From cc20bb19d00fb05101fab6327874dea279b251b1 Mon Sep 17 00:00:00 2001
From: Jason Freeman <jfreeman@microsoft.com>
Date: Thu, 21 Aug 2014 18:39:46 -0700
Subject: [PATCH 01/11] Baseline and harness changes

---
 src/harness/compilerRunner.ts                 |    2 +-
 src/harness/typeWriter.ts                     |    4 +-
 ...1.errors.txt => ArrowFunction1.errors.txt} |    2 +-
 ...2.errors.txt => ArrowFunction2.errors.txt} |    2 +-
 ...3.errors.txt => ArrowFunction3.errors.txt} |    2 +-
 tests/baselines/reference/ArrowFunction4.js   |    8 +
 ...owFunction4.types => ArrowFunction4.types} |    6 +-
 ...AndNonExportedFunctionThatShareAName.types |    8 +-
 ...essibleTypeInTypeParameterConstraint.types |    2 +-
 ...esInParameterAndReturnTypeAnnotation.types |    2 +-
 ...ssibleTypesInParameterTypeAnnotation.types |    2 +-
 ...ccessibleTypesInReturnTypeAnnotation.types |    2 +-
 ...hAccessibleTypesOnItsExportedMembers.types |    2 +-
 ...leWithSameNameAndDifferentCommonRoot.types |    6 +-
 ...AndNonExportedLocalVarsOfTheSameName.types |    6 +-
 ...ithTheSameNameAndDifferentCommonRoot.types |    2 +-
 ...ulesWithTheSameNameAndSameCommonRoot.types |    6 +-
 ...rrors.txt => TypeArgumentList1.errors.txt} |    2 +-
 ...rParameterAccessibilityModifier.errors.txt |    5 +-
 .../baselines/reference/accessorWithES5.types |    8 +-
 .../accessorWithInitializer.errors.txt        |    5 +-
 .../accessorWithRestParam.errors.txt          |    5 +-
 .../additionOperatorWithAnyAndEveryType.types |    8 +-
 .../aliasInaccessibleModule.errors.txt        |    8 -
 .../reference/aliasInaccessibleModule.types   |   11 +
 .../aliasInaccessibleModule2.errors.txt       |   12 -
 .../reference/aliasInaccessibleModule2.types  |   20 +
 .../aliasUsageInAccessorsOfClass.errors.txt   |   30 +
 .../reference/aliasUsageInAccessorsOfClass.js |   69 -
 .../aliasUsageInAccessorsOfClass.types        |   60 -
 .../aliasUsageInGenericFunction.types         |    6 +-
 .../reference/aliasUsedAsNameValue.types      |   11 +-
 .../reference/ambientDeclarations.types       |   30 +-
 ...nalModuleWithRelativeModuleName.errors.txt |    8 +-
 ...entExternalModuleWithRelativeModuleName.js |    4 -
 .../reference/ambientGetters.errors.txt       |    5 +-
 .../reference/ambientModuleExports.types      |   12 +-
 .../ambiguousOverloadResolution.types         |    6 +-
 .../amdDependencyComment2.errors.txt          |    7 -
 .../anyAsReturnTypeForNewOnCall.types         |    4 +-
 .../anyAssignabilityInInheritance.types       |  102 +-
 .../reference/anyAssignableToEveryType.types  |    2 +-
 .../anyInferenceAnonymousFunctions.types      |   22 +-
 tests/baselines/reference/arguments.types     |    2 +-
 ...argumentsUsedInObjectLiteralProperty.types |    6 +-
 .../baselines/reference/arrayConcatMap.types  |    6 +-
 .../arrayLiteralInNonVarArgParameter.types    |    4 +-
 .../reference/arrayLiteralTypeInference.types |   32 +-
 tests/baselines/reference/arrayconcat.types   |   39 +-
 .../reference/arrowFunctionExpressions.types  |   26 +-
 ...nctionMissingCurlyWithSemicolon.errors.txt |    7 -
 .../arrowFunctionsMissingTokens.errors.txt    |  115 -
 .../asiAmbientFunctionDeclaration.js          |    4 -
 .../asiAmbientFunctionDeclaration.types       |    4 -
 tests/baselines/reference/asiArith.types      |   40 +-
 tests/baselines/reference/asiBreak.js         |    6 -
 tests/baselines/reference/asiBreak.types      |    3 -
 tests/baselines/reference/asiContinue.js      |    6 -
 tests/baselines/reference/asiContinue.types   |    3 -
 .../baselines/reference/asiInES6Classes.types |    6 +-
 .../baselines/reference/asiReturn.errors.txt  |    5 -
 .../reference/assignEveryTypeToAny.types      |    2 +-
 .../reference/assignToPrototype1.types        |    6 +-
 .../reference/assignmentCompatForEnums.types  |    6 +-
 .../reference/assignmentCompatOnNew.types     |    4 +-
 .../assignmentCompatWithObjectMembers.js      |  168 +
 .../assignmentCompatWithObjectMembers.types   |  310 ++
 .../assignmentCompatability24.errors.txt      |    8 +-
 .../reference/assignmentCompatability24.js    |    2 +-
 .../assignmentCompatability33.errors.txt      |    8 +-
 .../reference/assignmentCompatability33.js    |    2 +-
 .../assignmentCompatability34.errors.txt      |    8 +-
 .../reference/assignmentCompatability34.js    |    2 +-
 .../assignmentCompatability37.errors.txt      |    8 +-
 .../reference/assignmentCompatability37.js    |    2 +-
 .../assignmentCompatability38.errors.txt      |    8 +-
 .../reference/assignmentCompatability38.js    |    2 +-
 ...tibilityForConstrainedTypeParameters.types |    2 +-
 .../reference/assignmentLHSIsReference.types  |    4 +-
 tests/baselines/reference/augmentArray.js     |    6 -
 tests/baselines/reference/augmentArray.types  |    7 -
 .../autoAsiForStaticsInClassDeclaration.js    |   12 -
 .../autoAsiForStaticsInClassDeclaration.types |   10 -
 tests/baselines/reference/avoid.types         |   10 +-
 .../reference/badArraySyntax.errors.txt       |    8 +-
 .../reference/badOverloadError.types          |    2 +-
 .../baselines/reference/badThisBinding.types  |   28 +-
 ...stCommonTypeOfConditionalExpressions.types |    2 +-
 .../bestCommonTypeReturnStatement.types       |   10 +-
 .../bitwiseNotOperatorWithBooleanType.types   |   12 +-
 .../bitwiseNotOperatorWithNumberType.types    |   12 +-
 .../bitwiseNotOperatorWithStringType.types    |   12 +-
 .../breakInIterationOrSwitchStatement1.js     |    9 +
 .../breakInIterationOrSwitchStatement1.types  |    5 +
 .../breakInIterationOrSwitchStatement2.js     |   10 +
 .../breakInIterationOrSwitchStatement2.types  |    6 +
 .../breakInIterationOrSwitchStatement3.js     |    9 +
 .../breakInIterationOrSwitchStatement3.types  |    5 +
 ...akInIterationOrSwitchStatement4.errors.txt |    6 +
 .../breakInIterationOrSwitchStatement4.js     |    9 +
 ...otInIterationOrSwitchStatement1.errors.txt |    4 +
 ...otInIterationOrSwitchStatement2.errors.txt |    8 +
 tests/baselines/reference/breakTarget1.js     |    6 +
 tests/baselines/reference/breakTarget1.types  |    4 +
 tests/baselines/reference/breakTarget2.js     |   10 +
 tests/baselines/reference/breakTarget2.types  |    6 +
 tests/baselines/reference/breakTarget3.js     |   11 +
 tests/baselines/reference/breakTarget3.types  |    7 +
 tests/baselines/reference/breakTarget4.js     |   11 +
 tests/baselines/reference/breakTarget4.types  |    7 +
 .../reference/breakTarget5.errors.txt         |   11 +
 .../reference/breakTarget6.errors.txt         |    6 +
 ...GenericFunctionWithZeroTypeArguments.types |    4 +-
 ...allSignatureWithoutAnnotationsOrBody.types |    4 +-
 ...WithoutReturnTypeAnnotationInference.types |   64 +-
 ...callSignaturesWithOptionalParameters.types |   12 +-
 ...allSignaturesWithOptionalParameters2.types |   18 +-
 .../reference/captureThisInSuperCall.js       |   32 -
 .../reference/captureThisInSuperCall.types    |   25 -
 .../castExpressionParentheses.errors.txt      |   42 +
 .../reference/castExpressionParentheses.js    |    2 +-
 .../reference/castExpressionParentheses.types |  170 -
 tests/baselines/reference/castTest.types      |   31 +-
 tests/baselines/reference/catch.types         |    2 +-
 tests/baselines/reference/cf.types            |    2 +-
 .../baselines/reference/chainedImportAlias.js |   18 +-
 .../reference/chainedImportAlias.types        |   33 +-
 .../reference/classExtendingClass.types       |   12 +-
 .../classExtendingPrimitive2.errors.txt       |   11 -
 .../classExtendsEveryObjectType2.errors.txt   |   10 -
 .../classImplementsImportedInterface.js       |   25 -
 .../classImplementsImportedInterface.types    |   28 -
 ...ssMemberInitializerWithLamdaScoping5.types |    4 +-
 .../classMethodWithKeywordName1.types         |    2 +-
 ...licMembersEquivalentToInterface.errors.txt |   30 +
 ...lyPublicMembersEquivalentToInterface.types |   73 -
 ...icMembersEquivalentToInterface2.errors.txt |   32 +
 ...yPublicMembersEquivalentToInterface2.types |   76 -
 .../reference/classWithPublicProperty.types   |    6 +-
 .../cloduleAcrossModuleDefinitions.types      |    2 +-
 tests/baselines/reference/cloduleTest1.types  |    2 +-
 ...ionCodeGenModuleWithFunctionChildren.types |    6 +-
 ...isionCodeGenModuleWithModuleChildren.types |    4 +-
 .../collisionExportsRequireAndFunction.types  |    4 +-
 .../collisionExportsRequireAndModule.types    |    4 +-
 ...xportsRequireAndUninstantiatedModule.types |    4 +-
 .../collisionExportsRequireAndVar.types       |    2 +-
 .../baselines/reference/commaOperator1.types  |    2 +-
 .../commaOperatorOtherValidOperation.types    |    6 +-
 .../commentBeforeStaticMethod1.types          |    2 +-
 .../commentInEmptyParameterList1.types        |    2 +-
 .../reference/commentInMethodCall.types       |    3 +-
 .../reference/commentOnSignature1.types       |    6 +-
 .../commentOnSimpleArrowFunctionBody1.types   |   12 +-
 .../reference/commentOnStaticMember1.types    |    2 +-
 .../commentsBeforeFunctionExpression1.types   |    4 +-
 .../reference/commentsClassMembers.types      |   60 +-
 .../reference/commentsCommentParsing.types    |   76 +-
 .../reference/commentsDottedModuleName.types  |   12 -
 .../reference/commentsExternalModules.types   |   28 +-
 .../reference/commentsExternalModules2.types  |   28 +-
 .../reference/commentsExternalModules3.types  |   28 +-
 .../reference/commentsFunction.types          |   24 +-
 .../reference/commentsInterface.types         |   20 +-
 .../baselines/reference/commentsModules.types |   16 +-
 .../commentsMultiModuleMultiFile.errors.txt   |   41 +
 .../reference/commentsMultiModuleMultiFile.js |   12 +-
 .../commentsMultiModuleMultiFile.types        |   62 -
 .../reference/commentsOnObjectLiteral3.types  |   21 +-
 .../reference/commentsOnObjectLiteral4.types  |    9 +-
 .../commentsOnReturnStatement1.types          |    2 +-
 .../reference/commentsOverloads.types         |   40 +-
 .../commentsPropertySignature1.types          |    5 +-
 .../reference/commentsTypeParameters.types    |    6 +-
 .../reference/commentsdoNotEmitComments.types |    4 +-
 .../reference/commentsemitComments.types      |    4 +-
 ...onOperatorWithIdenticalTypeParameter.types |    2 +-
 ...omparisonOperatorWithOneOperandIsAny.types |    2 +-
 ...mparisonOperatorWithOneOperandIsNull.types |    2 +-
 ...sonOperatorWithOneOperandIsUndefined.types |    2 +-
 .../reference/complexClassRelationships.types |    8 +-
 .../reference/complicatedPrivacy.errors.txt   |    6 +-
 .../reference/compositeGenericFunction.types  |   12 +-
 .../compoundAssignmentLHSIsReference.types    |    4 +-
 .../reference/conditionalExpressions2.types   |    2 +-
 ...itionalOperatorConditionIsNumberType.types |   10 +-
 ...itionalOperatorConditionIsObjectType.types |    6 +-
 ...itionalOperatorConditoinIsStringType.types |    6 +-
 ...eOverloadsCausedByOverloadResolution.types |   42 +-
 .../reference/constantOverloadFunction.types  |   10 +-
 ...straintPropagationThroughReturnTypes.types |    6 +-
 .../constraintSatisfactionWithAny.types       |   18 +-
 ...onstraintSatisfactionWithEmptyObject.types |   12 +-
 ...nstructorArgWithGenericCallSignature.types |    6 +-
 .../constructorArgsErrors3.errors.txt         |    8 -
 .../constructorArgsErrors4.errors.txt         |    8 -
 .../constructorArgsErrors5.errors.txt         |    8 -
 ...uctorsWithSpecializedSignatures.errors.txt |   60 -
 ...contextualSigInstantiationRestParams.types |   10 +-
 .../contextualSignatureInstantiation1.types   |    8 +-
 .../contextualSignatureInstantiation3.types   |   83 -
 ...meterConstrainedToOuterTypeParameter.types |    4 +-
 .../contextualTypeAppliedToVarArgs.types      |   16 +-
 .../contextualTypeArrayReturnType.types       |   18 +-
 .../reference/contextualTyping.errors.txt     |    4 +-
 tests/baselines/reference/contextualTyping.js |  197 +-
 .../reference/contextualTyping25.types        |    4 +-
 .../reference/contextualTyping26.types        |    4 +-
 .../reference/contextualTyping27.types        |    4 +-
 .../reference/contextualTyping28.types        |    4 +-
 .../reference/contextualTyping29.types        |    4 +-
 .../reference/contextualTyping31.types        |    4 +-
 .../reference/contextualTyping32.types        |    4 +-
 ...ypingTwoInstancesOfSameTypeParameter.types |    6 +-
 .../continueInIterationStatement1.js          |    9 +
 .../continueInIterationStatement1.types       |    5 +
 .../continueInIterationStatement2.js          |   10 +
 .../continueInIterationStatement2.types       |    6 +
 .../continueInIterationStatement3.js          |    9 +
 .../continueInIterationStatement3.types       |    5 +
 .../continueInIterationStatement4.errors.txt  |    6 +
 .../continueInIterationStatement4.js          |    9 +
 tests/baselines/reference/continueLabel.js    |    9 +
 tests/baselines/reference/continueLabel.types |   10 +
 ...ontinueNotInIterationStatement1.errors.txt |    4 +
 ...ontinueNotInIterationStatement2.errors.txt |    8 +
 ...ontinueNotInIterationStatement3.errors.txt |    7 +
 ...ontinueNotInIterationStatement4.errors.txt |   10 +
 .../reference/continueTarget1.errors.txt      |    5 +
 tests/baselines/reference/continueTarget2.js  |   10 +
 .../baselines/reference/continueTarget2.types |    6 +
 tests/baselines/reference/continueTarget3.js  |   11 +
 .../baselines/reference/continueTarget3.types |    7 +
 tests/baselines/reference/continueTarget4.js  |   11 +
 .../baselines/reference/continueTarget4.types |    7 +
 .../reference/continueTarget5.errors.txt      |   11 +
 .../reference/continueTarget6.errors.txt      |    6 +
 .../reference/convertKeywordsYes.errors.txt   |  330 ++
 .../baselines/reference/convertKeywordsYes.js |   28 +
 .../reference/convertKeywordsYes.types        |  936 -----
 tests/baselines/reference/covariance1.types   |    6 +-
 .../crashInresolveReturnStatement.types       |   10 +-
 .../baselines/reference/cyclicModuleImport.js |   21 -
 tests/baselines/reference/debugger.types      |    2 +-
 .../reference/declFileAccessors.types         |  160 -
 .../reference/declFileCallSignatures.types    |  117 -
 ...WithStaticMethodReturningConstructor.types |    2 +-
 .../declFileConstructSignatures.types         |  121 -
 .../reference/declFileConstructors.types      |  176 -
 .../reference/declFileFunctions.types         |  142 -
 .../reference/declFileGenericType.types       |   48 +-
 .../declFileImportChainInExportAssignment.js  |   39 -
 ...eclFileImportChainInExportAssignment.types |   24 -
 .../reference/declFileIndexSignatures.js      |   69 -
 .../reference/declFileIndexSignatures.types   |   66 -
 .../baselines/reference/declFileMethods.types |  447 ---
 ...uleAssignmentInObjectLiteralProperty.types |    5 +-
 ...tParametersOfFunctionAndFunctionType.types |   10 +-
 .../reference/declFileTypeofFunction.types    |   54 +-
 .../declFileTypeofInAnonymousType.types       |   12 +-
 .../declarationEmit_nameConflicts.errors.txt  |   53 +
 .../declarationEmit_nameConflicts.types       |  148 -
 .../declarationEmit_nameConflicts2.js         |    1 +
 .../declarationEmit_nameConflicts2.types      |    9 +-
 .../declarationEmit_nameConflicts3.js         |    1 +
 .../declarationEmit_nameConflicts3.types      |   27 +-
 ...tionEmit_nameConflictsWithAlias.errors.txt |   10 +
 ...clarationEmit_nameConflictsWithAlias.types |   21 -
 ...tAssignmentWithVarFromVariableStatement.js |   41 -
 ...signmentWithVarFromVariableStatement.types |   51 -
 .../deleteOperatorWithBooleanType.types       |   12 +-
 .../deleteOperatorWithNumberType.types        |   12 +-
 .../deleteOperatorWithStringType.types        |   12 +-
 ...achedCommentAtStartOfLambdaFunction1.types |    6 +-
 ...achedCommentAtStartOfLambdaFunction2.types |    7 +-
 .../reference/dottedSymbolResolution1.types   |   20 +-
 .../reference/duplicateLabel1.errors.txt      |    7 +
 .../reference/duplicateLabel2.errors.txt      |    9 +
 tests/baselines/reference/duplicateLabel3.js  |   17 +
 .../baselines/reference/duplicateLabel3.types |   11 +
 tests/baselines/reference/duplicateLabel4.js  |   14 +
 .../baselines/reference/duplicateLabel4.types |    9 +
 ...duplicatePropertiesInStrictMode.errors.txt |   10 -
 .../duplicateStringIndexers.errors.txt        |   47 -
 .../reference/duplicateStringIndexers.js      |   74 +-
 .../reference/duplicateVarAndImport.types     |   13 -
 .../duplicateVarAndImport2.errors.txt         |    7 -
 .../reference/duplicateVariablesByScope.types |    2 +-
 tests/baselines/reference/emitBOM.types       |    6 -
 .../emptyTypeArgumentList.errors.txt          |    7 -
 .../emptyTypeArgumentListWithNew.errors.txt   |    7 -
 tests/baselines/reference/enumBasics.types    |    8 +-
 .../reference/enumBasics1.errors.txt          |    2 +-
 tests/baselines/reference/enumBasics1.js      |    2 +-
 .../enumInitializersWithExponents.errors.txt  |   14 -
 tests/baselines/reference/es6ClassTest5.types |    4 +-
 tests/baselines/reference/es6ClassTest8.types |   56 +-
 .../reference/everyTypeAssignableToAny.types  |    2 +-
 ...veryTypeWithAnnotationAndInitializer.types |   20 +-
 .../reference/everyTypeWithInitializer.types  |   14 +-
 .../reference/exportAssignmentFunction.types  |    8 +-
 .../exportAssignmentMergedModule.types        |   12 +-
 ...ntWithDeclareAndExportModifiers.errors.txt |    7 -
 ...rtAssignmentWithDeclareModifier.errors.txt |    7 -
 ...ortAssignmentWithExportModifier.errors.txt |    7 -
 tests/baselines/reference/exportCodeGen.types |   12 +-
 tests/baselines/reference/exportImport.types  |    2 +-
 .../reference/exportImportMultipleFiles.types |   10 +-
 .../exportImportNonInstantiatedModule2.types  |    2 +-
 .../reference/exportVisibility.types          |    2 +-
 ...ndingClassFromAliasAndUsageInIndexer.types |    5 +-
 tests/baselines/reference/externFunc.types    |    4 +-
 ...fImportDeclarationWithExportModifier.types |    6 +-
 tests/baselines/reference/fatArrowSelf.types  |    8 +-
 .../reference/fatarrowfunctions.types         |   47 +-
 ...functionsInFunctionParameterDefaults.types |    4 +-
 .../fatarrowfunctionsInFunctions.types        |   29 +-
 .../fileReferencesWithNoExtensions.types      |   32 -
 ...rameterInSignatureWithRestParameters.types |    4 +-
 .../baselines/reference/forInStatement3.types |    2 +-
 tests/baselines/reference/forStatements.types |   20 +-
 .../forStatementsMultipleValidDecl.types      |    2 +-
 tests/baselines/reference/funcdecl.types      |   94 +-
 ...nAndInterfaceWithSeparateErrors.errors.txt |   12 -
 .../functionAndInterfaceWithSeparateErrors.js |   12 -
 tests/baselines/reference/functionCall1.types |    4 +-
 tests/baselines/reference/functionCall2.types |    4 +-
 tests/baselines/reference/functionCall3.types |    4 +-
 tests/baselines/reference/functionCall4.types |    8 +-
 tests/baselines/reference/functionCall5.types |    4 +-
 .../functionConstraintSatisfaction.types      |   44 +-
 .../functionConstraintSatisfaction3.types     |   22 +-
 ...nWithArgumentOfTypeFunctionTypeArray.types |    2 +-
 .../reference/functionImplementations.types   |  121 +-
 .../reference/functionMergedWithModule.types  |    8 +-
 .../reference/functionOnlyHasThrow.types      |    2 +-
 .../reference/functionOverloads10.types       |    6 +-
 .../reference/functionOverloads12.types       |    6 +-
 .../reference/functionOverloads13.types       |    6 +-
 .../reference/functionOverloads14.types       |    6 +-
 .../reference/functionOverloads15.types       |    6 +-
 .../reference/functionOverloads16.types       |    6 +-
 .../reference/functionOverloads21.types       |    6 +-
 .../reference/functionOverloads23.types       |    6 +-
 .../reference/functionOverloads24.types       |    6 +-
 .../reference/functionOverloads25.types       |    8 +-
 .../reference/functionOverloads26.types       |    8 +-
 .../reference/functionOverloads28.types       |    8 +-
 .../reference/functionOverloads30.types       |    8 +-
 .../reference/functionOverloads31.types       |    8 +-
 .../reference/functionOverloads32.types       |    8 +-
 .../reference/functionOverloads33.types       |    8 +-
 .../reference/functionOverloads35.types       |    8 +-
 .../reference/functionOverloads36.types       |    8 +-
 .../reference/functionOverloads38.types       |    8 +-
 .../reference/functionOverloads39.types       |    8 +-
 .../reference/functionOverloads42.types       |    8 +-
 .../reference/functionOverloads6.types        |    6 +-
 .../reference/functionOverloads8.types        |    6 +-
 .../reference/functionOverloads9.types        |    6 +-
 ...nOverloadsRecursiveGenericReturnType.types |    6 +-
 .../baselines/reference/functionReturn.types  |   14 +-
 .../reference/functionReturningItself.types   |    4 +-
 tests/baselines/reference/functionType.types  |    4 +-
 ...thAnyReturnTypeAndNoReturnExpression.types |    2 +-
 ...unctionWithMultipleReturnStatements2.types |   18 +-
 ...gReturnStatementsAndExpressions.errors.txt |  129 -
 .../funduleUsedAcrossFileBoundary.types       |    8 +-
 .../reference/generatedContextualTyping.types |  120 +-
 .../generativeRecursionWithTypeOf.types       |    4 +-
 tests/baselines/reference/genericArray0.types |    2 +-
 .../genericArrayPropertyAssignment.types      |    4 +-
 .../genericCallTypeArgumentInference.types    |   12 +-
 .../genericCallWithArrayLiteralArgs.types     |   18 +-
 ...WithConstraintsTypeArgumentInference.types |   16 +-
 .../genericCallWithFixedArguments.types       |    4 +-
 ...enericCallWithFunctionTypedArguments.types |   36 +-
 ...nericCallWithFunctionTypedArguments2.types |   30 +-
 ...nericCallWithFunctionTypedArguments3.types |    6 +-
 ...nericCallWithFunctionTypedArguments4.types |    6 +-
 ...ricCallWithGenericSignatureArguments.types |   32 +-
 ...icCallWithGenericSignatureArguments3.types |   28 +-
 .../genericCallWithNonGenericArgs1.types      |    4 +-
 .../genericCallWithNonSymmetricSubtypes.types |   22 +-
 .../genericCallWithObjectLiteralArgs.types    |   20 +-
 .../genericCallWithObjectTypeArgs.types       |    6 +-
 .../genericCallWithObjectTypeArgs2.types      |   12 +-
 ...CallWithObjectTypeArgsAndConstraints.types |   12 +-
 ...allWithObjectTypeArgsAndConstraints2.types |   20 +-
 ...ricCallWithObjectTypeArgsAndIndexers.types |    8 +-
 ...lWithObjectTypeArgsAndNumericIndexer.types |   16 +-
 ...llWithObjectTypeArgsAndStringIndexer.types |   16 +-
 ...hOverloadedConstructorTypedArguments.types |   26 +-
 ...WithOverloadedFunctionTypedArguments.types |   30 +-
 .../reference/genericClassStaticMethod.types  |    4 +-
 ...lassWithFunctionTypedMemberArguments.types |    2 +-
 .../reference/genericCloduleInModule.types    |    2 +-
 .../genericConstraintDeclaration.types        |    2 +-
 .../genericFunctionHasFreshTypeArgs.types     |    6 +-
 .../genericFunctionSpecializations1.types     |    8 +-
 .../reference/genericFunctions0.types         |    4 +-
 .../reference/genericFunctions1.types         |    4 +-
 .../reference/genericFunctions2.types         |    4 +-
 .../reference/genericFunctions3.types         |    4 +-
 .../reference/genericInference2.types         |   15 +-
 ...stantiationEquivalentToObjectLiteral.types |   12 +-
 ...enericInterfaceFunctionTypeParameter.types |    4 +-
 .../genericMethodOverspecialization.types     |   24 +-
 .../reference/genericOverloadSignatures.types |    6 +-
 .../genericParameterAssignability1.types      |    6 +-
 .../genericStaticAnyTypeFunction.types        |   10 +-
 .../genericTypeParameterEquivalence2.types    |   54 +-
 .../genericTypeWithCallableMembers.js         |    2 +-
 .../genericTypeWithCallableMembers.types      |    2 +-
 .../genericTypeWithCallableMembers2.types     |    4 +-
 .../genericsAndHigherOrderFunctions.types     |   14 +-
 .../genericsManyTypeParameters.types          |   21 +-
 .../reference/getterSetterNonAccessor.types   |   32 +-
 tests/baselines/reference/global.types        |    6 +-
 .../heterogeneousArrayLiterals.types          |    8 +-
 tests/baselines/reference/icomparable.types   |    4 +-
 tests/baselines/reference/idInProp.types      |    2 +-
 .../reference/ifDoWhileStatements.types       |   28 +-
 ...ementGenericWithMismatchedTypes.errors.txt |   11 +-
 .../implementGenericWithMismatchedTypes.js    |    2 +-
 .../implicitAnyAnyReturningFunction.types     |    4 +-
 ...AnyDeclareFunctionWithoutFormalType2.types |    6 +-
 .../reference/implicitAnyGenerics.types       |    6 +-
 .../baselines/reference/importDecl.errors.txt |   83 +
 tests/baselines/reference/importDecl.js       |   56 +-
 tests/baselines/reference/importDecl.types    |  228 --
 .../reference/importStatements.types          |    2 +-
 .../inOperatorWithValidOperands.types         |    2 +-
 .../indexSignatureTypeInference.errors.txt    |   23 -
 .../indexSignaturesInferentialTyping.types    |   12 +-
 .../reference/inferSecondaryParameter.types   |    8 +-
 ...gumentsInSignatureWithRestParameters.types |   16 +-
 .../inferentialTypingWithFunctionType.types   |    8 +-
 .../inferentialTypingWithFunctionType2.types  |    4 +-
 ...erentialTypingWithFunctionTypeNested.types |   12 +-
 ...ngWithFunctionTypeSyntacticScenarios.types |   68 +-
 .../inferentiallyTypingAnEmptyArray.types     |    4 +-
 ...nfiniteExpansionThroughTypeInference.types |    4 +-
 .../reference/infinitelyExpandingTypes5.types |    6 +-
 ...finitelyExpandingTypesNonGenericBase.types |    4 +-
 ...nheritanceStaticFuncOverridingMethod.types |    4 +-
 ...aticFuncOverridingPropertyOfFuncType.types |    2 +-
 ...icFunctionOverridingInstanceProperty.types |    2 +-
 ...ritedFunctionAssignmentCompatibility.types |    6 +-
 ...ritedOverloadedSpecializedSignatures.types |   90 -
 tests/baselines/reference/innerAliases2.types |    2 +-
 tests/baselines/reference/innerFunc.types     |    4 +-
 .../baselines/reference/innerOverloads.types  |    4 +-
 .../innerTypeArgumentInference.types          |    4 +-
 .../innerTypeParameterShadowingOuterOne.types |    4 +-
 .../instanceAndStaticDeclarations1.types      |    2 +-
 .../instanceOfInExternalModules.types         |    2 +-
 ...anceofOperatorWithLHSIsTypeParameter.types |    2 +-
 .../reference/instantiatedModule.types        |    6 +-
 .../interMixingModulesInterfaces0.types       |    6 +-
 .../interMixingModulesInterfaces1.types       |    6 +-
 .../interMixingModulesInterfaces2.types       |    2 +-
 .../interMixingModulesInterfaces3.types       |    2 +-
 .../interMixingModulesInterfaces4.types       |    6 +-
 .../interMixingModulesInterfaces5.types       |    6 +-
 .../reference/interfaceContextualType.types   |    8 +-
 .../interfaceWithPropertyOfEveryType.types    |   26 +-
 .../reference/internalAliasFunction.types     |   12 +-
 ...sFunctionInsideLocalModuleWithExport.types |   12 +-
 ...nctionInsideLocalModuleWithoutExport.types |   12 +-
 ...nctionInsideTopLevelModuleWithExport.types |   12 +-
 ...ionInsideTopLevelModuleWithoutExport.types |   12 +-
 .../internalAliasWithDottedNameEmit.js        |    8 -
 .../invalidTryStatements2.errors.txt          |   31 +-
 .../reference/invalidUndefinedValues.types    |    6 +-
 tests/baselines/reference/ipromise2.types     |    8 +-
 tests/baselines/reference/ipromise3.types     |    8 +-
 tests/baselines/reference/lambdaASIEmit.types |   12 +-
 tests/baselines/reference/listFailure.types   |   12 +-
 tests/baselines/reference/literals1.types     |    3 -
 .../localImportNameVsGlobalName.types         |    8 +-
 ...ocalVariablesReturnedFromCatchBlocks.types |    2 +-
 ...logicalAndOperatorWithTypeParameters.types |    2 +-
 .../logicalNotOperatorWithBooleanType.types   |   12 +-
 .../logicalNotOperatorWithNumberType.types    |   12 +-
 .../logicalNotOperatorWithStringType.types    |   12 +-
 .../logicalOrOperatorWithTypeParameters.types |    6 +-
 .../memberAccessMustUseModuleInstances.types  |    6 +-
 .../memberFunctionsWithPublicOverloads.types  |   28 +-
 .../reference/mergedDeclarations1.types       |    6 +-
 .../mergedModuleDeclarationCodeGen2.types     |    8 +-
 .../mergedModuleDeclarationCodeGen3.types     |    6 +-
 .../mergedModuleDeclarationCodeGen4.types     |    6 +-
 .../mergedModuleDeclarationCodeGen5.types     |   24 +-
 .../methodContainingLocalFunction.types       |   23 +-
 .../missingRequiredDeclare.d.errors.txt       |    6 +
 tests/baselines/reference/mixedExports.js     |   19 -
 tests/baselines/reference/mixedExports.types  |   38 -
 .../reference/modFunctionCrash.types          |    6 +-
 .../moduleAliasAsFunctionArgument.types       |    4 +-
 .../reference/moduleCodeGenTest5.types        |    4 +-
 .../moduleMemberWithoutTypeAnnotation1.types  |    6 +-
 .../moduleMemberWithoutTypeAnnotation2.types  |    2 +-
 .../reference/moduleScopingBug.types          |    2 +-
 .../reference/moduleSymbolMerging.types       |   21 -
 .../reference/moduleUnassignedVariable.types  |    4 +-
 .../reference/moduleVisibilityTest1.types     |   20 +-
 .../moduleWithStatementsOfEveryKind.types     |   12 +-
 .../reference/multiCallOverloads.types        |   10 +-
 .../reference/multiImportExport.errors.txt    |   26 +
 .../baselines/reference/multiImportExport.js  |   63 -
 .../reference/multiImportExport.types         |   51 -
 .../reference/multiModuleClodule1.types       |   12 +-
 .../reference/multiModuleFundule1.types       |    6 +-
 tests/baselines/reference/mutrec.types        |   12 +-
 .../nameCollisionsInPropertyAssignments.js    |    9 -
 .../nameCollisionsInPropertyAssignments.types |   12 -
 .../reference/nameWithRelativePaths.types     |    6 +-
 ...ionExpressionAssignedToClassProperty.types |    4 +-
 .../namedFunctionExpressionCall.types         |   16 +-
 .../namedFunctionExpressionInModule.types     |    3 +-
 .../negateOperatorWithAnyOtherType.types      |   10 +-
 .../negateOperatorWithBooleanType.types       |   12 +-
 .../negateOperatorWithNumberType.types        |   12 +-
 .../negateOperatorWithStringType.types        |   12 +-
 tests/baselines/reference/nestedIndexer.types |    2 +-
 .../reference/nestedRecursiveLambda.types     |    4 +-
 .../reference/newOperatorConformance.types    |    8 +-
 tests/baselines/reference/noCatchBlock.js     |   14 -
 tests/baselines/reference/noCatchBlock.js.map |    2 -
 .../reference/noCatchBlock.sourcemap.txt      |   53 -
 tests/baselines/reference/noCatchBlock.types  |    8 -
 ...isExpressionAndLocalVarInConstructor.types |   31 +-
 ...nThisExpressionAndLocalVarInFunction.types |    2 +-
 ...ionThisExpressionAndLocalVarInLambda.types |   23 +-
 ...ionThisExpressionAndLocalVarInMethod.types |   31 +-
 ...nThisExpressionAndLocalVarInProperty.types |   31 +-
 ...isExpressionInFunctionAndVarInGlobal.types |    2 +-
 .../reference/noConstraintInReturnType1.types |    2 +-
 .../reference/noImplicitAnyForIn.errors.txt   |   42 -
 .../noImplicitAnyIndexing.errors.txt          |   58 -
 ...icitAnyParametersInAmbientClass.errors.txt |  155 -
 .../noImplicitAnyParametersInAmbientClass.js  |   95 -
 ...AnyParametersInAmbientFunctions.errors.txt |   89 -
 ...ImplicitAnyParametersInAmbientFunctions.js |   47 -
 ...citAnyParametersInAmbientModule.errors.txt |   91 -
 .../noImplicitAnyParametersInAmbientModule.js |   49 -
 ...citAnyParametersInBareFunctions.errors.txt |   89 -
 .../noImplicitAnyParametersInClass.errors.txt |  181 -
 ...mplicitAnyParametersInInterface.errors.txt |  106 -
 .../noImplicitAnyParametersInInterface.js     |   54 -
 ...noImplicitAnyParametersInModule.errors.txt |   91 -
 tests/baselines/reference/noSelfOnVars.types  |    2 +-
 .../reference/nonInstantiatedModule.types     |    2 +-
 tests/baselines/reference/null.types          |    4 +-
 .../reference/nullAssignableToEveryType.types |    2 +-
 ...ullIsSubtypeOfEverythingButUndefined.types |    6 +-
 .../reference/objectLitGetterSetter.types     |   46 +-
 .../objectLiteralArraySpecialization.types    |    4 +-
 .../reference/objectLiteralWidened.types      |   18 +-
 .../objectTypeHidingMembersOfObject.types     |    4 +-
 .../reference/objectTypePropertyAccess.types  |    4 +-
 .../objectTypeWithNumericProperty.types       |    5 +-
 ...ctTypeWithStringNamedNumericProperty.types |   13 +-
 ...ringNamedPropertyOfIllegalCharacters.types |    6 +-
 .../reference/objectTypesIdentity.types       |  102 +-
 .../reference/objectTypesIdentity2.types      |   66 +-
 ...bjectTypesIdentityWithCallSignatures.types |  114 +-
 ...jectTypesIdentityWithCallSignatures2.types |  114 +-
 ...thCallSignaturesDifferingParamCounts.types |  114 +-
 ...hCallSignaturesDifferingParamCounts2.types |   48 +-
 ...ntityWithCallSignaturesWithOverloads.types |  118 +-
 ...TypesIdentityWithConstructSignatures.types |   96 +-
 ...ypesIdentityWithConstructSignatures2.types |   84 +-
 ...structSignaturesDifferingParamCounts.types |   84 +-
 ...pesIdentityWithGenericCallSignatures.types |  114 +-
 ...esIdentityWithGenericCallSignatures2.types |  114 +-
 ...CallSignaturesDifferingByConstraints.types |  114 +-
 ...cCallSignaturesDifferingByReturnType.types |  114 +-
 ...CallSignaturesDifferingByReturnType2.types |  114 +-
 ...gnaturesDifferingTypeParameterCounts.types |  114 +-
 ...naturesDifferingTypeParameterCounts2.types |   42 +-
 ...ignaturesDifferingTypeParameterNames.types |  114 +-
 ...hGenericCallSignaturesOptionalParams.types |  114 +-
 ...GenericCallSignaturesOptionalParams2.types |  114 +-
 ...GenericCallSignaturesOptionalParams3.types |  114 +-
 ...ructSignaturesDifferingByConstraints.types |   78 +-
 ...tructSignaturesDifferingByReturnType.types |   90 +-
 ...ructSignaturesDifferingByReturnType2.types |   84 +-
 ...gnaturesDifferingTypeParameterCounts.types |   78 +-
 ...ignaturesDifferingTypeParameterNames.types |   78 +-
 ...ricConstructSignaturesOptionalParams.types |   78 +-
 ...icConstructSignaturesOptionalParams2.types |   78 +-
 ...icConstructSignaturesOptionalParams3.types |   78 +-
 ...ectTypesIdentityWithNumericIndexers1.types |  138 +-
 ...ectTypesIdentityWithNumericIndexers2.types |  138 +-
 ...ectTypesIdentityWithNumericIndexers3.types |  138 +-
 .../objectTypesIdentityWithOptionality.types  |   54 +-
 .../objectTypesIdentityWithPrivates.types     |  138 +-
 .../objectTypesIdentityWithPrivates2.types    |   40 +-
 .../objectTypesIdentityWithPublics.types      |  102 +-
 ...bjectTypesIdentityWithStringIndexers.types |  138 +-
 ...jectTypesIdentityWithStringIndexers2.types |  138 +-
 .../octalLiteralInStrictModeES3.errors.txt    |    5 -
 .../optionalAccessorsInInterface1.types       |    8 +-
 ...optionalParamReferencingOtherParams1.types |    2 +-
 tests/baselines/reference/overload2.types     |   12 +-
 tests/baselines/reference/overloadCrash.types |    6 +-
 .../overloadEquivalenceWithStatics.types      |    6 +-
 .../overloadGenericFunctionWithRestArgs.types |    4 +-
 .../overloadOnConstConstraintChecks2.types    |    8 +-
 .../overloadOnConstConstraintChecks3.types    |    8 +-
 ...loadOnGenericClassAndNonGenericClass.types |    8 +-
 .../overloadResolutionOverNonCTLambdas.types  |   31 +-
 ...overloadResolutionOverNonCTObjectLit.types |    2 +-
 .../reference/overloadReturnTypes.types       |    8 +-
 ...lbacksWithDifferingOptionalityOnArgs.types |   10 +-
 ...overloadedStaticMethodSpecialization.types |    6 +-
 .../overloadsAndTypeArgumentArity.types       |   12 +-
 ...rentContainersDisagreeOnAmbient.errors.txt |   11 -
 ...sInDifferentContainersDisagreeOnAmbient.js |   17 -
 .../parametersWithNoAnnotationAreAny.types    |   20 +-
 tests/baselines/reference/parser579071.types  |    1 -
 tests/baselines/reference/parser596700.types  |    1 -
 tests/baselines/reference/parser630933.types  |    1 -
 .../baselines/reference/parser645086_3.types  |    1 -
 .../baselines/reference/parser645086_4.types  |    1 -
 tests/baselines/reference/parser768531.types  |    5 +-
 .../parserAccessibilityAfterStatic11.types    |    2 +-
 .../parserAccessibilityAfterStatic14.types    |    2 +-
 .../reference/parserAccessors1.errors.txt     |    4 +-
 tests/baselines/reference/parserAccessors1.js |   17 -
 ...errors.txt => parserAccessors2.errors.txt} |    2 +-
 tests/baselines/reference/parserAccessors2.js |   17 -
 .../reference/parserAccessors2.types          |    8 -
 .../reference/parserAccessors3.errors.txt     |    4 +-
 tests/baselines/reference/parserAccessors3.js |    6 -
 ...errors.txt => parserAccessors4.errors.txt} |    2 +-
 tests/baselines/reference/parserAccessors4.js |    6 -
 .../reference/parserAccessors4.types          |    7 -
 .../reference/parserAccessors5.errors.txt     |    2 +-
 .../reference/parserAccessors6.errors.txt     |    2 +-
 .../reference/parserAccessors7.errors.txt     |    2 +-
 .../reference/parserAccessors8.errors.txt     |    2 +-
 .../reference/parserAccessors9.errors.txt     |    2 +-
 .../parserAssignmentExpression1.errors.txt    |    8 -
 .../reference/parserAssignmentExpression1.js  |    5 -
 .../parserConstructorDeclaration11.errors.txt |    8 -
 .../baselines/reference/parserDoStatement2.js |    8 -
 .../reference/parserDoStatement2.types        |    3 -
 .../reference/parserES3Accessors1.errors.txt  |    8 -
 .../reference/parserES3Accessors3.errors.txt  |    6 -
 ...very_ExtendsOrImplementsClause6.errors.txt |    4 -
 .../reference/parserForStatement4.errors.txt  |    9 -
 .../reference/parserForStatement4.js          |    7 -
 .../reference/parserForStatement5.errors.txt  |    7 -
 .../reference/parserForStatement5.js          |    7 -
 .../reference/parserForStatement6.errors.txt  |    9 -
 .../reference/parserForStatement6.js          |    7 -
 .../reference/parserForStatement7.errors.txt  |    9 -
 .../reference/parserForStatement7.js          |    7 -
 .../reference/parserForStatement8.errors.txt  |    7 -
 .../reference/parserForStatement8.js          |    7 -
 .../parserFunctionDeclaration1.d.types        |    2 +-
 .../parserFunctionDeclaration5.types          |    4 +-
 .../parserFunctionDeclaration8.types          |    2 +-
 ...rGetAccessorWithTypeParameters1.errors.txt |    2 +-
 .../parserGreaterThanTokenAmbiguity10.types   |    5 +-
 .../parserGreaterThanTokenAmbiguity5.types    |    5 +-
 .../parserKeywordsAsIdentifierName1.types     |    6 +-
 ...parserKeywordsAsIdentifierName2.errors.txt |    2 +-
 .../parserMemberAccessor1.errors.txt          |    6 +-
 .../reference/parserMemberAccessor1.js        |   20 -
 ...arserMemberAccessorDeclaration1.errors.txt |    4 +-
 .../parserMemberAccessorDeclaration1.js       |   17 -
 ...rserMemberAccessorDeclaration10.errors.txt |    4 +-
 ...rserMemberAccessorDeclaration11.errors.txt |    4 +-
 ...rserMemberAccessorDeclaration12.errors.txt |    2 +-
 ...rserMemberAccessorDeclaration13.errors.txt |    2 +-
 ...rserMemberAccessorDeclaration14.errors.txt |    2 +-
 ...rserMemberAccessorDeclaration15.errors.txt |    2 +-
 ...rserMemberAccessorDeclaration16.errors.txt |    2 +-
 ...rserMemberAccessorDeclaration17.errors.txt |    2 +-
 ...rserMemberAccessorDeclaration18.errors.txt |    2 +-
 ...arserMemberAccessorDeclaration2.errors.txt |    4 +-
 .../parserMemberAccessorDeclaration2.js       |   17 -
 ...arserMemberAccessorDeclaration3.errors.txt |    4 +-
 .../parserMemberAccessorDeclaration3.js       |   17 -
 ...arserMemberAccessorDeclaration4.errors.txt |    6 +
 .../parserMemberAccessorDeclaration4.js       |   17 -
 .../parserMemberAccessorDeclaration4.types    |    8 -
 ...arserMemberAccessorDeclaration5.errors.txt |    6 +
 .../parserMemberAccessorDeclaration5.js       |   17 -
 .../parserMemberAccessorDeclaration5.types    |    7 -
 ...arserMemberAccessorDeclaration6.errors.txt |    6 +
 .../parserMemberAccessorDeclaration6.js       |   17 -
 .../parserMemberAccessorDeclaration6.types    |    7 -
 ...arserMemberAccessorDeclaration7.errors.txt |    4 +-
 ...arserMemberAccessorDeclaration8.errors.txt |    4 +-
 ...arserMemberAccessorDeclaration9.errors.txt |    4 +-
 .../reference/parserModuleDeclaration11.types |    6 +-
 .../parserObjectCreation2.errors.txt          |    4 -
 .../reference/parserObjectCreation2.js        |    5 -
 .../reference/parserObjectLiterals1.js        |    5 -
 .../reference/parserObjectLiterals1.types     |    7 -
 .../reference/parserObjectType5.errors.txt    |    9 -
 .../reference/parserObjectType6.errors.txt    |    9 -
 .../parserPostfixUnaryExpression1.errors.txt  |   10 -
 .../reference/parserReturnStatement3.types    |    2 +-
 .../reference/parserS7.6.1.1_A1.10.errors.txt |   21 +
 .../reference/parserS7.6.1.1_A1.10.types      |   16 -
 ...rSetAccessorWithTypeAnnotation1.errors.txt |    2 +-
 ...rSetAccessorWithTypeParameters1.errors.txt |    2 +-
 .../parserSyntaxWalker.generated.errors.txt   |  334 ++
 .../parserSyntaxWalker.generated.types        |  281 --
 .../parserUnaryExpression1.errors.txt         |    4 -
 .../reference/parserUnaryExpression1.js       |    5 -
 .../parserUnaryExpression2.errors.txt         |    4 -
 .../reference/parserUnaryExpression2.js       |    6 -
 .../parserUnaryExpression3.errors.txt         |    4 -
 .../reference/parserUnaryExpression3.js       |    5 -
 .../parserUnaryExpression4.errors.txt         |    4 -
 .../reference/parserUnaryExpression4.js       |    5 -
 .../parserUnaryExpression5.errors.txt         |    6 -
 .../reference/parserUnaryExpression5.js       |    5 -
 .../reference/parserUnaryExpression6.js       |    4 -
 .../reference/parserUnaryExpression6.types    |    3 -
 .../parserUnaryExpression7.errors.txt         |    6 -
 .../reference/parserUnaryExpression7.js       |    5 -
 .../parserUnicodeWhitespaceCharacter1.types   |    2 +-
 .../reference/parserX_ArrowFunction4.js       |    8 -
 ...sWhenHittingUnexpectedSemicolon.errors.txt |    8 -
 .../reference/partiallyAmbientClodule.types   |    2 +-
 .../reference/partiallyAmbientFundule.types   |    2 +-
 .../plusOperatorWithBooleanType.types         |   12 +-
 .../plusOperatorWithNumberType.types          |   12 +-
 .../plusOperatorWithStringType.types          |   12 +-
 ...refixIncrementAsOperandOfPlusExpression.js |   11 -
 ...ixIncrementAsOperandOfPlusExpression.types |   17 -
 .../prespecializedGenericMembers1.types       |    4 +-
 .../reference/primtiveTypesAreIdentical.types |   44 +-
 .../privacyAccessorDeclFile.errors.txt        | 1130 ------
 .../reference/privacyAccessorDeclFile.js      | 3555 -----------------
 ...ivacyCannotNameAccessorDeclFile.errors.txt |  151 -
 ...rivacyCannotNameVarTypeDeclFile.errors.txt |  123 -
 .../privacyCheckAnonymousFunctionParameter.js |    4 -
 ...ivacyCheckAnonymousFunctionParameter.types |   14 +-
 ...privacyCheckAnonymousFunctionParameter2.js |    4 -
 ...vacyCheckAnonymousFunctionParameter2.types |    6 +-
 ...lbackOfInterfaceMethodWithTypeParameter.js |    8 -
 ...rtAssignmentOnExportedGenericInterface1.js |   11 -
 ...rtAssignmentOnExportedGenericInterface2.js |   10 -
 ...nalModuleExportAssignmentOfGenericClass.js |   14 -
 ...arameterReferenceInConstructorParameter.js |    9 -
 .../privacyCheckTypeOfFunction.errors.txt     |    8 +-
 .../reference/privacyCheckTypeOfFunction.js   |   12 -
 ...CheckTypeOfInvisibleModuleError.errors.txt |   11 -
 ...ivacyCheckTypeOfInvisibleModuleError.types |   17 +
 ...ivacyClassExtendsClauseDeclFile.errors.txt |  106 -
 .../privacyClassExtendsClauseDeclFile.js      |  351 --
 ...cyClassImplementsClauseDeclFile.errors.txt |  105 -
 .../privacyClassImplementsClauseDeclFile.js   |  239 --
 tests/baselines/reference/privacyFunc.types   |   30 +-
 ...CannotNameParameterTypeDeclFile.errors.txt |  203 -
 ...ionCannotNameReturnTypeDeclFile.errors.txt |  186 -
 ...rivacyFunctionParameterDeclFile.errors.txt |  805 ----
 .../privacyFunctionParameterDeclFile.js       | 1279 ------
 ...ivacyFunctionReturnTypeDeclFile.errors.txt | 1324 ------
 .../privacyFunctionReturnTypeDeclFile.js      | 2279 -----------
 .../reference/privacyGetter.errors.txt        |  304 ++
 tests/baselines/reference/privacyGetter.types |  410 --
 .../baselines/reference/privacyGloFunc.types  |   72 +-
 .../reference/privacyGloGetter.errors.txt     |  129 +
 .../reference/privacyGloGetter.types          |  174 -
 .../reference/privacyGloImport.errors.txt     |  145 +-
 .../privacyGloImportParseErrors.errors.txt    |  185 -
 .../reference/privacyImport.errors.txt        |  460 ++-
 .../privacyImportParseErrors.errors.txt       |  455 ---
 ...yInterfaceExtendsClauseDeclFile.errors.txt |  105 -
 .../privacyInterfaceExtendsClauseDeclFile.js  |   98 -
 ...ternalReferenceImportWithExport.errors.txt |  167 -
 ...calInternalReferenceImportWithExport.types |  537 +++
 ...nalReferenceImportWithoutExport.errors.txt |  163 -
 ...InternalReferenceImportWithoutExport.types |  537 +++
 ...tExternalModuleImportWithExport.errors.txt |   57 +
 ...elAmbientExternalModuleImportWithExport.js |   70 +-
 ...mbientExternalModuleImportWithExport.types |  113 -
 ...ternalModuleImportWithoutExport.errors.txt |   49 +
 ...mbientExternalModuleImportWithoutExport.js |   36 -
 ...entExternalModuleImportWithoutExport.types |  113 -
 ...ternalReferenceImportWithExport.errors.txt |  114 -
 ...velInternalReferenceImportWithExport.types |  312 ++
 ...nalReferenceImportWithoutExport.errors.txt |  111 -
 ...velInternalReferenceImportWithoutExport.js |    1 -
 ...InternalReferenceImportWithoutExport.types |  312 ++
 .../privacyTypeParameterOfFunction.errors.txt |  135 +
 .../privacyTypeParameterOfFunction.types      |  303 --
 ...TypeParameterOfFunctionDeclFile.errors.txt |  511 ---
 .../privacyTypeParameterOfFunctionDeclFile.js |  816 ----
 .../privacyTypeParametersOfClass.errors.txt   |   46 +
 .../privacyTypeParametersOfClass.types        |  104 -
 ...cyTypeParametersOfClassDeclFile.errors.txt |  163 -
 .../privacyTypeParametersOfClassDeclFile.js   |  383 --
 ...rivacyTypeParametersOfInterface.errors.txt |   61 +
 .../privacyTypeParametersOfInterface.js       |   83 -
 .../privacyTypeParametersOfInterface.types    |  199 -
 ...peParametersOfInterfaceDeclFile.errors.txt |  231 --
 ...rivacyTypeParametersOfInterfaceDeclFile.js |  265 --
 .../reference/privacyVarDeclFile.errors.txt   |  484 ---
 .../reference/promiseChaining.errors.txt      |  136 +
 .../baselines/reference/promiseChaining.types |   59 -
 .../reference/promiseChaining2.errors.txt     |   13 -
 tests/baselines/reference/promiseChaining2.js |   24 +-
 .../reference/promiseChaining2.types          |    3 +
 tests/baselines/reference/promiseTest.types   |    8 +-
 .../reference/promiseTypeInference.types      |    8 +-
 .../propagationOfPromiseInitialization.types  |   30 +-
 ...AccessOnTypeParameterWithConstraints.types |   12 +-
 ...ccessOnTypeParameterWithConstraints2.types |   12 +-
 ...essOnTypeParameterWithoutConstraints.types |   12 +-
 .../propertyNameWithoutTypeAnnotation.types   |    4 +-
 ...opertyParameterWithQuestionMark.errors.txt |   16 -
 .../protoAsIndexInIndexExpression.types       |   12 +-
 tests/baselines/reference/rectype.types       |   30 +-
 .../recursiveComplicatedClasses.types         |    4 +-
 .../reference/recursiveFunctionTypes1.types   |    6 +-
 .../recursiveGenericMethodCall.types          |    4 +-
 ...cursiveGenericSignatureInstantiation.types |    4 +-
 ...recursiveIdenticalOverloadResolution.types |   30 +-
 .../reference/recursiveInference1.types       |    8 +-
 tests/baselines/reference/recursiveMods.types |   14 +-
 .../reference/recursiveReturns.types          |   12 +-
 .../reference/regExpWithSlashInCharClass.js   |   10 -
 .../regExpWithSlashInCharClass.types          |   22 -
 .../reservedNameOnInterfaceImport.errors.txt  |   10 -
 .../reservedNameOnInterfaceImport.js          |   10 -
 .../reference/reservedNameOnModuleImport.js   |   10 -
 .../reservedNameOnModuleImport.types          |   13 -
 ...NameOnModuleImportWithInterface.errors.txt |   11 -
 ...reservedNameOnModuleImportWithInterface.js |   11 -
 tests/baselines/reference/reservedWords.types |   15 +-
 .../restParameterNoTypeAnnotation.types       |    2 +-
 .../baselines/reference/restParameters.types  |    8 +-
 .../reference/returnStatement1.types          |    6 +-
 .../reference/returnStatements.types          |   24 +-
 .../returnTypeParameterWithModules.types      |   12 +-
 ...seInferenceInContextualInstantiation.types |    4 +-
 .../reference/scannerES3NumericLiteral1.js    |    5 -
 .../reference/scannerES3NumericLiteral1.types |    3 -
 .../reference/scannerES3NumericLiteral2.js    |    5 -
 .../reference/scannerES3NumericLiteral2.types |    3 -
 .../scannerES3NumericLiteral3.errors.txt      |    4 -
 .../scannerES3NumericLiteral4.errors.txt      |    4 -
 .../reference/scannerES3NumericLiteral5.js    |    5 -
 .../reference/scannerES3NumericLiteral5.types |    3 -
 .../scannerES3NumericLiteral6.errors.txt      |    4 -
 .../reference/scannerES3NumericLiteral7.js    |    5 -
 .../reference/scannerES3NumericLiteral7.types |    3 -
 .../scannerNumericLiteral2.errors.txt         |    4 -
 .../reference/scannerNumericLiteral2.js       |    5 +
 .../reference/scannerNumericLiteral2.types    |    3 +
 .../scannerNumericLiteral3.errors.txt         |    4 +-
 .../scannerNumericLiteral8.errors.txt         |    4 -
 .../scannerNumericLiteral9.errors.txt         |    6 -
 .../scopeResolutionIdentifiers.types          |    2 +-
 tests/baselines/reference/selfInLambdas.types |   52 +-
 tests/baselines/reference/separate1-2.types   |    2 +-
 .../sourceMap-FileWithComments.types          |    2 +-
 .../reference/sourceMap-SkippedNode.js        |   13 -
 .../reference/sourceMap-SkippedNode.js.map    |    2 -
 .../sourceMap-SkippedNode.sourcemap.txt       |   52 -
 .../reference/sourceMap-SkippedNode.types     |    7 -
 .../sourceMapValidationClass.errors.txt       |   23 +
 .../reference/sourceMapValidationClass.js     |   49 -
 .../reference/sourceMapValidationClass.js.map |    2 -
 .../sourceMapValidationClass.sourcemap.txt    |  388 --
 .../reference/sourceMapValidationClass.types  |   52 -
 .../sourceMapValidationClasses.types          |    6 +-
 ...ceMapValidationExportAssignmentCommonjs.js |   14 -
 ...pValidationExportAssignmentCommonjs.js.map |    2 -
 ...tionExportAssignmentCommonjs.sourcemap.txt |   89 -
 ...apValidationExportAssignmentCommonjs.types |   10 -
 ...urceMapValidationFunctionExpressions.types |    5 +-
 .../sourceMapValidationFunctions.types        |    6 +-
 .../reference/sourceMapValidationModule.types |    2 +-
 .../sourceMapValidationWithComments.types     |    2 +-
 ...rceMapWithMultipleFilesWithCopyright.types |    5 +-
 ...cializationsShouldNotAffectEachOther.types |    2 +-
 .../reference/specializeVarArgs1.types        |    4 +-
 .../specializedLambdaTypeArguments.errors.txt |    9 +
 .../specializedLambdaTypeArguments.js         |    2 +-
 .../specializedLambdaTypeArguments.types      |   16 -
 .../specializedSignatureInInterface.js        |   11 -
 .../specializedSignatureInInterface.types     |   18 -
 ...reIsSubtypeOfNonSpecializedSignature.types |    6 +-
 .../reference/staticAndMemberFunctions.types  |    2 +-
 ...staticAndNonStaticPropertiesSameName.types |    2 +-
 .../baselines/reference/staticFactory1.types  |    6 +-
 tests/baselines/reference/staticGetter2.types |    2 +-
 .../reference/staticInheritance.types         |   10 +-
 .../reference/staticInstanceResolution.types  |    2 +-
 .../reference/staticInstanceResolution3.types |    6 +-
 .../staticInterfaceAssignmentCompat.types     |    2 +-
 .../staticMemberAccessOffDerivedType1.types   |    6 +-
 ...dWithTypeParameterExtendsClauseDeclFile.js |   66 -
 ...thTypeParameterExtendsClauseDeclFile.types |   44 -
 tests/baselines/reference/stradac.types       |    2 +-
 tests/baselines/reference/strictMode2.types   |    2 +-
 tests/baselines/reference/strictMode3.types   |    2 +-
 tests/baselines/reference/strictMode5.js      |   46 -
 tests/baselines/reference/strictMode5.types   |   40 -
 ...ralPropertyNameWithLineContinuation1.types |    3 +-
 .../reference/stringNamedPropertyAccess.types |    4 +-
 .../reference/stringPropCodeGen.types         |    7 +-
 tests/baselines/reference/structural1.types   |    4 +-
 .../subtypingWithCallSignatures.types         |   16 +-
 .../subtypingWithCallSignatures2.types        |  108 +-
 .../subtypingWithCallSignatures3.types        |   68 +-
 .../subtypingWithCallSignatures4.types        |   66 +-
 .../subtypingWithConstructSignatures.types    |   16 +-
 .../subtypingWithConstructSignatures2.types   |  108 +-
 .../subtypingWithConstructSignatures3.types   |   68 +-
 .../subtypingWithConstructSignatures4.types   |   66 +-
 .../subtypingWithOptionalProperties.types     |    4 +-
 .../reference/superAccessInFatArrow1.types    |    8 +-
 ...FromClassThatDerivesFromGenericType1.types |    2 +-
 tests/baselines/reference/superCalls.types    |    4 +-
 .../reference/superWithGenerics.types         |    2 +-
 .../reference/switchFallThroughs.types        |    2 +-
 .../reference/switchStatements.types          |   10 +-
 ...hStatementsWithMultipleDefaults.errors.txt |   50 -
 .../baselines/reference/targetTypeArgs.types  |    4 +-
 .../reference/targetTypeObjectLiteral.types   |   18 +-
 .../targetTypeObjectLiteralToAny.types        |   10 +-
 .../baselines/reference/targetTypeTest2.types |    6 +-
 .../reference/testContainerList.types         |   13 -
 tests/baselines/reference/thisBinding2.types  |   50 +-
 tests/baselines/reference/thisCapture1.types  |   16 +-
 .../thisExpressionInIndexExpression.types     |    2 +-
 .../thisInGenericStaticMembers.types          |   16 +-
 .../reference/thisInInnerFunctions.types      |    7 +-
 tests/baselines/reference/thisInLambda.types  |   26 +-
 .../reference/thisInModuleFunction1.types     |    6 +-
 .../reference/thisInObjectLiterals.types      |   10 +-
 .../thisInPropertyBoundDeclarations.types     |   73 +-
 .../reference/thisInStaticMethod1.types       |    6 +-
 ...rencedInFunctionInsideArrowFunction1.types |    9 +-
 .../throwInEnclosingStatements.types          |   13 +-
 .../baselines/reference/throwStatements.types |   22 +-
 .../baselines/reference/topLevelExports.types |    4 +-
 .../baselines/reference/topLevelLambda2.types |    4 +-
 .../baselines/reference/trailingCommasES3.js  |   25 -
 .../reference/trailingCommasES3.types         |   47 -
 .../baselines/reference/trailingCommasES5.js  |   25 -
 .../reference/trailingCommasES5.types         |   47 -
 tests/baselines/reference/tryStatements.types |    2 +-
 ...notationBestCommonTypeInArrayLiteral.types |   28 +-
 .../reference/typeArgInference2.types         |   14 +-
 .../reference/typeArgInferenceWithNull.types  |   12 +-
 .../reference/typeArgumentInference.types     |  106 +-
 .../typeArgumentInferenceOrdering.types       |    4 +-
 ...tInferenceWithConstraintAsCommonRoot.types |    4 +-
 .../typeArgumentsInFunctionExpressions.types  |   10 +-
 ...ssionWithUndefinedCallResolutionData.types |    6 +-
 .../typeInferenceConflictingCandidates.types  |    4 +-
 .../reference/typeInferenceFixEarly.types     |    4 +-
 .../typeInferenceReturnTypeCallback.types     |    8 +-
 .../typeInferenceWithTypeAnnotation.types     |    4 +-
 .../typeOfThisInFunctionExpression.types      |   34 +-
 .../typeOfThisInMemberFunctions.types         |    6 +-
 .../reference/typeOfThisInStaticMembers.types |   20 +-
 .../typeParameterAndArgumentOfSameName1.types |    2 +-
 .../typeParameterAsElementType.types          |    2 +-
 .../typeParameterAsTypeArgument.types         |    4 +-
 ...sTypeParameterConstraintTransitively.types |   20 +-
 ...TypeParameterConstraintTransitively2.types |   18 +-
 ...eterCompatibilityAccrossDeclarations.types |    8 +-
 ...ameterWithInvalidConstraintType.errors.txt |   13 -
 ...peParametersAreIdenticalToThemselves.types |   14 +-
 ...typeParametersAvailableInNestedScope.types |    5 +-
 ...ypeParametersAvailableInNestedScope2.types |    2 +-
 .../reference/typeQueryWithReservedWords.js   |   29 -
 .../typeQueryWithReservedWords.types          |   37 -
 tests/baselines/reference/typeofClass2.types  |   10 +-
 .../typeofOperatorWithBooleanType.types       |   18 +-
 .../typeofOperatorWithNumberType.types        |   18 +-
 .../typeofOperatorWithStringType.types        |   18 +-
 .../reference/uncaughtCompilerError1.types    |    2 +-
 .../undefinedArgumentInference.types          |    4 +-
 .../undefinedAssignableToEveryType.types      |    2 +-
 .../undefinedInferentialTyping.types          |    4 +-
 .../reference/underscoreMapFirst.types        |   18 +-
 .../baselines/reference/underscoreTest1.types |  102 +-
 .../untypedArgumentInLambdaExpression.types   |   12 +-
 .../reference/unusedImportDeclaration.js      |    8 -
 .../reference/unusedImportDeclaration.types   |    8 +-
 .../validMultipleVariableDeclarations.types   |    2 +-
 .../reference/validUndefinedAssignments.types |    2 +-
 .../reference/varArgParamTypeCheck.types      |   56 +-
 .../varInFunctionInVarInitializer.types       |    5 +-
 tests/baselines/reference/vardecl.types       |    2 +-
 .../reference/variableDeclarator1.types       |    5 +-
 .../visibilityOfCrossModuleTypeUsage.types    |    2 +-
 .../voidFunctionAssignmentCompat.types        |    8 +-
 .../voidOperatorWithBooleanType.types         |   12 +-
 .../voidOperatorWithNumberType.types          |   12 +-
 .../voidOperatorWithStringType.types          |   12 +-
 .../reference/voidReturnLambdaValue.types     |    2 +-
 .../baselines/reference/withImportDecl.types  |   10 +-
 .../accessorParameterAccessibilityModifier.ts |    2 +-
 .../cases/compiler/accessorWithInitializer.ts |    2 +-
 tests/cases/compiler/accessorWithRestParam.ts |    2 -
 .../cases/compiler/aliasInaccessibleModule.ts |    1 -
 .../compiler/aliasInaccessibleModule2.ts      |    1 -
 .../compiler/aliasUsageInAccessorsOfClass.ts  |    1 -
 ...entExternalModuleWithRelativeModuleName.ts |    4 -
 tests/cases/compiler/ambientGetters.ts        |    2 -
 tests/cases/compiler/amdDependencyComment2.ts |    5 -
 .../arrowFunctionMissingCurlyWithSemicolon.ts |    4 -
 .../compiler/arrowFunctionsMissingTokens.ts   |   66 -
 .../compiler/asiAmbientFunctionDeclaration.ts |    1 -
 tests/cases/compiler/asiBreak.ts              |    1 -
 tests/cases/compiler/asiContinue.ts           |    1 -
 tests/cases/compiler/asiReturn.ts             |    2 -
 .../compiler/assignmentCompatability24.ts     |    2 +-
 .../compiler/assignmentCompatability33.ts     |    2 +-
 .../compiler/assignmentCompatability34.ts     |    2 +-
 .../compiler/assignmentCompatability37.ts     |    2 +-
 .../compiler/assignmentCompatability38.ts     |    2 +-
 tests/cases/compiler/augmentArray.ts          |    3 -
 .../autoAsiForStaticsInClassDeclaration.ts    |    4 -
 tests/cases/compiler/badArraySyntax.ts        |    2 +-
 .../breakInIterationOrSwitchStatement1.ts     |    3 +
 .../breakInIterationOrSwitchStatement2.ts     |    4 +
 .../breakInIterationOrSwitchStatement3.ts     |    3 +
 .../breakInIterationOrSwitchStatement4.ts     |    3 +
 .../breakNotInIterationOrSwitchStatement1.ts  |    1 +
 .../breakNotInIterationOrSwitchStatement2.ts  |    5 +
 tests/cases/compiler/breakTarget1.ts          |    2 +
 tests/cases/compiler/breakTarget2.ts          |    4 +
 tests/cases/compiler/breakTarget3.ts          |    5 +
 tests/cases/compiler/breakTarget4.ts          |    5 +
 tests/cases/compiler/breakTarget5.ts          |    8 +
 tests/cases/compiler/breakTarget6.ts          |    3 +
 .../cases/compiler/captureThisInSuperCall.ts  |    8 -
 .../compiler/castExpressionParentheses.ts     |    2 +-
 tests/cases/compiler/chainedImportAlias.ts    |    7 +-
 .../classImplementsImportedInterface.ts       |   12 -
 .../compiler/commentsDottedModuleName.ts      |   11 -
 .../compiler/commentsMultiModuleMultiFile.ts  |    4 +-
 tests/cases/compiler/complicatedPrivacy.ts    |    1 -
 .../cases/compiler/constructorArgsErrors3.ts  |    4 -
 .../cases/compiler/constructorArgsErrors4.ts  |    4 -
 .../cases/compiler/constructorArgsErrors5.ts  |    4 -
 .../constructorsWithSpecializedSignatures.ts  |   43 -
 .../contextualSignatureInstantiation3.ts      |   22 -
 tests/cases/compiler/contextualTyping.ts      |    3 +-
 .../compiler/continueInIterationStatement1.ts |    3 +
 .../compiler/continueInIterationStatement2.ts |    4 +
 .../compiler/continueInIterationStatement3.ts |    3 +
 .../compiler/continueInIterationStatement4.ts |    3 +
 tests/cases/compiler/continueLabel.ts         |    3 +
 .../continueNotInIterationStatement1.ts       |    1 +
 .../continueNotInIterationStatement2.ts       |    5 +
 .../continueNotInIterationStatement3.ts       |    4 +
 .../continueNotInIterationStatement4.ts       |    6 +
 tests/cases/compiler/continueTarget1.ts       |    2 +
 tests/cases/compiler/continueTarget2.ts       |    4 +
 tests/cases/compiler/continueTarget3.ts       |    5 +
 tests/cases/compiler/continueTarget4.ts       |    5 +
 tests/cases/compiler/continueTarget5.ts       |    8 +
 tests/cases/compiler/continueTarget6.ts       |    3 +
 tests/cases/compiler/convertKeywordsYes.ts    |    8 +
 tests/cases/compiler/cyclicModuleImport.ts    |    1 -
 tests/cases/compiler/declFileAccessors.ts     |  104 -
 .../cases/compiler/declFileCallSignatures.ts  |   68 -
 .../compiler/declFileConstructSignatures.ts   |   68 -
 tests/cases/compiler/declFileConstructors.ts  |  100 -
 tests/cases/compiler/declFileFunctions.ts     |   62 -
 .../declFileImportChainInExportAssignment.ts  |   11 -
 .../cases/compiler/declFileIndexSignatures.ts |   38 -
 tests/cases/compiler/declFileMethods.ts       |  192 -
 .../compiler/declarationEmit_nameConflicts.ts |    4 +-
 .../declarationEmit_nameConflicts2.ts         |    1 +
 .../declarationEmit_nameConflicts3.ts         |    2 +-
 .../declarationEmit_nameConflictsWithAlias.ts |    2 +-
 ...tAssignmentWithVarFromVariableStatement.ts |   20 -
 tests/cases/compiler/duplicateLabel1.ts       |    4 +
 tests/cases/compiler/duplicateLabel2.ts       |    6 +
 tests/cases/compiler/duplicateLabel3.ts       |    8 +
 tests/cases/compiler/duplicateLabel4.ts       |    7 +
 .../duplicatePropertiesInStrictMode.ts        |    5 -
 tests/cases/compiler/duplicateVarAndImport.ts |    5 -
 .../cases/compiler/duplicateVarAndImport2.ts  |    4 -
 tests/cases/compiler/emitBOM.ts               |    6 -
 tests/cases/compiler/emptyTypeArgumentList.ts |    2 -
 .../compiler/emptyTypeArgumentListWithNew.ts  |    2 -
 tests/cases/compiler/enumBasics1.ts           |    2 +-
 .../compiler/enumInitializersWithExponents.ts |    9 -
 ...AssignmentWithDeclareAndExportModifiers.ts |    2 -
 .../exportAssignmentWithDeclareModifier.ts    |    2 -
 .../exportAssignmentWithExportModifier.ts     |    2 -
 .../fileReferencesWithNoExtensions.ts         |   19 -
 .../functionAndInterfaceWithSeparateErrors.ts |    7 -
 ...nsMissingReturnStatementsAndExpressions.ts |  119 -
 .../genericTypeWithCallableMembers.ts         |    2 +-
 .../implementGenericWithMismatchedTypes.ts    |    2 +-
 tests/cases/compiler/importDecl.ts            |    1 +
 .../compiler/indexSignatureTypeInference.ts   |   19 -
 ...nheritedOverloadedSpecializedSignatures.ts |   36 -
 .../internalAliasWithDottedNameEmit.ts        |    1 -
 .../compiler/missingRequiredDeclare.d.ts      |    1 +
 tests/cases/compiler/mixedExports.ts          |   16 -
 tests/cases/compiler/moduleSymbolMerging.ts   |   12 -
 tests/cases/compiler/multiImportExport.ts     |    2 -
 .../nameCollisionsInPropertyAssignments.ts    |    2 -
 tests/cases/compiler/noCatchBlock.ts          |    7 -
 tests/cases/compiler/noImplicitAnyForIn.ts    |   32 -
 tests/cases/compiler/noImplicitAnyIndexing.ts |   49 -
 .../noImplicitAnyParametersInAmbientClass.ts  |   93 -
 ...ImplicitAnyParametersInAmbientFunctions.ts |   45 -
 .../noImplicitAnyParametersInAmbientModule.ts |   47 -
 .../noImplicitAnyParametersInBareFunctions.ts |   45 -
 .../noImplicitAnyParametersInClass.ts         |   93 -
 .../noImplicitAnyParametersInInterface.ts     |   52 -
 .../noImplicitAnyParametersInModule.ts        |   47 -
 ...sInDifferentContainersDisagreeOnAmbient.ts |    8 -
 ...sRecoversWhenHittingUnexpectedSemicolon.ts |    4 -
 ...refixIncrementAsOperandOfPlusExpression.ts |    4 -
 .../cases/compiler/privacyAccessorDeclFile.ts | 1061 -----
 .../privacyCannotNameAccessorDeclFile.ts      |  138 -
 .../privacyCannotNameVarTypeDeclFile.ts       |  101 -
 .../privacyCheckAnonymousFunctionParameter.ts |    1 -
 ...privacyCheckAnonymousFunctionParameter2.ts |    1 -
 ...lbackOfInterfaceMethodWithTypeParameter.ts |    1 -
 ...rtAssignmentOnExportedGenericInterface1.ts |    1 -
 ...rtAssignmentOnExportedGenericInterface2.ts |    1 -
 ...nalModuleExportAssignmentOfGenericClass.ts |    1 -
 ...arameterReferenceInConstructorParameter.ts |    1 -
 .../compiler/privacyCheckTypeOfFunction.ts    |    2 -
 .../privacyCheckTypeOfInvisibleModuleError.ts |    1 -
 .../privacyClassExtendsClauseDeclFile.ts      |   97 -
 .../privacyClassImplementsClauseDeclFile.ts   |   94 -
 ...FunctionCannotNameParameterTypeDeclFile.ts |  157 -
 ...acyFunctionCannotNameReturnTypeDeclFile.ts |  163 -
 .../privacyFunctionParameterDeclFile.ts       |  687 ----
 .../privacyFunctionReturnTypeDeclFile.ts      | 1194 ------
 tests/cases/compiler/privacyGetter.ts         |    1 -
 tests/cases/compiler/privacyGloGetter.ts      |    1 -
 tests/cases/compiler/privacyGloImport.ts      |   98 +-
 .../compiler/privacyGloImportParseErrors.ts   |  153 -
 tests/cases/compiler/privacyImport.ts         |  357 +-
 .../compiler/privacyImportParseErrors.ts      |  357 --
 .../privacyInterfaceExtendsClauseDeclFile.ts  |   94 -
 ...yLocalInternalReferenceImportWithExport.ts |    1 -
 ...calInternalReferenceImportWithoutExport.ts |    1 -
 ...elAmbientExternalModuleImportWithExport.ts |   19 +-
 ...mbientExternalModuleImportWithoutExport.ts |    3 -
 ...pLevelInternalReferenceImportWithExport.ts |    1 -
 ...velInternalReferenceImportWithoutExport.ts |    2 -
 .../privacyTypeParameterOfFunction.ts         |    1 -
 .../privacyTypeParameterOfFunctionDeclFile.ts |  440 --
 .../compiler/privacyTypeParametersOfClass.ts  |    1 -
 .../privacyTypeParametersOfClassDeclFile.ts   |  155 -
 .../privacyTypeParametersOfInterface.ts       |    1 -
 ...rivacyTypeParametersOfInterfaceDeclFile.ts |  192 -
 tests/cases/compiler/privacyVarDeclFile.ts    |  426 --
 tests/cases/compiler/promiseChaining.ts       |   24 +
 tests/cases/compiler/promiseChaining2.ts      |   10 -
 .../propertyParameterWithQuestionMark.ts      |    9 -
 .../compiler/regExpWithSlashInCharClass.ts    |    3 -
 .../compiler/reservedNameOnInterfaceImport.ts |    6 -
 .../compiler/reservedNameOnModuleImport.ts    |    6 -
 ...reservedNameOnModuleImportWithInterface.ts |    7 -
 tests/cases/compiler/sourceMap-SkippedNode.ts |    6 -
 .../compiler/sourceMapValidationClass.ts      |    1 -
 ...ceMapValidationExportAssignmentCommonjs.ts |    6 -
 .../specializedLambdaTypeArguments.ts         |    2 +-
 .../specializedSignatureInInterface.ts        |    8 -
 ...dWithTypeParameterExtendsClauseDeclFile.ts |   22 -
 tests/cases/compiler/strictMode5.ts           |   18 -
 .../switchStatementsWithMultipleDefaults.ts   |   31 -
 tests/cases/compiler/testContainerList.ts     |    6 -
 tests/cases/compiler/trailingCommasES3.ts     |   13 -
 tests/cases/compiler/trailingCommasES5.ts     |   13 -
 .../typeParameterWithInvalidConstraintType.ts |   10 -
 .../cases/compiler/unusedImportDeclaration.ts |    1 -
 .../classExtendingPrimitive2.ts               |    4 -
 .../classExtendsEveryObjectType2.ts           |    3 -
 .../Accessors/parserES3Accessors1.ts          |    3 -
 .../Accessors/parserES3Accessors2.ts          |    3 -
 .../Accessors/parserES3Accessors3.ts          |    1 -
 .../Accessors/parserES3Accessors4.ts          |    1 -
 .../ecmascript5/Accessors/parserAccessors1.ts |    1 -
 .../Accessors/parserAccessors10.ts            |    1 -
 .../ecmascript5/Accessors/parserAccessors2.ts |    1 -
 .../ecmascript5/Accessors/parserAccessors3.ts |    1 -
 .../ecmascript5/Accessors/parserAccessors4.ts |    1 -
 .../ecmascript5/Accessors/parserAccessors5.ts |    1 -
 .../ecmascript5/Accessors/parserAccessors6.ts |    1 -
 .../ecmascript5/Accessors/parserAccessors7.ts |    1 -
 .../ecmascript5/Accessors/parserAccessors8.ts |    1 -
 .../ecmascript5/Accessors/parserAccessors9.ts |    1 -
 .../parserGetAccessorWithTypeParameters1.ts   |    1 -
 .../parserSetAccessorWithTypeAnnotation1.ts   |    1 -
 .../parserSetAccessorWithTypeParameters1.ts   |    1 -
 .../parserConstructorDeclaration11.ts         |    3 -
 ...rX_ArrowFunction1.ts => ArrowFunction1.ts} |    0
 ...rX_ArrowFunction2.ts => ArrowFunction2.ts} |    0
 ...rX_ArrowFunction3.ts => ArrowFunction3.ts} |    0
 ...rX_ArrowFunction4.ts => ArrowFunction4.ts} |    0
 ...rrorRecovery_ExtendsOrImplementsClause6.ts |    1 -
 ...eArgumentList1.ts => TypeArgumentList1.ts} |    0
 .../parserAssignmentExpression1.ts            |    1 -
 .../Expressions/parserObjectCreation2.ts      |    1 -
 .../parserPostfixUnaryExpression1.ts          |    1 -
 .../Expressions/parserUnaryExpression1.ts     |    1 -
 .../Expressions/parserUnaryExpression2.ts     |    1 -
 .../Expressions/parserUnaryExpression3.ts     |    1 -
 .../Expressions/parserUnaryExpression4.ts     |    1 -
 .../Expressions/parserUnaryExpression5.ts     |    1 -
 .../Expressions/parserUnaryExpression6.ts     |    0
 .../Expressions/parserUnaryExpression7.ts     |    1 -
 .../parserMemberAccessor1.ts                  |    1 -
 .../parserMemberAccessorDeclaration1.ts       |    1 -
 .../parserMemberAccessorDeclaration10.ts      |    1 -
 .../parserMemberAccessorDeclaration11.ts      |    1 -
 .../parserMemberAccessorDeclaration12.ts      |    1 -
 .../parserMemberAccessorDeclaration13.ts      |    1 -
 .../parserMemberAccessorDeclaration14.ts      |    1 -
 .../parserMemberAccessorDeclaration15.ts      |    1 -
 .../parserMemberAccessorDeclaration16.ts      |    1 -
 .../parserMemberAccessorDeclaration17.ts      |    1 -
 .../parserMemberAccessorDeclaration18.ts      |    1 -
 .../parserMemberAccessorDeclaration2.ts       |    1 -
 .../parserMemberAccessorDeclaration3.ts       |    1 -
 .../parserMemberAccessorDeclaration4.ts       |    1 -
 .../parserMemberAccessorDeclaration5.ts       |    1 -
 .../parserMemberAccessorDeclaration6.ts       |    1 -
 .../parserMemberAccessorDeclaration7.ts       |    1 -
 .../parserMemberAccessorDeclaration8.ts       |    1 -
 .../parserMemberAccessorDeclaration9.ts       |    1 -
 .../ObjectLiterals/parserObjectLiterals1.ts   |    1 -
 .../ObjectTypes/parserObjectType5.ts          |    4 -
 .../ObjectTypes/parserObjectType6.ts          |    4 -
 .../parserReturnStatement4.js                 |    3 -
 .../Statements/parserDoStatement2.ts          |    1 -
 .../Statements/parserForStatement4.ts         |    2 -
 .../Statements/parserForStatement5.ts         |    2 -
 .../Statements/parserForStatement6.ts         |    2 -
 .../Statements/parserForStatement7.ts         |    2 -
 .../Statements/parserForStatement8.ts         |    2 -
 .../StrictMode/octalLiteralInStrictModeES3.ts |    2 -
 .../parserKeywordsAsIdentifierName2.ts        |    2 +-
 .../ecmascript5/parserS7.6.1.1_A1.10.ts       |    2 +-
 .../parserSyntaxWalker.generated.ts           |  452 +--
 .../ecmascript3/scannerES3NumericLiteral1.ts  |    1 -
 .../ecmascript3/scannerES3NumericLiteral2.ts  |    1 -
 .../ecmascript3/scannerES3NumericLiteral3.ts  |    1 -
 .../ecmascript3/scannerES3NumericLiteral4.ts  |    1 -
 .../ecmascript3/scannerES3NumericLiteral5.ts  |    1 -
 .../ecmascript3/scannerES3NumericLiteral6.ts  |    1 -
 .../ecmascript3/scannerES3NumericLiteral7.ts  |    1 -
 .../ecmascript5/scannerNumericLiteral1.ts     |    1 -
 .../ecmascript5/scannerNumericLiteral2.ts     |    1 -
 .../ecmascript5/scannerNumericLiteral3.ts     |    1 -
 .../ecmascript5/scannerNumericLiteral4.ts     |    1 -
 .../ecmascript5/scannerNumericLiteral5.ts     |    1 -
 .../ecmascript5/scannerNumericLiteral6.ts     |    1 -
 .../ecmascript5/scannerNumericLiteral7.ts     |    1 -
 .../ecmascript5/scannerNumericLiteral8.ts     |    2 -
 .../ecmascript5/scannerNumericLiteral9.ts     |    2 -
 .../tryStatements/invalidTryStatements2.ts    |   21 +-
 .../types/members/duplicateStringIndexers.ts  |   59 +-
 ...hOnlyPublicMembersEquivalentToInterface.ts |    1 -
 ...OnlyPublicMembersEquivalentToInterface2.ts |    1 -
 .../typeQueries/typeQueryWithReservedWords.ts |   14 -
 .../assignmentCompatWithObjectMembers.ts      |   85 +
 1278 files changed, 10852 insertions(+), 40071 deletions(-)
 rename tests/baselines/reference/{parserX_ArrowFunction1.errors.txt => ArrowFunction1.errors.txt} (66%)
 rename tests/baselines/reference/{parserX_ArrowFunction2.errors.txt => ArrowFunction2.errors.txt} (73%)
 rename tests/baselines/reference/{parserX_ArrowFunction3.errors.txt => ArrowFunction3.errors.txt} (74%)
 create mode 100644 tests/baselines/reference/ArrowFunction4.js
 rename tests/baselines/reference/{parserX_ArrowFunction4.types => ArrowFunction4.types} (59%)
 rename tests/baselines/reference/{parserX_TypeArgumentList1.errors.txt => TypeArgumentList1.errors.txt} (72%)
 delete mode 100644 tests/baselines/reference/aliasInaccessibleModule.errors.txt
 create mode 100644 tests/baselines/reference/aliasInaccessibleModule.types
 delete mode 100644 tests/baselines/reference/aliasInaccessibleModule2.errors.txt
 create mode 100644 tests/baselines/reference/aliasInaccessibleModule2.types
 create mode 100644 tests/baselines/reference/aliasUsageInAccessorsOfClass.errors.txt
 delete mode 100644 tests/baselines/reference/aliasUsageInAccessorsOfClass.js
 delete mode 100644 tests/baselines/reference/aliasUsageInAccessorsOfClass.types
 delete mode 100644 tests/baselines/reference/amdDependencyComment2.errors.txt
 delete mode 100644 tests/baselines/reference/arrowFunctionMissingCurlyWithSemicolon.errors.txt
 delete mode 100644 tests/baselines/reference/arrowFunctionsMissingTokens.errors.txt
 delete mode 100644 tests/baselines/reference/asiAmbientFunctionDeclaration.js
 delete mode 100644 tests/baselines/reference/asiAmbientFunctionDeclaration.types
 delete mode 100644 tests/baselines/reference/asiBreak.js
 delete mode 100644 tests/baselines/reference/asiBreak.types
 delete mode 100644 tests/baselines/reference/asiContinue.js
 delete mode 100644 tests/baselines/reference/asiContinue.types
 delete mode 100644 tests/baselines/reference/asiReturn.errors.txt
 create mode 100644 tests/baselines/reference/assignmentCompatWithObjectMembers.js
 create mode 100644 tests/baselines/reference/assignmentCompatWithObjectMembers.types
 delete mode 100644 tests/baselines/reference/augmentArray.js
 delete mode 100644 tests/baselines/reference/augmentArray.types
 delete mode 100644 tests/baselines/reference/autoAsiForStaticsInClassDeclaration.js
 delete mode 100644 tests/baselines/reference/autoAsiForStaticsInClassDeclaration.types
 create mode 100644 tests/baselines/reference/breakInIterationOrSwitchStatement1.js
 create mode 100644 tests/baselines/reference/breakInIterationOrSwitchStatement1.types
 create mode 100644 tests/baselines/reference/breakInIterationOrSwitchStatement2.js
 create mode 100644 tests/baselines/reference/breakInIterationOrSwitchStatement2.types
 create mode 100644 tests/baselines/reference/breakInIterationOrSwitchStatement3.js
 create mode 100644 tests/baselines/reference/breakInIterationOrSwitchStatement3.types
 create mode 100644 tests/baselines/reference/breakInIterationOrSwitchStatement4.errors.txt
 create mode 100644 tests/baselines/reference/breakInIterationOrSwitchStatement4.js
 create mode 100644 tests/baselines/reference/breakNotInIterationOrSwitchStatement1.errors.txt
 create mode 100644 tests/baselines/reference/breakNotInIterationOrSwitchStatement2.errors.txt
 create mode 100644 tests/baselines/reference/breakTarget1.js
 create mode 100644 tests/baselines/reference/breakTarget1.types
 create mode 100644 tests/baselines/reference/breakTarget2.js
 create mode 100644 tests/baselines/reference/breakTarget2.types
 create mode 100644 tests/baselines/reference/breakTarget3.js
 create mode 100644 tests/baselines/reference/breakTarget3.types
 create mode 100644 tests/baselines/reference/breakTarget4.js
 create mode 100644 tests/baselines/reference/breakTarget4.types
 create mode 100644 tests/baselines/reference/breakTarget5.errors.txt
 create mode 100644 tests/baselines/reference/breakTarget6.errors.txt
 delete mode 100644 tests/baselines/reference/captureThisInSuperCall.js
 delete mode 100644 tests/baselines/reference/captureThisInSuperCall.types
 create mode 100644 tests/baselines/reference/castExpressionParentheses.errors.txt
 delete mode 100644 tests/baselines/reference/castExpressionParentheses.types
 delete mode 100644 tests/baselines/reference/classExtendingPrimitive2.errors.txt
 delete mode 100644 tests/baselines/reference/classExtendsEveryObjectType2.errors.txt
 delete mode 100644 tests/baselines/reference/classImplementsImportedInterface.js
 delete mode 100644 tests/baselines/reference/classImplementsImportedInterface.types
 create mode 100644 tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface.errors.txt
 delete mode 100644 tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface.types
 create mode 100644 tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface2.errors.txt
 delete mode 100644 tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface2.types
 delete mode 100644 tests/baselines/reference/commentsDottedModuleName.types
 create mode 100644 tests/baselines/reference/commentsMultiModuleMultiFile.errors.txt
 delete mode 100644 tests/baselines/reference/commentsMultiModuleMultiFile.types
 delete mode 100644 tests/baselines/reference/constructorArgsErrors3.errors.txt
 delete mode 100644 tests/baselines/reference/constructorArgsErrors4.errors.txt
 delete mode 100644 tests/baselines/reference/constructorArgsErrors5.errors.txt
 delete mode 100644 tests/baselines/reference/constructorsWithSpecializedSignatures.errors.txt
 delete mode 100644 tests/baselines/reference/contextualSignatureInstantiation3.types
 create mode 100644 tests/baselines/reference/continueInIterationStatement1.js
 create mode 100644 tests/baselines/reference/continueInIterationStatement1.types
 create mode 100644 tests/baselines/reference/continueInIterationStatement2.js
 create mode 100644 tests/baselines/reference/continueInIterationStatement2.types
 create mode 100644 tests/baselines/reference/continueInIterationStatement3.js
 create mode 100644 tests/baselines/reference/continueInIterationStatement3.types
 create mode 100644 tests/baselines/reference/continueInIterationStatement4.errors.txt
 create mode 100644 tests/baselines/reference/continueInIterationStatement4.js
 create mode 100644 tests/baselines/reference/continueLabel.js
 create mode 100644 tests/baselines/reference/continueLabel.types
 create mode 100644 tests/baselines/reference/continueNotInIterationStatement1.errors.txt
 create mode 100644 tests/baselines/reference/continueNotInIterationStatement2.errors.txt
 create mode 100644 tests/baselines/reference/continueNotInIterationStatement3.errors.txt
 create mode 100644 tests/baselines/reference/continueNotInIterationStatement4.errors.txt
 create mode 100644 tests/baselines/reference/continueTarget1.errors.txt
 create mode 100644 tests/baselines/reference/continueTarget2.js
 create mode 100644 tests/baselines/reference/continueTarget2.types
 create mode 100644 tests/baselines/reference/continueTarget3.js
 create mode 100644 tests/baselines/reference/continueTarget3.types
 create mode 100644 tests/baselines/reference/continueTarget4.js
 create mode 100644 tests/baselines/reference/continueTarget4.types
 create mode 100644 tests/baselines/reference/continueTarget5.errors.txt
 create mode 100644 tests/baselines/reference/continueTarget6.errors.txt
 create mode 100644 tests/baselines/reference/convertKeywordsYes.errors.txt
 delete mode 100644 tests/baselines/reference/convertKeywordsYes.types
 delete mode 100644 tests/baselines/reference/declFileAccessors.types
 delete mode 100644 tests/baselines/reference/declFileCallSignatures.types
 delete mode 100644 tests/baselines/reference/declFileConstructSignatures.types
 delete mode 100644 tests/baselines/reference/declFileConstructors.types
 delete mode 100644 tests/baselines/reference/declFileFunctions.types
 delete mode 100644 tests/baselines/reference/declFileImportChainInExportAssignment.js
 delete mode 100644 tests/baselines/reference/declFileImportChainInExportAssignment.types
 delete mode 100644 tests/baselines/reference/declFileIndexSignatures.js
 delete mode 100644 tests/baselines/reference/declFileIndexSignatures.types
 delete mode 100644 tests/baselines/reference/declFileMethods.types
 create mode 100644 tests/baselines/reference/declarationEmit_nameConflicts.errors.txt
 delete mode 100644 tests/baselines/reference/declarationEmit_nameConflicts.types
 create mode 100644 tests/baselines/reference/declarationEmit_nameConflictsWithAlias.errors.txt
 delete mode 100644 tests/baselines/reference/declarationEmit_nameConflictsWithAlias.types
 delete mode 100644 tests/baselines/reference/declareFileExportAssignmentWithVarFromVariableStatement.js
 delete mode 100644 tests/baselines/reference/declareFileExportAssignmentWithVarFromVariableStatement.types
 create mode 100644 tests/baselines/reference/duplicateLabel1.errors.txt
 create mode 100644 tests/baselines/reference/duplicateLabel2.errors.txt
 create mode 100644 tests/baselines/reference/duplicateLabel3.js
 create mode 100644 tests/baselines/reference/duplicateLabel3.types
 create mode 100644 tests/baselines/reference/duplicateLabel4.js
 create mode 100644 tests/baselines/reference/duplicateLabel4.types
 delete mode 100644 tests/baselines/reference/duplicatePropertiesInStrictMode.errors.txt
 delete mode 100644 tests/baselines/reference/duplicateStringIndexers.errors.txt
 delete mode 100644 tests/baselines/reference/duplicateVarAndImport.types
 delete mode 100644 tests/baselines/reference/duplicateVarAndImport2.errors.txt
 delete mode 100644 tests/baselines/reference/emitBOM.types
 delete mode 100644 tests/baselines/reference/emptyTypeArgumentList.errors.txt
 delete mode 100644 tests/baselines/reference/emptyTypeArgumentListWithNew.errors.txt
 delete mode 100644 tests/baselines/reference/enumInitializersWithExponents.errors.txt
 delete mode 100644 tests/baselines/reference/exportAssignmentWithDeclareAndExportModifiers.errors.txt
 delete mode 100644 tests/baselines/reference/exportAssignmentWithDeclareModifier.errors.txt
 delete mode 100644 tests/baselines/reference/exportAssignmentWithExportModifier.errors.txt
 delete mode 100644 tests/baselines/reference/fileReferencesWithNoExtensions.types
 delete mode 100644 tests/baselines/reference/functionAndInterfaceWithSeparateErrors.errors.txt
 delete mode 100644 tests/baselines/reference/functionAndInterfaceWithSeparateErrors.js
 delete mode 100644 tests/baselines/reference/functionsMissingReturnStatementsAndExpressions.errors.txt
 create mode 100644 tests/baselines/reference/importDecl.errors.txt
 delete mode 100644 tests/baselines/reference/importDecl.types
 delete mode 100644 tests/baselines/reference/indexSignatureTypeInference.errors.txt
 delete mode 100644 tests/baselines/reference/inheritedOverloadedSpecializedSignatures.types
 create mode 100644 tests/baselines/reference/missingRequiredDeclare.d.errors.txt
 delete mode 100644 tests/baselines/reference/mixedExports.js
 delete mode 100644 tests/baselines/reference/mixedExports.types
 delete mode 100644 tests/baselines/reference/moduleSymbolMerging.types
 create mode 100644 tests/baselines/reference/multiImportExport.errors.txt
 delete mode 100644 tests/baselines/reference/multiImportExport.js
 delete mode 100644 tests/baselines/reference/multiImportExport.types
 delete mode 100644 tests/baselines/reference/nameCollisionsInPropertyAssignments.js
 delete mode 100644 tests/baselines/reference/nameCollisionsInPropertyAssignments.types
 delete mode 100644 tests/baselines/reference/noCatchBlock.js
 delete mode 100644 tests/baselines/reference/noCatchBlock.js.map
 delete mode 100644 tests/baselines/reference/noCatchBlock.sourcemap.txt
 delete mode 100644 tests/baselines/reference/noCatchBlock.types
 delete mode 100644 tests/baselines/reference/noImplicitAnyForIn.errors.txt
 delete mode 100644 tests/baselines/reference/noImplicitAnyIndexing.errors.txt
 delete mode 100644 tests/baselines/reference/noImplicitAnyParametersInAmbientClass.errors.txt
 delete mode 100644 tests/baselines/reference/noImplicitAnyParametersInAmbientClass.js
 delete mode 100644 tests/baselines/reference/noImplicitAnyParametersInAmbientFunctions.errors.txt
 delete mode 100644 tests/baselines/reference/noImplicitAnyParametersInAmbientFunctions.js
 delete mode 100644 tests/baselines/reference/noImplicitAnyParametersInAmbientModule.errors.txt
 delete mode 100644 tests/baselines/reference/noImplicitAnyParametersInAmbientModule.js
 delete mode 100644 tests/baselines/reference/noImplicitAnyParametersInBareFunctions.errors.txt
 delete mode 100644 tests/baselines/reference/noImplicitAnyParametersInClass.errors.txt
 delete mode 100644 tests/baselines/reference/noImplicitAnyParametersInInterface.errors.txt
 delete mode 100644 tests/baselines/reference/noImplicitAnyParametersInInterface.js
 delete mode 100644 tests/baselines/reference/noImplicitAnyParametersInModule.errors.txt
 delete mode 100644 tests/baselines/reference/octalLiteralInStrictModeES3.errors.txt
 delete mode 100644 tests/baselines/reference/overloadsInDifferentContainersDisagreeOnAmbient.errors.txt
 delete mode 100644 tests/baselines/reference/overloadsInDifferentContainersDisagreeOnAmbient.js
 delete mode 100644 tests/baselines/reference/parserAccessors1.js
 rename tests/baselines/reference/{parserES3Accessors2.errors.txt => parserAccessors2.errors.txt} (54%)
 delete mode 100644 tests/baselines/reference/parserAccessors2.js
 delete mode 100644 tests/baselines/reference/parserAccessors2.types
 delete mode 100644 tests/baselines/reference/parserAccessors3.js
 rename tests/baselines/reference/{parserES3Accessors4.errors.txt => parserAccessors4.errors.txt} (52%)
 delete mode 100644 tests/baselines/reference/parserAccessors4.js
 delete mode 100644 tests/baselines/reference/parserAccessors4.types
 delete mode 100644 tests/baselines/reference/parserAssignmentExpression1.errors.txt
 delete mode 100644 tests/baselines/reference/parserAssignmentExpression1.js
 delete mode 100644 tests/baselines/reference/parserConstructorDeclaration11.errors.txt
 delete mode 100644 tests/baselines/reference/parserDoStatement2.js
 delete mode 100644 tests/baselines/reference/parserDoStatement2.types
 delete mode 100644 tests/baselines/reference/parserES3Accessors1.errors.txt
 delete mode 100644 tests/baselines/reference/parserES3Accessors3.errors.txt
 delete mode 100644 tests/baselines/reference/parserErrorRecovery_ExtendsOrImplementsClause6.errors.txt
 delete mode 100644 tests/baselines/reference/parserForStatement4.errors.txt
 delete mode 100644 tests/baselines/reference/parserForStatement4.js
 delete mode 100644 tests/baselines/reference/parserForStatement5.errors.txt
 delete mode 100644 tests/baselines/reference/parserForStatement5.js
 delete mode 100644 tests/baselines/reference/parserForStatement6.errors.txt
 delete mode 100644 tests/baselines/reference/parserForStatement6.js
 delete mode 100644 tests/baselines/reference/parserForStatement7.errors.txt
 delete mode 100644 tests/baselines/reference/parserForStatement7.js
 delete mode 100644 tests/baselines/reference/parserForStatement8.errors.txt
 delete mode 100644 tests/baselines/reference/parserForStatement8.js
 delete mode 100644 tests/baselines/reference/parserMemberAccessor1.js
 delete mode 100644 tests/baselines/reference/parserMemberAccessorDeclaration1.js
 delete mode 100644 tests/baselines/reference/parserMemberAccessorDeclaration2.js
 delete mode 100644 tests/baselines/reference/parserMemberAccessorDeclaration3.js
 create mode 100644 tests/baselines/reference/parserMemberAccessorDeclaration4.errors.txt
 delete mode 100644 tests/baselines/reference/parserMemberAccessorDeclaration4.js
 delete mode 100644 tests/baselines/reference/parserMemberAccessorDeclaration4.types
 create mode 100644 tests/baselines/reference/parserMemberAccessorDeclaration5.errors.txt
 delete mode 100644 tests/baselines/reference/parserMemberAccessorDeclaration5.js
 delete mode 100644 tests/baselines/reference/parserMemberAccessorDeclaration5.types
 create mode 100644 tests/baselines/reference/parserMemberAccessorDeclaration6.errors.txt
 delete mode 100644 tests/baselines/reference/parserMemberAccessorDeclaration6.js
 delete mode 100644 tests/baselines/reference/parserMemberAccessorDeclaration6.types
 delete mode 100644 tests/baselines/reference/parserObjectCreation2.errors.txt
 delete mode 100644 tests/baselines/reference/parserObjectCreation2.js
 delete mode 100644 tests/baselines/reference/parserObjectLiterals1.js
 delete mode 100644 tests/baselines/reference/parserObjectLiterals1.types
 delete mode 100644 tests/baselines/reference/parserObjectType5.errors.txt
 delete mode 100644 tests/baselines/reference/parserObjectType6.errors.txt
 delete mode 100644 tests/baselines/reference/parserPostfixUnaryExpression1.errors.txt
 create mode 100644 tests/baselines/reference/parserS7.6.1.1_A1.10.errors.txt
 delete mode 100644 tests/baselines/reference/parserS7.6.1.1_A1.10.types
 create mode 100644 tests/baselines/reference/parserSyntaxWalker.generated.errors.txt
 delete mode 100644 tests/baselines/reference/parserSyntaxWalker.generated.types
 delete mode 100644 tests/baselines/reference/parserUnaryExpression1.errors.txt
 delete mode 100644 tests/baselines/reference/parserUnaryExpression1.js
 delete mode 100644 tests/baselines/reference/parserUnaryExpression2.errors.txt
 delete mode 100644 tests/baselines/reference/parserUnaryExpression2.js
 delete mode 100644 tests/baselines/reference/parserUnaryExpression3.errors.txt
 delete mode 100644 tests/baselines/reference/parserUnaryExpression3.js
 delete mode 100644 tests/baselines/reference/parserUnaryExpression4.errors.txt
 delete mode 100644 tests/baselines/reference/parserUnaryExpression4.js
 delete mode 100644 tests/baselines/reference/parserUnaryExpression5.errors.txt
 delete mode 100644 tests/baselines/reference/parserUnaryExpression5.js
 delete mode 100644 tests/baselines/reference/parserUnaryExpression6.js
 delete mode 100644 tests/baselines/reference/parserUnaryExpression6.types
 delete mode 100644 tests/baselines/reference/parserUnaryExpression7.errors.txt
 delete mode 100644 tests/baselines/reference/parserUnaryExpression7.js
 delete mode 100644 tests/baselines/reference/parserX_ArrowFunction4.js
 delete mode 100644 tests/baselines/reference/parsingClassRecoversWhenHittingUnexpectedSemicolon.errors.txt
 delete mode 100644 tests/baselines/reference/prefixIncrementAsOperandOfPlusExpression.js
 delete mode 100644 tests/baselines/reference/prefixIncrementAsOperandOfPlusExpression.types
 delete mode 100644 tests/baselines/reference/privacyAccessorDeclFile.errors.txt
 delete mode 100644 tests/baselines/reference/privacyAccessorDeclFile.js
 delete mode 100644 tests/baselines/reference/privacyCannotNameAccessorDeclFile.errors.txt
 delete mode 100644 tests/baselines/reference/privacyCannotNameVarTypeDeclFile.errors.txt
 delete mode 100644 tests/baselines/reference/privacyCheckTypeOfFunction.js
 delete mode 100644 tests/baselines/reference/privacyCheckTypeOfInvisibleModuleError.errors.txt
 create mode 100644 tests/baselines/reference/privacyCheckTypeOfInvisibleModuleError.types
 delete mode 100644 tests/baselines/reference/privacyClassExtendsClauseDeclFile.errors.txt
 delete mode 100644 tests/baselines/reference/privacyClassExtendsClauseDeclFile.js
 delete mode 100644 tests/baselines/reference/privacyClassImplementsClauseDeclFile.errors.txt
 delete mode 100644 tests/baselines/reference/privacyClassImplementsClauseDeclFile.js
 delete mode 100644 tests/baselines/reference/privacyFunctionCannotNameParameterTypeDeclFile.errors.txt
 delete mode 100644 tests/baselines/reference/privacyFunctionCannotNameReturnTypeDeclFile.errors.txt
 delete mode 100644 tests/baselines/reference/privacyFunctionParameterDeclFile.errors.txt
 delete mode 100644 tests/baselines/reference/privacyFunctionParameterDeclFile.js
 delete mode 100644 tests/baselines/reference/privacyFunctionReturnTypeDeclFile.errors.txt
 delete mode 100644 tests/baselines/reference/privacyFunctionReturnTypeDeclFile.js
 create mode 100644 tests/baselines/reference/privacyGetter.errors.txt
 delete mode 100644 tests/baselines/reference/privacyGetter.types
 create mode 100644 tests/baselines/reference/privacyGloGetter.errors.txt
 delete mode 100644 tests/baselines/reference/privacyGloGetter.types
 delete mode 100644 tests/baselines/reference/privacyGloImportParseErrors.errors.txt
 delete mode 100644 tests/baselines/reference/privacyImportParseErrors.errors.txt
 delete mode 100644 tests/baselines/reference/privacyInterfaceExtendsClauseDeclFile.errors.txt
 delete mode 100644 tests/baselines/reference/privacyInterfaceExtendsClauseDeclFile.js
 delete mode 100644 tests/baselines/reference/privacyLocalInternalReferenceImportWithExport.errors.txt
 create mode 100644 tests/baselines/reference/privacyLocalInternalReferenceImportWithExport.types
 delete mode 100644 tests/baselines/reference/privacyLocalInternalReferenceImportWithoutExport.errors.txt
 create mode 100644 tests/baselines/reference/privacyLocalInternalReferenceImportWithoutExport.types
 create mode 100644 tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithExport.errors.txt
 delete mode 100644 tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithExport.types
 create mode 100644 tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithoutExport.errors.txt
 delete mode 100644 tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithoutExport.types
 delete mode 100644 tests/baselines/reference/privacyTopLevelInternalReferenceImportWithExport.errors.txt
 create mode 100644 tests/baselines/reference/privacyTopLevelInternalReferenceImportWithExport.types
 delete mode 100644 tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.errors.txt
 create mode 100644 tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.types
 create mode 100644 tests/baselines/reference/privacyTypeParameterOfFunction.errors.txt
 delete mode 100644 tests/baselines/reference/privacyTypeParameterOfFunction.types
 delete mode 100644 tests/baselines/reference/privacyTypeParameterOfFunctionDeclFile.errors.txt
 delete mode 100644 tests/baselines/reference/privacyTypeParameterOfFunctionDeclFile.js
 create mode 100644 tests/baselines/reference/privacyTypeParametersOfClass.errors.txt
 delete mode 100644 tests/baselines/reference/privacyTypeParametersOfClass.types
 delete mode 100644 tests/baselines/reference/privacyTypeParametersOfClassDeclFile.errors.txt
 delete mode 100644 tests/baselines/reference/privacyTypeParametersOfClassDeclFile.js
 create mode 100644 tests/baselines/reference/privacyTypeParametersOfInterface.errors.txt
 delete mode 100644 tests/baselines/reference/privacyTypeParametersOfInterface.js
 delete mode 100644 tests/baselines/reference/privacyTypeParametersOfInterface.types
 delete mode 100644 tests/baselines/reference/privacyTypeParametersOfInterfaceDeclFile.errors.txt
 delete mode 100644 tests/baselines/reference/privacyTypeParametersOfInterfaceDeclFile.js
 delete mode 100644 tests/baselines/reference/privacyVarDeclFile.errors.txt
 create mode 100644 tests/baselines/reference/promiseChaining.errors.txt
 delete mode 100644 tests/baselines/reference/promiseChaining.types
 delete mode 100644 tests/baselines/reference/promiseChaining2.errors.txt
 create mode 100644 tests/baselines/reference/promiseChaining2.types
 delete mode 100644 tests/baselines/reference/propertyParameterWithQuestionMark.errors.txt
 delete mode 100644 tests/baselines/reference/regExpWithSlashInCharClass.js
 delete mode 100644 tests/baselines/reference/regExpWithSlashInCharClass.types
 delete mode 100644 tests/baselines/reference/reservedNameOnInterfaceImport.errors.txt
 delete mode 100644 tests/baselines/reference/reservedNameOnInterfaceImport.js
 delete mode 100644 tests/baselines/reference/reservedNameOnModuleImport.js
 delete mode 100644 tests/baselines/reference/reservedNameOnModuleImport.types
 delete mode 100644 tests/baselines/reference/reservedNameOnModuleImportWithInterface.errors.txt
 delete mode 100644 tests/baselines/reference/reservedNameOnModuleImportWithInterface.js
 delete mode 100644 tests/baselines/reference/scannerES3NumericLiteral1.js
 delete mode 100644 tests/baselines/reference/scannerES3NumericLiteral1.types
 delete mode 100644 tests/baselines/reference/scannerES3NumericLiteral2.js
 delete mode 100644 tests/baselines/reference/scannerES3NumericLiteral2.types
 delete mode 100644 tests/baselines/reference/scannerES3NumericLiteral3.errors.txt
 delete mode 100644 tests/baselines/reference/scannerES3NumericLiteral4.errors.txt
 delete mode 100644 tests/baselines/reference/scannerES3NumericLiteral5.js
 delete mode 100644 tests/baselines/reference/scannerES3NumericLiteral5.types
 delete mode 100644 tests/baselines/reference/scannerES3NumericLiteral6.errors.txt
 delete mode 100644 tests/baselines/reference/scannerES3NumericLiteral7.js
 delete mode 100644 tests/baselines/reference/scannerES3NumericLiteral7.types
 delete mode 100644 tests/baselines/reference/scannerNumericLiteral2.errors.txt
 create mode 100644 tests/baselines/reference/scannerNumericLiteral2.js
 create mode 100644 tests/baselines/reference/scannerNumericLiteral2.types
 delete mode 100644 tests/baselines/reference/scannerNumericLiteral8.errors.txt
 delete mode 100644 tests/baselines/reference/scannerNumericLiteral9.errors.txt
 delete mode 100644 tests/baselines/reference/sourceMap-SkippedNode.js
 delete mode 100644 tests/baselines/reference/sourceMap-SkippedNode.js.map
 delete mode 100644 tests/baselines/reference/sourceMap-SkippedNode.sourcemap.txt
 delete mode 100644 tests/baselines/reference/sourceMap-SkippedNode.types
 create mode 100644 tests/baselines/reference/sourceMapValidationClass.errors.txt
 delete mode 100644 tests/baselines/reference/sourceMapValidationClass.js
 delete mode 100644 tests/baselines/reference/sourceMapValidationClass.sourcemap.txt
 delete mode 100644 tests/baselines/reference/sourceMapValidationClass.types
 delete mode 100644 tests/baselines/reference/sourceMapValidationExportAssignmentCommonjs.js
 delete mode 100644 tests/baselines/reference/sourceMapValidationExportAssignmentCommonjs.js.map
 delete mode 100644 tests/baselines/reference/sourceMapValidationExportAssignmentCommonjs.sourcemap.txt
 delete mode 100644 tests/baselines/reference/sourceMapValidationExportAssignmentCommonjs.types
 create mode 100644 tests/baselines/reference/specializedLambdaTypeArguments.errors.txt
 delete mode 100644 tests/baselines/reference/specializedLambdaTypeArguments.types
 delete mode 100644 tests/baselines/reference/specializedSignatureInInterface.js
 delete mode 100644 tests/baselines/reference/specializedSignatureInInterface.types
 delete mode 100644 tests/baselines/reference/staticMethodWithTypeParameterExtendsClauseDeclFile.js
 delete mode 100644 tests/baselines/reference/staticMethodWithTypeParameterExtendsClauseDeclFile.types
 delete mode 100644 tests/baselines/reference/strictMode5.js
 delete mode 100644 tests/baselines/reference/strictMode5.types
 delete mode 100644 tests/baselines/reference/switchStatementsWithMultipleDefaults.errors.txt
 delete mode 100644 tests/baselines/reference/testContainerList.types
 delete mode 100644 tests/baselines/reference/trailingCommasES3.js
 delete mode 100644 tests/baselines/reference/trailingCommasES3.types
 delete mode 100644 tests/baselines/reference/trailingCommasES5.js
 delete mode 100644 tests/baselines/reference/trailingCommasES5.types
 delete mode 100644 tests/baselines/reference/typeParameterWithInvalidConstraintType.errors.txt
 delete mode 100644 tests/baselines/reference/typeQueryWithReservedWords.js
 delete mode 100644 tests/baselines/reference/typeQueryWithReservedWords.types
 delete mode 100644 tests/cases/compiler/amdDependencyComment2.ts
 delete mode 100644 tests/cases/compiler/arrowFunctionMissingCurlyWithSemicolon.ts
 delete mode 100644 tests/cases/compiler/arrowFunctionsMissingTokens.ts
 delete mode 100644 tests/cases/compiler/asiAmbientFunctionDeclaration.ts
 delete mode 100644 tests/cases/compiler/asiBreak.ts
 delete mode 100644 tests/cases/compiler/asiContinue.ts
 delete mode 100644 tests/cases/compiler/asiReturn.ts
 delete mode 100644 tests/cases/compiler/augmentArray.ts
 delete mode 100644 tests/cases/compiler/autoAsiForStaticsInClassDeclaration.ts
 create mode 100644 tests/cases/compiler/breakInIterationOrSwitchStatement1.ts
 create mode 100644 tests/cases/compiler/breakInIterationOrSwitchStatement2.ts
 create mode 100644 tests/cases/compiler/breakInIterationOrSwitchStatement3.ts
 create mode 100644 tests/cases/compiler/breakInIterationOrSwitchStatement4.ts
 create mode 100644 tests/cases/compiler/breakNotInIterationOrSwitchStatement1.ts
 create mode 100644 tests/cases/compiler/breakNotInIterationOrSwitchStatement2.ts
 create mode 100644 tests/cases/compiler/breakTarget1.ts
 create mode 100644 tests/cases/compiler/breakTarget2.ts
 create mode 100644 tests/cases/compiler/breakTarget3.ts
 create mode 100644 tests/cases/compiler/breakTarget4.ts
 create mode 100644 tests/cases/compiler/breakTarget5.ts
 create mode 100644 tests/cases/compiler/breakTarget6.ts
 delete mode 100644 tests/cases/compiler/captureThisInSuperCall.ts
 delete mode 100644 tests/cases/compiler/classImplementsImportedInterface.ts
 delete mode 100644 tests/cases/compiler/commentsDottedModuleName.ts
 delete mode 100644 tests/cases/compiler/constructorArgsErrors3.ts
 delete mode 100644 tests/cases/compiler/constructorArgsErrors4.ts
 delete mode 100644 tests/cases/compiler/constructorArgsErrors5.ts
 delete mode 100644 tests/cases/compiler/constructorsWithSpecializedSignatures.ts
 delete mode 100644 tests/cases/compiler/contextualSignatureInstantiation3.ts
 create mode 100644 tests/cases/compiler/continueInIterationStatement1.ts
 create mode 100644 tests/cases/compiler/continueInIterationStatement2.ts
 create mode 100644 tests/cases/compiler/continueInIterationStatement3.ts
 create mode 100644 tests/cases/compiler/continueInIterationStatement4.ts
 create mode 100644 tests/cases/compiler/continueLabel.ts
 create mode 100644 tests/cases/compiler/continueNotInIterationStatement1.ts
 create mode 100644 tests/cases/compiler/continueNotInIterationStatement2.ts
 create mode 100644 tests/cases/compiler/continueNotInIterationStatement3.ts
 create mode 100644 tests/cases/compiler/continueNotInIterationStatement4.ts
 create mode 100644 tests/cases/compiler/continueTarget1.ts
 create mode 100644 tests/cases/compiler/continueTarget2.ts
 create mode 100644 tests/cases/compiler/continueTarget3.ts
 create mode 100644 tests/cases/compiler/continueTarget4.ts
 create mode 100644 tests/cases/compiler/continueTarget5.ts
 create mode 100644 tests/cases/compiler/continueTarget6.ts
 delete mode 100644 tests/cases/compiler/declFileAccessors.ts
 delete mode 100644 tests/cases/compiler/declFileCallSignatures.ts
 delete mode 100644 tests/cases/compiler/declFileConstructSignatures.ts
 delete mode 100644 tests/cases/compiler/declFileConstructors.ts
 delete mode 100644 tests/cases/compiler/declFileFunctions.ts
 delete mode 100644 tests/cases/compiler/declFileImportChainInExportAssignment.ts
 delete mode 100644 tests/cases/compiler/declFileIndexSignatures.ts
 delete mode 100644 tests/cases/compiler/declFileMethods.ts
 delete mode 100644 tests/cases/compiler/declareFileExportAssignmentWithVarFromVariableStatement.ts
 create mode 100644 tests/cases/compiler/duplicateLabel1.ts
 create mode 100644 tests/cases/compiler/duplicateLabel2.ts
 create mode 100644 tests/cases/compiler/duplicateLabel3.ts
 create mode 100644 tests/cases/compiler/duplicateLabel4.ts
 delete mode 100644 tests/cases/compiler/duplicatePropertiesInStrictMode.ts
 delete mode 100644 tests/cases/compiler/duplicateVarAndImport.ts
 delete mode 100644 tests/cases/compiler/duplicateVarAndImport2.ts
 delete mode 100644 tests/cases/compiler/emitBOM.ts
 delete mode 100644 tests/cases/compiler/emptyTypeArgumentList.ts
 delete mode 100644 tests/cases/compiler/emptyTypeArgumentListWithNew.ts
 delete mode 100644 tests/cases/compiler/enumInitializersWithExponents.ts
 delete mode 100644 tests/cases/compiler/exportAssignmentWithDeclareAndExportModifiers.ts
 delete mode 100644 tests/cases/compiler/exportAssignmentWithDeclareModifier.ts
 delete mode 100644 tests/cases/compiler/exportAssignmentWithExportModifier.ts
 delete mode 100644 tests/cases/compiler/fileReferencesWithNoExtensions.ts
 delete mode 100644 tests/cases/compiler/functionAndInterfaceWithSeparateErrors.ts
 delete mode 100644 tests/cases/compiler/functionsMissingReturnStatementsAndExpressions.ts
 delete mode 100644 tests/cases/compiler/indexSignatureTypeInference.ts
 delete mode 100644 tests/cases/compiler/inheritedOverloadedSpecializedSignatures.ts
 create mode 100644 tests/cases/compiler/missingRequiredDeclare.d.ts
 delete mode 100644 tests/cases/compiler/mixedExports.ts
 delete mode 100644 tests/cases/compiler/moduleSymbolMerging.ts
 delete mode 100644 tests/cases/compiler/nameCollisionsInPropertyAssignments.ts
 delete mode 100644 tests/cases/compiler/noCatchBlock.ts
 delete mode 100644 tests/cases/compiler/noImplicitAnyForIn.ts
 delete mode 100644 tests/cases/compiler/noImplicitAnyIndexing.ts
 delete mode 100644 tests/cases/compiler/noImplicitAnyParametersInAmbientClass.ts
 delete mode 100644 tests/cases/compiler/noImplicitAnyParametersInAmbientFunctions.ts
 delete mode 100644 tests/cases/compiler/noImplicitAnyParametersInAmbientModule.ts
 delete mode 100644 tests/cases/compiler/noImplicitAnyParametersInBareFunctions.ts
 delete mode 100644 tests/cases/compiler/noImplicitAnyParametersInClass.ts
 delete mode 100644 tests/cases/compiler/noImplicitAnyParametersInInterface.ts
 delete mode 100644 tests/cases/compiler/noImplicitAnyParametersInModule.ts
 delete mode 100644 tests/cases/compiler/overloadsInDifferentContainersDisagreeOnAmbient.ts
 delete mode 100644 tests/cases/compiler/parsingClassRecoversWhenHittingUnexpectedSemicolon.ts
 delete mode 100644 tests/cases/compiler/prefixIncrementAsOperandOfPlusExpression.ts
 delete mode 100644 tests/cases/compiler/privacyAccessorDeclFile.ts
 delete mode 100644 tests/cases/compiler/privacyCannotNameAccessorDeclFile.ts
 delete mode 100644 tests/cases/compiler/privacyCannotNameVarTypeDeclFile.ts
 delete mode 100644 tests/cases/compiler/privacyClassExtendsClauseDeclFile.ts
 delete mode 100644 tests/cases/compiler/privacyClassImplementsClauseDeclFile.ts
 delete mode 100644 tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile.ts
 delete mode 100644 tests/cases/compiler/privacyFunctionCannotNameReturnTypeDeclFile.ts
 delete mode 100644 tests/cases/compiler/privacyFunctionParameterDeclFile.ts
 delete mode 100644 tests/cases/compiler/privacyFunctionReturnTypeDeclFile.ts
 delete mode 100644 tests/cases/compiler/privacyGloImportParseErrors.ts
 delete mode 100644 tests/cases/compiler/privacyImportParseErrors.ts
 delete mode 100644 tests/cases/compiler/privacyInterfaceExtendsClauseDeclFile.ts
 delete mode 100644 tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts
 delete mode 100644 tests/cases/compiler/privacyTypeParametersOfClassDeclFile.ts
 delete mode 100644 tests/cases/compiler/privacyTypeParametersOfInterfaceDeclFile.ts
 delete mode 100644 tests/cases/compiler/privacyVarDeclFile.ts
 delete mode 100644 tests/cases/compiler/propertyParameterWithQuestionMark.ts
 delete mode 100644 tests/cases/compiler/regExpWithSlashInCharClass.ts
 delete mode 100644 tests/cases/compiler/reservedNameOnInterfaceImport.ts
 delete mode 100644 tests/cases/compiler/reservedNameOnModuleImport.ts
 delete mode 100644 tests/cases/compiler/reservedNameOnModuleImportWithInterface.ts
 delete mode 100644 tests/cases/compiler/sourceMap-SkippedNode.ts
 delete mode 100644 tests/cases/compiler/sourceMapValidationExportAssignmentCommonjs.ts
 delete mode 100644 tests/cases/compiler/specializedSignatureInInterface.ts
 delete mode 100644 tests/cases/compiler/staticMethodWithTypeParameterExtendsClauseDeclFile.ts
 delete mode 100644 tests/cases/compiler/strictMode5.ts
 delete mode 100644 tests/cases/compiler/switchStatementsWithMultipleDefaults.ts
 delete mode 100644 tests/cases/compiler/testContainerList.ts
 delete mode 100644 tests/cases/compiler/trailingCommasES3.ts
 delete mode 100644 tests/cases/compiler/trailingCommasES5.ts
 delete mode 100644 tests/cases/compiler/typeParameterWithInvalidConstraintType.ts
 delete mode 100644 tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendingPrimitive2.ts
 delete mode 100644 tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendsEveryObjectType2.ts
 delete mode 100644 tests/cases/conformance/parser/ecmascript3/Accessors/parserES3Accessors1.ts
 delete mode 100644 tests/cases/conformance/parser/ecmascript3/Accessors/parserES3Accessors2.ts
 delete mode 100644 tests/cases/conformance/parser/ecmascript3/Accessors/parserES3Accessors3.ts
 delete mode 100644 tests/cases/conformance/parser/ecmascript3/Accessors/parserES3Accessors4.ts
 delete mode 100644 tests/cases/conformance/parser/ecmascript5/ConstructorDeclarations/parserConstructorDeclaration11.ts
 rename tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ArrowFunctions/{parserX_ArrowFunction1.ts => ArrowFunction1.ts} (100%)
 rename tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ArrowFunctions/{parserX_ArrowFunction2.ts => ArrowFunction2.ts} (100%)
 rename tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ArrowFunctions/{parserX_ArrowFunction3.ts => ArrowFunction3.ts} (100%)
 rename tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ArrowFunctions/{parserX_ArrowFunction4.ts => ArrowFunction4.ts} (100%)
 delete mode 100644 tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ExtendsOrImplementsClauses/parserErrorRecovery_ExtendsOrImplementsClause6.ts
 rename tests/cases/conformance/parser/ecmascript5/ErrorRecovery/TypeArgumentLists/{parserX_TypeArgumentList1.ts => TypeArgumentList1.ts} (100%)
 delete mode 100644 tests/cases/conformance/parser/ecmascript5/Expressions/parserAssignmentExpression1.ts
 delete mode 100644 tests/cases/conformance/parser/ecmascript5/Expressions/parserObjectCreation2.ts
 delete mode 100644 tests/cases/conformance/parser/ecmascript5/Expressions/parserPostfixUnaryExpression1.ts
 delete mode 100644 tests/cases/conformance/parser/ecmascript5/Expressions/parserUnaryExpression1.ts
 delete mode 100644 tests/cases/conformance/parser/ecmascript5/Expressions/parserUnaryExpression2.ts
 delete mode 100644 tests/cases/conformance/parser/ecmascript5/Expressions/parserUnaryExpression3.ts
 delete mode 100644 tests/cases/conformance/parser/ecmascript5/Expressions/parserUnaryExpression4.ts
 delete mode 100644 tests/cases/conformance/parser/ecmascript5/Expressions/parserUnaryExpression5.ts
 delete mode 100644 tests/cases/conformance/parser/ecmascript5/Expressions/parserUnaryExpression6.ts
 delete mode 100644 tests/cases/conformance/parser/ecmascript5/Expressions/parserUnaryExpression7.ts
 delete mode 100644 tests/cases/conformance/parser/ecmascript5/ObjectLiterals/parserObjectLiterals1.ts
 delete mode 100644 tests/cases/conformance/parser/ecmascript5/ObjectTypes/parserObjectType5.ts
 delete mode 100644 tests/cases/conformance/parser/ecmascript5/ObjectTypes/parserObjectType6.ts
 delete mode 100644 tests/cases/conformance/parser/ecmascript5/Statements/ReturnStatements/parserReturnStatement4.js
 delete mode 100644 tests/cases/conformance/parser/ecmascript5/Statements/parserDoStatement2.ts
 delete mode 100644 tests/cases/conformance/parser/ecmascript5/Statements/parserForStatement4.ts
 delete mode 100644 tests/cases/conformance/parser/ecmascript5/Statements/parserForStatement5.ts
 delete mode 100644 tests/cases/conformance/parser/ecmascript5/Statements/parserForStatement6.ts
 delete mode 100644 tests/cases/conformance/parser/ecmascript5/Statements/parserForStatement7.ts
 delete mode 100644 tests/cases/conformance/parser/ecmascript5/Statements/parserForStatement8.ts
 delete mode 100644 tests/cases/conformance/parser/ecmascript5/StrictMode/octalLiteralInStrictModeES3.ts
 delete mode 100644 tests/cases/conformance/scanner/ecmascript3/scannerES3NumericLiteral1.ts
 delete mode 100644 tests/cases/conformance/scanner/ecmascript3/scannerES3NumericLiteral2.ts
 delete mode 100644 tests/cases/conformance/scanner/ecmascript3/scannerES3NumericLiteral3.ts
 delete mode 100644 tests/cases/conformance/scanner/ecmascript3/scannerES3NumericLiteral4.ts
 delete mode 100644 tests/cases/conformance/scanner/ecmascript3/scannerES3NumericLiteral5.ts
 delete mode 100644 tests/cases/conformance/scanner/ecmascript3/scannerES3NumericLiteral6.ts
 delete mode 100644 tests/cases/conformance/scanner/ecmascript3/scannerES3NumericLiteral7.ts
 delete mode 100644 tests/cases/conformance/scanner/ecmascript5/scannerNumericLiteral8.ts
 delete mode 100644 tests/cases/conformance/scanner/ecmascript5/scannerNumericLiteral9.ts
 delete mode 100644 tests/cases/conformance/types/specifyingTypes/typeQueries/typeQueryWithReservedWords.ts
 create mode 100644 tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembers.ts

diff --git a/src/harness/compilerRunner.ts b/src/harness/compilerRunner.ts
index bab1200d74c..feae3f1dc66 100644
--- a/src/harness/compilerRunner.ts
+++ b/src/harness/compilerRunner.ts
@@ -307,7 +307,7 @@ class CompilerBaselineRunner extends RunnerBase {
                         allFiles.forEach(file => {
                             var codeLines = file.content.split('\n');
                             walker.getTypes(file.unitName).forEach(result => {
-                                var formattedLine = result.identifierName + " : " + result.type;
+                                var formattedLine = result.identifierName.replace(/\r?\n/g, "") + " : " + result.type;
                                 if (!typeMap[file.unitName]) {
                                     typeMap[file.unitName] = {};
                                 }
diff --git a/src/harness/typeWriter.ts b/src/harness/typeWriter.ts
index 87f215d5b72..ea7d39136bf 100644
--- a/src/harness/typeWriter.ts
+++ b/src/harness/typeWriter.ts
@@ -28,7 +28,7 @@ class TypeWriterWalker {
             // TODO: Ideally we should log all expressions, but to compare to the
             // old typeWriter baselines, suppress tokens
             case ts.SyntaxKind.ThisKeyword:
-            case ts.SyntaxKind.RegularExpressionLiteral:
+         //   case ts.SyntaxKind.RegularExpressionLiteral:
             case ts.SyntaxKind.ArrayLiteral:
             case ts.SyntaxKind.ObjectLiteral:
             case ts.SyntaxKind.PropertyAccess:
@@ -87,7 +87,7 @@ class TypeWriterWalker {
             column: lineAndCharacter.character,
             syntaxKind: ts.SyntaxKind[node.kind],
             identifierName: sourceText,
-            type: isUnknownType ? sourceText : this.checker.typeToString(type)
+            type: isUnknownType ? sourceText : this.checker.typeToString(type, undefined, ts.TypeFormatFlags.UseTypeOfFunction)
         });
     }
 
diff --git a/tests/baselines/reference/parserX_ArrowFunction1.errors.txt b/tests/baselines/reference/ArrowFunction1.errors.txt
similarity index 66%
rename from tests/baselines/reference/parserX_ArrowFunction1.errors.txt
rename to tests/baselines/reference/ArrowFunction1.errors.txt
index 2443366b415..ed868daec13 100644
--- a/tests/baselines/reference/parserX_ArrowFunction1.errors.txt
+++ b/tests/baselines/reference/ArrowFunction1.errors.txt
@@ -1,4 +1,4 @@
-==== tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ArrowFunctions/parserX_ArrowFunction1.ts (1 errors) ====
+==== tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ArrowFunctions/ArrowFunction1.ts (1 errors) ====
     var v = (a: ) => {
                 ~
 !!! Type expected.
diff --git a/tests/baselines/reference/parserX_ArrowFunction2.errors.txt b/tests/baselines/reference/ArrowFunction2.errors.txt
similarity index 73%
rename from tests/baselines/reference/parserX_ArrowFunction2.errors.txt
rename to tests/baselines/reference/ArrowFunction2.errors.txt
index 0b9eced39fa..eef47a30ba2 100644
--- a/tests/baselines/reference/parserX_ArrowFunction2.errors.txt
+++ b/tests/baselines/reference/ArrowFunction2.errors.txt
@@ -1,4 +1,4 @@
-==== tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ArrowFunctions/parserX_ArrowFunction2.ts (2 errors) ====
+==== tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ArrowFunctions/ArrowFunction2.ts (2 errors) ====
     var v = (a: b,) => {
                  ~
 !!! Trailing comma not allowed.
diff --git a/tests/baselines/reference/parserX_ArrowFunction3.errors.txt b/tests/baselines/reference/ArrowFunction3.errors.txt
similarity index 74%
rename from tests/baselines/reference/parserX_ArrowFunction3.errors.txt
rename to tests/baselines/reference/ArrowFunction3.errors.txt
index 3088cde2b10..a286116ff29 100644
--- a/tests/baselines/reference/parserX_ArrowFunction3.errors.txt
+++ b/tests/baselines/reference/ArrowFunction3.errors.txt
@@ -1,4 +1,4 @@
-==== tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ArrowFunctions/parserX_ArrowFunction3.ts (3 errors) ====
+==== tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ArrowFunctions/ArrowFunction3.ts (3 errors) ====
     var v = (a): => {
                ~
 !!! ',' expected.
diff --git a/tests/baselines/reference/ArrowFunction4.js b/tests/baselines/reference/ArrowFunction4.js
new file mode 100644
index 00000000000..e9759abb183
--- /dev/null
+++ b/tests/baselines/reference/ArrowFunction4.js
@@ -0,0 +1,8 @@
+//// [ArrowFunction4.ts]
+var v = (a, b) => {
+   
+};
+
+//// [ArrowFunction4.js]
+var v = function (a, b) {
+};
diff --git a/tests/baselines/reference/parserX_ArrowFunction4.types b/tests/baselines/reference/ArrowFunction4.types
similarity index 59%
rename from tests/baselines/reference/parserX_ArrowFunction4.types
rename to tests/baselines/reference/ArrowFunction4.types
index 1e606de909f..1d049f193e6 100644
--- a/tests/baselines/reference/parserX_ArrowFunction4.types
+++ b/tests/baselines/reference/ArrowFunction4.types
@@ -1,9 +1,7 @@
-=== tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ArrowFunctions/parserX_ArrowFunction4.ts ===
+=== tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ArrowFunctions/ArrowFunction4.ts ===
 var v = (a, b) => {
 >v : (a: any, b: any) => void
->(a, b) => {
-   
-} : (a: any, b: any) => void
+>(a, b) => {   } : (a: any, b: any) => void
 >a : any
 >b : any
    
diff --git a/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.types b/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.types
index 3ea1919ecae..10132e604ae 100644
--- a/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.types
+++ b/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.types
@@ -7,7 +7,7 @@ class Point {
 >y : number
 
     static Origin(): Point { return { x: 0, y: 0 }; }
->Origin : () => Point
+>Origin : typeof Origin
 >Point : Point
 >{ x: 0, y: 0 } : { x: number; y: number; }
 >x : number
@@ -18,7 +18,7 @@ module Point {
 >Point : typeof Point
 
     function Origin() { return ""; }// not an error, since not exported
->Origin : () => string
+>Origin : typeof Origin
 }
 
 
@@ -33,7 +33,7 @@ module A {
 >y : number
 
         static Origin(): Point { return { x: 0, y: 0 }; }
->Origin : () => Point
+>Origin : typeof Origin
 >Point : Point
 >{ x: 0, y: 0 } : { x: number; y: number; }
 >x : number
@@ -44,6 +44,6 @@ module A {
 >Point : typeof Point
 
         function Origin() { return ""; }// not an error since not exported
->Origin : () => string
+>Origin : typeof Origin
     }
 }
diff --git a/tests/baselines/reference/ExportClassWithInaccessibleTypeInTypeParameterConstraint.types b/tests/baselines/reference/ExportClassWithInaccessibleTypeInTypeParameterConstraint.types
index 6f4452fce4c..cac8fac99f2 100644
--- a/tests/baselines/reference/ExportClassWithInaccessibleTypeInTypeParameterConstraint.types
+++ b/tests/baselines/reference/ExportClassWithInaccessibleTypeInTypeParameterConstraint.types
@@ -47,7 +47,7 @@ module A {
 >TPoint : TPoint
 
         static fromorigin2d(p: Point): Line<Point>{
->fromorigin2d : (p: Point) => Line<Point>
+>fromorigin2d : typeof fromorigin2d
 >p : Point
 >Point : Point
 >Line : Line<TPoint>
diff --git a/tests/baselines/reference/ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.types b/tests/baselines/reference/ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.types
index ac1845a533c..fe2fea1b7a6 100644
--- a/tests/baselines/reference/ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.types
+++ b/tests/baselines/reference/ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.types
@@ -23,7 +23,7 @@ module A {
     }
 
     export function fromOrigin(p: Point): Line {
->fromOrigin : (p: Point) => Line
+>fromOrigin : typeof fromOrigin
 >p : Point
 >Point : Point
 >Line : Line
diff --git a/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.types b/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.types
index 3f3a670ee8e..36c78cd700a 100644
--- a/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.types
+++ b/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.types
@@ -23,7 +23,7 @@ module A {
     }
 
     export function fromOrigin(p: Point): Line {
->fromOrigin : (p: Point) => Line
+>fromOrigin : typeof fromOrigin
 >p : Point
 >Point : Point
 >Line : Line
diff --git a/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.types b/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.types
index 7634e2cde3e..5d59aa10039 100644
--- a/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.types
+++ b/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.types
@@ -23,7 +23,7 @@ module A {
     }
 
     export function fromOrigin(p: Point): Line {
->fromOrigin : (p: Point) => Line
+>fromOrigin : typeof fromOrigin
 >p : Point
 >Point : Point
 >Line : Line
diff --git a/tests/baselines/reference/ExportModuleWithAccessibleTypesOnItsExportedMembers.types b/tests/baselines/reference/ExportModuleWithAccessibleTypesOnItsExportedMembers.types
index a3a80cb06ad..11a62d66f98 100644
--- a/tests/baselines/reference/ExportModuleWithAccessibleTypesOnItsExportedMembers.types
+++ b/tests/baselines/reference/ExportModuleWithAccessibleTypesOnItsExportedMembers.types
@@ -31,7 +31,7 @@ module A {
             }
 
             static fromOrigin(p: Point) {
->fromOrigin : (p: Point) => Line
+>fromOrigin : typeof fromOrigin
 >p : Point
 >Point : Point
 
diff --git a/tests/baselines/reference/FunctionAndModuleWithSameNameAndDifferentCommonRoot.types b/tests/baselines/reference/FunctionAndModuleWithSameNameAndDifferentCommonRoot.types
index 3110020b9bc..55a30a857cc 100644
--- a/tests/baselines/reference/FunctionAndModuleWithSameNameAndDifferentCommonRoot.types
+++ b/tests/baselines/reference/FunctionAndModuleWithSameNameAndDifferentCommonRoot.types
@@ -3,7 +3,7 @@ module A {
 >A : typeof A
 
     export function Point() {
->Point : () => { x: number; y: number; }
+>Point : typeof Point
 
         return { x: 0, y: 0 };
 >{ x: 0, y: 0 } : { x: number; y: number; }
@@ -35,9 +35,9 @@ var fn: () => { x: number; y: number };
 
 var fn = A.Point;
 >fn : () => { x: number; y: number; }
->A.Point : () => { x: number; y: number; }
+>A.Point : typeof Point
 >A : typeof A
->Point : () => { x: number; y: number; }
+>Point : typeof Point
 
 var cl: { x: number; y: number; }
 >cl : { x: number; y: number; }
diff --git a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedLocalVarsOfTheSameName.types b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedLocalVarsOfTheSameName.types
index 44472c4da6b..4fc79d0409c 100644
--- a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedLocalVarsOfTheSameName.types
+++ b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedLocalVarsOfTheSameName.types
@@ -16,7 +16,7 @@ module A {
 >Utils : typeof Utils
 
         export function mirror<T extends Point>(p: T) {
->mirror : <T extends Point>(p: T) => { x: number; y: number; }
+>mirror : typeof mirror
 >T : T
 >Point : Point
 >p : T
@@ -87,11 +87,11 @@ var o = A.Origin;
 var o = A.Utils.mirror(o);
 >o : { x: number; y: number; }
 >A.Utils.mirror(o) : { x: number; y: number; }
->A.Utils.mirror : <T extends Point>(p: T) => { x: number; y: number; }
+>A.Utils.mirror : typeof mirror
 >A.Utils : typeof Utils
 >A : typeof A
 >Utils : typeof Utils
->mirror : <T extends Point>(p: T) => { x: number; y: number; }
+>mirror : typeof mirror
 >o : { x: number; y: number; }
 
 var p: { tl: A.Point; br: A.Point };
diff --git a/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndDifferentCommonRoot.types b/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndDifferentCommonRoot.types
index 15f596622e7..6662806a523 100644
--- a/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndDifferentCommonRoot.types
+++ b/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndDifferentCommonRoot.types
@@ -19,7 +19,7 @@ module Root {
 >Utils : typeof Utils
 
             export function mirror<T extends Point>(p: T) {
->mirror : <T extends Point>(p: T) => { x: number; y: number; }
+>mirror : typeof mirror
 >T : T
 >Point : Point
 >p : T
diff --git a/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndSameCommonRoot.types b/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndSameCommonRoot.types
index 0bcc1b750c8..6e12c97e761 100644
--- a/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndSameCommonRoot.types
+++ b/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndSameCommonRoot.types
@@ -16,7 +16,7 @@ module A {
 >Utils : typeof Utils
 
         export function mirror<T extends Point>(p: T) {
->mirror : <T extends Point>(p: T) => { x: number; y: number; }
+>mirror : typeof mirror
 >T : T
 >Point : Point
 >p : T
@@ -84,11 +84,11 @@ var o = A.Origin;
 var o = A.Utils.mirror(o);
 >o : { x: number; y: number; }
 >A.Utils.mirror(o) : { x: number; y: number; }
->A.Utils.mirror : <T extends Point>(p: T) => { x: number; y: number; }
+>A.Utils.mirror : typeof mirror
 >A.Utils : typeof Utils
 >A : typeof A
 >Utils : typeof Utils
->mirror : <T extends Point>(p: T) => { x: number; y: number; }
+>mirror : typeof mirror
 >o : { x: number; y: number; }
 
 var p: { tl: A.Point; br: A.Point };
diff --git a/tests/baselines/reference/parserX_TypeArgumentList1.errors.txt b/tests/baselines/reference/TypeArgumentList1.errors.txt
similarity index 72%
rename from tests/baselines/reference/parserX_TypeArgumentList1.errors.txt
rename to tests/baselines/reference/TypeArgumentList1.errors.txt
index 44a696d7ce9..6c1a300f5a5 100644
--- a/tests/baselines/reference/parserX_TypeArgumentList1.errors.txt
+++ b/tests/baselines/reference/TypeArgumentList1.errors.txt
@@ -1,4 +1,4 @@
-==== tests/cases/conformance/parser/ecmascript5/ErrorRecovery/TypeArgumentLists/parserX_TypeArgumentList1.ts (5 errors) ====
+==== tests/cases/conformance/parser/ecmascript5/ErrorRecovery/TypeArgumentLists/TypeArgumentList1.ts (5 errors) ====
     Foo<A,B,\ C>(4, 5, 6);
             
 !!! Invalid character.
diff --git a/tests/baselines/reference/accessorParameterAccessibilityModifier.errors.txt b/tests/baselines/reference/accessorParameterAccessibilityModifier.errors.txt
index df4fe1ecf9e..8765a8002a5 100644
--- a/tests/baselines/reference/accessorParameterAccessibilityModifier.errors.txt
+++ b/tests/baselines/reference/accessorParameterAccessibilityModifier.errors.txt
@@ -1,14 +1,15 @@
 ==== tests/cases/compiler/accessorParameterAccessibilityModifier.ts (4 errors) ====
+    // target: es5
     
     class C {
         set X(public v) { }
             ~
-!!! A parameter property is only allowed in a constructor implementation.
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
               ~~~~~~~~
 !!! A parameter property is only allowed in a constructor implementation.
         static set X(public v2) { }
                    ~
-!!! A parameter property is only allowed in a constructor implementation.
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
                      ~~~~~~~~~
 !!! A parameter property is only allowed in a constructor implementation.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/accessorWithES5.types b/tests/baselines/reference/accessorWithES5.types
index 8753eb64ae4..9d4976dd91a 100644
--- a/tests/baselines/reference/accessorWithES5.types
+++ b/tests/baselines/reference/accessorWithES5.types
@@ -21,9 +21,7 @@ class D {
 
 var x = {
 >x : { a: number; }
->{
-    get a() { return 1 }
-} : { a: number; }
+>{    get a() { return 1 }} : { a: number; }
 
     get a() { return 1 }
 >a : number
@@ -31,9 +29,7 @@ var x = {
 
 var y = {
 >y : { b: any; }
->{
-    set b(v) { }
-} : { b: any; }
+>{    set b(v) { }} : { b: any; }
 
     set b(v) { }
 >b : any
diff --git a/tests/baselines/reference/accessorWithInitializer.errors.txt b/tests/baselines/reference/accessorWithInitializer.errors.txt
index 127bfdc8d82..ebd518ec9e8 100644
--- a/tests/baselines/reference/accessorWithInitializer.errors.txt
+++ b/tests/baselines/reference/accessorWithInitializer.errors.txt
@@ -1,10 +1,11 @@
 ==== tests/cases/compiler/accessorWithInitializer.ts (2 errors) ====
+    // target: es5
     
     class C {
         set X(v = 0) { }
             ~
-!!! A 'set' accessor parameter cannot have an initializer.
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
         static set X(v2 = 0) { }
                    ~
-!!! A 'set' accessor parameter cannot have an initializer.
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/accessorWithRestParam.errors.txt b/tests/baselines/reference/accessorWithRestParam.errors.txt
index 10f4633805f..8f5877fef1e 100644
--- a/tests/baselines/reference/accessorWithRestParam.errors.txt
+++ b/tests/baselines/reference/accessorWithRestParam.errors.txt
@@ -1,10 +1,9 @@
 ==== tests/cases/compiler/accessorWithRestParam.ts (2 errors) ====
-    
     class C {
         set X(...v) { }
             ~
-!!! A 'set' accessor cannot have rest parameter.
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
         static set X(...v2) { }
                    ~
-!!! A 'set' accessor cannot have rest parameter.
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/additionOperatorWithAnyAndEveryType.types b/tests/baselines/reference/additionOperatorWithAnyAndEveryType.types
index da534c68ad6..15672dc0006 100644
--- a/tests/baselines/reference/additionOperatorWithAnyAndEveryType.types
+++ b/tests/baselines/reference/additionOperatorWithAnyAndEveryType.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/expressions/binaryOperators/additionOperator/additionOperatorWithAnyAndEveryType.ts ===
 function foo() { }
->foo : () => void
+>foo : typeof foo
 
 class C {
 >C : C
@@ -9,7 +9,7 @@ class C {
 >a : string
 
     static foo() { }
->foo : () => void
+>foo : typeof foo
 }
 enum E { a, b, c }
 >E : E
@@ -98,14 +98,14 @@ var r10 = a + foo;
 >r10 : any
 >a + foo : any
 >a : any
->foo : () => void
+>foo : typeof foo
 
 var r11 = a + foo();
 >r11 : any
 >a + foo() : any
 >a : any
 >foo() : void
->foo : () => void
+>foo : typeof foo
 
 var r12 = a + C;
 >r12 : any
diff --git a/tests/baselines/reference/aliasInaccessibleModule.errors.txt b/tests/baselines/reference/aliasInaccessibleModule.errors.txt
deleted file mode 100644
index 839ea965b02..00000000000
--- a/tests/baselines/reference/aliasInaccessibleModule.errors.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-==== tests/cases/compiler/aliasInaccessibleModule.ts (1 errors) ====
-    module M {
-        module N {
-        }
-        export import X = N;
-        ~~~~~~~~~~~~~~~~~~~~
-!!! Import declaration 'X' is using private name 'N'.
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/aliasInaccessibleModule.types b/tests/baselines/reference/aliasInaccessibleModule.types
new file mode 100644
index 00000000000..482e3f667ac
--- /dev/null
+++ b/tests/baselines/reference/aliasInaccessibleModule.types
@@ -0,0 +1,11 @@
+=== tests/cases/compiler/aliasInaccessibleModule.ts ===
+module M {
+>M : typeof M
+
+    module N {
+>N : N
+    }
+    export import X = N;
+>X : X
+>N : N
+}
diff --git a/tests/baselines/reference/aliasInaccessibleModule2.errors.txt b/tests/baselines/reference/aliasInaccessibleModule2.errors.txt
deleted file mode 100644
index 149410acb10..00000000000
--- a/tests/baselines/reference/aliasInaccessibleModule2.errors.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-==== tests/cases/compiler/aliasInaccessibleModule2.ts (1 errors) ====
-    module M {
-        module N {
-            class C {
-            }
-            
-        }
-        import R = N;
-        ~~~~~~~~~~~~~
-!!! Import declaration 'R' is using private name 'N'.
-        export import X = R;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/aliasInaccessibleModule2.types b/tests/baselines/reference/aliasInaccessibleModule2.types
new file mode 100644
index 00000000000..1ad25ae0cf9
--- /dev/null
+++ b/tests/baselines/reference/aliasInaccessibleModule2.types
@@ -0,0 +1,20 @@
+=== tests/cases/compiler/aliasInaccessibleModule2.ts ===
+module M {
+>M : typeof M
+
+    module N {
+>N : typeof N
+
+        class C {
+>C : C
+        }
+        
+    }
+    import R = N;
+>R : typeof N
+>N : typeof N
+
+    export import X = R;
+>X : typeof N
+>R : typeof N
+}
diff --git a/tests/baselines/reference/aliasUsageInAccessorsOfClass.errors.txt b/tests/baselines/reference/aliasUsageInAccessorsOfClass.errors.txt
new file mode 100644
index 00000000000..2fdccc7f49a
--- /dev/null
+++ b/tests/baselines/reference/aliasUsageInAccessorsOfClass.errors.txt
@@ -0,0 +1,30 @@
+==== tests/cases/compiler/aliasUsage1_main.ts (2 errors) ====
+    import Backbone = require("aliasUsage1_backbone");
+    import moduleA = require("aliasUsage1_moduleA");
+    interface IHasVisualizationModel {
+        VisualizationModel: typeof Backbone.Model;
+    }
+    class C2 {
+        x: IHasVisualizationModel;
+        get A() {
+            ~
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
+            return this.x;
+        }
+        set A(x) {
+            ~
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
+            x = moduleA;
+        }
+    }
+==== tests/cases/compiler/aliasUsage1_backbone.ts (0 errors) ====
+    export class Model {
+        public someData: string;
+    }
+    
+==== tests/cases/compiler/aliasUsage1_moduleA.ts (0 errors) ====
+    import Backbone = require("aliasUsage1_backbone");
+    export class VisualizationModel extends Backbone.Model {
+        // interesting stuff here
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/aliasUsageInAccessorsOfClass.js b/tests/baselines/reference/aliasUsageInAccessorsOfClass.js
deleted file mode 100644
index 485aedc971d..00000000000
--- a/tests/baselines/reference/aliasUsageInAccessorsOfClass.js
+++ /dev/null
@@ -1,69 +0,0 @@
-//// [tests/cases/compiler/aliasUsageInAccessorsOfClass.ts] ////
-
-//// [aliasUsage1_backbone.ts]
-export class Model {
-    public someData: string;
-}
-
-//// [aliasUsage1_moduleA.ts]
-import Backbone = require("aliasUsage1_backbone");
-export class VisualizationModel extends Backbone.Model {
-    // interesting stuff here
-}
-
-//// [aliasUsage1_main.ts]
-import Backbone = require("aliasUsage1_backbone");
-import moduleA = require("aliasUsage1_moduleA");
-interface IHasVisualizationModel {
-    VisualizationModel: typeof Backbone.Model;
-}
-class C2 {
-    x: IHasVisualizationModel;
-    get A() {
-        return this.x;
-    }
-    set A(x) {
-        x = moduleA;
-    }
-}
-
-//// [aliasUsage1_backbone.js]
-var Model = (function () {
-    function Model() {
-    }
-    return Model;
-})();
-exports.Model = Model;
-//// [aliasUsage1_moduleA.js]
-var __extends = this.__extends || function (d, b) {
-    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
-    function __() { this.constructor = d; }
-    __.prototype = b.prototype;
-    d.prototype = new __();
-};
-var Backbone = require("aliasUsage1_backbone");
-var VisualizationModel = (function (_super) {
-    __extends(VisualizationModel, _super);
-    function VisualizationModel() {
-        _super.apply(this, arguments);
-    }
-    return VisualizationModel;
-})(Backbone.Model);
-exports.VisualizationModel = VisualizationModel;
-//// [aliasUsage1_main.js]
-var moduleA = require("aliasUsage1_moduleA");
-var C2 = (function () {
-    function C2() {
-    }
-    Object.defineProperty(C2.prototype, "A", {
-        get: function () {
-            return this.x;
-        },
-        set: function (x) {
-            x = moduleA;
-        },
-        enumerable: true,
-        configurable: true
-    });
-    return C2;
-})();
diff --git a/tests/baselines/reference/aliasUsageInAccessorsOfClass.types b/tests/baselines/reference/aliasUsageInAccessorsOfClass.types
deleted file mode 100644
index 8dc3aadedae..00000000000
--- a/tests/baselines/reference/aliasUsageInAccessorsOfClass.types
+++ /dev/null
@@ -1,60 +0,0 @@
-=== tests/cases/compiler/aliasUsage1_main.ts ===
-import Backbone = require("aliasUsage1_backbone");
->Backbone : typeof "tests/cases/compiler/aliasUsage1_backbone"
-
-import moduleA = require("aliasUsage1_moduleA");
->moduleA : typeof "tests/cases/compiler/aliasUsage1_moduleA"
-
-interface IHasVisualizationModel {
->IHasVisualizationModel : IHasVisualizationModel
-
-    VisualizationModel: typeof Backbone.Model;
->VisualizationModel : typeof Model
->Backbone : typeof "tests/cases/compiler/aliasUsage1_backbone"
->Model : typeof Model
-}
-class C2 {
->C2 : C2
-
-    x: IHasVisualizationModel;
->x : IHasVisualizationModel
->IHasVisualizationModel : IHasVisualizationModel
-
-    get A() {
->A : IHasVisualizationModel
-
-        return this.x;
->this.x : IHasVisualizationModel
->this : C2
->x : IHasVisualizationModel
-    }
-    set A(x) {
->A : IHasVisualizationModel
->x : IHasVisualizationModel
-
-        x = moduleA;
->x = moduleA : typeof "tests/cases/compiler/aliasUsage1_moduleA"
->x : IHasVisualizationModel
->moduleA : typeof "tests/cases/compiler/aliasUsage1_moduleA"
-    }
-}
-=== tests/cases/compiler/aliasUsage1_backbone.ts ===
-export class Model {
->Model : Model
-
-    public someData: string;
->someData : string
-}
-
-=== tests/cases/compiler/aliasUsage1_moduleA.ts ===
-import Backbone = require("aliasUsage1_backbone");
->Backbone : typeof "tests/cases/compiler/aliasUsage1_backbone"
-
-export class VisualizationModel extends Backbone.Model {
->VisualizationModel : VisualizationModel
->Backbone : Backbone
->Model : Model
-
-    // interesting stuff here
-}
-
diff --git a/tests/baselines/reference/aliasUsageInGenericFunction.types b/tests/baselines/reference/aliasUsageInGenericFunction.types
index 2d357d58ceb..a54953520db 100644
--- a/tests/baselines/reference/aliasUsageInGenericFunction.types
+++ b/tests/baselines/reference/aliasUsageInGenericFunction.types
@@ -14,7 +14,7 @@ interface IHasVisualizationModel {
 >Model : typeof Model
 }
 function foo<T extends { a: IHasVisualizationModel }>(x: T) {
->foo : <T extends { a: IHasVisualizationModel; }>(x: T) => T
+>foo : typeof foo
 >T : T
 >a : IHasVisualizationModel
 >IHasVisualizationModel : IHasVisualizationModel
@@ -27,7 +27,7 @@ function foo<T extends { a: IHasVisualizationModel }>(x: T) {
 var r = foo({ a: moduleA });
 >r : { a: typeof "tests/cases/compiler/aliasUsageInGenericFunction_moduleA"; }
 >foo({ a: moduleA }) : { a: typeof "tests/cases/compiler/aliasUsageInGenericFunction_moduleA"; }
->foo : <T extends { a: IHasVisualizationModel; }>(x: T) => T
+>foo : typeof foo
 >{ a: moduleA } : { a: typeof "tests/cases/compiler/aliasUsageInGenericFunction_moduleA"; }
 >a : typeof "tests/cases/compiler/aliasUsageInGenericFunction_moduleA"
 >moduleA : moduleA
@@ -35,7 +35,7 @@ var r = foo({ a: moduleA });
 var r2 = foo({ a: <IHasVisualizationModel>null });
 >r2 : { a: IHasVisualizationModel; }
 >foo({ a: <IHasVisualizationModel>null }) : { a: IHasVisualizationModel; }
->foo : <T extends { a: IHasVisualizationModel; }>(x: T) => T
+>foo : typeof foo
 >{ a: <IHasVisualizationModel>null } : { a: IHasVisualizationModel; }
 >a : IHasVisualizationModel
 ><IHasVisualizationModel>null : IHasVisualizationModel
diff --git a/tests/baselines/reference/aliasUsedAsNameValue.types b/tests/baselines/reference/aliasUsedAsNameValue.types
index 3eebbdce7fd..8783d3fd14e 100644
--- a/tests/baselines/reference/aliasUsedAsNameValue.types
+++ b/tests/baselines/reference/aliasUsedAsNameValue.types
@@ -9,17 +9,14 @@ import b = require("aliasUsedAsNameValue_1");
  
 export var a = function () {
 >a : () => void
->function () {
-    //var x = mod.id; // TODO needed hack that mod is loaded
-    b.b(mod);
-} : () => void
+>function () {    //var x = mod.id; // TODO needed hack that mod is loaded    b.b(mod);} : () => void
 
     //var x = mod.id; // TODO needed hack that mod is loaded
     b.b(mod);
 >b.b(mod) : any
->b.b : (a: any) => any
+>b.b : typeof b
 >b : typeof "tests/cases/compiler/aliasUsedAsNameValue_1"
->b : (a: any) => any
+>b : typeof b
 >mod : typeof "tests/cases/compiler/aliasUsedAsNameValue_0"
 }
 
@@ -29,6 +26,6 @@ export var id: number;
 
 === tests/cases/compiler/aliasUsedAsNameValue_1.ts ===
 export function b(a: any): any { return null; }
->b : (a: any) => any
+>b : typeof b
 >a : any
 
diff --git a/tests/baselines/reference/ambientDeclarations.types b/tests/baselines/reference/ambientDeclarations.types
index 38814405521..11b7bae1617 100644
--- a/tests/baselines/reference/ambientDeclarations.types
+++ b/tests/baselines/reference/ambientDeclarations.types
@@ -9,50 +9,50 @@ declare var m: string;
 
 // Ambient function with no type annotations
 declare function fn1();
->fn1 : () => any
+>fn1 : typeof fn1
 
 // Ambient function with type annotations
 declare function fn2(n: string): number;
->fn2 : (n: string) => number
+>fn2 : typeof fn2
 >n : string
 
 // Ambient function with valid overloads
 declare function fn3(n: string): number;
->fn3 : (n: string) => number
+>fn3 : typeof fn3
 >n : string
 
 declare function fn4(n: number, y: number): string;
->fn4 : (n: number, y: number) => string
+>fn4 : typeof fn4
 >n : number
 >y : number
 
 // Ambient function with optional parameters
 declare function fn5(x, y?);
->fn5 : (x: any, y?: any) => any
+>fn5 : typeof fn5
 >x : any
 >y : any
 
 declare function fn6(e?);
->fn6 : (e?: any) => any
+>fn6 : typeof fn6
 >e : any
 
 declare function fn7(x, y?, ...z);
->fn7 : (x: any, y?: any, ...z: any[]) => any
+>fn7 : typeof fn7
 >x : any
 >y : any
 >z : any[]
 
 declare function fn8(y?, ...z: number[]);
->fn8 : (y?: any, ...z: number[]) => any
+>fn8 : typeof fn8
 >y : any
 >z : number[]
 
 declare function fn9(...q: {}[]);
->fn9 : (...q: {}[]) => any
+>fn9 : typeof fn9
 >q : {}[]
 
 declare function fn10<T>(...q: T[]);
->fn10 : <T>(...q: T[]) => any
+>fn10 : typeof fn10
 >T : T
 >q : T[]
 >T : T
@@ -67,7 +67,7 @@ declare class cls {
 >cls : cls
 
     static static(p): number;
->static : (p: any) => number
+>static : typeof static
 >p : any
 
     static q;
@@ -77,7 +77,7 @@ declare class cls {
 >fn : () => any
 
     private static fns();
->fns : () => any
+>fns : typeof fns
 }
 
 // Ambient enum
@@ -141,7 +141,7 @@ declare module M1 {
 >x : any
 
     function fn(): number;
->fn : () => number
+>fn : typeof fn
 }
 
 // Ambient module members are always exported with or without export keyword
@@ -154,9 +154,9 @@ var p = M1.x;
 var q = M1.fn();
 >q : number
 >M1.fn() : number
->M1.fn : () => number
+>M1.fn : typeof fn
 >M1 : typeof M1
->fn : () => number
+>fn : typeof fn
 
 // Ambient external module in the global module
 // Ambient external module with a string literal name that is a top level external module name
diff --git a/tests/baselines/reference/ambientExternalModuleWithRelativeModuleName.errors.txt b/tests/baselines/reference/ambientExternalModuleWithRelativeModuleName.errors.txt
index fba44282cc3..084ff473afc 100644
--- a/tests/baselines/reference/ambientExternalModuleWithRelativeModuleName.errors.txt
+++ b/tests/baselines/reference/ambientExternalModuleWithRelativeModuleName.errors.txt
@@ -1,12 +1,6 @@
-==== tests/cases/compiler/ambientExternalModuleWithRelativeModuleName.ts (2 errors) ====
+==== tests/cases/compiler/ambientExternalModuleWithRelativeModuleName.ts (1 errors) ====
     declare module "./relativeModule" {
                    ~~~~~~~~~~~~~~~~~~
-!!! Ambient external module declaration cannot specify relative module name.
-        var x: string;
-    }
-    
-    declare module ".\\relativeModule" {
-                   ~~~~~~~~~~~~~~~~~~~
 !!! Ambient external module declaration cannot specify relative module name.
         var x: string;
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/ambientExternalModuleWithRelativeModuleName.js b/tests/baselines/reference/ambientExternalModuleWithRelativeModuleName.js
index 9a4622a1b7e..6eb77f96970 100644
--- a/tests/baselines/reference/ambientExternalModuleWithRelativeModuleName.js
+++ b/tests/baselines/reference/ambientExternalModuleWithRelativeModuleName.js
@@ -1,10 +1,6 @@
 //// [ambientExternalModuleWithRelativeModuleName.ts]
 declare module "./relativeModule" {
     var x: string;
-}
-
-declare module ".\\relativeModule" {
-    var x: string;
 }
 
 //// [ambientExternalModuleWithRelativeModuleName.js]
diff --git a/tests/baselines/reference/ambientGetters.errors.txt b/tests/baselines/reference/ambientGetters.errors.txt
index a01c146d977..0ed6bda5848 100644
--- a/tests/baselines/reference/ambientGetters.errors.txt
+++ b/tests/baselines/reference/ambientGetters.errors.txt
@@ -1,13 +1,12 @@
 ==== tests/cases/compiler/ambientGetters.ts (2 errors) ====
-    
     declare class A {
         get length() : number;
             ~~~~~~
-!!! An accessor cannot be declared in an ambient context.
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
     }
     
     declare class B {
         get length() { return 0; }
             ~~~~~~
-!!! An accessor cannot be declared in an ambient context.
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/ambientModuleExports.types b/tests/baselines/reference/ambientModuleExports.types
index bb964bd3927..deb49b17694 100644
--- a/tests/baselines/reference/ambientModuleExports.types
+++ b/tests/baselines/reference/ambientModuleExports.types
@@ -3,7 +3,7 @@ declare module Foo {
 >Foo : typeof Foo
 
 	function a():void;
->a : () => void
+>a : typeof a
 
 	var b:number;
 >b : number
@@ -14,9 +14,9 @@ declare module Foo {
 
 Foo.a();
 >Foo.a() : void
->Foo.a : () => void
+>Foo.a : typeof a
 >Foo : typeof Foo
->a : () => void
+>a : typeof a
 
 Foo.b;
 >Foo.b : number
@@ -34,7 +34,7 @@ declare module Foo2 {
 >Foo2 : typeof Foo2
 
     export function a(): void;
->a : () => void
+>a : typeof a
 
     export var b: number;
 >b : number
@@ -45,9 +45,9 @@ declare module Foo2 {
 
 Foo2.a();
 >Foo2.a() : void
->Foo2.a : () => void
+>Foo2.a : typeof a
 >Foo2 : typeof Foo2
->a : () => void
+>a : typeof a
 
 Foo2.b;
 >Foo2.b : number
diff --git a/tests/baselines/reference/ambiguousOverloadResolution.types b/tests/baselines/reference/ambiguousOverloadResolution.types
index dd42b44d7c3..17ce79db6f1 100644
--- a/tests/baselines/reference/ambiguousOverloadResolution.types
+++ b/tests/baselines/reference/ambiguousOverloadResolution.types
@@ -8,14 +8,14 @@ class B extends A { x: number; }
 >x : number
 
 declare function f(p: A, q: B): number;
->f : { (p: A, q: B): number; (p: B, q: A): string; }
+>f : typeof f
 >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; }
+>f : typeof f
 >p : B
 >B : B
 >q : A
@@ -28,7 +28,7 @@ var x: B;
 var t: number = f(x, x); // Not an error
 >t : number
 >f(x, x) : number
->f : { (p: A, q: B): number; (p: B, q: A): string; }
+>f : typeof f
 >x : B
 >x : B
 
diff --git a/tests/baselines/reference/amdDependencyComment2.errors.txt b/tests/baselines/reference/amdDependencyComment2.errors.txt
deleted file mode 100644
index edab2e9c955..00000000000
--- a/tests/baselines/reference/amdDependencyComment2.errors.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-==== tests/cases/compiler/amdDependencyComment2.ts (1 errors) ====
-    ///<amd-dependency path='bar'/>
-    
-    import m1 = require("m2")
-                        ~~~~
-!!! Cannot find external module 'm2'.
-    m1.f();
\ No newline at end of file
diff --git a/tests/baselines/reference/anyAsReturnTypeForNewOnCall.types b/tests/baselines/reference/anyAsReturnTypeForNewOnCall.types
index f25cd57831b..e95e692c34d 100644
--- a/tests/baselines/reference/anyAsReturnTypeForNewOnCall.types
+++ b/tests/baselines/reference/anyAsReturnTypeForNewOnCall.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/anyAsReturnTypeForNewOnCall.ts ===
 function Point(x, y) {
->Point : (x: any, y: any) => void
+>Point : typeof Point
 >x : any
 >y : any
 
@@ -23,7 +23,7 @@ function Point(x, y) {
 var o = new Point(3, 4);
 >o : any
 >new Point(3, 4) : any
->Point : (x: any, y: any) => void
+>Point : typeof Point
 
 var xx = o.x;
 >xx : any
diff --git a/tests/baselines/reference/anyAssignabilityInInheritance.types b/tests/baselines/reference/anyAssignabilityInInheritance.types
index f5a4f22ef3f..795e4a1f332 100644
--- a/tests/baselines/reference/anyAssignabilityInInheritance.types
+++ b/tests/baselines/reference/anyAssignabilityInInheritance.types
@@ -15,107 +15,107 @@ var a: any;
 >a : any
 
 declare function foo2(x: number): number;
->foo2 : { (x: number): number; (x: any): any; }
+>foo2 : typeof foo2
 >x : number
 
 declare function foo2(x: any): any;
->foo2 : { (x: number): number; (x: any): any; }
+>foo2 : typeof foo2
 >x : any
 
 var r3 = foo2(a); // any, not a subtype of number so it skips that overload, is a subtype of itself so it picks second (if truly ambiguous it would pick first overload)
 >r3 : any
 >foo2(a) : any
->foo2 : { (x: number): number; (x: any): any; }
+>foo2 : typeof foo2
 >a : any
 
 declare function foo3(x: string): string;
->foo3 : { (x: string): string; (x: any): any; }
+>foo3 : typeof foo3
 >x : string
 
 declare function foo3(x: any): any;
->foo3 : { (x: string): string; (x: any): any; }
+>foo3 : typeof foo3
 >x : any
 
 var r3 = foo3(a); // any
 >r3 : any
 >foo3(a) : any
->foo3 : { (x: string): string; (x: any): any; }
+>foo3 : typeof foo3
 >a : any
 
 declare function foo4(x: boolean): boolean;
->foo4 : { (x: boolean): boolean; (x: any): any; }
+>foo4 : typeof foo4
 >x : boolean
 
 declare function foo4(x: any): any;
->foo4 : { (x: boolean): boolean; (x: any): any; }
+>foo4 : typeof foo4
 >x : any
 
 var r3 = foo3(a); // any
 >r3 : any
 >foo3(a) : any
->foo3 : { (x: string): string; (x: any): any; }
+>foo3 : typeof foo3
 >a : any
 
 declare function foo5(x: Date): Date;
->foo5 : { (x: Date): Date; (x: any): any; }
+>foo5 : typeof foo5
 >x : Date
 >Date : Date
 >Date : Date
 
 declare function foo5(x: any): any;
->foo5 : { (x: Date): Date; (x: any): any; }
+>foo5 : typeof foo5
 >x : any
 
 var r3 = foo3(a); // any
 >r3 : any
 >foo3(a) : any
->foo3 : { (x: string): string; (x: any): any; }
+>foo3 : typeof foo3
 >a : any
 
 declare function foo6(x: RegExp): RegExp;
->foo6 : { (x: RegExp): RegExp; (x: any): any; }
+>foo6 : typeof foo6
 >x : RegExp
 >RegExp : RegExp
 >RegExp : RegExp
 
 declare function foo6(x: any): any;
->foo6 : { (x: RegExp): RegExp; (x: any): any; }
+>foo6 : typeof foo6
 >x : any
 
 var r3 = foo3(a); // any
 >r3 : any
 >foo3(a) : any
->foo3 : { (x: string): string; (x: any): any; }
+>foo3 : typeof foo3
 >a : any
 
 declare function foo7(x: { bar: number }): { bar: number };
->foo7 : { (x: { bar: number; }): { bar: number; }; (x: any): any; }
+>foo7 : typeof foo7
 >x : { bar: number; }
 >bar : number
 >bar : number
 
 declare function foo7(x: any): any;
->foo7 : { (x: { bar: number; }): { bar: number; }; (x: any): any; }
+>foo7 : typeof foo7
 >x : any
 
 var r3 = foo3(a); // any
 >r3 : any
 >foo3(a) : any
->foo3 : { (x: string): string; (x: any): any; }
+>foo3 : typeof foo3
 >a : any
 
 declare function foo8(x: number[]): number[];
->foo8 : { (x: number[]): number[]; (x: any): any; }
+>foo8 : typeof foo8
 >x : number[]
 
 declare function foo8(x: any): any;
->foo8 : { (x: number[]): number[]; (x: any): any; }
+>foo8 : typeof foo8
 >x : any
 
 var r3 = foo3(a); // any
 >r3 : any
 >foo3(a) : any
->foo3 : { (x: string): string; (x: any): any; }
+>foo3 : typeof foo3
 >a : any
 
 interface I8 { foo: string }
@@ -123,19 +123,19 @@ interface I8 { foo: string }
 >foo : string
 
 declare function foo9(x: I8): I8;
->foo9 : { (x: I8): I8; (x: any): any; }
+>foo9 : typeof foo9
 >x : I8
 >I8 : I8
 >I8 : I8
 
 declare function foo9(x: any): any;
->foo9 : { (x: I8): I8; (x: any): any; }
+>foo9 : typeof foo9
 >x : any
 
 var r3 = foo3(a); // any
 >r3 : any
 >foo3(a) : any
->foo3 : { (x: string): string; (x: any): any; }
+>foo3 : typeof foo3
 >a : any
 
 class A { foo: number; }
@@ -143,19 +143,19 @@ class A { foo: number; }
 >foo : number
 
 declare function foo10(x: A): A;
->foo10 : { (x: A): A; (x: any): any; }
+>foo10 : typeof foo10
 >x : A
 >A : A
 >A : A
 
 declare function foo10(x: any): any;
->foo10 : { (x: A): A; (x: any): any; }
+>foo10 : typeof foo10
 >x : any
 
 var r3 = foo3(a); // any
 >r3 : any
 >foo3(a) : any
->foo3 : { (x: string): string; (x: any): any; }
+>foo3 : typeof foo3
 >a : any
 
 class A2<T> { foo: T; }
@@ -165,39 +165,39 @@ class A2<T> { foo: T; }
 >T : T
 
 declare function foo11(x: A2<string>): A2<string>;
->foo11 : { (x: A2<string>): A2<string>; (x: any): any; }
+>foo11 : typeof foo11
 >x : A2<string>
 >A2 : A2<T>
 >A2 : A2<T>
 
 declare function foo11(x: any): any;
->foo11 : { (x: A2<string>): A2<string>; (x: any): any; }
+>foo11 : typeof foo11
 >x : any
 
 var r3 = foo3(a); // any
 >r3 : any
 >foo3(a) : any
->foo3 : { (x: string): string; (x: any): any; }
+>foo3 : typeof foo3
 >a : any
 
 declare function foo12(x: (x) => number): (x) => number;
->foo12 : { (x: (x: any) => number): (x: any) => number; (x: any): any; }
+>foo12 : typeof foo12
 >x : (x: any) => number
 >x : any
 >x : any
 
 declare function foo12(x: any): any;
->foo12 : { (x: (x: any) => number): (x: any) => number; (x: any): any; }
+>foo12 : typeof foo12
 >x : any
 
 var r3 = foo3(a); // any
 >r3 : any
 >foo3(a) : any
->foo3 : { (x: string): string; (x: any): any; }
+>foo3 : typeof 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; }
+>foo13 : typeof foo13
 >x : <T>(x: T) => T
 >T : T
 >x : T
@@ -209,13 +209,13 @@ declare function foo13(x: <T>(x: T) => T): <T>(x: T) => T;
 >T : T
 
 declare function foo13(x: any): any;
->foo13 : { (x: <T>(x: T) => T): <T>(x: T) => T; (x: any): any; }
+>foo13 : typeof foo13
 >x : any
 
 var r3 = foo3(a); // any
 >r3 : any
 >foo3(a) : any
->foo3 : { (x: string): string; (x: any): any; }
+>foo3 : typeof foo3
 >a : any
 
 enum E { A }
@@ -223,19 +223,19 @@ enum E { A }
 >A : E
 
 declare function foo14(x: E): E;
->foo14 : { (x: E): E; (x: any): any; }
+>foo14 : typeof foo14
 >x : E
 >E : E
 >E : E
 
 declare function foo14(x: any): any;
->foo14 : { (x: E): E; (x: any): any; }
+>foo14 : typeof foo14
 >x : any
 
 var r3 = foo3(a); // any
 >r3 : any
 >foo3(a) : any
->foo3 : { (x: string): string; (x: any): any; }
+>foo3 : typeof foo3
 >a : any
 
 function f() { }
@@ -248,19 +248,19 @@ module f {
 >bar : number
 }
 declare function foo15(x: typeof f): typeof f;
->foo15 : { (x: typeof f): typeof f; (x: any): any; }
+>foo15 : typeof foo15
 >x : typeof f
 >f : typeof f
 >f : typeof f
 
 declare function foo15(x: any): any;
->foo15 : { (x: typeof f): typeof f; (x: any): any; }
+>foo15 : typeof foo15
 >x : any
 
 var r3 = foo3(a); // any
 >r3 : any
 >foo3(a) : any
->foo3 : { (x: string): string; (x: any): any; }
+>foo3 : typeof foo3
 >a : any
 
 class CC { baz: string }
@@ -274,48 +274,48 @@ module CC {
 >bar : number
 }
 declare function foo16(x: CC): CC;
->foo16 : { (x: CC): CC; (x: any): any; }
+>foo16 : typeof foo16
 >x : CC
 >CC : CC
 >CC : CC
 
 declare function foo16(x: any): any;
->foo16 : { (x: CC): CC; (x: any): any; }
+>foo16 : typeof foo16
 >x : any
 
 var r3 = foo3(a); // any
 >r3 : any
 >foo3(a) : any
->foo3 : { (x: string): string; (x: any): any; }
+>foo3 : typeof foo3
 >a : any
 
 declare function foo17(x: Object): Object;
->foo17 : { (x: Object): Object; (x: any): any; }
+>foo17 : typeof foo17
 >x : Object
 >Object : Object
 >Object : Object
 
 declare function foo17(x: any): any;
->foo17 : { (x: Object): Object; (x: any): any; }
+>foo17 : typeof foo17
 >x : any
 
 var r3 = foo3(a); // any
 >r3 : any
 >foo3(a) : any
->foo3 : { (x: string): string; (x: any): any; }
+>foo3 : typeof foo3
 >a : any
 
 declare function foo18(x: {}): {};
->foo18 : { (x: {}): {}; (x: any): any; }
+>foo18 : typeof foo18
 >x : {}
 
 declare function foo18(x: any): any;
->foo18 : { (x: {}): {}; (x: any): any; }
+>foo18 : typeof foo18
 >x : any
 
 var r3 = foo3(a); // any
 >r3 : any
 >foo3(a) : any
->foo3 : { (x: string): string; (x: any): any; }
+>foo3 : typeof foo3
 >a : any
 
diff --git a/tests/baselines/reference/anyAssignableToEveryType.types b/tests/baselines/reference/anyAssignableToEveryType.types
index c2a9b324d96..36c24c6ac3d 100644
--- a/tests/baselines/reference/anyAssignableToEveryType.types
+++ b/tests/baselines/reference/anyAssignableToEveryType.types
@@ -121,7 +121,7 @@ var q: String = a;
 >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
+>foo : typeof foo
 >T : T
 >U : U
 >V : V
diff --git a/tests/baselines/reference/anyInferenceAnonymousFunctions.types b/tests/baselines/reference/anyInferenceAnonymousFunctions.types
index ac249f83414..8dc7fdcb90f 100644
--- a/tests/baselines/reference/anyInferenceAnonymousFunctions.types
+++ b/tests/baselines/reference/anyInferenceAnonymousFunctions.types
@@ -3,19 +3,11 @@ var paired: any[];
 >paired : any[]
 
 paired.reduce(function (a1, a2) {
->paired.reduce(function (a1, a2) {
-
-    return a1.concat({});
-
-} , []) : any
+>paired.reduce(function (a1, a2) {    return a1.concat({});} , []) : any
 >paired.reduce : { (callbackfn: (previousValue: any, currentValue: any, currentIndex: number, array: any[]) => any, initialValue?: any): any; <U>(callbackfn: (previousValue: U, currentValue: any, currentIndex: number, array: any[]) => U, initialValue: U): U; }
 >paired : any[]
 >reduce : { (callbackfn: (previousValue: any, currentValue: any, currentIndex: number, array: any[]) => any, initialValue?: any): any; <U>(callbackfn: (previousValue: U, currentValue: any, currentIndex: number, array: any[]) => U, initialValue: U): U; }
->function (a1, a2) {
-
-    return a1.concat({});
-
-} : (a1: any, a2: any) => any
+>function (a1, a2) {    return a1.concat({});} : (a1: any, a2: any) => any
 >a1 : any
 >a2 : any
 
@@ -30,17 +22,11 @@ paired.reduce(function (a1, a2) {
 >[] : undefined[]
 
 paired.reduce((b1, b2) => {
->paired.reduce((b1, b2) => {
-
-    return b1.concat({});
-} , []) : any
+>paired.reduce((b1, b2) => {    return b1.concat({});} , []) : any
 >paired.reduce : { (callbackfn: (previousValue: any, currentValue: any, currentIndex: number, array: any[]) => any, initialValue?: any): any; <U>(callbackfn: (previousValue: U, currentValue: any, currentIndex: number, array: any[]) => U, initialValue: U): U; }
 >paired : any[]
 >reduce : { (callbackfn: (previousValue: any, currentValue: any, currentIndex: number, array: any[]) => any, initialValue?: any): any; <U>(callbackfn: (previousValue: U, currentValue: any, currentIndex: number, array: any[]) => U, initialValue: U): U; }
->(b1, b2) => {
-
-    return b1.concat({});
-} : (b1: any, b2: any) => any
+>(b1, b2) => {    return b1.concat({});} : (b1: any, b2: any) => any
 >b1 : any
 >b2 : any
 
diff --git a/tests/baselines/reference/arguments.types b/tests/baselines/reference/arguments.types
index 1902e459316..5adaf29a8ba 100644
--- a/tests/baselines/reference/arguments.types
+++ b/tests/baselines/reference/arguments.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/arguments.ts ===
 function f() {
->f : () => void
+>f : typeof f
 
     var x=arguments[12];
 >x : any
diff --git a/tests/baselines/reference/argumentsUsedInObjectLiteralProperty.types b/tests/baselines/reference/argumentsUsedInObjectLiteralProperty.types
index 532412d0c08..63c7c5d556e 100644
--- a/tests/baselines/reference/argumentsUsedInObjectLiteralProperty.types
+++ b/tests/baselines/reference/argumentsUsedInObjectLiteralProperty.types
@@ -3,14 +3,12 @@ class A {
 >A : A
 
     public static createSelectableViewModel(initialState?: any, selectedValue?: any) {
->createSelectableViewModel : (initialState?: any, selectedValue?: any) => { selectedValue: number; }
+>createSelectableViewModel : typeof createSelectableViewModel
 >initialState : any
 >selectedValue : any
 
         return {
->{
-            selectedValue: arguments.length
-        } : { selectedValue: number; }
+>{            selectedValue: arguments.length        } : { selectedValue: number; }
 
             selectedValue: arguments.length
 >selectedValue : number
diff --git a/tests/baselines/reference/arrayConcatMap.types b/tests/baselines/reference/arrayConcatMap.types
index 643f1a6a57e..92da3edf93f 100644
--- a/tests/baselines/reference/arrayConcatMap.types
+++ b/tests/baselines/reference/arrayConcatMap.types
@@ -1,10 +1,8 @@
 === tests/cases/compiler/arrayConcatMap.ts ===
 var x = [].concat([{ a: 1 }], [{ a: 2 }])
 >x : any[]
->[].concat([{ a: 1 }], [{ a: 2 }])
-          .map(b => b.a) : any[]
->[].concat([{ a: 1 }], [{ a: 2 }])
-          .map : <U>(callbackfn: (value: any, index: number, array: any[]) => U, thisArg?: any) => U[]
+>[].concat([{ a: 1 }], [{ a: 2 }])          .map(b => b.a) : any[]
+>[].concat([{ a: 1 }], [{ a: 2 }])          .map : <U>(callbackfn: (value: any, index: number, array: any[]) => U, thisArg?: any) => U[]
 >[].concat([{ a: 1 }], [{ a: 2 }]) : any[]
 >[].concat : { <U extends any[]>(...items: U[]): any[]; (...items: any[]): any[]; }
 >[] : undefined[]
diff --git a/tests/baselines/reference/arrayLiteralInNonVarArgParameter.types b/tests/baselines/reference/arrayLiteralInNonVarArgParameter.types
index c4889e223bb..9afd479dc7f 100644
--- a/tests/baselines/reference/arrayLiteralInNonVarArgParameter.types
+++ b/tests/baselines/reference/arrayLiteralInNonVarArgParameter.types
@@ -1,11 +1,11 @@
 === tests/cases/compiler/arrayLiteralInNonVarArgParameter.ts ===
 function panic(val: string[], ...opt: string[]) { }
->panic : (val: string[], ...opt: string[]) => void
+>panic : typeof panic
 >val : string[]
 >opt : string[]
 
 panic([], 'one', 'two');
 >panic([], 'one', 'two') : void
->panic : (val: string[], ...opt: string[]) => void
+>panic : typeof panic
 >[] : string[]
 
diff --git a/tests/baselines/reference/arrayLiteralTypeInference.types b/tests/baselines/reference/arrayLiteralTypeInference.types
index a5f1cb97084..5b4d9b7fff8 100644
--- a/tests/baselines/reference/arrayLiteralTypeInference.types
+++ b/tests/baselines/reference/arrayLiteralTypeInference.types
@@ -25,10 +25,7 @@ class ActionB extends Action {
 var x1: Action[] = [
 >x1 : Action[]
 >Action : Action
->[
-    { id: 2, trueness: false },
-    { id: 3, name: "three" }
-] : Action[]
+>[    { id: 2, trueness: false },    { id: 3, name: "three" }] : Action[]
 
     { id: 2, trueness: false },
 >{ id: 2, trueness: false } : { id: number; trueness: boolean; }
@@ -45,10 +42,7 @@ var x1: Action[] = [
 var x2: Action[] = [
 >x2 : Action[]
 >Action : Action
->[
-    new ActionA(),
-    new ActionB()
-] : Action[]
+>[    new ActionA(),    new ActionB()] : Action[]
 
     new ActionA(),
 >new ActionA() : ActionA
@@ -63,11 +57,7 @@ var x2: Action[] = [
 var x3: Action[] = [
 >x3 : Action[]
 >Action : Action
->[
-    new Action(),
-    new ActionA(),
-    new ActionB()
-] : Action[]
+>[    new Action(),    new ActionA(),    new ActionB()] : Action[]
 
     new Action(),
 >new Action() : Action
@@ -88,10 +78,7 @@ var z1: { id: number }[] =
 >id : number
 
     [
->[
-        { id: 2, trueness: false },
-        { id: 3, name: "three" }
-    ] : { id: number; }[]
+>[        { id: 2, trueness: false },        { id: 3, name: "three" }    ] : { id: number; }[]
 
         { id: 2, trueness: false },
 >{ id: 2, trueness: false } : { id: number; trueness: boolean; }
@@ -110,10 +97,7 @@ var z2: { id: number }[] =
 >id : number
 
     [
->[
-        new ActionA(),
-        new ActionB()
-    ] : { id: number; }[]
+>[        new ActionA(),        new ActionB()    ] : { id: number; }[]
 
         new ActionA(),
 >new ActionA() : ActionA
@@ -130,11 +114,7 @@ var z3: { id: number }[] =
 >id : number
 
     [
->[
-        new Action(),
-        new ActionA(),
-        new ActionB()
-    ] : { id: number; }[]
+>[        new Action(),        new ActionA(),        new ActionB()    ] : { id: number; }[]
 
         new Action(),
 >new Action() : Action
diff --git a/tests/baselines/reference/arrayconcat.types b/tests/baselines/reference/arrayconcat.types
index 0ae65d31426..37e7308aad9 100644
--- a/tests/baselines/reference/arrayconcat.types
+++ b/tests/baselines/reference/arrayconcat.types
@@ -36,50 +36,17 @@ class parser {
 >m : () => void
 
 		this.options = this.options.sort(function(a, b) {
->this.options = this.options.sort(function(a, b) {
-            var aName = a.name.toLowerCase();
-            var bName = b.name.toLowerCase();
-
-            if (aName > bName) {
-                return 1;
-            } else if (aName < bName) {
-                return -1;
-            } else {
-                return 0;
-            }
-        }) : IOptions[]
+>this.options = this.options.sort(function(a, b) {            var aName = a.name.toLowerCase();            var bName = b.name.toLowerCase();            if (aName > bName) {                return 1;            } else if (aName < bName) {                return -1;            } else {                return 0;            }        }) : IOptions[]
 >this.options : IOptions[]
 >this : parser
 >options : IOptions[]
->this.options.sort(function(a, b) {
-            var aName = a.name.toLowerCase();
-            var bName = b.name.toLowerCase();
-
-            if (aName > bName) {
-                return 1;
-            } else if (aName < bName) {
-                return -1;
-            } else {
-                return 0;
-            }
-        }) : IOptions[]
+>this.options.sort(function(a, b) {            var aName = a.name.toLowerCase();            var bName = b.name.toLowerCase();            if (aName > bName) {                return 1;            } else if (aName < bName) {                return -1;            } else {                return 0;            }        }) : IOptions[]
 >this.options.sort : (compareFn?: (a: IOptions, b: IOptions) => number) => IOptions[]
 >this.options : IOptions[]
 >this : parser
 >options : IOptions[]
 >sort : (compareFn?: (a: IOptions, b: IOptions) => number) => IOptions[]
->function(a, b) {
-            var aName = a.name.toLowerCase();
-            var bName = b.name.toLowerCase();
-
-            if (aName > bName) {
-                return 1;
-            } else if (aName < bName) {
-                return -1;
-            } else {
-                return 0;
-            }
-        } : (a: IOptions, b: IOptions) => number
+>function(a, b) {            var aName = a.name.toLowerCase();            var bName = b.name.toLowerCase();            if (aName > bName) {                return 1;            } else if (aName < bName) {                return -1;            } else {                return 0;            }        } : (a: IOptions, b: IOptions) => number
 >a : IOptions
 >b : IOptions
 
diff --git a/tests/baselines/reference/arrowFunctionExpressions.types b/tests/baselines/reference/arrowFunctionExpressions.types
index 6d23dcd6600..8a27de65225 100644
--- a/tests/baselines/reference/arrowFunctionExpressions.types
+++ b/tests/baselines/reference/arrowFunctionExpressions.types
@@ -118,7 +118,7 @@ var e: number;
 
 // Arrow function used in arrow function used in function
 function someFn() {
->someFn : () => void
+>someFn : typeof someFn
 
     var arr = (n: number) => (p: number) => p * n;
 >arr : (n: number) => (p: number) => number
@@ -141,7 +141,7 @@ function someFn() {
 
 // Arrow function used in function
 function someOtherFn() {
->someOtherFn : () => void
+>someOtherFn : typeof someOtherFn
 
     var arr = (n: number) => '' + n;
 >arr : (n: number) => string
@@ -160,7 +160,7 @@ function someOtherFn() {
 
 // Arrow function used in nested function in function
 function outerFn() {
->outerFn : () => void
+>outerFn : typeof outerFn
 
     function innerFn() {
 >innerFn : () => void
@@ -182,12 +182,7 @@ function outerFn() {
 // Arrow function used in nested function in arrow function
 var f = (n: string) => {
 >f : (n: string) => () => string
->(n: string) => {
-    function fn(x: number) {
-        return () => n + x;
-    }
-    return fn(4);
-} : (n: string) => () => string
+>(n: string) => {    function fn(x: number) {        return () => n + x;    }    return fn(4);} : (n: string) => () => string
 >n : string
 
     function fn(x: number) {
@@ -216,16 +211,11 @@ var g: string;
 
 // Arrow function used in nested function in arrow function in nested function
 function someOuterFn() {
->someOuterFn : () => (n: string) => () => () => number
+>someOuterFn : typeof someOuterFn
 
     var arr = (n: string) => {
 >arr : (n: string) => () => () => number
->(n: string) => {
-        function innerFn() {
-            return () => n.length;
-        }
-        return innerFn;
-    } : (n: string) => () => () => number
+>(n: string) => {        function innerFn() {            return () => n.length;        }        return innerFn;    } : (n: string) => () => () => number
 >n : string
 
         function innerFn() {
@@ -249,7 +239,7 @@ var h = someOuterFn()('')()();
 >someOuterFn()('')() : () => number
 >someOuterFn()('') : () => () => number
 >someOuterFn() : (n: string) => () => () => number
->someOuterFn : () => (n: string) => () => () => number
+>someOuterFn : typeof someOuterFn
 
 h.toExponential();
 >h.toExponential() : string
@@ -259,7 +249,7 @@ h.toExponential();
 
 // Arrow function used in try/catch/finally in function
 function tryCatchFn() {
->tryCatchFn : () => void
+>tryCatchFn : typeof tryCatchFn
 
     try {
         var x = () => this;
diff --git a/tests/baselines/reference/arrowFunctionMissingCurlyWithSemicolon.errors.txt b/tests/baselines/reference/arrowFunctionMissingCurlyWithSemicolon.errors.txt
deleted file mode 100644
index a0cf2c00518..00000000000
--- a/tests/baselines/reference/arrowFunctionMissingCurlyWithSemicolon.errors.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-==== tests/cases/compiler/arrowFunctionMissingCurlyWithSemicolon.ts (1 errors) ====
-    // Should error at semicolon.
-    var f = () => ;
-                  ~
-!!! Expression expected.
-    var b = 1 * 2 * 3 * 4;
-    var square = (x: number) => x * x;
\ No newline at end of file
diff --git a/tests/baselines/reference/arrowFunctionsMissingTokens.errors.txt b/tests/baselines/reference/arrowFunctionsMissingTokens.errors.txt
deleted file mode 100644
index 69b94cd7d46..00000000000
--- a/tests/baselines/reference/arrowFunctionsMissingTokens.errors.txt
+++ /dev/null
@@ -1,115 +0,0 @@
-==== tests/cases/compiler/arrowFunctionsMissingTokens.ts (24 errors) ====
-    
-    module missingArrowsWithCurly {
-        var a = () { };
-                   ~
-!!! '=>' expected.
-    
-        var b = (): void { }
-                         ~
-!!! '=>' expected.
-    
-        var c = (x) { };
-                    ~
-!!! '=>' expected.
-    
-        var d = (x: number, y: string) { };
-                                       ~
-!!! '=>' expected.
-    
-        var e = (x: number, y: string): void { };
-                                             ~
-!!! '=>' expected.
-    }
-    
-    module missingCurliesWithArrow {
-        module withStatement {
-            var a = () => var k = 10;};
-                          ~~~
-!!! '{' expected.
-    
-            var b = (): void => var k = 10;}
-                                ~~~
-!!! '{' expected.
-    
-            var c = (x) => var k = 10;};
-                           ~~~
-!!! '{' expected.
-    
-            var d = (x: number, y: string) => var k = 10;};
-                                              ~~~
-!!! '{' expected.
-    
-            var e = (x: number, y: string): void => var k = 10;};
-                                                    ~~~
-!!! '{' expected.
-    
-            var f = () => var k = 10;}
-                          ~~~
-!!! '{' expected.
-        }
-    
-        module withoutStatement {
-            var a = () => };
-                          ~
-!!! Expression expected.
-    
-            var b = (): void => }
-                                ~
-!!! Expression expected.
-    
-            var c = (x) => };
-                           ~
-!!! Expression expected.
-    
-            var d = (x: number, y: string) => };
-                                              ~
-!!! Expression expected.
-    
-            var e = (x: number, y: string): void => };
-                                                    ~
-!!! Expression expected.
-    
-            var f = () => }
-                          ~
-!!! Expression expected.
-        }
-        ~
-!!! Declaration or statement expected.
-    }
-    ~
-!!! Declaration or statement expected.
-    
-    module ce_nEst_pas_une_arrow_function {
-        var a = ();
-                 ~
-!!! Expression expected.
-    
-        var b = (): void;
-                        ~
-!!! '=>' expected.
-    
-        var c = (x);
-                 ~
-!!! Cannot find name 'x'.
-    
-        var d = (x: number, y: string);
-                                      ~
-!!! '=>' expected.
-    
-        var e = (x: number, y: string): void;
-                                            ~
-!!! '=>' expected.
-    }
-    
-    module okay {
-        var a = () => { };
-    
-        var b = (): void => { }
-    
-        var c = (x) => { };
-    
-        var d = (x: number, y: string) => { };
-    
-        var e = (x: number, y: string): void => { };
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/asiAmbientFunctionDeclaration.js b/tests/baselines/reference/asiAmbientFunctionDeclaration.js
deleted file mode 100644
index 30b7e76056a..00000000000
--- a/tests/baselines/reference/asiAmbientFunctionDeclaration.js
+++ /dev/null
@@ -1,4 +0,0 @@
-//// [asiAmbientFunctionDeclaration.ts]
-declare function foo()
-
-//// [asiAmbientFunctionDeclaration.js]
diff --git a/tests/baselines/reference/asiAmbientFunctionDeclaration.types b/tests/baselines/reference/asiAmbientFunctionDeclaration.types
deleted file mode 100644
index 40ad7f2ba94..00000000000
--- a/tests/baselines/reference/asiAmbientFunctionDeclaration.types
+++ /dev/null
@@ -1,4 +0,0 @@
-=== tests/cases/compiler/asiAmbientFunctionDeclaration.ts ===
-declare function foo()
->foo : () => any
-
diff --git a/tests/baselines/reference/asiArith.types b/tests/baselines/reference/asiArith.types
index 5a4ae5fbcc4..d6c0c7abd71 100644
--- a/tests/baselines/reference/asiArith.types
+++ b/tests/baselines/reference/asiArith.types
@@ -9,30 +9,16 @@ var z =
 >z : number
 
 x
->x
-
-+
-
-+
-
-+
-
-y : number
+>x+++y : number
 >x : number
 
 +
 
 +
->+
-
-+
-
-y : number
+>++y : number
 
 +
->+
-
-y : number
+>+y : number
 
 y
 >y : number
@@ -48,30 +34,16 @@ var c =
 >c : number
 
 x
->x
-
--
-
--
-
--
-
-y : number
+>x---y : number
 >x : number
 
 -
 
 -
->-
-
--
-
-y : number
+>--y : number
 
 -
->-
-
-y : number
+>-y : number
 
 y
 >y : number
diff --git a/tests/baselines/reference/asiBreak.js b/tests/baselines/reference/asiBreak.js
deleted file mode 100644
index cd890f74de7..00000000000
--- a/tests/baselines/reference/asiBreak.js
+++ /dev/null
@@ -1,6 +0,0 @@
-//// [asiBreak.ts]
-while (true) break
-
-//// [asiBreak.js]
-while (true)
-    break;
diff --git a/tests/baselines/reference/asiBreak.types b/tests/baselines/reference/asiBreak.types
deleted file mode 100644
index 355d27f2a43..00000000000
--- a/tests/baselines/reference/asiBreak.types
+++ /dev/null
@@ -1,3 +0,0 @@
-=== tests/cases/compiler/asiBreak.ts ===
-while (true) break
-No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/asiContinue.js b/tests/baselines/reference/asiContinue.js
deleted file mode 100644
index b2b9bc751cc..00000000000
--- a/tests/baselines/reference/asiContinue.js
+++ /dev/null
@@ -1,6 +0,0 @@
-//// [asiContinue.ts]
-while (true) continue
-
-//// [asiContinue.js]
-while (true)
-    continue;
diff --git a/tests/baselines/reference/asiContinue.types b/tests/baselines/reference/asiContinue.types
deleted file mode 100644
index 5b3f0145377..00000000000
--- a/tests/baselines/reference/asiContinue.types
+++ /dev/null
@@ -1,3 +0,0 @@
-=== tests/cases/compiler/asiContinue.ts ===
-while (true) continue
-No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/asiInES6Classes.types b/tests/baselines/reference/asiInES6Classes.types
index aa80e3e073e..90c7f71aba6 100644
--- a/tests/baselines/reference/asiInES6Classes.types
+++ b/tests/baselines/reference/asiInES6Classes.types
@@ -6,11 +6,7 @@ class Foo {
 
     defaults = {
 >defaults : { done: boolean; }
->{
-
-        done: false
-
-    } : { done: boolean; }
+>{        done: false    } : { done: boolean; }
 
         done: false
 >done : boolean
diff --git a/tests/baselines/reference/asiReturn.errors.txt b/tests/baselines/reference/asiReturn.errors.txt
deleted file mode 100644
index 7b7b44655c2..00000000000
--- a/tests/baselines/reference/asiReturn.errors.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-==== tests/cases/compiler/asiReturn.ts (1 errors) ====
-    // This should be an error for using a return outside a function, but ASI should work properly
-    return
-    ~~~~~~
-!!! A 'return' statement can only be used within a function body.
\ No newline at end of file
diff --git a/tests/baselines/reference/assignEveryTypeToAny.types b/tests/baselines/reference/assignEveryTypeToAny.types
index b25aba00837..379d705cc4b 100644
--- a/tests/baselines/reference/assignEveryTypeToAny.types
+++ b/tests/baselines/reference/assignEveryTypeToAny.types
@@ -150,7 +150,7 @@ x = { f<T>(x: T) { return x; } }
 >x : T
 
 function j<T>(a: T) {
->j : <T>(a: T) => void
+>j : typeof j
 >T : T
 >a : T
 >T : T
diff --git a/tests/baselines/reference/assignToPrototype1.types b/tests/baselines/reference/assignToPrototype1.types
index 6fec8d187d3..f4631c89e0b 100644
--- a/tests/baselines/reference/assignToPrototype1.types
+++ b/tests/baselines/reference/assignToPrototype1.types
@@ -9,15 +9,13 @@ declare class Point {
 }
 
 Point.prototype.add = function(dx, dy) {
->Point.prototype.add = function(dx, dy) {
-} : (dx: number, dy: number) => void
+>Point.prototype.add = function(dx, dy) {} : (dx: number, dy: number) => void
 >Point.prototype.add : (dx: number, dy: number) => void
 >Point.prototype : Point
 >Point : typeof Point
 >prototype : Point
 >add : (dx: number, dy: number) => void
->function(dx, dy) {
-} : (dx: number, dy: number) => void
+>function(dx, dy) {} : (dx: number, dy: number) => void
 >dx : number
 >dy : number
 
diff --git a/tests/baselines/reference/assignmentCompatForEnums.types b/tests/baselines/reference/assignmentCompatForEnums.types
index 53e8caab638..c8026077aec 100644
--- a/tests/baselines/reference/assignmentCompatForEnums.types
+++ b/tests/baselines/reference/assignmentCompatForEnums.types
@@ -10,16 +10,16 @@ var list = {};
 
 
 function returnType(): TokenType { return null; }
->returnType : () => TokenType
+>returnType : typeof returnType
 >TokenType : TokenType
 
 function foo() {
->foo : () => void
+>foo : typeof foo
 
     var x = returnType();
 >x : TokenType
 >returnType() : TokenType
->returnType : () => TokenType
+>returnType : typeof returnType
 
     var x: TokenType = list['one'];
 >x : TokenType
diff --git a/tests/baselines/reference/assignmentCompatOnNew.types b/tests/baselines/reference/assignmentCompatOnNew.types
index 19994e61df8..a6fb74f6184 100644
--- a/tests/baselines/reference/assignmentCompatOnNew.types
+++ b/tests/baselines/reference/assignmentCompatOnNew.types
@@ -3,12 +3,12 @@ class Foo{};
 >Foo : Foo
 
 function bar(x: {new(): Foo;}){}
->bar : (x: new () => Foo) => void
+>bar : typeof bar
 >x : new () => Foo
 >Foo : Foo
 
 bar(Foo); // Error, but should be allowed
 >bar(Foo) : void
->bar : (x: new () => Foo) => void
+>bar : typeof bar
 >Foo : typeof Foo
 
diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembers.js b/tests/baselines/reference/assignmentCompatWithObjectMembers.js
new file mode 100644
index 00000000000..14b49dcd1e7
--- /dev/null
+++ b/tests/baselines/reference/assignmentCompatWithObjectMembers.js
@@ -0,0 +1,168 @@
+//// [assignmentCompatWithObjectMembers.ts]
+// members N and M of types S and T have the same name, same accessibility, same optionality, and N is assignable M
+// no errors expected
+
+module SimpleTypes {
+    class S { foo: string; }
+    class T { foo: string; }
+    var s: S;
+    var t: T;
+
+    interface S2 { foo: string; }
+    interface T2 { foo: string; }
+    var s2: S2;
+    var t2: T2;
+
+    var a: { foo: string; }
+    var b: { foo: string; }
+
+    var a2 = { foo: '' };
+    var b2 = { foo: '' };
+
+    s = t;
+    t = s;
+    s = s2;
+    s = a2;
+
+    s2 = t2;
+    t2 = s2;
+    s2 = t;
+    s2 = b;
+    s2 = a2;
+
+    a = b;
+    b = a;
+    a = s;
+    a = s2;
+    a = a2;
+
+    a2 = b2;
+    b2 = a2;
+    a2 = b;
+    a2 = t2;
+    a2 = t;
+}
+
+module ObjectTypes {
+    class S { foo: S; }
+    class T { foo: T; }
+    var s: S;
+    var t: T;
+
+    interface S2 { foo: S2; }
+    interface T2 { foo: T2; }
+    var s2: S2;
+    var t2: T2;
+
+    var a: { foo: typeof a; }
+    var b: { foo: typeof b; }
+
+    var a2 = { foo: a2 };
+    var b2 = { foo: b2 };
+
+    s = t;
+    t = s;
+    s = s2;
+    s = a2;
+
+    s2 = t2;
+    t2 = s2;
+    s2 = t;
+    s2 = b;
+    s2 = a2;
+
+    a = b;
+    b = a;
+    a = s;
+    a = s2;
+    a = a2;
+
+    a2 = b2;
+    b2 = a2;
+    a2 = b;
+    a2 = t2;
+    a2 = t;
+
+}
+
+//// [assignmentCompatWithObjectMembers.js]
+var SimpleTypes;
+(function (SimpleTypes) {
+    var S = (function () {
+        function S() {
+        }
+        return S;
+    })();
+    var T = (function () {
+        function T() {
+        }
+        return T;
+    })();
+    var s;
+    var t;
+    var s2;
+    var t2;
+    var a;
+    var b;
+    var a2 = { foo: '' };
+    var b2 = { foo: '' };
+    s = t;
+    t = s;
+    s = s2;
+    s = a2;
+    s2 = t2;
+    t2 = s2;
+    s2 = t;
+    s2 = b;
+    s2 = a2;
+    a = b;
+    b = a;
+    a = s;
+    a = s2;
+    a = a2;
+    a2 = b2;
+    b2 = a2;
+    a2 = b;
+    a2 = t2;
+    a2 = t;
+})(SimpleTypes || (SimpleTypes = {}));
+var ObjectTypes;
+(function (ObjectTypes) {
+    var S = (function () {
+        function S() {
+        }
+        return S;
+    })();
+    var T = (function () {
+        function T() {
+        }
+        return T;
+    })();
+    var s;
+    var t;
+    var s2;
+    var t2;
+    var a;
+    var b;
+    var a2 = { foo: a2 };
+    var b2 = { foo: b2 };
+    s = t;
+    t = s;
+    s = s2;
+    s = a2;
+    s2 = t2;
+    t2 = s2;
+    s2 = t;
+    s2 = b;
+    s2 = a2;
+    a = b;
+    b = a;
+    a = s;
+    a = s2;
+    a = a2;
+    a2 = b2;
+    b2 = a2;
+    a2 = b;
+    a2 = t2;
+    a2 = t;
+})(ObjectTypes || (ObjectTypes = {}));
diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembers.types b/tests/baselines/reference/assignmentCompatWithObjectMembers.types
new file mode 100644
index 00000000000..b821fbc8608
--- /dev/null
+++ b/tests/baselines/reference/assignmentCompatWithObjectMembers.types
@@ -0,0 +1,310 @@
+=== tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembers.ts ===
+// members N and M of types S and T have the same name, same accessibility, same optionality, and N is assignable M
+// no errors expected
+
+module SimpleTypes {
+>SimpleTypes : typeof SimpleTypes
+
+    class S { foo: string; }
+>S : S
+>foo : string
+
+    class T { foo: string; }
+>T : T
+>foo : string
+
+    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; }
+>foo : string
+
+    var b: { foo: string; }
+>b : { foo: string; }
+>foo : string
+
+    var a2 = { foo: '' };
+>a2 : { foo: string; }
+>{ foo: '' } : { foo: string; }
+>foo : string
+
+    var b2 = { foo: '' };
+>b2 : { foo: string; }
+>{ foo: '' } : { foo: string; }
+>foo : string
+
+    s = t;
+>s = t : T
+>s : S
+>t : T
+
+    t = s;
+>t = s : S
+>t : T
+>s : S
+
+    s = s2;
+>s = s2 : S2
+>s : S
+>s2 : S2
+
+    s = a2;
+>s = a2 : { foo: string; }
+>s : S
+>a2 : { foo: string; }
+
+    s2 = t2;
+>s2 = t2 : T2
+>s2 : S2
+>t2 : T2
+
+    t2 = s2;
+>t2 = s2 : S2
+>t2 : T2
+>s2 : S2
+
+    s2 = t;
+>s2 = t : T
+>s2 : S2
+>t : T
+
+    s2 = b;
+>s2 = b : { foo: string; }
+>s2 : S2
+>b : { foo: string; }
+
+    s2 = a2;
+>s2 = a2 : { foo: string; }
+>s2 : S2
+>a2 : { foo: string; }
+
+    a = b;
+>a = b : { foo: string; }
+>a : { foo: string; }
+>b : { foo: string; }
+
+    b = a;
+>b = a : { foo: string; }
+>b : { foo: string; }
+>a : { foo: string; }
+
+    a = s;
+>a = s : S
+>a : { foo: string; }
+>s : S
+
+    a = s2;
+>a = s2 : S2
+>a : { foo: string; }
+>s2 : S2
+
+    a = a2;
+>a = a2 : { foo: string; }
+>a : { foo: string; }
+>a2 : { foo: string; }
+
+    a2 = b2;
+>a2 = b2 : { foo: string; }
+>a2 : { foo: string; }
+>b2 : { foo: string; }
+
+    b2 = a2;
+>b2 = a2 : { foo: string; }
+>b2 : { foo: string; }
+>a2 : { foo: string; }
+
+    a2 = b;
+>a2 = b : { foo: string; }
+>a2 : { foo: string; }
+>b : { foo: string; }
+
+    a2 = t2;
+>a2 = t2 : T2
+>a2 : { foo: string; }
+>t2 : T2
+
+    a2 = t;
+>a2 = t : T
+>a2 : { foo: string; }
+>t : T
+}
+
+module ObjectTypes {
+>ObjectTypes : typeof 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; }
+>foo : { foo: any; }
+>a : { foo: any; }
+
+    var b: { foo: typeof b; }
+>b : { foo: any; }
+>foo : { foo: any; }
+>b : { foo: any; }
+
+    var a2 = { foo: a2 };
+>a2 : any
+>{ foo: a2 } : { foo: any; }
+>foo : any
+>a2 : a2
+
+    var b2 = { foo: b2 };
+>b2 : any
+>{ foo: b2 } : { foo: any; }
+>foo : any
+>b2 : b2
+
+    s = t;
+>s = t : T
+>s : S
+>t : T
+
+    t = s;
+>t = s : S
+>t : T
+>s : S
+
+    s = s2;
+>s = s2 : S2
+>s : S
+>s2 : S2
+
+    s = a2;
+>s = a2 : any
+>s : S
+>a2 : any
+
+    s2 = t2;
+>s2 = t2 : T2
+>s2 : S2
+>t2 : T2
+
+    t2 = s2;
+>t2 = s2 : S2
+>t2 : T2
+>s2 : S2
+
+    s2 = t;
+>s2 = t : T
+>s2 : S2
+>t : T
+
+    s2 = b;
+>s2 = b : { foo: any; }
+>s2 : S2
+>b : { foo: any; }
+
+    s2 = a2;
+>s2 = a2 : any
+>s2 : S2
+>a2 : any
+
+    a = b;
+>a = b : { foo: any; }
+>a : { foo: any; }
+>b : { foo: any; }
+
+    b = a;
+>b = a : { foo: any; }
+>b : { foo: any; }
+>a : { foo: any; }
+
+    a = s;
+>a = s : S
+>a : { foo: any; }
+>s : S
+
+    a = s2;
+>a = s2 : S2
+>a : { foo: any; }
+>s2 : S2
+
+    a = a2;
+>a = a2 : any
+>a : { foo: any; }
+>a2 : any
+
+    a2 = b2;
+>a2 = b2 : any
+>a2 : any
+>b2 : any
+
+    b2 = a2;
+>b2 = a2 : any
+>b2 : any
+>a2 : any
+
+    a2 = b;
+>a2 = b : { foo: any; }
+>a2 : any
+>b : { foo: any; }
+
+    a2 = t2;
+>a2 = t2 : T2
+>a2 : any
+>t2 : T2
+
+    a2 = t;
+>a2 = t : T
+>a2 : any
+>t : T
+
+}
diff --git a/tests/baselines/reference/assignmentCompatability24.errors.txt b/tests/baselines/reference/assignmentCompatability24.errors.txt
index 70a6717b9b7..a696d593e5a 100644
--- a/tests/baselines/reference/assignmentCompatability24.errors.txt
+++ b/tests/baselines/reference/assignmentCompatability24.errors.txt
@@ -1,12 +1,14 @@
-==== tests/cases/compiler/assignmentCompatability24.ts (1 errors) ====
+==== tests/cases/compiler/assignmentCompatability24.ts (2 errors) ====
     module __test1__ {
         export interface interfaceWithPublicAndOptional<T,U> { one: T; two?: U; };  var obj4: interfaceWithPublicAndOptional<number,string> = { one: 1 };;
         export var __val__obj4 = obj4;
     }
     module __test2__ {
-        export var obj = function f<Tstring>(a: Tstring) { return a; };;
+        export var obj = function f<string>(a: string) { return a; };;
+                                    ~~~~~~
+!!! Type parameter name cannot be 'string'
         export var __val__obj = obj;
     }
     __test2__.__val__obj = __test1__.__val__obj4
     ~~~~~~~~~~~~~~~~~~~~
-!!! Type 'interfaceWithPublicAndOptional<number, string>' is not assignable to type '<Tstring>(a: Tstring) => Tstring'.
\ No newline at end of file
+!!! Type 'interfaceWithPublicAndOptional<number, string>' is not assignable to type '<string>(a: string) => string'.
\ No newline at end of file
diff --git a/tests/baselines/reference/assignmentCompatability24.js b/tests/baselines/reference/assignmentCompatability24.js
index 7eda1e61266..3be069c17fe 100644
--- a/tests/baselines/reference/assignmentCompatability24.js
+++ b/tests/baselines/reference/assignmentCompatability24.js
@@ -4,7 +4,7 @@ module __test1__ {
     export var __val__obj4 = obj4;
 }
 module __test2__ {
-    export var obj = function f<Tstring>(a: Tstring) { return a; };;
+    export var obj = function f<string>(a: string) { return a; };;
     export var __val__obj = obj;
 }
 __test2__.__val__obj = __test1__.__val__obj4
diff --git a/tests/baselines/reference/assignmentCompatability33.errors.txt b/tests/baselines/reference/assignmentCompatability33.errors.txt
index 3f9f4716f81..d9037bbdbfe 100644
--- a/tests/baselines/reference/assignmentCompatability33.errors.txt
+++ b/tests/baselines/reference/assignmentCompatability33.errors.txt
@@ -1,12 +1,14 @@
-==== tests/cases/compiler/assignmentCompatability33.ts (1 errors) ====
+==== tests/cases/compiler/assignmentCompatability33.ts (2 errors) ====
     module __test1__ {
         export interface interfaceWithPublicAndOptional<T,U> { one: T; two?: U; };  var obj4: interfaceWithPublicAndOptional<number,string> = { one: 1 };;
         export var __val__obj4 = obj4;
     }
     module __test2__ {
-        export var obj: { <Tstring>(a: Tstring): Tstring; };
+        export var obj: { <string>(a: string): string; };
+                           ~~~~~~
+!!! Type parameter name cannot be 'string'
         export var __val__obj = obj;
     }
     __test2__.__val__obj = __test1__.__val__obj4
     ~~~~~~~~~~~~~~~~~~~~
-!!! Type 'interfaceWithPublicAndOptional<number, string>' is not assignable to type '<Tstring>(a: Tstring) => Tstring'.
\ No newline at end of file
+!!! Type 'interfaceWithPublicAndOptional<number, string>' is not assignable to type '<string>(a: string) => string'.
\ No newline at end of file
diff --git a/tests/baselines/reference/assignmentCompatability33.js b/tests/baselines/reference/assignmentCompatability33.js
index 80dfcfc4f7a..f14fc82d3fa 100644
--- a/tests/baselines/reference/assignmentCompatability33.js
+++ b/tests/baselines/reference/assignmentCompatability33.js
@@ -4,7 +4,7 @@ module __test1__ {
     export var __val__obj4 = obj4;
 }
 module __test2__ {
-    export var obj: { <Tstring>(a: Tstring): Tstring; };
+    export var obj: { <string>(a: string): string; };
     export var __val__obj = obj;
 }
 __test2__.__val__obj = __test1__.__val__obj4
diff --git a/tests/baselines/reference/assignmentCompatability34.errors.txt b/tests/baselines/reference/assignmentCompatability34.errors.txt
index 1ae98d98d37..26e92151da9 100644
--- a/tests/baselines/reference/assignmentCompatability34.errors.txt
+++ b/tests/baselines/reference/assignmentCompatability34.errors.txt
@@ -1,12 +1,14 @@
-==== tests/cases/compiler/assignmentCompatability34.ts (1 errors) ====
+==== tests/cases/compiler/assignmentCompatability34.ts (2 errors) ====
     module __test1__ {
         export interface interfaceWithPublicAndOptional<T,U> { one: T; two?: U; };  var obj4: interfaceWithPublicAndOptional<number,string> = { one: 1 };;
         export var __val__obj4 = obj4;
     }
     module __test2__ {
-        export var obj: { <Tnumber>(a:Tnumber):Tnumber;};
+        export var obj: { <number>(a:number):number;};
+                           ~~~~~~
+!!! Type parameter name cannot be 'number'
         export var __val__obj = obj;
     }
     __test2__.__val__obj = __test1__.__val__obj4
     ~~~~~~~~~~~~~~~~~~~~
-!!! Type 'interfaceWithPublicAndOptional<number, string>' is not assignable to type '<Tnumber>(a: Tnumber) => Tnumber'.
\ No newline at end of file
+!!! Type 'interfaceWithPublicAndOptional<number, string>' is not assignable to type '<number>(a: number) => number'.
\ No newline at end of file
diff --git a/tests/baselines/reference/assignmentCompatability34.js b/tests/baselines/reference/assignmentCompatability34.js
index ab324a10396..454ec319c5c 100644
--- a/tests/baselines/reference/assignmentCompatability34.js
+++ b/tests/baselines/reference/assignmentCompatability34.js
@@ -4,7 +4,7 @@ module __test1__ {
     export var __val__obj4 = obj4;
 }
 module __test2__ {
-    export var obj: { <Tnumber>(a:Tnumber):Tnumber;};
+    export var obj: { <number>(a:number):number;};
     export var __val__obj = obj;
 }
 __test2__.__val__obj = __test1__.__val__obj4
diff --git a/tests/baselines/reference/assignmentCompatability37.errors.txt b/tests/baselines/reference/assignmentCompatability37.errors.txt
index f097e9664d3..b08b483174a 100644
--- a/tests/baselines/reference/assignmentCompatability37.errors.txt
+++ b/tests/baselines/reference/assignmentCompatability37.errors.txt
@@ -1,12 +1,14 @@
-==== tests/cases/compiler/assignmentCompatability37.ts (1 errors) ====
+==== tests/cases/compiler/assignmentCompatability37.ts (2 errors) ====
     module __test1__ {
         export interface interfaceWithPublicAndOptional<T,U> { one: T; two?: U; };  var obj4: interfaceWithPublicAndOptional<number,string> = { one: 1 };;
         export var __val__obj4 = obj4;
     }
     module __test2__ {
-        export var aa:{ new <Tnumber>(param: Tnumber); };;
+        export var aa:{ new <number>(param: number); };;
+                             ~~~~~~
+!!! Type parameter name cannot be 'number'
         export var __val__aa = aa;
     }
     __test2__.__val__aa = __test1__.__val__obj4
     ~~~~~~~~~~~~~~~~~~~
-!!! Type 'interfaceWithPublicAndOptional<number, string>' is not assignable to type 'new <Tnumber>(param: Tnumber) => any'.
\ No newline at end of file
+!!! Type 'interfaceWithPublicAndOptional<number, string>' is not assignable to type 'new <number>(param: number) => any'.
\ No newline at end of file
diff --git a/tests/baselines/reference/assignmentCompatability37.js b/tests/baselines/reference/assignmentCompatability37.js
index 8625cae42e5..bf37f2c902e 100644
--- a/tests/baselines/reference/assignmentCompatability37.js
+++ b/tests/baselines/reference/assignmentCompatability37.js
@@ -4,7 +4,7 @@ module __test1__ {
     export var __val__obj4 = obj4;
 }
 module __test2__ {
-    export var aa:{ new <Tnumber>(param: Tnumber); };;
+    export var aa:{ new <number>(param: number); };;
     export var __val__aa = aa;
 }
 __test2__.__val__aa = __test1__.__val__obj4
diff --git a/tests/baselines/reference/assignmentCompatability38.errors.txt b/tests/baselines/reference/assignmentCompatability38.errors.txt
index 9efa19b0338..f915afa52a8 100644
--- a/tests/baselines/reference/assignmentCompatability38.errors.txt
+++ b/tests/baselines/reference/assignmentCompatability38.errors.txt
@@ -1,12 +1,14 @@
-==== tests/cases/compiler/assignmentCompatability38.ts (1 errors) ====
+==== tests/cases/compiler/assignmentCompatability38.ts (2 errors) ====
     module __test1__ {
         export interface interfaceWithPublicAndOptional<T,U> { one: T; two?: U; };  var obj4: interfaceWithPublicAndOptional<number,string> = { one: 1 };;
         export var __val__obj4 = obj4;
     }
     module __test2__ {
-        export var aa:{ new <Tstring>(param: Tstring); };;
+        export var aa:{ new <string>(param: string); };;
+                             ~~~~~~
+!!! Type parameter name cannot be 'string'
         export var __val__aa = aa;
     }
     __test2__.__val__aa = __test1__.__val__obj4
     ~~~~~~~~~~~~~~~~~~~
-!!! Type 'interfaceWithPublicAndOptional<number, string>' is not assignable to type 'new <Tstring>(param: Tstring) => any'.
\ No newline at end of file
+!!! Type 'interfaceWithPublicAndOptional<number, string>' is not assignable to type 'new <string>(param: string) => any'.
\ No newline at end of file
diff --git a/tests/baselines/reference/assignmentCompatability38.js b/tests/baselines/reference/assignmentCompatability38.js
index 22096b68f25..ba1c5c3c5d1 100644
--- a/tests/baselines/reference/assignmentCompatability38.js
+++ b/tests/baselines/reference/assignmentCompatability38.js
@@ -4,7 +4,7 @@ module __test1__ {
     export var __val__obj4 = obj4;
 }
 module __test2__ {
-    export var aa:{ new <Tstring>(param: Tstring); };;
+    export var aa:{ new <string>(param: string); };;
     export var __val__aa = aa;
 }
 __test2__.__val__aa = __test1__.__val__obj4
diff --git a/tests/baselines/reference/assignmentCompatibilityForConstrainedTypeParameters.types b/tests/baselines/reference/assignmentCompatibilityForConstrainedTypeParameters.types
index fab8e2baae6..1a8f0e6bfd2 100644
--- a/tests/baselines/reference/assignmentCompatibilityForConstrainedTypeParameters.types
+++ b/tests/baselines/reference/assignmentCompatibilityForConstrainedTypeParameters.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/assignmentCompatibilityForConstrainedTypeParameters.ts ===
 function foo<T extends { bar: string }>() {
->foo : <T extends { bar: string; }>() => void
+>foo : typeof foo
 >T : T
 >bar : string
 
diff --git a/tests/baselines/reference/assignmentLHSIsReference.types b/tests/baselines/reference/assignmentLHSIsReference.types
index 0d7bfad3f06..c5dc4813a5d 100644
--- a/tests/baselines/reference/assignmentLHSIsReference.types
+++ b/tests/baselines/reference/assignmentLHSIsReference.types
@@ -12,7 +12,7 @@ x1 = value;
 >value : any
 
 function fn1(x2: number) {
->fn1 : (x2: number) => void
+>fn1 : typeof fn1
 >x2 : number
 
     x2 = value;
@@ -47,7 +47,7 @@ x3['a'] = value;
 >value : any
 
 function fn2(x4: number) {
->fn2 : (x4: number) => void
+>fn2 : typeof fn2
 >x4 : number
 
     (x4) = value;
diff --git a/tests/baselines/reference/augmentArray.js b/tests/baselines/reference/augmentArray.js
deleted file mode 100644
index 948f1944048..00000000000
--- a/tests/baselines/reference/augmentArray.js
+++ /dev/null
@@ -1,6 +0,0 @@
-//// [augmentArray.ts]
-interface Array<T> {
-    (): any[];
-}
-
-//// [augmentArray.js]
diff --git a/tests/baselines/reference/augmentArray.types b/tests/baselines/reference/augmentArray.types
deleted file mode 100644
index 31f7e11edca..00000000000
--- a/tests/baselines/reference/augmentArray.types
+++ /dev/null
@@ -1,7 +0,0 @@
-=== tests/cases/compiler/augmentArray.ts ===
-interface Array<T> {
->Array : T[]
->T : T
-
-    (): any[];
-}
diff --git a/tests/baselines/reference/autoAsiForStaticsInClassDeclaration.js b/tests/baselines/reference/autoAsiForStaticsInClassDeclaration.js
deleted file mode 100644
index 27b56e4ff88..00000000000
--- a/tests/baselines/reference/autoAsiForStaticsInClassDeclaration.js
+++ /dev/null
@@ -1,12 +0,0 @@
-//// [autoAsiForStaticsInClassDeclaration.ts]
-class C {
-    static x
-    static y
-} 
-
-//// [autoAsiForStaticsInClassDeclaration.js]
-var C = (function () {
-    function C() {
-    }
-    return C;
-})();
diff --git a/tests/baselines/reference/autoAsiForStaticsInClassDeclaration.types b/tests/baselines/reference/autoAsiForStaticsInClassDeclaration.types
deleted file mode 100644
index d902f0b3eaa..00000000000
--- a/tests/baselines/reference/autoAsiForStaticsInClassDeclaration.types
+++ /dev/null
@@ -1,10 +0,0 @@
-=== tests/cases/compiler/autoAsiForStaticsInClassDeclaration.ts ===
-class C {
->C : C
-
-    static x
->x : any
-
-    static y
->y : any
-} 
diff --git a/tests/baselines/reference/avoid.types b/tests/baselines/reference/avoid.types
index 853d93bdd79..23e78f37613 100644
--- a/tests/baselines/reference/avoid.types
+++ b/tests/baselines/reference/avoid.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/avoid.ts ===
 function f() {
->f : () => void
+>f : typeof f
 
     var x=1;
 >x : number
@@ -9,12 +9,12 @@ function f() {
 var y=f();  // error void fn
 >y : void
 >f() : void
->f : () => void
+>f : typeof f
 
 var why:any=f(); // error void fn
 >why : any
 >f() : void
->f : () => void
+>f : typeof f
 
 var w:any;
 >w : any
@@ -23,7 +23,7 @@ w=f(); // error void fn
 >w=f() : void
 >w : any
 >f() : void
->f : () => void
+>f : typeof f
 
 class C {
 >C : C
@@ -45,6 +45,6 @@ var z=new C().g(); // error void fn
 var N=new f();  // ok with void fn
 >N : any
 >new f() : any
->f : () => void
+>f : typeof f
 
 
diff --git a/tests/baselines/reference/badArraySyntax.errors.txt b/tests/baselines/reference/badArraySyntax.errors.txt
index 9c1edf93231..a38f9918197 100644
--- a/tests/baselines/reference/badArraySyntax.errors.txt
+++ b/tests/baselines/reference/badArraySyntax.errors.txt
@@ -1,4 +1,4 @@
-==== tests/cases/compiler/badArraySyntax.ts (6 errors) ====
+==== tests/cases/compiler/badArraySyntax.ts (4 errors) ====
     class Z {
      public x = "";
     }
@@ -16,9 +16,5 @@
     var a5: Z[] = new Z[]();
                        ~~
 !!! 'new T[]' cannot be used to create an array. Use 'new Array<T>()' instead.
-    var a6: Z[][] = new   Z     [      ]   [  ];
-                                ~~~~~~~~
-!!! 'new T[]' cannot be used to create an array. Use 'new Array<T>()' instead.
-                                           ~~~~
-!!! 'new T[]' cannot be used to create an array. Use 'new Array<T>()' instead.
+    
     
\ No newline at end of file
diff --git a/tests/baselines/reference/badOverloadError.types b/tests/baselines/reference/badOverloadError.types
index 837eb5c5c83..8777296d798 100644
--- a/tests/baselines/reference/badOverloadError.types
+++ b/tests/baselines/reference/badOverloadError.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/badOverloadError.ts ===
 function method() {
->method : () => void
+>method : typeof method
 
     var dictionary = <{ [index: string]: string; }>{};
 >dictionary : { [x: string]: string; }
diff --git a/tests/baselines/reference/badThisBinding.types b/tests/baselines/reference/badThisBinding.types
index 852fb02f58e..5b95cc95ba0 100644
--- a/tests/baselines/reference/badThisBinding.types
+++ b/tests/baselines/reference/badThisBinding.types
@@ -1,10 +1,10 @@
 === tests/cases/compiler/badThisBinding.ts ===
 declare function foo(a:any): any;
->foo : (a: any) => any
+>foo : typeof foo
 >a : any
 
 declare function bar(a:any): any;
->bar : (a: any) => any
+>bar : typeof bar
 >a : any
 
 class Greeter {
@@ -12,26 +12,14 @@ class Greeter {
 
     constructor() {
 		foo(() => {
->foo(() => {
-            bar(() => {
-                var x = this;
-			});
-		}) : any
->foo : (a: any) => any
->() => {
-            bar(() => {
-                var x = this;
-			});
-		} : () => void
+>foo(() => {            bar(() => {                var x = this;			});		}) : any
+>foo : typeof foo
+>() => {            bar(() => {                var x = this;			});		} : () => void
 
             bar(() => {
->bar(() => {
-                var x = this;
-			}) : any
->bar : (a: any) => any
->() => {
-                var x = this;
-			} : () => void
+>bar(() => {                var x = this;			}) : any
+>bar : typeof bar
+>() => {                var x = this;			} : () => void
 
                 var x = this;
 >x : Greeter
diff --git a/tests/baselines/reference/bestCommonTypeOfConditionalExpressions.types b/tests/baselines/reference/bestCommonTypeOfConditionalExpressions.types
index 3deeae69bbe..ae9f7c59765 100644
--- a/tests/baselines/reference/bestCommonTypeOfConditionalExpressions.types
+++ b/tests/baselines/reference/bestCommonTypeOfConditionalExpressions.types
@@ -102,7 +102,7 @@ var r11 = true ? base : derived2;
 >derived2 : Derived2
 
 function foo5<T, U>(t: T, u: U): Object {
->foo5 : <T, U>(t: T, u: U) => Object
+>foo5 : typeof foo5
 >T : T
 >U : U
 >t : T
diff --git a/tests/baselines/reference/bestCommonTypeReturnStatement.types b/tests/baselines/reference/bestCommonTypeReturnStatement.types
index 3c260ea709b..ce360a92ccf 100644
--- a/tests/baselines/reference/bestCommonTypeReturnStatement.types
+++ b/tests/baselines/reference/bestCommonTypeReturnStatement.types
@@ -14,23 +14,23 @@ interface IPromise<T> {
 }
 
 function f() {
->f : () => IPromise<void>
+>f : typeof f
 
     if (true) return b();
 >b() : IPromise<void>
->b : () => IPromise<void>
+>b : typeof b
 
     return d();
 >d() : IPromise<any>
->d : () => IPromise<any>
+>d : typeof d
 }
 
 
 function b(): IPromise<void> { return null; }
->b : () => IPromise<void>
+>b : typeof b
 >IPromise : IPromise<T>
 
 function d(): IPromise<any> { return null; }
->d : () => IPromise<any>
+>d : typeof d
 >IPromise : IPromise<T>
 
diff --git a/tests/baselines/reference/bitwiseNotOperatorWithBooleanType.types b/tests/baselines/reference/bitwiseNotOperatorWithBooleanType.types
index ce870dbc818..94c056cf77c 100644
--- a/tests/baselines/reference/bitwiseNotOperatorWithBooleanType.types
+++ b/tests/baselines/reference/bitwiseNotOperatorWithBooleanType.types
@@ -4,7 +4,7 @@ var BOOLEAN: boolean;
 >BOOLEAN : boolean
 
 function foo(): boolean { return true; }
->foo : () => boolean
+>foo : typeof foo
 
 class A {
 >A : A
@@ -13,7 +13,7 @@ class A {
 >a : boolean
 
     static foo() { return false; }
->foo : () => boolean
+>foo : typeof foo
 }
 module M {
 >M : typeof M
@@ -64,15 +64,15 @@ var ResultIsNumber6 = ~foo();
 >ResultIsNumber6 : number
 >~foo() : number
 >foo() : boolean
->foo : () => boolean
+>foo : typeof foo
 
 var ResultIsNumber7 = ~A.foo();
 >ResultIsNumber7 : number
 >~A.foo() : number
 >A.foo() : boolean
->A.foo : () => boolean
+>A.foo : typeof foo
 >A : typeof A
->foo : () => boolean
+>foo : typeof foo
 
 // multiple ~ operators
 var ResultIsNumber8 = ~~BOOLEAN;
@@ -92,7 +92,7 @@ var ResultIsNumber8 = ~~BOOLEAN;
 ~foo();
 >~foo() : number
 >foo() : boolean
->foo : () => boolean
+>foo : typeof foo
 
 ~true, false;
 >~true, false : boolean
diff --git a/tests/baselines/reference/bitwiseNotOperatorWithNumberType.types b/tests/baselines/reference/bitwiseNotOperatorWithNumberType.types
index 94207a56343..18b22db036c 100644
--- a/tests/baselines/reference/bitwiseNotOperatorWithNumberType.types
+++ b/tests/baselines/reference/bitwiseNotOperatorWithNumberType.types
@@ -8,7 +8,7 @@ var NUMBER1: number[] = [1, 2];
 >[1, 2] : number[]
 
 function foo(): number { return 1; }
->foo : () => number
+>foo : typeof foo
 
 class A {
 >A : A
@@ -17,7 +17,7 @@ class A {
 >a : number
 
     static foo() { return 1; }
->foo : () => number
+>foo : typeof foo
 }
 module M {
 >M : typeof M
@@ -89,15 +89,15 @@ var ResultIsNumber9 = ~foo();
 >ResultIsNumber9 : number
 >~foo() : number
 >foo() : number
->foo : () => number
+>foo : typeof foo
 
 var ResultIsNumber10 = ~A.foo();
 >ResultIsNumber10 : number
 >~A.foo() : number
 >A.foo() : number
->A.foo : () => number
+>A.foo : typeof foo
 >A : typeof A
->foo : () => number
+>foo : typeof foo
 
 var ResultIsNumber11 = ~(NUMBER + NUMBER);
 >ResultIsNumber11 : number
@@ -136,7 +136,7 @@ var ResultIsNumber13 = ~~~(NUMBER + NUMBER);
 ~foo();
 >~foo() : number
 >foo() : number
->foo : () => number
+>foo : typeof foo
 
 ~objA.a;
 >~objA.a : number
diff --git a/tests/baselines/reference/bitwiseNotOperatorWithStringType.types b/tests/baselines/reference/bitwiseNotOperatorWithStringType.types
index dbe2f29631e..d7c65a478fc 100644
--- a/tests/baselines/reference/bitwiseNotOperatorWithStringType.types
+++ b/tests/baselines/reference/bitwiseNotOperatorWithStringType.types
@@ -8,7 +8,7 @@ var STRING1: string[] = ["", "abc"];
 >["", "abc"] : string[]
 
 function foo(): string { return "abc"; }
->foo : () => string
+>foo : typeof foo
 
 class A {
 >A : A
@@ -17,7 +17,7 @@ class A {
 >a : string
 
     static foo() { return ""; }
->foo : () => string
+>foo : typeof foo
 }
 module M {
 >M : typeof M
@@ -89,15 +89,15 @@ var ResultIsNumber9 = ~foo();
 >ResultIsNumber9 : number
 >~foo() : number
 >foo() : string
->foo : () => string
+>foo : typeof foo
 
 var ResultIsNumber10 = ~A.foo();
 >ResultIsNumber10 : number
 >~A.foo() : number
 >A.foo() : string
->A.foo : () => string
+>A.foo : typeof foo
 >A : typeof A
->foo : () => string
+>foo : typeof foo
 
 var ResultIsNumber11 = ~(STRING + STRING);
 >ResultIsNumber11 : number
@@ -144,7 +144,7 @@ var ResultIsNumber14 = ~~~(STRING + STRING);
 ~foo();
 >~foo() : number
 >foo() : string
->foo : () => string
+>foo : typeof foo
 
 ~objA.a,M.n;
 >~objA.a,M.n : string
diff --git a/tests/baselines/reference/breakInIterationOrSwitchStatement1.js b/tests/baselines/reference/breakInIterationOrSwitchStatement1.js
new file mode 100644
index 00000000000..0a3de64c675
--- /dev/null
+++ b/tests/baselines/reference/breakInIterationOrSwitchStatement1.js
@@ -0,0 +1,9 @@
+//// [breakInIterationOrSwitchStatement1.ts]
+while (true) {
+  break;
+}
+
+//// [breakInIterationOrSwitchStatement1.js]
+while (true) {
+    break;
+}
diff --git a/tests/baselines/reference/breakInIterationOrSwitchStatement1.types b/tests/baselines/reference/breakInIterationOrSwitchStatement1.types
new file mode 100644
index 00000000000..6a2bae2c2c4
--- /dev/null
+++ b/tests/baselines/reference/breakInIterationOrSwitchStatement1.types
@@ -0,0 +1,5 @@
+=== tests/cases/compiler/breakInIterationOrSwitchStatement1.ts ===
+while (true) {
+No type information for this code.  break;
+No type information for this code.}
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/breakInIterationOrSwitchStatement2.js b/tests/baselines/reference/breakInIterationOrSwitchStatement2.js
new file mode 100644
index 00000000000..903bed733db
--- /dev/null
+++ b/tests/baselines/reference/breakInIterationOrSwitchStatement2.js
@@ -0,0 +1,10 @@
+//// [breakInIterationOrSwitchStatement2.ts]
+do {
+  break;
+}
+while (true);
+
+//// [breakInIterationOrSwitchStatement2.js]
+do {
+    break;
+} while (true);
diff --git a/tests/baselines/reference/breakInIterationOrSwitchStatement2.types b/tests/baselines/reference/breakInIterationOrSwitchStatement2.types
new file mode 100644
index 00000000000..0f8928a664d
--- /dev/null
+++ b/tests/baselines/reference/breakInIterationOrSwitchStatement2.types
@@ -0,0 +1,6 @@
+=== tests/cases/compiler/breakInIterationOrSwitchStatement2.ts ===
+do {
+No type information for this code.  break;
+No type information for this code.}
+No type information for this code.while (true);
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/breakInIterationOrSwitchStatement3.js b/tests/baselines/reference/breakInIterationOrSwitchStatement3.js
new file mode 100644
index 00000000000..dfadaf03182
--- /dev/null
+++ b/tests/baselines/reference/breakInIterationOrSwitchStatement3.js
@@ -0,0 +1,9 @@
+//// [breakInIterationOrSwitchStatement3.ts]
+for (;;) {
+  break;
+}
+
+//// [breakInIterationOrSwitchStatement3.js]
+for (;;) {
+    break;
+}
diff --git a/tests/baselines/reference/breakInIterationOrSwitchStatement3.types b/tests/baselines/reference/breakInIterationOrSwitchStatement3.types
new file mode 100644
index 00000000000..5676b2deccd
--- /dev/null
+++ b/tests/baselines/reference/breakInIterationOrSwitchStatement3.types
@@ -0,0 +1,5 @@
+=== tests/cases/compiler/breakInIterationOrSwitchStatement3.ts ===
+for (;;) {
+No type information for this code.  break;
+No type information for this code.}
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/breakInIterationOrSwitchStatement4.errors.txt b/tests/baselines/reference/breakInIterationOrSwitchStatement4.errors.txt
new file mode 100644
index 00000000000..667108c902d
--- /dev/null
+++ b/tests/baselines/reference/breakInIterationOrSwitchStatement4.errors.txt
@@ -0,0 +1,6 @@
+==== tests/cases/compiler/breakInIterationOrSwitchStatement4.ts (1 errors) ====
+    for (var i in something) {
+                  ~~~~~~~~~
+!!! Cannot find name 'something'.
+      break;
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/breakInIterationOrSwitchStatement4.js b/tests/baselines/reference/breakInIterationOrSwitchStatement4.js
new file mode 100644
index 00000000000..ef1978666e2
--- /dev/null
+++ b/tests/baselines/reference/breakInIterationOrSwitchStatement4.js
@@ -0,0 +1,9 @@
+//// [breakInIterationOrSwitchStatement4.ts]
+for (var i in something) {
+  break;
+}
+
+//// [breakInIterationOrSwitchStatement4.js]
+for (var i in something) {
+    break;
+}
diff --git a/tests/baselines/reference/breakNotInIterationOrSwitchStatement1.errors.txt b/tests/baselines/reference/breakNotInIterationOrSwitchStatement1.errors.txt
new file mode 100644
index 00000000000..6220fd09e9d
--- /dev/null
+++ b/tests/baselines/reference/breakNotInIterationOrSwitchStatement1.errors.txt
@@ -0,0 +1,4 @@
+==== tests/cases/compiler/breakNotInIterationOrSwitchStatement1.ts (1 errors) ====
+    break;
+    ~~~~~~
+!!! A 'break' statement can only be used within an enclosing iteration or switch statement.
\ No newline at end of file
diff --git a/tests/baselines/reference/breakNotInIterationOrSwitchStatement2.errors.txt b/tests/baselines/reference/breakNotInIterationOrSwitchStatement2.errors.txt
new file mode 100644
index 00000000000..e34345f8e8c
--- /dev/null
+++ b/tests/baselines/reference/breakNotInIterationOrSwitchStatement2.errors.txt
@@ -0,0 +1,8 @@
+==== tests/cases/compiler/breakNotInIterationOrSwitchStatement2.ts (1 errors) ====
+    while (true) {
+      function f() {
+        break;
+        ~~~~~~
+!!! Jump target cannot cross function boundary.
+      }
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/breakTarget1.js b/tests/baselines/reference/breakTarget1.js
new file mode 100644
index 00000000000..5283dfe1911
--- /dev/null
+++ b/tests/baselines/reference/breakTarget1.js
@@ -0,0 +1,6 @@
+//// [breakTarget1.ts]
+target:
+  break target;
+
+//// [breakTarget1.js]
+target: break target;
diff --git a/tests/baselines/reference/breakTarget1.types b/tests/baselines/reference/breakTarget1.types
new file mode 100644
index 00000000000..eda3b1cac35
--- /dev/null
+++ b/tests/baselines/reference/breakTarget1.types
@@ -0,0 +1,4 @@
+=== tests/cases/compiler/breakTarget1.ts ===
+target:
+No type information for this code.  break target;
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/breakTarget2.js b/tests/baselines/reference/breakTarget2.js
new file mode 100644
index 00000000000..9ca050c18e5
--- /dev/null
+++ b/tests/baselines/reference/breakTarget2.js
@@ -0,0 +1,10 @@
+//// [breakTarget2.ts]
+target:
+while (true) {
+  break target;
+}
+
+//// [breakTarget2.js]
+target: while (true) {
+    break target;
+}
diff --git a/tests/baselines/reference/breakTarget2.types b/tests/baselines/reference/breakTarget2.types
new file mode 100644
index 00000000000..6357695785b
--- /dev/null
+++ b/tests/baselines/reference/breakTarget2.types
@@ -0,0 +1,6 @@
+=== tests/cases/compiler/breakTarget2.ts ===
+target:
+No type information for this code.while (true) {
+No type information for this code.  break target;
+No type information for this code.}
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/breakTarget3.js b/tests/baselines/reference/breakTarget3.js
new file mode 100644
index 00000000000..0fa6cd2d298
--- /dev/null
+++ b/tests/baselines/reference/breakTarget3.js
@@ -0,0 +1,11 @@
+//// [breakTarget3.ts]
+target1:
+target2:
+while (true) {
+  break target1;
+}
+
+//// [breakTarget3.js]
+target1: target2: while (true) {
+    break target1;
+}
diff --git a/tests/baselines/reference/breakTarget3.types b/tests/baselines/reference/breakTarget3.types
new file mode 100644
index 00000000000..580706bbd4a
--- /dev/null
+++ b/tests/baselines/reference/breakTarget3.types
@@ -0,0 +1,7 @@
+=== tests/cases/compiler/breakTarget3.ts ===
+target1:
+No type information for this code.target2:
+No type information for this code.while (true) {
+No type information for this code.  break target1;
+No type information for this code.}
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/breakTarget4.js b/tests/baselines/reference/breakTarget4.js
new file mode 100644
index 00000000000..4586301d71b
--- /dev/null
+++ b/tests/baselines/reference/breakTarget4.js
@@ -0,0 +1,11 @@
+//// [breakTarget4.ts]
+target1:
+target2:
+while (true) {
+  break target2;
+}
+
+//// [breakTarget4.js]
+target1: target2: while (true) {
+    break target2;
+}
diff --git a/tests/baselines/reference/breakTarget4.types b/tests/baselines/reference/breakTarget4.types
new file mode 100644
index 00000000000..aba35ddcfdf
--- /dev/null
+++ b/tests/baselines/reference/breakTarget4.types
@@ -0,0 +1,7 @@
+=== tests/cases/compiler/breakTarget4.ts ===
+target1:
+No type information for this code.target2:
+No type information for this code.while (true) {
+No type information for this code.  break target2;
+No type information for this code.}
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/breakTarget5.errors.txt b/tests/baselines/reference/breakTarget5.errors.txt
new file mode 100644
index 00000000000..a9b3932bcbb
--- /dev/null
+++ b/tests/baselines/reference/breakTarget5.errors.txt
@@ -0,0 +1,11 @@
+==== tests/cases/compiler/breakTarget5.ts (1 errors) ====
+    target:
+    while (true) {
+      function f() {
+        while (true) {
+          break target;
+          ~~~~~~~~~~~~~
+!!! Jump target cannot cross function boundary.
+        }
+      }
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/breakTarget6.errors.txt b/tests/baselines/reference/breakTarget6.errors.txt
new file mode 100644
index 00000000000..3a921bc6d36
--- /dev/null
+++ b/tests/baselines/reference/breakTarget6.errors.txt
@@ -0,0 +1,6 @@
+==== tests/cases/compiler/breakTarget6.ts (1 errors) ====
+    while (true) {
+      break target;
+      ~~~~~~~~~~~~~
+!!! A 'break' statement can only jump to a label of an enclosing statement.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/callGenericFunctionWithZeroTypeArguments.types b/tests/baselines/reference/callGenericFunctionWithZeroTypeArguments.types
index 34de901e3c0..f2ac424455b 100644
--- a/tests/baselines/reference/callGenericFunctionWithZeroTypeArguments.types
+++ b/tests/baselines/reference/callGenericFunctionWithZeroTypeArguments.types
@@ -2,7 +2,7 @@
 // valid invocations of generic functions with no explicit type arguments provided 
 
 function f<T>(x: T): T { return null; }
->f : <T>(x: T) => T
+>f : typeof f
 >T : T
 >x : T
 >T : T
@@ -11,7 +11,7 @@ function f<T>(x: T): T { return null; }
 var r = f(1);
 >r : number
 >f(1) : number
->f : <T>(x: T) => T
+>f : typeof f
 
 var f2 = <T>(x: T): T => { return null; }
 >f2 : <T>(x: T) => T
diff --git a/tests/baselines/reference/callSignatureWithoutAnnotationsOrBody.types b/tests/baselines/reference/callSignatureWithoutAnnotationsOrBody.types
index b8b608762f5..08288f53f7e 100644
--- a/tests/baselines/reference/callSignatureWithoutAnnotationsOrBody.types
+++ b/tests/baselines/reference/callSignatureWithoutAnnotationsOrBody.types
@@ -2,13 +2,13 @@
 // Call signatures without a return type annotation and function body return 'any'
 
 function foo(x) { }
->foo : (x: any) => void
+>foo : typeof foo
 >x : any
 
 var r = foo(1); // void since there's a body
 >r : void
 >foo(1) : void
->foo : (x: any) => void
+>foo : typeof foo
 
 interface I {
 >I : I
diff --git a/tests/baselines/reference/callSignatureWithoutReturnTypeAnnotationInference.types b/tests/baselines/reference/callSignatureWithoutReturnTypeAnnotationInference.types
index 2bb38c096f6..5a171809e40 100644
--- a/tests/baselines/reference/callSignatureWithoutReturnTypeAnnotationInference.types
+++ b/tests/baselines/reference/callSignatureWithoutReturnTypeAnnotationInference.types
@@ -3,7 +3,7 @@
 
 // Simple types
 function foo(x) {
->foo : (x: any) => number
+>foo : typeof foo
 >x : any
 
     return 1;
@@ -11,36 +11,36 @@ function foo(x) {
 var r = foo(1);
 >r : number
 >foo(1) : number
->foo : (x: any) => number
+>foo : typeof foo
 
 function foo2(x) {
->foo2 : (x: any) => number
+>foo2 : typeof foo2
 >x : any
 
     return foo(x);
 >foo(x) : number
->foo : (x: any) => number
+>foo : typeof foo
 >x : any
 }
 var r2 = foo2(1);
 >r2 : number
 >foo2(1) : number
->foo2 : (x: any) => number
+>foo2 : typeof foo2
 
 function foo3() {
->foo3 : () => any
+>foo3 : typeof foo3
 
     return foo3();
 >foo3() : any
->foo3 : () => any
+>foo3 : typeof foo3
 }
 var r3 = foo3();
 >r3 : any
 >foo3() : any
->foo3 : () => any
+>foo3 : typeof foo3
 
 function foo4<T>(x: T) {
->foo4 : <T>(x: T) => T
+>foo4 : typeof foo4
 >T : T
 >x : T
 >T : T
@@ -51,10 +51,10 @@ function foo4<T>(x: T) {
 var r4 = foo4(1);
 >r4 : number
 >foo4(1) : number
->foo4 : <T>(x: T) => T
+>foo4 : typeof foo4
 
 function foo5(x) {
->foo5 : (x: any) => number
+>foo5 : typeof foo5
 >x : any
 
     if (true) {
@@ -66,10 +66,10 @@ function foo5(x) {
 var r5 = foo5(1);
 >r5 : number
 >foo5(1) : number
->foo5 : (x: any) => number
+>foo5 : typeof foo5
 
 function foo6(x) {
->foo6 : (x: any) => any[]
+>foo6 : typeof foo6
 >x : any
 
     try {
@@ -88,10 +88,10 @@ function foo6(x) {
 var r6 = foo6(1);
 >r6 : any[]
 >foo6(1) : any[]
->foo6 : (x: any) => any[]
+>foo6 : typeof foo6
 
 function foo7(x) {
->foo7 : (x: any) => string
+>foo7 : typeof foo7
 >x : any
 
     return typeof x;
@@ -101,11 +101,11 @@ function foo7(x) {
 var r7 = foo7(1);
 >r7 : string
 >foo7(1) : string
->foo7 : (x: any) => string
+>foo7 : typeof foo7
 
 // object types
 function foo8(x: number) {
->foo8 : (x: number) => { x: number; }
+>foo8 : typeof foo8
 >x : number
 
     return { x: x };
@@ -116,7 +116,7 @@ function foo8(x: number) {
 var r8 = foo8(1);
 >r8 : { x: number; }
 >foo8(1) : { x: number; }
->foo8 : (x: number) => { x: number; }
+>foo8 : typeof foo8
 
 interface I {
 >I : I
@@ -125,7 +125,7 @@ interface I {
 >foo : string
 }
 function foo9(x: number) {
->foo9 : (x: number) => I
+>foo9 : typeof foo9
 >x : number
 
     var i: I;
@@ -138,7 +138,7 @@ function foo9(x: number) {
 var r9 = foo9(1);
 >r9 : I
 >foo9(1) : I
->foo9 : (x: number) => I
+>foo9 : typeof foo9
 
 class C {
 >C : C
@@ -147,7 +147,7 @@ class C {
 >foo : string
 }
 function foo10(x: number) {
->foo10 : (x: number) => C
+>foo10 : typeof foo10
 >x : number
 
     var c: C;
@@ -160,7 +160,7 @@ function foo10(x: number) {
 var r10 = foo10(1);
 >r10 : C
 >foo10(1) : C
->foo10 : (x: number) => C
+>foo10 : typeof foo10
 
 module M {
 >M : typeof M
@@ -173,7 +173,7 @@ module M {
 >foo : string
 }
 function foo11() {
->foo11 : () => typeof M
+>foo11 : typeof foo11
 
     return M;
 >M : typeof M
@@ -181,7 +181,7 @@ function foo11() {
 var r11 = foo11();
 >r11 : typeof M
 >foo11() : typeof M
->foo11 : () => typeof M
+>foo11 : typeof foo11
 
 // merged declarations
 interface I2 {
@@ -197,7 +197,7 @@ interface I2 {
 >y : number
 }
 function foo12() {
->foo12 : () => I2
+>foo12 : typeof foo12
 
     var i2: I2;
 >i2 : I2
@@ -209,7 +209,7 @@ function foo12() {
 var r12 = foo12();
 >r12 : I2
 >foo12() : I2
->foo12 : () => I2
+>foo12 : typeof foo12
 
 function m1() { return 1; }
 >m1 : typeof m1
@@ -219,7 +219,7 @@ module m1 { export var y = 2; }
 >y : number
 
 function foo13() {
->foo13 : () => typeof m1
+>foo13 : typeof foo13
 
     return m1;
 >m1 : typeof m1
@@ -227,7 +227,7 @@ function foo13() {
 var r13 = foo13();
 >r13 : typeof m1
 >foo13() : typeof m1
->foo13 : () => typeof m1
+>foo13 : typeof foo13
 
 class c1 {
 >c1 : c1
@@ -245,7 +245,7 @@ module c1 {
 >x : number
 }
 function foo14() {
->foo14 : () => typeof c1
+>foo14 : typeof foo14
 
     return c1;
 >c1 : typeof c1
@@ -253,7 +253,7 @@ function foo14() {
 var r14 = foo14();
 >r14 : typeof c1
 >foo14() : typeof c1
->foo14 : () => typeof c1
+>foo14 : typeof foo14
 
 enum e1 { A }
 >e1 : e1
@@ -264,7 +264,7 @@ module e1 { export var y = 1; }
 >y : number
 
 function foo15() {
->foo15 : () => typeof e1
+>foo15 : typeof foo15
 
     return e1;
 >e1 : typeof e1
@@ -272,5 +272,5 @@ function foo15() {
 var r15 = foo15();
 >r15 : typeof e1
 >foo15() : typeof e1
->foo15 : () => typeof e1
+>foo15 : typeof foo15
 
diff --git a/tests/baselines/reference/callSignaturesWithOptionalParameters.types b/tests/baselines/reference/callSignaturesWithOptionalParameters.types
index b38b5687ed4..199d458983c 100644
--- a/tests/baselines/reference/callSignaturesWithOptionalParameters.types
+++ b/tests/baselines/reference/callSignaturesWithOptionalParameters.types
@@ -2,7 +2,7 @@
 // Optional parameters should be valid in all the below casts
 
 function foo(x?: number) { }
->foo : (x?: number) => void
+>foo : typeof foo
 >x : number
 
 var f = function foo(x?: number) { }
@@ -19,11 +19,11 @@ var f2 = (x: number, y?: number) => { }
 
 foo(1);
 >foo(1) : void
->foo : (x?: number) => void
+>foo : typeof foo
 
 foo();
 >foo() : void
->foo : (x?: number) => void
+>foo : typeof foo
 
 f(1);
 >f(1) : void
@@ -134,11 +134,7 @@ a.foo(1);
 
 var b = {
 >b : { foo: (x?: number) => void; a: (x: number, y?: number) => void; b: (x?: number) => void; }
->{
-    foo(x?: number) { },
-    a: function foo(x: number, y?: number) { },
-    b: (x?: number) => { }
-} : { foo: (x?: number) => void; a: (x: number, y?: number) => void; b: (x?: number) => void; }
+>{    foo(x?: number) { },    a: function foo(x: number, y?: number) { },    b: (x?: number) => { }} : { foo: (x?: number) => void; a: (x: number, y?: number) => void; b: (x?: number) => void; }
 
     foo(x?: number) { },
 >foo : (x?: number) => void
diff --git a/tests/baselines/reference/callSignaturesWithOptionalParameters2.types b/tests/baselines/reference/callSignaturesWithOptionalParameters2.types
index 602edd911fe..c13942a5c70 100644
--- a/tests/baselines/reference/callSignaturesWithOptionalParameters2.types
+++ b/tests/baselines/reference/callSignaturesWithOptionalParameters2.types
@@ -2,42 +2,42 @@
 // Optional parameters should be valid in all the below casts
 
 function foo(x?: number);
->foo : (x?: number) => any
+>foo : typeof foo
 >x : number
 
 function foo(x?: number) { }
->foo : (x?: number) => any
+>foo : typeof foo
 >x : number
 
 foo(1);
 >foo(1) : any
->foo : (x?: number) => any
+>foo : typeof foo
 
 foo();
 >foo() : any
->foo : (x?: number) => any
+>foo : typeof foo
 
 function foo2(x: number);
->foo2 : { (x: number): any; (x: number, y?: number): any; }
+>foo2 : typeof foo2
 >x : number
 
 function foo2(x: number, y?: number);
->foo2 : { (x: number): any; (x: number, y?: number): any; }
+>foo2 : typeof foo2
 >x : number
 >y : number
 
 function foo2(x: number, y?: number) { }
->foo2 : { (x: number): any; (x: number, y?: number): any; }
+>foo2 : typeof foo2
 >x : number
 >y : number
 
 foo2(1);
 >foo2(1) : any
->foo2 : { (x: number): any; (x: number, y?: number): any; }
+>foo2 : typeof foo2
 
 foo2(1, 2);
 >foo2(1, 2) : any
->foo2 : { (x: number): any; (x: number, y?: number): any; }
+>foo2 : typeof foo2
 
 class C {
 >C : C
diff --git a/tests/baselines/reference/captureThisInSuperCall.js b/tests/baselines/reference/captureThisInSuperCall.js
deleted file mode 100644
index 3f60fcd3cb1..00000000000
--- a/tests/baselines/reference/captureThisInSuperCall.js
+++ /dev/null
@@ -1,32 +0,0 @@
-//// [captureThisInSuperCall.ts]
-class A {
-    constructor(p:any) {}
-}
-
-class B extends A {
-    constructor() { super({ test: () => this.someMethod()}); } 
-    someMethod() {}
-}
-
-//// [captureThisInSuperCall.js]
-var __extends = this.__extends || function (d, b) {
-    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
-    function __() { this.constructor = d; }
-    __.prototype = b.prototype;
-    d.prototype = new __();
-};
-var A = (function () {
-    function A(p) {
-    }
-    return A;
-})();
-var B = (function (_super) {
-    __extends(B, _super);
-    function B() {
-        var _this = this;
-        _super.call(this, { test: function () { return _this.someMethod(); } });
-    }
-    B.prototype.someMethod = function () {
-    };
-    return B;
-})(A);
diff --git a/tests/baselines/reference/captureThisInSuperCall.types b/tests/baselines/reference/captureThisInSuperCall.types
deleted file mode 100644
index dc11b56ada2..00000000000
--- a/tests/baselines/reference/captureThisInSuperCall.types
+++ /dev/null
@@ -1,25 +0,0 @@
-=== tests/cases/compiler/captureThisInSuperCall.ts ===
-class A {
->A : A
-
-    constructor(p:any) {}
->p : any
-}
-
-class B extends A {
->B : B
->A : A
-
-    constructor() { super({ test: () => this.someMethod()}); } 
->super({ test: () => this.someMethod()}) : void
->{ test: () => this.someMethod()} : { test: () => void; }
->test : () => void
->() => this.someMethod() : () => void
->this.someMethod() : void
->this.someMethod : () => void
->this : B
->someMethod : () => void
-
-    someMethod() {}
->someMethod : () => void
-}
diff --git a/tests/baselines/reference/castExpressionParentheses.errors.txt b/tests/baselines/reference/castExpressionParentheses.errors.txt
new file mode 100644
index 00000000000..acb0f057f9a
--- /dev/null
+++ b/tests/baselines/reference/castExpressionParentheses.errors.txt
@@ -0,0 +1,42 @@
+==== tests/cases/compiler/castExpressionParentheses.ts (1 errors) ====
+    declare var a;
+    
+    // parentheses should be omitted
+    // literals
+    (<any>{a:0});  
+    (<any>[1,3,]); 
+    (<any>"string"); 
+    (<any>23.0); 
+    (<any>/regexp/g); 
+    (<any>false); 
+    (<any>true); 
+    (<any>null); 
+    // names and dotted names
+    (<any>this); 
+    (<any>this.x); 
+    (<any>(<any>a).x);
+    (<any><any>a);
+    (<any>a[0]);
+    (<any>a.b["0"]);
+    (<any>a()).x;
+    
+    declare var A;
+    
+    // should keep the parentheses in emit
+    (<any>new A).foo; 
+    (<any>typeof A).x; 
+    (<any>-A).x; 
+    new (<any>A());
+    (<any>()=> {})();
+      ~~~
+!!! Type parameter name cannot be 'any'
+    (<any>function foo() { })();
+    (<any><number><any>-A).x; 
+    
+    // nested cast, should keep one pair of parenthese
+    (<any><number>(<any>-A)).x; 
+    
+    // nested parenthesized expression, should keep one pair of parenthese
+    (<any>(A)) 
+    
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/castExpressionParentheses.js b/tests/baselines/reference/castExpressionParentheses.js
index 2f62d6e9447..f400d647a94 100644
--- a/tests/baselines/reference/castExpressionParentheses.js
+++ b/tests/baselines/reference/castExpressionParentheses.js
@@ -27,7 +27,7 @@ declare var A;
 (<any>typeof A).x; 
 (<any>-A).x; 
 new (<any>A());
-(<Tany>()=> {})();
+(<any>()=> {})();
 (<any>function foo() { })();
 (<any><number><any>-A).x; 
 
diff --git a/tests/baselines/reference/castExpressionParentheses.types b/tests/baselines/reference/castExpressionParentheses.types
deleted file mode 100644
index 590c23b048f..00000000000
--- a/tests/baselines/reference/castExpressionParentheses.types
+++ /dev/null
@@ -1,170 +0,0 @@
-=== tests/cases/compiler/castExpressionParentheses.ts ===
-declare var a;
->a : any
-
-// parentheses should be omitted
-// literals
-(<any>{a:0});  
->(<any>{a:0}) : any
-><any>{a:0} : any
->{a:0} : { a: number; }
->a : number
-
-(<any>[1,3,]); 
->(<any>[1,3,]) : any
-><any>[1,3,] : any
->[1,3,] : number[]
-
-(<any>"string"); 
->(<any>"string") : any
-><any>"string" : any
-
-(<any>23.0); 
->(<any>23.0) : any
-><any>23.0 : any
-
-(<any>/regexp/g); 
->(<any>/regexp/g) : any
-><any>/regexp/g : any
->/regexp/g : RegExp
-
-(<any>false); 
->(<any>false) : any
-><any>false : any
-
-(<any>true); 
->(<any>true) : any
-><any>true : any
-
-(<any>null); 
->(<any>null) : any
-><any>null : any
-
-// names and dotted names
-(<any>this); 
->(<any>this) : any
-><any>this : any
->this : any
-
-(<any>this.x); 
->(<any>this.x) : any
-><any>this.x : any
->this.x : any
->this : any
->x : any
-
-(<any>(<any>a).x);
->(<any>(<any>a).x) : any
-><any>(<any>a).x : any
->(<any>a).x : any
->(<any>a) : any
-><any>a : any
->a : any
->x : any
-
-(<any><any>a);
->(<any><any>a) : any
-><any><any>a : any
-><any>a : any
->a : any
-
-(<any>a[0]);
->(<any>a[0]) : any
-><any>a[0] : any
->a[0] : any
->a : any
-
-(<any>a.b["0"]);
->(<any>a.b["0"]) : any
-><any>a.b["0"] : any
->a.b["0"] : any
->a.b : any
->a : any
->b : any
-
-(<any>a()).x;
->(<any>a()).x : any
->(<any>a()) : any
-><any>a() : any
->a() : any
->a : any
->x : any
-
-declare var A;
->A : any
-
-// should keep the parentheses in emit
-(<any>new A).foo; 
->(<any>new A).foo : any
->(<any>new A) : any
-><any>new A : any
->new A : any
->A : any
->foo : any
-
-(<any>typeof A).x; 
->(<any>typeof A).x : any
->(<any>typeof A) : any
-><any>typeof A : any
->typeof A : string
->A : any
->x : any
-
-(<any>-A).x; 
->(<any>-A).x : any
->(<any>-A) : any
-><any>-A : any
->-A : number
->A : any
->x : any
-
-new (<any>A());
->new (<any>A()) : any
->(<any>A()) : any
-><any>A() : any
->A() : any
->A : any
-
-(<Tany>()=> {})();
->(<Tany>()=> {})() : void
->(<Tany>()=> {}) : <Tany>() => void
-><Tany>()=> {} : <Tany>() => void
->Tany : Tany
-
-(<any>function foo() { })();
->(<any>function foo() { })() : any
->(<any>function foo() { }) : any
-><any>function foo() { } : any
->function foo() { } : () => void
->foo : () => void
-
-(<any><number><any>-A).x; 
->(<any><number><any>-A).x : any
->(<any><number><any>-A) : any
-><any><number><any>-A : any
-><number><any>-A : number
-><any>-A : any
->-A : number
->A : any
->x : any
-
-// nested cast, should keep one pair of parenthese
-(<any><number>(<any>-A)).x; 
->(<any><number>(<any>-A)).x : any
->(<any><number>(<any>-A)) : any
-><any><number>(<any>-A) : any
-><number>(<any>-A) : number
->(<any>-A) : any
-><any>-A : any
->-A : number
->A : any
->x : any
-
-// nested parenthesized expression, should keep one pair of parenthese
-(<any>(A)) 
->(<any>(A)) : any
-><any>(A) : any
->(A) : any
->A : any
-
-
diff --git a/tests/baselines/reference/castTest.types b/tests/baselines/reference/castTest.types
index 42a721d8fff..501ff5a3cbe 100644
--- a/tests/baselines/reference/castTest.types
+++ b/tests/baselines/reference/castTest.types
@@ -63,31 +63,10 @@ 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> ({    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: any, dy: any) => Point; mult: (p: any) => any; }
->{
-    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: any, dy: any) => Point; mult: (p: any) => any; }
+>({    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: any, dy: any) => Point; mult: (p: any) => any; }
+>{    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: any, dy: any) => Point; mult: (p: any) => any; }
 
     x: 0,
 >x : number
@@ -97,9 +76,7 @@ var p_cast = <Point> ({
 
     add: function(dx, dy) {
 >add : (dx: any, dy: any) => Point
->function(dx, dy) {
-        return new Point(this.x + dx, this.y + dy);
-    } : (dx: any, dy: any) => Point
+>function(dx, dy) {        return new Point(this.x + dx, this.y + dy);    } : (dx: any, dy: any) => Point
 >dx : any
 >dy : any
 
diff --git a/tests/baselines/reference/catch.types b/tests/baselines/reference/catch.types
index bb0b2adbefe..2caa04d8697 100644
--- a/tests/baselines/reference/catch.types
+++ b/tests/baselines/reference/catch.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/catch.ts ===
 function f() {
->f : () => void
+>f : typeof f
 
     try {} catch(e) { }
 >e : any
diff --git a/tests/baselines/reference/cf.types b/tests/baselines/reference/cf.types
index 62dcba0ba9a..df7dc12ce31 100644
--- a/tests/baselines/reference/cf.types
+++ b/tests/baselines/reference/cf.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/cf.ts ===
 function f() {
->f : () => void
+>f : typeof f
 
     var z;
 >z : any
diff --git a/tests/baselines/reference/chainedImportAlias.js b/tests/baselines/reference/chainedImportAlias.js
index 6149105bce0..cbc1e82b45a 100644
--- a/tests/baselines/reference/chainedImportAlias.js
+++ b/tests/baselines/reference/chainedImportAlias.js
@@ -6,19 +6,15 @@ export module m {
 }
 
 //// [chainedImportAlias_file1.ts]
-import x = require('chainedImportAlias_file0');
+import x = require('chainedImportAlias_file1');
 import y = x;
-y.m.foo();
+declare var console: {
+    log(message?: any);
+};
+console.log(y);
 
 
-//// [chainedImportAlias_file0.js]
-(function (m) {
-    function foo() {
-    }
-    m.foo = foo;
-})(exports.m || (exports.m = {}));
-var m = exports.m;
 //// [chainedImportAlias_file1.js]
-var x = require('chainedImportAlias_file0');
+var x = require('chainedImportAlias_file1');
 var y = x;
-y.m.foo();
+console.log(y);
diff --git a/tests/baselines/reference/chainedImportAlias.types b/tests/baselines/reference/chainedImportAlias.types
index 4a94cf6867e..463b49a14aa 100644
--- a/tests/baselines/reference/chainedImportAlias.types
+++ b/tests/baselines/reference/chainedImportAlias.types
@@ -1,24 +1,23 @@
 === tests/cases/compiler/chainedImportAlias_file1.ts ===
-import x = require('chainedImportAlias_file0');
->x : typeof "tests/cases/compiler/chainedImportAlias_file0"
+import x = require('chainedImportAlias_file1');
+>x : typeof "tests/cases/compiler/chainedImportAlias_file1"
 
 import y = x;
->y : typeof "tests/cases/compiler/chainedImportAlias_file0"
->x : typeof "tests/cases/compiler/chainedImportAlias_file0"
+>y : typeof "tests/cases/compiler/chainedImportAlias_file1"
+>x : typeof "tests/cases/compiler/chainedImportAlias_file1"
 
-y.m.foo();
->y.m.foo() : void
->y.m.foo : () => void
->y.m : typeof m
->y : typeof "tests/cases/compiler/chainedImportAlias_file0"
->m : typeof m
->foo : () => void
+declare var console: {
+>console : { log(message?: any): any; }
 
-=== tests/cases/compiler/chainedImportAlias_file0.ts ===
-export module m {
->m : typeof m
+    log(message?: any);
+>log : (message?: any) => any
+>message : any
 
-    export function foo() { }
->foo : () => void
-}
+};
+console.log(y);
+>console.log(y) : any
+>console.log : (message?: any) => any
+>console : { log(message?: any): any; }
+>log : (message?: any) => any
+>y : typeof "tests/cases/compiler/chainedImportAlias_file1"
 
diff --git a/tests/baselines/reference/classExtendingClass.types b/tests/baselines/reference/classExtendingClass.types
index 7eaaaecf17f..19c73a2b9db 100644
--- a/tests/baselines/reference/classExtendingClass.types
+++ b/tests/baselines/reference/classExtendingClass.types
@@ -9,7 +9,7 @@ class C {
 >thing : () => void
 
     static other() { }
->other : () => void
+>other : typeof other
 }
 
 class D extends C {
@@ -46,9 +46,9 @@ var r3 = d.thing();
 var r4 = D.other();
 >r4 : void
 >D.other() : void
->D.other : () => void
+>D.other : typeof other
 >D : typeof D
->other : () => void
+>other : typeof other
 
 class C2<T> {
 >C2 : C2<T>
@@ -64,7 +64,7 @@ class C2<T> {
 >T : T
 
     static other<T>(x: T) { }
->other : <T>(x: T) => void
+>other : typeof other
 >T : T
 >x : T
 >T : T
@@ -106,7 +106,7 @@ var r7 = d2.thing('');
 var r8 = D2.other(1);
 >r8 : void
 >D2.other(1) : void
->D2.other : <T>(x: T) => void
+>D2.other : typeof other
 >D2 : typeof D2
->other : <T>(x: T) => void
+>other : typeof other
 
diff --git a/tests/baselines/reference/classExtendingPrimitive2.errors.txt b/tests/baselines/reference/classExtendingPrimitive2.errors.txt
deleted file mode 100644
index 9d1f62d5350..00000000000
--- a/tests/baselines/reference/classExtendingPrimitive2.errors.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-==== tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendingPrimitive2.ts (3 errors) ====
-    // classes cannot extend primitives
-    
-    class C4a extends void {}
-                      ~~~~
-!!! Identifier expected.
-    class C5a extends null { }
-                      ~~~~
-!!! Identifier expected.
-                           ~
-!!! ';' expected.
\ No newline at end of file
diff --git a/tests/baselines/reference/classExtendsEveryObjectType2.errors.txt b/tests/baselines/reference/classExtendsEveryObjectType2.errors.txt
deleted file mode 100644
index 7a5573ae000..00000000000
--- a/tests/baselines/reference/classExtendsEveryObjectType2.errors.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-==== tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendsEveryObjectType2.ts (3 errors) ====
-    class C2 extends { foo: string; } { } // error
-                     ~
-!!! Identifier expected.
-    
-    class C6 extends []{ } // error
-                     ~
-!!! Identifier expected.
-                       ~
-!!! ';' expected.
\ No newline at end of file
diff --git a/tests/baselines/reference/classImplementsImportedInterface.js b/tests/baselines/reference/classImplementsImportedInterface.js
deleted file mode 100644
index c76a026b58a..00000000000
--- a/tests/baselines/reference/classImplementsImportedInterface.js
+++ /dev/null
@@ -1,25 +0,0 @@
-//// [classImplementsImportedInterface.ts]
-module M1 {
-    export interface I {
-        foo();
-    }
-}
-
-module M2 {
-    import T = M1.I;
-    class C implements T {
-        foo() {}
-    }
-}
-
-//// [classImplementsImportedInterface.js]
-var M2;
-(function (M2) {
-    var C = (function () {
-        function C() {
-        }
-        C.prototype.foo = function () {
-        };
-        return C;
-    })();
-})(M2 || (M2 = {}));
diff --git a/tests/baselines/reference/classImplementsImportedInterface.types b/tests/baselines/reference/classImplementsImportedInterface.types
deleted file mode 100644
index ef02896a945..00000000000
--- a/tests/baselines/reference/classImplementsImportedInterface.types
+++ /dev/null
@@ -1,28 +0,0 @@
-=== tests/cases/compiler/classImplementsImportedInterface.ts ===
-module M1 {
->M1 : M1
-
-    export interface I {
->I : I
-
-        foo();
->foo : () => any
-    }
-}
-
-module M2 {
->M2 : typeof M2
-
-    import T = M1.I;
->T : T
->M1 : M1
->I : I
-
-    class C implements T {
->C : C
->T : I
-
-        foo() {}
->foo : () => void
-    }
-}
diff --git a/tests/baselines/reference/classMemberInitializerWithLamdaScoping5.types b/tests/baselines/reference/classMemberInitializerWithLamdaScoping5.types
index 689ff5bdf41..bff966e605f 100644
--- a/tests/baselines/reference/classMemberInitializerWithLamdaScoping5.types
+++ b/tests/baselines/reference/classMemberInitializerWithLamdaScoping5.types
@@ -17,9 +17,7 @@ class Greeter {
 
     messageHandler = (message: string) => {
 >messageHandler : (message: string) => void
->(message: string) => {
-        console.log(message); // This shouldnt be error
-    } : (message: string) => void
+>(message: string) => {        console.log(message); // This shouldnt be error    } : (message: string) => void
 >message : string
 
         console.log(message); // This shouldnt be error
diff --git a/tests/baselines/reference/classMethodWithKeywordName1.types b/tests/baselines/reference/classMethodWithKeywordName1.types
index 8ad128bdb00..ab8232ed4ba 100644
--- a/tests/baselines/reference/classMethodWithKeywordName1.types
+++ b/tests/baselines/reference/classMethodWithKeywordName1.types
@@ -3,5 +3,5 @@ class C {
 >C : C
 
  static try() {}
->try : () => void
+>try : typeof try
 }
diff --git a/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface.errors.txt b/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface.errors.txt
new file mode 100644
index 00000000000..618caae14e0
--- /dev/null
+++ b/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface.errors.txt
@@ -0,0 +1,30 @@
+==== tests/cases/conformance/types/namedTypes/classWithOnlyPublicMembersEquivalentToInterface.ts (2 errors) ====
+    // no errors expected
+    
+    class C {
+        public x: string;
+        public y(a: number): number { return null; }
+        public get z() { return 1; }
+                   ~
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
+        public set z(v) { }
+                   ~
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
+        [x: string]: Object;
+        [x: number]: Object;
+        0: number;
+    }
+    
+    interface I {
+        x: string;
+        y(b: number): number;
+        z: number;
+        [x: string]: Object;
+        [x: number]: Object;
+        0: number;
+    }
+    
+    var c: C;
+    var i: I;
+    c = i;
+    i = c;
\ No newline at end of file
diff --git a/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface.types b/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface.types
deleted file mode 100644
index 9f6d031bf20..00000000000
--- a/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface.types
+++ /dev/null
@@ -1,73 +0,0 @@
-=== tests/cases/conformance/types/namedTypes/classWithOnlyPublicMembersEquivalentToInterface.ts ===
-// no errors expected
-
-class C {
->C : C
-
-    public x: string;
->x : string
-
-    public y(a: number): number { return null; }
->y : (a: number) => number
->a : number
-
-    public get z() { return 1; }
->z : number
-
-    public set z(v) { }
->z : number
->v : number
-
-    [x: string]: Object;
->x : string
->Object : Object
-
-    [x: number]: Object;
->x : number
->Object : Object
-
-    0: number;
-}
-
-interface I {
->I : I
-
-    x: string;
->x : string
-
-    y(b: number): number;
->y : (b: number) => number
->b : number
-
-    z: number;
->z : number
-
-    [x: string]: Object;
->x : string
->Object : Object
-
-    [x: number]: Object;
->x : number
->Object : Object
-
-    0: number;
-}
-
-var c: C;
->c : C
->C : C
-
-var i: I;
->i : I
->I : I
-
-c = i;
->c = i : I
->c : C
->i : I
-
-i = c;
->i = c : C
->i : I
->c : C
-
diff --git a/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface2.errors.txt b/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface2.errors.txt
new file mode 100644
index 00000000000..b26f3cd6146
--- /dev/null
+++ b/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface2.errors.txt
@@ -0,0 +1,32 @@
+==== tests/cases/conformance/types/namedTypes/classWithOnlyPublicMembersEquivalentToInterface2.ts (2 errors) ====
+    // no errors expected
+    
+    class C {
+        public x: string;
+        public y(a: number): number { return null; }
+        public get z() { return 1; }
+                   ~
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
+        public set z(v) { }
+                   ~
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
+        [x: string]: Object;
+        [x: number]: Object;
+        0: number;
+    
+        public static foo: string; // doesn't effect equivalence
+    }
+    
+    interface I {
+        x: string;
+        y(b: number): number;
+        z: number;
+        [x: string]: Object;
+        [x: number]: Object;
+        0: number;
+    }
+    
+    var c: C;
+    var i: I;
+    c = i;
+    i = c;
\ No newline at end of file
diff --git a/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface2.types b/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface2.types
deleted file mode 100644
index be504f895fd..00000000000
--- a/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface2.types
+++ /dev/null
@@ -1,76 +0,0 @@
-=== tests/cases/conformance/types/namedTypes/classWithOnlyPublicMembersEquivalentToInterface2.ts ===
-// no errors expected
-
-class C {
->C : C
-
-    public x: string;
->x : string
-
-    public y(a: number): number { return null; }
->y : (a: number) => number
->a : number
-
-    public get z() { return 1; }
->z : number
-
-    public set z(v) { }
->z : number
->v : number
-
-    [x: string]: Object;
->x : string
->Object : Object
-
-    [x: number]: Object;
->x : number
->Object : Object
-
-    0: number;
-
-    public static foo: string; // doesn't effect equivalence
->foo : string
-}
-
-interface I {
->I : I
-
-    x: string;
->x : string
-
-    y(b: number): number;
->y : (b: number) => number
->b : number
-
-    z: number;
->z : number
-
-    [x: string]: Object;
->x : string
->Object : Object
-
-    [x: number]: Object;
->x : number
->Object : Object
-
-    0: number;
-}
-
-var c: C;
->c : C
->C : C
-
-var i: I;
->i : I
->I : I
-
-c = i;
->c = i : I
->c : C
->i : I
-
-i = c;
->i = c : C
->i : I
->c : C
-
diff --git a/tests/baselines/reference/classWithPublicProperty.types b/tests/baselines/reference/classWithPublicProperty.types
index a5bdeb95f1a..ee08e04256c 100644
--- a/tests/baselines/reference/classWithPublicProperty.types
+++ b/tests/baselines/reference/classWithPublicProperty.types
@@ -22,7 +22,7 @@ class C {
 >e : any
 
     public static f() { return '' }
->f : () => string
+>f : typeof f
 
     public static g = () => '';
 >g : () => string
@@ -76,9 +76,9 @@ var r6: string = C.e;
 var r7: string = C.f();
 >r7 : string
 >C.f() : string
->C.f : () => string
+>C.f : typeof f
 >C : typeof C
->f : () => string
+>f : typeof f
 
 var r8: string = C.g();
 >r8 : string
diff --git a/tests/baselines/reference/cloduleAcrossModuleDefinitions.types b/tests/baselines/reference/cloduleAcrossModuleDefinitions.types
index 3bd384b6e95..b513d80ccc0 100644
--- a/tests/baselines/reference/cloduleAcrossModuleDefinitions.types
+++ b/tests/baselines/reference/cloduleAcrossModuleDefinitions.types
@@ -9,7 +9,7 @@ module A {
 >foo : () => void
 
         static bar() { }
->bar : () => void
+>bar : typeof bar
     }
 }
 
diff --git a/tests/baselines/reference/cloduleTest1.types b/tests/baselines/reference/cloduleTest1.types
index a92355b483a..214b46c2676 100644
--- a/tests/baselines/reference/cloduleTest1.types
+++ b/tests/baselines/reference/cloduleTest1.types
@@ -19,7 +19,7 @@
 >AjaxSettings : AjaxSettings
     }
     export function ajax(options: AjaxSettings) { }
->ajax : (options: AjaxSettings) => void
+>ajax : typeof ajax
 >options : AjaxSettings
 >AjaxSettings : AjaxSettings
   }
diff --git a/tests/baselines/reference/collisionCodeGenModuleWithFunctionChildren.types b/tests/baselines/reference/collisionCodeGenModuleWithFunctionChildren.types
index 07ef123f642..7c22d6ddc8f 100644
--- a/tests/baselines/reference/collisionCodeGenModuleWithFunctionChildren.types
+++ b/tests/baselines/reference/collisionCodeGenModuleWithFunctionChildren.types
@@ -6,7 +6,7 @@ module M {
 >x : number
 
     function fn(M, p = x) { }
->fn : (M: any, p?: number) => void
+>fn : typeof fn
 >M : any
 >p : number
 >x : number
@@ -16,7 +16,7 @@ module M {
 >M : typeof M
 
     function fn2() {
->fn2 : () => void
+>fn2 : typeof fn2
 
         var M;
 >M : any
@@ -31,7 +31,7 @@ module M {
 >M : typeof M
 
     function fn3() {
->fn3 : () => void
+>fn3 : typeof fn3
 
         function M() {
 >M : () => void
diff --git a/tests/baselines/reference/collisionCodeGenModuleWithModuleChildren.types b/tests/baselines/reference/collisionCodeGenModuleWithModuleChildren.types
index 7853bcbdb32..3ed65442a0e 100644
--- a/tests/baselines/reference/collisionCodeGenModuleWithModuleChildren.types
+++ b/tests/baselines/reference/collisionCodeGenModuleWithModuleChildren.types
@@ -44,7 +44,7 @@ module M {
 >m3 : typeof m3
 
         function M() {
->M : () => void
+>M : typeof M
         }
         var p = x;
 >p : number
@@ -53,7 +53,7 @@ module M {
         var p2 = M();
 >p2 : void
 >M() : void
->M : () => void
+>M : typeof M
     }
 }
 
diff --git a/tests/baselines/reference/collisionExportsRequireAndFunction.types b/tests/baselines/reference/collisionExportsRequireAndFunction.types
index 8b90397c6fe..8bf94d991f7 100644
--- a/tests/baselines/reference/collisionExportsRequireAndFunction.types
+++ b/tests/baselines/reference/collisionExportsRequireAndFunction.types
@@ -1,11 +1,11 @@
 === tests/cases/compiler/collisionExportsRequireAndFunction.ts ===
 export function exports() {
->exports : () => number
+>exports : typeof exports
 
     return 1;
 }
 export function require() {
->require : () => string
+>require : typeof require
 
     return "require";
 }
diff --git a/tests/baselines/reference/collisionExportsRequireAndModule.types b/tests/baselines/reference/collisionExportsRequireAndModule.types
index e2956ee1ba8..21154458d6f 100644
--- a/tests/baselines/reference/collisionExportsRequireAndModule.types
+++ b/tests/baselines/reference/collisionExportsRequireAndModule.types
@@ -10,7 +10,7 @@ export module require {
     }
 }
 export function foo(): require.I {
->foo : () => I
+>foo : typeof foo
 >require : require
 >I : I
 
@@ -27,7 +27,7 @@ export module exports {
     }
 }
 export function foo2(): exports.I {
->foo2 : () => I
+>foo2 : typeof foo2
 >exports : exports
 >I : I
 
diff --git a/tests/baselines/reference/collisionExportsRequireAndUninstantiatedModule.types b/tests/baselines/reference/collisionExportsRequireAndUninstantiatedModule.types
index 4b219229ef3..e29b88abfe9 100644
--- a/tests/baselines/reference/collisionExportsRequireAndUninstantiatedModule.types
+++ b/tests/baselines/reference/collisionExportsRequireAndUninstantiatedModule.types
@@ -7,7 +7,7 @@ export module require { // no error
     }
 }
 export function foo(): require.I {
->foo : () => I
+>foo : typeof foo
 >require : require
 >I : I
 
@@ -21,7 +21,7 @@ export module exports { // no error
     }
 }
 export function foo2(): exports.I {
->foo2 : () => I
+>foo2 : typeof foo2
 >exports : exports
 >I : I
 
diff --git a/tests/baselines/reference/collisionExportsRequireAndVar.types b/tests/baselines/reference/collisionExportsRequireAndVar.types
index 656c705aa23..112b8ec838e 100644
--- a/tests/baselines/reference/collisionExportsRequireAndVar.types
+++ b/tests/baselines/reference/collisionExportsRequireAndVar.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/collisionExportsRequireAndVar.ts ===
 export function foo() {
->foo : () => void
+>foo : typeof foo
 }
 var exports = 1;
 >exports : number
diff --git a/tests/baselines/reference/commaOperator1.types b/tests/baselines/reference/commaOperator1.types
index 52a36e33024..17b8c3cad00 100644
--- a/tests/baselines/reference/commaOperator1.types
+++ b/tests/baselines/reference/commaOperator1.types
@@ -12,7 +12,7 @@ var v1 = ((1, 2, 3), 4, 5, (6, 7));
 >6, 7 : number
 
 function f1() {
->f1 : () => number
+>f1 : typeof f1
 
     var a = 1;
 >a : number
diff --git a/tests/baselines/reference/commaOperatorOtherValidOperation.types b/tests/baselines/reference/commaOperatorOtherValidOperation.types
index e42991e7b5a..57538f4a1cb 100644
--- a/tests/baselines/reference/commaOperatorOtherValidOperation.types
+++ b/tests/baselines/reference/commaOperatorOtherValidOperation.types
@@ -16,7 +16,7 @@ for (var i = 0, j = 10; i < j; i++, j--)
 
 //Comma operator in fuction arguments and return
 function foo(x: number, y: string)
->foo : (x: number, y: string) => string
+>foo : typeof foo
 >x : number
 >y : string
 {
@@ -28,11 +28,11 @@ function foo(x: number, y: string)
 var resultIsString = foo(1, "123");
 >resultIsString : string
 >foo(1, "123") : string
->foo : (x: number, y: string) => string
+>foo : typeof foo
 
 //TypeParameters
 function foo1<T1, T2>()
->foo1 : <T1, T2>() => void
+>foo1 : typeof foo1
 >T1 : T1
 >T2 : T2
 {
diff --git a/tests/baselines/reference/commentBeforeStaticMethod1.types b/tests/baselines/reference/commentBeforeStaticMethod1.types
index db674324306..ebae1111658 100644
--- a/tests/baselines/reference/commentBeforeStaticMethod1.types
+++ b/tests/baselines/reference/commentBeforeStaticMethod1.types
@@ -6,7 +6,7 @@ class C {
    * Returns bar
    */
   public static foo(): string {
->foo : () => string
+>foo : typeof foo
 
     return "bar";
   }
diff --git a/tests/baselines/reference/commentInEmptyParameterList1.types b/tests/baselines/reference/commentInEmptyParameterList1.types
index dd708e8c9ac..c2e120d1ffb 100644
--- a/tests/baselines/reference/commentInEmptyParameterList1.types
+++ b/tests/baselines/reference/commentInEmptyParameterList1.types
@@ -1,4 +1,4 @@
 === tests/cases/compiler/commentInEmptyParameterList1.ts ===
 function foo(/** nothing */) {
->foo : () => void
+>foo : typeof foo
 }
diff --git a/tests/baselines/reference/commentInMethodCall.types b/tests/baselines/reference/commentInMethodCall.types
index dad966bd3df..e9543a8c6f2 100644
--- a/tests/baselines/reference/commentInMethodCall.types
+++ b/tests/baselines/reference/commentInMethodCall.types
@@ -4,8 +4,7 @@ var s: string[];
 >s : string[]
 
 s.map(// do something
->s.map(// do something
-    function () { }) : void[]
+>s.map(// do something    function () { }) : void[]
 >s.map : <U>(callbackfn: (value: string, index: number, array: string[]) => U, thisArg?: any) => U[]
 >s : string[]
 >map : <U>(callbackfn: (value: string, index: number, array: string[]) => U, thisArg?: any) => U[]
diff --git a/tests/baselines/reference/commentOnSignature1.types b/tests/baselines/reference/commentOnSignature1.types
index 6fd4516d4e9..6630fb2cf1e 100644
--- a/tests/baselines/reference/commentOnSignature1.types
+++ b/tests/baselines/reference/commentOnSignature1.types
@@ -1,15 +1,15 @@
 === tests/cases/compiler/commentOnSignature1.ts ===
 /*! Keep this pinned comment */
 function foo(n: number): void;
->foo : { (n: number): void; (s: string): void; }
+>foo : typeof foo
 >n : number
 
 // Don't keep this comment.
 function foo(s: string): void;
->foo : { (n: number): void; (s: string): void; }
+>foo : typeof foo
 >s : string
 
 function foo(a: any): void {
->foo : { (n: number): void; (s: string): void; }
+>foo : typeof foo
 >a : any
 }
diff --git a/tests/baselines/reference/commentOnSimpleArrowFunctionBody1.types b/tests/baselines/reference/commentOnSimpleArrowFunctionBody1.types
index 797da3e419a..99ec3c9a021 100644
--- a/tests/baselines/reference/commentOnSimpleArrowFunctionBody1.types
+++ b/tests/baselines/reference/commentOnSimpleArrowFunctionBody1.types
@@ -1,18 +1,14 @@
 === tests/cases/compiler/commentOnSimpleArrowFunctionBody1.ts ===
 function Foo(x: any)
->Foo : (x: any) => void
+>Foo : typeof Foo
 >x : any
 {
 }
  
 Foo(() =>
->Foo(() =>
-    // do something
-    127) : void
->Foo : (x: any) => void
->() =>
-    // do something
-    127 : () => number
+>Foo(() =>    // do something    127) : void
+>Foo : typeof Foo
+>() =>    // do something    127 : () => number
 
     // do something
     127);
diff --git a/tests/baselines/reference/commentOnStaticMember1.types b/tests/baselines/reference/commentOnStaticMember1.types
index 4b54b07570a..927114680d8 100644
--- a/tests/baselines/reference/commentOnStaticMember1.types
+++ b/tests/baselines/reference/commentOnStaticMember1.types
@@ -4,6 +4,6 @@ class Greeter {
 
     //Hello World
     static foo(){
->foo : () => void
+>foo : typeof foo
     }
 }
diff --git a/tests/baselines/reference/commentsBeforeFunctionExpression1.types b/tests/baselines/reference/commentsBeforeFunctionExpression1.types
index 50bb6352fad..4580ca9ceeb 100644
--- a/tests/baselines/reference/commentsBeforeFunctionExpression1.types
+++ b/tests/baselines/reference/commentsBeforeFunctionExpression1.types
@@ -1,9 +1,7 @@
 === tests/cases/compiler/commentsBeforeFunctionExpression1.ts ===
 var v = {
 >v : { f: (a: any) => number; }
->{
-    f: /**own f*/ (a) => 0
-} : { f: (a: any) => number; }
+>{    f: /**own f*/ (a) => 0} : { f: (a: any) => number; }
 
     f: /**own f*/ (a) => 0
 >f : (a: any) => number
diff --git a/tests/baselines/reference/commentsClassMembers.types b/tests/baselines/reference/commentsClassMembers.types
index d71ccd2e1e8..91e76986262 100644
--- a/tests/baselines/reference/commentsClassMembers.types
+++ b/tests/baselines/reference/commentsClassMembers.types
@@ -107,7 +107,7 @@ class c1 {
 
     /** static sum with property*/
     static s2(/** number to add*/b: number) {
->s2 : (b: number) => number
+>s2 : typeof s2
 >b : number
 
         return c1.s1 + b;
@@ -123,9 +123,9 @@ class c1 {
 
         return c1.s2(c1.s1);
 >c1.s2(c1.s1) : number
->c1.s2 : (b: number) => number
+>c1.s2 : typeof s2
 >c1 : typeof c1
->s2 : (b: number) => number
+>s2 : typeof s2
 >c1.s1 : number
 >c1 : typeof c1
 >s1 : number
@@ -142,9 +142,9 @@ class c1 {
 >c1 : typeof c1
 >s1 : number
 >c1.s2(value) : number
->c1.s2 : (b: number) => number
+>c1.s2 : typeof s2
 >c1 : typeof c1
->s2 : (b: number) => number
+>s2 : typeof s2
 >value : number
 
     }/*trailing comment 2 */ /*setter*/
@@ -234,7 +234,7 @@ class c1 {
 >nc_s1 : number
 
     static nc_s2(b: number) {
->nc_s2 : (b: number) => number
+>nc_s2 : typeof nc_s2
 >b : number
 
         return c1.nc_s1 + b;
@@ -249,9 +249,9 @@ class c1 {
 
         return c1.nc_s2(c1.nc_s1);
 >c1.nc_s2(c1.nc_s1) : number
->c1.nc_s2 : (b: number) => number
+>c1.nc_s2 : typeof nc_s2
 >c1 : typeof c1
->nc_s2 : (b: number) => number
+>nc_s2 : typeof nc_s2
 >c1.nc_s1 : number
 >c1 : typeof c1
 >nc_s1 : number
@@ -266,9 +266,9 @@ class c1 {
 >c1 : typeof c1
 >nc_s1 : number
 >c1.nc_s2(value) : number
->c1.nc_s2 : (b: number) => number
+>c1.nc_s2 : typeof nc_s2
 >c1 : typeof c1
->nc_s2 : (b: number) => number
+>nc_s2 : typeof nc_s2
 >value : number
     }
 
@@ -369,7 +369,7 @@ class c1 {
 
     // static sum with property
     static a_s2(b: number) {
->a_s2 : (b: number) => number
+>a_s2 : typeof a_s2
 >b : number
 
         return c1.a_s1 + b;
@@ -385,9 +385,9 @@ class c1 {
 
         return c1.s2(c1.s1);
 >c1.s2(c1.s1) : number
->c1.s2 : (b: number) => number
+>c1.s2 : typeof s2
 >c1 : typeof c1
->s2 : (b: number) => number
+>s2 : typeof s2
 >c1.s1 : number
 >c1 : typeof c1
 >s1 : number
@@ -404,9 +404,9 @@ class c1 {
 >c1 : typeof c1
 >a_s1 : number
 >c1.a_s2(value) : number
->c1.a_s2 : (b: number) => number
+>c1.a_s2 : typeof a_s2
 >c1 : typeof c1
->a_s2 : (b: number) => number
+>a_s2 : typeof a_s2
 >value : number
     }
 
@@ -507,7 +507,7 @@ class c1 {
 
     /** static sum with property */
     static b_s2(b: number) {
->b_s2 : (b: number) => number
+>b_s2 : typeof b_s2
 >b : number
 
         return c1.b_s1 + b;
@@ -524,9 +524,9 @@ class c1 {
 
         return c1.s2(c1.s1);
 >c1.s2(c1.s1) : number
->c1.s2 : (b: number) => number
+>c1.s2 : typeof s2
 >c1 : typeof c1
->s2 : (b: number) => number
+>s2 : typeof s2
 >c1.s1 : number
 >c1 : typeof c1
 >s1 : number
@@ -545,9 +545,9 @@ class c1 {
 >c1 : typeof c1
 >b_s1 : number
 >c1.b_s2(value) : number
->c1.b_s2 : (b: number) => number
+>c1.b_s2 : typeof b_s2
 >c1 : typeof c1
->b_s2 : (b: number) => number
+>b_s2 : typeof b_s2
 >value : number
     }
 }
@@ -627,17 +627,17 @@ var i1_s_p = c1.s1;
 >s1 : number
 
 var i1_s_f = c1.s2;
->i1_s_f : (b: number) => number
->c1.s2 : (b: number) => number
+>i1_s_f : typeof s2
+>c1.s2 : typeof s2
 >c1 : typeof c1
->s2 : (b: number) => number
+>s2 : typeof s2
 
 var i1_s_r = c1.s2(20);
 >i1_s_r : number
 >c1.s2(20) : number
->c1.s2 : (b: number) => number
+>c1.s2 : typeof s2
 >c1 : typeof c1
->s2 : (b: number) => number
+>s2 : typeof s2
 
 var i1_s_prop = c1.s3;
 >i1_s_prop : number
@@ -659,17 +659,17 @@ var i1_s_nc_p = c1.nc_s1;
 >nc_s1 : number
 
 var i1_s_ncf = c1.nc_s2;
->i1_s_ncf : (b: number) => number
->c1.nc_s2 : (b: number) => number
+>i1_s_ncf : typeof nc_s2
+>c1.nc_s2 : typeof nc_s2
 >c1 : typeof c1
->nc_s2 : (b: number) => number
+>nc_s2 : typeof nc_s2
 
 var i1_s_ncr = c1.nc_s2(20);
 >i1_s_ncr : number
 >c1.nc_s2(20) : number
->c1.nc_s2 : (b: number) => number
+>c1.nc_s2 : typeof nc_s2
 >c1 : typeof c1
->nc_s2 : (b: number) => number
+>nc_s2 : typeof nc_s2
 
 var i1_s_ncprop = c1.nc_s3;
 >i1_s_ncprop : number
diff --git a/tests/baselines/reference/commentsCommentParsing.types b/tests/baselines/reference/commentsCommentParsing.types
index a9194f9a63a..d10a339868e 100644
--- a/tests/baselines/reference/commentsCommentParsing.types
+++ b/tests/baselines/reference/commentsCommentParsing.types
@@ -2,41 +2,41 @@
 
 /// This is simple /// comments
 function simple() {
->simple : () => void
+>simple : typeof simple
 }
 
 simple();
 >simple() : void
->simple : () => void
+>simple : typeof simple
 
 /// multiLine /// Comments
 /// This is example of multiline /// comments
 /// Another multiLine
 function multiLine() {
->multiLine : () => void
+>multiLine : typeof multiLine
 }
 multiLine();
 >multiLine() : void
->multiLine : () => void
+>multiLine : typeof multiLine
 
 /** this is eg of single line jsdoc style comment */
 function jsDocSingleLine() {
->jsDocSingleLine : () => void
+>jsDocSingleLine : typeof jsDocSingleLine
 }
 jsDocSingleLine();
 >jsDocSingleLine() : void
->jsDocSingleLine : () => void
+>jsDocSingleLine : typeof jsDocSingleLine
 
 
 /** this is multiple line jsdoc stule comment
 *New line1
 *New Line2*/
 function jsDocMultiLine() {
->jsDocMultiLine : () => void
+>jsDocMultiLine : typeof jsDocMultiLine
 }
 jsDocMultiLine();
 >jsDocMultiLine() : void
->jsDocMultiLine : () => void
+>jsDocMultiLine : typeof jsDocMultiLine
 
 /** this is multiple line jsdoc stule comment
 *New line1
@@ -44,60 +44,60 @@ jsDocMultiLine();
 /** Shoul mege this line as well
 * and this too*/ /** Another this one too*/
 function jsDocMultiLineMerge() {
->jsDocMultiLineMerge : () => void
+>jsDocMultiLineMerge : typeof jsDocMultiLineMerge
 }
 jsDocMultiLineMerge();
 >jsDocMultiLineMerge() : void
->jsDocMultiLineMerge : () => void
+>jsDocMultiLineMerge : typeof jsDocMultiLineMerge
 
 
 /// Triple slash comment
 /** jsdoc comment */
 function jsDocMixedComments1() {
->jsDocMixedComments1 : () => void
+>jsDocMixedComments1 : typeof jsDocMixedComments1
 }
 jsDocMixedComments1();
 >jsDocMixedComments1() : void
->jsDocMixedComments1 : () => void
+>jsDocMixedComments1 : typeof jsDocMixedComments1
 
 /// Triple slash comment
 /** jsdoc comment */ /*** another jsDocComment*/
 function jsDocMixedComments2() {
->jsDocMixedComments2 : () => void
+>jsDocMixedComments2 : typeof jsDocMixedComments2
 }
 jsDocMixedComments2();
 >jsDocMixedComments2() : void
->jsDocMixedComments2 : () => void
+>jsDocMixedComments2 : typeof jsDocMixedComments2
 
 /** jsdoc comment */ /*** another jsDocComment*/
 /// Triple slash comment
 function jsDocMixedComments3() {
->jsDocMixedComments3 : () => void
+>jsDocMixedComments3 : typeof jsDocMixedComments3
 }
 jsDocMixedComments3();
 >jsDocMixedComments3() : void
->jsDocMixedComments3 : () => void
+>jsDocMixedComments3 : typeof jsDocMixedComments3
 
 /** jsdoc comment */ /*** another jsDocComment*/
 /// Triple slash comment
 /// Triple slash comment 2
 function jsDocMixedComments4() {
->jsDocMixedComments4 : () => void
+>jsDocMixedComments4 : typeof jsDocMixedComments4
 }
 jsDocMixedComments4();
 >jsDocMixedComments4() : void
->jsDocMixedComments4 : () => void
+>jsDocMixedComments4 : typeof jsDocMixedComments4
 
 /// Triple slash comment 1
 /** jsdoc comment */ /*** another jsDocComment*/
 /// Triple slash comment
 /// Triple slash comment 2
 function jsDocMixedComments5() {
->jsDocMixedComments5 : () => void
+>jsDocMixedComments5 : typeof jsDocMixedComments5
 }
 jsDocMixedComments5();
 >jsDocMixedComments5() : void
->jsDocMixedComments5 : () => void
+>jsDocMixedComments5 : typeof jsDocMixedComments5
 
 /*** another jsDocComment*/
 /// Triple slash comment 1
@@ -105,41 +105,41 @@ jsDocMixedComments5();
 /// Triple slash comment 2
 /** jsdoc comment */
 function jsDocMixedComments6() {
->jsDocMixedComments6 : () => void
+>jsDocMixedComments6 : typeof jsDocMixedComments6
 }
 jsDocMixedComments6();
 >jsDocMixedComments6() : void
->jsDocMixedComments6 : () => void
+>jsDocMixedComments6 : typeof jsDocMixedComments6
 
 // This shoulnot be help comment
 function noHelpComment1() {
->noHelpComment1 : () => void
+>noHelpComment1 : typeof noHelpComment1
 }
 noHelpComment1();
 >noHelpComment1() : void
->noHelpComment1 : () => void
+>noHelpComment1 : typeof noHelpComment1
 
 /* This shoulnot be help comment */
 function noHelpComment2() {
->noHelpComment2 : () => void
+>noHelpComment2 : typeof noHelpComment2
 }
 noHelpComment2();
 >noHelpComment2() : void
->noHelpComment2 : () => void
+>noHelpComment2 : typeof noHelpComment2
 
 function noHelpComment3() {
->noHelpComment3 : () => void
+>noHelpComment3 : typeof noHelpComment3
 }
 noHelpComment3();
 >noHelpComment3() : void
->noHelpComment3 : () => void
+>noHelpComment3 : typeof noHelpComment3
 
 /** Adds two integers and returns the result
   * @param {number} a first number
   * @param b second number
   */
 function sum(a: number, b: number) {
->sum : (a: number, b: number) => number
+>sum : typeof sum
 >a : number
 >b : number
 
@@ -150,7 +150,7 @@ function sum(a: number, b: number) {
 }
 sum(10, 20);
 >sum(10, 20) : number
->sum : (a: number, b: number) => number
+>sum : typeof sum
 
 /** This is multiplication function*/
 /** @param */
@@ -160,7 +160,7 @@ sum(10, 20);
  @param d @anotherTag*/
 /** @param e LastParam @anotherTag*/
 function multiply(a: number, b: number, c?: number, d?, e?) {
->multiply : (a: number, b: number, c?: number, d?: any, e?: any) => void
+>multiply : typeof multiply
 >a : number
 >b : number
 >c : number
@@ -171,16 +171,16 @@ function multiply(a: number, b: number, c?: number, d?, e?) {
 * @param { string} b about b
 */
 function f1(a: number);
->f1 : { (a: number): any; (b: string): any; }
+>f1 : typeof f1
 >a : number
 
 function f1(b: string);
->f1 : { (a: number): any; (b: string): any; }
+>f1 : typeof f1
 >b : string
 
 /**@param opt optional parameter*/
 function f1(aOrb, opt?) {
->f1 : { (a: number): any; (b: string): any; }
+>f1 : typeof f1
 >aOrb : any
 >opt : any
 
@@ -196,7 +196,7 @@ function f1(aOrb, opt?) {
 @param { { { () => string; } } f this is optional param f
 */
 function subtract(a: number, b: number, c?: () => string, d?: () => string, e?: () => string, f?: () => string) {
->subtract : (a: number, b: number, c?: () => string, d?: () => string, e?: () => string, f?: () => string) => void
+>subtract : typeof subtract
 >a : number
 >b : number
 >c : () => string
@@ -210,7 +210,7 @@ function subtract(a: number, b: number, c?: () => string, d?: () => string, e?:
 @returnType { number } it is return type
 */
 function square(a: number) {
->square : (a: number) => number
+>square : typeof square
 >a : number
 
     return a * a;
@@ -224,7 +224,7 @@ function square(a: number) {
 @param { number} b this is b
 */
 function divide(a: number, b: number) {
->divide : (a: number, b: number) => void
+>divide : typeof divide
 >a : number
 >b : number
 }
@@ -233,7 +233,7 @@ function divide(a: number, b: number) {
 *@param c it is third parameter
 */
 function jsDocParamTest(/** this is inline comment for a */a: number, /** this is inline comment for b*/ b: number, c: number, d: number) {
->jsDocParamTest : (a: number, b: number, c: number, d: number) => number
+>jsDocParamTest : typeof jsDocParamTest
 >a : number
 >b : number
 >c : number
diff --git a/tests/baselines/reference/commentsDottedModuleName.types b/tests/baselines/reference/commentsDottedModuleName.types
deleted file mode 100644
index 53195bfccfa..00000000000
--- a/tests/baselines/reference/commentsDottedModuleName.types
+++ /dev/null
@@ -1,12 +0,0 @@
-=== tests/cases/compiler/commentsDottedModuleName.ts ===
-
-/** this is multi declare module*/
-export module outerModule.InnerModule {
->outerModule : typeof outerModule
->InnerModule : typeof InnerModule
-
-    /// class b comment
-    export class b {
->b : b
-    }
-}
diff --git a/tests/baselines/reference/commentsExternalModules.types b/tests/baselines/reference/commentsExternalModules.types
index cff7702fcfa..dd6569e6e53 100644
--- a/tests/baselines/reference/commentsExternalModules.types
+++ b/tests/baselines/reference/commentsExternalModules.types
@@ -5,11 +5,11 @@ import extMod = require("commentsExternalModules_0"); // trailing comment1
 
 extMod.m1.fooExport();
 >extMod.m1.fooExport() : number
->extMod.m1.fooExport : () => number
+>extMod.m1.fooExport : typeof fooExport
 >extMod.m1 : typeof m1
 >extMod : typeof "tests/cases/compiler/commentsExternalModules_0"
 >m1 : typeof m1
->fooExport : () => number
+>fooExport : typeof fooExport
 
 var newVar = new extMod.m1.m2.c();
 >newVar : c
@@ -24,11 +24,11 @@ var newVar = new extMod.m1.m2.c();
 
 extMod.m4.fooExport();
 >extMod.m4.fooExport() : number
->extMod.m4.fooExport : () => number
+>extMod.m4.fooExport : typeof fooExport
 >extMod.m4 : typeof m4
 >extMod : typeof "tests/cases/compiler/commentsExternalModules_0"
 >m4 : typeof m4
->fooExport : () => number
+>fooExport : typeof fooExport
 
 var newVar2 = new extMod.m4.m2.c();
 >newVar2 : c
@@ -53,7 +53,7 @@ export module m1 {
 
     /** foo's comment*/
     function foo() {
->foo : () => number
+>foo : typeof foo
 
         return b;
 >b : number
@@ -75,18 +75,18 @@ export module m1 {
     }
     /** exported function*/
     export function fooExport() {
->fooExport : () => number
+>fooExport : typeof fooExport
 
         return foo();
 >foo() : number
->foo : () => number
+>foo : typeof foo
     }
 }
 m1.fooExport();
 >m1.fooExport() : number
->m1.fooExport : () => number
+>m1.fooExport : typeof fooExport
 >m1 : typeof m1
->fooExport : () => number
+>fooExport : typeof fooExport
 
 var myvar = new m1.m2.c();
 >myvar : c
@@ -108,7 +108,7 @@ export module m4 {
     /** foo's comment
     */
     function foo() {
->foo : () => number
+>foo : typeof foo
 
         return b;
 >b : number
@@ -131,18 +131,18 @@ export module m4 {
     }
     /** exported function */
     export function fooExport() {
->fooExport : () => number
+>fooExport : typeof fooExport
 
         return foo();
 >foo() : number
->foo : () => number
+>foo : typeof foo
     }
 }
 m4.fooExport();
 >m4.fooExport() : number
->m4.fooExport : () => number
+>m4.fooExport : typeof fooExport
 >m4 : typeof m4
->fooExport : () => number
+>fooExport : typeof fooExport
 
 var myvar2 = new m4.m2.c();
 >myvar2 : c
diff --git a/tests/baselines/reference/commentsExternalModules2.types b/tests/baselines/reference/commentsExternalModules2.types
index d7f72277b2e..fb624d9c5a6 100644
--- a/tests/baselines/reference/commentsExternalModules2.types
+++ b/tests/baselines/reference/commentsExternalModules2.types
@@ -5,11 +5,11 @@ import extMod = require("commentsExternalModules2_0"); // trailing comment 1
 
 extMod.m1.fooExport();
 >extMod.m1.fooExport() : number
->extMod.m1.fooExport : () => number
+>extMod.m1.fooExport : typeof fooExport
 >extMod.m1 : typeof m1
 >extMod : typeof "tests/cases/compiler/commentsExternalModules2_0"
 >m1 : typeof m1
->fooExport : () => number
+>fooExport : typeof fooExport
 
 export var newVar = new extMod.m1.m2.c();
 >newVar : c
@@ -24,11 +24,11 @@ export var newVar = new extMod.m1.m2.c();
 
 extMod.m4.fooExport();
 >extMod.m4.fooExport() : number
->extMod.m4.fooExport : () => number
+>extMod.m4.fooExport : typeof fooExport
 >extMod.m4 : typeof m4
 >extMod : typeof "tests/cases/compiler/commentsExternalModules2_0"
 >m4 : typeof m4
->fooExport : () => number
+>fooExport : typeof fooExport
 
 export var newVar2 = new extMod.m4.m2.c();
 >newVar2 : c
@@ -53,7 +53,7 @@ export module m1 {
 
     /** foo's comment*/
     function foo() {
->foo : () => number
+>foo : typeof foo
 
         return b;
 >b : number
@@ -75,18 +75,18 @@ export module m1 {
     }
     /** exported function*/
     export function fooExport() {
->fooExport : () => number
+>fooExport : typeof fooExport
 
         return foo();
 >foo() : number
->foo : () => number
+>foo : typeof foo
     }
 }
 m1.fooExport();
 >m1.fooExport() : number
->m1.fooExport : () => number
+>m1.fooExport : typeof fooExport
 >m1 : typeof m1
->fooExport : () => number
+>fooExport : typeof fooExport
 
 var myvar = new m1.m2.c();
 >myvar : c
@@ -108,7 +108,7 @@ export module m4 {
     /** foo's comment
     */
     function foo() {
->foo : () => number
+>foo : typeof foo
 
         return b;
 >b : number
@@ -131,18 +131,18 @@ export module m4 {
     }
     /** exported function */
     export function fooExport() {
->fooExport : () => number
+>fooExport : typeof fooExport
 
         return foo();
 >foo() : number
->foo : () => number
+>foo : typeof foo
     }
 }
 m4.fooExport();
 >m4.fooExport() : number
->m4.fooExport : () => number
+>m4.fooExport : typeof fooExport
 >m4 : typeof m4
->fooExport : () => number
+>fooExport : typeof fooExport
 
 var myvar2 = new m4.m2.c();
 >myvar2 : c
diff --git a/tests/baselines/reference/commentsExternalModules3.types b/tests/baselines/reference/commentsExternalModules3.types
index d7f72277b2e..fb624d9c5a6 100644
--- a/tests/baselines/reference/commentsExternalModules3.types
+++ b/tests/baselines/reference/commentsExternalModules3.types
@@ -5,11 +5,11 @@ import extMod = require("commentsExternalModules2_0"); // trailing comment 1
 
 extMod.m1.fooExport();
 >extMod.m1.fooExport() : number
->extMod.m1.fooExport : () => number
+>extMod.m1.fooExport : typeof fooExport
 >extMod.m1 : typeof m1
 >extMod : typeof "tests/cases/compiler/commentsExternalModules2_0"
 >m1 : typeof m1
->fooExport : () => number
+>fooExport : typeof fooExport
 
 export var newVar = new extMod.m1.m2.c();
 >newVar : c
@@ -24,11 +24,11 @@ export var newVar = new extMod.m1.m2.c();
 
 extMod.m4.fooExport();
 >extMod.m4.fooExport() : number
->extMod.m4.fooExport : () => number
+>extMod.m4.fooExport : typeof fooExport
 >extMod.m4 : typeof m4
 >extMod : typeof "tests/cases/compiler/commentsExternalModules2_0"
 >m4 : typeof m4
->fooExport : () => number
+>fooExport : typeof fooExport
 
 export var newVar2 = new extMod.m4.m2.c();
 >newVar2 : c
@@ -53,7 +53,7 @@ export module m1 {
 
     /** foo's comment*/
     function foo() {
->foo : () => number
+>foo : typeof foo
 
         return b;
 >b : number
@@ -75,18 +75,18 @@ export module m1 {
     }
     /** exported function*/
     export function fooExport() {
->fooExport : () => number
+>fooExport : typeof fooExport
 
         return foo();
 >foo() : number
->foo : () => number
+>foo : typeof foo
     }
 }
 m1.fooExport();
 >m1.fooExport() : number
->m1.fooExport : () => number
+>m1.fooExport : typeof fooExport
 >m1 : typeof m1
->fooExport : () => number
+>fooExport : typeof fooExport
 
 var myvar = new m1.m2.c();
 >myvar : c
@@ -108,7 +108,7 @@ export module m4 {
     /** foo's comment
     */
     function foo() {
->foo : () => number
+>foo : typeof foo
 
         return b;
 >b : number
@@ -131,18 +131,18 @@ export module m4 {
     }
     /** exported function */
     export function fooExport() {
->fooExport : () => number
+>fooExport : typeof fooExport
 
         return foo();
 >foo() : number
->foo : () => number
+>foo : typeof foo
     }
 }
 m4.fooExport();
 >m4.fooExport() : number
->m4.fooExport : () => number
+>m4.fooExport : typeof fooExport
 >m4 : typeof m4
->fooExport : () => number
+>fooExport : typeof fooExport
 
 var myvar2 = new m4.m2.c();
 >myvar2 : c
diff --git a/tests/baselines/reference/commentsFunction.types b/tests/baselines/reference/commentsFunction.types
index 642a1c42665..6b8dd2dec26 100644
--- a/tests/baselines/reference/commentsFunction.types
+++ b/tests/baselines/reference/commentsFunction.types
@@ -2,16 +2,16 @@
 
 /** This comment should appear for foo*/
 function foo() {
->foo : () => void
+>foo : typeof foo
 
 } /* trailing comment of function */
 foo();
 >foo() : void
->foo : () => void
+>foo : typeof foo
 
 /** This is comment for function signature*/
 function fooWithParameters(/** this is comment about a*/a: string,
->fooWithParameters : (a: string, b: number) => void
+>fooWithParameters : typeof fooWithParameters
 >a : string
 
     /** this is comment for b*/
@@ -25,16 +25,14 @@ function fooWithParameters(/** this is comment about a*/a: string,
 } // trailing comment of function
 fooWithParameters("a", 10);
 >fooWithParameters("a", 10) : void
->fooWithParameters : (a: string, b: number) => void
+>fooWithParameters : typeof fooWithParameters
 
 /** fooFunc
  * comment
  */
 var fooFunc = function FooFunctionValue(/** fooFunctionValue param */ b: string) {
 >fooFunc : (b: string) => string
->function FooFunctionValue(/** fooFunctionValue param */ b: string) {
-    return b;
-} : (b: string) => string
+>function FooFunctionValue(/** fooFunctionValue param */ b: string) {    return b;} : (b: string) => string
 >FooFunctionValue : (b: string) => string
 >b : string
 
@@ -70,19 +68,19 @@ lambddaNoVarComment(10, 20);
 >lambddaNoVarComment : (a: number, b: number) => number
 
 function blah(a: string /* multiline trailing comment 
->blah : (a: string) => void
+>blah : typeof blah
 >a : string
 
 multiline */) {
 }
 
 function blah2(a: string /* single line multiple trailing comments */ /* second */) {
->blah2 : (a: string) => void
+>blah2 : typeof blah2
 >a : string
 }
 
 function blah3(a: string // trailing commen single line
->blah3 : (a: string) => void
+>blah3 : typeof blah3
 >a : string
 
     ) {
@@ -106,19 +104,19 @@ lambdaFoo = (a, b) => a * b; // This is trailing comment
 >() => 0 : () => number
 
 function blah4(/*1*/a: string/*2*/,/*3*/b: string/*4*/) {
->blah4 : (a: string, b: string) => void
+>blah4 : typeof blah4
 >a : string
 >b : string
 }
 
 function foo1() {
->foo1 : () => void
+>foo1 : typeof foo1
 
     // should emit this
 }
 
 function foo2() {
->foo2 : () => void
+>foo2 : typeof foo2
 
     /// This is some detached comment
 
diff --git a/tests/baselines/reference/commentsInterface.types b/tests/baselines/reference/commentsInterface.types
index 74ae683cff2..68d552882e2 100644
--- a/tests/baselines/reference/commentsInterface.types
+++ b/tests/baselines/reference/commentsInterface.types
@@ -186,25 +186,9 @@ var 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; }
+>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; }
 >i3_i : i3
->{
-    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; }
+>{    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; }
 
     f: /**own f*/ (/**i3_i a*/a: number) => "Hello" + a,
 >f : (a: number) => string
diff --git a/tests/baselines/reference/commentsModules.types b/tests/baselines/reference/commentsModules.types
index 253ec964c1d..8302ef5b517 100644
--- a/tests/baselines/reference/commentsModules.types
+++ b/tests/baselines/reference/commentsModules.types
@@ -9,7 +9,7 @@ module m1 {
 
     /** foo's comment*/
     function foo() {
->foo : () => number
+>foo : typeof foo
 
         return b;
 >b : number
@@ -31,16 +31,16 @@ module m1 {
     }
     /** exported function*/
     export function fooExport() {
->fooExport : () => number
+>fooExport : typeof fooExport
 
         return foo();
 >foo() : number
->foo : () => number
+>foo : typeof foo
     }
 
     // shouldn't appear
     export function foo2Export(/**hm*/ a: string) {
->foo2Export : (a: string) => void
+>foo2Export : typeof foo2Export
 >a : string
     }
 
@@ -48,21 +48,21 @@ module m1 {
      * comment
      */
     export function foo3Export() {
->foo3Export : () => void
+>foo3Export : typeof foo3Export
     }
 
     /** foo4Export
      * comment
      */
     function foo4Export() {
->foo4Export : () => void
+>foo4Export : typeof foo4Export
     }
 } // trailing comment module
 m1.fooExport();
 >m1.fooExport() : number
->m1.fooExport : () => number
+>m1.fooExport : typeof fooExport
 >m1 : typeof m1
->fooExport : () => number
+>fooExport : typeof fooExport
 
 var myvar = new m1.m2.c();
 >myvar : c
diff --git a/tests/baselines/reference/commentsMultiModuleMultiFile.errors.txt b/tests/baselines/reference/commentsMultiModuleMultiFile.errors.txt
new file mode 100644
index 00000000000..4f6d83c47ce
--- /dev/null
+++ b/tests/baselines/reference/commentsMultiModuleMultiFile.errors.txt
@@ -0,0 +1,41 @@
+==== tests/cases/compiler/commentsMultiModuleMultiFile_1.ts (0 errors) ====
+    import m = require('commentsMultiModuleMultiFile_0');
+    /** this is multi module 3 comment*/
+    module multiM {
+        /** class d comment*/
+        export class d {
+        }
+    
+        /// class f comment
+        export class f {
+        }
+    }
+    new multiM.d();
+==== tests/cases/compiler/commentsMultiModuleMultiFile_0.ts (3 errors) ====
+    
+    /** this is multi declare module*/
+    export module multiM {
+                  ~~~~~~
+!!! Individual declarations in merged declaration multiM must be all exported or all local.
+        /// class b comment
+        export class b {
+        }
+    }
+    /** thi is multi module 2*/
+    module multiM {
+           ~~~~~~
+!!! Individual declarations in merged declaration multiM must be all exported or all local.
+        /** class c comment*/
+        export class c {
+        }
+    
+        // class e comment
+        export class e {
+        }
+    }
+    
+    new multiM.b();
+    new multiM.c();
+               ~
+!!! Property 'c' does not exist on type 'typeof multiM'.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/commentsMultiModuleMultiFile.js b/tests/baselines/reference/commentsMultiModuleMultiFile.js
index 2c0cf2b837e..80a971a8e27 100644
--- a/tests/baselines/reference/commentsMultiModuleMultiFile.js
+++ b/tests/baselines/reference/commentsMultiModuleMultiFile.js
@@ -9,7 +9,7 @@ export module multiM {
     }
 }
 /** thi is multi module 2*/
-export module multiM {
+module multiM {
     /** class c comment*/
     export class c {
     }
@@ -25,7 +25,7 @@ new multiM.c();
 //// [commentsMultiModuleMultiFile_1.ts]
 import m = require('commentsMultiModuleMultiFile_0');
 /** this is multi module 3 comment*/
-export module multiM {
+module multiM {
     /** class d comment*/
     export class d {
     }
@@ -50,6 +50,7 @@ define(["require", "exports"], function (require, exports) {
     })(exports.multiM || (exports.multiM = {}));
     var multiM = exports.multiM;
     /** thi is multi module 2*/
+    var multiM;
     (function (multiM) {
         /** class c comment*/
         var c = (function () {
@@ -65,14 +66,14 @@ define(["require", "exports"], function (require, exports) {
             return e;
         })();
         multiM.e = e;
-    })(exports.multiM || (exports.multiM = {}));
-    var multiM = exports.multiM;
+    })(multiM || (multiM = {}));
     new multiM.b();
     new multiM.c();
 });
 //// [commentsMultiModuleMultiFile_1.js]
 define(["require", "exports"], function (require, exports) {
     /** this is multi module 3 comment*/
+    var multiM;
     (function (multiM) {
         /** class d comment*/
         var d = (function () {
@@ -88,8 +89,7 @@ define(["require", "exports"], function (require, exports) {
             return f;
         })();
         multiM.f = f;
-    })(exports.multiM || (exports.multiM = {}));
-    var multiM = exports.multiM;
+    })(multiM || (multiM = {}));
     new multiM.d();
 });
 
diff --git a/tests/baselines/reference/commentsMultiModuleMultiFile.types b/tests/baselines/reference/commentsMultiModuleMultiFile.types
deleted file mode 100644
index cb3db3961f0..00000000000
--- a/tests/baselines/reference/commentsMultiModuleMultiFile.types
+++ /dev/null
@@ -1,62 +0,0 @@
-=== tests/cases/compiler/commentsMultiModuleMultiFile_1.ts ===
-import m = require('commentsMultiModuleMultiFile_0');
->m : typeof "tests/cases/compiler/commentsMultiModuleMultiFile_0"
-
-/** this is multi module 3 comment*/
-export module multiM {
->multiM : typeof multiM
-
-    /** class d comment*/
-    export class d {
->d : d
-    }
-
-    /// class f comment
-    export class f {
->f : f
-    }
-}
-new multiM.d();
->new multiM.d() : d
->multiM.d : typeof d
->multiM : typeof multiM
->d : typeof d
-
-=== tests/cases/compiler/commentsMultiModuleMultiFile_0.ts ===
-
-/** this is multi declare module*/
-export module multiM {
->multiM : typeof multiM
-
-    /// class b comment
-    export class b {
->b : b
-    }
-}
-/** thi is multi module 2*/
-export module multiM {
->multiM : typeof multiM
-
-    /** class c comment*/
-    export class c {
->c : c
-    }
-
-    // class e comment
-    export class e {
->e : e
-    }
-}
-
-new multiM.b();
->new multiM.b() : b
->multiM.b : typeof b
->multiM : typeof multiM
->b : typeof b
-
-new multiM.c();
->new multiM.c() : c
->multiM.c : typeof c
->multiM : typeof multiM
->c : typeof c
-
diff --git a/tests/baselines/reference/commentsOnObjectLiteral3.types b/tests/baselines/reference/commentsOnObjectLiteral3.types
index b9bdc09506f..e7770c7e273 100644
--- a/tests/baselines/reference/commentsOnObjectLiteral3.types
+++ b/tests/baselines/reference/commentsOnObjectLiteral3.types
@@ -2,23 +2,7 @@
 
 var v = {
 >v : { prop: number; func: () => void; func1: () => void; a: any; }
->{
- //property
- prop: 1 /* multiple trailing comments */ /*trailing comments*/,
- //property
- func: function () {
- },
- //PropertyName + CallSignature
- func1() { },
- //getter
- get a() {
-  return this.prop;
- } /*trailing 1*/,
- //setter
- set a(value) {
-  this.prop = value;
- } // trailing 2
-} : { prop: number; func: () => void; func1: () => void; a: any; }
+>{ //property prop: 1 /* multiple trailing comments */ /*trailing comments*/, //property func: function () { }, //PropertyName + CallSignature func1() { }, //getter get a() {  return this.prop; } /*trailing 1*/, //setter set a(value) {  this.prop = value; } // trailing 2} : { prop: number; func: () => void; func1: () => void; a: any; }
 
  //property
  prop: 1 /* multiple trailing comments */ /*trailing comments*/,
@@ -27,8 +11,7 @@ var v = {
  //property
  func: function () {
 >func : () => void
->function () {
- } : () => void
+>function () { } : () => void
 
  },
  //PropertyName + CallSignature
diff --git a/tests/baselines/reference/commentsOnObjectLiteral4.types b/tests/baselines/reference/commentsOnObjectLiteral4.types
index 6f89ba78ea4..364df6e5ea1 100644
--- a/tests/baselines/reference/commentsOnObjectLiteral4.types
+++ b/tests/baselines/reference/commentsOnObjectLiteral4.types
@@ -2,14 +2,7 @@
 
 var v = {
 >v : { bar: number; }
->{
- /**
-  * @type {number}
-  */
- get bar(): number {
-  return this._bar;
- }
-} : { bar: number; }
+>{ /**  * @type {number}  */ get bar(): number {  return this._bar; }} : { bar: number; }
 
  /**
   * @type {number}
diff --git a/tests/baselines/reference/commentsOnReturnStatement1.types b/tests/baselines/reference/commentsOnReturnStatement1.types
index 0d447b6536f..c9604beaba9 100644
--- a/tests/baselines/reference/commentsOnReturnStatement1.types
+++ b/tests/baselines/reference/commentsOnReturnStatement1.types
@@ -3,7 +3,7 @@ class DebugClass {
 >DebugClass : DebugClass
 
     public static debugFunc() {
->debugFunc : () => boolean
+>debugFunc : typeof debugFunc
 
         // Start Debugger Test Code
         var i = 0;
diff --git a/tests/baselines/reference/commentsOverloads.types b/tests/baselines/reference/commentsOverloads.types
index 9984c1b5b26..c9fc0517fd4 100644
--- a/tests/baselines/reference/commentsOverloads.types
+++ b/tests/baselines/reference/commentsOverloads.types
@@ -1,96 +1,96 @@
 === tests/cases/compiler/commentsOverloads.ts ===
 /** this is signature 1*/
 function f1(/**param a*/a: number): number;
->f1 : { (a: number): number; (b: string): number; }
+>f1 : typeof f1
 >a : number
 
 function f1(b: string): number;
->f1 : { (a: number): number; (b: string): number; }
+>f1 : typeof f1
 >b : string
 
 function f1(aOrb: any) {
->f1 : { (a: number): number; (b: string): number; }
+>f1 : typeof f1
 >aOrb : any
 
     return 10;
 }
 f1("hello");
 >f1("hello") : number
->f1 : { (a: number): number; (b: string): number; }
+>f1 : typeof f1
 
 f1(10);
 >f1(10) : number
->f1 : { (a: number): number; (b: string): number; }
+>f1 : typeof f1
 
 function f2(a: number): number;
->f2 : { (a: number): number; (b: string): number; }
+>f2 : typeof f2
 >a : number
 
 /** this is signature 2*/
 function f2(b: string): number;
->f2 : { (a: number): number; (b: string): number; }
+>f2 : typeof f2
 >b : string
 
 /** this is f2 var comment*/
 function f2(aOrb: any) {
->f2 : { (a: number): number; (b: string): number; }
+>f2 : typeof f2
 >aOrb : any
 
     return 10;
 }
 f2("hello");
 >f2("hello") : number
->f2 : { (a: number): number; (b: string): number; }
+>f2 : typeof f2
 
 f2(10);
 >f2(10) : number
->f2 : { (a: number): number; (b: string): number; }
+>f2 : typeof f2
 
 function f3(a: number): number;
->f3 : { (a: number): number; (b: string): number; }
+>f3 : typeof f3
 >a : number
 
 function f3(b: string): number;
->f3 : { (a: number): number; (b: string): number; }
+>f3 : typeof f3
 >b : string
 
 function f3(aOrb: any) {
->f3 : { (a: number): number; (b: string): number; }
+>f3 : typeof f3
 >aOrb : any
 
     return 10;
 }
 f3("hello");
 >f3("hello") : number
->f3 : { (a: number): number; (b: string): number; }
+>f3 : typeof f3
 
 f3(10);
 >f3(10) : number
->f3 : { (a: number): number; (b: string): number; }
+>f3 : typeof f3
 
 /** this is signature 4 - with number parameter*/
 function f4(/**param a*/a: number): number;
->f4 : { (a: number): number; (b: string): number; }
+>f4 : typeof f4
 >a : number
 
 /** this is signature 4 - with string parameter*/
 function f4(b: string): number;
->f4 : { (a: number): number; (b: string): number; }
+>f4 : typeof f4
 >b : string
 
 function f4(aOrb: any) {
->f4 : { (a: number): number; (b: string): number; }
+>f4 : typeof f4
 >aOrb : any
 
     return 10;
 }
 f4("hello");
 >f4("hello") : number
->f4 : { (a: number): number; (b: string): number; }
+>f4 : typeof f4
 
 f4(10);
 >f4(10) : number
->f4 : { (a: number): number; (b: string): number; }
+>f4 : typeof f4
 
 interface i1 {
 >i1 : i1
diff --git a/tests/baselines/reference/commentsPropertySignature1.types b/tests/baselines/reference/commentsPropertySignature1.types
index c2fe276a410..857b0c98ee5 100644
--- a/tests/baselines/reference/commentsPropertySignature1.types
+++ b/tests/baselines/reference/commentsPropertySignature1.types
@@ -1,10 +1,7 @@
 === tests/cases/compiler/commentsPropertySignature1.ts ===
 var a = {
 >a : { x: number; }
->{
-    /** own x*/
-    x: 0
-} : { x: number; }
+>{    /** own x*/    x: 0} : { x: number; }
 
     /** own x*/
     x: 0
diff --git a/tests/baselines/reference/commentsTypeParameters.types b/tests/baselines/reference/commentsTypeParameters.types
index 573dabed7da..056a65f8073 100644
--- a/tests/baselines/reference/commentsTypeParameters.types
+++ b/tests/baselines/reference/commentsTypeParameters.types
@@ -11,7 +11,7 @@ class C</**docComment for type parameter*/ T> {
 >U : U
     }
     static staticmethod</**docComment of method type parameter */ U>(a: U) {
->staticmethod : <U>(a: U) => void
+>staticmethod : typeof staticmethod
 >U : U
 >a : U
 >U : U
@@ -25,7 +25,7 @@ class C</**docComment for type parameter*/ T> {
 >U : U
     }
     private static privatestaticmethod</**docComment of method type parameter */ U>(a: U) {
->privatestaticmethod : <U>(a: U) => void
+>privatestaticmethod : typeof privatestaticmethod
 >U : U
 >a : U
 >U : U
@@ -33,7 +33,7 @@ class C</**docComment for type parameter*/ T> {
 }
 
 function compare</**type*/T>(a: T, b: T) {
->compare : <T>(a: T, b: T) => boolean
+>compare : typeof compare
 >T : T
 >a : T
 >T : T
diff --git a/tests/baselines/reference/commentsdoNotEmitComments.types b/tests/baselines/reference/commentsdoNotEmitComments.types
index 8cc0b26028d..b625fc41b87 100644
--- a/tests/baselines/reference/commentsdoNotEmitComments.types
+++ b/tests/baselines/reference/commentsdoNotEmitComments.types
@@ -6,7 +6,7 @@ var myVariable = 10;
 
 /** function comments*/
 function foo(/** parameter comment*/p: number) {
->foo : (p: number) => void
+>foo : typeof foo
 >p : number
 }
 
@@ -16,7 +16,7 @@ var fooVar: () => void;
 
 foo(50);
 >foo(50) : void
->foo : (p: number) => void
+>foo : typeof foo
 
 fooVar();
 >fooVar() : void
diff --git a/tests/baselines/reference/commentsemitComments.types b/tests/baselines/reference/commentsemitComments.types
index 0defb522428..e9da4d5f46d 100644
--- a/tests/baselines/reference/commentsemitComments.types
+++ b/tests/baselines/reference/commentsemitComments.types
@@ -6,7 +6,7 @@ var myVariable = 10;
 
 /** function comments*/
 function foo(/** parameter comment*/p: number) {
->foo : (p: number) => void
+>foo : typeof foo
 >p : number
 }
 
@@ -16,7 +16,7 @@ var fooVar: () => void;
 
 foo(50);
 >foo(50) : void
->foo : (p: number) => void
+>foo : typeof foo
 
 fooVar();
 >fooVar() : void
diff --git a/tests/baselines/reference/comparisonOperatorWithIdenticalTypeParameter.types b/tests/baselines/reference/comparisonOperatorWithIdenticalTypeParameter.types
index b545fdc9f1a..32a6a69f671 100644
--- a/tests/baselines/reference/comparisonOperatorWithIdenticalTypeParameter.types
+++ b/tests/baselines/reference/comparisonOperatorWithIdenticalTypeParameter.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithIdenticalTypeParameter.ts ===
 function foo<T>(t: T) {
->foo : <T>(t: T) => void
+>foo : typeof foo
 >T : T
 >t : T
 >T : T
diff --git a/tests/baselines/reference/comparisonOperatorWithOneOperandIsAny.types b/tests/baselines/reference/comparisonOperatorWithOneOperandIsAny.types
index e132f03cfa3..a4be3dfa27d 100644
--- a/tests/baselines/reference/comparisonOperatorWithOneOperandIsAny.types
+++ b/tests/baselines/reference/comparisonOperatorWithOneOperandIsAny.types
@@ -9,7 +9,7 @@ enum E { a, b, c }
 >c : E
 
 function foo<T>(t: T) {
->foo : <T>(t: T) => void
+>foo : typeof foo
 >T : T
 >t : T
 >T : T
diff --git a/tests/baselines/reference/comparisonOperatorWithOneOperandIsNull.types b/tests/baselines/reference/comparisonOperatorWithOneOperandIsNull.types
index d1b30eb7f6a..a1ed285e96c 100644
--- a/tests/baselines/reference/comparisonOperatorWithOneOperandIsNull.types
+++ b/tests/baselines/reference/comparisonOperatorWithOneOperandIsNull.types
@@ -6,7 +6,7 @@ enum E { a, b, c }
 >c : E
 
 function foo<T>(t: T) {
->foo : <T>(t: T) => void
+>foo : typeof foo
 >T : T
 >t : T
 >T : T
diff --git a/tests/baselines/reference/comparisonOperatorWithOneOperandIsUndefined.types b/tests/baselines/reference/comparisonOperatorWithOneOperandIsUndefined.types
index b4a70c3e3d6..a7b92a27c40 100644
--- a/tests/baselines/reference/comparisonOperatorWithOneOperandIsUndefined.types
+++ b/tests/baselines/reference/comparisonOperatorWithOneOperandIsUndefined.types
@@ -10,7 +10,7 @@ enum E { a, b, c }
 >c : E
 
 function foo<T>(t: T) {
->foo : <T>(t: T) => void
+>foo : typeof foo
 >T : T
 >t : T
 >T : T
diff --git a/tests/baselines/reference/complexClassRelationships.types b/tests/baselines/reference/complexClassRelationships.types
index 69bee9caade..3b34e1295b1 100644
--- a/tests/baselines/reference/complexClassRelationships.types
+++ b/tests/baselines/reference/complexClassRelationships.types
@@ -5,7 +5,7 @@ class Derived extends Base {
 >Base : Base
 
     public static createEmpty(): Derived {
->createEmpty : () => Derived
+>createEmpty : typeof createEmpty
 >Derived : Derived
 
         var item = new Derived();
@@ -58,7 +58,7 @@ class ComponentCollection<T> {
 >T : T
 
     private static sortComponents(p: Foo) {
->sortComponents : (p: Foo) => GenericType<string>
+>sortComponents : typeof sortComponents
 >p : Foo
 >Foo : Foo
 
@@ -97,9 +97,9 @@ class Foo {
 >new BaseCollection<Derived>(Derived.createEmpty) : BaseCollection<Derived>
 >BaseCollection : typeof BaseCollection
 >Derived : Derived
->Derived.createEmpty : () => Derived
+>Derived.createEmpty : typeof createEmpty
 >Derived : typeof Derived
->createEmpty : () => Derived
+>createEmpty : typeof createEmpty
     }
 }
 
diff --git a/tests/baselines/reference/complicatedPrivacy.errors.txt b/tests/baselines/reference/complicatedPrivacy.errors.txt
index 443fefd9487..b28321e6caf 100644
--- a/tests/baselines/reference/complicatedPrivacy.errors.txt
+++ b/tests/baselines/reference/complicatedPrivacy.errors.txt
@@ -1,4 +1,4 @@
-==== tests/cases/compiler/complicatedPrivacy.ts (4 errors) ====
+==== tests/cases/compiler/complicatedPrivacy.ts (5 errors) ====
     module m1 {
         export module m2 {
     
@@ -11,11 +11,13 @@
             export class C2 implements m3.i3 {
                 public get p1(arg) {
                            ~~
-!!! A 'get' accessor cannot have parameters.
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
                     return new C1();
                 }
     
                 public set p1(arg1: C1) {
+                           ~~
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
                 }
     
                 public f55() {
diff --git a/tests/baselines/reference/compositeGenericFunction.types b/tests/baselines/reference/compositeGenericFunction.types
index 421b7bbe514..2711c0fabc0 100644
--- a/tests/baselines/reference/compositeGenericFunction.types
+++ b/tests/baselines/reference/compositeGenericFunction.types
@@ -1,13 +1,13 @@
 === tests/cases/compiler/compositeGenericFunction.ts ===
 function f<T>(value: T) { return value; };
->f : <T>(value: T) => T
+>f : typeof f
 >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
+>h : typeof h
 >R : R
 >func : (x: number) => R
 >x : number
@@ -17,12 +17,12 @@ function h<R>(func: (x: number) => R): R { return null; }
 var z: number = h<number>(f);
 >z : number
 >h<number>(f) : number
->h : <R>(func: (x: number) => R) => R
->f : <T>(value: T) => T
+>h : typeof h
+>f : typeof f
 
 var z: number = h(f);
 >z : number
 >h(f) : number
->h : <R>(func: (x: number) => R) => R
->f : <T>(value: T) => T
+>h : typeof h
+>f : typeof f
 
diff --git a/tests/baselines/reference/compoundAssignmentLHSIsReference.types b/tests/baselines/reference/compoundAssignmentLHSIsReference.types
index e30cf19f3e3..1234d6fb876 100644
--- a/tests/baselines/reference/compoundAssignmentLHSIsReference.types
+++ b/tests/baselines/reference/compoundAssignmentLHSIsReference.types
@@ -17,7 +17,7 @@ x1 += value;
 >value : any
 
 function fn1(x2: number) {
->fn1 : (x2: number) => void
+>fn1 : typeof fn1
 >x2 : number
 
     x2 *= value;
@@ -76,7 +76,7 @@ x3['a'] += value;
 >value : any
 
 function fn2(x4: number) {
->fn2 : (x4: number) => void
+>fn2 : typeof fn2
 >x4 : number
 
     (x4) *= value;
diff --git a/tests/baselines/reference/conditionalExpressions2.types b/tests/baselines/reference/conditionalExpressions2.types
index 7fa483ad348..a85b4889444 100644
--- a/tests/baselines/reference/conditionalExpressions2.types
+++ b/tests/baselines/reference/conditionalExpressions2.types
@@ -38,7 +38,7 @@ var h = [{h:5}, null];
 >h : number
 
 function i() { if (true) { return { x: 5 }; } else { return null; } }
->i : () => { x: number; }
+>i : typeof i
 >{ x: 5 } : { x: number; }
 >x : number
 
diff --git a/tests/baselines/reference/conditionalOperatorConditionIsNumberType.types b/tests/baselines/reference/conditionalOperatorConditionIsNumberType.types
index 3396885509a..2182a6864c2 100644
--- a/tests/baselines/reference/conditionalOperatorConditionIsNumberType.types
+++ b/tests/baselines/reference/conditionalOperatorConditionIsNumberType.types
@@ -95,7 +95,7 @@ condNumber ? exprIsObject1 : exprIsObject2;
 
 //Cond is a number type expression
 function foo() { return 1 };
->foo : () => number
+>foo : typeof foo
 
 var array = [1, 2, 3];
 >array : number[]
@@ -123,7 +123,7 @@ var array = [1, 2, 3];
 foo() ? exprString1 : exprString2;
 >foo() ? exprString1 : exprString2 : string
 >foo() : number
->foo : () => number
+>foo : typeof foo
 >exprString1 : string
 >exprString2 : string
 
@@ -131,7 +131,7 @@ foo() / array[1] ? exprIsObject1 : exprIsObject2;
 >foo() / array[1] ? exprIsObject1 : exprIsObject2 : Object
 >foo() / array[1] : number
 >foo() : number
->foo : () => number
+>foo : typeof foo
 >array[1] : number
 >array : number[]
 >exprIsObject1 : Object
@@ -230,7 +230,7 @@ var resultIsString3 = foo() ? exprString1 : exprString2;
 >resultIsString3 : string
 >foo() ? exprString1 : exprString2 : string
 >foo() : number
->foo : () => number
+>foo : typeof foo
 >exprString1 : string
 >exprString2 : string
 
@@ -239,7 +239,7 @@ var resultIsObject3 = foo() / array[1] ? exprIsObject1 : exprIsObject2;
 >foo() / array[1] ? exprIsObject1 : exprIsObject2 : Object
 >foo() / array[1] : number
 >foo() : number
->foo : () => number
+>foo : typeof foo
 >array[1] : number
 >array : number[]
 >exprIsObject1 : Object
diff --git a/tests/baselines/reference/conditionalOperatorConditionIsObjectType.types b/tests/baselines/reference/conditionalOperatorConditionIsObjectType.types
index 36c15d64c54..d72ef94a175 100644
--- a/tests/baselines/reference/conditionalOperatorConditionIsObjectType.types
+++ b/tests/baselines/reference/conditionalOperatorConditionIsObjectType.types
@@ -37,7 +37,7 @@ var exprIsObject2: Object;
 >Object : Object
 
 function foo() { };
->foo : () => void
+>foo : typeof foo
 
 class C { static doIt: () => void };
 >C : C
@@ -126,7 +126,7 @@ condObject ? exprIsObject1 : exprIsObject2;
 foo() ? exprAny1 : exprAny2;
 >foo() ? exprAny1 : exprAny2 : any
 >foo() : void
->foo : () => void
+>foo : typeof foo
 >exprAny1 : any
 >exprAny2 : any
 
@@ -254,7 +254,7 @@ var resultIsAny3 = foo() ? exprAny1 : exprAny2;
 >resultIsAny3 : any
 >foo() ? exprAny1 : exprAny2 : any
 >foo() : void
->foo : () => void
+>foo : typeof foo
 >exprAny1 : any
 >exprAny2 : any
 
diff --git a/tests/baselines/reference/conditionalOperatorConditoinIsStringType.types b/tests/baselines/reference/conditionalOperatorConditoinIsStringType.types
index 668e0fc437c..dd316991075 100644
--- a/tests/baselines/reference/conditionalOperatorConditoinIsStringType.types
+++ b/tests/baselines/reference/conditionalOperatorConditoinIsStringType.types
@@ -94,7 +94,7 @@ condString ? exprIsObject1 : exprIsObject2;
 
 //Cond is a string type expression
 function foo() { return "string" };
->foo : () => string
+>foo : typeof foo
 
 var array = ["1", "2", "3"];
 >array : string[]
@@ -125,7 +125,7 @@ condString + "string" ? exprNumber1 : exprNumber2;
 foo() ? exprString1 : exprString2;
 >foo() ? exprString1 : exprString2 : string
 >foo() : string
->foo : () => string
+>foo : typeof foo
 >exprString1 : string
 >exprString2 : string
 
@@ -231,7 +231,7 @@ var resultIsString3 = foo() ? exprString1 : exprString2;
 >resultIsString3 : string
 >foo() ? exprString1 : exprString2 : string
 >foo() : string
->foo : () => string
+>foo : typeof foo
 >exprString1 : string
 >exprString2 : string
 
diff --git a/tests/baselines/reference/conditionallyDuplicateOverloadsCausedByOverloadResolution.types b/tests/baselines/reference/conditionallyDuplicateOverloadsCausedByOverloadResolution.types
index 021574dfbfa..4affab88a68 100644
--- a/tests/baselines/reference/conditionallyDuplicateOverloadsCausedByOverloadResolution.types
+++ b/tests/baselines/reference/conditionallyDuplicateOverloadsCausedByOverloadResolution.types
@@ -1,31 +1,21 @@
 === tests/cases/compiler/conditionallyDuplicateOverloadsCausedByOverloadResolution.ts ===
 declare function foo(func: (x: string, y: string) => any): boolean;
->foo : { (func: (x: string, y: string) => any): boolean; (func: (x: string, y: number) => any): string; }
+>foo : typeof foo
 >func : (x: string, y: string) => any
 >x : string
 >y : string
 
 declare function foo(func: (x: string, y: number) => any): string;
->foo : { (func: (x: string, y: string) => any): boolean; (func: (x: string, y: number) => any): string; }
+>foo : typeof foo
 >func : (x: string, y: number) => any
 >x : string
 >y : number
 
 var out = foo((x, y) => {
 >out : boolean
->foo((x, y) => {
-    function bar(a: typeof x): void;
-    function bar(b: typeof y): void;
-    function bar() { }
-    return bar;
-}) : boolean
->foo : { (func: (x: string, y: string) => any): boolean; (func: (x: string, y: number) => any): string; }
->(x, y) => {
-    function bar(a: typeof x): void;
-    function bar(b: typeof y): void;
-    function bar() { }
-    return bar;
-} : (x: string, y: string) => { (a: string): void; (b: string): void; }
+>foo((x, y) => {    function bar(a: typeof x): void;    function bar(b: typeof y): void;    function bar() { }    return bar;}) : boolean
+>foo : typeof foo
+>(x, y) => {    function bar(a: typeof x): void;    function bar(b: typeof y): void;    function bar() { }    return bar;} : (x: string, y: string) => { (a: string): void; (b: string): void; }
 >x : string
 >y : string
 
@@ -48,34 +38,22 @@ var out = foo((x, y) => {
 });
 
 declare function foo2(func: (x: string, y: string) => any): boolean;
->foo2 : { (func: (x: string, y: string) => any): boolean; (func: (x: string, y: number) => any): string; }
+>foo2 : typeof foo2
 >func : (x: string, y: string) => any
 >x : string
 >y : string
 
 declare function foo2(func: (x: string, y: number) => any): string;
->foo2 : { (func: (x: string, y: string) => any): boolean; (func: (x: string, y: number) => any): string; }
+>foo2 : typeof foo2
 >func : (x: string, y: number) => any
 >x : string
 >y : number
 
 var out2 = foo2((x, y) => {
 >out2 : boolean
->foo2((x, y) => {
-    var bar: {
-        (a: typeof x): void;
-        (b: typeof y): void;
-    };
-    return bar;
-}) : boolean
->foo2 : { (func: (x: string, y: string) => any): boolean; (func: (x: string, y: number) => any): string; }
->(x, y) => {
-    var bar: {
-        (a: typeof x): void;
-        (b: typeof y): void;
-    };
-    return bar;
-} : (x: string, y: string) => { (a: string): void; (b: string): void; }
+>foo2((x, y) => {    var bar: {        (a: typeof x): void;        (b: typeof y): void;    };    return bar;}) : boolean
+>foo2 : typeof foo2
+>(x, y) => {    var bar: {        (a: typeof x): void;        (b: typeof y): void;    };    return bar;} : (x: string, y: string) => { (a: string): void; (b: string): void; }
 >x : string
 >y : string
 
diff --git a/tests/baselines/reference/constantOverloadFunction.types b/tests/baselines/reference/constantOverloadFunction.types
index 1e74486cb32..aa2710a8c66 100644
--- a/tests/baselines/reference/constantOverloadFunction.types
+++ b/tests/baselines/reference/constantOverloadFunction.types
@@ -19,27 +19,27 @@ class Derived3 extends Base { biz() { } }
 >biz : () => void
 
 function foo(tagName: 'canvas'): Derived1;
->foo : { (tagName: 'canvas'): Derived1; (tagName: 'div'): Derived2; (tagName: 'span'): Derived3; (tagName: string): Base; }
+>foo : typeof foo
 >tagName : 'canvas'
 >Derived1 : Derived1
 
 function foo(tagName:  'div'): Derived2;
->foo : { (tagName: 'canvas'): Derived1; (tagName: 'div'): Derived2; (tagName: 'span'): Derived3; (tagName: string): Base; }
+>foo : typeof foo
 >tagName : 'div'
 >Derived2 : Derived2
 
 function foo(tagName: 'span'): Derived3;
->foo : { (tagName: 'canvas'): Derived1; (tagName: 'div'): Derived2; (tagName: 'span'): Derived3; (tagName: string): Base; }
+>foo : typeof foo
 >tagName : 'span'
 >Derived3 : Derived3
 
 function foo(tagName: string): Base;
->foo : { (tagName: 'canvas'): Derived1; (tagName: 'div'): Derived2; (tagName: 'span'): Derived3; (tagName: string): Base; }
+>foo : typeof foo
 >tagName : string
 >Base : Base
 
 function foo(tagName: any): Base {
->foo : { (tagName: 'canvas'): Derived1; (tagName: 'div'): Derived2; (tagName: 'span'): Derived3; (tagName: string): Base; }
+>foo : typeof foo
 >tagName : any
 >Base : Base
 
diff --git a/tests/baselines/reference/constraintPropagationThroughReturnTypes.types b/tests/baselines/reference/constraintPropagationThroughReturnTypes.types
index 6f56cca28cc..d8a7a5b9991 100644
--- a/tests/baselines/reference/constraintPropagationThroughReturnTypes.types
+++ b/tests/baselines/reference/constraintPropagationThroughReturnTypes.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/constraintPropagationThroughReturnTypes.ts ===
 function g<T>(x: T): T {
->g : <T>(x: T) => T
+>g : typeof g
 >T : T
 >x : T
 >T : T
@@ -11,7 +11,7 @@ function g<T>(x: T): T {
 }
  
 function f<S extends { foo: string }>(x: S) {
->f : <S extends { foo: string; }>(x: S) => void
+>f : typeof f
 >S : S
 >foo : string
 >x : S
@@ -20,7 +20,7 @@ function f<S extends { foo: string }>(x: S) {
   var y = g(x);
 >y : S
 >g(x) : S
->g : <T>(x: T) => T
+>g : typeof g
 >x : S
 
   y;
diff --git a/tests/baselines/reference/constraintSatisfactionWithAny.types b/tests/baselines/reference/constraintSatisfactionWithAny.types
index e007d3cec73..7e88d4044af 100644
--- a/tests/baselines/reference/constraintSatisfactionWithAny.types
+++ b/tests/baselines/reference/constraintSatisfactionWithAny.types
@@ -2,7 +2,7 @@
 // any is not a valid type argument unless there is no constraint, or the constraint is any
 
 function foo<T extends String>(x: T): T { return null; }
->foo : <T extends String>(x: T) => T
+>foo : typeof foo
 >T : T
 >String : String
 >x : T
@@ -10,7 +10,7 @@ function foo<T extends String>(x: T): T { return null; }
 >T : T
 
 function foo2<T extends { x: number }>(x: T): T { return null; }
->foo2 : <T extends { x: number; }>(x: T) => T
+>foo2 : typeof foo2
 >T : T
 >x : number
 >x : T
@@ -19,7 +19,7 @@ function foo2<T extends { x: number }>(x: T): T { return 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
+>foo4 : typeof foo4
 >T : T
 >T : T
 >x : T
@@ -33,18 +33,18 @@ var a;
 
 foo(a);
 >foo(a) : any
->foo : <T extends String>(x: T) => T
+>foo : typeof foo
 >a : any
 
 foo2(a);
 >foo2(a) : any
->foo2 : <T extends { x: number; }>(x: T) => T
+>foo2 : typeof foo2
 >a : any
 
 //foo3(a);
 foo4(a);
 >foo4(a) : any
->foo4 : <T extends <T>(x: T) => void>(x: T) => T
+>foo4 : typeof foo4
 >a : any
 
 var b: number;
@@ -52,18 +52,18 @@ var b: number;
 
 foo<any>(b);
 >foo<any>(b) : any
->foo : <T extends String>(x: T) => T
+>foo : typeof foo
 >b : number
 
 foo2<any>(b);
 >foo2<any>(b) : any
->foo2 : <T extends { x: number; }>(x: T) => T
+>foo2 : typeof foo2
 >b : number
 
 //foo3<any>(b);
 foo4<any>(b);
 >foo4<any>(b) : any
->foo4 : <T extends <T>(x: T) => void>(x: T) => T
+>foo4 : typeof foo4
 >b : number
 
 //function foo5<T extends String, U extends T>(x: T, y: U): T { return null; }
diff --git a/tests/baselines/reference/constraintSatisfactionWithEmptyObject.types b/tests/baselines/reference/constraintSatisfactionWithEmptyObject.types
index 113736bdd11..a36b8e5ec65 100644
--- a/tests/baselines/reference/constraintSatisfactionWithEmptyObject.types
+++ b/tests/baselines/reference/constraintSatisfactionWithEmptyObject.types
@@ -3,7 +3,7 @@
 
 // Object constraint
 function foo<T extends Object>(x: T) { }
->foo : <T extends Object>(x: T) => void
+>foo : typeof foo
 >T : T
 >Object : Object
 >x : T
@@ -12,7 +12,7 @@ function foo<T extends Object>(x: T) { }
 var r = foo({});
 >r : void
 >foo({}) : void
->foo : <T extends Object>(x: T) => void
+>foo : typeof foo
 >{} : {}
 
 var a = {};
@@ -22,7 +22,7 @@ var a = {};
 var r = foo({});
 >r : void
 >foo({}) : void
->foo : <T extends Object>(x: T) => void
+>foo : typeof foo
 >{} : {}
 
 class C<T extends Object> {
@@ -56,7 +56,7 @@ var i: I<{}>;
 
 // {} constraint
 function foo2<T extends {}>(x: T) { }
->foo2 : <T extends {}>(x: T) => void
+>foo2 : typeof foo2
 >T : T
 >x : T
 >T : T
@@ -64,7 +64,7 @@ function foo2<T extends {}>(x: T) { }
 var r = foo2({});
 >r : void
 >foo2({}) : void
->foo2 : <T extends {}>(x: T) => void
+>foo2 : typeof foo2
 >{} : {}
 
 var a = {};
@@ -74,7 +74,7 @@ var a = {};
 var r = foo2({});
 >r : void
 >foo2({}) : void
->foo2 : <T extends {}>(x: T) => void
+>foo2 : typeof foo2
 >{} : {}
 
 class C2<T extends {}> {
diff --git a/tests/baselines/reference/constructorArgWithGenericCallSignature.types b/tests/baselines/reference/constructorArgWithGenericCallSignature.types
index de3ed3ae5f1..acd7528976f 100644
--- a/tests/baselines/reference/constructorArgWithGenericCallSignature.types
+++ b/tests/baselines/reference/constructorArgWithGenericCallSignature.types
@@ -20,7 +20,7 @@ module Test {
     }
  
  export function F(func: MyFunc) { }
->F : (func: MyFunc) => void
+>F : typeof F
 >func : MyFunc
 >MyFunc : MyFunc
 }
@@ -31,9 +31,9 @@ var func: Test.MyFunc;
 
 Test.F(func); // OK
 >Test.F(func) : void
->Test.F : (func: MyFunc) => void
+>Test.F : typeof F
 >Test : typeof Test
->F : (func: MyFunc) => void
+>F : typeof F
 >func : MyFunc
 
 var test = new Test.MyClass(func); // Should be OK
diff --git a/tests/baselines/reference/constructorArgsErrors3.errors.txt b/tests/baselines/reference/constructorArgsErrors3.errors.txt
deleted file mode 100644
index b01950da279..00000000000
--- a/tests/baselines/reference/constructorArgsErrors3.errors.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-==== tests/cases/compiler/constructorArgsErrors3.ts (1 errors) ====
-    class foo {
-        constructor (public public a: number) {
-                            ~~~~~~
-!!! Accessibility modifier already seen.
-        }
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/constructorArgsErrors4.errors.txt b/tests/baselines/reference/constructorArgsErrors4.errors.txt
deleted file mode 100644
index 431844358ee..00000000000
--- a/tests/baselines/reference/constructorArgsErrors4.errors.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-==== tests/cases/compiler/constructorArgsErrors4.ts (1 errors) ====
-    class foo {
-        constructor (private public a: number) {
-                             ~~~~~~
-!!! Accessibility modifier already seen.
-        }
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/constructorArgsErrors5.errors.txt b/tests/baselines/reference/constructorArgsErrors5.errors.txt
deleted file mode 100644
index 176a2b7db06..00000000000
--- a/tests/baselines/reference/constructorArgsErrors5.errors.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-==== tests/cases/compiler/constructorArgsErrors5.ts (1 errors) ====
-    class foo {
-        constructor (export a: number) {
-                     ~~~~~~
-!!! 'export' modifier cannot appear on a parameter.
-        }
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/constructorsWithSpecializedSignatures.errors.txt b/tests/baselines/reference/constructorsWithSpecializedSignatures.errors.txt
deleted file mode 100644
index d7ba7dcf92b..00000000000
--- a/tests/baselines/reference/constructorsWithSpecializedSignatures.errors.txt
+++ /dev/null
@@ -1,60 +0,0 @@
-==== tests/cases/compiler/constructorsWithSpecializedSignatures.ts (8 errors) ====
-    // errors
-    declare class C {
-        constructor(x: "hi");
-        ~~~~~~~~~~~~~~~~~~~~~
-!!! Specialized overload signature is not assignable to any non-specialized signature.
-        constructor(x: "foo");
-        ~~~~~~~~~~~~~~~~~~~~~~
-!!! Specialized overload signature is not assignable to any non-specialized signature.
-        constructor(x: number);
-    }
-    
-    // ok
-    declare class C2 {
-        constructor(x: "hi");
-        constructor(x: "foo");
-        constructor(x: string);
-    }
-    
-    // errors
-    class D {
-        constructor(x: "hi");
-        ~~~~~~~~~~~~~~~~~~~~~
-!!! Specialized overload signature is not assignable to any non-specialized signature.
-        constructor(x: "foo");
-        ~~~~~~~~~~~~~~~~~~~~~~
-!!! Specialized overload signature is not assignable to any non-specialized signature.
-        constructor(x: number);
-        constructor(x: "hi") { }
-        ~~~~~~~~~~~~~~~~~~~~~~~~
-!!! A signature with an implementation cannot use a string literal type.
-    }
-    
-    // overloads are ok
-    class D2 {
-        constructor(x: "hi");
-        constructor(x: "foo");
-        constructor(x: string);
-        constructor(x: "hi") { } // error
-        ~~~~~~~~~~~~~~~~~~~~~~~~
-!!! A signature with an implementation cannot use a string literal type.
-    }
-    
-    // errors
-    interface I {
-        new (x: "hi");
-        ~~~~~~~~~~~~~~
-!!! Specialized overload signature is not assignable to any non-specialized signature.
-        new (x: "foo");
-        ~~~~~~~~~~~~~~~
-!!! Specialized overload signature is not assignable to any non-specialized signature.
-        new (x: number);
-    }
-    
-    // ok
-    interface I2 {
-        new (x: "hi");
-        new (x: "foo");
-        new (x: string);
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/contextualSigInstantiationRestParams.types b/tests/baselines/reference/contextualSigInstantiationRestParams.types
index 76a00310fd9..6dc06be50fc 100644
--- a/tests/baselines/reference/contextualSigInstantiationRestParams.types
+++ b/tests/baselines/reference/contextualSigInstantiationRestParams.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/contextualSigInstantiationRestParams.ts ===
 declare function toInstantiate<A, B>(a?: A, b?: B): B;
->toInstantiate : <A, B>(a?: A, b?: B) => B
+>toInstantiate : typeof toInstantiate
 >A : A
 >B : B
 >a : A
@@ -10,11 +10,11 @@ declare function toInstantiate<A, B>(a?: A, b?: B): B;
 >B : B
 
 declare function contextual(...s: string[]): string
->contextual : (...s: string[]) => string
+>contextual : typeof contextual
 >s : string[]
 
 var sig: typeof contextual = toInstantiate;
->sig : (...s: string[]) => string
->contextual : (...s: string[]) => string
->toInstantiate : <A, B>(a?: A, b?: B) => B
+>sig : typeof contextual
+>contextual : typeof contextual
+>toInstantiate : typeof toInstantiate
 
diff --git a/tests/baselines/reference/contextualSignatureInstantiation1.types b/tests/baselines/reference/contextualSignatureInstantiation1.types
index 3a95e87b76f..e181cd47ab3 100644
--- a/tests/baselines/reference/contextualSignatureInstantiation1.types
+++ b/tests/baselines/reference/contextualSignatureInstantiation1.types
@@ -1,6 +1,6 @@
 === 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[]
+>map : typeof map
 >S : S
 >T : T
 >f : (x: S) => T
@@ -25,11 +25,11 @@ var e = <K>(x: string, y?: K) => x.length;
 var r99 = map(e); // should be {}[] for S since a generic lambda is not inferentially typed
 >r99 : (a: {}[]) => number[]
 >map(e) : (a: {}[]) => number[]
->map : <S, T>(f: (x: S) => T) => (a: S[]) => T[]
+>map : typeof map
 >e : <K>(x: string, y?: K) => number
 
 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[]
+>map2 : typeof map2
 >S : S
 >length : number
 >T : T
@@ -55,6 +55,6 @@ var e2 = <K>(x: string, y?: K) => x.length;
 var r100 = map2(e2); // type arg inference should fail for S since a generic lambda is not inferentially typed. Falls back to { length: number }
 >r100 : (a: { length: number; }[]) => number[]
 >map2(e2) : (a: { length: number; }[]) => number[]
->map2 : <S extends { length: number; }, T>(f: (x: S) => T) => (a: S[]) => T[]
+>map2 : typeof map2
 >e2 : <K>(x: string, y?: K) => number
 
diff --git a/tests/baselines/reference/contextualSignatureInstantiation3.types b/tests/baselines/reference/contextualSignatureInstantiation3.types
deleted file mode 100644
index c6ed5a7e97d..00000000000
--- a/tests/baselines/reference/contextualSignatureInstantiation3.types
+++ /dev/null
@@ -1,83 +0,0 @@
-=== 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[]
->items.map : <U>(callbackfn: (value: T, index: number, array: T[]) => U, thisArg?: any) => U[]
->items : T[]
->map : <U>(callbackfn: (value: T, index: number, array: T[]) => U, thisArg?: any) => U[]
->f : (x: T) => U
-}
-
-function identity<T>(x: T) {
->identity : <T>(x: T) => T
->T : T
->x : T
->T : T
-
-    return x;
->x : T
-}
-
-function singleton<T>(x: T) {
->singleton : <T>(x: T) => T[]
->T : T
->x : T
->T : T
-
-    return [x];
->[x] : T[]
->x : T
-}
-
-var xs = [1, 2, 3];
->xs : number[]
->[1, 2, 3] : number[]
-
-// Have compiler check that we get the correct types
-var v1: number[];
->v1 : number[]
-
-var v1 = xs.map(identity);      // Error if not number[]
->v1 : number[]
->xs.map(identity) : number[]
->xs.map : <U>(callbackfn: (value: number, index: number, array: number[]) => U, thisArg?: any) => U[]
->xs : number[]
->map : <U>(callbackfn: (value: number, index: number, array: number[]) => U, thisArg?: any) => U[]
->identity : <T>(x: T) => T
-
-var v1 = map(xs, identity);     // Error if not number[]
->v1 : number[]
->map(xs, identity) : number[]
->map : <T, U>(items: T[], f: (x: T) => U) => U[]
->xs : number[]
->identity : <T>(x: T) => T
-
-var v2: number[][];         
->v2 : number[][]
-
-var v2 = xs.map(singleton);     // Error if not number[][]
->v2 : number[][]
->xs.map(singleton) : number[][]
->xs.map : <U>(callbackfn: (value: number, index: number, array: number[]) => U, thisArg?: any) => U[]
->xs : number[]
->map : <U>(callbackfn: (value: number, index: number, array: number[]) => U, thisArg?: any) => U[]
->singleton : <T>(x: T) => T[]
-
-var v2 = map(xs, singleton);    // Error if not number[][]
->v2 : number[][]
->map(xs, singleton) : number[][]
->map : <T, U>(items: T[], f: (x: T) => U) => U[]
->xs : number[]
->singleton : <T>(x: T) => T[]
-
diff --git a/tests/baselines/reference/contextualSignatureInstantiationWithTypeParameterConstrainedToOuterTypeParameter.types b/tests/baselines/reference/contextualSignatureInstantiationWithTypeParameterConstrainedToOuterTypeParameter.types
index 89ea3028d94..e858596a976 100644
--- a/tests/baselines/reference/contextualSignatureInstantiationWithTypeParameterConstrainedToOuterTypeParameter.types
+++ b/tests/baselines/reference/contextualSignatureInstantiationWithTypeParameterConstrainedToOuterTypeParameter.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/contextualSignatureInstantiationWithTypeParameterConstrainedToOuterTypeParameter.ts ===
 function f<T>() {
->f : <T>() => <U extends T>(u: U) => U
+>f : typeof f
 >T : T
 
     function g<U extends T>(u: U): U { return null }
@@ -31,5 +31,5 @@ var x = h("", f<string>()); // Call should succeed and x should be string. All t
 >h("", f<string>()) : string
 >h : <V, W>(v: V, func: (v: V) => W) => W
 >f<string>() : <U extends string>(u: U) => U
->f : <T>() => <U extends T>(u: U) => U
+>f : typeof f
 
diff --git a/tests/baselines/reference/contextualTypeAppliedToVarArgs.types b/tests/baselines/reference/contextualTypeAppliedToVarArgs.types
index 2ae7600faa5..b6c50514918 100644
--- a/tests/baselines/reference/contextualTypeAppliedToVarArgs.types
+++ b/tests/baselines/reference/contextualTypeAppliedToVarArgs.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/contextualTypeAppliedToVarArgs.ts ===
 function delegate(instance: any, method: (...args: any[]) => any, data?: any): (...args: any[]) => any {
->delegate : (instance: any, method: (...args: any[]) => any, data?: any) => (...args: any[]) => any
+>delegate : typeof delegate
 >instance : any
 >method : (...args: any[]) => any
 >args : any[]
@@ -19,18 +19,10 @@ class Foo{
 >Bar : () => void
 
         delegate(this, function (source, args2)
->delegate(this, function (source, args2)
-        {
-            var a = source.node;
-            var b = args2.node;
-        } ) : (...args: any[]) => any
->delegate : (instance: any, method: (...args: any[]) => any, data?: any) => (...args: any[]) => any
+>delegate(this, function (source, args2)        {            var a = source.node;            var b = args2.node;        } ) : (...args: any[]) => any
+>delegate : typeof delegate
 >this : Foo
->function (source, args2)
-        {
-            var a = source.node;
-            var b = args2.node;
-        } : (source: any, args2: any) => void
+>function (source, args2)        {            var a = source.node;            var b = args2.node;        } : (source: any, args2: any) => void
 >source : any
 >args2 : any
         {
diff --git a/tests/baselines/reference/contextualTypeArrayReturnType.types b/tests/baselines/reference/contextualTypeArrayReturnType.types
index 62790f234ce..b0cd03f8510 100644
--- a/tests/baselines/reference/contextualTypeArrayReturnType.types
+++ b/tests/baselines/reference/contextualTypeArrayReturnType.types
@@ -26,27 +26,15 @@ interface Transform3D {
 var style: IBookStyle = {
 >style : IBookStyle
 >IBookStyle : IBookStyle
->{
-    initialLeftPageTransforms: (width: number) => {
-        return [
-            {'ry': null }
-        ];
-    }
-} : { initialLeftPageTransforms: (width: number) => NamedTransform[]; }
+>{    initialLeftPageTransforms: (width: number) => {        return [            {'ry': null }        ];    }} : { initialLeftPageTransforms: (width: number) => NamedTransform[]; }
 
     initialLeftPageTransforms: (width: number) => {
 >initialLeftPageTransforms : (width: number) => NamedTransform[]
->(width: number) => {
-        return [
-            {'ry': null }
-        ];
-    } : (width: number) => NamedTransform[]
+>(width: number) => {        return [            {'ry': null }        ];    } : (width: number) => NamedTransform[]
 >width : number
 
         return [
->[
-            {'ry': null }
-        ] : NamedTransform[]
+>[            {'ry': null }        ] : NamedTransform[]
 
             {'ry': null }
 >{'ry': null } : { [x: string]: Transform3D; 'ry': null; }
diff --git a/tests/baselines/reference/contextualTyping.errors.txt b/tests/baselines/reference/contextualTyping.errors.txt
index 69bffcc5782..effbed3d516 100644
--- a/tests/baselines/reference/contextualTyping.errors.txt
+++ b/tests/baselines/reference/contextualTyping.errors.txt
@@ -234,5 +234,5 @@
     interface B extends A { }
     var x: B = { };
         ~
-!!! Type '{}' is not assignable to type 'B':\n  Property 'x' is missing in type '{}'.
-    
\ No newline at end of file
+!!! Type '{}' is not assignable to type 'B':
+!!!   Property 'x' is missing in type '{}'.
\ No newline at end of file
diff --git a/tests/baselines/reference/contextualTyping.js b/tests/baselines/reference/contextualTyping.js
index 6d9f1911038..1cc39a795c8 100644
--- a/tests/baselines/reference/contextualTyping.js
+++ b/tests/baselines/reference/contextualTyping.js
@@ -228,8 +228,199 @@ Point.prototype = {
 
 interface A { x: string; }
 interface B extends A { }
-var x: B = { };
-
+var x: B = { };
 
 //// [contextualTyping.js]
-// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map
\ No newline at end of file
+// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map
+var C1T5 = (function () {
+    function C1T5() {
+        this.foo = function (i) {
+            return i;
+        };
+    }
+    return C1T5;
+})();
+var C2T5;
+(function (C2T5) {
+    C2T5.foo = function (i) {
+        return i;
+    };
+})(C2T5 || (C2T5 = {}));
+var c3t1 = (function (s) {
+    return s;
+});
+var c3t2 = ({
+    n: 1
+});
+var c3t3 = [];
+var c3t4 = function () {
+    return ({});
+};
+var c3t5 = function (n) {
+    return ({});
+};
+var c3t6 = function (n, s) {
+    return ({});
+};
+var c3t7 = function (n) {
+    return n;
+};
+var c3t8 = function (n) {
+    return n;
+};
+var c3t9 = [[], []];
+var c3t10 = [({}), ({})];
+var c3t11 = [function (n, s) {
+    return s;
+}];
+var c3t12 = {
+    foo: ({})
+};
+var c3t13 = ({
+    f: function (i, s) {
+        return s;
+    }
+});
+var c3t14 = ({
+    a: []
+});
+var C4T5 = (function () {
+    function C4T5() {
+        this.foo = function (i, s) {
+            return s;
+        };
+    }
+    return C4T5;
+})();
+var C5T5;
+(function (C5T5) {
+    C5T5.foo;
+    C5T5.foo = function (i, s) {
+        return s;
+    };
+})(C5T5 || (C5T5 = {}));
+var c6t5;
+c6t5 = function (n) {
+    return ({});
+};
+var c7t2;
+c7t2[0] = ({ n: 1 });
+var objc8 = ({});
+objc8.t1 = (function (s) {
+    return s;
+});
+objc8.t2 = ({
+    n: 1
+});
+objc8.t3 = [];
+objc8.t4 = function () {
+    return ({});
+};
+objc8.t5 = function (n) {
+    return ({});
+};
+objc8.t6 = function (n, s) {
+    return ({});
+};
+objc8.t7 = function (n) {
+    return n;
+};
+objc8.t8 = function (n) {
+    return n;
+};
+objc8.t9 = [[], []];
+objc8.t10 = [({}), ({})];
+objc8.t11 = [function (n, s) {
+    return s;
+}];
+objc8.t12 = {
+    foo: ({})
+};
+objc8.t13 = ({
+    f: function (i, s) {
+        return s;
+    }
+});
+objc8.t14 = ({
+    a: []
+});
+function c9t5(f) {
+}
+;
+c9t5(function (n) {
+    return ({});
+});
+var c10t5 = function () {
+    return function (n) {
+        return ({});
+    };
+};
+var C11t5 = (function () {
+    function C11t5(f) {
+    }
+    return C11t5;
+})();
+;
+var i = new C11t5(function (n) {
+    return ({});
+});
+var c12t1 = (function (s) {
+    return s;
+});
+var c12t2 = ({
+    n: 1
+});
+var c12t3 = [];
+var c12t4 = function () {
+    return ({});
+};
+var c12t5 = function (n) {
+    return ({});
+};
+var c12t6 = function (n, s) {
+    return ({});
+};
+var c12t7 = function (n) {
+    return n;
+};
+var c12t8 = function (n) {
+    return n;
+};
+var c12t9 = [[], []];
+var c12t10 = [({}), ({})];
+var c12t11 = [function (n, s) {
+    return s;
+}];
+var c12t12 = {
+    foo: ({})
+};
+var c12t13 = ({
+    f: function (i, s) {
+        return s;
+    }
+});
+var c12t14 = ({
+    a: []
+});
+function EF1(a, b) {
+    return a + b;
+}
+var efv = EF1(1, 2);
+function Point(x, y) {
+    this.x = x;
+    this.y = y;
+    return this;
+}
+Point.origin = new Point(0, 0);
+Point.prototype.add = function (dx, dy) {
+    return new Point(this.x + dx, this.y + dy);
+};
+Point.prototype = {
+    x: 0,
+    y: 0,
+    add: function (dx, dy) {
+        return new Point(this.x + dx, this.y + dy);
+    }
+};
+var x = {};
+//# sourceMappingURL=contextualTyping.js.map
diff --git a/tests/baselines/reference/contextualTyping25.types b/tests/baselines/reference/contextualTyping25.types
index 3c6442739a2..9b7b60a8715 100644
--- a/tests/baselines/reference/contextualTyping25.types
+++ b/tests/baselines/reference/contextualTyping25.types
@@ -1,10 +1,10 @@
 === tests/cases/compiler/contextualTyping25.ts ===
 function foo(param:{id:number;}){}; foo(<{id:number;}>({}));
->foo : (param: { id: number; }) => void
+>foo : typeof foo
 >param : { id: number; }
 >id : number
 >foo(<{id:number;}>({})) : void
->foo : (param: { id: number; }) => void
+>foo : typeof foo
 ><{id:number;}>({}) : { id: number; }
 >id : number
 >({}) : {}
diff --git a/tests/baselines/reference/contextualTyping26.types b/tests/baselines/reference/contextualTyping26.types
index 65a089f6082..45363789c20 100644
--- a/tests/baselines/reference/contextualTyping26.types
+++ b/tests/baselines/reference/contextualTyping26.types
@@ -1,10 +1,10 @@
 === tests/cases/compiler/contextualTyping26.ts ===
 function foo(param:{id:number;}){}; foo(<{id:number;}>({}));
->foo : (param: { id: number; }) => void
+>foo : typeof foo
 >param : { id: number; }
 >id : number
 >foo(<{id:number;}>({})) : void
->foo : (param: { id: number; }) => void
+>foo : typeof foo
 ><{id:number;}>({}) : { id: number; }
 >id : number
 >({}) : {}
diff --git a/tests/baselines/reference/contextualTyping27.types b/tests/baselines/reference/contextualTyping27.types
index f668565e43d..e74bee5e052 100644
--- a/tests/baselines/reference/contextualTyping27.types
+++ b/tests/baselines/reference/contextualTyping27.types
@@ -1,10 +1,10 @@
 === tests/cases/compiler/contextualTyping27.ts ===
 function foo(param:{id:number;}){}; foo(<{id:number;}>({}));
->foo : (param: { id: number; }) => void
+>foo : typeof foo
 >param : { id: number; }
 >id : number
 >foo(<{id:number;}>({})) : void
->foo : (param: { id: number; }) => void
+>foo : typeof foo
 ><{id:number;}>({}) : { id: number; }
 >id : number
 >({}) : {}
diff --git a/tests/baselines/reference/contextualTyping28.types b/tests/baselines/reference/contextualTyping28.types
index 6019fde4a6b..04ca0651af5 100644
--- a/tests/baselines/reference/contextualTyping28.types
+++ b/tests/baselines/reference/contextualTyping28.types
@@ -1,8 +1,8 @@
 === tests/cases/compiler/contextualTyping28.ts ===
 function foo(param:number[]){}; foo([1]);
->foo : (param: number[]) => void
+>foo : typeof foo
 >param : number[]
 >foo([1]) : void
->foo : (param: number[]) => void
+>foo : typeof foo
 >[1] : number[]
 
diff --git a/tests/baselines/reference/contextualTyping29.types b/tests/baselines/reference/contextualTyping29.types
index 9666e60e959..a06d296a378 100644
--- a/tests/baselines/reference/contextualTyping29.types
+++ b/tests/baselines/reference/contextualTyping29.types
@@ -1,8 +1,8 @@
 === tests/cases/compiler/contextualTyping29.ts ===
 function foo(param:number[]){}; foo([1, 3]);
->foo : (param: number[]) => void
+>foo : typeof foo
 >param : number[]
 >foo([1, 3]) : void
->foo : (param: number[]) => void
+>foo : typeof foo
 >[1, 3] : number[]
 
diff --git a/tests/baselines/reference/contextualTyping31.types b/tests/baselines/reference/contextualTyping31.types
index e37bacd33f3..80511aada95 100644
--- a/tests/baselines/reference/contextualTyping31.types
+++ b/tests/baselines/reference/contextualTyping31.types
@@ -1,8 +1,8 @@
 === tests/cases/compiler/contextualTyping31.ts ===
 function foo(param:number[]){}; foo([1]);
->foo : (param: number[]) => void
+>foo : typeof foo
 >param : number[]
 >foo([1]) : void
->foo : (param: number[]) => void
+>foo : typeof foo
 >[1] : number[]
 
diff --git a/tests/baselines/reference/contextualTyping32.types b/tests/baselines/reference/contextualTyping32.types
index a9d41405b93..cb8ad24166b 100644
--- a/tests/baselines/reference/contextualTyping32.types
+++ b/tests/baselines/reference/contextualTyping32.types
@@ -1,10 +1,10 @@
 === tests/cases/compiler/contextualTyping32.ts ===
 function foo(param: {():number; (i:number):number; }[]) { }; foo([function(){return 1;}, function(){return 4}]);
->foo : (param: { (): number; (i: number): number; }[]) => void
+>foo : typeof foo
 >param : { (): number; (i: number): number; }[]
 >i : number
 >foo([function(){return 1;}, function(){return 4}]) : void
->foo : (param: { (): number; (i: number): number; }[]) => void
+>foo : typeof foo
 >[function(){return 1;}, function(){return 4}] : { (): number; (i: number): number; }[]
 >function(){return 1;} : () => number
 >function(){return 4} : () => number
diff --git a/tests/baselines/reference/contextualTypingTwoInstancesOfSameTypeParameter.types b/tests/baselines/reference/contextualTypingTwoInstancesOfSameTypeParameter.types
index 0e5c25a9282..fb24b8c6f2b 100644
--- a/tests/baselines/reference/contextualTypingTwoInstancesOfSameTypeParameter.types
+++ b/tests/baselines/reference/contextualTypingTwoInstancesOfSameTypeParameter.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/contextualTypingTwoInstancesOfSameTypeParameter.ts ===
 function f6<T>(x: (a: T) => T) {
->f6 : <T>(x: (a: T) => T) => any
+>f6 : typeof f6
 >T : T
 >x : (a: T) => T
 >a : T
@@ -11,11 +11,11 @@ function f6<T>(x: (a: T) => T) {
 } 
 f6(x => f6(y => x = y));
 >f6(x => f6(y => x = y)) : any
->f6 : <T>(x: (a: T) => T) => any
+>f6 : typeof f6
 >x => f6(y => x = y) : (x: {}) => any
 >x : {}
 >f6(y => x = y) : any
->f6 : <T>(x: (a: T) => T) => any
+>f6 : typeof f6
 >y => x = y : (y: {}) => {}
 >y : {}
 >x = y : {}
diff --git a/tests/baselines/reference/continueInIterationStatement1.js b/tests/baselines/reference/continueInIterationStatement1.js
new file mode 100644
index 00000000000..e1c787ae7ea
--- /dev/null
+++ b/tests/baselines/reference/continueInIterationStatement1.js
@@ -0,0 +1,9 @@
+//// [continueInIterationStatement1.ts]
+while (true) {
+  continue;
+}
+
+//// [continueInIterationStatement1.js]
+while (true) {
+    continue;
+}
diff --git a/tests/baselines/reference/continueInIterationStatement1.types b/tests/baselines/reference/continueInIterationStatement1.types
new file mode 100644
index 00000000000..210de69f6bb
--- /dev/null
+++ b/tests/baselines/reference/continueInIterationStatement1.types
@@ -0,0 +1,5 @@
+=== tests/cases/compiler/continueInIterationStatement1.ts ===
+while (true) {
+No type information for this code.  continue;
+No type information for this code.}
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/continueInIterationStatement2.js b/tests/baselines/reference/continueInIterationStatement2.js
new file mode 100644
index 00000000000..d7ff84895f6
--- /dev/null
+++ b/tests/baselines/reference/continueInIterationStatement2.js
@@ -0,0 +1,10 @@
+//// [continueInIterationStatement2.ts]
+do {
+  continue;
+}
+while (true);
+
+//// [continueInIterationStatement2.js]
+do {
+    continue;
+} while (true);
diff --git a/tests/baselines/reference/continueInIterationStatement2.types b/tests/baselines/reference/continueInIterationStatement2.types
new file mode 100644
index 00000000000..5cb4b62f39a
--- /dev/null
+++ b/tests/baselines/reference/continueInIterationStatement2.types
@@ -0,0 +1,6 @@
+=== tests/cases/compiler/continueInIterationStatement2.ts ===
+do {
+No type information for this code.  continue;
+No type information for this code.}
+No type information for this code.while (true);
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/continueInIterationStatement3.js b/tests/baselines/reference/continueInIterationStatement3.js
new file mode 100644
index 00000000000..90619118ac5
--- /dev/null
+++ b/tests/baselines/reference/continueInIterationStatement3.js
@@ -0,0 +1,9 @@
+//// [continueInIterationStatement3.ts]
+for (;;) {
+  continue;
+}
+
+//// [continueInIterationStatement3.js]
+for (;;) {
+    continue;
+}
diff --git a/tests/baselines/reference/continueInIterationStatement3.types b/tests/baselines/reference/continueInIterationStatement3.types
new file mode 100644
index 00000000000..f4df3a295fb
--- /dev/null
+++ b/tests/baselines/reference/continueInIterationStatement3.types
@@ -0,0 +1,5 @@
+=== tests/cases/compiler/continueInIterationStatement3.ts ===
+for (;;) {
+No type information for this code.  continue;
+No type information for this code.}
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/continueInIterationStatement4.errors.txt b/tests/baselines/reference/continueInIterationStatement4.errors.txt
new file mode 100644
index 00000000000..c0f4388cf79
--- /dev/null
+++ b/tests/baselines/reference/continueInIterationStatement4.errors.txt
@@ -0,0 +1,6 @@
+==== tests/cases/compiler/continueInIterationStatement4.ts (1 errors) ====
+    for (var i in something) {
+                  ~~~~~~~~~
+!!! Cannot find name 'something'.
+      continue;
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/continueInIterationStatement4.js b/tests/baselines/reference/continueInIterationStatement4.js
new file mode 100644
index 00000000000..e72ab3ed9ab
--- /dev/null
+++ b/tests/baselines/reference/continueInIterationStatement4.js
@@ -0,0 +1,9 @@
+//// [continueInIterationStatement4.ts]
+for (var i in something) {
+  continue;
+}
+
+//// [continueInIterationStatement4.js]
+for (var i in something) {
+    continue;
+}
diff --git a/tests/baselines/reference/continueLabel.js b/tests/baselines/reference/continueLabel.js
new file mode 100644
index 00000000000..390566353eb
--- /dev/null
+++ b/tests/baselines/reference/continueLabel.js
@@ -0,0 +1,9 @@
+//// [continueLabel.ts]
+label1: for(var i = 0; i < 1; i++) {
+    continue label1;
+}
+
+//// [continueLabel.js]
+label1: for (var i = 0; i < 1; i++) {
+    continue label1;
+}
diff --git a/tests/baselines/reference/continueLabel.types b/tests/baselines/reference/continueLabel.types
new file mode 100644
index 00000000000..79c5381f08a
--- /dev/null
+++ b/tests/baselines/reference/continueLabel.types
@@ -0,0 +1,10 @@
+=== tests/cases/compiler/continueLabel.ts ===
+label1: for(var i = 0; i < 1; i++) {
+>i : number
+>i < 1 : boolean
+>i : number
+>i++ : number
+>i : number
+
+    continue label1;
+}
diff --git a/tests/baselines/reference/continueNotInIterationStatement1.errors.txt b/tests/baselines/reference/continueNotInIterationStatement1.errors.txt
new file mode 100644
index 00000000000..5f7d543a0aa
--- /dev/null
+++ b/tests/baselines/reference/continueNotInIterationStatement1.errors.txt
@@ -0,0 +1,4 @@
+==== tests/cases/compiler/continueNotInIterationStatement1.ts (1 errors) ====
+    continue;
+    ~~~~~~~~~
+!!! A 'continue' statement can only be used within an enclosing iteration statement.
\ No newline at end of file
diff --git a/tests/baselines/reference/continueNotInIterationStatement2.errors.txt b/tests/baselines/reference/continueNotInIterationStatement2.errors.txt
new file mode 100644
index 00000000000..0bfc41d7f72
--- /dev/null
+++ b/tests/baselines/reference/continueNotInIterationStatement2.errors.txt
@@ -0,0 +1,8 @@
+==== tests/cases/compiler/continueNotInIterationStatement2.ts (1 errors) ====
+    while (true) {
+      function f() {
+        continue;
+        ~~~~~~~~~
+!!! Jump target cannot cross function boundary.
+      }
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/continueNotInIterationStatement3.errors.txt b/tests/baselines/reference/continueNotInIterationStatement3.errors.txt
new file mode 100644
index 00000000000..d8627b4fc3a
--- /dev/null
+++ b/tests/baselines/reference/continueNotInIterationStatement3.errors.txt
@@ -0,0 +1,7 @@
+==== tests/cases/compiler/continueNotInIterationStatement3.ts (1 errors) ====
+    switch (0) {
+      default:
+        continue;
+        ~~~~~~~~~
+!!! A 'continue' statement can only be used within an enclosing iteration statement.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/continueNotInIterationStatement4.errors.txt b/tests/baselines/reference/continueNotInIterationStatement4.errors.txt
new file mode 100644
index 00000000000..91e7b26b578
--- /dev/null
+++ b/tests/baselines/reference/continueNotInIterationStatement4.errors.txt
@@ -0,0 +1,10 @@
+==== tests/cases/compiler/continueNotInIterationStatement4.ts (1 errors) ====
+    TWO:
+    while (true){
+      var x = () => {
+        continue TWO;
+        ~~~~~~~~~~~~~
+!!! Jump target cannot cross function boundary.
+      }
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/continueTarget1.errors.txt b/tests/baselines/reference/continueTarget1.errors.txt
new file mode 100644
index 00000000000..1b93d9fc707
--- /dev/null
+++ b/tests/baselines/reference/continueTarget1.errors.txt
@@ -0,0 +1,5 @@
+==== tests/cases/compiler/continueTarget1.ts (1 errors) ====
+    target:
+      continue target;
+      ~~~~~~~~~~~~~~~~
+!!! A 'continue' statement can only jump to a label of an enclosing iteration statement.
\ No newline at end of file
diff --git a/tests/baselines/reference/continueTarget2.js b/tests/baselines/reference/continueTarget2.js
new file mode 100644
index 00000000000..eb3b4118f7f
--- /dev/null
+++ b/tests/baselines/reference/continueTarget2.js
@@ -0,0 +1,10 @@
+//// [continueTarget2.ts]
+target:
+while (true) {
+  continue target;
+}
+
+//// [continueTarget2.js]
+target: while (true) {
+    continue target;
+}
diff --git a/tests/baselines/reference/continueTarget2.types b/tests/baselines/reference/continueTarget2.types
new file mode 100644
index 00000000000..16f45c402cd
--- /dev/null
+++ b/tests/baselines/reference/continueTarget2.types
@@ -0,0 +1,6 @@
+=== tests/cases/compiler/continueTarget2.ts ===
+target:
+No type information for this code.while (true) {
+No type information for this code.  continue target;
+No type information for this code.}
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/continueTarget3.js b/tests/baselines/reference/continueTarget3.js
new file mode 100644
index 00000000000..052b7b593c3
--- /dev/null
+++ b/tests/baselines/reference/continueTarget3.js
@@ -0,0 +1,11 @@
+//// [continueTarget3.ts]
+target1:
+target2:
+while (true) {
+  continue target1;
+}
+
+//// [continueTarget3.js]
+target1: target2: while (true) {
+    continue target1;
+}
diff --git a/tests/baselines/reference/continueTarget3.types b/tests/baselines/reference/continueTarget3.types
new file mode 100644
index 00000000000..a1b930f2f5a
--- /dev/null
+++ b/tests/baselines/reference/continueTarget3.types
@@ -0,0 +1,7 @@
+=== tests/cases/compiler/continueTarget3.ts ===
+target1:
+No type information for this code.target2:
+No type information for this code.while (true) {
+No type information for this code.  continue target1;
+No type information for this code.}
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/continueTarget4.js b/tests/baselines/reference/continueTarget4.js
new file mode 100644
index 00000000000..0f6211f9202
--- /dev/null
+++ b/tests/baselines/reference/continueTarget4.js
@@ -0,0 +1,11 @@
+//// [continueTarget4.ts]
+target1:
+target2:
+while (true) {
+  continue target2;
+}
+
+//// [continueTarget4.js]
+target1: target2: while (true) {
+    continue target2;
+}
diff --git a/tests/baselines/reference/continueTarget4.types b/tests/baselines/reference/continueTarget4.types
new file mode 100644
index 00000000000..ea1989a3e4d
--- /dev/null
+++ b/tests/baselines/reference/continueTarget4.types
@@ -0,0 +1,7 @@
+=== tests/cases/compiler/continueTarget4.ts ===
+target1:
+No type information for this code.target2:
+No type information for this code.while (true) {
+No type information for this code.  continue target2;
+No type information for this code.}
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/continueTarget5.errors.txt b/tests/baselines/reference/continueTarget5.errors.txt
new file mode 100644
index 00000000000..aa156707aa5
--- /dev/null
+++ b/tests/baselines/reference/continueTarget5.errors.txt
@@ -0,0 +1,11 @@
+==== tests/cases/compiler/continueTarget5.ts (1 errors) ====
+    target:
+    while (true) {
+      function f() {
+        while (true) {
+          continue target;
+          ~~~~~~~~~~~~~~~~
+!!! Jump target cannot cross function boundary.
+        }
+      }
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/continueTarget6.errors.txt b/tests/baselines/reference/continueTarget6.errors.txt
new file mode 100644
index 00000000000..2177e50523d
--- /dev/null
+++ b/tests/baselines/reference/continueTarget6.errors.txt
@@ -0,0 +1,6 @@
+==== tests/cases/compiler/continueTarget6.ts (1 errors) ====
+    while (true) {
+      continue target;
+      ~~~~~~~~~~~~~~~~
+!!! A 'continue' statement can only jump to a label of an enclosing iteration statement.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/convertKeywordsYes.errors.txt b/tests/baselines/reference/convertKeywordsYes.errors.txt
new file mode 100644
index 00000000000..a3502f6b52c
--- /dev/null
+++ b/tests/baselines/reference/convertKeywordsYes.errors.txt
@@ -0,0 +1,330 @@
+==== tests/cases/compiler/convertKeywordsYes.ts (8 errors) ====
+    // reserved ES5 future in strict mode
+    
+    var constructor = 0;
+    var any = 0;
+    var boolean = 0;
+    var implements = 0;
+    var interface = 0;
+    var let = 0;
+    var module = 0;
+    var number = 0;
+    var package = 0;
+    var private = 0;
+    var protected = 0;
+    var public = 0;
+    var set = 0;
+    var static = 0;
+    var string = 0;
+    var get = 0;
+    var yield = 0;
+    var declare = 0;
+    
+    function bigGeneric<
+        constructor,
+        any,
+        ~~~
+!!! Type parameter name cannot be 'any'
+        boolean,
+        ~~~~~~~
+!!! Type parameter name cannot be 'boolean'
+        implements ,
+        interface ,
+        let,
+        module ,
+        number,
+        ~~~~~~
+!!! Type parameter name cannot be 'number'
+        package,
+        private ,
+        protected,
+        public ,
+        set ,
+        static ,
+        string,
+        ~~~~~~
+!!! Type parameter name cannot be 'string'
+        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 ) { }
+    
+    var bigObject = {
+        constructor: 0,
+        any: 0,
+        boolean: 0,
+        implements: 0,
+        interface: 0,
+        let: 0,
+        module: 0,
+        number: 0,
+        package: 0,
+        private: 0,
+        protected: 0,
+        public: 0,
+        set: 0,
+        static: 0,
+        string: 0,
+        get: 0,
+        yield: 0,
+        break: 0,
+        case: 0,
+        catch: 0,
+        class: 0,
+        continue: 0,
+        const: 0,
+    
+        debugger: 0,
+        declare: 0,
+        default: 0,
+        delete: 0,
+        do: 0,
+        else: 0,
+        enum: 0,
+        export: 0,
+        extends: 0,
+        false: 0,
+        finally: 0,
+        for: 0,
+        function: 0,
+        if: 0,
+    
+        import: 0,
+        in: 0,
+        instanceof: 0,
+        new: 0,
+        null: 0,
+        return: 0,
+        super: 0,
+        switch: 0,
+        this: 0,
+        throw: 0,
+        true: 0,
+        try: 0,
+        typeof: 0,
+        var: 0,
+        void: 0,
+        while: 0,
+        with: 0,
+    };
+    
+    interface bigInterface {
+        constructor;
+        any;
+        boolean;
+        implements;
+        interface;
+        let;
+        module;
+        number;
+        package;
+        private;
+        protected;
+        public;
+        set;
+        static;
+        string;
+        get;
+        yield;
+        break;
+        case;
+        catch;
+        class;
+        continue;
+        const;
+    
+        debugger;
+        declare;
+        default;
+        delete;
+        do;
+        else;
+        enum;
+        export;
+        extends;
+        false;
+        finally;
+        for;
+        function;
+        if;
+    
+        import;
+        in;
+        instanceof;
+        new;
+        null;
+        return;
+        super;
+        switch;
+        this;
+        throw;
+        true;
+        try;
+        typeof;
+        var;
+        void;
+        while;
+        with;
+    }
+    
+    class bigClass {
+        public "constructor" = 0;
+        public any = 0;
+        public boolean = 0;
+        public implements = 0;
+        public interface = 0;
+        public let = 0;
+        public module = 0;
+        public number = 0;
+        public package = 0;
+        public private = 0;
+        public protected = 0;
+        public public = 0;
+        public set = 0;
+        public static = 0;
+        public string = 0;
+        public get = 0;
+        public yield = 0;
+        public break = 0;
+        public case = 0;
+        public catch = 0;
+        public class = 0;
+        public continue = 0;
+        public const = 0;
+        public debugger = 0;
+        public declare = 0;
+        public default = 0;
+        public delete = 0;
+        public do = 0;
+        public else = 0;
+        public enum = 0;
+        public export = 0;
+        public extends = 0;
+        public false = 0;
+        public finally = 0;
+        public for = 0;
+        public function = 0;
+        public if = 0;
+        public import = 0;
+        public in = 0;
+        public instanceof = 0;
+        public new = 0;
+        public null = 0;
+        public return = 0;
+        public super = 0;
+        public switch = 0;
+        public this = 0;
+        public throw = 0;
+        public true = 0;
+        public try = 0;
+        public typeof = 0;
+        public var = 0;
+        public void = 0;
+        public while = 0;
+        public with = 0;
+    }
+    
+    enum bigEnum {
+        constructor,
+        any,
+        boolean,
+        implements,
+        interface,
+        let,
+        module,
+        number,
+        package,
+        private,
+        protected,
+        public,
+        set,
+        static,
+        string,
+        get,
+        yield,
+        break,
+        case,
+        catch,
+        class,
+        continue,
+        const,
+    
+        debugger,
+        declare,
+        default,
+        delete,
+        do,
+        else,
+        enum,
+        export,
+        extends,
+        false,
+        finally,
+        for,
+        function,
+        if,
+    
+        import,
+        in,
+        instanceof,
+        new,
+        null,
+        return,
+        super,
+        switch,
+        this,
+        throw,
+        true,
+        try,
+        typeof,
+        var,
+        void,
+        while,
+        with,
+    }
+    
+    module bigModule {
+        class constructor { }
+        class any { }
+              ~~~
+!!! Class name cannot be 'any'
+        class boolean { }
+              ~~~~~~~
+!!! Class name cannot be 'boolean'
+        class implements { }
+        class interface { }
+        class let { }
+        class module { }
+        class number { }
+              ~~~~~~
+!!! Class name cannot be 'number'
+        class package { }
+        class private { }
+        class protected { }
+        class public { }
+        class set { }
+        class static { }
+        class string { }
+              ~~~~~~
+!!! Class name cannot be 'string'
+        class get { }
+        class yield { }
+        class declare { }
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/convertKeywordsYes.js b/tests/baselines/reference/convertKeywordsYes.js
index deae65b54c9..c58fec070cd 100644
--- a/tests/baselines/reference/convertKeywordsYes.js
+++ b/tests/baselines/reference/convertKeywordsYes.js
@@ -22,16 +22,20 @@ var declare = 0;
 
 function bigGeneric<
     constructor,
+    any,
+    boolean,
     implements ,
     interface ,
     let,
     module ,
+    number,
     package,
     private ,
     protected,
     public ,
     set ,
     static ,
+    string,
     get ,
     yield,
     declare
@@ -290,16 +294,20 @@ enum bigEnum {
 
 module bigModule {
     class constructor { }
+    class any { }
+    class boolean { }
     class implements { }
     class interface { }
     class let { }
     class module { }
+    class number { }
     class package { }
     class private { }
     class protected { }
     class public { }
     class set { }
     class static { }
+    class string { }
     class get { }
     class yield { }
     class declare { }
@@ -506,6 +514,16 @@ var bigModule;
         }
         return constructor;
     })();
+    var any = (function () {
+        function any() {
+        }
+        return any;
+    })();
+    var boolean = (function () {
+        function boolean() {
+        }
+        return boolean;
+    })();
     var implements = (function () {
         function implements() {
         }
@@ -526,6 +544,11 @@ var bigModule;
         }
         return module;
     })();
+    var number = (function () {
+        function number() {
+        }
+        return number;
+    })();
     var package = (function () {
         function package() {
         }
@@ -556,6 +579,11 @@ var bigModule;
         }
         return static;
     })();
+    var string = (function () {
+        function string() {
+        }
+        return string;
+    })();
     var get = (function () {
         function get() {
         }
diff --git a/tests/baselines/reference/convertKeywordsYes.types b/tests/baselines/reference/convertKeywordsYes.types
deleted file mode 100644
index 839c5b5f580..00000000000
--- a/tests/baselines/reference/convertKeywordsYes.types
+++ /dev/null
@@ -1,936 +0,0 @@
-=== tests/cases/compiler/convertKeywordsYes.ts ===
-// reserved ES5 future in strict mode
-
-var constructor = 0;
->constructor : number
-
-var any = 0;
->any : number
-
-var boolean = 0;
->boolean : number
-
-var implements = 0;
->implements : number
-
-var interface = 0;
->interface : number
-
-var let = 0;
->let : number
-
-var module = 0;
->module : number
-
-var number = 0;
->number : number
-
-var package = 0;
->package : number
-
-var private = 0;
->private : number
-
-var protected = 0;
->protected : number
-
-var public = 0;
->public : number
-
-var set = 0;
->set : number
-
-var static = 0;
->static : number
-
-var string = 0;
->string : number
-
-var get = 0;
->get : number
-
-var yield = 0;
->yield : number
-
-var declare = 0;
->declare : number
-
-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
-
-    b2: boolean,
->b2 : boolean
-
-    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; }
->{
-    constructor: 0,
-    any: 0,
-    boolean: 0,
-    implements: 0,
-    interface: 0,
-    let: 0,
-    module: 0,
-    number: 0,
-    package: 0,
-    private: 0,
-    protected: 0,
-    public: 0,
-    set: 0,
-    static: 0,
-    string: 0,
-    get: 0,
-    yield: 0,
-    break: 0,
-    case: 0,
-    catch: 0,
-    class: 0,
-    continue: 0,
-    const: 0,
-
-    debugger: 0,
-    declare: 0,
-    default: 0,
-    delete: 0,
-    do: 0,
-    else: 0,
-    enum: 0,
-    export: 0,
-    extends: 0,
-    false: 0,
-    finally: 0,
-    for: 0,
-    function: 0,
-    if: 0,
-
-    import: 0,
-    in: 0,
-    instanceof: 0,
-    new: 0,
-    null: 0,
-    return: 0,
-    super: 0,
-    switch: 0,
-    this: 0,
-    throw: 0,
-    true: 0,
-    try: 0,
-    typeof: 0,
-    var: 0,
-    void: 0,
-    while: 0,
-    with: 0,
-} : { 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; }
-
-    constructor: 0,
->constructor : number
-
-    any: 0,
->any : number
-
-    boolean: 0,
->boolean : number
-
-    implements: 0,
->implements : number
-
-    interface: 0,
->interface : number
-
-    let: 0,
->let : number
-
-    module: 0,
->module : number
-
-    number: 0,
->number : number
-
-    package: 0,
->package : number
-
-    private: 0,
->private : number
-
-    protected: 0,
->protected : number
-
-    public: 0,
->public : number
-
-    set: 0,
->set : number
-
-    static: 0,
->static : number
-
-    string: 0,
->string : number
-
-    get: 0,
->get : number
-
-    yield: 0,
->yield : number
-
-    break: 0,
->break : number
-
-    case: 0,
->case : number
-
-    catch: 0,
->catch : number
-
-    class: 0,
->class : number
-
-    continue: 0,
->continue : number
-
-    const: 0,
->const : number
-
-    debugger: 0,
->debugger : number
-
-    declare: 0,
->declare : number
-
-    default: 0,
->default : number
-
-    delete: 0,
->delete : number
-
-    do: 0,
->do : number
-
-    else: 0,
->else : number
-
-    enum: 0,
->enum : number
-
-    export: 0,
->export : number
-
-    extends: 0,
->extends : number
-
-    false: 0,
->false : number
-
-    finally: 0,
->finally : number
-
-    for: 0,
->for : number
-
-    function: 0,
->function : number
-
-    if: 0,
->if : number
-
-    import: 0,
->import : number
-
-    in: 0,
->in : number
-
-    instanceof: 0,
->instanceof : number
-
-    new: 0,
->new : number
-
-    null: 0,
->null : number
-
-    return: 0,
->return : number
-
-    super: 0,
->super : number
-
-    switch: 0,
->switch : number
-
-    this: 0,
->this : number
-
-    throw: 0,
->throw : number
-
-    true: 0,
->true : number
-
-    try: 0,
->try : number
-
-    typeof: 0,
->typeof : number
-
-    var: 0,
->var : number
-
-    void: 0,
->void : number
-
-    while: 0,
->while : number
-
-    with: 0,
->with : number
-
-};
-
-interface bigInterface {
->bigInterface : bigInterface
-
-    constructor;
->constructor : any
-
-    any;
->any : any
-
-    boolean;
->boolean : any
-
-    implements;
->implements : any
-
-    interface;
->interface : any
-
-    let;
->let : any
-
-    module;
->module : any
-
-    number;
->number : any
-
-    package;
->package : any
-
-    private;
->private : any
-
-    protected;
->protected : any
-
-    public;
->public : any
-
-    set;
->set : any
-
-    static;
->static : any
-
-    string;
->string : any
-
-    get;
->get : any
-
-    yield;
->yield : any
-
-    break;
->break : any
-
-    case;
->case : any
-
-    catch;
->catch : any
-
-    class;
->class : any
-
-    continue;
->continue : any
-
-    const;
->const : any
-
-    debugger;
->debugger : any
-
-    declare;
->declare : any
-
-    default;
->default : any
-
-    delete;
->delete : any
-
-    do;
->do : any
-
-    else;
->else : any
-
-    enum;
->enum : any
-
-    export;
->export : any
-
-    extends;
->extends : any
-
-    false;
->false : any
-
-    finally;
->finally : any
-
-    for;
->for : any
-
-    function;
->function : any
-
-    if;
->if : any
-
-    import;
->import : any
-
-    in;
->in : any
-
-    instanceof;
->instanceof : any
-
-    new;
->new : any
-
-    null;
->null : any
-
-    return;
->return : any
-
-    super;
->super : any
-
-    switch;
->switch : any
-
-    this;
->this : any
-
-    throw;
->throw : any
-
-    true;
->true : any
-
-    try;
->try : any
-
-    typeof;
->typeof : any
-
-    var;
->var : any
-
-    void;
->void : any
-
-    while;
->while : any
-
-    with;
->with : any
-}
-
-class bigClass {
->bigClass : bigClass
-
-    public "constructor" = 0;
-    public any = 0;
->any : number
-
-    public boolean = 0;
->boolean : number
-
-    public implements = 0;
->implements : number
-
-    public interface = 0;
->interface : number
-
-    public let = 0;
->let : number
-
-    public module = 0;
->module : number
-
-    public number = 0;
->number : number
-
-    public package = 0;
->package : number
-
-    public private = 0;
->private : number
-
-    public protected = 0;
->protected : number
-
-    public public = 0;
->public : number
-
-    public set = 0;
->set : number
-
-    public static = 0;
->static : number
-
-    public string = 0;
->string : number
-
-    public get = 0;
->get : number
-
-    public yield = 0;
->yield : number
-
-    public break = 0;
->break : number
-
-    public case = 0;
->case : number
-
-    public catch = 0;
->catch : number
-
-    public class = 0;
->class : number
-
-    public continue = 0;
->continue : number
-
-    public const = 0;
->const : number
-
-    public debugger = 0;
->debugger : number
-
-    public declare = 0;
->declare : number
-
-    public default = 0;
->default : number
-
-    public delete = 0;
->delete : number
-
-    public do = 0;
->do : number
-
-    public else = 0;
->else : number
-
-    public enum = 0;
->enum : number
-
-    public export = 0;
->export : number
-
-    public extends = 0;
->extends : number
-
-    public false = 0;
->false : number
-
-    public finally = 0;
->finally : number
-
-    public for = 0;
->for : number
-
-    public function = 0;
->function : number
-
-    public if = 0;
->if : number
-
-    public import = 0;
->import : number
-
-    public in = 0;
->in : number
-
-    public instanceof = 0;
->instanceof : number
-
-    public new = 0;
->new : number
-
-    public null = 0;
->null : number
-
-    public return = 0;
->return : number
-
-    public super = 0;
->super : number
-
-    public switch = 0;
->switch : number
-
-    public this = 0;
->this : number
-
-    public throw = 0;
->throw : number
-
-    public true = 0;
->true : number
-
-    public try = 0;
->try : number
-
-    public typeof = 0;
->typeof : number
-
-    public var = 0;
->var : number
-
-    public void = 0;
->void : number
-
-    public while = 0;
->while : number
-
-    public with = 0;
->with : number
-}
-
-enum bigEnum {
->bigEnum : bigEnum
-
-    constructor,
->constructor : bigEnum
-
-    any,
->any : bigEnum
-
-    boolean,
->boolean : bigEnum
-
-    implements,
->implements : bigEnum
-
-    interface,
->interface : bigEnum
-
-    let,
->let : bigEnum
-
-    module,
->module : bigEnum
-
-    number,
->number : bigEnum
-
-    package,
->package : bigEnum
-
-    private,
->private : bigEnum
-
-    protected,
->protected : bigEnum
-
-    public,
->public : bigEnum
-
-    set,
->set : bigEnum
-
-    static,
->static : bigEnum
-
-    string,
->string : bigEnum
-
-    get,
->get : bigEnum
-
-    yield,
->yield : bigEnum
-
-    break,
->break : bigEnum
-
-    case,
->case : bigEnum
-
-    catch,
->catch : bigEnum
-
-    class,
->class : bigEnum
-
-    continue,
->continue : bigEnum
-
-    const,
->const : bigEnum
-
-    debugger,
->debugger : bigEnum
-
-    declare,
->declare : bigEnum
-
-    default,
->default : bigEnum
-
-    delete,
->delete : bigEnum
-
-    do,
->do : bigEnum
-
-    else,
->else : bigEnum
-
-    enum,
->enum : bigEnum
-
-    export,
->export : bigEnum
-
-    extends,
->extends : bigEnum
-
-    false,
->false : bigEnum
-
-    finally,
->finally : bigEnum
-
-    for,
->for : bigEnum
-
-    function,
->function : bigEnum
-
-    if,
->if : bigEnum
-
-    import,
->import : bigEnum
-
-    in,
->in : bigEnum
-
-    instanceof,
->instanceof : bigEnum
-
-    new,
->new : bigEnum
-
-    null,
->null : bigEnum
-
-    return,
->return : bigEnum
-
-    super,
->super : bigEnum
-
-    switch,
->switch : bigEnum
-
-    this,
->this : bigEnum
-
-    throw,
->throw : bigEnum
-
-    true,
->true : bigEnum
-
-    try,
->try : bigEnum
-
-    typeof,
->typeof : bigEnum
-
-    var,
->var : bigEnum
-
-    void,
->void : bigEnum
-
-    while,
->while : bigEnum
-
-    with,
->with : bigEnum
-}
-
-module bigModule {
->bigModule : typeof bigModule
-
-    class constructor { }
->constructor : constructor
-
-    class implements { }
->implements : implements
-
-    class interface { }
->interface : interface
-
-    class let { }
->let : let
-
-    class module { }
->module : module
-
-    class package { }
->package : package
-
-    class private { }
->private : private
-
-    class protected { }
->protected : protected
-
-    class public { }
->public : public
-
-    class set { }
->set : set
-
-    class static { }
->static : static
-
-    class get { }
->get : get
-
-    class yield { }
->yield : yield
-
-    class declare { }
->declare : declare
-}
diff --git a/tests/baselines/reference/covariance1.types b/tests/baselines/reference/covariance1.types
index 44cdf018fee..b673b7afc31 100644
--- a/tests/baselines/reference/covariance1.types
+++ b/tests/baselines/reference/covariance1.types
@@ -17,7 +17,7 @@ module M {
 >X : X
 
     export function f(y:Y) { }
->f : (y: Y) => void
+>f : typeof f
 >y : Y
 >Y : Y
 
@@ -27,7 +27,7 @@ module M {
 
     f({x:a}); // ok
 >f({x:a}) : void
->f : (y: Y) => void
+>f : typeof f
 >{x:a} : { x: X; }
 >x : X
 >a : a
@@ -38,7 +38,7 @@ module M {
 
     f({x:b}); // ok covariant subtype
 >f({x:b}) : void
->f : (y: Y) => void
+>f : typeof f
 >{x:b} : { x: XX; }
 >x : XX
 >b : b
diff --git a/tests/baselines/reference/crashInresolveReturnStatement.types b/tests/baselines/reference/crashInresolveReturnStatement.types
index 6d31f15569b..6f25dcaea86 100644
--- a/tests/baselines/reference/crashInresolveReturnStatement.types
+++ b/tests/baselines/reference/crashInresolveReturnStatement.types
@@ -7,9 +7,9 @@ class WorkItemToolbar {
 
         WITDialogs.createCopyOfWorkItem();
 >WITDialogs.createCopyOfWorkItem() : void
->WITDialogs.createCopyOfWorkItem : () => void
+>WITDialogs.createCopyOfWorkItem : typeof createCopyOfWorkItem
 >WITDialogs : typeof WITDialogs
->createCopyOfWorkItem : () => void
+>createCopyOfWorkItem : typeof createCopyOfWorkItem
     }
 }
 class CreateCopyOfWorkItemDialog {
@@ -22,7 +22,7 @@ class CreateCopyOfWorkItemDialog {
     }
 }
 function createWorkItemDialog<P0>(dialogType: P0) {
->createWorkItemDialog : <P0>(dialogType: P0) => void
+>createWorkItemDialog : typeof createWorkItemDialog
 >P0 : P0
 >dialogType : P0
 >P0 : P0
@@ -31,11 +31,11 @@ class WITDialogs {
 >WITDialogs : WITDialogs
 
     public static createCopyOfWorkItem() {
->createCopyOfWorkItem : () => void
+>createCopyOfWorkItem : typeof createCopyOfWorkItem
 
         createWorkItemDialog(CreateCopyOfWorkItemDialog);
 >createWorkItemDialog(CreateCopyOfWorkItemDialog) : void
->createWorkItemDialog : <P0>(dialogType: P0) => void
+>createWorkItemDialog : typeof createWorkItemDialog
 >CreateCopyOfWorkItemDialog : typeof CreateCopyOfWorkItemDialog
     }
 }
diff --git a/tests/baselines/reference/cyclicModuleImport.js b/tests/baselines/reference/cyclicModuleImport.js
index 1c9b74eea4f..08f3c7d6147 100644
--- a/tests/baselines/reference/cyclicModuleImport.js
+++ b/tests/baselines/reference/cyclicModuleImport.js
@@ -20,24 +20,3 @@ declare module "MainModule" {
 
 
 //// [cyclicModuleImport.js]
-
-
-//// [cyclicModuleImport.d.ts]
-declare module "SubModule" {
-    import MainModule = require('MainModule');
-    class SubModule {
-        static StaticVar: number;
-        InstanceVar: number;
-        main: MainModule;
-        constructor();
-    }
-    export = SubModule;
-}
-declare module "MainModule" {
-    import SubModule = require('SubModule');
-    class MainModule {
-        SubModule: SubModule;
-        constructor();
-    }
-    export = MainModule;
-}
diff --git a/tests/baselines/reference/debugger.types b/tests/baselines/reference/debugger.types
index 8d46931bf8f..f53af948b67 100644
--- a/tests/baselines/reference/debugger.types
+++ b/tests/baselines/reference/debugger.types
@@ -2,7 +2,7 @@
 debugger;
 
 function foo() {
->foo : () => void
+>foo : typeof foo
 
     debugger;
 
diff --git a/tests/baselines/reference/declFileAccessors.types b/tests/baselines/reference/declFileAccessors.types
deleted file mode 100644
index 2d8524a21c3..00000000000
--- a/tests/baselines/reference/declFileAccessors.types
+++ /dev/null
@@ -1,160 +0,0 @@
-=== tests/cases/compiler/declFileAccessors_0.ts ===
-
-/** This is comment for c1*/
-export class c1 {
->c1 : c1
-
-    /** getter property*/
-    public get p3() {
->p3 : number
-
-        return 10;
-    }
-    /** setter property*/
-    public set p3(/** this is value*/value: number) {
->p3 : number
->value : number
-    }
-    /** private getter property*/
-    private get pp3() {
->pp3 : number
-
-        return 10;
-    }
-    /** private setter property*/
-    private set pp3(/** this is value*/value: number) {
->pp3 : number
->value : number
-    }
-    /** static getter property*/
-    static get s3() {
->s3 : number
-
-        return 10;
-    }
-    /** setter property*/
-    static set s3( /** this is value*/value: number) {
->s3 : number
->value : number
-    }
-    public get nc_p3() {
->nc_p3 : number
-
-        return 10;
-    }
-    public set nc_p3(value: number) {
->nc_p3 : number
->value : number
-    }
-    private get nc_pp3() {
->nc_pp3 : number
-
-        return 10;
-    }
-    private set nc_pp3(value: number) {
->nc_pp3 : number
->value : number
-    }
-    static get nc_s3() {
->nc_s3 : string
-
-        return "";
-    }
-    static set nc_s3(value: string) {
->nc_s3 : string
->value : string
-    }
-
-    // Only getter property
-    public get onlyGetter() {
->onlyGetter : number
-
-        return 10;
-    }
-
-    // Only setter property
-    public set onlySetter(value: number) {
->onlySetter : number
->value : number
-    }
-}
-
-=== tests/cases/compiler/declFileAccessors_1.ts ===
-/** This is comment for c2 - the global class*/
-class c2 {
->c2 : c2
-
-    /** getter property*/
-    public get p3() {
->p3 : number
-
-        return 10;
-    }
-    /** setter property*/
-    public set p3(/** this is value*/value: number) {
->p3 : number
->value : number
-    }
-    /** private getter property*/
-    private get pp3() {
->pp3 : number
-
-        return 10;
-    }
-    /** private setter property*/
-    private set pp3(/** this is value*/value: number) {
->pp3 : number
->value : number
-    }
-    /** static getter property*/
-    static get s3() {
->s3 : number
-
-        return 10;
-    }
-    /** setter property*/
-    static set s3( /** this is value*/value: number) {
->s3 : number
->value : number
-    }
-    public get nc_p3() {
->nc_p3 : number
-
-        return 10;
-    }
-    public set nc_p3(value: number) {
->nc_p3 : number
->value : number
-    }
-    private get nc_pp3() {
->nc_pp3 : number
-
-        return 10;
-    }
-    private set nc_pp3(value: number) {
->nc_pp3 : number
->value : number
-    }
-    static get nc_s3() {
->nc_s3 : string
-
-        return "";
-    }
-    static set nc_s3(value: string) {
->nc_s3 : string
->value : string
-    }
-
-    // Only getter property
-    public get onlyGetter() {
->onlyGetter : number
-
-        return 10;
-    }
-
-    // Only setter property
-    public set onlySetter(value: number) {
->onlySetter : number
->value : number
-    }
-}
diff --git a/tests/baselines/reference/declFileCallSignatures.types b/tests/baselines/reference/declFileCallSignatures.types
deleted file mode 100644
index 0fc0757aee1..00000000000
--- a/tests/baselines/reference/declFileCallSignatures.types
+++ /dev/null
@@ -1,117 +0,0 @@
-=== 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
-
-        /** this is comment for b*/
-        b: number): void;
->b : number
-}
-
-export interface ICallSignatureWithRestParameters {
->ICallSignatureWithRestParameters : ICallSignatureWithRestParameters
-
-    (a: string, ...rests: string[]): string;
->a : string
->rests : string[]
-}
-
-export interface ICallSignatureWithOverloads {
->ICallSignatureWithOverloads : ICallSignatureWithOverloads
-
-    (a: string): string;
->a : string
-
-    (a: number): number;
->a : number
-}
-
-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
-
-        /** this is comment for b*/
-        b: number): void;
->b : number
-}
-
-interface IGlobalCallSignatureWithRestParameters {
->IGlobalCallSignatureWithRestParameters : IGlobalCallSignatureWithRestParameters
-
-    (a: string, ...rests: string[]): string;
->a : string
->rests : string[]
-
-}
-
-interface IGlobalCallSignatureWithOverloads {
->IGlobalCallSignatureWithOverloads : IGlobalCallSignatureWithOverloads
-
-    (a: string): string;
->a : string
-
-    (a: number): number;
->a : number
-}
-
-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/declFileClassWithStaticMethodReturningConstructor.types b/tests/baselines/reference/declFileClassWithStaticMethodReturningConstructor.types
index 0f1b21efc9e..2de89b265c1 100644
--- a/tests/baselines/reference/declFileClassWithStaticMethodReturningConstructor.types
+++ b/tests/baselines/reference/declFileClassWithStaticMethodReturningConstructor.types
@@ -4,7 +4,7 @@ export class Enhancement {
 >Enhancement : Enhancement
 
     public static getType() {
->getType : () => typeof Enhancement
+>getType : typeof getType
 
         return this;
 >this : typeof Enhancement
diff --git a/tests/baselines/reference/declFileConstructSignatures.types b/tests/baselines/reference/declFileConstructSignatures.types
deleted file mode 100644
index 6ee19bfdcf7..00000000000
--- a/tests/baselines/reference/declFileConstructSignatures.types
+++ /dev/null
@@ -1,121 +0,0 @@
-=== 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
-
-        /** this is comment for b*/
-        b: number);
->b : number
-}
-
-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
-
-    new (a: number): number;
->a : number
-}
-
-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
-
-        /** this is comment for b*/
-        b: number);
->b : number
-}
-
-interface IGlobalConstructSignatureWithRestParameters {
->IGlobalConstructSignatureWithRestParameters : IGlobalConstructSignatureWithRestParameters
-
-    new (a: string, ...rests: string[]): string;
->a : string
->rests : string[]
-
-}
-
-interface IGlobalConstructSignatureWithOverloads {
->IGlobalConstructSignatureWithOverloads : IGlobalConstructSignatureWithOverloads
-
-    new (a: string): string;
->a : string
-
-    new (a: number): number;
->a : number
-}
-
-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/declFileConstructors.types b/tests/baselines/reference/declFileConstructors.types
deleted file mode 100644
index 723830bdeea..00000000000
--- a/tests/baselines/reference/declFileConstructors.types
+++ /dev/null
@@ -1,176 +0,0 @@
-=== tests/cases/compiler/declFileConstructors_0.ts ===
-
-export class SimpleConstructor {
->SimpleConstructor : SimpleConstructor
-
-    /** This comment should appear for foo*/
-    constructor() {
-    }
-}
-export class ConstructorWithParameters {
->ConstructorWithParameters : ConstructorWithParameters
-
-    /** This is comment for function signature*/
-    constructor(/** this is comment about a*/a: string,
->a : string
-
-        /** this is comment for b*/
-        b: number) {
->b : number
-
-        var d = a;
->d : string
->a : string
-    }
-}
-
-export class ConstructorWithRestParamters {
->ConstructorWithRestParamters : ConstructorWithRestParamters
-
-    constructor(a: string, ...rests: string[]) {
->a : string
->rests : string[]
-
-        return a + rests.join("");
->a + rests.join("") : string
->a : string
->rests.join("") : string
->rests.join : (separator?: string) => string
->rests : string[]
->join : (separator?: string) => string
-    }
-}
-
-export class ConstructorWithOverloads {
->ConstructorWithOverloads : ConstructorWithOverloads
-
-    constructor(a: string);
->a : string
-
-    constructor(a: number);
->a : number
-
-    constructor(a: any) {
->a : any
-    }
-}
-
-export class ConstructorWithPublicParameterProperty {
->ConstructorWithPublicParameterProperty : ConstructorWithPublicParameterProperty
-
-    constructor(public x: string) {
->x : string
-    }
-}
-
-export class ConstructorWithPrivateParameterProperty {
->ConstructorWithPrivateParameterProperty : ConstructorWithPrivateParameterProperty
-
-    constructor(private x: string) {
->x : string
-    }
-}
-
-export class ConstructorWithOptionalParameterProperty {
->ConstructorWithOptionalParameterProperty : ConstructorWithOptionalParameterProperty
-
-    constructor(public x?: string) {
->x : string
-    }
-}
-
-export class ConstructorWithParameterInitializer {
->ConstructorWithParameterInitializer : ConstructorWithParameterInitializer
-
-    constructor(public x = "hello") {
->x : string
-    }
-}
-
-=== tests/cases/compiler/declFileConstructors_1.ts ===
-class GlobalSimpleConstructor {
->GlobalSimpleConstructor : GlobalSimpleConstructor
-
-    /** This comment should appear for foo*/
-    constructor() {
-    }
-}
-class GlobalConstructorWithParameters {
->GlobalConstructorWithParameters : GlobalConstructorWithParameters
-
-    /** This is comment for function signature*/
-    constructor(/** this is comment about a*/a: string,
->a : string
-
-        /** this is comment for b*/
-        b: number) {
->b : number
-
-        var d = a;
->d : string
->a : string
-    }
-}
-
-class GlobalConstructorWithRestParamters {
->GlobalConstructorWithRestParamters : GlobalConstructorWithRestParamters
-
-    constructor(a: string, ...rests: string[]) {
->a : string
->rests : string[]
-
-        return a + rests.join("");
->a + rests.join("") : string
->a : string
->rests.join("") : string
->rests.join : (separator?: string) => string
->rests : string[]
->join : (separator?: string) => string
-    }
-}
-
-class GlobalConstructorWithOverloads {
->GlobalConstructorWithOverloads : GlobalConstructorWithOverloads
-
-    constructor(a: string);
->a : string
-
-    constructor(a: number);
->a : number
-
-    constructor(a: any) {
->a : any
-    }
-}
-
-class GlobalConstructorWithPublicParameterProperty {
->GlobalConstructorWithPublicParameterProperty : GlobalConstructorWithPublicParameterProperty
-
-    constructor(public x: string) {
->x : string
-    }
-}
-
-class GlobalConstructorWithPrivateParameterProperty {
->GlobalConstructorWithPrivateParameterProperty : GlobalConstructorWithPrivateParameterProperty
-
-    constructor(private x: string) {
->x : string
-    }
-}
-
-class GlobalConstructorWithOptionalParameterProperty {
->GlobalConstructorWithOptionalParameterProperty : GlobalConstructorWithOptionalParameterProperty
-
-    constructor(public x?: string) {
->x : string
-    }
-}
-
-class GlobalConstructorWithParameterInitializer {
->GlobalConstructorWithParameterInitializer : GlobalConstructorWithParameterInitializer
-
-    constructor(public x = "hello") {
->x : string
-    }
-}
diff --git a/tests/baselines/reference/declFileFunctions.types b/tests/baselines/reference/declFileFunctions.types
deleted file mode 100644
index 46281813eb0..00000000000
--- a/tests/baselines/reference/declFileFunctions.types
+++ /dev/null
@@ -1,142 +0,0 @@
-=== tests/cases/compiler/declFileFunctions_0.ts ===
-
-/** This comment should appear for foo*/
-export function foo() {
->foo : () => void
-}
-/** This is comment for function signature*/
-export function fooWithParameters(/** this is comment about a*/a: string,
->fooWithParameters : (a: string, b: number) => void
->a : string
-
-    /** this is comment for b*/
-    b: number) {
->b : number
-
-    var d = a;
->d : string
->a : string
-}
-export function fooWithRestParameters(a: string, ...rests: string[]) {
->fooWithRestParameters : (a: string, ...rests: string[]) => string
->a : string
->rests : string[]
-
-    return a + rests.join("");
->a + rests.join("") : string
->a : string
->rests.join("") : string
->rests.join : (separator?: string) => string
->rests : string[]
->join : (separator?: string) => string
-}
-
-export function fooWithOverloads(a: string): string;
->fooWithOverloads : { (a: string): string; (a: number): number; }
->a : string
-
-export function fooWithOverloads(a: number): number;
->fooWithOverloads : { (a: string): string; (a: number): number; }
->a : number
-
-export function fooWithOverloads(a: any): any {
->fooWithOverloads : { (a: string): string; (a: number): number; }
->a : any
-
-    return a;
->a : any
-}
-
-/** This comment should appear for nonExportedFoo*/
-function nonExportedFoo() {
->nonExportedFoo : () => void
-}
-/** This is comment for function signature*/
-function nonExportedFooWithParameters(/** this is comment about a*/a: string,
->nonExportedFooWithParameters : (a: string, b: number) => void
->a : string
-
-    /** this is comment for b*/
-    b: number) {
->b : number
-
-    var d = a;
->d : string
->a : string
-}
-function nonExportedFooWithRestParameters(a: string, ...rests: string[]) {
->nonExportedFooWithRestParameters : (a: string, ...rests: string[]) => string
->a : string
->rests : string[]
-
-    return a + rests.join("");
->a + rests.join("") : string
->a : string
->rests.join("") : string
->rests.join : (separator?: string) => string
->rests : string[]
->join : (separator?: string) => string
-}
-
-function nonExportedFooWithOverloads(a: string): string;
->nonExportedFooWithOverloads : { (a: string): string; (a: number): number; }
->a : string
-
-function nonExportedFooWithOverloads(a: number): number;
->nonExportedFooWithOverloads : { (a: string): string; (a: number): number; }
->a : number
-
-function nonExportedFooWithOverloads(a: any): any {
->nonExportedFooWithOverloads : { (a: string): string; (a: number): number; }
->a : any
-
-    return a;
->a : any
-}
-
-=== tests/cases/compiler/declFileFunctions_1.ts ===
-/** This comment should appear for foo*/
-function globalfoo() {
->globalfoo : () => void
-}
-/** This is comment for function signature*/
-function globalfooWithParameters(/** this is comment about a*/a: string,
->globalfooWithParameters : (a: string, b: number) => void
->a : string
-
-    /** this is comment for b*/
-    b: number) {
->b : number
-
-    var d = a;
->d : string
->a : string
-}
-function globalfooWithRestParameters(a: string, ...rests: string[]) {
->globalfooWithRestParameters : (a: string, ...rests: string[]) => string
->a : string
->rests : string[]
-
-    return a + rests.join("");
->a + rests.join("") : string
->a : string
->rests.join("") : string
->rests.join : (separator?: string) => string
->rests : string[]
->join : (separator?: string) => string
-}
-function globalfooWithOverloads(a: string): string;
->globalfooWithOverloads : { (a: string): string; (a: number): number; }
->a : string
-
-function globalfooWithOverloads(a: number): number;
->globalfooWithOverloads : { (a: string): string; (a: number): number; }
->a : number
-
-function globalfooWithOverloads(a: any): any {
->globalfooWithOverloads : { (a: string): string; (a: number): number; }
->a : any
-
-    return a;
->a : any
-}
diff --git a/tests/baselines/reference/declFileGenericType.types b/tests/baselines/reference/declFileGenericType.types
index 1e85eef3824..aaf5d5bf634 100644
--- a/tests/baselines/reference/declFileGenericType.types
+++ b/tests/baselines/reference/declFileGenericType.types
@@ -10,7 +10,7 @@ export module C {
 >B : B
     
     export function F<T>(x: T): A<B> { return null; }
->F : <T>(x: T) => A<B>
+>F : typeof F
 >T : T
 >x : T
 >T : T
@@ -18,7 +18,7 @@ export module C {
 >B : B
 
     export function F2<T>(x: T): C.A<C.B> { return null; }
->F2 : <T>(x: T) => A<B>
+>F2 : typeof F2
 >T : T
 >x : T
 >T : T
@@ -28,7 +28,7 @@ export module C {
 >B : B
 
     export function F3<T>(x: T): C.A<C.B>[] { return null; }
->F3 : <T>(x: T) => A<B>[]
+>F3 : typeof F3
 >T : T
 >x : T
 >T : T
@@ -38,7 +38,7 @@ export module C {
 >B : B
 
     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>[]
+>F4 : typeof F4
 >T : T
 >A : A<T>
 >B : B
@@ -51,12 +51,12 @@ export module C {
 >B : B
 
     export function F5<T>(): T { return null; }
->F5 : <T>() => T
+>F5 : typeof F5
 >T : T
 >T : T
 
     export function F6<T extends A<B>>(x: T): T { return null; }
->F6 : <T extends A<B>>(x: T) => T
+>F6 : typeof F6
 >T : T
 >A : A<T>
 >B : B
@@ -83,28 +83,28 @@ export var a: C.A<C.B>;
 >B : B
 
 export var b = C.F;
->b : <T>(x: T) => A<B>
->C.F : <T>(x: T) => A<B>
+>b : typeof F
+>C.F : typeof F
 >C : typeof C
->F : <T>(x: T) => A<B>
+>F : typeof F
 
 export var c = C.F2;
->c : <T>(x: T) => A<B>
->C.F2 : <T>(x: T) => A<B>
+>c : typeof F2
+>C.F2 : typeof F2
 >C : typeof C
->F2 : <T>(x: T) => A<B>
+>F2 : typeof F2
 
 export var d = C.F3;
->d : <T>(x: T) => A<B>[]
->C.F3 : <T>(x: T) => A<B>[]
+>d : typeof F3
+>C.F3 : typeof F3
 >C : typeof C
->F3 : <T>(x: T) => A<B>[]
+>F3 : typeof F3
 
 export var e = C.F4;
->e : <T extends A<B>>(x: T) => A<B>[]
->C.F4 : <T extends A<B>>(x: T) => A<B>[]
+>e : typeof F4
+>C.F4 : typeof F4
 >C : typeof C
->F4 : <T extends A<B>>(x: T) => A<B>[]
+>F4 : typeof F4
 
 export var x = (new C.D<C.A<C.B>>(new C.A<C.B>())).val;
 >x : A<B>
@@ -127,7 +127,7 @@ export var x = (new C.D<C.A<C.B>>(new C.A<C.B>())).val;
 >val : A<B>
 
 export function f<T extends C.A<C.B>>() { }
->f : <T extends A<B>>() => void
+>f : typeof f
 >T : T
 >C : C
 >A : A<T>
@@ -137,9 +137,9 @@ export function f<T extends C.A<C.B>>() { }
 export var g = C.F5<C.A<C.B>>();
 >g : A<B>
 >C.F5<C.A<C.B>>() : A<B>
->C.F5 : <T>() => T
+>C.F5 : typeof F5
 >C : typeof C
->F5 : <T>() => T
+>F5 : typeof F5
 >C : C
 >A : A<T>
 >C : C
@@ -160,8 +160,8 @@ export interface i extends C.A<C.B> { }
 >B : B
 
 export var j = C.F6;
->j : <T extends A<B>>(x: T) => T
->C.F6 : <T extends A<B>>(x: T) => T
+>j : typeof F6
+>C.F6 : typeof F6
 >C : typeof C
->F6 : <T extends A<B>>(x: T) => T
+>F6 : typeof F6
 
diff --git a/tests/baselines/reference/declFileImportChainInExportAssignment.js b/tests/baselines/reference/declFileImportChainInExportAssignment.js
deleted file mode 100644
index 73d8ede215a..00000000000
--- a/tests/baselines/reference/declFileImportChainInExportAssignment.js
+++ /dev/null
@@ -1,39 +0,0 @@
-//// [declFileImportChainInExportAssignment.ts]
-module m {
-    export module c {
-        export class c {
-        }
-    }
-}
-import a = m.c;
-import b = a;
-export = b;
-
-//// [declFileImportChainInExportAssignment.js]
-var m;
-(function (m) {
-    (function (_c) {
-        var c = (function () {
-            function c() {
-            }
-            return c;
-        })();
-        _c.c = c;
-    })(m.c || (m.c = {}));
-    var c = m.c;
-})(m || (m = {}));
-var a = m.c;
-var b = a;
-module.exports = b;
-
-
-//// [declFileImportChainInExportAssignment.d.ts]
-declare module m {
-    module c {
-        class c {
-        }
-    }
-}
-import a = m.c;
-import b = a;
-export = b;
diff --git a/tests/baselines/reference/declFileImportChainInExportAssignment.types b/tests/baselines/reference/declFileImportChainInExportAssignment.types
deleted file mode 100644
index 9f440c231ee..00000000000
--- a/tests/baselines/reference/declFileImportChainInExportAssignment.types
+++ /dev/null
@@ -1,24 +0,0 @@
-=== tests/cases/compiler/declFileImportChainInExportAssignment.ts ===
-module m {
->m : typeof m
-
-    export module c {
->c : typeof c
-
-        export class c {
->c : c
-        }
-    }
-}
-import a = m.c;
->a : typeof c
->m : typeof m
->c : typeof c
-
-import b = a;
->b : typeof c
->a : typeof c
-
-export = b;
->b : typeof c
-
diff --git a/tests/baselines/reference/declFileIndexSignatures.js b/tests/baselines/reference/declFileIndexSignatures.js
deleted file mode 100644
index 547c3f47060..00000000000
--- a/tests/baselines/reference/declFileIndexSignatures.js
+++ /dev/null
@@ -1,69 +0,0 @@
-//// [tests/cases/compiler/declFileIndexSignatures.ts] ////
-
-//// [declFileIndexSignatures_0.ts]
-
-export interface IStringIndexSignature {
-    [s: string]: string;
-}
-export interface INumberIndexSignature {
-    [n: number]: number;
-}
-
-export interface IBothIndexSignature {
-    [s: string]: any;
-    [n: number]: number;
-}
-
-export interface IIndexSignatureWithTypeParameter<T> {
-    [a: string]: T;
-}
-
-//// [declFileIndexSignatures_1.ts]
-interface IGlobalStringIndexSignature {
-    [s: string]: string;
-}
-interface IGlobalNumberIndexSignature {
-    [n: number]: number;
-}
-
-interface IGlobalBothIndexSignature {
-    [s: string]: any;
-    [n: number]: number;
-}
-
-interface IGlobalIndexSignatureWithTypeParameter<T> {
-    [a: string]: T;
-}
-
-//// [declFileIndexSignatures_0.js]
-//// [declFileIndexSignatures_1.js]
-
-
-//// [declFileIndexSignatures_0.d.ts]
-export interface IStringIndexSignature {
-    [s: string]: string;
-}
-export interface INumberIndexSignature {
-    [n: number]: number;
-}
-export interface IBothIndexSignature {
-    [s: string]: any;
-    [n: number]: number;
-}
-export interface IIndexSignatureWithTypeParameter<T> {
-    [a: string]: T;
-}
-//// [declFileIndexSignatures_1.d.ts]
-interface IGlobalStringIndexSignature {
-    [s: string]: string;
-}
-interface IGlobalNumberIndexSignature {
-    [n: number]: number;
-}
-interface IGlobalBothIndexSignature {
-    [s: string]: any;
-    [n: number]: number;
-}
-interface IGlobalIndexSignatureWithTypeParameter<T> {
-    [a: string]: T;
-}
diff --git a/tests/baselines/reference/declFileIndexSignatures.types b/tests/baselines/reference/declFileIndexSignatures.types
deleted file mode 100644
index c971fb4aeb0..00000000000
--- a/tests/baselines/reference/declFileIndexSignatures.types
+++ /dev/null
@@ -1,66 +0,0 @@
-=== 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
-
-    [n: number]: number;
->n : number
-}
-
-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
-
-    [n: number]: number;
->n : number
-}
-
-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
deleted file mode 100644
index 6432540f5a4..00000000000
--- a/tests/baselines/reference/declFileMethods.types
+++ /dev/null
@@ -1,447 +0,0 @@
-=== tests/cases/compiler/declFileMethods_0.ts ===
-
-export class c1 {
->c1 : c1
-
-    /** This comment should appear for foo*/
-    public foo() {
->foo : () => void
-    }
-    /** This is comment for function signature*/
-    public fooWithParameters(/** this is comment about a*/a: string,
->fooWithParameters : (a: string, b: number) => void
->a : string
-
-        /** this is comment for b*/
-        b: number) {
->b : number
-
-        var d = a;
->d : string
->a : string
-    }
-    public fooWithRestParameters(a: string, ...rests: string[]) {
->fooWithRestParameters : (a: string, ...rests: string[]) => string
->a : string
->rests : string[]
-
-        return a + rests.join("");
->a + rests.join("") : string
->a : string
->rests.join("") : string
->rests.join : (separator?: string) => string
->rests : string[]
->join : (separator?: string) => string
-    }
-
-    public fooWithOverloads(a: string): string;
->fooWithOverloads : { (a: string): string; (a: number): number; }
->a : string
-
-    public fooWithOverloads(a: number): number;
->fooWithOverloads : { (a: string): string; (a: number): number; }
->a : number
-
-    public fooWithOverloads(a: any): any {
->fooWithOverloads : { (a: string): string; (a: number): number; }
->a : any
-
-        return a;
->a : any
-    }
-
-
-    /** This comment should appear for privateFoo*/
-    private privateFoo() {
->privateFoo : () => void
-    }
-    /** This is comment for function signature*/
-    private privateFooWithParameters(/** this is comment about a*/a: string,
->privateFooWithParameters : (a: string, b: number) => void
->a : string
-
-        /** this is comment for b*/
-        b: number) {
->b : number
-
-        var d = a;
->d : string
->a : string
-    }
-    private privateFooWithRestParameters(a: string, ...rests: string[]) {
->privateFooWithRestParameters : (a: string, ...rests: string[]) => string
->a : string
->rests : string[]
-
-        return a + rests.join("");
->a + rests.join("") : string
->a : string
->rests.join("") : string
->rests.join : (separator?: string) => string
->rests : string[]
->join : (separator?: string) => string
-    }
-    private privateFooWithOverloads(a: string): string;
->privateFooWithOverloads : { (a: string): string; (a: number): number; }
->a : string
-
-    private privateFooWithOverloads(a: number): number;
->privateFooWithOverloads : { (a: string): string; (a: number): number; }
->a : number
-
-    private privateFooWithOverloads(a: any): any {
->privateFooWithOverloads : { (a: string): string; (a: number): number; }
->a : any
-
-        return a;
->a : any
-    }
-
-
-    /** This comment should appear for static foo*/
-    static staticFoo() {
->staticFoo : () => void
-    }
-    /** This is comment for function signature*/
-    static staticFooWithParameters(/** this is comment about a*/a: string,
->staticFooWithParameters : (a: string, b: number) => void
->a : string
-
-        /** this is comment for b*/
-        b: number) {
->b : number
-
-        var d = a;
->d : string
->a : string
-    }
-    static staticFooWithRestParameters(a: string, ...rests: string[]) {
->staticFooWithRestParameters : (a: string, ...rests: string[]) => string
->a : string
->rests : string[]
-
-        return a + rests.join("");
->a + rests.join("") : string
->a : string
->rests.join("") : string
->rests.join : (separator?: string) => string
->rests : string[]
->join : (separator?: string) => string
-    }
-    static staticFooWithOverloads(a: string): string;
->staticFooWithOverloads : { (a: string): string; (a: number): number; }
->a : string
-
-    static staticFooWithOverloads(a: number): number;
->staticFooWithOverloads : { (a: string): string; (a: number): number; }
->a : number
-
-    static staticFooWithOverloads(a: any): any {
->staticFooWithOverloads : { (a: string): string; (a: number): number; }
->a : any
-
-        return a;
->a : any
-    }
-
-
-    /** This comment should appear for privateStaticFoo*/
-    private static privateStaticFoo() {
->privateStaticFoo : () => void
-    }
-    /** This is comment for function signature*/
-    private static privateStaticFooWithParameters(/** this is comment about a*/a: string,
->privateStaticFooWithParameters : (a: string, b: number) => void
->a : string
-
-        /** this is comment for b*/
-        b: number) {
->b : number
-
-        var d = a;
->d : string
->a : string
-    }
-    private static privateStaticFooWithRestParameters(a: string, ...rests: string[]) {
->privateStaticFooWithRestParameters : (a: string, ...rests: string[]) => string
->a : string
->rests : string[]
-
-        return a + rests.join("");
->a + rests.join("") : string
->a : string
->rests.join("") : string
->rests.join : (separator?: string) => string
->rests : string[]
->join : (separator?: string) => string
-    }
-    private static privateStaticFooWithOverloads(a: string): string;
->privateStaticFooWithOverloads : { (a: string): string; (a: number): number; }
->a : string
-
-    private static privateStaticFooWithOverloads(a: number): number;
->privateStaticFooWithOverloads : { (a: string): string; (a: number): number; }
->a : number
-
-    private static privateStaticFooWithOverloads(a: any): any {
->privateStaticFooWithOverloads : { (a: string): string; (a: number): number; }
->a : any
-
-        return a;
->a : any
-    }
-}
-
-export interface I1 {
->I1 : I1
-
-    /** This comment should appear for foo*/
-    foo(): string;
->foo : () => string
-
-    /** This is comment for function signature*/
-    fooWithParameters(/** this is comment about a*/a: string,
->fooWithParameters : (a: string, b: number) => void
->a : string
-
-        /** this is comment for b*/
-        b: number): void;
->b : number
-
-    fooWithRestParameters(a: string, ...rests: string[]): string;
->fooWithRestParameters : (a: string, ...rests: string[]) => string
->a : string
->rests : string[]
-
-    fooWithOverloads(a: string): string;
->fooWithOverloads : { (a: string): string; (a: number): number; }
->a : string
-
-    fooWithOverloads(a: number): number;
->fooWithOverloads : { (a: string): string; (a: number): number; }
->a : number
-}
-
-=== tests/cases/compiler/declFileMethods_1.ts ===
-class c2 {
->c2 : c2
-
-    /** This comment should appear for foo*/
-    public foo() {
->foo : () => void
-    }
-    /** This is comment for function signature*/
-    public fooWithParameters(/** this is comment about a*/a: string,
->fooWithParameters : (a: string, b: number) => void
->a : string
-
-        /** this is comment for b*/
-        b: number) {
->b : number
-
-        var d = a;
->d : string
->a : string
-    }
-    public fooWithRestParameters(a: string, ...rests: string[]) {
->fooWithRestParameters : (a: string, ...rests: string[]) => string
->a : string
->rests : string[]
-
-        return a + rests.join("");
->a + rests.join("") : string
->a : string
->rests.join("") : string
->rests.join : (separator?: string) => string
->rests : string[]
->join : (separator?: string) => string
-    }
-
-    public fooWithOverloads(a: string): string;
->fooWithOverloads : { (a: string): string; (a: number): number; }
->a : string
-
-    public fooWithOverloads(a: number): number;
->fooWithOverloads : { (a: string): string; (a: number): number; }
->a : number
-
-    public fooWithOverloads(a: any): any {
->fooWithOverloads : { (a: string): string; (a: number): number; }
->a : any
-
-        return a;
->a : any
-    }
-
-
-    /** This comment should appear for privateFoo*/
-    private privateFoo() {
->privateFoo : () => void
-    }
-    /** This is comment for function signature*/
-    private privateFooWithParameters(/** this is comment about a*/a: string,
->privateFooWithParameters : (a: string, b: number) => void
->a : string
-
-        /** this is comment for b*/
-        b: number) {
->b : number
-
-        var d = a;
->d : string
->a : string
-    }
-    private privateFooWithRestParameters(a: string, ...rests: string[]) {
->privateFooWithRestParameters : (a: string, ...rests: string[]) => string
->a : string
->rests : string[]
-
-        return a + rests.join("");
->a + rests.join("") : string
->a : string
->rests.join("") : string
->rests.join : (separator?: string) => string
->rests : string[]
->join : (separator?: string) => string
-    }
-    private privateFooWithOverloads(a: string): string;
->privateFooWithOverloads : { (a: string): string; (a: number): number; }
->a : string
-
-    private privateFooWithOverloads(a: number): number;
->privateFooWithOverloads : { (a: string): string; (a: number): number; }
->a : number
-
-    private privateFooWithOverloads(a: any): any {
->privateFooWithOverloads : { (a: string): string; (a: number): number; }
->a : any
-
-        return a;
->a : any
-    }
-
-
-    /** This comment should appear for static foo*/
-    static staticFoo() {
->staticFoo : () => void
-    }
-    /** This is comment for function signature*/
-    static staticFooWithParameters(/** this is comment about a*/a: string,
->staticFooWithParameters : (a: string, b: number) => void
->a : string
-
-        /** this is comment for b*/
-        b: number) {
->b : number
-
-        var d = a;
->d : string
->a : string
-    }
-    static staticFooWithRestParameters(a: string, ...rests: string[]) {
->staticFooWithRestParameters : (a: string, ...rests: string[]) => string
->a : string
->rests : string[]
-
-        return a + rests.join("");
->a + rests.join("") : string
->a : string
->rests.join("") : string
->rests.join : (separator?: string) => string
->rests : string[]
->join : (separator?: string) => string
-    }
-    static staticFooWithOverloads(a: string): string;
->staticFooWithOverloads : { (a: string): string; (a: number): number; }
->a : string
-
-    static staticFooWithOverloads(a: number): number;
->staticFooWithOverloads : { (a: string): string; (a: number): number; }
->a : number
-
-    static staticFooWithOverloads(a: any): any {
->staticFooWithOverloads : { (a: string): string; (a: number): number; }
->a : any
-
-        return a;
->a : any
-    }
-
-
-    /** This comment should appear for privateStaticFoo*/
-    private static privateStaticFoo() {
->privateStaticFoo : () => void
-    }
-    /** This is comment for function signature*/
-    private static privateStaticFooWithParameters(/** this is comment about a*/a: string,
->privateStaticFooWithParameters : (a: string, b: number) => void
->a : string
-
-        /** this is comment for b*/
-        b: number) {
->b : number
-
-        var d = a;
->d : string
->a : string
-    }
-    private static privateStaticFooWithRestParameters(a: string, ...rests: string[]) {
->privateStaticFooWithRestParameters : (a: string, ...rests: string[]) => string
->a : string
->rests : string[]
-
-        return a + rests.join("");
->a + rests.join("") : string
->a : string
->rests.join("") : string
->rests.join : (separator?: string) => string
->rests : string[]
->join : (separator?: string) => string
-    }
-    private static privateStaticFooWithOverloads(a: string): string;
->privateStaticFooWithOverloads : { (a: string): string; (a: number): number; }
->a : string
-
-    private static privateStaticFooWithOverloads(a: number): number;
->privateStaticFooWithOverloads : { (a: string): string; (a: number): number; }
->a : number
-
-    private static privateStaticFooWithOverloads(a: any): any {
->privateStaticFooWithOverloads : { (a: string): string; (a: number): number; }
->a : any
-
-        return a;
->a : any
-    }
-}
-
-interface I2 {
->I2 : I2
-
-    /** This comment should appear for foo*/
-    foo(): string;
->foo : () => string
-
-    /** This is comment for function signature*/
-    fooWithParameters(/** this is comment about a*/a: string,
->fooWithParameters : (a: string, b: number) => void
->a : string
-
-        /** this is comment for b*/
-        b: number): void;
->b : number
-
-    fooWithRestParameters(a: string, ...rests: string[]): string;
->fooWithRestParameters : (a: string, ...rests: string[]) => string
->a : string
->rests : string[]
-
-    fooWithOverloads(a: string): string;
->fooWithOverloads : { (a: string): string; (a: number): number; }
->a : string
-
-    fooWithOverloads(a: number): number;
->fooWithOverloads : { (a: string): string; (a: number): number; }
->a : number
-}
-
diff --git a/tests/baselines/reference/declFileModuleAssignmentInObjectLiteralProperty.types b/tests/baselines/reference/declFileModuleAssignmentInObjectLiteralProperty.types
index f13397b1806..2b3d5d2656d 100644
--- a/tests/baselines/reference/declFileModuleAssignmentInObjectLiteralProperty.types
+++ b/tests/baselines/reference/declFileModuleAssignmentInObjectLiteralProperty.types
@@ -9,10 +9,7 @@ module m1 {
 }
 var d = {
 >d : { m1: { m: typeof m1; }; m2: { c: typeof c; }; }
->{
-    m1: { m: m1 },
-    m2: { c: m1.c },
-} : { m1: { m: typeof m1; }; m2: { c: typeof c; }; }
+>{    m1: { m: m1 },    m2: { c: m1.c },} : { m1: { m: typeof m1; }; m2: { c: typeof c; }; }
 
     m1: { m: m1 },
 >m1 : { m: typeof m1; }
diff --git a/tests/baselines/reference/declFileRestParametersOfFunctionAndFunctionType.types b/tests/baselines/reference/declFileRestParametersOfFunctionAndFunctionType.types
index ecb7c002089..41f709491d0 100644
--- a/tests/baselines/reference/declFileRestParametersOfFunctionAndFunctionType.types
+++ b/tests/baselines/reference/declFileRestParametersOfFunctionAndFunctionType.types
@@ -1,26 +1,26 @@
 === tests/cases/compiler/declFileRestParametersOfFunctionAndFunctionType.ts ===
 
 function f1(...args) { }
->f1 : (...args: any[]) => void
+>f1 : typeof f1
 >args : any[]
 
 function f2(x: (...args) => void) { }
->f2 : (x: (...args: any[]) => void) => void
+>f2 : typeof f2
 >x : (...args: any[]) => void
 >args : any[]
 
 function f3(x: { (...args): void }) { }
->f3 : (x: (...args: any[]) => void) => void
+>f3 : typeof f3
 >x : (...args: any[]) => void
 >args : any[]
 
 function f4<T extends (...args) => void>() { }
->f4 : <T extends (...args: any[]) => void>() => void
+>f4 : typeof f4
 >T : T
 >args : any[]
 
 function f5<T extends { (...args): void }>() { }
->f5 : <T extends (...args: any[]) => void>() => void
+>f5 : typeof f5
 >T : T
 >args : any[]
 
diff --git a/tests/baselines/reference/declFileTypeofFunction.types b/tests/baselines/reference/declFileTypeofFunction.types
index a157f80074c..0a2dae318e9 100644
--- a/tests/baselines/reference/declFileTypeofFunction.types
+++ b/tests/baselines/reference/declFileTypeofFunction.types
@@ -1,31 +1,31 @@
 === tests/cases/compiler/declFileTypeofFunction.ts ===
 
 function f(n: typeof f): string;
->f : { (n: typeof f): string; (n: { (n: typeof g): number; (n: typeof f): number; }): string; }
->n : { (n: typeof f): string; (n: { (n: typeof g): number; (n: typeof f): number; }): string; }
->f : { (n: typeof f): string; (n: { (n: typeof g): number; (n: typeof f): number; }): string; }
+>f : typeof f
+>n : typeof f
+>f : typeof f
 
 function f(n: typeof g): string;
->f : { (n: typeof f): string; (n: { (n: typeof g): number; (n: typeof f): number; }): string; }
->n : { (n: typeof g): number; (n: { (n: typeof f): string; (n: typeof g): string; }): number; }
->g : { (n: typeof g): number; (n: { (n: typeof f): string; (n: typeof g): string; }): number; }
+>f : typeof f
+>n : typeof g
+>g : typeof g
 
 function f() { return undefined; }
->f : { (n: typeof f): string; (n: { (n: typeof g): number; (n: typeof f): number; }): string; }
+>f : typeof f
 >undefined : undefined
 
 function g(n: typeof g): number;
->g : { (n: typeof g): number; (n: { (n: typeof f): string; (n: typeof g): string; }): number; }
->n : { (n: typeof g): number; (n: { (n: typeof f): string; (n: typeof g): string; }): number; }
->g : { (n: typeof g): number; (n: { (n: typeof f): string; (n: typeof g): string; }): number; }
+>g : typeof g
+>n : typeof g
+>g : typeof g
 
 function g(n: typeof f): number;
->g : { (n: typeof g): number; (n: { (n: typeof f): string; (n: typeof g): string; }): number; }
->n : { (n: typeof f): string; (n: { (n: typeof g): number; (n: typeof f): number; }): string; }
->f : { (n: typeof f): string; (n: { (n: typeof g): number; (n: typeof f): number; }): string; }
+>g : typeof g
+>n : typeof f
+>f : typeof f
 
 function g() { return undefined; }
->g : { (n: typeof g): number; (n: { (n: typeof f): string; (n: typeof g): string; }): number; }
+>g : typeof g
 >undefined : undefined
 
 var b: () => typeof b;
@@ -33,47 +33,43 @@ var b: () => typeof b;
 >b : any
 
 function b1() {
->b1 : () => typeof b1
+>b1 : typeof b1
 
     return b1;
->b1 : () => typeof b1
+>b1 : typeof b1
 }
 
 function foo(): typeof foo {
->foo : () => typeof foo
->foo : () => typeof foo
+>foo : typeof foo
+>foo : typeof foo
 
     return null;
 }
 var foo1: typeof foo;
->foo1 : () => typeof foo
->foo : () => typeof foo
+>foo1 : typeof foo
+>foo : typeof foo
 
 var foo2 = foo;
->foo2 : () => typeof foo
->foo : () => typeof foo
+>foo2 : typeof foo
+>foo : typeof foo
 
 var foo3 = function () {
 >foo3 : any
->function () {
-    return foo3;
-} : () => any
+>function () {    return foo3;} : () => any
 
     return foo3;
 >foo3 : any
 }
 var x = () => {
 >x : any
->() => {
-    return x;
-} : () => any
+>() => {    return x;} : () => any
 
     return x;
 >x : any
 }
 
 function foo5(x: number) {
->foo5 : (x: number) => (x: number) => number
+>foo5 : typeof foo5
 >x : number
 
     function bar(x: number) {
diff --git a/tests/baselines/reference/declFileTypeofInAnonymousType.types b/tests/baselines/reference/declFileTypeofInAnonymousType.types
index f029dc22048..1112946a157 100644
--- a/tests/baselines/reference/declFileTypeofInAnonymousType.types
+++ b/tests/baselines/reference/declFileTypeofInAnonymousType.types
@@ -27,10 +27,7 @@ var a: { c: m1.c; };
 
 var b = {
 >b : { c: typeof c; m1: typeof m1; }
->{
-    c: m1.c,
-    m1: m1
-} : { c: typeof c; m1: typeof m1; }
+>{    c: m1.c,    m1: m1} : { c: typeof c; m1: typeof m1; }
 
     c: m1.c,
 >c : typeof c
@@ -51,12 +48,7 @@ var c = { m1: m1 };
 
 var d = {
 >d : { m: { mod: typeof m1; }; mc: { cl: typeof c; }; me: { en: typeof e; }; mh: e; }
->{
-    m: { mod: m1 },
-    mc: { cl: m1.c },
-    me: { en: m1.e },
-    mh: m1.e.holiday
-} : { m: { mod: typeof m1; }; mc: { cl: typeof c; }; me: { en: typeof e; }; mh: e; }
+>{    m: { mod: m1 },    mc: { cl: m1.c },    me: { en: m1.e },    mh: m1.e.holiday} : { m: { mod: typeof m1; }; mc: { cl: typeof c; }; me: { en: typeof e; }; mh: e; }
 
     m: { mod: m1 },
 >m : { mod: typeof m1; }
diff --git a/tests/baselines/reference/declarationEmit_nameConflicts.errors.txt b/tests/baselines/reference/declarationEmit_nameConflicts.errors.txt
new file mode 100644
index 00000000000..6a202ec3e60
--- /dev/null
+++ b/tests/baselines/reference/declarationEmit_nameConflicts.errors.txt
@@ -0,0 +1,53 @@
+==== tests/cases/compiler/declarationEmit_nameConflicts_0.ts (1 errors) ====
+    import im = require('declarationEmit_nameConflicts_1');
+    export module M {
+        export function f() { }
+        export class C { }
+        export module N {
+            export function g() { };
+            export interface I { }
+        }
+    
+        export import a = M.f;
+        export import b = M.C;
+        export import c = N;
+        export import d = im;
+        ~~~~~~~~~~~~~~~~~~~~~
+!!! Cannot find name 'im'.
+    }
+    
+    export module M.P {
+        export function f() { }
+        export class C { }
+        export module N {
+            export function g() { };
+            export interface I { }
+        }
+        export import im = M.P.f;
+        // Bug 887180: Invalid .d.ts when an aliased entity is referenced, and a different entity is closer in scope
+        export var a = M.a; // emitted incorrectly as typeof f
+        export var b = M.b; // ok
+        export var c = M.c; // ok
+        export var g = M.c.g; // ok
+        export var d = M.d; // emitted incorrectly as typeof im
+    }
+    
+    export module M.Q {
+        export function f() { }
+        export class C { }
+        export module N {
+            export function g() { };
+            export interface I { }
+        }
+        export interface b extends M.b { } // ok
+        export interface I extends M.c.I { } // ok
+        export module c {
+            export interface I extends M.c.I { } // ok
+        }
+    }
+==== tests/cases/compiler/declarationEmit_nameConflicts_1.ts (1 errors) ====
+    function f() { }
+    export = f;
+    ~~~~~~~~~~~
+!!! Cannot compile external modules unless the '--module' flag is provided.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/declarationEmit_nameConflicts.types b/tests/baselines/reference/declarationEmit_nameConflicts.types
deleted file mode 100644
index 2b6a8d21827..00000000000
--- a/tests/baselines/reference/declarationEmit_nameConflicts.types
+++ /dev/null
@@ -1,148 +0,0 @@
-=== tests/cases/compiler/declarationEmit_nameConflicts_0.ts ===
-import im = require('declarationEmit_nameConflicts_1');
->im : typeof f
-
-export module M {
->M : typeof M
-
-    export function f() { }
->f : () => void
-
-    export class C { }
->C : C
-
-    export module N {
->N : typeof N
-
-        export function g() { };
->g : () => void
-
-        export interface I { }
->I : I
-    }
-
-    export import a = M.f;
->a : () => void
->M : typeof M
->f : () => void
-
-    export import b = M.C;
->b : typeof C
->M : typeof M
->C : C
-
-    export import c = N;
->c : typeof N
->N : typeof N
-
-    export import d = im;
->d : typeof f
->im : typeof f
-}
-
-export module M.P {
->M : typeof M
->P : typeof P
-
-    export function f() { }
->f : () => void
-
-    export class C { }
->C : C
-
-    export module N {
->N : typeof N
-
-        export function g() { };
->g : () => void
-
-        export interface I { }
->I : I
-    }
-    export import im = M.P.f;
->im : () => void
->M : typeof M
->P : typeof P
->f : () => void
-
-    export var a = M.a; // emitted incorrectly as typeof f
->a : () => void
->M.a : () => void
->M : typeof M
->a : () => void
-
-    export var b = M.b; // ok
->b : typeof C
->M.b : typeof C
->M : typeof M
->b : typeof C
-
-    export var c = M.c; // ok
->c : typeof N
->M.c : typeof N
->M : typeof M
->c : typeof N
-
-    export var g = M.c.g; // ok
->g : () => void
->M.c.g : () => void
->M.c : typeof N
->M : typeof M
->c : typeof N
->g : () => void
-
-    export var d = M.d; // emitted incorrectly as typeof im
->d : typeof f
->M.d : typeof f
->M : typeof M
->d : typeof f
-}
-
-export module M.Q {
->M : typeof M
->Q : typeof Q
-
-    export function f() { }
->f : () => void
-
-    export class C { }
->C : C
-
-    export module N {
->N : typeof N
-
-        export function g() { };
->g : () => void
-
-        export interface I { }
->I : I
-    }
-    export interface b extends M.b { } // ok
->b : b
->M : M
->b : C
-
-    export interface I extends M.c.I { } // ok
->I : I
->M : M
->c : c
->I : I
-
-    export module c {
->c : c
-
-        export interface I extends M.c.I { } // ok
->I : I
->M : M
->c : c
->I : I
-    }
-}
-=== tests/cases/compiler/declarationEmit_nameConflicts_1.ts ===
-module f { export class c { } }
->f : typeof f
->c : c
-
-export = f;
->f : typeof f
-
diff --git a/tests/baselines/reference/declarationEmit_nameConflicts2.js b/tests/baselines/reference/declarationEmit_nameConflicts2.js
index 7b8e1ce17c9..b60514e8076 100644
--- a/tests/baselines/reference/declarationEmit_nameConflicts2.js
+++ b/tests/baselines/reference/declarationEmit_nameConflicts2.js
@@ -9,6 +9,7 @@ module X.Y.base {
 }
 
 module X.Y.base.Z {
+    // Bug 887180
     export var f = X.Y.base.f; // Should be base.f
     export var C = X.Y.base.C; // Should be base.C
     export var M = X.Y.base.M; // Should be base.M
diff --git a/tests/baselines/reference/declarationEmit_nameConflicts2.types b/tests/baselines/reference/declarationEmit_nameConflicts2.types
index d1422468dd3..9daf65b530a 100644
--- a/tests/baselines/reference/declarationEmit_nameConflicts2.types
+++ b/tests/baselines/reference/declarationEmit_nameConflicts2.types
@@ -5,7 +5,7 @@ module X.Y.base {
 >base : typeof base
 
     export function f() { }
->f : () => void
+>f : typeof f
 
     export class C { }
 >C : C
@@ -26,15 +26,16 @@ module X.Y.base.Z {
 >base : typeof base
 >Z : typeof Z
 
+    // Bug 887180
     export var f = X.Y.base.f; // Should be base.f
->f : () => void
->X.Y.base.f : () => void
+>f : typeof f
+>X.Y.base.f : typeof f
 >X.Y.base : typeof base
 >X.Y : typeof Y
 >X : typeof X
 >Y : typeof Y
 >base : typeof base
->f : () => void
+>f : typeof f
 
     export var C = X.Y.base.C; // Should be base.C
 >C : typeof C
diff --git a/tests/baselines/reference/declarationEmit_nameConflicts3.js b/tests/baselines/reference/declarationEmit_nameConflicts3.js
index a8dc1217ef4..e4d4feddc99 100644
--- a/tests/baselines/reference/declarationEmit_nameConflicts3.js
+++ b/tests/baselines/reference/declarationEmit_nameConflicts3.js
@@ -20,6 +20,7 @@ module M.P {
     export enum D {
         f
     }
+    // Bug 887180
     export var v: M.D; // ok
     export var w = M.D.f; // error, should be typeof M.D.f
     export var x = M.C.f; // error, should be typeof M.C.f
diff --git a/tests/baselines/reference/declarationEmit_nameConflicts3.types b/tests/baselines/reference/declarationEmit_nameConflicts3.types
index f474b19288e..1021b10f79f 100644
--- a/tests/baselines/reference/declarationEmit_nameConflicts3.types
+++ b/tests/baselines/reference/declarationEmit_nameConflicts3.types
@@ -9,19 +9,19 @@ module M {
 >D : typeof D
 
         export function f() { }
->f : () => void
+>f : typeof f
     }
     export module C {
 >C : typeof C
 
         export function f() { }
->f : () => void
+>f : typeof f
     }
     export module E {
 >E : typeof E
 
         export function f() { }
->f : () => void
+>f : typeof f
     }
 }
 
@@ -33,7 +33,7 @@ module M.P {
 >C : C
 
         static f() { }
->f : () => void
+>f : typeof f
     }
     export class E extends C { }
 >E : E
@@ -45,32 +45,33 @@ module M.P {
         f
 >f : D
     }
+    // Bug 887180
     export var v: M.D; // ok
 >v : D
 >M : M
 >D : D
 
     export var w = M.D.f; // error, should be typeof M.D.f
->w : () => void
->M.D.f : () => void
+>w : typeof f
+>M.D.f : typeof f
 >M.D : typeof D
 >M : typeof M
 >D : typeof D
->f : () => void
+>f : typeof f
 
     export var x = M.C.f; // error, should be typeof M.C.f
->x : () => void
->M.C.f : () => void
+>x : typeof f
+>M.C.f : typeof f
 >M.C : typeof C
 >M : typeof M
 >C : typeof C
->f : () => void
+>f : typeof f
 
     export var x = M.E.f; // error, should be typeof M.E.f
->x : () => void
->M.E.f : () => void
+>x : typeof f
+>M.E.f : typeof f
 >M.E : typeof E
 >M : typeof M
 >E : typeof E
->f : () => void
+>f : typeof f
 }
diff --git a/tests/baselines/reference/declarationEmit_nameConflictsWithAlias.errors.txt b/tests/baselines/reference/declarationEmit_nameConflictsWithAlias.errors.txt
new file mode 100644
index 00000000000..7a62ea58b2d
--- /dev/null
+++ b/tests/baselines/reference/declarationEmit_nameConflictsWithAlias.errors.txt
@@ -0,0 +1,10 @@
+==== tests/cases/compiler/declarationEmit_nameConflictsWithAlias.ts (1 errors) ====
+    // Bug 887180
+    export module C { export interface I { } }
+                  ~
+!!! Cannot compile external modules unless the '--module' flag is provided.
+    export import v = C;
+    export module M {
+        export module C { export interface I { } }
+        export var w: v.I; // Gets emitted as C.I, which is the wrong interface
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/declarationEmit_nameConflictsWithAlias.types b/tests/baselines/reference/declarationEmit_nameConflictsWithAlias.types
deleted file mode 100644
index bd905943f4f..00000000000
--- a/tests/baselines/reference/declarationEmit_nameConflictsWithAlias.types
+++ /dev/null
@@ -1,21 +0,0 @@
-=== tests/cases/compiler/declarationEmit_nameConflictsWithAlias.ts ===
-export module C { export interface I { } }
->C : C
->I : I
-
-export import v = C;
->v : v
->C : C
-
-export module M {
->M : typeof M
-
-    export module C { export interface I { } }
->C : C
->I : I
-
-    export var w: v.I; // Gets emitted as C.I, which is the wrong interface
->w : I
->v : v
->I : I
-}
diff --git a/tests/baselines/reference/declareFileExportAssignmentWithVarFromVariableStatement.js b/tests/baselines/reference/declareFileExportAssignmentWithVarFromVariableStatement.js
deleted file mode 100644
index c4acd795453..00000000000
--- a/tests/baselines/reference/declareFileExportAssignmentWithVarFromVariableStatement.js
+++ /dev/null
@@ -1,41 +0,0 @@
-//// [declareFileExportAssignmentWithVarFromVariableStatement.ts]
-module m2 {
-    export interface connectModule {
-        (res, req, next): void;
-    }
-    export interface connectExport {
-        use: (mod: connectModule) => connectExport;
-        listen: (port: number) => void;
-    }
-
-}
-
-var x = 10, m2: {
-    (): m2.connectExport;
-    test1: m2.connectModule;
-    test2(): m2.connectModule;
-};
-
-export = m2;
-
-//// [declareFileExportAssignmentWithVarFromVariableStatement.js]
-var x = 10, m2;
-module.exports = m2;
-
-
-//// [declareFileExportAssignmentWithVarFromVariableStatement.d.ts]
-declare module m2 {
-    interface connectModule {
-        (res: any, req: any, next: any): void;
-    }
-    interface connectExport {
-        use: (mod: connectModule) => connectExport;
-        listen: (port: number) => void;
-    }
-}
-declare var m2: {
-    (): m2.connectExport;
-    test1: m2.connectModule;
-    test2(): m2.connectModule;
-};
-export = m2;
diff --git a/tests/baselines/reference/declareFileExportAssignmentWithVarFromVariableStatement.types b/tests/baselines/reference/declareFileExportAssignmentWithVarFromVariableStatement.types
deleted file mode 100644
index 0b173f89f16..00000000000
--- a/tests/baselines/reference/declareFileExportAssignmentWithVarFromVariableStatement.types
+++ /dev/null
@@ -1,51 +0,0 @@
-=== 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
->port : number
-    }
-
-}
-
-var x = 10, m2: {
->x : number
->m2 : { (): connectExport; test1: connectModule; test2(): connectModule; }
-
-    (): m2.connectExport;
->m2 : m2
->connectExport : connectExport
-
-    test1: m2.connectModule;
->test1 : connectModule
->m2 : m2
->connectModule : connectModule
-
-    test2(): m2.connectModule;
->test2 : () => connectModule
->m2 : m2
->connectModule : connectModule
-
-};
-
-export = m2;
->m2 : { (): connectExport; test1: connectModule; test2(): connectModule; }
-
diff --git a/tests/baselines/reference/deleteOperatorWithBooleanType.types b/tests/baselines/reference/deleteOperatorWithBooleanType.types
index fa8c375b0a5..eb5d657fcee 100644
--- a/tests/baselines/reference/deleteOperatorWithBooleanType.types
+++ b/tests/baselines/reference/deleteOperatorWithBooleanType.types
@@ -4,7 +4,7 @@ var BOOLEAN: boolean;
 >BOOLEAN : boolean
 
 function foo(): boolean { return true; }
->foo : () => boolean
+>foo : typeof foo
 
 class A {
 >A : A
@@ -13,7 +13,7 @@ class A {
 >a : boolean
 
     static foo() { return false; }
->foo : () => boolean
+>foo : typeof foo
 }
 module M {
 >M : typeof M
@@ -64,15 +64,15 @@ var ResultIsBoolean6 = delete foo();
 >ResultIsBoolean6 : boolean
 >delete foo() : boolean
 >foo() : boolean
->foo : () => boolean
+>foo : typeof foo
 
 var ResultIsBoolean7 = delete A.foo();
 >ResultIsBoolean7 : boolean
 >delete A.foo() : boolean
 >A.foo() : boolean
->A.foo : () => boolean
+>A.foo : typeof foo
 >A : typeof A
->foo : () => boolean
+>foo : typeof foo
 
 // multiple delete  operator
 var ResultIsBoolean8 = delete delete BOOLEAN;
@@ -92,7 +92,7 @@ delete BOOLEAN;
 delete foo();
 >delete foo() : boolean
 >foo() : boolean
->foo : () => boolean
+>foo : typeof foo
 
 delete true, false;
 >delete true, false : boolean
diff --git a/tests/baselines/reference/deleteOperatorWithNumberType.types b/tests/baselines/reference/deleteOperatorWithNumberType.types
index 542efe04c34..f367ef438b0 100644
--- a/tests/baselines/reference/deleteOperatorWithNumberType.types
+++ b/tests/baselines/reference/deleteOperatorWithNumberType.types
@@ -8,7 +8,7 @@ var NUMBER1: number[] = [1, 2];
 >[1, 2] : number[]
 
 function foo(): number { return 1; }
->foo : () => number
+>foo : typeof foo
 
 class A {
 >A : A
@@ -17,7 +17,7 @@ class A {
 >a : number
 
     static foo() { return 1; }
->foo : () => number
+>foo : typeof foo
 }
 module M {
 >M : typeof M
@@ -89,15 +89,15 @@ var ResultIsBoolean9 = delete foo();
 >ResultIsBoolean9 : boolean
 >delete foo() : boolean
 >foo() : number
->foo : () => number
+>foo : typeof foo
 
 var ResultIsBoolean10 = delete A.foo();
 >ResultIsBoolean10 : boolean
 >delete A.foo() : boolean
 >A.foo() : number
->A.foo : () => number
+>A.foo : typeof foo
 >A : typeof A
->foo : () => number
+>foo : typeof foo
 
 var ResultIsBoolean11 = delete (NUMBER + NUMBER);
 >ResultIsBoolean11 : boolean
@@ -139,7 +139,7 @@ delete NUMBER1;
 delete foo();
 >delete foo() : boolean
 >foo() : number
->foo : () => number
+>foo : typeof foo
 
 delete objA.a;
 >delete objA.a : boolean
diff --git a/tests/baselines/reference/deleteOperatorWithStringType.types b/tests/baselines/reference/deleteOperatorWithStringType.types
index f86afc39c49..17d0a77aa56 100644
--- a/tests/baselines/reference/deleteOperatorWithStringType.types
+++ b/tests/baselines/reference/deleteOperatorWithStringType.types
@@ -8,7 +8,7 @@ var STRING1: string[] = ["", "abc"];
 >["", "abc"] : string[]
 
 function foo(): string { return "abc"; }
->foo : () => string
+>foo : typeof foo
 
 class A {
 >A : A
@@ -17,7 +17,7 @@ class A {
 >a : string
 
     static foo() { return ""; }
->foo : () => string
+>foo : typeof foo
 }
 module M {
 >M : typeof M
@@ -89,15 +89,15 @@ var ResultIsBoolean9 = delete foo();
 >ResultIsBoolean9 : boolean
 >delete foo() : boolean
 >foo() : string
->foo : () => string
+>foo : typeof foo
 
 var ResultIsBoolean10 = delete A.foo();
 >ResultIsBoolean10 : boolean
 >delete A.foo() : boolean
 >A.foo() : string
->A.foo : () => string
+>A.foo : typeof foo
 >A : typeof A
->foo : () => string
+>foo : typeof foo
 
 var ResultIsBoolean11 = delete (STRING + STRING);
 >ResultIsBoolean11 : boolean
@@ -147,7 +147,7 @@ delete STRING1;
 delete foo();
 >delete foo() : boolean
 >foo() : string
->foo : () => string
+>foo : typeof foo
 
 delete objA.a,M.n;
 >delete objA.a,M.n : string
diff --git a/tests/baselines/reference/detachedCommentAtStartOfLambdaFunction1.types b/tests/baselines/reference/detachedCommentAtStartOfLambdaFunction1.types
index 6ba99c0eca4..016a123c5c1 100644
--- a/tests/baselines/reference/detachedCommentAtStartOfLambdaFunction1.types
+++ b/tests/baselines/reference/detachedCommentAtStartOfLambdaFunction1.types
@@ -10,11 +10,7 @@ class TestFile {
 >message : string
 
         return (...x: string[]) =>
->(...x: string[]) =>
-            /// <summary>Test summary</summary>
-            /// <param name="message" type="String" />
-            /// <returns type="Function" />
-            message + this.name : (...x: string[]) => string
+>(...x: string[]) =>            /// <summary>Test summary</summary>            /// <param name="message" type="String" />            /// <returns type="Function" />            message + this.name : (...x: string[]) => string
 >x : string[]
 
             /// <summary>Test summary</summary>
diff --git a/tests/baselines/reference/detachedCommentAtStartOfLambdaFunction2.types b/tests/baselines/reference/detachedCommentAtStartOfLambdaFunction2.types
index 31f4fc73e9b..2199a4490b5 100644
--- a/tests/baselines/reference/detachedCommentAtStartOfLambdaFunction2.types
+++ b/tests/baselines/reference/detachedCommentAtStartOfLambdaFunction2.types
@@ -10,12 +10,7 @@ class TestFile {
 >message : string
 
         return (...x: string[]) =>
->(...x: string[]) =>
-            /// <summary>Test summary</summary>
-            /// <param name="message" type="String" />
-            /// <returns type="Function" />
-
-            message + this.name : (...x: string[]) => string
+>(...x: string[]) =>            /// <summary>Test summary</summary>            /// <param name="message" type="String" />            /// <returns type="Function" />            message + this.name : (...x: string[]) => string
 >x : string[]
 
             /// <summary>Test summary</summary>
diff --git a/tests/baselines/reference/dottedSymbolResolution1.types b/tests/baselines/reference/dottedSymbolResolution1.types
index 5155d067c41..11c52d494bb 100644
--- a/tests/baselines/reference/dottedSymbolResolution1.types
+++ b/tests/baselines/reference/dottedSymbolResolution1.types
@@ -26,14 +26,14 @@ class Base { foo() { } }
 >foo : () => void
 
 function each(collection: string, 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; }
+>each : typeof each
 >collection : string
 >callback : (indexInArray: any, valueOfElement: any) => any
 >indexInArray : any
 >valueOfElement : any
 
 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; }
+>each : typeof each
 >collection : JQuery
 >JQuery : JQuery
 >callback : (indexInArray: number, valueOfElement: Base) => any
@@ -42,7 +42,7 @@ function each(collection: JQuery, callback: (indexInArray: number, valueOfElemen
 >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; }
+>each : typeof each
 >collection : any
 >callback : (indexInArray: any, valueOfElement: any) => any
 >indexInArray : any
@@ -52,7 +52,7 @@ function each(collection: any, callback: (indexInArray: any, valueOfElement: any
 }
 
 function _setBarAndText(): void {
->_setBarAndText : () => void
+>_setBarAndText : typeof _setBarAndText
 
     var x: JQuery, $: JQueryStatic
 >x : JQuery
@@ -61,19 +61,13 @@ function _setBarAndText(): void {
 >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
->each : { (collection: string, callback: (indexInArray: any, valueOfElement: any) => any): any; (collection: JQuery, callback: (indexInArray: number, valueOfElement: Base) => any): any; }
+>each(x.find(" "), function () {        var $this: JQuery = $(''),            thisBar = $this.find(".fx-usagebars-calloutbar-this"); // bug lead to 'could not find dotted symbol' here    } ) : any
+>each : typeof each
 >x.find(" ") : JQuery
 >x.find : (selector: string) => JQuery
 >x : JQuery
 >find : (selector: string) => JQuery
->function () {
-        var $this: JQuery = $(''),
-            thisBar = $this.find(".fx-usagebars-calloutbar-this"); // bug lead to 'could not find dotted symbol' here
-    } : () => void
+>function () {        var $this: JQuery = $(''),            thisBar = $this.find(".fx-usagebars-calloutbar-this"); // bug lead to 'could not find dotted symbol' here    } : () => void
 
         var $this: JQuery = $(''),
 >$this : JQuery
diff --git a/tests/baselines/reference/duplicateLabel1.errors.txt b/tests/baselines/reference/duplicateLabel1.errors.txt
new file mode 100644
index 00000000000..7503b9b278f
--- /dev/null
+++ b/tests/baselines/reference/duplicateLabel1.errors.txt
@@ -0,0 +1,7 @@
+==== tests/cases/compiler/duplicateLabel1.ts (1 errors) ====
+    target:
+    target:
+    ~~~~~~
+!!! Duplicate label 'target'
+    while (true) {
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/duplicateLabel2.errors.txt b/tests/baselines/reference/duplicateLabel2.errors.txt
new file mode 100644
index 00000000000..da40c01d528
--- /dev/null
+++ b/tests/baselines/reference/duplicateLabel2.errors.txt
@@ -0,0 +1,9 @@
+==== tests/cases/compiler/duplicateLabel2.ts (1 errors) ====
+    target:
+    while (true) {
+      target:
+      ~~~~~~
+!!! Duplicate label 'target'
+      while (true) {
+      }
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/duplicateLabel3.js b/tests/baselines/reference/duplicateLabel3.js
new file mode 100644
index 00000000000..37e9619e8f6
--- /dev/null
+++ b/tests/baselines/reference/duplicateLabel3.js
@@ -0,0 +1,17 @@
+//// [duplicateLabel3.ts]
+target:
+while (true) {
+  function f() {
+    target:
+    while (true) {
+    }
+  }
+}
+
+//// [duplicateLabel3.js]
+target: while (true) {
+    function f() {
+        target: while (true) {
+        }
+    }
+}
diff --git a/tests/baselines/reference/duplicateLabel3.types b/tests/baselines/reference/duplicateLabel3.types
new file mode 100644
index 00000000000..d4a26fa22a0
--- /dev/null
+++ b/tests/baselines/reference/duplicateLabel3.types
@@ -0,0 +1,11 @@
+=== tests/cases/compiler/duplicateLabel3.ts ===
+target:
+while (true) {
+  function f() {
+>f : () => void
+
+    target:
+    while (true) {
+    }
+  }
+}
diff --git a/tests/baselines/reference/duplicateLabel4.js b/tests/baselines/reference/duplicateLabel4.js
new file mode 100644
index 00000000000..22d072d38d7
--- /dev/null
+++ b/tests/baselines/reference/duplicateLabel4.js
@@ -0,0 +1,14 @@
+//// [duplicateLabel4.ts]
+target:
+while (true) {
+}
+
+target: 
+while (true) {
+}
+
+//// [duplicateLabel4.js]
+target: while (true) {
+}
+target: while (true) {
+}
diff --git a/tests/baselines/reference/duplicateLabel4.types b/tests/baselines/reference/duplicateLabel4.types
new file mode 100644
index 00000000000..c671abcef35
--- /dev/null
+++ b/tests/baselines/reference/duplicateLabel4.types
@@ -0,0 +1,9 @@
+=== tests/cases/compiler/duplicateLabel4.ts ===
+target:
+No type information for this code.while (true) {
+No type information for this code.}
+No type information for this code.
+No type information for this code.target: 
+No type information for this code.while (true) {
+No type information for this code.}
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/duplicatePropertiesInStrictMode.errors.txt b/tests/baselines/reference/duplicatePropertiesInStrictMode.errors.txt
deleted file mode 100644
index e184b7761ea..00000000000
--- a/tests/baselines/reference/duplicatePropertiesInStrictMode.errors.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-==== tests/cases/compiler/duplicatePropertiesInStrictMode.ts (2 errors) ====
-    "use strict";
-    var x = {
-      x: 1,
-      x: 2
-      ~
-!!! An object literal cannot have multiple properties with the same name in strict mode.
-      ~
-!!! Duplicate identifier 'x'.
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/duplicateStringIndexers.errors.txt b/tests/baselines/reference/duplicateStringIndexers.errors.txt
deleted file mode 100644
index f4cfe243bd3..00000000000
--- a/tests/baselines/reference/duplicateStringIndexers.errors.txt
+++ /dev/null
@@ -1,47 +0,0 @@
-==== tests/cases/conformance/types/members/duplicateStringIndexers.ts (6 errors) ====
-    // it is an error to have duplicate index signatures of the same kind in a type
-    
-    module test {
-        interface Number {
-            [x: string]: string;
-            [x: string]: string;
-            ~~~~~~~~~~~~~~~~~~~~
-!!! Duplicate string index signature.
-        }
-    
-        interface String {
-            [x: string]: string;
-            [x: string]: string;
-            ~~~~~~~~~~~~~~~~~~~~
-!!! Duplicate string index signature.
-        }
-    
-        interface Array<T> {
-            [x: string]: T;
-            [x: string]: T;
-            ~~~~~~~~~~~~~~~
-!!! Duplicate string index signature.
-        }
-    
-        class C {
-            [x: string]: string;
-            [x: string]: string;
-            ~~~~~~~~~~~~~~~~~~~~
-!!! Duplicate string index signature.
-        }
-    
-        interface I {
-            [x: string]: string;
-            [x: string]: string;
-            ~~~~~~~~~~~~~~~~~~~~
-!!! Duplicate string index signature.
-        }
-    
-        var a: {
-            [x: string]: string;
-            [x: string]: string;
-            ~~~~~~~~~~~~~~~~~~~~
-!!! Duplicate string index signature.
-        }
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/duplicateStringIndexers.js b/tests/baselines/reference/duplicateStringIndexers.js
index e4f8b7c9f3c..af7952bce50 100644
--- a/tests/baselines/reference/duplicateStringIndexers.js
+++ b/tests/baselines/reference/duplicateStringIndexers.js
@@ -1,47 +1,43 @@
 //// [duplicateStringIndexers.ts]
 // it is an error to have duplicate index signatures of the same kind in a type
 
-module test {
-    interface Number {
-        [x: string]: string;
-        [x: string]: string;
-    }
-
-    interface String {
-        [x: string]: string;
-        [x: string]: string;
-    }
-
-    interface Array<T> {
-        [x: string]: T;
-        [x: string]: T;
-    }
-
-    class C {
-        [x: string]: string;
-        [x: string]: string;
-    }
-
-    interface I {
-        [x: string]: string;
-        [x: string]: string;
-    }
-
-    var a: {
-        [x: string]: string;
-        [x: string]: string;
-    }
+interface Number {
+    [x: string]: string;
+    [x: string]: string;
 }
+
+interface String {
+    [x: string]: string;
+    [x: string]: string;
+}
+
+interface Array<T> {
+    [x: string]: T;
+    [x: string]: T;
+}
+
+class C {
+    [x: string]: string;
+    [x: string]: string;
+}
+
+interface I {
+    [x: string]: string;
+    [x: string]: string;
+}
+
+var a: {
+    [x: string]: string;
+    [x: string]: string;
+}
+
 
 
 //// [duplicateStringIndexers.js]
 // it is an error to have duplicate index signatures of the same kind in a type
-var test;
-(function (test) {
-    var C = (function () {
-        function C() {
-        }
-        return C;
-    })();
-    var a;
-})(test || (test = {}));
+var C = (function () {
+    function C() {
+    }
+    return C;
+})();
+var a;
diff --git a/tests/baselines/reference/duplicateVarAndImport.types b/tests/baselines/reference/duplicateVarAndImport.types
deleted file mode 100644
index a21f68a27ff..00000000000
--- a/tests/baselines/reference/duplicateVarAndImport.types
+++ /dev/null
@@ -1,13 +0,0 @@
-=== tests/cases/compiler/duplicateVarAndImport.ts ===
-// no error since module is not instantiated
-
-var a;
->a : any
-
-module M { }
->M : M
-
-import a = M;
->a : any
->M : M
-
diff --git a/tests/baselines/reference/duplicateVarAndImport2.errors.txt b/tests/baselines/reference/duplicateVarAndImport2.errors.txt
deleted file mode 100644
index b6f52fc23cb..00000000000
--- a/tests/baselines/reference/duplicateVarAndImport2.errors.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-==== tests/cases/compiler/duplicateVarAndImport2.ts (1 errors) ====
-    // error since module is instantiated
-    var a;
-    module M { export var x = 1; }
-    import a = M;
-    ~~~~~~~~~~~~~
-!!! Import declaration conflicts with local declaration of 'a'
\ No newline at end of file
diff --git a/tests/baselines/reference/duplicateVariablesByScope.types b/tests/baselines/reference/duplicateVariablesByScope.types
index ec20d665ad8..add12599a83 100644
--- a/tests/baselines/reference/duplicateVariablesByScope.types
+++ b/tests/baselines/reference/duplicateVariablesByScope.types
@@ -22,7 +22,7 @@ module M {
 }
 
 function foo() {
->foo : () => void
+>foo : typeof foo
 
     var x = 2;
 >x : number
diff --git a/tests/baselines/reference/emitBOM.types b/tests/baselines/reference/emitBOM.types
deleted file mode 100644
index b38fd19c8f4..00000000000
--- a/tests/baselines/reference/emitBOM.types
+++ /dev/null
@@ -1,6 +0,0 @@
-=== tests/cases/compiler/emitBOM.ts ===
-
-// JS and d.ts output should have a BOM but not the sourcemap
-var x;
->x : any
-
diff --git a/tests/baselines/reference/emptyTypeArgumentList.errors.txt b/tests/baselines/reference/emptyTypeArgumentList.errors.txt
deleted file mode 100644
index e05930401f7..00000000000
--- a/tests/baselines/reference/emptyTypeArgumentList.errors.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-==== tests/cases/compiler/emptyTypeArgumentList.ts (2 errors) ====
-    function foo<T>() { }
-    foo<>();
-       ~~
-!!! Type argument list cannot be empty.
-    ~~~~~~~
-!!! Supplied parameters do not match any signature of call target.
\ No newline at end of file
diff --git a/tests/baselines/reference/emptyTypeArgumentListWithNew.errors.txt b/tests/baselines/reference/emptyTypeArgumentListWithNew.errors.txt
deleted file mode 100644
index aad58ddfdce..00000000000
--- a/tests/baselines/reference/emptyTypeArgumentListWithNew.errors.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-==== tests/cases/compiler/emptyTypeArgumentListWithNew.ts (2 errors) ====
-    class foo<T> { }
-    new foo<>();
-           ~~
-!!! Type argument list cannot be empty.
-    ~~~~~~~~~~~
-!!! Supplied parameters do not match any signature of call target.
\ No newline at end of file
diff --git a/tests/baselines/reference/enumBasics.types b/tests/baselines/reference/enumBasics.types
index 67c16c62620..f775295891a 100644
--- a/tests/baselines/reference/enumBasics.types
+++ b/tests/baselines/reference/enumBasics.types
@@ -158,9 +158,7 @@ enum E9 {
 // Enum constant members are propagated
 var doNotPropagate = [
 >doNotPropagate : {}[]
->[
-    E8.B, E7.A, E4.Z, E3.X, E3.Y, E3.Z
-] : {}[]
+>[    E8.B, E7.A, E4.Z, E3.X, E3.Y, E3.Z] : {}[]
 
     E8.B, E7.A, E4.Z, E3.X, E3.Y, E3.Z
 >E8.B : E8
@@ -186,9 +184,7 @@ var doNotPropagate = [
 // Enum computed members are not propagated
 var doPropagate = [
 >doPropagate : {}[]
->[
-    E9.A, E9.B, E6.B, E6.C, E6.A, E5.A, E5.B, E5.C
-] : {}[]
+>[    E9.A, E9.B, E6.B, E6.C, E6.A, E5.A, E5.B, E5.C] : {}[]
 
     E9.A, E9.B, E6.B, E6.C, E6.A, E5.A, E5.B, E5.C
 >E9.A : E9
diff --git a/tests/baselines/reference/enumBasics1.errors.txt b/tests/baselines/reference/enumBasics1.errors.txt
index 6d9229341e2..d27def0a0bb 100644
--- a/tests/baselines/reference/enumBasics1.errors.txt
+++ b/tests/baselines/reference/enumBasics1.errors.txt
@@ -34,7 +34,7 @@
     	B,
     }
     
-    enum E2 { // should error for continued autonumbering
+    enum E2 { // shouldn't error
     	C,
     	~
 !!! In an enum with multiple declarations, only one declaration can omit an initializer for its first enum element.
diff --git a/tests/baselines/reference/enumBasics1.js b/tests/baselines/reference/enumBasics1.js
index b6c8c75f334..67bd91b6e5f 100644
--- a/tests/baselines/reference/enumBasics1.js
+++ b/tests/baselines/reference/enumBasics1.js
@@ -32,7 +32,7 @@ enum E2 {
 	B,
 }
 
-enum E2 { // should error for continued autonumbering
+enum E2 { // shouldn't error
 	C,
 	D,
 }
diff --git a/tests/baselines/reference/enumInitializersWithExponents.errors.txt b/tests/baselines/reference/enumInitializersWithExponents.errors.txt
deleted file mode 100644
index 60649475f78..00000000000
--- a/tests/baselines/reference/enumInitializersWithExponents.errors.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-==== tests/cases/compiler/enumInitializersWithExponents.ts (2 errors) ====
-    // Must be integer literals.
-    declare enum E {
-        a = 1e3, // ok
-        b = 1e25, // ok
-        c = 1e-3, // error
-        ~
-!!! Ambient enum elements can only have integer literal initializers.
-        d = 1e-9, // error
-        ~
-!!! Ambient enum elements can only have integer literal initializers.
-        e = 1e0, // ok
-        f = 1e+25 // ok
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/es6ClassTest5.types b/tests/baselines/reference/es6ClassTest5.types
index d1d3ab1b780..887e103c0f4 100644
--- a/tests/baselines/reference/es6ClassTest5.types
+++ b/tests/baselines/reference/es6ClassTest5.types
@@ -8,9 +8,7 @@ class C1T5 {
 >s : string
 
 	   	(i) => {
->(i) => {
-	        return i;
-	    } : (i: number) => number
+>(i) => {	        return i;	    } : (i: number) => number
 >i : number
 
 	        return i;
diff --git a/tests/baselines/reference/es6ClassTest8.types b/tests/baselines/reference/es6ClassTest8.types
index 5272f192b85..ea78670bec5 100644
--- a/tests/baselines/reference/es6ClassTest8.types
+++ b/tests/baselines/reference/es6ClassTest8.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/es6ClassTest8.ts ===
 function f1(x:any) {return x;}
->f1 : (x: any) => any
+>f1 : typeof f1
 >x : any
 >x : any
 
@@ -10,12 +10,8 @@ class C {
     constructor() {
         var bar:any = (function() {
 >bar : any
->(function() {
-            return bar; // 'bar' should be resolvable
-        }) : () => any
->function() {
-            return bar; // 'bar' should be resolvable
-        } : () => any
+>(function() {            return bar; // 'bar' should be resolvable        }) : () => any
+>function() {            return bar; // 'bar' should be resolvable        } : () => any
 
             return bar; // 'bar' should be resolvable
 >bar : any
@@ -24,9 +20,9 @@ class C {
         var b = f1(f1(bar));
 >b : any
 >f1(f1(bar)) : any
->f1 : (x: any) => any
+>f1 : typeof f1
 >f1(bar) : any
->f1 : (x: any) => any
+>f1 : typeof f1
 >bar : any
     }
   
@@ -36,13 +32,13 @@ class Vector {
 >Vector : Vector
 
     static norm(v:Vector):Vector {return null;}
->norm : (v: Vector) => Vector
+>norm : typeof norm
 >v : Vector
 >Vector : Vector
 >Vector : Vector
 
     static minus(v1:Vector, v2:Vector):Vector {return null;}
->minus : (v1: Vector, v2: Vector) => Vector
+>minus : typeof minus
 >v1 : Vector
 >Vector : Vector
 >v2 : Vector
@@ -50,7 +46,7 @@ class Vector {
 >Vector : Vector
 
     static times(v1:Vector, v2:Vector):Vector {return null;}
->times : (v1: Vector, v2: Vector) => Vector
+>times : typeof times
 >v1 : Vector
 >Vector : Vector
 >v2 : Vector
@@ -58,7 +54,7 @@ class Vector {
 >Vector : Vector
 
     static cross(v1:Vector, v2:Vector):Vector {return null;}
->cross : (v1: Vector, v2: Vector) => Vector
+>cross : typeof cross
 >v1 : Vector
 >Vector : Vector
 >v2 : Vector
@@ -76,7 +72,7 @@ class Vector {
     }
 
     static dot(v1:Vector, v2:Vector):Vector {return null;}    
->dot : (v1: Vector, v2: Vector) => Vector
+>dot : typeof dot
 >v1 : Vector
 >Vector : Vector
 >v2 : Vector
@@ -118,13 +114,13 @@ class Camera {
 >this : Camera
 >forward : Vector
 >Vector.norm(Vector.minus(lookAt,this.pos)) : Vector
->Vector.norm : (v: Vector) => Vector
+>Vector.norm : typeof norm
 >Vector : typeof Vector
->norm : (v: Vector) => Vector
+>norm : typeof norm
 >Vector.minus(lookAt,this.pos) : Vector
->Vector.minus : (v1: Vector, v2: Vector) => Vector
+>Vector.minus : typeof minus
 >Vector : typeof Vector
->minus : (v1: Vector, v2: Vector) => Vector
+>minus : typeof minus
 >lookAt : Vector
 >this.pos : Vector
 >this : Camera
@@ -136,18 +132,18 @@ class Camera {
 >this : Camera
 >right : Vector
 >Vector.times(down, Vector.norm(Vector.cross(this.forward, down))) : Vector
->Vector.times : (v1: Vector, v2: Vector) => Vector
+>Vector.times : typeof times
 >Vector : typeof Vector
->times : (v1: Vector, v2: Vector) => Vector
+>times : typeof times
 >down : Vector
 >Vector.norm(Vector.cross(this.forward, down)) : Vector
->Vector.norm : (v: Vector) => Vector
+>Vector.norm : typeof norm
 >Vector : typeof Vector
->norm : (v: Vector) => Vector
+>norm : typeof norm
 >Vector.cross(this.forward, down) : Vector
->Vector.cross : (v1: Vector, v2: Vector) => Vector
+>Vector.cross : typeof cross
 >Vector : typeof Vector
->cross : (v1: Vector, v2: Vector) => Vector
+>cross : typeof cross
 >this.forward : Vector
 >this : Camera
 >forward : Vector
@@ -159,18 +155,18 @@ class Camera {
 >this : Camera
 >up : Vector
 >Vector.times(down, Vector.norm(Vector.cross(this.forward, this.right))) : Vector
->Vector.times : (v1: Vector, v2: Vector) => Vector
+>Vector.times : typeof times
 >Vector : typeof Vector
->times : (v1: Vector, v2: Vector) => Vector
+>times : typeof times
 >down : Vector
 >Vector.norm(Vector.cross(this.forward, this.right)) : Vector
->Vector.norm : (v: Vector) => Vector
+>Vector.norm : typeof norm
 >Vector : typeof Vector
->norm : (v: Vector) => Vector
+>norm : typeof norm
 >Vector.cross(this.forward, this.right) : Vector
->Vector.cross : (v1: Vector, v2: Vector) => Vector
+>Vector.cross : typeof cross
 >Vector : typeof Vector
->cross : (v1: Vector, v2: Vector) => Vector
+>cross : typeof cross
 >this.forward : Vector
 >this : Camera
 >forward : Vector
diff --git a/tests/baselines/reference/everyTypeAssignableToAny.types b/tests/baselines/reference/everyTypeAssignableToAny.types
index 89af4f4b7c0..850a906ff9a 100644
--- a/tests/baselines/reference/everyTypeAssignableToAny.types
+++ b/tests/baselines/reference/everyTypeAssignableToAny.types
@@ -180,7 +180,7 @@ a = ae;
 >ae : E
 
 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
+>foo : typeof foo
 >T : T
 >U : U
 >V : V
diff --git a/tests/baselines/reference/everyTypeWithAnnotationAndInitializer.types b/tests/baselines/reference/everyTypeWithAnnotationAndInitializer.types
index 49f2ac2a781..a51aada11a7 100644
--- a/tests/baselines/reference/everyTypeWithAnnotationAndInitializer.types
+++ b/tests/baselines/reference/everyTypeWithAnnotationAndInitializer.types
@@ -35,7 +35,7 @@ class D<T>{
 }
 
 function F(x: string): number { return 42; }
->F : (x: string) => number
+>F : typeof F
 >x : string
 
 module M {
@@ -49,7 +49,7 @@ module M {
     }
 
     export function F2(x: number): string { return x.toString(); }
->F2 : (x: number) => string
+>F2 : typeof F2
 >x : number
 >x.toString() : string
 >x.toString : (radix?: number) => string
@@ -117,18 +117,18 @@ var anOtherObjectLiteral: { id: number } = new C();
 >C : typeof C
 
 var aFunction: typeof F = F;
->aFunction : (x: string) => number
->F : (x: string) => number
->F : (x: string) => number
+>aFunction : typeof F
+>F : typeof F
+>F : typeof F
 
 var anOtherFunction: (x: string) => number = F;
 >anOtherFunction : (x: string) => number
 >x : string
->F : (x: string) => number
+>F : typeof F
 
 var aLambda: typeof F = (x) => 2;
->aLambda : (x: string) => number
->F : (x: string) => number
+>aLambda : typeof F
+>F : typeof F
 >(x) => 2 : (x: string) => number
 >x : string
 
@@ -147,9 +147,9 @@ var aClassInModule: M.A = new M.A();
 >A : typeof A
 
 var aFunctionInModule: typeof M.F2 = (x) => 'this is a string';
->aFunctionInModule : (x: number) => string
+>aFunctionInModule : typeof F2
 >M : typeof M
->F2 : (x: number) => string
+>F2 : typeof F2
 >(x) => 'this is a string' : (x: number) => string
 >x : number
 
diff --git a/tests/baselines/reference/everyTypeWithInitializer.types b/tests/baselines/reference/everyTypeWithInitializer.types
index a721a88a5ca..4fdc818e830 100644
--- a/tests/baselines/reference/everyTypeWithInitializer.types
+++ b/tests/baselines/reference/everyTypeWithInitializer.types
@@ -35,7 +35,7 @@ class D<T>{
 }
 
 function F(x: string): number { return 42; }
->F : (x: string) => number
+>F : typeof F
 >x : string
 
 module M {
@@ -49,7 +49,7 @@ module M {
     }
 
     export function F2(x: number): string { return x.toString(); }
->F2 : (x: number) => string
+>F2 : typeof F2
 >x : number
 >x.toString() : string
 >x.toString : (radix?: number) => string
@@ -103,8 +103,8 @@ var anObjectLiteral = { id: 12 };
 >id : number
 
 var aFunction = F;
->aFunction : (x: string) => number
->F : (x: string) => number
+>aFunction : typeof F
+>F : typeof F
 
 var aLambda = (x) => 2;
 >aLambda : (x: any) => number
@@ -123,10 +123,10 @@ var aClassInModule = new M.A();
 >A : typeof A
 
 var aFunctionInModule = M.F2;
->aFunctionInModule : (x: number) => string
->M.F2 : (x: number) => string
+>aFunctionInModule : typeof F2
+>M.F2 : typeof F2
 >M : typeof M
->F2 : (x: number) => string
+>F2 : typeof F2
 
 // no initializer or annotation, so this is an 'any'
 var x;
diff --git a/tests/baselines/reference/exportAssignmentFunction.types b/tests/baselines/reference/exportAssignmentFunction.types
index 023a8c234d2..95e50be2c71 100644
--- a/tests/baselines/reference/exportAssignmentFunction.types
+++ b/tests/baselines/reference/exportAssignmentFunction.types
@@ -1,16 +1,16 @@
 === tests/cases/compiler/exportAssignmentFunction_B.ts ===
 import fooFunc = require("exportAssignmentFunction_A");
->fooFunc : () => number
+>fooFunc : typeof foo
 
 var n: number = fooFunc();
 >n : number
 >fooFunc() : number
->fooFunc : () => number
+>fooFunc : typeof foo
 
 === tests/cases/compiler/exportAssignmentFunction_A.ts ===
 function foo() { return 0; }
->foo : () => number
+>foo : typeof foo
 
 export = foo;
->foo : () => number
+>foo : typeof foo
 
diff --git a/tests/baselines/reference/exportAssignmentMergedModule.types b/tests/baselines/reference/exportAssignmentMergedModule.types
index 42dfe518d33..a71b94c7b1b 100644
--- a/tests/baselines/reference/exportAssignmentMergedModule.types
+++ b/tests/baselines/reference/exportAssignmentMergedModule.types
@@ -5,9 +5,9 @@ import foo = require("./foo_0");
 var a: number = foo.a();
 >a : number
 >foo.a() : number
->foo.a : () => number
+>foo.a : typeof a
 >foo : typeof Foo
->a : () => number
+>a : typeof a
 
 if(!!foo.b){
 >!!foo.b : boolean
@@ -24,16 +24,16 @@ if(!!foo.b){
 >Test : typeof Test
 >answer : number
 >foo.c(42) : number
->foo.c : (a: number) => number
+>foo.c : typeof c
 >foo : typeof Foo
->c : (a: number) => number
+>c : typeof c
 }
 === tests/cases/conformance/externalModules/foo_0.ts ===
 module Foo {
 >Foo : typeof Foo
 
 	export function a(){
->a : () => number
+>a : typeof a
 
 		return 5;
 	}
@@ -44,7 +44,7 @@ module Foo {
 >Foo : typeof Foo
 
 	export function c(a: number){
->c : (a: number) => number
+>c : typeof c
 >a : number
 
 		return a;
diff --git a/tests/baselines/reference/exportAssignmentWithDeclareAndExportModifiers.errors.txt b/tests/baselines/reference/exportAssignmentWithDeclareAndExportModifiers.errors.txt
deleted file mode 100644
index 2dd71ce0d07..00000000000
--- a/tests/baselines/reference/exportAssignmentWithDeclareAndExportModifiers.errors.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-==== tests/cases/compiler/exportAssignmentWithDeclareAndExportModifiers.ts (2 errors) ====
-    var x;
-    export declare export = x;
-    ~~~~~~~~~~~~~~
-!!! An export assignment cannot have modifiers.
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Cannot compile external modules unless the '--module' flag is provided.
\ No newline at end of file
diff --git a/tests/baselines/reference/exportAssignmentWithDeclareModifier.errors.txt b/tests/baselines/reference/exportAssignmentWithDeclareModifier.errors.txt
deleted file mode 100644
index 27b202ce0c8..00000000000
--- a/tests/baselines/reference/exportAssignmentWithDeclareModifier.errors.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-==== tests/cases/compiler/exportAssignmentWithDeclareModifier.ts (2 errors) ====
-    var x;
-    declare export = x;
-    ~~~~~~~
-!!! An export assignment cannot have modifiers.
-    ~~~~~~~~~~~~~~~~~~~
-!!! Cannot compile external modules unless the '--module' flag is provided.
\ No newline at end of file
diff --git a/tests/baselines/reference/exportAssignmentWithExportModifier.errors.txt b/tests/baselines/reference/exportAssignmentWithExportModifier.errors.txt
deleted file mode 100644
index dc3d6cb4cc5..00000000000
--- a/tests/baselines/reference/exportAssignmentWithExportModifier.errors.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-==== tests/cases/compiler/exportAssignmentWithExportModifier.ts (2 errors) ====
-    var x;
-    export export = x;
-    ~~~~~~
-!!! An export assignment cannot have modifiers.
-    ~~~~~~~~~~~~~~~~~~
-!!! Cannot compile external modules unless the '--module' flag is provided.
\ No newline at end of file
diff --git a/tests/baselines/reference/exportCodeGen.types b/tests/baselines/reference/exportCodeGen.types
index 89cb16fdf4c..348d8f9c46f 100644
--- a/tests/baselines/reference/exportCodeGen.types
+++ b/tests/baselines/reference/exportCodeGen.types
@@ -9,7 +9,7 @@ module A {
 >x : number
 
     function lt12() {
->lt12 : () => boolean
+>lt12 : typeof lt12
 
         return x < 12;
 >x < 12 : boolean
@@ -25,7 +25,7 @@ module B {
 >x : number
 
     function lt12() {
->lt12 : () => boolean
+>lt12 : typeof lt12
 
         return x < 12;
 >x < 12 : boolean
@@ -38,7 +38,7 @@ module C {
 >C : typeof C
 
     function no() {
->no : () => boolean
+>no : typeof no
 
         return false;
     }
@@ -49,7 +49,7 @@ module D {
 >D : typeof D
 
     export function yes() {
->yes : () => boolean
+>yes : typeof yes
 
         return true;
     }
@@ -64,7 +64,7 @@ module E {
 >Red : Color
 
     export function fn() { }
->fn : () => void
+>fn : typeof fn
 
     export interface I { id: number }
 >I : I
@@ -92,7 +92,7 @@ module F {
 >Red : Color
 
     function fn() { }
->fn : () => void
+>fn : typeof fn
 
     interface I { id: number }
 >I : I
diff --git a/tests/baselines/reference/exportImport.types b/tests/baselines/reference/exportImport.types
index 3fa93127cc8..7f7bdba5d03 100644
--- a/tests/baselines/reference/exportImport.types
+++ b/tests/baselines/reference/exportImport.types
@@ -3,7 +3,7 @@ import e = require('./exporter');
 >e : typeof "tests/cases/compiler/exporter"
 
 export function w(): e.w { // Should be OK
->w : () => Widget1
+>w : typeof w
 >e : e
 >w : Widget1
 
diff --git a/tests/baselines/reference/exportImportMultipleFiles.types b/tests/baselines/reference/exportImportMultipleFiles.types
index 02b17bd4101..a46732e4de2 100644
--- a/tests/baselines/reference/exportImportMultipleFiles.types
+++ b/tests/baselines/reference/exportImportMultipleFiles.types
@@ -4,15 +4,15 @@ import lib = require('./exportImportMultipleFiles_library');
 
 lib.math.add(3, 4); // Shouldnt be error
 >lib.math.add(3, 4) : any
->lib.math.add : (a: any, b: any) => any
+>lib.math.add : typeof add
 >lib.math : typeof "tests/cases/compiler/exportImportMultipleFiles_math"
 >lib : typeof "tests/cases/compiler/exportImportMultipleFiles_library"
 >math : typeof "tests/cases/compiler/exportImportMultipleFiles_math"
->add : (a: any, b: any) => any
+>add : typeof add
 
 === tests/cases/compiler/exportImportMultipleFiles_math.ts ===
 export function add(a, b) { return a + b; }
->add : (a: any, b: any) => any
+>add : typeof add
 >a : any
 >b : any
 >a + b : any
@@ -25,7 +25,7 @@ export import math = require("exportImportMultipleFiles_math");
 
 math.add(3, 4); // OK
 >math.add(3, 4) : any
->math.add : (a: any, b: any) => any
+>math.add : typeof add
 >math : typeof "tests/cases/compiler/exportImportMultipleFiles_math"
->add : (a: any, b: any) => any
+>add : typeof add
 
diff --git a/tests/baselines/reference/exportImportNonInstantiatedModule2.types b/tests/baselines/reference/exportImportNonInstantiatedModule2.types
index 2138bce4831..5d4ba1650e2 100644
--- a/tests/baselines/reference/exportImportNonInstantiatedModule2.types
+++ b/tests/baselines/reference/exportImportNonInstantiatedModule2.types
@@ -3,7 +3,7 @@ import e = require('./exporter');
 >e : typeof "tests/cases/compiler/exporter"
 
 export function w(): e.w { // Should be OK
->w : () => Widget1
+>w : typeof w
 >e : e
 >w : Widget1
 
diff --git a/tests/baselines/reference/exportVisibility.types b/tests/baselines/reference/exportVisibility.types
index 59936828275..c972bd0e5d6 100644
--- a/tests/baselines/reference/exportVisibility.types
+++ b/tests/baselines/reference/exportVisibility.types
@@ -9,7 +9,7 @@ export var foo = new Foo();
 >Foo : typeof Foo
 
 export function test(foo: Foo) {
->test : (foo: Foo) => boolean
+>test : typeof test
 >foo : Foo
 >Foo : Foo
 
diff --git a/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.types b/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.types
index 20a683c5968..11875e105b4 100644
--- a/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.types
+++ b/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.types
@@ -25,10 +25,7 @@ var moduleMap: { [key: string]: IHasVisualizationModel } = {
 >moduleMap : { [x: string]: IHasVisualizationModel; }
 >key : string
 >IHasVisualizationModel : IHasVisualizationModel
->{
-    "moduleA": moduleA,
-    "moduleB": moduleB
-} : { [x: string]: IHasVisualizationModel; "moduleA": typeof "tests/cases/compiler/extendingClassFromAliasAndUsageInIndexer_moduleA"; "moduleB": typeof "tests/cases/compiler/extendingClassFromAliasAndUsageInIndexer_moduleB"; }
+>{    "moduleA": moduleA,    "moduleB": moduleB} : { [x: string]: IHasVisualizationModel; "moduleA": typeof "tests/cases/compiler/extendingClassFromAliasAndUsageInIndexer_moduleA"; "moduleB": typeof "tests/cases/compiler/extendingClassFromAliasAndUsageInIndexer_moduleB"; }
 
     "moduleA": moduleA,
 >moduleA : moduleA
diff --git a/tests/baselines/reference/externFunc.types b/tests/baselines/reference/externFunc.types
index 5aac52ac125..2ba2886873d 100644
--- a/tests/baselines/reference/externFunc.types
+++ b/tests/baselines/reference/externFunc.types
@@ -1,9 +1,9 @@
 === tests/cases/compiler/externFunc.ts ===
 declare function parseInt(s:string):number;
->parseInt : { (s: string, radix?: number): number; (s: string): number; }
+>parseInt : typeof parseInt
 >s : string
 
 parseInt("2");
 >parseInt("2") : number
->parseInt : { (s: string, radix?: number): number; (s: string): number; }
+>parseInt : typeof parseInt
 
diff --git a/tests/baselines/reference/externalModuleReferenceOfImportDeclarationWithExportModifier.types b/tests/baselines/reference/externalModuleReferenceOfImportDeclarationWithExportModifier.types
index d0e60ad36ed..56cf4188cba 100644
--- a/tests/baselines/reference/externalModuleReferenceOfImportDeclarationWithExportModifier.types
+++ b/tests/baselines/reference/externalModuleReferenceOfImportDeclarationWithExportModifier.types
@@ -4,11 +4,11 @@ export import file1 = require('externalModuleReferenceOfImportDeclarationWithExp
 
 file1.foo();
 >file1.foo() : void
->file1.foo : () => void
+>file1.foo : typeof foo
 >file1 : typeof "tests/cases/compiler/externalModuleReferenceOfImportDeclarationWithExportModifier_0"
->foo : () => void
+>foo : typeof foo
 
 === tests/cases/compiler/externalModuleReferenceOfImportDeclarationWithExportModifier_0.ts ===
 export function foo() { };
->foo : () => void
+>foo : typeof foo
 
diff --git a/tests/baselines/reference/fatArrowSelf.types b/tests/baselines/reference/fatArrowSelf.types
index 19d0b2d61b0..e018600dc4f 100644
--- a/tests/baselines/reference/fatArrowSelf.types
+++ b/tests/baselines/reference/fatArrowSelf.types
@@ -35,17 +35,13 @@ module Consumer {
 >register : () => void
 
             this.emitter.addListener('change', (e) => {
->this.emitter.addListener('change', (e) => {
-                this.changed();
-            }) : void
+>this.emitter.addListener('change', (e) => {                this.changed();            }) : void
 >this.emitter.addListener : (type: string, listener: ListenerCallback) => void
 >this.emitter : EventEmitter
 >this : EventEmitterConsummer
 >emitter : EventEmitter
 >addListener : (type: string, listener: ListenerCallback) => void
->(e) => {
-                this.changed();
-            } : (e: any) => void
+>(e) => {                this.changed();            } : (e: any) => void
 >e : any
 
                 this.changed();
diff --git a/tests/baselines/reference/fatarrowfunctions.types b/tests/baselines/reference/fatarrowfunctions.types
index 5863436ef4e..0ac210f1b4e 100644
--- a/tests/baselines/reference/fatarrowfunctions.types
+++ b/tests/baselines/reference/fatarrowfunctions.types
@@ -1,7 +1,7 @@
 === tests/cases/compiler/fatarrowfunctions.ts ===
 
 function foo(x:any) {
->foo : (x: any) => any
+>foo : typeof foo
 >x : any
 
 	return x();
@@ -12,7 +12,7 @@ function foo(x:any) {
 
 foo((x:number,y,z)=>{return x+y+z;});
 >foo((x:number,y,z)=>{return x+y+z;}) : any
->foo : (x: any) => any
+>foo : typeof foo
 >(x:number,y,z)=>{return x+y+z;} : (x: number, y: any, z: any) => any
 >x : number
 >y : any
@@ -25,7 +25,7 @@ foo((x:number,y,z)=>{return x+y+z;});
 
 foo((x,y,z)=>{return x+y+z;});
 >foo((x,y,z)=>{return x+y+z;}) : any
->foo : (x: any) => any
+>foo : typeof foo
 >(x,y,z)=>{return x+y+z;} : (x: any, y: any, z: any) => any
 >x : any
 >y : any
@@ -38,7 +38,7 @@ foo((x,y,z)=>{return x+y+z;});
 
 foo((x,y:number,z)=>{return x+y+z;});
 >foo((x,y:number,z)=>{return x+y+z;}) : any
->foo : (x: any) => any
+>foo : typeof foo
 >(x,y:number,z)=>{return x+y+z;} : (x: any, y: number, z: any) => any
 >x : any
 >y : number
@@ -51,7 +51,7 @@ foo((x,y:number,z)=>{return x+y+z;});
 
 foo((x,y:number,z:number)=>{return x+y+z;});
 >foo((x,y:number,z:number)=>{return x+y+z;}) : any
->foo : (x: any) => any
+>foo : typeof foo
 >(x,y:number,z:number)=>{return x+y+z;} : (x: any, y: number, z: number) => any
 >x : any
 >y : number
@@ -64,7 +64,7 @@ foo((x,y:number,z:number)=>{return x+y+z;});
 
 foo((x,y,z:number)=>{return x+y+z;});
 >foo((x,y,z:number)=>{return x+y+z;}) : any
->foo : (x: any) => any
+>foo : typeof foo
 >(x,y,z:number)=>{return x+y+z;} : (x: any, y: any, z: number) => any
 >x : any
 >y : any
@@ -77,12 +77,12 @@ foo((x,y,z:number)=>{return x+y+z;});
 
 foo(()=>{return 0;});
 >foo(()=>{return 0;}) : any
->foo : (x: any) => any
+>foo : typeof foo
 >()=>{return 0;} : () => number
 
 foo((x:number,y,z)=>x+y+z);
 >foo((x:number,y,z)=>x+y+z) : any
->foo : (x: any) => any
+>foo : typeof foo
 >(x:number,y,z)=>x+y+z : (x: number, y: any, z: any) => any
 >x : number
 >y : any
@@ -95,7 +95,7 @@ foo((x:number,y,z)=>x+y+z);
 
 foo((x,y,z)=>x+y+z);
 >foo((x,y,z)=>x+y+z) : any
->foo : (x: any) => any
+>foo : typeof foo
 >(x,y,z)=>x+y+z : (x: any, y: any, z: any) => any
 >x : any
 >y : any
@@ -108,7 +108,7 @@ foo((x,y,z)=>x+y+z);
 
 foo((x,y:number,z)=>{return x+y+z;});
 >foo((x,y:number,z)=>{return x+y+z;}) : any
->foo : (x: any) => any
+>foo : typeof foo
 >(x,y:number,z)=>{return x+y+z;} : (x: any, y: number, z: any) => any
 >x : any
 >y : number
@@ -121,7 +121,7 @@ foo((x,y:number,z)=>{return x+y+z;});
 
 foo((x,y:number,z:number)=>{return x+y+z;});
 >foo((x,y:number,z:number)=>{return x+y+z;}) : any
->foo : (x: any) => any
+>foo : typeof foo
 >(x,y:number,z:number)=>{return x+y+z;} : (x: any, y: number, z: number) => any
 >x : any
 >y : number
@@ -134,7 +134,7 @@ foo((x,y:number,z:number)=>{return x+y+z;});
 
 foo((x,y,z:number)=>{return x+y+z;});
 >foo((x,y,z:number)=>{return x+y+z;}) : any
->foo : (x: any) => any
+>foo : typeof foo
 >(x,y,z:number)=>{return x+y+z;} : (x: any, y: any, z: number) => any
 >x : any
 >y : any
@@ -147,13 +147,13 @@ foo((x,y,z:number)=>{return x+y+z;});
 
 foo(()=>{return 0;});
 >foo(()=>{return 0;}) : any
->foo : (x: any) => any
+>foo : typeof foo
 >()=>{return 0;} : () => number
 
 
 foo(((x) => x));
 >foo(((x) => x)) : any
->foo : (x: any) => any
+>foo : typeof foo
 >((x) => x) : (x: any) => any
 >(x) => x : (x: any) => any
 >x : any
@@ -161,7 +161,7 @@ foo(((x) => x));
 
 foo(x => x*x);
 >foo(x => x*x) : any
->foo : (x: any) => any
+>foo : typeof foo
 >x => x*x : (x: any) => number
 >x : any
 >x*x : number
@@ -189,7 +189,7 @@ var w = () => 3;
 >() => 3 : () => number
 
 function ternaryTest(isWhile:boolean) {
->ternaryTest : (isWhile: boolean) => void
+>ternaryTest : typeof ternaryTest
 >isWhile : boolean
 
                 var f = isWhile ? function (n) { return n > 0; } : function (n) { return n === 0; };
@@ -208,32 +208,25 @@ function ternaryTest(isWhile:boolean) {
 }
 
 declare function setTimeout(expression: any, msec?: number, language?: any): number;
->setTimeout : (expression: any, msec?: number, language?: any) => number
+>setTimeout : typeof setTimeout
 >expression : any
 >msec : number
 >language : any
 
 var messenger = {
 >messenger : { message: string; start: () => void; }
->{
-    message: "Hello World",
-    start: function() {
-        setTimeout(() => { this.message.toString(); }, 3000);
-    }
-} : { message: string; start: () => void; }
+>{    message: "Hello World",    start: function() {        setTimeout(() => { this.message.toString(); }, 3000);    }} : { message: string; start: () => void; }
 
     message: "Hello World",
 >message : string
 
     start: function() {
 >start : () => void
->function() {
-        setTimeout(() => { this.message.toString(); }, 3000);
-    } : () => void
+>function() {        setTimeout(() => { this.message.toString(); }, 3000);    } : () => void
 
         setTimeout(() => { this.message.toString(); }, 3000);
 >setTimeout(() => { this.message.toString(); }, 3000) : number
->setTimeout : (expression: any, msec?: number, language?: any) => number
+>setTimeout : typeof setTimeout
 >() => { this.message.toString(); } : () => void
 >this.message.toString() : any
 >this.message.toString : any
diff --git a/tests/baselines/reference/fatarrowfunctionsInFunctionParameterDefaults.types b/tests/baselines/reference/fatarrowfunctionsInFunctionParameterDefaults.types
index cf561eb08af..57cfb46b109 100644
--- a/tests/baselines/reference/fatarrowfunctionsInFunctionParameterDefaults.types
+++ b/tests/baselines/reference/fatarrowfunctionsInFunctionParameterDefaults.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/fatarrowfunctionsInFunctionParameterDefaults.ts ===
 function fn(x = () => this, y = x()) {
->fn : (x?: () => any, y?: any) => any
+>fn : typeof fn
 >x : () => any
 >() => this : () => any
 >this : any
@@ -17,6 +17,6 @@ function fn(x = () => this, y = x()) {
 fn.call(4); // Should be 4
 >fn.call(4) : any
 >fn.call : (thisArg: any, ...argArray: any[]) => any
->fn : (x?: () => any, y?: any) => any
+>fn : typeof fn
 >call : (thisArg: any, ...argArray: any[]) => any
 
diff --git a/tests/baselines/reference/fatarrowfunctionsInFunctions.types b/tests/baselines/reference/fatarrowfunctionsInFunctions.types
index f92f2ae2cb1..7a91fa42d6f 100644
--- a/tests/baselines/reference/fatarrowfunctionsInFunctions.types
+++ b/tests/baselines/reference/fatarrowfunctionsInFunctions.types
@@ -1,46 +1,29 @@
 === tests/cases/compiler/fatarrowfunctionsInFunctions.ts ===
 declare function setTimeout(expression: any, msec?: number, language?: any): number;
->setTimeout : (expression: any, msec?: number, language?: any) => number
+>setTimeout : typeof setTimeout
 >expression : any
 >msec : number
 >language : any
 
 var messenger = {
 >messenger : { message: string; start: () => void; }
->{
-    message: "Hello World",
-    start: function() {
-        var _self = this;
-        setTimeout(function() {
-            _self.message.toString(); 
-        }, 3000); 
-    }
-} : { message: string; start: () => void; }
+>{    message: "Hello World",    start: function() {        var _self = this;        setTimeout(function() {            _self.message.toString();         }, 3000);     }} : { message: string; start: () => void; }
 
     message: "Hello World",
 >message : string
 
     start: function() {
 >start : () => void
->function() {
-        var _self = this;
-        setTimeout(function() {
-            _self.message.toString(); 
-        }, 3000); 
-    } : () => void
+>function() {        var _self = this;        setTimeout(function() {            _self.message.toString();         }, 3000);     } : () => void
 
         var _self = this;
 >_self : any
 >this : any
 
         setTimeout(function() {
->setTimeout(function() {
-            _self.message.toString(); 
-        }, 3000) : number
->setTimeout : (expression: any, msec?: number, language?: any) => number
->function() {
-            _self.message.toString(); 
-        } : () => void
+>setTimeout(function() {            _self.message.toString();         }, 3000) : number
+>setTimeout : typeof setTimeout
+>function() {            _self.message.toString();         } : () => void
 
             _self.message.toString(); 
 >_self.message.toString() : any
diff --git a/tests/baselines/reference/fileReferencesWithNoExtensions.types b/tests/baselines/reference/fileReferencesWithNoExtensions.types
deleted file mode 100644
index ec58e338345..00000000000
--- a/tests/baselines/reference/fileReferencesWithNoExtensions.types
+++ /dev/null
@@ -1,32 +0,0 @@
-=== tests/cases/compiler/t.ts ===
-/// <reference path="a"/>
-/// <reference path="b"/>
-/// <reference path="c"/>
-var a = aa;  // Check that a.ts is referenced
->a : number
->aa : number
-
-var b = bb;  // Check that b.d.ts is referenced
->b : number
->bb : number
-
-var c = cc;  // Check that c.ts has precedence over c.d.ts
->c : number
->cc : number
-
-=== tests/cases/compiler/a.ts ===
-var aa = 1;
->aa : number
-
-=== tests/cases/compiler/b.d.ts ===
-declare var bb: number;
->bb : number
-
-=== tests/cases/compiler/c.ts ===
-var cc = 1;
->cc : number
-
-=== tests/cases/compiler/c.d.ts ===
-declare var xx: number;
->xx : number
-
diff --git a/tests/baselines/reference/fixTypeParameterInSignatureWithRestParameters.types b/tests/baselines/reference/fixTypeParameterInSignatureWithRestParameters.types
index 95214571df9..d3781874b56 100644
--- a/tests/baselines/reference/fixTypeParameterInSignatureWithRestParameters.types
+++ b/tests/baselines/reference/fixTypeParameterInSignatureWithRestParameters.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/fixTypeParameterInSignatureWithRestParameters.ts ===
 function bar<T>(item1: T, item2: T) { }
->bar : <T>(item1: T, item2: T) => void
+>bar : typeof bar
 >T : T
 >item1 : T
 >T : T
@@ -9,5 +9,5 @@ function bar<T>(item1: T, item2: T) { }
 
 bar(1, ""); // Should be ok
 >bar(1, "") : void
->bar : <T>(item1: T, item2: T) => void
+>bar : typeof bar
 
diff --git a/tests/baselines/reference/forInStatement3.types b/tests/baselines/reference/forInStatement3.types
index 1d3803065bd..e98730e48b9 100644
--- a/tests/baselines/reference/forInStatement3.types
+++ b/tests/baselines/reference/forInStatement3.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/forInStatement3.ts ===
 function F<T>() {
->F : <T>() => void
+>F : typeof F
 >T : T
 
   var expr: T;
diff --git a/tests/baselines/reference/forStatements.types b/tests/baselines/reference/forStatements.types
index d8c9d444168..06b162c0f6e 100644
--- a/tests/baselines/reference/forStatements.types
+++ b/tests/baselines/reference/forStatements.types
@@ -35,7 +35,7 @@ class D<T>{
 }
 
 function F(x: string): number { return 42; }
->F : (x: string) => number
+>F : typeof F
 >x : string
 
 module M {
@@ -49,7 +49,7 @@ module M {
     }
 
     export function F2(x: number): string { return x.toString(); }
->F2 : (x: number) => string
+>F2 : typeof F2
 >x : number
 >x.toString() : string
 >x.toString : (radix?: number) => string
@@ -117,18 +117,18 @@ for(var anOtherObjectLiteral: { id: number } = new C();;){}
 >C : typeof C
 
 for(var aFunction: typeof F = F;;){}
->aFunction : (x: string) => number
->F : (x: string) => number
->F : (x: string) => number
+>aFunction : typeof F
+>F : typeof F
+>F : typeof F
 
 for(var anOtherFunction: (x: string) => number = F;;){}
 >anOtherFunction : (x: string) => number
 >x : string
->F : (x: string) => number
+>F : typeof F
 
 for(var aLambda: typeof F = (x) => 2;;){}
->aLambda : (x: string) => number
->F : (x: string) => number
+>aLambda : typeof F
+>F : typeof F
 >(x) => 2 : (x: string) => number
 >x : string
 
@@ -147,9 +147,9 @@ for(var aClassInModule: M.A = new M.A();;){}
 >A : typeof A
 
 for(var aFunctionInModule: typeof M.F2 = (x) => 'this is a string';;){}
->aFunctionInModule : (x: number) => string
+>aFunctionInModule : typeof F2
 >M : typeof M
->F2 : (x: number) => string
+>F2 : typeof F2
 >(x) => 'this is a string' : (x: number) => string
 >x : number
 
diff --git a/tests/baselines/reference/forStatementsMultipleValidDecl.types b/tests/baselines/reference/forStatementsMultipleValidDecl.types
index f894eef1404..f5401754e29 100644
--- a/tests/baselines/reference/forStatementsMultipleValidDecl.types
+++ b/tests/baselines/reference/forStatementsMultipleValidDecl.types
@@ -14,7 +14,7 @@ for (var x = <number>undefined; ;) { }
 
 // new declaration space, making redeclaring x as a string valid
 function declSpace() {
->declSpace : () => void
+>declSpace : typeof declSpace
 
     for (var x = 'this is a string'; ;) { }
 >x : string
diff --git a/tests/baselines/reference/funcdecl.types b/tests/baselines/reference/funcdecl.types
index 52f73f2a06c..a5e288b8394 100644
--- a/tests/baselines/reference/funcdecl.types
+++ b/tests/baselines/reference/funcdecl.types
@@ -1,42 +1,42 @@
 === tests/cases/compiler/funcdecl.ts ===
 function simpleFunc() {
->simpleFunc : () => string
+>simpleFunc : typeof simpleFunc
 
     return "this is my simple func";
 }
 var simpleFuncVar = simpleFunc;
->simpleFuncVar : () => string
->simpleFunc : () => string
+>simpleFuncVar : typeof simpleFunc
+>simpleFunc : typeof simpleFunc
 
 function anotherFuncNoReturn() {
->anotherFuncNoReturn : () => void
+>anotherFuncNoReturn : typeof anotherFuncNoReturn
 }
 var anotherFuncNoReturnVar = anotherFuncNoReturn;
->anotherFuncNoReturnVar : () => void
->anotherFuncNoReturn : () => void
+>anotherFuncNoReturnVar : typeof anotherFuncNoReturn
+>anotherFuncNoReturn : typeof anotherFuncNoReturn
 
 function withReturn() : string{
->withReturn : () => string
+>withReturn : typeof withReturn
 
     return "Hello";
 }
 var withReturnVar = withReturn;
->withReturnVar : () => string
->withReturn : () => string
+>withReturnVar : typeof withReturn
+>withReturn : typeof withReturn
 
 function withParams(a : string) : string{
->withParams : (a: string) => string
+>withParams : typeof withParams
 >a : string
 
     return a;
 >a : string
 }
 var withparamsVar = withParams;
->withparamsVar : (a: string) => string
->withParams : (a: string) => string
+>withparamsVar : typeof withParams
+>withParams : typeof withParams
 
 function withMultiParams(a : number, b, c: Object) {
->withMultiParams : (a: number, b: any, c: Object) => number
+>withMultiParams : typeof withMultiParams
 >a : number
 >b : any
 >c : Object
@@ -46,39 +46,39 @@ function withMultiParams(a : number, b, c: Object) {
 >a : number
 }
 var withMultiParamsVar = withMultiParams;
->withMultiParamsVar : (a: number, b: any, c: Object) => number
->withMultiParams : (a: number, b: any, c: Object) => number
+>withMultiParamsVar : typeof withMultiParams
+>withMultiParams : typeof withMultiParams
 
 function withOptionalParams(a?: string) {
->withOptionalParams : (a?: string) => void
+>withOptionalParams : typeof withOptionalParams
 >a : string
 }
 var withOptionalParamsVar = withOptionalParams;
->withOptionalParamsVar : (a?: string) => void
->withOptionalParams : (a?: string) => void
+>withOptionalParamsVar : typeof withOptionalParams
+>withOptionalParams : typeof withOptionalParams
 
 function withInitializedParams(a: string, b0, b = 30, c = "string value") {
->withInitializedParams : (a: string, b0: any, b?: number, c?: string) => void
+>withInitializedParams : typeof withInitializedParams
 >a : string
 >b0 : any
 >b : number
 >c : string
 }
 var withInitializedParamsVar = withInitializedParams;
->withInitializedParamsVar : (a: string, b0: any, b?: number, c?: string) => void
->withInitializedParams : (a: string, b0: any, b?: number, c?: string) => void
+>withInitializedParamsVar : typeof withInitializedParams
+>withInitializedParams : typeof withInitializedParams
 
 function withOptionalInitializedParams(a: string, c: string = "hello string") {
->withOptionalInitializedParams : (a: string, c?: string) => void
+>withOptionalInitializedParams : typeof withOptionalInitializedParams
 >a : string
 >c : string
 }
 var withOptionalInitializedParamsVar = withOptionalInitializedParams;
->withOptionalInitializedParamsVar : (a: string, c?: string) => void
->withOptionalInitializedParams : (a: string, c?: string) => void
+>withOptionalInitializedParamsVar : typeof withOptionalInitializedParams
+>withOptionalInitializedParams : typeof withOptionalInitializedParams
 
 function withRestParams(a: string, ... myRestParameter : number[]) {
->withRestParams : (a: string, ...myRestParameter: number[]) => number[]
+>withRestParams : typeof withRestParams
 >a : string
 >myRestParameter : number[]
 
@@ -86,19 +86,19 @@ function withRestParams(a: string, ... myRestParameter : number[]) {
 >myRestParameter : number[]
 }
 var withRestParamsVar = withRestParams;
->withRestParamsVar : (a: string, ...myRestParameter: number[]) => number[]
->withRestParams : (a: string, ...myRestParameter: number[]) => number[]
+>withRestParamsVar : typeof withRestParams
+>withRestParams : typeof withRestParams
 
 function overload1(n: number) : string;
->overload1 : { (n: number): string; (s: string): string; }
+>overload1 : typeof overload1
 >n : number
 
 function overload1(s: string) : string;
->overload1 : { (n: number): string; (s: string): string; }
+>overload1 : typeof overload1
 >s : string
 
 function overload1(ns: any) {
->overload1 : { (n: number): string; (s: string): string; }
+>overload1 : typeof overload1
 >ns : any
 
     return ns.toString();
@@ -108,37 +108,29 @@ function overload1(ns: any) {
 >toString : any
 }
 var withOverloadSignature = overload1;
->withOverloadSignature : { (n: number): string; (s: string): string; }
->overload1 : { (n: number): string; (s: string): string; }
+>withOverloadSignature : typeof overload1
+>overload1 : typeof overload1
 
 function f(n: () => void) { }
->f : (n: () => void) => void
+>f : typeof f
 >n : () => void
 
 module m2 {
 >m2 : typeof m2
 
     export function foo(n: () => void ) {
->foo : (n: () => void) => void
+>foo : typeof foo
 >n : () => void
     }
 
 }
 
 m2.foo(() =>  {
->m2.foo(() =>  {
-
-    var b = 30;
-    return b;
-}) : void
->m2.foo : (n: () => void) => void
+>m2.foo(() =>  {    var b = 30;    return b;}) : void
+>m2.foo : typeof foo
 >m2 : typeof m2
->foo : (n: () => void) => void
->() =>  {
-
-    var b = 30;
-    return b;
-} : () => number
+>foo : typeof foo
+>() =>  {    var b = 30;    return b;} : () => number
 
     var b = 30;
 >b : number
@@ -150,22 +142,20 @@ m2.foo(() =>  {
 
 
 declare function fooAmbient(n: number): string;
->fooAmbient : (n: number) => string
+>fooAmbient : typeof fooAmbient
 >n : number
 
 declare function overloadAmbient(n: number): string;
->overloadAmbient : { (n: number): string; (s: string): string; }
+>overloadAmbient : typeof overloadAmbient
 >n : number
 
 declare function overloadAmbient(s: string): string;
->overloadAmbient : { (n: number): string; (s: string): string; }
+>overloadAmbient : typeof overloadAmbient
 >s : string
 
 var f2 = () => {
 >f2 : () => string
->() => {
-    return "string";
-} : () => string
+>() => {    return "string";} : () => string
 
     return "string";
 }
diff --git a/tests/baselines/reference/functionAndInterfaceWithSeparateErrors.errors.txt b/tests/baselines/reference/functionAndInterfaceWithSeparateErrors.errors.txt
deleted file mode 100644
index 58936d29dbb..00000000000
--- a/tests/baselines/reference/functionAndInterfaceWithSeparateErrors.errors.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-==== tests/cases/compiler/functionAndInterfaceWithSeparateErrors.ts (2 errors) ====
-    function Foo(s: string);
-    ~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Overload signature is not compatible with function implementation.
-    function Foo(n: number) { }
-    
-    interface Foo {
-        [s: string]: string;
-        prop: number;
-        ~~~~~~~~~~~~~
-!!! Property 'prop' of type 'number' is not assignable to string index type 'string'.
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/functionAndInterfaceWithSeparateErrors.js b/tests/baselines/reference/functionAndInterfaceWithSeparateErrors.js
deleted file mode 100644
index 004e65d92af..00000000000
--- a/tests/baselines/reference/functionAndInterfaceWithSeparateErrors.js
+++ /dev/null
@@ -1,12 +0,0 @@
-//// [functionAndInterfaceWithSeparateErrors.ts]
-function Foo(s: string);
-function Foo(n: number) { }
-
-interface Foo {
-    [s: string]: string;
-    prop: number;
-}
-
-//// [functionAndInterfaceWithSeparateErrors.js]
-function Foo(n) {
-}
diff --git a/tests/baselines/reference/functionCall1.types b/tests/baselines/reference/functionCall1.types
index 1b06379860c..fbd17de66c7 100644
--- a/tests/baselines/reference/functionCall1.types
+++ b/tests/baselines/reference/functionCall1.types
@@ -1,9 +1,9 @@
 === tests/cases/compiler/functionCall1.ts ===
 function foo():any{return ""};
->foo : () => any
+>foo : typeof foo
 
 var x = foo();
 >x : any
 >foo() : any
->foo : () => any
+>foo : typeof foo
 
diff --git a/tests/baselines/reference/functionCall2.types b/tests/baselines/reference/functionCall2.types
index 92bb0f0be23..a40eefe5bb7 100644
--- a/tests/baselines/reference/functionCall2.types
+++ b/tests/baselines/reference/functionCall2.types
@@ -1,9 +1,9 @@
 === tests/cases/compiler/functionCall2.ts ===
 function foo():number{return 1}; 
->foo : () => number
+>foo : typeof foo
 
 var x = foo();
 >x : number
 >foo() : number
->foo : () => number
+>foo : typeof foo
 
diff --git a/tests/baselines/reference/functionCall3.types b/tests/baselines/reference/functionCall3.types
index a9b8e46069c..242ac83fed1 100644
--- a/tests/baselines/reference/functionCall3.types
+++ b/tests/baselines/reference/functionCall3.types
@@ -1,10 +1,10 @@
 === tests/cases/compiler/functionCall3.ts ===
 function foo():any[]{return [1];} 
->foo : () => any[]
+>foo : typeof foo
 >[1] : any[]
 
 var x = foo();
 >x : any[]
 >foo() : any[]
->foo : () => any[]
+>foo : typeof foo
 
diff --git a/tests/baselines/reference/functionCall4.types b/tests/baselines/reference/functionCall4.types
index 37a0b980a00..0a51873350b 100644
--- a/tests/baselines/reference/functionCall4.types
+++ b/tests/baselines/reference/functionCall4.types
@@ -1,13 +1,13 @@
 === tests/cases/compiler/functionCall4.ts ===
 function foo():any{return ""}; 
->foo : () => any
+>foo : typeof foo
 
 function bar():()=>any{return foo}; 
->bar : () => () => any
->foo : () => any
+>bar : typeof bar
+>foo : typeof foo
 
 var x = bar();
 >x : () => any
 >bar() : () => any
->bar : () => () => any
+>bar : typeof bar
 
diff --git a/tests/baselines/reference/functionCall5.types b/tests/baselines/reference/functionCall5.types
index 2485185bb49..c46f425a18f 100644
--- a/tests/baselines/reference/functionCall5.types
+++ b/tests/baselines/reference/functionCall5.types
@@ -5,7 +5,7 @@ module m1 { export class c1 { public a; }}
 >a : any
 
 function foo():m1.c1{return new m1.c1();}; 
->foo : () => c1
+>foo : typeof foo
 >m1 : m1
 >c1 : c1
 >new m1.c1() : c1
@@ -16,5 +16,5 @@ function foo():m1.c1{return new m1.c1();};
 var x = foo();
 >x : c1
 >foo() : c1
->foo : () => c1
+>foo : typeof foo
 
diff --git a/tests/baselines/reference/functionConstraintSatisfaction.types b/tests/baselines/reference/functionConstraintSatisfaction.types
index 70200af6fa9..56ebbe1fb01 100644
--- a/tests/baselines/reference/functionConstraintSatisfaction.types
+++ b/tests/baselines/reference/functionConstraintSatisfaction.types
@@ -2,7 +2,7 @@
 // satisfaction of a constraint to Function, no errors expected
 
 function foo<T extends Function>(x: T): T { return x; }
->foo : <T extends Function>(x: T) => T
+>foo : typeof foo
 >T : T
 >Function : Function
 >x : T
@@ -39,14 +39,14 @@ var c: { (): string; (x): string };
 var r = foo(new Function());
 >r : Function
 >foo(new Function()) : Function
->foo : <T extends Function>(x: T) => T
+>foo : typeof foo
 >new Function() : Function
 >Function : { (...args: string[]): Function; new (...args: string[]): Function; prototype: Function; }
 
 var r1 = foo((x) => x);
 >r1 : (x: any) => any
 >foo((x) => x) : (x: any) => any
->foo : <T extends Function>(x: T) => T
+>foo : typeof foo
 >(x) => x : (x: any) => any
 >x : any
 >x : any
@@ -54,7 +54,7 @@ var r1 = foo((x) => x);
 var r2 = foo((x: string[]) => x);
 >r2 : (x: string[]) => string[]
 >foo((x: string[]) => x) : (x: string[]) => string[]
->foo : <T extends Function>(x: T) => T
+>foo : typeof foo
 >(x: string[]) => x : (x: string[]) => string[]
 >x : string[]
 >x : string[]
@@ -62,7 +62,7 @@ var r2 = foo((x: string[]) => x);
 var r3 = foo(function (x) { return x });
 >r3 : (x: any) => any
 >foo(function (x) { return x }) : (x: any) => any
->foo : <T extends Function>(x: T) => T
+>foo : typeof foo
 >function (x) { return x } : (x: any) => any
 >x : any
 >x : any
@@ -70,7 +70,7 @@ var r3 = foo(function (x) { return x });
 var r4 = foo(function (x: string[]) { return x });
 >r4 : (x: string[]) => string[]
 >foo(function (x: string[]) { return x }) : (x: string[]) => string[]
->foo : <T extends Function>(x: T) => T
+>foo : typeof foo
 >function (x: string[]) { return x } : (x: string[]) => string[]
 >x : string[]
 >x : string[]
@@ -78,25 +78,25 @@ var r4 = foo(function (x: string[]) { return x });
 var r5 = foo(i);
 >r5 : I
 >foo(i) : I
->foo : <T extends Function>(x: T) => T
+>foo : typeof foo
 >i : I
 
 var r6 = foo(C);
 >r6 : typeof C
 >foo(C) : typeof C
->foo : <T extends Function>(x: T) => T
+>foo : typeof foo
 >C : typeof C
 
 var r7 = foo(b);
 >r7 : new () => string
 >foo(b) : new () => string
->foo : <T extends Function>(x: T) => T
+>foo : typeof foo
 >b : new () => string
 
 var r8 = foo(c);
 >r8 : { (): string; (x: any): string; }
 >foo(c) : { (): string; (x: any): string; }
->foo : <T extends Function>(x: T) => T
+>foo : typeof foo
 >c : { (): string; (x: any): string; }
 
 interface I2<T> {
@@ -151,7 +151,7 @@ var c2: { <T>(x: T): T; <T>(x: T, y: 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
+>foo : typeof foo
 ><U>(x: U) => x : <U>(x: U) => U
 >U : U
 >x : U
@@ -161,7 +161,7 @@ var r9 = foo(<U>(x: U) => x);
 var r10 = foo(function <U>(x: U) { return x; });
 >r10 : <U>(x: U) => U
 >foo(function <U>(x: U) { return x; }) : <U>(x: U) => U
->foo : <T extends Function>(x: T) => T
+>foo : typeof foo
 >function <U>(x: U) { return x; } : <U>(x: U) => U
 >U : U
 >x : U
@@ -171,7 +171,7 @@ var r10 = foo(function <U>(x: U) { return x; });
 var r11 = foo(<U extends Date>(x: U) => x);
 >r11 : <U extends Date>(x: U) => U
 >foo(<U extends Date>(x: U) => x) : <U extends Date>(x: U) => U
->foo : <T extends Function>(x: T) => T
+>foo : typeof foo
 ><U extends Date>(x: U) => x : <U extends Date>(x: U) => U
 >U : U
 >Date : Date
@@ -182,7 +182,7 @@ var r11 = foo(<U extends Date>(x: U) => x);
 var r12 = foo(<U, V>(x: U, y: V) => x);
 >r12 : <U, V>(x: U, y: V) => U
 >foo(<U, V>(x: U, y: V) => x) : <U, V>(x: U, y: V) => U
->foo : <T extends Function>(x: T) => T
+>foo : typeof foo
 ><U, V>(x: U, y: V) => x : <U, V>(x: U, y: V) => U
 >U : U
 >V : V
@@ -195,25 +195,25 @@ var r12 = foo(<U, V>(x: U, y: V) => x);
 var r13 = foo(i2);
 >r13 : I2<string>
 >foo(i2) : I2<string>
->foo : <T extends Function>(x: T) => T
+>foo : typeof foo
 >i2 : I2<string>
 
 var r14 = foo(C2);
 >r14 : typeof C2
 >foo(C2) : typeof C2
->foo : <T extends Function>(x: T) => T
+>foo : typeof foo
 >C2 : typeof C2
 
 var r15 = foo(b2);
 >r15 : new <T>(x: T) => T
 >foo(b2) : new <T>(x: T) => T
->foo : <T extends Function>(x: T) => T
+>foo : typeof foo
 >b2 : new <T>(x: T) => T
 
 var r16 = foo(c2);
 >r16 : { <T>(x: T): T; <T>(x: T, y: T): T; }
 >foo(c2) : { <T>(x: T): T; <T>(x: T, y: T): T; }
->foo : <T extends Function>(x: T) => T
+>foo : typeof foo
 >c2 : { <T>(x: T): T; <T>(x: T, y: T): T; }
 
 interface F2 extends Function { foo: string; }
@@ -228,11 +228,11 @@ var f2: F2;
 var r17 = foo(f2);
 >r17 : F2
 >foo(f2) : F2
->foo : <T extends Function>(x: T) => T
+>foo : typeof foo
 >f2 : 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
+>foo2 : typeof foo2
 >T : T
 >U : U
 >x : T
@@ -242,12 +242,12 @@ function foo2<T extends { (): void }, U extends { (): void }>(x: T, y: U) {
 
     foo(x);
 >foo(x) : T
->foo : <T extends Function>(x: T) => T
+>foo : typeof foo
 >x : T
 
     foo(y);
 >foo(y) : U
->foo : <T extends Function>(x: T) => T
+>foo : typeof foo
 >y : U
 }
 //function foo2<T extends { (): void }, U extends T>(x: T, y: U) {
diff --git a/tests/baselines/reference/functionConstraintSatisfaction3.types b/tests/baselines/reference/functionConstraintSatisfaction3.types
index 04963c36519..f260cc568da 100644
--- a/tests/baselines/reference/functionConstraintSatisfaction3.types
+++ b/tests/baselines/reference/functionConstraintSatisfaction3.types
@@ -2,7 +2,7 @@
 // satisfaction of a constraint to Function, no errors expected
 
 function foo<T extends (x: string) => string>(x: T): T { return x; }
->foo : <T extends (x: string) => string>(x: T) => T
+>foo : typeof foo
 >T : T
 >x : string
 >x : T
@@ -39,7 +39,7 @@ var c: { (): string; (x): string };
 var r1 = foo((x) => x);
 >r1 : (x: any) => any
 >foo((x) => x) : (x: any) => any
->foo : <T extends (x: string) => string>(x: T) => T
+>foo : typeof foo
 >(x) => x : (x: any) => any
 >x : any
 >x : any
@@ -47,7 +47,7 @@ var r1 = foo((x) => x);
 var r2 = foo((x: string) => x);
 >r2 : (x: string) => string
 >foo((x: string) => x) : (x: string) => string
->foo : <T extends (x: string) => string>(x: T) => T
+>foo : typeof foo
 >(x: string) => x : (x: string) => string
 >x : string
 >x : string
@@ -55,7 +55,7 @@ var r2 = foo((x: string) => x);
 var r3 = foo(function (x) { return x });
 >r3 : (x: any) => any
 >foo(function (x) { return x }) : (x: any) => any
->foo : <T extends (x: string) => string>(x: T) => T
+>foo : typeof foo
 >function (x) { return x } : (x: any) => any
 >x : any
 >x : any
@@ -63,7 +63,7 @@ var r3 = foo(function (x) { return x });
 var r4 = foo(function (x: string) { return x });
 >r4 : (x: string) => string
 >foo(function (x: string) { return x }) : (x: string) => string
->foo : <T extends (x: string) => string>(x: T) => T
+>foo : typeof foo
 >function (x: string) { return x } : (x: string) => string
 >x : string
 >x : string
@@ -71,13 +71,13 @@ var r4 = foo(function (x: string) { return x });
 var r5 = foo(i);
 >r5 : I
 >foo(i) : I
->foo : <T extends (x: string) => string>(x: T) => T
+>foo : typeof foo
 >i : I
 
 var r8 = foo(c);
 >r8 : { (): string; (x: any): string; }
 >foo(c) : { (): string; (x: any): string; }
->foo : <T extends (x: string) => string>(x: T) => T
+>foo : typeof foo
 >c : { (): string; (x: any): string; }
 
 interface I2<T> {
@@ -132,7 +132,7 @@ var c2: { <T>(x: T): T; <T>(x: T, y: T): T };
 var r9 = foo(function <U>(x: U) { return x; });
 >r9 : <U>(x: U) => U
 >foo(function <U>(x: U) { return x; }) : <U>(x: U) => U
->foo : <T extends (x: string) => string>(x: T) => T
+>foo : typeof foo
 >function <U>(x: U) { return x; } : <U>(x: U) => U
 >U : U
 >x : U
@@ -142,7 +142,7 @@ var r9 = foo(function <U>(x: U) { return x; });
 var r10 = foo(<U extends string>(x: U) => x);
 >r10 : <U extends string>(x: U) => U
 >foo(<U extends string>(x: U) => x) : <U extends string>(x: U) => U
->foo : <T extends (x: string) => string>(x: T) => T
+>foo : typeof foo
 ><U extends string>(x: U) => x : <U extends string>(x: U) => U
 >U : U
 >x : U
@@ -152,12 +152,12 @@ var r10 = foo(<U extends string>(x: U) => x);
 var r12 = foo(i2);
 >r12 : I2<string>
 >foo(i2) : I2<string>
->foo : <T extends (x: string) => string>(x: T) => T
+>foo : typeof foo
 >i2 : I2<string>
 
 var r15 = foo(c2);
 >r15 : { <T>(x: T): T; <T>(x: T, y: T): T; }
 >foo(c2) : { <T>(x: T): T; <T>(x: T, y: T): T; }
->foo : <T extends (x: string) => string>(x: T) => T
+>foo : typeof foo
 >c2 : { <T>(x: T): T; <T>(x: T, y: T): T; }
 
diff --git a/tests/baselines/reference/functionDeclarationWithArgumentOfTypeFunctionTypeArray.types b/tests/baselines/reference/functionDeclarationWithArgumentOfTypeFunctionTypeArray.types
index af751fbb0e9..fefa0168edb 100644
--- a/tests/baselines/reference/functionDeclarationWithArgumentOfTypeFunctionTypeArray.types
+++ b/tests/baselines/reference/functionDeclarationWithArgumentOfTypeFunctionTypeArray.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/functionDeclarationWithArgumentOfTypeFunctionTypeArray.ts ===
 function foo(args: { (x): number }[]) {
->foo : (args: { (x: any): number; }[]) => number
+>foo : typeof foo
 >args : { (x: any): number; }[]
 >x : any
 
diff --git a/tests/baselines/reference/functionImplementations.types b/tests/baselines/reference/functionImplementations.types
index b9c100e49b0..eeb3cb02a5c 100644
--- a/tests/baselines/reference/functionImplementations.types
+++ b/tests/baselines/reference/functionImplementations.types
@@ -8,9 +8,7 @@ var v: void = function () { } ();
 // FunctionExpression f with no return type annotation and directly references f in its body returns any
 var a: any = function f() {
 >a : any
->function f() {
-    return f;
-} : () => any
+>function f() {    return f;} : () => any
 >f : () => any
 
     return f;
@@ -19,9 +17,7 @@ var a: any = function f() {
 };
 var a: any = function f() {
 >a : any
->function f() {
-    return f();
-} : () => any
+>function f() {    return f();} : () => any
 >f : () => any
 
     return f();
@@ -33,10 +29,7 @@ var a: any = function f() {
 // FunctionExpression f with no return type annotation and indirectly references f in its body returns any
 var a: any = function f() {
 >a : any
->function f() {
-    var x = f;
-    return x;
-} : () => any
+>function f() {    var x = f;    return x;} : () => any
 >f : () => any
 
     var x = f;
@@ -50,43 +43,43 @@ var a: any = function f() {
 
 // Two mutually recursive function implementations with no return type annotations
 function rec1() {
->rec1 : () => any
+>rec1 : typeof rec1
 
     return rec2();
 >rec2() : any
->rec2 : () => any
+>rec2 : typeof rec2
 }
 function rec2() {
->rec2 : () => any
+>rec2 : typeof rec2
 
     return rec1();
 >rec1() : any
->rec1 : () => any
+>rec1 : typeof rec1
 }
 var a = rec1();
 >a : any
 >rec1() : any
->rec1 : () => any
+>rec1 : typeof rec1
 
 var a = rec2();
 >a : any
 >rec2() : any
->rec2 : () => any
+>rec2 : typeof rec2
 
 // Two mutually recursive function implementations with return type annotation in one
 function rec3(): number {
->rec3 : () => number
+>rec3 : typeof rec3
 
     return rec4();
 >rec4() : number
->rec4 : () => number
+>rec4 : typeof rec4
 }
 function rec4() {
->rec4 : () => number
+>rec4 : typeof rec4
 
     return rec3();
 >rec3() : number
->rec3 : () => number
+>rec3 : typeof rec3
 }
 var n: number;
 >n : number
@@ -94,22 +87,18 @@ var n: number;
 var n = rec3();
 >n : number
 >rec3() : number
->rec3 : () => number
+>rec3 : typeof rec3
 
 var n = rec4();
 >n : number
 >rec4() : number
->rec4 : () => number
+>rec4 : typeof rec4
 
 // FunctionExpression with no return type annotation and returns a number
 var n = function () {
 >n : number
->function () {
-    return 3;
-} () : number
->function () {
-    return 3;
-} : () => number
+>function () {    return 3;} () : number
+>function () {    return 3;} : () => number
 
     return 3;
 } ();
@@ -120,12 +109,8 @@ var nu = null;
 
 var nu = function () {
 >nu : any
->function () {
-    return null;
-} () : any
->function () {
-    return null;
-} : () => any
+>function () {    return null;} () : any
+>function () {    return null;} : () => any
 
     return null;
 } ();
@@ -137,12 +122,8 @@ var un = undefined;
 
 var un = function () {
 >un : any
->function () {
-    return undefined;
-} () : any
->function () {
-    return undefined;
-} : () => any
+>function () {    return undefined;} () : any
+>function () {    return undefined;} : () => any
 
     return undefined;
 >undefined : undefined
@@ -152,12 +133,8 @@ var un = function () {
 // FunctionExpression with no return type annotation and returns a type parameter type
 var n = function <T>(x: T) {
 >n : number
->function <T>(x: T) {
-    return x;
-} (4) : number
->function <T>(x: T) {
-    return x;
-} : <T>(x: T) => T
+>function <T>(x: T) {    return x;} (4) : number
+>function <T>(x: T) {    return x;} : <T>(x: T) => T
 >T : T
 >x : T
 >T : T
@@ -170,12 +147,8 @@ var n = function <T>(x: T) {
 // FunctionExpression with no return type annotation and returns a constrained type parameter type
 var n = function <T extends {}>(x: T) {
 >n : number
->function <T extends {}>(x: T) {
-    return x;
-} (4) : number
->function <T extends {}>(x: T) {
-    return x;
-} : <T extends {}>(x: T) => T
+>function <T extends {}>(x: T) {    return x;} (4) : number
+>function <T extends {}>(x: T) {    return x;} : <T extends {}>(x: T) => T
 >T : T
 >x : T
 >T : T
@@ -188,14 +161,8 @@ var n = function <T extends {}>(x: T) {
 // FunctionExpression with no return type annotation with multiple return statements with identical types
 var n = function () {
 >n : number
->function () {
-    return 3;
-    return 5;
-}() : number
->function () {
-    return 3;
-    return 5;
-} : () => number
+>function () {    return 3;    return 5;}() : number
+>function () {    return 3;    return 5;} : () => number
 
     return 3;
     return 5;
@@ -217,12 +184,8 @@ var b: Base;
 
 var b = function () {
 >b : Base
->function () {
-    return new Base(); return new Derived();
-} () : Base
->function () {
-    return new Base(); return new Derived();
-} : () => Base
+>function () {    return new Base(); return new Derived();} () : Base
+>function () {    return new Base(); return new Derived();} : () => Base
 
     return new Base(); return new Derived();
 >new Base() : Base
@@ -235,12 +198,8 @@ var b = function () {
 // FunctionExpression with no return type annotation with multiple return statements with one a recursive call
 var a = function f() {
 >a : any
->function f() {
-    return new Base(); return new Derived(); return f(); // ?
-} () : any
->function f() {
-    return new Base(); return new Derived(); return f(); // ?
-} : () => any
+>function f() {    return new Base(); return new Derived(); return f(); // ?} () : any
+>function f() {    return new Base(); return new Derived(); return f(); // ?} : () => any
 >f : () => any
 
     return new Base(); return new Derived(); return f(); // ?
@@ -255,13 +214,9 @@ var a = function f() {
 
 // FunctionExpression with non -void return type annotation with a single throw statement
 undefined === function (): number {
->undefined === function (): number {
-    throw undefined;
-} : boolean
+>undefined === function (): number {    throw undefined;} : boolean
 >undefined : undefined
->function (): number {
-    throw undefined;
-} : () => number
+>function (): number {    throw undefined;} : () => number
 
     throw undefined;
 >undefined : undefined
@@ -270,7 +225,7 @@ undefined === function (): number {
 
 // Type of 'this' in function implementation is 'any'
 function thisFunc() {
->thisFunc : () => void
+>thisFunc : typeof thisFunc
 
     var x = this;
 >x : any
@@ -282,7 +237,7 @@ function thisFunc() {
 
 // Function signature with optional parameter, no type annotation and initializer has initializer's type
 function opt1(n = 4) {
->opt1 : (n?: number) => void
+>opt1 : typeof opt1
 >n : number
 
     var m = n;
@@ -295,7 +250,7 @@ function opt1(n = 4) {
 
 // Function signature with optional parameter, no type annotation and initializer has initializer's widened type
 function opt2(n = { x: null, y: undefined }) {
->opt2 : (n?: { x: any; y: any; }) => void
+>opt2 : typeof opt2
 >n : { x: any; y: any; }
 >{ x: null, y: undefined } : { x: null; y: undefined; }
 >x : any
@@ -314,7 +269,7 @@ function opt2(n = { x: null, y: undefined }) {
 
 // Function signature with initializer referencing other parameter to the left
 function opt3(n: number, m = n) {
->opt3 : (n: number, m?: number) => void
+>opt3 : typeof opt3
 >n : number
 >m : number
 >n : number
@@ -332,7 +287,7 @@ function opt3(n: number, m = n) {
 
 // FunctionExpression with non -void return type annotation return with no expression
 function f6(): number {
->f6 : () => number
+>f6 : typeof f6
 
     return;
 }
diff --git a/tests/baselines/reference/functionMergedWithModule.types b/tests/baselines/reference/functionMergedWithModule.types
index d0c711ab39a..357762b9acd 100644
--- a/tests/baselines/reference/functionMergedWithModule.types
+++ b/tests/baselines/reference/functionMergedWithModule.types
@@ -12,7 +12,7 @@ module foo.Bar {
 >Bar : typeof Bar
 
     export function f() {
->f : () => void
+>f : typeof f
     }
 }
 
@@ -21,12 +21,12 @@ module foo.Baz {
 >Baz : typeof Baz
 
     export function g() {
->g : () => void
+>g : typeof g
 
         Bar.f();
 >Bar.f() : void
->Bar.f : () => void
+>Bar.f : typeof f
 >Bar : typeof Bar
->f : () => void
+>f : typeof f
     }
 }
diff --git a/tests/baselines/reference/functionOnlyHasThrow.types b/tests/baselines/reference/functionOnlyHasThrow.types
index 0f76f4be39d..33237c3c78a 100644
--- a/tests/baselines/reference/functionOnlyHasThrow.types
+++ b/tests/baselines/reference/functionOnlyHasThrow.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/functionOnlyHasThrow.ts ===
 function clone():number {
->clone : () => number
+>clone : typeof clone
 
 	throw new Error("To be implemented");
 >new Error("To be implemented") : Error
diff --git a/tests/baselines/reference/functionOverloads10.types b/tests/baselines/reference/functionOverloads10.types
index 8ec2bc7c589..8637862a87e 100644
--- a/tests/baselines/reference/functionOverloads10.types
+++ b/tests/baselines/reference/functionOverloads10.types
@@ -1,14 +1,14 @@
 === tests/cases/compiler/functionOverloads10.ts ===
 function foo(foo:string, bar:number);
->foo : { (foo: string, bar: number): any; (foo: string): any; }
+>foo : typeof foo
 >foo : string
 >bar : number
 
 function foo(foo:string);
->foo : { (foo: string, bar: number): any; (foo: string): any; }
+>foo : typeof foo
 >foo : string
 
 function foo(foo:any){ }
->foo : { (foo: string, bar: number): any; (foo: string): any; }
+>foo : typeof foo
 >foo : any
 
diff --git a/tests/baselines/reference/functionOverloads12.types b/tests/baselines/reference/functionOverloads12.types
index 6e4c2d9189e..2b46367ecbb 100644
--- a/tests/baselines/reference/functionOverloads12.types
+++ b/tests/baselines/reference/functionOverloads12.types
@@ -1,10 +1,10 @@
 === tests/cases/compiler/functionOverloads12.ts ===
 function foo():string;
->foo : { (): string; (): number; }
+>foo : typeof foo
 
 function foo():number;
->foo : { (): string; (): number; }
+>foo : typeof foo
 
 function foo():any { if (true) return ""; else return 0;}
->foo : { (): string; (): number; }
+>foo : typeof foo
 
diff --git a/tests/baselines/reference/functionOverloads13.types b/tests/baselines/reference/functionOverloads13.types
index ee65bc296e7..438a3008e9b 100644
--- a/tests/baselines/reference/functionOverloads13.types
+++ b/tests/baselines/reference/functionOverloads13.types
@@ -1,13 +1,13 @@
 === tests/cases/compiler/functionOverloads13.ts ===
 function foo(bar:number):string;
->foo : { (bar: number): string; (bar: number): number; }
+>foo : typeof foo
 >bar : number
 
 function foo(bar:number):number;
->foo : { (bar: number): string; (bar: number): number; }
+>foo : typeof foo
 >bar : number
 
 function foo(bar?:number):any { return "" }
->foo : { (bar: number): string; (bar: number): number; }
+>foo : typeof foo
 >bar : number
 
diff --git a/tests/baselines/reference/functionOverloads14.types b/tests/baselines/reference/functionOverloads14.types
index 562c43965c7..60c8a44e996 100644
--- a/tests/baselines/reference/functionOverloads14.types
+++ b/tests/baselines/reference/functionOverloads14.types
@@ -1,14 +1,14 @@
 === tests/cases/compiler/functionOverloads14.ts ===
 function foo():{a:number;}
->foo : { (): { a: number; }; (): { a: string; }; }
+>foo : typeof foo
 >a : number
 
 function foo():{a:string;}
->foo : { (): { a: number; }; (): { a: string; }; }
+>foo : typeof foo
 >a : string
 
 function foo():{a:any;} { return {a:1} }
->foo : { (): { a: number; }; (): { a: string; }; }
+>foo : typeof foo
 >a : any
 >{a:1} : { a: number; }
 >a : number
diff --git a/tests/baselines/reference/functionOverloads15.types b/tests/baselines/reference/functionOverloads15.types
index 6ca5b6709cb..ab5b25fb369 100644
--- a/tests/baselines/reference/functionOverloads15.types
+++ b/tests/baselines/reference/functionOverloads15.types
@@ -1,18 +1,18 @@
 === tests/cases/compiler/functionOverloads15.ts ===
 function foo(foo:{a:string; b:number;}):string;
->foo : { (foo: { a: string; b: number; }): string; (foo: { a: string; b: number; }): number; }
+>foo : typeof foo
 >foo : { a: string; b: number; }
 >a : string
 >b : number
 
 function foo(foo:{a:string; b:number;}):number;
->foo : { (foo: { a: string; b: number; }): string; (foo: { a: string; b: number; }): number; }
+>foo : typeof foo
 >foo : { a: string; b: number; }
 >a : string
 >b : number
 
 function foo(foo:{a:string; b?:number;}):any { return "" }
->foo : { (foo: { a: string; b: number; }): string; (foo: { a: string; b: number; }): number; }
+>foo : typeof foo
 >foo : { a: string; b?: number; }
 >a : string
 >b : number
diff --git a/tests/baselines/reference/functionOverloads16.types b/tests/baselines/reference/functionOverloads16.types
index 6974d0dab98..ae3d08d6479 100644
--- a/tests/baselines/reference/functionOverloads16.types
+++ b/tests/baselines/reference/functionOverloads16.types
@@ -1,16 +1,16 @@
 === tests/cases/compiler/functionOverloads16.ts ===
 function foo(foo:{a:string;}):string;
->foo : { (foo: { a: string; }): string; (foo: { a: string; }): number; }
+>foo : typeof foo
 >foo : { a: string; }
 >a : string
 
 function foo(foo:{a:string;}):number;
->foo : { (foo: { a: string; }): string; (foo: { a: string; }): number; }
+>foo : typeof foo
 >foo : { a: string; }
 >a : string
 
 function foo(foo:{a:string; b?:number;}):any { return "" }
->foo : { (foo: { a: string; }): string; (foo: { a: string; }): number; }
+>foo : typeof foo
 >foo : { a: string; b?: number; }
 >a : string
 >b : number
diff --git a/tests/baselines/reference/functionOverloads21.types b/tests/baselines/reference/functionOverloads21.types
index dc9e28b7b57..e3a8be004d5 100644
--- a/tests/baselines/reference/functionOverloads21.types
+++ b/tests/baselines/reference/functionOverloads21.types
@@ -1,17 +1,17 @@
 === tests/cases/compiler/functionOverloads21.ts ===
 function foo(bar:{a:number;}[]);
->foo : { (bar: { a: number; }[]): any; (bar: { a: number; b: string; }[]): any; }
+>foo : typeof foo
 >bar : { a: number; }[]
 >a : number
 
 function foo(bar:{a:number; b:string;}[]);
->foo : { (bar: { a: number; }[]): any; (bar: { a: number; b: string; }[]): any; }
+>foo : typeof foo
 >bar : { a: number; b: string; }[]
 >a : number
 >b : string
 
 function foo(bar:{a:any; b?:string;}[]) { return 0 }
->foo : { (bar: { a: number; }[]): any; (bar: { a: number; b: string; }[]): any; }
+>foo : typeof foo
 >bar : { a: any; b?: string; }[]
 >a : any
 >b : string
diff --git a/tests/baselines/reference/functionOverloads23.types b/tests/baselines/reference/functionOverloads23.types
index 40b67a78c55..4bdbc646fcf 100644
--- a/tests/baselines/reference/functionOverloads23.types
+++ b/tests/baselines/reference/functionOverloads23.types
@@ -1,16 +1,16 @@
 === tests/cases/compiler/functionOverloads23.ts ===
 function foo(bar:(b:string)=>void);
->foo : { (bar: (b: string) => void): any; (bar: (a: number) => void): any; }
+>foo : typeof foo
 >bar : (b: string) => void
 >b : string
 
 function foo(bar:(a:number)=>void);
->foo : { (bar: (b: string) => void): any; (bar: (a: number) => void): any; }
+>foo : typeof foo
 >bar : (a: number) => void
 >a : number
 
 function foo(bar:(a?)=>void) { return 0 }
->foo : { (bar: (b: string) => void): any; (bar: (a: number) => void): any; }
+>foo : typeof foo
 >bar : (a?: any) => void
 >a : any
 
diff --git a/tests/baselines/reference/functionOverloads24.types b/tests/baselines/reference/functionOverloads24.types
index f6f090d904f..cea176a6e05 100644
--- a/tests/baselines/reference/functionOverloads24.types
+++ b/tests/baselines/reference/functionOverloads24.types
@@ -1,16 +1,16 @@
 === tests/cases/compiler/functionOverloads24.ts ===
 function foo(bar:number):(b:string)=>void;
->foo : { (bar: number): (b: string) => void; (bar: string): (a: number) => void; }
+>foo : typeof foo
 >bar : number
 >b : string
 
 function foo(bar:string):(a:number)=>void;
->foo : { (bar: number): (b: string) => void; (bar: string): (a: number) => void; }
+>foo : typeof foo
 >bar : string
 >a : number
 
 function foo(bar:any):(a)=>void { return function(){} }
->foo : { (bar: number): (b: string) => void; (bar: string): (a: number) => void; }
+>foo : typeof foo
 >bar : any
 >a : any
 >function(){} : () => void
diff --git a/tests/baselines/reference/functionOverloads25.types b/tests/baselines/reference/functionOverloads25.types
index ace77ebc9e4..e84ac94b798 100644
--- a/tests/baselines/reference/functionOverloads25.types
+++ b/tests/baselines/reference/functionOverloads25.types
@@ -1,17 +1,17 @@
 === tests/cases/compiler/functionOverloads25.ts ===
 function foo():string;
->foo : { (): string; (bar: string): number; }
+>foo : typeof foo
 
 function foo(bar:string):number;
->foo : { (): string; (bar: string): number; }
+>foo : typeof foo
 >bar : string
 
 function foo(bar?:any):any{ return '' };
->foo : { (): string; (bar: string): number; }
+>foo : typeof foo
 >bar : any
 
 var x = foo();
 >x : string
 >foo() : string
->foo : { (): string; (bar: string): number; }
+>foo : typeof foo
 
diff --git a/tests/baselines/reference/functionOverloads26.types b/tests/baselines/reference/functionOverloads26.types
index 402003d7e7b..40aad4298da 100644
--- a/tests/baselines/reference/functionOverloads26.types
+++ b/tests/baselines/reference/functionOverloads26.types
@@ -1,17 +1,17 @@
 === tests/cases/compiler/functionOverloads26.ts ===
 function foo():string;
->foo : { (): string; (bar: string): number; }
+>foo : typeof foo
 
 function foo(bar:string):number;
->foo : { (): string; (bar: string): number; }
+>foo : typeof foo
 >bar : string
 
 function foo(bar?:any):any{ return '' }
->foo : { (): string; (bar: string): number; }
+>foo : typeof foo
 >bar : any
 
 var x = foo('baz');
 >x : number
 >foo('baz') : number
->foo : { (): string; (bar: string): number; }
+>foo : typeof foo
 
diff --git a/tests/baselines/reference/functionOverloads28.types b/tests/baselines/reference/functionOverloads28.types
index 034d35c64f7..f27ae1b8c0c 100644
--- a/tests/baselines/reference/functionOverloads28.types
+++ b/tests/baselines/reference/functionOverloads28.types
@@ -1,19 +1,19 @@
 === tests/cases/compiler/functionOverloads28.ts ===
 function foo():string;
->foo : { (): string; (bar: string): number; }
+>foo : typeof foo
 
 function foo(bar:string):number;
->foo : { (): string; (bar: string): number; }
+>foo : typeof foo
 >bar : string
 
 function foo(bar?:any):any{ return '' }
->foo : { (): string; (bar: string): number; }
+>foo : typeof foo
 >bar : any
 
 var t:any; var x = foo(t);
 >t : any
 >x : number
 >foo(t) : number
->foo : { (): string; (bar: string): number; }
+>foo : typeof foo
 >t : any
 
diff --git a/tests/baselines/reference/functionOverloads30.types b/tests/baselines/reference/functionOverloads30.types
index 80d43c952d9..088e6f51127 100644
--- a/tests/baselines/reference/functionOverloads30.types
+++ b/tests/baselines/reference/functionOverloads30.types
@@ -1,19 +1,19 @@
 === tests/cases/compiler/functionOverloads30.ts ===
 function foo(bar:string):string;
->foo : { (bar: string): string; (bar: number): number; }
+>foo : typeof foo
 >bar : string
 
 function foo(bar:number):number;
->foo : { (bar: string): string; (bar: number): number; }
+>foo : typeof foo
 >bar : number
 
 function foo(bar:any):any{ return bar }
->foo : { (bar: string): string; (bar: number): number; }
+>foo : typeof foo
 >bar : any
 >bar : any
 
 var x = foo('bar');
 >x : string
 >foo('bar') : string
->foo : { (bar: string): string; (bar: number): number; }
+>foo : typeof foo
 
diff --git a/tests/baselines/reference/functionOverloads31.types b/tests/baselines/reference/functionOverloads31.types
index 4d7816166bc..1005a2dc55c 100644
--- a/tests/baselines/reference/functionOverloads31.types
+++ b/tests/baselines/reference/functionOverloads31.types
@@ -1,19 +1,19 @@
 === tests/cases/compiler/functionOverloads31.ts ===
 function foo(bar:string):string;
->foo : { (bar: string): string; (bar: number): number; }
+>foo : typeof foo
 >bar : string
 
 function foo(bar:number):number;
->foo : { (bar: string): string; (bar: number): number; }
+>foo : typeof foo
 >bar : number
 
 function foo(bar:any):any{ return bar }
->foo : { (bar: string): string; (bar: number): number; }
+>foo : typeof foo
 >bar : any
 >bar : any
 
 var x = foo(5);
 >x : number
 >foo(5) : number
->foo : { (bar: string): string; (bar: number): number; }
+>foo : typeof foo
 
diff --git a/tests/baselines/reference/functionOverloads32.types b/tests/baselines/reference/functionOverloads32.types
index df997e5d52a..c858f2a54d1 100644
--- a/tests/baselines/reference/functionOverloads32.types
+++ b/tests/baselines/reference/functionOverloads32.types
@@ -1,14 +1,14 @@
 === tests/cases/compiler/functionOverloads32.ts ===
 function foo(bar:string):string;
->foo : { (bar: string): string; (bar: number): number; }
+>foo : typeof foo
 >bar : string
 
 function foo(bar:number):number;
->foo : { (bar: string): string; (bar: number): number; }
+>foo : typeof foo
 >bar : number
 
 function foo(bar:any):any{ return bar }
->foo : { (bar: string): string; (bar: number): number; }
+>foo : typeof foo
 >bar : any
 >bar : any
 
@@ -16,6 +16,6 @@ var baz:number; var x = foo(baz);
 >baz : number
 >x : number
 >foo(baz) : number
->foo : { (bar: string): string; (bar: number): number; }
+>foo : typeof foo
 >baz : number
 
diff --git a/tests/baselines/reference/functionOverloads33.types b/tests/baselines/reference/functionOverloads33.types
index 0199277180d..fd510ea959e 100644
--- a/tests/baselines/reference/functionOverloads33.types
+++ b/tests/baselines/reference/functionOverloads33.types
@@ -1,19 +1,19 @@
 === tests/cases/compiler/functionOverloads33.ts ===
 function foo(bar:string):string;
->foo : { (bar: string): string; (bar: any): number; }
+>foo : typeof foo
 >bar : string
 
 function foo(bar:any):number;
->foo : { (bar: string): string; (bar: any): number; }
+>foo : typeof foo
 >bar : any
 
 function foo(bar:any):any{ return bar }
->foo : { (bar: string): string; (bar: any): number; }
+>foo : typeof foo
 >bar : any
 >bar : any
 
 var x = foo(5);
 >x : number
 >foo(5) : number
->foo : { (bar: string): string; (bar: any): number; }
+>foo : typeof foo
 
diff --git a/tests/baselines/reference/functionOverloads35.types b/tests/baselines/reference/functionOverloads35.types
index 567f9512e3d..db42ed0d47b 100644
--- a/tests/baselines/reference/functionOverloads35.types
+++ b/tests/baselines/reference/functionOverloads35.types
@@ -1,16 +1,16 @@
 === tests/cases/compiler/functionOverloads35.ts ===
 function foo(bar:{a:number;}):number;
->foo : { (bar: { a: number; }): number; (bar: { a: string; }): string; }
+>foo : typeof foo
 >bar : { a: number; }
 >a : number
 
 function foo(bar:{a:string;}):string;
->foo : { (bar: { a: number; }): number; (bar: { a: string; }): string; }
+>foo : typeof foo
 >bar : { a: string; }
 >a : string
 
 function foo(bar:{a:any;}):any{ return bar }
->foo : { (bar: { a: number; }): number; (bar: { a: string; }): string; }
+>foo : typeof foo
 >bar : { a: any; }
 >a : any
 >bar : { a: any; }
@@ -18,7 +18,7 @@ function foo(bar:{a:any;}):any{ return bar }
 var x = foo({a:1});
 >x : number
 >foo({a:1}) : number
->foo : { (bar: { a: number; }): number; (bar: { a: string; }): string; }
+>foo : typeof foo
 >{a:1} : { a: number; }
 >a : number
 
diff --git a/tests/baselines/reference/functionOverloads36.types b/tests/baselines/reference/functionOverloads36.types
index 8118a1c113a..3726bbea87d 100644
--- a/tests/baselines/reference/functionOverloads36.types
+++ b/tests/baselines/reference/functionOverloads36.types
@@ -1,16 +1,16 @@
 === tests/cases/compiler/functionOverloads36.ts ===
 function foo(bar:{a:number;}):number;
->foo : { (bar: { a: number; }): number; (bar: { a: string; }): string; }
+>foo : typeof foo
 >bar : { a: number; }
 >a : number
 
 function foo(bar:{a:string;}):string;
->foo : { (bar: { a: number; }): number; (bar: { a: string; }): string; }
+>foo : typeof foo
 >bar : { a: string; }
 >a : string
 
 function foo(bar:{a:any;}):any{ return bar }
->foo : { (bar: { a: number; }): number; (bar: { a: string; }): string; }
+>foo : typeof foo
 >bar : { a: any; }
 >a : any
 >bar : { a: any; }
@@ -18,7 +18,7 @@ function foo(bar:{a:any;}):any{ return bar }
 var x = foo({a:'foo'});
 >x : string
 >foo({a:'foo'}) : string
->foo : { (bar: { a: number; }): number; (bar: { a: string; }): string; }
+>foo : typeof foo
 >{a:'foo'} : { a: string; }
 >a : string
 
diff --git a/tests/baselines/reference/functionOverloads38.types b/tests/baselines/reference/functionOverloads38.types
index 852191ba07f..021ac7490ba 100644
--- a/tests/baselines/reference/functionOverloads38.types
+++ b/tests/baselines/reference/functionOverloads38.types
@@ -1,16 +1,16 @@
 === tests/cases/compiler/functionOverloads38.ts ===
 function foo(bar:{a:number;}[]):string;
->foo : { (bar: { a: number; }[]): string; (bar: { a: boolean; }[]): number; }
+>foo : typeof foo
 >bar : { a: number; }[]
 >a : number
 
 function foo(bar:{a:boolean;}[]):number;
->foo : { (bar: { a: number; }[]): string; (bar: { a: boolean; }[]): number; }
+>foo : typeof foo
 >bar : { a: boolean; }[]
 >a : boolean
 
 function foo(bar:{a:any;}[]):any{ return bar }
->foo : { (bar: { a: number; }[]): string; (bar: { a: boolean; }[]): number; }
+>foo : typeof foo
 >bar : { a: any; }[]
 >a : any
 >bar : { a: any; }[]
@@ -18,7 +18,7 @@ function foo(bar:{a:any;}[]):any{ return bar }
 var x = foo([{a:1}]);
 >x : string
 >foo([{a:1}]) : string
->foo : { (bar: { a: number; }[]): string; (bar: { a: boolean; }[]): number; }
+>foo : typeof foo
 >[{a:1}] : { a: number; }[]
 >{a:1} : { a: number; }
 >a : number
diff --git a/tests/baselines/reference/functionOverloads39.types b/tests/baselines/reference/functionOverloads39.types
index 70eee2b5163..1cb1ebc43c1 100644
--- a/tests/baselines/reference/functionOverloads39.types
+++ b/tests/baselines/reference/functionOverloads39.types
@@ -1,16 +1,16 @@
 === tests/cases/compiler/functionOverloads39.ts ===
 function foo(bar:{a:number;}[]):string;
->foo : { (bar: { a: number; }[]): string; (bar: { a: boolean; }[]): number; }
+>foo : typeof foo
 >bar : { a: number; }[]
 >a : number
 
 function foo(bar:{a:boolean;}[]):number;
->foo : { (bar: { a: number; }[]): string; (bar: { a: boolean; }[]): number; }
+>foo : typeof foo
 >bar : { a: boolean; }[]
 >a : boolean
 
 function foo(bar:{a:any;}[]):any{ return bar }
->foo : { (bar: { a: number; }[]): string; (bar: { a: boolean; }[]): number; }
+>foo : typeof foo
 >bar : { a: any; }[]
 >a : any
 >bar : { a: any; }[]
@@ -18,7 +18,7 @@ function foo(bar:{a:any;}[]):any{ return bar }
 var x = foo([{a:true}]);
 >x : number
 >foo([{a:true}]) : number
->foo : { (bar: { a: number; }[]): string; (bar: { a: boolean; }[]): number; }
+>foo : typeof foo
 >[{a:true}] : { a: boolean; }[]
 >{a:true} : { a: boolean; }
 >a : boolean
diff --git a/tests/baselines/reference/functionOverloads42.types b/tests/baselines/reference/functionOverloads42.types
index dec6a041440..298ffcbc437 100644
--- a/tests/baselines/reference/functionOverloads42.types
+++ b/tests/baselines/reference/functionOverloads42.types
@@ -1,16 +1,16 @@
 === tests/cases/compiler/functionOverloads42.ts ===
 function foo(bar:{a:number;}[]):string;
->foo : { (bar: { a: number; }[]): string; (bar: { a: any; }[]): number; }
+>foo : typeof foo
 >bar : { a: number; }[]
 >a : number
 
 function foo(bar:{a:any;}[]):number;
->foo : { (bar: { a: number; }[]): string; (bar: { a: any; }[]): number; }
+>foo : typeof foo
 >bar : { a: any; }[]
 >a : any
 
 function foo(bar:{a:any;}[]):any{ return bar }
->foo : { (bar: { a: number; }[]): string; (bar: { a: any; }[]): number; }
+>foo : typeof foo
 >bar : { a: any; }[]
 >a : any
 >bar : { a: any; }[]
@@ -18,7 +18,7 @@ function foo(bar:{a:any;}[]):any{ return bar }
 var x = foo([{a:'s'}]);
 >x : number
 >foo([{a:'s'}]) : number
->foo : { (bar: { a: number; }[]): string; (bar: { a: any; }[]): number; }
+>foo : typeof foo
 >[{a:'s'}] : { a: any; }[]
 >{a:'s'} : { a: string; }
 >a : string
diff --git a/tests/baselines/reference/functionOverloads6.types b/tests/baselines/reference/functionOverloads6.types
index 6e195b1ca90..177ff0eac6b 100644
--- a/tests/baselines/reference/functionOverloads6.types
+++ b/tests/baselines/reference/functionOverloads6.types
@@ -3,14 +3,14 @@ class foo {
 >foo : foo
 
    static fnOverload();
->fnOverload : { (): any; (foo: string): any; }
+>fnOverload : typeof fnOverload
 
    static fnOverload(foo:string);
->fnOverload : { (): any; (foo: string): any; }
+>fnOverload : typeof fnOverload
 >foo : string
 
    static fnOverload(foo?: any){ }
->fnOverload : { (): any; (foo: string): any; }
+>fnOverload : typeof fnOverload
 >foo : any
 }
 
diff --git a/tests/baselines/reference/functionOverloads8.types b/tests/baselines/reference/functionOverloads8.types
index e342db5d174..9155a06e82e 100644
--- a/tests/baselines/reference/functionOverloads8.types
+++ b/tests/baselines/reference/functionOverloads8.types
@@ -1,12 +1,12 @@
 === tests/cases/compiler/functionOverloads8.ts ===
 function foo();
->foo : { (): any; (foo: string): any; }
+>foo : typeof foo
 
 function foo(foo:string);
->foo : { (): any; (foo: string): any; }
+>foo : typeof foo
 >foo : string
 
 function foo(foo?:any){ return '' }
->foo : { (): any; (foo: string): any; }
+>foo : typeof foo
 >foo : any
 
diff --git a/tests/baselines/reference/functionOverloads9.types b/tests/baselines/reference/functionOverloads9.types
index a844aee7df1..f27d1ba797c 100644
--- a/tests/baselines/reference/functionOverloads9.types
+++ b/tests/baselines/reference/functionOverloads9.types
@@ -1,14 +1,14 @@
 === tests/cases/compiler/functionOverloads9.ts ===
 function foo(foo:string);
->foo : (foo: string) => any
+>foo : typeof foo
 >foo : string
 
 function foo(foo?:string){ return '' };
->foo : (foo: string) => any
+>foo : typeof foo
 >foo : string
 
 var x = foo('foo');
 >x : any
 >foo('foo') : any
->foo : (foo: string) => any
+>foo : typeof foo
 
diff --git a/tests/baselines/reference/functionOverloadsRecursiveGenericReturnType.types b/tests/baselines/reference/functionOverloadsRecursiveGenericReturnType.types
index 9fe33890b55..7e9e07aff68 100644
--- a/tests/baselines/reference/functionOverloadsRecursiveGenericReturnType.types
+++ b/tests/baselines/reference/functionOverloadsRecursiveGenericReturnType.types
@@ -19,7 +19,7 @@ class A<U>{
 }
 
 function Choice<T>(args: T[]): A<T>;
->Choice : { <T>(args: T[]): A<T>; <T>(...v_args: T[]): A<T>; }
+>Choice : typeof Choice
 >T : T
 >args : T[]
 >T : T
@@ -27,7 +27,7 @@ function Choice<T>(args: T[]): A<T>;
 >T : T
 
 function Choice<T>(...v_args: T[]): A<T>;
->Choice : { <T>(args: T[]): A<T>; <T>(...v_args: T[]): A<T>; }
+>Choice : typeof Choice
 >T : T
 >v_args : T[]
 >T : T
@@ -35,7 +35,7 @@ function Choice<T>(...v_args: T[]): A<T>;
 >T : T
 
 function Choice<T>(...v_args: any[]): A<T>{
->Choice : { <T>(args: T[]): A<T>; <T>(...v_args: T[]): A<T>; }
+>Choice : typeof Choice
 >T : T
 >v_args : any[]
 >A : A<U>
diff --git a/tests/baselines/reference/functionReturn.types b/tests/baselines/reference/functionReturn.types
index 0c1ee8eafc2..1eb0342040f 100644
--- a/tests/baselines/reference/functionReturn.types
+++ b/tests/baselines/reference/functionReturn.types
@@ -1,29 +1,29 @@
 === tests/cases/compiler/functionReturn.ts ===
 function f0(): void { }
->f0 : () => void
+>f0 : typeof f0
 
 function f1() {
->f1 : () => void
+>f1 : typeof f1
 
     var n: any = f0();
 >n : any
 >f0() : void
->f0 : () => void
+>f0 : typeof f0
 }
 function f2(): any { }
->f2 : () => any
+>f2 : typeof f2
 
 function f3(): string { return; }
->f3 : () => string
+>f3 : typeof f3
 
 function f4(): string {
->f4 : () => string
+>f4 : typeof f4
 
     return '';
     return;
 }
 function f5(): string {
->f5 : () => string
+>f5 : typeof f5
 
     return '';
     return undefined;
diff --git a/tests/baselines/reference/functionReturningItself.types b/tests/baselines/reference/functionReturningItself.types
index 597202a55e2..6505e574c5e 100644
--- a/tests/baselines/reference/functionReturningItself.types
+++ b/tests/baselines/reference/functionReturningItself.types
@@ -1,7 +1,7 @@
 === tests/cases/compiler/functionReturningItself.ts ===
 function somefn() {
->somefn : () => typeof somefn
+>somefn : typeof somefn
 
     return somefn;
->somefn : () => typeof somefn
+>somefn : typeof somefn
 }
diff --git a/tests/baselines/reference/functionType.types b/tests/baselines/reference/functionType.types
index 4bbce7e096a..74aafc7c8d0 100644
--- a/tests/baselines/reference/functionType.types
+++ b/tests/baselines/reference/functionType.types
@@ -1,11 +1,11 @@
 === tests/cases/compiler/functionType.ts ===
 function salt() {}
->salt : () => void
+>salt : typeof salt
 
 salt.apply("hello", []);
 >salt.apply("hello", []) : any
 >salt.apply : (thisArg: any, argArray?: any) => any
->salt : () => void
+>salt : typeof salt
 >apply : (thisArg: any, argArray?: any) => any
 >[] : undefined[]
 
diff --git a/tests/baselines/reference/functionWithAnyReturnTypeAndNoReturnExpression.types b/tests/baselines/reference/functionWithAnyReturnTypeAndNoReturnExpression.types
index a5096d464d8..6b0208b6b64 100644
--- a/tests/baselines/reference/functionWithAnyReturnTypeAndNoReturnExpression.types
+++ b/tests/baselines/reference/functionWithAnyReturnTypeAndNoReturnExpression.types
@@ -1,7 +1,7 @@
 === tests/cases/compiler/functionWithAnyReturnTypeAndNoReturnExpression.ts ===
 // All should be allowed
 function f(): any { }
->f : () => any
+>f : typeof f
 
 var f2: () => any = () => { };
 >f2 : () => any
diff --git a/tests/baselines/reference/functionWithMultipleReturnStatements2.types b/tests/baselines/reference/functionWithMultipleReturnStatements2.types
index 706aca40c94..99aa5457f7b 100644
--- a/tests/baselines/reference/functionWithMultipleReturnStatements2.types
+++ b/tests/baselines/reference/functionWithMultipleReturnStatements2.types
@@ -3,7 +3,7 @@
 // no errors expected here
 
 function f1() {
->f1 : () => number
+>f1 : typeof f1
 
     if (true) {
         return 1;
@@ -13,7 +13,7 @@ function f1() {
 }
 
 function f2() {
->f2 : () => number
+>f2 : typeof f2
 
     if (true) {
         return 1;
@@ -25,7 +25,7 @@ function f2() {
 }
 
 function f4() {
->f4 : () => number
+>f4 : typeof f4
 
     try {
         return 1;
@@ -42,7 +42,7 @@ function f4() {
 }
 
 function f5() {
->f5 : () => Object
+>f5 : typeof f5
 
     return 1;
     return new Object();
@@ -51,7 +51,7 @@ function f5() {
 }
 
 function f6<T>(x: T) {
->f6 : <T>(x: T) => T
+>f6 : typeof f6
 >T : T
 >x : T
 >T : T
@@ -85,7 +85,7 @@ var b: { x: number; z?: number };
 
 // returns typeof a
 function f9() {
->f9 : () => { x: number; y?: number; }
+>f9 : typeof f9
 
     if (true) {
         return a;
@@ -99,7 +99,7 @@ function f9() {
 
 // returns typeof b
 function f10() {
->f10 : () => { x: number; z?: number; }
+>f10 : typeof f10
 
     if (true) {
         return b;
@@ -113,7 +113,7 @@ function f10() {
 
 // returns number => void
 function f11() {
->f11 : () => (x: number) => void
+>f11 : typeof f11
 
     if (true) {
         return (x: number) => { }
@@ -130,7 +130,7 @@ function f11() {
 
 // returns Object => void
 function f12() {
->f12 : () => (x: Object) => void
+>f12 : typeof f12
 
     if (true) {
         return (x: Object) => { }
diff --git a/tests/baselines/reference/functionsMissingReturnStatementsAndExpressions.errors.txt b/tests/baselines/reference/functionsMissingReturnStatementsAndExpressions.errors.txt
deleted file mode 100644
index 6ddbc91db57..00000000000
--- a/tests/baselines/reference/functionsMissingReturnStatementsAndExpressions.errors.txt
+++ /dev/null
@@ -1,129 +0,0 @@
-==== tests/cases/compiler/functionsMissingReturnStatementsAndExpressions.ts (5 errors) ====
-    
-    function f1(): string {
-                   ~~~~~~
-!!! A function whose declared type is neither 'void' nor 'any' must return a value or consist of a single 'throw' statement.
-        // errors because there are no return statements
-    }
-    
-    function f2(): string {
-        // Permissible; returns undefined.
-        return;
-    }
-    
-    function f3(): string {
-        return "Okay, because this is a return expression.";
-    }
-    
-    function f4(): void {
-        // Fine since we are typed void.
-    }
-    
-    function f5(): void {
-        // Fine since we are typed void.
-        return;
-    }
-    
-    function f6(): void {
-        // Fine since we are typed void and return undefined
-        return undefined;
-    }
-    
-    function f7(): void {
-        // Fine since we are typed void and return null
-        return null;
-    }
-    
-    function f8(): void {
-        // Fine since are typed any.
-        return;
-    }
-    
-    function f9(): void {
-        // Fine since we are typed any and return undefined
-        return undefined;
-    }
-    
-    function f10(): void {
-        // Fine since we are typed any and return null
-        return null;
-    }
-    
-    function f11(): string {
-        // Fine since we consist of a single throw statement.
-        throw undefined;
-    }
-    
-    function f12(): void {
-        // Fine since we consist of a single throw statement.
-        throw undefined;
-    }
-    
-    function f13(): any {
-        // Fine since we consist of a single throw statement.
-        throw undefined;
-    }
-    
-    function f14(): number {
-                    ~~~~~~
-!!! A function whose declared type is neither 'void' nor 'any' must return a value or consist of a single 'throw' statement.
-        // Not fine, since we can *only* consist of a single throw statement
-        // if no return statements are present but we are annotated.
-        throw undefined;
-        throw null;
-    }
-    
-    function f15(): number {
-        // Fine, since we have a return statement somewhere.
-        throw undefined;
-        throw null;
-        return;
-    }
-    
-    
-    function f16() {
-        // Okay; not type annotated.
-    }
-    
-    function f17() {
-        // Okay; not type annotated.
-        return;
-    }
-    
-    function f18() {
-        return "Okay, not type annotated.";
-    }
-    
-    
-    class C {
-        public get m1() {
-                   ~~
-!!! A 'get' accessor must return a value or consist of a single 'throw' statement.
-            // Errors; get accessors must return a value.
-        }
-    
-        public get m2() {
-            // Permissible; returns undefined.
-            return;
-        }
-    
-        public get m3() {
-            return "Okay, because this is a return expression.";
-        }
-    
-        public get m4() {
-            // Fine since this consists of a single throw statement.
-            throw null;
-        }
-    
-        public get m5() {
-                   ~~
-!!! A 'get' accessor must return a value or consist of a single 'throw' statement.
-            // Not fine, since we can *only* consist of a single throw statement
-            // if no return statements are present but we are a get accessor.
-            throw null;
-            throw undefined.
-        }
-        ~
-!!! Identifier expected.
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/funduleUsedAcrossFileBoundary.types b/tests/baselines/reference/funduleUsedAcrossFileBoundary.types
index a7924e89fac..a468e471bd2 100644
--- a/tests/baselines/reference/funduleUsedAcrossFileBoundary.types
+++ b/tests/baselines/reference/funduleUsedAcrossFileBoundary.types
@@ -16,13 +16,13 @@ declare module Q {
 >foo : string
     }
     export function defer<T>(): string;
->defer : <T>() => string
+>defer : typeof defer
 >T : T
 }
 
 === tests/cases/compiler/funduleUsedAcrossFileBoundary_file2.ts ===
 function promiseWithCancellation<T>(promise: Q.Promise<T>) {
->promiseWithCancellation : <T>(promise: Promise<T>) => void
+>promiseWithCancellation : typeof promiseWithCancellation
 >T : T
 >promise : Promise<T>
 >Q : Q
@@ -32,8 +32,8 @@ function promiseWithCancellation<T>(promise: Q.Promise<T>) {
     var deferred = Q.defer<T>(); // used to be an error
 >deferred : string
 >Q.defer<T>() : string
->Q.defer : <T>() => string
+>Q.defer : typeof defer
 >Q : typeof Q
->defer : <T>() => string
+>defer : typeof defer
 >T : T
 }
diff --git a/tests/baselines/reference/generatedContextualTyping.types b/tests/baselines/reference/generatedContextualTyping.types
index 57b5408eabe..13254eb8d22 100644
--- a/tests/baselines/reference/generatedContextualTyping.types
+++ b/tests/baselines/reference/generatedContextualTyping.types
@@ -1180,7 +1180,7 @@ class x120 { constructor(private parm: Genric<Base> = { func: n => { return [d1,
 >d2 : Derived2
 
 function x121(parm: () => Base[] = () => [d1, d2]) { }
->x121 : (parm?: () => Base[]) => void
+>x121 : typeof x121
 >parm : () => Base[]
 >Base : Base
 >() => [d1, d2] : () => Base[]
@@ -1189,7 +1189,7 @@ function x121(parm: () => Base[] = () => [d1, d2]) { }
 >d2 : Derived2
 
 function x122(parm: () => Base[] = function() { return [d1, d2] }) { }
->x122 : (parm?: () => Base[]) => void
+>x122 : typeof x122
 >parm : () => Base[]
 >Base : Base
 >function() { return [d1, d2] } : () => Base[]
@@ -1198,7 +1198,7 @@ function x122(parm: () => Base[] = function() { return [d1, d2] }) { }
 >d2 : Derived2
 
 function x123(parm: () => Base[] = function named() { return [d1, d2] }) { }
->x123 : (parm?: () => Base[]) => void
+>x123 : typeof x123
 >parm : () => Base[]
 >Base : Base
 >function named() { return [d1, d2] } : () => Base[]
@@ -1208,7 +1208,7 @@ function x123(parm: () => Base[] = function named() { return [d1, d2] }) { }
 >d2 : Derived2
 
 function x124(parm: { (): Base[]; } = () => [d1, d2]) { }
->x124 : (parm?: () => Base[]) => void
+>x124 : typeof x124
 >parm : () => Base[]
 >Base : Base
 >() => [d1, d2] : () => Base[]
@@ -1217,7 +1217,7 @@ function x124(parm: { (): Base[]; } = () => [d1, d2]) { }
 >d2 : Derived2
 
 function x125(parm: { (): Base[]; } = function() { return [d1, d2] }) { }
->x125 : (parm?: () => Base[]) => void
+>x125 : typeof x125
 >parm : () => Base[]
 >Base : Base
 >function() { return [d1, d2] } : () => Base[]
@@ -1226,7 +1226,7 @@ function x125(parm: { (): Base[]; } = function() { return [d1, d2] }) { }
 >d2 : Derived2
 
 function x126(parm: { (): Base[]; } = function named() { return [d1, d2] }) { }
->x126 : (parm?: () => Base[]) => void
+>x126 : typeof x126
 >parm : () => Base[]
 >Base : Base
 >function named() { return [d1, d2] } : () => Base[]
@@ -1236,7 +1236,7 @@ function x126(parm: { (): Base[]; } = function named() { return [d1, d2] }) { }
 >d2 : Derived2
 
 function x127(parm: Base[] = [d1, d2]) { }
->x127 : (parm?: Base[]) => void
+>x127 : typeof x127
 >parm : Base[]
 >Base : Base
 >[d1, d2] : Base[]
@@ -1244,7 +1244,7 @@ function x127(parm: Base[] = [d1, d2]) { }
 >d2 : Derived2
 
 function x128(parm: Array<Base> = [d1, d2]) { }
->x128 : (parm?: Base[]) => void
+>x128 : typeof x128
 >parm : Base[]
 >Array : T[]
 >Base : Base
@@ -1253,7 +1253,7 @@ function x128(parm: Array<Base> = [d1, d2]) { }
 >d2 : Derived2
 
 function x129(parm: { [n: number]: Base; } = [d1, d2]) { }
->x129 : (parm?: { [x: number]: Base; }) => void
+>x129 : typeof x129
 >parm : { [x: number]: Base; }
 >n : number
 >Base : Base
@@ -1262,7 +1262,7 @@ function x129(parm: { [n: number]: Base; } = [d1, d2]) { }
 >d2 : Derived2
 
 function x130(parm: {n: Base[]; }  = { n: [d1, d2] }) { }
->x130 : (parm?: { n: Base[]; }) => void
+>x130 : typeof x130
 >parm : { n: Base[]; }
 >n : Base[]
 >Base : Base
@@ -1273,7 +1273,7 @@ function x130(parm: {n: Base[]; }  = { n: [d1, d2] }) { }
 >d2 : Derived2
 
 function x131(parm: (s: Base[]) => any = n => { var n: Base[]; return null; }) { }
->x131 : (parm?: (s: Base[]) => any) => void
+>x131 : typeof x131
 >parm : (s: Base[]) => any
 >s : Base[]
 >Base : Base
@@ -1283,7 +1283,7 @@ function x131(parm: (s: Base[]) => any = n => { var n: Base[]; return null; }) {
 >Base : Base
 
 function x132(parm: Genric<Base> = { func: n => { return [d1, d2]; } }) { }
->x132 : (parm?: Genric<Base>) => void
+>x132 : typeof x132
 >parm : Genric<Base>
 >Genric : Genric<T>
 >Base : Base
@@ -1296,7 +1296,7 @@ function x132(parm: Genric<Base> = { func: n => { return [d1, d2]; } }) { }
 >d2 : Derived2
 
 function x133(): () => Base[] { return () => [d1, d2]; }
->x133 : () => () => Base[]
+>x133 : typeof x133
 >Base : Base
 >() => [d1, d2] : () => Base[]
 >[d1, d2] : Base[]
@@ -1304,7 +1304,7 @@ function x133(): () => Base[] { return () => [d1, d2]; }
 >d2 : Derived2
 
 function x134(): () => Base[] { return function() { return [d1, d2] }; }
->x134 : () => () => Base[]
+>x134 : typeof x134
 >Base : Base
 >function() { return [d1, d2] } : () => Base[]
 >[d1, d2] : Base[]
@@ -1312,7 +1312,7 @@ function x134(): () => Base[] { return function() { return [d1, d2] }; }
 >d2 : Derived2
 
 function x135(): () => Base[] { return function named() { return [d1, d2] }; }
->x135 : () => () => Base[]
+>x135 : typeof x135
 >Base : Base
 >function named() { return [d1, d2] } : () => Base[]
 >named : () => Base[]
@@ -1321,7 +1321,7 @@ function x135(): () => Base[] { return function named() { return [d1, d2] }; }
 >d2 : Derived2
 
 function x136(): { (): Base[]; } { return () => [d1, d2]; }
->x136 : () => () => Base[]
+>x136 : typeof x136
 >Base : Base
 >() => [d1, d2] : () => Base[]
 >[d1, d2] : Base[]
@@ -1329,7 +1329,7 @@ function x136(): { (): Base[]; } { return () => [d1, d2]; }
 >d2 : Derived2
 
 function x137(): { (): Base[]; } { return function() { return [d1, d2] }; }
->x137 : () => () => Base[]
+>x137 : typeof x137
 >Base : Base
 >function() { return [d1, d2] } : () => Base[]
 >[d1, d2] : Base[]
@@ -1337,7 +1337,7 @@ function x137(): { (): Base[]; } { return function() { return [d1, d2] }; }
 >d2 : Derived2
 
 function x138(): { (): Base[]; } { return function named() { return [d1, d2] }; }
->x138 : () => () => Base[]
+>x138 : typeof x138
 >Base : Base
 >function named() { return [d1, d2] } : () => Base[]
 >named : () => Base[]
@@ -1346,14 +1346,14 @@ function x138(): { (): Base[]; } { return function named() { return [d1, d2] };
 >d2 : Derived2
 
 function x139(): Base[] { return [d1, d2]; }
->x139 : () => Base[]
+>x139 : typeof x139
 >Base : Base
 >[d1, d2] : Base[]
 >d1 : Derived1
 >d2 : Derived2
 
 function x140(): Array<Base> { return [d1, d2]; }
->x140 : () => Base[]
+>x140 : typeof x140
 >Array : T[]
 >Base : Base
 >[d1, d2] : Base[]
@@ -1361,7 +1361,7 @@ function x140(): Array<Base> { return [d1, d2]; }
 >d2 : Derived2
 
 function x141(): { [n: number]: Base; } { return [d1, d2]; }
->x141 : () => { [x: number]: Base; }
+>x141 : typeof x141
 >n : number
 >Base : Base
 >[d1, d2] : Base[]
@@ -1369,7 +1369,7 @@ function x141(): { [n: number]: Base; } { return [d1, d2]; }
 >d2 : Derived2
 
 function x142(): {n: Base[]; }  { return { n: [d1, d2] }; }
->x142 : () => { n: Base[]; }
+>x142 : typeof x142
 >n : Base[]
 >Base : Base
 >{ n: [d1, d2] } : { n: Base[]; }
@@ -1379,7 +1379,7 @@ function x142(): {n: Base[]; }  { return { n: [d1, d2] }; }
 >d2 : Derived2
 
 function x143(): (s: Base[]) => any { return n => { var n: Base[]; return null; }; }
->x143 : () => (s: Base[]) => any
+>x143 : typeof x143
 >s : Base[]
 >Base : Base
 >n => { var n: Base[]; return null; } : (n: Base[]) => any
@@ -1388,7 +1388,7 @@ function x143(): (s: Base[]) => any { return n => { var n: Base[]; return null;
 >Base : Base
 
 function x144(): Genric<Base> { return { func: n => { return [d1, d2]; } }; }
->x144 : () => Genric<Base>
+>x144 : typeof x144
 >Genric : Genric<T>
 >Base : Base
 >{ func: n => { return [d1, d2]; } } : { func: (n: Base[]) => {}[]; }
@@ -1400,7 +1400,7 @@ function x144(): Genric<Base> { return { func: n => { return [d1, d2]; } }; }
 >d2 : Derived2
 
 function x145(): () => Base[] { return () => [d1, d2]; return () => [d1, d2]; }
->x145 : () => () => Base[]
+>x145 : typeof x145
 >Base : Base
 >() => [d1, d2] : () => Base[]
 >[d1, d2] : Base[]
@@ -1412,7 +1412,7 @@ function x145(): () => Base[] { return () => [d1, d2]; return () => [d1, d2]; }
 >d2 : Derived2
 
 function x146(): () => Base[] { return function() { return [d1, d2] }; return function() { return [d1, d2] }; }
->x146 : () => () => Base[]
+>x146 : typeof x146
 >Base : Base
 >function() { return [d1, d2] } : () => Base[]
 >[d1, d2] : Base[]
@@ -1424,7 +1424,7 @@ function x146(): () => Base[] { return function() { return [d1, d2] }; return fu
 >d2 : Derived2
 
 function x147(): () => Base[] { return function named() { return [d1, d2] }; return function named() { return [d1, d2] }; }
->x147 : () => () => Base[]
+>x147 : typeof x147
 >Base : Base
 >function named() { return [d1, d2] } : () => Base[]
 >named : () => Base[]
@@ -1438,7 +1438,7 @@ function x147(): () => Base[] { return function named() { return [d1, d2] }; ret
 >d2 : Derived2
 
 function x148(): { (): Base[]; } { return () => [d1, d2]; return () => [d1, d2]; }
->x148 : () => () => Base[]
+>x148 : typeof x148
 >Base : Base
 >() => [d1, d2] : () => Base[]
 >[d1, d2] : Base[]
@@ -1450,7 +1450,7 @@ function x148(): { (): Base[]; } { return () => [d1, d2]; return () => [d1, d2];
 >d2 : Derived2
 
 function x149(): { (): Base[]; } { return function() { return [d1, d2] }; return function() { return [d1, d2] }; }
->x149 : () => () => Base[]
+>x149 : typeof x149
 >Base : Base
 >function() { return [d1, d2] } : () => Base[]
 >[d1, d2] : Base[]
@@ -1462,7 +1462,7 @@ function x149(): { (): Base[]; } { return function() { return [d1, d2] }; return
 >d2 : Derived2
 
 function x150(): { (): Base[]; } { return function named() { return [d1, d2] }; return function named() { return [d1, d2] }; }
->x150 : () => () => Base[]
+>x150 : typeof x150
 >Base : Base
 >function named() { return [d1, d2] } : () => Base[]
 >named : () => Base[]
@@ -1476,7 +1476,7 @@ function x150(): { (): Base[]; } { return function named() { return [d1, d2] };
 >d2 : Derived2
 
 function x151(): Base[] { return [d1, d2]; return [d1, d2]; }
->x151 : () => Base[]
+>x151 : typeof x151
 >Base : Base
 >[d1, d2] : Base[]
 >d1 : Derived1
@@ -1486,7 +1486,7 @@ function x151(): Base[] { return [d1, d2]; return [d1, d2]; }
 >d2 : Derived2
 
 function x152(): Array<Base> { return [d1, d2]; return [d1, d2]; }
->x152 : () => Base[]
+>x152 : typeof x152
 >Array : T[]
 >Base : Base
 >[d1, d2] : Base[]
@@ -1497,7 +1497,7 @@ function x152(): Array<Base> { return [d1, d2]; return [d1, d2]; }
 >d2 : Derived2
 
 function x153(): { [n: number]: Base; } { return [d1, d2]; return [d1, d2]; }
->x153 : () => { [x: number]: Base; }
+>x153 : typeof x153
 >n : number
 >Base : Base
 >[d1, d2] : Base[]
@@ -1508,7 +1508,7 @@ function x153(): { [n: number]: Base; } { return [d1, d2]; return [d1, d2]; }
 >d2 : Derived2
 
 function x154(): {n: Base[]; }  { return { n: [d1, d2] }; return { n: [d1, d2] }; }
->x154 : () => { n: Base[]; }
+>x154 : typeof x154
 >n : Base[]
 >Base : Base
 >{ n: [d1, d2] } : { n: Base[]; }
@@ -1523,7 +1523,7 @@ function x154(): {n: Base[]; }  { return { n: [d1, d2] }; return { n: [d1, d2] }
 >d2 : Derived2
 
 function x155(): (s: Base[]) => any { return n => { var n: Base[]; return null; }; return n => { var n: Base[]; return null; }; }
->x155 : () => (s: Base[]) => any
+>x155 : typeof x155
 >s : Base[]
 >Base : Base
 >n => { var n: Base[]; return null; } : (n: Base[]) => any
@@ -1536,7 +1536,7 @@ function x155(): (s: Base[]) => any { return n => { var n: Base[]; return null;
 >Base : Base
 
 function x156(): Genric<Base> { return { func: n => { return [d1, d2]; } }; return { func: n => { return [d1, d2]; } }; }
->x156 : () => Genric<Base>
+>x156 : typeof x156
 >Genric : Genric<T>
 >Base : Base
 >{ func: n => { return [d1, d2]; } } : { func: (n: Base[]) => {}[]; }
@@ -3248,33 +3248,33 @@ var x320: Genric<Base> = true ? { func: n => { return [d1, d2]; } } : undefined;
 >undefined : undefined
 
 function x321(n: () => Base[]) { }; x321(() => [d1, d2]);
->x321 : (n: () => Base[]) => void
+>x321 : typeof x321
 >n : () => Base[]
 >Base : Base
 >x321(() => [d1, d2]) : void
->x321 : (n: () => Base[]) => void
+>x321 : typeof x321
 >() => [d1, d2] : () => Base[]
 >[d1, d2] : Base[]
 >d1 : Derived1
 >d2 : Derived2
 
 function x322(n: () => Base[]) { }; x322(function() { return [d1, d2] });
->x322 : (n: () => Base[]) => void
+>x322 : typeof x322
 >n : () => Base[]
 >Base : Base
 >x322(function() { return [d1, d2] }) : void
->x322 : (n: () => Base[]) => void
+>x322 : typeof x322
 >function() { return [d1, d2] } : () => Base[]
 >[d1, d2] : Base[]
 >d1 : Derived1
 >d2 : Derived2
 
 function x323(n: () => Base[]) { }; x323(function named() { return [d1, d2] });
->x323 : (n: () => Base[]) => void
+>x323 : typeof x323
 >n : () => Base[]
 >Base : Base
 >x323(function named() { return [d1, d2] }) : void
->x323 : (n: () => Base[]) => void
+>x323 : typeof x323
 >function named() { return [d1, d2] } : () => Base[]
 >named : () => Base[]
 >[d1, d2] : Base[]
@@ -3282,33 +3282,33 @@ function x323(n: () => Base[]) { }; x323(function named() { return [d1, d2] });
 >d2 : Derived2
 
 function x324(n: { (): Base[]; }) { }; x324(() => [d1, d2]);
->x324 : (n: () => Base[]) => void
+>x324 : typeof x324
 >n : () => Base[]
 >Base : Base
 >x324(() => [d1, d2]) : void
->x324 : (n: () => Base[]) => void
+>x324 : typeof x324
 >() => [d1, d2] : () => Base[]
 >[d1, d2] : Base[]
 >d1 : Derived1
 >d2 : Derived2
 
 function x325(n: { (): Base[]; }) { }; x325(function() { return [d1, d2] });
->x325 : (n: () => Base[]) => void
+>x325 : typeof x325
 >n : () => Base[]
 >Base : Base
 >x325(function() { return [d1, d2] }) : void
->x325 : (n: () => Base[]) => void
+>x325 : typeof x325
 >function() { return [d1, d2] } : () => Base[]
 >[d1, d2] : Base[]
 >d1 : Derived1
 >d2 : Derived2
 
 function x326(n: { (): Base[]; }) { }; x326(function named() { return [d1, d2] });
->x326 : (n: () => Base[]) => void
+>x326 : typeof x326
 >n : () => Base[]
 >Base : Base
 >x326(function named() { return [d1, d2] }) : void
->x326 : (n: () => Base[]) => void
+>x326 : typeof x326
 >function named() { return [d1, d2] } : () => Base[]
 >named : () => Base[]
 >[d1, d2] : Base[]
@@ -3316,44 +3316,44 @@ function x326(n: { (): Base[]; }) { }; x326(function named() { return [d1, d2] }
 >d2 : Derived2
 
 function x327(n: Base[]) { }; x327([d1, d2]);
->x327 : (n: Base[]) => void
+>x327 : typeof x327
 >n : Base[]
 >Base : Base
 >x327([d1, d2]) : void
->x327 : (n: Base[]) => void
+>x327 : typeof x327
 >[d1, d2] : Base[]
 >d1 : Derived1
 >d2 : Derived2
 
 function x328(n: Array<Base>) { }; x328([d1, d2]);
->x328 : (n: Base[]) => void
+>x328 : typeof x328
 >n : Base[]
 >Array : T[]
 >Base : Base
 >x328([d1, d2]) : void
->x328 : (n: Base[]) => void
+>x328 : typeof x328
 >[d1, d2] : Base[]
 >d1 : Derived1
 >d2 : Derived2
 
 function x329(n: { [n: number]: Base; }) { }; x329([d1, d2]);
->x329 : (n: { [x: number]: Base; }) => void
+>x329 : typeof x329
 >n : { [x: number]: Base; }
 >n : number
 >Base : Base
 >x329([d1, d2]) : void
->x329 : (n: { [x: number]: Base; }) => void
+>x329 : typeof x329
 >[d1, d2] : Base[]
 >d1 : Derived1
 >d2 : Derived2
 
 function x330(n: {n: Base[]; } ) { }; x330({ n: [d1, d2] });
->x330 : (n: { n: Base[]; }) => void
+>x330 : typeof x330
 >n : { n: Base[]; }
 >n : Base[]
 >Base : Base
 >x330({ n: [d1, d2] }) : void
->x330 : (n: { n: Base[]; }) => void
+>x330 : typeof x330
 >{ n: [d1, d2] } : { n: Base[]; }
 >n : Base[]
 >[d1, d2] : Base[]
@@ -3361,24 +3361,24 @@ function x330(n: {n: Base[]; } ) { }; x330({ n: [d1, d2] });
 >d2 : Derived2
 
 function x331(n: (s: Base[]) => any) { }; x331(n => { var n: Base[]; return null; });
->x331 : (n: (s: Base[]) => any) => void
+>x331 : typeof x331
 >n : (s: Base[]) => any
 >s : Base[]
 >Base : Base
 >x331(n => { var n: Base[]; return null; }) : void
->x331 : (n: (s: Base[]) => any) => void
+>x331 : typeof x331
 >n => { var n: Base[]; return null; } : (n: Base[]) => any
 >n : Base[]
 >n : Base[]
 >Base : Base
 
 function x332(n: Genric<Base>) { }; x332({ func: n => { return [d1, d2]; } });
->x332 : (n: Genric<Base>) => void
+>x332 : typeof x332
 >n : Genric<Base>
 >Genric : Genric<T>
 >Base : Base
 >x332({ func: n => { return [d1, d2]; } }) : void
->x332 : (n: Genric<Base>) => void
+>x332 : typeof x332
 >{ func: n => { return [d1, d2]; } } : { func: (n: Base[]) => {}[]; }
 >func : (n: Base[]) => {}[]
 >n => { return [d1, d2]; } : (n: Base[]) => {}[]
diff --git a/tests/baselines/reference/generativeRecursionWithTypeOf.types b/tests/baselines/reference/generativeRecursionWithTypeOf.types
index 1447c51358f..a781b308c13 100644
--- a/tests/baselines/reference/generativeRecursionWithTypeOf.types
+++ b/tests/baselines/reference/generativeRecursionWithTypeOf.types
@@ -4,7 +4,7 @@ class C<T> {
 >T : T
 
     static foo(x: number) { }
->foo : (x: number) => void
+>foo : typeof foo
 >x : number
 
     type: T;
@@ -16,7 +16,7 @@ module M {
 >M : typeof M
 
     export function f(x: typeof C) {   
->f : (x: typeof C) => C<typeof C>
+>f : typeof f
 >x : typeof C
 >C : typeof C
 
diff --git a/tests/baselines/reference/genericArray0.types b/tests/baselines/reference/genericArray0.types
index 80a9d5199bd..9118e312cd2 100644
--- a/tests/baselines/reference/genericArray0.types
+++ b/tests/baselines/reference/genericArray0.types
@@ -10,7 +10,7 @@ var y = x;
 >x : number[]
 
 function map<U>() {
->map : <U>() => void
+>map : typeof map
 >U : U
 
     var ys: U[] = [];
diff --git a/tests/baselines/reference/genericArrayPropertyAssignment.types b/tests/baselines/reference/genericArrayPropertyAssignment.types
index ab3f47de813..a0eea6f20f1 100644
--- a/tests/baselines/reference/genericArrayPropertyAssignment.types
+++ b/tests/baselines/reference/genericArrayPropertyAssignment.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/genericArrayPropertyAssignment.ts ===
 function isEmpty(list: {length:number;})
->isEmpty : (list: { length: number; }) => boolean
+>isEmpty : typeof isEmpty
 >list : { length: number; }
 >length : number
 {
@@ -13,7 +13,7 @@ return list.length ===0;
  
 isEmpty([]); // error
 >isEmpty([]) : boolean
->isEmpty : (list: { length: number; }) => boolean
+>isEmpty : typeof isEmpty
 >[] : undefined[]
  
 
diff --git a/tests/baselines/reference/genericCallTypeArgumentInference.types b/tests/baselines/reference/genericCallTypeArgumentInference.types
index ced2daee38d..f53018bddb1 100644
--- a/tests/baselines/reference/genericCallTypeArgumentInference.types
+++ b/tests/baselines/reference/genericCallTypeArgumentInference.types
@@ -2,7 +2,7 @@
 // Basic type inference with generic calls, no errors expected
 
 function foo<T>(t: T) {
->foo : <T>(t: T) => T
+>foo : typeof foo
 >T : T
 >t : T
 >T : T
@@ -14,10 +14,10 @@ function foo<T>(t: T) {
 var r = foo(''); // string
 >r : string
 >foo('') : string
->foo : <T>(t: T) => T
+>foo : typeof foo
 
 function foo2<T, U>(t: T, u: U) {
->foo2 : <T, U>(t: T, u: U) => U
+>foo2 : typeof foo2
 >T : T
 >U : U
 >t : T
@@ -30,7 +30,7 @@ function foo2<T, U>(t: T, u: U) {
 }
 
 function foo2b<T, U>(u: U) {
->foo2b : <T, U>(u: U) => T
+>foo2b : typeof foo2b
 >T : T
 >U : U
 >u : U
@@ -47,12 +47,12 @@ function foo2b<T, U>(u: U) {
 var r2 = foo2('', 1); // number
 >r2 : number
 >foo2('', 1) : number
->foo2 : <T, U>(t: T, u: U) => U
+>foo2 : typeof foo2
 
 var r3 = foo2b(1); // {}
 >r3 : {}
 >foo2b(1) : {}
->foo2b : <T, U>(u: U) => T
+>foo2b : typeof foo2b
 
 class C<T, U> {
 >C : C<T, U>
diff --git a/tests/baselines/reference/genericCallWithArrayLiteralArgs.types b/tests/baselines/reference/genericCallWithArrayLiteralArgs.types
index c79efb0792c..09da2dd2e41 100644
--- a/tests/baselines/reference/genericCallWithArrayLiteralArgs.types
+++ b/tests/baselines/reference/genericCallWithArrayLiteralArgs.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithArrayLiteralArgs.ts ===
 function foo<T>(t: T) {
->foo : <T>(t: T) => T
+>foo : typeof foo
 >T : T
 >t : T
 >T : T
@@ -12,49 +12,49 @@ function foo<T>(t: T) {
 var r = foo([1, 2]); // number[]
 >r : number[]
 >foo([1, 2]) : number[]
->foo : <T>(t: T) => T
+>foo : typeof foo
 >[1, 2] : number[]
 
 var r = foo<number[]>([1, 2]); // number[]
 >r : number[]
 >foo<number[]>([1, 2]) : number[]
->foo : <T>(t: T) => T
+>foo : typeof foo
 >[1, 2] : number[]
 
 var ra = foo<any[]>([1, 2]); // any[]
 >ra : any[]
 >foo<any[]>([1, 2]) : any[]
->foo : <T>(t: T) => T
+>foo : typeof foo
 >[1, 2] : any[]
 
 var r2 = foo([]); // any[]
 >r2 : any[]
 >foo([]) : any[]
->foo : <T>(t: T) => T
+>foo : typeof foo
 >[] : any[]
 
 var r3 = foo<number[]>([]); // number[]
 >r3 : number[]
 >foo<number[]>([]) : number[]
->foo : <T>(t: T) => T
+>foo : typeof foo
 >[] : number[]
 
 var r4 = foo([1, '']); // {}[]
 >r4 : {}[]
 >foo([1, '']) : {}[]
->foo : <T>(t: T) => T
+>foo : typeof foo
 >[1, ''] : {}[]
 
 var r5 = foo<any[]>([1, '']); // any[]
 >r5 : any[]
 >foo<any[]>([1, '']) : any[]
->foo : <T>(t: T) => T
+>foo : typeof foo
 >[1, ''] : any[]
 
 var r6 = foo<Object[]>([1, '']); // Object[]
 >r6 : Object[]
 >foo<Object[]>([1, '']) : Object[]
->foo : <T>(t: T) => T
+>foo : typeof foo
 >Object : Object
 >[1, ''] : Object[]
 
diff --git a/tests/baselines/reference/genericCallWithConstraintsTypeArgumentInference.types b/tests/baselines/reference/genericCallWithConstraintsTypeArgumentInference.types
index dcff9ef8a16..31e4ad647c5 100644
--- a/tests/baselines/reference/genericCallWithConstraintsTypeArgumentInference.types
+++ b/tests/baselines/reference/genericCallWithConstraintsTypeArgumentInference.types
@@ -28,7 +28,7 @@ var d2: Derived2;
 >Derived2 : Derived2
 
 function foo<T extends Base>(t: T) {
->foo : <T extends Base>(t: T) => T
+>foo : typeof foo
 >T : T
 >Base : Base
 >t : T
@@ -41,17 +41,17 @@ function foo<T extends Base>(t: T) {
 var r = foo(b); // Base
 >r : Base
 >foo(b) : Base
->foo : <T extends Base>(t: T) => T
+>foo : typeof foo
 >b : Base
 
 var r2 = foo(d1); // Derived
 >r2 : Derived
 >foo(d1) : Derived
->foo : <T extends Base>(t: T) => T
+>foo : typeof 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
+>foo2 : typeof foo2
 >T : T
 >Base : Base
 >U : U
@@ -66,7 +66,7 @@ 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
+>foo2b : typeof foo2b
 >T : T
 >Base : Base
 >U : U
@@ -83,7 +83,7 @@ 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
+>foo2c : typeof foo2c
 >T : T
 >Base : Base
 >U : U
@@ -100,13 +100,13 @@ function foo2c<T extends Base, U extends Derived>() {
 var r3 = foo2b(d1); // Base
 >r3 : Base
 >foo2b(d1) : Base
->foo2b : <T extends Base, U extends Derived>(u: U) => T
+>foo2b : typeof foo2b
 >d1 : Derived
 
 var r3b = foo2c(); // Base
 >r3b : Base
 >foo2c() : Base
->foo2c : <T extends Base, U extends Derived>() => T
+>foo2c : typeof foo2c
 
 class C<T extends Base, U extends Derived> {
 >C : C<T, U>
diff --git a/tests/baselines/reference/genericCallWithFixedArguments.types b/tests/baselines/reference/genericCallWithFixedArguments.types
index acfad45a0f2..3d40ceb3a06 100644
--- a/tests/baselines/reference/genericCallWithFixedArguments.types
+++ b/tests/baselines/reference/genericCallWithFixedArguments.types
@@ -8,14 +8,14 @@ class B { bar() { }}
 >bar : () => void
 
 function g<T, U>(x) { }
->g : <T, U>(x: any) => void
+>g : typeof g
 >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
+>g : typeof g
 >A : A
 >B : B
  
diff --git a/tests/baselines/reference/genericCallWithFunctionTypedArguments.types b/tests/baselines/reference/genericCallWithFunctionTypedArguments.types
index 2d3b234d0e1..aec40c508df 100644
--- a/tests/baselines/reference/genericCallWithFunctionTypedArguments.types
+++ b/tests/baselines/reference/genericCallWithFunctionTypedArguments.types
@@ -3,7 +3,7 @@
 // Using function arguments, no errors expected
 
 function foo<T>(x: (a: T) => T) {
->foo : <T>(x: (a: T) => T) => T
+>foo : typeof foo
 >T : T
 >x : (a: T) => T
 >a : T
@@ -18,7 +18,7 @@ function foo<T>(x: (a: T) => T) {
 var r = foo(<U>(x: U) => ''); // {}
 >r : {}
 >foo(<U>(x: U) => '') : {}
->foo : <T>(x: (a: T) => T) => T
+>foo : typeof foo
 ><U>(x: U) => '' : <U>(x: U) => string
 >U : U
 >x : U
@@ -27,7 +27,7 @@ var r = foo(<U>(x: U) => ''); // {}
 var r2 = foo<string>(<U>(x: U) => ''); // string 
 >r2 : string
 >foo<string>(<U>(x: U) => '') : string
->foo : <T>(x: (a: T) => T) => T
+>foo : typeof foo
 ><U>(x: U) => '' : <U>(x: U) => string
 >U : U
 >x : U
@@ -36,12 +36,12 @@ var r2 = foo<string>(<U>(x: U) => ''); // string
 var r3 = foo(x => ''); // {}
 >r3 : {}
 >foo(x => '') : {}
->foo : <T>(x: (a: T) => T) => T
+>foo : typeof foo
 >x => '' : (x: {}) => string
 >x : {}
 
 function foo2<T, U>(x: T, cb: (a: T) => U) {
->foo2 : <T, U>(x: T, cb: (a: T) => U) => U
+>foo2 : typeof foo2
 >T : T
 >U : U
 >x : T
@@ -60,7 +60,7 @@ function foo2<T, U>(x: T, cb: (a: T) => U) {
 var r4 = foo2(1, function <Z>(a: Z) { return '' }); // string, contextual signature instantiation is applied to generic functions
 >r4 : string
 >foo2(1, function <Z>(a: Z) { return '' }) : string
->foo2 : <T, U>(x: T, cb: (a: T) => U) => U
+>foo2 : typeof foo2
 >function <Z>(a: Z) { return '' } : <Z>(a: Z) => string
 >Z : Z
 >a : Z
@@ -69,21 +69,21 @@ var r4 = foo2(1, function <Z>(a: Z) { return '' }); // string, contextual signat
 var r5 = foo2(1, (a) => ''); // string
 >r5 : string
 >foo2(1, (a) => '') : string
->foo2 : <T, U>(x: T, cb: (a: T) => U) => U
+>foo2 : typeof foo2
 >(a) => '' : (a: number) => string
 >a : number
 
 var r6 = foo2<string, number>('', <Z>(a: Z) => 1);
 >r6 : number
 >foo2<string, number>('', <Z>(a: Z) => 1) : number
->foo2 : <T, U>(x: T, cb: (a: T) => U) => U
+>foo2 : typeof foo2
 ><Z>(a: Z) => 1 : <Z>(a: Z) => number
 >Z : Z
 >a : Z
 >Z : Z
 
 function foo3<T, U>(x: T, cb: (a: T) => U, y: U) {
->foo3 : <T, U>(x: T, cb: (a: T) => U, y: U) => U
+>foo3 : typeof foo3
 >T : T
 >U : U
 >x : T
@@ -104,7 +104,7 @@ function foo3<T, U>(x: T, cb: (a: T) => U, y: U) {
 var r7 = foo3(1, <Z>(a: Z) => '', ''); // string
 >r7 : string
 >foo3(1, <Z>(a: Z) => '', '') : string
->foo3 : <T, U>(x: T, cb: (a: T) => U, y: U) => U
+>foo3 : typeof foo3
 ><Z>(a: Z) => '' : <Z>(a: Z) => string
 >Z : Z
 >a : Z
@@ -113,19 +113,19 @@ var r7 = foo3(1, <Z>(a: Z) => '', ''); // string
 var r8 = foo3(1, function (a) { return '' }, 1); // {}
 >r8 : {}
 >foo3(1, function (a) { return '' }, 1) : {}
->foo3 : <T, U>(x: T, cb: (a: T) => U, y: U) => U
+>foo3 : typeof foo3
 >function (a) { return '' } : (a: number) => string
 >a : number
 
 var r9 = foo3<number, string>(1, (a) => '', ''); // string
 >r9 : string
 >foo3<number, string>(1, (a) => '', '') : string
->foo3 : <T, U>(x: T, cb: (a: T) => U, y: U) => U
+>foo3 : typeof foo3
 >(a) => '' : (a: number) => string
 >a : number
 
 function other<T, U>(t: T, u: U) {
->other : <T, U>(t: T, u: U) => void
+>other : typeof other
 >T : T
 >U : U
 >t : T
@@ -136,7 +136,7 @@ function other<T, U>(t: T, u: U) {
     var r10 = foo2(1, (x: T) => ''); // string, non-generic signature allows inferences to be made
 >r10 : string
 >foo2(1, (x: T) => '') : string
->foo2 : <T, U>(x: T, cb: (a: T) => U) => U
+>foo2 : typeof foo2
 >(x: T) => '' : (x: T) => string
 >x : T
 >T : T
@@ -144,14 +144,14 @@ function other<T, U>(t: T, u: U) {
     var r10 = foo2(1, (x) => ''); // string
 >r10 : string
 >foo2(1, (x) => '') : string
->foo2 : <T, U>(x: T, cb: (a: T) => U) => U
+>foo2 : typeof foo2
 >(x) => '' : (x: number) => string
 >x : number
 
     var r11 = foo3(1, (x: T) => '', ''); // string
 >r11 : string
 >foo3(1, (x: T) => '', '') : string
->foo3 : <T, U>(x: T, cb: (a: T) => U, y: U) => U
+>foo3 : typeof foo3
 >(x: T) => '' : (x: T) => string
 >x : T
 >T : T
@@ -159,7 +159,7 @@ function other<T, U>(t: T, u: U) {
     var r11b = foo3(1, (x: T) => '', 1); // {}
 >r11b : {}
 >foo3(1, (x: T) => '', 1) : {}
->foo3 : <T, U>(x: T, cb: (a: T) => U, y: U) => U
+>foo3 : typeof foo3
 >(x: T) => '' : (x: T) => string
 >x : T
 >T : T
@@ -167,7 +167,7 @@ function other<T, U>(t: T, u: U) {
     var r12 = foo3(1, function (a) { return '' }, 1); // {}
 >r12 : {}
 >foo3(1, function (a) { return '' }, 1) : {}
->foo3 : <T, U>(x: T, cb: (a: T) => U, y: U) => U
+>foo3 : typeof foo3
 >function (a) { return '' } : (a: number) => string
 >a : number
 }
diff --git a/tests/baselines/reference/genericCallWithFunctionTypedArguments2.types b/tests/baselines/reference/genericCallWithFunctionTypedArguments2.types
index 89d7afd94e2..09f86b64463 100644
--- a/tests/baselines/reference/genericCallWithFunctionTypedArguments2.types
+++ b/tests/baselines/reference/genericCallWithFunctionTypedArguments2.types
@@ -3,7 +3,7 @@
 // Using construct signature arguments, no errors expected
 
 function foo<T>(x: new(a: T) => T) {
->foo : <T>(x: new (a: T) => T) => T
+>foo : typeof foo
 >T : T
 >x : new (a: T) => T
 >a : T
@@ -54,29 +54,29 @@ var a: {
 var r = foo(i); // any
 >r : any
 >foo(i) : any
->foo : <T>(x: new (a: T) => T) => T
+>foo : typeof foo
 >i : I
 
 var r2 = foo<string>(i); // string 
 >r2 : string
 >foo<string>(i) : string
->foo : <T>(x: new (a: T) => T) => T
+>foo : typeof foo
 >i : I
 
 var r3 = foo(i2); // string
 >r3 : string
 >foo(i2) : string
->foo : <T>(x: new (a: T) => T) => T
+>foo : typeof foo
 >i2 : I2<string>
 
 var r3b = foo(a); // any
 >r3b : any
 >foo(a) : any
->foo : <T>(x: new (a: T) => T) => T
+>foo : typeof foo
 >a : new <T>(x: T) => T
 
 function foo2<T, U>(x: T, cb: new(a: T) => U) {
->foo2 : <T, U>(x: T, cb: new (a: T) => U) => U
+>foo2 : typeof foo2
 >T : T
 >U : U
 >x : T
@@ -95,29 +95,29 @@ function foo2<T, U>(x: T, cb: new(a: T) => U) {
 var r4 = foo2(1, i2); // string, instantiated generic
 >r4 : string
 >foo2(1, i2) : string
->foo2 : <T, U>(x: T, cb: new (a: T) => U) => U
+>foo2 : typeof foo2
 >i2 : I2<string>
 
 var r4b = foo2(1, a); // any
 >r4b : any
 >foo2(1, a) : any
->foo2 : <T, U>(x: T, cb: new (a: T) => U) => U
+>foo2 : typeof foo2
 >a : new <T>(x: T) => T
 
 var r5 = foo2(1, i); // any
 >r5 : any
 >foo2(1, i) : any
->foo2 : <T, U>(x: T, cb: new (a: T) => U) => U
+>foo2 : typeof foo2
 >i : I
 
 var r6 = foo2<string, string>('', i2); // string
 >r6 : string
 >foo2<string, string>('', i2) : string
->foo2 : <T, U>(x: T, cb: new (a: T) => U) => U
+>foo2 : typeof foo2
 >i2 : 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
+>foo3 : typeof foo3
 >T : T
 >U : U
 >x : T
@@ -138,24 +138,24 @@ function foo3<T, U>(x: T, cb: new(a: T) => U, y: U) {
 var r7 = foo3(null, i, ''); // any
 >r7 : any
 >foo3(null, i, '') : any
->foo3 : <T, U>(x: T, cb: new (a: T) => U, y: U) => U
+>foo3 : typeof foo3
 >i : I
 
 var r7b = foo3(null, a, ''); // any
 >r7b : any
 >foo3(null, a, '') : any
->foo3 : <T, U>(x: T, cb: new (a: T) => U, y: U) => U
+>foo3 : typeof foo3
 >a : new <T>(x: T) => T
 
 var r8 = foo3(1, i2, 1); // {}
 >r8 : {}
 >foo3(1, i2, 1) : {}
->foo3 : <T, U>(x: T, cb: new (a: T) => U, y: U) => U
+>foo3 : typeof foo3
 >i2 : I2<string>
 
 var r9 = foo3<string, string>('', i2, ''); // string
 >r9 : string
 >foo3<string, string>('', i2, '') : string
->foo3 : <T, U>(x: T, cb: new (a: T) => U, y: U) => U
+>foo3 : typeof foo3
 >i2 : I2<string>
 
diff --git a/tests/baselines/reference/genericCallWithFunctionTypedArguments3.types b/tests/baselines/reference/genericCallWithFunctionTypedArguments3.types
index a6e491d3eb8..988dcaa9c15 100644
--- a/tests/baselines/reference/genericCallWithFunctionTypedArguments3.types
+++ b/tests/baselines/reference/genericCallWithFunctionTypedArguments3.types
@@ -12,7 +12,7 @@ var a: {
 }
 
 function foo4<T, U>(cb: (x: T) => U) {
->foo4 : <T, U>(cb: (x: T) => U) => U
+>foo4 : typeof foo4
 >T : T
 >U : U
 >cb : (x: T) => U
@@ -31,7 +31,7 @@ function foo4<T, U>(cb: (x: T) => U) {
 var r = foo4(a); // T is {} (candidates boolean and string), U is any (candidates any and boolean)
 >r : any
 >foo4(a) : any
->foo4 : <T, U>(cb: (x: T) => U) => U
+>foo4 : typeof foo4
 >a : { (x: boolean): boolean; (x: string): any; }
 
 var b: {
@@ -51,6 +51,6 @@ var b: {
 var r2 = foo4(b); // T is {} (candidates boolean and {}), U is any (candidates any and {})
 >r2 : any
 >foo4(b) : any
->foo4 : <T, U>(cb: (x: T) => U) => U
+>foo4 : typeof foo4
 >b : { <T>(x: boolean): T; <T>(x: T): any; }
 
diff --git a/tests/baselines/reference/genericCallWithFunctionTypedArguments4.types b/tests/baselines/reference/genericCallWithFunctionTypedArguments4.types
index bf4e1eb749c..7e2100be048 100644
--- a/tests/baselines/reference/genericCallWithFunctionTypedArguments4.types
+++ b/tests/baselines/reference/genericCallWithFunctionTypedArguments4.types
@@ -22,7 +22,7 @@ var a: {
 }
 
 function foo4<T, U>(cb: new(x: T) => U) {
->foo4 : <T, U>(cb: new (x: T) => U) => U
+>foo4 : typeof foo4
 >T : T
 >U : U
 >cb : new (x: T) => U
@@ -41,7 +41,7 @@ function foo4<T, U>(cb: new(x: T) => U) {
 var r = foo4(a); // T is {} (candidates boolean and string), U is {} (candidates C and D)
 >r : D
 >foo4(a) : D
->foo4 : <T, U>(cb: new (x: T) => U) => U
+>foo4 : typeof foo4
 >a : { new (x: boolean): C; new (x: string): D; }
 
 var b: {
@@ -61,6 +61,6 @@ var b: {
 var r2 = foo4(b); // T is {} (candidates boolean and {}), U is any (candidates any and {})
 >r2 : any
 >foo4(b) : any
->foo4 : <T, U>(cb: new (x: T) => U) => U
+>foo4 : typeof foo4
 >b : { new <T>(x: boolean): T; new <T>(x: T): any; }
 
diff --git a/tests/baselines/reference/genericCallWithGenericSignatureArguments.types b/tests/baselines/reference/genericCallWithGenericSignatureArguments.types
index 9f634070b56..768bca10bdd 100644
--- a/tests/baselines/reference/genericCallWithGenericSignatureArguments.types
+++ b/tests/baselines/reference/genericCallWithGenericSignatureArguments.types
@@ -3,7 +3,7 @@
 // the corresponding inferred type arguments to become fixed and no further candidate inferences are made for them.
 
 function foo<T>(a: (x: T) => T, b: (x: T) => T) {
->foo : <T>(a: (x: T) => T, b: (x: T) => T) => (x: T) => T
+>foo : typeof foo
 >T : T
 >a : (x: T) => T
 >x : T
@@ -28,7 +28,7 @@ function foo<T>(a: (x: T) => T, b: (x: T) => T) {
 var r1b = foo((x) => 1, (x) => ''); // {} => {}
 >r1b : (x: {}) => {}
 >foo((x) => 1, (x) => '') : (x: {}) => {}
->foo : <T>(a: (x: T) => T, b: (x: T) => T) => (x: T) => T
+>foo : typeof foo
 >(x) => 1 : (x: {}) => number
 >x : {}
 >(x) => '' : (x: {}) => string
@@ -37,7 +37,7 @@ var r1b = foo((x) => 1, (x) => ''); // {} => {}
 var r2 = foo((x: Object) => null, (x: string) => ''); // Object => Object
 >r2 : (x: any) => any
 >foo((x: Object) => null, (x: string) => '') : (x: any) => any
->foo : <T>(a: (x: T) => T, b: (x: T) => T) => (x: T) => T
+>foo : typeof foo
 >(x: Object) => null : (x: Object) => any
 >x : Object
 >Object : Object
@@ -47,7 +47,7 @@ var r2 = foo((x: Object) => null, (x: string) => ''); // Object => Object
 var r3 = foo((x: number) => 1, (x: Object) => null); // number => number
 >r3 : (x: any) => any
 >foo((x: number) => 1, (x: Object) => null) : (x: any) => any
->foo : <T>(a: (x: T) => T, b: (x: T) => T) => (x: T) => T
+>foo : typeof foo
 >(x: number) => 1 : (x: number) => number
 >x : number
 >(x: Object) => null : (x: Object) => any
@@ -57,7 +57,7 @@ var r3 = foo((x: number) => 1, (x: Object) => null); // number => number
 var r3ii = foo((x: number) => 1, (x: number) => 1); // number => number
 >r3ii : (x: number) => number
 >foo((x: number) => 1, (x: number) => 1) : (x: number) => number
->foo : <T>(a: (x: T) => T, b: (x: T) => T) => (x: T) => T
+>foo : typeof foo
 >(x: number) => 1 : (x: number) => number
 >x : number
 >(x: number) => 1 : (x: number) => number
@@ -76,7 +76,7 @@ var b: { x: number; z?: number; };
 var r4 = foo((x: typeof a) => a, (x: typeof b) => b); // typeof a => typeof a
 >r4 : (x: { x: number; y?: number; }) => { x: number; y?: number; }
 >foo((x: typeof a) => a, (x: typeof b) => b) : (x: { x: number; y?: number; }) => { x: number; y?: number; }
->foo : <T>(a: (x: T) => T, b: (x: T) => T) => (x: T) => T
+>foo : typeof foo
 >(x: typeof a) => a : (x: { x: number; y?: number; }) => { x: number; y?: number; }
 >x : { x: number; y?: number; }
 >a : { x: number; y?: number; }
@@ -89,7 +89,7 @@ var r4 = foo((x: typeof a) => a, (x: typeof b) => b); // typeof a => typeof a
 var r5 = foo((x: typeof b) => b, (x: typeof a) => a); // typeof b => typeof b
 >r5 : (x: { x: number; z?: number; }) => { x: number; z?: number; }
 >foo((x: typeof b) => b, (x: typeof a) => a) : (x: { x: number; z?: number; }) => { x: number; z?: number; }
->foo : <T>(a: (x: T) => T, b: (x: T) => T) => (x: T) => T
+>foo : typeof foo
 >(x: typeof b) => b : (x: { x: number; z?: number; }) => { x: number; z?: number; }
 >x : { x: number; z?: number; }
 >b : { x: number; z?: number; }
@@ -100,7 +100,7 @@ var r5 = foo((x: typeof b) => b, (x: typeof a) => a); // typeof b => typeof b
 >a : { x: number; y?: number; }
 
 function other<T>(x: T) {
->other : <T>(x: T) => void
+>other : typeof other
 >T : T
 >x : T
 >T : T
@@ -108,7 +108,7 @@ function other<T>(x: T) {
     var r6 = foo((a: T) => a, (b: T) => b); // T => T
 >r6 : (x: T) => T
 >foo((a: T) => a, (b: T) => b) : (x: T) => T
->foo : <T>(a: (x: T) => T, b: (x: T) => T) => (x: T) => T
+>foo : typeof foo
 >(a: T) => a : (a: T) => T
 >a : T
 >T : T
@@ -121,7 +121,7 @@ function other<T>(x: T) {
     var r6b = foo((a) => a, (b) => b); // {} => {}
 >r6b : (x: {}) => {}
 >foo((a) => a, (b) => b) : (x: {}) => {}
->foo : <T>(a: (x: T) => T, b: (x: T) => T) => (x: T) => T
+>foo : typeof foo
 >(a) => a : (a: {}) => {}
 >a : {}
 >a : {}
@@ -131,7 +131,7 @@ function other<T>(x: T) {
 }
 
 function other2<T extends Date>(x: T) {
->other2 : <T extends Date>(x: T) => void
+>other2 : typeof other2
 >T : T
 >Date : Date
 >x : T
@@ -140,7 +140,7 @@ function other2<T extends Date>(x: T) {
     var r7 = foo((a: T) => a, (b: T) => b); // T => T
 >r7 : (x: T) => T
 >foo((a: T) => a, (b: T) => b) : (x: T) => T
->foo : <T>(a: (x: T) => T, b: (x: T) => T) => (x: T) => T
+>foo : typeof foo
 >(a: T) => a : (a: T) => T
 >a : T
 >T : T
@@ -153,7 +153,7 @@ function other2<T extends Date>(x: T) {
     var r7b = foo((a) => a, (b) => b); // {} => {}
 >r7b : (x: {}) => {}
 >foo((a) => a, (b) => b) : (x: {}) => {}
->foo : <T>(a: (x: T) => T, b: (x: T) => T) => (x: T) => T
+>foo : typeof foo
 >(a) => a : (a: {}) => {}
 >a : {}
 >a : {}
@@ -172,7 +172,7 @@ 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
+>foo2 : typeof foo2
 >T : T
 >Date : Date
 >a : (x: T) => T
@@ -195,7 +195,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
+>other3 : typeof other3
 >T : T
 >RegExp : RegExp
 >x : T
@@ -204,7 +204,7 @@ function other3<T extends RegExp>(x: T) {
     var r8 = foo2((a: Date) => a, (b: Date) => b); // Date => Date
 >r8 : (x: Date) => Date
 >foo2((a: Date) => a, (b: Date) => b) : (x: Date) => Date
->foo2 : <T extends Date>(a: (x: T) => T, b: (x: T) => T) => (x: T) => T
+>foo2 : typeof foo2
 >(a: Date) => a : (a: Date) => Date
 >a : Date
 >Date : Date
diff --git a/tests/baselines/reference/genericCallWithGenericSignatureArguments3.types b/tests/baselines/reference/genericCallWithGenericSignatureArguments3.types
index 2c0d21a5a07..fc512f8eeb4 100644
--- a/tests/baselines/reference/genericCallWithGenericSignatureArguments3.types
+++ b/tests/baselines/reference/genericCallWithGenericSignatureArguments3.types
@@ -3,7 +3,7 @@
 // the corresponding inferred type arguments to become fixed and no further candidate inferences are made for them.
 
 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
+>foo : typeof foo
 >T : T
 >x : T
 >T : T
@@ -29,7 +29,7 @@ function foo<T>(x: T, a: (x: T) => T, b: (x: T) => T) {
 var r1 = foo('', (x: string) => '', (x: Object) => null); // any => any
 >r1 : (x: any) => any
 >foo('', (x: string) => '', (x: Object) => null) : (x: any) => any
->foo : <T>(x: T, a: (x: T) => T, b: (x: T) => T) => (x: T) => T
+>foo : typeof foo
 >(x: string) => '' : (x: string) => string
 >x : string
 >(x: Object) => null : (x: Object) => any
@@ -39,7 +39,7 @@ var r1 = foo('', (x: string) => '', (x: Object) => null); // any => any
 var r1ii = foo('', (x) => '', (x) => null); // string => string
 >r1ii : (x: string) => string
 >foo('', (x) => '', (x) => null) : (x: string) => string
->foo : <T>(x: T, a: (x: T) => T, b: (x: T) => T) => (x: T) => T
+>foo : typeof foo
 >(x) => '' : (x: string) => string
 >x : string
 >(x) => null : (x: string) => any
@@ -48,7 +48,7 @@ var r1ii = foo('', (x) => '', (x) => null); // string => string
 var r2 = foo('', (x: string) => '', (x: Object) => ''); // string => string
 >r2 : (x: Object) => Object
 >foo('', (x: string) => '', (x: Object) => '') : (x: Object) => Object
->foo : <T>(x: T, a: (x: T) => T, b: (x: T) => T) => (x: T) => T
+>foo : typeof foo
 >(x: string) => '' : (x: string) => string
 >x : string
 >(x: Object) => '' : (x: Object) => string
@@ -58,7 +58,7 @@ var r2 = foo('', (x: string) => '', (x: Object) => ''); // string => string
 var r3 = foo(null, (x: Object) => '', (x: string) => ''); // Object => Object
 >r3 : (x: Object) => Object
 >foo(null, (x: Object) => '', (x: string) => '') : (x: Object) => Object
->foo : <T>(x: T, a: (x: T) => T, b: (x: T) => T) => (x: T) => T
+>foo : typeof foo
 >(x: Object) => '' : (x: Object) => string
 >x : Object
 >Object : Object
@@ -68,7 +68,7 @@ var r3 = foo(null, (x: Object) => '', (x: string) => ''); // Object => Object
 var r4 = foo(null, (x) => '', (x) => ''); // any => any
 >r4 : (x: any) => any
 >foo(null, (x) => '', (x) => '') : (x: any) => any
->foo : <T>(x: T, a: (x: T) => T, b: (x: T) => T) => (x: T) => T
+>foo : typeof foo
 >(x) => '' : (x: any) => string
 >x : any
 >(x) => '' : (x: any) => string
@@ -77,7 +77,7 @@ var r4 = foo(null, (x) => '', (x) => ''); // any => any
 var r5 = foo(new Object(), (x) => '', (x) => ''); // Object => Object
 >r5 : (x: Object) => Object
 >foo(new Object(), (x) => '', (x) => '') : (x: Object) => Object
->foo : <T>(x: T, a: (x: T) => T, b: (x: T) => T) => (x: T) => T
+>foo : typeof foo
 >new Object() : Object
 >Object : { (): any; (value: any): any; new (value?: any): Object; prototype: Object; getPrototypeOf(o: any): any; getOwnPropertyDescriptor(o: any, p: string): PropertyDescriptor; getOwnPropertyNames(o: any): string[]; create(o: any, properties?: PropertyDescriptorMap): any; defineProperty(o: any, p: string, attributes: PropertyDescriptor): any; defineProperties(o: any, properties: PropertyDescriptorMap): any; seal(o: any): any; freeze(o: any): any; preventExtensions(o: any): any; isSealed(o: any): boolean; isFrozen(o: any): boolean; isExtensible(o: any): boolean; keys(o: any): string[]; }
 >(x) => '' : (x: Object) => string
@@ -96,7 +96,7 @@ enum F { A }
 var r6 = foo(E.A, (x: number) => E.A, (x: F) => F.A); // number => number 
 >r6 : (x: number) => number
 >foo(E.A, (x: number) => E.A, (x: F) => F.A) : (x: number) => number
->foo : <T>(x: T, a: (x: T) => T, b: (x: T) => T) => (x: T) => T
+>foo : typeof foo
 >E.A : E
 >E : typeof E
 >A : E
@@ -114,7 +114,7 @@ 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
+>foo2 : typeof foo2
 >T : T
 >U : U
 >x : T
@@ -141,7 +141,7 @@ function foo2<T, U>(x: T, a: (x: T) => U, b: (x: T) => U) {
 var r8 = foo2('', (x) => '', (x) => null); // string => string
 >r8 : (x: string) => any
 >foo2('', (x) => '', (x) => null) : (x: string) => any
->foo2 : <T, U>(x: T, a: (x: T) => U, b: (x: T) => U) => (x: T) => U
+>foo2 : typeof foo2
 >(x) => '' : (x: string) => string
 >x : string
 >(x) => null : (x: string) => any
@@ -150,7 +150,7 @@ var r8 = foo2('', (x) => '', (x) => null); // string => string
 var r9 = foo2(null, (x) => '', (x) => ''); // any => any
 >r9 : (x: any) => string
 >foo2(null, (x) => '', (x) => '') : (x: any) => string
->foo2 : <T, U>(x: T, a: (x: T) => U, b: (x: T) => U) => (x: T) => U
+>foo2 : typeof foo2
 >(x) => '' : (x: any) => string
 >x : any
 >(x) => '' : (x: any) => string
@@ -159,7 +159,7 @@ var r9 = foo2(null, (x) => '', (x) => ''); // any => any
 var r10 = foo2(null, (x: Object) => '', (x: string) => ''); // Object => Object
 >r10 : (x: Object) => string
 >foo2(null, (x: Object) => '', (x: string) => '') : (x: Object) => string
->foo2 : <T, U>(x: T, a: (x: T) => U, b: (x: T) => U) => (x: T) => U
+>foo2 : typeof foo2
 >(x: Object) => '' : (x: Object) => string
 >x : Object
 >Object : Object
@@ -173,7 +173,7 @@ var x: (a: string) => boolean;
 var r11 = foo2(x, (a1: (y: string) => string) => (n: Object) => 1, (a2: (z: string) => string) => 2); // {} => {}
 >r11 : (x: {}) => {}
 >foo2(x, (a1: (y: string) => string) => (n: Object) => 1, (a2: (z: string) => string) => 2) : (x: {}) => {}
->foo2 : <T, U>(x: T, a: (x: T) => U, b: (x: T) => U) => (x: T) => U
+>foo2 : typeof foo2
 >x : (a: string) => boolean
 >(a1: (y: string) => string) => (n: Object) => 1 : (a1: (y: string) => string) => (n: Object) => number
 >a1 : (y: string) => string
@@ -188,7 +188,7 @@ var r11 = foo2(x, (a1: (y: string) => string) => (n: Object) => 1, (a2: (z: stri
 var r12 = foo2(x, (a1: (y: string) => boolean) => (n: Object) => 1, (a2: (z: string) => boolean) => 2); // (string => boolean) => {}
 >r12 : (x: (a: string) => boolean) => {}
 >foo2(x, (a1: (y: string) => boolean) => (n: Object) => 1, (a2: (z: string) => boolean) => 2) : (x: (a: string) => boolean) => {}
->foo2 : <T, U>(x: T, a: (x: T) => U, b: (x: T) => U) => (x: T) => U
+>foo2 : typeof foo2
 >x : (a: string) => boolean
 >(a1: (y: string) => boolean) => (n: Object) => 1 : (a1: (y: string) => boolean) => (n: Object) => number
 >a1 : (y: string) => boolean
diff --git a/tests/baselines/reference/genericCallWithNonGenericArgs1.types b/tests/baselines/reference/genericCallWithNonGenericArgs1.types
index f08f8503075..8b885d4f677 100644
--- a/tests/baselines/reference/genericCallWithNonGenericArgs1.types
+++ b/tests/baselines/reference/genericCallWithNonGenericArgs1.types
@@ -1,10 +1,10 @@
 === tests/cases/compiler/genericCallWithNonGenericArgs1.ts ===
 function f<T>(x: any) { }
->f : <T>(x: any) => void
+>f : typeof f
 >T : T
 >x : any
 
 f<any>(null)
 >f<any>(null) : void
->f : <T>(x: any) => void
+>f : typeof f
 
diff --git a/tests/baselines/reference/genericCallWithNonSymmetricSubtypes.types b/tests/baselines/reference/genericCallWithNonSymmetricSubtypes.types
index e37a010baed..dd08de2ab05 100644
--- a/tests/baselines/reference/genericCallWithNonSymmetricSubtypes.types
+++ b/tests/baselines/reference/genericCallWithNonSymmetricSubtypes.types
@@ -3,7 +3,7 @@
 // we choose the first candidate so the result is dependent on the order of the arguments provided
 
 function foo<T>(x: T, y: T) {
->foo : <T>(x: T, y: T) => T
+>foo : typeof foo
 >T : T
 >x : T
 >T : T
@@ -31,14 +31,14 @@ var b: { x: number; z?: number; };
 var r = foo(a, b); // { x: number; y?: number; };
 >r : { x: number; y?: number; }
 >foo(a, b) : { x: number; y?: number; }
->foo : <T>(x: T, y: T) => T
+>foo : typeof foo
 >a : { x: number; y?: number; }
 >b : { x: number; z?: number; }
 
 var r2 = foo(b, a); // { x: number; z?: number; };
 >r2 : { x: number; z?: number; }
 >foo(b, a) : { x: number; z?: number; }
->foo : <T>(x: T, y: T) => T
+>foo : typeof foo
 >b : { x: number; z?: number; }
 >a : { x: number; y?: number; }
 
@@ -53,42 +53,42 @@ var y: { x?: number; };
 var r3 = foo(a, x); // { x: number; y?: number; };
 >r3 : { x: number; y?: number; }
 >foo(a, x) : { x: number; y?: number; }
->foo : <T>(x: T, y: T) => T
+>foo : typeof foo
 >a : { x: number; y?: number; }
 >x : { x: number; }
 
 var r4 = foo(x, a); // { x: number; };
 >r4 : { x: number; }
 >foo(x, a) : { x: number; }
->foo : <T>(x: T, y: T) => T
+>foo : typeof foo
 >x : { x: number; }
 >a : { x: number; y?: number; }
 
 var r5 = foo(a, y); // { x?: number; };
 >r5 : { x?: number; }
 >foo(a, y) : { x?: number; }
->foo : <T>(x: T, y: T) => T
+>foo : typeof foo
 >a : { x: number; y?: number; }
 >y : { x?: number; }
 
 var r5 = foo(y, a); // { x?: number; };
 >r5 : { x?: number; }
 >foo(y, a) : { x?: number; }
->foo : <T>(x: T, y: T) => T
+>foo : typeof foo
 >y : { x?: number; }
 >a : { x: number; y?: number; }
 
 var r6 = foo(x, y); // { x?: number; };
 >r6 : { x?: number; }
 >foo(x, y) : { x?: number; }
->foo : <T>(x: T, y: T) => T
+>foo : typeof foo
 >x : { x: number; }
 >y : { x?: number; }
 
 var r6 = foo(y, x); // { x?: number; };
 >r6 : { x?: number; }
 >foo(y, x) : { x?: number; }
->foo : <T>(x: T, y: T) => T
+>foo : typeof foo
 >y : { x?: number; }
 >x : { x: number; }
 
@@ -104,14 +104,14 @@ var s2: (x: string) => string;
 var r7 = foo(s1, s2); // (x: Object) => string;
 >r7 : (x: Object) => string
 >foo(s1, s2) : (x: Object) => string
->foo : <T>(x: T, y: T) => T
+>foo : typeof foo
 >s1 : (x: Object) => string
 >s2 : (x: string) => string
 
 var r8 = foo(s2, s1); // (x: string) => string;
 >r8 : (x: string) => string
 >foo(s2, s1) : (x: string) => string
->foo : <T>(x: T, y: T) => T
+>foo : typeof foo
 >s2 : (x: string) => string
 >s1 : (x: Object) => string
 
diff --git a/tests/baselines/reference/genericCallWithObjectLiteralArgs.types b/tests/baselines/reference/genericCallWithObjectLiteralArgs.types
index 5cf8f12164a..2b825fb06f2 100644
--- a/tests/baselines/reference/genericCallWithObjectLiteralArgs.types
+++ b/tests/baselines/reference/genericCallWithObjectLiteralArgs.types
@@ -1,6 +1,6 @@
 === 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; }
+>foo : typeof foo
 >T : T
 >x : { bar: T; baz: T; }
 >bar : T
@@ -15,7 +15,7 @@ function foo<T>(x: { bar: T; baz: T }) {
 var r = foo({ bar: 1, baz: '' }); // T = {}
 >r : { bar: {}; baz: {}; }
 >foo({ bar: 1, baz: '' }) : { bar: {}; baz: {}; }
->foo : <T>(x: { bar: T; baz: T; }) => { bar: T; baz: T; }
+>foo : typeof foo
 >{ bar: 1, baz: '' } : { bar: number; baz: string; }
 >bar : number
 >baz : string
@@ -23,26 +23,26 @@ var r = foo({ bar: 1, baz: '' }); // T = {}
 var r2 = foo({ bar: 1, baz: 1 }); // T = number
 >r2 : { bar: number; baz: number; }
 >foo({ bar: 1, baz: 1 }) : { bar: number; baz: number; }
->foo : <T>(x: { bar: T; baz: T; }) => { bar: T; baz: T; }
+>foo : typeof foo
 >{ bar: 1, baz: 1 } : { bar: number; baz: number; }
 >bar : number
 >baz : number
 
 // BUG 835724
 var r3 = foo({ bar: foo, baz: foo }); // T = any
->r3 : { bar: <T>(x: { bar: T; baz: T; }) => { bar: T; baz: T; }; baz: <T>(x: { bar: T; baz: T; }) => { bar: T; baz: T; }; }
->foo({ bar: foo, baz: foo }) : { bar: <T>(x: { bar: T; baz: T; }) => { bar: T; baz: T; }; baz: <T>(x: { bar: T; baz: T; }) => { bar: T; baz: T; }; }
->foo : <T>(x: { bar: T; baz: T; }) => { bar: T; baz: T; }
->{ bar: foo, baz: foo } : { bar: <T>(x: { bar: T; baz: T; }) => { bar: T; baz: T; }; baz: <T>(x: { bar: T; baz: T; }) => { bar: T; baz: T; }; }
->bar : <T>(x: { bar: T; baz: T; }) => { bar: T; baz: T; }
+>r3 : { bar: typeof foo; baz: typeof foo; }
+>foo({ bar: foo, baz: foo }) : { bar: typeof foo; baz: typeof foo; }
+>foo : typeof foo
+>{ bar: foo, baz: foo } : { bar: typeof foo; baz: typeof foo; }
+>bar : typeof foo
 >foo : foo
->baz : <T>(x: { bar: T; baz: T; }) => { bar: T; baz: T; }
+>baz : typeof foo
 >foo : foo
 
 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; }
+>foo : typeof foo
 >Object : Object
 >{ bar: 1, baz: '' } : { bar: number; baz: string; }
 >bar : number
diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgs.types b/tests/baselines/reference/genericCallWithObjectTypeArgs.types
index ddbd7d83054..c2bb114c455 100644
--- a/tests/baselines/reference/genericCallWithObjectTypeArgs.types
+++ b/tests/baselines/reference/genericCallWithObjectTypeArgs.types
@@ -23,7 +23,7 @@ class X<T> {
 }
 
 function foo<T>(t: X<T>, t2: X<T>) {
->foo : <T>(t: X<T>, t2: X<T>) => T
+>foo : typeof foo
 >T : T
 >t : X<T>
 >X : X<T>
@@ -55,14 +55,14 @@ var d1 = new X<D>();
 var r = foo(c1, d1); // error
 >r : {}
 >foo(c1, d1) : {}
->foo : <T>(t: X<T>, t2: X<T>) => T
+>foo : typeof foo
 >c1 : X<C>
 >d1 : X<D>
 
 var r2 = foo(c1, c1); // ok
 >r2 : C
 >foo(c1, c1) : C
->foo : <T>(t: X<T>, t2: X<T>) => T
+>foo : typeof foo
 >c1 : X<C>
 >c1 : X<C>
 
diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgs2.types b/tests/baselines/reference/genericCallWithObjectTypeArgs2.types
index 0065811fdc1..35d38e3f065 100644
--- a/tests/baselines/reference/genericCallWithObjectTypeArgs2.types
+++ b/tests/baselines/reference/genericCallWithObjectTypeArgs2.types
@@ -22,7 +22,7 @@ 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; }) => {}[]
+>f : typeof f
 >T : T
 >Base : Base
 >U : U
@@ -46,7 +46,7 @@ function f<T extends Base, U extends Base>(a: { x: T; y: U }) {
 var r = f({ x: new Derived(), y: new Derived2() }); // {}[]
 >r : {}[]
 >f({ x: new Derived(), y: new Derived2() }) : {}[]
->f : <T extends Base, U extends Base>(a: { x: T; y: U; }) => {}[]
+>f : typeof f
 >{ x: new Derived(), y: new Derived2() } : { x: Derived; y: Derived2; }
 >x : Derived
 >new Derived() : Derived
@@ -58,7 +58,7 @@ var r = f({ x: new Derived(), y: new Derived2() }); // {}[]
 var r2 = f({ x: new Base(), y: new Derived2() }); // {}[]
 >r2 : {}[]
 >f({ x: new Base(), y: new Derived2() }) : {}[]
->f : <T extends Base, U extends Base>(a: { x: T; y: U; }) => {}[]
+>f : typeof f
 >{ x: new Base(), y: new Derived2() } : { x: Base; y: Derived2; }
 >x : Base
 >new Base() : Base
@@ -69,7 +69,7 @@ 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
+>f2 : typeof f2
 >T : T
 >Base : Base
 >U : U
@@ -92,7 +92,7 @@ function f2<T extends Base, U extends Base>(a: { x: T; y: U }) {
 var r3 = f2({ x: new Derived(), y: new Derived2() }); // Derived => Derived2
 >r3 : (x: Derived) => Derived2
 >f2({ x: new Derived(), y: new Derived2() }) : (x: Derived) => Derived2
->f2 : <T extends Base, U extends Base>(a: { x: T; y: U; }) => (x: T) => U
+>f2 : typeof f2
 >{ x: new Derived(), y: new Derived2() } : { x: Derived; y: Derived2; }
 >x : Derived
 >new Derived() : Derived
@@ -124,6 +124,6 @@ var i: I<Base, Derived>;
 var r4 = f2(i); // Base => Derived
 >r4 : (x: Base) => Derived
 >f2(i) : (x: Base) => Derived
->f2 : <T extends Base, U extends Base>(a: { x: T; y: U; }) => (x: T) => U
+>f2 : typeof f2
 >i : I<Base, Derived>
 
diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints.types b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints.types
index 8e062a8d5bf..852196e93f9 100644
--- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints.types
+++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints.types
@@ -29,7 +29,7 @@ class X<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
+>foo : typeof foo
 >T : T
 >x : string
 >t : X<T>
@@ -62,19 +62,19 @@ var d1 = new X<D>();
 var r = foo(c1, d1); 
 >r : C
 >foo(c1, d1) : C
->foo : <T extends { x: string; }>(t: X<T>, t2: X<T>) => T
+>foo : typeof foo
 >c1 : X<C>
 >d1 : X<D>
 
 var r2 = foo(c1, c1);
 >r2 : C
 >foo(c1, c1) : C
->foo : <T extends { x: string; }>(t: X<T>, t2: X<T>) => T
+>foo : typeof foo
 >c1 : X<C>
 >c1 : X<C>
 
 function foo2<T extends C>(t: X<T>, t2: X<T>) {
->foo2 : <T extends C>(t: X<T>, t2: X<T>) => T
+>foo2 : typeof foo2
 >T : T
 >C : C
 >t : X<T>
@@ -95,14 +95,14 @@ function foo2<T extends C>(t: X<T>, t2: X<T>) {
 var r = foo2(c1, d1); 
 >r : C
 >foo2(c1, d1) : C
->foo2 : <T extends C>(t: X<T>, t2: X<T>) => T
+>foo2 : typeof foo2
 >c1 : X<C>
 >d1 : X<D>
 
 var r2 = foo2(c1, c1);
 >r2 : C
 >foo2(c1, c1) : C
->foo2 : <T extends C>(t: X<T>, t2: X<T>) => T
+>foo2 : typeof foo2
 >c1 : X<C>
 >c1 : X<C>
 
diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints2.types b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints2.types
index 29706ba7e3d..db9db6422e1 100644
--- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints2.types
+++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints2.types
@@ -17,7 +17,7 @@ class Derived extends Base {
 }
 
 function f<T extends Base>(x: { foo: T; bar: T }) {
->f : <T extends Base>(x: { foo: T; bar: T; }) => T
+>f : typeof f
 >T : T
 >Base : Base
 >x : { foo: T; bar: T; }
@@ -36,7 +36,7 @@ function f<T extends Base>(x: { foo: T; bar: T }) {
 var r = f({ foo: new Base(), bar: new Derived() });
 >r : Base
 >f({ foo: new Base(), bar: new Derived() }) : Base
->f : <T extends Base>(x: { foo: T; bar: T; }) => T
+>f : typeof f
 >{ foo: new Base(), bar: new Derived() } : { foo: Base; bar: Derived; }
 >foo : Base
 >new Base() : Base
@@ -48,7 +48,7 @@ var r = f({ foo: new Base(), bar: new Derived() });
 var r2 = f({ foo: new Derived(), bar: new Derived() });
 >r2 : Derived
 >f({ foo: new Derived(), bar: new Derived() }) : Derived
->f : <T extends Base>(x: { foo: T; bar: T; }) => T
+>f : typeof f
 >{ foo: new Derived(), bar: new Derived() } : { foo: Derived; bar: Derived; }
 >foo : Derived
 >new Derived() : Derived
@@ -67,7 +67,7 @@ interface I<T> {
 >T : T
 }
 function f2<T extends Base>(x: I<T>) {
->f2 : <T extends Base>(x: I<T>) => T
+>f2 : typeof f2
 >T : T
 >Base : Base
 >x : I<T>
@@ -89,12 +89,12 @@ var i: I<Derived>;
 var r3 = f2(i);
 >r3 : Derived
 >f2(i) : Derived
->f2 : <T extends Base>(x: I<T>) => T
+>f2 : typeof f2
 >i : I<Derived>
 
 
 function f3<T extends Base>(x: T, y: (a: T) => T) {
->f3 : <T extends Base>(x: T, y: (a: T) => T) => T
+>f3 : typeof f3
 >T : T
 >Base : Base
 >x : T
@@ -111,7 +111,7 @@ function f3<T extends Base>(x: T, y: (a: T) => T) {
 var r4 = f3(new Base(), x => x);
 >r4 : Base
 >f3(new Base(), x => x) : Base
->f3 : <T extends Base>(x: T, y: (a: T) => T) => T
+>f3 : typeof f3
 >new Base() : Base
 >Base : typeof Base
 >x => x : (x: Base) => Base
@@ -121,7 +121,7 @@ var r4 = f3(new Base(), x => x);
 var r5 = f3(new Derived(), x => x);
 >r5 : Derived
 >f3(new Derived(), x => x) : Derived
->f3 : <T extends Base>(x: T, y: (a: T) => T) => T
+>f3 : typeof f3
 >new Derived() : Derived
 >Derived : typeof Derived
 >x => x : (x: Derived) => Derived
@@ -131,12 +131,12 @@ var r5 = f3(new Derived(), x => x);
 var r6 = f3(null, null); // any
 >r6 : any
 >f3(null, null) : any
->f3 : <T extends Base>(x: T, y: (a: T) => T) => T
+>f3 : typeof f3
 
 var r7 = f3(null, x => x); // any
 >r7 : any
 >f3(null, x => x) : any
->f3 : <T extends Base>(x: T, y: (a: T) => T) => T
+>f3 : typeof f3
 >x => x : (x: any) => any
 >x : any
 >x : any
diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgsAndIndexers.types b/tests/baselines/reference/genericCallWithObjectTypeArgsAndIndexers.types
index 9a7ca1dbb91..81f4fe5f6d2 100644
--- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndIndexers.types
+++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndIndexers.types
@@ -2,7 +2,7 @@
 // Type inference infers from indexers in target type, no errors expected
 
 function foo<T>(x: T) {
->foo : <T>(x: T) => T
+>foo : typeof foo
 >T : T
 >x : T
 >T : T
@@ -26,11 +26,11 @@ var a: {
 var r = foo(a);
 >r : { [x: string]: Object; [x: number]: Date; }
 >foo(a) : { [x: string]: Object; [x: number]: Date; }
->foo : <T>(x: T) => T
+>foo : typeof foo
 >a : { [x: string]: Object; [x: number]: Date; }
 
 function other<T extends Date>(arg: T) {
->other : <T extends Date>(arg: T) => void
+>other : typeof other
 >T : T
 >Date : Date
 >arg : T
@@ -51,7 +51,7 @@ function other<T extends Date>(arg: T) {
     var r2 = foo(b);
 >r2 : { [x: string]: Object; [x: number]: T; }
 >foo(b) : { [x: string]: Object; [x: number]: T; }
->foo : <T>(x: T) => T
+>foo : typeof foo
 >b : { [x: string]: Object; [x: number]: T; }
 
     var d = r2[1]; 
diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgsAndNumericIndexer.types b/tests/baselines/reference/genericCallWithObjectTypeArgsAndNumericIndexer.types
index f4b3f5960f0..497aa0b443e 100644
--- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndNumericIndexer.types
+++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndNumericIndexer.types
@@ -2,7 +2,7 @@
 // Type inference infers from indexers in target type, no errors expected
 
 function foo<T>(x: T) {
->foo : <T>(x: T) => T
+>foo : typeof foo
 >T : T
 >x : T
 >T : T
@@ -19,11 +19,11 @@ var a: { [x: number]: Date };
 var r = foo(a);
 >r : { [x: number]: Date; }
 >foo(a) : { [x: number]: Date; }
->foo : <T>(x: T) => T
+>foo : typeof foo
 >a : { [x: number]: Date; }
 
 function other<T>(arg: T) {
->other : <T>(arg: T) => void
+>other : typeof other
 >T : T
 >arg : T
 >T : T
@@ -36,12 +36,12 @@ function other<T>(arg: T) {
     var r2 = foo(b); // T
 >r2 : { [x: number]: T; }
 >foo(b) : { [x: number]: T; }
->foo : <T>(x: T) => T
+>foo : typeof foo
 >b : { [x: number]: T; }
 }
 
 function other2<T extends Date>(arg: T) {
->other2 : <T extends Date>(arg: T) => void
+>other2 : typeof other2
 >T : T
 >Date : Date
 >arg : T
@@ -55,7 +55,7 @@ function other2<T extends Date>(arg: T) {
     var r2 = foo(b);
 >r2 : { [x: number]: T; }
 >foo(b) : { [x: number]: T; }
->foo : <T>(x: T) => T
+>foo : typeof foo
 >b : { [x: number]: T; }
 
     var d = r2[1];
@@ -65,7 +65,7 @@ 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
+>other3 : typeof other3
 >T : T
 >Date : Date
 >U : U
@@ -81,7 +81,7 @@ function other3<T extends Date, U extends Date>(arg: T) {
     var r2 = foo(b);
 >r2 : { [x: number]: T; }
 >foo(b) : { [x: number]: T; }
->foo : <T>(x: T) => T
+>foo : typeof foo
 >b : { [x: number]: T; }
 
     var d = r2[1];
diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgsAndStringIndexer.types b/tests/baselines/reference/genericCallWithObjectTypeArgsAndStringIndexer.types
index e52e6cff113..133a4a6c6a9 100644
--- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndStringIndexer.types
+++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndStringIndexer.types
@@ -2,7 +2,7 @@
 // Type inference infers from indexers in target type, no errors expected
 
 function foo<T>(x: T) {
->foo : <T>(x: T) => T
+>foo : typeof foo
 >T : T
 >x : T
 >T : T
@@ -19,11 +19,11 @@ var a: { [x: string]: Date };
 var r = foo(a);
 >r : { [x: string]: Date; }
 >foo(a) : { [x: string]: Date; }
->foo : <T>(x: T) => T
+>foo : typeof foo
 >a : { [x: string]: Date; }
 
 function other<T>(arg: T) {
->other : <T>(arg: T) => void
+>other : typeof other
 >T : T
 >arg : T
 >T : T
@@ -36,12 +36,12 @@ function other<T>(arg: T) {
     var r2 = foo(b); // T
 >r2 : { [x: string]: T; }
 >foo(b) : { [x: string]: T; }
->foo : <T>(x: T) => T
+>foo : typeof foo
 >b : { [x: string]: T; }
 }
 
 function other2<T extends Date>(arg: T) {
->other2 : <T extends Date>(arg: T) => void
+>other2 : typeof other2
 >T : T
 >Date : Date
 >arg : T
@@ -55,7 +55,7 @@ function other2<T extends Date>(arg: T) {
     var r2 = foo(b);
 >r2 : { [x: string]: T; }
 >foo(b) : { [x: string]: T; }
->foo : <T>(x: T) => T
+>foo : typeof foo
 >b : { [x: string]: T; }
 
     var d: Date = r2['hm']; // ok
@@ -66,7 +66,7 @@ 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
+>other3 : typeof other3
 >T : T
 >Date : Date
 >U : U
@@ -82,7 +82,7 @@ function other3<T extends Date, U extends Date>(arg: T) {
     var r2 = foo(b);
 >r2 : { [x: string]: T; }
 >foo(b) : { [x: string]: T; }
->foo : <T>(x: T) => T
+>foo : typeof foo
 >b : { [x: string]: T; }
 
     var d: Date = r2['hm']; // ok
diff --git a/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments.types b/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments.types
index 6c16ad0259c..2a9b0c2e861 100644
--- a/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments.types
+++ b/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments.types
@@ -16,7 +16,7 @@ module NonGenericParameter {
     }
 
     function foo4(cb: typeof a) {
->foo4 : (cb: { new (x: boolean): boolean; new (x: string): string; }) => boolean
+>foo4 : typeof foo4
 >cb : { new (x: boolean): boolean; new (x: string): string; }
 >a : { new (x: boolean): boolean; new (x: string): string; }
 
@@ -28,7 +28,7 @@ module NonGenericParameter {
     var r = foo4(a);
 >r : boolean
 >foo4(a) : boolean
->foo4 : (cb: { new (x: boolean): boolean; new (x: string): string; }) => boolean
+>foo4 : typeof foo4
 >a : { new (x: boolean): boolean; new (x: string): string; }
 
     var b: { new <T>(x: T): T };
@@ -41,7 +41,7 @@ module NonGenericParameter {
     var r2 = foo4(b);
 >r2 : boolean
 >foo4(b) : boolean
->foo4 : (cb: { new (x: boolean): boolean; new (x: string): string; }) => boolean
+>foo4 : typeof foo4
 >b : new <T>(x: T) => T
 }
 
@@ -49,7 +49,7 @@ module GenericParameter {
 >GenericParameter : typeof 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; }
+>foo5 : typeof foo5
 >T : T
 >cb : { new (x: T): string; new (x: number): T; }
 >x : T
@@ -73,7 +73,7 @@ module GenericParameter {
     var r5 = foo5(a); // new{} => string; new(x:number) => {}
 >r5 : { new (x: boolean): string; new (x: number): boolean; }
 >foo5(a) : { new (x: boolean): string; new (x: number): boolean; }
->foo5 : <T>(cb: { new (x: T): string; new (x: number): T; }) => { new (x: T): string; new (x: number): T; }
+>foo5 : typeof foo5
 >a : { new (x: boolean): string; new (x: number): boolean; }
 
     var b: { new<T>(x: T): string; new<T>(x: number): T; }
@@ -88,11 +88,11 @@ module GenericParameter {
     var r7 = foo5(b); // new any => string; new(x:number) => any
 >r7 : { new (x: any): string; new (x: number): any; }
 >foo5(b) : { new (x: any): string; new (x: number): any; }
->foo5 : <T>(cb: { new (x: T): string; new (x: number): T; }) => { new (x: T): string; new (x: number): T; }
+>foo5 : typeof foo5
 >b : { new <T>(x: T): string; new <T>(x: number): T; }
 
     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; }
+>foo6 : typeof foo6
 >T : T
 >cb : { new (x: T): string; new (x: T, y?: T): string; }
 >x : T
@@ -109,17 +109,17 @@ module GenericParameter {
     var r8 = foo6(a); // new{} => string; new(x:{}, y?:{}) => string
 >r8 : { new (x: {}): string; new (x: {}, y?: {}): string; }
 >foo6(a) : { new (x: {}): string; new (x: {}, y?: {}): string; }
->foo6 : <T>(cb: { new (x: T): string; new (x: T, y?: T): string; }) => { new (x: T): string; new (x: T, y?: T): string; }
+>foo6 : typeof foo6
 >a : { new (x: boolean): string; new (x: number): boolean; }
 
     var r9 = foo6(b); // new any => string; new(x:any, y?:any) => string
 >r9 : { new (x: any): string; new (x: any, y?: any): string; }
 >foo6(b) : { new (x: any): string; new (x: any, y?: any): string; }
->foo6 : <T>(cb: { new (x: T): string; new (x: T, y?: T): string; }) => { new (x: T): string; new (x: T, y?: T): string; }
+>foo6 : typeof foo6
 >b : { new <T>(x: T): string; new <T>(x: number): T; }
 
     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; }
+>foo7 : typeof foo7
 >T : T
 >x : T
 >T : T
@@ -138,7 +138,7 @@ module GenericParameter {
     var r13 = foo7(1, b); // new any => string; new(x:any, y?:any) => string
 >r13 : { new (x: any): string; new (x: any, y?: any): string; }
 >foo7(1, b) : { new (x: any): string; new (x: any, y?: any): 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; }
+>foo7 : typeof foo7
 >b : { new <T>(x: T): string; new <T>(x: number): T; }
 
     var c: { new <T>(x: T): string; <T>(x: number): T; }
@@ -162,12 +162,12 @@ module GenericParameter {
     var r14 = foo7(1, c); // new any => string; new(x:any, y?:any) => string
 >r14 : { new (x: any): string; new (x: any, y?: any): string; }
 >foo7(1, c) : { new (x: any): string; new (x: any, y?: any): 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; }
+>foo7 : typeof foo7
 >c : { <T>(x: number): T; new <T>(x: T): string; }
 
     var r15 = foo7(1, c2); // new any => string; new(x:any, y?:any) => string
 >r15 : { new (x: any): string; new (x: any, y?: any): string; }
 >foo7(1, c2) : { new (x: any): string; new (x: any, y?: any): 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; }
+>foo7 : typeof foo7
 >c2 : { new <T>(x: T): string; new <T>(x: number): T; }
 }
diff --git a/tests/baselines/reference/genericCallWithOverloadedFunctionTypedArguments.types b/tests/baselines/reference/genericCallWithOverloadedFunctionTypedArguments.types
index ad491206be6..ecf23d2ead9 100644
--- a/tests/baselines/reference/genericCallWithOverloadedFunctionTypedArguments.types
+++ b/tests/baselines/reference/genericCallWithOverloadedFunctionTypedArguments.types
@@ -16,7 +16,7 @@ module NonGenericParameter {
     }
 
     function foo4(cb: typeof a) {
->foo4 : (cb: { (x: boolean): boolean; (x: string): string; }) => { (x: boolean): boolean; (x: string): string; }
+>foo4 : typeof foo4
 >cb : { (x: boolean): boolean; (x: string): string; }
 >a : { (x: boolean): boolean; (x: string): string; }
 
@@ -27,13 +27,13 @@ module NonGenericParameter {
     var r = foo4(a);
 >r : { (x: boolean): boolean; (x: string): string; }
 >foo4(a) : { (x: boolean): boolean; (x: string): string; }
->foo4 : (cb: { (x: boolean): boolean; (x: string): string; }) => { (x: boolean): boolean; (x: string): string; }
+>foo4 : typeof foo4
 >a : { (x: boolean): boolean; (x: string): string; }
 
     var r2 = foo4(<T>(x: T) => x);
 >r2 : { (x: boolean): boolean; (x: string): string; }
 >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; }
+>foo4 : typeof foo4
 ><T>(x: T) => x : <T>(x: T) => T
 >T : T
 >x : T
@@ -43,7 +43,7 @@ module NonGenericParameter {
     var r4 = foo4(x => x);    
 >r4 : { (x: boolean): boolean; (x: string): string; }
 >foo4(x => x) : { (x: boolean): boolean; (x: string): string; }
->foo4 : (cb: { (x: boolean): boolean; (x: string): string; }) => { (x: boolean): boolean; (x: string): string; }
+>foo4 : typeof foo4
 >x => x : (x: any) => any
 >x : any
 >x : any
@@ -53,7 +53,7 @@ module GenericParameter {
 >GenericParameter : typeof 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; }
+>foo5 : typeof foo5
 >T : T
 >cb : { (x: T): string; (x: number): T; }
 >x : T
@@ -68,7 +68,7 @@ module GenericParameter {
     var r5 = foo5(x => x); // any => string (+1 overload) [inferences are made for T, but lambda not contextually typed]. T is any
 >r5 : { (x: any): string; (x: number): any; }
 >foo5(x => x) : { (x: any): string; (x: number): any; }
->foo5 : <T>(cb: { (x: T): string; (x: number): T; }) => { (x: T): string; (x: number): T; }
+>foo5 : typeof foo5
 >x => x : (x: any) => any
 >x : any
 >x : any
@@ -85,11 +85,11 @@ module GenericParameter {
     var r7 = foo5(a); // any => string (+1 overload)
 >r7 : { (x: any): string; (x: number): any; }
 >foo5(a) : { (x: any): string; (x: number): any; }
->foo5 : <T>(cb: { (x: T): string; (x: number): T; }) => { (x: T): string; (x: number): T; }
+>foo5 : typeof foo5
 >a : { <T>(x: T): string; <T>(x: number): 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; }
+>foo6 : typeof foo6
 >T : T
 >cb : { (x: T): string; (x: T, y?: T): string; }
 >x : T
@@ -106,7 +106,7 @@ module GenericParameter {
     var r8 = foo6(x => x); // any => string (+1 overload) [inferences are made for T, but lambda not contextually typed]. T is any
 >r8 : { (x: any): string; (x: any, y?: any): string; }
 >foo6(x => x) : { (x: any): string; (x: any, y?: any): string; }
->foo6 : <T>(cb: { (x: T): string; (x: T, y?: T): string; }) => { (x: T): string; (x: T, y?: T): string; }
+>foo6 : typeof foo6
 >x => x : (x: any) => any
 >x : any
 >x : any
@@ -114,7 +114,7 @@ module GenericParameter {
     var r9 = foo6(<T>(x: T) => ''); // any => string (+1 overload)
 >r9 : { (x: any): string; (x: any, y?: any): string; }
 >foo6(<T>(x: T) => '') : { (x: any): string; (x: any, y?: any): string; }
->foo6 : <T>(cb: { (x: T): string; (x: T, y?: T): string; }) => { (x: T): string; (x: T, y?: T): string; }
+>foo6 : typeof foo6
 ><T>(x: T) => '' : <T>(x: T) => string
 >T : T
 >x : T
@@ -123,7 +123,7 @@ module GenericParameter {
     var r11 = foo6(<T>(x: T, y?: T) => ''); // any => string (+1 overload)
 >r11 : { (x: any): string; (x: any, y?: any): string; }
 >foo6(<T>(x: T, y?: T) => '') : { (x: any): string; (x: any, y?: any): string; }
->foo6 : <T>(cb: { (x: T): string; (x: T, y?: T): string; }) => { (x: T): string; (x: T, y?: T): string; }
+>foo6 : typeof foo6
 ><T>(x: T, y?: T) => '' : <T>(x: T, y?: T) => string
 >T : T
 >x : T
@@ -132,7 +132,7 @@ module GenericParameter {
 >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; }
+>foo7 : typeof foo7
 >T : T
 >x : T
 >T : T
@@ -151,7 +151,7 @@ module GenericParameter {
     var r12 = foo7(1, (x) => x); // any => string (+1 overload) [inferences are made for T, but lambda not contextually typed]
 >r12 : { (x: any): string; (x: any, y?: any): string; }
 >foo7(1, (x) => x) : { (x: any): string; (x: any, y?: any): string; }
->foo7 : <T>(x: T, cb: { (x: T): string; (x: T, y?: T): string; }) => { (x: T): string; (x: T, y?: T): string; }
+>foo7 : typeof foo7
 >(x) => x : (x: any) => any
 >x : any
 >x : any
@@ -159,7 +159,7 @@ module GenericParameter {
     var r13 = foo7(1, <T>(x: T) => ''); // any => string (+1 overload) [inferences are made for T, but lambda not contextually typed]
 >r13 : { (x: any): string; (x: any, y?: any): string; }
 >foo7(1, <T>(x: T) => '') : { (x: any): string; (x: any, y?: any): string; }
->foo7 : <T>(x: T, cb: { (x: T): string; (x: T, y?: T): string; }) => { (x: T): string; (x: T, y?: T): string; }
+>foo7 : typeof foo7
 ><T>(x: T) => '' : <T>(x: T) => string
 >T : T
 >x : T
@@ -177,6 +177,6 @@ module GenericParameter {
     var r14 = foo7(1, a); // any => string (+1 overload) [inferences are made for T, but lambda not contextually typed]
 >r14 : { (x: any): string; (x: any, y?: any): string; }
 >foo7(1, a) : { (x: any): string; (x: any, y?: any): string; }
->foo7 : <T>(x: T, cb: { (x: T): string; (x: T, y?: T): string; }) => { (x: T): string; (x: T, y?: T): string; }
+>foo7 : typeof foo7
 >a : { <T>(x: T): string; <T>(x: number): T; }
 }
diff --git a/tests/baselines/reference/genericClassStaticMethod.types b/tests/baselines/reference/genericClassStaticMethod.types
index 3d4c02317d6..6db91585fcc 100644
--- a/tests/baselines/reference/genericClassStaticMethod.types
+++ b/tests/baselines/reference/genericClassStaticMethod.types
@@ -4,7 +4,7 @@ class Foo<T> {
 >T : T
 
     static getFoo() {
->getFoo : () => void
+>getFoo : typeof getFoo
     }
 }
 
@@ -15,7 +15,7 @@ class Bar<T> extends Foo<T> {
 >T : T
 
     static getFoo() {
->getFoo : () => void
+>getFoo : typeof getFoo
     }
 }
 
diff --git a/tests/baselines/reference/genericClassWithFunctionTypedMemberArguments.types b/tests/baselines/reference/genericClassWithFunctionTypedMemberArguments.types
index 68b94d81d02..87037736eff 100644
--- a/tests/baselines/reference/genericClassWithFunctionTypedMemberArguments.types
+++ b/tests/baselines/reference/genericClassWithFunctionTypedMemberArguments.types
@@ -238,7 +238,7 @@ module WithCandidates {
 >C3 : C3<T, U>
 
     function other<T, U>(t: T, u: U) {
->other : <T, U>(t: T, u: U) => void
+>other : typeof other
 >T : T
 >U : U
 >t : T
diff --git a/tests/baselines/reference/genericCloduleInModule.types b/tests/baselines/reference/genericCloduleInModule.types
index b4646fde0a7..abc9b400d54 100644
--- a/tests/baselines/reference/genericCloduleInModule.types
+++ b/tests/baselines/reference/genericCloduleInModule.types
@@ -10,7 +10,7 @@ module A {
 >foo : () => void
 
         static bar() { }
->bar : () => void
+>bar : typeof bar
     }
     export module B {
 >B : typeof B
diff --git a/tests/baselines/reference/genericConstraintDeclaration.types b/tests/baselines/reference/genericConstraintDeclaration.types
index 126da138d4e..336d13c52fe 100644
--- a/tests/baselines/reference/genericConstraintDeclaration.types
+++ b/tests/baselines/reference/genericConstraintDeclaration.types
@@ -4,7 +4,7 @@ class List<T extends {}>{
 >T : T
 
     static empty<T extends {}>(): List<T>{return null;}
->empty : <T extends {}>() => List<T>
+>empty : typeof empty
 >T : T
 >List : List<T>
 >T : T
diff --git a/tests/baselines/reference/genericFunctionHasFreshTypeArgs.types b/tests/baselines/reference/genericFunctionHasFreshTypeArgs.types
index 3a3afebb9ac..23965f161a9 100644
--- a/tests/baselines/reference/genericFunctionHasFreshTypeArgs.types
+++ b/tests/baselines/reference/genericFunctionHasFreshTypeArgs.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/genericFunctionHasFreshTypeArgs.ts ===
 function f(p: <T>(x: T) => void) { };
->f : (p: <T>(x: T) => void) => void
+>f : typeof f
 >p : <T>(x: T) => void
 >T : T
 >x : T
@@ -8,11 +8,11 @@ function f(p: <T>(x: T) => void) { };
 
 f(x => f(y => x = y));
 >f(x => f(y => x = y)) : void
->f : (p: <T>(x: T) => void) => void
+>f : typeof f
 >x => f(y => x = y) : (x: any) => void
 >x : any
 >f(y => x = y) : void
->f : (p: <T>(x: T) => void) => void
+>f : typeof f
 >y => x = y : (y: any) => any
 >y : any
 >x = y : any
diff --git a/tests/baselines/reference/genericFunctionSpecializations1.types b/tests/baselines/reference/genericFunctionSpecializations1.types
index 60819c786b8..06e2f009bd0 100644
--- a/tests/baselines/reference/genericFunctionSpecializations1.types
+++ b/tests/baselines/reference/genericFunctionSpecializations1.types
@@ -1,22 +1,22 @@
 === tests/cases/compiler/genericFunctionSpecializations1.ts ===
 function foo3<T>(test: string); // error
->foo3 : <T>(test: string) => any
+>foo3 : typeof foo3
 >T : T
 >test : string
 
 function foo3<T>(test: T) { }
->foo3 : <T>(test: string) => any
+>foo3 : typeof foo3
 >T : T
 >test : T
 >T : T
 
 function foo4<T>(test: string); // valid
->foo4 : <T>(test: string) => any
+>foo4 : typeof foo4
 >T : T
 >test : string
 
 function foo4<T extends String>(test: T) { }
->foo4 : <T>(test: string) => any
+>foo4 : typeof foo4
 >T : T
 >String : String
 >test : T
diff --git a/tests/baselines/reference/genericFunctions0.types b/tests/baselines/reference/genericFunctions0.types
index 045224a7aaa..ee435ee0845 100644
--- a/tests/baselines/reference/genericFunctions0.types
+++ b/tests/baselines/reference/genericFunctions0.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/genericFunctions0.ts ===
 function foo<T > (x: T) { return x; }
->foo : <T>(x: T) => T
+>foo : typeof foo
 >T : T
 >x : T
 >T : T
@@ -9,5 +9,5 @@ function foo<T > (x: T) { return x; }
 var x = foo<number>(5); // 'x' should be number
 >x : number
 >foo<number>(5) : number
->foo : <T>(x: T) => T
+>foo : typeof foo
 
diff --git a/tests/baselines/reference/genericFunctions1.types b/tests/baselines/reference/genericFunctions1.types
index aed264c78e1..96862e9e0cb 100644
--- a/tests/baselines/reference/genericFunctions1.types
+++ b/tests/baselines/reference/genericFunctions1.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/genericFunctions1.ts ===
 function foo<T > (x: T) { return x; }
->foo : <T>(x: T) => T
+>foo : typeof foo
 >T : T
 >x : T
 >T : T
@@ -9,5 +9,5 @@ function foo<T > (x: T) { return x; }
 var x = foo(5); // 'x' should be number
 >x : number
 >foo(5) : number
->foo : <T>(x: T) => T
+>foo : typeof foo
 
diff --git a/tests/baselines/reference/genericFunctions2.types b/tests/baselines/reference/genericFunctions2.types
index 96e757d3d9e..2ad353559a5 100644
--- a/tests/baselines/reference/genericFunctions2.types
+++ b/tests/baselines/reference/genericFunctions2.types
@@ -1,6 +1,6 @@
 === 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[]
+>map : typeof map
 >T : T
 >U : U
 >items : T[]
@@ -17,7 +17,7 @@ var myItems: string[];
 var lengths = map(myItems, x => x.length);
 >lengths : number[]
 >map(myItems, x => x.length) : number[]
->map : <T, U>(items: T[], f: (x: T) => U) => U[]
+>map : typeof map
 >myItems : string[]
 >x => x.length : (x: string) => number
 >x : string
diff --git a/tests/baselines/reference/genericFunctions3.types b/tests/baselines/reference/genericFunctions3.types
index 2215e30adcf..663f6270f2a 100644
--- a/tests/baselines/reference/genericFunctions3.types
+++ b/tests/baselines/reference/genericFunctions3.types
@@ -11,14 +11,14 @@ interface Query<T> {
 }
  
 function from<T>(arg: boolean): Query<T>; // was Error: Overload signature is not compatible with function definition.
->from : <T>(arg: boolean) => Query<T>
+>from : typeof from
 >T : T
 >arg : boolean
 >Query : Query<T>
 >T : T
 
 function from<T>(arg: any): Query<T> {
->from : <T>(arg: boolean) => Query<T>
+>from : typeof from
 >T : T
 >arg : any
 >Query : Query<T>
diff --git a/tests/baselines/reference/genericInference2.types b/tests/baselines/reference/genericInference2.types
index 0bd8c533759..d8e22021906 100644
--- a/tests/baselines/reference/genericInference2.types
+++ b/tests/baselines/reference/genericInference2.types
@@ -24,7 +24,7 @@
 >T : T
        } 
        export function observable<T>(value: T): Observable<T>; 
->observable : <T>(value: T) => Observable<T>
+>observable : typeof observable
 >T : T
 >value : T
 >T : T
@@ -33,24 +33,21 @@
     } 
     var o = { 
 >o : { name: Observable<string>; age: Observable<number>; }
->{ 
-       name: ko.observable("Bob"), 
-       age: ko.observable(37) 
-    } : { name: Observable<string>; age: Observable<number>; }
+>{        name: ko.observable("Bob"),        age: ko.observable(37)     } : { name: Observable<string>; age: Observable<number>; }
 
        name: ko.observable("Bob"), 
 >name : Observable<string>
 >ko.observable("Bob") : Observable<string>
->ko.observable : <T>(value: T) => Observable<T>
+>ko.observable : typeof observable
 >ko : typeof ko
->observable : <T>(value: T) => Observable<T>
+>observable : typeof observable
 
        age: ko.observable(37) 
 >age : Observable<number>
 >ko.observable(37) : Observable<number>
->ko.observable : <T>(value: T) => Observable<T>
+>ko.observable : typeof observable
 >ko : typeof ko
->observable : <T>(value: T) => Observable<T>
+>observable : typeof observable
 
     }; 
     var x_v = o.name().length;  // should be 'number'
diff --git a/tests/baselines/reference/genericInstantiationEquivalentToObjectLiteral.types b/tests/baselines/reference/genericInstantiationEquivalentToObjectLiteral.types
index 449c5712c6c..aa67bfdf7bb 100644
--- a/tests/baselines/reference/genericInstantiationEquivalentToObjectLiteral.types
+++ b/tests/baselines/reference/genericInstantiationEquivalentToObjectLiteral.types
@@ -28,7 +28,7 @@ y = x;
 >x : Pair<string, number>
 
 declare function f<T, U>(x: Pair<T, U>);
->f : <T, U>(x: Pair<T, U>) => any
+>f : typeof f
 >T : T
 >U : U
 >x : Pair<T, U>
@@ -37,7 +37,7 @@ declare function f<T, U>(x: Pair<T, U>);
 >U : U
 
 declare function f2<T, U>(x: { first: T; second: U; });
->f2 : <T, U>(x: { first: T; second: U; }) => any
+>f2 : typeof f2
 >T : T
 >U : U
 >x : { first: T; second: U; }
@@ -48,21 +48,21 @@ declare function f2<T, U>(x: { first: T; second: U; });
 
 f(x);
 >f(x) : any
->f : <T, U>(x: Pair<T, U>) => any
+>f : typeof f
 >x : Pair<string, number>
 
 f(y);
 >f(y) : any
->f : <T, U>(x: Pair<T, U>) => any
+>f : typeof f
 >y : { first: string; second: number; }
 
 f2(x);
 >f2(x) : any
->f2 : <T, U>(x: { first: T; second: U; }) => any
+>f2 : typeof f2
 >x : Pair<string, number>
 
 f2(y);
 >f2(y) : any
->f2 : <T, U>(x: { first: T; second: U; }) => any
+>f2 : typeof f2
 >y : { first: string; second: number; }
 
diff --git a/tests/baselines/reference/genericInterfaceFunctionTypeParameter.types b/tests/baselines/reference/genericInterfaceFunctionTypeParameter.types
index f262fda55f6..f8d1ff0341d 100644
--- a/tests/baselines/reference/genericInterfaceFunctionTypeParameter.types
+++ b/tests/baselines/reference/genericInterfaceFunctionTypeParameter.types
@@ -4,7 +4,7 @@ export interface IFoo<A> { }
 >A : A
 
 export function foo<A>(fn: (ifoo: IFoo<A>) => void) {
->foo : <A>(fn: (ifoo: IFoo<A>) => void) => void
+>foo : typeof foo
 >A : A
 >fn : (ifoo: IFoo<A>) => void
 >ifoo : IFoo<A>
@@ -13,7 +13,7 @@ export function foo<A>(fn: (ifoo: IFoo<A>) => void) {
 
     foo(fn); // Invocation is necessary to repro (!)
 >foo(fn) : void
->foo : <A>(fn: (ifoo: IFoo<A>) => void) => void
+>foo : typeof foo
 >fn : (ifoo: IFoo<A>) => void
 }
 
diff --git a/tests/baselines/reference/genericMethodOverspecialization.types b/tests/baselines/reference/genericMethodOverspecialization.types
index c3f8a86d7eb..145a7b33381 100644
--- a/tests/baselines/reference/genericMethodOverspecialization.types
+++ b/tests/baselines/reference/genericMethodOverspecialization.types
@@ -28,15 +28,11 @@ interface Document {
 
 var elements = names.map(function (name) {
 >elements : HTMLElement[]
->names.map(function (name) {
-    return document.getElementById(name);
-}) : HTMLElement[]
+>names.map(function (name) {    return document.getElementById(name);}) : HTMLElement[]
 >names.map : <U>(callbackfn: (value: string, index: number, array: string[]) => U, thisArg?: any) => U[]
 >names : string[]
 >map : <U>(callbackfn: (value: string, index: number, array: string[]) => U, thisArg?: any) => U[]
->function (name) {
-    return document.getElementById(name);
-} : (name: string) => HTMLElement
+>function (name) {    return document.getElementById(name);} : (name: string) => HTMLElement
 >name : string
 
     return document.getElementById(name);
@@ -51,15 +47,11 @@ var elements = names.map(function (name) {
 
 var xxx = elements.filter(function (e) {
 >xxx : HTMLElement[]
->elements.filter(function (e) {
-    return !e.isDisabled;
-}) : HTMLElement[]
+>elements.filter(function (e) {    return !e.isDisabled;}) : HTMLElement[]
 >elements.filter : (callbackfn: (value: HTMLElement, index: number, array: HTMLElement[]) => boolean, thisArg?: any) => HTMLElement[]
 >elements : HTMLElement[]
 >filter : (callbackfn: (value: HTMLElement, index: number, array: HTMLElement[]) => boolean, thisArg?: any) => HTMLElement[]
->function (e) {
-    return !e.isDisabled;
-} : (e: HTMLElement) => boolean
+>function (e) {    return !e.isDisabled;} : (e: HTMLElement) => boolean
 >e : HTMLElement
 
     return !e.isDisabled;
@@ -72,15 +64,11 @@ var xxx = elements.filter(function (e) {
 
 var widths:number[] = elements.map(function (e) { // should not error
 >widths : number[]
->elements.map(function (e) { // should not error
-    return e.clientWidth;
-}) : number[]
+>elements.map(function (e) { // should not error    return e.clientWidth;}) : number[]
 >elements.map : <U>(callbackfn: (value: HTMLElement, index: number, array: HTMLElement[]) => U, thisArg?: any) => U[]
 >elements : HTMLElement[]
 >map : <U>(callbackfn: (value: HTMLElement, index: number, array: HTMLElement[]) => U, thisArg?: any) => U[]
->function (e) { // should not error
-    return e.clientWidth;
-} : (e: HTMLElement) => number
+>function (e) { // should not error    return e.clientWidth;} : (e: HTMLElement) => number
 >e : HTMLElement
 
     return e.clientWidth;
diff --git a/tests/baselines/reference/genericOverloadSignatures.types b/tests/baselines/reference/genericOverloadSignatures.types
index e1efe0785ab..1181d61ccb7 100644
--- a/tests/baselines/reference/genericOverloadSignatures.types
+++ b/tests/baselines/reference/genericOverloadSignatures.types
@@ -14,19 +14,19 @@ interface A {
 }
 
 function f<T>(a: T);
->f : { <T>(a: T): any; <T>(a: T): any; }
+>f : typeof f
 >T : T
 >a : T
 >T : T
 
 function f<T>(a: T);
->f : { <T>(a: T): any; <T>(a: T): any; }
+>f : typeof f
 >T : T
 >a : T
 >T : T
 
 function f(a) { }
->f : { <T>(a: T): any; <T>(a: T): any; }
+>f : typeof f
 >a : any
 
 interface I2 {
diff --git a/tests/baselines/reference/genericParameterAssignability1.types b/tests/baselines/reference/genericParameterAssignability1.types
index b7888014dea..ac7f1c97436 100644
--- a/tests/baselines/reference/genericParameterAssignability1.types
+++ b/tests/baselines/reference/genericParameterAssignability1.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/genericParameterAssignability1.ts ===
 function f<T>(x: T): T { return null; }
->f : <T>(x: T) => T
+>f : typeof f
 >T : T
 >x : T
 >T : T
@@ -15,7 +15,7 @@ var r = <T>(x: T) => x;
 >x : T
 
 r = f; // should be allowed
->r = f : <T>(x: T) => T
+>r = f : typeof f
 >r : <T>(x: T) => T
->f : <T>(x: T) => T
+>f : typeof f
 
diff --git a/tests/baselines/reference/genericStaticAnyTypeFunction.types b/tests/baselines/reference/genericStaticAnyTypeFunction.types
index 9cf511ca0d9..6e5b89a1e93 100644
--- a/tests/baselines/reference/genericStaticAnyTypeFunction.types
+++ b/tests/baselines/reference/genericStaticAnyTypeFunction.types
@@ -3,7 +3,7 @@ class A {
 >A : A
 
     static one<T>(source: T, value: number): T {
->one : <T>(source: T, value: number) => T
+>one : typeof one
 >T : T
 >source : T
 >T : T
@@ -15,10 +15,10 @@ class A {
 
     }
     static goo() { return 0; }
->goo : () => number
+>goo : typeof goo
 
     static two<T>(source: T): T {
->two : <T>(source: T) => T
+>two : typeof two
 >T : T
 >source : T
 >T : T
@@ -26,9 +26,9 @@ class A {
 
         return this.one<T>(source, 42); // should not error
 >this.one<T>(source, 42) : T
->this.one : <T>(source: T, value: number) => T
+>this.one : typeof one
 >this : typeof A
->one : <T>(source: T, value: number) => T
+>one : typeof one
 >T : T
 >source : T
 
diff --git a/tests/baselines/reference/genericTypeParameterEquivalence2.types b/tests/baselines/reference/genericTypeParameterEquivalence2.types
index 9c9c4e071bc..2c7af15b753 100644
--- a/tests/baselines/reference/genericTypeParameterEquivalence2.types
+++ b/tests/baselines/reference/genericTypeParameterEquivalence2.types
@@ -1,7 +1,7 @@
 === tests/cases/compiler/genericTypeParameterEquivalence2.ts ===
 // 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
+>compose : typeof compose
 >A : A
 >B : B
 >C : C
@@ -18,9 +18,7 @@ function compose<A, B, C>(f: (b: B) => C, g: (a:A) => B): (a:A) => C {
 >C : C
 
     return function (a:A) : C {
->function (a:A) : C {
-        return f(g.apply(null, a));
-    } : (a: A) => C
+>function (a:A) : C {        return f(g.apply(null, a));    } : (a: A) => C
 >a : A
 >A : A
 >C : C
@@ -39,7 +37,7 @@ 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
+>forEach : typeof forEach
 >A : A
 >list : A[]
 >A : A
@@ -70,7 +68,7 @@ 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[]
+>filter : typeof filter
 >A : A
 >f : (a: A) => boolean
 >a : A
@@ -84,18 +82,10 @@ function filter<A>(f: (a: A) => boolean, ar: A[]): A[] {
 >[] : undefined[]
 
     forEach(ar, (el) => {
->forEach(ar, (el) => {
-        if (f(el)) {
-            ret.push(el);
-        }
-    } ) : void
->forEach : <A>(list: A[], f: (a: A, n?: number) => void) => void
+>forEach(ar, (el) => {        if (f(el)) {            ret.push(el);        }    } ) : void
+>forEach : typeof forEach
 >ar : A[]
->(el) => {
-        if (f(el)) {
-            ret.push(el);
-        }
-    } : (el: A) => void
+>(el) => {        if (f(el)) {            ret.push(el);        }    } : (el: A) => void
 >el : A
 
         if (f(el)) {
@@ -118,7 +108,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
+>length2 : typeof length2
 >A : A
 >ar : A[]
 >A : A
@@ -131,7 +121,7 @@ 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
+>curry1 : typeof curry1
 >A : A
 >B : B
 >C : C
@@ -148,18 +138,12 @@ function curry1<A, B, C>(f: (a: A, b: B) => C): (ax: A) => (bx: B) => C {
 >C : C
 
     return function (ay: A) {
->function (ay: A) {
-        return function (by: B) {
-            return f(ay, by);
-        };
-    } : (ay: A) => (by: B) => C
+>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
+>function (by: B) {            return f(ay, by);        } : (by: B) => C
 >by : B
 >B : B
 
@@ -176,8 +160,8 @@ function curry1<A, B, C>(f: (a: A, b: B) => C): (ax: A) => (bx: B) => C {
 var cfilter = curry1(filter);
 >cfilter : (ax: {}) => (bx: {}) => {}[]
 >curry1(filter) : (ax: {}) => (bx: {}) => {}[]
->curry1 : <A, B, C>(f: (a: A, b: B) => C) => (ax: A) => (bx: B) => C
->filter : <A>(f: (a: A) => boolean, ar: A[]) => A[]
+>curry1 : typeof curry1
+>filter : typeof filter
 
 // compose :: (b->c) -> (a->b) -> (a->c)
 // length :: [a] -> Num
@@ -188,7 +172,7 @@ var cfilter = curry1(filter);
 // countWhere :: (a -> Bool) -> [a] -> Num
 
 function countWhere_1<A>(pred: (a: A) => boolean): (a: A[]) => number {
->countWhere_1 : <A>(pred: (a: A) => boolean) => (a: A[]) => number
+>countWhere_1 : typeof countWhere_1
 >A : A
 >pred : (a: A) => boolean
 >a : A
@@ -198,15 +182,15 @@ function countWhere_1<A>(pred: (a: A) => boolean): (a: A[]) => number {
 
     return compose(length2, cfilter(pred));
 >compose(length2, cfilter(pred)) : (a: {}) => number
->compose : <A, B, C>(f: (b: B) => C, g: (a: A) => B) => (a: A) => C
->length2 : <A>(ar: A[]) => number
+>compose : typeof compose
+>length2 : typeof length2
 >cfilter(pred) : (bx: {}) => {}[]
 >cfilter : (ax: {}) => (bx: {}) => {}[]
 >pred : (a: A) => boolean
 }
 
 function countWhere_2<A>(pred: (a: A) => boolean): (a: A[]) => number {
->countWhere_2 : <A>(pred: (a: A) => boolean) => (a: A[]) => number
+>countWhere_2 : typeof countWhere_2
 >A : A
 >pred : (a: A) => boolean
 >a : A
@@ -222,7 +206,7 @@ function countWhere_2<A>(pred: (a: A) => boolean): (a: A[]) => number {
 
     return compose(length2, where);
 >compose(length2, where) : (a: {}) => number
->compose : <A, B, C>(f: (b: B) => C, g: (a: A) => B) => (a: A) => C
->length2 : <A>(ar: A[]) => number
+>compose : typeof compose
+>length2 : typeof length2
 >where : (bx: {}) => {}[]
 }
diff --git a/tests/baselines/reference/genericTypeWithCallableMembers.js b/tests/baselines/reference/genericTypeWithCallableMembers.js
index ebf95b41dcc..c4ebf44c15e 100644
--- a/tests/baselines/reference/genericTypeWithCallableMembers.js
+++ b/tests/baselines/reference/genericTypeWithCallableMembers.js
@@ -6,7 +6,7 @@ interface Constructable {
 class C<T extends Constructable> {
     constructor(public data: T, public data2: Constructable) { }
     create() {
-        var x = new this.data(); // no error
+        var x = new this.data(); // error
         var x2 = new this.data2(); // was error, shouldn't be
     }
 }
diff --git a/tests/baselines/reference/genericTypeWithCallableMembers.types b/tests/baselines/reference/genericTypeWithCallableMembers.types
index e0068d5ff2b..379e7d2cacb 100644
--- a/tests/baselines/reference/genericTypeWithCallableMembers.types
+++ b/tests/baselines/reference/genericTypeWithCallableMembers.types
@@ -20,7 +20,7 @@ class C<T extends Constructable> {
     create() {
 >create : () => void
 
-        var x = new this.data(); // no error
+        var x = new this.data(); // error
 >x : Constructable
 >new this.data() : Constructable
 >this.data : T
diff --git a/tests/baselines/reference/genericTypeWithCallableMembers2.types b/tests/baselines/reference/genericTypeWithCallableMembers2.types
index 5c265e30a85..a0b6ec0e8a5 100644
--- a/tests/baselines/reference/genericTypeWithCallableMembers2.types
+++ b/tests/baselines/reference/genericTypeWithCallableMembers2.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/genericTypeWithCallableMembers2.ts ===
 function foo1<T extends { (): string; }>(f: T) {
->foo1 : <T extends () => string>(f: T) => string
+>foo1 : typeof foo1
 >T : T
 >f : T
 >T : T
@@ -11,7 +11,7 @@ function foo1<T extends { (): string; }>(f: T) {
 }
  
 function foo2<T extends { new (): string; }>(f: T) {
->foo2 : <T extends new () => string>(f: T) => string
+>foo2 : typeof foo2
 >T : T
 >f : T
 >T : T
diff --git a/tests/baselines/reference/genericsAndHigherOrderFunctions.types b/tests/baselines/reference/genericsAndHigherOrderFunctions.types
index 6f9ffe4217e..04209ca99ec 100644
--- a/tests/baselines/reference/genericsAndHigherOrderFunctions.types
+++ b/tests/baselines/reference/genericsAndHigherOrderFunctions.types
@@ -23,9 +23,7 @@ var combine: <T, S>(f: (_: T) => S) =>
 >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, 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
@@ -34,8 +32,7 @@ var combine: <T, S>(f: (_: T) => S) =>
 >S : S
 
         <U>(g: (_: U) => T) =>
-><U>(g: (_: U) => T) =>
-            (x: U) => f(g(x)) : <U>(g: (_: U) => T) => (x: U) => S
+><U>(g: (_: U) => T) =>            (x: U) => f(g(x)) : <U>(g: (_: U) => T) => (x: U) => S
 >U : U
 >g : (_: U) => T
 >_ : U
@@ -87,9 +84,7 @@ var foo: <K, N>(g: (x: K) => N) =>
 >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, 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
@@ -98,8 +93,7 @@ var foo: <K, N>(g: (x: K) => N) =>
 >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) =>            <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
diff --git a/tests/baselines/reference/genericsManyTypeParameters.types b/tests/baselines/reference/genericsManyTypeParameters.types
index 0094f320051..21ed88b2013 100644
--- a/tests/baselines/reference/genericsManyTypeParameters.types
+++ b/tests/baselines/reference/genericsManyTypeParameters.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/genericsManyTypeParameters.ts ===
 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) => {}[]
+>Foo : typeof Foo
 
     a1, a21, a31, a41, a51, a61,
 >a1 : a1
@@ -402,24 +402,7 @@ function Foo<
     )
     {
         return [x1 , y1 , z1 , a1 , b1 , c1,
->[x1 , y1 , z1 , a1 , b1 , c1,
-           x2 , y2 , z2 , a2 , b2 , c2,
-           x3 , y3 , z3 , a3 , b3 , c3,
-           x4 , y4 , z4 , a4 , b4 , c4,
-           x5 , y5 , z5 , a5 , b5 , c5,
-           x6 , y6 , z6 , a6 , b6 , c6,
-           x7 , y7 , z7 , a7 , b7 , c7,
-           x8 , y8 , z8 , a8 , b8 , c8,
-           x9 , y9 , z9 , a9 , b9 , c9,
-           x10 , y12 , z10 , a10 , b10 , c10,
-           x11 , y13 , z11 , a11 , b11 , c11,
-           x12 , y14 , z12 , a12 , b12 , c12,
-           x13 , y15 , z13 , a13 , b13 , c13,
-           x14 , y16 , z14 , a14 , b14 , c14,
-           x15 , y17 , z15 , a15 , b15 , c15,
-           x16 , y18 , z16 , a16 , b16 , c16,
-           x17 , y19 , z17 , a17 , b17 , c17,
-           x18 , y10 , z18 , a18 , b18 , c18] : {}[]
+>[x1 , y1 , z1 , a1 , b1 , c1,           x2 , y2 , z2 , a2 , b2 , c2,           x3 , y3 , z3 , a3 , b3 , c3,           x4 , y4 , z4 , a4 , b4 , c4,           x5 , y5 , z5 , a5 , b5 , c5,           x6 , y6 , z6 , a6 , b6 , c6,           x7 , y7 , z7 , a7 , b7 , c7,           x8 , y8 , z8 , a8 , b8 , c8,           x9 , y9 , z9 , a9 , b9 , c9,           x10 , y12 , z10 , a10 , b10 , c10,           x11 , y13 , z11 , a11 , b11 , c11,           x12 , y14 , z12 , a12 , b12 , c12,           x13 , y15 , z13 , a13 , b13 , c13,           x14 , y16 , z14 , a14 , b14 , c14,           x15 , y17 , z15 , a15 , b15 , c15,           x16 , y18 , z16 , a16 , b16 , c16,           x17 , y19 , z17 , a17 , b17 , c17,           x18 , y10 , z18 , a18 , b18 , c18] : {}[]
 >x1 : a1
 >y1 : a21
 >z1 : a31
diff --git a/tests/baselines/reference/getterSetterNonAccessor.types b/tests/baselines/reference/getterSetterNonAccessor.types
index 9bbf3298ffe..9ca08d4407e 100644
--- a/tests/baselines/reference/getterSetterNonAccessor.types
+++ b/tests/baselines/reference/getterSetterNonAccessor.types
@@ -1,44 +1,28 @@
 === tests/cases/compiler/getterSetterNonAccessor.ts ===
 function getFunc():any{return 0;}
->getFunc : () => any
+>getFunc : typeof getFunc
 
 function setFunc(v){}          
->setFunc : (v: any) => void
+>setFunc : typeof setFunc
 >v : any
 
 Object.defineProperty({}, "0", <PropertyDescriptor>({
->Object.defineProperty({}, "0", <PropertyDescriptor>({
-          get: getFunc,
-          set: setFunc,
-          configurable: true
-      })) : any
+>Object.defineProperty({}, "0", <PropertyDescriptor>({          get: getFunc,          set: setFunc,          configurable: true      })) : any
 >Object.defineProperty : (o: any, p: string, attributes: PropertyDescriptor) => any
 >Object : { (): any; (value: any): any; new (value?: any): Object; prototype: Object; getPrototypeOf(o: any): any; getOwnPropertyDescriptor(o: any, p: string): PropertyDescriptor; getOwnPropertyNames(o: any): string[]; create(o: any, properties?: PropertyDescriptorMap): any; defineProperty(o: any, p: string, attributes: PropertyDescriptor): any; defineProperties(o: any, properties: PropertyDescriptorMap): any; seal(o: any): any; freeze(o: any): any; preventExtensions(o: any): any; isSealed(o: any): boolean; isFrozen(o: any): boolean; isExtensible(o: any): boolean; keys(o: any): string[]; }
 >defineProperty : (o: any, p: string, attributes: PropertyDescriptor) => any
 >{} : {}
-><PropertyDescriptor>({
-          get: getFunc,
-          set: setFunc,
-          configurable: true
-      }) : PropertyDescriptor
+><PropertyDescriptor>({          get: getFunc,          set: setFunc,          configurable: true      }) : PropertyDescriptor
 >PropertyDescriptor : PropertyDescriptor
->({
-          get: getFunc,
-          set: setFunc,
-          configurable: true
-      }) : { get: () => any; set: (v: any) => void; configurable: boolean; }
->{
-          get: getFunc,
-          set: setFunc,
-          configurable: true
-      } : { get: () => any; set: (v: any) => void; configurable: boolean; }
+>({          get: getFunc,          set: setFunc,          configurable: true      }) : { get: typeof getFunc; set: typeof setFunc; configurable: boolean; }
+>{          get: getFunc,          set: setFunc,          configurable: true      } : { get: typeof getFunc; set: typeof setFunc; configurable: boolean; }
 
           get: getFunc,
->get : () => any
+>get : typeof getFunc
 >getFunc : getFunc
 
           set: setFunc,
->set : (v: any) => void
+>set : typeof setFunc
 >setFunc : setFunc
 
           configurable: true
diff --git a/tests/baselines/reference/global.types b/tests/baselines/reference/global.types
index 86d5dd3c986..ae041eca65a 100644
--- a/tests/baselines/reference/global.types
+++ b/tests/baselines/reference/global.types
@@ -3,7 +3,7 @@ module M {
 >M : typeof M
 
     export function f(y:number) {
->f : (y: number) => number
+>f : typeof f
 >y : number
 
         return x+y;
@@ -18,8 +18,8 @@ var x=10;
 
 M.f(3);
 >M.f(3) : number
->M.f : (y: number) => number
+>M.f : typeof f
 >M : typeof M
->f : (y: number) => number
+>f : typeof f
 
 
diff --git a/tests/baselines/reference/heterogeneousArrayLiterals.types b/tests/baselines/reference/heterogeneousArrayLiterals.types
index f81f1b2d249..a6de60ec174 100644
--- a/tests/baselines/reference/heterogeneousArrayLiterals.types
+++ b/tests/baselines/reference/heterogeneousArrayLiterals.types
@@ -237,7 +237,7 @@ module WithContextualType {
 }
 
 function foo<T, U>(t: T, u: U) {
->foo : <T, U>(t: T, u: U) => void
+>foo : typeof foo
 >T : T
 >U : U
 >t : T
@@ -286,7 +286,7 @@ 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
+>foo2 : typeof foo2
 >T : T
 >Base : Base
 >U : U
@@ -361,7 +361,7 @@ 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
+>foo3 : typeof foo3
 >T : T
 >Derived : Derived
 >U : U
@@ -436,7 +436,7 @@ 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
+>foo4 : typeof foo4
 >T : T
 >Base : Base
 >U : U
diff --git a/tests/baselines/reference/icomparable.types b/tests/baselines/reference/icomparable.types
index 2766743f41f..5281ff73e3c 100644
--- a/tests/baselines/reference/icomparable.types
+++ b/tests/baselines/reference/icomparable.types
@@ -10,7 +10,7 @@
     }
 
     declare function sort<U extends IComparable<any>>(items: U[]): U[];
->sort : <U extends IComparable<any>>(items: U[]) => U[]
+>sort : typeof sort
 >U : U
 >IComparable : IComparable<T>
 >items : U[]
@@ -29,6 +29,6 @@
     var x = sort(sc);
 >x : StringComparable[]
 >sort(sc) : StringComparable[]
->sort : <U extends IComparable<any>>(items: U[]) => U[]
+>sort : typeof sort
 >sc : StringComparable[]
 
diff --git a/tests/baselines/reference/idInProp.types b/tests/baselines/reference/idInProp.types
index f300be6ebf2..8227b6fe2c4 100644
--- a/tests/baselines/reference/idInProp.types
+++ b/tests/baselines/reference/idInProp.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/idInProp.ts ===
 function f() {
->f : () => void
+>f : typeof f
 
 var t: { (f: any) : any; };
 >t : (f: any) => any
diff --git a/tests/baselines/reference/ifDoWhileStatements.types b/tests/baselines/reference/ifDoWhileStatements.types
index 46663086532..b488b6c6fc0 100644
--- a/tests/baselines/reference/ifDoWhileStatements.types
+++ b/tests/baselines/reference/ifDoWhileStatements.types
@@ -46,11 +46,11 @@ class D<T>{
 }
 
 function F(x: string): number { return 42; }
->F : (x: string) => number
+>F : typeof F
 >x : string
 
 function F2(x: number): boolean { return x < 42; }
->F2 : (x: number) => boolean
+>F2 : typeof F2
 >x : number
 >x < 42 : boolean
 >x : number
@@ -66,7 +66,7 @@ module M {
     }
 
     export function F2(x: number): string { return x.toString(); }
->F2 : (x: number) => string
+>F2 : typeof F2
 >x : number
 >x.toString() : string
 >x.toString : (radix?: number) => string
@@ -85,7 +85,7 @@ module N {
     }
 
     export function F2(x: number): string { return x.toString(); }
->F2 : (x: number) => string
+>F2 : typeof F2
 >x : number
 >x.toString() : string
 >x.toString : (radix?: number) => string
@@ -124,13 +124,8 @@ while ('') { }
 do { }while('')
 
 if (/[a-z]/) { }
->/[a-z]/ : RegExp
-
 while (/[a-z]/) { }
->/[a-z]/ : RegExp
-
 do { }while(/[a-z]/)
->/[a-z]/ : RegExp
 
 if ([]) { }
 >[] : undefined[]
@@ -286,7 +281,6 @@ do { }while(f)
 
 var g = /[a-z]/
 >g : RegExp
->/[a-z]/ : RegExp
 
 if (g) { }
 >g : RegExp
@@ -352,30 +346,30 @@ do { }while(k)
 >k : { x: number; y: string; }
 
 function fn(x?: string): I { return null; }
->fn : (x?: string) => I
+>fn : typeof fn
 >x : string
 >I : I
 
 if (fn()) { }
 >fn() : I
->fn : (x?: string) => I
+>fn : typeof fn
 
 while (fn()) { }
 >fn() : I
->fn : (x?: string) => I
+>fn : typeof fn
 
 do { }while(fn())
 >fn() : I
->fn : (x?: string) => I
+>fn : typeof fn
 
 if (fn) { }
->fn : (x?: string) => I
+>fn : typeof fn
 
 while (fn) { }
->fn : (x?: string) => I
+>fn : typeof fn
 
 do { }while(fn)
->fn : (x?: string) => I
+>fn : typeof fn
 
 
 
diff --git a/tests/baselines/reference/implementGenericWithMismatchedTypes.errors.txt b/tests/baselines/reference/implementGenericWithMismatchedTypes.errors.txt
index 209749db465..34edae873cf 100644
--- a/tests/baselines/reference/implementGenericWithMismatchedTypes.errors.txt
+++ b/tests/baselines/reference/implementGenericWithMismatchedTypes.errors.txt
@@ -1,4 +1,4 @@
-==== tests/cases/compiler/implementGenericWithMismatchedTypes.ts (2 errors) ====
+==== tests/cases/compiler/implementGenericWithMismatchedTypes.ts (3 errors) ====
     // no errors because in the derived types the best common type for T's value is Object
     // and that matches the original signature for assignability since we treat its T's as Object
     
@@ -24,9 +24,12 @@
           ~~
 !!! Class 'C2<T>' incorrectly implements interface 'IFoo2<T>':
 !!!   Types of property 'foo' are incompatible:
-!!!     Type '<Tstring>(x: Tstring) => number' is not assignable to type '(x: T) => T':
-!!!       Type 'number' is not assignable to type 'T'.
-        foo<Tstring>(x: Tstring): number {
+!!!     Type '<string>(x: string) => number' is not assignable to type '(x: T) => T':
+!!!       Types of parameters 'x' and 'x' are incompatible:
+!!!         Type 'string' is not assignable to type 'T'.
+        foo<string>(x: string): number {
+            ~~~~~~
+!!! Type parameter name cannot be 'string'
             return null;
         }
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/implementGenericWithMismatchedTypes.js b/tests/baselines/reference/implementGenericWithMismatchedTypes.js
index a030ebc3c1d..5317666d912 100644
--- a/tests/baselines/reference/implementGenericWithMismatchedTypes.js
+++ b/tests/baselines/reference/implementGenericWithMismatchedTypes.js
@@ -15,7 +15,7 @@ interface IFoo2<T> {
     foo(x: T): T;
 }
 class C2<T> implements IFoo2<T> { // error
-    foo<Tstring>(x: Tstring): number {
+    foo<string>(x: string): number {
         return null;
     }
 }
diff --git a/tests/baselines/reference/implicitAnyAnyReturningFunction.types b/tests/baselines/reference/implicitAnyAnyReturningFunction.types
index 1f0b81c724f..e084498ccec 100644
--- a/tests/baselines/reference/implicitAnyAnyReturningFunction.types
+++ b/tests/baselines/reference/implicitAnyAnyReturningFunction.types
@@ -1,13 +1,13 @@
 === tests/cases/compiler/implicitAnyAnyReturningFunction.ts ===
 function A() {
->A : () => any
+>A : typeof A
 
     return <any>"";
 ><any>"" : any
 }
 
 function B() {
->B : () => any
+>B : typeof B
 
     var someLocal: any = {};
 >someLocal : any
diff --git a/tests/baselines/reference/implicitAnyDeclareFunctionWithoutFormalType2.types b/tests/baselines/reference/implicitAnyDeclareFunctionWithoutFormalType2.types
index 9fd971ab862..9c5264bb029 100644
--- a/tests/baselines/reference/implicitAnyDeclareFunctionWithoutFormalType2.types
+++ b/tests/baselines/reference/implicitAnyDeclareFunctionWithoutFormalType2.types
@@ -1,7 +1,7 @@
 === tests/cases/compiler/implicitAnyDeclareFunctionWithoutFormalType2.ts ===
 // generates function fn1(): number;
 function fn1() {
->fn1 : () => number
+>fn1 : typeof fn1
 
     var x: number;
 >x : number
@@ -11,7 +11,7 @@ function fn1() {
 }
 // generates function fn2(): any;
 function fn2(): any {
->fn2 : () => any
+>fn2 : typeof fn2
 
     var x: any;
 >x : any
@@ -21,7 +21,7 @@ function fn2(): any {
 }
 // generates function fn3();
 function fn3() {
->fn3 : () => any
+>fn3 : typeof fn3
 
     var x: any;
 >x : any
diff --git a/tests/baselines/reference/implicitAnyGenerics.types b/tests/baselines/reference/implicitAnyGenerics.types
index 91a231e3f12..b3744097d33 100644
--- a/tests/baselines/reference/implicitAnyGenerics.types
+++ b/tests/baselines/reference/implicitAnyGenerics.types
@@ -67,17 +67,17 @@ var d5: D<any> = new D(null);
 >D : typeof D
 
 function foo<T>(): T { return null; };
->foo : <T>() => T
+>foo : typeof foo
 >T : T
 >T : T
 
 foo() 
 >foo() : {}
->foo : <T>() => T
+>foo : typeof foo
 
 foo<any>();
 >foo<any>() : any
->foo : <T>() => T
+>foo : typeof foo
 
 
     
diff --git a/tests/baselines/reference/importDecl.errors.txt b/tests/baselines/reference/importDecl.errors.txt
new file mode 100644
index 00000000000..2a43a4362c5
--- /dev/null
+++ b/tests/baselines/reference/importDecl.errors.txt
@@ -0,0 +1,83 @@
+==== tests/cases/compiler/importDecl_1.ts (1 errors) ====
+    ///<reference path='importDecl_require.ts'/>
+    ///<reference path='importDecl_require1.ts'/>
+    ///<reference path='importDecl_require2.ts'/>
+    ///<reference path='importDecl_require3.ts'/>
+    ///<reference path='importDecl_require4.ts'/>
+    import m4 = require("importDecl_require"); // Emit used
+    export var x4 = m4.x;
+    export var d4 = m4.d;
+    export var f4 = m4.foo();
+    
+    export module m1 {
+        export var x2 = m4.x;
+        export var d2 = m4.d;
+        export var f2 = m4.foo();
+    
+        var x3 = m4.x;
+        var d3 = m4.d;
+        var f3 = m4.foo();
+    }
+    
+    //Emit global only usage
+    import glo_m4 = require("importDecl_require1");
+    export var useGlo_m4_x4 = glo_m4.x;
+                                     ~
+!!! Property 'x' does not exist on type 'typeof "tests/cases/compiler/importDecl_require1"'.
+    export var useGlo_m4_d4 = glo_m4.d;
+    export var useGlo_m4_f4 = glo_m4.foo();
+    
+    //Emit even when used just in function type
+    import fncOnly_m4 = require("importDecl_require2");
+    export var useFncOnly_m4_f4 = fncOnly_m4.foo();
+    
+    // only used privately no need to emit
+    import private_m4 = require("importDecl_require3");
+    export module usePrivate_m4_m1 {
+        var x3 = private_m4.x;
+        var d3 = private_m4.d;
+        var f3 = private_m4.foo();
+    }
+    
+    // Do not emit unused import
+    import m5 = require("importDecl_require4");
+    export var d = m5.foo2();
+    
+    // Do not emit multiple used import statements
+    import multiImport_m4 = require("importDecl_require"); // Emit used
+    export var useMultiImport_m4_x4 = multiImport_m4.x;
+    export var useMultiImport_m4_d4 = multiImport_m4.d;
+    export var useMultiImport_m4_f4 = multiImport_m4.foo();
+    
+==== tests/cases/compiler/importDecl_require.ts (0 errors) ====
+    export class d {
+        foo: string;
+    }
+    export var x: d;
+    export function foo(): d { return null; }
+    
+==== tests/cases/compiler/importDecl_require1.ts (0 errors) ====
+    export class d {
+        bar: string;
+    }
+    var x: d;
+    export function foo(): d { return null; }
+    
+==== tests/cases/compiler/importDecl_require2.ts (0 errors) ====
+    export class d {
+        baz: string;
+    }
+    export var x: d;
+    export function foo(): d { return null; }
+    
+==== tests/cases/compiler/importDecl_require3.ts (0 errors) ====
+    export class d {
+        bing: string;
+    }
+    export var x: d;
+    export function foo(): d { return null; }
+    
+==== tests/cases/compiler/importDecl_require4.ts (0 errors) ====
+    import m4 = require("importDecl_require");
+    export function foo2(): m4.d { return null; }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/importDecl.js b/tests/baselines/reference/importDecl.js
index e37d46919e9..76312b2b32a 100644
--- a/tests/baselines/reference/importDecl.js
+++ b/tests/baselines/reference/importDecl.js
@@ -55,6 +55,7 @@ export module m1 {
 
 //Emit global only usage
 import glo_m4 = require("importDecl_require1");
+export var useGlo_m4_x4 = glo_m4.x;
 export var useGlo_m4_d4 = glo_m4.d;
 export var useGlo_m4_f4 = glo_m4.foo();
 
@@ -155,6 +156,7 @@ exports.f4 = m4.foo();
 var m1 = exports.m1;
 //Emit global only usage
 var glo_m4 = require("importDecl_require1");
+exports.useGlo_m4_x4 = glo_m4.x;
 exports.useGlo_m4_d4 = glo_m4.d;
 exports.useGlo_m4_f4 = glo_m4.foo();
 //Emit even when used just in function type
@@ -176,57 +178,3 @@ var multiImport_m4 = require("importDecl_require"); // Emit used
 exports.useMultiImport_m4_x4 = multiImport_m4.x;
 exports.useMultiImport_m4_d4 = multiImport_m4.d;
 exports.useMultiImport_m4_f4 = multiImport_m4.foo();
-
-
-//// [importDecl_require.d.ts]
-export declare class d {
-    foo: string;
-}
-export declare var x: d;
-export declare function foo(): d;
-//// [importDecl_require1.d.ts]
-export declare class d {
-    bar: string;
-}
-export declare function foo(): d;
-//// [importDecl_require2.d.ts]
-export declare class d {
-    baz: string;
-}
-export declare var x: d;
-export declare function foo(): d;
-//// [importDecl_require3.d.ts]
-export declare class d {
-    bing: string;
-}
-export declare var x: d;
-export declare function foo(): d;
-//// [importDecl_require4.d.ts]
-import m4 = require("importDecl_require");
-export declare function foo2(): m4.d;
-//// [importDecl_1.d.ts]
-/// <reference path='importDecl_require.d.ts' />
-/// <reference path='importDecl_require1.d.ts' />
-/// <reference path='importDecl_require2.d.ts' />
-/// <reference path='importDecl_require3.d.ts' />
-/// <reference path='importDecl_require4.d.ts' />
-import m4 = require("importDecl_require");
-export declare var x4: m4.d;
-export declare var d4: typeof m4.d;
-export declare var f4: m4.d;
-export declare module m1 {
-    var x2: m4.d;
-    var d2: typeof m4.d;
-    var f2: m4.d;
-}
-import glo_m4 = require("importDecl_require1");
-export declare var useGlo_m4_d4: typeof glo_m4.d;
-export declare var useGlo_m4_f4: glo_m4.d;
-import fncOnly_m4 = require("importDecl_require2");
-export declare var useFncOnly_m4_f4: fncOnly_m4.d;
-export declare module usePrivate_m4_m1 {
-}
-export declare var d: m4.d;
-export declare var useMultiImport_m4_x4: m4.d;
-export declare var useMultiImport_m4_d4: typeof m4.d;
-export declare var useMultiImport_m4_f4: m4.d;
diff --git a/tests/baselines/reference/importDecl.types b/tests/baselines/reference/importDecl.types
deleted file mode 100644
index e6725e87768..00000000000
--- a/tests/baselines/reference/importDecl.types
+++ /dev/null
@@ -1,228 +0,0 @@
-=== tests/cases/compiler/importDecl_1.ts ===
-///<reference path='importDecl_require.ts'/>
-///<reference path='importDecl_require1.ts'/>
-///<reference path='importDecl_require2.ts'/>
-///<reference path='importDecl_require3.ts'/>
-///<reference path='importDecl_require4.ts'/>
-import m4 = require("importDecl_require"); // Emit used
->m4 : typeof "tests/cases/compiler/importDecl_require"
-
-export var x4 = m4.x;
->x4 : d
->m4.x : d
->m4 : typeof "tests/cases/compiler/importDecl_require"
->x : d
-
-export var d4 = m4.d;
->d4 : typeof d
->m4.d : typeof d
->m4 : typeof "tests/cases/compiler/importDecl_require"
->d : typeof d
-
-export var f4 = m4.foo();
->f4 : d
->m4.foo() : d
->m4.foo : () => d
->m4 : typeof "tests/cases/compiler/importDecl_require"
->foo : () => d
-
-export module m1 {
->m1 : typeof m1
-
-    export var x2 = m4.x;
->x2 : d
->m4.x : d
->m4 : typeof "tests/cases/compiler/importDecl_require"
->x : d
-
-    export var d2 = m4.d;
->d2 : typeof d
->m4.d : typeof d
->m4 : typeof "tests/cases/compiler/importDecl_require"
->d : typeof d
-
-    export var f2 = m4.foo();
->f2 : d
->m4.foo() : d
->m4.foo : () => d
->m4 : typeof "tests/cases/compiler/importDecl_require"
->foo : () => d
-
-    var x3 = m4.x;
->x3 : d
->m4.x : d
->m4 : typeof "tests/cases/compiler/importDecl_require"
->x : d
-
-    var d3 = m4.d;
->d3 : typeof d
->m4.d : typeof d
->m4 : typeof "tests/cases/compiler/importDecl_require"
->d : typeof d
-
-    var f3 = m4.foo();
->f3 : d
->m4.foo() : d
->m4.foo : () => d
->m4 : typeof "tests/cases/compiler/importDecl_require"
->foo : () => d
-}
-
-//Emit global only usage
-import glo_m4 = require("importDecl_require1");
->glo_m4 : typeof "tests/cases/compiler/importDecl_require1"
-
-export var useGlo_m4_d4 = glo_m4.d;
->useGlo_m4_d4 : typeof d
->glo_m4.d : typeof d
->glo_m4 : typeof "tests/cases/compiler/importDecl_require1"
->d : typeof d
-
-export var useGlo_m4_f4 = glo_m4.foo();
->useGlo_m4_f4 : d
->glo_m4.foo() : d
->glo_m4.foo : () => d
->glo_m4 : typeof "tests/cases/compiler/importDecl_require1"
->foo : () => d
-
-//Emit even when used just in function type
-import fncOnly_m4 = require("importDecl_require2");
->fncOnly_m4 : typeof "tests/cases/compiler/importDecl_require2"
-
-export var useFncOnly_m4_f4 = fncOnly_m4.foo();
->useFncOnly_m4_f4 : d
->fncOnly_m4.foo() : d
->fncOnly_m4.foo : () => d
->fncOnly_m4 : typeof "tests/cases/compiler/importDecl_require2"
->foo : () => d
-
-// only used privately no need to emit
-import private_m4 = require("importDecl_require3");
->private_m4 : typeof "tests/cases/compiler/importDecl_require3"
-
-export module usePrivate_m4_m1 {
->usePrivate_m4_m1 : typeof usePrivate_m4_m1
-
-    var x3 = private_m4.x;
->x3 : d
->private_m4.x : d
->private_m4 : typeof "tests/cases/compiler/importDecl_require3"
->x : d
-
-    var d3 = private_m4.d;
->d3 : typeof d
->private_m4.d : typeof d
->private_m4 : typeof "tests/cases/compiler/importDecl_require3"
->d : typeof d
-
-    var f3 = private_m4.foo();
->f3 : d
->private_m4.foo() : d
->private_m4.foo : () => d
->private_m4 : typeof "tests/cases/compiler/importDecl_require3"
->foo : () => d
-}
-
-// Do not emit unused import
-import m5 = require("importDecl_require4");
->m5 : typeof "tests/cases/compiler/importDecl_require4"
-
-export var d = m5.foo2();
->d : d
->m5.foo2() : d
->m5.foo2 : () => d
->m5 : typeof "tests/cases/compiler/importDecl_require4"
->foo2 : () => d
-
-// Do not emit multiple used import statements
-import multiImport_m4 = require("importDecl_require"); // Emit used
->multiImport_m4 : typeof "tests/cases/compiler/importDecl_require"
-
-export var useMultiImport_m4_x4 = multiImport_m4.x;
->useMultiImport_m4_x4 : d
->multiImport_m4.x : d
->multiImport_m4 : typeof "tests/cases/compiler/importDecl_require"
->x : d
-
-export var useMultiImport_m4_d4 = multiImport_m4.d;
->useMultiImport_m4_d4 : typeof d
->multiImport_m4.d : typeof d
->multiImport_m4 : typeof "tests/cases/compiler/importDecl_require"
->d : typeof d
-
-export var useMultiImport_m4_f4 = multiImport_m4.foo();
->useMultiImport_m4_f4 : d
->multiImport_m4.foo() : d
->multiImport_m4.foo : () => d
->multiImport_m4 : typeof "tests/cases/compiler/importDecl_require"
->foo : () => d
-
-=== tests/cases/compiler/importDecl_require.ts ===
-export class d {
->d : d
-
-    foo: string;
->foo : string
-}
-export var x: d;
->x : d
->d : d
-
-export function foo(): d { return null; }
->foo : () => d
->d : d
-
-=== tests/cases/compiler/importDecl_require1.ts ===
-export class d {
->d : d
-
-    bar: string;
->bar : string
-}
-var x: d;
->x : d
->d : d
-
-export function foo(): d { return null; }
->foo : () => d
->d : d
-
-=== tests/cases/compiler/importDecl_require2.ts ===
-export class d {
->d : d
-
-    baz: string;
->baz : string
-}
-export var x: d;
->x : d
->d : d
-
-export function foo(): d { return null; }
->foo : () => d
->d : d
-
-=== tests/cases/compiler/importDecl_require3.ts ===
-export class d {
->d : d
-
-    bing: string;
->bing : string
-}
-export var x: d;
->x : d
->d : d
-
-export function foo(): d { return null; }
->foo : () => d
->d : d
-
-=== tests/cases/compiler/importDecl_require4.ts ===
-import m4 = require("importDecl_require");
->m4 : typeof "tests/cases/compiler/importDecl_require"
-
-export function foo2(): m4.d { return null; }
->foo2 : () => d
->m4 : m4
->d : d
-
diff --git a/tests/baselines/reference/importStatements.types b/tests/baselines/reference/importStatements.types
index c7fe4382d30..6b08757d261 100644
--- a/tests/baselines/reference/importStatements.types
+++ b/tests/baselines/reference/importStatements.types
@@ -73,7 +73,7 @@ module E {
 >A : typeof A
 
     export function xDist(x: a.Point) {
->xDist : (x: Point) => number
+>xDist : typeof xDist
 >x : Point
 >a : a
 >Point : Point
diff --git a/tests/baselines/reference/inOperatorWithValidOperands.types b/tests/baselines/reference/inOperatorWithValidOperands.types
index f621c3bf55d..f2c4d903d1d 100644
--- a/tests/baselines/reference/inOperatorWithValidOperands.types
+++ b/tests/baselines/reference/inOperatorWithValidOperands.types
@@ -56,7 +56,7 @@ var rb2 = x in {};
 >{} : {}
 
 function foo<T>(t: T) {
->foo : <T>(t: T) => void
+>foo : typeof foo
 >T : T
 >t : T
 >T : T
diff --git a/tests/baselines/reference/indexSignatureTypeInference.errors.txt b/tests/baselines/reference/indexSignatureTypeInference.errors.txt
deleted file mode 100644
index a37e4458543..00000000000
--- a/tests/baselines/reference/indexSignatureTypeInference.errors.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-==== tests/cases/compiler/indexSignatureTypeInference.ts (1 errors) ====
-    interface NumberMap<T> {
-        [index: number]: T;
-    }
-    
-    interface StringMap<T> {
-        [index: string]: T;
-    }
-    
-    declare function numberMapToArray<T>(object: NumberMap<T>): T[];
-    declare function stringMapToArray<T>(object: StringMap<T>): T[];
-    
-    var numberMap: NumberMap<Function>;
-    var stringMap: StringMap<Function>;
-    
-    var v1: Function[];
-    var v1 = numberMapToArray(numberMap);  // Ok
-    var v1 = numberMapToArray(stringMap);  // Ok
-    var v1 = stringMapToArray(numberMap);  // Error expected here
-                              ~~~~~~~~~
-!!! Argument of type 'NumberMap<Function>' is not assignable to parameter of type 'StringMap<{}>'.
-    var v1 = stringMapToArray(stringMap);  // Ok
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/indexSignaturesInferentialTyping.types b/tests/baselines/reference/indexSignaturesInferentialTyping.types
index 3c16db3a2bf..a59c8e930ea 100644
--- a/tests/baselines/reference/indexSignaturesInferentialTyping.types
+++ b/tests/baselines/reference/indexSignaturesInferentialTyping.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/indexSignaturesInferentialTyping.ts ===
 function foo<T>(items: { [index: number]: T }): T { return undefined; }
->foo : <T>(items: { [x: number]: T; }) => T
+>foo : typeof foo
 >T : T
 >items : { [x: number]: T; }
 >index : number
@@ -9,7 +9,7 @@ function foo<T>(items: { [index: number]: T }): T { return undefined; }
 >undefined : undefined
 
 function bar<T>(items: { [index: string]: T }): T { return undefined; }
->bar : <T>(items: { [x: string]: T; }) => T
+>bar : typeof bar
 >T : T
 >items : { [x: string]: T; }
 >index : string
@@ -20,13 +20,13 @@ function bar<T>(items: { [index: string]: T }): T { return undefined; }
 var x1 = foo({ 0: 0, 1: 1 });       // type should be number
 >x1 : number
 >foo({ 0: 0, 1: 1 }) : number
->foo : <T>(items: { [x: number]: T; }) => T
+>foo : typeof foo
 >{ 0: 0, 1: 1 } : { [x: number]: number; 0: number; 1: number; }
 
 var x2 = foo({ zero: 0, one: 1 });
 >x2 : {}
 >foo({ zero: 0, one: 1 }) : {}
->foo : <T>(items: { [x: number]: T; }) => T
+>foo : typeof foo
 >{ zero: 0, one: 1 } : { [x: number]: {}; zero: number; one: number; }
 >zero : number
 >one : number
@@ -34,13 +34,13 @@ var x2 = foo({ zero: 0, one: 1 });
 var x3 = bar({ 0: 0, 1: 1 });
 >x3 : number
 >bar({ 0: 0, 1: 1 }) : number
->bar : <T>(items: { [x: string]: T; }) => T
+>bar : typeof bar
 >{ 0: 0, 1: 1 } : { [x: string]: number; 0: number; 1: number; }
 
 var x4 = bar({ zero: 0, one: 1 });  // type should be number
 >x4 : number
 >bar({ zero: 0, one: 1 }) : number
->bar : <T>(items: { [x: string]: T; }) => T
+>bar : typeof bar
 >{ zero: 0, one: 1 } : { [x: string]: number; zero: number; one: number; }
 >zero : number
 >one : number
diff --git a/tests/baselines/reference/inferSecondaryParameter.types b/tests/baselines/reference/inferSecondaryParameter.types
index 9831fe89e5b..e416cface90 100644
--- a/tests/baselines/reference/inferSecondaryParameter.types
+++ b/tests/baselines/reference/inferSecondaryParameter.types
@@ -19,15 +19,11 @@ var b: Ib = { m: function (test: string, fn: Function) { } };
 >Function : Function
 
 b.m("test", function (bug) {
->b.m("test", function (bug) {
-    var a: number = bug;
-}) : any
+>b.m("test", function (bug) {    var a: number = bug;}) : any
 >b.m : (test: string, fn: Function) => any
 >b : Ib
 >m : (test: string, fn: Function) => any
->function (bug) {
-    var a: number = bug;
-} : (bug: any) => void
+>function (bug) {    var a: number = bug;} : (bug: any) => void
 >bug : any
 
     var a: number = bug;
diff --git a/tests/baselines/reference/inferTypeArgumentsInSignatureWithRestParameters.types b/tests/baselines/reference/inferTypeArgumentsInSignatureWithRestParameters.types
index 5bf41c64b24..3f985ac3413 100644
--- a/tests/baselines/reference/inferTypeArgumentsInSignatureWithRestParameters.types
+++ b/tests/baselines/reference/inferTypeArgumentsInSignatureWithRestParameters.types
@@ -1,25 +1,25 @@
 === tests/cases/compiler/inferTypeArgumentsInSignatureWithRestParameters.ts ===
 function f<T>(array: T[], ...args) { }
->f : <T>(array: T[], ...args: any[]) => void
+>f : typeof f
 >T : T
 >array : T[]
 >T : T
 >args : any[]
 
 function g(array: number[], ...args) { }
->g : (array: number[], ...args: any[]) => void
+>g : typeof g
 >array : number[]
 >args : any[]
 
 function h<T>(nonarray: T, ...args) { }
->h : <T>(nonarray: T, ...args: any[]) => void
+>h : typeof h
 >T : T
 >nonarray : T
 >T : T
 >args : any[]
 
 function i<T>(array: T[], opt?: any[]) { }
->i : <T>(array: T[], opt?: any[]) => void
+>i : typeof i
 >T : T
 >array : T[]
 >T : T
@@ -31,21 +31,21 @@ var a = [1, 2, 3, 4, 5];
 
 f(a); // OK
 >f(a) : void
->f : <T>(array: T[], ...args: any[]) => void
+>f : typeof f
 >a : number[]
 
 g(a); // OK
 >g(a) : void
->g : (array: number[], ...args: any[]) => void
+>g : typeof g
 >a : number[]
 
 h(a); // OK
 >h(a) : void
->h : <T>(nonarray: T, ...args: any[]) => void
+>h : typeof h
 >a : number[]
 
 i(a); // OK
 >i(a) : void
->i : <T>(array: T[], opt?: any[]) => void
+>i : typeof i
 >a : number[]
 
diff --git a/tests/baselines/reference/inferentialTypingWithFunctionType.types b/tests/baselines/reference/inferentialTypingWithFunctionType.types
index 9f1986c49ea..44312c331f7 100644
--- a/tests/baselines/reference/inferentialTypingWithFunctionType.types
+++ b/tests/baselines/reference/inferentialTypingWithFunctionType.types
@@ -1,6 +1,6 @@
 === 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
+>map : typeof map
 >T : T
 >U : U
 >x : T
@@ -12,7 +12,7 @@ declare function map<T, U>(x: T, f: (s: T) => U): U;
 >U : U
 
 declare function identity<V>(y: V): V;
->identity : <V>(y: V) => V
+>identity : typeof identity
 >V : V
 >y : V
 >V : V
@@ -21,6 +21,6 @@ declare function identity<V>(y: V): V;
 var s = map("", identity);
 >s : string
 >map("", identity) : string
->map : <T, U>(x: T, f: (s: T) => U) => U
->identity : <V>(y: V) => V
+>map : typeof map
+>identity : typeof identity
 
diff --git a/tests/baselines/reference/inferentialTypingWithFunctionType2.types b/tests/baselines/reference/inferentialTypingWithFunctionType2.types
index a97bf2ab36c..81b74406ae2 100644
--- a/tests/baselines/reference/inferentialTypingWithFunctionType2.types
+++ b/tests/baselines/reference/inferentialTypingWithFunctionType2.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/inferentialTypingWithFunctionType2.ts ===
 function identity<A>(a: A): A {
->identity : <A>(a: A) => A
+>identity : typeof identity
 >A : A
 >a : A
 >A : A
@@ -16,5 +16,5 @@ var x = [1, 2, 3].map(identity)[0];
 >[1, 2, 3].map : <U>(callbackfn: (value: number, index: number, array: number[]) => U, thisArg?: any) => U[]
 >[1, 2, 3] : number[]
 >map : <U>(callbackfn: (value: number, index: number, array: number[]) => U, thisArg?: any) => U[]
->identity : <A>(a: A) => A
+>identity : typeof identity
 
diff --git a/tests/baselines/reference/inferentialTypingWithFunctionTypeNested.types b/tests/baselines/reference/inferentialTypingWithFunctionTypeNested.types
index 7628e9c4a9d..8afebb11aaf 100644
--- a/tests/baselines/reference/inferentialTypingWithFunctionTypeNested.types
+++ b/tests/baselines/reference/inferentialTypingWithFunctionTypeNested.types
@@ -1,6 +1,6 @@
 === 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
+>map : typeof map
 >T : T
 >U : U
 >x : T
@@ -13,7 +13,7 @@ declare function map<T, U>(x: T, f: () => { x: (s: T) => U }): U;
 >U : U
 
 declare function identity<V>(y: V): V;
->identity : <V>(y: V) => V
+>identity : typeof identity
 >V : V
 >y : V
 >V : V
@@ -22,9 +22,9 @@ declare function identity<V>(y: V): V;
 var s = map("", () => { return { x: identity }; });
 >s : any
 >map("", () => { return { x: identity }; }) : any
->map : <T, U>(x: T, f: () => { x: (s: T) => U; }) => U
->() => { return { x: identity }; } : () => { x: <V>(y: V) => V; }
->{ x: identity } : { x: <V>(y: V) => V; }
->x : <V>(y: V) => V
+>map : typeof map
+>() => { return { x: identity }; } : () => { x: typeof identity; }
+>{ x: identity } : { x: typeof identity; }
+>x : typeof identity
 >identity : identity
 
diff --git a/tests/baselines/reference/inferentialTypingWithFunctionTypeSyntacticScenarios.types b/tests/baselines/reference/inferentialTypingWithFunctionTypeSyntacticScenarios.types
index ac3d69b9b7d..347036b6981 100644
--- a/tests/baselines/reference/inferentialTypingWithFunctionTypeSyntacticScenarios.types
+++ b/tests/baselines/reference/inferentialTypingWithFunctionTypeSyntacticScenarios.types
@@ -1,6 +1,6 @@
 === 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
+>map : typeof map
 >T : T
 >U : U
 >array : T
@@ -12,7 +12,7 @@ declare function map<T, U>(array: T, func: (x: T) => U): U;
 >U : U
 
 declare function identity<V>(y: V): V;
->identity : <V>(y: V) => V
+>identity : typeof identity
 >V : V
 >y : V
 >V : V
@@ -23,46 +23,46 @@ var s: string;
 
 // dotted name
 var dottedIdentity = { x: identity };
->dottedIdentity : { x: <V>(y: V) => V; }
->{ x: identity } : { x: <V>(y: V) => V; }
->x : <V>(y: V) => V
+>dottedIdentity : { x: typeof identity; }
+>{ x: identity } : { x: typeof identity; }
+>x : typeof identity
 >identity : identity
 
 s = map("", dottedIdentity.x);
 >s = map("", dottedIdentity.x) : string
 >s : string
 >map("", dottedIdentity.x) : string
->map : <T, U>(array: T, func: (x: T) => U) => U
->dottedIdentity.x : <V>(y: V) => V
->dottedIdentity : { x: <V>(y: V) => V; }
->x : <V>(y: V) => V
+>map : typeof map
+>dottedIdentity.x : typeof identity
+>dottedIdentity : { x: typeof identity; }
+>x : typeof identity
 
 // index expression
 s = map("", dottedIdentity['x']);
 >s = map("", dottedIdentity['x']) : string
 >s : string
 >map("", dottedIdentity['x']) : string
->map : <T, U>(array: T, func: (x: T) => U) => U
->dottedIdentity['x'] : <V>(y: V) => V
->dottedIdentity : { x: <V>(y: V) => V; }
+>map : typeof map
+>dottedIdentity['x'] : typeof identity
+>dottedIdentity : { x: typeof identity; }
 
 // function call
 s = map("", (() => identity)());
 >s = map("", (() => identity)()) : string
 >s : string
 >map("", (() => identity)()) : string
->map : <T, U>(array: T, func: (x: T) => U) => U
->(() => identity)() : <V>(y: V) => V
->(() => identity) : () => <V>(y: V) => V
->() => identity : () => <V>(y: V) => V
->identity : <V>(y: V) => V
+>map : typeof map
+>(() => identity)() : typeof identity
+>(() => identity) : () => typeof identity
+>() => identity : () => typeof identity
+>identity : typeof identity
 
 // construct
 interface IdentityConstructor {
 >IdentityConstructor : IdentityConstructor
 
     new (): typeof identity;
->identity : <V>(y: V) => V
+>identity : typeof identity
 }
 var ic: IdentityConstructor;
 >ic : IdentityConstructor
@@ -72,8 +72,8 @@ s = map("", new ic());
 >s = map("", new ic()) : string
 >s : string
 >map("", new ic()) : string
->map : <T, U>(array: T, func: (x: T) => U) => U
->new ic() : <V>(y: V) => V
+>map : typeof map
+>new ic() : typeof identity
 >ic : IdentityConstructor
 
 // assignment
@@ -84,37 +84,37 @@ s = map("", t = identity);
 >s = map("", t = identity) : string
 >s : string
 >map("", t = identity) : string
->map : <T, U>(array: T, func: (x: T) => U) => U
->t = identity : <V>(y: V) => V
+>map : typeof map
+>t = identity : typeof identity
 >t : any
->identity : <V>(y: V) => V
+>identity : typeof identity
 
 // type assertion
 s = map("", <typeof identity>identity);
 >s = map("", <typeof identity>identity) : string
 >s : string
 >map("", <typeof identity>identity) : string
->map : <T, U>(array: T, func: (x: T) => U) => U
-><typeof identity>identity : <V>(y: V) => V
->identity : <V>(y: V) => V
->identity : <V>(y: V) => V
+>map : typeof map
+><typeof identity>identity : typeof identity
+>identity : typeof identity
+>identity : typeof identity
 
 // parenthesized expression
 s = map("", (identity));
 >s = map("", (identity)) : string
 >s : string
 >map("", (identity)) : string
->map : <T, U>(array: T, func: (x: T) => U) => U
->(identity) : <V>(y: V) => V
->identity : <V>(y: V) => V
+>map : typeof map
+>(identity) : typeof identity
+>identity : typeof identity
 
 // comma
 s = map("", ("", identity));
 >s = map("", ("", identity)) : string
 >s : string
 >map("", ("", identity)) : string
->map : <T, U>(array: T, func: (x: T) => U) => U
->("", identity) : <V>(y: V) => V
->"", identity : <V>(y: V) => V
->identity : <V>(y: V) => V
+>map : typeof map
+>("", identity) : typeof identity
+>"", identity : typeof identity
+>identity : typeof identity
 
diff --git a/tests/baselines/reference/inferentiallyTypingAnEmptyArray.types b/tests/baselines/reference/inferentiallyTypingAnEmptyArray.types
index c8f51c985e6..bd35eaac96e 100644
--- a/tests/baselines/reference/inferentiallyTypingAnEmptyArray.types
+++ b/tests/baselines/reference/inferentiallyTypingAnEmptyArray.types
@@ -15,7 +15,7 @@
 // Therefore, the following access to bar should not cause an error because we infer
 // the undefined[] type.
 declare function foo<T>(arr: T[]): T;
->foo : <T>(arr: T[]) => T
+>foo : typeof foo
 >T : T
 >arr : T[]
 >T : T
@@ -24,7 +24,7 @@ declare function foo<T>(arr: T[]): T;
 foo([]).bar;
 >foo([]).bar : any
 >foo([]) : any
->foo : <T>(arr: T[]) => T
+>foo : typeof foo
 >[] : any[]
 >bar : any
 
diff --git a/tests/baselines/reference/infiniteExpansionThroughTypeInference.types b/tests/baselines/reference/infiniteExpansionThroughTypeInference.types
index df818833aa0..69c705ca5b0 100644
--- a/tests/baselines/reference/infiniteExpansionThroughTypeInference.types
+++ b/tests/baselines/reference/infiniteExpansionThroughTypeInference.types
@@ -15,7 +15,7 @@ interface G<T> {
 }
 
 function ff<T>(g: G<T>): void {
->ff : <T>(g: G<T>) => void
+>ff : typeof ff
 >T : T
 >g : G<T>
 >G : G<T>
@@ -23,7 +23,7 @@ function ff<T>(g: G<T>): void {
 
     ff(g) // when infering T here we need to make sure to not descend into the structure of G<T> infinitely
 >ff(g) : void
->ff : <T>(g: G<T>) => void
+>ff : typeof ff
 >g : G<T>
 }
 
diff --git a/tests/baselines/reference/infinitelyExpandingTypes5.types b/tests/baselines/reference/infinitelyExpandingTypes5.types
index f145ff9539f..7c1ba26a7cf 100644
--- a/tests/baselines/reference/infinitelyExpandingTypes5.types
+++ b/tests/baselines/reference/infinitelyExpandingTypes5.types
@@ -23,7 +23,7 @@ interface Enumerator<T> {
 }
 
 function from<T>(array: T[]): Query<T>;
->from : { <T>(array: T[]): Query<T>; <T>(enumerator: Enumerator<T>): Query<T>; }
+>from : typeof from
 >T : T
 >array : T[]
 >T : T
@@ -31,7 +31,7 @@ function from<T>(array: T[]): Query<T>;
 >T : T
 
 function from<T>(enumerator: Enumerator<T>): Query<T>;
->from : { <T>(array: T[]): Query<T>; <T>(enumerator: Enumerator<T>): Query<T>; }
+>from : typeof from
 >T : T
 >enumerator : Enumerator<T>
 >Enumerator : Enumerator<T>
@@ -40,7 +40,7 @@ function from<T>(enumerator: Enumerator<T>): Query<T>;
 >T : T
 
 function from(arg: any): any {
->from : { <T>(array: T[]): Query<T>; <T>(enumerator: Enumerator<T>): Query<T>; }
+>from : typeof from
 >arg : any
 
     return undefined;
diff --git a/tests/baselines/reference/infinitelyExpandingTypesNonGenericBase.types b/tests/baselines/reference/infinitelyExpandingTypesNonGenericBase.types
index 9190ef15779..9a86ce3e8cd 100644
--- a/tests/baselines/reference/infinitelyExpandingTypesNonGenericBase.types
+++ b/tests/baselines/reference/infinitelyExpandingTypesNonGenericBase.types
@@ -44,13 +44,13 @@ interface Options<T> extends OptionsBase<T> {
 
 
 function o(type: new () => Base) {
->o : (type: new () => Base) => void
+>o : typeof o
 >type : new () => Base
 >Base : Base
 }
 
 o(A);
 >o(A) : void
->o : (type: new () => Base) => void
+>o : typeof o
 >A : typeof A
 
diff --git a/tests/baselines/reference/inheritanceStaticFuncOverridingMethod.types b/tests/baselines/reference/inheritanceStaticFuncOverridingMethod.types
index ec7b3f5bbf9..60b851e10d1 100644
--- a/tests/baselines/reference/inheritanceStaticFuncOverridingMethod.types
+++ b/tests/baselines/reference/inheritanceStaticFuncOverridingMethod.types
@@ -3,7 +3,7 @@ class a {
 >a : a
 
     static x() {
->x : () => string
+>x : typeof x
 
         return "10";
     }
@@ -14,7 +14,7 @@ class b extends a {
 >a : a
 
     static x() {
->x : () => string
+>x : typeof x
 
         return "20";
     }
diff --git a/tests/baselines/reference/inheritanceStaticFuncOverridingPropertyOfFuncType.types b/tests/baselines/reference/inheritanceStaticFuncOverridingPropertyOfFuncType.types
index 842f9ffddf9..bcecfd22605 100644
--- a/tests/baselines/reference/inheritanceStaticFuncOverridingPropertyOfFuncType.types
+++ b/tests/baselines/reference/inheritanceStaticFuncOverridingPropertyOfFuncType.types
@@ -11,7 +11,7 @@ class b extends a {
 >a : a
 
     static x() {
->x : () => string
+>x : typeof x
 
         return "20";
     }
diff --git a/tests/baselines/reference/inheritanceStaticFunctionOverridingInstanceProperty.types b/tests/baselines/reference/inheritanceStaticFunctionOverridingInstanceProperty.types
index 4742dde63f6..0f503f5c975 100644
--- a/tests/baselines/reference/inheritanceStaticFunctionOverridingInstanceProperty.types
+++ b/tests/baselines/reference/inheritanceStaticFunctionOverridingInstanceProperty.types
@@ -11,7 +11,7 @@ class b extends a {
 >a : a
 
     static x() {
->x : () => string
+>x : typeof x
 
         return new b().x;
 >new b().x : string
diff --git a/tests/baselines/reference/inheritedFunctionAssignmentCompatibility.types b/tests/baselines/reference/inheritedFunctionAssignmentCompatibility.types
index c24c0545c3e..2dc52065feb 100644
--- a/tests/baselines/reference/inheritedFunctionAssignmentCompatibility.types
+++ b/tests/baselines/reference/inheritedFunctionAssignmentCompatibility.types
@@ -4,20 +4,20 @@ interface IResultCallback extends Function { }
 >Function : Function
 
 function fn(cb: IResultCallback) { }
->fn : (cb: IResultCallback) => void
+>fn : typeof fn
 >cb : IResultCallback
 >IResultCallback : IResultCallback
 
 fn((a, b) => true);
 >fn((a, b) => true) : void
->fn : (cb: IResultCallback) => void
+>fn : typeof fn
 >(a, b) => true : (a: any, b: any) => boolean
 >a : any
 >b : any
 
 fn(function (a, b) { return true; })
 >fn(function (a, b) { return true; }) : void
->fn : (cb: IResultCallback) => void
+>fn : typeof fn
 >function (a, b) { return true; } : (a: any, b: any) => boolean
 >a : any
 >b : any
diff --git a/tests/baselines/reference/inheritedOverloadedSpecializedSignatures.types b/tests/baselines/reference/inheritedOverloadedSpecializedSignatures.types
deleted file mode 100644
index 0284fa4bc43..00000000000
--- a/tests/baselines/reference/inheritedOverloadedSpecializedSignatures.types
+++ /dev/null
@@ -1,90 +0,0 @@
-=== 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);
->b('foo').charAt(0) : string
->b('foo').charAt : (pos: number) => string
->b('foo') : string
->b : B
->charAt : (pos: number) => string
-
-interface A {
->A : A
-
-    (x: 'A1'): string;
->x : 'A1'
-
-    (x: string): void;
->x : string
-}
-
-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'
-}
-
-var b: B;
->b : B
->B : B
-
-// non of these lines should error
-var x1: string[] = b('B2'); 
->x1 : string[]
->b('B2') : string[]
->b : B
-
-var x2: number = b('B1');
->x2 : number
->b('B1') : number
->b : B
-
-var x3: boolean = b('A2');
->x3 : boolean
->b('A2') : boolean
->b : B
-
-var x4: string = b('A1');
->x4 : string
->b('A1') : string
->b : B
-
-var x5: void = b('A0');
->x5 : void
->b('A0') : void
->b : B
-
diff --git a/tests/baselines/reference/innerAliases2.types b/tests/baselines/reference/innerAliases2.types
index 458f0019831..ef599d0d3f6 100644
--- a/tests/baselines/reference/innerAliases2.types
+++ b/tests/baselines/reference/innerAliases2.types
@@ -24,7 +24,7 @@ module consumer {
 >UsefulClass : UsefulClass
                 
                 function use():provider.UsefulClass { 
->use : () => UsefulClass
+>use : typeof use
 >provider : provider
 >UsefulClass : UsefulClass
 
diff --git a/tests/baselines/reference/innerFunc.types b/tests/baselines/reference/innerFunc.types
index 8ca9e9d0a0b..7725f0c2928 100644
--- a/tests/baselines/reference/innerFunc.types
+++ b/tests/baselines/reference/innerFunc.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/innerFunc.ts ===
 function salt() {
->salt : () => number
+>salt : typeof salt
 
   function pepper() { return 5;}
 >pepper : () => number
@@ -14,7 +14,7 @@ module M {
 >M : typeof M
 
     export function tungsten() {
->tungsten : () => number
+>tungsten : typeof tungsten
 
         function oxygen() { return 6; };
 >oxygen : () => number
diff --git a/tests/baselines/reference/innerOverloads.types b/tests/baselines/reference/innerOverloads.types
index 7168f6161f3..5c5194e7de1 100644
--- a/tests/baselines/reference/innerOverloads.types
+++ b/tests/baselines/reference/innerOverloads.types
@@ -1,7 +1,7 @@
 === tests/cases/compiler/innerOverloads.ts ===
 
 function outer() {
->outer : () => any
+>outer : typeof outer
 
     function inner(x:number); // should work
 >inner : { (x: number): any; (x: string): any; }
@@ -24,6 +24,6 @@ function outer() {
 var x = outer(); // should work
 >x : any
 >outer() : any
->outer : () => any
+>outer : typeof outer
 
 
diff --git a/tests/baselines/reference/innerTypeArgumentInference.types b/tests/baselines/reference/innerTypeArgumentInference.types
index 759b78aa75f..d9f9c2c5dd8 100644
--- a/tests/baselines/reference/innerTypeArgumentInference.types
+++ b/tests/baselines/reference/innerTypeArgumentInference.types
@@ -5,7 +5,7 @@ interface Generator<T> { (): T; }
 >T : T
 
 function Generate<U>(func: Generator<U>): U {
->Generate : <U>(func: Generator<U>) => U
+>Generate : typeof Generate
 >U : U
 >func : Generator<U>
 >Generator : Generator<T>
@@ -14,6 +14,6 @@ function Generate<U>(func: Generator<U>): U {
 
     return Generate(func);
 >Generate(func) : U
->Generate : <U>(func: Generator<U>) => U
+>Generate : typeof Generate
 >func : Generator<U>
 }
diff --git a/tests/baselines/reference/innerTypeParameterShadowingOuterOne.types b/tests/baselines/reference/innerTypeParameterShadowingOuterOne.types
index eb1ffb17217..bdd687e727b 100644
--- a/tests/baselines/reference/innerTypeParameterShadowingOuterOne.types
+++ b/tests/baselines/reference/innerTypeParameterShadowingOuterOne.types
@@ -3,7 +3,7 @@
 // no errors expected
 
 function f<T extends Date>() {
->f : <T extends Date>() => void
+>f : typeof f
 >T : T
 >Date : Date
 
@@ -34,7 +34,7 @@ function f<T extends Date>() {
 }
 
 function f2<T extends Date, U extends Date>() {
->f2 : <T extends Date, U extends Date>() => void
+>f2 : typeof f2
 >T : T
 >Date : Date
 >U : U
diff --git a/tests/baselines/reference/instanceAndStaticDeclarations1.types b/tests/baselines/reference/instanceAndStaticDeclarations1.types
index c80cf78e37a..6d081b0e62d 100644
--- a/tests/baselines/reference/instanceAndStaticDeclarations1.types
+++ b/tests/baselines/reference/instanceAndStaticDeclarations1.types
@@ -52,7 +52,7 @@ class Point {
 >Point : typeof Point
 
     static distance(p1: Point, p2: Point) { return p1.distance(p2); }
->distance : (p1: Point, p2: Point) => number
+>distance : typeof distance
 >p1 : Point
 >Point : Point
 >p2 : Point
diff --git a/tests/baselines/reference/instanceOfInExternalModules.types b/tests/baselines/reference/instanceOfInExternalModules.types
index 35594ac2d7b..d5785247464 100644
--- a/tests/baselines/reference/instanceOfInExternalModules.types
+++ b/tests/baselines/reference/instanceOfInExternalModules.types
@@ -4,7 +4,7 @@ import Bar = require("instanceOfInExternalModules_require");
 >Bar : typeof "tests/cases/compiler/instanceOfInExternalModules_require"
 
 function IsFoo(value: any): boolean {
->IsFoo : (value: any) => boolean
+>IsFoo : typeof IsFoo
 >value : any
 
     return value instanceof Bar.Foo;
diff --git a/tests/baselines/reference/instanceofOperatorWithLHSIsTypeParameter.types b/tests/baselines/reference/instanceofOperatorWithLHSIsTypeParameter.types
index d10c6c5cafa..ec6c9e3963f 100644
--- a/tests/baselines/reference/instanceofOperatorWithLHSIsTypeParameter.types
+++ b/tests/baselines/reference/instanceofOperatorWithLHSIsTypeParameter.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/expressions/binaryOperators/instanceofOperator/instanceofOperatorWithLHSIsTypeParameter.ts ===
 function foo<T>(t: T) {
->foo : <T>(t: T) => void
+>foo : typeof foo
 >T : T
 >t : T
 >T : T
diff --git a/tests/baselines/reference/instantiatedModule.types b/tests/baselines/reference/instantiatedModule.types
index 5021cce8afb..d21f030d4bb 100644
--- a/tests/baselines/reference/instantiatedModule.types
+++ b/tests/baselines/reference/instantiatedModule.types
@@ -62,7 +62,7 @@ module M2 {
 >y : number
 
         static Origin(): Point {
->Origin : () => Point
+>Origin : typeof Origin
 >Point : Point
 
             return { x: 0, y: 0 };
@@ -104,9 +104,9 @@ var o: M2.Point = a2.Origin();
 >M2 : M2
 >Point : Point
 >a2.Origin() : Point
->a2.Origin : () => Point
+>a2.Origin : typeof Origin
 >a2 : typeof Point
->Origin : () => Point
+>Origin : typeof Origin
 
 var p2: { x: number; y: number }
 >p2 : { x: number; y: number; }
diff --git a/tests/baselines/reference/interMixingModulesInterfaces0.types b/tests/baselines/reference/interMixingModulesInterfaces0.types
index a6f132970cd..a6f246fc8d4 100644
--- a/tests/baselines/reference/interMixingModulesInterfaces0.types
+++ b/tests/baselines/reference/interMixingModulesInterfaces0.types
@@ -6,7 +6,7 @@ module A {
 >B : typeof B
 
         export function createB(): B {
->createB : () => B
+>createB : typeof createB
 >B : B
 
             return null;
@@ -29,9 +29,9 @@ var x: A.B = A.B.createB();
 >A : A
 >B : B
 >A.B.createB() : B
->A.B.createB : () => B
+>A.B.createB : typeof createB
 >A.B : typeof B
 >A : typeof A
 >B : typeof B
->createB : () => B
+>createB : typeof createB
 
diff --git a/tests/baselines/reference/interMixingModulesInterfaces1.types b/tests/baselines/reference/interMixingModulesInterfaces1.types
index df54cefd96f..14e746e6669 100644
--- a/tests/baselines/reference/interMixingModulesInterfaces1.types
+++ b/tests/baselines/reference/interMixingModulesInterfaces1.types
@@ -16,7 +16,7 @@ module A {
 >B : typeof B
 
         export function createB(): B {
->createB : () => B
+>createB : typeof createB
 >B : B
 
             return null;
@@ -29,9 +29,9 @@ var x: A.B = A.B.createB();
 >A : A
 >B : B
 >A.B.createB() : B
->A.B.createB : () => B
+>A.B.createB : typeof createB
 >A.B : typeof B
 >A : typeof A
 >B : typeof B
->createB : () => B
+>createB : typeof createB
 
diff --git a/tests/baselines/reference/interMixingModulesInterfaces2.types b/tests/baselines/reference/interMixingModulesInterfaces2.types
index 67d8e04c571..d5978a475f7 100644
--- a/tests/baselines/reference/interMixingModulesInterfaces2.types
+++ b/tests/baselines/reference/interMixingModulesInterfaces2.types
@@ -16,7 +16,7 @@ module A {
 >B : typeof B
 
         export function createB(): B {
->createB : () => B
+>createB : typeof createB
 >B : B
 
             return null;
diff --git a/tests/baselines/reference/interMixingModulesInterfaces3.types b/tests/baselines/reference/interMixingModulesInterfaces3.types
index 9ffb4149b48..967f6c4e8d7 100644
--- a/tests/baselines/reference/interMixingModulesInterfaces3.types
+++ b/tests/baselines/reference/interMixingModulesInterfaces3.types
@@ -6,7 +6,7 @@ module A {
 >B : typeof B
 
         export function createB(): B {
->createB : () => B
+>createB : typeof createB
 >B : B
 
             return null;
diff --git a/tests/baselines/reference/interMixingModulesInterfaces4.types b/tests/baselines/reference/interMixingModulesInterfaces4.types
index 9df3388a09a..eb117ea0029 100644
--- a/tests/baselines/reference/interMixingModulesInterfaces4.types
+++ b/tests/baselines/reference/interMixingModulesInterfaces4.types
@@ -6,7 +6,7 @@ module A {
 >B : typeof B
 
         export function createB(): number {
->createB : () => number
+>createB : typeof createB
 
             return null;
         }
@@ -26,9 +26,9 @@ module A {
 var x : number = A.B.createB();
 >x : number
 >A.B.createB() : number
->A.B.createB : () => number
+>A.B.createB : typeof createB
 >A.B : typeof B
 >A : typeof A
 >B : typeof B
->createB : () => number
+>createB : typeof createB
 
diff --git a/tests/baselines/reference/interMixingModulesInterfaces5.types b/tests/baselines/reference/interMixingModulesInterfaces5.types
index de08a7be442..91dd6c2168c 100644
--- a/tests/baselines/reference/interMixingModulesInterfaces5.types
+++ b/tests/baselines/reference/interMixingModulesInterfaces5.types
@@ -16,7 +16,7 @@ module A {
 >B : typeof B
 
         export function createB(): number {
->createB : () => number
+>createB : typeof createB
 
             return null;
         }
@@ -26,9 +26,9 @@ module A {
 var x: number = A.B.createB();
 >x : number
 >A.B.createB() : number
->A.B.createB : () => number
+>A.B.createB : typeof createB
 >A.B : typeof B
 >A : typeof A
 >B : typeof B
->createB : () => number
+>createB : typeof createB
 
diff --git a/tests/baselines/reference/interfaceContextualType.types b/tests/baselines/reference/interfaceContextualType.types
index 65bd6b7ae34..88ba9dcbc24 100644
--- a/tests/baselines/reference/interfaceContextualType.types
+++ b/tests/baselines/reference/interfaceContextualType.types
@@ -46,15 +46,11 @@ class Bug {
 >shouldBeOK : () => void
 
         this.values = {
->this.values = {
-            comments: { italic: true }
-        } : { [x: string]: IOptions; comments: { italic: boolean; }; }
+>this.values = {            comments: { italic: true }        } : { [x: string]: IOptions; comments: { italic: boolean; }; }
 >this.values : IMap
 >this : Bug
 >values : IMap
->{
-            comments: { italic: true }
-        } : { [x: string]: IOptions; comments: { italic: boolean; }; }
+>{            comments: { italic: true }        } : { [x: string]: IOptions; comments: { italic: boolean; }; }
 
             comments: { italic: true }
 >comments : { italic: boolean; }
diff --git a/tests/baselines/reference/interfaceWithPropertyOfEveryType.types b/tests/baselines/reference/interfaceWithPropertyOfEveryType.types
index be340c70143..08c59a3d82d 100644
--- a/tests/baselines/reference/interfaceWithPropertyOfEveryType.types
+++ b/tests/baselines/reference/interfaceWithPropertyOfEveryType.types
@@ -4,7 +4,7 @@ class C { foo: string; }
 >foo : string
 
 function f1() { }
->f1 : () => void
+>f1 : typeof f1
 
 module M {
 >M : typeof M
@@ -61,8 +61,8 @@ interface Foo {
 >C : C
 
     l: typeof f1;
->l : () => void
->f1 : () => void
+>l : typeof f1
+>f1 : typeof f1
 
     m: typeof M;
 >m : typeof M
@@ -79,23 +79,7 @@ interface Foo {
 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: boolean; 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,    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: boolean; d: {}; e: null; f: number[]; g: {}; h: (x: number) => number; i: <T>(x: T) => T; j: Foo; k: C; l: typeof f1; m: typeof M; n: {}; o: E; }
 
     a: 1,
 >a : number
@@ -145,7 +129,7 @@ var a: Foo = {
 >C : typeof C
 
     l: f1,
->l : () => void
+>l : typeof f1
 >f1 : f1
 
     m: M,
diff --git a/tests/baselines/reference/internalAliasFunction.types b/tests/baselines/reference/internalAliasFunction.types
index ed297ce1b4e..b1723a38e75 100644
--- a/tests/baselines/reference/internalAliasFunction.types
+++ b/tests/baselines/reference/internalAliasFunction.types
@@ -3,7 +3,7 @@ module a {
 >a : typeof a
 
     export function foo(x: number) {
->foo : (x: number) => number
+>foo : typeof foo
 >x : number
 
         return x;
@@ -15,17 +15,17 @@ module c {
 >c : typeof c
 
     import b = a.foo;
->b : (x: number) => number
+>b : typeof foo
 >a : typeof a
->foo : (x: number) => number
+>foo : typeof foo
 
     export var bVal = b(10);
 >bVal : number
 >b(10) : number
->b : (x: number) => number
+>b : typeof foo
 
     export var bVal2 = b;
->bVal2 : (x: number) => number
->b : (x: number) => number
+>bVal2 : typeof foo
+>b : typeof foo
 }
 
diff --git a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithExport.types b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithExport.types
index b3140e7b09a..260a57834a2 100644
--- a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithExport.types
+++ b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithExport.types
@@ -3,7 +3,7 @@ export module a {
 >a : typeof a
 
     export function foo(x: number) {
->foo : (x: number) => number
+>foo : typeof foo
 >x : number
 
         return x;
@@ -15,17 +15,17 @@ export module c {
 >c : typeof c
 
     export import b = a.foo;
->b : (x: number) => number
+>b : typeof foo
 >a : typeof a
->foo : (x: number) => number
+>foo : typeof foo
 
     export var bVal = b(10);
 >bVal : number
 >b(10) : number
->b : (x: number) => number
+>b : typeof foo
 
     export var bVal2 = b;
->bVal2 : (x: number) => number
->b : (x: number) => number
+>bVal2 : typeof foo
+>b : typeof foo
 }
 
diff --git a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExport.types b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExport.types
index c78b5040495..df75263fca9 100644
--- a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExport.types
+++ b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExport.types
@@ -3,7 +3,7 @@ export module a {
 >a : typeof a
 
     export function foo(x: number) {
->foo : (x: number) => number
+>foo : typeof foo
 >x : number
 
         return x;
@@ -15,17 +15,17 @@ export module c {
 >c : typeof c
 
     import b = a.foo;
->b : (x: number) => number
+>b : typeof foo
 >a : typeof a
->foo : (x: number) => number
+>foo : typeof foo
 
     var bVal = b(10);
 >bVal : number
 >b(10) : number
->b : (x: number) => number
+>b : typeof foo
 
     export var bVal2 = b;
->bVal2 : (x: number) => number
->b : (x: number) => number
+>bVal2 : typeof foo
+>b : typeof foo
 }
 
diff --git a/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithExport.types b/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithExport.types
index 365f0edeb27..835d07910b8 100644
--- a/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithExport.types
+++ b/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithExport.types
@@ -3,7 +3,7 @@ export module a {
 >a : typeof a
 
     export function foo(x: number) {
->foo : (x: number) => number
+>foo : typeof foo
 >x : number
 
         return x;
@@ -12,16 +12,16 @@ export module a {
 }
 
 export import b = a.foo;
->b : (x: number) => number
+>b : typeof foo
 >a : typeof a
->foo : (x: number) => number
+>foo : typeof foo
 
 export var bVal = b(10);
 >bVal : number
 >b(10) : number
->b : (x: number) => number
+>b : typeof foo
 
 export var bVal2 = b;
->bVal2 : (x: number) => number
->b : (x: number) => number
+>bVal2 : typeof foo
+>b : typeof foo
 
diff --git a/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithoutExport.types b/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithoutExport.types
index c2f06c66f76..da517b03a36 100644
--- a/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithoutExport.types
+++ b/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithoutExport.types
@@ -3,7 +3,7 @@ export module a {
 >a : typeof a
 
     export function foo(x: number) {
->foo : (x: number) => number
+>foo : typeof foo
 >x : number
 
         return x;
@@ -12,16 +12,16 @@ export module a {
 }
 
 import b = a.foo;
->b : (x: number) => number
+>b : typeof foo
 >a : typeof a
->foo : (x: number) => number
+>foo : typeof foo
 
 export var bVal = b(10);
 >bVal : number
 >b(10) : number
->b : (x: number) => number
+>b : typeof foo
 
 export var bVal2 = b;
->bVal2 : (x: number) => number
->b : (x: number) => number
+>bVal2 : typeof foo
+>b : typeof foo
 
diff --git a/tests/baselines/reference/internalAliasWithDottedNameEmit.js b/tests/baselines/reference/internalAliasWithDottedNameEmit.js
index d6a4cfcfff7..d70da1ba16c 100644
--- a/tests/baselines/reference/internalAliasWithDottedNameEmit.js
+++ b/tests/baselines/reference/internalAliasWithDottedNameEmit.js
@@ -18,11 +18,3 @@ var a;
     })(a.b || (a.b = {}));
     var b = a.b;
 })(a || (a = {}));
-
-
-//// [internalAliasWithDottedNameEmit.d.ts]
-declare module a.b.c {
-    var d: any;
-}
-declare module a.e.f {
-}
diff --git a/tests/baselines/reference/invalidTryStatements2.errors.txt b/tests/baselines/reference/invalidTryStatements2.errors.txt
index a600210a605..8481e437b89 100644
--- a/tests/baselines/reference/invalidTryStatements2.errors.txt
+++ b/tests/baselines/reference/invalidTryStatements2.errors.txt
@@ -1,4 +1,4 @@
-==== tests/cases/conformance/statements/tryStatements/invalidTryStatements2.ts (6 errors) ====
+==== tests/cases/conformance/statements/tryStatements/invalidTryStatements2.ts (2 errors) ====
     function fn() {
         try {
         } catch { // syntax error, missing '(x)'
@@ -10,32 +10,5 @@
         ~~~~~
 !!! 'try' expected.
     
-        finally{ } // potential error; can be absorbed by the 'catch'
-    }
-    
-    function fn2() {
-        finally { } // error missing try
-        ~~~~~~~
-!!! 'try' expected.
-        catch (x) { } // error missing try
-        ~~~~~
-!!! 'try' expected.
-    
-        // no error
-        try {
-        }
-        finally {
-        }
-    
-        // error missing try
-        finally {
-        ~~~~~~~
-!!! 'try' expected.
-        }
-    
-        // error missing try
-        catch (x) {
-        ~~~~~
-!!! 'try' expected.
-        }
+        finally{ } // error missing try
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/invalidUndefinedValues.types b/tests/baselines/reference/invalidUndefinedValues.types
index 9cc71b87c82..3824498d216 100644
--- a/tests/baselines/reference/invalidUndefinedValues.types
+++ b/tests/baselines/reference/invalidUndefinedValues.types
@@ -75,7 +75,7 @@ x = { f() { } }
 >f() { } : () => void
 
 function f<T>(a: T) {
->f : <T>(a: T) => void
+>f : typeof f
 >T : T
 >a : T
 >T : T
@@ -86,9 +86,9 @@ function f<T>(a: T) {
 >a : T
 }
 x = f;
->x = f : <T>(a: T) => void
+>x = f : typeof f
 >x : any
->f : <T>(a: T) => void
+>f : typeof f
 
 enum E { A }
 >E : E
diff --git a/tests/baselines/reference/ipromise2.types b/tests/baselines/reference/ipromise2.types
index 1cb5bcecc34..c611b081ed2 100644
--- a/tests/baselines/reference/ipromise2.types
+++ b/tests/baselines/reference/ipromise2.types
@@ -104,15 +104,11 @@ var p: Windows.Foundation.IPromise<string>;
 
 var p2 = p.then(function (s) {
 >p2 : IPromise<number>
->p.then(function (s) {
-    return 34;
-} ) : IPromise<number>
+>p.then(function (s) {    return 34;} ) : IPromise<number>
 >p.then : { <U>(success?: (value: string) => IPromise<U>, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: string) => IPromise<U>, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: string) => U, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: string) => U, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>; }
 >p : IPromise<string>
 >then : { <U>(success?: (value: string) => IPromise<U>, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: string) => IPromise<U>, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: string) => U, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: string) => U, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>; }
->function (s) {
-    return 34;
-} : (s: string) => number
+>function (s) {    return 34;} : (s: string) => number
 >s : string
 
     return 34;
diff --git a/tests/baselines/reference/ipromise3.types b/tests/baselines/reference/ipromise3.types
index 4750dd4b6ce..7f11624db09 100644
--- a/tests/baselines/reference/ipromise3.types
+++ b/tests/baselines/reference/ipromise3.types
@@ -85,15 +85,11 @@ var p1: IPromise3<string>;
 var p2: IPromise3<string> = p1.then(function (x) {
 >p2 : IPromise3<string>
 >IPromise3 : IPromise3<T>
->p1.then(function (x) {
-    return x;
-}) : IPromise3<string>
+>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>
 >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>; }
->function (x) {
-    return x;
-} : (x: string) => string
+>function (x) {    return x;} : (x: string) => string
 >x : string
 
     return x;
diff --git a/tests/baselines/reference/lambdaASIEmit.types b/tests/baselines/reference/lambdaASIEmit.types
index acdbd777f23..07b4431e519 100644
--- a/tests/baselines/reference/lambdaASIEmit.types
+++ b/tests/baselines/reference/lambdaASIEmit.types
@@ -1,19 +1,15 @@
 === tests/cases/compiler/lambdaASIEmit.ts ===
 
 function Foo(x: any)
->Foo : (x: any) => void
+>Foo : typeof Foo
 >x : any
 {
 }
  
 Foo(() =>
->Foo(() =>
-    // do something
-    127) : void
->Foo : (x: any) => void
->() =>
-    // do something
-    127 : () => number
+>Foo(() =>    // do something    127) : void
+>Foo : typeof Foo
+>() =>    // do something    127 : () => number
 
     // do something
     127);
diff --git a/tests/baselines/reference/listFailure.types b/tests/baselines/reference/listFailure.types
index de3c33bbfad..cd235e53986 100644
--- a/tests/baselines/reference/listFailure.types
+++ b/tests/baselines/reference/listFailure.types
@@ -10,7 +10,7 @@ module Editor {
 >List : List<T>
 >Line : Line
 >ListMakeHead<Line>() : List<Line>
->ListMakeHead : <U>() => List<U>
+>ListMakeHead : typeof ListMakeHead
 >Line : Line
         
         addLine(lineText: string): List<Line> {
@@ -41,7 +41,7 @@ module Editor {
     }
     
     export function ListRemoveEntry<U>(entry: List<U>): List<U> { 
->ListRemoveEntry : <U>(entry: List<U>) => List<U>
+>ListRemoveEntry : typeof ListRemoveEntry
 >U : U
 >entry : List<U>
 >List : List<T>
@@ -54,7 +54,7 @@ module Editor {
     }
 
     export function ListMakeHead<U>(): List<U> {
->ListMakeHead : <U>() => List<U>
+>ListMakeHead : typeof ListMakeHead
 >U : U
 >List : List<T>
 >U : U
@@ -63,7 +63,7 @@ module Editor {
     }
 
     export function ListMakeEntry<U>(data: U): List<U> {
->ListMakeEntry : <U>(data: U) => List<U>
+>ListMakeEntry : typeof ListMakeEntry
 >U : U
 >data : U
 >U : U
@@ -95,7 +95,7 @@ module Editor {
 >this : List<T>
 >next : List<T>
 >ListMakeEntry(data) : List<T>
->ListMakeEntry : <U>(data: U) => List<U>
+>ListMakeEntry : typeof ListMakeEntry
 >data : T
 
             return this.next;
@@ -115,7 +115,7 @@ module Editor {
             return (ListRemoveEntry(this.next));
 >(ListRemoveEntry(this.next)) : List<T>
 >ListRemoveEntry(this.next) : List<T>
->ListRemoveEntry : <U>(entry: List<U>) => List<U>
+>ListRemoveEntry : typeof ListRemoveEntry
 >this.next : List<T>
 >this : List<T>
 >next : List<T>
diff --git a/tests/baselines/reference/literals1.types b/tests/baselines/reference/literals1.types
index b7c5d672eea..f1d6736fdca 100644
--- a/tests/baselines/reference/literals1.types
+++ b/tests/baselines/reference/literals1.types
@@ -34,13 +34,10 @@ var k = 'q\tq';
 
 var m = /q/;
 >m : RegExp
->/q/ : RegExp
 
 var n = /\d+/g;
 >n : RegExp
->/\d+/g : RegExp
 
 var o = /[3-5]+/i;
 >o : RegExp
->/[3-5]+/i : RegExp
 
diff --git a/tests/baselines/reference/localImportNameVsGlobalName.types b/tests/baselines/reference/localImportNameVsGlobalName.types
index 7cb45208e81..6b920a25fe7 100644
--- a/tests/baselines/reference/localImportNameVsGlobalName.types
+++ b/tests/baselines/reference/localImportNameVsGlobalName.types
@@ -19,27 +19,27 @@ module App {
 >Key : Key
 
   export function foo(key: Key): void {}
->foo : (key: Key) => void
+>foo : typeof foo
 >key : Key
 >Key : Key
 
   foo(Key.UP);
 >foo(Key.UP) : void
->foo : (key: Key) => void
+>foo : typeof foo
 >Key.UP : Key
 >Key : typeof Key
 >UP : Key
 
   foo(Key.DOWN);
 >foo(Key.DOWN) : void
->foo : (key: Key) => void
+>foo : typeof foo
 >Key.DOWN : Key
 >Key : typeof Key
 >DOWN : Key
 
   foo(Key.LEFT);
 >foo(Key.LEFT) : void
->foo : (key: Key) => void
+>foo : typeof foo
 >Key.LEFT : Key
 >Key : typeof Key
 >LEFT : Key
diff --git a/tests/baselines/reference/localVariablesReturnedFromCatchBlocks.types b/tests/baselines/reference/localVariablesReturnedFromCatchBlocks.types
index 81ee0ddc74a..b18925989c4 100644
--- a/tests/baselines/reference/localVariablesReturnedFromCatchBlocks.types
+++ b/tests/baselines/reference/localVariablesReturnedFromCatchBlocks.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/localVariablesReturnedFromCatchBlocks.ts ===
 function f() {
->f : () => any
+>f : typeof f
 
     try {
     } catch (e) {
diff --git a/tests/baselines/reference/logicalAndOperatorWithTypeParameters.types b/tests/baselines/reference/logicalAndOperatorWithTypeParameters.types
index f77b231c6bc..711fca6c1e1 100644
--- a/tests/baselines/reference/logicalAndOperatorWithTypeParameters.types
+++ b/tests/baselines/reference/logicalAndOperatorWithTypeParameters.types
@@ -3,7 +3,7 @@
 // type as the second operand.
 
 function foo<T, U, V/* extends T*/>(t: T, u: U, v: V) {
->foo : <T, U, V>(t: T, u: U, v: V) => void
+>foo : typeof foo
 >T : T
 >U : U
 >V : V
diff --git a/tests/baselines/reference/logicalNotOperatorWithBooleanType.types b/tests/baselines/reference/logicalNotOperatorWithBooleanType.types
index e232ae2af80..d3c65cf8347 100644
--- a/tests/baselines/reference/logicalNotOperatorWithBooleanType.types
+++ b/tests/baselines/reference/logicalNotOperatorWithBooleanType.types
@@ -4,7 +4,7 @@ var BOOLEAN: boolean;
 >BOOLEAN : boolean
 
 function foo(): boolean { return true; }
->foo : () => boolean
+>foo : typeof foo
 
 class A {
 >A : A
@@ -13,7 +13,7 @@ class A {
 >a : boolean
 
     static foo() { return false; }
->foo : () => boolean
+>foo : typeof foo
 }
 module M {
 >M : typeof M
@@ -64,15 +64,15 @@ var ResultIsBoolean6 = !foo();
 >ResultIsBoolean6 : boolean
 >!foo() : boolean
 >foo() : boolean
->foo : () => boolean
+>foo : typeof foo
 
 var ResultIsBoolean7 = !A.foo();
 >ResultIsBoolean7 : boolean
 >!A.foo() : boolean
 >A.foo() : boolean
->A.foo : () => boolean
+>A.foo : typeof foo
 >A : typeof A
->foo : () => boolean
+>foo : typeof foo
 
 // multiple ! operators
 var ResultIsBoolean = !!BOOLEAN;
@@ -92,7 +92,7 @@ var ResultIsBoolean = !!BOOLEAN;
 !foo();
 >!foo() : boolean
 >foo() : boolean
->foo : () => boolean
+>foo : typeof foo
 
 !true, false;
 >!true, false : boolean
diff --git a/tests/baselines/reference/logicalNotOperatorWithNumberType.types b/tests/baselines/reference/logicalNotOperatorWithNumberType.types
index 4bcc8a14041..0e05d03eea7 100644
--- a/tests/baselines/reference/logicalNotOperatorWithNumberType.types
+++ b/tests/baselines/reference/logicalNotOperatorWithNumberType.types
@@ -8,7 +8,7 @@ var NUMBER1: number[] = [1, 2];
 >[1, 2] : number[]
 
 function foo(): number { return 1; }
->foo : () => number
+>foo : typeof foo
 
 class A {
 >A : A
@@ -17,7 +17,7 @@ class A {
 >a : number
 
     static foo() { return 1; }
->foo : () => number
+>foo : typeof foo
 }
 module M {
 >M : typeof M
@@ -89,15 +89,15 @@ var ResultIsBoolean9 = !foo();
 >ResultIsBoolean9 : boolean
 >!foo() : boolean
 >foo() : number
->foo : () => number
+>foo : typeof foo
 
 var ResultIsBoolean10 = !A.foo();
 >ResultIsBoolean10 : boolean
 >!A.foo() : boolean
 >A.foo() : number
->A.foo : () => number
+>A.foo : typeof foo
 >A : typeof A
->foo : () => number
+>foo : typeof foo
 
 var ResultIsBoolean11 = !(NUMBER + NUMBER);
 >ResultIsBoolean11 : boolean
@@ -139,7 +139,7 @@ var ResultIsBoolean13 = !!!(NUMBER + NUMBER);
 !foo();
 >!foo() : boolean
 >foo() : number
->foo : () => number
+>foo : typeof foo
 
 !objA.a;
 >!objA.a : boolean
diff --git a/tests/baselines/reference/logicalNotOperatorWithStringType.types b/tests/baselines/reference/logicalNotOperatorWithStringType.types
index 2decb1ade18..136d6628ddb 100644
--- a/tests/baselines/reference/logicalNotOperatorWithStringType.types
+++ b/tests/baselines/reference/logicalNotOperatorWithStringType.types
@@ -8,7 +8,7 @@ var STRING1: string[] = ["", "abc"];
 >["", "abc"] : string[]
 
 function foo(): string { return "abc"; }
->foo : () => string
+>foo : typeof foo
 
 class A {
 >A : A
@@ -17,7 +17,7 @@ class A {
 >a : string
 
     static foo() { return ""; }
->foo : () => string
+>foo : typeof foo
 }
 module M {
 >M : typeof M
@@ -89,15 +89,15 @@ var ResultIsBoolean9 = !foo();
 >ResultIsBoolean9 : boolean
 >!foo() : boolean
 >foo() : string
->foo : () => string
+>foo : typeof foo
 
 var ResultIsBoolean10 = !A.foo();
 >ResultIsBoolean10 : boolean
 >!A.foo() : boolean
 >A.foo() : string
->A.foo : () => string
+>A.foo : typeof foo
 >A : typeof A
->foo : () => string
+>foo : typeof foo
 
 var ResultIsBoolean11 = !(STRING + STRING);
 >ResultIsBoolean11 : boolean
@@ -147,7 +147,7 @@ var ResultIsBoolean14 = !!!(STRING + STRING);
 !foo();
 >!foo() : boolean
 >foo() : string
->foo : () => string
+>foo : typeof foo
 
 !objA.a,M.n;
 >!objA.a,M.n : string
diff --git a/tests/baselines/reference/logicalOrOperatorWithTypeParameters.types b/tests/baselines/reference/logicalOrOperatorWithTypeParameters.types
index ff0e0ce568a..374a7cdd5e9 100644
--- a/tests/baselines/reference/logicalOrOperatorWithTypeParameters.types
+++ b/tests/baselines/reference/logicalOrOperatorWithTypeParameters.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/expressions/binaryOperators/logicalOrOperator/logicalOrOperatorWithTypeParameters.ts ===
 function fn1<T, U>(t: T, u: U) {
->fn1 : <T, U>(t: T, u: U) => void
+>fn1 : typeof fn1
 >T : T
 >U : U
 >t : T
@@ -35,7 +35,7 @@ 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
+>fn2 : typeof fn2
 >T : T
 >U : U
 >V : V
@@ -82,7 +82,7 @@ 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
+>fn3 : typeof fn3
 >T : T
 >a : string
 >b : string
diff --git a/tests/baselines/reference/memberAccessMustUseModuleInstances.types b/tests/baselines/reference/memberAccessMustUseModuleInstances.types
index f549b4078f9..c1a7cc9d3f1 100644
--- a/tests/baselines/reference/memberAccessMustUseModuleInstances.types
+++ b/tests/baselines/reference/memberAccessMustUseModuleInstances.types
@@ -5,18 +5,18 @@ import WinJS = require('memberAccessMustUseModuleInstances_0');
 
 WinJS.Promise.timeout(10);
 >WinJS.Promise.timeout(10) : Promise
->WinJS.Promise.timeout : (delay: number) => Promise
+>WinJS.Promise.timeout : typeof timeout
 >WinJS.Promise : typeof Promise
 >WinJS : typeof "tests/cases/compiler/memberAccessMustUseModuleInstances_0"
 >Promise : typeof Promise
->timeout : (delay: number) => Promise
+>timeout : typeof timeout
 
 === tests/cases/compiler/memberAccessMustUseModuleInstances_0.ts ===
 export class Promise {
 >Promise : Promise
 
     static timeout(delay: number): Promise {
->timeout : (delay: number) => Promise
+>timeout : typeof timeout
 >delay : number
 >Promise : Promise
 
diff --git a/tests/baselines/reference/memberFunctionsWithPublicOverloads.types b/tests/baselines/reference/memberFunctionsWithPublicOverloads.types
index 7cbc2aca1ff..7dfd96d502e 100644
--- a/tests/baselines/reference/memberFunctionsWithPublicOverloads.types
+++ b/tests/baselines/reference/memberFunctionsWithPublicOverloads.types
@@ -35,34 +35,34 @@ class C {
 >y : any
 
     public static foo(x: number);
->foo : { (x: number): any; (x: number, y: string): any; }
+>foo : typeof foo
 >x : number
 
     public static foo(x: number, y: string);
->foo : { (x: number): any; (x: number, y: string): any; }
+>foo : typeof foo
 >x : number
 >y : string
 
     public static foo(x: any, y?: any) { }
->foo : { (x: number): any; (x: number, y: string): any; }
+>foo : typeof foo
 >x : any
 >y : any
 
     public static bar(x: 'hi');
->bar : { (x: 'hi'): any; (x: string): any; (x: number, y: string): any; }
+>bar : typeof bar
 >x : 'hi'
 
     public static bar(x: string);
->bar : { (x: 'hi'): any; (x: string): any; (x: number, y: string): any; }
+>bar : typeof bar
 >x : string
 
     public static bar(x: number, y: string);
->bar : { (x: 'hi'): any; (x: string): any; (x: number, y: string): any; }
+>bar : typeof bar
 >x : number
 >y : string
 
     public static bar(x: any, y?: any) { }
->bar : { (x: 'hi'): any; (x: string): any; (x: number, y: string): any; }
+>bar : typeof bar
 >x : any
 >y : any
 }
@@ -108,34 +108,34 @@ class D<T> {
 >y : any
 
     public static foo(x: number);
->foo : { (x: number): any; (x: number, y: string): any; }
+>foo : typeof foo
 >x : number
 
     public static foo(x: number, y: string);
->foo : { (x: number): any; (x: number, y: string): any; }
+>foo : typeof foo
 >x : number
 >y : string
 
     public static foo(x: any, y?: any) { }
->foo : { (x: number): any; (x: number, y: string): any; }
+>foo : typeof foo
 >x : any
 >y : any
 
     public static bar(x: 'hi');
->bar : { (x: 'hi'): any; (x: string): any; (x: number, y: string): any; }
+>bar : typeof bar
 >x : 'hi'
 
     public static bar(x: string);
->bar : { (x: 'hi'): any; (x: string): any; (x: number, y: string): any; }
+>bar : typeof bar
 >x : string
 
     public static bar(x: number, y: string);
->bar : { (x: 'hi'): any; (x: string): any; (x: number, y: string): any; }
+>bar : typeof bar
 >x : number
 >y : string
 
     public static bar(x: any, y?: any) { }
->bar : { (x: 'hi'): any; (x: string): any; (x: number, y: string): any; }
+>bar : typeof bar
 >x : any
 >y : any
 
diff --git a/tests/baselines/reference/mergedDeclarations1.types b/tests/baselines/reference/mergedDeclarations1.types
index d2b5cca6426..f4b6cfc6e4b 100644
--- a/tests/baselines/reference/mergedDeclarations1.types
+++ b/tests/baselines/reference/mergedDeclarations1.types
@@ -30,7 +30,7 @@ module point {
 >point : typeof point
 
     export function equals(p1: Point, p2: Point) {
->equals : (p1: Point, p2: Point) => boolean
+>equals : typeof equals
 >p1 : Point
 >Point : Point
 >p2 : Point
@@ -68,9 +68,9 @@ var p2 = point.origin;
 var b = point.equals(p1, p2);
 >b : boolean
 >point.equals(p1, p2) : boolean
->point.equals : (p1: Point, p2: Point) => boolean
+>point.equals : typeof equals
 >point : typeof point
->equals : (p1: Point, p2: Point) => boolean
+>equals : typeof equals
 >p1 : Point
 >p2 : Point
 
diff --git a/tests/baselines/reference/mergedModuleDeclarationCodeGen2.types b/tests/baselines/reference/mergedModuleDeclarationCodeGen2.types
index d27056b3bdd..7eb7b8f2ae4 100644
--- a/tests/baselines/reference/mergedModuleDeclarationCodeGen2.types
+++ b/tests/baselines/reference/mergedModuleDeclarationCodeGen2.types
@@ -5,20 +5,20 @@ module my.data.foo {
 >foo : typeof foo
 
     export function buz() { }
->buz : () => void
+>buz : typeof buz
 }
 module my.data {
 >my : typeof my
 >data : typeof data
 
     function data(my) {
->data : (my: any) => void
+>data : typeof data
 >my : any
 
         foo.buz();
 >foo.buz() : void
->foo.buz : () => void
+>foo.buz : typeof buz
 >foo : typeof foo
->buz : () => void
+>buz : typeof buz
     }
 }
diff --git a/tests/baselines/reference/mergedModuleDeclarationCodeGen3.types b/tests/baselines/reference/mergedModuleDeclarationCodeGen3.types
index 45f652fe3c0..2013d068571 100644
--- a/tests/baselines/reference/mergedModuleDeclarationCodeGen3.types
+++ b/tests/baselines/reference/mergedModuleDeclarationCodeGen3.types
@@ -4,7 +4,7 @@ module my.data {
 >data : typeof data
 
     export function buz() { }
->buz : () => void
+>buz : typeof buz
 }
 module my.data.foo {
 >my : typeof my
@@ -12,12 +12,12 @@ module my.data.foo {
 >foo : typeof foo
 
     function data(my, foo) {
->data : (my: any, foo: any) => void
+>data : typeof data
 >my : any
 >foo : any
 
         buz();
 >buz() : void
->buz : () => void
+>buz : typeof buz
     }
 }
diff --git a/tests/baselines/reference/mergedModuleDeclarationCodeGen4.types b/tests/baselines/reference/mergedModuleDeclarationCodeGen4.types
index 0907a21a969..aa0dfdb4762 100644
--- a/tests/baselines/reference/mergedModuleDeclarationCodeGen4.types
+++ b/tests/baselines/reference/mergedModuleDeclarationCodeGen4.types
@@ -13,7 +13,7 @@ module superContain {
 >data : typeof data
 
                 export function foo() { }
->foo : () => void
+>foo : typeof foo
             }
         }
         export module my.buz {
@@ -24,7 +24,7 @@ module superContain {
 >data : typeof data
 
                 export function bar(contain, my, buz, data) {
->bar : (contain: any, my: any, buz: any, data: any) => void
+>bar : typeof bar
 >contain : any
 >my : any
 >buz : any
@@ -32,7 +32,7 @@ module superContain {
 
                     foo();
 >foo() : void
->foo : () => void
+>foo : typeof foo
                 }
             }
         }
diff --git a/tests/baselines/reference/mergedModuleDeclarationCodeGen5.types b/tests/baselines/reference/mergedModuleDeclarationCodeGen5.types
index 344f052eb4c..0b835325cb9 100644
--- a/tests/baselines/reference/mergedModuleDeclarationCodeGen5.types
+++ b/tests/baselines/reference/mergedModuleDeclarationCodeGen5.types
@@ -5,10 +5,10 @@ module M.buz.plop {
 >plop : typeof plop
 
     export function doom() { }
->doom : () => void
+>doom : typeof doom
 
     export function M() { }
->M : () => void
+>M : typeof M
 }
 module M.buz.plop {
 >M : typeof M
@@ -16,10 +16,10 @@ module M.buz.plop {
 >plop : typeof plop
 
     function gunk() { }
->gunk : () => void
+>gunk : typeof gunk
 
     function buz() { }
->buz : () => void
+>buz : typeof buz
 
     export class fudge { }
 >fudge : fudge
@@ -29,20 +29,20 @@ module M.buz.plop {
 
     // Emit these references as follows
     var v1 = gunk; // gunk
->v1 : () => void
->gunk : () => void
+>v1 : typeof gunk
+>gunk : typeof gunk
 
     var v2 = buz; // buz
->v2 : () => void
->buz : () => void
+>v2 : typeof buz
+>buz : typeof buz
 
     export var v3 = doom; // _plop.doom
->v3 : () => void
->doom : () => void
+>v3 : typeof doom
+>doom : typeof doom
 
     export var v4 = M; // _plop.M
->v4 : () => void
->M : () => void
+>v4 : typeof M
+>M : typeof M
 
     export var v5 = fudge; // fudge
 >v5 : typeof fudge
diff --git a/tests/baselines/reference/methodContainingLocalFunction.types b/tests/baselines/reference/methodContainingLocalFunction.types
index 29d39cd9e19..fb52c3831ba 100644
--- a/tests/baselines/reference/methodContainingLocalFunction.types
+++ b/tests/baselines/reference/methodContainingLocalFunction.types
@@ -92,7 +92,7 @@ module M {
 >M : typeof M
 
     export function exhibitBug() {
->exhibitBug : () => void
+>exhibitBug : typeof exhibitBug
 
         function localFunction() { }
 >localFunction : () => void
@@ -112,24 +112,9 @@ enum E {
 
     A = (() => {
 >A : E
->(() => {
-        function localFunction() { }
-        var x: { (): void; };
-        x = localFunction;
-        return 0;
-    })() : number
->(() => {
-        function localFunction() { }
-        var x: { (): void; };
-        x = localFunction;
-        return 0;
-    }) : () => number
->() => {
-        function localFunction() { }
-        var x: { (): void; };
-        x = localFunction;
-        return 0;
-    } : () => number
+>(() => {        function localFunction() { }        var x: { (): void; };        x = localFunction;        return 0;    })() : number
+>(() => {        function localFunction() { }        var x: { (): void; };        x = localFunction;        return 0;    }) : () => number
+>() => {        function localFunction() { }        var x: { (): void; };        x = localFunction;        return 0;    } : () => number
 
         function localFunction() { }
 >localFunction : () => void
diff --git a/tests/baselines/reference/missingRequiredDeclare.d.errors.txt b/tests/baselines/reference/missingRequiredDeclare.d.errors.txt
new file mode 100644
index 00000000000..932512ba8d8
--- /dev/null
+++ b/tests/baselines/reference/missingRequiredDeclare.d.errors.txt
@@ -0,0 +1,6 @@
+==== tests/cases/compiler/missingRequiredDeclare.d.ts (2 errors) ====
+    var x = 1;
+    ~~~
+!!! A 'declare' modifier is required for a top level declaration in a .d.ts file.
+          ~
+!!! Initializers are not allowed in ambient contexts.
\ No newline at end of file
diff --git a/tests/baselines/reference/mixedExports.js b/tests/baselines/reference/mixedExports.js
deleted file mode 100644
index 1e99ad3c720..00000000000
--- a/tests/baselines/reference/mixedExports.js
+++ /dev/null
@@ -1,19 +0,0 @@
-//// [mixedExports.ts]
-declare module M {
-     function foo();
-     export function foo();
-     function foo();
-}
-
-declare module M1 {
-     export interface Foo {}
-     interface Foo {}
-}
-
-module A {
-     interface X {x}
-     export module X {}
-     interface X {y}
-}
-
-//// [mixedExports.js]
diff --git a/tests/baselines/reference/mixedExports.types b/tests/baselines/reference/mixedExports.types
deleted file mode 100644
index c9448423cb9..00000000000
--- a/tests/baselines/reference/mixedExports.types
+++ /dev/null
@@ -1,38 +0,0 @@
-=== tests/cases/compiler/mixedExports.ts ===
-declare module M {
->M : typeof M
-
-     function foo();
->foo : { (): any; (): any; (): any; }
-
-     export function foo();
->foo : { (): any; (): any; (): any; }
-
-     function foo();
->foo : { (): any; (): any; (): any; }
-}
-
-declare module M1 {
->M1 : M1
-
-     export interface Foo {}
->Foo : Foo
-
-     interface Foo {}
->Foo : Foo
-}
-
-module A {
->A : A
-
-     interface X {x}
->X : X
->x : any
-
-     export module X {}
->X : X
-
-     interface X {y}
->X : X
->y : any
-}
diff --git a/tests/baselines/reference/modFunctionCrash.types b/tests/baselines/reference/modFunctionCrash.types
index 596dac999a1..0bbeb588c7e 100644
--- a/tests/baselines/reference/modFunctionCrash.types
+++ b/tests/baselines/reference/modFunctionCrash.types
@@ -3,16 +3,16 @@ declare module Q {
 >Q : typeof Q
 
     function f(fn:()=>void); // typechecking the function type shouldnot crash the compiler
->f : (fn: () => void) => any
+>f : typeof f
 >fn : () => void
 }
 
 
 Q.f(function() {this;});
 >Q.f(function() {this;}) : any
->Q.f : (fn: () => void) => any
+>Q.f : typeof f
 >Q : typeof Q
->f : (fn: () => void) => any
+>f : typeof f
 >function() {this;} : () => void
 >this : any
 
diff --git a/tests/baselines/reference/moduleAliasAsFunctionArgument.types b/tests/baselines/reference/moduleAliasAsFunctionArgument.types
index 15954c681e7..bb9bda32376 100644
--- a/tests/baselines/reference/moduleAliasAsFunctionArgument.types
+++ b/tests/baselines/reference/moduleAliasAsFunctionArgument.types
@@ -4,7 +4,7 @@ import a = require('moduleAliasAsFunctionArgument_0');
 >a : typeof "tests/cases/compiler/moduleAliasAsFunctionArgument_0"
 
 function fn(arg: { x: number }) {
->fn : (arg: { x: number; }) => void
+>fn : typeof fn
 >arg : { x: number; }
 >x : number
 }
@@ -16,7 +16,7 @@ a.x; // OK
 
 fn(a); // Error: property 'x' is missing from 'a'
 >fn(a) : void
->fn : (arg: { x: number; }) => void
+>fn : typeof fn
 >a : typeof "tests/cases/compiler/moduleAliasAsFunctionArgument_0"
 
 === tests/cases/compiler/moduleAliasAsFunctionArgument_0.ts ===
diff --git a/tests/baselines/reference/moduleCodeGenTest5.types b/tests/baselines/reference/moduleCodeGenTest5.types
index 40161509aff..57f7b7e45e1 100644
--- a/tests/baselines/reference/moduleCodeGenTest5.types
+++ b/tests/baselines/reference/moduleCodeGenTest5.types
@@ -6,10 +6,10 @@ var y = 0;
 >y : number
 
 export function f1() {}
->f1 : () => void
+>f1 : typeof f1
 
 function f2() {}
->f2 : () => void
+>f2 : typeof f2
 
 export class C1 {
 >C1 : C1
diff --git a/tests/baselines/reference/moduleMemberWithoutTypeAnnotation1.types b/tests/baselines/reference/moduleMemberWithoutTypeAnnotation1.types
index d8f6083b2c9..aea08c53613 100644
--- a/tests/baselines/reference/moduleMemberWithoutTypeAnnotation1.types
+++ b/tests/baselines/reference/moduleMemberWithoutTypeAnnotation1.types
@@ -34,9 +34,9 @@ module TypeScript {
 
             return Syntax.childIndex();
 >Syntax.childIndex() : void
->Syntax.childIndex : () => void
+>Syntax.childIndex : typeof childIndex
 >Syntax : typeof Syntax
->childIndex : () => void
+>childIndex : typeof childIndex
         }
     }
 
@@ -91,7 +91,7 @@ module TypeScript.Syntax {
 >Syntax : typeof Syntax
 
     export function childIndex() { }
->childIndex : () => void
+>childIndex : typeof childIndex
 
     export class VariableWidthTokenWithTrailingTrivia implements ISyntaxToken {
 >VariableWidthTokenWithTrailingTrivia : VariableWidthTokenWithTrailingTrivia
diff --git a/tests/baselines/reference/moduleMemberWithoutTypeAnnotation2.types b/tests/baselines/reference/moduleMemberWithoutTypeAnnotation2.types
index 2a5d2c76e76..3a1c0b07d92 100644
--- a/tests/baselines/reference/moduleMemberWithoutTypeAnnotation2.types
+++ b/tests/baselines/reference/moduleMemberWithoutTypeAnnotation2.types
@@ -17,7 +17,7 @@ module TypeScript {
 >diagnosticWriter : any
 
         export function Alert(output: string) {
->Alert : (output: string) => void
+>Alert : typeof Alert
 >output : string
 
             if (diagnosticWriter) {
diff --git a/tests/baselines/reference/moduleScopingBug.types b/tests/baselines/reference/moduleScopingBug.types
index b92b8de0c81..00cd06d076c 100644
--- a/tests/baselines/reference/moduleScopingBug.types
+++ b/tests/baselines/reference/moduleScopingBug.types
@@ -8,7 +8,7 @@ module M
 >outer : number
 
     function f() {
->f : () => void
+>f : typeof f
 
         var inner = outer;   // Ok
 >inner : number
diff --git a/tests/baselines/reference/moduleSymbolMerging.types b/tests/baselines/reference/moduleSymbolMerging.types
deleted file mode 100644
index 29354592a42..00000000000
--- a/tests/baselines/reference/moduleSymbolMerging.types
+++ /dev/null
@@ -1,21 +0,0 @@
-=== tests/cases/compiler/B.ts ===
-///<reference path="A.ts" />
-module A { ; }
->A : typeof A
-
-module B {
->B : typeof B
-
-	export function f(): A.I { return null; }
->f : () => I
->A : A
->I : I
-}
-
-
-=== tests/cases/compiler/A.ts ===
-
-module A { export interface I {} }
->A : typeof A
->I : I
-
diff --git a/tests/baselines/reference/moduleUnassignedVariable.types b/tests/baselines/reference/moduleUnassignedVariable.types
index 7d1dd8600cf..c4eeecbf39f 100644
--- a/tests/baselines/reference/moduleUnassignedVariable.types
+++ b/tests/baselines/reference/moduleUnassignedVariable.types
@@ -6,14 +6,14 @@ module Bar {
 >a : number
 
     function fooA() { return a; } // Correct: return Bar.a
->fooA : () => number
+>fooA : typeof fooA
 >a : number
 
     export var b;
 >b : any
 
     function fooB() { return b; } // Incorrect: return b
->fooB : () => any
+>fooB : typeof fooB
 >b : any
 }
 
diff --git a/tests/baselines/reference/moduleVisibilityTest1.types b/tests/baselines/reference/moduleVisibilityTest1.types
index 0f266892351..3c450978d55 100644
--- a/tests/baselines/reference/moduleVisibilityTest1.types
+++ b/tests/baselines/reference/moduleVisibilityTest1.types
@@ -5,14 +5,14 @@ module OuterMod {
 >OuterMod : typeof OuterMod
 
 	export function someExportedOuterFunc() { return -1; }
->someExportedOuterFunc : () => number
+>someExportedOuterFunc : typeof someExportedOuterFunc
 >-1 : number
 
 	export module OuterInnerMod {
 >OuterInnerMod : typeof OuterInnerMod
 
 		export function someExportedOuterInnerFunc() { return "foo"; }
->someExportedOuterInnerFunc : () => string
+>someExportedOuterInnerFunc : typeof someExportedOuterInnerFunc
 	}
 }
 
@@ -28,7 +28,7 @@ module M {
 >InnerMod : typeof InnerMod
 
 		export function someExportedInnerFunc() { return -2; }
->someExportedInnerFunc : () => number
+>someExportedInnerFunc : typeof someExportedInnerFunc
 >-2 : number
 	}
 
@@ -76,23 +76,23 @@ module M {
 		public someMethodThatCallsAnOuterMethod() {return OuterInnerAlias.someExportedOuterInnerFunc();}
 >someMethodThatCallsAnOuterMethod : () => string
 >OuterInnerAlias.someExportedOuterInnerFunc() : string
->OuterInnerAlias.someExportedOuterInnerFunc : () => string
+>OuterInnerAlias.someExportedOuterInnerFunc : typeof someExportedOuterInnerFunc
 >OuterInnerAlias : typeof OuterInnerMod
->someExportedOuterInnerFunc : () => string
+>someExportedOuterInnerFunc : typeof someExportedOuterInnerFunc
 
 		public someMethodThatCallsAnInnerMethod() {return InnerMod.someExportedInnerFunc();}
 >someMethodThatCallsAnInnerMethod : () => number
 >InnerMod.someExportedInnerFunc() : number
->InnerMod.someExportedInnerFunc : () => number
+>InnerMod.someExportedInnerFunc : typeof someExportedInnerFunc
 >InnerMod : typeof InnerMod
->someExportedInnerFunc : () => number
+>someExportedInnerFunc : typeof someExportedInnerFunc
 
 		public someMethodThatCallsAnOuterInnerMethod() {return OuterMod.someExportedOuterFunc();}
 >someMethodThatCallsAnOuterInnerMethod : () => number
 >OuterMod.someExportedOuterFunc() : number
->OuterMod.someExportedOuterFunc : () => number
+>OuterMod.someExportedOuterFunc : typeof someExportedOuterFunc
 >OuterMod : typeof OuterMod
->someExportedOuterFunc : () => number
+>someExportedOuterFunc : typeof someExportedOuterFunc
 
 		public someMethod() { return 0; }
 >someMethod : () => number
@@ -113,7 +113,7 @@ module M {
 >someModuleVar : number
 
 	function someModuleFunction() { return 5;}
->someModuleFunction : () => number
+>someModuleFunction : typeof someModuleFunction
 }
 
 module M {
diff --git a/tests/baselines/reference/moduleWithStatementsOfEveryKind.types b/tests/baselines/reference/moduleWithStatementsOfEveryKind.types
index 1855f6eb587..2e1860fc2c9 100644
--- a/tests/baselines/reference/moduleWithStatementsOfEveryKind.types
+++ b/tests/baselines/reference/moduleWithStatementsOfEveryKind.types
@@ -47,7 +47,7 @@ module A {
 >x : number
 
     function F(s: string): number {
->F : (s: string) => number
+>F : typeof F
 >s : string
 
         return 2;
@@ -58,9 +58,7 @@ module A {
 
     var fn = (s: string) => {
 >fn : (s: string) => string
->(s: string) => {
-        return 'hello ' + s;
-    } : (s: string) => string
+>(s: string) => {        return 'hello ' + s;    } : (s: string) => string
 >s : string
 
         return 'hello ' + s;
@@ -123,7 +121,7 @@ module Y {
 >x : number
 
     export function F(s: string): number {
->F : (s: string) => number
+>F : typeof F
 >s : string
 
         return 2;
@@ -134,9 +132,7 @@ module Y {
 
     export var fn = (s: string) => {
 >fn : (s: string) => string
->(s: string) => {
-        return 'hello ' + s;
-    } : (s: string) => string
+>(s: string) => {        return 'hello ' + s;    } : (s: string) => string
 >s : string
 
         return 'hello ' + s;
diff --git a/tests/baselines/reference/multiCallOverloads.types b/tests/baselines/reference/multiCallOverloads.types
index 8c789510580..effde837b3c 100644
--- a/tests/baselines/reference/multiCallOverloads.types
+++ b/tests/baselines/reference/multiCallOverloads.types
@@ -7,7 +7,7 @@ interface ICallback {
 }
 
 function load(f: ICallback) {}
->load : (f: ICallback) => void
+>load : typeof load
 >f : ICallback
 >ICallback : ICallback
 
@@ -25,22 +25,22 @@ var f2: ICallback = function(z?) {}
 
 load(f1) // ok
 >load(f1) : void
->load : (f: ICallback) => void
+>load : typeof load
 >f1 : ICallback
 
 load(f2) // ok
 >load(f2) : void
->load : (f: ICallback) => void
+>load : typeof load
 >f2 : ICallback
 
 load(function() {}) // this shouldn’t be an error
 >load(function() {}) : void
->load : (f: ICallback) => void
+>load : typeof load
 >function() {} : () => void
 
 load(function(z?) {}) // this shouldn't be an error
 >load(function(z?) {}) : void
->load : (f: ICallback) => void
+>load : typeof load
 >function(z?) {} : (z?: string) => void
 >z : string
 
diff --git a/tests/baselines/reference/multiImportExport.errors.txt b/tests/baselines/reference/multiImportExport.errors.txt
new file mode 100644
index 00000000000..6237131d641
--- /dev/null
+++ b/tests/baselines/reference/multiImportExport.errors.txt
@@ -0,0 +1,26 @@
+==== tests/cases/compiler/consumer.ts (0 errors) ====
+    import Drawing = require('./Drawing');
+    var addr = new Drawing.Math.Adder();
+    
+==== tests/cases/compiler/Drawing.ts (0 errors) ====
+    export import Math = require('Math/Math')
+    
+==== tests/cases/compiler/Math/Math.ts (0 errors) ====
+    import Adder = require('Math/Adder');
+    
+    var Math = {
+        Adder:Adder
+    };
+    
+    export = Math
+    
+==== tests/cases/compiler/Math/Adder.ts (1 errors) ====
+    class Adder {
+        add(a: number, b: number) {
+            
+        }
+    }
+    
+    export = Adder;
+    ~~~~~~~~~~~~~~~
+!!! Cannot compile external modules unless the '--module' flag is provided.
\ No newline at end of file
diff --git a/tests/baselines/reference/multiImportExport.js b/tests/baselines/reference/multiImportExport.js
deleted file mode 100644
index 06d81f7e984..00000000000
--- a/tests/baselines/reference/multiImportExport.js
+++ /dev/null
@@ -1,63 +0,0 @@
-//// [tests/cases/compiler/multiImportExport.ts] ////
-
-//// [consumer.ts]
-import Drawing = require('./Drawing');
-var addr = new Drawing.Math.Adder();
-
-//// [Drawing.ts]
-export import Math = require('Math/Math')
-
-//// [Math.ts]
-import Adder = require('Math/Adder');
-
-var Math = {
-    Adder:Adder
-};
-
-export = Math
-
-//// [Adder.ts]
-class Adder {
-    add(a: number, b: number) {
-        
-    }
-}
-
-export = Adder;
-
-//// [Adder.js]
-var Adder = (function () {
-    function Adder() {
-    }
-    Adder.prototype.add = function (a, b) {
-    };
-    return Adder;
-})();
-module.exports = Adder;
-//// [Math.js]
-var Adder = require('Math/Adder');
-var Math = {
-    Adder: Adder
-};
-module.exports = Math;
-//// [Drawing.js]
-exports.Math = require('Math/Math');
-//// [consumer.js]
-var Drawing = require('./Drawing');
-var addr = new Drawing.Math.Adder();
-
-
-//// [Adder.d.ts]
-declare class Adder {
-    add(a: number, b: number): void;
-}
-export = Adder;
-//// [Math.d.ts]
-import Adder = require('Math/Adder');
-declare var Math: {
-    Adder: typeof Adder;
-};
-export = Math;
-//// [Drawing.d.ts]
-export import Math = require('Math/Math');
-//// [consumer.d.ts]
diff --git a/tests/baselines/reference/multiImportExport.types b/tests/baselines/reference/multiImportExport.types
deleted file mode 100644
index 1504fda69d3..00000000000
--- a/tests/baselines/reference/multiImportExport.types
+++ /dev/null
@@ -1,51 +0,0 @@
-=== tests/cases/compiler/consumer.ts ===
-import Drawing = require('./Drawing');
->Drawing : typeof "tests/cases/compiler/Drawing"
-
-var addr = new Drawing.Math.Adder();
->addr : Adder
->new Drawing.Math.Adder() : Adder
->Drawing.Math.Adder : typeof Adder
->Drawing.Math : { Adder: typeof Adder; }
->Drawing : typeof "tests/cases/compiler/Drawing"
->Math : { Adder: typeof Adder; }
->Adder : typeof Adder
-
-=== tests/cases/compiler/Drawing.ts ===
-export import Math = require('Math/Math')
->Math : { Adder: typeof Adder; }
-
-=== tests/cases/compiler/Math/Math.ts ===
-import Adder = require('Math/Adder');
->Adder : typeof Adder
-
-var Math = {
->Math : { Adder: typeof Adder; }
->{
-    Adder:Adder
-} : { Adder: typeof Adder; }
-
-    Adder:Adder
->Adder : typeof Adder
->Adder : Adder
-
-};
-
-export = Math
->Math : { Adder: typeof Adder; }
-
-=== tests/cases/compiler/Math/Adder.ts ===
-class Adder {
->Adder : Adder
-
-    add(a: number, b: number) {
->add : (a: number, b: number) => void
->a : number
->b : number
-        
-    }
-}
-
-export = Adder;
->Adder : Adder
-
diff --git a/tests/baselines/reference/multiModuleClodule1.types b/tests/baselines/reference/multiModuleClodule1.types
index f7379e33173..6d1b7b600a9 100644
--- a/tests/baselines/reference/multiModuleClodule1.types
+++ b/tests/baselines/reference/multiModuleClodule1.types
@@ -12,7 +12,7 @@ class C {
 >bar : () => void
 
     static boo() { }
->boo : () => void
+>boo : typeof boo
 }
 
 module C {
@@ -28,10 +28,10 @@ module C {
 >C : typeof C
 
     export function foo() { }
->foo : () => void
+>foo : typeof foo
 
     function baz() { return ''; }
->baz : () => string
+>baz : typeof baz
 }
 
 var c = new C(C.x);
@@ -43,11 +43,11 @@ var c = new C(C.x);
 >x : number
 
 c.foo = C.foo;
->c.foo = C.foo : () => void
+>c.foo = C.foo : typeof foo
 >c.foo : () => void
 >c : C
 >foo : () => void
->C.foo : () => void
+>C.foo : typeof foo
 >C : typeof C
->foo : () => void
+>foo : typeof foo
 
diff --git a/tests/baselines/reference/multiModuleFundule1.types b/tests/baselines/reference/multiModuleFundule1.types
index c78a195f4b1..1e6f125fd3e 100644
--- a/tests/baselines/reference/multiModuleFundule1.types
+++ b/tests/baselines/reference/multiModuleFundule1.types
@@ -13,7 +13,7 @@ module C {
 >C : typeof C
 
     export function foo() { }
->foo : () => void
+>foo : typeof foo
 }
 
 var r = C(2);
@@ -29,7 +29,7 @@ var r2 = new C(2); // using void returning function as constructor
 var r3 = C.foo();
 >r3 : void
 >C.foo() : void
->C.foo : () => void
+>C.foo : typeof foo
 >C : typeof C
->foo : () => void
+>foo : typeof foo
 
diff --git a/tests/baselines/reference/mutrec.types b/tests/baselines/reference/mutrec.types
index 6c147174484..602c6209be7 100644
--- a/tests/baselines/reference/mutrec.types
+++ b/tests/baselines/reference/mutrec.types
@@ -16,7 +16,7 @@ interface B {
 }
 
 function f(p: A) { return p };
->f : (p: A) => A
+>f : typeof f
 >p : A
 >A : A
 >p : A
@@ -27,7 +27,7 @@ var b:B;
 
 f(b);
 >f(b) : A
->f : (p: A) => A
+>f : typeof f
 >b : B
 
 interface I1 {
@@ -55,7 +55,7 @@ interface I3 {
 }
 
 function g(p: I1) { return p };
->g : (p: I1) => I1
+>g : typeof g
 >p : I1
 >I1 : I1
 >p : I1
@@ -66,7 +66,7 @@ var i2:I2;
 
 g(i2);
 >g(i2) : I1
->g : (p: I1) => I1
+>g : typeof g
 >i2 : I2
 
 var i3:I3;
@@ -75,7 +75,7 @@ var i3:I3;
 
 g(i3);
 >g(i3) : I1
->g : (p: I1) => I1
+>g : typeof g
 >i3 : I3
 
 interface I4 {
@@ -100,7 +100,7 @@ var i4:I4;
 
 g(i4);
 >g(i4) : I1
->g : (p: I1) => I1
+>g : typeof g
 >i4 : I4
 
 
diff --git a/tests/baselines/reference/nameCollisionsInPropertyAssignments.js b/tests/baselines/reference/nameCollisionsInPropertyAssignments.js
deleted file mode 100644
index 3035ab6e628..00000000000
--- a/tests/baselines/reference/nameCollisionsInPropertyAssignments.js
+++ /dev/null
@@ -1,9 +0,0 @@
-//// [nameCollisionsInPropertyAssignments.ts]
-var x = 1
-var y = { x() { x++; } }; 
-
-//// [nameCollisionsInPropertyAssignments.js]
-var x = 1;
-var y = { x: function () {
-    x++;
-} };
diff --git a/tests/baselines/reference/nameCollisionsInPropertyAssignments.types b/tests/baselines/reference/nameCollisionsInPropertyAssignments.types
deleted file mode 100644
index 1628b673621..00000000000
--- a/tests/baselines/reference/nameCollisionsInPropertyAssignments.types
+++ /dev/null
@@ -1,12 +0,0 @@
-=== tests/cases/compiler/nameCollisionsInPropertyAssignments.ts ===
-var x = 1
->x : number
-
-var y = { x() { x++; } }; 
->y : { x: () => void; }
->{ x() { x++; } } : { x: () => void; }
->x : () => void
->x() { x++; } : () => void
->x++ : number
->x : number
-
diff --git a/tests/baselines/reference/nameWithRelativePaths.types b/tests/baselines/reference/nameWithRelativePaths.types
index c20c4bc152d..4e438711548 100644
--- a/tests/baselines/reference/nameWithRelativePaths.types
+++ b/tests/baselines/reference/nameWithRelativePaths.types
@@ -22,9 +22,9 @@ if(foo2.M2.x){
 >foo0 : typeof "tests/cases/conformance/externalModules/foo_0"
 >foo : number
 >foo1.f() : number
->foo1.f : () => number
+>foo1.f : typeof f
 >foo1 : typeof "tests/cases/conformance/externalModules/test/test/foo_1"
->f : () => number
+>f : typeof f
 }
 
 === tests/cases/conformance/externalModules/foo_0.ts ===
@@ -33,7 +33,7 @@ export var foo = 42;
 
 === tests/cases/conformance/externalModules/test/test/foo_1.ts ===
 export function f(){
->f : () => number
+>f : typeof f
 
 	return 42;
 }
diff --git a/tests/baselines/reference/namedFunctionExpressionAssignedToClassProperty.types b/tests/baselines/reference/namedFunctionExpressionAssignedToClassProperty.types
index 870734b0c6e..49ba563379e 100644
--- a/tests/baselines/reference/namedFunctionExpressionAssignedToClassProperty.types
+++ b/tests/baselines/reference/namedFunctionExpressionAssignedToClassProperty.types
@@ -4,9 +4,7 @@ class Foo{
 
        a = function bar(){
 >a : () => void
->function bar(){
-
-       } : () => void
+>function bar(){       } : () => void
 >bar : () => void
 
        }; // this shouldn't crash the compiler...
diff --git a/tests/baselines/reference/namedFunctionExpressionCall.types b/tests/baselines/reference/namedFunctionExpressionCall.types
index 2f36c07f7d7..018cf64afcd 100644
--- a/tests/baselines/reference/namedFunctionExpressionCall.types
+++ b/tests/baselines/reference/namedFunctionExpressionCall.types
@@ -1,13 +1,7 @@
 === tests/cases/compiler/namedFunctionExpressionCall.ts ===
 var recurser = function foo() {
 >recurser : any
->function foo() {
-    // using the local name
-    foo();
-
-    // using the globally visible name
-    recurser();
-} : () => void
+>function foo() {    // using the local name    foo();    // using the globally visible name    recurser();} : () => void
 >foo : () => void
 
     // using the local name
@@ -24,12 +18,8 @@ var recurser = function foo() {
 
 
 (function bar() {
->(function bar() {
-    bar();
-}) : () => void
->function bar() {
-    bar();
-} : () => void
+>(function bar() {    bar();}) : () => void
+>function bar() {    bar();} : () => void
 >bar : () => void
 
     bar();
diff --git a/tests/baselines/reference/namedFunctionExpressionInModule.types b/tests/baselines/reference/namedFunctionExpressionInModule.types
index 4898b2cbc1e..9643d9ca069 100644
--- a/tests/baselines/reference/namedFunctionExpressionInModule.types
+++ b/tests/baselines/reference/namedFunctionExpressionInModule.types
@@ -4,8 +4,7 @@ module Variables{
 
     var x = function bar(a, b, c) {
 >x : (a: any, b: any, c: any) => void
->function bar(a, b, c) {
-    } : (a: any, b: any, c: any) => void
+>function bar(a, b, c) {    } : (a: any, b: any, c: any) => void
 >bar : (a: any, b: any, c: any) => void
 >a : any
 >b : any
diff --git a/tests/baselines/reference/negateOperatorWithAnyOtherType.types b/tests/baselines/reference/negateOperatorWithAnyOtherType.types
index 8785ab073b2..a44027aefc3 100644
--- a/tests/baselines/reference/negateOperatorWithAnyOtherType.types
+++ b/tests/baselines/reference/negateOperatorWithAnyOtherType.types
@@ -22,7 +22,7 @@ var obj1 = { x: "", y: () => { }};
 >() => { } : () => void
 
 function foo(): any {
->foo : () => any
+>foo : typeof foo
 
     var a;
 >a : any
@@ -37,7 +37,7 @@ class A {
 >a : any
 
     static foo() {
->foo : () => any
+>foo : typeof foo
 
         var a;
 >a : any
@@ -137,15 +137,15 @@ var ResultIsNumber13 = -foo();
 >ResultIsNumber13 : number
 >-foo() : number
 >foo() : any
->foo : () => any
+>foo : typeof foo
 
 var ResultIsNumber14 = -A.foo();
 >ResultIsNumber14 : number
 >-A.foo() : number
 >A.foo() : any
->A.foo : () => any
+>A.foo : typeof foo
 >A : typeof A
->foo : () => any
+>foo : typeof foo
 
 var ResultIsNumber15 = -(ANY - ANY1);
 >ResultIsNumber15 : number
diff --git a/tests/baselines/reference/negateOperatorWithBooleanType.types b/tests/baselines/reference/negateOperatorWithBooleanType.types
index 49467d87845..41d993b64ca 100644
--- a/tests/baselines/reference/negateOperatorWithBooleanType.types
+++ b/tests/baselines/reference/negateOperatorWithBooleanType.types
@@ -4,7 +4,7 @@ var BOOLEAN: boolean;
 >BOOLEAN : boolean
 
 function foo(): boolean { return true; }
->foo : () => boolean
+>foo : typeof foo
 
 class A {
 >A : A
@@ -13,7 +13,7 @@ class A {
 >a : boolean
 
     static foo() { return false; }
->foo : () => boolean
+>foo : typeof foo
 }
 module M {
 >M : typeof M
@@ -64,15 +64,15 @@ var ResultIsNumber6 = -foo();
 >ResultIsNumber6 : number
 >-foo() : number
 >foo() : boolean
->foo : () => boolean
+>foo : typeof foo
 
 var ResultIsNumber7 = -A.foo();
 >ResultIsNumber7 : number
 >-A.foo() : number
 >A.foo() : boolean
->A.foo : () => boolean
+>A.foo : typeof foo
 >A : typeof A
->foo : () => boolean
+>foo : typeof foo
 
 // miss assignment operators
 -true;
@@ -85,7 +85,7 @@ var ResultIsNumber7 = -A.foo();
 -foo();
 >-foo() : number
 >foo() : boolean
->foo : () => boolean
+>foo : typeof foo
 
 -true, false;
 >-true, false : boolean
diff --git a/tests/baselines/reference/negateOperatorWithNumberType.types b/tests/baselines/reference/negateOperatorWithNumberType.types
index f6cee89f6df..f6c60179f5e 100644
--- a/tests/baselines/reference/negateOperatorWithNumberType.types
+++ b/tests/baselines/reference/negateOperatorWithNumberType.types
@@ -8,7 +8,7 @@ var NUMBER1: number[] = [1, 2];
 >[1, 2] : number[]
 
 function foo(): number { return 1; }
->foo : () => number
+>foo : typeof foo
 
 class A {
 >A : A
@@ -17,7 +17,7 @@ class A {
 >a : number
 
     static foo() { return 1; }
->foo : () => number
+>foo : typeof foo
 }
 module M {
 >M : typeof M
@@ -89,15 +89,15 @@ var ResultIsNumber9 = -foo();
 >ResultIsNumber9 : number
 >-foo() : number
 >foo() : number
->foo : () => number
+>foo : typeof foo
 
 var ResultIsNumber10 = -A.foo();
 >ResultIsNumber10 : number
 >-A.foo() : number
 >A.foo() : number
->A.foo : () => number
+>A.foo : typeof foo
 >A : typeof A
->foo : () => number
+>foo : typeof foo
 
 var ResultIsNumber11 = -(NUMBER - NUMBER);
 >ResultIsNumber11 : number
@@ -122,7 +122,7 @@ var ResultIsNumber11 = -(NUMBER - NUMBER);
 -foo();
 >-foo() : number
 >foo() : number
->foo : () => number
+>foo : typeof foo
 
 -objA.a;
 >-objA.a : number
diff --git a/tests/baselines/reference/negateOperatorWithStringType.types b/tests/baselines/reference/negateOperatorWithStringType.types
index 43a9f05cc5b..5baec327f8e 100644
--- a/tests/baselines/reference/negateOperatorWithStringType.types
+++ b/tests/baselines/reference/negateOperatorWithStringType.types
@@ -8,7 +8,7 @@ var STRING1: string[] = ["", "abc"];
 >["", "abc"] : string[]
 
 function foo(): string { return "abc"; }
->foo : () => string
+>foo : typeof foo
 
 class A {
 >A : A
@@ -17,7 +17,7 @@ class A {
 >a : string
 
     static foo() { return ""; }
->foo : () => string
+>foo : typeof foo
 }
 module M {
 >M : typeof M
@@ -89,15 +89,15 @@ var ResultIsNumber9 = -foo();
 >ResultIsNumber9 : number
 >-foo() : number
 >foo() : string
->foo : () => string
+>foo : typeof foo
 
 var ResultIsNumber10 = -A.foo();
 >ResultIsNumber10 : number
 >-A.foo() : number
 >A.foo() : string
->A.foo : () => string
+>A.foo : typeof foo
 >A : typeof A
->foo : () => string
+>foo : typeof foo
 
 var ResultIsNumber11 = -(STRING + STRING);
 >ResultIsNumber11 : number
@@ -130,7 +130,7 @@ var ResultIsNumber12 = -STRING.charAt(0);
 -foo();
 >-foo() : number
 >foo() : string
->foo : () => string
+>foo : typeof foo
 
 -objA.a,M.n;
 >-objA.a,M.n : string
diff --git a/tests/baselines/reference/nestedIndexer.types b/tests/baselines/reference/nestedIndexer.types
index 612f6a260b7..5511f322fd7 100644
--- a/tests/baselines/reference/nestedIndexer.types
+++ b/tests/baselines/reference/nestedIndexer.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/nestedIndexer.ts ===
 function then(x) {
->then : (x: any) => void
+>then : typeof then
 >x : any
 
 var match: { [index: number]: string; }
diff --git a/tests/baselines/reference/nestedRecursiveLambda.types b/tests/baselines/reference/nestedRecursiveLambda.types
index 358ebda8abf..160204cb772 100644
--- a/tests/baselines/reference/nestedRecursiveLambda.types
+++ b/tests/baselines/reference/nestedRecursiveLambda.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/nestedRecursiveLambda.ts ===
 function f(a:any) {
->f : (a: any) => void
+>f : typeof f
 >a : any
 
 void (r =>(r => r));
@@ -15,7 +15,7 @@ void (r =>(r => r));
 }
 f((r =>(r => r)));
 >f((r =>(r => r))) : void
->f : (a: any) => void
+>f : typeof f
 >(r =>(r => r)) : (r: any) => (r: any) => any
 >r =>(r => r) : (r: any) => (r: any) => any
 >r : any
diff --git a/tests/baselines/reference/newOperatorConformance.types b/tests/baselines/reference/newOperatorConformance.types
index 37205bd6177..266aa89086e 100644
--- a/tests/baselines/reference/newOperatorConformance.types
+++ b/tests/baselines/reference/newOperatorConformance.types
@@ -84,7 +84,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
+>newFn1 : typeof newFn1
 >T : T
 >s : T
 >T : T
@@ -100,7 +100,7 @@ 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
+>newFn2 : typeof newFn2
 >T : T
 >s : number
 >s : T
@@ -117,12 +117,12 @@ function newFn2<T extends { new (s: number): string}>(s: T) {
 
 // Construct expression of void returning function
 function fnVoid(): void { }
->fnVoid : () => void
+>fnVoid : typeof fnVoid
 
 var t = new fnVoid();
 >t : any
 >new fnVoid() : any
->fnVoid : () => void
+>fnVoid : typeof fnVoid
 
 var t: any;
 >t : any
diff --git a/tests/baselines/reference/noCatchBlock.js b/tests/baselines/reference/noCatchBlock.js
deleted file mode 100644
index 7b0404c3cad..00000000000
--- a/tests/baselines/reference/noCatchBlock.js
+++ /dev/null
@@ -1,14 +0,0 @@
-//// [noCatchBlock.ts]
-
-try {
- // ...
-} finally {
- // N.B. No 'catch' block
-}
-
-//// [noCatchBlock.js]
-try {
-}
-finally {
-}
-//# sourceMappingURL=noCatchBlock.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/noCatchBlock.js.map b/tests/baselines/reference/noCatchBlock.js.map
deleted file mode 100644
index dccc7798c92..00000000000
--- a/tests/baselines/reference/noCatchBlock.js.map
+++ /dev/null
@@ -1,2 +0,0 @@
-//// [noCatchBlock.js.map]
-{"version":3,"file":"noCatchBlock.js","sourceRoot":"","sources":["noCatchBlock.ts"],"names":[],"mappings":"AACA,IAAA,CAAC;AAED,CAAC;QAAC,CAAC;AAEH,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/noCatchBlock.sourcemap.txt b/tests/baselines/reference/noCatchBlock.sourcemap.txt
deleted file mode 100644
index 8d5a67339f6..00000000000
--- a/tests/baselines/reference/noCatchBlock.sourcemap.txt
+++ /dev/null
@@ -1,53 +0,0 @@
-===================================================================
-JsFile: noCatchBlock.js
-mapUrl: noCatchBlock.js.map
-sourceRoot: 
-sources: noCatchBlock.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:tests/cases/compiler/noCatchBlock.js
-sourceFile:noCatchBlock.ts
--------------------------------------------------------------------
->>>try {
-1 >
-2 >^^^^
-3 >    ^
-1 >
-  >
-2 >
-3 >    t
-1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0)
-2 >Emitted(1, 5) Source(2, 1) + SourceIndex(0)
-3 >Emitted(1, 6) Source(2, 2) + SourceIndex(0)
----
->>>}
-1 >
-2 >^
-3 > ^^^^^^^^^->
-1 >ry {
-  > // ...
-  >
-2 >}
-1 >Emitted(2, 1) Source(4, 1) + SourceIndex(0)
-2 >Emitted(2, 2) Source(4, 2) + SourceIndex(0)
----
->>>finally {
-1->^^^^^^^^
-2 >        ^
-1-> 
-2 >        f
-1->Emitted(3, 9) Source(4, 3) + SourceIndex(0)
-2 >Emitted(3, 10) Source(4, 4) + SourceIndex(0)
----
->>>}
-1 >
-2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >inally {
-  > // N.B. No 'catch' block
-  >
-2 >}
-1 >Emitted(4, 1) Source(6, 1) + SourceIndex(0)
-2 >Emitted(4, 2) Source(6, 2) + SourceIndex(0)
----
->>>//# sourceMappingURL=noCatchBlock.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/noCatchBlock.types b/tests/baselines/reference/noCatchBlock.types
deleted file mode 100644
index cf7689660a3..00000000000
--- a/tests/baselines/reference/noCatchBlock.types
+++ /dev/null
@@ -1,8 +0,0 @@
-=== tests/cases/compiler/noCatchBlock.ts ===
-
-No type information for this code.try {
-No type information for this code. // ...
-No type information for this code.} finally {
-No type information for this code. // N.B. No 'catch' block
-No type information for this code.}
-No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/noCollisionThisExpressionAndLocalVarInConstructor.types b/tests/baselines/reference/noCollisionThisExpressionAndLocalVarInConstructor.types
index b41f5cd6074..f9537974161 100644
--- a/tests/baselines/reference/noCollisionThisExpressionAndLocalVarInConstructor.types
+++ b/tests/baselines/reference/noCollisionThisExpressionAndLocalVarInConstructor.types
@@ -5,24 +5,13 @@ class class1 {
     constructor() {
         var x2 = {
 >x2 : { doStuff: (callback: any) => () => any; }
->{
-            doStuff: (callback) => () => {
-                var _this = 2;
-                return callback(_this);
-            }
-        } : { doStuff: (callback: any) => () => any; }
+>{            doStuff: (callback) => () => {                var _this = 2;                return callback(_this);            }        } : { doStuff: (callback: any) => () => any; }
 
             doStuff: (callback) => () => {
 >doStuff : (callback: any) => () => any
->(callback) => () => {
-                var _this = 2;
-                return callback(_this);
-            } : (callback: any) => () => any
+>(callback) => () => {                var _this = 2;                return callback(_this);            } : (callback: any) => () => any
 >callback : any
->() => {
-                var _this = 2;
-                return callback(_this);
-            } : () => any
+>() => {                var _this = 2;                return callback(_this);            } : () => any
 
                 var _this = 2;
 >_this : number
@@ -45,21 +34,13 @@ class class2 {
 
         var x2 = {
 >x2 : { doStuff: (callback: any) => () => any; }
->{
-            doStuff: (callback) => () => {
-                return callback(_this);
-            }
-        } : { doStuff: (callback: any) => () => any; }
+>{            doStuff: (callback) => () => {                return callback(_this);            }        } : { doStuff: (callback: any) => () => any; }
 
             doStuff: (callback) => () => {
 >doStuff : (callback: any) => () => any
->(callback) => () => {
-                return callback(_this);
-            } : (callback: any) => () => any
+>(callback) => () => {                return callback(_this);            } : (callback: any) => () => any
 >callback : any
->() => {
-                return callback(_this);
-            } : () => any
+>() => {                return callback(_this);            } : () => any
 
                 return callback(_this);
 >callback(_this) : any
diff --git a/tests/baselines/reference/noCollisionThisExpressionAndLocalVarInFunction.types b/tests/baselines/reference/noCollisionThisExpressionAndLocalVarInFunction.types
index 56f5701e912..daeee8e1864 100644
--- a/tests/baselines/reference/noCollisionThisExpressionAndLocalVarInFunction.types
+++ b/tests/baselines/reference/noCollisionThisExpressionAndLocalVarInFunction.types
@@ -7,7 +7,7 @@ var console: {
 >val : any
 }
 function x() {
->x : () => void
+>x : typeof x
 
     var _this = 5;
 >_this : number
diff --git a/tests/baselines/reference/noCollisionThisExpressionAndLocalVarInLambda.types b/tests/baselines/reference/noCollisionThisExpressionAndLocalVarInLambda.types
index a8e7a622366..c67508c16d7 100644
--- a/tests/baselines/reference/noCollisionThisExpressionAndLocalVarInLambda.types
+++ b/tests/baselines/reference/noCollisionThisExpressionAndLocalVarInLambda.types
@@ -1,28 +1,17 @@
 === tests/cases/compiler/noCollisionThisExpressionAndLocalVarInLambda.ts ===
 declare function alert(message?: any): void;
->alert : (message?: any) => void
+>alert : typeof alert
 >message : any
 
 var x = {
 >x : { doStuff: (callback: any) => () => any; }
->{
-    doStuff: (callback) => () => {
-        var _this = 2;
-        return callback(_this);
-    }
-} : { doStuff: (callback: any) => () => any; }
+>{    doStuff: (callback) => () => {        var _this = 2;        return callback(_this);    }} : { doStuff: (callback: any) => () => any; }
 
     doStuff: (callback) => () => {
 >doStuff : (callback: any) => () => any
->(callback) => () => {
-        var _this = 2;
-        return callback(_this);
-    } : (callback: any) => () => any
+>(callback) => () => {        var _this = 2;        return callback(_this);    } : (callback: any) => () => any
 >callback : any
->() => {
-        var _this = 2;
-        return callback(_this);
-    } : () => any
+>() => {        var _this = 2;        return callback(_this);    } : () => any
 
         var _this = 2;
 >_this : number
@@ -35,7 +24,7 @@ var x = {
 }
 alert(x.doStuff(x => alert(x)));
 >alert(x.doStuff(x => alert(x))) : void
->alert : (message?: any) => void
+>alert : typeof alert
 >x.doStuff(x => alert(x)) : () => any
 >x.doStuff : (callback: any) => () => any
 >x : { doStuff: (callback: any) => () => any; }
@@ -43,6 +32,6 @@ alert(x.doStuff(x => alert(x)));
 >x => alert(x) : (x: any) => void
 >x : any
 >alert(x) : void
->alert : (message?: any) => void
+>alert : typeof alert
 >x : any
 
diff --git a/tests/baselines/reference/noCollisionThisExpressionAndLocalVarInMethod.types b/tests/baselines/reference/noCollisionThisExpressionAndLocalVarInMethod.types
index b08ce3e57c1..cb543b33ad4 100644
--- a/tests/baselines/reference/noCollisionThisExpressionAndLocalVarInMethod.types
+++ b/tests/baselines/reference/noCollisionThisExpressionAndLocalVarInMethod.types
@@ -9,24 +9,13 @@ class a {
 >method1 : () => { doStuff: (callback: any) => () => any; }
 
         return {
->{
-            doStuff: (callback) => () => {
-                var _this = 2;
-                return callback(_this);
-            }
-        } : { doStuff: (callback: any) => () => any; }
+>{            doStuff: (callback) => () => {                var _this = 2;                return callback(_this);            }        } : { doStuff: (callback: any) => () => any; }
 
             doStuff: (callback) => () => {
 >doStuff : (callback: any) => () => any
->(callback) => () => {
-                var _this = 2;
-                return callback(_this);
-            } : (callback: any) => () => any
+>(callback) => () => {                var _this = 2;                return callback(_this);            } : (callback: any) => () => any
 >callback : any
->() => {
-                var _this = 2;
-                return callback(_this);
-            } : () => any
+>() => {                var _this = 2;                return callback(_this);            } : () => any
 
                 var _this = 2;
 >_this : number
@@ -45,21 +34,13 @@ class a {
 >_this : number
 
         return {
->{
-            doStuff: (callback) => () => {
-                return callback(_this);
-            }
-        } : { doStuff: (callback: any) => () => any; }
+>{            doStuff: (callback) => () => {                return callback(_this);            }        } : { doStuff: (callback: any) => () => any; }
 
             doStuff: (callback) => () => {
 >doStuff : (callback: any) => () => any
->(callback) => () => {
-                return callback(_this);
-            } : (callback: any) => () => any
+>(callback) => () => {                return callback(_this);            } : (callback: any) => () => any
 >callback : any
->() => {
-                return callback(_this);
-            } : () => any
+>() => {                return callback(_this);            } : () => any
 
                 return callback(_this);
 >callback(_this) : any
diff --git a/tests/baselines/reference/noCollisionThisExpressionAndLocalVarInProperty.types b/tests/baselines/reference/noCollisionThisExpressionAndLocalVarInProperty.types
index 3ab8c345887..df4ad5113f2 100644
--- a/tests/baselines/reference/noCollisionThisExpressionAndLocalVarInProperty.types
+++ b/tests/baselines/reference/noCollisionThisExpressionAndLocalVarInProperty.types
@@ -4,24 +4,13 @@ class class1 {
 
     public prop1 = {
 >prop1 : { doStuff: (callback: any) => () => any; }
->{
-        doStuff: (callback) => () => {
-            var _this = 2;
-            return callback(_this);
-        }
-    } : { doStuff: (callback: any) => () => any; }
+>{        doStuff: (callback) => () => {            var _this = 2;            return callback(_this);        }    } : { doStuff: (callback: any) => () => any; }
 
         doStuff: (callback) => () => {
 >doStuff : (callback: any) => () => any
->(callback) => () => {
-            var _this = 2;
-            return callback(_this);
-        } : (callback: any) => () => any
+>(callback) => () => {            var _this = 2;            return callback(_this);        } : (callback: any) => () => any
 >callback : any
->() => {
-            var _this = 2;
-            return callback(_this);
-        } : () => any
+>() => {            var _this = 2;            return callback(_this);        } : () => any
 
             var _this = 2;
 >_this : number
@@ -43,21 +32,13 @@ class class2 {
     }
     public prop1 = {
 >prop1 : { doStuff: (callback: any) => () => any; }
->{
-        doStuff: (callback) => () => {
-            return callback(10);
-        }
-    } : { doStuff: (callback: any) => () => any; }
+>{        doStuff: (callback) => () => {            return callback(10);        }    } : { doStuff: (callback: any) => () => any; }
 
         doStuff: (callback) => () => {
 >doStuff : (callback: any) => () => any
->(callback) => () => {
-            return callback(10);
-        } : (callback: any) => () => any
+>(callback) => () => {            return callback(10);        } : (callback: any) => () => any
 >callback : any
->() => {
-            return callback(10);
-        } : () => any
+>() => {            return callback(10);        } : () => any
 
             return callback(10);
 >callback(10) : any
diff --git a/tests/baselines/reference/noCollisionThisExpressionInFunctionAndVarInGlobal.types b/tests/baselines/reference/noCollisionThisExpressionInFunctionAndVarInGlobal.types
index 35a62c6f671..1413afd3938 100644
--- a/tests/baselines/reference/noCollisionThisExpressionInFunctionAndVarInGlobal.types
+++ b/tests/baselines/reference/noCollisionThisExpressionInFunctionAndVarInGlobal.types
@@ -10,7 +10,7 @@ var _this = 5;
 >_this : number
 
 function x() {
->x : () => void
+>x : typeof x
 
     x => { console.log(this); };
 >x => { console.log(this); } : (x: any) => void
diff --git a/tests/baselines/reference/noConstraintInReturnType1.types b/tests/baselines/reference/noConstraintInReturnType1.types
index 19a7529ac79..45927b22d1e 100644
--- a/tests/baselines/reference/noConstraintInReturnType1.types
+++ b/tests/baselines/reference/noConstraintInReturnType1.types
@@ -4,7 +4,7 @@ class List<T extends {}> {
 >T : T
 
     static empty<T extends {}>(): List<T> { return null; }
->empty : <T extends {}>() => List<T>
+>empty : typeof empty
 >T : T
 >List : List<T>
 >T : T
diff --git a/tests/baselines/reference/noImplicitAnyForIn.errors.txt b/tests/baselines/reference/noImplicitAnyForIn.errors.txt
deleted file mode 100644
index 7e4122a8f26..00000000000
--- a/tests/baselines/reference/noImplicitAnyForIn.errors.txt
+++ /dev/null
@@ -1,42 +0,0 @@
-==== tests/cases/compiler/noImplicitAnyForIn.ts (5 errors) ====
-    
-    var x: {}[] = [[1, 2, 3], ["hello"]];
-    
-    for (var i in x) {
-        for (var j in x[i]) {
-    
-            //Should yield an implicit 'any' error
-            var _j = x[i][j];
-                     ~~~~~~~
-!!! Index signature of object type implicitly has an 'any' type.
-        }
-    
-        for (var k in x[0]) {
-            var k1 = x[0];
-    
-            //Should yield an implicit 'any' error
-            var k2 = k1[k];
-                     ~~~~~
-!!! Index signature of object type implicitly has an 'any' type.
-        }
-    }
-    
-    for (var a in x) {
-        // Should yield an implicit 'any' error.
-        var b;
-            ~
-!!! Variable 'b' implicitly has an 'any' type.
-    
-        var c = a || b;
-    }
-    
-    var idx = 0;
-    var m = [1, 2, 3, 4, 5];
-    // Should yield an implicit 'any' error.
-    var n = [[]] || [];
-        ~
-!!! Variable 'n' implicitly has an 'any[][]' type.
-    
-    for (n[idx++] in m);
-         ~~~~~~~~
-!!! The left-hand side of a 'for...in' statement must be of type 'string' or 'any'.
\ No newline at end of file
diff --git a/tests/baselines/reference/noImplicitAnyIndexing.errors.txt b/tests/baselines/reference/noImplicitAnyIndexing.errors.txt
deleted file mode 100644
index 857809c3e84..00000000000
--- a/tests/baselines/reference/noImplicitAnyIndexing.errors.txt
+++ /dev/null
@@ -1,58 +0,0 @@
-==== tests/cases/compiler/noImplicitAnyIndexing.ts (4 errors) ====
-    
-    enum MyEmusEnum {
-        emu
-    }
-    
-    // Should be okay; should be a string.
-    var strRepresentation1 = MyEmusEnum[0]
-    
-    // Should be okay; should be a string.
-    var strRepresentation2 = MyEmusEnum[MyEmusEnum.emu]
-    
-    // Should be implicit 'any' ; property access fails, no string indexer.
-    var strRepresentation3 = MyEmusEnum["monehh"];
-                             ~~~~~~~~~~~~~~~~~~~~
-!!! Index signature of object type implicitly has an 'any' type.
-    
-    // Should be okay; should be a MyEmusEnum
-    var strRepresentation4 = MyEmusEnum["emu"];
-    
-    
-    // Should report an implicit 'any'.
-    var x = {}["hi"];
-            ~~~~~~~~
-!!! Index signature of object type implicitly has an 'any' type.
-    
-    // Should report an implicit 'any'.
-    var y = {}[10];
-            ~~~~~~
-!!! Index signature of object type implicitly has an 'any' type.
-    
-    
-    var hi: any = "hi";
-    
-    var emptyObj = {};
-    
-    // Should report an implicit 'any'.
-    var z1 = emptyObj[hi];
-             ~~~~~~~~~~~~
-!!! Index signature of object type implicitly has an 'any' type.
-    var z2 = (<any>emptyObj)[hi];
-    
-    interface MyMap<T> {
-        [key: string]: T;
-    }
-    
-    var m: MyMap<number> = {
-        "0": 0,
-        "1": 1,
-        "2": 2,
-        "Okay that's enough for today.": NaN
-    };
-    
-    var mResult1 = m[MyEmusEnum.emu];
-    var mResult2 = m[MyEmusEnum[MyEmusEnum.emu]];
-    var mResult3 = m[hi];
-    
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/noImplicitAnyParametersInAmbientClass.errors.txt b/tests/baselines/reference/noImplicitAnyParametersInAmbientClass.errors.txt
deleted file mode 100644
index d81e3e38404..00000000000
--- a/tests/baselines/reference/noImplicitAnyParametersInAmbientClass.errors.txt
+++ /dev/null
@@ -1,155 +0,0 @@
-==== tests/cases/compiler/noImplicitAnyParametersInAmbientClass.ts (31 errors) ====
-    
-    declare class D_C {
-        // No implicit-'any' errors.
-        public pub_f1(): void;
-    
-        // Implicit-'any' errors for x.
-        public pub_f2(x): void;
-                      ~
-!!! Parameter 'x' implicitly has an 'any' type.
-    
-        // No implicit-'any' errors.
-        public pub_f3(x: any): void;
-    
-        // Implicit-'any' errors for x, y, and z.
-        public pub_f4(x, y, z): void;
-                      ~
-!!! Parameter 'x' implicitly has an 'any' type.
-                         ~
-!!! Parameter 'y' implicitly has an 'any' type.
-                            ~
-!!! Parameter 'z' implicitly has an 'any' type.
-    
-        // Implicit-'any' errors for x, and z.
-        public pub_f5(x, y: any, z): void;
-                      ~
-!!! Parameter 'x' implicitly has an 'any' type.
-                                 ~
-!!! Parameter 'z' implicitly has an 'any' type.
-    
-        // Implicit-'any[]' errors for r.
-        public pub_f6(...r): void;
-                      ~~~~
-!!! Rest parameter 'r' implicitly has an 'any[]' type.
-    
-        // Implicit-'any'/'any[]' errors for x, r.
-        public pub_f7(x, ...r): void;
-                      ~
-!!! Parameter 'x' implicitly has an 'any' type.
-                         ~~~~
-!!! Rest parameter 'r' implicitly has an 'any[]' type.
-    
-        // Implicit-'any' errors for x1, y2, x3, and y3.
-        public pub_f8(x1, y1: number): any;
-                      ~~
-!!! Parameter 'x1' implicitly has an 'any' type.
-        public pub_f8(x2: string, y2): any;
-                                  ~~
-!!! Parameter 'y2' implicitly has an 'any' type.
-        public pub_f8(x3, y3): any;
-                      ~~
-!!! Parameter 'x3' implicitly has an 'any' type.
-                          ~~
-!!! Parameter 'y3' implicitly has an 'any' type.
-    
-        // No implicit-'any' errors.
-        public pub_f9: () => string;
-    
-        // Implicit-'any' error for x.
-        public pub_f10: (x) => string;
-                         ~
-!!! Parameter 'x' implicitly has an 'any' type.
-    
-        // Implicit-'any' errors for x, y, and z.
-        public pub_f11: (x, y, z) => string;
-                         ~
-!!! Parameter 'x' implicitly has an 'any' type.
-                            ~
-!!! Parameter 'y' implicitly has an 'any' type.
-                               ~
-!!! Parameter 'z' implicitly has an 'any' type.
-    
-        // Implicit-'any' errors for x and z.
-        public pub_f12: (x, y: any, z) => string;
-                         ~
-!!! Parameter 'x' implicitly has an 'any' type.
-                                    ~
-!!! Parameter 'z' implicitly has an 'any' type.
-    
-        // Implicit-'any[]' error for r.
-        public pub_f13: (...r) => string;
-                         ~~~~
-!!! Rest parameter 'r' implicitly has an 'any[]' type.
-    
-        // Implicit-'any'/'any[]' errors for x, r.
-        public pub_f14: (x, ...r) => string;
-                         ~
-!!! Parameter 'x' implicitly has an 'any' type.
-                            ~~~~
-!!! Rest parameter 'r' implicitly has an 'any[]' type.
-    
-        ///////////////////////////////////////////
-    
-        // No implicit-'any' errors.
-        private priv_f1(): void;
-    
-        // No implicit-'any' errors.
-        private priv_f2(x): void;
-    
-        // No implicit-'any' errors.
-        private priv_f3(x: any): void;
-    
-        // No implicit-'any' errors.
-        private priv_f4(x, y, z): void;
-    
-        // No implicit-'any' errors.
-        private priv_f5(x, y: any, z): void;
-    
-        // No implicit-'any' errors.
-        private priv_f6(...r): void;
-    
-        // No implicit-'any' errors.
-        private priv_f7(x, ...r): void;
-    
-        // No implicit-'any' errors.
-        private priv_f8(x1, y1: number): any;
-        private priv_f8(x2: string, y2): any;
-        private priv_f8(x3, y3): any;
-    
-        // No implicit-'any' errors.
-        private priv_f9: () => string;
-    
-        // Implicit-'any' error for x.
-        private priv_f10: (x) => string;
-                           ~
-!!! Parameter 'x' implicitly has an 'any' type.
-    
-        // Implicit-'any' errors for x, y, and z.
-        private priv_f11: (x, y, z) => string;
-                           ~
-!!! Parameter 'x' implicitly has an 'any' type.
-                              ~
-!!! Parameter 'y' implicitly has an 'any' type.
-                                 ~
-!!! Parameter 'z' implicitly has an 'any' type.
-    
-        // Implicit-'any' errors for x and z.
-        private priv_f12: (x, y: any, z) => string;
-                           ~
-!!! Parameter 'x' implicitly has an 'any' type.
-                                      ~
-!!! Parameter 'z' implicitly has an 'any' type.
-    
-        // Implicit-'any[]' error for r.
-        private priv_f13: (...r) => string;
-                           ~~~~
-!!! Rest parameter 'r' implicitly has an 'any[]' type.
-    
-        // Implicit-'any'/'any[]' errors for x, r.
-        private priv_f14: (x, ...r) => string;
-                           ~
-!!! Parameter 'x' implicitly has an 'any' type.
-                              ~~~~
-!!! Rest parameter 'r' implicitly has an 'any[]' type.
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/noImplicitAnyParametersInAmbientClass.js b/tests/baselines/reference/noImplicitAnyParametersInAmbientClass.js
deleted file mode 100644
index 4af0a8c74a3..00000000000
--- a/tests/baselines/reference/noImplicitAnyParametersInAmbientClass.js
+++ /dev/null
@@ -1,95 +0,0 @@
-//// [noImplicitAnyParametersInAmbientClass.ts]
-
-declare class D_C {
-    // No implicit-'any' errors.
-    public pub_f1(): void;
-
-    // Implicit-'any' errors for x.
-    public pub_f2(x): void;
-
-    // No implicit-'any' errors.
-    public pub_f3(x: any): void;
-
-    // Implicit-'any' errors for x, y, and z.
-    public pub_f4(x, y, z): void;
-
-    // Implicit-'any' errors for x, and z.
-    public pub_f5(x, y: any, z): void;
-
-    // Implicit-'any[]' errors for r.
-    public pub_f6(...r): void;
-
-    // Implicit-'any'/'any[]' errors for x, r.
-    public pub_f7(x, ...r): void;
-
-    // Implicit-'any' errors for x1, y2, x3, and y3.
-    public pub_f8(x1, y1: number): any;
-    public pub_f8(x2: string, y2): any;
-    public pub_f8(x3, y3): any;
-
-    // No implicit-'any' errors.
-    public pub_f9: () => string;
-
-    // Implicit-'any' error for x.
-    public pub_f10: (x) => string;
-
-    // Implicit-'any' errors for x, y, and z.
-    public pub_f11: (x, y, z) => string;
-
-    // Implicit-'any' errors for x and z.
-    public pub_f12: (x, y: any, z) => string;
-
-    // Implicit-'any[]' error for r.
-    public pub_f13: (...r) => string;
-
-    // Implicit-'any'/'any[]' errors for x, r.
-    public pub_f14: (x, ...r) => string;
-
-    ///////////////////////////////////////////
-
-    // No implicit-'any' errors.
-    private priv_f1(): void;
-
-    // No implicit-'any' errors.
-    private priv_f2(x): void;
-
-    // No implicit-'any' errors.
-    private priv_f3(x: any): void;
-
-    // No implicit-'any' errors.
-    private priv_f4(x, y, z): void;
-
-    // No implicit-'any' errors.
-    private priv_f5(x, y: any, z): void;
-
-    // No implicit-'any' errors.
-    private priv_f6(...r): void;
-
-    // No implicit-'any' errors.
-    private priv_f7(x, ...r): void;
-
-    // No implicit-'any' errors.
-    private priv_f8(x1, y1: number): any;
-    private priv_f8(x2: string, y2): any;
-    private priv_f8(x3, y3): any;
-
-    // No implicit-'any' errors.
-    private priv_f9: () => string;
-
-    // Implicit-'any' error for x.
-    private priv_f10: (x) => string;
-
-    // Implicit-'any' errors for x, y, and z.
-    private priv_f11: (x, y, z) => string;
-
-    // Implicit-'any' errors for x and z.
-    private priv_f12: (x, y: any, z) => string;
-
-    // Implicit-'any[]' error for r.
-    private priv_f13: (...r) => string;
-
-    // Implicit-'any'/'any[]' errors for x, r.
-    private priv_f14: (x, ...r) => string;
-}
-
-//// [noImplicitAnyParametersInAmbientClass.js]
diff --git a/tests/baselines/reference/noImplicitAnyParametersInAmbientFunctions.errors.txt b/tests/baselines/reference/noImplicitAnyParametersInAmbientFunctions.errors.txt
deleted file mode 100644
index 905ea1ac9f0..00000000000
--- a/tests/baselines/reference/noImplicitAnyParametersInAmbientFunctions.errors.txt
+++ /dev/null
@@ -1,89 +0,0 @@
-==== tests/cases/compiler/noImplicitAnyParametersInAmbientFunctions.ts (22 errors) ====
-    
-    // No implicit-'any' errors.
-    declare function d_f1(): void;
-    
-    // Implicit-'any' errors for x.
-    declare function d_f2(x): void;
-                          ~
-!!! Parameter 'x' implicitly has an 'any' type.
-    
-    // No implicit-'any' errors.
-    declare function d_f3(x: any): void;
-    
-    // Implicit-'any' errors for x, y, and z.
-    declare function d_f4(x, y, z): void;
-                          ~
-!!! Parameter 'x' implicitly has an 'any' type.
-                             ~
-!!! Parameter 'y' implicitly has an 'any' type.
-                                ~
-!!! Parameter 'z' implicitly has an 'any' type.
-    
-    // Implicit-'any' errors for x, and z.
-    declare function d_f5(x, y: any, z): void;
-                          ~
-!!! Parameter 'x' implicitly has an 'any' type.
-                                     ~
-!!! Parameter 'z' implicitly has an 'any' type.
-    
-    // Implicit-'any[]' errors for r.
-    declare function d_f6(...r): void;
-                          ~~~~
-!!! Rest parameter 'r' implicitly has an 'any[]' type.
-    
-    // Implicit-'any'/'any[]' errors for x, r.
-    declare function d_f7(x, ...r): void;
-                          ~
-!!! Parameter 'x' implicitly has an 'any' type.
-                             ~~~~
-!!! Rest parameter 'r' implicitly has an 'any[]' type.
-    
-    // Implicit-'any' errors for x1, y2, x3, and y3.
-    declare function d_f8(x1, y1: number): any;
-                          ~~
-!!! Parameter 'x1' implicitly has an 'any' type.
-    declare function d_f8(x2: string, y2): any;
-                                      ~~
-!!! Parameter 'y2' implicitly has an 'any' type.
-    declare function d_f8(x3, y3): any;
-                          ~~
-!!! Parameter 'x3' implicitly has an 'any' type.
-                              ~~
-!!! Parameter 'y3' implicitly has an 'any' type.
-    
-    // No implicit-'any' errors.
-    declare var d_f9: () => string;
-    
-    // Implicit-'any' error for x.
-    declare var d_f10: (x) => string;
-                        ~
-!!! Parameter 'x' implicitly has an 'any' type.
-    
-    // Implicit-'any' errors for x, y, and z.
-    declare var d_f11: (x, y, z) => string;
-                        ~
-!!! Parameter 'x' implicitly has an 'any' type.
-                           ~
-!!! Parameter 'y' implicitly has an 'any' type.
-                              ~
-!!! Parameter 'z' implicitly has an 'any' type.
-    
-    // Implicit-'any' errors for x and z.
-    declare var d_f12: (x, y: any, z) => string;
-                        ~
-!!! Parameter 'x' implicitly has an 'any' type.
-                                   ~
-!!! Parameter 'z' implicitly has an 'any' type.
-    
-    // Implicit-'any[]' error for r.
-    declare var d_f13: (...r) => string;
-                        ~~~~
-!!! Rest parameter 'r' implicitly has an 'any[]' type.
-    
-    // Implicit-'any'/'any[]' errors for x, r.
-    declare var d_f14: (x, ...r) => string;
-                        ~
-!!! Parameter 'x' implicitly has an 'any' type.
-                           ~~~~
-!!! Rest parameter 'r' implicitly has an 'any[]' type.
\ No newline at end of file
diff --git a/tests/baselines/reference/noImplicitAnyParametersInAmbientFunctions.js b/tests/baselines/reference/noImplicitAnyParametersInAmbientFunctions.js
deleted file mode 100644
index 3e825c2b24f..00000000000
--- a/tests/baselines/reference/noImplicitAnyParametersInAmbientFunctions.js
+++ /dev/null
@@ -1,47 +0,0 @@
-//// [noImplicitAnyParametersInAmbientFunctions.ts]
-
-// No implicit-'any' errors.
-declare function d_f1(): void;
-
-// Implicit-'any' errors for x.
-declare function d_f2(x): void;
-
-// No implicit-'any' errors.
-declare function d_f3(x: any): void;
-
-// Implicit-'any' errors for x, y, and z.
-declare function d_f4(x, y, z): void;
-
-// Implicit-'any' errors for x, and z.
-declare function d_f5(x, y: any, z): void;
-
-// Implicit-'any[]' errors for r.
-declare function d_f6(...r): void;
-
-// Implicit-'any'/'any[]' errors for x, r.
-declare function d_f7(x, ...r): void;
-
-// Implicit-'any' errors for x1, y2, x3, and y3.
-declare function d_f8(x1, y1: number): any;
-declare function d_f8(x2: string, y2): any;
-declare function d_f8(x3, y3): any;
-
-// No implicit-'any' errors.
-declare var d_f9: () => string;
-
-// Implicit-'any' error for x.
-declare var d_f10: (x) => string;
-
-// Implicit-'any' errors for x, y, and z.
-declare var d_f11: (x, y, z) => string;
-
-// Implicit-'any' errors for x and z.
-declare var d_f12: (x, y: any, z) => string;
-
-// Implicit-'any[]' error for r.
-declare var d_f13: (...r) => string;
-
-// Implicit-'any'/'any[]' errors for x, r.
-declare var d_f14: (x, ...r) => string;
-
-//// [noImplicitAnyParametersInAmbientFunctions.js]
diff --git a/tests/baselines/reference/noImplicitAnyParametersInAmbientModule.errors.txt b/tests/baselines/reference/noImplicitAnyParametersInAmbientModule.errors.txt
deleted file mode 100644
index 99779ab7697..00000000000
--- a/tests/baselines/reference/noImplicitAnyParametersInAmbientModule.errors.txt
+++ /dev/null
@@ -1,91 +0,0 @@
-==== tests/cases/compiler/noImplicitAnyParametersInAmbientModule.ts (22 errors) ====
-    
-    declare module D_M {
-        // No implicit-'any' errors.
-        function dm_f1(): void;
-    
-        // No implicit-'any' errors.
-        function dm_f2(x): void;
-                       ~
-!!! Parameter 'x' implicitly has an 'any' type.
-    
-        // No implicit-'any' errors.
-        function dm_f3(x: any): void;
-    
-        // No implicit-'any' errors.
-        function dm_f4(x, y, z): void;
-                       ~
-!!! Parameter 'x' implicitly has an 'any' type.
-                          ~
-!!! Parameter 'y' implicitly has an 'any' type.
-                             ~
-!!! Parameter 'z' implicitly has an 'any' type.
-    
-        // No implicit-'any' errors.
-        function dm_f5(x, y: any, z): void;
-                       ~
-!!! Parameter 'x' implicitly has an 'any' type.
-                                  ~
-!!! Parameter 'z' implicitly has an 'any' type.
-    
-        // No implicit-'any' errors.
-        function dm_f6(...r): void;
-                       ~~~~
-!!! Rest parameter 'r' implicitly has an 'any[]' type.
-    
-        // No implicit-'any' errors.
-        function dm_f7(x, ...r): void;
-                       ~
-!!! Parameter 'x' implicitly has an 'any' type.
-                          ~~~~
-!!! Rest parameter 'r' implicitly has an 'any[]' type.
-    
-        // No implicit-'any' errors.
-        function dm_f8(x1, y1: number): any;
-                       ~~
-!!! Parameter 'x1' implicitly has an 'any' type.
-        function dm_f8(x2: string, y2): any;
-                                   ~~
-!!! Parameter 'y2' implicitly has an 'any' type.
-        function dm_f8(x3, y3): any;
-                       ~~
-!!! Parameter 'x3' implicitly has an 'any' type.
-                           ~~
-!!! Parameter 'y3' implicitly has an 'any' type.
-    
-        // No implicit-'any' errors.
-        var dm_f9: () => string;
-    
-        // No implicit-'any' errors.
-        var dm_f10: (x) => string;
-                     ~
-!!! Parameter 'x' implicitly has an 'any' type.
-    
-        // No implicit-'any' errors.
-        var dm_f11: (x, y, z) => string;
-                     ~
-!!! Parameter 'x' implicitly has an 'any' type.
-                        ~
-!!! Parameter 'y' implicitly has an 'any' type.
-                           ~
-!!! Parameter 'z' implicitly has an 'any' type.
-    
-        // No implicit-'any' errors.
-        var dm_f12: (x, y: any, z) => string;
-                     ~
-!!! Parameter 'x' implicitly has an 'any' type.
-                                ~
-!!! Parameter 'z' implicitly has an 'any' type.
-    
-        // No implicit-'any' errors.
-        var dm_f13: (...r) => string;
-                     ~~~~
-!!! Rest parameter 'r' implicitly has an 'any[]' type.
-    
-        // No implicit-'any' errors.
-        var dm_f14: (x, ...r) => string;
-                     ~
-!!! Parameter 'x' implicitly has an 'any' type.
-                        ~~~~
-!!! Rest parameter 'r' implicitly has an 'any[]' type.
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/noImplicitAnyParametersInAmbientModule.js b/tests/baselines/reference/noImplicitAnyParametersInAmbientModule.js
deleted file mode 100644
index d35cbe9d9d4..00000000000
--- a/tests/baselines/reference/noImplicitAnyParametersInAmbientModule.js
+++ /dev/null
@@ -1,49 +0,0 @@
-//// [noImplicitAnyParametersInAmbientModule.ts]
-
-declare module D_M {
-    // No implicit-'any' errors.
-    function dm_f1(): void;
-
-    // No implicit-'any' errors.
-    function dm_f2(x): void;
-
-    // No implicit-'any' errors.
-    function dm_f3(x: any): void;
-
-    // No implicit-'any' errors.
-    function dm_f4(x, y, z): void;
-
-    // No implicit-'any' errors.
-    function dm_f5(x, y: any, z): void;
-
-    // No implicit-'any' errors.
-    function dm_f6(...r): void;
-
-    // No implicit-'any' errors.
-    function dm_f7(x, ...r): void;
-
-    // No implicit-'any' errors.
-    function dm_f8(x1, y1: number): any;
-    function dm_f8(x2: string, y2): any;
-    function dm_f8(x3, y3): any;
-
-    // No implicit-'any' errors.
-    var dm_f9: () => string;
-
-    // No implicit-'any' errors.
-    var dm_f10: (x) => string;
-
-    // No implicit-'any' errors.
-    var dm_f11: (x, y, z) => string;
-
-    // No implicit-'any' errors.
-    var dm_f12: (x, y: any, z) => string;
-
-    // No implicit-'any' errors.
-    var dm_f13: (...r) => string;
-
-    // No implicit-'any' errors.
-    var dm_f14: (x, ...r) => string;
-}
-
-//// [noImplicitAnyParametersInAmbientModule.js]
diff --git a/tests/baselines/reference/noImplicitAnyParametersInBareFunctions.errors.txt b/tests/baselines/reference/noImplicitAnyParametersInBareFunctions.errors.txt
deleted file mode 100644
index ed49e1dbd11..00000000000
--- a/tests/baselines/reference/noImplicitAnyParametersInBareFunctions.errors.txt
+++ /dev/null
@@ -1,89 +0,0 @@
-==== tests/cases/compiler/noImplicitAnyParametersInBareFunctions.ts (22 errors) ====
-    
-    // No implicit-'any' errors.
-    function f1(): void { }
-    
-    // Implicit-'any' error for x.
-    function f2(x): void { }
-                ~
-!!! Parameter 'x' implicitly has an 'any' type.
-    
-    // No implicit-'any' errors.
-    function f3(x: any): void { }
-    
-    // Implicit-'any' errors for x, y, and z.
-    function f4(x, y, z): void { }
-                ~
-!!! Parameter 'x' implicitly has an 'any' type.
-                   ~
-!!! Parameter 'y' implicitly has an 'any' type.
-                      ~
-!!! Parameter 'z' implicitly has an 'any' type.
-    
-    // Implicit-'any' errors for x, and z.
-    function f5(x, y: any, z): void { }
-                ~
-!!! Parameter 'x' implicitly has an 'any' type.
-                           ~
-!!! Parameter 'z' implicitly has an 'any' type.
-    
-    // Implicit-'any[]' error for r.
-    function f6(...r): void { }
-                ~~~~
-!!! Rest parameter 'r' implicitly has an 'any[]' type.
-    
-    // Implicit-'any'/'any[]' errors for x, r.
-    function f7(x, ...r): void { }
-                ~
-!!! Parameter 'x' implicitly has an 'any' type.
-                   ~~~~
-!!! Rest parameter 'r' implicitly has an 'any[]' type.
-    
-    // Implicit-'any' errors for x1, y2, x3, and y3.
-    function f8(x1, y1: number): any;
-                ~~
-!!! Parameter 'x1' implicitly has an 'any' type.
-    function f8(x2: string, y2): any;
-                            ~~
-!!! Parameter 'y2' implicitly has an 'any' type.
-    function f8(x3, y3): any { } 
-                ~~
-!!! Parameter 'x3' implicitly has an 'any' type.
-                    ~~
-!!! Parameter 'y3' implicitly has an 'any' type.
-    
-    // No implicit-'any' errors.
-    var f9 = () => "";
-    
-    // Implicit-'any' errors for x.
-    var f10 = (x) => "";
-               ~
-!!! Parameter 'x' implicitly has an 'any' type.
-    
-    // Implicit-'any' errors for x, y, and z.
-    var f11 = (x, y, z) => "";
-               ~
-!!! Parameter 'x' implicitly has an 'any' type.
-                  ~
-!!! Parameter 'y' implicitly has an 'any' type.
-                     ~
-!!! Parameter 'z' implicitly has an 'any' type.
-    
-    // Implicit-'any' errors for x and z.
-    var f12 = (x, y: any, z) => "";
-               ~
-!!! Parameter 'x' implicitly has an 'any' type.
-                          ~
-!!! Parameter 'z' implicitly has an 'any' type.
-    
-    // Implicit-'any[]' error for r.
-    var f13 = (...r) => "";
-               ~~~~
-!!! Rest parameter 'r' implicitly has an 'any[]' type.
-    
-    // Implicit-'any'/'any[]' errors for x, r.
-    var f14 = (x, ...r) => "";
-               ~
-!!! Parameter 'x' implicitly has an 'any' type.
-                  ~~~~
-!!! Rest parameter 'r' implicitly has an 'any[]' type.
\ No newline at end of file
diff --git a/tests/baselines/reference/noImplicitAnyParametersInClass.errors.txt b/tests/baselines/reference/noImplicitAnyParametersInClass.errors.txt
deleted file mode 100644
index 785ebe83b87..00000000000
--- a/tests/baselines/reference/noImplicitAnyParametersInClass.errors.txt
+++ /dev/null
@@ -1,181 +0,0 @@
-==== tests/cases/compiler/noImplicitAnyParametersInClass.ts (44 errors) ====
-    
-    class C {
-        // No implicit-'any' errors.
-        public pub_f1(): void { }
-    
-        // Implicit-'any' errors for x.
-        public pub_f2(x): void { }
-                      ~
-!!! Parameter 'x' implicitly has an 'any' type.
-    
-        // No implicit-'any' errors.
-        public pub_f3(x: any): void { }
-    
-        // Implicit-'any' errors for x, y, and z.
-        public pub_f4(x, y, z): void { }
-                      ~
-!!! Parameter 'x' implicitly has an 'any' type.
-                         ~
-!!! Parameter 'y' implicitly has an 'any' type.
-                            ~
-!!! Parameter 'z' implicitly has an 'any' type.
-    
-        // Implicit-'any' errors for x, and z.
-        public pub_f5(x, y: any, z): void { }
-                      ~
-!!! Parameter 'x' implicitly has an 'any' type.
-                                 ~
-!!! Parameter 'z' implicitly has an 'any' type.
-    
-        // Implicit-'any[]' errors for r.
-        public pub_f6(...r): void { }
-                      ~~~~
-!!! Rest parameter 'r' implicitly has an 'any[]' type.
-    
-        // Implicit-'any'/'any[]' errors for x, r.
-        public pub_f7(x, ...r): void { }
-                      ~
-!!! Parameter 'x' implicitly has an 'any' type.
-                         ~~~~
-!!! Rest parameter 'r' implicitly has an 'any[]' type.
-    
-        // Implicit-'any' errors for x1, y2, x3, and y3.
-        public pub_f8(x1, y1: number): any;
-                      ~~
-!!! Parameter 'x1' implicitly has an 'any' type.
-        public pub_f8(x2: string, y2): any;
-                                  ~~
-!!! Parameter 'y2' implicitly has an 'any' type.
-        public pub_f8(x3, y3): any { }
-                      ~~
-!!! Parameter 'x3' implicitly has an 'any' type.
-                          ~~
-!!! Parameter 'y3' implicitly has an 'any' type.
-    
-        // No implicit-'any' errors.
-        public pub_f9 = () => "";
-    
-        // Implicit-'any' errors for x.
-        public pub_f10 = (x) => "";
-                          ~
-!!! Parameter 'x' implicitly has an 'any' type.
-    
-        // Implicit-'any' errors for x, y, and z.
-        public pub_f11 = (x, y, z) => "";
-                          ~
-!!! Parameter 'x' implicitly has an 'any' type.
-                             ~
-!!! Parameter 'y' implicitly has an 'any' type.
-                                ~
-!!! Parameter 'z' implicitly has an 'any' type.
-    
-        // Implicit-'any' errors for x and z.
-        public pub_f12 = (x, y: any, z) => "";
-                          ~
-!!! Parameter 'x' implicitly has an 'any' type.
-                                     ~
-!!! Parameter 'z' implicitly has an 'any' type.
-    
-        // Implicit-'any[]' error for r.
-        public pub_f13 = (...r) => "";
-                          ~~~~
-!!! Rest parameter 'r' implicitly has an 'any[]' type.
-    
-        // Implicit-'any'/'any[]' errors for x, r.
-        public pub_f14 = (x, ...r) => "";
-                          ~
-!!! Parameter 'x' implicitly has an 'any' type.
-                             ~~~~
-!!! Rest parameter 'r' implicitly has an 'any[]' type.
-    
-        ///////////////////////////////////////////
-    
-        // No implicit-'any' errors.
-        private priv_f1(): void { }
-    
-        // Implicit-'any' errors for x.
-        private priv_f2(x): void { }
-                        ~
-!!! Parameter 'x' implicitly has an 'any' type.
-    
-        // No implicit-'any' errors.
-        private priv_f3(x: any): void { }
-    
-        // Implicit-'any' errors for x, y, and z.
-        private priv_f4(x, y, z): void { }
-                        ~
-!!! Parameter 'x' implicitly has an 'any' type.
-                           ~
-!!! Parameter 'y' implicitly has an 'any' type.
-                              ~
-!!! Parameter 'z' implicitly has an 'any' type.
-    
-        // Implicit-'any' errors for x, and z.
-        private priv_f5(x, y: any, z): void { }
-                        ~
-!!! Parameter 'x' implicitly has an 'any' type.
-                                   ~
-!!! Parameter 'z' implicitly has an 'any' type.
-    
-        // Implicit-'any[]' errors for r.
-        private priv_f6(...r): void { }
-                        ~~~~
-!!! Rest parameter 'r' implicitly has an 'any[]' type.
-    
-        // Implicit-'any'/'any[]' errors for x, r.
-        private priv_f7(x, ...r): void { }
-                        ~
-!!! Parameter 'x' implicitly has an 'any' type.
-                           ~~~~
-!!! Rest parameter 'r' implicitly has an 'any[]' type.
-    
-        // Implicit-'any' errors for x1, y2, x3, and y3.
-        private priv_f8(x1, y1: number): any;
-                        ~~
-!!! Parameter 'x1' implicitly has an 'any' type.
-        private priv_f8(x2: string, y2): any;
-                                    ~~
-!!! Parameter 'y2' implicitly has an 'any' type.
-        private priv_f8(x3, y3): any { }
-                        ~~
-!!! Parameter 'x3' implicitly has an 'any' type.
-                            ~~
-!!! Parameter 'y3' implicitly has an 'any' type.
-    
-        // No implicit-'any' errors.
-        private priv_f9 = () => "";
-    
-        // Implicit-'any' errors for x.
-        private priv_f10 = (x) => "";
-                            ~
-!!! Parameter 'x' implicitly has an 'any' type.
-    
-        // Implicit-'any' errors for x, y, and z.
-        private priv_f11 = (x, y, z) => "";
-                            ~
-!!! Parameter 'x' implicitly has an 'any' type.
-                               ~
-!!! Parameter 'y' implicitly has an 'any' type.
-                                  ~
-!!! Parameter 'z' implicitly has an 'any' type.
-    
-        // Implicit-'any' errors for x and z.
-        private priv_f12 = (x, y: any, z) => "";
-                            ~
-!!! Parameter 'x' implicitly has an 'any' type.
-                                       ~
-!!! Parameter 'z' implicitly has an 'any' type.
-    
-        // Implicit-'any[]' error for r.
-        private priv_f13 = (...r) => "";
-                            ~~~~
-!!! Rest parameter 'r' implicitly has an 'any[]' type.
-    
-        // Implicit-'any'/'any[]' errors for x, r.
-        private priv_f14 = (x, ...r) => "";
-                            ~
-!!! Parameter 'x' implicitly has an 'any' type.
-                               ~~~~
-!!! Rest parameter 'r' implicitly has an 'any[]' type.
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/noImplicitAnyParametersInInterface.errors.txt b/tests/baselines/reference/noImplicitAnyParametersInInterface.errors.txt
deleted file mode 100644
index c9bece57671..00000000000
--- a/tests/baselines/reference/noImplicitAnyParametersInInterface.errors.txt
+++ /dev/null
@@ -1,106 +0,0 @@
-==== tests/cases/compiler/noImplicitAnyParametersInInterface.ts (27 errors) ====
-    
-    interface I {
-        // Implicit-'any' errors for first two call signatures, x1, x2, z2.
-        ();
-        ~~~
-!!! Call signature, which lacks return-type annotation, implicitly has an 'any' return type.
-        (x1);
-        ~~~~~
-!!! Call signature, which lacks return-type annotation, implicitly has an 'any' return type.
-         ~~
-!!! Parameter 'x1' implicitly has an 'any' type.
-        (x2, y2: string, z2): any;
-         ~~
-!!! Parameter 'x2' implicitly has an 'any' type.
-                         ~~
-!!! Parameter 'z2' implicitly has an 'any' type.
-    
-        // No implicit-'any' errors.
-        f1(): void;
-    
-        // Implicit-'any' errors for x.
-        f2(x): void;
-           ~
-!!! Parameter 'x' implicitly has an 'any' type.
-    
-        // No implicit-'any' errors.
-        f3(x: any): void;
-    
-        // Implicit-'any' errors for x, y, and z.
-        f4(x, y, z): void;
-           ~
-!!! Parameter 'x' implicitly has an 'any' type.
-              ~
-!!! Parameter 'y' implicitly has an 'any' type.
-                 ~
-!!! Parameter 'z' implicitly has an 'any' type.
-    
-        // Implicit-'any' errors for x, and z.
-        f5(x, y: any, z): void;
-           ~
-!!! Parameter 'x' implicitly has an 'any' type.
-                      ~
-!!! Parameter 'z' implicitly has an 'any' type.
-    
-        // Implicit-'any[]' errors for r.
-        f6(...r): void;
-           ~~~~
-!!! Rest parameter 'r' implicitly has an 'any[]' type.
-    
-        // Implicit-'any'/'any[]' errors for x, r.
-        f7(x, ...r): void;
-           ~
-!!! Parameter 'x' implicitly has an 'any' type.
-              ~~~~
-!!! Rest parameter 'r' implicitly has an 'any[]' type.
-    
-        // Implicit-'any' errors for x1, y2, x3, and y3.
-        f8(x1, y1: number): any;
-           ~~
-!!! Parameter 'x1' implicitly has an 'any' type.
-        f8(x2: string, y2): any;
-                       ~~
-!!! Parameter 'y2' implicitly has an 'any' type.
-        f8(x3, y3): any;
-           ~~
-!!! Parameter 'x3' implicitly has an 'any' type.
-               ~~
-!!! Parameter 'y3' implicitly has an 'any' type.
-    
-        // No implicit-'any' errors.
-        f9: () => string;
-    
-        // Implicit-'any' errors for x.
-        f10: (x) => string;
-              ~
-!!! Parameter 'x' implicitly has an 'any' type.
-    
-        // Implicit-'any' errors for x, y, and z.
-        f11: (x, y, z) => string;
-              ~
-!!! Parameter 'x' implicitly has an 'any' type.
-                 ~
-!!! Parameter 'y' implicitly has an 'any' type.
-                    ~
-!!! Parameter 'z' implicitly has an 'any' type.
-    
-        // Implicit-'any' errors for x and z.
-        f12: (x, y: any, z) => string;
-              ~
-!!! Parameter 'x' implicitly has an 'any' type.
-                         ~
-!!! Parameter 'z' implicitly has an 'any' type.
-    
-        // Implicit-'any[]' error for r.
-        f13: (...r) => string;
-              ~~~~
-!!! Rest parameter 'r' implicitly has an 'any[]' type.
-    
-        // Implicit-'any'/'any[]' errors for x, r.
-        f14: (x, ...r) => string;
-              ~
-!!! Parameter 'x' implicitly has an 'any' type.
-                 ~~~~
-!!! Rest parameter 'r' implicitly has an 'any[]' type.
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/noImplicitAnyParametersInInterface.js b/tests/baselines/reference/noImplicitAnyParametersInInterface.js
deleted file mode 100644
index e8844fa1fad..00000000000
--- a/tests/baselines/reference/noImplicitAnyParametersInInterface.js
+++ /dev/null
@@ -1,54 +0,0 @@
-//// [noImplicitAnyParametersInInterface.ts]
-
-interface I {
-    // Implicit-'any' errors for first two call signatures, x1, x2, z2.
-    ();
-    (x1);
-    (x2, y2: string, z2): any;
-
-    // No implicit-'any' errors.
-    f1(): void;
-
-    // Implicit-'any' errors for x.
-    f2(x): void;
-
-    // No implicit-'any' errors.
-    f3(x: any): void;
-
-    // Implicit-'any' errors for x, y, and z.
-    f4(x, y, z): void;
-
-    // Implicit-'any' errors for x, and z.
-    f5(x, y: any, z): void;
-
-    // Implicit-'any[]' errors for r.
-    f6(...r): void;
-
-    // Implicit-'any'/'any[]' errors for x, r.
-    f7(x, ...r): void;
-
-    // Implicit-'any' errors for x1, y2, x3, and y3.
-    f8(x1, y1: number): any;
-    f8(x2: string, y2): any;
-    f8(x3, y3): any;
-
-    // No implicit-'any' errors.
-    f9: () => string;
-
-    // Implicit-'any' errors for x.
-    f10: (x) => string;
-
-    // Implicit-'any' errors for x, y, and z.
-    f11: (x, y, z) => string;
-
-    // Implicit-'any' errors for x and z.
-    f12: (x, y: any, z) => string;
-
-    // Implicit-'any[]' error for r.
-    f13: (...r) => string;
-
-    // Implicit-'any'/'any[]' errors for x, r.
-    f14: (x, ...r) => string;
-}
-
-//// [noImplicitAnyParametersInInterface.js]
diff --git a/tests/baselines/reference/noImplicitAnyParametersInModule.errors.txt b/tests/baselines/reference/noImplicitAnyParametersInModule.errors.txt
deleted file mode 100644
index 87912f0dcfa..00000000000
--- a/tests/baselines/reference/noImplicitAnyParametersInModule.errors.txt
+++ /dev/null
@@ -1,91 +0,0 @@
-==== tests/cases/compiler/noImplicitAnyParametersInModule.ts (22 errors) ====
-    
-    module M {
-        // No implicit-'any' errors.
-        function m_f1(): void { }
-    
-        // Implicit-'any' error for x.
-        function m_f2(x): void { }
-                      ~
-!!! Parameter 'x' implicitly has an 'any' type.
-    
-        // No implicit-'any' errors.
-        function m_f3(x: any): void { }
-    
-        // Implicit-'any' errors for x, y, and z.
-        function m_f4(x, y, z): void { }
-                      ~
-!!! Parameter 'x' implicitly has an 'any' type.
-                         ~
-!!! Parameter 'y' implicitly has an 'any' type.
-                            ~
-!!! Parameter 'z' implicitly has an 'any' type.
-    
-        // Implicit-'any' errors for x and z.
-        function m_f5(x, y: any, z): void { }
-                      ~
-!!! Parameter 'x' implicitly has an 'any' type.
-                                 ~
-!!! Parameter 'z' implicitly has an 'any' type.
-    
-        // Implicit-'any[]' error for r.
-        function m_f6(...r): void { }
-                      ~~~~
-!!! Rest parameter 'r' implicitly has an 'any[]' type.
-    
-        // Implicit-'any'/'any[]' errors for x and r.
-        function m_f7(x, ...r): void { }
-                      ~
-!!! Parameter 'x' implicitly has an 'any' type.
-                         ~~~~
-!!! Rest parameter 'r' implicitly has an 'any[]' type.
-    
-        // Implicit-'any' errors for x1, y2, x3, and y3.
-        function m_f8(x1, y1: number): any;
-                      ~~
-!!! Parameter 'x1' implicitly has an 'any' type.
-        function m_f8(x2: string, y2): any;
-                                  ~~
-!!! Parameter 'y2' implicitly has an 'any' type.
-        function m_f8(x3, y3): any { }
-                      ~~
-!!! Parameter 'x3' implicitly has an 'any' type.
-                          ~~
-!!! Parameter 'y3' implicitly has an 'any' type.
-    
-        // No implicit-'any' errors.
-        var m_f9 = () => "";
-    
-        // Implicit-'any' error for x.
-        var m_f10 = (x) => "";
-                     ~
-!!! Parameter 'x' implicitly has an 'any' type.
-    
-        // Implicit-'any' errors for x, y, and z.
-        var m_f11 = (x, y, z) => "";
-                     ~
-!!! Parameter 'x' implicitly has an 'any' type.
-                        ~
-!!! Parameter 'y' implicitly has an 'any' type.
-                           ~
-!!! Parameter 'z' implicitly has an 'any' type.
-    
-        // Implicit-'any' errors for x and z.
-        var m_f12 = (x, y: any, z) => "";
-                     ~
-!!! Parameter 'x' implicitly has an 'any' type.
-                                ~
-!!! Parameter 'z' implicitly has an 'any' type.
-    
-        // Implicit-'any[]' errors for r.
-        var m_f13 = (...r) => "";
-                     ~~~~
-!!! Rest parameter 'r' implicitly has an 'any[]' type.
-    
-        // Implicit-'any'/'any[]' errors for x and r.
-        var m_f14 = (x, ...r) => "";
-                     ~
-!!! Parameter 'x' implicitly has an 'any' type.
-                        ~~~~
-!!! Rest parameter 'r' implicitly has an 'any[]' type.
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/noSelfOnVars.types b/tests/baselines/reference/noSelfOnVars.types
index 8a059d8bc60..3f7f637a468 100644
--- a/tests/baselines/reference/noSelfOnVars.types
+++ b/tests/baselines/reference/noSelfOnVars.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/noSelfOnVars.ts ===
 function foo() {
->foo : () => void
+>foo : typeof foo
 
     function bar() { }
 >bar : () => void
diff --git a/tests/baselines/reference/nonInstantiatedModule.types b/tests/baselines/reference/nonInstantiatedModule.types
index 64ca01d029d..04ad14a3d37 100644
--- a/tests/baselines/reference/nonInstantiatedModule.types
+++ b/tests/baselines/reference/nonInstantiatedModule.types
@@ -45,7 +45,7 @@ module M2 {
 >Point : typeof Point
 
         export function Origin(): Point {
->Origin : () => Point
+>Origin : typeof Origin
 >Point : Point
 
             return { x: 0, y: 0 };
diff --git a/tests/baselines/reference/null.types b/tests/baselines/reference/null.types
index 0614b5efec4..6e937ce732e 100644
--- a/tests/baselines/reference/null.types
+++ b/tests/baselines/reference/null.types
@@ -15,7 +15,7 @@ class C {
 >C : C
 }
 function f() {
->f : () => C
+>f : typeof f
 
     return null;
     return new C();
@@ -23,7 +23,7 @@ function f() {
 >C : typeof C
 }
 function g() {
->g : () => number
+>g : typeof g
 
     return null;
     return 3;
diff --git a/tests/baselines/reference/nullAssignableToEveryType.types b/tests/baselines/reference/nullAssignableToEveryType.types
index aaf3b3bd8c5..3fe16f828a4 100644
--- a/tests/baselines/reference/nullAssignableToEveryType.types
+++ b/tests/baselines/reference/nullAssignableToEveryType.types
@@ -99,7 +99,7 @@ var q: String = null;
 >String : String
 
 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
+>foo : typeof foo
 >T : T
 >U : U
 >V : V
diff --git a/tests/baselines/reference/nullIsSubtypeOfEverythingButUndefined.types b/tests/baselines/reference/nullIsSubtypeOfEverythingButUndefined.types
index 0395ae8faf5..e954f677bb7 100644
--- a/tests/baselines/reference/nullIsSubtypeOfEverythingButUndefined.types
+++ b/tests/baselines/reference/nullIsSubtypeOfEverythingButUndefined.types
@@ -62,12 +62,10 @@ var r4 = true ? null : new Date();
 var r5 = true ? /1/ : null;
 >r5 : RegExp
 >true ? /1/ : null : RegExp
->/1/ : RegExp
 
 var r5 = true ? null : /1/;
 >r5 : RegExp
 >true ? null : /1/ : RegExp
->/1/ : RegExp
 
 var r6 = true ? { foo: 1 } : null;
 >r6 : { foo: number; }
@@ -241,7 +239,7 @@ var r16 = true ? null : ac;
 >ac : typeof c
 
 function f17<T>(x: T) {
->f17 : <T>(x: T) => void
+>f17 : typeof f17
 >T : T
 >x : T
 >T : T
@@ -258,7 +256,7 @@ function f17<T>(x: T) {
 }
 
 function f18<T, U>(x: U) {
->f18 : <T, U>(x: U) => void
+>f18 : typeof f18
 >T : T
 >U : U
 >x : U
diff --git a/tests/baselines/reference/objectLitGetterSetter.types b/tests/baselines/reference/objectLitGetterSetter.types
index 271b3bf4e74..9ac8643baab 100644
--- a/tests/baselines/reference/objectLitGetterSetter.types
+++ b/tests/baselines/reference/objectLitGetterSetter.types
@@ -4,61 +4,29 @@
 >{} : {}
 
             Object.defineProperty(obj, "accProperty", <PropertyDescriptor>({
->Object.defineProperty(obj, "accProperty", <PropertyDescriptor>({
-                get: function () {
-                    eval("public = 1;");
-                    return 11;
-                },
-                set: function (v) {
-                }
-            })) : any
+>Object.defineProperty(obj, "accProperty", <PropertyDescriptor>({                get: function () {                    eval("public = 1;");                    return 11;                },                set: function (v) {                }            })) : any
 >Object.defineProperty : (o: any, p: string, attributes: PropertyDescriptor) => any
 >Object : { (): any; (value: any): any; new (value?: any): Object; prototype: Object; getPrototypeOf(o: any): any; getOwnPropertyDescriptor(o: any, p: string): PropertyDescriptor; getOwnPropertyNames(o: any): string[]; create(o: any, properties?: PropertyDescriptorMap): any; defineProperty(o: any, p: string, attributes: PropertyDescriptor): any; defineProperties(o: any, properties: PropertyDescriptorMap): any; seal(o: any): any; freeze(o: any): any; preventExtensions(o: any): any; isSealed(o: any): boolean; isFrozen(o: any): boolean; isExtensible(o: any): boolean; keys(o: any): string[]; }
 >defineProperty : (o: any, p: string, attributes: PropertyDescriptor) => any
 >obj : {}
-><PropertyDescriptor>({
-                get: function () {
-                    eval("public = 1;");
-                    return 11;
-                },
-                set: function (v) {
-                }
-            }) : PropertyDescriptor
+><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; }
+>({                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; }
 
                 get: function () {
 >get : () => number
->function () {
-                    eval("public = 1;");
-                    return 11;
-                } : () => number
+>function () {                    eval("public = 1;");                    return 11;                } : () => number
 
                     eval("public = 1;");
 >eval("public = 1;") : any
->eval : (x: string) => any
+>eval : typeof eval
 
                     return 11;
                 },
                 set: function (v) {
 >set : (v: any) => void
->function (v) {
-                } : (v: any) => void
+>function (v) {                } : (v: any) => void
 >v : any
                 }
             }))
diff --git a/tests/baselines/reference/objectLiteralArraySpecialization.types b/tests/baselines/reference/objectLiteralArraySpecialization.types
index d077354728b..b7be0f6c1a0 100644
--- a/tests/baselines/reference/objectLiteralArraySpecialization.types
+++ b/tests/baselines/reference/objectLiteralArraySpecialization.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/objectLiteralArraySpecialization.ts ===
 declare function create<T>(initialValues?: T[]): MyArrayWrapper<T>;
->create : <T>(initialValues?: T[]) => MyArrayWrapper<T>
+>create : typeof create
 >T : T
 >initialValues : T[]
 >T : T
@@ -27,7 +27,7 @@ interface MyArrayWrapper<T> {
 var thing = create([ { name: "bob", id: 24 }, { name: "doug", id: 32 } ]); // should not error
 >thing : MyArrayWrapper<{ name: string; id: number; }>
 >create([ { name: "bob", id: 24 }, { name: "doug", id: 32 } ]) : MyArrayWrapper<{ name: string; id: number; }>
->create : <T>(initialValues?: T[]) => MyArrayWrapper<T>
+>create : typeof create
 >[ { name: "bob", id: 24 }, { name: "doug", id: 32 } ] : { name: string; id: number; }[]
 >{ name: "bob", id: 24 } : { name: string; id: number; }
 >name : string
diff --git a/tests/baselines/reference/objectLiteralWidened.types b/tests/baselines/reference/objectLiteralWidened.types
index cd62d194f23..e8dc707a489 100644
--- a/tests/baselines/reference/objectLiteralWidened.types
+++ b/tests/baselines/reference/objectLiteralWidened.types
@@ -3,10 +3,7 @@
 
 var x = {
 >x : { foo: any; bar: any; }
->{
-    foo: null,
-    bar: undefined
-} : { foo: null; bar: undefined; }
+>{    foo: null,    bar: undefined} : { foo: null; bar: undefined; }
 
     foo: null,
 >foo : any
@@ -18,23 +15,14 @@ var x = {
 
 var y = {
 >y : { foo: any; bar: { baz: any; boo: any; }; }
->{
-    foo: null,
-    bar: {
-        baz: null,
-        boo: undefined
-    }
-} : { foo: null; bar: { baz: null; boo: undefined; }; }
+>{    foo: null,    bar: {        baz: null,        boo: undefined    }} : { foo: null; bar: { baz: null; boo: undefined; }; }
 
     foo: null,
 >foo : any
 
     bar: {
 >bar : { baz: any; boo: any; }
->{
-        baz: null,
-        boo: undefined
-    } : { baz: null; boo: undefined; }
+>{        baz: null,        boo: undefined    } : { baz: null; boo: undefined; }
 
         baz: null,
 >baz : any
diff --git a/tests/baselines/reference/objectTypeHidingMembersOfObject.types b/tests/baselines/reference/objectTypeHidingMembersOfObject.types
index 1926969b8bb..5bbd3a555ee 100644
--- a/tests/baselines/reference/objectTypeHidingMembersOfObject.types
+++ b/tests/baselines/reference/objectTypeHidingMembersOfObject.types
@@ -39,9 +39,7 @@ var r2: void = i.valueOf();
 
 var a = {
 >a : { valueOf: () => void; }
->{
-    valueOf: () => { }
-} : { valueOf: () => void; }
+>{    valueOf: () => { }} : { valueOf: () => void; }
 
     valueOf: () => { }
 >valueOf : () => void
diff --git a/tests/baselines/reference/objectTypePropertyAccess.types b/tests/baselines/reference/objectTypePropertyAccess.types
index 2ad370fd7aa..56e45f1bae0 100644
--- a/tests/baselines/reference/objectTypePropertyAccess.types
+++ b/tests/baselines/reference/objectTypePropertyAccess.types
@@ -71,9 +71,7 @@ var r7 = i['bar'];
 
 var a = {
 >a : { foo: string; }
->{
-    foo: ''
-} : { foo: string; }
+>{    foo: ''} : { foo: string; }
 
     foo: ''
 >foo : string
diff --git a/tests/baselines/reference/objectTypeWithNumericProperty.types b/tests/baselines/reference/objectTypeWithNumericProperty.types
index fb9e20f94a0..7c507cd4f64 100644
--- a/tests/baselines/reference/objectTypeWithNumericProperty.types
+++ b/tests/baselines/reference/objectTypeWithNumericProperty.types
@@ -92,10 +92,7 @@ var r4 = a['1.1'];
 
 var b = {
 >b : { 1: number; 1.1: string; }
->{
-    1: 1,
-    1.1: ""
-} : { 1: number; 1.1: string; }
+>{    1: 1,    1.1: ""} : { 1: number; 1.1: string; }
 
     1: 1,
     1.1: ""
diff --git a/tests/baselines/reference/objectTypeWithStringNamedNumericProperty.types b/tests/baselines/reference/objectTypeWithStringNamedNumericProperty.types
index 8f445923024..7a25f163efe 100644
--- a/tests/baselines/reference/objectTypeWithStringNamedNumericProperty.types
+++ b/tests/baselines/reference/objectTypeWithStringNamedNumericProperty.types
@@ -344,16 +344,7 @@ var r13 = i[-01]
 
 var b = {
 >b : { "1": number; "0.1": void; ".1": Object; "1.": string; "1..": boolean; "1.0": Date; "-1.0": RegExp; "-1": { (): 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; }; }
->{
-    "0.1": <void>null,
-    ".1": new Object(),
-    "1": 1,
-    "1.": "",
-    "1..": true,
-    "1.0": new Date(),
-    "-1.0": /123/,
-    "-1": Date
-} : { "1": number; "0.1": void; ".1": Object; "1.": string; "1..": boolean; "1.0": Date; "-1.0": RegExp; "-1": { (): 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; }; }
+>{    "0.1": <void>null,    ".1": new Object(),    "1": 1,    "1.": "",    "1..": true,    "1.0": new Date(),    "-1.0": /123/,    "-1": Date} : { "1": number; "0.1": void; ".1": Object; "1.": string; "1..": boolean; "1.0": Date; "-1.0": RegExp; "-1": { (): 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; }; }
 
     "0.1": <void>null,
 ><void>null : void
@@ -370,8 +361,6 @@ var b = {
 >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; }
 
     "-1.0": /123/,
->/123/ : RegExp
-
     "-1": Date
 >Date : Date
 
diff --git a/tests/baselines/reference/objectTypeWithStringNamedPropertyOfIllegalCharacters.types b/tests/baselines/reference/objectTypeWithStringNamedPropertyOfIllegalCharacters.types
index 032f54a8565..fce2b03f53f 100644
--- a/tests/baselines/reference/objectTypeWithStringNamedPropertyOfIllegalCharacters.types
+++ b/tests/baselines/reference/objectTypeWithStringNamedPropertyOfIllegalCharacters.types
@@ -99,11 +99,7 @@ var r4 = a["~!@#$%^&*()_+{}|:'<>?\/.,`"];
 
 var b = {
 >b : { "   ": number; "a   b": string; "~!@#$%^&*()_+{}|:'<>?\/.,`": number; }
->{
-    "   ": 1,
-    "a   b": "",
-    "~!@#$%^&*()_+{}|:'<>?\/.,`": 1,
-} : { "   ": number; "a   b": string; "~!@#$%^&*()_+{}|:'<>?\/.,`": number; }
+>{    "   ": 1,    "a   b": "",    "~!@#$%^&*()_+{}|:'<>?\/.,`": 1,} : { "   ": number; "a   b": string; "~!@#$%^&*()_+{}|:'<>?\/.,`": number; }
 
     "   ": 1,
     "a   b": "",
diff --git a/tests/baselines/reference/objectTypesIdentity.types b/tests/baselines/reference/objectTypesIdentity.types
index c148c4223ed..7a7db0b15d7 100644
--- a/tests/baselines/reference/objectTypesIdentity.types
+++ b/tests/baselines/reference/objectTypesIdentity.types
@@ -41,240 +41,240 @@ var b = { foo: '' };
 >foo : string
 
 function foo1(x: A);
->foo1 : { (x: A): any; (x: A): any; }
+>foo1 : typeof foo1
 >x : A
 >A : A
 
 function foo1(x: A); // error
->foo1 : { (x: A): any; (x: A): any; }
+>foo1 : typeof foo1
 >x : A
 >A : A
 
 function foo1(x: any) { }
->foo1 : { (x: A): any; (x: A): any; }
+>foo1 : typeof foo1
 >x : any
 
 function foo1b(x: B);
->foo1b : { (x: B): any; (x: B): any; }
+>foo1b : typeof foo1b
 >x : B
 >B : B
 
 function foo1b(x: B); // error
->foo1b : { (x: B): any; (x: B): any; }
+>foo1b : typeof foo1b
 >x : B
 >B : B
 
 function foo1b(x: any) { }
->foo1b : { (x: B): any; (x: B): any; }
+>foo1b : typeof foo1b
 >x : any
 
 function foo1c(x: C<string>);
->foo1c : { (x: C<string>): any; (x: C<string>): any; }
+>foo1c : typeof foo1c
 >x : C<string>
 >C : C<T>
 
 function foo1c(x: C<string>); // error
->foo1c : { (x: C<string>): any; (x: C<string>): any; }
+>foo1c : typeof foo1c
 >x : C<string>
 >C : C<T>
 
 function foo1c(x: any) { }
->foo1c : { (x: C<string>): any; (x: C<string>): any; }
+>foo1c : typeof foo1c
 >x : any
 
 function foo2(x: I);
->foo2 : { (x: I): any; (x: I): any; }
+>foo2 : typeof foo2
 >x : I
 >I : I
 
 function foo2(x: I); // error
->foo2 : { (x: I): any; (x: I): any; }
+>foo2 : typeof foo2
 >x : I
 >I : I
 
 function foo2(x: any) { }
->foo2 : { (x: I): any; (x: I): any; }
+>foo2 : typeof foo2
 >x : any
 
 function foo3(x: typeof a);
->foo3 : { (x: { foo: string; }): any; (x: { foo: string; }): any; }
+>foo3 : typeof foo3
 >x : { foo: string; }
 >a : { foo: string; }
 
 function foo3(x: typeof a); // error
->foo3 : { (x: { foo: string; }): any; (x: { foo: string; }): any; }
+>foo3 : typeof foo3
 >x : { foo: string; }
 >a : { foo: string; }
 
 function foo3(x: any) { }
->foo3 : { (x: { foo: string; }): any; (x: { foo: string; }): any; }
+>foo3 : typeof foo3
 >x : any
 
 function foo4(x: typeof b);
->foo4 : { (x: { foo: string; }): any; (x: { foo: string; }): any; }
+>foo4 : typeof foo4
 >x : { foo: string; }
 >b : { foo: string; }
 
 function foo4(x: typeof b); // error
->foo4 : { (x: { foo: string; }): any; (x: { foo: string; }): any; }
+>foo4 : typeof foo4
 >x : { foo: string; }
 >b : { foo: string; }
 
 function foo4(x: any) { }
->foo4 : { (x: { foo: string; }): any; (x: { foo: string; }): any; }
+>foo4 : typeof foo4
 >x : any
 
 function foo5(x: A);
->foo5 : { (x: A): any; (x: B): any; }
+>foo5 : typeof foo5
 >x : A
 >A : A
 
 function foo5(x: B); // error
->foo5 : { (x: A): any; (x: B): any; }
+>foo5 : typeof foo5
 >x : B
 >B : B
 
 function foo5(x: any) { }
->foo5 : { (x: A): any; (x: B): any; }
+>foo5 : typeof foo5
 >x : any
 
 function foo5b(x: A);
->foo5b : { (x: A): any; (x: C<string>): any; }
+>foo5b : typeof foo5b
 >x : A
 >A : A
 
 function foo5b(x: C<string>); // error
->foo5b : { (x: A): any; (x: C<string>): any; }
+>foo5b : typeof foo5b
 >x : C<string>
 >C : C<T>
 
 function foo5b(x: any) { }
->foo5b : { (x: A): any; (x: C<string>): any; }
+>foo5b : typeof foo5b
 >x : any
 
 function foo6(x: A);
->foo6 : { (x: A): any; (x: I): any; }
+>foo6 : typeof foo6
 >x : A
 >A : A
 
 function foo6(x: I); // error
->foo6 : { (x: A): any; (x: I): any; }
+>foo6 : typeof foo6
 >x : I
 >I : I
 
 function foo6(x: any) { }
->foo6 : { (x: A): any; (x: I): any; }
+>foo6 : typeof foo6
 >x : any
 
 function foo7(x: A);
->foo7 : { (x: A): any; (x: { foo: string; }): any; }
+>foo7 : typeof foo7
 >x : A
 >A : A
 
 function foo7(x: typeof a); // error
->foo7 : { (x: A): any; (x: { foo: string; }): any; }
+>foo7 : typeof foo7
 >x : { foo: string; }
 >a : { foo: string; }
 
 function foo7(x: any) { }
->foo7 : { (x: A): any; (x: { foo: string; }): any; }
+>foo7 : typeof foo7
 >x : any
 
 function foo8(x: B);
->foo8 : { (x: B): any; (x: I): any; }
+>foo8 : typeof foo8
 >x : B
 >B : B
 
 function foo8(x: I); // error
->foo8 : { (x: B): any; (x: I): any; }
+>foo8 : typeof foo8
 >x : I
 >I : I
 
 function foo8(x: any) { }
->foo8 : { (x: B): any; (x: I): any; }
+>foo8 : typeof foo8
 >x : any
 
 function foo9(x: B);
->foo9 : { (x: B): any; (x: C<string>): any; }
+>foo9 : typeof foo9
 >x : B
 >B : B
 
 function foo9(x: C<string>); // error
->foo9 : { (x: B): any; (x: C<string>): any; }
+>foo9 : typeof foo9
 >x : C<string>
 >C : C<T>
 
 function foo9(x: any) { }
->foo9 : { (x: B): any; (x: C<string>): any; }
+>foo9 : typeof foo9
 >x : any
 
 function foo10(x: B);
->foo10 : { (x: B): any; (x: { foo: string; }): any; }
+>foo10 : typeof foo10
 >x : B
 >B : B
 
 function foo10(x: typeof a); // error
->foo10 : { (x: B): any; (x: { foo: string; }): any; }
+>foo10 : typeof foo10
 >x : { foo: string; }
 >a : { foo: string; }
 
 function foo10(x: any) { }
->foo10 : { (x: B): any; (x: { foo: string; }): any; }
+>foo10 : typeof foo10
 >x : any
 
 function foo11(x: B);
->foo11 : { (x: B): any; (x: { foo: string; }): any; }
+>foo11 : typeof foo11
 >x : B
 >B : B
 
 function foo11(x: typeof b); // error
->foo11 : { (x: B): any; (x: { foo: string; }): any; }
+>foo11 : typeof foo11
 >x : { foo: string; }
 >b : { foo: string; }
 
 function foo11(x: any) { }
->foo11 : { (x: B): any; (x: { foo: string; }): any; }
+>foo11 : typeof foo11
 >x : any
 
 function foo12(x: I);
->foo12 : { (x: I): any; (x: C<string>): any; }
+>foo12 : typeof foo12
 >x : I
 >I : I
 
 function foo12(x: C<string>); // error
->foo12 : { (x: I): any; (x: C<string>): any; }
+>foo12 : typeof foo12
 >x : C<string>
 >C : C<T>
 
 function foo12(x: any) { }
->foo12 : { (x: I): any; (x: C<string>): any; }
+>foo12 : typeof foo12
 >x : any
 
 function foo13(x: I);
->foo13 : { (x: I): any; (x: { foo: string; }): any; }
+>foo13 : typeof foo13
 >x : I
 >I : I
 
 function foo13(x: typeof a); // error
->foo13 : { (x: I): any; (x: { foo: string; }): any; }
+>foo13 : typeof foo13
 >x : { foo: string; }
 >a : { foo: string; }
 
 function foo13(x: any) { }
->foo13 : { (x: I): any; (x: { foo: string; }): any; }
+>foo13 : typeof foo13
 >x : any
 
 function foo14(x: I);
->foo14 : { (x: I): any; (x: { foo: string; }): any; }
+>foo14 : typeof foo14
 >x : I
 >I : I
 
 function foo14(x: typeof b); // error
->foo14 : { (x: I): any; (x: { foo: string; }): any; }
+>foo14 : typeof foo14
 >x : { foo: string; }
 >b : { foo: string; }
 
 function foo14(x: any) { }
->foo14 : { (x: I): any; (x: { foo: string; }): any; }
+>foo14 : typeof foo14
 >x : any
 
diff --git a/tests/baselines/reference/objectTypesIdentity2.types b/tests/baselines/reference/objectTypesIdentity2.types
index 1969d55bd11..891a0e25c04 100644
--- a/tests/baselines/reference/objectTypesIdentity2.types
+++ b/tests/baselines/reference/objectTypesIdentity2.types
@@ -50,156 +50,156 @@ var b = { foo: E.A };
 >A : E
 
 function foo5(x: A);
->foo5 : { (x: A): any; (x: B): any; }
+>foo5 : typeof foo5
 >x : A
 >A : A
 
 function foo5(x: B); // ok
->foo5 : { (x: A): any; (x: B): any; }
+>foo5 : typeof foo5
 >x : B
 >B : B
 
 function foo5(x: any) { }
->foo5 : { (x: A): any; (x: B): any; }
+>foo5 : typeof foo5
 >x : any
 
 function foo5b(x: A);
->foo5b : { (x: A): any; (x: C<string>): any; }
+>foo5b : typeof foo5b
 >x : A
 >A : A
 
 function foo5b(x: C<string>); // ok
->foo5b : { (x: A): any; (x: C<string>): any; }
+>foo5b : typeof foo5b
 >x : C<string>
 >C : C<T>
 
 function foo5b(x: any) { }
->foo5b : { (x: A): any; (x: C<string>): any; }
+>foo5b : typeof foo5b
 >x : any
 
 function foo6(x: A);
->foo6 : { (x: A): any; (x: I): any; }
+>foo6 : typeof foo6
 >x : A
 >A : A
 
 function foo6(x: I); // ok
->foo6 : { (x: A): any; (x: I): any; }
+>foo6 : typeof foo6
 >x : I
 >I : I
 
 function foo6(x: any) { }
->foo6 : { (x: A): any; (x: I): any; }
+>foo6 : typeof foo6
 >x : any
 
 function foo7(x: A);
->foo7 : { (x: A): any; (x: { foo: RegExp; }): any; }
+>foo7 : typeof foo7
 >x : A
 >A : A
 
 function foo7(x: typeof a); // ok
->foo7 : { (x: A): any; (x: { foo: RegExp; }): any; }
+>foo7 : typeof foo7
 >x : { foo: RegExp; }
 >a : { foo: RegExp; }
 
 function foo7(x: any) { }
->foo7 : { (x: A): any; (x: { foo: RegExp; }): any; }
+>foo7 : typeof foo7
 >x : any
 
 function foo8(x: B);
->foo8 : { (x: B): any; (x: I): any; }
+>foo8 : typeof foo8
 >x : B
 >B : B
 
 function foo8(x: I); // ok
->foo8 : { (x: B): any; (x: I): any; }
+>foo8 : typeof foo8
 >x : I
 >I : I
 
 function foo8(x: any) { }
->foo8 : { (x: B): any; (x: I): any; }
+>foo8 : typeof foo8
 >x : any
 
 function foo9(x: B);
->foo9 : { (x: B): any; (x: C<string>): any; }
+>foo9 : typeof foo9
 >x : B
 >B : B
 
 function foo9(x: C<string>); // ok
->foo9 : { (x: B): any; (x: C<string>): any; }
+>foo9 : typeof foo9
 >x : C<string>
 >C : C<T>
 
 function foo9(x: any) { }
->foo9 : { (x: B): any; (x: C<string>): any; }
+>foo9 : typeof foo9
 >x : any
 
 function foo10(x: B);
->foo10 : { (x: B): any; (x: { foo: RegExp; }): any; }
+>foo10 : typeof foo10
 >x : B
 >B : B
 
 function foo10(x: typeof a); // ok
->foo10 : { (x: B): any; (x: { foo: RegExp; }): any; }
+>foo10 : typeof foo10
 >x : { foo: RegExp; }
 >a : { foo: RegExp; }
 
 function foo10(x: any) { }
->foo10 : { (x: B): any; (x: { foo: RegExp; }): any; }
+>foo10 : typeof foo10
 >x : any
 
 function foo11(x: B);
->foo11 : { (x: B): any; (x: { foo: E; }): any; }
+>foo11 : typeof foo11
 >x : B
 >B : B
 
 function foo11(x: typeof b); // ok
->foo11 : { (x: B): any; (x: { foo: E; }): any; }
+>foo11 : typeof foo11
 >x : { foo: E; }
 >b : { foo: E; }
 
 function foo11(x: any) { }
->foo11 : { (x: B): any; (x: { foo: E; }): any; }
+>foo11 : typeof foo11
 >x : any
 
 function foo12(x: I);
->foo12 : { (x: I): any; (x: C<string>): any; }
+>foo12 : typeof foo12
 >x : I
 >I : I
 
 function foo12(x: C<string>); // ok
->foo12 : { (x: I): any; (x: C<string>): any; }
+>foo12 : typeof foo12
 >x : C<string>
 >C : C<T>
 
 function foo12(x: any) { }
->foo12 : { (x: I): any; (x: C<string>): any; }
+>foo12 : typeof foo12
 >x : any
 
 function foo13(x: I);
->foo13 : { (x: I): any; (x: { foo: RegExp; }): any; }
+>foo13 : typeof foo13
 >x : I
 >I : I
 
 function foo13(x: typeof a); // ok
->foo13 : { (x: I): any; (x: { foo: RegExp; }): any; }
+>foo13 : typeof foo13
 >x : { foo: RegExp; }
 >a : { foo: RegExp; }
 
 function foo13(x: any) { }
->foo13 : { (x: I): any; (x: { foo: RegExp; }): any; }
+>foo13 : typeof foo13
 >x : any
 
 function foo14(x: I);
->foo14 : { (x: I): any; (x: { foo: E; }): any; }
+>foo14 : typeof foo14
 >x : I
 >I : I
 
 function foo14(x: typeof b); // ok
->foo14 : { (x: I): any; (x: { foo: E; }): any; }
+>foo14 : typeof foo14
 >x : { foo: E; }
 >b : { foo: E; }
 
 function foo14(x: any) { }
->foo14 : { (x: I): any; (x: { foo: E; }): any; }
+>foo14 : typeof foo14
 >x : any
 
diff --git a/tests/baselines/reference/objectTypesIdentityWithCallSignatures.types b/tests/baselines/reference/objectTypesIdentityWithCallSignatures.types
index f73785fab0d..d484446b91e 100644
--- a/tests/baselines/reference/objectTypesIdentityWithCallSignatures.types
+++ b/tests/baselines/reference/objectTypesIdentityWithCallSignatures.types
@@ -60,268 +60,268 @@ var b = { foo(x: string) { return ''; } };
 >x : string
 
 function foo1(x: A);
->foo1 : { (x: A): any; (x: A): any; }
+>foo1 : typeof foo1
 >x : A
 >A : A
 
 function foo1(x: A); // error
->foo1 : { (x: A): any; (x: A): any; }
+>foo1 : typeof foo1
 >x : A
 >A : A
 
 function foo1(x: any) { }
->foo1 : { (x: A): any; (x: A): any; }
+>foo1 : typeof foo1
 >x : any
 
 function foo1b(x: B);
->foo1b : { (x: B): any; (x: B): any; }
+>foo1b : typeof foo1b
 >x : B
 >B : B
 
 function foo1b(x: B); // error
->foo1b : { (x: B): any; (x: B): any; }
+>foo1b : typeof foo1b
 >x : B
 >B : B
 
 function foo1b(x: any) { }
->foo1b : { (x: B): any; (x: B): any; }
+>foo1b : typeof foo1b
 >x : any
 
 function foo1c(x: C<string>);
->foo1c : { (x: C<string>): any; (x: C<string>): any; }
+>foo1c : typeof foo1c
 >x : C<string>
 >C : C<T>
 
 function foo1c(x: C<string>); // error
->foo1c : { (x: C<string>): any; (x: C<string>): any; }
+>foo1c : typeof foo1c
 >x : C<string>
 >C : C<T>
 
 function foo1c(x: any) { }
->foo1c : { (x: C<string>): any; (x: C<string>): any; }
+>foo1c : typeof foo1c
 >x : any
 
 function foo2(x: I);
->foo2 : { (x: I): any; (x: I): any; }
+>foo2 : typeof foo2
 >x : I
 >I : I
 
 function foo2(x: I); // error
->foo2 : { (x: I): any; (x: I): any; }
+>foo2 : typeof foo2
 >x : I
 >I : I
 
 function foo2(x: any) { }
->foo2 : { (x: I): any; (x: I): any; }
+>foo2 : typeof foo2
 >x : any
 
 function foo3(x: typeof a);
->foo3 : { (x: { foo(x: string): string; }): any; (x: { foo(x: string): string; }): any; }
+>foo3 : typeof foo3
 >x : { foo(x: string): string; }
 >a : { foo(x: string): string; }
 
 function foo3(x: typeof a); // error
->foo3 : { (x: { foo(x: string): string; }): any; (x: { foo(x: string): string; }): any; }
+>foo3 : typeof foo3
 >x : { foo(x: string): string; }
 >a : { foo(x: string): string; }
 
 function foo3(x: any) { }
->foo3 : { (x: { foo(x: string): string; }): any; (x: { foo(x: string): string; }): any; }
+>foo3 : typeof foo3
 >x : any
 
 function foo4(x: typeof b);
->foo4 : { (x: { foo: (x: string) => string; }): any; (x: { foo: (x: string) => string; }): any; }
+>foo4 : typeof foo4
 >x : { foo: (x: string) => string; }
 >b : { foo: (x: string) => string; }
 
 function foo4(x: typeof b); // error
->foo4 : { (x: { foo: (x: string) => string; }): any; (x: { foo: (x: string) => string; }): any; }
+>foo4 : typeof foo4
 >x : { foo: (x: string) => string; }
 >b : { foo: (x: string) => string; }
 
 function foo4(x: any) { }
->foo4 : { (x: { foo: (x: string) => string; }): any; (x: { foo: (x: string) => string; }): any; }
+>foo4 : typeof foo4
 >x : any
 
 function foo5(x: A);
->foo5 : { (x: A): any; (x: B): any; }
+>foo5 : typeof foo5
 >x : A
 >A : A
 
 function foo5(x: B); // error
->foo5 : { (x: A): any; (x: B): any; }
+>foo5 : typeof foo5
 >x : B
 >B : B
 
 function foo5(x: any) { }
->foo5 : { (x: A): any; (x: B): any; }
+>foo5 : typeof foo5
 >x : any
 
 function foo5b(x: A);
->foo5b : { (x: A): any; (x: C<string>): any; }
+>foo5b : typeof foo5b
 >x : A
 >A : A
 
 function foo5b(x: C<string>); // error
->foo5b : { (x: A): any; (x: C<string>): any; }
+>foo5b : typeof foo5b
 >x : C<string>
 >C : C<T>
 
 function foo5b(x: any) { }
->foo5b : { (x: A): any; (x: C<string>): any; }
+>foo5b : typeof foo5b
 >x : any
 
 function foo6(x: A);
->foo6 : { (x: A): any; (x: I): any; }
+>foo6 : typeof foo6
 >x : A
 >A : A
 
 function foo6(x: I); // error
->foo6 : { (x: A): any; (x: I): any; }
+>foo6 : typeof foo6
 >x : I
 >I : I
 
 function foo6(x: any) { }
->foo6 : { (x: A): any; (x: I): any; }
+>foo6 : typeof foo6
 >x : any
 
 function foo7(x: A);
->foo7 : { (x: A): any; (x: { foo(x: string): string; }): any; }
+>foo7 : typeof foo7
 >x : A
 >A : A
 
 function foo7(x: typeof a); // error
->foo7 : { (x: A): any; (x: { foo(x: string): string; }): any; }
+>foo7 : typeof foo7
 >x : { foo(x: string): string; }
 >a : { foo(x: string): string; }
 
 function foo7(x: any) { }
->foo7 : { (x: A): any; (x: { foo(x: string): string; }): any; }
+>foo7 : typeof foo7
 >x : any
 
 function foo8(x: B);
->foo8 : { (x: B): any; (x: I): any; }
+>foo8 : typeof foo8
 >x : B
 >B : B
 
 function foo8(x: I); // error
->foo8 : { (x: B): any; (x: I): any; }
+>foo8 : typeof foo8
 >x : I
 >I : I
 
 function foo8(x: any) { }
->foo8 : { (x: B): any; (x: I): any; }
+>foo8 : typeof foo8
 >x : any
 
 function foo9(x: B);
->foo9 : { (x: B): any; (x: C<string>): any; }
+>foo9 : typeof foo9
 >x : B
 >B : B
 
 function foo9(x: C<string>); // error
->foo9 : { (x: B): any; (x: C<string>): any; }
+>foo9 : typeof foo9
 >x : C<string>
 >C : C<T>
 
 function foo9(x: any) { }
->foo9 : { (x: B): any; (x: C<string>): any; }
+>foo9 : typeof foo9
 >x : any
 
 function foo10(x: B);
->foo10 : { (x: B): any; (x: { foo(x: string): string; }): any; }
+>foo10 : typeof foo10
 >x : B
 >B : B
 
 function foo10(x: typeof a); // error
->foo10 : { (x: B): any; (x: { foo(x: string): string; }): any; }
+>foo10 : typeof foo10
 >x : { foo(x: string): string; }
 >a : { foo(x: string): string; }
 
 function foo10(x: any) { }
->foo10 : { (x: B): any; (x: { foo(x: string): string; }): any; }
+>foo10 : typeof foo10
 >x : any
 
 function foo11(x: B);
->foo11 : { (x: B): any; (x: { foo: (x: string) => string; }): any; }
+>foo11 : typeof foo11
 >x : B
 >B : B
 
 function foo11(x: typeof b); // error
->foo11 : { (x: B): any; (x: { foo: (x: string) => string; }): any; }
+>foo11 : typeof foo11
 >x : { foo: (x: string) => string; }
 >b : { foo: (x: string) => string; }
 
 function foo11(x: any) { }
->foo11 : { (x: B): any; (x: { foo: (x: string) => string; }): any; }
+>foo11 : typeof foo11
 >x : any
 
 function foo12(x: I);
->foo12 : { (x: I): any; (x: C<string>): any; }
+>foo12 : typeof foo12
 >x : I
 >I : I
 
 function foo12(x: C<string>); // error
->foo12 : { (x: I): any; (x: C<string>): any; }
+>foo12 : typeof foo12
 >x : C<string>
 >C : C<T>
 
 function foo12(x: any) { }
->foo12 : { (x: I): any; (x: C<string>): any; }
+>foo12 : typeof foo12
 >x : any
 
 function foo12b(x: I2<string>);
->foo12b : { (x: I2<string>): any; (x: C<string>): any; }
+>foo12b : typeof foo12b
 >x : I2<string>
 >I2 : I2<T>
 
 function foo12b(x: C<string>); // error
->foo12b : { (x: I2<string>): any; (x: C<string>): any; }
+>foo12b : typeof foo12b
 >x : C<string>
 >C : C<T>
 
 function foo12b(x: any) { }
->foo12b : { (x: I2<string>): any; (x: C<string>): any; }
+>foo12b : typeof foo12b
 >x : any
 
 function foo13(x: I);
->foo13 : { (x: I): any; (x: { foo(x: string): string; }): any; }
+>foo13 : typeof foo13
 >x : I
 >I : I
 
 function foo13(x: typeof a); // error
->foo13 : { (x: I): any; (x: { foo(x: string): string; }): any; }
+>foo13 : typeof foo13
 >x : { foo(x: string): string; }
 >a : { foo(x: string): string; }
 
 function foo13(x: any) { }
->foo13 : { (x: I): any; (x: { foo(x: string): string; }): any; }
+>foo13 : typeof foo13
 >x : any
 
 function foo14(x: I);
->foo14 : { (x: I): any; (x: { foo: (x: string) => string; }): any; }
+>foo14 : typeof foo14
 >x : I
 >I : I
 
 function foo14(x: typeof b); // error
->foo14 : { (x: I): any; (x: { foo: (x: string) => string; }): any; }
+>foo14 : typeof foo14
 >x : { foo: (x: string) => string; }
 >b : { foo: (x: string) => string; }
 
 function foo14(x: any) { }
->foo14 : { (x: I): any; (x: { foo: (x: string) => string; }): any; }
+>foo14 : typeof foo14
 >x : any
 
 function foo15(x: I2<string>);
->foo15 : { (x: I2<string>): any; (x: C<number>): any; }
+>foo15 : typeof foo15
 >x : I2<string>
 >I2 : I2<T>
 
 function foo15(x: C<number>); // ok
->foo15 : { (x: I2<string>): any; (x: C<number>): any; }
+>foo15 : typeof foo15
 >x : C<number>
 >C : C<T>
 
 function foo15(x: any) { }
->foo15 : { (x: I2<string>): any; (x: C<number>): any; }
+>foo15 : typeof foo15
 >x : any
 
diff --git a/tests/baselines/reference/objectTypesIdentityWithCallSignatures2.types b/tests/baselines/reference/objectTypesIdentityWithCallSignatures2.types
index 16b658d0e43..f45434ed589 100644
--- a/tests/baselines/reference/objectTypesIdentityWithCallSignatures2.types
+++ b/tests/baselines/reference/objectTypesIdentityWithCallSignatures2.types
@@ -62,268 +62,268 @@ var b = { foo(x: RegExp) { return ''; } };
 >RegExp : RegExp
 
 function foo1(x: A);
->foo1 : { (x: A): any; (x: A): any; }
+>foo1 : typeof foo1
 >x : A
 >A : A
 
 function foo1(x: A); // error
->foo1 : { (x: A): any; (x: A): any; }
+>foo1 : typeof foo1
 >x : A
 >A : A
 
 function foo1(x: any) { }
->foo1 : { (x: A): any; (x: A): any; }
+>foo1 : typeof foo1
 >x : any
 
 function foo1b(x: B);
->foo1b : { (x: B): any; (x: B): any; }
+>foo1b : typeof foo1b
 >x : B
 >B : B
 
 function foo1b(x: B); // error
->foo1b : { (x: B): any; (x: B): any; }
+>foo1b : typeof foo1b
 >x : B
 >B : B
 
 function foo1b(x: any) { }
->foo1b : { (x: B): any; (x: B): any; }
+>foo1b : typeof foo1b
 >x : any
 
 function foo1c(x: C<string>);
->foo1c : { (x: C<string>): any; (x: C<string>): any; }
+>foo1c : typeof foo1c
 >x : C<string>
 >C : C<T>
 
 function foo1c(x: C<string>); // error
->foo1c : { (x: C<string>): any; (x: C<string>): any; }
+>foo1c : typeof foo1c
 >x : C<string>
 >C : C<T>
 
 function foo1c(x: any) { }
->foo1c : { (x: C<string>): any; (x: C<string>): any; }
+>foo1c : typeof foo1c
 >x : any
 
 function foo2(x: I);
->foo2 : { (x: I): any; (x: I): any; }
+>foo2 : typeof foo2
 >x : I
 >I : I
 
 function foo2(x: I); // error
->foo2 : { (x: I): any; (x: I): any; }
+>foo2 : typeof foo2
 >x : I
 >I : I
 
 function foo2(x: any) { }
->foo2 : { (x: I): any; (x: I): any; }
+>foo2 : typeof foo2
 >x : any
 
 function foo3(x: typeof a);
->foo3 : { (x: { foo(x: Date): string; }): any; (x: { foo(x: Date): string; }): any; }
+>foo3 : typeof foo3
 >x : { foo(x: Date): string; }
 >a : { foo(x: Date): string; }
 
 function foo3(x: typeof a); // error
->foo3 : { (x: { foo(x: Date): string; }): any; (x: { foo(x: Date): string; }): any; }
+>foo3 : typeof foo3
 >x : { foo(x: Date): string; }
 >a : { foo(x: Date): string; }
 
 function foo3(x: any) { }
->foo3 : { (x: { foo(x: Date): string; }): any; (x: { foo(x: Date): string; }): any; }
+>foo3 : typeof foo3
 >x : any
 
 function foo4(x: typeof b);
->foo4 : { (x: { foo: (x: RegExp) => string; }): any; (x: { foo: (x: RegExp) => string; }): any; }
+>foo4 : typeof foo4
 >x : { foo: (x: RegExp) => string; }
 >b : { foo: (x: RegExp) => string; }
 
 function foo4(x: typeof b); // error
->foo4 : { (x: { foo: (x: RegExp) => string; }): any; (x: { foo: (x: RegExp) => string; }): any; }
+>foo4 : typeof foo4
 >x : { foo: (x: RegExp) => string; }
 >b : { foo: (x: RegExp) => string; }
 
 function foo4(x: any) { }
->foo4 : { (x: { foo: (x: RegExp) => string; }): any; (x: { foo: (x: RegExp) => string; }): any; }
+>foo4 : typeof foo4
 >x : any
 
 function foo5(x: A);
->foo5 : { (x: A): any; (x: B): any; }
+>foo5 : typeof foo5
 >x : A
 >A : A
 
 function foo5(x: B); // ok
->foo5 : { (x: A): any; (x: B): any; }
+>foo5 : typeof foo5
 >x : B
 >B : B
 
 function foo5(x: any) { }
->foo5 : { (x: A): any; (x: B): any; }
+>foo5 : typeof foo5
 >x : any
 
 function foo5b(x: A);
->foo5b : { (x: A): any; (x: C<string>): any; }
+>foo5b : typeof foo5b
 >x : A
 >A : A
 
 function foo5b(x: C<string>); // error
->foo5b : { (x: A): any; (x: C<string>): any; }
+>foo5b : typeof foo5b
 >x : C<string>
 >C : C<T>
 
 function foo5b(x: any) { }
->foo5b : { (x: A): any; (x: C<string>): any; }
+>foo5b : typeof foo5b
 >x : any
 
 function foo6(x: A);
->foo6 : { (x: A): any; (x: I): any; }
+>foo6 : typeof foo6
 >x : A
 >A : A
 
 function foo6(x: I); // ok
->foo6 : { (x: A): any; (x: I): any; }
+>foo6 : typeof foo6
 >x : I
 >I : I
 
 function foo6(x: any) { }
->foo6 : { (x: A): any; (x: I): any; }
+>foo6 : typeof foo6
 >x : any
 
 function foo7(x: A);
->foo7 : { (x: A): any; (x: { foo(x: Date): string; }): any; }
+>foo7 : typeof foo7
 >x : A
 >A : A
 
 function foo7(x: typeof a); // ok
->foo7 : { (x: A): any; (x: { foo(x: Date): string; }): any; }
+>foo7 : typeof foo7
 >x : { foo(x: Date): string; }
 >a : { foo(x: Date): string; }
 
 function foo7(x: any) { }
->foo7 : { (x: A): any; (x: { foo(x: Date): string; }): any; }
+>foo7 : typeof foo7
 >x : any
 
 function foo8(x: B);
->foo8 : { (x: B): any; (x: I): any; }
+>foo8 : typeof foo8
 >x : B
 >B : B
 
 function foo8(x: I); // ok
->foo8 : { (x: B): any; (x: I): any; }
+>foo8 : typeof foo8
 >x : I
 >I : I
 
 function foo8(x: any) { }
->foo8 : { (x: B): any; (x: I): any; }
+>foo8 : typeof foo8
 >x : any
 
 function foo9(x: B);
->foo9 : { (x: B): any; (x: C<string>): any; }
+>foo9 : typeof foo9
 >x : B
 >B : B
 
 function foo9(x: C<string>); // ok
->foo9 : { (x: B): any; (x: C<string>): any; }
+>foo9 : typeof foo9
 >x : C<string>
 >C : C<T>
 
 function foo9(x: any) { }
->foo9 : { (x: B): any; (x: C<string>): any; }
+>foo9 : typeof foo9
 >x : any
 
 function foo10(x: B);
->foo10 : { (x: B): any; (x: { foo(x: Date): string; }): any; }
+>foo10 : typeof foo10
 >x : B
 >B : B
 
 function foo10(x: typeof a); // ok
->foo10 : { (x: B): any; (x: { foo(x: Date): string; }): any; }
+>foo10 : typeof foo10
 >x : { foo(x: Date): string; }
 >a : { foo(x: Date): string; }
 
 function foo10(x: any) { }
->foo10 : { (x: B): any; (x: { foo(x: Date): string; }): any; }
+>foo10 : typeof foo10
 >x : any
 
 function foo11(x: B);
->foo11 : { (x: B): any; (x: { foo: (x: RegExp) => string; }): any; }
+>foo11 : typeof foo11
 >x : B
 >B : B
 
 function foo11(x: typeof b); // ok
->foo11 : { (x: B): any; (x: { foo: (x: RegExp) => string; }): any; }
+>foo11 : typeof foo11
 >x : { foo: (x: RegExp) => string; }
 >b : { foo: (x: RegExp) => string; }
 
 function foo11(x: any) { }
->foo11 : { (x: B): any; (x: { foo: (x: RegExp) => string; }): any; }
+>foo11 : typeof foo11
 >x : any
 
 function foo12(x: I);
->foo12 : { (x: I): any; (x: C<string>): any; }
+>foo12 : typeof foo12
 >x : I
 >I : I
 
 function foo12(x: C<string>); // ok
->foo12 : { (x: I): any; (x: C<string>): any; }
+>foo12 : typeof foo12
 >x : C<string>
 >C : C<T>
 
 function foo12(x: any) { }
->foo12 : { (x: I): any; (x: C<string>): any; }
+>foo12 : typeof foo12
 >x : any
 
 function foo12b(x: I2<string>);
->foo12b : { (x: I2<string>): any; (x: C<string>): any; }
+>foo12b : typeof foo12b
 >x : I2<string>
 >I2 : I2<T>
 
 function foo12b(x: C<string>); // error
->foo12b : { (x: I2<string>): any; (x: C<string>): any; }
+>foo12b : typeof foo12b
 >x : C<string>
 >C : C<T>
 
 function foo12b(x: any) { }
->foo12b : { (x: I2<string>): any; (x: C<string>): any; }
+>foo12b : typeof foo12b
 >x : any
 
 function foo13(x: I);
->foo13 : { (x: I): any; (x: { foo(x: Date): string; }): any; }
+>foo13 : typeof foo13
 >x : I
 >I : I
 
 function foo13(x: typeof a); // ok
->foo13 : { (x: I): any; (x: { foo(x: Date): string; }): any; }
+>foo13 : typeof foo13
 >x : { foo(x: Date): string; }
 >a : { foo(x: Date): string; }
 
 function foo13(x: any) { }
->foo13 : { (x: I): any; (x: { foo(x: Date): string; }): any; }
+>foo13 : typeof foo13
 >x : any
 
 function foo14(x: I);
->foo14 : { (x: I): any; (x: { foo: (x: RegExp) => string; }): any; }
+>foo14 : typeof foo14
 >x : I
 >I : I
 
 function foo14(x: typeof b); // ok
->foo14 : { (x: I): any; (x: { foo: (x: RegExp) => string; }): any; }
+>foo14 : typeof foo14
 >x : { foo: (x: RegExp) => string; }
 >b : { foo: (x: RegExp) => string; }
 
 function foo14(x: any) { }
->foo14 : { (x: I): any; (x: { foo: (x: RegExp) => string; }): any; }
+>foo14 : typeof foo14
 >x : any
 
 function foo15(x: I2<string>);
->foo15 : { (x: I2<string>): any; (x: C<number>): any; }
+>foo15 : typeof foo15
 >x : I2<string>
 >I2 : I2<T>
 
 function foo15(x: C<number>); // ok
->foo15 : { (x: I2<string>): any; (x: C<number>): any; }
+>foo15 : typeof foo15
 >x : C<number>
 >C : C<T>
 
 function foo15(x: any) { }
->foo15 : { (x: I2<string>): any; (x: C<number>): any; }
+>foo15 : typeof foo15
 >x : any
 
diff --git a/tests/baselines/reference/objectTypesIdentityWithCallSignaturesDifferingParamCounts.types b/tests/baselines/reference/objectTypesIdentityWithCallSignaturesDifferingParamCounts.types
index 0ebbc639e5f..c0b3bbfcd45 100644
--- a/tests/baselines/reference/objectTypesIdentityWithCallSignaturesDifferingParamCounts.types
+++ b/tests/baselines/reference/objectTypesIdentityWithCallSignaturesDifferingParamCounts.types
@@ -64,268 +64,268 @@ var b = { foo(x: string) { return ''; } };
 >x : string
 
 function foo1(x: A);
->foo1 : { (x: A): any; (x: A): any; }
+>foo1 : typeof foo1
 >x : A
 >A : A
 
 function foo1(x: A); // error
->foo1 : { (x: A): any; (x: A): any; }
+>foo1 : typeof foo1
 >x : A
 >A : A
 
 function foo1(x: any) { }
->foo1 : { (x: A): any; (x: A): any; }
+>foo1 : typeof foo1
 >x : any
 
 function foo1b(x: B);
->foo1b : { (x: B): any; (x: B): any; }
+>foo1b : typeof foo1b
 >x : B
 >B : B
 
 function foo1b(x: B); // error
->foo1b : { (x: B): any; (x: B): any; }
+>foo1b : typeof foo1b
 >x : B
 >B : B
 
 function foo1b(x: any) { }
->foo1b : { (x: B): any; (x: B): any; }
+>foo1b : typeof foo1b
 >x : any
 
 function foo1c(x: C<string>);
->foo1c : { (x: C<string>): any; (x: C<string>): any; }
+>foo1c : typeof foo1c
 >x : C<string>
 >C : C<T>
 
 function foo1c(x: C<string>); // error
->foo1c : { (x: C<string>): any; (x: C<string>): any; }
+>foo1c : typeof foo1c
 >x : C<string>
 >C : C<T>
 
 function foo1c(x: any) { }
->foo1c : { (x: C<string>): any; (x: C<string>): any; }
+>foo1c : typeof foo1c
 >x : any
 
 function foo2(x: I);
->foo2 : { (x: I): any; (x: I): any; }
+>foo2 : typeof foo2
 >x : I
 >I : I
 
 function foo2(x: I); // error
->foo2 : { (x: I): any; (x: I): any; }
+>foo2 : typeof foo2
 >x : I
 >I : I
 
 function foo2(x: any) { }
->foo2 : { (x: I): any; (x: I): any; }
+>foo2 : typeof foo2
 >x : any
 
 function foo3(x: typeof a);
->foo3 : { (x: { foo(x: string, y: string): string; }): any; (x: { foo(x: string, y: string): string; }): any; }
+>foo3 : typeof foo3
 >x : { foo(x: string, y: string): string; }
 >a : { foo(x: string, y: string): string; }
 
 function foo3(x: typeof a); // error
->foo3 : { (x: { foo(x: string, y: string): string; }): any; (x: { foo(x: string, y: string): string; }): any; }
+>foo3 : typeof foo3
 >x : { foo(x: string, y: string): string; }
 >a : { foo(x: string, y: string): string; }
 
 function foo3(x: any) { }
->foo3 : { (x: { foo(x: string, y: string): string; }): any; (x: { foo(x: string, y: string): string; }): any; }
+>foo3 : typeof foo3
 >x : any
 
 function foo4(x: typeof b);
->foo4 : { (x: { foo: (x: string) => string; }): any; (x: { foo: (x: string) => string; }): any; }
+>foo4 : typeof foo4
 >x : { foo: (x: string) => string; }
 >b : { foo: (x: string) => string; }
 
 function foo4(x: typeof b); // error
->foo4 : { (x: { foo: (x: string) => string; }): any; (x: { foo: (x: string) => string; }): any; }
+>foo4 : typeof foo4
 >x : { foo: (x: string) => string; }
 >b : { foo: (x: string) => string; }
 
 function foo4(x: any) { }
->foo4 : { (x: { foo: (x: string) => string; }): any; (x: { foo: (x: string) => string; }): any; }
+>foo4 : typeof foo4
 >x : any
 
 function foo5(x: A);
->foo5 : { (x: A): any; (x: B): any; }
+>foo5 : typeof foo5
 >x : A
 >A : A
 
 function foo5(x: B); // ok
->foo5 : { (x: A): any; (x: B): any; }
+>foo5 : typeof foo5
 >x : B
 >B : B
 
 function foo5(x: any) { }
->foo5 : { (x: A): any; (x: B): any; }
+>foo5 : typeof foo5
 >x : any
 
 function foo5b(x: A);
->foo5b : { (x: A): any; (x: C<string>): any; }
+>foo5b : typeof foo5b
 >x : A
 >A : A
 
 function foo5b(x: C<string>); // ok
->foo5b : { (x: A): any; (x: C<string>): any; }
+>foo5b : typeof foo5b
 >x : C<string>
 >C : C<T>
 
 function foo5b(x: any) { }
->foo5b : { (x: A): any; (x: C<string>): any; }
+>foo5b : typeof foo5b
 >x : any
 
 function foo6(x: A);
->foo6 : { (x: A): any; (x: I): any; }
+>foo6 : typeof foo6
 >x : A
 >A : A
 
 function foo6(x: I); // error
->foo6 : { (x: A): any; (x: I): any; }
+>foo6 : typeof foo6
 >x : I
 >I : I
 
 function foo6(x: any) { }
->foo6 : { (x: A): any; (x: I): any; }
+>foo6 : typeof foo6
 >x : any
 
 function foo7(x: A);
->foo7 : { (x: A): any; (x: { foo(x: string, y: string): string; }): any; }
+>foo7 : typeof foo7
 >x : A
 >A : A
 
 function foo7(x: typeof a); // ok
->foo7 : { (x: A): any; (x: { foo(x: string, y: string): string; }): any; }
+>foo7 : typeof foo7
 >x : { foo(x: string, y: string): string; }
 >a : { foo(x: string, y: string): string; }
 
 function foo7(x: any) { }
->foo7 : { (x: A): any; (x: { foo(x: string, y: string): string; }): any; }
+>foo7 : typeof foo7
 >x : any
 
 function foo8(x: B);
->foo8 : { (x: B): any; (x: I): any; }
+>foo8 : typeof foo8
 >x : B
 >B : B
 
 function foo8(x: I); // ok
->foo8 : { (x: B): any; (x: I): any; }
+>foo8 : typeof foo8
 >x : I
 >I : I
 
 function foo8(x: any) { }
->foo8 : { (x: B): any; (x: I): any; }
+>foo8 : typeof foo8
 >x : any
 
 function foo9(x: B);
->foo9 : { (x: B): any; (x: C<string>): any; }
+>foo9 : typeof foo9
 >x : B
 >B : B
 
 function foo9(x: C<string>); // ok
->foo9 : { (x: B): any; (x: C<string>): any; }
+>foo9 : typeof foo9
 >x : C<string>
 >C : C<T>
 
 function foo9(x: any) { }
->foo9 : { (x: B): any; (x: C<string>): any; }
+>foo9 : typeof foo9
 >x : any
 
 function foo10(x: B);
->foo10 : { (x: B): any; (x: { foo(x: string, y: string): string; }): any; }
+>foo10 : typeof foo10
 >x : B
 >B : B
 
 function foo10(x: typeof a); // error
->foo10 : { (x: B): any; (x: { foo(x: string, y: string): string; }): any; }
+>foo10 : typeof foo10
 >x : { foo(x: string, y: string): string; }
 >a : { foo(x: string, y: string): string; }
 
 function foo10(x: any) { }
->foo10 : { (x: B): any; (x: { foo(x: string, y: string): string; }): any; }
+>foo10 : typeof foo10
 >x : any
 
 function foo11(x: B);
->foo11 : { (x: B): any; (x: { foo: (x: string) => string; }): any; }
+>foo11 : typeof foo11
 >x : B
 >B : B
 
 function foo11(x: typeof b); // ok
->foo11 : { (x: B): any; (x: { foo: (x: string) => string; }): any; }
+>foo11 : typeof foo11
 >x : { foo: (x: string) => string; }
 >b : { foo: (x: string) => string; }
 
 function foo11(x: any) { }
->foo11 : { (x: B): any; (x: { foo: (x: string) => string; }): any; }
+>foo11 : typeof foo11
 >x : any
 
 function foo12(x: I);
->foo12 : { (x: I): any; (x: C<string>): any; }
+>foo12 : typeof foo12
 >x : I
 >I : I
 
 function foo12(x: C<string>); // ok
->foo12 : { (x: I): any; (x: C<string>): any; }
+>foo12 : typeof foo12
 >x : C<string>
 >C : C<T>
 
 function foo12(x: any) { }
->foo12 : { (x: I): any; (x: C<string>): any; }
+>foo12 : typeof foo12
 >x : any
 
 function foo12b(x: I2<string>);
->foo12b : { (x: I2<string>): any; (x: C<string>): any; }
+>foo12b : typeof foo12b
 >x : I2<string>
 >I2 : I2<T>
 
 function foo12b(x: C<string>); // ok
->foo12b : { (x: I2<string>): any; (x: C<string>): any; }
+>foo12b : typeof foo12b
 >x : C<string>
 >C : C<T>
 
 function foo12b(x: any) { }
->foo12b : { (x: I2<string>): any; (x: C<string>): any; }
+>foo12b : typeof foo12b
 >x : any
 
 function foo13(x: I);
->foo13 : { (x: I): any; (x: { foo(x: string, y: string): string; }): any; }
+>foo13 : typeof foo13
 >x : I
 >I : I
 
 function foo13(x: typeof a); // ok
->foo13 : { (x: I): any; (x: { foo(x: string, y: string): string; }): any; }
+>foo13 : typeof foo13
 >x : { foo(x: string, y: string): string; }
 >a : { foo(x: string, y: string): string; }
 
 function foo13(x: any) { }
->foo13 : { (x: I): any; (x: { foo(x: string, y: string): string; }): any; }
+>foo13 : typeof foo13
 >x : any
 
 function foo14(x: I);
->foo14 : { (x: I): any; (x: { foo: (x: string) => string; }): any; }
+>foo14 : typeof foo14
 >x : I
 >I : I
 
 function foo14(x: typeof b); // error
->foo14 : { (x: I): any; (x: { foo: (x: string) => string; }): any; }
+>foo14 : typeof foo14
 >x : { foo: (x: string) => string; }
 >b : { foo: (x: string) => string; }
 
 function foo14(x: any) { }
->foo14 : { (x: I): any; (x: { foo: (x: string) => string; }): any; }
+>foo14 : typeof foo14
 >x : any
 
 function foo15(x: I2<string>);
->foo15 : { (x: I2<string>): any; (x: C<number>): any; }
+>foo15 : typeof foo15
 >x : I2<string>
 >I2 : I2<T>
 
 function foo15(x: C<number>); // ok
->foo15 : { (x: I2<string>): any; (x: C<number>): any; }
+>foo15 : typeof foo15
 >x : C<number>
 >C : C<T>
 
 function foo15(x: any) { }
->foo15 : { (x: I2<string>): any; (x: C<number>): any; }
+>foo15 : typeof foo15
 >x : any
 
diff --git a/tests/baselines/reference/objectTypesIdentityWithCallSignaturesDifferingParamCounts2.types b/tests/baselines/reference/objectTypesIdentityWithCallSignaturesDifferingParamCounts2.types
index b72d0a799e4..becd0d14850 100644
--- a/tests/baselines/reference/objectTypesIdentityWithCallSignaturesDifferingParamCounts2.types
+++ b/tests/baselines/reference/objectTypesIdentityWithCallSignaturesDifferingParamCounts2.types
@@ -24,114 +24,114 @@ var a: { (x: string, y: string): string }
 >y : string
 
 function foo2(x: I);
->foo2 : { (x: I): any; (x: I): any; }
+>foo2 : typeof foo2
 >x : I
 >I : I
 
 function foo2(x: I); // error
->foo2 : { (x: I): any; (x: I): any; }
+>foo2 : typeof foo2
 >x : I
 >I : I
 
 function foo2(x: any) { }
->foo2 : { (x: I): any; (x: I): any; }
+>foo2 : typeof foo2
 >x : any
 
 function foo3(x: typeof a);
->foo3 : { (x: (x: string, y: string) => string): any; (x: (x: string, y: string) => string): any; }
+>foo3 : typeof foo3
 >x : (x: string, y: string) => string
 >a : (x: string, y: string) => string
 
 function foo3(x: typeof a); // error
->foo3 : { (x: (x: string, y: string) => string): any; (x: (x: string, y: string) => string): any; }
+>foo3 : typeof foo3
 >x : (x: string, y: string) => string
 >a : (x: string, y: string) => string
 
 function foo3(x: any) { }
->foo3 : { (x: (x: string, y: string) => string): any; (x: (x: string, y: string) => string): any; }
+>foo3 : typeof foo3
 >x : any
 
 function foo4(x: I2<string>);
->foo4 : { (x: I2<string>): any; (x: I2<string>): any; }
+>foo4 : typeof foo4
 >x : I2<string>
 >I2 : I2<T>
 
 function foo4(x: I2<string>); // error
->foo4 : { (x: I2<string>): any; (x: I2<string>): any; }
+>foo4 : typeof foo4
 >x : I2<string>
 >I2 : I2<T>
 
 function foo4(x: any) { }
->foo4 : { (x: I2<string>): any; (x: I2<string>): any; }
+>foo4 : typeof foo4
 >x : any
 
 function foo5(x: I2<string>);
->foo5 : { (x: I2<string>): any; (x: I2<number>): any; }
+>foo5 : typeof foo5
 >x : I2<string>
 >I2 : I2<T>
 
 function foo5(x: I2<number>); // ok
->foo5 : { (x: I2<string>): any; (x: I2<number>): any; }
+>foo5 : typeof foo5
 >x : I2<number>
 >I2 : I2<T>
 
 function foo5(x: any) { }
->foo5 : { (x: I2<string>): any; (x: I2<number>): any; }
+>foo5 : typeof foo5
 >x : any
 
 function foo13(x: I);
->foo13 : { (x: I): any; (x: (x: string, y: string) => string): any; }
+>foo13 : typeof foo13
 >x : I
 >I : I
 
 function foo13(x: typeof a); // ok
->foo13 : { (x: I): any; (x: (x: string, y: string) => string): any; }
+>foo13 : typeof foo13
 >x : (x: string, y: string) => string
 >a : (x: string, y: string) => string
 
 function foo13(x: any) { }
->foo13 : { (x: I): any; (x: (x: string, y: string) => string): any; }
+>foo13 : typeof foo13
 >x : any
 
 function foo14(x: I);
->foo14 : { (x: I): any; (x: I2<string>): any; }
+>foo14 : typeof foo14
 >x : I
 >I : I
 
 function foo14(x: I2<string>); // error
->foo14 : { (x: I): any; (x: I2<string>): any; }
+>foo14 : typeof foo14
 >x : I2<string>
 >I2 : I2<T>
 
 function foo14(x: any) { }
->foo14 : { (x: I): any; (x: I2<string>): any; }
+>foo14 : typeof foo14
 >x : any
 
 function foo14b(x: typeof a);
->foo14b : { (x: (x: string, y: string) => string): any; (x: I2<string>): any; }
+>foo14b : typeof foo14b
 >x : (x: string, y: string) => string
 >a : (x: string, y: string) => string
 
 function foo14b(x: I2<string>); // ok
->foo14b : { (x: (x: string, y: string) => string): any; (x: I2<string>): any; }
+>foo14b : typeof foo14b
 >x : I2<string>
 >I2 : I2<T>
 
 function foo14b(x: any) { }
->foo14b : { (x: (x: string, y: string) => string): any; (x: I2<string>): any; }
+>foo14b : typeof foo14b
 >x : any
 
 function foo15(x: I);
->foo15 : { (x: I): any; (x: I2<number>): any; }
+>foo15 : typeof foo15
 >x : I
 >I : I
 
 function foo15(x: I2<number>); // ok
->foo15 : { (x: I): any; (x: I2<number>): any; }
+>foo15 : typeof foo15
 >x : I2<number>
 >I2 : I2<T>
 
 function foo15(x: any) { }
->foo15 : { (x: I): any; (x: I2<number>): any; }
+>foo15 : typeof foo15
 >x : any
 
diff --git a/tests/baselines/reference/objectTypesIdentityWithCallSignaturesWithOverloads.types b/tests/baselines/reference/objectTypesIdentityWithCallSignaturesWithOverloads.types
index efca8fc72dd..e24ea1c88ac 100644
--- a/tests/baselines/reference/objectTypesIdentityWithCallSignaturesWithOverloads.types
+++ b/tests/baselines/reference/objectTypesIdentityWithCallSignaturesWithOverloads.types
@@ -101,9 +101,7 @@ var a: {
 
 var b = {
 >b : { foo: (x: any) => any; }
->{
-    foo(x: any) { return <any>''; }
-} : { foo: (x: any) => any; }
+>{    foo(x: any) { return <any>''; }} : { foo: (x: any) => any; }
 
     foo(x: any) { return <any>''; }
 >foo : (x: any) => any
@@ -114,268 +112,268 @@ var b = {
 };
 
 function foo1(x: A);
->foo1 : { (x: A): any; (x: A): any; }
+>foo1 : typeof foo1
 >x : A
 >A : A
 
 function foo1(x: A); // error
->foo1 : { (x: A): any; (x: A): any; }
+>foo1 : typeof foo1
 >x : A
 >A : A
 
 function foo1(x: any) { }
->foo1 : { (x: A): any; (x: A): any; }
+>foo1 : typeof foo1
 >x : any
 
 function foo1b(x: B);
->foo1b : { (x: B): any; (x: B): any; }
+>foo1b : typeof foo1b
 >x : B
 >B : B
 
 function foo1b(x: B); // error
->foo1b : { (x: B): any; (x: B): any; }
+>foo1b : typeof foo1b
 >x : B
 >B : B
 
 function foo1b(x: any) { }
->foo1b : { (x: B): any; (x: B): any; }
+>foo1b : typeof foo1b
 >x : any
 
 function foo1c(x: C<string>);
->foo1c : { (x: C<string>): any; (x: C<string>): any; }
+>foo1c : typeof foo1c
 >x : C<string>
 >C : C<T>
 
 function foo1c(x: C<string>); // error
->foo1c : { (x: C<string>): any; (x: C<string>): any; }
+>foo1c : typeof foo1c
 >x : C<string>
 >C : C<T>
 
 function foo1c(x: any) { }
->foo1c : { (x: C<string>): any; (x: C<string>): any; }
+>foo1c : typeof foo1c
 >x : any
 
 function foo2(x: I);
->foo2 : { (x: I): any; (x: I): any; }
+>foo2 : typeof foo2
 >x : I
 >I : I
 
 function foo2(x: I); // error
->foo2 : { (x: I): any; (x: I): any; }
+>foo2 : typeof foo2
 >x : I
 >I : I
 
 function foo2(x: any) { }
->foo2 : { (x: I): any; (x: I): any; }
+>foo2 : typeof foo2
 >x : any
 
 function foo3(x: typeof a);
->foo3 : { (x: { foo(x: number): number; foo(x: string): string; }): any; (x: { foo(x: number): number; foo(x: string): string; }): any; }
+>foo3 : typeof foo3
 >x : { foo(x: number): number; foo(x: string): string; }
 >a : { foo(x: number): number; foo(x: string): string; }
 
 function foo3(x: typeof a); // error
->foo3 : { (x: { foo(x: number): number; foo(x: string): string; }): any; (x: { foo(x: number): number; foo(x: string): string; }): any; }
+>foo3 : typeof foo3
 >x : { foo(x: number): number; foo(x: string): string; }
 >a : { foo(x: number): number; foo(x: string): string; }
 
 function foo3(x: any) { }
->foo3 : { (x: { foo(x: number): number; foo(x: string): string; }): any; (x: { foo(x: number): number; foo(x: string): string; }): any; }
+>foo3 : typeof foo3
 >x : any
 
 function foo4(x: typeof b);
->foo4 : { (x: { foo: (x: any) => any; }): any; (x: { foo: (x: any) => any; }): any; }
+>foo4 : typeof foo4
 >x : { foo: (x: any) => any; }
 >b : { foo: (x: any) => any; }
 
 function foo4(x: typeof b); // error
->foo4 : { (x: { foo: (x: any) => any; }): any; (x: { foo: (x: any) => any; }): any; }
+>foo4 : typeof foo4
 >x : { foo: (x: any) => any; }
 >b : { foo: (x: any) => any; }
 
 function foo4(x: any) { }
->foo4 : { (x: { foo: (x: any) => any; }): any; (x: { foo: (x: any) => any; }): any; }
+>foo4 : typeof foo4
 >x : any
 
 function foo5(x: A);
->foo5 : { (x: A): any; (x: B): any; }
+>foo5 : typeof foo5
 >x : A
 >A : A
 
 function foo5(x: B); // error
->foo5 : { (x: A): any; (x: B): any; }
+>foo5 : typeof foo5
 >x : B
 >B : B
 
 function foo5(x: any) { }
->foo5 : { (x: A): any; (x: B): any; }
+>foo5 : typeof foo5
 >x : any
 
 function foo5b(x: A);
->foo5b : { (x: A): any; (x: C<string>): any; }
+>foo5b : typeof foo5b
 >x : A
 >A : A
 
 function foo5b(x: C<string>); // ok
->foo5b : { (x: A): any; (x: C<string>): any; }
+>foo5b : typeof foo5b
 >x : C<string>
 >C : C<T>
 
 function foo5b(x: any) { }
->foo5b : { (x: A): any; (x: C<string>): any; }
+>foo5b : typeof foo5b
 >x : any
 
 function foo6(x: A);
->foo6 : { (x: A): any; (x: I): any; }
+>foo6 : typeof foo6
 >x : A
 >A : A
 
 function foo6(x: I); // BUG 831930
->foo6 : { (x: A): any; (x: I): any; }
+>foo6 : typeof foo6
 >x : I
 >I : I
 
 function foo6(x: any) { }
->foo6 : { (x: A): any; (x: I): any; }
+>foo6 : typeof foo6
 >x : any
 
 function foo7(x: A);
->foo7 : { (x: A): any; (x: { foo(x: number): number; foo(x: string): string; }): any; }
+>foo7 : typeof foo7
 >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; }
+>foo7 : typeof foo7
 >x : { foo(x: number): number; foo(x: string): string; }
 >a : { foo(x: number): number; foo(x: string): string; }
 
 function foo7(x: any) { }
->foo7 : { (x: A): any; (x: { foo(x: number): number; foo(x: string): string; }): any; }
+>foo7 : typeof foo7
 >x : any
 
 function foo8(x: B);
->foo8 : { (x: B): any; (x: I): any; }
+>foo8 : typeof foo8
 >x : B
 >B : B
 
 function foo8(x: I); // BUG 831930
->foo8 : { (x: B): any; (x: I): any; }
+>foo8 : typeof foo8
 >x : I
 >I : I
 
 function foo8(x: any) { }
->foo8 : { (x: B): any; (x: I): any; }
+>foo8 : typeof foo8
 >x : any
 
 function foo9(x: B);
->foo9 : { (x: B): any; (x: C<string>): any; }
+>foo9 : typeof foo9
 >x : B
 >B : B
 
 function foo9(x: C<string>); // ok
->foo9 : { (x: B): any; (x: C<string>): any; }
+>foo9 : typeof foo9
 >x : C<string>
 >C : C<T>
 
 function foo9(x: any) { }
->foo9 : { (x: B): any; (x: C<string>): any; }
+>foo9 : typeof foo9
 >x : any
 
 function foo10(x: B);
->foo10 : { (x: B): any; (x: { foo(x: number): number; foo(x: string): string; }): any; }
+>foo10 : typeof foo10
 >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; }
+>foo10 : typeof foo10
 >x : { foo(x: number): number; foo(x: string): string; }
 >a : { foo(x: number): number; foo(x: string): string; }
 
 function foo10(x: any) { }
->foo10 : { (x: B): any; (x: { foo(x: number): number; foo(x: string): string; }): any; }
+>foo10 : typeof foo10
 >x : any
 
 function foo11(x: B);
->foo11 : { (x: B): any; (x: { foo: (x: any) => any; }): any; }
+>foo11 : typeof foo11
 >x : B
 >B : B
 
 function foo11(x: typeof b); // ok
->foo11 : { (x: B): any; (x: { foo: (x: any) => any; }): any; }
+>foo11 : typeof foo11
 >x : { foo: (x: any) => any; }
 >b : { foo: (x: any) => any; }
 
 function foo11(x: any) { }
->foo11 : { (x: B): any; (x: { foo: (x: any) => any; }): any; }
+>foo11 : typeof foo11
 >x : any
 
 function foo12(x: I);
->foo12 : { (x: I): any; (x: C<string>): any; }
+>foo12 : typeof foo12
 >x : I
 >I : I
 
 function foo12(x: C<string>); // ok
->foo12 : { (x: I): any; (x: C<string>): any; }
+>foo12 : typeof foo12
 >x : C<string>
 >C : C<T>
 
 function foo12(x: any) { }
->foo12 : { (x: I): any; (x: C<string>): any; }
+>foo12 : typeof foo12
 >x : any
 
 function foo12b(x: I2<string>);
->foo12b : { (x: I2<string>): any; (x: C<string>): any; }
+>foo12b : typeof foo12b
 >x : I2<string>
 >I2 : I2<T>
 
 function foo12b(x: C<string>); // ok
->foo12b : { (x: I2<string>): any; (x: C<string>): any; }
+>foo12b : typeof foo12b
 >x : C<string>
 >C : C<T>
 
 function foo12b(x: any) { }
->foo12b : { (x: I2<string>): any; (x: C<string>): any; }
+>foo12b : typeof foo12b
 >x : any
 
 function foo13(x: I);
->foo13 : { (x: I): any; (x: { foo(x: number): number; foo(x: string): string; }): any; }
+>foo13 : typeof foo13
 >x : I
 >I : I
 
 function foo13(x: typeof a);  // error
->foo13 : { (x: I): any; (x: { foo(x: number): number; foo(x: string): string; }): any; }
+>foo13 : typeof foo13
 >x : { foo(x: number): number; foo(x: string): string; }
 >a : { foo(x: number): number; foo(x: string): string; }
 
 function foo13(x: any) { }
->foo13 : { (x: I): any; (x: { foo(x: number): number; foo(x: string): string; }): any; }
+>foo13 : typeof foo13
 >x : any
 
 function foo14(x: I);
->foo14 : { (x: I): any; (x: { foo: (x: any) => any; }): any; }
+>foo14 : typeof foo14
 >x : I
 >I : I
 
 function foo14(x: typeof b); // ok
->foo14 : { (x: I): any; (x: { foo: (x: any) => any; }): any; }
+>foo14 : typeof foo14
 >x : { foo: (x: any) => any; }
 >b : { foo: (x: any) => any; }
 
 function foo14(x: any) { }
->foo14 : { (x: I): any; (x: { foo: (x: any) => any; }): any; }
+>foo14 : typeof foo14
 >x : any
 
 function foo15(x: I2<string>);
->foo15 : { (x: I2<string>): any; (x: C<number>): any; }
+>foo15 : typeof foo15
 >x : I2<string>
 >I2 : I2<T>
 
 function foo15(x: C<number>); // ok
->foo15 : { (x: I2<string>): any; (x: C<number>): any; }
+>foo15 : typeof foo15
 >x : C<number>
 >C : C<T>
 
 function foo15(x: any) { }
->foo15 : { (x: I2<string>): any; (x: C<number>): any; }
+>foo15 : typeof foo15
 >x : any
 
diff --git a/tests/baselines/reference/objectTypesIdentityWithConstructSignatures.types b/tests/baselines/reference/objectTypesIdentityWithConstructSignatures.types
index a29f213bdde..f78a89f9097 100644
--- a/tests/baselines/reference/objectTypesIdentityWithConstructSignatures.types
+++ b/tests/baselines/reference/objectTypesIdentityWithConstructSignatures.types
@@ -46,226 +46,226 @@ var a: { new(x: string) }
 >x : string
 
 function foo1(x: A);
->foo1 : { (x: A): any; (x: A): any; }
+>foo1 : typeof foo1
 >x : A
 >A : A
 
 function foo1(x: A); // error
->foo1 : { (x: A): any; (x: A): any; }
+>foo1 : typeof foo1
 >x : A
 >A : A
 
 function foo1(x: any) { }
->foo1 : { (x: A): any; (x: A): any; }
+>foo1 : typeof foo1
 >x : any
 
 function foo1b(x: B);
->foo1b : { (x: B): any; (x: B): any; }
+>foo1b : typeof foo1b
 >x : B
 >B : B
 
 function foo1b(x: B); // error
->foo1b : { (x: B): any; (x: B): any; }
+>foo1b : typeof foo1b
 >x : B
 >B : B
 
 function foo1b(x: any) { }
->foo1b : { (x: B): any; (x: B): any; }
+>foo1b : typeof foo1b
 >x : any
 
 function foo1c(x: C<string>);
->foo1c : { (x: C<string>): any; (x: C<string>): any; }
+>foo1c : typeof foo1c
 >x : C<string>
 >C : C<T>
 
 function foo1c(x: C<string>); // error
->foo1c : { (x: C<string>): any; (x: C<string>): any; }
+>foo1c : typeof foo1c
 >x : C<string>
 >C : C<T>
 
 function foo1c(x: any) { }
->foo1c : { (x: C<string>): any; (x: C<string>): any; }
+>foo1c : typeof foo1c
 >x : any
 
 function foo2(x: I);
->foo2 : { (x: I): any; (x: I): any; }
+>foo2 : typeof foo2
 >x : I
 >I : I
 
 function foo2(x: I); // error
->foo2 : { (x: I): any; (x: I): any; }
+>foo2 : typeof foo2
 >x : I
 >I : I
 
 function foo2(x: any) { }
->foo2 : { (x: I): any; (x: I): any; }
+>foo2 : typeof foo2
 >x : any
 
 function foo3(x: typeof a);
->foo3 : { (x: new (x: string) => any): any; (x: new (x: string) => any): any; }
+>foo3 : typeof foo3
 >x : new (x: string) => any
 >a : new (x: string) => any
 
 function foo3(x: typeof a); // error
->foo3 : { (x: new (x: string) => any): any; (x: new (x: string) => any): any; }
+>foo3 : typeof foo3
 >x : new (x: string) => any
 >a : new (x: string) => any
 
 function foo3(x: any) { }
->foo3 : { (x: new (x: string) => any): any; (x: new (x: string) => any): any; }
+>foo3 : typeof foo3
 >x : any
 
 function foo5(x: A);
->foo5 : { (x: A): any; (x: B): any; }
+>foo5 : typeof foo5
 >x : A
 >A : A
 
 function foo5(x: B); // error
->foo5 : { (x: A): any; (x: B): any; }
+>foo5 : typeof foo5
 >x : B
 >B : B
 
 function foo5(x: any) { }
->foo5 : { (x: A): any; (x: B): any; }
+>foo5 : typeof foo5
 >x : any
 
 function foo5b(x: A);
->foo5b : { (x: A): any; (x: C<string>): any; }
+>foo5b : typeof foo5b
 >x : A
 >A : A
 
 function foo5b(x: C<string>); // error
->foo5b : { (x: A): any; (x: C<string>): any; }
+>foo5b : typeof foo5b
 >x : C<string>
 >C : C<T>
 
 function foo5b(x: any) { }
->foo5b : { (x: A): any; (x: C<string>): any; }
+>foo5b : typeof foo5b
 >x : any
 
 function foo6(x: A);
->foo6 : { (x: A): any; (x: I): any; }
+>foo6 : typeof foo6
 >x : A
 >A : A
 
 function foo6(x: I); // ok 
->foo6 : { (x: A): any; (x: I): any; }
+>foo6 : typeof foo6
 >x : I
 >I : I
 
 function foo6(x: any) { }
->foo6 : { (x: A): any; (x: I): any; }
+>foo6 : typeof foo6
 >x : any
 
 function foo7(x: A);
->foo7 : { (x: A): any; (x: new (x: string) => any): any; }
+>foo7 : typeof foo7
 >x : A
 >A : A
 
 function foo7(x: typeof a); // ok
->foo7 : { (x: A): any; (x: new (x: string) => any): any; }
+>foo7 : typeof foo7
 >x : new (x: string) => any
 >a : new (x: string) => any
 
 function foo7(x: any) { }
->foo7 : { (x: A): any; (x: new (x: string) => any): any; }
+>foo7 : typeof foo7
 >x : any
 
 function foo8(x: B);
->foo8 : { (x: B): any; (x: I): any; }
+>foo8 : typeof foo8
 >x : B
 >B : B
 
 function foo8(x: I); // ok
->foo8 : { (x: B): any; (x: I): any; }
+>foo8 : typeof foo8
 >x : I
 >I : I
 
 function foo8(x: any) { }
->foo8 : { (x: B): any; (x: I): any; }
+>foo8 : typeof foo8
 >x : any
 
 function foo9(x: B);
->foo9 : { (x: B): any; (x: C<string>): any; }
+>foo9 : typeof foo9
 >x : B
 >B : B
 
 function foo9(x: C<string>); // error
->foo9 : { (x: B): any; (x: C<string>): any; }
+>foo9 : typeof foo9
 >x : C<string>
 >C : C<T>
 
 function foo9(x: any) { }
->foo9 : { (x: B): any; (x: C<string>): any; }
+>foo9 : typeof foo9
 >x : any
 
 function foo10(x: B);
->foo10 : { (x: B): any; (x: new (x: string) => any): any; }
+>foo10 : typeof foo10
 >x : B
 >B : B
 
 function foo10(x: typeof a); // ok
->foo10 : { (x: B): any; (x: new (x: string) => any): any; }
+>foo10 : typeof foo10
 >x : new (x: string) => any
 >a : new (x: string) => any
 
 function foo10(x: any) { }
->foo10 : { (x: B): any; (x: new (x: string) => any): any; }
+>foo10 : typeof foo10
 >x : any
 
 function foo12(x: I);
->foo12 : { (x: I): any; (x: C<string>): any; }
+>foo12 : typeof foo12
 >x : I
 >I : I
 
 function foo12(x: C<string>); // ok
->foo12 : { (x: I): any; (x: C<string>): any; }
+>foo12 : typeof foo12
 >x : C<string>
 >C : C<T>
 
 function foo12(x: any) { }
->foo12 : { (x: I): any; (x: C<string>): any; }
+>foo12 : typeof foo12
 >x : any
 
 function foo12b(x: I2<string>);
->foo12b : { (x: I2<string>): any; (x: C<string>): any; }
+>foo12b : typeof foo12b
 >x : I2<string>
 >I2 : I2<T>
 
 function foo12b(x: C<string>); // ok
->foo12b : { (x: I2<string>): any; (x: C<string>): any; }
+>foo12b : typeof foo12b
 >x : C<string>
 >C : C<T>
 
 function foo12b(x: any) { }
->foo12b : { (x: I2<string>): any; (x: C<string>): any; }
+>foo12b : typeof foo12b
 >x : any
 
 function foo13(x: I);
->foo13 : { (x: I): any; (x: new (x: string) => any): any; }
+>foo13 : typeof foo13
 >x : I
 >I : I
 
 function foo13(x: typeof a); // error
->foo13 : { (x: I): any; (x: new (x: string) => any): any; }
+>foo13 : typeof foo13
 >x : new (x: string) => any
 >a : new (x: string) => any
 
 function foo13(x: any) { }
->foo13 : { (x: I): any; (x: new (x: string) => any): any; }
+>foo13 : typeof foo13
 >x : any
 
 function foo15(x: I2<string>);
->foo15 : { (x: I2<string>): any; (x: C<number>): any; }
+>foo15 : typeof foo15
 >x : I2<string>
 >I2 : I2<T>
 
 function foo15(x: C<number>); // ok
->foo15 : { (x: I2<string>): any; (x: C<number>): any; }
+>foo15 : typeof foo15
 >x : C<number>
 >C : C<T>
 
 function foo15(x: any) { }
->foo15 : { (x: I2<string>): any; (x: C<number>): any; }
+>foo15 : typeof foo15
 >x : any
 
diff --git a/tests/baselines/reference/objectTypesIdentityWithConstructSignatures2.types b/tests/baselines/reference/objectTypesIdentityWithConstructSignatures2.types
index c530f1ced9b..2245a3c8cef 100644
--- a/tests/baselines/reference/objectTypesIdentityWithConstructSignatures2.types
+++ b/tests/baselines/reference/objectTypesIdentityWithConstructSignatures2.types
@@ -48,198 +48,198 @@ var b = { new(x: RegExp) { return ''; } }; // not a construct signature, functio
 >RegExp : RegExp
 
 function foo1b(x: B);
->foo1b : { (x: B): any; (x: B): any; }
+>foo1b : typeof foo1b
 >x : B
 >B : B
 
 function foo1b(x: B); // error
->foo1b : { (x: B): any; (x: B): any; }
+>foo1b : typeof foo1b
 >x : B
 >B : B
 
 function foo1b(x: any) { }
->foo1b : { (x: B): any; (x: B): any; }
+>foo1b : typeof foo1b
 >x : any
 
 function foo1c(x: C<string>);
->foo1c : { (x: C<string>): any; (x: C<string>): any; }
+>foo1c : typeof foo1c
 >x : C<string>
 >C : C<T>
 
 function foo1c(x: C<string>); // error
->foo1c : { (x: C<string>): any; (x: C<string>): any; }
+>foo1c : typeof foo1c
 >x : C<string>
 >C : C<T>
 
 function foo1c(x: any) { }
->foo1c : { (x: C<string>): any; (x: C<string>): any; }
+>foo1c : typeof foo1c
 >x : any
 
 function foo2(x: I);
->foo2 : { (x: I): any; (x: I): any; }
+>foo2 : typeof foo2
 >x : I
 >I : I
 
 function foo2(x: I); // error
->foo2 : { (x: I): any; (x: I): any; }
+>foo2 : typeof foo2
 >x : I
 >I : I
 
 function foo2(x: any) { }
->foo2 : { (x: I): any; (x: I): any; }
+>foo2 : typeof foo2
 >x : any
 
 function foo3(x: typeof a);
->foo3 : { (x: new (x: Date) => string): any; (x: new (x: Date) => string): any; }
+>foo3 : typeof foo3
 >x : new (x: Date) => string
 >a : new (x: Date) => string
 
 function foo3(x: typeof a); // error
->foo3 : { (x: new (x: Date) => string): any; (x: new (x: Date) => string): any; }
+>foo3 : typeof foo3
 >x : new (x: Date) => string
 >a : new (x: Date) => string
 
 function foo3(x: any) { }
->foo3 : { (x: new (x: Date) => string): any; (x: new (x: Date) => string): any; }
+>foo3 : typeof foo3
 >x : any
 
 function foo4(x: typeof b);
->foo4 : { (x: { new: (x: RegExp) => string; }): any; (x: { new: (x: RegExp) => string; }): any; }
+>foo4 : typeof foo4
 >x : { new: (x: RegExp) => string; }
 >b : { new: (x: RegExp) => string; }
 
 function foo4(x: typeof b); // error
->foo4 : { (x: { new: (x: RegExp) => string; }): any; (x: { new: (x: RegExp) => string; }): any; }
+>foo4 : typeof foo4
 >x : { new: (x: RegExp) => string; }
 >b : { new: (x: RegExp) => string; }
 
 function foo4(x: any) { }
->foo4 : { (x: { new: (x: RegExp) => string; }): any; (x: { new: (x: RegExp) => string; }): any; }
+>foo4 : typeof foo4
 >x : any
 
 function foo8(x: B);
->foo8 : { (x: B): any; (x: I): any; }
+>foo8 : typeof foo8
 >x : B
 >B : B
 
 function foo8(x: I); // ok
->foo8 : { (x: B): any; (x: I): any; }
+>foo8 : typeof foo8
 >x : I
 >I : I
 
 function foo8(x: any) { }
->foo8 : { (x: B): any; (x: I): any; }
+>foo8 : typeof foo8
 >x : any
 
 function foo9(x: B);
->foo9 : { (x: B): any; (x: C<string>): any; }
+>foo9 : typeof foo9
 >x : B
 >B : B
 
 function foo9(x: C<string>); // error, types are structurally equal
->foo9 : { (x: B): any; (x: C<string>): any; }
+>foo9 : typeof foo9
 >x : C<string>
 >C : C<T>
 
 function foo9(x: any) { }
->foo9 : { (x: B): any; (x: C<string>): any; }
+>foo9 : typeof foo9
 >x : any
 
 function foo10(x: B);
->foo10 : { (x: B): any; (x: new (x: Date) => string): any; }
+>foo10 : typeof foo10
 >x : B
 >B : B
 
 function foo10(x: typeof a); // ok
->foo10 : { (x: B): any; (x: new (x: Date) => string): any; }
+>foo10 : typeof foo10
 >x : new (x: Date) => string
 >a : new (x: Date) => string
 
 function foo10(x: any) { }
->foo10 : { (x: B): any; (x: new (x: Date) => string): any; }
+>foo10 : typeof foo10
 >x : any
 
 function foo11(x: B);
->foo11 : { (x: B): any; (x: { new: (x: RegExp) => string; }): any; }
+>foo11 : typeof foo11
 >x : B
 >B : B
 
 function foo11(x: typeof b); // ok
->foo11 : { (x: B): any; (x: { new: (x: RegExp) => string; }): any; }
+>foo11 : typeof foo11
 >x : { new: (x: RegExp) => string; }
 >b : { new: (x: RegExp) => string; }
 
 function foo11(x: any) { }
->foo11 : { (x: B): any; (x: { new: (x: RegExp) => string; }): any; }
+>foo11 : typeof foo11
 >x : any
 
 function foo12(x: I);
->foo12 : { (x: I): any; (x: C<string>): any; }
+>foo12 : typeof foo12
 >x : I
 >I : I
 
 function foo12(x: C<string>); // ok
->foo12 : { (x: I): any; (x: C<string>): any; }
+>foo12 : typeof foo12
 >x : C<string>
 >C : C<T>
 
 function foo12(x: any) { }
->foo12 : { (x: I): any; (x: C<string>): any; }
+>foo12 : typeof foo12
 >x : any
 
 function foo12b(x: I2<string>);
->foo12b : { (x: I2<string>): any; (x: C<string>): any; }
+>foo12b : typeof foo12b
 >x : I2<string>
 >I2 : I2<T>
 
 function foo12b(x: C<string>); // ok
->foo12b : { (x: I2<string>): any; (x: C<string>): any; }
+>foo12b : typeof foo12b
 >x : C<string>
 >C : C<T>
 
 function foo12b(x: any) { }
->foo12b : { (x: I2<string>): any; (x: C<string>): any; }
+>foo12b : typeof foo12b
 >x : any
 
 function foo13(x: I);
->foo13 : { (x: I): any; (x: new (x: Date) => string): any; }
+>foo13 : typeof foo13
 >x : I
 >I : I
 
 function foo13(x: typeof a); // ok
->foo13 : { (x: I): any; (x: new (x: Date) => string): any; }
+>foo13 : typeof foo13
 >x : new (x: Date) => string
 >a : new (x: Date) => string
 
 function foo13(x: any) { }
->foo13 : { (x: I): any; (x: new (x: Date) => string): any; }
+>foo13 : typeof foo13
 >x : any
 
 function foo14(x: I);
->foo14 : { (x: I): any; (x: { new: (x: RegExp) => string; }): any; }
+>foo14 : typeof foo14
 >x : I
 >I : I
 
 function foo14(x: typeof b); // ok
->foo14 : { (x: I): any; (x: { new: (x: RegExp) => string; }): any; }
+>foo14 : typeof foo14
 >x : { new: (x: RegExp) => string; }
 >b : { new: (x: RegExp) => string; }
 
 function foo14(x: any) { }
->foo14 : { (x: I): any; (x: { new: (x: RegExp) => string; }): any; }
+>foo14 : typeof foo14
 >x : any
 
 function foo15(x: I2<string>);
->foo15 : { (x: I2<string>): any; (x: C<number>): any; }
+>foo15 : typeof foo15
 >x : I2<string>
 >I2 : I2<T>
 
 function foo15(x: C<number>); // ok
->foo15 : { (x: I2<string>): any; (x: C<number>): any; }
+>foo15 : typeof foo15
 >x : C<number>
 >C : C<T>
 
 function foo15(x: any) { }
->foo15 : { (x: I2<string>): any; (x: C<number>): any; }
+>foo15 : typeof foo15
 >x : any
 
diff --git a/tests/baselines/reference/objectTypesIdentityWithConstructSignaturesDifferingParamCounts.types b/tests/baselines/reference/objectTypesIdentityWithConstructSignaturesDifferingParamCounts.types
index e5598f874e0..615a1cd6e6b 100644
--- a/tests/baselines/reference/objectTypesIdentityWithConstructSignaturesDifferingParamCounts.types
+++ b/tests/baselines/reference/objectTypesIdentityWithConstructSignaturesDifferingParamCounts.types
@@ -50,198 +50,198 @@ var b = { new(x: string) { return ''; } }; // not a construct signature, functio
 >x : string
 
 function foo1b(x: B);
->foo1b : { (x: B): any; (x: B): any; }
+>foo1b : typeof foo1b
 >x : B
 >B : B
 
 function foo1b(x: B); // error
->foo1b : { (x: B): any; (x: B): any; }
+>foo1b : typeof foo1b
 >x : B
 >B : B
 
 function foo1b(x: any) { }
->foo1b : { (x: B): any; (x: B): any; }
+>foo1b : typeof foo1b
 >x : any
 
 function foo1c(x: C<string>);
->foo1c : { (x: C<string>): any; (x: C<string>): any; }
+>foo1c : typeof foo1c
 >x : C<string>
 >C : C<T>
 
 function foo1c(x: C<string>); // error
->foo1c : { (x: C<string>): any; (x: C<string>): any; }
+>foo1c : typeof foo1c
 >x : C<string>
 >C : C<T>
 
 function foo1c(x: any) { }
->foo1c : { (x: C<string>): any; (x: C<string>): any; }
+>foo1c : typeof foo1c
 >x : any
 
 function foo2(x: I);
->foo2 : { (x: I): any; (x: I): any; }
+>foo2 : typeof foo2
 >x : I
 >I : I
 
 function foo2(x: I); // error
->foo2 : { (x: I): any; (x: I): any; }
+>foo2 : typeof foo2
 >x : I
 >I : I
 
 function foo2(x: any) { }
->foo2 : { (x: I): any; (x: I): any; }
+>foo2 : typeof foo2
 >x : any
 
 function foo3(x: typeof a);
->foo3 : { (x: new (x: string, y: string) => string): any; (x: new (x: string, y: string) => string): any; }
+>foo3 : typeof foo3
 >x : new (x: string, y: string) => string
 >a : new (x: string, y: string) => string
 
 function foo3(x: typeof a); // error
->foo3 : { (x: new (x: string, y: string) => string): any; (x: new (x: string, y: string) => string): any; }
+>foo3 : typeof foo3
 >x : new (x: string, y: string) => string
 >a : new (x: string, y: string) => string
 
 function foo3(x: any) { }
->foo3 : { (x: new (x: string, y: string) => string): any; (x: new (x: string, y: string) => string): any; }
+>foo3 : typeof foo3
 >x : any
 
 function foo4(x: typeof b);
->foo4 : { (x: { new: (x: string) => string; }): any; (x: { new: (x: string) => string; }): any; }
+>foo4 : typeof foo4
 >x : { new: (x: string) => string; }
 >b : { new: (x: string) => string; }
 
 function foo4(x: typeof b); // error
->foo4 : { (x: { new: (x: string) => string; }): any; (x: { new: (x: string) => string; }): any; }
+>foo4 : typeof foo4
 >x : { new: (x: string) => string; }
 >b : { new: (x: string) => string; }
 
 function foo4(x: any) { }
->foo4 : { (x: { new: (x: string) => string; }): any; (x: { new: (x: string) => string; }): any; }
+>foo4 : typeof foo4
 >x : any
 
 function foo8(x: B);
->foo8 : { (x: B): any; (x: I): any; }
+>foo8 : typeof foo8
 >x : B
 >B : B
 
 function foo8(x: I); // ok
->foo8 : { (x: B): any; (x: I): any; }
+>foo8 : typeof foo8
 >x : I
 >I : I
 
 function foo8(x: any) { }
->foo8 : { (x: B): any; (x: I): any; }
+>foo8 : typeof foo8
 >x : any
 
 function foo9(x: B);
->foo9 : { (x: B): any; (x: C<string>): any; }
+>foo9 : typeof foo9
 >x : B
 >B : B
 
 function foo9(x: C<string>); // error, types are structurally equal
->foo9 : { (x: B): any; (x: C<string>): any; }
+>foo9 : typeof foo9
 >x : C<string>
 >C : C<T>
 
 function foo9(x: any) { }
->foo9 : { (x: B): any; (x: C<string>): any; }
+>foo9 : typeof foo9
 >x : any
 
 function foo10(x: B);
->foo10 : { (x: B): any; (x: new (x: string, y: string) => string): any; }
+>foo10 : typeof foo10
 >x : B
 >B : B
 
 function foo10(x: typeof a); // ok
->foo10 : { (x: B): any; (x: new (x: string, y: string) => string): any; }
+>foo10 : typeof foo10
 >x : new (x: string, y: string) => string
 >a : new (x: string, y: string) => string
 
 function foo10(x: any) { }
->foo10 : { (x: B): any; (x: new (x: string, y: string) => string): any; }
+>foo10 : typeof foo10
 >x : any
 
 function foo11(x: B);
->foo11 : { (x: B): any; (x: { new: (x: string) => string; }): any; }
+>foo11 : typeof foo11
 >x : B
 >B : B
 
 function foo11(x: typeof b); // ok
->foo11 : { (x: B): any; (x: { new: (x: string) => string; }): any; }
+>foo11 : typeof foo11
 >x : { new: (x: string) => string; }
 >b : { new: (x: string) => string; }
 
 function foo11(x: any) { }
->foo11 : { (x: B): any; (x: { new: (x: string) => string; }): any; }
+>foo11 : typeof foo11
 >x : any
 
 function foo12(x: I);
->foo12 : { (x: I): any; (x: C<string>): any; }
+>foo12 : typeof foo12
 >x : I
 >I : I
 
 function foo12(x: C<string>); // ok
->foo12 : { (x: I): any; (x: C<string>): any; }
+>foo12 : typeof foo12
 >x : C<string>
 >C : C<T>
 
 function foo12(x: any) { }
->foo12 : { (x: I): any; (x: C<string>): any; }
+>foo12 : typeof foo12
 >x : any
 
 function foo12b(x: I2<string>);
->foo12b : { (x: I2<string>): any; (x: C<string>): any; }
+>foo12b : typeof foo12b
 >x : I2<string>
 >I2 : I2<T>
 
 function foo12b(x: C<string>); // ok
->foo12b : { (x: I2<string>): any; (x: C<string>): any; }
+>foo12b : typeof foo12b
 >x : C<string>
 >C : C<T>
 
 function foo12b(x: any) { }
->foo12b : { (x: I2<string>): any; (x: C<string>): any; }
+>foo12b : typeof foo12b
 >x : any
 
 function foo13(x: I);
->foo13 : { (x: I): any; (x: new (x: string, y: string) => string): any; }
+>foo13 : typeof foo13
 >x : I
 >I : I
 
 function foo13(x: typeof a); // ok
->foo13 : { (x: I): any; (x: new (x: string, y: string) => string): any; }
+>foo13 : typeof foo13
 >x : new (x: string, y: string) => string
 >a : new (x: string, y: string) => string
 
 function foo13(x: any) { }
->foo13 : { (x: I): any; (x: new (x: string, y: string) => string): any; }
+>foo13 : typeof foo13
 >x : any
 
 function foo14(x: I);
->foo14 : { (x: I): any; (x: { new: (x: string) => string; }): any; }
+>foo14 : typeof foo14
 >x : I
 >I : I
 
 function foo14(x: typeof b); // ok
->foo14 : { (x: I): any; (x: { new: (x: string) => string; }): any; }
+>foo14 : typeof foo14
 >x : { new: (x: string) => string; }
 >b : { new: (x: string) => string; }
 
 function foo14(x: any) { }
->foo14 : { (x: I): any; (x: { new: (x: string) => string; }): any; }
+>foo14 : typeof foo14
 >x : any
 
 function foo15(x: I2<string>);
->foo15 : { (x: I2<string>): any; (x: C<number>): any; }
+>foo15 : typeof foo15
 >x : I2<string>
 >I2 : I2<T>
 
 function foo15(x: C<number>); // ok
->foo15 : { (x: I2<string>): any; (x: C<number>): any; }
+>foo15 : typeof foo15
 >x : C<number>
 >C : C<T>
 
 function foo15(x: any) { }
->foo15 : { (x: I2<string>): any; (x: C<number>): any; }
+>foo15 : typeof foo15
 >x : any
 
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignatures.types b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignatures.types
index 240e12b1c22..a6223aae995 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignatures.types
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignatures.types
@@ -75,268 +75,268 @@ var b = { foo<T>(x: T) { return x; } };
 >x : T
 
 function foo1(x: A);
->foo1 : { (x: A): any; (x: A): any; }
+>foo1 : typeof foo1
 >x : A
 >A : A
 
 function foo1(x: A); // error
->foo1 : { (x: A): any; (x: A): any; }
+>foo1 : typeof foo1
 >x : A
 >A : A
 
 function foo1(x: any) { }
->foo1 : { (x: A): any; (x: A): any; }
+>foo1 : typeof foo1
 >x : any
 
 function foo1b(x: B<string>);
->foo1b : { (x: B<string>): any; (x: B<string>): any; }
+>foo1b : typeof foo1b
 >x : B<string>
 >B : B<T>
 
 function foo1b(x: B<string>); // error
->foo1b : { (x: B<string>): any; (x: B<string>): any; }
+>foo1b : typeof foo1b
 >x : B<string>
 >B : B<T>
 
 function foo1b(x: any) { }
->foo1b : { (x: B<string>): any; (x: B<string>): any; }
+>foo1b : typeof foo1b
 >x : any
 
 function foo1c(x: C<string>);
->foo1c : { (x: C<string>): any; (x: C<string>): any; }
+>foo1c : typeof foo1c
 >x : C<string>
 >C : C<T>
 
 function foo1c(x: C<string>); // error
->foo1c : { (x: C<string>): any; (x: C<string>): any; }
+>foo1c : typeof foo1c
 >x : C<string>
 >C : C<T>
 
 function foo1c(x: any) { }
->foo1c : { (x: C<string>): any; (x: C<string>): any; }
+>foo1c : typeof foo1c
 >x : any
 
 function foo2(x: I<string>);
->foo2 : { (x: I<string>): any; (x: I<string>): any; }
+>foo2 : typeof foo2
 >x : I<string>
 >I : I<T>
 
 function foo2(x: I<string>); // error
->foo2 : { (x: I<string>): any; (x: I<string>): any; }
+>foo2 : typeof foo2
 >x : I<string>
 >I : I<T>
 
 function foo2(x: any) { }
->foo2 : { (x: I<string>): any; (x: I<string>): any; }
+>foo2 : typeof foo2
 >x : any
 
 function foo3(x: typeof a);
->foo3 : { (x: { foo<T>(x: T): T; }): any; (x: { foo<T>(x: T): T; }): any; }
+>foo3 : typeof foo3
 >x : { foo<T>(x: T): T; }
 >a : { foo<T>(x: T): T; }
 
 function foo3(x: typeof a); // error
->foo3 : { (x: { foo<T>(x: T): T; }): any; (x: { foo<T>(x: T): T; }): any; }
+>foo3 : typeof foo3
 >x : { foo<T>(x: T): T; }
 >a : { foo<T>(x: T): T; }
 
 function foo3(x: any) { }
->foo3 : { (x: { foo<T>(x: T): T; }): any; (x: { foo<T>(x: T): T; }): any; }
+>foo3 : typeof foo3
 >x : any
 
 function foo4(x: typeof b);
->foo4 : { (x: { foo: <T>(x: T) => T; }): any; (x: { foo: <T>(x: T) => T; }): any; }
+>foo4 : typeof foo4
 >x : { foo: <T>(x: T) => T; }
 >b : { foo: <T>(x: T) => T; }
 
 function foo4(x: typeof b); // error
->foo4 : { (x: { foo: <T>(x: T) => T; }): any; (x: { foo: <T>(x: T) => T; }): any; }
+>foo4 : typeof foo4
 >x : { foo: <T>(x: T) => T; }
 >b : { foo: <T>(x: T) => T; }
 
 function foo4(x: any) { }
->foo4 : { (x: { foo: <T>(x: T) => T; }): any; (x: { foo: <T>(x: T) => T; }): any; }
+>foo4 : typeof foo4
 >x : any
 
 function foo5(x: A);
->foo5 : { (x: A): any; (x: B<string>): any; }
+>foo5 : typeof foo5
 >x : A
 >A : A
 
 function foo5(x: B<string>); // ok
->foo5 : { (x: A): any; (x: B<string>): any; }
+>foo5 : typeof foo5
 >x : B<string>
 >B : B<T>
 
 function foo5(x: any) { }
->foo5 : { (x: A): any; (x: B<string>): any; }
+>foo5 : typeof foo5
 >x : any
 
 function foo5b(x: A);
->foo5b : { (x: A): any; (x: C<string>): any; }
+>foo5b : typeof foo5b
 >x : A
 >A : A
 
 function foo5b(x: C<string>); // ok
->foo5b : { (x: A): any; (x: C<string>): any; }
+>foo5b : typeof foo5b
 >x : C<string>
 >C : C<T>
 
 function foo5b(x: any) { }
->foo5b : { (x: A): any; (x: C<string>): any; }
+>foo5b : typeof foo5b
 >x : any
 
 function foo6(x: A);
->foo6 : { (x: A): any; (x: I<string>): any; }
+>foo6 : typeof foo6
 >x : A
 >A : A
 
 function foo6(x: I<string>); // ok
->foo6 : { (x: A): any; (x: I<string>): any; }
+>foo6 : typeof foo6
 >x : I<string>
 >I : I<T>
 
 function foo6(x: any) { }
->foo6 : { (x: A): any; (x: I<string>): any; }
+>foo6 : typeof foo6
 >x : any
 
 function foo7(x: A);
->foo7 : { (x: A): any; (x: { foo<T>(x: T): T; }): any; }
+>foo7 : typeof foo7
 >x : A
 >A : A
 
 function foo7(x: typeof a); // error
->foo7 : { (x: A): any; (x: { foo<T>(x: T): T; }): any; }
+>foo7 : typeof foo7
 >x : { foo<T>(x: T): T; }
 >a : { foo<T>(x: T): T; }
 
 function foo7(x: any) { }
->foo7 : { (x: A): any; (x: { foo<T>(x: T): T; }): any; }
+>foo7 : typeof foo7
 >x : any
 
 function foo8(x: B<string>);
->foo8 : { (x: B<string>): any; (x: I<string>): any; }
+>foo8 : typeof foo8
 >x : B<string>
 >B : B<T>
 
 function foo8(x: I<string>); // error
->foo8 : { (x: B<string>): any; (x: I<string>): any; }
+>foo8 : typeof foo8
 >x : I<string>
 >I : I<T>
 
 function foo8(x: any) { }
->foo8 : { (x: B<string>): any; (x: I<string>): any; }
+>foo8 : typeof foo8
 >x : any
 
 function foo9(x: B<string>);
->foo9 : { (x: B<string>): any; (x: C<string>): any; }
+>foo9 : typeof foo9
 >x : B<string>
 >B : B<T>
 
 function foo9(x: C<string>); // error
->foo9 : { (x: B<string>): any; (x: C<string>): any; }
+>foo9 : typeof foo9
 >x : C<string>
 >C : C<T>
 
 function foo9(x: any) { }
->foo9 : { (x: B<string>): any; (x: C<string>): any; }
+>foo9 : typeof foo9
 >x : any
 
 function foo10(x: B<string>);
->foo10 : { (x: B<string>): any; (x: { foo<T>(x: T): T; }): any; }
+>foo10 : typeof foo10
 >x : B<string>
 >B : B<T>
 
 function foo10(x: typeof a); // ok
->foo10 : { (x: B<string>): any; (x: { foo<T>(x: T): T; }): any; }
+>foo10 : typeof foo10
 >x : { foo<T>(x: T): T; }
 >a : { foo<T>(x: T): T; }
 
 function foo10(x: any) { }
->foo10 : { (x: B<string>): any; (x: { foo<T>(x: T): T; }): any; }
+>foo10 : typeof foo10
 >x : any
 
 function foo11(x: B<string>);
->foo11 : { (x: B<string>): any; (x: { foo: <T>(x: T) => T; }): any; }
+>foo11 : typeof foo11
 >x : B<string>
 >B : B<T>
 
 function foo11(x: typeof b); // ok
->foo11 : { (x: B<string>): any; (x: { foo: <T>(x: T) => T; }): any; }
+>foo11 : typeof foo11
 >x : { foo: <T>(x: T) => T; }
 >b : { foo: <T>(x: T) => T; }
 
 function foo11(x: any) { }
->foo11 : { (x: B<string>): any; (x: { foo: <T>(x: T) => T; }): any; }
+>foo11 : typeof foo11
 >x : any
 
 function foo12(x: I<string>);
->foo12 : { (x: I<string>): any; (x: C<string>): any; }
+>foo12 : typeof foo12
 >x : I<string>
 >I : I<T>
 
 function foo12(x: C<string>); // error
->foo12 : { (x: I<string>): any; (x: C<string>): any; }
+>foo12 : typeof foo12
 >x : C<string>
 >C : C<T>
 
 function foo12(x: any) { }
->foo12 : { (x: I<string>): any; (x: C<string>): any; }
+>foo12 : typeof foo12
 >x : any
 
 function foo12b(x: I2);
->foo12b : { (x: I2): any; (x: C<string>): any; }
+>foo12b : typeof foo12b
 >x : I2
 >I2 : I2
 
 function foo12b(x: C<string>); // ok
->foo12b : { (x: I2): any; (x: C<string>): any; }
+>foo12b : typeof foo12b
 >x : C<string>
 >C : C<T>
 
 function foo12b(x: any) { }
->foo12b : { (x: I2): any; (x: C<string>): any; }
+>foo12b : typeof foo12b
 >x : any
 
 function foo13(x: I<string>);
->foo13 : { (x: I<string>): any; (x: { foo<T>(x: T): T; }): any; }
+>foo13 : typeof foo13
 >x : I<string>
 >I : I<T>
 
 function foo13(x: typeof a); // ok
->foo13 : { (x: I<string>): any; (x: { foo<T>(x: T): T; }): any; }
+>foo13 : typeof foo13
 >x : { foo<T>(x: T): T; }
 >a : { foo<T>(x: T): T; }
 
 function foo13(x: any) { }
->foo13 : { (x: I<string>): any; (x: { foo<T>(x: T): T; }): any; }
+>foo13 : typeof foo13
 >x : any
 
 function foo14(x: I<string>);
->foo14 : { (x: I<string>): any; (x: { foo: <T>(x: T) => T; }): any; }
+>foo14 : typeof foo14
 >x : I<string>
 >I : I<T>
 
 function foo14(x: typeof b); // ok
->foo14 : { (x: I<string>): any; (x: { foo: <T>(x: T) => T; }): any; }
+>foo14 : typeof foo14
 >x : { foo: <T>(x: T) => T; }
 >b : { foo: <T>(x: T) => T; }
 
 function foo14(x: any) { }
->foo14 : { (x: I<string>): any; (x: { foo: <T>(x: T) => T; }): any; }
+>foo14 : typeof foo14
 >x : any
 
 function foo15(x: I2);
->foo15 : { (x: I2): any; (x: C<number>): any; }
+>foo15 : typeof foo15
 >x : I2
 >I2 : I2
 
 function foo15(x: C<number>); // ok
->foo15 : { (x: I2): any; (x: C<number>): any; }
+>foo15 : typeof foo15
 >x : C<number>
 >C : C<T>
 
 function foo15(x: any) { }
->foo15 : { (x: I2): any; (x: C<number>): any; }
+>foo15 : typeof foo15
 >x : any
 
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignatures2.types b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignatures2.types
index 932dbf7e9b3..f3ecf95b1f8 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignatures2.types
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignatures2.types
@@ -96,268 +96,268 @@ var b = { foo<T, U>(x: T, y: U) { return x; } };
 >x : T
 
 function foo1(x: A);
->foo1 : { (x: A): any; (x: A): any; }
+>foo1 : typeof foo1
 >x : A
 >A : A
 
 function foo1(x: A); // error
->foo1 : { (x: A): any; (x: A): any; }
+>foo1 : typeof foo1
 >x : A
 >A : A
 
 function foo1(x: any) { }
->foo1 : { (x: A): any; (x: A): any; }
+>foo1 : typeof foo1
 >x : any
 
 function foo1b(x: B<string, number>);
->foo1b : { (x: B<string, number>): any; (x: B<string, number>): any; }
+>foo1b : typeof foo1b
 >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; }
+>foo1b : typeof foo1b
 >x : B<string, number>
 >B : B<T, U>
 
 function foo1b(x: any) { }
->foo1b : { (x: B<string, number>): any; (x: B<string, number>): any; }
+>foo1b : typeof foo1b
 >x : any
 
 function foo1c(x: C<string, number>);
->foo1c : { (x: C<string, number>): any; (x: C<string, number>): any; }
+>foo1c : typeof foo1c
 >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; }
+>foo1c : typeof foo1c
 >x : C<string, number>
 >C : C<T, U>
 
 function foo1c(x: any) { }
->foo1c : { (x: C<string, number>): any; (x: C<string, number>): any; }
+>foo1c : typeof foo1c
 >x : any
 
 function foo2(x: I<string, number>);
->foo2 : { (x: I<string, number>): any; (x: I<string, number>): any; }
+>foo2 : typeof foo2
 >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; }
+>foo2 : typeof foo2
 >x : I<string, number>
 >I : I<T, U>
 
 function foo2(x: any) { }
->foo2 : { (x: I<string, number>): any; (x: I<string, number>): any; }
+>foo2 : typeof foo2
 >x : any
 
 function foo3(x: typeof a);
->foo3 : { (x: { foo<T, U>(x: T, y: U): T; }): any; (x: { foo<T, U>(x: T, y: U): T; }): any; }
+>foo3 : typeof foo3
 >x : { foo<T, U>(x: T, y: U): T; }
 >a : { foo<T, U>(x: T, y: U): T; }
 
 function foo3(x: typeof a); // error
->foo3 : { (x: { foo<T, U>(x: T, y: U): T; }): any; (x: { foo<T, U>(x: T, y: U): T; }): any; }
+>foo3 : typeof foo3
 >x : { foo<T, U>(x: T, y: U): T; }
 >a : { foo<T, U>(x: T, y: U): T; }
 
 function foo3(x: any) { }
->foo3 : { (x: { foo<T, U>(x: T, y: U): T; }): any; (x: { foo<T, U>(x: T, y: U): T; }): any; }
+>foo3 : typeof foo3
 >x : any
 
 function foo4(x: typeof b);
->foo4 : { (x: { foo: <T, U>(x: T, y: U) => T; }): any; (x: { foo: <T, U>(x: T, y: U) => T; }): any; }
+>foo4 : typeof foo4
 >x : { foo: <T, U>(x: T, y: U) => T; }
 >b : { foo: <T, U>(x: T, y: U) => T; }
 
 function foo4(x: typeof b); // error
->foo4 : { (x: { foo: <T, U>(x: T, y: U) => T; }): any; (x: { foo: <T, U>(x: T, y: U) => T; }): any; }
+>foo4 : typeof foo4
 >x : { foo: <T, U>(x: T, y: U) => T; }
 >b : { foo: <T, U>(x: T, y: U) => T; }
 
 function foo4(x: any) { }
->foo4 : { (x: { foo: <T, U>(x: T, y: U) => T; }): any; (x: { foo: <T, U>(x: T, y: U) => T; }): any; }
+>foo4 : typeof foo4
 >x : any
 
 function foo5(x: A);
->foo5 : { (x: A): any; (x: B<string, number>): any; }
+>foo5 : typeof foo5
 >x : A
 >A : A
 
 function foo5(x: B<string, number>); // ok
->foo5 : { (x: A): any; (x: B<string, number>): any; }
+>foo5 : typeof foo5
 >x : B<string, number>
 >B : B<T, U>
 
 function foo5(x: any) { }
->foo5 : { (x: A): any; (x: B<string, number>): any; }
+>foo5 : typeof foo5
 >x : any
 
 function foo5b(x: A);
->foo5b : { (x: A): any; (x: C<string, number>): any; }
+>foo5b : typeof foo5b
 >x : A
 >A : A
 
 function foo5b(x: C<string, number>); // ok
->foo5b : { (x: A): any; (x: C<string, number>): any; }
+>foo5b : typeof foo5b
 >x : C<string, number>
 >C : C<T, U>
 
 function foo5b(x: any) { }
->foo5b : { (x: A): any; (x: C<string, number>): any; }
+>foo5b : typeof foo5b
 >x : any
 
 function foo6(x: A);
->foo6 : { (x: A): any; (x: I<string, number>): any; }
+>foo6 : typeof foo6
 >x : A
 >A : A
 
 function foo6(x: I<string, number>); // ok
->foo6 : { (x: A): any; (x: I<string, number>): any; }
+>foo6 : typeof foo6
 >x : I<string, number>
 >I : I<T, U>
 
 function foo6(x: any) { }
->foo6 : { (x: A): any; (x: I<string, number>): any; }
+>foo6 : typeof foo6
 >x : any
 
 function foo7(x: A);
->foo7 : { (x: A): any; (x: { foo<T, U>(x: T, y: U): T; }): any; }
+>foo7 : typeof foo7
 >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; }
+>foo7 : typeof foo7
 >x : { foo<T, U>(x: T, y: U): T; }
 >a : { foo<T, U>(x: T, y: U): T; }
 
 function foo7(x: any) { }
->foo7 : { (x: A): any; (x: { foo<T, U>(x: T, y: U): T; }): any; }
+>foo7 : typeof foo7
 >x : any
 
 function foo8(x: B<string, number>);
->foo8 : { (x: B<string, number>): any; (x: I<string, number>): any; }
+>foo8 : typeof foo8
 >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; }
+>foo8 : typeof foo8
 >x : I<string, number>
 >I : I<T, U>
 
 function foo8(x: any) { }
->foo8 : { (x: B<string, number>): any; (x: I<string, number>): any; }
+>foo8 : typeof foo8
 >x : any
 
 function foo9(x: B<string, number>);
->foo9 : { (x: B<string, number>): any; (x: C<string, number>): any; }
+>foo9 : typeof foo9
 >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; }
+>foo9 : typeof foo9
 >x : C<string, number>
 >C : C<T, U>
 
 function foo9(x: any) { }
->foo9 : { (x: B<string, number>): any; (x: C<string, number>): any; }
+>foo9 : typeof 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; }
+>foo10 : typeof foo10
 >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; }
+>foo10 : typeof foo10
 >x : { foo<T, U>(x: T, y: U): T; }
 >a : { foo<T, U>(x: T, y: U): T; }
 
 function foo10(x: any) { }
->foo10 : { (x: B<string, number>): any; (x: { foo<T, U>(x: T, y: U): T; }): any; }
+>foo10 : typeof 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; }
+>foo11 : typeof foo11
 >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; }
+>foo11 : typeof foo11
 >x : { foo: <T, U>(x: T, y: U) => T; }
 >b : { foo: <T, U>(x: T, y: U) => T; }
 
 function foo11(x: any) { }
->foo11 : { (x: B<string, number>): any; (x: { foo: <T, U>(x: T, y: U) => T; }): any; }
+>foo11 : typeof foo11
 >x : any
 
 function foo12(x: I<string, number>);
->foo12 : { (x: I<string, number>): any; (x: C<string, number>): any; }
+>foo12 : typeof foo12
 >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; }
+>foo12 : typeof foo12
 >x : C<string, number>
 >C : C<T, U>
 
 function foo12(x: any) { }
->foo12 : { (x: I<string, number>): any; (x: C<string, number>): any; }
+>foo12 : typeof foo12
 >x : any
 
 function foo12b(x: I2);
->foo12b : { (x: I2): any; (x: C<string, number>): any; }
+>foo12b : typeof foo12b
 >x : I2
 >I2 : I2
 
 function foo12b(x: C<string, number>); // ok
->foo12b : { (x: I2): any; (x: C<string, number>): any; }
+>foo12b : typeof foo12b
 >x : C<string, number>
 >C : C<T, U>
 
 function foo12b(x: any) { }
->foo12b : { (x: I2): any; (x: C<string, number>): any; }
+>foo12b : typeof 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; }
+>foo13 : typeof foo13
 >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; }
+>foo13 : typeof foo13
 >x : { foo<T, U>(x: T, y: U): T; }
 >a : { foo<T, U>(x: T, y: U): T; }
 
 function foo13(x: any) { }
->foo13 : { (x: I<string, number>): any; (x: { foo<T, U>(x: T, y: U): T; }): any; }
+>foo13 : typeof 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; }
+>foo14 : typeof foo14
 >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; }
+>foo14 : typeof foo14
 >x : { foo: <T, U>(x: T, y: U) => T; }
 >b : { foo: <T, U>(x: T, y: U) => T; }
 
 function foo14(x: any) { }
->foo14 : { (x: I<string, number>): any; (x: { foo: <T, U>(x: T, y: U) => T; }): any; }
+>foo14 : typeof foo14
 >x : any
 
 function foo15(x: I2);
->foo15 : { (x: I2): any; (x: C<string, number>): any; }
+>foo15 : typeof foo15
 >x : I2
 >I2 : I2
 
 function foo15(x: C<string, number>); // ok
->foo15 : { (x: I2): any; (x: C<string, number>): any; }
+>foo15 : typeof foo15
 >x : C<string, number>
 >C : C<T, U>
 
 function foo15(x: any) { }
->foo15 : { (x: I2): any; (x: C<string, number>): any; }
+>foo15 : typeof foo15
 >x : any
 
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.types b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.types
index 2a5ab2dfe70..a0a1ace5645 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.types
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.types
@@ -77,289 +77,289 @@ var b = { foo<T extends RegExp>(x: T) { return ''; } };
 >T : T
 
 function foo1(x: A);
->foo1 : { (x: A): any; (x: A): any; }
+>foo1 : typeof foo1
 >x : A
 >A : A
 
 function foo1(x: A); // error
->foo1 : { (x: A): any; (x: A): any; }
+>foo1 : typeof foo1
 >x : A
 >A : A
 
 function foo1(x: any) { }
->foo1 : { (x: A): any; (x: A): any; }
+>foo1 : typeof foo1
 >x : any
 
 function foo1b(x: B<Array<number>>);
->foo1b : { (x: B<number[]>): any; (x: B<number[]>): any; }
+>foo1b : typeof foo1b
 >x : B<number[]>
 >B : B<T>
 >Array : T[]
 
 function foo1b(x: B<Array<number>>); // error
->foo1b : { (x: B<number[]>): any; (x: B<number[]>): any; }
+>foo1b : typeof foo1b
 >x : B<number[]>
 >B : B<T>
 >Array : T[]
 
 function foo1b(x: any) { }
->foo1b : { (x: B<number[]>): any; (x: B<number[]>): any; }
+>foo1b : typeof foo1b
 >x : any
 
 function foo1c(x: C<String>);
->foo1c : { (x: C<String>): any; (x: C<String>): any; }
+>foo1c : typeof foo1c
 >x : C<String>
 >C : C<T>
 >String : String
 
 function foo1c(x: C<String>); // error
->foo1c : { (x: C<String>): any; (x: C<String>): any; }
+>foo1c : typeof foo1c
 >x : C<String>
 >C : C<T>
 >String : String
 
 function foo1c(x: any) { }
->foo1c : { (x: C<String>): any; (x: C<String>): any; }
+>foo1c : typeof foo1c
 >x : any
 
 function foo2(x: I<Number>);
->foo2 : { (x: I<Number>): any; (x: I<Number>): any; }
+>foo2 : typeof foo2
 >x : I<Number>
 >I : I<T>
 >Number : Number
 
 function foo2(x: I<Number>); // error
->foo2 : { (x: I<Number>): any; (x: I<Number>): any; }
+>foo2 : typeof foo2
 >x : I<Number>
 >I : I<T>
 >Number : Number
 
 function foo2(x: any) { }
->foo2 : { (x: I<Number>): any; (x: I<Number>): any; }
+>foo2 : typeof foo2
 >x : any
 
 function foo3(x: typeof a);
->foo3 : { (x: { foo<T extends string[]>(x: T): string; }): any; (x: { foo<T extends string[]>(x: T): string; }): any; }
+>foo3 : typeof foo3
 >x : { foo<T extends string[]>(x: T): string; }
 >a : { foo<T extends string[]>(x: T): string; }
 
 function foo3(x: typeof a); // error
->foo3 : { (x: { foo<T extends string[]>(x: T): string; }): any; (x: { foo<T extends string[]>(x: T): string; }): any; }
+>foo3 : typeof foo3
 >x : { foo<T extends string[]>(x: T): string; }
 >a : { foo<T extends string[]>(x: T): string; }
 
 function foo3(x: any) { }
->foo3 : { (x: { foo<T extends string[]>(x: T): string; }): any; (x: { foo<T extends string[]>(x: T): string; }): any; }
+>foo3 : typeof foo3
 >x : any
 
 function foo4(x: typeof b);
->foo4 : { (x: { foo: <T extends RegExp>(x: T) => string; }): any; (x: { foo: <T extends RegExp>(x: T) => string; }): any; }
+>foo4 : typeof foo4
 >x : { foo: <T extends RegExp>(x: T) => string; }
 >b : { foo: <T extends RegExp>(x: T) => string; }
 
 function foo4(x: typeof b); // error
->foo4 : { (x: { foo: <T extends RegExp>(x: T) => string; }): any; (x: { foo: <T extends RegExp>(x: T) => string; }): any; }
+>foo4 : typeof foo4
 >x : { foo: <T extends RegExp>(x: T) => string; }
 >b : { foo: <T extends RegExp>(x: T) => string; }
 
 function foo4(x: any) { }
->foo4 : { (x: { foo: <T extends RegExp>(x: T) => string; }): any; (x: { foo: <T extends RegExp>(x: T) => string; }): any; }
+>foo4 : typeof foo4
 >x : any
 
 function foo5(x: A);
->foo5 : { (x: A): any; (x: B<number[]>): any; }
+>foo5 : typeof foo5
 >x : A
 >A : A
 
 function foo5(x: B<Array<number>>); // ok
->foo5 : { (x: A): any; (x: B<number[]>): any; }
+>foo5 : typeof foo5
 >x : B<number[]>
 >B : B<T>
 >Array : T[]
 
 function foo5(x: any) { }
->foo5 : { (x: A): any; (x: B<number[]>): any; }
+>foo5 : typeof foo5
 >x : any
 
 function foo5b(x: A);
->foo5b : { (x: A): any; (x: C<String>): any; }
+>foo5b : typeof foo5b
 >x : A
 >A : A
 
 function foo5b(x: C<String>); // ok
->foo5b : { (x: A): any; (x: C<String>): any; }
+>foo5b : typeof foo5b
 >x : C<String>
 >C : C<T>
 >String : String
 
 function foo5b(x: any) { }
->foo5b : { (x: A): any; (x: C<String>): any; }
+>foo5b : typeof foo5b
 >x : any
 
 function foo6(x: A);
->foo6 : { (x: A): any; (x: I<Number>): any; }
+>foo6 : typeof foo6
 >x : A
 >A : A
 
 function foo6(x: I<Number>); // ok
->foo6 : { (x: A): any; (x: I<Number>): any; }
+>foo6 : typeof foo6
 >x : I<Number>
 >I : I<T>
 >Number : Number
 
 function foo6(x: any) { }
->foo6 : { (x: A): any; (x: I<Number>): any; }
+>foo6 : typeof foo6
 >x : any
 
 function foo7(x: A);
->foo7 : { (x: A): any; (x: { foo<T extends string[]>(x: T): string; }): any; }
+>foo7 : typeof foo7
 >x : A
 >A : A
 
 function foo7(x: typeof a); // ok
->foo7 : { (x: A): any; (x: { foo<T extends string[]>(x: T): string; }): any; }
+>foo7 : typeof foo7
 >x : { foo<T extends string[]>(x: T): string; }
 >a : { foo<T extends string[]>(x: T): string; }
 
 function foo7(x: any) { }
->foo7 : { (x: A): any; (x: { foo<T extends string[]>(x: T): string; }): any; }
+>foo7 : typeof foo7
 >x : any
 
 function foo8(x: B<Array<number>>);
->foo8 : { (x: B<number[]>): any; (x: I<Number>): any; }
+>foo8 : typeof foo8
 >x : B<number[]>
 >B : B<T>
 >Array : T[]
 
 function foo8(x: I<Number>); // ok
->foo8 : { (x: B<number[]>): any; (x: I<Number>): any; }
+>foo8 : typeof foo8
 >x : I<Number>
 >I : I<T>
 >Number : Number
 
 function foo8(x: any) { }
->foo8 : { (x: B<number[]>): any; (x: I<Number>): any; }
+>foo8 : typeof foo8
 >x : any
 
 function foo9(x: B<Array<number>>);
->foo9 : { (x: B<number[]>): any; (x: C<String>): any; }
+>foo9 : typeof foo9
 >x : B<number[]>
 >B : B<T>
 >Array : T[]
 
 function foo9(x: C<String>); // ok
->foo9 : { (x: B<number[]>): any; (x: C<String>): any; }
+>foo9 : typeof foo9
 >x : C<String>
 >C : C<T>
 >String : String
 
 function foo9(x: any) { }
->foo9 : { (x: B<number[]>): any; (x: C<String>): any; }
+>foo9 : typeof foo9
 >x : any
 
 function foo10(x: B<Array<number>>);
->foo10 : { (x: B<number[]>): any; (x: { foo<T extends string[]>(x: T): string; }): any; }
+>foo10 : typeof foo10
 >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; }
+>foo10 : typeof foo10
 >x : { foo<T extends string[]>(x: T): string; }
 >a : { foo<T extends string[]>(x: T): string; }
 
 function foo10(x: any) { }
->foo10 : { (x: B<number[]>): any; (x: { foo<T extends string[]>(x: T): string; }): any; }
+>foo10 : typeof foo10
 >x : any
 
 function foo11(x: B<Array<number>>);
->foo11 : { (x: B<number[]>): any; (x: { foo: <T extends RegExp>(x: T) => string; }): any; }
+>foo11 : typeof foo11
 >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; }
+>foo11 : typeof foo11
 >x : { foo: <T extends RegExp>(x: T) => string; }
 >b : { foo: <T extends RegExp>(x: T) => string; }
 
 function foo11(x: any) { }
->foo11 : { (x: B<number[]>): any; (x: { foo: <T extends RegExp>(x: T) => string; }): any; }
+>foo11 : typeof foo11
 >x : any
 
 function foo12(x: I<Number>);
->foo12 : { (x: I<Number>): any; (x: C<String>): any; }
+>foo12 : typeof foo12
 >x : I<Number>
 >I : I<T>
 >Number : Number
 
 function foo12(x: C<String>); // ok
->foo12 : { (x: I<Number>): any; (x: C<String>): any; }
+>foo12 : typeof foo12
 >x : C<String>
 >C : C<T>
 >String : String
 
 function foo12(x: any) { }
->foo12 : { (x: I<Number>): any; (x: C<String>): any; }
+>foo12 : typeof foo12
 >x : any
 
 function foo12b(x: I2);
->foo12b : { (x: I2): any; (x: C<String>): any; }
+>foo12b : typeof foo12b
 >x : I2
 >I2 : I2
 
 function foo12b(x: C<String>); // ok
->foo12b : { (x: I2): any; (x: C<String>): any; }
+>foo12b : typeof foo12b
 >x : C<String>
 >C : C<T>
 >String : String
 
 function foo12b(x: any) { }
->foo12b : { (x: I2): any; (x: C<String>): any; }
+>foo12b : typeof foo12b
 >x : any
 
 function foo13(x: I<Number>);
->foo13 : { (x: I<Number>): any; (x: { foo<T extends string[]>(x: T): string; }): any; }
+>foo13 : typeof foo13
 >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; }
+>foo13 : typeof foo13
 >x : { foo<T extends string[]>(x: T): string; }
 >a : { foo<T extends string[]>(x: T): string; }
 
 function foo13(x: any) { }
->foo13 : { (x: I<Number>): any; (x: { foo<T extends string[]>(x: T): string; }): any; }
+>foo13 : typeof foo13
 >x : any
 
 function foo14(x: I<Number>);
->foo14 : { (x: I<Number>): any; (x: { foo: <T extends RegExp>(x: T) => string; }): any; }
+>foo14 : typeof foo14
 >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; }
+>foo14 : typeof foo14
 >x : { foo: <T extends RegExp>(x: T) => string; }
 >b : { foo: <T extends RegExp>(x: T) => string; }
 
 function foo14(x: any) { }
->foo14 : { (x: I<Number>): any; (x: { foo: <T extends RegExp>(x: T) => string; }): any; }
+>foo14 : typeof foo14
 >x : any
 
 function foo15(x: I2);
->foo15 : { (x: I2): any; (x: C<String>): any; }
+>foo15 : typeof foo15
 >x : I2
 >I2 : I2
 
 function foo15(x: C<String>); // ok
->foo15 : { (x: I2): any; (x: C<String>): any; }
+>foo15 : typeof foo15
 >x : C<String>
 >C : C<T>
 >String : String
 
 function foo15(x: any) { }
->foo15 : { (x: I2): any; (x: C<String>): any; }
+>foo15 : typeof foo15
 >x : any
 
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType.types b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType.types
index 9de1a816ab7..d06da02469b 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType.types
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType.types
@@ -73,268 +73,268 @@ var b = { foo<T>(x: T) { return null; } };
 >T : T
 
 function foo1(x: A);
->foo1 : { (x: A): any; (x: A): any; }
+>foo1 : typeof foo1
 >x : A
 >A : A
 
 function foo1(x: A); // error
->foo1 : { (x: A): any; (x: A): any; }
+>foo1 : typeof foo1
 >x : A
 >A : A
 
 function foo1(x: any) { }
->foo1 : { (x: A): any; (x: A): any; }
+>foo1 : typeof foo1
 >x : any
 
 function foo1b(x: B<string>);
->foo1b : { (x: B<string>): any; (x: B<string>): any; }
+>foo1b : typeof foo1b
 >x : B<string>
 >B : B<T>
 
 function foo1b(x: B<string>); // error
->foo1b : { (x: B<string>): any; (x: B<string>): any; }
+>foo1b : typeof foo1b
 >x : B<string>
 >B : B<T>
 
 function foo1b(x: any) { }
->foo1b : { (x: B<string>): any; (x: B<string>): any; }
+>foo1b : typeof foo1b
 >x : any
 
 function foo1c(x: C<string>);
->foo1c : { (x: C<string>): any; (x: C<string>): any; }
+>foo1c : typeof foo1c
 >x : C<string>
 >C : C<T>
 
 function foo1c(x: C<string>); // error
->foo1c : { (x: C<string>): any; (x: C<string>): any; }
+>foo1c : typeof foo1c
 >x : C<string>
 >C : C<T>
 
 function foo1c(x: any) { }
->foo1c : { (x: C<string>): any; (x: C<string>): any; }
+>foo1c : typeof foo1c
 >x : any
 
 function foo2(x: I<string>);
->foo2 : { (x: I<string>): any; (x: I<string>): any; }
+>foo2 : typeof foo2
 >x : I<string>
 >I : I<T>
 
 function foo2(x: I<string>); // error
->foo2 : { (x: I<string>): any; (x: I<string>): any; }
+>foo2 : typeof foo2
 >x : I<string>
 >I : I<T>
 
 function foo2(x: any) { }
->foo2 : { (x: I<string>): any; (x: I<string>): any; }
+>foo2 : typeof foo2
 >x : any
 
 function foo3(x: typeof a);
->foo3 : { (x: { foo<T>(x: T): T; }): any; (x: { foo<T>(x: T): T; }): any; }
+>foo3 : typeof foo3
 >x : { foo<T>(x: T): T; }
 >a : { foo<T>(x: T): T; }
 
 function foo3(x: typeof a); // error
->foo3 : { (x: { foo<T>(x: T): T; }): any; (x: { foo<T>(x: T): T; }): any; }
+>foo3 : typeof foo3
 >x : { foo<T>(x: T): T; }
 >a : { foo<T>(x: T): T; }
 
 function foo3(x: any) { }
->foo3 : { (x: { foo<T>(x: T): T; }): any; (x: { foo<T>(x: T): T; }): any; }
+>foo3 : typeof foo3
 >x : any
 
 function foo4(x: typeof b);
->foo4 : { (x: { foo: <T>(x: T) => any; }): any; (x: { foo: <T>(x: T) => any; }): any; }
+>foo4 : typeof foo4
 >x : { foo: <T>(x: T) => any; }
 >b : { foo: <T>(x: T) => any; }
 
 function foo4(x: typeof b); // error
->foo4 : { (x: { foo: <T>(x: T) => any; }): any; (x: { foo: <T>(x: T) => any; }): any; }
+>foo4 : typeof foo4
 >x : { foo: <T>(x: T) => any; }
 >b : { foo: <T>(x: T) => any; }
 
 function foo4(x: any) { }
->foo4 : { (x: { foo: <T>(x: T) => any; }): any; (x: { foo: <T>(x: T) => any; }): any; }
+>foo4 : typeof foo4
 >x : any
 
 function foo5(x: A);
->foo5 : { (x: A): any; (x: B<string>): any; }
+>foo5 : typeof foo5
 >x : A
 >A : A
 
 function foo5(x: B<string>); // ok
->foo5 : { (x: A): any; (x: B<string>): any; }
+>foo5 : typeof foo5
 >x : B<string>
 >B : B<T>
 
 function foo5(x: any) { }
->foo5 : { (x: A): any; (x: B<string>): any; }
+>foo5 : typeof foo5
 >x : any
 
 function foo5b(x: A);
->foo5b : { (x: A): any; (x: C<string>): any; }
+>foo5b : typeof foo5b
 >x : A
 >A : A
 
 function foo5b(x: C<string>); // ok
->foo5b : { (x: A): any; (x: C<string>): any; }
+>foo5b : typeof foo5b
 >x : C<string>
 >C : C<T>
 
 function foo5b(x: any) { }
->foo5b : { (x: A): any; (x: C<string>): any; }
+>foo5b : typeof foo5b
 >x : any
 
 function foo6(x: A);
->foo6 : { (x: A): any; (x: I<string>): any; }
+>foo6 : typeof foo6
 >x : A
 >A : A
 
 function foo6(x: I<string>); // ok
->foo6 : { (x: A): any; (x: I<string>): any; }
+>foo6 : typeof foo6
 >x : I<string>
 >I : I<T>
 
 function foo6(x: any) { }
->foo6 : { (x: A): any; (x: I<string>): any; }
+>foo6 : typeof foo6
 >x : any
 
 function foo7(x: A);
->foo7 : { (x: A): any; (x: { foo<T>(x: T): T; }): any; }
+>foo7 : typeof foo7
 >x : A
 >A : A
 
 function foo7(x: typeof a); // ok
->foo7 : { (x: A): any; (x: { foo<T>(x: T): T; }): any; }
+>foo7 : typeof foo7
 >x : { foo<T>(x: T): T; }
 >a : { foo<T>(x: T): T; }
 
 function foo7(x: any) { }
->foo7 : { (x: A): any; (x: { foo<T>(x: T): T; }): any; }
+>foo7 : typeof foo7
 >x : any
 
 function foo8(x: B<string>);
->foo8 : { (x: B<string>): any; (x: I<string>): any; }
+>foo8 : typeof foo8
 >x : B<string>
 >B : B<T>
 
 function foo8(x: I<string>); // ok
->foo8 : { (x: B<string>): any; (x: I<string>): any; }
+>foo8 : typeof foo8
 >x : I<string>
 >I : I<T>
 
 function foo8(x: any) { }
->foo8 : { (x: B<string>): any; (x: I<string>): any; }
+>foo8 : typeof foo8
 >x : any
 
 function foo9(x: B<string>);
->foo9 : { (x: B<string>): any; (x: C<string>): any; }
+>foo9 : typeof foo9
 >x : B<string>
 >B : B<T>
 
 function foo9(x: C<string>); // ok
->foo9 : { (x: B<string>): any; (x: C<string>): any; }
+>foo9 : typeof foo9
 >x : C<string>
 >C : C<T>
 
 function foo9(x: any) { }
->foo9 : { (x: B<string>): any; (x: C<string>): any; }
+>foo9 : typeof foo9
 >x : any
 
 function foo10(x: B<string>);
->foo10 : { (x: B<string>): any; (x: { foo<T>(x: T): T; }): any; }
+>foo10 : typeof foo10
 >x : B<string>
 >B : B<T>
 
 function foo10(x: typeof a); // ok
->foo10 : { (x: B<string>): any; (x: { foo<T>(x: T): T; }): any; }
+>foo10 : typeof foo10
 >x : { foo<T>(x: T): T; }
 >a : { foo<T>(x: T): T; }
 
 function foo10(x: any) { }
->foo10 : { (x: B<string>): any; (x: { foo<T>(x: T): T; }): any; }
+>foo10 : typeof foo10
 >x : any
 
 function foo11(x: B<string>);
->foo11 : { (x: B<string>): any; (x: { foo: <T>(x: T) => any; }): any; }
+>foo11 : typeof foo11
 >x : B<string>
 >B : B<T>
 
 function foo11(x: typeof b); // ok
->foo11 : { (x: B<string>): any; (x: { foo: <T>(x: T) => any; }): any; }
+>foo11 : typeof foo11
 >x : { foo: <T>(x: T) => any; }
 >b : { foo: <T>(x: T) => any; }
 
 function foo11(x: any) { }
->foo11 : { (x: B<string>): any; (x: { foo: <T>(x: T) => any; }): any; }
+>foo11 : typeof foo11
 >x : any
 
 function foo12(x: I<string>);
->foo12 : { (x: I<string>): any; (x: C<string>): any; }
+>foo12 : typeof foo12
 >x : I<string>
 >I : I<T>
 
 function foo12(x: C<string>); // ok
->foo12 : { (x: I<string>): any; (x: C<string>): any; }
+>foo12 : typeof foo12
 >x : C<string>
 >C : C<T>
 
 function foo12(x: any) { }
->foo12 : { (x: I<string>): any; (x: C<string>): any; }
+>foo12 : typeof foo12
 >x : any
 
 function foo12b(x: I2);
->foo12b : { (x: I2): any; (x: C<string>): any; }
+>foo12b : typeof foo12b
 >x : I2
 >I2 : I2
 
 function foo12b(x: C<string>); // ok
->foo12b : { (x: I2): any; (x: C<string>): any; }
+>foo12b : typeof foo12b
 >x : C<string>
 >C : C<T>
 
 function foo12b(x: any) { }
->foo12b : { (x: I2): any; (x: C<string>): any; }
+>foo12b : typeof foo12b
 >x : any
 
 function foo13(x: I<string>);
->foo13 : { (x: I<string>): any; (x: { foo<T>(x: T): T; }): any; }
+>foo13 : typeof foo13
 >x : I<string>
 >I : I<T>
 
 function foo13(x: typeof a); // ok
->foo13 : { (x: I<string>): any; (x: { foo<T>(x: T): T; }): any; }
+>foo13 : typeof foo13
 >x : { foo<T>(x: T): T; }
 >a : { foo<T>(x: T): T; }
 
 function foo13(x: any) { }
->foo13 : { (x: I<string>): any; (x: { foo<T>(x: T): T; }): any; }
+>foo13 : typeof foo13
 >x : any
 
 function foo14(x: I<string>);
->foo14 : { (x: I<string>): any; (x: { foo: <T>(x: T) => any; }): any; }
+>foo14 : typeof foo14
 >x : I<string>
 >I : I<T>
 
 function foo14(x: typeof b); // ok
->foo14 : { (x: I<string>): any; (x: { foo: <T>(x: T) => any; }): any; }
+>foo14 : typeof foo14
 >x : { foo: <T>(x: T) => any; }
 >b : { foo: <T>(x: T) => any; }
 
 function foo14(x: any) { }
->foo14 : { (x: I<string>): any; (x: { foo: <T>(x: T) => any; }): any; }
+>foo14 : typeof foo14
 >x : any
 
 function foo15(x: I2);
->foo15 : { (x: I2): any; (x: C<number>): any; }
+>foo15 : typeof foo15
 >x : I2
 >I2 : I2
 
 function foo15(x: C<number>); // ok
->foo15 : { (x: I2): any; (x: C<number>): any; }
+>foo15 : typeof foo15
 >x : C<number>
 >C : C<T>
 
 function foo15(x: any) { }
->foo15 : { (x: I2): any; (x: C<number>): any; }
+>foo15 : typeof foo15
 >x : any
 
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.types b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.types
index f6f33890c07..710c440e2d0 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.types
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.types
@@ -80,289 +80,289 @@ var b = { foo<T extends Date>(x: T) { return null; } };
 >T : T
 
 function foo1(x: A);
->foo1 : { (x: A): any; (x: A): any; }
+>foo1 : typeof foo1
 >x : A
 >A : A
 
 function foo1(x: A); // error
->foo1 : { (x: A): any; (x: A): any; }
+>foo1 : typeof foo1
 >x : A
 >A : A
 
 function foo1(x: any) { }
->foo1 : { (x: A): any; (x: A): any; }
+>foo1 : typeof foo1
 >x : any
 
 function foo1b(x: B<Date>);
->foo1b : { (x: B<Date>): any; (x: B<Date>): any; }
+>foo1b : typeof foo1b
 >x : B<Date>
 >B : B<T>
 >Date : Date
 
 function foo1b(x: B<Date>); // error
->foo1b : { (x: B<Date>): any; (x: B<Date>): any; }
+>foo1b : typeof foo1b
 >x : B<Date>
 >B : B<T>
 >Date : Date
 
 function foo1b(x: any) { }
->foo1b : { (x: B<Date>): any; (x: B<Date>): any; }
+>foo1b : typeof foo1b
 >x : any
 
 function foo1c(x: C<Date>);
->foo1c : { (x: C<Date>): any; (x: C<Date>): any; }
+>foo1c : typeof foo1c
 >x : C<Date>
 >C : C<T>
 >Date : Date
 
 function foo1c(x: C<Date>); // error
->foo1c : { (x: C<Date>): any; (x: C<Date>): any; }
+>foo1c : typeof foo1c
 >x : C<Date>
 >C : C<T>
 >Date : Date
 
 function foo1c(x: any) { }
->foo1c : { (x: C<Date>): any; (x: C<Date>): any; }
+>foo1c : typeof foo1c
 >x : any
 
 function foo2(x: I<Date>);
->foo2 : { (x: I<Date>): any; (x: I<Date>): any; }
+>foo2 : typeof foo2
 >x : I<Date>
 >I : I<T>
 >Date : Date
 
 function foo2(x: I<Date>); // error
->foo2 : { (x: I<Date>): any; (x: I<Date>): any; }
+>foo2 : typeof foo2
 >x : I<Date>
 >I : I<T>
 >Date : Date
 
 function foo2(x: any) { }
->foo2 : { (x: I<Date>): any; (x: I<Date>): any; }
+>foo2 : typeof foo2
 >x : any
 
 function foo3(x: typeof a);
->foo3 : { (x: { foo<T extends Date>(x: T): T; }): any; (x: { foo<T extends Date>(x: T): T; }): any; }
+>foo3 : typeof foo3
 >x : { foo<T extends Date>(x: T): T; }
 >a : { foo<T extends Date>(x: T): T; }
 
 function foo3(x: typeof a); // error
->foo3 : { (x: { foo<T extends Date>(x: T): T; }): any; (x: { foo<T extends Date>(x: T): T; }): any; }
+>foo3 : typeof foo3
 >x : { foo<T extends Date>(x: T): T; }
 >a : { foo<T extends Date>(x: T): T; }
 
 function foo3(x: any) { }
->foo3 : { (x: { foo<T extends Date>(x: T): T; }): any; (x: { foo<T extends Date>(x: T): T; }): any; }
+>foo3 : typeof foo3
 >x : any
 
 function foo4(x: typeof b);
->foo4 : { (x: { foo: <T extends Date>(x: T) => any; }): any; (x: { foo: <T extends Date>(x: T) => any; }): any; }
+>foo4 : typeof foo4
 >x : { foo: <T extends Date>(x: T) => any; }
 >b : { foo: <T extends Date>(x: T) => any; }
 
 function foo4(x: typeof b); // error
->foo4 : { (x: { foo: <T extends Date>(x: T) => any; }): any; (x: { foo: <T extends Date>(x: T) => any; }): any; }
+>foo4 : typeof foo4
 >x : { foo: <T extends Date>(x: T) => any; }
 >b : { foo: <T extends Date>(x: T) => any; }
 
 function foo4(x: any) { }
->foo4 : { (x: { foo: <T extends Date>(x: T) => any; }): any; (x: { foo: <T extends Date>(x: T) => any; }): any; }
+>foo4 : typeof foo4
 >x : any
 
 function foo5(x: A);
->foo5 : { (x: A): any; (x: B<Date>): any; }
+>foo5 : typeof foo5
 >x : A
 >A : A
 
 function foo5(x: B<Date>); // ok
->foo5 : { (x: A): any; (x: B<Date>): any; }
+>foo5 : typeof foo5
 >x : B<Date>
 >B : B<T>
 >Date : Date
 
 function foo5(x: any) { }
->foo5 : { (x: A): any; (x: B<Date>): any; }
+>foo5 : typeof foo5
 >x : any
 
 function foo5b(x: A);
->foo5b : { (x: A): any; (x: C<Date>): any; }
+>foo5b : typeof foo5b
 >x : A
 >A : A
 
 function foo5b(x: C<Date>); // ok
->foo5b : { (x: A): any; (x: C<Date>): any; }
+>foo5b : typeof foo5b
 >x : C<Date>
 >C : C<T>
 >Date : Date
 
 function foo5b(x: any) { }
->foo5b : { (x: A): any; (x: C<Date>): any; }
+>foo5b : typeof foo5b
 >x : any
 
 function foo6(x: A);
->foo6 : { (x: A): any; (x: I<Date>): any; }
+>foo6 : typeof foo6
 >x : A
 >A : A
 
 function foo6(x: I<Date>); // ok
->foo6 : { (x: A): any; (x: I<Date>): any; }
+>foo6 : typeof foo6
 >x : I<Date>
 >I : I<T>
 >Date : Date
 
 function foo6(x: any) { }
->foo6 : { (x: A): any; (x: I<Date>): any; }
+>foo6 : typeof foo6
 >x : any
 
 function foo7(x: A);
->foo7 : { (x: A): any; (x: { foo<T extends Date>(x: T): T; }): any; }
+>foo7 : typeof foo7
 >x : A
 >A : A
 
 function foo7(x: typeof a); // ok
->foo7 : { (x: A): any; (x: { foo<T extends Date>(x: T): T; }): any; }
+>foo7 : typeof foo7
 >x : { foo<T extends Date>(x: T): T; }
 >a : { foo<T extends Date>(x: T): T; }
 
 function foo7(x: any) { }
->foo7 : { (x: A): any; (x: { foo<T extends Date>(x: T): T; }): any; }
+>foo7 : typeof foo7
 >x : any
 
 function foo8(x: B<Date>);
->foo8 : { (x: B<Date>): any; (x: I<Date>): any; }
+>foo8 : typeof foo8
 >x : B<Date>
 >B : B<T>
 >Date : Date
 
 function foo8(x: I<Date>); // ok
->foo8 : { (x: B<Date>): any; (x: I<Date>): any; }
+>foo8 : typeof foo8
 >x : I<Date>
 >I : I<T>
 >Date : Date
 
 function foo8(x: any) { }
->foo8 : { (x: B<Date>): any; (x: I<Date>): any; }
+>foo8 : typeof foo8
 >x : any
 
 function foo9(x: B<Date>);
->foo9 : { (x: B<Date>): any; (x: C<Date>): any; }
+>foo9 : typeof foo9
 >x : B<Date>
 >B : B<T>
 >Date : Date
 
 function foo9(x: C<Date>); // ok
->foo9 : { (x: B<Date>): any; (x: C<Date>): any; }
+>foo9 : typeof foo9
 >x : C<Date>
 >C : C<T>
 >Date : Date
 
 function foo9(x: any) { }
->foo9 : { (x: B<Date>): any; (x: C<Date>): any; }
+>foo9 : typeof foo9
 >x : any
 
 function foo10(x: B<Date>);
->foo10 : { (x: B<Date>): any; (x: { foo<T extends Date>(x: T): T; }): any; }
+>foo10 : typeof foo10
 >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; }
+>foo10 : typeof foo10
 >x : { foo<T extends Date>(x: T): T; }
 >a : { foo<T extends Date>(x: T): T; }
 
 function foo10(x: any) { }
->foo10 : { (x: B<Date>): any; (x: { foo<T extends Date>(x: T): T; }): any; }
+>foo10 : typeof foo10
 >x : any
 
 function foo11(x: B<Date>);
->foo11 : { (x: B<Date>): any; (x: { foo: <T extends Date>(x: T) => any; }): any; }
+>foo11 : typeof foo11
 >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; }
+>foo11 : typeof foo11
 >x : { foo: <T extends Date>(x: T) => any; }
 >b : { foo: <T extends Date>(x: T) => any; }
 
 function foo11(x: any) { }
->foo11 : { (x: B<Date>): any; (x: { foo: <T extends Date>(x: T) => any; }): any; }
+>foo11 : typeof foo11
 >x : any
 
 function foo12(x: I<Date>);
->foo12 : { (x: I<Date>): any; (x: C<Date>): any; }
+>foo12 : typeof foo12
 >x : I<Date>
 >I : I<T>
 >Date : Date
 
 function foo12(x: C<Date>); // ok
->foo12 : { (x: I<Date>): any; (x: C<Date>): any; }
+>foo12 : typeof foo12
 >x : C<Date>
 >C : C<T>
 >Date : Date
 
 function foo12(x: any) { }
->foo12 : { (x: I<Date>): any; (x: C<Date>): any; }
+>foo12 : typeof foo12
 >x : any
 
 function foo12b(x: I2);
->foo12b : { (x: I2): any; (x: C<Date>): any; }
+>foo12b : typeof foo12b
 >x : I2
 >I2 : I2
 
 function foo12b(x: C<Date>); // ok
->foo12b : { (x: I2): any; (x: C<Date>): any; }
+>foo12b : typeof foo12b
 >x : C<Date>
 >C : C<T>
 >Date : Date
 
 function foo12b(x: any) { }
->foo12b : { (x: I2): any; (x: C<Date>): any; }
+>foo12b : typeof foo12b
 >x : any
 
 function foo13(x: I<Date>);
->foo13 : { (x: I<Date>): any; (x: { foo<T extends Date>(x: T): T; }): any; }
+>foo13 : typeof foo13
 >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; }
+>foo13 : typeof foo13
 >x : { foo<T extends Date>(x: T): T; }
 >a : { foo<T extends Date>(x: T): T; }
 
 function foo13(x: any) { }
->foo13 : { (x: I<Date>): any; (x: { foo<T extends Date>(x: T): T; }): any; }
+>foo13 : typeof foo13
 >x : any
 
 function foo14(x: I<Date>);
->foo14 : { (x: I<Date>): any; (x: { foo: <T extends Date>(x: T) => any; }): any; }
+>foo14 : typeof foo14
 >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; }
+>foo14 : typeof foo14
 >x : { foo: <T extends Date>(x: T) => any; }
 >b : { foo: <T extends Date>(x: T) => any; }
 
 function foo14(x: any) { }
->foo14 : { (x: I<Date>): any; (x: { foo: <T extends Date>(x: T) => any; }): any; }
+>foo14 : typeof foo14
 >x : any
 
 function foo15(x: I2);
->foo15 : { (x: I2): any; (x: C<Date>): any; }
+>foo15 : typeof foo15
 >x : I2
 >I2 : I2
 
 function foo15(x: C<Date>); // ok
->foo15 : { (x: I2): any; (x: C<Date>): any; }
+>foo15 : typeof foo15
 >x : C<Date>
 >C : C<T>
 >Date : Date
 
 function foo15(x: any) { }
->foo15 : { (x: I2): any; (x: C<Date>): any; }
+>foo15 : typeof foo15
 >x : any
 
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.types b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.types
index dbd6d3e7d03..dd8f28b684d 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.types
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.types
@@ -93,238 +93,238 @@ var b = { foo<A, B, C, D, E, F>(x: A) { return x; } };
 >x : A
 
 function foo1(x: A);
->foo1 : { (x: A): any; (x: A): any; }
+>foo1 : typeof foo1
 >x : A
 >A : A
 
 function foo1(x: A); // error
->foo1 : { (x: A): any; (x: A): any; }
+>foo1 : typeof foo1
 >x : A
 >A : A
 
 function foo1(x: any) { }
->foo1 : { (x: A): any; (x: A): any; }
+>foo1 : typeof foo1
 >x : any
 
 function foo1b(x: B<string, string>);
->foo1b : { (x: B<string, string>): any; (x: B<string, string>): any; }
+>foo1b : typeof foo1b
 >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; }
+>foo1b : typeof foo1b
 >x : B<string, string>
 >B : B<U, V>
 
 function foo1b(x: any) { }
->foo1b : { (x: B<string, string>): any; (x: B<string, string>): any; }
+>foo1b : typeof foo1b
 >x : any
 
 function foo1c(x: C<string, number, boolean>);
->foo1c : { (x: C<string, number, boolean>): any; (x: C<string, number, boolean>): any; }
+>foo1c : typeof foo1c
 >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; }
+>foo1c : typeof foo1c
 >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; }
+>foo1c : typeof 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; }
+>foo2 : typeof foo2
 >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; }
+>foo2 : typeof foo2
 >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; }
+>foo2 : typeof foo2
 >x : any
 
 function foo3(x: typeof a);
->foo3 : { (x: { foo<Z, A, B, C, D>(x: Z): Z; }): any; (x: { foo<Z, A, B, C, D>(x: Z): Z; }): any; }
+>foo3 : typeof foo3
 >x : { foo<Z, A, B, C, D>(x: Z): Z; }
 >a : { foo<Z, A, B, C, D>(x: Z): Z; }
 
 function foo3(x: typeof a); // error
->foo3 : { (x: { foo<Z, A, B, C, D>(x: Z): Z; }): any; (x: { foo<Z, A, B, C, D>(x: Z): Z; }): any; }
+>foo3 : typeof foo3
 >x : { foo<Z, A, B, C, D>(x: Z): Z; }
 >a : { foo<Z, A, B, C, D>(x: Z): Z; }
 
 function foo3(x: any) { }
->foo3 : { (x: { foo<Z, A, B, C, D>(x: Z): Z; }): any; (x: { foo<Z, A, B, C, D>(x: Z): Z; }): any; }
+>foo3 : typeof foo3
 >x : any
 
 function foo4(x: typeof b);
->foo4 : { (x: { foo: <A, B, C, D, E, F>(x: A) => A; }): any; (x: { foo: <A, B, C, D, E, F>(x: A) => A; }): any; }
+>foo4 : typeof foo4
 >x : { foo: <A, B, C, D, E, F>(x: A) => A; }
 >b : { foo: <A, B, C, D, E, F>(x: A) => A; }
 
 function foo4(x: typeof b); // error
->foo4 : { (x: { foo: <A, B, C, D, E, F>(x: A) => A; }): any; (x: { foo: <A, B, C, D, E, F>(x: A) => A; }): any; }
+>foo4 : typeof foo4
 >x : { foo: <A, B, C, D, E, F>(x: A) => A; }
 >b : { foo: <A, B, C, D, E, F>(x: A) => A; }
 
 function foo4(x: any) { }
->foo4 : { (x: { foo: <A, B, C, D, E, F>(x: A) => A; }): any; (x: { foo: <A, B, C, D, E, F>(x: A) => A; }): any; }
+>foo4 : typeof foo4
 >x : any
 
 function foo5(x: A);
->foo5 : { (x: A): any; (x: B<string, string>): any; }
+>foo5 : typeof foo5
 >x : A
 >A : A
 
 function foo5(x: B<string, string>); // ok
->foo5 : { (x: A): any; (x: B<string, string>): any; }
+>foo5 : typeof foo5
 >x : B<string, string>
 >B : B<U, V>
 
 function foo5(x: any) { }
->foo5 : { (x: A): any; (x: B<string, string>): any; }
+>foo5 : typeof foo5
 >x : any
 
 function foo5b(x: A);
->foo5b : { (x: A): any; (x: C<string, number, boolean>): any; }
+>foo5b : typeof foo5b
 >x : A
 >A : A
 
 function foo5b(x: C<string, number, boolean>); // ok
->foo5b : { (x: A): any; (x: C<string, number, boolean>): any; }
+>foo5b : typeof foo5b
 >x : C<string, number, boolean>
 >C : C<V, W, X>
 
 function foo5b(x: any) { }
->foo5b : { (x: A): any; (x: C<string, number, boolean>): any; }
+>foo5b : typeof foo5b
 >x : any
 
 function foo6(x: A);
->foo6 : { (x: A): any; (x: I<string, number, boolean, Date>): any; }
+>foo6 : typeof foo6
 >x : A
 >A : A
 
 function foo6(x: I<string, number, boolean, Date>); // ok
->foo6 : { (x: A): any; (x: I<string, number, boolean, Date>): any; }
+>foo6 : typeof foo6
 >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; }
+>foo6 : typeof foo6
 >x : any
 
 function foo7(x: A);
->foo7 : { (x: A): any; (x: { foo<Z, A, B, C, D>(x: Z): Z; }): any; }
+>foo7 : typeof foo7
 >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; }
+>foo7 : typeof foo7
 >x : { foo<Z, A, B, C, D>(x: Z): Z; }
 >a : { foo<Z, A, B, C, D>(x: Z): Z; }
 
 function foo7(x: any) { }
->foo7 : { (x: A): any; (x: { foo<Z, A, B, C, D>(x: Z): Z; }): any; }
+>foo7 : typeof foo7
 >x : any
 
 function foo8(x: B<string, string>);
->foo8 : { (x: B<string, string>): any; (x: I<string, string, boolean, Date>): any; }
+>foo8 : typeof foo8
 >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; }
+>foo8 : typeof foo8
 >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; }
+>foo8 : typeof foo8
 >x : any
 
 function foo9(x: B<string, number>);
->foo9 : { (x: B<string, number>): any; (x: C<string, number, B<string, string>>): any; }
+>foo9 : typeof foo9
 >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; }
+>foo9 : typeof foo9
 >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; }
+>foo9 : typeof 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; }
+>foo10 : typeof foo10
 >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; }
+>foo10 : typeof foo10
 >x : { foo<Z, A, B, C, D>(x: Z): Z; }
 >a : { foo<Z, A, B, C, D>(x: Z): Z; }
 
 function foo10(x: any) { }
->foo10 : { (x: B<string, boolean>): any; (x: { foo<Z, A, B, C, D>(x: Z): Z; }): any; }
+>foo10 : typeof 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; }
+>foo11 : typeof foo11
 >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; }
+>foo11 : typeof foo11
 >x : { foo: <A, B, C, D, E, F>(x: A) => A; }
 >b : { foo: <A, B, C, D, E, F>(x: A) => A; }
 
 function foo11(x: any) { }
->foo11 : { (x: B<string, boolean>): any; (x: { foo: <A, B, C, D, E, F>(x: A) => A; }): any; }
+>foo11 : typeof 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; }
+>foo12 : typeof foo12
 >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; }
+>foo12 : typeof foo12
 >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; }
+>foo12 : typeof foo12
 >x : any
 
 function foo12b(x: I2);
->foo12b : { (x: I2): any; (x: C<string, string, boolean>): any; }
+>foo12b : typeof foo12b
 >x : I2
 >I2 : I2
 
 function foo12b(x: C<string, string, boolean>); // ok
->foo12b : { (x: I2): any; (x: C<string, string, boolean>): any; }
+>foo12b : typeof foo12b
 >x : C<string, string, boolean>
 >C : C<V, W, X>
 
 function foo12b(x: any) { }
->foo12b : { (x: I2): any; (x: C<string, string, boolean>): any; }
+>foo12b : typeof 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; }
+>foo13 : typeof foo13
 >x : I<string, Date, RegExp, Date>
 >I : I<X, Y, Z, A>
 >Date : Date
@@ -332,43 +332,43 @@ function foo13(x: I<string, Date, RegExp, Date>);
 >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; }
+>foo13 : typeof foo13
 >x : { foo<Z, A, B, C, D>(x: Z): Z; }
 >a : { foo<Z, A, B, C, D>(x: Z): Z; }
 
 function foo13(x: any) { }
->foo13 : { (x: I<string, Date, RegExp, Date>): any; (x: { foo<Z, A, B, C, D>(x: Z): Z; }): any; }
+>foo13 : typeof 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; }
+>foo14 : typeof foo14
 >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; }
+>foo14 : typeof foo14
 >x : { foo: <A, B, C, D, E, F>(x: A) => A; }
 >b : { foo: <A, B, C, D, E, F>(x: A) => A; }
 
 function foo14(x: any) { }
->foo14 : { (x: I<string, Date, RegExp, boolean>): any; (x: { foo: <A, B, C, D, E, F>(x: A) => A; }): any; }
+>foo14 : typeof foo14
 >x : any
 
 function foo15(x: I2);
->foo15 : { (x: I2): any; (x: C<number, B<string, string>, B<number, string>>): any; }
+>foo15 : typeof foo15
 >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; }
+>foo15 : typeof foo15
 >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; }
+>foo15 : typeof foo15
 >x : any
 
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts2.types b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts2.types
index 8cc0042cc9e..0340ce46d6e 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts2.types
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts2.types
@@ -40,103 +40,103 @@ var a: { <Z, A, B, C, D>(x: 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; }
+>foo1 : typeof foo1
 >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; }
+>foo1 : typeof foo1
 >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; }
+>foo1 : typeof foo1
 >x : any
 
 function foo2(x: I2);
->foo2 : { (x: I2): any; (x: I2): any; }
+>foo2 : typeof foo2
 >x : I2
 >I2 : I2
 
 function foo2(x: I2); // error
->foo2 : { (x: I2): any; (x: I2): any; }
+>foo2 : typeof foo2
 >x : I2
 >I2 : I2
 
 function foo2(x: any) { }
->foo2 : { (x: I2): any; (x: I2): any; }
+>foo2 : typeof foo2
 >x : any
 
 function foo3(x: typeof a);
->foo3 : { (x: <Z, A, B, C, D>(x: Z) => Z): any; (x: <Z, A, B, C, D>(x: Z) => Z): any; }
+>foo3 : typeof foo3
 >x : <Z, A, B, C, D>(x: Z) => Z
 >a : <Z, A, B, C, D>(x: Z) => Z
 
 function foo3(x: typeof a); // error
->foo3 : { (x: <Z, A, B, C, D>(x: Z) => Z): any; (x: <Z, A, B, C, D>(x: Z) => Z): any; }
+>foo3 : typeof foo3
 >x : <Z, A, B, C, D>(x: Z) => Z
 >a : <Z, A, B, C, D>(x: Z) => Z
 
 function foo3(x: any) { }
->foo3 : { (x: <Z, A, B, C, D>(x: Z) => Z): any; (x: <Z, A, B, C, D>(x: Z) => Z): any; }
+>foo3 : typeof 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; }
+>foo13 : typeof foo13
 >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; }
+>foo13 : typeof foo13
 >x : <Z, A, B, C, D>(x: Z) => Z
 >a : <Z, A, B, C, D>(x: Z) => Z
 
 function foo13(x: any) { }
->foo13 : { (x: I<boolean, string, number, Date>): any; (x: <Z, A, B, C, D>(x: Z) => Z): any; }
+>foo13 : typeof foo13
 >x : any
 
 function foo14(x: I<boolean, string, number, Date>);
->foo14 : { (x: I<boolean, string, number, Date>): any; (x: I2): any; }
+>foo14 : typeof foo14
 >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; }
+>foo14 : typeof foo14
 >x : I2
 >I2 : I2
 
 function foo14(x: any) { }
->foo14 : { (x: I<boolean, string, number, Date>): any; (x: I2): any; }
+>foo14 : typeof foo14
 >x : any
 
 function foo14b(x: typeof a);
->foo14b : { (x: <Z, A, B, C, D>(x: Z) => Z): any; (x: I2): any; }
+>foo14b : typeof foo14b
 >x : <Z, A, B, C, D>(x: Z) => Z
 >a : <Z, A, B, C, D>(x: Z) => Z
 
 function foo14b(x: I2); // ok
->foo14b : { (x: <Z, A, B, C, D>(x: Z) => Z): any; (x: I2): any; }
+>foo14b : typeof foo14b
 >x : I2
 >I2 : I2
 
 function foo14b(x: any) { }
->foo14b : { (x: <Z, A, B, C, D>(x: Z) => Z): any; (x: I2): any; }
+>foo14b : typeof foo14b
 >x : any
 
 function foo15(x: I<boolean, string, number, Date>);
->foo15 : { (x: I<boolean, string, number, Date>): any; (x: I2): any; }
+>foo15 : typeof foo15
 >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; }
+>foo15 : typeof foo15
 >x : I2
 >I2 : I2
 
 function foo15(x: any) { }
->foo15 : { (x: I<boolean, string, number, Date>): any; (x: I2): any; }
+>foo15 : typeof foo15
 >x : any
 
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterNames.types b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterNames.types
index 85e83528cd0..7c90a214fff 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterNames.types
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterNames.types
@@ -75,268 +75,268 @@ var b = { foo<A>(x: A) { return x; } };
 >x : A
 
 function foo1(x: A);
->foo1 : { (x: A): any; (x: A): any; }
+>foo1 : typeof foo1
 >x : A
 >A : A
 
 function foo1(x: A); // error
->foo1 : { (x: A): any; (x: A): any; }
+>foo1 : typeof foo1
 >x : A
 >A : A
 
 function foo1(x: any) { }
->foo1 : { (x: A): any; (x: A): any; }
+>foo1 : typeof foo1
 >x : any
 
 function foo1b(x: B<string>);
->foo1b : { (x: B<string>): any; (x: B<string>): any; }
+>foo1b : typeof foo1b
 >x : B<string>
 >B : B<U>
 
 function foo1b(x: B<string>); // error
->foo1b : { (x: B<string>): any; (x: B<string>): any; }
+>foo1b : typeof foo1b
 >x : B<string>
 >B : B<U>
 
 function foo1b(x: any) { }
->foo1b : { (x: B<string>): any; (x: B<string>): any; }
+>foo1b : typeof foo1b
 >x : any
 
 function foo1c(x: C<string>);
->foo1c : { (x: C<string>): any; (x: C<string>): any; }
+>foo1c : typeof foo1c
 >x : C<string>
 >C : C<V>
 
 function foo1c(x: C<string>); // error
->foo1c : { (x: C<string>): any; (x: C<string>): any; }
+>foo1c : typeof foo1c
 >x : C<string>
 >C : C<V>
 
 function foo1c(x: any) { }
->foo1c : { (x: C<string>): any; (x: C<string>): any; }
+>foo1c : typeof foo1c
 >x : any
 
 function foo2(x: I<string>);
->foo2 : { (x: I<string>): any; (x: I<string>): any; }
+>foo2 : typeof foo2
 >x : I<string>
 >I : I<X>
 
 function foo2(x: I<string>); // error
->foo2 : { (x: I<string>): any; (x: I<string>): any; }
+>foo2 : typeof foo2
 >x : I<string>
 >I : I<X>
 
 function foo2(x: any) { }
->foo2 : { (x: I<string>): any; (x: I<string>): any; }
+>foo2 : typeof foo2
 >x : any
 
 function foo3(x: typeof a);
->foo3 : { (x: { foo<Z>(x: Z): Z; }): any; (x: { foo<Z>(x: Z): Z; }): any; }
+>foo3 : typeof foo3
 >x : { foo<Z>(x: Z): Z; }
 >a : { foo<Z>(x: Z): Z; }
 
 function foo3(x: typeof a); // error
->foo3 : { (x: { foo<Z>(x: Z): Z; }): any; (x: { foo<Z>(x: Z): Z; }): any; }
+>foo3 : typeof foo3
 >x : { foo<Z>(x: Z): Z; }
 >a : { foo<Z>(x: Z): Z; }
 
 function foo3(x: any) { }
->foo3 : { (x: { foo<Z>(x: Z): Z; }): any; (x: { foo<Z>(x: Z): Z; }): any; }
+>foo3 : typeof foo3
 >x : any
 
 function foo4(x: typeof b);
->foo4 : { (x: { foo: <A>(x: A) => A; }): any; (x: { foo: <A>(x: A) => A; }): any; }
+>foo4 : typeof foo4
 >x : { foo: <A>(x: A) => A; }
 >b : { foo: <A>(x: A) => A; }
 
 function foo4(x: typeof b); // error
->foo4 : { (x: { foo: <A>(x: A) => A; }): any; (x: { foo: <A>(x: A) => A; }): any; }
+>foo4 : typeof foo4
 >x : { foo: <A>(x: A) => A; }
 >b : { foo: <A>(x: A) => A; }
 
 function foo4(x: any) { }
->foo4 : { (x: { foo: <A>(x: A) => A; }): any; (x: { foo: <A>(x: A) => A; }): any; }
+>foo4 : typeof foo4
 >x : any
 
 function foo5(x: A);
->foo5 : { (x: A): any; (x: B<string>): any; }
+>foo5 : typeof foo5
 >x : A
 >A : A
 
 function foo5(x: B<string>); // ok
->foo5 : { (x: A): any; (x: B<string>): any; }
+>foo5 : typeof foo5
 >x : B<string>
 >B : B<U>
 
 function foo5(x: any) { }
->foo5 : { (x: A): any; (x: B<string>): any; }
+>foo5 : typeof foo5
 >x : any
 
 function foo5b(x: A);
->foo5b : { (x: A): any; (x: C<string>): any; }
+>foo5b : typeof foo5b
 >x : A
 >A : A
 
 function foo5b(x: C<string>); // ok
->foo5b : { (x: A): any; (x: C<string>): any; }
+>foo5b : typeof foo5b
 >x : C<string>
 >C : C<V>
 
 function foo5b(x: any) { }
->foo5b : { (x: A): any; (x: C<string>): any; }
+>foo5b : typeof foo5b
 >x : any
 
 function foo6(x: A);
->foo6 : { (x: A): any; (x: I<string>): any; }
+>foo6 : typeof foo6
 >x : A
 >A : A
 
 function foo6(x: I<string>); // ok
->foo6 : { (x: A): any; (x: I<string>): any; }
+>foo6 : typeof foo6
 >x : I<string>
 >I : I<X>
 
 function foo6(x: any) { }
->foo6 : { (x: A): any; (x: I<string>): any; }
+>foo6 : typeof foo6
 >x : any
 
 function foo7(x: A);
->foo7 : { (x: A): any; (x: { foo<Z>(x: Z): Z; }): any; }
+>foo7 : typeof foo7
 >x : A
 >A : A
 
 function foo7(x: typeof a); // error
->foo7 : { (x: A): any; (x: { foo<Z>(x: Z): Z; }): any; }
+>foo7 : typeof foo7
 >x : { foo<Z>(x: Z): Z; }
 >a : { foo<Z>(x: Z): Z; }
 
 function foo7(x: any) { }
->foo7 : { (x: A): any; (x: { foo<Z>(x: Z): Z; }): any; }
+>foo7 : typeof foo7
 >x : any
 
 function foo8(x: B<string>);
->foo8 : { (x: B<string>): any; (x: I<string>): any; }
+>foo8 : typeof foo8
 >x : B<string>
 >B : B<U>
 
 function foo8(x: I<string>); // error
->foo8 : { (x: B<string>): any; (x: I<string>): any; }
+>foo8 : typeof foo8
 >x : I<string>
 >I : I<X>
 
 function foo8(x: any) { }
->foo8 : { (x: B<string>): any; (x: I<string>): any; }
+>foo8 : typeof foo8
 >x : any
 
 function foo9(x: B<string>);
->foo9 : { (x: B<string>): any; (x: C<string>): any; }
+>foo9 : typeof foo9
 >x : B<string>
 >B : B<U>
 
 function foo9(x: C<string>); // error
->foo9 : { (x: B<string>): any; (x: C<string>): any; }
+>foo9 : typeof foo9
 >x : C<string>
 >C : C<V>
 
 function foo9(x: any) { }
->foo9 : { (x: B<string>): any; (x: C<string>): any; }
+>foo9 : typeof foo9
 >x : any
 
 function foo10(x: B<string>);
->foo10 : { (x: B<string>): any; (x: { foo<Z>(x: Z): Z; }): any; }
+>foo10 : typeof foo10
 >x : B<string>
 >B : B<U>
 
 function foo10(x: typeof a); // ok
->foo10 : { (x: B<string>): any; (x: { foo<Z>(x: Z): Z; }): any; }
+>foo10 : typeof foo10
 >x : { foo<Z>(x: Z): Z; }
 >a : { foo<Z>(x: Z): Z; }
 
 function foo10(x: any) { }
->foo10 : { (x: B<string>): any; (x: { foo<Z>(x: Z): Z; }): any; }
+>foo10 : typeof foo10
 >x : any
 
 function foo11(x: B<string>);
->foo11 : { (x: B<string>): any; (x: { foo: <A>(x: A) => A; }): any; }
+>foo11 : typeof foo11
 >x : B<string>
 >B : B<U>
 
 function foo11(x: typeof b); // ok
->foo11 : { (x: B<string>): any; (x: { foo: <A>(x: A) => A; }): any; }
+>foo11 : typeof foo11
 >x : { foo: <A>(x: A) => A; }
 >b : { foo: <A>(x: A) => A; }
 
 function foo11(x: any) { }
->foo11 : { (x: B<string>): any; (x: { foo: <A>(x: A) => A; }): any; }
+>foo11 : typeof foo11
 >x : any
 
 function foo12(x: I<string>);
->foo12 : { (x: I<string>): any; (x: C<string>): any; }
+>foo12 : typeof foo12
 >x : I<string>
 >I : I<X>
 
 function foo12(x: C<string>); // error
->foo12 : { (x: I<string>): any; (x: C<string>): any; }
+>foo12 : typeof foo12
 >x : C<string>
 >C : C<V>
 
 function foo12(x: any) { }
->foo12 : { (x: I<string>): any; (x: C<string>): any; }
+>foo12 : typeof foo12
 >x : any
 
 function foo12b(x: I2);
->foo12b : { (x: I2): any; (x: C<string>): any; }
+>foo12b : typeof foo12b
 >x : I2
 >I2 : I2
 
 function foo12b(x: C<string>); // ok
->foo12b : { (x: I2): any; (x: C<string>): any; }
+>foo12b : typeof foo12b
 >x : C<string>
 >C : C<V>
 
 function foo12b(x: any) { }
->foo12b : { (x: I2): any; (x: C<string>): any; }
+>foo12b : typeof foo12b
 >x : any
 
 function foo13(x: I<string>);
->foo13 : { (x: I<string>): any; (x: { foo<Z>(x: Z): Z; }): any; }
+>foo13 : typeof foo13
 >x : I<string>
 >I : I<X>
 
 function foo13(x: typeof a); // ok
->foo13 : { (x: I<string>): any; (x: { foo<Z>(x: Z): Z; }): any; }
+>foo13 : typeof foo13
 >x : { foo<Z>(x: Z): Z; }
 >a : { foo<Z>(x: Z): Z; }
 
 function foo13(x: any) { }
->foo13 : { (x: I<string>): any; (x: { foo<Z>(x: Z): Z; }): any; }
+>foo13 : typeof foo13
 >x : any
 
 function foo14(x: I<string>);
->foo14 : { (x: I<string>): any; (x: { foo: <A>(x: A) => A; }): any; }
+>foo14 : typeof foo14
 >x : I<string>
 >I : I<X>
 
 function foo14(x: typeof b); // ok
->foo14 : { (x: I<string>): any; (x: { foo: <A>(x: A) => A; }): any; }
+>foo14 : typeof foo14
 >x : { foo: <A>(x: A) => A; }
 >b : { foo: <A>(x: A) => A; }
 
 function foo14(x: any) { }
->foo14 : { (x: I<string>): any; (x: { foo: <A>(x: A) => A; }): any; }
+>foo14 : typeof foo14
 >x : any
 
 function foo15(x: I2);
->foo15 : { (x: I2): any; (x: C<number>): any; }
+>foo15 : typeof foo15
 >x : I2
 >I2 : I2
 
 function foo15(x: C<number>); // ok
->foo15 : { (x: I2): any; (x: C<number>): any; }
+>foo15 : typeof foo15
 >x : C<number>
 >C : C<V>
 
 function foo15(x: any) { }
->foo15 : { (x: I2): any; (x: C<number>): any; }
+>foo15 : typeof foo15
 >x : any
 
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesOptionalParams.types b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesOptionalParams.types
index bef916fc410..c0bcf8e394c 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesOptionalParams.types
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesOptionalParams.types
@@ -91,268 +91,268 @@ var b = { foo<T>(x: T, y?: T) { return x; } };
 >x : T
 
 function foo1(x: A);
->foo1 : { (x: A): any; (x: A): any; }
+>foo1 : typeof foo1
 >x : A
 >A : A
 
 function foo1(x: A); // error
->foo1 : { (x: A): any; (x: A): any; }
+>foo1 : typeof foo1
 >x : A
 >A : A
 
 function foo1(x: any) { }
->foo1 : { (x: A): any; (x: A): any; }
+>foo1 : typeof foo1
 >x : any
 
 function foo1b(x: B<string>);
->foo1b : { (x: B<string>): any; (x: B<string>): any; }
+>foo1b : typeof foo1b
 >x : B<string>
 >B : B<T>
 
 function foo1b(x: B<string>); // error
->foo1b : { (x: B<string>): any; (x: B<string>): any; }
+>foo1b : typeof foo1b
 >x : B<string>
 >B : B<T>
 
 function foo1b(x: any) { }
->foo1b : { (x: B<string>): any; (x: B<string>): any; }
+>foo1b : typeof foo1b
 >x : any
 
 function foo1c(x: C<string>);
->foo1c : { (x: C<string>): any; (x: C<string>): any; }
+>foo1c : typeof foo1c
 >x : C<string>
 >C : C<T>
 
 function foo1c(x: C<string>); // error
->foo1c : { (x: C<string>): any; (x: C<string>): any; }
+>foo1c : typeof foo1c
 >x : C<string>
 >C : C<T>
 
 function foo1c(x: any) { }
->foo1c : { (x: C<string>): any; (x: C<string>): any; }
+>foo1c : typeof foo1c
 >x : any
 
 function foo2(x: I<string>);
->foo2 : { (x: I<string>): any; (x: I<string>): any; }
+>foo2 : typeof foo2
 >x : I<string>
 >I : I<T>
 
 function foo2(x: I<string>); // error
->foo2 : { (x: I<string>): any; (x: I<string>): any; }
+>foo2 : typeof foo2
 >x : I<string>
 >I : I<T>
 
 function foo2(x: any) { }
->foo2 : { (x: I<string>): any; (x: I<string>): any; }
+>foo2 : typeof foo2
 >x : any
 
 function foo3(x: typeof a);
->foo3 : { (x: { foo<T>(x: T, y?: T): T; }): any; (x: { foo<T>(x: T, y?: T): T; }): any; }
+>foo3 : typeof foo3
 >x : { foo<T>(x: T, y?: T): T; }
 >a : { foo<T>(x: T, y?: T): T; }
 
 function foo3(x: typeof a); // error
->foo3 : { (x: { foo<T>(x: T, y?: T): T; }): any; (x: { foo<T>(x: T, y?: T): T; }): any; }
+>foo3 : typeof foo3
 >x : { foo<T>(x: T, y?: T): T; }
 >a : { foo<T>(x: T, y?: T): T; }
 
 function foo3(x: any) { }
->foo3 : { (x: { foo<T>(x: T, y?: T): T; }): any; (x: { foo<T>(x: T, y?: T): T; }): any; }
+>foo3 : typeof foo3
 >x : any
 
 function foo4(x: typeof b);
->foo4 : { (x: { foo: <T>(x: T, y?: T) => T; }): any; (x: { foo: <T>(x: T, y?: T) => T; }): any; }
+>foo4 : typeof foo4
 >x : { foo: <T>(x: T, y?: T) => T; }
 >b : { foo: <T>(x: T, y?: T) => T; }
 
 function foo4(x: typeof b); // error
->foo4 : { (x: { foo: <T>(x: T, y?: T) => T; }): any; (x: { foo: <T>(x: T, y?: T) => T; }): any; }
+>foo4 : typeof foo4
 >x : { foo: <T>(x: T, y?: T) => T; }
 >b : { foo: <T>(x: T, y?: T) => T; }
 
 function foo4(x: any) { }
->foo4 : { (x: { foo: <T>(x: T, y?: T) => T; }): any; (x: { foo: <T>(x: T, y?: T) => T; }): any; }
+>foo4 : typeof foo4
 >x : any
 
 function foo5(x: A);
->foo5 : { (x: A): any; (x: B<string>): any; }
+>foo5 : typeof foo5
 >x : A
 >A : A
 
 function foo5(x: B<string>); // ok
->foo5 : { (x: A): any; (x: B<string>): any; }
+>foo5 : typeof foo5
 >x : B<string>
 >B : B<T>
 
 function foo5(x: any) { }
->foo5 : { (x: A): any; (x: B<string>): any; }
+>foo5 : typeof foo5
 >x : any
 
 function foo5b(x: A);
->foo5b : { (x: A): any; (x: C<string>): any; }
+>foo5b : typeof foo5b
 >x : A
 >A : A
 
 function foo5b(x: C<string>); // ok
->foo5b : { (x: A): any; (x: C<string>): any; }
+>foo5b : typeof foo5b
 >x : C<string>
 >C : C<T>
 
 function foo5b(x: any) { }
->foo5b : { (x: A): any; (x: C<string>): any; }
+>foo5b : typeof foo5b
 >x : any
 
 function foo6(x: A);
->foo6 : { (x: A): any; (x: I<string>): any; }
+>foo6 : typeof foo6
 >x : A
 >A : A
 
 function foo6(x: I<string>); // ok
->foo6 : { (x: A): any; (x: I<string>): any; }
+>foo6 : typeof foo6
 >x : I<string>
 >I : I<T>
 
 function foo6(x: any) { }
->foo6 : { (x: A): any; (x: I<string>): any; }
+>foo6 : typeof foo6
 >x : any
 
 function foo7(x: A);
->foo7 : { (x: A): any; (x: { foo<T>(x: T, y?: T): T; }): any; }
+>foo7 : typeof foo7
 >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; }
+>foo7 : typeof foo7
 >x : { foo<T>(x: T, y?: T): T; }
 >a : { foo<T>(x: T, y?: T): T; }
 
 function foo7(x: any) { }
->foo7 : { (x: A): any; (x: { foo<T>(x: T, y?: T): T; }): any; }
+>foo7 : typeof foo7
 >x : any
 
 function foo8(x: B<string>);
->foo8 : { (x: B<string>): any; (x: I<string>): any; }
+>foo8 : typeof foo8
 >x : B<string>
 >B : B<T>
 
 function foo8(x: I<string>); // error
->foo8 : { (x: B<string>): any; (x: I<string>): any; }
+>foo8 : typeof foo8
 >x : I<string>
 >I : I<T>
 
 function foo8(x: any) { }
->foo8 : { (x: B<string>): any; (x: I<string>): any; }
+>foo8 : typeof foo8
 >x : any
 
 function foo9(x: B<string>);
->foo9 : { (x: B<string>): any; (x: C<string>): any; }
+>foo9 : typeof foo9
 >x : B<string>
 >B : B<T>
 
 function foo9(x: C<string>); // error
->foo9 : { (x: B<string>): any; (x: C<string>): any; }
+>foo9 : typeof foo9
 >x : C<string>
 >C : C<T>
 
 function foo9(x: any) { }
->foo9 : { (x: B<string>): any; (x: C<string>): any; }
+>foo9 : typeof foo9
 >x : any
 
 function foo10(x: B<string>);
->foo10 : { (x: B<string>): any; (x: { foo<T>(x: T, y?: T): T; }): any; }
+>foo10 : typeof foo10
 >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; }
+>foo10 : typeof foo10
 >x : { foo<T>(x: T, y?: T): T; }
 >a : { foo<T>(x: T, y?: T): T; }
 
 function foo10(x: any) { }
->foo10 : { (x: B<string>): any; (x: { foo<T>(x: T, y?: T): T; }): any; }
+>foo10 : typeof foo10
 >x : any
 
 function foo11(x: B<string>);
->foo11 : { (x: B<string>): any; (x: { foo: <T>(x: T, y?: T) => T; }): any; }
+>foo11 : typeof foo11
 >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; }
+>foo11 : typeof foo11
 >x : { foo: <T>(x: T, y?: T) => T; }
 >b : { foo: <T>(x: T, y?: T) => T; }
 
 function foo11(x: any) { }
->foo11 : { (x: B<string>): any; (x: { foo: <T>(x: T, y?: T) => T; }): any; }
+>foo11 : typeof foo11
 >x : any
 
 function foo12(x: I<string>);
->foo12 : { (x: I<string>): any; (x: C<string>): any; }
+>foo12 : typeof foo12
 >x : I<string>
 >I : I<T>
 
 function foo12(x: C<string>); // error
->foo12 : { (x: I<string>): any; (x: C<string>): any; }
+>foo12 : typeof foo12
 >x : C<string>
 >C : C<T>
 
 function foo12(x: any) { }
->foo12 : { (x: I<string>): any; (x: C<string>): any; }
+>foo12 : typeof foo12
 >x : any
 
 function foo12b(x: I2);
->foo12b : { (x: I2): any; (x: C<string>): any; }
+>foo12b : typeof foo12b
 >x : I2
 >I2 : I2
 
 function foo12b(x: C<string>); // ok
->foo12b : { (x: I2): any; (x: C<string>): any; }
+>foo12b : typeof foo12b
 >x : C<string>
 >C : C<T>
 
 function foo12b(x: any) { }
->foo12b : { (x: I2): any; (x: C<string>): any; }
+>foo12b : typeof foo12b
 >x : any
 
 function foo13(x: I<string>);
->foo13 : { (x: I<string>): any; (x: { foo<T>(x: T, y?: T): T; }): any; }
+>foo13 : typeof foo13
 >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; }
+>foo13 : typeof foo13
 >x : { foo<T>(x: T, y?: T): T; }
 >a : { foo<T>(x: T, y?: T): T; }
 
 function foo13(x: any) { }
->foo13 : { (x: I<string>): any; (x: { foo<T>(x: T, y?: T): T; }): any; }
+>foo13 : typeof foo13
 >x : any
 
 function foo14(x: I<string>);
->foo14 : { (x: I<string>): any; (x: { foo: <T>(x: T, y?: T) => T; }): any; }
+>foo14 : typeof foo14
 >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; }
+>foo14 : typeof foo14
 >x : { foo: <T>(x: T, y?: T) => T; }
 >b : { foo: <T>(x: T, y?: T) => T; }
 
 function foo14(x: any) { }
->foo14 : { (x: I<string>): any; (x: { foo: <T>(x: T, y?: T) => T; }): any; }
+>foo14 : typeof foo14
 >x : any
 
 function foo15(x: I2);
->foo15 : { (x: I2): any; (x: C<number>): any; }
+>foo15 : typeof foo15
 >x : I2
 >I2 : I2
 
 function foo15(x: C<number>); // ok
->foo15 : { (x: I2): any; (x: C<number>): any; }
+>foo15 : typeof foo15
 >x : C<number>
 >C : C<T>
 
 function foo15(x: any) { }
->foo15 : { (x: I2): any; (x: C<number>): any; }
+>foo15 : typeof foo15
 >x : any
 
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesOptionalParams2.types b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesOptionalParams2.types
index c8a4ad6be29..cbf9db01907 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesOptionalParams2.types
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesOptionalParams2.types
@@ -98,268 +98,268 @@ var b = { foo<T, U>(x: T, y?: U) { return x; } };
 >x : T
 
 function foo1(x: A);
->foo1 : { (x: A): any; (x: A): any; }
+>foo1 : typeof foo1
 >x : A
 >A : A
 
 function foo1(x: A); // error
->foo1 : { (x: A): any; (x: A): any; }
+>foo1 : typeof foo1
 >x : A
 >A : A
 
 function foo1(x: any) { }
->foo1 : { (x: A): any; (x: A): any; }
+>foo1 : typeof foo1
 >x : any
 
 function foo1b(x: B<string, number>);
->foo1b : { (x: B<string, number>): any; (x: B<string, number>): any; }
+>foo1b : typeof foo1b
 >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; }
+>foo1b : typeof foo1b
 >x : B<string, number>
 >B : B<T, U>
 
 function foo1b(x: any) { }
->foo1b : { (x: B<string, number>): any; (x: B<string, number>): any; }
+>foo1b : typeof foo1b
 >x : any
 
 function foo1c(x: C<string, number>);
->foo1c : { (x: C<string, number>): any; (x: C<string, number>): any; }
+>foo1c : typeof foo1c
 >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; }
+>foo1c : typeof foo1c
 >x : C<string, number>
 >C : C<T, U>
 
 function foo1c(x: any) { }
->foo1c : { (x: C<string, number>): any; (x: C<string, number>): any; }
+>foo1c : typeof foo1c
 >x : any
 
 function foo2(x: I<string, number>);
->foo2 : { (x: I<string, number>): any; (x: I<string, number>): any; }
+>foo2 : typeof foo2
 >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; }
+>foo2 : typeof foo2
 >x : I<string, number>
 >I : I<T, U>
 
 function foo2(x: any) { }
->foo2 : { (x: I<string, number>): any; (x: I<string, number>): any; }
+>foo2 : typeof foo2
 >x : any
 
 function foo3(x: typeof a);
->foo3 : { (x: { foo<T, U>(x: T, y?: U): T; }): any; (x: { foo<T, U>(x: T, y?: U): T; }): any; }
+>foo3 : typeof foo3
 >x : { foo<T, U>(x: T, y?: U): T; }
 >a : { foo<T, U>(x: T, y?: U): T; }
 
 function foo3(x: typeof a); // error
->foo3 : { (x: { foo<T, U>(x: T, y?: U): T; }): any; (x: { foo<T, U>(x: T, y?: U): T; }): any; }
+>foo3 : typeof foo3
 >x : { foo<T, U>(x: T, y?: U): T; }
 >a : { foo<T, U>(x: T, y?: U): T; }
 
 function foo3(x: any) { }
->foo3 : { (x: { foo<T, U>(x: T, y?: U): T; }): any; (x: { foo<T, U>(x: T, y?: U): T; }): any; }
+>foo3 : typeof foo3
 >x : any
 
 function foo4(x: typeof b);
->foo4 : { (x: { foo: <T, U>(x: T, y?: U) => T; }): any; (x: { foo: <T, U>(x: T, y?: U) => T; }): any; }
+>foo4 : typeof foo4
 >x : { foo: <T, U>(x: T, y?: U) => T; }
 >b : { foo: <T, U>(x: T, y?: U) => T; }
 
 function foo4(x: typeof b); // error
->foo4 : { (x: { foo: <T, U>(x: T, y?: U) => T; }): any; (x: { foo: <T, U>(x: T, y?: U) => T; }): any; }
+>foo4 : typeof foo4
 >x : { foo: <T, U>(x: T, y?: U) => T; }
 >b : { foo: <T, U>(x: T, y?: U) => T; }
 
 function foo4(x: any) { }
->foo4 : { (x: { foo: <T, U>(x: T, y?: U) => T; }): any; (x: { foo: <T, U>(x: T, y?: U) => T; }): any; }
+>foo4 : typeof foo4
 >x : any
 
 function foo5(x: A);
->foo5 : { (x: A): any; (x: B<string, number>): any; }
+>foo5 : typeof foo5
 >x : A
 >A : A
 
 function foo5(x: B<string, number>); // ok
->foo5 : { (x: A): any; (x: B<string, number>): any; }
+>foo5 : typeof foo5
 >x : B<string, number>
 >B : B<T, U>
 
 function foo5(x: any) { }
->foo5 : { (x: A): any; (x: B<string, number>): any; }
+>foo5 : typeof foo5
 >x : any
 
 function foo5b(x: A);
->foo5b : { (x: A): any; (x: C<string, number>): any; }
+>foo5b : typeof foo5b
 >x : A
 >A : A
 
 function foo5b(x: C<string, number>); // ok
->foo5b : { (x: A): any; (x: C<string, number>): any; }
+>foo5b : typeof foo5b
 >x : C<string, number>
 >C : C<T, U>
 
 function foo5b(x: any) { }
->foo5b : { (x: A): any; (x: C<string, number>): any; }
+>foo5b : typeof foo5b
 >x : any
 
 function foo6(x: A);
->foo6 : { (x: A): any; (x: I<string, number>): any; }
+>foo6 : typeof foo6
 >x : A
 >A : A
 
 function foo6(x: I<string, number>); // ok
->foo6 : { (x: A): any; (x: I<string, number>): any; }
+>foo6 : typeof foo6
 >x : I<string, number>
 >I : I<T, U>
 
 function foo6(x: any) { }
->foo6 : { (x: A): any; (x: I<string, number>): any; }
+>foo6 : typeof foo6
 >x : any
 
 function foo7(x: A);
->foo7 : { (x: A): any; (x: { foo<T, U>(x: T, y?: U): T; }): any; }
+>foo7 : typeof foo7
 >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; }
+>foo7 : typeof foo7
 >x : { foo<T, U>(x: T, y?: U): T; }
 >a : { foo<T, U>(x: T, y?: U): T; }
 
 function foo7(x: any) { }
->foo7 : { (x: A): any; (x: { foo<T, U>(x: T, y?: U): T; }): any; }
+>foo7 : typeof foo7
 >x : any
 
 function foo8(x: B<string, number>);
->foo8 : { (x: B<string, number>): any; (x: I<string, number>): any; }
+>foo8 : typeof foo8
 >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; }
+>foo8 : typeof foo8
 >x : I<string, number>
 >I : I<T, U>
 
 function foo8(x: any) { }
->foo8 : { (x: B<string, number>): any; (x: I<string, number>): any; }
+>foo8 : typeof foo8
 >x : any
 
 function foo9(x: B<string, number>);
->foo9 : { (x: B<string, number>): any; (x: C<string, number>): any; }
+>foo9 : typeof foo9
 >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; }
+>foo9 : typeof foo9
 >x : C<string, number>
 >C : C<T, U>
 
 function foo9(x: any) { }
->foo9 : { (x: B<string, number>): any; (x: C<string, number>): any; }
+>foo9 : typeof 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; }
+>foo10 : typeof foo10
 >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; }
+>foo10 : typeof foo10
 >x : { foo<T, U>(x: T, y?: U): T; }
 >a : { foo<T, U>(x: T, y?: U): T; }
 
 function foo10(x: any) { }
->foo10 : { (x: B<string, number>): any; (x: { foo<T, U>(x: T, y?: U): T; }): any; }
+>foo10 : typeof 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; }
+>foo11 : typeof foo11
 >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; }
+>foo11 : typeof foo11
 >x : { foo: <T, U>(x: T, y?: U) => T; }
 >b : { foo: <T, U>(x: T, y?: U) => T; }
 
 function foo11(x: any) { }
->foo11 : { (x: B<string, number>): any; (x: { foo: <T, U>(x: T, y?: U) => T; }): any; }
+>foo11 : typeof foo11
 >x : any
 
 function foo12(x: I<string, number>);
->foo12 : { (x: I<string, number>): any; (x: C<string, number>): any; }
+>foo12 : typeof foo12
 >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; }
+>foo12 : typeof foo12
 >x : C<string, number>
 >C : C<T, U>
 
 function foo12(x: any) { }
->foo12 : { (x: I<string, number>): any; (x: C<string, number>): any; }
+>foo12 : typeof foo12
 >x : any
 
 function foo12b(x: I2);
->foo12b : { (x: I2): any; (x: C<string, number>): any; }
+>foo12b : typeof foo12b
 >x : I2
 >I2 : I2
 
 function foo12b(x: C<string, number>); // ok
->foo12b : { (x: I2): any; (x: C<string, number>): any; }
+>foo12b : typeof foo12b
 >x : C<string, number>
 >C : C<T, U>
 
 function foo12b(x: any) { }
->foo12b : { (x: I2): any; (x: C<string, number>): any; }
+>foo12b : typeof 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; }
+>foo13 : typeof foo13
 >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; }
+>foo13 : typeof foo13
 >x : { foo<T, U>(x: T, y?: U): T; }
 >a : { foo<T, U>(x: T, y?: U): T; }
 
 function foo13(x: any) { }
->foo13 : { (x: I<string, number>): any; (x: { foo<T, U>(x: T, y?: U): T; }): any; }
+>foo13 : typeof 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; }
+>foo14 : typeof foo14
 >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; }
+>foo14 : typeof foo14
 >x : { foo: <T, U>(x: T, y?: U) => T; }
 >b : { foo: <T, U>(x: T, y?: U) => T; }
 
 function foo14(x: any) { }
->foo14 : { (x: I<string, number>): any; (x: { foo: <T, U>(x: T, y?: U) => T; }): any; }
+>foo14 : typeof foo14
 >x : any
 
 function foo15(x: I2);
->foo15 : { (x: I2): any; (x: C<string, number>): any; }
+>foo15 : typeof foo15
 >x : I2
 >I2 : I2
 
 function foo15(x: C<string, number>); // ok
->foo15 : { (x: I2): any; (x: C<string, number>): any; }
+>foo15 : typeof foo15
 >x : C<string, number>
 >C : C<T, U>
 
 function foo15(x: any) { }
->foo15 : { (x: I2): any; (x: C<string, number>): any; }
+>foo15 : typeof foo15
 >x : any
 
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesOptionalParams3.types b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesOptionalParams3.types
index 06c23dcd0b1..f03e7b89ce6 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesOptionalParams3.types
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesOptionalParams3.types
@@ -98,268 +98,268 @@ var b = { foo<T, U>(x: T, y: U) { return x; } };
 >x : T
 
 function foo1(x: A);
->foo1 : { (x: A): any; (x: A): any; }
+>foo1 : typeof foo1
 >x : A
 >A : A
 
 function foo1(x: A); // error
->foo1 : { (x: A): any; (x: A): any; }
+>foo1 : typeof foo1
 >x : A
 >A : A
 
 function foo1(x: any) { }
->foo1 : { (x: A): any; (x: A): any; }
+>foo1 : typeof foo1
 >x : any
 
 function foo1b(x: B<string, number>);
->foo1b : { (x: B<string, number>): any; (x: B<string, number>): any; }
+>foo1b : typeof foo1b
 >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; }
+>foo1b : typeof foo1b
 >x : B<string, number>
 >B : B<T, U>
 
 function foo1b(x: any) { }
->foo1b : { (x: B<string, number>): any; (x: B<string, number>): any; }
+>foo1b : typeof foo1b
 >x : any
 
 function foo1c(x: C<string, number>);
->foo1c : { (x: C<string, number>): any; (x: C<string, number>): any; }
+>foo1c : typeof foo1c
 >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; }
+>foo1c : typeof foo1c
 >x : C<string, number>
 >C : C<T, U>
 
 function foo1c(x: any) { }
->foo1c : { (x: C<string, number>): any; (x: C<string, number>): any; }
+>foo1c : typeof foo1c
 >x : any
 
 function foo2(x: I<string, number>);
->foo2 : { (x: I<string, number>): any; (x: I<string, number>): any; }
+>foo2 : typeof foo2
 >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; }
+>foo2 : typeof foo2
 >x : I<string, number>
 >I : I<T, U>
 
 function foo2(x: any) { }
->foo2 : { (x: I<string, number>): any; (x: I<string, number>): any; }
+>foo2 : typeof foo2
 >x : any
 
 function foo3(x: typeof a);
->foo3 : { (x: { foo<T, U>(x: T, y?: U): T; }): any; (x: { foo<T, U>(x: T, y?: U): T; }): any; }
+>foo3 : typeof foo3
 >x : { foo<T, U>(x: T, y?: U): T; }
 >a : { foo<T, U>(x: T, y?: U): T; }
 
 function foo3(x: typeof a); // error
->foo3 : { (x: { foo<T, U>(x: T, y?: U): T; }): any; (x: { foo<T, U>(x: T, y?: U): T; }): any; }
+>foo3 : typeof foo3
 >x : { foo<T, U>(x: T, y?: U): T; }
 >a : { foo<T, U>(x: T, y?: U): T; }
 
 function foo3(x: any) { }
->foo3 : { (x: { foo<T, U>(x: T, y?: U): T; }): any; (x: { foo<T, U>(x: T, y?: U): T; }): any; }
+>foo3 : typeof foo3
 >x : any
 
 function foo4(x: typeof b);
->foo4 : { (x: { foo: <T, U>(x: T, y: U) => T; }): any; (x: { foo: <T, U>(x: T, y: U) => T; }): any; }
+>foo4 : typeof foo4
 >x : { foo: <T, U>(x: T, y: U) => T; }
 >b : { foo: <T, U>(x: T, y: U) => T; }
 
 function foo4(x: typeof b); // error
->foo4 : { (x: { foo: <T, U>(x: T, y: U) => T; }): any; (x: { foo: <T, U>(x: T, y: U) => T; }): any; }
+>foo4 : typeof foo4
 >x : { foo: <T, U>(x: T, y: U) => T; }
 >b : { foo: <T, U>(x: T, y: U) => T; }
 
 function foo4(x: any) { }
->foo4 : { (x: { foo: <T, U>(x: T, y: U) => T; }): any; (x: { foo: <T, U>(x: T, y: U) => T; }): any; }
+>foo4 : typeof foo4
 >x : any
 
 function foo5(x: A);
->foo5 : { (x: A): any; (x: B<string, number>): any; }
+>foo5 : typeof foo5
 >x : A
 >A : A
 
 function foo5(x: B<string, number>); // ok
->foo5 : { (x: A): any; (x: B<string, number>): any; }
+>foo5 : typeof foo5
 >x : B<string, number>
 >B : B<T, U>
 
 function foo5(x: any) { }
->foo5 : { (x: A): any; (x: B<string, number>): any; }
+>foo5 : typeof foo5
 >x : any
 
 function foo5b(x: A);
->foo5b : { (x: A): any; (x: C<string, number>): any; }
+>foo5b : typeof foo5b
 >x : A
 >A : A
 
 function foo5b(x: C<string, number>); // ok
->foo5b : { (x: A): any; (x: C<string, number>): any; }
+>foo5b : typeof foo5b
 >x : C<string, number>
 >C : C<T, U>
 
 function foo5b(x: any) { }
->foo5b : { (x: A): any; (x: C<string, number>): any; }
+>foo5b : typeof foo5b
 >x : any
 
 function foo6(x: A);
->foo6 : { (x: A): any; (x: I<string, number>): any; }
+>foo6 : typeof foo6
 >x : A
 >A : A
 
 function foo6(x: I<string, number>); // ok
->foo6 : { (x: A): any; (x: I<string, number>): any; }
+>foo6 : typeof foo6
 >x : I<string, number>
 >I : I<T, U>
 
 function foo6(x: any) { }
->foo6 : { (x: A): any; (x: I<string, number>): any; }
+>foo6 : typeof foo6
 >x : any
 
 function foo7(x: A);
->foo7 : { (x: A): any; (x: { foo<T, U>(x: T, y?: U): T; }): any; }
+>foo7 : typeof foo7
 >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; }
+>foo7 : typeof foo7
 >x : { foo<T, U>(x: T, y?: U): T; }
 >a : { foo<T, U>(x: T, y?: U): T; }
 
 function foo7(x: any) { }
->foo7 : { (x: A): any; (x: { foo<T, U>(x: T, y?: U): T; }): any; }
+>foo7 : typeof foo7
 >x : any
 
 function foo8(x: B<string, number>);
->foo8 : { (x: B<string, number>): any; (x: I<string, number>): any; }
+>foo8 : typeof foo8
 >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; }
+>foo8 : typeof foo8
 >x : I<string, number>
 >I : I<T, U>
 
 function foo8(x: any) { }
->foo8 : { (x: B<string, number>): any; (x: I<string, number>): any; }
+>foo8 : typeof foo8
 >x : any
 
 function foo9(x: B<string, number>);
->foo9 : { (x: B<string, number>): any; (x: C<string, number>): any; }
+>foo9 : typeof foo9
 >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; }
+>foo9 : typeof foo9
 >x : C<string, number>
 >C : C<T, U>
 
 function foo9(x: any) { }
->foo9 : { (x: B<string, number>): any; (x: C<string, number>): any; }
+>foo9 : typeof 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; }
+>foo10 : typeof foo10
 >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; }
+>foo10 : typeof foo10
 >x : { foo<T, U>(x: T, y?: U): T; }
 >a : { foo<T, U>(x: T, y?: U): T; }
 
 function foo10(x: any) { }
->foo10 : { (x: B<string, number>): any; (x: { foo<T, U>(x: T, y?: U): T; }): any; }
+>foo10 : typeof 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; }
+>foo11 : typeof foo11
 >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; }
+>foo11 : typeof foo11
 >x : { foo: <T, U>(x: T, y: U) => T; }
 >b : { foo: <T, U>(x: T, y: U) => T; }
 
 function foo11(x: any) { }
->foo11 : { (x: B<string, number>): any; (x: { foo: <T, U>(x: T, y: U) => T; }): any; }
+>foo11 : typeof foo11
 >x : any
 
 function foo12(x: I<string, number>);
->foo12 : { (x: I<string, number>): any; (x: C<string, number>): any; }
+>foo12 : typeof foo12
 >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; }
+>foo12 : typeof foo12
 >x : C<string, number>
 >C : C<T, U>
 
 function foo12(x: any) { }
->foo12 : { (x: I<string, number>): any; (x: C<string, number>): any; }
+>foo12 : typeof foo12
 >x : any
 
 function foo12b(x: I2);
->foo12b : { (x: I2): any; (x: C<string, number>): any; }
+>foo12b : typeof foo12b
 >x : I2
 >I2 : I2
 
 function foo12b(x: C<string, number>); // ok
->foo12b : { (x: I2): any; (x: C<string, number>): any; }
+>foo12b : typeof foo12b
 >x : C<string, number>
 >C : C<T, U>
 
 function foo12b(x: any) { }
->foo12b : { (x: I2): any; (x: C<string, number>): any; }
+>foo12b : typeof 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; }
+>foo13 : typeof foo13
 >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; }
+>foo13 : typeof foo13
 >x : { foo<T, U>(x: T, y?: U): T; }
 >a : { foo<T, U>(x: T, y?: U): T; }
 
 function foo13(x: any) { }
->foo13 : { (x: I<string, number>): any; (x: { foo<T, U>(x: T, y?: U): T; }): any; }
+>foo13 : typeof 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; }
+>foo14 : typeof foo14
 >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; }
+>foo14 : typeof foo14
 >x : { foo: <T, U>(x: T, y: U) => T; }
 >b : { foo: <T, U>(x: T, y: U) => T; }
 
 function foo14(x: any) { }
->foo14 : { (x: I<string, number>): any; (x: { foo: <T, U>(x: T, y: U) => T; }): any; }
+>foo14 : typeof foo14
 >x : any
 
 function foo15(x: I2);
->foo15 : { (x: I2): any; (x: C<string, number>): any; }
+>foo15 : typeof foo15
 >x : I2
 >I2 : I2
 
 function foo15(x: C<string, number>); // ok
->foo15 : { (x: I2): any; (x: C<string, number>): any; }
+>foo15 : typeof foo15
 >x : C<string, number>
 >C : C<T, U>
 
 function foo15(x: any) { }
->foo15 : { (x: I2): any; (x: C<string, number>): any; }
+>foo15 : typeof foo15
 >x : any
 
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.types b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.types
index 8a41814e1a9..5a9db264031 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.types
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.types
@@ -61,201 +61,201 @@ var b = { new<T extends RegExp>(x: T) { return ''; } }; // not a construct signa
 >T : T
 
 function foo1b(x: B<Array<number>>);
->foo1b : { (x: B<number[]>): any; (x: B<number[]>): any; }
+>foo1b : typeof foo1b
 >x : B<number[]>
 >B : B<T>
 >Array : T[]
 
 function foo1b(x: B<Array<number>>); // error
->foo1b : { (x: B<number[]>): any; (x: B<number[]>): any; }
+>foo1b : typeof foo1b
 >x : B<number[]>
 >B : B<T>
 >Array : T[]
 
 function foo1b(x: any) { }
->foo1b : { (x: B<number[]>): any; (x: B<number[]>): any; }
+>foo1b : typeof foo1b
 >x : any
 
 function foo1c(x: C<String>);
->foo1c : { (x: C<String>): any; (x: C<String>): any; }
+>foo1c : typeof foo1c
 >x : C<String>
 >C : C<T>
 >String : String
 
 function foo1c(x: C<String>); // error
->foo1c : { (x: C<String>): any; (x: C<String>): any; }
+>foo1c : typeof foo1c
 >x : C<String>
 >C : C<T>
 >String : String
 
 function foo1c(x: any) { }
->foo1c : { (x: C<String>): any; (x: C<String>): any; }
+>foo1c : typeof foo1c
 >x : any
 
 function foo2(x: I<Number>);
->foo2 : { (x: I<Number>): any; (x: I<Number>): any; }
+>foo2 : typeof foo2
 >x : I<Number>
 >I : I<T>
 >Number : Number
 
 function foo2(x: I<Number>); // error
->foo2 : { (x: I<Number>): any; (x: I<Number>): any; }
+>foo2 : typeof foo2
 >x : I<Number>
 >I : I<T>
 >Number : Number
 
 function foo2(x: any) { }
->foo2 : { (x: I<Number>): any; (x: I<Number>): any; }
+>foo2 : typeof foo2
 >x : any
 
 function foo3(x: typeof a);
->foo3 : { (x: new <T extends string[]>(x: T) => string): any; (x: new <T extends string[]>(x: T) => string): any; }
+>foo3 : typeof foo3
 >x : new <T extends string[]>(x: T) => string
 >a : new <T extends string[]>(x: T) => string
 
 function foo3(x: typeof a); // error
->foo3 : { (x: new <T extends string[]>(x: T) => string): any; (x: new <T extends string[]>(x: T) => string): any; }
+>foo3 : typeof foo3
 >x : new <T extends string[]>(x: T) => string
 >a : new <T extends string[]>(x: T) => string
 
 function foo3(x: any) { }
->foo3 : { (x: new <T extends string[]>(x: T) => string): any; (x: new <T extends string[]>(x: T) => string): any; }
+>foo3 : typeof foo3
 >x : any
 
 function foo4(x: typeof b);
->foo4 : { (x: { new: <T extends RegExp>(x: T) => string; }): any; (x: { new: <T extends RegExp>(x: T) => string; }): any; }
+>foo4 : typeof foo4
 >x : { new: <T extends RegExp>(x: T) => string; }
 >b : { new: <T extends RegExp>(x: T) => string; }
 
 function foo4(x: typeof b); // error
->foo4 : { (x: { new: <T extends RegExp>(x: T) => string; }): any; (x: { new: <T extends RegExp>(x: T) => string; }): any; }
+>foo4 : typeof foo4
 >x : { new: <T extends RegExp>(x: T) => string; }
 >b : { new: <T extends RegExp>(x: T) => string; }
 
 function foo4(x: any) { }
->foo4 : { (x: { new: <T extends RegExp>(x: T) => string; }): any; (x: { new: <T extends RegExp>(x: T) => string; }): any; }
+>foo4 : typeof foo4
 >x : any
 
 function foo8(x: B<Array<number>>);
->foo8 : { (x: B<number[]>): any; (x: I<Number>): any; }
+>foo8 : typeof foo8
 >x : B<number[]>
 >B : B<T>
 >Array : T[]
 
 function foo8(x: I<Number>); // ok
->foo8 : { (x: B<number[]>): any; (x: I<Number>): any; }
+>foo8 : typeof foo8
 >x : I<Number>
 >I : I<T>
 >Number : Number
 
 function foo8(x: any) { }
->foo8 : { (x: B<number[]>): any; (x: I<Number>): any; }
+>foo8 : typeof foo8
 >x : any
 
 function foo9(x: B<Array<number>>);
->foo9 : { (x: B<number[]>): any; (x: C<String>): any; }
+>foo9 : typeof foo9
 >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; }
+>foo9 : typeof foo9
 >x : C<String>
 >C : C<T>
 >String : String
 
 function foo9(x: any) { }
->foo9 : { (x: B<number[]>): any; (x: C<String>): any; }
+>foo9 : typeof foo9
 >x : any
 
 function foo10(x: B<Array<number>>);
->foo10 : { (x: B<number[]>): any; (x: new <T extends string[]>(x: T) => string): any; }
+>foo10 : typeof foo10
 >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; }
+>foo10 : typeof foo10
 >x : new <T extends string[]>(x: T) => string
 >a : new <T extends string[]>(x: T) => string
 
 function foo10(x: any) { }
->foo10 : { (x: B<number[]>): any; (x: new <T extends string[]>(x: T) => string): any; }
+>foo10 : typeof foo10
 >x : any
 
 function foo11(x: B<Array<number>>);
->foo11 : { (x: B<number[]>): any; (x: { new: <T extends RegExp>(x: T) => string; }): any; }
+>foo11 : typeof foo11
 >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; }
+>foo11 : typeof foo11
 >x : { new: <T extends RegExp>(x: T) => string; }
 >b : { new: <T extends RegExp>(x: T) => string; }
 
 function foo11(x: any) { }
->foo11 : { (x: B<number[]>): any; (x: { new: <T extends RegExp>(x: T) => string; }): any; }
+>foo11 : typeof foo11
 >x : any
 
 function foo12(x: I<Number>);
->foo12 : { (x: I<Number>): any; (x: C<String>): any; }
+>foo12 : typeof foo12
 >x : I<Number>
 >I : I<T>
 >Number : Number
 
 function foo12(x: C<String>); // ok
->foo12 : { (x: I<Number>): any; (x: C<String>): any; }
+>foo12 : typeof foo12
 >x : C<String>
 >C : C<T>
 >String : String
 
 function foo12(x: any) { }
->foo12 : { (x: I<Number>): any; (x: C<String>): any; }
+>foo12 : typeof foo12
 >x : any
 
 function foo12b(x: I2);
->foo12b : { (x: I2): any; (x: C<String>): any; }
+>foo12b : typeof foo12b
 >x : I2
 >I2 : I2
 
 function foo12b(x: C<String>); // ok
->foo12b : { (x: I2): any; (x: C<String>): any; }
+>foo12b : typeof foo12b
 >x : C<String>
 >C : C<T>
 >String : String
 
 function foo12b(x: any) { }
->foo12b : { (x: I2): any; (x: C<String>): any; }
+>foo12b : typeof foo12b
 >x : any
 
 function foo13(x: I<Number>);
->foo13 : { (x: I<Number>): any; (x: new <T extends string[]>(x: T) => string): any; }
+>foo13 : typeof foo13
 >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; }
+>foo13 : typeof foo13
 >x : new <T extends string[]>(x: T) => string
 >a : new <T extends string[]>(x: T) => string
 
 function foo13(x: any) { }
->foo13 : { (x: I<Number>): any; (x: new <T extends string[]>(x: T) => string): any; }
+>foo13 : typeof foo13
 >x : any
 
 function foo14(x: I<Number>);
->foo14 : { (x: I<Number>): any; (x: { new: <T extends RegExp>(x: T) => string; }): any; }
+>foo14 : typeof foo14
 >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; }
+>foo14 : typeof foo14
 >x : { new: <T extends RegExp>(x: T) => string; }
 >b : { new: <T extends RegExp>(x: T) => string; }
 
 function foo14(x: any) { }
->foo14 : { (x: I<Number>): any; (x: { new: <T extends RegExp>(x: T) => string; }): any; }
+>foo14 : typeof foo14
 >x : any
 
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType.types b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType.types
index 1eac69f7f23..c07d0e2430f 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType.types
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType.types
@@ -59,212 +59,212 @@ var b = { new<T>(x: T): T { return null; } }; // not a construct signature, func
 >T : T
 
 function foo1b(x: B<string>);
->foo1b : { (x: B<string>): any; (x: B<string>): any; }
+>foo1b : typeof foo1b
 >x : B<string>
 >B : B<T>
 
 function foo1b(x: B<string>); // error
->foo1b : { (x: B<string>): any; (x: B<string>): any; }
+>foo1b : typeof foo1b
 >x : B<string>
 >B : B<T>
 
 function foo1b(x: any) { }
->foo1b : { (x: B<string>): any; (x: B<string>): any; }
+>foo1b : typeof foo1b
 >x : any
 
 function foo1c(x: C<string>);
->foo1c : { (x: C<string>): any; (x: C<string>): any; }
+>foo1c : typeof foo1c
 >x : C<string>
 >C : C<T>
 
 function foo1c(x: C<string>); // error
->foo1c : { (x: C<string>): any; (x: C<string>): any; }
+>foo1c : typeof foo1c
 >x : C<string>
 >C : C<T>
 
 function foo1c(x: any) { }
->foo1c : { (x: C<string>): any; (x: C<string>): any; }
+>foo1c : typeof foo1c
 >x : any
 
 function foo2(x: I<string>);
->foo2 : { (x: I<string>): any; (x: I<string>): any; }
+>foo2 : typeof foo2
 >x : I<string>
 >I : I<T>
 
 function foo2(x: I<string>); // error
->foo2 : { (x: I<string>): any; (x: I<string>): any; }
+>foo2 : typeof foo2
 >x : I<string>
 >I : I<T>
 
 function foo2(x: any) { }
->foo2 : { (x: I<string>): any; (x: I<string>): any; }
+>foo2 : typeof foo2
 >x : any
 
 function foo3(x: typeof a);
->foo3 : { (x: new <T>(x: T) => T): any; (x: new <T>(x: T) => T): any; }
+>foo3 : typeof foo3
 >x : new <T>(x: T) => T
 >a : new <T>(x: T) => T
 
 function foo3(x: typeof a); // error
->foo3 : { (x: new <T>(x: T) => T): any; (x: new <T>(x: T) => T): any; }
+>foo3 : typeof foo3
 >x : new <T>(x: T) => T
 >a : new <T>(x: T) => T
 
 function foo3(x: any) { }
->foo3 : { (x: new <T>(x: T) => T): any; (x: new <T>(x: T) => T): any; }
+>foo3 : typeof foo3
 >x : any
 
 function foo4(x: typeof b);
->foo4 : { (x: { new: <T>(x: T) => T; }): any; (x: { new: <T>(x: T) => T; }): any; }
+>foo4 : typeof foo4
 >x : { new: <T>(x: T) => T; }
 >b : { new: <T>(x: T) => T; }
 
 function foo4(x: typeof b); // error
->foo4 : { (x: { new: <T>(x: T) => T; }): any; (x: { new: <T>(x: T) => T; }): any; }
+>foo4 : typeof foo4
 >x : { new: <T>(x: T) => T; }
 >b : { new: <T>(x: T) => T; }
 
 function foo4(x: any) { }
->foo4 : { (x: { new: <T>(x: T) => T; }): any; (x: { new: <T>(x: T) => T; }): any; }
+>foo4 : typeof foo4
 >x : any
 
 function foo5(x: typeof a): number;
->foo5 : { (x: new <T>(x: T) => T): number; (x: { new: <T>(x: T) => T; }): string; }
+>foo5 : typeof foo5
 >x : new <T>(x: T) => T
 >a : new <T>(x: T) => T
 
 function foo5(x: typeof b): string; // ok
->foo5 : { (x: new <T>(x: T) => T): number; (x: { new: <T>(x: T) => T; }): string; }
+>foo5 : typeof foo5
 >x : { new: <T>(x: T) => T; }
 >b : { new: <T>(x: T) => T; }
 
 function foo5(x: any): any { }
->foo5 : { (x: new <T>(x: T) => T): number; (x: { new: <T>(x: T) => T; }): string; }
+>foo5 : typeof foo5
 >x : any
 
 function foo8(x: B<string>);
->foo8 : { (x: B<string>): any; (x: I<string>): any; }
+>foo8 : typeof foo8
 >x : B<string>
 >B : B<T>
 
 function foo8(x: I<string>); // ok
->foo8 : { (x: B<string>): any; (x: I<string>): any; }
+>foo8 : typeof foo8
 >x : I<string>
 >I : I<T>
 
 function foo8(x: any) { }
->foo8 : { (x: B<string>): any; (x: I<string>): any; }
+>foo8 : typeof foo8
 >x : any
 
 function foo9(x: B<string>);
->foo9 : { (x: B<string>): any; (x: C<string>): any; }
+>foo9 : typeof foo9
 >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; }
+>foo9 : typeof foo9
 >x : C<string>
 >C : C<T>
 
 function foo9(x: any) { }
->foo9 : { (x: B<string>): any; (x: C<string>): any; }
+>foo9 : typeof foo9
 >x : any
 
 function foo10(x: B<string>);
->foo10 : { (x: B<string>): any; (x: new <T>(x: T) => T): any; }
+>foo10 : typeof foo10
 >x : B<string>
 >B : B<T>
 
 function foo10(x: typeof a); // ok
->foo10 : { (x: B<string>): any; (x: new <T>(x: T) => T): any; }
+>foo10 : typeof foo10
 >x : new <T>(x: T) => T
 >a : new <T>(x: T) => T
 
 function foo10(x: any) { }
->foo10 : { (x: B<string>): any; (x: new <T>(x: T) => T): any; }
+>foo10 : typeof foo10
 >x : any
 
 function foo11(x: B<string>);
->foo11 : { (x: B<string>): any; (x: { new: <T>(x: T) => T; }): any; }
+>foo11 : typeof foo11
 >x : B<string>
 >B : B<T>
 
 function foo11(x: typeof b); // ok
->foo11 : { (x: B<string>): any; (x: { new: <T>(x: T) => T; }): any; }
+>foo11 : typeof foo11
 >x : { new: <T>(x: T) => T; }
 >b : { new: <T>(x: T) => T; }
 
 function foo11(x: any) { }
->foo11 : { (x: B<string>): any; (x: { new: <T>(x: T) => T; }): any; }
+>foo11 : typeof foo11
 >x : any
 
 function foo12(x: I<string>);
->foo12 : { (x: I<string>): any; (x: C<string>): any; }
+>foo12 : typeof foo12
 >x : I<string>
 >I : I<T>
 
 function foo12(x: C<string>); // ok
->foo12 : { (x: I<string>): any; (x: C<string>): any; }
+>foo12 : typeof foo12
 >x : C<string>
 >C : C<T>
 
 function foo12(x: any) { }
->foo12 : { (x: I<string>): any; (x: C<string>): any; }
+>foo12 : typeof foo12
 >x : any
 
 function foo12b(x: I2);
->foo12b : { (x: I2): any; (x: C<string>): any; }
+>foo12b : typeof foo12b
 >x : I2
 >I2 : I2
 
 function foo12b(x: C<string>); // ok
->foo12b : { (x: I2): any; (x: C<string>): any; }
+>foo12b : typeof foo12b
 >x : C<string>
 >C : C<T>
 
 function foo12b(x: any) { }
->foo12b : { (x: I2): any; (x: C<string>): any; }
+>foo12b : typeof foo12b
 >x : any
 
 function foo13(x: I<string>);
->foo13 : { (x: I<string>): any; (x: new <T>(x: T) => T): any; }
+>foo13 : typeof foo13
 >x : I<string>
 >I : I<T>
 
 function foo13(x: typeof a); // ok
->foo13 : { (x: I<string>): any; (x: new <T>(x: T) => T): any; }
+>foo13 : typeof foo13
 >x : new <T>(x: T) => T
 >a : new <T>(x: T) => T
 
 function foo13(x: any) { }
->foo13 : { (x: I<string>): any; (x: new <T>(x: T) => T): any; }
+>foo13 : typeof foo13
 >x : any
 
 function foo14(x: I<string>);
->foo14 : { (x: I<string>): any; (x: { new: <T>(x: T) => T; }): any; }
+>foo14 : typeof foo14
 >x : I<string>
 >I : I<T>
 
 function foo14(x: typeof b); // ok
->foo14 : { (x: I<string>): any; (x: { new: <T>(x: T) => T; }): any; }
+>foo14 : typeof foo14
 >x : { new: <T>(x: T) => T; }
 >b : { new: <T>(x: T) => T; }
 
 function foo14(x: any) { }
->foo14 : { (x: I<string>): any; (x: { new: <T>(x: T) => T; }): any; }
+>foo14 : typeof foo14
 >x : any
 
 function foo15(x: I2);
->foo15 : { (x: I2): any; (x: C<number>): any; }
+>foo15 : typeof foo15
 >x : I2
 >I2 : I2
 
 function foo15(x: C<number>); // ok
->foo15 : { (x: I2): any; (x: C<number>): any; }
+>foo15 : typeof foo15
 >x : C<number>
 >C : C<T>
 
 function foo15(x: any) { }
->foo15 : { (x: I2): any; (x: C<number>): any; }
+>foo15 : typeof foo15
 >x : any
 
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.types b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.types
index 308f592ef12..80086f62f9c 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.types
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.types
@@ -64,216 +64,216 @@ var b = { new<T extends Date>(x: T) { return null; } }; // not a construct signa
 >T : T
 
 function foo1b(x: B<Date>);
->foo1b : { (x: B<Date>): any; (x: B<Date>): any; }
+>foo1b : typeof foo1b
 >x : B<Date>
 >B : B<T>
 >Date : Date
 
 function foo1b(x: B<Date>); // error
->foo1b : { (x: B<Date>): any; (x: B<Date>): any; }
+>foo1b : typeof foo1b
 >x : B<Date>
 >B : B<T>
 >Date : Date
 
 function foo1b(x: any) { }
->foo1b : { (x: B<Date>): any; (x: B<Date>): any; }
+>foo1b : typeof foo1b
 >x : any
 
 function foo1c(x: C<Date>);
->foo1c : { (x: C<Date>): any; (x: C<Date>): any; }
+>foo1c : typeof foo1c
 >x : C<Date>
 >C : C<T>
 >Date : Date
 
 function foo1c(x: C<Date>); // error
->foo1c : { (x: C<Date>): any; (x: C<Date>): any; }
+>foo1c : typeof foo1c
 >x : C<Date>
 >C : C<T>
 >Date : Date
 
 function foo1c(x: any) { }
->foo1c : { (x: C<Date>): any; (x: C<Date>): any; }
+>foo1c : typeof foo1c
 >x : any
 
 function foo2(x: I<Date>);
->foo2 : { (x: I<Date>): any; (x: I<Date>): any; }
+>foo2 : typeof foo2
 >x : I<Date>
 >I : I<T>
 >Date : Date
 
 function foo2(x: I<Date>); // error
->foo2 : { (x: I<Date>): any; (x: I<Date>): any; }
+>foo2 : typeof foo2
 >x : I<Date>
 >I : I<T>
 >Date : Date
 
 function foo2(x: any) { }
->foo2 : { (x: I<Date>): any; (x: I<Date>): any; }
+>foo2 : typeof foo2
 >x : any
 
 function foo3(x: typeof a);
->foo3 : { (x: new <T extends Date>(x: T) => T): any; (x: new <T extends Date>(x: T) => T): any; }
+>foo3 : typeof foo3
 >x : new <T extends Date>(x: T) => T
 >a : new <T extends Date>(x: T) => T
 
 function foo3(x: typeof a); // error
->foo3 : { (x: new <T extends Date>(x: T) => T): any; (x: new <T extends Date>(x: T) => T): any; }
+>foo3 : typeof foo3
 >x : new <T extends Date>(x: T) => T
 >a : new <T extends Date>(x: T) => T
 
 function foo3(x: any) { }
->foo3 : { (x: new <T extends Date>(x: T) => T): any; (x: new <T extends Date>(x: T) => T): any; }
+>foo3 : typeof foo3
 >x : any
 
 function foo4(x: typeof b);
->foo4 : { (x: { new: <T extends Date>(x: T) => any; }): any; (x: { new: <T extends Date>(x: T) => any; }): any; }
+>foo4 : typeof foo4
 >x : { new: <T extends Date>(x: T) => any; }
 >b : { new: <T extends Date>(x: T) => any; }
 
 function foo4(x: typeof b); // error
->foo4 : { (x: { new: <T extends Date>(x: T) => any; }): any; (x: { new: <T extends Date>(x: T) => any; }): any; }
+>foo4 : typeof foo4
 >x : { new: <T extends Date>(x: T) => any; }
 >b : { new: <T extends Date>(x: T) => any; }
 
 function foo4(x: any) { }
->foo4 : { (x: { new: <T extends Date>(x: T) => any; }): any; (x: { new: <T extends Date>(x: T) => any; }): any; }
+>foo4 : typeof foo4
 >x : any
 
 function foo8(x: B<Date>);
->foo8 : { (x: B<Date>): any; (x: I<Date>): any; }
+>foo8 : typeof foo8
 >x : B<Date>
 >B : B<T>
 >Date : Date
 
 function foo8(x: I<Date>); // ok
->foo8 : { (x: B<Date>): any; (x: I<Date>): any; }
+>foo8 : typeof foo8
 >x : I<Date>
 >I : I<T>
 >Date : Date
 
 function foo8(x: any) { }
->foo8 : { (x: B<Date>): any; (x: I<Date>): any; }
+>foo8 : typeof foo8
 >x : any
 
 function foo9(x: B<Date>);
->foo9 : { (x: B<Date>): any; (x: C<Date>): any; }
+>foo9 : typeof foo9
 >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; }
+>foo9 : typeof foo9
 >x : C<Date>
 >C : C<T>
 >Date : Date
 
 function foo9(x: any) { }
->foo9 : { (x: B<Date>): any; (x: C<Date>): any; }
+>foo9 : typeof foo9
 >x : any
 
 function foo10(x: B<Date>);
->foo10 : { (x: B<Date>): any; (x: new <T extends Date>(x: T) => T): any; }
+>foo10 : typeof foo10
 >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; }
+>foo10 : typeof foo10
 >x : new <T extends Date>(x: T) => T
 >a : new <T extends Date>(x: T) => T
 
 function foo10(x: any) { }
->foo10 : { (x: B<Date>): any; (x: new <T extends Date>(x: T) => T): any; }
+>foo10 : typeof foo10
 >x : any
 
 function foo11(x: B<Date>);
->foo11 : { (x: B<Date>): any; (x: { new: <T extends Date>(x: T) => any; }): any; }
+>foo11 : typeof foo11
 >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; }
+>foo11 : typeof foo11
 >x : { new: <T extends Date>(x: T) => any; }
 >b : { new: <T extends Date>(x: T) => any; }
 
 function foo11(x: any) { }
->foo11 : { (x: B<Date>): any; (x: { new: <T extends Date>(x: T) => any; }): any; }
+>foo11 : typeof foo11
 >x : any
 
 function foo12(x: I<Date>);
->foo12 : { (x: I<Date>): any; (x: C<Date>): any; }
+>foo12 : typeof foo12
 >x : I<Date>
 >I : I<T>
 >Date : Date
 
 function foo12(x: C<Date>); // ok
->foo12 : { (x: I<Date>): any; (x: C<Date>): any; }
+>foo12 : typeof foo12
 >x : C<Date>
 >C : C<T>
 >Date : Date
 
 function foo12(x: any) { }
->foo12 : { (x: I<Date>): any; (x: C<Date>): any; }
+>foo12 : typeof foo12
 >x : any
 
 function foo12b(x: I2);
->foo12b : { (x: I2): any; (x: C<Date>): any; }
+>foo12b : typeof foo12b
 >x : I2
 >I2 : I2
 
 function foo12b(x: C<Date>); // ok
->foo12b : { (x: I2): any; (x: C<Date>): any; }
+>foo12b : typeof foo12b
 >x : C<Date>
 >C : C<T>
 >Date : Date
 
 function foo12b(x: any) { }
->foo12b : { (x: I2): any; (x: C<Date>): any; }
+>foo12b : typeof foo12b
 >x : any
 
 function foo13(x: I<Date>);
->foo13 : { (x: I<Date>): any; (x: new <T extends Date>(x: T) => T): any; }
+>foo13 : typeof foo13
 >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; }
+>foo13 : typeof foo13
 >x : new <T extends Date>(x: T) => T
 >a : new <T extends Date>(x: T) => T
 
 function foo13(x: any) { }
->foo13 : { (x: I<Date>): any; (x: new <T extends Date>(x: T) => T): any; }
+>foo13 : typeof foo13
 >x : any
 
 function foo14(x: I<Date>);
->foo14 : { (x: I<Date>): any; (x: { new: <T extends Date>(x: T) => any; }): any; }
+>foo14 : typeof foo14
 >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; }
+>foo14 : typeof foo14
 >x : { new: <T extends Date>(x: T) => any; }
 >b : { new: <T extends Date>(x: T) => any; }
 
 function foo14(x: any) { }
->foo14 : { (x: I<Date>): any; (x: { new: <T extends Date>(x: T) => any; }): any; }
+>foo14 : typeof foo14
 >x : any
 
 function foo15(x: I2);
->foo15 : { (x: I2): any; (x: C<Date>): any; }
+>foo15 : typeof foo15
 >x : I2
 >I2 : I2
 
 function foo15(x: C<Date>); // ok
->foo15 : { (x: I2): any; (x: C<Date>): any; }
+>foo15 : typeof foo15
 >x : C<Date>
 >C : C<T>
 >Date : Date
 
 function foo15(x: any) { }
->foo15 : { (x: I2): any; (x: C<Date>): any; }
+>foo15 : typeof foo15
 >x : any
 
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterCounts.types b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterCounts.types
index 0276458ea91..52cee1f5bcd 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterCounts.types
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterCounts.types
@@ -83,167 +83,167 @@ var b = { new<A, B, C, D, E, F>(x: A) { return x; } };
 >x : A
 
 function foo1b(x: B<string, string>);
->foo1b : { (x: B<string, string>): any; (x: B<string, string>): any; }
+>foo1b : typeof foo1b
 >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; }
+>foo1b : typeof foo1b
 >x : B<string, string>
 >B : B<U, V>
 
 function foo1b(x: any) { }
->foo1b : { (x: B<string, string>): any; (x: B<string, string>): any; }
+>foo1b : typeof foo1b
 >x : any
 
 function foo1c(x: C<string, number, boolean>);
->foo1c : { (x: C<string, number, boolean>): any; (x: C<string, number, boolean>): any; }
+>foo1c : typeof foo1c
 >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; }
+>foo1c : typeof foo1c
 >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; }
+>foo1c : typeof 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; }
+>foo2 : typeof foo2
 >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; }
+>foo2 : typeof foo2
 >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; }
+>foo2 : typeof foo2
 >x : any
 
 function foo3(x: typeof a);
->foo3 : { (x: new <Z, A, B, CC, D>(x: Z) => C<Z, A, B>): any; (x: new <Z, A, B, CC, D>(x: Z) => C<Z, A, B>): any; }
+>foo3 : typeof foo3
 >x : 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>
 
 function foo3(x: typeof a); // error
->foo3 : { (x: new <Z, A, B, CC, D>(x: Z) => C<Z, A, B>): any; (x: new <Z, A, B, CC, D>(x: Z) => C<Z, A, B>): any; }
+>foo3 : typeof foo3
 >x : 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>
 
 function foo3(x: any) { }
->foo3 : { (x: new <Z, A, B, CC, D>(x: Z) => C<Z, A, B>): any; (x: new <Z, A, B, CC, D>(x: Z) => C<Z, A, B>): any; }
+>foo3 : typeof foo3
 >x : any
 
 function foo4(x: typeof b);
->foo4 : { (x: { new: <A, B, C, D, E, F>(x: A) => A; }): any; (x: { new: <A, B, C, D, E, F>(x: A) => A; }): any; }
+>foo4 : typeof foo4
 >x : { new: <A, B, C, D, E, F>(x: A) => A; }
 >b : { new: <A, B, C, D, E, F>(x: A) => A; }
 
 function foo4(x: typeof b); // error
->foo4 : { (x: { new: <A, B, C, D, E, F>(x: A) => A; }): any; (x: { new: <A, B, C, D, E, F>(x: A) => A; }): any; }
+>foo4 : typeof foo4
 >x : { new: <A, B, C, D, E, F>(x: A) => A; }
 >b : { new: <A, B, C, D, E, F>(x: A) => A; }
 
 function foo4(x: any) { }
->foo4 : { (x: { new: <A, B, C, D, E, F>(x: A) => A; }): any; (x: { new: <A, B, C, D, E, F>(x: A) => A; }): any; }
+>foo4 : typeof foo4
 >x : any
 
 function foo8(x: B<string, string>);
->foo8 : { (x: B<string, string>): any; (x: I<string, string, boolean, Date>): any; }
+>foo8 : typeof foo8
 >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; }
+>foo8 : typeof foo8
 >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; }
+>foo8 : typeof foo8
 >x : any
 
 function foo9(x: B<string, number>);
->foo9 : { (x: B<string, number>): any; (x: C<string, number, B<string, string>>): any; }
+>foo9 : typeof foo9
 >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; }
+>foo9 : typeof foo9
 >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; }
+>foo9 : typeof 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; }
+>foo10 : typeof foo10
 >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; }
+>foo10 : typeof foo10
 >x : 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>
 
 function foo10(x: any) { }
->foo10 : { (x: B<string, boolean>): any; (x: new <Z, A, B, CC, D>(x: Z) => C<Z, A, B>): any; }
+>foo10 : typeof 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; }
+>foo11 : typeof foo11
 >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; }
+>foo11 : typeof foo11
 >x : { new: <A, B, C, D, E, F>(x: A) => A; }
 >b : { new: <A, B, C, D, E, F>(x: A) => A; }
 
 function foo11(x: any) { }
->foo11 : { (x: B<string, boolean>): any; (x: { new: <A, B, C, D, E, F>(x: A) => A; }): any; }
+>foo11 : typeof 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; }
+>foo12 : typeof foo12
 >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; }
+>foo12 : typeof foo12
 >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; }
+>foo12 : typeof foo12
 >x : any
 
 function foo12b(x: I2);
->foo12b : { (x: I2): any; (x: C<string, string, boolean>): any; }
+>foo12b : typeof foo12b
 >x : I2
 >I2 : I2
 
 function foo12b(x: C<string, string, boolean>); // BUG 832086
->foo12b : { (x: I2): any; (x: C<string, string, boolean>): any; }
+>foo12b : typeof foo12b
 >x : C<string, string, boolean>
 >C : C<V, W, X>
 
 function foo12b(x: any) { }
->foo12b : { (x: I2): any; (x: C<string, string, boolean>): any; }
+>foo12b : typeof 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; }
+>foo13 : typeof foo13
 >x : I<string, Date, RegExp, Date>
 >I : I<X, Y, Z, A>
 >Date : Date
@@ -251,27 +251,27 @@ function foo13(x: I<string, Date, RegExp, Date>);
 >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; }
+>foo13 : typeof foo13
 >x : 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>
 
 function foo13(x: any) { }
->foo13 : { (x: I<string, Date, RegExp, Date>): any; (x: new <Z, A, B, CC, D>(x: Z) => C<Z, A, B>): any; }
+>foo13 : typeof 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; }
+>foo14 : typeof foo14
 >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; }
+>foo14 : typeof foo14
 >x : { new: <A, B, C, D, E, F>(x: A) => A; }
 >b : { new: <A, B, C, D, E, F>(x: A) => A; }
 
 function foo14(x: any) { }
->foo14 : { (x: I<string, Date, RegExp, boolean>): any; (x: { new: <A, B, C, D, E, F>(x: A) => A; }): any; }
+>foo14 : typeof foo14
 >x : any
 
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterNames.types b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterNames.types
index 10a8da26907..a1c1e1aca99 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterNames.types
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterNames.types
@@ -63,184 +63,184 @@ var b = { new<A>(x: A) { return new C<A>(x); } };
 >x : A
 
 function foo1b(x: B<string>);
->foo1b : { (x: B<string>): any; (x: B<string>): any; }
+>foo1b : typeof foo1b
 >x : B<string>
 >B : B<U>
 
 function foo1b(x: B<string>); // error
->foo1b : { (x: B<string>): any; (x: B<string>): any; }
+>foo1b : typeof foo1b
 >x : B<string>
 >B : B<U>
 
 function foo1b(x: any) { }
->foo1b : { (x: B<string>): any; (x: B<string>): any; }
+>foo1b : typeof foo1b
 >x : any
 
 function foo1c(x: C<string>);
->foo1c : { (x: C<string>): any; (x: C<string>): any; }
+>foo1c : typeof foo1c
 >x : C<string>
 >C : C<V>
 
 function foo1c(x: C<string>); // error
->foo1c : { (x: C<string>): any; (x: C<string>): any; }
+>foo1c : typeof foo1c
 >x : C<string>
 >C : C<V>
 
 function foo1c(x: any) { }
->foo1c : { (x: C<string>): any; (x: C<string>): any; }
+>foo1c : typeof foo1c
 >x : any
 
 function foo2(x: I<string>);
->foo2 : { (x: I<string>): any; (x: I<string>): any; }
+>foo2 : typeof foo2
 >x : I<string>
 >I : I<X>
 
 function foo2(x: I<string>); // error
->foo2 : { (x: I<string>): any; (x: I<string>): any; }
+>foo2 : typeof foo2
 >x : I<string>
 >I : I<X>
 
 function foo2(x: any) { }
->foo2 : { (x: I<string>): any; (x: I<string>): any; }
+>foo2 : typeof foo2
 >x : any
 
 function foo3(x: typeof a);
->foo3 : { (x: new <Z>(x: Z) => B<Z>): any; (x: new <Z>(x: Z) => B<Z>): any; }
+>foo3 : typeof foo3
 >x : new <Z>(x: Z) => B<Z>
 >a : new <Z>(x: Z) => B<Z>
 
 function foo3(x: typeof a); // error
->foo3 : { (x: new <Z>(x: Z) => B<Z>): any; (x: new <Z>(x: Z) => B<Z>): any; }
+>foo3 : typeof foo3
 >x : new <Z>(x: Z) => B<Z>
 >a : new <Z>(x: Z) => B<Z>
 
 function foo3(x: any) { }
->foo3 : { (x: new <Z>(x: Z) => B<Z>): any; (x: new <Z>(x: Z) => B<Z>): any; }
+>foo3 : typeof foo3
 >x : any
 
 function foo4(x: typeof b);
->foo4 : { (x: { new: <A>(x: A) => C<A>; }): any; (x: { new: <A>(x: A) => C<A>; }): any; }
+>foo4 : typeof foo4
 >x : { new: <A>(x: A) => C<A>; }
 >b : { new: <A>(x: A) => C<A>; }
 
 function foo4(x: typeof b); // error
->foo4 : { (x: { new: <A>(x: A) => C<A>; }): any; (x: { new: <A>(x: A) => C<A>; }): any; }
+>foo4 : typeof foo4
 >x : { new: <A>(x: A) => C<A>; }
 >b : { new: <A>(x: A) => C<A>; }
 
 function foo4(x: any) { }
->foo4 : { (x: { new: <A>(x: A) => C<A>; }): any; (x: { new: <A>(x: A) => C<A>; }): any; }
+>foo4 : typeof foo4
 >x : any
 
 function foo8(x: B<string>);
->foo8 : { (x: B<string>): any; (x: I<string>): any; }
+>foo8 : typeof foo8
 >x : B<string>
 >B : B<U>
 
 function foo8(x: I<string>); // BUG 832086
->foo8 : { (x: B<string>): any; (x: I<string>): any; }
+>foo8 : typeof foo8
 >x : I<string>
 >I : I<X>
 
 function foo8(x: any) { }
->foo8 : { (x: B<string>): any; (x: I<string>): any; }
+>foo8 : typeof foo8
 >x : any
 
 function foo9(x: B<string>);
->foo9 : { (x: B<string>): any; (x: C<string>): any; }
+>foo9 : typeof foo9
 >x : B<string>
 >B : B<U>
 
 function foo9(x: C<string>); // error
->foo9 : { (x: B<string>): any; (x: C<string>): any; }
+>foo9 : typeof foo9
 >x : C<string>
 >C : C<V>
 
 function foo9(x: any) { }
->foo9 : { (x: B<string>): any; (x: C<string>): any; }
+>foo9 : typeof foo9
 >x : any
 
 function foo10(x: B<string>);
->foo10 : { (x: B<string>): any; (x: new <Z>(x: Z) => B<Z>): any; }
+>foo10 : typeof foo10
 >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; }
+>foo10 : typeof foo10
 >x : new <Z>(x: Z) => B<Z>
 >a : new <Z>(x: Z) => B<Z>
 
 function foo10(x: any) { }
->foo10 : { (x: B<string>): any; (x: new <Z>(x: Z) => B<Z>): any; }
+>foo10 : typeof foo10
 >x : any
 
 function foo11(x: B<string>);
->foo11 : { (x: B<string>): any; (x: { new: <A>(x: A) => C<A>; }): any; }
+>foo11 : typeof foo11
 >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; }
+>foo11 : typeof foo11
 >x : { new: <A>(x: A) => C<A>; }
 >b : { new: <A>(x: A) => C<A>; }
 
 function foo11(x: any) { }
->foo11 : { (x: B<string>): any; (x: { new: <A>(x: A) => C<A>; }): any; }
+>foo11 : typeof foo11
 >x : any
 
 function foo12(x: I<string>);
->foo12 : { (x: I<string>): any; (x: C<string>): any; }
+>foo12 : typeof foo12
 >x : I<string>
 >I : I<X>
 
 function foo12(x: C<string>); // error
->foo12 : { (x: I<string>): any; (x: C<string>): any; }
+>foo12 : typeof foo12
 >x : C<string>
 >C : C<V>
 
 function foo12(x: any) { }
->foo12 : { (x: I<string>): any; (x: C<string>): any; }
+>foo12 : typeof foo12
 >x : any
 
 function foo12b(x: I2);
->foo12b : { (x: I2): any; (x: C<string>): any; }
+>foo12b : typeof foo12b
 >x : I2
 >I2 : I2
 
 function foo12b(x: C<string>); // BUG 832086
->foo12b : { (x: I2): any; (x: C<string>): any; }
+>foo12b : typeof foo12b
 >x : C<string>
 >C : C<V>
 
 function foo12b(x: any) { }
->foo12b : { (x: I2): any; (x: C<string>): any; }
+>foo12b : typeof foo12b
 >x : any
 
 function foo13(x: I<string>);
->foo13 : { (x: I<string>): any; (x: new <Z>(x: Z) => B<Z>): any; }
+>foo13 : typeof foo13
 >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; }
+>foo13 : typeof foo13
 >x : new <Z>(x: Z) => B<Z>
 >a : new <Z>(x: Z) => B<Z>
 
 function foo13(x: any) { }
->foo13 : { (x: I<string>): any; (x: new <Z>(x: Z) => B<Z>): any; }
+>foo13 : typeof foo13
 >x : any
 
 function foo14(x: I<string>);
->foo14 : { (x: I<string>): any; (x: { new: <A>(x: A) => C<A>; }): any; }
+>foo14 : typeof foo14
 >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; }
+>foo14 : typeof foo14
 >x : { new: <A>(x: A) => C<A>; }
 >b : { new: <A>(x: A) => C<A>; }
 
 function foo14(x: any) { }
->foo14 : { (x: I<string>): any; (x: { new: <A>(x: A) => C<A>; }): any; }
+>foo14 : typeof foo14
 >x : any
 
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesOptionalParams.types b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesOptionalParams.types
index 28ef6a81505..9da0c3ae436 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesOptionalParams.types
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesOptionalParams.types
@@ -78,184 +78,184 @@ var b = { new<T>(x: T, y?: T) { return new C<T>(x, y); } }; // not a construct s
 >y : T
 
 function foo1b(x: B<string>);
->foo1b : { (x: B<string>): any; (x: B<string>): any; }
+>foo1b : typeof foo1b
 >x : B<string>
 >B : B<T>
 
 function foo1b(x: B<string>); // error
->foo1b : { (x: B<string>): any; (x: B<string>): any; }
+>foo1b : typeof foo1b
 >x : B<string>
 >B : B<T>
 
 function foo1b(x: any) { }
->foo1b : { (x: B<string>): any; (x: B<string>): any; }
+>foo1b : typeof foo1b
 >x : any
 
 function foo1c(x: C<string>);
->foo1c : { (x: C<string>): any; (x: C<string>): any; }
+>foo1c : typeof foo1c
 >x : C<string>
 >C : C<T>
 
 function foo1c(x: C<string>); // error
->foo1c : { (x: C<string>): any; (x: C<string>): any; }
+>foo1c : typeof foo1c
 >x : C<string>
 >C : C<T>
 
 function foo1c(x: any) { }
->foo1c : { (x: C<string>): any; (x: C<string>): any; }
+>foo1c : typeof foo1c
 >x : any
 
 function foo2(x: I<string>);
->foo2 : { (x: I<string>): any; (x: I<string>): any; }
+>foo2 : typeof foo2
 >x : I<string>
 >I : I<T>
 
 function foo2(x: I<string>); // error
->foo2 : { (x: I<string>): any; (x: I<string>): any; }
+>foo2 : typeof foo2
 >x : I<string>
 >I : I<T>
 
 function foo2(x: any) { }
->foo2 : { (x: I<string>): any; (x: I<string>): any; }
+>foo2 : typeof foo2
 >x : any
 
 function foo3(x: typeof a);
->foo3 : { (x: new <T>(x: T, y?: T) => B<T>): any; (x: new <T>(x: T, y?: T) => B<T>): any; }
+>foo3 : typeof foo3
 >x : new <T>(x: T, y?: T) => B<T>
 >a : new <T>(x: T, y?: T) => B<T>
 
 function foo3(x: typeof a); // error
->foo3 : { (x: new <T>(x: T, y?: T) => B<T>): any; (x: new <T>(x: T, y?: T) => B<T>): any; }
+>foo3 : typeof foo3
 >x : new <T>(x: T, y?: T) => B<T>
 >a : new <T>(x: T, y?: T) => B<T>
 
 function foo3(x: any) { }
->foo3 : { (x: new <T>(x: T, y?: T) => B<T>): any; (x: new <T>(x: T, y?: T) => B<T>): any; }
+>foo3 : typeof foo3
 >x : any
 
 function foo4(x: typeof b);
->foo4 : { (x: { new: <T>(x: T, y?: T) => C<T>; }): any; (x: { new: <T>(x: T, y?: T) => C<T>; }): any; }
+>foo4 : typeof foo4
 >x : { new: <T>(x: T, y?: T) => C<T>; }
 >b : { new: <T>(x: T, y?: T) => C<T>; }
 
 function foo4(x: typeof b); // error
->foo4 : { (x: { new: <T>(x: T, y?: T) => C<T>; }): any; (x: { new: <T>(x: T, y?: T) => C<T>; }): any; }
+>foo4 : typeof foo4
 >x : { new: <T>(x: T, y?: T) => C<T>; }
 >b : { new: <T>(x: T, y?: T) => C<T>; }
 
 function foo4(x: any) { }
->foo4 : { (x: { new: <T>(x: T, y?: T) => C<T>; }): any; (x: { new: <T>(x: T, y?: T) => C<T>; }): any; }
+>foo4 : typeof foo4
 >x : any
 
 function foo8(x: B<string>): string;
->foo8 : { (x: B<string>): string; (x: I<string>): number; }
+>foo8 : typeof foo8
 >x : B<string>
 >B : B<T>
 
 function foo8(x: I<string>): number; // BUG 832086
->foo8 : { (x: B<string>): string; (x: I<string>): number; }
+>foo8 : typeof foo8
 >x : I<string>
 >I : I<T>
 
 function foo8(x: any): any { }
->foo8 : { (x: B<string>): string; (x: I<string>): number; }
+>foo8 : typeof foo8
 >x : any
 
 function foo9(x: B<string>);
->foo9 : { (x: B<string>): any; (x: C<string>): any; }
+>foo9 : typeof foo9
 >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; }
+>foo9 : typeof foo9
 >x : C<string>
 >C : C<T>
 
 function foo9(x: any) { }
->foo9 : { (x: B<string>): any; (x: C<string>): any; }
+>foo9 : typeof foo9
 >x : any
 
 function foo10(x: B<string>);
->foo10 : { (x: B<string>): any; (x: new <T>(x: T, y?: T) => B<T>): any; }
+>foo10 : typeof foo10
 >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; }
+>foo10 : typeof foo10
 >x : new <T>(x: T, y?: T) => B<T>
 >a : new <T>(x: T, y?: T) => B<T>
 
 function foo10(x: any) { }
->foo10 : { (x: B<string>): any; (x: new <T>(x: T, y?: T) => B<T>): any; }
+>foo10 : typeof foo10
 >x : any
 
 function foo11(x: B<string>);
->foo11 : { (x: B<string>): any; (x: { new: <T>(x: T, y?: T) => C<T>; }): any; }
+>foo11 : typeof foo11
 >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; }
+>foo11 : typeof foo11
 >x : { new: <T>(x: T, y?: T) => C<T>; }
 >b : { new: <T>(x: T, y?: T) => C<T>; }
 
 function foo11(x: any) { }
->foo11 : { (x: B<string>): any; (x: { new: <T>(x: T, y?: T) => C<T>; }): any; }
+>foo11 : typeof foo11
 >x : any
 
 function foo12(x: I<string>);
->foo12 : { (x: I<string>): any; (x: C<string>): any; }
+>foo12 : typeof foo12
 >x : I<string>
 >I : I<T>
 
 function foo12(x: C<string>); // ok
->foo12 : { (x: I<string>): any; (x: C<string>): any; }
+>foo12 : typeof foo12
 >x : C<string>
 >C : C<T>
 
 function foo12(x: any) { }
->foo12 : { (x: I<string>): any; (x: C<string>): any; }
+>foo12 : typeof foo12
 >x : any
 
 function foo12b(x: I2);
->foo12b : { (x: I2): any; (x: C<string>): any; }
+>foo12b : typeof foo12b
 >x : I2
 >I2 : I2
 
 function foo12b(x: C<string>); // BUG 832086
->foo12b : { (x: I2): any; (x: C<string>): any; }
+>foo12b : typeof foo12b
 >x : C<string>
 >C : C<T>
 
 function foo12b(x: any) { }
->foo12b : { (x: I2): any; (x: C<string>): any; }
+>foo12b : typeof foo12b
 >x : any
 
 function foo13(x: I<string>);
->foo13 : { (x: I<string>): any; (x: new <T>(x: T, y?: T) => B<T>): any; }
+>foo13 : typeof foo13
 >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; }
+>foo13 : typeof foo13
 >x : new <T>(x: T, y?: T) => B<T>
 >a : new <T>(x: T, y?: T) => B<T>
 
 function foo13(x: any) { }
->foo13 : { (x: I<string>): any; (x: new <T>(x: T, y?: T) => B<T>): any; }
+>foo13 : typeof foo13
 >x : any
 
 function foo14(x: I<string>);
->foo14 : { (x: I<string>): any; (x: { new: <T>(x: T, y?: T) => C<T>; }): any; }
+>foo14 : typeof foo14
 >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; }
+>foo14 : typeof foo14
 >x : { new: <T>(x: T, y?: T) => C<T>; }
 >b : { new: <T>(x: T, y?: T) => C<T>; }
 
 function foo14(x: any) { }
->foo14 : { (x: I<string>): any; (x: { new: <T>(x: T, y?: T) => C<T>; }): any; }
+>foo14 : typeof foo14
 >x : any
 
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesOptionalParams2.types b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesOptionalParams2.types
index e75f1ce7cbb..1a500ad8a62 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesOptionalParams2.types
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesOptionalParams2.types
@@ -88,184 +88,184 @@ var b = { new<T, U>(x: T, y?: U) { return new C<T, U>(x, y); } }; // not a const
 >y : U
 
 function foo1b(x: B<string, number>);
->foo1b : { (x: B<string, number>): any; (x: B<string, number>): any; }
+>foo1b : typeof foo1b
 >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; }
+>foo1b : typeof foo1b
 >x : B<string, number>
 >B : B<T, U>
 
 function foo1b(x: any) { }
->foo1b : { (x: B<string, number>): any; (x: B<string, number>): any; }
+>foo1b : typeof foo1b
 >x : any
 
 function foo1c(x: C<string, number>);
->foo1c : { (x: C<string, number>): any; (x: C<string, number>): any; }
+>foo1c : typeof foo1c
 >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; }
+>foo1c : typeof foo1c
 >x : C<string, number>
 >C : C<T, U>
 
 function foo1c(x: any) { }
->foo1c : { (x: C<string, number>): any; (x: C<string, number>): any; }
+>foo1c : typeof foo1c
 >x : any
 
 function foo2(x: I<string, number>);
->foo2 : { (x: I<string, number>): any; (x: I<string, number>): any; }
+>foo2 : typeof foo2
 >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; }
+>foo2 : typeof foo2
 >x : I<string, number>
 >I : I<T, U>
 
 function foo2(x: any) { }
->foo2 : { (x: I<string, number>): any; (x: I<string, number>): any; }
+>foo2 : typeof foo2
 >x : any
 
 function foo3(x: typeof a);
->foo3 : { (x: new <T, U>(x: T, y?: U) => B<T, U>): any; (x: new <T, U>(x: T, y?: U) => B<T, U>): any; }
+>foo3 : typeof foo3
 >x : new <T, U>(x: T, y?: U) => B<T, U>
 >a : new <T, U>(x: T, y?: U) => B<T, U>
 
 function foo3(x: typeof a); // error
->foo3 : { (x: new <T, U>(x: T, y?: U) => B<T, U>): any; (x: new <T, U>(x: T, y?: U) => B<T, U>): any; }
+>foo3 : typeof foo3
 >x : new <T, U>(x: T, y?: U) => B<T, U>
 >a : new <T, U>(x: T, y?: U) => B<T, U>
 
 function foo3(x: any) { }
->foo3 : { (x: new <T, U>(x: T, y?: U) => B<T, U>): any; (x: new <T, U>(x: T, y?: U) => B<T, U>): any; }
+>foo3 : typeof foo3
 >x : any
 
 function foo4(x: typeof b);
->foo4 : { (x: { new: <T, U>(x: T, y?: U) => C<T, U>; }): any; (x: { new: <T, U>(x: T, y?: U) => C<T, U>; }): any; }
+>foo4 : typeof foo4
 >x : { new: <T, U>(x: T, y?: U) => C<T, U>; }
 >b : { new: <T, U>(x: T, y?: U) => C<T, U>; }
 
 function foo4(x: typeof b); // error
->foo4 : { (x: { new: <T, U>(x: T, y?: U) => C<T, U>; }): any; (x: { new: <T, U>(x: T, y?: U) => C<T, U>; }): any; }
+>foo4 : typeof foo4
 >x : { new: <T, U>(x: T, y?: U) => C<T, U>; }
 >b : { new: <T, U>(x: T, y?: U) => C<T, U>; }
 
 function foo4(x: any) { }
->foo4 : { (x: { new: <T, U>(x: T, y?: U) => C<T, U>; }): any; (x: { new: <T, U>(x: T, y?: U) => C<T, U>; }): any; }
+>foo4 : typeof foo4
 >x : any
 
 function foo8(x: B<string, number>);
->foo8 : { (x: B<string, number>): any; (x: I<string, number>): any; }
+>foo8 : typeof foo8
 >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; }
+>foo8 : typeof foo8
 >x : I<string, number>
 >I : I<T, U>
 
 function foo8(x: any) { }
->foo8 : { (x: B<string, number>): any; (x: I<string, number>): any; }
+>foo8 : typeof foo8
 >x : any
 
 function foo9(x: B<string, number>);
->foo9 : { (x: B<string, number>): any; (x: C<string, number>): any; }
+>foo9 : typeof foo9
 >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; }
+>foo9 : typeof foo9
 >x : C<string, number>
 >C : C<T, U>
 
 function foo9(x: any) { }
->foo9 : { (x: B<string, number>): any; (x: C<string, number>): any; }
+>foo9 : typeof 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; }
+>foo10 : typeof foo10
 >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; }
+>foo10 : typeof foo10
 >x : new <T, U>(x: T, y?: U) => B<T, U>
 >a : new <T, U>(x: T, y?: U) => B<T, U>
 
 function foo10(x: any) { }
->foo10 : { (x: B<string, number>): any; (x: new <T, U>(x: T, y?: U) => B<T, U>): any; }
+>foo10 : typeof 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; }
+>foo11 : typeof foo11
 >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; }
+>foo11 : typeof foo11
 >x : { new: <T, U>(x: T, y?: U) => C<T, U>; }
 >b : { new: <T, U>(x: T, y?: U) => C<T, U>; }
 
 function foo11(x: any) { }
->foo11 : { (x: B<string, number>): any; (x: { new: <T, U>(x: T, y?: U) => C<T, U>; }): any; }
+>foo11 : typeof foo11
 >x : any
 
 function foo12(x: I<string, number>);
->foo12 : { (x: I<string, number>): any; (x: C<string, number>): any; }
+>foo12 : typeof foo12
 >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; }
+>foo12 : typeof foo12
 >x : C<string, number>
 >C : C<T, U>
 
 function foo12(x: any) { }
->foo12 : { (x: I<string, number>): any; (x: C<string, number>): any; }
+>foo12 : typeof foo12
 >x : any
 
 function foo12b(x: I2);
->foo12b : { (x: I2): any; (x: C<string, number>): any; }
+>foo12b : typeof foo12b
 >x : I2
 >I2 : I2
 
 function foo12b(x: C<string, number>); // ok
->foo12b : { (x: I2): any; (x: C<string, number>): any; }
+>foo12b : typeof foo12b
 >x : C<string, number>
 >C : C<T, U>
 
 function foo12b(x: any) { }
->foo12b : { (x: I2): any; (x: C<string, number>): any; }
+>foo12b : typeof 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; }
+>foo13 : typeof foo13
 >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; }
+>foo13 : typeof foo13
 >x : new <T, U>(x: T, y?: U) => B<T, U>
 >a : new <T, U>(x: T, y?: U) => B<T, U>
 
 function foo13(x: any) { }
->foo13 : { (x: I<string, number>): any; (x: new <T, U>(x: T, y?: U) => B<T, U>): any; }
+>foo13 : typeof 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; }
+>foo14 : typeof foo14
 >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; }
+>foo14 : typeof foo14
 >x : { new: <T, U>(x: T, y?: U) => C<T, U>; }
 >b : { new: <T, U>(x: T, y?: U) => C<T, U>; }
 
 function foo14(x: any) { }
->foo14 : { (x: I<string, number>): any; (x: { new: <T, U>(x: T, y?: U) => C<T, U>; }): any; }
+>foo14 : typeof foo14
 >x : any
 
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesOptionalParams3.types b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesOptionalParams3.types
index 5f5d592df34..1fd61d4cf8c 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesOptionalParams3.types
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesOptionalParams3.types
@@ -88,184 +88,184 @@ var b = { new<T, U>(x: T, y: U) { return new C<T, U>(x, y); } }; // not a constr
 >y : U
 
 function foo1b(x: B<string, number>);
->foo1b : { (x: B<string, number>): any; (x: B<string, number>): any; }
+>foo1b : typeof foo1b
 >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; }
+>foo1b : typeof foo1b
 >x : B<string, number>
 >B : B<T, U>
 
 function foo1b(x: any) { }
->foo1b : { (x: B<string, number>): any; (x: B<string, number>): any; }
+>foo1b : typeof foo1b
 >x : any
 
 function foo1c(x: C<string, number>);
->foo1c : { (x: C<string, number>): any; (x: C<string, number>): any; }
+>foo1c : typeof foo1c
 >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; }
+>foo1c : typeof foo1c
 >x : C<string, number>
 >C : C<T, U>
 
 function foo1c(x: any) { }
->foo1c : { (x: C<string, number>): any; (x: C<string, number>): any; }
+>foo1c : typeof foo1c
 >x : any
 
 function foo2(x: I<string, number>);
->foo2 : { (x: I<string, number>): any; (x: I<string, number>): any; }
+>foo2 : typeof foo2
 >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; }
+>foo2 : typeof foo2
 >x : I<string, number>
 >I : I<T, U>
 
 function foo2(x: any) { }
->foo2 : { (x: I<string, number>): any; (x: I<string, number>): any; }
+>foo2 : typeof foo2
 >x : any
 
 function foo3(x: typeof a);
->foo3 : { (x: new <T, U>(x: T, y?: U) => B<T, U>): any; (x: new <T, U>(x: T, y?: U) => B<T, U>): any; }
+>foo3 : typeof foo3
 >x : new <T, U>(x: T, y?: U) => B<T, U>
 >a : new <T, U>(x: T, y?: U) => B<T, U>
 
 function foo3(x: typeof a); // error
->foo3 : { (x: new <T, U>(x: T, y?: U) => B<T, U>): any; (x: new <T, U>(x: T, y?: U) => B<T, U>): any; }
+>foo3 : typeof foo3
 >x : new <T, U>(x: T, y?: U) => B<T, U>
 >a : new <T, U>(x: T, y?: U) => B<T, U>
 
 function foo3(x: any) { }
->foo3 : { (x: new <T, U>(x: T, y?: U) => B<T, U>): any; (x: new <T, U>(x: T, y?: U) => B<T, U>): any; }
+>foo3 : typeof foo3
 >x : any
 
 function foo4(x: typeof b);
->foo4 : { (x: { new: <T, U>(x: T, y: U) => C<T, U>; }): any; (x: { new: <T, U>(x: T, y: U) => C<T, U>; }): any; }
+>foo4 : typeof foo4
 >x : { new: <T, U>(x: T, y: U) => C<T, U>; }
 >b : { new: <T, U>(x: T, y: U) => C<T, U>; }
 
 function foo4(x: typeof b); // error
->foo4 : { (x: { new: <T, U>(x: T, y: U) => C<T, U>; }): any; (x: { new: <T, U>(x: T, y: U) => C<T, U>; }): any; }
+>foo4 : typeof foo4
 >x : { new: <T, U>(x: T, y: U) => C<T, U>; }
 >b : { new: <T, U>(x: T, y: U) => C<T, U>; }
 
 function foo4(x: any) { }
->foo4 : { (x: { new: <T, U>(x: T, y: U) => C<T, U>; }): any; (x: { new: <T, U>(x: T, y: U) => C<T, U>; }): any; }
+>foo4 : typeof foo4
 >x : any
 
 function foo8(x: B<string, number>);
->foo8 : { (x: B<string, number>): any; (x: I<string, number>): any; }
+>foo8 : typeof foo8
 >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; }
+>foo8 : typeof foo8
 >x : I<string, number>
 >I : I<T, U>
 
 function foo8(x: any) { }
->foo8 : { (x: B<string, number>): any; (x: I<string, number>): any; }
+>foo8 : typeof foo8
 >x : any
 
 function foo9(x: B<string, number>);
->foo9 : { (x: B<string, number>): any; (x: C<string, number>): any; }
+>foo9 : typeof foo9
 >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; }
+>foo9 : typeof foo9
 >x : C<string, number>
 >C : C<T, U>
 
 function foo9(x: any) { }
->foo9 : { (x: B<string, number>): any; (x: C<string, number>): any; }
+>foo9 : typeof 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; }
+>foo10 : typeof foo10
 >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; }
+>foo10 : typeof foo10
 >x : new <T, U>(x: T, y?: U) => B<T, U>
 >a : new <T, U>(x: T, y?: U) => B<T, U>
 
 function foo10(x: any) { }
->foo10 : { (x: B<string, number>): any; (x: new <T, U>(x: T, y?: U) => B<T, U>): any; }
+>foo10 : typeof 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; }
+>foo11 : typeof foo11
 >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; }
+>foo11 : typeof foo11
 >x : { new: <T, U>(x: T, y: U) => C<T, U>; }
 >b : { new: <T, U>(x: T, y: U) => C<T, U>; }
 
 function foo11(x: any) { }
->foo11 : { (x: B<string, number>): any; (x: { new: <T, U>(x: T, y: U) => C<T, U>; }): any; }
+>foo11 : typeof foo11
 >x : any
 
 function foo12(x: I<string, number>);
->foo12 : { (x: I<string, number>): any; (x: C<string, number>): any; }
+>foo12 : typeof foo12
 >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; }
+>foo12 : typeof foo12
 >x : C<string, number>
 >C : C<T, U>
 
 function foo12(x: any) { }
->foo12 : { (x: I<string, number>): any; (x: C<string, number>): any; }
+>foo12 : typeof foo12
 >x : any
 
 function foo12b(x: I2);
->foo12b : { (x: I2): any; (x: C<string, number>): any; }
+>foo12b : typeof foo12b
 >x : I2
 >I2 : I2
 
 function foo12b(x: C<string, number>); // BUG 832086
->foo12b : { (x: I2): any; (x: C<string, number>): any; }
+>foo12b : typeof foo12b
 >x : C<string, number>
 >C : C<T, U>
 
 function foo12b(x: any) { }
->foo12b : { (x: I2): any; (x: C<string, number>): any; }
+>foo12b : typeof 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; }
+>foo13 : typeof foo13
 >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; }
+>foo13 : typeof foo13
 >x : new <T, U>(x: T, y?: U) => B<T, U>
 >a : new <T, U>(x: T, y?: U) => B<T, U>
 
 function foo13(x: any) { }
->foo13 : { (x: I<string, number>): any; (x: new <T, U>(x: T, y?: U) => B<T, U>): any; }
+>foo13 : typeof 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; }
+>foo14 : typeof foo14
 >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; }
+>foo14 : typeof foo14
 >x : { new: <T, U>(x: T, y: U) => C<T, U>; }
 >b : { new: <T, U>(x: T, y: U) => C<T, U>; }
 
 function foo14(x: any) { }
->foo14 : { (x: I<string, number>): any; (x: { new: <T, U>(x: T, y: U) => C<T, U>; }): any; }
+>foo14 : typeof foo14
 >x : any
 
diff --git a/tests/baselines/reference/objectTypesIdentityWithNumericIndexers1.types b/tests/baselines/reference/objectTypesIdentityWithNumericIndexers1.types
index ab83b0c78f0..7182fd542de 100644
--- a/tests/baselines/reference/objectTypesIdentityWithNumericIndexers1.types
+++ b/tests/baselines/reference/objectTypesIdentityWithNumericIndexers1.types
@@ -54,325 +54,325 @@ var b: { [x: number]: string; } = { foo: '' };
 >foo : string
 
 function foo1(x: A);
->foo1 : { (x: A): any; (x: A): any; }
+>foo1 : typeof foo1
 >x : A
 >A : A
 
 function foo1(x: A); // error
->foo1 : { (x: A): any; (x: A): any; }
+>foo1 : typeof foo1
 >x : A
 >A : A
 
 function foo1(x: any) { }
->foo1 : { (x: A): any; (x: A): any; }
+>foo1 : typeof foo1
 >x : any
 
 function foo1b(x: B);
->foo1b : { (x: B): any; (x: B): any; }
+>foo1b : typeof foo1b
 >x : B
 >B : B
 
 function foo1b(x: B); // error
->foo1b : { (x: B): any; (x: B): any; }
+>foo1b : typeof foo1b
 >x : B
 >B : B
 
 function foo1b(x: any) { }
->foo1b : { (x: B): any; (x: B): any; }
+>foo1b : typeof foo1b
 >x : any
 
 function foo1c(x: C<string>);
->foo1c : { (x: C<string>): any; (x: C<string>): any; }
+>foo1c : typeof foo1c
 >x : C<string>
 >C : C<T>
 
 function foo1c(x: C<string>); // error
->foo1c : { (x: C<string>): any; (x: C<string>): any; }
+>foo1c : typeof foo1c
 >x : C<string>
 >C : C<T>
 
 function foo1c(x: any) { }
->foo1c : { (x: C<string>): any; (x: C<string>): any; }
+>foo1c : typeof foo1c
 >x : any
 
 function foo2(x: I);
->foo2 : { (x: I): any; (x: I): any; }
+>foo2 : typeof foo2
 >x : I
 >I : I
 
 function foo2(x: I); // error
->foo2 : { (x: I): any; (x: I): any; }
+>foo2 : typeof foo2
 >x : I
 >I : I
 
 function foo2(x: any) { }
->foo2 : { (x: I): any; (x: I): any; }
+>foo2 : typeof foo2
 >x : any
 
 function foo3(x: typeof a);
->foo3 : { (x: { [x: number]: string; }): any; (x: { [x: number]: string; }): any; }
+>foo3 : typeof foo3
 >x : { [x: number]: string; }
 >a : { [x: number]: string; }
 
 function foo3(x: typeof a); // error
->foo3 : { (x: { [x: number]: string; }): any; (x: { [x: number]: string; }): any; }
+>foo3 : typeof foo3
 >x : { [x: number]: string; }
 >a : { [x: number]: string; }
 
 function foo3(x: any) { }
->foo3 : { (x: { [x: number]: string; }): any; (x: { [x: number]: string; }): any; }
+>foo3 : typeof foo3
 >x : any
 
 function foo4(x: typeof b);
->foo4 : { (x: { [x: number]: string; }): any; (x: { [x: number]: string; }): any; }
+>foo4 : typeof foo4
 >x : { [x: number]: string; }
 >b : { [x: number]: string; }
 
 function foo4(x: typeof b); // error
->foo4 : { (x: { [x: number]: string; }): any; (x: { [x: number]: string; }): any; }
+>foo4 : typeof foo4
 >x : { [x: number]: string; }
 >b : { [x: number]: string; }
 
 function foo4(x: any) { }
->foo4 : { (x: { [x: number]: string; }): any; (x: { [x: number]: string; }): any; }
+>foo4 : typeof foo4
 >x : any
 
 function foo5(x: A);
->foo5 : { (x: A): any; (x: B): any; }
+>foo5 : typeof foo5
 >x : A
 >A : A
 
 function foo5(x: B); // error
->foo5 : { (x: A): any; (x: B): any; }
+>foo5 : typeof foo5
 >x : B
 >B : B
 
 function foo5(x: any) { }
->foo5 : { (x: A): any; (x: B): any; }
+>foo5 : typeof foo5
 >x : any
 
 function foo5b(x: A);
->foo5b : { (x: A): any; (x: C<string>): any; }
+>foo5b : typeof foo5b
 >x : A
 >A : A
 
 function foo5b(x: C<string>); // error
->foo5b : { (x: A): any; (x: C<string>): any; }
+>foo5b : typeof foo5b
 >x : C<string>
 >C : C<T>
 
 function foo5b(x: any) { }
->foo5b : { (x: A): any; (x: C<string>): any; }
+>foo5b : typeof foo5b
 >x : any
 
 function foo5c(x: A);
->foo5c : { (x: A): any; (x: PA): any; }
+>foo5c : typeof foo5c
 >x : A
 >A : A
 
 function foo5c(x: PA); // error
->foo5c : { (x: A): any; (x: PA): any; }
+>foo5c : typeof foo5c
 >x : PA
 >PA : PA
 
 function foo5c(x: any) { }
->foo5c : { (x: A): any; (x: PA): any; }
+>foo5c : typeof foo5c
 >x : any
 
 function foo5d(x: A);
->foo5d : { (x: A): any; (x: PB): any; }
+>foo5d : typeof foo5d
 >x : A
 >A : A
 
 function foo5d(x: PB); // error
->foo5d : { (x: A): any; (x: PB): any; }
+>foo5d : typeof foo5d
 >x : PB
 >PB : PB
 
 function foo5d(x: any) { }
->foo5d : { (x: A): any; (x: PB): any; }
+>foo5d : typeof foo5d
 >x : any
 
 function foo6(x: A);
->foo6 : { (x: A): any; (x: I): any; }
+>foo6 : typeof foo6
 >x : A
 >A : A
 
 function foo6(x: I); // error
->foo6 : { (x: A): any; (x: I): any; }
+>foo6 : typeof foo6
 >x : I
 >I : I
 
 function foo6(x: any) { }
->foo6 : { (x: A): any; (x: I): any; }
+>foo6 : typeof foo6
 >x : any
 
 function foo7(x: A);
->foo7 : { (x: A): any; (x: { [x: number]: string; }): any; }
+>foo7 : typeof foo7
 >x : A
 >A : A
 
 function foo7(x: typeof a); // error
->foo7 : { (x: A): any; (x: { [x: number]: string; }): any; }
+>foo7 : typeof foo7
 >x : { [x: number]: string; }
 >a : { [x: number]: string; }
 
 function foo7(x: any) { }
->foo7 : { (x: A): any; (x: { [x: number]: string; }): any; }
+>foo7 : typeof foo7
 >x : any
 
 function foo8(x: B);
->foo8 : { (x: B): any; (x: I): any; }
+>foo8 : typeof foo8
 >x : B
 >B : B
 
 function foo8(x: I); // error
->foo8 : { (x: B): any; (x: I): any; }
+>foo8 : typeof foo8
 >x : I
 >I : I
 
 function foo8(x: any) { }
->foo8 : { (x: B): any; (x: I): any; }
+>foo8 : typeof foo8
 >x : any
 
 function foo9(x: B);
->foo9 : { (x: B): any; (x: C<string>): any; }
+>foo9 : typeof foo9
 >x : B
 >B : B
 
 function foo9(x: C<string>); // error
->foo9 : { (x: B): any; (x: C<string>): any; }
+>foo9 : typeof foo9
 >x : C<string>
 >C : C<T>
 
 function foo9(x: any) { }
->foo9 : { (x: B): any; (x: C<string>): any; }
+>foo9 : typeof foo9
 >x : any
 
 function foo10(x: B);
->foo10 : { (x: B): any; (x: { [x: number]: string; }): any; }
+>foo10 : typeof foo10
 >x : B
 >B : B
 
 function foo10(x: typeof a); // error
->foo10 : { (x: B): any; (x: { [x: number]: string; }): any; }
+>foo10 : typeof foo10
 >x : { [x: number]: string; }
 >a : { [x: number]: string; }
 
 function foo10(x: any) { }
->foo10 : { (x: B): any; (x: { [x: number]: string; }): any; }
+>foo10 : typeof foo10
 >x : any
 
 function foo11(x: B);
->foo11 : { (x: B): any; (x: { [x: number]: string; }): any; }
+>foo11 : typeof foo11
 >x : B
 >B : B
 
 function foo11(x: typeof b); // error
->foo11 : { (x: B): any; (x: { [x: number]: string; }): any; }
+>foo11 : typeof foo11
 >x : { [x: number]: string; }
 >b : { [x: number]: string; }
 
 function foo11(x: any) { }
->foo11 : { (x: B): any; (x: { [x: number]: string; }): any; }
+>foo11 : typeof foo11
 >x : any
 
 function foo11b(x: B);
->foo11b : { (x: B): any; (x: PA): any; }
+>foo11b : typeof foo11b
 >x : B
 >B : B
 
 function foo11b(x: PA); // error
->foo11b : { (x: B): any; (x: PA): any; }
+>foo11b : typeof foo11b
 >x : PA
 >PA : PA
 
 function foo11b(x: any) { }
->foo11b : { (x: B): any; (x: PA): any; }
+>foo11b : typeof foo11b
 >x : any
 
 function foo11c(x: B);
->foo11c : { (x: B): any; (x: PB): any; }
+>foo11c : typeof foo11c
 >x : B
 >B : B
 
 function foo11c(x: PB); // error
->foo11c : { (x: B): any; (x: PB): any; }
+>foo11c : typeof foo11c
 >x : PB
 >PB : PB
 
 function foo11c(x: any) { }
->foo11c : { (x: B): any; (x: PB): any; }
+>foo11c : typeof foo11c
 >x : any
 
 function foo12(x: I);
->foo12 : { (x: I): any; (x: C<string>): any; }
+>foo12 : typeof foo12
 >x : I
 >I : I
 
 function foo12(x: C<string>); // error
->foo12 : { (x: I): any; (x: C<string>): any; }
+>foo12 : typeof foo12
 >x : C<string>
 >C : C<T>
 
 function foo12(x: any) { }
->foo12 : { (x: I): any; (x: C<string>): any; }
+>foo12 : typeof foo12
 >x : any
 
 function foo13(x: I);
->foo13 : { (x: I): any; (x: { [x: number]: string; }): any; }
+>foo13 : typeof foo13
 >x : I
 >I : I
 
 function foo13(x: typeof a); // error
->foo13 : { (x: I): any; (x: { [x: number]: string; }): any; }
+>foo13 : typeof foo13
 >x : { [x: number]: string; }
 >a : { [x: number]: string; }
 
 function foo13(x: any) { }
->foo13 : { (x: I): any; (x: { [x: number]: string; }): any; }
+>foo13 : typeof foo13
 >x : any
 
 function foo14(x: I);
->foo14 : { (x: I): any; (x: { [x: number]: string; }): any; }
+>foo14 : typeof foo14
 >x : I
 >I : I
 
 function foo14(x: typeof b); // error
->foo14 : { (x: I): any; (x: { [x: number]: string; }): any; }
+>foo14 : typeof foo14
 >x : { [x: number]: string; }
 >b : { [x: number]: string; }
 
 function foo14(x: any) { }
->foo14 : { (x: I): any; (x: { [x: number]: string; }): any; }
+>foo14 : typeof foo14
 >x : any
 
 function foo15(x: I);
->foo15 : { (x: I): any; (x: PA): any; }
+>foo15 : typeof foo15
 >x : I
 >I : I
 
 function foo15(x: PA); // error
->foo15 : { (x: I): any; (x: PA): any; }
+>foo15 : typeof foo15
 >x : PA
 >PA : PA
 
 function foo15(x: any) { }
->foo15 : { (x: I): any; (x: PA): any; }
+>foo15 : typeof foo15
 >x : any
 
 function foo16(x: I);
->foo16 : { (x: I): any; (x: PB): any; }
+>foo16 : typeof foo16
 >x : I
 >I : I
 
 function foo16(x: PB); // error
->foo16 : { (x: I): any; (x: PB): any; }
+>foo16 : typeof foo16
 >x : PB
 >PB : PB
 
 function foo16(x: any) { }
->foo16 : { (x: I): any; (x: PB): any; }
+>foo16 : typeof foo16
 >x : any
 
 
diff --git a/tests/baselines/reference/objectTypesIdentityWithNumericIndexers2.types b/tests/baselines/reference/objectTypesIdentityWithNumericIndexers2.types
index cd8f19b2b7e..dc5616ebba6 100644
--- a/tests/baselines/reference/objectTypesIdentityWithNumericIndexers2.types
+++ b/tests/baselines/reference/objectTypesIdentityWithNumericIndexers2.types
@@ -70,328 +70,328 @@ var b: { [x: number]: Derived; } = { foo: <Derived>null };
 >Derived : Derived
 
 function foo1(x: A);
->foo1 : { (x: A): any; (x: A): any; }
+>foo1 : typeof foo1
 >x : A
 >A : A
 
 function foo1(x: A); // error
->foo1 : { (x: A): any; (x: A): any; }
+>foo1 : typeof foo1
 >x : A
 >A : A
 
 function foo1(x: any) { }
->foo1 : { (x: A): any; (x: A): any; }
+>foo1 : typeof foo1
 >x : any
 
 function foo1b(x: B);
->foo1b : { (x: B): any; (x: B): any; }
+>foo1b : typeof foo1b
 >x : B
 >B : B
 
 function foo1b(x: B); // error
->foo1b : { (x: B): any; (x: B): any; }
+>foo1b : typeof foo1b
 >x : B
 >B : B
 
 function foo1b(x: any) { }
->foo1b : { (x: B): any; (x: B): any; }
+>foo1b : typeof foo1b
 >x : any
 
 function foo1c(x: C<string>);
->foo1c : { (x: C<string>): any; (x: C<string>): any; }
+>foo1c : typeof foo1c
 >x : C<string>
 >C : C<T>
 
 function foo1c(x: C<string>); // error
->foo1c : { (x: C<string>): any; (x: C<string>): any; }
+>foo1c : typeof foo1c
 >x : C<string>
 >C : C<T>
 
 function foo1c(x: any) { }
->foo1c : { (x: C<string>): any; (x: C<string>): any; }
+>foo1c : typeof foo1c
 >x : any
 
 function foo2(x: I);
->foo2 : { (x: I): any; (x: I): any; }
+>foo2 : typeof foo2
 >x : I
 >I : I
 
 function foo2(x: I); // error
->foo2 : { (x: I): any; (x: I): any; }
+>foo2 : typeof foo2
 >x : I
 >I : I
 
 function foo2(x: any) { }
->foo2 : { (x: I): any; (x: I): any; }
+>foo2 : typeof foo2
 >x : any
 
 function foo3(x: typeof a);
->foo3 : { (x: { [x: number]: Base; }): any; (x: { [x: number]: Base; }): any; }
+>foo3 : typeof foo3
 >x : { [x: number]: Base; }
 >a : { [x: number]: Base; }
 
 function foo3(x: typeof a); // error
->foo3 : { (x: { [x: number]: Base; }): any; (x: { [x: number]: Base; }): any; }
+>foo3 : typeof foo3
 >x : { [x: number]: Base; }
 >a : { [x: number]: Base; }
 
 function foo3(x: any) { }
->foo3 : { (x: { [x: number]: Base; }): any; (x: { [x: number]: Base; }): any; }
+>foo3 : typeof foo3
 >x : any
 
 function foo4(x: typeof b);
->foo4 : { (x: { [x: number]: Derived; }): any; (x: { [x: number]: Derived; }): any; }
+>foo4 : typeof foo4
 >x : { [x: number]: Derived; }
 >b : { [x: number]: Derived; }
 
 function foo4(x: typeof b); // error
->foo4 : { (x: { [x: number]: Derived; }): any; (x: { [x: number]: Derived; }): any; }
+>foo4 : typeof foo4
 >x : { [x: number]: Derived; }
 >b : { [x: number]: Derived; }
 
 function foo4(x: any) { }
->foo4 : { (x: { [x: number]: Derived; }): any; (x: { [x: number]: Derived; }): any; }
+>foo4 : typeof foo4
 >x : any
 
 function foo5(x: A);
->foo5 : { (x: A): any; (x: B): any; }
+>foo5 : typeof foo5
 >x : A
 >A : A
 
 function foo5(x: B); // ok
->foo5 : { (x: A): any; (x: B): any; }
+>foo5 : typeof foo5
 >x : B
 >B : B
 
 function foo5(x: any) { }
->foo5 : { (x: A): any; (x: B): any; }
+>foo5 : typeof foo5
 >x : any
 
 function foo5b(x: A);
->foo5b : { (x: A): any; (x: C<Derived>): any; }
+>foo5b : typeof foo5b
 >x : A
 >A : A
 
 function foo5b(x: C<Derived>); // ok
->foo5b : { (x: A): any; (x: C<Derived>): any; }
+>foo5b : typeof foo5b
 >x : C<Derived>
 >C : C<T>
 >Derived : Derived
 
 function foo5b(x: any) { }
->foo5b : { (x: A): any; (x: C<Derived>): any; }
+>foo5b : typeof foo5b
 >x : any
 
 function foo5c(x: A);
->foo5c : { (x: A): any; (x: PA): any; }
+>foo5c : typeof foo5c
 >x : A
 >A : A
 
 function foo5c(x: PA); // error
->foo5c : { (x: A): any; (x: PA): any; }
+>foo5c : typeof foo5c
 >x : PA
 >PA : PA
 
 function foo5c(x: any) { }
->foo5c : { (x: A): any; (x: PA): any; }
+>foo5c : typeof foo5c
 >x : any
 
 function foo5d(x: A);
->foo5d : { (x: A): any; (x: PB): any; }
+>foo5d : typeof foo5d
 >x : A
 >A : A
 
 function foo5d(x: PB); // ok
->foo5d : { (x: A): any; (x: PB): any; }
+>foo5d : typeof foo5d
 >x : PB
 >PB : PB
 
 function foo5d(x: any) { }
->foo5d : { (x: A): any; (x: PB): any; }
+>foo5d : typeof foo5d
 >x : any
 
 function foo6(x: A);
->foo6 : { (x: A): any; (x: I): any; }
+>foo6 : typeof foo6
 >x : A
 >A : A
 
 function foo6(x: I); // ok
->foo6 : { (x: A): any; (x: I): any; }
+>foo6 : typeof foo6
 >x : I
 >I : I
 
 function foo6(x: any) { }
->foo6 : { (x: A): any; (x: I): any; }
+>foo6 : typeof foo6
 >x : any
 
 function foo7(x: A);
->foo7 : { (x: A): any; (x: { [x: number]: Base; }): any; }
+>foo7 : typeof foo7
 >x : A
 >A : A
 
 function foo7(x: typeof a); // error
->foo7 : { (x: A): any; (x: { [x: number]: Base; }): any; }
+>foo7 : typeof foo7
 >x : { [x: number]: Base; }
 >a : { [x: number]: Base; }
 
 function foo7(x: any) { }
->foo7 : { (x: A): any; (x: { [x: number]: Base; }): any; }
+>foo7 : typeof foo7
 >x : any
 
 function foo8(x: B);
->foo8 : { (x: B): any; (x: I): any; }
+>foo8 : typeof foo8
 >x : B
 >B : B
 
 function foo8(x: I); // error
->foo8 : { (x: B): any; (x: I): any; }
+>foo8 : typeof foo8
 >x : I
 >I : I
 
 function foo8(x: any) { }
->foo8 : { (x: B): any; (x: I): any; }
+>foo8 : typeof foo8
 >x : any
 
 function foo9(x: B);
->foo9 : { (x: B): any; (x: C<Base>): any; }
+>foo9 : typeof foo9
 >x : B
 >B : B
 
 function foo9(x: C<Base>); // ok
->foo9 : { (x: B): any; (x: C<Base>): any; }
+>foo9 : typeof foo9
 >x : C<Base>
 >C : C<T>
 >Base : Base
 
 function foo9(x: any) { }
->foo9 : { (x: B): any; (x: C<Base>): any; }
+>foo9 : typeof foo9
 >x : any
 
 function foo10(x: B);
->foo10 : { (x: B): any; (x: { [x: number]: Base; }): any; }
+>foo10 : typeof foo10
 >x : B
 >B : B
 
 function foo10(x: typeof a); // ok
->foo10 : { (x: B): any; (x: { [x: number]: Base; }): any; }
+>foo10 : typeof foo10
 >x : { [x: number]: Base; }
 >a : { [x: number]: Base; }
 
 function foo10(x: any) { }
->foo10 : { (x: B): any; (x: { [x: number]: Base; }): any; }
+>foo10 : typeof foo10
 >x : any
 
 function foo11(x: B);
->foo11 : { (x: B): any; (x: { [x: number]: Derived; }): any; }
+>foo11 : typeof foo11
 >x : B
 >B : B
 
 function foo11(x: typeof b); // error
->foo11 : { (x: B): any; (x: { [x: number]: Derived; }): any; }
+>foo11 : typeof foo11
 >x : { [x: number]: Derived; }
 >b : { [x: number]: Derived; }
 
 function foo11(x: any) { }
->foo11 : { (x: B): any; (x: { [x: number]: Derived; }): any; }
+>foo11 : typeof foo11
 >x : any
 
 function foo11b(x: B);
->foo11b : { (x: B): any; (x: PA): any; }
+>foo11b : typeof foo11b
 >x : B
 >B : B
 
 function foo11b(x: PA); // ok
->foo11b : { (x: B): any; (x: PA): any; }
+>foo11b : typeof foo11b
 >x : PA
 >PA : PA
 
 function foo11b(x: any) { }
->foo11b : { (x: B): any; (x: PA): any; }
+>foo11b : typeof foo11b
 >x : any
 
 function foo11c(x: B);
->foo11c : { (x: B): any; (x: PB): any; }
+>foo11c : typeof foo11c
 >x : B
 >B : B
 
 function foo11c(x: PB); // error
->foo11c : { (x: B): any; (x: PB): any; }
+>foo11c : typeof foo11c
 >x : PB
 >PB : PB
 
 function foo11c(x: any) { }
->foo11c : { (x: B): any; (x: PB): any; }
+>foo11c : typeof foo11c
 >x : any
 
 function foo12(x: I);
->foo12 : { (x: I): any; (x: C<Derived>): any; }
+>foo12 : typeof foo12
 >x : I
 >I : I
 
 function foo12(x: C<Derived>); // error
->foo12 : { (x: I): any; (x: C<Derived>): any; }
+>foo12 : typeof foo12
 >x : C<Derived>
 >C : C<T>
 >Derived : Derived
 
 function foo12(x: any) { }
->foo12 : { (x: I): any; (x: C<Derived>): any; }
+>foo12 : typeof foo12
 >x : any
 
 function foo13(x: I);
->foo13 : { (x: I): any; (x: { [x: number]: Base; }): any; }
+>foo13 : typeof foo13
 >x : I
 >I : I
 
 function foo13(x: typeof a); // ok
->foo13 : { (x: I): any; (x: { [x: number]: Base; }): any; }
+>foo13 : typeof foo13
 >x : { [x: number]: Base; }
 >a : { [x: number]: Base; }
 
 function foo13(x: any) { }
->foo13 : { (x: I): any; (x: { [x: number]: Base; }): any; }
+>foo13 : typeof foo13
 >x : any
 
 function foo14(x: I);
->foo14 : { (x: I): any; (x: { [x: number]: Derived; }): any; }
+>foo14 : typeof foo14
 >x : I
 >I : I
 
 function foo14(x: typeof b); // error
->foo14 : { (x: I): any; (x: { [x: number]: Derived; }): any; }
+>foo14 : typeof foo14
 >x : { [x: number]: Derived; }
 >b : { [x: number]: Derived; }
 
 function foo14(x: any) { }
->foo14 : { (x: I): any; (x: { [x: number]: Derived; }): any; }
+>foo14 : typeof foo14
 >x : any
 
 function foo15(x: I);
->foo15 : { (x: I): any; (x: PA): any; }
+>foo15 : typeof foo15
 >x : I
 >I : I
 
 function foo15(x: PA); // ok
->foo15 : { (x: I): any; (x: PA): any; }
+>foo15 : typeof foo15
 >x : PA
 >PA : PA
 
 function foo15(x: any) { }
->foo15 : { (x: I): any; (x: PA): any; }
+>foo15 : typeof foo15
 >x : any
 
 function foo16(x: I);
->foo16 : { (x: I): any; (x: PB): any; }
+>foo16 : typeof foo16
 >x : I
 >I : I
 
 function foo16(x: PB); // error
->foo16 : { (x: I): any; (x: PB): any; }
+>foo16 : typeof foo16
 >x : PB
 >PB : PB
 
 function foo16(x: any) { }
->foo16 : { (x: I): any; (x: PB): any; }
+>foo16 : typeof foo16
 >x : any
 
 
diff --git a/tests/baselines/reference/objectTypesIdentityWithNumericIndexers3.types b/tests/baselines/reference/objectTypesIdentityWithNumericIndexers3.types
index 6a73749fc84..d62a05d7e23 100644
--- a/tests/baselines/reference/objectTypesIdentityWithNumericIndexers3.types
+++ b/tests/baselines/reference/objectTypesIdentityWithNumericIndexers3.types
@@ -54,325 +54,325 @@ var b: { [x: number]: string; } = { foo: '' };
 >foo : string
 
 function foo1(x: A);
->foo1 : { (x: A): any; (x: A): any; }
+>foo1 : typeof foo1
 >x : A
 >A : A
 
 function foo1(x: A); // error
->foo1 : { (x: A): any; (x: A): any; }
+>foo1 : typeof foo1
 >x : A
 >A : A
 
 function foo1(x: any) { }
->foo1 : { (x: A): any; (x: A): any; }
+>foo1 : typeof foo1
 >x : any
 
 function foo1b(x: B);
->foo1b : { (x: B): any; (x: B): any; }
+>foo1b : typeof foo1b
 >x : B
 >B : B
 
 function foo1b(x: B); // error
->foo1b : { (x: B): any; (x: B): any; }
+>foo1b : typeof foo1b
 >x : B
 >B : B
 
 function foo1b(x: any) { }
->foo1b : { (x: B): any; (x: B): any; }
+>foo1b : typeof foo1b
 >x : any
 
 function foo1c(x: C<string>);
->foo1c : { (x: C<string>): any; (x: C<string>): any; }
+>foo1c : typeof foo1c
 >x : C<string>
 >C : C<T>
 
 function foo1c(x: C<string>); // error
->foo1c : { (x: C<string>): any; (x: C<string>): any; }
+>foo1c : typeof foo1c
 >x : C<string>
 >C : C<T>
 
 function foo1c(x: any) { }
->foo1c : { (x: C<string>): any; (x: C<string>): any; }
+>foo1c : typeof foo1c
 >x : any
 
 function foo2(x: I);
->foo2 : { (x: I): any; (x: I): any; }
+>foo2 : typeof foo2
 >x : I
 >I : I
 
 function foo2(x: I); // error
->foo2 : { (x: I): any; (x: I): any; }
+>foo2 : typeof foo2
 >x : I
 >I : I
 
 function foo2(x: any) { }
->foo2 : { (x: I): any; (x: I): any; }
+>foo2 : typeof foo2
 >x : any
 
 function foo3(x: typeof a);
->foo3 : { (x: { [x: string]: string; }): any; (x: { [x: string]: string; }): any; }
+>foo3 : typeof foo3
 >x : { [x: string]: string; }
 >a : { [x: string]: string; }
 
 function foo3(x: typeof a); // error
->foo3 : { (x: { [x: string]: string; }): any; (x: { [x: string]: string; }): any; }
+>foo3 : typeof foo3
 >x : { [x: string]: string; }
 >a : { [x: string]: string; }
 
 function foo3(x: any) { }
->foo3 : { (x: { [x: string]: string; }): any; (x: { [x: string]: string; }): any; }
+>foo3 : typeof foo3
 >x : any
 
 function foo4(x: typeof b);
->foo4 : { (x: { [x: number]: string; }): any; (x: { [x: number]: string; }): any; }
+>foo4 : typeof foo4
 >x : { [x: number]: string; }
 >b : { [x: number]: string; }
 
 function foo4(x: typeof b); // error
->foo4 : { (x: { [x: number]: string; }): any; (x: { [x: number]: string; }): any; }
+>foo4 : typeof foo4
 >x : { [x: number]: string; }
 >b : { [x: number]: string; }
 
 function foo4(x: any) { }
->foo4 : { (x: { [x: number]: string; }): any; (x: { [x: number]: string; }): any; }
+>foo4 : typeof foo4
 >x : any
 
 function foo5(x: A);
->foo5 : { (x: A): any; (x: B): any; }
+>foo5 : typeof foo5
 >x : A
 >A : A
 
 function foo5(x: B); // ok
->foo5 : { (x: A): any; (x: B): any; }
+>foo5 : typeof foo5
 >x : B
 >B : B
 
 function foo5(x: any) { }
->foo5 : { (x: A): any; (x: B): any; }
+>foo5 : typeof foo5
 >x : any
 
 function foo5b(x: A);
->foo5b : { (x: A): any; (x: C<string>): any; }
+>foo5b : typeof foo5b
 >x : A
 >A : A
 
 function foo5b(x: C<string>); // error
->foo5b : { (x: A): any; (x: C<string>): any; }
+>foo5b : typeof foo5b
 >x : C<string>
 >C : C<T>
 
 function foo5b(x: any) { }
->foo5b : { (x: A): any; (x: C<string>): any; }
+>foo5b : typeof foo5b
 >x : any
 
 function foo5c(x: A);
->foo5c : { (x: A): any; (x: PA): any; }
+>foo5c : typeof foo5c
 >x : A
 >A : A
 
 function foo5c(x: PA); // error
->foo5c : { (x: A): any; (x: PA): any; }
+>foo5c : typeof foo5c
 >x : PA
 >PA : PA
 
 function foo5c(x: any) { }
->foo5c : { (x: A): any; (x: PA): any; }
+>foo5c : typeof foo5c
 >x : any
 
 function foo5d(x: A);
->foo5d : { (x: A): any; (x: PB): any; }
+>foo5d : typeof foo5d
 >x : A
 >A : A
 
 function foo5d(x: PB); // ok
->foo5d : { (x: A): any; (x: PB): any; }
+>foo5d : typeof foo5d
 >x : PB
 >PB : PB
 
 function foo5d(x: any) { }
->foo5d : { (x: A): any; (x: PB): any; }
+>foo5d : typeof foo5d
 >x : any
 
 function foo6(x: A);
->foo6 : { (x: A): any; (x: I): any; }
+>foo6 : typeof foo6
 >x : A
 >A : A
 
 function foo6(x: I); // ok
->foo6 : { (x: A): any; (x: I): any; }
+>foo6 : typeof foo6
 >x : I
 >I : I
 
 function foo6(x: any) { }
->foo6 : { (x: A): any; (x: I): any; }
+>foo6 : typeof foo6
 >x : any
 
 function foo7(x: A);
->foo7 : { (x: A): any; (x: { [x: string]: string; }): any; }
+>foo7 : typeof foo7
 >x : A
 >A : A
 
 function foo7(x: typeof a); // ok
->foo7 : { (x: A): any; (x: { [x: string]: string; }): any; }
+>foo7 : typeof foo7
 >x : { [x: string]: string; }
 >a : { [x: string]: string; }
 
 function foo7(x: any) { }
->foo7 : { (x: A): any; (x: { [x: string]: string; }): any; }
+>foo7 : typeof foo7
 >x : any
 
 function foo8(x: B);
->foo8 : { (x: B): any; (x: I): any; }
+>foo8 : typeof foo8
 >x : B
 >B : B
 
 function foo8(x: I); // error
->foo8 : { (x: B): any; (x: I): any; }
+>foo8 : typeof foo8
 >x : I
 >I : I
 
 function foo8(x: any) { }
->foo8 : { (x: B): any; (x: I): any; }
+>foo8 : typeof foo8
 >x : any
 
 function foo9(x: B);
->foo9 : { (x: B): any; (x: C<string>): any; }
+>foo9 : typeof foo9
 >x : B
 >B : B
 
 function foo9(x: C<string>); // ok
->foo9 : { (x: B): any; (x: C<string>): any; }
+>foo9 : typeof foo9
 >x : C<string>
 >C : C<T>
 
 function foo9(x: any) { }
->foo9 : { (x: B): any; (x: C<string>): any; }
+>foo9 : typeof foo9
 >x : any
 
 function foo10(x: B);
->foo10 : { (x: B): any; (x: { [x: string]: string; }): any; }
+>foo10 : typeof foo10
 >x : B
 >B : B
 
 function foo10(x: typeof a); // error
->foo10 : { (x: B): any; (x: { [x: string]: string; }): any; }
+>foo10 : typeof foo10
 >x : { [x: string]: string; }
 >a : { [x: string]: string; }
 
 function foo10(x: any) { }
->foo10 : { (x: B): any; (x: { [x: string]: string; }): any; }
+>foo10 : typeof foo10
 >x : any
 
 function foo11(x: B);
->foo11 : { (x: B): any; (x: { [x: number]: string; }): any; }
+>foo11 : typeof foo11
 >x : B
 >B : B
 
 function foo11(x: typeof b); // ok
->foo11 : { (x: B): any; (x: { [x: number]: string; }): any; }
+>foo11 : typeof foo11
 >x : { [x: number]: string; }
 >b : { [x: number]: string; }
 
 function foo11(x: any) { }
->foo11 : { (x: B): any; (x: { [x: number]: string; }): any; }
+>foo11 : typeof foo11
 >x : any
 
 function foo11b(x: B);
->foo11b : { (x: B): any; (x: PA): any; }
+>foo11b : typeof foo11b
 >x : B
 >B : B
 
 function foo11b(x: PA); // ok
->foo11b : { (x: B): any; (x: PA): any; }
+>foo11b : typeof foo11b
 >x : PA
 >PA : PA
 
 function foo11b(x: any) { }
->foo11b : { (x: B): any; (x: PA): any; }
+>foo11b : typeof foo11b
 >x : any
 
 function foo11c(x: B);
->foo11c : { (x: B): any; (x: PB): any; }
+>foo11c : typeof foo11c
 >x : B
 >B : B
 
 function foo11c(x: PB); // error
->foo11c : { (x: B): any; (x: PB): any; }
+>foo11c : typeof foo11c
 >x : PB
 >PB : PB
 
 function foo11c(x: any) { }
->foo11c : { (x: B): any; (x: PB): any; }
+>foo11c : typeof foo11c
 >x : any
 
 function foo12(x: I);
->foo12 : { (x: I): any; (x: C<string>): any; }
+>foo12 : typeof foo12
 >x : I
 >I : I
 
 function foo12(x: C<string>); // ok
->foo12 : { (x: I): any; (x: C<string>): any; }
+>foo12 : typeof foo12
 >x : C<string>
 >C : C<T>
 
 function foo12(x: any) { }
->foo12 : { (x: I): any; (x: C<string>): any; }
+>foo12 : typeof foo12
 >x : any
 
 function foo13(x: I);
->foo13 : { (x: I): any; (x: { [x: string]: string; }): any; }
+>foo13 : typeof foo13
 >x : I
 >I : I
 
 function foo13(x: typeof a); // error
->foo13 : { (x: I): any; (x: { [x: string]: string; }): any; }
+>foo13 : typeof foo13
 >x : { [x: string]: string; }
 >a : { [x: string]: string; }
 
 function foo13(x: any) { }
->foo13 : { (x: I): any; (x: { [x: string]: string; }): any; }
+>foo13 : typeof foo13
 >x : any
 
 function foo14(x: I);
->foo14 : { (x: I): any; (x: { [x: number]: string; }): any; }
+>foo14 : typeof foo14
 >x : I
 >I : I
 
 function foo14(x: typeof b); // ok
->foo14 : { (x: I): any; (x: { [x: number]: string; }): any; }
+>foo14 : typeof foo14
 >x : { [x: number]: string; }
 >b : { [x: number]: string; }
 
 function foo14(x: any) { }
->foo14 : { (x: I): any; (x: { [x: number]: string; }): any; }
+>foo14 : typeof foo14
 >x : any
 
 function foo15(x: I);
->foo15 : { (x: I): any; (x: PA): any; }
+>foo15 : typeof foo15
 >x : I
 >I : I
 
 function foo15(x: PA); // ok
->foo15 : { (x: I): any; (x: PA): any; }
+>foo15 : typeof foo15
 >x : PA
 >PA : PA
 
 function foo15(x: any) { }
->foo15 : { (x: I): any; (x: PA): any; }
+>foo15 : typeof foo15
 >x : any
 
 function foo16(x: I);
->foo16 : { (x: I): any; (x: PB): any; }
+>foo16 : typeof foo16
 >x : I
 >I : I
 
 function foo16(x: PB); // error
->foo16 : { (x: I): any; (x: PB): any; }
+>foo16 : typeof foo16
 >x : PB
 >PB : PB
 
 function foo16(x: any) { }
->foo16 : { (x: I): any; (x: PB): any; }
+>foo16 : typeof foo16
 >x : any
 
 
diff --git a/tests/baselines/reference/objectTypesIdentityWithOptionality.types b/tests/baselines/reference/objectTypesIdentityWithOptionality.types
index 0ca5b552bf5..4a762d39fac 100644
--- a/tests/baselines/reference/objectTypesIdentityWithOptionality.types
+++ b/tests/baselines/reference/objectTypesIdentityWithOptionality.types
@@ -41,128 +41,128 @@ var b = { foo: '' };
 >foo : string
 
 function foo2(x: I);
->foo2 : { (x: I): any; (x: I): any; }
+>foo2 : typeof foo2
 >x : I
 >I : I
 
 function foo2(x: I); // error
->foo2 : { (x: I): any; (x: I): any; }
+>foo2 : typeof foo2
 >x : I
 >I : I
 
 function foo2(x: any) { }
->foo2 : { (x: I): any; (x: I): any; }
+>foo2 : typeof foo2
 >x : any
 
 function foo3(x: typeof a);
->foo3 : { (x: { foo?: string; }): any; (x: { foo?: string; }): any; }
+>foo3 : typeof foo3
 >x : { foo?: string; }
 >a : { foo?: string; }
 
 function foo3(x: typeof a); // error
->foo3 : { (x: { foo?: string; }): any; (x: { foo?: string; }): any; }
+>foo3 : typeof foo3
 >x : { foo?: string; }
 >a : { foo?: string; }
 
 function foo3(x: any) { }
->foo3 : { (x: { foo?: string; }): any; (x: { foo?: string; }): any; }
+>foo3 : typeof foo3
 >x : any
 
 function foo6(x: A);
->foo6 : { (x: A): any; (x: I): any; }
+>foo6 : typeof foo6
 >x : A
 >A : A
 
 function foo6(x: I); // ok
->foo6 : { (x: A): any; (x: I): any; }
+>foo6 : typeof foo6
 >x : I
 >I : I
 
 function foo6(x: any) { }
->foo6 : { (x: A): any; (x: I): any; }
+>foo6 : typeof foo6
 >x : any
 
 function foo7(x: A);
->foo7 : { (x: A): any; (x: { foo?: string; }): any; }
+>foo7 : typeof foo7
 >x : A
 >A : A
 
 function foo7(x: typeof a); // ok
->foo7 : { (x: A): any; (x: { foo?: string; }): any; }
+>foo7 : typeof foo7
 >x : { foo?: string; }
 >a : { foo?: string; }
 
 function foo7(x: any) { }
->foo7 : { (x: A): any; (x: { foo?: string; }): any; }
+>foo7 : typeof foo7
 >x : any
 
 function foo8(x: B);
->foo8 : { (x: B): any; (x: I): any; }
+>foo8 : typeof foo8
 >x : B
 >B : B
 
 function foo8(x: I); // ok
->foo8 : { (x: B): any; (x: I): any; }
+>foo8 : typeof foo8
 >x : I
 >I : I
 
 function foo8(x: any) { }
->foo8 : { (x: B): any; (x: I): any; }
+>foo8 : typeof foo8
 >x : any
 
 function foo10(x: B);
->foo10 : { (x: B): any; (x: { foo?: string; }): any; }
+>foo10 : typeof foo10
 >x : B
 >B : B
 
 function foo10(x: typeof a); // ok
->foo10 : { (x: B): any; (x: { foo?: string; }): any; }
+>foo10 : typeof foo10
 >x : { foo?: string; }
 >a : { foo?: string; }
 
 function foo10(x: any) { }
->foo10 : { (x: B): any; (x: { foo?: string; }): any; }
+>foo10 : typeof foo10
 >x : any
 
 function foo12(x: I);
->foo12 : { (x: I): any; (x: C<string>): any; }
+>foo12 : typeof foo12
 >x : I
 >I : I
 
 function foo12(x: C<string>); // ok
->foo12 : { (x: I): any; (x: C<string>): any; }
+>foo12 : typeof foo12
 >x : C<string>
 >C : C<T>
 
 function foo12(x: any) { }
->foo12 : { (x: I): any; (x: C<string>): any; }
+>foo12 : typeof foo12
 >x : any
 
 function foo13(x: I);
->foo13 : { (x: I): any; (x: { foo?: string; }): any; }
+>foo13 : typeof foo13
 >x : I
 >I : I
 
 function foo13(x: typeof a); // error
->foo13 : { (x: I): any; (x: { foo?: string; }): any; }
+>foo13 : typeof foo13
 >x : { foo?: string; }
 >a : { foo?: string; }
 
 function foo13(x: any) { }
->foo13 : { (x: I): any; (x: { foo?: string; }): any; }
+>foo13 : typeof foo13
 >x : any
 
 function foo14(x: I);
->foo14 : { (x: I): any; (x: { foo: string; }): any; }
+>foo14 : typeof foo14
 >x : I
 >I : I
 
 function foo14(x: typeof b); // ok
->foo14 : { (x: I): any; (x: { foo: string; }): any; }
+>foo14 : typeof foo14
 >x : { foo: string; }
 >b : { foo: string; }
 
 function foo14(x: any) { }
->foo14 : { (x: I): any; (x: { foo: string; }): any; }
+>foo14 : typeof foo14
 >x : any
 
diff --git a/tests/baselines/reference/objectTypesIdentityWithPrivates.types b/tests/baselines/reference/objectTypesIdentityWithPrivates.types
index 391f6f1f200..6bd61edbacf 100644
--- a/tests/baselines/reference/objectTypesIdentityWithPrivates.types
+++ b/tests/baselines/reference/objectTypesIdentityWithPrivates.types
@@ -51,325 +51,325 @@ var b = { foo: '' };
 >foo : string
 
 function foo1(x: A);
->foo1 : { (x: A): any; (x: A): any; }
+>foo1 : typeof foo1
 >x : A
 >A : A
 
 function foo1(x: A); // error
->foo1 : { (x: A): any; (x: A): any; }
+>foo1 : typeof foo1
 >x : A
 >A : A
 
 function foo1(x: any) { }
->foo1 : { (x: A): any; (x: A): any; }
+>foo1 : typeof foo1
 >x : any
 
 function foo1b(x: B);
->foo1b : { (x: B): any; (x: B): any; }
+>foo1b : typeof foo1b
 >x : B
 >B : B
 
 function foo1b(x: B); // error
->foo1b : { (x: B): any; (x: B): any; }
+>foo1b : typeof foo1b
 >x : B
 >B : B
 
 function foo1b(x: any) { }
->foo1b : { (x: B): any; (x: B): any; }
+>foo1b : typeof foo1b
 >x : any
 
 function foo1c(x: C<string>);
->foo1c : { (x: C<string>): any; (x: C<string>): any; }
+>foo1c : typeof foo1c
 >x : C<string>
 >C : C<T>
 
 function foo1c(x: C<string>); // error
->foo1c : { (x: C<string>): any; (x: C<string>): any; }
+>foo1c : typeof foo1c
 >x : C<string>
 >C : C<T>
 
 function foo1c(x: any) { }
->foo1c : { (x: C<string>): any; (x: C<string>): any; }
+>foo1c : typeof foo1c
 >x : any
 
 function foo2(x: I);
->foo2 : { (x: I): any; (x: I): any; }
+>foo2 : typeof foo2
 >x : I
 >I : I
 
 function foo2(x: I); // error
->foo2 : { (x: I): any; (x: I): any; }
+>foo2 : typeof foo2
 >x : I
 >I : I
 
 function foo2(x: any) { }
->foo2 : { (x: I): any; (x: I): any; }
+>foo2 : typeof foo2
 >x : any
 
 function foo3(x: typeof a);
->foo3 : { (x: { foo: string; }): any; (x: { foo: string; }): any; }
+>foo3 : typeof foo3
 >x : { foo: string; }
 >a : { foo: string; }
 
 function foo3(x: typeof a); // error
->foo3 : { (x: { foo: string; }): any; (x: { foo: string; }): any; }
+>foo3 : typeof foo3
 >x : { foo: string; }
 >a : { foo: string; }
 
 function foo3(x: any) { }
->foo3 : { (x: { foo: string; }): any; (x: { foo: string; }): any; }
+>foo3 : typeof foo3
 >x : any
 
 function foo4(x: typeof b);
->foo4 : { (x: { foo: string; }): any; (x: { foo: string; }): any; }
+>foo4 : typeof foo4
 >x : { foo: string; }
 >b : { foo: string; }
 
 function foo4(x: typeof b); // error
->foo4 : { (x: { foo: string; }): any; (x: { foo: string; }): any; }
+>foo4 : typeof foo4
 >x : { foo: string; }
 >b : { foo: string; }
 
 function foo4(x: any) { }
->foo4 : { (x: { foo: string; }): any; (x: { foo: string; }): any; }
+>foo4 : typeof foo4
 >x : any
 
 function foo5(x: A);
->foo5 : { (x: A): any; (x: B): any; }
+>foo5 : typeof foo5
 >x : A
 >A : A
 
 function foo5(x: B); // no error
->foo5 : { (x: A): any; (x: B): any; }
+>foo5 : typeof foo5
 >x : B
 >B : B
 
 function foo5(x: any) { }
->foo5 : { (x: A): any; (x: B): any; }
+>foo5 : typeof foo5
 >x : any
 
 function foo5b(x: A);
->foo5b : { (x: A): any; (x: C<string>): any; }
+>foo5b : typeof foo5b
 >x : A
 >A : A
 
 function foo5b(x: C<string>); // no error
->foo5b : { (x: A): any; (x: C<string>): any; }
+>foo5b : typeof foo5b
 >x : C<string>
 >C : C<T>
 
 function foo5b(x: any) { }
->foo5b : { (x: A): any; (x: C<string>): any; }
+>foo5b : typeof foo5b
 >x : any
 
 function foo5c(x: A);
->foo5c : { (x: A): any; (x: PA): any; }
+>foo5c : typeof foo5c
 >x : A
 >A : A
 
 function foo5c(x: PA); // error
->foo5c : { (x: A): any; (x: PA): any; }
+>foo5c : typeof foo5c
 >x : PA
 >PA : PA
 
 function foo5c(x: any) { }
->foo5c : { (x: A): any; (x: PA): any; }
+>foo5c : typeof foo5c
 >x : any
 
 function foo5d(x: A);
->foo5d : { (x: A): any; (x: PB): any; }
+>foo5d : typeof foo5d
 >x : A
 >A : A
 
 function foo5d(x: PB); // no error
->foo5d : { (x: A): any; (x: PB): any; }
+>foo5d : typeof foo5d
 >x : PB
 >PB : PB
 
 function foo5d(x: any) { }
->foo5d : { (x: A): any; (x: PB): any; }
+>foo5d : typeof foo5d
 >x : any
 
 function foo6(x: A);
->foo6 : { (x: A): any; (x: I): any; }
+>foo6 : typeof foo6
 >x : A
 >A : A
 
 function foo6(x: I); // no error
->foo6 : { (x: A): any; (x: I): any; }
+>foo6 : typeof foo6
 >x : I
 >I : I
 
 function foo6(x: any) { }
->foo6 : { (x: A): any; (x: I): any; }
+>foo6 : typeof foo6
 >x : any
 
 function foo7(x: A);
->foo7 : { (x: A): any; (x: { foo: string; }): any; }
+>foo7 : typeof foo7
 >x : A
 >A : A
 
 function foo7(x: typeof a); // no error
->foo7 : { (x: A): any; (x: { foo: string; }): any; }
+>foo7 : typeof foo7
 >x : { foo: string; }
 >a : { foo: string; }
 
 function foo7(x: any) { }
->foo7 : { (x: A): any; (x: { foo: string; }): any; }
+>foo7 : typeof foo7
 >x : any
 
 function foo8(x: B);
->foo8 : { (x: B): any; (x: I): any; }
+>foo8 : typeof foo8
 >x : B
 >B : B
 
 function foo8(x: I); // no error
->foo8 : { (x: B): any; (x: I): any; }
+>foo8 : typeof foo8
 >x : I
 >I : I
 
 function foo8(x: any) { }
->foo8 : { (x: B): any; (x: I): any; }
+>foo8 : typeof foo8
 >x : any
 
 function foo9(x: B);
->foo9 : { (x: B): any; (x: C<string>): any; }
+>foo9 : typeof foo9
 >x : B
 >B : B
 
 function foo9(x: C<string>); // no error
->foo9 : { (x: B): any; (x: C<string>): any; }
+>foo9 : typeof foo9
 >x : C<string>
 >C : C<T>
 
 function foo9(x: any) { }
->foo9 : { (x: B): any; (x: C<string>): any; }
+>foo9 : typeof foo9
 >x : any
 
 function foo10(x: B);
->foo10 : { (x: B): any; (x: { foo: string; }): any; }
+>foo10 : typeof foo10
 >x : B
 >B : B
 
 function foo10(x: typeof a); // no error
->foo10 : { (x: B): any; (x: { foo: string; }): any; }
+>foo10 : typeof foo10
 >x : { foo: string; }
 >a : { foo: string; }
 
 function foo10(x: any) { }
->foo10 : { (x: B): any; (x: { foo: string; }): any; }
+>foo10 : typeof foo10
 >x : any
 
 function foo11(x: B);
->foo11 : { (x: B): any; (x: { foo: string; }): any; }
+>foo11 : typeof foo11
 >x : B
 >B : B
 
 function foo11(x: typeof b); // no error
->foo11 : { (x: B): any; (x: { foo: string; }): any; }
+>foo11 : typeof foo11
 >x : { foo: string; }
 >b : { foo: string; }
 
 function foo11(x: any) { }
->foo11 : { (x: B): any; (x: { foo: string; }): any; }
+>foo11 : typeof foo11
 >x : any
 
 function foo11b(x: B);
->foo11b : { (x: B): any; (x: PA): any; }
+>foo11b : typeof foo11b
 >x : B
 >B : B
 
 function foo11b(x: PA); // no error
->foo11b : { (x: B): any; (x: PA): any; }
+>foo11b : typeof foo11b
 >x : PA
 >PA : PA
 
 function foo11b(x: any) { }
->foo11b : { (x: B): any; (x: PA): any; }
+>foo11b : typeof foo11b
 >x : any
 
 function foo11c(x: B);
->foo11c : { (x: B): any; (x: PB): any; }
+>foo11c : typeof foo11c
 >x : B
 >B : B
 
 function foo11c(x: PB); // error
->foo11c : { (x: B): any; (x: PB): any; }
+>foo11c : typeof foo11c
 >x : PB
 >PB : PB
 
 function foo11c(x: any) { }
->foo11c : { (x: B): any; (x: PB): any; }
+>foo11c : typeof foo11c
 >x : any
 
 function foo12(x: I);
->foo12 : { (x: I): any; (x: C<string>): any; }
+>foo12 : typeof foo12
 >x : I
 >I : I
 
 function foo12(x: C<string>); // no error
->foo12 : { (x: I): any; (x: C<string>): any; }
+>foo12 : typeof foo12
 >x : C<string>
 >C : C<T>
 
 function foo12(x: any) { }
->foo12 : { (x: I): any; (x: C<string>): any; }
+>foo12 : typeof foo12
 >x : any
 
 function foo13(x: I);
->foo13 : { (x: I): any; (x: { foo: string; }): any; }
+>foo13 : typeof foo13
 >x : I
 >I : I
 
 function foo13(x: typeof a); // error
->foo13 : { (x: I): any; (x: { foo: string; }): any; }
+>foo13 : typeof foo13
 >x : { foo: string; }
 >a : { foo: string; }
 
 function foo13(x: any) { }
->foo13 : { (x: I): any; (x: { foo: string; }): any; }
+>foo13 : typeof foo13
 >x : any
 
 function foo14(x: I);
->foo14 : { (x: I): any; (x: { foo: string; }): any; }
+>foo14 : typeof foo14
 >x : I
 >I : I
 
 function foo14(x: typeof b); // error
->foo14 : { (x: I): any; (x: { foo: string; }): any; }
+>foo14 : typeof foo14
 >x : { foo: string; }
 >b : { foo: string; }
 
 function foo14(x: any) { }
->foo14 : { (x: I): any; (x: { foo: string; }): any; }
+>foo14 : typeof foo14
 >x : any
 
 function foo15(x: I);
->foo15 : { (x: I): any; (x: PA): any; }
+>foo15 : typeof foo15
 >x : I
 >I : I
 
 function foo15(x: PA); // no error
->foo15 : { (x: I): any; (x: PA): any; }
+>foo15 : typeof foo15
 >x : PA
 >PA : PA
 
 function foo15(x: any) { }
->foo15 : { (x: I): any; (x: PA): any; }
+>foo15 : typeof foo15
 >x : any
 
 function foo16(x: I);
->foo16 : { (x: I): any; (x: PB): any; }
+>foo16 : typeof foo16
 >x : I
 >I : I
 
 function foo16(x: PB); // no error
->foo16 : { (x: I): any; (x: PB): any; }
+>foo16 : typeof foo16
 >x : PB
 >PB : PB
 
 function foo16(x: any) { }
->foo16 : { (x: I): any; (x: PB): any; }
+>foo16 : typeof foo16
 >x : any
 
 
diff --git a/tests/baselines/reference/objectTypesIdentityWithPrivates2.types b/tests/baselines/reference/objectTypesIdentityWithPrivates2.types
index a29edc75162..2756ce4a327 100644
--- a/tests/baselines/reference/objectTypesIdentityWithPrivates2.types
+++ b/tests/baselines/reference/objectTypesIdentityWithPrivates2.types
@@ -18,101 +18,101 @@ class D<T> extends C<T> {
 }
 
 function foo1(x: C<string>);
->foo1 : { (x: C<string>): any; (x: C<number>): any; }
+>foo1 : typeof foo1
 >x : C<string>
 >C : C<T>
 
 function foo1(x: C<number>); // ok
->foo1 : { (x: C<string>): any; (x: C<number>): any; }
+>foo1 : typeof foo1
 >x : C<number>
 >C : C<T>
 
 function foo1(x: any) { }
->foo1 : { (x: C<string>): any; (x: C<number>): any; }
+>foo1 : typeof foo1
 >x : any
 
 function foo2(x: D<string>);
->foo2 : { (x: D<string>): any; (x: D<number>): any; }
+>foo2 : typeof foo2
 >x : D<string>
 >D : D<T>
 
 function foo2(x: D<number>); // ok
->foo2 : { (x: D<string>): any; (x: D<number>): any; }
+>foo2 : typeof foo2
 >x : D<number>
 >D : D<T>
 
 function foo2(x: any) { }
->foo2 : { (x: D<string>): any; (x: D<number>): any; }
+>foo2 : typeof foo2
 >x : any
 
 function foo3(x: C<string>);
->foo3 : { (x: C<string>): any; (x: D<number>): any; }
+>foo3 : typeof foo3
 >x : C<string>
 >C : C<T>
 
 function foo3(x: D<number>); // ok
->foo3 : { (x: C<string>): any; (x: D<number>): any; }
+>foo3 : typeof foo3
 >x : D<number>
 >D : D<T>
 
 function foo3(x: any) { }
->foo3 : { (x: C<string>): any; (x: D<number>): any; }
+>foo3 : typeof foo3
 >x : any
 
 function foo4(x: C<number>): number; 
->foo4 : { (x: C<number>): number; (x: D<number>): string; }
+>foo4 : typeof foo4
 >x : C<number>
 >C : C<T>
 
 function foo4(x: D<number>): string; // BUG 831926
->foo4 : { (x: C<number>): number; (x: D<number>): string; }
+>foo4 : typeof foo4
 >x : D<number>
 >D : D<T>
 
 function foo4(x: any): any { }
->foo4 : { (x: C<number>): number; (x: D<number>): string; }
+>foo4 : typeof foo4
 >x : any
 
 var r = foo4(new C<number>());
 >r : number
 >foo4(new C<number>()) : number
->foo4 : { (x: C<number>): number; (x: D<number>): string; }
+>foo4 : typeof foo4
 >new C<number>() : C<number>
 >C : typeof C
 
 var r = foo4(new D<number>());
 >r : number
 >foo4(new D<number>()) : number
->foo4 : { (x: C<number>): number; (x: D<number>): string; }
+>foo4 : typeof foo4
 >new D<number>() : D<number>
 >D : typeof D
 
 function foo5(x: C<number>): number;
->foo5 : { (x: C<number>): number; (x: C<number>): string; }
+>foo5 : typeof foo5
 >x : C<number>
 >C : C<T>
 
 function foo5(x: C<number>): string; // error
->foo5 : { (x: C<number>): number; (x: C<number>): string; }
+>foo5 : typeof foo5
 >x : C<number>
 >C : C<T>
 
 function foo5(x: any): any { }
->foo5 : { (x: C<number>): number; (x: C<number>): string; }
+>foo5 : typeof foo5
 >x : any
 
 function foo6(x: D<number>): number;
->foo6 : { (x: D<number>): number; (x: D<number>): string; }
+>foo6 : typeof foo6
 >x : D<number>
 >D : D<T>
 
 function foo6(x: D<number>): string; // error
->foo6 : { (x: D<number>): number; (x: D<number>): string; }
+>foo6 : typeof foo6
 >x : D<number>
 >D : D<T>
 
 function foo6(x: any): any { }
->foo6 : { (x: D<number>): number; (x: D<number>): string; }
+>foo6 : typeof foo6
 >x : any
 
 
diff --git a/tests/baselines/reference/objectTypesIdentityWithPublics.types b/tests/baselines/reference/objectTypesIdentityWithPublics.types
index 411fe4fb88e..a15bc396bea 100644
--- a/tests/baselines/reference/objectTypesIdentityWithPublics.types
+++ b/tests/baselines/reference/objectTypesIdentityWithPublics.types
@@ -41,240 +41,240 @@ var b = { foo: '' };
 >foo : string
 
 function foo1(x: A);
->foo1 : { (x: A): any; (x: A): any; }
+>foo1 : typeof foo1
 >x : A
 >A : A
 
 function foo1(x: A); // error
->foo1 : { (x: A): any; (x: A): any; }
+>foo1 : typeof foo1
 >x : A
 >A : A
 
 function foo1(x: any) { }
->foo1 : { (x: A): any; (x: A): any; }
+>foo1 : typeof foo1
 >x : any
 
 function foo1b(x: B);
->foo1b : { (x: B): any; (x: B): any; }
+>foo1b : typeof foo1b
 >x : B
 >B : B
 
 function foo1b(x: B); // error
->foo1b : { (x: B): any; (x: B): any; }
+>foo1b : typeof foo1b
 >x : B
 >B : B
 
 function foo1b(x: any) { }
->foo1b : { (x: B): any; (x: B): any; }
+>foo1b : typeof foo1b
 >x : any
 
 function foo1c(x: C<string>);
->foo1c : { (x: C<string>): any; (x: C<string>): any; }
+>foo1c : typeof foo1c
 >x : C<string>
 >C : C<T>
 
 function foo1c(x: C<string>); // error
->foo1c : { (x: C<string>): any; (x: C<string>): any; }
+>foo1c : typeof foo1c
 >x : C<string>
 >C : C<T>
 
 function foo1c(x: any) { }
->foo1c : { (x: C<string>): any; (x: C<string>): any; }
+>foo1c : typeof foo1c
 >x : any
 
 function foo2(x: I);
->foo2 : { (x: I): any; (x: I): any; }
+>foo2 : typeof foo2
 >x : I
 >I : I
 
 function foo2(x: I); // error
->foo2 : { (x: I): any; (x: I): any; }
+>foo2 : typeof foo2
 >x : I
 >I : I
 
 function foo2(x: any) { }
->foo2 : { (x: I): any; (x: I): any; }
+>foo2 : typeof foo2
 >x : any
 
 function foo3(x: typeof a);
->foo3 : { (x: { foo: string; }): any; (x: { foo: string; }): any; }
+>foo3 : typeof foo3
 >x : { foo: string; }
 >a : { foo: string; }
 
 function foo3(x: typeof a); // error
->foo3 : { (x: { foo: string; }): any; (x: { foo: string; }): any; }
+>foo3 : typeof foo3
 >x : { foo: string; }
 >a : { foo: string; }
 
 function foo3(x: any) { }
->foo3 : { (x: { foo: string; }): any; (x: { foo: string; }): any; }
+>foo3 : typeof foo3
 >x : any
 
 function foo4(x: typeof b);
->foo4 : { (x: { foo: string; }): any; (x: { foo: string; }): any; }
+>foo4 : typeof foo4
 >x : { foo: string; }
 >b : { foo: string; }
 
 function foo4(x: typeof b); // error
->foo4 : { (x: { foo: string; }): any; (x: { foo: string; }): any; }
+>foo4 : typeof foo4
 >x : { foo: string; }
 >b : { foo: string; }
 
 function foo4(x: any) { }
->foo4 : { (x: { foo: string; }): any; (x: { foo: string; }): any; }
+>foo4 : typeof foo4
 >x : any
 
 function foo5(x: A);
->foo5 : { (x: A): any; (x: B): any; }
+>foo5 : typeof foo5
 >x : A
 >A : A
 
 function foo5(x: B); // error
->foo5 : { (x: A): any; (x: B): any; }
+>foo5 : typeof foo5
 >x : B
 >B : B
 
 function foo5(x: any) { }
->foo5 : { (x: A): any; (x: B): any; }
+>foo5 : typeof foo5
 >x : any
 
 function foo5b(x: A);
->foo5b : { (x: A): any; (x: C<string>): any; }
+>foo5b : typeof foo5b
 >x : A
 >A : A
 
 function foo5b(x: C<string>); // error
->foo5b : { (x: A): any; (x: C<string>): any; }
+>foo5b : typeof foo5b
 >x : C<string>
 >C : C<T>
 
 function foo5b(x: any) { }
->foo5b : { (x: A): any; (x: C<string>): any; }
+>foo5b : typeof foo5b
 >x : any
 
 function foo6(x: A);
->foo6 : { (x: A): any; (x: I): any; }
+>foo6 : typeof foo6
 >x : A
 >A : A
 
 function foo6(x: I); // error
->foo6 : { (x: A): any; (x: I): any; }
+>foo6 : typeof foo6
 >x : I
 >I : I
 
 function foo6(x: any) { }
->foo6 : { (x: A): any; (x: I): any; }
+>foo6 : typeof foo6
 >x : any
 
 function foo7(x: A);
->foo7 : { (x: A): any; (x: { foo: string; }): any; }
+>foo7 : typeof foo7
 >x : A
 >A : A
 
 function foo7(x: typeof a); // error
->foo7 : { (x: A): any; (x: { foo: string; }): any; }
+>foo7 : typeof foo7
 >x : { foo: string; }
 >a : { foo: string; }
 
 function foo7(x: any) { }
->foo7 : { (x: A): any; (x: { foo: string; }): any; }
+>foo7 : typeof foo7
 >x : any
 
 function foo8(x: B);
->foo8 : { (x: B): any; (x: I): any; }
+>foo8 : typeof foo8
 >x : B
 >B : B
 
 function foo8(x: I); // error
->foo8 : { (x: B): any; (x: I): any; }
+>foo8 : typeof foo8
 >x : I
 >I : I
 
 function foo8(x: any) { }
->foo8 : { (x: B): any; (x: I): any; }
+>foo8 : typeof foo8
 >x : any
 
 function foo9(x: B);
->foo9 : { (x: B): any; (x: C<string>): any; }
+>foo9 : typeof foo9
 >x : B
 >B : B
 
 function foo9(x: C<string>); // error
->foo9 : { (x: B): any; (x: C<string>): any; }
+>foo9 : typeof foo9
 >x : C<string>
 >C : C<T>
 
 function foo9(x: any) { }
->foo9 : { (x: B): any; (x: C<string>): any; }
+>foo9 : typeof foo9
 >x : any
 
 function foo10(x: B);
->foo10 : { (x: B): any; (x: { foo: string; }): any; }
+>foo10 : typeof foo10
 >x : B
 >B : B
 
 function foo10(x: typeof a); // error
->foo10 : { (x: B): any; (x: { foo: string; }): any; }
+>foo10 : typeof foo10
 >x : { foo: string; }
 >a : { foo: string; }
 
 function foo10(x: any) { }
->foo10 : { (x: B): any; (x: { foo: string; }): any; }
+>foo10 : typeof foo10
 >x : any
 
 function foo11(x: B);
->foo11 : { (x: B): any; (x: { foo: string; }): any; }
+>foo11 : typeof foo11
 >x : B
 >B : B
 
 function foo11(x: typeof b); // error
->foo11 : { (x: B): any; (x: { foo: string; }): any; }
+>foo11 : typeof foo11
 >x : { foo: string; }
 >b : { foo: string; }
 
 function foo11(x: any) { }
->foo11 : { (x: B): any; (x: { foo: string; }): any; }
+>foo11 : typeof foo11
 >x : any
 
 function foo12(x: I);
->foo12 : { (x: I): any; (x: C<string>): any; }
+>foo12 : typeof foo12
 >x : I
 >I : I
 
 function foo12(x: C<string>); // error
->foo12 : { (x: I): any; (x: C<string>): any; }
+>foo12 : typeof foo12
 >x : C<string>
 >C : C<T>
 
 function foo12(x: any) { }
->foo12 : { (x: I): any; (x: C<string>): any; }
+>foo12 : typeof foo12
 >x : any
 
 function foo13(x: I);
->foo13 : { (x: I): any; (x: { foo: string; }): any; }
+>foo13 : typeof foo13
 >x : I
 >I : I
 
 function foo13(x: typeof a); // error
->foo13 : { (x: I): any; (x: { foo: string; }): any; }
+>foo13 : typeof foo13
 >x : { foo: string; }
 >a : { foo: string; }
 
 function foo13(x: any) { }
->foo13 : { (x: I): any; (x: { foo: string; }): any; }
+>foo13 : typeof foo13
 >x : any
 
 function foo14(x: I);
->foo14 : { (x: I): any; (x: { foo: string; }): any; }
+>foo14 : typeof foo14
 >x : I
 >I : I
 
 function foo14(x: typeof b); // error
->foo14 : { (x: I): any; (x: { foo: string; }): any; }
+>foo14 : typeof foo14
 >x : { foo: string; }
 >b : { foo: string; }
 
 function foo14(x: any) { }
->foo14 : { (x: I): any; (x: { foo: string; }): any; }
+>foo14 : typeof foo14
 >x : any
 
diff --git a/tests/baselines/reference/objectTypesIdentityWithStringIndexers.types b/tests/baselines/reference/objectTypesIdentityWithStringIndexers.types
index 83a73646874..9488d61a819 100644
--- a/tests/baselines/reference/objectTypesIdentityWithStringIndexers.types
+++ b/tests/baselines/reference/objectTypesIdentityWithStringIndexers.types
@@ -54,325 +54,325 @@ var b: { [x: string]: string; } = { foo: '' };
 >foo : string
 
 function foo1(x: A);
->foo1 : { (x: A): any; (x: A): any; }
+>foo1 : typeof foo1
 >x : A
 >A : A
 
 function foo1(x: A); // error
->foo1 : { (x: A): any; (x: A): any; }
+>foo1 : typeof foo1
 >x : A
 >A : A
 
 function foo1(x: any) { }
->foo1 : { (x: A): any; (x: A): any; }
+>foo1 : typeof foo1
 >x : any
 
 function foo1b(x: B);
->foo1b : { (x: B): any; (x: B): any; }
+>foo1b : typeof foo1b
 >x : B
 >B : B
 
 function foo1b(x: B); // error
->foo1b : { (x: B): any; (x: B): any; }
+>foo1b : typeof foo1b
 >x : B
 >B : B
 
 function foo1b(x: any) { }
->foo1b : { (x: B): any; (x: B): any; }
+>foo1b : typeof foo1b
 >x : any
 
 function foo1c(x: C<string>);
->foo1c : { (x: C<string>): any; (x: C<string>): any; }
+>foo1c : typeof foo1c
 >x : C<string>
 >C : C<T>
 
 function foo1c(x: C<string>); // error
->foo1c : { (x: C<string>): any; (x: C<string>): any; }
+>foo1c : typeof foo1c
 >x : C<string>
 >C : C<T>
 
 function foo1c(x: any) { }
->foo1c : { (x: C<string>): any; (x: C<string>): any; }
+>foo1c : typeof foo1c
 >x : any
 
 function foo2(x: I);
->foo2 : { (x: I): any; (x: I): any; }
+>foo2 : typeof foo2
 >x : I
 >I : I
 
 function foo2(x: I); // error
->foo2 : { (x: I): any; (x: I): any; }
+>foo2 : typeof foo2
 >x : I
 >I : I
 
 function foo2(x: any) { }
->foo2 : { (x: I): any; (x: I): any; }
+>foo2 : typeof foo2
 >x : any
 
 function foo3(x: typeof a);
->foo3 : { (x: { [x: string]: string; }): any; (x: { [x: string]: string; }): any; }
+>foo3 : typeof foo3
 >x : { [x: string]: string; }
 >a : { [x: string]: string; }
 
 function foo3(x: typeof a); // error
->foo3 : { (x: { [x: string]: string; }): any; (x: { [x: string]: string; }): any; }
+>foo3 : typeof foo3
 >x : { [x: string]: string; }
 >a : { [x: string]: string; }
 
 function foo3(x: any) { }
->foo3 : { (x: { [x: string]: string; }): any; (x: { [x: string]: string; }): any; }
+>foo3 : typeof foo3
 >x : any
 
 function foo4(x: typeof b);
->foo4 : { (x: { [x: string]: string; }): any; (x: { [x: string]: string; }): any; }
+>foo4 : typeof foo4
 >x : { [x: string]: string; }
 >b : { [x: string]: string; }
 
 function foo4(x: typeof b); // error
->foo4 : { (x: { [x: string]: string; }): any; (x: { [x: string]: string; }): any; }
+>foo4 : typeof foo4
 >x : { [x: string]: string; }
 >b : { [x: string]: string; }
 
 function foo4(x: any) { }
->foo4 : { (x: { [x: string]: string; }): any; (x: { [x: string]: string; }): any; }
+>foo4 : typeof foo4
 >x : any
 
 function foo5(x: A);
->foo5 : { (x: A): any; (x: B): any; }
+>foo5 : typeof foo5
 >x : A
 >A : A
 
 function foo5(x: B); // error
->foo5 : { (x: A): any; (x: B): any; }
+>foo5 : typeof foo5
 >x : B
 >B : B
 
 function foo5(x: any) { }
->foo5 : { (x: A): any; (x: B): any; }
+>foo5 : typeof foo5
 >x : any
 
 function foo5b(x: A);
->foo5b : { (x: A): any; (x: C<string>): any; }
+>foo5b : typeof foo5b
 >x : A
 >A : A
 
 function foo5b(x: C<string>); // error
->foo5b : { (x: A): any; (x: C<string>): any; }
+>foo5b : typeof foo5b
 >x : C<string>
 >C : C<T>
 
 function foo5b(x: any) { }
->foo5b : { (x: A): any; (x: C<string>): any; }
+>foo5b : typeof foo5b
 >x : any
 
 function foo5c(x: A);
->foo5c : { (x: A): any; (x: PA): any; }
+>foo5c : typeof foo5c
 >x : A
 >A : A
 
 function foo5c(x: PA); // error
->foo5c : { (x: A): any; (x: PA): any; }
+>foo5c : typeof foo5c
 >x : PA
 >PA : PA
 
 function foo5c(x: any) { }
->foo5c : { (x: A): any; (x: PA): any; }
+>foo5c : typeof foo5c
 >x : any
 
 function foo5d(x: A);
->foo5d : { (x: A): any; (x: PB): any; }
+>foo5d : typeof foo5d
 >x : A
 >A : A
 
 function foo5d(x: PB); // error
->foo5d : { (x: A): any; (x: PB): any; }
+>foo5d : typeof foo5d
 >x : PB
 >PB : PB
 
 function foo5d(x: any) { }
->foo5d : { (x: A): any; (x: PB): any; }
+>foo5d : typeof foo5d
 >x : any
 
 function foo6(x: A);
->foo6 : { (x: A): any; (x: I): any; }
+>foo6 : typeof foo6
 >x : A
 >A : A
 
 function foo6(x: I); // error
->foo6 : { (x: A): any; (x: I): any; }
+>foo6 : typeof foo6
 >x : I
 >I : I
 
 function foo6(x: any) { }
->foo6 : { (x: A): any; (x: I): any; }
+>foo6 : typeof foo6
 >x : any
 
 function foo7(x: A);
->foo7 : { (x: A): any; (x: { [x: string]: string; }): any; }
+>foo7 : typeof foo7
 >x : A
 >A : A
 
 function foo7(x: typeof a); // error
->foo7 : { (x: A): any; (x: { [x: string]: string; }): any; }
+>foo7 : typeof foo7
 >x : { [x: string]: string; }
 >a : { [x: string]: string; }
 
 function foo7(x: any) { }
->foo7 : { (x: A): any; (x: { [x: string]: string; }): any; }
+>foo7 : typeof foo7
 >x : any
 
 function foo8(x: B);
->foo8 : { (x: B): any; (x: I): any; }
+>foo8 : typeof foo8
 >x : B
 >B : B
 
 function foo8(x: I); // error
->foo8 : { (x: B): any; (x: I): any; }
+>foo8 : typeof foo8
 >x : I
 >I : I
 
 function foo8(x: any) { }
->foo8 : { (x: B): any; (x: I): any; }
+>foo8 : typeof foo8
 >x : any
 
 function foo9(x: B);
->foo9 : { (x: B): any; (x: C<string>): any; }
+>foo9 : typeof foo9
 >x : B
 >B : B
 
 function foo9(x: C<string>); // error
->foo9 : { (x: B): any; (x: C<string>): any; }
+>foo9 : typeof foo9
 >x : C<string>
 >C : C<T>
 
 function foo9(x: any) { }
->foo9 : { (x: B): any; (x: C<string>): any; }
+>foo9 : typeof foo9
 >x : any
 
 function foo10(x: B);
->foo10 : { (x: B): any; (x: { [x: string]: string; }): any; }
+>foo10 : typeof foo10
 >x : B
 >B : B
 
 function foo10(x: typeof a); // error
->foo10 : { (x: B): any; (x: { [x: string]: string; }): any; }
+>foo10 : typeof foo10
 >x : { [x: string]: string; }
 >a : { [x: string]: string; }
 
 function foo10(x: any) { }
->foo10 : { (x: B): any; (x: { [x: string]: string; }): any; }
+>foo10 : typeof foo10
 >x : any
 
 function foo11(x: B);
->foo11 : { (x: B): any; (x: { [x: string]: string; }): any; }
+>foo11 : typeof foo11
 >x : B
 >B : B
 
 function foo11(x: typeof b); // error
->foo11 : { (x: B): any; (x: { [x: string]: string; }): any; }
+>foo11 : typeof foo11
 >x : { [x: string]: string; }
 >b : { [x: string]: string; }
 
 function foo11(x: any) { }
->foo11 : { (x: B): any; (x: { [x: string]: string; }): any; }
+>foo11 : typeof foo11
 >x : any
 
 function foo11b(x: B);
->foo11b : { (x: B): any; (x: PA): any; }
+>foo11b : typeof foo11b
 >x : B
 >B : B
 
 function foo11b(x: PA); // error
->foo11b : { (x: B): any; (x: PA): any; }
+>foo11b : typeof foo11b
 >x : PA
 >PA : PA
 
 function foo11b(x: any) { }
->foo11b : { (x: B): any; (x: PA): any; }
+>foo11b : typeof foo11b
 >x : any
 
 function foo11c(x: B);
->foo11c : { (x: B): any; (x: PB): any; }
+>foo11c : typeof foo11c
 >x : B
 >B : B
 
 function foo11c(x: PB); // error
->foo11c : { (x: B): any; (x: PB): any; }
+>foo11c : typeof foo11c
 >x : PB
 >PB : PB
 
 function foo11c(x: any) { }
->foo11c : { (x: B): any; (x: PB): any; }
+>foo11c : typeof foo11c
 >x : any
 
 function foo12(x: I);
->foo12 : { (x: I): any; (x: C<string>): any; }
+>foo12 : typeof foo12
 >x : I
 >I : I
 
 function foo12(x: C<string>); // error
->foo12 : { (x: I): any; (x: C<string>): any; }
+>foo12 : typeof foo12
 >x : C<string>
 >C : C<T>
 
 function foo12(x: any) { }
->foo12 : { (x: I): any; (x: C<string>): any; }
+>foo12 : typeof foo12
 >x : any
 
 function foo13(x: I);
->foo13 : { (x: I): any; (x: { [x: string]: string; }): any; }
+>foo13 : typeof foo13
 >x : I
 >I : I
 
 function foo13(x: typeof a); // error
->foo13 : { (x: I): any; (x: { [x: string]: string; }): any; }
+>foo13 : typeof foo13
 >x : { [x: string]: string; }
 >a : { [x: string]: string; }
 
 function foo13(x: any) { }
->foo13 : { (x: I): any; (x: { [x: string]: string; }): any; }
+>foo13 : typeof foo13
 >x : any
 
 function foo14(x: I);
->foo14 : { (x: I): any; (x: { [x: string]: string; }): any; }
+>foo14 : typeof foo14
 >x : I
 >I : I
 
 function foo14(x: typeof b); // error
->foo14 : { (x: I): any; (x: { [x: string]: string; }): any; }
+>foo14 : typeof foo14
 >x : { [x: string]: string; }
 >b : { [x: string]: string; }
 
 function foo14(x: any) { }
->foo14 : { (x: I): any; (x: { [x: string]: string; }): any; }
+>foo14 : typeof foo14
 >x : any
 
 function foo15(x: I);
->foo15 : { (x: I): any; (x: PA): any; }
+>foo15 : typeof foo15
 >x : I
 >I : I
 
 function foo15(x: PA); // error
->foo15 : { (x: I): any; (x: PA): any; }
+>foo15 : typeof foo15
 >x : PA
 >PA : PA
 
 function foo15(x: any) { }
->foo15 : { (x: I): any; (x: PA): any; }
+>foo15 : typeof foo15
 >x : any
 
 function foo16(x: I);
->foo16 : { (x: I): any; (x: PB): any; }
+>foo16 : typeof foo16
 >x : I
 >I : I
 
 function foo16(x: PB); // error
->foo16 : { (x: I): any; (x: PB): any; }
+>foo16 : typeof foo16
 >x : PB
 >PB : PB
 
 function foo16(x: any) { }
->foo16 : { (x: I): any; (x: PB): any; }
+>foo16 : typeof foo16
 >x : any
 
 
diff --git a/tests/baselines/reference/objectTypesIdentityWithStringIndexers2.types b/tests/baselines/reference/objectTypesIdentityWithStringIndexers2.types
index c621be1e26b..6a9d54b1062 100644
--- a/tests/baselines/reference/objectTypesIdentityWithStringIndexers2.types
+++ b/tests/baselines/reference/objectTypesIdentityWithStringIndexers2.types
@@ -70,328 +70,328 @@ var b: { [x: string]: Derived; } = { foo: <Derived>null };
 >Derived : Derived
 
 function foo1(x: A);
->foo1 : { (x: A): any; (x: A): any; }
+>foo1 : typeof foo1
 >x : A
 >A : A
 
 function foo1(x: A); // error
->foo1 : { (x: A): any; (x: A): any; }
+>foo1 : typeof foo1
 >x : A
 >A : A
 
 function foo1(x: any) { }
->foo1 : { (x: A): any; (x: A): any; }
+>foo1 : typeof foo1
 >x : any
 
 function foo1b(x: B);
->foo1b : { (x: B): any; (x: B): any; }
+>foo1b : typeof foo1b
 >x : B
 >B : B
 
 function foo1b(x: B); // error
->foo1b : { (x: B): any; (x: B): any; }
+>foo1b : typeof foo1b
 >x : B
 >B : B
 
 function foo1b(x: any) { }
->foo1b : { (x: B): any; (x: B): any; }
+>foo1b : typeof foo1b
 >x : any
 
 function foo1c(x: C<string>);
->foo1c : { (x: C<string>): any; (x: C<string>): any; }
+>foo1c : typeof foo1c
 >x : C<string>
 >C : C<T>
 
 function foo1c(x: C<string>); // error
->foo1c : { (x: C<string>): any; (x: C<string>): any; }
+>foo1c : typeof foo1c
 >x : C<string>
 >C : C<T>
 
 function foo1c(x: any) { }
->foo1c : { (x: C<string>): any; (x: C<string>): any; }
+>foo1c : typeof foo1c
 >x : any
 
 function foo2(x: I);
->foo2 : { (x: I): any; (x: I): any; }
+>foo2 : typeof foo2
 >x : I
 >I : I
 
 function foo2(x: I); // error
->foo2 : { (x: I): any; (x: I): any; }
+>foo2 : typeof foo2
 >x : I
 >I : I
 
 function foo2(x: any) { }
->foo2 : { (x: I): any; (x: I): any; }
+>foo2 : typeof foo2
 >x : any
 
 function foo3(x: typeof a);
->foo3 : { (x: { [x: string]: Base; }): any; (x: { [x: string]: Base; }): any; }
+>foo3 : typeof foo3
 >x : { [x: string]: Base; }
 >a : { [x: string]: Base; }
 
 function foo3(x: typeof a); // error
->foo3 : { (x: { [x: string]: Base; }): any; (x: { [x: string]: Base; }): any; }
+>foo3 : typeof foo3
 >x : { [x: string]: Base; }
 >a : { [x: string]: Base; }
 
 function foo3(x: any) { }
->foo3 : { (x: { [x: string]: Base; }): any; (x: { [x: string]: Base; }): any; }
+>foo3 : typeof foo3
 >x : any
 
 function foo4(x: typeof b);
->foo4 : { (x: { [x: string]: Derived; }): any; (x: { [x: string]: Derived; }): any; }
+>foo4 : typeof foo4
 >x : { [x: string]: Derived; }
 >b : { [x: string]: Derived; }
 
 function foo4(x: typeof b); // error
->foo4 : { (x: { [x: string]: Derived; }): any; (x: { [x: string]: Derived; }): any; }
+>foo4 : typeof foo4
 >x : { [x: string]: Derived; }
 >b : { [x: string]: Derived; }
 
 function foo4(x: any) { }
->foo4 : { (x: { [x: string]: Derived; }): any; (x: { [x: string]: Derived; }): any; }
+>foo4 : typeof foo4
 >x : any
 
 function foo5(x: A);
->foo5 : { (x: A): any; (x: B): any; }
+>foo5 : typeof foo5
 >x : A
 >A : A
 
 function foo5(x: B); // ok
->foo5 : { (x: A): any; (x: B): any; }
+>foo5 : typeof foo5
 >x : B
 >B : B
 
 function foo5(x: any) { }
->foo5 : { (x: A): any; (x: B): any; }
+>foo5 : typeof foo5
 >x : any
 
 function foo5b(x: A);
->foo5b : { (x: A): any; (x: C<Derived>): any; }
+>foo5b : typeof foo5b
 >x : A
 >A : A
 
 function foo5b(x: C<Derived>); // ok
->foo5b : { (x: A): any; (x: C<Derived>): any; }
+>foo5b : typeof foo5b
 >x : C<Derived>
 >C : C<T>
 >Derived : Derived
 
 function foo5b(x: any) { }
->foo5b : { (x: A): any; (x: C<Derived>): any; }
+>foo5b : typeof foo5b
 >x : any
 
 function foo5c(x: A);
->foo5c : { (x: A): any; (x: PA): any; }
+>foo5c : typeof foo5c
 >x : A
 >A : A
 
 function foo5c(x: PA); // error
->foo5c : { (x: A): any; (x: PA): any; }
+>foo5c : typeof foo5c
 >x : PA
 >PA : PA
 
 function foo5c(x: any) { }
->foo5c : { (x: A): any; (x: PA): any; }
+>foo5c : typeof foo5c
 >x : any
 
 function foo5d(x: A);
->foo5d : { (x: A): any; (x: PB): any; }
+>foo5d : typeof foo5d
 >x : A
 >A : A
 
 function foo5d(x: PB); // ok
->foo5d : { (x: A): any; (x: PB): any; }
+>foo5d : typeof foo5d
 >x : PB
 >PB : PB
 
 function foo5d(x: any) { }
->foo5d : { (x: A): any; (x: PB): any; }
+>foo5d : typeof foo5d
 >x : any
 
 function foo6(x: A);
->foo6 : { (x: A): any; (x: I): any; }
+>foo6 : typeof foo6
 >x : A
 >A : A
 
 function foo6(x: I); // ok
->foo6 : { (x: A): any; (x: I): any; }
+>foo6 : typeof foo6
 >x : I
 >I : I
 
 function foo6(x: any) { }
->foo6 : { (x: A): any; (x: I): any; }
+>foo6 : typeof foo6
 >x : any
 
 function foo7(x: A);
->foo7 : { (x: A): any; (x: { [x: string]: Base; }): any; }
+>foo7 : typeof foo7
 >x : A
 >A : A
 
 function foo7(x: typeof a); // error
->foo7 : { (x: A): any; (x: { [x: string]: Base; }): any; }
+>foo7 : typeof foo7
 >x : { [x: string]: Base; }
 >a : { [x: string]: Base; }
 
 function foo7(x: any) { }
->foo7 : { (x: A): any; (x: { [x: string]: Base; }): any; }
+>foo7 : typeof foo7
 >x : any
 
 function foo8(x: B);
->foo8 : { (x: B): any; (x: I): any; }
+>foo8 : typeof foo8
 >x : B
 >B : B
 
 function foo8(x: I); // error
->foo8 : { (x: B): any; (x: I): any; }
+>foo8 : typeof foo8
 >x : I
 >I : I
 
 function foo8(x: any) { }
->foo8 : { (x: B): any; (x: I): any; }
+>foo8 : typeof foo8
 >x : any
 
 function foo9(x: B);
->foo9 : { (x: B): any; (x: C<Base>): any; }
+>foo9 : typeof foo9
 >x : B
 >B : B
 
 function foo9(x: C<Base>); // ok
->foo9 : { (x: B): any; (x: C<Base>): any; }
+>foo9 : typeof foo9
 >x : C<Base>
 >C : C<T>
 >Base : Base
 
 function foo9(x: any) { }
->foo9 : { (x: B): any; (x: C<Base>): any; }
+>foo9 : typeof foo9
 >x : any
 
 function foo10(x: B);
->foo10 : { (x: B): any; (x: { [x: string]: Base; }): any; }
+>foo10 : typeof foo10
 >x : B
 >B : B
 
 function foo10(x: typeof a); // ok
->foo10 : { (x: B): any; (x: { [x: string]: Base; }): any; }
+>foo10 : typeof foo10
 >x : { [x: string]: Base; }
 >a : { [x: string]: Base; }
 
 function foo10(x: any) { }
->foo10 : { (x: B): any; (x: { [x: string]: Base; }): any; }
+>foo10 : typeof foo10
 >x : any
 
 function foo11(x: B);
->foo11 : { (x: B): any; (x: { [x: string]: Derived; }): any; }
+>foo11 : typeof foo11
 >x : B
 >B : B
 
 function foo11(x: typeof b); // error
->foo11 : { (x: B): any; (x: { [x: string]: Derived; }): any; }
+>foo11 : typeof foo11
 >x : { [x: string]: Derived; }
 >b : { [x: string]: Derived; }
 
 function foo11(x: any) { }
->foo11 : { (x: B): any; (x: { [x: string]: Derived; }): any; }
+>foo11 : typeof foo11
 >x : any
 
 function foo11b(x: B);
->foo11b : { (x: B): any; (x: PA): any; }
+>foo11b : typeof foo11b
 >x : B
 >B : B
 
 function foo11b(x: PA); // ok
->foo11b : { (x: B): any; (x: PA): any; }
+>foo11b : typeof foo11b
 >x : PA
 >PA : PA
 
 function foo11b(x: any) { }
->foo11b : { (x: B): any; (x: PA): any; }
+>foo11b : typeof foo11b
 >x : any
 
 function foo11c(x: B);
->foo11c : { (x: B): any; (x: PB): any; }
+>foo11c : typeof foo11c
 >x : B
 >B : B
 
 function foo11c(x: PB); // error
->foo11c : { (x: B): any; (x: PB): any; }
+>foo11c : typeof foo11c
 >x : PB
 >PB : PB
 
 function foo11c(x: any) { }
->foo11c : { (x: B): any; (x: PB): any; }
+>foo11c : typeof foo11c
 >x : any
 
 function foo12(x: I);
->foo12 : { (x: I): any; (x: C<Derived>): any; }
+>foo12 : typeof foo12
 >x : I
 >I : I
 
 function foo12(x: C<Derived>); // error
->foo12 : { (x: I): any; (x: C<Derived>): any; }
+>foo12 : typeof foo12
 >x : C<Derived>
 >C : C<T>
 >Derived : Derived
 
 function foo12(x: any) { }
->foo12 : { (x: I): any; (x: C<Derived>): any; }
+>foo12 : typeof foo12
 >x : any
 
 function foo13(x: I);
->foo13 : { (x: I): any; (x: { [x: string]: Base; }): any; }
+>foo13 : typeof foo13
 >x : I
 >I : I
 
 function foo13(x: typeof a); // ok
->foo13 : { (x: I): any; (x: { [x: string]: Base; }): any; }
+>foo13 : typeof foo13
 >x : { [x: string]: Base; }
 >a : { [x: string]: Base; }
 
 function foo13(x: any) { }
->foo13 : { (x: I): any; (x: { [x: string]: Base; }): any; }
+>foo13 : typeof foo13
 >x : any
 
 function foo14(x: I);
->foo14 : { (x: I): any; (x: { [x: string]: Derived; }): any; }
+>foo14 : typeof foo14
 >x : I
 >I : I
 
 function foo14(x: typeof b); // error
->foo14 : { (x: I): any; (x: { [x: string]: Derived; }): any; }
+>foo14 : typeof foo14
 >x : { [x: string]: Derived; }
 >b : { [x: string]: Derived; }
 
 function foo14(x: any) { }
->foo14 : { (x: I): any; (x: { [x: string]: Derived; }): any; }
+>foo14 : typeof foo14
 >x : any
 
 function foo15(x: I);
->foo15 : { (x: I): any; (x: PA): any; }
+>foo15 : typeof foo15
 >x : I
 >I : I
 
 function foo15(x: PA); // ok
->foo15 : { (x: I): any; (x: PA): any; }
+>foo15 : typeof foo15
 >x : PA
 >PA : PA
 
 function foo15(x: any) { }
->foo15 : { (x: I): any; (x: PA): any; }
+>foo15 : typeof foo15
 >x : any
 
 function foo16(x: I);
->foo16 : { (x: I): any; (x: PB): any; }
+>foo16 : typeof foo16
 >x : I
 >I : I
 
 function foo16(x: PB); // error
->foo16 : { (x: I): any; (x: PB): any; }
+>foo16 : typeof foo16
 >x : PB
 >PB : PB
 
 function foo16(x: any) { }
->foo16 : { (x: I): any; (x: PB): any; }
+>foo16 : typeof foo16
 >x : any
 
 
diff --git a/tests/baselines/reference/octalLiteralInStrictModeES3.errors.txt b/tests/baselines/reference/octalLiteralInStrictModeES3.errors.txt
deleted file mode 100644
index c282d871aff..00000000000
--- a/tests/baselines/reference/octalLiteralInStrictModeES3.errors.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-==== tests/cases/conformance/parser/ecmascript5/StrictMode/octalLiteralInStrictModeES3.ts (1 errors) ====
-    "use strict";
-    03;
-    ~~
-!!! Octal literals are not allowed in strict mode.
\ No newline at end of file
diff --git a/tests/baselines/reference/optionalAccessorsInInterface1.types b/tests/baselines/reference/optionalAccessorsInInterface1.types
index c426cdba178..ab541bd0400 100644
--- a/tests/baselines/reference/optionalAccessorsInInterface1.types
+++ b/tests/baselines/reference/optionalAccessorsInInterface1.types
@@ -11,7 +11,7 @@ interface MyPropertyDescriptor {
 }
 
 declare function defineMyProperty(o: any, p: string, attributes: MyPropertyDescriptor): any;
->defineMyProperty : (o: any, p: string, attributes: MyPropertyDescriptor) => any
+>defineMyProperty : typeof defineMyProperty
 >o : any
 >p : string
 >attributes : MyPropertyDescriptor
@@ -19,7 +19,7 @@ declare function defineMyProperty(o: any, p: string, attributes: MyPropertyDescr
 
 defineMyProperty({}, "name", { get: function () { return 5; } });
 >defineMyProperty({}, "name", { get: function () { return 5; } }) : any
->defineMyProperty : (o: any, p: string, attributes: MyPropertyDescriptor) => any
+>defineMyProperty : typeof defineMyProperty
 >{} : {}
 >{ get: function () { return 5; } } : { get: () => number; }
 >get : () => number
@@ -37,7 +37,7 @@ interface MyPropertyDescriptor2 {
 }
 
 declare function defineMyProperty2(o: any, p: string, attributes: MyPropertyDescriptor2): any;
->defineMyProperty2 : (o: any, p: string, attributes: MyPropertyDescriptor2) => any
+>defineMyProperty2 : typeof defineMyProperty2
 >o : any
 >p : string
 >attributes : MyPropertyDescriptor2
@@ -45,7 +45,7 @@ declare function defineMyProperty2(o: any, p: string, attributes: MyPropertyDesc
 
 defineMyProperty2({}, "name", { get: function () { return 5; } });
 >defineMyProperty2({}, "name", { get: function () { return 5; } }) : any
->defineMyProperty2 : (o: any, p: string, attributes: MyPropertyDescriptor2) => any
+>defineMyProperty2 : typeof defineMyProperty2
 >{} : {}
 >{ get: function () { return 5; } } : { get: () => number; }
 >get : () => number
diff --git a/tests/baselines/reference/optionalParamReferencingOtherParams1.types b/tests/baselines/reference/optionalParamReferencingOtherParams1.types
index 3a62d51759c..8170b3e95f1 100644
--- a/tests/baselines/reference/optionalParamReferencingOtherParams1.types
+++ b/tests/baselines/reference/optionalParamReferencingOtherParams1.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/optionalParamReferencingOtherParams1.ts ===
 function strange(x: number, y = x * 1, z = x + y) {
->strange : (x: number, y?: number, z?: number) => number
+>strange : typeof strange
 >x : number
 >y : number
 >x * 1 : number
diff --git a/tests/baselines/reference/overload2.types b/tests/baselines/reference/overload2.types
index 05a9533b2d2..b52ff0579ca 100644
--- a/tests/baselines/reference/overload2.types
+++ b/tests/baselines/reference/overload2.types
@@ -6,18 +6,18 @@ enum B { }
 >B : B
     
 function foo(a: A);
->foo : { (a: A): any; (b: B): any; }
+>foo : typeof foo
 >a : A
 >A : A
 
 function foo(b: B);
->foo : { (a: A): any; (b: B): any; }
+>foo : typeof foo
 >b : B
 >B : B
 
 // should be ok
 function foo(x: number) { 
->foo : { (a: A): any; (b: B): any; }
+>foo : typeof foo
 >x : number
 }
 
@@ -25,18 +25,18 @@ class C { }
 >C : C
 
 function foo1(a: A);
->foo1 : { (a: A): any; (c: C): any; }
+>foo1 : typeof foo1
 >a : A
 >A : A
 
 function foo1(c: C);
->foo1 : { (a: A): any; (c: C): any; }
+>foo1 : typeof foo1
 >c : C
 >C : C
 
 // should be ok
 function foo1(x: number) { 
->foo1 : { (a: A): any; (c: C): any; }
+>foo1 : typeof foo1
 >x : number
 }
 
diff --git a/tests/baselines/reference/overloadCrash.types b/tests/baselines/reference/overloadCrash.types
index 88c2b8c79c0..3a93fcb6d53 100644
--- a/tests/baselines/reference/overloadCrash.types
+++ b/tests/baselines/reference/overloadCrash.types
@@ -17,12 +17,12 @@ interface I3 {a:number; b:number; c:number; d:number;};
 >d : number
 
 declare function foo(...n:I1[]);
->foo : { (...n: I1[]): any; (n1: I2, n3: I2): any; }
+>foo : typeof foo
 >n : I1[]
 >I1 : I1
 
 declare function foo(n1:I2, n3:I2);
->foo : { (...n: I1[]): any; (n1: I2, n3: I2): any; }
+>foo : typeof foo
 >n1 : I2
 >I2 : I2
 >n3 : I2
@@ -34,7 +34,7 @@ var i3:I3;
 
 foo(i3, i3); // should not crash the compiler :)
 >foo(i3, i3) : any
->foo : { (...n: I1[]): any; (n1: I2, n3: I2): any; }
+>foo : typeof foo
 >i3 : I3
 >i3 : I3
 
diff --git a/tests/baselines/reference/overloadEquivalenceWithStatics.types b/tests/baselines/reference/overloadEquivalenceWithStatics.types
index 96ad16ae19c..f55875576c2 100644
--- a/tests/baselines/reference/overloadEquivalenceWithStatics.types
+++ b/tests/baselines/reference/overloadEquivalenceWithStatics.types
@@ -4,7 +4,7 @@ class 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>; }
+>B : typeof B
 >S : S
 >v : A1<S>
 >A1 : A1<T>
@@ -13,7 +13,7 @@ static B<S>(v: A1<S>): A1<S>; // 1
 >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>; }
+>B : typeof B
 >S : S
 >v : S
 >S : S
@@ -21,7 +21,7 @@ static B<S>(v: S): A1<S>; // 2 : Error Duplicate signature
 >S : S
 
 static B<S>(v: any): A1<S> {
->B : { <S>(v: A1<S>): A1<S>; <S>(v: S): A1<S>; }
+>B : typeof B
 >S : S
 >v : any
 >A1 : A1<T>
diff --git a/tests/baselines/reference/overloadGenericFunctionWithRestArgs.types b/tests/baselines/reference/overloadGenericFunctionWithRestArgs.types
index 17ecdeac503..5ea89a59e9b 100644
--- a/tests/baselines/reference/overloadGenericFunctionWithRestArgs.types
+++ b/tests/baselines/reference/overloadGenericFunctionWithRestArgs.types
@@ -17,7 +17,7 @@ class A<U>{
 >U : U
 }
 function Choice<T>(...v_args: T[]): A<T>;
->Choice : <T>(...v_args: T[]) => A<T>
+>Choice : typeof Choice
 >T : T
 >v_args : T[]
 >T : T
@@ -25,7 +25,7 @@ function Choice<T>(...v_args: T[]): A<T>;
 >T : T
 
 function Choice<T>(...v_args: T[]): A<T> {
->Choice : <T>(...v_args: T[]) => A<T>
+>Choice : typeof Choice
 >T : T
 >v_args : T[]
 >T : T
diff --git a/tests/baselines/reference/overloadOnConstConstraintChecks2.types b/tests/baselines/reference/overloadOnConstConstraintChecks2.types
index c5af206c6da..d4a62b4e9a7 100644
--- a/tests/baselines/reference/overloadOnConstConstraintChecks2.types
+++ b/tests/baselines/reference/overloadOnConstConstraintChecks2.types
@@ -14,22 +14,22 @@ class C extends A {
 >foo : () => void
 }
 function foo(name: 'hi'): B;
->foo : { (name: 'hi'): B; (name: 'bye'): C; (name: string): A; }
+>foo : typeof foo
 >name : 'hi'
 >B : B
 
 function foo(name: 'bye'): C;
->foo : { (name: 'hi'): B; (name: 'bye'): C; (name: string): A; }
+>foo : typeof foo
 >name : 'bye'
 >C : C
 
 function foo(name: string): A;
->foo : { (name: 'hi'): B; (name: 'bye'): C; (name: string): A; }
+>foo : typeof foo
 >name : string
 >A : A
 
 function foo(name: any): A {
->foo : { (name: 'hi'): B; (name: 'bye'): C; (name: string): A; }
+>foo : typeof foo
 >name : any
 >A : A
 
diff --git a/tests/baselines/reference/overloadOnConstConstraintChecks3.types b/tests/baselines/reference/overloadOnConstConstraintChecks3.types
index adc41ff235c..e3c2ead8606 100644
--- a/tests/baselines/reference/overloadOnConstConstraintChecks3.types
+++ b/tests/baselines/reference/overloadOnConstConstraintChecks3.types
@@ -15,22 +15,22 @@ class C extends A {
 >foo : () => void
 }
 function foo(name: 'hi'): B;
->foo : { (name: 'hi'): B; (name: 'bye'): C; (name: string): A; }
+>foo : typeof foo
 >name : 'hi'
 >B : B
 
 function foo(name: 'bye'): C;
->foo : { (name: 'hi'): B; (name: 'bye'): C; (name: string): A; }
+>foo : typeof foo
 >name : 'bye'
 >C : C
 
 function foo(name: string): A;
->foo : { (name: 'hi'): B; (name: 'bye'): C; (name: string): A; }
+>foo : typeof foo
 >name : string
 >A : A
 
 function foo(name: any): A {
->foo : { (name: 'hi'): B; (name: 'bye'): C; (name: string): A; }
+>foo : typeof foo
 >name : any
 >A : A
 
diff --git a/tests/baselines/reference/overloadOnGenericClassAndNonGenericClass.types b/tests/baselines/reference/overloadOnGenericClassAndNonGenericClass.types
index c0d0533a533..c69b06e5c1c 100644
--- a/tests/baselines/reference/overloadOnGenericClassAndNonGenericClass.types
+++ b/tests/baselines/reference/overloadOnGenericClassAndNonGenericClass.types
@@ -26,13 +26,13 @@ class X2 { x: string; }
 >x : string
 
 function f(a: X1): A;
->f : { (a: X1): A; <T>(a: X<T>): B; }
+>f : typeof f
 >a : X1
 >X1 : X1
 >A : A
 
 function f<T>(a: X<T>): B;
->f : { (a: X1): A; <T>(a: X<T>): B; }
+>f : typeof f
 >T : T
 >a : X<T>
 >X : X<T>
@@ -40,7 +40,7 @@ function f<T>(a: X<T>): B;
 >B : B
 
 function f(a): any {
->f : { (a: X1): A; <T>(a: X<T>): B; }
+>f : typeof f
 >a : any
 }
 
@@ -51,7 +51,7 @@ var xs: X<string>;
 var t3 = f(xs);
 >t3 : A
 >f(xs) : A
->f : { (a: X1): A; <T>(a: X<T>): B; }
+>f : typeof f
 >xs : X<string>
 
 var t3: A; // should not error
diff --git a/tests/baselines/reference/overloadResolutionOverNonCTLambdas.types b/tests/baselines/reference/overloadResolutionOverNonCTLambdas.types
index 4b4781948a5..1936ac54b53 100644
--- a/tests/baselines/reference/overloadResolutionOverNonCTLambdas.types
+++ b/tests/baselines/reference/overloadResolutionOverNonCTLambdas.types
@@ -8,28 +8,17 @@ module Bugs {
   
   // replace(searchValue: RegExp, replaceValue: (substring: string, ...args: any[]) => string): string;
   function bug2(message:string, ...args:any[]):string {
->bug2 : (message: string, ...args: any[]) => string
+>bug2 : typeof bug2
 >message : string
 >args : any[]
 
     var result= message.replace(/\{(\d+)\}/g, function(match, ...rest) {
 >result : string
->message.replace(/\{(\d+)\}/g, function(match, ...rest) {
-      var index= rest[0];
-      return typeof args[index] !== 'undefined'
-        ? args[index]
-        : match;
-    }) : string
+>message.replace(/\{(\d+)\}/g, function(match, ...rest) {      var index= rest[0];      return typeof args[index] !== 'undefined'        ? args[index]        : match;    }) : string
 >message.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; }
 >message : 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; }
->/\{(\d+)\}/g : RegExp
->function(match, ...rest) {
-      var index= rest[0];
-      return typeof args[index] !== 'undefined'
-        ? args[index]
-        : match;
-    } : (match: string, ...rest: any[]) => any
+>function(match, ...rest) {      var index= rest[0];      return typeof args[index] !== 'undefined'        ? args[index]        : match;    } : (match: string, ...rest: any[]) => any
 >match : string
 >rest : any[]
 
@@ -39,9 +28,7 @@ module Bugs {
 >rest : any[]
 
       return typeof args[index] !== 'undefined'
->typeof args[index] !== 'undefined'
-        ? args[index]
-        : match : any
+>typeof args[index] !== 'undefined'        ? args[index]        : match : any
 >typeof args[index] !== 'undefined' : boolean
 >typeof args[index] : string
 >args[index] : any
@@ -63,25 +50,25 @@ module Bugs {
 }
 
 function bug3(f:(x:string)=>string) { return f("s") }
->bug3 : (f: (x: string) => string) => string
+>bug3 : typeof bug3
 >f : (x: string) => string
 >x : string
 >f("s") : string
 >f : (x: string) => string
 
 function fprime(x:string):string { return x; }
->fprime : (x: string) => string
+>fprime : typeof fprime
 >x : string
 >x : string
 
 bug3(fprime);
 >bug3(fprime) : string
->bug3 : (f: (x: string) => string) => string
->fprime : (x: string) => string
+>bug3 : typeof bug3
+>fprime : typeof fprime
 
 bug3(function(x:string):string { return x; });
 >bug3(function(x:string):string { return x; }) : string
->bug3 : (f: (x: string) => string) => string
+>bug3 : typeof bug3
 >function(x:string):string { return x; } : (x: string) => string
 >x : string
 >x : string
diff --git a/tests/baselines/reference/overloadResolutionOverNonCTObjectLit.types b/tests/baselines/reference/overloadResolutionOverNonCTObjectLit.types
index 6bc491fd157..0a13b0084c1 100644
--- a/tests/baselines/reference/overloadResolutionOverNonCTObjectLit.types
+++ b/tests/baselines/reference/overloadResolutionOverNonCTObjectLit.types
@@ -32,7 +32,7 @@ module Bugs {
                 }
                 
                 function bug3() {
->bug3 : () => void
+>bug3 : typeof bug3
 
                                 var tokens:IToken[]= [];
 >tokens : IToken[]
diff --git a/tests/baselines/reference/overloadReturnTypes.types b/tests/baselines/reference/overloadReturnTypes.types
index 1823c752ae7..125bca016d4 100644
--- a/tests/baselines/reference/overloadReturnTypes.types
+++ b/tests/baselines/reference/overloadReturnTypes.types
@@ -3,22 +3,22 @@ class Accessor {}
 >Accessor : Accessor
 
 function attr(name: string): string;
->attr : { (name: string): string; (name: string, value: string): Accessor; (map: any): Accessor; }
+>attr : typeof attr
 >name : string
 
 function attr(name: string, value: string): Accessor;
->attr : { (name: string): string; (name: string, value: string): Accessor; (map: any): Accessor; }
+>attr : typeof attr
 >name : string
 >value : string
 >Accessor : Accessor
 
 function attr(map: any): Accessor;
->attr : { (name: string): string; (name: string, value: string): Accessor; (map: any): Accessor; }
+>attr : typeof attr
 >map : any
 >Accessor : Accessor
 
 function attr(nameOrMap: any, value?: string): any {
->attr : { (name: string): string; (name: string, value: string): Accessor; (map: any): Accessor; }
+>attr : typeof attr
 >nameOrMap : any
 >value : string
 
diff --git a/tests/baselines/reference/overloadWithCallbacksWithDifferingOptionalityOnArgs.types b/tests/baselines/reference/overloadWithCallbacksWithDifferingOptionalityOnArgs.types
index 2ed804ad012..dec652bc677 100644
--- a/tests/baselines/reference/overloadWithCallbacksWithDifferingOptionalityOnArgs.types
+++ b/tests/baselines/reference/overloadWithCallbacksWithDifferingOptionalityOnArgs.types
@@ -1,27 +1,27 @@
 === tests/cases/compiler/overloadWithCallbacksWithDifferingOptionalityOnArgs.ts ===
 function x2(callback: (x?: number) => number);
->x2 : { (callback: (x?: number) => number): any; (callback: (x: string) => number): any; }
+>x2 : typeof x2
 >callback : (x?: number) => number
 >x : number
 
 function x2(callback: (x: string) => number);
->x2 : { (callback: (x?: number) => number): any; (callback: (x: string) => number): any; }
+>x2 : typeof x2
 >callback : (x: string) => number
 >x : string
 
 function x2(callback: (x: any) => number) { }
->x2 : { (callback: (x?: number) => number): any; (callback: (x: string) => number): any; }
+>x2 : typeof x2
 >callback : (x: any) => number
 >x : any
 
 x2(() => 1);
 >x2(() => 1) : any
->x2 : { (callback: (x?: number) => number): any; (callback: (x: string) => number): any; }
+>x2 : typeof x2
 >() => 1 : () => number
 
 x2((x) => 1 );
 >x2((x) => 1 ) : any
->x2 : { (callback: (x?: number) => number): any; (callback: (x: string) => number): any; }
+>x2 : typeof x2
 >(x) => 1 : (x: number) => number
 >x : number
 
diff --git a/tests/baselines/reference/overloadedStaticMethodSpecialization.types b/tests/baselines/reference/overloadedStaticMethodSpecialization.types
index bd60fc16fe0..9884a008e81 100644
--- a/tests/baselines/reference/overloadedStaticMethodSpecialization.types
+++ b/tests/baselines/reference/overloadedStaticMethodSpecialization.types
@@ -4,7 +4,7 @@ class A<T> {
 >T : T
 
     static B<S>(v: A<S>): A<S>;
->B : { <S>(v: A<S>): A<S>; <S>(v: S): A<S>; }
+>B : typeof B
 >S : S
 >v : A<S>
 >A : A<T>
@@ -13,7 +13,7 @@ class A<T> {
 >S : S
 
     static B<S>(v: S): A<S>;
->B : { <S>(v: A<S>): A<S>; <S>(v: S): A<S>; }
+>B : typeof B
 >S : S
 >v : S
 >S : S
@@ -21,7 +21,7 @@ class A<T> {
 >S : S
 
     static B<S>(v: any): A<S> {
->B : { <S>(v: A<S>): A<S>; <S>(v: S): A<S>; }
+>B : typeof B
 >S : S
 >v : any
 >A : A<T>
diff --git a/tests/baselines/reference/overloadsAndTypeArgumentArity.types b/tests/baselines/reference/overloadsAndTypeArgumentArity.types
index 1b76b8e13fe..b7ac883b837 100644
--- a/tests/baselines/reference/overloadsAndTypeArgumentArity.types
+++ b/tests/baselines/reference/overloadsAndTypeArgumentArity.types
@@ -1,21 +1,21 @@
 === tests/cases/compiler/overloadsAndTypeArgumentArity.ts ===
 declare function Callbacks(flags?: string): void;
->Callbacks : { (flags?: string): void; <T>(flags?: string): void; <T1, T2>(flags?: string): void; <T1, T2, T3>(flags?: string): void; }
+>Callbacks : typeof Callbacks
 >flags : string
 
 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; }
+>Callbacks : typeof Callbacks
 >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; }
+>Callbacks : typeof Callbacks
 >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; }
+>Callbacks : typeof Callbacks
 >T1 : T1
 >T2 : T2
 >T3 : T3
@@ -23,9 +23,9 @@ declare function Callbacks<T1, T2, T3>(flags?: string): void;
 
 Callbacks<number, string, boolean>('s'); // no error
 >Callbacks<number, string, boolean>('s') : void
->Callbacks : { (flags?: string): void; <T>(flags?: string): void; <T1, T2>(flags?: string): void; <T1, T2, T3>(flags?: string): void; }
+>Callbacks : typeof Callbacks
 
 new Callbacks<number, string, boolean>('s'); // no error
 >new Callbacks<number, string, boolean>('s') : any
->Callbacks : { (flags?: string): void; <T>(flags?: string): void; <T1, T2>(flags?: string): void; <T1, T2, T3>(flags?: string): void; }
+>Callbacks : typeof Callbacks
 
diff --git a/tests/baselines/reference/overloadsInDifferentContainersDisagreeOnAmbient.errors.txt b/tests/baselines/reference/overloadsInDifferentContainersDisagreeOnAmbient.errors.txt
deleted file mode 100644
index 06bd4d0f62d..00000000000
--- a/tests/baselines/reference/overloadsInDifferentContainersDisagreeOnAmbient.errors.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-==== tests/cases/compiler/overloadsInDifferentContainersDisagreeOnAmbient.ts (1 errors) ====
-    declare module M {
-        // Error because body is not ambient and this overload is
-        export function f();
-    }
-    
-    module M {
-        export function f() { }
-                        ~
-!!! Overload signatures must all be ambient or non-ambient.
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/overloadsInDifferentContainersDisagreeOnAmbient.js b/tests/baselines/reference/overloadsInDifferentContainersDisagreeOnAmbient.js
deleted file mode 100644
index 4d0ac15c717..00000000000
--- a/tests/baselines/reference/overloadsInDifferentContainersDisagreeOnAmbient.js
+++ /dev/null
@@ -1,17 +0,0 @@
-//// [overloadsInDifferentContainersDisagreeOnAmbient.ts]
-declare module M {
-    // Error because body is not ambient and this overload is
-    export function f();
-}
-
-module M {
-    export function f() { }
-}
-
-//// [overloadsInDifferentContainersDisagreeOnAmbient.js]
-var M;
-(function (M) {
-    function f() {
-    }
-    M.f = f;
-})(M || (M = {}));
diff --git a/tests/baselines/reference/parametersWithNoAnnotationAreAny.types b/tests/baselines/reference/parametersWithNoAnnotationAreAny.types
index 72fd2cb64be..791ab04550e 100644
--- a/tests/baselines/reference/parametersWithNoAnnotationAreAny.types
+++ b/tests/baselines/reference/parametersWithNoAnnotationAreAny.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/types/objectTypeLiteral/callSignatures/parametersWithNoAnnotationAreAny.ts ===
 function foo(x) { return x; }
->foo : (x: any) => any
+>foo : typeof foo
 >x : any
 >x : any
 
@@ -59,21 +59,11 @@ var a: {
 
 var b = {
 >b : { foo: (x: any) => any; a: (x: any) => any; b: (x: any) => any; }
->{
-    foo(x) {
-        return x;
-    },
-    a: function foo(x) {
-        return x;
-    },
-    b: (x) => x
-} : { foo: (x: any) => any; a: (x: any) => any; b: (x: any) => any; }
+>{    foo(x) {        return x;    },    a: function foo(x) {        return x;    },    b: (x) => x} : { foo: (x: any) => any; a: (x: any) => any; b: (x: any) => any; }
 
     foo(x) {
 >foo : (x: any) => any
->foo(x) {
-        return x;
-    } : (x: any) => any
+>foo(x) {        return x;    } : (x: any) => any
 >x : any
 
         return x;
@@ -82,9 +72,7 @@ var b = {
     },
     a: function foo(x) {
 >a : (x: any) => any
->function foo(x) {
-        return x;
-    } : (x: any) => any
+>function foo(x) {        return x;    } : (x: any) => any
 >foo : (x: any) => any
 >x : any
 
diff --git a/tests/baselines/reference/parser579071.types b/tests/baselines/reference/parser579071.types
index bfdece6f787..6ae9576c036 100644
--- a/tests/baselines/reference/parser579071.types
+++ b/tests/baselines/reference/parser579071.types
@@ -1,5 +1,4 @@
 === tests/cases/conformance/parser/ecmascript5/RegressionTests/parser579071.ts ===
 var x = /fo(o/;
 >x : RegExp
->/fo(o/ : RegExp
 
diff --git a/tests/baselines/reference/parser596700.types b/tests/baselines/reference/parser596700.types
index b14e28be716..d92d4b68ef5 100644
--- a/tests/baselines/reference/parser596700.types
+++ b/tests/baselines/reference/parser596700.types
@@ -1,5 +1,4 @@
 === tests/cases/conformance/parser/ecmascript5/RegressionTests/parser596700.ts ===
 var regex2 = /[a-z/]$/i;
 >regex2 : RegExp
->/[a-z/]$/i : RegExp
 
diff --git a/tests/baselines/reference/parser630933.types b/tests/baselines/reference/parser630933.types
index 5134bda8c1f..4b1686fcbf2 100644
--- a/tests/baselines/reference/parser630933.types
+++ b/tests/baselines/reference/parser630933.types
@@ -8,5 +8,4 @@ var b = a.match(/\/ver=([^/]+)/);
 >a.match : { (regexp: string): RegExpMatchArray; (regexp: RegExp): RegExpMatchArray; }
 >a : string
 >match : { (regexp: string): RegExpMatchArray; (regexp: RegExp): RegExpMatchArray; }
->/\/ver=([^/]+)/ : RegExp
 
diff --git a/tests/baselines/reference/parser645086_3.types b/tests/baselines/reference/parser645086_3.types
index 8cf6c0e73a5..57ca07e1b2a 100644
--- a/tests/baselines/reference/parser645086_3.types
+++ b/tests/baselines/reference/parser645086_3.types
@@ -1,5 +1,4 @@
 === tests/cases/conformance/parser/ecmascript5/RegressionTests/parser645086_3.ts ===
 var v = /[\]/]/
 >v : RegExp
->/[\]/]/ : RegExp
 
diff --git a/tests/baselines/reference/parser645086_4.types b/tests/baselines/reference/parser645086_4.types
index a7c00b04fce..01a702e2a06 100644
--- a/tests/baselines/reference/parser645086_4.types
+++ b/tests/baselines/reference/parser645086_4.types
@@ -1,5 +1,4 @@
 === tests/cases/conformance/parser/ecmascript5/RegressionTests/parser645086_4.ts ===
 var v = /[^\]/]/
 >v : RegExp
->/[^\]/]/ : RegExp
 
diff --git a/tests/baselines/reference/parser768531.types b/tests/baselines/reference/parser768531.types
index 43b5dbfa547..2da2298c8e2 100644
--- a/tests/baselines/reference/parser768531.types
+++ b/tests/baselines/reference/parser768531.types
@@ -1,5 +1,4 @@
 === tests/cases/conformance/parser/ecmascript5/Fuzz/parser768531.ts ===
 {a: 3}
-/x/
->/x/ : RegExp
-
+No type information for this code./x/
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserAccessibilityAfterStatic11.types b/tests/baselines/reference/parserAccessibilityAfterStatic11.types
index c3b3699bb27..d1be9d1e3c5 100644
--- a/tests/baselines/reference/parserAccessibilityAfterStatic11.types
+++ b/tests/baselines/reference/parserAccessibilityAfterStatic11.types
@@ -3,6 +3,6 @@ class Outer
 >Outer : Outer
 {
 static public() {}
->public : () => void
+>public : typeof public
 }
 
diff --git a/tests/baselines/reference/parserAccessibilityAfterStatic14.types b/tests/baselines/reference/parserAccessibilityAfterStatic14.types
index 6b4cff3e17f..547ad1baadb 100644
--- a/tests/baselines/reference/parserAccessibilityAfterStatic14.types
+++ b/tests/baselines/reference/parserAccessibilityAfterStatic14.types
@@ -3,7 +3,7 @@ class Outer
 >Outer : Outer
 {
 static public<T>() {}
->public : <T>() => void
+>public : typeof public
 >T : T
 }
 
diff --git a/tests/baselines/reference/parserAccessors1.errors.txt b/tests/baselines/reference/parserAccessors1.errors.txt
index 76747e37104..3059fd7c506 100644
--- a/tests/baselines/reference/parserAccessors1.errors.txt
+++ b/tests/baselines/reference/parserAccessors1.errors.txt
@@ -1,6 +1,8 @@
-==== tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors1.ts (1 errors) ====
+==== tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors1.ts (2 errors) ====
     class C {
         get Foo() { }
             ~~~
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
+            ~~~
 !!! A 'get' accessor must return a value or consist of a single 'throw' statement.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserAccessors1.js b/tests/baselines/reference/parserAccessors1.js
deleted file mode 100644
index b4cc809e7b2..00000000000
--- a/tests/baselines/reference/parserAccessors1.js
+++ /dev/null
@@ -1,17 +0,0 @@
-//// [parserAccessors1.ts]
-class C {
-    get Foo() { }
-}
-
-//// [parserAccessors1.js]
-var C = (function () {
-    function C() {
-    }
-    Object.defineProperty(C.prototype, "Foo", {
-        get: function () {
-        },
-        enumerable: true,
-        configurable: true
-    });
-    return C;
-})();
diff --git a/tests/baselines/reference/parserES3Accessors2.errors.txt b/tests/baselines/reference/parserAccessors2.errors.txt
similarity index 54%
rename from tests/baselines/reference/parserES3Accessors2.errors.txt
rename to tests/baselines/reference/parserAccessors2.errors.txt
index 13fd8c37b0f..80878ab0ab8 100644
--- a/tests/baselines/reference/parserES3Accessors2.errors.txt
+++ b/tests/baselines/reference/parserAccessors2.errors.txt
@@ -1,4 +1,4 @@
-==== tests/cases/conformance/parser/ecmascript3/Accessors/parserES3Accessors2.ts (1 errors) ====
+==== tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors2.ts (1 errors) ====
     class C {
         set Foo(a) { }
             ~~~
diff --git a/tests/baselines/reference/parserAccessors2.js b/tests/baselines/reference/parserAccessors2.js
deleted file mode 100644
index 71cbd6f466b..00000000000
--- a/tests/baselines/reference/parserAccessors2.js
+++ /dev/null
@@ -1,17 +0,0 @@
-//// [parserAccessors2.ts]
-class C {
-    set Foo(a) { }
-}
-
-//// [parserAccessors2.js]
-var C = (function () {
-    function C() {
-    }
-    Object.defineProperty(C.prototype, "Foo", {
-        set: function (a) {
-        },
-        enumerable: true,
-        configurable: true
-    });
-    return C;
-})();
diff --git a/tests/baselines/reference/parserAccessors2.types b/tests/baselines/reference/parserAccessors2.types
deleted file mode 100644
index 9a0d9b0fdaa..00000000000
--- a/tests/baselines/reference/parserAccessors2.types
+++ /dev/null
@@ -1,8 +0,0 @@
-=== tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors2.ts ===
-class C {
->C : C
-
-    set Foo(a) { }
->Foo : any
->a : any
-}
diff --git a/tests/baselines/reference/parserAccessors3.errors.txt b/tests/baselines/reference/parserAccessors3.errors.txt
index dd1f2075ae6..a709168b0e0 100644
--- a/tests/baselines/reference/parserAccessors3.errors.txt
+++ b/tests/baselines/reference/parserAccessors3.errors.txt
@@ -1,4 +1,6 @@
-==== tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors3.ts (1 errors) ====
+==== tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors3.ts (2 errors) ====
     var v = { get Foo() { } };
                   ~~~
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
+                  ~~~
 !!! A 'get' accessor must return a value or consist of a single 'throw' statement.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserAccessors3.js b/tests/baselines/reference/parserAccessors3.js
deleted file mode 100644
index 68d8ec15e63..00000000000
--- a/tests/baselines/reference/parserAccessors3.js
+++ /dev/null
@@ -1,6 +0,0 @@
-//// [parserAccessors3.ts]
-var v = { get Foo() { } };
-
-//// [parserAccessors3.js]
-var v = { get Foo() {
-} };
diff --git a/tests/baselines/reference/parserES3Accessors4.errors.txt b/tests/baselines/reference/parserAccessors4.errors.txt
similarity index 52%
rename from tests/baselines/reference/parserES3Accessors4.errors.txt
rename to tests/baselines/reference/parserAccessors4.errors.txt
index 04de4d3c7fc..46569ff83a2 100644
--- a/tests/baselines/reference/parserES3Accessors4.errors.txt
+++ b/tests/baselines/reference/parserAccessors4.errors.txt
@@ -1,4 +1,4 @@
-==== tests/cases/conformance/parser/ecmascript3/Accessors/parserES3Accessors4.ts (1 errors) ====
+==== tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors4.ts (1 errors) ====
     var v = { set Foo(a) { } };
                   ~~~
 !!! Accessors are only available when targeting ECMAScript 5 and higher.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserAccessors4.js b/tests/baselines/reference/parserAccessors4.js
deleted file mode 100644
index 9ebd1f0e82e..00000000000
--- a/tests/baselines/reference/parserAccessors4.js
+++ /dev/null
@@ -1,6 +0,0 @@
-//// [parserAccessors4.ts]
-var v = { set Foo(a) { } };
-
-//// [parserAccessors4.js]
-var v = { set Foo(a) {
-} };
diff --git a/tests/baselines/reference/parserAccessors4.types b/tests/baselines/reference/parserAccessors4.types
deleted file mode 100644
index d2db232d796..00000000000
--- a/tests/baselines/reference/parserAccessors4.types
+++ /dev/null
@@ -1,7 +0,0 @@
-=== tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors4.ts ===
-var v = { set Foo(a) { } };
->v : { Foo: any; }
->{ set Foo(a) { } } : { Foo: any; }
->Foo : any
->a : any
-
diff --git a/tests/baselines/reference/parserAccessors5.errors.txt b/tests/baselines/reference/parserAccessors5.errors.txt
index af7de2497f8..7be1d3c8184 100644
--- a/tests/baselines/reference/parserAccessors5.errors.txt
+++ b/tests/baselines/reference/parserAccessors5.errors.txt
@@ -2,5 +2,5 @@
     declare class C {
       get foo() { return 0; }
           ~~~
-!!! An accessor cannot be declared in an ambient context.
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserAccessors6.errors.txt b/tests/baselines/reference/parserAccessors6.errors.txt
index 3b1e8d658ae..81690486f07 100644
--- a/tests/baselines/reference/parserAccessors6.errors.txt
+++ b/tests/baselines/reference/parserAccessors6.errors.txt
@@ -2,5 +2,5 @@
     declare class C {
       set foo(v) { }
           ~~~
-!!! An accessor cannot be declared in an ambient context.
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserAccessors7.errors.txt b/tests/baselines/reference/parserAccessors7.errors.txt
index cac6f016814..9fc027e8e39 100644
--- a/tests/baselines/reference/parserAccessors7.errors.txt
+++ b/tests/baselines/reference/parserAccessors7.errors.txt
@@ -1,6 +1,6 @@
 ==== tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors7.ts (2 errors) ====
     var v = { get foo(v: number) { } };
                   ~~~
-!!! A 'get' accessor cannot have parameters.
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
                   ~~~
 !!! A 'get' accessor must return a value or consist of a single 'throw' statement.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserAccessors8.errors.txt b/tests/baselines/reference/parserAccessors8.errors.txt
index 17fbd54bd82..1b5968ac460 100644
--- a/tests/baselines/reference/parserAccessors8.errors.txt
+++ b/tests/baselines/reference/parserAccessors8.errors.txt
@@ -1,4 +1,4 @@
 ==== tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors8.ts (1 errors) ====
     var v = { set foo() { } }
                   ~~~
-!!! A 'set' accessor must have exactly one parameter.
\ No newline at end of file
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserAccessors9.errors.txt b/tests/baselines/reference/parserAccessors9.errors.txt
index 5b45fca62a7..6de8ef82f21 100644
--- a/tests/baselines/reference/parserAccessors9.errors.txt
+++ b/tests/baselines/reference/parserAccessors9.errors.txt
@@ -1,4 +1,4 @@
 ==== tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors9.ts (1 errors) ====
     var v = { set foo(a, b) { } }
                   ~~~
-!!! A 'set' accessor must have exactly one parameter.
\ No newline at end of file
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserAssignmentExpression1.errors.txt b/tests/baselines/reference/parserAssignmentExpression1.errors.txt
deleted file mode 100644
index 5e2b65cd977..00000000000
--- a/tests/baselines/reference/parserAssignmentExpression1.errors.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-==== tests/cases/conformance/parser/ecmascript5/Expressions/parserAssignmentExpression1.ts (3 errors) ====
-    (foo()) = bar;
-    ~~~~~~~
-!!! Invalid left-hand side of assignment expression.
-     ~~~
-!!! Cannot find name 'foo'.
-              ~~~
-!!! Cannot find name 'bar'.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserAssignmentExpression1.js b/tests/baselines/reference/parserAssignmentExpression1.js
deleted file mode 100644
index f6dfa5d3956..00000000000
--- a/tests/baselines/reference/parserAssignmentExpression1.js
+++ /dev/null
@@ -1,5 +0,0 @@
-//// [parserAssignmentExpression1.ts]
-(foo()) = bar;
-
-//// [parserAssignmentExpression1.js]
-(foo()) = bar;
diff --git a/tests/baselines/reference/parserConstructorDeclaration11.errors.txt b/tests/baselines/reference/parserConstructorDeclaration11.errors.txt
deleted file mode 100644
index 1a516bcc668..00000000000
--- a/tests/baselines/reference/parserConstructorDeclaration11.errors.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-==== tests/cases/conformance/parser/ecmascript5/ConstructorDeclarations/parserConstructorDeclaration11.ts (2 errors) ====
-    class C {
-      constructor<>() { }
-                 ~~
-!!! Type parameter list cannot be empty.
-                  
-!!! Type parameters cannot appear on a constructor declaration.
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserDoStatement2.js b/tests/baselines/reference/parserDoStatement2.js
deleted file mode 100644
index 9febdc60865..00000000000
--- a/tests/baselines/reference/parserDoStatement2.js
+++ /dev/null
@@ -1,8 +0,0 @@
-//// [parserDoStatement2.ts]
-do{;}while(false)false
-
-//// [parserDoStatement2.js]
-do {
-    ;
-} while (false);
-false;
diff --git a/tests/baselines/reference/parserDoStatement2.types b/tests/baselines/reference/parserDoStatement2.types
deleted file mode 100644
index 62790b49103..00000000000
--- a/tests/baselines/reference/parserDoStatement2.types
+++ /dev/null
@@ -1,3 +0,0 @@
-=== tests/cases/conformance/parser/ecmascript5/Statements/parserDoStatement2.ts ===
-do{;}while(false)false
-No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserES3Accessors1.errors.txt b/tests/baselines/reference/parserES3Accessors1.errors.txt
deleted file mode 100644
index 53bfc5e868e..00000000000
--- a/tests/baselines/reference/parserES3Accessors1.errors.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-==== tests/cases/conformance/parser/ecmascript3/Accessors/parserES3Accessors1.ts (2 errors) ====
-    class C {
-        get Foo() { }
-            ~~~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
-            ~~~
-!!! A 'get' accessor must return a value or consist of a single 'throw' statement.
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserES3Accessors3.errors.txt b/tests/baselines/reference/parserES3Accessors3.errors.txt
deleted file mode 100644
index 74a79ccf6d8..00000000000
--- a/tests/baselines/reference/parserES3Accessors3.errors.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-==== tests/cases/conformance/parser/ecmascript3/Accessors/parserES3Accessors3.ts (2 errors) ====
-    var v = { get Foo() { } };
-                  ~~~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
-                  ~~~
-!!! A 'get' accessor must return a value or consist of a single 'throw' statement.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserErrorRecovery_ExtendsOrImplementsClause6.errors.txt b/tests/baselines/reference/parserErrorRecovery_ExtendsOrImplementsClause6.errors.txt
deleted file mode 100644
index 7efe1e42167..00000000000
--- a/tests/baselines/reference/parserErrorRecovery_ExtendsOrImplementsClause6.errors.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-==== tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ExtendsOrImplementsClauses/parserErrorRecovery_ExtendsOrImplementsClause6.ts (1 errors) ====
-    interface I extends { }
-                ~~~~~~~
-!!! 'extends' list cannot be empty.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserForStatement4.errors.txt b/tests/baselines/reference/parserForStatement4.errors.txt
deleted file mode 100644
index 923b05341b5..00000000000
--- a/tests/baselines/reference/parserForStatement4.errors.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-==== tests/cases/conformance/parser/ecmascript5/Statements/parserForStatement4.ts (3 errors) ====
-    for (a = 1 in b) {
-         ~
-!!! Cannot find name 'a'.
-         ~~~~~
-!!! The left-hand side of a 'for...in' statement must be of type 'string' or 'any'.
-                  ~
-!!! Cannot find name 'b'.
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserForStatement4.js b/tests/baselines/reference/parserForStatement4.js
deleted file mode 100644
index 9da13b387d0..00000000000
--- a/tests/baselines/reference/parserForStatement4.js
+++ /dev/null
@@ -1,7 +0,0 @@
-//// [parserForStatement4.ts]
-for (a = 1 in b) {
-}
-
-//// [parserForStatement4.js]
-for (a = 1 in b) {
-}
diff --git a/tests/baselines/reference/parserForStatement5.errors.txt b/tests/baselines/reference/parserForStatement5.errors.txt
deleted file mode 100644
index e1d52c58ab6..00000000000
--- a/tests/baselines/reference/parserForStatement5.errors.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-==== tests/cases/conformance/parser/ecmascript5/Statements/parserForStatement5.ts (2 errors) ====
-    for ({} in b) {
-         ~~
-!!! The left-hand side of a 'for...in' statement must be of type 'string' or 'any'.
-               ~
-!!! Cannot find name 'b'.
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserForStatement5.js b/tests/baselines/reference/parserForStatement5.js
deleted file mode 100644
index 8c6b12b8c18..00000000000
--- a/tests/baselines/reference/parserForStatement5.js
+++ /dev/null
@@ -1,7 +0,0 @@
-//// [parserForStatement5.ts]
-for ({} in b) {
-}
-
-//// [parserForStatement5.js]
-for ({} in b) {
-}
diff --git a/tests/baselines/reference/parserForStatement6.errors.txt b/tests/baselines/reference/parserForStatement6.errors.txt
deleted file mode 100644
index cb758f34359..00000000000
--- a/tests/baselines/reference/parserForStatement6.errors.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-==== tests/cases/conformance/parser/ecmascript5/Statements/parserForStatement6.ts (3 errors) ====
-    for (foo() in b) {
-         ~~~
-!!! Cannot find name 'foo'.
-         ~~~~~
-!!! The left-hand side of a 'for...in' statement must be of type 'string' or 'any'.
-                  ~
-!!! Cannot find name 'b'.
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserForStatement6.js b/tests/baselines/reference/parserForStatement6.js
deleted file mode 100644
index d05ee600b35..00000000000
--- a/tests/baselines/reference/parserForStatement6.js
+++ /dev/null
@@ -1,7 +0,0 @@
-//// [parserForStatement6.ts]
-for (foo() in b) {
-}
-
-//// [parserForStatement6.js]
-for (foo() in b) {
-}
diff --git a/tests/baselines/reference/parserForStatement7.errors.txt b/tests/baselines/reference/parserForStatement7.errors.txt
deleted file mode 100644
index 0b1eeba1e05..00000000000
--- a/tests/baselines/reference/parserForStatement7.errors.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-==== tests/cases/conformance/parser/ecmascript5/Statements/parserForStatement7.ts (3 errors) ====
-    for (new foo() in b) {
-         ~~~~~~~~~
-!!! The left-hand side of a 'for...in' statement must be of type 'string' or 'any'.
-             ~~~
-!!! Cannot find name 'foo'.
-                      ~
-!!! Cannot find name 'b'.
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserForStatement7.js b/tests/baselines/reference/parserForStatement7.js
deleted file mode 100644
index a5c149131c8..00000000000
--- a/tests/baselines/reference/parserForStatement7.js
+++ /dev/null
@@ -1,7 +0,0 @@
-//// [parserForStatement7.ts]
-for (new foo() in b) {
-}
-
-//// [parserForStatement7.js]
-for (new foo() in b) {
-}
diff --git a/tests/baselines/reference/parserForStatement8.errors.txt b/tests/baselines/reference/parserForStatement8.errors.txt
deleted file mode 100644
index f374f6935aa..00000000000
--- a/tests/baselines/reference/parserForStatement8.errors.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-==== tests/cases/conformance/parser/ecmascript5/Statements/parserForStatement8.ts (2 errors) ====
-    for (this in b) {
-         ~~~~
-!!! Invalid left-hand side in 'for...in' statement.
-                 ~
-!!! Cannot find name 'b'.
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserForStatement8.js b/tests/baselines/reference/parserForStatement8.js
deleted file mode 100644
index 3f2bd697e58..00000000000
--- a/tests/baselines/reference/parserForStatement8.js
+++ /dev/null
@@ -1,7 +0,0 @@
-//// [parserForStatement8.ts]
-for (this in b) {
-}
-
-//// [parserForStatement8.js]
-for (this in b) {
-}
diff --git a/tests/baselines/reference/parserFunctionDeclaration1.d.types b/tests/baselines/reference/parserFunctionDeclaration1.d.types
index cb62ab01c90..732188e3e8b 100644
--- a/tests/baselines/reference/parserFunctionDeclaration1.d.types
+++ b/tests/baselines/reference/parserFunctionDeclaration1.d.types
@@ -1,4 +1,4 @@
 === tests/cases/conformance/parser/ecmascript5/FunctionDeclarations/parserFunctionDeclaration1.d.ts ===
 declare function F();
->F : () => any
+>F : typeof F
 
diff --git a/tests/baselines/reference/parserFunctionDeclaration5.types b/tests/baselines/reference/parserFunctionDeclaration5.types
index a3cf71336ea..2d48c8f5d1a 100644
--- a/tests/baselines/reference/parserFunctionDeclaration5.types
+++ b/tests/baselines/reference/parserFunctionDeclaration5.types
@@ -1,7 +1,7 @@
 === tests/cases/conformance/parser/ecmascript5/FunctionDeclarations/parserFunctionDeclaration5.ts ===
 function foo();
->foo : () => any
+>foo : typeof foo
 
 function foo() { }
->foo : () => any
+>foo : typeof foo
 
diff --git a/tests/baselines/reference/parserFunctionDeclaration8.types b/tests/baselines/reference/parserFunctionDeclaration8.types
index ebb8ff8d409..15a8721932d 100644
--- a/tests/baselines/reference/parserFunctionDeclaration8.types
+++ b/tests/baselines/reference/parserFunctionDeclaration8.types
@@ -3,5 +3,5 @@ declare module M {
 >M : typeof M
 
    function foo();
->foo : () => any
+>foo : typeof foo
 }
diff --git a/tests/baselines/reference/parserGetAccessorWithTypeParameters1.errors.txt b/tests/baselines/reference/parserGetAccessorWithTypeParameters1.errors.txt
index 0f290dbd8ab..8af4097341b 100644
--- a/tests/baselines/reference/parserGetAccessorWithTypeParameters1.errors.txt
+++ b/tests/baselines/reference/parserGetAccessorWithTypeParameters1.errors.txt
@@ -2,7 +2,7 @@
     class C {
       get foo<T>() { }
           ~~~
-!!! An accessor cannot have type parameters.
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
           ~~~
 !!! A 'get' accessor must return a value or consist of a single 'throw' statement.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserGreaterThanTokenAmbiguity10.types b/tests/baselines/reference/parserGreaterThanTokenAmbiguity10.types
index 09626481336..f58be05c966 100644
--- a/tests/baselines/reference/parserGreaterThanTokenAmbiguity10.types
+++ b/tests/baselines/reference/parserGreaterThanTokenAmbiguity10.types
@@ -1,9 +1,6 @@
 === tests/cases/conformance/parser/ecmascript5/Generics/parserGreaterThanTokenAmbiguity10.ts ===
 1 
->1 
-// before
->>> // after
-2 : number
+>1 // before>>> // after2 : number
 
 // before
 >>> // after
diff --git a/tests/baselines/reference/parserGreaterThanTokenAmbiguity5.types b/tests/baselines/reference/parserGreaterThanTokenAmbiguity5.types
index e62528a1e1f..770d3fa611f 100644
--- a/tests/baselines/reference/parserGreaterThanTokenAmbiguity5.types
+++ b/tests/baselines/reference/parserGreaterThanTokenAmbiguity5.types
@@ -1,9 +1,6 @@
 === tests/cases/conformance/parser/ecmascript5/Generics/parserGreaterThanTokenAmbiguity5.ts ===
 1 
->1 
-// before
->> // after
-2 : number
+>1 // before>> // after2 : number
 
 // before
 >> // after
diff --git a/tests/baselines/reference/parserKeywordsAsIdentifierName1.types b/tests/baselines/reference/parserKeywordsAsIdentifierName1.types
index e940f534c1e..e917dc76cf0 100644
--- a/tests/baselines/reference/parserKeywordsAsIdentifierName1.types
+++ b/tests/baselines/reference/parserKeywordsAsIdentifierName1.types
@@ -1,11 +1,7 @@
 === tests/cases/conformance/parser/ecmascript5/parserKeywordsAsIdentifierName1.ts ===
 var big = {
 >big : { break: number; super: number; const: number; }
->{
-   break : 0,
-   super : 0,
-   const : 0
-} : { break: number; super: number; const: number; }
+>{   break : 0,   super : 0,   const : 0} : { break: number; super: number; const: number; }
 
    break : 0,
 >break : number
diff --git a/tests/baselines/reference/parserKeywordsAsIdentifierName2.errors.txt b/tests/baselines/reference/parserKeywordsAsIdentifierName2.errors.txt
index 41b5ab32f89..ca8bde2f068 100644
--- a/tests/baselines/reference/parserKeywordsAsIdentifierName2.errors.txt
+++ b/tests/baselines/reference/parserKeywordsAsIdentifierName2.errors.txt
@@ -1,5 +1,5 @@
 ==== tests/cases/conformance/parser/ecmascript5/parserKeywordsAsIdentifierName2.ts (2 errors) ====
-    // 'public' should be marked unusable, should complain on trailing /*
+    // 'public' shoudl be marked unusable because it has a trailing /*
     a.public /*
                
 !!! '*/' expected.
diff --git a/tests/baselines/reference/parserMemberAccessor1.errors.txt b/tests/baselines/reference/parserMemberAccessor1.errors.txt
index c768b0ce2fe..59e39b490c8 100644
--- a/tests/baselines/reference/parserMemberAccessor1.errors.txt
+++ b/tests/baselines/reference/parserMemberAccessor1.errors.txt
@@ -1,7 +1,11 @@
-==== tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessor1.ts (1 errors) ====
+==== tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessor1.ts (3 errors) ====
     class C {
       get foo() { }
           ~~~
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
+          ~~~
 !!! A 'get' accessor must return a value or consist of a single 'throw' statement.
       set foo(a) { }
+          ~~~
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserMemberAccessor1.js b/tests/baselines/reference/parserMemberAccessor1.js
deleted file mode 100644
index 3d4690d58e9..00000000000
--- a/tests/baselines/reference/parserMemberAccessor1.js
+++ /dev/null
@@ -1,20 +0,0 @@
-//// [parserMemberAccessor1.ts]
-class C {
-  get foo() { }
-  set foo(a) { }
-}
-
-//// [parserMemberAccessor1.js]
-var C = (function () {
-    function C() {
-    }
-    Object.defineProperty(C.prototype, "foo", {
-        get: function () {
-        },
-        set: function (a) {
-        },
-        enumerable: true,
-        configurable: true
-    });
-    return C;
-})();
diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration1.errors.txt b/tests/baselines/reference/parserMemberAccessorDeclaration1.errors.txt
index 403a30a67ae..0cb6526b2ad 100644
--- a/tests/baselines/reference/parserMemberAccessorDeclaration1.errors.txt
+++ b/tests/baselines/reference/parserMemberAccessorDeclaration1.errors.txt
@@ -1,6 +1,8 @@
-==== tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration1.ts (1 errors) ====
+==== tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration1.ts (2 errors) ====
     class C {
       get a() { }
           ~
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
+          ~
 !!! A 'get' accessor must return a value or consist of a single 'throw' statement.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration1.js b/tests/baselines/reference/parserMemberAccessorDeclaration1.js
deleted file mode 100644
index 1f0b5eb3bd9..00000000000
--- a/tests/baselines/reference/parserMemberAccessorDeclaration1.js
+++ /dev/null
@@ -1,17 +0,0 @@
-//// [parserMemberAccessorDeclaration1.ts]
-class C {
-  get a() { }
-}
-
-//// [parserMemberAccessorDeclaration1.js]
-var C = (function () {
-    function C() {
-    }
-    Object.defineProperty(C.prototype, "a", {
-        get: function () {
-        },
-        enumerable: true,
-        configurable: true
-    });
-    return C;
-})();
diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration10.errors.txt b/tests/baselines/reference/parserMemberAccessorDeclaration10.errors.txt
index a1b29085f5d..b0a0c583d54 100644
--- a/tests/baselines/reference/parserMemberAccessorDeclaration10.errors.txt
+++ b/tests/baselines/reference/parserMemberAccessorDeclaration10.errors.txt
@@ -1,8 +1,10 @@
-==== tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration10.ts (2 errors) ====
+==== tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration10.ts (3 errors) ====
     class C {
         export get Foo() { }
         ~~~~~~
 !!! 'export' modifier cannot appear on a class element.
                    ~~~
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
+                   ~~~
 !!! A 'get' accessor must return a value or consist of a single 'throw' statement.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration11.errors.txt b/tests/baselines/reference/parserMemberAccessorDeclaration11.errors.txt
index 6d3e1651273..1e8324f4e60 100644
--- a/tests/baselines/reference/parserMemberAccessorDeclaration11.errors.txt
+++ b/tests/baselines/reference/parserMemberAccessorDeclaration11.errors.txt
@@ -1,6 +1,8 @@
-==== tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration11.ts (1 errors) ====
+==== tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration11.ts (2 errors) ====
     class C {
         declare get Foo() { }
         ~~~~~~~
 !!! 'declare' modifier cannot appear on a class element.
+                    ~~~
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration12.errors.txt b/tests/baselines/reference/parserMemberAccessorDeclaration12.errors.txt
index 7cbf2606274..0c0990b37e5 100644
--- a/tests/baselines/reference/parserMemberAccessorDeclaration12.errors.txt
+++ b/tests/baselines/reference/parserMemberAccessorDeclaration12.errors.txt
@@ -2,7 +2,7 @@
     class C {
        get Foo(a: number) { }
            ~~~
-!!! A 'get' accessor cannot have parameters.
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
            ~~~
 !!! A 'get' accessor must return a value or consist of a single 'throw' statement.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration13.errors.txt b/tests/baselines/reference/parserMemberAccessorDeclaration13.errors.txt
index b891866c684..dd8eb7b4147 100644
--- a/tests/baselines/reference/parserMemberAccessorDeclaration13.errors.txt
+++ b/tests/baselines/reference/parserMemberAccessorDeclaration13.errors.txt
@@ -2,5 +2,5 @@
     class C {
        set Foo() { }
            ~~~
-!!! A 'set' accessor must have exactly one parameter.
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration14.errors.txt b/tests/baselines/reference/parserMemberAccessorDeclaration14.errors.txt
index 6d49231ce08..95ede4f9764 100644
--- a/tests/baselines/reference/parserMemberAccessorDeclaration14.errors.txt
+++ b/tests/baselines/reference/parserMemberAccessorDeclaration14.errors.txt
@@ -2,5 +2,5 @@
     class C {
        set Foo(a: number, b: number) { }
            ~~~
-!!! A 'set' accessor must have exactly one parameter.
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration15.errors.txt b/tests/baselines/reference/parserMemberAccessorDeclaration15.errors.txt
index ae659f7f464..35b762e1e26 100644
--- a/tests/baselines/reference/parserMemberAccessorDeclaration15.errors.txt
+++ b/tests/baselines/reference/parserMemberAccessorDeclaration15.errors.txt
@@ -2,7 +2,7 @@
     class C {
        set Foo(public a: number) { }
            ~~~
-!!! A parameter property is only allowed in a constructor implementation.
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
                ~~~~~~~~~~~~~~~~
 !!! A parameter property is only allowed in a constructor implementation.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration16.errors.txt b/tests/baselines/reference/parserMemberAccessorDeclaration16.errors.txt
index 7505ca7a68b..1f78f88831f 100644
--- a/tests/baselines/reference/parserMemberAccessorDeclaration16.errors.txt
+++ b/tests/baselines/reference/parserMemberAccessorDeclaration16.errors.txt
@@ -2,5 +2,5 @@
     class C {
        set Foo(a = 1) { }
            ~~~
-!!! A 'set' accessor parameter cannot have an initializer.
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration17.errors.txt b/tests/baselines/reference/parserMemberAccessorDeclaration17.errors.txt
index b2f34a5d348..bd2af9040f7 100644
--- a/tests/baselines/reference/parserMemberAccessorDeclaration17.errors.txt
+++ b/tests/baselines/reference/parserMemberAccessorDeclaration17.errors.txt
@@ -2,5 +2,5 @@
     class C {
        set Foo(a?: number) { }
            ~~~
-!!! A 'set' accessor cannot have an optional parameter.
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration18.errors.txt b/tests/baselines/reference/parserMemberAccessorDeclaration18.errors.txt
index d7ea5ac0188..6c798ed48dc 100644
--- a/tests/baselines/reference/parserMemberAccessorDeclaration18.errors.txt
+++ b/tests/baselines/reference/parserMemberAccessorDeclaration18.errors.txt
@@ -2,5 +2,5 @@
     class C {
        set Foo(...a) { }
            ~~~
-!!! A 'set' accessor cannot have rest parameter.
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration2.errors.txt b/tests/baselines/reference/parserMemberAccessorDeclaration2.errors.txt
index 1a32d342f1b..3a54a437ec0 100644
--- a/tests/baselines/reference/parserMemberAccessorDeclaration2.errors.txt
+++ b/tests/baselines/reference/parserMemberAccessorDeclaration2.errors.txt
@@ -1,6 +1,8 @@
-==== tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration2.ts (1 errors) ====
+==== tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration2.ts (2 errors) ====
     class C {
       get "b"() { }
           ~~~
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
+          ~~~
 !!! A 'get' accessor must return a value or consist of a single 'throw' statement.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration2.js b/tests/baselines/reference/parserMemberAccessorDeclaration2.js
deleted file mode 100644
index 00cc2812014..00000000000
--- a/tests/baselines/reference/parserMemberAccessorDeclaration2.js
+++ /dev/null
@@ -1,17 +0,0 @@
-//// [parserMemberAccessorDeclaration2.ts]
-class C {
-  get "b"() { }
-}
-
-//// [parserMemberAccessorDeclaration2.js]
-var C = (function () {
-    function C() {
-    }
-    Object.defineProperty(C.prototype, "b", {
-        get: function () {
-        },
-        enumerable: true,
-        configurable: true
-    });
-    return C;
-})();
diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration3.errors.txt b/tests/baselines/reference/parserMemberAccessorDeclaration3.errors.txt
index dbf94b6420f..bd30a29dc52 100644
--- a/tests/baselines/reference/parserMemberAccessorDeclaration3.errors.txt
+++ b/tests/baselines/reference/parserMemberAccessorDeclaration3.errors.txt
@@ -1,6 +1,8 @@
-==== tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration3.ts (1 errors) ====
+==== tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration3.ts (2 errors) ====
     class C {
       get 0() { }
           ~
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
+          ~
 !!! A 'get' accessor must return a value or consist of a single 'throw' statement.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration3.js b/tests/baselines/reference/parserMemberAccessorDeclaration3.js
deleted file mode 100644
index 86fc2c3e532..00000000000
--- a/tests/baselines/reference/parserMemberAccessorDeclaration3.js
+++ /dev/null
@@ -1,17 +0,0 @@
-//// [parserMemberAccessorDeclaration3.ts]
-class C {
-  get 0() { }
-}
-
-//// [parserMemberAccessorDeclaration3.js]
-var C = (function () {
-    function C() {
-    }
-    Object.defineProperty(C.prototype, "0", {
-        get: function () {
-        },
-        enumerable: true,
-        configurable: true
-    });
-    return C;
-})();
diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration4.errors.txt b/tests/baselines/reference/parserMemberAccessorDeclaration4.errors.txt
new file mode 100644
index 00000000000..30d2b4e437b
--- /dev/null
+++ b/tests/baselines/reference/parserMemberAccessorDeclaration4.errors.txt
@@ -0,0 +1,6 @@
+==== tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration4.ts (1 errors) ====
+    class C {
+      set a(i) { }
+          ~
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration4.js b/tests/baselines/reference/parserMemberAccessorDeclaration4.js
deleted file mode 100644
index 552c2c1d27a..00000000000
--- a/tests/baselines/reference/parserMemberAccessorDeclaration4.js
+++ /dev/null
@@ -1,17 +0,0 @@
-//// [parserMemberAccessorDeclaration4.ts]
-class C {
-  set a(i) { }
-}
-
-//// [parserMemberAccessorDeclaration4.js]
-var C = (function () {
-    function C() {
-    }
-    Object.defineProperty(C.prototype, "a", {
-        set: function (i) {
-        },
-        enumerable: true,
-        configurable: true
-    });
-    return C;
-})();
diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration4.types b/tests/baselines/reference/parserMemberAccessorDeclaration4.types
deleted file mode 100644
index de4bc245d2e..00000000000
--- a/tests/baselines/reference/parserMemberAccessorDeclaration4.types
+++ /dev/null
@@ -1,8 +0,0 @@
-=== tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration4.ts ===
-class C {
->C : C
-
-  set a(i) { }
->a : any
->i : any
-}
diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration5.errors.txt b/tests/baselines/reference/parserMemberAccessorDeclaration5.errors.txt
new file mode 100644
index 00000000000..6fa083c4df8
--- /dev/null
+++ b/tests/baselines/reference/parserMemberAccessorDeclaration5.errors.txt
@@ -0,0 +1,6 @@
+==== tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration5.ts (1 errors) ====
+    class C {
+      set "a"(i) { }
+          ~~~
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration5.js b/tests/baselines/reference/parserMemberAccessorDeclaration5.js
deleted file mode 100644
index 309df8b68ec..00000000000
--- a/tests/baselines/reference/parserMemberAccessorDeclaration5.js
+++ /dev/null
@@ -1,17 +0,0 @@
-//// [parserMemberAccessorDeclaration5.ts]
-class C {
-  set "a"(i) { }
-}
-
-//// [parserMemberAccessorDeclaration5.js]
-var C = (function () {
-    function C() {
-    }
-    Object.defineProperty(C.prototype, "a", {
-        set: function (i) {
-        },
-        enumerable: true,
-        configurable: true
-    });
-    return C;
-})();
diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration5.types b/tests/baselines/reference/parserMemberAccessorDeclaration5.types
deleted file mode 100644
index d22ee2d775a..00000000000
--- a/tests/baselines/reference/parserMemberAccessorDeclaration5.types
+++ /dev/null
@@ -1,7 +0,0 @@
-=== tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration5.ts ===
-class C {
->C : C
-
-  set "a"(i) { }
->i : any
-}
diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration6.errors.txt b/tests/baselines/reference/parserMemberAccessorDeclaration6.errors.txt
new file mode 100644
index 00000000000..18c6675eac1
--- /dev/null
+++ b/tests/baselines/reference/parserMemberAccessorDeclaration6.errors.txt
@@ -0,0 +1,6 @@
+==== tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration6.ts (1 errors) ====
+    class C {
+      set 0(i) { }
+          ~
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration6.js b/tests/baselines/reference/parserMemberAccessorDeclaration6.js
deleted file mode 100644
index 0b44673f146..00000000000
--- a/tests/baselines/reference/parserMemberAccessorDeclaration6.js
+++ /dev/null
@@ -1,17 +0,0 @@
-//// [parserMemberAccessorDeclaration6.ts]
-class C {
-  set 0(i) { }
-}
-
-//// [parserMemberAccessorDeclaration6.js]
-var C = (function () {
-    function C() {
-    }
-    Object.defineProperty(C.prototype, "0", {
-        set: function (i) {
-        },
-        enumerable: true,
-        configurable: true
-    });
-    return C;
-})();
diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration6.types b/tests/baselines/reference/parserMemberAccessorDeclaration6.types
deleted file mode 100644
index a06b6ddfa0c..00000000000
--- a/tests/baselines/reference/parserMemberAccessorDeclaration6.types
+++ /dev/null
@@ -1,7 +0,0 @@
-=== tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration6.ts ===
-class C {
->C : C
-
-  set 0(i) { }
->i : any
-}
diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration7.errors.txt b/tests/baselines/reference/parserMemberAccessorDeclaration7.errors.txt
index 20ebd2f3583..61c9115a17a 100644
--- a/tests/baselines/reference/parserMemberAccessorDeclaration7.errors.txt
+++ b/tests/baselines/reference/parserMemberAccessorDeclaration7.errors.txt
@@ -1,8 +1,10 @@
-==== tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration7.ts (2 errors) ====
+==== tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration7.ts (3 errors) ====
     class C {
         public public get Foo() { }
                ~~~~~~
 !!! Accessibility modifier already seen.
                           ~~~
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
+                          ~~~
 !!! A 'get' accessor must return a value or consist of a single 'throw' statement.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration8.errors.txt b/tests/baselines/reference/parserMemberAccessorDeclaration8.errors.txt
index f6d151bfb7f..b8e304aed8c 100644
--- a/tests/baselines/reference/parserMemberAccessorDeclaration8.errors.txt
+++ b/tests/baselines/reference/parserMemberAccessorDeclaration8.errors.txt
@@ -1,8 +1,10 @@
-==== tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration8.ts (2 errors) ====
+==== tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration8.ts (3 errors) ====
     class C {
         static static get Foo() { }
                ~~~~~~
 !!! 'static' modifier already seen.
                           ~~~
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
+                          ~~~
 !!! A 'get' accessor must return a value or consist of a single 'throw' statement.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration9.errors.txt b/tests/baselines/reference/parserMemberAccessorDeclaration9.errors.txt
index e4c88dfd57d..18d9653c8e0 100644
--- a/tests/baselines/reference/parserMemberAccessorDeclaration9.errors.txt
+++ b/tests/baselines/reference/parserMemberAccessorDeclaration9.errors.txt
@@ -1,8 +1,10 @@
-==== tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration9.ts (2 errors) ====
+==== tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration9.ts (3 errors) ====
     class C {
         static public get Foo() { }
                ~~~~~~
 !!! 'public' modifier must precede 'static' modifier.
                           ~~~
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
+                          ~~~
 !!! A 'get' accessor must return a value or consist of a single 'throw' statement.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserModuleDeclaration11.types b/tests/baselines/reference/parserModuleDeclaration11.types
index 23c74ae1538..5a0d48f4e6c 100644
--- a/tests/baselines/reference/parserModuleDeclaration11.types
+++ b/tests/baselines/reference/parserModuleDeclaration11.types
@@ -6,14 +6,14 @@ declare module string {
 >X : X
 
     export function foo(s: string);
->foo : (s: string) => any
+>foo : typeof foo
 >s : string
 }
 string.foo("abc");
 >string.foo("abc") : any
->string.foo : (s: string) => any
+>string.foo : typeof foo
 >string : typeof string
->foo : (s: string) => any
+>foo : typeof foo
 
 var x: string.X;
 >x : X
diff --git a/tests/baselines/reference/parserObjectCreation2.errors.txt b/tests/baselines/reference/parserObjectCreation2.errors.txt
deleted file mode 100644
index c20922d1784..00000000000
--- a/tests/baselines/reference/parserObjectCreation2.errors.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-==== tests/cases/conformance/parser/ecmascript5/Expressions/parserObjectCreation2.ts (1 errors) ====
-    new new Foo()()
-            ~~~
-!!! Cannot find name 'Foo'.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserObjectCreation2.js b/tests/baselines/reference/parserObjectCreation2.js
deleted file mode 100644
index ce05a2af96a..00000000000
--- a/tests/baselines/reference/parserObjectCreation2.js
+++ /dev/null
@@ -1,5 +0,0 @@
-//// [parserObjectCreation2.ts]
-new new Foo()()
-
-//// [parserObjectCreation2.js]
-new new Foo()();
diff --git a/tests/baselines/reference/parserObjectLiterals1.js b/tests/baselines/reference/parserObjectLiterals1.js
deleted file mode 100644
index 426b8107d3b..00000000000
--- a/tests/baselines/reference/parserObjectLiterals1.js
+++ /dev/null
@@ -1,5 +0,0 @@
-//// [parserObjectLiterals1.ts]
-var v = { a: 1, b: 2 };
-
-//// [parserObjectLiterals1.js]
-var v = { a: 1, b: 2 };
diff --git a/tests/baselines/reference/parserObjectLiterals1.types b/tests/baselines/reference/parserObjectLiterals1.types
deleted file mode 100644
index c38adbf55b6..00000000000
--- a/tests/baselines/reference/parserObjectLiterals1.types
+++ /dev/null
@@ -1,7 +0,0 @@
-=== tests/cases/conformance/parser/ecmascript5/ObjectLiterals/parserObjectLiterals1.ts ===
-var v = { a: 1, b: 2 };
->v : { a: number; b: number; }
->{ a: 1, b: 2 } : { a: number; b: number; }
->a : number
->b : number
-
diff --git a/tests/baselines/reference/parserObjectType5.errors.txt b/tests/baselines/reference/parserObjectType5.errors.txt
deleted file mode 100644
index f8ca853af63..00000000000
--- a/tests/baselines/reference/parserObjectType5.errors.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-==== tests/cases/conformance/parser/ecmascript5/ObjectTypes/parserObjectType5.ts (2 errors) ====
-    var v: {
-       A: B
-          ~
-!!! Cannot find name 'B'.
-       <T>;
-          ~
-!!! '(' expected.
-    };
\ No newline at end of file
diff --git a/tests/baselines/reference/parserObjectType6.errors.txt b/tests/baselines/reference/parserObjectType6.errors.txt
deleted file mode 100644
index 4e3d0f206b9..00000000000
--- a/tests/baselines/reference/parserObjectType6.errors.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-==== tests/cases/conformance/parser/ecmascript5/ObjectTypes/parserObjectType6.ts (2 errors) ====
-    var v: {
-       a: B
-          ~
-!!! Cannot find name 'B'.
-       [];
-       ~~
-!!! An index signature must have exactly one parameter.
-    };
\ No newline at end of file
diff --git a/tests/baselines/reference/parserPostfixUnaryExpression1.errors.txt b/tests/baselines/reference/parserPostfixUnaryExpression1.errors.txt
deleted file mode 100644
index 29b5e697abd..00000000000
--- a/tests/baselines/reference/parserPostfixUnaryExpression1.errors.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-==== tests/cases/conformance/parser/ecmascript5/Expressions/parserPostfixUnaryExpression1.ts (4 errors) ====
-    foo ++ ++;
-           ~~
-!!! ';' expected.
-             ~
-!!! Expression expected.
-    ~~~
-!!! Cannot find name 'foo'.
-             
-!!! The operand of an increment or decrement operator must be a variable, property or indexer.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserReturnStatement3.types b/tests/baselines/reference/parserReturnStatement3.types
index 6484050efee..28b06c922ab 100644
--- a/tests/baselines/reference/parserReturnStatement3.types
+++ b/tests/baselines/reference/parserReturnStatement3.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/parser/ecmascript5/Statements/ReturnStatements/parserReturnStatement3.ts ===
 function f() {
->f : () => void
+>f : typeof f
 
    return;
 }
diff --git a/tests/baselines/reference/parserS7.6.1.1_A1.10.errors.txt b/tests/baselines/reference/parserS7.6.1.1_A1.10.errors.txt
new file mode 100644
index 00000000000..c5a53560920
--- /dev/null
+++ b/tests/baselines/reference/parserS7.6.1.1_A1.10.errors.txt
@@ -0,0 +1,21 @@
+==== tests/cases/conformance/parser/ecmascript5/parserS7.6.1.1_A1.10.ts (3 errors) ====
+    // Copyright 2009 the Sputnik authors.  All rights reserved.
+    // This code is governed by the BSD license found in the LICENSE file.
+    
+    /**
+     * The "for" token can not be used as identifier
+     *
+     * @path ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.10.js
+     * @description Checking if execution of "for=1" fails
+     * @negative
+     */
+    
+    for = 1;
+        ~
+!!! '(' expected.
+        
+!!! Invalid left-hand side of assignment expression.
+    
+    
+    
+!!! Expression expected.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserS7.6.1.1_A1.10.types b/tests/baselines/reference/parserS7.6.1.1_A1.10.types
deleted file mode 100644
index 28441e36fe6..00000000000
--- a/tests/baselines/reference/parserS7.6.1.1_A1.10.types
+++ /dev/null
@@ -1,16 +0,0 @@
-=== tests/cases/conformance/parser/ecmascript5/parserS7.6.1.1_A1.10.ts ===
-// Copyright 2009 the Sputnik authors.  All rights reserved.
-No type information for this code.// This code is governed by the BSD license found in the LICENSE file.
-No type information for this code.
-No type information for this code./**
-No type information for this code. * The "for" token can not be used as identifier
-No type information for this code. *
-No type information for this code. * @path ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.10.js
-No type information for this code. * @description Checking if execution of "for=1" fails
-No type information for this code. * @negative
-No type information for this code. */
-No type information for this code.
-No type information for this code.//for = 1;
-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/parserSetAccessorWithTypeAnnotation1.errors.txt b/tests/baselines/reference/parserSetAccessorWithTypeAnnotation1.errors.txt
index 135f06cf304..b1f3fd145eb 100644
--- a/tests/baselines/reference/parserSetAccessorWithTypeAnnotation1.errors.txt
+++ b/tests/baselines/reference/parserSetAccessorWithTypeAnnotation1.errors.txt
@@ -2,6 +2,6 @@
     class C {
        set foo(v): number {
            ~~~
-!!! A 'set' accessor cannot have a return type annotation.
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
        }
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserSetAccessorWithTypeParameters1.errors.txt b/tests/baselines/reference/parserSetAccessorWithTypeParameters1.errors.txt
index 6d5ab6f30af..a9ec344d8c5 100644
--- a/tests/baselines/reference/parserSetAccessorWithTypeParameters1.errors.txt
+++ b/tests/baselines/reference/parserSetAccessorWithTypeParameters1.errors.txt
@@ -2,5 +2,5 @@
     class C {
        set foo<T>(v) { }
            ~~~
-!!! An accessor cannot have type parameters.
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserSyntaxWalker.generated.errors.txt b/tests/baselines/reference/parserSyntaxWalker.generated.errors.txt
new file mode 100644
index 00000000000..b304fe6f388
--- /dev/null
+++ b/tests/baselines/reference/parserSyntaxWalker.generated.errors.txt
@@ -0,0 +1,334 @@
+==== tests/cases/conformance/parser/ecmascript5/parserSyntaxWalker.generated.ts (27 errors) ====
+    declare module "fs" {
+        export class File {
+            constructor(filename: string);
+            public ReadAllText(): string;
+        }
+        export interface IFile {
+            [index: number]: string;
+        }
+    }
+    
+    import fs = module("fs");
+                      ~
+!!! ';' expected.
+    ~~~~~~~~~~~~~~~~~~
+!!! Cannot find name 'module'.
+    
+    
+    module TypeScriptAllInOne {
+        export class Program {
+            static Main(...args: string[]) {
+                try {
+                    var bfs = new BasicFeatures();
+                    var retValue: number = 0;
+    
+                    retValue = bfs.VARIABLES();
+                    if (retValue != 0) {
+    
+                        return 1;
+                    }
+    
+                    retValue = bfs.STATEMENTS(4);
+                    if (retValue != 0) {
+    
+                        return 1;
+                    }
+    
+    
+                    retValue = bfs.TYPES();
+                    if (retValue != 0) {
+    
+                        return 1;
+                    }
+    
+                    retValue = bfs.OPERATOR();
+                    if (retValue != 0) {
+    
+                        return 1;
+                    }
+                }
+                catch (e) {
+                    console.log(e);
+                    ~~~~~~~
+!!! Cannot find name 'console'.
+                }
+                finally {
+    
+                }
+    
+                console.log('Done');
+                ~~~~~~~
+!!! Cannot find name 'console'.
+    
+                return 0;
+    
+            }
+        }
+    
+        class BasicFeatures {
+            /// <summary>
+            /// Test various of variables. Including nullable,key world as variable,special format
+            /// </summary>
+            /// <returns></returns>
+            public VARIABLES(): number {
+                var local = Number.MAX_VALUE;
+                var min = Number.MIN_VALUE;
+                var inf = Number.NEGATIVE_INFINITY;
+                var nan = Number.NaN;
+                var undef = undefined;
+    
+                var п = local;
+                var м = local;
+    
+                var local5 = <fs.File>null;
+                var local6 = local5 instanceof fs.File;
+                             ~~~~~~
+!!! The left-hand side of an 'instanceof' expression must be of type 'any', an object type or a type parameter.
+                                               ~~~~~~~
+!!! The right-hand side of an 'instanceof' expression must be of type 'any' or of a type assignable to the 'Function' interface type.
+    
+                var hex = 0xBADC0DE, Hex = 0XDEADBEEF;
+                var float = 6.02e23, float2 = 6.02E-23
+                var char = 'c', \u0066 = '\u0066', hexchar = '\x42';
+                var quoted = '"', quoted2 = "'";
+                var reg = /\w*/;
+                var objLit = { "var": number = 42, equals: function (x) { return x["var"] === 42; }, toString: () => 'objLit{42}' };
+                var weekday = Weekdays.Monday;
+    
+                var con = char + f + hexchar + float.toString() + float2.toString() + reg.toString() + objLit + weekday;
+    
+                //
+                var any = 0;
+                var boolean = 0;
+                var declare = 0;
+                var constructor = 0;
+                var get = 0;
+                var implements = 0;
+                var interface = 0;
+                var let = 0;
+                var module = 0;
+                var number = 0;
+                var package = 0;
+                var private = 0;
+                var protected = 0;
+                var public = 0;
+                var set = 0;
+                var static = 0;
+                var string = 0;
+                var yield = 0;
+    
+                var sum3 = any + boolean + declare + constructor + get + implements + interface + let + module + number + package + private + protected + public + set + static + string + yield;
+    
+                return 0;
+            }
+    
+            /// <summary>
+            /// Test different statements. Including if-else,swith,foreach,(un)checked,lock,using,try-catch-finally
+            /// </summary>
+            /// <param name="i"></param>
+            /// <returns></returns>
+            STATEMENTS(i: number): number {
+                var retVal = 0;
+                if (i == 1)
+                    retVal = 1;
+                else
+                    retVal = 0;
+                switch (i) {
+                    case 2:
+                        retVal = 1;
+                        break;
+                    case 3:
+                        retVal = 1;
+                        break;
+                    default:
+                        break;
+                }
+    
+                for (var x in { x: 0, y: 1 }) {
+                }
+    
+                try {
+                    throw null;
+                }
+                catch (Exception) {
+                }
+                finally {
+                    try { }
+                    catch (Exception) { }
+                }
+    
+                return retVal;
+            }
+    
+            /// <summary>
+            /// Test types in ts language. Including class,struct,interface,delegate,anonymous type
+            /// </summary>
+            /// <returns></returns>
+            public TYPES(): number {
+                var retVal = 0;
+                var c = new CLASS();
+                var xx: IF = c;
+                retVal += c.Property;
+                retVal += c.Member();
+                retVal += xx ^= Foo() ? 0 : 1;
+                          ~~
+!!! The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type.
+                                ~~~
+!!! Cannot find name 'Foo'.
+    
+                //anonymous type
+                var anony = { a: new CLASS() };
+    
+                retVal += anony.a.d();
+                ~~~~~~
+!!! Type 'string' is not assignable to type 'number'.
+    
+                return retVal;
+            }
+    
+    
+            ///// <summary>
+            ///// Test different operators
+            ///// </summary>
+            ///// <returns></returns>
+            public OPERATOR(): number {
+                var a: number[] = [1, 2, 3, 4,  implements , ];/*[] bug*/ // YES []
+                                                ~~~~~~~~~~
+!!! Cannot find name 'implements'.
+                var i = a[1];/*[]*/
+                i = i + i - i * i / i % i & i | i ^ i;/*+ - * / % & | ^*/
+                var b = true && false || true ^ false;/*& | ^*/
+                                         ~~~~
+!!! The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type.
+                                                ~~~~~
+!!! The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type.
+                b = !b;/*!*/
+                i = ~i;/*~i*/
+                b = i < (i -  continue ) && (i + 1) > i;/*< && >*/
+                              ~~~~~~~~
+!!! Expression expected.
+                                       ~
+!!! Identifier expected.
+                                         ~~
+!!! Statement expected.
+                var f = true ? 1 : 0;/*? :*/   // YES :
+                i++;/*++*/
+                i--;/*--*/
+                b = true && false || true;/*&& ||*/
+                i = i << 5;/*<<*/
+                i = i >> 5;/*>>*/
+                var j = i;
+                b = i == j && i != j && i <= j && i >= j;/*= == && != <= >=*/
+                i += <number>5.0;/*+=*/
+                i -= i;/*-=*/
+                i *= i;/**=*/
+                if (i == 0)
+                    i++;
+                i /= i;/*/=*/
+                i %= i;/*%=*/
+                i &= i;/*&=*/
+                i |= i;/*|=*/
+                i ^= i;/*^=*/
+                i <<= i;/*<<=*/
+                i >>= i;/*>>=*/
+    
+                if (i == 0 && !b && f == 1)
+                    return 0;
+                else return 1;
+            }
+    
+        }
+    
+        interface IF {
+            Foo <!-- ): boolean;
+                ~
+!!! Type parameter list cannot be empty.
+                 ~
+!!! '(' expected.
+                 ~
+!!! Type parameter declaration expected.
+                     ~
+!!! Expression expected.
+                      ~
+!!! Declaration or statement expected.
+                     
+!!! The operand of an increment or decrement operator must be a variable, property or indexer.
+                        ~~~~~~~
+!!! Cannot find name 'boolean'.
+        }
+    
+        class CLASS implements IF {
+                               ~~
+!!! Cannot find name 'IF'.
+    
+            public d = () =>  '  return 0; };
+                                             
+!!! Unterminated string literal.
+            public get Property() { return 0; }
+                       ~~~~~~~~
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
+            public Member() {
+                return 0;
+            }
+            public Foo(): boolean {
+                var myEvent = () => { return 1; };
+                if (myEvent() == 1)
+                    return true;
+                else
+                    return false;
+            }
+        }
+    
+    
+        // todo: use these
+        class A {
+            public method1(val:number) {
+                return val;
+            }
+            public method2() {
+                return 2 * this.method1(2);
+            }
+        }
+    
+        class B extends A {
+    
+            public method2() {
+                return this.method1(2);
+            }
+        }
+    
+        class Overloading {
+    
+            private otherValue = 42;
+    
+            constructor(private value: number, public name: string) { }
+           
+            public Overloads(value: string);
+            public Overloads(value: string, ...rest: string[]) { }
+    
+            public DefaultValue(value?: string = "Hello") { }
+                                ~~~~~
+!!! Parameter cannot have question mark and initializer.
+        }
+    }
+    ~
+!!! Declaration or statement expected.
+    
+    enum Weekdays {
+        Monday,
+        Tuesday,
+        Weekend,
+    }
+    
+    enum Fruit {
+        Apple,
+        Pear
+    }
+    
+    interface IDisposable {
+        Dispose(): void;
+    }
+    
+    TypeScriptAllInOne.Program.Main();
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/parserSyntaxWalker.generated.types b/tests/baselines/reference/parserSyntaxWalker.generated.types
deleted file mode 100644
index dde34e06746..00000000000
--- a/tests/baselines/reference/parserSyntaxWalker.generated.types
+++ /dev/null
@@ -1,281 +0,0 @@
-=== tests/cases/conformance/parser/ecmascript5/parserSyntaxWalker.generated.ts ===
-//declare module "fs" {
-No type information for this code.//    export class File {
-No type information for this code.//        constructor(filename: string);
-No type information for this code.//        public ReadAllText(): string;
-No type information for this code.//    }
-No type information for this code.//    export interface IFile {
-No type information for this code.//        [index: number]: string;
-No type information for this code.//    }
-No type information for this code.//}
-No type information for this code.
-No type information for this code.//import fs = module("fs");
-No type information for this code.
-No type information for this code.
-No type information for this code.//module TypeScriptAllInOne {
-No type information for this code.//    export class Program {
-No type information for this code.//        static Main(...args: string[]) {
-No type information for this code.//            try {
-No type information for this code.//                var bfs = new BasicFeatures();
-No type information for this code.//                var retValue: number = 0;
-No type information for this code.
-No type information for this code.//                retValue = bfs.VARIABLES();
-No type information for this code.//                if (retValue != 0) {
-No type information for this code.
-No type information for this code.//                    return 1;
-No type information for this code.//                }
-No type information for this code.
-No type information for this code.//                retValue = bfs.STATEMENTS(4);
-No type information for this code.//                if (retValue != 0) {
-No type information for this code.
-No type information for this code.//                    return 1;
-No type information for this code.//                }
-No type information for this code.
-No type information for this code.
-No type information for this code.//                retValue = bfs.TYPES();
-No type information for this code.//                if (retValue != 0) {
-No type information for this code.
-No type information for this code.//                    return 1;
-No type information for this code.//                }
-No type information for this code.
-No type information for this code.//                retValue = bfs.OPERATOR();
-No type information for this code.//                if (retValue != 0) {
-No type information for this code.
-No type information for this code.//                    return 1;
-No type information for this code.//                }
-No type information for this code.//            }
-No type information for this code.//            catch (e) {
-No type information for this code.//                console.log(e);
-No type information for this code.//            }
-No type information for this code.//            finally {
-No type information for this code.
-No type information for this code.//            }
-No type information for this code.
-No type information for this code.//            console.log('Done');
-No type information for this code.
-No type information for this code.//            return 0;
-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.//    class BasicFeatures {
-No type information for this code.//        /// <summary>
-No type information for this code.//        /// Test various of variables. Including nullable,key world as variable,special format
-No type information for this code.//        /// </summary>
-No type information for this code.//        /// <returns></returns>
-No type information for this code.//        public VARIABLES(): number {
-No type information for this code.//            var local = Number.MAX_VALUE;
-No type information for this code.//            var min = Number.MIN_VALUE;
-No type information for this code.//            var inf = Number.NEGATIVE_INFINITY;
-No type information for this code.//            var nan = Number.NaN;
-No type information for this code.//            var undef = undefined;
-No type information for this code.
-No type information for this code.//            var п = local;
-No type information for this code.//            var м = local;
-No type information for this code.
-No type information for this code.//            var local5 = <fs.File>null;
-No type information for this code.//            var local6 = local5 instanceof fs.File;
-No type information for this code.
-No type information for this code.//            var hex = 0xBADC0DE, Hex = 0XDEADBEEF;
-No type information for this code.//            var float = 6.02e23, float2 = 6.02E-23
-No type information for this code.//            var char = 'c', \u0066 = '\u0066', hexchar = '\x42';
-No type information for this code.//            var quoted = '"', quoted2 = "'";
-No type information for this code.//            var reg = /\w*/;
-No type information for this code.//            var objLit = { "var": number = 42, equals: function (x) { return x["var"] === 42; }, toString: () => 'objLit{42}' };
-No type information for this code.//            var weekday = Weekdays.Monday;
-No type information for this code.
-No type information for this code.//            var con = char + f + hexchar + float.toString() + float2.toString() + reg.toString() + objLit + weekday;
-No type information for this code.
-No type information for this code.//            //
-No type information for this code.//            var any = 0;
-No type information for this code.//            var boolean = 0;
-No type information for this code.//            var declare = 0;
-No type information for this code.//            var constructor = 0;
-No type information for this code.//            var get = 0;
-No type information for this code.//            var implements = 0;
-No type information for this code.//            var interface = 0;
-No type information for this code.//            var let = 0;
-No type information for this code.//            var module = 0;
-No type information for this code.//            var number = 0;
-No type information for this code.//            var package = 0;
-No type information for this code.//            var private = 0;
-No type information for this code.//            var protected = 0;
-No type information for this code.//            var public = 0;
-No type information for this code.//            var set = 0;
-No type information for this code.//            var static = 0;
-No type information for this code.//            var string = 0;
-No type information for this code.//            var yield = 0;
-No type information for this code.
-No type information for this code.//            var sum3 = any + boolean + declare + constructor + get + implements + interface + let + module + number + package + private + protected + public + set + static + string + yield;
-No type information for this code.
-No type information for this code.//            return 0;
-No type information for this code.//        }
-No type information for this code.
-No type information for this code.//        /// <summary>
-No type information for this code.//        /// Test different statements. Including if-else,swith,foreach,(un)checked,lock,using,try-catch-finally
-No type information for this code.//        /// </summary>
-No type information for this code.//        /// <param name="i"></param>
-No type information for this code.//        /// <returns></returns>
-No type information for this code.//        STATEMENTS(i: number): number {
-No type information for this code.//            var retVal = 0;
-No type information for this code.//            if (i == 1)
-No type information for this code.//                retVal = 1;
-No type information for this code.//            else
-No type information for this code.//                retVal = 0;
-No type information for this code.//            switch (i) {
-No type information for this code.//                case 2:
-No type information for this code.//                    retVal = 1;
-No type information for this code.//                    break;
-No type information for this code.//                case 3:
-No type information for this code.//                    retVal = 1;
-No type information for this code.//                    break;
-No type information for this code.//                default:
-No type information for this code.//                    break;
-No type information for this code.//            }
-No type information for this code.
-No type information for this code.//            for (var x in { x: 0, y: 1 }) {
-No type information for this code.//            }
-No type information for this code.
-No type information for this code.//            try {
-No type information for this code.//                throw null;
-No type information for this code.//            }
-No type information for this code.//            catch (Exception) {
-No type information for this code.//            }
-No type information for this code.//            finally {
-No type information for this code.//                try { }
-No type information for this code.//                catch (Exception) { }
-No type information for this code.//            }
-No type information for this code.
-No type information for this code.//            return retVal;
-No type information for this code.//        }
-No type information for this code.
-No type information for this code.//        /// <summary>
-No type information for this code.//        /// Test types in ts language. Including class,struct,interface,delegate,anonymous type
-No type information for this code.//        /// </summary>
-No type information for this code.//        /// <returns></returns>
-No type information for this code.//        public TYPES(): number {
-No type information for this code.//            var retVal = 0;
-No type information for this code.//            var c = new CLASS();
-No type information for this code.//            var xx: IF = c;
-No type information for this code.//            retVal += c.Property;
-No type information for this code.//            retVal += c.Member();
-No type information for this code.//            retVal += xx ^= Foo() ? 0 : 1;
-No type information for this code.
-No type information for this code.//            //anonymous type
-No type information for this code.//            var anony = { a: new CLASS() };
-No type information for this code.
-No type information for this code.//            retVal += anony.a.d();
-No type information for this code.
-No type information for this code.//            return retVal;
-No type information for this code.//        }
-No type information for this code.
-No type information for this code.
-No type information for this code.//        ///// <summary>
-No type information for this code.//        ///// Test different operators
-No type information for this code.//        ///// </summary>
-No type information for this code.//        ///// <returns></returns>
-No type information for this code.//        public OPERATOR(): number {
-No type information for this code.//            var a: number[] = [1, 2, 3, 4,  implements , ];/*[] bug*/ // YES []
-No type information for this code.//            var i = a[1];/*[]*/
-No type information for this code.//            i = i + i - i * i / i % i & i | i ^ i;/*+ - * / % & | ^*/
-No type information for this code.//            var b = true && false || true ^ false;/*& | ^*/
-No type information for this code.//            b = !b;/*!*/
-No type information for this code.//            i = ~i;/*~i*/
-No type information for this code.//            b = i < (i -  continue ) && (i + 1) > i;/*< && >*/
-No type information for this code.//            var f = true ? 1 : 0;/*? :*/   // YES :
-No type information for this code.//            i++;/*++*/
-No type information for this code.//            i--;/*--*/
-No type information for this code.//            b = true && false || true;/*&& ||*/
-No type information for this code.//            i = i << 5;/*<<*/
-No type information for this code.//            i = i >> 5;/*>>*/
-No type information for this code.//            var j = i;
-No type information for this code.//            b = i == j && i != j && i <= j && i >= j;/*= == && != <= >=*/
-No type information for this code.//            i += <number>5.0;/*+=*/
-No type information for this code.//            i -= i;/*-=*/
-No type information for this code.//            i *= i;/**=*/
-No type information for this code.//            if (i == 0)
-No type information for this code.//                i++;
-No type information for this code.//            i /= i;/*/=*/
-No type information for this code.//            i %= i;/*%=*/
-No type information for this code.//            i &= i;/*&=*/
-No type information for this code.//            i |= i;/*|=*/
-No type information for this code.//            i ^= i;/*^=*/
-No type information for this code.//            i <<= i;/*<<=*/
-No type information for this code.//            i >>= i;/*>>=*/
-No type information for this code.
-No type information for this code.//            if (i == 0 && !b && f == 1)
-No type information for this code.//                return 0;
-No type information for this code.//            else return 1;
-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.//    interface IF {
-No type information for this code.//        Foo <!-- ): boolean;
-No type information for this code.//    }
-No type information for this code.
-No type information for this code.//    class CLASS implements IF {
-No type information for this code.
-No type information for this code.//        public d = () =>  '  return 0; };
-No type information for this code.//        public get Property() { return 0; }
-No type information for this code.//        public Member() {
-No type information for this code.//            return 0;
-No type information for this code.//        }
-No type information for this code.//        public Foo(): boolean {
-No type information for this code.//            var myEvent = () => { return 1; };
-No type information for this code.//            if (myEvent() == 1)
-No type information for this code.//                return true;
-No type information for this code.//            else
-No type information for this code.//                return false;
-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.//    // todo: use these
-No type information for this code.//    class A {
-No type information for this code.//        public method1(val:number) {
-No type information for this code.//            return val;
-No type information for this code.//        }
-No type information for this code.//        public method2() {
-No type information for this code.//            return 2 * this.method1(2);
-No type information for this code.//        }
-No type information for this code.//    }
-No type information for this code.
-No type information for this code.//    class B extends A {
-No type information for this code.
-No type information for this code.//        public method2() {
-No type information for this code.//            return this.method1(2);
-No type information for this code.//        }
-No type information for this code.//    }
-No type information for this code.
-No type information for this code.//    class Overloading {
-No type information for this code.
-No type information for this code.//        private otherValue = 42;
-No type information for this code.
-No type information for this code.//        constructor(private value: number, public name: string) { }
-No type information for this code.       
-No type information for this code.//        public Overloads(value: string);
-No type information for this code.//        public Overloads(value: string, ...rest: string[]) { }
-No type information for this code.
-No type information for this code.//        public DefaultValue(value?: string = "Hello") { }
-No type information for this code.//    }
-No type information for this code.//}
-No type information for this code.
-No type information for this code.//enum Weekdays {
-No type information for this code.//    Monday,
-No type information for this code.//    Tuesday,
-No type information for this code.//    Weekend,
-No type information for this code.//}
-No type information for this code.
-No type information for this code.//enum Fruit {
-No type information for this code.//    Apple,
-No type information for this code.//    Pear
-No type information for this code.//}
-No type information for this code.
-No type information for this code.//interface IDisposable {
-No type information for this code.//    Dispose(): void;
-No type information for this code.//}
-No type information for this code.
-No type information for this code.//TypeScriptAllInOne.Program.Main();
-No type information for this code.
-No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserUnaryExpression1.errors.txt b/tests/baselines/reference/parserUnaryExpression1.errors.txt
deleted file mode 100644
index 5ed4550b277..00000000000
--- a/tests/baselines/reference/parserUnaryExpression1.errors.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-==== tests/cases/conformance/parser/ecmascript5/Expressions/parserUnaryExpression1.ts (1 errors) ====
-    ++this;
-      ~~~~
-!!! The operand of an increment or decrement operator must be a variable, property or indexer.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserUnaryExpression1.js b/tests/baselines/reference/parserUnaryExpression1.js
deleted file mode 100644
index a0183ea0e00..00000000000
--- a/tests/baselines/reference/parserUnaryExpression1.js
+++ /dev/null
@@ -1,5 +0,0 @@
-//// [parserUnaryExpression1.ts]
-++this;
-
-//// [parserUnaryExpression1.js]
-++this;
diff --git a/tests/baselines/reference/parserUnaryExpression2.errors.txt b/tests/baselines/reference/parserUnaryExpression2.errors.txt
deleted file mode 100644
index ea0c0ace51d..00000000000
--- a/tests/baselines/reference/parserUnaryExpression2.errors.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-==== tests/cases/conformance/parser/ecmascript5/Expressions/parserUnaryExpression2.ts (1 errors) ====
-    ++function(e) { }
-      ~~~~~~~~~~~~~~~
-!!! An arithmetic operand must be of type 'any', 'number' or an enum type.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserUnaryExpression2.js b/tests/baselines/reference/parserUnaryExpression2.js
deleted file mode 100644
index 97b17b2b800..00000000000
--- a/tests/baselines/reference/parserUnaryExpression2.js
+++ /dev/null
@@ -1,6 +0,0 @@
-//// [parserUnaryExpression2.ts]
-++function(e) { }
-
-//// [parserUnaryExpression2.js]
-++function (e) {
-};
diff --git a/tests/baselines/reference/parserUnaryExpression3.errors.txt b/tests/baselines/reference/parserUnaryExpression3.errors.txt
deleted file mode 100644
index 22cc9fdcdef..00000000000
--- a/tests/baselines/reference/parserUnaryExpression3.errors.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-==== tests/cases/conformance/parser/ecmascript5/Expressions/parserUnaryExpression3.ts (1 errors) ====
-    ++[0];
-      ~~~
-!!! An arithmetic operand must be of type 'any', 'number' or an enum type.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserUnaryExpression3.js b/tests/baselines/reference/parserUnaryExpression3.js
deleted file mode 100644
index 37a9f72e7b2..00000000000
--- a/tests/baselines/reference/parserUnaryExpression3.js
+++ /dev/null
@@ -1,5 +0,0 @@
-//// [parserUnaryExpression3.ts]
-++[0];
-
-//// [parserUnaryExpression3.js]
-++[0];
diff --git a/tests/baselines/reference/parserUnaryExpression4.errors.txt b/tests/baselines/reference/parserUnaryExpression4.errors.txt
deleted file mode 100644
index 4f4e8c5eea7..00000000000
--- a/tests/baselines/reference/parserUnaryExpression4.errors.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-==== tests/cases/conformance/parser/ecmascript5/Expressions/parserUnaryExpression4.ts (1 errors) ====
-    ++{};
-      ~~
-!!! An arithmetic operand must be of type 'any', 'number' or an enum type.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserUnaryExpression4.js b/tests/baselines/reference/parserUnaryExpression4.js
deleted file mode 100644
index 6e17a9cd3b4..00000000000
--- a/tests/baselines/reference/parserUnaryExpression4.js
+++ /dev/null
@@ -1,5 +0,0 @@
-//// [parserUnaryExpression4.ts]
-++{};
-
-//// [parserUnaryExpression4.js]
-++{};
diff --git a/tests/baselines/reference/parserUnaryExpression5.errors.txt b/tests/baselines/reference/parserUnaryExpression5.errors.txt
deleted file mode 100644
index 09d42f3c3b2..00000000000
--- a/tests/baselines/reference/parserUnaryExpression5.errors.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-==== tests/cases/conformance/parser/ecmascript5/Expressions/parserUnaryExpression5.ts (2 errors) ====
-    ++ delete foo.bar
-       ~~~~~~~~~~~~~~
-!!! An arithmetic operand must be of type 'any', 'number' or an enum type.
-              ~~~
-!!! Cannot find name 'foo'.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserUnaryExpression5.js b/tests/baselines/reference/parserUnaryExpression5.js
deleted file mode 100644
index 9495ee15b88..00000000000
--- a/tests/baselines/reference/parserUnaryExpression5.js
+++ /dev/null
@@ -1,5 +0,0 @@
-//// [parserUnaryExpression5.ts]
-++ delete foo.bar
-
-//// [parserUnaryExpression5.js]
-++delete foo.bar;
diff --git a/tests/baselines/reference/parserUnaryExpression6.js b/tests/baselines/reference/parserUnaryExpression6.js
deleted file mode 100644
index ad50d2f6733..00000000000
--- a/tests/baselines/reference/parserUnaryExpression6.js
+++ /dev/null
@@ -1,4 +0,0 @@
-//// [parserUnaryExpression6.ts]
-
-
-//// [parserUnaryExpression6.js]
diff --git a/tests/baselines/reference/parserUnaryExpression6.types b/tests/baselines/reference/parserUnaryExpression6.types
deleted file mode 100644
index 25104d2d298..00000000000
--- a/tests/baselines/reference/parserUnaryExpression6.types
+++ /dev/null
@@ -1,3 +0,0 @@
-=== tests/cases/conformance/parser/ecmascript5/Expressions/parserUnaryExpression6.ts ===
-
-No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserUnaryExpression7.errors.txt b/tests/baselines/reference/parserUnaryExpression7.errors.txt
deleted file mode 100644
index 05351f9bee8..00000000000
--- a/tests/baselines/reference/parserUnaryExpression7.errors.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-==== tests/cases/conformance/parser/ecmascript5/Expressions/parserUnaryExpression7.ts (2 errors) ====
-    ++ new Foo();
-       ~~~~~~~~~
-!!! The operand of an increment or decrement operator must be a variable, property or indexer.
-           ~~~
-!!! Cannot find name 'Foo'.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserUnaryExpression7.js b/tests/baselines/reference/parserUnaryExpression7.js
deleted file mode 100644
index 848d4c97ded..00000000000
--- a/tests/baselines/reference/parserUnaryExpression7.js
+++ /dev/null
@@ -1,5 +0,0 @@
-//// [parserUnaryExpression7.ts]
-++ new Foo();
-
-//// [parserUnaryExpression7.js]
-++new Foo();
diff --git a/tests/baselines/reference/parserUnicodeWhitespaceCharacter1.types b/tests/baselines/reference/parserUnicodeWhitespaceCharacter1.types
index 4fd487230b2..fed538e327e 100644
--- a/tests/baselines/reference/parserUnicodeWhitespaceCharacter1.types
+++ b/tests/baselines/reference/parserUnicodeWhitespaceCharacter1.types
@@ -1,4 +1,4 @@
 === tests/cases/conformance/parser/ecmascript5/parserUnicodeWhitespaceCharacter1.ts ===
 function foo(){　}
->foo : () => void
+>foo : typeof foo
 
diff --git a/tests/baselines/reference/parserX_ArrowFunction4.js b/tests/baselines/reference/parserX_ArrowFunction4.js
deleted file mode 100644
index b576e62813c..00000000000
--- a/tests/baselines/reference/parserX_ArrowFunction4.js
+++ /dev/null
@@ -1,8 +0,0 @@
-//// [parserX_ArrowFunction4.ts]
-var v = (a, b) => {
-   
-};
-
-//// [parserX_ArrowFunction4.js]
-var v = function (a, b) {
-};
diff --git a/tests/baselines/reference/parsingClassRecoversWhenHittingUnexpectedSemicolon.errors.txt b/tests/baselines/reference/parsingClassRecoversWhenHittingUnexpectedSemicolon.errors.txt
deleted file mode 100644
index 0780b807ead..00000000000
--- a/tests/baselines/reference/parsingClassRecoversWhenHittingUnexpectedSemicolon.errors.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-==== tests/cases/compiler/parsingClassRecoversWhenHittingUnexpectedSemicolon.ts (1 errors) ====
-    class C {
-        public f() { };
-                      ~
-!!! Unexpected token. A constructor, method, accessor, or property was expected.
-        private m;
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/partiallyAmbientClodule.types b/tests/baselines/reference/partiallyAmbientClodule.types
index 40307f426d0..c0cd877d05f 100644
--- a/tests/baselines/reference/partiallyAmbientClodule.types
+++ b/tests/baselines/reference/partiallyAmbientClodule.types
@@ -3,7 +3,7 @@ declare module foo {
 >foo : typeof foo
 
     export function x(): any;
->x : () => any
+>x : typeof x
 }
 class foo { } // Legal, because module is ambient
 >foo : foo
diff --git a/tests/baselines/reference/partiallyAmbientFundule.types b/tests/baselines/reference/partiallyAmbientFundule.types
index c11c6ed5ec3..37f59588a7c 100644
--- a/tests/baselines/reference/partiallyAmbientFundule.types
+++ b/tests/baselines/reference/partiallyAmbientFundule.types
@@ -3,7 +3,7 @@ declare module foo {
 >foo : typeof foo
 
     export function x(): any;
->x : () => any
+>x : typeof x
 }
 function foo () { } // Legal, because module is ambient
 >foo : typeof foo
diff --git a/tests/baselines/reference/plusOperatorWithBooleanType.types b/tests/baselines/reference/plusOperatorWithBooleanType.types
index 40ca167a4d7..ed4ccfd6c2d 100644
--- a/tests/baselines/reference/plusOperatorWithBooleanType.types
+++ b/tests/baselines/reference/plusOperatorWithBooleanType.types
@@ -4,7 +4,7 @@ var BOOLEAN: boolean;
 >BOOLEAN : boolean
 
 function foo(): boolean { return true; }
->foo : () => boolean
+>foo : typeof foo
 
 class A {
 >A : A
@@ -13,7 +13,7 @@ class A {
 >a : boolean
 
     static foo() { return false; }
->foo : () => boolean
+>foo : typeof foo
 }
 module M {
 >M : typeof M
@@ -64,15 +64,15 @@ var ResultIsNumber6 = +foo();
 >ResultIsNumber6 : number
 >+foo() : number
 >foo() : boolean
->foo : () => boolean
+>foo : typeof foo
 
 var ResultIsNumber7 = +A.foo();
 >ResultIsNumber7 : number
 >+A.foo() : number
 >A.foo() : boolean
->A.foo : () => boolean
+>A.foo : typeof foo
 >A : typeof A
->foo : () => boolean
+>foo : typeof foo
 
 // miss assignment operators
 +true;
@@ -85,7 +85,7 @@ var ResultIsNumber7 = +A.foo();
 +foo();
 >+foo() : number
 >foo() : boolean
->foo : () => boolean
+>foo : typeof foo
 
 +true, false;
 >+true, false : boolean
diff --git a/tests/baselines/reference/plusOperatorWithNumberType.types b/tests/baselines/reference/plusOperatorWithNumberType.types
index cad0448f2a3..973fffc20b7 100644
--- a/tests/baselines/reference/plusOperatorWithNumberType.types
+++ b/tests/baselines/reference/plusOperatorWithNumberType.types
@@ -8,7 +8,7 @@ var NUMBER1: number[] = [1, 2];
 >[1, 2] : number[]
 
 function foo(): number { return 1; }
->foo : () => number
+>foo : typeof foo
 
 class A {
 >A : A
@@ -17,7 +17,7 @@ class A {
 >a : number
 
     static foo() { return 1; }
->foo : () => number
+>foo : typeof foo
 }
 module M {
 >M : typeof M
@@ -89,15 +89,15 @@ var ResultIsNumber9 = +foo();
 >ResultIsNumber9 : number
 >+foo() : number
 >foo() : number
->foo : () => number
+>foo : typeof foo
 
 var ResultIsNumber10 = +A.foo();
 >ResultIsNumber10 : number
 >+A.foo() : number
 >A.foo() : number
->A.foo : () => number
+>A.foo : typeof foo
 >A : typeof A
->foo : () => number
+>foo : typeof foo
 
 var ResultIsNumber11 = +(NUMBER + NUMBER);
 >ResultIsNumber11 : number
@@ -122,7 +122,7 @@ var ResultIsNumber11 = +(NUMBER + NUMBER);
 +foo();
 >+foo() : number
 >foo() : number
->foo : () => number
+>foo : typeof foo
 
 +objA.a;
 >+objA.a : number
diff --git a/tests/baselines/reference/plusOperatorWithStringType.types b/tests/baselines/reference/plusOperatorWithStringType.types
index d08a3917196..2e72d1b7deb 100644
--- a/tests/baselines/reference/plusOperatorWithStringType.types
+++ b/tests/baselines/reference/plusOperatorWithStringType.types
@@ -8,7 +8,7 @@ var STRING1: string[] = ["", "abc"];
 >["", "abc"] : string[]
 
 function foo(): string { return "abc"; }
->foo : () => string
+>foo : typeof foo
 
 class A {
 >A : A
@@ -17,7 +17,7 @@ class A {
 >a : string
 
     static foo() { return ""; }
->foo : () => string
+>foo : typeof foo
 }
 module M {
 >M : typeof M
@@ -89,15 +89,15 @@ var ResultIsNumber9 = +foo();
 >ResultIsNumber9 : number
 >+foo() : number
 >foo() : string
->foo : () => string
+>foo : typeof foo
 
 var ResultIsNumber10 = +A.foo();
 >ResultIsNumber10 : number
 >+A.foo() : number
 >A.foo() : string
->A.foo : () => string
+>A.foo : typeof foo
 >A : typeof A
->foo : () => string
+>foo : typeof foo
 
 var ResultIsNumber11 = +(STRING + STRING);
 >ResultIsNumber11 : number
@@ -130,7 +130,7 @@ var ResultIsNumber12 = +STRING.charAt(0);
 +foo();
 >+foo() : number
 >foo() : string
->foo : () => string
+>foo : typeof foo
 
 +objA.a,M.n;
 >+objA.a,M.n : string
diff --git a/tests/baselines/reference/prefixIncrementAsOperandOfPlusExpression.js b/tests/baselines/reference/prefixIncrementAsOperandOfPlusExpression.js
deleted file mode 100644
index 719dceb3423..00000000000
--- a/tests/baselines/reference/prefixIncrementAsOperandOfPlusExpression.js
+++ /dev/null
@@ -1,11 +0,0 @@
-//// [prefixIncrementAsOperandOfPlusExpression.ts]
-var x = 1;
-var y = 1;
-+ ++x;
-+ ++y;
-
-//// [prefixIncrementAsOperandOfPlusExpression.js]
-var x = 1;
-var y = 1;
-+ ++x;
-+ ++y;
diff --git a/tests/baselines/reference/prefixIncrementAsOperandOfPlusExpression.types b/tests/baselines/reference/prefixIncrementAsOperandOfPlusExpression.types
deleted file mode 100644
index 0d773b89f12..00000000000
--- a/tests/baselines/reference/prefixIncrementAsOperandOfPlusExpression.types
+++ /dev/null
@@ -1,17 +0,0 @@
-=== tests/cases/compiler/prefixIncrementAsOperandOfPlusExpression.ts ===
-var x = 1;
->x : number
-
-var y = 1;
->y : number
-
-+ ++x;
->+ ++x : number
->++x : number
->x : number
-
-+ ++y;
->+ ++y : number
->++y : number
->y : number
-
diff --git a/tests/baselines/reference/prespecializedGenericMembers1.types b/tests/baselines/reference/prespecializedGenericMembers1.types
index 09578f323ca..4d12c2767c8 100644
--- a/tests/baselines/reference/prespecializedGenericMembers1.types
+++ b/tests/baselines/reference/prespecializedGenericMembers1.types
@@ -33,9 +33,7 @@ var cat = new Cat<IKitty>();
 
 var catThing = {
 >catThing : { barry: Cat<IKitty>; }
->{
-    barry: cat
-} : { barry: Cat<IKitty>; }
+>{    barry: cat} : { barry: Cat<IKitty>; }
 
     barry: cat
 >barry : Cat<IKitty>
diff --git a/tests/baselines/reference/primtiveTypesAreIdentical.types b/tests/baselines/reference/primtiveTypesAreIdentical.types
index bbff4623f0b..aee6272223f 100644
--- a/tests/baselines/reference/primtiveTypesAreIdentical.types
+++ b/tests/baselines/reference/primtiveTypesAreIdentical.types
@@ -2,67 +2,67 @@
 // primitive types are identical to themselves so these overloads will all cause errors
 
 function foo1(x: number);
->foo1 : { (x: number): any; (x: number): any; }
+>foo1 : typeof foo1
 >x : number
 
 function foo1(x: number);
->foo1 : { (x: number): any; (x: number): any; }
+>foo1 : typeof foo1
 >x : number
 
 function foo1(x: any) { }
->foo1 : { (x: number): any; (x: number): any; }
+>foo1 : typeof foo1
 >x : any
 
 function foo2(x: string);
->foo2 : { (x: string): any; (x: string): any; }
+>foo2 : typeof foo2
 >x : string
 
 function foo2(x: string);
->foo2 : { (x: string): any; (x: string): any; }
+>foo2 : typeof foo2
 >x : string
 
 function foo2(x: any) { }
->foo2 : { (x: string): any; (x: string): any; }
+>foo2 : typeof foo2
 >x : any
 
 function foo3(x: boolean);
->foo3 : { (x: boolean): any; (x: boolean): any; }
+>foo3 : typeof foo3
 >x : boolean
 
 function foo3(x: boolean);
->foo3 : { (x: boolean): any; (x: boolean): any; }
+>foo3 : typeof foo3
 >x : boolean
 
 function foo3(x: any) { }
->foo3 : { (x: boolean): any; (x: boolean): any; }
+>foo3 : typeof foo3
 >x : any
 
 function foo4(x: any);
->foo4 : { (x: any): any; (x: any): any; }
+>foo4 : typeof foo4
 >x : any
 
 function foo4(x: any);
->foo4 : { (x: any): any; (x: any): any; }
+>foo4 : typeof foo4
 >x : any
 
 function foo4(x: any) { }
->foo4 : { (x: any): any; (x: any): any; }
+>foo4 : typeof foo4
 >x : any
 
 function foo5(x: 'a');
->foo5 : { (x: 'a'): any; (x: 'a'): any; (x: string): any; }
+>foo5 : typeof foo5
 >x : 'a'
 
 function foo5(x: 'a');
->foo5 : { (x: 'a'): any; (x: 'a'): any; (x: string): any; }
+>foo5 : typeof foo5
 >x : 'a'
 
 function foo5(x: string);
->foo5 : { (x: 'a'): any; (x: 'a'): any; (x: string): any; }
+>foo5 : typeof foo5
 >x : string
 
 function foo5(x: any) { }
->foo5 : { (x: 'a'): any; (x: 'a'): any; (x: string): any; }
+>foo5 : typeof foo5
 >x : any
 
 enum E { A }
@@ -70,28 +70,28 @@ enum E { A }
 >A : E
 
 function foo6(x: E);
->foo6 : { (x: E): any; (x: E): any; }
+>foo6 : typeof foo6
 >x : E
 >E : E
 
 function foo6(x: E);
->foo6 : { (x: E): any; (x: E): any; }
+>foo6 : typeof foo6
 >x : E
 >E : E
 
 function foo6(x: any) { }
->foo6 : { (x: E): any; (x: E): any; }
+>foo6 : typeof foo6
 >x : any
 
 function foo7(x: void);
->foo7 : { (x: void): any; (x: void): any; }
+>foo7 : typeof foo7
 >x : void
 
 function foo7(x: void);
->foo7 : { (x: void): any; (x: void): any; }
+>foo7 : typeof foo7
 >x : void
 
 function foo7(x: any) { }
->foo7 : { (x: void): any; (x: void): any; }
+>foo7 : typeof foo7
 >x : any
 
diff --git a/tests/baselines/reference/privacyAccessorDeclFile.errors.txt b/tests/baselines/reference/privacyAccessorDeclFile.errors.txt
deleted file mode 100644
index 713f1807251..00000000000
--- a/tests/baselines/reference/privacyAccessorDeclFile.errors.txt
+++ /dev/null
@@ -1,1130 +0,0 @@
-==== tests/cases/compiler/privacyAccessorDeclFile_externalModule.ts (24 errors) ====
-    
-    class privateClass {
-    }
-    
-    export class publicClass {
-    }
-    
-    export class publicClassWithWithPrivateGetAccessorTypes {
-        static get myPublicStaticMethod(): privateClass { // Error
-                   ~~~~~~~~~~~~~~~~~~~~
-!!! Return type of public static property getter from exported class has or is using private name 'privateClass'.
-            return null;
-        }
-        private static get myPrivateStaticMethod(): privateClass {
-            return null;
-        }
-        get myPublicMethod(): privateClass { // Error
-            ~~~~~~~~~~~~~~
-!!! Return type of public property getter from exported class has or is using private name 'privateClass'.
-            return null;
-        }
-        private get myPrivateMethod(): privateClass {
-            return null;
-        }
-        static get myPublicStaticMethod1() { // Error
-                   ~~~~~~~~~~~~~~~~~~~~~
-!!! Return type of public static property getter from exported class has or is using private name 'privateClass'.
-            return new privateClass();
-        }
-        private static get myPrivateStaticMethod1() {
-            return new privateClass();
-        }
-        get myPublicMethod1() { // Error
-            ~~~~~~~~~~~~~~~
-!!! Return type of public property getter from exported class has or is using private name 'privateClass'.
-            return new privateClass();
-        }
-        private get myPrivateMethod1() {
-            return new privateClass();
-        }
-    }
-    
-    export class publicClassWithWithPublicGetAccessorTypes {
-        static get myPublicStaticMethod(): publicClass {
-            return null;
-        }
-        private static get myPrivateStaticMethod(): publicClass {
-            return null;
-        }
-        get myPublicMethod(): publicClass {
-            return null;
-        }
-        private get myPrivateMethod(): publicClass {
-            return null;
-        }
-        static get myPublicStaticMethod1() {
-            return new publicClass();
-        }
-        private static get myPrivateStaticMethod1() {
-            return new publicClass();
-        }
-        get myPublicMethod1() {
-            return new publicClass();
-        }
-        private get myPrivateMethod1() {
-            return new publicClass();
-        }
-    }
-    
-    class privateClassWithWithPrivateGetAccessorTypes {
-        static get myPublicStaticMethod(): privateClass {
-            return null;
-        }
-        private static get myPrivateStaticMethod(): privateClass {
-            return null;
-        }
-        get myPublicMethod(): privateClass {
-            return null;
-        }
-        private get myPrivateMethod(): privateClass {
-            return null;
-        }
-        static get myPublicStaticMethod1() {
-            return new privateClass();
-        }
-        private static get myPrivateStaticMethod1() {
-            return new privateClass();
-        }
-        get myPublicMethod1() {
-            return new privateClass();
-        }
-        private get myPrivateMethod1() {
-            return new privateClass();
-        }
-    }
-    
-    class privateClassWithWithPublicGetAccessorTypes {
-        static get myPublicStaticMethod(): publicClass {
-            return null;
-        }
-        private static get myPrivateStaticMethod(): publicClass {
-            return null;
-        }
-        get myPublicMethod(): publicClass {
-            return null;
-        }
-        private get myPrivateMethod(): publicClass {
-            return null;
-        }
-        static get myPublicStaticMethod1() {
-            return new publicClass();
-        }
-        private static get myPrivateStaticMethod1() {
-            return new publicClass();
-        }
-        get myPublicMethod1() {
-            return new publicClass();
-        }
-        private get myPrivateMethod1() {
-            return new publicClass();
-        }
-    }
-    
-    export class publicClassWithWithPrivateSetAccessorTypes {
-        static set myPublicStaticMethod(param: privateClass) { // Error
-                                        ~~~~~~~~~~~~~~~~~~~
-!!! Parameter 'myPublicStaticMethod' of public property setter from exported class has or is using private name 'privateClass'.
-        }
-        private static set myPrivateStaticMethod(param: privateClass) {
-        }
-        set myPublicMethod(param: privateClass) { // Error
-                           ~~~~~~~~~~~~~~~~~~~
-!!! Parameter 'myPublicMethod' of public property setter from exported class has or is using private name 'privateClass'.
-        }
-        private set myPrivateMethod(param: privateClass) {
-        }
-    }
-    
-    export class publicClassWithWithPublicSetAccessorTypes {
-        static set myPublicStaticMethod(param: publicClass) {
-        }
-        private static set myPrivateStaticMethod(param: publicClass) {
-        }
-        set myPublicMethod(param: publicClass) {
-        }
-        private set myPrivateMethod(param: publicClass) {
-        }
-    }
-    
-    class privateClassWithWithPrivateSetAccessorTypes {
-        static set myPublicStaticMethod(param: privateClass) {
-        }
-        private static set myPrivateStaticMethod(param: privateClass) {
-        }
-        set myPublicMethod(param: privateClass) { 
-        }
-        private set myPrivateMethod(param: privateClass) {
-        }
-    }
-    
-    class privateClassWithWithPublicSetAccessorTypes {
-        static set myPublicStaticMethod(param: publicClass) {
-        }
-        private static set myPrivateStaticMethod(param: publicClass) {
-        }
-        set myPublicMethod(param: publicClass) {
-        }
-        private set myPrivateMethod(param: publicClass) {
-        }
-    }
-    
-    export class publicClassWithPrivateModuleGetAccessorTypes {
-        static get myPublicStaticMethod(): privateModule.publicClass { // Error
-                   ~~~~~~~~~~~~~~~~~~~~
-!!! Return type of public static property getter from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-            return null;
-        }
-        get myPublicMethod(): privateModule.publicClass { // Error
-            ~~~~~~~~~~~~~~
-!!! Return type of public property getter from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-            return null;
-        }
-        static get myPublicStaticMethod1() { // Error
-                   ~~~~~~~~~~~~~~~~~~~~~
-!!! Return type of public static property getter from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-            return new privateModule.publicClass();
-        }
-        get myPublicMethod1() { // Error
-            ~~~~~~~~~~~~~~~
-!!! Return type of public property getter from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-            return new privateModule.publicClass();
-        }
-    }
-    
-    export class publicClassWithPrivateModuleSetAccessorTypes {
-        static set myPublicStaticMethod(param: privateModule.publicClass) { // Error
-                                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Parameter 'myPublicStaticMethod' of public property setter from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-        }
-        set myPublicMethod(param: privateModule.publicClass) { // Error
-                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Parameter 'myPublicMethod' of public property setter from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-        }
-    }
-    
-    class privateClassWithPrivateModuleGetAccessorTypes {
-        static get myPublicStaticMethod(): privateModule.publicClass {
-            return null;
-        }
-        get myPublicMethod(): privateModule.publicClass {
-            return null;
-        }
-        static get myPublicStaticMethod1() {
-            return new privateModule.publicClass();
-        }
-        get myPublicMethod1() {
-            return new privateModule.publicClass();
-        }
-    }
-    
-    class privateClassWithPrivateModuleSetAccessorTypes {
-        static set myPublicStaticMethod(param: privateModule.publicClass) {
-        }
-        set myPublicMethod(param: privateModule.publicClass) {
-        }
-    }
-    
-    export module publicModule {
-        class privateClass {
-        }
-    
-        export class publicClass {
-        }
-        export class publicClassWithWithPrivateGetAccessorTypes {
-            static get myPublicStaticMethod(): privateClass { // Error
-                       ~~~~~~~~~~~~~~~~~~~~
-!!! Return type of public static property getter from exported class has or is using private name 'privateClass'.
-                return null;
-            }
-            private static get myPrivateStaticMethod(): privateClass {
-                return null;
-            }
-            get myPublicMethod(): privateClass { // Error
-                ~~~~~~~~~~~~~~
-!!! Return type of public property getter from exported class has or is using private name 'privateClass'.
-                return null;
-            }
-            private get myPrivateMethod(): privateClass {
-                return null;
-            }
-            static get myPublicStaticMethod1() { // Error
-                       ~~~~~~~~~~~~~~~~~~~~~
-!!! Return type of public static property getter from exported class has or is using private name 'privateClass'.
-                return new privateClass();
-            }
-            private static get myPrivateStaticMethod1() {
-                return new privateClass();
-            }
-            get myPublicMethod1() { // Error
-                ~~~~~~~~~~~~~~~
-!!! Return type of public property getter from exported class has or is using private name 'privateClass'.
-                return new privateClass();
-            }
-            private get myPrivateMethod1() {
-                return new privateClass();
-            }
-        }
-    
-        export class publicClassWithWithPublicGetAccessorTypes {
-            static get myPublicStaticMethod(): publicClass {
-                return null;
-            }
-            private static get myPrivateStaticMethod(): publicClass {
-                return null;
-            }
-            get myPublicMethod(): publicClass {
-                return null;
-            }
-            private get myPrivateMethod(): publicClass {
-                return null;
-            }
-            static get myPublicStaticMethod1() {
-                return new publicClass();
-            }
-            private static get myPrivateStaticMethod1() {
-                return new publicClass();
-            }
-            get myPublicMethod1() {
-                return new publicClass();
-            }
-            private get myPrivateMethod1() {
-                return new publicClass();
-            }
-        }
-    
-        class privateClassWithWithPrivateGetAccessorTypes {
-            static get myPublicStaticMethod(): privateClass {
-                return null;
-            }
-            private static get myPrivateStaticMethod(): privateClass {
-                return null;
-            }
-            get myPublicMethod(): privateClass {
-                return null;
-            }
-            private get myPrivateMethod(): privateClass {
-                return null;
-            }
-            static get myPublicStaticMethod1() {
-                return new privateClass();
-            }
-            private static get myPrivateStaticMethod1() {
-                return new privateClass();
-            }
-            get myPublicMethod1() {
-                return new privateClass();
-            }
-            private get myPrivateMethod1() {
-                return new privateClass();
-            }
-        }
-    
-        class privateClassWithWithPublicGetAccessorTypes {
-            static get myPublicStaticMethod(): publicClass {
-                return null;
-            }
-            private static get myPrivateStaticMethod(): publicClass {
-                return null;
-            }
-            get myPublicMethod(): publicClass {
-                return null;
-            }
-            private get myPrivateMethod(): publicClass {
-                return null;
-            }
-            static get myPublicStaticMethod1() {
-                return new publicClass();
-            }
-            private static get myPrivateStaticMethod1() {
-                return new publicClass();
-            }
-            get myPublicMethod1() {
-                return new publicClass();
-            }
-            private get myPrivateMethod1() {
-                return new publicClass();
-            }
-        }
-    
-        export class publicClassWithWithPrivateSetAccessorTypes {
-            static set myPublicStaticMethod(param: privateClass) { // Error
-                                            ~~~~~~~~~~~~~~~~~~~
-!!! Parameter 'myPublicStaticMethod' of public property setter from exported class has or is using private name 'privateClass'.
-            }
-            private static set myPrivateStaticMethod(param: privateClass) {
-            }
-            set myPublicMethod(param: privateClass) { // Error
-                               ~~~~~~~~~~~~~~~~~~~
-!!! Parameter 'myPublicMethod' of public property setter from exported class has or is using private name 'privateClass'.
-            }
-            private set myPrivateMethod(param: privateClass) {
-            }
-        }
-    
-        export class publicClassWithWithPublicSetAccessorTypes {
-            static set myPublicStaticMethod(param: publicClass) {
-            }
-            private static set myPrivateStaticMethod(param: publicClass) {
-            }
-            set myPublicMethod(param: publicClass) {
-            }
-            private set myPrivateMethod(param: publicClass) {
-            }
-        }
-    
-        class privateClassWithWithPrivateSetAccessorTypes {
-            static set myPublicStaticMethod(param: privateClass) {
-            }
-            private static set myPrivateStaticMethod(param: privateClass) {
-            }
-            set myPublicMethod(param: privateClass) {
-            }
-            private set myPrivateMethod(param: privateClass) {
-            }
-        }
-    
-        class privateClassWithWithPublicSetAccessorTypes {
-            static set myPublicStaticMethod(param: publicClass) {
-            }
-            private static set myPrivateStaticMethod(param: publicClass) {
-            }
-            set myPublicMethod(param: publicClass) {
-            }
-            private set myPrivateMethod(param: publicClass) {
-            }
-        }
-    
-        export class publicClassWithPrivateModuleGetAccessorTypes {
-            static get myPublicStaticMethod(): privateModule.publicClass { // Error
-                       ~~~~~~~~~~~~~~~~~~~~
-!!! Return type of public static property getter from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-                return null;
-            }
-            get myPublicMethod(): privateModule.publicClass { // Error
-                ~~~~~~~~~~~~~~
-!!! Return type of public property getter from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-                return null;
-            }
-            static get myPublicStaticMethod1() { // Error
-                       ~~~~~~~~~~~~~~~~~~~~~
-!!! Return type of public static property getter from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-                return new privateModule.publicClass();
-            }
-            get myPublicMethod1() { // Error
-                ~~~~~~~~~~~~~~~
-!!! Return type of public property getter from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-                return new privateModule.publicClass();
-            }
-        }
-    
-        export class publicClassWithPrivateModuleSetAccessorTypes {
-            static set myPublicStaticMethod(param: privateModule.publicClass) { // Error
-                                            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Parameter 'myPublicStaticMethod' of public property setter from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-            }
-            set myPublicMethod(param: privateModule.publicClass) { // Error
-                               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Parameter 'myPublicMethod' of public property setter from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-            }
-        }
-    
-        class privateClassWithPrivateModuleGetAccessorTypes {
-            static get myPublicStaticMethod(): privateModule.publicClass {
-                return null;
-            }
-            get myPublicMethod(): privateModule.publicClass {
-                return null;
-            }
-            static get myPublicStaticMethod1() {
-                return new privateModule.publicClass();
-            }
-            get myPublicMethod1() {
-                return new privateModule.publicClass();
-            }
-        }
-    
-        class privateClassWithPrivateModuleSetAccessorTypes {
-            static set myPublicStaticMethod(param: privateModule.publicClass) {
-            }
-            set myPublicMethod(param: privateModule.publicClass) {
-            }
-        }
-    }
-    
-    module privateModule {
-        class privateClass {
-        }
-    
-        export class publicClass {
-        }
-        export class publicClassWithWithPrivateGetAccessorTypes {
-            static get myPublicStaticMethod(): privateClass { 
-                return null;
-            }
-            private static get myPrivateStaticMethod(): privateClass {
-                return null;
-            }
-            get myPublicMethod(): privateClass { 
-                return null;
-            }
-            private get myPrivateMethod(): privateClass {
-                return null;
-            }
-            static get myPublicStaticMethod1() { 
-                return new privateClass();
-            }
-            private static get myPrivateStaticMethod1() {
-                return new privateClass();
-            }
-            get myPublicMethod1() { 
-                return new privateClass();
-            }
-            private get myPrivateMethod1() {
-                return new privateClass();
-            }
-        }
-    
-        export class publicClassWithWithPublicGetAccessorTypes {
-            static get myPublicStaticMethod(): publicClass {
-                return null;
-            }
-            private static get myPrivateStaticMethod(): publicClass {
-                return null;
-            }
-            get myPublicMethod(): publicClass {
-                return null;
-            }
-            private get myPrivateMethod(): publicClass {
-                return null;
-            }
-            static get myPublicStaticMethod1() {
-                return new publicClass();
-            }
-            private static get myPrivateStaticMethod1() {
-                return new publicClass();
-            }
-            get myPublicMethod1() {
-                return new publicClass();
-            }
-            private get myPrivateMethod1() {
-                return new publicClass();
-            }
-        }
-    
-        class privateClassWithWithPrivateGetAccessorTypes {
-            static get myPublicStaticMethod(): privateClass {
-                return null;
-            }
-            private static get myPrivateStaticMethod(): privateClass {
-                return null;
-            }
-            get myPublicMethod(): privateClass {
-                return null;
-            }
-            private get myPrivateMethod(): privateClass {
-                return null;
-            }
-            static get myPublicStaticMethod1() {
-                return new privateClass();
-            }
-            private static get myPrivateStaticMethod1() {
-                return new privateClass();
-            }
-            get myPublicMethod1() {
-                return new privateClass();
-            }
-            private get myPrivateMethod1() {
-                return new privateClass();
-            }
-        }
-    
-        class privateClassWithWithPublicGetAccessorTypes {
-            static get myPublicStaticMethod(): publicClass {
-                return null;
-            }
-            private static get myPrivateStaticMethod(): publicClass {
-                return null;
-            }
-            get myPublicMethod(): publicClass {
-                return null;
-            }
-            private get myPrivateMethod(): publicClass {
-                return null;
-            }
-            static get myPublicStaticMethod1() {
-                return new publicClass();
-            }
-            private static get myPrivateStaticMethod1() {
-                return new publicClass();
-            }
-            get myPublicMethod1() {
-                return new publicClass();
-            }
-            private get myPrivateMethod1() {
-                return new publicClass();
-            }
-        }
-    
-        export class publicClassWithWithPrivateSetAccessorTypes {
-            static set myPublicStaticMethod(param: privateClass) { 
-            }
-            private static set myPrivateStaticMethod(param: privateClass) {
-            }
-            set myPublicMethod(param: privateClass) { 
-            }
-            private set myPrivateMethod(param: privateClass) {
-            }
-        }
-    
-        export class publicClassWithWithPublicSetAccessorTypes {
-            static set myPublicStaticMethod(param: publicClass) {
-            }
-            private static set myPrivateStaticMethod(param: publicClass) {
-            }
-            set myPublicMethod(param: publicClass) {
-            }
-            private set myPrivateMethod(param: publicClass) {
-            }
-        }
-    
-        class privateClassWithWithPrivateSetAccessorTypes {
-            static set myPublicStaticMethod(param: privateClass) {
-            }
-            private static set myPrivateStaticMethod(param: privateClass) {
-            }
-            set myPublicMethod(param: privateClass) {
-            }
-            private set myPrivateMethod(param: privateClass) {
-            }
-        }
-    
-        class privateClassWithWithPublicSetAccessorTypes {
-            static set myPublicStaticMethod(param: publicClass) {
-            }
-            private static set myPrivateStaticMethod(param: publicClass) {
-            }
-            set myPublicMethod(param: publicClass) {
-            }
-            private set myPrivateMethod(param: publicClass) {
-            }
-        }
-    
-        export class publicClassWithPrivateModuleGetAccessorTypes {
-            static get myPublicStaticMethod(): privateModule.publicClass { 
-                return null;
-            }
-            get myPublicMethod(): privateModule.publicClass { 
-                return null;
-            }
-            static get myPublicStaticMethod1() { 
-                return new privateModule.publicClass();
-            }
-            get myPublicMethod1() { 
-                return new privateModule.publicClass();
-            }
-        }
-    
-        export class publicClassWithPrivateModuleSetAccessorTypes {
-            static set myPublicStaticMethod(param: privateModule.publicClass) { 
-            }
-            set myPublicMethod(param: privateModule.publicClass) { 
-            }
-        }
-    
-        class privateClassWithPrivateModuleGetAccessorTypes {
-            static get myPublicStaticMethod(): privateModule.publicClass {
-                return null;
-            }
-            get myPublicMethod(): privateModule.publicClass {
-                return null;
-            }
-            static get myPublicStaticMethod1() {
-                return new privateModule.publicClass();
-            }
-            get myPublicMethod1() {
-                return new privateModule.publicClass();
-            }
-        }
-    
-        class privateClassWithPrivateModuleSetAccessorTypes {
-            static set myPublicStaticMethod(param: privateModule.publicClass) {
-            }
-            set myPublicMethod(param: privateModule.publicClass) {
-            }
-        }
-    }
-    
-==== tests/cases/compiler/privacyAccessorDeclFile_GlobalFile.ts (12 errors) ====
-    class publicClassInGlobal {
-    }
-    
-    class publicClassInGlobalWithPublicGetAccessorTypes {
-        static get myPublicStaticMethod(): publicClassInGlobal {
-            return null;
-        }
-        private static get myPrivateStaticMethod(): publicClassInGlobal {
-            return null;
-        }
-        get myPublicMethod(): publicClassInGlobal {
-            return null;
-        }
-        private get myPrivateMethod(): publicClassInGlobal {
-            return null;
-        }
-        static get myPublicStaticMethod1() {
-            return new publicClassInGlobal();
-        }
-        private static get myPrivateStaticMethod1() {
-            return new publicClassInGlobal();
-        }
-        get myPublicMethod1() {
-            return new publicClassInGlobal();
-        }
-        private get myPrivateMethod1() {
-            return new publicClassInGlobal();
-        }
-    }
-    
-    class publicClassInGlobalWithWithPublicSetAccessorTypes {
-        static set myPublicStaticMethod(param: publicClassInGlobal) {
-        }
-        private static set myPrivateStaticMethod(param: publicClassInGlobal) {
-        }
-        set myPublicMethod(param: publicClassInGlobal) {
-        }
-        private set myPrivateMethod(param: publicClassInGlobal) {
-        }
-    }
-    
-    module publicModuleInGlobal {
-        class privateClass {
-        }
-    
-        export class publicClass {
-        }
-    
-        module privateModule {
-            class privateClass {
-            }
-    
-            export class publicClass {
-            }
-            export class publicClassWithWithPrivateGetAccessorTypes {
-                static get myPublicStaticMethod(): privateClass {
-                    return null;
-                }
-                private static get myPrivateStaticMethod(): privateClass {
-                    return null;
-                }
-                get myPublicMethod(): privateClass {
-                    return null;
-                }
-                private get myPrivateMethod(): privateClass {
-                    return null;
-                }
-                static get myPublicStaticMethod1() {
-                    return new privateClass();
-                }
-                private static get myPrivateStaticMethod1() {
-                    return new privateClass();
-                }
-                get myPublicMethod1() {
-                    return new privateClass();
-                }
-                private get myPrivateMethod1() {
-                    return new privateClass();
-                }
-            }
-    
-            export class publicClassWithWithPublicGetAccessorTypes {
-                static get myPublicStaticMethod(): publicClass {
-                    return null;
-                }
-                private static get myPrivateStaticMethod(): publicClass {
-                    return null;
-                }
-                get myPublicMethod(): publicClass {
-                    return null;
-                }
-                private get myPrivateMethod(): publicClass {
-                    return null;
-                }
-                static get myPublicStaticMethod1() {
-                    return new publicClass();
-                }
-                private static get myPrivateStaticMethod1() {
-                    return new publicClass();
-                }
-                get myPublicMethod1() {
-                    return new publicClass();
-                }
-                private get myPrivateMethod1() {
-                    return new publicClass();
-                }
-            }
-    
-            class privateClassWithWithPrivateGetAccessorTypes {
-                static get myPublicStaticMethod(): privateClass {
-                    return null;
-                }
-                private static get myPrivateStaticMethod(): privateClass {
-                    return null;
-                }
-                get myPublicMethod(): privateClass {
-                    return null;
-                }
-                private get myPrivateMethod(): privateClass {
-                    return null;
-                }
-                static get myPublicStaticMethod1() {
-                    return new privateClass();
-                }
-                private static get myPrivateStaticMethod1() {
-                    return new privateClass();
-                }
-                get myPublicMethod1() {
-                    return new privateClass();
-                }
-                private get myPrivateMethod1() {
-                    return new privateClass();
-                }
-            }
-    
-            class privateClassWithWithPublicGetAccessorTypes {
-                static get myPublicStaticMethod(): publicClass {
-                    return null;
-                }
-                private static get myPrivateStaticMethod(): publicClass {
-                    return null;
-                }
-                get myPublicMethod(): publicClass {
-                    return null;
-                }
-                private get myPrivateMethod(): publicClass {
-                    return null;
-                }
-                static get myPublicStaticMethod1() {
-                    return new publicClass();
-                }
-                private static get myPrivateStaticMethod1() {
-                    return new publicClass();
-                }
-                get myPublicMethod1() {
-                    return new publicClass();
-                }
-                private get myPrivateMethod1() {
-                    return new publicClass();
-                }
-            }
-    
-            export class publicClassWithWithPrivateSetAccessorTypes {
-                static set myPublicStaticMethod(param: privateClass) {
-                }
-                private static set myPrivateStaticMethod(param: privateClass) {
-                }
-                set myPublicMethod(param: privateClass) {
-                }
-                private set myPrivateMethod(param: privateClass) {
-                }
-            }
-    
-            export class publicClassWithWithPublicSetAccessorTypes {
-                static set myPublicStaticMethod(param: publicClass) {
-                }
-                private static set myPrivateStaticMethod(param: publicClass) {
-                }
-                set myPublicMethod(param: publicClass) {
-                }
-                private set myPrivateMethod(param: publicClass) {
-                }
-            }
-    
-            class privateClassWithWithPrivateSetAccessorTypes {
-                static set myPublicStaticMethod(param: privateClass) {
-                }
-                private static set myPrivateStaticMethod(param: privateClass) {
-                }
-                set myPublicMethod(param: privateClass) {
-                }
-                private set myPrivateMethod(param: privateClass) {
-                }
-            }
-    
-            class privateClassWithWithPublicSetAccessorTypes {
-                static set myPublicStaticMethod(param: publicClass) {
-                }
-                private static set myPrivateStaticMethod(param: publicClass) {
-                }
-                set myPublicMethod(param: publicClass) {
-                }
-                private set myPrivateMethod(param: publicClass) {
-                }
-            }
-    
-            export class publicClassWithPrivateModuleGetAccessorTypes {
-                static get myPublicStaticMethod(): privateModule.publicClass {
-                    return null;
-                }
-                get myPublicMethod(): privateModule.publicClass {
-                    return null;
-                }
-                static get myPublicStaticMethod1() {
-                    return new privateModule.publicClass();
-                }
-                get myPublicMethod1() {
-                    return new privateModule.publicClass();
-                }
-            }
-    
-            export class publicClassWithPrivateModuleSetAccessorTypes {
-                static set myPublicStaticMethod(param: privateModule.publicClass) {
-                }
-                set myPublicMethod(param: privateModule.publicClass) {
-                }
-            }
-    
-            class privateClassWithPrivateModuleGetAccessorTypes {
-                static get myPublicStaticMethod(): privateModule.publicClass {
-                    return null;
-                }
-                get myPublicMethod(): privateModule.publicClass {
-                    return null;
-                }
-                static get myPublicStaticMethod1() {
-                    return new privateModule.publicClass();
-                }
-                get myPublicMethod1() {
-                    return new privateModule.publicClass();
-                }
-            }
-    
-            class privateClassWithPrivateModuleSetAccessorTypes {
-                static set myPublicStaticMethod(param: privateModule.publicClass) {
-                }
-                set myPublicMethod(param: privateModule.publicClass) {
-                }
-            }
-        }
-    
-        export class publicClassWithWithPrivateGetAccessorTypes {
-            static get myPublicStaticMethod(): privateClass { // Error
-                       ~~~~~~~~~~~~~~~~~~~~
-!!! Return type of public static property getter from exported class has or is using private name 'privateClass'.
-                return null;
-            }
-            private static get myPrivateStaticMethod(): privateClass {
-                return null;
-            }
-            get myPublicMethod(): privateClass { // Error
-                ~~~~~~~~~~~~~~
-!!! Return type of public property getter from exported class has or is using private name 'privateClass'.
-                return null;
-            }
-            private get myPrivateMethod(): privateClass {
-                return null;
-            }
-            static get myPublicStaticMethod1() { // Error
-                       ~~~~~~~~~~~~~~~~~~~~~
-!!! Return type of public static property getter from exported class has or is using private name 'privateClass'.
-                return new privateClass();
-            }
-            private static get myPrivateStaticMethod1() {
-                return new privateClass();
-            }
-            get myPublicMethod1() { // Error
-                ~~~~~~~~~~~~~~~
-!!! Return type of public property getter from exported class has or is using private name 'privateClass'.
-                return new privateClass();
-            }
-            private get myPrivateMethod1() {
-                return new privateClass();
-            }
-        }
-    
-        export class publicClassWithWithPublicGetAccessorTypes {
-            static get myPublicStaticMethod(): publicClass {
-                return null;
-            }
-            private static get myPrivateStaticMethod(): publicClass {
-                return null;
-            }
-            get myPublicMethod(): publicClass {
-                return null;
-            }
-            private get myPrivateMethod(): publicClass {
-                return null;
-            }
-            static get myPublicStaticMethod1() {
-                return new publicClass();
-            }
-            private static get myPrivateStaticMethod1() {
-                return new publicClass();
-            }
-            get myPublicMethod1() {
-                return new publicClass();
-            }
-            private get myPrivateMethod1() {
-                return new publicClass();
-            }
-        }
-    
-        class privateClassWithWithPrivateGetAccessorTypes {
-            static get myPublicStaticMethod(): privateClass {
-                return null;
-            }
-            private static get myPrivateStaticMethod(): privateClass {
-                return null;
-            }
-            get myPublicMethod(): privateClass {
-                return null;
-            }
-            private get myPrivateMethod(): privateClass {
-                return null;
-            }
-            static get myPublicStaticMethod1() {
-                return new privateClass();
-            }
-            private static get myPrivateStaticMethod1() {
-                return new privateClass();
-            }
-            get myPublicMethod1() {
-                return new privateClass();
-            }
-            private get myPrivateMethod1() {
-                return new privateClass();
-            }
-        }
-    
-        class privateClassWithWithPublicGetAccessorTypes {
-            static get myPublicStaticMethod(): publicClass {
-                return null;
-            }
-            private static get myPrivateStaticMethod(): publicClass {
-                return null;
-            }
-            get myPublicMethod(): publicClass {
-                return null;
-            }
-            private get myPrivateMethod(): publicClass {
-                return null;
-            }
-            static get myPublicStaticMethod1() {
-                return new publicClass();
-            }
-            private static get myPrivateStaticMethod1() {
-                return new publicClass();
-            }
-            get myPublicMethod1() {
-                return new publicClass();
-            }
-            private get myPrivateMethod1() {
-                return new publicClass();
-            }
-        }
-    
-        export class publicClassWithWithPrivateSetAccessorTypes {
-            static set myPublicStaticMethod(param: privateClass) { // Error
-                                            ~~~~~~~~~~~~~~~~~~~
-!!! Parameter 'myPublicStaticMethod' of public property setter from exported class has or is using private name 'privateClass'.
-            }
-            private static set myPrivateStaticMethod(param: privateClass) {
-            }
-            set myPublicMethod(param: privateClass) { // Error
-                               ~~~~~~~~~~~~~~~~~~~
-!!! Parameter 'myPublicMethod' of public property setter from exported class has or is using private name 'privateClass'.
-            }
-            private set myPrivateMethod(param: privateClass) {
-            }
-        }
-    
-        export class publicClassWithWithPublicSetAccessorTypes {
-            static set myPublicStaticMethod(param: publicClass) {
-            }
-            private static set myPrivateStaticMethod(param: publicClass) {
-            }
-            set myPublicMethod(param: publicClass) {
-            }
-            private set myPrivateMethod(param: publicClass) {
-            }
-        }
-    
-        class privateClassWithWithPrivateSetAccessorTypes {
-            static set myPublicStaticMethod(param: privateClass) {
-            }
-            private static set myPrivateStaticMethod(param: privateClass) {
-            }
-            set myPublicMethod(param: privateClass) {
-            }
-            private set myPrivateMethod(param: privateClass) {
-            }
-        }
-    
-        class privateClassWithWithPublicSetAccessorTypes {
-            static set myPublicStaticMethod(param: publicClass) {
-            }
-            private static set myPrivateStaticMethod(param: publicClass) {
-            }
-            set myPublicMethod(param: publicClass) {
-            }
-            private set myPrivateMethod(param: publicClass) {
-            }
-        }
-    
-        export class publicClassWithPrivateModuleGetAccessorTypes {
-            static get myPublicStaticMethod(): privateModule.publicClass { // Error
-                       ~~~~~~~~~~~~~~~~~~~~
-!!! Return type of public static property getter from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-                return null;
-            }
-            get myPublicMethod(): privateModule.publicClass { // Error
-                ~~~~~~~~~~~~~~
-!!! Return type of public property getter from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-                return null;
-            }
-            static get myPublicStaticMethod1() { // Error
-                       ~~~~~~~~~~~~~~~~~~~~~
-!!! Return type of public static property getter from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-                return new privateModule.publicClass();
-            }
-            get myPublicMethod1() { // Error
-                ~~~~~~~~~~~~~~~
-!!! Return type of public property getter from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-                return new privateModule.publicClass();
-            }
-        }
-    
-        export class publicClassWithPrivateModuleSetAccessorTypes {
-            static set myPublicStaticMethod(param: privateModule.publicClass) { // Error
-                                            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Parameter 'myPublicStaticMethod' of public property setter from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-            }
-            set myPublicMethod(param: privateModule.publicClass) { // Error
-                               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Parameter 'myPublicMethod' of public property setter from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-            }
-        }
-    
-        class privateClassWithPrivateModuleGetAccessorTypes {
-            static get myPublicStaticMethod(): privateModule.publicClass {
-                return null;
-            }
-            get myPublicMethod(): privateModule.publicClass {
-                return null;
-            }
-            static get myPublicStaticMethod1() {
-                return new privateModule.publicClass();
-            }
-            get myPublicMethod1() {
-                return new privateModule.publicClass();
-            }
-        }
-    
-        class privateClassWithPrivateModuleSetAccessorTypes {
-            static set myPublicStaticMethod(param: privateModule.publicClass) {
-            }
-            set myPublicMethod(param: privateModule.publicClass) {
-            }
-        }
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/privacyAccessorDeclFile.js b/tests/baselines/reference/privacyAccessorDeclFile.js
deleted file mode 100644
index 9744e4ef220..00000000000
--- a/tests/baselines/reference/privacyAccessorDeclFile.js
+++ /dev/null
@@ -1,3555 +0,0 @@
-//// [tests/cases/compiler/privacyAccessorDeclFile.ts] ////
-
-//// [privacyAccessorDeclFile_externalModule.ts]
-
-class privateClass {
-}
-
-export class publicClass {
-}
-
-export class publicClassWithWithPrivateGetAccessorTypes {
-    static get myPublicStaticMethod(): privateClass { // Error
-        return null;
-    }
-    private static get myPrivateStaticMethod(): privateClass {
-        return null;
-    }
-    get myPublicMethod(): privateClass { // Error
-        return null;
-    }
-    private get myPrivateMethod(): privateClass {
-        return null;
-    }
-    static get myPublicStaticMethod1() { // Error
-        return new privateClass();
-    }
-    private static get myPrivateStaticMethod1() {
-        return new privateClass();
-    }
-    get myPublicMethod1() { // Error
-        return new privateClass();
-    }
-    private get myPrivateMethod1() {
-        return new privateClass();
-    }
-}
-
-export class publicClassWithWithPublicGetAccessorTypes {
-    static get myPublicStaticMethod(): publicClass {
-        return null;
-    }
-    private static get myPrivateStaticMethod(): publicClass {
-        return null;
-    }
-    get myPublicMethod(): publicClass {
-        return null;
-    }
-    private get myPrivateMethod(): publicClass {
-        return null;
-    }
-    static get myPublicStaticMethod1() {
-        return new publicClass();
-    }
-    private static get myPrivateStaticMethod1() {
-        return new publicClass();
-    }
-    get myPublicMethod1() {
-        return new publicClass();
-    }
-    private get myPrivateMethod1() {
-        return new publicClass();
-    }
-}
-
-class privateClassWithWithPrivateGetAccessorTypes {
-    static get myPublicStaticMethod(): privateClass {
-        return null;
-    }
-    private static get myPrivateStaticMethod(): privateClass {
-        return null;
-    }
-    get myPublicMethod(): privateClass {
-        return null;
-    }
-    private get myPrivateMethod(): privateClass {
-        return null;
-    }
-    static get myPublicStaticMethod1() {
-        return new privateClass();
-    }
-    private static get myPrivateStaticMethod1() {
-        return new privateClass();
-    }
-    get myPublicMethod1() {
-        return new privateClass();
-    }
-    private get myPrivateMethod1() {
-        return new privateClass();
-    }
-}
-
-class privateClassWithWithPublicGetAccessorTypes {
-    static get myPublicStaticMethod(): publicClass {
-        return null;
-    }
-    private static get myPrivateStaticMethod(): publicClass {
-        return null;
-    }
-    get myPublicMethod(): publicClass {
-        return null;
-    }
-    private get myPrivateMethod(): publicClass {
-        return null;
-    }
-    static get myPublicStaticMethod1() {
-        return new publicClass();
-    }
-    private static get myPrivateStaticMethod1() {
-        return new publicClass();
-    }
-    get myPublicMethod1() {
-        return new publicClass();
-    }
-    private get myPrivateMethod1() {
-        return new publicClass();
-    }
-}
-
-export class publicClassWithWithPrivateSetAccessorTypes {
-    static set myPublicStaticMethod(param: privateClass) { // Error
-    }
-    private static set myPrivateStaticMethod(param: privateClass) {
-    }
-    set myPublicMethod(param: privateClass) { // Error
-    }
-    private set myPrivateMethod(param: privateClass) {
-    }
-}
-
-export class publicClassWithWithPublicSetAccessorTypes {
-    static set myPublicStaticMethod(param: publicClass) {
-    }
-    private static set myPrivateStaticMethod(param: publicClass) {
-    }
-    set myPublicMethod(param: publicClass) {
-    }
-    private set myPrivateMethod(param: publicClass) {
-    }
-}
-
-class privateClassWithWithPrivateSetAccessorTypes {
-    static set myPublicStaticMethod(param: privateClass) {
-    }
-    private static set myPrivateStaticMethod(param: privateClass) {
-    }
-    set myPublicMethod(param: privateClass) { 
-    }
-    private set myPrivateMethod(param: privateClass) {
-    }
-}
-
-class privateClassWithWithPublicSetAccessorTypes {
-    static set myPublicStaticMethod(param: publicClass) {
-    }
-    private static set myPrivateStaticMethod(param: publicClass) {
-    }
-    set myPublicMethod(param: publicClass) {
-    }
-    private set myPrivateMethod(param: publicClass) {
-    }
-}
-
-export class publicClassWithPrivateModuleGetAccessorTypes {
-    static get myPublicStaticMethod(): privateModule.publicClass { // Error
-        return null;
-    }
-    get myPublicMethod(): privateModule.publicClass { // Error
-        return null;
-    }
-    static get myPublicStaticMethod1() { // Error
-        return new privateModule.publicClass();
-    }
-    get myPublicMethod1() { // Error
-        return new privateModule.publicClass();
-    }
-}
-
-export class publicClassWithPrivateModuleSetAccessorTypes {
-    static set myPublicStaticMethod(param: privateModule.publicClass) { // Error
-    }
-    set myPublicMethod(param: privateModule.publicClass) { // Error
-    }
-}
-
-class privateClassWithPrivateModuleGetAccessorTypes {
-    static get myPublicStaticMethod(): privateModule.publicClass {
-        return null;
-    }
-    get myPublicMethod(): privateModule.publicClass {
-        return null;
-    }
-    static get myPublicStaticMethod1() {
-        return new privateModule.publicClass();
-    }
-    get myPublicMethod1() {
-        return new privateModule.publicClass();
-    }
-}
-
-class privateClassWithPrivateModuleSetAccessorTypes {
-    static set myPublicStaticMethod(param: privateModule.publicClass) {
-    }
-    set myPublicMethod(param: privateModule.publicClass) {
-    }
-}
-
-export module publicModule {
-    class privateClass {
-    }
-
-    export class publicClass {
-    }
-    export class publicClassWithWithPrivateGetAccessorTypes {
-        static get myPublicStaticMethod(): privateClass { // Error
-            return null;
-        }
-        private static get myPrivateStaticMethod(): privateClass {
-            return null;
-        }
-        get myPublicMethod(): privateClass { // Error
-            return null;
-        }
-        private get myPrivateMethod(): privateClass {
-            return null;
-        }
-        static get myPublicStaticMethod1() { // Error
-            return new privateClass();
-        }
-        private static get myPrivateStaticMethod1() {
-            return new privateClass();
-        }
-        get myPublicMethod1() { // Error
-            return new privateClass();
-        }
-        private get myPrivateMethod1() {
-            return new privateClass();
-        }
-    }
-
-    export class publicClassWithWithPublicGetAccessorTypes {
-        static get myPublicStaticMethod(): publicClass {
-            return null;
-        }
-        private static get myPrivateStaticMethod(): publicClass {
-            return null;
-        }
-        get myPublicMethod(): publicClass {
-            return null;
-        }
-        private get myPrivateMethod(): publicClass {
-            return null;
-        }
-        static get myPublicStaticMethod1() {
-            return new publicClass();
-        }
-        private static get myPrivateStaticMethod1() {
-            return new publicClass();
-        }
-        get myPublicMethod1() {
-            return new publicClass();
-        }
-        private get myPrivateMethod1() {
-            return new publicClass();
-        }
-    }
-
-    class privateClassWithWithPrivateGetAccessorTypes {
-        static get myPublicStaticMethod(): privateClass {
-            return null;
-        }
-        private static get myPrivateStaticMethod(): privateClass {
-            return null;
-        }
-        get myPublicMethod(): privateClass {
-            return null;
-        }
-        private get myPrivateMethod(): privateClass {
-            return null;
-        }
-        static get myPublicStaticMethod1() {
-            return new privateClass();
-        }
-        private static get myPrivateStaticMethod1() {
-            return new privateClass();
-        }
-        get myPublicMethod1() {
-            return new privateClass();
-        }
-        private get myPrivateMethod1() {
-            return new privateClass();
-        }
-    }
-
-    class privateClassWithWithPublicGetAccessorTypes {
-        static get myPublicStaticMethod(): publicClass {
-            return null;
-        }
-        private static get myPrivateStaticMethod(): publicClass {
-            return null;
-        }
-        get myPublicMethod(): publicClass {
-            return null;
-        }
-        private get myPrivateMethod(): publicClass {
-            return null;
-        }
-        static get myPublicStaticMethod1() {
-            return new publicClass();
-        }
-        private static get myPrivateStaticMethod1() {
-            return new publicClass();
-        }
-        get myPublicMethod1() {
-            return new publicClass();
-        }
-        private get myPrivateMethod1() {
-            return new publicClass();
-        }
-    }
-
-    export class publicClassWithWithPrivateSetAccessorTypes {
-        static set myPublicStaticMethod(param: privateClass) { // Error
-        }
-        private static set myPrivateStaticMethod(param: privateClass) {
-        }
-        set myPublicMethod(param: privateClass) { // Error
-        }
-        private set myPrivateMethod(param: privateClass) {
-        }
-    }
-
-    export class publicClassWithWithPublicSetAccessorTypes {
-        static set myPublicStaticMethod(param: publicClass) {
-        }
-        private static set myPrivateStaticMethod(param: publicClass) {
-        }
-        set myPublicMethod(param: publicClass) {
-        }
-        private set myPrivateMethod(param: publicClass) {
-        }
-    }
-
-    class privateClassWithWithPrivateSetAccessorTypes {
-        static set myPublicStaticMethod(param: privateClass) {
-        }
-        private static set myPrivateStaticMethod(param: privateClass) {
-        }
-        set myPublicMethod(param: privateClass) {
-        }
-        private set myPrivateMethod(param: privateClass) {
-        }
-    }
-
-    class privateClassWithWithPublicSetAccessorTypes {
-        static set myPublicStaticMethod(param: publicClass) {
-        }
-        private static set myPrivateStaticMethod(param: publicClass) {
-        }
-        set myPublicMethod(param: publicClass) {
-        }
-        private set myPrivateMethod(param: publicClass) {
-        }
-    }
-
-    export class publicClassWithPrivateModuleGetAccessorTypes {
-        static get myPublicStaticMethod(): privateModule.publicClass { // Error
-            return null;
-        }
-        get myPublicMethod(): privateModule.publicClass { // Error
-            return null;
-        }
-        static get myPublicStaticMethod1() { // Error
-            return new privateModule.publicClass();
-        }
-        get myPublicMethod1() { // Error
-            return new privateModule.publicClass();
-        }
-    }
-
-    export class publicClassWithPrivateModuleSetAccessorTypes {
-        static set myPublicStaticMethod(param: privateModule.publicClass) { // Error
-        }
-        set myPublicMethod(param: privateModule.publicClass) { // Error
-        }
-    }
-
-    class privateClassWithPrivateModuleGetAccessorTypes {
-        static get myPublicStaticMethod(): privateModule.publicClass {
-            return null;
-        }
-        get myPublicMethod(): privateModule.publicClass {
-            return null;
-        }
-        static get myPublicStaticMethod1() {
-            return new privateModule.publicClass();
-        }
-        get myPublicMethod1() {
-            return new privateModule.publicClass();
-        }
-    }
-
-    class privateClassWithPrivateModuleSetAccessorTypes {
-        static set myPublicStaticMethod(param: privateModule.publicClass) {
-        }
-        set myPublicMethod(param: privateModule.publicClass) {
-        }
-    }
-}
-
-module privateModule {
-    class privateClass {
-    }
-
-    export class publicClass {
-    }
-    export class publicClassWithWithPrivateGetAccessorTypes {
-        static get myPublicStaticMethod(): privateClass { 
-            return null;
-        }
-        private static get myPrivateStaticMethod(): privateClass {
-            return null;
-        }
-        get myPublicMethod(): privateClass { 
-            return null;
-        }
-        private get myPrivateMethod(): privateClass {
-            return null;
-        }
-        static get myPublicStaticMethod1() { 
-            return new privateClass();
-        }
-        private static get myPrivateStaticMethod1() {
-            return new privateClass();
-        }
-        get myPublicMethod1() { 
-            return new privateClass();
-        }
-        private get myPrivateMethod1() {
-            return new privateClass();
-        }
-    }
-
-    export class publicClassWithWithPublicGetAccessorTypes {
-        static get myPublicStaticMethod(): publicClass {
-            return null;
-        }
-        private static get myPrivateStaticMethod(): publicClass {
-            return null;
-        }
-        get myPublicMethod(): publicClass {
-            return null;
-        }
-        private get myPrivateMethod(): publicClass {
-            return null;
-        }
-        static get myPublicStaticMethod1() {
-            return new publicClass();
-        }
-        private static get myPrivateStaticMethod1() {
-            return new publicClass();
-        }
-        get myPublicMethod1() {
-            return new publicClass();
-        }
-        private get myPrivateMethod1() {
-            return new publicClass();
-        }
-    }
-
-    class privateClassWithWithPrivateGetAccessorTypes {
-        static get myPublicStaticMethod(): privateClass {
-            return null;
-        }
-        private static get myPrivateStaticMethod(): privateClass {
-            return null;
-        }
-        get myPublicMethod(): privateClass {
-            return null;
-        }
-        private get myPrivateMethod(): privateClass {
-            return null;
-        }
-        static get myPublicStaticMethod1() {
-            return new privateClass();
-        }
-        private static get myPrivateStaticMethod1() {
-            return new privateClass();
-        }
-        get myPublicMethod1() {
-            return new privateClass();
-        }
-        private get myPrivateMethod1() {
-            return new privateClass();
-        }
-    }
-
-    class privateClassWithWithPublicGetAccessorTypes {
-        static get myPublicStaticMethod(): publicClass {
-            return null;
-        }
-        private static get myPrivateStaticMethod(): publicClass {
-            return null;
-        }
-        get myPublicMethod(): publicClass {
-            return null;
-        }
-        private get myPrivateMethod(): publicClass {
-            return null;
-        }
-        static get myPublicStaticMethod1() {
-            return new publicClass();
-        }
-        private static get myPrivateStaticMethod1() {
-            return new publicClass();
-        }
-        get myPublicMethod1() {
-            return new publicClass();
-        }
-        private get myPrivateMethod1() {
-            return new publicClass();
-        }
-    }
-
-    export class publicClassWithWithPrivateSetAccessorTypes {
-        static set myPublicStaticMethod(param: privateClass) { 
-        }
-        private static set myPrivateStaticMethod(param: privateClass) {
-        }
-        set myPublicMethod(param: privateClass) { 
-        }
-        private set myPrivateMethod(param: privateClass) {
-        }
-    }
-
-    export class publicClassWithWithPublicSetAccessorTypes {
-        static set myPublicStaticMethod(param: publicClass) {
-        }
-        private static set myPrivateStaticMethod(param: publicClass) {
-        }
-        set myPublicMethod(param: publicClass) {
-        }
-        private set myPrivateMethod(param: publicClass) {
-        }
-    }
-
-    class privateClassWithWithPrivateSetAccessorTypes {
-        static set myPublicStaticMethod(param: privateClass) {
-        }
-        private static set myPrivateStaticMethod(param: privateClass) {
-        }
-        set myPublicMethod(param: privateClass) {
-        }
-        private set myPrivateMethod(param: privateClass) {
-        }
-    }
-
-    class privateClassWithWithPublicSetAccessorTypes {
-        static set myPublicStaticMethod(param: publicClass) {
-        }
-        private static set myPrivateStaticMethod(param: publicClass) {
-        }
-        set myPublicMethod(param: publicClass) {
-        }
-        private set myPrivateMethod(param: publicClass) {
-        }
-    }
-
-    export class publicClassWithPrivateModuleGetAccessorTypes {
-        static get myPublicStaticMethod(): privateModule.publicClass { 
-            return null;
-        }
-        get myPublicMethod(): privateModule.publicClass { 
-            return null;
-        }
-        static get myPublicStaticMethod1() { 
-            return new privateModule.publicClass();
-        }
-        get myPublicMethod1() { 
-            return new privateModule.publicClass();
-        }
-    }
-
-    export class publicClassWithPrivateModuleSetAccessorTypes {
-        static set myPublicStaticMethod(param: privateModule.publicClass) { 
-        }
-        set myPublicMethod(param: privateModule.publicClass) { 
-        }
-    }
-
-    class privateClassWithPrivateModuleGetAccessorTypes {
-        static get myPublicStaticMethod(): privateModule.publicClass {
-            return null;
-        }
-        get myPublicMethod(): privateModule.publicClass {
-            return null;
-        }
-        static get myPublicStaticMethod1() {
-            return new privateModule.publicClass();
-        }
-        get myPublicMethod1() {
-            return new privateModule.publicClass();
-        }
-    }
-
-    class privateClassWithPrivateModuleSetAccessorTypes {
-        static set myPublicStaticMethod(param: privateModule.publicClass) {
-        }
-        set myPublicMethod(param: privateModule.publicClass) {
-        }
-    }
-}
-
-//// [privacyAccessorDeclFile_GlobalFile.ts]
-class publicClassInGlobal {
-}
-
-class publicClassInGlobalWithPublicGetAccessorTypes {
-    static get myPublicStaticMethod(): publicClassInGlobal {
-        return null;
-    }
-    private static get myPrivateStaticMethod(): publicClassInGlobal {
-        return null;
-    }
-    get myPublicMethod(): publicClassInGlobal {
-        return null;
-    }
-    private get myPrivateMethod(): publicClassInGlobal {
-        return null;
-    }
-    static get myPublicStaticMethod1() {
-        return new publicClassInGlobal();
-    }
-    private static get myPrivateStaticMethod1() {
-        return new publicClassInGlobal();
-    }
-    get myPublicMethod1() {
-        return new publicClassInGlobal();
-    }
-    private get myPrivateMethod1() {
-        return new publicClassInGlobal();
-    }
-}
-
-class publicClassInGlobalWithWithPublicSetAccessorTypes {
-    static set myPublicStaticMethod(param: publicClassInGlobal) {
-    }
-    private static set myPrivateStaticMethod(param: publicClassInGlobal) {
-    }
-    set myPublicMethod(param: publicClassInGlobal) {
-    }
-    private set myPrivateMethod(param: publicClassInGlobal) {
-    }
-}
-
-module publicModuleInGlobal {
-    class privateClass {
-    }
-
-    export class publicClass {
-    }
-
-    module privateModule {
-        class privateClass {
-        }
-
-        export class publicClass {
-        }
-        export class publicClassWithWithPrivateGetAccessorTypes {
-            static get myPublicStaticMethod(): privateClass {
-                return null;
-            }
-            private static get myPrivateStaticMethod(): privateClass {
-                return null;
-            }
-            get myPublicMethod(): privateClass {
-                return null;
-            }
-            private get myPrivateMethod(): privateClass {
-                return null;
-            }
-            static get myPublicStaticMethod1() {
-                return new privateClass();
-            }
-            private static get myPrivateStaticMethod1() {
-                return new privateClass();
-            }
-            get myPublicMethod1() {
-                return new privateClass();
-            }
-            private get myPrivateMethod1() {
-                return new privateClass();
-            }
-        }
-
-        export class publicClassWithWithPublicGetAccessorTypes {
-            static get myPublicStaticMethod(): publicClass {
-                return null;
-            }
-            private static get myPrivateStaticMethod(): publicClass {
-                return null;
-            }
-            get myPublicMethod(): publicClass {
-                return null;
-            }
-            private get myPrivateMethod(): publicClass {
-                return null;
-            }
-            static get myPublicStaticMethod1() {
-                return new publicClass();
-            }
-            private static get myPrivateStaticMethod1() {
-                return new publicClass();
-            }
-            get myPublicMethod1() {
-                return new publicClass();
-            }
-            private get myPrivateMethod1() {
-                return new publicClass();
-            }
-        }
-
-        class privateClassWithWithPrivateGetAccessorTypes {
-            static get myPublicStaticMethod(): privateClass {
-                return null;
-            }
-            private static get myPrivateStaticMethod(): privateClass {
-                return null;
-            }
-            get myPublicMethod(): privateClass {
-                return null;
-            }
-            private get myPrivateMethod(): privateClass {
-                return null;
-            }
-            static get myPublicStaticMethod1() {
-                return new privateClass();
-            }
-            private static get myPrivateStaticMethod1() {
-                return new privateClass();
-            }
-            get myPublicMethod1() {
-                return new privateClass();
-            }
-            private get myPrivateMethod1() {
-                return new privateClass();
-            }
-        }
-
-        class privateClassWithWithPublicGetAccessorTypes {
-            static get myPublicStaticMethod(): publicClass {
-                return null;
-            }
-            private static get myPrivateStaticMethod(): publicClass {
-                return null;
-            }
-            get myPublicMethod(): publicClass {
-                return null;
-            }
-            private get myPrivateMethod(): publicClass {
-                return null;
-            }
-            static get myPublicStaticMethod1() {
-                return new publicClass();
-            }
-            private static get myPrivateStaticMethod1() {
-                return new publicClass();
-            }
-            get myPublicMethod1() {
-                return new publicClass();
-            }
-            private get myPrivateMethod1() {
-                return new publicClass();
-            }
-        }
-
-        export class publicClassWithWithPrivateSetAccessorTypes {
-            static set myPublicStaticMethod(param: privateClass) {
-            }
-            private static set myPrivateStaticMethod(param: privateClass) {
-            }
-            set myPublicMethod(param: privateClass) {
-            }
-            private set myPrivateMethod(param: privateClass) {
-            }
-        }
-
-        export class publicClassWithWithPublicSetAccessorTypes {
-            static set myPublicStaticMethod(param: publicClass) {
-            }
-            private static set myPrivateStaticMethod(param: publicClass) {
-            }
-            set myPublicMethod(param: publicClass) {
-            }
-            private set myPrivateMethod(param: publicClass) {
-            }
-        }
-
-        class privateClassWithWithPrivateSetAccessorTypes {
-            static set myPublicStaticMethod(param: privateClass) {
-            }
-            private static set myPrivateStaticMethod(param: privateClass) {
-            }
-            set myPublicMethod(param: privateClass) {
-            }
-            private set myPrivateMethod(param: privateClass) {
-            }
-        }
-
-        class privateClassWithWithPublicSetAccessorTypes {
-            static set myPublicStaticMethod(param: publicClass) {
-            }
-            private static set myPrivateStaticMethod(param: publicClass) {
-            }
-            set myPublicMethod(param: publicClass) {
-            }
-            private set myPrivateMethod(param: publicClass) {
-            }
-        }
-
-        export class publicClassWithPrivateModuleGetAccessorTypes {
-            static get myPublicStaticMethod(): privateModule.publicClass {
-                return null;
-            }
-            get myPublicMethod(): privateModule.publicClass {
-                return null;
-            }
-            static get myPublicStaticMethod1() {
-                return new privateModule.publicClass();
-            }
-            get myPublicMethod1() {
-                return new privateModule.publicClass();
-            }
-        }
-
-        export class publicClassWithPrivateModuleSetAccessorTypes {
-            static set myPublicStaticMethod(param: privateModule.publicClass) {
-            }
-            set myPublicMethod(param: privateModule.publicClass) {
-            }
-        }
-
-        class privateClassWithPrivateModuleGetAccessorTypes {
-            static get myPublicStaticMethod(): privateModule.publicClass {
-                return null;
-            }
-            get myPublicMethod(): privateModule.publicClass {
-                return null;
-            }
-            static get myPublicStaticMethod1() {
-                return new privateModule.publicClass();
-            }
-            get myPublicMethod1() {
-                return new privateModule.publicClass();
-            }
-        }
-
-        class privateClassWithPrivateModuleSetAccessorTypes {
-            static set myPublicStaticMethod(param: privateModule.publicClass) {
-            }
-            set myPublicMethod(param: privateModule.publicClass) {
-            }
-        }
-    }
-
-    export class publicClassWithWithPrivateGetAccessorTypes {
-        static get myPublicStaticMethod(): privateClass { // Error
-            return null;
-        }
-        private static get myPrivateStaticMethod(): privateClass {
-            return null;
-        }
-        get myPublicMethod(): privateClass { // Error
-            return null;
-        }
-        private get myPrivateMethod(): privateClass {
-            return null;
-        }
-        static get myPublicStaticMethod1() { // Error
-            return new privateClass();
-        }
-        private static get myPrivateStaticMethod1() {
-            return new privateClass();
-        }
-        get myPublicMethod1() { // Error
-            return new privateClass();
-        }
-        private get myPrivateMethod1() {
-            return new privateClass();
-        }
-    }
-
-    export class publicClassWithWithPublicGetAccessorTypes {
-        static get myPublicStaticMethod(): publicClass {
-            return null;
-        }
-        private static get myPrivateStaticMethod(): publicClass {
-            return null;
-        }
-        get myPublicMethod(): publicClass {
-            return null;
-        }
-        private get myPrivateMethod(): publicClass {
-            return null;
-        }
-        static get myPublicStaticMethod1() {
-            return new publicClass();
-        }
-        private static get myPrivateStaticMethod1() {
-            return new publicClass();
-        }
-        get myPublicMethod1() {
-            return new publicClass();
-        }
-        private get myPrivateMethod1() {
-            return new publicClass();
-        }
-    }
-
-    class privateClassWithWithPrivateGetAccessorTypes {
-        static get myPublicStaticMethod(): privateClass {
-            return null;
-        }
-        private static get myPrivateStaticMethod(): privateClass {
-            return null;
-        }
-        get myPublicMethod(): privateClass {
-            return null;
-        }
-        private get myPrivateMethod(): privateClass {
-            return null;
-        }
-        static get myPublicStaticMethod1() {
-            return new privateClass();
-        }
-        private static get myPrivateStaticMethod1() {
-            return new privateClass();
-        }
-        get myPublicMethod1() {
-            return new privateClass();
-        }
-        private get myPrivateMethod1() {
-            return new privateClass();
-        }
-    }
-
-    class privateClassWithWithPublicGetAccessorTypes {
-        static get myPublicStaticMethod(): publicClass {
-            return null;
-        }
-        private static get myPrivateStaticMethod(): publicClass {
-            return null;
-        }
-        get myPublicMethod(): publicClass {
-            return null;
-        }
-        private get myPrivateMethod(): publicClass {
-            return null;
-        }
-        static get myPublicStaticMethod1() {
-            return new publicClass();
-        }
-        private static get myPrivateStaticMethod1() {
-            return new publicClass();
-        }
-        get myPublicMethod1() {
-            return new publicClass();
-        }
-        private get myPrivateMethod1() {
-            return new publicClass();
-        }
-    }
-
-    export class publicClassWithWithPrivateSetAccessorTypes {
-        static set myPublicStaticMethod(param: privateClass) { // Error
-        }
-        private static set myPrivateStaticMethod(param: privateClass) {
-        }
-        set myPublicMethod(param: privateClass) { // Error
-        }
-        private set myPrivateMethod(param: privateClass) {
-        }
-    }
-
-    export class publicClassWithWithPublicSetAccessorTypes {
-        static set myPublicStaticMethod(param: publicClass) {
-        }
-        private static set myPrivateStaticMethod(param: publicClass) {
-        }
-        set myPublicMethod(param: publicClass) {
-        }
-        private set myPrivateMethod(param: publicClass) {
-        }
-    }
-
-    class privateClassWithWithPrivateSetAccessorTypes {
-        static set myPublicStaticMethod(param: privateClass) {
-        }
-        private static set myPrivateStaticMethod(param: privateClass) {
-        }
-        set myPublicMethod(param: privateClass) {
-        }
-        private set myPrivateMethod(param: privateClass) {
-        }
-    }
-
-    class privateClassWithWithPublicSetAccessorTypes {
-        static set myPublicStaticMethod(param: publicClass) {
-        }
-        private static set myPrivateStaticMethod(param: publicClass) {
-        }
-        set myPublicMethod(param: publicClass) {
-        }
-        private set myPrivateMethod(param: publicClass) {
-        }
-    }
-
-    export class publicClassWithPrivateModuleGetAccessorTypes {
-        static get myPublicStaticMethod(): privateModule.publicClass { // Error
-            return null;
-        }
-        get myPublicMethod(): privateModule.publicClass { // Error
-            return null;
-        }
-        static get myPublicStaticMethod1() { // Error
-            return new privateModule.publicClass();
-        }
-        get myPublicMethod1() { // Error
-            return new privateModule.publicClass();
-        }
-    }
-
-    export class publicClassWithPrivateModuleSetAccessorTypes {
-        static set myPublicStaticMethod(param: privateModule.publicClass) { // Error
-        }
-        set myPublicMethod(param: privateModule.publicClass) { // Error
-        }
-    }
-
-    class privateClassWithPrivateModuleGetAccessorTypes {
-        static get myPublicStaticMethod(): privateModule.publicClass {
-            return null;
-        }
-        get myPublicMethod(): privateModule.publicClass {
-            return null;
-        }
-        static get myPublicStaticMethod1() {
-            return new privateModule.publicClass();
-        }
-        get myPublicMethod1() {
-            return new privateModule.publicClass();
-        }
-    }
-
-    class privateClassWithPrivateModuleSetAccessorTypes {
-        static set myPublicStaticMethod(param: privateModule.publicClass) {
-        }
-        set myPublicMethod(param: privateModule.publicClass) {
-        }
-    }
-}
-
-//// [privacyAccessorDeclFile_externalModule.js]
-var privateClass = (function () {
-    function privateClass() {
-    }
-    return privateClass;
-})();
-var publicClass = (function () {
-    function publicClass() {
-    }
-    return publicClass;
-})();
-exports.publicClass = publicClass;
-var publicClassWithWithPrivateGetAccessorTypes = (function () {
-    function publicClassWithWithPrivateGetAccessorTypes() {
-    }
-    Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes, "myPublicStaticMethod", {
-        get: function () {
-            return null;
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes, "myPrivateStaticMethod", {
-        get: function () {
-            return null;
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes.prototype, "myPublicMethod", {
-        get: function () {
-            return null;
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes.prototype, "myPrivateMethod", {
-        get: function () {
-            return null;
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes, "myPublicStaticMethod1", {
-        get: function () {
-            return new privateClass();
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes, "myPrivateStaticMethod1", {
-        get: function () {
-            return new privateClass();
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes.prototype, "myPublicMethod1", {
-        get: function () {
-            return new privateClass();
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes.prototype, "myPrivateMethod1", {
-        get: function () {
-            return new privateClass();
-        },
-        enumerable: true,
-        configurable: true
-    });
-    return publicClassWithWithPrivateGetAccessorTypes;
-})();
-exports.publicClassWithWithPrivateGetAccessorTypes = publicClassWithWithPrivateGetAccessorTypes;
-var publicClassWithWithPublicGetAccessorTypes = (function () {
-    function publicClassWithWithPublicGetAccessorTypes() {
-    }
-    Object.defineProperty(publicClassWithWithPublicGetAccessorTypes, "myPublicStaticMethod", {
-        get: function () {
-            return null;
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(publicClassWithWithPublicGetAccessorTypes, "myPrivateStaticMethod", {
-        get: function () {
-            return null;
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(publicClassWithWithPublicGetAccessorTypes.prototype, "myPublicMethod", {
-        get: function () {
-            return null;
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(publicClassWithWithPublicGetAccessorTypes.prototype, "myPrivateMethod", {
-        get: function () {
-            return null;
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(publicClassWithWithPublicGetAccessorTypes, "myPublicStaticMethod1", {
-        get: function () {
-            return new publicClass();
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(publicClassWithWithPublicGetAccessorTypes, "myPrivateStaticMethod1", {
-        get: function () {
-            return new publicClass();
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(publicClassWithWithPublicGetAccessorTypes.prototype, "myPublicMethod1", {
-        get: function () {
-            return new publicClass();
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(publicClassWithWithPublicGetAccessorTypes.prototype, "myPrivateMethod1", {
-        get: function () {
-            return new publicClass();
-        },
-        enumerable: true,
-        configurable: true
-    });
-    return publicClassWithWithPublicGetAccessorTypes;
-})();
-exports.publicClassWithWithPublicGetAccessorTypes = publicClassWithWithPublicGetAccessorTypes;
-var privateClassWithWithPrivateGetAccessorTypes = (function () {
-    function privateClassWithWithPrivateGetAccessorTypes() {
-    }
-    Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes, "myPublicStaticMethod", {
-        get: function () {
-            return null;
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes, "myPrivateStaticMethod", {
-        get: function () {
-            return null;
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes.prototype, "myPublicMethod", {
-        get: function () {
-            return null;
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes.prototype, "myPrivateMethod", {
-        get: function () {
-            return null;
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes, "myPublicStaticMethod1", {
-        get: function () {
-            return new privateClass();
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes, "myPrivateStaticMethod1", {
-        get: function () {
-            return new privateClass();
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes.prototype, "myPublicMethod1", {
-        get: function () {
-            return new privateClass();
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes.prototype, "myPrivateMethod1", {
-        get: function () {
-            return new privateClass();
-        },
-        enumerable: true,
-        configurable: true
-    });
-    return privateClassWithWithPrivateGetAccessorTypes;
-})();
-var privateClassWithWithPublicGetAccessorTypes = (function () {
-    function privateClassWithWithPublicGetAccessorTypes() {
-    }
-    Object.defineProperty(privateClassWithWithPublicGetAccessorTypes, "myPublicStaticMethod", {
-        get: function () {
-            return null;
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(privateClassWithWithPublicGetAccessorTypes, "myPrivateStaticMethod", {
-        get: function () {
-            return null;
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(privateClassWithWithPublicGetAccessorTypes.prototype, "myPublicMethod", {
-        get: function () {
-            return null;
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(privateClassWithWithPublicGetAccessorTypes.prototype, "myPrivateMethod", {
-        get: function () {
-            return null;
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(privateClassWithWithPublicGetAccessorTypes, "myPublicStaticMethod1", {
-        get: function () {
-            return new publicClass();
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(privateClassWithWithPublicGetAccessorTypes, "myPrivateStaticMethod1", {
-        get: function () {
-            return new publicClass();
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(privateClassWithWithPublicGetAccessorTypes.prototype, "myPublicMethod1", {
-        get: function () {
-            return new publicClass();
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(privateClassWithWithPublicGetAccessorTypes.prototype, "myPrivateMethod1", {
-        get: function () {
-            return new publicClass();
-        },
-        enumerable: true,
-        configurable: true
-    });
-    return privateClassWithWithPublicGetAccessorTypes;
-})();
-var publicClassWithWithPrivateSetAccessorTypes = (function () {
-    function publicClassWithWithPrivateSetAccessorTypes() {
-    }
-    Object.defineProperty(publicClassWithWithPrivateSetAccessorTypes, "myPublicStaticMethod", {
-        set: function (param) {
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(publicClassWithWithPrivateSetAccessorTypes, "myPrivateStaticMethod", {
-        set: function (param) {
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(publicClassWithWithPrivateSetAccessorTypes.prototype, "myPublicMethod", {
-        set: function (param) {
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(publicClassWithWithPrivateSetAccessorTypes.prototype, "myPrivateMethod", {
-        set: function (param) {
-        },
-        enumerable: true,
-        configurable: true
-    });
-    return publicClassWithWithPrivateSetAccessorTypes;
-})();
-exports.publicClassWithWithPrivateSetAccessorTypes = publicClassWithWithPrivateSetAccessorTypes;
-var publicClassWithWithPublicSetAccessorTypes = (function () {
-    function publicClassWithWithPublicSetAccessorTypes() {
-    }
-    Object.defineProperty(publicClassWithWithPublicSetAccessorTypes, "myPublicStaticMethod", {
-        set: function (param) {
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(publicClassWithWithPublicSetAccessorTypes, "myPrivateStaticMethod", {
-        set: function (param) {
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(publicClassWithWithPublicSetAccessorTypes.prototype, "myPublicMethod", {
-        set: function (param) {
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(publicClassWithWithPublicSetAccessorTypes.prototype, "myPrivateMethod", {
-        set: function (param) {
-        },
-        enumerable: true,
-        configurable: true
-    });
-    return publicClassWithWithPublicSetAccessorTypes;
-})();
-exports.publicClassWithWithPublicSetAccessorTypes = publicClassWithWithPublicSetAccessorTypes;
-var privateClassWithWithPrivateSetAccessorTypes = (function () {
-    function privateClassWithWithPrivateSetAccessorTypes() {
-    }
-    Object.defineProperty(privateClassWithWithPrivateSetAccessorTypes, "myPublicStaticMethod", {
-        set: function (param) {
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(privateClassWithWithPrivateSetAccessorTypes, "myPrivateStaticMethod", {
-        set: function (param) {
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(privateClassWithWithPrivateSetAccessorTypes.prototype, "myPublicMethod", {
-        set: function (param) {
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(privateClassWithWithPrivateSetAccessorTypes.prototype, "myPrivateMethod", {
-        set: function (param) {
-        },
-        enumerable: true,
-        configurable: true
-    });
-    return privateClassWithWithPrivateSetAccessorTypes;
-})();
-var privateClassWithWithPublicSetAccessorTypes = (function () {
-    function privateClassWithWithPublicSetAccessorTypes() {
-    }
-    Object.defineProperty(privateClassWithWithPublicSetAccessorTypes, "myPublicStaticMethod", {
-        set: function (param) {
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(privateClassWithWithPublicSetAccessorTypes, "myPrivateStaticMethod", {
-        set: function (param) {
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(privateClassWithWithPublicSetAccessorTypes.prototype, "myPublicMethod", {
-        set: function (param) {
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(privateClassWithWithPublicSetAccessorTypes.prototype, "myPrivateMethod", {
-        set: function (param) {
-        },
-        enumerable: true,
-        configurable: true
-    });
-    return privateClassWithWithPublicSetAccessorTypes;
-})();
-var publicClassWithPrivateModuleGetAccessorTypes = (function () {
-    function publicClassWithPrivateModuleGetAccessorTypes() {
-    }
-    Object.defineProperty(publicClassWithPrivateModuleGetAccessorTypes, "myPublicStaticMethod", {
-        get: function () {
-            return null;
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(publicClassWithPrivateModuleGetAccessorTypes.prototype, "myPublicMethod", {
-        get: function () {
-            return null;
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(publicClassWithPrivateModuleGetAccessorTypes, "myPublicStaticMethod1", {
-        get: function () {
-            return new privateModule.publicClass();
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(publicClassWithPrivateModuleGetAccessorTypes.prototype, "myPublicMethod1", {
-        get: function () {
-            return new privateModule.publicClass();
-        },
-        enumerable: true,
-        configurable: true
-    });
-    return publicClassWithPrivateModuleGetAccessorTypes;
-})();
-exports.publicClassWithPrivateModuleGetAccessorTypes = publicClassWithPrivateModuleGetAccessorTypes;
-var publicClassWithPrivateModuleSetAccessorTypes = (function () {
-    function publicClassWithPrivateModuleSetAccessorTypes() {
-    }
-    Object.defineProperty(publicClassWithPrivateModuleSetAccessorTypes, "myPublicStaticMethod", {
-        set: function (param) {
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(publicClassWithPrivateModuleSetAccessorTypes.prototype, "myPublicMethod", {
-        set: function (param) {
-        },
-        enumerable: true,
-        configurable: true
-    });
-    return publicClassWithPrivateModuleSetAccessorTypes;
-})();
-exports.publicClassWithPrivateModuleSetAccessorTypes = publicClassWithPrivateModuleSetAccessorTypes;
-var privateClassWithPrivateModuleGetAccessorTypes = (function () {
-    function privateClassWithPrivateModuleGetAccessorTypes() {
-    }
-    Object.defineProperty(privateClassWithPrivateModuleGetAccessorTypes, "myPublicStaticMethod", {
-        get: function () {
-            return null;
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(privateClassWithPrivateModuleGetAccessorTypes.prototype, "myPublicMethod", {
-        get: function () {
-            return null;
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(privateClassWithPrivateModuleGetAccessorTypes, "myPublicStaticMethod1", {
-        get: function () {
-            return new privateModule.publicClass();
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(privateClassWithPrivateModuleGetAccessorTypes.prototype, "myPublicMethod1", {
-        get: function () {
-            return new privateModule.publicClass();
-        },
-        enumerable: true,
-        configurable: true
-    });
-    return privateClassWithPrivateModuleGetAccessorTypes;
-})();
-var privateClassWithPrivateModuleSetAccessorTypes = (function () {
-    function privateClassWithPrivateModuleSetAccessorTypes() {
-    }
-    Object.defineProperty(privateClassWithPrivateModuleSetAccessorTypes, "myPublicStaticMethod", {
-        set: function (param) {
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(privateClassWithPrivateModuleSetAccessorTypes.prototype, "myPublicMethod", {
-        set: function (param) {
-        },
-        enumerable: true,
-        configurable: true
-    });
-    return privateClassWithPrivateModuleSetAccessorTypes;
-})();
-(function (publicModule) {
-    var privateClass = (function () {
-        function privateClass() {
-        }
-        return privateClass;
-    })();
-    var publicClass = (function () {
-        function publicClass() {
-        }
-        return publicClass;
-    })();
-    publicModule.publicClass = publicClass;
-    var publicClassWithWithPrivateGetAccessorTypes = (function () {
-        function publicClassWithWithPrivateGetAccessorTypes() {
-        }
-        Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes, "myPublicStaticMethod", {
-            get: function () {
-                return null;
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes, "myPrivateStaticMethod", {
-            get: function () {
-                return null;
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes.prototype, "myPublicMethod", {
-            get: function () {
-                return null;
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes.prototype, "myPrivateMethod", {
-            get: function () {
-                return null;
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes, "myPublicStaticMethod1", {
-            get: function () {
-                return new privateClass();
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes, "myPrivateStaticMethod1", {
-            get: function () {
-                return new privateClass();
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes.prototype, "myPublicMethod1", {
-            get: function () {
-                return new privateClass();
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes.prototype, "myPrivateMethod1", {
-            get: function () {
-                return new privateClass();
-            },
-            enumerable: true,
-            configurable: true
-        });
-        return publicClassWithWithPrivateGetAccessorTypes;
-    })();
-    publicModule.publicClassWithWithPrivateGetAccessorTypes = publicClassWithWithPrivateGetAccessorTypes;
-    var publicClassWithWithPublicGetAccessorTypes = (function () {
-        function publicClassWithWithPublicGetAccessorTypes() {
-        }
-        Object.defineProperty(publicClassWithWithPublicGetAccessorTypes, "myPublicStaticMethod", {
-            get: function () {
-                return null;
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(publicClassWithWithPublicGetAccessorTypes, "myPrivateStaticMethod", {
-            get: function () {
-                return null;
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(publicClassWithWithPublicGetAccessorTypes.prototype, "myPublicMethod", {
-            get: function () {
-                return null;
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(publicClassWithWithPublicGetAccessorTypes.prototype, "myPrivateMethod", {
-            get: function () {
-                return null;
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(publicClassWithWithPublicGetAccessorTypes, "myPublicStaticMethod1", {
-            get: function () {
-                return new publicClass();
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(publicClassWithWithPublicGetAccessorTypes, "myPrivateStaticMethod1", {
-            get: function () {
-                return new publicClass();
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(publicClassWithWithPublicGetAccessorTypes.prototype, "myPublicMethod1", {
-            get: function () {
-                return new publicClass();
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(publicClassWithWithPublicGetAccessorTypes.prototype, "myPrivateMethod1", {
-            get: function () {
-                return new publicClass();
-            },
-            enumerable: true,
-            configurable: true
-        });
-        return publicClassWithWithPublicGetAccessorTypes;
-    })();
-    publicModule.publicClassWithWithPublicGetAccessorTypes = publicClassWithWithPublicGetAccessorTypes;
-    var privateClassWithWithPrivateGetAccessorTypes = (function () {
-        function privateClassWithWithPrivateGetAccessorTypes() {
-        }
-        Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes, "myPublicStaticMethod", {
-            get: function () {
-                return null;
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes, "myPrivateStaticMethod", {
-            get: function () {
-                return null;
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes.prototype, "myPublicMethod", {
-            get: function () {
-                return null;
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes.prototype, "myPrivateMethod", {
-            get: function () {
-                return null;
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes, "myPublicStaticMethod1", {
-            get: function () {
-                return new privateClass();
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes, "myPrivateStaticMethod1", {
-            get: function () {
-                return new privateClass();
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes.prototype, "myPublicMethod1", {
-            get: function () {
-                return new privateClass();
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes.prototype, "myPrivateMethod1", {
-            get: function () {
-                return new privateClass();
-            },
-            enumerable: true,
-            configurable: true
-        });
-        return privateClassWithWithPrivateGetAccessorTypes;
-    })();
-    var privateClassWithWithPublicGetAccessorTypes = (function () {
-        function privateClassWithWithPublicGetAccessorTypes() {
-        }
-        Object.defineProperty(privateClassWithWithPublicGetAccessorTypes, "myPublicStaticMethod", {
-            get: function () {
-                return null;
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(privateClassWithWithPublicGetAccessorTypes, "myPrivateStaticMethod", {
-            get: function () {
-                return null;
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(privateClassWithWithPublicGetAccessorTypes.prototype, "myPublicMethod", {
-            get: function () {
-                return null;
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(privateClassWithWithPublicGetAccessorTypes.prototype, "myPrivateMethod", {
-            get: function () {
-                return null;
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(privateClassWithWithPublicGetAccessorTypes, "myPublicStaticMethod1", {
-            get: function () {
-                return new publicClass();
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(privateClassWithWithPublicGetAccessorTypes, "myPrivateStaticMethod1", {
-            get: function () {
-                return new publicClass();
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(privateClassWithWithPublicGetAccessorTypes.prototype, "myPublicMethod1", {
-            get: function () {
-                return new publicClass();
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(privateClassWithWithPublicGetAccessorTypes.prototype, "myPrivateMethod1", {
-            get: function () {
-                return new publicClass();
-            },
-            enumerable: true,
-            configurable: true
-        });
-        return privateClassWithWithPublicGetAccessorTypes;
-    })();
-    var publicClassWithWithPrivateSetAccessorTypes = (function () {
-        function publicClassWithWithPrivateSetAccessorTypes() {
-        }
-        Object.defineProperty(publicClassWithWithPrivateSetAccessorTypes, "myPublicStaticMethod", {
-            set: function (param) {
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(publicClassWithWithPrivateSetAccessorTypes, "myPrivateStaticMethod", {
-            set: function (param) {
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(publicClassWithWithPrivateSetAccessorTypes.prototype, "myPublicMethod", {
-            set: function (param) {
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(publicClassWithWithPrivateSetAccessorTypes.prototype, "myPrivateMethod", {
-            set: function (param) {
-            },
-            enumerable: true,
-            configurable: true
-        });
-        return publicClassWithWithPrivateSetAccessorTypes;
-    })();
-    publicModule.publicClassWithWithPrivateSetAccessorTypes = publicClassWithWithPrivateSetAccessorTypes;
-    var publicClassWithWithPublicSetAccessorTypes = (function () {
-        function publicClassWithWithPublicSetAccessorTypes() {
-        }
-        Object.defineProperty(publicClassWithWithPublicSetAccessorTypes, "myPublicStaticMethod", {
-            set: function (param) {
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(publicClassWithWithPublicSetAccessorTypes, "myPrivateStaticMethod", {
-            set: function (param) {
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(publicClassWithWithPublicSetAccessorTypes.prototype, "myPublicMethod", {
-            set: function (param) {
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(publicClassWithWithPublicSetAccessorTypes.prototype, "myPrivateMethod", {
-            set: function (param) {
-            },
-            enumerable: true,
-            configurable: true
-        });
-        return publicClassWithWithPublicSetAccessorTypes;
-    })();
-    publicModule.publicClassWithWithPublicSetAccessorTypes = publicClassWithWithPublicSetAccessorTypes;
-    var privateClassWithWithPrivateSetAccessorTypes = (function () {
-        function privateClassWithWithPrivateSetAccessorTypes() {
-        }
-        Object.defineProperty(privateClassWithWithPrivateSetAccessorTypes, "myPublicStaticMethod", {
-            set: function (param) {
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(privateClassWithWithPrivateSetAccessorTypes, "myPrivateStaticMethod", {
-            set: function (param) {
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(privateClassWithWithPrivateSetAccessorTypes.prototype, "myPublicMethod", {
-            set: function (param) {
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(privateClassWithWithPrivateSetAccessorTypes.prototype, "myPrivateMethod", {
-            set: function (param) {
-            },
-            enumerable: true,
-            configurable: true
-        });
-        return privateClassWithWithPrivateSetAccessorTypes;
-    })();
-    var privateClassWithWithPublicSetAccessorTypes = (function () {
-        function privateClassWithWithPublicSetAccessorTypes() {
-        }
-        Object.defineProperty(privateClassWithWithPublicSetAccessorTypes, "myPublicStaticMethod", {
-            set: function (param) {
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(privateClassWithWithPublicSetAccessorTypes, "myPrivateStaticMethod", {
-            set: function (param) {
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(privateClassWithWithPublicSetAccessorTypes.prototype, "myPublicMethod", {
-            set: function (param) {
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(privateClassWithWithPublicSetAccessorTypes.prototype, "myPrivateMethod", {
-            set: function (param) {
-            },
-            enumerable: true,
-            configurable: true
-        });
-        return privateClassWithWithPublicSetAccessorTypes;
-    })();
-    var publicClassWithPrivateModuleGetAccessorTypes = (function () {
-        function publicClassWithPrivateModuleGetAccessorTypes() {
-        }
-        Object.defineProperty(publicClassWithPrivateModuleGetAccessorTypes, "myPublicStaticMethod", {
-            get: function () {
-                return null;
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(publicClassWithPrivateModuleGetAccessorTypes.prototype, "myPublicMethod", {
-            get: function () {
-                return null;
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(publicClassWithPrivateModuleGetAccessorTypes, "myPublicStaticMethod1", {
-            get: function () {
-                return new privateModule.publicClass();
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(publicClassWithPrivateModuleGetAccessorTypes.prototype, "myPublicMethod1", {
-            get: function () {
-                return new privateModule.publicClass();
-            },
-            enumerable: true,
-            configurable: true
-        });
-        return publicClassWithPrivateModuleGetAccessorTypes;
-    })();
-    publicModule.publicClassWithPrivateModuleGetAccessorTypes = publicClassWithPrivateModuleGetAccessorTypes;
-    var publicClassWithPrivateModuleSetAccessorTypes = (function () {
-        function publicClassWithPrivateModuleSetAccessorTypes() {
-        }
-        Object.defineProperty(publicClassWithPrivateModuleSetAccessorTypes, "myPublicStaticMethod", {
-            set: function (param) {
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(publicClassWithPrivateModuleSetAccessorTypes.prototype, "myPublicMethod", {
-            set: function (param) {
-            },
-            enumerable: true,
-            configurable: true
-        });
-        return publicClassWithPrivateModuleSetAccessorTypes;
-    })();
-    publicModule.publicClassWithPrivateModuleSetAccessorTypes = publicClassWithPrivateModuleSetAccessorTypes;
-    var privateClassWithPrivateModuleGetAccessorTypes = (function () {
-        function privateClassWithPrivateModuleGetAccessorTypes() {
-        }
-        Object.defineProperty(privateClassWithPrivateModuleGetAccessorTypes, "myPublicStaticMethod", {
-            get: function () {
-                return null;
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(privateClassWithPrivateModuleGetAccessorTypes.prototype, "myPublicMethod", {
-            get: function () {
-                return null;
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(privateClassWithPrivateModuleGetAccessorTypes, "myPublicStaticMethod1", {
-            get: function () {
-                return new privateModule.publicClass();
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(privateClassWithPrivateModuleGetAccessorTypes.prototype, "myPublicMethod1", {
-            get: function () {
-                return new privateModule.publicClass();
-            },
-            enumerable: true,
-            configurable: true
-        });
-        return privateClassWithPrivateModuleGetAccessorTypes;
-    })();
-    var privateClassWithPrivateModuleSetAccessorTypes = (function () {
-        function privateClassWithPrivateModuleSetAccessorTypes() {
-        }
-        Object.defineProperty(privateClassWithPrivateModuleSetAccessorTypes, "myPublicStaticMethod", {
-            set: function (param) {
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(privateClassWithPrivateModuleSetAccessorTypes.prototype, "myPublicMethod", {
-            set: function (param) {
-            },
-            enumerable: true,
-            configurable: true
-        });
-        return privateClassWithPrivateModuleSetAccessorTypes;
-    })();
-})(exports.publicModule || (exports.publicModule = {}));
-var publicModule = exports.publicModule;
-var privateModule;
-(function (privateModule) {
-    var privateClass = (function () {
-        function privateClass() {
-        }
-        return privateClass;
-    })();
-    var publicClass = (function () {
-        function publicClass() {
-        }
-        return publicClass;
-    })();
-    privateModule.publicClass = publicClass;
-    var publicClassWithWithPrivateGetAccessorTypes = (function () {
-        function publicClassWithWithPrivateGetAccessorTypes() {
-        }
-        Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes, "myPublicStaticMethod", {
-            get: function () {
-                return null;
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes, "myPrivateStaticMethod", {
-            get: function () {
-                return null;
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes.prototype, "myPublicMethod", {
-            get: function () {
-                return null;
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes.prototype, "myPrivateMethod", {
-            get: function () {
-                return null;
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes, "myPublicStaticMethod1", {
-            get: function () {
-                return new privateClass();
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes, "myPrivateStaticMethod1", {
-            get: function () {
-                return new privateClass();
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes.prototype, "myPublicMethod1", {
-            get: function () {
-                return new privateClass();
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes.prototype, "myPrivateMethod1", {
-            get: function () {
-                return new privateClass();
-            },
-            enumerable: true,
-            configurable: true
-        });
-        return publicClassWithWithPrivateGetAccessorTypes;
-    })();
-    privateModule.publicClassWithWithPrivateGetAccessorTypes = publicClassWithWithPrivateGetAccessorTypes;
-    var publicClassWithWithPublicGetAccessorTypes = (function () {
-        function publicClassWithWithPublicGetAccessorTypes() {
-        }
-        Object.defineProperty(publicClassWithWithPublicGetAccessorTypes, "myPublicStaticMethod", {
-            get: function () {
-                return null;
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(publicClassWithWithPublicGetAccessorTypes, "myPrivateStaticMethod", {
-            get: function () {
-                return null;
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(publicClassWithWithPublicGetAccessorTypes.prototype, "myPublicMethod", {
-            get: function () {
-                return null;
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(publicClassWithWithPublicGetAccessorTypes.prototype, "myPrivateMethod", {
-            get: function () {
-                return null;
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(publicClassWithWithPublicGetAccessorTypes, "myPublicStaticMethod1", {
-            get: function () {
-                return new publicClass();
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(publicClassWithWithPublicGetAccessorTypes, "myPrivateStaticMethod1", {
-            get: function () {
-                return new publicClass();
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(publicClassWithWithPublicGetAccessorTypes.prototype, "myPublicMethod1", {
-            get: function () {
-                return new publicClass();
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(publicClassWithWithPublicGetAccessorTypes.prototype, "myPrivateMethod1", {
-            get: function () {
-                return new publicClass();
-            },
-            enumerable: true,
-            configurable: true
-        });
-        return publicClassWithWithPublicGetAccessorTypes;
-    })();
-    privateModule.publicClassWithWithPublicGetAccessorTypes = publicClassWithWithPublicGetAccessorTypes;
-    var privateClassWithWithPrivateGetAccessorTypes = (function () {
-        function privateClassWithWithPrivateGetAccessorTypes() {
-        }
-        Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes, "myPublicStaticMethod", {
-            get: function () {
-                return null;
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes, "myPrivateStaticMethod", {
-            get: function () {
-                return null;
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes.prototype, "myPublicMethod", {
-            get: function () {
-                return null;
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes.prototype, "myPrivateMethod", {
-            get: function () {
-                return null;
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes, "myPublicStaticMethod1", {
-            get: function () {
-                return new privateClass();
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes, "myPrivateStaticMethod1", {
-            get: function () {
-                return new privateClass();
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes.prototype, "myPublicMethod1", {
-            get: function () {
-                return new privateClass();
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes.prototype, "myPrivateMethod1", {
-            get: function () {
-                return new privateClass();
-            },
-            enumerable: true,
-            configurable: true
-        });
-        return privateClassWithWithPrivateGetAccessorTypes;
-    })();
-    var privateClassWithWithPublicGetAccessorTypes = (function () {
-        function privateClassWithWithPublicGetAccessorTypes() {
-        }
-        Object.defineProperty(privateClassWithWithPublicGetAccessorTypes, "myPublicStaticMethod", {
-            get: function () {
-                return null;
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(privateClassWithWithPublicGetAccessorTypes, "myPrivateStaticMethod", {
-            get: function () {
-                return null;
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(privateClassWithWithPublicGetAccessorTypes.prototype, "myPublicMethod", {
-            get: function () {
-                return null;
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(privateClassWithWithPublicGetAccessorTypes.prototype, "myPrivateMethod", {
-            get: function () {
-                return null;
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(privateClassWithWithPublicGetAccessorTypes, "myPublicStaticMethod1", {
-            get: function () {
-                return new publicClass();
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(privateClassWithWithPublicGetAccessorTypes, "myPrivateStaticMethod1", {
-            get: function () {
-                return new publicClass();
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(privateClassWithWithPublicGetAccessorTypes.prototype, "myPublicMethod1", {
-            get: function () {
-                return new publicClass();
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(privateClassWithWithPublicGetAccessorTypes.prototype, "myPrivateMethod1", {
-            get: function () {
-                return new publicClass();
-            },
-            enumerable: true,
-            configurable: true
-        });
-        return privateClassWithWithPublicGetAccessorTypes;
-    })();
-    var publicClassWithWithPrivateSetAccessorTypes = (function () {
-        function publicClassWithWithPrivateSetAccessorTypes() {
-        }
-        Object.defineProperty(publicClassWithWithPrivateSetAccessorTypes, "myPublicStaticMethod", {
-            set: function (param) {
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(publicClassWithWithPrivateSetAccessorTypes, "myPrivateStaticMethod", {
-            set: function (param) {
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(publicClassWithWithPrivateSetAccessorTypes.prototype, "myPublicMethod", {
-            set: function (param) {
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(publicClassWithWithPrivateSetAccessorTypes.prototype, "myPrivateMethod", {
-            set: function (param) {
-            },
-            enumerable: true,
-            configurable: true
-        });
-        return publicClassWithWithPrivateSetAccessorTypes;
-    })();
-    privateModule.publicClassWithWithPrivateSetAccessorTypes = publicClassWithWithPrivateSetAccessorTypes;
-    var publicClassWithWithPublicSetAccessorTypes = (function () {
-        function publicClassWithWithPublicSetAccessorTypes() {
-        }
-        Object.defineProperty(publicClassWithWithPublicSetAccessorTypes, "myPublicStaticMethod", {
-            set: function (param) {
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(publicClassWithWithPublicSetAccessorTypes, "myPrivateStaticMethod", {
-            set: function (param) {
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(publicClassWithWithPublicSetAccessorTypes.prototype, "myPublicMethod", {
-            set: function (param) {
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(publicClassWithWithPublicSetAccessorTypes.prototype, "myPrivateMethod", {
-            set: function (param) {
-            },
-            enumerable: true,
-            configurable: true
-        });
-        return publicClassWithWithPublicSetAccessorTypes;
-    })();
-    privateModule.publicClassWithWithPublicSetAccessorTypes = publicClassWithWithPublicSetAccessorTypes;
-    var privateClassWithWithPrivateSetAccessorTypes = (function () {
-        function privateClassWithWithPrivateSetAccessorTypes() {
-        }
-        Object.defineProperty(privateClassWithWithPrivateSetAccessorTypes, "myPublicStaticMethod", {
-            set: function (param) {
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(privateClassWithWithPrivateSetAccessorTypes, "myPrivateStaticMethod", {
-            set: function (param) {
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(privateClassWithWithPrivateSetAccessorTypes.prototype, "myPublicMethod", {
-            set: function (param) {
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(privateClassWithWithPrivateSetAccessorTypes.prototype, "myPrivateMethod", {
-            set: function (param) {
-            },
-            enumerable: true,
-            configurable: true
-        });
-        return privateClassWithWithPrivateSetAccessorTypes;
-    })();
-    var privateClassWithWithPublicSetAccessorTypes = (function () {
-        function privateClassWithWithPublicSetAccessorTypes() {
-        }
-        Object.defineProperty(privateClassWithWithPublicSetAccessorTypes, "myPublicStaticMethod", {
-            set: function (param) {
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(privateClassWithWithPublicSetAccessorTypes, "myPrivateStaticMethod", {
-            set: function (param) {
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(privateClassWithWithPublicSetAccessorTypes.prototype, "myPublicMethod", {
-            set: function (param) {
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(privateClassWithWithPublicSetAccessorTypes.prototype, "myPrivateMethod", {
-            set: function (param) {
-            },
-            enumerable: true,
-            configurable: true
-        });
-        return privateClassWithWithPublicSetAccessorTypes;
-    })();
-    var publicClassWithPrivateModuleGetAccessorTypes = (function () {
-        function publicClassWithPrivateModuleGetAccessorTypes() {
-        }
-        Object.defineProperty(publicClassWithPrivateModuleGetAccessorTypes, "myPublicStaticMethod", {
-            get: function () {
-                return null;
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(publicClassWithPrivateModuleGetAccessorTypes.prototype, "myPublicMethod", {
-            get: function () {
-                return null;
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(publicClassWithPrivateModuleGetAccessorTypes, "myPublicStaticMethod1", {
-            get: function () {
-                return new privateModule.publicClass();
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(publicClassWithPrivateModuleGetAccessorTypes.prototype, "myPublicMethod1", {
-            get: function () {
-                return new privateModule.publicClass();
-            },
-            enumerable: true,
-            configurable: true
-        });
-        return publicClassWithPrivateModuleGetAccessorTypes;
-    })();
-    privateModule.publicClassWithPrivateModuleGetAccessorTypes = publicClassWithPrivateModuleGetAccessorTypes;
-    var publicClassWithPrivateModuleSetAccessorTypes = (function () {
-        function publicClassWithPrivateModuleSetAccessorTypes() {
-        }
-        Object.defineProperty(publicClassWithPrivateModuleSetAccessorTypes, "myPublicStaticMethod", {
-            set: function (param) {
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(publicClassWithPrivateModuleSetAccessorTypes.prototype, "myPublicMethod", {
-            set: function (param) {
-            },
-            enumerable: true,
-            configurable: true
-        });
-        return publicClassWithPrivateModuleSetAccessorTypes;
-    })();
-    privateModule.publicClassWithPrivateModuleSetAccessorTypes = publicClassWithPrivateModuleSetAccessorTypes;
-    var privateClassWithPrivateModuleGetAccessorTypes = (function () {
-        function privateClassWithPrivateModuleGetAccessorTypes() {
-        }
-        Object.defineProperty(privateClassWithPrivateModuleGetAccessorTypes, "myPublicStaticMethod", {
-            get: function () {
-                return null;
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(privateClassWithPrivateModuleGetAccessorTypes.prototype, "myPublicMethod", {
-            get: function () {
-                return null;
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(privateClassWithPrivateModuleGetAccessorTypes, "myPublicStaticMethod1", {
-            get: function () {
-                return new privateModule.publicClass();
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(privateClassWithPrivateModuleGetAccessorTypes.prototype, "myPublicMethod1", {
-            get: function () {
-                return new privateModule.publicClass();
-            },
-            enumerable: true,
-            configurable: true
-        });
-        return privateClassWithPrivateModuleGetAccessorTypes;
-    })();
-    var privateClassWithPrivateModuleSetAccessorTypes = (function () {
-        function privateClassWithPrivateModuleSetAccessorTypes() {
-        }
-        Object.defineProperty(privateClassWithPrivateModuleSetAccessorTypes, "myPublicStaticMethod", {
-            set: function (param) {
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(privateClassWithPrivateModuleSetAccessorTypes.prototype, "myPublicMethod", {
-            set: function (param) {
-            },
-            enumerable: true,
-            configurable: true
-        });
-        return privateClassWithPrivateModuleSetAccessorTypes;
-    })();
-})(privateModule || (privateModule = {}));
-//// [privacyAccessorDeclFile_GlobalFile.js]
-var publicClassInGlobal = (function () {
-    function publicClassInGlobal() {
-    }
-    return publicClassInGlobal;
-})();
-var publicClassInGlobalWithPublicGetAccessorTypes = (function () {
-    function publicClassInGlobalWithPublicGetAccessorTypes() {
-    }
-    Object.defineProperty(publicClassInGlobalWithPublicGetAccessorTypes, "myPublicStaticMethod", {
-        get: function () {
-            return null;
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(publicClassInGlobalWithPublicGetAccessorTypes, "myPrivateStaticMethod", {
-        get: function () {
-            return null;
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(publicClassInGlobalWithPublicGetAccessorTypes.prototype, "myPublicMethod", {
-        get: function () {
-            return null;
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(publicClassInGlobalWithPublicGetAccessorTypes.prototype, "myPrivateMethod", {
-        get: function () {
-            return null;
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(publicClassInGlobalWithPublicGetAccessorTypes, "myPublicStaticMethod1", {
-        get: function () {
-            return new publicClassInGlobal();
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(publicClassInGlobalWithPublicGetAccessorTypes, "myPrivateStaticMethod1", {
-        get: function () {
-            return new publicClassInGlobal();
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(publicClassInGlobalWithPublicGetAccessorTypes.prototype, "myPublicMethod1", {
-        get: function () {
-            return new publicClassInGlobal();
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(publicClassInGlobalWithPublicGetAccessorTypes.prototype, "myPrivateMethod1", {
-        get: function () {
-            return new publicClassInGlobal();
-        },
-        enumerable: true,
-        configurable: true
-    });
-    return publicClassInGlobalWithPublicGetAccessorTypes;
-})();
-var publicClassInGlobalWithWithPublicSetAccessorTypes = (function () {
-    function publicClassInGlobalWithWithPublicSetAccessorTypes() {
-    }
-    Object.defineProperty(publicClassInGlobalWithWithPublicSetAccessorTypes, "myPublicStaticMethod", {
-        set: function (param) {
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(publicClassInGlobalWithWithPublicSetAccessorTypes, "myPrivateStaticMethod", {
-        set: function (param) {
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(publicClassInGlobalWithWithPublicSetAccessorTypes.prototype, "myPublicMethod", {
-        set: function (param) {
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(publicClassInGlobalWithWithPublicSetAccessorTypes.prototype, "myPrivateMethod", {
-        set: function (param) {
-        },
-        enumerable: true,
-        configurable: true
-    });
-    return publicClassInGlobalWithWithPublicSetAccessorTypes;
-})();
-var publicModuleInGlobal;
-(function (publicModuleInGlobal) {
-    var privateClass = (function () {
-        function privateClass() {
-        }
-        return privateClass;
-    })();
-    var publicClass = (function () {
-        function publicClass() {
-        }
-        return publicClass;
-    })();
-    publicModuleInGlobal.publicClass = publicClass;
-    var privateModule;
-    (function (privateModule) {
-        var privateClass = (function () {
-            function privateClass() {
-            }
-            return privateClass;
-        })();
-        var publicClass = (function () {
-            function publicClass() {
-            }
-            return publicClass;
-        })();
-        privateModule.publicClass = publicClass;
-        var publicClassWithWithPrivateGetAccessorTypes = (function () {
-            function publicClassWithWithPrivateGetAccessorTypes() {
-            }
-            Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes, "myPublicStaticMethod", {
-                get: function () {
-                    return null;
-                },
-                enumerable: true,
-                configurable: true
-            });
-            Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes, "myPrivateStaticMethod", {
-                get: function () {
-                    return null;
-                },
-                enumerable: true,
-                configurable: true
-            });
-            Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes.prototype, "myPublicMethod", {
-                get: function () {
-                    return null;
-                },
-                enumerable: true,
-                configurable: true
-            });
-            Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes.prototype, "myPrivateMethod", {
-                get: function () {
-                    return null;
-                },
-                enumerable: true,
-                configurable: true
-            });
-            Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes, "myPublicStaticMethod1", {
-                get: function () {
-                    return new privateClass();
-                },
-                enumerable: true,
-                configurable: true
-            });
-            Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes, "myPrivateStaticMethod1", {
-                get: function () {
-                    return new privateClass();
-                },
-                enumerable: true,
-                configurable: true
-            });
-            Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes.prototype, "myPublicMethod1", {
-                get: function () {
-                    return new privateClass();
-                },
-                enumerable: true,
-                configurable: true
-            });
-            Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes.prototype, "myPrivateMethod1", {
-                get: function () {
-                    return new privateClass();
-                },
-                enumerable: true,
-                configurable: true
-            });
-            return publicClassWithWithPrivateGetAccessorTypes;
-        })();
-        privateModule.publicClassWithWithPrivateGetAccessorTypes = publicClassWithWithPrivateGetAccessorTypes;
-        var publicClassWithWithPublicGetAccessorTypes = (function () {
-            function publicClassWithWithPublicGetAccessorTypes() {
-            }
-            Object.defineProperty(publicClassWithWithPublicGetAccessorTypes, "myPublicStaticMethod", {
-                get: function () {
-                    return null;
-                },
-                enumerable: true,
-                configurable: true
-            });
-            Object.defineProperty(publicClassWithWithPublicGetAccessorTypes, "myPrivateStaticMethod", {
-                get: function () {
-                    return null;
-                },
-                enumerable: true,
-                configurable: true
-            });
-            Object.defineProperty(publicClassWithWithPublicGetAccessorTypes.prototype, "myPublicMethod", {
-                get: function () {
-                    return null;
-                },
-                enumerable: true,
-                configurable: true
-            });
-            Object.defineProperty(publicClassWithWithPublicGetAccessorTypes.prototype, "myPrivateMethod", {
-                get: function () {
-                    return null;
-                },
-                enumerable: true,
-                configurable: true
-            });
-            Object.defineProperty(publicClassWithWithPublicGetAccessorTypes, "myPublicStaticMethod1", {
-                get: function () {
-                    return new publicClass();
-                },
-                enumerable: true,
-                configurable: true
-            });
-            Object.defineProperty(publicClassWithWithPublicGetAccessorTypes, "myPrivateStaticMethod1", {
-                get: function () {
-                    return new publicClass();
-                },
-                enumerable: true,
-                configurable: true
-            });
-            Object.defineProperty(publicClassWithWithPublicGetAccessorTypes.prototype, "myPublicMethod1", {
-                get: function () {
-                    return new publicClass();
-                },
-                enumerable: true,
-                configurable: true
-            });
-            Object.defineProperty(publicClassWithWithPublicGetAccessorTypes.prototype, "myPrivateMethod1", {
-                get: function () {
-                    return new publicClass();
-                },
-                enumerable: true,
-                configurable: true
-            });
-            return publicClassWithWithPublicGetAccessorTypes;
-        })();
-        privateModule.publicClassWithWithPublicGetAccessorTypes = publicClassWithWithPublicGetAccessorTypes;
-        var privateClassWithWithPrivateGetAccessorTypes = (function () {
-            function privateClassWithWithPrivateGetAccessorTypes() {
-            }
-            Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes, "myPublicStaticMethod", {
-                get: function () {
-                    return null;
-                },
-                enumerable: true,
-                configurable: true
-            });
-            Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes, "myPrivateStaticMethod", {
-                get: function () {
-                    return null;
-                },
-                enumerable: true,
-                configurable: true
-            });
-            Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes.prototype, "myPublicMethod", {
-                get: function () {
-                    return null;
-                },
-                enumerable: true,
-                configurable: true
-            });
-            Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes.prototype, "myPrivateMethod", {
-                get: function () {
-                    return null;
-                },
-                enumerable: true,
-                configurable: true
-            });
-            Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes, "myPublicStaticMethod1", {
-                get: function () {
-                    return new privateClass();
-                },
-                enumerable: true,
-                configurable: true
-            });
-            Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes, "myPrivateStaticMethod1", {
-                get: function () {
-                    return new privateClass();
-                },
-                enumerable: true,
-                configurable: true
-            });
-            Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes.prototype, "myPublicMethod1", {
-                get: function () {
-                    return new privateClass();
-                },
-                enumerable: true,
-                configurable: true
-            });
-            Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes.prototype, "myPrivateMethod1", {
-                get: function () {
-                    return new privateClass();
-                },
-                enumerable: true,
-                configurable: true
-            });
-            return privateClassWithWithPrivateGetAccessorTypes;
-        })();
-        var privateClassWithWithPublicGetAccessorTypes = (function () {
-            function privateClassWithWithPublicGetAccessorTypes() {
-            }
-            Object.defineProperty(privateClassWithWithPublicGetAccessorTypes, "myPublicStaticMethod", {
-                get: function () {
-                    return null;
-                },
-                enumerable: true,
-                configurable: true
-            });
-            Object.defineProperty(privateClassWithWithPublicGetAccessorTypes, "myPrivateStaticMethod", {
-                get: function () {
-                    return null;
-                },
-                enumerable: true,
-                configurable: true
-            });
-            Object.defineProperty(privateClassWithWithPublicGetAccessorTypes.prototype, "myPublicMethod", {
-                get: function () {
-                    return null;
-                },
-                enumerable: true,
-                configurable: true
-            });
-            Object.defineProperty(privateClassWithWithPublicGetAccessorTypes.prototype, "myPrivateMethod", {
-                get: function () {
-                    return null;
-                },
-                enumerable: true,
-                configurable: true
-            });
-            Object.defineProperty(privateClassWithWithPublicGetAccessorTypes, "myPublicStaticMethod1", {
-                get: function () {
-                    return new publicClass();
-                },
-                enumerable: true,
-                configurable: true
-            });
-            Object.defineProperty(privateClassWithWithPublicGetAccessorTypes, "myPrivateStaticMethod1", {
-                get: function () {
-                    return new publicClass();
-                },
-                enumerable: true,
-                configurable: true
-            });
-            Object.defineProperty(privateClassWithWithPublicGetAccessorTypes.prototype, "myPublicMethod1", {
-                get: function () {
-                    return new publicClass();
-                },
-                enumerable: true,
-                configurable: true
-            });
-            Object.defineProperty(privateClassWithWithPublicGetAccessorTypes.prototype, "myPrivateMethod1", {
-                get: function () {
-                    return new publicClass();
-                },
-                enumerable: true,
-                configurable: true
-            });
-            return privateClassWithWithPublicGetAccessorTypes;
-        })();
-        var publicClassWithWithPrivateSetAccessorTypes = (function () {
-            function publicClassWithWithPrivateSetAccessorTypes() {
-            }
-            Object.defineProperty(publicClassWithWithPrivateSetAccessorTypes, "myPublicStaticMethod", {
-                set: function (param) {
-                },
-                enumerable: true,
-                configurable: true
-            });
-            Object.defineProperty(publicClassWithWithPrivateSetAccessorTypes, "myPrivateStaticMethod", {
-                set: function (param) {
-                },
-                enumerable: true,
-                configurable: true
-            });
-            Object.defineProperty(publicClassWithWithPrivateSetAccessorTypes.prototype, "myPublicMethod", {
-                set: function (param) {
-                },
-                enumerable: true,
-                configurable: true
-            });
-            Object.defineProperty(publicClassWithWithPrivateSetAccessorTypes.prototype, "myPrivateMethod", {
-                set: function (param) {
-                },
-                enumerable: true,
-                configurable: true
-            });
-            return publicClassWithWithPrivateSetAccessorTypes;
-        })();
-        privateModule.publicClassWithWithPrivateSetAccessorTypes = publicClassWithWithPrivateSetAccessorTypes;
-        var publicClassWithWithPublicSetAccessorTypes = (function () {
-            function publicClassWithWithPublicSetAccessorTypes() {
-            }
-            Object.defineProperty(publicClassWithWithPublicSetAccessorTypes, "myPublicStaticMethod", {
-                set: function (param) {
-                },
-                enumerable: true,
-                configurable: true
-            });
-            Object.defineProperty(publicClassWithWithPublicSetAccessorTypes, "myPrivateStaticMethod", {
-                set: function (param) {
-                },
-                enumerable: true,
-                configurable: true
-            });
-            Object.defineProperty(publicClassWithWithPublicSetAccessorTypes.prototype, "myPublicMethod", {
-                set: function (param) {
-                },
-                enumerable: true,
-                configurable: true
-            });
-            Object.defineProperty(publicClassWithWithPublicSetAccessorTypes.prototype, "myPrivateMethod", {
-                set: function (param) {
-                },
-                enumerable: true,
-                configurable: true
-            });
-            return publicClassWithWithPublicSetAccessorTypes;
-        })();
-        privateModule.publicClassWithWithPublicSetAccessorTypes = publicClassWithWithPublicSetAccessorTypes;
-        var privateClassWithWithPrivateSetAccessorTypes = (function () {
-            function privateClassWithWithPrivateSetAccessorTypes() {
-            }
-            Object.defineProperty(privateClassWithWithPrivateSetAccessorTypes, "myPublicStaticMethod", {
-                set: function (param) {
-                },
-                enumerable: true,
-                configurable: true
-            });
-            Object.defineProperty(privateClassWithWithPrivateSetAccessorTypes, "myPrivateStaticMethod", {
-                set: function (param) {
-                },
-                enumerable: true,
-                configurable: true
-            });
-            Object.defineProperty(privateClassWithWithPrivateSetAccessorTypes.prototype, "myPublicMethod", {
-                set: function (param) {
-                },
-                enumerable: true,
-                configurable: true
-            });
-            Object.defineProperty(privateClassWithWithPrivateSetAccessorTypes.prototype, "myPrivateMethod", {
-                set: function (param) {
-                },
-                enumerable: true,
-                configurable: true
-            });
-            return privateClassWithWithPrivateSetAccessorTypes;
-        })();
-        var privateClassWithWithPublicSetAccessorTypes = (function () {
-            function privateClassWithWithPublicSetAccessorTypes() {
-            }
-            Object.defineProperty(privateClassWithWithPublicSetAccessorTypes, "myPublicStaticMethod", {
-                set: function (param) {
-                },
-                enumerable: true,
-                configurable: true
-            });
-            Object.defineProperty(privateClassWithWithPublicSetAccessorTypes, "myPrivateStaticMethod", {
-                set: function (param) {
-                },
-                enumerable: true,
-                configurable: true
-            });
-            Object.defineProperty(privateClassWithWithPublicSetAccessorTypes.prototype, "myPublicMethod", {
-                set: function (param) {
-                },
-                enumerable: true,
-                configurable: true
-            });
-            Object.defineProperty(privateClassWithWithPublicSetAccessorTypes.prototype, "myPrivateMethod", {
-                set: function (param) {
-                },
-                enumerable: true,
-                configurable: true
-            });
-            return privateClassWithWithPublicSetAccessorTypes;
-        })();
-        var publicClassWithPrivateModuleGetAccessorTypes = (function () {
-            function publicClassWithPrivateModuleGetAccessorTypes() {
-            }
-            Object.defineProperty(publicClassWithPrivateModuleGetAccessorTypes, "myPublicStaticMethod", {
-                get: function () {
-                    return null;
-                },
-                enumerable: true,
-                configurable: true
-            });
-            Object.defineProperty(publicClassWithPrivateModuleGetAccessorTypes.prototype, "myPublicMethod", {
-                get: function () {
-                    return null;
-                },
-                enumerable: true,
-                configurable: true
-            });
-            Object.defineProperty(publicClassWithPrivateModuleGetAccessorTypes, "myPublicStaticMethod1", {
-                get: function () {
-                    return new privateModule.publicClass();
-                },
-                enumerable: true,
-                configurable: true
-            });
-            Object.defineProperty(publicClassWithPrivateModuleGetAccessorTypes.prototype, "myPublicMethod1", {
-                get: function () {
-                    return new privateModule.publicClass();
-                },
-                enumerable: true,
-                configurable: true
-            });
-            return publicClassWithPrivateModuleGetAccessorTypes;
-        })();
-        privateModule.publicClassWithPrivateModuleGetAccessorTypes = publicClassWithPrivateModuleGetAccessorTypes;
-        var publicClassWithPrivateModuleSetAccessorTypes = (function () {
-            function publicClassWithPrivateModuleSetAccessorTypes() {
-            }
-            Object.defineProperty(publicClassWithPrivateModuleSetAccessorTypes, "myPublicStaticMethod", {
-                set: function (param) {
-                },
-                enumerable: true,
-                configurable: true
-            });
-            Object.defineProperty(publicClassWithPrivateModuleSetAccessorTypes.prototype, "myPublicMethod", {
-                set: function (param) {
-                },
-                enumerable: true,
-                configurable: true
-            });
-            return publicClassWithPrivateModuleSetAccessorTypes;
-        })();
-        privateModule.publicClassWithPrivateModuleSetAccessorTypes = publicClassWithPrivateModuleSetAccessorTypes;
-        var privateClassWithPrivateModuleGetAccessorTypes = (function () {
-            function privateClassWithPrivateModuleGetAccessorTypes() {
-            }
-            Object.defineProperty(privateClassWithPrivateModuleGetAccessorTypes, "myPublicStaticMethod", {
-                get: function () {
-                    return null;
-                },
-                enumerable: true,
-                configurable: true
-            });
-            Object.defineProperty(privateClassWithPrivateModuleGetAccessorTypes.prototype, "myPublicMethod", {
-                get: function () {
-                    return null;
-                },
-                enumerable: true,
-                configurable: true
-            });
-            Object.defineProperty(privateClassWithPrivateModuleGetAccessorTypes, "myPublicStaticMethod1", {
-                get: function () {
-                    return new privateModule.publicClass();
-                },
-                enumerable: true,
-                configurable: true
-            });
-            Object.defineProperty(privateClassWithPrivateModuleGetAccessorTypes.prototype, "myPublicMethod1", {
-                get: function () {
-                    return new privateModule.publicClass();
-                },
-                enumerable: true,
-                configurable: true
-            });
-            return privateClassWithPrivateModuleGetAccessorTypes;
-        })();
-        var privateClassWithPrivateModuleSetAccessorTypes = (function () {
-            function privateClassWithPrivateModuleSetAccessorTypes() {
-            }
-            Object.defineProperty(privateClassWithPrivateModuleSetAccessorTypes, "myPublicStaticMethod", {
-                set: function (param) {
-                },
-                enumerable: true,
-                configurable: true
-            });
-            Object.defineProperty(privateClassWithPrivateModuleSetAccessorTypes.prototype, "myPublicMethod", {
-                set: function (param) {
-                },
-                enumerable: true,
-                configurable: true
-            });
-            return privateClassWithPrivateModuleSetAccessorTypes;
-        })();
-    })(privateModule || (privateModule = {}));
-    var publicClassWithWithPrivateGetAccessorTypes = (function () {
-        function publicClassWithWithPrivateGetAccessorTypes() {
-        }
-        Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes, "myPublicStaticMethod", {
-            get: function () {
-                return null;
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes, "myPrivateStaticMethod", {
-            get: function () {
-                return null;
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes.prototype, "myPublicMethod", {
-            get: function () {
-                return null;
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes.prototype, "myPrivateMethod", {
-            get: function () {
-                return null;
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes, "myPublicStaticMethod1", {
-            get: function () {
-                return new privateClass();
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes, "myPrivateStaticMethod1", {
-            get: function () {
-                return new privateClass();
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes.prototype, "myPublicMethod1", {
-            get: function () {
-                return new privateClass();
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes.prototype, "myPrivateMethod1", {
-            get: function () {
-                return new privateClass();
-            },
-            enumerable: true,
-            configurable: true
-        });
-        return publicClassWithWithPrivateGetAccessorTypes;
-    })();
-    publicModuleInGlobal.publicClassWithWithPrivateGetAccessorTypes = publicClassWithWithPrivateGetAccessorTypes;
-    var publicClassWithWithPublicGetAccessorTypes = (function () {
-        function publicClassWithWithPublicGetAccessorTypes() {
-        }
-        Object.defineProperty(publicClassWithWithPublicGetAccessorTypes, "myPublicStaticMethod", {
-            get: function () {
-                return null;
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(publicClassWithWithPublicGetAccessorTypes, "myPrivateStaticMethod", {
-            get: function () {
-                return null;
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(publicClassWithWithPublicGetAccessorTypes.prototype, "myPublicMethod", {
-            get: function () {
-                return null;
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(publicClassWithWithPublicGetAccessorTypes.prototype, "myPrivateMethod", {
-            get: function () {
-                return null;
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(publicClassWithWithPublicGetAccessorTypes, "myPublicStaticMethod1", {
-            get: function () {
-                return new publicClass();
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(publicClassWithWithPublicGetAccessorTypes, "myPrivateStaticMethod1", {
-            get: function () {
-                return new publicClass();
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(publicClassWithWithPublicGetAccessorTypes.prototype, "myPublicMethod1", {
-            get: function () {
-                return new publicClass();
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(publicClassWithWithPublicGetAccessorTypes.prototype, "myPrivateMethod1", {
-            get: function () {
-                return new publicClass();
-            },
-            enumerable: true,
-            configurable: true
-        });
-        return publicClassWithWithPublicGetAccessorTypes;
-    })();
-    publicModuleInGlobal.publicClassWithWithPublicGetAccessorTypes = publicClassWithWithPublicGetAccessorTypes;
-    var privateClassWithWithPrivateGetAccessorTypes = (function () {
-        function privateClassWithWithPrivateGetAccessorTypes() {
-        }
-        Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes, "myPublicStaticMethod", {
-            get: function () {
-                return null;
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes, "myPrivateStaticMethod", {
-            get: function () {
-                return null;
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes.prototype, "myPublicMethod", {
-            get: function () {
-                return null;
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes.prototype, "myPrivateMethod", {
-            get: function () {
-                return null;
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes, "myPublicStaticMethod1", {
-            get: function () {
-                return new privateClass();
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes, "myPrivateStaticMethod1", {
-            get: function () {
-                return new privateClass();
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes.prototype, "myPublicMethod1", {
-            get: function () {
-                return new privateClass();
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes.prototype, "myPrivateMethod1", {
-            get: function () {
-                return new privateClass();
-            },
-            enumerable: true,
-            configurable: true
-        });
-        return privateClassWithWithPrivateGetAccessorTypes;
-    })();
-    var privateClassWithWithPublicGetAccessorTypes = (function () {
-        function privateClassWithWithPublicGetAccessorTypes() {
-        }
-        Object.defineProperty(privateClassWithWithPublicGetAccessorTypes, "myPublicStaticMethod", {
-            get: function () {
-                return null;
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(privateClassWithWithPublicGetAccessorTypes, "myPrivateStaticMethod", {
-            get: function () {
-                return null;
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(privateClassWithWithPublicGetAccessorTypes.prototype, "myPublicMethod", {
-            get: function () {
-                return null;
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(privateClassWithWithPublicGetAccessorTypes.prototype, "myPrivateMethod", {
-            get: function () {
-                return null;
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(privateClassWithWithPublicGetAccessorTypes, "myPublicStaticMethod1", {
-            get: function () {
-                return new publicClass();
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(privateClassWithWithPublicGetAccessorTypes, "myPrivateStaticMethod1", {
-            get: function () {
-                return new publicClass();
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(privateClassWithWithPublicGetAccessorTypes.prototype, "myPublicMethod1", {
-            get: function () {
-                return new publicClass();
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(privateClassWithWithPublicGetAccessorTypes.prototype, "myPrivateMethod1", {
-            get: function () {
-                return new publicClass();
-            },
-            enumerable: true,
-            configurable: true
-        });
-        return privateClassWithWithPublicGetAccessorTypes;
-    })();
-    var publicClassWithWithPrivateSetAccessorTypes = (function () {
-        function publicClassWithWithPrivateSetAccessorTypes() {
-        }
-        Object.defineProperty(publicClassWithWithPrivateSetAccessorTypes, "myPublicStaticMethod", {
-            set: function (param) {
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(publicClassWithWithPrivateSetAccessorTypes, "myPrivateStaticMethod", {
-            set: function (param) {
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(publicClassWithWithPrivateSetAccessorTypes.prototype, "myPublicMethod", {
-            set: function (param) {
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(publicClassWithWithPrivateSetAccessorTypes.prototype, "myPrivateMethod", {
-            set: function (param) {
-            },
-            enumerable: true,
-            configurable: true
-        });
-        return publicClassWithWithPrivateSetAccessorTypes;
-    })();
-    publicModuleInGlobal.publicClassWithWithPrivateSetAccessorTypes = publicClassWithWithPrivateSetAccessorTypes;
-    var publicClassWithWithPublicSetAccessorTypes = (function () {
-        function publicClassWithWithPublicSetAccessorTypes() {
-        }
-        Object.defineProperty(publicClassWithWithPublicSetAccessorTypes, "myPublicStaticMethod", {
-            set: function (param) {
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(publicClassWithWithPublicSetAccessorTypes, "myPrivateStaticMethod", {
-            set: function (param) {
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(publicClassWithWithPublicSetAccessorTypes.prototype, "myPublicMethod", {
-            set: function (param) {
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(publicClassWithWithPublicSetAccessorTypes.prototype, "myPrivateMethod", {
-            set: function (param) {
-            },
-            enumerable: true,
-            configurable: true
-        });
-        return publicClassWithWithPublicSetAccessorTypes;
-    })();
-    publicModuleInGlobal.publicClassWithWithPublicSetAccessorTypes = publicClassWithWithPublicSetAccessorTypes;
-    var privateClassWithWithPrivateSetAccessorTypes = (function () {
-        function privateClassWithWithPrivateSetAccessorTypes() {
-        }
-        Object.defineProperty(privateClassWithWithPrivateSetAccessorTypes, "myPublicStaticMethod", {
-            set: function (param) {
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(privateClassWithWithPrivateSetAccessorTypes, "myPrivateStaticMethod", {
-            set: function (param) {
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(privateClassWithWithPrivateSetAccessorTypes.prototype, "myPublicMethod", {
-            set: function (param) {
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(privateClassWithWithPrivateSetAccessorTypes.prototype, "myPrivateMethod", {
-            set: function (param) {
-            },
-            enumerable: true,
-            configurable: true
-        });
-        return privateClassWithWithPrivateSetAccessorTypes;
-    })();
-    var privateClassWithWithPublicSetAccessorTypes = (function () {
-        function privateClassWithWithPublicSetAccessorTypes() {
-        }
-        Object.defineProperty(privateClassWithWithPublicSetAccessorTypes, "myPublicStaticMethod", {
-            set: function (param) {
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(privateClassWithWithPublicSetAccessorTypes, "myPrivateStaticMethod", {
-            set: function (param) {
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(privateClassWithWithPublicSetAccessorTypes.prototype, "myPublicMethod", {
-            set: function (param) {
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(privateClassWithWithPublicSetAccessorTypes.prototype, "myPrivateMethod", {
-            set: function (param) {
-            },
-            enumerable: true,
-            configurable: true
-        });
-        return privateClassWithWithPublicSetAccessorTypes;
-    })();
-    var publicClassWithPrivateModuleGetAccessorTypes = (function () {
-        function publicClassWithPrivateModuleGetAccessorTypes() {
-        }
-        Object.defineProperty(publicClassWithPrivateModuleGetAccessorTypes, "myPublicStaticMethod", {
-            get: function () {
-                return null;
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(publicClassWithPrivateModuleGetAccessorTypes.prototype, "myPublicMethod", {
-            get: function () {
-                return null;
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(publicClassWithPrivateModuleGetAccessorTypes, "myPublicStaticMethod1", {
-            get: function () {
-                return new privateModule.publicClass();
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(publicClassWithPrivateModuleGetAccessorTypes.prototype, "myPublicMethod1", {
-            get: function () {
-                return new privateModule.publicClass();
-            },
-            enumerable: true,
-            configurable: true
-        });
-        return publicClassWithPrivateModuleGetAccessorTypes;
-    })();
-    publicModuleInGlobal.publicClassWithPrivateModuleGetAccessorTypes = publicClassWithPrivateModuleGetAccessorTypes;
-    var publicClassWithPrivateModuleSetAccessorTypes = (function () {
-        function publicClassWithPrivateModuleSetAccessorTypes() {
-        }
-        Object.defineProperty(publicClassWithPrivateModuleSetAccessorTypes, "myPublicStaticMethod", {
-            set: function (param) {
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(publicClassWithPrivateModuleSetAccessorTypes.prototype, "myPublicMethod", {
-            set: function (param) {
-            },
-            enumerable: true,
-            configurable: true
-        });
-        return publicClassWithPrivateModuleSetAccessorTypes;
-    })();
-    publicModuleInGlobal.publicClassWithPrivateModuleSetAccessorTypes = publicClassWithPrivateModuleSetAccessorTypes;
-    var privateClassWithPrivateModuleGetAccessorTypes = (function () {
-        function privateClassWithPrivateModuleGetAccessorTypes() {
-        }
-        Object.defineProperty(privateClassWithPrivateModuleGetAccessorTypes, "myPublicStaticMethod", {
-            get: function () {
-                return null;
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(privateClassWithPrivateModuleGetAccessorTypes.prototype, "myPublicMethod", {
-            get: function () {
-                return null;
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(privateClassWithPrivateModuleGetAccessorTypes, "myPublicStaticMethod1", {
-            get: function () {
-                return new privateModule.publicClass();
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(privateClassWithPrivateModuleGetAccessorTypes.prototype, "myPublicMethod1", {
-            get: function () {
-                return new privateModule.publicClass();
-            },
-            enumerable: true,
-            configurable: true
-        });
-        return privateClassWithPrivateModuleGetAccessorTypes;
-    })();
-    var privateClassWithPrivateModuleSetAccessorTypes = (function () {
-        function privateClassWithPrivateModuleSetAccessorTypes() {
-        }
-        Object.defineProperty(privateClassWithPrivateModuleSetAccessorTypes, "myPublicStaticMethod", {
-            set: function (param) {
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(privateClassWithPrivateModuleSetAccessorTypes.prototype, "myPublicMethod", {
-            set: function (param) {
-            },
-            enumerable: true,
-            configurable: true
-        });
-        return privateClassWithPrivateModuleSetAccessorTypes;
-    })();
-})(publicModuleInGlobal || (publicModuleInGlobal = {}));
diff --git a/tests/baselines/reference/privacyCannotNameAccessorDeclFile.errors.txt b/tests/baselines/reference/privacyCannotNameAccessorDeclFile.errors.txt
deleted file mode 100644
index 4f7f684d073..00000000000
--- a/tests/baselines/reference/privacyCannotNameAccessorDeclFile.errors.txt
+++ /dev/null
@@ -1,151 +0,0 @@
-==== tests/cases/compiler/privacyCannotNameAccessorDeclFile_consumer.ts (8 errors) ====
-    import exporter = require("privacyCannotNameAccessorDeclFile_exporter");
-    export class publicClassWithWithPrivateGetAccessorTypes {
-        static get myPublicStaticMethod() { // Error
-                   ~~~~~~~~~~~~~~~~~~~~
-!!! Return type of public static property getter from exported class has or is using name 'Widget1' from external module "tests/cases/compiler/privacyCannotNameAccessorDeclFile_Widgets" but cannot be named.
-            return exporter.createExportedWidget1();
-        }
-        private static get myPrivateStaticMethod() {
-            return exporter.createExportedWidget1();
-        }
-        get myPublicMethod() { // Error
-            ~~~~~~~~~~~~~~
-!!! Return type of public property getter from exported class has or is using name 'Widget1' from external module "tests/cases/compiler/privacyCannotNameAccessorDeclFile_Widgets" but cannot be named.
-            return exporter.createExportedWidget1();
-        }
-        private get myPrivateMethod() {
-            return exporter.createExportedWidget1();
-        }
-        static get myPublicStaticMethod1() { // Error
-                   ~~~~~~~~~~~~~~~~~~~~~
-!!! Return type of public static property getter from exported class has or is using name 'Widget3' from external module "GlobalWidgets" but cannot be named.
-            return exporter.createExportedWidget3();
-        }
-        private static get myPrivateStaticMethod1() {
-            return exporter.createExportedWidget3();
-        }
-        get myPublicMethod1() { // Error
-            ~~~~~~~~~~~~~~~
-!!! Return type of public property getter from exported class has or is using name 'Widget3' from external module "GlobalWidgets" but cannot be named.
-            return exporter.createExportedWidget3();
-        }
-        private get myPrivateMethod1() {
-            return exporter.createExportedWidget3();
-        }
-    }
-    
-    class privateClassWithWithPrivateGetAccessorTypes {
-        static get myPublicStaticMethod() { 
-            return exporter.createExportedWidget1();
-        }
-        private static get myPrivateStaticMethod() {
-            return exporter.createExportedWidget1();
-        }
-        get myPublicMethod() { 
-            return exporter.createExportedWidget1();
-        }
-        private get myPrivateMethod() {
-            return exporter.createExportedWidget1();
-        }
-        static get myPublicStaticMethod1() { 
-            return exporter.createExportedWidget3();
-        }
-        private static get myPrivateStaticMethod1() {
-            return exporter.createExportedWidget3();
-        }
-        get myPublicMethod1() { 
-            return exporter.createExportedWidget3();
-        }
-        private get myPrivateMethod1() {
-            return exporter.createExportedWidget3();
-        }
-    }
-    
-    export class publicClassWithPrivateModuleGetAccessorTypes {
-        static get myPublicStaticMethod() { // Error
-                   ~~~~~~~~~~~~~~~~~~~~
-!!! Return type of public static property getter from exported class has or is using name 'SpecializedWidget.Widget2' from external module "tests/cases/compiler/privacyCannotNameAccessorDeclFile_Widgets" but cannot be named.
-            return exporter.createExportedWidget2();
-        }
-        get myPublicMethod() { // Error
-            ~~~~~~~~~~~~~~
-!!! Return type of public property getter from exported class has or is using name 'SpecializedWidget.Widget2' from external module "tests/cases/compiler/privacyCannotNameAccessorDeclFile_Widgets" but cannot be named.
-            return exporter.createExportedWidget2();
-        }
-        static get myPublicStaticMethod1() { // Error
-                   ~~~~~~~~~~~~~~~~~~~~~
-!!! Return type of public static property getter from exported class has or is using name 'SpecializedGlobalWidget.Widget4' from external module "GlobalWidgets" but cannot be named.
-            return exporter.createExportedWidget4();
-        }
-        get myPublicMethod1() { // Error
-            ~~~~~~~~~~~~~~~
-!!! Return type of public property getter from exported class has or is using name 'SpecializedGlobalWidget.Widget4' from external module "GlobalWidgets" but cannot be named.
-            return exporter.createExportedWidget4();
-        }
-    }
-    
-    class privateClassWithPrivateModuleGetAccessorTypes {
-        static get myPublicStaticMethod() { 
-            return exporter.createExportedWidget2();
-        }
-        get myPublicMethod() { 
-            return exporter.createExportedWidget2();
-        }
-        static get myPublicStaticMethod1() { 
-            return exporter.createExportedWidget4();
-        }
-        get myPublicMethod1() { 
-            return exporter.createExportedWidget4();
-        }
-    }
-==== tests/cases/compiler/privacyCannotNameAccessorDeclFile_GlobalWidgets.ts (0 errors) ====
-    
-    declare module "GlobalWidgets" {
-        export class Widget3 {
-            name: string;
-        }
-        export function createWidget3(): Widget3;
-    
-        export module SpecializedGlobalWidget {
-            export class Widget4 {
-                name: string;
-            }
-            function createWidget4(): Widget4;
-        }
-    }
-    
-==== tests/cases/compiler/privacyCannotNameAccessorDeclFile_Widgets.ts (0 errors) ====
-    export class Widget1 {
-        name = 'one';
-    }
-    export function createWidget1() {
-        return new Widget1();
-    }
-    
-    export module SpecializedWidget {
-        export class Widget2 {
-            name = 'one';
-        }
-        export function createWidget2() {
-            return new Widget2();
-        }
-    }
-    
-==== tests/cases/compiler/privacyCannotNameAccessorDeclFile_exporter.ts (0 errors) ====
-    ///<reference path='privacyCannotNameAccessorDeclFile_GlobalWidgets.ts'/>
-    import Widgets = require("privacyCannotNameAccessorDeclFile_Widgets");
-    import Widgets1 = require("GlobalWidgets");
-    export function createExportedWidget1() {
-        return Widgets.createWidget1();
-    }
-    export function createExportedWidget2() {
-        return Widgets.SpecializedWidget.createWidget2();
-    }
-    export function createExportedWidget3() {
-        return Widgets1.createWidget3();
-    }
-    export function createExportedWidget4() {
-        return Widgets1.SpecializedGlobalWidget.createWidget4();
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.errors.txt b/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.errors.txt
deleted file mode 100644
index 92a2f349908..00000000000
--- a/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.errors.txt
+++ /dev/null
@@ -1,123 +0,0 @@
-==== tests/cases/compiler/privacyCannotNameVarTypeDeclFile_consumer.ts (12 errors) ====
-    import exporter = require("privacyCannotNameVarTypeDeclFile_exporter");
-    export class publicClassWithWithPrivatePropertyTypes {
-        static myPublicStaticProperty = exporter.createExportedWidget1(); // Error
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Public static property 'myPublicStaticProperty' of exported class has or is using name 'Widget1' from external module "tests/cases/compiler/privacyCannotNameVarTypeDeclFile_Widgets" but cannot be named.
-        private static myPrivateStaticProperty = exporter.createExportedWidget1();
-        myPublicProperty = exporter.createExportedWidget1(); // Error
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Public property 'myPublicProperty' of exported class has or is using name 'Widget1' from external module "tests/cases/compiler/privacyCannotNameVarTypeDeclFile_Widgets" but cannot be named.
-        private myPrivateProperty = exporter.createExportedWidget1();
-    
-        static myPublicStaticProperty1 = exporter.createExportedWidget3(); // Error
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Public static property 'myPublicStaticProperty1' of exported class has or is using name 'Widget3' from external module "GlobalWidgets" but cannot be named.
-        private static myPrivateStaticProperty1 = exporter.createExportedWidget3();
-        myPublicProperty1 = exporter.createExportedWidget3(); // Error
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Public property 'myPublicProperty1' of exported class has or is using name 'Widget3' from external module "GlobalWidgets" but cannot be named.
-        private myPrivateProperty1 = exporter.createExportedWidget3();
-    }
-    
-    class privateClassWithWithPrivatePropertyTypes {
-        static myPublicStaticProperty = exporter.createExportedWidget1(); 
-        private static myPrivateStaticProperty = exporter.createExportedWidget1();
-        myPublicProperty = exporter.createExportedWidget1(); 
-        private myPrivateProperty = exporter.createExportedWidget1();
-    
-        static myPublicStaticProperty1 = exporter.createExportedWidget3(); 
-        private static myPrivateStaticProperty1 = exporter.createExportedWidget3();
-        myPublicProperty1 = exporter.createExportedWidget3(); 
-        private myPrivateProperty1 = exporter.createExportedWidget3();
-    }
-    
-    export var publicVarWithPrivatePropertyTypes= exporter.createExportedWidget1(); // Error
-               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Exported variable 'publicVarWithPrivatePropertyTypes' has or is using name 'Widget1' from external module "tests/cases/compiler/privacyCannotNameVarTypeDeclFile_Widgets" but cannot be named.
-    var privateVarWithPrivatePropertyTypes= exporter.createExportedWidget1();
-    export var publicVarWithPrivatePropertyTypes1 = exporter.createExportedWidget3(); // Error
-               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Exported variable 'publicVarWithPrivatePropertyTypes1' has or is using name 'Widget3' from external module "GlobalWidgets" but cannot be named.
-    var privateVarWithPrivatePropertyTypes1 = exporter.createExportedWidget3();
-    
-    export class publicClassWithPrivateModulePropertyTypes {
-        static myPublicStaticProperty= exporter.createExportedWidget2(); // Error
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Public static property 'myPublicStaticProperty' of exported class has or is using name 'SpecializedWidget.Widget2' from external module "tests/cases/compiler/privacyCannotNameVarTypeDeclFile_Widgets" but cannot be named.
-        myPublicProperty = exporter.createExportedWidget2(); // Error
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Public property 'myPublicProperty' of exported class has or is using name 'SpecializedWidget.Widget2' from external module "tests/cases/compiler/privacyCannotNameVarTypeDeclFile_Widgets" but cannot be named.
-        static myPublicStaticProperty1 = exporter.createExportedWidget4(); // Error
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Public static property 'myPublicStaticProperty1' of exported class has or is using name 'SpecializedGlobalWidget.Widget4' from external module "GlobalWidgets" but cannot be named.
-        myPublicProperty1 = exporter.createExportedWidget4(); // Error
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Public property 'myPublicProperty1' of exported class has or is using name 'SpecializedGlobalWidget.Widget4' from external module "GlobalWidgets" but cannot be named.
-    }
-    export var publicVarWithPrivateModulePropertyTypes= exporter.createExportedWidget2(); // Error
-               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Exported variable 'publicVarWithPrivateModulePropertyTypes' has or is using name 'SpecializedWidget.Widget2' from external module "tests/cases/compiler/privacyCannotNameVarTypeDeclFile_Widgets" but cannot be named.
-    export var publicVarWithPrivateModulePropertyTypes1 = exporter.createExportedWidget4(); // Error
-               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Exported variable 'publicVarWithPrivateModulePropertyTypes1' has or is using name 'SpecializedGlobalWidget.Widget4' from external module "GlobalWidgets" but cannot be named.
-    
-    class privateClassWithPrivateModulePropertyTypes {
-        static myPublicStaticProperty= exporter.createExportedWidget2();
-        myPublicProperty= exporter.createExportedWidget2();
-        static myPublicStaticProperty1 = exporter.createExportedWidget4();
-        myPublicProperty1 = exporter.createExportedWidget4();
-    }
-    var privateVarWithPrivateModulePropertyTypes= exporter.createExportedWidget2();
-    var privateVarWithPrivateModulePropertyTypes1 = exporter.createExportedWidget4();
-==== tests/cases/compiler/privacyCannotNameVarTypeDeclFile_GlobalWidgets.ts (0 errors) ====
-    
-    
-    declare module "GlobalWidgets" {
-        export class Widget3 {
-            name: string;
-        }
-        export function createWidget3(): Widget3;
-    
-        export module SpecializedGlobalWidget {
-            export class Widget4 {
-                name: string;
-            }
-            function createWidget4(): Widget4;
-        }
-    }
-    
-==== tests/cases/compiler/privacyCannotNameVarTypeDeclFile_Widgets.ts (0 errors) ====
-    export class Widget1 {
-        name = 'one';
-    }
-    export function createWidget1() {
-        return new Widget1();
-    }
-    
-    export module SpecializedWidget {
-        export class Widget2 {
-            name = 'one';
-        }
-        export function createWidget2() {
-            return new Widget2();
-        }
-    }
-    
-==== tests/cases/compiler/privacyCannotNameVarTypeDeclFile_exporter.ts (0 errors) ====
-    ///<reference path='privacyCannotNameVarTypeDeclFile_GlobalWidgets.ts'/>
-    import Widgets = require("privacyCannotNameVarTypeDeclFile_Widgets");
-    import Widgets1 = require("GlobalWidgets");
-    export function createExportedWidget1() {
-        return Widgets.createWidget1();
-    }
-    export function createExportedWidget2() {
-        return Widgets.SpecializedWidget.createWidget2();
-    }
-    export function createExportedWidget3() {
-        return Widgets1.createWidget3();
-    }
-    export function createExportedWidget4() {
-        return Widgets1.SpecializedGlobalWidget.createWidget4();
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/privacyCheckAnonymousFunctionParameter.js b/tests/baselines/reference/privacyCheckAnonymousFunctionParameter.js
index 70bc067bb8d..ccaf3c7924f 100644
--- a/tests/baselines/reference/privacyCheckAnonymousFunctionParameter.js
+++ b/tests/baselines/reference/privacyCheckAnonymousFunctionParameter.js
@@ -30,7 +30,3 @@ var Query;
         });
     }
 })(Query || (Query = {}));
-
-
-//// [privacyCheckAnonymousFunctionParameter.d.ts]
-export declare var x: number;
diff --git a/tests/baselines/reference/privacyCheckAnonymousFunctionParameter.types b/tests/baselines/reference/privacyCheckAnonymousFunctionParameter.types
index d38d223bae7..2ce71bdacfa 100644
--- a/tests/baselines/reference/privacyCheckAnonymousFunctionParameter.types
+++ b/tests/baselines/reference/privacyCheckAnonymousFunctionParameter.types
@@ -11,7 +11,7 @@ module Query {
 >Query : typeof Query
 
     export function fromDoWhile<T>(doWhile: (test: Iterator<T>) => boolean): Iterator<T> {
->fromDoWhile : <T>(doWhile: (test: Iterator<T>) => boolean) => Iterator<T>
+>fromDoWhile : typeof fromDoWhile
 >T : T
 >doWhile : (test: Iterator<T>) => boolean
 >test : Iterator<T>
@@ -24,16 +24,12 @@ module Query {
     }
 
     function fromOrderBy() {
->fromOrderBy : () => Iterator<{}>
+>fromOrderBy : typeof fromOrderBy
 
         return fromDoWhile(test => {
->fromDoWhile(test => {
-            return true;
-        }) : Iterator<{}>
->fromDoWhile : <T>(doWhile: (test: Iterator<T>) => boolean) => Iterator<T>
->test => {
-            return true;
-        } : (test: Iterator<{}>) => boolean
+>fromDoWhile(test => {            return true;        }) : Iterator<{}>
+>fromDoWhile : typeof fromDoWhile
+>test => {            return true;        } : (test: Iterator<{}>) => boolean
 >test : Iterator<{}>
 
             return true;
diff --git a/tests/baselines/reference/privacyCheckAnonymousFunctionParameter2.js b/tests/baselines/reference/privacyCheckAnonymousFunctionParameter2.js
index 77bb7e9349b..78647537ace 100644
--- a/tests/baselines/reference/privacyCheckAnonymousFunctionParameter2.js
+++ b/tests/baselines/reference/privacyCheckAnonymousFunctionParameter2.js
@@ -31,7 +31,3 @@ define(["require", "exports"], function (require, exports) {
         }
     })(Q || (Q = {}));
 });
-
-
-//// [privacyCheckAnonymousFunctionParameter2.d.ts]
-export declare var x: number;
diff --git a/tests/baselines/reference/privacyCheckAnonymousFunctionParameter2.types b/tests/baselines/reference/privacyCheckAnonymousFunctionParameter2.types
index 6615a3c9af0..7854f5f9b77 100644
--- a/tests/baselines/reference/privacyCheckAnonymousFunctionParameter2.types
+++ b/tests/baselines/reference/privacyCheckAnonymousFunctionParameter2.types
@@ -12,7 +12,7 @@ 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
+>foo : typeof foo
 >T : T
 >x : (a: Iterator<T>) => number
 >a : Iterator<T>
@@ -28,10 +28,10 @@ module Q {
 >Q : typeof Q
 
     function bar() {
->bar : () => void
+>bar : typeof bar
 
         foo(null);
 >foo(null) : (a: Iterator<{}>) => number
->foo : <T>(x: (a: Iterator<T>) => number) => (a: Iterator<T>) => number
+>foo : typeof foo
     }
 }
diff --git a/tests/baselines/reference/privacyCheckCallbackOfInterfaceMethodWithTypeParameter.js b/tests/baselines/reference/privacyCheckCallbackOfInterfaceMethodWithTypeParameter.js
index faaef563ebb..02a4b682d94 100644
--- a/tests/baselines/reference/privacyCheckCallbackOfInterfaceMethodWithTypeParameter.js
+++ b/tests/baselines/reference/privacyCheckCallbackOfInterfaceMethodWithTypeParameter.js
@@ -10,11 +10,3 @@ export interface B<T> extends A<T> {
 //// [privacyCheckCallbackOfInterfaceMethodWithTypeParameter.js]
 define(["require", "exports"], function (require, exports) {
 });
-
-
-//// [privacyCheckCallbackOfInterfaceMethodWithTypeParameter.d.ts]
-export interface A<T> {
-    f1(callback: (p: T) => any): any;
-}
-export interface B<T> extends A<T> {
-}
diff --git a/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface1.js b/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface1.js
index 7b5e63ce009..1b02a38307b 100644
--- a/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface1.js
+++ b/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface1.js
@@ -11,14 +11,3 @@ export = Foo;
 //// [privacyCheckExportAssignmentOnExportedGenericInterface1.js]
 var Foo;
 module.exports = Foo;
-
-
-//// [privacyCheckExportAssignmentOnExportedGenericInterface1.d.ts]
-declare module Foo {
-    interface A<T> {
-    }
-}
-interface Foo<T> {
-}
-declare var Foo: new () => Foo.A<Foo<string>>;
-export = Foo;
diff --git a/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface2.js b/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface2.js
index 11a51318230..2b4e9ddf833 100644
--- a/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface2.js
+++ b/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface2.js
@@ -24,13 +24,3 @@ define(["require", "exports"], function (require, exports) {
     })(Foo || (Foo = {}));
     return Foo;
 });
-
-
-//// [privacyCheckExportAssignmentOnExportedGenericInterface2.d.ts]
-export = Foo;
-interface Foo<T> {
-}
-declare function Foo<T>(array: T[]): Foo<T>;
-declare module Foo {
-    var x: string;
-}
diff --git a/tests/baselines/reference/privacyCheckExternalModuleExportAssignmentOfGenericClass.js b/tests/baselines/reference/privacyCheckExternalModuleExportAssignmentOfGenericClass.js
index eeaea58e0ab..94aa5c28e92 100644
--- a/tests/baselines/reference/privacyCheckExternalModuleExportAssignmentOfGenericClass.js
+++ b/tests/baselines/reference/privacyCheckExternalModuleExportAssignmentOfGenericClass.js
@@ -22,17 +22,3 @@ var Foo = (function () {
 })();
 module.exports = Foo;
 //// [privacyCheckExternalModuleExportAssignmentOfGenericClass_1.js]
-
-
-//// [privacyCheckExternalModuleExportAssignmentOfGenericClass_0.d.ts]
-export = Foo;
-declare class Foo<A> {
-    a: A;
-    constructor(a: A);
-}
-//// [privacyCheckExternalModuleExportAssignmentOfGenericClass_1.d.ts]
-import Foo = require("privacyCheckExternalModuleExportAssignmentOfGenericClass_0");
-export = Bar;
-interface Bar {
-    foo: Foo<number>;
-}
diff --git a/tests/baselines/reference/privacyCheckOnTypeParameterReferenceInConstructorParameter.js b/tests/baselines/reference/privacyCheckOnTypeParameterReferenceInConstructorParameter.js
index 6e2ef744946..a1def385809 100644
--- a/tests/baselines/reference/privacyCheckOnTypeParameterReferenceInConstructorParameter.js
+++ b/tests/baselines/reference/privacyCheckOnTypeParameterReferenceInConstructorParameter.js
@@ -26,12 +26,3 @@ define(["require", "exports"], function (require, exports) {
     })();
     exports.B = B;
 });
-
-
-//// [privacyCheckOnTypeParameterReferenceInConstructorParameter.d.ts]
-export declare class A<T1> {
-    constructor(callback: (self: A<T1>) => void);
-}
-export declare class B<T2> {
-    constructor(parent: T2);
-}
diff --git a/tests/baselines/reference/privacyCheckTypeOfFunction.errors.txt b/tests/baselines/reference/privacyCheckTypeOfFunction.errors.txt
index 50b9dc0242b..3132a1c56a7 100644
--- a/tests/baselines/reference/privacyCheckTypeOfFunction.errors.txt
+++ b/tests/baselines/reference/privacyCheckTypeOfFunction.errors.txt
@@ -1,10 +1,8 @@
-==== tests/cases/compiler/privacyCheckTypeOfFunction.ts (2 errors) ====
+==== tests/cases/compiler/privacyCheckTypeOfFunction.ts (1 errors) ====
     function foo() {
     }
     export var x: typeof foo;
-               ~
-!!! Exported variable 'x' has or is using private name 'foo'.
+    ~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Cannot compile external modules unless the '--module' flag is provided.
     export var b = foo;
-               ~
-!!! Exported variable 'b' has or is using private name 'foo'.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/privacyCheckTypeOfFunction.js b/tests/baselines/reference/privacyCheckTypeOfFunction.js
deleted file mode 100644
index 757416c691b..00000000000
--- a/tests/baselines/reference/privacyCheckTypeOfFunction.js
+++ /dev/null
@@ -1,12 +0,0 @@
-//// [privacyCheckTypeOfFunction.ts]
-function foo() {
-}
-export var x: typeof foo;
-export var b = foo;
-
-
-//// [privacyCheckTypeOfFunction.js]
-function foo() {
-}
-exports.x;
-exports.b = foo;
diff --git a/tests/baselines/reference/privacyCheckTypeOfInvisibleModuleError.errors.txt b/tests/baselines/reference/privacyCheckTypeOfInvisibleModuleError.errors.txt
deleted file mode 100644
index e09c933ce4f..00000000000
--- a/tests/baselines/reference/privacyCheckTypeOfInvisibleModuleError.errors.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-==== tests/cases/compiler/privacyCheckTypeOfInvisibleModuleError.ts (1 errors) ====
-    module Outer {
-        module Inner {
-            export var m: typeof Inner;
-        }
-    
-        export var f: typeof Inner;
-                   ~
-!!! Exported variable 'f' has or is using private name 'Inner'.
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/privacyCheckTypeOfInvisibleModuleError.types b/tests/baselines/reference/privacyCheckTypeOfInvisibleModuleError.types
new file mode 100644
index 00000000000..c028c328245
--- /dev/null
+++ b/tests/baselines/reference/privacyCheckTypeOfInvisibleModuleError.types
@@ -0,0 +1,17 @@
+=== tests/cases/compiler/privacyCheckTypeOfInvisibleModuleError.ts ===
+module Outer {
+>Outer : typeof Outer
+
+    module Inner {
+>Inner : typeof Inner
+
+        export var m: typeof Inner;
+>m : typeof Inner
+>Inner : typeof Inner
+    }
+
+    export var f: typeof Inner;
+>f : typeof Inner
+>Inner : typeof Inner
+}
+
diff --git a/tests/baselines/reference/privacyClassExtendsClauseDeclFile.errors.txt b/tests/baselines/reference/privacyClassExtendsClauseDeclFile.errors.txt
deleted file mode 100644
index 598dead5154..00000000000
--- a/tests/baselines/reference/privacyClassExtendsClauseDeclFile.errors.txt
+++ /dev/null
@@ -1,106 +0,0 @@
-==== tests/cases/compiler/privacyClassExtendsClauseDeclFile_externalModule.ts (4 errors) ====
-    
-    export module publicModule {
-        export class publicClassInPublicModule {
-            private f1() {
-            }
-        }
-    
-        class privateClassInPublicModule {
-        }
-    
-        class privateClassExtendingPublicClassInModule extends publicClassInPublicModule {
-        }
-        class privateClassExtendingPrivateClassInModule extends privateClassInPublicModule {
-        }
-        export class publicClassExtendingPublicClassInModule extends publicClassInPublicModule {
-        }
-        export class publicClassExtendingPrivateClassInModule extends privateClassInPublicModule { // Should error
-                                                                      ~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Extends clause of exported class 'publicClassExtendingPrivateClassInModule' has or is using private name 'privateClassInPublicModule'.
-        }
-    
-        class privateClassExtendingFromPrivateModuleClass extends privateModule.publicClassInPrivateModule {
-        }
-        export class publicClassExtendingFromPrivateModuleClass extends privateModule.publicClassInPrivateModule { // Should error
-                                                                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Extends clause of exported class 'publicClassExtendingFromPrivateModuleClass' has or is using name 'privateModule.publicClassInPrivateModule' from private module 'privateModule'.
-        }
-    }
-    
-    module privateModule {
-        export class publicClassInPrivateModule {
-            private f1() {
-            }
-        }
-    
-        class privateClassInPrivateModule {
-        }
-    
-        class privateClassExtendingPublicClassInModule extends publicClassInPrivateModule {
-        }
-        class privateClassExtendingPrivateClassInModule extends privateClassInPrivateModule {
-        }
-        export class publicClassExtendingPublicClassInModule extends publicClassInPrivateModule {
-        }
-        export class publicClassExtendingPrivateClassInModule extends privateClassInPrivateModule { 
-        }
-    
-        class privateClassExtendingFromPrivateModuleClass extends privateModule.publicClassInPrivateModule {
-        }
-        export class publicClassExtendingFromPrivateModuleClass extends privateModule.publicClassInPrivateModule {
-        }
-    }
-    
-    export class publicClass {
-        private f1() {
-        }
-    }
-    
-    class privateClass {
-    }
-    
-    class privateClassExtendingPublicClass extends publicClass {
-    }
-    class privateClassExtendingPrivateClassInModule extends privateClass {
-    }
-    export class publicClassExtendingPublicClass extends publicClass {
-    }
-    export class publicClassExtendingPrivateClass extends privateClass { // Should error
-                                                          ~~~~~~~~~~~~
-!!! Extends clause of exported class 'publicClassExtendingPrivateClass' has or is using private name 'privateClass'.
-    }
-    
-    class privateClassExtendingFromPrivateModuleClass extends privateModule.publicClassInPrivateModule {
-    }
-    export class publicClassExtendingFromPrivateModuleClass extends privateModule.publicClassInPrivateModule { // Should error
-                                                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Extends clause of exported class 'publicClassExtendingFromPrivateModuleClass' has or is using name 'privateModule.publicClassInPrivateModule' from private module 'privateModule'.
-    }
-    
-==== tests/cases/compiler/privacyClassExtendsClauseDeclFile_GlobalFile.ts (1 errors) ====
-    module publicModuleInGlobal {
-        export class publicClassInPublicModule {
-            private f1() {
-            }
-        }
-    
-        class privateClassInPublicModule {
-        }
-    
-        class privateClassExtendingPublicClassInModule extends publicClassInPublicModule {
-        }
-        class privateClassExtendingPrivateClassInModule extends privateClassInPublicModule {
-        }
-        export class publicClassExtendingPublicClassInModule extends publicClassInPublicModule {
-        }
-        export class publicClassExtendingPrivateClassInModule extends privateClassInPublicModule { // Should error
-                                                                      ~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Extends clause of exported class 'publicClassExtendingPrivateClassInModule' has or is using private name 'privateClassInPublicModule'.
-        }
-    }
-    class publicClassInGlobal {
-    }
-    class publicClassExtendingPublicClassInGlobal extends publicClassInGlobal {
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/privacyClassExtendsClauseDeclFile.js b/tests/baselines/reference/privacyClassExtendsClauseDeclFile.js
deleted file mode 100644
index 77adca24aa6..00000000000
--- a/tests/baselines/reference/privacyClassExtendsClauseDeclFile.js
+++ /dev/null
@@ -1,351 +0,0 @@
-//// [tests/cases/compiler/privacyClassExtendsClauseDeclFile.ts] ////
-
-//// [privacyClassExtendsClauseDeclFile_externalModule.ts]
-
-export module publicModule {
-    export class publicClassInPublicModule {
-        private f1() {
-        }
-    }
-
-    class privateClassInPublicModule {
-    }
-
-    class privateClassExtendingPublicClassInModule extends publicClassInPublicModule {
-    }
-    class privateClassExtendingPrivateClassInModule extends privateClassInPublicModule {
-    }
-    export class publicClassExtendingPublicClassInModule extends publicClassInPublicModule {
-    }
-    export class publicClassExtendingPrivateClassInModule extends privateClassInPublicModule { // Should error
-    }
-
-    class privateClassExtendingFromPrivateModuleClass extends privateModule.publicClassInPrivateModule {
-    }
-    export class publicClassExtendingFromPrivateModuleClass extends privateModule.publicClassInPrivateModule { // Should error
-    }
-}
-
-module privateModule {
-    export class publicClassInPrivateModule {
-        private f1() {
-        }
-    }
-
-    class privateClassInPrivateModule {
-    }
-
-    class privateClassExtendingPublicClassInModule extends publicClassInPrivateModule {
-    }
-    class privateClassExtendingPrivateClassInModule extends privateClassInPrivateModule {
-    }
-    export class publicClassExtendingPublicClassInModule extends publicClassInPrivateModule {
-    }
-    export class publicClassExtendingPrivateClassInModule extends privateClassInPrivateModule { 
-    }
-
-    class privateClassExtendingFromPrivateModuleClass extends privateModule.publicClassInPrivateModule {
-    }
-    export class publicClassExtendingFromPrivateModuleClass extends privateModule.publicClassInPrivateModule {
-    }
-}
-
-export class publicClass {
-    private f1() {
-    }
-}
-
-class privateClass {
-}
-
-class privateClassExtendingPublicClass extends publicClass {
-}
-class privateClassExtendingPrivateClassInModule extends privateClass {
-}
-export class publicClassExtendingPublicClass extends publicClass {
-}
-export class publicClassExtendingPrivateClass extends privateClass { // Should error
-}
-
-class privateClassExtendingFromPrivateModuleClass extends privateModule.publicClassInPrivateModule {
-}
-export class publicClassExtendingFromPrivateModuleClass extends privateModule.publicClassInPrivateModule { // Should error
-}
-
-//// [privacyClassExtendsClauseDeclFile_GlobalFile.ts]
-module publicModuleInGlobal {
-    export class publicClassInPublicModule {
-        private f1() {
-        }
-    }
-
-    class privateClassInPublicModule {
-    }
-
-    class privateClassExtendingPublicClassInModule extends publicClassInPublicModule {
-    }
-    class privateClassExtendingPrivateClassInModule extends privateClassInPublicModule {
-    }
-    export class publicClassExtendingPublicClassInModule extends publicClassInPublicModule {
-    }
-    export class publicClassExtendingPrivateClassInModule extends privateClassInPublicModule { // Should error
-    }
-}
-class publicClassInGlobal {
-}
-class publicClassExtendingPublicClassInGlobal extends publicClassInGlobal {
-}
-
-
-//// [privacyClassExtendsClauseDeclFile_externalModule.js]
-var __extends = this.__extends || function (d, b) {
-    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
-    function __() { this.constructor = d; }
-    __.prototype = b.prototype;
-    d.prototype = new __();
-};
-(function (publicModule) {
-    var publicClassInPublicModule = (function () {
-        function publicClassInPublicModule() {
-        }
-        publicClassInPublicModule.prototype.f1 = function () {
-        };
-        return publicClassInPublicModule;
-    })();
-    publicModule.publicClassInPublicModule = publicClassInPublicModule;
-    var privateClassInPublicModule = (function () {
-        function privateClassInPublicModule() {
-        }
-        return privateClassInPublicModule;
-    })();
-    var privateClassExtendingPublicClassInModule = (function (_super) {
-        __extends(privateClassExtendingPublicClassInModule, _super);
-        function privateClassExtendingPublicClassInModule() {
-            _super.apply(this, arguments);
-        }
-        return privateClassExtendingPublicClassInModule;
-    })(publicClassInPublicModule);
-    var privateClassExtendingPrivateClassInModule = (function (_super) {
-        __extends(privateClassExtendingPrivateClassInModule, _super);
-        function privateClassExtendingPrivateClassInModule() {
-            _super.apply(this, arguments);
-        }
-        return privateClassExtendingPrivateClassInModule;
-    })(privateClassInPublicModule);
-    var publicClassExtendingPublicClassInModule = (function (_super) {
-        __extends(publicClassExtendingPublicClassInModule, _super);
-        function publicClassExtendingPublicClassInModule() {
-            _super.apply(this, arguments);
-        }
-        return publicClassExtendingPublicClassInModule;
-    })(publicClassInPublicModule);
-    publicModule.publicClassExtendingPublicClassInModule = publicClassExtendingPublicClassInModule;
-    var publicClassExtendingPrivateClassInModule = (function (_super) {
-        __extends(publicClassExtendingPrivateClassInModule, _super);
-        function publicClassExtendingPrivateClassInModule() {
-            _super.apply(this, arguments);
-        }
-        return publicClassExtendingPrivateClassInModule;
-    })(privateClassInPublicModule);
-    publicModule.publicClassExtendingPrivateClassInModule = publicClassExtendingPrivateClassInModule;
-    var privateClassExtendingFromPrivateModuleClass = (function (_super) {
-        __extends(privateClassExtendingFromPrivateModuleClass, _super);
-        function privateClassExtendingFromPrivateModuleClass() {
-            _super.apply(this, arguments);
-        }
-        return privateClassExtendingFromPrivateModuleClass;
-    })(privateModule.publicClassInPrivateModule);
-    var publicClassExtendingFromPrivateModuleClass = (function (_super) {
-        __extends(publicClassExtendingFromPrivateModuleClass, _super);
-        function publicClassExtendingFromPrivateModuleClass() {
-            _super.apply(this, arguments);
-        }
-        return publicClassExtendingFromPrivateModuleClass;
-    })(privateModule.publicClassInPrivateModule);
-    publicModule.publicClassExtendingFromPrivateModuleClass = publicClassExtendingFromPrivateModuleClass;
-})(exports.publicModule || (exports.publicModule = {}));
-var publicModule = exports.publicModule;
-var privateModule;
-(function (privateModule) {
-    var publicClassInPrivateModule = (function () {
-        function publicClassInPrivateModule() {
-        }
-        publicClassInPrivateModule.prototype.f1 = function () {
-        };
-        return publicClassInPrivateModule;
-    })();
-    privateModule.publicClassInPrivateModule = publicClassInPrivateModule;
-    var privateClassInPrivateModule = (function () {
-        function privateClassInPrivateModule() {
-        }
-        return privateClassInPrivateModule;
-    })();
-    var privateClassExtendingPublicClassInModule = (function (_super) {
-        __extends(privateClassExtendingPublicClassInModule, _super);
-        function privateClassExtendingPublicClassInModule() {
-            _super.apply(this, arguments);
-        }
-        return privateClassExtendingPublicClassInModule;
-    })(publicClassInPrivateModule);
-    var privateClassExtendingPrivateClassInModule = (function (_super) {
-        __extends(privateClassExtendingPrivateClassInModule, _super);
-        function privateClassExtendingPrivateClassInModule() {
-            _super.apply(this, arguments);
-        }
-        return privateClassExtendingPrivateClassInModule;
-    })(privateClassInPrivateModule);
-    var publicClassExtendingPublicClassInModule = (function (_super) {
-        __extends(publicClassExtendingPublicClassInModule, _super);
-        function publicClassExtendingPublicClassInModule() {
-            _super.apply(this, arguments);
-        }
-        return publicClassExtendingPublicClassInModule;
-    })(publicClassInPrivateModule);
-    privateModule.publicClassExtendingPublicClassInModule = publicClassExtendingPublicClassInModule;
-    var publicClassExtendingPrivateClassInModule = (function (_super) {
-        __extends(publicClassExtendingPrivateClassInModule, _super);
-        function publicClassExtendingPrivateClassInModule() {
-            _super.apply(this, arguments);
-        }
-        return publicClassExtendingPrivateClassInModule;
-    })(privateClassInPrivateModule);
-    privateModule.publicClassExtendingPrivateClassInModule = publicClassExtendingPrivateClassInModule;
-    var privateClassExtendingFromPrivateModuleClass = (function (_super) {
-        __extends(privateClassExtendingFromPrivateModuleClass, _super);
-        function privateClassExtendingFromPrivateModuleClass() {
-            _super.apply(this, arguments);
-        }
-        return privateClassExtendingFromPrivateModuleClass;
-    })(privateModule.publicClassInPrivateModule);
-    var publicClassExtendingFromPrivateModuleClass = (function (_super) {
-        __extends(publicClassExtendingFromPrivateModuleClass, _super);
-        function publicClassExtendingFromPrivateModuleClass() {
-            _super.apply(this, arguments);
-        }
-        return publicClassExtendingFromPrivateModuleClass;
-    })(privateModule.publicClassInPrivateModule);
-    privateModule.publicClassExtendingFromPrivateModuleClass = publicClassExtendingFromPrivateModuleClass;
-})(privateModule || (privateModule = {}));
-var publicClass = (function () {
-    function publicClass() {
-    }
-    publicClass.prototype.f1 = function () {
-    };
-    return publicClass;
-})();
-exports.publicClass = publicClass;
-var privateClass = (function () {
-    function privateClass() {
-    }
-    return privateClass;
-})();
-var privateClassExtendingPublicClass = (function (_super) {
-    __extends(privateClassExtendingPublicClass, _super);
-    function privateClassExtendingPublicClass() {
-        _super.apply(this, arguments);
-    }
-    return privateClassExtendingPublicClass;
-})(publicClass);
-var privateClassExtendingPrivateClassInModule = (function (_super) {
-    __extends(privateClassExtendingPrivateClassInModule, _super);
-    function privateClassExtendingPrivateClassInModule() {
-        _super.apply(this, arguments);
-    }
-    return privateClassExtendingPrivateClassInModule;
-})(privateClass);
-var publicClassExtendingPublicClass = (function (_super) {
-    __extends(publicClassExtendingPublicClass, _super);
-    function publicClassExtendingPublicClass() {
-        _super.apply(this, arguments);
-    }
-    return publicClassExtendingPublicClass;
-})(publicClass);
-exports.publicClassExtendingPublicClass = publicClassExtendingPublicClass;
-var publicClassExtendingPrivateClass = (function (_super) {
-    __extends(publicClassExtendingPrivateClass, _super);
-    function publicClassExtendingPrivateClass() {
-        _super.apply(this, arguments);
-    }
-    return publicClassExtendingPrivateClass;
-})(privateClass);
-exports.publicClassExtendingPrivateClass = publicClassExtendingPrivateClass;
-var privateClassExtendingFromPrivateModuleClass = (function (_super) {
-    __extends(privateClassExtendingFromPrivateModuleClass, _super);
-    function privateClassExtendingFromPrivateModuleClass() {
-        _super.apply(this, arguments);
-    }
-    return privateClassExtendingFromPrivateModuleClass;
-})(privateModule.publicClassInPrivateModule);
-var publicClassExtendingFromPrivateModuleClass = (function (_super) {
-    __extends(publicClassExtendingFromPrivateModuleClass, _super);
-    function publicClassExtendingFromPrivateModuleClass() {
-        _super.apply(this, arguments);
-    }
-    return publicClassExtendingFromPrivateModuleClass;
-})(privateModule.publicClassInPrivateModule);
-exports.publicClassExtendingFromPrivateModuleClass = publicClassExtendingFromPrivateModuleClass;
-//// [privacyClassExtendsClauseDeclFile_GlobalFile.js]
-var __extends = this.__extends || function (d, b) {
-    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
-    function __() { this.constructor = d; }
-    __.prototype = b.prototype;
-    d.prototype = new __();
-};
-var publicModuleInGlobal;
-(function (publicModuleInGlobal) {
-    var publicClassInPublicModule = (function () {
-        function publicClassInPublicModule() {
-        }
-        publicClassInPublicModule.prototype.f1 = function () {
-        };
-        return publicClassInPublicModule;
-    })();
-    publicModuleInGlobal.publicClassInPublicModule = publicClassInPublicModule;
-    var privateClassInPublicModule = (function () {
-        function privateClassInPublicModule() {
-        }
-        return privateClassInPublicModule;
-    })();
-    var privateClassExtendingPublicClassInModule = (function (_super) {
-        __extends(privateClassExtendingPublicClassInModule, _super);
-        function privateClassExtendingPublicClassInModule() {
-            _super.apply(this, arguments);
-        }
-        return privateClassExtendingPublicClassInModule;
-    })(publicClassInPublicModule);
-    var privateClassExtendingPrivateClassInModule = (function (_super) {
-        __extends(privateClassExtendingPrivateClassInModule, _super);
-        function privateClassExtendingPrivateClassInModule() {
-            _super.apply(this, arguments);
-        }
-        return privateClassExtendingPrivateClassInModule;
-    })(privateClassInPublicModule);
-    var publicClassExtendingPublicClassInModule = (function (_super) {
-        __extends(publicClassExtendingPublicClassInModule, _super);
-        function publicClassExtendingPublicClassInModule() {
-            _super.apply(this, arguments);
-        }
-        return publicClassExtendingPublicClassInModule;
-    })(publicClassInPublicModule);
-    publicModuleInGlobal.publicClassExtendingPublicClassInModule = publicClassExtendingPublicClassInModule;
-    var publicClassExtendingPrivateClassInModule = (function (_super) {
-        __extends(publicClassExtendingPrivateClassInModule, _super);
-        function publicClassExtendingPrivateClassInModule() {
-            _super.apply(this, arguments);
-        }
-        return publicClassExtendingPrivateClassInModule;
-    })(privateClassInPublicModule);
-    publicModuleInGlobal.publicClassExtendingPrivateClassInModule = publicClassExtendingPrivateClassInModule;
-})(publicModuleInGlobal || (publicModuleInGlobal = {}));
-var publicClassInGlobal = (function () {
-    function publicClassInGlobal() {
-    }
-    return publicClassInGlobal;
-})();
-var publicClassExtendingPublicClassInGlobal = (function (_super) {
-    __extends(publicClassExtendingPublicClassInGlobal, _super);
-    function publicClassExtendingPublicClassInGlobal() {
-        _super.apply(this, arguments);
-    }
-    return publicClassExtendingPublicClassInGlobal;
-})(publicClassInGlobal);
diff --git a/tests/baselines/reference/privacyClassImplementsClauseDeclFile.errors.txt b/tests/baselines/reference/privacyClassImplementsClauseDeclFile.errors.txt
deleted file mode 100644
index 61b5e199b07..00000000000
--- a/tests/baselines/reference/privacyClassImplementsClauseDeclFile.errors.txt
+++ /dev/null
@@ -1,105 +0,0 @@
-==== tests/cases/compiler/privacyClassImplementsClauseDeclFile_externalModule.ts (5 errors) ====
-    
-    export module publicModule {
-        export interface publicInterfaceInPublicModule {
-        }
-    
-        interface privateInterfaceInPublicModule {
-        }
-    
-        class privateClassImplementingPublicInterfaceInModule implements publicInterfaceInPublicModule {
-        }
-        class privateClassImplementingPrivateInterfaceInModule implements privateInterfaceInPublicModule {
-        }
-        export class publicClassImplementingPublicInterfaceInModule implements publicInterfaceInPublicModule {
-        }
-        export class publicClassImplementingPrivateInterfaceInModule implements privateInterfaceInPublicModule { // Should error
-                                                                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Implements clause of exported class 'publicClassImplementingPrivateInterfaceInModule' has or is using private name 'privateInterfaceInPublicModule'.
-        }
-    
-        class privateClassImplementingFromPrivateModuleInterface implements privateModule.publicInterfaceInPrivateModule {
-        }
-        export class publicClassImplementingFromPrivateModuleInterface implements privateModule.publicInterfaceInPrivateModule { // Should error
-                                                                                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Implements clause of exported class 'publicClassImplementingFromPrivateModuleInterface' has or is using name 'privateModule.publicInterfaceInPrivateModule' from private module 'privateModule'.
-        }
-    
-        export class publicClassImplementingPrivateAndPublicInterface implements privateInterfaceInPublicModule, publicInterfaceInPublicModule { // Should error
-                                                                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Implements clause of exported class 'publicClassImplementingPrivateAndPublicInterface' has or is using private name 'privateInterfaceInPublicModule'.
-        }
-    }
-    
-    module privateModule {
-        export interface publicInterfaceInPrivateModule {
-    
-        }
-    
-        interface privateInterfaceInPrivateModule {
-        }
-    
-        class privateClassImplementingPublicInterfaceInModule implements publicInterfaceInPrivateModule {
-        }
-        class privateClassImplementingPrivateInterfaceInModule implements privateInterfaceInPrivateModule {
-        }
-        export class publicClassImplementingPublicInterfaceInModule implements publicInterfaceInPrivateModule {
-        }
-        export class publicClassImplementingPrivateInterfaceInModule implements privateInterfaceInPrivateModule { 
-        }
-    
-        class privateClassImplementingFromPrivateModuleInterface implements privateModule.publicInterfaceInPrivateModule {
-        }
-        export class publicClassImplementingFromPrivateModuleInterface implements privateModule.publicInterfaceInPrivateModule {
-        }
-    }
-    
-    export interface publicInterface {
-    
-    }
-    
-    interface privateInterface {
-    }
-    
-    class privateClassImplementingPublicInterface implements publicInterface {
-    }
-    class privateClassImplementingPrivateInterfaceInModule implements privateInterface {
-    }
-    export class publicClassImplementingPublicInterface implements publicInterface {
-    }
-    export class publicClassImplementingPrivateInterface implements privateInterface { // Should error
-                                                                    ~~~~~~~~~~~~~~~~
-!!! Implements clause of exported class 'publicClassImplementingPrivateInterface' has or is using private name 'privateInterface'.
-    }
-    
-    class privateClassImplementingFromPrivateModuleInterface implements privateModule.publicInterfaceInPrivateModule {
-    }
-    export class publicClassImplementingFromPrivateModuleInterface implements privateModule.publicInterfaceInPrivateModule { // Should error
-                                                                              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Implements clause of exported class 'publicClassImplementingFromPrivateModuleInterface' has or is using name 'privateModule.publicInterfaceInPrivateModule' from private module 'privateModule'.
-    }
-    
-==== tests/cases/compiler/privacyClassImplementsClauseDeclFile_GlobalFile.ts (1 errors) ====
-    module publicModuleInGlobal {
-        export interface publicInterfaceInPublicModule {
-        }
-    
-        interface privateInterfaceInPublicModule {
-        }
-    
-        class privateClassImplementingPublicInterfaceInModule implements publicInterfaceInPublicModule {
-        }
-        class privateClassImplementingPrivateInterfaceInModule implements privateInterfaceInPublicModule {
-        }
-        export class publicClassImplementingPublicInterfaceInModule implements publicInterfaceInPublicModule {
-        }
-        export class publicClassImplementingPrivateInterfaceInModule implements privateInterfaceInPublicModule { // Should error
-                                                                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Implements clause of exported class 'publicClassImplementingPrivateInterfaceInModule' has or is using private name 'privateInterfaceInPublicModule'.
-        }
-    }
-    interface publicInterfaceInGlobal {
-    }
-    class publicClassImplementingPublicInterfaceInGlobal implements publicInterfaceInGlobal {
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/privacyClassImplementsClauseDeclFile.js b/tests/baselines/reference/privacyClassImplementsClauseDeclFile.js
deleted file mode 100644
index d4a1ffafd53..00000000000
--- a/tests/baselines/reference/privacyClassImplementsClauseDeclFile.js
+++ /dev/null
@@ -1,239 +0,0 @@
-//// [tests/cases/compiler/privacyClassImplementsClauseDeclFile.ts] ////
-
-//// [privacyClassImplementsClauseDeclFile_externalModule.ts]
-
-export module publicModule {
-    export interface publicInterfaceInPublicModule {
-    }
-
-    interface privateInterfaceInPublicModule {
-    }
-
-    class privateClassImplementingPublicInterfaceInModule implements publicInterfaceInPublicModule {
-    }
-    class privateClassImplementingPrivateInterfaceInModule implements privateInterfaceInPublicModule {
-    }
-    export class publicClassImplementingPublicInterfaceInModule implements publicInterfaceInPublicModule {
-    }
-    export class publicClassImplementingPrivateInterfaceInModule implements privateInterfaceInPublicModule { // Should error
-    }
-
-    class privateClassImplementingFromPrivateModuleInterface implements privateModule.publicInterfaceInPrivateModule {
-    }
-    export class publicClassImplementingFromPrivateModuleInterface implements privateModule.publicInterfaceInPrivateModule { // Should error
-    }
-
-    export class publicClassImplementingPrivateAndPublicInterface implements privateInterfaceInPublicModule, publicInterfaceInPublicModule { // Should error
-    }
-}
-
-module privateModule {
-    export interface publicInterfaceInPrivateModule {
-
-    }
-
-    interface privateInterfaceInPrivateModule {
-    }
-
-    class privateClassImplementingPublicInterfaceInModule implements publicInterfaceInPrivateModule {
-    }
-    class privateClassImplementingPrivateInterfaceInModule implements privateInterfaceInPrivateModule {
-    }
-    export class publicClassImplementingPublicInterfaceInModule implements publicInterfaceInPrivateModule {
-    }
-    export class publicClassImplementingPrivateInterfaceInModule implements privateInterfaceInPrivateModule { 
-    }
-
-    class privateClassImplementingFromPrivateModuleInterface implements privateModule.publicInterfaceInPrivateModule {
-    }
-    export class publicClassImplementingFromPrivateModuleInterface implements privateModule.publicInterfaceInPrivateModule {
-    }
-}
-
-export interface publicInterface {
-
-}
-
-interface privateInterface {
-}
-
-class privateClassImplementingPublicInterface implements publicInterface {
-}
-class privateClassImplementingPrivateInterfaceInModule implements privateInterface {
-}
-export class publicClassImplementingPublicInterface implements publicInterface {
-}
-export class publicClassImplementingPrivateInterface implements privateInterface { // Should error
-}
-
-class privateClassImplementingFromPrivateModuleInterface implements privateModule.publicInterfaceInPrivateModule {
-}
-export class publicClassImplementingFromPrivateModuleInterface implements privateModule.publicInterfaceInPrivateModule { // Should error
-}
-
-//// [privacyClassImplementsClauseDeclFile_GlobalFile.ts]
-module publicModuleInGlobal {
-    export interface publicInterfaceInPublicModule {
-    }
-
-    interface privateInterfaceInPublicModule {
-    }
-
-    class privateClassImplementingPublicInterfaceInModule implements publicInterfaceInPublicModule {
-    }
-    class privateClassImplementingPrivateInterfaceInModule implements privateInterfaceInPublicModule {
-    }
-    export class publicClassImplementingPublicInterfaceInModule implements publicInterfaceInPublicModule {
-    }
-    export class publicClassImplementingPrivateInterfaceInModule implements privateInterfaceInPublicModule { // Should error
-    }
-}
-interface publicInterfaceInGlobal {
-}
-class publicClassImplementingPublicInterfaceInGlobal implements publicInterfaceInGlobal {
-}
-
-
-//// [privacyClassImplementsClauseDeclFile_externalModule.js]
-(function (publicModule) {
-    var privateClassImplementingPublicInterfaceInModule = (function () {
-        function privateClassImplementingPublicInterfaceInModule() {
-        }
-        return privateClassImplementingPublicInterfaceInModule;
-    })();
-    var privateClassImplementingPrivateInterfaceInModule = (function () {
-        function privateClassImplementingPrivateInterfaceInModule() {
-        }
-        return privateClassImplementingPrivateInterfaceInModule;
-    })();
-    var publicClassImplementingPublicInterfaceInModule = (function () {
-        function publicClassImplementingPublicInterfaceInModule() {
-        }
-        return publicClassImplementingPublicInterfaceInModule;
-    })();
-    publicModule.publicClassImplementingPublicInterfaceInModule = publicClassImplementingPublicInterfaceInModule;
-    var publicClassImplementingPrivateInterfaceInModule = (function () {
-        function publicClassImplementingPrivateInterfaceInModule() {
-        }
-        return publicClassImplementingPrivateInterfaceInModule;
-    })();
-    publicModule.publicClassImplementingPrivateInterfaceInModule = publicClassImplementingPrivateInterfaceInModule;
-    var privateClassImplementingFromPrivateModuleInterface = (function () {
-        function privateClassImplementingFromPrivateModuleInterface() {
-        }
-        return privateClassImplementingFromPrivateModuleInterface;
-    })();
-    var publicClassImplementingFromPrivateModuleInterface = (function () {
-        function publicClassImplementingFromPrivateModuleInterface() {
-        }
-        return publicClassImplementingFromPrivateModuleInterface;
-    })();
-    publicModule.publicClassImplementingFromPrivateModuleInterface = publicClassImplementingFromPrivateModuleInterface;
-    var publicClassImplementingPrivateAndPublicInterface = (function () {
-        function publicClassImplementingPrivateAndPublicInterface() {
-        }
-        return publicClassImplementingPrivateAndPublicInterface;
-    })();
-    publicModule.publicClassImplementingPrivateAndPublicInterface = publicClassImplementingPrivateAndPublicInterface;
-})(exports.publicModule || (exports.publicModule = {}));
-var publicModule = exports.publicModule;
-var privateModule;
-(function (privateModule) {
-    var privateClassImplementingPublicInterfaceInModule = (function () {
-        function privateClassImplementingPublicInterfaceInModule() {
-        }
-        return privateClassImplementingPublicInterfaceInModule;
-    })();
-    var privateClassImplementingPrivateInterfaceInModule = (function () {
-        function privateClassImplementingPrivateInterfaceInModule() {
-        }
-        return privateClassImplementingPrivateInterfaceInModule;
-    })();
-    var publicClassImplementingPublicInterfaceInModule = (function () {
-        function publicClassImplementingPublicInterfaceInModule() {
-        }
-        return publicClassImplementingPublicInterfaceInModule;
-    })();
-    privateModule.publicClassImplementingPublicInterfaceInModule = publicClassImplementingPublicInterfaceInModule;
-    var publicClassImplementingPrivateInterfaceInModule = (function () {
-        function publicClassImplementingPrivateInterfaceInModule() {
-        }
-        return publicClassImplementingPrivateInterfaceInModule;
-    })();
-    privateModule.publicClassImplementingPrivateInterfaceInModule = publicClassImplementingPrivateInterfaceInModule;
-    var privateClassImplementingFromPrivateModuleInterface = (function () {
-        function privateClassImplementingFromPrivateModuleInterface() {
-        }
-        return privateClassImplementingFromPrivateModuleInterface;
-    })();
-    var publicClassImplementingFromPrivateModuleInterface = (function () {
-        function publicClassImplementingFromPrivateModuleInterface() {
-        }
-        return publicClassImplementingFromPrivateModuleInterface;
-    })();
-    privateModule.publicClassImplementingFromPrivateModuleInterface = publicClassImplementingFromPrivateModuleInterface;
-})(privateModule || (privateModule = {}));
-var privateClassImplementingPublicInterface = (function () {
-    function privateClassImplementingPublicInterface() {
-    }
-    return privateClassImplementingPublicInterface;
-})();
-var privateClassImplementingPrivateInterfaceInModule = (function () {
-    function privateClassImplementingPrivateInterfaceInModule() {
-    }
-    return privateClassImplementingPrivateInterfaceInModule;
-})();
-var publicClassImplementingPublicInterface = (function () {
-    function publicClassImplementingPublicInterface() {
-    }
-    return publicClassImplementingPublicInterface;
-})();
-exports.publicClassImplementingPublicInterface = publicClassImplementingPublicInterface;
-var publicClassImplementingPrivateInterface = (function () {
-    function publicClassImplementingPrivateInterface() {
-    }
-    return publicClassImplementingPrivateInterface;
-})();
-exports.publicClassImplementingPrivateInterface = publicClassImplementingPrivateInterface;
-var privateClassImplementingFromPrivateModuleInterface = (function () {
-    function privateClassImplementingFromPrivateModuleInterface() {
-    }
-    return privateClassImplementingFromPrivateModuleInterface;
-})();
-var publicClassImplementingFromPrivateModuleInterface = (function () {
-    function publicClassImplementingFromPrivateModuleInterface() {
-    }
-    return publicClassImplementingFromPrivateModuleInterface;
-})();
-exports.publicClassImplementingFromPrivateModuleInterface = publicClassImplementingFromPrivateModuleInterface;
-//// [privacyClassImplementsClauseDeclFile_GlobalFile.js]
-var publicModuleInGlobal;
-(function (publicModuleInGlobal) {
-    var privateClassImplementingPublicInterfaceInModule = (function () {
-        function privateClassImplementingPublicInterfaceInModule() {
-        }
-        return privateClassImplementingPublicInterfaceInModule;
-    })();
-    var privateClassImplementingPrivateInterfaceInModule = (function () {
-        function privateClassImplementingPrivateInterfaceInModule() {
-        }
-        return privateClassImplementingPrivateInterfaceInModule;
-    })();
-    var publicClassImplementingPublicInterfaceInModule = (function () {
-        function publicClassImplementingPublicInterfaceInModule() {
-        }
-        return publicClassImplementingPublicInterfaceInModule;
-    })();
-    publicModuleInGlobal.publicClassImplementingPublicInterfaceInModule = publicClassImplementingPublicInterfaceInModule;
-    var publicClassImplementingPrivateInterfaceInModule = (function () {
-        function publicClassImplementingPrivateInterfaceInModule() {
-        }
-        return publicClassImplementingPrivateInterfaceInModule;
-    })();
-    publicModuleInGlobal.publicClassImplementingPrivateInterfaceInModule = publicClassImplementingPrivateInterfaceInModule;
-})(publicModuleInGlobal || (publicModuleInGlobal = {}));
-var publicClassImplementingPublicInterfaceInGlobal = (function () {
-    function publicClassImplementingPublicInterfaceInGlobal() {
-    }
-    return publicClassImplementingPublicInterfaceInGlobal;
-})();
diff --git a/tests/baselines/reference/privacyFunc.types b/tests/baselines/reference/privacyFunc.types
index e43a5c0102a..367a5213a3a 100644
--- a/tests/baselines/reference/privacyFunc.types
+++ b/tests/baselines/reference/privacyFunc.types
@@ -267,32 +267,32 @@ module m1 {
     }
 
     function f1_public(m1_f1_arg: C1_public) {
->f1_public : (m1_f1_arg: C1_public) => void
+>f1_public : typeof f1_public
 >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
+>f2_public : typeof f2_public
 >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
+>f3_public : typeof f3_public
 >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
+>f4_public : typeof f4_public
 >m1_f4_arg : C2_private
 >C2_private : C2_private
     }
 
 
     function f5_public() {
->f5_public : () => C1_public
+>f5_public : typeof f5_public
 
         return new C1_public();
 >new C1_public() : C1_public
@@ -300,7 +300,7 @@ module m1 {
     }
 
     export function f6_public() {
->f6_public : () => C1_public
+>f6_public : typeof f6_public
 
         return new C1_public();
 >new C1_public() : C1_public
@@ -308,7 +308,7 @@ module m1 {
     }
 
     function f7_public() {
->f7_public : () => C2_private
+>f7_public : typeof f7_public
 
         return new C2_private();
 >new C2_private() : C2_private
@@ -316,7 +316,7 @@ module m1 {
     }
 
     export function f8_public() {
->f8_public : () => C2_private
+>f8_public : typeof f8_public
 
         return new C2_private();  // error
 >new C2_private() : C2_private
@@ -325,7 +325,7 @@ module m1 {
 
 
     function f9_private(): C1_public {
->f9_private : () => C1_public
+>f9_private : typeof f9_private
 >C1_public : C1_public
 
         return new C1_public();
@@ -334,7 +334,7 @@ module m1 {
     }
 
     export function f10_public(): C1_public {
->f10_public : () => C1_public
+>f10_public : typeof f10_public
 >C1_public : C1_public
 
         return new C1_public();
@@ -343,7 +343,7 @@ module m1 {
     }
 
     function f11_private(): C2_private {
->f11_private : () => C2_private
+>f11_private : typeof f11_private
 >C2_private : C2_private
 
         return new C2_private();
@@ -352,7 +352,7 @@ module m1 {
     }
 
     export function f12_public(): C2_private { // error
->f12_public : () => C2_private
+>f12_public : typeof f12_public
 >C2_private : C2_private
 
         return new C2_private(); //error
@@ -433,7 +433,7 @@ class C9_public {
   
 
 function f4_public(f4_arg: C6_public) {
->f4_public : (f4_arg: C6_public) => void
+>f4_public : typeof f4_public
 >f4_arg : C6_public
 >C6_public : C6_public
 }
@@ -441,7 +441,7 @@ function f4_public(f4_arg: C6_public) {
 
 
 function f6_public() {
->f6_public : () => C6_public
+>f6_public : typeof f6_public
 
     return new C6_public();
 >new C6_public() : C6_public
@@ -450,7 +450,7 @@ function f6_public() {
 
 
 function f10_public(): C6_public {
->f10_public : () => C6_public
+>f10_public : typeof f10_public
 >C6_public : C6_public
 
     return new C6_public();
diff --git a/tests/baselines/reference/privacyFunctionCannotNameParameterTypeDeclFile.errors.txt b/tests/baselines/reference/privacyFunctionCannotNameParameterTypeDeclFile.errors.txt
deleted file mode 100644
index 269be5ed425..00000000000
--- a/tests/baselines/reference/privacyFunctionCannotNameParameterTypeDeclFile.errors.txt
+++ /dev/null
@@ -1,203 +0,0 @@
-==== tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_consumer.ts (24 errors) ====
-    import exporter = require("privacyFunctionCannotNameParameterTypeDeclFile_exporter");
-    export class publicClassWithWithPrivateParmeterTypes {
-        static myPublicStaticMethod(param = exporter.createExportedWidget1()) { // Error
-                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Parameter 'param' of public static method from exported class has or is using name 'Widget1' from external module "tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_Widgets" but cannot be named.
-        }
-        private static myPrivateStaticMethod(param = exporter.createExportedWidget1()) {
-        }
-        myPublicMethod(param  = exporter.createExportedWidget1()) { // Error
-                       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Parameter 'param' of public method from exported class has or is using name 'Widget1' from external module "tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_Widgets" but cannot be named.
-        }
-        private myPrivateMethod(param = exporter.createExportedWidget1()) {
-        }
-        constructor(param = exporter.createExportedWidget1(), private param1 = exporter.createExportedWidget1(), public param2 = exporter.createExportedWidget1()) { // Error
-                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Parameter 'param' of constructor from exported class has or is using name 'Widget1' from external module "tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_Widgets" but cannot be named.
-                                                              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Parameter 'param1' of constructor from exported class has or is using name 'Widget1' from external module "tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_Widgets" but cannot be named.
-                                                                                                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Parameter 'param2' of constructor from exported class has or is using name 'Widget1' from external module "tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_Widgets" but cannot be named.
-        }
-    }
-    export class publicClassWithWithPrivateParmeterTypes1 {
-        static myPublicStaticMethod(param = exporter.createExportedWidget3()) { // Error
-                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Parameter 'param' of public static method from exported class has or is using name 'Widget3' from external module "GlobalWidgets" but cannot be named.
-        }
-        private static myPrivateStaticMethod(param = exporter.createExportedWidget3()) {
-        }
-        myPublicMethod(param  = exporter.createExportedWidget3()) { // Error
-                       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Parameter 'param' of public method from exported class has or is using name 'Widget3' from external module "GlobalWidgets" but cannot be named.
-        }
-        private myPrivateMethod(param = exporter.createExportedWidget3()) {
-        }
-        constructor(param = exporter.createExportedWidget3(), private param1 = exporter.createExportedWidget3(), public param2 = exporter.createExportedWidget3()) { // Error
-                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Parameter 'param' of constructor from exported class has or is using name 'Widget3' from external module "GlobalWidgets" but cannot be named.
-                                                              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Parameter 'param1' of constructor from exported class has or is using name 'Widget3' from external module "GlobalWidgets" but cannot be named.
-                                                                                                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Parameter 'param2' of constructor from exported class has or is using name 'Widget3' from external module "GlobalWidgets" but cannot be named.
-        }
-    }
-    
-    class privateClassWithWithPrivateParmeterTypes {
-        static myPublicStaticMethod(param = exporter.createExportedWidget1()) {
-        }
-        private static myPrivateStaticMethod(param = exporter.createExportedWidget1()) {
-        }
-        myPublicMethod(param  = exporter.createExportedWidget1()) {
-        }
-        private myPrivateMethod(param = exporter.createExportedWidget1()) {
-        }
-        constructor(param = exporter.createExportedWidget1(), private param1 = exporter.createExportedWidget1(), public param2 = exporter.createExportedWidget1()) {
-        }
-    }
-    class privateClassWithWithPrivateParmeterTypes2 {
-        static myPublicStaticMethod(param = exporter.createExportedWidget3()) {
-        }
-        private static myPrivateStaticMethod(param = exporter.createExportedWidget3()) {
-        }
-        myPublicMethod(param  = exporter.createExportedWidget3()) {
-        }
-        private myPrivateMethod(param = exporter.createExportedWidget3()) {
-        }
-        constructor(param = exporter.createExportedWidget3(), private param1 = exporter.createExportedWidget3(), public param2 = exporter.createExportedWidget3()) {
-        }
-    }
-    
-    export function publicFunctionWithPrivateParmeterTypes(param = exporter.createExportedWidget1()) { // Error
-                                                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Parameter 'param' of exported function has or is using name 'Widget1' from external module "tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_Widgets" but cannot be named.
-    }
-    function privateFunctionWithPrivateParmeterTypes(param = exporter.createExportedWidget1()) {
-    }
-    export function publicFunctionWithPrivateParmeterTypes1(param = exporter.createExportedWidget3()) { // Error
-                                                            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Parameter 'param' of exported function has or is using name 'Widget3' from external module "GlobalWidgets" but cannot be named.
-    }
-    function privateFunctionWithPrivateParmeterTypes1(param = exporter.createExportedWidget3()) {
-    }
-    
-    
-    export class publicClassWithPrivateModuleParameterTypes {
-        static myPublicStaticMethod(param= exporter.createExportedWidget2()) { // Error
-                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Parameter 'param' of public static method from exported class has or is using name 'SpecializedWidget.Widget2' from external module "tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_Widgets" but cannot be named.
-        }
-        myPublicMethod(param= exporter.createExportedWidget2()) { // Error
-                       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Parameter 'param' of public method from exported class has or is using name 'SpecializedWidget.Widget2' from external module "tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_Widgets" but cannot be named.
-        }
-        constructor(param= exporter.createExportedWidget2(), private param1= exporter.createExportedWidget2(), public param2= exporter.createExportedWidget2()) { // Error
-                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Parameter 'param' of constructor from exported class has or is using name 'SpecializedWidget.Widget2' from external module "tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_Widgets" but cannot be named.
-                                                             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Parameter 'param1' of constructor from exported class has or is using name 'SpecializedWidget.Widget2' from external module "tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_Widgets" but cannot be named.
-                                                                                                               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Parameter 'param2' of constructor from exported class has or is using name 'SpecializedWidget.Widget2' from external module "tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_Widgets" but cannot be named.
-        }
-    }
-    export class publicClassWithPrivateModuleParameterTypes2 {
-        static myPublicStaticMethod(param= exporter.createExportedWidget4()) { // Error
-                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Parameter 'param' of public static method from exported class has or is using name 'SpecializedGlobalWidget.Widget4' from external module "GlobalWidgets" but cannot be named.
-        }
-        myPublicMethod(param= exporter.createExportedWidget4()) { // Error
-                       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Parameter 'param' of public method from exported class has or is using name 'SpecializedGlobalWidget.Widget4' from external module "GlobalWidgets" but cannot be named.
-        }
-        constructor(param= exporter.createExportedWidget4(), private param1= exporter.createExportedWidget4(), public param2= exporter.createExportedWidget4()) { // Error
-                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Parameter 'param' of constructor from exported class has or is using name 'SpecializedGlobalWidget.Widget4' from external module "GlobalWidgets" but cannot be named.
-                                                             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Parameter 'param1' of constructor from exported class has or is using name 'SpecializedGlobalWidget.Widget4' from external module "GlobalWidgets" but cannot be named.
-                                                                                                               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Parameter 'param2' of constructor from exported class has or is using name 'SpecializedGlobalWidget.Widget4' from external module "GlobalWidgets" but cannot be named.
-        }
-    }
-    export function publicFunctionWithPrivateModuleParameterTypes(param= exporter.createExportedWidget2()) { // Error
-                                                                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Parameter 'param' of exported function has or is using name 'SpecializedWidget.Widget2' from external module "tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_Widgets" but cannot be named.
-    }
-    export function publicFunctionWithPrivateModuleParameterTypes1(param= exporter.createExportedWidget4()) { // Error
-                                                                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Parameter 'param' of exported function has or is using name 'SpecializedGlobalWidget.Widget4' from external module "GlobalWidgets" but cannot be named.
-    }
-    
-    
-    class privateClassWithPrivateModuleParameterTypes {
-        static myPublicStaticMethod(param= exporter.createExportedWidget2()) {
-        }
-        myPublicMethod(param= exporter.createExportedWidget2()) {
-        }
-        constructor(param= exporter.createExportedWidget2(), private param1= exporter.createExportedWidget2(), public param2= exporter.createExportedWidget2()) {
-        }
-    }
-    class privateClassWithPrivateModuleParameterTypes1 {
-        static myPublicStaticMethod(param= exporter.createExportedWidget4()) {
-        }
-        myPublicMethod(param= exporter.createExportedWidget4()) {
-        }
-        constructor(param= exporter.createExportedWidget4(), private param1= exporter.createExportedWidget4(), public param2= exporter.createExportedWidget4()) {
-        }
-    }
-    function privateFunctionWithPrivateModuleParameterTypes(param= exporter.createExportedWidget2()) {
-    }
-    function privateFunctionWithPrivateModuleParameterTypes1(param= exporter.createExportedWidget4()) {
-    }
-==== tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_GlobalWidgets.ts (0 errors) ====
-    
-    
-    declare module "GlobalWidgets" {
-        export class Widget3 {
-            name: string;
-        }
-        export function createWidget3(): Widget3;
-    
-        export module SpecializedGlobalWidget {
-            export class Widget4 {
-                name: string;
-            }
-            function createWidget4(): Widget4;
-        }
-    }
-    
-==== tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_Widgets.ts (0 errors) ====
-    export class Widget1 {
-        name = 'one';
-    }
-    export function createWidget1() {
-        return new Widget1();
-    }
-    
-    export module SpecializedWidget {
-        export class Widget2 {
-            name = 'one';
-        }
-        export function createWidget2() {
-            return new Widget2();
-        }
-    }
-    
-==== tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_exporter.ts (0 errors) ====
-    ///<reference path='privacyFunctionCannotNameParameterTypeDeclFile_GlobalWidgets.ts'/>
-    import Widgets = require("privacyFunctionCannotNameParameterTypeDeclFile_Widgets");
-    import Widgets1 = require("GlobalWidgets");
-    export function createExportedWidget1() {
-        return Widgets.createWidget1();
-    }
-    export function createExportedWidget2() {
-        return Widgets.SpecializedWidget.createWidget2();
-    }
-    export function createExportedWidget3() {
-        return Widgets1.createWidget3();
-    }
-    export function createExportedWidget4() {
-        return Widgets1.SpecializedGlobalWidget.createWidget4();
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/privacyFunctionCannotNameReturnTypeDeclFile.errors.txt b/tests/baselines/reference/privacyFunctionCannotNameReturnTypeDeclFile.errors.txt
deleted file mode 100644
index 834e3d783c6..00000000000
--- a/tests/baselines/reference/privacyFunctionCannotNameReturnTypeDeclFile.errors.txt
+++ /dev/null
@@ -1,186 +0,0 @@
-==== tests/cases/compiler/privacyFunctionReturnTypeDeclFile_consumer.ts (12 errors) ====
-    import exporter = require("privacyFunctionReturnTypeDeclFile_exporter");
-    export class publicClassWithWithPrivateParmeterTypes {
-        static myPublicStaticMethod() { // Error
-               ~~~~~~~~~~~~~~~~~~~~
-!!! Return type of public static method from exported class has or is using name 'Widget1' from external module "tests/cases/compiler/privacyFunctionReturnTypeDeclFile_Widgets" but cannot be named.
-            return exporter.createExportedWidget1();
-        }
-        private static myPrivateStaticMethod() {
-            return exporter.createExportedWidget1();;
-        }
-        myPublicMethod() { // Error
-        ~~~~~~~~~~~~~~
-!!! Return type of public method from exported class has or is using name 'Widget1' from external module "tests/cases/compiler/privacyFunctionReturnTypeDeclFile_Widgets" but cannot be named.
-            return exporter.createExportedWidget1();;
-        }
-        private myPrivateMethod() {
-            return exporter.createExportedWidget1();;
-        }
-        static myPublicStaticMethod1() { // Error
-               ~~~~~~~~~~~~~~~~~~~~~
-!!! Return type of public static method from exported class has or is using name 'Widget3' from external module "GlobalWidgets" but cannot be named.
-            return exporter.createExportedWidget3();
-        }
-        private static myPrivateStaticMethod1() {
-            return exporter.createExportedWidget3();;
-        }
-        myPublicMethod1() { // Error
-        ~~~~~~~~~~~~~~~
-!!! Return type of public method from exported class has or is using name 'Widget3' from external module "GlobalWidgets" but cannot be named.
-            return exporter.createExportedWidget3();;
-        }
-        private myPrivateMethod1() {
-            return exporter.createExportedWidget3();;
-        }
-    }
-    
-    class privateClassWithWithPrivateParmeterTypes {
-        static myPublicStaticMethod() { 
-            return exporter.createExportedWidget1();
-        }
-        private static myPrivateStaticMethod() {
-            return exporter.createExportedWidget1();;
-        }
-        myPublicMethod() { 
-            return exporter.createExportedWidget1();;
-        }
-        private myPrivateMethod() {
-            return exporter.createExportedWidget1();;
-        }
-        static myPublicStaticMethod1() { 
-            return exporter.createExportedWidget3();
-        }
-        private static myPrivateStaticMethod1() {
-            return exporter.createExportedWidget3();;
-        }
-        myPublicMethod1() { 
-            return exporter.createExportedWidget3();;
-        }
-        private myPrivateMethod1() {
-            return exporter.createExportedWidget3();;
-        }
-    }
-    
-    export function publicFunctionWithPrivateParmeterTypes() { // Error
-                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Return type of exported function has or is using name 'Widget1' from external module "tests/cases/compiler/privacyFunctionReturnTypeDeclFile_Widgets" but cannot be named.
-        return exporter.createExportedWidget1();
-    }
-    function privateFunctionWithPrivateParmeterTypes()   {
-        return exporter.createExportedWidget1();
-    }
-    export function publicFunctionWithPrivateParmeterTypes1() { // Error
-                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Return type of exported function has or is using name 'Widget3' from external module "GlobalWidgets" but cannot be named.
-        return exporter.createExportedWidget3();
-    }
-    function privateFunctionWithPrivateParmeterTypes1() {
-        return exporter.createExportedWidget3();
-    }
-    
-    export class publicClassWithPrivateModuleReturnTypes {
-        static myPublicStaticMethod() { // Error
-               ~~~~~~~~~~~~~~~~~~~~
-!!! Return type of public static method from exported class has or is using name 'SpecializedWidget.Widget2' from external module "tests/cases/compiler/privacyFunctionReturnTypeDeclFile_Widgets" but cannot be named.
-            return exporter.createExportedWidget2();
-        }
-        myPublicMethod() { // Error
-        ~~~~~~~~~~~~~~
-!!! Return type of public method from exported class has or is using name 'SpecializedWidget.Widget2' from external module "tests/cases/compiler/privacyFunctionReturnTypeDeclFile_Widgets" but cannot be named.
-            return exporter.createExportedWidget2();
-        }
-        static myPublicStaticMethod1() { // Error
-               ~~~~~~~~~~~~~~~~~~~~~
-!!! Return type of public static method from exported class has or is using name 'SpecializedGlobalWidget.Widget4' from external module "GlobalWidgets" but cannot be named.
-            return exporter.createExportedWidget4();
-        }
-        myPublicMethod1() { // Error
-        ~~~~~~~~~~~~~~~
-!!! Return type of public method from exported class has or is using name 'SpecializedGlobalWidget.Widget4' from external module "GlobalWidgets" but cannot be named.
-            return exporter.createExportedWidget4();
-        }
-    }
-    export function publicFunctionWithPrivateModuleReturnTypes() { // Error
-                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Return type of exported function has or is using name 'SpecializedWidget.Widget2' from external module "tests/cases/compiler/privacyFunctionReturnTypeDeclFile_Widgets" but cannot be named.
-        return exporter.createExportedWidget2();
-    }
-    export function publicFunctionWithPrivateModuleReturnTypes1() { // Error
-                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Return type of exported function has or is using name 'SpecializedGlobalWidget.Widget4' from external module "GlobalWidgets" but cannot be named.
-        return exporter.createExportedWidget4();
-    }
-    
-    class privateClassWithPrivateModuleReturnTypes {
-        static myPublicStaticMethod() { 
-            return exporter.createExportedWidget2();
-        }
-        myPublicMethod() { 
-            return exporter.createExportedWidget2();
-        }
-        static myPublicStaticMethod1() { // Error
-            return exporter.createExportedWidget4();
-        }
-        myPublicMethod1() { // Error
-            return exporter.createExportedWidget4();
-        }
-    }
-    function privateFunctionWithPrivateModuleReturnTypes() { 
-        return exporter.createExportedWidget2();
-    }
-    function privateFunctionWithPrivateModuleReturnTypes1() {
-        return exporter.createExportedWidget4();
-    }
-    
-==== tests/cases/compiler/privacyFunctionReturnTypeDeclFile_GlobalWidgets.ts (0 errors) ====
-    
-    
-    declare module "GlobalWidgets" {
-        export class Widget3 {
-            name: string;
-        }
-        export function createWidget3(): Widget3;
-    
-        export module SpecializedGlobalWidget {
-            export class Widget4 {
-                name: string;
-            }
-            function createWidget4(): Widget4;
-        }
-    }
-    
-==== tests/cases/compiler/privacyFunctionReturnTypeDeclFile_Widgets.ts (0 errors) ====
-    export class Widget1 {
-        name = 'one';
-    }
-    export function createWidget1() {
-        return new Widget1();
-    }
-    
-    export module SpecializedWidget {
-        export class Widget2 {
-            name = 'one';
-        }
-        export function createWidget2() {
-            return new Widget2();
-        }
-    }
-    
-==== tests/cases/compiler/privacyFunctionReturnTypeDeclFile_exporter.ts (0 errors) ====
-    ///<reference path='privacyFunctionReturnTypeDeclFile_GlobalWidgets.ts'/>
-    import Widgets = require("privacyFunctionReturnTypeDeclFile_Widgets");
-    import Widgets1 = require("GlobalWidgets");
-    export function createExportedWidget1() {
-        return Widgets.createWidget1();
-    }
-    export function createExportedWidget2() {
-        return Widgets.SpecializedWidget.createWidget2();
-    }
-    export function createExportedWidget3() {
-        return Widgets1.createWidget3();
-    }
-    export function createExportedWidget4() {
-        return Widgets1.SpecializedGlobalWidget.createWidget4();
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/privacyFunctionParameterDeclFile.errors.txt b/tests/baselines/reference/privacyFunctionParameterDeclFile.errors.txt
deleted file mode 100644
index e4d45caccba..00000000000
--- a/tests/baselines/reference/privacyFunctionParameterDeclFile.errors.txt
+++ /dev/null
@@ -1,805 +0,0 @@
-==== tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts (40 errors) ====
-    
-    class privateClass {
-    }
-    
-    export class publicClass {
-    }
-    
-    export interface publicInterfaceWithPrivateParmeterTypes {
-        new (param: privateClass): publicClass; // Error
-             ~~~~~~~~~~~~~~~~~~~
-!!! Parameter 'param' of constructor signature from exported interface has or is using private name 'privateClass'.
-        (param: privateClass): publicClass; // Error
-         ~~~~~~~~~~~~~~~~~~~
-!!! Parameter 'param' of call signature from exported interface has or is using private name 'privateClass'.
-        myMethod(param: privateClass): void; // Error
-                 ~~~~~~~~~~~~~~~~~~~
-!!! Parameter 'param' of method from exported interface has or is using private name 'privateClass'.
-    }
-    
-    export interface publicInterfaceWithPublicParmeterTypes {
-        new (param: publicClass): publicClass;
-        (param: publicClass): publicClass;
-        myMethod(param: publicClass): void;
-    }
-    
-    interface privateInterfaceWithPrivateParmeterTypes {
-        new (param: privateClass): privateClass;
-        (param: privateClass): privateClass;
-        myMethod(param: privateClass): void;
-    }
-    
-    interface privateInterfaceWithPublicParmeterTypes {
-        new (param: publicClass): publicClass;
-        (param: publicClass): publicClass;
-        myMethod(param: publicClass): void;
-    }
-    
-    export class publicClassWithWithPrivateParmeterTypes {
-        static myPublicStaticMethod(param: privateClass) { // Error
-                                    ~~~~~~~~~~~~~~~~~~~
-!!! Parameter 'param' of public static method from exported class has or is using private name 'privateClass'.
-        }
-        private static myPrivateStaticMethod(param: privateClass) {
-        }
-        myPublicMethod(param: privateClass) { // Error
-                       ~~~~~~~~~~~~~~~~~~~
-!!! Parameter 'param' of public method from exported class has or is using private name 'privateClass'.
-        }
-        private myPrivateMethod(param: privateClass) {
-        }
-        constructor(param: privateClass, private param1: privateClass, public param2: privateClass) { // Error
-                    ~~~~~~~~~~~~~~~~~~~
-!!! Parameter 'param' of constructor from exported class has or is using private name 'privateClass'.
-                                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Parameter 'param1' of constructor from exported class has or is using private name 'privateClass'.
-                                                                       ~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Parameter 'param2' of constructor from exported class has or is using private name 'privateClass'.
-        }
-    }
-    
-    export class publicClassWithWithPublicParmeterTypes {
-        static myPublicStaticMethod(param: publicClass) {
-        }
-        private static myPrivateStaticMethod(param: publicClass) {
-        }
-        myPublicMethod(param: publicClass) {
-        }
-        private myPrivateMethod(param: publicClass) {
-        }
-        constructor(param: publicClass, private param1: publicClass, public param2: publicClass) {
-        }
-    }
-    
-    class privateClassWithWithPrivateParmeterTypes {
-        static myPublicStaticMethod(param: privateClass) {
-        }
-        private static myPrivateStaticMethod(param: privateClass) {
-        }
-        myPublicMethod(param: privateClass) { 
-        }
-        private myPrivateMethod(param: privateClass) {
-        }
-        constructor(param: privateClass, private param1: privateClass, public param2: privateClass) {
-        }
-    }
-    
-    class privateClassWithWithPublicParmeterTypes {
-        static myPublicStaticMethod(param: publicClass) {
-        }
-        private static myPrivateStaticMethod(param: publicClass) {
-        }
-        myPublicMethod(param: publicClass) {
-        }
-        private myPrivateMethod(param: publicClass) {
-        }
-        constructor(param: publicClass, private param1: publicClass, public param2: publicClass) {
-        }
-    }
-    
-    export function publicFunctionWithPrivateParmeterTypes(param: privateClass) { // Error
-                                                           ~~~~~~~~~~~~~~~~~~~
-!!! Parameter 'param' of exported function has or is using private name 'privateClass'.
-    }
-    export function publicFunctionWithPublicParmeterTypes(param: publicClass) {
-    }
-    function privateFunctionWithPrivateParmeterTypes(param: privateClass) {
-    }
-    function privateFunctionWithPublicParmeterTypes(param: publicClass) {
-    }
-    
-    export declare function publicAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void; // Error
-                                                                          ~~~~~~~~~~~~~~~~~~~
-!!! Parameter 'param' of exported function has or is using private name 'privateClass'.
-    export declare function publicAmbientFunctionWithPublicParmeterTypes(param: publicClass): void;
-    declare function privateAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void;
-    declare function privateAmbientFunctionWithPublicParmeterTypes(param: publicClass): void;
-    
-    export interface publicInterfaceWithPrivateModuleParameterTypes {
-        new (param: privateModule.publicClass): publicClass; // Error
-             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Parameter 'param' of constructor signature from exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-        (param: privateModule.publicClass): publicClass; // Error
-         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Parameter 'param' of call signature from exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-        myMethod(param: privateModule.publicClass): void; // Error
-                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Parameter 'param' of method from exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-    }
-    export class publicClassWithPrivateModuleParameterTypes {
-        static myPublicStaticMethod(param: privateModule.publicClass) { // Error
-                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Parameter 'param' of public static method from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-        }
-        myPublicMethod(param: privateModule.publicClass) { // Error
-                       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Parameter 'param' of public method from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-        }
-        constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) { // Error
-                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Parameter 'param' of constructor from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-                                                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Parameter 'param1' of constructor from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-                                                                                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Parameter 'param2' of constructor from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-        }
-    }
-    export function publicFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) { // Error
-                                                                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Parameter 'param' of exported function has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-    }
-    export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void; // Error
-                                                                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Parameter 'param' of exported function has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-    
-    interface privateInterfaceWithPrivateModuleParameterTypes {
-        new (param: privateModule.publicClass): publicClass;
-        (param: privateModule.publicClass): publicClass;
-        myMethod(param: privateModule.publicClass): void;
-    }
-    class privateClassWithPrivateModuleParameterTypes {
-        static myPublicStaticMethod(param: privateModule.publicClass) {
-        }
-        myPublicMethod(param: privateModule.publicClass) {
-        }
-        constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) {
-        }
-    }
-    function privateFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) {
-    }
-    declare function privateAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void;
-    
-    export module publicModule {
-        class privateClass {
-        }
-    
-        export class publicClass {
-        }
-    
-    
-        export interface publicInterfaceWithPrivateParmeterTypes {
-            new (param: privateClass): publicClass; // Error
-                 ~~~~~~~~~~~~~~~~~~~
-!!! Parameter 'param' of constructor signature from exported interface has or is using private name 'privateClass'.
-            (param: privateClass): publicClass; // Error
-             ~~~~~~~~~~~~~~~~~~~
-!!! Parameter 'param' of call signature from exported interface has or is using private name 'privateClass'.
-            myMethod(param: privateClass): void; // Error
-                     ~~~~~~~~~~~~~~~~~~~
-!!! Parameter 'param' of method from exported interface has or is using private name 'privateClass'.
-        }
-    
-        export interface publicInterfaceWithPublicParmeterTypes {
-            new (param: publicClass): publicClass;
-            (param: publicClass): publicClass;
-            myMethod(param: publicClass): void;
-        }
-    
-        interface privateInterfaceWithPrivateParmeterTypes {
-            new (param: privateClass): privateClass;
-            (param: privateClass): privateClass;
-            myMethod(param: privateClass): void;
-        }
-    
-        interface privateInterfaceWithPublicParmeterTypes {
-            new (param: publicClass): publicClass;
-            (param: publicClass): publicClass;
-            myMethod(param: publicClass): void;
-        }
-    
-        export class publicClassWithWithPrivateParmeterTypes {
-            static myPublicStaticMethod(param: privateClass) { // Error
-                                        ~~~~~~~~~~~~~~~~~~~
-!!! Parameter 'param' of public static method from exported class has or is using private name 'privateClass'.
-            }
-            private static myPrivateStaticMethod(param: privateClass) {
-            }
-            myPublicMethod(param: privateClass) { // Error
-                           ~~~~~~~~~~~~~~~~~~~
-!!! Parameter 'param' of public method from exported class has or is using private name 'privateClass'.
-            }
-            private myPrivateMethod(param: privateClass) {
-            }
-            constructor(param: privateClass, private param1: privateClass, public param2: privateClass) { // Error
-                        ~~~~~~~~~~~~~~~~~~~
-!!! Parameter 'param' of constructor from exported class has or is using private name 'privateClass'.
-                                             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Parameter 'param1' of constructor from exported class has or is using private name 'privateClass'.
-                                                                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Parameter 'param2' of constructor from exported class has or is using private name 'privateClass'.
-            }
-        }
-    
-        export class publicClassWithWithPublicParmeterTypes {
-            static myPublicStaticMethod(param: publicClass) {
-            }
-            private static myPrivateStaticMethod(param: publicClass) {
-            }
-            myPublicMethod(param: publicClass) {
-            }
-            private myPrivateMethod(param: publicClass) {
-            }
-            constructor(param: publicClass, private param1: publicClass, public param2: publicClass) {
-            }
-        }
-    
-        class privateClassWithWithPrivateParmeterTypes {
-            static myPublicStaticMethod(param: privateClass) {
-            }
-            private static myPrivateStaticMethod(param: privateClass) {
-            }
-            myPublicMethod(param: privateClass) {
-            }
-            private myPrivateMethod(param: privateClass) {
-            }
-            constructor(param: privateClass, private param1: privateClass, public param2: privateClass) {
-            }
-        }
-    
-        class privateClassWithWithPublicParmeterTypes {
-            static myPublicStaticMethod(param: publicClass) {
-            }
-            private static myPrivateStaticMethod(param: publicClass) {
-            }
-            myPublicMethod(param: publicClass) {
-            }
-            private myPrivateMethod(param: publicClass) {
-            }
-            constructor(param: publicClass, private param1: publicClass, public param2: publicClass) {
-            }
-        }
-    
-        export function publicFunctionWithPrivateParmeterTypes(param: privateClass) { // Error
-                                                               ~~~~~~~~~~~~~~~~~~~
-!!! Parameter 'param' of exported function has or is using private name 'privateClass'.
-        }
-        export function publicFunctionWithPublicParmeterTypes(param: publicClass) {
-        }
-        function privateFunctionWithPrivateParmeterTypes(param: privateClass) {
-        }
-        function privateFunctionWithPublicParmeterTypes(param: publicClass) {
-        }
-    
-        export declare function publicAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void; // Error
-                                                                              ~~~~~~~~~~~~~~~~~~~
-!!! Parameter 'param' of exported function has or is using private name 'privateClass'.
-        export declare function publicAmbientFunctionWithPublicParmeterTypes(param: publicClass): void;
-        declare function privateAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void;
-        declare function privateAmbientFunctionWithPublicParmeterTypes(param: publicClass): void;
-    
-        export interface publicInterfaceWithPrivateModuleParameterTypes {
-            new (param: privateModule.publicClass): publicClass; // Error
-                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Parameter 'param' of constructor signature from exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-            (param: privateModule.publicClass): publicClass; // Error
-             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Parameter 'param' of call signature from exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-            myMethod(param: privateModule.publicClass): void; // Error
-                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Parameter 'param' of method from exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-        }
-        export class publicClassWithPrivateModuleParameterTypes {
-            static myPublicStaticMethod(param: privateModule.publicClass) { // Error
-                                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Parameter 'param' of public static method from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-            }
-            myPublicMethod(param: privateModule.publicClass) { // Error
-                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Parameter 'param' of public method from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-            }
-            constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) { // Error
-                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Parameter 'param' of constructor from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-                                                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Parameter 'param1' of constructor from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-                                                                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Parameter 'param2' of constructor from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-            }
-        }
-        export function publicFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) { // Error
-                                                                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Parameter 'param' of exported function has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-        }
-        export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void; // Error
-                                                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Parameter 'param' of exported function has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-    
-        interface privateInterfaceWithPrivateModuleParameterTypes {
-            new (param: privateModule.publicClass): publicClass;
-            (param: privateModule.publicClass): publicClass;
-            myMethod(param: privateModule.publicClass): void;
-        }
-        class privateClassWithPrivateModuleParameterTypes {
-            static myPublicStaticMethod(param: privateModule.publicClass) {
-            }
-            myPublicMethod(param: privateModule.publicClass) {
-            }
-            constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) {
-            }
-        }
-        function privateFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) {
-        }
-        declare function privateAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void;
-    
-    }
-    
-    module privateModule {
-        class privateClass {
-        }
-    
-        export class publicClass {
-        }
-    
-        export interface publicInterfaceWithPrivateParmeterTypes {
-            new (param: privateClass): publicClass;
-            (param: privateClass): publicClass;
-            myMethod(param: privateClass): void;
-        }
-    
-        export interface publicInterfaceWithPublicParmeterTypes {
-            new (param: publicClass): publicClass;
-            (param: publicClass): publicClass;
-            myMethod(param: publicClass): void;
-        }
-    
-        interface privateInterfaceWithPrivateParmeterTypes {
-            new (param: privateClass): privateClass;
-            (param: privateClass): privateClass;
-            myMethod(param: privateClass): void;
-        }
-    
-        interface privateInterfaceWithPublicParmeterTypes {
-            new (param: publicClass): publicClass;
-            (param: publicClass): publicClass;
-            myMethod(param: publicClass): void;
-        }
-    
-        export class publicClassWithWithPrivateParmeterTypes {
-            static myPublicStaticMethod(param: privateClass) {
-            }
-            private static myPrivateStaticMethod(param: privateClass) {
-            }
-            myPublicMethod(param: privateClass) {
-            }
-            private myPrivateMethod(param: privateClass) {
-            }
-            constructor(param: privateClass, private param1: privateClass, public param2: privateClass) {
-            }
-        }
-    
-        export class publicClassWithWithPublicParmeterTypes {
-            static myPublicStaticMethod(param: publicClass) {
-            }
-            private static myPrivateStaticMethod(param: publicClass) {
-            }
-            myPublicMethod(param: publicClass) {
-            }
-            private myPrivateMethod(param: publicClass) {
-            }
-            constructor(param: publicClass, private param1: publicClass, public param2: publicClass) {
-            }
-        }
-    
-        class privateClassWithWithPrivateParmeterTypes {
-            static myPublicStaticMethod(param: privateClass) {
-            }
-            private static myPrivateStaticMethod(param: privateClass) {
-            }
-            myPublicMethod(param: privateClass) {
-            }
-            private myPrivateMethod(param: privateClass) {
-            }
-            constructor(param: privateClass, private param1: privateClass, public param2: privateClass) {
-            }
-        }
-    
-        class privateClassWithWithPublicParmeterTypes {
-            static myPublicStaticMethod(param: publicClass) {
-            }
-            private static myPrivateStaticMethod(param: publicClass) {
-            }
-            myPublicMethod(param: publicClass) {
-            }
-            private myPrivateMethod(param: publicClass) {
-            }
-            constructor(param: publicClass, private param1: publicClass, public param2: publicClass) {
-            }
-        }
-    
-        export function publicFunctionWithPrivateParmeterTypes(param: privateClass) {
-        }
-        export function publicFunctionWithPublicParmeterTypes(param: publicClass) {
-        }
-        function privateFunctionWithPrivateParmeterTypes(param: privateClass) {
-        }
-        function privateFunctionWithPublicParmeterTypes(param: publicClass) {
-        }
-    
-        export declare function publicAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void;
-        export declare function publicAmbientFunctionWithPublicParmeterTypes(param: publicClass): void;
-        declare function privateAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void;
-        declare function privateAmbientFunctionWithPublicParmeterTypes(param: publicClass): void;
-    
-        export interface publicInterfaceWithPrivateModuleParameterTypes {
-            new (param: privateModule.publicClass): publicClass;
-            (param: privateModule.publicClass): publicClass;
-            myMethod(param: privateModule.publicClass): void;
-        }
-        export class publicClassWithPrivateModuleParameterTypes {
-            static myPublicStaticMethod(param: privateModule.publicClass) {
-            }
-            myPublicMethod(param: privateModule.publicClass) {
-            }
-            constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) {
-            }
-        }
-        export function publicFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) {
-        }
-        export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void;
-    
-        interface privateInterfaceWithPrivateModuleParameterTypes {
-            new (param: privateModule.publicClass): publicClass;
-            (param: privateModule.publicClass): publicClass;
-            myMethod(param: privateModule.publicClass): void;
-        }
-        class privateClassWithPrivateModuleParameterTypes {
-            static myPublicStaticMethod(param: privateModule.publicClass) {
-            }
-            myPublicMethod(param: privateModule.publicClass) {
-            }
-            constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) {
-            }
-        }
-        function privateFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) {
-        }
-        declare function privateAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void;
-    }
-    
-==== tests/cases/compiler/privacyFunctionParameterDeclFile_GlobalFile.ts (20 errors) ====
-    class publicClassInGlobal {
-    }
-    interface publicInterfaceWithPublicParmeterTypesInGlobal {
-        new (param: publicClassInGlobal): publicClassInGlobal;
-        (param: publicClassInGlobal): publicClassInGlobal;
-        myMethod(param: publicClassInGlobal): void;
-    }
-    class publicClassWithWithPublicParmeterTypesInGlobal {
-        static myPublicStaticMethod(param: publicClassInGlobal) {
-        }
-        private static myPrivateStaticMethod(param: publicClassInGlobal) {
-        }
-        myPublicMethod(param: publicClassInGlobal) {
-        }
-        private myPrivateMethod(param: publicClassInGlobal) {
-        }
-        constructor(param: publicClassInGlobal, private param1: publicClassInGlobal, public param2: publicClassInGlobal) {
-        }
-    }
-    function publicFunctionWithPublicParmeterTypesInGlobal(param: publicClassInGlobal) {
-    }
-    declare function publicAmbientFunctionWithPublicParmeterTypesInGlobal(param: publicClassInGlobal): void;
-    
-    module publicModuleInGlobal {
-        class privateClass {
-        }
-    
-        export class publicClass {
-        }
-    
-        module privateModule {
-            class privateClass {
-            }
-    
-            export class publicClass {
-            }
-    
-            export interface publicInterfaceWithPrivateParmeterTypes {
-                new (param: privateClass): publicClass;
-                (param: privateClass): publicClass;
-                myMethod(param: privateClass): void;
-            }
-    
-            export interface publicInterfaceWithPublicParmeterTypes {
-                new (param: publicClass): publicClass;
-                (param: publicClass): publicClass;
-                myMethod(param: publicClass): void;
-            }
-    
-            interface privateInterfaceWithPrivateParmeterTypes {
-                new (param: privateClass): privateClass;
-                (param: privateClass): privateClass;
-                myMethod(param: privateClass): void;
-            }
-    
-            interface privateInterfaceWithPublicParmeterTypes {
-                new (param: publicClass): publicClass;
-                (param: publicClass): publicClass;
-                myMethod(param: publicClass): void;
-            }
-    
-            export class publicClassWithWithPrivateParmeterTypes {
-                static myPublicStaticMethod(param: privateClass) {
-                }
-                private static myPrivateStaticMethod(param: privateClass) {
-                }
-                myPublicMethod(param: privateClass) {
-                }
-                private myPrivateMethod(param: privateClass) {
-                }
-                constructor(param: privateClass, private param1: privateClass, public param2: privateClass) {
-                }
-            }
-    
-            export class publicClassWithWithPublicParmeterTypes {
-                static myPublicStaticMethod(param: publicClass) {
-                }
-                private static myPrivateStaticMethod(param: publicClass) {
-                }
-                myPublicMethod(param: publicClass) {
-                }
-                private myPrivateMethod(param: publicClass) {
-                }
-                constructor(param: publicClass, private param1: publicClass, public param2: publicClass) {
-                }
-            }
-    
-            class privateClassWithWithPrivateParmeterTypes {
-                static myPublicStaticMethod(param: privateClass) {
-                }
-                private static myPrivateStaticMethod(param: privateClass) {
-                }
-                myPublicMethod(param: privateClass) {
-                }
-                private myPrivateMethod(param: privateClass) {
-                }
-                constructor(param: privateClass, private param1: privateClass, public param2: privateClass) {
-                }
-            }
-    
-            class privateClassWithWithPublicParmeterTypes {
-                static myPublicStaticMethod(param: publicClass) {
-                }
-                private static myPrivateStaticMethod(param: publicClass) {
-                }
-                myPublicMethod(param: publicClass) {
-                }
-                private myPrivateMethod(param: publicClass) {
-                }
-                constructor(param: publicClass, private param1: publicClass, public param2: publicClass) {
-                }
-            }
-    
-            export function publicFunctionWithPrivateParmeterTypes(param: privateClass) {
-            }
-            export function publicFunctionWithPublicParmeterTypes(param: publicClass) {
-            }
-            function privateFunctionWithPrivateParmeterTypes(param: privateClass) {
-            }
-            function privateFunctionWithPublicParmeterTypes(param: publicClass) {
-            }
-    
-            export declare function publicAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void;
-            export declare function publicAmbientFunctionWithPublicParmeterTypes(param: publicClass): void;
-            declare function privateAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void;
-            declare function privateAmbientFunctionWithPublicParmeterTypes(param: publicClass): void;
-    
-            export interface publicInterfaceWithPrivateModuleParameterTypes {
-                new (param: privateModule.publicClass): publicClass;
-                (param: privateModule.publicClass): publicClass;
-                myMethod(param: privateModule.publicClass): void;
-            }
-            export class publicClassWithPrivateModuleParameterTypes {
-                static myPublicStaticMethod(param: privateModule.publicClass) {
-                }
-                myPublicMethod(param: privateModule.publicClass) {
-                }
-                constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) {
-                }
-            }
-            export function publicFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) {
-            }
-            export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void;
-    
-            interface privateInterfaceWithPrivateModuleParameterTypes {
-                new (param: privateModule.publicClass): publicClass;
-                (param: privateModule.publicClass): publicClass;
-                myMethod(param: privateModule.publicClass): void;
-            }
-            class privateClassWithPrivateModuleParameterTypes {
-                static myPublicStaticMethod(param: privateModule.publicClass) {
-                }
-                myPublicMethod(param: privateModule.publicClass) {
-                }
-                constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) {
-                }
-            }
-            function privateFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) {
-            }
-            declare function privateAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void;
-        }
-    
-        export interface publicInterfaceWithPrivateParmeterTypes {
-            new (param: privateClass): publicClass; // Error
-                 ~~~~~~~~~~~~~~~~~~~
-!!! Parameter 'param' of constructor signature from exported interface has or is using private name 'privateClass'.
-            (param: privateClass): publicClass; // Error
-             ~~~~~~~~~~~~~~~~~~~
-!!! Parameter 'param' of call signature from exported interface has or is using private name 'privateClass'.
-            myMethod(param: privateClass): void; // Error
-                     ~~~~~~~~~~~~~~~~~~~
-!!! Parameter 'param' of method from exported interface has or is using private name 'privateClass'.
-        }
-    
-        export interface publicInterfaceWithPublicParmeterTypes {
-            new (param: publicClass): publicClass;
-            (param: publicClass): publicClass;
-            myMethod(param: publicClass): void;
-        }
-    
-        interface privateInterfaceWithPrivateParmeterTypes {
-            new (param: privateClass): privateClass;
-            (param: privateClass): privateClass;
-            myMethod(param: privateClass): void;
-        }
-    
-        interface privateInterfaceWithPublicParmeterTypes {
-            new (param: publicClass): publicClass;
-            (param: publicClass): publicClass;
-            myMethod(param: publicClass): void;
-        }
-    
-        export class publicClassWithWithPrivateParmeterTypes {
-            static myPublicStaticMethod(param: privateClass) { // Error
-                                        ~~~~~~~~~~~~~~~~~~~
-!!! Parameter 'param' of public static method from exported class has or is using private name 'privateClass'.
-            }
-            private static myPrivateStaticMethod(param: privateClass) {
-            }
-            myPublicMethod(param: privateClass) { // Error
-                           ~~~~~~~~~~~~~~~~~~~
-!!! Parameter 'param' of public method from exported class has or is using private name 'privateClass'.
-            }
-            private myPrivateMethod(param: privateClass) {
-            }
-            constructor(param: privateClass, private param1: privateClass, public param2: privateClass) { // Error
-                        ~~~~~~~~~~~~~~~~~~~
-!!! Parameter 'param' of constructor from exported class has or is using private name 'privateClass'.
-                                             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Parameter 'param1' of constructor from exported class has or is using private name 'privateClass'.
-                                                                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Parameter 'param2' of constructor from exported class has or is using private name 'privateClass'.
-            }
-        }
-    
-        export class publicClassWithWithPublicParmeterTypes {
-            static myPublicStaticMethod(param: publicClass) {
-            }
-            private static myPrivateStaticMethod(param: publicClass) {
-            }
-            myPublicMethod(param: publicClass) {
-            }
-            private myPrivateMethod(param: publicClass) {
-            }
-            constructor(param: publicClass, private param1: publicClass, public param2: publicClass) {
-            }
-        }
-    
-        class privateClassWithWithPrivateParmeterTypes {
-            static myPublicStaticMethod(param: privateClass) {
-            }
-            private static myPrivateStaticMethod(param: privateClass) {
-            }
-            myPublicMethod(param: privateClass) {
-            }
-            private myPrivateMethod(param: privateClass) {
-            }
-            constructor(param: privateClass, private param1: privateClass, public param2: privateClass) {
-            }
-        }
-    
-        class privateClassWithWithPublicParmeterTypes {
-            static myPublicStaticMethod(param: publicClass) {
-            }
-            private static myPrivateStaticMethod(param: publicClass) {
-            }
-            myPublicMethod(param: publicClass) {
-            }
-            private myPrivateMethod(param: publicClass) {
-            }
-            constructor(param: publicClass, private param1: publicClass, public param2: publicClass) {
-            }
-        }
-    
-        export function publicFunctionWithPrivateParmeterTypes(param: privateClass) { // Error
-                                                               ~~~~~~~~~~~~~~~~~~~
-!!! Parameter 'param' of exported function has or is using private name 'privateClass'.
-        }
-        export function publicFunctionWithPublicParmeterTypes(param: publicClass) {
-        }
-        function privateFunctionWithPrivateParmeterTypes(param: privateClass) {
-        }
-        function privateFunctionWithPublicParmeterTypes(param: publicClass) {
-        }
-    
-        export declare function publicAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void; // Error
-                                                                              ~~~~~~~~~~~~~~~~~~~
-!!! Parameter 'param' of exported function has or is using private name 'privateClass'.
-        export declare function publicAmbientFunctionWithPublicParmeterTypes(param: publicClass): void;
-        declare function privateAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void;
-        declare function privateAmbientFunctionWithPublicParmeterTypes(param: publicClass): void;
-    
-        export interface publicInterfaceWithPrivateModuleParameterTypes {
-            new (param: privateModule.publicClass): publicClass; // Error
-                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Parameter 'param' of constructor signature from exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-            (param: privateModule.publicClass): publicClass; // Error
-             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Parameter 'param' of call signature from exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-            myMethod(param: privateModule.publicClass): void; // Error
-                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Parameter 'param' of method from exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-        }
-        export class publicClassWithPrivateModuleParameterTypes {
-            static myPublicStaticMethod(param: privateModule.publicClass) { // Error
-                                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Parameter 'param' of public static method from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-            }
-            myPublicMethod(param: privateModule.publicClass) { // Error
-                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Parameter 'param' of public method from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-            }
-            constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) { // Error
-                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Parameter 'param' of constructor from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-                                                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Parameter 'param1' of constructor from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-                                                                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Parameter 'param2' of constructor from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-            }
-        }
-        export function publicFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) { // Error
-                                                                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Parameter 'param' of exported function has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-        }
-        export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void; // Error
-                                                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Parameter 'param' of exported function has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-    
-        interface privateInterfaceWithPrivateModuleParameterTypes {
-            new (param: privateModule.publicClass): publicClass;
-            (param: privateModule.publicClass): publicClass;
-            myMethod(param: privateModule.publicClass): void;
-        }
-        class privateClassWithPrivateModuleParameterTypes {
-            static myPublicStaticMethod(param: privateModule.publicClass) {
-            }
-            myPublicMethod(param: privateModule.publicClass) {
-            }
-            constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) {
-            }
-        }
-        function privateFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) {
-        }
-        declare function privateAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/privacyFunctionParameterDeclFile.js b/tests/baselines/reference/privacyFunctionParameterDeclFile.js
deleted file mode 100644
index 0e2f72ce3a6..00000000000
--- a/tests/baselines/reference/privacyFunctionParameterDeclFile.js
+++ /dev/null
@@ -1,1279 +0,0 @@
-//// [tests/cases/compiler/privacyFunctionParameterDeclFile.ts] ////
-
-//// [privacyFunctionParameterDeclFile_externalModule.ts]
-
-class privateClass {
-}
-
-export class publicClass {
-}
-
-export interface publicInterfaceWithPrivateParmeterTypes {
-    new (param: privateClass): publicClass; // Error
-    (param: privateClass): publicClass; // Error
-    myMethod(param: privateClass): void; // Error
-}
-
-export interface publicInterfaceWithPublicParmeterTypes {
-    new (param: publicClass): publicClass;
-    (param: publicClass): publicClass;
-    myMethod(param: publicClass): void;
-}
-
-interface privateInterfaceWithPrivateParmeterTypes {
-    new (param: privateClass): privateClass;
-    (param: privateClass): privateClass;
-    myMethod(param: privateClass): void;
-}
-
-interface privateInterfaceWithPublicParmeterTypes {
-    new (param: publicClass): publicClass;
-    (param: publicClass): publicClass;
-    myMethod(param: publicClass): void;
-}
-
-export class publicClassWithWithPrivateParmeterTypes {
-    static myPublicStaticMethod(param: privateClass) { // Error
-    }
-    private static myPrivateStaticMethod(param: privateClass) {
-    }
-    myPublicMethod(param: privateClass) { // Error
-    }
-    private myPrivateMethod(param: privateClass) {
-    }
-    constructor(param: privateClass, private param1: privateClass, public param2: privateClass) { // Error
-    }
-}
-
-export class publicClassWithWithPublicParmeterTypes {
-    static myPublicStaticMethod(param: publicClass) {
-    }
-    private static myPrivateStaticMethod(param: publicClass) {
-    }
-    myPublicMethod(param: publicClass) {
-    }
-    private myPrivateMethod(param: publicClass) {
-    }
-    constructor(param: publicClass, private param1: publicClass, public param2: publicClass) {
-    }
-}
-
-class privateClassWithWithPrivateParmeterTypes {
-    static myPublicStaticMethod(param: privateClass) {
-    }
-    private static myPrivateStaticMethod(param: privateClass) {
-    }
-    myPublicMethod(param: privateClass) { 
-    }
-    private myPrivateMethod(param: privateClass) {
-    }
-    constructor(param: privateClass, private param1: privateClass, public param2: privateClass) {
-    }
-}
-
-class privateClassWithWithPublicParmeterTypes {
-    static myPublicStaticMethod(param: publicClass) {
-    }
-    private static myPrivateStaticMethod(param: publicClass) {
-    }
-    myPublicMethod(param: publicClass) {
-    }
-    private myPrivateMethod(param: publicClass) {
-    }
-    constructor(param: publicClass, private param1: publicClass, public param2: publicClass) {
-    }
-}
-
-export function publicFunctionWithPrivateParmeterTypes(param: privateClass) { // Error
-}
-export function publicFunctionWithPublicParmeterTypes(param: publicClass) {
-}
-function privateFunctionWithPrivateParmeterTypes(param: privateClass) {
-}
-function privateFunctionWithPublicParmeterTypes(param: publicClass) {
-}
-
-export declare function publicAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void; // Error
-export declare function publicAmbientFunctionWithPublicParmeterTypes(param: publicClass): void;
-declare function privateAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void;
-declare function privateAmbientFunctionWithPublicParmeterTypes(param: publicClass): void;
-
-export interface publicInterfaceWithPrivateModuleParameterTypes {
-    new (param: privateModule.publicClass): publicClass; // Error
-    (param: privateModule.publicClass): publicClass; // Error
-    myMethod(param: privateModule.publicClass): void; // Error
-}
-export class publicClassWithPrivateModuleParameterTypes {
-    static myPublicStaticMethod(param: privateModule.publicClass) { // Error
-    }
-    myPublicMethod(param: privateModule.publicClass) { // Error
-    }
-    constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) { // Error
-    }
-}
-export function publicFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) { // Error
-}
-export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void; // Error
-
-interface privateInterfaceWithPrivateModuleParameterTypes {
-    new (param: privateModule.publicClass): publicClass;
-    (param: privateModule.publicClass): publicClass;
-    myMethod(param: privateModule.publicClass): void;
-}
-class privateClassWithPrivateModuleParameterTypes {
-    static myPublicStaticMethod(param: privateModule.publicClass) {
-    }
-    myPublicMethod(param: privateModule.publicClass) {
-    }
-    constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) {
-    }
-}
-function privateFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) {
-}
-declare function privateAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void;
-
-export module publicModule {
-    class privateClass {
-    }
-
-    export class publicClass {
-    }
-
-
-    export interface publicInterfaceWithPrivateParmeterTypes {
-        new (param: privateClass): publicClass; // Error
-        (param: privateClass): publicClass; // Error
-        myMethod(param: privateClass): void; // Error
-    }
-
-    export interface publicInterfaceWithPublicParmeterTypes {
-        new (param: publicClass): publicClass;
-        (param: publicClass): publicClass;
-        myMethod(param: publicClass): void;
-    }
-
-    interface privateInterfaceWithPrivateParmeterTypes {
-        new (param: privateClass): privateClass;
-        (param: privateClass): privateClass;
-        myMethod(param: privateClass): void;
-    }
-
-    interface privateInterfaceWithPublicParmeterTypes {
-        new (param: publicClass): publicClass;
-        (param: publicClass): publicClass;
-        myMethod(param: publicClass): void;
-    }
-
-    export class publicClassWithWithPrivateParmeterTypes {
-        static myPublicStaticMethod(param: privateClass) { // Error
-        }
-        private static myPrivateStaticMethod(param: privateClass) {
-        }
-        myPublicMethod(param: privateClass) { // Error
-        }
-        private myPrivateMethod(param: privateClass) {
-        }
-        constructor(param: privateClass, private param1: privateClass, public param2: privateClass) { // Error
-        }
-    }
-
-    export class publicClassWithWithPublicParmeterTypes {
-        static myPublicStaticMethod(param: publicClass) {
-        }
-        private static myPrivateStaticMethod(param: publicClass) {
-        }
-        myPublicMethod(param: publicClass) {
-        }
-        private myPrivateMethod(param: publicClass) {
-        }
-        constructor(param: publicClass, private param1: publicClass, public param2: publicClass) {
-        }
-    }
-
-    class privateClassWithWithPrivateParmeterTypes {
-        static myPublicStaticMethod(param: privateClass) {
-        }
-        private static myPrivateStaticMethod(param: privateClass) {
-        }
-        myPublicMethod(param: privateClass) {
-        }
-        private myPrivateMethod(param: privateClass) {
-        }
-        constructor(param: privateClass, private param1: privateClass, public param2: privateClass) {
-        }
-    }
-
-    class privateClassWithWithPublicParmeterTypes {
-        static myPublicStaticMethod(param: publicClass) {
-        }
-        private static myPrivateStaticMethod(param: publicClass) {
-        }
-        myPublicMethod(param: publicClass) {
-        }
-        private myPrivateMethod(param: publicClass) {
-        }
-        constructor(param: publicClass, private param1: publicClass, public param2: publicClass) {
-        }
-    }
-
-    export function publicFunctionWithPrivateParmeterTypes(param: privateClass) { // Error
-    }
-    export function publicFunctionWithPublicParmeterTypes(param: publicClass) {
-    }
-    function privateFunctionWithPrivateParmeterTypes(param: privateClass) {
-    }
-    function privateFunctionWithPublicParmeterTypes(param: publicClass) {
-    }
-
-    export declare function publicAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void; // Error
-    export declare function publicAmbientFunctionWithPublicParmeterTypes(param: publicClass): void;
-    declare function privateAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void;
-    declare function privateAmbientFunctionWithPublicParmeterTypes(param: publicClass): void;
-
-    export interface publicInterfaceWithPrivateModuleParameterTypes {
-        new (param: privateModule.publicClass): publicClass; // Error
-        (param: privateModule.publicClass): publicClass; // Error
-        myMethod(param: privateModule.publicClass): void; // Error
-    }
-    export class publicClassWithPrivateModuleParameterTypes {
-        static myPublicStaticMethod(param: privateModule.publicClass) { // Error
-        }
-        myPublicMethod(param: privateModule.publicClass) { // Error
-        }
-        constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) { // Error
-        }
-    }
-    export function publicFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) { // Error
-    }
-    export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void; // Error
-
-    interface privateInterfaceWithPrivateModuleParameterTypes {
-        new (param: privateModule.publicClass): publicClass;
-        (param: privateModule.publicClass): publicClass;
-        myMethod(param: privateModule.publicClass): void;
-    }
-    class privateClassWithPrivateModuleParameterTypes {
-        static myPublicStaticMethod(param: privateModule.publicClass) {
-        }
-        myPublicMethod(param: privateModule.publicClass) {
-        }
-        constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) {
-        }
-    }
-    function privateFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) {
-    }
-    declare function privateAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void;
-
-}
-
-module privateModule {
-    class privateClass {
-    }
-
-    export class publicClass {
-    }
-
-    export interface publicInterfaceWithPrivateParmeterTypes {
-        new (param: privateClass): publicClass;
-        (param: privateClass): publicClass;
-        myMethod(param: privateClass): void;
-    }
-
-    export interface publicInterfaceWithPublicParmeterTypes {
-        new (param: publicClass): publicClass;
-        (param: publicClass): publicClass;
-        myMethod(param: publicClass): void;
-    }
-
-    interface privateInterfaceWithPrivateParmeterTypes {
-        new (param: privateClass): privateClass;
-        (param: privateClass): privateClass;
-        myMethod(param: privateClass): void;
-    }
-
-    interface privateInterfaceWithPublicParmeterTypes {
-        new (param: publicClass): publicClass;
-        (param: publicClass): publicClass;
-        myMethod(param: publicClass): void;
-    }
-
-    export class publicClassWithWithPrivateParmeterTypes {
-        static myPublicStaticMethod(param: privateClass) {
-        }
-        private static myPrivateStaticMethod(param: privateClass) {
-        }
-        myPublicMethod(param: privateClass) {
-        }
-        private myPrivateMethod(param: privateClass) {
-        }
-        constructor(param: privateClass, private param1: privateClass, public param2: privateClass) {
-        }
-    }
-
-    export class publicClassWithWithPublicParmeterTypes {
-        static myPublicStaticMethod(param: publicClass) {
-        }
-        private static myPrivateStaticMethod(param: publicClass) {
-        }
-        myPublicMethod(param: publicClass) {
-        }
-        private myPrivateMethod(param: publicClass) {
-        }
-        constructor(param: publicClass, private param1: publicClass, public param2: publicClass) {
-        }
-    }
-
-    class privateClassWithWithPrivateParmeterTypes {
-        static myPublicStaticMethod(param: privateClass) {
-        }
-        private static myPrivateStaticMethod(param: privateClass) {
-        }
-        myPublicMethod(param: privateClass) {
-        }
-        private myPrivateMethod(param: privateClass) {
-        }
-        constructor(param: privateClass, private param1: privateClass, public param2: privateClass) {
-        }
-    }
-
-    class privateClassWithWithPublicParmeterTypes {
-        static myPublicStaticMethod(param: publicClass) {
-        }
-        private static myPrivateStaticMethod(param: publicClass) {
-        }
-        myPublicMethod(param: publicClass) {
-        }
-        private myPrivateMethod(param: publicClass) {
-        }
-        constructor(param: publicClass, private param1: publicClass, public param2: publicClass) {
-        }
-    }
-
-    export function publicFunctionWithPrivateParmeterTypes(param: privateClass) {
-    }
-    export function publicFunctionWithPublicParmeterTypes(param: publicClass) {
-    }
-    function privateFunctionWithPrivateParmeterTypes(param: privateClass) {
-    }
-    function privateFunctionWithPublicParmeterTypes(param: publicClass) {
-    }
-
-    export declare function publicAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void;
-    export declare function publicAmbientFunctionWithPublicParmeterTypes(param: publicClass): void;
-    declare function privateAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void;
-    declare function privateAmbientFunctionWithPublicParmeterTypes(param: publicClass): void;
-
-    export interface publicInterfaceWithPrivateModuleParameterTypes {
-        new (param: privateModule.publicClass): publicClass;
-        (param: privateModule.publicClass): publicClass;
-        myMethod(param: privateModule.publicClass): void;
-    }
-    export class publicClassWithPrivateModuleParameterTypes {
-        static myPublicStaticMethod(param: privateModule.publicClass) {
-        }
-        myPublicMethod(param: privateModule.publicClass) {
-        }
-        constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) {
-        }
-    }
-    export function publicFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) {
-    }
-    export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void;
-
-    interface privateInterfaceWithPrivateModuleParameterTypes {
-        new (param: privateModule.publicClass): publicClass;
-        (param: privateModule.publicClass): publicClass;
-        myMethod(param: privateModule.publicClass): void;
-    }
-    class privateClassWithPrivateModuleParameterTypes {
-        static myPublicStaticMethod(param: privateModule.publicClass) {
-        }
-        myPublicMethod(param: privateModule.publicClass) {
-        }
-        constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) {
-        }
-    }
-    function privateFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) {
-    }
-    declare function privateAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void;
-}
-
-//// [privacyFunctionParameterDeclFile_GlobalFile.ts]
-class publicClassInGlobal {
-}
-interface publicInterfaceWithPublicParmeterTypesInGlobal {
-    new (param: publicClassInGlobal): publicClassInGlobal;
-    (param: publicClassInGlobal): publicClassInGlobal;
-    myMethod(param: publicClassInGlobal): void;
-}
-class publicClassWithWithPublicParmeterTypesInGlobal {
-    static myPublicStaticMethod(param: publicClassInGlobal) {
-    }
-    private static myPrivateStaticMethod(param: publicClassInGlobal) {
-    }
-    myPublicMethod(param: publicClassInGlobal) {
-    }
-    private myPrivateMethod(param: publicClassInGlobal) {
-    }
-    constructor(param: publicClassInGlobal, private param1: publicClassInGlobal, public param2: publicClassInGlobal) {
-    }
-}
-function publicFunctionWithPublicParmeterTypesInGlobal(param: publicClassInGlobal) {
-}
-declare function publicAmbientFunctionWithPublicParmeterTypesInGlobal(param: publicClassInGlobal): void;
-
-module publicModuleInGlobal {
-    class privateClass {
-    }
-
-    export class publicClass {
-    }
-
-    module privateModule {
-        class privateClass {
-        }
-
-        export class publicClass {
-        }
-
-        export interface publicInterfaceWithPrivateParmeterTypes {
-            new (param: privateClass): publicClass;
-            (param: privateClass): publicClass;
-            myMethod(param: privateClass): void;
-        }
-
-        export interface publicInterfaceWithPublicParmeterTypes {
-            new (param: publicClass): publicClass;
-            (param: publicClass): publicClass;
-            myMethod(param: publicClass): void;
-        }
-
-        interface privateInterfaceWithPrivateParmeterTypes {
-            new (param: privateClass): privateClass;
-            (param: privateClass): privateClass;
-            myMethod(param: privateClass): void;
-        }
-
-        interface privateInterfaceWithPublicParmeterTypes {
-            new (param: publicClass): publicClass;
-            (param: publicClass): publicClass;
-            myMethod(param: publicClass): void;
-        }
-
-        export class publicClassWithWithPrivateParmeterTypes {
-            static myPublicStaticMethod(param: privateClass) {
-            }
-            private static myPrivateStaticMethod(param: privateClass) {
-            }
-            myPublicMethod(param: privateClass) {
-            }
-            private myPrivateMethod(param: privateClass) {
-            }
-            constructor(param: privateClass, private param1: privateClass, public param2: privateClass) {
-            }
-        }
-
-        export class publicClassWithWithPublicParmeterTypes {
-            static myPublicStaticMethod(param: publicClass) {
-            }
-            private static myPrivateStaticMethod(param: publicClass) {
-            }
-            myPublicMethod(param: publicClass) {
-            }
-            private myPrivateMethod(param: publicClass) {
-            }
-            constructor(param: publicClass, private param1: publicClass, public param2: publicClass) {
-            }
-        }
-
-        class privateClassWithWithPrivateParmeterTypes {
-            static myPublicStaticMethod(param: privateClass) {
-            }
-            private static myPrivateStaticMethod(param: privateClass) {
-            }
-            myPublicMethod(param: privateClass) {
-            }
-            private myPrivateMethod(param: privateClass) {
-            }
-            constructor(param: privateClass, private param1: privateClass, public param2: privateClass) {
-            }
-        }
-
-        class privateClassWithWithPublicParmeterTypes {
-            static myPublicStaticMethod(param: publicClass) {
-            }
-            private static myPrivateStaticMethod(param: publicClass) {
-            }
-            myPublicMethod(param: publicClass) {
-            }
-            private myPrivateMethod(param: publicClass) {
-            }
-            constructor(param: publicClass, private param1: publicClass, public param2: publicClass) {
-            }
-        }
-
-        export function publicFunctionWithPrivateParmeterTypes(param: privateClass) {
-        }
-        export function publicFunctionWithPublicParmeterTypes(param: publicClass) {
-        }
-        function privateFunctionWithPrivateParmeterTypes(param: privateClass) {
-        }
-        function privateFunctionWithPublicParmeterTypes(param: publicClass) {
-        }
-
-        export declare function publicAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void;
-        export declare function publicAmbientFunctionWithPublicParmeterTypes(param: publicClass): void;
-        declare function privateAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void;
-        declare function privateAmbientFunctionWithPublicParmeterTypes(param: publicClass): void;
-
-        export interface publicInterfaceWithPrivateModuleParameterTypes {
-            new (param: privateModule.publicClass): publicClass;
-            (param: privateModule.publicClass): publicClass;
-            myMethod(param: privateModule.publicClass): void;
-        }
-        export class publicClassWithPrivateModuleParameterTypes {
-            static myPublicStaticMethod(param: privateModule.publicClass) {
-            }
-            myPublicMethod(param: privateModule.publicClass) {
-            }
-            constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) {
-            }
-        }
-        export function publicFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) {
-        }
-        export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void;
-
-        interface privateInterfaceWithPrivateModuleParameterTypes {
-            new (param: privateModule.publicClass): publicClass;
-            (param: privateModule.publicClass): publicClass;
-            myMethod(param: privateModule.publicClass): void;
-        }
-        class privateClassWithPrivateModuleParameterTypes {
-            static myPublicStaticMethod(param: privateModule.publicClass) {
-            }
-            myPublicMethod(param: privateModule.publicClass) {
-            }
-            constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) {
-            }
-        }
-        function privateFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) {
-        }
-        declare function privateAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void;
-    }
-
-    export interface publicInterfaceWithPrivateParmeterTypes {
-        new (param: privateClass): publicClass; // Error
-        (param: privateClass): publicClass; // Error
-        myMethod(param: privateClass): void; // Error
-    }
-
-    export interface publicInterfaceWithPublicParmeterTypes {
-        new (param: publicClass): publicClass;
-        (param: publicClass): publicClass;
-        myMethod(param: publicClass): void;
-    }
-
-    interface privateInterfaceWithPrivateParmeterTypes {
-        new (param: privateClass): privateClass;
-        (param: privateClass): privateClass;
-        myMethod(param: privateClass): void;
-    }
-
-    interface privateInterfaceWithPublicParmeterTypes {
-        new (param: publicClass): publicClass;
-        (param: publicClass): publicClass;
-        myMethod(param: publicClass): void;
-    }
-
-    export class publicClassWithWithPrivateParmeterTypes {
-        static myPublicStaticMethod(param: privateClass) { // Error
-        }
-        private static myPrivateStaticMethod(param: privateClass) {
-        }
-        myPublicMethod(param: privateClass) { // Error
-        }
-        private myPrivateMethod(param: privateClass) {
-        }
-        constructor(param: privateClass, private param1: privateClass, public param2: privateClass) { // Error
-        }
-    }
-
-    export class publicClassWithWithPublicParmeterTypes {
-        static myPublicStaticMethod(param: publicClass) {
-        }
-        private static myPrivateStaticMethod(param: publicClass) {
-        }
-        myPublicMethod(param: publicClass) {
-        }
-        private myPrivateMethod(param: publicClass) {
-        }
-        constructor(param: publicClass, private param1: publicClass, public param2: publicClass) {
-        }
-    }
-
-    class privateClassWithWithPrivateParmeterTypes {
-        static myPublicStaticMethod(param: privateClass) {
-        }
-        private static myPrivateStaticMethod(param: privateClass) {
-        }
-        myPublicMethod(param: privateClass) {
-        }
-        private myPrivateMethod(param: privateClass) {
-        }
-        constructor(param: privateClass, private param1: privateClass, public param2: privateClass) {
-        }
-    }
-
-    class privateClassWithWithPublicParmeterTypes {
-        static myPublicStaticMethod(param: publicClass) {
-        }
-        private static myPrivateStaticMethod(param: publicClass) {
-        }
-        myPublicMethod(param: publicClass) {
-        }
-        private myPrivateMethod(param: publicClass) {
-        }
-        constructor(param: publicClass, private param1: publicClass, public param2: publicClass) {
-        }
-    }
-
-    export function publicFunctionWithPrivateParmeterTypes(param: privateClass) { // Error
-    }
-    export function publicFunctionWithPublicParmeterTypes(param: publicClass) {
-    }
-    function privateFunctionWithPrivateParmeterTypes(param: privateClass) {
-    }
-    function privateFunctionWithPublicParmeterTypes(param: publicClass) {
-    }
-
-    export declare function publicAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void; // Error
-    export declare function publicAmbientFunctionWithPublicParmeterTypes(param: publicClass): void;
-    declare function privateAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void;
-    declare function privateAmbientFunctionWithPublicParmeterTypes(param: publicClass): void;
-
-    export interface publicInterfaceWithPrivateModuleParameterTypes {
-        new (param: privateModule.publicClass): publicClass; // Error
-        (param: privateModule.publicClass): publicClass; // Error
-        myMethod(param: privateModule.publicClass): void; // Error
-    }
-    export class publicClassWithPrivateModuleParameterTypes {
-        static myPublicStaticMethod(param: privateModule.publicClass) { // Error
-        }
-        myPublicMethod(param: privateModule.publicClass) { // Error
-        }
-        constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) { // Error
-        }
-    }
-    export function publicFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) { // Error
-    }
-    export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void; // Error
-
-    interface privateInterfaceWithPrivateModuleParameterTypes {
-        new (param: privateModule.publicClass): publicClass;
-        (param: privateModule.publicClass): publicClass;
-        myMethod(param: privateModule.publicClass): void;
-    }
-    class privateClassWithPrivateModuleParameterTypes {
-        static myPublicStaticMethod(param: privateModule.publicClass) {
-        }
-        myPublicMethod(param: privateModule.publicClass) {
-        }
-        constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) {
-        }
-    }
-    function privateFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) {
-    }
-    declare function privateAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void;
-}
-
-//// [privacyFunctionParameterDeclFile_externalModule.js]
-var privateClass = (function () {
-    function privateClass() {
-    }
-    return privateClass;
-})();
-var publicClass = (function () {
-    function publicClass() {
-    }
-    return publicClass;
-})();
-exports.publicClass = publicClass;
-var publicClassWithWithPrivateParmeterTypes = (function () {
-    function publicClassWithWithPrivateParmeterTypes(param, param1, param2) {
-        this.param1 = param1;
-        this.param2 = param2;
-    }
-    publicClassWithWithPrivateParmeterTypes.myPublicStaticMethod = function (param) {
-    };
-    publicClassWithWithPrivateParmeterTypes.myPrivateStaticMethod = function (param) {
-    };
-    publicClassWithWithPrivateParmeterTypes.prototype.myPublicMethod = function (param) {
-    };
-    publicClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod = function (param) {
-    };
-    return publicClassWithWithPrivateParmeterTypes;
-})();
-exports.publicClassWithWithPrivateParmeterTypes = publicClassWithWithPrivateParmeterTypes;
-var publicClassWithWithPublicParmeterTypes = (function () {
-    function publicClassWithWithPublicParmeterTypes(param, param1, param2) {
-        this.param1 = param1;
-        this.param2 = param2;
-    }
-    publicClassWithWithPublicParmeterTypes.myPublicStaticMethod = function (param) {
-    };
-    publicClassWithWithPublicParmeterTypes.myPrivateStaticMethod = function (param) {
-    };
-    publicClassWithWithPublicParmeterTypes.prototype.myPublicMethod = function (param) {
-    };
-    publicClassWithWithPublicParmeterTypes.prototype.myPrivateMethod = function (param) {
-    };
-    return publicClassWithWithPublicParmeterTypes;
-})();
-exports.publicClassWithWithPublicParmeterTypes = publicClassWithWithPublicParmeterTypes;
-var privateClassWithWithPrivateParmeterTypes = (function () {
-    function privateClassWithWithPrivateParmeterTypes(param, param1, param2) {
-        this.param1 = param1;
-        this.param2 = param2;
-    }
-    privateClassWithWithPrivateParmeterTypes.myPublicStaticMethod = function (param) {
-    };
-    privateClassWithWithPrivateParmeterTypes.myPrivateStaticMethod = function (param) {
-    };
-    privateClassWithWithPrivateParmeterTypes.prototype.myPublicMethod = function (param) {
-    };
-    privateClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod = function (param) {
-    };
-    return privateClassWithWithPrivateParmeterTypes;
-})();
-var privateClassWithWithPublicParmeterTypes = (function () {
-    function privateClassWithWithPublicParmeterTypes(param, param1, param2) {
-        this.param1 = param1;
-        this.param2 = param2;
-    }
-    privateClassWithWithPublicParmeterTypes.myPublicStaticMethod = function (param) {
-    };
-    privateClassWithWithPublicParmeterTypes.myPrivateStaticMethod = function (param) {
-    };
-    privateClassWithWithPublicParmeterTypes.prototype.myPublicMethod = function (param) {
-    };
-    privateClassWithWithPublicParmeterTypes.prototype.myPrivateMethod = function (param) {
-    };
-    return privateClassWithWithPublicParmeterTypes;
-})();
-function publicFunctionWithPrivateParmeterTypes(param) {
-}
-exports.publicFunctionWithPrivateParmeterTypes = publicFunctionWithPrivateParmeterTypes;
-function publicFunctionWithPublicParmeterTypes(param) {
-}
-exports.publicFunctionWithPublicParmeterTypes = publicFunctionWithPublicParmeterTypes;
-function privateFunctionWithPrivateParmeterTypes(param) {
-}
-function privateFunctionWithPublicParmeterTypes(param) {
-}
-var publicClassWithPrivateModuleParameterTypes = (function () {
-    function publicClassWithPrivateModuleParameterTypes(param, param1, param2) {
-        this.param1 = param1;
-        this.param2 = param2;
-    }
-    publicClassWithPrivateModuleParameterTypes.myPublicStaticMethod = function (param) {
-    };
-    publicClassWithPrivateModuleParameterTypes.prototype.myPublicMethod = function (param) {
-    };
-    return publicClassWithPrivateModuleParameterTypes;
-})();
-exports.publicClassWithPrivateModuleParameterTypes = publicClassWithPrivateModuleParameterTypes;
-function publicFunctionWithPrivateModuleParameterTypes(param) {
-}
-exports.publicFunctionWithPrivateModuleParameterTypes = publicFunctionWithPrivateModuleParameterTypes;
-var privateClassWithPrivateModuleParameterTypes = (function () {
-    function privateClassWithPrivateModuleParameterTypes(param, param1, param2) {
-        this.param1 = param1;
-        this.param2 = param2;
-    }
-    privateClassWithPrivateModuleParameterTypes.myPublicStaticMethod = function (param) {
-    };
-    privateClassWithPrivateModuleParameterTypes.prototype.myPublicMethod = function (param) {
-    };
-    return privateClassWithPrivateModuleParameterTypes;
-})();
-function privateFunctionWithPrivateModuleParameterTypes(param) {
-}
-(function (publicModule) {
-    var privateClass = (function () {
-        function privateClass() {
-        }
-        return privateClass;
-    })();
-    var publicClass = (function () {
-        function publicClass() {
-        }
-        return publicClass;
-    })();
-    publicModule.publicClass = publicClass;
-    var publicClassWithWithPrivateParmeterTypes = (function () {
-        function publicClassWithWithPrivateParmeterTypes(param, param1, param2) {
-            this.param1 = param1;
-            this.param2 = param2;
-        }
-        publicClassWithWithPrivateParmeterTypes.myPublicStaticMethod = function (param) {
-        };
-        publicClassWithWithPrivateParmeterTypes.myPrivateStaticMethod = function (param) {
-        };
-        publicClassWithWithPrivateParmeterTypes.prototype.myPublicMethod = function (param) {
-        };
-        publicClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod = function (param) {
-        };
-        return publicClassWithWithPrivateParmeterTypes;
-    })();
-    publicModule.publicClassWithWithPrivateParmeterTypes = publicClassWithWithPrivateParmeterTypes;
-    var publicClassWithWithPublicParmeterTypes = (function () {
-        function publicClassWithWithPublicParmeterTypes(param, param1, param2) {
-            this.param1 = param1;
-            this.param2 = param2;
-        }
-        publicClassWithWithPublicParmeterTypes.myPublicStaticMethod = function (param) {
-        };
-        publicClassWithWithPublicParmeterTypes.myPrivateStaticMethod = function (param) {
-        };
-        publicClassWithWithPublicParmeterTypes.prototype.myPublicMethod = function (param) {
-        };
-        publicClassWithWithPublicParmeterTypes.prototype.myPrivateMethod = function (param) {
-        };
-        return publicClassWithWithPublicParmeterTypes;
-    })();
-    publicModule.publicClassWithWithPublicParmeterTypes = publicClassWithWithPublicParmeterTypes;
-    var privateClassWithWithPrivateParmeterTypes = (function () {
-        function privateClassWithWithPrivateParmeterTypes(param, param1, param2) {
-            this.param1 = param1;
-            this.param2 = param2;
-        }
-        privateClassWithWithPrivateParmeterTypes.myPublicStaticMethod = function (param) {
-        };
-        privateClassWithWithPrivateParmeterTypes.myPrivateStaticMethod = function (param) {
-        };
-        privateClassWithWithPrivateParmeterTypes.prototype.myPublicMethod = function (param) {
-        };
-        privateClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod = function (param) {
-        };
-        return privateClassWithWithPrivateParmeterTypes;
-    })();
-    var privateClassWithWithPublicParmeterTypes = (function () {
-        function privateClassWithWithPublicParmeterTypes(param, param1, param2) {
-            this.param1 = param1;
-            this.param2 = param2;
-        }
-        privateClassWithWithPublicParmeterTypes.myPublicStaticMethod = function (param) {
-        };
-        privateClassWithWithPublicParmeterTypes.myPrivateStaticMethod = function (param) {
-        };
-        privateClassWithWithPublicParmeterTypes.prototype.myPublicMethod = function (param) {
-        };
-        privateClassWithWithPublicParmeterTypes.prototype.myPrivateMethod = function (param) {
-        };
-        return privateClassWithWithPublicParmeterTypes;
-    })();
-    function publicFunctionWithPrivateParmeterTypes(param) {
-    }
-    publicModule.publicFunctionWithPrivateParmeterTypes = publicFunctionWithPrivateParmeterTypes;
-    function publicFunctionWithPublicParmeterTypes(param) {
-    }
-    publicModule.publicFunctionWithPublicParmeterTypes = publicFunctionWithPublicParmeterTypes;
-    function privateFunctionWithPrivateParmeterTypes(param) {
-    }
-    function privateFunctionWithPublicParmeterTypes(param) {
-    }
-    var publicClassWithPrivateModuleParameterTypes = (function () {
-        function publicClassWithPrivateModuleParameterTypes(param, param1, param2) {
-            this.param1 = param1;
-            this.param2 = param2;
-        }
-        publicClassWithPrivateModuleParameterTypes.myPublicStaticMethod = function (param) {
-        };
-        publicClassWithPrivateModuleParameterTypes.prototype.myPublicMethod = function (param) {
-        };
-        return publicClassWithPrivateModuleParameterTypes;
-    })();
-    publicModule.publicClassWithPrivateModuleParameterTypes = publicClassWithPrivateModuleParameterTypes;
-    function publicFunctionWithPrivateModuleParameterTypes(param) {
-    }
-    publicModule.publicFunctionWithPrivateModuleParameterTypes = publicFunctionWithPrivateModuleParameterTypes;
-    var privateClassWithPrivateModuleParameterTypes = (function () {
-        function privateClassWithPrivateModuleParameterTypes(param, param1, param2) {
-            this.param1 = param1;
-            this.param2 = param2;
-        }
-        privateClassWithPrivateModuleParameterTypes.myPublicStaticMethod = function (param) {
-        };
-        privateClassWithPrivateModuleParameterTypes.prototype.myPublicMethod = function (param) {
-        };
-        return privateClassWithPrivateModuleParameterTypes;
-    })();
-    function privateFunctionWithPrivateModuleParameterTypes(param) {
-    }
-})(exports.publicModule || (exports.publicModule = {}));
-var publicModule = exports.publicModule;
-var privateModule;
-(function (privateModule) {
-    var privateClass = (function () {
-        function privateClass() {
-        }
-        return privateClass;
-    })();
-    var publicClass = (function () {
-        function publicClass() {
-        }
-        return publicClass;
-    })();
-    privateModule.publicClass = publicClass;
-    var publicClassWithWithPrivateParmeterTypes = (function () {
-        function publicClassWithWithPrivateParmeterTypes(param, param1, param2) {
-            this.param1 = param1;
-            this.param2 = param2;
-        }
-        publicClassWithWithPrivateParmeterTypes.myPublicStaticMethod = function (param) {
-        };
-        publicClassWithWithPrivateParmeterTypes.myPrivateStaticMethod = function (param) {
-        };
-        publicClassWithWithPrivateParmeterTypes.prototype.myPublicMethod = function (param) {
-        };
-        publicClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod = function (param) {
-        };
-        return publicClassWithWithPrivateParmeterTypes;
-    })();
-    privateModule.publicClassWithWithPrivateParmeterTypes = publicClassWithWithPrivateParmeterTypes;
-    var publicClassWithWithPublicParmeterTypes = (function () {
-        function publicClassWithWithPublicParmeterTypes(param, param1, param2) {
-            this.param1 = param1;
-            this.param2 = param2;
-        }
-        publicClassWithWithPublicParmeterTypes.myPublicStaticMethod = function (param) {
-        };
-        publicClassWithWithPublicParmeterTypes.myPrivateStaticMethod = function (param) {
-        };
-        publicClassWithWithPublicParmeterTypes.prototype.myPublicMethod = function (param) {
-        };
-        publicClassWithWithPublicParmeterTypes.prototype.myPrivateMethod = function (param) {
-        };
-        return publicClassWithWithPublicParmeterTypes;
-    })();
-    privateModule.publicClassWithWithPublicParmeterTypes = publicClassWithWithPublicParmeterTypes;
-    var privateClassWithWithPrivateParmeterTypes = (function () {
-        function privateClassWithWithPrivateParmeterTypes(param, param1, param2) {
-            this.param1 = param1;
-            this.param2 = param2;
-        }
-        privateClassWithWithPrivateParmeterTypes.myPublicStaticMethod = function (param) {
-        };
-        privateClassWithWithPrivateParmeterTypes.myPrivateStaticMethod = function (param) {
-        };
-        privateClassWithWithPrivateParmeterTypes.prototype.myPublicMethod = function (param) {
-        };
-        privateClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod = function (param) {
-        };
-        return privateClassWithWithPrivateParmeterTypes;
-    })();
-    var privateClassWithWithPublicParmeterTypes = (function () {
-        function privateClassWithWithPublicParmeterTypes(param, param1, param2) {
-            this.param1 = param1;
-            this.param2 = param2;
-        }
-        privateClassWithWithPublicParmeterTypes.myPublicStaticMethod = function (param) {
-        };
-        privateClassWithWithPublicParmeterTypes.myPrivateStaticMethod = function (param) {
-        };
-        privateClassWithWithPublicParmeterTypes.prototype.myPublicMethod = function (param) {
-        };
-        privateClassWithWithPublicParmeterTypes.prototype.myPrivateMethod = function (param) {
-        };
-        return privateClassWithWithPublicParmeterTypes;
-    })();
-    function publicFunctionWithPrivateParmeterTypes(param) {
-    }
-    privateModule.publicFunctionWithPrivateParmeterTypes = publicFunctionWithPrivateParmeterTypes;
-    function publicFunctionWithPublicParmeterTypes(param) {
-    }
-    privateModule.publicFunctionWithPublicParmeterTypes = publicFunctionWithPublicParmeterTypes;
-    function privateFunctionWithPrivateParmeterTypes(param) {
-    }
-    function privateFunctionWithPublicParmeterTypes(param) {
-    }
-    var publicClassWithPrivateModuleParameterTypes = (function () {
-        function publicClassWithPrivateModuleParameterTypes(param, param1, param2) {
-            this.param1 = param1;
-            this.param2 = param2;
-        }
-        publicClassWithPrivateModuleParameterTypes.myPublicStaticMethod = function (param) {
-        };
-        publicClassWithPrivateModuleParameterTypes.prototype.myPublicMethod = function (param) {
-        };
-        return publicClassWithPrivateModuleParameterTypes;
-    })();
-    privateModule.publicClassWithPrivateModuleParameterTypes = publicClassWithPrivateModuleParameterTypes;
-    function publicFunctionWithPrivateModuleParameterTypes(param) {
-    }
-    privateModule.publicFunctionWithPrivateModuleParameterTypes = publicFunctionWithPrivateModuleParameterTypes;
-    var privateClassWithPrivateModuleParameterTypes = (function () {
-        function privateClassWithPrivateModuleParameterTypes(param, param1, param2) {
-            this.param1 = param1;
-            this.param2 = param2;
-        }
-        privateClassWithPrivateModuleParameterTypes.myPublicStaticMethod = function (param) {
-        };
-        privateClassWithPrivateModuleParameterTypes.prototype.myPublicMethod = function (param) {
-        };
-        return privateClassWithPrivateModuleParameterTypes;
-    })();
-    function privateFunctionWithPrivateModuleParameterTypes(param) {
-    }
-})(privateModule || (privateModule = {}));
-//// [privacyFunctionParameterDeclFile_GlobalFile.js]
-var publicClassInGlobal = (function () {
-    function publicClassInGlobal() {
-    }
-    return publicClassInGlobal;
-})();
-var publicClassWithWithPublicParmeterTypesInGlobal = (function () {
-    function publicClassWithWithPublicParmeterTypesInGlobal(param, param1, param2) {
-        this.param1 = param1;
-        this.param2 = param2;
-    }
-    publicClassWithWithPublicParmeterTypesInGlobal.myPublicStaticMethod = function (param) {
-    };
-    publicClassWithWithPublicParmeterTypesInGlobal.myPrivateStaticMethod = function (param) {
-    };
-    publicClassWithWithPublicParmeterTypesInGlobal.prototype.myPublicMethod = function (param) {
-    };
-    publicClassWithWithPublicParmeterTypesInGlobal.prototype.myPrivateMethod = function (param) {
-    };
-    return publicClassWithWithPublicParmeterTypesInGlobal;
-})();
-function publicFunctionWithPublicParmeterTypesInGlobal(param) {
-}
-var publicModuleInGlobal;
-(function (publicModuleInGlobal) {
-    var privateClass = (function () {
-        function privateClass() {
-        }
-        return privateClass;
-    })();
-    var publicClass = (function () {
-        function publicClass() {
-        }
-        return publicClass;
-    })();
-    publicModuleInGlobal.publicClass = publicClass;
-    var privateModule;
-    (function (privateModule) {
-        var privateClass = (function () {
-            function privateClass() {
-            }
-            return privateClass;
-        })();
-        var publicClass = (function () {
-            function publicClass() {
-            }
-            return publicClass;
-        })();
-        privateModule.publicClass = publicClass;
-        var publicClassWithWithPrivateParmeterTypes = (function () {
-            function publicClassWithWithPrivateParmeterTypes(param, param1, param2) {
-                this.param1 = param1;
-                this.param2 = param2;
-            }
-            publicClassWithWithPrivateParmeterTypes.myPublicStaticMethod = function (param) {
-            };
-            publicClassWithWithPrivateParmeterTypes.myPrivateStaticMethod = function (param) {
-            };
-            publicClassWithWithPrivateParmeterTypes.prototype.myPublicMethod = function (param) {
-            };
-            publicClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod = function (param) {
-            };
-            return publicClassWithWithPrivateParmeterTypes;
-        })();
-        privateModule.publicClassWithWithPrivateParmeterTypes = publicClassWithWithPrivateParmeterTypes;
-        var publicClassWithWithPublicParmeterTypes = (function () {
-            function publicClassWithWithPublicParmeterTypes(param, param1, param2) {
-                this.param1 = param1;
-                this.param2 = param2;
-            }
-            publicClassWithWithPublicParmeterTypes.myPublicStaticMethod = function (param) {
-            };
-            publicClassWithWithPublicParmeterTypes.myPrivateStaticMethod = function (param) {
-            };
-            publicClassWithWithPublicParmeterTypes.prototype.myPublicMethod = function (param) {
-            };
-            publicClassWithWithPublicParmeterTypes.prototype.myPrivateMethod = function (param) {
-            };
-            return publicClassWithWithPublicParmeterTypes;
-        })();
-        privateModule.publicClassWithWithPublicParmeterTypes = publicClassWithWithPublicParmeterTypes;
-        var privateClassWithWithPrivateParmeterTypes = (function () {
-            function privateClassWithWithPrivateParmeterTypes(param, param1, param2) {
-                this.param1 = param1;
-                this.param2 = param2;
-            }
-            privateClassWithWithPrivateParmeterTypes.myPublicStaticMethod = function (param) {
-            };
-            privateClassWithWithPrivateParmeterTypes.myPrivateStaticMethod = function (param) {
-            };
-            privateClassWithWithPrivateParmeterTypes.prototype.myPublicMethod = function (param) {
-            };
-            privateClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod = function (param) {
-            };
-            return privateClassWithWithPrivateParmeterTypes;
-        })();
-        var privateClassWithWithPublicParmeterTypes = (function () {
-            function privateClassWithWithPublicParmeterTypes(param, param1, param2) {
-                this.param1 = param1;
-                this.param2 = param2;
-            }
-            privateClassWithWithPublicParmeterTypes.myPublicStaticMethod = function (param) {
-            };
-            privateClassWithWithPublicParmeterTypes.myPrivateStaticMethod = function (param) {
-            };
-            privateClassWithWithPublicParmeterTypes.prototype.myPublicMethod = function (param) {
-            };
-            privateClassWithWithPublicParmeterTypes.prototype.myPrivateMethod = function (param) {
-            };
-            return privateClassWithWithPublicParmeterTypes;
-        })();
-        function publicFunctionWithPrivateParmeterTypes(param) {
-        }
-        privateModule.publicFunctionWithPrivateParmeterTypes = publicFunctionWithPrivateParmeterTypes;
-        function publicFunctionWithPublicParmeterTypes(param) {
-        }
-        privateModule.publicFunctionWithPublicParmeterTypes = publicFunctionWithPublicParmeterTypes;
-        function privateFunctionWithPrivateParmeterTypes(param) {
-        }
-        function privateFunctionWithPublicParmeterTypes(param) {
-        }
-        var publicClassWithPrivateModuleParameterTypes = (function () {
-            function publicClassWithPrivateModuleParameterTypes(param, param1, param2) {
-                this.param1 = param1;
-                this.param2 = param2;
-            }
-            publicClassWithPrivateModuleParameterTypes.myPublicStaticMethod = function (param) {
-            };
-            publicClassWithPrivateModuleParameterTypes.prototype.myPublicMethod = function (param) {
-            };
-            return publicClassWithPrivateModuleParameterTypes;
-        })();
-        privateModule.publicClassWithPrivateModuleParameterTypes = publicClassWithPrivateModuleParameterTypes;
-        function publicFunctionWithPrivateModuleParameterTypes(param) {
-        }
-        privateModule.publicFunctionWithPrivateModuleParameterTypes = publicFunctionWithPrivateModuleParameterTypes;
-        var privateClassWithPrivateModuleParameterTypes = (function () {
-            function privateClassWithPrivateModuleParameterTypes(param, param1, param2) {
-                this.param1 = param1;
-                this.param2 = param2;
-            }
-            privateClassWithPrivateModuleParameterTypes.myPublicStaticMethod = function (param) {
-            };
-            privateClassWithPrivateModuleParameterTypes.prototype.myPublicMethod = function (param) {
-            };
-            return privateClassWithPrivateModuleParameterTypes;
-        })();
-        function privateFunctionWithPrivateModuleParameterTypes(param) {
-        }
-    })(privateModule || (privateModule = {}));
-    var publicClassWithWithPrivateParmeterTypes = (function () {
-        function publicClassWithWithPrivateParmeterTypes(param, param1, param2) {
-            this.param1 = param1;
-            this.param2 = param2;
-        }
-        publicClassWithWithPrivateParmeterTypes.myPublicStaticMethod = function (param) {
-        };
-        publicClassWithWithPrivateParmeterTypes.myPrivateStaticMethod = function (param) {
-        };
-        publicClassWithWithPrivateParmeterTypes.prototype.myPublicMethod = function (param) {
-        };
-        publicClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod = function (param) {
-        };
-        return publicClassWithWithPrivateParmeterTypes;
-    })();
-    publicModuleInGlobal.publicClassWithWithPrivateParmeterTypes = publicClassWithWithPrivateParmeterTypes;
-    var publicClassWithWithPublicParmeterTypes = (function () {
-        function publicClassWithWithPublicParmeterTypes(param, param1, param2) {
-            this.param1 = param1;
-            this.param2 = param2;
-        }
-        publicClassWithWithPublicParmeterTypes.myPublicStaticMethod = function (param) {
-        };
-        publicClassWithWithPublicParmeterTypes.myPrivateStaticMethod = function (param) {
-        };
-        publicClassWithWithPublicParmeterTypes.prototype.myPublicMethod = function (param) {
-        };
-        publicClassWithWithPublicParmeterTypes.prototype.myPrivateMethod = function (param) {
-        };
-        return publicClassWithWithPublicParmeterTypes;
-    })();
-    publicModuleInGlobal.publicClassWithWithPublicParmeterTypes = publicClassWithWithPublicParmeterTypes;
-    var privateClassWithWithPrivateParmeterTypes = (function () {
-        function privateClassWithWithPrivateParmeterTypes(param, param1, param2) {
-            this.param1 = param1;
-            this.param2 = param2;
-        }
-        privateClassWithWithPrivateParmeterTypes.myPublicStaticMethod = function (param) {
-        };
-        privateClassWithWithPrivateParmeterTypes.myPrivateStaticMethod = function (param) {
-        };
-        privateClassWithWithPrivateParmeterTypes.prototype.myPublicMethod = function (param) {
-        };
-        privateClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod = function (param) {
-        };
-        return privateClassWithWithPrivateParmeterTypes;
-    })();
-    var privateClassWithWithPublicParmeterTypes = (function () {
-        function privateClassWithWithPublicParmeterTypes(param, param1, param2) {
-            this.param1 = param1;
-            this.param2 = param2;
-        }
-        privateClassWithWithPublicParmeterTypes.myPublicStaticMethod = function (param) {
-        };
-        privateClassWithWithPublicParmeterTypes.myPrivateStaticMethod = function (param) {
-        };
-        privateClassWithWithPublicParmeterTypes.prototype.myPublicMethod = function (param) {
-        };
-        privateClassWithWithPublicParmeterTypes.prototype.myPrivateMethod = function (param) {
-        };
-        return privateClassWithWithPublicParmeterTypes;
-    })();
-    function publicFunctionWithPrivateParmeterTypes(param) {
-    }
-    publicModuleInGlobal.publicFunctionWithPrivateParmeterTypes = publicFunctionWithPrivateParmeterTypes;
-    function publicFunctionWithPublicParmeterTypes(param) {
-    }
-    publicModuleInGlobal.publicFunctionWithPublicParmeterTypes = publicFunctionWithPublicParmeterTypes;
-    function privateFunctionWithPrivateParmeterTypes(param) {
-    }
-    function privateFunctionWithPublicParmeterTypes(param) {
-    }
-    var publicClassWithPrivateModuleParameterTypes = (function () {
-        function publicClassWithPrivateModuleParameterTypes(param, param1, param2) {
-            this.param1 = param1;
-            this.param2 = param2;
-        }
-        publicClassWithPrivateModuleParameterTypes.myPublicStaticMethod = function (param) {
-        };
-        publicClassWithPrivateModuleParameterTypes.prototype.myPublicMethod = function (param) {
-        };
-        return publicClassWithPrivateModuleParameterTypes;
-    })();
-    publicModuleInGlobal.publicClassWithPrivateModuleParameterTypes = publicClassWithPrivateModuleParameterTypes;
-    function publicFunctionWithPrivateModuleParameterTypes(param) {
-    }
-    publicModuleInGlobal.publicFunctionWithPrivateModuleParameterTypes = publicFunctionWithPrivateModuleParameterTypes;
-    var privateClassWithPrivateModuleParameterTypes = (function () {
-        function privateClassWithPrivateModuleParameterTypes(param, param1, param2) {
-            this.param1 = param1;
-            this.param2 = param2;
-        }
-        privateClassWithPrivateModuleParameterTypes.myPublicStaticMethod = function (param) {
-        };
-        privateClassWithPrivateModuleParameterTypes.prototype.myPublicMethod = function (param) {
-        };
-        return privateClassWithPrivateModuleParameterTypes;
-    })();
-    function privateFunctionWithPrivateModuleParameterTypes(param) {
-    }
-})(publicModuleInGlobal || (publicModuleInGlobal = {}));
diff --git a/tests/baselines/reference/privacyFunctionReturnTypeDeclFile.errors.txt b/tests/baselines/reference/privacyFunctionReturnTypeDeclFile.errors.txt
deleted file mode 100644
index 0fe9b40ea83..00000000000
--- a/tests/baselines/reference/privacyFunctionReturnTypeDeclFile.errors.txt
+++ /dev/null
@@ -1,1324 +0,0 @@
-==== tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts (44 errors) ====
-    
-    class privateClass {
-    }
-    
-    export class publicClass {
-    }
-    
-    export interface publicInterfaceWithPrivateParmeterTypes {
-        new (): privateClass; // Error
-        ~~~~~~~~~~~~~~~~~~~~~
-!!! Return type of constructor signature from exported interface has or is using private name 'privateClass'.
-        (): privateClass; // Error
-        ~~~~~~~~~~~~~~~~~
-!!! Return type of call signature from exported interface has or is using private name 'privateClass'.
-        [x: number]: privateClass; // Error
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Return type of index signature from exported interface has or is using private name 'privateClass'.
-        myMethod(): privateClass; // Error
-        ~~~~~~~~
-!!! Return type of method from exported interface has or is using private name 'privateClass'.
-    }
-    
-    export interface publicInterfaceWithPublicParmeterTypes {
-        new (): publicClass;
-        (): publicClass;
-        [x: number]: publicClass;
-        myMethod(): publicClass;
-    }
-    
-    interface privateInterfaceWithPrivateParmeterTypes {
-        new (): privateClass;
-        (): privateClass;
-        [x: number]: privateClass;
-        myMethod(): privateClass;
-    }
-    
-    interface privateInterfaceWithPublicParmeterTypes {
-        new (): publicClass;
-        (): publicClass;
-        [x: number]: publicClass;
-        myMethod(): publicClass;
-    }
-    
-    export class publicClassWithWithPrivateParmeterTypes {
-        static myPublicStaticMethod(): privateClass { // Error
-               ~~~~~~~~~~~~~~~~~~~~
-!!! Return type of public static method from exported class has or is using private name 'privateClass'.
-            return null;
-        }
-        private static myPrivateStaticMethod(): privateClass {
-            return null;
-        }
-        myPublicMethod(): privateClass { // Error
-        ~~~~~~~~~~~~~~
-!!! Return type of public method from exported class has or is using private name 'privateClass'.
-            return null;
-        }
-        private myPrivateMethod(): privateClass {
-            return null;
-        }
-        static myPublicStaticMethod1() { // Error
-               ~~~~~~~~~~~~~~~~~~~~~
-!!! Return type of public static method from exported class has or is using private name 'privateClass'.
-            return new privateClass();
-        }
-        private static myPrivateStaticMethod1() {
-            return new privateClass();
-        }
-        myPublicMethod1() { // Error
-        ~~~~~~~~~~~~~~~
-!!! Return type of public method from exported class has or is using private name 'privateClass'.
-            return new privateClass();
-        }
-        private myPrivateMethod1() {
-            return new privateClass();
-        }
-    }
-    
-    export class publicClassWithWithPublicParmeterTypes {
-        static myPublicStaticMethod(): publicClass { 
-            return null;
-        }
-        private static myPrivateStaticMethod(): publicClass {
-            return null;
-        }
-        myPublicMethod(): publicClass { 
-            return null;
-        }
-        private myPrivateMethod(): publicClass {
-            return null;
-        }
-        static myPublicStaticMethod1() {
-            return new publicClass();
-        }
-        private static myPrivateStaticMethod1() {
-            return new publicClass();
-        }
-        myPublicMethod1() { 
-            return new publicClass();
-        }
-        private myPrivateMethod1() {
-            return new publicClass();
-        }
-    }
-    
-    class privateClassWithWithPrivateParmeterTypes {
-        static myPublicStaticMethod(): privateClass {
-            return null;
-        }
-        private static myPrivateStaticMethod(): privateClass {
-            return null;
-        }
-        myPublicMethod(): privateClass {
-            return null;
-        }
-        private myPrivateMethod(): privateClass {
-            return null;
-        }
-        static myPublicStaticMethod1() {
-            return new privateClass();
-        }
-        private static myPrivateStaticMethod1() {
-            return new privateClass();
-        }
-        myPublicMethod1() {
-            return new privateClass();
-        }
-        private myPrivateMethod1() {
-            return new privateClass();
-        }
-    }
-    
-    class privateClassWithWithPublicParmeterTypes {
-        static myPublicStaticMethod(): publicClass {
-            return null;
-        }
-        private static myPrivateStaticMethod(): publicClass {
-            return null;
-        }
-        myPublicMethod(): publicClass {
-            return null;
-        }
-        private myPrivateMethod(): publicClass {
-            return null;
-        }
-        static myPublicStaticMethod1() {
-            return new publicClass();
-        }
-        private static myPrivateStaticMethod1() {
-            return new publicClass();
-        }
-        myPublicMethod1() {
-            return new publicClass();
-        }
-        private myPrivateMethod1() {
-            return new publicClass();
-        }
-    }
-    
-    export function publicFunctionWithPrivateParmeterTypes(): privateClass { // Error
-                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Return type of exported function has or is using private name 'privateClass'.
-        return null;
-    }
-    export function publicFunctionWithPublicParmeterTypes(): publicClass {
-        return null;
-    }
-    function privateFunctionWithPrivateParmeterTypes(): privateClass {
-        return null;
-    }
-    function privateFunctionWithPublicParmeterTypes(): publicClass {
-        return null;
-    }
-    export function publicFunctionWithPrivateParmeterTypes1() { // Error
-                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Return type of exported function has or is using private name 'privateClass'.
-        return new privateClass();
-    }
-    export function publicFunctionWithPublicParmeterTypes1() {
-        return new publicClass();
-    }
-    function privateFunctionWithPrivateParmeterTypes1() {
-        return new privateClass();
-    }
-    function privateFunctionWithPublicParmeterTypes1() {
-        return new publicClass();
-    }
-    
-    export declare function publicAmbientFunctionWithPrivateParmeterTypes(): privateClass; // Error
-                            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Return type of exported function has or is using private name 'privateClass'.
-    export declare function publicAmbientFunctionWithPublicParmeterTypes(): publicClass;
-    declare function privateAmbientFunctionWithPrivateParmeterTypes(): privateClass;
-    declare function privateAmbientFunctionWithPublicParmeterTypes(): publicClass;
-    
-    export interface publicInterfaceWithPrivateModuleParameterTypes {
-        new (): privateModule.publicClass; // Error
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Return type of constructor signature from exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-        (): privateModule.publicClass; // Error
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Return type of call signature from exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-        [x: number]: privateModule.publicClass // Error
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Return type of index signature from exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-        myMethod(): privateModule.publicClass; // Error
-        ~~~~~~~~
-!!! Return type of method from exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-    }
-    export class publicClassWithPrivateModuleParameterTypes {
-        static myPublicStaticMethod(): privateModule.publicClass { // Error
-               ~~~~~~~~~~~~~~~~~~~~
-!!! Return type of public static method from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-            return null;
-        }
-        myPublicMethod(): privateModule.publicClass { // Error
-        ~~~~~~~~~~~~~~
-!!! Return type of public method from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-            return null;
-        }
-        static myPublicStaticMethod1() { // Error
-               ~~~~~~~~~~~~~~~~~~~~~
-!!! Return type of public static method from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-            return new privateModule.publicClass();
-        }
-        myPublicMethod1() { // Error
-        ~~~~~~~~~~~~~~~
-!!! Return type of public method from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-            return new privateModule.publicClass();
-        }
-    }
-    export function publicFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass { // Error
-                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Return type of exported function has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-        return null;
-    }
-    export function publicFunctionWithPrivateModuleParameterTypes1() { // Error
-                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Return type of exported function has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-        return new privateModule.publicClass();
-    }
-    export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; // Error
-                            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Return type of exported function has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-    
-    interface privateInterfaceWithPrivateModuleParameterTypes {
-        new (): privateModule.publicClass; 
-        (): privateModule.publicClass;
-        [x: number]: privateModule.publicClass
-        myMethod(): privateModule.publicClass;
-    }
-    class privateClassWithPrivateModuleParameterTypes {
-        static myPublicStaticMethod(): privateModule.publicClass { 
-            return null;
-        }
-        myPublicMethod(): privateModule.publicClass { 
-            return null;
-        }
-        static myPublicStaticMethod1() { 
-            return new privateModule.publicClass();
-        }
-        myPublicMethod1() { 
-            return new privateModule.publicClass();
-        }
-    }
-    function privateFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass { 
-        return null;
-    }
-    function privateFunctionWithPrivateModuleParameterTypes1() { 
-        return new privateModule.publicClass();
-    }
-    declare function privateAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; 
-    
-    export module publicModule {
-        class privateClass {
-        }
-    
-        export class publicClass {
-        }
-    
-        export interface publicInterfaceWithPrivateParmeterTypes {
-            new (): privateClass; // Error
-            ~~~~~~~~~~~~~~~~~~~~~
-!!! Return type of constructor signature from exported interface has or is using private name 'privateClass'.
-            (): privateClass; // Error
-            ~~~~~~~~~~~~~~~~~
-!!! Return type of call signature from exported interface has or is using private name 'privateClass'.
-            [x: number]: privateClass; // Error
-            ~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Return type of index signature from exported interface has or is using private name 'privateClass'.
-            myMethod(): privateClass; // Error
-            ~~~~~~~~
-!!! Return type of method from exported interface has or is using private name 'privateClass'.
-        }
-    
-        export interface publicInterfaceWithPublicParmeterTypes {
-            new (): publicClass;
-            (): publicClass;
-            [x: number]: publicClass;
-            myMethod(): publicClass;
-        }
-    
-        interface privateInterfaceWithPrivateParmeterTypes {
-            new (): privateClass;
-            (): privateClass;
-            [x: number]: privateClass;
-            myMethod(): privateClass;
-        }
-    
-        interface privateInterfaceWithPublicParmeterTypes {
-            new (): publicClass;
-            (): publicClass;
-            [x: number]: publicClass;
-            myMethod(): publicClass;
-        }
-    
-        export class publicClassWithWithPrivateParmeterTypes {
-            static myPublicStaticMethod(): privateClass { // Error
-                   ~~~~~~~~~~~~~~~~~~~~
-!!! Return type of public static method from exported class has or is using private name 'privateClass'.
-                return null;
-            }
-            private static myPrivateStaticMethod(): privateClass {
-                return null;
-            }
-            myPublicMethod(): privateClass { // Error
-            ~~~~~~~~~~~~~~
-!!! Return type of public method from exported class has or is using private name 'privateClass'.
-                return null;
-            }
-            private myPrivateMethod(): privateClass {
-                return null;
-            }
-            static myPublicStaticMethod1() { // Error
-                   ~~~~~~~~~~~~~~~~~~~~~
-!!! Return type of public static method from exported class has or is using private name 'privateClass'.
-                return new privateClass();
-            }
-            private static myPrivateStaticMethod1() {
-                return new privateClass();
-            }
-            myPublicMethod1() { // Error
-            ~~~~~~~~~~~~~~~
-!!! Return type of public method from exported class has or is using private name 'privateClass'.
-                return new privateClass();
-            }
-            private myPrivateMethod1() {
-                return new privateClass();
-            }
-        }
-    
-        export class publicClassWithWithPublicParmeterTypes {
-            static myPublicStaticMethod(): publicClass {
-                return null;
-            }
-            private static myPrivateStaticMethod(): publicClass {
-                return null;
-            }
-            myPublicMethod(): publicClass {
-                return null;
-            }
-            private myPrivateMethod(): publicClass {
-                return null;
-            }
-            static myPublicStaticMethod1() {
-                return new publicClass();
-            }
-            private static myPrivateStaticMethod1() {
-                return new publicClass();
-            }
-            myPublicMethod1() {
-                return new publicClass();
-            }
-            private myPrivateMethod1() {
-                return new publicClass();
-            }
-        }
-    
-        class privateClassWithWithPrivateParmeterTypes {
-            static myPublicStaticMethod(): privateClass {
-                return null;
-            }
-            private static myPrivateStaticMethod(): privateClass {
-                return null;
-            }
-            myPublicMethod(): privateClass {
-                return null;
-            }
-            private myPrivateMethod(): privateClass {
-                return null;
-            }
-            static myPublicStaticMethod1() {
-                return new privateClass();
-            }
-            private static myPrivateStaticMethod1() {
-                return new privateClass();
-            }
-            myPublicMethod1() {
-                return new privateClass();
-            }
-            private myPrivateMethod1() {
-                return new privateClass();
-            }
-        }
-    
-        class privateClassWithWithPublicParmeterTypes {
-            static myPublicStaticMethod(): publicClass {
-                return null;
-            }
-            private static myPrivateStaticMethod(): publicClass {
-                return null;
-            }
-            myPublicMethod(): publicClass {
-                return null;
-            }
-            private myPrivateMethod(): publicClass {
-                return null;
-            }
-            static myPublicStaticMethod1() {
-                return new publicClass();
-            }
-            private static myPrivateStaticMethod1() {
-                return new publicClass();
-            }
-            myPublicMethod1() {
-                return new publicClass();
-            }
-            private myPrivateMethod1() {
-                return new publicClass();
-            }
-        }
-    
-        export function publicFunctionWithPrivateParmeterTypes(): privateClass { // Error
-                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Return type of exported function has or is using private name 'privateClass'.
-            return null;
-        }
-        export function publicFunctionWithPublicParmeterTypes(): publicClass {
-            return null;
-        }
-        function privateFunctionWithPrivateParmeterTypes(): privateClass {
-            return null;
-        }
-        function privateFunctionWithPublicParmeterTypes(): publicClass {
-            return null;
-        }
-        export function publicFunctionWithPrivateParmeterTypes1() { // Error
-                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Return type of exported function has or is using private name 'privateClass'.
-            return new privateClass();
-        }
-        export function publicFunctionWithPublicParmeterTypes1() {
-            return new publicClass();
-        }
-        function privateFunctionWithPrivateParmeterTypes1() {
-            return new privateClass();
-        }
-        function privateFunctionWithPublicParmeterTypes1() {
-            return new publicClass();
-        }
-    
-        export declare function publicAmbientFunctionWithPrivateParmeterTypes(): privateClass; // Error
-                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Return type of exported function has or is using private name 'privateClass'.
-        export declare function publicAmbientFunctionWithPublicParmeterTypes(): publicClass;
-        declare function privateAmbientFunctionWithPrivateParmeterTypes(): privateClass;
-        declare function privateAmbientFunctionWithPublicParmeterTypes(): publicClass;
-    
-        export interface publicInterfaceWithPrivateModuleParameterTypes {
-            new (): privateModule.publicClass; // Error
-            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Return type of constructor signature from exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-            (): privateModule.publicClass; // Error
-            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Return type of call signature from exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-            [x: number]: privateModule.publicClass; // Error
-            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Return type of index signature from exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-            myMethod(): privateModule.publicClass; // Error
-            ~~~~~~~~
-!!! Return type of method from exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-        }
-        export class publicClassWithPrivateModuleParameterTypes {
-            static myPublicStaticMethod(): privateModule.publicClass { // Error
-                   ~~~~~~~~~~~~~~~~~~~~
-!!! Return type of public static method from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-                return null;
-            }
-            myPublicMethod(): privateModule.publicClass { // Error
-            ~~~~~~~~~~~~~~
-!!! Return type of public method from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-                return null;
-            }
-            static myPublicStaticMethod1() { // Error
-                   ~~~~~~~~~~~~~~~~~~~~~
-!!! Return type of public static method from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-                return new privateModule.publicClass();
-            }
-            myPublicMethod1() { // Error
-            ~~~~~~~~~~~~~~~
-!!! Return type of public method from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-                return new privateModule.publicClass();
-            }
-        }
-        export function publicFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass { // Error
-                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Return type of exported function has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-            return null;
-        }
-        export function publicFunctionWithPrivateModuleParameterTypes1() { // Error
-                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Return type of exported function has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-            return new privateModule.publicClass();
-        }
-        export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; // Error
-                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Return type of exported function has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-    
-        interface privateInterfaceWithPrivateModuleParameterTypes {
-            new (): privateModule.publicClass;
-            (): privateModule.publicClass;
-            [x: number]: privateModule.publicClass;
-            myMethod(): privateModule.publicClass;
-        }
-        class privateClassWithPrivateModuleParameterTypes {
-            static myPublicStaticMethod(): privateModule.publicClass {
-                return null;
-            }
-            myPublicMethod(): privateModule.publicClass {
-                return null;
-            }
-            static myPublicStaticMethod1() {
-                return new privateModule.publicClass();
-            }
-            myPublicMethod1() {
-                return new privateModule.publicClass();
-            }
-        }
-        function privateFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass {
-            return null;
-        }
-        function privateFunctionWithPrivateModuleParameterTypes1() {
-            return new privateModule.publicClass();
-        }
-        declare function privateAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; 
-    }
-    
-    module privateModule {
-        class privateClass {
-        }
-    
-        export class publicClass {
-        }
-    
-        export interface publicInterfaceWithPrivateParmeterTypes {
-            new (): privateClass; 
-            (): privateClass; 
-            [x: number]: privateClass; 
-            myMethod(): privateClass; 
-        }
-    
-        export interface publicInterfaceWithPublicParmeterTypes {
-            new (): publicClass;
-            (): publicClass;
-            [x: number]: publicClass;
-            myMethod(): publicClass;
-        }
-    
-        interface privateInterfaceWithPrivateParmeterTypes {
-            new (): privateClass;
-            (): privateClass;
-            [x: number]: privateClass;
-            myMethod(): privateClass;
-        }
-    
-        interface privateInterfaceWithPublicParmeterTypes {
-            new (): publicClass;
-            (): publicClass;
-            [x: number]: publicClass;
-            myMethod(): publicClass;
-        }
-    
-        export class publicClassWithWithPrivateParmeterTypes {
-            static myPublicStaticMethod(): privateClass { 
-                return null;
-            }
-            private static myPrivateStaticMethod(): privateClass {
-                return null;
-            }
-            myPublicMethod(): privateClass { 
-                return null;
-            }
-            private myPrivateMethod(): privateClass {
-                return null;
-            }
-            static myPublicStaticMethod1() { 
-                return new privateClass();
-            }
-            private static myPrivateStaticMethod1() {
-                return new privateClass();
-            }
-            myPublicMethod1() { 
-                return new privateClass();
-            }
-            private myPrivateMethod1() {
-                return new privateClass();
-            }
-        }
-    
-        export class publicClassWithWithPublicParmeterTypes {
-            static myPublicStaticMethod(): publicClass {
-                return null;
-            }
-            private static myPrivateStaticMethod(): publicClass {
-                return null;
-            }
-            myPublicMethod(): publicClass {
-                return null;
-            }
-            private myPrivateMethod(): publicClass {
-                return null;
-            }
-            static myPublicStaticMethod1() {
-                return new publicClass();
-            }
-            private static myPrivateStaticMethod1() {
-                return new publicClass();
-            }
-            myPublicMethod1() {
-                return new publicClass();
-            }
-            private myPrivateMethod1() {
-                return new publicClass();
-            }
-        }
-    
-        class privateClassWithWithPrivateParmeterTypes {
-            static myPublicStaticMethod(): privateClass {
-                return null;
-            }
-            private static myPrivateStaticMethod(): privateClass {
-                return null;
-            }
-            myPublicMethod(): privateClass {
-                return null;
-            }
-            private myPrivateMethod(): privateClass {
-                return null;
-            }
-            static myPublicStaticMethod1() {
-                return new privateClass();
-            }
-            private static myPrivateStaticMethod1() {
-                return new privateClass();
-            }
-            myPublicMethod1() {
-                return new privateClass();
-            }
-            private myPrivateMethod1() {
-                return new privateClass();
-            }
-        }
-    
-        class privateClassWithWithPublicParmeterTypes {
-            static myPublicStaticMethod(): publicClass {
-                return null;
-            }
-            private static myPrivateStaticMethod(): publicClass {
-                return null;
-            }
-            myPublicMethod(): publicClass {
-                return null;
-            }
-            private myPrivateMethod(): publicClass {
-                return null;
-            }
-            static myPublicStaticMethod1() {
-                return new publicClass();
-            }
-            private static myPrivateStaticMethod1() {
-                return new publicClass();
-            }
-            myPublicMethod1() {
-                return new publicClass();
-            }
-            private myPrivateMethod1() {
-                return new publicClass();
-            }
-        }
-    
-        export function publicFunctionWithPrivateParmeterTypes(): privateClass { 
-            return null;
-        }
-        export function publicFunctionWithPublicParmeterTypes(): publicClass {
-            return null;
-        }
-        function privateFunctionWithPrivateParmeterTypes(): privateClass {
-            return null;
-        }
-        function privateFunctionWithPublicParmeterTypes(): publicClass {
-            return null;
-        }
-        export function publicFunctionWithPrivateParmeterTypes1() { 
-            return new privateClass();
-        }
-        export function publicFunctionWithPublicParmeterTypes1() {
-            return new publicClass();
-        }
-        function privateFunctionWithPrivateParmeterTypes1() {
-            return new privateClass();
-        }
-        function privateFunctionWithPublicParmeterTypes1() {
-            return new publicClass();
-        }
-    
-        export declare function publicAmbientFunctionWithPrivateParmeterTypes(): privateClass; 
-        export declare function publicAmbientFunctionWithPublicParmeterTypes(): publicClass;
-        declare function privateAmbientFunctionWithPrivateParmeterTypes(): privateClass;
-        declare function privateAmbientFunctionWithPublicParmeterTypes(): publicClass;
-    
-        export interface publicInterfaceWithPrivateModuleParameterTypes {
-            new (): privateModule.publicClass;
-            (): privateModule.publicClass;
-            [x: number]: privateModule.publicClass;
-            myMethod(): privateModule.publicClass;
-        }
-        export class publicClassWithPrivateModuleParameterTypes {
-            static myPublicStaticMethod(): privateModule.publicClass { 
-                return null;
-            }
-            myPublicMethod(): privateModule.publicClass { 
-                return null;
-            }
-            static myPublicStaticMethod1() { 
-                return new privateModule.publicClass();
-            }
-            myPublicMethod1() { 
-                return new privateModule.publicClass();
-            }
-        }
-        export function publicFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass { 
-            return null;
-        }
-        export function publicFunctionWithPrivateModuleParameterTypes1() { 
-            return new privateModule.publicClass();
-        }
-        export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; 
-    
-        interface privateInterfaceWithPrivateModuleParameterTypes {
-            new (): privateModule.publicClass;
-            (): privateModule.publicClass;
-            [x: number]: privateModule.publicClass;
-            myMethod(): privateModule.publicClass;
-        }
-        class privateClassWithPrivateModuleParameterTypes {
-            static myPublicStaticMethod(): privateModule.publicClass {
-                return null;
-            }
-            myPublicMethod(): privateModule.publicClass {
-                return null;
-            }
-            static myPublicStaticMethod1() {
-                return new privateModule.publicClass();
-            }
-            myPublicMethod1() {
-                return new privateModule.publicClass();
-            }
-        }
-        function privateFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass {
-            return null;
-        }
-        function privateFunctionWithPrivateModuleParameterTypes1() {
-            return new privateModule.publicClass();
-        }
-        declare function privateAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; 
-    }
-    
-==== tests/cases/compiler/privacyFunctionReturnTypeDeclFile_GlobalFile.ts (22 errors) ====
-    class publicClassInGlobal {
-    }
-    interface publicInterfaceWithPublicParmeterTypesInGlobal {
-        new (): publicClassInGlobal;
-        (): publicClassInGlobal;
-        [x: number]: publicClassInGlobal;
-        myMethod(): publicClassInGlobal;
-    }
-    class publicClassWithWithPublicParmeterTypesInGlobal {
-        static myPublicStaticMethod(): publicClassInGlobal {
-            return null;
-        }
-        private static myPrivateStaticMethod(): publicClassInGlobal {
-            return null;
-        }
-        myPublicMethod(): publicClassInGlobal {
-            return null;
-        }
-        private myPrivateMethod(): publicClassInGlobal {
-            return null;
-        }
-        static myPublicStaticMethod1() {
-            return new publicClassInGlobal();
-        }
-        private static myPrivateStaticMethod1() {
-            return new publicClassInGlobal();
-        }
-        myPublicMethod1() {
-            return new publicClassInGlobal();
-        }
-        private myPrivateMethod1() {
-            return new publicClassInGlobal();
-        }
-    }
-    function publicFunctionWithPublicParmeterTypesInGlobal(): publicClassInGlobal {
-        return null;
-    }
-    function publicFunctionWithPublicParmeterTypesInGlobal1() {
-        return new publicClassInGlobal();
-    }
-    declare function publicAmbientFunctionWithPublicParmeterTypesInGlobal(): publicClassInGlobal;
-    
-    module publicModuleInGlobal {
-        class privateClass {
-        }
-    
-        export class publicClass {
-        }
-    
-        module privateModule {
-            class privateClass {
-            }
-    
-            export class publicClass {
-            }
-    
-            export interface publicInterfaceWithPrivateParmeterTypes {
-                new (): privateClass;
-                (): privateClass;
-                [x: number]: privateClass;
-                myMethod(): privateClass;
-            }
-    
-            export interface publicInterfaceWithPublicParmeterTypes {
-                new (): publicClass;
-                (): publicClass;
-                [x: number]: publicClass;
-                myMethod(): publicClass;
-            }
-    
-            interface privateInterfaceWithPrivateParmeterTypes {
-                new (): privateClass;
-                (): privateClass;
-                [x: number]: privateClass;
-                myMethod(): privateClass;
-            }
-    
-            interface privateInterfaceWithPublicParmeterTypes {
-                new (): publicClass;
-                (): publicClass;
-                [x: number]: publicClass;
-                myMethod(): publicClass;
-            }
-    
-            export class publicClassWithWithPrivateParmeterTypes {
-                static myPublicStaticMethod(): privateClass {
-                    return null;
-                }
-                private static myPrivateStaticMethod(): privateClass {
-                    return null;
-                }
-                myPublicMethod(): privateClass {
-                    return null;
-                }
-                private myPrivateMethod(): privateClass {
-                    return null;
-                }
-                static myPublicStaticMethod1() {
-                    return new privateClass();
-                }
-                private static myPrivateStaticMethod1() {
-                    return new privateClass();
-                }
-                myPublicMethod1() {
-                    return new privateClass();
-                }
-                private myPrivateMethod1() {
-                    return new privateClass();
-                }
-            }
-    
-            export class publicClassWithWithPublicParmeterTypes {
-                static myPublicStaticMethod(): publicClass {
-                    return null;
-                }
-                private static myPrivateStaticMethod(): publicClass {
-                    return null;
-                }
-                myPublicMethod(): publicClass {
-                    return null;
-                }
-                private myPrivateMethod(): publicClass {
-                    return null;
-                }
-                static myPublicStaticMethod1() {
-                    return new publicClass();
-                }
-                private static myPrivateStaticMethod1() {
-                    return new publicClass();
-                }
-                myPublicMethod1() {
-                    return new publicClass();
-                }
-                private myPrivateMethod1() {
-                    return new publicClass();
-                }
-            }
-    
-            class privateClassWithWithPrivateParmeterTypes {
-                static myPublicStaticMethod(): privateClass {
-                    return null;
-                }
-                private static myPrivateStaticMethod(): privateClass {
-                    return null;
-                }
-                myPublicMethod(): privateClass {
-                    return null;
-                }
-                private myPrivateMethod(): privateClass {
-                    return null;
-                }
-                static myPublicStaticMethod1() {
-                    return new privateClass();
-                }
-                private static myPrivateStaticMethod1() {
-                    return new privateClass();
-                }
-                myPublicMethod1() {
-                    return new privateClass();
-                }
-                private myPrivateMethod1() {
-                    return new privateClass();
-                }
-            }
-    
-            class privateClassWithWithPublicParmeterTypes {
-                static myPublicStaticMethod(): publicClass {
-                    return null;
-                }
-                private static myPrivateStaticMethod(): publicClass {
-                    return null;
-                }
-                myPublicMethod(): publicClass {
-                    return null;
-                }
-                private myPrivateMethod(): publicClass {
-                    return null;
-                }
-                static myPublicStaticMethod1() {
-                    return new publicClass();
-                }
-                private static myPrivateStaticMethod1() {
-                    return new publicClass();
-                }
-                myPublicMethod1() {
-                    return new publicClass();
-                }
-                private myPrivateMethod1() {
-                    return new publicClass();
-                }
-            }
-    
-            export function publicFunctionWithPrivateParmeterTypes(): privateClass {
-                return null;
-            }
-            export function publicFunctionWithPublicParmeterTypes(): publicClass {
-                return null;
-            }
-            function privateFunctionWithPrivateParmeterTypes(): privateClass {
-                return null;
-            }
-            function privateFunctionWithPublicParmeterTypes(): publicClass {
-                return null;
-            }
-            export function publicFunctionWithPrivateParmeterTypes1() {
-                return new privateClass();
-            }
-            export function publicFunctionWithPublicParmeterTypes1() {
-                return new publicClass();
-            }
-            function privateFunctionWithPrivateParmeterTypes1() {
-                return new privateClass();
-            }
-            function privateFunctionWithPublicParmeterTypes1() {
-                return new publicClass();
-            }
-    
-            export declare function publicAmbientFunctionWithPrivateParmeterTypes(): privateClass;
-            export declare function publicAmbientFunctionWithPublicParmeterTypes(): publicClass;
-            declare function privateAmbientFunctionWithPrivateParmeterTypes(): privateClass;
-            declare function privateAmbientFunctionWithPublicParmeterTypes(): publicClass;
-    
-            export interface publicInterfaceWithPrivateModuleParameterTypes {
-                new (): privateModule.publicClass;
-                (): privateModule.publicClass;
-                [x: number]: privateModule.publicClass;
-                myMethod(): privateModule.publicClass;
-            }
-            export class publicClassWithPrivateModuleParameterTypes {
-                static myPublicStaticMethod(): privateModule.publicClass {
-                    return null;
-                }
-                myPublicMethod(): privateModule.publicClass {
-                    return null;
-                }
-                static myPublicStaticMethod1() {
-                    return new privateModule.publicClass();
-                }
-                myPublicMethod1() {
-                    return new privateModule.publicClass();
-                }
-            }
-            export function publicFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass {
-                return null;
-            }
-            export function publicFunctionWithPrivateModuleParameterTypes1() {
-                return new privateModule.publicClass();
-            }
-            export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass;
-    
-            interface privateInterfaceWithPrivateModuleParameterTypes {
-                new (): privateModule.publicClass;
-                (): privateModule.publicClass;
-                [x: number]: privateModule.publicClass;
-                myMethod(): privateModule.publicClass;
-            }
-            class privateClassWithPrivateModuleParameterTypes {
-                static myPublicStaticMethod(): privateModule.publicClass {
-                    return null;
-                }
-                myPublicMethod(): privateModule.publicClass {
-                    return null;
-                }
-                static myPublicStaticMethod1() {
-                    return new privateModule.publicClass();
-                }
-                myPublicMethod1() {
-                    return new privateModule.publicClass();
-                }
-            }
-            function privateFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass {
-                return null;
-            }
-            function privateFunctionWithPrivateModuleParameterTypes1() {
-                return new privateModule.publicClass();
-            }
-            declare function privateAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass;
-        }
-    
-        export interface publicInterfaceWithPrivateParmeterTypes {
-            new (): privateClass; // Error
-            ~~~~~~~~~~~~~~~~~~~~~
-!!! Return type of constructor signature from exported interface has or is using private name 'privateClass'.
-            (): privateClass; // Error
-            ~~~~~~~~~~~~~~~~~
-!!! Return type of call signature from exported interface has or is using private name 'privateClass'.
-            [x: number]: privateClass; // Error
-            ~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Return type of index signature from exported interface has or is using private name 'privateClass'.
-            myMethod(): privateClass; // Error
-            ~~~~~~~~
-!!! Return type of method from exported interface has or is using private name 'privateClass'.
-        }
-    
-        export interface publicInterfaceWithPublicParmeterTypes {
-            new (): publicClass;
-            (): publicClass;
-            [x: number]: publicClass;
-            myMethod(): publicClass;
-        }
-    
-        interface privateInterfaceWithPrivateParmeterTypes {
-            new (): privateClass;
-            (): privateClass;
-            [x: number]: privateClass;
-            myMethod(): privateClass;
-        }
-    
-        interface privateInterfaceWithPublicParmeterTypes {
-            new (): publicClass;
-            (): publicClass;
-            [x: number]: publicClass;
-            myMethod(): publicClass;
-        }
-    
-        export class publicClassWithWithPrivateParmeterTypes {
-            static myPublicStaticMethod(): privateClass { // Error
-                   ~~~~~~~~~~~~~~~~~~~~
-!!! Return type of public static method from exported class has or is using private name 'privateClass'.
-                return null;
-            }
-            private static myPrivateStaticMethod(): privateClass {
-                return null;
-            }
-            myPublicMethod(): privateClass { // Error
-            ~~~~~~~~~~~~~~
-!!! Return type of public method from exported class has or is using private name 'privateClass'.
-                return null;
-            }
-            private myPrivateMethod(): privateClass {
-                return null;
-            }
-            static myPublicStaticMethod1() { // Error
-                   ~~~~~~~~~~~~~~~~~~~~~
-!!! Return type of public static method from exported class has or is using private name 'privateClass'.
-                return new privateClass();
-            }
-            private static myPrivateStaticMethod1() {
-                return new privateClass();
-            }
-            myPublicMethod1() { // Error
-            ~~~~~~~~~~~~~~~
-!!! Return type of public method from exported class has or is using private name 'privateClass'.
-                return new privateClass();
-            }
-            private myPrivateMethod1() {
-                return new privateClass();
-            }
-        }
-    
-        export class publicClassWithWithPublicParmeterTypes {
-            static myPublicStaticMethod(): publicClass {
-                return null;
-            }
-            private static myPrivateStaticMethod(): publicClass {
-                return null;
-            }
-            myPublicMethod(): publicClass {
-                return null;
-            }
-            private myPrivateMethod(): publicClass {
-                return null;
-            }
-            static myPublicStaticMethod1() {
-                return new publicClass();
-            }
-            private static myPrivateStaticMethod1() {
-                return new publicClass();
-            }
-            myPublicMethod1() {
-                return new publicClass();
-            }
-            private myPrivateMethod1() {
-                return new publicClass();
-            }
-        }
-    
-        class privateClassWithWithPrivateParmeterTypes {
-            static myPublicStaticMethod(): privateClass {
-                return null;
-            }
-            private static myPrivateStaticMethod(): privateClass {
-                return null;
-            }
-            myPublicMethod(): privateClass {
-                return null;
-            }
-            private myPrivateMethod(): privateClass {
-                return null;
-            }
-            static myPublicStaticMethod1() {
-                return new privateClass();
-            }
-            private static myPrivateStaticMethod1() {
-                return new privateClass();
-            }
-            myPublicMethod1() {
-                return new privateClass();
-            }
-            private myPrivateMethod1() {
-                return new privateClass();
-            }
-        }
-    
-        class privateClassWithWithPublicParmeterTypes {
-            static myPublicStaticMethod(): publicClass {
-                return null;
-            }
-            private static myPrivateStaticMethod(): publicClass {
-                return null;
-            }
-            myPublicMethod(): publicClass {
-                return null;
-            }
-            private myPrivateMethod(): publicClass {
-                return null;
-            }
-            static myPublicStaticMethod1() {
-                return new publicClass();
-            }
-            private static myPrivateStaticMethod1() {
-                return new publicClass();
-            }
-            myPublicMethod1() {
-                return new publicClass();
-            }
-            private myPrivateMethod1() {
-                return new publicClass();
-            }
-        }
-    
-        export function publicFunctionWithPrivateParmeterTypes(): privateClass { // Error
-                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Return type of exported function has or is using private name 'privateClass'.
-            return null;
-        }
-        export function publicFunctionWithPublicParmeterTypes(): publicClass {
-            return null;
-        }
-        function privateFunctionWithPrivateParmeterTypes(): privateClass {
-            return null;
-        }
-        function privateFunctionWithPublicParmeterTypes(): publicClass {
-            return null;
-        }
-        export function publicFunctionWithPrivateParmeterTypes1() { // Error
-                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Return type of exported function has or is using private name 'privateClass'.
-            return new privateClass();
-        }
-        export function publicFunctionWithPublicParmeterTypes1() {
-            return new publicClass();
-        }
-        function privateFunctionWithPrivateParmeterTypes1() {
-            return new privateClass();
-        }
-        function privateFunctionWithPublicParmeterTypes1() {
-            return new publicClass();
-        }
-    
-        export declare function publicAmbientFunctionWithPrivateParmeterTypes(): privateClass; // Error
-                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Return type of exported function has or is using private name 'privateClass'.
-        export declare function publicAmbientFunctionWithPublicParmeterTypes(): publicClass;
-        declare function privateAmbientFunctionWithPrivateParmeterTypes(): privateClass;
-        declare function privateAmbientFunctionWithPublicParmeterTypes(): publicClass;
-    
-        export interface publicInterfaceWithPrivateModuleParameterTypes {
-            new (): privateModule.publicClass; // Error
-            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Return type of constructor signature from exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-            (): privateModule.publicClass; // Error
-            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Return type of call signature from exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-            [x: number]: privateModule.publicClass; // Error
-            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Return type of index signature from exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-            myMethod(): privateModule.publicClass; // Error
-            ~~~~~~~~
-!!! Return type of method from exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-        }
-        export class publicClassWithPrivateModuleParameterTypes {
-            static myPublicStaticMethod(): privateModule.publicClass { // Error
-                   ~~~~~~~~~~~~~~~~~~~~
-!!! Return type of public static method from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-                return null;
-            }
-            myPublicMethod(): privateModule.publicClass { // Error
-            ~~~~~~~~~~~~~~
-!!! Return type of public method from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-                return null;
-            }
-            static myPublicStaticMethod1() { // Error
-                   ~~~~~~~~~~~~~~~~~~~~~
-!!! Return type of public static method from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-                return new privateModule.publicClass();
-            }
-            myPublicMethod1() { // Error
-            ~~~~~~~~~~~~~~~
-!!! Return type of public method from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-                return new privateModule.publicClass();
-            }
-        }
-        export function publicFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass { // Error
-                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Return type of exported function has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-            return null;
-        }
-        export function publicFunctionWithPrivateModuleParameterTypes1() { // Error
-                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Return type of exported function has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-            return new privateModule.publicClass();
-        }
-        export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; // Error
-                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Return type of exported function has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-    
-        interface privateInterfaceWithPrivateModuleParameterTypes {
-            new (): privateModule.publicClass;
-            (): privateModule.publicClass;
-            [x: number]: privateModule.publicClass;
-            myMethod(): privateModule.publicClass;
-        }
-        class privateClassWithPrivateModuleParameterTypes {
-            static myPublicStaticMethod(): privateModule.publicClass {
-                return null;
-            }
-            myPublicMethod(): privateModule.publicClass {
-                return null;
-            }
-            static myPublicStaticMethod1() {
-                return new privateModule.publicClass();
-            }
-            myPublicMethod1() {
-                return new privateModule.publicClass();
-            }
-        }
-        function privateFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass {
-            return null;
-        }
-        function privateFunctionWithPrivateModuleParameterTypes1() {
-            return new privateModule.publicClass();
-        }
-        declare function privateAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/privacyFunctionReturnTypeDeclFile.js b/tests/baselines/reference/privacyFunctionReturnTypeDeclFile.js
deleted file mode 100644
index 06a64104148..00000000000
--- a/tests/baselines/reference/privacyFunctionReturnTypeDeclFile.js
+++ /dev/null
@@ -1,2279 +0,0 @@
-//// [tests/cases/compiler/privacyFunctionReturnTypeDeclFile.ts] ////
-
-//// [privacyFunctionReturnTypeDeclFile_externalModule.ts]
-
-class privateClass {
-}
-
-export class publicClass {
-}
-
-export interface publicInterfaceWithPrivateParmeterTypes {
-    new (): privateClass; // Error
-    (): privateClass; // Error
-    [x: number]: privateClass; // Error
-    myMethod(): privateClass; // Error
-}
-
-export interface publicInterfaceWithPublicParmeterTypes {
-    new (): publicClass;
-    (): publicClass;
-    [x: number]: publicClass;
-    myMethod(): publicClass;
-}
-
-interface privateInterfaceWithPrivateParmeterTypes {
-    new (): privateClass;
-    (): privateClass;
-    [x: number]: privateClass;
-    myMethod(): privateClass;
-}
-
-interface privateInterfaceWithPublicParmeterTypes {
-    new (): publicClass;
-    (): publicClass;
-    [x: number]: publicClass;
-    myMethod(): publicClass;
-}
-
-export class publicClassWithWithPrivateParmeterTypes {
-    static myPublicStaticMethod(): privateClass { // Error
-        return null;
-    }
-    private static myPrivateStaticMethod(): privateClass {
-        return null;
-    }
-    myPublicMethod(): privateClass { // Error
-        return null;
-    }
-    private myPrivateMethod(): privateClass {
-        return null;
-    }
-    static myPublicStaticMethod1() { // Error
-        return new privateClass();
-    }
-    private static myPrivateStaticMethod1() {
-        return new privateClass();
-    }
-    myPublicMethod1() { // Error
-        return new privateClass();
-    }
-    private myPrivateMethod1() {
-        return new privateClass();
-    }
-}
-
-export class publicClassWithWithPublicParmeterTypes {
-    static myPublicStaticMethod(): publicClass { 
-        return null;
-    }
-    private static myPrivateStaticMethod(): publicClass {
-        return null;
-    }
-    myPublicMethod(): publicClass { 
-        return null;
-    }
-    private myPrivateMethod(): publicClass {
-        return null;
-    }
-    static myPublicStaticMethod1() {
-        return new publicClass();
-    }
-    private static myPrivateStaticMethod1() {
-        return new publicClass();
-    }
-    myPublicMethod1() { 
-        return new publicClass();
-    }
-    private myPrivateMethod1() {
-        return new publicClass();
-    }
-}
-
-class privateClassWithWithPrivateParmeterTypes {
-    static myPublicStaticMethod(): privateClass {
-        return null;
-    }
-    private static myPrivateStaticMethod(): privateClass {
-        return null;
-    }
-    myPublicMethod(): privateClass {
-        return null;
-    }
-    private myPrivateMethod(): privateClass {
-        return null;
-    }
-    static myPublicStaticMethod1() {
-        return new privateClass();
-    }
-    private static myPrivateStaticMethod1() {
-        return new privateClass();
-    }
-    myPublicMethod1() {
-        return new privateClass();
-    }
-    private myPrivateMethod1() {
-        return new privateClass();
-    }
-}
-
-class privateClassWithWithPublicParmeterTypes {
-    static myPublicStaticMethod(): publicClass {
-        return null;
-    }
-    private static myPrivateStaticMethod(): publicClass {
-        return null;
-    }
-    myPublicMethod(): publicClass {
-        return null;
-    }
-    private myPrivateMethod(): publicClass {
-        return null;
-    }
-    static myPublicStaticMethod1() {
-        return new publicClass();
-    }
-    private static myPrivateStaticMethod1() {
-        return new publicClass();
-    }
-    myPublicMethod1() {
-        return new publicClass();
-    }
-    private myPrivateMethod1() {
-        return new publicClass();
-    }
-}
-
-export function publicFunctionWithPrivateParmeterTypes(): privateClass { // Error
-    return null;
-}
-export function publicFunctionWithPublicParmeterTypes(): publicClass {
-    return null;
-}
-function privateFunctionWithPrivateParmeterTypes(): privateClass {
-    return null;
-}
-function privateFunctionWithPublicParmeterTypes(): publicClass {
-    return null;
-}
-export function publicFunctionWithPrivateParmeterTypes1() { // Error
-    return new privateClass();
-}
-export function publicFunctionWithPublicParmeterTypes1() {
-    return new publicClass();
-}
-function privateFunctionWithPrivateParmeterTypes1() {
-    return new privateClass();
-}
-function privateFunctionWithPublicParmeterTypes1() {
-    return new publicClass();
-}
-
-export declare function publicAmbientFunctionWithPrivateParmeterTypes(): privateClass; // Error
-export declare function publicAmbientFunctionWithPublicParmeterTypes(): publicClass;
-declare function privateAmbientFunctionWithPrivateParmeterTypes(): privateClass;
-declare function privateAmbientFunctionWithPublicParmeterTypes(): publicClass;
-
-export interface publicInterfaceWithPrivateModuleParameterTypes {
-    new (): privateModule.publicClass; // Error
-    (): privateModule.publicClass; // Error
-    [x: number]: privateModule.publicClass // Error
-    myMethod(): privateModule.publicClass; // Error
-}
-export class publicClassWithPrivateModuleParameterTypes {
-    static myPublicStaticMethod(): privateModule.publicClass { // Error
-        return null;
-    }
-    myPublicMethod(): privateModule.publicClass { // Error
-        return null;
-    }
-    static myPublicStaticMethod1() { // Error
-        return new privateModule.publicClass();
-    }
-    myPublicMethod1() { // Error
-        return new privateModule.publicClass();
-    }
-}
-export function publicFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass { // Error
-    return null;
-}
-export function publicFunctionWithPrivateModuleParameterTypes1() { // Error
-    return new privateModule.publicClass();
-}
-export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; // Error
-
-interface privateInterfaceWithPrivateModuleParameterTypes {
-    new (): privateModule.publicClass; 
-    (): privateModule.publicClass;
-    [x: number]: privateModule.publicClass
-    myMethod(): privateModule.publicClass;
-}
-class privateClassWithPrivateModuleParameterTypes {
-    static myPublicStaticMethod(): privateModule.publicClass { 
-        return null;
-    }
-    myPublicMethod(): privateModule.publicClass { 
-        return null;
-    }
-    static myPublicStaticMethod1() { 
-        return new privateModule.publicClass();
-    }
-    myPublicMethod1() { 
-        return new privateModule.publicClass();
-    }
-}
-function privateFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass { 
-    return null;
-}
-function privateFunctionWithPrivateModuleParameterTypes1() { 
-    return new privateModule.publicClass();
-}
-declare function privateAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; 
-
-export module publicModule {
-    class privateClass {
-    }
-
-    export class publicClass {
-    }
-
-    export interface publicInterfaceWithPrivateParmeterTypes {
-        new (): privateClass; // Error
-        (): privateClass; // Error
-        [x: number]: privateClass; // Error
-        myMethod(): privateClass; // Error
-    }
-
-    export interface publicInterfaceWithPublicParmeterTypes {
-        new (): publicClass;
-        (): publicClass;
-        [x: number]: publicClass;
-        myMethod(): publicClass;
-    }
-
-    interface privateInterfaceWithPrivateParmeterTypes {
-        new (): privateClass;
-        (): privateClass;
-        [x: number]: privateClass;
-        myMethod(): privateClass;
-    }
-
-    interface privateInterfaceWithPublicParmeterTypes {
-        new (): publicClass;
-        (): publicClass;
-        [x: number]: publicClass;
-        myMethod(): publicClass;
-    }
-
-    export class publicClassWithWithPrivateParmeterTypes {
-        static myPublicStaticMethod(): privateClass { // Error
-            return null;
-        }
-        private static myPrivateStaticMethod(): privateClass {
-            return null;
-        }
-        myPublicMethod(): privateClass { // Error
-            return null;
-        }
-        private myPrivateMethod(): privateClass {
-            return null;
-        }
-        static myPublicStaticMethod1() { // Error
-            return new privateClass();
-        }
-        private static myPrivateStaticMethod1() {
-            return new privateClass();
-        }
-        myPublicMethod1() { // Error
-            return new privateClass();
-        }
-        private myPrivateMethod1() {
-            return new privateClass();
-        }
-    }
-
-    export class publicClassWithWithPublicParmeterTypes {
-        static myPublicStaticMethod(): publicClass {
-            return null;
-        }
-        private static myPrivateStaticMethod(): publicClass {
-            return null;
-        }
-        myPublicMethod(): publicClass {
-            return null;
-        }
-        private myPrivateMethod(): publicClass {
-            return null;
-        }
-        static myPublicStaticMethod1() {
-            return new publicClass();
-        }
-        private static myPrivateStaticMethod1() {
-            return new publicClass();
-        }
-        myPublicMethod1() {
-            return new publicClass();
-        }
-        private myPrivateMethod1() {
-            return new publicClass();
-        }
-    }
-
-    class privateClassWithWithPrivateParmeterTypes {
-        static myPublicStaticMethod(): privateClass {
-            return null;
-        }
-        private static myPrivateStaticMethod(): privateClass {
-            return null;
-        }
-        myPublicMethod(): privateClass {
-            return null;
-        }
-        private myPrivateMethod(): privateClass {
-            return null;
-        }
-        static myPublicStaticMethod1() {
-            return new privateClass();
-        }
-        private static myPrivateStaticMethod1() {
-            return new privateClass();
-        }
-        myPublicMethod1() {
-            return new privateClass();
-        }
-        private myPrivateMethod1() {
-            return new privateClass();
-        }
-    }
-
-    class privateClassWithWithPublicParmeterTypes {
-        static myPublicStaticMethod(): publicClass {
-            return null;
-        }
-        private static myPrivateStaticMethod(): publicClass {
-            return null;
-        }
-        myPublicMethod(): publicClass {
-            return null;
-        }
-        private myPrivateMethod(): publicClass {
-            return null;
-        }
-        static myPublicStaticMethod1() {
-            return new publicClass();
-        }
-        private static myPrivateStaticMethod1() {
-            return new publicClass();
-        }
-        myPublicMethod1() {
-            return new publicClass();
-        }
-        private myPrivateMethod1() {
-            return new publicClass();
-        }
-    }
-
-    export function publicFunctionWithPrivateParmeterTypes(): privateClass { // Error
-        return null;
-    }
-    export function publicFunctionWithPublicParmeterTypes(): publicClass {
-        return null;
-    }
-    function privateFunctionWithPrivateParmeterTypes(): privateClass {
-        return null;
-    }
-    function privateFunctionWithPublicParmeterTypes(): publicClass {
-        return null;
-    }
-    export function publicFunctionWithPrivateParmeterTypes1() { // Error
-        return new privateClass();
-    }
-    export function publicFunctionWithPublicParmeterTypes1() {
-        return new publicClass();
-    }
-    function privateFunctionWithPrivateParmeterTypes1() {
-        return new privateClass();
-    }
-    function privateFunctionWithPublicParmeterTypes1() {
-        return new publicClass();
-    }
-
-    export declare function publicAmbientFunctionWithPrivateParmeterTypes(): privateClass; // Error
-    export declare function publicAmbientFunctionWithPublicParmeterTypes(): publicClass;
-    declare function privateAmbientFunctionWithPrivateParmeterTypes(): privateClass;
-    declare function privateAmbientFunctionWithPublicParmeterTypes(): publicClass;
-
-    export interface publicInterfaceWithPrivateModuleParameterTypes {
-        new (): privateModule.publicClass; // Error
-        (): privateModule.publicClass; // Error
-        [x: number]: privateModule.publicClass; // Error
-        myMethod(): privateModule.publicClass; // Error
-    }
-    export class publicClassWithPrivateModuleParameterTypes {
-        static myPublicStaticMethod(): privateModule.publicClass { // Error
-            return null;
-        }
-        myPublicMethod(): privateModule.publicClass { // Error
-            return null;
-        }
-        static myPublicStaticMethod1() { // Error
-            return new privateModule.publicClass();
-        }
-        myPublicMethod1() { // Error
-            return new privateModule.publicClass();
-        }
-    }
-    export function publicFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass { // Error
-        return null;
-    }
-    export function publicFunctionWithPrivateModuleParameterTypes1() { // Error
-        return new privateModule.publicClass();
-    }
-    export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; // Error
-
-    interface privateInterfaceWithPrivateModuleParameterTypes {
-        new (): privateModule.publicClass;
-        (): privateModule.publicClass;
-        [x: number]: privateModule.publicClass;
-        myMethod(): privateModule.publicClass;
-    }
-    class privateClassWithPrivateModuleParameterTypes {
-        static myPublicStaticMethod(): privateModule.publicClass {
-            return null;
-        }
-        myPublicMethod(): privateModule.publicClass {
-            return null;
-        }
-        static myPublicStaticMethod1() {
-            return new privateModule.publicClass();
-        }
-        myPublicMethod1() {
-            return new privateModule.publicClass();
-        }
-    }
-    function privateFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass {
-        return null;
-    }
-    function privateFunctionWithPrivateModuleParameterTypes1() {
-        return new privateModule.publicClass();
-    }
-    declare function privateAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; 
-}
-
-module privateModule {
-    class privateClass {
-    }
-
-    export class publicClass {
-    }
-
-    export interface publicInterfaceWithPrivateParmeterTypes {
-        new (): privateClass; 
-        (): privateClass; 
-        [x: number]: privateClass; 
-        myMethod(): privateClass; 
-    }
-
-    export interface publicInterfaceWithPublicParmeterTypes {
-        new (): publicClass;
-        (): publicClass;
-        [x: number]: publicClass;
-        myMethod(): publicClass;
-    }
-
-    interface privateInterfaceWithPrivateParmeterTypes {
-        new (): privateClass;
-        (): privateClass;
-        [x: number]: privateClass;
-        myMethod(): privateClass;
-    }
-
-    interface privateInterfaceWithPublicParmeterTypes {
-        new (): publicClass;
-        (): publicClass;
-        [x: number]: publicClass;
-        myMethod(): publicClass;
-    }
-
-    export class publicClassWithWithPrivateParmeterTypes {
-        static myPublicStaticMethod(): privateClass { 
-            return null;
-        }
-        private static myPrivateStaticMethod(): privateClass {
-            return null;
-        }
-        myPublicMethod(): privateClass { 
-            return null;
-        }
-        private myPrivateMethod(): privateClass {
-            return null;
-        }
-        static myPublicStaticMethod1() { 
-            return new privateClass();
-        }
-        private static myPrivateStaticMethod1() {
-            return new privateClass();
-        }
-        myPublicMethod1() { 
-            return new privateClass();
-        }
-        private myPrivateMethod1() {
-            return new privateClass();
-        }
-    }
-
-    export class publicClassWithWithPublicParmeterTypes {
-        static myPublicStaticMethod(): publicClass {
-            return null;
-        }
-        private static myPrivateStaticMethod(): publicClass {
-            return null;
-        }
-        myPublicMethod(): publicClass {
-            return null;
-        }
-        private myPrivateMethod(): publicClass {
-            return null;
-        }
-        static myPublicStaticMethod1() {
-            return new publicClass();
-        }
-        private static myPrivateStaticMethod1() {
-            return new publicClass();
-        }
-        myPublicMethod1() {
-            return new publicClass();
-        }
-        private myPrivateMethod1() {
-            return new publicClass();
-        }
-    }
-
-    class privateClassWithWithPrivateParmeterTypes {
-        static myPublicStaticMethod(): privateClass {
-            return null;
-        }
-        private static myPrivateStaticMethod(): privateClass {
-            return null;
-        }
-        myPublicMethod(): privateClass {
-            return null;
-        }
-        private myPrivateMethod(): privateClass {
-            return null;
-        }
-        static myPublicStaticMethod1() {
-            return new privateClass();
-        }
-        private static myPrivateStaticMethod1() {
-            return new privateClass();
-        }
-        myPublicMethod1() {
-            return new privateClass();
-        }
-        private myPrivateMethod1() {
-            return new privateClass();
-        }
-    }
-
-    class privateClassWithWithPublicParmeterTypes {
-        static myPublicStaticMethod(): publicClass {
-            return null;
-        }
-        private static myPrivateStaticMethod(): publicClass {
-            return null;
-        }
-        myPublicMethod(): publicClass {
-            return null;
-        }
-        private myPrivateMethod(): publicClass {
-            return null;
-        }
-        static myPublicStaticMethod1() {
-            return new publicClass();
-        }
-        private static myPrivateStaticMethod1() {
-            return new publicClass();
-        }
-        myPublicMethod1() {
-            return new publicClass();
-        }
-        private myPrivateMethod1() {
-            return new publicClass();
-        }
-    }
-
-    export function publicFunctionWithPrivateParmeterTypes(): privateClass { 
-        return null;
-    }
-    export function publicFunctionWithPublicParmeterTypes(): publicClass {
-        return null;
-    }
-    function privateFunctionWithPrivateParmeterTypes(): privateClass {
-        return null;
-    }
-    function privateFunctionWithPublicParmeterTypes(): publicClass {
-        return null;
-    }
-    export function publicFunctionWithPrivateParmeterTypes1() { 
-        return new privateClass();
-    }
-    export function publicFunctionWithPublicParmeterTypes1() {
-        return new publicClass();
-    }
-    function privateFunctionWithPrivateParmeterTypes1() {
-        return new privateClass();
-    }
-    function privateFunctionWithPublicParmeterTypes1() {
-        return new publicClass();
-    }
-
-    export declare function publicAmbientFunctionWithPrivateParmeterTypes(): privateClass; 
-    export declare function publicAmbientFunctionWithPublicParmeterTypes(): publicClass;
-    declare function privateAmbientFunctionWithPrivateParmeterTypes(): privateClass;
-    declare function privateAmbientFunctionWithPublicParmeterTypes(): publicClass;
-
-    export interface publicInterfaceWithPrivateModuleParameterTypes {
-        new (): privateModule.publicClass;
-        (): privateModule.publicClass;
-        [x: number]: privateModule.publicClass;
-        myMethod(): privateModule.publicClass;
-    }
-    export class publicClassWithPrivateModuleParameterTypes {
-        static myPublicStaticMethod(): privateModule.publicClass { 
-            return null;
-        }
-        myPublicMethod(): privateModule.publicClass { 
-            return null;
-        }
-        static myPublicStaticMethod1() { 
-            return new privateModule.publicClass();
-        }
-        myPublicMethod1() { 
-            return new privateModule.publicClass();
-        }
-    }
-    export function publicFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass { 
-        return null;
-    }
-    export function publicFunctionWithPrivateModuleParameterTypes1() { 
-        return new privateModule.publicClass();
-    }
-    export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; 
-
-    interface privateInterfaceWithPrivateModuleParameterTypes {
-        new (): privateModule.publicClass;
-        (): privateModule.publicClass;
-        [x: number]: privateModule.publicClass;
-        myMethod(): privateModule.publicClass;
-    }
-    class privateClassWithPrivateModuleParameterTypes {
-        static myPublicStaticMethod(): privateModule.publicClass {
-            return null;
-        }
-        myPublicMethod(): privateModule.publicClass {
-            return null;
-        }
-        static myPublicStaticMethod1() {
-            return new privateModule.publicClass();
-        }
-        myPublicMethod1() {
-            return new privateModule.publicClass();
-        }
-    }
-    function privateFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass {
-        return null;
-    }
-    function privateFunctionWithPrivateModuleParameterTypes1() {
-        return new privateModule.publicClass();
-    }
-    declare function privateAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; 
-}
-
-//// [privacyFunctionReturnTypeDeclFile_GlobalFile.ts]
-class publicClassInGlobal {
-}
-interface publicInterfaceWithPublicParmeterTypesInGlobal {
-    new (): publicClassInGlobal;
-    (): publicClassInGlobal;
-    [x: number]: publicClassInGlobal;
-    myMethod(): publicClassInGlobal;
-}
-class publicClassWithWithPublicParmeterTypesInGlobal {
-    static myPublicStaticMethod(): publicClassInGlobal {
-        return null;
-    }
-    private static myPrivateStaticMethod(): publicClassInGlobal {
-        return null;
-    }
-    myPublicMethod(): publicClassInGlobal {
-        return null;
-    }
-    private myPrivateMethod(): publicClassInGlobal {
-        return null;
-    }
-    static myPublicStaticMethod1() {
-        return new publicClassInGlobal();
-    }
-    private static myPrivateStaticMethod1() {
-        return new publicClassInGlobal();
-    }
-    myPublicMethod1() {
-        return new publicClassInGlobal();
-    }
-    private myPrivateMethod1() {
-        return new publicClassInGlobal();
-    }
-}
-function publicFunctionWithPublicParmeterTypesInGlobal(): publicClassInGlobal {
-    return null;
-}
-function publicFunctionWithPublicParmeterTypesInGlobal1() {
-    return new publicClassInGlobal();
-}
-declare function publicAmbientFunctionWithPublicParmeterTypesInGlobal(): publicClassInGlobal;
-
-module publicModuleInGlobal {
-    class privateClass {
-    }
-
-    export class publicClass {
-    }
-
-    module privateModule {
-        class privateClass {
-        }
-
-        export class publicClass {
-        }
-
-        export interface publicInterfaceWithPrivateParmeterTypes {
-            new (): privateClass;
-            (): privateClass;
-            [x: number]: privateClass;
-            myMethod(): privateClass;
-        }
-
-        export interface publicInterfaceWithPublicParmeterTypes {
-            new (): publicClass;
-            (): publicClass;
-            [x: number]: publicClass;
-            myMethod(): publicClass;
-        }
-
-        interface privateInterfaceWithPrivateParmeterTypes {
-            new (): privateClass;
-            (): privateClass;
-            [x: number]: privateClass;
-            myMethod(): privateClass;
-        }
-
-        interface privateInterfaceWithPublicParmeterTypes {
-            new (): publicClass;
-            (): publicClass;
-            [x: number]: publicClass;
-            myMethod(): publicClass;
-        }
-
-        export class publicClassWithWithPrivateParmeterTypes {
-            static myPublicStaticMethod(): privateClass {
-                return null;
-            }
-            private static myPrivateStaticMethod(): privateClass {
-                return null;
-            }
-            myPublicMethod(): privateClass {
-                return null;
-            }
-            private myPrivateMethod(): privateClass {
-                return null;
-            }
-            static myPublicStaticMethod1() {
-                return new privateClass();
-            }
-            private static myPrivateStaticMethod1() {
-                return new privateClass();
-            }
-            myPublicMethod1() {
-                return new privateClass();
-            }
-            private myPrivateMethod1() {
-                return new privateClass();
-            }
-        }
-
-        export class publicClassWithWithPublicParmeterTypes {
-            static myPublicStaticMethod(): publicClass {
-                return null;
-            }
-            private static myPrivateStaticMethod(): publicClass {
-                return null;
-            }
-            myPublicMethod(): publicClass {
-                return null;
-            }
-            private myPrivateMethod(): publicClass {
-                return null;
-            }
-            static myPublicStaticMethod1() {
-                return new publicClass();
-            }
-            private static myPrivateStaticMethod1() {
-                return new publicClass();
-            }
-            myPublicMethod1() {
-                return new publicClass();
-            }
-            private myPrivateMethod1() {
-                return new publicClass();
-            }
-        }
-
-        class privateClassWithWithPrivateParmeterTypes {
-            static myPublicStaticMethod(): privateClass {
-                return null;
-            }
-            private static myPrivateStaticMethod(): privateClass {
-                return null;
-            }
-            myPublicMethod(): privateClass {
-                return null;
-            }
-            private myPrivateMethod(): privateClass {
-                return null;
-            }
-            static myPublicStaticMethod1() {
-                return new privateClass();
-            }
-            private static myPrivateStaticMethod1() {
-                return new privateClass();
-            }
-            myPublicMethod1() {
-                return new privateClass();
-            }
-            private myPrivateMethod1() {
-                return new privateClass();
-            }
-        }
-
-        class privateClassWithWithPublicParmeterTypes {
-            static myPublicStaticMethod(): publicClass {
-                return null;
-            }
-            private static myPrivateStaticMethod(): publicClass {
-                return null;
-            }
-            myPublicMethod(): publicClass {
-                return null;
-            }
-            private myPrivateMethod(): publicClass {
-                return null;
-            }
-            static myPublicStaticMethod1() {
-                return new publicClass();
-            }
-            private static myPrivateStaticMethod1() {
-                return new publicClass();
-            }
-            myPublicMethod1() {
-                return new publicClass();
-            }
-            private myPrivateMethod1() {
-                return new publicClass();
-            }
-        }
-
-        export function publicFunctionWithPrivateParmeterTypes(): privateClass {
-            return null;
-        }
-        export function publicFunctionWithPublicParmeterTypes(): publicClass {
-            return null;
-        }
-        function privateFunctionWithPrivateParmeterTypes(): privateClass {
-            return null;
-        }
-        function privateFunctionWithPublicParmeterTypes(): publicClass {
-            return null;
-        }
-        export function publicFunctionWithPrivateParmeterTypes1() {
-            return new privateClass();
-        }
-        export function publicFunctionWithPublicParmeterTypes1() {
-            return new publicClass();
-        }
-        function privateFunctionWithPrivateParmeterTypes1() {
-            return new privateClass();
-        }
-        function privateFunctionWithPublicParmeterTypes1() {
-            return new publicClass();
-        }
-
-        export declare function publicAmbientFunctionWithPrivateParmeterTypes(): privateClass;
-        export declare function publicAmbientFunctionWithPublicParmeterTypes(): publicClass;
-        declare function privateAmbientFunctionWithPrivateParmeterTypes(): privateClass;
-        declare function privateAmbientFunctionWithPublicParmeterTypes(): publicClass;
-
-        export interface publicInterfaceWithPrivateModuleParameterTypes {
-            new (): privateModule.publicClass;
-            (): privateModule.publicClass;
-            [x: number]: privateModule.publicClass;
-            myMethod(): privateModule.publicClass;
-        }
-        export class publicClassWithPrivateModuleParameterTypes {
-            static myPublicStaticMethod(): privateModule.publicClass {
-                return null;
-            }
-            myPublicMethod(): privateModule.publicClass {
-                return null;
-            }
-            static myPublicStaticMethod1() {
-                return new privateModule.publicClass();
-            }
-            myPublicMethod1() {
-                return new privateModule.publicClass();
-            }
-        }
-        export function publicFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass {
-            return null;
-        }
-        export function publicFunctionWithPrivateModuleParameterTypes1() {
-            return new privateModule.publicClass();
-        }
-        export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass;
-
-        interface privateInterfaceWithPrivateModuleParameterTypes {
-            new (): privateModule.publicClass;
-            (): privateModule.publicClass;
-            [x: number]: privateModule.publicClass;
-            myMethod(): privateModule.publicClass;
-        }
-        class privateClassWithPrivateModuleParameterTypes {
-            static myPublicStaticMethod(): privateModule.publicClass {
-                return null;
-            }
-            myPublicMethod(): privateModule.publicClass {
-                return null;
-            }
-            static myPublicStaticMethod1() {
-                return new privateModule.publicClass();
-            }
-            myPublicMethod1() {
-                return new privateModule.publicClass();
-            }
-        }
-        function privateFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass {
-            return null;
-        }
-        function privateFunctionWithPrivateModuleParameterTypes1() {
-            return new privateModule.publicClass();
-        }
-        declare function privateAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass;
-    }
-
-    export interface publicInterfaceWithPrivateParmeterTypes {
-        new (): privateClass; // Error
-        (): privateClass; // Error
-        [x: number]: privateClass; // Error
-        myMethod(): privateClass; // Error
-    }
-
-    export interface publicInterfaceWithPublicParmeterTypes {
-        new (): publicClass;
-        (): publicClass;
-        [x: number]: publicClass;
-        myMethod(): publicClass;
-    }
-
-    interface privateInterfaceWithPrivateParmeterTypes {
-        new (): privateClass;
-        (): privateClass;
-        [x: number]: privateClass;
-        myMethod(): privateClass;
-    }
-
-    interface privateInterfaceWithPublicParmeterTypes {
-        new (): publicClass;
-        (): publicClass;
-        [x: number]: publicClass;
-        myMethod(): publicClass;
-    }
-
-    export class publicClassWithWithPrivateParmeterTypes {
-        static myPublicStaticMethod(): privateClass { // Error
-            return null;
-        }
-        private static myPrivateStaticMethod(): privateClass {
-            return null;
-        }
-        myPublicMethod(): privateClass { // Error
-            return null;
-        }
-        private myPrivateMethod(): privateClass {
-            return null;
-        }
-        static myPublicStaticMethod1() { // Error
-            return new privateClass();
-        }
-        private static myPrivateStaticMethod1() {
-            return new privateClass();
-        }
-        myPublicMethod1() { // Error
-            return new privateClass();
-        }
-        private myPrivateMethod1() {
-            return new privateClass();
-        }
-    }
-
-    export class publicClassWithWithPublicParmeterTypes {
-        static myPublicStaticMethod(): publicClass {
-            return null;
-        }
-        private static myPrivateStaticMethod(): publicClass {
-            return null;
-        }
-        myPublicMethod(): publicClass {
-            return null;
-        }
-        private myPrivateMethod(): publicClass {
-            return null;
-        }
-        static myPublicStaticMethod1() {
-            return new publicClass();
-        }
-        private static myPrivateStaticMethod1() {
-            return new publicClass();
-        }
-        myPublicMethod1() {
-            return new publicClass();
-        }
-        private myPrivateMethod1() {
-            return new publicClass();
-        }
-    }
-
-    class privateClassWithWithPrivateParmeterTypes {
-        static myPublicStaticMethod(): privateClass {
-            return null;
-        }
-        private static myPrivateStaticMethod(): privateClass {
-            return null;
-        }
-        myPublicMethod(): privateClass {
-            return null;
-        }
-        private myPrivateMethod(): privateClass {
-            return null;
-        }
-        static myPublicStaticMethod1() {
-            return new privateClass();
-        }
-        private static myPrivateStaticMethod1() {
-            return new privateClass();
-        }
-        myPublicMethod1() {
-            return new privateClass();
-        }
-        private myPrivateMethod1() {
-            return new privateClass();
-        }
-    }
-
-    class privateClassWithWithPublicParmeterTypes {
-        static myPublicStaticMethod(): publicClass {
-            return null;
-        }
-        private static myPrivateStaticMethod(): publicClass {
-            return null;
-        }
-        myPublicMethod(): publicClass {
-            return null;
-        }
-        private myPrivateMethod(): publicClass {
-            return null;
-        }
-        static myPublicStaticMethod1() {
-            return new publicClass();
-        }
-        private static myPrivateStaticMethod1() {
-            return new publicClass();
-        }
-        myPublicMethod1() {
-            return new publicClass();
-        }
-        private myPrivateMethod1() {
-            return new publicClass();
-        }
-    }
-
-    export function publicFunctionWithPrivateParmeterTypes(): privateClass { // Error
-        return null;
-    }
-    export function publicFunctionWithPublicParmeterTypes(): publicClass {
-        return null;
-    }
-    function privateFunctionWithPrivateParmeterTypes(): privateClass {
-        return null;
-    }
-    function privateFunctionWithPublicParmeterTypes(): publicClass {
-        return null;
-    }
-    export function publicFunctionWithPrivateParmeterTypes1() { // Error
-        return new privateClass();
-    }
-    export function publicFunctionWithPublicParmeterTypes1() {
-        return new publicClass();
-    }
-    function privateFunctionWithPrivateParmeterTypes1() {
-        return new privateClass();
-    }
-    function privateFunctionWithPublicParmeterTypes1() {
-        return new publicClass();
-    }
-
-    export declare function publicAmbientFunctionWithPrivateParmeterTypes(): privateClass; // Error
-    export declare function publicAmbientFunctionWithPublicParmeterTypes(): publicClass;
-    declare function privateAmbientFunctionWithPrivateParmeterTypes(): privateClass;
-    declare function privateAmbientFunctionWithPublicParmeterTypes(): publicClass;
-
-    export interface publicInterfaceWithPrivateModuleParameterTypes {
-        new (): privateModule.publicClass; // Error
-        (): privateModule.publicClass; // Error
-        [x: number]: privateModule.publicClass; // Error
-        myMethod(): privateModule.publicClass; // Error
-    }
-    export class publicClassWithPrivateModuleParameterTypes {
-        static myPublicStaticMethod(): privateModule.publicClass { // Error
-            return null;
-        }
-        myPublicMethod(): privateModule.publicClass { // Error
-            return null;
-        }
-        static myPublicStaticMethod1() { // Error
-            return new privateModule.publicClass();
-        }
-        myPublicMethod1() { // Error
-            return new privateModule.publicClass();
-        }
-    }
-    export function publicFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass { // Error
-        return null;
-    }
-    export function publicFunctionWithPrivateModuleParameterTypes1() { // Error
-        return new privateModule.publicClass();
-    }
-    export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; // Error
-
-    interface privateInterfaceWithPrivateModuleParameterTypes {
-        new (): privateModule.publicClass;
-        (): privateModule.publicClass;
-        [x: number]: privateModule.publicClass;
-        myMethod(): privateModule.publicClass;
-    }
-    class privateClassWithPrivateModuleParameterTypes {
-        static myPublicStaticMethod(): privateModule.publicClass {
-            return null;
-        }
-        myPublicMethod(): privateModule.publicClass {
-            return null;
-        }
-        static myPublicStaticMethod1() {
-            return new privateModule.publicClass();
-        }
-        myPublicMethod1() {
-            return new privateModule.publicClass();
-        }
-    }
-    function privateFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass {
-        return null;
-    }
-    function privateFunctionWithPrivateModuleParameterTypes1() {
-        return new privateModule.publicClass();
-    }
-    declare function privateAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass;
-}
-
-//// [privacyFunctionReturnTypeDeclFile_externalModule.js]
-var privateClass = (function () {
-    function privateClass() {
-    }
-    return privateClass;
-})();
-var publicClass = (function () {
-    function publicClass() {
-    }
-    return publicClass;
-})();
-exports.publicClass = publicClass;
-var publicClassWithWithPrivateParmeterTypes = (function () {
-    function publicClassWithWithPrivateParmeterTypes() {
-    }
-    publicClassWithWithPrivateParmeterTypes.myPublicStaticMethod = function () {
-        return null;
-    };
-    publicClassWithWithPrivateParmeterTypes.myPrivateStaticMethod = function () {
-        return null;
-    };
-    publicClassWithWithPrivateParmeterTypes.prototype.myPublicMethod = function () {
-        return null;
-    };
-    publicClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod = function () {
-        return null;
-    };
-    publicClassWithWithPrivateParmeterTypes.myPublicStaticMethod1 = function () {
-        return new privateClass();
-    };
-    publicClassWithWithPrivateParmeterTypes.myPrivateStaticMethod1 = function () {
-        return new privateClass();
-    };
-    publicClassWithWithPrivateParmeterTypes.prototype.myPublicMethod1 = function () {
-        return new privateClass();
-    };
-    publicClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod1 = function () {
-        return new privateClass();
-    };
-    return publicClassWithWithPrivateParmeterTypes;
-})();
-exports.publicClassWithWithPrivateParmeterTypes = publicClassWithWithPrivateParmeterTypes;
-var publicClassWithWithPublicParmeterTypes = (function () {
-    function publicClassWithWithPublicParmeterTypes() {
-    }
-    publicClassWithWithPublicParmeterTypes.myPublicStaticMethod = function () {
-        return null;
-    };
-    publicClassWithWithPublicParmeterTypes.myPrivateStaticMethod = function () {
-        return null;
-    };
-    publicClassWithWithPublicParmeterTypes.prototype.myPublicMethod = function () {
-        return null;
-    };
-    publicClassWithWithPublicParmeterTypes.prototype.myPrivateMethod = function () {
-        return null;
-    };
-    publicClassWithWithPublicParmeterTypes.myPublicStaticMethod1 = function () {
-        return new publicClass();
-    };
-    publicClassWithWithPublicParmeterTypes.myPrivateStaticMethod1 = function () {
-        return new publicClass();
-    };
-    publicClassWithWithPublicParmeterTypes.prototype.myPublicMethod1 = function () {
-        return new publicClass();
-    };
-    publicClassWithWithPublicParmeterTypes.prototype.myPrivateMethod1 = function () {
-        return new publicClass();
-    };
-    return publicClassWithWithPublicParmeterTypes;
-})();
-exports.publicClassWithWithPublicParmeterTypes = publicClassWithWithPublicParmeterTypes;
-var privateClassWithWithPrivateParmeterTypes = (function () {
-    function privateClassWithWithPrivateParmeterTypes() {
-    }
-    privateClassWithWithPrivateParmeterTypes.myPublicStaticMethod = function () {
-        return null;
-    };
-    privateClassWithWithPrivateParmeterTypes.myPrivateStaticMethod = function () {
-        return null;
-    };
-    privateClassWithWithPrivateParmeterTypes.prototype.myPublicMethod = function () {
-        return null;
-    };
-    privateClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod = function () {
-        return null;
-    };
-    privateClassWithWithPrivateParmeterTypes.myPublicStaticMethod1 = function () {
-        return new privateClass();
-    };
-    privateClassWithWithPrivateParmeterTypes.myPrivateStaticMethod1 = function () {
-        return new privateClass();
-    };
-    privateClassWithWithPrivateParmeterTypes.prototype.myPublicMethod1 = function () {
-        return new privateClass();
-    };
-    privateClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod1 = function () {
-        return new privateClass();
-    };
-    return privateClassWithWithPrivateParmeterTypes;
-})();
-var privateClassWithWithPublicParmeterTypes = (function () {
-    function privateClassWithWithPublicParmeterTypes() {
-    }
-    privateClassWithWithPublicParmeterTypes.myPublicStaticMethod = function () {
-        return null;
-    };
-    privateClassWithWithPublicParmeterTypes.myPrivateStaticMethod = function () {
-        return null;
-    };
-    privateClassWithWithPublicParmeterTypes.prototype.myPublicMethod = function () {
-        return null;
-    };
-    privateClassWithWithPublicParmeterTypes.prototype.myPrivateMethod = function () {
-        return null;
-    };
-    privateClassWithWithPublicParmeterTypes.myPublicStaticMethod1 = function () {
-        return new publicClass();
-    };
-    privateClassWithWithPublicParmeterTypes.myPrivateStaticMethod1 = function () {
-        return new publicClass();
-    };
-    privateClassWithWithPublicParmeterTypes.prototype.myPublicMethod1 = function () {
-        return new publicClass();
-    };
-    privateClassWithWithPublicParmeterTypes.prototype.myPrivateMethod1 = function () {
-        return new publicClass();
-    };
-    return privateClassWithWithPublicParmeterTypes;
-})();
-function publicFunctionWithPrivateParmeterTypes() {
-    return null;
-}
-exports.publicFunctionWithPrivateParmeterTypes = publicFunctionWithPrivateParmeterTypes;
-function publicFunctionWithPublicParmeterTypes() {
-    return null;
-}
-exports.publicFunctionWithPublicParmeterTypes = publicFunctionWithPublicParmeterTypes;
-function privateFunctionWithPrivateParmeterTypes() {
-    return null;
-}
-function privateFunctionWithPublicParmeterTypes() {
-    return null;
-}
-function publicFunctionWithPrivateParmeterTypes1() {
-    return new privateClass();
-}
-exports.publicFunctionWithPrivateParmeterTypes1 = publicFunctionWithPrivateParmeterTypes1;
-function publicFunctionWithPublicParmeterTypes1() {
-    return new publicClass();
-}
-exports.publicFunctionWithPublicParmeterTypes1 = publicFunctionWithPublicParmeterTypes1;
-function privateFunctionWithPrivateParmeterTypes1() {
-    return new privateClass();
-}
-function privateFunctionWithPublicParmeterTypes1() {
-    return new publicClass();
-}
-var publicClassWithPrivateModuleParameterTypes = (function () {
-    function publicClassWithPrivateModuleParameterTypes() {
-    }
-    publicClassWithPrivateModuleParameterTypes.myPublicStaticMethod = function () {
-        return null;
-    };
-    publicClassWithPrivateModuleParameterTypes.prototype.myPublicMethod = function () {
-        return null;
-    };
-    publicClassWithPrivateModuleParameterTypes.myPublicStaticMethod1 = function () {
-        return new privateModule.publicClass();
-    };
-    publicClassWithPrivateModuleParameterTypes.prototype.myPublicMethod1 = function () {
-        return new privateModule.publicClass();
-    };
-    return publicClassWithPrivateModuleParameterTypes;
-})();
-exports.publicClassWithPrivateModuleParameterTypes = publicClassWithPrivateModuleParameterTypes;
-function publicFunctionWithPrivateModuleParameterTypes() {
-    return null;
-}
-exports.publicFunctionWithPrivateModuleParameterTypes = publicFunctionWithPrivateModuleParameterTypes;
-function publicFunctionWithPrivateModuleParameterTypes1() {
-    return new privateModule.publicClass();
-}
-exports.publicFunctionWithPrivateModuleParameterTypes1 = publicFunctionWithPrivateModuleParameterTypes1;
-var privateClassWithPrivateModuleParameterTypes = (function () {
-    function privateClassWithPrivateModuleParameterTypes() {
-    }
-    privateClassWithPrivateModuleParameterTypes.myPublicStaticMethod = function () {
-        return null;
-    };
-    privateClassWithPrivateModuleParameterTypes.prototype.myPublicMethod = function () {
-        return null;
-    };
-    privateClassWithPrivateModuleParameterTypes.myPublicStaticMethod1 = function () {
-        return new privateModule.publicClass();
-    };
-    privateClassWithPrivateModuleParameterTypes.prototype.myPublicMethod1 = function () {
-        return new privateModule.publicClass();
-    };
-    return privateClassWithPrivateModuleParameterTypes;
-})();
-function privateFunctionWithPrivateModuleParameterTypes() {
-    return null;
-}
-function privateFunctionWithPrivateModuleParameterTypes1() {
-    return new privateModule.publicClass();
-}
-(function (publicModule) {
-    var privateClass = (function () {
-        function privateClass() {
-        }
-        return privateClass;
-    })();
-    var publicClass = (function () {
-        function publicClass() {
-        }
-        return publicClass;
-    })();
-    publicModule.publicClass = publicClass;
-    var publicClassWithWithPrivateParmeterTypes = (function () {
-        function publicClassWithWithPrivateParmeterTypes() {
-        }
-        publicClassWithWithPrivateParmeterTypes.myPublicStaticMethod = function () {
-            return null;
-        };
-        publicClassWithWithPrivateParmeterTypes.myPrivateStaticMethod = function () {
-            return null;
-        };
-        publicClassWithWithPrivateParmeterTypes.prototype.myPublicMethod = function () {
-            return null;
-        };
-        publicClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod = function () {
-            return null;
-        };
-        publicClassWithWithPrivateParmeterTypes.myPublicStaticMethod1 = function () {
-            return new privateClass();
-        };
-        publicClassWithWithPrivateParmeterTypes.myPrivateStaticMethod1 = function () {
-            return new privateClass();
-        };
-        publicClassWithWithPrivateParmeterTypes.prototype.myPublicMethod1 = function () {
-            return new privateClass();
-        };
-        publicClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod1 = function () {
-            return new privateClass();
-        };
-        return publicClassWithWithPrivateParmeterTypes;
-    })();
-    publicModule.publicClassWithWithPrivateParmeterTypes = publicClassWithWithPrivateParmeterTypes;
-    var publicClassWithWithPublicParmeterTypes = (function () {
-        function publicClassWithWithPublicParmeterTypes() {
-        }
-        publicClassWithWithPublicParmeterTypes.myPublicStaticMethod = function () {
-            return null;
-        };
-        publicClassWithWithPublicParmeterTypes.myPrivateStaticMethod = function () {
-            return null;
-        };
-        publicClassWithWithPublicParmeterTypes.prototype.myPublicMethod = function () {
-            return null;
-        };
-        publicClassWithWithPublicParmeterTypes.prototype.myPrivateMethod = function () {
-            return null;
-        };
-        publicClassWithWithPublicParmeterTypes.myPublicStaticMethod1 = function () {
-            return new publicClass();
-        };
-        publicClassWithWithPublicParmeterTypes.myPrivateStaticMethod1 = function () {
-            return new publicClass();
-        };
-        publicClassWithWithPublicParmeterTypes.prototype.myPublicMethod1 = function () {
-            return new publicClass();
-        };
-        publicClassWithWithPublicParmeterTypes.prototype.myPrivateMethod1 = function () {
-            return new publicClass();
-        };
-        return publicClassWithWithPublicParmeterTypes;
-    })();
-    publicModule.publicClassWithWithPublicParmeterTypes = publicClassWithWithPublicParmeterTypes;
-    var privateClassWithWithPrivateParmeterTypes = (function () {
-        function privateClassWithWithPrivateParmeterTypes() {
-        }
-        privateClassWithWithPrivateParmeterTypes.myPublicStaticMethod = function () {
-            return null;
-        };
-        privateClassWithWithPrivateParmeterTypes.myPrivateStaticMethod = function () {
-            return null;
-        };
-        privateClassWithWithPrivateParmeterTypes.prototype.myPublicMethod = function () {
-            return null;
-        };
-        privateClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod = function () {
-            return null;
-        };
-        privateClassWithWithPrivateParmeterTypes.myPublicStaticMethod1 = function () {
-            return new privateClass();
-        };
-        privateClassWithWithPrivateParmeterTypes.myPrivateStaticMethod1 = function () {
-            return new privateClass();
-        };
-        privateClassWithWithPrivateParmeterTypes.prototype.myPublicMethod1 = function () {
-            return new privateClass();
-        };
-        privateClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod1 = function () {
-            return new privateClass();
-        };
-        return privateClassWithWithPrivateParmeterTypes;
-    })();
-    var privateClassWithWithPublicParmeterTypes = (function () {
-        function privateClassWithWithPublicParmeterTypes() {
-        }
-        privateClassWithWithPublicParmeterTypes.myPublicStaticMethod = function () {
-            return null;
-        };
-        privateClassWithWithPublicParmeterTypes.myPrivateStaticMethod = function () {
-            return null;
-        };
-        privateClassWithWithPublicParmeterTypes.prototype.myPublicMethod = function () {
-            return null;
-        };
-        privateClassWithWithPublicParmeterTypes.prototype.myPrivateMethod = function () {
-            return null;
-        };
-        privateClassWithWithPublicParmeterTypes.myPublicStaticMethod1 = function () {
-            return new publicClass();
-        };
-        privateClassWithWithPublicParmeterTypes.myPrivateStaticMethod1 = function () {
-            return new publicClass();
-        };
-        privateClassWithWithPublicParmeterTypes.prototype.myPublicMethod1 = function () {
-            return new publicClass();
-        };
-        privateClassWithWithPublicParmeterTypes.prototype.myPrivateMethod1 = function () {
-            return new publicClass();
-        };
-        return privateClassWithWithPublicParmeterTypes;
-    })();
-    function publicFunctionWithPrivateParmeterTypes() {
-        return null;
-    }
-    publicModule.publicFunctionWithPrivateParmeterTypes = publicFunctionWithPrivateParmeterTypes;
-    function publicFunctionWithPublicParmeterTypes() {
-        return null;
-    }
-    publicModule.publicFunctionWithPublicParmeterTypes = publicFunctionWithPublicParmeterTypes;
-    function privateFunctionWithPrivateParmeterTypes() {
-        return null;
-    }
-    function privateFunctionWithPublicParmeterTypes() {
-        return null;
-    }
-    function publicFunctionWithPrivateParmeterTypes1() {
-        return new privateClass();
-    }
-    publicModule.publicFunctionWithPrivateParmeterTypes1 = publicFunctionWithPrivateParmeterTypes1;
-    function publicFunctionWithPublicParmeterTypes1() {
-        return new publicClass();
-    }
-    publicModule.publicFunctionWithPublicParmeterTypes1 = publicFunctionWithPublicParmeterTypes1;
-    function privateFunctionWithPrivateParmeterTypes1() {
-        return new privateClass();
-    }
-    function privateFunctionWithPublicParmeterTypes1() {
-        return new publicClass();
-    }
-    var publicClassWithPrivateModuleParameterTypes = (function () {
-        function publicClassWithPrivateModuleParameterTypes() {
-        }
-        publicClassWithPrivateModuleParameterTypes.myPublicStaticMethod = function () {
-            return null;
-        };
-        publicClassWithPrivateModuleParameterTypes.prototype.myPublicMethod = function () {
-            return null;
-        };
-        publicClassWithPrivateModuleParameterTypes.myPublicStaticMethod1 = function () {
-            return new privateModule.publicClass();
-        };
-        publicClassWithPrivateModuleParameterTypes.prototype.myPublicMethod1 = function () {
-            return new privateModule.publicClass();
-        };
-        return publicClassWithPrivateModuleParameterTypes;
-    })();
-    publicModule.publicClassWithPrivateModuleParameterTypes = publicClassWithPrivateModuleParameterTypes;
-    function publicFunctionWithPrivateModuleParameterTypes() {
-        return null;
-    }
-    publicModule.publicFunctionWithPrivateModuleParameterTypes = publicFunctionWithPrivateModuleParameterTypes;
-    function publicFunctionWithPrivateModuleParameterTypes1() {
-        return new privateModule.publicClass();
-    }
-    publicModule.publicFunctionWithPrivateModuleParameterTypes1 = publicFunctionWithPrivateModuleParameterTypes1;
-    var privateClassWithPrivateModuleParameterTypes = (function () {
-        function privateClassWithPrivateModuleParameterTypes() {
-        }
-        privateClassWithPrivateModuleParameterTypes.myPublicStaticMethod = function () {
-            return null;
-        };
-        privateClassWithPrivateModuleParameterTypes.prototype.myPublicMethod = function () {
-            return null;
-        };
-        privateClassWithPrivateModuleParameterTypes.myPublicStaticMethod1 = function () {
-            return new privateModule.publicClass();
-        };
-        privateClassWithPrivateModuleParameterTypes.prototype.myPublicMethod1 = function () {
-            return new privateModule.publicClass();
-        };
-        return privateClassWithPrivateModuleParameterTypes;
-    })();
-    function privateFunctionWithPrivateModuleParameterTypes() {
-        return null;
-    }
-    function privateFunctionWithPrivateModuleParameterTypes1() {
-        return new privateModule.publicClass();
-    }
-})(exports.publicModule || (exports.publicModule = {}));
-var publicModule = exports.publicModule;
-var privateModule;
-(function (privateModule) {
-    var privateClass = (function () {
-        function privateClass() {
-        }
-        return privateClass;
-    })();
-    var publicClass = (function () {
-        function publicClass() {
-        }
-        return publicClass;
-    })();
-    privateModule.publicClass = publicClass;
-    var publicClassWithWithPrivateParmeterTypes = (function () {
-        function publicClassWithWithPrivateParmeterTypes() {
-        }
-        publicClassWithWithPrivateParmeterTypes.myPublicStaticMethod = function () {
-            return null;
-        };
-        publicClassWithWithPrivateParmeterTypes.myPrivateStaticMethod = function () {
-            return null;
-        };
-        publicClassWithWithPrivateParmeterTypes.prototype.myPublicMethod = function () {
-            return null;
-        };
-        publicClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod = function () {
-            return null;
-        };
-        publicClassWithWithPrivateParmeterTypes.myPublicStaticMethod1 = function () {
-            return new privateClass();
-        };
-        publicClassWithWithPrivateParmeterTypes.myPrivateStaticMethod1 = function () {
-            return new privateClass();
-        };
-        publicClassWithWithPrivateParmeterTypes.prototype.myPublicMethod1 = function () {
-            return new privateClass();
-        };
-        publicClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod1 = function () {
-            return new privateClass();
-        };
-        return publicClassWithWithPrivateParmeterTypes;
-    })();
-    privateModule.publicClassWithWithPrivateParmeterTypes = publicClassWithWithPrivateParmeterTypes;
-    var publicClassWithWithPublicParmeterTypes = (function () {
-        function publicClassWithWithPublicParmeterTypes() {
-        }
-        publicClassWithWithPublicParmeterTypes.myPublicStaticMethod = function () {
-            return null;
-        };
-        publicClassWithWithPublicParmeterTypes.myPrivateStaticMethod = function () {
-            return null;
-        };
-        publicClassWithWithPublicParmeterTypes.prototype.myPublicMethod = function () {
-            return null;
-        };
-        publicClassWithWithPublicParmeterTypes.prototype.myPrivateMethod = function () {
-            return null;
-        };
-        publicClassWithWithPublicParmeterTypes.myPublicStaticMethod1 = function () {
-            return new publicClass();
-        };
-        publicClassWithWithPublicParmeterTypes.myPrivateStaticMethod1 = function () {
-            return new publicClass();
-        };
-        publicClassWithWithPublicParmeterTypes.prototype.myPublicMethod1 = function () {
-            return new publicClass();
-        };
-        publicClassWithWithPublicParmeterTypes.prototype.myPrivateMethod1 = function () {
-            return new publicClass();
-        };
-        return publicClassWithWithPublicParmeterTypes;
-    })();
-    privateModule.publicClassWithWithPublicParmeterTypes = publicClassWithWithPublicParmeterTypes;
-    var privateClassWithWithPrivateParmeterTypes = (function () {
-        function privateClassWithWithPrivateParmeterTypes() {
-        }
-        privateClassWithWithPrivateParmeterTypes.myPublicStaticMethod = function () {
-            return null;
-        };
-        privateClassWithWithPrivateParmeterTypes.myPrivateStaticMethod = function () {
-            return null;
-        };
-        privateClassWithWithPrivateParmeterTypes.prototype.myPublicMethod = function () {
-            return null;
-        };
-        privateClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod = function () {
-            return null;
-        };
-        privateClassWithWithPrivateParmeterTypes.myPublicStaticMethod1 = function () {
-            return new privateClass();
-        };
-        privateClassWithWithPrivateParmeterTypes.myPrivateStaticMethod1 = function () {
-            return new privateClass();
-        };
-        privateClassWithWithPrivateParmeterTypes.prototype.myPublicMethod1 = function () {
-            return new privateClass();
-        };
-        privateClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod1 = function () {
-            return new privateClass();
-        };
-        return privateClassWithWithPrivateParmeterTypes;
-    })();
-    var privateClassWithWithPublicParmeterTypes = (function () {
-        function privateClassWithWithPublicParmeterTypes() {
-        }
-        privateClassWithWithPublicParmeterTypes.myPublicStaticMethod = function () {
-            return null;
-        };
-        privateClassWithWithPublicParmeterTypes.myPrivateStaticMethod = function () {
-            return null;
-        };
-        privateClassWithWithPublicParmeterTypes.prototype.myPublicMethod = function () {
-            return null;
-        };
-        privateClassWithWithPublicParmeterTypes.prototype.myPrivateMethod = function () {
-            return null;
-        };
-        privateClassWithWithPublicParmeterTypes.myPublicStaticMethod1 = function () {
-            return new publicClass();
-        };
-        privateClassWithWithPublicParmeterTypes.myPrivateStaticMethod1 = function () {
-            return new publicClass();
-        };
-        privateClassWithWithPublicParmeterTypes.prototype.myPublicMethod1 = function () {
-            return new publicClass();
-        };
-        privateClassWithWithPublicParmeterTypes.prototype.myPrivateMethod1 = function () {
-            return new publicClass();
-        };
-        return privateClassWithWithPublicParmeterTypes;
-    })();
-    function publicFunctionWithPrivateParmeterTypes() {
-        return null;
-    }
-    privateModule.publicFunctionWithPrivateParmeterTypes = publicFunctionWithPrivateParmeterTypes;
-    function publicFunctionWithPublicParmeterTypes() {
-        return null;
-    }
-    privateModule.publicFunctionWithPublicParmeterTypes = publicFunctionWithPublicParmeterTypes;
-    function privateFunctionWithPrivateParmeterTypes() {
-        return null;
-    }
-    function privateFunctionWithPublicParmeterTypes() {
-        return null;
-    }
-    function publicFunctionWithPrivateParmeterTypes1() {
-        return new privateClass();
-    }
-    privateModule.publicFunctionWithPrivateParmeterTypes1 = publicFunctionWithPrivateParmeterTypes1;
-    function publicFunctionWithPublicParmeterTypes1() {
-        return new publicClass();
-    }
-    privateModule.publicFunctionWithPublicParmeterTypes1 = publicFunctionWithPublicParmeterTypes1;
-    function privateFunctionWithPrivateParmeterTypes1() {
-        return new privateClass();
-    }
-    function privateFunctionWithPublicParmeterTypes1() {
-        return new publicClass();
-    }
-    var publicClassWithPrivateModuleParameterTypes = (function () {
-        function publicClassWithPrivateModuleParameterTypes() {
-        }
-        publicClassWithPrivateModuleParameterTypes.myPublicStaticMethod = function () {
-            return null;
-        };
-        publicClassWithPrivateModuleParameterTypes.prototype.myPublicMethod = function () {
-            return null;
-        };
-        publicClassWithPrivateModuleParameterTypes.myPublicStaticMethod1 = function () {
-            return new privateModule.publicClass();
-        };
-        publicClassWithPrivateModuleParameterTypes.prototype.myPublicMethod1 = function () {
-            return new privateModule.publicClass();
-        };
-        return publicClassWithPrivateModuleParameterTypes;
-    })();
-    privateModule.publicClassWithPrivateModuleParameterTypes = publicClassWithPrivateModuleParameterTypes;
-    function publicFunctionWithPrivateModuleParameterTypes() {
-        return null;
-    }
-    privateModule.publicFunctionWithPrivateModuleParameterTypes = publicFunctionWithPrivateModuleParameterTypes;
-    function publicFunctionWithPrivateModuleParameterTypes1() {
-        return new privateModule.publicClass();
-    }
-    privateModule.publicFunctionWithPrivateModuleParameterTypes1 = publicFunctionWithPrivateModuleParameterTypes1;
-    var privateClassWithPrivateModuleParameterTypes = (function () {
-        function privateClassWithPrivateModuleParameterTypes() {
-        }
-        privateClassWithPrivateModuleParameterTypes.myPublicStaticMethod = function () {
-            return null;
-        };
-        privateClassWithPrivateModuleParameterTypes.prototype.myPublicMethod = function () {
-            return null;
-        };
-        privateClassWithPrivateModuleParameterTypes.myPublicStaticMethod1 = function () {
-            return new privateModule.publicClass();
-        };
-        privateClassWithPrivateModuleParameterTypes.prototype.myPublicMethod1 = function () {
-            return new privateModule.publicClass();
-        };
-        return privateClassWithPrivateModuleParameterTypes;
-    })();
-    function privateFunctionWithPrivateModuleParameterTypes() {
-        return null;
-    }
-    function privateFunctionWithPrivateModuleParameterTypes1() {
-        return new privateModule.publicClass();
-    }
-})(privateModule || (privateModule = {}));
-//// [privacyFunctionReturnTypeDeclFile_GlobalFile.js]
-var publicClassInGlobal = (function () {
-    function publicClassInGlobal() {
-    }
-    return publicClassInGlobal;
-})();
-var publicClassWithWithPublicParmeterTypesInGlobal = (function () {
-    function publicClassWithWithPublicParmeterTypesInGlobal() {
-    }
-    publicClassWithWithPublicParmeterTypesInGlobal.myPublicStaticMethod = function () {
-        return null;
-    };
-    publicClassWithWithPublicParmeterTypesInGlobal.myPrivateStaticMethod = function () {
-        return null;
-    };
-    publicClassWithWithPublicParmeterTypesInGlobal.prototype.myPublicMethod = function () {
-        return null;
-    };
-    publicClassWithWithPublicParmeterTypesInGlobal.prototype.myPrivateMethod = function () {
-        return null;
-    };
-    publicClassWithWithPublicParmeterTypesInGlobal.myPublicStaticMethod1 = function () {
-        return new publicClassInGlobal();
-    };
-    publicClassWithWithPublicParmeterTypesInGlobal.myPrivateStaticMethod1 = function () {
-        return new publicClassInGlobal();
-    };
-    publicClassWithWithPublicParmeterTypesInGlobal.prototype.myPublicMethod1 = function () {
-        return new publicClassInGlobal();
-    };
-    publicClassWithWithPublicParmeterTypesInGlobal.prototype.myPrivateMethod1 = function () {
-        return new publicClassInGlobal();
-    };
-    return publicClassWithWithPublicParmeterTypesInGlobal;
-})();
-function publicFunctionWithPublicParmeterTypesInGlobal() {
-    return null;
-}
-function publicFunctionWithPublicParmeterTypesInGlobal1() {
-    return new publicClassInGlobal();
-}
-var publicModuleInGlobal;
-(function (publicModuleInGlobal) {
-    var privateClass = (function () {
-        function privateClass() {
-        }
-        return privateClass;
-    })();
-    var publicClass = (function () {
-        function publicClass() {
-        }
-        return publicClass;
-    })();
-    publicModuleInGlobal.publicClass = publicClass;
-    var privateModule;
-    (function (privateModule) {
-        var privateClass = (function () {
-            function privateClass() {
-            }
-            return privateClass;
-        })();
-        var publicClass = (function () {
-            function publicClass() {
-            }
-            return publicClass;
-        })();
-        privateModule.publicClass = publicClass;
-        var publicClassWithWithPrivateParmeterTypes = (function () {
-            function publicClassWithWithPrivateParmeterTypes() {
-            }
-            publicClassWithWithPrivateParmeterTypes.myPublicStaticMethod = function () {
-                return null;
-            };
-            publicClassWithWithPrivateParmeterTypes.myPrivateStaticMethod = function () {
-                return null;
-            };
-            publicClassWithWithPrivateParmeterTypes.prototype.myPublicMethod = function () {
-                return null;
-            };
-            publicClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod = function () {
-                return null;
-            };
-            publicClassWithWithPrivateParmeterTypes.myPublicStaticMethod1 = function () {
-                return new privateClass();
-            };
-            publicClassWithWithPrivateParmeterTypes.myPrivateStaticMethod1 = function () {
-                return new privateClass();
-            };
-            publicClassWithWithPrivateParmeterTypes.prototype.myPublicMethod1 = function () {
-                return new privateClass();
-            };
-            publicClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod1 = function () {
-                return new privateClass();
-            };
-            return publicClassWithWithPrivateParmeterTypes;
-        })();
-        privateModule.publicClassWithWithPrivateParmeterTypes = publicClassWithWithPrivateParmeterTypes;
-        var publicClassWithWithPublicParmeterTypes = (function () {
-            function publicClassWithWithPublicParmeterTypes() {
-            }
-            publicClassWithWithPublicParmeterTypes.myPublicStaticMethod = function () {
-                return null;
-            };
-            publicClassWithWithPublicParmeterTypes.myPrivateStaticMethod = function () {
-                return null;
-            };
-            publicClassWithWithPublicParmeterTypes.prototype.myPublicMethod = function () {
-                return null;
-            };
-            publicClassWithWithPublicParmeterTypes.prototype.myPrivateMethod = function () {
-                return null;
-            };
-            publicClassWithWithPublicParmeterTypes.myPublicStaticMethod1 = function () {
-                return new publicClass();
-            };
-            publicClassWithWithPublicParmeterTypes.myPrivateStaticMethod1 = function () {
-                return new publicClass();
-            };
-            publicClassWithWithPublicParmeterTypes.prototype.myPublicMethod1 = function () {
-                return new publicClass();
-            };
-            publicClassWithWithPublicParmeterTypes.prototype.myPrivateMethod1 = function () {
-                return new publicClass();
-            };
-            return publicClassWithWithPublicParmeterTypes;
-        })();
-        privateModule.publicClassWithWithPublicParmeterTypes = publicClassWithWithPublicParmeterTypes;
-        var privateClassWithWithPrivateParmeterTypes = (function () {
-            function privateClassWithWithPrivateParmeterTypes() {
-            }
-            privateClassWithWithPrivateParmeterTypes.myPublicStaticMethod = function () {
-                return null;
-            };
-            privateClassWithWithPrivateParmeterTypes.myPrivateStaticMethod = function () {
-                return null;
-            };
-            privateClassWithWithPrivateParmeterTypes.prototype.myPublicMethod = function () {
-                return null;
-            };
-            privateClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod = function () {
-                return null;
-            };
-            privateClassWithWithPrivateParmeterTypes.myPublicStaticMethod1 = function () {
-                return new privateClass();
-            };
-            privateClassWithWithPrivateParmeterTypes.myPrivateStaticMethod1 = function () {
-                return new privateClass();
-            };
-            privateClassWithWithPrivateParmeterTypes.prototype.myPublicMethod1 = function () {
-                return new privateClass();
-            };
-            privateClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod1 = function () {
-                return new privateClass();
-            };
-            return privateClassWithWithPrivateParmeterTypes;
-        })();
-        var privateClassWithWithPublicParmeterTypes = (function () {
-            function privateClassWithWithPublicParmeterTypes() {
-            }
-            privateClassWithWithPublicParmeterTypes.myPublicStaticMethod = function () {
-                return null;
-            };
-            privateClassWithWithPublicParmeterTypes.myPrivateStaticMethod = function () {
-                return null;
-            };
-            privateClassWithWithPublicParmeterTypes.prototype.myPublicMethod = function () {
-                return null;
-            };
-            privateClassWithWithPublicParmeterTypes.prototype.myPrivateMethod = function () {
-                return null;
-            };
-            privateClassWithWithPublicParmeterTypes.myPublicStaticMethod1 = function () {
-                return new publicClass();
-            };
-            privateClassWithWithPublicParmeterTypes.myPrivateStaticMethod1 = function () {
-                return new publicClass();
-            };
-            privateClassWithWithPublicParmeterTypes.prototype.myPublicMethod1 = function () {
-                return new publicClass();
-            };
-            privateClassWithWithPublicParmeterTypes.prototype.myPrivateMethod1 = function () {
-                return new publicClass();
-            };
-            return privateClassWithWithPublicParmeterTypes;
-        })();
-        function publicFunctionWithPrivateParmeterTypes() {
-            return null;
-        }
-        privateModule.publicFunctionWithPrivateParmeterTypes = publicFunctionWithPrivateParmeterTypes;
-        function publicFunctionWithPublicParmeterTypes() {
-            return null;
-        }
-        privateModule.publicFunctionWithPublicParmeterTypes = publicFunctionWithPublicParmeterTypes;
-        function privateFunctionWithPrivateParmeterTypes() {
-            return null;
-        }
-        function privateFunctionWithPublicParmeterTypes() {
-            return null;
-        }
-        function publicFunctionWithPrivateParmeterTypes1() {
-            return new privateClass();
-        }
-        privateModule.publicFunctionWithPrivateParmeterTypes1 = publicFunctionWithPrivateParmeterTypes1;
-        function publicFunctionWithPublicParmeterTypes1() {
-            return new publicClass();
-        }
-        privateModule.publicFunctionWithPublicParmeterTypes1 = publicFunctionWithPublicParmeterTypes1;
-        function privateFunctionWithPrivateParmeterTypes1() {
-            return new privateClass();
-        }
-        function privateFunctionWithPublicParmeterTypes1() {
-            return new publicClass();
-        }
-        var publicClassWithPrivateModuleParameterTypes = (function () {
-            function publicClassWithPrivateModuleParameterTypes() {
-            }
-            publicClassWithPrivateModuleParameterTypes.myPublicStaticMethod = function () {
-                return null;
-            };
-            publicClassWithPrivateModuleParameterTypes.prototype.myPublicMethod = function () {
-                return null;
-            };
-            publicClassWithPrivateModuleParameterTypes.myPublicStaticMethod1 = function () {
-                return new privateModule.publicClass();
-            };
-            publicClassWithPrivateModuleParameterTypes.prototype.myPublicMethod1 = function () {
-                return new privateModule.publicClass();
-            };
-            return publicClassWithPrivateModuleParameterTypes;
-        })();
-        privateModule.publicClassWithPrivateModuleParameterTypes = publicClassWithPrivateModuleParameterTypes;
-        function publicFunctionWithPrivateModuleParameterTypes() {
-            return null;
-        }
-        privateModule.publicFunctionWithPrivateModuleParameterTypes = publicFunctionWithPrivateModuleParameterTypes;
-        function publicFunctionWithPrivateModuleParameterTypes1() {
-            return new privateModule.publicClass();
-        }
-        privateModule.publicFunctionWithPrivateModuleParameterTypes1 = publicFunctionWithPrivateModuleParameterTypes1;
-        var privateClassWithPrivateModuleParameterTypes = (function () {
-            function privateClassWithPrivateModuleParameterTypes() {
-            }
-            privateClassWithPrivateModuleParameterTypes.myPublicStaticMethod = function () {
-                return null;
-            };
-            privateClassWithPrivateModuleParameterTypes.prototype.myPublicMethod = function () {
-                return null;
-            };
-            privateClassWithPrivateModuleParameterTypes.myPublicStaticMethod1 = function () {
-                return new privateModule.publicClass();
-            };
-            privateClassWithPrivateModuleParameterTypes.prototype.myPublicMethod1 = function () {
-                return new privateModule.publicClass();
-            };
-            return privateClassWithPrivateModuleParameterTypes;
-        })();
-        function privateFunctionWithPrivateModuleParameterTypes() {
-            return null;
-        }
-        function privateFunctionWithPrivateModuleParameterTypes1() {
-            return new privateModule.publicClass();
-        }
-    })(privateModule || (privateModule = {}));
-    var publicClassWithWithPrivateParmeterTypes = (function () {
-        function publicClassWithWithPrivateParmeterTypes() {
-        }
-        publicClassWithWithPrivateParmeterTypes.myPublicStaticMethod = function () {
-            return null;
-        };
-        publicClassWithWithPrivateParmeterTypes.myPrivateStaticMethod = function () {
-            return null;
-        };
-        publicClassWithWithPrivateParmeterTypes.prototype.myPublicMethod = function () {
-            return null;
-        };
-        publicClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod = function () {
-            return null;
-        };
-        publicClassWithWithPrivateParmeterTypes.myPublicStaticMethod1 = function () {
-            return new privateClass();
-        };
-        publicClassWithWithPrivateParmeterTypes.myPrivateStaticMethod1 = function () {
-            return new privateClass();
-        };
-        publicClassWithWithPrivateParmeterTypes.prototype.myPublicMethod1 = function () {
-            return new privateClass();
-        };
-        publicClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod1 = function () {
-            return new privateClass();
-        };
-        return publicClassWithWithPrivateParmeterTypes;
-    })();
-    publicModuleInGlobal.publicClassWithWithPrivateParmeterTypes = publicClassWithWithPrivateParmeterTypes;
-    var publicClassWithWithPublicParmeterTypes = (function () {
-        function publicClassWithWithPublicParmeterTypes() {
-        }
-        publicClassWithWithPublicParmeterTypes.myPublicStaticMethod = function () {
-            return null;
-        };
-        publicClassWithWithPublicParmeterTypes.myPrivateStaticMethod = function () {
-            return null;
-        };
-        publicClassWithWithPublicParmeterTypes.prototype.myPublicMethod = function () {
-            return null;
-        };
-        publicClassWithWithPublicParmeterTypes.prototype.myPrivateMethod = function () {
-            return null;
-        };
-        publicClassWithWithPublicParmeterTypes.myPublicStaticMethod1 = function () {
-            return new publicClass();
-        };
-        publicClassWithWithPublicParmeterTypes.myPrivateStaticMethod1 = function () {
-            return new publicClass();
-        };
-        publicClassWithWithPublicParmeterTypes.prototype.myPublicMethod1 = function () {
-            return new publicClass();
-        };
-        publicClassWithWithPublicParmeterTypes.prototype.myPrivateMethod1 = function () {
-            return new publicClass();
-        };
-        return publicClassWithWithPublicParmeterTypes;
-    })();
-    publicModuleInGlobal.publicClassWithWithPublicParmeterTypes = publicClassWithWithPublicParmeterTypes;
-    var privateClassWithWithPrivateParmeterTypes = (function () {
-        function privateClassWithWithPrivateParmeterTypes() {
-        }
-        privateClassWithWithPrivateParmeterTypes.myPublicStaticMethod = function () {
-            return null;
-        };
-        privateClassWithWithPrivateParmeterTypes.myPrivateStaticMethod = function () {
-            return null;
-        };
-        privateClassWithWithPrivateParmeterTypes.prototype.myPublicMethod = function () {
-            return null;
-        };
-        privateClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod = function () {
-            return null;
-        };
-        privateClassWithWithPrivateParmeterTypes.myPublicStaticMethod1 = function () {
-            return new privateClass();
-        };
-        privateClassWithWithPrivateParmeterTypes.myPrivateStaticMethod1 = function () {
-            return new privateClass();
-        };
-        privateClassWithWithPrivateParmeterTypes.prototype.myPublicMethod1 = function () {
-            return new privateClass();
-        };
-        privateClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod1 = function () {
-            return new privateClass();
-        };
-        return privateClassWithWithPrivateParmeterTypes;
-    })();
-    var privateClassWithWithPublicParmeterTypes = (function () {
-        function privateClassWithWithPublicParmeterTypes() {
-        }
-        privateClassWithWithPublicParmeterTypes.myPublicStaticMethod = function () {
-            return null;
-        };
-        privateClassWithWithPublicParmeterTypes.myPrivateStaticMethod = function () {
-            return null;
-        };
-        privateClassWithWithPublicParmeterTypes.prototype.myPublicMethod = function () {
-            return null;
-        };
-        privateClassWithWithPublicParmeterTypes.prototype.myPrivateMethod = function () {
-            return null;
-        };
-        privateClassWithWithPublicParmeterTypes.myPublicStaticMethod1 = function () {
-            return new publicClass();
-        };
-        privateClassWithWithPublicParmeterTypes.myPrivateStaticMethod1 = function () {
-            return new publicClass();
-        };
-        privateClassWithWithPublicParmeterTypes.prototype.myPublicMethod1 = function () {
-            return new publicClass();
-        };
-        privateClassWithWithPublicParmeterTypes.prototype.myPrivateMethod1 = function () {
-            return new publicClass();
-        };
-        return privateClassWithWithPublicParmeterTypes;
-    })();
-    function publicFunctionWithPrivateParmeterTypes() {
-        return null;
-    }
-    publicModuleInGlobal.publicFunctionWithPrivateParmeterTypes = publicFunctionWithPrivateParmeterTypes;
-    function publicFunctionWithPublicParmeterTypes() {
-        return null;
-    }
-    publicModuleInGlobal.publicFunctionWithPublicParmeterTypes = publicFunctionWithPublicParmeterTypes;
-    function privateFunctionWithPrivateParmeterTypes() {
-        return null;
-    }
-    function privateFunctionWithPublicParmeterTypes() {
-        return null;
-    }
-    function publicFunctionWithPrivateParmeterTypes1() {
-        return new privateClass();
-    }
-    publicModuleInGlobal.publicFunctionWithPrivateParmeterTypes1 = publicFunctionWithPrivateParmeterTypes1;
-    function publicFunctionWithPublicParmeterTypes1() {
-        return new publicClass();
-    }
-    publicModuleInGlobal.publicFunctionWithPublicParmeterTypes1 = publicFunctionWithPublicParmeterTypes1;
-    function privateFunctionWithPrivateParmeterTypes1() {
-        return new privateClass();
-    }
-    function privateFunctionWithPublicParmeterTypes1() {
-        return new publicClass();
-    }
-    var publicClassWithPrivateModuleParameterTypes = (function () {
-        function publicClassWithPrivateModuleParameterTypes() {
-        }
-        publicClassWithPrivateModuleParameterTypes.myPublicStaticMethod = function () {
-            return null;
-        };
-        publicClassWithPrivateModuleParameterTypes.prototype.myPublicMethod = function () {
-            return null;
-        };
-        publicClassWithPrivateModuleParameterTypes.myPublicStaticMethod1 = function () {
-            return new privateModule.publicClass();
-        };
-        publicClassWithPrivateModuleParameterTypes.prototype.myPublicMethod1 = function () {
-            return new privateModule.publicClass();
-        };
-        return publicClassWithPrivateModuleParameterTypes;
-    })();
-    publicModuleInGlobal.publicClassWithPrivateModuleParameterTypes = publicClassWithPrivateModuleParameterTypes;
-    function publicFunctionWithPrivateModuleParameterTypes() {
-        return null;
-    }
-    publicModuleInGlobal.publicFunctionWithPrivateModuleParameterTypes = publicFunctionWithPrivateModuleParameterTypes;
-    function publicFunctionWithPrivateModuleParameterTypes1() {
-        return new privateModule.publicClass();
-    }
-    publicModuleInGlobal.publicFunctionWithPrivateModuleParameterTypes1 = publicFunctionWithPrivateModuleParameterTypes1;
-    var privateClassWithPrivateModuleParameterTypes = (function () {
-        function privateClassWithPrivateModuleParameterTypes() {
-        }
-        privateClassWithPrivateModuleParameterTypes.myPublicStaticMethod = function () {
-            return null;
-        };
-        privateClassWithPrivateModuleParameterTypes.prototype.myPublicMethod = function () {
-            return null;
-        };
-        privateClassWithPrivateModuleParameterTypes.myPublicStaticMethod1 = function () {
-            return new privateModule.publicClass();
-        };
-        privateClassWithPrivateModuleParameterTypes.prototype.myPublicMethod1 = function () {
-            return new privateModule.publicClass();
-        };
-        return privateClassWithPrivateModuleParameterTypes;
-    })();
-    function privateFunctionWithPrivateModuleParameterTypes() {
-        return null;
-    }
-    function privateFunctionWithPrivateModuleParameterTypes1() {
-        return new privateModule.publicClass();
-    }
-})(publicModuleInGlobal || (publicModuleInGlobal = {}));
diff --git a/tests/baselines/reference/privacyGetter.errors.txt b/tests/baselines/reference/privacyGetter.errors.txt
new file mode 100644
index 00000000000..ea185031726
--- /dev/null
+++ b/tests/baselines/reference/privacyGetter.errors.txt
@@ -0,0 +1,304 @@
+==== tests/cases/compiler/privacyGetter.ts (48 errors) ====
+    export module m1 {
+        export class C1_public {
+            private f1() {
+            }
+        }
+    
+        class C2_private {
+        }
+    
+        export class C3_public {
+            private get p1_private() {
+                        ~~~~~~~~~~
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
+                return new C1_public();
+            }
+    
+            private set p1_private(m1_c3_p1_arg: C1_public) {
+                        ~~~~~~~~~~
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
+            }
+    
+            private get p2_private() {
+                        ~~~~~~~~~~
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
+                return new C1_public();
+            }
+    
+            private set p2_private(m1_c3_p2_arg: C1_public) {
+                        ~~~~~~~~~~
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
+            }
+    
+            private get p3_private() {
+                        ~~~~~~~~~~
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
+                return new C2_private();
+            }
+    
+            private set p3_private(m1_c3_p3_arg: C2_private) {
+                        ~~~~~~~~~~
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
+            }
+    
+            public get p4_public(): C2_private { // error
+                       ~~~~~~~~~
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
+                return new C2_private(); //error
+            }
+    
+            public set p4_public(m1_c3_p4_arg: C2_private) { // error
+                       ~~~~~~~~~
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
+            }
+        }
+    
+        class C4_private {
+            private get p1_private() {
+                        ~~~~~~~~~~
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
+                return new C1_public();
+            }
+    
+            private set p1_private(m1_c3_p1_arg: C1_public) {
+                        ~~~~~~~~~~
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
+            }
+    
+            private get p2_private() {
+                        ~~~~~~~~~~
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
+                return new C1_public();
+            }
+    
+            private set p2_private(m1_c3_p2_arg: C1_public) {
+                        ~~~~~~~~~~
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
+            }
+    
+            private get p3_private() {
+                        ~~~~~~~~~~
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
+                return new C2_private();
+            }
+    
+            private set p3_private(m1_c3_p3_arg: C2_private) {
+                        ~~~~~~~~~~
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
+            }
+    
+            public get p4_public(): C2_private {
+                       ~~~~~~~~~
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
+                return new C2_private();
+            }
+    
+            public set p4_public(m1_c3_p4_arg: C2_private) {
+                       ~~~~~~~~~
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
+            }
+        }
+    }
+    
+    module m2 {
+        export class m2_C1_public {
+            private f1() {
+            }
+        }
+    
+        class m2_C2_private {
+        }
+    
+        export class m2_C3_public {
+            private get p1_private() {
+                        ~~~~~~~~~~
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
+                return new m2_C1_public();
+            }
+    
+            private set p1_private(m2_c3_p1_arg: m2_C1_public) {
+                        ~~~~~~~~~~
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
+            }
+    
+            private get p2_private() {
+                        ~~~~~~~~~~
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
+                return new m2_C1_public();
+            }
+    
+            private set p2_private(m2_c3_p2_arg: m2_C1_public) {
+                        ~~~~~~~~~~
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
+            }
+    
+            private get p3_private() {
+                        ~~~~~~~~~~
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
+                return new m2_C2_private();
+            }
+    
+            private set p3_private(m2_c3_p3_arg: m2_C2_private) {
+                        ~~~~~~~~~~
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
+            }
+    
+            public get p4_public(): m2_C2_private {
+                       ~~~~~~~~~
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
+                return new m2_C2_private();
+            }
+    
+            public set p4_public(m2_c3_p4_arg: m2_C2_private) {
+                       ~~~~~~~~~
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
+            }
+        }
+    
+        class m2_C4_private {
+            private get p1_private() {
+                        ~~~~~~~~~~
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
+                return new m2_C1_public();
+            }
+    
+            private set p1_private(m2_c3_p1_arg: m2_C1_public) {
+                        ~~~~~~~~~~
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
+            }
+    
+            private get p2_private() {
+                        ~~~~~~~~~~
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
+                return new m2_C1_public();
+            }
+    
+            private set p2_private(m2_c3_p2_arg: m2_C1_public) {
+                        ~~~~~~~~~~
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
+            }
+    
+            private get p3_private() {
+                        ~~~~~~~~~~
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
+                return new m2_C2_private();
+            }
+    
+            private set p3_private(m2_c3_p3_arg: m2_C2_private) {
+                        ~~~~~~~~~~
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
+            }
+    
+            public get p4_public(): m2_C2_private {
+                       ~~~~~~~~~
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
+                return new m2_C2_private();
+            }
+    
+            public set p4_public(m2_c3_p4_arg: m2_C2_private) {
+                       ~~~~~~~~~
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
+            }
+        }
+    }
+    
+    class C5_private {
+        private f() {
+        }
+    }
+    
+    export class C6_public {
+    }
+    
+    export class C7_public {
+        private get p1_private() {
+                    ~~~~~~~~~~
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
+            return new C6_public();
+        }
+    
+        private set p1_private(m1_c3_p1_arg: C6_public) {
+                    ~~~~~~~~~~
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
+        }
+    
+        private get p2_private() {
+                    ~~~~~~~~~~
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
+            return new C6_public();
+        }
+    
+        private set p2_private(m1_c3_p2_arg: C6_public) {
+                    ~~~~~~~~~~
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
+        }
+    
+        private get p3_private() {
+                    ~~~~~~~~~~
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
+            return new C5_private();
+        }
+    
+        private set p3_private(m1_c3_p3_arg: C5_private) {
+                    ~~~~~~~~~~
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
+        }
+    
+        public get p4_public(): C5_private { // error
+                   ~~~~~~~~~
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
+            return new C5_private(); //error
+        }
+    
+        public set p4_public(m1_c3_p4_arg: C5_private) { // error
+                   ~~~~~~~~~
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
+        }
+    }
+    
+    class C8_private {
+        private get p1_private() {
+                    ~~~~~~~~~~
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
+            return new C6_public();
+        }
+    
+        private set p1_private(m1_c3_p1_arg: C6_public) {
+                    ~~~~~~~~~~
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
+        }
+    
+        private get p2_private() {
+                    ~~~~~~~~~~
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
+            return new C6_public();
+        }
+    
+        private set p2_private(m1_c3_p2_arg: C6_public) {
+                    ~~~~~~~~~~
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
+        }
+    
+        private get p3_private() {
+                    ~~~~~~~~~~
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
+            return new C5_private();
+        }
+    
+        private set p3_private(m1_c3_p3_arg: C5_private) {
+                    ~~~~~~~~~~
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
+        }
+    
+        public get p4_public(): C5_private {
+                   ~~~~~~~~~
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
+            return new C5_private();
+        }
+    
+        public set p4_public(m1_c3_p4_arg: C5_private) {
+                   ~~~~~~~~~
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
+        }
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/privacyGetter.types b/tests/baselines/reference/privacyGetter.types
deleted file mode 100644
index 160d72a0279..00000000000
--- a/tests/baselines/reference/privacyGetter.types
+++ /dev/null
@@ -1,410 +0,0 @@
-=== tests/cases/compiler/privacyGetter.ts ===
-export module m1 {
->m1 : typeof m1
-
-    export class C1_public {
->C1_public : C1_public
-
-        private f1() {
->f1 : () => void
-        }
-    }
-
-    class C2_private {
->C2_private : C2_private
-    }
-
-    export class C3_public {
->C3_public : C3_public
-
-        private get p1_private() {
->p1_private : C1_public
-
-            return new C1_public();
->new C1_public() : C1_public
->C1_public : typeof C1_public
-        }
-
-        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() {
->p2_private : C1_public
-
-            return new C1_public();
->new C1_public() : C1_public
->C1_public : typeof C1_public
-        }
-
-        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() {
->p3_private : C2_private
-
-            return new C2_private();
->new C2_private() : C2_private
->C2_private : typeof C2_private
-        }
-
-        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
->C2_private : typeof C2_private
-        }
-
-        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
-        }
-    }
-
-    class C4_private {
->C4_private : C4_private
-
-        private get p1_private() {
->p1_private : C1_public
-
-            return new C1_public();
->new C1_public() : C1_public
->C1_public : typeof C1_public
-        }
-
-        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() {
->p2_private : C1_public
-
-            return new C1_public();
->new C1_public() : C1_public
->C1_public : typeof C1_public
-        }
-
-        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() {
->p3_private : C2_private
-
-            return new C2_private();
->new C2_private() : C2_private
->C2_private : typeof C2_private
-        }
-
-        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
->C2_private : typeof C2_private
-        }
-
-        public set p4_public(m1_c3_p4_arg: C2_private) {
->p4_public : C2_private
->m1_c3_p4_arg : C2_private
->C2_private : C2_private
-        }
-    }
-}
-
-module m2 {
->m2 : typeof m2
-
-    export class m2_C1_public {
->m2_C1_public : m2_C1_public
-
-        private f1() {
->f1 : () => void
-        }
-    }
-
-    class m2_C2_private {
->m2_C2_private : m2_C2_private
-    }
-
-    export class m2_C3_public {
->m2_C3_public : m2_C3_public
-
-        private get p1_private() {
->p1_private : m2_C1_public
-
-            return new m2_C1_public();
->new m2_C1_public() : m2_C1_public
->m2_C1_public : typeof m2_C1_public
-        }
-
-        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() {
->p2_private : m2_C1_public
-
-            return new m2_C1_public();
->new m2_C1_public() : m2_C1_public
->m2_C1_public : typeof m2_C1_public
-        }
-
-        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() {
->p3_private : m2_C2_private
-
-            return new m2_C2_private();
->new m2_C2_private() : m2_C2_private
->m2_C2_private : typeof m2_C2_private
-        }
-
-        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
->m2_C2_private : typeof m2_C2_private
-        }
-
-        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
-        }
-    }
-
-    class m2_C4_private {
->m2_C4_private : m2_C4_private
-
-        private get p1_private() {
->p1_private : m2_C1_public
-
-            return new m2_C1_public();
->new m2_C1_public() : m2_C1_public
->m2_C1_public : typeof m2_C1_public
-        }
-
-        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() {
->p2_private : m2_C1_public
-
-            return new m2_C1_public();
->new m2_C1_public() : m2_C1_public
->m2_C1_public : typeof m2_C1_public
-        }
-
-        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() {
->p3_private : m2_C2_private
-
-            return new m2_C2_private();
->new m2_C2_private() : m2_C2_private
->m2_C2_private : typeof m2_C2_private
-        }
-
-        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
->m2_C2_private : typeof m2_C2_private
-        }
-
-        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
-        }
-    }
-}
-
-class C5_private {
->C5_private : C5_private
-
-    private f() {
->f : () => void
-    }
-}
-
-export class C6_public {
->C6_public : C6_public
-}
-
-export class C7_public {
->C7_public : C7_public
-
-    private get p1_private() {
->p1_private : C6_public
-
-        return new C6_public();
->new C6_public() : C6_public
->C6_public : typeof C6_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() {
->p2_private : C6_public
-
-        return new C6_public();
->new C6_public() : C6_public
->C6_public : typeof C6_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() {
->p3_private : C5_private
-
-        return new C5_private();
->new C5_private() : C5_private
->C5_private : typeof C5_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 { // error
->p4_public : C5_private
->C5_private : C5_private
-
-        return new C5_private(); //error
->new C5_private() : C5_private
->C5_private : typeof C5_private
-    }
-
-    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
-    }
-}
-
-class C8_private {
->C8_private : C8_private
-
-    private get p1_private() {
->p1_private : C6_public
-
-        return new C6_public();
->new C6_public() : C6_public
->C6_public : typeof C6_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() {
->p2_private : C6_public
-
-        return new C6_public();
->new C6_public() : C6_public
->C6_public : typeof C6_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() {
->p3_private : C5_private
-
-        return new C5_private();
->new C5_private() : C5_private
->C5_private : typeof C5_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
->C5_private : typeof C5_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/privacyGloFunc.types b/tests/baselines/reference/privacyGloFunc.types
index 35ccb19f8ed..8b8eacd4157 100644
--- a/tests/baselines/reference/privacyGloFunc.types
+++ b/tests/baselines/reference/privacyGloFunc.types
@@ -267,32 +267,32 @@ export module m1 {
     }
 
     function f1_public(m1_f1_arg: C1_public) {
->f1_public : (m1_f1_arg: C1_public) => void
+>f1_public : typeof f1_public
 >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
+>f2_public : typeof f2_public
 >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
+>f3_public : typeof f3_public
 >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
+>f4_public : typeof f4_public
 >m1_f4_arg : C2_private
 >C2_private : C2_private
     }
 
 
     function f5_public() {
->f5_public : () => C1_public
+>f5_public : typeof f5_public
 
         return new C1_public();
 >new C1_public() : C1_public
@@ -300,7 +300,7 @@ export module m1 {
     }
 
     export function f6_public() {
->f6_public : () => C1_public
+>f6_public : typeof f6_public
 
         return new C1_public();
 >new C1_public() : C1_public
@@ -308,7 +308,7 @@ export module m1 {
     }
 
     function f7_public() {
->f7_public : () => C2_private
+>f7_public : typeof f7_public
 
         return new C2_private();
 >new C2_private() : C2_private
@@ -316,7 +316,7 @@ export module m1 {
     }
 
     export function f8_public() {
->f8_public : () => C2_private
+>f8_public : typeof f8_public
 
         return new C2_private();  // error
 >new C2_private() : C2_private
@@ -325,7 +325,7 @@ export module m1 {
 
 
     function f9_private(): C1_public {
->f9_private : () => C1_public
+>f9_private : typeof f9_private
 >C1_public : C1_public
 
         return new C1_public();
@@ -334,7 +334,7 @@ export module m1 {
     }
 
     export function f10_public(): C1_public {
->f10_public : () => C1_public
+>f10_public : typeof f10_public
 >C1_public : C1_public
 
         return new C1_public();
@@ -343,7 +343,7 @@ export module m1 {
     }
 
     function f11_private(): C2_private {
->f11_private : () => C2_private
+>f11_private : typeof f11_private
 >C2_private : C2_private
 
         return new C2_private();
@@ -352,7 +352,7 @@ export module m1 {
     }
 
     export function f12_public(): C2_private { // error
->f12_public : () => C2_private
+>f12_public : typeof f12_public
 >C2_private : C2_private
 
         return new C2_private(); //error
@@ -630,32 +630,32 @@ module m2 {
     }
 
     function f1_public(m2_f1_arg: m2_C1_public) {
->f1_public : (m2_f1_arg: m2_C1_public) => void
+>f1_public : typeof f1_public
 >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
+>f2_public : typeof f2_public
 >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
+>f3_public : typeof f3_public
 >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
+>f4_public : typeof f4_public
 >m2_f4_arg : m2_C2_private
 >m2_C2_private : m2_C2_private
     }
 
 
     function f5_public() {
->f5_public : () => m2_C1_public
+>f5_public : typeof f5_public
 
         return new m2_C1_public();
 >new m2_C1_public() : m2_C1_public
@@ -663,7 +663,7 @@ module m2 {
     }
 
     export function f6_public() {
->f6_public : () => m2_C1_public
+>f6_public : typeof f6_public
 
         return new m2_C1_public();
 >new m2_C1_public() : m2_C1_public
@@ -671,7 +671,7 @@ module m2 {
     }
 
     function f7_public() {
->f7_public : () => m2_C2_private
+>f7_public : typeof f7_public
 
         return new m2_C2_private();
 >new m2_C2_private() : m2_C2_private
@@ -679,7 +679,7 @@ module m2 {
     }
 
     export function f8_public() {
->f8_public : () => m2_C2_private
+>f8_public : typeof f8_public
 
         return new m2_C2_private();
 >new m2_C2_private() : m2_C2_private
@@ -688,7 +688,7 @@ module m2 {
 
 
     function f9_private(): m2_C1_public {
->f9_private : () => m2_C1_public
+>f9_private : typeof f9_private
 >m2_C1_public : m2_C1_public
 
         return new m2_C1_public();
@@ -697,7 +697,7 @@ module m2 {
     }
 
     export function f10_public(): m2_C1_public {
->f10_public : () => m2_C1_public
+>f10_public : typeof f10_public
 >m2_C1_public : m2_C1_public
 
         return new m2_C1_public();
@@ -706,7 +706,7 @@ module m2 {
     }
 
     function f11_private(): m2_C2_private {
->f11_private : () => m2_C2_private
+>f11_private : typeof f11_private
 >m2_C2_private : m2_C2_private
 
         return new m2_C2_private();
@@ -715,7 +715,7 @@ module m2 {
     }
 
     export function f12_public(): m2_C2_private {
->f12_public : () => m2_C2_private
+>f12_public : typeof f12_public
 >m2_C2_private : m2_C2_private
 
         return new m2_C2_private();
@@ -988,31 +988,31 @@ class C12_private {
 }
 
 function f1_private(f1_arg: C5_private) {
->f1_private : (f1_arg: C5_private) => void
+>f1_private : typeof f1_private
 >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_public : typeof f2_public
 >f2_arg : C5_private
 >C5_private : C5_private
 }
 
 function f3_private(f3_arg: C6_public) {
->f3_private : (f3_arg: C6_public) => void
+>f3_private : typeof f3_private
 >f3_arg : C6_public
 >C6_public : C6_public
 }
 
 export function f4_public(f4_arg: C6_public) {
->f4_public : (f4_arg: C6_public) => void
+>f4_public : typeof f4_public
 >f4_arg : C6_public
 >C6_public : C6_public
 }
 
 function f5_private() {
->f5_private : () => C6_public
+>f5_private : typeof f5_private
 
     return new C6_public();
 >new C6_public() : C6_public
@@ -1020,7 +1020,7 @@ function f5_private() {
 }
 
 export function f6_public() {
->f6_public : () => C6_public
+>f6_public : typeof f6_public
 
     return new C6_public();
 >new C6_public() : C6_public
@@ -1028,7 +1028,7 @@ export function f6_public() {
 }
 
 function f7_private() {
->f7_private : () => C5_private
+>f7_private : typeof f7_private
 
     return new C5_private();
 >new C5_private() : C5_private
@@ -1036,7 +1036,7 @@ function f7_private() {
 }
 
 export function f8_public() {
->f8_public : () => C5_private
+>f8_public : typeof f8_public
 
     return new C5_private(); //error
 >new C5_private() : C5_private
@@ -1044,7 +1044,7 @@ export function f8_public() {
 }
 
 function f9_private(): C6_public {
->f9_private : () => C6_public
+>f9_private : typeof f9_private
 >C6_public : C6_public
 
     return new C6_public();
@@ -1053,7 +1053,7 @@ function f9_private(): C6_public {
 }
 
 export function f10_public(): C6_public {
->f10_public : () => C6_public
+>f10_public : typeof f10_public
 >C6_public : C6_public
 
     return new C6_public();
@@ -1062,7 +1062,7 @@ export function f10_public(): C6_public {
 }
 
 function f11_private(): C5_private {
->f11_private : () => C5_private
+>f11_private : typeof f11_private
 >C5_private : C5_private
 
     return new C5_private();
@@ -1071,7 +1071,7 @@ function f11_private(): C5_private {
 }
 
 export function f12_public(): C5_private { //error 
->f12_public : () => C5_private
+>f12_public : typeof f12_public
 >C5_private : C5_private
 
     return new C5_private(); //error
diff --git a/tests/baselines/reference/privacyGloGetter.errors.txt b/tests/baselines/reference/privacyGloGetter.errors.txt
new file mode 100644
index 00000000000..d23ed7d1491
--- /dev/null
+++ b/tests/baselines/reference/privacyGloGetter.errors.txt
@@ -0,0 +1,129 @@
+==== tests/cases/compiler/privacyGloGetter.ts (20 errors) ====
+    module m1 {
+        export class C1_public {
+            private f1() {
+            }
+        }
+    
+        class C2_private {
+        }
+    
+        export class C3_public {
+            private get p1_private() {
+                        ~~~~~~~~~~
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
+                return new C1_public();
+            }
+    
+            private set p1_private(m1_c3_p1_arg: C1_public) {
+                        ~~~~~~~~~~
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
+            }
+    
+            private get p2_private() {
+                        ~~~~~~~~~~
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
+                return new C1_public();
+            }
+    
+            private set p2_private(m1_c3_p2_arg: C1_public) {
+                        ~~~~~~~~~~
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
+            }
+    
+            private get p3_private() {
+                        ~~~~~~~~~~
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
+                return new C2_private();
+            }
+    
+            private set p3_private(m1_c3_p3_arg: C2_private) {
+                        ~~~~~~~~~~
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
+            }
+    
+            public get p4_public(): C2_private { // error
+                       ~~~~~~~~~
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
+                return new C2_private(); //error
+            }
+    
+            public set p4_public(m1_c3_p4_arg: C2_private) { // error
+                       ~~~~~~~~~
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
+            }
+        }
+    
+        class C4_private {
+            private get p1_private() {
+                        ~~~~~~~~~~
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
+                return new C1_public();
+            }
+    
+            private set p1_private(m1_c3_p1_arg: C1_public) {
+                        ~~~~~~~~~~
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
+            }
+    
+            private get p2_private() {
+                        ~~~~~~~~~~
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
+                return new C1_public();
+            }
+    
+            private set p2_private(m1_c3_p2_arg: C1_public) {
+                        ~~~~~~~~~~
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
+            }
+    
+            private get p3_private() {
+                        ~~~~~~~~~~
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
+                return new C2_private();
+            }
+    
+            private set p3_private(m1_c3_p3_arg: C2_private) {
+                        ~~~~~~~~~~
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
+            }
+    
+            public get p4_public(): C2_private {
+                       ~~~~~~~~~
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
+                return new C2_private();
+            }
+    
+            public set p4_public(m1_c3_p4_arg: C2_private) {
+                       ~~~~~~~~~
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
+            }
+        }
+    }
+    
+    class C6_public {
+    }
+    
+    class C7_public {
+        private get p1_private() {
+                    ~~~~~~~~~~
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
+            return new C6_public();
+        }
+    
+        private set p1_private(m1_c3_p1_arg: C6_public) {
+                    ~~~~~~~~~~
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
+        }
+    
+        private get p2_private() {
+                    ~~~~~~~~~~
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
+            return new C6_public();
+        }
+    
+        private set p2_private(m1_c3_p2_arg: C6_public) {
+                    ~~~~~~~~~~
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
+        }
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/privacyGloGetter.types b/tests/baselines/reference/privacyGloGetter.types
deleted file mode 100644
index 6dc32ec095b..00000000000
--- a/tests/baselines/reference/privacyGloGetter.types
+++ /dev/null
@@ -1,174 +0,0 @@
-=== tests/cases/compiler/privacyGloGetter.ts ===
-module m1 {
->m1 : typeof m1
-
-    export class C1_public {
->C1_public : C1_public
-
-        private f1() {
->f1 : () => void
-        }
-    }
-
-    class C2_private {
->C2_private : C2_private
-    }
-
-    export class C3_public {
->C3_public : C3_public
-
-        private get p1_private() {
->p1_private : C1_public
-
-            return new C1_public();
->new C1_public() : C1_public
->C1_public : typeof C1_public
-        }
-
-        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() {
->p2_private : C1_public
-
-            return new C1_public();
->new C1_public() : C1_public
->C1_public : typeof C1_public
-        }
-
-        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() {
->p3_private : C2_private
-
-            return new C2_private();
->new C2_private() : C2_private
->C2_private : typeof C2_private
-        }
-
-        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
->C2_private : typeof C2_private
-        }
-
-        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
-        }
-    }
-
-    class C4_private {
->C4_private : C4_private
-
-        private get p1_private() {
->p1_private : C1_public
-
-            return new C1_public();
->new C1_public() : C1_public
->C1_public : typeof C1_public
-        }
-
-        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() {
->p2_private : C1_public
-
-            return new C1_public();
->new C1_public() : C1_public
->C1_public : typeof C1_public
-        }
-
-        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() {
->p3_private : C2_private
-
-            return new C2_private();
->new C2_private() : C2_private
->C2_private : typeof C2_private
-        }
-
-        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
->C2_private : typeof C2_private
-        }
-
-        public set p4_public(m1_c3_p4_arg: C2_private) {
->p4_public : C2_private
->m1_c3_p4_arg : C2_private
->C2_private : C2_private
-        }
-    }
-}
-
-class C6_public {
->C6_public : C6_public
-}
-
-class C7_public {
->C7_public : C7_public
-
-    private get p1_private() {
->p1_private : C6_public
-
-        return new C6_public();
->new C6_public() : C6_public
->C6_public : typeof C6_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() {
->p2_private : C6_public
-
-        return new C6_public();
->new C6_public() : C6_public
->C6_public : typeof C6_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.errors.txt b/tests/baselines/reference/privacyGloImport.errors.txt
index cd5c19fa9d7..38d31860a5b 100644
--- a/tests/baselines/reference/privacyGloImport.errors.txt
+++ b/tests/baselines/reference/privacyGloImport.errors.txt
@@ -1,4 +1,4 @@
-==== tests/cases/compiler/privacyGloImport.ts (2 errors) ====
+==== tests/cases/compiler/privacyGloImport.ts (21 errors) ====
     module m1 {
         export module m1_M1_public {
             export class c1 {
@@ -20,21 +20,27 @@
             export var v2: c1;
         }
     
-        //export declare module "m1_M3_public" {
-        //    export function f1();
-        //    export class c1 {
-        //    }
-        //    export var v1: { new (): c1; };
-        //    export var v2: c1;
-        //}
+        declare export module "m1_M3_public" {
+                ~~~~~~
+!!! 'export' modifier must precede 'declare' modifier.
+                              ~~~~~~~~~~~~~~
+!!! Ambient external modules cannot be nested in other modules.
+            export function f1();
+            export class c1 {
+            }
+            export var v1: { new (): c1; };
+            export var v2: c1;
+        }
     
-        //declare module "m1_M4_private" {
-        //    export function f1();
-        //    export class c1 {
-        //    }
-        //    export var v1: { new (): c1; };
-        //    export var v2: c1;
-        //}
+        declare module "m1_M4_private" {
+                       ~~~~~~~~~~~~~~~
+!!! Ambient external modules cannot be nested in other modules.
+            export function f1();
+            export class c1 {
+            }
+            export var v1: { new (): c1; };
+            export var v2: c1;
+        }
     
         import m1_im1_private = m1_M1_public;
         export var m1_im1_private_v1_public = m1_im1_private.c1;
@@ -48,8 +54,6 @@
     
     
         import m1_im2_private = m1_M2_private;
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Import declaration 'm1_im2_private' is using private name 'm1_M2_private'.
         export var m1_im2_private_v1_public = m1_im2_private.c1;
         export var m1_im2_private_v2_public = new m1_im2_private.c1();
         export var m1_im2_private_v3_public = m1_im2_private.f1;
@@ -59,32 +63,43 @@
         var m1_im2_private_v3_private = m1_im2_private.f1;
         var m1_im2_private_v4_private = m1_im2_private.f1();
     
-        //import m1_im3_private = require("m1_M3_public");
-        //export var m1_im3_private_v1_public = m1_im3_private.c1;
-        //export var m1_im3_private_v2_public = new m1_im3_private.c1();
-        //export var m1_im3_private_v3_public = m1_im3_private.f1;
-        //export var m1_im3_private_v4_public = m1_im3_private.f1();
-        //var m1_im3_private_v1_private = m1_im3_private.c1;
-        //var m1_im3_private_v2_private = new m1_im3_private.c1();
-        //var m1_im3_private_v3_private = m1_im3_private.f1;
-        //var m1_im3_private_v4_private = m1_im3_private.f1();
+        import m1_im3_private = require("m1_M3_public");
+        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Import declarations in an internal module cannot reference an external module.
+                                        ~~~~~~~~~~~~~~
+!!! Cannot find external module 'm1_M3_public'.
+        export var m1_im3_private_v1_public = m1_im3_private.c1;
+        export var m1_im3_private_v2_public = new m1_im3_private.c1();
+        export var m1_im3_private_v3_public = m1_im3_private.f1;
+        export var m1_im3_private_v4_public = m1_im3_private.f1();
+        var m1_im3_private_v1_private = m1_im3_private.c1;
+        var m1_im3_private_v2_private = new m1_im3_private.c1();
+        var m1_im3_private_v3_private = m1_im3_private.f1;
+        var m1_im3_private_v4_private = m1_im3_private.f1();
     
-        //import m1_im4_private = require("m1_M4_private");
-        //export var m1_im4_private_v1_public = m1_im4_private.c1;
-        //export var m1_im4_private_v2_public = new m1_im4_private.c1();
-        //export var m1_im4_private_v3_public = m1_im4_private.f1;
-        //export var m1_im4_private_v4_public = m1_im4_private.f1();
-        //var m1_im4_private_v1_private = m1_im4_private.c1;
-        //var m1_im4_private_v2_private = new m1_im4_private.c1();
-        //var m1_im4_private_v3_private = m1_im4_private.f1;
-        //var m1_im4_private_v4_private = m1_im4_private.f1();
+        import m1_im4_private = require("m1_M4_private");
+        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Import declarations in an internal module cannot reference an external module.
+                                        ~~~~~~~~~~~~~~~
+!!! Cannot find external module 'm1_M4_private'.
+        export var m1_im4_private_v1_public = m1_im4_private.c1;
+        export var m1_im4_private_v2_public = new m1_im4_private.c1();
+        export var m1_im4_private_v3_public = m1_im4_private.f1;
+        export var m1_im4_private_v4_public = m1_im4_private.f1();
+        var m1_im4_private_v1_private = m1_im4_private.c1;
+        var m1_im4_private_v2_private = new m1_im4_private.c1();
+        var m1_im4_private_v3_private = m1_im4_private.f1;
+        var m1_im4_private_v4_private = m1_im4_private.f1();
     
+        // Parse error to export module
         export import m1_im1_public = m1_M1_public;
         export import m1_im2_public = m1_M2_private;
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Import declaration 'm1_im2_public' is using private name 'm1_M2_private'.
-        //export import m1_im3_public = require("m1_M3_public");
-        //export import m1_im4_public = require("m1_M4_private");
+        export import m1_im3_public = require("m1_M3_public");
+        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Import declarations in an internal module cannot reference an external module.
+        export import m1_im4_public = require("m1_M4_private");
+        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Import declarations in an internal module cannot reference an external module.
     }
     
     module glo_M1_public {
@@ -108,26 +123,38 @@
     declare module "use_glo_M1_public" {
         import use_glo_M1_public = glo_M1_public;
         export var use_glo_M1_public_v1_public: { new (): use_glo_M1_public.c1; };
-        export var use_glo_M1_public_v2_public: typeof use_glo_M1_public;
+        export var use_glo_M1_public_v2_public: use_glo_M1_public;
+                                                ~~~~~~~~~~~~~~~~~
+!!! Cannot find name 'use_glo_M1_public'.
         export var use_glo_M1_public_v3_public: ()=> use_glo_M1_public.c1;
         var use_glo_M1_public_v1_private: { new (): use_glo_M1_public.c1; };
-        var use_glo_M1_public_v2_private: typeof use_glo_M1_public;
+        var use_glo_M1_public_v2_private: use_glo_M1_public;
+                                          ~~~~~~~~~~~~~~~~~
+!!! Cannot find name 'use_glo_M1_public'.
         var use_glo_M1_public_v3_private: () => use_glo_M1_public.c1;
     
         import use_glo_M2_public = require("glo_M2_public");
         export var use_glo_M2_public_v1_public: { new (): use_glo_M2_public.c1; };
-        export var use_glo_M2_public_v2_public: typeof use_glo_M2_public;
+        export var use_glo_M2_public_v2_public: use_glo_M2_public;
+                                                ~~~~~~~~~~~~~~~~~
+!!! Cannot find name 'use_glo_M2_public'.
         export var use_glo_M2_public_v3_public: () => use_glo_M2_public.c1;
         var use_glo_M2_public_v1_private: { new (): use_glo_M2_public.c1; };
-        var use_glo_M2_public_v2_private: typeof use_glo_M2_public;
+        var use_glo_M2_public_v2_private: use_glo_M2_public;
+                                          ~~~~~~~~~~~~~~~~~
+!!! Cannot find name 'use_glo_M2_public'.
         var use_glo_M2_public_v3_private: () => use_glo_M2_public.c1;
     
         module m2 {
-            //import errorImport = require("glo_M2_public");
+            import errorImport = require("glo_M2_public");
+            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Import declarations in an internal module cannot reference an external module.
             import nonerrorImport = glo_M1_public;
     
             module m5 {
-                //import m5_errorImport = require("glo_M2_public");
+                import m5_errorImport = require("glo_M2_public");
+                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Import declarations in an internal module cannot reference an external module.
                 import m5_nonerrorImport = glo_M1_public;
             }
         }
@@ -135,23 +162,35 @@
     
     declare module "anotherParseError" {
         module m2 {
-            //declare module "abc" {
-            //}
+            declare module "abc" {
+            ~~~~~~~
+!!! A 'declare' modifier cannot be used in an already ambient context.
+                           ~~~~~
+!!! Ambient external modules cannot be nested in other modules.
+            }
         }
     
         module m2 {
-            //module "abc2" {
-            //}
+            module "abc2" {
+                   ~~~~~~
+!!! Ambient external modules cannot be nested in other modules.
+            }
+        }
+        module "abc3" {
+               ~~~~~~
+!!! Ambient external modules cannot be nested in other modules.
         }
-        //module "abc3" {
-        //}
     }
     
     module m2 {
-        //import m3 = require("use_glo_M1_public");
+        import m3 = require("use_glo_M1_public");
+        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Import declarations in an internal module cannot reference an external module.
         module m4 {
             var a = 10;
-            //import m2 = require("use_glo_M1_public");
+            import m2 = require("use_glo_M1_public");
+            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Import declarations in an internal module cannot reference an external module.
         }
     
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/privacyGloImportParseErrors.errors.txt b/tests/baselines/reference/privacyGloImportParseErrors.errors.txt
deleted file mode 100644
index d681008e3b5..00000000000
--- a/tests/baselines/reference/privacyGloImportParseErrors.errors.txt
+++ /dev/null
@@ -1,185 +0,0 @@
-==== tests/cases/compiler/privacyGloImportParseErrors.ts (16 errors) ====
-    module m1 {
-        export module m1_M1_public {
-            export class c1 {
-            }
-            export function f1() {
-                return new c1;
-            }
-            export var v1 = c1;
-            export var v2: c1;
-        }
-    
-        module m1_M2_private {
-            export class c1 {
-            }
-            export function f1() {
-                return new c1;
-            }
-            export var v1 = c1;
-            export var v2: c1;
-        }
-    
-        export declare module "m1_M3_public" {
-                              ~~~~~~~~~~~~~~
-!!! Ambient external modules cannot be nested in other modules.
-            export function f1();
-            export class c1 {
-            }
-            export var v1: { new (): c1; };
-            export var v2: c1;
-        }
-    
-        declare module "m1_M4_private" {
-                       ~~~~~~~~~~~~~~~
-!!! Ambient external modules cannot be nested in other modules.
-            export function f1();
-            export class c1 {
-            }
-            export var v1: { new (): c1; };
-            export var v2: c1;
-        }
-    
-        import m1_im1_private = m1_M1_public;
-        export var m1_im1_private_v1_public = m1_im1_private.c1;
-        export var m1_im1_private_v2_public = new m1_im1_private.c1();
-        export var m1_im1_private_v3_public = m1_im1_private.f1;
-        export var m1_im1_private_v4_public = m1_im1_private.f1();
-        var m1_im1_private_v1_private = m1_im1_private.c1;
-        var m1_im1_private_v2_private = new m1_im1_private.c1();
-        var m1_im1_private_v3_private = m1_im1_private.f1;
-        var m1_im1_private_v4_private = m1_im1_private.f1();
-    
-    
-        import m1_im2_private = m1_M2_private;
-        export var m1_im2_private_v1_public = m1_im2_private.c1;
-        export var m1_im2_private_v2_public = new m1_im2_private.c1();
-        export var m1_im2_private_v3_public = m1_im2_private.f1;
-        export var m1_im2_private_v4_public = m1_im2_private.f1();
-        var m1_im2_private_v1_private = m1_im2_private.c1;
-        var m1_im2_private_v2_private = new m1_im2_private.c1();
-        var m1_im2_private_v3_private = m1_im2_private.f1;
-        var m1_im2_private_v4_private = m1_im2_private.f1();
-    
-        import m1_im3_private = require("m1_M3_public");
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Import declarations in an internal module cannot reference an external module.
-                                        ~~~~~~~~~~~~~~
-!!! Cannot find external module 'm1_M3_public'.
-        export var m1_im3_private_v1_public = m1_im3_private.c1;
-        export var m1_im3_private_v2_public = new m1_im3_private.c1();
-        export var m1_im3_private_v3_public = m1_im3_private.f1;
-        export var m1_im3_private_v4_public = m1_im3_private.f1();
-        var m1_im3_private_v1_private = m1_im3_private.c1;
-        var m1_im3_private_v2_private = new m1_im3_private.c1();
-        var m1_im3_private_v3_private = m1_im3_private.f1;
-        var m1_im3_private_v4_private = m1_im3_private.f1();
-    
-        import m1_im4_private = require("m1_M4_private");
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Import declarations in an internal module cannot reference an external module.
-                                        ~~~~~~~~~~~~~~~
-!!! Cannot find external module 'm1_M4_private'.
-        export var m1_im4_private_v1_public = m1_im4_private.c1;
-        export var m1_im4_private_v2_public = new m1_im4_private.c1();
-        export var m1_im4_private_v3_public = m1_im4_private.f1;
-        export var m1_im4_private_v4_public = m1_im4_private.f1();
-        var m1_im4_private_v1_private = m1_im4_private.c1;
-        var m1_im4_private_v2_private = new m1_im4_private.c1();
-        var m1_im4_private_v3_private = m1_im4_private.f1;
-        var m1_im4_private_v4_private = m1_im4_private.f1();
-    
-        export import m1_im1_public = m1_M1_public;
-        export import m1_im2_public = m1_M2_private;
-        export import m1_im3_public = require("m1_M3_public");
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Import declarations in an internal module cannot reference an external module.
-        export import m1_im4_public = require("m1_M4_private");
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Import declarations in an internal module cannot reference an external module.
-    }
-    
-    module glo_M1_public {
-        export class c1 {
-        }
-        export function f1() {
-            return new c1;
-        }
-        export var v1 = c1;
-        export var v2: c1;
-    }
-    
-    declare module "glo_M2_public" {
-        export function f1();
-        export class c1 {
-        }
-        export var v1: { new (): c1; };
-        export var v2: c1;
-    }
-    
-    declare module "use_glo_M1_public" {
-        import use_glo_M1_public = glo_M1_public;
-        export var use_glo_M1_public_v1_public: { new (): use_glo_M1_public.c1; };
-        export var use_glo_M1_public_v2_public: typeof use_glo_M1_public;
-        export var use_glo_M1_public_v3_public: ()=> use_glo_M1_public.c1;
-        var use_glo_M1_public_v1_private: { new (): use_glo_M1_public.c1; };
-        var use_glo_M1_public_v2_private: typeof use_glo_M1_public;
-        var use_glo_M1_public_v3_private: () => use_glo_M1_public.c1;
-    
-        import use_glo_M2_public = require("glo_M2_public");
-        export var use_glo_M2_public_v1_public: { new (): use_glo_M2_public.c1; };
-        export var use_glo_M2_public_v2_public: typeof use_glo_M2_public;
-        export var use_glo_M2_public_v3_public: () => use_glo_M2_public.c1;
-        var use_glo_M2_public_v1_private: { new (): use_glo_M2_public.c1; };
-        var use_glo_M2_public_v2_private: typeof use_glo_M2_public;
-        var use_glo_M2_public_v3_private: () => use_glo_M2_public.c1;
-    
-        module m2 {
-            import errorImport = require("glo_M2_public");
-            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Import declarations in an internal module cannot reference an external module.
-            import nonerrorImport = glo_M1_public;
-    
-            module m5 {
-                import m5_errorImport = require("glo_M2_public");
-                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Import declarations in an internal module cannot reference an external module.
-                import m5_nonerrorImport = glo_M1_public;
-            }
-        }
-    }
-    
-    declare module "anotherParseError" {
-        module m2 {
-            declare module "abc" {
-            ~~~~~~~
-!!! A 'declare' modifier cannot be used in an already ambient context.
-                           ~~~~~
-!!! Ambient external modules cannot be nested in other modules.
-            }
-        }
-    
-        module m2 {
-            module "abc2" {
-                   ~~~~~~
-!!! Ambient external modules cannot be nested in other modules.
-            }
-        }
-        module "abc3" {
-               ~~~~~~
-!!! Ambient external modules cannot be nested in other modules.
-        }
-    }
-    
-    module m2 {
-        import m3 = require("use_glo_M1_public");
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Import declarations in an internal module cannot reference an external module.
-        module m4 {
-            var a = 10;
-            import m2 = require("use_glo_M1_public");
-            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Import declarations in an internal module cannot reference an external module.
-        }
-    
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/privacyImport.errors.txt b/tests/baselines/reference/privacyImport.errors.txt
index a4ea4776a12..bb22a0c398c 100644
--- a/tests/baselines/reference/privacyImport.errors.txt
+++ b/tests/baselines/reference/privacyImport.errors.txt
@@ -1,4 +1,4 @@
-==== tests/cases/compiler/privacyImport.ts (2 errors) ====
+==== tests/cases/compiler/privacyImport.ts (49 errors) ====
     export module m1 {
         export module m1_M1_public {
             export class c1 {
@@ -20,21 +20,25 @@
             export var v2: c1;
         }
     
-        //export declare module "m1_M3_public" {
-        //    export function f1();
-        //    export class c1 {
-        //    }
-        //    export var v1: { new (): c1; };
-        //    export var v2: c1;
-        //}
+        export declare module "m1_M3_public" {
+                              ~~~~~~~~~~~~~~
+!!! Ambient external modules cannot be nested in other modules.
+            export function f1();
+            export class c1 {
+            }
+            export var v1: { new (): c1; };
+            export var v2: c1;
+        }
     
-        //declare module "m1_M4_private" {
-        //    export function f1();
-        //    export class c1 {
-        //    }
-        //    export var v1: { new (): c1; };
-        //    export var v2: c1;
-        //}
+        declare module "m1_M4_private" {
+                       ~~~~~~~~~~~~~~~
+!!! Ambient external modules cannot be nested in other modules.
+            export function f1();
+            export class c1 {
+            }
+            export var v1: { new (): c1; };
+            export var v2: c1;
+        }
     
         import m1_im1_private = m1_M1_public;
         export var m1_im1_private_v1_public = m1_im1_private.c1;
@@ -48,8 +52,6 @@
     
     
         import m1_im2_private = m1_M2_private;
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Import declaration 'm1_im2_private' is using private name 'm1_M2_private'.
         export var m1_im2_private_v1_public = m1_im2_private.c1;
         export var m1_im2_private_v2_public = new m1_im2_private.c1();
         export var m1_im2_private_v3_public = m1_im2_private.f1;
@@ -59,32 +61,42 @@
         var m1_im2_private_v3_private = m1_im2_private.f1;
         var m1_im2_private_v4_private = m1_im2_private.f1();
     
-        //import m1_im3_private = require("m1_M3_public");
-        //export var m1_im3_private_v1_public = m1_im3_private.c1;
-        //export var m1_im3_private_v2_public = new m1_im3_private.c1();
-        //export var m1_im3_private_v3_public = m1_im3_private.f1;
-        //export var m1_im3_private_v4_public = m1_im3_private.f1();
-        //var m1_im3_private_v1_private = m1_im3_private.c1;
-        //var m1_im3_private_v2_private = new m1_im3_private.c1();
-        //var m1_im3_private_v3_private = m1_im3_private.f1;
-        //var m1_im3_private_v4_private = m1_im3_private.f1();
+        import m1_im3_private = require("m1_M3_public");
+        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Import declarations in an internal module cannot reference an external module.
+                                        ~~~~~~~~~~~~~~
+!!! Cannot find external module 'm1_M3_public'.
+        export var m1_im3_private_v1_public = m1_im3_private.c1;
+        export var m1_im3_private_v2_public = new m1_im3_private.c1();
+        export var m1_im3_private_v3_public = m1_im3_private.f1;
+        export var m1_im3_private_v4_public = m1_im3_private.f1();
+        var m1_im3_private_v1_private = m1_im3_private.c1;
+        var m1_im3_private_v2_private = new m1_im3_private.c1();
+        var m1_im3_private_v3_private = m1_im3_private.f1;
+        var m1_im3_private_v4_private = m1_im3_private.f1();
     
-        //import m1_im4_private = require("m1_M4_private");
-        //export var m1_im4_private_v1_public = m1_im4_private.c1;
-        //export var m1_im4_private_v2_public = new m1_im4_private.c1();
-        //export var m1_im4_private_v3_public = m1_im4_private.f1;
-        //export var m1_im4_private_v4_public = m1_im4_private.f1();
-        //var m1_im4_private_v1_private = m1_im4_private.c1;
-        //var m1_im4_private_v2_private = new m1_im4_private.c1();
-        //var m1_im4_private_v3_private = m1_im4_private.f1;
-        //var m1_im4_private_v4_private = m1_im4_private.f1();
+        import m1_im4_private = require("m1_M4_private");
+        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Import declarations in an internal module cannot reference an external module.
+                                        ~~~~~~~~~~~~~~~
+!!! Cannot find external module 'm1_M4_private'.
+        export var m1_im4_private_v1_public = m1_im4_private.c1;
+        export var m1_im4_private_v2_public = new m1_im4_private.c1();
+        export var m1_im4_private_v3_public = m1_im4_private.f1;
+        export var m1_im4_private_v4_public = m1_im4_private.f1();
+        var m1_im4_private_v1_private = m1_im4_private.c1;
+        var m1_im4_private_v2_private = new m1_im4_private.c1();
+        var m1_im4_private_v3_private = m1_im4_private.f1;
+        var m1_im4_private_v4_private = m1_im4_private.f1();
     
         export import m1_im1_public = m1_M1_public;
         export import m1_im2_public = m1_M2_private;
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Import declaration 'm1_im2_public' is using private name 'm1_M2_private'.
-        //export import m1_im3_public = require("m1_M3_public");
-        //export import m1_im4_public = require("m1_M4_private");
+        export import m1_im3_public = require("m1_M3_public");
+        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Import declarations in an internal module cannot reference an external module.
+        export import m1_im4_public = require("m1_M4_private");
+        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Import declarations in an internal module cannot reference an external module.
     }
     
     module m2 {
@@ -108,21 +120,25 @@
             export var v2: c1;
         }
     
-        //export declare module "m2_M3_public" {
-        //    export function f1();
-        //    export class c1 {
-        //    }
-        //    export var v1: { new (): c1; };
-        //    export var v2: c1;
-        //}
+        export declare module "m2_M3_public" {
+                              ~~~~~~~~~~~~~~
+!!! Ambient external modules cannot be nested in other modules.
+            export function f1();
+            export class c1 {
+            }
+            export var v1: { new (): c1; };
+            export var v2: c1;
+        }
     
-        //declare module "m2_M4_private" {
-        //    export function f1();
-        //    export class c1 {
-        //    }
-        //    export var v1: { new (): c1; };
-        //    export var v2: c1;
-        //}
+        declare module "m2_M4_private" {
+                       ~~~~~~~~~~~~~~~
+!!! Ambient external modules cannot be nested in other modules.
+            export function f1();
+            export class c1 {
+            }
+            export var v1: { new (): c1; };
+            export var v2: c1;
+        }
     
         import m1_im1_private = m2_M1_public;
         export var m1_im1_private_v1_public = m1_im1_private.c1;
@@ -145,31 +161,43 @@
         var m1_im2_private_v3_private = m1_im2_private.f1;
         var m1_im2_private_v4_private = m1_im2_private.f1();
     
-        //import m1_im3_private = require("m2_M3_public");
-        //export var m1_im3_private_v1_public = m1_im3_private.c1;
-        //export var m1_im3_private_v2_public = new m1_im3_private.c1();
-        //export var m1_im3_private_v3_public = m1_im3_private.f1;
-        //export var m1_im3_private_v4_public = m1_im3_private.f1();
-        //var m1_im3_private_v1_private = m1_im3_private.c1;
-        //var m1_im3_private_v2_private = new m1_im3_private.c1();
-        //var m1_im3_private_v3_private = m1_im3_private.f1;
-        //var m1_im3_private_v4_private = m1_im3_private.f1();
+        import m1_im3_private = require("m2_M3_public");
+        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Import declarations in an internal module cannot reference an external module.
+                                        ~~~~~~~~~~~~~~
+!!! Cannot find external module 'm2_M3_public'.
+        export var m1_im3_private_v1_public = m1_im3_private.c1;
+        export var m1_im3_private_v2_public = new m1_im3_private.c1();
+        export var m1_im3_private_v3_public = m1_im3_private.f1;
+        export var m1_im3_private_v4_public = m1_im3_private.f1();
+        var m1_im3_private_v1_private = m1_im3_private.c1;
+        var m1_im3_private_v2_private = new m1_im3_private.c1();
+        var m1_im3_private_v3_private = m1_im3_private.f1;
+        var m1_im3_private_v4_private = m1_im3_private.f1();
     
-        //import m1_im4_private = require("m2_M4_private");
-        //export var m1_im4_private_v1_public = m1_im4_private.c1;
-        //export var m1_im4_private_v2_public = new m1_im4_private.c1();
-        //export var m1_im4_private_v3_public = m1_im4_private.f1;
-        //export var m1_im4_private_v4_public = m1_im4_private.f1();
-        //var m1_im4_private_v1_private = m1_im4_private.c1;
-        //var m1_im4_private_v2_private = new m1_im4_private.c1();
-        //var m1_im4_private_v3_private = m1_im4_private.f1;
-        //var m1_im4_private_v4_private = m1_im4_private.f1();
+        import m1_im4_private = require("m2_M4_private");
+        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Import declarations in an internal module cannot reference an external module.
+                                        ~~~~~~~~~~~~~~~
+!!! Cannot find external module 'm2_M4_private'.
+        export var m1_im4_private_v1_public = m1_im4_private.c1;
+        export var m1_im4_private_v2_public = new m1_im4_private.c1();
+        export var m1_im4_private_v3_public = m1_im4_private.f1;
+        export var m1_im4_private_v4_public = m1_im4_private.f1();
+        var m1_im4_private_v1_private = m1_im4_private.c1;
+        var m1_im4_private_v2_private = new m1_im4_private.c1();
+        var m1_im4_private_v3_private = m1_im4_private.f1;
+        var m1_im4_private_v4_private = m1_im4_private.f1();
     
         // Parse error to export module
         export import m1_im1_public = m2_M1_public;
         export import m1_im2_public = m2_M2_private;
-        //export import m1_im3_public = require("m2_M3_public");
-        //export import m1_im4_public = require("m2_M4_private");
+        export import m1_im3_public = require("m2_M3_public");
+        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Import declarations in an internal module cannot reference an external module.
+        export import m1_im4_public = require("m2_M4_private");
+        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Import declarations in an internal module cannot reference an external module.
     }
     
     export module glo_M1_public {
@@ -182,13 +210,15 @@
         export var v2: c1;
     }
     
-    //export declare module "glo_M2_public" {
-    //    export function f1();
-    //    export class c1 {
-    //    }
-    //    export var v1: { new (): c1; };
-    //    export var v2: c1;
-    //}
+    export declare module "glo_M2_public" {
+                          ~~~~~~~~~~~~~~~
+!!! Ambient external modules cannot be nested in other modules.
+        export function f1();
+        export class c1 {
+        }
+        export var v1: { new (): c1; };
+        export var v2: c1;
+    }
     
     export module glo_M3_private {
         export class c1 {
@@ -200,13 +230,15 @@
         export var v2: c1;
     }
     
-    //export declare module "glo_M4_private" {
-    //    export function f1();
-    //    export class c1 {
-    //    }
-    //    export var v1: { new (): c1; };
-    //    export var v2: c1;
-    //}
+    export declare module "glo_M4_private" {
+                          ~~~~~~~~~~~~~~~~
+!!! Ambient external modules cannot be nested in other modules.
+        export function f1();
+        export class c1 {
+        }
+        export var v1: { new (): c1; };
+        export var v2: c1;
+    }
     
     
     import glo_im1_private = glo_M1_public;
@@ -220,15 +252,17 @@
     var glo_im1_private_v4_private = glo_im1_private.f1();
     
     
-    //import glo_im2_private = require("glo_M2_public");
-    //export var glo_im2_private_v1_public = glo_im2_private.c1;
-    //export var glo_im2_private_v2_public = new glo_im2_private.c1();
-    //export var glo_im2_private_v3_public = glo_im2_private.f1;
-    //export var glo_im2_private_v4_public = glo_im2_private.f1();
-    //var glo_im2_private_v1_private = glo_im2_private.c1;
-    //var glo_im2_private_v2_private = new glo_im2_private.c1();
-    //var glo_im2_private_v3_private = glo_im2_private.f1;
-    //var glo_im2_private_v4_private = glo_im2_private.f1();
+    import glo_im2_private = require("glo_M2_public");
+                                     ~~~~~~~~~~~~~~~
+!!! Cannot find external module 'glo_M2_public'.
+    export var glo_im2_private_v1_public = glo_im2_private.c1;
+    export var glo_im2_private_v2_public = new glo_im2_private.c1();
+    export var glo_im2_private_v3_public = glo_im2_private.f1;
+    export var glo_im2_private_v4_public = glo_im2_private.f1();
+    var glo_im2_private_v1_private = glo_im2_private.c1;
+    var glo_im2_private_v2_private = new glo_im2_private.c1();
+    var glo_im2_private_v3_private = glo_im2_private.f1;
+    var glo_im2_private_v4_private = glo_im2_private.f1();
     
     import glo_im3_private = glo_M3_private;
     export var glo_im3_private_v1_public = glo_im3_private.c1;
@@ -240,122 +274,182 @@
     var glo_im3_private_v3_private = glo_im3_private.f1;
     var glo_im3_private_v4_private = glo_im3_private.f1();
     
-    //import glo_im4_private = require("glo_M4_private");
-    //export var glo_im4_private_v1_public = glo_im4_private.c1;
-    //export var glo_im4_private_v2_public = new glo_im4_private.c1();
-    //export var glo_im4_private_v3_public = glo_im4_private.f1;
-    //export var glo_im4_private_v4_public = glo_im4_private.f1();
-    //var glo_im4_private_v1_private = glo_im4_private.c1;
-    //var glo_im4_private_v2_private = new glo_im4_private.c1();
-    //var glo_im4_private_v3_private = glo_im4_private.f1;
-    //var glo_im4_private_v4_private = glo_im4_private.f1();
+    import glo_im4_private = require("glo_M4_private");
+                                     ~~~~~~~~~~~~~~~~
+!!! Cannot find external module 'glo_M4_private'.
+    export var glo_im4_private_v1_public = glo_im4_private.c1;
+    export var glo_im4_private_v2_public = new glo_im4_private.c1();
+    export var glo_im4_private_v3_public = glo_im4_private.f1;
+    export var glo_im4_private_v4_public = glo_im4_private.f1();
+    var glo_im4_private_v1_private = glo_im4_private.c1;
+    var glo_im4_private_v2_private = new glo_im4_private.c1();
+    var glo_im4_private_v3_private = glo_im4_private.f1;
+    var glo_im4_private_v4_private = glo_im4_private.f1();
     
     // Parse error to export module
     export import glo_im1_public = glo_M1_public;
     export import glo_im2_public = glo_M3_private;
-    //export import glo_im3_public = require("glo_M2_public");
-    //export import glo_im4_public = require("glo_M4_private");
+    export import glo_im3_public = require("glo_M2_public");
+                                           ~~~~~~~~~~~~~~~
+!!! Cannot find external module 'glo_M2_public'.
+    export import glo_im4_public = require("glo_M4_private");
+                                           ~~~~~~~~~~~~~~~~
+!!! Cannot find external module 'glo_M4_private'.
     
     
-    //export declare module "use_glo_M1_public" {
-    //    import use_glo_M1_public = glo_M1_public;
-    //    export var use_glo_M1_public_v1_public: { new (): use_glo_M1_public.c1; };
-    //    export var use_glo_M1_public_v2_public: use_glo_M1_public;
-    //    export var use_glo_M1_public_v3_public: () => use_glo_M1_public.c1;
-    //    var use_glo_M1_public_v1_private: { new (): use_glo_M1_public.c1; };
-    //    var use_glo_M1_public_v2_private: use_glo_M1_public;
-    //    var use_glo_M1_public_v3_private: () => use_glo_M1_public.c1;
+    export declare module "use_glo_M1_public" {
+                          ~~~~~~~~~~~~~~~~~~~
+!!! Ambient external modules cannot be nested in other modules.
+        import use_glo_M1_public = glo_M1_public;
+        export var use_glo_M1_public_v1_public: { new (): use_glo_M1_public.c1; };
+        export var use_glo_M1_public_v2_public: use_glo_M1_public;
+                                                ~~~~~~~~~~~~~~~~~
+!!! Cannot find name 'use_glo_M1_public'.
+        export var use_glo_M1_public_v3_public: () => use_glo_M1_public.c1;
+        var use_glo_M1_public_v1_private: { new (): use_glo_M1_public.c1; };
+        var use_glo_M1_public_v2_private: use_glo_M1_public;
+                                          ~~~~~~~~~~~~~~~~~
+!!! Cannot find name 'use_glo_M1_public'.
+        var use_glo_M1_public_v3_private: () => use_glo_M1_public.c1;
     
-    //    import use_glo_M2_public = require("glo_M2_public");
-    //    export var use_glo_M2_public_v1_public: { new (): use_glo_M2_public.c1; };
-    //    export var use_glo_M2_public_v2_public: use_glo_M2_public;
-    //    export var use_glo_M2_public_v3_public: () => use_glo_M2_public.c1;
-    //    var use_glo_M2_public_v1_private: { new (): use_glo_M2_public.c1; };
-    //    var use_glo_M2_public_v2_private: use_glo_M2_public;
-    //    var use_glo_M2_public_v3_private: () => use_glo_M2_public.c1;
+        import use_glo_M2_public = require("glo_M2_public");
+                                           ~~~~~~~~~~~~~~~
+!!! Cannot find external module 'glo_M2_public'.
+        export var use_glo_M2_public_v1_public: { new (): use_glo_M2_public.c1; };
+        export var use_glo_M2_public_v2_public: use_glo_M2_public;
+        export var use_glo_M2_public_v3_public: () => use_glo_M2_public.c1;
+        var use_glo_M2_public_v1_private: { new (): use_glo_M2_public.c1; };
+        var use_glo_M2_public_v2_private: use_glo_M2_public;
+        var use_glo_M2_public_v3_private: () => use_glo_M2_public.c1;
     
-    //    module m2 {
-    //        import errorImport = require("glo_M2_public");
-    //        import nonerrorImport = glo_M1_public;
+        module m2 {
+            import errorImport = require("glo_M2_public");
+            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Import declarations in an internal module cannot reference an external module.
+            import nonerrorImport = glo_M1_public;
     
-    //        module m5 {
-    //            import m5_errorImport = require("glo_M2_public");
-    //            import m5_nonerrorImport = glo_M1_public;
-    //        }
-    //    }
-    //}
+            module m5 {
+                import m5_errorImport = require("glo_M2_public");
+                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Import declarations in an internal module cannot reference an external module.
+                import m5_nonerrorImport = glo_M1_public;
+            }
+        }
+    }
     
     
-    //declare module "use_glo_M3_private" {
-    //    import use_glo_M3_private = glo_M3_private;
-    //    export var use_glo_M3_private_v1_public: { new (): use_glo_M3_private.c1; };
-    //    export var use_glo_M3_private_v2_public: use_glo_M3_private;
-    //    export var use_glo_M3_private_v3_public: () => use_glo_M3_private.c1;
-    //    var use_glo_M3_private_v1_private: { new (): use_glo_M3_private.c1; };
-    //    var use_glo_M3_private_v2_private: use_glo_M3_private;
-    //    var use_glo_M3_private_v3_private: () => use_glo_M3_private.c1;
+    declare module "use_glo_M3_private" {
+                   ~~~~~~~~~~~~~~~~~~~~
+!!! Ambient external modules cannot be nested in other modules.
+        import use_glo_M3_private = glo_M3_private;
+        export var use_glo_M3_private_v1_public: { new (): use_glo_M3_private.c1; };
+        export var use_glo_M3_private_v2_public: use_glo_M3_private;
+                                                 ~~~~~~~~~~~~~~~~~~
+!!! Cannot find name 'use_glo_M3_private'.
+        export var use_glo_M3_private_v3_public: () => use_glo_M3_private.c1;
+        var use_glo_M3_private_v1_private: { new (): use_glo_M3_private.c1; };
+        var use_glo_M3_private_v2_private: use_glo_M3_private;
+                                           ~~~~~~~~~~~~~~~~~~
+!!! Cannot find name 'use_glo_M3_private'.
+        var use_glo_M3_private_v3_private: () => use_glo_M3_private.c1;
     
-    //    import use_glo_M4_private = require("glo_M4_private");
-    //    export var use_glo_M4_private_v1_public: { new (): use_glo_M4_private.c1; };
-    //    export var use_glo_M4_private_v2_public: use_glo_M4_private;
-    //    export var use_glo_M4_private_v3_public: () => use_glo_M4_private.c1;
-    //    var use_glo_M4_private_v1_private: { new (): use_glo_M4_private.c1; };
-    //    var use_glo_M4_private_v2_private: use_glo_M4_private;
-    //    var use_glo_M4_private_v3_private: () => use_glo_M4_private.c1;
+        import use_glo_M4_private = require("glo_M4_private");
+                                            ~~~~~~~~~~~~~~~~
+!!! Cannot find external module 'glo_M4_private'.
+        export var use_glo_M4_private_v1_public: { new (): use_glo_M4_private.c1; };
+        export var use_glo_M4_private_v2_public: use_glo_M4_private;
+        export var use_glo_M4_private_v3_public: () => use_glo_M4_private.c1;
+        var use_glo_M4_private_v1_private: { new (): use_glo_M4_private.c1; };
+        var use_glo_M4_private_v2_private: use_glo_M4_private;
+        var use_glo_M4_private_v3_private: () => use_glo_M4_private.c1;
     
-    //    module m2 {
-    //        import errorImport = require("glo_M4_private");
-    //        import nonerrorImport = glo_M3_private;
+        module m2 {
+            import errorImport = require("glo_M4_private");
+            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Import declarations in an internal module cannot reference an external module.
+            import nonerrorImport = glo_M3_private;
     
-    //        module m5 {
-    //            import m5_errorImport = require("glo_M4_private");
-    //            import m5_nonerrorImport = glo_M3_private;
-    //        }
-    //    }
-    //}
+            module m5 {
+                import m5_errorImport = require("glo_M4_private");
+                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Import declarations in an internal module cannot reference an external module.
+                import m5_nonerrorImport = glo_M3_private;
+            }
+        }
+    }
     
-    //declare module "anotherParseError" {
-    //    module m2 {
-    //        declare module "abc" {
-    //        }
-    //    }
+    declare module "anotherParseError" {
+                   ~~~~~~~~~~~~~~~~~~~
+!!! Ambient external modules cannot be nested in other modules.
+        module m2 {
+            declare module "abc" {
+            ~~~~~~~
+!!! A 'declare' modifier cannot be used in an already ambient context.
+                           ~~~~~
+!!! Ambient external modules cannot be nested in other modules.
+            }
+        }
     
-    //    module m2 {
-    //        module "abc2" {
-    //        }
-    //    }
-    //    module "abc3" {
-    //    }
-    //}
+        module m2 {
+            module "abc2" {
+                   ~~~~~~
+!!! Ambient external modules cannot be nested in other modules.
+            }
+        }
+        module "abc3" {
+               ~~~~~~
+!!! Ambient external modules cannot be nested in other modules.
+        }
+    }
     
-    //declare export module "anotherParseError2" {
-    //    module m2 {
-    //        declare module "abc" {
-    //        }
-    //    }
+    declare export module "anotherParseError2" {
+            ~~~~~~
+!!! 'export' modifier must precede 'declare' modifier.
+                          ~~~~~~~~~~~~~~~~~~~~
+!!! Ambient external modules cannot be nested in other modules.
+        module m2 {
+            declare module "abc" {
+            ~~~~~~~
+!!! A 'declare' modifier cannot be used in an already ambient context.
+                           ~~~~~
+!!! Ambient external modules cannot be nested in other modules.
+            }
+        }
     
-    //    module m2 {
-    //        module "abc2" {
-    //        }
-    //    }
-    //    module "abc3" {
-    //    }
-    //}
+        module m2 {
+            module "abc2" {
+                   ~~~~~~
+!!! Ambient external modules cannot be nested in other modules.
+            }
+        }
+        module "abc3" {
+               ~~~~~~
+!!! Ambient external modules cannot be nested in other modules.
+        }
+    }
     
     module m2 {
-        //import m3 = require("use_glo_M1_public");
+        import m3 = require("use_glo_M1_public");
+        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Import declarations in an internal module cannot reference an external module.
         module m4 {
             var a = 10;
-            //import m2 = require("use_glo_M1_public");
+            import m2 = require("use_glo_M1_public");
+            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Import declarations in an internal module cannot reference an external module.
         }
     
     }
     
     export module m3 {
-        //import m3 = require("use_glo_M1_public");
+        import m3 = require("use_glo_M1_public");
+        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Import declarations in an internal module cannot reference an external module.
         module m4 {
             var a = 10;
-            //import m2 = require("use_glo_M1_public");
+            import m2 = require("use_glo_M1_public");
+            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Import declarations in an internal module cannot reference an external module.
         }
     
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/privacyImportParseErrors.errors.txt b/tests/baselines/reference/privacyImportParseErrors.errors.txt
deleted file mode 100644
index 6889ad85e1b..00000000000
--- a/tests/baselines/reference/privacyImportParseErrors.errors.txt
+++ /dev/null
@@ -1,455 +0,0 @@
-==== tests/cases/compiler/privacyImportParseErrors.ts (49 errors) ====
-    export module m1 {
-        export module m1_M1_public {
-            export class c1 {
-            }
-            export function f1() {
-                return new c1;
-            }
-            export var v1 = c1;
-            export var v2: c1;
-        }
-    
-        module m1_M2_private {
-            export class c1 {
-            }
-            export function f1() {
-                return new c1;
-            }
-            export var v1 = c1;
-            export var v2: c1;
-        }
-    
-        export declare module "m1_M3_public" {
-                              ~~~~~~~~~~~~~~
-!!! Ambient external modules cannot be nested in other modules.
-            export function f1();
-            export class c1 {
-            }
-            export var v1: { new (): c1; };
-            export var v2: c1;
-        }
-    
-        declare module "m1_M4_private" {
-                       ~~~~~~~~~~~~~~~
-!!! Ambient external modules cannot be nested in other modules.
-            export function f1();
-            export class c1 {
-            }
-            export var v1: { new (): c1; };
-            export var v2: c1;
-        }
-    
-        import m1_im1_private = m1_M1_public;
-        export var m1_im1_private_v1_public = m1_im1_private.c1;
-        export var m1_im1_private_v2_public = new m1_im1_private.c1();
-        export var m1_im1_private_v3_public = m1_im1_private.f1;
-        export var m1_im1_private_v4_public = m1_im1_private.f1();
-        var m1_im1_private_v1_private = m1_im1_private.c1;
-        var m1_im1_private_v2_private = new m1_im1_private.c1();
-        var m1_im1_private_v3_private = m1_im1_private.f1;
-        var m1_im1_private_v4_private = m1_im1_private.f1();
-    
-    
-        import m1_im2_private = m1_M2_private;
-        export var m1_im2_private_v1_public = m1_im2_private.c1;
-        export var m1_im2_private_v2_public = new m1_im2_private.c1();
-        export var m1_im2_private_v3_public = m1_im2_private.f1;
-        export var m1_im2_private_v4_public = m1_im2_private.f1();
-        var m1_im2_private_v1_private = m1_im2_private.c1;
-        var m1_im2_private_v2_private = new m1_im2_private.c1();
-        var m1_im2_private_v3_private = m1_im2_private.f1;
-        var m1_im2_private_v4_private = m1_im2_private.f1();
-    
-        import m1_im3_private = require("m1_M3_public");
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Import declarations in an internal module cannot reference an external module.
-                                        ~~~~~~~~~~~~~~
-!!! Cannot find external module 'm1_M3_public'.
-        export var m1_im3_private_v1_public = m1_im3_private.c1;
-        export var m1_im3_private_v2_public = new m1_im3_private.c1();
-        export var m1_im3_private_v3_public = m1_im3_private.f1;
-        export var m1_im3_private_v4_public = m1_im3_private.f1();
-        var m1_im3_private_v1_private = m1_im3_private.c1;
-        var m1_im3_private_v2_private = new m1_im3_private.c1();
-        var m1_im3_private_v3_private = m1_im3_private.f1;
-        var m1_im3_private_v4_private = m1_im3_private.f1();
-    
-        import m1_im4_private = require("m1_M4_private");
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Import declarations in an internal module cannot reference an external module.
-                                        ~~~~~~~~~~~~~~~
-!!! Cannot find external module 'm1_M4_private'.
-        export var m1_im4_private_v1_public = m1_im4_private.c1;
-        export var m1_im4_private_v2_public = new m1_im4_private.c1();
-        export var m1_im4_private_v3_public = m1_im4_private.f1;
-        export var m1_im4_private_v4_public = m1_im4_private.f1();
-        var m1_im4_private_v1_private = m1_im4_private.c1;
-        var m1_im4_private_v2_private = new m1_im4_private.c1();
-        var m1_im4_private_v3_private = m1_im4_private.f1;
-        var m1_im4_private_v4_private = m1_im4_private.f1();
-    
-        export import m1_im1_public = m1_M1_public;
-        export import m1_im2_public = m1_M2_private;
-        export import m1_im3_public = require("m1_M3_public");
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Import declarations in an internal module cannot reference an external module.
-        export import m1_im4_public = require("m1_M4_private");
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Import declarations in an internal module cannot reference an external module.
-    }
-    
-    module m2 {
-        export module m2_M1_public {
-            export class c1 {
-            }
-            export function f1() {
-                return new c1;
-            }
-            export var v1 = c1;
-            export var v2: c1;
-        }
-    
-        module m2_M2_private {
-            export class c1 {
-            }
-            export function f1() {
-                return new c1;
-            }
-            export var v1 = c1;
-            export var v2: c1;
-        }
-    
-        export declare module "m2_M3_public" {
-                              ~~~~~~~~~~~~~~
-!!! Ambient external modules cannot be nested in other modules.
-            export function f1();
-            export class c1 {
-            }
-            export var v1: { new (): c1; };
-            export var v2: c1;
-        }
-    
-        declare module "m2_M4_private" {
-                       ~~~~~~~~~~~~~~~
-!!! Ambient external modules cannot be nested in other modules.
-            export function f1();
-            export class c1 {
-            }
-            export var v1: { new (): c1; };
-            export var v2: c1;
-        }
-    
-        import m1_im1_private = m2_M1_public;
-        export var m1_im1_private_v1_public = m1_im1_private.c1;
-        export var m1_im1_private_v2_public = new m1_im1_private.c1();
-        export var m1_im1_private_v3_public = m1_im1_private.f1;
-        export var m1_im1_private_v4_public = m1_im1_private.f1();
-        var m1_im1_private_v1_private = m1_im1_private.c1;
-        var m1_im1_private_v2_private = new m1_im1_private.c1();
-        var m1_im1_private_v3_private = m1_im1_private.f1;
-        var m1_im1_private_v4_private = m1_im1_private.f1();
-    
-    
-        import m1_im2_private = m2_M2_private;
-        export var m1_im2_private_v1_public = m1_im2_private.c1;
-        export var m1_im2_private_v2_public = new m1_im2_private.c1();
-        export var m1_im2_private_v3_public = m1_im2_private.f1;
-        export var m1_im2_private_v4_public = m1_im2_private.f1();
-        var m1_im2_private_v1_private = m1_im2_private.c1;
-        var m1_im2_private_v2_private = new m1_im2_private.c1();
-        var m1_im2_private_v3_private = m1_im2_private.f1;
-        var m1_im2_private_v4_private = m1_im2_private.f1();
-    
-        import m1_im3_private = require("m2_M3_public");
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Import declarations in an internal module cannot reference an external module.
-                                        ~~~~~~~~~~~~~~
-!!! Cannot find external module 'm2_M3_public'.
-        export var m1_im3_private_v1_public = m1_im3_private.c1;
-        export var m1_im3_private_v2_public = new m1_im3_private.c1();
-        export var m1_im3_private_v3_public = m1_im3_private.f1;
-        export var m1_im3_private_v4_public = m1_im3_private.f1();
-        var m1_im3_private_v1_private = m1_im3_private.c1;
-        var m1_im3_private_v2_private = new m1_im3_private.c1();
-        var m1_im3_private_v3_private = m1_im3_private.f1;
-        var m1_im3_private_v4_private = m1_im3_private.f1();
-    
-        import m1_im4_private = require("m2_M4_private");
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Import declarations in an internal module cannot reference an external module.
-                                        ~~~~~~~~~~~~~~~
-!!! Cannot find external module 'm2_M4_private'.
-        export var m1_im4_private_v1_public = m1_im4_private.c1;
-        export var m1_im4_private_v2_public = new m1_im4_private.c1();
-        export var m1_im4_private_v3_public = m1_im4_private.f1;
-        export var m1_im4_private_v4_public = m1_im4_private.f1();
-        var m1_im4_private_v1_private = m1_im4_private.c1;
-        var m1_im4_private_v2_private = new m1_im4_private.c1();
-        var m1_im4_private_v3_private = m1_im4_private.f1;
-        var m1_im4_private_v4_private = m1_im4_private.f1();
-    
-        // Parse error to export module
-        export import m1_im1_public = m2_M1_public;
-        export import m1_im2_public = m2_M2_private;
-        export import m1_im3_public = require("m2_M3_public");
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Import declarations in an internal module cannot reference an external module.
-        export import m1_im4_public = require("m2_M4_private");
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Import declarations in an internal module cannot reference an external module.
-    }
-    
-    export module glo_M1_public {
-        export class c1 {
-        }
-        export function f1() {
-            return new c1;
-        }
-        export var v1 = c1;
-        export var v2: c1;
-    }
-    
-    export declare module "glo_M2_public" {
-                          ~~~~~~~~~~~~~~~
-!!! Ambient external modules cannot be nested in other modules.
-        export function f1();
-        export class c1 {
-        }
-        export var v1: { new (): c1; };
-        export var v2: c1;
-    }
-    
-    export module glo_M3_private {
-        export class c1 {
-        }
-        export function f1() {
-            return new c1;
-        }
-        export var v1 = c1;
-        export var v2: c1;
-    }
-    
-    export declare module "glo_M4_private" {
-                          ~~~~~~~~~~~~~~~~
-!!! Ambient external modules cannot be nested in other modules.
-        export function f1();
-        export class c1 {
-        }
-        export var v1: { new (): c1; };
-        export var v2: c1;
-    }
-    
-    
-    import glo_im1_private = glo_M1_public;
-    export var glo_im1_private_v1_public = glo_im1_private.c1;
-    export var glo_im1_private_v2_public = new glo_im1_private.c1();
-    export var glo_im1_private_v3_public = glo_im1_private.f1;
-    export var glo_im1_private_v4_public = glo_im1_private.f1();
-    var glo_im1_private_v1_private = glo_im1_private.c1;
-    var glo_im1_private_v2_private = new glo_im1_private.c1();
-    var glo_im1_private_v3_private = glo_im1_private.f1;
-    var glo_im1_private_v4_private = glo_im1_private.f1();
-    
-    
-    import glo_im2_private = require("glo_M2_public");
-                                     ~~~~~~~~~~~~~~~
-!!! Cannot find external module 'glo_M2_public'.
-    export var glo_im2_private_v1_public = glo_im2_private.c1;
-    export var glo_im2_private_v2_public = new glo_im2_private.c1();
-    export var glo_im2_private_v3_public = glo_im2_private.f1;
-    export var glo_im2_private_v4_public = glo_im2_private.f1();
-    var glo_im2_private_v1_private = glo_im2_private.c1;
-    var glo_im2_private_v2_private = new glo_im2_private.c1();
-    var glo_im2_private_v3_private = glo_im2_private.f1;
-    var glo_im2_private_v4_private = glo_im2_private.f1();
-    
-    import glo_im3_private = glo_M3_private;
-    export var glo_im3_private_v1_public = glo_im3_private.c1;
-    export var glo_im3_private_v2_public = new glo_im3_private.c1();
-    export var glo_im3_private_v3_public = glo_im3_private.f1;
-    export var glo_im3_private_v4_public = glo_im3_private.f1();
-    var glo_im3_private_v1_private = glo_im3_private.c1;
-    var glo_im3_private_v2_private = new glo_im3_private.c1();
-    var glo_im3_private_v3_private = glo_im3_private.f1;
-    var glo_im3_private_v4_private = glo_im3_private.f1();
-    
-    import glo_im4_private = require("glo_M4_private");
-                                     ~~~~~~~~~~~~~~~~
-!!! Cannot find external module 'glo_M4_private'.
-    export var glo_im4_private_v1_public = glo_im4_private.c1;
-    export var glo_im4_private_v2_public = new glo_im4_private.c1();
-    export var glo_im4_private_v3_public = glo_im4_private.f1;
-    export var glo_im4_private_v4_public = glo_im4_private.f1();
-    var glo_im4_private_v1_private = glo_im4_private.c1;
-    var glo_im4_private_v2_private = new glo_im4_private.c1();
-    var glo_im4_private_v3_private = glo_im4_private.f1;
-    var glo_im4_private_v4_private = glo_im4_private.f1();
-    
-    // Parse error to export module
-    export import glo_im1_public = glo_M1_public;
-    export import glo_im2_public = glo_M3_private;
-    export import glo_im3_public = require("glo_M2_public");
-                                           ~~~~~~~~~~~~~~~
-!!! Cannot find external module 'glo_M2_public'.
-    export import glo_im4_public = require("glo_M4_private");
-                                           ~~~~~~~~~~~~~~~~
-!!! Cannot find external module 'glo_M4_private'.
-    
-    
-    export declare module "use_glo_M1_public" {
-                          ~~~~~~~~~~~~~~~~~~~
-!!! Ambient external modules cannot be nested in other modules.
-        import use_glo_M1_public = glo_M1_public;
-        export var use_glo_M1_public_v1_public: { new (): use_glo_M1_public.c1; };
-        export var use_glo_M1_public_v2_public: use_glo_M1_public;
-                                                ~~~~~~~~~~~~~~~~~
-!!! Cannot find name 'use_glo_M1_public'.
-        export var use_glo_M1_public_v3_public: () => use_glo_M1_public.c1;
-        var use_glo_M1_public_v1_private: { new (): use_glo_M1_public.c1; };
-        var use_glo_M1_public_v2_private: use_glo_M1_public;
-                                          ~~~~~~~~~~~~~~~~~
-!!! Cannot find name 'use_glo_M1_public'.
-        var use_glo_M1_public_v3_private: () => use_glo_M1_public.c1;
-    
-        import use_glo_M2_public = require("glo_M2_public");
-                                           ~~~~~~~~~~~~~~~
-!!! Cannot find external module 'glo_M2_public'.
-        export var use_glo_M2_public_v1_public: { new (): use_glo_M2_public.c1; };
-        export var use_glo_M2_public_v2_public: use_glo_M2_public;
-        export var use_glo_M2_public_v3_public: () => use_glo_M2_public.c1;
-        var use_glo_M2_public_v1_private: { new (): use_glo_M2_public.c1; };
-        var use_glo_M2_public_v2_private: use_glo_M2_public;
-        var use_glo_M2_public_v3_private: () => use_glo_M2_public.c1;
-    
-        module m2 {
-            import errorImport = require("glo_M2_public");
-            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Import declarations in an internal module cannot reference an external module.
-            import nonerrorImport = glo_M1_public;
-    
-            module m5 {
-                import m5_errorImport = require("glo_M2_public");
-                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Import declarations in an internal module cannot reference an external module.
-                import m5_nonerrorImport = glo_M1_public;
-            }
-        }
-    }
-    
-    
-    declare module "use_glo_M3_private" {
-                   ~~~~~~~~~~~~~~~~~~~~
-!!! Ambient external modules cannot be nested in other modules.
-        import use_glo_M3_private = glo_M3_private;
-        export var use_glo_M3_private_v1_public: { new (): use_glo_M3_private.c1; };
-        export var use_glo_M3_private_v2_public: use_glo_M3_private;
-                                                 ~~~~~~~~~~~~~~~~~~
-!!! Cannot find name 'use_glo_M3_private'.
-        export var use_glo_M3_private_v3_public: () => use_glo_M3_private.c1;
-        var use_glo_M3_private_v1_private: { new (): use_glo_M3_private.c1; };
-        var use_glo_M3_private_v2_private: use_glo_M3_private;
-                                           ~~~~~~~~~~~~~~~~~~
-!!! Cannot find name 'use_glo_M3_private'.
-        var use_glo_M3_private_v3_private: () => use_glo_M3_private.c1;
-    
-        import use_glo_M4_private = require("glo_M4_private");
-                                            ~~~~~~~~~~~~~~~~
-!!! Cannot find external module 'glo_M4_private'.
-        export var use_glo_M4_private_v1_public: { new (): use_glo_M4_private.c1; };
-        export var use_glo_M4_private_v2_public: use_glo_M4_private;
-        export var use_glo_M4_private_v3_public: () => use_glo_M4_private.c1;
-        var use_glo_M4_private_v1_private: { new (): use_glo_M4_private.c1; };
-        var use_glo_M4_private_v2_private: use_glo_M4_private;
-        var use_glo_M4_private_v3_private: () => use_glo_M4_private.c1;
-    
-        module m2 {
-            import errorImport = require("glo_M4_private");
-            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Import declarations in an internal module cannot reference an external module.
-            import nonerrorImport = glo_M3_private;
-    
-            module m5 {
-                import m5_errorImport = require("glo_M4_private");
-                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Import declarations in an internal module cannot reference an external module.
-                import m5_nonerrorImport = glo_M3_private;
-            }
-        }
-    }
-    
-    declare module "anotherParseError" {
-                   ~~~~~~~~~~~~~~~~~~~
-!!! Ambient external modules cannot be nested in other modules.
-        module m2 {
-            declare module "abc" {
-            ~~~~~~~
-!!! A 'declare' modifier cannot be used in an already ambient context.
-                           ~~~~~
-!!! Ambient external modules cannot be nested in other modules.
-            }
-        }
-    
-        module m2 {
-            module "abc2" {
-                   ~~~~~~
-!!! Ambient external modules cannot be nested in other modules.
-            }
-        }
-        module "abc3" {
-               ~~~~~~
-!!! Ambient external modules cannot be nested in other modules.
-        }
-    }
-    
-    declare export module "anotherParseError2" {
-            ~~~~~~
-!!! 'export' modifier must precede 'declare' modifier.
-                          ~~~~~~~~~~~~~~~~~~~~
-!!! Ambient external modules cannot be nested in other modules.
-        module m2 {
-            declare module "abc" {
-            ~~~~~~~
-!!! A 'declare' modifier cannot be used in an already ambient context.
-                           ~~~~~
-!!! Ambient external modules cannot be nested in other modules.
-            }
-        }
-    
-        module m2 {
-            module "abc2" {
-                   ~~~~~~
-!!! Ambient external modules cannot be nested in other modules.
-            }
-        }
-        module "abc3" {
-               ~~~~~~
-!!! Ambient external modules cannot be nested in other modules.
-        }
-    }
-    
-    module m2 {
-        import m3 = require("use_glo_M1_public");
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Import declarations in an internal module cannot reference an external module.
-        module m4 {
-            var a = 10;
-            import m2 = require("use_glo_M1_public");
-            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Import declarations in an internal module cannot reference an external module.
-        }
-    
-    }
-    
-    export module m3 {
-        import m3 = require("use_glo_M1_public");
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Import declarations in an internal module cannot reference an external module.
-        module m4 {
-            var a = 10;
-            import m2 = require("use_glo_M1_public");
-            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Import declarations in an internal module cannot reference an external module.
-        }
-    
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/privacyInterfaceExtendsClauseDeclFile.errors.txt b/tests/baselines/reference/privacyInterfaceExtendsClauseDeclFile.errors.txt
deleted file mode 100644
index 24fccd203bc..00000000000
--- a/tests/baselines/reference/privacyInterfaceExtendsClauseDeclFile.errors.txt
+++ /dev/null
@@ -1,105 +0,0 @@
-==== tests/cases/compiler/privacyInterfaceExtendsClauseDeclFile_externalModule.ts (5 errors) ====
-    
-    export module publicModule {
-        export interface publicInterfaceInPublicModule {
-        }
-    
-        interface privateInterfaceInPublicModule {
-        }
-    
-        interface privateInterfaceImplementingPublicInterfaceInModule extends publicInterfaceInPublicModule {
-        }
-        interface privateInterfaceImplementingPrivateInterfaceInModule extends privateInterfaceInPublicModule {
-        }
-        export interface publicInterfaceImplementingPublicInterfaceInModule extends publicInterfaceInPublicModule {
-        }
-        export interface publicInterfaceImplementingPrivateInterfaceInModule extends privateInterfaceInPublicModule { // Should error
-                                                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Extends clause of exported interface 'publicInterfaceImplementingPrivateInterfaceInModule' has or is using private name 'privateInterfaceInPublicModule'.
-        }
-    
-        interface privateInterfaceImplementingFromPrivateModuleInterface extends privateModule.publicInterfaceInPrivateModule {
-        }
-        export interface publicInterfaceImplementingFromPrivateModuleInterface extends privateModule.publicInterfaceInPrivateModule { // Should error
-                                                                                       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Extends clause of exported interface 'publicInterfaceImplementingFromPrivateModuleInterface' has or is using name 'privateModule.publicInterfaceInPrivateModule' from private module 'privateModule'.
-        }
-    
-        export interface publicInterfaceImplementingPrivateAndPublicInterface extends privateInterfaceInPublicModule, publicInterfaceInPublicModule { // Should error
-                                                                                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Extends clause of exported interface 'publicInterfaceImplementingPrivateAndPublicInterface' has or is using private name 'privateInterfaceInPublicModule'.
-        }
-    }
-    
-    module privateModule {
-        export interface publicInterfaceInPrivateModule {
-    
-        }
-    
-        interface privateInterfaceInPrivateModule {
-        }
-    
-        interface privateInterfaceImplementingPublicInterfaceInModule extends publicInterfaceInPrivateModule {
-        }
-        interface privateInterfaceImplementingPrivateInterfaceInModule extends privateInterfaceInPrivateModule {
-        }
-        export interface publicInterfaceImplementingPublicInterfaceInModule extends publicInterfaceInPrivateModule {
-        }
-        export interface publicInterfaceImplementingPrivateInterfaceInModule extends privateInterfaceInPrivateModule {
-        }
-    
-        interface privateInterfaceImplementingFromPrivateModuleInterface extends privateModule.publicInterfaceInPrivateModule {
-        }
-        export interface publicInterfaceImplementingFromPrivateModuleInterface extends privateModule.publicInterfaceInPrivateModule {
-        }
-    }
-    
-    export interface publicInterface {
-    
-    }
-    
-    interface privateInterface {
-    }
-    
-    interface privateInterfaceImplementingPublicInterface extends publicInterface {
-    }
-    interface privateInterfaceImplementingPrivateInterfaceInModule extends privateInterface {
-    }
-    export interface publicInterfaceImplementingPublicInterface extends publicInterface {
-    }
-    export interface publicInterfaceImplementingPrivateInterface extends privateInterface { // Should error
-                                                                         ~~~~~~~~~~~~~~~~
-!!! Extends clause of exported interface 'publicInterfaceImplementingPrivateInterface' has or is using private name 'privateInterface'.
-    }
-    
-    interface privateInterfaceImplementingFromPrivateModuleInterface extends privateModule.publicInterfaceInPrivateModule {
-    }
-    export interface publicInterfaceImplementingFromPrivateModuleInterface extends privateModule.publicInterfaceInPrivateModule { // Should error
-                                                                                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Extends clause of exported interface 'publicInterfaceImplementingFromPrivateModuleInterface' has or is using name 'privateModule.publicInterfaceInPrivateModule' from private module 'privateModule'.
-    }
-    
-==== tests/cases/compiler/privacyInterfaceExtendsClauseDeclFile_GlobalFile.ts (1 errors) ====
-    module publicModuleInGlobal {
-        export interface publicInterfaceInPublicModule {
-        }
-    
-        interface privateInterfaceInPublicModule {
-        }
-    
-        interface privateInterfaceImplementingPublicInterfaceInModule extends publicInterfaceInPublicModule {
-        }
-        interface privateInterfaceImplementingPrivateInterfaceInModule extends privateInterfaceInPublicModule {
-        }
-        export interface publicInterfaceImplementingPublicInterfaceInModule extends publicInterfaceInPublicModule {
-        }
-        export interface publicInterfaceImplementingPrivateInterfaceInModule extends privateInterfaceInPublicModule { // Should error
-                                                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Extends clause of exported interface 'publicInterfaceImplementingPrivateInterfaceInModule' has or is using private name 'privateInterfaceInPublicModule'.
-        }
-    }
-    interface publicInterfaceInGlobal {
-    }
-    interface publicInterfaceImplementingPublicInterfaceInGlobal extends publicInterfaceInGlobal {
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/privacyInterfaceExtendsClauseDeclFile.js b/tests/baselines/reference/privacyInterfaceExtendsClauseDeclFile.js
deleted file mode 100644
index 65f0a2af420..00000000000
--- a/tests/baselines/reference/privacyInterfaceExtendsClauseDeclFile.js
+++ /dev/null
@@ -1,98 +0,0 @@
-//// [tests/cases/compiler/privacyInterfaceExtendsClauseDeclFile.ts] ////
-
-//// [privacyInterfaceExtendsClauseDeclFile_externalModule.ts]
-
-export module publicModule {
-    export interface publicInterfaceInPublicModule {
-    }
-
-    interface privateInterfaceInPublicModule {
-    }
-
-    interface privateInterfaceImplementingPublicInterfaceInModule extends publicInterfaceInPublicModule {
-    }
-    interface privateInterfaceImplementingPrivateInterfaceInModule extends privateInterfaceInPublicModule {
-    }
-    export interface publicInterfaceImplementingPublicInterfaceInModule extends publicInterfaceInPublicModule {
-    }
-    export interface publicInterfaceImplementingPrivateInterfaceInModule extends privateInterfaceInPublicModule { // Should error
-    }
-
-    interface privateInterfaceImplementingFromPrivateModuleInterface extends privateModule.publicInterfaceInPrivateModule {
-    }
-    export interface publicInterfaceImplementingFromPrivateModuleInterface extends privateModule.publicInterfaceInPrivateModule { // Should error
-    }
-
-    export interface publicInterfaceImplementingPrivateAndPublicInterface extends privateInterfaceInPublicModule, publicInterfaceInPublicModule { // Should error
-    }
-}
-
-module privateModule {
-    export interface publicInterfaceInPrivateModule {
-
-    }
-
-    interface privateInterfaceInPrivateModule {
-    }
-
-    interface privateInterfaceImplementingPublicInterfaceInModule extends publicInterfaceInPrivateModule {
-    }
-    interface privateInterfaceImplementingPrivateInterfaceInModule extends privateInterfaceInPrivateModule {
-    }
-    export interface publicInterfaceImplementingPublicInterfaceInModule extends publicInterfaceInPrivateModule {
-    }
-    export interface publicInterfaceImplementingPrivateInterfaceInModule extends privateInterfaceInPrivateModule {
-    }
-
-    interface privateInterfaceImplementingFromPrivateModuleInterface extends privateModule.publicInterfaceInPrivateModule {
-    }
-    export interface publicInterfaceImplementingFromPrivateModuleInterface extends privateModule.publicInterfaceInPrivateModule {
-    }
-}
-
-export interface publicInterface {
-
-}
-
-interface privateInterface {
-}
-
-interface privateInterfaceImplementingPublicInterface extends publicInterface {
-}
-interface privateInterfaceImplementingPrivateInterfaceInModule extends privateInterface {
-}
-export interface publicInterfaceImplementingPublicInterface extends publicInterface {
-}
-export interface publicInterfaceImplementingPrivateInterface extends privateInterface { // Should error
-}
-
-interface privateInterfaceImplementingFromPrivateModuleInterface extends privateModule.publicInterfaceInPrivateModule {
-}
-export interface publicInterfaceImplementingFromPrivateModuleInterface extends privateModule.publicInterfaceInPrivateModule { // Should error
-}
-
-//// [privacyInterfaceExtendsClauseDeclFile_GlobalFile.ts]
-module publicModuleInGlobal {
-    export interface publicInterfaceInPublicModule {
-    }
-
-    interface privateInterfaceInPublicModule {
-    }
-
-    interface privateInterfaceImplementingPublicInterfaceInModule extends publicInterfaceInPublicModule {
-    }
-    interface privateInterfaceImplementingPrivateInterfaceInModule extends privateInterfaceInPublicModule {
-    }
-    export interface publicInterfaceImplementingPublicInterfaceInModule extends publicInterfaceInPublicModule {
-    }
-    export interface publicInterfaceImplementingPrivateInterfaceInModule extends privateInterfaceInPublicModule { // Should error
-    }
-}
-interface publicInterfaceInGlobal {
-}
-interface publicInterfaceImplementingPublicInterfaceInGlobal extends publicInterfaceInGlobal {
-}
-
-
-//// [privacyInterfaceExtendsClauseDeclFile_externalModule.js]
-//// [privacyInterfaceExtendsClauseDeclFile_GlobalFile.js]
diff --git a/tests/baselines/reference/privacyLocalInternalReferenceImportWithExport.errors.txt b/tests/baselines/reference/privacyLocalInternalReferenceImportWithExport.errors.txt
deleted file mode 100644
index acbe63a21d7..00000000000
--- a/tests/baselines/reference/privacyLocalInternalReferenceImportWithExport.errors.txt
+++ /dev/null
@@ -1,167 +0,0 @@
-==== tests/cases/compiler/privacyLocalInternalReferenceImportWithExport.ts (7 errors) ====
-    // private elements
-    module m_private {
-        export class c_private {
-        }
-        export enum e_private {
-            Happy,
-            Grumpy
-        }
-        export function f_private() {
-            return new c_private();
-        }
-        export var v_private = new c_private();
-        export interface i_private {
-        }
-        export module mi_private {
-            export class c {
-            }
-        }
-        export module mu_private {
-            export interface i {
-            }
-        }
-    }
-    
-    // Public elements
-    export module m_public {
-        export class c_public {
-        }
-        export enum e_public {
-            Happy,
-            Grumpy
-        }
-        export function f_public() {
-            return new c_public();
-        }
-        export var v_public = 10;
-        export interface i_public {
-        }
-        export module mi_public {
-            export class c {
-            }
-        }
-        export module mu_public {
-            export interface i {
-            }
-        }
-    }
-    
-    export module import_public {
-        // Privacy errors - importing private elements
-        export import im_public_c_private = m_private.c_private;
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Import declaration 'im_public_c_private' is using private name 'm_private'.
-        export import im_public_e_private = m_private.e_private;
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Import declaration 'im_public_e_private' is using private name 'm_private'.
-        export import im_public_f_private = m_private.f_private;
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Import declaration 'im_public_f_private' is using private name 'm_private'.
-        export import im_public_v_private = m_private.v_private;
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Import declaration 'im_public_v_private' is using private name 'm_private'.
-        export import im_public_i_private = m_private.i_private;
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Import declaration 'im_public_i_private' is using private name 'm_private'.
-        export import im_public_mi_private = m_private.mi_private;
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Import declaration 'im_public_mi_private' is using private name 'm_private'.
-        export import im_public_mu_private = m_private.mu_private;
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Import declaration 'im_public_mu_private' is using private name 'm_private'.
-    
-        // Usage of privacy error imports
-        var privateUse_im_public_c_private = new im_public_c_private();
-        export var publicUse_im_public_c_private = new im_public_c_private();
-        var privateUse_im_public_e_private = im_public_e_private.Happy;
-        export var publicUse_im_public_e_private = im_public_e_private.Grumpy;
-        var privateUse_im_public_f_private = im_public_f_private();
-        export var publicUse_im_public_f_private = im_public_f_private();
-        var privateUse_im_public_v_private = im_public_v_private;
-        export var publicUse_im_public_v_private = im_public_v_private;
-        var privateUse_im_public_i_private: im_public_i_private;
-        export var publicUse_im_public_i_private: im_public_i_private;
-        var privateUse_im_public_mi_private = new im_public_mi_private.c();
-        export var publicUse_im_public_mi_private = new im_public_mi_private.c();
-        var privateUse_im_public_mu_private: im_public_mu_private.i;
-        export var publicUse_im_public_mu_private: im_public_mu_private.i;
-    
-    
-        // No Privacy errors - importing public elements
-        export import im_public_c_public = m_public.c_public;
-        export import im_public_e_public = m_public.e_public;
-        export import im_public_f_public = m_public.f_public;
-        export import im_public_v_public = m_public.v_public;
-        export import im_public_i_public = m_public.i_public;
-        export import im_public_mi_public = m_public.mi_public;
-        export import im_public_mu_public = m_public.mu_public;
-    
-        // Usage of above
-        var privateUse_im_public_c_public = new im_public_c_public();
-        export var publicUse_im_public_c_public = new im_public_c_public();
-        var privateUse_im_public_e_public = im_public_e_public.Happy;
-        export var publicUse_im_public_e_public = im_public_e_public.Grumpy;
-        var privateUse_im_public_f_public = im_public_f_public();
-        export var publicUse_im_public_f_public = im_public_f_public();
-        var privateUse_im_public_v_public = im_public_v_public;
-        export var publicUse_im_public_v_public = im_public_v_public;
-        var privateUse_im_public_i_public: im_public_i_public;
-        export var publicUse_im_public_i_public: im_public_i_public;
-        var privateUse_im_public_mi_public = new im_public_mi_public.c();
-        export var publicUse_im_public_mi_public = new im_public_mi_public.c();
-        var privateUse_im_public_mu_public: im_public_mu_public.i;
-        export var publicUse_im_public_mu_public: im_public_mu_public.i;
-    }
-    
-    module import_private {
-        // No Privacy errors - importing private elements
-        export import im_private_c_private = m_private.c_private;
-        export import im_private_e_private = m_private.e_private;
-        export import im_private_f_private = m_private.f_private;
-        export import im_private_v_private = m_private.v_private;
-        export import im_private_i_private = m_private.i_private;
-        export import im_private_mi_private = m_private.mi_private;
-        export import im_private_mu_private = m_private.mu_private;
-    
-        // Usage of above decls
-        var privateUse_im_private_c_private = new im_private_c_private();
-        export var publicUse_im_private_c_private = new im_private_c_private();
-        var privateUse_im_private_e_private = im_private_e_private.Happy;
-        export var publicUse_im_private_e_private = im_private_e_private.Grumpy;
-        var privateUse_im_private_f_private = im_private_f_private();
-        export var publicUse_im_private_f_private = im_private_f_private();
-        var privateUse_im_private_v_private = im_private_v_private;
-        export var publicUse_im_private_v_private = im_private_v_private;
-        var privateUse_im_private_i_private: im_private_i_private;
-        export var publicUse_im_private_i_private: im_private_i_private;
-        var privateUse_im_private_mi_private = new im_private_mi_private.c();
-        export var publicUse_im_private_mi_private = new im_private_mi_private.c();
-        var privateUse_im_private_mu_private: im_private_mu_private.i;
-        export var publicUse_im_private_mu_private: im_private_mu_private.i;
-    
-        // No privacy Error - importing public elements
-        export import im_private_c_public = m_public.c_public;
-        export import im_private_e_public = m_public.e_public;
-        export import im_private_f_public = m_public.f_public;
-        export import im_private_v_public = m_public.v_public;
-        export import im_private_i_public = m_public.i_public;
-        export import im_private_mi_public = m_public.mi_public;
-        export import im_private_mu_public = m_public.mu_public;
-    
-        // Usage of no privacy error imports
-        var privateUse_im_private_c_public = new im_private_c_public();
-        export var publicUse_im_private_c_public = new im_private_c_public();
-        var privateUse_im_private_e_public = im_private_e_public.Happy;
-        export var publicUse_im_private_e_public = im_private_e_public.Grumpy;
-        var privateUse_im_private_f_public = im_private_f_public();
-        export var publicUse_im_private_f_public = im_private_f_public();
-        var privateUse_im_private_v_public = im_private_v_public;
-        export var publicUse_im_private_v_public = im_private_v_public;
-        var privateUse_im_private_i_public: im_private_i_public;
-        export var publicUse_im_private_i_public: im_private_i_public;
-        var privateUse_im_private_mi_public = new im_private_mi_public.c();
-        export var publicUse_im_private_mi_public = new im_private_mi_public.c();
-        var privateUse_im_private_mu_public: im_private_mu_public.i;
-        export var publicUse_im_private_mu_public: im_private_mu_public.i;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/privacyLocalInternalReferenceImportWithExport.types b/tests/baselines/reference/privacyLocalInternalReferenceImportWithExport.types
new file mode 100644
index 00000000000..93d6a252627
--- /dev/null
+++ b/tests/baselines/reference/privacyLocalInternalReferenceImportWithExport.types
@@ -0,0 +1,537 @@
+=== tests/cases/compiler/privacyLocalInternalReferenceImportWithExport.ts ===
+// private elements
+module m_private {
+>m_private : typeof m_private
+
+    export class c_private {
+>c_private : c_private
+    }
+    export enum e_private {
+>e_private : e_private
+
+        Happy,
+>Happy : e_private
+
+        Grumpy
+>Grumpy : e_private
+    }
+    export function f_private() {
+>f_private : typeof f_private
+
+        return new c_private();
+>new c_private() : c_private
+>c_private : typeof c_private
+    }
+    export var v_private = new c_private();
+>v_private : c_private
+>new c_private() : c_private
+>c_private : typeof c_private
+
+    export interface i_private {
+>i_private : i_private
+    }
+    export module mi_private {
+>mi_private : typeof mi_private
+
+        export class c {
+>c : c
+        }
+    }
+    export module mu_private {
+>mu_private : mu_private
+
+        export interface i {
+>i : i
+        }
+    }
+}
+
+// Public elements
+export module m_public {
+>m_public : typeof m_public
+
+    export class c_public {
+>c_public : c_public
+    }
+    export enum e_public {
+>e_public : e_public
+
+        Happy,
+>Happy : e_public
+
+        Grumpy
+>Grumpy : e_public
+    }
+    export function f_public() {
+>f_public : typeof f_public
+
+        return new c_public();
+>new c_public() : c_public
+>c_public : typeof c_public
+    }
+    export var v_public = 10;
+>v_public : number
+
+    export interface i_public {
+>i_public : i_public
+    }
+    export module mi_public {
+>mi_public : typeof mi_public
+
+        export class c {
+>c : c
+        }
+    }
+    export module mu_public {
+>mu_public : mu_public
+
+        export interface i {
+>i : i
+        }
+    }
+}
+
+export module import_public {
+>import_public : typeof import_public
+
+    // Privacy errors - importing private elements
+    export import im_public_c_private = m_private.c_private;
+>im_public_c_private : typeof c_private
+>m_private : typeof m_private
+>c_private : c_private
+
+    export import im_public_e_private = m_private.e_private;
+>im_public_e_private : typeof e_private
+>m_private : typeof m_private
+>e_private : e_private
+
+    export import im_public_f_private = m_private.f_private;
+>im_public_f_private : typeof f_private
+>m_private : typeof m_private
+>f_private : typeof f_private
+
+    export import im_public_v_private = m_private.v_private;
+>im_public_v_private : c_private
+>m_private : typeof m_private
+>v_private : c_private
+
+    export import im_public_i_private = m_private.i_private;
+>im_public_i_private : im_public_i_private
+>m_private : typeof m_private
+>i_private : i_private
+
+    export import im_public_mi_private = m_private.mi_private;
+>im_public_mi_private : typeof mi_private
+>m_private : typeof m_private
+>mi_private : typeof mi_private
+
+    export import im_public_mu_private = m_private.mu_private;
+>im_public_mu_private : im_public_mu_private
+>m_private : typeof m_private
+>mu_private : mu_private
+
+    // Usage of privacy error imports
+    var privateUse_im_public_c_private = new im_public_c_private();
+>privateUse_im_public_c_private : c_private
+>new im_public_c_private() : c_private
+>im_public_c_private : typeof c_private
+
+    export var publicUse_im_public_c_private = new im_public_c_private();
+>publicUse_im_public_c_private : c_private
+>new im_public_c_private() : c_private
+>im_public_c_private : typeof c_private
+
+    var privateUse_im_public_e_private = im_public_e_private.Happy;
+>privateUse_im_public_e_private : e_private
+>im_public_e_private.Happy : e_private
+>im_public_e_private : typeof e_private
+>Happy : e_private
+
+    export var publicUse_im_public_e_private = im_public_e_private.Grumpy;
+>publicUse_im_public_e_private : e_private
+>im_public_e_private.Grumpy : e_private
+>im_public_e_private : typeof e_private
+>Grumpy : e_private
+
+    var privateUse_im_public_f_private = im_public_f_private();
+>privateUse_im_public_f_private : c_private
+>im_public_f_private() : c_private
+>im_public_f_private : typeof f_private
+
+    export var publicUse_im_public_f_private = im_public_f_private();
+>publicUse_im_public_f_private : c_private
+>im_public_f_private() : c_private
+>im_public_f_private : typeof f_private
+
+    var privateUse_im_public_v_private = im_public_v_private;
+>privateUse_im_public_v_private : c_private
+>im_public_v_private : c_private
+
+    export var publicUse_im_public_v_private = im_public_v_private;
+>publicUse_im_public_v_private : c_private
+>im_public_v_private : c_private
+
+    var privateUse_im_public_i_private: im_public_i_private;
+>privateUse_im_public_i_private : i_private
+>im_public_i_private : i_private
+
+    export var publicUse_im_public_i_private: im_public_i_private;
+>publicUse_im_public_i_private : i_private
+>im_public_i_private : i_private
+
+    var privateUse_im_public_mi_private = new im_public_mi_private.c();
+>privateUse_im_public_mi_private : c
+>new im_public_mi_private.c() : c
+>im_public_mi_private.c : typeof c
+>im_public_mi_private : typeof mi_private
+>c : typeof c
+
+    export var publicUse_im_public_mi_private = new im_public_mi_private.c();
+>publicUse_im_public_mi_private : c
+>new im_public_mi_private.c() : c
+>im_public_mi_private.c : typeof c
+>im_public_mi_private : typeof mi_private
+>c : typeof c
+
+    var privateUse_im_public_mu_private: im_public_mu_private.i;
+>privateUse_im_public_mu_private : i
+>im_public_mu_private : im_public_mu_private
+>i : i
+
+    export var publicUse_im_public_mu_private: im_public_mu_private.i;
+>publicUse_im_public_mu_private : i
+>im_public_mu_private : im_public_mu_private
+>i : i
+
+
+    // No Privacy errors - importing public elements
+    export import im_public_c_public = m_public.c_public;
+>im_public_c_public : typeof c_public
+>m_public : typeof m_public
+>c_public : c_public
+
+    export import im_public_e_public = m_public.e_public;
+>im_public_e_public : typeof e_public
+>m_public : typeof m_public
+>e_public : e_public
+
+    export import im_public_f_public = m_public.f_public;
+>im_public_f_public : typeof f_public
+>m_public : typeof m_public
+>f_public : typeof f_public
+
+    export import im_public_v_public = m_public.v_public;
+>im_public_v_public : number
+>m_public : typeof m_public
+>v_public : number
+
+    export import im_public_i_public = m_public.i_public;
+>im_public_i_public : im_public_i_public
+>m_public : typeof m_public
+>i_public : i_public
+
+    export import im_public_mi_public = m_public.mi_public;
+>im_public_mi_public : typeof mi_public
+>m_public : typeof m_public
+>mi_public : typeof mi_public
+
+    export import im_public_mu_public = m_public.mu_public;
+>im_public_mu_public : im_public_mu_public
+>m_public : typeof m_public
+>mu_public : mu_public
+
+    // Usage of above
+    var privateUse_im_public_c_public = new im_public_c_public();
+>privateUse_im_public_c_public : c_public
+>new im_public_c_public() : c_public
+>im_public_c_public : typeof c_public
+
+    export var publicUse_im_public_c_public = new im_public_c_public();
+>publicUse_im_public_c_public : c_public
+>new im_public_c_public() : c_public
+>im_public_c_public : typeof c_public
+
+    var privateUse_im_public_e_public = im_public_e_public.Happy;
+>privateUse_im_public_e_public : e_public
+>im_public_e_public.Happy : e_public
+>im_public_e_public : typeof e_public
+>Happy : e_public
+
+    export var publicUse_im_public_e_public = im_public_e_public.Grumpy;
+>publicUse_im_public_e_public : e_public
+>im_public_e_public.Grumpy : e_public
+>im_public_e_public : typeof e_public
+>Grumpy : e_public
+
+    var privateUse_im_public_f_public = im_public_f_public();
+>privateUse_im_public_f_public : c_public
+>im_public_f_public() : c_public
+>im_public_f_public : typeof f_public
+
+    export var publicUse_im_public_f_public = im_public_f_public();
+>publicUse_im_public_f_public : c_public
+>im_public_f_public() : c_public
+>im_public_f_public : typeof f_public
+
+    var privateUse_im_public_v_public = im_public_v_public;
+>privateUse_im_public_v_public : number
+>im_public_v_public : number
+
+    export var publicUse_im_public_v_public = im_public_v_public;
+>publicUse_im_public_v_public : number
+>im_public_v_public : number
+
+    var privateUse_im_public_i_public: im_public_i_public;
+>privateUse_im_public_i_public : i_public
+>im_public_i_public : i_public
+
+    export var publicUse_im_public_i_public: im_public_i_public;
+>publicUse_im_public_i_public : i_public
+>im_public_i_public : i_public
+
+    var privateUse_im_public_mi_public = new im_public_mi_public.c();
+>privateUse_im_public_mi_public : c
+>new im_public_mi_public.c() : c
+>im_public_mi_public.c : typeof c
+>im_public_mi_public : typeof mi_public
+>c : typeof c
+
+    export var publicUse_im_public_mi_public = new im_public_mi_public.c();
+>publicUse_im_public_mi_public : c
+>new im_public_mi_public.c() : c
+>im_public_mi_public.c : typeof c
+>im_public_mi_public : typeof mi_public
+>c : typeof c
+
+    var privateUse_im_public_mu_public: im_public_mu_public.i;
+>privateUse_im_public_mu_public : i
+>im_public_mu_public : im_public_mu_public
+>i : i
+
+    export var publicUse_im_public_mu_public: im_public_mu_public.i;
+>publicUse_im_public_mu_public : i
+>im_public_mu_public : im_public_mu_public
+>i : i
+}
+
+module import_private {
+>import_private : typeof import_private
+
+    // No Privacy errors - importing private elements
+    export import im_private_c_private = m_private.c_private;
+>im_private_c_private : typeof c_private
+>m_private : typeof m_private
+>c_private : c_private
+
+    export import im_private_e_private = m_private.e_private;
+>im_private_e_private : typeof e_private
+>m_private : typeof m_private
+>e_private : e_private
+
+    export import im_private_f_private = m_private.f_private;
+>im_private_f_private : typeof f_private
+>m_private : typeof m_private
+>f_private : typeof f_private
+
+    export import im_private_v_private = m_private.v_private;
+>im_private_v_private : c_private
+>m_private : typeof m_private
+>v_private : c_private
+
+    export import im_private_i_private = m_private.i_private;
+>im_private_i_private : im_private_i_private
+>m_private : typeof m_private
+>i_private : i_private
+
+    export import im_private_mi_private = m_private.mi_private;
+>im_private_mi_private : typeof mi_private
+>m_private : typeof m_private
+>mi_private : typeof mi_private
+
+    export import im_private_mu_private = m_private.mu_private;
+>im_private_mu_private : im_private_mu_private
+>m_private : typeof m_private
+>mu_private : mu_private
+
+    // Usage of above decls
+    var privateUse_im_private_c_private = new im_private_c_private();
+>privateUse_im_private_c_private : c_private
+>new im_private_c_private() : c_private
+>im_private_c_private : typeof c_private
+
+    export var publicUse_im_private_c_private = new im_private_c_private();
+>publicUse_im_private_c_private : c_private
+>new im_private_c_private() : c_private
+>im_private_c_private : typeof c_private
+
+    var privateUse_im_private_e_private = im_private_e_private.Happy;
+>privateUse_im_private_e_private : e_private
+>im_private_e_private.Happy : e_private
+>im_private_e_private : typeof e_private
+>Happy : e_private
+
+    export var publicUse_im_private_e_private = im_private_e_private.Grumpy;
+>publicUse_im_private_e_private : e_private
+>im_private_e_private.Grumpy : e_private
+>im_private_e_private : typeof e_private
+>Grumpy : e_private
+
+    var privateUse_im_private_f_private = im_private_f_private();
+>privateUse_im_private_f_private : c_private
+>im_private_f_private() : c_private
+>im_private_f_private : typeof f_private
+
+    export var publicUse_im_private_f_private = im_private_f_private();
+>publicUse_im_private_f_private : c_private
+>im_private_f_private() : c_private
+>im_private_f_private : typeof f_private
+
+    var privateUse_im_private_v_private = im_private_v_private;
+>privateUse_im_private_v_private : c_private
+>im_private_v_private : c_private
+
+    export var publicUse_im_private_v_private = im_private_v_private;
+>publicUse_im_private_v_private : c_private
+>im_private_v_private : c_private
+
+    var privateUse_im_private_i_private: im_private_i_private;
+>privateUse_im_private_i_private : i_private
+>im_private_i_private : i_private
+
+    export var publicUse_im_private_i_private: im_private_i_private;
+>publicUse_im_private_i_private : i_private
+>im_private_i_private : i_private
+
+    var privateUse_im_private_mi_private = new im_private_mi_private.c();
+>privateUse_im_private_mi_private : c
+>new im_private_mi_private.c() : c
+>im_private_mi_private.c : typeof c
+>im_private_mi_private : typeof mi_private
+>c : typeof c
+
+    export var publicUse_im_private_mi_private = new im_private_mi_private.c();
+>publicUse_im_private_mi_private : c
+>new im_private_mi_private.c() : c
+>im_private_mi_private.c : typeof c
+>im_private_mi_private : typeof mi_private
+>c : typeof c
+
+    var privateUse_im_private_mu_private: im_private_mu_private.i;
+>privateUse_im_private_mu_private : i
+>im_private_mu_private : im_private_mu_private
+>i : i
+
+    export var publicUse_im_private_mu_private: im_private_mu_private.i;
+>publicUse_im_private_mu_private : i
+>im_private_mu_private : im_private_mu_private
+>i : i
+
+    // No privacy Error - importing public elements
+    export import im_private_c_public = m_public.c_public;
+>im_private_c_public : typeof c_public
+>m_public : typeof m_public
+>c_public : c_public
+
+    export import im_private_e_public = m_public.e_public;
+>im_private_e_public : typeof e_public
+>m_public : typeof m_public
+>e_public : e_public
+
+    export import im_private_f_public = m_public.f_public;
+>im_private_f_public : typeof f_public
+>m_public : typeof m_public
+>f_public : typeof f_public
+
+    export import im_private_v_public = m_public.v_public;
+>im_private_v_public : number
+>m_public : typeof m_public
+>v_public : number
+
+    export import im_private_i_public = m_public.i_public;
+>im_private_i_public : im_private_i_public
+>m_public : typeof m_public
+>i_public : i_public
+
+    export import im_private_mi_public = m_public.mi_public;
+>im_private_mi_public : typeof mi_public
+>m_public : typeof m_public
+>mi_public : typeof mi_public
+
+    export import im_private_mu_public = m_public.mu_public;
+>im_private_mu_public : im_private_mu_public
+>m_public : typeof m_public
+>mu_public : mu_public
+
+    // Usage of no privacy error imports
+    var privateUse_im_private_c_public = new im_private_c_public();
+>privateUse_im_private_c_public : c_public
+>new im_private_c_public() : c_public
+>im_private_c_public : typeof c_public
+
+    export var publicUse_im_private_c_public = new im_private_c_public();
+>publicUse_im_private_c_public : c_public
+>new im_private_c_public() : c_public
+>im_private_c_public : typeof c_public
+
+    var privateUse_im_private_e_public = im_private_e_public.Happy;
+>privateUse_im_private_e_public : e_public
+>im_private_e_public.Happy : e_public
+>im_private_e_public : typeof e_public
+>Happy : e_public
+
+    export var publicUse_im_private_e_public = im_private_e_public.Grumpy;
+>publicUse_im_private_e_public : e_public
+>im_private_e_public.Grumpy : e_public
+>im_private_e_public : typeof e_public
+>Grumpy : e_public
+
+    var privateUse_im_private_f_public = im_private_f_public();
+>privateUse_im_private_f_public : c_public
+>im_private_f_public() : c_public
+>im_private_f_public : typeof f_public
+
+    export var publicUse_im_private_f_public = im_private_f_public();
+>publicUse_im_private_f_public : c_public
+>im_private_f_public() : c_public
+>im_private_f_public : typeof f_public
+
+    var privateUse_im_private_v_public = im_private_v_public;
+>privateUse_im_private_v_public : number
+>im_private_v_public : number
+
+    export var publicUse_im_private_v_public = im_private_v_public;
+>publicUse_im_private_v_public : number
+>im_private_v_public : number
+
+    var privateUse_im_private_i_public: im_private_i_public;
+>privateUse_im_private_i_public : i_public
+>im_private_i_public : i_public
+
+    export var publicUse_im_private_i_public: im_private_i_public;
+>publicUse_im_private_i_public : i_public
+>im_private_i_public : i_public
+
+    var privateUse_im_private_mi_public = new im_private_mi_public.c();
+>privateUse_im_private_mi_public : c
+>new im_private_mi_public.c() : c
+>im_private_mi_public.c : typeof c
+>im_private_mi_public : typeof mi_public
+>c : typeof c
+
+    export var publicUse_im_private_mi_public = new im_private_mi_public.c();
+>publicUse_im_private_mi_public : c
+>new im_private_mi_public.c() : c
+>im_private_mi_public.c : typeof c
+>im_private_mi_public : typeof mi_public
+>c : typeof c
+
+    var privateUse_im_private_mu_public: im_private_mu_public.i;
+>privateUse_im_private_mu_public : i
+>im_private_mu_public : im_private_mu_public
+>i : i
+
+    export var publicUse_im_private_mu_public: im_private_mu_public.i;
+>publicUse_im_private_mu_public : i
+>im_private_mu_public : im_private_mu_public
+>i : i
+}
diff --git a/tests/baselines/reference/privacyLocalInternalReferenceImportWithoutExport.errors.txt b/tests/baselines/reference/privacyLocalInternalReferenceImportWithoutExport.errors.txt
deleted file mode 100644
index 7872b2b0715..00000000000
--- a/tests/baselines/reference/privacyLocalInternalReferenceImportWithoutExport.errors.txt
+++ /dev/null
@@ -1,163 +0,0 @@
-==== tests/cases/compiler/privacyLocalInternalReferenceImportWithoutExport.ts (5 errors) ====
-    // private elements
-    module m_private {
-        export class c_private {
-        }
-        export enum e_private {
-            Happy,
-            Grumpy
-        }
-        export function f_private() {
-            return new c_private();
-        }
-        export var v_private = new c_private();
-        export interface i_private {
-        }
-        export module mi_private {
-            export class c {
-            }
-        }
-        export module mu_private {
-            export interface i {
-            }
-        }
-    }
-    
-    // Public elements
-    export module m_public {
-        export class c_public {
-        }
-        export enum e_public {
-            Happy,
-            Grumpy
-        }
-        export function f_public() {
-            return new c_public();
-        }
-        export var v_public = 10;
-        export interface i_public {
-        }
-        export module mi_public {
-            export class c {
-            }
-        }
-        export module mu_public {
-            export interface i {
-            }
-        }
-    }
-    
-    export module import_public {
-        // No Privacy errors - importing private elements
-        import im_private_c_private = m_private.c_private;
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Import declaration 'im_private_c_private' is using private name 'm_private'.
-        import im_private_e_private = m_private.e_private;
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Import declaration 'im_private_e_private' is using private name 'm_private'.
-        import im_private_f_private = m_private.f_private;
-        import im_private_v_private = m_private.v_private;
-        import im_private_i_private = m_private.i_private;
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Import declaration 'im_private_i_private' is using private name 'm_private'.
-        import im_private_mi_private = m_private.mi_private;
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Import declaration 'im_private_mi_private' is using private name 'm_private'.
-        import im_private_mu_private = m_private.mu_private;
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Import declaration 'im_private_mu_private' is using private name 'm_private'.
-    
-        // Usage of above decls
-        var privateUse_im_private_c_private = new im_private_c_private();
-        export var publicUse_im_private_c_private = new im_private_c_private();
-        var privateUse_im_private_e_private = im_private_e_private.Happy;
-        export var publicUse_im_private_e_private = im_private_e_private.Grumpy;
-        var privateUse_im_private_f_private = im_private_f_private();
-        export var publicUse_im_private_f_private = im_private_f_private();
-        var privateUse_im_private_v_private = im_private_v_private;
-        export var publicUse_im_private_v_private = im_private_v_private;
-        var privateUse_im_private_i_private: im_private_i_private;
-        export var publicUse_im_private_i_private: im_private_i_private;
-        var privateUse_im_private_mi_private = new im_private_mi_private.c();
-        export var publicUse_im_private_mi_private = new im_private_mi_private.c();
-        var privateUse_im_private_mu_private: im_private_mu_private.i;
-        export var publicUse_im_private_mu_private: im_private_mu_private.i;
-    
-    
-        // No Privacy errors - importing public elements
-        import im_private_c_public = m_public.c_public;
-        import im_private_e_public = m_public.e_public;
-        import im_private_f_public = m_public.f_public;
-        import im_private_v_public = m_public.v_public;
-        import im_private_i_public = m_public.i_public;
-        import im_private_mi_public = m_public.mi_public;
-        import im_private_mu_public = m_public.mu_public;
-    
-        // Usage of above decls
-        var privateUse_im_private_c_public = new im_private_c_public();
-        export var publicUse_im_private_c_public = new im_private_c_public();
-        var privateUse_im_private_e_public = im_private_e_public.Happy;
-        export var publicUse_im_private_e_public = im_private_e_public.Grumpy;
-        var privateUse_im_private_f_public = im_private_f_public();
-        export var publicUse_im_private_f_public = im_private_f_public();
-        var privateUse_im_private_v_public = im_private_v_public;
-        export var publicUse_im_private_v_public = im_private_v_public;
-        var privateUse_im_private_i_public: im_private_i_public;
-        export var publicUse_im_private_i_public: im_private_i_public;
-        var privateUse_im_private_mi_public = new im_private_mi_public.c();
-        export var publicUse_im_private_mi_public = new im_private_mi_public.c();
-        var privateUse_im_private_mu_public: im_private_mu_public.i;
-        export var publicUse_im_private_mu_public: im_private_mu_public.i;
-    }
-    
-    module import_private {
-        // No Privacy errors - importing private elements
-        import im_private_c_private = m_private.c_private;
-        import im_private_e_private = m_private.e_private;
-        import im_private_f_private = m_private.f_private;
-        import im_private_v_private = m_private.v_private;
-        import im_private_i_private = m_private.i_private;
-        import im_private_mi_private = m_private.mi_private;
-        import im_private_mu_private = m_private.mu_private;
-    
-        // Usage of above decls
-        var privateUse_im_private_c_private = new im_private_c_private();
-        export var publicUse_im_private_c_private = new im_private_c_private();
-        var privateUse_im_private_e_private = im_private_e_private.Happy;
-        export var publicUse_im_private_e_private = im_private_e_private.Grumpy;
-        var privateUse_im_private_f_private = im_private_f_private();
-        export var publicUse_im_private_f_private = im_private_f_private();
-        var privateUse_im_private_v_private = im_private_v_private;
-        export var publicUse_im_private_v_private = im_private_v_private;
-        var privateUse_im_private_i_private: im_private_i_private;
-        export var publicUse_im_private_i_private: im_private_i_private;
-        var privateUse_im_private_mi_private = new im_private_mi_private.c();
-        export var publicUse_im_private_mi_private = new im_private_mi_private.c();
-        var privateUse_im_private_mu_private: im_private_mu_private.i;
-        export var publicUse_im_private_mu_private: im_private_mu_private.i;
-    
-        // No privacy Error - importing public elements
-        import im_private_c_public = m_public.c_public;
-        import im_private_e_public = m_public.e_public;
-        import im_private_f_public = m_public.f_public;
-        import im_private_v_public = m_public.v_public;
-        import im_private_i_public = m_public.i_public;
-        import im_private_mi_public = m_public.mi_public;
-        import im_private_mu_public = m_public.mu_public;
-    
-        // Usage of above decls
-        var privateUse_im_private_c_public = new im_private_c_public();
-        export var publicUse_im_private_c_public = new im_private_c_public();
-        var privateUse_im_private_e_public = im_private_e_public.Happy;
-        export var publicUse_im_private_e_public = im_private_e_public.Grumpy;
-        var privateUse_im_private_f_public = im_private_f_public();
-        export var publicUse_im_private_f_public = im_private_f_public();
-        var privateUse_im_private_v_public = im_private_v_public;
-        export var publicUse_im_private_v_public = im_private_v_public;
-        var privateUse_im_private_i_public: im_private_i_public;
-        export var publicUse_im_private_i_public: im_private_i_public;
-        var privateUse_im_private_mi_public = new im_private_mi_public.c();
-        export var publicUse_im_private_mi_public = new im_private_mi_public.c();
-        var privateUse_im_private_mu_public: im_private_mu_public.i;
-        export var publicUse_im_private_mu_public: im_private_mu_public.i;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/privacyLocalInternalReferenceImportWithoutExport.types b/tests/baselines/reference/privacyLocalInternalReferenceImportWithoutExport.types
new file mode 100644
index 00000000000..27effbd5ccb
--- /dev/null
+++ b/tests/baselines/reference/privacyLocalInternalReferenceImportWithoutExport.types
@@ -0,0 +1,537 @@
+=== tests/cases/compiler/privacyLocalInternalReferenceImportWithoutExport.ts ===
+// private elements
+module m_private {
+>m_private : typeof m_private
+
+    export class c_private {
+>c_private : c_private
+    }
+    export enum e_private {
+>e_private : e_private
+
+        Happy,
+>Happy : e_private
+
+        Grumpy
+>Grumpy : e_private
+    }
+    export function f_private() {
+>f_private : typeof f_private
+
+        return new c_private();
+>new c_private() : c_private
+>c_private : typeof c_private
+    }
+    export var v_private = new c_private();
+>v_private : c_private
+>new c_private() : c_private
+>c_private : typeof c_private
+
+    export interface i_private {
+>i_private : i_private
+    }
+    export module mi_private {
+>mi_private : typeof mi_private
+
+        export class c {
+>c : c
+        }
+    }
+    export module mu_private {
+>mu_private : mu_private
+
+        export interface i {
+>i : i
+        }
+    }
+}
+
+// Public elements
+export module m_public {
+>m_public : typeof m_public
+
+    export class c_public {
+>c_public : c_public
+    }
+    export enum e_public {
+>e_public : e_public
+
+        Happy,
+>Happy : e_public
+
+        Grumpy
+>Grumpy : e_public
+    }
+    export function f_public() {
+>f_public : typeof f_public
+
+        return new c_public();
+>new c_public() : c_public
+>c_public : typeof c_public
+    }
+    export var v_public = 10;
+>v_public : number
+
+    export interface i_public {
+>i_public : i_public
+    }
+    export module mi_public {
+>mi_public : typeof mi_public
+
+        export class c {
+>c : c
+        }
+    }
+    export module mu_public {
+>mu_public : mu_public
+
+        export interface i {
+>i : i
+        }
+    }
+}
+
+export module import_public {
+>import_public : typeof import_public
+
+    // No Privacy errors - importing private elements
+    import im_private_c_private = m_private.c_private;
+>im_private_c_private : typeof c_private
+>m_private : typeof m_private
+>c_private : c_private
+
+    import im_private_e_private = m_private.e_private;
+>im_private_e_private : typeof e_private
+>m_private : typeof m_private
+>e_private : e_private
+
+    import im_private_f_private = m_private.f_private;
+>im_private_f_private : typeof f_private
+>m_private : typeof m_private
+>f_private : typeof f_private
+
+    import im_private_v_private = m_private.v_private;
+>im_private_v_private : c_private
+>m_private : typeof m_private
+>v_private : c_private
+
+    import im_private_i_private = m_private.i_private;
+>im_private_i_private : im_private_i_private
+>m_private : typeof m_private
+>i_private : i_private
+
+    import im_private_mi_private = m_private.mi_private;
+>im_private_mi_private : typeof mi_private
+>m_private : typeof m_private
+>mi_private : typeof mi_private
+
+    import im_private_mu_private = m_private.mu_private;
+>im_private_mu_private : im_private_mu_private
+>m_private : typeof m_private
+>mu_private : mu_private
+
+    // Usage of above decls
+    var privateUse_im_private_c_private = new im_private_c_private();
+>privateUse_im_private_c_private : c_private
+>new im_private_c_private() : c_private
+>im_private_c_private : typeof c_private
+
+    export var publicUse_im_private_c_private = new im_private_c_private();
+>publicUse_im_private_c_private : c_private
+>new im_private_c_private() : c_private
+>im_private_c_private : typeof c_private
+
+    var privateUse_im_private_e_private = im_private_e_private.Happy;
+>privateUse_im_private_e_private : e_private
+>im_private_e_private.Happy : e_private
+>im_private_e_private : typeof e_private
+>Happy : e_private
+
+    export var publicUse_im_private_e_private = im_private_e_private.Grumpy;
+>publicUse_im_private_e_private : e_private
+>im_private_e_private.Grumpy : e_private
+>im_private_e_private : typeof e_private
+>Grumpy : e_private
+
+    var privateUse_im_private_f_private = im_private_f_private();
+>privateUse_im_private_f_private : c_private
+>im_private_f_private() : c_private
+>im_private_f_private : typeof f_private
+
+    export var publicUse_im_private_f_private = im_private_f_private();
+>publicUse_im_private_f_private : c_private
+>im_private_f_private() : c_private
+>im_private_f_private : typeof f_private
+
+    var privateUse_im_private_v_private = im_private_v_private;
+>privateUse_im_private_v_private : c_private
+>im_private_v_private : c_private
+
+    export var publicUse_im_private_v_private = im_private_v_private;
+>publicUse_im_private_v_private : c_private
+>im_private_v_private : c_private
+
+    var privateUse_im_private_i_private: im_private_i_private;
+>privateUse_im_private_i_private : i_private
+>im_private_i_private : i_private
+
+    export var publicUse_im_private_i_private: im_private_i_private;
+>publicUse_im_private_i_private : i_private
+>im_private_i_private : i_private
+
+    var privateUse_im_private_mi_private = new im_private_mi_private.c();
+>privateUse_im_private_mi_private : c
+>new im_private_mi_private.c() : c
+>im_private_mi_private.c : typeof c
+>im_private_mi_private : typeof mi_private
+>c : typeof c
+
+    export var publicUse_im_private_mi_private = new im_private_mi_private.c();
+>publicUse_im_private_mi_private : c
+>new im_private_mi_private.c() : c
+>im_private_mi_private.c : typeof c
+>im_private_mi_private : typeof mi_private
+>c : typeof c
+
+    var privateUse_im_private_mu_private: im_private_mu_private.i;
+>privateUse_im_private_mu_private : i
+>im_private_mu_private : im_private_mu_private
+>i : i
+
+    export var publicUse_im_private_mu_private: im_private_mu_private.i;
+>publicUse_im_private_mu_private : i
+>im_private_mu_private : im_private_mu_private
+>i : i
+
+
+    // No Privacy errors - importing public elements
+    import im_private_c_public = m_public.c_public;
+>im_private_c_public : typeof c_public
+>m_public : typeof m_public
+>c_public : c_public
+
+    import im_private_e_public = m_public.e_public;
+>im_private_e_public : typeof e_public
+>m_public : typeof m_public
+>e_public : e_public
+
+    import im_private_f_public = m_public.f_public;
+>im_private_f_public : typeof f_public
+>m_public : typeof m_public
+>f_public : typeof f_public
+
+    import im_private_v_public = m_public.v_public;
+>im_private_v_public : number
+>m_public : typeof m_public
+>v_public : number
+
+    import im_private_i_public = m_public.i_public;
+>im_private_i_public : im_private_i_public
+>m_public : typeof m_public
+>i_public : i_public
+
+    import im_private_mi_public = m_public.mi_public;
+>im_private_mi_public : typeof mi_public
+>m_public : typeof m_public
+>mi_public : typeof mi_public
+
+    import im_private_mu_public = m_public.mu_public;
+>im_private_mu_public : im_private_mu_public
+>m_public : typeof m_public
+>mu_public : mu_public
+
+    // Usage of above decls
+    var privateUse_im_private_c_public = new im_private_c_public();
+>privateUse_im_private_c_public : c_public
+>new im_private_c_public() : c_public
+>im_private_c_public : typeof c_public
+
+    export var publicUse_im_private_c_public = new im_private_c_public();
+>publicUse_im_private_c_public : c_public
+>new im_private_c_public() : c_public
+>im_private_c_public : typeof c_public
+
+    var privateUse_im_private_e_public = im_private_e_public.Happy;
+>privateUse_im_private_e_public : e_public
+>im_private_e_public.Happy : e_public
+>im_private_e_public : typeof e_public
+>Happy : e_public
+
+    export var publicUse_im_private_e_public = im_private_e_public.Grumpy;
+>publicUse_im_private_e_public : e_public
+>im_private_e_public.Grumpy : e_public
+>im_private_e_public : typeof e_public
+>Grumpy : e_public
+
+    var privateUse_im_private_f_public = im_private_f_public();
+>privateUse_im_private_f_public : c_public
+>im_private_f_public() : c_public
+>im_private_f_public : typeof f_public
+
+    export var publicUse_im_private_f_public = im_private_f_public();
+>publicUse_im_private_f_public : c_public
+>im_private_f_public() : c_public
+>im_private_f_public : typeof f_public
+
+    var privateUse_im_private_v_public = im_private_v_public;
+>privateUse_im_private_v_public : number
+>im_private_v_public : number
+
+    export var publicUse_im_private_v_public = im_private_v_public;
+>publicUse_im_private_v_public : number
+>im_private_v_public : number
+
+    var privateUse_im_private_i_public: im_private_i_public;
+>privateUse_im_private_i_public : i_public
+>im_private_i_public : i_public
+
+    export var publicUse_im_private_i_public: im_private_i_public;
+>publicUse_im_private_i_public : i_public
+>im_private_i_public : i_public
+
+    var privateUse_im_private_mi_public = new im_private_mi_public.c();
+>privateUse_im_private_mi_public : c
+>new im_private_mi_public.c() : c
+>im_private_mi_public.c : typeof c
+>im_private_mi_public : typeof mi_public
+>c : typeof c
+
+    export var publicUse_im_private_mi_public = new im_private_mi_public.c();
+>publicUse_im_private_mi_public : c
+>new im_private_mi_public.c() : c
+>im_private_mi_public.c : typeof c
+>im_private_mi_public : typeof mi_public
+>c : typeof c
+
+    var privateUse_im_private_mu_public: im_private_mu_public.i;
+>privateUse_im_private_mu_public : i
+>im_private_mu_public : im_private_mu_public
+>i : i
+
+    export var publicUse_im_private_mu_public: im_private_mu_public.i;
+>publicUse_im_private_mu_public : i
+>im_private_mu_public : im_private_mu_public
+>i : i
+}
+
+module import_private {
+>import_private : typeof import_private
+
+    // No Privacy errors - importing private elements
+    import im_private_c_private = m_private.c_private;
+>im_private_c_private : typeof c_private
+>m_private : typeof m_private
+>c_private : c_private
+
+    import im_private_e_private = m_private.e_private;
+>im_private_e_private : typeof e_private
+>m_private : typeof m_private
+>e_private : e_private
+
+    import im_private_f_private = m_private.f_private;
+>im_private_f_private : typeof f_private
+>m_private : typeof m_private
+>f_private : typeof f_private
+
+    import im_private_v_private = m_private.v_private;
+>im_private_v_private : c_private
+>m_private : typeof m_private
+>v_private : c_private
+
+    import im_private_i_private = m_private.i_private;
+>im_private_i_private : im_private_i_private
+>m_private : typeof m_private
+>i_private : i_private
+
+    import im_private_mi_private = m_private.mi_private;
+>im_private_mi_private : typeof mi_private
+>m_private : typeof m_private
+>mi_private : typeof mi_private
+
+    import im_private_mu_private = m_private.mu_private;
+>im_private_mu_private : im_private_mu_private
+>m_private : typeof m_private
+>mu_private : mu_private
+
+    // Usage of above decls
+    var privateUse_im_private_c_private = new im_private_c_private();
+>privateUse_im_private_c_private : c_private
+>new im_private_c_private() : c_private
+>im_private_c_private : typeof c_private
+
+    export var publicUse_im_private_c_private = new im_private_c_private();
+>publicUse_im_private_c_private : c_private
+>new im_private_c_private() : c_private
+>im_private_c_private : typeof c_private
+
+    var privateUse_im_private_e_private = im_private_e_private.Happy;
+>privateUse_im_private_e_private : e_private
+>im_private_e_private.Happy : e_private
+>im_private_e_private : typeof e_private
+>Happy : e_private
+
+    export var publicUse_im_private_e_private = im_private_e_private.Grumpy;
+>publicUse_im_private_e_private : e_private
+>im_private_e_private.Grumpy : e_private
+>im_private_e_private : typeof e_private
+>Grumpy : e_private
+
+    var privateUse_im_private_f_private = im_private_f_private();
+>privateUse_im_private_f_private : c_private
+>im_private_f_private() : c_private
+>im_private_f_private : typeof f_private
+
+    export var publicUse_im_private_f_private = im_private_f_private();
+>publicUse_im_private_f_private : c_private
+>im_private_f_private() : c_private
+>im_private_f_private : typeof f_private
+
+    var privateUse_im_private_v_private = im_private_v_private;
+>privateUse_im_private_v_private : c_private
+>im_private_v_private : c_private
+
+    export var publicUse_im_private_v_private = im_private_v_private;
+>publicUse_im_private_v_private : c_private
+>im_private_v_private : c_private
+
+    var privateUse_im_private_i_private: im_private_i_private;
+>privateUse_im_private_i_private : i_private
+>im_private_i_private : i_private
+
+    export var publicUse_im_private_i_private: im_private_i_private;
+>publicUse_im_private_i_private : i_private
+>im_private_i_private : i_private
+
+    var privateUse_im_private_mi_private = new im_private_mi_private.c();
+>privateUse_im_private_mi_private : c
+>new im_private_mi_private.c() : c
+>im_private_mi_private.c : typeof c
+>im_private_mi_private : typeof mi_private
+>c : typeof c
+
+    export var publicUse_im_private_mi_private = new im_private_mi_private.c();
+>publicUse_im_private_mi_private : c
+>new im_private_mi_private.c() : c
+>im_private_mi_private.c : typeof c
+>im_private_mi_private : typeof mi_private
+>c : typeof c
+
+    var privateUse_im_private_mu_private: im_private_mu_private.i;
+>privateUse_im_private_mu_private : i
+>im_private_mu_private : im_private_mu_private
+>i : i
+
+    export var publicUse_im_private_mu_private: im_private_mu_private.i;
+>publicUse_im_private_mu_private : i
+>im_private_mu_private : im_private_mu_private
+>i : i
+
+    // No privacy Error - importing public elements
+    import im_private_c_public = m_public.c_public;
+>im_private_c_public : typeof c_public
+>m_public : typeof m_public
+>c_public : c_public
+
+    import im_private_e_public = m_public.e_public;
+>im_private_e_public : typeof e_public
+>m_public : typeof m_public
+>e_public : e_public
+
+    import im_private_f_public = m_public.f_public;
+>im_private_f_public : typeof f_public
+>m_public : typeof m_public
+>f_public : typeof f_public
+
+    import im_private_v_public = m_public.v_public;
+>im_private_v_public : number
+>m_public : typeof m_public
+>v_public : number
+
+    import im_private_i_public = m_public.i_public;
+>im_private_i_public : im_private_i_public
+>m_public : typeof m_public
+>i_public : i_public
+
+    import im_private_mi_public = m_public.mi_public;
+>im_private_mi_public : typeof mi_public
+>m_public : typeof m_public
+>mi_public : typeof mi_public
+
+    import im_private_mu_public = m_public.mu_public;
+>im_private_mu_public : im_private_mu_public
+>m_public : typeof m_public
+>mu_public : mu_public
+
+    // Usage of above decls
+    var privateUse_im_private_c_public = new im_private_c_public();
+>privateUse_im_private_c_public : c_public
+>new im_private_c_public() : c_public
+>im_private_c_public : typeof c_public
+
+    export var publicUse_im_private_c_public = new im_private_c_public();
+>publicUse_im_private_c_public : c_public
+>new im_private_c_public() : c_public
+>im_private_c_public : typeof c_public
+
+    var privateUse_im_private_e_public = im_private_e_public.Happy;
+>privateUse_im_private_e_public : e_public
+>im_private_e_public.Happy : e_public
+>im_private_e_public : typeof e_public
+>Happy : e_public
+
+    export var publicUse_im_private_e_public = im_private_e_public.Grumpy;
+>publicUse_im_private_e_public : e_public
+>im_private_e_public.Grumpy : e_public
+>im_private_e_public : typeof e_public
+>Grumpy : e_public
+
+    var privateUse_im_private_f_public = im_private_f_public();
+>privateUse_im_private_f_public : c_public
+>im_private_f_public() : c_public
+>im_private_f_public : typeof f_public
+
+    export var publicUse_im_private_f_public = im_private_f_public();
+>publicUse_im_private_f_public : c_public
+>im_private_f_public() : c_public
+>im_private_f_public : typeof f_public
+
+    var privateUse_im_private_v_public = im_private_v_public;
+>privateUse_im_private_v_public : number
+>im_private_v_public : number
+
+    export var publicUse_im_private_v_public = im_private_v_public;
+>publicUse_im_private_v_public : number
+>im_private_v_public : number
+
+    var privateUse_im_private_i_public: im_private_i_public;
+>privateUse_im_private_i_public : i_public
+>im_private_i_public : i_public
+
+    export var publicUse_im_private_i_public: im_private_i_public;
+>publicUse_im_private_i_public : i_public
+>im_private_i_public : i_public
+
+    var privateUse_im_private_mi_public = new im_private_mi_public.c();
+>privateUse_im_private_mi_public : c
+>new im_private_mi_public.c() : c
+>im_private_mi_public.c : typeof c
+>im_private_mi_public : typeof mi_public
+>c : typeof c
+
+    export var publicUse_im_private_mi_public = new im_private_mi_public.c();
+>publicUse_im_private_mi_public : c
+>new im_private_mi_public.c() : c
+>im_private_mi_public.c : typeof c
+>im_private_mi_public : typeof mi_public
+>c : typeof c
+
+    var privateUse_im_private_mu_public: im_private_mu_public.i;
+>privateUse_im_private_mu_public : i
+>im_private_mu_public : im_private_mu_public
+>i : i
+
+    export var publicUse_im_private_mu_public: im_private_mu_public.i;
+>publicUse_im_private_mu_public : i
+>im_private_mu_public : im_private_mu_public
+>i : i
+}
diff --git a/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithExport.errors.txt b/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithExport.errors.txt
new file mode 100644
index 00000000000..7a102fce1f2
--- /dev/null
+++ b/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithExport.errors.txt
@@ -0,0 +1,57 @@
+==== tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithExport_core.ts (6 errors) ====
+    // Privacy errors - importing private elements
+    export import im_public_mi_private = require("privacyTopLevelAmbientExternalModuleImportWithExport_require");
+    export import im_public_mu_private = require("privacyTopLevelAmbientExternalModuleImportWithExport_require1");
+    export import im_public_mi_public = require("m");
+                                                ~~~
+!!! Cannot find external module 'm'.
+    export import im_public_mu_public = require("m2");
+                                                ~~~~
+!!! Cannot find external module 'm2'.
+    
+    // Usage of privacy error imports
+    var privateUse_im_public_mi_private = new im_public_mi_private.c_private();
+                                                                   ~~~~~~~~~
+!!! Property 'c_private' does not exist on type 'typeof "tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithExport_require"'.
+    export var publicUse_im_public_mi_private = new im_public_mi_private.c_private();
+                                                                         ~~~~~~~~~
+!!! Property 'c_private' does not exist on type 'typeof "tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithExport_require"'.
+    var privateUse_im_public_mu_private = new im_public_mu_private.c_private();
+                                                                   ~~~~~~~~~
+!!! Property 'c_private' does not exist on type 'typeof "tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithExport_require1"'.
+    export var publicUse_im_public_mu_private = new im_public_mu_private.c_private();
+                                                                         ~~~~~~~~~
+!!! Property 'c_private' does not exist on type 'typeof "tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithExport_require1"'.
+    var privateUse_im_public_mi_public = new im_public_mi_public.c_public();
+    export var publicUse_im_public_mi_public = new im_public_mi_public.c_public();
+    var privateUse_im_public_mi_public = new im_public_mi_public.c_public();
+    export var publicUse_im_public_mi_public = new im_public_mi_public.c_public();
+    
+==== tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithExport_require.ts (0 errors) ====
+    // Public elements
+    export class c_public {
+        foo: string;
+    }
+    
+==== tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithExport_require1.ts (0 errors) ====
+    export class c_public {
+        bar: string;
+    }
+    
+==== tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithExport_require2.ts (0 errors) ====
+    // private elements
+    // Export - Error ambient modules allowed only in global
+    declare module 'm' {
+        export class c_private {
+            baz: string;
+        }
+    }
+    
+    
+==== tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithExport_require3.ts (0 errors) ====
+    declare module 'm2' {
+        export class c_private {
+            bing: string;
+        }
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithExport.js b/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithExport.js
index 4ae42e1118e..1956ea5e111 100644
--- a/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithExport.js
+++ b/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithExport.js
@@ -29,8 +29,6 @@ declare module 'm2' {
 }
 
 //// [privacyTopLevelAmbientExternalModuleImportWithExport_core.ts]
-///<reference path='privacyTopLevelAmbientExternalModuleImportWithExport_require2.ts'/>
-///<reference path='privacyTopLevelAmbientExternalModuleImportWithExport_require3.ts'/>
 // Privacy errors - importing private elements
 export import im_public_mi_private = require("privacyTopLevelAmbientExternalModuleImportWithExport_require");
 export import im_public_mu_private = require("privacyTopLevelAmbientExternalModuleImportWithExport_require1");
@@ -38,18 +36,16 @@ export import im_public_mi_public = require("m");
 export import im_public_mu_public = require("m2");
 
 // Usage of privacy error imports
-var privateUse_im_public_mi_private = new im_public_mi_private.c_public();
-export var publicUse_im_public_mi_private = new im_public_mi_private.c_public();
-var privateUse_im_public_mu_private = new im_public_mu_private.c_public();
-export var publicUse_im_public_mu_private = new im_public_mu_private.c_public();
-var privateUse_im_public_mi_public = new im_public_mi_public.c_private();
-export var publicUse_im_public_mi_public = new im_public_mi_public.c_private();
-var privateUse_im_public_mi_public = new im_public_mi_public.c_private();
-export var publicUse_im_public_mi_public = new im_public_mi_public.c_private();
+var privateUse_im_public_mi_private = new im_public_mi_private.c_private();
+export var publicUse_im_public_mi_private = new im_public_mi_private.c_private();
+var privateUse_im_public_mu_private = new im_public_mu_private.c_private();
+export var publicUse_im_public_mu_private = new im_public_mu_private.c_private();
+var privateUse_im_public_mi_public = new im_public_mi_public.c_public();
+export var publicUse_im_public_mi_public = new im_public_mi_public.c_public();
+var privateUse_im_public_mi_public = new im_public_mi_public.c_public();
+export var publicUse_im_public_mi_public = new im_public_mi_public.c_public();
 
 
-//// [privacyTopLevelAmbientExternalModuleImportWithExport_require2.js]
-//// [privacyTopLevelAmbientExternalModuleImportWithExport_require3.js]
 //// [privacyTopLevelAmbientExternalModuleImportWithExport_require.js]
 // Public elements
 var c_public = (function () {
@@ -72,46 +68,12 @@ exports.c_public = c_public;
 exports.im_public_mi_private = require("privacyTopLevelAmbientExternalModuleImportWithExport_require");
 exports.im_public_mu_private = require("privacyTopLevelAmbientExternalModuleImportWithExport_require1");
 exports.im_public_mi_public = require("m");
-exports.im_public_mu_public = require("m2");
 // Usage of privacy error imports
-var privateUse_im_public_mi_private = new exports.im_public_mi_private.c_public();
-exports.publicUse_im_public_mi_private = new exports.im_public_mi_private.c_public();
-var privateUse_im_public_mu_private = new exports.im_public_mu_private.c_public();
-exports.publicUse_im_public_mu_private = new exports.im_public_mu_private.c_public();
-var privateUse_im_public_mi_public = new exports.im_public_mi_public.c_private();
-exports.publicUse_im_public_mi_public = new exports.im_public_mi_public.c_private();
-var privateUse_im_public_mi_public = new exports.im_public_mi_public.c_private();
-exports.publicUse_im_public_mi_public = new exports.im_public_mi_public.c_private();
-
-
-//// [privacyTopLevelAmbientExternalModuleImportWithExport_require2.d.ts]
-declare module 'm' {
-    class c_private {
-        baz: string;
-    }
-}
-//// [privacyTopLevelAmbientExternalModuleImportWithExport_require3.d.ts]
-declare module 'm2' {
-    class c_private {
-        bing: string;
-    }
-}
-//// [privacyTopLevelAmbientExternalModuleImportWithExport_require.d.ts]
-export declare class c_public {
-    foo: string;
-}
-//// [privacyTopLevelAmbientExternalModuleImportWithExport_require1.d.ts]
-export declare class c_public {
-    bar: string;
-}
-//// [privacyTopLevelAmbientExternalModuleImportWithExport_core.d.ts]
-/// <reference path='privacyTopLevelAmbientExternalModuleImportWithExport_require2.d.ts' />
-/// <reference path='privacyTopLevelAmbientExternalModuleImportWithExport_require3.d.ts' />
-export import im_public_mi_private = require("privacyTopLevelAmbientExternalModuleImportWithExport_require");
-export import im_public_mu_private = require("privacyTopLevelAmbientExternalModuleImportWithExport_require1");
-export import im_public_mi_public = require("m");
-export import im_public_mu_public = require("m2");
-export declare var publicUse_im_public_mi_private: im_public_mi_private.c_public;
-export declare var publicUse_im_public_mu_private: im_public_mu_private.c_public;
-export declare var publicUse_im_public_mi_public: im_public_mi_public.c_private;
-export declare var publicUse_im_public_mi_public: im_public_mi_public.c_private;
+var privateUse_im_public_mi_private = new exports.im_public_mi_private.c_private();
+exports.publicUse_im_public_mi_private = new exports.im_public_mi_private.c_private();
+var privateUse_im_public_mu_private = new exports.im_public_mu_private.c_private();
+exports.publicUse_im_public_mu_private = new exports.im_public_mu_private.c_private();
+var privateUse_im_public_mi_public = new exports.im_public_mi_public.c_public();
+exports.publicUse_im_public_mi_public = new exports.im_public_mi_public.c_public();
+var privateUse_im_public_mi_public = new exports.im_public_mi_public.c_public();
+exports.publicUse_im_public_mi_public = new exports.im_public_mi_public.c_public();
diff --git a/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithExport.types b/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithExport.types
deleted file mode 100644
index bb52127b6a8..00000000000
--- a/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithExport.types
+++ /dev/null
@@ -1,113 +0,0 @@
-=== tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithExport_core.ts ===
-///<reference path='privacyTopLevelAmbientExternalModuleImportWithExport_require2.ts'/>
-///<reference path='privacyTopLevelAmbientExternalModuleImportWithExport_require3.ts'/>
-// Privacy errors - importing private elements
-export import im_public_mi_private = require("privacyTopLevelAmbientExternalModuleImportWithExport_require");
->im_public_mi_private : typeof "tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithExport_require"
-
-export import im_public_mu_private = require("privacyTopLevelAmbientExternalModuleImportWithExport_require1");
->im_public_mu_private : typeof "tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithExport_require1"
-
-export import im_public_mi_public = require("m");
->im_public_mi_public : typeof 'm'
-
-export import im_public_mu_public = require("m2");
->im_public_mu_public : typeof 'm2'
-
-// Usage of privacy error imports
-var privateUse_im_public_mi_private = new im_public_mi_private.c_public();
->privateUse_im_public_mi_private : c_public
->new im_public_mi_private.c_public() : c_public
->im_public_mi_private.c_public : typeof c_public
->im_public_mi_private : typeof "tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithExport_require"
->c_public : typeof c_public
-
-export var publicUse_im_public_mi_private = new im_public_mi_private.c_public();
->publicUse_im_public_mi_private : c_public
->new im_public_mi_private.c_public() : c_public
->im_public_mi_private.c_public : typeof c_public
->im_public_mi_private : typeof "tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithExport_require"
->c_public : typeof c_public
-
-var privateUse_im_public_mu_private = new im_public_mu_private.c_public();
->privateUse_im_public_mu_private : c_public
->new im_public_mu_private.c_public() : c_public
->im_public_mu_private.c_public : typeof c_public
->im_public_mu_private : typeof "tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithExport_require1"
->c_public : typeof c_public
-
-export var publicUse_im_public_mu_private = new im_public_mu_private.c_public();
->publicUse_im_public_mu_private : c_public
->new im_public_mu_private.c_public() : c_public
->im_public_mu_private.c_public : typeof c_public
->im_public_mu_private : typeof "tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithExport_require1"
->c_public : typeof c_public
-
-var privateUse_im_public_mi_public = new im_public_mi_public.c_private();
->privateUse_im_public_mi_public : c_private
->new im_public_mi_public.c_private() : c_private
->im_public_mi_public.c_private : typeof c_private
->im_public_mi_public : typeof 'm'
->c_private : typeof c_private
-
-export var publicUse_im_public_mi_public = new im_public_mi_public.c_private();
->publicUse_im_public_mi_public : c_private
->new im_public_mi_public.c_private() : c_private
->im_public_mi_public.c_private : typeof c_private
->im_public_mi_public : typeof 'm'
->c_private : typeof c_private
-
-var privateUse_im_public_mi_public = new im_public_mi_public.c_private();
->privateUse_im_public_mi_public : c_private
->new im_public_mi_public.c_private() : c_private
->im_public_mi_public.c_private : typeof c_private
->im_public_mi_public : typeof 'm'
->c_private : typeof c_private
-
-export var publicUse_im_public_mi_public = new im_public_mi_public.c_private();
->publicUse_im_public_mi_public : c_private
->new im_public_mi_public.c_private() : c_private
->im_public_mi_public.c_private : typeof c_private
->im_public_mi_public : typeof 'm'
->c_private : typeof c_private
-
-=== tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithExport_require.ts ===
-// Public elements
-export class c_public {
->c_public : c_public
-
-    foo: string;
->foo : string
-}
-
-=== tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithExport_require1.ts ===
-export class c_public {
->c_public : c_public
-
-    bar: string;
->bar : string
-}
-
-=== tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithExport_require2.ts ===
-// private elements
-// Export - Error ambient modules allowed only in global
-declare module 'm' {
-    export class c_private {
->c_private : c_private
-
-        baz: string;
->baz : string
-    }
-}
-
-
-=== tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithExport_require3.ts ===
-declare module 'm2' {
-    export class c_private {
->c_private : c_private
-
-        bing: string;
->bing : string
-    }
-}
-
diff --git a/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithoutExport.errors.txt b/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithoutExport.errors.txt
new file mode 100644
index 00000000000..359ee29c2d7
--- /dev/null
+++ b/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithoutExport.errors.txt
@@ -0,0 +1,49 @@
+==== tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithoutExport_core.ts (2 errors) ====
+    // Privacy errors - importing private elements
+    import im_private_mi_private = require("m");
+                                           ~~~
+!!! Cannot find external module 'm'.
+    import im_private_mu_private = require("m2");
+                                           ~~~~
+!!! Cannot find external module 'm2'.
+    import im_private_mi_public = require("privacyTopLevelAmbientExternalModuleImportWithoutExport_require");
+    import im_private_mu_public = require("privacyTopLevelAmbientExternalModuleImportWithoutExport_require1");
+    
+    // Usage of privacy error imports
+    var privateUse_im_private_mi_private = new im_private_mi_private.c_private();
+    export var publicUse_im_private_mi_private = new im_private_mi_private.c_private();
+    var privateUse_im_private_mu_private = new im_private_mu_private.c_private();
+    export var publicUse_im_private_mu_private = new im_private_mu_private.c_private();
+    var privateUse_im_private_mi_public = new im_private_mi_public.c_public();
+    export var publicUse_im_private_mi_public = new im_private_mi_public.c_public();
+    var privateUse_im_private_mi_public = new im_private_mi_public.c_public();
+    export var publicUse_im_private_mi_public = new im_private_mi_public.c_public();
+    
+==== tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithoutExport_require.ts (0 errors) ====
+    
+    // Public elements
+    export class c_public {
+        foo: string;
+    }
+    
+==== tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithoutExport_require1.ts (0 errors) ====
+    export class c_public {
+        bar: string;
+    }
+    
+==== tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithoutExport_require2.ts (0 errors) ====
+    // private elements
+    // Export - Error ambient modules allowed only in global
+    declare module 'm' {
+        export class c_private {
+            baz: string
+        }   
+    }
+    
+==== tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithoutExport_require3.ts (0 errors) ====
+    declare module 'm2' {
+        export class c_private {
+            bing: string;
+        }
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithoutExport.js b/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithoutExport.js
index de0835bb6e3..948a64fc136 100644
--- a/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithoutExport.js
+++ b/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithoutExport.js
@@ -29,8 +29,6 @@ declare module 'm2' {
 }
 
 //// [privacyTopLevelAmbientExternalModuleImportWithoutExport_core.ts]
-///<reference path='privacyTopLevelAmbientExternalModuleImportWithoutExport_require2.ts'/>
-///<reference path='privacyTopLevelAmbientExternalModuleImportWithoutExport_require3.ts'/>
 // Privacy errors - importing private elements
 import im_private_mi_private = require("m");
 import im_private_mu_private = require("m2");
@@ -48,8 +46,6 @@ var privateUse_im_private_mi_public = new im_private_mi_public.c_public();
 export var publicUse_im_private_mi_public = new im_private_mi_public.c_public();
 
 
-//// [privacyTopLevelAmbientExternalModuleImportWithoutExport_require2.js]
-//// [privacyTopLevelAmbientExternalModuleImportWithoutExport_require3.js]
 //// [privacyTopLevelAmbientExternalModuleImportWithoutExport_require.js]
 define(["require", "exports"], function (require, exports) {
     // Public elements
@@ -81,35 +77,3 @@ define(["require", "exports", "m", "m2", "privacyTopLevelAmbientExternalModuleIm
     var privateUse_im_private_mi_public = new im_private_mi_public.c_public();
     exports.publicUse_im_private_mi_public = new im_private_mi_public.c_public();
 });
-
-
-//// [privacyTopLevelAmbientExternalModuleImportWithoutExport_require2.d.ts]
-declare module 'm' {
-    class c_private {
-        baz: string;
-    }
-}
-//// [privacyTopLevelAmbientExternalModuleImportWithoutExport_require3.d.ts]
-declare module 'm2' {
-    class c_private {
-        bing: string;
-    }
-}
-//// [privacyTopLevelAmbientExternalModuleImportWithoutExport_require.d.ts]
-export declare class c_public {
-    foo: string;
-}
-//// [privacyTopLevelAmbientExternalModuleImportWithoutExport_require1.d.ts]
-export declare class c_public {
-    bar: string;
-}
-//// [privacyTopLevelAmbientExternalModuleImportWithoutExport_core.d.ts]
-/// <reference path='privacyTopLevelAmbientExternalModuleImportWithoutExport_require2.d.ts' />
-/// <reference path='privacyTopLevelAmbientExternalModuleImportWithoutExport_require3.d.ts' />
-import im_private_mi_private = require("m");
-import im_private_mu_private = require("m2");
-import im_private_mi_public = require("privacyTopLevelAmbientExternalModuleImportWithoutExport_require");
-export declare var publicUse_im_private_mi_private: im_private_mi_private.c_private;
-export declare var publicUse_im_private_mu_private: im_private_mu_private.c_private;
-export declare var publicUse_im_private_mi_public: im_private_mi_public.c_public;
-export declare var publicUse_im_private_mi_public: im_private_mi_public.c_public;
diff --git a/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithoutExport.types b/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithoutExport.types
deleted file mode 100644
index 3825f7e2a3f..00000000000
--- a/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithoutExport.types
+++ /dev/null
@@ -1,113 +0,0 @@
-=== tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithoutExport_core.ts ===
-///<reference path='privacyTopLevelAmbientExternalModuleImportWithoutExport_require2.ts'/>
-///<reference path='privacyTopLevelAmbientExternalModuleImportWithoutExport_require3.ts'/>
-// Privacy errors - importing private elements
-import im_private_mi_private = require("m");
->im_private_mi_private : typeof 'm'
-
-import im_private_mu_private = require("m2");
->im_private_mu_private : typeof 'm2'
-
-import im_private_mi_public = require("privacyTopLevelAmbientExternalModuleImportWithoutExport_require");
->im_private_mi_public : typeof "tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithoutExport_require"
-
-import im_private_mu_public = require("privacyTopLevelAmbientExternalModuleImportWithoutExport_require1");
->im_private_mu_public : typeof "tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithoutExport_require1"
-
-// Usage of privacy error imports
-var privateUse_im_private_mi_private = new im_private_mi_private.c_private();
->privateUse_im_private_mi_private : c_private
->new im_private_mi_private.c_private() : c_private
->im_private_mi_private.c_private : typeof c_private
->im_private_mi_private : typeof 'm'
->c_private : typeof c_private
-
-export var publicUse_im_private_mi_private = new im_private_mi_private.c_private();
->publicUse_im_private_mi_private : c_private
->new im_private_mi_private.c_private() : c_private
->im_private_mi_private.c_private : typeof c_private
->im_private_mi_private : typeof 'm'
->c_private : typeof c_private
-
-var privateUse_im_private_mu_private = new im_private_mu_private.c_private();
->privateUse_im_private_mu_private : c_private
->new im_private_mu_private.c_private() : c_private
->im_private_mu_private.c_private : typeof c_private
->im_private_mu_private : typeof 'm2'
->c_private : typeof c_private
-
-export var publicUse_im_private_mu_private = new im_private_mu_private.c_private();
->publicUse_im_private_mu_private : c_private
->new im_private_mu_private.c_private() : c_private
->im_private_mu_private.c_private : typeof c_private
->im_private_mu_private : typeof 'm2'
->c_private : typeof c_private
-
-var privateUse_im_private_mi_public = new im_private_mi_public.c_public();
->privateUse_im_private_mi_public : c_public
->new im_private_mi_public.c_public() : c_public
->im_private_mi_public.c_public : typeof c_public
->im_private_mi_public : typeof "tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithoutExport_require"
->c_public : typeof c_public
-
-export var publicUse_im_private_mi_public = new im_private_mi_public.c_public();
->publicUse_im_private_mi_public : c_public
->new im_private_mi_public.c_public() : c_public
->im_private_mi_public.c_public : typeof c_public
->im_private_mi_public : typeof "tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithoutExport_require"
->c_public : typeof c_public
-
-var privateUse_im_private_mi_public = new im_private_mi_public.c_public();
->privateUse_im_private_mi_public : c_public
->new im_private_mi_public.c_public() : c_public
->im_private_mi_public.c_public : typeof c_public
->im_private_mi_public : typeof "tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithoutExport_require"
->c_public : typeof c_public
-
-export var publicUse_im_private_mi_public = new im_private_mi_public.c_public();
->publicUse_im_private_mi_public : c_public
->new im_private_mi_public.c_public() : c_public
->im_private_mi_public.c_public : typeof c_public
->im_private_mi_public : typeof "tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithoutExport_require"
->c_public : typeof c_public
-
-=== tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithoutExport_require.ts ===
-
-// Public elements
-export class c_public {
->c_public : c_public
-
-    foo: string;
->foo : string
-}
-
-=== tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithoutExport_require1.ts ===
-export class c_public {
->c_public : c_public
-
-    bar: string;
->bar : string
-}
-
-=== tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithoutExport_require2.ts ===
-// private elements
-// Export - Error ambient modules allowed only in global
-declare module 'm' {
-    export class c_private {
->c_private : c_private
-
-        baz: string
->baz : string
-    }   
-}
-
-=== tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithoutExport_require3.ts ===
-declare module 'm2' {
-    export class c_private {
->c_private : c_private
-
-        bing: string;
->bing : string
-    }
-}
-
diff --git a/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithExport.errors.txt b/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithExport.errors.txt
deleted file mode 100644
index 899832db215..00000000000
--- a/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithExport.errors.txt
+++ /dev/null
@@ -1,114 +0,0 @@
-==== tests/cases/compiler/privacyTopLevelInternalReferenceImportWithExport.ts (7 errors) ====
-    // private elements
-    module m_private {
-        export class c_private {
-        }
-        export enum e_private {
-            Happy,
-            Grumpy
-        }
-        export function f_private() {
-            return new c_private();
-        }
-        export var v_private = new c_private();
-        export interface i_private {
-        }
-        export module mi_private {
-            export class c {
-            }
-        }
-        export module mu_private {
-            export interface i {
-            }
-        }
-    }
-    
-    // Public elements
-    export module m_public {
-        export class c_public {
-        }
-        export enum e_public {
-            Happy,
-            Grumpy
-        }
-        export function f_public() {
-            return new c_public();
-        }
-        export var v_public = 10;
-        export interface i_public {
-        }
-        export module mi_public {
-            export class c {
-            }
-        }
-        export module mu_public {
-            export interface i {
-            }
-        }
-    }
-    
-    // Privacy errors - importing private elements
-    export import im_public_c_private = m_private.c_private;
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Import declaration 'im_public_c_private' is using private name 'm_private'.
-    export import im_public_e_private = m_private.e_private;
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Import declaration 'im_public_e_private' is using private name 'm_private'.
-    export import im_public_f_private = m_private.f_private;
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Import declaration 'im_public_f_private' is using private name 'm_private'.
-    export import im_public_v_private = m_private.v_private;
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Import declaration 'im_public_v_private' is using private name 'm_private'.
-    export import im_public_i_private = m_private.i_private;
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Import declaration 'im_public_i_private' is using private name 'm_private'.
-    export import im_public_mi_private = m_private.mi_private;
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Import declaration 'im_public_mi_private' is using private name 'm_private'.
-    export import im_public_mu_private = m_private.mu_private;
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Import declaration 'im_public_mu_private' is using private name 'm_private'.
-    
-    // Usage of privacy error imports
-    var privateUse_im_public_c_private = new im_public_c_private();
-    export var publicUse_im_public_c_private = new im_public_c_private();
-    var privateUse_im_public_e_private = im_public_e_private.Happy;
-    export var publicUse_im_public_e_private = im_public_e_private.Grumpy;
-    var privateUse_im_public_f_private = im_public_f_private();
-    export var publicUse_im_public_f_private = im_public_f_private();
-    var privateUse_im_public_v_private = im_public_v_private;
-    export var publicUse_im_public_v_private = im_public_v_private;
-    var privateUse_im_public_i_private: im_public_i_private;
-    export var publicUse_im_public_i_private: im_public_i_private;
-    var privateUse_im_public_mi_private = new im_public_mi_private.c();
-    export var publicUse_im_public_mi_private = new im_public_mi_private.c();
-    var privateUse_im_public_mu_private: im_public_mu_private.i;
-    export var publicUse_im_public_mu_private: im_public_mu_private.i;
-    
-    
-    // No Privacy errors - importing public elements
-    export import im_public_c_public = m_public.c_public;
-    export import im_public_e_public = m_public.e_public;
-    export import im_public_f_public = m_public.f_public;
-    export import im_public_v_public = m_public.v_public;
-    export import im_public_i_public = m_public.i_public;
-    export import im_public_mi_public = m_public.mi_public;
-    export import im_public_mu_public = m_public.mu_public;
-    
-    // Usage of above decls
-    var privateUse_im_public_c_public = new im_public_c_public();
-    export var publicUse_im_public_c_public = new im_public_c_public();
-    var privateUse_im_public_e_public = im_public_e_public.Happy;
-    export var publicUse_im_public_e_public = im_public_e_public.Grumpy;
-    var privateUse_im_public_f_public = im_public_f_public();
-    export var publicUse_im_public_f_public = im_public_f_public();
-    var privateUse_im_public_v_public = im_public_v_public;
-    export var publicUse_im_public_v_public = im_public_v_public;
-    var privateUse_im_public_i_public: im_public_i_public;
-    export var publicUse_im_public_i_public: im_public_i_public;
-    var privateUse_im_public_mi_public = new im_public_mi_public.c();
-    export var publicUse_im_public_mi_public = new im_public_mi_public.c();
-    var privateUse_im_public_mu_public: im_public_mu_public.i;
-    export var publicUse_im_public_mu_public: im_public_mu_public.i;
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithExport.types b/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithExport.types
new file mode 100644
index 00000000000..338d06442a0
--- /dev/null
+++ b/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithExport.types
@@ -0,0 +1,312 @@
+=== tests/cases/compiler/privacyTopLevelInternalReferenceImportWithExport.ts ===
+// private elements
+module m_private {
+>m_private : typeof m_private
+
+    export class c_private {
+>c_private : c_private
+    }
+    export enum e_private {
+>e_private : e_private
+
+        Happy,
+>Happy : e_private
+
+        Grumpy
+>Grumpy : e_private
+    }
+    export function f_private() {
+>f_private : typeof f_private
+
+        return new c_private();
+>new c_private() : c_private
+>c_private : typeof c_private
+    }
+    export var v_private = new c_private();
+>v_private : c_private
+>new c_private() : c_private
+>c_private : typeof c_private
+
+    export interface i_private {
+>i_private : i_private
+    }
+    export module mi_private {
+>mi_private : typeof mi_private
+
+        export class c {
+>c : c
+        }
+    }
+    export module mu_private {
+>mu_private : mu_private
+
+        export interface i {
+>i : i
+        }
+    }
+}
+
+// Public elements
+export module m_public {
+>m_public : typeof m_public
+
+    export class c_public {
+>c_public : c_public
+    }
+    export enum e_public {
+>e_public : e_public
+
+        Happy,
+>Happy : e_public
+
+        Grumpy
+>Grumpy : e_public
+    }
+    export function f_public() {
+>f_public : typeof f_public
+
+        return new c_public();
+>new c_public() : c_public
+>c_public : typeof c_public
+    }
+    export var v_public = 10;
+>v_public : number
+
+    export interface i_public {
+>i_public : i_public
+    }
+    export module mi_public {
+>mi_public : typeof mi_public
+
+        export class c {
+>c : c
+        }
+    }
+    export module mu_public {
+>mu_public : mu_public
+
+        export interface i {
+>i : i
+        }
+    }
+}
+
+// Privacy errors - importing private elements
+export import im_public_c_private = m_private.c_private;
+>im_public_c_private : typeof c_private
+>m_private : typeof m_private
+>c_private : c_private
+
+export import im_public_e_private = m_private.e_private;
+>im_public_e_private : typeof e_private
+>m_private : typeof m_private
+>e_private : e_private
+
+export import im_public_f_private = m_private.f_private;
+>im_public_f_private : typeof f_private
+>m_private : typeof m_private
+>f_private : typeof f_private
+
+export import im_public_v_private = m_private.v_private;
+>im_public_v_private : c_private
+>m_private : typeof m_private
+>v_private : c_private
+
+export import im_public_i_private = m_private.i_private;
+>im_public_i_private : im_public_i_private
+>m_private : typeof m_private
+>i_private : i_private
+
+export import im_public_mi_private = m_private.mi_private;
+>im_public_mi_private : typeof mi_private
+>m_private : typeof m_private
+>mi_private : typeof mi_private
+
+export import im_public_mu_private = m_private.mu_private;
+>im_public_mu_private : im_public_mu_private
+>m_private : typeof m_private
+>mu_private : mu_private
+
+// Usage of privacy error imports
+var privateUse_im_public_c_private = new im_public_c_private();
+>privateUse_im_public_c_private : c_private
+>new im_public_c_private() : c_private
+>im_public_c_private : typeof c_private
+
+export var publicUse_im_public_c_private = new im_public_c_private();
+>publicUse_im_public_c_private : c_private
+>new im_public_c_private() : c_private
+>im_public_c_private : typeof c_private
+
+var privateUse_im_public_e_private = im_public_e_private.Happy;
+>privateUse_im_public_e_private : e_private
+>im_public_e_private.Happy : e_private
+>im_public_e_private : typeof e_private
+>Happy : e_private
+
+export var publicUse_im_public_e_private = im_public_e_private.Grumpy;
+>publicUse_im_public_e_private : e_private
+>im_public_e_private.Grumpy : e_private
+>im_public_e_private : typeof e_private
+>Grumpy : e_private
+
+var privateUse_im_public_f_private = im_public_f_private();
+>privateUse_im_public_f_private : c_private
+>im_public_f_private() : c_private
+>im_public_f_private : typeof f_private
+
+export var publicUse_im_public_f_private = im_public_f_private();
+>publicUse_im_public_f_private : c_private
+>im_public_f_private() : c_private
+>im_public_f_private : typeof f_private
+
+var privateUse_im_public_v_private = im_public_v_private;
+>privateUse_im_public_v_private : c_private
+>im_public_v_private : c_private
+
+export var publicUse_im_public_v_private = im_public_v_private;
+>publicUse_im_public_v_private : c_private
+>im_public_v_private : c_private
+
+var privateUse_im_public_i_private: im_public_i_private;
+>privateUse_im_public_i_private : i_private
+>im_public_i_private : i_private
+
+export var publicUse_im_public_i_private: im_public_i_private;
+>publicUse_im_public_i_private : i_private
+>im_public_i_private : i_private
+
+var privateUse_im_public_mi_private = new im_public_mi_private.c();
+>privateUse_im_public_mi_private : c
+>new im_public_mi_private.c() : c
+>im_public_mi_private.c : typeof c
+>im_public_mi_private : typeof mi_private
+>c : typeof c
+
+export var publicUse_im_public_mi_private = new im_public_mi_private.c();
+>publicUse_im_public_mi_private : c
+>new im_public_mi_private.c() : c
+>im_public_mi_private.c : typeof c
+>im_public_mi_private : typeof mi_private
+>c : typeof c
+
+var privateUse_im_public_mu_private: im_public_mu_private.i;
+>privateUse_im_public_mu_private : i
+>im_public_mu_private : im_public_mu_private
+>i : i
+
+export var publicUse_im_public_mu_private: im_public_mu_private.i;
+>publicUse_im_public_mu_private : i
+>im_public_mu_private : im_public_mu_private
+>i : i
+
+
+// No Privacy errors - importing public elements
+export import im_public_c_public = m_public.c_public;
+>im_public_c_public : typeof c_public
+>m_public : typeof m_public
+>c_public : c_public
+
+export import im_public_e_public = m_public.e_public;
+>im_public_e_public : typeof e_public
+>m_public : typeof m_public
+>e_public : e_public
+
+export import im_public_f_public = m_public.f_public;
+>im_public_f_public : typeof f_public
+>m_public : typeof m_public
+>f_public : typeof f_public
+
+export import im_public_v_public = m_public.v_public;
+>im_public_v_public : number
+>m_public : typeof m_public
+>v_public : number
+
+export import im_public_i_public = m_public.i_public;
+>im_public_i_public : im_public_i_public
+>m_public : typeof m_public
+>i_public : i_public
+
+export import im_public_mi_public = m_public.mi_public;
+>im_public_mi_public : typeof mi_public
+>m_public : typeof m_public
+>mi_public : typeof mi_public
+
+export import im_public_mu_public = m_public.mu_public;
+>im_public_mu_public : im_public_mu_public
+>m_public : typeof m_public
+>mu_public : mu_public
+
+// Usage of above decls
+var privateUse_im_public_c_public = new im_public_c_public();
+>privateUse_im_public_c_public : c_public
+>new im_public_c_public() : c_public
+>im_public_c_public : typeof c_public
+
+export var publicUse_im_public_c_public = new im_public_c_public();
+>publicUse_im_public_c_public : c_public
+>new im_public_c_public() : c_public
+>im_public_c_public : typeof c_public
+
+var privateUse_im_public_e_public = im_public_e_public.Happy;
+>privateUse_im_public_e_public : e_public
+>im_public_e_public.Happy : e_public
+>im_public_e_public : typeof e_public
+>Happy : e_public
+
+export var publicUse_im_public_e_public = im_public_e_public.Grumpy;
+>publicUse_im_public_e_public : e_public
+>im_public_e_public.Grumpy : e_public
+>im_public_e_public : typeof e_public
+>Grumpy : e_public
+
+var privateUse_im_public_f_public = im_public_f_public();
+>privateUse_im_public_f_public : c_public
+>im_public_f_public() : c_public
+>im_public_f_public : typeof f_public
+
+export var publicUse_im_public_f_public = im_public_f_public();
+>publicUse_im_public_f_public : c_public
+>im_public_f_public() : c_public
+>im_public_f_public : typeof f_public
+
+var privateUse_im_public_v_public = im_public_v_public;
+>privateUse_im_public_v_public : number
+>im_public_v_public : number
+
+export var publicUse_im_public_v_public = im_public_v_public;
+>publicUse_im_public_v_public : number
+>im_public_v_public : number
+
+var privateUse_im_public_i_public: im_public_i_public;
+>privateUse_im_public_i_public : i_public
+>im_public_i_public : i_public
+
+export var publicUse_im_public_i_public: im_public_i_public;
+>publicUse_im_public_i_public : i_public
+>im_public_i_public : i_public
+
+var privateUse_im_public_mi_public = new im_public_mi_public.c();
+>privateUse_im_public_mi_public : c
+>new im_public_mi_public.c() : c
+>im_public_mi_public.c : typeof c
+>im_public_mi_public : typeof mi_public
+>c : typeof c
+
+export var publicUse_im_public_mi_public = new im_public_mi_public.c();
+>publicUse_im_public_mi_public : c
+>new im_public_mi_public.c() : c
+>im_public_mi_public.c : typeof c
+>im_public_mi_public : typeof mi_public
+>c : typeof c
+
+var privateUse_im_public_mu_public: im_public_mu_public.i;
+>privateUse_im_public_mu_public : i
+>im_public_mu_public : im_public_mu_public
+>i : i
+
+export var publicUse_im_public_mu_public: im_public_mu_public.i;
+>publicUse_im_public_mu_public : i
+>im_public_mu_public : im_public_mu_public
+>i : i
+
diff --git a/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.errors.txt b/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.errors.txt
deleted file mode 100644
index b9791738e24..00000000000
--- a/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.errors.txt
+++ /dev/null
@@ -1,111 +0,0 @@
-==== tests/cases/compiler/privacyTopLevelInternalReferenceImportWithoutExport.ts (5 errors) ====
-    
-    // private elements
-    module m_private {
-        export class c_private {
-        }
-        export enum e_private {
-            Happy,
-            Grumpy
-        }
-        export function f_private() {
-            return new c_private();
-        }
-        export var v_private = new c_private();
-        export interface i_private {
-        }
-        export module mi_private {
-            export class c {
-            }
-        }
-        export module mu_private {
-            export interface i {
-            }
-        }
-    }
-    
-    // Public elements
-    export module m_public {
-        export class c_public {
-        }
-        export enum e_public {
-            Happy,
-            Grumpy
-        }
-        export function f_public() {
-            return new c_public();
-        }
-        export var v_public = 10;
-        export interface i_public {
-        }
-        export module mi_public {
-            export class c {
-            }
-        }
-        export module mu_public {
-            export interface i {
-            }
-        }
-    }
-    
-    // No Privacy errors - importing private elements
-    import im_private_c_private = m_private.c_private;
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Import declaration 'im_private_c_private' is using private name 'm_private'.
-    import im_private_e_private = m_private.e_private;
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Import declaration 'im_private_e_private' is using private name 'm_private'.
-    import im_private_f_private = m_private.f_private;
-    import im_private_v_private = m_private.v_private;
-    import im_private_i_private = m_private.i_private;
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Import declaration 'im_private_i_private' is using private name 'm_private'.
-    import im_private_mi_private = m_private.mi_private;
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Import declaration 'im_private_mi_private' is using private name 'm_private'.
-    import im_private_mu_private = m_private.mu_private;
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Import declaration 'im_private_mu_private' is using private name 'm_private'.
-    
-    // Usage of above decls
-    var privateUse_im_private_c_private = new im_private_c_private();
-    export var publicUse_im_private_c_private = new im_private_c_private();
-    var privateUse_im_private_e_private = im_private_e_private.Happy;
-    export var publicUse_im_private_e_private = im_private_e_private.Grumpy;
-    var privateUse_im_private_f_private = im_private_f_private();
-    export var publicUse_im_private_f_private = im_private_f_private();
-    var privateUse_im_private_v_private = im_private_v_private;
-    export var publicUse_im_private_v_private = im_private_v_private;
-    var privateUse_im_private_i_private: im_private_i_private;
-    export var publicUse_im_private_i_private: im_private_i_private;
-    var privateUse_im_private_mi_private = new im_private_mi_private.c();
-    export var publicUse_im_private_mi_private = new im_private_mi_private.c();
-    var privateUse_im_private_mu_private: im_private_mu_private.i;
-    export var publicUse_im_private_mu_private: im_private_mu_private.i;
-    
-    
-    // No Privacy errors - importing public elements
-    import im_private_c_public = m_public.c_public;
-    import im_private_e_public = m_public.e_public;
-    import im_private_f_public = m_public.f_public;
-    import im_private_v_public = m_public.v_public;
-    import im_private_i_public = m_public.i_public;
-    import im_private_mi_public = m_public.mi_public;
-    import im_private_mu_public = m_public.mu_public;
-    
-    // Usage of above decls
-    var privateUse_im_private_c_public = new im_private_c_public();
-    export var publicUse_im_private_c_public = new im_private_c_public();
-    var privateUse_im_private_e_public = im_private_e_public.Happy;
-    export var publicUse_im_private_e_public = im_private_e_public.Grumpy;
-    var privateUse_im_private_f_public = im_private_f_public();
-    export var publicUse_im_private_f_public = im_private_f_public();
-    var privateUse_im_private_v_public = im_private_v_public;
-    export var publicUse_im_private_v_public = im_private_v_public;
-    var privateUse_im_private_i_public: im_private_i_public;
-    export var publicUse_im_private_i_public: im_private_i_public;
-    var privateUse_im_private_mi_public = new im_private_mi_public.c();
-    export var publicUse_im_private_mi_public = new im_private_mi_public.c();
-    var privateUse_im_private_mu_public: im_private_mu_public.i;
-    export var publicUse_im_private_mu_public: im_private_mu_public.i;
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.js b/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.js
index acc9f6e438e..c5547ac58cb 100644
--- a/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.js
+++ b/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.js
@@ -1,5 +1,4 @@
 //// [privacyTopLevelInternalReferenceImportWithoutExport.ts]
-
 // private elements
 module m_private {
     export class c_private {
diff --git a/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.types b/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.types
new file mode 100644
index 00000000000..e5cd624d5ae
--- /dev/null
+++ b/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.types
@@ -0,0 +1,312 @@
+=== tests/cases/compiler/privacyTopLevelInternalReferenceImportWithoutExport.ts ===
+// private elements
+module m_private {
+>m_private : typeof m_private
+
+    export class c_private {
+>c_private : c_private
+    }
+    export enum e_private {
+>e_private : e_private
+
+        Happy,
+>Happy : e_private
+
+        Grumpy
+>Grumpy : e_private
+    }
+    export function f_private() {
+>f_private : typeof f_private
+
+        return new c_private();
+>new c_private() : c_private
+>c_private : typeof c_private
+    }
+    export var v_private = new c_private();
+>v_private : c_private
+>new c_private() : c_private
+>c_private : typeof c_private
+
+    export interface i_private {
+>i_private : i_private
+    }
+    export module mi_private {
+>mi_private : typeof mi_private
+
+        export class c {
+>c : c
+        }
+    }
+    export module mu_private {
+>mu_private : mu_private
+
+        export interface i {
+>i : i
+        }
+    }
+}
+
+// Public elements
+export module m_public {
+>m_public : typeof m_public
+
+    export class c_public {
+>c_public : c_public
+    }
+    export enum e_public {
+>e_public : e_public
+
+        Happy,
+>Happy : e_public
+
+        Grumpy
+>Grumpy : e_public
+    }
+    export function f_public() {
+>f_public : typeof f_public
+
+        return new c_public();
+>new c_public() : c_public
+>c_public : typeof c_public
+    }
+    export var v_public = 10;
+>v_public : number
+
+    export interface i_public {
+>i_public : i_public
+    }
+    export module mi_public {
+>mi_public : typeof mi_public
+
+        export class c {
+>c : c
+        }
+    }
+    export module mu_public {
+>mu_public : mu_public
+
+        export interface i {
+>i : i
+        }
+    }
+}
+
+// No Privacy errors - importing private elements
+import im_private_c_private = m_private.c_private;
+>im_private_c_private : typeof c_private
+>m_private : typeof m_private
+>c_private : c_private
+
+import im_private_e_private = m_private.e_private;
+>im_private_e_private : typeof e_private
+>m_private : typeof m_private
+>e_private : e_private
+
+import im_private_f_private = m_private.f_private;
+>im_private_f_private : typeof f_private
+>m_private : typeof m_private
+>f_private : typeof f_private
+
+import im_private_v_private = m_private.v_private;
+>im_private_v_private : c_private
+>m_private : typeof m_private
+>v_private : c_private
+
+import im_private_i_private = m_private.i_private;
+>im_private_i_private : im_private_i_private
+>m_private : typeof m_private
+>i_private : i_private
+
+import im_private_mi_private = m_private.mi_private;
+>im_private_mi_private : typeof mi_private
+>m_private : typeof m_private
+>mi_private : typeof mi_private
+
+import im_private_mu_private = m_private.mu_private;
+>im_private_mu_private : im_private_mu_private
+>m_private : typeof m_private
+>mu_private : mu_private
+
+// Usage of above decls
+var privateUse_im_private_c_private = new im_private_c_private();
+>privateUse_im_private_c_private : c_private
+>new im_private_c_private() : c_private
+>im_private_c_private : typeof c_private
+
+export var publicUse_im_private_c_private = new im_private_c_private();
+>publicUse_im_private_c_private : c_private
+>new im_private_c_private() : c_private
+>im_private_c_private : typeof c_private
+
+var privateUse_im_private_e_private = im_private_e_private.Happy;
+>privateUse_im_private_e_private : e_private
+>im_private_e_private.Happy : e_private
+>im_private_e_private : typeof e_private
+>Happy : e_private
+
+export var publicUse_im_private_e_private = im_private_e_private.Grumpy;
+>publicUse_im_private_e_private : e_private
+>im_private_e_private.Grumpy : e_private
+>im_private_e_private : typeof e_private
+>Grumpy : e_private
+
+var privateUse_im_private_f_private = im_private_f_private();
+>privateUse_im_private_f_private : c_private
+>im_private_f_private() : c_private
+>im_private_f_private : typeof f_private
+
+export var publicUse_im_private_f_private = im_private_f_private();
+>publicUse_im_private_f_private : c_private
+>im_private_f_private() : c_private
+>im_private_f_private : typeof f_private
+
+var privateUse_im_private_v_private = im_private_v_private;
+>privateUse_im_private_v_private : c_private
+>im_private_v_private : c_private
+
+export var publicUse_im_private_v_private = im_private_v_private;
+>publicUse_im_private_v_private : c_private
+>im_private_v_private : c_private
+
+var privateUse_im_private_i_private: im_private_i_private;
+>privateUse_im_private_i_private : i_private
+>im_private_i_private : i_private
+
+export var publicUse_im_private_i_private: im_private_i_private;
+>publicUse_im_private_i_private : i_private
+>im_private_i_private : i_private
+
+var privateUse_im_private_mi_private = new im_private_mi_private.c();
+>privateUse_im_private_mi_private : c
+>new im_private_mi_private.c() : c
+>im_private_mi_private.c : typeof c
+>im_private_mi_private : typeof mi_private
+>c : typeof c
+
+export var publicUse_im_private_mi_private = new im_private_mi_private.c();
+>publicUse_im_private_mi_private : c
+>new im_private_mi_private.c() : c
+>im_private_mi_private.c : typeof c
+>im_private_mi_private : typeof mi_private
+>c : typeof c
+
+var privateUse_im_private_mu_private: im_private_mu_private.i;
+>privateUse_im_private_mu_private : i
+>im_private_mu_private : im_private_mu_private
+>i : i
+
+export var publicUse_im_private_mu_private: im_private_mu_private.i;
+>publicUse_im_private_mu_private : i
+>im_private_mu_private : im_private_mu_private
+>i : i
+
+
+// No Privacy errors - importing public elements
+import im_private_c_public = m_public.c_public;
+>im_private_c_public : typeof c_public
+>m_public : typeof m_public
+>c_public : c_public
+
+import im_private_e_public = m_public.e_public;
+>im_private_e_public : typeof e_public
+>m_public : typeof m_public
+>e_public : e_public
+
+import im_private_f_public = m_public.f_public;
+>im_private_f_public : typeof f_public
+>m_public : typeof m_public
+>f_public : typeof f_public
+
+import im_private_v_public = m_public.v_public;
+>im_private_v_public : number
+>m_public : typeof m_public
+>v_public : number
+
+import im_private_i_public = m_public.i_public;
+>im_private_i_public : im_private_i_public
+>m_public : typeof m_public
+>i_public : i_public
+
+import im_private_mi_public = m_public.mi_public;
+>im_private_mi_public : typeof mi_public
+>m_public : typeof m_public
+>mi_public : typeof mi_public
+
+import im_private_mu_public = m_public.mu_public;
+>im_private_mu_public : im_private_mu_public
+>m_public : typeof m_public
+>mu_public : mu_public
+
+// Usage of above decls
+var privateUse_im_private_c_public = new im_private_c_public();
+>privateUse_im_private_c_public : c_public
+>new im_private_c_public() : c_public
+>im_private_c_public : typeof c_public
+
+export var publicUse_im_private_c_public = new im_private_c_public();
+>publicUse_im_private_c_public : c_public
+>new im_private_c_public() : c_public
+>im_private_c_public : typeof c_public
+
+var privateUse_im_private_e_public = im_private_e_public.Happy;
+>privateUse_im_private_e_public : e_public
+>im_private_e_public.Happy : e_public
+>im_private_e_public : typeof e_public
+>Happy : e_public
+
+export var publicUse_im_private_e_public = im_private_e_public.Grumpy;
+>publicUse_im_private_e_public : e_public
+>im_private_e_public.Grumpy : e_public
+>im_private_e_public : typeof e_public
+>Grumpy : e_public
+
+var privateUse_im_private_f_public = im_private_f_public();
+>privateUse_im_private_f_public : c_public
+>im_private_f_public() : c_public
+>im_private_f_public : typeof f_public
+
+export var publicUse_im_private_f_public = im_private_f_public();
+>publicUse_im_private_f_public : c_public
+>im_private_f_public() : c_public
+>im_private_f_public : typeof f_public
+
+var privateUse_im_private_v_public = im_private_v_public;
+>privateUse_im_private_v_public : number
+>im_private_v_public : number
+
+export var publicUse_im_private_v_public = im_private_v_public;
+>publicUse_im_private_v_public : number
+>im_private_v_public : number
+
+var privateUse_im_private_i_public: im_private_i_public;
+>privateUse_im_private_i_public : i_public
+>im_private_i_public : i_public
+
+export var publicUse_im_private_i_public: im_private_i_public;
+>publicUse_im_private_i_public : i_public
+>im_private_i_public : i_public
+
+var privateUse_im_private_mi_public = new im_private_mi_public.c();
+>privateUse_im_private_mi_public : c
+>new im_private_mi_public.c() : c
+>im_private_mi_public.c : typeof c
+>im_private_mi_public : typeof mi_public
+>c : typeof c
+
+export var publicUse_im_private_mi_public = new im_private_mi_public.c();
+>publicUse_im_private_mi_public : c
+>new im_private_mi_public.c() : c
+>im_private_mi_public.c : typeof c
+>im_private_mi_public : typeof mi_public
+>c : typeof c
+
+var privateUse_im_private_mu_public: im_private_mu_public.i;
+>privateUse_im_private_mu_public : i
+>im_private_mu_public : im_private_mu_public
+>i : i
+
+export var publicUse_im_private_mu_public: im_private_mu_public.i;
+>publicUse_im_private_mu_public : i
+>im_private_mu_public : im_private_mu_public
+>i : i
+
diff --git a/tests/baselines/reference/privacyTypeParameterOfFunction.errors.txt b/tests/baselines/reference/privacyTypeParameterOfFunction.errors.txt
new file mode 100644
index 00000000000..c58147621b5
--- /dev/null
+++ b/tests/baselines/reference/privacyTypeParameterOfFunction.errors.txt
@@ -0,0 +1,135 @@
+==== tests/cases/compiler/privacyTypeParameterOfFunction.ts (1 errors) ====
+    class privateClass {
+    }
+    
+    export class publicClass {
+                 ~~~~~~~~~~~
+!!! Cannot compile external modules unless the '--module' flag is provided.
+    }
+    
+    export interface publicInterfaceWithPrivateTypeParameters {
+        // TypeParameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_type_1
+        new <T extends privateClass>(): privateClass; 
+    
+        // TypeParameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_type_1
+        <T extends privateClass>(): privateClass;
+    
+        // TypeParameter_0_of_method_from_exported_interface_has_or_is_using_private_type_1
+        myMethod<T extends privateClass>(): privateClass;
+    }
+    
+    export interface publicInterfaceWithPublicTypeParameters {
+        new <T extends publicClass>(): publicClass;
+        <T extends publicClass>(): publicClass;
+        myMethod<T extends publicClass>(): publicClass;
+    }
+    
+    interface privateInterfaceWithPrivateTypeParameters {
+        new <T extends privateClass>(): privateClass;
+        <T extends privateClass>(): privateClass;
+        myMethod<T extends privateClass>(): privateClass;
+    }
+    
+    interface privateInterfaceWithPublicTypeParameters {
+        new <T extends publicClass>(): publicClass;
+        <T extends publicClass>(): publicClass;
+        myMethod<T extends publicClass>(): publicClass;
+    }
+    
+    export class publicClassWithWithPrivateTypeParameters {
+        // TypeParameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_type_1
+        static myPublicStaticMethod<T extends privateClass>() {
+        }
+        private static myPrivateStaticMethod<T extends privateClass>() { // No error
+        }
+        // TypeParameter_0_of_public_method_from_exported_class_has_or_is_using_private_type_1
+        myPublicMethod<T extends privateClass>() {
+        }
+        private myPrivateMethod<T extends privateClass>() { // No error
+        }
+    }
+    
+    export class publicClassWithWithPublicTypeParameters {
+        static myPublicStaticMethod<T extends publicClass>() {
+        }
+        private static myPrivateStaticMethod<T extends publicClass>() { 
+        }
+        myPublicMethod<T extends publicClass>() {
+        }
+        private myPrivateMethod<T extends publicClass>() {
+        }
+    }
+    
+    class privateClassWithWithPrivateTypeParameters {
+        static myPublicStaticMethod<T extends privateClass>() {
+        }
+        private static myPrivateStaticMethod<T extends privateClass>() { // No error
+        }
+        myPublicMethod<T extends privateClass>() {
+        }
+        private myPrivateMethod<T extends privateClass>() { // No error
+        }
+    }
+    
+    class privateClassWithWithPublicTypeParameters {
+        static myPublicStaticMethod<T extends publicClass>() {
+        }
+        private static myPrivateStaticMethod<T extends publicClass>() {
+        }
+        myPublicMethod<T extends publicClass>() {
+        }
+        private myPrivateMethod<T extends publicClass>() {
+        }
+    }
+    
+    // TypeParameter_0_of_exported_function_has_or_is_using_private_type_1
+    export function publicFunctionWithPrivateTypeParameters<T extends privateClass>() {
+    }
+    
+    export function publicFunctionWithPublicTypeParameters<T extends publicClass>() {
+    }
+    
+    function privateFunctionWithPrivateTypeParameters<T extends privateClass>() {
+    }
+    
+    function privateFunctionWithPublicTypeParameters<T extends publicClass>() {
+    }
+    
+    export interface publicInterfaceWithPublicTypeParametersWithoutExtends {
+        new <T>(): publicClass;
+        <T>(): publicClass;
+        myMethod<T>(): publicClass;
+    }
+    
+    interface privateInterfaceWithPublicTypeParametersWithoutExtends {
+        new <T>(): publicClass;
+        <T>(): publicClass;
+        myMethod<T>(): publicClass;
+    }
+    
+    export class publicClassWithWithPublicTypeParametersWithoutExtends {
+        static myPublicStaticMethod<T>() {
+        }
+        private static myPrivateStaticMethod<T>() {
+        }
+        myPublicMethod<T>() {
+        }
+        private myPrivateMethod<T>() {
+        }
+    }
+    class privateClassWithWithPublicTypeParametersWithoutExtends {
+        static myPublicStaticMethod<T>() {
+        }
+        private static myPrivateStaticMethod<T>() {
+        }
+        myPublicMethod<T>() {
+        }
+        private myPrivateMethod<T>() {
+        }
+    }
+    
+    export function publicFunctionWithPublicTypeParametersWithoutExtends<T>() {
+    }
+    
+    function privateFunctionWithPublicTypeParametersWithoutExtends<T>() {
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/privacyTypeParameterOfFunction.types b/tests/baselines/reference/privacyTypeParameterOfFunction.types
deleted file mode 100644
index 7d5c147a21d..00000000000
--- a/tests/baselines/reference/privacyTypeParameterOfFunction.types
+++ /dev/null
@@ -1,303 +0,0 @@
-=== tests/cases/compiler/privacyTypeParameterOfFunction.ts ===
-class privateClass {
->privateClass : privateClass
-}
-
-export class publicClass {
->publicClass : 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 {
->publicClassWithWithPrivateTypeParameters : 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
-    }
-}
-
-export class publicClassWithWithPublicTypeParameters {
->publicClassWithWithPublicTypeParameters : 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
-    }
-}
-
-class privateClassWithWithPrivateTypeParameters {
->privateClassWithWithPrivateTypeParameters : 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
-    }
-}
-
-class privateClassWithWithPublicTypeParameters {
->privateClassWithWithPublicTypeParameters : 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 {
->publicClassWithWithPublicTypeParametersWithoutExtends : 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 {
->privateClassWithWithPublicTypeParametersWithoutExtends : 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.errors.txt b/tests/baselines/reference/privacyTypeParameterOfFunctionDeclFile.errors.txt
deleted file mode 100644
index 3297ac7228d..00000000000
--- a/tests/baselines/reference/privacyTypeParameterOfFunctionDeclFile.errors.txt
+++ /dev/null
@@ -1,511 +0,0 @@
-==== tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts (36 errors) ====
-    class privateClass {
-    }
-    
-    export class publicClass {
-    }
-    
-    export interface publicInterfaceWithPrivateTypeParameters {
-        new <T extends privateClass>(): privateClass;  // Error
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Return type of constructor signature from exported interface has or is using private name 'privateClass'.
-             ~~~~~~~~~~~~~~~~~~~~~~
-!!! Type parameter 'T' of constructor signature from exported interface has or is using private name 'privateClass'.
-        <T extends privateClass>(): privateClass;  // Error
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Return type of call signature from exported interface has or is using private name 'privateClass'.
-         ~~~~~~~~~~~~~~~~~~~~~~
-!!! Type parameter 'T' of call signature from exported interface has or is using private name 'privateClass'.
-        myMethod<T extends privateClass>(): privateClass;  // Error
-        ~~~~~~~~
-!!! Return type of method from exported interface has or is using private name 'privateClass'.
-                 ~~~~~~~~~~~~~~~~~~~~~~
-!!! Type parameter 'T' of method from exported interface has or is using private name 'privateClass'.
-    }
-    
-    export interface publicInterfaceWithPublicTypeParameters {
-        new <T extends publicClass>(): publicClass;
-        <T extends publicClass>(): publicClass;
-        myMethod<T extends publicClass>(): publicClass;
-    }
-    
-    interface privateInterfaceWithPrivateTypeParameters {
-        new <T extends privateClass>(): privateClass;
-        <T extends privateClass>(): privateClass;
-        myMethod<T extends privateClass>(): privateClass;
-    }
-    
-    interface privateInterfaceWithPublicTypeParameters {
-        new <T extends publicClass>(): publicClass;
-        <T extends publicClass>(): publicClass;
-        myMethod<T extends publicClass>(): publicClass;
-    }
-    
-    export class publicClassWithWithPrivateTypeParameters {
-        static myPublicStaticMethod<T extends privateClass>() {  // Error
-                                    ~~~~~~~~~~~~~~~~~~~~~~
-!!! Type parameter 'T' of public static method from exported class has or is using private name 'privateClass'.
-        }
-        private static myPrivateStaticMethod<T extends privateClass>() {
-        }
-        myPublicMethod<T extends privateClass>() {  // Error
-                       ~~~~~~~~~~~~~~~~~~~~~~
-!!! Type parameter 'T' of public method from exported class has or is using private name 'privateClass'.
-        }
-        private myPrivateMethod<T extends privateClass>() {
-        }
-    }
-    
-    export class publicClassWithWithPublicTypeParameters {
-        static myPublicStaticMethod<T extends publicClass>() {
-        }
-        private static myPrivateStaticMethod<T extends publicClass>() { 
-        }
-        myPublicMethod<T extends publicClass>() {
-        }
-        private myPrivateMethod<T extends publicClass>() {
-        }
-    }
-    
-    class privateClassWithWithPrivateTypeParameters {
-        static myPublicStaticMethod<T extends privateClass>() {
-        }
-        private static myPrivateStaticMethod<T extends privateClass>() {
-        }
-        myPublicMethod<T extends privateClass>() {
-        }
-        private myPrivateMethod<T extends privateClass>() {
-        }
-    }
-    
-    class privateClassWithWithPublicTypeParameters {
-        static myPublicStaticMethod<T extends publicClass>() {
-        }
-        private static myPrivateStaticMethod<T extends publicClass>() {
-        }
-        myPublicMethod<T extends publicClass>() {
-        }
-        private myPrivateMethod<T extends publicClass>() {
-        }
-    }
-    
-    export function publicFunctionWithPrivateTypeParameters<T extends privateClass>() {  // Error
-                                                            ~~~~~~~~~~~~~~~~~~~~~~
-!!! Type parameter 'T' of exported function has or is using private name 'privateClass'.
-    }
-    
-    export function publicFunctionWithPublicTypeParameters<T extends publicClass>() {
-    }
-    
-    function privateFunctionWithPrivateTypeParameters<T extends privateClass>() {
-    }
-    
-    function privateFunctionWithPublicTypeParameters<T extends publicClass>() {
-    }
-    
-    export interface publicInterfaceWithPublicTypeParametersWithoutExtends {
-        new <T>(): publicClass;
-        <T>(): publicClass;
-        myMethod<T>(): publicClass;
-    }
-    
-    interface privateInterfaceWithPublicTypeParametersWithoutExtends {
-        new <T>(): publicClass;
-        <T>(): publicClass;
-        myMethod<T>(): publicClass;
-    }
-    
-    export class publicClassWithWithPublicTypeParametersWithoutExtends {
-        static myPublicStaticMethod<T>() {
-        }
-        private static myPrivateStaticMethod<T>() {
-        }
-        myPublicMethod<T>() {
-        }
-        private myPrivateMethod<T>() {
-        }
-    }
-    class privateClassWithWithPublicTypeParametersWithoutExtends {
-        static myPublicStaticMethod<T>() {
-        }
-        private static myPrivateStaticMethod<T>() {
-        }
-        myPublicMethod<T>() {
-        }
-        private myPrivateMethod<T>() {
-        }
-    }
-    
-    export function publicFunctionWithPublicTypeParametersWithoutExtends<T>() {
-    }
-    
-    function privateFunctionWithPublicTypeParametersWithoutExtends<T>() {
-    }
-    
-    export interface publicInterfaceWithPrivatModuleTypeParameters {
-        new <T extends privateModule.publicClass>(): privateModule.publicClass;  // Error
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Return type of constructor signature from exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Type parameter 'T' of constructor signature from exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-        <T extends privateModule.publicClass>(): privateModule.publicClass;  // Error
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Return type of call signature from exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Type parameter 'T' of call signature from exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-        myMethod<T extends privateModule.publicClass>(): privateModule.publicClass;  // Error
-        ~~~~~~~~
-!!! Return type of method from exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Type parameter 'T' of method from exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-    }
-    export class publicClassWithWithPrivateModuleTypeParameters {
-        static myPublicStaticMethod<T extends privateModule.publicClass>() {  // Error
-                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Type parameter 'T' of public static method from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-        }
-        myPublicMethod<T extends privateModule.publicClass>() {  // Error
-                       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Type parameter 'T' of public method from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-        }
-    }
-    export function publicFunctionWithPrivateMopduleTypeParameters<T extends privateModule.publicClass>() {  // Error
-                                                                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Type parameter 'T' of exported function has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-    }
-    
-    
-    interface privateInterfaceWithPrivatModuleTypeParameters {
-        new <T extends privateModule.publicClass>(): privateModule.publicClass;
-        <T extends privateModule.publicClass>(): privateModule.publicClass;
-        myMethod<T extends privateModule.publicClass>(): privateModule.publicClass;
-    }
-    class privateClassWithWithPrivateModuleTypeParameters {
-        static myPublicStaticMethod<T extends privateModule.publicClass>() {
-        }
-        myPublicMethod<T extends privateModule.publicClass>() {
-        }
-    }
-    function privateFunctionWithPrivateMopduleTypeParameters<T extends privateModule.publicClass>() {
-    }
-    
-    
-    export module publicModule {
-        class privateClass {
-        }
-    
-        export class publicClass {
-        }
-    
-        export interface publicInterfaceWithPrivateTypeParameters {
-            new <T extends privateClass>(): privateClass;  // Error
-            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Return type of constructor signature from exported interface has or is using private name 'privateClass'.
-                 ~~~~~~~~~~~~~~~~~~~~~~
-!!! Type parameter 'T' of constructor signature from exported interface has or is using private name 'privateClass'.
-            <T extends privateClass>(): privateClass;  // Error
-            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Return type of call signature from exported interface has or is using private name 'privateClass'.
-             ~~~~~~~~~~~~~~~~~~~~~~
-!!! Type parameter 'T' of call signature from exported interface has or is using private name 'privateClass'.
-            myMethod<T extends privateClass>(): privateClass;  // Error
-            ~~~~~~~~
-!!! Return type of method from exported interface has or is using private name 'privateClass'.
-                     ~~~~~~~~~~~~~~~~~~~~~~
-!!! Type parameter 'T' of method from exported interface has or is using private name 'privateClass'.
-        }
-    
-        export interface publicInterfaceWithPublicTypeParameters {
-            new <T extends publicClass>(): publicClass;
-            <T extends publicClass>(): publicClass;
-            myMethod<T extends publicClass>(): publicClass;
-        }
-    
-        interface privateInterfaceWithPrivateTypeParameters {
-            new <T extends privateClass>(): privateClass;
-            <T extends privateClass>(): privateClass;
-            myMethod<T extends privateClass>(): privateClass;
-        }
-    
-        interface privateInterfaceWithPublicTypeParameters {
-            new <T extends publicClass>(): publicClass;
-            <T extends publicClass>(): publicClass;
-            myMethod<T extends publicClass>(): publicClass;
-        }
-    
-        export class publicClassWithWithPrivateTypeParameters {
-            static myPublicStaticMethod<T extends privateClass>() {  // Error
-                                        ~~~~~~~~~~~~~~~~~~~~~~
-!!! Type parameter 'T' of public static method from exported class has or is using private name 'privateClass'.
-            }
-            private static myPrivateStaticMethod<T extends privateClass>() {
-            }
-            myPublicMethod<T extends privateClass>() {  // Error
-                           ~~~~~~~~~~~~~~~~~~~~~~
-!!! Type parameter 'T' of public method from exported class has or is using private name 'privateClass'.
-            }
-            private myPrivateMethod<T extends privateClass>() {
-            }
-        }
-    
-        export class publicClassWithWithPublicTypeParameters {
-            static myPublicStaticMethod<T extends publicClass>() {
-            }
-            private static myPrivateStaticMethod<T extends publicClass>() {
-            }
-            myPublicMethod<T extends publicClass>() {
-            }
-            private myPrivateMethod<T extends publicClass>() {
-            }
-        }
-    
-        class privateClassWithWithPrivateTypeParameters {
-            static myPublicStaticMethod<T extends privateClass>() {
-            }
-            private static myPrivateStaticMethod<T extends privateClass>() {
-            }
-            myPublicMethod<T extends privateClass>() {
-            }
-            private myPrivateMethod<T extends privateClass>() {
-            }
-        }
-    
-        class privateClassWithWithPublicTypeParameters {
-            static myPublicStaticMethod<T extends publicClass>() {
-            }
-            private static myPrivateStaticMethod<T extends publicClass>() {
-            }
-            myPublicMethod<T extends publicClass>() {
-            }
-            private myPrivateMethod<T extends publicClass>() {
-            }
-        }
-    
-        export function publicFunctionWithPrivateTypeParameters<T extends privateClass>() {  // Error
-                                                                ~~~~~~~~~~~~~~~~~~~~~~
-!!! Type parameter 'T' of exported function has or is using private name 'privateClass'.
-        }
-    
-        export function publicFunctionWithPublicTypeParameters<T extends publicClass>() {
-        }
-    
-        function privateFunctionWithPrivateTypeParameters<T extends privateClass>() {
-        }
-    
-        function privateFunctionWithPublicTypeParameters<T extends publicClass>() {
-        }
-    
-        export interface publicInterfaceWithPublicTypeParametersWithoutExtends {
-            new <T>(): publicClass;
-            <T>(): publicClass;
-            myMethod<T>(): publicClass;
-        }
-    
-        interface privateInterfaceWithPublicTypeParametersWithoutExtends {
-            new <T>(): publicClass;
-            <T>(): publicClass;
-            myMethod<T>(): publicClass;
-        }
-    
-        export class publicClassWithWithPublicTypeParametersWithoutExtends {
-            static myPublicStaticMethod<T>() {
-            }
-            private static myPrivateStaticMethod<T>() {
-            }
-            myPublicMethod<T>() {
-            }
-            private myPrivateMethod<T>() {
-            }
-        }
-        class privateClassWithWithPublicTypeParametersWithoutExtends {
-            static myPublicStaticMethod<T>() {
-            }
-            private static myPrivateStaticMethod<T>() {
-            }
-            myPublicMethod<T>() {
-            }
-            private myPrivateMethod<T>() {
-            }
-        }
-    
-        export function publicFunctionWithPublicTypeParametersWithoutExtends<T>() {
-        }
-    
-        function privateFunctionWithPublicTypeParametersWithoutExtends<T>() {
-        }
-    
-        export interface publicInterfaceWithPrivatModuleTypeParameters {
-            new <T extends privateModule.publicClass>(): privateModule.publicClass;  // Error
-            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Return type of constructor signature from exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Type parameter 'T' of constructor signature from exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-            <T extends privateModule.publicClass>(): privateModule.publicClass;  // Error
-            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Return type of call signature from exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Type parameter 'T' of call signature from exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-            myMethod<T extends privateModule.publicClass>(): privateModule.publicClass;  // Error
-            ~~~~~~~~
-!!! Return type of method from exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Type parameter 'T' of method from exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-        }
-        export class publicClassWithWithPrivateModuleTypeParameters {
-            static myPublicStaticMethod<T extends privateModule.publicClass>() {  // Error
-                                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Type parameter 'T' of public static method from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-            }
-            myPublicMethod<T extends privateModule.publicClass>() {  // Error
-                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Type parameter 'T' of public method from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-            }
-        }
-        export function publicFunctionWithPrivateMopduleTypeParameters<T extends privateModule.publicClass>() {  // Error
-                                                                       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Type parameter 'T' of exported function has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-        }
-    
-    
-        interface privateInterfaceWithPrivatModuleTypeParameters {
-            new <T extends privateModule.publicClass>(): privateModule.publicClass;  
-            <T extends privateModule.publicClass>(): privateModule.publicClass;  
-            myMethod<T extends privateModule.publicClass>(): privateModule.publicClass;  
-        }
-        class privateClassWithWithPrivateModuleTypeParameters {
-            static myPublicStaticMethod<T extends privateModule.publicClass>() {  
-            }
-            myPublicMethod<T extends privateModule.publicClass>() { 
-            }
-        }
-        function privateFunctionWithPrivateMopduleTypeParameters<T extends privateModule.publicClass>() { 
-        }
-    
-    }
-    
-    module privateModule {
-        class privateClass {
-        }
-    
-        export class publicClass {
-        }
-    
-        export interface publicInterfaceWithPrivateTypeParameters {
-            new <T extends privateClass>(): privateClass; 
-            <T extends privateClass>(): privateClass;
-            myMethod<T extends privateClass>(): privateClass; 
-        }
-    
-        export interface publicInterfaceWithPublicTypeParameters {
-            new <T extends publicClass>(): publicClass;
-            <T extends publicClass>(): publicClass;
-            myMethod<T extends publicClass>(): publicClass;
-        }
-    
-        interface privateInterfaceWithPrivateTypeParameters {
-            new <T extends privateClass>(): privateClass;
-            <T extends privateClass>(): privateClass;
-            myMethod<T extends privateClass>(): privateClass;
-        }
-    
-        interface privateInterfaceWithPublicTypeParameters {
-            new <T extends publicClass>(): publicClass;
-            <T extends publicClass>(): publicClass;
-            myMethod<T extends publicClass>(): publicClass;
-        }
-    
-        export class publicClassWithWithPrivateTypeParameters {
-            static myPublicStaticMethod<T extends privateClass>() { 
-            }
-            private static myPrivateStaticMethod<T extends privateClass>() {
-            }
-            myPublicMethod<T extends privateClass>() {  
-            }
-            private myPrivateMethod<T extends privateClass>() {
-            }
-        }
-    
-        export class publicClassWithWithPublicTypeParameters {
-            static myPublicStaticMethod<T extends publicClass>() {
-            }
-            private static myPrivateStaticMethod<T extends publicClass>() {
-            }
-            myPublicMethod<T extends publicClass>() {
-            }
-            private myPrivateMethod<T extends publicClass>() {
-            }
-        }
-    
-        class privateClassWithWithPrivateTypeParameters {
-            static myPublicStaticMethod<T extends privateClass>() {
-            }
-            private static myPrivateStaticMethod<T extends privateClass>() {
-            }
-            myPublicMethod<T extends privateClass>() {
-            }
-            private myPrivateMethod<T extends privateClass>() {
-            }
-        }
-    
-        class privateClassWithWithPublicTypeParameters {
-            static myPublicStaticMethod<T extends publicClass>() {
-            }
-            private static myPrivateStaticMethod<T extends publicClass>() {
-            }
-            myPublicMethod<T extends publicClass>() {
-            }
-            private myPrivateMethod<T extends publicClass>() {
-            }
-        }
-    
-        export function publicFunctionWithPrivateTypeParameters<T extends privateClass>() { 
-        }
-    
-        export function publicFunctionWithPublicTypeParameters<T extends publicClass>() {
-        }
-    
-        function privateFunctionWithPrivateTypeParameters<T extends privateClass>() {
-        }
-    
-        function privateFunctionWithPublicTypeParameters<T extends publicClass>() {
-        }
-    
-        export interface publicInterfaceWithPublicTypeParametersWithoutExtends {
-            new <T>(): publicClass;
-            <T>(): publicClass;
-            myMethod<T>(): publicClass;
-        }
-    
-        interface privateInterfaceWithPublicTypeParametersWithoutExtends {
-            new <T>(): publicClass;
-            <T>(): publicClass;
-            myMethod<T>(): publicClass;
-        }
-    
-        export class publicClassWithWithPublicTypeParametersWithoutExtends {
-            static myPublicStaticMethod<T>() {
-            }
-            private static myPrivateStaticMethod<T>() {
-            }
-            myPublicMethod<T>() {
-            }
-            private myPrivateMethod<T>() {
-            }
-        }
-        class privateClassWithWithPublicTypeParametersWithoutExtends {
-            static myPublicStaticMethod<T>() {
-            }
-            private static myPrivateStaticMethod<T>() {
-            }
-            myPublicMethod<T>() {
-            }
-            private myPrivateMethod<T>() {
-            }
-        }
-    
-        export function publicFunctionWithPublicTypeParametersWithoutExtends<T>() {
-        }
-    
-        function privateFunctionWithPublicTypeParametersWithoutExtends<T>() {
-        }
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/privacyTypeParameterOfFunctionDeclFile.js b/tests/baselines/reference/privacyTypeParameterOfFunctionDeclFile.js
deleted file mode 100644
index 173b48b8049..00000000000
--- a/tests/baselines/reference/privacyTypeParameterOfFunctionDeclFile.js
+++ /dev/null
@@ -1,816 +0,0 @@
-//// [privacyTypeParameterOfFunctionDeclFile.ts]
-class privateClass {
-}
-
-export class publicClass {
-}
-
-export interface publicInterfaceWithPrivateTypeParameters {
-    new <T extends privateClass>(): privateClass;  // Error
-    <T extends privateClass>(): privateClass;  // Error
-    myMethod<T extends privateClass>(): privateClass;  // Error
-}
-
-export interface publicInterfaceWithPublicTypeParameters {
-    new <T extends publicClass>(): publicClass;
-    <T extends publicClass>(): publicClass;
-    myMethod<T extends publicClass>(): publicClass;
-}
-
-interface privateInterfaceWithPrivateTypeParameters {
-    new <T extends privateClass>(): privateClass;
-    <T extends privateClass>(): privateClass;
-    myMethod<T extends privateClass>(): privateClass;
-}
-
-interface privateInterfaceWithPublicTypeParameters {
-    new <T extends publicClass>(): publicClass;
-    <T extends publicClass>(): publicClass;
-    myMethod<T extends publicClass>(): publicClass;
-}
-
-export class publicClassWithWithPrivateTypeParameters {
-    static myPublicStaticMethod<T extends privateClass>() {  // Error
-    }
-    private static myPrivateStaticMethod<T extends privateClass>() {
-    }
-    myPublicMethod<T extends privateClass>() {  // Error
-    }
-    private myPrivateMethod<T extends privateClass>() {
-    }
-}
-
-export class publicClassWithWithPublicTypeParameters {
-    static myPublicStaticMethod<T extends publicClass>() {
-    }
-    private static myPrivateStaticMethod<T extends publicClass>() { 
-    }
-    myPublicMethod<T extends publicClass>() {
-    }
-    private myPrivateMethod<T extends publicClass>() {
-    }
-}
-
-class privateClassWithWithPrivateTypeParameters {
-    static myPublicStaticMethod<T extends privateClass>() {
-    }
-    private static myPrivateStaticMethod<T extends privateClass>() {
-    }
-    myPublicMethod<T extends privateClass>() {
-    }
-    private myPrivateMethod<T extends privateClass>() {
-    }
-}
-
-class privateClassWithWithPublicTypeParameters {
-    static myPublicStaticMethod<T extends publicClass>() {
-    }
-    private static myPrivateStaticMethod<T extends publicClass>() {
-    }
-    myPublicMethod<T extends publicClass>() {
-    }
-    private myPrivateMethod<T extends publicClass>() {
-    }
-}
-
-export function publicFunctionWithPrivateTypeParameters<T extends privateClass>() {  // Error
-}
-
-export function publicFunctionWithPublicTypeParameters<T extends publicClass>() {
-}
-
-function privateFunctionWithPrivateTypeParameters<T extends privateClass>() {
-}
-
-function privateFunctionWithPublicTypeParameters<T extends publicClass>() {
-}
-
-export interface publicInterfaceWithPublicTypeParametersWithoutExtends {
-    new <T>(): publicClass;
-    <T>(): publicClass;
-    myMethod<T>(): publicClass;
-}
-
-interface privateInterfaceWithPublicTypeParametersWithoutExtends {
-    new <T>(): publicClass;
-    <T>(): publicClass;
-    myMethod<T>(): publicClass;
-}
-
-export class publicClassWithWithPublicTypeParametersWithoutExtends {
-    static myPublicStaticMethod<T>() {
-    }
-    private static myPrivateStaticMethod<T>() {
-    }
-    myPublicMethod<T>() {
-    }
-    private myPrivateMethod<T>() {
-    }
-}
-class privateClassWithWithPublicTypeParametersWithoutExtends {
-    static myPublicStaticMethod<T>() {
-    }
-    private static myPrivateStaticMethod<T>() {
-    }
-    myPublicMethod<T>() {
-    }
-    private myPrivateMethod<T>() {
-    }
-}
-
-export function publicFunctionWithPublicTypeParametersWithoutExtends<T>() {
-}
-
-function privateFunctionWithPublicTypeParametersWithoutExtends<T>() {
-}
-
-export interface publicInterfaceWithPrivatModuleTypeParameters {
-    new <T extends privateModule.publicClass>(): privateModule.publicClass;  // Error
-    <T extends privateModule.publicClass>(): privateModule.publicClass;  // Error
-    myMethod<T extends privateModule.publicClass>(): privateModule.publicClass;  // Error
-}
-export class publicClassWithWithPrivateModuleTypeParameters {
-    static myPublicStaticMethod<T extends privateModule.publicClass>() {  // Error
-    }
-    myPublicMethod<T extends privateModule.publicClass>() {  // Error
-    }
-}
-export function publicFunctionWithPrivateMopduleTypeParameters<T extends privateModule.publicClass>() {  // Error
-}
-
-
-interface privateInterfaceWithPrivatModuleTypeParameters {
-    new <T extends privateModule.publicClass>(): privateModule.publicClass;
-    <T extends privateModule.publicClass>(): privateModule.publicClass;
-    myMethod<T extends privateModule.publicClass>(): privateModule.publicClass;
-}
-class privateClassWithWithPrivateModuleTypeParameters {
-    static myPublicStaticMethod<T extends privateModule.publicClass>() {
-    }
-    myPublicMethod<T extends privateModule.publicClass>() {
-    }
-}
-function privateFunctionWithPrivateMopduleTypeParameters<T extends privateModule.publicClass>() {
-}
-
-
-export module publicModule {
-    class privateClass {
-    }
-
-    export class publicClass {
-    }
-
-    export interface publicInterfaceWithPrivateTypeParameters {
-        new <T extends privateClass>(): privateClass;  // Error
-        <T extends privateClass>(): privateClass;  // Error
-        myMethod<T extends privateClass>(): privateClass;  // Error
-    }
-
-    export interface publicInterfaceWithPublicTypeParameters {
-        new <T extends publicClass>(): publicClass;
-        <T extends publicClass>(): publicClass;
-        myMethod<T extends publicClass>(): publicClass;
-    }
-
-    interface privateInterfaceWithPrivateTypeParameters {
-        new <T extends privateClass>(): privateClass;
-        <T extends privateClass>(): privateClass;
-        myMethod<T extends privateClass>(): privateClass;
-    }
-
-    interface privateInterfaceWithPublicTypeParameters {
-        new <T extends publicClass>(): publicClass;
-        <T extends publicClass>(): publicClass;
-        myMethod<T extends publicClass>(): publicClass;
-    }
-
-    export class publicClassWithWithPrivateTypeParameters {
-        static myPublicStaticMethod<T extends privateClass>() {  // Error
-        }
-        private static myPrivateStaticMethod<T extends privateClass>() {
-        }
-        myPublicMethod<T extends privateClass>() {  // Error
-        }
-        private myPrivateMethod<T extends privateClass>() {
-        }
-    }
-
-    export class publicClassWithWithPublicTypeParameters {
-        static myPublicStaticMethod<T extends publicClass>() {
-        }
-        private static myPrivateStaticMethod<T extends publicClass>() {
-        }
-        myPublicMethod<T extends publicClass>() {
-        }
-        private myPrivateMethod<T extends publicClass>() {
-        }
-    }
-
-    class privateClassWithWithPrivateTypeParameters {
-        static myPublicStaticMethod<T extends privateClass>() {
-        }
-        private static myPrivateStaticMethod<T extends privateClass>() {
-        }
-        myPublicMethod<T extends privateClass>() {
-        }
-        private myPrivateMethod<T extends privateClass>() {
-        }
-    }
-
-    class privateClassWithWithPublicTypeParameters {
-        static myPublicStaticMethod<T extends publicClass>() {
-        }
-        private static myPrivateStaticMethod<T extends publicClass>() {
-        }
-        myPublicMethod<T extends publicClass>() {
-        }
-        private myPrivateMethod<T extends publicClass>() {
-        }
-    }
-
-    export function publicFunctionWithPrivateTypeParameters<T extends privateClass>() {  // Error
-    }
-
-    export function publicFunctionWithPublicTypeParameters<T extends publicClass>() {
-    }
-
-    function privateFunctionWithPrivateTypeParameters<T extends privateClass>() {
-    }
-
-    function privateFunctionWithPublicTypeParameters<T extends publicClass>() {
-    }
-
-    export interface publicInterfaceWithPublicTypeParametersWithoutExtends {
-        new <T>(): publicClass;
-        <T>(): publicClass;
-        myMethod<T>(): publicClass;
-    }
-
-    interface privateInterfaceWithPublicTypeParametersWithoutExtends {
-        new <T>(): publicClass;
-        <T>(): publicClass;
-        myMethod<T>(): publicClass;
-    }
-
-    export class publicClassWithWithPublicTypeParametersWithoutExtends {
-        static myPublicStaticMethod<T>() {
-        }
-        private static myPrivateStaticMethod<T>() {
-        }
-        myPublicMethod<T>() {
-        }
-        private myPrivateMethod<T>() {
-        }
-    }
-    class privateClassWithWithPublicTypeParametersWithoutExtends {
-        static myPublicStaticMethod<T>() {
-        }
-        private static myPrivateStaticMethod<T>() {
-        }
-        myPublicMethod<T>() {
-        }
-        private myPrivateMethod<T>() {
-        }
-    }
-
-    export function publicFunctionWithPublicTypeParametersWithoutExtends<T>() {
-    }
-
-    function privateFunctionWithPublicTypeParametersWithoutExtends<T>() {
-    }
-
-    export interface publicInterfaceWithPrivatModuleTypeParameters {
-        new <T extends privateModule.publicClass>(): privateModule.publicClass;  // Error
-        <T extends privateModule.publicClass>(): privateModule.publicClass;  // Error
-        myMethod<T extends privateModule.publicClass>(): privateModule.publicClass;  // Error
-    }
-    export class publicClassWithWithPrivateModuleTypeParameters {
-        static myPublicStaticMethod<T extends privateModule.publicClass>() {  // Error
-        }
-        myPublicMethod<T extends privateModule.publicClass>() {  // Error
-        }
-    }
-    export function publicFunctionWithPrivateMopduleTypeParameters<T extends privateModule.publicClass>() {  // Error
-    }
-
-
-    interface privateInterfaceWithPrivatModuleTypeParameters {
-        new <T extends privateModule.publicClass>(): privateModule.publicClass;  
-        <T extends privateModule.publicClass>(): privateModule.publicClass;  
-        myMethod<T extends privateModule.publicClass>(): privateModule.publicClass;  
-    }
-    class privateClassWithWithPrivateModuleTypeParameters {
-        static myPublicStaticMethod<T extends privateModule.publicClass>() {  
-        }
-        myPublicMethod<T extends privateModule.publicClass>() { 
-        }
-    }
-    function privateFunctionWithPrivateMopduleTypeParameters<T extends privateModule.publicClass>() { 
-    }
-
-}
-
-module privateModule {
-    class privateClass {
-    }
-
-    export class publicClass {
-    }
-
-    export interface publicInterfaceWithPrivateTypeParameters {
-        new <T extends privateClass>(): privateClass; 
-        <T extends privateClass>(): privateClass;
-        myMethod<T extends privateClass>(): privateClass; 
-    }
-
-    export interface publicInterfaceWithPublicTypeParameters {
-        new <T extends publicClass>(): publicClass;
-        <T extends publicClass>(): publicClass;
-        myMethod<T extends publicClass>(): publicClass;
-    }
-
-    interface privateInterfaceWithPrivateTypeParameters {
-        new <T extends privateClass>(): privateClass;
-        <T extends privateClass>(): privateClass;
-        myMethod<T extends privateClass>(): privateClass;
-    }
-
-    interface privateInterfaceWithPublicTypeParameters {
-        new <T extends publicClass>(): publicClass;
-        <T extends publicClass>(): publicClass;
-        myMethod<T extends publicClass>(): publicClass;
-    }
-
-    export class publicClassWithWithPrivateTypeParameters {
-        static myPublicStaticMethod<T extends privateClass>() { 
-        }
-        private static myPrivateStaticMethod<T extends privateClass>() {
-        }
-        myPublicMethod<T extends privateClass>() {  
-        }
-        private myPrivateMethod<T extends privateClass>() {
-        }
-    }
-
-    export class publicClassWithWithPublicTypeParameters {
-        static myPublicStaticMethod<T extends publicClass>() {
-        }
-        private static myPrivateStaticMethod<T extends publicClass>() {
-        }
-        myPublicMethod<T extends publicClass>() {
-        }
-        private myPrivateMethod<T extends publicClass>() {
-        }
-    }
-
-    class privateClassWithWithPrivateTypeParameters {
-        static myPublicStaticMethod<T extends privateClass>() {
-        }
-        private static myPrivateStaticMethod<T extends privateClass>() {
-        }
-        myPublicMethod<T extends privateClass>() {
-        }
-        private myPrivateMethod<T extends privateClass>() {
-        }
-    }
-
-    class privateClassWithWithPublicTypeParameters {
-        static myPublicStaticMethod<T extends publicClass>() {
-        }
-        private static myPrivateStaticMethod<T extends publicClass>() {
-        }
-        myPublicMethod<T extends publicClass>() {
-        }
-        private myPrivateMethod<T extends publicClass>() {
-        }
-    }
-
-    export function publicFunctionWithPrivateTypeParameters<T extends privateClass>() { 
-    }
-
-    export function publicFunctionWithPublicTypeParameters<T extends publicClass>() {
-    }
-
-    function privateFunctionWithPrivateTypeParameters<T extends privateClass>() {
-    }
-
-    function privateFunctionWithPublicTypeParameters<T extends publicClass>() {
-    }
-
-    export interface publicInterfaceWithPublicTypeParametersWithoutExtends {
-        new <T>(): publicClass;
-        <T>(): publicClass;
-        myMethod<T>(): publicClass;
-    }
-
-    interface privateInterfaceWithPublicTypeParametersWithoutExtends {
-        new <T>(): publicClass;
-        <T>(): publicClass;
-        myMethod<T>(): publicClass;
-    }
-
-    export class publicClassWithWithPublicTypeParametersWithoutExtends {
-        static myPublicStaticMethod<T>() {
-        }
-        private static myPrivateStaticMethod<T>() {
-        }
-        myPublicMethod<T>() {
-        }
-        private myPrivateMethod<T>() {
-        }
-    }
-    class privateClassWithWithPublicTypeParametersWithoutExtends {
-        static myPublicStaticMethod<T>() {
-        }
-        private static myPrivateStaticMethod<T>() {
-        }
-        myPublicMethod<T>() {
-        }
-        private myPrivateMethod<T>() {
-        }
-    }
-
-    export function publicFunctionWithPublicTypeParametersWithoutExtends<T>() {
-    }
-
-    function privateFunctionWithPublicTypeParametersWithoutExtends<T>() {
-    }
-}
-
-//// [privacyTypeParameterOfFunctionDeclFile.js]
-var privateClass = (function () {
-    function privateClass() {
-    }
-    return privateClass;
-})();
-var publicClass = (function () {
-    function publicClass() {
-    }
-    return publicClass;
-})();
-exports.publicClass = publicClass;
-var publicClassWithWithPrivateTypeParameters = (function () {
-    function publicClassWithWithPrivateTypeParameters() {
-    }
-    publicClassWithWithPrivateTypeParameters.myPublicStaticMethod = function () {
-    };
-    publicClassWithWithPrivateTypeParameters.myPrivateStaticMethod = function () {
-    };
-    publicClassWithWithPrivateTypeParameters.prototype.myPublicMethod = function () {
-    };
-    publicClassWithWithPrivateTypeParameters.prototype.myPrivateMethod = function () {
-    };
-    return publicClassWithWithPrivateTypeParameters;
-})();
-exports.publicClassWithWithPrivateTypeParameters = publicClassWithWithPrivateTypeParameters;
-var publicClassWithWithPublicTypeParameters = (function () {
-    function publicClassWithWithPublicTypeParameters() {
-    }
-    publicClassWithWithPublicTypeParameters.myPublicStaticMethod = function () {
-    };
-    publicClassWithWithPublicTypeParameters.myPrivateStaticMethod = function () {
-    };
-    publicClassWithWithPublicTypeParameters.prototype.myPublicMethod = function () {
-    };
-    publicClassWithWithPublicTypeParameters.prototype.myPrivateMethod = function () {
-    };
-    return publicClassWithWithPublicTypeParameters;
-})();
-exports.publicClassWithWithPublicTypeParameters = publicClassWithWithPublicTypeParameters;
-var privateClassWithWithPrivateTypeParameters = (function () {
-    function privateClassWithWithPrivateTypeParameters() {
-    }
-    privateClassWithWithPrivateTypeParameters.myPublicStaticMethod = function () {
-    };
-    privateClassWithWithPrivateTypeParameters.myPrivateStaticMethod = function () {
-    };
-    privateClassWithWithPrivateTypeParameters.prototype.myPublicMethod = function () {
-    };
-    privateClassWithWithPrivateTypeParameters.prototype.myPrivateMethod = function () {
-    };
-    return privateClassWithWithPrivateTypeParameters;
-})();
-var privateClassWithWithPublicTypeParameters = (function () {
-    function privateClassWithWithPublicTypeParameters() {
-    }
-    privateClassWithWithPublicTypeParameters.myPublicStaticMethod = function () {
-    };
-    privateClassWithWithPublicTypeParameters.myPrivateStaticMethod = function () {
-    };
-    privateClassWithWithPublicTypeParameters.prototype.myPublicMethod = function () {
-    };
-    privateClassWithWithPublicTypeParameters.prototype.myPrivateMethod = function () {
-    };
-    return privateClassWithWithPublicTypeParameters;
-})();
-function publicFunctionWithPrivateTypeParameters() {
-}
-exports.publicFunctionWithPrivateTypeParameters = publicFunctionWithPrivateTypeParameters;
-function publicFunctionWithPublicTypeParameters() {
-}
-exports.publicFunctionWithPublicTypeParameters = publicFunctionWithPublicTypeParameters;
-function privateFunctionWithPrivateTypeParameters() {
-}
-function privateFunctionWithPublicTypeParameters() {
-}
-var publicClassWithWithPublicTypeParametersWithoutExtends = (function () {
-    function publicClassWithWithPublicTypeParametersWithoutExtends() {
-    }
-    publicClassWithWithPublicTypeParametersWithoutExtends.myPublicStaticMethod = function () {
-    };
-    publicClassWithWithPublicTypeParametersWithoutExtends.myPrivateStaticMethod = function () {
-    };
-    publicClassWithWithPublicTypeParametersWithoutExtends.prototype.myPublicMethod = function () {
-    };
-    publicClassWithWithPublicTypeParametersWithoutExtends.prototype.myPrivateMethod = function () {
-    };
-    return publicClassWithWithPublicTypeParametersWithoutExtends;
-})();
-exports.publicClassWithWithPublicTypeParametersWithoutExtends = publicClassWithWithPublicTypeParametersWithoutExtends;
-var privateClassWithWithPublicTypeParametersWithoutExtends = (function () {
-    function privateClassWithWithPublicTypeParametersWithoutExtends() {
-    }
-    privateClassWithWithPublicTypeParametersWithoutExtends.myPublicStaticMethod = function () {
-    };
-    privateClassWithWithPublicTypeParametersWithoutExtends.myPrivateStaticMethod = function () {
-    };
-    privateClassWithWithPublicTypeParametersWithoutExtends.prototype.myPublicMethod = function () {
-    };
-    privateClassWithWithPublicTypeParametersWithoutExtends.prototype.myPrivateMethod = function () {
-    };
-    return privateClassWithWithPublicTypeParametersWithoutExtends;
-})();
-function publicFunctionWithPublicTypeParametersWithoutExtends() {
-}
-exports.publicFunctionWithPublicTypeParametersWithoutExtends = publicFunctionWithPublicTypeParametersWithoutExtends;
-function privateFunctionWithPublicTypeParametersWithoutExtends() {
-}
-var publicClassWithWithPrivateModuleTypeParameters = (function () {
-    function publicClassWithWithPrivateModuleTypeParameters() {
-    }
-    publicClassWithWithPrivateModuleTypeParameters.myPublicStaticMethod = function () {
-    };
-    publicClassWithWithPrivateModuleTypeParameters.prototype.myPublicMethod = function () {
-    };
-    return publicClassWithWithPrivateModuleTypeParameters;
-})();
-exports.publicClassWithWithPrivateModuleTypeParameters = publicClassWithWithPrivateModuleTypeParameters;
-function publicFunctionWithPrivateMopduleTypeParameters() {
-}
-exports.publicFunctionWithPrivateMopduleTypeParameters = publicFunctionWithPrivateMopduleTypeParameters;
-var privateClassWithWithPrivateModuleTypeParameters = (function () {
-    function privateClassWithWithPrivateModuleTypeParameters() {
-    }
-    privateClassWithWithPrivateModuleTypeParameters.myPublicStaticMethod = function () {
-    };
-    privateClassWithWithPrivateModuleTypeParameters.prototype.myPublicMethod = function () {
-    };
-    return privateClassWithWithPrivateModuleTypeParameters;
-})();
-function privateFunctionWithPrivateMopduleTypeParameters() {
-}
-(function (publicModule) {
-    var privateClass = (function () {
-        function privateClass() {
-        }
-        return privateClass;
-    })();
-    var publicClass = (function () {
-        function publicClass() {
-        }
-        return publicClass;
-    })();
-    publicModule.publicClass = publicClass;
-    var publicClassWithWithPrivateTypeParameters = (function () {
-        function publicClassWithWithPrivateTypeParameters() {
-        }
-        publicClassWithWithPrivateTypeParameters.myPublicStaticMethod = function () {
-        };
-        publicClassWithWithPrivateTypeParameters.myPrivateStaticMethod = function () {
-        };
-        publicClassWithWithPrivateTypeParameters.prototype.myPublicMethod = function () {
-        };
-        publicClassWithWithPrivateTypeParameters.prototype.myPrivateMethod = function () {
-        };
-        return publicClassWithWithPrivateTypeParameters;
-    })();
-    publicModule.publicClassWithWithPrivateTypeParameters = publicClassWithWithPrivateTypeParameters;
-    var publicClassWithWithPublicTypeParameters = (function () {
-        function publicClassWithWithPublicTypeParameters() {
-        }
-        publicClassWithWithPublicTypeParameters.myPublicStaticMethod = function () {
-        };
-        publicClassWithWithPublicTypeParameters.myPrivateStaticMethod = function () {
-        };
-        publicClassWithWithPublicTypeParameters.prototype.myPublicMethod = function () {
-        };
-        publicClassWithWithPublicTypeParameters.prototype.myPrivateMethod = function () {
-        };
-        return publicClassWithWithPublicTypeParameters;
-    })();
-    publicModule.publicClassWithWithPublicTypeParameters = publicClassWithWithPublicTypeParameters;
-    var privateClassWithWithPrivateTypeParameters = (function () {
-        function privateClassWithWithPrivateTypeParameters() {
-        }
-        privateClassWithWithPrivateTypeParameters.myPublicStaticMethod = function () {
-        };
-        privateClassWithWithPrivateTypeParameters.myPrivateStaticMethod = function () {
-        };
-        privateClassWithWithPrivateTypeParameters.prototype.myPublicMethod = function () {
-        };
-        privateClassWithWithPrivateTypeParameters.prototype.myPrivateMethod = function () {
-        };
-        return privateClassWithWithPrivateTypeParameters;
-    })();
-    var privateClassWithWithPublicTypeParameters = (function () {
-        function privateClassWithWithPublicTypeParameters() {
-        }
-        privateClassWithWithPublicTypeParameters.myPublicStaticMethod = function () {
-        };
-        privateClassWithWithPublicTypeParameters.myPrivateStaticMethod = function () {
-        };
-        privateClassWithWithPublicTypeParameters.prototype.myPublicMethod = function () {
-        };
-        privateClassWithWithPublicTypeParameters.prototype.myPrivateMethod = function () {
-        };
-        return privateClassWithWithPublicTypeParameters;
-    })();
-    function publicFunctionWithPrivateTypeParameters() {
-    }
-    publicModule.publicFunctionWithPrivateTypeParameters = publicFunctionWithPrivateTypeParameters;
-    function publicFunctionWithPublicTypeParameters() {
-    }
-    publicModule.publicFunctionWithPublicTypeParameters = publicFunctionWithPublicTypeParameters;
-    function privateFunctionWithPrivateTypeParameters() {
-    }
-    function privateFunctionWithPublicTypeParameters() {
-    }
-    var publicClassWithWithPublicTypeParametersWithoutExtends = (function () {
-        function publicClassWithWithPublicTypeParametersWithoutExtends() {
-        }
-        publicClassWithWithPublicTypeParametersWithoutExtends.myPublicStaticMethod = function () {
-        };
-        publicClassWithWithPublicTypeParametersWithoutExtends.myPrivateStaticMethod = function () {
-        };
-        publicClassWithWithPublicTypeParametersWithoutExtends.prototype.myPublicMethod = function () {
-        };
-        publicClassWithWithPublicTypeParametersWithoutExtends.prototype.myPrivateMethod = function () {
-        };
-        return publicClassWithWithPublicTypeParametersWithoutExtends;
-    })();
-    publicModule.publicClassWithWithPublicTypeParametersWithoutExtends = publicClassWithWithPublicTypeParametersWithoutExtends;
-    var privateClassWithWithPublicTypeParametersWithoutExtends = (function () {
-        function privateClassWithWithPublicTypeParametersWithoutExtends() {
-        }
-        privateClassWithWithPublicTypeParametersWithoutExtends.myPublicStaticMethod = function () {
-        };
-        privateClassWithWithPublicTypeParametersWithoutExtends.myPrivateStaticMethod = function () {
-        };
-        privateClassWithWithPublicTypeParametersWithoutExtends.prototype.myPublicMethod = function () {
-        };
-        privateClassWithWithPublicTypeParametersWithoutExtends.prototype.myPrivateMethod = function () {
-        };
-        return privateClassWithWithPublicTypeParametersWithoutExtends;
-    })();
-    function publicFunctionWithPublicTypeParametersWithoutExtends() {
-    }
-    publicModule.publicFunctionWithPublicTypeParametersWithoutExtends = publicFunctionWithPublicTypeParametersWithoutExtends;
-    function privateFunctionWithPublicTypeParametersWithoutExtends() {
-    }
-    var publicClassWithWithPrivateModuleTypeParameters = (function () {
-        function publicClassWithWithPrivateModuleTypeParameters() {
-        }
-        publicClassWithWithPrivateModuleTypeParameters.myPublicStaticMethod = function () {
-        };
-        publicClassWithWithPrivateModuleTypeParameters.prototype.myPublicMethod = function () {
-        };
-        return publicClassWithWithPrivateModuleTypeParameters;
-    })();
-    publicModule.publicClassWithWithPrivateModuleTypeParameters = publicClassWithWithPrivateModuleTypeParameters;
-    function publicFunctionWithPrivateMopduleTypeParameters() {
-    }
-    publicModule.publicFunctionWithPrivateMopduleTypeParameters = publicFunctionWithPrivateMopduleTypeParameters;
-    var privateClassWithWithPrivateModuleTypeParameters = (function () {
-        function privateClassWithWithPrivateModuleTypeParameters() {
-        }
-        privateClassWithWithPrivateModuleTypeParameters.myPublicStaticMethod = function () {
-        };
-        privateClassWithWithPrivateModuleTypeParameters.prototype.myPublicMethod = function () {
-        };
-        return privateClassWithWithPrivateModuleTypeParameters;
-    })();
-    function privateFunctionWithPrivateMopduleTypeParameters() {
-    }
-})(exports.publicModule || (exports.publicModule = {}));
-var publicModule = exports.publicModule;
-var privateModule;
-(function (privateModule) {
-    var privateClass = (function () {
-        function privateClass() {
-        }
-        return privateClass;
-    })();
-    var publicClass = (function () {
-        function publicClass() {
-        }
-        return publicClass;
-    })();
-    privateModule.publicClass = publicClass;
-    var publicClassWithWithPrivateTypeParameters = (function () {
-        function publicClassWithWithPrivateTypeParameters() {
-        }
-        publicClassWithWithPrivateTypeParameters.myPublicStaticMethod = function () {
-        };
-        publicClassWithWithPrivateTypeParameters.myPrivateStaticMethod = function () {
-        };
-        publicClassWithWithPrivateTypeParameters.prototype.myPublicMethod = function () {
-        };
-        publicClassWithWithPrivateTypeParameters.prototype.myPrivateMethod = function () {
-        };
-        return publicClassWithWithPrivateTypeParameters;
-    })();
-    privateModule.publicClassWithWithPrivateTypeParameters = publicClassWithWithPrivateTypeParameters;
-    var publicClassWithWithPublicTypeParameters = (function () {
-        function publicClassWithWithPublicTypeParameters() {
-        }
-        publicClassWithWithPublicTypeParameters.myPublicStaticMethod = function () {
-        };
-        publicClassWithWithPublicTypeParameters.myPrivateStaticMethod = function () {
-        };
-        publicClassWithWithPublicTypeParameters.prototype.myPublicMethod = function () {
-        };
-        publicClassWithWithPublicTypeParameters.prototype.myPrivateMethod = function () {
-        };
-        return publicClassWithWithPublicTypeParameters;
-    })();
-    privateModule.publicClassWithWithPublicTypeParameters = publicClassWithWithPublicTypeParameters;
-    var privateClassWithWithPrivateTypeParameters = (function () {
-        function privateClassWithWithPrivateTypeParameters() {
-        }
-        privateClassWithWithPrivateTypeParameters.myPublicStaticMethod = function () {
-        };
-        privateClassWithWithPrivateTypeParameters.myPrivateStaticMethod = function () {
-        };
-        privateClassWithWithPrivateTypeParameters.prototype.myPublicMethod = function () {
-        };
-        privateClassWithWithPrivateTypeParameters.prototype.myPrivateMethod = function () {
-        };
-        return privateClassWithWithPrivateTypeParameters;
-    })();
-    var privateClassWithWithPublicTypeParameters = (function () {
-        function privateClassWithWithPublicTypeParameters() {
-        }
-        privateClassWithWithPublicTypeParameters.myPublicStaticMethod = function () {
-        };
-        privateClassWithWithPublicTypeParameters.myPrivateStaticMethod = function () {
-        };
-        privateClassWithWithPublicTypeParameters.prototype.myPublicMethod = function () {
-        };
-        privateClassWithWithPublicTypeParameters.prototype.myPrivateMethod = function () {
-        };
-        return privateClassWithWithPublicTypeParameters;
-    })();
-    function publicFunctionWithPrivateTypeParameters() {
-    }
-    privateModule.publicFunctionWithPrivateTypeParameters = publicFunctionWithPrivateTypeParameters;
-    function publicFunctionWithPublicTypeParameters() {
-    }
-    privateModule.publicFunctionWithPublicTypeParameters = publicFunctionWithPublicTypeParameters;
-    function privateFunctionWithPrivateTypeParameters() {
-    }
-    function privateFunctionWithPublicTypeParameters() {
-    }
-    var publicClassWithWithPublicTypeParametersWithoutExtends = (function () {
-        function publicClassWithWithPublicTypeParametersWithoutExtends() {
-        }
-        publicClassWithWithPublicTypeParametersWithoutExtends.myPublicStaticMethod = function () {
-        };
-        publicClassWithWithPublicTypeParametersWithoutExtends.myPrivateStaticMethod = function () {
-        };
-        publicClassWithWithPublicTypeParametersWithoutExtends.prototype.myPublicMethod = function () {
-        };
-        publicClassWithWithPublicTypeParametersWithoutExtends.prototype.myPrivateMethod = function () {
-        };
-        return publicClassWithWithPublicTypeParametersWithoutExtends;
-    })();
-    privateModule.publicClassWithWithPublicTypeParametersWithoutExtends = publicClassWithWithPublicTypeParametersWithoutExtends;
-    var privateClassWithWithPublicTypeParametersWithoutExtends = (function () {
-        function privateClassWithWithPublicTypeParametersWithoutExtends() {
-        }
-        privateClassWithWithPublicTypeParametersWithoutExtends.myPublicStaticMethod = function () {
-        };
-        privateClassWithWithPublicTypeParametersWithoutExtends.myPrivateStaticMethod = function () {
-        };
-        privateClassWithWithPublicTypeParametersWithoutExtends.prototype.myPublicMethod = function () {
-        };
-        privateClassWithWithPublicTypeParametersWithoutExtends.prototype.myPrivateMethod = function () {
-        };
-        return privateClassWithWithPublicTypeParametersWithoutExtends;
-    })();
-    function publicFunctionWithPublicTypeParametersWithoutExtends() {
-    }
-    privateModule.publicFunctionWithPublicTypeParametersWithoutExtends = publicFunctionWithPublicTypeParametersWithoutExtends;
-    function privateFunctionWithPublicTypeParametersWithoutExtends() {
-    }
-})(privateModule || (privateModule = {}));
diff --git a/tests/baselines/reference/privacyTypeParametersOfClass.errors.txt b/tests/baselines/reference/privacyTypeParametersOfClass.errors.txt
new file mode 100644
index 00000000000..409588c58b0
--- /dev/null
+++ b/tests/baselines/reference/privacyTypeParametersOfClass.errors.txt
@@ -0,0 +1,46 @@
+==== tests/cases/compiler/privacyTypeParametersOfClass.ts (1 errors) ====
+    class privateClass {
+    }
+    
+    export class publicClass {
+                 ~~~~~~~~~~~
+!!! Cannot compile external modules unless the '--module' flag is provided.
+    }
+    
+    // TypeParameter_0_of_exported_class_1_has_or_is_using_private_type_2
+    export class publicClassWithPrivateTypeParameters<T extends privateClass> {
+        myMethod(val: T): T { // Error
+            return val;
+        }
+    }
+    
+    export class publicClassWithPublicTypeParameters<T extends publicClass> {
+        myMethod(val: T): T { // No Error
+            return val;
+        }
+    }
+    
+    class privateClassWithPrivateTypeParameters<T extends privateClass> {
+        myMethod(val: T): T { // No Error
+            return val;
+        }
+    }
+    
+    class privateClassWithPublicTypeParameters<T extends publicClass> {
+        myMethod(val: T): T { // No Error
+            return val;
+        }
+    }
+    
+    export class publicClassWithPublicTypeParametersWithoutExtends<T> {
+        myMethod(val: T): T { // No Error
+            return val;
+        }
+    }
+    
+    class privateClassWithPublicTypeParametersWithoutExtends<T> {
+        myMethod(val: T): T { // No Error
+            return val;
+        }
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/privacyTypeParametersOfClass.types b/tests/baselines/reference/privacyTypeParametersOfClass.types
deleted file mode 100644
index c99b8b08afd..00000000000
--- a/tests/baselines/reference/privacyTypeParametersOfClass.types
+++ /dev/null
@@ -1,104 +0,0 @@
-=== tests/cases/compiler/privacyTypeParametersOfClass.ts ===
-class privateClass {
->privateClass : privateClass
-}
-
-export class publicClass {
->publicClass : 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
-    }
-}
-
-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
-    }
-}
-
-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
-    }
-}
-
-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
-    }
-}
-
-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
-    }
-}
-
-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.errors.txt b/tests/baselines/reference/privacyTypeParametersOfClassDeclFile.errors.txt
deleted file mode 100644
index b413b671f40..00000000000
--- a/tests/baselines/reference/privacyTypeParametersOfClassDeclFile.errors.txt
+++ /dev/null
@@ -1,163 +0,0 @@
-==== tests/cases/compiler/privacyTypeParametersOfClassDeclFile.ts (4 errors) ====
-    class privateClass {
-    }
-    
-    export class publicClass {
-    }
-    
-    export class publicClassWithPrivateTypeParameters<T extends privateClass> { // Error
-                                                      ~~~~~~~~~~~~~~~~~~~~~~
-!!! Type parameter 'T' of exported class has or is using private name 'privateClass'.
-        myMethod(val: T): T {
-            return val;
-        }
-    }
-    
-    export class publicClassWithPublicTypeParameters<T extends publicClass> {
-        myMethod(val: T): T {
-            return val;
-        }
-    }
-    
-    class privateClassWithPrivateTypeParameters<T extends privateClass> {
-        myMethod(val: T): T {
-            return val;
-        }
-    }
-    
-    class privateClassWithPublicTypeParameters<T extends publicClass> {
-        myMethod(val: T): T { 
-            return val;
-        }
-    }
-    
-    export class publicClassWithPublicTypeParametersWithoutExtends<T> {
-        myMethod(val: T): T { 
-            return val;
-        }
-    }
-    
-    class privateClassWithPublicTypeParametersWithoutExtends<T> {
-        myMethod(val: T): T { 
-            return val;
-        }
-    }
-    
-    export class publicClassWithTypeParametersFromPrivateModule<T extends privateModule.publicClassInPrivateModule> { // Error
-                                                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Type parameter 'T' of exported class has or is using name 'privateModule.publicClassInPrivateModule' from private module 'privateModule'.
-        myMethod(val: T): T {
-            return val;
-        }
-    }
-    
-    class privateClassWithTypeParametersFromPrivateModule<T extends privateModule.publicClassInPrivateModule> {
-        myMethod(val: T): T {
-            return val;
-        }
-    }
-    
-    export module publicModule {
-        class privateClassInPublicModule {
-        }
-    
-        export class publicClassInPublicModule {
-        }
-    
-        export class publicClassWithPrivateTypeParameters<T extends privateClassInPublicModule> { // Error
-                                                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Type parameter 'T' of exported class has or is using private name 'privateClassInPublicModule'.
-            myMethod(val: T): T {
-                return val;
-            }
-        }
-    
-        export class publicClassWithPublicTypeParameters<T extends publicClassInPublicModule> {
-            myMethod(val: T): T {
-                return val;
-            }
-        }
-    
-        class privateClassWithPrivateTypeParameters<T extends privateClassInPublicModule> {
-            myMethod(val: T): T {
-                return val;
-            }
-        }
-    
-        class privateClassWithPublicTypeParameters<T extends publicClassInPublicModule> {
-            myMethod(val: T): T {
-                return val;
-            }
-        }
-    
-        export class publicClassWithPublicTypeParametersWithoutExtends<T> {
-            myMethod(val: T): T {
-                return val;
-            }
-        }
-    
-        class privateClassWithPublicTypeParametersWithoutExtends<T> {
-            myMethod(val: T): T {
-                return val;
-            }
-        }
-    
-        export class publicClassWithTypeParametersFromPrivateModule<T extends privateModule.publicClassInPrivateModule> { // Error
-                                                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Type parameter 'T' of exported class has or is using name 'privateModule.publicClassInPrivateModule' from private module 'privateModule'.
-            myMethod(val: T): T {
-                return val;
-            }
-        }
-    
-        class privateClassWithTypeParametersFromPrivateModule<T extends privateModule.publicClassInPrivateModule> {
-            myMethod(val: T): T {
-                return val;
-            }
-        }
-    }
-    
-    module privateModule {
-        class privateClassInPrivateModule {
-        }
-    
-        export class publicClassInPrivateModule {
-        }
-    
-        export class publicClassWithPrivateTypeParameters<T extends privateClassInPrivateModule> {
-            myMethod(val: T): T {
-                return val;
-            }
-        }
-    
-        export class publicClassWithPublicTypeParameters<T extends publicClassInPrivateModule> {
-            myMethod(val: T): T {
-                return val;
-            }
-        }
-    
-        class privateClassWithPrivateTypeParameters<T extends privateClassInPrivateModule> {
-            myMethod(val: T): T {
-                return val;
-            }
-        }
-    
-        class privateClassWithPublicTypeParameters<T extends publicClassInPrivateModule> {
-            myMethod(val: T): T {
-                return val;
-            }
-        }
-    
-        export class publicClassWithPublicTypeParametersWithoutExtends<T> {
-            myMethod(val: T): T {
-                return val;
-            }
-        }
-    
-        class privateClassWithPublicTypeParametersWithoutExtends<T> {
-            myMethod(val: T): T {
-                return val;
-            }
-        }
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/privacyTypeParametersOfClassDeclFile.js b/tests/baselines/reference/privacyTypeParametersOfClassDeclFile.js
deleted file mode 100644
index ae829f5ab8a..00000000000
--- a/tests/baselines/reference/privacyTypeParametersOfClassDeclFile.js
+++ /dev/null
@@ -1,383 +0,0 @@
-//// [privacyTypeParametersOfClassDeclFile.ts]
-class privateClass {
-}
-
-export class publicClass {
-}
-
-export class publicClassWithPrivateTypeParameters<T extends privateClass> { // Error
-    myMethod(val: T): T {
-        return val;
-    }
-}
-
-export class publicClassWithPublicTypeParameters<T extends publicClass> {
-    myMethod(val: T): T {
-        return val;
-    }
-}
-
-class privateClassWithPrivateTypeParameters<T extends privateClass> {
-    myMethod(val: T): T {
-        return val;
-    }
-}
-
-class privateClassWithPublicTypeParameters<T extends publicClass> {
-    myMethod(val: T): T { 
-        return val;
-    }
-}
-
-export class publicClassWithPublicTypeParametersWithoutExtends<T> {
-    myMethod(val: T): T { 
-        return val;
-    }
-}
-
-class privateClassWithPublicTypeParametersWithoutExtends<T> {
-    myMethod(val: T): T { 
-        return val;
-    }
-}
-
-export class publicClassWithTypeParametersFromPrivateModule<T extends privateModule.publicClassInPrivateModule> { // Error
-    myMethod(val: T): T {
-        return val;
-    }
-}
-
-class privateClassWithTypeParametersFromPrivateModule<T extends privateModule.publicClassInPrivateModule> {
-    myMethod(val: T): T {
-        return val;
-    }
-}
-
-export module publicModule {
-    class privateClassInPublicModule {
-    }
-
-    export class publicClassInPublicModule {
-    }
-
-    export class publicClassWithPrivateTypeParameters<T extends privateClassInPublicModule> { // Error
-        myMethod(val: T): T {
-            return val;
-        }
-    }
-
-    export class publicClassWithPublicTypeParameters<T extends publicClassInPublicModule> {
-        myMethod(val: T): T {
-            return val;
-        }
-    }
-
-    class privateClassWithPrivateTypeParameters<T extends privateClassInPublicModule> {
-        myMethod(val: T): T {
-            return val;
-        }
-    }
-
-    class privateClassWithPublicTypeParameters<T extends publicClassInPublicModule> {
-        myMethod(val: T): T {
-            return val;
-        }
-    }
-
-    export class publicClassWithPublicTypeParametersWithoutExtends<T> {
-        myMethod(val: T): T {
-            return val;
-        }
-    }
-
-    class privateClassWithPublicTypeParametersWithoutExtends<T> {
-        myMethod(val: T): T {
-            return val;
-        }
-    }
-
-    export class publicClassWithTypeParametersFromPrivateModule<T extends privateModule.publicClassInPrivateModule> { // Error
-        myMethod(val: T): T {
-            return val;
-        }
-    }
-
-    class privateClassWithTypeParametersFromPrivateModule<T extends privateModule.publicClassInPrivateModule> {
-        myMethod(val: T): T {
-            return val;
-        }
-    }
-}
-
-module privateModule {
-    class privateClassInPrivateModule {
-    }
-
-    export class publicClassInPrivateModule {
-    }
-
-    export class publicClassWithPrivateTypeParameters<T extends privateClassInPrivateModule> {
-        myMethod(val: T): T {
-            return val;
-        }
-    }
-
-    export class publicClassWithPublicTypeParameters<T extends publicClassInPrivateModule> {
-        myMethod(val: T): T {
-            return val;
-        }
-    }
-
-    class privateClassWithPrivateTypeParameters<T extends privateClassInPrivateModule> {
-        myMethod(val: T): T {
-            return val;
-        }
-    }
-
-    class privateClassWithPublicTypeParameters<T extends publicClassInPrivateModule> {
-        myMethod(val: T): T {
-            return val;
-        }
-    }
-
-    export class publicClassWithPublicTypeParametersWithoutExtends<T> {
-        myMethod(val: T): T {
-            return val;
-        }
-    }
-
-    class privateClassWithPublicTypeParametersWithoutExtends<T> {
-        myMethod(val: T): T {
-            return val;
-        }
-    }
-}
-
-
-//// [privacyTypeParametersOfClassDeclFile.js]
-var privateClass = (function () {
-    function privateClass() {
-    }
-    return privateClass;
-})();
-var publicClass = (function () {
-    function publicClass() {
-    }
-    return publicClass;
-})();
-exports.publicClass = publicClass;
-var publicClassWithPrivateTypeParameters = (function () {
-    function publicClassWithPrivateTypeParameters() {
-    }
-    publicClassWithPrivateTypeParameters.prototype.myMethod = function (val) {
-        return val;
-    };
-    return publicClassWithPrivateTypeParameters;
-})();
-exports.publicClassWithPrivateTypeParameters = publicClassWithPrivateTypeParameters;
-var publicClassWithPublicTypeParameters = (function () {
-    function publicClassWithPublicTypeParameters() {
-    }
-    publicClassWithPublicTypeParameters.prototype.myMethod = function (val) {
-        return val;
-    };
-    return publicClassWithPublicTypeParameters;
-})();
-exports.publicClassWithPublicTypeParameters = publicClassWithPublicTypeParameters;
-var privateClassWithPrivateTypeParameters = (function () {
-    function privateClassWithPrivateTypeParameters() {
-    }
-    privateClassWithPrivateTypeParameters.prototype.myMethod = function (val) {
-        return val;
-    };
-    return privateClassWithPrivateTypeParameters;
-})();
-var privateClassWithPublicTypeParameters = (function () {
-    function privateClassWithPublicTypeParameters() {
-    }
-    privateClassWithPublicTypeParameters.prototype.myMethod = function (val) {
-        return val;
-    };
-    return privateClassWithPublicTypeParameters;
-})();
-var publicClassWithPublicTypeParametersWithoutExtends = (function () {
-    function publicClassWithPublicTypeParametersWithoutExtends() {
-    }
-    publicClassWithPublicTypeParametersWithoutExtends.prototype.myMethod = function (val) {
-        return val;
-    };
-    return publicClassWithPublicTypeParametersWithoutExtends;
-})();
-exports.publicClassWithPublicTypeParametersWithoutExtends = publicClassWithPublicTypeParametersWithoutExtends;
-var privateClassWithPublicTypeParametersWithoutExtends = (function () {
-    function privateClassWithPublicTypeParametersWithoutExtends() {
-    }
-    privateClassWithPublicTypeParametersWithoutExtends.prototype.myMethod = function (val) {
-        return val;
-    };
-    return privateClassWithPublicTypeParametersWithoutExtends;
-})();
-var publicClassWithTypeParametersFromPrivateModule = (function () {
-    function publicClassWithTypeParametersFromPrivateModule() {
-    }
-    publicClassWithTypeParametersFromPrivateModule.prototype.myMethod = function (val) {
-        return val;
-    };
-    return publicClassWithTypeParametersFromPrivateModule;
-})();
-exports.publicClassWithTypeParametersFromPrivateModule = publicClassWithTypeParametersFromPrivateModule;
-var privateClassWithTypeParametersFromPrivateModule = (function () {
-    function privateClassWithTypeParametersFromPrivateModule() {
-    }
-    privateClassWithTypeParametersFromPrivateModule.prototype.myMethod = function (val) {
-        return val;
-    };
-    return privateClassWithTypeParametersFromPrivateModule;
-})();
-(function (publicModule) {
-    var privateClassInPublicModule = (function () {
-        function privateClassInPublicModule() {
-        }
-        return privateClassInPublicModule;
-    })();
-    var publicClassInPublicModule = (function () {
-        function publicClassInPublicModule() {
-        }
-        return publicClassInPublicModule;
-    })();
-    publicModule.publicClassInPublicModule = publicClassInPublicModule;
-    var publicClassWithPrivateTypeParameters = (function () {
-        function publicClassWithPrivateTypeParameters() {
-        }
-        publicClassWithPrivateTypeParameters.prototype.myMethod = function (val) {
-            return val;
-        };
-        return publicClassWithPrivateTypeParameters;
-    })();
-    publicModule.publicClassWithPrivateTypeParameters = publicClassWithPrivateTypeParameters;
-    var publicClassWithPublicTypeParameters = (function () {
-        function publicClassWithPublicTypeParameters() {
-        }
-        publicClassWithPublicTypeParameters.prototype.myMethod = function (val) {
-            return val;
-        };
-        return publicClassWithPublicTypeParameters;
-    })();
-    publicModule.publicClassWithPublicTypeParameters = publicClassWithPublicTypeParameters;
-    var privateClassWithPrivateTypeParameters = (function () {
-        function privateClassWithPrivateTypeParameters() {
-        }
-        privateClassWithPrivateTypeParameters.prototype.myMethod = function (val) {
-            return val;
-        };
-        return privateClassWithPrivateTypeParameters;
-    })();
-    var privateClassWithPublicTypeParameters = (function () {
-        function privateClassWithPublicTypeParameters() {
-        }
-        privateClassWithPublicTypeParameters.prototype.myMethod = function (val) {
-            return val;
-        };
-        return privateClassWithPublicTypeParameters;
-    })();
-    var publicClassWithPublicTypeParametersWithoutExtends = (function () {
-        function publicClassWithPublicTypeParametersWithoutExtends() {
-        }
-        publicClassWithPublicTypeParametersWithoutExtends.prototype.myMethod = function (val) {
-            return val;
-        };
-        return publicClassWithPublicTypeParametersWithoutExtends;
-    })();
-    publicModule.publicClassWithPublicTypeParametersWithoutExtends = publicClassWithPublicTypeParametersWithoutExtends;
-    var privateClassWithPublicTypeParametersWithoutExtends = (function () {
-        function privateClassWithPublicTypeParametersWithoutExtends() {
-        }
-        privateClassWithPublicTypeParametersWithoutExtends.prototype.myMethod = function (val) {
-            return val;
-        };
-        return privateClassWithPublicTypeParametersWithoutExtends;
-    })();
-    var publicClassWithTypeParametersFromPrivateModule = (function () {
-        function publicClassWithTypeParametersFromPrivateModule() {
-        }
-        publicClassWithTypeParametersFromPrivateModule.prototype.myMethod = function (val) {
-            return val;
-        };
-        return publicClassWithTypeParametersFromPrivateModule;
-    })();
-    publicModule.publicClassWithTypeParametersFromPrivateModule = publicClassWithTypeParametersFromPrivateModule;
-    var privateClassWithTypeParametersFromPrivateModule = (function () {
-        function privateClassWithTypeParametersFromPrivateModule() {
-        }
-        privateClassWithTypeParametersFromPrivateModule.prototype.myMethod = function (val) {
-            return val;
-        };
-        return privateClassWithTypeParametersFromPrivateModule;
-    })();
-})(exports.publicModule || (exports.publicModule = {}));
-var publicModule = exports.publicModule;
-var privateModule;
-(function (privateModule) {
-    var privateClassInPrivateModule = (function () {
-        function privateClassInPrivateModule() {
-        }
-        return privateClassInPrivateModule;
-    })();
-    var publicClassInPrivateModule = (function () {
-        function publicClassInPrivateModule() {
-        }
-        return publicClassInPrivateModule;
-    })();
-    privateModule.publicClassInPrivateModule = publicClassInPrivateModule;
-    var publicClassWithPrivateTypeParameters = (function () {
-        function publicClassWithPrivateTypeParameters() {
-        }
-        publicClassWithPrivateTypeParameters.prototype.myMethod = function (val) {
-            return val;
-        };
-        return publicClassWithPrivateTypeParameters;
-    })();
-    privateModule.publicClassWithPrivateTypeParameters = publicClassWithPrivateTypeParameters;
-    var publicClassWithPublicTypeParameters = (function () {
-        function publicClassWithPublicTypeParameters() {
-        }
-        publicClassWithPublicTypeParameters.prototype.myMethod = function (val) {
-            return val;
-        };
-        return publicClassWithPublicTypeParameters;
-    })();
-    privateModule.publicClassWithPublicTypeParameters = publicClassWithPublicTypeParameters;
-    var privateClassWithPrivateTypeParameters = (function () {
-        function privateClassWithPrivateTypeParameters() {
-        }
-        privateClassWithPrivateTypeParameters.prototype.myMethod = function (val) {
-            return val;
-        };
-        return privateClassWithPrivateTypeParameters;
-    })();
-    var privateClassWithPublicTypeParameters = (function () {
-        function privateClassWithPublicTypeParameters() {
-        }
-        privateClassWithPublicTypeParameters.prototype.myMethod = function (val) {
-            return val;
-        };
-        return privateClassWithPublicTypeParameters;
-    })();
-    var publicClassWithPublicTypeParametersWithoutExtends = (function () {
-        function publicClassWithPublicTypeParametersWithoutExtends() {
-        }
-        publicClassWithPublicTypeParametersWithoutExtends.prototype.myMethod = function (val) {
-            return val;
-        };
-        return publicClassWithPublicTypeParametersWithoutExtends;
-    })();
-    privateModule.publicClassWithPublicTypeParametersWithoutExtends = publicClassWithPublicTypeParametersWithoutExtends;
-    var privateClassWithPublicTypeParametersWithoutExtends = (function () {
-        function privateClassWithPublicTypeParametersWithoutExtends() {
-        }
-        privateClassWithPublicTypeParametersWithoutExtends.prototype.myMethod = function (val) {
-            return val;
-        };
-        return privateClassWithPublicTypeParametersWithoutExtends;
-    })();
-})(privateModule || (privateModule = {}));
diff --git a/tests/baselines/reference/privacyTypeParametersOfInterface.errors.txt b/tests/baselines/reference/privacyTypeParametersOfInterface.errors.txt
new file mode 100644
index 00000000000..72f22a2f56c
--- /dev/null
+++ b/tests/baselines/reference/privacyTypeParametersOfInterface.errors.txt
@@ -0,0 +1,61 @@
+==== tests/cases/compiler/privacyTypeParametersOfInterface.ts (1 errors) ====
+    class privateClass {
+    }
+    
+    export class publicClass {
+                 ~~~~~~~~~~~
+!!! Cannot compile external modules unless the '--module' flag is provided.
+    }
+    
+    class privateClassT<T> {
+    }
+    
+    export class publicClassT<T> {
+    }
+    
+    // TypeParameter_0_of_exported_interface_1_has_or_is_using_private_type_2
+    export interface publicInterfaceWithPrivateTypeParameters<T extends privateClass> {
+        myMethod(val: T): T; // Error
+        myMethod0(): publicClassT<T>; // error
+        myMethod1(): privateClassT<privateClass>; // error
+        myMethod2(): privateClassT<publicClass>; // error
+        myMethod3(): publicClassT<privateClass>; //error
+        myMethod4(): publicClassT<publicClass>; // no error
+    }
+    
+    export interface publicInterfaceWithPublicTypeParameters<T extends publicClass> {
+        myMethod(val: T): T; // No Error
+        myMethod0(): publicClassT<T>; // No error
+        myMethod1(): privateClassT<privateClass>; // error
+        myMethod2(): privateClassT<publicClass>; // error
+        myMethod3(): publicClassT<privateClass>; //error
+        myMethod4(): publicClassT<publicClass>; // no error
+    }
+    
+    interface privateInterfaceWithPrivateTypeParameters<T extends privateClass> {
+        myMethod(val: T): T; // No Error
+        myMethod0(): publicClassT<T>; // No error
+        myMethod1(): privateClassT<privateClass>; // No error
+        myMethod2(): privateClassT<publicClass>; // No error
+        myMethod3(): publicClassT<privateClass>; //No error
+        myMethod4(): publicClassT<publicClass>; // no error
+    }
+    
+    interface privateInterfaceWithPublicTypeParameters<T extends publicClass> {
+        myMethod(val: T): T; // No Error
+        myMethod0(): publicClassT<T>; // No error
+        myMethod1(): privateClassT<privateClass>; // No error
+        myMethod2(): privateClassT<publicClass>; // No error
+        myMethod3(): publicClassT<privateClass>; //No error
+        myMethod4(): publicClassT<publicClass>; // no error
+    }
+    
+    export interface publicInterfaceWithPublicTypeParametersWithoutExtends<T> {
+        myMethod(val: T): T; // No Error
+        myMethod0(): publicClassT<T>; // No error
+    }
+    
+    interface privateInterfaceWithPublicTypeParametersWithoutExtends<T> {
+        myMethod(val: T): T; // No Error
+        myMethod0(): publicClassT<T>; // No error
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/privacyTypeParametersOfInterface.js b/tests/baselines/reference/privacyTypeParametersOfInterface.js
deleted file mode 100644
index 02e63ce7098..00000000000
--- a/tests/baselines/reference/privacyTypeParametersOfInterface.js
+++ /dev/null
@@ -1,83 +0,0 @@
-//// [privacyTypeParametersOfInterface.ts]
-class privateClass {
-}
-
-export class publicClass {
-}
-
-class privateClassT<T> {
-}
-
-export class publicClassT<T> {
-}
-
-// TypeParameter_0_of_exported_interface_1_has_or_is_using_private_type_2
-export interface publicInterfaceWithPrivateTypeParameters<T extends privateClass> {
-    myMethod(val: T): T; // Error
-    myMethod0(): publicClassT<T>; // error
-    myMethod1(): privateClassT<privateClass>; // error
-    myMethod2(): privateClassT<publicClass>; // error
-    myMethod3(): publicClassT<privateClass>; //error
-    myMethod4(): publicClassT<publicClass>; // no error
-}
-
-export interface publicInterfaceWithPublicTypeParameters<T extends publicClass> {
-    myMethod(val: T): T; // No Error
-    myMethod0(): publicClassT<T>; // No error
-    myMethod1(): privateClassT<privateClass>; // error
-    myMethod2(): privateClassT<publicClass>; // error
-    myMethod3(): publicClassT<privateClass>; //error
-    myMethod4(): publicClassT<publicClass>; // no error
-}
-
-interface privateInterfaceWithPrivateTypeParameters<T extends privateClass> {
-    myMethod(val: T): T; // No Error
-    myMethod0(): publicClassT<T>; // No error
-    myMethod1(): privateClassT<privateClass>; // No error
-    myMethod2(): privateClassT<publicClass>; // No error
-    myMethod3(): publicClassT<privateClass>; //No error
-    myMethod4(): publicClassT<publicClass>; // no error
-}
-
-interface privateInterfaceWithPublicTypeParameters<T extends publicClass> {
-    myMethod(val: T): T; // No Error
-    myMethod0(): publicClassT<T>; // No error
-    myMethod1(): privateClassT<privateClass>; // No error
-    myMethod2(): privateClassT<publicClass>; // No error
-    myMethod3(): publicClassT<privateClass>; //No error
-    myMethod4(): publicClassT<publicClass>; // no error
-}
-
-export interface publicInterfaceWithPublicTypeParametersWithoutExtends<T> {
-    myMethod(val: T): T; // No Error
-    myMethod0(): publicClassT<T>; // No error
-}
-
-interface privateInterfaceWithPublicTypeParametersWithoutExtends<T> {
-    myMethod(val: T): T; // No Error
-    myMethod0(): publicClassT<T>; // No error
-}
-
-//// [privacyTypeParametersOfInterface.js]
-var privateClass = (function () {
-    function privateClass() {
-    }
-    return privateClass;
-})();
-var publicClass = (function () {
-    function publicClass() {
-    }
-    return publicClass;
-})();
-exports.publicClass = publicClass;
-var privateClassT = (function () {
-    function privateClassT() {
-    }
-    return privateClassT;
-})();
-var publicClassT = (function () {
-    function publicClassT() {
-    }
-    return publicClassT;
-})();
-exports.publicClassT = publicClassT;
diff --git a/tests/baselines/reference/privacyTypeParametersOfInterface.types b/tests/baselines/reference/privacyTypeParametersOfInterface.types
deleted file mode 100644
index 0a72d093e04..00000000000
--- a/tests/baselines/reference/privacyTypeParametersOfInterface.types
+++ /dev/null
@@ -1,199 +0,0 @@
-=== tests/cases/compiler/privacyTypeParametersOfInterface.ts ===
-class privateClass {
->privateClass : privateClass
-}
-
-export class publicClass {
->publicClass : 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.errors.txt b/tests/baselines/reference/privacyTypeParametersOfInterfaceDeclFile.errors.txt
deleted file mode 100644
index c4e9934ce8c..00000000000
--- a/tests/baselines/reference/privacyTypeParametersOfInterfaceDeclFile.errors.txt
+++ /dev/null
@@ -1,231 +0,0 @@
-==== tests/cases/compiler/privacyTypeParametersOfInterfaceDeclFile.ts (20 errors) ====
-    class privateClass {
-    }
-    
-    export class publicClass {
-    }
-    
-    class privateClassT<T> {
-    }
-    
-    export class publicClassT<T> {
-    }
-    
-    export interface publicInterfaceWithPrivateTypeParameters<T extends privateClass> { // Error
-                                                              ~~~~~~~~~~~~~~~~~~~~~~
-!!! Type parameter 'T' of exported interface has or is using private name 'privateClass'.
-        myMethod(val: T): T;
-        myMethod0(): publicClassT<T>;
-        myMethod1(): privateClassT<privateClass>; 
-        ~~~~~~~~~
-!!! Return type of method from exported interface has or is using private name 'privateClass'.
-        ~~~~~~~~~
-!!! Return type of method from exported interface has or is using private name 'privateClassT'.
-        myMethod2(): privateClassT<publicClass>;
-        ~~~~~~~~~
-!!! Return type of method from exported interface has or is using private name 'privateClassT'.
-        myMethod3(): publicClassT<privateClass>;
-        ~~~~~~~~~
-!!! Return type of method from exported interface has or is using private name 'privateClass'.
-        myMethod4(): publicClassT<publicClass>; 
-    }
-    
-    export interface publicInterfaceWithPublicTypeParameters<T extends publicClass> {
-        myMethod(val: T): T;
-        myMethod0(): publicClassT<T>
-        myMethod1(): privateClassT<privateClass>;
-        ~~~~~~~~~
-!!! Return type of method from exported interface has or is using private name 'privateClass'.
-        ~~~~~~~~~
-!!! Return type of method from exported interface has or is using private name 'privateClassT'.
-        myMethod2(): privateClassT<publicClass>;
-        ~~~~~~~~~
-!!! Return type of method from exported interface has or is using private name 'privateClassT'.
-        myMethod3(): publicClassT<privateClass>;
-        ~~~~~~~~~
-!!! Return type of method from exported interface has or is using private name 'privateClass'.
-        myMethod4(): publicClassT<publicClass>;
-    }
-    
-    interface privateInterfaceWithPrivateTypeParameters<T extends privateClass> {
-        myMethod(val: T): T;
-        myMethod0(): publicClassT<T>;
-        myMethod1(): privateClassT<privateClass>;
-        myMethod2(): privateClassT<publicClass>;
-        myMethod3(): publicClassT<privateClass>;
-        myMethod4(): publicClassT<publicClass>;
-    }
-    
-    interface privateInterfaceWithPublicTypeParameters<T extends publicClass> {
-        myMethod(val: T): T;
-        myMethod0(): publicClassT<T>;
-        myMethod1(): privateClassT<privateClass>;
-        myMethod2(): privateClassT<publicClass>;
-        myMethod3(): publicClassT<privateClass>;
-        myMethod4(): publicClassT<publicClass>;
-    }
-    
-    export interface publicInterfaceWithPublicTypeParametersWithoutExtends<T> {
-        myMethod(val: T): T;
-        myMethod0(): publicClassT<T>;
-    }
-    
-    interface privateInterfaceWithPublicTypeParametersWithoutExtends<T> {
-        myMethod(val: T): T;
-        myMethod0(): publicClassT<T>;
-    }
-    
-    
-    export interface publicInterfaceWithPrivateModuleTypeParameterConstraints<T extends privateModule.publicClassInPrivateModule> { // Error
-                                                                              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Type parameter 'T' of exported interface has or is using name 'privateModule.publicClassInPrivateModule' from private module 'privateModule'.
-    }
-    
-    interface privateInterfaceWithPrivateModuleTypeParameterConstraints<T extends privateModule.publicClassInPrivateModule> { // Error
-    }
-    
-    export module publicModule {
-        class privateClassInPublicModule {
-        }
-    
-        export class publicClassInPublicModule {
-        }
-    
-        class privateClassInPublicModuleT<T> {
-        }
-    
-        export class publicClassInPublicModuleT<T> {
-        }
-    
-        export interface publicInterfaceWithPrivateTypeParameters<T extends privateClassInPublicModule> { // Error
-                                                                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Type parameter 'T' of exported interface has or is using private name 'privateClassInPublicModule'.
-            myMethod(val: T): T;
-            myMethod0(): publicClassInPublicModuleT<T>;
-            myMethod1(): privateClassInPublicModuleT<privateClassInPublicModule>;
-            ~~~~~~~~~
-!!! Return type of method from exported interface has or is using private name 'privateClassInPublicModule'.
-            ~~~~~~~~~
-!!! Return type of method from exported interface has or is using private name 'privateClassInPublicModuleT'.
-            myMethod2(): privateClassInPublicModuleT<publicClassInPublicModule>;
-            ~~~~~~~~~
-!!! Return type of method from exported interface has or is using private name 'privateClassInPublicModuleT'.
-            myMethod3(): publicClassInPublicModuleT<privateClassInPublicModule>;
-            ~~~~~~~~~
-!!! Return type of method from exported interface has or is using private name 'privateClassInPublicModule'.
-            myMethod4(): publicClassInPublicModuleT<publicClassInPublicModule>;
-        }
-    
-        export interface publicInterfaceWithPublicTypeParameters<T extends publicClassInPublicModule> {
-            myMethod(val: T): T;
-            myMethod0(): publicClassInPublicModuleT<T>
-            myMethod1(): privateClassInPublicModuleT<privateClassInPublicModule>;
-            ~~~~~~~~~
-!!! Return type of method from exported interface has or is using private name 'privateClassInPublicModule'.
-            ~~~~~~~~~
-!!! Return type of method from exported interface has or is using private name 'privateClassInPublicModuleT'.
-            myMethod2(): privateClassInPublicModuleT<publicClassInPublicModule>;
-            ~~~~~~~~~
-!!! Return type of method from exported interface has or is using private name 'privateClassInPublicModuleT'.
-            myMethod3(): publicClassInPublicModuleT<privateClassInPublicModule>;
-            ~~~~~~~~~
-!!! Return type of method from exported interface has or is using private name 'privateClassInPublicModule'.
-            myMethod4(): publicClassInPublicModuleT<publicClassInPublicModule>;
-        }
-    
-        interface privateInterfaceWithPrivateTypeParameters<T extends privateClassInPublicModule> {
-            myMethod(val: T): T;
-            myMethod0(): publicClassInPublicModuleT<T>;
-            myMethod1(): privateClassInPublicModuleT<privateClassInPublicModule>;
-            myMethod2(): privateClassInPublicModuleT<publicClassInPublicModule>;
-            myMethod3(): publicClassInPublicModuleT<privateClassInPublicModule>;
-            myMethod4(): publicClassInPublicModuleT<publicClassInPublicModule>;
-        }
-    
-        interface privateInterfaceWithPublicTypeParameters<T extends publicClassInPublicModule> {
-            myMethod(val: T): T;
-            myMethod0(): publicClassInPublicModuleT<T>;
-            myMethod1(): privateClassInPublicModuleT<privateClassInPublicModule>;
-            myMethod2(): privateClassInPublicModuleT<publicClassInPublicModule>;
-            myMethod3(): publicClassInPublicModuleT<privateClassInPublicModule>;
-            myMethod4(): publicClassInPublicModuleT<publicClassInPublicModule>;
-        }
-    
-        export interface publicInterfaceWithPublicTypeParametersWithoutExtends<T> {
-            myMethod(val: T): T;
-            myMethod0(): publicClassInPublicModuleT<T>;
-        }
-    
-        interface privateInterfaceWithPublicTypeParametersWithoutExtends<T> {
-            myMethod(val: T): T;
-            myMethod0(): publicClassInPublicModuleT<T>;
-        }
-    
-        export interface publicInterfaceWithPrivateModuleTypeParameterConstraints<T extends privateModule.publicClassInPrivateModule> { // Error
-                                                                                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Type parameter 'T' of exported interface has or is using name 'privateModule.publicClassInPrivateModule' from private module 'privateModule'.
-        }
-    
-        interface privateInterfaceWithPrivateModuleTypeParameterConstraints<T extends privateModule.publicClassInPrivateModule> { // Error
-        }
-    }
-    
-    module privateModule {
-        class privateClassInPrivateModule {
-        }
-    
-        export class publicClassInPrivateModule {
-        }
-    
-        class privateClassInPrivateModuleT<T> {
-        }
-    
-        export class publicClassInPrivateModuleT<T> {
-        }
-    
-        export interface publicInterfaceWithPrivateTypeParameters<T extends privateClassInPrivateModule> {
-            myMethod(val: T): T;
-            myMethod0(): publicClassInPrivateModuleT<T>;
-            myMethod1(): privateClassInPrivateModuleT<privateClassInPrivateModule>;
-            myMethod2(): privateClassInPrivateModuleT<publicClassInPrivateModule>;
-            myMethod3(): publicClassInPrivateModuleT<privateClassInPrivateModule>;
-            myMethod4(): publicClassInPrivateModuleT<publicClassInPrivateModule>;
-        }
-    
-        export interface publicInterfaceWithPublicTypeParameters<T extends publicClassInPrivateModule> {
-            myMethod(val: T): T;
-            myMethod0(): publicClassInPrivateModuleT<T>
-            myMethod1(): privateClassInPrivateModuleT<privateClassInPrivateModule>;
-            myMethod2(): privateClassInPrivateModuleT<publicClassInPrivateModule>;
-            myMethod3(): publicClassInPrivateModuleT<privateClassInPrivateModule>;
-            myMethod4(): publicClassInPrivateModuleT<publicClassInPrivateModule>;
-        }
-    
-        interface privateInterfaceWithPrivateTypeParameters<T extends privateClassInPrivateModule> {
-            myMethod(val: T): T;
-            myMethod0(): publicClassInPrivateModuleT<T>;
-            myMethod1(): privateClassInPrivateModuleT<privateClassInPrivateModule>;
-            myMethod2(): privateClassInPrivateModuleT<publicClassInPrivateModule>;
-            myMethod3(): publicClassInPrivateModuleT<privateClassInPrivateModule>;
-            myMethod4(): publicClassInPrivateModuleT<publicClassInPrivateModule>;
-        }
-    
-        interface privateInterfaceWithPublicTypeParameters<T extends publicClassInPrivateModule> {
-            myMethod(val: T): T;
-            myMethod0(): publicClassInPrivateModuleT<T>;
-            myMethod1(): privateClassInPrivateModuleT<privateClassInPrivateModule>;
-            myMethod2(): privateClassInPrivateModuleT<publicClassInPrivateModule>;
-            myMethod3(): publicClassInPrivateModuleT<privateClassInPrivateModule>;
-            myMethod4(): publicClassInPrivateModuleT<publicClassInPrivateModule>;
-        }
-    
-        export interface publicInterfaceWithPublicTypeParametersWithoutExtends<T> {
-            myMethod(val: T): T;
-            myMethod0(): publicClassInPrivateModuleT<T>;
-        }
-    
-        interface privateInterfaceWithPublicTypeParametersWithoutExtends<T> {
-            myMethod(val: T): T;
-            myMethod0(): publicClassInPrivateModuleT<T>;
-        }
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/privacyTypeParametersOfInterfaceDeclFile.js b/tests/baselines/reference/privacyTypeParametersOfInterfaceDeclFile.js
deleted file mode 100644
index 2ae5488dd3c..00000000000
--- a/tests/baselines/reference/privacyTypeParametersOfInterfaceDeclFile.js
+++ /dev/null
@@ -1,265 +0,0 @@
-//// [privacyTypeParametersOfInterfaceDeclFile.ts]
-class privateClass {
-}
-
-export class publicClass {
-}
-
-class privateClassT<T> {
-}
-
-export class publicClassT<T> {
-}
-
-export interface publicInterfaceWithPrivateTypeParameters<T extends privateClass> { // Error
-    myMethod(val: T): T;
-    myMethod0(): publicClassT<T>;
-    myMethod1(): privateClassT<privateClass>; 
-    myMethod2(): privateClassT<publicClass>;
-    myMethod3(): publicClassT<privateClass>;
-    myMethod4(): publicClassT<publicClass>; 
-}
-
-export interface publicInterfaceWithPublicTypeParameters<T extends publicClass> {
-    myMethod(val: T): T;
-    myMethod0(): publicClassT<T>
-    myMethod1(): privateClassT<privateClass>;
-    myMethod2(): privateClassT<publicClass>;
-    myMethod3(): publicClassT<privateClass>;
-    myMethod4(): publicClassT<publicClass>;
-}
-
-interface privateInterfaceWithPrivateTypeParameters<T extends privateClass> {
-    myMethod(val: T): T;
-    myMethod0(): publicClassT<T>;
-    myMethod1(): privateClassT<privateClass>;
-    myMethod2(): privateClassT<publicClass>;
-    myMethod3(): publicClassT<privateClass>;
-    myMethod4(): publicClassT<publicClass>;
-}
-
-interface privateInterfaceWithPublicTypeParameters<T extends publicClass> {
-    myMethod(val: T): T;
-    myMethod0(): publicClassT<T>;
-    myMethod1(): privateClassT<privateClass>;
-    myMethod2(): privateClassT<publicClass>;
-    myMethod3(): publicClassT<privateClass>;
-    myMethod4(): publicClassT<publicClass>;
-}
-
-export interface publicInterfaceWithPublicTypeParametersWithoutExtends<T> {
-    myMethod(val: T): T;
-    myMethod0(): publicClassT<T>;
-}
-
-interface privateInterfaceWithPublicTypeParametersWithoutExtends<T> {
-    myMethod(val: T): T;
-    myMethod0(): publicClassT<T>;
-}
-
-
-export interface publicInterfaceWithPrivateModuleTypeParameterConstraints<T extends privateModule.publicClassInPrivateModule> { // Error
-}
-
-interface privateInterfaceWithPrivateModuleTypeParameterConstraints<T extends privateModule.publicClassInPrivateModule> { // Error
-}
-
-export module publicModule {
-    class privateClassInPublicModule {
-    }
-
-    export class publicClassInPublicModule {
-    }
-
-    class privateClassInPublicModuleT<T> {
-    }
-
-    export class publicClassInPublicModuleT<T> {
-    }
-
-    export interface publicInterfaceWithPrivateTypeParameters<T extends privateClassInPublicModule> { // Error
-        myMethod(val: T): T;
-        myMethod0(): publicClassInPublicModuleT<T>;
-        myMethod1(): privateClassInPublicModuleT<privateClassInPublicModule>;
-        myMethod2(): privateClassInPublicModuleT<publicClassInPublicModule>;
-        myMethod3(): publicClassInPublicModuleT<privateClassInPublicModule>;
-        myMethod4(): publicClassInPublicModuleT<publicClassInPublicModule>;
-    }
-
-    export interface publicInterfaceWithPublicTypeParameters<T extends publicClassInPublicModule> {
-        myMethod(val: T): T;
-        myMethod0(): publicClassInPublicModuleT<T>
-        myMethod1(): privateClassInPublicModuleT<privateClassInPublicModule>;
-        myMethod2(): privateClassInPublicModuleT<publicClassInPublicModule>;
-        myMethod3(): publicClassInPublicModuleT<privateClassInPublicModule>;
-        myMethod4(): publicClassInPublicModuleT<publicClassInPublicModule>;
-    }
-
-    interface privateInterfaceWithPrivateTypeParameters<T extends privateClassInPublicModule> {
-        myMethod(val: T): T;
-        myMethod0(): publicClassInPublicModuleT<T>;
-        myMethod1(): privateClassInPublicModuleT<privateClassInPublicModule>;
-        myMethod2(): privateClassInPublicModuleT<publicClassInPublicModule>;
-        myMethod3(): publicClassInPublicModuleT<privateClassInPublicModule>;
-        myMethod4(): publicClassInPublicModuleT<publicClassInPublicModule>;
-    }
-
-    interface privateInterfaceWithPublicTypeParameters<T extends publicClassInPublicModule> {
-        myMethod(val: T): T;
-        myMethod0(): publicClassInPublicModuleT<T>;
-        myMethod1(): privateClassInPublicModuleT<privateClassInPublicModule>;
-        myMethod2(): privateClassInPublicModuleT<publicClassInPublicModule>;
-        myMethod3(): publicClassInPublicModuleT<privateClassInPublicModule>;
-        myMethod4(): publicClassInPublicModuleT<publicClassInPublicModule>;
-    }
-
-    export interface publicInterfaceWithPublicTypeParametersWithoutExtends<T> {
-        myMethod(val: T): T;
-        myMethod0(): publicClassInPublicModuleT<T>;
-    }
-
-    interface privateInterfaceWithPublicTypeParametersWithoutExtends<T> {
-        myMethod(val: T): T;
-        myMethod0(): publicClassInPublicModuleT<T>;
-    }
-
-    export interface publicInterfaceWithPrivateModuleTypeParameterConstraints<T extends privateModule.publicClassInPrivateModule> { // Error
-    }
-
-    interface privateInterfaceWithPrivateModuleTypeParameterConstraints<T extends privateModule.publicClassInPrivateModule> { // Error
-    }
-}
-
-module privateModule {
-    class privateClassInPrivateModule {
-    }
-
-    export class publicClassInPrivateModule {
-    }
-
-    class privateClassInPrivateModuleT<T> {
-    }
-
-    export class publicClassInPrivateModuleT<T> {
-    }
-
-    export interface publicInterfaceWithPrivateTypeParameters<T extends privateClassInPrivateModule> {
-        myMethod(val: T): T;
-        myMethod0(): publicClassInPrivateModuleT<T>;
-        myMethod1(): privateClassInPrivateModuleT<privateClassInPrivateModule>;
-        myMethod2(): privateClassInPrivateModuleT<publicClassInPrivateModule>;
-        myMethod3(): publicClassInPrivateModuleT<privateClassInPrivateModule>;
-        myMethod4(): publicClassInPrivateModuleT<publicClassInPrivateModule>;
-    }
-
-    export interface publicInterfaceWithPublicTypeParameters<T extends publicClassInPrivateModule> {
-        myMethod(val: T): T;
-        myMethod0(): publicClassInPrivateModuleT<T>
-        myMethod1(): privateClassInPrivateModuleT<privateClassInPrivateModule>;
-        myMethod2(): privateClassInPrivateModuleT<publicClassInPrivateModule>;
-        myMethod3(): publicClassInPrivateModuleT<privateClassInPrivateModule>;
-        myMethod4(): publicClassInPrivateModuleT<publicClassInPrivateModule>;
-    }
-
-    interface privateInterfaceWithPrivateTypeParameters<T extends privateClassInPrivateModule> {
-        myMethod(val: T): T;
-        myMethod0(): publicClassInPrivateModuleT<T>;
-        myMethod1(): privateClassInPrivateModuleT<privateClassInPrivateModule>;
-        myMethod2(): privateClassInPrivateModuleT<publicClassInPrivateModule>;
-        myMethod3(): publicClassInPrivateModuleT<privateClassInPrivateModule>;
-        myMethod4(): publicClassInPrivateModuleT<publicClassInPrivateModule>;
-    }
-
-    interface privateInterfaceWithPublicTypeParameters<T extends publicClassInPrivateModule> {
-        myMethod(val: T): T;
-        myMethod0(): publicClassInPrivateModuleT<T>;
-        myMethod1(): privateClassInPrivateModuleT<privateClassInPrivateModule>;
-        myMethod2(): privateClassInPrivateModuleT<publicClassInPrivateModule>;
-        myMethod3(): publicClassInPrivateModuleT<privateClassInPrivateModule>;
-        myMethod4(): publicClassInPrivateModuleT<publicClassInPrivateModule>;
-    }
-
-    export interface publicInterfaceWithPublicTypeParametersWithoutExtends<T> {
-        myMethod(val: T): T;
-        myMethod0(): publicClassInPrivateModuleT<T>;
-    }
-
-    interface privateInterfaceWithPublicTypeParametersWithoutExtends<T> {
-        myMethod(val: T): T;
-        myMethod0(): publicClassInPrivateModuleT<T>;
-    }
-}
-
-//// [privacyTypeParametersOfInterfaceDeclFile.js]
-var privateClass = (function () {
-    function privateClass() {
-    }
-    return privateClass;
-})();
-var publicClass = (function () {
-    function publicClass() {
-    }
-    return publicClass;
-})();
-exports.publicClass = publicClass;
-var privateClassT = (function () {
-    function privateClassT() {
-    }
-    return privateClassT;
-})();
-var publicClassT = (function () {
-    function publicClassT() {
-    }
-    return publicClassT;
-})();
-exports.publicClassT = publicClassT;
-(function (publicModule) {
-    var privateClassInPublicModule = (function () {
-        function privateClassInPublicModule() {
-        }
-        return privateClassInPublicModule;
-    })();
-    var publicClassInPublicModule = (function () {
-        function publicClassInPublicModule() {
-        }
-        return publicClassInPublicModule;
-    })();
-    publicModule.publicClassInPublicModule = publicClassInPublicModule;
-    var privateClassInPublicModuleT = (function () {
-        function privateClassInPublicModuleT() {
-        }
-        return privateClassInPublicModuleT;
-    })();
-    var publicClassInPublicModuleT = (function () {
-        function publicClassInPublicModuleT() {
-        }
-        return publicClassInPublicModuleT;
-    })();
-    publicModule.publicClassInPublicModuleT = publicClassInPublicModuleT;
-})(exports.publicModule || (exports.publicModule = {}));
-var publicModule = exports.publicModule;
-var privateModule;
-(function (privateModule) {
-    var privateClassInPrivateModule = (function () {
-        function privateClassInPrivateModule() {
-        }
-        return privateClassInPrivateModule;
-    })();
-    var publicClassInPrivateModule = (function () {
-        function publicClassInPrivateModule() {
-        }
-        return publicClassInPrivateModule;
-    })();
-    privateModule.publicClassInPrivateModule = publicClassInPrivateModule;
-    var privateClassInPrivateModuleT = (function () {
-        function privateClassInPrivateModuleT() {
-        }
-        return privateClassInPrivateModuleT;
-    })();
-    var publicClassInPrivateModuleT = (function () {
-        function publicClassInPrivateModuleT() {
-        }
-        return publicClassInPrivateModuleT;
-    })();
-    privateModule.publicClassInPrivateModuleT = publicClassInPrivateModuleT;
-})(privateModule || (privateModule = {}));
diff --git a/tests/baselines/reference/privacyVarDeclFile.errors.txt b/tests/baselines/reference/privacyVarDeclFile.errors.txt
deleted file mode 100644
index 7a0288f42df..00000000000
--- a/tests/baselines/reference/privacyVarDeclFile.errors.txt
+++ /dev/null
@@ -1,484 +0,0 @@
-==== tests/cases/compiler/privacyVarDeclFile_externalModule.ts (20 errors) ====
-    
-    class privateClass {
-    }
-    
-    export class publicClass {
-    }
-    
-    export interface publicInterfaceWithPrivatePropertyTypes {
-        myProperty: privateClass;  // Error
-        ~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Property 'myProperty' of exported interface has or is using private name 'privateClass'.
-    }
-    
-    export interface publicInterfaceWithPublicPropertyTypes {
-        myProperty: publicClass;
-    }
-    
-    interface privateInterfaceWithPrivatePropertyTypes {
-        myProperty: privateClass;
-    }
-    
-    interface privateInterfaceWithPublicPropertyTypes {
-        myProperty: publicClass;
-    }
-    
-    export class publicClassWithWithPrivatePropertyTypes {
-        static myPublicStaticProperty: privateClass; // Error
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Public static property 'myPublicStaticProperty' of exported class has or is using private name 'privateClass'.
-        private static myPrivateStaticProperty: privateClass;
-        myPublicProperty: privateClass; // Error
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Public property 'myPublicProperty' of exported class has or is using private name 'privateClass'.
-        private myPrivateProperty: privateClass;
-    }
-    
-    export class publicClassWithWithPublicPropertyTypes {
-        static myPublicStaticProperty: publicClass;
-        private static myPrivateStaticProperty: publicClass;
-        myPublicProperty: publicClass;
-        private myPrivateProperty: publicClass;
-    }
-    
-    class privateClassWithWithPrivatePropertyTypes {
-        static myPublicStaticProperty: privateClass;
-        private static myPrivateStaticProperty: privateClass;
-        myPublicProperty: privateClass;
-        private myPrivateProperty: privateClass;
-    }
-    
-    class privateClassWithWithPublicPropertyTypes {
-        static myPublicStaticProperty: publicClass;
-        private static myPrivateStaticProperty: publicClass;
-        myPublicProperty: publicClass;
-        private myPrivateProperty: publicClass;
-    }
-    
-    export var publicVarWithPrivatePropertyTypes: privateClass; // Error
-               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Exported variable 'publicVarWithPrivatePropertyTypes' has or is using private name 'privateClass'.
-    export var publicVarWithPublicPropertyTypes: publicClass;
-    var privateVarWithPrivatePropertyTypes: privateClass;
-    var privateVarWithPublicPropertyTypes: publicClass;
-    
-    export declare var publicAmbientVarWithPrivatePropertyTypes: privateClass; // Error
-                       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Exported variable 'publicAmbientVarWithPrivatePropertyTypes' has or is using private name 'privateClass'.
-    export declare var publicAmbientVarWithPublicPropertyTypes: publicClass;
-    declare var privateAmbientVarWithPrivatePropertyTypes: privateClass;
-    declare var privateAmbientVarWithPublicPropertyTypes: publicClass;
-    
-    export interface publicInterfaceWithPrivateModulePropertyTypes {
-        myProperty: privateModule.publicClass; // Error
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Property 'myProperty' of exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-    }
-    export class publicClassWithPrivateModulePropertyTypes {
-        static myPublicStaticProperty: privateModule.publicClass; // Error
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Public static property 'myPublicStaticProperty' of exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-        myPublicProperty: privateModule.publicClass; // Error
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Public property 'myPublicProperty' of exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-    }
-    export var publicVarWithPrivateModulePropertyTypes: privateModule.publicClass; // Error
-               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Exported variable 'publicVarWithPrivateModulePropertyTypes' has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-    export declare var publicAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass; // Error
-                       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Exported variable 'publicAmbientVarWithPrivateModulePropertyTypes' has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-    
-    interface privateInterfaceWithPrivateModulePropertyTypes {
-        myProperty: privateModule.publicClass;
-    }
-    class privateClassWithPrivateModulePropertyTypes {
-        static myPublicStaticProperty: privateModule.publicClass;
-        myPublicProperty: privateModule.publicClass;
-    }
-    var privateVarWithPrivateModulePropertyTypes: privateModule.publicClass;
-    declare var privateAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass;
-    
-    export module publicModule {
-        class privateClass {
-        }
-    
-        export class publicClass {
-        }
-    
-        export interface publicInterfaceWithPrivatePropertyTypes {
-            myProperty: privateClass;  // Error
-            ~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Property 'myProperty' of exported interface has or is using private name 'privateClass'.
-        }
-    
-        export interface publicInterfaceWithPublicPropertyTypes {
-            myProperty: publicClass;
-        }
-    
-        interface privateInterfaceWithPrivatePropertyTypes {
-            myProperty: privateClass;
-        }
-    
-        interface privateInterfaceWithPublicPropertyTypes {
-            myProperty: publicClass;
-        }
-    
-        export class publicClassWithWithPrivatePropertyTypes {
-            static myPublicStaticProperty: privateClass; // Error
-            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Public static property 'myPublicStaticProperty' of exported class has or is using private name 'privateClass'.
-            private static myPrivateStaticProperty: privateClass;
-            myPublicProperty: privateClass; // Error
-            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Public property 'myPublicProperty' of exported class has or is using private name 'privateClass'.
-            private myPrivateProperty: privateClass;
-        }
-    
-        export class publicClassWithWithPublicPropertyTypes {
-            static myPublicStaticProperty: publicClass;
-            private static myPrivateStaticProperty: publicClass;
-            myPublicProperty: publicClass;
-            private myPrivateProperty: publicClass;
-        }
-    
-        class privateClassWithWithPrivatePropertyTypes {
-            static myPublicStaticProperty: privateClass;
-            private static myPrivateStaticProperty: privateClass;
-            myPublicProperty: privateClass;
-            private myPrivateProperty: privateClass;
-        }
-    
-        class privateClassWithWithPublicPropertyTypes {
-            static myPublicStaticProperty: publicClass;
-            private static myPrivateStaticProperty: publicClass;
-            myPublicProperty: publicClass;
-            private myPrivateProperty: publicClass;
-        }
-    
-        export var publicVarWithPrivatePropertyTypes: privateClass; // Error
-                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Exported variable 'publicVarWithPrivatePropertyTypes' has or is using private name 'privateClass'.
-        export var publicVarWithPublicPropertyTypes: publicClass;
-        var privateVarWithPrivatePropertyTypes: privateClass;
-        var privateVarWithPublicPropertyTypes: publicClass;
-    
-        export declare var publicAmbientVarWithPrivatePropertyTypes: privateClass; // Error
-                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Exported variable 'publicAmbientVarWithPrivatePropertyTypes' has or is using private name 'privateClass'.
-        export declare var publicAmbientVarWithPublicPropertyTypes: publicClass;
-        declare var privateAmbientVarWithPrivatePropertyTypes: privateClass;
-        declare var privateAmbientVarWithPublicPropertyTypes: publicClass;
-    
-        export interface publicInterfaceWithPrivateModulePropertyTypes {
-            myProperty: privateModule.publicClass; // Error
-            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Property 'myProperty' of exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-        }
-        export class publicClassWithPrivateModulePropertyTypes {
-            static myPublicStaticProperty: privateModule.publicClass; // Error
-            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Public static property 'myPublicStaticProperty' of exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-            myPublicProperty: privateModule.publicClass; // Error
-            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Public property 'myPublicProperty' of exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-        }
-        export var publicVarWithPrivateModulePropertyTypes: privateModule.publicClass; // Error
-                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Exported variable 'publicVarWithPrivateModulePropertyTypes' has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-        export declare var publicAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass; // Error
-                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Exported variable 'publicAmbientVarWithPrivateModulePropertyTypes' has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-    
-        interface privateInterfaceWithPrivateModulePropertyTypes {
-            myProperty: privateModule.publicClass;
-        }
-        class privateClassWithPrivateModulePropertyTypes {
-            static myPublicStaticProperty: privateModule.publicClass;
-            myPublicProperty: privateModule.publicClass;
-        }
-        var privateVarWithPrivateModulePropertyTypes: privateModule.publicClass;
-        declare var privateAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass;
-    }
-    
-    module privateModule {
-        class privateClass {
-        }
-    
-        export class publicClass {
-        }
-    
-        export interface publicInterfaceWithPrivatePropertyTypes {
-            myProperty: privateClass;  
-        }
-    
-        export interface publicInterfaceWithPublicPropertyTypes {
-            myProperty: publicClass;
-        }
-    
-        interface privateInterfaceWithPrivatePropertyTypes {
-            myProperty: privateClass;
-        }
-    
-        interface privateInterfaceWithPublicPropertyTypes {
-            myProperty: publicClass;
-        }
-    
-        export class publicClassWithWithPrivatePropertyTypes {
-            static myPublicStaticProperty: privateClass; 
-            private static myPrivateStaticProperty: privateClass;
-            myPublicProperty: privateClass; 
-            private myPrivateProperty: privateClass;
-        }
-    
-        export class publicClassWithWithPublicPropertyTypes {
-            static myPublicStaticProperty: publicClass;
-            private static myPrivateStaticProperty: publicClass;
-            myPublicProperty: publicClass;
-            private myPrivateProperty: publicClass;
-        }
-    
-        class privateClassWithWithPrivatePropertyTypes {
-            static myPublicStaticProperty: privateClass;
-            private static myPrivateStaticProperty: privateClass;
-            myPublicProperty: privateClass;
-            private myPrivateProperty: privateClass;
-        }
-    
-        class privateClassWithWithPublicPropertyTypes {
-            static myPublicStaticProperty: publicClass;
-            private static myPrivateStaticProperty: publicClass;
-            myPublicProperty: publicClass;
-            private myPrivateProperty: publicClass;
-        }
-    
-        export var publicVarWithPrivatePropertyTypes: privateClass; 
-        export var publicVarWithPublicPropertyTypes: publicClass;
-        var privateVarWithPrivatePropertyTypes: privateClass;
-        var privateVarWithPublicPropertyTypes: publicClass;
-    
-        export declare var publicAmbientVarWithPrivatePropertyTypes: privateClass; 
-        export declare var publicAmbientVarWithPublicPropertyTypes: publicClass;
-        declare var privateAmbientVarWithPrivatePropertyTypes: privateClass;
-        declare var privateAmbientVarWithPublicPropertyTypes: publicClass;
-    
-        export interface publicInterfaceWithPrivateModulePropertyTypes {
-            myProperty: privateModule.publicClass; 
-        }
-        export class publicClassWithPrivateModulePropertyTypes {
-            static myPublicStaticProperty: privateModule.publicClass; 
-            myPublicProperty: privateModule.publicClass; 
-        }
-        export var publicVarWithPrivateModulePropertyTypes: privateModule.publicClass; 
-        export declare var publicAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass;
-    
-        interface privateInterfaceWithPrivateModulePropertyTypes {
-            myProperty: privateModule.publicClass;
-        }
-        class privateClassWithPrivateModulePropertyTypes {
-            static myPublicStaticProperty: privateModule.publicClass;
-            myPublicProperty: privateModule.publicClass;
-        }
-        var privateVarWithPrivateModulePropertyTypes: privateModule.publicClass;
-        declare var privateAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass;
-    }
-    
-==== tests/cases/compiler/privacyVarDeclFile_GlobalFile.ts (10 errors) ====
-    class publicClassInGlobal {
-    }
-    interface publicInterfaceWithPublicPropertyTypesInGlobal {
-        myProperty: publicClassInGlobal;
-    }
-    class publicClassWithWithPublicPropertyTypesInGlobal {
-        static myPublicStaticProperty: publicClassInGlobal;
-        private static myPrivateStaticProperty: publicClassInGlobal;
-        myPublicProperty: publicClassInGlobal;
-        private myPrivateProperty: publicClassInGlobal;
-    }
-    var publicVarWithPublicPropertyTypesInGlobal: publicClassInGlobal;
-    declare var publicAmbientVarWithPublicPropertyTypesInGlobal: publicClassInGlobal;
-    
-    module publicModuleInGlobal {
-        class privateClass {
-        }
-    
-        export class publicClass {
-        }
-    
-        module privateModule {
-            class privateClass {
-            }
-    
-            export class publicClass {
-            }
-    
-            export interface publicInterfaceWithPrivatePropertyTypes {
-                myProperty: privateClass;
-            }
-    
-            export interface publicInterfaceWithPublicPropertyTypes {
-                myProperty: publicClass;
-            }
-    
-            interface privateInterfaceWithPrivatePropertyTypes {
-                myProperty: privateClass;
-            }
-    
-            interface privateInterfaceWithPublicPropertyTypes {
-                myProperty: publicClass;
-            }
-    
-            export class publicClassWithWithPrivatePropertyTypes {
-                static myPublicStaticProperty: privateClass;
-                private static myPrivateStaticProperty: privateClass;
-                myPublicProperty: privateClass;
-                private myPrivateProperty: privateClass;
-            }
-    
-            export class publicClassWithWithPublicPropertyTypes {
-                static myPublicStaticProperty: publicClass;
-                private static myPrivateStaticProperty: publicClass;
-                myPublicProperty: publicClass;
-                private myPrivateProperty: publicClass;
-            }
-    
-            class privateClassWithWithPrivatePropertyTypes {
-                static myPublicStaticProperty: privateClass;
-                private static myPrivateStaticProperty: privateClass;
-                myPublicProperty: privateClass;
-                private myPrivateProperty: privateClass;
-            }
-    
-            class privateClassWithWithPublicPropertyTypes {
-                static myPublicStaticProperty: publicClass;
-                private static myPrivateStaticProperty: publicClass;
-                myPublicProperty: publicClass;
-                private myPrivateProperty: publicClass;
-            }
-    
-            export var publicVarWithPrivatePropertyTypes: privateClass;
-            export var publicVarWithPublicPropertyTypes: publicClass;
-            var privateVarWithPrivatePropertyTypes: privateClass;
-            var privateVarWithPublicPropertyTypes: publicClass;
-    
-            export declare var publicAmbientVarWithPrivatePropertyTypes: privateClass;
-            export declare var publicAmbientVarWithPublicPropertyTypes: publicClass;
-            declare var privateAmbientVarWithPrivatePropertyTypes: privateClass;
-            declare var privateAmbientVarWithPublicPropertyTypes: publicClass;
-    
-            export interface publicInterfaceWithPrivateModulePropertyTypes {
-                myProperty: privateModule.publicClass;
-            }
-            export class publicClassWithPrivateModulePropertyTypes {
-                static myPublicStaticProperty: privateModule.publicClass;
-                myPublicProperty: privateModule.publicClass;
-            }
-            export var publicVarWithPrivateModulePropertyTypes: privateModule.publicClass;
-            export declare var publicAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass;
-    
-            interface privateInterfaceWithPrivateModulePropertyTypes {
-                myProperty: privateModule.publicClass;
-            }
-            class privateClassWithPrivateModulePropertyTypes {
-                static myPublicStaticProperty: privateModule.publicClass;
-                myPublicProperty: privateModule.publicClass;
-            }
-            var privateVarWithPrivateModulePropertyTypes: privateModule.publicClass;
-            declare var privateAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass;
-        }
-    
-        export interface publicInterfaceWithPrivatePropertyTypes {
-            myProperty: privateClass;  // Error
-            ~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Property 'myProperty' of exported interface has or is using private name 'privateClass'.
-        }
-    
-        export interface publicInterfaceWithPublicPropertyTypes {
-            myProperty: publicClass;
-        }
-    
-        interface privateInterfaceWithPrivatePropertyTypes {
-            myProperty: privateClass;
-        }
-    
-        interface privateInterfaceWithPublicPropertyTypes {
-            myProperty: publicClass;
-        }
-    
-        export class publicClassWithWithPrivatePropertyTypes {
-            static myPublicStaticProperty: privateClass; // Error
-            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Public static property 'myPublicStaticProperty' of exported class has or is using private name 'privateClass'.
-            private static myPrivateStaticProperty: privateClass;
-            myPublicProperty: privateClass; // Error
-            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Public property 'myPublicProperty' of exported class has or is using private name 'privateClass'.
-            private myPrivateProperty: privateClass;
-        }
-    
-        export class publicClassWithWithPublicPropertyTypes {
-            static myPublicStaticProperty: publicClass;
-            private static myPrivateStaticProperty: publicClass;
-            myPublicProperty: publicClass;
-            private myPrivateProperty: publicClass;
-        }
-    
-        class privateClassWithWithPrivatePropertyTypes {
-            static myPublicStaticProperty: privateClass;
-            private static myPrivateStaticProperty: privateClass;
-            myPublicProperty: privateClass;
-            private myPrivateProperty: privateClass;
-        }
-    
-        class privateClassWithWithPublicPropertyTypes {
-            static myPublicStaticProperty: publicClass;
-            private static myPrivateStaticProperty: publicClass;
-            myPublicProperty: publicClass;
-            private myPrivateProperty: publicClass;
-        }
-    
-        export var publicVarWithPrivatePropertyTypes: privateClass; // Error
-                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Exported variable 'publicVarWithPrivatePropertyTypes' has or is using private name 'privateClass'.
-        export var publicVarWithPublicPropertyTypes: publicClass;
-        var privateVarWithPrivatePropertyTypes: privateClass;
-        var privateVarWithPublicPropertyTypes: publicClass;
-    
-        export declare var publicAmbientVarWithPrivatePropertyTypes: privateClass; // Error
-                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Exported variable 'publicAmbientVarWithPrivatePropertyTypes' has or is using private name 'privateClass'.
-        export declare var publicAmbientVarWithPublicPropertyTypes: publicClass;
-        declare var privateAmbientVarWithPrivatePropertyTypes: privateClass;
-        declare var privateAmbientVarWithPublicPropertyTypes: publicClass;
-    
-        export interface publicInterfaceWithPrivateModulePropertyTypes {
-            myProperty: privateModule.publicClass; // Error
-            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Property 'myProperty' of exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-        }
-        export class publicClassWithPrivateModulePropertyTypes {
-            static myPublicStaticProperty: privateModule.publicClass; // Error
-            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Public static property 'myPublicStaticProperty' of exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-            myPublicProperty: privateModule.publicClass; // Error
-            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Public property 'myPublicProperty' of exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-        }
-        export var publicVarWithPrivateModulePropertyTypes: privateModule.publicClass; // Error
-                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Exported variable 'publicVarWithPrivateModulePropertyTypes' has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-        export declare var publicAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass; // Error
-                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Exported variable 'publicAmbientVarWithPrivateModulePropertyTypes' has or is using name 'privateModule.publicClass' from private module 'privateModule'.
-    
-        interface privateInterfaceWithPrivateModulePropertyTypes {
-            myProperty: privateModule.publicClass;
-        }
-        class privateClassWithPrivateModulePropertyTypes {
-            static myPublicStaticProperty: privateModule.publicClass;
-            myPublicProperty: privateModule.publicClass;
-        }
-        var privateVarWithPrivateModulePropertyTypes: privateModule.publicClass;
-        declare var privateAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/promiseChaining.errors.txt b/tests/baselines/reference/promiseChaining.errors.txt
new file mode 100644
index 00000000000..c128f434d80
--- /dev/null
+++ b/tests/baselines/reference/promiseChaining.errors.txt
@@ -0,0 +1,136 @@
+==== tests/cases/compiler/promiseChaining.ts (50 errors) ====
+    <<<<<<< HEAD
+    ~~
+!!! Declaration or statement expected.
+      ~~
+!!! Declaration or statement expected.
+        ~~
+!!! Declaration or statement expected.
+            ~~~~
+!!! Cannot find name 'HEAD'.
+    =======
+    ~~~
+!!! '>' expected.
+       ~~~
+!!! Expression expected.
+          ~
+!!! Expression expected.
+    // This exhibits the bug that you see with Promise typings having generic signatures in a generic type
+    
+    // BUG 858876: should get a fresh type parameter which each then call
+    
+    >>>>>>> d99cb83... Clean up 'blocked' tests
+    ~
+!!! Declaration or statement expected.
+     ~
+!!! Declaration or statement expected.
+      ~
+!!! Declaration or statement expected.
+       ~
+!!! Declaration or statement expected.
+        ~
+!!! Declaration or statement expected.
+         ~
+!!! Declaration or statement expected.
+          ~
+!!! Declaration or statement expected.
+                   ~~~
+!!! ';' expected.
+                             ~~
+!!! ';' expected.
+                                ~~~~~~~~~
+!!! ';' expected.
+                                          ~~~~~
+!!! ';' expected.
+            ~~~~~~~
+!!! Cannot find name 'd99cb83'.
+                       ~~~~~
+!!! Cannot find name 'Clean'.
+                             ~~
+!!! Cannot find name 'up'.
+                                          ~~~~~
+!!! Cannot find name 'tests'.
+    class Chain<T> {
+        constructor(public value: T) { }
+        then<S>(cb: (x: T) => S): Chain<S> {
+            var result = cb(this.value);
+    <<<<<<< HEAD
+    ~~
+!!! Statement expected.
+      ~~
+!!! Statement expected.
+        ~~
+!!! Statement expected.
+            ~~~~
+!!! Cannot find name 'HEAD'.
+            // should get a fresh type parameter which each then call
+            var z = this.then(x => result)/*S*/.then(x => "abc")/*string*/.then(x => x.length)/*number*/; // No error
+            ~~~
+!!! '>' expected.
+            return new Chain(result);
+        }
+    }
+    =======
+    ~~~
+!!! Declaration or statement expected.
+       ~~~
+!!! Declaration or statement expected.
+          ~
+!!! Declaration or statement expected.
+            var z = this.then(x => result).then(x => "abc").then(x => x.length); 
+                                   ~~~~~~
+!!! Cannot find name 'result'.
+            return new Chain(result);
+            ~~~~~~
+!!! A 'return' statement can only be used within a function body.
+        }
+        ~
+!!! Declaration or statement expected.
+    }
+    ~
+!!! Declaration or statement expected.
+    
+    // same example but with constraints on each type parameter
+    class Chain2<T extends { length: number }> {
+        constructor(public value: T) { }
+        then<S extends Function>(cb: (x: T) => S): Chain2<S> {
+            var result = cb(this.value);
+            // should get a fresh type parameter which each then call
+            var z = this.then(x => result).then(x => "abc").then(x => x.length);
+                                                ~~~~~~~~~~
+!!! Argument of type '(x: S) => string' is not assignable to parameter of type '(x: S) => Function'.
+            return new Chain2(result);
+        }
+    }
+    >>>>>>> d99cb83... Clean up 'blocked' tests
+    ~
+!!! Declaration or statement expected.
+     ~
+!!! Declaration or statement expected.
+      ~
+!!! Declaration or statement expected.
+       ~
+!!! Declaration or statement expected.
+        ~
+!!! Declaration or statement expected.
+         ~
+!!! Declaration or statement expected.
+          ~
+!!! Declaration or statement expected.
+                   ~~~
+!!! ';' expected.
+                             ~~
+!!! ';' expected.
+                                ~~~~~~~~~
+!!! ';' expected.
+                                          ~~~~~
+!!! ';' expected.
+            ~~~~~~~
+!!! Cannot find name 'd99cb83'.
+                       ~~~~~
+!!! Cannot find name 'Clean'.
+                             ~~
+!!! Cannot find name 'up'.
+                                          ~~~~~
+!!! Cannot find name 'tests'.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/promiseChaining.types b/tests/baselines/reference/promiseChaining.types
deleted file mode 100644
index 6edb6c6d09f..00000000000
--- a/tests/baselines/reference/promiseChaining.types
+++ /dev/null
@@ -1,59 +0,0 @@
-=== 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
->cb(this.value) : S
->cb : (x: T) => S
->this.value : T
->this : Chain<T>
->value : T
-
-        // should get a fresh type parameter which each then call
-        var z = this.then(x => result)/*S*/.then(x => "abc")/*string*/.then(x => x.length)/*number*/; // No error
->z : Chain<number>
->this.then(x => result)/*S*/.then(x => "abc")/*string*/.then(x => x.length) : Chain<number>
->this.then(x => result)/*S*/.then(x => "abc")/*string*/.then : <S>(cb: (x: string) => S) => Chain<S>
->this.then(x => result)/*S*/.then(x => "abc") : Chain<string>
->this.then(x => result)/*S*/.then : <S>(cb: (x: S) => S) => Chain<S>
->this.then(x => result) : Chain<S>
->this.then : <S>(cb: (x: T) => S) => Chain<S>
->this : Chain<T>
->then : <S>(cb: (x: T) => S) => Chain<S>
->x => result : (x: T) => S
->x : T
->result : S
->then : <S>(cb: (x: S) => S) => Chain<S>
->x => "abc" : (x: S) => string
->x : S
->then : <S>(cb: (x: string) => S) => Chain<S>
->x => x.length : (x: string) => number
->x : string
->x.length : number
->x : string
->length : number
-
-        return new Chain(result);
->new Chain(result) : Chain<S>
->Chain : typeof Chain
->result : S
-    }
-}
-
-
diff --git a/tests/baselines/reference/promiseChaining2.errors.txt b/tests/baselines/reference/promiseChaining2.errors.txt
deleted file mode 100644
index 62a12242558..00000000000
--- a/tests/baselines/reference/promiseChaining2.errors.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-==== tests/cases/compiler/promiseChaining2.ts (1 errors) ====
-    // same example but with constraints on each type parameter
-    class Chain2<T extends { length: number }> {
-        constructor(public value: T) { }
-        then<S extends Function>(cb: (x: T) => S): Chain2<S> {
-            var result = cb(this.value);
-            // should get a fresh type parameter which each then call
-            var z = this.then(x => result).then(x => "abc").then(x => x.length);
-                                                ~~~~~~~~~~
-!!! Argument of type '(x: S) => string' is not assignable to parameter of type '(x: S) => Function'.
-            return new Chain2(result);
-        }
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/promiseChaining2.js b/tests/baselines/reference/promiseChaining2.js
index ed03ab2c97a..e9fed96839b 100644
--- a/tests/baselines/reference/promiseChaining2.js
+++ b/tests/baselines/reference/promiseChaining2.js
@@ -1,26 +1,4 @@
 //// [promiseChaining2.ts]
-// same example but with constraints on each type parameter
-class Chain2<T extends { length: number }> {
-    constructor(public value: T) { }
-    then<S extends Function>(cb: (x: T) => S): Chain2<S> {
-        var result = cb(this.value);
-        // should get a fresh type parameter which each then call
-        var z = this.then(x => result).then(x => "abc").then(x => x.length);
-        return new Chain2(result);
-    }
-}
+
 
 //// [promiseChaining2.js]
-// same example but with constraints on each type parameter
-var Chain2 = (function () {
-    function Chain2(value) {
-        this.value = value;
-    }
-    Chain2.prototype.then = function (cb) {
-        var result = cb(this.value);
-        // should get a fresh type parameter which each then call
-        var z = this.then(function (x) { return result; }).then(function (x) { return "abc"; }).then(function (x) { return x.length; });
-        return new Chain2(result);
-    };
-    return Chain2;
-})();
diff --git a/tests/baselines/reference/promiseChaining2.types b/tests/baselines/reference/promiseChaining2.types
new file mode 100644
index 00000000000..14ab4cc823f
--- /dev/null
+++ b/tests/baselines/reference/promiseChaining2.types
@@ -0,0 +1,3 @@
+=== tests/cases/compiler/promiseChaining2.ts ===
+
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/promiseTest.types b/tests/baselines/reference/promiseTest.types
index 6f67484ab77..ac21c5973ad 100644
--- a/tests/baselines/reference/promiseTest.types
+++ b/tests/baselines/reference/promiseTest.types
@@ -36,15 +36,11 @@ var p: Promise<number> = null;
 
 var p2 = p.then(function (x) {
 >p2 : Promise<number>
->p.then(function (x) {
-    return p;
-} ) : Promise<number>
+>p.then(function (x) {    return p;} ) : Promise<number>
 >p.then : { <A>(success?: (value: number) => Promise<A>): Promise<A>; <B>(success?: (value: number) => B): Promise<B>; }
 >p : Promise<number>
 >then : { <A>(success?: (value: number) => Promise<A>): Promise<A>; <B>(success?: (value: number) => B): Promise<B>; }
->function (x) {
-    return p;
-} : (x: number) => Promise<number>
+>function (x) {    return p;} : (x: number) => Promise<number>
 >x : number
 
     return p;
diff --git a/tests/baselines/reference/promiseTypeInference.types b/tests/baselines/reference/promiseTypeInference.types
index 52d026adb1d..3674ea90dcf 100644
--- a/tests/baselines/reference/promiseTypeInference.types
+++ b/tests/baselines/reference/promiseTypeInference.types
@@ -30,12 +30,12 @@ interface IPromise<T> {
 >U : U
 }
 declare function load(name: string): Promise<string>;
->load : (name: string) => Promise<string>
+>load : typeof load
 >name : string
 >Promise : Promise<T>
 
 declare function convert(s: string): IPromise<number>;
->convert : (s: string) => IPromise<number>
+>convert : typeof convert
 >s : string
 >IPromise : IPromise<T>
 
@@ -44,11 +44,11 @@ var $$x = load("something").then(s => convert(s));
 >load("something").then(s => convert(s)) : Promise<number>
 >load("something").then : <U>(success?: (value: string) => Promise<U>) => Promise<U>
 >load("something") : Promise<string>
->load : (name: string) => Promise<string>
+>load : typeof load
 >then : <U>(success?: (value: string) => Promise<U>) => Promise<U>
 >s => convert(s) : (s: string) => IPromise<number>
 >s : string
 >convert(s) : IPromise<number>
->convert : (s: string) => IPromise<number>
+>convert : typeof convert
 >s : string
 
diff --git a/tests/baselines/reference/propagationOfPromiseInitialization.types b/tests/baselines/reference/propagationOfPromiseInitialization.types
index d7b97721320..e146aea91d8 100644
--- a/tests/baselines/reference/propagationOfPromiseInitialization.types
+++ b/tests/baselines/reference/propagationOfPromiseInitialization.types
@@ -22,40 +22,20 @@ var 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>
->foo.then((x) => {
-    // x is inferred to be a number
-    return "asdf";
-}).then : <TResult>(successCallback: (promiseValue: string) => TResult, errorCallback?: (reason: any) => TResult) => IPromise<TResult>
->foo.then((x) => {
-    // x is inferred to be a number
-    return "asdf";
-}) : IPromise<string>
+>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>
+>foo.then((x) => {    // x is inferred to be a number    return "asdf";}).then : <TResult>(successCallback: (promiseValue: string) => TResult, errorCallback?: (reason: any) => TResult) => IPromise<TResult>
+>foo.then((x) => {    // x is inferred to be a number    return "asdf";}) : IPromise<string>
 >foo.then : <TResult>(successCallback: (promiseValue: number) => TResult, errorCallback?: (reason: any) => TResult) => IPromise<TResult>
 >foo : IPromise<number>
 >then : <TResult>(successCallback: (promiseValue: number) => TResult, errorCallback?: (reason: any) => TResult) => IPromise<TResult>
->(x) => {
-    // x is inferred to be a number
-    return "asdf";
-} : (x: number) => string
+>(x) => {    // x is inferred to be a number    return "asdf";} : (x: number) => string
 >x : number
 
     // x is inferred to be a number
     return "asdf";
 }).then((x) => {
 >then : <TResult>(successCallback: (promiseValue: string) => TResult, errorCallback?: (reason: any) => TResult) => IPromise<TResult>
->(x) => {
-    // x is inferred to be string
-    x.length;
-    return 123;
-} : (x: string) => number
+>(x) => {    // x is inferred to be string    x.length;    return 123;} : (x: string) => number
 >x : string
 
     // x is inferred to be string
diff --git a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints.types b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints.types
index d6779649c30..b467740332b 100644
--- a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints.types
+++ b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints.types
@@ -97,19 +97,11 @@ var r3b = a()['getDate']();
 
 var b = {
 >b : { foo: <T extends Date>(x: T) => number; }
->{
-    foo: <T extends Date>(x: T) => {
-        var a = x['getDate'](); // number
-        return a + x.getDate();
-    }
-} : { foo: <T extends Date>(x: T) => number; }
+>{    foo: <T extends Date>(x: T) => {        var a = x['getDate'](); // number        return a + x.getDate();    }} : { foo: <T extends Date>(x: T) => number; }
 
     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 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
diff --git a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints2.types b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints2.types
index f7bf888533b..364184d5652 100644
--- a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints2.types
+++ b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints2.types
@@ -221,19 +221,11 @@ var r3d = a(aB, aB)['foo']();
 
 var b = {
 >b : { foo: <U extends A, T extends A>(x: U, y: T) => string; }
->{
-    foo: <U extends A, T extends A>(x: U, y: T) => {
-        var a = x['foo'](); // should be string
-        return a + x.foo();
-    }
-} : { foo: <U extends A, T extends A>(x: U, y: T) => string; }
+>{    foo: <U extends A, T extends A>(x: U, y: T) => {        var a = x['foo'](); // should be string        return a + x.foo();    }} : { foo: <U extends A, T extends A>(x: U, y: T) => string; }
 
     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 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
diff --git a/tests/baselines/reference/propertyAccessOnTypeParameterWithoutConstraints.types b/tests/baselines/reference/propertyAccessOnTypeParameterWithoutConstraints.types
index c78a6608aa3..038c7962284 100644
--- a/tests/baselines/reference/propertyAccessOnTypeParameterWithoutConstraints.types
+++ b/tests/baselines/reference/propertyAccessOnTypeParameterWithoutConstraints.types
@@ -88,19 +88,11 @@ var r3b: string = a()['toString']();
 
 var b = {
 >b : { foo: <T>(x: T) => string; }
->{
-    foo: <T>(x: T) => {
-        var a = x['toString'](); // should be string
-        return a + x.toString();
-    }
-} : { foo: <T>(x: T) => string; }
+>{    foo: <T>(x: T) => {        var a = x['toString'](); // should be string        return a + x.toString();    }} : { foo: <T>(x: T) => string; }
 
     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>(x: T) => {        var a = x['toString'](); // should be string        return a + x.toString();    } : <T>(x: T) => string
 >T : T
 >x : T
 >T : T
diff --git a/tests/baselines/reference/propertyNameWithoutTypeAnnotation.types b/tests/baselines/reference/propertyNameWithoutTypeAnnotation.types
index cf8dd038801..bdc8452863d 100644
--- a/tests/baselines/reference/propertyNameWithoutTypeAnnotation.types
+++ b/tests/baselines/reference/propertyNameWithoutTypeAnnotation.types
@@ -22,9 +22,7 @@ var a: {
 
 var b = {
 >b : { foo: any; }
->{
-    foo: null
-} : { foo: null; }
+>{    foo: null} : { foo: null; }
 
     foo: null
 >foo : any
diff --git a/tests/baselines/reference/propertyParameterWithQuestionMark.errors.txt b/tests/baselines/reference/propertyParameterWithQuestionMark.errors.txt
deleted file mode 100644
index c58b2345205..00000000000
--- a/tests/baselines/reference/propertyParameterWithQuestionMark.errors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-==== tests/cases/compiler/propertyParameterWithQuestionMark.ts (2 errors) ====
-    class C {
-        constructor(public x?) { }
-    }
-    
-    // x should not be an optional property
-    var v: C = {}; // Should fail
-        ~
-!!! Type '{}' is not assignable to type 'C':
-!!!   Property 'x' is missing in type '{}'.
-    var v2: { x? }
-    v = v2; // Should fail
-    ~
-!!! Type '{ x?: any; }' is not assignable to type 'C':
-!!!   Required property 'x' cannot be reimplemented with optional property in '{ x?: any; }'.
-    var v3: { x } = new C; // Should succeed
\ No newline at end of file
diff --git a/tests/baselines/reference/protoAsIndexInIndexExpression.types b/tests/baselines/reference/protoAsIndexInIndexExpression.types
index fdfb612623b..e950098e6a1 100644
--- a/tests/baselines/reference/protoAsIndexInIndexExpression.types
+++ b/tests/baselines/reference/protoAsIndexInIndexExpression.types
@@ -6,15 +6,11 @@ var EntityPrototype = undefined;
 
 var WorkspacePrototype = {
 >WorkspacePrototype : { serialize: () => any; }
->{
-    serialize: function (): any {
-    }
-} : { serialize: () => any; }
+>{    serialize: function (): any {    }} : { serialize: () => any; }
 
     serialize: function (): any {
 >serialize : () => any
->function (): any {
-    } : () => any
+>function (): any {    } : () => any
     }
 };
 WorkspacePrototype['__proto__'] = EntityPrototype;
@@ -25,9 +21,7 @@ WorkspacePrototype['__proto__'] = EntityPrototype;
 
 var o = {
 >o : {}
->{
-    "__proto__": 0
-} : {}
+>{    "__proto__": 0} : {}
 
     "__proto__": 0
 };
diff --git a/tests/baselines/reference/rectype.types b/tests/baselines/reference/rectype.types
index 403e7a3a4dc..5d8da81c3e1 100644
--- a/tests/baselines/reference/rectype.types
+++ b/tests/baselines/reference/rectype.types
@@ -9,35 +9,35 @@ module M {
 >I : I
 
     export function f(p: I) { return f };
->f : (p: I) => typeof f
+>f : typeof f
 >p : I
 >I : I
->f : (p: I) => typeof f
+>f : typeof f
 
     var i:I;
 >i : I
 >I : I
 
     f(i);
->f(i) : (p: I) => typeof f
->f : (p: I) => typeof f
+>f(i) : typeof f
+>f : typeof f
 >i : I
 
     f(f(i));
->f(f(i)) : (p: I) => typeof f
->f : (p: I) => typeof f
->f(i) : (p: I) => typeof f
->f : (p: I) => typeof f
+>f(f(i)) : typeof f
+>f : typeof f
+>f(i) : typeof f
+>f : typeof f
 >i : I
 
     f((f(f(i))));
->f((f(f(i)))) : (p: I) => typeof f
->f : (p: I) => typeof f
->(f(f(i))) : (p: I) => typeof f
->f(f(i)) : (p: I) => typeof f
->f : (p: I) => typeof f
->f(i) : (p: I) => typeof f
->f : (p: I) => typeof f
+>f((f(f(i)))) : typeof f
+>f : typeof f
+>(f(f(i))) : typeof f
+>f(f(i)) : typeof f
+>f : typeof f
+>f(i) : typeof f
+>f : typeof f
 >i : I
 }
 
diff --git a/tests/baselines/reference/recursiveComplicatedClasses.types b/tests/baselines/reference/recursiveComplicatedClasses.types
index d969bbfcea0..cb0db56e69b 100644
--- a/tests/baselines/reference/recursiveComplicatedClasses.types
+++ b/tests/baselines/reference/recursiveComplicatedClasses.types
@@ -8,7 +8,7 @@ class Signature {
 }
 
 function aEnclosesB(a: Symbol) {
->aEnclosesB : (a: Symbol) => boolean
+>aEnclosesB : typeof aEnclosesB
 >a : Symbol
 >Symbol : Symbol
 
@@ -30,7 +30,7 @@ class Symbol {
 
         return aEnclosesB(b);
 >aEnclosesB(b) : boolean
->aEnclosesB : (a: Symbol) => boolean
+>aEnclosesB : typeof aEnclosesB
 >b : TypeSymbol
     }
 
diff --git a/tests/baselines/reference/recursiveFunctionTypes1.types b/tests/baselines/reference/recursiveFunctionTypes1.types
index 535555ef13d..005a4989420 100644
--- a/tests/baselines/reference/recursiveFunctionTypes1.types
+++ b/tests/baselines/reference/recursiveFunctionTypes1.types
@@ -3,8 +3,8 @@ class C {
 >C : C
 
      static g(t: typeof C.g){ }
->g : (t: typeof g) => void
->t : (t: typeof g) => void
+>g : typeof g
+>t : typeof g
 >C : typeof C
->g : (t: typeof g) => void
+>g : typeof g
 }
diff --git a/tests/baselines/reference/recursiveGenericMethodCall.types b/tests/baselines/reference/recursiveGenericMethodCall.types
index ef03ca545df..948790e31fa 100644
--- a/tests/baselines/reference/recursiveGenericMethodCall.types
+++ b/tests/baselines/reference/recursiveGenericMethodCall.types
@@ -5,7 +5,7 @@ interface Generator<T> { (): T; }
 >T : T
 
 function Generate<T>(func: Generator<T>): T {
->Generate : <T>(func: Generator<T>) => T
+>Generate : typeof Generate
 >T : T
 >func : Generator<T>
 >Generator : Generator<T>
@@ -14,7 +14,7 @@ function Generate<T>(func: Generator<T>): T {
 
     return Generate(func);
 >Generate(func) : T
->Generate : <T>(func: Generator<T>) => T
+>Generate : typeof Generate
 >func : Generator<T>
 }
 
diff --git a/tests/baselines/reference/recursiveGenericSignatureInstantiation.types b/tests/baselines/reference/recursiveGenericSignatureInstantiation.types
index f1e93270396..8d61d58549c 100644
--- a/tests/baselines/reference/recursiveGenericSignatureInstantiation.types
+++ b/tests/baselines/reference/recursiveGenericSignatureInstantiation.types
@@ -1,13 +1,13 @@
 === tests/cases/compiler/recursiveGenericSignatureInstantiation.ts ===
 function f6<T>(x: T) {
->f6 : <T>(x: T) => any
+>f6 : typeof f6
 >T : T
 >x : T
 >T : T
 
     return f6(x);
 >f6(x) : any
->f6 : <T>(x: T) => any
+>f6 : typeof f6
 >x : T
 }
 
diff --git a/tests/baselines/reference/recursiveIdenticalOverloadResolution.types b/tests/baselines/reference/recursiveIdenticalOverloadResolution.types
index e2ec96b1c82..18000888d4f 100644
--- a/tests/baselines/reference/recursiveIdenticalOverloadResolution.types
+++ b/tests/baselines/reference/recursiveIdenticalOverloadResolution.types
@@ -10,35 +10,35 @@ module M {
 >I : I
 
    function f(p: I) { return f };
->f : (p: I) => typeof f
+>f : typeof f
 >p : I
 >I : I
->f : (p: I) => typeof f
+>f : typeof f
 
    var i: I;
 >i : I
 >I : I
 
    f(i);
->f(i) : (p: I) => typeof f
->f : (p: I) => typeof f
+>f(i) : typeof f
+>f : typeof f
 >i : I
 
    f(f(i));
->f(f(i)) : (p: I) => typeof f
->f : (p: I) => typeof f
->f(i) : (p: I) => typeof f
->f : (p: I) => typeof f
+>f(f(i)) : typeof f
+>f : typeof f
+>f(i) : typeof f
+>f : typeof f
 >i : I
 
    f((f(f(i))));
->f((f(f(i)))) : (p: I) => typeof f
->f : (p: I) => typeof f
->(f(f(i))) : (p: I) => typeof f
->f(f(i)) : (p: I) => typeof f
->f : (p: I) => typeof f
->f(i) : (p: I) => typeof f
->f : (p: I) => typeof f
+>f((f(f(i)))) : typeof f
+>f : typeof f
+>(f(f(i))) : typeof f
+>f(f(i)) : typeof f
+>f : typeof f
+>f(i) : typeof f
+>f : typeof f
 >i : I
 
 }
diff --git a/tests/baselines/reference/recursiveInference1.types b/tests/baselines/reference/recursiveInference1.types
index 3fef5dbb805..02688f17705 100644
--- a/tests/baselines/reference/recursiveInference1.types
+++ b/tests/baselines/reference/recursiveInference1.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/recursiveInference1.ts ===
 function fib(x:number) { return x <= 1 ? x : fib(x - 1) + fib(x - 2); }
->fib : (x: number) => any
+>fib : typeof fib
 >x : number
 >x <= 1 ? x : fib(x - 1) + fib(x - 2) : any
 >x <= 1 : boolean
@@ -8,16 +8,16 @@ function fib(x:number) { return x <= 1 ? x : fib(x - 1) + fib(x - 2); }
 >x : number
 >fib(x - 1) + fib(x - 2) : any
 >fib(x - 1) : any
->fib : (x: number) => any
+>fib : typeof fib
 >x - 1 : number
 >x : number
 >fib(x - 2) : any
->fib : (x: number) => any
+>fib : typeof fib
 >x - 2 : number
 >x : number
 
 var result = fib(5);
 >result : any
 >fib(5) : any
->fib : (x: number) => any
+>fib : typeof fib
 
diff --git a/tests/baselines/reference/recursiveMods.types b/tests/baselines/reference/recursiveMods.types
index a02156a6e9b..016b9a72129 100644
--- a/tests/baselines/reference/recursiveMods.types
+++ b/tests/baselines/reference/recursiveMods.types
@@ -10,12 +10,12 @@ export module Foo {
 >Foo : typeof Foo
 
 	function Bar() : C {
->Bar : () => C
+>Bar : typeof Bar
 >C : C
 
 		if (true) { return Bar();}
 >Bar() : C
->Bar : () => C
+>Bar : typeof Bar
 
 		return new C();
 >new C() : C
@@ -23,27 +23,27 @@ export module Foo {
 	}
 
 	function Baz() : C {
->Baz : () => C
+>Baz : typeof Baz
 >C : C
 
 		var c = Baz();
 >c : C
 >Baz() : C
->Baz : () => C
+>Baz : typeof Baz
 
 		return Bar();
 >Bar() : C
->Bar : () => C
+>Bar : typeof Bar
 	}
 
 	function Gar() {
->Gar : () => void
+>Gar : typeof Gar
 
 		var c : C = Baz();
 >c : C
 >C : C
 >Baz() : C
->Baz : () => C
+>Baz : typeof Baz
 
 		return;
 	}
diff --git a/tests/baselines/reference/recursiveReturns.types b/tests/baselines/reference/recursiveReturns.types
index dfb54f126a3..a62578cf41a 100644
--- a/tests/baselines/reference/recursiveReturns.types
+++ b/tests/baselines/reference/recursiveReturns.types
@@ -1,21 +1,21 @@
 === tests/cases/compiler/recursiveReturns.ts ===
 function R1() {
->R1 : () => void
+>R1 : typeof R1
 
 	R1();
 >R1() : void
->R1 : () => void
+>R1 : typeof R1
 
 	return;
 }
 
 function R2() { R2(); }
->R2 : () => void
+>R2 : typeof R2
 >R2() : void
->R2 : () => void
+>R2 : typeof R2
 
 function R3(n:number) {
->R3 : (n: number) => void
+>R3 : typeof R3
 >n : number
 
 	if (n == 0) {
@@ -27,7 +27,7 @@ function R3(n:number) {
 	else {
 		R3(n--);
 >R3(n--) : void
->R3 : (n: number) => void
+>R3 : typeof R3
 >n-- : number
 >n : number
 	}
diff --git a/tests/baselines/reference/regExpWithSlashInCharClass.js b/tests/baselines/reference/regExpWithSlashInCharClass.js
deleted file mode 100644
index e96b6165a97..00000000000
--- a/tests/baselines/reference/regExpWithSlashInCharClass.js
+++ /dev/null
@@ -1,10 +0,0 @@
-//// [regExpWithSlashInCharClass.ts]
-var foo1 = "a/".replace(/.[/]/, "");
-var foo2 = "a//".replace(/.[//]/g, "");
-var foo3 = "a/".replace(/.[/no sleep /till/]/, "bugfix");
-
-
-//// [regExpWithSlashInCharClass.js]
-var foo1 = "a/".replace(/.[/]/, "");
-var foo2 = "a//".replace(/.[//]/g, "");
-var foo3 = "a/".replace(/.[/no sleep /till/]/, "bugfix");
diff --git a/tests/baselines/reference/regExpWithSlashInCharClass.types b/tests/baselines/reference/regExpWithSlashInCharClass.types
deleted file mode 100644
index eb1cd88795a..00000000000
--- a/tests/baselines/reference/regExpWithSlashInCharClass.types
+++ /dev/null
@@ -1,22 +0,0 @@
-=== tests/cases/compiler/regExpWithSlashInCharClass.ts ===
-var foo1 = "a/".replace(/.[/]/, "");
->foo1 : string
->"a/".replace(/.[/]/, "") : string
->"a/".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; }
->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; }
->/.[/]/ : RegExp
-
-var foo2 = "a//".replace(/.[//]/g, "");
->foo2 : string
->"a//".replace(/.[//]/g, "") : string
->"a//".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; }
->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; }
->/.[//]/g : RegExp
-
-var foo3 = "a/".replace(/.[/no sleep /till/]/, "bugfix");
->foo3 : string
->"a/".replace(/.[/no sleep /till/]/, "bugfix") : string
->"a/".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; }
->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; }
->/.[/no sleep /till/]/ : RegExp
-
diff --git a/tests/baselines/reference/reservedNameOnInterfaceImport.errors.txt b/tests/baselines/reference/reservedNameOnInterfaceImport.errors.txt
deleted file mode 100644
index 1d2b5665a2f..00000000000
--- a/tests/baselines/reference/reservedNameOnInterfaceImport.errors.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-==== tests/cases/compiler/reservedNameOnInterfaceImport.ts (1 errors) ====
-    declare module test {
-        interface istring { }
-    
-        // Should error; 'test.istring' is a type, so this import conflicts with the 'string' type.
-        import string = test.istring;
-               ~~~~~~
-!!! Import name cannot be 'string'
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/reservedNameOnInterfaceImport.js b/tests/baselines/reference/reservedNameOnInterfaceImport.js
deleted file mode 100644
index 028fe49abca..00000000000
--- a/tests/baselines/reference/reservedNameOnInterfaceImport.js
+++ /dev/null
@@ -1,10 +0,0 @@
-//// [reservedNameOnInterfaceImport.ts]
-declare module test {
-    interface istring { }
-
-    // Should error; 'test.istring' is a type, so this import conflicts with the 'string' type.
-    import string = test.istring;
-}
-
-
-//// [reservedNameOnInterfaceImport.js]
diff --git a/tests/baselines/reference/reservedNameOnModuleImport.js b/tests/baselines/reference/reservedNameOnModuleImport.js
deleted file mode 100644
index 4024afc4ba1..00000000000
--- a/tests/baselines/reference/reservedNameOnModuleImport.js
+++ /dev/null
@@ -1,10 +0,0 @@
-//// [reservedNameOnModuleImport.ts]
-declare module test {
-    module mstring { }
-
-    // Should be fine; this does not clobber any declared values.
-    export import string = mstring;
-}
-
-
-//// [reservedNameOnModuleImport.js]
diff --git a/tests/baselines/reference/reservedNameOnModuleImport.types b/tests/baselines/reference/reservedNameOnModuleImport.types
deleted file mode 100644
index 99f1c2dba27..00000000000
--- a/tests/baselines/reference/reservedNameOnModuleImport.types
+++ /dev/null
@@ -1,13 +0,0 @@
-=== tests/cases/compiler/reservedNameOnModuleImport.ts ===
-declare module test {
->test : typeof test
-
-    module mstring { }
->mstring : mstring
-
-    // Should be fine; this does not clobber any declared values.
-    export import string = mstring;
->string : string
->mstring : mstring
-}
-
diff --git a/tests/baselines/reference/reservedNameOnModuleImportWithInterface.errors.txt b/tests/baselines/reference/reservedNameOnModuleImportWithInterface.errors.txt
deleted file mode 100644
index 57ec0f94b91..00000000000
--- a/tests/baselines/reference/reservedNameOnModuleImportWithInterface.errors.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-==== tests/cases/compiler/reservedNameOnModuleImportWithInterface.ts (1 errors) ====
-    declare module test {
-        interface mi_string { }
-        module mi_string { }
-    
-        // Should error; imports both a type and a module, which means it conflicts with the 'string' type.
-        import string = mi_string;
-               ~~~~~~
-!!! Import name cannot be 'string'
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/reservedNameOnModuleImportWithInterface.js b/tests/baselines/reference/reservedNameOnModuleImportWithInterface.js
deleted file mode 100644
index c5dc15747e2..00000000000
--- a/tests/baselines/reference/reservedNameOnModuleImportWithInterface.js
+++ /dev/null
@@ -1,11 +0,0 @@
-//// [reservedNameOnModuleImportWithInterface.ts]
-declare module test {
-    interface mi_string { }
-    module mi_string { }
-
-    // Should error; imports both a type and a module, which means it conflicts with the 'string' type.
-    import string = mi_string;
-}
-
-
-//// [reservedNameOnModuleImportWithInterface.js]
diff --git a/tests/baselines/reference/reservedWords.types b/tests/baselines/reference/reservedWords.types
index 244753b0ae8..769039a76bf 100644
--- a/tests/baselines/reference/reservedWords.types
+++ b/tests/baselines/reference/reservedWords.types
@@ -1,12 +1,7 @@
 === tests/cases/compiler/reservedWords.ts ===
 var obj = {
 >obj : { if: number; debugger: number; break: number; function: number; }
->{
-    if: 0,
-    debugger: 2,
-    break: 3,
-    function: 4
-} : { if: number; debugger: number; break: number; function: number; }
+>{    if: 0,    debugger: 2,    break: 3,    function: 4} : { if: number; debugger: number; break: number; function: number; }
 
     if: 0,
 >if : number
@@ -25,13 +20,7 @@ var obj = {
 
 var obj2 = {
 >obj2 : { if: number; while: number; debugger: number; break: number; function: number; }
->{
-    if: 0,
-    while: 1,
-    debugger: 2,
-    break: 3,
-    function: 4
-} : { if: number; while: number; debugger: number; break: number; function: number; }
+>{    if: 0,    while: 1,    debugger: 2,    break: 3,    function: 4} : { if: number; while: number; debugger: number; break: number; function: number; }
 
     if: 0,
 >if : number
diff --git a/tests/baselines/reference/restParameterNoTypeAnnotation.types b/tests/baselines/reference/restParameterNoTypeAnnotation.types
index 0298ff37ca5..d4b5f3ed850 100644
--- a/tests/baselines/reference/restParameterNoTypeAnnotation.types
+++ b/tests/baselines/reference/restParameterNoTypeAnnotation.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/restParameterNoTypeAnnotation.ts ===
 function foo(...rest) {   
->foo : (...rest: any[]) => number
+>foo : typeof foo
 >rest : any[]
 
      var x: number = rest[0];
diff --git a/tests/baselines/reference/restParameters.types b/tests/baselines/reference/restParameters.types
index 441635287ea..dea68d33762 100644
--- a/tests/baselines/reference/restParameters.types
+++ b/tests/baselines/reference/restParameters.types
@@ -1,23 +1,23 @@
 === tests/cases/compiler/restParameters.ts ===
 function f18(a?:string, ...b:number[]){}
->f18 : (a?: string, ...b: number[]) => void
+>f18 : typeof f18
 >a : string
 >b : number[]
  
 function f19(a?:string, b?:number, ...c:number[]){}
->f19 : (a?: string, b?: number, ...c: number[]) => void
+>f19 : typeof f19
 >a : string
 >b : number
 >c : number[]
  
 function f20(a:string, b?:string, ...c:number[]){}
->f20 : (a: string, b?: string, ...c: number[]) => void
+>f20 : typeof f20
 >a : string
 >b : string
 >c : number[]
  
 function f21(a:string, b?:string, c?:number, ...d:number[]){}
->f21 : (a: string, b?: string, c?: number, ...d: number[]) => void
+>f21 : typeof f21
 >a : string
 >b : string
 >c : number
diff --git a/tests/baselines/reference/returnStatement1.types b/tests/baselines/reference/returnStatement1.types
index 1d1201edb1a..37c2db7b5e7 100644
--- a/tests/baselines/reference/returnStatement1.types
+++ b/tests/baselines/reference/returnStatement1.types
@@ -1,11 +1,9 @@
 === tests/cases/compiler/returnStatement1.ts ===
 function f() {
->f : () => (s: any) => void
+>f : typeof f
 
     return function (s) {
->function (s) {
-        var x = s;
-    } : (s: any) => void
+>function (s) {        var x = s;    } : (s: any) => void
 >s : any
 
         var x = s;
diff --git a/tests/baselines/reference/returnStatements.types b/tests/baselines/reference/returnStatements.types
index 58d2a251b0e..0a4b81f6873 100644
--- a/tests/baselines/reference/returnStatements.types
+++ b/tests/baselines/reference/returnStatements.types
@@ -1,32 +1,32 @@
 === tests/cases/conformance/statements/returnStatements/returnStatements.ts ===
 // all the following should be valid
 function fn1(): number { return 1; }
->fn1 : () => number
+>fn1 : typeof fn1
 
 function fn2(): string { return ''; }
->fn2 : () => string
+>fn2 : typeof fn2
 
 function fn3(): void { return undefined; }
->fn3 : () => void
+>fn3 : typeof fn3
 >undefined : undefined
 
 function fn4(): void { return; }
->fn4 : () => void
+>fn4 : typeof fn4
 
 function fn5(): boolean { return true; }
->fn5 : () => boolean
+>fn5 : typeof fn5
 
 function fn6(): Date { return new Date(12); }
->fn6 : () => Date
+>fn6 : typeof fn6
 >Date : Date
 >new Date(12) : 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; }
 
 function fn7(): any { return null; }
->fn7 : () => any
+>fn7 : typeof fn7
 
 function fn8(): any { return; } // OK, eq. to 'return undefined'
->fn8 : () => any
+>fn8 : typeof fn8
 
 interface I { id: number }
 >I : I
@@ -50,24 +50,24 @@ class D extends C {
 >name : string
 }
 function fn10(): I { return { id: 12 }; } 
->fn10 : () => I
+>fn10 : typeof fn10
 >I : I
 >{ id: 12 } : { id: number; }
 >id : number
 
 function fn11(): I { return new C(); }
->fn11 : () => I
+>fn11 : typeof fn11
 >I : I
 >new C() : C
 >C : typeof C
 
 function fn12(): C { return new D(); }
->fn12 : () => C
+>fn12 : typeof fn12
 >C : C
 >new D() : D
 >D : typeof D
 
 function fn13(): C { return null; }
->fn13 : () => C
+>fn13 : typeof fn13
 >C : C
 
diff --git a/tests/baselines/reference/returnTypeParameterWithModules.types b/tests/baselines/reference/returnTypeParameterWithModules.types
index 909c6f45f6f..7814d5a8c63 100644
--- a/tests/baselines/reference/returnTypeParameterWithModules.types
+++ b/tests/baselines/reference/returnTypeParameterWithModules.types
@@ -3,7 +3,7 @@ module M1 {
 >M1 : typeof M1
 
     export function reduce<A>(ar, f, e?): Array<A> {
->reduce : <A>(ar: any, f: any, e?: any) => A[]
+>reduce : typeof reduce
 >A : A
 >ar : any
 >f : any
@@ -39,19 +39,19 @@ module M2 {
 >M1 : typeof M1
 
   export function compose() {
->compose : () => void
+>compose : typeof compose
 
         A.reduce(arguments, compose2);
 >A.reduce(arguments, compose2) : {}[]
->A.reduce : <A>(ar: any, f: any, e?: any) => A[]
+>A.reduce : typeof reduce
 >A : typeof M1
->reduce : <A>(ar: any, f: any, e?: any) => A[]
+>reduce : typeof reduce
 >arguments : IArguments
->compose2 : <B, C, D>(g: (x: B) => C, f: (x: D) => B) => (x: D) => C
+>compose2 : typeof compose2
 
     };
     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
+>compose2 : typeof compose2
 >B : B
 >C : C
 >D : D
diff --git a/tests/baselines/reference/reverseInferenceInContextualInstantiation.types b/tests/baselines/reference/reverseInferenceInContextualInstantiation.types
index d38d0423e84..60ca53a0c94 100644
--- a/tests/baselines/reference/reverseInferenceInContextualInstantiation.types
+++ b/tests/baselines/reference/reverseInferenceInContextualInstantiation.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/reverseInferenceInContextualInstantiation.ts ===
 function compare<T>(a: T, b: T): number { return 0; }
->compare : <T>(a: T, b: T) => number
+>compare : typeof compare
 >T : T
 >a : T
 >T : T
@@ -15,5 +15,5 @@ x.sort(compare); // Error, but shouldn't be
 >x.sort : (compareFn?: (a: number, b: number) => number) => number[]
 >x : number[]
 >sort : (compareFn?: (a: number, b: number) => number) => number[]
->compare : <T>(a: T, b: T) => number
+>compare : typeof compare
 
diff --git a/tests/baselines/reference/scannerES3NumericLiteral1.js b/tests/baselines/reference/scannerES3NumericLiteral1.js
deleted file mode 100644
index 62ba5663fc4..00000000000
--- a/tests/baselines/reference/scannerES3NumericLiteral1.js
+++ /dev/null
@@ -1,5 +0,0 @@
-//// [scannerES3NumericLiteral1.ts]
-0
-
-//// [scannerES3NumericLiteral1.js]
-0;
diff --git a/tests/baselines/reference/scannerES3NumericLiteral1.types b/tests/baselines/reference/scannerES3NumericLiteral1.types
deleted file mode 100644
index 96f7ad835c2..00000000000
--- a/tests/baselines/reference/scannerES3NumericLiteral1.types
+++ /dev/null
@@ -1,3 +0,0 @@
-=== tests/cases/conformance/scanner/ecmascript3/scannerES3NumericLiteral1.ts ===
-0
-No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/scannerES3NumericLiteral2.js b/tests/baselines/reference/scannerES3NumericLiteral2.js
deleted file mode 100644
index ddb237e3006..00000000000
--- a/tests/baselines/reference/scannerES3NumericLiteral2.js
+++ /dev/null
@@ -1,5 +0,0 @@
-//// [scannerES3NumericLiteral2.ts]
-01
-
-//// [scannerES3NumericLiteral2.js]
-01;
diff --git a/tests/baselines/reference/scannerES3NumericLiteral2.types b/tests/baselines/reference/scannerES3NumericLiteral2.types
deleted file mode 100644
index d51f3292e5f..00000000000
--- a/tests/baselines/reference/scannerES3NumericLiteral2.types
+++ /dev/null
@@ -1,3 +0,0 @@
-=== tests/cases/conformance/scanner/ecmascript3/scannerES3NumericLiteral2.ts ===
-01
-No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/scannerES3NumericLiteral3.errors.txt b/tests/baselines/reference/scannerES3NumericLiteral3.errors.txt
deleted file mode 100644
index 42f7a908a76..00000000000
--- a/tests/baselines/reference/scannerES3NumericLiteral3.errors.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-==== tests/cases/conformance/scanner/ecmascript3/scannerES3NumericLiteral3.ts (1 errors) ====
-    01.0
-      ~~
-!!! ';' expected.
\ No newline at end of file
diff --git a/tests/baselines/reference/scannerES3NumericLiteral4.errors.txt b/tests/baselines/reference/scannerES3NumericLiteral4.errors.txt
deleted file mode 100644
index c053fda21b5..00000000000
--- a/tests/baselines/reference/scannerES3NumericLiteral4.errors.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-==== tests/cases/conformance/scanner/ecmascript3/scannerES3NumericLiteral4.ts (1 errors) ====
-    1e
-      
-!!! Digit expected.
\ No newline at end of file
diff --git a/tests/baselines/reference/scannerES3NumericLiteral5.js b/tests/baselines/reference/scannerES3NumericLiteral5.js
deleted file mode 100644
index 3ef35476d83..00000000000
--- a/tests/baselines/reference/scannerES3NumericLiteral5.js
+++ /dev/null
@@ -1,5 +0,0 @@
-//// [scannerES3NumericLiteral5.ts]
-1e0
-
-//// [scannerES3NumericLiteral5.js]
-1e0;
diff --git a/tests/baselines/reference/scannerES3NumericLiteral5.types b/tests/baselines/reference/scannerES3NumericLiteral5.types
deleted file mode 100644
index d147c48a336..00000000000
--- a/tests/baselines/reference/scannerES3NumericLiteral5.types
+++ /dev/null
@@ -1,3 +0,0 @@
-=== tests/cases/conformance/scanner/ecmascript3/scannerES3NumericLiteral5.ts ===
-1e0
-No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/scannerES3NumericLiteral6.errors.txt b/tests/baselines/reference/scannerES3NumericLiteral6.errors.txt
deleted file mode 100644
index 0229679f245..00000000000
--- a/tests/baselines/reference/scannerES3NumericLiteral6.errors.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-==== tests/cases/conformance/scanner/ecmascript3/scannerES3NumericLiteral6.ts (1 errors) ====
-    1e+
-       
-!!! Digit expected.
\ No newline at end of file
diff --git a/tests/baselines/reference/scannerES3NumericLiteral7.js b/tests/baselines/reference/scannerES3NumericLiteral7.js
deleted file mode 100644
index 32987d85a84..00000000000
--- a/tests/baselines/reference/scannerES3NumericLiteral7.js
+++ /dev/null
@@ -1,5 +0,0 @@
-//// [scannerES3NumericLiteral7.ts]
-1e+0
-
-//// [scannerES3NumericLiteral7.js]
-1e+0;
diff --git a/tests/baselines/reference/scannerES3NumericLiteral7.types b/tests/baselines/reference/scannerES3NumericLiteral7.types
deleted file mode 100644
index c615dd1ebfa..00000000000
--- a/tests/baselines/reference/scannerES3NumericLiteral7.types
+++ /dev/null
@@ -1,3 +0,0 @@
-=== tests/cases/conformance/scanner/ecmascript3/scannerES3NumericLiteral7.ts ===
-1e+0
-No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/scannerNumericLiteral2.errors.txt b/tests/baselines/reference/scannerNumericLiteral2.errors.txt
deleted file mode 100644
index c9160bffdf2..00000000000
--- a/tests/baselines/reference/scannerNumericLiteral2.errors.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-==== tests/cases/conformance/scanner/ecmascript5/scannerNumericLiteral2.ts (1 errors) ====
-    01
-    ~~
-!!! Octal literals are not available when targeting ECMAScript 5 and higher.
\ No newline at end of file
diff --git a/tests/baselines/reference/scannerNumericLiteral2.js b/tests/baselines/reference/scannerNumericLiteral2.js
new file mode 100644
index 00000000000..382f1e6e4df
--- /dev/null
+++ b/tests/baselines/reference/scannerNumericLiteral2.js
@@ -0,0 +1,5 @@
+//// [scannerNumericLiteral2.ts]
+01
+
+//// [scannerNumericLiteral2.js]
+01;
diff --git a/tests/baselines/reference/scannerNumericLiteral2.types b/tests/baselines/reference/scannerNumericLiteral2.types
new file mode 100644
index 00000000000..57a8b533367
--- /dev/null
+++ b/tests/baselines/reference/scannerNumericLiteral2.types
@@ -0,0 +1,3 @@
+=== tests/cases/conformance/scanner/ecmascript5/scannerNumericLiteral2.ts ===
+01
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/scannerNumericLiteral3.errors.txt b/tests/baselines/reference/scannerNumericLiteral3.errors.txt
index ac751dd9089..6f82581759b 100644
--- a/tests/baselines/reference/scannerNumericLiteral3.errors.txt
+++ b/tests/baselines/reference/scannerNumericLiteral3.errors.txt
@@ -1,6 +1,4 @@
-==== tests/cases/conformance/scanner/ecmascript5/scannerNumericLiteral3.ts (2 errors) ====
+==== tests/cases/conformance/scanner/ecmascript5/scannerNumericLiteral3.ts (1 errors) ====
     01.0
-    ~~
-!!! Octal literals are not available when targeting ECMAScript 5 and higher.
       ~~
 !!! ';' expected.
\ No newline at end of file
diff --git a/tests/baselines/reference/scannerNumericLiteral8.errors.txt b/tests/baselines/reference/scannerNumericLiteral8.errors.txt
deleted file mode 100644
index a55568d91e0..00000000000
--- a/tests/baselines/reference/scannerNumericLiteral8.errors.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-==== tests/cases/conformance/scanner/ecmascript5/scannerNumericLiteral8.ts (1 errors) ====
-    -03
-     ~~
-!!! Octal literals are not available when targeting ECMAScript 5 and higher.
\ No newline at end of file
diff --git a/tests/baselines/reference/scannerNumericLiteral9.errors.txt b/tests/baselines/reference/scannerNumericLiteral9.errors.txt
deleted file mode 100644
index 610c1c0a5fc..00000000000
--- a/tests/baselines/reference/scannerNumericLiteral9.errors.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-==== tests/cases/conformance/scanner/ecmascript5/scannerNumericLiteral9.ts (2 errors) ====
-    009
-    ~~
-!!! Octal literals are not available when targeting ECMAScript 5 and higher.
-      ~
-!!! ';' expected.
\ No newline at end of file
diff --git a/tests/baselines/reference/scopeResolutionIdentifiers.types b/tests/baselines/reference/scopeResolutionIdentifiers.types
index 37fa897863d..daac3c316e4 100644
--- a/tests/baselines/reference/scopeResolutionIdentifiers.types
+++ b/tests/baselines/reference/scopeResolutionIdentifiers.types
@@ -33,7 +33,7 @@ module M2 {
 }
 
 function fn() {
->fn : () => void
+>fn : typeof fn
 
     var s: boolean;
 >s : boolean
diff --git a/tests/baselines/reference/selfInLambdas.types b/tests/baselines/reference/selfInLambdas.types
index db0355143c5..42a58a9294f 100644
--- a/tests/baselines/reference/selfInLambdas.types
+++ b/tests/baselines/reference/selfInLambdas.types
@@ -24,51 +24,21 @@ interface Window {
 }
 var o = {
 >o : { counter: number; start: () => void; }
->{
-
-    counter: 0,
-
-    start: function() {
-
-        window.onmousemove = () => {
-            this.counter++
-            var f = () => this.counter;
-
-        }
-
-    }
-
-} : { counter: number; start: () => void; }
+>{    counter: 0,    start: function() {        window.onmousemove = () => {            this.counter++            var f = () => this.counter;        }    }} : { counter: number; start: () => void; }
 
     counter: 0,
 >counter : number
 
     start: function() {
 >start : () => void
->function() {
-
-        window.onmousemove = () => {
-            this.counter++
-            var f = () => this.counter;
-
-        }
-
-    } : () => void
+>function() {        window.onmousemove = () => {            this.counter++            var f = () => this.counter;        }    } : () => void
 
         window.onmousemove = () => {
->window.onmousemove = () => {
-            this.counter++
-            var f = () => this.counter;
-
-        } : () => void
+>window.onmousemove = () => {            this.counter++            var f = () => this.counter;        } : () => void
 >window.onmousemove : (ev: MouseEvent) => any
 >window : Window
 >onmousemove : (ev: MouseEvent) => any
->() => {
-            this.counter++
-            var f = () => this.counter;
-
-        } : () => void
+>() => {            this.counter++            var f = () => this.counter;        } : () => void
 
             this.counter++
 >this.counter++ : number
@@ -102,15 +72,7 @@ class X {
 
 		var outer= () => {
 >outer : () => void
->() => {
-            var x = this.value;
-            var inner = () => {
-                var y = this.value;
-			}
-
-			inner();
-
-		} : () => void
+>() => {            var x = this.value;            var inner = () => {                var y = this.value;			}			inner();		} : () => void
 
             var x = this.value;
 >x : string
@@ -120,9 +82,7 @@ class X {
 
             var inner = () => {
 >inner : () => void
->() => {
-                var y = this.value;
-			} : () => void
+>() => {                var y = this.value;			} : () => void
 
                 var y = this.value;
 >y : string
diff --git a/tests/baselines/reference/separate1-2.types b/tests/baselines/reference/separate1-2.types
index 11b19d0b476..9e07b3f7a5b 100644
--- a/tests/baselines/reference/separate1-2.types
+++ b/tests/baselines/reference/separate1-2.types
@@ -3,5 +3,5 @@ module X {
 >X : typeof X
 
     export function f() { }
->f : () => void
+>f : typeof f
 }
diff --git a/tests/baselines/reference/sourceMap-FileWithComments.types b/tests/baselines/reference/sourceMap-FileWithComments.types
index efc31770859..82ff5b0e1bd 100644
--- a/tests/baselines/reference/sourceMap-FileWithComments.types
+++ b/tests/baselines/reference/sourceMap-FileWithComments.types
@@ -57,7 +57,7 @@ module Shapes {
 >a : number
 
     export function foo() {
->foo : () => void
+>foo : typeof foo
     }
 
     /**  comment after function
diff --git a/tests/baselines/reference/sourceMap-SkippedNode.js b/tests/baselines/reference/sourceMap-SkippedNode.js
deleted file mode 100644
index 656b5a244e9..00000000000
--- a/tests/baselines/reference/sourceMap-SkippedNode.js
+++ /dev/null
@@ -1,13 +0,0 @@
-//// [sourceMap-SkippedNode.ts]
-try {
-// ...
-} finally {
-// N.B. No 'catch' block
-}
-
-//// [sourceMap-SkippedNode.js]
-try {
-}
-finally {
-}
-//# sourceMappingURL=sourceMap-SkippedNode.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMap-SkippedNode.js.map b/tests/baselines/reference/sourceMap-SkippedNode.js.map
deleted file mode 100644
index cdcdc804634..00000000000
--- a/tests/baselines/reference/sourceMap-SkippedNode.js.map
+++ /dev/null
@@ -1,2 +0,0 @@
-//// [sourceMap-SkippedNode.js.map]
-{"version":3,"file":"sourceMap-SkippedNode.js","sourceRoot":"","sources":["sourceMap-SkippedNode.ts"],"names":[],"mappings":"AAAA,IAAA,CAAC;AAED,CAAC;QAAC,CAAC;AAEH,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMap-SkippedNode.sourcemap.txt b/tests/baselines/reference/sourceMap-SkippedNode.sourcemap.txt
deleted file mode 100644
index 531a666ade0..00000000000
--- a/tests/baselines/reference/sourceMap-SkippedNode.sourcemap.txt
+++ /dev/null
@@ -1,52 +0,0 @@
-===================================================================
-JsFile: sourceMap-SkippedNode.js
-mapUrl: sourceMap-SkippedNode.js.map
-sourceRoot: 
-sources: sourceMap-SkippedNode.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:tests/cases/compiler/sourceMap-SkippedNode.js
-sourceFile:sourceMap-SkippedNode.ts
--------------------------------------------------------------------
->>>try {
-1 >
-2 >^^^^
-3 >    ^
-1 >
-2 >
-3 >    t
-1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-2 >Emitted(1, 5) Source(1, 1) + SourceIndex(0)
-3 >Emitted(1, 6) Source(1, 2) + SourceIndex(0)
----
->>>}
-1 >
-2 >^
-3 > ^^^^^^^^^->
-1 >ry {
-  >// ...
-  >
-2 >}
-1 >Emitted(2, 1) Source(3, 1) + SourceIndex(0)
-2 >Emitted(2, 2) Source(3, 2) + SourceIndex(0)
----
->>>finally {
-1->^^^^^^^^
-2 >        ^
-1-> 
-2 >        f
-1->Emitted(3, 9) Source(3, 3) + SourceIndex(0)
-2 >Emitted(3, 10) Source(3, 4) + SourceIndex(0)
----
->>>}
-1 >
-2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >inally {
-  >// N.B. No 'catch' block
-  >
-2 >}
-1 >Emitted(4, 1) Source(5, 1) + SourceIndex(0)
-2 >Emitted(4, 2) Source(5, 2) + SourceIndex(0)
----
->>>//# sourceMappingURL=sourceMap-SkippedNode.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMap-SkippedNode.types b/tests/baselines/reference/sourceMap-SkippedNode.types
deleted file mode 100644
index 4ee6fd4c1d3..00000000000
--- a/tests/baselines/reference/sourceMap-SkippedNode.types
+++ /dev/null
@@ -1,7 +0,0 @@
-=== tests/cases/compiler/sourceMap-SkippedNode.ts ===
-try {
-No type information for this code.// ...
-No type information for this code.} finally {
-No type information for this code.// N.B. No 'catch' block
-No type information for this code.}
-No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapValidationClass.errors.txt b/tests/baselines/reference/sourceMapValidationClass.errors.txt
new file mode 100644
index 00000000000..df30f19f993
--- /dev/null
+++ b/tests/baselines/reference/sourceMapValidationClass.errors.txt
@@ -0,0 +1,23 @@
+==== tests/cases/compiler/sourceMapValidationClass.ts (2 errors) ====
+    class Greeter {
+        constructor(public greeting: string, ...b: string[]) {
+        }
+        greet() {
+            return "<h1>" + this.greeting + "</h1>";
+        }
+        private x: string;
+        private x1: number = 10;
+        private fn() {
+            return this.greeting;
+        }
+        get greetings() {
+            ~~~~~~~~~
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
+            return this.greeting;
+        }
+        set greetings(greetings: string) {
+            ~~~~~~~~~
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
+            this.greeting = greetings;
+        }
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapValidationClass.js b/tests/baselines/reference/sourceMapValidationClass.js
deleted file mode 100644
index eef5a723ebf..00000000000
--- a/tests/baselines/reference/sourceMapValidationClass.js
+++ /dev/null
@@ -1,49 +0,0 @@
-//// [sourceMapValidationClass.ts]
-class Greeter {
-    constructor(public greeting: string, ...b: string[]) {
-    }
-    greet() {
-        return "<h1>" + this.greeting + "</h1>";
-    }
-    private x: string;
-    private x1: number = 10;
-    private fn() {
-        return this.greeting;
-    }
-    get greetings() {
-        return this.greeting;
-    }
-    set greetings(greetings: string) {
-        this.greeting = greetings;
-    }
-}
-
-//// [sourceMapValidationClass.js]
-var Greeter = (function () {
-    function Greeter(greeting) {
-        var b = [];
-        for (var _i = 1; _i < arguments.length; _i++) {
-            b[_i - 1] = arguments[_i];
-        }
-        this.greeting = greeting;
-        this.x1 = 10;
-    }
-    Greeter.prototype.greet = function () {
-        return "<h1>" + this.greeting + "</h1>";
-    };
-    Greeter.prototype.fn = function () {
-        return this.greeting;
-    };
-    Object.defineProperty(Greeter.prototype, "greetings", {
-        get: function () {
-            return this.greeting;
-        },
-        set: function (greetings) {
-            this.greeting = greetings;
-        },
-        enumerable: true,
-        configurable: true
-    });
-    return Greeter;
-})();
-//# sourceMappingURL=sourceMapValidationClass.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapValidationClass.js.map b/tests/baselines/reference/sourceMapValidationClass.js.map
index 661459022b1..e69de29bb2d 100644
--- a/tests/baselines/reference/sourceMapValidationClass.js.map
+++ b/tests/baselines/reference/sourceMapValidationClass.js.map
@@ -1,2 +0,0 @@
-//// [sourceMapValidationClass.js.map]
-{"version":3,"file":"sourceMapValidationClass.js","sourceRoot":"","sources":["sourceMapValidationClass.ts"],"names":["Greeter","Greeter.constructor","Greeter.greet","Greeter.fn","Greeter.greetings"],"mappings":"AAAA,IAAM,OAAO;IACTA,SADEA,OAAOA,CACUA,QAAgBA;QAAEC,WAAcA;aAAdA,WAAcA,CAAdA,sBAAcA,CAAdA,IAAcA;YAAdA,0BAAcA;;QAAhCA,aAAQA,GAARA,QAAQA,CAAQA;QAM3BA,OAAEA,GAAWA,EAAEA,CAACA;IALxBA,CAACA;IACDD,uBAAKA,GAALA;QACIE,MAAMA,CAACA,MAAMA,GAAGA,IAAIA,CAACA,QAAQA,GAAGA,OAAOA,CAACA;IAC5CA,CAACA;IAGOF,oBAAEA,GAAVA;QACIG,MAAMA,CAACA,IAAIA,CAACA,QAAQA,CAACA;IACzBA,CAACA;IACDH,sBAAIA,8BAASA;aAAbA;YACII,MAAMA,CAACA,IAAIA,CAACA,QAAQA,CAACA;QACzBA,CAACA;aACDJ,UAAcA,SAAiBA;YAC3BI,IAAIA,CAACA,QAAQA,GAAGA,SAASA,CAACA;QAC9BA,CAACA;;;OAHAJ;IAILA,cAACA;AAADA,CAACA,AAjBD,IAiBC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapValidationClass.sourcemap.txt b/tests/baselines/reference/sourceMapValidationClass.sourcemap.txt
deleted file mode 100644
index 1c80abde32e..00000000000
--- a/tests/baselines/reference/sourceMapValidationClass.sourcemap.txt
+++ /dev/null
@@ -1,388 +0,0 @@
-===================================================================
-JsFile: sourceMapValidationClass.js
-mapUrl: sourceMapValidationClass.js.map
-sourceRoot: 
-sources: sourceMapValidationClass.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:tests/cases/compiler/sourceMapValidationClass.js
-sourceFile:sourceMapValidationClass.ts
--------------------------------------------------------------------
->>>var Greeter = (function () {
-1 >
-2 >^^^^
-3 >    ^^^^^^^
-4 >           ^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-2 >class 
-3 >    Greeter
-1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-2 >Emitted(1, 5) Source(1, 7) + SourceIndex(0)
-3 >Emitted(1, 12) Source(1, 14) + SourceIndex(0)
----
->>>    function Greeter(greeting) {
-1->^^^^
-2 >    ^^^^^^^^^
-3 >             ^^^^^^^
-4 >                    ^
-5 >                     ^^^^^^^^
-1-> {
-  >    
-2 >    
-3 >             Greeter
-4 >                     {
-  >                        constructor(public 
-5 >                     greeting: string
-1->Emitted(2, 5) Source(2, 5) + SourceIndex(0) name (Greeter)
-2 >Emitted(2, 14) Source(1, 7) + SourceIndex(0) name (Greeter)
-3 >Emitted(2, 21) Source(1, 14) + SourceIndex(0) name (Greeter)
-4 >Emitted(2, 22) Source(2, 24) + SourceIndex(0) name (Greeter)
-5 >Emitted(2, 30) Source(2, 40) + SourceIndex(0) name (Greeter)
----
->>>        var b = [];
-1 >^^^^^^^^
-2 >        ^^^^^^^^^^^
-3 >                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >, 
-2 >        ...b: string[]
-1 >Emitted(3, 9) Source(2, 42) + SourceIndex(0) name (Greeter.constructor)
-2 >Emitted(3, 20) Source(2, 56) + SourceIndex(0) name (Greeter.constructor)
----
->>>        for (var _i = 1; _i < arguments.length; _i++) {
-1->^^^^^^^^^^^^^
-2 >             ^^^^^^^^^^^
-3 >                        ^
-4 >                         ^^^^^^^^^^^^^^^^^^^^^^
-5 >                                               ^
-6 >                                                ^^^^
-1->
-2 >             ...b: string[]
-3 >                        
-4 >                         ...b: string[]
-5 >                                               
-6 >                                                ...b: string[]
-1->Emitted(4, 14) Source(2, 42) + SourceIndex(0) name (Greeter.constructor)
-2 >Emitted(4, 25) Source(2, 56) + SourceIndex(0) name (Greeter.constructor)
-3 >Emitted(4, 26) Source(2, 42) + SourceIndex(0) name (Greeter.constructor)
-4 >Emitted(4, 48) Source(2, 56) + SourceIndex(0) name (Greeter.constructor)
-5 >Emitted(4, 49) Source(2, 42) + SourceIndex(0) name (Greeter.constructor)
-6 >Emitted(4, 53) Source(2, 56) + SourceIndex(0) name (Greeter.constructor)
----
->>>            b[_i - 1] = arguments[_i];
-1 >^^^^^^^^^^^^
-2 >            ^^^^^^^^^^^^^^^^^^^^^^^^^^
-1 >
-2 >            ...b: string[]
-1 >Emitted(5, 13) Source(2, 42) + SourceIndex(0) name (Greeter.constructor)
-2 >Emitted(5, 39) Source(2, 56) + SourceIndex(0) name (Greeter.constructor)
----
->>>        }
->>>        this.greeting = greeting;
-1 >^^^^^^^^
-2 >        ^^^^^^^^^^^^^
-3 >                     ^^^
-4 >                        ^^^^^^^^
-5 >                                ^
-1 >
-2 >        greeting
-3 >                     
-4 >                        greeting
-5 >                                : string
-1 >Emitted(7, 9) Source(2, 24) + SourceIndex(0) name (Greeter.constructor)
-2 >Emitted(7, 22) Source(2, 32) + SourceIndex(0) name (Greeter.constructor)
-3 >Emitted(7, 25) Source(2, 24) + SourceIndex(0) name (Greeter.constructor)
-4 >Emitted(7, 33) Source(2, 32) + SourceIndex(0) name (Greeter.constructor)
-5 >Emitted(7, 34) Source(2, 40) + SourceIndex(0) name (Greeter.constructor)
----
->>>        this.x1 = 10;
-1 >^^^^^^^^
-2 >        ^^^^^^^
-3 >               ^^^
-4 >                  ^^
-5 >                    ^
-1 >, ...b: string[]) {
-  >    }
-  >    greet() {
-  >        return "<h1>" + this.greeting + "</h1>";
-  >    }
-  >    private x: string;
-  >    private 
-2 >        x1
-3 >               : number = 
-4 >                  10
-5 >                    ;
-1 >Emitted(8, 9) Source(8, 13) + SourceIndex(0) name (Greeter.constructor)
-2 >Emitted(8, 16) Source(8, 15) + SourceIndex(0) name (Greeter.constructor)
-3 >Emitted(8, 19) Source(8, 26) + SourceIndex(0) name (Greeter.constructor)
-4 >Emitted(8, 21) Source(8, 28) + SourceIndex(0) name (Greeter.constructor)
-5 >Emitted(8, 22) Source(8, 29) + SourceIndex(0) name (Greeter.constructor)
----
->>>    }
-1 >^^^^
-2 >    ^
-3 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-2 >    }
-1 >Emitted(9, 5) Source(3, 5) + SourceIndex(0) name (Greeter.constructor)
-2 >Emitted(9, 6) Source(3, 6) + SourceIndex(0) name (Greeter.constructor)
----
->>>    Greeter.prototype.greet = function () {
-1->^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^^^^
-3 >                           ^^^
-4 >                              ^^^^^^^^^^^^^^^^^^^->
-1->
-  >    
-2 >    greet
-3 >                           
-1->Emitted(10, 5) Source(4, 5) + SourceIndex(0) name (Greeter)
-2 >Emitted(10, 28) Source(4, 10) + SourceIndex(0) name (Greeter)
-3 >Emitted(10, 31) Source(4, 5) + SourceIndex(0) name (Greeter)
----
->>>        return "<h1>" + this.greeting + "</h1>";
-1->^^^^^^^^
-2 >        ^^^^^^
-3 >              ^
-4 >               ^^^^^^
-5 >                     ^^^
-6 >                        ^^^^
-7 >                            ^
-8 >                             ^^^^^^^^
-9 >                                     ^^^
-10>                                        ^^^^^^^
-11>                                               ^
-1->greet() {
-  >        
-2 >        return
-3 >               
-4 >               "<h1>"
-5 >                      + 
-6 >                        this
-7 >                            .
-8 >                             greeting
-9 >                                      + 
-10>                                        "</h1>"
-11>                                               ;
-1->Emitted(11, 9) Source(5, 9) + SourceIndex(0) name (Greeter.greet)
-2 >Emitted(11, 15) Source(5, 15) + SourceIndex(0) name (Greeter.greet)
-3 >Emitted(11, 16) Source(5, 16) + SourceIndex(0) name (Greeter.greet)
-4 >Emitted(11, 22) Source(5, 22) + SourceIndex(0) name (Greeter.greet)
-5 >Emitted(11, 25) Source(5, 25) + SourceIndex(0) name (Greeter.greet)
-6 >Emitted(11, 29) Source(5, 29) + SourceIndex(0) name (Greeter.greet)
-7 >Emitted(11, 30) Source(5, 30) + SourceIndex(0) name (Greeter.greet)
-8 >Emitted(11, 38) Source(5, 38) + SourceIndex(0) name (Greeter.greet)
-9 >Emitted(11, 41) Source(5, 41) + SourceIndex(0) name (Greeter.greet)
-10>Emitted(11, 48) Source(5, 48) + SourceIndex(0) name (Greeter.greet)
-11>Emitted(11, 49) Source(5, 49) + SourceIndex(0) name (Greeter.greet)
----
->>>    };
-1 >^^^^
-2 >    ^
-3 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >    
-2 >    }
-1 >Emitted(12, 5) Source(6, 5) + SourceIndex(0) name (Greeter.greet)
-2 >Emitted(12, 6) Source(6, 6) + SourceIndex(0) name (Greeter.greet)
----
->>>    Greeter.prototype.fn = function () {
-1->^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^
-3 >                        ^^^
-4 >                           ^^^->
-1->
-  >    private x: string;
-  >    private x1: number = 10;
-  >    private 
-2 >    fn
-3 >                        
-1->Emitted(13, 5) Source(9, 13) + SourceIndex(0) name (Greeter)
-2 >Emitted(13, 25) Source(9, 15) + SourceIndex(0) name (Greeter)
-3 >Emitted(13, 28) Source(9, 5) + SourceIndex(0) name (Greeter)
----
->>>        return this.greeting;
-1->^^^^^^^^
-2 >        ^^^^^^
-3 >              ^
-4 >               ^^^^
-5 >                   ^
-6 >                    ^^^^^^^^
-7 >                            ^
-1->private fn() {
-  >        
-2 >        return
-3 >               
-4 >               this
-5 >                   .
-6 >                    greeting
-7 >                            ;
-1->Emitted(14, 9) Source(10, 9) + SourceIndex(0) name (Greeter.fn)
-2 >Emitted(14, 15) Source(10, 15) + SourceIndex(0) name (Greeter.fn)
-3 >Emitted(14, 16) Source(10, 16) + SourceIndex(0) name (Greeter.fn)
-4 >Emitted(14, 20) Source(10, 20) + SourceIndex(0) name (Greeter.fn)
-5 >Emitted(14, 21) Source(10, 21) + SourceIndex(0) name (Greeter.fn)
-6 >Emitted(14, 29) Source(10, 29) + SourceIndex(0) name (Greeter.fn)
-7 >Emitted(14, 30) Source(10, 30) + SourceIndex(0) name (Greeter.fn)
----
->>>    };
-1 >^^^^
-2 >    ^
-3 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >    
-2 >    }
-1 >Emitted(15, 5) Source(11, 5) + SourceIndex(0) name (Greeter.fn)
-2 >Emitted(15, 6) Source(11, 6) + SourceIndex(0) name (Greeter.fn)
----
->>>    Object.defineProperty(Greeter.prototype, "greetings", {
-1->^^^^
-2 >    ^^^^^^^^^^^^^^^^^^^^^^
-3 >                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1->
-  >    
-2 >    get 
-3 >                          greetings
-1->Emitted(16, 5) Source(12, 5) + SourceIndex(0) name (Greeter)
-2 >Emitted(16, 27) Source(12, 9) + SourceIndex(0) name (Greeter)
-3 >Emitted(16, 57) Source(12, 18) + SourceIndex(0) name (Greeter)
----
->>>        get: function () {
-1 >^^^^^^^^^^^^^
-2 >             ^^^^^^^^^^^^^^^^^^^^^->
-1 >
-1 >Emitted(17, 14) Source(12, 5) + SourceIndex(0) name (Greeter)
----
->>>            return this.greeting;
-1->^^^^^^^^^^^^
-2 >            ^^^^^^
-3 >                  ^
-4 >                   ^^^^
-5 >                       ^
-6 >                        ^^^^^^^^
-7 >                                ^
-1->get greetings() {
-  >        
-2 >            return
-3 >                   
-4 >                   this
-5 >                       .
-6 >                        greeting
-7 >                                ;
-1->Emitted(18, 13) Source(13, 9) + SourceIndex(0) name (Greeter.greetings)
-2 >Emitted(18, 19) Source(13, 15) + SourceIndex(0) name (Greeter.greetings)
-3 >Emitted(18, 20) Source(13, 16) + SourceIndex(0) name (Greeter.greetings)
-4 >Emitted(18, 24) Source(13, 20) + SourceIndex(0) name (Greeter.greetings)
-5 >Emitted(18, 25) Source(13, 21) + SourceIndex(0) name (Greeter.greetings)
-6 >Emitted(18, 33) Source(13, 29) + SourceIndex(0) name (Greeter.greetings)
-7 >Emitted(18, 34) Source(13, 30) + SourceIndex(0) name (Greeter.greetings)
----
->>>        },
-1 >^^^^^^^^
-2 >        ^
-3 >         ^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >    
-2 >        }
-1 >Emitted(19, 9) Source(14, 5) + SourceIndex(0) name (Greeter.greetings)
-2 >Emitted(19, 10) Source(14, 6) + SourceIndex(0) name (Greeter.greetings)
----
->>>        set: function (greetings) {
-1->^^^^^^^^^^^^^
-2 >             ^^^^^^^^^^
-3 >                       ^^^^^^^^^
-4 >                                ^^^^^^^->
-1->
-  >    
-2 >             set greetings(
-3 >                       greetings: string
-1->Emitted(20, 14) Source(15, 5) + SourceIndex(0) name (Greeter)
-2 >Emitted(20, 24) Source(15, 19) + SourceIndex(0) name (Greeter)
-3 >Emitted(20, 33) Source(15, 36) + SourceIndex(0) name (Greeter)
----
->>>            this.greeting = greetings;
-1->^^^^^^^^^^^^
-2 >            ^^^^
-3 >                ^
-4 >                 ^^^^^^^^
-5 >                         ^^^
-6 >                            ^^^^^^^^^
-7 >                                     ^
-1->) {
-  >        
-2 >            this
-3 >                .
-4 >                 greeting
-5 >                          = 
-6 >                            greetings
-7 >                                     ;
-1->Emitted(21, 13) Source(16, 9) + SourceIndex(0) name (Greeter.greetings)
-2 >Emitted(21, 17) Source(16, 13) + SourceIndex(0) name (Greeter.greetings)
-3 >Emitted(21, 18) Source(16, 14) + SourceIndex(0) name (Greeter.greetings)
-4 >Emitted(21, 26) Source(16, 22) + SourceIndex(0) name (Greeter.greetings)
-5 >Emitted(21, 29) Source(16, 25) + SourceIndex(0) name (Greeter.greetings)
-6 >Emitted(21, 38) Source(16, 34) + SourceIndex(0) name (Greeter.greetings)
-7 >Emitted(21, 39) Source(16, 35) + SourceIndex(0) name (Greeter.greetings)
----
->>>        },
-1 >^^^^^^^^
-2 >        ^
-3 >         ^^^^^^^^^^^^^^^^^->
-1 >
-  >    
-2 >        }
-1 >Emitted(22, 9) Source(17, 5) + SourceIndex(0) name (Greeter.greetings)
-2 >Emitted(22, 10) Source(17, 6) + SourceIndex(0) name (Greeter.greetings)
----
->>>        enumerable: true,
->>>        configurable: true
->>>    });
-1->^^^^^^^
-2 >       ^^^^^^^^^^^^^->
-1->
-1->Emitted(25, 8) Source(14, 6) + SourceIndex(0) name (Greeter)
----
->>>    return Greeter;
-1->^^^^
-2 >    ^^^^^^^^^^^^^^
-1->
-  >    set greetings(greetings: string) {
-  >        this.greeting = greetings;
-  >    }
-  >
-2 >    }
-1->Emitted(26, 5) Source(18, 1) + SourceIndex(0) name (Greeter)
-2 >Emitted(26, 19) Source(18, 2) + SourceIndex(0) name (Greeter)
----
->>>})();
-1 >
-2 >^
-3 > 
-4 > ^^^^
-5 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-2 >}
-3 > 
-4 > class Greeter {
-  >     constructor(public greeting: string, ...b: string[]) {
-  >     }
-  >     greet() {
-  >         return "<h1>" + this.greeting + "</h1>";
-  >     }
-  >     private x: string;
-  >     private x1: number = 10;
-  >     private fn() {
-  >         return this.greeting;
-  >     }
-  >     get greetings() {
-  >         return this.greeting;
-  >     }
-  >     set greetings(greetings: string) {
-  >         this.greeting = greetings;
-  >     }
-  > }
-1 >Emitted(27, 1) Source(18, 1) + SourceIndex(0) name (Greeter)
-2 >Emitted(27, 2) Source(18, 2) + SourceIndex(0) name (Greeter)
-3 >Emitted(27, 2) Source(1, 1) + SourceIndex(0)
-4 >Emitted(27, 6) Source(18, 2) + SourceIndex(0)
----
->>>//# sourceMappingURL=sourceMapValidationClass.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapValidationClass.types b/tests/baselines/reference/sourceMapValidationClass.types
deleted file mode 100644
index 1e10c244da3..00000000000
--- a/tests/baselines/reference/sourceMapValidationClass.types
+++ /dev/null
@@ -1,52 +0,0 @@
-=== tests/cases/compiler/sourceMapValidationClass.ts ===
-class Greeter {
->Greeter : Greeter
-
-    constructor(public greeting: string, ...b: string[]) {
->greeting : string
->b : string[]
-    }
-    greet() {
->greet : () => string
-
-        return "<h1>" + this.greeting + "</h1>";
->"<h1>" + this.greeting + "</h1>" : string
->"<h1>" + this.greeting : string
->this.greeting : string
->this : Greeter
->greeting : string
-    }
-    private x: string;
->x : string
-
-    private x1: number = 10;
->x1 : number
-
-    private fn() {
->fn : () => string
-
-        return this.greeting;
->this.greeting : string
->this : Greeter
->greeting : string
-    }
-    get greetings() {
->greetings : string
-
-        return this.greeting;
->this.greeting : string
->this : Greeter
->greeting : string
-    }
-    set greetings(greetings: string) {
->greetings : string
->greetings : string
-
-        this.greeting = greetings;
->this.greeting = greetings : string
->this.greeting : string
->this : Greeter
->greeting : string
->greetings : string
-    }
-}
diff --git a/tests/baselines/reference/sourceMapValidationClasses.types b/tests/baselines/reference/sourceMapValidationClasses.types
index d53cdcb9974..8deaf6c2ce8 100644
--- a/tests/baselines/reference/sourceMapValidationClasses.types
+++ b/tests/baselines/reference/sourceMapValidationClasses.types
@@ -26,7 +26,7 @@ module Foo.Bar {
 
 
     function foo(greeting: string): Greeter {
->foo : (greeting: string) => Greeter
+>foo : typeof foo
 >greeting : string
 >Greeter : Greeter
 
@@ -49,7 +49,7 @@ module Foo.Bar {
 >greet : () => string
 
     function foo2(greeting: string, ...restGreetings /* more greeting */: string[]) {
->foo2 : (greeting: string, ...restGreetings: string[]) => Greeter[]
+>foo2 : typeof foo2
 >greeting : string
 >restGreetings : string[]
 
@@ -95,7 +95,7 @@ module Foo.Bar {
     var b = foo2("Hello", "World", "!");
 >b : Greeter[]
 >foo2("Hello", "World", "!") : Greeter[]
->foo2 : (greeting: string, ...restGreetings: string[]) => Greeter[]
+>foo2 : typeof foo2
 
     // This is simple signle line comment
     for (var j = 0; j < b.length; j++) {
diff --git a/tests/baselines/reference/sourceMapValidationExportAssignmentCommonjs.js b/tests/baselines/reference/sourceMapValidationExportAssignmentCommonjs.js
deleted file mode 100644
index 0a0b3feda5f..00000000000
--- a/tests/baselines/reference/sourceMapValidationExportAssignmentCommonjs.js
+++ /dev/null
@@ -1,14 +0,0 @@
-//// [sourceMapValidationExportAssignmentCommonjs.ts]
-class a {
-    public c;
-}
-export = a;
-
-//// [sourceMapValidationExportAssignmentCommonjs.js]
-var a = (function () {
-    function a() {
-    }
-    return a;
-})();
-module.exports = a;
-//# sourceMappingURL=sourceMapValidationExportAssignmentCommonjs.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapValidationExportAssignmentCommonjs.js.map b/tests/baselines/reference/sourceMapValidationExportAssignmentCommonjs.js.map
deleted file mode 100644
index 18e89d37465..00000000000
--- a/tests/baselines/reference/sourceMapValidationExportAssignmentCommonjs.js.map
+++ /dev/null
@@ -1,2 +0,0 @@
-//// [sourceMapValidationExportAssignmentCommonjs.js.map]
-{"version":3,"file":"sourceMapValidationExportAssignmentCommonjs.js","sourceRoot":"","sources":["sourceMapValidationExportAssignmentCommonjs.ts"],"names":["a","a.constructor"],"mappings":"AAAA,IAAM,CAAC;IAAPA,SAAMA,CAACA;IAEPC,CAACA;IAADD,QAACA;AAADA,CAACA,AAFD,IAEC;AACU,AAAX,iBAAS,CAAC,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapValidationExportAssignmentCommonjs.sourcemap.txt b/tests/baselines/reference/sourceMapValidationExportAssignmentCommonjs.sourcemap.txt
deleted file mode 100644
index 308e29c37a5..00000000000
--- a/tests/baselines/reference/sourceMapValidationExportAssignmentCommonjs.sourcemap.txt
+++ /dev/null
@@ -1,89 +0,0 @@
-===================================================================
-JsFile: sourceMapValidationExportAssignmentCommonjs.js
-mapUrl: sourceMapValidationExportAssignmentCommonjs.js.map
-sourceRoot: 
-sources: sourceMapValidationExportAssignmentCommonjs.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:tests/cases/compiler/sourceMapValidationExportAssignmentCommonjs.js
-sourceFile:sourceMapValidationExportAssignmentCommonjs.ts
--------------------------------------------------------------------
->>>var a = (function () {
-1 >
-2 >^^^^
-3 >    ^
-4 >     ^^^^^^^^^^^^^^->
-1 >
-2 >class 
-3 >    a
-1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-2 >Emitted(1, 5) Source(1, 7) + SourceIndex(0)
-3 >Emitted(1, 6) Source(1, 8) + SourceIndex(0)
----
->>>    function a() {
-1->^^^^
-2 >    ^^^^^^^^^
-3 >             ^
-1->
-2 >    class 
-3 >             a
-1->Emitted(2, 5) Source(1, 1) + SourceIndex(0) name (a)
-2 >Emitted(2, 14) Source(1, 7) + SourceIndex(0) name (a)
-3 >Emitted(2, 15) Source(1, 8) + SourceIndex(0) name (a)
----
->>>    }
-1 >^^^^
-2 >    ^
-3 >     ^^^^^^^^^->
-1 > {
-  >    public c;
-  >
-2 >    }
-1 >Emitted(3, 5) Source(3, 1) + SourceIndex(0) name (a.constructor)
-2 >Emitted(3, 6) Source(3, 2) + SourceIndex(0) name (a.constructor)
----
->>>    return a;
-1->^^^^
-2 >    ^^^^^^^^
-1->
-2 >    }
-1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (a)
-2 >Emitted(4, 13) Source(3, 2) + SourceIndex(0) name (a)
----
->>>})();
-1 >
-2 >^
-3 > 
-4 > ^^^^
-5 >     ^^^^^^^^^^^^^^^->
-1 >
-2 >}
-3 > 
-4 > class a {
-  >     public c;
-  > }
-1 >Emitted(5, 1) Source(3, 1) + SourceIndex(0) name (a)
-2 >Emitted(5, 2) Source(3, 2) + SourceIndex(0) name (a)
-3 >Emitted(5, 2) Source(1, 1) + SourceIndex(0)
-4 >Emitted(5, 6) Source(3, 2) + SourceIndex(0)
----
->>>module.exports = a;
-1->
-2 >
-3 >^^^^^^^^^^^^^^^^^
-4 >                 ^
-5 >                  ^
-6 >                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->
-  >export = a;
-2 >
-3 >export = 
-4 >                 a
-5 >                  ;
-1->Emitted(6, 1) Source(4, 12) + SourceIndex(0)
-2 >Emitted(6, 1) Source(4, 1) + SourceIndex(0)
-3 >Emitted(6, 18) Source(4, 10) + SourceIndex(0)
-4 >Emitted(6, 19) Source(4, 11) + SourceIndex(0)
-5 >Emitted(6, 20) Source(4, 12) + SourceIndex(0)
----
->>>//# sourceMappingURL=sourceMapValidationExportAssignmentCommonjs.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapValidationExportAssignmentCommonjs.types b/tests/baselines/reference/sourceMapValidationExportAssignmentCommonjs.types
deleted file mode 100644
index 6a4e97bdbf3..00000000000
--- a/tests/baselines/reference/sourceMapValidationExportAssignmentCommonjs.types
+++ /dev/null
@@ -1,10 +0,0 @@
-=== tests/cases/compiler/sourceMapValidationExportAssignmentCommonjs.ts ===
-class a {
->a : a
-
-    public c;
->c : any
-}
-export = a;
->a : a
-
diff --git a/tests/baselines/reference/sourceMapValidationFunctionExpressions.types b/tests/baselines/reference/sourceMapValidationFunctionExpressions.types
index 619a58db9db..cd1c82c5819 100644
--- a/tests/baselines/reference/sourceMapValidationFunctionExpressions.types
+++ b/tests/baselines/reference/sourceMapValidationFunctionExpressions.types
@@ -4,10 +4,7 @@ var greetings = 0;
 
 var greet = (greeting: string): number => {
 >greet : (greeting: string) => number
->(greeting: string): number => {
-    greetings++;
-    return greetings;
-} : (greeting: string) => number
+>(greeting: string): number => {    greetings++;    return greetings;} : (greeting: string) => number
 >greeting : string
 
     greetings++;
diff --git a/tests/baselines/reference/sourceMapValidationFunctions.types b/tests/baselines/reference/sourceMapValidationFunctions.types
index 0d110ece2d2..e6d2c156496 100644
--- a/tests/baselines/reference/sourceMapValidationFunctions.types
+++ b/tests/baselines/reference/sourceMapValidationFunctions.types
@@ -3,7 +3,7 @@ var greetings = 0;
 >greetings : number
 
 function greet(greeting: string): number {
->greet : (greeting: string) => number
+>greet : typeof greet
 >greeting : string
 
     greetings++;
@@ -14,7 +14,7 @@ function greet(greeting: string): number {
 >greetings : number
 }
 function greet2(greeting: string, n = 10, x?: string, ...restParams: string[]): number {
->greet2 : (greeting: string, n?: number, x?: string, ...restParams: string[]) => number
+>greet2 : typeof greet2
 >greeting : string
 >n : number
 >x : string
@@ -28,7 +28,7 @@ function greet2(greeting: string, n = 10, x?: string, ...restParams: string[]):
 >greetings : number
 }
 function foo(greeting: string, n = 10, x?: string, ...restParams: string[])
->foo : (greeting: string, n?: number, x?: string, ...restParams: string[]) => void
+>foo : typeof foo
 >greeting : string
 >n : number
 >x : string
diff --git a/tests/baselines/reference/sourceMapValidationModule.types b/tests/baselines/reference/sourceMapValidationModule.types
index 6c77a0b9b44..38c0c3e8392 100644
--- a/tests/baselines/reference/sourceMapValidationModule.types
+++ b/tests/baselines/reference/sourceMapValidationModule.types
@@ -20,7 +20,7 @@ module m3 {
     }
 
     export function foo() {
->foo : () => number
+>foo : typeof foo
 
         return m4.x;
 >m4.x : number
diff --git a/tests/baselines/reference/sourceMapValidationWithComments.types b/tests/baselines/reference/sourceMapValidationWithComments.types
index c5725c7d96c..4e88b468ce4 100644
--- a/tests/baselines/reference/sourceMapValidationWithComments.types
+++ b/tests/baselines/reference/sourceMapValidationWithComments.types
@@ -3,7 +3,7 @@ class DebugClass {
 >DebugClass : DebugClass
 
     public static debugFunc() {
->debugFunc : () => boolean
+>debugFunc : typeof debugFunc
 
         // Start Debugger Test Code
         var i = 0;
diff --git a/tests/baselines/reference/sourceMapWithMultipleFilesWithCopyright.types b/tests/baselines/reference/sourceMapWithMultipleFilesWithCopyright.types
index 8e53a8914f7..d72fd90b0c6 100644
--- a/tests/baselines/reference/sourceMapWithMultipleFilesWithCopyright.types
+++ b/tests/baselines/reference/sourceMapWithMultipleFilesWithCopyright.types
@@ -15,10 +15,7 @@ Copyright
 
 var x = {
 >x : { a: number; b: number; }
->{
-    a: 10,
-    b: 20
-} : { a: number; b: number; }
+>{    a: 10,    b: 20} : { a: number; b: number; }
 
     a: 10,
 >a : number
diff --git a/tests/baselines/reference/specializationsShouldNotAffectEachOther.types b/tests/baselines/reference/specializationsShouldNotAffectEachOther.types
index 9bf91e6fe42..f8ca3216848 100644
--- a/tests/baselines/reference/specializationsShouldNotAffectEachOther.types
+++ b/tests/baselines/reference/specializationsShouldNotAffectEachOther.types
@@ -13,7 +13,7 @@ var series: Series;
 
 
 function foo() {
->foo : () => any
+>foo : typeof foo
 
     var seriesExtent = (series) => null;
 >seriesExtent : (series: any) => any
diff --git a/tests/baselines/reference/specializeVarArgs1.types b/tests/baselines/reference/specializeVarArgs1.types
index 4cdf5790983..8c9175b9d4f 100644
--- a/tests/baselines/reference/specializeVarArgs1.types
+++ b/tests/baselines/reference/specializeVarArgs1.types
@@ -23,7 +23,7 @@ interface ObservableArray<T> extends Observable<T[]>
  
 
 function observableArray<T>(): ObservableArray<T> { return null;}
->observableArray : <T>() => ObservableArray<T>
+>observableArray : typeof observableArray
 >T : T
 >ObservableArray : ObservableArray<T>
 >T : T
@@ -33,7 +33,7 @@ function observableArray<T>(): ObservableArray<T> { return null;}
 var a =  observableArray<string>();
 >a : ObservableArray<string>
 >observableArray<string>() : ObservableArray<string>
->observableArray : <T>() => ObservableArray<T>
+>observableArray : typeof observableArray
 
 a.push('Some Value');
 >a.push('Some Value') : any
diff --git a/tests/baselines/reference/specializedLambdaTypeArguments.errors.txt b/tests/baselines/reference/specializedLambdaTypeArguments.errors.txt
new file mode 100644
index 00000000000..72fe62d877e
--- /dev/null
+++ b/tests/baselines/reference/specializedLambdaTypeArguments.errors.txt
@@ -0,0 +1,9 @@
+==== tests/cases/compiler/specializedLambdaTypeArguments.ts (1 errors) ====
+    class X<A> {
+    	prop: X< <any>() => any >;
+    	          ~~~
+!!! Type parameter name cannot be 'any'
+    }
+    var a: X<boolean>;
+     
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/specializedLambdaTypeArguments.js b/tests/baselines/reference/specializedLambdaTypeArguments.js
index 393b4f9e8c3..b114f58f751 100644
--- a/tests/baselines/reference/specializedLambdaTypeArguments.js
+++ b/tests/baselines/reference/specializedLambdaTypeArguments.js
@@ -1,6 +1,6 @@
 //// [specializedLambdaTypeArguments.ts]
 class X<A> {
-	prop: X< <Tany>() => Tany >;
+	prop: X< <any>() => any >;
 }
 var a: X<boolean>;
  
diff --git a/tests/baselines/reference/specializedLambdaTypeArguments.types b/tests/baselines/reference/specializedLambdaTypeArguments.types
deleted file mode 100644
index 3eb2fbc959e..00000000000
--- a/tests/baselines/reference/specializedLambdaTypeArguments.types
+++ /dev/null
@@ -1,16 +0,0 @@
-=== 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/specializedSignatureInInterface.js b/tests/baselines/reference/specializedSignatureInInterface.js
deleted file mode 100644
index cf4a549fae9..00000000000
--- a/tests/baselines/reference/specializedSignatureInInterface.js
+++ /dev/null
@@ -1,11 +0,0 @@
-//// [specializedSignatureInInterface.ts]
-interface A {
-  (key:string):void;
-}
-
-interface B extends A {
-  (key:'foo'):string;
-  (key:'bar'):string;
-}
-
-//// [specializedSignatureInInterface.js]
diff --git a/tests/baselines/reference/specializedSignatureInInterface.types b/tests/baselines/reference/specializedSignatureInInterface.types
deleted file mode 100644
index c8f76f4cb9b..00000000000
--- a/tests/baselines/reference/specializedSignatureInInterface.types
+++ /dev/null
@@ -1,18 +0,0 @@
-=== 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'
-
-  (key:'bar'):string;
->key : 'bar'
-}
diff --git a/tests/baselines/reference/specializedSignatureIsSubtypeOfNonSpecializedSignature.types b/tests/baselines/reference/specializedSignatureIsSubtypeOfNonSpecializedSignature.types
index cb86966d65a..e28c8144d02 100644
--- a/tests/baselines/reference/specializedSignatureIsSubtypeOfNonSpecializedSignature.types
+++ b/tests/baselines/reference/specializedSignatureIsSubtypeOfNonSpecializedSignature.types
@@ -3,15 +3,15 @@
 // All the below should not be errors
 
 function foo(x: 'a');
->foo : { (x: 'a'): any; (x: string): any; }
+>foo : typeof foo
 >x : 'a'
 
 function foo(x: string);
->foo : { (x: 'a'): any; (x: string): any; }
+>foo : typeof foo
 >x : string
 
 function foo(x: any) { }
->foo : { (x: 'a'): any; (x: string): any; }
+>foo : typeof foo
 >x : any
 
 class C {
diff --git a/tests/baselines/reference/staticAndMemberFunctions.types b/tests/baselines/reference/staticAndMemberFunctions.types
index cc52d24d281..b795cb11c89 100644
--- a/tests/baselines/reference/staticAndMemberFunctions.types
+++ b/tests/baselines/reference/staticAndMemberFunctions.types
@@ -3,7 +3,7 @@ class T {
 >T : T
 
     static x() { }
->x : () => void
+>x : typeof x
 
     public y() { }
 >y : () => void
diff --git a/tests/baselines/reference/staticAndNonStaticPropertiesSameName.types b/tests/baselines/reference/staticAndNonStaticPropertiesSameName.types
index 4c8da030f10..55748f21068 100644
--- a/tests/baselines/reference/staticAndNonStaticPropertiesSameName.types
+++ b/tests/baselines/reference/staticAndNonStaticPropertiesSameName.types
@@ -12,5 +12,5 @@ class C {
 >f : () => void
 
     static f() { }
->f : () => void
+>f : typeof f
 }
diff --git a/tests/baselines/reference/staticFactory1.types b/tests/baselines/reference/staticFactory1.types
index ed275442fb5..e125c659d7c 100644
--- a/tests/baselines/reference/staticFactory1.types
+++ b/tests/baselines/reference/staticFactory1.types
@@ -6,7 +6,7 @@ class Base {
 >foo : () => number
 
     static create() {
->create : () => Base
+>create : typeof create
 
         return new this();
 >new this() : Base
@@ -24,9 +24,9 @@ class Derived extends Base {
 var d = Derived.create(); 
 >d : Base
 >Derived.create() : Base
->Derived.create : () => Base
+>Derived.create : typeof create
 >Derived : typeof Derived
->create : () => Base
+>create : typeof create
 
 d.foo();  
 >d.foo() : number
diff --git a/tests/baselines/reference/staticGetter2.types b/tests/baselines/reference/staticGetter2.types
index 609c07aa059..762ec83e155 100644
--- a/tests/baselines/reference/staticGetter2.types
+++ b/tests/baselines/reference/staticGetter2.types
@@ -4,7 +4,7 @@ class C {
 >C : C
 
     static x() {
->x : () => typeof C
+>x : typeof x
 
         var r = this;
 >r : typeof C
diff --git a/tests/baselines/reference/staticInheritance.types b/tests/baselines/reference/staticInheritance.types
index 04c64281ba8..d4926e059c9 100644
--- a/tests/baselines/reference/staticInheritance.types
+++ b/tests/baselines/reference/staticInheritance.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/staticInheritance.ts ===
 function doThing(x: { n: string }) { }
->doThing : (x: { n: string; }) => void
+>doThing : typeof doThing
 >x : { n: string; }
 >n : string
 
@@ -13,7 +13,7 @@ class A {
     p = doThing(A); // OK
 >p : void
 >doThing(A) : void
->doThing : (x: { n: string; }) => void
+>doThing : typeof doThing
 >A : typeof A
 }
 class B extends A {
@@ -23,17 +23,17 @@ class B extends A {
     p1 = doThing(A); // OK
 >p1 : void
 >doThing(A) : void
->doThing : (x: { n: string; }) => void
+>doThing : typeof doThing
 >A : typeof A
 
     p2 = doThing(B); // OK
 >p2 : void
 >doThing(B) : void
->doThing : (x: { n: string; }) => void
+>doThing : typeof doThing
 >B : typeof B
 }
 doThing(B); //OK
 >doThing(B) : void
->doThing : (x: { n: string; }) => void
+>doThing : typeof doThing
 >B : typeof B
 
diff --git a/tests/baselines/reference/staticInstanceResolution.types b/tests/baselines/reference/staticInstanceResolution.types
index 1a4d3de09a0..ac72c91da75 100644
--- a/tests/baselines/reference/staticInstanceResolution.types
+++ b/tests/baselines/reference/staticInstanceResolution.types
@@ -9,7 +9,7 @@ class Comment {
     }
 
     static getDocCommentText(comments: Comment[])
->getDocCommentText : (comments: Comment[]) => void
+>getDocCommentText : typeof getDocCommentText
 >comments : Comment[]
 >Comment : Comment
     {
diff --git a/tests/baselines/reference/staticInstanceResolution3.types b/tests/baselines/reference/staticInstanceResolution3.types
index d05a5a20343..d8f267edf52 100644
--- a/tests/baselines/reference/staticInstanceResolution3.types
+++ b/tests/baselines/reference/staticInstanceResolution3.types
@@ -5,18 +5,18 @@ import WinJS = require('staticInstanceResolution3_0');
 
 WinJS.Promise.timeout(10);
 >WinJS.Promise.timeout(10) : Promise
->WinJS.Promise.timeout : (delay: number) => Promise
+>WinJS.Promise.timeout : typeof timeout
 >WinJS.Promise : typeof Promise
 >WinJS : typeof "tests/cases/compiler/staticInstanceResolution3_0"
 >Promise : typeof Promise
->timeout : (delay: number) => Promise
+>timeout : typeof timeout
 
 === tests/cases/compiler/staticInstanceResolution3_0.ts ===
 export class Promise {
 >Promise : Promise
 
     static timeout(delay: number): Promise {
->timeout : (delay: number) => Promise
+>timeout : typeof timeout
 >delay : number
 >Promise : Promise
 
diff --git a/tests/baselines/reference/staticInterfaceAssignmentCompat.types b/tests/baselines/reference/staticInterfaceAssignmentCompat.types
index 89e513233ba..807a68d6989 100644
--- a/tests/baselines/reference/staticInterfaceAssignmentCompat.types
+++ b/tests/baselines/reference/staticInterfaceAssignmentCompat.types
@@ -3,7 +3,7 @@ class Shape {
 >Shape : Shape
 
     static create(): Shape {
->create : () => Shape
+>create : typeof create
 >Shape : Shape
 
         return new Shape();
diff --git a/tests/baselines/reference/staticMemberAccessOffDerivedType1.types b/tests/baselines/reference/staticMemberAccessOffDerivedType1.types
index abae26973b0..13aec1da2c0 100644
--- a/tests/baselines/reference/staticMemberAccessOffDerivedType1.types
+++ b/tests/baselines/reference/staticMemberAccessOffDerivedType1.types
@@ -3,7 +3,7 @@ class SomeBase {
 >SomeBase : SomeBase
 
     static GetNumber() {
->GetNumber : () => number
+>GetNumber : typeof GetNumber
 
         return 2;
     }
@@ -15,8 +15,8 @@ class P extends SomeBase {
     static SomeNumber = P.GetNumber();
 >SomeNumber : number
 >P.GetNumber() : number
->P.GetNumber : () => number
+>P.GetNumber : typeof GetNumber
 >P : typeof P
->GetNumber : () => number
+>GetNumber : typeof GetNumber
 }
 
diff --git a/tests/baselines/reference/staticMethodWithTypeParameterExtendsClauseDeclFile.js b/tests/baselines/reference/staticMethodWithTypeParameterExtendsClauseDeclFile.js
deleted file mode 100644
index ba2ca1ae758..00000000000
--- a/tests/baselines/reference/staticMethodWithTypeParameterExtendsClauseDeclFile.js
+++ /dev/null
@@ -1,66 +0,0 @@
-//// [staticMethodWithTypeParameterExtendsClauseDeclFile.ts]
-class privateClass {
-}
-
-export class publicClass {
-}
-
-export class publicClassWithWithPrivateTypeParameters {
-    private static myPrivateStaticMethod1<T extends privateClass>() { // do not emit extends clause
-    }
-    private myPrivateMethod1<T extends privateClass>() { // do not emit extends clause
-    }
-    private static myPrivateStaticMethod2<T extends publicClass>() { // do not emit extends clause
-    }
-    private myPrivateMethod2<T extends publicClass>() { // do not emit extends clause
-    }
-    public static myPublicStaticMethod<T extends publicClass>() {
-    }
-    public myPublicMethod<T extends publicClass>() {
-    }
-}
-
-
-//// [staticMethodWithTypeParameterExtendsClauseDeclFile.js]
-var privateClass = (function () {
-    function privateClass() {
-    }
-    return privateClass;
-})();
-var publicClass = (function () {
-    function publicClass() {
-    }
-    return publicClass;
-})();
-exports.publicClass = publicClass;
-var publicClassWithWithPrivateTypeParameters = (function () {
-    function publicClassWithWithPrivateTypeParameters() {
-    }
-    publicClassWithWithPrivateTypeParameters.myPrivateStaticMethod1 = function () {
-    };
-    publicClassWithWithPrivateTypeParameters.prototype.myPrivateMethod1 = function () {
-    };
-    publicClassWithWithPrivateTypeParameters.myPrivateStaticMethod2 = function () {
-    };
-    publicClassWithWithPrivateTypeParameters.prototype.myPrivateMethod2 = function () {
-    };
-    publicClassWithWithPrivateTypeParameters.myPublicStaticMethod = function () {
-    };
-    publicClassWithWithPrivateTypeParameters.prototype.myPublicMethod = function () {
-    };
-    return publicClassWithWithPrivateTypeParameters;
-})();
-exports.publicClassWithWithPrivateTypeParameters = publicClassWithWithPrivateTypeParameters;
-
-
-//// [staticMethodWithTypeParameterExtendsClauseDeclFile.d.ts]
-export declare class publicClass {
-}
-export declare class publicClassWithWithPrivateTypeParameters {
-    private static myPrivateStaticMethod1<T>();
-    private myPrivateMethod1<T>();
-    private static myPrivateStaticMethod2<T>();
-    private myPrivateMethod2<T>();
-    static myPublicStaticMethod<T extends publicClass>(): void;
-    myPublicMethod<T extends publicClass>(): void;
-}
diff --git a/tests/baselines/reference/staticMethodWithTypeParameterExtendsClauseDeclFile.types b/tests/baselines/reference/staticMethodWithTypeParameterExtendsClauseDeclFile.types
deleted file mode 100644
index eb43b58aecc..00000000000
--- a/tests/baselines/reference/staticMethodWithTypeParameterExtendsClauseDeclFile.types
+++ /dev/null
@@ -1,44 +0,0 @@
-=== tests/cases/compiler/staticMethodWithTypeParameterExtendsClauseDeclFile.ts ===
-class privateClass {
->privateClass : privateClass
-}
-
-export class publicClass {
->publicClass : publicClass
-}
-
-export class publicClassWithWithPrivateTypeParameters {
->publicClassWithWithPrivateTypeParameters : 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/stradac.types b/tests/baselines/reference/stradac.types
index 6fc9bb282be..a720e3e608d 100644
--- a/tests/baselines/reference/stradac.types
+++ b/tests/baselines/reference/stradac.types
@@ -10,7 +10,7 @@ var x = 10;
     
     
 function foo() {
->foo : () => void
+>foo : typeof foo
 
     x++;
 >x++ : number
diff --git a/tests/baselines/reference/strictMode2.types b/tests/baselines/reference/strictMode2.types
index 69c972355b8..87d6db600d6 100644
--- a/tests/baselines/reference/strictMode2.types
+++ b/tests/baselines/reference/strictMode2.types
@@ -2,7 +2,7 @@
 "use strict";
 
 function foo() {
->foo : () => number
+>foo : typeof foo
 
     return 30;
 }
diff --git a/tests/baselines/reference/strictMode3.types b/tests/baselines/reference/strictMode3.types
index 701ebc12d9a..fce99bbcb45 100644
--- a/tests/baselines/reference/strictMode3.types
+++ b/tests/baselines/reference/strictMode3.types
@@ -11,7 +11,7 @@ class B extends A {
 }
 
 function foo() {
->foo : () => any
+>foo : typeof foo
 
     return this.window;
 >this.window : any
diff --git a/tests/baselines/reference/strictMode5.js b/tests/baselines/reference/strictMode5.js
deleted file mode 100644
index c46de926dbb..00000000000
--- a/tests/baselines/reference/strictMode5.js
+++ /dev/null
@@ -1,46 +0,0 @@
-//// [strictMode5.ts]
-function foo(...args) {
-    "use strict"
-}
-
-class A {
-    m() {
-        "use strict"
-
-        var v = () => {
-            return this.n();
-        };
-    }
-    n() {}
-}
-
-function bar(x: number = 10) {
-    "use strict"
-}
-
-//// [strictMode5.js]
-function foo() {
-    "use strict";
-    var args = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        args[_i - 0] = arguments[_i];
-    }
-}
-var A = (function () {
-    function A() {
-    }
-    A.prototype.m = function () {
-        "use strict";
-        var _this = this;
-        var v = function () {
-            return _this.n();
-        };
-    };
-    A.prototype.n = function () {
-    };
-    return A;
-})();
-function bar(x) {
-    "use strict";
-    if (x === void 0) { x = 10; }
-}
diff --git a/tests/baselines/reference/strictMode5.types b/tests/baselines/reference/strictMode5.types
deleted file mode 100644
index 7832a118092..00000000000
--- a/tests/baselines/reference/strictMode5.types
+++ /dev/null
@@ -1,40 +0,0 @@
-=== tests/cases/compiler/strictMode5.ts ===
-function foo(...args) {
->foo : (...args: any[]) => void
->args : any[]
-
-    "use strict"
-}
-
-class A {
->A : A
-
-    m() {
->m : () => void
-
-        "use strict"
-
-        var v = () => {
->v : () => void
->() => {
-            return this.n();
-        } : () => void
-
-            return this.n();
->this.n() : void
->this.n : () => void
->this : A
->n : () => void
-
-        };
-    }
-    n() {}
->n : () => void
-}
-
-function bar(x: number = 10) {
->bar : (x?: number) => void
->x : number
-
-    "use strict"
-}
diff --git a/tests/baselines/reference/stringLiteralPropertyNameWithLineContinuation1.types b/tests/baselines/reference/stringLiteralPropertyNameWithLineContinuation1.types
index ed9c4869bcd..612d36fe6ad 100644
--- a/tests/baselines/reference/stringLiteralPropertyNameWithLineContinuation1.types
+++ b/tests/baselines/reference/stringLiteralPropertyNameWithLineContinuation1.types
@@ -2,8 +2,7 @@
 var x = {'text\
 >x : { 'text\
 ': string; }
->{'text\
-':'hello'} : { 'text\
+>{'text\':'hello'} : { 'text\
 ': string; }
 
 ':'hello'}
diff --git a/tests/baselines/reference/stringNamedPropertyAccess.types b/tests/baselines/reference/stringNamedPropertyAccess.types
index 215543edd6f..180259cab6e 100644
--- a/tests/baselines/reference/stringNamedPropertyAccess.types
+++ b/tests/baselines/reference/stringNamedPropertyAccess.types
@@ -45,9 +45,7 @@ var r3 = a["a b"];
 
 var b = {
 >b : { "a b": number; }
->{
-    "a b": 1
-} : { "a b": number; }
+>{    "a b": 1} : { "a b": number; }
 
     "a b": 1
 }
diff --git a/tests/baselines/reference/stringPropCodeGen.types b/tests/baselines/reference/stringPropCodeGen.types
index 7dab4bf8501..423ab2ffa0e 100644
--- a/tests/baselines/reference/stringPropCodeGen.types
+++ b/tests/baselines/reference/stringPropCodeGen.types
@@ -1,12 +1,7 @@
 === tests/cases/compiler/stringPropCodeGen.ts ===
 var a = {
 >a : { "foo": () => void; "bar": number; }
->{
-
-  "foo" : function() { },
-  "bar" : 5
-
-} : { "foo": () => void; "bar": number; }
+>{  "foo" : function() { },  "bar" : 5} : { "foo": () => void; "bar": number; }
 
   "foo" : function() { },
 >function() { } : () => void
diff --git a/tests/baselines/reference/structural1.types b/tests/baselines/reference/structural1.types
index dcbfc8a3bb7..cb0e8a356a5 100644
--- a/tests/baselines/reference/structural1.types
+++ b/tests/baselines/reference/structural1.types
@@ -13,14 +13,14 @@ module M {
     }
 
     export function f(i:I) {
->f : (i: I) => void
+>f : typeof f
 >i : I
 >I : I
     }
 
     f({salt:2,pepper:0});
 >f({salt:2,pepper:0}) : void
->f : (i: I) => void
+>f : typeof f
 >{salt:2,pepper:0} : { salt: number; pepper: number; }
 >salt : number
 >pepper : number
diff --git a/tests/baselines/reference/subtypingWithCallSignatures.types b/tests/baselines/reference/subtypingWithCallSignatures.types
index 49b5bf299ab..c9c35c1cd55 100644
--- a/tests/baselines/reference/subtypingWithCallSignatures.types
+++ b/tests/baselines/reference/subtypingWithCallSignatures.types
@@ -3,46 +3,46 @@ module CallSignature {
 >CallSignature : typeof CallSignature
 
     declare function foo1(cb: (x: number) => void): typeof cb;
->foo1 : { (cb: (x: number) => void): (x: number) => void; (cb: any): any; }
+>foo1 : typeof foo1
 >cb : (x: number) => void
 >x : number
 >cb : (x: number) => void
 
     declare function foo1(cb: any): any;
->foo1 : { (cb: (x: number) => void): (x: number) => void; (cb: any): any; }
+>foo1 : typeof foo1
 >cb : any
 
     var r = foo1((x: number) => 1); // ok because base returns void
 >r : (x: number) => void
 >foo1((x: number) => 1) : (x: number) => void
->foo1 : { (cb: (x: number) => void): (x: number) => void; (cb: any): any; }
+>foo1 : typeof foo1
 >(x: number) => 1 : (x: number) => number
 >x : number
 
     var r2 = foo1(<T>(x: T) => ''); // ok because base returns void
 >r2 : (x: number) => void
 >foo1(<T>(x: T) => '') : (x: number) => void
->foo1 : { (cb: (x: number) => void): (x: number) => void; (cb: any): any; }
+>foo1 : typeof foo1
 ><T>(x: T) => '' : <T>(x: T) => string
 >T : T
 >x : T
 >T : T
 
     declare function foo2(cb: (x: number, y: number) => void): typeof cb;
->foo2 : { (cb: (x: number, y: number) => void): (x: number, y: number) => void; (cb: any): any; }
+>foo2 : typeof foo2
 >cb : (x: number, y: number) => void
 >x : number
 >y : number
 >cb : (x: number, y: number) => void
 
     declare function foo2(cb: any): any;
->foo2 : { (cb: (x: number, y: number) => void): (x: number, y: number) => void; (cb: any): any; }
+>foo2 : typeof foo2
 >cb : any
 
     var r3 = foo2((x: number, y: number) => 1); // ok because base returns void
 >r3 : (x: number, y: number) => void
 >foo2((x: number, y: number) => 1) : (x: number, y: number) => void
->foo2 : { (cb: (x: number, y: number) => void): (x: number, y: number) => void; (cb: any): any; }
+>foo2 : typeof foo2
 >(x: number, y: number) => 1 : (x: number, y: number) => number
 >x : number
 >y : number
@@ -50,7 +50,7 @@ module CallSignature {
     var r4 = foo2(<T>(x: T) => ''); // ok because base returns void
 >r4 : (x: number, y: number) => void
 >foo2(<T>(x: T) => '') : (x: number, y: number) => void
->foo2 : { (cb: (x: number, y: number) => void): (x: number, y: number) => void; (cb: any): any; }
+>foo2 : typeof foo2
 ><T>(x: T) => '' : <T>(x: T) => string
 >T : T
 >x : T
diff --git a/tests/baselines/reference/subtypingWithCallSignatures2.types b/tests/baselines/reference/subtypingWithCallSignatures2.types
index 5006e00d52b..91984c6aba2 100644
--- a/tests/baselines/reference/subtypingWithCallSignatures2.types
+++ b/tests/baselines/reference/subtypingWithCallSignatures2.types
@@ -21,59 +21,59 @@ class OtherDerived extends Base { bing: string; }
 >bing : string
 
 declare function foo1(a: (x: number) => number[]): typeof a;
->foo1 : { (a: (x: number) => number[]): (x: number) => number[]; (a: any): any; }
+>foo1 : typeof foo1
 >a : (x: number) => number[]
 >x : number
 >a : (x: number) => number[]
 
 declare function foo1(a: any): any;
->foo1 : { (a: (x: number) => number[]): (x: number) => number[]; (a: any): any; }
+>foo1 : typeof foo1
 >a : any
 
 declare function foo2(a: (x: number) => string[]): typeof a;
->foo2 : { (a: (x: number) => string[]): (x: number) => string[]; (a: any): any; }
+>foo2 : typeof foo2
 >a : (x: number) => string[]
 >x : number
 >a : (x: number) => string[]
 
 declare function foo2(a: any): any;
->foo2 : { (a: (x: number) => string[]): (x: number) => string[]; (a: any): any; }
+>foo2 : typeof foo2
 >a : any
 
 declare function foo3(a: (x: number) => void): typeof a;
->foo3 : { (a: (x: number) => void): (x: number) => void; (a: any): any; }
+>foo3 : typeof foo3
 >a : (x: number) => void
 >x : number
 >a : (x: number) => void
 
 declare function foo3(a: any): any;
->foo3 : { (a: (x: number) => void): (x: number) => void; (a: any): any; }
+>foo3 : typeof foo3
 >a : any
 
 declare function foo4(a: (x: string, y: number) => string): typeof a;
->foo4 : { (a: (x: string, y: number) => string): (x: string, y: number) => string; (a: any): any; }
+>foo4 : typeof foo4
 >a : (x: string, y: number) => string
 >x : string
 >y : number
 >a : (x: string, y: number) => string
 
 declare function foo4(a: any): any;
->foo4 : { (a: (x: string, y: number) => string): (x: string, y: number) => string; (a: any): any; }
+>foo4 : typeof foo4
 >a : any
 
 declare function foo5(a: (x: (arg: string) => number) => string): typeof a;
->foo5 : { (a: (x: (arg: string) => number) => string): (x: (arg: string) => number) => string; (a: any): any; }
+>foo5 : typeof foo5
 >a : (x: (arg: string) => number) => string
 >x : (arg: string) => number
 >arg : string
 >a : (x: (arg: string) => number) => string
 
 declare function foo5(a: any): any;
->foo5 : { (a: (x: (arg: string) => number) => string): (x: (arg: string) => number) => string; (a: any): any; }
+>foo5 : typeof foo5
 >a : any
 
 declare function foo6(a: (x: (arg: Base) => Derived) => Base): typeof a;
->foo6 : { (a: (x: (arg: Base) => Derived) => Base): (x: (arg: Base) => Derived) => Base; (a: any): any; }
+>foo6 : typeof foo6
 >a : (x: (arg: Base) => Derived) => Base
 >x : (arg: Base) => Derived
 >arg : Base
@@ -83,11 +83,11 @@ declare function foo6(a: (x: (arg: Base) => Derived) => Base): typeof a;
 >a : (x: (arg: Base) => Derived) => Base
 
 declare function foo6(a: any): any;
->foo6 : { (a: (x: (arg: Base) => Derived) => Base): (x: (arg: Base) => Derived) => Base; (a: any): any; }
+>foo6 : typeof foo6
 >a : any
 
 declare function foo7(a: (x: (arg: Base) => Derived) => (r: Base) => Derived): typeof a;
->foo7 : { (a: (x: (arg: Base) => Derived) => (r: Base) => Derived): (x: (arg: Base) => Derived) => (r: Base) => Derived; (a: any): any; }
+>foo7 : typeof foo7
 >a : (x: (arg: Base) => Derived) => (r: Base) => Derived
 >x : (arg: Base) => Derived
 >arg : Base
@@ -99,11 +99,11 @@ declare function foo7(a: (x: (arg: Base) => Derived) => (r: Base) => Derived): t
 >a : (x: (arg: Base) => Derived) => (r: Base) => Derived
 
 declare function foo7(a: any): any;
->foo7 : { (a: (x: (arg: Base) => Derived) => (r: Base) => Derived): (x: (arg: Base) => Derived) => (r: Base) => Derived; (a: any): any; }
+>foo7 : typeof foo7
 >a : any
 
 declare function foo8(a: (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived): typeof a;
->foo8 : { (a: (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived): (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived; (a: any): any; }
+>foo8 : typeof foo8
 >a : (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived
 >x : (arg: Base) => Derived
 >arg : Base
@@ -119,11 +119,11 @@ declare function foo8(a: (x: (arg: Base) => Derived, y: (arg2: Base) => Derived)
 >a : (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived
 
 declare function foo8(a: any): any;
->foo8 : { (a: (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived): (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived; (a: any): any; }
+>foo8 : typeof foo8
 >a : any
 
 declare function foo9(a: (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived): typeof a;
->foo9 : { (a: (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived): (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived; (a: any): any; }
+>foo9 : typeof foo9
 >a : (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived
 >x : (arg: Base) => Derived
 >arg : Base
@@ -139,11 +139,11 @@ declare function foo9(a: (x: (arg: Base) => Derived, y: (arg2: Base) => Derived)
 >a : (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived
 
 declare function foo9(a: any): any;
->foo9 : { (a: (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived): (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived; (a: any): any; }
+>foo9 : typeof foo9
 >a : any
 
 declare function foo10(a: (...x: Derived[]) => Derived): typeof a;
->foo10 : { (a: (...x: Derived[]) => Derived): (...x: Derived[]) => Derived; (a: any): any; }
+>foo10 : typeof foo10
 >a : (...x: Derived[]) => Derived
 >x : Derived[]
 >Derived : Derived
@@ -151,11 +151,11 @@ declare function foo10(a: (...x: Derived[]) => Derived): typeof a;
 >a : (...x: Derived[]) => Derived
 
 declare function foo10(a: any): any;
->foo10 : { (a: (...x: Derived[]) => Derived): (...x: Derived[]) => Derived; (a: any): any; }
+>foo10 : typeof foo10
 >a : any
 
 declare function foo11(a: (x: { foo: string }, y: { foo: string; bar: string }) => Base): typeof a;
->foo11 : { (a: (x: { foo: string; }, y: { foo: string; bar: string; }) => Base): (x: { foo: string; }, y: { foo: string; bar: string; }) => Base; (a: any): any; }
+>foo11 : typeof foo11
 >a : (x: { foo: string; }, y: { foo: string; bar: string; }) => Base
 >x : { foo: string; }
 >foo : string
@@ -166,11 +166,11 @@ declare function foo11(a: (x: { foo: string }, y: { foo: string; bar: string })
 >a : (x: { foo: string; }, y: { foo: string; bar: string; }) => Base
 
 declare function foo11(a: any): any;
->foo11 : { (a: (x: { foo: string; }, y: { foo: string; bar: string; }) => Base): (x: { foo: string; }, y: { foo: string; bar: string; }) => Base; (a: any): any; }
+>foo11 : typeof foo11
 >a : any
 
 declare function foo12(a: (x: Array<Base>, y: Array<Derived2>) => Array<Derived>): typeof a;
->foo12 : { (a: (x: Base[], y: Derived2[]) => Derived[]): (x: Base[], y: Derived2[]) => Derived[]; (a: any): any; }
+>foo12 : typeof foo12
 >a : (x: Base[], y: Derived2[]) => Derived[]
 >x : Base[]
 >Array : T[]
@@ -183,11 +183,11 @@ declare function foo12(a: (x: Array<Base>, y: Array<Derived2>) => Array<Derived>
 >a : (x: Base[], y: Derived2[]) => Derived[]
 
 declare function foo12(a: any): any;
->foo12 : { (a: (x: Base[], y: Derived2[]) => Derived[]): (x: Base[], y: Derived2[]) => Derived[]; (a: any): any; }
+>foo12 : typeof foo12
 >a : any
 
 declare function foo13(a: (x: Array<Base>, y: Array<Derived>) => Array<Derived>): typeof a;
->foo13 : { (a: (x: Base[], y: Derived[]) => Derived[]): (x: Base[], y: Derived[]) => Derived[]; (a: any): any; }
+>foo13 : typeof foo13
 >a : (x: Base[], y: Derived[]) => Derived[]
 >x : Base[]
 >Array : T[]
@@ -200,11 +200,11 @@ declare function foo13(a: (x: Array<Base>, y: Array<Derived>) => Array<Derived>)
 >a : (x: Base[], y: Derived[]) => Derived[]
 
 declare function foo13(a: any): any;
->foo13 : { (a: (x: Base[], y: Derived[]) => Derived[]): (x: Base[], y: Derived[]) => Derived[]; (a: any): any; }
+>foo13 : typeof foo13
 >a : any
 
 declare function foo14(a: (x: { a: string; b: number }) => Object): typeof a;
->foo14 : { (a: (x: { a: string; b: number; }) => Object): (x: { a: string; b: number; }) => Object; (a: any): any; }
+>foo14 : typeof foo14
 >a : (x: { a: string; b: number; }) => Object
 >x : { a: string; b: number; }
 >a : string
@@ -213,11 +213,11 @@ declare function foo14(a: (x: { a: string; b: number }) => Object): typeof a;
 >a : (x: { a: string; b: number; }) => Object
 
 declare function foo14(a: any): any;
->foo14 : { (a: (x: { a: string; b: number; }) => Object): (x: { a: string; b: number; }) => Object; (a: any): any; }
+>foo14 : typeof foo14
 >a : any
 
 declare function foo15(a: { 
->foo15 : { (a: { (x: number): number[]; (x: string): string[]; }): { (x: number): number[]; (x: string): string[]; }; (a: any): any; }
+>foo15 : typeof foo15
 >a : { (x: number): number[]; (x: string): string[]; }
 
     (x: number): number[];
@@ -230,11 +230,11 @@ declare function foo15(a: {
 >a : { (x: number): number[]; (x: string): string[]; }
 
 declare function foo15(a: any): any;
->foo15 : { (a: { (x: number): number[]; (x: string): string[]; }): { (x: number): number[]; (x: string): string[]; }; (a: any): any; }
+>foo15 : typeof foo15
 >a : any
 
 declare function foo16(a: {
->foo16 : { (a: { <T extends Derived>(x: T): number[]; <U extends Base>(x: U): number[]; }): { <T extends Derived>(x: T): number[]; <U extends Base>(x: U): number[]; }; (a: any): any; }
+>foo16 : typeof foo16
 >a : { <T extends Derived>(x: T): number[]; <U extends Base>(x: U): number[]; }
 
     <T extends Derived>(x: T): number[];
@@ -253,11 +253,11 @@ declare function foo16(a: {
 >a : { <T extends Derived>(x: T): number[]; <U extends Base>(x: U): number[]; }
 
 declare function foo16(a: any): any;
->foo16 : { (a: { <T extends Derived>(x: T): number[]; <U extends Base>(x: U): number[]; }): { <T extends Derived>(x: T): number[]; <U extends Base>(x: U): number[]; }; (a: any): any; }
+>foo16 : typeof foo16
 >a : any
 
 declare function foo17(a: {
->foo17 : { (a: { (x: (a: number) => number): number[]; (x: (a: string) => string): string[]; }): { (x: (a: number) => number): number[]; (x: (a: string) => string): string[]; }; (a: any): any; }
+>foo17 : typeof foo17
 >a : { (x: (a: number) => number): number[]; (x: (a: string) => string): string[]; }
 
     (x: (a: number) => number): number[];
@@ -272,11 +272,11 @@ declare function foo17(a: {
 >a : { (x: (a: number) => number): number[]; (x: (a: string) => string): string[]; }
 
 declare function foo17(a: any): any;
->foo17 : { (a: { (x: (a: number) => number): number[]; (x: (a: string) => string): string[]; }): { (x: (a: number) => number): number[]; (x: (a: string) => string): string[]; }; (a: any): any; }
+>foo17 : typeof foo17
 >a : any
 
 declare function foo18(a: {
->foo18 : { (a: { (x: { (a: number): number; (a: string): string; }): any[]; (x: { (a: boolean): boolean; (a: Date): Date; }): any[]; }): { (x: { (a: number): number; (a: string): string; }): any[]; (x: { (a: boolean): boolean; (a: Date): Date; }): any[]; }; (a: any): any; }
+>foo18 : typeof foo18
 >a : { (x: { (a: number): number; (a: string): string; }): any[]; (x: { (a: boolean): boolean; (a: Date): Date; }): any[]; }
 
     (x: {
@@ -305,7 +305,7 @@ declare function foo18(a: {
 >a : { (x: { (a: number): number; (a: string): string; }): any[]; (x: { (a: boolean): boolean; (a: Date): Date; }): any[]; }
 
 declare function foo18(a: any): any;
->foo18 : { (a: { (x: { (a: number): number; (a: string): string; }): any[]; (x: { (a: boolean): boolean; (a: Date): Date; }): any[]; }): { (x: { (a: number): number; (a: string): string; }): any[]; (x: { (a: boolean): boolean; (a: Date): Date; }): any[]; }; (a: any): any; }
+>foo18 : typeof foo18
 >a : any
 
 var r1arg1 = <T>(x: T) => [x];
@@ -326,7 +326,7 @@ var r1arg2 = (x: number) => [1];
 var r1 = foo1(r1arg1); // any, return types are not subtype of first overload
 >r1 : any
 >foo1(r1arg1) : any
->foo1 : { (a: (x: number) => number[]): (x: number) => number[]; (a: any): any; }
+>foo1 : typeof foo1
 >r1arg1 : <T>(x: T) => T[]
 
 var r1a = [r1arg2, r1arg1]; // generic signature, subtype in both directions
@@ -358,7 +358,7 @@ var r2arg2 = (x: number) => [''];
 var r2 = foo2(r2arg1); 
 >r2 : (x: number) => string[]
 >foo2(r2arg1) : (x: number) => string[]
->foo2 : { (a: (x: number) => string[]): (x: number) => string[]; (a: any): any; }
+>foo2 : typeof foo2
 >r2arg1 : <T>(x: T) => string[]
 
 var r2a = [r2arg1, r2arg2];
@@ -389,7 +389,7 @@ var r3arg2 = (x: number) => { };
 var r3 = foo3(r3arg1); 
 >r3 : (x: number) => void
 >foo3(r3arg1) : (x: number) => void
->foo3 : { (a: (x: number) => void): (x: number) => void; (a: any): any; }
+>foo3 : typeof foo3
 >r3arg1 : <T>(x: T) => T
 
 var r3a = [r3arg1, r3arg2];
@@ -424,7 +424,7 @@ var r4arg2 = (x: string, y: number) => '';
 var r4 = foo4(r4arg1); // any
 >r4 : any
 >foo4(r4arg1) : any
->foo4 : { (a: (x: string, y: number) => string): (x: string, y: number) => string; (a: any): any; }
+>foo4 : typeof foo4
 >r4arg1 : <T, U>(x: T, y: U) => T
 
 var r4a = [r4arg1, r4arg2];
@@ -460,7 +460,7 @@ var r5arg2 = (x: (arg: string) => number) => '';
 var r5 = foo5(r5arg1); // any
 >r5 : any
 >foo5(r5arg1) : any
->foo5 : { (a: (x: (arg: string) => number) => string): (x: (arg: string) => number) => string; (a: any): any; }
+>foo5 : typeof foo5
 >r5arg1 : <T, U>(x: (arg: T) => U) => T
 
 var r5a = [r5arg1, r5arg2];
@@ -502,7 +502,7 @@ var r6arg2 = (x: (arg: Base) => Derived) => <Base>null;
 var r6 = foo6(r6arg1); // any
 >r6 : any
 >foo6(r6arg1) : any
->foo6 : { (a: (x: (arg: Base) => Derived) => Base): (x: (arg: Base) => Derived) => Base; (a: any): any; }
+>foo6 : typeof foo6
 >r6arg1 : <T extends Base, U extends Derived>(x: (arg: T) => U) => T
 
 var r6a = [r6arg1, r6arg2];
@@ -550,7 +550,7 @@ var r7arg2 = (x: (arg: Base) => Derived) => (r: Base) => <Derived>null;
 var r7 = foo7(r7arg1); // any
 >r7 : any
 >foo7(r7arg1) : any
->foo7 : { (a: (x: (arg: Base) => Derived) => (r: Base) => Derived): (x: (arg: Base) => Derived) => (r: Base) => Derived; (a: any): any; }
+>foo7 : typeof foo7
 >r7arg1 : <T extends Base, U extends Derived>(x: (arg: T) => U) => (r: T) => U
 
 var r7a = [r7arg1, r7arg2];
@@ -606,7 +606,7 @@ var r8arg2 = (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base
 var r8 = foo8(r8arg1); // any
 >r8 : any
 >foo8(r8arg1) : any
->foo8 : { (a: (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived): (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived; (a: any): any; }
+>foo8 : typeof foo8
 >r8arg1 : <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: T) => U) => (r: T) => U
 
 var r8a = [r8arg1, r8arg2];
@@ -663,7 +663,7 @@ var r9arg2 = (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base
 var r9 = foo9(r9arg1); // any
 >r9 : any
 >foo9(r9arg1) : any
->foo9 : { (a: (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived): (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived; (a: any): any; }
+>foo9 : typeof foo9
 >r9arg1 : <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: string; bing: number; }) => U) => (r: T) => U
 
 var r9a = [r9arg1, r9arg2];
@@ -699,7 +699,7 @@ var r10arg2 = (...x: Derived[]) => <Derived>null;
 var r10 = foo10(r10arg1); // any
 >r10 : any
 >foo10(r10arg1) : any
->foo10 : { (a: (...x: Derived[]) => Derived): (...x: Derived[]) => Derived; (a: any): any; }
+>foo10 : typeof foo10
 >r10arg1 : <T extends Derived>(...x: T[]) => T
 
 var r10a = [r10arg1, r10arg2];
@@ -739,7 +739,7 @@ var r11arg2 = (x: { foo: string }, y: { foo: string; bar: string }) => <Base>nul
 var r11 = foo11(r11arg1); // any
 >r11 : any
 >foo11(r11arg1) : any
->foo11 : { (a: (x: { foo: string; }, y: { foo: string; bar: string; }) => Base): (x: { foo: string; }, y: { foo: string; bar: string; }) => Base; (a: any): any; }
+>foo11 : typeof foo11
 >r11arg1 : <T extends Base>(x: T, y: T) => T
 
 var r11a = [r11arg1, r11arg2];
@@ -785,7 +785,7 @@ var r12arg2 = (x: Array<Base>, y: Array<Derived2>) => <Array<Derived>>null;
 var r12 = foo12(r12arg1); // any
 >r12 : (x: Base[], y: Derived2[]) => Derived[]
 >foo12(r12arg1) : (x: Base[], y: Derived2[]) => Derived[]
->foo12 : { (a: (x: Base[], y: Derived2[]) => Derived[]): (x: Base[], y: Derived2[]) => Derived[]; (a: any): any; }
+>foo12 : typeof foo12
 >r12arg1 : <T extends Base[]>(x: Base[], y: T) => Derived[]
 
 var r12a = [r12arg1, r12arg2];
@@ -829,7 +829,7 @@ var r13arg2 = (x: Array<Base>, y: Array<Derived>) => <Array<Derived>>null;
 var r13 = foo13(r13arg1); // any
 >r13 : any
 >foo13(r13arg1) : any
->foo13 : { (a: (x: Base[], y: Derived[]) => Derived[]): (x: Base[], y: Derived[]) => Derived[]; (a: any): any; }
+>foo13 : typeof foo13
 >r13arg1 : <T extends Derived[]>(x: Base[], y: T) => T
 
 var r13a = [r13arg1, r13arg2];
@@ -869,7 +869,7 @@ var r14arg2 = (x: { a: string; b: number }) => <Object>null;
 var r14 = foo14(r14arg1); // any
 >r14 : any
 >foo14(r14arg1) : any
->foo14 : { (a: (x: { a: string; b: number; }) => Object): (x: { a: string; b: number; }) => Object; (a: any): any; }
+>foo14 : typeof foo14
 >r14arg1 : <T>(x: { a: T; b: T; }) => T
 
 var r14a = [r14arg1, r14arg2];
@@ -896,7 +896,7 @@ var r15arg1 = <T>(x: T) => <T[]>null
 var r15 = foo15(r15arg1); // any
 >r15 : any
 >foo15(r15arg1) : any
->foo15 : { (a: { (x: number): number[]; (x: string): string[]; }): { (x: number): number[]; (x: string): string[]; }; (a: any): any; }
+>foo15 : typeof foo15
 >r15arg1 : <T>(x: T) => T[]
 
 var r16arg1 = <T extends Base>(x: T) => [1];
@@ -911,7 +911,7 @@ var r16arg1 = <T extends Base>(x: T) => [1];
 var r16 = foo16(r16arg1); 
 >r16 : { <T extends Derived>(x: T): number[]; <U extends Base>(x: U): number[]; }
 >foo16(r16arg1) : { <T extends Derived>(x: T): number[]; <U extends Base>(x: U): number[]; }
->foo16 : { (a: { <T extends Derived>(x: T): number[]; <U extends Base>(x: U): number[]; }): { <T extends Derived>(x: T): number[]; <U extends Base>(x: U): number[]; }; (a: any): any; }
+>foo16 : typeof foo16
 >r16arg1 : <T extends Base>(x: T) => number[]
 
 var r17arg1 = <T>(x: (a: T) => T) => <T[]>null;
@@ -928,7 +928,7 @@ var r17arg1 = <T>(x: (a: T) => T) => <T[]>null;
 var r17 = foo17(r17arg1); // any
 >r17 : any
 >foo17(r17arg1) : any
->foo17 : { (a: { (x: (a: number) => number): number[]; (x: (a: string) => string): string[]; }): { (x: (a: number) => number): number[]; (x: (a: string) => string): string[]; }; (a: any): any; }
+>foo17 : typeof foo17
 >r17arg1 : <T>(x: (a: T) => T) => T[]
 
 var r18arg1 = <T>(x: (a: T) => T) => <T[]>null;
@@ -945,6 +945,6 @@ var r18arg1 = <T>(x: (a: T) => T) => <T[]>null;
 var r18 = foo18(r18arg1); 
 >r18 : { (x: { (a: number): number; (a: string): string; }): any[]; (x: { (a: boolean): boolean; (a: Date): Date; }): any[]; }
 >foo18(r18arg1) : { (x: { (a: number): number; (a: string): string; }): any[]; (x: { (a: boolean): boolean; (a: Date): Date; }): any[]; }
->foo18 : { (a: { (x: { (a: number): number; (a: string): string; }): any[]; (x: { (a: boolean): boolean; (a: Date): Date; }): any[]; }): { (x: { (a: number): number; (a: string): string; }): any[]; (x: { (a: boolean): boolean; (a: Date): Date; }): any[]; }; (a: any): any; }
+>foo18 : typeof foo18
 >r18arg1 : <T>(x: (a: T) => T) => T[]
 
diff --git a/tests/baselines/reference/subtypingWithCallSignatures3.types b/tests/baselines/reference/subtypingWithCallSignatures3.types
index 8c136113464..122301a477d 100644
--- a/tests/baselines/reference/subtypingWithCallSignatures3.types
+++ b/tests/baselines/reference/subtypingWithCallSignatures3.types
@@ -25,17 +25,17 @@ module Errors {
 >bing : string
 
     declare function foo2(a2: (x: number) => string[]): typeof a2;
->foo2 : { (a2: (x: number) => string[]): (x: number) => string[]; (a2: any): any; }
+>foo2 : typeof foo2
 >a2 : (x: number) => string[]
 >x : number
 >a2 : (x: number) => string[]
 
     declare function foo2(a2: any): any;
->foo2 : { (a2: (x: number) => string[]): (x: number) => string[]; (a2: any): any; }
+>foo2 : typeof foo2
 >a2 : any
 
     declare function foo7(a2: (x: (arg: Base) => Derived) => (r: Base) => Derived2): typeof a2;
->foo7 : { (a2: (x: (arg: Base) => Derived) => (r: Base) => Derived2): (x: (arg: Base) => Derived) => (r: Base) => Derived2; (a2: any): any; }
+>foo7 : typeof foo7
 >a2 : (x: (arg: Base) => Derived) => (r: Base) => Derived2
 >x : (arg: Base) => Derived
 >arg : Base
@@ -47,11 +47,11 @@ module Errors {
 >a2 : (x: (arg: Base) => Derived) => (r: Base) => Derived2
 
     declare function foo7(a2: any): any;
->foo7 : { (a2: (x: (arg: Base) => Derived) => (r: Base) => Derived2): (x: (arg: Base) => Derived) => (r: Base) => Derived2; (a2: any): any; }
+>foo7 : typeof foo7
 >a2 : any
 
     declare function foo8(a2: (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived): typeof a2;
->foo8 : { (a2: (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived): (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived; (a2: any): any; }
+>foo8 : typeof foo8
 >a2 : (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived
 >x : (arg: Base) => Derived
 >arg : Base
@@ -67,11 +67,11 @@ module Errors {
 >a2 : (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived
 
     declare function foo8(a2: any): any;
->foo8 : { (a2: (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived): (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived; (a2: any): any; }
+>foo8 : typeof foo8
 >a2 : any
 
     declare function foo10(a2: (...x: Base[]) => Base): typeof a2;
->foo10 : { (a2: (...x: Base[]) => Base): (...x: Base[]) => Base; (a2: any): any; }
+>foo10 : typeof foo10
 >a2 : (...x: Base[]) => Base
 >x : Base[]
 >Base : Base
@@ -79,11 +79,11 @@ module Errors {
 >a2 : (...x: Base[]) => Base
 
     declare function foo10(a2: any): any;
->foo10 : { (a2: (...x: Base[]) => Base): (...x: Base[]) => Base; (a2: any): any; }
+>foo10 : typeof foo10
 >a2 : any
 
     declare function foo11(a2: (x: { foo: string }, y: { foo: string; bar: string }) => Base): typeof a2;
->foo11 : { (a2: (x: { foo: string; }, y: { foo: string; bar: string; }) => Base): (x: { foo: string; }, y: { foo: string; bar: string; }) => Base; (a2: any): any; }
+>foo11 : typeof foo11
 >a2 : (x: { foo: string; }, y: { foo: string; bar: string; }) => Base
 >x : { foo: string; }
 >foo : string
@@ -94,11 +94,11 @@ module Errors {
 >a2 : (x: { foo: string; }, y: { foo: string; bar: string; }) => Base
 
     declare function foo11(a2: any): any;
->foo11 : { (a2: (x: { foo: string; }, y: { foo: string; bar: string; }) => Base): (x: { foo: string; }, y: { foo: string; bar: string; }) => Base; (a2: any): any; }
+>foo11 : typeof foo11
 >a2 : any
 
     declare function foo12(a2: (x: Array<Base>, y: Array<Derived2>) => Array<Derived>): typeof a2;
->foo12 : { (a2: (x: Base[], y: Derived2[]) => Derived[]): (x: Base[], y: Derived2[]) => Derived[]; (a2: any): any; }
+>foo12 : typeof foo12
 >a2 : (x: Base[], y: Derived2[]) => Derived[]
 >x : Base[]
 >Array : T[]
@@ -111,11 +111,11 @@ module Errors {
 >a2 : (x: Base[], y: Derived2[]) => Derived[]
 
     declare function foo12(a2: any): any;
->foo12 : { (a2: (x: Base[], y: Derived2[]) => Derived[]): (x: Base[], y: Derived2[]) => Derived[]; (a2: any): any; }
+>foo12 : typeof foo12
 >a2 : any
 
     declare function foo15(a2: (x: { a: string; b: number }) => number): typeof a2;
->foo15 : { (a2: (x: { a: string; b: number; }) => number): (x: { a: string; b: number; }) => number; (a2: any): any; }
+>foo15 : typeof foo15
 >a2 : (x: { a: string; b: number; }) => number
 >x : { a: string; b: number; }
 >a : string
@@ -123,11 +123,11 @@ module Errors {
 >a2 : (x: { a: string; b: number; }) => number
 
     declare function foo15(a2: any): any;
->foo15 : { (a2: (x: { a: string; b: number; }) => number): (x: { a: string; b: number; }) => number; (a2: any): any; }
+>foo15 : typeof foo15
 >a2 : any
 
     declare function foo16(a2: {
->foo16 : { (a2: { (x: { (a: number): number; (a?: number): number; }): number[]; (x: { (a: boolean): boolean; (a?: boolean): boolean; }): boolean[]; }): { (x: { (a: number): number; (a?: number): number; }): number[]; (x: { (a: boolean): boolean; (a?: boolean): boolean; }): boolean[]; }; (a2: any): any; }
+>foo16 : typeof foo16
 >a2 : { (x: { (a: number): number; (a?: number): number; }): number[]; (x: { (a: boolean): boolean; (a?: boolean): boolean; }): boolean[]; }
 
         // type of parameter is overload set which means we can't do inference based on this type
@@ -155,11 +155,11 @@ module Errors {
 >a2 : { (x: { (a: number): number; (a?: number): number; }): number[]; (x: { (a: boolean): boolean; (a?: boolean): boolean; }): boolean[]; }
 
     declare function foo16(a2: any): any;
->foo16 : { (a2: { (x: { (a: number): number; (a?: number): number; }): number[]; (x: { (a: boolean): boolean; (a?: boolean): boolean; }): boolean[]; }): { (x: { (a: number): number; (a?: number): number; }): number[]; (x: { (a: boolean): boolean; (a?: boolean): boolean; }): boolean[]; }; (a2: any): any; }
+>foo16 : typeof foo16
 >a2 : any
 
     declare function foo17(a2: {
->foo17 : { (a2: { (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[]; }): { (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[]; }; (a2: any): any; }
+>foo17 : typeof foo17
 >a2 : { (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[]; }
 
         (x: {
@@ -202,13 +202,13 @@ module Errors {
 >a2 : { (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[]; }
 
     declare function foo17(a2: any): any;
->foo17 : { (a2: { (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[]; }): { (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[]; }; (a2: any): any; }
+>foo17 : typeof foo17
 >a2 : any
 
     var r1 = foo2(<T, U>(x: T) => <U[]>null); // any
 >r1 : any
 >foo2(<T, U>(x: T) => <U[]>null) : any
->foo2 : { (a2: (x: number) => string[]): (x: number) => string[]; (a2: any): any; }
+>foo2 : typeof foo2
 ><T, U>(x: T) => <U[]>null : <T, U>(x: T) => U[]
 >T : T
 >U : U
@@ -280,7 +280,7 @@ module Errors {
     var r2 = foo7(r2arg); // any
 >r2 : any
 >foo7(r2arg) : any
->foo7 : { (a2: (x: (arg: Base) => Derived) => (r: Base) => Derived2): (x: (arg: Base) => Derived) => (r: Base) => Derived2; (a2: any): any; }
+>foo7 : typeof foo7
 >r2arg : <T extends Base, U extends Derived, V extends Derived2>(x: (arg: T) => U) => (r: T) => V
 
     var r2a = [r2arg2, r2arg];
@@ -336,7 +336,7 @@ module Errors {
     var r3 = foo8(r3arg); // any
 >r3 : any
 >foo8(r3arg) : any
->foo8 : { (a2: (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived): (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived; (a2: any): any; }
+>foo8 : typeof foo8
 >r3arg : <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: number; }) => U) => (r: T) => U
 
     var r3a = [r3arg2, r3arg];
@@ -372,7 +372,7 @@ module Errors {
     var r4 = foo10(r4arg); // any
 >r4 : any
 >foo10(r4arg) : any
->foo10 : { (a2: (...x: Base[]) => Base): (...x: Base[]) => Base; (a2: any): any; }
+>foo10 : typeof foo10
 >r4arg : <T extends Derived>(...x: T[]) => T
 
     var r4a = [r4arg2, r4arg];
@@ -413,7 +413,7 @@ module Errors {
     var r5 = foo11(r5arg); // any
 >r5 : any
 >foo11(r5arg) : any
->foo11 : { (a2: (x: { foo: string; }, y: { foo: string; bar: string; }) => Base): (x: { foo: string; }, y: { foo: string; bar: string; }) => Base; (a2: any): any; }
+>foo11 : typeof foo11
 >r5arg : <T extends Derived>(x: T, y: T) => T
 
     var r5a = [r5arg2, r5arg];
@@ -459,7 +459,7 @@ module Errors {
     var r6 = foo12(r6arg); // (x: Array<Base>, y: Array<Derived2>) => Array<Derived>
 >r6 : (x: Base[], y: Derived2[]) => Derived[]
 >foo12(r6arg) : (x: Base[], y: Derived2[]) => Derived[]
->foo12 : { (a2: (x: Base[], y: Derived2[]) => Derived[]): (x: Base[], y: Derived2[]) => Derived[]; (a2: any): any; }
+>foo12 : typeof foo12
 >r6arg : (x: Base[], y: Derived2[]) => Derived[]
 
     var r6a = [r6arg2, r6arg];
@@ -496,7 +496,7 @@ module Errors {
     var r7 = foo15(r7arg); // any
 >r7 : any
 >foo15(r7arg) : any
->foo15 : { (a2: (x: { a: string; b: number; }) => number): (x: { a: string; b: number; }) => number; (a2: any): any; }
+>foo15 : typeof foo15
 >r7arg : <T>(x: { a: T; b: T; }) => T
 
     var r7a = [r7arg2, r7arg];
@@ -525,7 +525,7 @@ module Errors {
     var r7c = foo15(r7arg3); // (x: { a: string; b: number }) => number): number;
 >r7c : (x: { a: string; b: number; }) => number
 >foo15(r7arg3) : (x: { a: string; b: number; }) => number
->foo15 : { (a2: (x: { a: string; b: number; }) => number): (x: { a: string; b: number; }) => number; (a2: any): any; }
+>foo15 : typeof foo15
 >r7arg3 : <T extends Base>(x: { a: T; b: T; }) => number
 
     var r7d = [r7arg2, r7arg3];
@@ -554,7 +554,7 @@ module Errors {
     var r8 = foo16(r8arg); // any
 >r8 : any
 >foo16(r8arg) : any
->foo16 : { (a2: { (x: { (a: number): number; (a?: number): number; }): number[]; (x: { (a: boolean): boolean; (a?: boolean): boolean; }): boolean[]; }): { (x: { (a: number): number; (a?: number): number; }): number[]; (x: { (a: boolean): boolean; (a?: boolean): boolean; }): boolean[]; }; (a2: any): any; }
+>foo16 : typeof foo16
 >r8arg : <T>(x: (a: T) => T) => T[]
 
     var r9arg = <T>(x: (a: T) => T) => <any[]>null;
@@ -570,7 +570,7 @@ module Errors {
     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 : { (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[]; }
 >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[]; }
->foo17 : { (a2: { (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[]; }): { (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[]; }; (a2: any): any; }
+>foo17 : typeof foo17
 >r9arg : <T>(x: (a: T) => T) => any[]
 }
 
@@ -578,7 +578,7 @@ module WithGenericSignaturesInBaseType {
 >WithGenericSignaturesInBaseType : typeof WithGenericSignaturesInBaseType
 
     declare function foo2(a2: <T>(x: T) => T[]): typeof a2;
->foo2 : { (a2: <T>(x: T) => T[]): <T>(x: T) => T[]; (a2: any): any; }
+>foo2 : typeof foo2
 >a2 : <T>(x: T) => T[]
 >T : T
 >x : T
@@ -587,7 +587,7 @@ module WithGenericSignaturesInBaseType {
 >a2 : <T>(x: T) => T[]
 
     declare function foo2(a2: any): any;
->foo2 : { (a2: <T>(x: T) => T[]): <T>(x: T) => T[]; (a2: any): any; }
+>foo2 : typeof foo2
 >a2 : any
 
     var r2arg2 = <T>(x: T) => [''];
@@ -601,11 +601,11 @@ module WithGenericSignaturesInBaseType {
     var r2 = foo2(r2arg2); // <T>(x:T) => T[] since we can infer from generic signatures now
 >r2 : <T>(x: T) => T[]
 >foo2(r2arg2) : <T>(x: T) => T[]
->foo2 : { (a2: <T>(x: T) => T[]): <T>(x: T) => T[]; (a2: any): any; }
+>foo2 : typeof foo2
 >r2arg2 : <T>(x: T) => string[]
 
     declare function foo3(a2: <T>(x: T) => string[]): typeof a2;
->foo3 : { (a2: <T>(x: T) => string[]): <T>(x: T) => string[]; (a2: any): any; }
+>foo3 : typeof foo3
 >a2 : <T>(x: T) => string[]
 >T : T
 >x : T
@@ -613,7 +613,7 @@ module WithGenericSignaturesInBaseType {
 >a2 : <T>(x: T) => string[]
 
     declare function foo3(a2: any): any;
->foo3 : { (a2: <T>(x: T) => string[]): <T>(x: T) => string[]; (a2: any): any; }
+>foo3 : typeof foo3
 >a2 : any
 
     var r3arg2 = <T>(x: T) => <T[]>null;
@@ -628,6 +628,6 @@ module WithGenericSignaturesInBaseType {
     var r3 = foo3(r3arg2); // any
 >r3 : any
 >foo3(r3arg2) : any
->foo3 : { (a2: <T>(x: T) => string[]): <T>(x: T) => string[]; (a2: any): any; }
+>foo3 : typeof foo3
 >r3arg2 : <T>(x: T) => T[]
 }
diff --git a/tests/baselines/reference/subtypingWithCallSignatures4.types b/tests/baselines/reference/subtypingWithCallSignatures4.types
index 07b3af3e540..e570a89ab42 100644
--- a/tests/baselines/reference/subtypingWithCallSignatures4.types
+++ b/tests/baselines/reference/subtypingWithCallSignatures4.types
@@ -21,7 +21,7 @@ class OtherDerived extends Base { bing: string; }
 >bing : string
 
 declare function foo1(a: <T>(x: T) => T[]);
->foo1 : { (a: <T>(x: T) => T[]): any; (a: any): any; }
+>foo1 : typeof foo1
 >a : <T>(x: T) => T[]
 >T : T
 >x : T
@@ -29,33 +29,33 @@ declare function foo1(a: <T>(x: T) => T[]);
 >T : T
 
 declare function foo1(a: any): any;
->foo1 : { (a: <T>(x: T) => T[]): any; (a: any): any; }
+>foo1 : typeof foo1
 >a : any
 
 declare function foo2(a2: <T>(x: T) => string[]);
->foo2 : { (a2: <T>(x: T) => string[]): any; (a: any): any; }
+>foo2 : typeof foo2
 >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; }
+>foo2 : typeof foo2
 >a : any
 
 declare function foo3(a3: <T>(x: T) => void);
->foo3 : { (a3: <T>(x: T) => void): any; (a: any): any; }
+>foo3 : typeof foo3
 >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; }
+>foo3 : typeof foo3
 >a : 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; }
+>foo4 : typeof foo4
 >a4 : <T, U>(x: T, y: U) => string
 >T : T
 >U : U
@@ -65,11 +65,11 @@ declare function foo4(a4: <T, U>(x: T, y: U) => string);
 >U : U
 
 declare function foo4(a: any): any;
->foo4 : { (a4: <T, U>(x: T, y: U) => string): any; (a: any): any; }
+>foo4 : typeof foo4
 >a : 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; }
+>foo5 : typeof foo5
 >a5 : <T, U>(x: (arg: T) => U) => T
 >T : T
 >U : U
@@ -80,11 +80,11 @@ declare function foo5(a5: <T, U>(x: (arg: T) => U) => T);
 >T : T
 
 declare function foo5(a: any): any;
->foo5 : { (a5: <T, U>(x: (arg: T) => U) => T): any; (a: any): any; }
+>foo5 : typeof foo5
 >a : 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; }
+>foo6 : typeof foo6
 >a6 : <T extends Base>(x: (arg: T) => Derived) => T
 >T : T
 >Base : Base
@@ -95,11 +95,11 @@ declare function foo6(a6: <T extends Base>(x: (arg: T) => Derived) => T);
 >T : T
 
 declare function foo6(a: any): any;
->foo6 : { (a6: <T extends Base>(x: (arg: T) => Derived) => T): any; (a: any): any; }
+>foo6 : typeof foo6
 >a : 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; }
+>foo11 : typeof foo11
 >a11 : <T>(x: { foo: T; }, y: { foo: T; bar: T; }) => Base
 >T : T
 >x : { foo: T; }
@@ -113,11 +113,11 @@ declare function foo11(a11: <T>(x: { foo: T }, y: { foo: T; bar: T }) => Base);
 >Base : Base
 
 declare function foo11(a: any): any;
->foo11 : { (a11: <T>(x: { foo: T; }, y: { foo: T; bar: T; }) => Base): any; (a: any): any; }
+>foo11 : typeof foo11
 >a : 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; }
+>foo15 : typeof foo15
 >a15 : <T>(x: { a: T; b: T; }) => T[]
 >T : T
 >x : { a: T; b: T; }
@@ -128,11 +128,11 @@ declare function foo15(a15: <T>(x: { a: T; b: T }) => T[]);
 >T : T
 
 declare function foo15(a: any): any;
->foo15 : { (a15: <T>(x: { a: T; b: T; }) => T[]): any; (a: any): any; }
+>foo15 : typeof foo15
 >a : 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; }
+>foo16 : typeof foo16
 >a16 : <T extends Base>(x: { a: T; b: T; }) => T[]
 >T : T
 >Base : Base
@@ -144,11 +144,11 @@ declare function foo16(a16: <T extends Base>(x: { a: T; b: 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; }
+>foo16 : typeof foo16
 >a : any
 
 declare function foo17(a17: {
->foo17 : { (a17: { <T extends Derived>(x: (a: T) => T): T[]; <T extends Base>(x: (a: T) => T): T[]; }): any; (a: any): any; }
+>foo17 : typeof foo17
 >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[];
@@ -171,11 +171,11 @@ declare function foo17(a17: {
 
 });
 declare function foo17(a: any): any;
->foo17 : { (a17: { <T extends Derived>(x: (a: T) => T): T[]; <T extends Base>(x: (a: T) => T): T[]; }): any; (a: any): any; }
+>foo17 : typeof foo17
 >a : any
 
 declare function foo18(a18: {
->foo18 : { (a18: { (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[]; }): any; (a: any): any; }
+>foo18 : typeof foo18
 >a18 : { (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[]; }
 
     (x: {
@@ -216,7 +216,7 @@ declare function foo18(a18: {
     }): any[];
 });
 declare function foo18(a: any): any;
->foo18 : { (a18: { (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[]; }): any; (a: any): any; }
+>foo18 : typeof foo18
 >a : any
 
 var r1arg = <T>(x: T) => <T[]>null;
@@ -240,7 +240,7 @@ var r1arg2 = <T>(x: T) => <T[]>null;
 var r1 = foo1(r1arg);
 >r1 : any
 >foo1(r1arg) : any
->foo1 : { (a: <T>(x: T) => T[]): any; (a: any): any; }
+>foo1 : typeof foo1
 >r1arg : <T>(x: T) => T[]
 
 var r1a = [r1arg, r1arg2];
@@ -274,7 +274,7 @@ var r2arg2 = <T>(x: T) => [''];
 var r2 = foo2(r2arg);
 >r2 : any
 >foo2(r2arg) : any
->foo2 : { (a2: <T>(x: T) => string[]): any; (a: any): any; }
+>foo2 : typeof foo2
 >r2arg : <T>(x: T) => string[]
 
 var r2a = [r2arg, r2arg2];
@@ -308,7 +308,7 @@ var r3arg2 = <T>(x: T) => { };
 var r3 = foo3(r3arg);
 >r3 : any
 >foo3(r3arg) : any
->foo3 : { (a3: <T>(x: T) => void): any; (a: any): any; }
+>foo3 : typeof foo3
 >r3arg : <T>(x: T) => T
 
 var r3a = [r3arg, r3arg2];
@@ -346,7 +346,7 @@ var r4arg2 = <T, U>(x: T, y: U) => '';
 var r4 = foo4(r4arg);
 >r4 : any
 >foo4(r4arg) : any
->foo4 : { (a4: <T, U>(x: T, y: U) => string): any; (a: any): any; }
+>foo4 : typeof foo4
 >r4arg : <T, U>(x: T, y: U) => string
 
 var r4a = [r4arg, r4arg2];
@@ -388,7 +388,7 @@ var r5arg2 = <T, U>(x: (arg: T) => U) => <T>null;
 var r5 = foo5(r5arg);
 >r5 : any
 >foo5(r5arg) : any
->foo5 : { (a5: <T, U>(x: (arg: T) => U) => T): any; (a: any): any; }
+>foo5 : typeof foo5
 >r5arg : <T, U>(x: (arg: T) => U) => T
 
 var r5a = [r5arg, r5arg2];
@@ -432,7 +432,7 @@ var r6arg2 = <T extends Base>(x: (arg: T) => Derived) => <T>null;
 var r6 = foo6(r6arg);
 >r6 : any
 >foo6(r6arg) : any
->foo6 : { (a6: <T extends Base>(x: (arg: T) => Derived) => T): any; (a: any): any; }
+>foo6 : typeof foo6
 >r6arg : <T extends Base, U extends Derived>(x: (arg: T) => U) => T
 
 var r6a = [r6arg, r6arg2];
@@ -481,7 +481,7 @@ var r11arg2 = <T>(x: { foo: T }, y: { foo: T; bar: T }) => <Base>null;
 var r11 = foo11(r11arg);
 >r11 : any
 >foo11(r11arg) : any
->foo11 : { (a11: <T>(x: { foo: T; }, y: { foo: T; bar: T; }) => Base): any; (a: any): any; }
+>foo11 : typeof foo11
 >r11arg : <T, U>(x: { foo: T; }, y: { foo: U; bar: U; }) => Base
 
 var r11a = [r11arg, r11arg2];
@@ -524,7 +524,7 @@ var r15arg2 = <T>(x: { a: T; b: T }) => <T[]>null;
 var r15 = foo15(r15arg);
 >r15 : any
 >foo15(r15arg) : any
->foo15 : { (a15: <T>(x: { a: T; b: T; }) => T[]): any; (a: any): any; }
+>foo15 : typeof foo15
 >r15arg : <U, V>(x: { a: U; b: V; }) => U[]
 
 var r15a = [r15arg, r15arg2];
@@ -568,7 +568,7 @@ var r16arg2 = <T extends Base>(x: { a: T; b: T }) => <T[]>null;
 var r16 = foo16(r16arg);
 >r16 : any
 >foo16(r16arg) : any
->foo16 : { (a16: <T extends Base>(x: { a: T; b: T; }) => T[]): any; (a: any): any; }
+>foo16 : typeof foo16
 >r16arg : <T extends Base>(x: { a: T; b: T; }) => T[]
 
 var r16a = [r16arg, r16arg2];
@@ -597,7 +597,7 @@ var r17arg = <T>(x: (a: T) => T) => <T[]>null;
 var r17 = foo17(r17arg);
 >r17 : any
 >foo17(r17arg) : any
->foo17 : { (a17: { <T extends Derived>(x: (a: T) => T): T[]; <T extends Base>(x: (a: T) => T): T[]; }): any; (a: any): any; }
+>foo17 : typeof foo17
 >r17arg : <T>(x: (a: T) => T) => T[]
 
 var r18arg = (x: <T>(a: T) => T) => <any[]>null;
@@ -613,6 +613,6 @@ var r18arg = (x: <T>(a: T) => T) => <any[]>null;
 var r18 = foo18(r18arg);
 >r18 : any
 >foo18(r18arg) : any
->foo18 : { (a18: { (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[]; }): any; (a: any): any; }
+>foo18 : typeof foo18
 >r18arg : (x: <T>(a: T) => T) => any[]
 
diff --git a/tests/baselines/reference/subtypingWithConstructSignatures.types b/tests/baselines/reference/subtypingWithConstructSignatures.types
index 71ee7384f25..ed6ebc18c56 100644
--- a/tests/baselines/reference/subtypingWithConstructSignatures.types
+++ b/tests/baselines/reference/subtypingWithConstructSignatures.types
@@ -3,13 +3,13 @@ module ConstructSignature {
 >ConstructSignature : typeof ConstructSignature
 
     declare function foo1(cb: new (x: number) => void): typeof cb;
->foo1 : { (cb: new (x: number) => void): new (x: number) => void; (cb: any): any; }
+>foo1 : typeof foo1
 >cb : new (x: number) => void
 >x : number
 >cb : new (x: number) => void
 
     declare function foo1(cb: any): any;
->foo1 : { (cb: new (x: number) => void): new (x: number) => void; (cb: any): any; }
+>foo1 : typeof foo1
 >cb : any
 
     var rarg1: new (x: number) => number;
@@ -19,7 +19,7 @@ module ConstructSignature {
     var r = foo1(rarg1); // ok because base returns void
 >r : new (x: number) => void
 >foo1(rarg1) : new (x: number) => void
->foo1 : { (cb: new (x: number) => void): new (x: number) => void; (cb: any): any; }
+>foo1 : typeof foo1
 >rarg1 : new (x: number) => number
 
     var rarg2: new <T>(x: T) => string;
@@ -31,18 +31,18 @@ module ConstructSignature {
     var r2 = foo1(rarg2); // ok because base returns void
 >r2 : new (x: number) => void
 >foo1(rarg2) : new (x: number) => void
->foo1 : { (cb: new (x: number) => void): new (x: number) => void; (cb: any): any; }
+>foo1 : typeof foo1
 >rarg2 : new <T>(x: T) => string
 
     declare function foo2(cb: new (x: number, y: number) => void): typeof cb;
->foo2 : { (cb: new (x: number, y: number) => void): new (x: number, y: number) => void; (cb: any): any; }
+>foo2 : typeof foo2
 >cb : new (x: number, y: number) => void
 >x : number
 >y : number
 >cb : new (x: number, y: number) => void
 
     declare function foo2(cb: any): any;
->foo2 : { (cb: new (x: number, y: number) => void): new (x: number, y: number) => void; (cb: any): any; }
+>foo2 : typeof foo2
 >cb : any
 
     var r3arg1: new (x: number, y: number) => number;
@@ -53,7 +53,7 @@ module ConstructSignature {
     var r3 = foo2(r3arg1); // ok because base returns void
 >r3 : new (x: number, y: number) => void
 >foo2(r3arg1) : new (x: number, y: number) => void
->foo2 : { (cb: new (x: number, y: number) => void): new (x: number, y: number) => void; (cb: any): any; }
+>foo2 : typeof foo2
 >r3arg1 : new (x: number, y: number) => number
 
     var r4arg1: new <T>(x: T) => string;
@@ -65,6 +65,6 @@ module ConstructSignature {
     var r4 = foo2(r4arg1); // ok because base returns void
 >r4 : new (x: number, y: number) => void
 >foo2(r4arg1) : new (x: number, y: number) => void
->foo2 : { (cb: new (x: number, y: number) => void): new (x: number, y: number) => void; (cb: any): any; }
+>foo2 : typeof foo2
 >r4arg1 : new <T>(x: T) => string
 }
diff --git a/tests/baselines/reference/subtypingWithConstructSignatures2.types b/tests/baselines/reference/subtypingWithConstructSignatures2.types
index fdba6014751..75859e04902 100644
--- a/tests/baselines/reference/subtypingWithConstructSignatures2.types
+++ b/tests/baselines/reference/subtypingWithConstructSignatures2.types
@@ -21,59 +21,59 @@ class OtherDerived extends Base { bing: string; }
 >bing : string
 
 declare function foo1(a: new (x: number) => number[]): typeof a;
->foo1 : { (a: new (x: number) => number[]): new (x: number) => number[]; (a: any): any; }
+>foo1 : typeof foo1
 >a : new (x: number) => number[]
 >x : number
 >a : new (x: number) => number[]
 
 declare function foo1(a: any): any;
->foo1 : { (a: new (x: number) => number[]): new (x: number) => number[]; (a: any): any; }
+>foo1 : typeof foo1
 >a : any
 
 declare function foo2(a: new (x: number) => string[]): typeof a;
->foo2 : { (a: new (x: number) => string[]): new (x: number) => string[]; (a: any): any; }
+>foo2 : typeof foo2
 >a : new (x: number) => string[]
 >x : number
 >a : new (x: number) => string[]
 
 declare function foo2(a: any): any;
->foo2 : { (a: new (x: number) => string[]): new (x: number) => string[]; (a: any): any; }
+>foo2 : typeof foo2
 >a : any
 
 declare function foo3(a: new (x: number) => void): typeof a;
->foo3 : { (a: new (x: number) => void): new (x: number) => void; (a: any): any; }
+>foo3 : typeof foo3
 >a : new (x: number) => void
 >x : number
 >a : new (x: number) => void
 
 declare function foo3(a: any): any;
->foo3 : { (a: new (x: number) => void): new (x: number) => void; (a: any): any; }
+>foo3 : typeof foo3
 >a : any
 
 declare function foo4(a: new (x: string, y: number) => string): typeof a;
->foo4 : { (a: new (x: string, y: number) => string): new (x: string, y: number) => string; (a: any): any; }
+>foo4 : typeof foo4
 >a : new (x: string, y: number) => string
 >x : string
 >y : number
 >a : new (x: string, y: number) => string
 
 declare function foo4(a: any): any;
->foo4 : { (a: new (x: string, y: number) => string): new (x: string, y: number) => string; (a: any): any; }
+>foo4 : typeof foo4
 >a : any
 
 declare function foo5(a: new (x: new (arg: string) => number) => string): typeof a;
->foo5 : { (a: new (x: new (arg: string) => number) => string): new (x: new (arg: string) => number) => string; (a: any): any; }
+>foo5 : typeof foo5
 >a : new (x: new (arg: string) => number) => string
 >x : new (arg: string) => number
 >arg : string
 >a : new (x: new (arg: string) => number) => string
 
 declare function foo5(a: any): any;
->foo5 : { (a: new (x: new (arg: string) => number) => string): new (x: new (arg: string) => number) => string; (a: any): any; }
+>foo5 : typeof foo5
 >a : any
 
 declare function foo6(a: new (x: new (arg: Base) => Derived) => Base): typeof a;
->foo6 : { (a: new (x: new (arg: Base) => Derived) => Base): new (x: new (arg: Base) => Derived) => Base; (a: any): any; }
+>foo6 : typeof foo6
 >a : new (x: new (arg: Base) => Derived) => Base
 >x : new (arg: Base) => Derived
 >arg : Base
@@ -83,11 +83,11 @@ declare function foo6(a: new (x: new (arg: Base) => Derived) => Base): typeof a;
 >a : new (x: new (arg: Base) => Derived) => Base
 
 declare function foo6(a: any): any;
->foo6 : { (a: new (x: new (arg: Base) => Derived) => Base): new (x: new (arg: Base) => Derived) => Base; (a: any): any; }
+>foo6 : typeof foo6
 >a : any
 
 declare function foo7(a: new (x: new (arg: Base) => Derived) => new (r: Base) => Derived): typeof a;
->foo7 : { (a: new (x: new (arg: Base) => Derived) => new (r: Base) => Derived): new (x: new (arg: Base) => Derived) => new (r: Base) => Derived; (a: any): any; }
+>foo7 : typeof foo7
 >a : new (x: new (arg: Base) => Derived) => new (r: Base) => Derived
 >x : new (arg: Base) => Derived
 >arg : Base
@@ -99,11 +99,11 @@ declare function foo7(a: new (x: new (arg: Base) => Derived) => new (r: Base) =>
 >a : new (x: new (arg: Base) => Derived) => new (r: Base) => Derived
 
 declare function foo7(a: any): any;
->foo7 : { (a: new (x: new (arg: Base) => Derived) => new (r: Base) => Derived): new (x: new (arg: Base) => Derived) => new (r: Base) => Derived; (a: any): any; }
+>foo7 : typeof foo7
 >a : any
 
 declare function foo8(a: new (x: new (arg: Base) => Derived, y: new (arg2: Base) => Derived) => new (r: Base) => Derived): typeof a;
->foo8 : { (a: new (x: new (arg: Base) => Derived, y: new (arg2: Base) => Derived) => new (r: Base) => Derived): new (x: new (arg: Base) => Derived, y: new (arg2: Base) => Derived) => new (r: Base) => Derived; (a: any): any; }
+>foo8 : typeof foo8
 >a : new (x: new (arg: Base) => Derived, y: new (arg2: Base) => Derived) => new (r: Base) => Derived
 >x : new (arg: Base) => Derived
 >arg : Base
@@ -119,11 +119,11 @@ 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
 
 declare function foo8(a: any): any;
->foo8 : { (a: new (x: new (arg: Base) => Derived, y: new (arg2: Base) => Derived) => new (r: Base) => Derived): new (x: new (arg: Base) => Derived, y: new (arg2: Base) => Derived) => new (r: Base) => Derived; (a: any): any; }
+>foo8 : typeof foo8
 >a : any
 
 declare function foo9(a: new (x: new (arg: Base) => Derived, y: new (arg2: Base) => Derived) => new (r: Base) => Derived): typeof a;
->foo9 : { (a: new (x: new (arg: Base) => Derived, y: new (arg2: Base) => Derived) => new (r: Base) => Derived): new (x: new (arg: Base) => Derived, y: new (arg2: Base) => Derived) => new (r: Base) => Derived; (a: any): any; }
+>foo9 : typeof foo9
 >a : new (x: new (arg: Base) => Derived, y: new (arg2: Base) => Derived) => new (r: Base) => Derived
 >x : new (arg: Base) => Derived
 >arg : Base
@@ -139,11 +139,11 @@ 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
 
 declare function foo9(a: any): any;
->foo9 : { (a: new (x: new (arg: Base) => Derived, y: new (arg2: Base) => Derived) => new (r: Base) => Derived): new (x: new (arg: Base) => Derived, y: new (arg2: Base) => Derived) => new (r: Base) => Derived; (a: any): any; }
+>foo9 : typeof foo9
 >a : any
 
 declare function foo10(a: new (...x: Derived[]) => Derived): typeof a;
->foo10 : { (a: new (...x: Derived[]) => Derived): new (...x: Derived[]) => Derived; (a: any): any; }
+>foo10 : typeof foo10
 >a : new (...x: Derived[]) => Derived
 >x : Derived[]
 >Derived : Derived
@@ -151,11 +151,11 @@ declare function foo10(a: new (...x: Derived[]) => Derived): typeof a;
 >a : new (...x: Derived[]) => Derived
 
 declare function foo10(a: any): any;
->foo10 : { (a: new (...x: Derived[]) => Derived): new (...x: Derived[]) => Derived; (a: any): any; }
+>foo10 : typeof foo10
 >a : any
 
 declare function foo11(a: new (x: { foo: string }, y: { foo: string; bar: string }) => Base): typeof a;
->foo11 : { (a: new (x: { foo: string; }, y: { foo: string; bar: string; }) => Base): new (x: { foo: string; }, y: { foo: string; bar: string; }) => Base; (a: any): any; }
+>foo11 : typeof foo11
 >a : new (x: { foo: string; }, y: { foo: string; bar: string; }) => Base
 >x : { foo: string; }
 >foo : string
@@ -166,11 +166,11 @@ declare function foo11(a: new (x: { foo: string }, y: { foo: string; bar: string
 >a : new (x: { foo: string; }, y: { foo: string; bar: string; }) => Base
 
 declare function foo11(a: any): any;
->foo11 : { (a: new (x: { foo: string; }, y: { foo: string; bar: string; }) => Base): new (x: { foo: string; }, y: { foo: string; bar: string; }) => Base; (a: any): any; }
+>foo11 : typeof foo11
 >a : any
 
 declare function foo12(a: new (x: Array<Base>, y: Array<Derived2>) => Array<Derived>): typeof a;
->foo12 : { (a: new (x: Base[], y: Derived2[]) => Derived[]): new (x: Base[], y: Derived2[]) => Derived[]; (a: any): any; }
+>foo12 : typeof foo12
 >a : new (x: Base[], y: Derived2[]) => Derived[]
 >x : Base[]
 >Array : T[]
@@ -183,11 +183,11 @@ declare function foo12(a: new (x: Array<Base>, y: Array<Derived2>) => Array<Deri
 >a : new (x: Base[], y: Derived2[]) => Derived[]
 
 declare function foo12(a: any): any;
->foo12 : { (a: new (x: Base[], y: Derived2[]) => Derived[]): new (x: Base[], y: Derived2[]) => Derived[]; (a: any): any; }
+>foo12 : typeof foo12
 >a : any
 
 declare function foo13(a: new (x: Array<Base>, y: Array<Derived>) => Array<Derived>): typeof a;
->foo13 : { (a: new (x: Base[], y: Derived[]) => Derived[]): new (x: Base[], y: Derived[]) => Derived[]; (a: any): any; }
+>foo13 : typeof foo13
 >a : new (x: Base[], y: Derived[]) => Derived[]
 >x : Base[]
 >Array : T[]
@@ -200,11 +200,11 @@ declare function foo13(a: new (x: Array<Base>, y: Array<Derived>) => Array<Deriv
 >a : new (x: Base[], y: Derived[]) => Derived[]
 
 declare function foo13(a: any): any;
->foo13 : { (a: new (x: Base[], y: Derived[]) => Derived[]): new (x: Base[], y: Derived[]) => Derived[]; (a: any): any; }
+>foo13 : typeof foo13
 >a : any
 
 declare function foo14(a: new (x: { a: string; b: number }) => Object): typeof a;
->foo14 : { (a: new (x: { a: string; b: number; }) => Object): new (x: { a: string; b: number; }) => Object; (a: any): any; }
+>foo14 : typeof foo14
 >a : new (x: { a: string; b: number; }) => Object
 >x : { a: string; b: number; }
 >a : string
@@ -213,11 +213,11 @@ declare function foo14(a: new (x: { a: string; b: number }) => Object): typeof a
 >a : new (x: { a: string; b: number; }) => Object
 
 declare function foo14(a: any): any;
->foo14 : { (a: new (x: { a: string; b: number; }) => Object): new (x: { a: string; b: number; }) => Object; (a: any): any; }
+>foo14 : typeof foo14
 >a : any
 
 declare function foo15(a: { 
->foo15 : { (a: { new (x: number): number[]; new (x: string): string[]; }): { new (x: number): number[]; new (x: string): string[]; }; (a: any): any; }
+>foo15 : typeof foo15
 >a : { new (x: number): number[]; new (x: string): string[]; }
 
     new (x: number): number[];
@@ -230,11 +230,11 @@ declare function foo15(a: {
 >a : { new (x: number): number[]; new (x: string): string[]; }
 
 declare function foo15(a: any): any;
->foo15 : { (a: { new (x: number): number[]; new (x: string): string[]; }): { new (x: number): number[]; new (x: string): string[]; }; (a: any): any; }
+>foo15 : typeof foo15
 >a : any
 
 declare function foo16(a: {
->foo16 : { (a: { new <T extends Derived>(x: T): number[]; new <U extends Base>(x: U): number[]; }): { new <T extends Derived>(x: T): number[]; new <U extends Base>(x: U): number[]; }; (a: any): any; }
+>foo16 : typeof foo16
 >a : { new <T extends Derived>(x: T): number[]; new <U extends Base>(x: U): number[]; }
 
     new <T extends Derived>(x: T): number[];
@@ -253,11 +253,11 @@ declare function foo16(a: {
 >a : { new <T extends Derived>(x: T): number[]; new <U extends Base>(x: U): number[]; }
 
 declare function foo16(a: any): any;
->foo16 : { (a: { new <T extends Derived>(x: T): number[]; new <U extends Base>(x: U): number[]; }): { new <T extends Derived>(x: T): number[]; new <U extends Base>(x: U): number[]; }; (a: any): any; }
+>foo16 : typeof foo16
 >a : any
 
 declare function foo17(a: {
->foo17 : { (a: { new (x: (a: number) => number): number[]; new (x: (a: string) => string): string[]; }): { new (x: (a: number) => number): number[]; new (x: (a: string) => string): string[]; }; (a: any): any; }
+>foo17 : typeof foo17
 >a : { new (x: (a: number) => number): number[]; new (x: (a: string) => string): string[]; }
 
     new (x: (a: number) => number): number[];
@@ -272,11 +272,11 @@ declare function foo17(a: {
 >a : { new (x: (a: number) => number): number[]; new (x: (a: string) => string): string[]; }
 
 declare function foo17(a: any): any;
->foo17 : { (a: { new (x: (a: number) => number): number[]; new (x: (a: string) => string): string[]; }): { new (x: (a: number) => number): number[]; new (x: (a: string) => string): string[]; }; (a: any): any; }
+>foo17 : typeof foo17
 >a : any
 
 declare function foo18(a: {
->foo18 : { (a: { new (x: { new (a: number): number; new (a: string): string; }): any[]; new (x: { new (a: boolean): boolean; new (a: Date): Date; }): any[]; }): { new (x: { new (a: number): number; new (a: string): string; }): any[]; new (x: { new (a: boolean): boolean; new (a: Date): Date; }): any[]; }; (a: any): any; }
+>foo18 : typeof foo18
 >a : { new (x: { new (a: number): number; new (a: string): string; }): any[]; new (x: { new (a: boolean): boolean; new (a: Date): Date; }): any[]; }
 
     new (x: {
@@ -305,7 +305,7 @@ declare function foo18(a: {
 >a : { new (x: { new (a: number): number; new (a: string): string; }): any[]; new (x: { new (a: boolean): boolean; new (a: Date): Date; }): any[]; }
 
 declare function foo18(a: any): any;
->foo18 : { (a: { new (x: { new (a: number): number; new (a: string): string; }): any[]; new (x: { new (a: boolean): boolean; new (a: Date): Date; }): any[]; }): { new (x: { new (a: number): number; new (a: string): string; }): any[]; new (x: { new (a: boolean): boolean; new (a: Date): Date; }): any[]; }; (a: any): any; }
+>foo18 : typeof foo18
 >a : any
 
 var r1arg1: new <T>(x: T) => T[];
@@ -322,7 +322,7 @@ var r1arg2: new (x: number) => number[];
 var r1 = foo1(r1arg1); // any, return types are not subtype of first overload
 >r1 : any
 >foo1(r1arg1) : any
->foo1 : { (a: new (x: number) => number[]): new (x: number) => number[]; (a: any): any; }
+>foo1 : typeof foo1
 >r1arg1 : new <T>(x: T) => T[]
 
 var r1a = [r1arg2, r1arg1]; // generic signature, subtype in both directions
@@ -350,7 +350,7 @@ var r2arg2: new (x: number) => string[];
 var r2 = foo2(r2arg1);
 >r2 : new (x: number) => string[]
 >foo2(r2arg1) : new (x: number) => string[]
->foo2 : { (a: new (x: number) => string[]): new (x: number) => string[]; (a: any): any; }
+>foo2 : typeof foo2
 >r2arg1 : new <T>(x: T) => string[]
 
 var r2a = [r2arg1, r2arg2];
@@ -379,7 +379,7 @@ var r3arg2: new (x: number) => void;
 var r3 = foo3(r3arg1);
 >r3 : new (x: number) => void
 >foo3(r3arg1) : new (x: number) => void
->foo3 : { (a: new (x: number) => void): new (x: number) => void; (a: any): any; }
+>foo3 : typeof foo3
 >r3arg1 : new <T>(x: T) => T
 
 var r3a = [r3arg1, r3arg2];
@@ -412,7 +412,7 @@ var r4arg2: new (x: string, y: number) => string;
 var r4 = foo4(r4arg1); // any
 >r4 : any
 >foo4(r4arg1) : any
->foo4 : { (a: new (x: string, y: number) => string): new (x: string, y: number) => string; (a: any): any; }
+>foo4 : typeof foo4
 >r4arg1 : new <T, U>(x: T, y: U) => T
 
 var r4a = [r4arg1, r4arg2];
@@ -445,7 +445,7 @@ var r5arg2: new (x: new (arg: string) => number) => string;
 var r5 = foo5(r5arg1); // any
 >r5 : any
 >foo5(r5arg1) : any
->foo5 : { (a: new (x: new (arg: string) => number) => string): new (x: new (arg: string) => number) => string; (a: any): any; }
+>foo5 : typeof foo5
 >r5arg1 : new <T, U>(x: new (arg: T) => U) => T
 
 var r5a = [r5arg1, r5arg2];
@@ -483,7 +483,7 @@ var r6arg2: new (x: new (arg: Base) => Derived) => Base;
 var r6 = foo6(r6arg1); // any
 >r6 : any
 >foo6(r6arg1) : any
->foo6 : { (a: new (x: new (arg: Base) => Derived) => Base): new (x: new (arg: Base) => Derived) => Base; (a: any): any; }
+>foo6 : typeof foo6
 >r6arg1 : new <T extends Base, U extends Derived>(x: new (arg: T) => U) => T
 
 var r6a = [r6arg1, r6arg2];
@@ -525,7 +525,7 @@ var r7arg2: new (x: new (arg: Base) => Derived) => new (r: Base) => Derived;
 var r7 = foo7(r7arg1); // any
 >r7 : any
 >foo7(r7arg1) : any
->foo7 : { (a: new (x: new (arg: Base) => Derived) => new (r: Base) => Derived): new (x: new (arg: Base) => Derived) => new (r: Base) => Derived; (a: any): any; }
+>foo7 : typeof foo7
 >r7arg1 : new <T extends Base, U extends Derived>(x: new (arg: T) => U) => new (r: T) => U
 
 var r7a = [r7arg1, r7arg2];
@@ -575,7 +575,7 @@ var r8arg2: new (x: new (arg: Base) => Derived, y: new (arg2: Base) => Derived)
 var r8 = foo8(r8arg1); // any
 >r8 : any
 >foo8(r8arg1) : any
->foo8 : { (a: new (x: new (arg: Base) => Derived, y: new (arg2: Base) => Derived) => new (r: Base) => Derived): new (x: new (arg: Base) => Derived, y: new (arg2: Base) => Derived) => new (r: Base) => Derived; (a: any): any; }
+>foo8 : typeof foo8
 >r8arg1 : new <T extends Base, U extends Derived>(x: new (arg: T) => U, y: new (arg2: T) => U) => new (r: T) => U
 
 var r8a = [r8arg1, r8arg2];
@@ -626,7 +626,7 @@ var r9arg2: new (x: new (arg: Base) => Derived, y: new (arg2: Base) => Derived)
 var r9 = foo9(r9arg1); // any
 >r9 : any
 >foo9(r9arg1) : any
->foo9 : { (a: new (x: new (arg: Base) => Derived, y: new (arg2: Base) => Derived) => new (r: Base) => Derived): new (x: new (arg: Base) => Derived, y: new (arg2: Base) => Derived) => new (r: Base) => Derived; (a: any): any; }
+>foo9 : typeof foo9
 >r9arg1 : new <T extends Base, U extends Derived>(x: new (arg: T) => U, y: (arg2: { foo: string; bing: number; }) => U) => new (r: T) => U
 
 var r9a = [r9arg1, r9arg2];
@@ -658,7 +658,7 @@ var r10arg2: new (...x: Derived[]) => Derived;
 var r10 = foo10(r10arg1); // any
 >r10 : any
 >foo10(r10arg1) : any
->foo10 : { (a: new (...x: Derived[]) => Derived): new (...x: Derived[]) => Derived; (a: any): any; }
+>foo10 : typeof foo10
 >r10arg1 : new <T extends Derived>(...x: T[]) => T
 
 var r10a = [r10arg1, r10arg2];
@@ -695,7 +695,7 @@ var r11arg2: new (x: { foo: string }, y: { foo: string; bar: string }) => Base;
 var r11 = foo11(r11arg1); // any
 >r11 : any
 >foo11(r11arg1) : any
->foo11 : { (a: new (x: { foo: string; }, y: { foo: string; bar: string; }) => Base): new (x: { foo: string; }, y: { foo: string; bar: string; }) => Base; (a: any): any; }
+>foo11 : typeof foo11
 >r11arg1 : new <T extends Base>(x: T, y: T) => T
 
 var r11a = [r11arg1, r11arg2];
@@ -737,7 +737,7 @@ var r12arg2: new (x: Array<Base>, y: Array<Derived2>) => Array<Derived>;
 var r12 = foo12(r12arg1); // any
 >r12 : new (x: Base[], y: Derived2[]) => Derived[]
 >foo12(r12arg1) : new (x: Base[], y: Derived2[]) => Derived[]
->foo12 : { (a: new (x: Base[], y: Derived2[]) => Derived[]): new (x: Base[], y: Derived2[]) => Derived[]; (a: any): any; }
+>foo12 : typeof foo12
 >r12arg1 : new <T extends Base[]>(x: Base[], y: T) => Derived[]
 
 var r12a = [r12arg1, r12arg2];
@@ -778,7 +778,7 @@ var r13arg2: new (x: Array<Base>, y: Array<Derived>) => Array<Derived>;
 var r13 = foo13(r13arg1); // any
 >r13 : any
 >foo13(r13arg1) : any
->foo13 : { (a: new (x: Base[], y: Derived[]) => Derived[]): new (x: Base[], y: Derived[]) => Derived[]; (a: any): any; }
+>foo13 : typeof foo13
 >r13arg1 : new <T extends Derived[]>(x: Base[], y: T) => T
 
 var r13a = [r13arg1, r13arg2];
@@ -813,7 +813,7 @@ var r14arg2: new (x: { a: string; b: number }) => Object;
 var r14 = foo14(r14arg1); // any
 >r14 : any
 >foo14(r14arg1) : any
->foo14 : { (a: new (x: { a: string; b: number; }) => Object): new (x: { a: string; b: number; }) => Object; (a: any): any; }
+>foo14 : typeof foo14
 >r14arg1 : new <T>(x: { a: T; b: T; }) => T
 
 var r14a = [r14arg1, r14arg2];
@@ -838,7 +838,7 @@ var r15arg1: new <T>(x: T) => T[];
 var r15 = foo15(r15arg1); // any
 >r15 : any
 >foo15(r15arg1) : any
->foo15 : { (a: { new (x: number): number[]; new (x: string): string[]; }): { new (x: number): number[]; new (x: string): string[]; }; (a: any): any; }
+>foo15 : typeof foo15
 >r15arg1 : new <T>(x: T) => T[]
 
 var r16arg1: new <T extends Base>(x: T) => number[];
@@ -851,7 +851,7 @@ var r16arg1: new <T extends Base>(x: T) => number[];
 var r16 = foo16(r16arg1);
 >r16 : { new <T extends Derived>(x: T): number[]; new <U extends Base>(x: U): number[]; }
 >foo16(r16arg1) : { new <T extends Derived>(x: T): number[]; new <U extends Base>(x: U): number[]; }
->foo16 : { (a: { new <T extends Derived>(x: T): number[]; new <U extends Base>(x: U): number[]; }): { new <T extends Derived>(x: T): number[]; new <U extends Base>(x: U): number[]; }; (a: any): any; }
+>foo16 : typeof foo16
 >r16arg1 : new <T extends Base>(x: T) => number[]
 
 var r17arg1: new <T>(x: (a: T) => T) => T[];
@@ -866,7 +866,7 @@ var r17arg1: new <T>(x: (a: T) => T) => T[];
 var r17 = foo17(r17arg1); // any
 >r17 : any
 >foo17(r17arg1) : any
->foo17 : { (a: { new (x: (a: number) => number): number[]; new (x: (a: string) => string): string[]; }): { new (x: (a: number) => number): number[]; new (x: (a: string) => string): string[]; }; (a: any): any; }
+>foo17 : typeof foo17
 >r17arg1 : new <T>(x: (a: T) => T) => T[]
 
 var r18arg1: new <T>(x: (a: T) => T) => T[];
@@ -881,6 +881,6 @@ var r18arg1: new <T>(x: (a: T) => T) => T[];
 var r18 = foo18(r18arg1); 
 >r18 : any
 >foo18(r18arg1) : any
->foo18 : { (a: { new (x: { new (a: number): number; new (a: string): string; }): any[]; new (x: { new (a: boolean): boolean; new (a: Date): Date; }): any[]; }): { new (x: { new (a: number): number; new (a: string): string; }): any[]; new (x: { new (a: boolean): boolean; new (a: Date): Date; }): any[]; }; (a: any): any; }
+>foo18 : typeof foo18
 >r18arg1 : new <T>(x: (a: T) => T) => T[]
 
diff --git a/tests/baselines/reference/subtypingWithConstructSignatures3.types b/tests/baselines/reference/subtypingWithConstructSignatures3.types
index cf4db8939fd..5d33a2149d6 100644
--- a/tests/baselines/reference/subtypingWithConstructSignatures3.types
+++ b/tests/baselines/reference/subtypingWithConstructSignatures3.types
@@ -25,17 +25,17 @@ module Errors {
 >bing : string
 
     declare function foo2(a2: new (x: number) => string[]): typeof a2;
->foo2 : { (a2: new (x: number) => string[]): new (x: number) => string[]; (a2: any): any; }
+>foo2 : typeof foo2
 >a2 : new (x: number) => string[]
 >x : number
 >a2 : new (x: number) => string[]
 
     declare function foo2(a2: any): any;
->foo2 : { (a2: new (x: number) => string[]): new (x: number) => string[]; (a2: any): any; }
+>foo2 : typeof foo2
 >a2 : any
 
     declare function foo7(a2: new (x: new (arg: Base) => Derived) => new (r: Base) => Derived2): typeof a2;
->foo7 : { (a2: new (x: new (arg: Base) => Derived) => new (r: Base) => Derived2): new (x: new (arg: Base) => Derived) => new (r: Base) => Derived2; (a2: any): any; }
+>foo7 : typeof foo7
 >a2 : new (x: new (arg: Base) => Derived) => new (r: Base) => Derived2
 >x : new (arg: Base) => Derived
 >arg : Base
@@ -47,11 +47,11 @@ module Errors {
 >a2 : new (x: new (arg: Base) => Derived) => new (r: Base) => Derived2
 
     declare function foo7(a2: any): any;
->foo7 : { (a2: new (x: new (arg: Base) => Derived) => new (r: Base) => Derived2): new (x: new (arg: Base) => Derived) => new (r: Base) => Derived2; (a2: any): any; }
+>foo7 : typeof foo7
 >a2 : any
 
     declare function foo8(a2: new (x: new (arg: Base) => Derived, y: new (arg2: Base) => Derived) => new (r: Base) => Derived): typeof a2;
->foo8 : { (a2: new (x: new (arg: Base) => Derived, y: new (arg2: Base) => Derived) => new (r: Base) => Derived): new (x: new (arg: Base) => Derived, y: new (arg2: Base) => Derived) => new (r: Base) => Derived; (a2: any): any; }
+>foo8 : typeof foo8
 >a2 : new (x: new (arg: Base) => Derived, y: new (arg2: Base) => Derived) => new (r: Base) => Derived
 >x : new (arg: Base) => Derived
 >arg : Base
@@ -67,11 +67,11 @@ module Errors {
 >a2 : new (x: new (arg: Base) => Derived, y: new (arg2: Base) => Derived) => new (r: Base) => Derived
 
     declare function foo8(a2: any): any;
->foo8 : { (a2: new (x: new (arg: Base) => Derived, y: new (arg2: Base) => Derived) => new (r: Base) => Derived): new (x: new (arg: Base) => Derived, y: new (arg2: Base) => Derived) => new (r: Base) => Derived; (a2: any): any; }
+>foo8 : typeof foo8
 >a2 : any
 
     declare function foo10(a2: new (...x: Base[]) => Base): typeof a2;
->foo10 : { (a2: new (...x: Base[]) => Base): new (...x: Base[]) => Base; (a2: any): any; }
+>foo10 : typeof foo10
 >a2 : new (...x: Base[]) => Base
 >x : Base[]
 >Base : Base
@@ -79,11 +79,11 @@ module Errors {
 >a2 : new (...x: Base[]) => Base
 
     declare function foo10(a2: any): any;
->foo10 : { (a2: new (...x: Base[]) => Base): new (...x: Base[]) => Base; (a2: any): any; }
+>foo10 : typeof foo10
 >a2 : any
 
     declare function foo11(a2: new (x: { foo: string }, y: { foo: string; bar: string }) => Base): typeof a2;
->foo11 : { (a2: new (x: { foo: string; }, y: { foo: string; bar: string; }) => Base): new (x: { foo: string; }, y: { foo: string; bar: string; }) => Base; (a2: any): any; }
+>foo11 : typeof foo11
 >a2 : new (x: { foo: string; }, y: { foo: string; bar: string; }) => Base
 >x : { foo: string; }
 >foo : string
@@ -94,11 +94,11 @@ module Errors {
 >a2 : new (x: { foo: string; }, y: { foo: string; bar: string; }) => Base
 
     declare function foo11(a2: any): any;
->foo11 : { (a2: new (x: { foo: string; }, y: { foo: string; bar: string; }) => Base): new (x: { foo: string; }, y: { foo: string; bar: string; }) => Base; (a2: any): any; }
+>foo11 : typeof foo11
 >a2 : any
 
     declare function foo12(a2: new (x: Array<Base>, y: Array<Derived2>) => Array<Derived>): typeof a2;
->foo12 : { (a2: new (x: Base[], y: Derived2[]) => Derived[]): new (x: Base[], y: Derived2[]) => Derived[]; (a2: any): any; }
+>foo12 : typeof foo12
 >a2 : new (x: Base[], y: Derived2[]) => Derived[]
 >x : Base[]
 >Array : T[]
@@ -111,11 +111,11 @@ module Errors {
 >a2 : new (x: Base[], y: Derived2[]) => Derived[]
 
     declare function foo12(a2: any): any;
->foo12 : { (a2: new (x: Base[], y: Derived2[]) => Derived[]): new (x: Base[], y: Derived2[]) => Derived[]; (a2: any): any; }
+>foo12 : typeof foo12
 >a2 : any
 
     declare function foo15(a2: new (x: { a: string; b: number }) => number): typeof a2;
->foo15 : { (a2: new (x: { a: string; b: number; }) => number): new (x: { a: string; b: number; }) => number; (a2: any): any; }
+>foo15 : typeof foo15
 >a2 : new (x: { a: string; b: number; }) => number
 >x : { a: string; b: number; }
 >a : string
@@ -123,11 +123,11 @@ module Errors {
 >a2 : new (x: { a: string; b: number; }) => number
 
     declare function foo15(a2: any): any;
->foo15 : { (a2: new (x: { a: string; b: number; }) => number): new (x: { a: string; b: number; }) => number; (a2: any): any; }
+>foo15 : typeof foo15
 >a2 : any
 
     declare function foo16(a2: {
->foo16 : { (a2: { new (x: { new (a: number): number; new (a?: number): number; }): number[]; new (x: { new (a: boolean): boolean; new (a?: boolean): boolean; }): boolean[]; }): { new (x: { new (a: number): number; new (a?: number): number; }): number[]; new (x: { new (a: boolean): boolean; new (a?: boolean): boolean; }): boolean[]; }; (a2: any): any; }
+>foo16 : typeof foo16
 >a2 : { new (x: { new (a: number): number; new (a?: number): number; }): number[]; new (x: { new (a: boolean): boolean; new (a?: boolean): boolean; }): boolean[]; }
 
         // type of parameter is overload set which means we can't do inference based on this type
@@ -155,11 +155,11 @@ module Errors {
 >a2 : { new (x: { new (a: number): number; new (a?: number): number; }): number[]; new (x: { new (a: boolean): boolean; new (a?: boolean): boolean; }): boolean[]; }
 
     declare function foo16(a2: any): any;
->foo16 : { (a2: { new (x: { new (a: number): number; new (a?: number): number; }): number[]; new (x: { new (a: boolean): boolean; new (a?: boolean): boolean; }): boolean[]; }): { new (x: { new (a: number): number; new (a?: number): number; }): number[]; new (x: { new (a: boolean): boolean; new (a?: boolean): boolean; }): boolean[]; }; (a2: any): any; }
+>foo16 : typeof foo16
 >a2 : any
 
     declare function foo17(a2: {
->foo17 : { (a2: { 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[]; }): { 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[]; }; (a2: any): any; }
+>foo17 : typeof foo17
 >a2 : { 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[]; }
 
         new (x: {
@@ -202,7 +202,7 @@ module Errors {
 >a2 : { 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[]; }
 
     declare function foo17(a2: any): any;
->foo17 : { (a2: { 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[]; }): { 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[]; }; (a2: any): any; }
+>foo17 : typeof foo17
 >a2 : any
 
     var r1arg1: new <T, U>(x: T) => U[];
@@ -220,7 +220,7 @@ module Errors {
     var r1 = foo2(r1arg1); // any
 >r1 : any
 >foo2(r1arg1) : any
->foo2 : { (a2: new (x: number) => string[]): new (x: number) => string[]; (a2: any): any; }
+>foo2 : typeof foo2
 >r1arg1 : new <T, U>(x: T) => U[]
 
     var r1a = [r1arg2, r1arg1];
@@ -264,7 +264,7 @@ module Errors {
     var r2 = foo7(r2arg1); // any
 >r2 : any
 >foo7(r2arg1) : any
->foo7 : { (a2: new (x: new (arg: Base) => Derived) => new (r: Base) => Derived2): new (x: new (arg: Base) => Derived) => new (r: Base) => Derived2; (a2: any): any; }
+>foo7 : typeof foo7
 >r2arg1 : new <T extends Base, U extends Derived, V extends Derived2>(x: new (arg: T) => U) => new (r: T) => V
 
     var r2a = [r2arg2, r2arg1];
@@ -314,7 +314,7 @@ module Errors {
     var r3 = foo8(r3arg1); // any
 >r3 : any
 >foo8(r3arg1) : any
->foo8 : { (a2: new (x: new (arg: Base) => Derived, y: new (arg2: Base) => Derived) => new (r: Base) => Derived): new (x: new (arg: Base) => Derived, y: new (arg2: Base) => Derived) => new (r: Base) => Derived; (a2: any): any; }
+>foo8 : typeof foo8
 >r3arg1 : new <T extends Base, U extends Derived>(x: new (arg: T) => U, y: (arg2: { foo: number; }) => U) => new (r: T) => U
 
     var r3a = [r3arg2, r3arg1];
@@ -346,7 +346,7 @@ module Errors {
     var r4 = foo10(r4arg1); // any
 >r4 : any
 >foo10(r4arg1) : any
->foo10 : { (a2: new (...x: Base[]) => Base): new (...x: Base[]) => Base; (a2: any): any; }
+>foo10 : typeof foo10
 >r4arg1 : new <T extends Derived>(...x: T[]) => T
 
     var r4a = [r4arg2, r4arg1];
@@ -383,7 +383,7 @@ module Errors {
     var r5 = foo11(r5arg1); // any
 >r5 : any
 >foo11(r5arg1) : any
->foo11 : { (a2: new (x: { foo: string; }, y: { foo: string; bar: string; }) => Base): new (x: { foo: string; }, y: { foo: string; bar: string; }) => Base; (a2: any): any; }
+>foo11 : typeof foo11
 >r5arg1 : new <T extends Derived>(x: T, y: T) => T
 
     var r5a = [r5arg2, r5arg1];
@@ -425,7 +425,7 @@ module Errors {
     var r6 = foo12(r6arg1); // new (x: Array<Base>, y: Array<Derived2>) => Array<Derived>
 >r6 : new (x: Base[], y: Derived2[]) => Derived[]
 >foo12(r6arg1) : new (x: Base[], y: Derived2[]) => Derived[]
->foo12 : { (a2: new (x: Base[], y: Derived2[]) => Derived[]): new (x: Base[], y: Derived2[]) => Derived[]; (a2: any): any; }
+>foo12 : typeof foo12
 >r6arg1 : new (x: Base[], y: Derived2[]) => Derived[]
 
     var r6a = [r6arg2, r6arg1];
@@ -459,7 +459,7 @@ module Errors {
     var r7 = foo15(r7arg1); // (x: { a: string; b: number }) => number): number;
 >r7 : any
 >foo15(r7arg1) : any
->foo15 : { (a2: new (x: { a: string; b: number; }) => number): new (x: { a: string; b: number; }) => number; (a2: any): any; }
+>foo15 : typeof foo15
 >r7arg1 : new <T>(x: { a: T; b: T; }) => T
 
     var r7a = [r7arg2, r7arg1];
@@ -487,7 +487,7 @@ module Errors {
     var r7c = foo15(r7arg3); // any
 >r7c : new (x: { a: string; b: number; }) => number
 >foo15(r7arg3) : new (x: { a: string; b: number; }) => number
->foo15 : { (a2: new (x: { a: string; b: number; }) => number): new (x: { a: string; b: number; }) => number; (a2: any): any; }
+>foo15 : typeof foo15
 >r7arg3 : new <T extends Base>(x: { a: T; b: T; }) => number
 
     var r7d = [r7arg2, r7arg3];
@@ -514,7 +514,7 @@ module Errors {
     var r8 = foo16(r8arg); // any
 >r8 : any
 >foo16(r8arg) : any
->foo16 : { (a2: { new (x: { new (a: number): number; new (a?: number): number; }): number[]; new (x: { new (a: boolean): boolean; new (a?: boolean): boolean; }): boolean[]; }): { new (x: { new (a: number): number; new (a?: number): number; }): number[]; new (x: { new (a: boolean): boolean; new (a?: boolean): boolean; }): boolean[]; }; (a2: any): any; }
+>foo16 : typeof foo16
 >r8arg : new <T>(x: new (a: T) => T) => T[]
 
     var r9arg: new <T>(x: new (a: T) => T) => any[];
@@ -528,7 +528,7 @@ module Errors {
     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[]; }
 >foo17(r9arg) : { 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[]; }
->foo17 : { (a2: { 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[]; }): { 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[]; }; (a2: any): any; }
+>foo17 : typeof foo17
 >r9arg : new <T>(x: new (a: T) => T) => any[]
 }
 
@@ -536,7 +536,7 @@ module WithGenericSignaturesInBaseType {
 >WithGenericSignaturesInBaseType : typeof 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; }
+>foo2 : typeof foo2
 >a2 : new <T>(x: T) => T[]
 >T : T
 >x : T
@@ -545,7 +545,7 @@ module WithGenericSignaturesInBaseType {
 >a2 : new <T>(x: T) => T[]
 
     declare function foo2(a2: any): any;
->foo2 : { (a2: new <T>(x: T) => T[]): new <T>(x: T) => T[]; (a2: any): any; }
+>foo2 : typeof foo2
 >a2 : any
 
     var r2arg2: new <T>(x: T) => string[];
@@ -557,11 +557,11 @@ module WithGenericSignaturesInBaseType {
     var r2 = foo2(r2arg2); // <T>(x:T) => T[] since we can infer from generic signatures now
 >r2 : new <T>(x: T) => T[]
 >foo2(r2arg2) : new <T>(x: T) => T[]
->foo2 : { (a2: new <T>(x: T) => T[]): new <T>(x: T) => T[]; (a2: any): any; }
+>foo2 : typeof foo2
 >r2arg2 : new <T>(x: T) => string[]
 
     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; }
+>foo3 : typeof foo3
 >a2 : new <T>(x: T) => string[]
 >T : T
 >x : T
@@ -569,7 +569,7 @@ module WithGenericSignaturesInBaseType {
 >a2 : new <T>(x: T) => string[]
 
     declare function foo3(a2: any): any;
->foo3 : { (a2: new <T>(x: T) => string[]): new <T>(x: T) => string[]; (a2: any): any; }
+>foo3 : typeof foo3
 >a2 : any
 
     var r3arg2: new <T>(x: T) => T[];
@@ -582,6 +582,6 @@ module WithGenericSignaturesInBaseType {
     var r3 = foo3(r3arg2); // any
 >r3 : any
 >foo3(r3arg2) : any
->foo3 : { (a2: new <T>(x: T) => string[]): new <T>(x: T) => string[]; (a2: any): any; }
+>foo3 : typeof foo3
 >r3arg2 : new <T>(x: T) => T[]
 }
diff --git a/tests/baselines/reference/subtypingWithConstructSignatures4.types b/tests/baselines/reference/subtypingWithConstructSignatures4.types
index a9116880df3..d168c57a7eb 100644
--- a/tests/baselines/reference/subtypingWithConstructSignatures4.types
+++ b/tests/baselines/reference/subtypingWithConstructSignatures4.types
@@ -21,7 +21,7 @@ class OtherDerived extends Base { bing: string; }
 >bing : string
 
 declare function foo1(a: new <T>(x: T) => T[]);
->foo1 : { (a: new <T>(x: T) => T[]): any; (a: any): any; }
+>foo1 : typeof foo1
 >a : new <T>(x: T) => T[]
 >T : T
 >x : T
@@ -29,33 +29,33 @@ declare function foo1(a: new <T>(x: T) => T[]);
 >T : T
 
 declare function foo1(a: any): any;
->foo1 : { (a: new <T>(x: T) => T[]): any; (a: any): any; }
+>foo1 : typeof foo1
 >a : any
 
 declare function foo2(a2: new <T>(x: T) => string[]);
->foo2 : { (a2: new <T>(x: T) => string[]): any; (a: any): any; }
+>foo2 : typeof foo2
 >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; }
+>foo2 : typeof foo2
 >a : any
 
 declare function foo3(a3: new <T>(x: T) => void);
->foo3 : { (a3: new <T>(x: T) => void): any; (a: any): any; }
+>foo3 : typeof foo3
 >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; }
+>foo3 : typeof foo3
 >a : 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; }
+>foo4 : typeof foo4
 >a4 : new <T, U>(x: T, y: U) => string
 >T : T
 >U : U
@@ -65,11 +65,11 @@ declare function foo4(a4: new <T, U>(x: T, y: U) => string);
 >U : U
 
 declare function foo4(a: any): any;
->foo4 : { (a4: new <T, U>(x: T, y: U) => string): any; (a: any): any; }
+>foo4 : typeof foo4
 >a : 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; }
+>foo5 : typeof foo5
 >a5 : new <T, U>(x: new (arg: T) => U) => T
 >T : T
 >U : U
@@ -80,11 +80,11 @@ declare function foo5(a5: new <T, U>(x: new (arg: T) => U) => T);
 >T : T
 
 declare function foo5(a: any): any;
->foo5 : { (a5: new <T, U>(x: new (arg: T) => U) => T): any; (a: any): any; }
+>foo5 : typeof foo5
 >a : 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; }
+>foo6 : typeof foo6
 >a6 : new <T extends Base>(x: new (arg: T) => Derived) => T
 >T : T
 >Base : Base
@@ -95,11 +95,11 @@ declare function foo6(a6: new <T extends Base>(x: new (arg: T) => Derived) => T)
 >T : T
 
 declare function foo6(a: any): any;
->foo6 : { (a6: new <T extends Base>(x: new (arg: T) => Derived) => T): any; (a: any): any; }
+>foo6 : typeof foo6
 >a : 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; }
+>foo11 : typeof foo11
 >a11 : new <T>(x: { foo: T; }, y: { foo: T; bar: T; }) => Base
 >T : T
 >x : { foo: T; }
@@ -113,11 +113,11 @@ declare function foo11(a11: new <T>(x: { foo: T }, y: { foo: T; bar: T }) => Bas
 >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; }
+>foo11 : typeof foo11
 >a : 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; }
+>foo15 : typeof foo15
 >a15 : new <T>(x: { a: T; b: T; }) => T[]
 >T : T
 >x : { a: T; b: T; }
@@ -128,11 +128,11 @@ declare function foo15(a15: new <T>(x: { a: T; b: T }) => T[]);
 >T : T
 
 declare function foo15(a: any): any;
->foo15 : { (a15: new <T>(x: { a: T; b: T; }) => T[]): any; (a: any): any; }
+>foo15 : typeof foo15
 >a : 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; }
+>foo16 : typeof foo16
 >a16 : new <T extends Base>(x: { a: T; b: T; }) => T[]
 >T : T
 >Base : Base
@@ -144,11 +144,11 @@ declare function foo16(a16: new <T extends Base>(x: { a: T; b: 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; }
+>foo16 : typeof foo16
 >a : any
 
 declare function foo17(a17: {
->foo17 : { (a17: { new <T extends Derived>(x: new (a: T) => T): T[]; new <T extends Base>(x: new (a: T) => T): T[]; }): any; (a: any): any; }
+>foo17 : typeof foo17
 >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[];
@@ -171,11 +171,11 @@ declare function foo17(a17: {
 
 });
 declare function foo17(a: any): any;
->foo17 : { (a17: { new <T extends Derived>(x: new (a: T) => T): T[]; new <T extends Base>(x: new (a: T) => T): T[]; }): any; (a: any): any; }
+>foo17 : typeof foo17
 >a : any
 
 declare function foo18(a18: {
->foo18 : { (a18: { 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[]; }): any; (a: any): any; }
+>foo18 : typeof foo18
 >a18 : { 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[]; }
 
     new (x: {
@@ -216,7 +216,7 @@ declare function foo18(a18: {
     }): any[];
 });
 declare function foo18(a: any): any;
->foo18 : { (a18: { 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[]; }): any; (a: any): any; }
+>foo18 : typeof foo18
 >a : any
 
 var r1arg: new <T>(x: T) => T[];
@@ -236,7 +236,7 @@ var r1arg2: new <T>(x: T) => T[];
 var r1 = foo1(r1arg);
 >r1 : any
 >foo1(r1arg) : any
->foo1 : { (a: new <T>(x: T) => T[]): any; (a: any): any; }
+>foo1 : typeof foo1
 >r1arg : new <T>(x: T) => T[]
 
 var r1a = [r1arg, r1arg2];
@@ -266,7 +266,7 @@ var r2arg2: new <T>(x: T) => string[];
 var r2 = foo2(r2arg);
 >r2 : any
 >foo2(r2arg) : any
->foo2 : { (a2: new <T>(x: T) => string[]): any; (a: any): any; }
+>foo2 : typeof foo2
 >r2arg : new <T>(x: T) => string[]
 
 var r2a = [r2arg, r2arg2];
@@ -297,7 +297,7 @@ var r3arg2: new <T>(x: T) => void;
 var r3 = foo3(r3arg);
 >r3 : any
 >foo3(r3arg) : any
->foo3 : { (a3: new <T>(x: T) => void): any; (a: any): any; }
+>foo3 : typeof foo3
 >r3arg : new <T>(x: T) => T
 
 var r3a = [r3arg, r3arg2];
@@ -333,7 +333,7 @@ var r4arg2: new <T, U>(x: T, y: U) => string;
 var r4 = foo4(r4arg);
 >r4 : any
 >foo4(r4arg) : any
->foo4 : { (a4: new <T, U>(x: T, y: U) => string): any; (a: any): any; }
+>foo4 : typeof foo4
 >r4arg : new <T, U>(x: T, y: U) => string
 
 var r4a = [r4arg, r4arg2];
@@ -371,7 +371,7 @@ var r5arg2: new <T, U>(x: new (arg: T) => U) => T;
 var r5 = foo5(r5arg);
 >r5 : any
 >foo5(r5arg) : any
->foo5 : { (a5: new <T, U>(x: new (arg: T) => U) => T): any; (a: any): any; }
+>foo5 : typeof foo5
 >r5arg : new <T, U>(x: new (arg: T) => U) => T
 
 var r5a = [r5arg, r5arg2];
@@ -411,7 +411,7 @@ var r6arg2: new <T extends Base>(x: new (arg: T) => Derived) => T;
 var r6 = foo6(r6arg);
 >r6 : any
 >foo6(r6arg) : any
->foo6 : { (a6: new <T extends Base>(x: new (arg: T) => Derived) => T): any; (a: any): any; }
+>foo6 : typeof foo6
 >r6arg : new <T extends Base, U extends Derived>(x: new (arg: T) => U) => T
 
 var r6a = [r6arg, r6arg2];
@@ -456,7 +456,7 @@ var r11arg2: new <T>(x: { foo: T }, y: { foo: T; bar: T }) => Base;
 var r11 = foo11(r11arg);
 >r11 : any
 >foo11(r11arg) : any
->foo11 : { (a11: new <T>(x: { foo: T; }, y: { foo: T; bar: T; }) => Base): any; (a: any): any; }
+>foo11 : typeof foo11
 >r11arg : new <T, U>(x: { foo: T; }, y: { foo: U; bar: U; }) => Base
 
 var r11a = [r11arg, r11arg2];
@@ -495,7 +495,7 @@ var r15arg2: new <T>(x: { a: T; b: T }) => T[];
 var r15 = foo15(r15arg);
 >r15 : any
 >foo15(r15arg) : any
->foo15 : { (a15: new <T>(x: { a: T; b: T; }) => T[]): any; (a: any): any; }
+>foo15 : typeof foo15
 >r15arg : new <U, V>(x: { a: U; b: V; }) => U[]
 
 var r15a = [r15arg, r15arg2];
@@ -535,7 +535,7 @@ var r16arg2: new <T extends Base>(x: { a: T; b: T }) => T[];
 var r16 = foo16(r16arg);
 >r16 : any
 >foo16(r16arg) : any
->foo16 : { (a16: new <T extends Base>(x: { a: T; b: T; }) => T[]): any; (a: any): any; }
+>foo16 : typeof foo16
 >r16arg : new <T extends Base>(x: { a: T; b: T; }) => T[]
 
 var r16a = [r16arg, r16arg2];
@@ -562,7 +562,7 @@ var r17arg: new <T>(x: new (a: T) => T) => T[];
 var r17 = foo17(r17arg);
 >r17 : any
 >foo17(r17arg) : any
->foo17 : { (a17: { new <T extends Derived>(x: new (a: T) => T): T[]; new <T extends Base>(x: new (a: T) => T): T[]; }): any; (a: any): any; }
+>foo17 : typeof foo17
 >r17arg : new <T>(x: new (a: T) => T) => T[]
 
 var r18arg: new (x: new <T>(a: T) => T) => any[];
@@ -576,6 +576,6 @@ var r18arg: new (x: new <T>(a: T) => T) => any[];
 var r18 = foo18(r18arg);
 >r18 : any
 >foo18(r18arg) : any
->foo18 : { (a18: { 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[]; }): any; (a: any): any; }
+>foo18 : typeof foo18
 >r18arg : new (x: new <T>(a: T) => T) => any[]
 
diff --git a/tests/baselines/reference/subtypingWithOptionalProperties.types b/tests/baselines/reference/subtypingWithOptionalProperties.types
index 67eeb274c6b..d16903202d7 100644
--- a/tests/baselines/reference/subtypingWithOptionalProperties.types
+++ b/tests/baselines/reference/subtypingWithOptionalProperties.types
@@ -3,7 +3,7 @@
 
 // returns { s?: number; }
 function f<T>(a: T) {
->f : <T>(a: T) => { s?: number; }
+>f : typeof f
 >T : T
 >a : T
 >T : T
@@ -20,7 +20,7 @@ function f<T>(a: T) {
 var r = f({ s: new Object() }); // ok
 >r : { s?: number; }
 >f({ s: new Object() }) : { s?: number; }
->f : <T>(a: T) => { s?: number; }
+>f : typeof f
 >{ s: new Object() } : { s: Object; }
 >s : Object
 >new Object() : Object
diff --git a/tests/baselines/reference/superAccessInFatArrow1.types b/tests/baselines/reference/superAccessInFatArrow1.types
index f7d0d623cd0..d14f4cc549c 100644
--- a/tests/baselines/reference/superAccessInFatArrow1.types
+++ b/tests/baselines/reference/superAccessInFatArrow1.types
@@ -21,15 +21,11 @@ module test {
 >runme : () => void
 
             this.bar(() => {
->this.bar(() => {
-                super.foo();
-            }) : void
+>this.bar(() => {                super.foo();            }) : void
 >this.bar : (callback: () => void) => void
 >this : B
 >bar : (callback: () => void) => void
->() => {
-                super.foo();
-            } : () => void
+>() => {                super.foo();            } : () => void
 
                 super.foo();
 >super.foo() : void
diff --git a/tests/baselines/reference/superCallFromClassThatDerivesFromGenericType1.types b/tests/baselines/reference/superCallFromClassThatDerivesFromGenericType1.types
index e125522bbb7..6b2b340bfbb 100644
--- a/tests/baselines/reference/superCallFromClassThatDerivesFromGenericType1.types
+++ b/tests/baselines/reference/superCallFromClassThatDerivesFromGenericType1.types
@@ -10,7 +10,7 @@ declare class B<T> {
 >U : U
 
     static g(): B<any>;
->g : () => B<any>
+>g : typeof g
 >B : B<T>
 }
 
diff --git a/tests/baselines/reference/superCalls.types b/tests/baselines/reference/superCalls.types
index 07a4688ba3a..bc22cc734d2 100644
--- a/tests/baselines/reference/superCalls.types
+++ b/tests/baselines/reference/superCalls.types
@@ -12,7 +12,7 @@ class Base {
 }
 
 function v(): void { }
->v : () => void
+>v : typeof v
 
 class Derived extends Base {
 >Derived : Derived
@@ -33,7 +33,7 @@ class Derived extends Base {
         var p = v();
 >p : void
 >v() : void
->v : () => void
+>v : typeof v
     }
 }
 
diff --git a/tests/baselines/reference/superWithGenerics.types b/tests/baselines/reference/superWithGenerics.types
index 89086033284..9f765db7b48 100644
--- a/tests/baselines/reference/superWithGenerics.types
+++ b/tests/baselines/reference/superWithGenerics.types
@@ -10,7 +10,7 @@ declare class B<T> {
 >U : U
 
     static g(): B<any>;
->g : () => B<any>
+>g : typeof g
 >B : B<T>
 }
 
diff --git a/tests/baselines/reference/switchFallThroughs.types b/tests/baselines/reference/switchFallThroughs.types
index dfca84cfa4c..0d3f7ccb871 100644
--- a/tests/baselines/reference/switchFallThroughs.types
+++ b/tests/baselines/reference/switchFallThroughs.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/switchFallThroughs.ts ===
 function R1(index: number) {
->R1 : (index: number) => string
+>R1 : typeof R1
 >index : number
 
     switch (index) {
diff --git a/tests/baselines/reference/switchStatements.types b/tests/baselines/reference/switchStatements.types
index 6839de6b93a..7f082ba5f27 100644
--- a/tests/baselines/reference/switchStatements.types
+++ b/tests/baselines/reference/switchStatements.types
@@ -3,7 +3,7 @@ module M {
 >M : typeof M
 
     export function fn(x: number) {
->fn : (x: number) => string
+>fn : typeof fn
 >x : number
 
         return '';
@@ -32,8 +32,6 @@ switch (x) {
 >Object : { (): any; (value: any): any; new (value?: any): Object; prototype: Object; getPrototypeOf(o: any): any; getOwnPropertyDescriptor(o: any, p: string): PropertyDescriptor; getOwnPropertyNames(o: any): string[]; create(o: any, properties?: PropertyDescriptorMap): any; defineProperty(o: any, p: string, attributes: PropertyDescriptor): any; defineProperties(o: any, properties: PropertyDescriptorMap): any; seal(o: any): any; freeze(o: any): any; preventExtensions(o: any): any; isSealed(o: any): boolean; isFrozen(o: any): boolean; isExtensible(o: any): boolean; keys(o: any): string[]; }
 
     case /[a-z]/:
->/[a-z]/ : RegExp
-
     case[]:
 >[] : undefined[]
 
@@ -57,9 +55,9 @@ switch (x) {
 
     case M.fn(1):
 >M.fn(1) : string
->M.fn : (x: number) => string
+>M.fn : typeof fn
 >M : typeof M
->fn : (x: number) => string
+>fn : typeof fn
 
     case <T>(x: number) => '':
 ><T>(x: number) => '' : <T>(x: number) => string
@@ -120,8 +118,6 @@ switch (new Object()) { }
 >Object : { (): any; (value: any): any; new (value?: any): Object; prototype: Object; getPrototypeOf(o: any): any; getOwnPropertyDescriptor(o: any, p: string): PropertyDescriptor; getOwnPropertyNames(o: any): string[]; create(o: any, properties?: PropertyDescriptorMap): any; defineProperty(o: any, p: string, attributes: PropertyDescriptor): any; defineProperties(o: any, properties: PropertyDescriptorMap): any; seal(o: any): any; freeze(o: any): any; preventExtensions(o: any): any; isSealed(o: any): boolean; isFrozen(o: any): boolean; isExtensible(o: any): boolean; keys(o: any): string[]; }
 
 switch (/[a-z]/) { }
->/[a-z]/ : RegExp
-
 switch ([]) { }
 >[] : undefined[]
 
diff --git a/tests/baselines/reference/switchStatementsWithMultipleDefaults.errors.txt b/tests/baselines/reference/switchStatementsWithMultipleDefaults.errors.txt
deleted file mode 100644
index e84c4cdcc0e..00000000000
--- a/tests/baselines/reference/switchStatementsWithMultipleDefaults.errors.txt
+++ /dev/null
@@ -1,50 +0,0 @@
-==== tests/cases/compiler/switchStatementsWithMultipleDefaults.ts (9 errors) ====
-    
-    var x = 10;
-    
-    switch (x) {
-        case 1:
-        case 2:
-        default:    // No issues.
-            break;
-        default:    // Error; second 'default' clause.
-        ~~~~~~~~
-!!! A 'default' clause cannot appear more than once in a 'switch' statement.
-        default:    // Error; third 'default' clause.
-        ~~~~~~~~
-!!! A 'default' clause cannot appear more than once in a 'switch' statement.
-        case 3:
-            x *= x;
-    }
-    
-    switch (x) {
-        default:    // No issues.
-            break;
-        case 100:
-            switch (x * x) {
-                default:    // No issues.
-                default:    // Error; second 'default' clause.
-                ~~~~~~~~
-!!! A 'default' clause cannot appear more than once in a 'switch' statement.
-                    break;
-                case 10000:
-                    x /= x;
-                default:    // Error, third 'default' clause
-                ~~~~~~~~
-!!! A 'default' clause cannot appear more than once in a 'switch' statement.
-                def\u0061ult: // Error, fourth 'default' clause.
-                ~~~~~~~~~~~~~
-!!! A 'default' clause cannot appear more than once in a 'switch' statement.
-                // Errors on fifth-seventh
-                default: return;
-                ~~~~~~~~
-!!! A 'default' clause cannot appear more than once in a 'switch' statement.
-                         ~~~~~~
-!!! A 'return' statement can only be used within a function body.
-                default: default:
-                ~~~~~~~~
-!!! A 'default' clause cannot appear more than once in a 'switch' statement.
-                         ~~~~~~~~
-!!! A 'default' clause cannot appear more than once in a 'switch' statement.
-            }
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/targetTypeArgs.types b/tests/baselines/reference/targetTypeArgs.types
index 80c99ff9ff3..ec14cdf4e0f 100644
--- a/tests/baselines/reference/targetTypeArgs.types
+++ b/tests/baselines/reference/targetTypeArgs.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/targetTypeArgs.ts ===
 function foo(callback: (x: string) => void) {
->foo : (callback: (x: string) => void) => void
+>foo : typeof foo
 >callback : (x: string) => void
 >x : string
 
@@ -11,7 +11,7 @@ function foo(callback: (x: string) => void) {
 
 foo(function(x) { x });
 >foo(function(x) { x }) : void
->foo : (callback: (x: string) => void) => void
+>foo : typeof foo
 >function(x) { x } : (x: string) => void
 >x : string
 >x : string
diff --git a/tests/baselines/reference/targetTypeObjectLiteral.types b/tests/baselines/reference/targetTypeObjectLiteral.types
index 2d9e6e182a5..f63a505162b 100644
--- a/tests/baselines/reference/targetTypeObjectLiteral.types
+++ b/tests/baselines/reference/targetTypeObjectLiteral.types
@@ -4,28 +4,14 @@ var z: { x: number; y: (w:string)=>number;} = {
 >x : number
 >y : (w: string) => number
 >w : string
->{
-
-    x: 12,
-
-    y: function(w) {
-
-        return 0;
-
-    }
-
-} : { x: number; y: (w: string) => number; }
+>{    x: 12,    y: function(w) {        return 0;    }} : { x: number; y: (w: string) => number; }
 
     x: 12,
 >x : number
 
     y: function(w) {
 >y : (w: string) => number
->function(w) {
-
-        return 0;
-
-    } : (w: string) => number
+>function(w) {        return 0;    } : (w: string) => number
 >w : string
 
         return 0;
diff --git a/tests/baselines/reference/targetTypeObjectLiteralToAny.types b/tests/baselines/reference/targetTypeObjectLiteralToAny.types
index 280f3cfc492..cbb1879ed4c 100644
--- a/tests/baselines/reference/targetTypeObjectLiteralToAny.types
+++ b/tests/baselines/reference/targetTypeObjectLiteralToAny.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/targetTypeObjectLiteralToAny.ts ===
 function suggest(){ 
->suggest : () => void
+>suggest : typeof suggest
 
 	var TypeScriptKeywords:string[];  
 >TypeScriptKeywords : string[]
@@ -9,15 +9,11 @@ function suggest(){
 >result : any
 					
 	TypeScriptKeywords.forEach(function(keyword) {						
->TypeScriptKeywords.forEach(function(keyword) {						
-		result.push({text:keyword, type:"keyword"}); // this should not cause a crash - push should be typed to any
-	}) : void
+>TypeScriptKeywords.forEach(function(keyword) {								result.push({text:keyword, type:"keyword"}); // this should not cause a crash - push should be typed to any	}) : void
 >TypeScriptKeywords.forEach : (callbackfn: (value: string, index: number, array: string[]) => void, thisArg?: any) => void
 >TypeScriptKeywords : string[]
 >forEach : (callbackfn: (value: string, index: number, array: string[]) => void, thisArg?: any) => void
->function(keyword) {						
-		result.push({text:keyword, type:"keyword"}); // this should not cause a crash - push should be typed to any
-	} : (keyword: string) => void
+>function(keyword) {								result.push({text:keyword, type:"keyword"}); // this should not cause a crash - push should be typed to any	} : (keyword: string) => void
 >keyword : string
 
 		result.push({text:keyword, type:"keyword"}); // this should not cause a crash - push should be typed to any
diff --git a/tests/baselines/reference/targetTypeTest2.types b/tests/baselines/reference/targetTypeTest2.types
index 795dd7036f7..dc8b5359250 100644
--- a/tests/baselines/reference/targetTypeTest2.types
+++ b/tests/baselines/reference/targetTypeTest2.types
@@ -8,19 +8,19 @@ var a : any[] = [1,2,"3"];
 
 
 function func1(stuff:any[]) { return stuff; }
->func1 : (stuff: any[]) => any[]
+>func1 : typeof func1
 >stuff : any[]
 >stuff : any[]
 
 function func2(stuff1:string, stuff2:number, stuff3:number) {
->func2 : (stuff1: string, stuff2: number, stuff3: number) => any[]
+>func2 : typeof func2
 >stuff1 : string
 >stuff2 : number
 >stuff3 : number
 
 	return func1([stuff1, stuff2, stuff3]);
 >func1([stuff1, stuff2, stuff3]) : any[]
->func1 : (stuff: any[]) => any[]
+>func1 : typeof func1
 >[stuff1, stuff2, stuff3] : any[]
 >stuff1 : string
 >stuff2 : number
diff --git a/tests/baselines/reference/testContainerList.types b/tests/baselines/reference/testContainerList.types
deleted file mode 100644
index 8449b6dc065..00000000000
--- a/tests/baselines/reference/testContainerList.types
+++ /dev/null
@@ -1,13 +0,0 @@
-=== tests/cases/compiler/testContainerList.ts ===
-// Regression test for #325
-module A {
->A : typeof A
-
-    class C {
->C : C
-
-        constructor(public d: {}) { }
->d : {}
-    }
-}
-
diff --git a/tests/baselines/reference/thisBinding2.types b/tests/baselines/reference/thisBinding2.types
index e4ad6b1d31b..d2027a4ea5b 100644
--- a/tests/baselines/reference/thisBinding2.types
+++ b/tests/baselines/reference/thisBinding2.types
@@ -7,25 +7,13 @@ class C {
 
     constructor() {
         this.x = (() => {
->this.x = (() => {
-   var x = 1;
-   return this.x;
-  })() : number
+>this.x = (() => {   var x = 1;   return this.x;  })() : number
 >this.x : number
 >this : C
 >x : number
->(() => {
-   var x = 1;
-   return this.x;
-  })() : number
->(() => {
-   var x = 1;
-   return this.x;
-  }) : () => number
->() => {
-   var x = 1;
-   return this.x;
-  } : () => number
+>(() => {   var x = 1;   return this.x;  })() : number
+>(() => {   var x = 1;   return this.x;  }) : () => number
+>() => {   var x = 1;   return this.x;  } : () => number
 
    var x = 1;
 >x : number
@@ -37,21 +25,12 @@ class C {
 
   })();
   this.x = function() {
->this.x = function() {
-   var x = 1;
-   return this.x;
-  }() : any
+>this.x = function() {   var x = 1;   return this.x;  }() : any
 >this.x : number
 >this : C
 >x : number
->function() {
-   var x = 1;
-   return this.x;
-  }() : any
->function() {
-   var x = 1;
-   return this.x;
-  } : () => any
+>function() {   var x = 1;   return this.x;  }() : any
+>function() {   var x = 1;   return this.x;  } : () => any
 
    var x = 1;
 >x : number
@@ -65,32 +44,25 @@ class C {
     }  
 }
 declare function setTimeout(expression: any, msec?: number, language?: any): number;
->setTimeout : (expression: any, msec?: number, language?: any) => number
+>setTimeout : typeof setTimeout
 >expression : any
 >msec : number
 >language : any
 
 var messenger = {
 >messenger : { message: string; start: () => number; }
->{
-    message: "Hello World",
-    start: function () {
-        return setTimeout(() => { var x = this.message; }, 3000);
-    }
-} : { message: string; start: () => number; }
+>{    message: "Hello World",    start: function () {        return setTimeout(() => { var x = this.message; }, 3000);    }} : { message: string; start: () => number; }
 
     message: "Hello World",
 >message : string
 
     start: function () {
 >start : () => number
->function () {
-        return setTimeout(() => { var x = this.message; }, 3000);
-    } : () => number
+>function () {        return setTimeout(() => { var x = this.message; }, 3000);    } : () => number
 
         return setTimeout(() => { var x = this.message; }, 3000);
 >setTimeout(() => { var x = this.message; }, 3000) : number
->setTimeout : (expression: any, msec?: number, language?: any) => number
+>setTimeout : typeof setTimeout
 >() => { var x = this.message; } : () => void
 >x : any
 >this.message : any
diff --git a/tests/baselines/reference/thisCapture1.types b/tests/baselines/reference/thisCapture1.types
index e5d6f144bd4..1b867dea6b5 100644
--- a/tests/baselines/reference/thisCapture1.types
+++ b/tests/baselines/reference/thisCapture1.types
@@ -13,21 +13,13 @@ class X {
 >ret : any
 
         return ret.always(() => {
->ret.always(() => {
-            this.y = 0;
-        }).promise() : any
->ret.always(() => {
-            this.y = 0;
-        }).promise : any
->ret.always(() => {
-            this.y = 0;
-        }) : any
+>ret.always(() => {            this.y = 0;        }).promise() : any
+>ret.always(() => {            this.y = 0;        }).promise : any
+>ret.always(() => {            this.y = 0;        }) : any
 >ret.always : any
 >ret : any
 >always : any
->() => {
-            this.y = 0;
-        } : () => void
+>() => {            this.y = 0;        } : () => void
 
             this.y = 0;
 >this.y = 0 : number
diff --git a/tests/baselines/reference/thisExpressionInIndexExpression.types b/tests/baselines/reference/thisExpressionInIndexExpression.types
index b26dbb8bde7..057fb2f9db7 100644
--- a/tests/baselines/reference/thisExpressionInIndexExpression.types
+++ b/tests/baselines/reference/thisExpressionInIndexExpression.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/thisExpressionInIndexExpression.ts ===
 function f() {
->f : () => (r: any) => any
+>f : typeof f
 
     return r => r[this];
 >r => r[this] : (r: any) => any
diff --git a/tests/baselines/reference/thisInGenericStaticMembers.types b/tests/baselines/reference/thisInGenericStaticMembers.types
index ea05ed83473..5852fa37f77 100644
--- a/tests/baselines/reference/thisInGenericStaticMembers.types
+++ b/tests/baselines/reference/thisInGenericStaticMembers.types
@@ -5,7 +5,7 @@ class A {
 >A : A
 
     static one<T>(source:T, value: number): T {
->one : <T>(source: T, value: number) => T
+>one : typeof one
 >T : T
 >source : T
 >T : T
@@ -17,7 +17,7 @@ class A {
     }
 
     static two<T>(source: T): T {
->two : <T>(source: T) => T
+>two : typeof two
 >T : T
 >source : T
 >T : T
@@ -25,9 +25,9 @@ class A {
 
         return this.one<T>(source, 42);
 >this.one<T>(source, 42) : T
->this.one : <T>(source: T, value: number) => T
+>this.one : typeof one
 >this : typeof A
->one : <T>(source: T, value: number) => T
+>one : typeof one
 >T : T
 >source : T
     }
@@ -37,7 +37,7 @@ class B {
 >B : B
 
     static one(source: B, value: number): B {
->one : (source: B, value: number) => B
+>one : typeof one
 >source : B
 >B : B
 >value : number
@@ -48,16 +48,16 @@ class B {
     }
 
     static two(source: B): B {
->two : (source: B) => B
+>two : typeof two
 >source : B
 >B : B
 >B : B
 
         return this.one(source, 42);
 >this.one(source, 42) : B
->this.one : (source: B, value: number) => B
+>this.one : typeof one
 >this : typeof B
->one : (source: B, value: number) => B
+>one : typeof one
 >source : B
     }
 }
diff --git a/tests/baselines/reference/thisInInnerFunctions.types b/tests/baselines/reference/thisInInnerFunctions.types
index ced44c8fb1a..cec73bbdcf0 100644
--- a/tests/baselines/reference/thisInInnerFunctions.types
+++ b/tests/baselines/reference/thisInInnerFunctions.types
@@ -28,14 +28,11 @@ class Foo {
 }
 
 function test() {
->test : () => void
+>test : typeof test
 
     var x = () => {
 >x : () => void
->() => {
-        (() => this)();
-        this;
-    } : () => void
+>() => {        (() => this)();        this;    } : () => void
 
         (() => this)();
 >(() => this)() : any
diff --git a/tests/baselines/reference/thisInLambda.types b/tests/baselines/reference/thisInLambda.types
index eedbc715c7a..950b7ecc3ef 100644
--- a/tests/baselines/reference/thisInLambda.types
+++ b/tests/baselines/reference/thisInLambda.types
@@ -23,7 +23,7 @@ class Foo {
 }
 
 function myFn(a:any) { }
->myFn : (a: any) => void
+>myFn : typeof myFn
 >a : any
 
 class myCls {
@@ -31,26 +31,14 @@ class myCls {
 
     constructor () {
         myFn(() => {
->myFn(() => {
-            myFn(() => {
-                var x = this;
-            });
-        }) : void
->myFn : (a: any) => void
->() => {
-            myFn(() => {
-                var x = this;
-            });
-        } : () => void
+>myFn(() => {            myFn(() => {                var x = this;            });        }) : void
+>myFn : typeof myFn
+>() => {            myFn(() => {                var x = this;            });        } : () => void
 
             myFn(() => {
->myFn(() => {
-                var x = this;
-            }) : void
->myFn : (a: any) => void
->() => {
-                var x = this;
-            } : () => void
+>myFn(() => {                var x = this;            }) : void
+>myFn : typeof myFn
+>() => {                var x = this;            } : () => void
 
                 var x = this;
 >x : myCls
diff --git a/tests/baselines/reference/thisInModuleFunction1.types b/tests/baselines/reference/thisInModuleFunction1.types
index c73f9ebbd9c..bb13435a29f 100644
--- a/tests/baselines/reference/thisInModuleFunction1.types
+++ b/tests/baselines/reference/thisInModuleFunction1.types
@@ -3,7 +3,7 @@ module bar {
 >bar : typeof bar
 
  export function bar() {
->bar : () => any
+>bar : typeof bar
 
   return this;
 >this : any
@@ -12,7 +12,7 @@ module bar {
 var z = bar.bar();
 >z : any
 >bar.bar() : any
->bar.bar : () => any
+>bar.bar : typeof bar
+>bar : typeof bar
 >bar : typeof bar
->bar : () => any
 
diff --git a/tests/baselines/reference/thisInObjectLiterals.types b/tests/baselines/reference/thisInObjectLiterals.types
index 4215ff87980..8a279923e19 100644
--- a/tests/baselines/reference/thisInObjectLiterals.types
+++ b/tests/baselines/reference/thisInObjectLiterals.types
@@ -30,17 +30,11 @@ class MyClass {
 //type of 'this' in an object literal property of a function type is Any
 var obj = {
 >obj : { f: () => any; }
->{
-    f() {
-        return this.spaaace;
-    }
-} : { f: () => any; }
+>{    f() {        return this.spaaace;    }} : { f: () => any; }
 
     f() {
 >f : () => any
->f() {
-        return this.spaaace;
-    } : () => any
+>f() {        return this.spaaace;    } : () => any
 
         return this.spaaace;
 >this.spaaace : any
diff --git a/tests/baselines/reference/thisInPropertyBoundDeclarations.types b/tests/baselines/reference/thisInPropertyBoundDeclarations.types
index 0ddda5fe294..1ccebef5eaa 100644
--- a/tests/baselines/reference/thisInPropertyBoundDeclarations.types
+++ b/tests/baselines/reference/thisInPropertyBoundDeclarations.types
@@ -8,16 +8,10 @@ class Bug {
     private static func: Function[] = [
 >func : Function[]
 >Function : Function
->[
-     (that: Bug, name: string) => {
-         that.foo(name);
-     }
-    ] : Function[]
+>[     (that: Bug, name: string) => {         that.foo(name);     }    ] : Function[]
 
      (that: Bug, name: string) => {
->(that: Bug, name: string) => {
-         that.foo(name);
-     } : (that: Bug, name: string) => void
+>(that: Bug, name: string) => {         that.foo(name);     } : (that: Bug, name: string) => void
 >that : Bug
 >Bug : Bug
 >name : string
@@ -50,9 +44,7 @@ class A {
 
     prop1 = function() {
 >prop1 : () => void
->function() {
-        this;
-    } : () => void
+>function() {        this;    } : () => void
 
         this;
 >this : any
@@ -61,12 +53,7 @@ class A {
 
     prop2 = function() {
 >prop2 : () => void
->function() {
-        function inner() {
-            this;
-        }
-        () => this;
-    } : () => void
+>function() {        function inner() {            this;        }        () => this;    } : () => void
 
         function inner() {
 >inner : () => void
@@ -82,11 +69,7 @@ class A {
 
     prop3 = () => {
 >prop3 : () => void
->() => {
-        function inner() {
-            this;
-        }
-    } : () => void
+>() => {        function inner() {            this;        }    } : () => void
 
         function inner() {
 >inner : () => void
@@ -98,9 +81,7 @@ class A {
 
     prop4 = {
 >prop4 : { a: () => any; }
->{
-        a: function() { return this; },
-    } : { a: () => any; }
+>{        a: function() { return this; },    } : { a: () => any; }
 
         a: function() { return this; },
 >a : () => any
@@ -111,16 +92,10 @@ class A {
 
     prop5 = () => {
 >prop5 : () => { a: () => any; }
->() => {
-        return {
-            a: function() { return this; },
-        };
-    } : () => { a: () => any; }
+>() => {        return {            a: function() { return this; },        };    } : () => { a: () => any; }
 
         return {
->{
-            a: function() { return this; },
-        } : { a: () => any; }
+>{            a: function() { return this; },        } : { a: () => any; }
 
             a: function() { return this; },
 >a : () => any
@@ -153,22 +128,12 @@ class B {
 
     prop4 = '  ' +
 >prop4 : string
->'  ' +
-    function() {
-    } +
-    ' ' +
-    (() => () => () => this) : string
->'  ' +
-    function() {
-    } +
-    ' ' : string
->'  ' +
-    function() {
-    } : string
+>'  ' +    function() {    } +    ' ' +    (() => () => () => this) : string
+>'  ' +    function() {    } +    ' ' : string
+>'  ' +    function() {    } : string
 
     function() {
->function() {
-    } : () => void
+>function() {    } : () => void
 
     } +
     ' ' +
@@ -181,9 +146,7 @@ class B {
 
     prop5 = {
 >prop5 : { a: () => B; }
->{
-        a: () => { return this; }
-    } : { a: () => B; }
+>{        a: () => { return this; }    } : { a: () => B; }
 
         a: () => { return this; }
 >a : () => B
@@ -194,16 +157,10 @@ class B {
 
     prop6 = () => {
 >prop6 : () => { a: () => B; }
->() => {
-        return {
-            a: () => { return this; }
-        };
-    } : () => { a: () => B; }
+>() => {        return {            a: () => { return this; }        };    } : () => { a: () => B; }
 
         return {
->{
-            a: () => { return this; }
-        } : { a: () => B; }
+>{            a: () => { return this; }        } : { a: () => B; }
 
             a: () => { return this; }
 >a : () => B
diff --git a/tests/baselines/reference/thisInStaticMethod1.types b/tests/baselines/reference/thisInStaticMethod1.types
index fd7c4dcf48e..15f079cd514 100644
--- a/tests/baselines/reference/thisInStaticMethod1.types
+++ b/tests/baselines/reference/thisInStaticMethod1.types
@@ -6,7 +6,7 @@ class foo {
 >x : number
 
  static bar() {
->bar : () => number
+>bar : typeof bar
 
   return this.x;
 >this.x : number
@@ -17,7 +17,7 @@ class foo {
 var x = foo.bar();
 >x : number
 >foo.bar() : number
->foo.bar : () => number
+>foo.bar : typeof bar
 >foo : typeof foo
->bar : () => number
+>bar : typeof bar
 
diff --git a/tests/baselines/reference/thisReferencedInFunctionInsideArrowFunction1.types b/tests/baselines/reference/thisReferencedInFunctionInsideArrowFunction1.types
index ee79057511d..03b7ba5db3b 100644
--- a/tests/baselines/reference/thisReferencedInFunctionInsideArrowFunction1.types
+++ b/tests/baselines/reference/thisReferencedInFunctionInsideArrowFunction1.types
@@ -5,15 +5,12 @@ var foo = (dummy) => { };
 >dummy : any
 
 function test()
->test : () => void
+>test : typeof test
 {
     foo(() =>
->foo(() =>
-        function () { return this; }
-    ) : void
+>foo(() =>        function () { return this; }    ) : void
 >foo : (dummy: any) => void
->() =>
-        function () { return this; } : () => () => any
+>() =>        function () { return this; } : () => () => any
 
         function () { return this; }
 >function () { return this; } : () => any
diff --git a/tests/baselines/reference/throwInEnclosingStatements.types b/tests/baselines/reference/throwInEnclosingStatements.types
index d4d3a002504..50b8aa97e64 100644
--- a/tests/baselines/reference/throwInEnclosingStatements.types
+++ b/tests/baselines/reference/throwInEnclosingStatements.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/statements/throwStatements/throwInEnclosingStatements.ts ===
 function fn(x) {
->fn : (x: any) => void
+>fn : typeof fn
 >x : any
 
     throw x;
@@ -84,21 +84,14 @@ class C<T> {
 
 var aa = {
 >aa : { id: number; biz: () => void; }
->{
-    id:12,
-    biz() {
-        throw this;
-    }
-} : { id: number; biz: () => void; }
+>{    id:12,    biz() {        throw this;    }} : { id: number; biz: () => void; }
 
     id:12,
 >id : number
 
     biz() {
 >biz : () => void
->biz() {
-        throw this;
-    } : () => void
+>biz() {        throw this;    } : () => void
 
         throw this;
 >this : any
diff --git a/tests/baselines/reference/throwStatements.types b/tests/baselines/reference/throwStatements.types
index 42edde3080b..c34a1177ab9 100644
--- a/tests/baselines/reference/throwStatements.types
+++ b/tests/baselines/reference/throwStatements.types
@@ -37,7 +37,7 @@ class D<T>{
 }
 
 function F(x: string): number { return 42; }
->F : (x: string) => number
+>F : typeof F
 >x : string
 
 module M {
@@ -51,7 +51,7 @@ module M {
     }
 
     export function F2(x: number): string { return x.toString(); }
->F2 : (x: number) => string
+>F2 : typeof F2
 >x : number
 >x.toString() : string
 >x.toString : (radix?: number) => string
@@ -134,15 +134,15 @@ throw anObjectLiteral;
 >anObjectLiteral : { id: number; }
 
 var aFunction = F;
->aFunction : (x: string) => number
->F : (x: string) => number
+>aFunction : typeof F
+>F : typeof F
 
 throw aFunction;
->aFunction : (x: string) => number
+>aFunction : typeof F
 
 throw aFunction('');
 >aFunction('') : number
->aFunction : (x: string) => number
+>aFunction : typeof F
 
 var aLambda = (x) => 2;
 >aLambda : (x: any) => number
@@ -178,13 +178,13 @@ throw aClassInModule;
 >aClassInModule : A
 
 var aFunctionInModule = M.F2;
->aFunctionInModule : (x: number) => string
->M.F2 : (x: number) => string
+>aFunctionInModule : typeof F2
+>M.F2 : typeof F2
 >M : typeof M
->F2 : (x: number) => string
+>F2 : typeof F2
 
 throw aFunctionInModule;
->aFunctionInModule : (x: number) => string
+>aFunctionInModule : typeof F2
 
 // no initializer or annotation, so this is an 'any'
 var x;
@@ -223,8 +223,6 @@ throw ['a', ['b']];
 >['b'] : string[]
 
 throw /[a-z]/;
->/[a-z]/ : RegExp
-
 throw new Date();
 >new Date() : 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; }
diff --git a/tests/baselines/reference/topLevelExports.types b/tests/baselines/reference/topLevelExports.types
index c4076a80239..38789ad5304 100644
--- a/tests/baselines/reference/topLevelExports.types
+++ b/tests/baselines/reference/topLevelExports.types
@@ -3,7 +3,7 @@ export var foo = 3;
 >foo : number
 
 function log(n:number) { return n;}
->log : (n: number) => number
+>log : typeof log
 >n : number
 >n : number
 
@@ -12,7 +12,7 @@ void log(foo).toString();
 >log(foo).toString() : string
 >log(foo).toString : (radix?: number) => string
 >log(foo) : number
->log : (n: number) => number
+>log : typeof log
 >foo : number
 >toString : (radix?: number) => string
 
diff --git a/tests/baselines/reference/topLevelLambda2.types b/tests/baselines/reference/topLevelLambda2.types
index 7dcb909cdf9..04f1c0833cb 100644
--- a/tests/baselines/reference/topLevelLambda2.types
+++ b/tests/baselines/reference/topLevelLambda2.types
@@ -1,11 +1,11 @@
 === tests/cases/compiler/topLevelLambda2.ts ===
 function foo(x:any) {}
->foo : (x: any) => void
+>foo : typeof foo
 >x : any
 
 foo(()=>this.window);
 >foo(()=>this.window) : void
->foo : (x: any) => void
+>foo : typeof foo
 >()=>this.window : () => any
 >this.window : any
 >this : any
diff --git a/tests/baselines/reference/trailingCommasES3.js b/tests/baselines/reference/trailingCommasES3.js
deleted file mode 100644
index 56e30fe5c17..00000000000
--- a/tests/baselines/reference/trailingCommasES3.js
+++ /dev/null
@@ -1,25 +0,0 @@
-//// [trailingCommasES3.ts]
-
-var o1 = { a: 1, b: 2 };
-var o2 = { a: 1, b: 2, };
-var o3 = { a: 1, };
-var o4 = {};
-
-var a1 = [1, 2];
-var a2 = [1, 2, ];
-var a3 = [1, ];
-var a4 = [];
-var a5 = [1, , ];
-var a6 = [, , ];
-
-//// [trailingCommasES3.js]
-var o1 = { a: 1, b: 2 };
-var o2 = { a: 1, b: 2 };
-var o3 = { a: 1 };
-var o4 = {};
-var a1 = [1, 2];
-var a2 = [1, 2, ];
-var a3 = [1, ];
-var a4 = [];
-var a5 = [1, , ];
-var a6 = [, , ];
diff --git a/tests/baselines/reference/trailingCommasES3.types b/tests/baselines/reference/trailingCommasES3.types
deleted file mode 100644
index 51fa689623b..00000000000
--- a/tests/baselines/reference/trailingCommasES3.types
+++ /dev/null
@@ -1,47 +0,0 @@
-=== tests/cases/compiler/trailingCommasES3.ts ===
-
-var o1 = { a: 1, b: 2 };
->o1 : { a: number; b: number; }
->{ a: 1, b: 2 } : { a: number; b: number; }
->a : number
->b : number
-
-var o2 = { a: 1, b: 2, };
->o2 : { a: number; b: number; }
->{ a: 1, b: 2, } : { a: number; b: number; }
->a : number
->b : number
-
-var o3 = { a: 1, };
->o3 : { a: number; }
->{ a: 1, } : { a: number; }
->a : number
-
-var o4 = {};
->o4 : {}
->{} : {}
-
-var a1 = [1, 2];
->a1 : number[]
->[1, 2] : number[]
-
-var a2 = [1, 2, ];
->a2 : number[]
->[1, 2, ] : number[]
-
-var a3 = [1, ];
->a3 : number[]
->[1, ] : number[]
-
-var a4 = [];
->a4 : any[]
->[] : undefined[]
-
-var a5 = [1, , ];
->a5 : number[]
->[1, , ] : number[]
-
-var a6 = [, , ];
->a6 : any[]
->[, , ] : undefined[]
-
diff --git a/tests/baselines/reference/trailingCommasES5.js b/tests/baselines/reference/trailingCommasES5.js
deleted file mode 100644
index f342d9ac2d7..00000000000
--- a/tests/baselines/reference/trailingCommasES5.js
+++ /dev/null
@@ -1,25 +0,0 @@
-//// [trailingCommasES5.ts]
-
-var o1 = { a: 1, b: 2 };
-var o2 = { a: 1, b: 2, };
-var o3 = { a: 1, };
-var o4 = {};
-
-var a1 = [1, 2];
-var a2 = [1, 2, ];
-var a3 = [1, ];
-var a4 = [];
-var a5 = [1, , ];
-var a6 = [, , ];
-
-//// [trailingCommasES5.js]
-var o1 = { a: 1, b: 2 };
-var o2 = { a: 1, b: 2,  };
-var o3 = { a: 1,  };
-var o4 = {};
-var a1 = [1, 2];
-var a2 = [1, 2, ];
-var a3 = [1, ];
-var a4 = [];
-var a5 = [1, , ];
-var a6 = [, , ];
diff --git a/tests/baselines/reference/trailingCommasES5.types b/tests/baselines/reference/trailingCommasES5.types
deleted file mode 100644
index 2cfb2060435..00000000000
--- a/tests/baselines/reference/trailingCommasES5.types
+++ /dev/null
@@ -1,47 +0,0 @@
-=== tests/cases/compiler/trailingCommasES5.ts ===
-
-var o1 = { a: 1, b: 2 };
->o1 : { a: number; b: number; }
->{ a: 1, b: 2 } : { a: number; b: number; }
->a : number
->b : number
-
-var o2 = { a: 1, b: 2, };
->o2 : { a: number; b: number; }
->{ a: 1, b: 2, } : { a: number; b: number; }
->a : number
->b : number
-
-var o3 = { a: 1, };
->o3 : { a: number; }
->{ a: 1, } : { a: number; }
->a : number
-
-var o4 = {};
->o4 : {}
->{} : {}
-
-var a1 = [1, 2];
->a1 : number[]
->[1, 2] : number[]
-
-var a2 = [1, 2, ];
->a2 : number[]
->[1, 2, ] : number[]
-
-var a3 = [1, ];
->a3 : number[]
->[1, ] : number[]
-
-var a4 = [];
->a4 : any[]
->[] : undefined[]
-
-var a5 = [1, , ];
->a5 : number[]
->[1, , ] : number[]
-
-var a6 = [, , ];
->a6 : any[]
->[, , ] : undefined[]
-
diff --git a/tests/baselines/reference/tryStatements.types b/tests/baselines/reference/tryStatements.types
index 07bc3997d83..54a1b1539b5 100644
--- a/tests/baselines/reference/tryStatements.types
+++ b/tests/baselines/reference/tryStatements.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/statements/tryStatements/tryStatements.ts ===
 function fn() {
->fn : () => void
+>fn : typeof fn
 
     try {
 
diff --git a/tests/baselines/reference/typeAnnotationBestCommonTypeInArrayLiteral.types b/tests/baselines/reference/typeAnnotationBestCommonTypeInArrayLiteral.types
index 0e2206c646c..584ae0dcb3c 100644
--- a/tests/baselines/reference/typeAnnotationBestCommonTypeInArrayLiteral.types
+++ b/tests/baselines/reference/typeAnnotationBestCommonTypeInArrayLiteral.types
@@ -23,38 +23,16 @@ 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"
-    }
-] : IMenuItem[]
+>[    {        "id": "ourLogo",        "type": "image",        "link": "",        "icon": "modules/menu/logo.svg"    }, {        "id": "productName",        "type": "default",        "link": "",        "text": "Product Name"    }] : IMenuItem[]
     {
->{
-        "id": "ourLogo",
-        "type": "image",
-        "link": "",
-        "icon": "modules/menu/logo.svg"
-    } : { "id": string; "type": string; "link": string; "icon": string; }
+>{        "id": "ourLogo",        "type": "image",        "link": "",        "icon": "modules/menu/logo.svg"    } : { "id": string; "type": string; "link": string; "icon": string; }
 
         "id": "ourLogo",
         "type": "image",
         "link": "",
         "icon": "modules/menu/logo.svg"
     }, {
->{
-        "id": "productName",
-        "type": "default",
-        "link": "",
-        "text": "Product Name"
-    } : { "id": string; "type": string; "link": string; "text": string; }
+>{        "id": "productName",        "type": "default",        "link": "",        "text": "Product Name"    } : { "id": string; "type": string; "link": string; "text": string; }
 
         "id": "productName",
         "type": "default",
diff --git a/tests/baselines/reference/typeArgInference2.types b/tests/baselines/reference/typeArgInference2.types
index b6568afee24..d7bc7eb7ebc 100644
--- a/tests/baselines/reference/typeArgInference2.types
+++ b/tests/baselines/reference/typeArgInference2.types
@@ -7,7 +7,7 @@ interface Item {
 }
 
 declare function foo<T extends Item>(x?: T, y?: T): T;
->foo : <T extends Item>(x?: T, y?: T) => T
+>foo : typeof foo
 >T : T
 >Item : Item
 >x : T
@@ -19,31 +19,31 @@ declare function foo<T extends Item>(x?: T, y?: T): T;
 var z1 = foo(null);                   // any
 >z1 : any
 >foo(null) : any
->foo : <T extends Item>(x?: T, y?: T) => T
+>foo : typeof foo
 
 var z2 = foo();                       // Item
 >z2 : Item
 >foo() : Item
->foo : <T extends Item>(x?: T, y?: T) => T
+>foo : typeof foo
 
 var z3 = foo({ name: null });         // { name: any }
 >z3 : { name: any; }
 >foo({ name: null }) : { name: any; }
->foo : <T extends Item>(x?: T, y?: T) => T
+>foo : typeof foo
 >{ name: null } : { name: null; }
 >name : any
 
 var z4 = foo({ name: "abc" });        // { name: string }
 >z4 : { name: string; }
 >foo({ name: "abc" }) : { name: string; }
->foo : <T extends Item>(x?: T, y?: T) => T
+>foo : typeof foo
 >{ name: "abc" } : { name: string; }
 >name : string
 
 var z5 = foo({ name: "abc", a: 5 });  // { name: string; a: number }
 >z5 : { name: string; a: number; }
 >foo({ name: "abc", a: 5 }) : { name: string; a: number; }
->foo : <T extends Item>(x?: T, y?: T) => T
+>foo : typeof foo
 >{ name: "abc", a: 5 } : { name: string; a: number; }
 >name : string
 >a : number
@@ -51,7 +51,7 @@ var z5 = foo({ name: "abc", a: 5 });  // { name: string; a: number }
 var z6 = foo({ name: "abc", a: 5 }, { name: "def", b: 5 });  // Item
 >z6 : Item
 >foo({ name: "abc", a: 5 }, { name: "def", b: 5 }) : Item
->foo : <T extends Item>(x?: T, y?: T) => T
+>foo : typeof foo
 >{ name: "abc", a: 5 } : { name: string; a: number; }
 >name : string
 >a : number
diff --git a/tests/baselines/reference/typeArgInferenceWithNull.types b/tests/baselines/reference/typeArgInferenceWithNull.types
index 9fd3ea33e24..cb3bbe344b3 100644
--- a/tests/baselines/reference/typeArgInferenceWithNull.types
+++ b/tests/baselines/reference/typeArgInferenceWithNull.types
@@ -2,17 +2,17 @@
 // All legal
 
 function fn4<T extends string>(n: T) { }
->fn4 : <T extends string>(n: T) => void
+>fn4 : typeof fn4
 >T : T
 >n : T
 >T : T
 
 fn4(null);
 >fn4(null) : void
->fn4 : <T extends string>(n: T) => void
+>fn4 : typeof fn4
 
 function fn5<T extends { x: string }>(n: T) { }
->fn5 : <T extends { x: string; }>(n: T) => void
+>fn5 : typeof fn5
 >T : T
 >x : string
 >n : T
@@ -20,12 +20,12 @@ function fn5<T extends { x: string }>(n: T) { }
 
 fn5({ x: null });
 >fn5({ x: null }) : void
->fn5 : <T extends { x: string; }>(n: T) => void
+>fn5 : typeof fn5
 >{ x: null } : { x: null; }
 >x : any
 
 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
+>fn6 : typeof fn6
 >T : T
 >x : string
 >n : T
@@ -38,7 +38,7 @@ function fn6<T extends { x: string }>(n: T, fun: (x: T) => void, n2: T) { }
 
 fn6({ x: null }, y => { }, { x: "" }); // y has type { x: any }, but ideally would have type { x: string }
 >fn6({ x: null }, y => { }, { x: "" }) : void
->fn6 : <T extends { x: string; }>(n: T, fun: (x: T) => void, n2: T) => void
+>fn6 : typeof fn6
 >{ x: null } : { x: null; }
 >x : any
 >y => { } : (y: { x: string; }) => void
diff --git a/tests/baselines/reference/typeArgumentInference.types b/tests/baselines/reference/typeArgumentInference.types
index 40136bd10c3..0930cad6e53 100644
--- a/tests/baselines/reference/typeArgumentInference.types
+++ b/tests/baselines/reference/typeArgumentInference.types
@@ -1,42 +1,42 @@
 === tests/cases/conformance/expressions/functionCalls/typeArgumentInference.ts ===
 // Generic call with no parameters
 function noParams<T>() { }
->noParams : <T>() => void
+>noParams : typeof noParams
 >T : T
 
 noParams();
 >noParams() : void
->noParams : <T>() => void
+>noParams : typeof noParams
 
 noParams<string>();
 >noParams<string>() : void
->noParams : <T>() => void
+>noParams : typeof noParams
 
 noParams<{}>();
 >noParams<{}>() : void
->noParams : <T>() => void
+>noParams : typeof noParams
 
 // Generic call with parameters but none use type parameter type
 function noGenericParams<T>(n: string) { }
->noGenericParams : <T>(n: string) => void
+>noGenericParams : typeof noGenericParams
 >T : T
 >n : string
 
 noGenericParams('');
 >noGenericParams('') : void
->noGenericParams : <T>(n: string) => void
+>noGenericParams : typeof noGenericParams
 
 noGenericParams<number>('');
 >noGenericParams<number>('') : void
->noGenericParams : <T>(n: string) => void
+>noGenericParams : typeof noGenericParams
 
 noGenericParams<{}>('');
 >noGenericParams<{}>('') : void
->noGenericParams : <T>(n: string) => void
+>noGenericParams : typeof 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
+>someGenerics1 : typeof someGenerics1
 >T : T
 >U : U
 >n : T
@@ -45,15 +45,15 @@ function someGenerics1<T, U>(n: T, m: number) { }
 
 someGenerics1(3, 4);
 >someGenerics1(3, 4) : void
->someGenerics1 : <T, U>(n: T, m: number) => void
+>someGenerics1 : typeof someGenerics1
 
 someGenerics1<number, {}>(3, 4);
 >someGenerics1<number, {}>(3, 4) : void
->someGenerics1 : <T, U>(n: T, m: number) => void
+>someGenerics1 : typeof someGenerics1
 
 // 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
+>someGenerics2a : typeof someGenerics2a
 >T : T
 >n : (x: T) => void
 >x : T
@@ -61,21 +61,21 @@ function someGenerics2a<T>(n: (x: T) => void) { }
 
 someGenerics2a((n: string) => n);
 >someGenerics2a((n: string) => n) : void
->someGenerics2a : <T>(n: (x: T) => void) => void
+>someGenerics2a : typeof someGenerics2a
 >(n: string) => n : (n: string) => string
 >n : string
 >n : string
 
 someGenerics2a<string>((n: string) => n);
 >someGenerics2a<string>((n: string) => n) : void
->someGenerics2a : <T>(n: (x: T) => void) => void
+>someGenerics2a : typeof someGenerics2a
 >(n: string) => n : (n: string) => string
 >n : string
 >n : string
 
 someGenerics2a<string>((n) => n.substr(0));
 >someGenerics2a<string>((n) => n.substr(0)) : void
->someGenerics2a : <T>(n: (x: T) => void) => void
+>someGenerics2a : typeof someGenerics2a
 >(n) => n.substr(0) : (n: string) => string
 >n : string
 >n.substr(0) : string
@@ -84,7 +84,7 @@ someGenerics2a<string>((n) => n.substr(0));
 >substr : (from: number, length?: number) => string
 
 function someGenerics2b<T, U>(n: (x: T, y: U) => void) { }
->someGenerics2b : <T, U>(n: (x: T, y: U) => void) => void
+>someGenerics2b : typeof someGenerics2b
 >T : T
 >U : U
 >n : (x: T, y: U) => void
@@ -95,7 +95,7 @@ function someGenerics2b<T, U>(n: (x: T, y: U) => void) { }
 
 someGenerics2b((n: string, x: number) => n);
 >someGenerics2b((n: string, x: number) => n) : void
->someGenerics2b : <T, U>(n: (x: T, y: U) => void) => void
+>someGenerics2b : typeof someGenerics2b
 >(n: string, x: number) => n : (n: string, x: number) => string
 >n : string
 >x : number
@@ -103,7 +103,7 @@ someGenerics2b((n: string, x: number) => n);
 
 someGenerics2b<string, number>((n: string, t: number) => n);
 >someGenerics2b<string, number>((n: string, t: number) => n) : void
->someGenerics2b : <T, U>(n: (x: T, y: U) => void) => void
+>someGenerics2b : typeof someGenerics2b
 >(n: string, t: number) => n : (n: string, t: number) => string
 >n : string
 >t : number
@@ -111,7 +111,7 @@ someGenerics2b<string, number>((n: string, t: number) => n);
 
 someGenerics2b<string, number>((n, t) => n.substr(t * t));
 >someGenerics2b<string, number>((n, t) => n.substr(t * t)) : void
->someGenerics2b : <T, U>(n: (x: T, y: U) => void) => void
+>someGenerics2b : typeof someGenerics2b
 >(n, t) => n.substr(t * t) : (n: string, t: number) => string
 >n : string
 >t : number
@@ -125,31 +125,31 @@ 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
+>someGenerics3 : typeof someGenerics3
 >T : T
 >producer : () => T
 >T : T
 
 someGenerics3(() => '');
 >someGenerics3(() => '') : void
->someGenerics3 : <T>(producer: () => T) => void
+>someGenerics3 : typeof someGenerics3
 >() => '' : () => string
 
 someGenerics3<Date>(() => undefined);
 >someGenerics3<Date>(() => undefined) : void
->someGenerics3 : <T>(producer: () => T) => void
+>someGenerics3 : typeof someGenerics3
 >Date : Date
 >() => undefined : () => any
 >undefined : undefined
 
 someGenerics3<number>(() => 3);
 >someGenerics3<number>(() => 3) : void
->someGenerics3 : <T>(producer: () => T) => void
+>someGenerics3 : typeof someGenerics3
 >() => 3 : () => number
 
 // 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
+>someGenerics4 : typeof someGenerics4
 >T : T
 >U : U
 >n : T
@@ -160,21 +160,21 @@ function someGenerics4<T, U>(n: T, f: (x: U) => void) { }
 
 someGenerics4(4, () => null);
 >someGenerics4(4, () => null) : void
->someGenerics4 : <T, U>(n: T, f: (x: U) => void) => void
+>someGenerics4 : typeof someGenerics4
 >() => null : () => any
 
 someGenerics4<string, number>('', () => 3);
 >someGenerics4<string, number>('', () => 3) : void
->someGenerics4 : <T, U>(n: T, f: (x: U) => void) => void
+>someGenerics4 : typeof someGenerics4
 >() => 3 : () => number
 
 someGenerics4<string, number>(null, null);
 >someGenerics4<string, number>(null, null) : void
->someGenerics4 : <T, U>(n: T, f: (x: U) => void) => void
+>someGenerics4 : typeof someGenerics4
 
 // 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
+>someGenerics5 : typeof someGenerics5
 >U : U
 >T : T
 >n : T
@@ -185,21 +185,21 @@ function someGenerics5<U, T>(n: T, f: (x: U) => void) { }
 
 someGenerics5(4, () => null);
 >someGenerics5(4, () => null) : void
->someGenerics5 : <U, T>(n: T, f: (x: U) => void) => void
+>someGenerics5 : typeof someGenerics5
 >() => null : () => any
 
 someGenerics5<number, string>('', () => 3);
 >someGenerics5<number, string>('', () => 3) : void
->someGenerics5 : <U, T>(n: T, f: (x: U) => void) => void
+>someGenerics5 : typeof someGenerics5
 >() => 3 : () => number
 
 someGenerics5<string, number>(null, null);
 >someGenerics5<string, number>(null, null) : void
->someGenerics5 : <U, T>(n: T, f: (x: U) => void) => void
+>someGenerics5 : typeof someGenerics5
 
 // 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
+>someGenerics6 : typeof someGenerics6
 >A : A
 >a : (a: A) => A
 >a : A
@@ -216,7 +216,7 @@ function someGenerics6<A>(a: (a: A) => A, b: (b: A) => A, c: (c: A) => A) { }
 
 someGenerics6(n => n, n => n, n => n);
 >someGenerics6(n => n, n => n, n => n) : void
->someGenerics6 : <A>(a: (a: A) => A, b: (b: A) => A, c: (c: A) => A) => void
+>someGenerics6 : typeof someGenerics6
 >n => n : (n: {}) => {}
 >n : {}
 >n : {}
@@ -229,7 +229,7 @@ someGenerics6(n => n, n => n, n => n);
 
 someGenerics6<number>(n => n, n => n, n => n);
 >someGenerics6<number>(n => n, n => n, n => n) : void
->someGenerics6 : <A>(a: (a: A) => A, b: (b: A) => A, c: (c: A) => A) => void
+>someGenerics6 : typeof someGenerics6
 >n => n : (n: number) => number
 >n : number
 >n : number
@@ -242,7 +242,7 @@ someGenerics6<number>(n => n, n => n, n => n);
 
 someGenerics6<number>((n: number) => n, (n: number) => n, (n: number) => n);
 >someGenerics6<number>((n: number) => n, (n: number) => n, (n: number) => n) : void
->someGenerics6 : <A>(a: (a: A) => A, b: (b: A) => A, c: (c: A) => A) => void
+>someGenerics6 : typeof someGenerics6
 >(n: number) => n : (n: number) => number
 >n : number
 >n : number
@@ -255,7 +255,7 @@ 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
+>someGenerics7 : typeof someGenerics7
 >A : A
 >B : B
 >C : C
@@ -274,7 +274,7 @@ function someGenerics7<A, B, C>(a: (a: A) => A, b: (b: B) => B, c: (c: C) => C)
 
 someGenerics7(n => n, n => n, n => n);
 >someGenerics7(n => n, n => n, n => n) : void
->someGenerics7 : <A, B, C>(a: (a: A) => A, b: (b: B) => B, c: (c: C) => C) => void
+>someGenerics7 : typeof someGenerics7
 >n => n : (n: {}) => {}
 >n : {}
 >n : {}
@@ -287,7 +287,7 @@ someGenerics7(n => n, n => n, n => n);
 
 someGenerics7<number, string, number>(n => n, n => n, n => n);
 >someGenerics7<number, string, number>(n => n, n => n, n => n) : void
->someGenerics7 : <A, B, C>(a: (a: A) => A, b: (b: B) => B, c: (c: C) => C) => void
+>someGenerics7 : typeof someGenerics7
 >n => n : (n: number) => number
 >n : number
 >n : number
@@ -300,7 +300,7 @@ someGenerics7<number, string, number>(n => n, n => n, n => n);
 
 someGenerics7<number, string, number>((n: number) => n, (n: string) => n, (n: number) => n);
 >someGenerics7<number, string, number>((n: number) => n, (n: string) => n, (n: number) => n) : void
->someGenerics7 : <A, B, C>(a: (a: A) => A, b: (b: B) => B, c: (c: C) => C) => void
+>someGenerics7 : typeof someGenerics7
 >(n: number) => n : (n: number) => number
 >n : number
 >n : number
@@ -313,7 +313,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
+>someGenerics8 : typeof someGenerics8
 >T : T
 >n : T
 >T : T
@@ -321,18 +321,18 @@ function someGenerics8<T>(n: T): T { return n; }
 >n : T
 
 var x = someGenerics8(someGenerics7);
->x : <A, B, C>(a: (a: A) => A, b: (b: B) => B, c: (c: C) => C) => void
->someGenerics8(someGenerics7) : <A, B, C>(a: (a: A) => A, b: (b: B) => B, c: (c: C) => C) => void
->someGenerics8 : <T>(n: T) => T
->someGenerics7 : <A, B, C>(a: (a: A) => A, b: (b: B) => B, c: (c: C) => C) => void
+>x : typeof someGenerics7
+>someGenerics8(someGenerics7) : typeof someGenerics7
+>someGenerics8 : typeof someGenerics8
+>someGenerics7 : typeof someGenerics7
 
 x<string, string, string>(null, null, null);
 >x<string, string, string>(null, null, null) : void
->x : <A, B, C>(a: (a: A) => A, b: (b: B) => B, c: (c: C) => C) => void
+>x : typeof someGenerics7
 
 // 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
+>someGenerics9 : typeof someGenerics9
 >T : T
 >a : T
 >T : T
@@ -347,7 +347,7 @@ function someGenerics9<T>(a: T, b: T, c: T): T {
 var a9a = someGenerics9('', 0, []);
 >a9a : {}
 >someGenerics9('', 0, []) : {}
->someGenerics9 : <T>(a: T, b: T, c: T) => T
+>someGenerics9 : typeof someGenerics9
 >[] : undefined[]
 
 var a9a: {};
@@ -356,7 +356,7 @@ var a9a: {};
 var a9b = someGenerics9<{ a?: number; b?: string; }>({ a: 0 }, { b: '' }, null);
 >a9b : { a?: number; b?: string; }
 >someGenerics9<{ a?: number; b?: string; }>({ a: 0 }, { b: '' }, null) : { a?: number; b?: string; }
->someGenerics9 : <T>(a: T, b: T, c: T) => T
+>someGenerics9 : typeof someGenerics9
 >a : number
 >b : string
 >{ a: 0 } : { a: number; }
@@ -392,7 +392,7 @@ interface A92 {
 var a9e = someGenerics9(undefined, { x: 6, z: new Date() }, { x: 6, y: '' });
 >a9e : {}
 >someGenerics9(undefined, { x: 6, z: new Date() }, { x: 6, y: '' }) : {}
->someGenerics9 : <T>(a: T, b: T, c: T) => T
+>someGenerics9 : typeof someGenerics9
 >undefined : undefined
 >{ x: 6, z: new Date() } : { x: number; z: Date; }
 >x : number
@@ -409,7 +409,7 @@ var a9e: {};
 var a9f = someGenerics9<A92>(undefined, { x: 6, z: new Date() }, { x: 6, y: '' });
 >a9f : A92
 >someGenerics9<A92>(undefined, { x: 6, z: new Date() }, { x: 6, y: '' }) : A92
->someGenerics9 : <T>(a: T, b: T, c: T) => T
+>someGenerics9 : typeof someGenerics9
 >A92 : A92
 >undefined : undefined
 >{ x: 6, z: new Date() } : { x: number; z: Date; }
@@ -429,7 +429,7 @@ var a9f: A92;
 var a9d = someGenerics9({ x: 3 }, { x: 6 }, { x: 6 });
 >a9d : { x: number; }
 >someGenerics9({ x: 3 }, { x: 6 }, { x: 6 }) : { x: number; }
->someGenerics9 : <T>(a: T, b: T, c: T) => T
+>someGenerics9 : typeof someGenerics9
 >{ x: 3 } : { x: number; }
 >x : number
 >{ x: 6 } : { x: number; }
@@ -448,7 +448,7 @@ var anyVar: any;
 var a = someGenerics9(7, anyVar, 4);
 >a : any
 >someGenerics9(7, anyVar, 4) : any
->someGenerics9 : <T>(a: T, b: T, c: T) => T
+>someGenerics9 : typeof someGenerics9
 >anyVar : any
 
 var a: any;
@@ -458,7 +458,7 @@ var a: any;
 var arr = someGenerics9([], null, undefined);
 >arr : any[]
 >someGenerics9([], null, undefined) : any[]
->someGenerics9 : <T>(a: T, b: T, c: T) => T
+>someGenerics9 : typeof someGenerics9
 >[] : any[]
 >undefined : undefined
 
diff --git a/tests/baselines/reference/typeArgumentInferenceOrdering.types b/tests/baselines/reference/typeArgumentInferenceOrdering.types
index 62371562c96..ebba7ce49c9 100644
--- a/tests/baselines/reference/typeArgumentInferenceOrdering.types
+++ b/tests/baselines/reference/typeArgumentInferenceOrdering.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/typeArgumentInferenceOrdering.ts ===
 function foo<T>(f: { y: T }): T { return null }
->foo : <T>(f: { y: T; }) => T
+>foo : typeof foo
 >T : T
 >f : { y: T; }
 >y : T
@@ -11,7 +11,7 @@ var x = foo(new C()).x; // was Error that property x does not exist on type {}
 >x : () => Goo
 >foo(new C()).x : () => Goo
 >foo(new C()) : I
->foo : <T>(f: { y: T; }) => T
+>foo : typeof foo
 >new C() : C
 >C : typeof C
 >x : () => Goo
diff --git a/tests/baselines/reference/typeArgumentInferenceWithConstraintAsCommonRoot.types b/tests/baselines/reference/typeArgumentInferenceWithConstraintAsCommonRoot.types
index 35328f72803..4d4ae199926 100644
--- a/tests/baselines/reference/typeArgumentInferenceWithConstraintAsCommonRoot.types
+++ b/tests/baselines/reference/typeArgumentInferenceWithConstraintAsCommonRoot.types
@@ -14,7 +14,7 @@ interface Elephant extends Animal { z }
 >z : any
 
 function f<T extends Animal>(x: T, y: T): T { return undefined; }
->f : <T extends Animal>(x: T, y: T) => T
+>f : typeof f
 >T : T
 >Animal : Animal
 >x : T
@@ -34,7 +34,7 @@ var e: Elephant;
 
 f(g, e); // valid because both Giraffe and Elephant satisfy the constraint. T is Animal
 >f(g, e) : Animal
->f : <T extends Animal>(x: T, y: T) => T
+>f : typeof f
 >g : Giraffe
 >e : Elephant
 
diff --git a/tests/baselines/reference/typeArgumentsInFunctionExpressions.types b/tests/baselines/reference/typeArgumentsInFunctionExpressions.types
index 80c96715254..e8635e7105d 100644
--- a/tests/baselines/reference/typeArgumentsInFunctionExpressions.types
+++ b/tests/baselines/reference/typeArgumentsInFunctionExpressions.types
@@ -1,10 +1,7 @@
 === tests/cases/compiler/typeArgumentsInFunctionExpressions.ts ===
 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
+>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
@@ -21,10 +18,7 @@ var obj = function f<T>(a: T) { // should not error
  
 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
+>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
diff --git a/tests/baselines/reference/typeCheckObjectCreationExpressionWithUndefinedCallResolutionData.types b/tests/baselines/reference/typeCheckObjectCreationExpressionWithUndefinedCallResolutionData.types
index 145a449c74c..79ff4b1687b 100644
--- a/tests/baselines/reference/typeCheckObjectCreationExpressionWithUndefinedCallResolutionData.types
+++ b/tests/baselines/reference/typeCheckObjectCreationExpressionWithUndefinedCallResolutionData.types
@@ -4,13 +4,13 @@ import f = require('file1');
 
 f.foo();
 >f.foo() : any
->f.foo : () => any
+>f.foo : typeof foo
 >f : typeof "tests/cases/compiler/file1"
->foo : () => any
+>foo : typeof foo
 
 === tests/cases/compiler/file1.ts ===
 export function foo() {
->foo : () => any
+>foo : typeof foo
 
 var classes = undefined;
 >classes : any
diff --git a/tests/baselines/reference/typeInferenceConflictingCandidates.types b/tests/baselines/reference/typeInferenceConflictingCandidates.types
index 7a77daf4092..fc9e2824265 100644
--- a/tests/baselines/reference/typeInferenceConflictingCandidates.types
+++ b/tests/baselines/reference/typeInferenceConflictingCandidates.types
@@ -1,6 +1,6 @@
 === 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
+>g : typeof g
 >T : T
 >a : T
 >T : T
@@ -14,7 +14,7 @@ declare function g<T>(a: T, b: T, c: (t: T) => T): T;
 
 g("", 3, a => a);
 >g("", 3, a => a) : {}
->g : <T>(a: T, b: T, c: (t: T) => T) => T
+>g : typeof g
 >a => a : (a: {}) => {}
 >a : {}
 >a : {}
diff --git a/tests/baselines/reference/typeInferenceFixEarly.types b/tests/baselines/reference/typeInferenceFixEarly.types
index c009d2d809e..47bdcec0c71 100644
--- a/tests/baselines/reference/typeInferenceFixEarly.types
+++ b/tests/baselines/reference/typeInferenceFixEarly.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/typeInferenceFixEarly.ts ===
 declare function f<T>(p: (t: T) => T): T;
->f : <T>(p: (t: T) => T) => T
+>f : typeof f
 >T : T
 >p : (t: T) => T
 >t : T
@@ -10,7 +10,7 @@ declare function f<T>(p: (t: T) => T): T;
 
 f(n => 3);
 >f(n => 3) : {}
->f : <T>(p: (t: T) => T) => T
+>f : typeof f
 >n => 3 : (n: {}) => number
 >n : {}
 
diff --git a/tests/baselines/reference/typeInferenceReturnTypeCallback.types b/tests/baselines/reference/typeInferenceReturnTypeCallback.types
index d697b34f344..807574ed3d8 100644
--- a/tests/baselines/reference/typeInferenceReturnTypeCallback.types
+++ b/tests/baselines/reference/typeInferenceReturnTypeCallback.types
@@ -51,18 +51,14 @@ class Cons<T> implements IList<T>{
 >U : U
 
         return this.foldRight(new Nil<U>(), (t, acc) => {
->this.foldRight(new Nil<U>(), (t, acc) => {
-            return new Cons<U>();
-        }) : Nil<U>
+>this.foldRight(new Nil<U>(), (t, acc) => {            return new Cons<U>();        }) : Nil<U>
 >this.foldRight : <E>(z: E, f: (t: T, acc: E) => E) => E
 >this : Cons<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, acc) => {            return new Cons<U>();        } : (t: T, acc: Nil<U>) => Cons<U>
 >t : T
 >acc : Nil<U>
 
diff --git a/tests/baselines/reference/typeInferenceWithTypeAnnotation.types b/tests/baselines/reference/typeInferenceWithTypeAnnotation.types
index b1d97ec3fef..f47aaf9942b 100644
--- a/tests/baselines/reference/typeInferenceWithTypeAnnotation.types
+++ b/tests/baselines/reference/typeInferenceWithTypeAnnotation.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/typeInferenceWithTypeAnnotation.ts ===
 declare function f<T>(p: (t: T) => T): T;
->f : <T>(p: (t: T) => T) => T
+>f : typeof f
 >T : T
 >p : (t: T) => T
 >t : T
@@ -10,7 +10,7 @@ declare function f<T>(p: (t: T) => T): T;
 
 f((n: number) => n); 
 >f((n: number) => n) : number
->f : <T>(p: (t: T) => T) => T
+>f : typeof f
 >(n: number) => n : (n: number) => number
 >n : number
 >n : number
diff --git a/tests/baselines/reference/typeOfThisInFunctionExpression.types b/tests/baselines/reference/typeOfThisInFunctionExpression.types
index d4021f3bcfb..5b66ec0d5c9 100644
--- a/tests/baselines/reference/typeOfThisInFunctionExpression.types
+++ b/tests/baselines/reference/typeOfThisInFunctionExpression.types
@@ -2,7 +2,7 @@
 // type of 'this' in FunctionExpression is Any
 
 function fn() {
->fn : () => void
+>fn : typeof fn
 
     var p = this;
 >p : any
@@ -14,10 +14,7 @@ function fn() {
 
 var t = function () {
 >t : () => void
->function () {
-    var p = this;
-    var p: any;
-} : () => void
+>function () {    var p = this;    var p: any;} : () => void
 
     var p = this;
 >p : any
@@ -29,10 +26,7 @@ var t = function () {
 
 var t2 = function f() {
 >t2 : () => void
->function f() {
-    var x = this;
-    var x: any;
-} : () => void
+>function f() {    var x = this;    var x: any;} : () => void
 >f : () => void
 
     var x = this;
@@ -48,10 +42,7 @@ class C {
 
     x = function () {
 >x : () => void
->function () {
-        var q: any;
-        var q = this;
-    } : () => void
+>function () {        var q: any;        var q = this;    } : () => void
 
         var q: any;
 >q : any
@@ -62,10 +53,7 @@ class C {
     }
     y = function ff() {
 >y : () => void
->function ff() {
-        var q: any;
-        var q = this;
-    } : () => void
+>function ff() {        var q: any;        var q = this;    } : () => void
 >ff : () => void
 
         var q: any;
@@ -81,7 +69,7 @@ module M {
 >M : typeof M
 
     function fn() {
->fn : () => void
+>fn : typeof fn
 
         var p = this;
 >p : any
@@ -93,10 +81,7 @@ module M {
 
     var t = function () {
 >t : () => void
->function () {
-        var p = this;
-        var p: any;
-    } : () => void
+>function () {        var p = this;        var p: any;    } : () => void
 
         var p = this;
 >p : any
@@ -108,10 +93,7 @@ module M {
 
     var t2 = function f() {
 >t2 : () => void
->function f() {
-        var x = this;
-        var x: any;
-    } : () => void
+>function f() {        var x = this;        var x: any;    } : () => void
 >f : () => void
 
         var x = this;
diff --git a/tests/baselines/reference/typeOfThisInMemberFunctions.types b/tests/baselines/reference/typeOfThisInMemberFunctions.types
index 2be8af1ca75..7d31126658d 100644
--- a/tests/baselines/reference/typeOfThisInMemberFunctions.types
+++ b/tests/baselines/reference/typeOfThisInMemberFunctions.types
@@ -11,7 +11,7 @@ class C {
     }
 
     static bar() {
->bar : () => void
+>bar : typeof bar
 
         var r2 = this;
 >r2 : typeof C
@@ -36,7 +36,7 @@ class D<T> {
     }
 
     static bar() {
->bar : () => void
+>bar : typeof bar
 
         var r2 = this;
 >r2 : typeof D
@@ -62,7 +62,7 @@ class E<T extends Date> {
     }
 
     static bar() {
->bar : () => void
+>bar : typeof bar
 
         var r2 = this;
 >r2 : typeof E
diff --git a/tests/baselines/reference/typeOfThisInStaticMembers.types b/tests/baselines/reference/typeOfThisInStaticMembers.types
index 65440fb1f2e..c455bb0a226 100644
--- a/tests/baselines/reference/typeOfThisInStaticMembers.types
+++ b/tests/baselines/reference/typeOfThisInStaticMembers.types
@@ -9,7 +9,7 @@ class C {
 >foo : number
 
     static bar() {
->bar : () => typeof C
+>bar : typeof bar
 
         // type of this is the constructor function type
         var t = this;
@@ -24,9 +24,9 @@ class C {
 var t = C.bar();
 >t : typeof C
 >C.bar() : typeof C
->C.bar : () => typeof C
+>C.bar : typeof bar
 >C : typeof C
->bar : () => typeof C
+>bar : typeof bar
 
 // all ok
 var r2 = t.foo + 1;
@@ -39,9 +39,9 @@ var r2 = t.foo + 1;
 var r3 = t.bar();
 >r3 : typeof C
 >t.bar() : typeof C
->t.bar : () => typeof C
+>t.bar : typeof bar
 >t : typeof C
->bar : () => typeof C
+>bar : typeof bar
 
 var r4 = new t(1);
 >r4 : C
@@ -62,7 +62,7 @@ class C2<T> {
 >foo : string
 
     static bar() {
->bar : () => typeof C2
+>bar : typeof bar
 
         // type of this is the constructor function type
         var t = this;
@@ -77,9 +77,9 @@ class C2<T> {
 var t2 = C2.bar();
 >t2 : typeof C2
 >C2.bar() : typeof C2
->C2.bar : () => typeof C2
+>C2.bar : typeof bar
 >C2 : typeof C2
->bar : () => typeof C2
+>bar : typeof bar
 
 // all ok
 var r5 = t2.foo + 1;
@@ -92,9 +92,9 @@ var r5 = t2.foo + 1;
 var r6 = t2.bar();
 >r6 : typeof C2
 >t2.bar() : typeof C2
->t2.bar : () => typeof C2
+>t2.bar : typeof bar
 >t2 : typeof C2
->bar : () => typeof C2
+>bar : typeof bar
 
 var r7 = new t2('');
 >r7 : C2<{}>
diff --git a/tests/baselines/reference/typeParameterAndArgumentOfSameName1.types b/tests/baselines/reference/typeParameterAndArgumentOfSameName1.types
index 5811e481ebd..64195a4a976 100644
--- a/tests/baselines/reference/typeParameterAndArgumentOfSameName1.types
+++ b/tests/baselines/reference/typeParameterAndArgumentOfSameName1.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/typeParameterAndArgumentOfSameName1.ts ===
 function f<A extends Number>(A: A): A {
->f : <A extends Number>(A: A) => A
+>f : typeof f
 >A : A
 >Number : Number
 >A : A
diff --git a/tests/baselines/reference/typeParameterAsElementType.types b/tests/baselines/reference/typeParameterAsElementType.types
index 0dbbbf5ac7a..46c603af294 100644
--- a/tests/baselines/reference/typeParameterAsElementType.types
+++ b/tests/baselines/reference/typeParameterAsElementType.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/typeParameterAsElementType.ts ===
 function fee<T>() {
->fee : <T>() => void
+>fee : typeof fee
 >T : T
 
     var t: T;
diff --git a/tests/baselines/reference/typeParameterAsTypeArgument.types b/tests/baselines/reference/typeParameterAsTypeArgument.types
index 5e0d5ba2437..d8573a1564b 100644
--- a/tests/baselines/reference/typeParameterAsTypeArgument.types
+++ b/tests/baselines/reference/typeParameterAsTypeArgument.types
@@ -2,7 +2,7 @@
 // These are all errors because type parameters cannot reference other type parameters from the same list
 
 function foo<T, U>(x: T, y: U) {
->foo : <T, U>(x: T, y: U) => C<U, T>
+>foo : typeof foo
 >T : T
 >U : U
 >x : T
@@ -12,7 +12,7 @@ function foo<T, U>(x: T, y: U) {
 
     foo<U, U>(y, y);
 >foo<U, U>(y, y) : C<U, U>
->foo : <T, U>(x: T, y: U) => C<U, T>
+>foo : typeof foo
 >U : U
 >U : U
 >y : U
diff --git a/tests/baselines/reference/typeParameterAsTypeParameterConstraintTransitively.types b/tests/baselines/reference/typeParameterAsTypeParameterConstraintTransitively.types
index 21f0f4835ab..62a19ee5d4f 100644
--- a/tests/baselines/reference/typeParameterAsTypeParameterConstraintTransitively.types
+++ b/tests/baselines/reference/typeParameterAsTypeParameterConstraintTransitively.types
@@ -29,7 +29,7 @@ var 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
+>foo : typeof foo
 >T : T
 >U : U
 >V : V
@@ -46,11 +46,11 @@ function foo<T, U, V>(x: T, y: U, z: V): V { return z; }
 
 foo(1, 2, 3);
 >foo(1, 2, 3) : number
->foo : <T, U, V>(x: T, y: U, z: V) => V
+>foo : typeof foo
 
 foo({ x: 1 }, { x: 1, y: '' }, { x: 2, y: '', z: true });
 >foo({ x: 1 }, { x: 1, y: '' }, { x: 2, y: '', z: true }) : { x: number; y: string; z: boolean; }
->foo : <T, U, V>(x: T, y: U, z: V) => V
+>foo : typeof foo
 >{ x: 1 } : { x: number; }
 >x : number
 >{ x: 1, y: '' } : { x: number; y: string; }
@@ -63,14 +63,14 @@ foo({ x: 1 }, { x: 1, y: '' }, { x: 2, y: '', z: true });
 
 foo(a, b, c);
 >foo(a, b, c) : C
->foo : <T, U, V>(x: T, y: U, z: V) => V
+>foo : typeof foo
 >a : A
 >b : B
 >c : C
 
 foo(a, b, { foo: 1, bar: '', hm: true });
 >foo(a, b, { foo: 1, bar: '', hm: true }) : { foo: number; bar: string; hm: boolean; }
->foo : <T, U, V>(x: T, y: U, z: V) => V
+>foo : typeof foo
 >a : A
 >b : B
 >{ foo: 1, bar: '', hm: true } : { foo: number; bar: string; hm: boolean; }
@@ -80,7 +80,7 @@ foo(a, b, { foo: 1, bar: '', hm: true });
 
 foo((x: number, y) => { }, (x) => { }, () => { });
 >foo((x: number, y) => { }, (x) => { }, () => { }) : () => void
->foo : <T, U, V>(x: T, y: U, z: V) => V
+>foo : typeof foo
 >(x: number, y) => { } : (x: number, y: any) => void
 >x : number
 >y : any
@@ -89,7 +89,7 @@ foo((x: number, y) => { }, (x) => { }, () => { });
 >() => { } : () => void
 
 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
+>foo2 : typeof foo2
 >T : T
 >A : A
 >U : U
@@ -106,21 +106,21 @@ function foo2<T extends A, U, V>(x: T, y: U, z: V): V { return z; }
 //function foo2<T extends A, U extends T, V extends U>(x: T, y: U, z: V): V { return z; }
 foo(a, a, a);
 >foo(a, a, a) : A
->foo : <T, U, V>(x: T, y: U, z: V) => V
+>foo : typeof foo
 >a : A
 >a : A
 >a : A
 
 foo(a, b, c);
 >foo(a, b, c) : C
->foo : <T, U, V>(x: T, y: U, z: V) => V
+>foo : typeof foo
 >a : A
 >b : B
 >c : C
 
 foo(b, b, { foo: 1, bar: '', hm: '' });
 >foo(b, b, { foo: 1, bar: '', hm: '' }) : { foo: number; bar: string; hm: string; }
->foo : <T, U, V>(x: T, y: U, z: V) => V
+>foo : typeof foo
 >b : B
 >b : B
 >{ foo: 1, bar: '', hm: '' } : { foo: number; bar: string; hm: string; }
diff --git a/tests/baselines/reference/typeParameterAsTypeParameterConstraintTransitively2.types b/tests/baselines/reference/typeParameterAsTypeParameterConstraintTransitively2.types
index fdd66ebf435..283b6e43205 100644
--- a/tests/baselines/reference/typeParameterAsTypeParameterConstraintTransitively2.types
+++ b/tests/baselines/reference/typeParameterAsTypeParameterConstraintTransitively2.types
@@ -29,7 +29,7 @@ var 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
+>foo : typeof foo
 >T : T
 >U : U
 >V : V
@@ -46,11 +46,11 @@ function foo<T, U, V>(x: T, y: U, z: V): V { return z; }
 
 foo(1, 2, '');
 >foo(1, 2, '') : string
->foo : <T, U, V>(x: T, y: U, z: V) => V
+>foo : typeof foo
 
 foo({ x: 1 }, { x: 1, y: '' }, { x: 2, y: 2, z: true });
 >foo({ x: 1 }, { x: 1, y: '' }, { x: 2, y: 2, z: true }) : { x: number; y: number; z: boolean; }
->foo : <T, U, V>(x: T, y: U, z: V) => V
+>foo : typeof foo
 >{ x: 1 } : { x: number; }
 >x : number
 >{ x: 1, y: '' } : { x: number; y: string; }
@@ -63,14 +63,14 @@ foo({ x: 1 }, { x: 1, y: '' }, { x: 2, y: 2, z: true });
 
 foo(a, b, a);
 >foo(a, b, a) : A
->foo : <T, U, V>(x: T, y: U, z: V) => V
+>foo : typeof foo
 >a : A
 >b : B
 >a : A
 
 foo(a, { foo: 1, bar: '', hm: true }, b);
 >foo(a, { foo: 1, bar: '', hm: true }, b) : B
->foo : <T, U, V>(x: T, y: U, z: V) => V
+>foo : typeof foo
 >a : A
 >{ foo: 1, bar: '', hm: true } : { foo: number; bar: string; hm: boolean; }
 >foo : number
@@ -80,7 +80,7 @@ foo(a, { foo: 1, bar: '', hm: true }, b);
 
 foo((x: number, y: string) => { }, (x, y: boolean) => { }, () => { });
 >foo((x: number, y: string) => { }, (x, y: boolean) => { }, () => { }) : () => void
->foo : <T, U, V>(x: T, y: U, z: V) => V
+>foo : typeof foo
 >(x: number, y: string) => { } : (x: number, y: string) => void
 >x : number
 >y : string
@@ -90,7 +90,7 @@ foo((x: number, y: string) => { }, (x, y: boolean) => { }, () => { });
 >() => { } : () => void
 
 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
+>foo2 : typeof foo2
 >T : T
 >A : A
 >U : U
@@ -109,14 +109,14 @@ function foo2<T extends A, U extends A, V extends A>(x: T, y: U, z: V): V { retu
 //function foo2<T extends A, U extends T, V extends U>(x: T, y: U, z: V): V { return z; }
 foo(b, a, c);
 >foo(b, a, c) : C
->foo : <T, U, V>(x: T, y: U, z: V) => V
+>foo : typeof foo
 >b : B
 >a : A
 >c : C
 
 foo(c, c, a);
 >foo(c, c, a) : A
->foo : <T, U, V>(x: T, y: U, z: V) => V
+>foo : typeof foo
 >c : C
 >c : C
 >a : A
diff --git a/tests/baselines/reference/typeParameterCompatibilityAccrossDeclarations.types b/tests/baselines/reference/typeParameterCompatibilityAccrossDeclarations.types
index 657dbbe9573..9d041b27738 100644
--- a/tests/baselines/reference/typeParameterCompatibilityAccrossDeclarations.types
+++ b/tests/baselines/reference/typeParameterCompatibilityAccrossDeclarations.types
@@ -1,9 +1,7 @@
 === tests/cases/compiler/typeParameterCompatibilityAccrossDeclarations.ts ===
 var a = {
 >a : { x: <T>(y: T) => T; }
->{
-   x: function <T>(y: T): T { return null; }
-} : { x: <T>(y: T) => T; }
+>{   x: function <T>(y: T): T { return null; }} : { x: <T>(y: T) => T; }
 
    x: function <T>(y: T): T { return null; }
 >x : <T>(y: T) => T
@@ -15,9 +13,7 @@ var a = {
 }
 var a2 = {
 >a2 : { x: (y: any) => any; }
->{
-   x: function (y: any): any { return null; }
-} : { x: (y: any) => any; }
+>{   x: function (y: any): any { return null; }} : { x: (y: any) => any; }
 
    x: function (y: any): any { return null; }
 >x : (y: any) => any
diff --git a/tests/baselines/reference/typeParameterWithInvalidConstraintType.errors.txt b/tests/baselines/reference/typeParameterWithInvalidConstraintType.errors.txt
deleted file mode 100644
index 134d3009469..00000000000
--- a/tests/baselines/reference/typeParameterWithInvalidConstraintType.errors.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-==== tests/cases/compiler/typeParameterWithInvalidConstraintType.ts (1 errors) ====
-    class A<T extends T> {
-            ~~~~~~~~~~~
-!!! Constraint of a type parameter cannot reference any type parameter from the same type parameter list.
-        foo() {
-            var x: T;
-            // no error expected below this line
-            var a = x.foo();
-            var b = new x(123);
-            var c = x[1];
-            var d = x();
-        }
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/typeParametersAreIdenticalToThemselves.types b/tests/baselines/reference/typeParametersAreIdenticalToThemselves.types
index 345914d41bf..52b5754854a 100644
--- a/tests/baselines/reference/typeParametersAreIdenticalToThemselves.types
+++ b/tests/baselines/reference/typeParametersAreIdenticalToThemselves.types
@@ -2,46 +2,46 @@
 // type parameters from the same declaration are identical to themself
 
 function foo1<T>(x: T);
->foo1 : { <T>(x: T): any; <T>(x: T): any; }
+>foo1 : typeof foo1
 >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; }
+>foo1 : typeof foo1
 >T : T
 >x : T
 >T : T
 
 function foo1<T>(x: T) { }
->foo1 : { <T>(x: T): any; <T>(x: T): any; }
+>foo1 : typeof foo1
 >T : T
 >x : T
 >T : T
 
 function foo2<T, U>(x: T);
->foo2 : { <T, U>(x: T): any; <T, U>(x: T): any; }
+>foo2 : typeof foo2
 >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; }
+>foo2 : typeof foo2
 >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; }
+>foo2 : typeof foo2
 >T : T
 >U : U
 >x : T
 >T : T
 
 function foo3<T, U>(x: T, y: U) {
->foo3 : <T, U>(x: T, y: U) => void
+>foo3 : typeof foo3
 >T : T
 >U : U
 >x : T
diff --git a/tests/baselines/reference/typeParametersAvailableInNestedScope.types b/tests/baselines/reference/typeParametersAvailableInNestedScope.types
index 71cfde4e72c..8e36eb1ae67 100644
--- a/tests/baselines/reference/typeParametersAvailableInNestedScope.types
+++ b/tests/baselines/reference/typeParametersAvailableInNestedScope.types
@@ -9,10 +9,7 @@ class C<T> {
 
     x = <U>(a: U) => {
 >x : <U>(a: U) => T
-><U>(a: U) => {
-        var y: T;
-        return y;
-    } : <U>(a: U) => T
+><U>(a: U) => {        var y: T;        return y;    } : <U>(a: U) => T
 >U : U
 >a : U
 >U : U
diff --git a/tests/baselines/reference/typeParametersAvailableInNestedScope2.types b/tests/baselines/reference/typeParametersAvailableInNestedScope2.types
index e5aa4282fbd..70b0aa8b691 100644
--- a/tests/baselines/reference/typeParametersAvailableInNestedScope2.types
+++ b/tests/baselines/reference/typeParametersAvailableInNestedScope2.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/types/typeParameters/typeParameterLists/typeParametersAvailableInNestedScope2.ts ===
 function foo<T, U>(x: T, y: U) {
->foo : <T, U>(x: T, y: U) => void
+>foo : typeof foo
 >T : T
 >U : U
 >x : T
diff --git a/tests/baselines/reference/typeQueryWithReservedWords.js b/tests/baselines/reference/typeQueryWithReservedWords.js
deleted file mode 100644
index e6e7f86541b..00000000000
--- a/tests/baselines/reference/typeQueryWithReservedWords.js
+++ /dev/null
@@ -1,29 +0,0 @@
-//// [typeQueryWithReservedWords.ts]
-class Controller {
-    create() {
-    }
-    delete() {
-    }
-    var() {
-    }
-}
-
-interface IScope {
-    create: typeof Controller.prototype.create;  
-    delete: typeof Controller.prototype.delete;  // Should not error
-    var: typeof Controller.prototype.var;        // Should not error
-}
-
-
-//// [typeQueryWithReservedWords.js]
-var Controller = (function () {
-    function Controller() {
-    }
-    Controller.prototype.create = function () {
-    };
-    Controller.prototype.delete = function () {
-    };
-    Controller.prototype.var = function () {
-    };
-    return Controller;
-})();
diff --git a/tests/baselines/reference/typeQueryWithReservedWords.types b/tests/baselines/reference/typeQueryWithReservedWords.types
deleted file mode 100644
index d90b84fa015..00000000000
--- a/tests/baselines/reference/typeQueryWithReservedWords.types
+++ /dev/null
@@ -1,37 +0,0 @@
-=== tests/cases/conformance/types/specifyingTypes/typeQueries/typeQueryWithReservedWords.ts ===
-class Controller {
->Controller : Controller
-
-    create() {
->create : () => void
-    }
-    delete() {
->delete : () => void
-    }
-    var() {
->var : () => void
-    }
-}
-
-interface IScope {
->IScope : IScope
-
-    create: typeof Controller.prototype.create;  
->create : () => void
->Controller : typeof Controller
->prototype : Controller
->create : () => void
-
-    delete: typeof Controller.prototype.delete;  // Should not error
->delete : () => void
->Controller : typeof Controller
->prototype : Controller
->delete : () => void
-
-    var: typeof Controller.prototype.var;        // Should not error
->var : () => void
->Controller : typeof Controller
->prototype : Controller
->var : () => void
-}
-
diff --git a/tests/baselines/reference/typeofClass2.types b/tests/baselines/reference/typeofClass2.types
index 8870d9a5874..cc5fc9b5811 100644
--- a/tests/baselines/reference/typeofClass2.types
+++ b/tests/baselines/reference/typeofClass2.types
@@ -12,20 +12,20 @@ class C {
 >x : any
 
     static foo(x: number);
->foo : { (x: number): any; (x: C): any; }
+>foo : typeof foo
 >x : number
 
     static foo(x: C);
->foo : { (x: number): any; (x: C): any; }
+>foo : typeof foo
 >x : C
 >C : C
 
     static foo(x) { }
->foo : { (x: number): any; (x: C): any; }
+>foo : typeof foo
 >x : any
 
     static bar(x) { }
->bar : (x: any) => void
+>bar : typeof bar
 >x : any
 }
 
@@ -34,7 +34,7 @@ class D extends C {
 >C : C
 
     static baz(x: number) { }
->baz : (x: number) => void
+>baz : typeof baz
 >x : number
 
     foo() { }
diff --git a/tests/baselines/reference/typeofOperatorWithBooleanType.types b/tests/baselines/reference/typeofOperatorWithBooleanType.types
index 74df383985a..859374a4ed9 100644
--- a/tests/baselines/reference/typeofOperatorWithBooleanType.types
+++ b/tests/baselines/reference/typeofOperatorWithBooleanType.types
@@ -4,7 +4,7 @@ var BOOLEAN: boolean;
 >BOOLEAN : boolean
 
 function foo(): boolean { return true; }
->foo : () => boolean
+>foo : typeof foo
 
 class A {
 >A : A
@@ -13,7 +13,7 @@ class A {
 >a : boolean
 
     static foo() { return false; }
->foo : () => boolean
+>foo : typeof foo
 }
 module M {
 >M : typeof M
@@ -64,15 +64,15 @@ var ResultIsString6 = typeof foo();
 >ResultIsString6 : string
 >typeof foo() : string
 >foo() : boolean
->foo : () => boolean
+>foo : typeof foo
 
 var ResultIsString7 = typeof A.foo();
 >ResultIsString7 : string
 >typeof A.foo() : string
 >A.foo() : boolean
->A.foo : () => boolean
+>A.foo : typeof foo
 >A : typeof A
->foo : () => boolean
+>foo : typeof foo
 
 // multiple typeof  operator
 var ResultIsString8 = typeof typeof BOOLEAN;
@@ -92,7 +92,7 @@ typeof BOOLEAN;
 typeof foo();
 >typeof foo() : string
 >foo() : boolean
->foo : () => boolean
+>foo : typeof foo
 
 typeof true, false;
 >typeof true, false : boolean
@@ -126,7 +126,7 @@ z: typeof BOOLEAN;
 
 r: typeof foo;
 >typeof foo : string
->foo : () => boolean
+>foo : typeof foo
 
 var y = { a: true, b: false};
 >y : { a: boolean; b: boolean; }
@@ -148,9 +148,9 @@ z: typeof objA.a;
 
 z: typeof A.foo;
 >typeof A.foo : string
->A.foo : () => boolean
+>A.foo : typeof foo
 >A : typeof A
->foo : () => boolean
+>foo : typeof foo
 
 z: typeof M.n;
 >typeof M.n : string
diff --git a/tests/baselines/reference/typeofOperatorWithNumberType.types b/tests/baselines/reference/typeofOperatorWithNumberType.types
index 43d798d4c8e..575594d96d1 100644
--- a/tests/baselines/reference/typeofOperatorWithNumberType.types
+++ b/tests/baselines/reference/typeofOperatorWithNumberType.types
@@ -8,7 +8,7 @@ var NUMBER1: number[] = [1, 2];
 >[1, 2] : number[]
 
 function foo(): number { return 1; }
->foo : () => number
+>foo : typeof foo
 
 class A {
 >A : A
@@ -17,7 +17,7 @@ class A {
 >a : number
 
     static foo() { return 1; }
->foo : () => number
+>foo : typeof foo
 }
 module M {
 >M : typeof M
@@ -89,15 +89,15 @@ var ResultIsString9 = typeof foo();
 >ResultIsString9 : string
 >typeof foo() : string
 >foo() : number
->foo : () => number
+>foo : typeof foo
 
 var ResultIsString10 = typeof A.foo();
 >ResultIsString10 : string
 >typeof A.foo() : string
 >A.foo() : number
->A.foo : () => number
+>A.foo : typeof foo
 >A : typeof A
->foo : () => number
+>foo : typeof foo
 
 var ResultIsString11 = typeof (NUMBER + NUMBER);
 >ResultIsString11 : string
@@ -139,7 +139,7 @@ typeof NUMBER1;
 typeof foo();
 >typeof foo() : string
 >foo() : number
->foo : () => number
+>foo : typeof foo
 
 typeof objA.a;
 >typeof objA.a : string
@@ -180,7 +180,7 @@ x: typeof NUMBER1;
 
 r: typeof foo;
 >typeof foo : string
->foo : () => number
+>foo : typeof foo
 
 var y = { a: 1, b: 2 };
 >y : { a: number; b: number; }
@@ -202,9 +202,9 @@ z: typeof objA.a;
 
 z: typeof A.foo;
 >typeof A.foo : string
->A.foo : () => number
+>A.foo : typeof foo
 >A : typeof A
->foo : () => number
+>foo : typeof foo
 
 z: typeof M.n;
 >typeof M.n : string
diff --git a/tests/baselines/reference/typeofOperatorWithStringType.types b/tests/baselines/reference/typeofOperatorWithStringType.types
index fe63bc4cd36..568ec34ff00 100644
--- a/tests/baselines/reference/typeofOperatorWithStringType.types
+++ b/tests/baselines/reference/typeofOperatorWithStringType.types
@@ -8,7 +8,7 @@ var STRING1: string[] = ["", "abc"];
 >["", "abc"] : string[]
 
 function foo(): string { return "abc"; }
->foo : () => string
+>foo : typeof foo
 
 class A {
 >A : A
@@ -17,7 +17,7 @@ class A {
 >a : string
 
     static foo() { return ""; }
->foo : () => string
+>foo : typeof foo
 }
 module M {
 >M : typeof M
@@ -89,15 +89,15 @@ var ResultIsString9 = typeof foo();
 >ResultIsString9 : string
 >typeof foo() : string
 >foo() : string
->foo : () => string
+>foo : typeof foo
 
 var ResultIsString10 = typeof A.foo();
 >ResultIsString10 : string
 >typeof A.foo() : string
 >A.foo() : string
->A.foo : () => string
+>A.foo : typeof foo
 >A : typeof A
->foo : () => string
+>foo : typeof foo
 
 var ResultIsString11 = typeof (STRING + STRING);
 >ResultIsString11 : string
@@ -147,7 +147,7 @@ typeof STRING1;
 typeof foo();
 >typeof foo() : string
 >foo() : string
->foo : () => string
+>foo : typeof foo
 
 typeof objA.a, M.n;
 >typeof objA.a, M.n : string
@@ -179,7 +179,7 @@ x: typeof STRING1;
 
 r: typeof foo;
 >typeof foo : string
->foo : () => string
+>foo : typeof foo
 
 var y = { a: "", b: "" };
 >y : { a: string; b: string; }
@@ -201,9 +201,9 @@ z: typeof objA.a;
 
 z: typeof A.foo;
 >typeof A.foo : string
->A.foo : () => string
+>A.foo : typeof foo
 >A : typeof A
->foo : () => string
+>foo : typeof foo
 
 z: typeof M.n;
 >typeof M.n : string
diff --git a/tests/baselines/reference/uncaughtCompilerError1.types b/tests/baselines/reference/uncaughtCompilerError1.types
index 1300915a803..b017471e569 100644
--- a/tests/baselines/reference/uncaughtCompilerError1.types
+++ b/tests/baselines/reference/uncaughtCompilerError1.types
@@ -6,7 +6,7 @@ declare var index, lineTokens, token, tokens;
 >tokens : any
 
 function f() {
->f : () => { appendText: string; advanceCount: number; }
+>f : typeof f
 
     if (lineTokens[index].trim() === '=' && index > 0 && token.type === '' && tokens[index - 1].type === 'attribute.name.html') {
 >lineTokens[index].trim() === '=' && index > 0 && token.type === '' && tokens[index - 1].type === 'attribute.name.html' : boolean
diff --git a/tests/baselines/reference/undefinedArgumentInference.types b/tests/baselines/reference/undefinedArgumentInference.types
index e6c50461aeb..463b3fca1fa 100644
--- a/tests/baselines/reference/undefinedArgumentInference.types
+++ b/tests/baselines/reference/undefinedArgumentInference.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/undefinedArgumentInference.ts ===
 function foo1<T>(f1: { x: T; y: T }): T {
->foo1 : <T>(f1: { x: T; y: T; }) => T
+>foo1 : typeof foo1
 >T : T
 >f1 : { x: T; y: T; }
 >x : T
@@ -17,7 +17,7 @@ function foo1<T>(f1: { x: T; y: T }): T {
 var z1 = foo1({ x: undefined, y: undefined }); 
 >z1 : any
 >foo1({ x: undefined, y: undefined }) : any
->foo1 : <T>(f1: { x: T; y: T; }) => T
+>foo1 : typeof foo1
 >{ x: undefined, y: undefined } : { x: undefined; y: undefined; }
 >x : any
 >undefined : undefined
diff --git a/tests/baselines/reference/undefinedAssignableToEveryType.types b/tests/baselines/reference/undefinedAssignableToEveryType.types
index a32af9cd58f..1037b96976f 100644
--- a/tests/baselines/reference/undefinedAssignableToEveryType.types
+++ b/tests/baselines/reference/undefinedAssignableToEveryType.types
@@ -118,7 +118,7 @@ var q: String = undefined;
 >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
+>foo : typeof foo
 >T : T
 >U : U
 >V : V
diff --git a/tests/baselines/reference/undefinedInferentialTyping.types b/tests/baselines/reference/undefinedInferentialTyping.types
index b5741e4d40f..881ced0fb90 100644
--- a/tests/baselines/reference/undefinedInferentialTyping.types
+++ b/tests/baselines/reference/undefinedInferentialTyping.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/undefinedInferentialTyping.ts ===
 function f<T>(arr: T[], elemnt: T): T {
->f : <T>(arr: T[], elemnt: T) => T
+>f : typeof f
 >T : T
 >arr : T[]
 >T : T
@@ -14,6 +14,6 @@ function f<T>(arr: T[], elemnt: T): T {
 var a = f([], 3); // should be number
 >a : number
 >f([], 3) : number
->f : <T>(arr: T[], elemnt: T) => T
+>f : typeof f
 >[] : number[]
 
diff --git a/tests/baselines/reference/underscoreMapFirst.types b/tests/baselines/reference/underscoreMapFirst.types
index a62d6cc86f5..f4fca3dff69 100644
--- a/tests/baselines/reference/underscoreMapFirst.types
+++ b/tests/baselines/reference/underscoreMapFirst.types
@@ -45,7 +45,7 @@ declare module _ {
 >T : T
     }
     export function pluck<T extends {}>(
->pluck : <T extends {}>(list: Collection<T>, propertyName: string) => any[]
+>pluck : typeof pluck
 >T : T
 
         list: Collection<T>,
@@ -57,7 +57,7 @@ declare module _ {
 >propertyName : string
 
     export function map<T, TResult>(
->map : <T, TResult>(list: List<T>, iterator: ListIterator<T, TResult>, context?: any) => TResult[]
+>map : typeof map
 >T : T
 >TResult : TResult
 
@@ -77,7 +77,7 @@ declare module _ {
 >TResult : TResult
 
     export function first<T>(array: List<T>): T;
->first : <T>(array: List<T>) => T
+>first : typeof first
 >T : T
 >array : List<T>
 >List : List<T>
@@ -132,20 +132,20 @@ class MyView extends View {
 >allSeries : ISeries[][]
 >ISeries : ISeries
 >_.pluck(data, "series") : any[]
->_.pluck : <T extends {}>(list: Collection<T>, propertyName: string) => any[]
+>_.pluck : typeof pluck
 >_ : typeof _
->pluck : <T extends {}>(list: Collection<T>, propertyName: string) => any[]
+>pluck : typeof pluck
 >data : IData[]
 
         return _.map(allSeries, _.first);
 >_.map(allSeries, _.first) : ISeries[]
->_.map : <T, TResult>(list: List<T>, iterator: ListIterator<T, TResult>, context?: any) => TResult[]
+>_.map : typeof map
 >_ : typeof _
->map : <T, TResult>(list: List<T>, iterator: ListIterator<T, TResult>, context?: any) => TResult[]
+>map : typeof map
 >allSeries : ISeries[][]
->_.first : <T>(array: List<T>) => T
+>_.first : typeof first
 >_ : typeof _
->first : <T>(array: List<T>) => T
+>first : typeof first
     }
 }
 
diff --git a/tests/baselines/reference/underscoreTest1.types b/tests/baselines/reference/underscoreTest1.types
index c32162b95a5..75fb30a8a3c 100644
--- a/tests/baselines/reference/underscoreTest1.types
+++ b/tests/baselines/reference/underscoreTest1.types
@@ -5,7 +5,7 @@ declare var $;
 >$ : any
 
 declare function alert(x: string): void;
->alert : (x: string) => void
+>alert : typeof alert
 >x : string
 
 _.each([1, 2, 3], (num) => alert(num.toString()));
@@ -17,7 +17,7 @@ _.each([1, 2, 3], (num) => alert(num.toString()));
 >(num) => alert(num.toString()) : (num: number) => void
 >num : number
 >alert(num.toString()) : void
->alert : (x: string) => void
+>alert : typeof alert
 >num.toString() : string
 >num.toString : (radix?: number) => string
 >num : number
@@ -36,7 +36,7 @@ _.each({ one: 1, two: 2, three: 3 }, (value: number, key?: string) => alert(valu
 >value : number
 >key : string
 >alert(value.toString()) : void
->alert : (x: string) => void
+>alert : typeof alert
 >value.toString() : string
 >value.toString : (radix?: number) => string
 >value : number
@@ -557,11 +557,7 @@ func2();
 
 var buttonView = {
 >buttonView : { label: string; onClick: () => void; onHover: () => void; }
->{
-    label: 'underscore',
-    onClick: function () { alert('clicked: ' + this.label); },
-    onHover: function () { alert('hovering: ' + this.label); }
-} : { label: string; onClick: () => void; onHover: () => void; }
+>{    label: 'underscore',    onClick: function () { alert('clicked: ' + this.label); },    onHover: function () { alert('hovering: ' + this.label); }} : { label: string; onClick: () => void; onHover: () => void; }
 
     label: 'underscore',
 >label : string
@@ -570,7 +566,7 @@ var buttonView = {
 >onClick : () => void
 >function () { alert('clicked: ' + this.label); } : () => void
 >alert('clicked: ' + this.label) : void
->alert : (x: string) => void
+>alert : typeof alert
 >'clicked: ' + this.label : string
 >this.label : any
 >this : any
@@ -580,7 +576,7 @@ var buttonView = {
 >onHover : () => void
 >function () { alert('hovering: ' + this.label); } : () => void
 >alert('hovering: ' + this.label) : void
->alert : (x: string) => void
+>alert : typeof alert
 >'hovering: ' + this.label : string
 >this.label : any
 >this : any
@@ -606,15 +602,11 @@ $('#underscore_button').bind('click', buttonView.onClick);
 
 var fibonacci = _.memoize(function (n) {
 >fibonacci : any
->_.memoize(function (n) {
-    return n < 2 ? n : fibonacci(n - 1) + fibonacci(n - 2);
-}) : (n: any) => any
+>_.memoize(function (n) {    return n < 2 ? n : fibonacci(n - 1) + fibonacci(n - 2);}) : (n: any) => any
 >_.memoize : <T extends Function>(func: T, hashFunction?: Function) => T
 >_ : Static
 >memoize : <T extends Function>(func: T, hashFunction?: Function) => T
->function (n) {
-    return n < 2 ? n : fibonacci(n - 1) + fibonacci(n - 2);
-} : (n: any) => any
+>function (n) {    return n < 2 ? n : fibonacci(n - 1) + fibonacci(n - 2);} : (n: any) => any
 >n : any
 
     return n < 2 ? n : fibonacci(n - 1) + fibonacci(n - 2);
@@ -659,13 +651,13 @@ _.defer(function () { alert('deferred'); });
 >defer : (func: Function, ...args: any[]) => number
 >function () { alert('deferred'); } : () => void
 >alert('deferred') : void
->alert : (x: string) => void
+>alert : typeof alert
 
 var updatePosition = () => alert('updating position...');
 >updatePosition : () => void
 >() => alert('updating position...') : () => void
 >alert('updating position...') : void
->alert : (x: string) => void
+>alert : typeof alert
 
 var throttled = _.throttle(updatePosition, 100);
 >throttled : () => void
@@ -687,7 +679,7 @@ var calculateLayout = () => alert('calculating layout...');
 >calculateLayout : () => void
 >() => alert('calculating layout...') : () => void
 >alert('calculating layout...') : void
->alert : (x: string) => void
+>alert : typeof alert
 
 var lazyLayout = _.debounce(calculateLayout, 300);
 >lazyLayout : () => void
@@ -709,7 +701,7 @@ var createApplication = () => alert('creating application...');
 >createApplication : () => void
 >() => alert('creating application...') : () => void
 >alert('creating application...') : void
->alert : (x: string) => void
+>alert : typeof alert
 
 var initialize = _.once(createApplication);
 >initialize : () => void
@@ -734,7 +726,7 @@ var render = () => alert("rendering...");
 >render : () => void
 >() => alert("rendering...") : () => void
 >alert("rendering...") : void
->alert : (x: string) => void
+>alert : typeof alert
 
 var renderNotes = _.after(notes.length, render);
 >renderNotes : () => void
@@ -921,34 +913,14 @@ _.clone({ name: 'moe' });
 >name : string
 
 _.chain([1, 2, 3, 200])
->_.chain([1, 2, 3, 200])
-    .filter(function (num) { return num % 2 == 0; })
-    .tap(<any>alert)
-    .map(function (num) { return num * num })
-    .value() : number[]
->_.chain([1, 2, 3, 200])
-    .filter(function (num) { return num % 2 == 0; })
-    .tap(<any>alert)
-    .map(function (num) { return num * num })
-    .value : () => number[]
->_.chain([1, 2, 3, 200])
-    .filter(function (num) { return num % 2 == 0; })
-    .tap(<any>alert)
-    .map(function (num) { return num * num }) : ChainedArray<number>
->_.chain([1, 2, 3, 200])
-    .filter(function (num) { return num % 2 == 0; })
-    .tap(<any>alert)
-    .map : <U>(iterator: Iterator<number, U>, context?: any) => ChainedArray<U>
->_.chain([1, 2, 3, 200])
-    .filter(function (num) { return num % 2 == 0; })
-    .tap(<any>alert) : ChainedArray<number>
->_.chain([1, 2, 3, 200])
-    .filter(function (num) { return num % 2 == 0; })
-    .tap : (interceptor: (object: number[]) => void) => ChainedArray<number>
->_.chain([1, 2, 3, 200])
-    .filter(function (num) { return num % 2 == 0; }) : ChainedArray<number>
->_.chain([1, 2, 3, 200])
-    .filter : (iterator: Iterator<number, boolean>, context?: any) => ChainedArray<number>
+>_.chain([1, 2, 3, 200])    .filter(function (num) { return num % 2 == 0; })    .tap(<any>alert)    .map(function (num) { return num * num })    .value() : number[]
+>_.chain([1, 2, 3, 200])    .filter(function (num) { return num % 2 == 0; })    .tap(<any>alert)    .map(function (num) { return num * num })    .value : () => number[]
+>_.chain([1, 2, 3, 200])    .filter(function (num) { return num % 2 == 0; })    .tap(<any>alert)    .map(function (num) { return num * num }) : ChainedArray<number>
+>_.chain([1, 2, 3, 200])    .filter(function (num) { return num % 2 == 0; })    .tap(<any>alert)    .map : <U>(iterator: Iterator<number, U>, context?: any) => ChainedArray<U>
+>_.chain([1, 2, 3, 200])    .filter(function (num) { return num % 2 == 0; })    .tap(<any>alert) : ChainedArray<number>
+>_.chain([1, 2, 3, 200])    .filter(function (num) { return num % 2 == 0; })    .tap : (interceptor: (object: number[]) => void) => ChainedArray<number>
+>_.chain([1, 2, 3, 200])    .filter(function (num) { return num % 2 == 0; }) : ChainedArray<number>
+>_.chain([1, 2, 3, 200])    .filter : (iterator: Iterator<number, boolean>, context?: any) => ChainedArray<number>
 >_.chain([1, 2, 3, 200]) : ChainedArray<number>
 >_.chain : { <T>(list: T[]): ChainedArray<T>; <T>(list: Dictionary<T>): ChainedDictionary<T>; <T>(obj: T): ChainedObject<T>; }
 >_ : Static
@@ -966,7 +938,7 @@ _.chain([1, 2, 3, 200])
     .tap(<any>alert)
 >tap : (interceptor: (object: number[]) => void) => ChainedArray<number>
 ><any>alert : any
->alert : (x: string) => void
+>alert : typeof alert
 
     .map(function (num) { return num * num })
 >map : <U>(iterator: Iterator<number, U>, context?: any) => ChainedArray<U>
@@ -1083,7 +1055,7 @@ _.isFunction(alert);
 >_.isFunction : (object: any) => boolean
 >_ : Static
 >isFunction : (object: any) => boolean
->alert : (x: string) => void
+>alert : typeof alert
 
 _.isString("moe");
 >_.isString("moe") : boolean
@@ -1132,7 +1104,6 @@ _.isRegExp(/moe/);
 >_.isRegExp : (object: any) => boolean
 >_ : Static
 >isRegExp : (object: any) => boolean
->/moe/ : RegExp
 
 _.isNaN(NaN);
 >_.isNaN(NaN) : boolean
@@ -1143,7 +1114,7 @@ _.isNaN(NaN);
 
 isNaN(undefined);
 >isNaN(undefined) : boolean
->isNaN : (number: number) => boolean
+>isNaN : typeof isNaN
 >undefined : undefined
 
 _.isNaN(undefined);
@@ -1222,25 +1193,15 @@ _.random(0, 100);
 >random : { (max: number): number; (min: number, max: number): number; }
 
 _.mixin({
->_.mixin({
-    capitalize: function (string) {
-        return string.charAt(0).toUpperCase() + string.substring(1).toLowerCase();
-    }
-}) : void
+>_.mixin({    capitalize: function (string) {        return string.charAt(0).toUpperCase() + string.substring(1).toLowerCase();    }}) : void
 >_.mixin : (object: any) => void
 >_ : Static
 >mixin : (object: any) => void
->{
-    capitalize: function (string) {
-        return string.charAt(0).toUpperCase() + string.substring(1).toLowerCase();
-    }
-} : { capitalize: (string: any) => any; }
+>{    capitalize: function (string) {        return string.charAt(0).toUpperCase() + string.substring(1).toLowerCase();    }} : { capitalize: (string: any) => any; }
 
     capitalize: function (string) {
 >capitalize : (string: any) => any
->function (string) {
-        return string.charAt(0).toUpperCase() + string.substring(1).toLowerCase();
-    } : (string: any) => any
+>function (string) {        return string.charAt(0).toUpperCase() + string.substring(1).toLowerCase();    } : (string: any) => any
 >string : any
 
         return string.charAt(0).toUpperCase() + string.substring(1).toLowerCase();
@@ -1356,19 +1317,14 @@ compiled2({ epithet: "stooge" });
 >epithet : string
 
 _.templateSettings = {
->_.templateSettings = {
-    interpolate: /\{\{(.+?)\}\}/g
-} : { interpolate: RegExp; }
+>_.templateSettings = {    interpolate: /\{\{(.+?)\}\}/g} : { interpolate: RegExp; }
 >_.templateSettings : TemplateSettings
 >_ : Static
 >templateSettings : TemplateSettings
->{
-    interpolate: /\{\{(.+?)\}\}/g
-} : { interpolate: RegExp; }
+>{    interpolate: /\{\{(.+?)\}\}/g} : { interpolate: RegExp; }
 
     interpolate: /\{\{(.+?)\}\}/g
 >interpolate : RegExp
->/\{\{(.+?)\}\}/g : RegExp
 
 };
 var template2 = _.template("Hello {{ name }}!");
diff --git a/tests/baselines/reference/untypedArgumentInLambdaExpression.types b/tests/baselines/reference/untypedArgumentInLambdaExpression.types
index 30c7d694269..f400a0525c9 100644
--- a/tests/baselines/reference/untypedArgumentInLambdaExpression.types
+++ b/tests/baselines/reference/untypedArgumentInLambdaExpression.types
@@ -1,17 +1,13 @@
 === tests/cases/compiler/untypedArgumentInLambdaExpression.ts ===
 declare function f(fn: (a: string) => string);
->f : (fn: (a: string) => string) => any
+>f : typeof f
 >fn : (a: string) => string
 >a : string
  
 f((input): string => {
->f((input): string => {
-    return "." + input;
-}) : any
->f : (fn: (a: string) => string) => any
->(input): string => {
-    return "." + input;
-} : (input: string) => string
+>f((input): string => {    return "." + input;}) : any
+>f : typeof f
+>(input): string => {    return "." + input;} : (input: string) => string
 >input : string
 
     return "." + input;
diff --git a/tests/baselines/reference/unusedImportDeclaration.js b/tests/baselines/reference/unusedImportDeclaration.js
index 54885f09e36..1faff01d197 100644
--- a/tests/baselines/reference/unusedImportDeclaration.js
+++ b/tests/baselines/reference/unusedImportDeclaration.js
@@ -27,11 +27,3 @@ var thingy = {
     me: "A"
 };
 foo("IN " + thingy.me + "!");
-
-
-//// [unusedImportDeclaration_testerB.d.ts]
-declare class TesterB {
-    me: string;
-}
-export = TesterB;
-//// [unusedImportDeclaration_testerA.d.ts]
diff --git a/tests/baselines/reference/unusedImportDeclaration.types b/tests/baselines/reference/unusedImportDeclaration.types
index 0f95301da7f..2433bf7c7aa 100644
--- a/tests/baselines/reference/unusedImportDeclaration.types
+++ b/tests/baselines/reference/unusedImportDeclaration.types
@@ -5,21 +5,19 @@ import B = require("unusedImportDeclaration_testerB");
 var thingy: B = {
 >thingy : TesterB
 >B : TesterB
->{
-    me: "A"
-} : { me: string; }
+>{    me: "A"} : { me: string; }
 
     me: "A"
 >me : string
 
 };
 declare function foo(a: string): void;
->foo : (a: string) => void
+>foo : typeof foo
 >a : string
 
 foo("IN " + thingy.me + "!");
 >foo("IN " + thingy.me + "!") : void
->foo : (a: string) => void
+>foo : typeof foo
 >"IN " + thingy.me + "!" : string
 >"IN " + thingy.me : string
 >thingy.me : string
diff --git a/tests/baselines/reference/validMultipleVariableDeclarations.types b/tests/baselines/reference/validMultipleVariableDeclarations.types
index 0e25906aac4..60e7cebb491 100644
--- a/tests/baselines/reference/validMultipleVariableDeclarations.types
+++ b/tests/baselines/reference/validMultipleVariableDeclarations.types
@@ -21,7 +21,7 @@ var x = <number>undefined;
 
 // new declaration space, making redeclaring x as a string valid
 function declSpace() {
->declSpace : () => void
+>declSpace : typeof declSpace
 
     var x = 'this is a string';
 >x : string
diff --git a/tests/baselines/reference/validUndefinedAssignments.types b/tests/baselines/reference/validUndefinedAssignments.types
index b48b6072e34..84e9848c5b9 100644
--- a/tests/baselines/reference/validUndefinedAssignments.types
+++ b/tests/baselines/reference/validUndefinedAssignments.types
@@ -61,7 +61,7 @@ var h: { f(): void } = x;
 >x : any
 
 function i<T>(a: T) {
->i : <T>(a: T) => void
+>i : typeof i
 >T : T
 >a : T
 >T : T
diff --git a/tests/baselines/reference/varArgParamTypeCheck.types b/tests/baselines/reference/varArgParamTypeCheck.types
index 00060143356..bd342bb79d9 100644
--- a/tests/baselines/reference/varArgParamTypeCheck.types
+++ b/tests/baselines/reference/varArgParamTypeCheck.types
@@ -1,53 +1,31 @@
 === tests/cases/compiler/varArgParamTypeCheck.ts ===
 function sequence(...sequences:{():void;}[]) {
->sequence : (...sequences: { (): void; }[]) => void
+>sequence : typeof sequence
 >sequences : { (): void; }[]
 }
 
 function callback(clb:()=>void) {
->callback : (clb: () => void) => void
+>callback : typeof callback
 >clb : () => void
 }
 
 sequence(
->sequence(
-    function bar() {
-    },
-    function foo() {
-        callback(()=>{
-            this();
-        });
-    },
-    function baz() {
-        callback(()=>{
-            this();
-        });
-    }
-) : void
->sequence : (...sequences: { (): void; }[]) => void
+>sequence(    function bar() {    },    function foo() {        callback(()=>{            this();        });    },    function baz() {        callback(()=>{            this();        });    }) : void
+>sequence : typeof sequence
 
     function bar() {
->function bar() {
-    } : () => void
+>function bar() {    } : () => void
 >bar : () => void
 
     },
     function foo() {
->function foo() {
-        callback(()=>{
-            this();
-        });
-    } : () => void
+>function foo() {        callback(()=>{            this();        });    } : () => void
 >foo : () => void
 
         callback(()=>{
->callback(()=>{
-            this();
-        }) : void
->callback : (clb: () => void) => void
->()=>{
-            this();
-        } : () => void
+>callback(()=>{            this();        }) : void
+>callback : typeof callback
+>()=>{            this();        } : () => void
 
             this();
 >this() : any
@@ -56,21 +34,13 @@ sequence(
         });
     },
     function baz() {
->function baz() {
-        callback(()=>{
-            this();
-        });
-    } : () => void
+>function baz() {        callback(()=>{            this();        });    } : () => void
 >baz : () => void
 
         callback(()=>{
->callback(()=>{
-            this();
-        }) : void
->callback : (clb: () => void) => void
->()=>{
-            this();
-        } : () => void
+>callback(()=>{            this();        }) : void
+>callback : typeof callback
+>()=>{            this();        } : () => void
 
             this();
 >this() : any
diff --git a/tests/baselines/reference/varInFunctionInVarInitializer.types b/tests/baselines/reference/varInFunctionInVarInitializer.types
index ea7dd618ea8..6503bce63a5 100644
--- a/tests/baselines/reference/varInFunctionInVarInitializer.types
+++ b/tests/baselines/reference/varInFunctionInVarInitializer.types
@@ -1,10 +1,7 @@
 === tests/cases/compiler/varInFunctionInVarInitializer.ts ===
 var a = function () {
 >a : () => number
->function () {
-    var c = 1;
-    return c;
-} : () => number
+>function () {    var c = 1;    return c;} : () => number
 
     var c = 1;
 >c : number
diff --git a/tests/baselines/reference/vardecl.types b/tests/baselines/reference/vardecl.types
index f757562c103..714a721602e 100644
--- a/tests/baselines/reference/vardecl.types
+++ b/tests/baselines/reference/vardecl.types
@@ -220,7 +220,7 @@ var z;
 >z : any
 
 function foo(a2) {
->foo : (a2: any) => void
+>foo : typeof foo
 >a2 : any
 
     var a = 10;
diff --git a/tests/baselines/reference/variableDeclarator1.types b/tests/baselines/reference/variableDeclarator1.types
index 433f7cf732b..ead84b9d8d6 100644
--- a/tests/baselines/reference/variableDeclarator1.types
+++ b/tests/baselines/reference/variableDeclarator1.types
@@ -1,10 +1,7 @@
 === tests/cases/compiler/variableDeclarator1.ts ===
 var a = function () {
 >a : () => number
->function () {
-        var c = 1;
-        return c;
-    } : () => number
+>function () {        var c = 1;        return c;    } : () => number
 
         var c = 1;
 >c : number
diff --git a/tests/baselines/reference/visibilityOfCrossModuleTypeUsage.types b/tests/baselines/reference/visibilityOfCrossModuleTypeUsage.types
index 1e75bcb819a..c9df8d9ca1b 100644
--- a/tests/baselines/reference/visibilityOfCrossModuleTypeUsage.types
+++ b/tests/baselines/reference/visibilityOfCrossModuleTypeUsage.types
@@ -3,7 +3,7 @@ import commands = require('visibilityOfCrossModuleTypeUsage_commands');
 >commands : typeof "tests/cases/compiler/visibilityOfCrossModuleTypeUsage_commands"
 
 function run(configuration: commands.IConfiguration) {
->run : (configuration: IConfiguration) => void
+>run : typeof run
 >configuration : IConfiguration
 >commands : commands
 >IConfiguration : IConfiguration
diff --git a/tests/baselines/reference/voidFunctionAssignmentCompat.types b/tests/baselines/reference/voidFunctionAssignmentCompat.types
index 86e69c278c8..8da295f13bc 100644
--- a/tests/baselines/reference/voidFunctionAssignmentCompat.types
+++ b/tests/baselines/reference/voidFunctionAssignmentCompat.types
@@ -18,7 +18,7 @@ fv = function() { return 0; } // should work
 >function() { return 0; } : () => number
 
 function execAny(callback:(val:any)=>any) { return callback(0) }
->execAny : (callback: (val: any) => any) => any
+>execAny : typeof execAny
 >callback : (val: any) => any
 >val : any
 >callback(0) : any
@@ -26,11 +26,11 @@ function execAny(callback:(val:any)=>any) { return callback(0) }
 
 execAny(function () {}); // should work
 >execAny(function () {}) : any
->execAny : (callback: (val: any) => any) => any
+>execAny : typeof execAny
 >function () {} : () => void
 
 function execVoid(callback:(val:any)=>void) { callback(0); }
->execVoid : (callback: (val: any) => void) => void
+>execVoid : typeof execVoid
 >callback : (val: any) => void
 >val : any
 >callback(0) : void
@@ -38,7 +38,7 @@ function execVoid(callback:(val:any)=>void) { callback(0); }
 
 execVoid(function () {return 0;}); // should work
 >execVoid(function () {return 0;}) : void
->execVoid : (callback: (val: any) => void) => void
+>execVoid : typeof execVoid
 >function () {return 0;} : () => number
 
 var fra: (v:any)=>any = function() { return function () {}; } // should work
diff --git a/tests/baselines/reference/voidOperatorWithBooleanType.types b/tests/baselines/reference/voidOperatorWithBooleanType.types
index 88859c20378..83167141dd1 100644
--- a/tests/baselines/reference/voidOperatorWithBooleanType.types
+++ b/tests/baselines/reference/voidOperatorWithBooleanType.types
@@ -4,7 +4,7 @@ var BOOLEAN: boolean;
 >BOOLEAN : boolean
 
 function foo(): boolean { return true; }
->foo : () => boolean
+>foo : typeof foo
 
 class A {
 >A : A
@@ -13,7 +13,7 @@ class A {
 >a : boolean
 
     static foo() { return false; }
->foo : () => boolean
+>foo : typeof foo
 }
 module M {
 >M : typeof M
@@ -64,15 +64,15 @@ var ResultIsAny6 = void foo();
 >ResultIsAny6 : any
 >void foo() : undefined
 >foo() : boolean
->foo : () => boolean
+>foo : typeof foo
 
 var ResultIsAny7 = void A.foo();
 >ResultIsAny7 : any
 >void A.foo() : undefined
 >A.foo() : boolean
->A.foo : () => boolean
+>A.foo : typeof foo
 >A : typeof A
->foo : () => boolean
+>foo : typeof foo
 
 // multiple void  operator
 var ResultIsAny8 = void void BOOLEAN;
@@ -92,7 +92,7 @@ void BOOLEAN;
 void foo();
 >void foo() : undefined
 >foo() : boolean
->foo : () => boolean
+>foo : typeof foo
 
 void true, false;
 >void true, false : boolean
diff --git a/tests/baselines/reference/voidOperatorWithNumberType.types b/tests/baselines/reference/voidOperatorWithNumberType.types
index 5669709e24b..8b3c6bf0453 100644
--- a/tests/baselines/reference/voidOperatorWithNumberType.types
+++ b/tests/baselines/reference/voidOperatorWithNumberType.types
@@ -8,7 +8,7 @@ var NUMBER1: number[] = [1, 2];
 >[1, 2] : number[]
 
 function foo(): number { return 1; }
->foo : () => number
+>foo : typeof foo
 
 class A {
 >A : A
@@ -17,7 +17,7 @@ class A {
 >a : number
 
     static foo() { return 1; }
->foo : () => number
+>foo : typeof foo
 }
 module M {
 >M : typeof M
@@ -89,15 +89,15 @@ var ResultIsAny9 = void foo();
 >ResultIsAny9 : any
 >void foo() : undefined
 >foo() : number
->foo : () => number
+>foo : typeof foo
 
 var ResultIsAny10 = void A.foo();
 >ResultIsAny10 : any
 >void A.foo() : undefined
 >A.foo() : number
->A.foo : () => number
+>A.foo : typeof foo
 >A : typeof A
->foo : () => number
+>foo : typeof foo
 
 var ResultIsAny11 = void (NUMBER + NUMBER);
 >ResultIsAny11 : any
@@ -139,7 +139,7 @@ void NUMBER1;
 void foo();
 >void foo() : undefined
 >foo() : number
->foo : () => number
+>foo : typeof foo
 
 void objA.a;
 >void objA.a : undefined
diff --git a/tests/baselines/reference/voidOperatorWithStringType.types b/tests/baselines/reference/voidOperatorWithStringType.types
index cb2dc7cb490..520fab3e557 100644
--- a/tests/baselines/reference/voidOperatorWithStringType.types
+++ b/tests/baselines/reference/voidOperatorWithStringType.types
@@ -8,7 +8,7 @@ var STRING1: string[] = ["", "abc"];
 >["", "abc"] : string[]
 
 function foo(): string { return "abc"; }
->foo : () => string
+>foo : typeof foo
 
 class A {
 >A : A
@@ -17,7 +17,7 @@ class A {
 >a : string
 
     static foo() { return ""; }
->foo : () => string
+>foo : typeof foo
 }
 module M {
 >M : typeof M
@@ -89,15 +89,15 @@ var ResultIsAny9 = void foo();
 >ResultIsAny9 : any
 >void foo() : undefined
 >foo() : string
->foo : () => string
+>foo : typeof foo
 
 var ResultIsAny10 = void A.foo();
 >ResultIsAny10 : any
 >void A.foo() : undefined
 >A.foo() : string
->A.foo : () => string
+>A.foo : typeof foo
 >A : typeof A
->foo : () => string
+>foo : typeof foo
 
 var ResultIsAny11 = void (STRING + STRING);
 >ResultIsAny11 : any
@@ -147,7 +147,7 @@ void STRING1;
 void foo();
 >void foo() : undefined
 >foo() : string
->foo : () => string
+>foo : typeof foo
 
 void objA.a,M.n;
 >void objA.a,M.n : string
diff --git a/tests/baselines/reference/voidReturnLambdaValue.types b/tests/baselines/reference/voidReturnLambdaValue.types
index 0e524460a0c..70ba206c6e1 100644
--- a/tests/baselines/reference/voidReturnLambdaValue.types
+++ b/tests/baselines/reference/voidReturnLambdaValue.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/voidReturnLambdaValue.ts ===
 function foo(arg1, arg2, callback:(v1,v2,v3) => void):void {
->foo : (arg1: any, arg2: any, callback: (v1: any, v2: any, v3: any) => void) => void
+>foo : typeof foo
 >arg1 : any
 >arg2 : any
 >callback : (v1: any, v2: any, v3: any) => void
diff --git a/tests/baselines/reference/withImportDecl.types b/tests/baselines/reference/withImportDecl.types
index 792b237d9fb..e97dbf5bb01 100644
--- a/tests/baselines/reference/withImportDecl.types
+++ b/tests/baselines/reference/withImportDecl.types
@@ -40,14 +40,10 @@ var arrayVar: string[] = ['a', 'b'];
 
 
 function simpleFunction() {
->simpleFunction : () => { x: string; y: string; n: number; }
+>simpleFunction : typeof simpleFunction
 
     return {
->{
-        x: "Hello",
-        y: "word",
-        n: 2
-    } : { x: string; y: string; n: number; }
+>{        x: "Hello",        y: "word",        n: 2    } : { x: string; y: string; n: number; }
 
         x: "Hello",
 >x : string
@@ -65,7 +61,7 @@ module m1 {
 >m1 : typeof m1
 
     export function foo() {
->foo : () => string
+>foo : typeof foo
 
         return "Hello";
     }
diff --git a/tests/cases/compiler/accessorParameterAccessibilityModifier.ts b/tests/cases/compiler/accessorParameterAccessibilityModifier.ts
index 9d6ec6870f1..3f258ac2a8f 100644
--- a/tests/cases/compiler/accessorParameterAccessibilityModifier.ts
+++ b/tests/cases/compiler/accessorParameterAccessibilityModifier.ts
@@ -1,4 +1,4 @@
-// @target: es5
+// target: es5
 
 class C {
     set X(public v) { }
diff --git a/tests/cases/compiler/accessorWithInitializer.ts b/tests/cases/compiler/accessorWithInitializer.ts
index cdb63475adf..345b1a8da55 100644
--- a/tests/cases/compiler/accessorWithInitializer.ts
+++ b/tests/cases/compiler/accessorWithInitializer.ts
@@ -1,4 +1,4 @@
-// @target: es5
+// target: es5
 
 class C {
     set X(v = 0) { }
diff --git a/tests/cases/compiler/accessorWithRestParam.ts b/tests/cases/compiler/accessorWithRestParam.ts
index 015846a4aaa..22ab316e354 100644
--- a/tests/cases/compiler/accessorWithRestParam.ts
+++ b/tests/cases/compiler/accessorWithRestParam.ts
@@ -1,5 +1,3 @@
-// @target: es5
-
 class C {
     set X(...v) { }
     static set X(...v2) { }
diff --git a/tests/cases/compiler/aliasInaccessibleModule.ts b/tests/cases/compiler/aliasInaccessibleModule.ts
index 91f36d9d118..f1037fb7652 100644
--- a/tests/cases/compiler/aliasInaccessibleModule.ts
+++ b/tests/cases/compiler/aliasInaccessibleModule.ts
@@ -1,4 +1,3 @@
-// @declaration: true
 module M {
     module N {
     }
diff --git a/tests/cases/compiler/aliasInaccessibleModule2.ts b/tests/cases/compiler/aliasInaccessibleModule2.ts
index d970db79538..7932d775d27 100644
--- a/tests/cases/compiler/aliasInaccessibleModule2.ts
+++ b/tests/cases/compiler/aliasInaccessibleModule2.ts
@@ -1,4 +1,3 @@
-// @declaration: true
 module M {
     module N {
         class C {
diff --git a/tests/cases/compiler/aliasUsageInAccessorsOfClass.ts b/tests/cases/compiler/aliasUsageInAccessorsOfClass.ts
index 2aeddbad947..fc86451358a 100644
--- a/tests/cases/compiler/aliasUsageInAccessorsOfClass.ts
+++ b/tests/cases/compiler/aliasUsageInAccessorsOfClass.ts
@@ -1,5 +1,4 @@
 //@module: commonjs
-// @target: ES5
 // @Filename: aliasUsage1_backbone.ts
 export class Model {
     public someData: string;
diff --git a/tests/cases/compiler/ambientExternalModuleWithRelativeModuleName.ts b/tests/cases/compiler/ambientExternalModuleWithRelativeModuleName.ts
index 69f585db5f5..25b0a04161d 100644
--- a/tests/cases/compiler/ambientExternalModuleWithRelativeModuleName.ts
+++ b/tests/cases/compiler/ambientExternalModuleWithRelativeModuleName.ts
@@ -1,7 +1,3 @@
 declare module "./relativeModule" {
     var x: string;
-}
-
-declare module ".\\relativeModule" {
-    var x: string;
 }
\ No newline at end of file
diff --git a/tests/cases/compiler/ambientGetters.ts b/tests/cases/compiler/ambientGetters.ts
index 401eacf9066..2c06a9d5b79 100644
--- a/tests/cases/compiler/ambientGetters.ts
+++ b/tests/cases/compiler/ambientGetters.ts
@@ -1,5 +1,3 @@
-// @target: es5
-
 declare class A {
     get length() : number;
 }
diff --git a/tests/cases/compiler/amdDependencyComment2.ts b/tests/cases/compiler/amdDependencyComment2.ts
deleted file mode 100644
index 2b60327856f..00000000000
--- a/tests/cases/compiler/amdDependencyComment2.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-//@module: amd
-///<amd-dependency path='bar'/>
-
-import m1 = require("m2")
-m1.f();
\ No newline at end of file
diff --git a/tests/cases/compiler/arrowFunctionMissingCurlyWithSemicolon.ts b/tests/cases/compiler/arrowFunctionMissingCurlyWithSemicolon.ts
deleted file mode 100644
index 67e2e6110f9..00000000000
--- a/tests/cases/compiler/arrowFunctionMissingCurlyWithSemicolon.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-// Should error at semicolon.
-var f = () => ;
-var b = 1 * 2 * 3 * 4;
-var square = (x: number) => x * x;
\ No newline at end of file
diff --git a/tests/cases/compiler/arrowFunctionsMissingTokens.ts b/tests/cases/compiler/arrowFunctionsMissingTokens.ts
deleted file mode 100644
index bd3e25d56b4..00000000000
--- a/tests/cases/compiler/arrowFunctionsMissingTokens.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-
-module missingArrowsWithCurly {
-    var a = () { };
-
-    var b = (): void { }
-
-    var c = (x) { };
-
-    var d = (x: number, y: string) { };
-
-    var e = (x: number, y: string): void { };
-}
-
-module missingCurliesWithArrow {
-    module withStatement {
-        var a = () => var k = 10;};
-
-        var b = (): void => var k = 10;}
-
-        var c = (x) => var k = 10;};
-
-        var d = (x: number, y: string) => var k = 10;};
-
-        var e = (x: number, y: string): void => var k = 10;};
-
-        var f = () => var k = 10;}
-    }
-
-    module withoutStatement {
-        var a = () => };
-
-        var b = (): void => }
-
-        var c = (x) => };
-
-        var d = (x: number, y: string) => };
-
-        var e = (x: number, y: string): void => };
-
-        var f = () => }
-    }
-}
-
-module ce_nEst_pas_une_arrow_function {
-    var a = ();
-
-    var b = (): void;
-
-    var c = (x);
-
-    var d = (x: number, y: string);
-
-    var e = (x: number, y: string): void;
-}
-
-module okay {
-    var a = () => { };
-
-    var b = (): void => { }
-
-    var c = (x) => { };
-
-    var d = (x: number, y: string) => { };
-
-    var e = (x: number, y: string): void => { };
-}
\ No newline at end of file
diff --git a/tests/cases/compiler/asiAmbientFunctionDeclaration.ts b/tests/cases/compiler/asiAmbientFunctionDeclaration.ts
deleted file mode 100644
index c29d38a8990..00000000000
--- a/tests/cases/compiler/asiAmbientFunctionDeclaration.ts
+++ /dev/null
@@ -1 +0,0 @@
-declare function foo()
\ No newline at end of file
diff --git a/tests/cases/compiler/asiBreak.ts b/tests/cases/compiler/asiBreak.ts
deleted file mode 100644
index ee846ec1018..00000000000
--- a/tests/cases/compiler/asiBreak.ts
+++ /dev/null
@@ -1 +0,0 @@
-while (true) break
\ No newline at end of file
diff --git a/tests/cases/compiler/asiContinue.ts b/tests/cases/compiler/asiContinue.ts
deleted file mode 100644
index 6c0ddd398ba..00000000000
--- a/tests/cases/compiler/asiContinue.ts
+++ /dev/null
@@ -1 +0,0 @@
-while (true) continue
\ No newline at end of file
diff --git a/tests/cases/compiler/asiReturn.ts b/tests/cases/compiler/asiReturn.ts
deleted file mode 100644
index 4e3f11d8375..00000000000
--- a/tests/cases/compiler/asiReturn.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-// This should be an error for using a return outside a function, but ASI should work properly
-return
\ No newline at end of file
diff --git a/tests/cases/compiler/assignmentCompatability24.ts b/tests/cases/compiler/assignmentCompatability24.ts
index 75d977b4081..2ed697f0e94 100644
--- a/tests/cases/compiler/assignmentCompatability24.ts
+++ b/tests/cases/compiler/assignmentCompatability24.ts
@@ -3,7 +3,7 @@ module __test1__ {
     export var __val__obj4 = obj4;
 }
 module __test2__ {
-    export var obj = function f<Tstring>(a: Tstring) { return a; };;
+    export var obj = function f<string>(a: string) { return a; };;
     export var __val__obj = obj;
 }
 __test2__.__val__obj = __test1__.__val__obj4
\ No newline at end of file
diff --git a/tests/cases/compiler/assignmentCompatability33.ts b/tests/cases/compiler/assignmentCompatability33.ts
index 12f28fbed60..fb500f9b767 100644
--- a/tests/cases/compiler/assignmentCompatability33.ts
+++ b/tests/cases/compiler/assignmentCompatability33.ts
@@ -3,7 +3,7 @@ module __test1__ {
     export var __val__obj4 = obj4;
 }
 module __test2__ {
-    export var obj: { <Tstring>(a: Tstring): Tstring; };
+    export var obj: { <string>(a: string): string; };
     export var __val__obj = obj;
 }
 __test2__.__val__obj = __test1__.__val__obj4
\ No newline at end of file
diff --git a/tests/cases/compiler/assignmentCompatability34.ts b/tests/cases/compiler/assignmentCompatability34.ts
index 32aa07e9949..9d0af77a3f5 100644
--- a/tests/cases/compiler/assignmentCompatability34.ts
+++ b/tests/cases/compiler/assignmentCompatability34.ts
@@ -3,7 +3,7 @@ module __test1__ {
     export var __val__obj4 = obj4;
 }
 module __test2__ {
-    export var obj: { <Tnumber>(a:Tnumber):Tnumber;};
+    export var obj: { <number>(a:number):number;};
     export var __val__obj = obj;
 }
 __test2__.__val__obj = __test1__.__val__obj4
\ No newline at end of file
diff --git a/tests/cases/compiler/assignmentCompatability37.ts b/tests/cases/compiler/assignmentCompatability37.ts
index 23cfabb1d03..b7cb25d4219 100644
--- a/tests/cases/compiler/assignmentCompatability37.ts
+++ b/tests/cases/compiler/assignmentCompatability37.ts
@@ -3,7 +3,7 @@ module __test1__ {
     export var __val__obj4 = obj4;
 }
 module __test2__ {
-    export var aa:{ new <Tnumber>(param: Tnumber); };;
+    export var aa:{ new <number>(param: number); };;
     export var __val__aa = aa;
 }
 __test2__.__val__aa = __test1__.__val__obj4
\ No newline at end of file
diff --git a/tests/cases/compiler/assignmentCompatability38.ts b/tests/cases/compiler/assignmentCompatability38.ts
index c7fc9970e0d..0845b811c2a 100644
--- a/tests/cases/compiler/assignmentCompatability38.ts
+++ b/tests/cases/compiler/assignmentCompatability38.ts
@@ -3,7 +3,7 @@ module __test1__ {
     export var __val__obj4 = obj4;
 }
 module __test2__ {
-    export var aa:{ new <Tstring>(param: Tstring); };;
+    export var aa:{ new <string>(param: string); };;
     export var __val__aa = aa;
 }
 __test2__.__val__aa = __test1__.__val__obj4
\ No newline at end of file
diff --git a/tests/cases/compiler/augmentArray.ts b/tests/cases/compiler/augmentArray.ts
deleted file mode 100644
index e2ab81db941..00000000000
--- a/tests/cases/compiler/augmentArray.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-interface Array<T> {
-    (): any[];
-}
\ No newline at end of file
diff --git a/tests/cases/compiler/autoAsiForStaticsInClassDeclaration.ts b/tests/cases/compiler/autoAsiForStaticsInClassDeclaration.ts
deleted file mode 100644
index 99599bbb165..00000000000
--- a/tests/cases/compiler/autoAsiForStaticsInClassDeclaration.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-class C {
-    static x
-    static y
-} 
\ No newline at end of file
diff --git a/tests/cases/compiler/badArraySyntax.ts b/tests/cases/compiler/badArraySyntax.ts
index 6a19a1504ac..77cb9ab4541 100644
--- a/tests/cases/compiler/badArraySyntax.ts
+++ b/tests/cases/compiler/badArraySyntax.ts
@@ -7,4 +7,4 @@ var a2 = new Z[];
 var a3 = new Z[]();
 var a4: Z[] = new Z[];
 var a5: Z[] = new Z[]();
-var a6: Z[][] = new   Z     [      ]   [  ];
+
diff --git a/tests/cases/compiler/breakInIterationOrSwitchStatement1.ts b/tests/cases/compiler/breakInIterationOrSwitchStatement1.ts
new file mode 100644
index 00000000000..831d2bd7faa
--- /dev/null
+++ b/tests/cases/compiler/breakInIterationOrSwitchStatement1.ts
@@ -0,0 +1,3 @@
+while (true) {
+  break;
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/breakInIterationOrSwitchStatement2.ts b/tests/cases/compiler/breakInIterationOrSwitchStatement2.ts
new file mode 100644
index 00000000000..e502557f3bc
--- /dev/null
+++ b/tests/cases/compiler/breakInIterationOrSwitchStatement2.ts
@@ -0,0 +1,4 @@
+do {
+  break;
+}
+while (true);
\ No newline at end of file
diff --git a/tests/cases/compiler/breakInIterationOrSwitchStatement3.ts b/tests/cases/compiler/breakInIterationOrSwitchStatement3.ts
new file mode 100644
index 00000000000..19858da08b2
--- /dev/null
+++ b/tests/cases/compiler/breakInIterationOrSwitchStatement3.ts
@@ -0,0 +1,3 @@
+for (;;) {
+  break;
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/breakInIterationOrSwitchStatement4.ts b/tests/cases/compiler/breakInIterationOrSwitchStatement4.ts
new file mode 100644
index 00000000000..da939495217
--- /dev/null
+++ b/tests/cases/compiler/breakInIterationOrSwitchStatement4.ts
@@ -0,0 +1,3 @@
+for (var i in something) {
+  break;
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/breakNotInIterationOrSwitchStatement1.ts b/tests/cases/compiler/breakNotInIterationOrSwitchStatement1.ts
new file mode 100644
index 00000000000..8cb76cf02d7
--- /dev/null
+++ b/tests/cases/compiler/breakNotInIterationOrSwitchStatement1.ts
@@ -0,0 +1 @@
+break;
\ No newline at end of file
diff --git a/tests/cases/compiler/breakNotInIterationOrSwitchStatement2.ts b/tests/cases/compiler/breakNotInIterationOrSwitchStatement2.ts
new file mode 100644
index 00000000000..7d4c337e29f
--- /dev/null
+++ b/tests/cases/compiler/breakNotInIterationOrSwitchStatement2.ts
@@ -0,0 +1,5 @@
+while (true) {
+  function f() {
+    break;
+  }
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/breakTarget1.ts b/tests/cases/compiler/breakTarget1.ts
new file mode 100644
index 00000000000..03f96cbc602
--- /dev/null
+++ b/tests/cases/compiler/breakTarget1.ts
@@ -0,0 +1,2 @@
+target:
+  break target;
\ No newline at end of file
diff --git a/tests/cases/compiler/breakTarget2.ts b/tests/cases/compiler/breakTarget2.ts
new file mode 100644
index 00000000000..daa11e45b95
--- /dev/null
+++ b/tests/cases/compiler/breakTarget2.ts
@@ -0,0 +1,4 @@
+target:
+while (true) {
+  break target;
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/breakTarget3.ts b/tests/cases/compiler/breakTarget3.ts
new file mode 100644
index 00000000000..9cef599692c
--- /dev/null
+++ b/tests/cases/compiler/breakTarget3.ts
@@ -0,0 +1,5 @@
+target1:
+target2:
+while (true) {
+  break target1;
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/breakTarget4.ts b/tests/cases/compiler/breakTarget4.ts
new file mode 100644
index 00000000000..2c3eadca7db
--- /dev/null
+++ b/tests/cases/compiler/breakTarget4.ts
@@ -0,0 +1,5 @@
+target1:
+target2:
+while (true) {
+  break target2;
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/breakTarget5.ts b/tests/cases/compiler/breakTarget5.ts
new file mode 100644
index 00000000000..a05ee1cf879
--- /dev/null
+++ b/tests/cases/compiler/breakTarget5.ts
@@ -0,0 +1,8 @@
+target:
+while (true) {
+  function f() {
+    while (true) {
+      break target;
+    }
+  }
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/breakTarget6.ts b/tests/cases/compiler/breakTarget6.ts
new file mode 100644
index 00000000000..bd94d0030e3
--- /dev/null
+++ b/tests/cases/compiler/breakTarget6.ts
@@ -0,0 +1,3 @@
+while (true) {
+  break target;
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/captureThisInSuperCall.ts b/tests/cases/compiler/captureThisInSuperCall.ts
deleted file mode 100644
index 8037aa50b44..00000000000
--- a/tests/cases/compiler/captureThisInSuperCall.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-class A {
-    constructor(p:any) {}
-}
-
-class B extends A {
-    constructor() { super({ test: () => this.someMethod()}); } 
-    someMethod() {}
-}
\ No newline at end of file
diff --git a/tests/cases/compiler/castExpressionParentheses.ts b/tests/cases/compiler/castExpressionParentheses.ts
index 93b26ebaf4e..6636fd2e5bc 100644
--- a/tests/cases/compiler/castExpressionParentheses.ts
+++ b/tests/cases/compiler/castExpressionParentheses.ts
@@ -26,7 +26,7 @@ declare var A;
 (<any>typeof A).x; 
 (<any>-A).x; 
 new (<any>A());
-(<Tany>()=> {})();
+(<any>()=> {})();
 (<any>function foo() { })();
 (<any><number><any>-A).x; 
 
diff --git a/tests/cases/compiler/chainedImportAlias.ts b/tests/cases/compiler/chainedImportAlias.ts
index 97bf28bf4a5..a8b79016d1b 100644
--- a/tests/cases/compiler/chainedImportAlias.ts
+++ b/tests/cases/compiler/chainedImportAlias.ts
@@ -5,6 +5,9 @@ export module m {
 }
 
 // @Filename: chainedImportAlias_file1.ts 
-import x = require('chainedImportAlias_file0');
+import x = require('chainedImportAlias_file1');
 import y = x;
-y.m.foo();
+declare var console: {
+    log(message?: any);
+};
+console.log(y);
diff --git a/tests/cases/compiler/classImplementsImportedInterface.ts b/tests/cases/compiler/classImplementsImportedInterface.ts
deleted file mode 100644
index ae4cbffede5..00000000000
--- a/tests/cases/compiler/classImplementsImportedInterface.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-module M1 {
-    export interface I {
-        foo();
-    }
-}
-
-module M2 {
-    import T = M1.I;
-    class C implements T {
-        foo() {}
-    }
-}
\ No newline at end of file
diff --git a/tests/cases/compiler/commentsDottedModuleName.ts b/tests/cases/compiler/commentsDottedModuleName.ts
deleted file mode 100644
index 136d189d1ac..00000000000
--- a/tests/cases/compiler/commentsDottedModuleName.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-//@module: amd
-// @target: ES5
-// @declaration: true
-// @comments: true
-
-/** this is multi declare module*/
-export module outerModule.InnerModule {
-    /// class b comment
-    export class b {
-    }
-}
\ No newline at end of file
diff --git a/tests/cases/compiler/commentsMultiModuleMultiFile.ts b/tests/cases/compiler/commentsMultiModuleMultiFile.ts
index 2d19f775bda..0fd410a4b5d 100644
--- a/tests/cases/compiler/commentsMultiModuleMultiFile.ts
+++ b/tests/cases/compiler/commentsMultiModuleMultiFile.ts
@@ -11,7 +11,7 @@ export module multiM {
     }
 }
 /** thi is multi module 2*/
-export module multiM {
+module multiM {
     /** class c comment*/
     export class c {
     }
@@ -27,7 +27,7 @@ new multiM.c();
 // @Filename: commentsMultiModuleMultiFile_1.ts
 import m = require('commentsMultiModuleMultiFile_0');
 /** this is multi module 3 comment*/
-export module multiM {
+module multiM {
     /** class d comment*/
     export class d {
     }
diff --git a/tests/cases/compiler/complicatedPrivacy.ts b/tests/cases/compiler/complicatedPrivacy.ts
index 6c1e3fa8527..917f505241d 100644
--- a/tests/cases/compiler/complicatedPrivacy.ts
+++ b/tests/cases/compiler/complicatedPrivacy.ts
@@ -1,4 +1,3 @@
-// @target: es5
 module m1 {
     export module m2 {
 
diff --git a/tests/cases/compiler/constructorArgsErrors3.ts b/tests/cases/compiler/constructorArgsErrors3.ts
deleted file mode 100644
index 9d1979c0509..00000000000
--- a/tests/cases/compiler/constructorArgsErrors3.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-class foo {
-    constructor (public public a: number) {
-    }
-}
diff --git a/tests/cases/compiler/constructorArgsErrors4.ts b/tests/cases/compiler/constructorArgsErrors4.ts
deleted file mode 100644
index f058eaccef5..00000000000
--- a/tests/cases/compiler/constructorArgsErrors4.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-class foo {
-    constructor (private public a: number) {
-    }
-}
diff --git a/tests/cases/compiler/constructorArgsErrors5.ts b/tests/cases/compiler/constructorArgsErrors5.ts
deleted file mode 100644
index 55f97d691f9..00000000000
--- a/tests/cases/compiler/constructorArgsErrors5.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-class foo {
-    constructor (export a: number) {
-    }
-}
diff --git a/tests/cases/compiler/constructorsWithSpecializedSignatures.ts b/tests/cases/compiler/constructorsWithSpecializedSignatures.ts
deleted file mode 100644
index 49af660fee1..00000000000
--- a/tests/cases/compiler/constructorsWithSpecializedSignatures.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-// errors
-declare class C {
-    constructor(x: "hi");
-    constructor(x: "foo");
-    constructor(x: number);
-}
-
-// ok
-declare class C2 {
-    constructor(x: "hi");
-    constructor(x: "foo");
-    constructor(x: string);
-}
-
-// errors
-class D {
-    constructor(x: "hi");
-    constructor(x: "foo");
-    constructor(x: number);
-    constructor(x: "hi") { }
-}
-
-// overloads are ok
-class D2 {
-    constructor(x: "hi");
-    constructor(x: "foo");
-    constructor(x: string);
-    constructor(x: "hi") { } // error
-}
-
-// errors
-interface I {
-    new (x: "hi");
-    new (x: "foo");
-    new (x: number);
-}
-
-// ok
-interface I2 {
-    new (x: "hi");
-    new (x: "foo");
-    new (x: string);
-}
\ No newline at end of file
diff --git a/tests/cases/compiler/contextualSignatureInstantiation3.ts b/tests/cases/compiler/contextualSignatureInstantiation3.ts
deleted file mode 100644
index a71f08d209d..00000000000
--- a/tests/cases/compiler/contextualSignatureInstantiation3.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-function map<T, U>(items: T[], f: (x: T) => U): U[]{
-    return items.map(f);
-}
-
-function identity<T>(x: T) {
-    return x;
-}
-
-function singleton<T>(x: T) {
-    return [x];
-}
-
-var xs = [1, 2, 3];
-
-// Have compiler check that we get the correct types
-var v1: number[];
-var v1 = xs.map(identity);      // Error if not number[]
-var v1 = map(xs, identity);     // Error if not number[]
-
-var v2: number[][];         
-var v2 = xs.map(singleton);     // Error if not number[][]
-var v2 = map(xs, singleton);    // Error if not number[][]
diff --git a/tests/cases/compiler/contextualTyping.ts b/tests/cases/compiler/contextualTyping.ts
index e378fd82065..408e878f8a4 100644
--- a/tests/cases/compiler/contextualTyping.ts
+++ b/tests/cases/compiler/contextualTyping.ts
@@ -1,4 +1,3 @@
-// @newline: \n
 // @sourcemap: true
 // DEFAULT INTERFACES
 interface IFoo {
@@ -229,4 +228,4 @@ Point.prototype = {
 
 interface A { x: string; }
 interface B extends A { }
-var x: B = { };
+var x: B = { };
\ No newline at end of file
diff --git a/tests/cases/compiler/continueInIterationStatement1.ts b/tests/cases/compiler/continueInIterationStatement1.ts
new file mode 100644
index 00000000000..89b9743144c
--- /dev/null
+++ b/tests/cases/compiler/continueInIterationStatement1.ts
@@ -0,0 +1,3 @@
+while (true) {
+  continue;
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/continueInIterationStatement2.ts b/tests/cases/compiler/continueInIterationStatement2.ts
new file mode 100644
index 00000000000..40bb1c438af
--- /dev/null
+++ b/tests/cases/compiler/continueInIterationStatement2.ts
@@ -0,0 +1,4 @@
+do {
+  continue;
+}
+while (true);
\ No newline at end of file
diff --git a/tests/cases/compiler/continueInIterationStatement3.ts b/tests/cases/compiler/continueInIterationStatement3.ts
new file mode 100644
index 00000000000..3b23060504c
--- /dev/null
+++ b/tests/cases/compiler/continueInIterationStatement3.ts
@@ -0,0 +1,3 @@
+for (;;) {
+  continue;
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/continueInIterationStatement4.ts b/tests/cases/compiler/continueInIterationStatement4.ts
new file mode 100644
index 00000000000..9bd164bc366
--- /dev/null
+++ b/tests/cases/compiler/continueInIterationStatement4.ts
@@ -0,0 +1,3 @@
+for (var i in something) {
+  continue;
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/continueLabel.ts b/tests/cases/compiler/continueLabel.ts
new file mode 100644
index 00000000000..a3c36c4a263
--- /dev/null
+++ b/tests/cases/compiler/continueLabel.ts
@@ -0,0 +1,3 @@
+label1: for(var i = 0; i < 1; i++) {
+    continue label1;
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/continueNotInIterationStatement1.ts b/tests/cases/compiler/continueNotInIterationStatement1.ts
new file mode 100644
index 00000000000..45127c0ad12
--- /dev/null
+++ b/tests/cases/compiler/continueNotInIterationStatement1.ts
@@ -0,0 +1 @@
+continue;
\ No newline at end of file
diff --git a/tests/cases/compiler/continueNotInIterationStatement2.ts b/tests/cases/compiler/continueNotInIterationStatement2.ts
new file mode 100644
index 00000000000..114c300a70e
--- /dev/null
+++ b/tests/cases/compiler/continueNotInIterationStatement2.ts
@@ -0,0 +1,5 @@
+while (true) {
+  function f() {
+    continue;
+  }
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/continueNotInIterationStatement3.ts b/tests/cases/compiler/continueNotInIterationStatement3.ts
new file mode 100644
index 00000000000..203a3477af9
--- /dev/null
+++ b/tests/cases/compiler/continueNotInIterationStatement3.ts
@@ -0,0 +1,4 @@
+switch (0) {
+  default:
+    continue;
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/continueNotInIterationStatement4.ts b/tests/cases/compiler/continueNotInIterationStatement4.ts
new file mode 100644
index 00000000000..5996eb4323a
--- /dev/null
+++ b/tests/cases/compiler/continueNotInIterationStatement4.ts
@@ -0,0 +1,6 @@
+TWO:
+while (true){
+  var x = () => {
+    continue TWO;
+  }
+}
diff --git a/tests/cases/compiler/continueTarget1.ts b/tests/cases/compiler/continueTarget1.ts
new file mode 100644
index 00000000000..7235f96bac8
--- /dev/null
+++ b/tests/cases/compiler/continueTarget1.ts
@@ -0,0 +1,2 @@
+target:
+  continue target;
\ No newline at end of file
diff --git a/tests/cases/compiler/continueTarget2.ts b/tests/cases/compiler/continueTarget2.ts
new file mode 100644
index 00000000000..8b57308a2df
--- /dev/null
+++ b/tests/cases/compiler/continueTarget2.ts
@@ -0,0 +1,4 @@
+target:
+while (true) {
+  continue target;
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/continueTarget3.ts b/tests/cases/compiler/continueTarget3.ts
new file mode 100644
index 00000000000..26bea241a7a
--- /dev/null
+++ b/tests/cases/compiler/continueTarget3.ts
@@ -0,0 +1,5 @@
+target1:
+target2:
+while (true) {
+  continue target1;
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/continueTarget4.ts b/tests/cases/compiler/continueTarget4.ts
new file mode 100644
index 00000000000..e00c222aa9c
--- /dev/null
+++ b/tests/cases/compiler/continueTarget4.ts
@@ -0,0 +1,5 @@
+target1:
+target2:
+while (true) {
+  continue target2;
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/continueTarget5.ts b/tests/cases/compiler/continueTarget5.ts
new file mode 100644
index 00000000000..dd3a806ab2d
--- /dev/null
+++ b/tests/cases/compiler/continueTarget5.ts
@@ -0,0 +1,8 @@
+target:
+while (true) {
+  function f() {
+    while (true) {
+      continue target;
+    }
+  }
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/continueTarget6.ts b/tests/cases/compiler/continueTarget6.ts
new file mode 100644
index 00000000000..bcdda2ab5e1
--- /dev/null
+++ b/tests/cases/compiler/continueTarget6.ts
@@ -0,0 +1,3 @@
+while (true) {
+  continue target;
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/convertKeywordsYes.ts b/tests/cases/compiler/convertKeywordsYes.ts
index ad50ce50e8e..ac5d52aa494 100644
--- a/tests/cases/compiler/convertKeywordsYes.ts
+++ b/tests/cases/compiler/convertKeywordsYes.ts
@@ -21,16 +21,20 @@ var declare = 0;
 
 function bigGeneric<
     constructor,
+    any,
+    boolean,
     implements ,
     interface ,
     let,
     module ,
+    number,
     package,
     private ,
     protected,
     public ,
     set ,
     static ,
+    string,
     get ,
     yield,
     declare
@@ -289,16 +293,20 @@ enum bigEnum {
 
 module bigModule {
     class constructor { }
+    class any { }
+    class boolean { }
     class implements { }
     class interface { }
     class let { }
     class module { }
+    class number { }
     class package { }
     class private { }
     class protected { }
     class public { }
     class set { }
     class static { }
+    class string { }
     class get { }
     class yield { }
     class declare { }
diff --git a/tests/cases/compiler/cyclicModuleImport.ts b/tests/cases/compiler/cyclicModuleImport.ts
index 1a17860805e..88cb378c9c9 100644
--- a/tests/cases/compiler/cyclicModuleImport.ts
+++ b/tests/cases/compiler/cyclicModuleImport.ts
@@ -1,4 +1,3 @@
-// @declaration: true
 declare module "SubModule" {
     import MainModule = require('MainModule');
     class SubModule {
diff --git a/tests/cases/compiler/declFileAccessors.ts b/tests/cases/compiler/declFileAccessors.ts
deleted file mode 100644
index ea9b05f2fef..00000000000
--- a/tests/cases/compiler/declFileAccessors.ts
+++ /dev/null
@@ -1,104 +0,0 @@
-// @target: ES5
-// @declaration: true
-// @comments: true
-// @module: commonjs
-
-// @Filename: declFileAccessors_0.ts
-/** This is comment for c1*/
-export class c1 {
-    /** getter property*/
-    public get p3() {
-        return 10;
-    }
-    /** setter property*/
-    public set p3(/** this is value*/value: number) {
-    }
-    /** private getter property*/
-    private get pp3() {
-        return 10;
-    }
-    /** private setter property*/
-    private set pp3(/** this is value*/value: number) {
-    }
-    /** static getter property*/
-    static get s3() {
-        return 10;
-    }
-    /** setter property*/
-    static set s3( /** this is value*/value: number) {
-    }
-    public get nc_p3() {
-        return 10;
-    }
-    public set nc_p3(value: number) {
-    }
-    private get nc_pp3() {
-        return 10;
-    }
-    private set nc_pp3(value: number) {
-    }
-    static get nc_s3() {
-        return "";
-    }
-    static set nc_s3(value: string) {
-    }
-
-    // Only getter property
-    public get onlyGetter() {
-        return 10;
-    }
-
-    // Only setter property
-    public set onlySetter(value: number) {
-    }
-}
-
-// @Filename: declFileAccessors_1.ts
-/** This is comment for c2 - the global class*/
-class c2 {
-    /** getter property*/
-    public get p3() {
-        return 10;
-    }
-    /** setter property*/
-    public set p3(/** this is value*/value: number) {
-    }
-    /** private getter property*/
-    private get pp3() {
-        return 10;
-    }
-    /** private setter property*/
-    private set pp3(/** this is value*/value: number) {
-    }
-    /** static getter property*/
-    static get s3() {
-        return 10;
-    }
-    /** setter property*/
-    static set s3( /** this is value*/value: number) {
-    }
-    public get nc_p3() {
-        return 10;
-    }
-    public set nc_p3(value: number) {
-    }
-    private get nc_pp3() {
-        return 10;
-    }
-    private set nc_pp3(value: number) {
-    }
-    static get nc_s3() {
-        return "";
-    }
-    static set nc_s3(value: string) {
-    }
-
-    // Only getter property
-    public get onlyGetter() {
-        return 10;
-    }
-
-    // Only setter property
-    public set onlySetter(value: number) {
-    }
-}
\ No newline at end of file
diff --git a/tests/cases/compiler/declFileCallSignatures.ts b/tests/cases/compiler/declFileCallSignatures.ts
deleted file mode 100644
index 9ff74730fbf..00000000000
--- a/tests/cases/compiler/declFileCallSignatures.ts
+++ /dev/null
@@ -1,68 +0,0 @@
-// @target: ES5
-// @declaration: true
-// @comments: true
-// @module: commonjs
-
-// @Filename: declFileCallSignatures_0.ts
-export interface ICallSignature {
-    /** This comment should appear for foo*/
-    (): string;
-}
-
-export interface ICallSignatureWithParameters {
-    /** This is comment for function signature*/
-    (/** this is comment about a*/a: string,
-        /** this is comment for b*/
-        b: number): void;
-}
-
-export interface ICallSignatureWithRestParameters {
-    (a: string, ...rests: string[]): string;
-}
-
-export interface ICallSignatureWithOverloads {
-    (a: string): string;
-    (a: number): number;
-}
-
-export interface ICallSignatureWithTypeParameters<T> {
-    /** This comment should appear for foo*/
-    (a: T): string;
-}
-
-export interface ICallSignatureWithOwnTypeParametes {
-    <T extends ICallSignature>(a: T): string;
-}
-
-// @Filename: declFileCallSignatures_1.ts
-interface IGlobalCallSignature {
-    /** This comment should appear for foo*/
-    (): string;
-}
-
-interface IGlobalCallSignatureWithParameters {
-    /** This is comment for function signature*/
-    (/** this is comment about a*/a: string,
-        /** this is comment for b*/
-        b: number): void;
-}
-
-interface IGlobalCallSignatureWithRestParameters {
-
-    (a: string, ...rests: string[]): string;
-
-}
-
-interface IGlobalCallSignatureWithOverloads {
-    (a: string): string;
-    (a: number): number;
-}
-
-interface IGlobalCallSignatureWithTypeParameters<T> {
-    /** This comment should appear for foo*/
-    (a: T): string;
-}
-
-interface IGlobalCallSignatureWithOwnTypeParametes {
-    <T extends IGlobalCallSignature>(a: T): string;
-}
\ No newline at end of file
diff --git a/tests/cases/compiler/declFileConstructSignatures.ts b/tests/cases/compiler/declFileConstructSignatures.ts
deleted file mode 100644
index b81e4f831ea..00000000000
--- a/tests/cases/compiler/declFileConstructSignatures.ts
+++ /dev/null
@@ -1,68 +0,0 @@
-// @target: ES5
-// @declaration: true
-// @comments: true
-// @module: commonjs
-
-// @Filename: declFileConstructSignatures_0.ts
-export interface IConstructSignature {
-    /** This comment should appear for foo*/
-    new (): string;
-}
-
-export interface IConstructSignatureWithParameters {
-    /** This is comment for function signature*/
-    new (/** this is comment about a*/a: string,
-        /** this is comment for b*/
-        b: number);
-}
-
-export interface IConstructSignatureWithRestParameters {
-    new (a: string, ...rests: string[]): string;
-}
-
-export interface IConstructSignatureWithOverloads {
-    new (a: string): string;
-    new (a: number): number;
-}
-
-export interface IConstructSignatureWithTypeParameters<T> {
-    /** This comment should appear for foo*/
-    new (a: T): T;
-}
-
-export interface IConstructSignatureWithOwnTypeParametes {
-    new <T extends IConstructSignature>(a: T): T;
-}
-
-// @Filename: declFileConstructSignatures_1.ts
-interface IGlobalConstructSignature {
-    /** This comment should appear for foo*/
-    new (): string;
-}
-
-interface IGlobalConstructSignatureWithParameters {
-    /** This is comment for function signature*/
-    new (/** this is comment about a*/a: string,
-        /** this is comment for b*/
-        b: number);
-}
-
-interface IGlobalConstructSignatureWithRestParameters {
-
-    new (a: string, ...rests: string[]): string;
-
-}
-
-interface IGlobalConstructSignatureWithOverloads {
-    new (a: string): string;
-    new (a: number): number;
-}
-
-interface IGlobalConstructSignatureWithTypeParameters<T> {
-    /** This comment should appear for foo*/
-    new (a: T): T;
-}
-
-interface IGlobalConstructSignatureWithOwnTypeParametes {
-    new <T extends IGlobalConstructSignature>(a: T): T;
-}
\ No newline at end of file
diff --git a/tests/cases/compiler/declFileConstructors.ts b/tests/cases/compiler/declFileConstructors.ts
deleted file mode 100644
index c1f4862e44c..00000000000
--- a/tests/cases/compiler/declFileConstructors.ts
+++ /dev/null
@@ -1,100 +0,0 @@
-// @target: ES5
-// @declaration: true
-// @comments: true
-// @module: commonjs
-
-// @Filename: declFileConstructors_0.ts
-export class SimpleConstructor {
-    /** This comment should appear for foo*/
-    constructor() {
-    }
-}
-export class ConstructorWithParameters {
-    /** This is comment for function signature*/
-    constructor(/** this is comment about a*/a: string,
-        /** this is comment for b*/
-        b: number) {
-        var d = a;
-    }
-}
-
-export class ConstructorWithRestParamters {
-    constructor(a: string, ...rests: string[]) {
-        return a + rests.join("");
-    }
-}
-
-export class ConstructorWithOverloads {
-    constructor(a: string);
-    constructor(a: number);
-    constructor(a: any) {
-    }
-}
-
-export class ConstructorWithPublicParameterProperty {
-    constructor(public x: string) {
-    }
-}
-
-export class ConstructorWithPrivateParameterProperty {
-    constructor(private x: string) {
-    }
-}
-
-export class ConstructorWithOptionalParameterProperty {
-    constructor(public x?: string) {
-    }
-}
-
-export class ConstructorWithParameterInitializer {
-    constructor(public x = "hello") {
-    }
-}
-
-// @Filename: declFileConstructors_1.ts
-class GlobalSimpleConstructor {
-    /** This comment should appear for foo*/
-    constructor() {
-    }
-}
-class GlobalConstructorWithParameters {
-    /** This is comment for function signature*/
-    constructor(/** this is comment about a*/a: string,
-        /** this is comment for b*/
-        b: number) {
-        var d = a;
-    }
-}
-
-class GlobalConstructorWithRestParamters {
-    constructor(a: string, ...rests: string[]) {
-        return a + rests.join("");
-    }
-}
-
-class GlobalConstructorWithOverloads {
-    constructor(a: string);
-    constructor(a: number);
-    constructor(a: any) {
-    }
-}
-
-class GlobalConstructorWithPublicParameterProperty {
-    constructor(public x: string) {
-    }
-}
-
-class GlobalConstructorWithPrivateParameterProperty {
-    constructor(private x: string) {
-    }
-}
-
-class GlobalConstructorWithOptionalParameterProperty {
-    constructor(public x?: string) {
-    }
-}
-
-class GlobalConstructorWithParameterInitializer {
-    constructor(public x = "hello") {
-    }
-}
\ No newline at end of file
diff --git a/tests/cases/compiler/declFileFunctions.ts b/tests/cases/compiler/declFileFunctions.ts
deleted file mode 100644
index ead3fdd1f25..00000000000
--- a/tests/cases/compiler/declFileFunctions.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-// @target: ES5
-// @declaration: true
-// @comments: true
-// @module: commonjs
-
-// @Filename: declFileFunctions_0.ts
-/** This comment should appear for foo*/
-export function foo() {
-}
-/** This is comment for function signature*/
-export function fooWithParameters(/** this is comment about a*/a: string,
-    /** this is comment for b*/
-    b: number) {
-    var d = a;
-}
-export function fooWithRestParameters(a: string, ...rests: string[]) {
-    return a + rests.join("");
-}
-
-export function fooWithOverloads(a: string): string;
-export function fooWithOverloads(a: number): number;
-export function fooWithOverloads(a: any): any {
-    return a;
-}
-
-/** This comment should appear for nonExportedFoo*/
-function nonExportedFoo() {
-}
-/** This is comment for function signature*/
-function nonExportedFooWithParameters(/** this is comment about a*/a: string,
-    /** this is comment for b*/
-    b: number) {
-    var d = a;
-}
-function nonExportedFooWithRestParameters(a: string, ...rests: string[]) {
-    return a + rests.join("");
-}
-
-function nonExportedFooWithOverloads(a: string): string;
-function nonExportedFooWithOverloads(a: number): number;
-function nonExportedFooWithOverloads(a: any): any {
-    return a;
-}
-
-// @Filename: declFileFunctions_1.ts
-/** This comment should appear for foo*/
-function globalfoo() {
-}
-/** This is comment for function signature*/
-function globalfooWithParameters(/** this is comment about a*/a: string,
-    /** this is comment for b*/
-    b: number) {
-    var d = a;
-}
-function globalfooWithRestParameters(a: string, ...rests: string[]) {
-    return a + rests.join("");
-}
-function globalfooWithOverloads(a: string): string;
-function globalfooWithOverloads(a: number): number;
-function globalfooWithOverloads(a: any): any {
-    return a;
-}
\ No newline at end of file
diff --git a/tests/cases/compiler/declFileImportChainInExportAssignment.ts b/tests/cases/compiler/declFileImportChainInExportAssignment.ts
deleted file mode 100644
index da18e81a6c6..00000000000
--- a/tests/cases/compiler/declFileImportChainInExportAssignment.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-// @declaration: true
-// @module: commonjs
-module m {
-    export module c {
-        export class c {
-        }
-    }
-}
-import a = m.c;
-import b = a;
-export = b;
\ No newline at end of file
diff --git a/tests/cases/compiler/declFileIndexSignatures.ts b/tests/cases/compiler/declFileIndexSignatures.ts
deleted file mode 100644
index 3c9aaf34bfc..00000000000
--- a/tests/cases/compiler/declFileIndexSignatures.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-// @target: ES5
-// @declaration: true
-// @comments: true
-// @module: commonjs
-
-// @Filename: declFileIndexSignatures_0.ts
-export interface IStringIndexSignature {
-    [s: string]: string;
-}
-export interface INumberIndexSignature {
-    [n: number]: number;
-}
-
-export interface IBothIndexSignature {
-    [s: string]: any;
-    [n: number]: number;
-}
-
-export interface IIndexSignatureWithTypeParameter<T> {
-    [a: string]: T;
-}
-
-// @Filename: declFileIndexSignatures_1.ts
-interface IGlobalStringIndexSignature {
-    [s: string]: string;
-}
-interface IGlobalNumberIndexSignature {
-    [n: number]: number;
-}
-
-interface IGlobalBothIndexSignature {
-    [s: string]: any;
-    [n: number]: number;
-}
-
-interface IGlobalIndexSignatureWithTypeParameter<T> {
-    [a: string]: T;
-}
\ No newline at end of file
diff --git a/tests/cases/compiler/declFileMethods.ts b/tests/cases/compiler/declFileMethods.ts
deleted file mode 100644
index a5c31728ccd..00000000000
--- a/tests/cases/compiler/declFileMethods.ts
+++ /dev/null
@@ -1,192 +0,0 @@
-// @target: ES5
-// @declaration: true
-// @comments: true
-// @module: commonjs
-
-// @Filename: declFileMethods_0.ts
-export class c1 {
-    /** This comment should appear for foo*/
-    public foo() {
-    }
-    /** This is comment for function signature*/
-    public fooWithParameters(/** this is comment about a*/a: string,
-        /** this is comment for b*/
-        b: number) {
-        var d = a;
-    }
-    public fooWithRestParameters(a: string, ...rests: string[]) {
-        return a + rests.join("");
-    }
-
-    public fooWithOverloads(a: string): string;
-    public fooWithOverloads(a: number): number;
-    public fooWithOverloads(a: any): any {
-        return a;
-    }
-
-
-    /** This comment should appear for privateFoo*/
-    private privateFoo() {
-    }
-    /** This is comment for function signature*/
-    private privateFooWithParameters(/** this is comment about a*/a: string,
-        /** this is comment for b*/
-        b: number) {
-        var d = a;
-    }
-    private privateFooWithRestParameters(a: string, ...rests: string[]) {
-        return a + rests.join("");
-    }
-    private privateFooWithOverloads(a: string): string;
-    private privateFooWithOverloads(a: number): number;
-    private privateFooWithOverloads(a: any): any {
-        return a;
-    }
-
-
-    /** This comment should appear for static foo*/
-    static staticFoo() {
-    }
-    /** This is comment for function signature*/
-    static staticFooWithParameters(/** this is comment about a*/a: string,
-        /** this is comment for b*/
-        b: number) {
-        var d = a;
-    }
-    static staticFooWithRestParameters(a: string, ...rests: string[]) {
-        return a + rests.join("");
-    }
-    static staticFooWithOverloads(a: string): string;
-    static staticFooWithOverloads(a: number): number;
-    static staticFooWithOverloads(a: any): any {
-        return a;
-    }
-
-
-    /** This comment should appear for privateStaticFoo*/
-    private static privateStaticFoo() {
-    }
-    /** This is comment for function signature*/
-    private static privateStaticFooWithParameters(/** this is comment about a*/a: string,
-        /** this is comment for b*/
-        b: number) {
-        var d = a;
-    }
-    private static privateStaticFooWithRestParameters(a: string, ...rests: string[]) {
-        return a + rests.join("");
-    }
-    private static privateStaticFooWithOverloads(a: string): string;
-    private static privateStaticFooWithOverloads(a: number): number;
-    private static privateStaticFooWithOverloads(a: any): any {
-        return a;
-    }
-}
-
-export interface I1 {
-    /** This comment should appear for foo*/
-    foo(): string;
-
-    /** This is comment for function signature*/
-    fooWithParameters(/** this is comment about a*/a: string,
-        /** this is comment for b*/
-        b: number): void;
-
-    fooWithRestParameters(a: string, ...rests: string[]): string;
-
-    fooWithOverloads(a: string): string;
-    fooWithOverloads(a: number): number;
-}
-
-// @Filename: declFileMethods_1.ts
-class c2 {
-    /** This comment should appear for foo*/
-    public foo() {
-    }
-    /** This is comment for function signature*/
-    public fooWithParameters(/** this is comment about a*/a: string,
-        /** this is comment for b*/
-        b: number) {
-        var d = a;
-    }
-    public fooWithRestParameters(a: string, ...rests: string[]) {
-        return a + rests.join("");
-    }
-
-    public fooWithOverloads(a: string): string;
-    public fooWithOverloads(a: number): number;
-    public fooWithOverloads(a: any): any {
-        return a;
-    }
-
-
-    /** This comment should appear for privateFoo*/
-    private privateFoo() {
-    }
-    /** This is comment for function signature*/
-    private privateFooWithParameters(/** this is comment about a*/a: string,
-        /** this is comment for b*/
-        b: number) {
-        var d = a;
-    }
-    private privateFooWithRestParameters(a: string, ...rests: string[]) {
-        return a + rests.join("");
-    }
-    private privateFooWithOverloads(a: string): string;
-    private privateFooWithOverloads(a: number): number;
-    private privateFooWithOverloads(a: any): any {
-        return a;
-    }
-
-
-    /** This comment should appear for static foo*/
-    static staticFoo() {
-    }
-    /** This is comment for function signature*/
-    static staticFooWithParameters(/** this is comment about a*/a: string,
-        /** this is comment for b*/
-        b: number) {
-        var d = a;
-    }
-    static staticFooWithRestParameters(a: string, ...rests: string[]) {
-        return a + rests.join("");
-    }
-    static staticFooWithOverloads(a: string): string;
-    static staticFooWithOverloads(a: number): number;
-    static staticFooWithOverloads(a: any): any {
-        return a;
-    }
-
-
-    /** This comment should appear for privateStaticFoo*/
-    private static privateStaticFoo() {
-    }
-    /** This is comment for function signature*/
-    private static privateStaticFooWithParameters(/** this is comment about a*/a: string,
-        /** this is comment for b*/
-        b: number) {
-        var d = a;
-    }
-    private static privateStaticFooWithRestParameters(a: string, ...rests: string[]) {
-        return a + rests.join("");
-    }
-    private static privateStaticFooWithOverloads(a: string): string;
-    private static privateStaticFooWithOverloads(a: number): number;
-    private static privateStaticFooWithOverloads(a: any): any {
-        return a;
-    }
-}
-
-interface I2 {
-    /** This comment should appear for foo*/
-    foo(): string;
-
-    /** This is comment for function signature*/
-    fooWithParameters(/** this is comment about a*/a: string,
-        /** this is comment for b*/
-        b: number): void;
-
-    fooWithRestParameters(a: string, ...rests: string[]): string;
-
-    fooWithOverloads(a: string): string;
-    fooWithOverloads(a: number): number;
-}
diff --git a/tests/cases/compiler/declarationEmit_nameConflicts.ts b/tests/cases/compiler/declarationEmit_nameConflicts.ts
index 66eb732ddae..40ae28d8c14 100644
--- a/tests/cases/compiler/declarationEmit_nameConflicts.ts
+++ b/tests/cases/compiler/declarationEmit_nameConflicts.ts
@@ -1,7 +1,6 @@
 // @declaration: true
-// @module: commonjs
 // @Filename: declarationEmit_nameConflicts_1.ts
-module f { export class c { } }
+function f() { }
 export = f;
 
 // @Filename: declarationEmit_nameConflicts_0.ts
@@ -28,6 +27,7 @@ export module M.P {
         export interface I { }
     }
     export import im = M.P.f;
+    // Bug 887180: Invalid .d.ts when an aliased entity is referenced, and a different entity is closer in scope
     export var a = M.a; // emitted incorrectly as typeof f
     export var b = M.b; // ok
     export var c = M.c; // ok
diff --git a/tests/cases/compiler/declarationEmit_nameConflicts2.ts b/tests/cases/compiler/declarationEmit_nameConflicts2.ts
index f0112fa9501..d7dd5134e96 100644
--- a/tests/cases/compiler/declarationEmit_nameConflicts2.ts
+++ b/tests/cases/compiler/declarationEmit_nameConflicts2.ts
@@ -9,6 +9,7 @@ module X.Y.base {
 }
 
 module X.Y.base.Z {
+    // Bug 887180
     export var f = X.Y.base.f; // Should be base.f
     export var C = X.Y.base.C; // Should be base.C
     export var M = X.Y.base.M; // Should be base.M
diff --git a/tests/cases/compiler/declarationEmit_nameConflicts3.ts b/tests/cases/compiler/declarationEmit_nameConflicts3.ts
index 6edc1056fa2..98f7ce91d5e 100644
--- a/tests/cases/compiler/declarationEmit_nameConflicts3.ts
+++ b/tests/cases/compiler/declarationEmit_nameConflicts3.ts
@@ -1,5 +1,4 @@
 // @declaration: true
-// @module: commonjs
 module M {
     export interface D { }
     export module D {
@@ -21,6 +20,7 @@ module M.P {
     export enum D {
         f
     }
+    // Bug 887180
     export var v: M.D; // ok
     export var w = M.D.f; // error, should be typeof M.D.f
     export var x = M.C.f; // error, should be typeof M.C.f
diff --git a/tests/cases/compiler/declarationEmit_nameConflictsWithAlias.ts b/tests/cases/compiler/declarationEmit_nameConflictsWithAlias.ts
index 50fc2484a4a..e6771f2d848 100644
--- a/tests/cases/compiler/declarationEmit_nameConflictsWithAlias.ts
+++ b/tests/cases/compiler/declarationEmit_nameConflictsWithAlias.ts
@@ -1,5 +1,5 @@
 // @declaration: true
-// @module: commonjs
+// Bug 887180
 export module C { export interface I { } }
 export import v = C;
 export module M {
diff --git a/tests/cases/compiler/declareFileExportAssignmentWithVarFromVariableStatement.ts b/tests/cases/compiler/declareFileExportAssignmentWithVarFromVariableStatement.ts
deleted file mode 100644
index 4333b9c1050..00000000000
--- a/tests/cases/compiler/declareFileExportAssignmentWithVarFromVariableStatement.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-//@module: commonjs
-// @declaration: true
-module m2 {
-    export interface connectModule {
-        (res, req, next): void;
-    }
-    export interface connectExport {
-        use: (mod: connectModule) => connectExport;
-        listen: (port: number) => void;
-    }
-
-}
-
-var x = 10, m2: {
-    (): m2.connectExport;
-    test1: m2.connectModule;
-    test2(): m2.connectModule;
-};
-
-export = m2;
\ No newline at end of file
diff --git a/tests/cases/compiler/duplicateLabel1.ts b/tests/cases/compiler/duplicateLabel1.ts
new file mode 100644
index 00000000000..c588e7b8183
--- /dev/null
+++ b/tests/cases/compiler/duplicateLabel1.ts
@@ -0,0 +1,4 @@
+target:
+target:
+while (true) {
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/duplicateLabel2.ts b/tests/cases/compiler/duplicateLabel2.ts
new file mode 100644
index 00000000000..bdb0396a246
--- /dev/null
+++ b/tests/cases/compiler/duplicateLabel2.ts
@@ -0,0 +1,6 @@
+target:
+while (true) {
+  target:
+  while (true) {
+  }
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/duplicateLabel3.ts b/tests/cases/compiler/duplicateLabel3.ts
new file mode 100644
index 00000000000..d4db9399ed2
--- /dev/null
+++ b/tests/cases/compiler/duplicateLabel3.ts
@@ -0,0 +1,8 @@
+target:
+while (true) {
+  function f() {
+    target:
+    while (true) {
+    }
+  }
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/duplicateLabel4.ts b/tests/cases/compiler/duplicateLabel4.ts
new file mode 100644
index 00000000000..2c62180a2ab
--- /dev/null
+++ b/tests/cases/compiler/duplicateLabel4.ts
@@ -0,0 +1,7 @@
+target:
+while (true) {
+}
+
+target: 
+while (true) {
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/duplicatePropertiesInStrictMode.ts b/tests/cases/compiler/duplicatePropertiesInStrictMode.ts
deleted file mode 100644
index bea869f93a4..00000000000
--- a/tests/cases/compiler/duplicatePropertiesInStrictMode.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-"use strict";
-var x = {
-  x: 1,
-  x: 2
-}
\ No newline at end of file
diff --git a/tests/cases/compiler/duplicateVarAndImport.ts b/tests/cases/compiler/duplicateVarAndImport.ts
deleted file mode 100644
index f8daf5ea9c9..00000000000
--- a/tests/cases/compiler/duplicateVarAndImport.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-// no error since module is not instantiated
-
-var a;
-module M { }
-import a = M;
\ No newline at end of file
diff --git a/tests/cases/compiler/duplicateVarAndImport2.ts b/tests/cases/compiler/duplicateVarAndImport2.ts
deleted file mode 100644
index f42b2bcf50b..00000000000
--- a/tests/cases/compiler/duplicateVarAndImport2.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-// error since module is instantiated
-var a;
-module M { export var x = 1; }
-import a = M;
\ No newline at end of file
diff --git a/tests/cases/compiler/emitBOM.ts b/tests/cases/compiler/emitBOM.ts
deleted file mode 100644
index f503cd4de7b..00000000000
--- a/tests/cases/compiler/emitBOM.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-//@emitBOM: true
-//@declaration: true
-//@sourcemap: true
-
-// JS and d.ts output should have a BOM but not the sourcemap
-var x;
\ No newline at end of file
diff --git a/tests/cases/compiler/emptyTypeArgumentList.ts b/tests/cases/compiler/emptyTypeArgumentList.ts
deleted file mode 100644
index f06bbc3afd2..00000000000
--- a/tests/cases/compiler/emptyTypeArgumentList.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-function foo<T>() { }
-foo<>();
\ No newline at end of file
diff --git a/tests/cases/compiler/emptyTypeArgumentListWithNew.ts b/tests/cases/compiler/emptyTypeArgumentListWithNew.ts
deleted file mode 100644
index 3a4926f5a8a..00000000000
--- a/tests/cases/compiler/emptyTypeArgumentListWithNew.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-class foo<T> { }
-new foo<>();
\ No newline at end of file
diff --git a/tests/cases/compiler/enumBasics1.ts b/tests/cases/compiler/enumBasics1.ts
index b3614d5bcc2..5401cc77779 100644
--- a/tests/cases/compiler/enumBasics1.ts
+++ b/tests/cases/compiler/enumBasics1.ts
@@ -31,7 +31,7 @@ enum E2 {
 	B,
 }
 
-enum E2 { // should error for continued autonumbering
+enum E2 { // shouldn't error
 	C,
 	D,
 }
\ No newline at end of file
diff --git a/tests/cases/compiler/enumInitializersWithExponents.ts b/tests/cases/compiler/enumInitializersWithExponents.ts
deleted file mode 100644
index 6cc88a6c7cd..00000000000
--- a/tests/cases/compiler/enumInitializersWithExponents.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-// Must be integer literals.
-declare enum E {
-    a = 1e3, // ok
-    b = 1e25, // ok
-    c = 1e-3, // error
-    d = 1e-9, // error
-    e = 1e0, // ok
-    f = 1e+25 // ok
-}
\ No newline at end of file
diff --git a/tests/cases/compiler/exportAssignmentWithDeclareAndExportModifiers.ts b/tests/cases/compiler/exportAssignmentWithDeclareAndExportModifiers.ts
deleted file mode 100644
index 02e40fd3645..00000000000
--- a/tests/cases/compiler/exportAssignmentWithDeclareAndExportModifiers.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-var x;
-export declare export = x;
\ No newline at end of file
diff --git a/tests/cases/compiler/exportAssignmentWithDeclareModifier.ts b/tests/cases/compiler/exportAssignmentWithDeclareModifier.ts
deleted file mode 100644
index e38f7fa8d38..00000000000
--- a/tests/cases/compiler/exportAssignmentWithDeclareModifier.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-var x;
-declare export = x;
\ No newline at end of file
diff --git a/tests/cases/compiler/exportAssignmentWithExportModifier.ts b/tests/cases/compiler/exportAssignmentWithExportModifier.ts
deleted file mode 100644
index c6b543caeec..00000000000
--- a/tests/cases/compiler/exportAssignmentWithExportModifier.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-var x;
-export export = x;
\ No newline at end of file
diff --git a/tests/cases/compiler/fileReferencesWithNoExtensions.ts b/tests/cases/compiler/fileReferencesWithNoExtensions.ts
deleted file mode 100644
index 40fa3fccbdd..00000000000
--- a/tests/cases/compiler/fileReferencesWithNoExtensions.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-// @Filename: t.ts
-/// <reference path="a"/>
-/// <reference path="b"/>
-/// <reference path="c"/>
-var a = aa;  // Check that a.ts is referenced
-var b = bb;  // Check that b.d.ts is referenced
-var c = cc;  // Check that c.ts has precedence over c.d.ts
-
-// @Filename: a.ts
-var aa = 1;
-
-// @Filename: b.d.ts
-declare var bb: number;
-
-// @Filename: c.ts
-var cc = 1;
-
-// @Filename: c.d.ts
-declare var xx: number;
diff --git a/tests/cases/compiler/functionAndInterfaceWithSeparateErrors.ts b/tests/cases/compiler/functionAndInterfaceWithSeparateErrors.ts
deleted file mode 100644
index 771e0488450..00000000000
--- a/tests/cases/compiler/functionAndInterfaceWithSeparateErrors.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-function Foo(s: string);
-function Foo(n: number) { }
-
-interface Foo {
-    [s: string]: string;
-    prop: number;
-}
\ No newline at end of file
diff --git a/tests/cases/compiler/functionsMissingReturnStatementsAndExpressions.ts b/tests/cases/compiler/functionsMissingReturnStatementsAndExpressions.ts
deleted file mode 100644
index 81259fd7c0c..00000000000
--- a/tests/cases/compiler/functionsMissingReturnStatementsAndExpressions.ts
+++ /dev/null
@@ -1,119 +0,0 @@
-// @target: es5
-
-function f1(): string {
-    // errors because there are no return statements
-}
-
-function f2(): string {
-    // Permissible; returns undefined.
-    return;
-}
-
-function f3(): string {
-    return "Okay, because this is a return expression.";
-}
-
-function f4(): void {
-    // Fine since we are typed void.
-}
-
-function f5(): void {
-    // Fine since we are typed void.
-    return;
-}
-
-function f6(): void {
-    // Fine since we are typed void and return undefined
-    return undefined;
-}
-
-function f7(): void {
-    // Fine since we are typed void and return null
-    return null;
-}
-
-function f8(): void {
-    // Fine since are typed any.
-    return;
-}
-
-function f9(): void {
-    // Fine since we are typed any and return undefined
-    return undefined;
-}
-
-function f10(): void {
-    // Fine since we are typed any and return null
-    return null;
-}
-
-function f11(): string {
-    // Fine since we consist of a single throw statement.
-    throw undefined;
-}
-
-function f12(): void {
-    // Fine since we consist of a single throw statement.
-    throw undefined;
-}
-
-function f13(): any {
-    // Fine since we consist of a single throw statement.
-    throw undefined;
-}
-
-function f14(): number {
-    // Not fine, since we can *only* consist of a single throw statement
-    // if no return statements are present but we are annotated.
-    throw undefined;
-    throw null;
-}
-
-function f15(): number {
-    // Fine, since we have a return statement somewhere.
-    throw undefined;
-    throw null;
-    return;
-}
-
-
-function f16() {
-    // Okay; not type annotated.
-}
-
-function f17() {
-    // Okay; not type annotated.
-    return;
-}
-
-function f18() {
-    return "Okay, not type annotated.";
-}
-
-
-class C {
-    public get m1() {
-        // Errors; get accessors must return a value.
-    }
-
-    public get m2() {
-        // Permissible; returns undefined.
-        return;
-    }
-
-    public get m3() {
-        return "Okay, because this is a return expression.";
-    }
-
-    public get m4() {
-        // Fine since this consists of a single throw statement.
-        throw null;
-    }
-
-    public get m5() {
-        // Not fine, since we can *only* consist of a single throw statement
-        // if no return statements are present but we are a get accessor.
-        throw null;
-        throw undefined.
-    }
-}
\ No newline at end of file
diff --git a/tests/cases/compiler/genericTypeWithCallableMembers.ts b/tests/cases/compiler/genericTypeWithCallableMembers.ts
index d3e06d405a2..01a2e6fdd05 100644
--- a/tests/cases/compiler/genericTypeWithCallableMembers.ts
+++ b/tests/cases/compiler/genericTypeWithCallableMembers.ts
@@ -5,7 +5,7 @@ interface Constructable {
 class C<T extends Constructable> {
     constructor(public data: T, public data2: Constructable) { }
     create() {
-        var x = new this.data(); // no error
+        var x = new this.data(); // error
         var x2 = new this.data2(); // was error, shouldn't be
     }
 }
diff --git a/tests/cases/compiler/implementGenericWithMismatchedTypes.ts b/tests/cases/compiler/implementGenericWithMismatchedTypes.ts
index 6e3c2d749af..9383ad2a649 100644
--- a/tests/cases/compiler/implementGenericWithMismatchedTypes.ts
+++ b/tests/cases/compiler/implementGenericWithMismatchedTypes.ts
@@ -14,7 +14,7 @@ interface IFoo2<T> {
     foo(x: T): T;
 }
 class C2<T> implements IFoo2<T> { // error
-    foo<Tstring>(x: Tstring): number {
+    foo<string>(x: string): number {
         return null;
     }
 }
\ No newline at end of file
diff --git a/tests/cases/compiler/importDecl.ts b/tests/cases/compiler/importDecl.ts
index c28b332eb43..9efbc50f0b2 100644
--- a/tests/cases/compiler/importDecl.ts
+++ b/tests/cases/compiler/importDecl.ts
@@ -55,6 +55,7 @@ export module m1 {
 
 //Emit global only usage
 import glo_m4 = require("importDecl_require1");
+export var useGlo_m4_x4 = glo_m4.x;
 export var useGlo_m4_d4 = glo_m4.d;
 export var useGlo_m4_f4 = glo_m4.foo();
 
diff --git a/tests/cases/compiler/indexSignatureTypeInference.ts b/tests/cases/compiler/indexSignatureTypeInference.ts
deleted file mode 100644
index 66fcb53d76c..00000000000
--- a/tests/cases/compiler/indexSignatureTypeInference.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-interface NumberMap<T> {
-    [index: number]: T;
-}
-
-interface StringMap<T> {
-    [index: string]: T;
-}
-
-declare function numberMapToArray<T>(object: NumberMap<T>): T[];
-declare function stringMapToArray<T>(object: StringMap<T>): T[];
-
-var numberMap: NumberMap<Function>;
-var stringMap: StringMap<Function>;
-
-var v1: Function[];
-var v1 = numberMapToArray(numberMap);  // Ok
-var v1 = numberMapToArray(stringMap);  // Ok
-var v1 = stringMapToArray(numberMap);  // Error expected here
-var v1 = stringMapToArray(stringMap);  // Ok
diff --git a/tests/cases/compiler/inheritedOverloadedSpecializedSignatures.ts b/tests/cases/compiler/inheritedOverloadedSpecializedSignatures.ts
deleted file mode 100644
index c513cecb2cb..00000000000
--- a/tests/cases/compiler/inheritedOverloadedSpecializedSignatures.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-interface A {
-  (key:string):void;
-}
-
-interface B extends A {
-  (key:'foo'):string;
-}
-
-var b:B;
-// Should not error
-b('foo').charAt(0);
-
-interface A {
-    (x: 'A1'): string;
-    (x: string): void;
-}
-
-interface B extends A {
-    (x: 'B1'): number;
-}
-
-interface A {
-    (x: 'A2'): boolean;
-}
-
-interface B  {
-    (x: 'B2'): string[];
-}
-
-var b: B;
-// non of these lines should error
-var x1: string[] = b('B2'); 
-var x2: number = b('B1');
-var x3: boolean = b('A2');
-var x4: string = b('A1');
-var x5: void = b('A0');
\ No newline at end of file
diff --git a/tests/cases/compiler/internalAliasWithDottedNameEmit.ts b/tests/cases/compiler/internalAliasWithDottedNameEmit.ts
index 23192257125..a906259715c 100644
--- a/tests/cases/compiler/internalAliasWithDottedNameEmit.ts
+++ b/tests/cases/compiler/internalAliasWithDottedNameEmit.ts
@@ -1,4 +1,3 @@
-// @declaration: true
 module a.b.c {
       export var d;
 }
diff --git a/tests/cases/compiler/missingRequiredDeclare.d.ts b/tests/cases/compiler/missingRequiredDeclare.d.ts
new file mode 100644
index 00000000000..889af3b9a49
--- /dev/null
+++ b/tests/cases/compiler/missingRequiredDeclare.d.ts
@@ -0,0 +1 @@
+var x = 1;
\ No newline at end of file
diff --git a/tests/cases/compiler/mixedExports.ts b/tests/cases/compiler/mixedExports.ts
deleted file mode 100644
index c3ad54846a9..00000000000
--- a/tests/cases/compiler/mixedExports.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-declare module M {
-     function foo();
-     export function foo();
-     function foo();
-}
-
-declare module M1 {
-     export interface Foo {}
-     interface Foo {}
-}
-
-module A {
-     interface X {x}
-     export module X {}
-     interface X {y}
-}
\ No newline at end of file
diff --git a/tests/cases/compiler/moduleSymbolMerging.ts b/tests/cases/compiler/moduleSymbolMerging.ts
deleted file mode 100644
index 03df2c5e596..00000000000
--- a/tests/cases/compiler/moduleSymbolMerging.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// @declaration: true
-
-// @Filename: A.ts
-module A { export interface I {} }
-
-// @Filename: B.ts
-///<reference path="A.ts" />
-module A { ; }
-module B {
-	export function f(): A.I { return null; }
-}
-
diff --git a/tests/cases/compiler/multiImportExport.ts b/tests/cases/compiler/multiImportExport.ts
index 939a6e1061e..33f0f5eb17f 100644
--- a/tests/cases/compiler/multiImportExport.ts
+++ b/tests/cases/compiler/multiImportExport.ts
@@ -1,5 +1,3 @@
-// @module: commonjs
-// @declaration: true
 // @Filename: consumer.ts
 import Drawing = require('./Drawing');
 var addr = new Drawing.Math.Adder();
diff --git a/tests/cases/compiler/nameCollisionsInPropertyAssignments.ts b/tests/cases/compiler/nameCollisionsInPropertyAssignments.ts
deleted file mode 100644
index 3847cca3a45..00000000000
--- a/tests/cases/compiler/nameCollisionsInPropertyAssignments.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-var x = 1
-var y = { x() { x++; } }; 
\ No newline at end of file
diff --git a/tests/cases/compiler/noCatchBlock.ts b/tests/cases/compiler/noCatchBlock.ts
deleted file mode 100644
index 2ebf4737ffc..00000000000
--- a/tests/cases/compiler/noCatchBlock.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-//@sourceMap: true
-
-try {
- // ...
-} finally {
- // N.B. No 'catch' block
-}
\ No newline at end of file
diff --git a/tests/cases/compiler/noImplicitAnyForIn.ts b/tests/cases/compiler/noImplicitAnyForIn.ts
deleted file mode 100644
index 64f9d24083d..00000000000
--- a/tests/cases/compiler/noImplicitAnyForIn.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-//@noImplicitAny: true
-
-var x: {}[] = [[1, 2, 3], ["hello"]];
-
-for (var i in x) {
-    for (var j in x[i]) {
-
-        //Should yield an implicit 'any' error
-        var _j = x[i][j];
-    }
-
-    for (var k in x[0]) {
-        var k1 = x[0];
-
-        //Should yield an implicit 'any' error
-        var k2 = k1[k];
-    }
-}
-
-for (var a in x) {
-    // Should yield an implicit 'any' error.
-    var b;
-
-    var c = a || b;
-}
-
-var idx = 0;
-var m = [1, 2, 3, 4, 5];
-// Should yield an implicit 'any' error.
-var n = [[]] || [];
-
-for (n[idx++] in m);
\ No newline at end of file
diff --git a/tests/cases/compiler/noImplicitAnyIndexing.ts b/tests/cases/compiler/noImplicitAnyIndexing.ts
deleted file mode 100644
index 7f76697f8c1..00000000000
--- a/tests/cases/compiler/noImplicitAnyIndexing.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-//@noImplicitAny: true
-
-enum MyEmusEnum {
-    emu
-}
-
-// Should be okay; should be a string.
-var strRepresentation1 = MyEmusEnum[0]
-
-// Should be okay; should be a string.
-var strRepresentation2 = MyEmusEnum[MyEmusEnum.emu]
-
-// Should be implicit 'any' ; property access fails, no string indexer.
-var strRepresentation3 = MyEmusEnum["monehh"];
-
-// Should be okay; should be a MyEmusEnum
-var strRepresentation4 = MyEmusEnum["emu"];
-
-
-// Should report an implicit 'any'.
-var x = {}["hi"];
-
-// Should report an implicit 'any'.
-var y = {}[10];
-
-
-var hi: any = "hi";
-
-var emptyObj = {};
-
-// Should report an implicit 'any'.
-var z1 = emptyObj[hi];
-var z2 = (<any>emptyObj)[hi];
-
-interface MyMap<T> {
-    [key: string]: T;
-}
-
-var m: MyMap<number> = {
-    "0": 0,
-    "1": 1,
-    "2": 2,
-    "Okay that's enough for today.": NaN
-};
-
-var mResult1 = m[MyEmusEnum.emu];
-var mResult2 = m[MyEmusEnum[MyEmusEnum.emu]];
-var mResult3 = m[hi];
-
diff --git a/tests/cases/compiler/noImplicitAnyParametersInAmbientClass.ts b/tests/cases/compiler/noImplicitAnyParametersInAmbientClass.ts
deleted file mode 100644
index 7f2a66109d1..00000000000
--- a/tests/cases/compiler/noImplicitAnyParametersInAmbientClass.ts
+++ /dev/null
@@ -1,93 +0,0 @@
-//@noImplicitAny: true
-
-declare class D_C {
-    // No implicit-'any' errors.
-    public pub_f1(): void;
-
-    // Implicit-'any' errors for x.
-    public pub_f2(x): void;
-
-    // No implicit-'any' errors.
-    public pub_f3(x: any): void;
-
-    // Implicit-'any' errors for x, y, and z.
-    public pub_f4(x, y, z): void;
-
-    // Implicit-'any' errors for x, and z.
-    public pub_f5(x, y: any, z): void;
-
-    // Implicit-'any[]' errors for r.
-    public pub_f6(...r): void;
-
-    // Implicit-'any'/'any[]' errors for x, r.
-    public pub_f7(x, ...r): void;
-
-    // Implicit-'any' errors for x1, y2, x3, and y3.
-    public pub_f8(x1, y1: number): any;
-    public pub_f8(x2: string, y2): any;
-    public pub_f8(x3, y3): any;
-
-    // No implicit-'any' errors.
-    public pub_f9: () => string;
-
-    // Implicit-'any' error for x.
-    public pub_f10: (x) => string;
-
-    // Implicit-'any' errors for x, y, and z.
-    public pub_f11: (x, y, z) => string;
-
-    // Implicit-'any' errors for x and z.
-    public pub_f12: (x, y: any, z) => string;
-
-    // Implicit-'any[]' error for r.
-    public pub_f13: (...r) => string;
-
-    // Implicit-'any'/'any[]' errors for x, r.
-    public pub_f14: (x, ...r) => string;
-
-    ///////////////////////////////////////////
-
-    // No implicit-'any' errors.
-    private priv_f1(): void;
-
-    // No implicit-'any' errors.
-    private priv_f2(x): void;
-
-    // No implicit-'any' errors.
-    private priv_f3(x: any): void;
-
-    // No implicit-'any' errors.
-    private priv_f4(x, y, z): void;
-
-    // No implicit-'any' errors.
-    private priv_f5(x, y: any, z): void;
-
-    // No implicit-'any' errors.
-    private priv_f6(...r): void;
-
-    // No implicit-'any' errors.
-    private priv_f7(x, ...r): void;
-
-    // No implicit-'any' errors.
-    private priv_f8(x1, y1: number): any;
-    private priv_f8(x2: string, y2): any;
-    private priv_f8(x3, y3): any;
-
-    // No implicit-'any' errors.
-    private priv_f9: () => string;
-
-    // Implicit-'any' error for x.
-    private priv_f10: (x) => string;
-
-    // Implicit-'any' errors for x, y, and z.
-    private priv_f11: (x, y, z) => string;
-
-    // Implicit-'any' errors for x and z.
-    private priv_f12: (x, y: any, z) => string;
-
-    // Implicit-'any[]' error for r.
-    private priv_f13: (...r) => string;
-
-    // Implicit-'any'/'any[]' errors for x, r.
-    private priv_f14: (x, ...r) => string;
-}
\ No newline at end of file
diff --git a/tests/cases/compiler/noImplicitAnyParametersInAmbientFunctions.ts b/tests/cases/compiler/noImplicitAnyParametersInAmbientFunctions.ts
deleted file mode 100644
index 4e34a58768c..00000000000
--- a/tests/cases/compiler/noImplicitAnyParametersInAmbientFunctions.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-//@noImplicitAny: true
-
-// No implicit-'any' errors.
-declare function d_f1(): void;
-
-// Implicit-'any' errors for x.
-declare function d_f2(x): void;
-
-// No implicit-'any' errors.
-declare function d_f3(x: any): void;
-
-// Implicit-'any' errors for x, y, and z.
-declare function d_f4(x, y, z): void;
-
-// Implicit-'any' errors for x, and z.
-declare function d_f5(x, y: any, z): void;
-
-// Implicit-'any[]' errors for r.
-declare function d_f6(...r): void;
-
-// Implicit-'any'/'any[]' errors for x, r.
-declare function d_f7(x, ...r): void;
-
-// Implicit-'any' errors for x1, y2, x3, and y3.
-declare function d_f8(x1, y1: number): any;
-declare function d_f8(x2: string, y2): any;
-declare function d_f8(x3, y3): any;
-
-// No implicit-'any' errors.
-declare var d_f9: () => string;
-
-// Implicit-'any' error for x.
-declare var d_f10: (x) => string;
-
-// Implicit-'any' errors for x, y, and z.
-declare var d_f11: (x, y, z) => string;
-
-// Implicit-'any' errors for x and z.
-declare var d_f12: (x, y: any, z) => string;
-
-// Implicit-'any[]' error for r.
-declare var d_f13: (...r) => string;
-
-// Implicit-'any'/'any[]' errors for x, r.
-declare var d_f14: (x, ...r) => string;
\ No newline at end of file
diff --git a/tests/cases/compiler/noImplicitAnyParametersInAmbientModule.ts b/tests/cases/compiler/noImplicitAnyParametersInAmbientModule.ts
deleted file mode 100644
index 5ccc82bf690..00000000000
--- a/tests/cases/compiler/noImplicitAnyParametersInAmbientModule.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-//@noImplicitAny: true
-
-declare module D_M {
-    // No implicit-'any' errors.
-    function dm_f1(): void;
-
-    // No implicit-'any' errors.
-    function dm_f2(x): void;
-
-    // No implicit-'any' errors.
-    function dm_f3(x: any): void;
-
-    // No implicit-'any' errors.
-    function dm_f4(x, y, z): void;
-
-    // No implicit-'any' errors.
-    function dm_f5(x, y: any, z): void;
-
-    // No implicit-'any' errors.
-    function dm_f6(...r): void;
-
-    // No implicit-'any' errors.
-    function dm_f7(x, ...r): void;
-
-    // No implicit-'any' errors.
-    function dm_f8(x1, y1: number): any;
-    function dm_f8(x2: string, y2): any;
-    function dm_f8(x3, y3): any;
-
-    // No implicit-'any' errors.
-    var dm_f9: () => string;
-
-    // No implicit-'any' errors.
-    var dm_f10: (x) => string;
-
-    // No implicit-'any' errors.
-    var dm_f11: (x, y, z) => string;
-
-    // No implicit-'any' errors.
-    var dm_f12: (x, y: any, z) => string;
-
-    // No implicit-'any' errors.
-    var dm_f13: (...r) => string;
-
-    // No implicit-'any' errors.
-    var dm_f14: (x, ...r) => string;
-}
\ No newline at end of file
diff --git a/tests/cases/compiler/noImplicitAnyParametersInBareFunctions.ts b/tests/cases/compiler/noImplicitAnyParametersInBareFunctions.ts
deleted file mode 100644
index a0371a9d0d1..00000000000
--- a/tests/cases/compiler/noImplicitAnyParametersInBareFunctions.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-//@noImplicitAny: true
-
-// No implicit-'any' errors.
-function f1(): void { }
-
-// Implicit-'any' error for x.
-function f2(x): void { }
-
-// No implicit-'any' errors.
-function f3(x: any): void { }
-
-// Implicit-'any' errors for x, y, and z.
-function f4(x, y, z): void { }
-
-// Implicit-'any' errors for x, and z.
-function f5(x, y: any, z): void { }
-
-// Implicit-'any[]' error for r.
-function f6(...r): void { }
-
-// Implicit-'any'/'any[]' errors for x, r.
-function f7(x, ...r): void { }
-
-// Implicit-'any' errors for x1, y2, x3, and y3.
-function f8(x1, y1: number): any;
-function f8(x2: string, y2): any;
-function f8(x3, y3): any { } 
-
-// No implicit-'any' errors.
-var f9 = () => "";
-
-// Implicit-'any' errors for x.
-var f10 = (x) => "";
-
-// Implicit-'any' errors for x, y, and z.
-var f11 = (x, y, z) => "";
-
-// Implicit-'any' errors for x and z.
-var f12 = (x, y: any, z) => "";
-
-// Implicit-'any[]' error for r.
-var f13 = (...r) => "";
-
-// Implicit-'any'/'any[]' errors for x, r.
-var f14 = (x, ...r) => "";
\ No newline at end of file
diff --git a/tests/cases/compiler/noImplicitAnyParametersInClass.ts b/tests/cases/compiler/noImplicitAnyParametersInClass.ts
deleted file mode 100644
index 912725912f6..00000000000
--- a/tests/cases/compiler/noImplicitAnyParametersInClass.ts
+++ /dev/null
@@ -1,93 +0,0 @@
-//@noImplicitAny: true
-
-class C {
-    // No implicit-'any' errors.
-    public pub_f1(): void { }
-
-    // Implicit-'any' errors for x.
-    public pub_f2(x): void { }
-
-    // No implicit-'any' errors.
-    public pub_f3(x: any): void { }
-
-    // Implicit-'any' errors for x, y, and z.
-    public pub_f4(x, y, z): void { }
-
-    // Implicit-'any' errors for x, and z.
-    public pub_f5(x, y: any, z): void { }
-
-    // Implicit-'any[]' errors for r.
-    public pub_f6(...r): void { }
-
-    // Implicit-'any'/'any[]' errors for x, r.
-    public pub_f7(x, ...r): void { }
-
-    // Implicit-'any' errors for x1, y2, x3, and y3.
-    public pub_f8(x1, y1: number): any;
-    public pub_f8(x2: string, y2): any;
-    public pub_f8(x3, y3): any { }
-
-    // No implicit-'any' errors.
-    public pub_f9 = () => "";
-
-    // Implicit-'any' errors for x.
-    public pub_f10 = (x) => "";
-
-    // Implicit-'any' errors for x, y, and z.
-    public pub_f11 = (x, y, z) => "";
-
-    // Implicit-'any' errors for x and z.
-    public pub_f12 = (x, y: any, z) => "";
-
-    // Implicit-'any[]' error for r.
-    public pub_f13 = (...r) => "";
-
-    // Implicit-'any'/'any[]' errors for x, r.
-    public pub_f14 = (x, ...r) => "";
-
-    ///////////////////////////////////////////
-
-    // No implicit-'any' errors.
-    private priv_f1(): void { }
-
-    // Implicit-'any' errors for x.
-    private priv_f2(x): void { }
-
-    // No implicit-'any' errors.
-    private priv_f3(x: any): void { }
-
-    // Implicit-'any' errors for x, y, and z.
-    private priv_f4(x, y, z): void { }
-
-    // Implicit-'any' errors for x, and z.
-    private priv_f5(x, y: any, z): void { }
-
-    // Implicit-'any[]' errors for r.
-    private priv_f6(...r): void { }
-
-    // Implicit-'any'/'any[]' errors for x, r.
-    private priv_f7(x, ...r): void { }
-
-    // Implicit-'any' errors for x1, y2, x3, and y3.
-    private priv_f8(x1, y1: number): any;
-    private priv_f8(x2: string, y2): any;
-    private priv_f8(x3, y3): any { }
-
-    // No implicit-'any' errors.
-    private priv_f9 = () => "";
-
-    // Implicit-'any' errors for x.
-    private priv_f10 = (x) => "";
-
-    // Implicit-'any' errors for x, y, and z.
-    private priv_f11 = (x, y, z) => "";
-
-    // Implicit-'any' errors for x and z.
-    private priv_f12 = (x, y: any, z) => "";
-
-    // Implicit-'any[]' error for r.
-    private priv_f13 = (...r) => "";
-
-    // Implicit-'any'/'any[]' errors for x, r.
-    private priv_f14 = (x, ...r) => "";
-}
\ No newline at end of file
diff --git a/tests/cases/compiler/noImplicitAnyParametersInInterface.ts b/tests/cases/compiler/noImplicitAnyParametersInInterface.ts
deleted file mode 100644
index eab18458718..00000000000
--- a/tests/cases/compiler/noImplicitAnyParametersInInterface.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-//@noImplicitAny: true
-
-interface I {
-    // Implicit-'any' errors for first two call signatures, x1, x2, z2.
-    ();
-    (x1);
-    (x2, y2: string, z2): any;
-
-    // No implicit-'any' errors.
-    f1(): void;
-
-    // Implicit-'any' errors for x.
-    f2(x): void;
-
-    // No implicit-'any' errors.
-    f3(x: any): void;
-
-    // Implicit-'any' errors for x, y, and z.
-    f4(x, y, z): void;
-
-    // Implicit-'any' errors for x, and z.
-    f5(x, y: any, z): void;
-
-    // Implicit-'any[]' errors for r.
-    f6(...r): void;
-
-    // Implicit-'any'/'any[]' errors for x, r.
-    f7(x, ...r): void;
-
-    // Implicit-'any' errors for x1, y2, x3, and y3.
-    f8(x1, y1: number): any;
-    f8(x2: string, y2): any;
-    f8(x3, y3): any;
-
-    // No implicit-'any' errors.
-    f9: () => string;
-
-    // Implicit-'any' errors for x.
-    f10: (x) => string;
-
-    // Implicit-'any' errors for x, y, and z.
-    f11: (x, y, z) => string;
-
-    // Implicit-'any' errors for x and z.
-    f12: (x, y: any, z) => string;
-
-    // Implicit-'any[]' error for r.
-    f13: (...r) => string;
-
-    // Implicit-'any'/'any[]' errors for x, r.
-    f14: (x, ...r) => string;
-}
\ No newline at end of file
diff --git a/tests/cases/compiler/noImplicitAnyParametersInModule.ts b/tests/cases/compiler/noImplicitAnyParametersInModule.ts
deleted file mode 100644
index 69dd3c8c647..00000000000
--- a/tests/cases/compiler/noImplicitAnyParametersInModule.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-//@noImplicitAny: true
-
-module M {
-    // No implicit-'any' errors.
-    function m_f1(): void { }
-
-    // Implicit-'any' error for x.
-    function m_f2(x): void { }
-
-    // No implicit-'any' errors.
-    function m_f3(x: any): void { }
-
-    // Implicit-'any' errors for x, y, and z.
-    function m_f4(x, y, z): void { }
-
-    // Implicit-'any' errors for x and z.
-    function m_f5(x, y: any, z): void { }
-
-    // Implicit-'any[]' error for r.
-    function m_f6(...r): void { }
-
-    // Implicit-'any'/'any[]' errors for x and r.
-    function m_f7(x, ...r): void { }
-
-    // Implicit-'any' errors for x1, y2, x3, and y3.
-    function m_f8(x1, y1: number): any;
-    function m_f8(x2: string, y2): any;
-    function m_f8(x3, y3): any { }
-
-    // No implicit-'any' errors.
-    var m_f9 = () => "";
-
-    // Implicit-'any' error for x.
-    var m_f10 = (x) => "";
-
-    // Implicit-'any' errors for x, y, and z.
-    var m_f11 = (x, y, z) => "";
-
-    // Implicit-'any' errors for x and z.
-    var m_f12 = (x, y: any, z) => "";
-
-    // Implicit-'any[]' errors for r.
-    var m_f13 = (...r) => "";
-
-    // Implicit-'any'/'any[]' errors for x and r.
-    var m_f14 = (x, ...r) => "";
-}
\ No newline at end of file
diff --git a/tests/cases/compiler/overloadsInDifferentContainersDisagreeOnAmbient.ts b/tests/cases/compiler/overloadsInDifferentContainersDisagreeOnAmbient.ts
deleted file mode 100644
index eb22f0a2447..00000000000
--- a/tests/cases/compiler/overloadsInDifferentContainersDisagreeOnAmbient.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-declare module M {
-    // Error because body is not ambient and this overload is
-    export function f();
-}
-
-module M {
-    export function f() { }
-}
\ No newline at end of file
diff --git a/tests/cases/compiler/parsingClassRecoversWhenHittingUnexpectedSemicolon.ts b/tests/cases/compiler/parsingClassRecoversWhenHittingUnexpectedSemicolon.ts
deleted file mode 100644
index 4ec21368fb8..00000000000
--- a/tests/cases/compiler/parsingClassRecoversWhenHittingUnexpectedSemicolon.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-class C {
-    public f() { };
-    private m;
-}
diff --git a/tests/cases/compiler/prefixIncrementAsOperandOfPlusExpression.ts b/tests/cases/compiler/prefixIncrementAsOperandOfPlusExpression.ts
deleted file mode 100644
index ae9af83d8e4..00000000000
--- a/tests/cases/compiler/prefixIncrementAsOperandOfPlusExpression.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-var x = 1;
-var y = 1;
-+ ++x;
-+ ++y;
\ No newline at end of file
diff --git a/tests/cases/compiler/privacyAccessorDeclFile.ts b/tests/cases/compiler/privacyAccessorDeclFile.ts
deleted file mode 100644
index 25d590c0d37..00000000000
--- a/tests/cases/compiler/privacyAccessorDeclFile.ts
+++ /dev/null
@@ -1,1061 +0,0 @@
-// @target: ES5
-// @module: commonjs
-// @declaration: true
-
-// @Filename:privacyAccessorDeclFile_externalModule.ts
-class privateClass {
-}
-
-export class publicClass {
-}
-
-export class publicClassWithWithPrivateGetAccessorTypes {
-    static get myPublicStaticMethod(): privateClass { // Error
-        return null;
-    }
-    private static get myPrivateStaticMethod(): privateClass {
-        return null;
-    }
-    get myPublicMethod(): privateClass { // Error
-        return null;
-    }
-    private get myPrivateMethod(): privateClass {
-        return null;
-    }
-    static get myPublicStaticMethod1() { // Error
-        return new privateClass();
-    }
-    private static get myPrivateStaticMethod1() {
-        return new privateClass();
-    }
-    get myPublicMethod1() { // Error
-        return new privateClass();
-    }
-    private get myPrivateMethod1() {
-        return new privateClass();
-    }
-}
-
-export class publicClassWithWithPublicGetAccessorTypes {
-    static get myPublicStaticMethod(): publicClass {
-        return null;
-    }
-    private static get myPrivateStaticMethod(): publicClass {
-        return null;
-    }
-    get myPublicMethod(): publicClass {
-        return null;
-    }
-    private get myPrivateMethod(): publicClass {
-        return null;
-    }
-    static get myPublicStaticMethod1() {
-        return new publicClass();
-    }
-    private static get myPrivateStaticMethod1() {
-        return new publicClass();
-    }
-    get myPublicMethod1() {
-        return new publicClass();
-    }
-    private get myPrivateMethod1() {
-        return new publicClass();
-    }
-}
-
-class privateClassWithWithPrivateGetAccessorTypes {
-    static get myPublicStaticMethod(): privateClass {
-        return null;
-    }
-    private static get myPrivateStaticMethod(): privateClass {
-        return null;
-    }
-    get myPublicMethod(): privateClass {
-        return null;
-    }
-    private get myPrivateMethod(): privateClass {
-        return null;
-    }
-    static get myPublicStaticMethod1() {
-        return new privateClass();
-    }
-    private static get myPrivateStaticMethod1() {
-        return new privateClass();
-    }
-    get myPublicMethod1() {
-        return new privateClass();
-    }
-    private get myPrivateMethod1() {
-        return new privateClass();
-    }
-}
-
-class privateClassWithWithPublicGetAccessorTypes {
-    static get myPublicStaticMethod(): publicClass {
-        return null;
-    }
-    private static get myPrivateStaticMethod(): publicClass {
-        return null;
-    }
-    get myPublicMethod(): publicClass {
-        return null;
-    }
-    private get myPrivateMethod(): publicClass {
-        return null;
-    }
-    static get myPublicStaticMethod1() {
-        return new publicClass();
-    }
-    private static get myPrivateStaticMethod1() {
-        return new publicClass();
-    }
-    get myPublicMethod1() {
-        return new publicClass();
-    }
-    private get myPrivateMethod1() {
-        return new publicClass();
-    }
-}
-
-export class publicClassWithWithPrivateSetAccessorTypes {
-    static set myPublicStaticMethod(param: privateClass) { // Error
-    }
-    private static set myPrivateStaticMethod(param: privateClass) {
-    }
-    set myPublicMethod(param: privateClass) { // Error
-    }
-    private set myPrivateMethod(param: privateClass) {
-    }
-}
-
-export class publicClassWithWithPublicSetAccessorTypes {
-    static set myPublicStaticMethod(param: publicClass) {
-    }
-    private static set myPrivateStaticMethod(param: publicClass) {
-    }
-    set myPublicMethod(param: publicClass) {
-    }
-    private set myPrivateMethod(param: publicClass) {
-    }
-}
-
-class privateClassWithWithPrivateSetAccessorTypes {
-    static set myPublicStaticMethod(param: privateClass) {
-    }
-    private static set myPrivateStaticMethod(param: privateClass) {
-    }
-    set myPublicMethod(param: privateClass) { 
-    }
-    private set myPrivateMethod(param: privateClass) {
-    }
-}
-
-class privateClassWithWithPublicSetAccessorTypes {
-    static set myPublicStaticMethod(param: publicClass) {
-    }
-    private static set myPrivateStaticMethod(param: publicClass) {
-    }
-    set myPublicMethod(param: publicClass) {
-    }
-    private set myPrivateMethod(param: publicClass) {
-    }
-}
-
-export class publicClassWithPrivateModuleGetAccessorTypes {
-    static get myPublicStaticMethod(): privateModule.publicClass { // Error
-        return null;
-    }
-    get myPublicMethod(): privateModule.publicClass { // Error
-        return null;
-    }
-    static get myPublicStaticMethod1() { // Error
-        return new privateModule.publicClass();
-    }
-    get myPublicMethod1() { // Error
-        return new privateModule.publicClass();
-    }
-}
-
-export class publicClassWithPrivateModuleSetAccessorTypes {
-    static set myPublicStaticMethod(param: privateModule.publicClass) { // Error
-    }
-    set myPublicMethod(param: privateModule.publicClass) { // Error
-    }
-}
-
-class privateClassWithPrivateModuleGetAccessorTypes {
-    static get myPublicStaticMethod(): privateModule.publicClass {
-        return null;
-    }
-    get myPublicMethod(): privateModule.publicClass {
-        return null;
-    }
-    static get myPublicStaticMethod1() {
-        return new privateModule.publicClass();
-    }
-    get myPublicMethod1() {
-        return new privateModule.publicClass();
-    }
-}
-
-class privateClassWithPrivateModuleSetAccessorTypes {
-    static set myPublicStaticMethod(param: privateModule.publicClass) {
-    }
-    set myPublicMethod(param: privateModule.publicClass) {
-    }
-}
-
-export module publicModule {
-    class privateClass {
-    }
-
-    export class publicClass {
-    }
-    export class publicClassWithWithPrivateGetAccessorTypes {
-        static get myPublicStaticMethod(): privateClass { // Error
-            return null;
-        }
-        private static get myPrivateStaticMethod(): privateClass {
-            return null;
-        }
-        get myPublicMethod(): privateClass { // Error
-            return null;
-        }
-        private get myPrivateMethod(): privateClass {
-            return null;
-        }
-        static get myPublicStaticMethod1() { // Error
-            return new privateClass();
-        }
-        private static get myPrivateStaticMethod1() {
-            return new privateClass();
-        }
-        get myPublicMethod1() { // Error
-            return new privateClass();
-        }
-        private get myPrivateMethod1() {
-            return new privateClass();
-        }
-    }
-
-    export class publicClassWithWithPublicGetAccessorTypes {
-        static get myPublicStaticMethod(): publicClass {
-            return null;
-        }
-        private static get myPrivateStaticMethod(): publicClass {
-            return null;
-        }
-        get myPublicMethod(): publicClass {
-            return null;
-        }
-        private get myPrivateMethod(): publicClass {
-            return null;
-        }
-        static get myPublicStaticMethod1() {
-            return new publicClass();
-        }
-        private static get myPrivateStaticMethod1() {
-            return new publicClass();
-        }
-        get myPublicMethod1() {
-            return new publicClass();
-        }
-        private get myPrivateMethod1() {
-            return new publicClass();
-        }
-    }
-
-    class privateClassWithWithPrivateGetAccessorTypes {
-        static get myPublicStaticMethod(): privateClass {
-            return null;
-        }
-        private static get myPrivateStaticMethod(): privateClass {
-            return null;
-        }
-        get myPublicMethod(): privateClass {
-            return null;
-        }
-        private get myPrivateMethod(): privateClass {
-            return null;
-        }
-        static get myPublicStaticMethod1() {
-            return new privateClass();
-        }
-        private static get myPrivateStaticMethod1() {
-            return new privateClass();
-        }
-        get myPublicMethod1() {
-            return new privateClass();
-        }
-        private get myPrivateMethod1() {
-            return new privateClass();
-        }
-    }
-
-    class privateClassWithWithPublicGetAccessorTypes {
-        static get myPublicStaticMethod(): publicClass {
-            return null;
-        }
-        private static get myPrivateStaticMethod(): publicClass {
-            return null;
-        }
-        get myPublicMethod(): publicClass {
-            return null;
-        }
-        private get myPrivateMethod(): publicClass {
-            return null;
-        }
-        static get myPublicStaticMethod1() {
-            return new publicClass();
-        }
-        private static get myPrivateStaticMethod1() {
-            return new publicClass();
-        }
-        get myPublicMethod1() {
-            return new publicClass();
-        }
-        private get myPrivateMethod1() {
-            return new publicClass();
-        }
-    }
-
-    export class publicClassWithWithPrivateSetAccessorTypes {
-        static set myPublicStaticMethod(param: privateClass) { // Error
-        }
-        private static set myPrivateStaticMethod(param: privateClass) {
-        }
-        set myPublicMethod(param: privateClass) { // Error
-        }
-        private set myPrivateMethod(param: privateClass) {
-        }
-    }
-
-    export class publicClassWithWithPublicSetAccessorTypes {
-        static set myPublicStaticMethod(param: publicClass) {
-        }
-        private static set myPrivateStaticMethod(param: publicClass) {
-        }
-        set myPublicMethod(param: publicClass) {
-        }
-        private set myPrivateMethod(param: publicClass) {
-        }
-    }
-
-    class privateClassWithWithPrivateSetAccessorTypes {
-        static set myPublicStaticMethod(param: privateClass) {
-        }
-        private static set myPrivateStaticMethod(param: privateClass) {
-        }
-        set myPublicMethod(param: privateClass) {
-        }
-        private set myPrivateMethod(param: privateClass) {
-        }
-    }
-
-    class privateClassWithWithPublicSetAccessorTypes {
-        static set myPublicStaticMethod(param: publicClass) {
-        }
-        private static set myPrivateStaticMethod(param: publicClass) {
-        }
-        set myPublicMethod(param: publicClass) {
-        }
-        private set myPrivateMethod(param: publicClass) {
-        }
-    }
-
-    export class publicClassWithPrivateModuleGetAccessorTypes {
-        static get myPublicStaticMethod(): privateModule.publicClass { // Error
-            return null;
-        }
-        get myPublicMethod(): privateModule.publicClass { // Error
-            return null;
-        }
-        static get myPublicStaticMethod1() { // Error
-            return new privateModule.publicClass();
-        }
-        get myPublicMethod1() { // Error
-            return new privateModule.publicClass();
-        }
-    }
-
-    export class publicClassWithPrivateModuleSetAccessorTypes {
-        static set myPublicStaticMethod(param: privateModule.publicClass) { // Error
-        }
-        set myPublicMethod(param: privateModule.publicClass) { // Error
-        }
-    }
-
-    class privateClassWithPrivateModuleGetAccessorTypes {
-        static get myPublicStaticMethod(): privateModule.publicClass {
-            return null;
-        }
-        get myPublicMethod(): privateModule.publicClass {
-            return null;
-        }
-        static get myPublicStaticMethod1() {
-            return new privateModule.publicClass();
-        }
-        get myPublicMethod1() {
-            return new privateModule.publicClass();
-        }
-    }
-
-    class privateClassWithPrivateModuleSetAccessorTypes {
-        static set myPublicStaticMethod(param: privateModule.publicClass) {
-        }
-        set myPublicMethod(param: privateModule.publicClass) {
-        }
-    }
-}
-
-module privateModule {
-    class privateClass {
-    }
-
-    export class publicClass {
-    }
-    export class publicClassWithWithPrivateGetAccessorTypes {
-        static get myPublicStaticMethod(): privateClass { 
-            return null;
-        }
-        private static get myPrivateStaticMethod(): privateClass {
-            return null;
-        }
-        get myPublicMethod(): privateClass { 
-            return null;
-        }
-        private get myPrivateMethod(): privateClass {
-            return null;
-        }
-        static get myPublicStaticMethod1() { 
-            return new privateClass();
-        }
-        private static get myPrivateStaticMethod1() {
-            return new privateClass();
-        }
-        get myPublicMethod1() { 
-            return new privateClass();
-        }
-        private get myPrivateMethod1() {
-            return new privateClass();
-        }
-    }
-
-    export class publicClassWithWithPublicGetAccessorTypes {
-        static get myPublicStaticMethod(): publicClass {
-            return null;
-        }
-        private static get myPrivateStaticMethod(): publicClass {
-            return null;
-        }
-        get myPublicMethod(): publicClass {
-            return null;
-        }
-        private get myPrivateMethod(): publicClass {
-            return null;
-        }
-        static get myPublicStaticMethod1() {
-            return new publicClass();
-        }
-        private static get myPrivateStaticMethod1() {
-            return new publicClass();
-        }
-        get myPublicMethod1() {
-            return new publicClass();
-        }
-        private get myPrivateMethod1() {
-            return new publicClass();
-        }
-    }
-
-    class privateClassWithWithPrivateGetAccessorTypes {
-        static get myPublicStaticMethod(): privateClass {
-            return null;
-        }
-        private static get myPrivateStaticMethod(): privateClass {
-            return null;
-        }
-        get myPublicMethod(): privateClass {
-            return null;
-        }
-        private get myPrivateMethod(): privateClass {
-            return null;
-        }
-        static get myPublicStaticMethod1() {
-            return new privateClass();
-        }
-        private static get myPrivateStaticMethod1() {
-            return new privateClass();
-        }
-        get myPublicMethod1() {
-            return new privateClass();
-        }
-        private get myPrivateMethod1() {
-            return new privateClass();
-        }
-    }
-
-    class privateClassWithWithPublicGetAccessorTypes {
-        static get myPublicStaticMethod(): publicClass {
-            return null;
-        }
-        private static get myPrivateStaticMethod(): publicClass {
-            return null;
-        }
-        get myPublicMethod(): publicClass {
-            return null;
-        }
-        private get myPrivateMethod(): publicClass {
-            return null;
-        }
-        static get myPublicStaticMethod1() {
-            return new publicClass();
-        }
-        private static get myPrivateStaticMethod1() {
-            return new publicClass();
-        }
-        get myPublicMethod1() {
-            return new publicClass();
-        }
-        private get myPrivateMethod1() {
-            return new publicClass();
-        }
-    }
-
-    export class publicClassWithWithPrivateSetAccessorTypes {
-        static set myPublicStaticMethod(param: privateClass) { 
-        }
-        private static set myPrivateStaticMethod(param: privateClass) {
-        }
-        set myPublicMethod(param: privateClass) { 
-        }
-        private set myPrivateMethod(param: privateClass) {
-        }
-    }
-
-    export class publicClassWithWithPublicSetAccessorTypes {
-        static set myPublicStaticMethod(param: publicClass) {
-        }
-        private static set myPrivateStaticMethod(param: publicClass) {
-        }
-        set myPublicMethod(param: publicClass) {
-        }
-        private set myPrivateMethod(param: publicClass) {
-        }
-    }
-
-    class privateClassWithWithPrivateSetAccessorTypes {
-        static set myPublicStaticMethod(param: privateClass) {
-        }
-        private static set myPrivateStaticMethod(param: privateClass) {
-        }
-        set myPublicMethod(param: privateClass) {
-        }
-        private set myPrivateMethod(param: privateClass) {
-        }
-    }
-
-    class privateClassWithWithPublicSetAccessorTypes {
-        static set myPublicStaticMethod(param: publicClass) {
-        }
-        private static set myPrivateStaticMethod(param: publicClass) {
-        }
-        set myPublicMethod(param: publicClass) {
-        }
-        private set myPrivateMethod(param: publicClass) {
-        }
-    }
-
-    export class publicClassWithPrivateModuleGetAccessorTypes {
-        static get myPublicStaticMethod(): privateModule.publicClass { 
-            return null;
-        }
-        get myPublicMethod(): privateModule.publicClass { 
-            return null;
-        }
-        static get myPublicStaticMethod1() { 
-            return new privateModule.publicClass();
-        }
-        get myPublicMethod1() { 
-            return new privateModule.publicClass();
-        }
-    }
-
-    export class publicClassWithPrivateModuleSetAccessorTypes {
-        static set myPublicStaticMethod(param: privateModule.publicClass) { 
-        }
-        set myPublicMethod(param: privateModule.publicClass) { 
-        }
-    }
-
-    class privateClassWithPrivateModuleGetAccessorTypes {
-        static get myPublicStaticMethod(): privateModule.publicClass {
-            return null;
-        }
-        get myPublicMethod(): privateModule.publicClass {
-            return null;
-        }
-        static get myPublicStaticMethod1() {
-            return new privateModule.publicClass();
-        }
-        get myPublicMethod1() {
-            return new privateModule.publicClass();
-        }
-    }
-
-    class privateClassWithPrivateModuleSetAccessorTypes {
-        static set myPublicStaticMethod(param: privateModule.publicClass) {
-        }
-        set myPublicMethod(param: privateModule.publicClass) {
-        }
-    }
-}
-
-// @Filename: privacyAccessorDeclFile_GlobalFile.ts
-class publicClassInGlobal {
-}
-
-class publicClassInGlobalWithPublicGetAccessorTypes {
-    static get myPublicStaticMethod(): publicClassInGlobal {
-        return null;
-    }
-    private static get myPrivateStaticMethod(): publicClassInGlobal {
-        return null;
-    }
-    get myPublicMethod(): publicClassInGlobal {
-        return null;
-    }
-    private get myPrivateMethod(): publicClassInGlobal {
-        return null;
-    }
-    static get myPublicStaticMethod1() {
-        return new publicClassInGlobal();
-    }
-    private static get myPrivateStaticMethod1() {
-        return new publicClassInGlobal();
-    }
-    get myPublicMethod1() {
-        return new publicClassInGlobal();
-    }
-    private get myPrivateMethod1() {
-        return new publicClassInGlobal();
-    }
-}
-
-class publicClassInGlobalWithWithPublicSetAccessorTypes {
-    static set myPublicStaticMethod(param: publicClassInGlobal) {
-    }
-    private static set myPrivateStaticMethod(param: publicClassInGlobal) {
-    }
-    set myPublicMethod(param: publicClassInGlobal) {
-    }
-    private set myPrivateMethod(param: publicClassInGlobal) {
-    }
-}
-
-module publicModuleInGlobal {
-    class privateClass {
-    }
-
-    export class publicClass {
-    }
-
-    module privateModule {
-        class privateClass {
-        }
-
-        export class publicClass {
-        }
-        export class publicClassWithWithPrivateGetAccessorTypes {
-            static get myPublicStaticMethod(): privateClass {
-                return null;
-            }
-            private static get myPrivateStaticMethod(): privateClass {
-                return null;
-            }
-            get myPublicMethod(): privateClass {
-                return null;
-            }
-            private get myPrivateMethod(): privateClass {
-                return null;
-            }
-            static get myPublicStaticMethod1() {
-                return new privateClass();
-            }
-            private static get myPrivateStaticMethod1() {
-                return new privateClass();
-            }
-            get myPublicMethod1() {
-                return new privateClass();
-            }
-            private get myPrivateMethod1() {
-                return new privateClass();
-            }
-        }
-
-        export class publicClassWithWithPublicGetAccessorTypes {
-            static get myPublicStaticMethod(): publicClass {
-                return null;
-            }
-            private static get myPrivateStaticMethod(): publicClass {
-                return null;
-            }
-            get myPublicMethod(): publicClass {
-                return null;
-            }
-            private get myPrivateMethod(): publicClass {
-                return null;
-            }
-            static get myPublicStaticMethod1() {
-                return new publicClass();
-            }
-            private static get myPrivateStaticMethod1() {
-                return new publicClass();
-            }
-            get myPublicMethod1() {
-                return new publicClass();
-            }
-            private get myPrivateMethod1() {
-                return new publicClass();
-            }
-        }
-
-        class privateClassWithWithPrivateGetAccessorTypes {
-            static get myPublicStaticMethod(): privateClass {
-                return null;
-            }
-            private static get myPrivateStaticMethod(): privateClass {
-                return null;
-            }
-            get myPublicMethod(): privateClass {
-                return null;
-            }
-            private get myPrivateMethod(): privateClass {
-                return null;
-            }
-            static get myPublicStaticMethod1() {
-                return new privateClass();
-            }
-            private static get myPrivateStaticMethod1() {
-                return new privateClass();
-            }
-            get myPublicMethod1() {
-                return new privateClass();
-            }
-            private get myPrivateMethod1() {
-                return new privateClass();
-            }
-        }
-
-        class privateClassWithWithPublicGetAccessorTypes {
-            static get myPublicStaticMethod(): publicClass {
-                return null;
-            }
-            private static get myPrivateStaticMethod(): publicClass {
-                return null;
-            }
-            get myPublicMethod(): publicClass {
-                return null;
-            }
-            private get myPrivateMethod(): publicClass {
-                return null;
-            }
-            static get myPublicStaticMethod1() {
-                return new publicClass();
-            }
-            private static get myPrivateStaticMethod1() {
-                return new publicClass();
-            }
-            get myPublicMethod1() {
-                return new publicClass();
-            }
-            private get myPrivateMethod1() {
-                return new publicClass();
-            }
-        }
-
-        export class publicClassWithWithPrivateSetAccessorTypes {
-            static set myPublicStaticMethod(param: privateClass) {
-            }
-            private static set myPrivateStaticMethod(param: privateClass) {
-            }
-            set myPublicMethod(param: privateClass) {
-            }
-            private set myPrivateMethod(param: privateClass) {
-            }
-        }
-
-        export class publicClassWithWithPublicSetAccessorTypes {
-            static set myPublicStaticMethod(param: publicClass) {
-            }
-            private static set myPrivateStaticMethod(param: publicClass) {
-            }
-            set myPublicMethod(param: publicClass) {
-            }
-            private set myPrivateMethod(param: publicClass) {
-            }
-        }
-
-        class privateClassWithWithPrivateSetAccessorTypes {
-            static set myPublicStaticMethod(param: privateClass) {
-            }
-            private static set myPrivateStaticMethod(param: privateClass) {
-            }
-            set myPublicMethod(param: privateClass) {
-            }
-            private set myPrivateMethod(param: privateClass) {
-            }
-        }
-
-        class privateClassWithWithPublicSetAccessorTypes {
-            static set myPublicStaticMethod(param: publicClass) {
-            }
-            private static set myPrivateStaticMethod(param: publicClass) {
-            }
-            set myPublicMethod(param: publicClass) {
-            }
-            private set myPrivateMethod(param: publicClass) {
-            }
-        }
-
-        export class publicClassWithPrivateModuleGetAccessorTypes {
-            static get myPublicStaticMethod(): privateModule.publicClass {
-                return null;
-            }
-            get myPublicMethod(): privateModule.publicClass {
-                return null;
-            }
-            static get myPublicStaticMethod1() {
-                return new privateModule.publicClass();
-            }
-            get myPublicMethod1() {
-                return new privateModule.publicClass();
-            }
-        }
-
-        export class publicClassWithPrivateModuleSetAccessorTypes {
-            static set myPublicStaticMethod(param: privateModule.publicClass) {
-            }
-            set myPublicMethod(param: privateModule.publicClass) {
-            }
-        }
-
-        class privateClassWithPrivateModuleGetAccessorTypes {
-            static get myPublicStaticMethod(): privateModule.publicClass {
-                return null;
-            }
-            get myPublicMethod(): privateModule.publicClass {
-                return null;
-            }
-            static get myPublicStaticMethod1() {
-                return new privateModule.publicClass();
-            }
-            get myPublicMethod1() {
-                return new privateModule.publicClass();
-            }
-        }
-
-        class privateClassWithPrivateModuleSetAccessorTypes {
-            static set myPublicStaticMethod(param: privateModule.publicClass) {
-            }
-            set myPublicMethod(param: privateModule.publicClass) {
-            }
-        }
-    }
-
-    export class publicClassWithWithPrivateGetAccessorTypes {
-        static get myPublicStaticMethod(): privateClass { // Error
-            return null;
-        }
-        private static get myPrivateStaticMethod(): privateClass {
-            return null;
-        }
-        get myPublicMethod(): privateClass { // Error
-            return null;
-        }
-        private get myPrivateMethod(): privateClass {
-            return null;
-        }
-        static get myPublicStaticMethod1() { // Error
-            return new privateClass();
-        }
-        private static get myPrivateStaticMethod1() {
-            return new privateClass();
-        }
-        get myPublicMethod1() { // Error
-            return new privateClass();
-        }
-        private get myPrivateMethod1() {
-            return new privateClass();
-        }
-    }
-
-    export class publicClassWithWithPublicGetAccessorTypes {
-        static get myPublicStaticMethod(): publicClass {
-            return null;
-        }
-        private static get myPrivateStaticMethod(): publicClass {
-            return null;
-        }
-        get myPublicMethod(): publicClass {
-            return null;
-        }
-        private get myPrivateMethod(): publicClass {
-            return null;
-        }
-        static get myPublicStaticMethod1() {
-            return new publicClass();
-        }
-        private static get myPrivateStaticMethod1() {
-            return new publicClass();
-        }
-        get myPublicMethod1() {
-            return new publicClass();
-        }
-        private get myPrivateMethod1() {
-            return new publicClass();
-        }
-    }
-
-    class privateClassWithWithPrivateGetAccessorTypes {
-        static get myPublicStaticMethod(): privateClass {
-            return null;
-        }
-        private static get myPrivateStaticMethod(): privateClass {
-            return null;
-        }
-        get myPublicMethod(): privateClass {
-            return null;
-        }
-        private get myPrivateMethod(): privateClass {
-            return null;
-        }
-        static get myPublicStaticMethod1() {
-            return new privateClass();
-        }
-        private static get myPrivateStaticMethod1() {
-            return new privateClass();
-        }
-        get myPublicMethod1() {
-            return new privateClass();
-        }
-        private get myPrivateMethod1() {
-            return new privateClass();
-        }
-    }
-
-    class privateClassWithWithPublicGetAccessorTypes {
-        static get myPublicStaticMethod(): publicClass {
-            return null;
-        }
-        private static get myPrivateStaticMethod(): publicClass {
-            return null;
-        }
-        get myPublicMethod(): publicClass {
-            return null;
-        }
-        private get myPrivateMethod(): publicClass {
-            return null;
-        }
-        static get myPublicStaticMethod1() {
-            return new publicClass();
-        }
-        private static get myPrivateStaticMethod1() {
-            return new publicClass();
-        }
-        get myPublicMethod1() {
-            return new publicClass();
-        }
-        private get myPrivateMethod1() {
-            return new publicClass();
-        }
-    }
-
-    export class publicClassWithWithPrivateSetAccessorTypes {
-        static set myPublicStaticMethod(param: privateClass) { // Error
-        }
-        private static set myPrivateStaticMethod(param: privateClass) {
-        }
-        set myPublicMethod(param: privateClass) { // Error
-        }
-        private set myPrivateMethod(param: privateClass) {
-        }
-    }
-
-    export class publicClassWithWithPublicSetAccessorTypes {
-        static set myPublicStaticMethod(param: publicClass) {
-        }
-        private static set myPrivateStaticMethod(param: publicClass) {
-        }
-        set myPublicMethod(param: publicClass) {
-        }
-        private set myPrivateMethod(param: publicClass) {
-        }
-    }
-
-    class privateClassWithWithPrivateSetAccessorTypes {
-        static set myPublicStaticMethod(param: privateClass) {
-        }
-        private static set myPrivateStaticMethod(param: privateClass) {
-        }
-        set myPublicMethod(param: privateClass) {
-        }
-        private set myPrivateMethod(param: privateClass) {
-        }
-    }
-
-    class privateClassWithWithPublicSetAccessorTypes {
-        static set myPublicStaticMethod(param: publicClass) {
-        }
-        private static set myPrivateStaticMethod(param: publicClass) {
-        }
-        set myPublicMethod(param: publicClass) {
-        }
-        private set myPrivateMethod(param: publicClass) {
-        }
-    }
-
-    export class publicClassWithPrivateModuleGetAccessorTypes {
-        static get myPublicStaticMethod(): privateModule.publicClass { // Error
-            return null;
-        }
-        get myPublicMethod(): privateModule.publicClass { // Error
-            return null;
-        }
-        static get myPublicStaticMethod1() { // Error
-            return new privateModule.publicClass();
-        }
-        get myPublicMethod1() { // Error
-            return new privateModule.publicClass();
-        }
-    }
-
-    export class publicClassWithPrivateModuleSetAccessorTypes {
-        static set myPublicStaticMethod(param: privateModule.publicClass) { // Error
-        }
-        set myPublicMethod(param: privateModule.publicClass) { // Error
-        }
-    }
-
-    class privateClassWithPrivateModuleGetAccessorTypes {
-        static get myPublicStaticMethod(): privateModule.publicClass {
-            return null;
-        }
-        get myPublicMethod(): privateModule.publicClass {
-            return null;
-        }
-        static get myPublicStaticMethod1() {
-            return new privateModule.publicClass();
-        }
-        get myPublicMethod1() {
-            return new privateModule.publicClass();
-        }
-    }
-
-    class privateClassWithPrivateModuleSetAccessorTypes {
-        static set myPublicStaticMethod(param: privateModule.publicClass) {
-        }
-        set myPublicMethod(param: privateModule.publicClass) {
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/cases/compiler/privacyCannotNameAccessorDeclFile.ts b/tests/cases/compiler/privacyCannotNameAccessorDeclFile.ts
deleted file mode 100644
index 1150cf963bf..00000000000
--- a/tests/cases/compiler/privacyCannotNameAccessorDeclFile.ts
+++ /dev/null
@@ -1,138 +0,0 @@
-// @target: ES5
-// @module: commonjs
-// @declaration: true
-
-// @Filename: privacyCannotNameAccessorDeclFile_GlobalWidgets.ts
-declare module "GlobalWidgets" {
-    export class Widget3 {
-        name: string;
-    }
-    export function createWidget3(): Widget3;
-
-    export module SpecializedGlobalWidget {
-        export class Widget4 {
-            name: string;
-        }
-        function createWidget4(): Widget4;
-    }
-}
-
-// @Filename: privacyCannotNameAccessorDeclFile_Widgets.ts
-export class Widget1 {
-    name = 'one';
-}
-export function createWidget1() {
-    return new Widget1();
-}
-
-export module SpecializedWidget {
-    export class Widget2 {
-        name = 'one';
-    }
-    export function createWidget2() {
-        return new Widget2();
-    }
-}
-
-// @Filename:privacyCannotNameAccessorDeclFile_exporter.ts
-///<reference path='privacyCannotNameAccessorDeclFile_GlobalWidgets.ts'/>
-import Widgets = require("privacyCannotNameAccessorDeclFile_Widgets");
-import Widgets1 = require("GlobalWidgets");
-export function createExportedWidget1() {
-    return Widgets.createWidget1();
-}
-export function createExportedWidget2() {
-    return Widgets.SpecializedWidget.createWidget2();
-}
-export function createExportedWidget3() {
-    return Widgets1.createWidget3();
-}
-export function createExportedWidget4() {
-    return Widgets1.SpecializedGlobalWidget.createWidget4();
-}
-
-// @Filename:privacyCannotNameAccessorDeclFile_consumer.ts
-import exporter = require("privacyCannotNameAccessorDeclFile_exporter");
-export class publicClassWithWithPrivateGetAccessorTypes {
-    static get myPublicStaticMethod() { // Error
-        return exporter.createExportedWidget1();
-    }
-    private static get myPrivateStaticMethod() {
-        return exporter.createExportedWidget1();
-    }
-    get myPublicMethod() { // Error
-        return exporter.createExportedWidget1();
-    }
-    private get myPrivateMethod() {
-        return exporter.createExportedWidget1();
-    }
-    static get myPublicStaticMethod1() { // Error
-        return exporter.createExportedWidget3();
-    }
-    private static get myPrivateStaticMethod1() {
-        return exporter.createExportedWidget3();
-    }
-    get myPublicMethod1() { // Error
-        return exporter.createExportedWidget3();
-    }
-    private get myPrivateMethod1() {
-        return exporter.createExportedWidget3();
-    }
-}
-
-class privateClassWithWithPrivateGetAccessorTypes {
-    static get myPublicStaticMethod() { 
-        return exporter.createExportedWidget1();
-    }
-    private static get myPrivateStaticMethod() {
-        return exporter.createExportedWidget1();
-    }
-    get myPublicMethod() { 
-        return exporter.createExportedWidget1();
-    }
-    private get myPrivateMethod() {
-        return exporter.createExportedWidget1();
-    }
-    static get myPublicStaticMethod1() { 
-        return exporter.createExportedWidget3();
-    }
-    private static get myPrivateStaticMethod1() {
-        return exporter.createExportedWidget3();
-    }
-    get myPublicMethod1() { 
-        return exporter.createExportedWidget3();
-    }
-    private get myPrivateMethod1() {
-        return exporter.createExportedWidget3();
-    }
-}
-
-export class publicClassWithPrivateModuleGetAccessorTypes {
-    static get myPublicStaticMethod() { // Error
-        return exporter.createExportedWidget2();
-    }
-    get myPublicMethod() { // Error
-        return exporter.createExportedWidget2();
-    }
-    static get myPublicStaticMethod1() { // Error
-        return exporter.createExportedWidget4();
-    }
-    get myPublicMethod1() { // Error
-        return exporter.createExportedWidget4();
-    }
-}
-
-class privateClassWithPrivateModuleGetAccessorTypes {
-    static get myPublicStaticMethod() { 
-        return exporter.createExportedWidget2();
-    }
-    get myPublicMethod() { 
-        return exporter.createExportedWidget2();
-    }
-    static get myPublicStaticMethod1() { 
-        return exporter.createExportedWidget4();
-    }
-    get myPublicMethod1() { 
-        return exporter.createExportedWidget4();
-    }
-}
\ No newline at end of file
diff --git a/tests/cases/compiler/privacyCannotNameVarTypeDeclFile.ts b/tests/cases/compiler/privacyCannotNameVarTypeDeclFile.ts
deleted file mode 100644
index e49d31946c6..00000000000
--- a/tests/cases/compiler/privacyCannotNameVarTypeDeclFile.ts
+++ /dev/null
@@ -1,101 +0,0 @@
-// @module: commonjs
-// @declaration: true
-
-
-// @Filename: privacyCannotNameVarTypeDeclFile_GlobalWidgets.ts
-declare module "GlobalWidgets" {
-    export class Widget3 {
-        name: string;
-    }
-    export function createWidget3(): Widget3;
-
-    export module SpecializedGlobalWidget {
-        export class Widget4 {
-            name: string;
-        }
-        function createWidget4(): Widget4;
-    }
-}
-
-// @Filename: privacyCannotNameVarTypeDeclFile_Widgets.ts
-export class Widget1 {
-    name = 'one';
-}
-export function createWidget1() {
-    return new Widget1();
-}
-
-export module SpecializedWidget {
-    export class Widget2 {
-        name = 'one';
-    }
-    export function createWidget2() {
-        return new Widget2();
-    }
-}
-
-// @Filename:privacyCannotNameVarTypeDeclFile_exporter.ts
-///<reference path='privacyCannotNameVarTypeDeclFile_GlobalWidgets.ts'/>
-import Widgets = require("privacyCannotNameVarTypeDeclFile_Widgets");
-import Widgets1 = require("GlobalWidgets");
-export function createExportedWidget1() {
-    return Widgets.createWidget1();
-}
-export function createExportedWidget2() {
-    return Widgets.SpecializedWidget.createWidget2();
-}
-export function createExportedWidget3() {
-    return Widgets1.createWidget3();
-}
-export function createExportedWidget4() {
-    return Widgets1.SpecializedGlobalWidget.createWidget4();
-}
-
-// @Filename:privacyCannotNameVarTypeDeclFile_consumer.ts
-import exporter = require("privacyCannotNameVarTypeDeclFile_exporter");
-export class publicClassWithWithPrivatePropertyTypes {
-    static myPublicStaticProperty = exporter.createExportedWidget1(); // Error
-    private static myPrivateStaticProperty = exporter.createExportedWidget1();
-    myPublicProperty = exporter.createExportedWidget1(); // Error
-    private myPrivateProperty = exporter.createExportedWidget1();
-
-    static myPublicStaticProperty1 = exporter.createExportedWidget3(); // Error
-    private static myPrivateStaticProperty1 = exporter.createExportedWidget3();
-    myPublicProperty1 = exporter.createExportedWidget3(); // Error
-    private myPrivateProperty1 = exporter.createExportedWidget3();
-}
-
-class privateClassWithWithPrivatePropertyTypes {
-    static myPublicStaticProperty = exporter.createExportedWidget1(); 
-    private static myPrivateStaticProperty = exporter.createExportedWidget1();
-    myPublicProperty = exporter.createExportedWidget1(); 
-    private myPrivateProperty = exporter.createExportedWidget1();
-
-    static myPublicStaticProperty1 = exporter.createExportedWidget3(); 
-    private static myPrivateStaticProperty1 = exporter.createExportedWidget3();
-    myPublicProperty1 = exporter.createExportedWidget3(); 
-    private myPrivateProperty1 = exporter.createExportedWidget3();
-}
-
-export var publicVarWithPrivatePropertyTypes= exporter.createExportedWidget1(); // Error
-var privateVarWithPrivatePropertyTypes= exporter.createExportedWidget1();
-export var publicVarWithPrivatePropertyTypes1 = exporter.createExportedWidget3(); // Error
-var privateVarWithPrivatePropertyTypes1 = exporter.createExportedWidget3();
-
-export class publicClassWithPrivateModulePropertyTypes {
-    static myPublicStaticProperty= exporter.createExportedWidget2(); // Error
-    myPublicProperty = exporter.createExportedWidget2(); // Error
-    static myPublicStaticProperty1 = exporter.createExportedWidget4(); // Error
-    myPublicProperty1 = exporter.createExportedWidget4(); // Error
-}
-export var publicVarWithPrivateModulePropertyTypes= exporter.createExportedWidget2(); // Error
-export var publicVarWithPrivateModulePropertyTypes1 = exporter.createExportedWidget4(); // Error
-
-class privateClassWithPrivateModulePropertyTypes {
-    static myPublicStaticProperty= exporter.createExportedWidget2();
-    myPublicProperty= exporter.createExportedWidget2();
-    static myPublicStaticProperty1 = exporter.createExportedWidget4();
-    myPublicProperty1 = exporter.createExportedWidget4();
-}
-var privateVarWithPrivateModulePropertyTypes= exporter.createExportedWidget2();
-var privateVarWithPrivateModulePropertyTypes1 = exporter.createExportedWidget4();
\ No newline at end of file
diff --git a/tests/cases/compiler/privacyCheckAnonymousFunctionParameter.ts b/tests/cases/compiler/privacyCheckAnonymousFunctionParameter.ts
index c867a664520..d4ce6c675f5 100644
--- a/tests/cases/compiler/privacyCheckAnonymousFunctionParameter.ts
+++ b/tests/cases/compiler/privacyCheckAnonymousFunctionParameter.ts
@@ -1,5 +1,4 @@
 //@module: commonjs
-//@declaration: true
 export var x = 1;  // Makes this an external module
 interface Iterator<T> {
 }
diff --git a/tests/cases/compiler/privacyCheckAnonymousFunctionParameter2.ts b/tests/cases/compiler/privacyCheckAnonymousFunctionParameter2.ts
index 1aea1a17e98..6aa0761d8d7 100644
--- a/tests/cases/compiler/privacyCheckAnonymousFunctionParameter2.ts
+++ b/tests/cases/compiler/privacyCheckAnonymousFunctionParameter2.ts
@@ -1,5 +1,4 @@
 //@module: amd
-//@declaration: true
 export var x = 1;  // Makes this an external module 
 interface Iterator<T> { x: T }
 
diff --git a/tests/cases/compiler/privacyCheckCallbackOfInterfaceMethodWithTypeParameter.ts b/tests/cases/compiler/privacyCheckCallbackOfInterfaceMethodWithTypeParameter.ts
index e9fda583a14..98e11a37e66 100644
--- a/tests/cases/compiler/privacyCheckCallbackOfInterfaceMethodWithTypeParameter.ts
+++ b/tests/cases/compiler/privacyCheckCallbackOfInterfaceMethodWithTypeParameter.ts
@@ -1,5 +1,4 @@
 //@module: amd
-//@declaration: true
 export interface A<T> {
     f1(callback: (p: T) => any); 
 }
diff --git a/tests/cases/compiler/privacyCheckExportAssignmentOnExportedGenericInterface1.ts b/tests/cases/compiler/privacyCheckExportAssignmentOnExportedGenericInterface1.ts
index b2a5e374f48..6014c8bb041 100644
--- a/tests/cases/compiler/privacyCheckExportAssignmentOnExportedGenericInterface1.ts
+++ b/tests/cases/compiler/privacyCheckExportAssignmentOnExportedGenericInterface1.ts
@@ -1,5 +1,4 @@
 //@module: commonjs
-//@declaration: true
 module Foo {
     export interface A<T> {
     }
diff --git a/tests/cases/compiler/privacyCheckExportAssignmentOnExportedGenericInterface2.ts b/tests/cases/compiler/privacyCheckExportAssignmentOnExportedGenericInterface2.ts
index 42c121ac80e..5d150e2f5e7 100644
--- a/tests/cases/compiler/privacyCheckExportAssignmentOnExportedGenericInterface2.ts
+++ b/tests/cases/compiler/privacyCheckExportAssignmentOnExportedGenericInterface2.ts
@@ -1,5 +1,4 @@
 //@module: amd
-//@declaration: true
 export = Foo;
 
 interface Foo<T> {
diff --git a/tests/cases/compiler/privacyCheckExternalModuleExportAssignmentOfGenericClass.ts b/tests/cases/compiler/privacyCheckExternalModuleExportAssignmentOfGenericClass.ts
index b412622ad40..e43e4dc6d93 100644
--- a/tests/cases/compiler/privacyCheckExternalModuleExportAssignmentOfGenericClass.ts
+++ b/tests/cases/compiler/privacyCheckExternalModuleExportAssignmentOfGenericClass.ts
@@ -1,5 +1,4 @@
 //@module: commonjs
-//@declaration: true
 // @Filename: privacyCheckExternalModuleExportAssignmentOfGenericClass_0.ts
 export = Foo;
 class Foo<A> {
diff --git a/tests/cases/compiler/privacyCheckOnTypeParameterReferenceInConstructorParameter.ts b/tests/cases/compiler/privacyCheckOnTypeParameterReferenceInConstructorParameter.ts
index 01ecd8c1ebd..cf73b3626ee 100644
--- a/tests/cases/compiler/privacyCheckOnTypeParameterReferenceInConstructorParameter.ts
+++ b/tests/cases/compiler/privacyCheckOnTypeParameterReferenceInConstructorParameter.ts
@@ -1,5 +1,4 @@
 //@module: amd
-//@declaration: true
 export class A<T1>{
     constructor(callback: (self: A<T1>) => void) {
         var child = new B(this);
diff --git a/tests/cases/compiler/privacyCheckTypeOfFunction.ts b/tests/cases/compiler/privacyCheckTypeOfFunction.ts
index 80bab76dc26..a4980fe6229 100644
--- a/tests/cases/compiler/privacyCheckTypeOfFunction.ts
+++ b/tests/cases/compiler/privacyCheckTypeOfFunction.ts
@@ -1,5 +1,3 @@
-//@module: commonjs
-//@declaration: true
 function foo() {
 }
 export var x: typeof foo;
diff --git a/tests/cases/compiler/privacyCheckTypeOfInvisibleModuleError.ts b/tests/cases/compiler/privacyCheckTypeOfInvisibleModuleError.ts
index b37fb72677b..e439cae861e 100644
--- a/tests/cases/compiler/privacyCheckTypeOfInvisibleModuleError.ts
+++ b/tests/cases/compiler/privacyCheckTypeOfInvisibleModuleError.ts
@@ -1,4 +1,3 @@
-//@declaration: true
 module Outer {
     module Inner {
         export var m: typeof Inner;
diff --git a/tests/cases/compiler/privacyClassExtendsClauseDeclFile.ts b/tests/cases/compiler/privacyClassExtendsClauseDeclFile.ts
deleted file mode 100644
index 4feb4a691b7..00000000000
--- a/tests/cases/compiler/privacyClassExtendsClauseDeclFile.ts
+++ /dev/null
@@ -1,97 +0,0 @@
-// @module: commonjs
-// @declaration: true
-
-// @Filename: privacyClassExtendsClauseDeclFile_externalModule.ts
-export module publicModule {
-    export class publicClassInPublicModule {
-        private f1() {
-        }
-    }
-
-    class privateClassInPublicModule {
-    }
-
-    class privateClassExtendingPublicClassInModule extends publicClassInPublicModule {
-    }
-    class privateClassExtendingPrivateClassInModule extends privateClassInPublicModule {
-    }
-    export class publicClassExtendingPublicClassInModule extends publicClassInPublicModule {
-    }
-    export class publicClassExtendingPrivateClassInModule extends privateClassInPublicModule { // Should error
-    }
-
-    class privateClassExtendingFromPrivateModuleClass extends privateModule.publicClassInPrivateModule {
-    }
-    export class publicClassExtendingFromPrivateModuleClass extends privateModule.publicClassInPrivateModule { // Should error
-    }
-}
-
-module privateModule {
-    export class publicClassInPrivateModule {
-        private f1() {
-        }
-    }
-
-    class privateClassInPrivateModule {
-    }
-
-    class privateClassExtendingPublicClassInModule extends publicClassInPrivateModule {
-    }
-    class privateClassExtendingPrivateClassInModule extends privateClassInPrivateModule {
-    }
-    export class publicClassExtendingPublicClassInModule extends publicClassInPrivateModule {
-    }
-    export class publicClassExtendingPrivateClassInModule extends privateClassInPrivateModule { 
-    }
-
-    class privateClassExtendingFromPrivateModuleClass extends privateModule.publicClassInPrivateModule {
-    }
-    export class publicClassExtendingFromPrivateModuleClass extends privateModule.publicClassInPrivateModule {
-    }
-}
-
-export class publicClass {
-    private f1() {
-    }
-}
-
-class privateClass {
-}
-
-class privateClassExtendingPublicClass extends publicClass {
-}
-class privateClassExtendingPrivateClassInModule extends privateClass {
-}
-export class publicClassExtendingPublicClass extends publicClass {
-}
-export class publicClassExtendingPrivateClass extends privateClass { // Should error
-}
-
-class privateClassExtendingFromPrivateModuleClass extends privateModule.publicClassInPrivateModule {
-}
-export class publicClassExtendingFromPrivateModuleClass extends privateModule.publicClassInPrivateModule { // Should error
-}
-
-// @Filename: privacyClassExtendsClauseDeclFile_GlobalFile.ts
-module publicModuleInGlobal {
-    export class publicClassInPublicModule {
-        private f1() {
-        }
-    }
-
-    class privateClassInPublicModule {
-    }
-
-    class privateClassExtendingPublicClassInModule extends publicClassInPublicModule {
-    }
-    class privateClassExtendingPrivateClassInModule extends privateClassInPublicModule {
-    }
-    export class publicClassExtendingPublicClassInModule extends publicClassInPublicModule {
-    }
-    export class publicClassExtendingPrivateClassInModule extends privateClassInPublicModule { // Should error
-    }
-}
-class publicClassInGlobal {
-}
-class publicClassExtendingPublicClassInGlobal extends publicClassInGlobal {
-}
diff --git a/tests/cases/compiler/privacyClassImplementsClauseDeclFile.ts b/tests/cases/compiler/privacyClassImplementsClauseDeclFile.ts
deleted file mode 100644
index 17791e49f86..00000000000
--- a/tests/cases/compiler/privacyClassImplementsClauseDeclFile.ts
+++ /dev/null
@@ -1,94 +0,0 @@
-// @module: commonjs
-// @declaration: true
-
-// @Filename: privacyClassImplementsClauseDeclFile_externalModule.ts
-export module publicModule {
-    export interface publicInterfaceInPublicModule {
-    }
-
-    interface privateInterfaceInPublicModule {
-    }
-
-    class privateClassImplementingPublicInterfaceInModule implements publicInterfaceInPublicModule {
-    }
-    class privateClassImplementingPrivateInterfaceInModule implements privateInterfaceInPublicModule {
-    }
-    export class publicClassImplementingPublicInterfaceInModule implements publicInterfaceInPublicModule {
-    }
-    export class publicClassImplementingPrivateInterfaceInModule implements privateInterfaceInPublicModule { // Should error
-    }
-
-    class privateClassImplementingFromPrivateModuleInterface implements privateModule.publicInterfaceInPrivateModule {
-    }
-    export class publicClassImplementingFromPrivateModuleInterface implements privateModule.publicInterfaceInPrivateModule { // Should error
-    }
-
-    export class publicClassImplementingPrivateAndPublicInterface implements privateInterfaceInPublicModule, publicInterfaceInPublicModule { // Should error
-    }
-}
-
-module privateModule {
-    export interface publicInterfaceInPrivateModule {
-
-    }
-
-    interface privateInterfaceInPrivateModule {
-    }
-
-    class privateClassImplementingPublicInterfaceInModule implements publicInterfaceInPrivateModule {
-    }
-    class privateClassImplementingPrivateInterfaceInModule implements privateInterfaceInPrivateModule {
-    }
-    export class publicClassImplementingPublicInterfaceInModule implements publicInterfaceInPrivateModule {
-    }
-    export class publicClassImplementingPrivateInterfaceInModule implements privateInterfaceInPrivateModule { 
-    }
-
-    class privateClassImplementingFromPrivateModuleInterface implements privateModule.publicInterfaceInPrivateModule {
-    }
-    export class publicClassImplementingFromPrivateModuleInterface implements privateModule.publicInterfaceInPrivateModule {
-    }
-}
-
-export interface publicInterface {
-
-}
-
-interface privateInterface {
-}
-
-class privateClassImplementingPublicInterface implements publicInterface {
-}
-class privateClassImplementingPrivateInterfaceInModule implements privateInterface {
-}
-export class publicClassImplementingPublicInterface implements publicInterface {
-}
-export class publicClassImplementingPrivateInterface implements privateInterface { // Should error
-}
-
-class privateClassImplementingFromPrivateModuleInterface implements privateModule.publicInterfaceInPrivateModule {
-}
-export class publicClassImplementingFromPrivateModuleInterface implements privateModule.publicInterfaceInPrivateModule { // Should error
-}
-
-// @Filename: privacyClassImplementsClauseDeclFile_GlobalFile.ts
-module publicModuleInGlobal {
-    export interface publicInterfaceInPublicModule {
-    }
-
-    interface privateInterfaceInPublicModule {
-    }
-
-    class privateClassImplementingPublicInterfaceInModule implements publicInterfaceInPublicModule {
-    }
-    class privateClassImplementingPrivateInterfaceInModule implements privateInterfaceInPublicModule {
-    }
-    export class publicClassImplementingPublicInterfaceInModule implements publicInterfaceInPublicModule {
-    }
-    export class publicClassImplementingPrivateInterfaceInModule implements privateInterfaceInPublicModule { // Should error
-    }
-}
-interface publicInterfaceInGlobal {
-}
-class publicClassImplementingPublicInterfaceInGlobal implements publicInterfaceInGlobal {
-}
diff --git a/tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile.ts b/tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile.ts
deleted file mode 100644
index f24ed8ea32b..00000000000
--- a/tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile.ts
+++ /dev/null
@@ -1,157 +0,0 @@
-// @module: commonjs
-// @declaration: true
-
-
-// @Filename: privacyFunctionCannotNameParameterTypeDeclFile_GlobalWidgets.ts
-declare module "GlobalWidgets" {
-    export class Widget3 {
-        name: string;
-    }
-    export function createWidget3(): Widget3;
-
-    export module SpecializedGlobalWidget {
-        export class Widget4 {
-            name: string;
-        }
-        function createWidget4(): Widget4;
-    }
-}
-
-// @Filename: privacyFunctionCannotNameParameterTypeDeclFile_Widgets.ts
-export class Widget1 {
-    name = 'one';
-}
-export function createWidget1() {
-    return new Widget1();
-}
-
-export module SpecializedWidget {
-    export class Widget2 {
-        name = 'one';
-    }
-    export function createWidget2() {
-        return new Widget2();
-    }
-}
-
-// @Filename:privacyFunctionCannotNameParameterTypeDeclFile_exporter.ts
-///<reference path='privacyFunctionCannotNameParameterTypeDeclFile_GlobalWidgets.ts'/>
-import Widgets = require("privacyFunctionCannotNameParameterTypeDeclFile_Widgets");
-import Widgets1 = require("GlobalWidgets");
-export function createExportedWidget1() {
-    return Widgets.createWidget1();
-}
-export function createExportedWidget2() {
-    return Widgets.SpecializedWidget.createWidget2();
-}
-export function createExportedWidget3() {
-    return Widgets1.createWidget3();
-}
-export function createExportedWidget4() {
-    return Widgets1.SpecializedGlobalWidget.createWidget4();
-}
-
-// @Filename:privacyFunctionCannotNameParameterTypeDeclFile_consumer.ts
-import exporter = require("privacyFunctionCannotNameParameterTypeDeclFile_exporter");
-export class publicClassWithWithPrivateParmeterTypes {
-    static myPublicStaticMethod(param = exporter.createExportedWidget1()) { // Error
-    }
-    private static myPrivateStaticMethod(param = exporter.createExportedWidget1()) {
-    }
-    myPublicMethod(param  = exporter.createExportedWidget1()) { // Error
-    }
-    private myPrivateMethod(param = exporter.createExportedWidget1()) {
-    }
-    constructor(param = exporter.createExportedWidget1(), private param1 = exporter.createExportedWidget1(), public param2 = exporter.createExportedWidget1()) { // Error
-    }
-}
-export class publicClassWithWithPrivateParmeterTypes1 {
-    static myPublicStaticMethod(param = exporter.createExportedWidget3()) { // Error
-    }
-    private static myPrivateStaticMethod(param = exporter.createExportedWidget3()) {
-    }
-    myPublicMethod(param  = exporter.createExportedWidget3()) { // Error
-    }
-    private myPrivateMethod(param = exporter.createExportedWidget3()) {
-    }
-    constructor(param = exporter.createExportedWidget3(), private param1 = exporter.createExportedWidget3(), public param2 = exporter.createExportedWidget3()) { // Error
-    }
-}
-
-class privateClassWithWithPrivateParmeterTypes {
-    static myPublicStaticMethod(param = exporter.createExportedWidget1()) {
-    }
-    private static myPrivateStaticMethod(param = exporter.createExportedWidget1()) {
-    }
-    myPublicMethod(param  = exporter.createExportedWidget1()) {
-    }
-    private myPrivateMethod(param = exporter.createExportedWidget1()) {
-    }
-    constructor(param = exporter.createExportedWidget1(), private param1 = exporter.createExportedWidget1(), public param2 = exporter.createExportedWidget1()) {
-    }
-}
-class privateClassWithWithPrivateParmeterTypes2 {
-    static myPublicStaticMethod(param = exporter.createExportedWidget3()) {
-    }
-    private static myPrivateStaticMethod(param = exporter.createExportedWidget3()) {
-    }
-    myPublicMethod(param  = exporter.createExportedWidget3()) {
-    }
-    private myPrivateMethod(param = exporter.createExportedWidget3()) {
-    }
-    constructor(param = exporter.createExportedWidget3(), private param1 = exporter.createExportedWidget3(), public param2 = exporter.createExportedWidget3()) {
-    }
-}
-
-export function publicFunctionWithPrivateParmeterTypes(param = exporter.createExportedWidget1()) { // Error
-}
-function privateFunctionWithPrivateParmeterTypes(param = exporter.createExportedWidget1()) {
-}
-export function publicFunctionWithPrivateParmeterTypes1(param = exporter.createExportedWidget3()) { // Error
-}
-function privateFunctionWithPrivateParmeterTypes1(param = exporter.createExportedWidget3()) {
-}
-
-
-export class publicClassWithPrivateModuleParameterTypes {
-    static myPublicStaticMethod(param= exporter.createExportedWidget2()) { // Error
-    }
-    myPublicMethod(param= exporter.createExportedWidget2()) { // Error
-    }
-    constructor(param= exporter.createExportedWidget2(), private param1= exporter.createExportedWidget2(), public param2= exporter.createExportedWidget2()) { // Error
-    }
-}
-export class publicClassWithPrivateModuleParameterTypes2 {
-    static myPublicStaticMethod(param= exporter.createExportedWidget4()) { // Error
-    }
-    myPublicMethod(param= exporter.createExportedWidget4()) { // Error
-    }
-    constructor(param= exporter.createExportedWidget4(), private param1= exporter.createExportedWidget4(), public param2= exporter.createExportedWidget4()) { // Error
-    }
-}
-export function publicFunctionWithPrivateModuleParameterTypes(param= exporter.createExportedWidget2()) { // Error
-}
-export function publicFunctionWithPrivateModuleParameterTypes1(param= exporter.createExportedWidget4()) { // Error
-}
-
-
-class privateClassWithPrivateModuleParameterTypes {
-    static myPublicStaticMethod(param= exporter.createExportedWidget2()) {
-    }
-    myPublicMethod(param= exporter.createExportedWidget2()) {
-    }
-    constructor(param= exporter.createExportedWidget2(), private param1= exporter.createExportedWidget2(), public param2= exporter.createExportedWidget2()) {
-    }
-}
-class privateClassWithPrivateModuleParameterTypes1 {
-    static myPublicStaticMethod(param= exporter.createExportedWidget4()) {
-    }
-    myPublicMethod(param= exporter.createExportedWidget4()) {
-    }
-    constructor(param= exporter.createExportedWidget4(), private param1= exporter.createExportedWidget4(), public param2= exporter.createExportedWidget4()) {
-    }
-}
-function privateFunctionWithPrivateModuleParameterTypes(param= exporter.createExportedWidget2()) {
-}
-function privateFunctionWithPrivateModuleParameterTypes1(param= exporter.createExportedWidget4()) {
-}
\ No newline at end of file
diff --git a/tests/cases/compiler/privacyFunctionCannotNameReturnTypeDeclFile.ts b/tests/cases/compiler/privacyFunctionCannotNameReturnTypeDeclFile.ts
deleted file mode 100644
index 2eff22327b5..00000000000
--- a/tests/cases/compiler/privacyFunctionCannotNameReturnTypeDeclFile.ts
+++ /dev/null
@@ -1,163 +0,0 @@
-// @module: commonjs
-// @declaration: true
-
-
-// @Filename: privacyFunctionReturnTypeDeclFile_GlobalWidgets.ts
-declare module "GlobalWidgets" {
-    export class Widget3 {
-        name: string;
-    }
-    export function createWidget3(): Widget3;
-
-    export module SpecializedGlobalWidget {
-        export class Widget4 {
-            name: string;
-        }
-        function createWidget4(): Widget4;
-    }
-}
-
-// @Filename: privacyFunctionReturnTypeDeclFile_Widgets.ts
-export class Widget1 {
-    name = 'one';
-}
-export function createWidget1() {
-    return new Widget1();
-}
-
-export module SpecializedWidget {
-    export class Widget2 {
-        name = 'one';
-    }
-    export function createWidget2() {
-        return new Widget2();
-    }
-}
-
-// @Filename:privacyFunctionReturnTypeDeclFile_exporter.ts
-///<reference path='privacyFunctionReturnTypeDeclFile_GlobalWidgets.ts'/>
-import Widgets = require("privacyFunctionReturnTypeDeclFile_Widgets");
-import Widgets1 = require("GlobalWidgets");
-export function createExportedWidget1() {
-    return Widgets.createWidget1();
-}
-export function createExportedWidget2() {
-    return Widgets.SpecializedWidget.createWidget2();
-}
-export function createExportedWidget3() {
-    return Widgets1.createWidget3();
-}
-export function createExportedWidget4() {
-    return Widgets1.SpecializedGlobalWidget.createWidget4();
-}
-
-// @Filename:privacyFunctionReturnTypeDeclFile_consumer.ts
-import exporter = require("privacyFunctionReturnTypeDeclFile_exporter");
-export class publicClassWithWithPrivateParmeterTypes {
-    static myPublicStaticMethod() { // Error
-        return exporter.createExportedWidget1();
-    }
-    private static myPrivateStaticMethod() {
-        return exporter.createExportedWidget1();;
-    }
-    myPublicMethod() { // Error
-        return exporter.createExportedWidget1();;
-    }
-    private myPrivateMethod() {
-        return exporter.createExportedWidget1();;
-    }
-    static myPublicStaticMethod1() { // Error
-        return exporter.createExportedWidget3();
-    }
-    private static myPrivateStaticMethod1() {
-        return exporter.createExportedWidget3();;
-    }
-    myPublicMethod1() { // Error
-        return exporter.createExportedWidget3();;
-    }
-    private myPrivateMethod1() {
-        return exporter.createExportedWidget3();;
-    }
-}
-
-class privateClassWithWithPrivateParmeterTypes {
-    static myPublicStaticMethod() { 
-        return exporter.createExportedWidget1();
-    }
-    private static myPrivateStaticMethod() {
-        return exporter.createExportedWidget1();;
-    }
-    myPublicMethod() { 
-        return exporter.createExportedWidget1();;
-    }
-    private myPrivateMethod() {
-        return exporter.createExportedWidget1();;
-    }
-    static myPublicStaticMethod1() { 
-        return exporter.createExportedWidget3();
-    }
-    private static myPrivateStaticMethod1() {
-        return exporter.createExportedWidget3();;
-    }
-    myPublicMethod1() { 
-        return exporter.createExportedWidget3();;
-    }
-    private myPrivateMethod1() {
-        return exporter.createExportedWidget3();;
-    }
-}
-
-export function publicFunctionWithPrivateParmeterTypes() { // Error
-    return exporter.createExportedWidget1();
-}
-function privateFunctionWithPrivateParmeterTypes()   {
-    return exporter.createExportedWidget1();
-}
-export function publicFunctionWithPrivateParmeterTypes1() { // Error
-    return exporter.createExportedWidget3();
-}
-function privateFunctionWithPrivateParmeterTypes1() {
-    return exporter.createExportedWidget3();
-}
-
-export class publicClassWithPrivateModuleReturnTypes {
-    static myPublicStaticMethod() { // Error
-        return exporter.createExportedWidget2();
-    }
-    myPublicMethod() { // Error
-        return exporter.createExportedWidget2();
-    }
-    static myPublicStaticMethod1() { // Error
-        return exporter.createExportedWidget4();
-    }
-    myPublicMethod1() { // Error
-        return exporter.createExportedWidget4();
-    }
-}
-export function publicFunctionWithPrivateModuleReturnTypes() { // Error
-    return exporter.createExportedWidget2();
-}
-export function publicFunctionWithPrivateModuleReturnTypes1() { // Error
-    return exporter.createExportedWidget4();
-}
-
-class privateClassWithPrivateModuleReturnTypes {
-    static myPublicStaticMethod() { 
-        return exporter.createExportedWidget2();
-    }
-    myPublicMethod() { 
-        return exporter.createExportedWidget2();
-    }
-    static myPublicStaticMethod1() { // Error
-        return exporter.createExportedWidget4();
-    }
-    myPublicMethod1() { // Error
-        return exporter.createExportedWidget4();
-    }
-}
-function privateFunctionWithPrivateModuleReturnTypes() { 
-    return exporter.createExportedWidget2();
-}
-function privateFunctionWithPrivateModuleReturnTypes1() {
-    return exporter.createExportedWidget4();
-}
diff --git a/tests/cases/compiler/privacyFunctionParameterDeclFile.ts b/tests/cases/compiler/privacyFunctionParameterDeclFile.ts
deleted file mode 100644
index baa2ed4bee6..00000000000
--- a/tests/cases/compiler/privacyFunctionParameterDeclFile.ts
+++ /dev/null
@@ -1,687 +0,0 @@
-// @module: commonjs
-// @declaration: true
-
-// @Filename:privacyFunctionParameterDeclFile_externalModule.ts
-class privateClass {
-}
-
-export class publicClass {
-}
-
-export interface publicInterfaceWithPrivateParmeterTypes {
-    new (param: privateClass): publicClass; // Error
-    (param: privateClass): publicClass; // Error
-    myMethod(param: privateClass): void; // Error
-}
-
-export interface publicInterfaceWithPublicParmeterTypes {
-    new (param: publicClass): publicClass;
-    (param: publicClass): publicClass;
-    myMethod(param: publicClass): void;
-}
-
-interface privateInterfaceWithPrivateParmeterTypes {
-    new (param: privateClass): privateClass;
-    (param: privateClass): privateClass;
-    myMethod(param: privateClass): void;
-}
-
-interface privateInterfaceWithPublicParmeterTypes {
-    new (param: publicClass): publicClass;
-    (param: publicClass): publicClass;
-    myMethod(param: publicClass): void;
-}
-
-export class publicClassWithWithPrivateParmeterTypes {
-    static myPublicStaticMethod(param: privateClass) { // Error
-    }
-    private static myPrivateStaticMethod(param: privateClass) {
-    }
-    myPublicMethod(param: privateClass) { // Error
-    }
-    private myPrivateMethod(param: privateClass) {
-    }
-    constructor(param: privateClass, private param1: privateClass, public param2: privateClass) { // Error
-    }
-}
-
-export class publicClassWithWithPublicParmeterTypes {
-    static myPublicStaticMethod(param: publicClass) {
-    }
-    private static myPrivateStaticMethod(param: publicClass) {
-    }
-    myPublicMethod(param: publicClass) {
-    }
-    private myPrivateMethod(param: publicClass) {
-    }
-    constructor(param: publicClass, private param1: publicClass, public param2: publicClass) {
-    }
-}
-
-class privateClassWithWithPrivateParmeterTypes {
-    static myPublicStaticMethod(param: privateClass) {
-    }
-    private static myPrivateStaticMethod(param: privateClass) {
-    }
-    myPublicMethod(param: privateClass) { 
-    }
-    private myPrivateMethod(param: privateClass) {
-    }
-    constructor(param: privateClass, private param1: privateClass, public param2: privateClass) {
-    }
-}
-
-class privateClassWithWithPublicParmeterTypes {
-    static myPublicStaticMethod(param: publicClass) {
-    }
-    private static myPrivateStaticMethod(param: publicClass) {
-    }
-    myPublicMethod(param: publicClass) {
-    }
-    private myPrivateMethod(param: publicClass) {
-    }
-    constructor(param: publicClass, private param1: publicClass, public param2: publicClass) {
-    }
-}
-
-export function publicFunctionWithPrivateParmeterTypes(param: privateClass) { // Error
-}
-export function publicFunctionWithPublicParmeterTypes(param: publicClass) {
-}
-function privateFunctionWithPrivateParmeterTypes(param: privateClass) {
-}
-function privateFunctionWithPublicParmeterTypes(param: publicClass) {
-}
-
-export declare function publicAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void; // Error
-export declare function publicAmbientFunctionWithPublicParmeterTypes(param: publicClass): void;
-declare function privateAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void;
-declare function privateAmbientFunctionWithPublicParmeterTypes(param: publicClass): void;
-
-export interface publicInterfaceWithPrivateModuleParameterTypes {
-    new (param: privateModule.publicClass): publicClass; // Error
-    (param: privateModule.publicClass): publicClass; // Error
-    myMethod(param: privateModule.publicClass): void; // Error
-}
-export class publicClassWithPrivateModuleParameterTypes {
-    static myPublicStaticMethod(param: privateModule.publicClass) { // Error
-    }
-    myPublicMethod(param: privateModule.publicClass) { // Error
-    }
-    constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) { // Error
-    }
-}
-export function publicFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) { // Error
-}
-export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void; // Error
-
-interface privateInterfaceWithPrivateModuleParameterTypes {
-    new (param: privateModule.publicClass): publicClass;
-    (param: privateModule.publicClass): publicClass;
-    myMethod(param: privateModule.publicClass): void;
-}
-class privateClassWithPrivateModuleParameterTypes {
-    static myPublicStaticMethod(param: privateModule.publicClass) {
-    }
-    myPublicMethod(param: privateModule.publicClass) {
-    }
-    constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) {
-    }
-}
-function privateFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) {
-}
-declare function privateAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void;
-
-export module publicModule {
-    class privateClass {
-    }
-
-    export class publicClass {
-    }
-
-
-    export interface publicInterfaceWithPrivateParmeterTypes {
-        new (param: privateClass): publicClass; // Error
-        (param: privateClass): publicClass; // Error
-        myMethod(param: privateClass): void; // Error
-    }
-
-    export interface publicInterfaceWithPublicParmeterTypes {
-        new (param: publicClass): publicClass;
-        (param: publicClass): publicClass;
-        myMethod(param: publicClass): void;
-    }
-
-    interface privateInterfaceWithPrivateParmeterTypes {
-        new (param: privateClass): privateClass;
-        (param: privateClass): privateClass;
-        myMethod(param: privateClass): void;
-    }
-
-    interface privateInterfaceWithPublicParmeterTypes {
-        new (param: publicClass): publicClass;
-        (param: publicClass): publicClass;
-        myMethod(param: publicClass): void;
-    }
-
-    export class publicClassWithWithPrivateParmeterTypes {
-        static myPublicStaticMethod(param: privateClass) { // Error
-        }
-        private static myPrivateStaticMethod(param: privateClass) {
-        }
-        myPublicMethod(param: privateClass) { // Error
-        }
-        private myPrivateMethod(param: privateClass) {
-        }
-        constructor(param: privateClass, private param1: privateClass, public param2: privateClass) { // Error
-        }
-    }
-
-    export class publicClassWithWithPublicParmeterTypes {
-        static myPublicStaticMethod(param: publicClass) {
-        }
-        private static myPrivateStaticMethod(param: publicClass) {
-        }
-        myPublicMethod(param: publicClass) {
-        }
-        private myPrivateMethod(param: publicClass) {
-        }
-        constructor(param: publicClass, private param1: publicClass, public param2: publicClass) {
-        }
-    }
-
-    class privateClassWithWithPrivateParmeterTypes {
-        static myPublicStaticMethod(param: privateClass) {
-        }
-        private static myPrivateStaticMethod(param: privateClass) {
-        }
-        myPublicMethod(param: privateClass) {
-        }
-        private myPrivateMethod(param: privateClass) {
-        }
-        constructor(param: privateClass, private param1: privateClass, public param2: privateClass) {
-        }
-    }
-
-    class privateClassWithWithPublicParmeterTypes {
-        static myPublicStaticMethod(param: publicClass) {
-        }
-        private static myPrivateStaticMethod(param: publicClass) {
-        }
-        myPublicMethod(param: publicClass) {
-        }
-        private myPrivateMethod(param: publicClass) {
-        }
-        constructor(param: publicClass, private param1: publicClass, public param2: publicClass) {
-        }
-    }
-
-    export function publicFunctionWithPrivateParmeterTypes(param: privateClass) { // Error
-    }
-    export function publicFunctionWithPublicParmeterTypes(param: publicClass) {
-    }
-    function privateFunctionWithPrivateParmeterTypes(param: privateClass) {
-    }
-    function privateFunctionWithPublicParmeterTypes(param: publicClass) {
-    }
-
-    export declare function publicAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void; // Error
-    export declare function publicAmbientFunctionWithPublicParmeterTypes(param: publicClass): void;
-    declare function privateAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void;
-    declare function privateAmbientFunctionWithPublicParmeterTypes(param: publicClass): void;
-
-    export interface publicInterfaceWithPrivateModuleParameterTypes {
-        new (param: privateModule.publicClass): publicClass; // Error
-        (param: privateModule.publicClass): publicClass; // Error
-        myMethod(param: privateModule.publicClass): void; // Error
-    }
-    export class publicClassWithPrivateModuleParameterTypes {
-        static myPublicStaticMethod(param: privateModule.publicClass) { // Error
-        }
-        myPublicMethod(param: privateModule.publicClass) { // Error
-        }
-        constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) { // Error
-        }
-    }
-    export function publicFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) { // Error
-    }
-    export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void; // Error
-
-    interface privateInterfaceWithPrivateModuleParameterTypes {
-        new (param: privateModule.publicClass): publicClass;
-        (param: privateModule.publicClass): publicClass;
-        myMethod(param: privateModule.publicClass): void;
-    }
-    class privateClassWithPrivateModuleParameterTypes {
-        static myPublicStaticMethod(param: privateModule.publicClass) {
-        }
-        myPublicMethod(param: privateModule.publicClass) {
-        }
-        constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) {
-        }
-    }
-    function privateFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) {
-    }
-    declare function privateAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void;
-
-}
-
-module privateModule {
-    class privateClass {
-    }
-
-    export class publicClass {
-    }
-
-    export interface publicInterfaceWithPrivateParmeterTypes {
-        new (param: privateClass): publicClass;
-        (param: privateClass): publicClass;
-        myMethod(param: privateClass): void;
-    }
-
-    export interface publicInterfaceWithPublicParmeterTypes {
-        new (param: publicClass): publicClass;
-        (param: publicClass): publicClass;
-        myMethod(param: publicClass): void;
-    }
-
-    interface privateInterfaceWithPrivateParmeterTypes {
-        new (param: privateClass): privateClass;
-        (param: privateClass): privateClass;
-        myMethod(param: privateClass): void;
-    }
-
-    interface privateInterfaceWithPublicParmeterTypes {
-        new (param: publicClass): publicClass;
-        (param: publicClass): publicClass;
-        myMethod(param: publicClass): void;
-    }
-
-    export class publicClassWithWithPrivateParmeterTypes {
-        static myPublicStaticMethod(param: privateClass) {
-        }
-        private static myPrivateStaticMethod(param: privateClass) {
-        }
-        myPublicMethod(param: privateClass) {
-        }
-        private myPrivateMethod(param: privateClass) {
-        }
-        constructor(param: privateClass, private param1: privateClass, public param2: privateClass) {
-        }
-    }
-
-    export class publicClassWithWithPublicParmeterTypes {
-        static myPublicStaticMethod(param: publicClass) {
-        }
-        private static myPrivateStaticMethod(param: publicClass) {
-        }
-        myPublicMethod(param: publicClass) {
-        }
-        private myPrivateMethod(param: publicClass) {
-        }
-        constructor(param: publicClass, private param1: publicClass, public param2: publicClass) {
-        }
-    }
-
-    class privateClassWithWithPrivateParmeterTypes {
-        static myPublicStaticMethod(param: privateClass) {
-        }
-        private static myPrivateStaticMethod(param: privateClass) {
-        }
-        myPublicMethod(param: privateClass) {
-        }
-        private myPrivateMethod(param: privateClass) {
-        }
-        constructor(param: privateClass, private param1: privateClass, public param2: privateClass) {
-        }
-    }
-
-    class privateClassWithWithPublicParmeterTypes {
-        static myPublicStaticMethod(param: publicClass) {
-        }
-        private static myPrivateStaticMethod(param: publicClass) {
-        }
-        myPublicMethod(param: publicClass) {
-        }
-        private myPrivateMethod(param: publicClass) {
-        }
-        constructor(param: publicClass, private param1: publicClass, public param2: publicClass) {
-        }
-    }
-
-    export function publicFunctionWithPrivateParmeterTypes(param: privateClass) {
-    }
-    export function publicFunctionWithPublicParmeterTypes(param: publicClass) {
-    }
-    function privateFunctionWithPrivateParmeterTypes(param: privateClass) {
-    }
-    function privateFunctionWithPublicParmeterTypes(param: publicClass) {
-    }
-
-    export declare function publicAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void;
-    export declare function publicAmbientFunctionWithPublicParmeterTypes(param: publicClass): void;
-    declare function privateAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void;
-    declare function privateAmbientFunctionWithPublicParmeterTypes(param: publicClass): void;
-
-    export interface publicInterfaceWithPrivateModuleParameterTypes {
-        new (param: privateModule.publicClass): publicClass;
-        (param: privateModule.publicClass): publicClass;
-        myMethod(param: privateModule.publicClass): void;
-    }
-    export class publicClassWithPrivateModuleParameterTypes {
-        static myPublicStaticMethod(param: privateModule.publicClass) {
-        }
-        myPublicMethod(param: privateModule.publicClass) {
-        }
-        constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) {
-        }
-    }
-    export function publicFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) {
-    }
-    export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void;
-
-    interface privateInterfaceWithPrivateModuleParameterTypes {
-        new (param: privateModule.publicClass): publicClass;
-        (param: privateModule.publicClass): publicClass;
-        myMethod(param: privateModule.publicClass): void;
-    }
-    class privateClassWithPrivateModuleParameterTypes {
-        static myPublicStaticMethod(param: privateModule.publicClass) {
-        }
-        myPublicMethod(param: privateModule.publicClass) {
-        }
-        constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) {
-        }
-    }
-    function privateFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) {
-    }
-    declare function privateAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void;
-}
-
-// @Filename: privacyFunctionParameterDeclFile_GlobalFile.ts
-class publicClassInGlobal {
-}
-interface publicInterfaceWithPublicParmeterTypesInGlobal {
-    new (param: publicClassInGlobal): publicClassInGlobal;
-    (param: publicClassInGlobal): publicClassInGlobal;
-    myMethod(param: publicClassInGlobal): void;
-}
-class publicClassWithWithPublicParmeterTypesInGlobal {
-    static myPublicStaticMethod(param: publicClassInGlobal) {
-    }
-    private static myPrivateStaticMethod(param: publicClassInGlobal) {
-    }
-    myPublicMethod(param: publicClassInGlobal) {
-    }
-    private myPrivateMethod(param: publicClassInGlobal) {
-    }
-    constructor(param: publicClassInGlobal, private param1: publicClassInGlobal, public param2: publicClassInGlobal) {
-    }
-}
-function publicFunctionWithPublicParmeterTypesInGlobal(param: publicClassInGlobal) {
-}
-declare function publicAmbientFunctionWithPublicParmeterTypesInGlobal(param: publicClassInGlobal): void;
-
-module publicModuleInGlobal {
-    class privateClass {
-    }
-
-    export class publicClass {
-    }
-
-    module privateModule {
-        class privateClass {
-        }
-
-        export class publicClass {
-        }
-
-        export interface publicInterfaceWithPrivateParmeterTypes {
-            new (param: privateClass): publicClass;
-            (param: privateClass): publicClass;
-            myMethod(param: privateClass): void;
-        }
-
-        export interface publicInterfaceWithPublicParmeterTypes {
-            new (param: publicClass): publicClass;
-            (param: publicClass): publicClass;
-            myMethod(param: publicClass): void;
-        }
-
-        interface privateInterfaceWithPrivateParmeterTypes {
-            new (param: privateClass): privateClass;
-            (param: privateClass): privateClass;
-            myMethod(param: privateClass): void;
-        }
-
-        interface privateInterfaceWithPublicParmeterTypes {
-            new (param: publicClass): publicClass;
-            (param: publicClass): publicClass;
-            myMethod(param: publicClass): void;
-        }
-
-        export class publicClassWithWithPrivateParmeterTypes {
-            static myPublicStaticMethod(param: privateClass) {
-            }
-            private static myPrivateStaticMethod(param: privateClass) {
-            }
-            myPublicMethod(param: privateClass) {
-            }
-            private myPrivateMethod(param: privateClass) {
-            }
-            constructor(param: privateClass, private param1: privateClass, public param2: privateClass) {
-            }
-        }
-
-        export class publicClassWithWithPublicParmeterTypes {
-            static myPublicStaticMethod(param: publicClass) {
-            }
-            private static myPrivateStaticMethod(param: publicClass) {
-            }
-            myPublicMethod(param: publicClass) {
-            }
-            private myPrivateMethod(param: publicClass) {
-            }
-            constructor(param: publicClass, private param1: publicClass, public param2: publicClass) {
-            }
-        }
-
-        class privateClassWithWithPrivateParmeterTypes {
-            static myPublicStaticMethod(param: privateClass) {
-            }
-            private static myPrivateStaticMethod(param: privateClass) {
-            }
-            myPublicMethod(param: privateClass) {
-            }
-            private myPrivateMethod(param: privateClass) {
-            }
-            constructor(param: privateClass, private param1: privateClass, public param2: privateClass) {
-            }
-        }
-
-        class privateClassWithWithPublicParmeterTypes {
-            static myPublicStaticMethod(param: publicClass) {
-            }
-            private static myPrivateStaticMethod(param: publicClass) {
-            }
-            myPublicMethod(param: publicClass) {
-            }
-            private myPrivateMethod(param: publicClass) {
-            }
-            constructor(param: publicClass, private param1: publicClass, public param2: publicClass) {
-            }
-        }
-
-        export function publicFunctionWithPrivateParmeterTypes(param: privateClass) {
-        }
-        export function publicFunctionWithPublicParmeterTypes(param: publicClass) {
-        }
-        function privateFunctionWithPrivateParmeterTypes(param: privateClass) {
-        }
-        function privateFunctionWithPublicParmeterTypes(param: publicClass) {
-        }
-
-        export declare function publicAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void;
-        export declare function publicAmbientFunctionWithPublicParmeterTypes(param: publicClass): void;
-        declare function privateAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void;
-        declare function privateAmbientFunctionWithPublicParmeterTypes(param: publicClass): void;
-
-        export interface publicInterfaceWithPrivateModuleParameterTypes {
-            new (param: privateModule.publicClass): publicClass;
-            (param: privateModule.publicClass): publicClass;
-            myMethod(param: privateModule.publicClass): void;
-        }
-        export class publicClassWithPrivateModuleParameterTypes {
-            static myPublicStaticMethod(param: privateModule.publicClass) {
-            }
-            myPublicMethod(param: privateModule.publicClass) {
-            }
-            constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) {
-            }
-        }
-        export function publicFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) {
-        }
-        export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void;
-
-        interface privateInterfaceWithPrivateModuleParameterTypes {
-            new (param: privateModule.publicClass): publicClass;
-            (param: privateModule.publicClass): publicClass;
-            myMethod(param: privateModule.publicClass): void;
-        }
-        class privateClassWithPrivateModuleParameterTypes {
-            static myPublicStaticMethod(param: privateModule.publicClass) {
-            }
-            myPublicMethod(param: privateModule.publicClass) {
-            }
-            constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) {
-            }
-        }
-        function privateFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) {
-        }
-        declare function privateAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void;
-    }
-
-    export interface publicInterfaceWithPrivateParmeterTypes {
-        new (param: privateClass): publicClass; // Error
-        (param: privateClass): publicClass; // Error
-        myMethod(param: privateClass): void; // Error
-    }
-
-    export interface publicInterfaceWithPublicParmeterTypes {
-        new (param: publicClass): publicClass;
-        (param: publicClass): publicClass;
-        myMethod(param: publicClass): void;
-    }
-
-    interface privateInterfaceWithPrivateParmeterTypes {
-        new (param: privateClass): privateClass;
-        (param: privateClass): privateClass;
-        myMethod(param: privateClass): void;
-    }
-
-    interface privateInterfaceWithPublicParmeterTypes {
-        new (param: publicClass): publicClass;
-        (param: publicClass): publicClass;
-        myMethod(param: publicClass): void;
-    }
-
-    export class publicClassWithWithPrivateParmeterTypes {
-        static myPublicStaticMethod(param: privateClass) { // Error
-        }
-        private static myPrivateStaticMethod(param: privateClass) {
-        }
-        myPublicMethod(param: privateClass) { // Error
-        }
-        private myPrivateMethod(param: privateClass) {
-        }
-        constructor(param: privateClass, private param1: privateClass, public param2: privateClass) { // Error
-        }
-    }
-
-    export class publicClassWithWithPublicParmeterTypes {
-        static myPublicStaticMethod(param: publicClass) {
-        }
-        private static myPrivateStaticMethod(param: publicClass) {
-        }
-        myPublicMethod(param: publicClass) {
-        }
-        private myPrivateMethod(param: publicClass) {
-        }
-        constructor(param: publicClass, private param1: publicClass, public param2: publicClass) {
-        }
-    }
-
-    class privateClassWithWithPrivateParmeterTypes {
-        static myPublicStaticMethod(param: privateClass) {
-        }
-        private static myPrivateStaticMethod(param: privateClass) {
-        }
-        myPublicMethod(param: privateClass) {
-        }
-        private myPrivateMethod(param: privateClass) {
-        }
-        constructor(param: privateClass, private param1: privateClass, public param2: privateClass) {
-        }
-    }
-
-    class privateClassWithWithPublicParmeterTypes {
-        static myPublicStaticMethod(param: publicClass) {
-        }
-        private static myPrivateStaticMethod(param: publicClass) {
-        }
-        myPublicMethod(param: publicClass) {
-        }
-        private myPrivateMethod(param: publicClass) {
-        }
-        constructor(param: publicClass, private param1: publicClass, public param2: publicClass) {
-        }
-    }
-
-    export function publicFunctionWithPrivateParmeterTypes(param: privateClass) { // Error
-    }
-    export function publicFunctionWithPublicParmeterTypes(param: publicClass) {
-    }
-    function privateFunctionWithPrivateParmeterTypes(param: privateClass) {
-    }
-    function privateFunctionWithPublicParmeterTypes(param: publicClass) {
-    }
-
-    export declare function publicAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void; // Error
-    export declare function publicAmbientFunctionWithPublicParmeterTypes(param: publicClass): void;
-    declare function privateAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void;
-    declare function privateAmbientFunctionWithPublicParmeterTypes(param: publicClass): void;
-
-    export interface publicInterfaceWithPrivateModuleParameterTypes {
-        new (param: privateModule.publicClass): publicClass; // Error
-        (param: privateModule.publicClass): publicClass; // Error
-        myMethod(param: privateModule.publicClass): void; // Error
-    }
-    export class publicClassWithPrivateModuleParameterTypes {
-        static myPublicStaticMethod(param: privateModule.publicClass) { // Error
-        }
-        myPublicMethod(param: privateModule.publicClass) { // Error
-        }
-        constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) { // Error
-        }
-    }
-    export function publicFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) { // Error
-    }
-    export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void; // Error
-
-    interface privateInterfaceWithPrivateModuleParameterTypes {
-        new (param: privateModule.publicClass): publicClass;
-        (param: privateModule.publicClass): publicClass;
-        myMethod(param: privateModule.publicClass): void;
-    }
-    class privateClassWithPrivateModuleParameterTypes {
-        static myPublicStaticMethod(param: privateModule.publicClass) {
-        }
-        myPublicMethod(param: privateModule.publicClass) {
-        }
-        constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) {
-        }
-    }
-    function privateFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) {
-    }
-    declare function privateAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void;
-}
\ No newline at end of file
diff --git a/tests/cases/compiler/privacyFunctionReturnTypeDeclFile.ts b/tests/cases/compiler/privacyFunctionReturnTypeDeclFile.ts
deleted file mode 100644
index c09c4b123f2..00000000000
--- a/tests/cases/compiler/privacyFunctionReturnTypeDeclFile.ts
+++ /dev/null
@@ -1,1194 +0,0 @@
-// @module: commonjs
-// @declaration: true
-
-// @Filename:privacyFunctionReturnTypeDeclFile_externalModule.ts
-class privateClass {
-}
-
-export class publicClass {
-}
-
-export interface publicInterfaceWithPrivateParmeterTypes {
-    new (): privateClass; // Error
-    (): privateClass; // Error
-    [x: number]: privateClass; // Error
-    myMethod(): privateClass; // Error
-}
-
-export interface publicInterfaceWithPublicParmeterTypes {
-    new (): publicClass;
-    (): publicClass;
-    [x: number]: publicClass;
-    myMethod(): publicClass;
-}
-
-interface privateInterfaceWithPrivateParmeterTypes {
-    new (): privateClass;
-    (): privateClass;
-    [x: number]: privateClass;
-    myMethod(): privateClass;
-}
-
-interface privateInterfaceWithPublicParmeterTypes {
-    new (): publicClass;
-    (): publicClass;
-    [x: number]: publicClass;
-    myMethod(): publicClass;
-}
-
-export class publicClassWithWithPrivateParmeterTypes {
-    static myPublicStaticMethod(): privateClass { // Error
-        return null;
-    }
-    private static myPrivateStaticMethod(): privateClass {
-        return null;
-    }
-    myPublicMethod(): privateClass { // Error
-        return null;
-    }
-    private myPrivateMethod(): privateClass {
-        return null;
-    }
-    static myPublicStaticMethod1() { // Error
-        return new privateClass();
-    }
-    private static myPrivateStaticMethod1() {
-        return new privateClass();
-    }
-    myPublicMethod1() { // Error
-        return new privateClass();
-    }
-    private myPrivateMethod1() {
-        return new privateClass();
-    }
-}
-
-export class publicClassWithWithPublicParmeterTypes {
-    static myPublicStaticMethod(): publicClass { 
-        return null;
-    }
-    private static myPrivateStaticMethod(): publicClass {
-        return null;
-    }
-    myPublicMethod(): publicClass { 
-        return null;
-    }
-    private myPrivateMethod(): publicClass {
-        return null;
-    }
-    static myPublicStaticMethod1() {
-        return new publicClass();
-    }
-    private static myPrivateStaticMethod1() {
-        return new publicClass();
-    }
-    myPublicMethod1() { 
-        return new publicClass();
-    }
-    private myPrivateMethod1() {
-        return new publicClass();
-    }
-}
-
-class privateClassWithWithPrivateParmeterTypes {
-    static myPublicStaticMethod(): privateClass {
-        return null;
-    }
-    private static myPrivateStaticMethod(): privateClass {
-        return null;
-    }
-    myPublicMethod(): privateClass {
-        return null;
-    }
-    private myPrivateMethod(): privateClass {
-        return null;
-    }
-    static myPublicStaticMethod1() {
-        return new privateClass();
-    }
-    private static myPrivateStaticMethod1() {
-        return new privateClass();
-    }
-    myPublicMethod1() {
-        return new privateClass();
-    }
-    private myPrivateMethod1() {
-        return new privateClass();
-    }
-}
-
-class privateClassWithWithPublicParmeterTypes {
-    static myPublicStaticMethod(): publicClass {
-        return null;
-    }
-    private static myPrivateStaticMethod(): publicClass {
-        return null;
-    }
-    myPublicMethod(): publicClass {
-        return null;
-    }
-    private myPrivateMethod(): publicClass {
-        return null;
-    }
-    static myPublicStaticMethod1() {
-        return new publicClass();
-    }
-    private static myPrivateStaticMethod1() {
-        return new publicClass();
-    }
-    myPublicMethod1() {
-        return new publicClass();
-    }
-    private myPrivateMethod1() {
-        return new publicClass();
-    }
-}
-
-export function publicFunctionWithPrivateParmeterTypes(): privateClass { // Error
-    return null;
-}
-export function publicFunctionWithPublicParmeterTypes(): publicClass {
-    return null;
-}
-function privateFunctionWithPrivateParmeterTypes(): privateClass {
-    return null;
-}
-function privateFunctionWithPublicParmeterTypes(): publicClass {
-    return null;
-}
-export function publicFunctionWithPrivateParmeterTypes1() { // Error
-    return new privateClass();
-}
-export function publicFunctionWithPublicParmeterTypes1() {
-    return new publicClass();
-}
-function privateFunctionWithPrivateParmeterTypes1() {
-    return new privateClass();
-}
-function privateFunctionWithPublicParmeterTypes1() {
-    return new publicClass();
-}
-
-export declare function publicAmbientFunctionWithPrivateParmeterTypes(): privateClass; // Error
-export declare function publicAmbientFunctionWithPublicParmeterTypes(): publicClass;
-declare function privateAmbientFunctionWithPrivateParmeterTypes(): privateClass;
-declare function privateAmbientFunctionWithPublicParmeterTypes(): publicClass;
-
-export interface publicInterfaceWithPrivateModuleParameterTypes {
-    new (): privateModule.publicClass; // Error
-    (): privateModule.publicClass; // Error
-    [x: number]: privateModule.publicClass // Error
-    myMethod(): privateModule.publicClass; // Error
-}
-export class publicClassWithPrivateModuleParameterTypes {
-    static myPublicStaticMethod(): privateModule.publicClass { // Error
-        return null;
-    }
-    myPublicMethod(): privateModule.publicClass { // Error
-        return null;
-    }
-    static myPublicStaticMethod1() { // Error
-        return new privateModule.publicClass();
-    }
-    myPublicMethod1() { // Error
-        return new privateModule.publicClass();
-    }
-}
-export function publicFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass { // Error
-    return null;
-}
-export function publicFunctionWithPrivateModuleParameterTypes1() { // Error
-    return new privateModule.publicClass();
-}
-export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; // Error
-
-interface privateInterfaceWithPrivateModuleParameterTypes {
-    new (): privateModule.publicClass; 
-    (): privateModule.publicClass;
-    [x: number]: privateModule.publicClass
-    myMethod(): privateModule.publicClass;
-}
-class privateClassWithPrivateModuleParameterTypes {
-    static myPublicStaticMethod(): privateModule.publicClass { 
-        return null;
-    }
-    myPublicMethod(): privateModule.publicClass { 
-        return null;
-    }
-    static myPublicStaticMethod1() { 
-        return new privateModule.publicClass();
-    }
-    myPublicMethod1() { 
-        return new privateModule.publicClass();
-    }
-}
-function privateFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass { 
-    return null;
-}
-function privateFunctionWithPrivateModuleParameterTypes1() { 
-    return new privateModule.publicClass();
-}
-declare function privateAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; 
-
-export module publicModule {
-    class privateClass {
-    }
-
-    export class publicClass {
-    }
-
-    export interface publicInterfaceWithPrivateParmeterTypes {
-        new (): privateClass; // Error
-        (): privateClass; // Error
-        [x: number]: privateClass; // Error
-        myMethod(): privateClass; // Error
-    }
-
-    export interface publicInterfaceWithPublicParmeterTypes {
-        new (): publicClass;
-        (): publicClass;
-        [x: number]: publicClass;
-        myMethod(): publicClass;
-    }
-
-    interface privateInterfaceWithPrivateParmeterTypes {
-        new (): privateClass;
-        (): privateClass;
-        [x: number]: privateClass;
-        myMethod(): privateClass;
-    }
-
-    interface privateInterfaceWithPublicParmeterTypes {
-        new (): publicClass;
-        (): publicClass;
-        [x: number]: publicClass;
-        myMethod(): publicClass;
-    }
-
-    export class publicClassWithWithPrivateParmeterTypes {
-        static myPublicStaticMethod(): privateClass { // Error
-            return null;
-        }
-        private static myPrivateStaticMethod(): privateClass {
-            return null;
-        }
-        myPublicMethod(): privateClass { // Error
-            return null;
-        }
-        private myPrivateMethod(): privateClass {
-            return null;
-        }
-        static myPublicStaticMethod1() { // Error
-            return new privateClass();
-        }
-        private static myPrivateStaticMethod1() {
-            return new privateClass();
-        }
-        myPublicMethod1() { // Error
-            return new privateClass();
-        }
-        private myPrivateMethod1() {
-            return new privateClass();
-        }
-    }
-
-    export class publicClassWithWithPublicParmeterTypes {
-        static myPublicStaticMethod(): publicClass {
-            return null;
-        }
-        private static myPrivateStaticMethod(): publicClass {
-            return null;
-        }
-        myPublicMethod(): publicClass {
-            return null;
-        }
-        private myPrivateMethod(): publicClass {
-            return null;
-        }
-        static myPublicStaticMethod1() {
-            return new publicClass();
-        }
-        private static myPrivateStaticMethod1() {
-            return new publicClass();
-        }
-        myPublicMethod1() {
-            return new publicClass();
-        }
-        private myPrivateMethod1() {
-            return new publicClass();
-        }
-    }
-
-    class privateClassWithWithPrivateParmeterTypes {
-        static myPublicStaticMethod(): privateClass {
-            return null;
-        }
-        private static myPrivateStaticMethod(): privateClass {
-            return null;
-        }
-        myPublicMethod(): privateClass {
-            return null;
-        }
-        private myPrivateMethod(): privateClass {
-            return null;
-        }
-        static myPublicStaticMethod1() {
-            return new privateClass();
-        }
-        private static myPrivateStaticMethod1() {
-            return new privateClass();
-        }
-        myPublicMethod1() {
-            return new privateClass();
-        }
-        private myPrivateMethod1() {
-            return new privateClass();
-        }
-    }
-
-    class privateClassWithWithPublicParmeterTypes {
-        static myPublicStaticMethod(): publicClass {
-            return null;
-        }
-        private static myPrivateStaticMethod(): publicClass {
-            return null;
-        }
-        myPublicMethod(): publicClass {
-            return null;
-        }
-        private myPrivateMethod(): publicClass {
-            return null;
-        }
-        static myPublicStaticMethod1() {
-            return new publicClass();
-        }
-        private static myPrivateStaticMethod1() {
-            return new publicClass();
-        }
-        myPublicMethod1() {
-            return new publicClass();
-        }
-        private myPrivateMethod1() {
-            return new publicClass();
-        }
-    }
-
-    export function publicFunctionWithPrivateParmeterTypes(): privateClass { // Error
-        return null;
-    }
-    export function publicFunctionWithPublicParmeterTypes(): publicClass {
-        return null;
-    }
-    function privateFunctionWithPrivateParmeterTypes(): privateClass {
-        return null;
-    }
-    function privateFunctionWithPublicParmeterTypes(): publicClass {
-        return null;
-    }
-    export function publicFunctionWithPrivateParmeterTypes1() { // Error
-        return new privateClass();
-    }
-    export function publicFunctionWithPublicParmeterTypes1() {
-        return new publicClass();
-    }
-    function privateFunctionWithPrivateParmeterTypes1() {
-        return new privateClass();
-    }
-    function privateFunctionWithPublicParmeterTypes1() {
-        return new publicClass();
-    }
-
-    export declare function publicAmbientFunctionWithPrivateParmeterTypes(): privateClass; // Error
-    export declare function publicAmbientFunctionWithPublicParmeterTypes(): publicClass;
-    declare function privateAmbientFunctionWithPrivateParmeterTypes(): privateClass;
-    declare function privateAmbientFunctionWithPublicParmeterTypes(): publicClass;
-
-    export interface publicInterfaceWithPrivateModuleParameterTypes {
-        new (): privateModule.publicClass; // Error
-        (): privateModule.publicClass; // Error
-        [x: number]: privateModule.publicClass; // Error
-        myMethod(): privateModule.publicClass; // Error
-    }
-    export class publicClassWithPrivateModuleParameterTypes {
-        static myPublicStaticMethod(): privateModule.publicClass { // Error
-            return null;
-        }
-        myPublicMethod(): privateModule.publicClass { // Error
-            return null;
-        }
-        static myPublicStaticMethod1() { // Error
-            return new privateModule.publicClass();
-        }
-        myPublicMethod1() { // Error
-            return new privateModule.publicClass();
-        }
-    }
-    export function publicFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass { // Error
-        return null;
-    }
-    export function publicFunctionWithPrivateModuleParameterTypes1() { // Error
-        return new privateModule.publicClass();
-    }
-    export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; // Error
-
-    interface privateInterfaceWithPrivateModuleParameterTypes {
-        new (): privateModule.publicClass;
-        (): privateModule.publicClass;
-        [x: number]: privateModule.publicClass;
-        myMethod(): privateModule.publicClass;
-    }
-    class privateClassWithPrivateModuleParameterTypes {
-        static myPublicStaticMethod(): privateModule.publicClass {
-            return null;
-        }
-        myPublicMethod(): privateModule.publicClass {
-            return null;
-        }
-        static myPublicStaticMethod1() {
-            return new privateModule.publicClass();
-        }
-        myPublicMethod1() {
-            return new privateModule.publicClass();
-        }
-    }
-    function privateFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass {
-        return null;
-    }
-    function privateFunctionWithPrivateModuleParameterTypes1() {
-        return new privateModule.publicClass();
-    }
-    declare function privateAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; 
-}
-
-module privateModule {
-    class privateClass {
-    }
-
-    export class publicClass {
-    }
-
-    export interface publicInterfaceWithPrivateParmeterTypes {
-        new (): privateClass; 
-        (): privateClass; 
-        [x: number]: privateClass; 
-        myMethod(): privateClass; 
-    }
-
-    export interface publicInterfaceWithPublicParmeterTypes {
-        new (): publicClass;
-        (): publicClass;
-        [x: number]: publicClass;
-        myMethod(): publicClass;
-    }
-
-    interface privateInterfaceWithPrivateParmeterTypes {
-        new (): privateClass;
-        (): privateClass;
-        [x: number]: privateClass;
-        myMethod(): privateClass;
-    }
-
-    interface privateInterfaceWithPublicParmeterTypes {
-        new (): publicClass;
-        (): publicClass;
-        [x: number]: publicClass;
-        myMethod(): publicClass;
-    }
-
-    export class publicClassWithWithPrivateParmeterTypes {
-        static myPublicStaticMethod(): privateClass { 
-            return null;
-        }
-        private static myPrivateStaticMethod(): privateClass {
-            return null;
-        }
-        myPublicMethod(): privateClass { 
-            return null;
-        }
-        private myPrivateMethod(): privateClass {
-            return null;
-        }
-        static myPublicStaticMethod1() { 
-            return new privateClass();
-        }
-        private static myPrivateStaticMethod1() {
-            return new privateClass();
-        }
-        myPublicMethod1() { 
-            return new privateClass();
-        }
-        private myPrivateMethod1() {
-            return new privateClass();
-        }
-    }
-
-    export class publicClassWithWithPublicParmeterTypes {
-        static myPublicStaticMethod(): publicClass {
-            return null;
-        }
-        private static myPrivateStaticMethod(): publicClass {
-            return null;
-        }
-        myPublicMethod(): publicClass {
-            return null;
-        }
-        private myPrivateMethod(): publicClass {
-            return null;
-        }
-        static myPublicStaticMethod1() {
-            return new publicClass();
-        }
-        private static myPrivateStaticMethod1() {
-            return new publicClass();
-        }
-        myPublicMethod1() {
-            return new publicClass();
-        }
-        private myPrivateMethod1() {
-            return new publicClass();
-        }
-    }
-
-    class privateClassWithWithPrivateParmeterTypes {
-        static myPublicStaticMethod(): privateClass {
-            return null;
-        }
-        private static myPrivateStaticMethod(): privateClass {
-            return null;
-        }
-        myPublicMethod(): privateClass {
-            return null;
-        }
-        private myPrivateMethod(): privateClass {
-            return null;
-        }
-        static myPublicStaticMethod1() {
-            return new privateClass();
-        }
-        private static myPrivateStaticMethod1() {
-            return new privateClass();
-        }
-        myPublicMethod1() {
-            return new privateClass();
-        }
-        private myPrivateMethod1() {
-            return new privateClass();
-        }
-    }
-
-    class privateClassWithWithPublicParmeterTypes {
-        static myPublicStaticMethod(): publicClass {
-            return null;
-        }
-        private static myPrivateStaticMethod(): publicClass {
-            return null;
-        }
-        myPublicMethod(): publicClass {
-            return null;
-        }
-        private myPrivateMethod(): publicClass {
-            return null;
-        }
-        static myPublicStaticMethod1() {
-            return new publicClass();
-        }
-        private static myPrivateStaticMethod1() {
-            return new publicClass();
-        }
-        myPublicMethod1() {
-            return new publicClass();
-        }
-        private myPrivateMethod1() {
-            return new publicClass();
-        }
-    }
-
-    export function publicFunctionWithPrivateParmeterTypes(): privateClass { 
-        return null;
-    }
-    export function publicFunctionWithPublicParmeterTypes(): publicClass {
-        return null;
-    }
-    function privateFunctionWithPrivateParmeterTypes(): privateClass {
-        return null;
-    }
-    function privateFunctionWithPublicParmeterTypes(): publicClass {
-        return null;
-    }
-    export function publicFunctionWithPrivateParmeterTypes1() { 
-        return new privateClass();
-    }
-    export function publicFunctionWithPublicParmeterTypes1() {
-        return new publicClass();
-    }
-    function privateFunctionWithPrivateParmeterTypes1() {
-        return new privateClass();
-    }
-    function privateFunctionWithPublicParmeterTypes1() {
-        return new publicClass();
-    }
-
-    export declare function publicAmbientFunctionWithPrivateParmeterTypes(): privateClass; 
-    export declare function publicAmbientFunctionWithPublicParmeterTypes(): publicClass;
-    declare function privateAmbientFunctionWithPrivateParmeterTypes(): privateClass;
-    declare function privateAmbientFunctionWithPublicParmeterTypes(): publicClass;
-
-    export interface publicInterfaceWithPrivateModuleParameterTypes {
-        new (): privateModule.publicClass;
-        (): privateModule.publicClass;
-        [x: number]: privateModule.publicClass;
-        myMethod(): privateModule.publicClass;
-    }
-    export class publicClassWithPrivateModuleParameterTypes {
-        static myPublicStaticMethod(): privateModule.publicClass { 
-            return null;
-        }
-        myPublicMethod(): privateModule.publicClass { 
-            return null;
-        }
-        static myPublicStaticMethod1() { 
-            return new privateModule.publicClass();
-        }
-        myPublicMethod1() { 
-            return new privateModule.publicClass();
-        }
-    }
-    export function publicFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass { 
-        return null;
-    }
-    export function publicFunctionWithPrivateModuleParameterTypes1() { 
-        return new privateModule.publicClass();
-    }
-    export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; 
-
-    interface privateInterfaceWithPrivateModuleParameterTypes {
-        new (): privateModule.publicClass;
-        (): privateModule.publicClass;
-        [x: number]: privateModule.publicClass;
-        myMethod(): privateModule.publicClass;
-    }
-    class privateClassWithPrivateModuleParameterTypes {
-        static myPublicStaticMethod(): privateModule.publicClass {
-            return null;
-        }
-        myPublicMethod(): privateModule.publicClass {
-            return null;
-        }
-        static myPublicStaticMethod1() {
-            return new privateModule.publicClass();
-        }
-        myPublicMethod1() {
-            return new privateModule.publicClass();
-        }
-    }
-    function privateFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass {
-        return null;
-    }
-    function privateFunctionWithPrivateModuleParameterTypes1() {
-        return new privateModule.publicClass();
-    }
-    declare function privateAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; 
-}
-
-// @Filename: privacyFunctionReturnTypeDeclFile_GlobalFile.ts
-class publicClassInGlobal {
-}
-interface publicInterfaceWithPublicParmeterTypesInGlobal {
-    new (): publicClassInGlobal;
-    (): publicClassInGlobal;
-    [x: number]: publicClassInGlobal;
-    myMethod(): publicClassInGlobal;
-}
-class publicClassWithWithPublicParmeterTypesInGlobal {
-    static myPublicStaticMethod(): publicClassInGlobal {
-        return null;
-    }
-    private static myPrivateStaticMethod(): publicClassInGlobal {
-        return null;
-    }
-    myPublicMethod(): publicClassInGlobal {
-        return null;
-    }
-    private myPrivateMethod(): publicClassInGlobal {
-        return null;
-    }
-    static myPublicStaticMethod1() {
-        return new publicClassInGlobal();
-    }
-    private static myPrivateStaticMethod1() {
-        return new publicClassInGlobal();
-    }
-    myPublicMethod1() {
-        return new publicClassInGlobal();
-    }
-    private myPrivateMethod1() {
-        return new publicClassInGlobal();
-    }
-}
-function publicFunctionWithPublicParmeterTypesInGlobal(): publicClassInGlobal {
-    return null;
-}
-function publicFunctionWithPublicParmeterTypesInGlobal1() {
-    return new publicClassInGlobal();
-}
-declare function publicAmbientFunctionWithPublicParmeterTypesInGlobal(): publicClassInGlobal;
-
-module publicModuleInGlobal {
-    class privateClass {
-    }
-
-    export class publicClass {
-    }
-
-    module privateModule {
-        class privateClass {
-        }
-
-        export class publicClass {
-        }
-
-        export interface publicInterfaceWithPrivateParmeterTypes {
-            new (): privateClass;
-            (): privateClass;
-            [x: number]: privateClass;
-            myMethod(): privateClass;
-        }
-
-        export interface publicInterfaceWithPublicParmeterTypes {
-            new (): publicClass;
-            (): publicClass;
-            [x: number]: publicClass;
-            myMethod(): publicClass;
-        }
-
-        interface privateInterfaceWithPrivateParmeterTypes {
-            new (): privateClass;
-            (): privateClass;
-            [x: number]: privateClass;
-            myMethod(): privateClass;
-        }
-
-        interface privateInterfaceWithPublicParmeterTypes {
-            new (): publicClass;
-            (): publicClass;
-            [x: number]: publicClass;
-            myMethod(): publicClass;
-        }
-
-        export class publicClassWithWithPrivateParmeterTypes {
-            static myPublicStaticMethod(): privateClass {
-                return null;
-            }
-            private static myPrivateStaticMethod(): privateClass {
-                return null;
-            }
-            myPublicMethod(): privateClass {
-                return null;
-            }
-            private myPrivateMethod(): privateClass {
-                return null;
-            }
-            static myPublicStaticMethod1() {
-                return new privateClass();
-            }
-            private static myPrivateStaticMethod1() {
-                return new privateClass();
-            }
-            myPublicMethod1() {
-                return new privateClass();
-            }
-            private myPrivateMethod1() {
-                return new privateClass();
-            }
-        }
-
-        export class publicClassWithWithPublicParmeterTypes {
-            static myPublicStaticMethod(): publicClass {
-                return null;
-            }
-            private static myPrivateStaticMethod(): publicClass {
-                return null;
-            }
-            myPublicMethod(): publicClass {
-                return null;
-            }
-            private myPrivateMethod(): publicClass {
-                return null;
-            }
-            static myPublicStaticMethod1() {
-                return new publicClass();
-            }
-            private static myPrivateStaticMethod1() {
-                return new publicClass();
-            }
-            myPublicMethod1() {
-                return new publicClass();
-            }
-            private myPrivateMethod1() {
-                return new publicClass();
-            }
-        }
-
-        class privateClassWithWithPrivateParmeterTypes {
-            static myPublicStaticMethod(): privateClass {
-                return null;
-            }
-            private static myPrivateStaticMethod(): privateClass {
-                return null;
-            }
-            myPublicMethod(): privateClass {
-                return null;
-            }
-            private myPrivateMethod(): privateClass {
-                return null;
-            }
-            static myPublicStaticMethod1() {
-                return new privateClass();
-            }
-            private static myPrivateStaticMethod1() {
-                return new privateClass();
-            }
-            myPublicMethod1() {
-                return new privateClass();
-            }
-            private myPrivateMethod1() {
-                return new privateClass();
-            }
-        }
-
-        class privateClassWithWithPublicParmeterTypes {
-            static myPublicStaticMethod(): publicClass {
-                return null;
-            }
-            private static myPrivateStaticMethod(): publicClass {
-                return null;
-            }
-            myPublicMethod(): publicClass {
-                return null;
-            }
-            private myPrivateMethod(): publicClass {
-                return null;
-            }
-            static myPublicStaticMethod1() {
-                return new publicClass();
-            }
-            private static myPrivateStaticMethod1() {
-                return new publicClass();
-            }
-            myPublicMethod1() {
-                return new publicClass();
-            }
-            private myPrivateMethod1() {
-                return new publicClass();
-            }
-        }
-
-        export function publicFunctionWithPrivateParmeterTypes(): privateClass {
-            return null;
-        }
-        export function publicFunctionWithPublicParmeterTypes(): publicClass {
-            return null;
-        }
-        function privateFunctionWithPrivateParmeterTypes(): privateClass {
-            return null;
-        }
-        function privateFunctionWithPublicParmeterTypes(): publicClass {
-            return null;
-        }
-        export function publicFunctionWithPrivateParmeterTypes1() {
-            return new privateClass();
-        }
-        export function publicFunctionWithPublicParmeterTypes1() {
-            return new publicClass();
-        }
-        function privateFunctionWithPrivateParmeterTypes1() {
-            return new privateClass();
-        }
-        function privateFunctionWithPublicParmeterTypes1() {
-            return new publicClass();
-        }
-
-        export declare function publicAmbientFunctionWithPrivateParmeterTypes(): privateClass;
-        export declare function publicAmbientFunctionWithPublicParmeterTypes(): publicClass;
-        declare function privateAmbientFunctionWithPrivateParmeterTypes(): privateClass;
-        declare function privateAmbientFunctionWithPublicParmeterTypes(): publicClass;
-
-        export interface publicInterfaceWithPrivateModuleParameterTypes {
-            new (): privateModule.publicClass;
-            (): privateModule.publicClass;
-            [x: number]: privateModule.publicClass;
-            myMethod(): privateModule.publicClass;
-        }
-        export class publicClassWithPrivateModuleParameterTypes {
-            static myPublicStaticMethod(): privateModule.publicClass {
-                return null;
-            }
-            myPublicMethod(): privateModule.publicClass {
-                return null;
-            }
-            static myPublicStaticMethod1() {
-                return new privateModule.publicClass();
-            }
-            myPublicMethod1() {
-                return new privateModule.publicClass();
-            }
-        }
-        export function publicFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass {
-            return null;
-        }
-        export function publicFunctionWithPrivateModuleParameterTypes1() {
-            return new privateModule.publicClass();
-        }
-        export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass;
-
-        interface privateInterfaceWithPrivateModuleParameterTypes {
-            new (): privateModule.publicClass;
-            (): privateModule.publicClass;
-            [x: number]: privateModule.publicClass;
-            myMethod(): privateModule.publicClass;
-        }
-        class privateClassWithPrivateModuleParameterTypes {
-            static myPublicStaticMethod(): privateModule.publicClass {
-                return null;
-            }
-            myPublicMethod(): privateModule.publicClass {
-                return null;
-            }
-            static myPublicStaticMethod1() {
-                return new privateModule.publicClass();
-            }
-            myPublicMethod1() {
-                return new privateModule.publicClass();
-            }
-        }
-        function privateFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass {
-            return null;
-        }
-        function privateFunctionWithPrivateModuleParameterTypes1() {
-            return new privateModule.publicClass();
-        }
-        declare function privateAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass;
-    }
-
-    export interface publicInterfaceWithPrivateParmeterTypes {
-        new (): privateClass; // Error
-        (): privateClass; // Error
-        [x: number]: privateClass; // Error
-        myMethod(): privateClass; // Error
-    }
-
-    export interface publicInterfaceWithPublicParmeterTypes {
-        new (): publicClass;
-        (): publicClass;
-        [x: number]: publicClass;
-        myMethod(): publicClass;
-    }
-
-    interface privateInterfaceWithPrivateParmeterTypes {
-        new (): privateClass;
-        (): privateClass;
-        [x: number]: privateClass;
-        myMethod(): privateClass;
-    }
-
-    interface privateInterfaceWithPublicParmeterTypes {
-        new (): publicClass;
-        (): publicClass;
-        [x: number]: publicClass;
-        myMethod(): publicClass;
-    }
-
-    export class publicClassWithWithPrivateParmeterTypes {
-        static myPublicStaticMethod(): privateClass { // Error
-            return null;
-        }
-        private static myPrivateStaticMethod(): privateClass {
-            return null;
-        }
-        myPublicMethod(): privateClass { // Error
-            return null;
-        }
-        private myPrivateMethod(): privateClass {
-            return null;
-        }
-        static myPublicStaticMethod1() { // Error
-            return new privateClass();
-        }
-        private static myPrivateStaticMethod1() {
-            return new privateClass();
-        }
-        myPublicMethod1() { // Error
-            return new privateClass();
-        }
-        private myPrivateMethod1() {
-            return new privateClass();
-        }
-    }
-
-    export class publicClassWithWithPublicParmeterTypes {
-        static myPublicStaticMethod(): publicClass {
-            return null;
-        }
-        private static myPrivateStaticMethod(): publicClass {
-            return null;
-        }
-        myPublicMethod(): publicClass {
-            return null;
-        }
-        private myPrivateMethod(): publicClass {
-            return null;
-        }
-        static myPublicStaticMethod1() {
-            return new publicClass();
-        }
-        private static myPrivateStaticMethod1() {
-            return new publicClass();
-        }
-        myPublicMethod1() {
-            return new publicClass();
-        }
-        private myPrivateMethod1() {
-            return new publicClass();
-        }
-    }
-
-    class privateClassWithWithPrivateParmeterTypes {
-        static myPublicStaticMethod(): privateClass {
-            return null;
-        }
-        private static myPrivateStaticMethod(): privateClass {
-            return null;
-        }
-        myPublicMethod(): privateClass {
-            return null;
-        }
-        private myPrivateMethod(): privateClass {
-            return null;
-        }
-        static myPublicStaticMethod1() {
-            return new privateClass();
-        }
-        private static myPrivateStaticMethod1() {
-            return new privateClass();
-        }
-        myPublicMethod1() {
-            return new privateClass();
-        }
-        private myPrivateMethod1() {
-            return new privateClass();
-        }
-    }
-
-    class privateClassWithWithPublicParmeterTypes {
-        static myPublicStaticMethod(): publicClass {
-            return null;
-        }
-        private static myPrivateStaticMethod(): publicClass {
-            return null;
-        }
-        myPublicMethod(): publicClass {
-            return null;
-        }
-        private myPrivateMethod(): publicClass {
-            return null;
-        }
-        static myPublicStaticMethod1() {
-            return new publicClass();
-        }
-        private static myPrivateStaticMethod1() {
-            return new publicClass();
-        }
-        myPublicMethod1() {
-            return new publicClass();
-        }
-        private myPrivateMethod1() {
-            return new publicClass();
-        }
-    }
-
-    export function publicFunctionWithPrivateParmeterTypes(): privateClass { // Error
-        return null;
-    }
-    export function publicFunctionWithPublicParmeterTypes(): publicClass {
-        return null;
-    }
-    function privateFunctionWithPrivateParmeterTypes(): privateClass {
-        return null;
-    }
-    function privateFunctionWithPublicParmeterTypes(): publicClass {
-        return null;
-    }
-    export function publicFunctionWithPrivateParmeterTypes1() { // Error
-        return new privateClass();
-    }
-    export function publicFunctionWithPublicParmeterTypes1() {
-        return new publicClass();
-    }
-    function privateFunctionWithPrivateParmeterTypes1() {
-        return new privateClass();
-    }
-    function privateFunctionWithPublicParmeterTypes1() {
-        return new publicClass();
-    }
-
-    export declare function publicAmbientFunctionWithPrivateParmeterTypes(): privateClass; // Error
-    export declare function publicAmbientFunctionWithPublicParmeterTypes(): publicClass;
-    declare function privateAmbientFunctionWithPrivateParmeterTypes(): privateClass;
-    declare function privateAmbientFunctionWithPublicParmeterTypes(): publicClass;
-
-    export interface publicInterfaceWithPrivateModuleParameterTypes {
-        new (): privateModule.publicClass; // Error
-        (): privateModule.publicClass; // Error
-        [x: number]: privateModule.publicClass; // Error
-        myMethod(): privateModule.publicClass; // Error
-    }
-    export class publicClassWithPrivateModuleParameterTypes {
-        static myPublicStaticMethod(): privateModule.publicClass { // Error
-            return null;
-        }
-        myPublicMethod(): privateModule.publicClass { // Error
-            return null;
-        }
-        static myPublicStaticMethod1() { // Error
-            return new privateModule.publicClass();
-        }
-        myPublicMethod1() { // Error
-            return new privateModule.publicClass();
-        }
-    }
-    export function publicFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass { // Error
-        return null;
-    }
-    export function publicFunctionWithPrivateModuleParameterTypes1() { // Error
-        return new privateModule.publicClass();
-    }
-    export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; // Error
-
-    interface privateInterfaceWithPrivateModuleParameterTypes {
-        new (): privateModule.publicClass;
-        (): privateModule.publicClass;
-        [x: number]: privateModule.publicClass;
-        myMethod(): privateModule.publicClass;
-    }
-    class privateClassWithPrivateModuleParameterTypes {
-        static myPublicStaticMethod(): privateModule.publicClass {
-            return null;
-        }
-        myPublicMethod(): privateModule.publicClass {
-            return null;
-        }
-        static myPublicStaticMethod1() {
-            return new privateModule.publicClass();
-        }
-        myPublicMethod1() {
-            return new privateModule.publicClass();
-        }
-    }
-    function privateFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass {
-        return null;
-    }
-    function privateFunctionWithPrivateModuleParameterTypes1() {
-        return new privateModule.publicClass();
-    }
-    declare function privateAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass;
-}
\ No newline at end of file
diff --git a/tests/cases/compiler/privacyGetter.ts b/tests/cases/compiler/privacyGetter.ts
index aab0cb22a0e..65b6303833c 100644
--- a/tests/cases/compiler/privacyGetter.ts
+++ b/tests/cases/compiler/privacyGetter.ts
@@ -1,4 +1,3 @@
-// @target: ES5
 //@module: amd
 export module m1 {
     export class C1_public {
diff --git a/tests/cases/compiler/privacyGloGetter.ts b/tests/cases/compiler/privacyGloGetter.ts
index c892c2e75da..5ebca909ad9 100644
--- a/tests/cases/compiler/privacyGloGetter.ts
+++ b/tests/cases/compiler/privacyGloGetter.ts
@@ -1,4 +1,3 @@
-// @target: ES5
 module m1 {
     export class C1_public {
         private f1() {
diff --git a/tests/cases/compiler/privacyGloImport.ts b/tests/cases/compiler/privacyGloImport.ts
index 19bf1009867..68b67f42d89 100644
--- a/tests/cases/compiler/privacyGloImport.ts
+++ b/tests/cases/compiler/privacyGloImport.ts
@@ -1,4 +1,3 @@
-//@declaration: true
 module m1 {
     export module m1_M1_public {
         export class c1 {
@@ -20,21 +19,21 @@ module m1 {
         export var v2: c1;
     }
 
-    //export declare module "m1_M3_public" {
-    //    export function f1();
-    //    export class c1 {
-    //    }
-    //    export var v1: { new (): c1; };
-    //    export var v2: c1;
-    //}
+    declare export module "m1_M3_public" {
+        export function f1();
+        export class c1 {
+        }
+        export var v1: { new (): c1; };
+        export var v2: c1;
+    }
 
-    //declare module "m1_M4_private" {
-    //    export function f1();
-    //    export class c1 {
-    //    }
-    //    export var v1: { new (): c1; };
-    //    export var v2: c1;
-    //}
+    declare module "m1_M4_private" {
+        export function f1();
+        export class c1 {
+        }
+        export var v1: { new (): c1; };
+        export var v2: c1;
+    }
 
     import m1_im1_private = m1_M1_public;
     export var m1_im1_private_v1_public = m1_im1_private.c1;
@@ -57,30 +56,31 @@ module m1 {
     var m1_im2_private_v3_private = m1_im2_private.f1;
     var m1_im2_private_v4_private = m1_im2_private.f1();
 
-    //import m1_im3_private = require("m1_M3_public");
-    //export var m1_im3_private_v1_public = m1_im3_private.c1;
-    //export var m1_im3_private_v2_public = new m1_im3_private.c1();
-    //export var m1_im3_private_v3_public = m1_im3_private.f1;
-    //export var m1_im3_private_v4_public = m1_im3_private.f1();
-    //var m1_im3_private_v1_private = m1_im3_private.c1;
-    //var m1_im3_private_v2_private = new m1_im3_private.c1();
-    //var m1_im3_private_v3_private = m1_im3_private.f1;
-    //var m1_im3_private_v4_private = m1_im3_private.f1();
+    import m1_im3_private = require("m1_M3_public");
+    export var m1_im3_private_v1_public = m1_im3_private.c1;
+    export var m1_im3_private_v2_public = new m1_im3_private.c1();
+    export var m1_im3_private_v3_public = m1_im3_private.f1;
+    export var m1_im3_private_v4_public = m1_im3_private.f1();
+    var m1_im3_private_v1_private = m1_im3_private.c1;
+    var m1_im3_private_v2_private = new m1_im3_private.c1();
+    var m1_im3_private_v3_private = m1_im3_private.f1;
+    var m1_im3_private_v4_private = m1_im3_private.f1();
 
-    //import m1_im4_private = require("m1_M4_private");
-    //export var m1_im4_private_v1_public = m1_im4_private.c1;
-    //export var m1_im4_private_v2_public = new m1_im4_private.c1();
-    //export var m1_im4_private_v3_public = m1_im4_private.f1;
-    //export var m1_im4_private_v4_public = m1_im4_private.f1();
-    //var m1_im4_private_v1_private = m1_im4_private.c1;
-    //var m1_im4_private_v2_private = new m1_im4_private.c1();
-    //var m1_im4_private_v3_private = m1_im4_private.f1;
-    //var m1_im4_private_v4_private = m1_im4_private.f1();
+    import m1_im4_private = require("m1_M4_private");
+    export var m1_im4_private_v1_public = m1_im4_private.c1;
+    export var m1_im4_private_v2_public = new m1_im4_private.c1();
+    export var m1_im4_private_v3_public = m1_im4_private.f1;
+    export var m1_im4_private_v4_public = m1_im4_private.f1();
+    var m1_im4_private_v1_private = m1_im4_private.c1;
+    var m1_im4_private_v2_private = new m1_im4_private.c1();
+    var m1_im4_private_v3_private = m1_im4_private.f1;
+    var m1_im4_private_v4_private = m1_im4_private.f1();
 
+    // Parse error to export module
     export import m1_im1_public = m1_M1_public;
     export import m1_im2_public = m1_M2_private;
-    //export import m1_im3_public = require("m1_M3_public");
-    //export import m1_im4_public = require("m1_M4_private");
+    export import m1_im3_public = require("m1_M3_public");
+    export import m1_im4_public = require("m1_M4_private");
 }
 
 module glo_M1_public {
@@ -104,26 +104,26 @@ declare module "glo_M2_public" {
 declare module "use_glo_M1_public" {
     import use_glo_M1_public = glo_M1_public;
     export var use_glo_M1_public_v1_public: { new (): use_glo_M1_public.c1; };
-    export var use_glo_M1_public_v2_public: typeof use_glo_M1_public;
+    export var use_glo_M1_public_v2_public: use_glo_M1_public;
     export var use_glo_M1_public_v3_public: ()=> use_glo_M1_public.c1;
     var use_glo_M1_public_v1_private: { new (): use_glo_M1_public.c1; };
-    var use_glo_M1_public_v2_private: typeof use_glo_M1_public;
+    var use_glo_M1_public_v2_private: use_glo_M1_public;
     var use_glo_M1_public_v3_private: () => use_glo_M1_public.c1;
 
     import use_glo_M2_public = require("glo_M2_public");
     export var use_glo_M2_public_v1_public: { new (): use_glo_M2_public.c1; };
-    export var use_glo_M2_public_v2_public: typeof use_glo_M2_public;
+    export var use_glo_M2_public_v2_public: use_glo_M2_public;
     export var use_glo_M2_public_v3_public: () => use_glo_M2_public.c1;
     var use_glo_M2_public_v1_private: { new (): use_glo_M2_public.c1; };
-    var use_glo_M2_public_v2_private: typeof use_glo_M2_public;
+    var use_glo_M2_public_v2_private: use_glo_M2_public;
     var use_glo_M2_public_v3_private: () => use_glo_M2_public.c1;
 
     module m2 {
-        //import errorImport = require("glo_M2_public");
+        import errorImport = require("glo_M2_public");
         import nonerrorImport = glo_M1_public;
 
         module m5 {
-            //import m5_errorImport = require("glo_M2_public");
+            import m5_errorImport = require("glo_M2_public");
             import m5_nonerrorImport = glo_M1_public;
         }
     }
@@ -131,23 +131,23 @@ declare module "use_glo_M1_public" {
 
 declare module "anotherParseError" {
     module m2 {
-        //declare module "abc" {
-        //}
+        declare module "abc" {
+        }
     }
 
     module m2 {
-        //module "abc2" {
-        //}
+        module "abc2" {
+        }
+    }
+    module "abc3" {
     }
-    //module "abc3" {
-    //}
 }
 
 module m2 {
-    //import m3 = require("use_glo_M1_public");
+    import m3 = require("use_glo_M1_public");
     module m4 {
         var a = 10;
-        //import m2 = require("use_glo_M1_public");
+        import m2 = require("use_glo_M1_public");
     }
 
 }
\ No newline at end of file
diff --git a/tests/cases/compiler/privacyGloImportParseErrors.ts b/tests/cases/compiler/privacyGloImportParseErrors.ts
deleted file mode 100644
index 8419f6737ea..00000000000
--- a/tests/cases/compiler/privacyGloImportParseErrors.ts
+++ /dev/null
@@ -1,153 +0,0 @@
-//@declaration: true
-module m1 {
-    export module m1_M1_public {
-        export class c1 {
-        }
-        export function f1() {
-            return new c1;
-        }
-        export var v1 = c1;
-        export var v2: c1;
-    }
-
-    module m1_M2_private {
-        export class c1 {
-        }
-        export function f1() {
-            return new c1;
-        }
-        export var v1 = c1;
-        export var v2: c1;
-    }
-
-    export declare module "m1_M3_public" {
-        export function f1();
-        export class c1 {
-        }
-        export var v1: { new (): c1; };
-        export var v2: c1;
-    }
-
-    declare module "m1_M4_private" {
-        export function f1();
-        export class c1 {
-        }
-        export var v1: { new (): c1; };
-        export var v2: c1;
-    }
-
-    import m1_im1_private = m1_M1_public;
-    export var m1_im1_private_v1_public = m1_im1_private.c1;
-    export var m1_im1_private_v2_public = new m1_im1_private.c1();
-    export var m1_im1_private_v3_public = m1_im1_private.f1;
-    export var m1_im1_private_v4_public = m1_im1_private.f1();
-    var m1_im1_private_v1_private = m1_im1_private.c1;
-    var m1_im1_private_v2_private = new m1_im1_private.c1();
-    var m1_im1_private_v3_private = m1_im1_private.f1;
-    var m1_im1_private_v4_private = m1_im1_private.f1();
-
-
-    import m1_im2_private = m1_M2_private;
-    export var m1_im2_private_v1_public = m1_im2_private.c1;
-    export var m1_im2_private_v2_public = new m1_im2_private.c1();
-    export var m1_im2_private_v3_public = m1_im2_private.f1;
-    export var m1_im2_private_v4_public = m1_im2_private.f1();
-    var m1_im2_private_v1_private = m1_im2_private.c1;
-    var m1_im2_private_v2_private = new m1_im2_private.c1();
-    var m1_im2_private_v3_private = m1_im2_private.f1;
-    var m1_im2_private_v4_private = m1_im2_private.f1();
-
-    import m1_im3_private = require("m1_M3_public");
-    export var m1_im3_private_v1_public = m1_im3_private.c1;
-    export var m1_im3_private_v2_public = new m1_im3_private.c1();
-    export var m1_im3_private_v3_public = m1_im3_private.f1;
-    export var m1_im3_private_v4_public = m1_im3_private.f1();
-    var m1_im3_private_v1_private = m1_im3_private.c1;
-    var m1_im3_private_v2_private = new m1_im3_private.c1();
-    var m1_im3_private_v3_private = m1_im3_private.f1;
-    var m1_im3_private_v4_private = m1_im3_private.f1();
-
-    import m1_im4_private = require("m1_M4_private");
-    export var m1_im4_private_v1_public = m1_im4_private.c1;
-    export var m1_im4_private_v2_public = new m1_im4_private.c1();
-    export var m1_im4_private_v3_public = m1_im4_private.f1;
-    export var m1_im4_private_v4_public = m1_im4_private.f1();
-    var m1_im4_private_v1_private = m1_im4_private.c1;
-    var m1_im4_private_v2_private = new m1_im4_private.c1();
-    var m1_im4_private_v3_private = m1_im4_private.f1;
-    var m1_im4_private_v4_private = m1_im4_private.f1();
-
-    export import m1_im1_public = m1_M1_public;
-    export import m1_im2_public = m1_M2_private;
-    export import m1_im3_public = require("m1_M3_public");
-    export import m1_im4_public = require("m1_M4_private");
-}
-
-module glo_M1_public {
-    export class c1 {
-    }
-    export function f1() {
-        return new c1;
-    }
-    export var v1 = c1;
-    export var v2: c1;
-}
-
-declare module "glo_M2_public" {
-    export function f1();
-    export class c1 {
-    }
-    export var v1: { new (): c1; };
-    export var v2: c1;
-}
-
-declare module "use_glo_M1_public" {
-    import use_glo_M1_public = glo_M1_public;
-    export var use_glo_M1_public_v1_public: { new (): use_glo_M1_public.c1; };
-    export var use_glo_M1_public_v2_public: typeof use_glo_M1_public;
-    export var use_glo_M1_public_v3_public: ()=> use_glo_M1_public.c1;
-    var use_glo_M1_public_v1_private: { new (): use_glo_M1_public.c1; };
-    var use_glo_M1_public_v2_private: typeof use_glo_M1_public;
-    var use_glo_M1_public_v3_private: () => use_glo_M1_public.c1;
-
-    import use_glo_M2_public = require("glo_M2_public");
-    export var use_glo_M2_public_v1_public: { new (): use_glo_M2_public.c1; };
-    export var use_glo_M2_public_v2_public: typeof use_glo_M2_public;
-    export var use_glo_M2_public_v3_public: () => use_glo_M2_public.c1;
-    var use_glo_M2_public_v1_private: { new (): use_glo_M2_public.c1; };
-    var use_glo_M2_public_v2_private: typeof use_glo_M2_public;
-    var use_glo_M2_public_v3_private: () => use_glo_M2_public.c1;
-
-    module m2 {
-        import errorImport = require("glo_M2_public");
-        import nonerrorImport = glo_M1_public;
-
-        module m5 {
-            import m5_errorImport = require("glo_M2_public");
-            import m5_nonerrorImport = glo_M1_public;
-        }
-    }
-}
-
-declare module "anotherParseError" {
-    module m2 {
-        declare module "abc" {
-        }
-    }
-
-    module m2 {
-        module "abc2" {
-        }
-    }
-    module "abc3" {
-    }
-}
-
-module m2 {
-    import m3 = require("use_glo_M1_public");
-    module m4 {
-        var a = 10;
-        import m2 = require("use_glo_M1_public");
-    }
-
-}
\ No newline at end of file
diff --git a/tests/cases/compiler/privacyImport.ts b/tests/cases/compiler/privacyImport.ts
index dff16781d56..04d789a3749 100644
--- a/tests/cases/compiler/privacyImport.ts
+++ b/tests/cases/compiler/privacyImport.ts
@@ -1,5 +1,4 @@
 //@module: commonjs
-//@declaration: true
 export module m1 {
     export module m1_M1_public {
         export class c1 {
@@ -21,21 +20,21 @@ export module m1 {
         export var v2: c1;
     }
 
-    //export declare module "m1_M3_public" {
-    //    export function f1();
-    //    export class c1 {
-    //    }
-    //    export var v1: { new (): c1; };
-    //    export var v2: c1;
-    //}
+    export declare module "m1_M3_public" {
+        export function f1();
+        export class c1 {
+        }
+        export var v1: { new (): c1; };
+        export var v2: c1;
+    }
 
-    //declare module "m1_M4_private" {
-    //    export function f1();
-    //    export class c1 {
-    //    }
-    //    export var v1: { new (): c1; };
-    //    export var v2: c1;
-    //}
+    declare module "m1_M4_private" {
+        export function f1();
+        export class c1 {
+        }
+        export var v1: { new (): c1; };
+        export var v2: c1;
+    }
 
     import m1_im1_private = m1_M1_public;
     export var m1_im1_private_v1_public = m1_im1_private.c1;
@@ -58,30 +57,30 @@ export module m1 {
     var m1_im2_private_v3_private = m1_im2_private.f1;
     var m1_im2_private_v4_private = m1_im2_private.f1();
 
-    //import m1_im3_private = require("m1_M3_public");
-    //export var m1_im3_private_v1_public = m1_im3_private.c1;
-    //export var m1_im3_private_v2_public = new m1_im3_private.c1();
-    //export var m1_im3_private_v3_public = m1_im3_private.f1;
-    //export var m1_im3_private_v4_public = m1_im3_private.f1();
-    //var m1_im3_private_v1_private = m1_im3_private.c1;
-    //var m1_im3_private_v2_private = new m1_im3_private.c1();
-    //var m1_im3_private_v3_private = m1_im3_private.f1;
-    //var m1_im3_private_v4_private = m1_im3_private.f1();
+    import m1_im3_private = require("m1_M3_public");
+    export var m1_im3_private_v1_public = m1_im3_private.c1;
+    export var m1_im3_private_v2_public = new m1_im3_private.c1();
+    export var m1_im3_private_v3_public = m1_im3_private.f1;
+    export var m1_im3_private_v4_public = m1_im3_private.f1();
+    var m1_im3_private_v1_private = m1_im3_private.c1;
+    var m1_im3_private_v2_private = new m1_im3_private.c1();
+    var m1_im3_private_v3_private = m1_im3_private.f1;
+    var m1_im3_private_v4_private = m1_im3_private.f1();
 
-    //import m1_im4_private = require("m1_M4_private");
-    //export var m1_im4_private_v1_public = m1_im4_private.c1;
-    //export var m1_im4_private_v2_public = new m1_im4_private.c1();
-    //export var m1_im4_private_v3_public = m1_im4_private.f1;
-    //export var m1_im4_private_v4_public = m1_im4_private.f1();
-    //var m1_im4_private_v1_private = m1_im4_private.c1;
-    //var m1_im4_private_v2_private = new m1_im4_private.c1();
-    //var m1_im4_private_v3_private = m1_im4_private.f1;
-    //var m1_im4_private_v4_private = m1_im4_private.f1();
+    import m1_im4_private = require("m1_M4_private");
+    export var m1_im4_private_v1_public = m1_im4_private.c1;
+    export var m1_im4_private_v2_public = new m1_im4_private.c1();
+    export var m1_im4_private_v3_public = m1_im4_private.f1;
+    export var m1_im4_private_v4_public = m1_im4_private.f1();
+    var m1_im4_private_v1_private = m1_im4_private.c1;
+    var m1_im4_private_v2_private = new m1_im4_private.c1();
+    var m1_im4_private_v3_private = m1_im4_private.f1;
+    var m1_im4_private_v4_private = m1_im4_private.f1();
 
     export import m1_im1_public = m1_M1_public;
     export import m1_im2_public = m1_M2_private;
-    //export import m1_im3_public = require("m1_M3_public");
-    //export import m1_im4_public = require("m1_M4_private");
+    export import m1_im3_public = require("m1_M3_public");
+    export import m1_im4_public = require("m1_M4_private");
 }
 
 module m2 {
@@ -105,21 +104,21 @@ module m2 {
         export var v2: c1;
     }
 
-    //export declare module "m2_M3_public" {
-    //    export function f1();
-    //    export class c1 {
-    //    }
-    //    export var v1: { new (): c1; };
-    //    export var v2: c1;
-    //}
+    export declare module "m2_M3_public" {
+        export function f1();
+        export class c1 {
+        }
+        export var v1: { new (): c1; };
+        export var v2: c1;
+    }
 
-    //declare module "m2_M4_private" {
-    //    export function f1();
-    //    export class c1 {
-    //    }
-    //    export var v1: { new (): c1; };
-    //    export var v2: c1;
-    //}
+    declare module "m2_M4_private" {
+        export function f1();
+        export class c1 {
+        }
+        export var v1: { new (): c1; };
+        export var v2: c1;
+    }
 
     import m1_im1_private = m2_M1_public;
     export var m1_im1_private_v1_public = m1_im1_private.c1;
@@ -142,31 +141,31 @@ module m2 {
     var m1_im2_private_v3_private = m1_im2_private.f1;
     var m1_im2_private_v4_private = m1_im2_private.f1();
 
-    //import m1_im3_private = require("m2_M3_public");
-    //export var m1_im3_private_v1_public = m1_im3_private.c1;
-    //export var m1_im3_private_v2_public = new m1_im3_private.c1();
-    //export var m1_im3_private_v3_public = m1_im3_private.f1;
-    //export var m1_im3_private_v4_public = m1_im3_private.f1();
-    //var m1_im3_private_v1_private = m1_im3_private.c1;
-    //var m1_im3_private_v2_private = new m1_im3_private.c1();
-    //var m1_im3_private_v3_private = m1_im3_private.f1;
-    //var m1_im3_private_v4_private = m1_im3_private.f1();
+    import m1_im3_private = require("m2_M3_public");
+    export var m1_im3_private_v1_public = m1_im3_private.c1;
+    export var m1_im3_private_v2_public = new m1_im3_private.c1();
+    export var m1_im3_private_v3_public = m1_im3_private.f1;
+    export var m1_im3_private_v4_public = m1_im3_private.f1();
+    var m1_im3_private_v1_private = m1_im3_private.c1;
+    var m1_im3_private_v2_private = new m1_im3_private.c1();
+    var m1_im3_private_v3_private = m1_im3_private.f1;
+    var m1_im3_private_v4_private = m1_im3_private.f1();
 
-    //import m1_im4_private = require("m2_M4_private");
-    //export var m1_im4_private_v1_public = m1_im4_private.c1;
-    //export var m1_im4_private_v2_public = new m1_im4_private.c1();
-    //export var m1_im4_private_v3_public = m1_im4_private.f1;
-    //export var m1_im4_private_v4_public = m1_im4_private.f1();
-    //var m1_im4_private_v1_private = m1_im4_private.c1;
-    //var m1_im4_private_v2_private = new m1_im4_private.c1();
-    //var m1_im4_private_v3_private = m1_im4_private.f1;
-    //var m1_im4_private_v4_private = m1_im4_private.f1();
+    import m1_im4_private = require("m2_M4_private");
+    export var m1_im4_private_v1_public = m1_im4_private.c1;
+    export var m1_im4_private_v2_public = new m1_im4_private.c1();
+    export var m1_im4_private_v3_public = m1_im4_private.f1;
+    export var m1_im4_private_v4_public = m1_im4_private.f1();
+    var m1_im4_private_v1_private = m1_im4_private.c1;
+    var m1_im4_private_v2_private = new m1_im4_private.c1();
+    var m1_im4_private_v3_private = m1_im4_private.f1;
+    var m1_im4_private_v4_private = m1_im4_private.f1();
 
     // Parse error to export module
     export import m1_im1_public = m2_M1_public;
     export import m1_im2_public = m2_M2_private;
-    //export import m1_im3_public = require("m2_M3_public");
-    //export import m1_im4_public = require("m2_M4_private");
+    export import m1_im3_public = require("m2_M3_public");
+    export import m1_im4_public = require("m2_M4_private");
 }
 
 export module glo_M1_public {
@@ -179,13 +178,13 @@ export module glo_M1_public {
     export var v2: c1;
 }
 
-//export declare module "glo_M2_public" {
-//    export function f1();
-//    export class c1 {
-//    }
-//    export var v1: { new (): c1; };
-//    export var v2: c1;
-//}
+export declare module "glo_M2_public" {
+    export function f1();
+    export class c1 {
+    }
+    export var v1: { new (): c1; };
+    export var v2: c1;
+}
 
 export module glo_M3_private {
     export class c1 {
@@ -197,13 +196,13 @@ export module glo_M3_private {
     export var v2: c1;
 }
 
-//export declare module "glo_M4_private" {
-//    export function f1();
-//    export class c1 {
-//    }
-//    export var v1: { new (): c1; };
-//    export var v2: c1;
-//}
+export declare module "glo_M4_private" {
+    export function f1();
+    export class c1 {
+    }
+    export var v1: { new (): c1; };
+    export var v2: c1;
+}
 
 
 import glo_im1_private = glo_M1_public;
@@ -217,15 +216,15 @@ var glo_im1_private_v3_private = glo_im1_private.f1;
 var glo_im1_private_v4_private = glo_im1_private.f1();
 
 
-//import glo_im2_private = require("glo_M2_public");
-//export var glo_im2_private_v1_public = glo_im2_private.c1;
-//export var glo_im2_private_v2_public = new glo_im2_private.c1();
-//export var glo_im2_private_v3_public = glo_im2_private.f1;
-//export var glo_im2_private_v4_public = glo_im2_private.f1();
-//var glo_im2_private_v1_private = glo_im2_private.c1;
-//var glo_im2_private_v2_private = new glo_im2_private.c1();
-//var glo_im2_private_v3_private = glo_im2_private.f1;
-//var glo_im2_private_v4_private = glo_im2_private.f1();
+import glo_im2_private = require("glo_M2_public");
+export var glo_im2_private_v1_public = glo_im2_private.c1;
+export var glo_im2_private_v2_public = new glo_im2_private.c1();
+export var glo_im2_private_v3_public = glo_im2_private.f1;
+export var glo_im2_private_v4_public = glo_im2_private.f1();
+var glo_im2_private_v1_private = glo_im2_private.c1;
+var glo_im2_private_v2_private = new glo_im2_private.c1();
+var glo_im2_private_v3_private = glo_im2_private.f1;
+var glo_im2_private_v4_private = glo_im2_private.f1();
 
 import glo_im3_private = glo_M3_private;
 export var glo_im3_private_v1_public = glo_im3_private.c1;
@@ -237,122 +236,122 @@ var glo_im3_private_v2_private = new glo_im3_private.c1();
 var glo_im3_private_v3_private = glo_im3_private.f1;
 var glo_im3_private_v4_private = glo_im3_private.f1();
 
-//import glo_im4_private = require("glo_M4_private");
-//export var glo_im4_private_v1_public = glo_im4_private.c1;
-//export var glo_im4_private_v2_public = new glo_im4_private.c1();
-//export var glo_im4_private_v3_public = glo_im4_private.f1;
-//export var glo_im4_private_v4_public = glo_im4_private.f1();
-//var glo_im4_private_v1_private = glo_im4_private.c1;
-//var glo_im4_private_v2_private = new glo_im4_private.c1();
-//var glo_im4_private_v3_private = glo_im4_private.f1;
-//var glo_im4_private_v4_private = glo_im4_private.f1();
+import glo_im4_private = require("glo_M4_private");
+export var glo_im4_private_v1_public = glo_im4_private.c1;
+export var glo_im4_private_v2_public = new glo_im4_private.c1();
+export var glo_im4_private_v3_public = glo_im4_private.f1;
+export var glo_im4_private_v4_public = glo_im4_private.f1();
+var glo_im4_private_v1_private = glo_im4_private.c1;
+var glo_im4_private_v2_private = new glo_im4_private.c1();
+var glo_im4_private_v3_private = glo_im4_private.f1;
+var glo_im4_private_v4_private = glo_im4_private.f1();
 
 // Parse error to export module
 export import glo_im1_public = glo_M1_public;
 export import glo_im2_public = glo_M3_private;
-//export import glo_im3_public = require("glo_M2_public");
-//export import glo_im4_public = require("glo_M4_private");
+export import glo_im3_public = require("glo_M2_public");
+export import glo_im4_public = require("glo_M4_private");
 
 
-//export declare module "use_glo_M1_public" {
-//    import use_glo_M1_public = glo_M1_public;
-//    export var use_glo_M1_public_v1_public: { new (): use_glo_M1_public.c1; };
-//    export var use_glo_M1_public_v2_public: use_glo_M1_public;
-//    export var use_glo_M1_public_v3_public: () => use_glo_M1_public.c1;
-//    var use_glo_M1_public_v1_private: { new (): use_glo_M1_public.c1; };
-//    var use_glo_M1_public_v2_private: use_glo_M1_public;
-//    var use_glo_M1_public_v3_private: () => use_glo_M1_public.c1;
+export declare module "use_glo_M1_public" {
+    import use_glo_M1_public = glo_M1_public;
+    export var use_glo_M1_public_v1_public: { new (): use_glo_M1_public.c1; };
+    export var use_glo_M1_public_v2_public: use_glo_M1_public;
+    export var use_glo_M1_public_v3_public: () => use_glo_M1_public.c1;
+    var use_glo_M1_public_v1_private: { new (): use_glo_M1_public.c1; };
+    var use_glo_M1_public_v2_private: use_glo_M1_public;
+    var use_glo_M1_public_v3_private: () => use_glo_M1_public.c1;
 
-//    import use_glo_M2_public = require("glo_M2_public");
-//    export var use_glo_M2_public_v1_public: { new (): use_glo_M2_public.c1; };
-//    export var use_glo_M2_public_v2_public: use_glo_M2_public;
-//    export var use_glo_M2_public_v3_public: () => use_glo_M2_public.c1;
-//    var use_glo_M2_public_v1_private: { new (): use_glo_M2_public.c1; };
-//    var use_glo_M2_public_v2_private: use_glo_M2_public;
-//    var use_glo_M2_public_v3_private: () => use_glo_M2_public.c1;
+    import use_glo_M2_public = require("glo_M2_public");
+    export var use_glo_M2_public_v1_public: { new (): use_glo_M2_public.c1; };
+    export var use_glo_M2_public_v2_public: use_glo_M2_public;
+    export var use_glo_M2_public_v3_public: () => use_glo_M2_public.c1;
+    var use_glo_M2_public_v1_private: { new (): use_glo_M2_public.c1; };
+    var use_glo_M2_public_v2_private: use_glo_M2_public;
+    var use_glo_M2_public_v3_private: () => use_glo_M2_public.c1;
 
-//    module m2 {
-//        import errorImport = require("glo_M2_public");
-//        import nonerrorImport = glo_M1_public;
+    module m2 {
+        import errorImport = require("glo_M2_public");
+        import nonerrorImport = glo_M1_public;
 
-//        module m5 {
-//            import m5_errorImport = require("glo_M2_public");
-//            import m5_nonerrorImport = glo_M1_public;
-//        }
-//    }
-//}
+        module m5 {
+            import m5_errorImport = require("glo_M2_public");
+            import m5_nonerrorImport = glo_M1_public;
+        }
+    }
+}
 
 
-//declare module "use_glo_M3_private" {
-//    import use_glo_M3_private = glo_M3_private;
-//    export var use_glo_M3_private_v1_public: { new (): use_glo_M3_private.c1; };
-//    export var use_glo_M3_private_v2_public: use_glo_M3_private;
-//    export var use_glo_M3_private_v3_public: () => use_glo_M3_private.c1;
-//    var use_glo_M3_private_v1_private: { new (): use_glo_M3_private.c1; };
-//    var use_glo_M3_private_v2_private: use_glo_M3_private;
-//    var use_glo_M3_private_v3_private: () => use_glo_M3_private.c1;
+declare module "use_glo_M3_private" {
+    import use_glo_M3_private = glo_M3_private;
+    export var use_glo_M3_private_v1_public: { new (): use_glo_M3_private.c1; };
+    export var use_glo_M3_private_v2_public: use_glo_M3_private;
+    export var use_glo_M3_private_v3_public: () => use_glo_M3_private.c1;
+    var use_glo_M3_private_v1_private: { new (): use_glo_M3_private.c1; };
+    var use_glo_M3_private_v2_private: use_glo_M3_private;
+    var use_glo_M3_private_v3_private: () => use_glo_M3_private.c1;
 
-//    import use_glo_M4_private = require("glo_M4_private");
-//    export var use_glo_M4_private_v1_public: { new (): use_glo_M4_private.c1; };
-//    export var use_glo_M4_private_v2_public: use_glo_M4_private;
-//    export var use_glo_M4_private_v3_public: () => use_glo_M4_private.c1;
-//    var use_glo_M4_private_v1_private: { new (): use_glo_M4_private.c1; };
-//    var use_glo_M4_private_v2_private: use_glo_M4_private;
-//    var use_glo_M4_private_v3_private: () => use_glo_M4_private.c1;
+    import use_glo_M4_private = require("glo_M4_private");
+    export var use_glo_M4_private_v1_public: { new (): use_glo_M4_private.c1; };
+    export var use_glo_M4_private_v2_public: use_glo_M4_private;
+    export var use_glo_M4_private_v3_public: () => use_glo_M4_private.c1;
+    var use_glo_M4_private_v1_private: { new (): use_glo_M4_private.c1; };
+    var use_glo_M4_private_v2_private: use_glo_M4_private;
+    var use_glo_M4_private_v3_private: () => use_glo_M4_private.c1;
 
-//    module m2 {
-//        import errorImport = require("glo_M4_private");
-//        import nonerrorImport = glo_M3_private;
+    module m2 {
+        import errorImport = require("glo_M4_private");
+        import nonerrorImport = glo_M3_private;
 
-//        module m5 {
-//            import m5_errorImport = require("glo_M4_private");
-//            import m5_nonerrorImport = glo_M3_private;
-//        }
-//    }
-//}
+        module m5 {
+            import m5_errorImport = require("glo_M4_private");
+            import m5_nonerrorImport = glo_M3_private;
+        }
+    }
+}
 
-//declare module "anotherParseError" {
-//    module m2 {
-//        declare module "abc" {
-//        }
-//    }
+declare module "anotherParseError" {
+    module m2 {
+        declare module "abc" {
+        }
+    }
 
-//    module m2 {
-//        module "abc2" {
-//        }
-//    }
-//    module "abc3" {
-//    }
-//}
+    module m2 {
+        module "abc2" {
+        }
+    }
+    module "abc3" {
+    }
+}
 
-//declare export module "anotherParseError2" {
-//    module m2 {
-//        declare module "abc" {
-//        }
-//    }
+declare export module "anotherParseError2" {
+    module m2 {
+        declare module "abc" {
+        }
+    }
 
-//    module m2 {
-//        module "abc2" {
-//        }
-//    }
-//    module "abc3" {
-//    }
-//}
+    module m2 {
+        module "abc2" {
+        }
+    }
+    module "abc3" {
+    }
+}
 
 module m2 {
-    //import m3 = require("use_glo_M1_public");
+    import m3 = require("use_glo_M1_public");
     module m4 {
         var a = 10;
-        //import m2 = require("use_glo_M1_public");
+        import m2 = require("use_glo_M1_public");
     }
 
 }
 
 export module m3 {
-    //import m3 = require("use_glo_M1_public");
+    import m3 = require("use_glo_M1_public");
     module m4 {
         var a = 10;
-        //import m2 = require("use_glo_M1_public");
+        import m2 = require("use_glo_M1_public");
     }
 
 }
\ No newline at end of file
diff --git a/tests/cases/compiler/privacyImportParseErrors.ts b/tests/cases/compiler/privacyImportParseErrors.ts
deleted file mode 100644
index 04d789a3749..00000000000
--- a/tests/cases/compiler/privacyImportParseErrors.ts
+++ /dev/null
@@ -1,357 +0,0 @@
-//@module: commonjs
-export module m1 {
-    export module m1_M1_public {
-        export class c1 {
-        }
-        export function f1() {
-            return new c1;
-        }
-        export var v1 = c1;
-        export var v2: c1;
-    }
-
-    module m1_M2_private {
-        export class c1 {
-        }
-        export function f1() {
-            return new c1;
-        }
-        export var v1 = c1;
-        export var v2: c1;
-    }
-
-    export declare module "m1_M3_public" {
-        export function f1();
-        export class c1 {
-        }
-        export var v1: { new (): c1; };
-        export var v2: c1;
-    }
-
-    declare module "m1_M4_private" {
-        export function f1();
-        export class c1 {
-        }
-        export var v1: { new (): c1; };
-        export var v2: c1;
-    }
-
-    import m1_im1_private = m1_M1_public;
-    export var m1_im1_private_v1_public = m1_im1_private.c1;
-    export var m1_im1_private_v2_public = new m1_im1_private.c1();
-    export var m1_im1_private_v3_public = m1_im1_private.f1;
-    export var m1_im1_private_v4_public = m1_im1_private.f1();
-    var m1_im1_private_v1_private = m1_im1_private.c1;
-    var m1_im1_private_v2_private = new m1_im1_private.c1();
-    var m1_im1_private_v3_private = m1_im1_private.f1;
-    var m1_im1_private_v4_private = m1_im1_private.f1();
-
-
-    import m1_im2_private = m1_M2_private;
-    export var m1_im2_private_v1_public = m1_im2_private.c1;
-    export var m1_im2_private_v2_public = new m1_im2_private.c1();
-    export var m1_im2_private_v3_public = m1_im2_private.f1;
-    export var m1_im2_private_v4_public = m1_im2_private.f1();
-    var m1_im2_private_v1_private = m1_im2_private.c1;
-    var m1_im2_private_v2_private = new m1_im2_private.c1();
-    var m1_im2_private_v3_private = m1_im2_private.f1;
-    var m1_im2_private_v4_private = m1_im2_private.f1();
-
-    import m1_im3_private = require("m1_M3_public");
-    export var m1_im3_private_v1_public = m1_im3_private.c1;
-    export var m1_im3_private_v2_public = new m1_im3_private.c1();
-    export var m1_im3_private_v3_public = m1_im3_private.f1;
-    export var m1_im3_private_v4_public = m1_im3_private.f1();
-    var m1_im3_private_v1_private = m1_im3_private.c1;
-    var m1_im3_private_v2_private = new m1_im3_private.c1();
-    var m1_im3_private_v3_private = m1_im3_private.f1;
-    var m1_im3_private_v4_private = m1_im3_private.f1();
-
-    import m1_im4_private = require("m1_M4_private");
-    export var m1_im4_private_v1_public = m1_im4_private.c1;
-    export var m1_im4_private_v2_public = new m1_im4_private.c1();
-    export var m1_im4_private_v3_public = m1_im4_private.f1;
-    export var m1_im4_private_v4_public = m1_im4_private.f1();
-    var m1_im4_private_v1_private = m1_im4_private.c1;
-    var m1_im4_private_v2_private = new m1_im4_private.c1();
-    var m1_im4_private_v3_private = m1_im4_private.f1;
-    var m1_im4_private_v4_private = m1_im4_private.f1();
-
-    export import m1_im1_public = m1_M1_public;
-    export import m1_im2_public = m1_M2_private;
-    export import m1_im3_public = require("m1_M3_public");
-    export import m1_im4_public = require("m1_M4_private");
-}
-
-module m2 {
-    export module m2_M1_public {
-        export class c1 {
-        }
-        export function f1() {
-            return new c1;
-        }
-        export var v1 = c1;
-        export var v2: c1;
-    }
-
-    module m2_M2_private {
-        export class c1 {
-        }
-        export function f1() {
-            return new c1;
-        }
-        export var v1 = c1;
-        export var v2: c1;
-    }
-
-    export declare module "m2_M3_public" {
-        export function f1();
-        export class c1 {
-        }
-        export var v1: { new (): c1; };
-        export var v2: c1;
-    }
-
-    declare module "m2_M4_private" {
-        export function f1();
-        export class c1 {
-        }
-        export var v1: { new (): c1; };
-        export var v2: c1;
-    }
-
-    import m1_im1_private = m2_M1_public;
-    export var m1_im1_private_v1_public = m1_im1_private.c1;
-    export var m1_im1_private_v2_public = new m1_im1_private.c1();
-    export var m1_im1_private_v3_public = m1_im1_private.f1;
-    export var m1_im1_private_v4_public = m1_im1_private.f1();
-    var m1_im1_private_v1_private = m1_im1_private.c1;
-    var m1_im1_private_v2_private = new m1_im1_private.c1();
-    var m1_im1_private_v3_private = m1_im1_private.f1;
-    var m1_im1_private_v4_private = m1_im1_private.f1();
-
-
-    import m1_im2_private = m2_M2_private;
-    export var m1_im2_private_v1_public = m1_im2_private.c1;
-    export var m1_im2_private_v2_public = new m1_im2_private.c1();
-    export var m1_im2_private_v3_public = m1_im2_private.f1;
-    export var m1_im2_private_v4_public = m1_im2_private.f1();
-    var m1_im2_private_v1_private = m1_im2_private.c1;
-    var m1_im2_private_v2_private = new m1_im2_private.c1();
-    var m1_im2_private_v3_private = m1_im2_private.f1;
-    var m1_im2_private_v4_private = m1_im2_private.f1();
-
-    import m1_im3_private = require("m2_M3_public");
-    export var m1_im3_private_v1_public = m1_im3_private.c1;
-    export var m1_im3_private_v2_public = new m1_im3_private.c1();
-    export var m1_im3_private_v3_public = m1_im3_private.f1;
-    export var m1_im3_private_v4_public = m1_im3_private.f1();
-    var m1_im3_private_v1_private = m1_im3_private.c1;
-    var m1_im3_private_v2_private = new m1_im3_private.c1();
-    var m1_im3_private_v3_private = m1_im3_private.f1;
-    var m1_im3_private_v4_private = m1_im3_private.f1();
-
-    import m1_im4_private = require("m2_M4_private");
-    export var m1_im4_private_v1_public = m1_im4_private.c1;
-    export var m1_im4_private_v2_public = new m1_im4_private.c1();
-    export var m1_im4_private_v3_public = m1_im4_private.f1;
-    export var m1_im4_private_v4_public = m1_im4_private.f1();
-    var m1_im4_private_v1_private = m1_im4_private.c1;
-    var m1_im4_private_v2_private = new m1_im4_private.c1();
-    var m1_im4_private_v3_private = m1_im4_private.f1;
-    var m1_im4_private_v4_private = m1_im4_private.f1();
-
-    // Parse error to export module
-    export import m1_im1_public = m2_M1_public;
-    export import m1_im2_public = m2_M2_private;
-    export import m1_im3_public = require("m2_M3_public");
-    export import m1_im4_public = require("m2_M4_private");
-}
-
-export module glo_M1_public {
-    export class c1 {
-    }
-    export function f1() {
-        return new c1;
-    }
-    export var v1 = c1;
-    export var v2: c1;
-}
-
-export declare module "glo_M2_public" {
-    export function f1();
-    export class c1 {
-    }
-    export var v1: { new (): c1; };
-    export var v2: c1;
-}
-
-export module glo_M3_private {
-    export class c1 {
-    }
-    export function f1() {
-        return new c1;
-    }
-    export var v1 = c1;
-    export var v2: c1;
-}
-
-export declare module "glo_M4_private" {
-    export function f1();
-    export class c1 {
-    }
-    export var v1: { new (): c1; };
-    export var v2: c1;
-}
-
-
-import glo_im1_private = glo_M1_public;
-export var glo_im1_private_v1_public = glo_im1_private.c1;
-export var glo_im1_private_v2_public = new glo_im1_private.c1();
-export var glo_im1_private_v3_public = glo_im1_private.f1;
-export var glo_im1_private_v4_public = glo_im1_private.f1();
-var glo_im1_private_v1_private = glo_im1_private.c1;
-var glo_im1_private_v2_private = new glo_im1_private.c1();
-var glo_im1_private_v3_private = glo_im1_private.f1;
-var glo_im1_private_v4_private = glo_im1_private.f1();
-
-
-import glo_im2_private = require("glo_M2_public");
-export var glo_im2_private_v1_public = glo_im2_private.c1;
-export var glo_im2_private_v2_public = new glo_im2_private.c1();
-export var glo_im2_private_v3_public = glo_im2_private.f1;
-export var glo_im2_private_v4_public = glo_im2_private.f1();
-var glo_im2_private_v1_private = glo_im2_private.c1;
-var glo_im2_private_v2_private = new glo_im2_private.c1();
-var glo_im2_private_v3_private = glo_im2_private.f1;
-var glo_im2_private_v4_private = glo_im2_private.f1();
-
-import glo_im3_private = glo_M3_private;
-export var glo_im3_private_v1_public = glo_im3_private.c1;
-export var glo_im3_private_v2_public = new glo_im3_private.c1();
-export var glo_im3_private_v3_public = glo_im3_private.f1;
-export var glo_im3_private_v4_public = glo_im3_private.f1();
-var glo_im3_private_v1_private = glo_im3_private.c1;
-var glo_im3_private_v2_private = new glo_im3_private.c1();
-var glo_im3_private_v3_private = glo_im3_private.f1;
-var glo_im3_private_v4_private = glo_im3_private.f1();
-
-import glo_im4_private = require("glo_M4_private");
-export var glo_im4_private_v1_public = glo_im4_private.c1;
-export var glo_im4_private_v2_public = new glo_im4_private.c1();
-export var glo_im4_private_v3_public = glo_im4_private.f1;
-export var glo_im4_private_v4_public = glo_im4_private.f1();
-var glo_im4_private_v1_private = glo_im4_private.c1;
-var glo_im4_private_v2_private = new glo_im4_private.c1();
-var glo_im4_private_v3_private = glo_im4_private.f1;
-var glo_im4_private_v4_private = glo_im4_private.f1();
-
-// Parse error to export module
-export import glo_im1_public = glo_M1_public;
-export import glo_im2_public = glo_M3_private;
-export import glo_im3_public = require("glo_M2_public");
-export import glo_im4_public = require("glo_M4_private");
-
-
-export declare module "use_glo_M1_public" {
-    import use_glo_M1_public = glo_M1_public;
-    export var use_glo_M1_public_v1_public: { new (): use_glo_M1_public.c1; };
-    export var use_glo_M1_public_v2_public: use_glo_M1_public;
-    export var use_glo_M1_public_v3_public: () => use_glo_M1_public.c1;
-    var use_glo_M1_public_v1_private: { new (): use_glo_M1_public.c1; };
-    var use_glo_M1_public_v2_private: use_glo_M1_public;
-    var use_glo_M1_public_v3_private: () => use_glo_M1_public.c1;
-
-    import use_glo_M2_public = require("glo_M2_public");
-    export var use_glo_M2_public_v1_public: { new (): use_glo_M2_public.c1; };
-    export var use_glo_M2_public_v2_public: use_glo_M2_public;
-    export var use_glo_M2_public_v3_public: () => use_glo_M2_public.c1;
-    var use_glo_M2_public_v1_private: { new (): use_glo_M2_public.c1; };
-    var use_glo_M2_public_v2_private: use_glo_M2_public;
-    var use_glo_M2_public_v3_private: () => use_glo_M2_public.c1;
-
-    module m2 {
-        import errorImport = require("glo_M2_public");
-        import nonerrorImport = glo_M1_public;
-
-        module m5 {
-            import m5_errorImport = require("glo_M2_public");
-            import m5_nonerrorImport = glo_M1_public;
-        }
-    }
-}
-
-
-declare module "use_glo_M3_private" {
-    import use_glo_M3_private = glo_M3_private;
-    export var use_glo_M3_private_v1_public: { new (): use_glo_M3_private.c1; };
-    export var use_glo_M3_private_v2_public: use_glo_M3_private;
-    export var use_glo_M3_private_v3_public: () => use_glo_M3_private.c1;
-    var use_glo_M3_private_v1_private: { new (): use_glo_M3_private.c1; };
-    var use_glo_M3_private_v2_private: use_glo_M3_private;
-    var use_glo_M3_private_v3_private: () => use_glo_M3_private.c1;
-
-    import use_glo_M4_private = require("glo_M4_private");
-    export var use_glo_M4_private_v1_public: { new (): use_glo_M4_private.c1; };
-    export var use_glo_M4_private_v2_public: use_glo_M4_private;
-    export var use_glo_M4_private_v3_public: () => use_glo_M4_private.c1;
-    var use_glo_M4_private_v1_private: { new (): use_glo_M4_private.c1; };
-    var use_glo_M4_private_v2_private: use_glo_M4_private;
-    var use_glo_M4_private_v3_private: () => use_glo_M4_private.c1;
-
-    module m2 {
-        import errorImport = require("glo_M4_private");
-        import nonerrorImport = glo_M3_private;
-
-        module m5 {
-            import m5_errorImport = require("glo_M4_private");
-            import m5_nonerrorImport = glo_M3_private;
-        }
-    }
-}
-
-declare module "anotherParseError" {
-    module m2 {
-        declare module "abc" {
-        }
-    }
-
-    module m2 {
-        module "abc2" {
-        }
-    }
-    module "abc3" {
-    }
-}
-
-declare export module "anotherParseError2" {
-    module m2 {
-        declare module "abc" {
-        }
-    }
-
-    module m2 {
-        module "abc2" {
-        }
-    }
-    module "abc3" {
-    }
-}
-
-module m2 {
-    import m3 = require("use_glo_M1_public");
-    module m4 {
-        var a = 10;
-        import m2 = require("use_glo_M1_public");
-    }
-
-}
-
-export module m3 {
-    import m3 = require("use_glo_M1_public");
-    module m4 {
-        var a = 10;
-        import m2 = require("use_glo_M1_public");
-    }
-
-}
\ No newline at end of file
diff --git a/tests/cases/compiler/privacyInterfaceExtendsClauseDeclFile.ts b/tests/cases/compiler/privacyInterfaceExtendsClauseDeclFile.ts
deleted file mode 100644
index d1c73724bb9..00000000000
--- a/tests/cases/compiler/privacyInterfaceExtendsClauseDeclFile.ts
+++ /dev/null
@@ -1,94 +0,0 @@
-// @module: commonjs
-// @declaration: true
-
-// @Filename: privacyInterfaceExtendsClauseDeclFile_externalModule.ts
-export module publicModule {
-    export interface publicInterfaceInPublicModule {
-    }
-
-    interface privateInterfaceInPublicModule {
-    }
-
-    interface privateInterfaceImplementingPublicInterfaceInModule extends publicInterfaceInPublicModule {
-    }
-    interface privateInterfaceImplementingPrivateInterfaceInModule extends privateInterfaceInPublicModule {
-    }
-    export interface publicInterfaceImplementingPublicInterfaceInModule extends publicInterfaceInPublicModule {
-    }
-    export interface publicInterfaceImplementingPrivateInterfaceInModule extends privateInterfaceInPublicModule { // Should error
-    }
-
-    interface privateInterfaceImplementingFromPrivateModuleInterface extends privateModule.publicInterfaceInPrivateModule {
-    }
-    export interface publicInterfaceImplementingFromPrivateModuleInterface extends privateModule.publicInterfaceInPrivateModule { // Should error
-    }
-
-    export interface publicInterfaceImplementingPrivateAndPublicInterface extends privateInterfaceInPublicModule, publicInterfaceInPublicModule { // Should error
-    }
-}
-
-module privateModule {
-    export interface publicInterfaceInPrivateModule {
-
-    }
-
-    interface privateInterfaceInPrivateModule {
-    }
-
-    interface privateInterfaceImplementingPublicInterfaceInModule extends publicInterfaceInPrivateModule {
-    }
-    interface privateInterfaceImplementingPrivateInterfaceInModule extends privateInterfaceInPrivateModule {
-    }
-    export interface publicInterfaceImplementingPublicInterfaceInModule extends publicInterfaceInPrivateModule {
-    }
-    export interface publicInterfaceImplementingPrivateInterfaceInModule extends privateInterfaceInPrivateModule {
-    }
-
-    interface privateInterfaceImplementingFromPrivateModuleInterface extends privateModule.publicInterfaceInPrivateModule {
-    }
-    export interface publicInterfaceImplementingFromPrivateModuleInterface extends privateModule.publicInterfaceInPrivateModule {
-    }
-}
-
-export interface publicInterface {
-
-}
-
-interface privateInterface {
-}
-
-interface privateInterfaceImplementingPublicInterface extends publicInterface {
-}
-interface privateInterfaceImplementingPrivateInterfaceInModule extends privateInterface {
-}
-export interface publicInterfaceImplementingPublicInterface extends publicInterface {
-}
-export interface publicInterfaceImplementingPrivateInterface extends privateInterface { // Should error
-}
-
-interface privateInterfaceImplementingFromPrivateModuleInterface extends privateModule.publicInterfaceInPrivateModule {
-}
-export interface publicInterfaceImplementingFromPrivateModuleInterface extends privateModule.publicInterfaceInPrivateModule { // Should error
-}
-
-// @Filename: privacyInterfaceExtendsClauseDeclFile_GlobalFile.ts
-module publicModuleInGlobal {
-    export interface publicInterfaceInPublicModule {
-    }
-
-    interface privateInterfaceInPublicModule {
-    }
-
-    interface privateInterfaceImplementingPublicInterfaceInModule extends publicInterfaceInPublicModule {
-    }
-    interface privateInterfaceImplementingPrivateInterfaceInModule extends privateInterfaceInPublicModule {
-    }
-    export interface publicInterfaceImplementingPublicInterfaceInModule extends publicInterfaceInPublicModule {
-    }
-    export interface publicInterfaceImplementingPrivateInterfaceInModule extends privateInterfaceInPublicModule { // Should error
-    }
-}
-interface publicInterfaceInGlobal {
-}
-interface publicInterfaceImplementingPublicInterfaceInGlobal extends publicInterfaceInGlobal {
-}
diff --git a/tests/cases/compiler/privacyLocalInternalReferenceImportWithExport.ts b/tests/cases/compiler/privacyLocalInternalReferenceImportWithExport.ts
index 89bd95e6a64..9219f1ae6a9 100644
--- a/tests/cases/compiler/privacyLocalInternalReferenceImportWithExport.ts
+++ b/tests/cases/compiler/privacyLocalInternalReferenceImportWithExport.ts
@@ -1,5 +1,4 @@
 //@module: commonjs
-//@declaration: true
 // private elements
 module m_private {
     export class c_private {
diff --git a/tests/cases/compiler/privacyLocalInternalReferenceImportWithoutExport.ts b/tests/cases/compiler/privacyLocalInternalReferenceImportWithoutExport.ts
index 454212f2e31..fd7cecc01bf 100644
--- a/tests/cases/compiler/privacyLocalInternalReferenceImportWithoutExport.ts
+++ b/tests/cases/compiler/privacyLocalInternalReferenceImportWithoutExport.ts
@@ -1,5 +1,4 @@
 //@module: amd
-//@declaration: true
 // private elements
 module m_private {
     export class c_private {
diff --git a/tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithExport.ts b/tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithExport.ts
index 16c6e19fb59..aa98a1a969b 100644
--- a/tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithExport.ts
+++ b/tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithExport.ts
@@ -1,5 +1,4 @@
 //@module: commonjs
-//@declaration: true
 // @Filename: privacyTopLevelAmbientExternalModuleImportWithExport_require.ts
 // Public elements
 export class c_public {
@@ -29,8 +28,6 @@ declare module 'm2' {
 }
 
 // @Filename: privacyTopLevelAmbientExternalModuleImportWithExport_core.ts
-///<reference path='privacyTopLevelAmbientExternalModuleImportWithExport_require2.ts'/>
-///<reference path='privacyTopLevelAmbientExternalModuleImportWithExport_require3.ts'/>
 // Privacy errors - importing private elements
 export import im_public_mi_private = require("privacyTopLevelAmbientExternalModuleImportWithExport_require");
 export import im_public_mu_private = require("privacyTopLevelAmbientExternalModuleImportWithExport_require1");
@@ -38,11 +35,11 @@ export import im_public_mi_public = require("m");
 export import im_public_mu_public = require("m2");
 
 // Usage of privacy error imports
-var privateUse_im_public_mi_private = new im_public_mi_private.c_public();
-export var publicUse_im_public_mi_private = new im_public_mi_private.c_public();
-var privateUse_im_public_mu_private = new im_public_mu_private.c_public();
-export var publicUse_im_public_mu_private = new im_public_mu_private.c_public();
-var privateUse_im_public_mi_public = new im_public_mi_public.c_private();
-export var publicUse_im_public_mi_public = new im_public_mi_public.c_private();
-var privateUse_im_public_mi_public = new im_public_mi_public.c_private();
-export var publicUse_im_public_mi_public = new im_public_mi_public.c_private();
+var privateUse_im_public_mi_private = new im_public_mi_private.c_private();
+export var publicUse_im_public_mi_private = new im_public_mi_private.c_private();
+var privateUse_im_public_mu_private = new im_public_mu_private.c_private();
+export var publicUse_im_public_mu_private = new im_public_mu_private.c_private();
+var privateUse_im_public_mi_public = new im_public_mi_public.c_public();
+export var publicUse_im_public_mi_public = new im_public_mi_public.c_public();
+var privateUse_im_public_mi_public = new im_public_mi_public.c_public();
+export var publicUse_im_public_mi_public = new im_public_mi_public.c_public();
diff --git a/tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithoutExport.ts b/tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithoutExport.ts
index f663871cbdb..b2d3910a959 100644
--- a/tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithoutExport.ts
+++ b/tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithoutExport.ts
@@ -1,5 +1,4 @@
 //@module: amd
-//@declaration: true
 
 // @Filename: privacyTopLevelAmbientExternalModuleImportWithoutExport_require.ts
 // Public elements
@@ -29,8 +28,6 @@ declare module 'm2' {
 }
 
 // @Filename: privacyTopLevelAmbientExternalModuleImportWithoutExport_core.ts
-///<reference path='privacyTopLevelAmbientExternalModuleImportWithoutExport_require2.ts'/>
-///<reference path='privacyTopLevelAmbientExternalModuleImportWithoutExport_require3.ts'/>
 // Privacy errors - importing private elements
 import im_private_mi_private = require("m");
 import im_private_mu_private = require("m2");
diff --git a/tests/cases/compiler/privacyTopLevelInternalReferenceImportWithExport.ts b/tests/cases/compiler/privacyTopLevelInternalReferenceImportWithExport.ts
index 987c35c7325..ada020f4da6 100644
--- a/tests/cases/compiler/privacyTopLevelInternalReferenceImportWithExport.ts
+++ b/tests/cases/compiler/privacyTopLevelInternalReferenceImportWithExport.ts
@@ -1,5 +1,4 @@
 //@module: amd
-//@declaration: true
 // private elements
 module m_private {
     export class c_private {
diff --git a/tests/cases/compiler/privacyTopLevelInternalReferenceImportWithoutExport.ts b/tests/cases/compiler/privacyTopLevelInternalReferenceImportWithoutExport.ts
index 8f241c5ab01..d703e1ea0d6 100644
--- a/tests/cases/compiler/privacyTopLevelInternalReferenceImportWithoutExport.ts
+++ b/tests/cases/compiler/privacyTopLevelInternalReferenceImportWithoutExport.ts
@@ -1,6 +1,4 @@
 //@module: amd
-//@declaration: true
-
 // private elements
 module m_private {
     export class c_private {
diff --git a/tests/cases/compiler/privacyTypeParameterOfFunction.ts b/tests/cases/compiler/privacyTypeParameterOfFunction.ts
index dfbecc24bf3..2b22b5321bb 100644
--- a/tests/cases/compiler/privacyTypeParameterOfFunction.ts
+++ b/tests/cases/compiler/privacyTypeParameterOfFunction.ts
@@ -1,4 +1,3 @@
-// @module: commonjs
 class privateClass {
 }
 
diff --git a/tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts b/tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts
deleted file mode 100644
index 7ea908e9cfb..00000000000
--- a/tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts
+++ /dev/null
@@ -1,440 +0,0 @@
-// @module: commonjs
-// @declaration: true
-class privateClass {
-}
-
-export class publicClass {
-}
-
-export interface publicInterfaceWithPrivateTypeParameters {
-    new <T extends privateClass>(): privateClass;  // Error
-    <T extends privateClass>(): privateClass;  // Error
-    myMethod<T extends privateClass>(): privateClass;  // Error
-}
-
-export interface publicInterfaceWithPublicTypeParameters {
-    new <T extends publicClass>(): publicClass;
-    <T extends publicClass>(): publicClass;
-    myMethod<T extends publicClass>(): publicClass;
-}
-
-interface privateInterfaceWithPrivateTypeParameters {
-    new <T extends privateClass>(): privateClass;
-    <T extends privateClass>(): privateClass;
-    myMethod<T extends privateClass>(): privateClass;
-}
-
-interface privateInterfaceWithPublicTypeParameters {
-    new <T extends publicClass>(): publicClass;
-    <T extends publicClass>(): publicClass;
-    myMethod<T extends publicClass>(): publicClass;
-}
-
-export class publicClassWithWithPrivateTypeParameters {
-    static myPublicStaticMethod<T extends privateClass>() {  // Error
-    }
-    private static myPrivateStaticMethod<T extends privateClass>() {
-    }
-    myPublicMethod<T extends privateClass>() {  // Error
-    }
-    private myPrivateMethod<T extends privateClass>() {
-    }
-}
-
-export class publicClassWithWithPublicTypeParameters {
-    static myPublicStaticMethod<T extends publicClass>() {
-    }
-    private static myPrivateStaticMethod<T extends publicClass>() { 
-    }
-    myPublicMethod<T extends publicClass>() {
-    }
-    private myPrivateMethod<T extends publicClass>() {
-    }
-}
-
-class privateClassWithWithPrivateTypeParameters {
-    static myPublicStaticMethod<T extends privateClass>() {
-    }
-    private static myPrivateStaticMethod<T extends privateClass>() {
-    }
-    myPublicMethod<T extends privateClass>() {
-    }
-    private myPrivateMethod<T extends privateClass>() {
-    }
-}
-
-class privateClassWithWithPublicTypeParameters {
-    static myPublicStaticMethod<T extends publicClass>() {
-    }
-    private static myPrivateStaticMethod<T extends publicClass>() {
-    }
-    myPublicMethod<T extends publicClass>() {
-    }
-    private myPrivateMethod<T extends publicClass>() {
-    }
-}
-
-export function publicFunctionWithPrivateTypeParameters<T extends privateClass>() {  // Error
-}
-
-export function publicFunctionWithPublicTypeParameters<T extends publicClass>() {
-}
-
-function privateFunctionWithPrivateTypeParameters<T extends privateClass>() {
-}
-
-function privateFunctionWithPublicTypeParameters<T extends publicClass>() {
-}
-
-export interface publicInterfaceWithPublicTypeParametersWithoutExtends {
-    new <T>(): publicClass;
-    <T>(): publicClass;
-    myMethod<T>(): publicClass;
-}
-
-interface privateInterfaceWithPublicTypeParametersWithoutExtends {
-    new <T>(): publicClass;
-    <T>(): publicClass;
-    myMethod<T>(): publicClass;
-}
-
-export class publicClassWithWithPublicTypeParametersWithoutExtends {
-    static myPublicStaticMethod<T>() {
-    }
-    private static myPrivateStaticMethod<T>() {
-    }
-    myPublicMethod<T>() {
-    }
-    private myPrivateMethod<T>() {
-    }
-}
-class privateClassWithWithPublicTypeParametersWithoutExtends {
-    static myPublicStaticMethod<T>() {
-    }
-    private static myPrivateStaticMethod<T>() {
-    }
-    myPublicMethod<T>() {
-    }
-    private myPrivateMethod<T>() {
-    }
-}
-
-export function publicFunctionWithPublicTypeParametersWithoutExtends<T>() {
-}
-
-function privateFunctionWithPublicTypeParametersWithoutExtends<T>() {
-}
-
-export interface publicInterfaceWithPrivatModuleTypeParameters {
-    new <T extends privateModule.publicClass>(): privateModule.publicClass;  // Error
-    <T extends privateModule.publicClass>(): privateModule.publicClass;  // Error
-    myMethod<T extends privateModule.publicClass>(): privateModule.publicClass;  // Error
-}
-export class publicClassWithWithPrivateModuleTypeParameters {
-    static myPublicStaticMethod<T extends privateModule.publicClass>() {  // Error
-    }
-    myPublicMethod<T extends privateModule.publicClass>() {  // Error
-    }
-}
-export function publicFunctionWithPrivateMopduleTypeParameters<T extends privateModule.publicClass>() {  // Error
-}
-
-
-interface privateInterfaceWithPrivatModuleTypeParameters {
-    new <T extends privateModule.publicClass>(): privateModule.publicClass;
-    <T extends privateModule.publicClass>(): privateModule.publicClass;
-    myMethod<T extends privateModule.publicClass>(): privateModule.publicClass;
-}
-class privateClassWithWithPrivateModuleTypeParameters {
-    static myPublicStaticMethod<T extends privateModule.publicClass>() {
-    }
-    myPublicMethod<T extends privateModule.publicClass>() {
-    }
-}
-function privateFunctionWithPrivateMopduleTypeParameters<T extends privateModule.publicClass>() {
-}
-
-
-export module publicModule {
-    class privateClass {
-    }
-
-    export class publicClass {
-    }
-
-    export interface publicInterfaceWithPrivateTypeParameters {
-        new <T extends privateClass>(): privateClass;  // Error
-        <T extends privateClass>(): privateClass;  // Error
-        myMethod<T extends privateClass>(): privateClass;  // Error
-    }
-
-    export interface publicInterfaceWithPublicTypeParameters {
-        new <T extends publicClass>(): publicClass;
-        <T extends publicClass>(): publicClass;
-        myMethod<T extends publicClass>(): publicClass;
-    }
-
-    interface privateInterfaceWithPrivateTypeParameters {
-        new <T extends privateClass>(): privateClass;
-        <T extends privateClass>(): privateClass;
-        myMethod<T extends privateClass>(): privateClass;
-    }
-
-    interface privateInterfaceWithPublicTypeParameters {
-        new <T extends publicClass>(): publicClass;
-        <T extends publicClass>(): publicClass;
-        myMethod<T extends publicClass>(): publicClass;
-    }
-
-    export class publicClassWithWithPrivateTypeParameters {
-        static myPublicStaticMethod<T extends privateClass>() {  // Error
-        }
-        private static myPrivateStaticMethod<T extends privateClass>() {
-        }
-        myPublicMethod<T extends privateClass>() {  // Error
-        }
-        private myPrivateMethod<T extends privateClass>() {
-        }
-    }
-
-    export class publicClassWithWithPublicTypeParameters {
-        static myPublicStaticMethod<T extends publicClass>() {
-        }
-        private static myPrivateStaticMethod<T extends publicClass>() {
-        }
-        myPublicMethod<T extends publicClass>() {
-        }
-        private myPrivateMethod<T extends publicClass>() {
-        }
-    }
-
-    class privateClassWithWithPrivateTypeParameters {
-        static myPublicStaticMethod<T extends privateClass>() {
-        }
-        private static myPrivateStaticMethod<T extends privateClass>() {
-        }
-        myPublicMethod<T extends privateClass>() {
-        }
-        private myPrivateMethod<T extends privateClass>() {
-        }
-    }
-
-    class privateClassWithWithPublicTypeParameters {
-        static myPublicStaticMethod<T extends publicClass>() {
-        }
-        private static myPrivateStaticMethod<T extends publicClass>() {
-        }
-        myPublicMethod<T extends publicClass>() {
-        }
-        private myPrivateMethod<T extends publicClass>() {
-        }
-    }
-
-    export function publicFunctionWithPrivateTypeParameters<T extends privateClass>() {  // Error
-    }
-
-    export function publicFunctionWithPublicTypeParameters<T extends publicClass>() {
-    }
-
-    function privateFunctionWithPrivateTypeParameters<T extends privateClass>() {
-    }
-
-    function privateFunctionWithPublicTypeParameters<T extends publicClass>() {
-    }
-
-    export interface publicInterfaceWithPublicTypeParametersWithoutExtends {
-        new <T>(): publicClass;
-        <T>(): publicClass;
-        myMethod<T>(): publicClass;
-    }
-
-    interface privateInterfaceWithPublicTypeParametersWithoutExtends {
-        new <T>(): publicClass;
-        <T>(): publicClass;
-        myMethod<T>(): publicClass;
-    }
-
-    export class publicClassWithWithPublicTypeParametersWithoutExtends {
-        static myPublicStaticMethod<T>() {
-        }
-        private static myPrivateStaticMethod<T>() {
-        }
-        myPublicMethod<T>() {
-        }
-        private myPrivateMethod<T>() {
-        }
-    }
-    class privateClassWithWithPublicTypeParametersWithoutExtends {
-        static myPublicStaticMethod<T>() {
-        }
-        private static myPrivateStaticMethod<T>() {
-        }
-        myPublicMethod<T>() {
-        }
-        private myPrivateMethod<T>() {
-        }
-    }
-
-    export function publicFunctionWithPublicTypeParametersWithoutExtends<T>() {
-    }
-
-    function privateFunctionWithPublicTypeParametersWithoutExtends<T>() {
-    }
-
-    export interface publicInterfaceWithPrivatModuleTypeParameters {
-        new <T extends privateModule.publicClass>(): privateModule.publicClass;  // Error
-        <T extends privateModule.publicClass>(): privateModule.publicClass;  // Error
-        myMethod<T extends privateModule.publicClass>(): privateModule.publicClass;  // Error
-    }
-    export class publicClassWithWithPrivateModuleTypeParameters {
-        static myPublicStaticMethod<T extends privateModule.publicClass>() {  // Error
-        }
-        myPublicMethod<T extends privateModule.publicClass>() {  // Error
-        }
-    }
-    export function publicFunctionWithPrivateMopduleTypeParameters<T extends privateModule.publicClass>() {  // Error
-    }
-
-
-    interface privateInterfaceWithPrivatModuleTypeParameters {
-        new <T extends privateModule.publicClass>(): privateModule.publicClass;  
-        <T extends privateModule.publicClass>(): privateModule.publicClass;  
-        myMethod<T extends privateModule.publicClass>(): privateModule.publicClass;  
-    }
-    class privateClassWithWithPrivateModuleTypeParameters {
-        static myPublicStaticMethod<T extends privateModule.publicClass>() {  
-        }
-        myPublicMethod<T extends privateModule.publicClass>() { 
-        }
-    }
-    function privateFunctionWithPrivateMopduleTypeParameters<T extends privateModule.publicClass>() { 
-    }
-
-}
-
-module privateModule {
-    class privateClass {
-    }
-
-    export class publicClass {
-    }
-
-    export interface publicInterfaceWithPrivateTypeParameters {
-        new <T extends privateClass>(): privateClass; 
-        <T extends privateClass>(): privateClass;
-        myMethod<T extends privateClass>(): privateClass; 
-    }
-
-    export interface publicInterfaceWithPublicTypeParameters {
-        new <T extends publicClass>(): publicClass;
-        <T extends publicClass>(): publicClass;
-        myMethod<T extends publicClass>(): publicClass;
-    }
-
-    interface privateInterfaceWithPrivateTypeParameters {
-        new <T extends privateClass>(): privateClass;
-        <T extends privateClass>(): privateClass;
-        myMethod<T extends privateClass>(): privateClass;
-    }
-
-    interface privateInterfaceWithPublicTypeParameters {
-        new <T extends publicClass>(): publicClass;
-        <T extends publicClass>(): publicClass;
-        myMethod<T extends publicClass>(): publicClass;
-    }
-
-    export class publicClassWithWithPrivateTypeParameters {
-        static myPublicStaticMethod<T extends privateClass>() { 
-        }
-        private static myPrivateStaticMethod<T extends privateClass>() {
-        }
-        myPublicMethod<T extends privateClass>() {  
-        }
-        private myPrivateMethod<T extends privateClass>() {
-        }
-    }
-
-    export class publicClassWithWithPublicTypeParameters {
-        static myPublicStaticMethod<T extends publicClass>() {
-        }
-        private static myPrivateStaticMethod<T extends publicClass>() {
-        }
-        myPublicMethod<T extends publicClass>() {
-        }
-        private myPrivateMethod<T extends publicClass>() {
-        }
-    }
-
-    class privateClassWithWithPrivateTypeParameters {
-        static myPublicStaticMethod<T extends privateClass>() {
-        }
-        private static myPrivateStaticMethod<T extends privateClass>() {
-        }
-        myPublicMethod<T extends privateClass>() {
-        }
-        private myPrivateMethod<T extends privateClass>() {
-        }
-    }
-
-    class privateClassWithWithPublicTypeParameters {
-        static myPublicStaticMethod<T extends publicClass>() {
-        }
-        private static myPrivateStaticMethod<T extends publicClass>() {
-        }
-        myPublicMethod<T extends publicClass>() {
-        }
-        private myPrivateMethod<T extends publicClass>() {
-        }
-    }
-
-    export function publicFunctionWithPrivateTypeParameters<T extends privateClass>() { 
-    }
-
-    export function publicFunctionWithPublicTypeParameters<T extends publicClass>() {
-    }
-
-    function privateFunctionWithPrivateTypeParameters<T extends privateClass>() {
-    }
-
-    function privateFunctionWithPublicTypeParameters<T extends publicClass>() {
-    }
-
-    export interface publicInterfaceWithPublicTypeParametersWithoutExtends {
-        new <T>(): publicClass;
-        <T>(): publicClass;
-        myMethod<T>(): publicClass;
-    }
-
-    interface privateInterfaceWithPublicTypeParametersWithoutExtends {
-        new <T>(): publicClass;
-        <T>(): publicClass;
-        myMethod<T>(): publicClass;
-    }
-
-    export class publicClassWithWithPublicTypeParametersWithoutExtends {
-        static myPublicStaticMethod<T>() {
-        }
-        private static myPrivateStaticMethod<T>() {
-        }
-        myPublicMethod<T>() {
-        }
-        private myPrivateMethod<T>() {
-        }
-    }
-    class privateClassWithWithPublicTypeParametersWithoutExtends {
-        static myPublicStaticMethod<T>() {
-        }
-        private static myPrivateStaticMethod<T>() {
-        }
-        myPublicMethod<T>() {
-        }
-        private myPrivateMethod<T>() {
-        }
-    }
-
-    export function publicFunctionWithPublicTypeParametersWithoutExtends<T>() {
-    }
-
-    function privateFunctionWithPublicTypeParametersWithoutExtends<T>() {
-    }
-}
\ No newline at end of file
diff --git a/tests/cases/compiler/privacyTypeParametersOfClass.ts b/tests/cases/compiler/privacyTypeParametersOfClass.ts
index e7b520e58ca..59f771ef718 100644
--- a/tests/cases/compiler/privacyTypeParametersOfClass.ts
+++ b/tests/cases/compiler/privacyTypeParametersOfClass.ts
@@ -1,4 +1,3 @@
-// @module: commonjs
 class privateClass {
 }
 
diff --git a/tests/cases/compiler/privacyTypeParametersOfClassDeclFile.ts b/tests/cases/compiler/privacyTypeParametersOfClassDeclFile.ts
deleted file mode 100644
index dcc21ca362a..00000000000
--- a/tests/cases/compiler/privacyTypeParametersOfClassDeclFile.ts
+++ /dev/null
@@ -1,155 +0,0 @@
-// @module: commonjs
-// @declaration: true
-class privateClass {
-}
-
-export class publicClass {
-}
-
-export class publicClassWithPrivateTypeParameters<T extends privateClass> { // Error
-    myMethod(val: T): T {
-        return val;
-    }
-}
-
-export class publicClassWithPublicTypeParameters<T extends publicClass> {
-    myMethod(val: T): T {
-        return val;
-    }
-}
-
-class privateClassWithPrivateTypeParameters<T extends privateClass> {
-    myMethod(val: T): T {
-        return val;
-    }
-}
-
-class privateClassWithPublicTypeParameters<T extends publicClass> {
-    myMethod(val: T): T { 
-        return val;
-    }
-}
-
-export class publicClassWithPublicTypeParametersWithoutExtends<T> {
-    myMethod(val: T): T { 
-        return val;
-    }
-}
-
-class privateClassWithPublicTypeParametersWithoutExtends<T> {
-    myMethod(val: T): T { 
-        return val;
-    }
-}
-
-export class publicClassWithTypeParametersFromPrivateModule<T extends privateModule.publicClassInPrivateModule> { // Error
-    myMethod(val: T): T {
-        return val;
-    }
-}
-
-class privateClassWithTypeParametersFromPrivateModule<T extends privateModule.publicClassInPrivateModule> {
-    myMethod(val: T): T {
-        return val;
-    }
-}
-
-export module publicModule {
-    class privateClassInPublicModule {
-    }
-
-    export class publicClassInPublicModule {
-    }
-
-    export class publicClassWithPrivateTypeParameters<T extends privateClassInPublicModule> { // Error
-        myMethod(val: T): T {
-            return val;
-        }
-    }
-
-    export class publicClassWithPublicTypeParameters<T extends publicClassInPublicModule> {
-        myMethod(val: T): T {
-            return val;
-        }
-    }
-
-    class privateClassWithPrivateTypeParameters<T extends privateClassInPublicModule> {
-        myMethod(val: T): T {
-            return val;
-        }
-    }
-
-    class privateClassWithPublicTypeParameters<T extends publicClassInPublicModule> {
-        myMethod(val: T): T {
-            return val;
-        }
-    }
-
-    export class publicClassWithPublicTypeParametersWithoutExtends<T> {
-        myMethod(val: T): T {
-            return val;
-        }
-    }
-
-    class privateClassWithPublicTypeParametersWithoutExtends<T> {
-        myMethod(val: T): T {
-            return val;
-        }
-    }
-
-    export class publicClassWithTypeParametersFromPrivateModule<T extends privateModule.publicClassInPrivateModule> { // Error
-        myMethod(val: T): T {
-            return val;
-        }
-    }
-
-    class privateClassWithTypeParametersFromPrivateModule<T extends privateModule.publicClassInPrivateModule> {
-        myMethod(val: T): T {
-            return val;
-        }
-    }
-}
-
-module privateModule {
-    class privateClassInPrivateModule {
-    }
-
-    export class publicClassInPrivateModule {
-    }
-
-    export class publicClassWithPrivateTypeParameters<T extends privateClassInPrivateModule> {
-        myMethod(val: T): T {
-            return val;
-        }
-    }
-
-    export class publicClassWithPublicTypeParameters<T extends publicClassInPrivateModule> {
-        myMethod(val: T): T {
-            return val;
-        }
-    }
-
-    class privateClassWithPrivateTypeParameters<T extends privateClassInPrivateModule> {
-        myMethod(val: T): T {
-            return val;
-        }
-    }
-
-    class privateClassWithPublicTypeParameters<T extends publicClassInPrivateModule> {
-        myMethod(val: T): T {
-            return val;
-        }
-    }
-
-    export class publicClassWithPublicTypeParametersWithoutExtends<T> {
-        myMethod(val: T): T {
-            return val;
-        }
-    }
-
-    class privateClassWithPublicTypeParametersWithoutExtends<T> {
-        myMethod(val: T): T {
-            return val;
-        }
-    }
-}
diff --git a/tests/cases/compiler/privacyTypeParametersOfInterface.ts b/tests/cases/compiler/privacyTypeParametersOfInterface.ts
index c61174a37c0..fedb16be766 100644
--- a/tests/cases/compiler/privacyTypeParametersOfInterface.ts
+++ b/tests/cases/compiler/privacyTypeParametersOfInterface.ts
@@ -1,4 +1,3 @@
-// @module: commonjs
 class privateClass {
 }
 
diff --git a/tests/cases/compiler/privacyTypeParametersOfInterfaceDeclFile.ts b/tests/cases/compiler/privacyTypeParametersOfInterfaceDeclFile.ts
deleted file mode 100644
index 55984b46ccb..00000000000
--- a/tests/cases/compiler/privacyTypeParametersOfInterfaceDeclFile.ts
+++ /dev/null
@@ -1,192 +0,0 @@
-// @module: commonjs
-// @declaration: true
-class privateClass {
-}
-
-export class publicClass {
-}
-
-class privateClassT<T> {
-}
-
-export class publicClassT<T> {
-}
-
-export interface publicInterfaceWithPrivateTypeParameters<T extends privateClass> { // Error
-    myMethod(val: T): T;
-    myMethod0(): publicClassT<T>;
-    myMethod1(): privateClassT<privateClass>; 
-    myMethod2(): privateClassT<publicClass>;
-    myMethod3(): publicClassT<privateClass>;
-    myMethod4(): publicClassT<publicClass>; 
-}
-
-export interface publicInterfaceWithPublicTypeParameters<T extends publicClass> {
-    myMethod(val: T): T;
-    myMethod0(): publicClassT<T>
-    myMethod1(): privateClassT<privateClass>;
-    myMethod2(): privateClassT<publicClass>;
-    myMethod3(): publicClassT<privateClass>;
-    myMethod4(): publicClassT<publicClass>;
-}
-
-interface privateInterfaceWithPrivateTypeParameters<T extends privateClass> {
-    myMethod(val: T): T;
-    myMethod0(): publicClassT<T>;
-    myMethod1(): privateClassT<privateClass>;
-    myMethod2(): privateClassT<publicClass>;
-    myMethod3(): publicClassT<privateClass>;
-    myMethod4(): publicClassT<publicClass>;
-}
-
-interface privateInterfaceWithPublicTypeParameters<T extends publicClass> {
-    myMethod(val: T): T;
-    myMethod0(): publicClassT<T>;
-    myMethod1(): privateClassT<privateClass>;
-    myMethod2(): privateClassT<publicClass>;
-    myMethod3(): publicClassT<privateClass>;
-    myMethod4(): publicClassT<publicClass>;
-}
-
-export interface publicInterfaceWithPublicTypeParametersWithoutExtends<T> {
-    myMethod(val: T): T;
-    myMethod0(): publicClassT<T>;
-}
-
-interface privateInterfaceWithPublicTypeParametersWithoutExtends<T> {
-    myMethod(val: T): T;
-    myMethod0(): publicClassT<T>;
-}
-
-
-export interface publicInterfaceWithPrivateModuleTypeParameterConstraints<T extends privateModule.publicClassInPrivateModule> { // Error
-}
-
-interface privateInterfaceWithPrivateModuleTypeParameterConstraints<T extends privateModule.publicClassInPrivateModule> { // Error
-}
-
-export module publicModule {
-    class privateClassInPublicModule {
-    }
-
-    export class publicClassInPublicModule {
-    }
-
-    class privateClassInPublicModuleT<T> {
-    }
-
-    export class publicClassInPublicModuleT<T> {
-    }
-
-    export interface publicInterfaceWithPrivateTypeParameters<T extends privateClassInPublicModule> { // Error
-        myMethod(val: T): T;
-        myMethod0(): publicClassInPublicModuleT<T>;
-        myMethod1(): privateClassInPublicModuleT<privateClassInPublicModule>;
-        myMethod2(): privateClassInPublicModuleT<publicClassInPublicModule>;
-        myMethod3(): publicClassInPublicModuleT<privateClassInPublicModule>;
-        myMethod4(): publicClassInPublicModuleT<publicClassInPublicModule>;
-    }
-
-    export interface publicInterfaceWithPublicTypeParameters<T extends publicClassInPublicModule> {
-        myMethod(val: T): T;
-        myMethod0(): publicClassInPublicModuleT<T>
-        myMethod1(): privateClassInPublicModuleT<privateClassInPublicModule>;
-        myMethod2(): privateClassInPublicModuleT<publicClassInPublicModule>;
-        myMethod3(): publicClassInPublicModuleT<privateClassInPublicModule>;
-        myMethod4(): publicClassInPublicModuleT<publicClassInPublicModule>;
-    }
-
-    interface privateInterfaceWithPrivateTypeParameters<T extends privateClassInPublicModule> {
-        myMethod(val: T): T;
-        myMethod0(): publicClassInPublicModuleT<T>;
-        myMethod1(): privateClassInPublicModuleT<privateClassInPublicModule>;
-        myMethod2(): privateClassInPublicModuleT<publicClassInPublicModule>;
-        myMethod3(): publicClassInPublicModuleT<privateClassInPublicModule>;
-        myMethod4(): publicClassInPublicModuleT<publicClassInPublicModule>;
-    }
-
-    interface privateInterfaceWithPublicTypeParameters<T extends publicClassInPublicModule> {
-        myMethod(val: T): T;
-        myMethod0(): publicClassInPublicModuleT<T>;
-        myMethod1(): privateClassInPublicModuleT<privateClassInPublicModule>;
-        myMethod2(): privateClassInPublicModuleT<publicClassInPublicModule>;
-        myMethod3(): publicClassInPublicModuleT<privateClassInPublicModule>;
-        myMethod4(): publicClassInPublicModuleT<publicClassInPublicModule>;
-    }
-
-    export interface publicInterfaceWithPublicTypeParametersWithoutExtends<T> {
-        myMethod(val: T): T;
-        myMethod0(): publicClassInPublicModuleT<T>;
-    }
-
-    interface privateInterfaceWithPublicTypeParametersWithoutExtends<T> {
-        myMethod(val: T): T;
-        myMethod0(): publicClassInPublicModuleT<T>;
-    }
-
-    export interface publicInterfaceWithPrivateModuleTypeParameterConstraints<T extends privateModule.publicClassInPrivateModule> { // Error
-    }
-
-    interface privateInterfaceWithPrivateModuleTypeParameterConstraints<T extends privateModule.publicClassInPrivateModule> { // Error
-    }
-}
-
-module privateModule {
-    class privateClassInPrivateModule {
-    }
-
-    export class publicClassInPrivateModule {
-    }
-
-    class privateClassInPrivateModuleT<T> {
-    }
-
-    export class publicClassInPrivateModuleT<T> {
-    }
-
-    export interface publicInterfaceWithPrivateTypeParameters<T extends privateClassInPrivateModule> {
-        myMethod(val: T): T;
-        myMethod0(): publicClassInPrivateModuleT<T>;
-        myMethod1(): privateClassInPrivateModuleT<privateClassInPrivateModule>;
-        myMethod2(): privateClassInPrivateModuleT<publicClassInPrivateModule>;
-        myMethod3(): publicClassInPrivateModuleT<privateClassInPrivateModule>;
-        myMethod4(): publicClassInPrivateModuleT<publicClassInPrivateModule>;
-    }
-
-    export interface publicInterfaceWithPublicTypeParameters<T extends publicClassInPrivateModule> {
-        myMethod(val: T): T;
-        myMethod0(): publicClassInPrivateModuleT<T>
-        myMethod1(): privateClassInPrivateModuleT<privateClassInPrivateModule>;
-        myMethod2(): privateClassInPrivateModuleT<publicClassInPrivateModule>;
-        myMethod3(): publicClassInPrivateModuleT<privateClassInPrivateModule>;
-        myMethod4(): publicClassInPrivateModuleT<publicClassInPrivateModule>;
-    }
-
-    interface privateInterfaceWithPrivateTypeParameters<T extends privateClassInPrivateModule> {
-        myMethod(val: T): T;
-        myMethod0(): publicClassInPrivateModuleT<T>;
-        myMethod1(): privateClassInPrivateModuleT<privateClassInPrivateModule>;
-        myMethod2(): privateClassInPrivateModuleT<publicClassInPrivateModule>;
-        myMethod3(): publicClassInPrivateModuleT<privateClassInPrivateModule>;
-        myMethod4(): publicClassInPrivateModuleT<publicClassInPrivateModule>;
-    }
-
-    interface privateInterfaceWithPublicTypeParameters<T extends publicClassInPrivateModule> {
-        myMethod(val: T): T;
-        myMethod0(): publicClassInPrivateModuleT<T>;
-        myMethod1(): privateClassInPrivateModuleT<privateClassInPrivateModule>;
-        myMethod2(): privateClassInPrivateModuleT<publicClassInPrivateModule>;
-        myMethod3(): publicClassInPrivateModuleT<privateClassInPrivateModule>;
-        myMethod4(): publicClassInPrivateModuleT<publicClassInPrivateModule>;
-    }
-
-    export interface publicInterfaceWithPublicTypeParametersWithoutExtends<T> {
-        myMethod(val: T): T;
-        myMethod0(): publicClassInPrivateModuleT<T>;
-    }
-
-    interface privateInterfaceWithPublicTypeParametersWithoutExtends<T> {
-        myMethod(val: T): T;
-        myMethod0(): publicClassInPrivateModuleT<T>;
-    }
-}
\ No newline at end of file
diff --git a/tests/cases/compiler/privacyVarDeclFile.ts b/tests/cases/compiler/privacyVarDeclFile.ts
deleted file mode 100644
index 46012bc9d9f..00000000000
--- a/tests/cases/compiler/privacyVarDeclFile.ts
+++ /dev/null
@@ -1,426 +0,0 @@
-// @module: commonjs
-// @declaration: true
-
-// @Filename:privacyVarDeclFile_externalModule.ts
-class privateClass {
-}
-
-export class publicClass {
-}
-
-export interface publicInterfaceWithPrivatePropertyTypes {
-    myProperty: privateClass;  // Error
-}
-
-export interface publicInterfaceWithPublicPropertyTypes {
-    myProperty: publicClass;
-}
-
-interface privateInterfaceWithPrivatePropertyTypes {
-    myProperty: privateClass;
-}
-
-interface privateInterfaceWithPublicPropertyTypes {
-    myProperty: publicClass;
-}
-
-export class publicClassWithWithPrivatePropertyTypes {
-    static myPublicStaticProperty: privateClass; // Error
-    private static myPrivateStaticProperty: privateClass;
-    myPublicProperty: privateClass; // Error
-    private myPrivateProperty: privateClass;
-}
-
-export class publicClassWithWithPublicPropertyTypes {
-    static myPublicStaticProperty: publicClass;
-    private static myPrivateStaticProperty: publicClass;
-    myPublicProperty: publicClass;
-    private myPrivateProperty: publicClass;
-}
-
-class privateClassWithWithPrivatePropertyTypes {
-    static myPublicStaticProperty: privateClass;
-    private static myPrivateStaticProperty: privateClass;
-    myPublicProperty: privateClass;
-    private myPrivateProperty: privateClass;
-}
-
-class privateClassWithWithPublicPropertyTypes {
-    static myPublicStaticProperty: publicClass;
-    private static myPrivateStaticProperty: publicClass;
-    myPublicProperty: publicClass;
-    private myPrivateProperty: publicClass;
-}
-
-export var publicVarWithPrivatePropertyTypes: privateClass; // Error
-export var publicVarWithPublicPropertyTypes: publicClass;
-var privateVarWithPrivatePropertyTypes: privateClass;
-var privateVarWithPublicPropertyTypes: publicClass;
-
-export declare var publicAmbientVarWithPrivatePropertyTypes: privateClass; // Error
-export declare var publicAmbientVarWithPublicPropertyTypes: publicClass;
-declare var privateAmbientVarWithPrivatePropertyTypes: privateClass;
-declare var privateAmbientVarWithPublicPropertyTypes: publicClass;
-
-export interface publicInterfaceWithPrivateModulePropertyTypes {
-    myProperty: privateModule.publicClass; // Error
-}
-export class publicClassWithPrivateModulePropertyTypes {
-    static myPublicStaticProperty: privateModule.publicClass; // Error
-    myPublicProperty: privateModule.publicClass; // Error
-}
-export var publicVarWithPrivateModulePropertyTypes: privateModule.publicClass; // Error
-export declare var publicAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass; // Error
-
-interface privateInterfaceWithPrivateModulePropertyTypes {
-    myProperty: privateModule.publicClass;
-}
-class privateClassWithPrivateModulePropertyTypes {
-    static myPublicStaticProperty: privateModule.publicClass;
-    myPublicProperty: privateModule.publicClass;
-}
-var privateVarWithPrivateModulePropertyTypes: privateModule.publicClass;
-declare var privateAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass;
-
-export module publicModule {
-    class privateClass {
-    }
-
-    export class publicClass {
-    }
-
-    export interface publicInterfaceWithPrivatePropertyTypes {
-        myProperty: privateClass;  // Error
-    }
-
-    export interface publicInterfaceWithPublicPropertyTypes {
-        myProperty: publicClass;
-    }
-
-    interface privateInterfaceWithPrivatePropertyTypes {
-        myProperty: privateClass;
-    }
-
-    interface privateInterfaceWithPublicPropertyTypes {
-        myProperty: publicClass;
-    }
-
-    export class publicClassWithWithPrivatePropertyTypes {
-        static myPublicStaticProperty: privateClass; // Error
-        private static myPrivateStaticProperty: privateClass;
-        myPublicProperty: privateClass; // Error
-        private myPrivateProperty: privateClass;
-    }
-
-    export class publicClassWithWithPublicPropertyTypes {
-        static myPublicStaticProperty: publicClass;
-        private static myPrivateStaticProperty: publicClass;
-        myPublicProperty: publicClass;
-        private myPrivateProperty: publicClass;
-    }
-
-    class privateClassWithWithPrivatePropertyTypes {
-        static myPublicStaticProperty: privateClass;
-        private static myPrivateStaticProperty: privateClass;
-        myPublicProperty: privateClass;
-        private myPrivateProperty: privateClass;
-    }
-
-    class privateClassWithWithPublicPropertyTypes {
-        static myPublicStaticProperty: publicClass;
-        private static myPrivateStaticProperty: publicClass;
-        myPublicProperty: publicClass;
-        private myPrivateProperty: publicClass;
-    }
-
-    export var publicVarWithPrivatePropertyTypes: privateClass; // Error
-    export var publicVarWithPublicPropertyTypes: publicClass;
-    var privateVarWithPrivatePropertyTypes: privateClass;
-    var privateVarWithPublicPropertyTypes: publicClass;
-
-    export declare var publicAmbientVarWithPrivatePropertyTypes: privateClass; // Error
-    export declare var publicAmbientVarWithPublicPropertyTypes: publicClass;
-    declare var privateAmbientVarWithPrivatePropertyTypes: privateClass;
-    declare var privateAmbientVarWithPublicPropertyTypes: publicClass;
-
-    export interface publicInterfaceWithPrivateModulePropertyTypes {
-        myProperty: privateModule.publicClass; // Error
-    }
-    export class publicClassWithPrivateModulePropertyTypes {
-        static myPublicStaticProperty: privateModule.publicClass; // Error
-        myPublicProperty: privateModule.publicClass; // Error
-    }
-    export var publicVarWithPrivateModulePropertyTypes: privateModule.publicClass; // Error
-    export declare var publicAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass; // Error
-
-    interface privateInterfaceWithPrivateModulePropertyTypes {
-        myProperty: privateModule.publicClass;
-    }
-    class privateClassWithPrivateModulePropertyTypes {
-        static myPublicStaticProperty: privateModule.publicClass;
-        myPublicProperty: privateModule.publicClass;
-    }
-    var privateVarWithPrivateModulePropertyTypes: privateModule.publicClass;
-    declare var privateAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass;
-}
-
-module privateModule {
-    class privateClass {
-    }
-
-    export class publicClass {
-    }
-
-    export interface publicInterfaceWithPrivatePropertyTypes {
-        myProperty: privateClass;  
-    }
-
-    export interface publicInterfaceWithPublicPropertyTypes {
-        myProperty: publicClass;
-    }
-
-    interface privateInterfaceWithPrivatePropertyTypes {
-        myProperty: privateClass;
-    }
-
-    interface privateInterfaceWithPublicPropertyTypes {
-        myProperty: publicClass;
-    }
-
-    export class publicClassWithWithPrivatePropertyTypes {
-        static myPublicStaticProperty: privateClass; 
-        private static myPrivateStaticProperty: privateClass;
-        myPublicProperty: privateClass; 
-        private myPrivateProperty: privateClass;
-    }
-
-    export class publicClassWithWithPublicPropertyTypes {
-        static myPublicStaticProperty: publicClass;
-        private static myPrivateStaticProperty: publicClass;
-        myPublicProperty: publicClass;
-        private myPrivateProperty: publicClass;
-    }
-
-    class privateClassWithWithPrivatePropertyTypes {
-        static myPublicStaticProperty: privateClass;
-        private static myPrivateStaticProperty: privateClass;
-        myPublicProperty: privateClass;
-        private myPrivateProperty: privateClass;
-    }
-
-    class privateClassWithWithPublicPropertyTypes {
-        static myPublicStaticProperty: publicClass;
-        private static myPrivateStaticProperty: publicClass;
-        myPublicProperty: publicClass;
-        private myPrivateProperty: publicClass;
-    }
-
-    export var publicVarWithPrivatePropertyTypes: privateClass; 
-    export var publicVarWithPublicPropertyTypes: publicClass;
-    var privateVarWithPrivatePropertyTypes: privateClass;
-    var privateVarWithPublicPropertyTypes: publicClass;
-
-    export declare var publicAmbientVarWithPrivatePropertyTypes: privateClass; 
-    export declare var publicAmbientVarWithPublicPropertyTypes: publicClass;
-    declare var privateAmbientVarWithPrivatePropertyTypes: privateClass;
-    declare var privateAmbientVarWithPublicPropertyTypes: publicClass;
-
-    export interface publicInterfaceWithPrivateModulePropertyTypes {
-        myProperty: privateModule.publicClass; 
-    }
-    export class publicClassWithPrivateModulePropertyTypes {
-        static myPublicStaticProperty: privateModule.publicClass; 
-        myPublicProperty: privateModule.publicClass; 
-    }
-    export var publicVarWithPrivateModulePropertyTypes: privateModule.publicClass; 
-    export declare var publicAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass;
-
-    interface privateInterfaceWithPrivateModulePropertyTypes {
-        myProperty: privateModule.publicClass;
-    }
-    class privateClassWithPrivateModulePropertyTypes {
-        static myPublicStaticProperty: privateModule.publicClass;
-        myPublicProperty: privateModule.publicClass;
-    }
-    var privateVarWithPrivateModulePropertyTypes: privateModule.publicClass;
-    declare var privateAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass;
-}
-
-// @Filename: privacyVarDeclFile_GlobalFile.ts
-class publicClassInGlobal {
-}
-interface publicInterfaceWithPublicPropertyTypesInGlobal {
-    myProperty: publicClassInGlobal;
-}
-class publicClassWithWithPublicPropertyTypesInGlobal {
-    static myPublicStaticProperty: publicClassInGlobal;
-    private static myPrivateStaticProperty: publicClassInGlobal;
-    myPublicProperty: publicClassInGlobal;
-    private myPrivateProperty: publicClassInGlobal;
-}
-var publicVarWithPublicPropertyTypesInGlobal: publicClassInGlobal;
-declare var publicAmbientVarWithPublicPropertyTypesInGlobal: publicClassInGlobal;
-
-module publicModuleInGlobal {
-    class privateClass {
-    }
-
-    export class publicClass {
-    }
-
-    module privateModule {
-        class privateClass {
-        }
-
-        export class publicClass {
-        }
-
-        export interface publicInterfaceWithPrivatePropertyTypes {
-            myProperty: privateClass;
-        }
-
-        export interface publicInterfaceWithPublicPropertyTypes {
-            myProperty: publicClass;
-        }
-
-        interface privateInterfaceWithPrivatePropertyTypes {
-            myProperty: privateClass;
-        }
-
-        interface privateInterfaceWithPublicPropertyTypes {
-            myProperty: publicClass;
-        }
-
-        export class publicClassWithWithPrivatePropertyTypes {
-            static myPublicStaticProperty: privateClass;
-            private static myPrivateStaticProperty: privateClass;
-            myPublicProperty: privateClass;
-            private myPrivateProperty: privateClass;
-        }
-
-        export class publicClassWithWithPublicPropertyTypes {
-            static myPublicStaticProperty: publicClass;
-            private static myPrivateStaticProperty: publicClass;
-            myPublicProperty: publicClass;
-            private myPrivateProperty: publicClass;
-        }
-
-        class privateClassWithWithPrivatePropertyTypes {
-            static myPublicStaticProperty: privateClass;
-            private static myPrivateStaticProperty: privateClass;
-            myPublicProperty: privateClass;
-            private myPrivateProperty: privateClass;
-        }
-
-        class privateClassWithWithPublicPropertyTypes {
-            static myPublicStaticProperty: publicClass;
-            private static myPrivateStaticProperty: publicClass;
-            myPublicProperty: publicClass;
-            private myPrivateProperty: publicClass;
-        }
-
-        export var publicVarWithPrivatePropertyTypes: privateClass;
-        export var publicVarWithPublicPropertyTypes: publicClass;
-        var privateVarWithPrivatePropertyTypes: privateClass;
-        var privateVarWithPublicPropertyTypes: publicClass;
-
-        export declare var publicAmbientVarWithPrivatePropertyTypes: privateClass;
-        export declare var publicAmbientVarWithPublicPropertyTypes: publicClass;
-        declare var privateAmbientVarWithPrivatePropertyTypes: privateClass;
-        declare var privateAmbientVarWithPublicPropertyTypes: publicClass;
-
-        export interface publicInterfaceWithPrivateModulePropertyTypes {
-            myProperty: privateModule.publicClass;
-        }
-        export class publicClassWithPrivateModulePropertyTypes {
-            static myPublicStaticProperty: privateModule.publicClass;
-            myPublicProperty: privateModule.publicClass;
-        }
-        export var publicVarWithPrivateModulePropertyTypes: privateModule.publicClass;
-        export declare var publicAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass;
-
-        interface privateInterfaceWithPrivateModulePropertyTypes {
-            myProperty: privateModule.publicClass;
-        }
-        class privateClassWithPrivateModulePropertyTypes {
-            static myPublicStaticProperty: privateModule.publicClass;
-            myPublicProperty: privateModule.publicClass;
-        }
-        var privateVarWithPrivateModulePropertyTypes: privateModule.publicClass;
-        declare var privateAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass;
-    }
-
-    export interface publicInterfaceWithPrivatePropertyTypes {
-        myProperty: privateClass;  // Error
-    }
-
-    export interface publicInterfaceWithPublicPropertyTypes {
-        myProperty: publicClass;
-    }
-
-    interface privateInterfaceWithPrivatePropertyTypes {
-        myProperty: privateClass;
-    }
-
-    interface privateInterfaceWithPublicPropertyTypes {
-        myProperty: publicClass;
-    }
-
-    export class publicClassWithWithPrivatePropertyTypes {
-        static myPublicStaticProperty: privateClass; // Error
-        private static myPrivateStaticProperty: privateClass;
-        myPublicProperty: privateClass; // Error
-        private myPrivateProperty: privateClass;
-    }
-
-    export class publicClassWithWithPublicPropertyTypes {
-        static myPublicStaticProperty: publicClass;
-        private static myPrivateStaticProperty: publicClass;
-        myPublicProperty: publicClass;
-        private myPrivateProperty: publicClass;
-    }
-
-    class privateClassWithWithPrivatePropertyTypes {
-        static myPublicStaticProperty: privateClass;
-        private static myPrivateStaticProperty: privateClass;
-        myPublicProperty: privateClass;
-        private myPrivateProperty: privateClass;
-    }
-
-    class privateClassWithWithPublicPropertyTypes {
-        static myPublicStaticProperty: publicClass;
-        private static myPrivateStaticProperty: publicClass;
-        myPublicProperty: publicClass;
-        private myPrivateProperty: publicClass;
-    }
-
-    export var publicVarWithPrivatePropertyTypes: privateClass; // Error
-    export var publicVarWithPublicPropertyTypes: publicClass;
-    var privateVarWithPrivatePropertyTypes: privateClass;
-    var privateVarWithPublicPropertyTypes: publicClass;
-
-    export declare var publicAmbientVarWithPrivatePropertyTypes: privateClass; // Error
-    export declare var publicAmbientVarWithPublicPropertyTypes: publicClass;
-    declare var privateAmbientVarWithPrivatePropertyTypes: privateClass;
-    declare var privateAmbientVarWithPublicPropertyTypes: publicClass;
-
-    export interface publicInterfaceWithPrivateModulePropertyTypes {
-        myProperty: privateModule.publicClass; // Error
-    }
-    export class publicClassWithPrivateModulePropertyTypes {
-        static myPublicStaticProperty: privateModule.publicClass; // Error
-        myPublicProperty: privateModule.publicClass; // Error
-    }
-    export var publicVarWithPrivateModulePropertyTypes: privateModule.publicClass; // Error
-    export declare var publicAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass; // Error
-
-    interface privateInterfaceWithPrivateModulePropertyTypes {
-        myProperty: privateModule.publicClass;
-    }
-    class privateClassWithPrivateModulePropertyTypes {
-        static myPublicStaticProperty: privateModule.publicClass;
-        myPublicProperty: privateModule.publicClass;
-    }
-    var privateVarWithPrivateModulePropertyTypes: privateModule.publicClass;
-    declare var privateAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass;
-}
\ No newline at end of file
diff --git a/tests/cases/compiler/promiseChaining.ts b/tests/cases/compiler/promiseChaining.ts
index 8da2853830b..824fc1718ac 100644
--- a/tests/cases/compiler/promiseChaining.ts
+++ b/tests/cases/compiler/promiseChaining.ts
@@ -1,10 +1,34 @@
+<<<<<<< HEAD
+=======
+// This exhibits the bug that you see with Promise typings having generic signatures in a generic type
+
+// BUG 858876: should get a fresh type parameter which each then call
+
+>>>>>>> d99cb83... Clean up 'blocked' tests
 class Chain<T> {
     constructor(public value: T) { }
     then<S>(cb: (x: T) => S): Chain<S> {
         var result = cb(this.value);
+<<<<<<< HEAD
         // should get a fresh type parameter which each then call
         var z = this.then(x => result)/*S*/.then(x => "abc")/*string*/.then(x => x.length)/*number*/; // No error
         return new Chain(result);
     }
 }
+=======
+        var z = this.then(x => result).then(x => "abc").then(x => x.length); 
+        return new Chain(result);
+    }
+}
 
+// same example but with constraints on each type parameter
+class Chain2<T extends { length: number }> {
+    constructor(public value: T) { }
+    then<S extends Function>(cb: (x: T) => S): Chain2<S> {
+        var result = cb(this.value);
+        // should get a fresh type parameter which each then call
+        var z = this.then(x => result).then(x => "abc").then(x => x.length);
+        return new Chain2(result);
+    }
+}
+>>>>>>> d99cb83... Clean up 'blocked' tests
diff --git a/tests/cases/compiler/promiseChaining2.ts b/tests/cases/compiler/promiseChaining2.ts
index 5f990f0330b..e69de29bb2d 100644
--- a/tests/cases/compiler/promiseChaining2.ts
+++ b/tests/cases/compiler/promiseChaining2.ts
@@ -1,10 +0,0 @@
-// same example but with constraints on each type parameter
-class Chain2<T extends { length: number }> {
-    constructor(public value: T) { }
-    then<S extends Function>(cb: (x: T) => S): Chain2<S> {
-        var result = cb(this.value);
-        // should get a fresh type parameter which each then call
-        var z = this.then(x => result).then(x => "abc").then(x => x.length);
-        return new Chain2(result);
-    }
-}
\ No newline at end of file
diff --git a/tests/cases/compiler/propertyParameterWithQuestionMark.ts b/tests/cases/compiler/propertyParameterWithQuestionMark.ts
deleted file mode 100644
index 1a0eedb799e..00000000000
--- a/tests/cases/compiler/propertyParameterWithQuestionMark.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-class C {
-    constructor(public x?) { }
-}
-
-// x should not be an optional property
-var v: C = {}; // Should fail
-var v2: { x? }
-v = v2; // Should fail
-var v3: { x } = new C; // Should succeed
\ No newline at end of file
diff --git a/tests/cases/compiler/regExpWithSlashInCharClass.ts b/tests/cases/compiler/regExpWithSlashInCharClass.ts
deleted file mode 100644
index 6d54f8779e0..00000000000
--- a/tests/cases/compiler/regExpWithSlashInCharClass.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-var foo1 = "a/".replace(/.[/]/, "");
-var foo2 = "a//".replace(/.[//]/g, "");
-var foo3 = "a/".replace(/.[/no sleep /till/]/, "bugfix");
diff --git a/tests/cases/compiler/reservedNameOnInterfaceImport.ts b/tests/cases/compiler/reservedNameOnInterfaceImport.ts
deleted file mode 100644
index 0a706a9acba..00000000000
--- a/tests/cases/compiler/reservedNameOnInterfaceImport.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-declare module test {
-    interface istring { }
-
-    // Should error; 'test.istring' is a type, so this import conflicts with the 'string' type.
-    import string = test.istring;
-}
diff --git a/tests/cases/compiler/reservedNameOnModuleImport.ts b/tests/cases/compiler/reservedNameOnModuleImport.ts
deleted file mode 100644
index de0344f56f3..00000000000
--- a/tests/cases/compiler/reservedNameOnModuleImport.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-declare module test {
-    module mstring { }
-
-    // Should be fine; this does not clobber any declared values.
-    export import string = mstring;
-}
diff --git a/tests/cases/compiler/reservedNameOnModuleImportWithInterface.ts b/tests/cases/compiler/reservedNameOnModuleImportWithInterface.ts
deleted file mode 100644
index bde58f92795..00000000000
--- a/tests/cases/compiler/reservedNameOnModuleImportWithInterface.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-declare module test {
-    interface mi_string { }
-    module mi_string { }
-
-    // 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/cases/compiler/sourceMap-SkippedNode.ts b/tests/cases/compiler/sourceMap-SkippedNode.ts
deleted file mode 100644
index ae5674d6da0..00000000000
--- a/tests/cases/compiler/sourceMap-SkippedNode.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-//@sourceMap: true
-try {
-// ...
-} finally {
-// N.B. No 'catch' block
-}
\ No newline at end of file
diff --git a/tests/cases/compiler/sourceMapValidationClass.ts b/tests/cases/compiler/sourceMapValidationClass.ts
index 0be760d06ed..1b1b8da9877 100644
--- a/tests/cases/compiler/sourceMapValidationClass.ts
+++ b/tests/cases/compiler/sourceMapValidationClass.ts
@@ -1,5 +1,4 @@
 // @sourcemap: true
-// @target: es5
 class Greeter {
     constructor(public greeting: string, ...b: string[]) {
     }
diff --git a/tests/cases/compiler/sourceMapValidationExportAssignmentCommonjs.ts b/tests/cases/compiler/sourceMapValidationExportAssignmentCommonjs.ts
deleted file mode 100644
index ccf25ae59b7..00000000000
--- a/tests/cases/compiler/sourceMapValidationExportAssignmentCommonjs.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-//@module: commonjs
-// @sourcemap: true
-class a {
-    public c;
-}
-export = a;
\ No newline at end of file
diff --git a/tests/cases/compiler/specializedLambdaTypeArguments.ts b/tests/cases/compiler/specializedLambdaTypeArguments.ts
index 7ef5d8bff36..95efdbfa3e7 100644
--- a/tests/cases/compiler/specializedLambdaTypeArguments.ts
+++ b/tests/cases/compiler/specializedLambdaTypeArguments.ts
@@ -1,5 +1,5 @@
 class X<A> {
-	prop: X< <Tany>() => Tany >;
+	prop: X< <any>() => any >;
 }
 var a: X<boolean>;
  
diff --git a/tests/cases/compiler/specializedSignatureInInterface.ts b/tests/cases/compiler/specializedSignatureInInterface.ts
deleted file mode 100644
index f9a69ccde85..00000000000
--- a/tests/cases/compiler/specializedSignatureInInterface.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-interface A {
-  (key:string):void;
-}
-
-interface B extends A {
-  (key:'foo'):string;
-  (key:'bar'):string;
-}
\ No newline at end of file
diff --git a/tests/cases/compiler/staticMethodWithTypeParameterExtendsClauseDeclFile.ts b/tests/cases/compiler/staticMethodWithTypeParameterExtendsClauseDeclFile.ts
deleted file mode 100644
index 48d31d92870..00000000000
--- a/tests/cases/compiler/staticMethodWithTypeParameterExtendsClauseDeclFile.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-// @module: commonjs
-// @declaration: true
-class privateClass {
-}
-
-export class publicClass {
-}
-
-export class publicClassWithWithPrivateTypeParameters {
-    private static myPrivateStaticMethod1<T extends privateClass>() { // do not emit extends clause
-    }
-    private myPrivateMethod1<T extends privateClass>() { // do not emit extends clause
-    }
-    private static myPrivateStaticMethod2<T extends publicClass>() { // do not emit extends clause
-    }
-    private myPrivateMethod2<T extends publicClass>() { // do not emit extends clause
-    }
-    public static myPublicStaticMethod<T extends publicClass>() {
-    }
-    public myPublicMethod<T extends publicClass>() {
-    }
-}
diff --git a/tests/cases/compiler/strictMode5.ts b/tests/cases/compiler/strictMode5.ts
deleted file mode 100644
index c980cf7c86d..00000000000
--- a/tests/cases/compiler/strictMode5.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-function foo(...args) {
-    "use strict"
-}
-
-class A {
-    m() {
-        "use strict"
-
-        var v = () => {
-            return this.n();
-        };
-    }
-    n() {}
-}
-
-function bar(x: number = 10) {
-    "use strict"
-}
\ No newline at end of file
diff --git a/tests/cases/compiler/switchStatementsWithMultipleDefaults.ts b/tests/cases/compiler/switchStatementsWithMultipleDefaults.ts
deleted file mode 100644
index 33a73cd4929..00000000000
--- a/tests/cases/compiler/switchStatementsWithMultipleDefaults.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-
-var x = 10;
-
-switch (x) {
-    case 1:
-    case 2:
-    default:    // No issues.
-        break;
-    default:    // Error; second 'default' clause.
-    default:    // Error; third 'default' clause.
-    case 3:
-        x *= x;
-}
-
-switch (x) {
-    default:    // No issues.
-        break;
-    case 100:
-        switch (x * x) {
-            default:    // No issues.
-            default:    // Error; second 'default' clause.
-                break;
-            case 10000:
-                x /= x;
-            default:    // Error, third 'default' clause
-            def\u0061ult: // Error, fourth 'default' clause.
-            // Errors on fifth-seventh
-            default: return;
-            default: default:
-        }
-}
\ No newline at end of file
diff --git a/tests/cases/compiler/testContainerList.ts b/tests/cases/compiler/testContainerList.ts
deleted file mode 100644
index 29a4fbd206c..00000000000
--- a/tests/cases/compiler/testContainerList.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-// Regression test for #325
-module A {
-    class C {
-        constructor(public d: {}) { }
-    }
-}
diff --git a/tests/cases/compiler/trailingCommasES3.ts b/tests/cases/compiler/trailingCommasES3.ts
deleted file mode 100644
index cc35f8e4823..00000000000
--- a/tests/cases/compiler/trailingCommasES3.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-// @target: es3
-
-var o1 = { a: 1, b: 2 };
-var o2 = { a: 1, b: 2, };
-var o3 = { a: 1, };
-var o4 = {};
-
-var a1 = [1, 2];
-var a2 = [1, 2, ];
-var a3 = [1, ];
-var a4 = [];
-var a5 = [1, , ];
-var a6 = [, , ];
\ No newline at end of file
diff --git a/tests/cases/compiler/trailingCommasES5.ts b/tests/cases/compiler/trailingCommasES5.ts
deleted file mode 100644
index b5518e69d90..00000000000
--- a/tests/cases/compiler/trailingCommasES5.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-// @target: es5
-
-var o1 = { a: 1, b: 2 };
-var o2 = { a: 1, b: 2, };
-var o3 = { a: 1, };
-var o4 = {};
-
-var a1 = [1, 2];
-var a2 = [1, 2, ];
-var a3 = [1, ];
-var a4 = [];
-var a5 = [1, , ];
-var a6 = [, , ];
\ No newline at end of file
diff --git a/tests/cases/compiler/typeParameterWithInvalidConstraintType.ts b/tests/cases/compiler/typeParameterWithInvalidConstraintType.ts
deleted file mode 100644
index 7c92ad4575a..00000000000
--- a/tests/cases/compiler/typeParameterWithInvalidConstraintType.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-class A<T extends T> {
-    foo() {
-        var x: T;
-        // no error expected below this line
-        var a = x.foo();
-        var b = new x(123);
-        var c = x[1];
-        var d = x();
-    }
-}
\ No newline at end of file
diff --git a/tests/cases/compiler/unusedImportDeclaration.ts b/tests/cases/compiler/unusedImportDeclaration.ts
index 263b355f69c..83cb089acfe 100644
--- a/tests/cases/compiler/unusedImportDeclaration.ts
+++ b/tests/cases/compiler/unusedImportDeclaration.ts
@@ -1,5 +1,4 @@
 //@module: commonjs
-//@declaration: true
 // @Filename: unusedImportDeclaration_testerB.ts
 class TesterB {
     me: string;
diff --git a/tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendingPrimitive2.ts b/tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendingPrimitive2.ts
deleted file mode 100644
index 58b397cbd84..00000000000
--- a/tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendingPrimitive2.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-// classes cannot extend primitives
-
-class C4a extends void {}
-class C5a extends null { }
\ No newline at end of file
diff --git a/tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendsEveryObjectType2.ts b/tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendsEveryObjectType2.ts
deleted file mode 100644
index 095c0a11544..00000000000
--- a/tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendsEveryObjectType2.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-class C2 extends { foo: string; } { } // error
-
-class C6 extends []{ } // error
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript3/Accessors/parserES3Accessors1.ts b/tests/cases/conformance/parser/ecmascript3/Accessors/parserES3Accessors1.ts
deleted file mode 100644
index 8dadcb2f744..00000000000
--- a/tests/cases/conformance/parser/ecmascript3/Accessors/parserES3Accessors1.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-class C {
-    get Foo() { }
-}
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript3/Accessors/parserES3Accessors2.ts b/tests/cases/conformance/parser/ecmascript3/Accessors/parserES3Accessors2.ts
deleted file mode 100644
index 99fab6497f3..00000000000
--- a/tests/cases/conformance/parser/ecmascript3/Accessors/parserES3Accessors2.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-class C {
-    set Foo(a) { }
-}
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript3/Accessors/parserES3Accessors3.ts b/tests/cases/conformance/parser/ecmascript3/Accessors/parserES3Accessors3.ts
deleted file mode 100644
index 9941815d807..00000000000
--- a/tests/cases/conformance/parser/ecmascript3/Accessors/parserES3Accessors3.ts
+++ /dev/null
@@ -1 +0,0 @@
-var v = { get Foo() { } };
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript3/Accessors/parserES3Accessors4.ts b/tests/cases/conformance/parser/ecmascript3/Accessors/parserES3Accessors4.ts
deleted file mode 100644
index c39d3375119..00000000000
--- a/tests/cases/conformance/parser/ecmascript3/Accessors/parserES3Accessors4.ts
+++ /dev/null
@@ -1 +0,0 @@
-var v = { set Foo(a) { } };
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors1.ts b/tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors1.ts
index f44ef535b13..8dadcb2f744 100644
--- a/tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors1.ts
+++ b/tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors1.ts
@@ -1,4 +1,3 @@
-// @target: es5
 class C {
     get Foo() { }
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors10.ts b/tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors10.ts
index 828bbc94914..050e83ceec0 100644
--- a/tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors10.ts
+++ b/tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors10.ts
@@ -1,4 +1,3 @@
-// @target: es5
 var v = {
   public get foo() { }
 };
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors2.ts b/tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors2.ts
index a2ba74bdb14..99fab6497f3 100644
--- a/tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors2.ts
+++ b/tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors2.ts
@@ -1,4 +1,3 @@
-// @target: es5
 class C {
     set Foo(a) { }
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors3.ts b/tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors3.ts
index ce4e80f9b74..9941815d807 100644
--- a/tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors3.ts
+++ b/tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors3.ts
@@ -1,2 +1 @@
-// @target: es5
 var v = { get Foo() { } };
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors4.ts b/tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors4.ts
index 5fc896002d7..c39d3375119 100644
--- a/tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors4.ts
+++ b/tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors4.ts
@@ -1,2 +1 @@
-// @target: es5
 var v = { set Foo(a) { } };
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors5.ts b/tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors5.ts
index 3da8d3376f1..9ccf2efa60f 100644
--- a/tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors5.ts
+++ b/tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors5.ts
@@ -1,4 +1,3 @@
-// @target: es5
 declare class C {
   get foo() { return 0; }
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors6.ts b/tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors6.ts
index 4d2aa80828b..16ba813df62 100644
--- a/tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors6.ts
+++ b/tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors6.ts
@@ -1,4 +1,3 @@
-// @target: es5
 declare class C {
   set foo(v) { }
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors7.ts b/tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors7.ts
index 02eb7800c95..b8fc3e06655 100644
--- a/tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors7.ts
+++ b/tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors7.ts
@@ -1,2 +1 @@
-// @target: es5
 var v = { get foo(v: number) { } };
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors8.ts b/tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors8.ts
index 2d8af279224..f881fd22f20 100644
--- a/tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors8.ts
+++ b/tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors8.ts
@@ -1,2 +1 @@
-// @target: es5
 var v = { set foo() { } }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors9.ts b/tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors9.ts
index 7f61bd2d4d6..4f752146c23 100644
--- a/tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors9.ts
+++ b/tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors9.ts
@@ -1,2 +1 @@
-// @target: es5
 var v = { set foo(a, b) { } }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/Accessors/parserGetAccessorWithTypeParameters1.ts b/tests/cases/conformance/parser/ecmascript5/Accessors/parserGetAccessorWithTypeParameters1.ts
index 8318b20399b..85379b5bbf1 100644
--- a/tests/cases/conformance/parser/ecmascript5/Accessors/parserGetAccessorWithTypeParameters1.ts
+++ b/tests/cases/conformance/parser/ecmascript5/Accessors/parserGetAccessorWithTypeParameters1.ts
@@ -1,4 +1,3 @@
-// @target: es5
 class C {
   get foo<T>() { }
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/Accessors/parserSetAccessorWithTypeAnnotation1.ts b/tests/cases/conformance/parser/ecmascript5/Accessors/parserSetAccessorWithTypeAnnotation1.ts
index 8b3d1129278..79bf4b51b87 100644
--- a/tests/cases/conformance/parser/ecmascript5/Accessors/parserSetAccessorWithTypeAnnotation1.ts
+++ b/tests/cases/conformance/parser/ecmascript5/Accessors/parserSetAccessorWithTypeAnnotation1.ts
@@ -1,4 +1,3 @@
-// @target: es5
 class C {
    set foo(v): number {
    }
diff --git a/tests/cases/conformance/parser/ecmascript5/Accessors/parserSetAccessorWithTypeParameters1.ts b/tests/cases/conformance/parser/ecmascript5/Accessors/parserSetAccessorWithTypeParameters1.ts
index 16a09906d76..2b4975a07b1 100644
--- a/tests/cases/conformance/parser/ecmascript5/Accessors/parserSetAccessorWithTypeParameters1.ts
+++ b/tests/cases/conformance/parser/ecmascript5/Accessors/parserSetAccessorWithTypeParameters1.ts
@@ -1,4 +1,3 @@
-// @target: es5
 class C {
    set foo<T>(v) { }
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/ConstructorDeclarations/parserConstructorDeclaration11.ts b/tests/cases/conformance/parser/ecmascript5/ConstructorDeclarations/parserConstructorDeclaration11.ts
deleted file mode 100644
index 7a4d68ce12d..00000000000
--- a/tests/cases/conformance/parser/ecmascript5/ConstructorDeclarations/parserConstructorDeclaration11.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-class C {
-  constructor<>() { }
-}
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ArrowFunctions/parserX_ArrowFunction1.ts b/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ArrowFunctions/ArrowFunction1.ts
similarity index 100%
rename from tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ArrowFunctions/parserX_ArrowFunction1.ts
rename to tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ArrowFunctions/ArrowFunction1.ts
diff --git a/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ArrowFunctions/parserX_ArrowFunction2.ts b/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ArrowFunctions/ArrowFunction2.ts
similarity index 100%
rename from tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ArrowFunctions/parserX_ArrowFunction2.ts
rename to tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ArrowFunctions/ArrowFunction2.ts
diff --git a/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ArrowFunctions/parserX_ArrowFunction3.ts b/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ArrowFunctions/ArrowFunction3.ts
similarity index 100%
rename from tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ArrowFunctions/parserX_ArrowFunction3.ts
rename to tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ArrowFunctions/ArrowFunction3.ts
diff --git a/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ArrowFunctions/parserX_ArrowFunction4.ts b/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ArrowFunctions/ArrowFunction4.ts
similarity index 100%
rename from tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ArrowFunctions/parserX_ArrowFunction4.ts
rename to tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ArrowFunctions/ArrowFunction4.ts
diff --git a/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ExtendsOrImplementsClauses/parserErrorRecovery_ExtendsOrImplementsClause6.ts b/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ExtendsOrImplementsClauses/parserErrorRecovery_ExtendsOrImplementsClause6.ts
deleted file mode 100644
index 89c65ca1c8f..00000000000
--- a/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ExtendsOrImplementsClauses/parserErrorRecovery_ExtendsOrImplementsClause6.ts
+++ /dev/null
@@ -1 +0,0 @@
-interface I extends { }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/TypeArgumentLists/parserX_TypeArgumentList1.ts b/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/TypeArgumentLists/TypeArgumentList1.ts
similarity index 100%
rename from tests/cases/conformance/parser/ecmascript5/ErrorRecovery/TypeArgumentLists/parserX_TypeArgumentList1.ts
rename to tests/cases/conformance/parser/ecmascript5/ErrorRecovery/TypeArgumentLists/TypeArgumentList1.ts
diff --git a/tests/cases/conformance/parser/ecmascript5/Expressions/parserAssignmentExpression1.ts b/tests/cases/conformance/parser/ecmascript5/Expressions/parserAssignmentExpression1.ts
deleted file mode 100644
index ca85f41bceb..00000000000
--- a/tests/cases/conformance/parser/ecmascript5/Expressions/parserAssignmentExpression1.ts
+++ /dev/null
@@ -1 +0,0 @@
-(foo()) = bar;
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/Expressions/parserObjectCreation2.ts b/tests/cases/conformance/parser/ecmascript5/Expressions/parserObjectCreation2.ts
deleted file mode 100644
index 0b7a19893bd..00000000000
--- a/tests/cases/conformance/parser/ecmascript5/Expressions/parserObjectCreation2.ts
+++ /dev/null
@@ -1 +0,0 @@
-new new Foo()()
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/Expressions/parserPostfixUnaryExpression1.ts b/tests/cases/conformance/parser/ecmascript5/Expressions/parserPostfixUnaryExpression1.ts
deleted file mode 100644
index 6ddc487528e..00000000000
--- a/tests/cases/conformance/parser/ecmascript5/Expressions/parserPostfixUnaryExpression1.ts
+++ /dev/null
@@ -1 +0,0 @@
-foo ++ ++;
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/Expressions/parserUnaryExpression1.ts b/tests/cases/conformance/parser/ecmascript5/Expressions/parserUnaryExpression1.ts
deleted file mode 100644
index 911a219c844..00000000000
--- a/tests/cases/conformance/parser/ecmascript5/Expressions/parserUnaryExpression1.ts
+++ /dev/null
@@ -1 +0,0 @@
-++this;
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/Expressions/parserUnaryExpression2.ts b/tests/cases/conformance/parser/ecmascript5/Expressions/parserUnaryExpression2.ts
deleted file mode 100644
index efc6883818d..00000000000
--- a/tests/cases/conformance/parser/ecmascript5/Expressions/parserUnaryExpression2.ts
+++ /dev/null
@@ -1 +0,0 @@
-++function(e) { }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/Expressions/parserUnaryExpression3.ts b/tests/cases/conformance/parser/ecmascript5/Expressions/parserUnaryExpression3.ts
deleted file mode 100644
index 2c3d2a675e4..00000000000
--- a/tests/cases/conformance/parser/ecmascript5/Expressions/parserUnaryExpression3.ts
+++ /dev/null
@@ -1 +0,0 @@
-++[0];
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/Expressions/parserUnaryExpression4.ts b/tests/cases/conformance/parser/ecmascript5/Expressions/parserUnaryExpression4.ts
deleted file mode 100644
index 9c6da06171c..00000000000
--- a/tests/cases/conformance/parser/ecmascript5/Expressions/parserUnaryExpression4.ts
+++ /dev/null
@@ -1 +0,0 @@
-++{};
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/Expressions/parserUnaryExpression5.ts b/tests/cases/conformance/parser/ecmascript5/Expressions/parserUnaryExpression5.ts
deleted file mode 100644
index be4cdbb33a1..00000000000
--- a/tests/cases/conformance/parser/ecmascript5/Expressions/parserUnaryExpression5.ts
+++ /dev/null
@@ -1 +0,0 @@
-++ delete foo.bar
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/Expressions/parserUnaryExpression6.ts b/tests/cases/conformance/parser/ecmascript5/Expressions/parserUnaryExpression6.ts
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/cases/conformance/parser/ecmascript5/Expressions/parserUnaryExpression7.ts b/tests/cases/conformance/parser/ecmascript5/Expressions/parserUnaryExpression7.ts
deleted file mode 100644
index 5569afbbc9b..00000000000
--- a/tests/cases/conformance/parser/ecmascript5/Expressions/parserUnaryExpression7.ts
+++ /dev/null
@@ -1 +0,0 @@
-++ new Foo();
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessor1.ts b/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessor1.ts
index 61bc60a46db..31db48d70b6 100644
--- a/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessor1.ts
+++ b/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessor1.ts
@@ -1,4 +1,3 @@
-// @target: es5
 class C {
   get foo() { }
   set foo(a) { }
diff --git a/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration1.ts b/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration1.ts
index e4f157dc497..6d6476d8d8d 100644
--- a/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration1.ts
+++ b/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration1.ts
@@ -1,4 +1,3 @@
-// @target: es5
 class C {
   get a() { }
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration10.ts b/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration10.ts
index fa586f53c53..d7a16a2dab5 100644
--- a/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration10.ts
+++ b/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration10.ts
@@ -1,4 +1,3 @@
-// @target: es5
 class C {
     export get Foo() { }
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration11.ts b/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration11.ts
index 8e2cfaa7bd6..7076131b99e 100644
--- a/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration11.ts
+++ b/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration11.ts
@@ -1,4 +1,3 @@
-// @target: es5
 class C {
     declare get Foo() { }
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration12.ts b/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration12.ts
index c05d6c15c0c..5cd370d9297 100644
--- a/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration12.ts
+++ b/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration12.ts
@@ -1,4 +1,3 @@
-// @target: es5
 class C {
    get Foo(a: number) { }
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration13.ts b/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration13.ts
index 935f70c1c90..54ca5d608b3 100644
--- a/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration13.ts
+++ b/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration13.ts
@@ -1,4 +1,3 @@
-// @target: es5
 class C {
    set Foo() { }
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration14.ts b/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration14.ts
index 79bc5e73630..2fb70a780b1 100644
--- a/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration14.ts
+++ b/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration14.ts
@@ -1,4 +1,3 @@
-// @target: es5
 class C {
    set Foo(a: number, b: number) { }
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration15.ts b/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration15.ts
index fa5379c9a2c..928e1f7e972 100644
--- a/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration15.ts
+++ b/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration15.ts
@@ -1,4 +1,3 @@
-// @target: es5
 class C {
    set Foo(public a: number) { }
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration16.ts b/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration16.ts
index 1bb0a7c7ebc..9ee2dd29c32 100644
--- a/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration16.ts
+++ b/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration16.ts
@@ -1,4 +1,3 @@
-// @target: es5
 class C {
    set Foo(a = 1) { }
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration17.ts b/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration17.ts
index 000aedd75a0..f64dc51f72a 100644
--- a/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration17.ts
+++ b/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration17.ts
@@ -1,4 +1,3 @@
-// @target: es5
 class C {
    set Foo(a?: number) { }
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration18.ts b/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration18.ts
index 94a7a62295e..0617316119f 100644
--- a/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration18.ts
+++ b/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration18.ts
@@ -1,4 +1,3 @@
-// @target: es5
 class C {
    set Foo(...a) { }
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration2.ts b/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration2.ts
index bfa10430978..f38ae14b7bb 100644
--- a/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration2.ts
+++ b/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration2.ts
@@ -1,4 +1,3 @@
-// @target: es5
 class C {
   get "b"() { }
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration3.ts b/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration3.ts
index 98c90c4f6c9..64676552aea 100644
--- a/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration3.ts
+++ b/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration3.ts
@@ -1,4 +1,3 @@
-// @target: es5
 class C {
   get 0() { }
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration4.ts b/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration4.ts
index e27e000ef20..acfd17a3f59 100644
--- a/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration4.ts
+++ b/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration4.ts
@@ -1,4 +1,3 @@
-// @target: es5
 class C {
   set a(i) { }
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration5.ts b/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration5.ts
index 4e71fad535b..e54a1865fbe 100644
--- a/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration5.ts
+++ b/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration5.ts
@@ -1,4 +1,3 @@
-// @target: es5
 class C {
   set "a"(i) { }
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration6.ts b/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration6.ts
index 1ef5cb83fbd..096ed5691fb 100644
--- a/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration6.ts
+++ b/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration6.ts
@@ -1,4 +1,3 @@
-// @target: es5
 class C {
   set 0(i) { }
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration7.ts b/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration7.ts
index c7fff54d528..e7ca2f6b9b4 100644
--- a/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration7.ts
+++ b/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration7.ts
@@ -1,4 +1,3 @@
-// @target: es5
 class C {
     public public get Foo() { }
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration8.ts b/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration8.ts
index f95d5f10930..a60d8b90b0c 100644
--- a/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration8.ts
+++ b/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration8.ts
@@ -1,4 +1,3 @@
-// @target: es5
 class C {
     static static get Foo() { }
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration9.ts b/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration9.ts
index 2e60420c434..b77bcb0b2e7 100644
--- a/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration9.ts
+++ b/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration9.ts
@@ -1,4 +1,3 @@
-// @target: es5
 class C {
     static public get Foo() { }
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/ObjectLiterals/parserObjectLiterals1.ts b/tests/cases/conformance/parser/ecmascript5/ObjectLiterals/parserObjectLiterals1.ts
deleted file mode 100644
index acaf67deb2a..00000000000
--- a/tests/cases/conformance/parser/ecmascript5/ObjectLiterals/parserObjectLiterals1.ts
+++ /dev/null
@@ -1 +0,0 @@
-var v = { a: 1, b: 2 };
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/ObjectTypes/parserObjectType5.ts b/tests/cases/conformance/parser/ecmascript5/ObjectTypes/parserObjectType5.ts
deleted file mode 100644
index 0687805280b..00000000000
--- a/tests/cases/conformance/parser/ecmascript5/ObjectTypes/parserObjectType5.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-var v: {
-   A: B
-   <T>;
-};
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/ObjectTypes/parserObjectType6.ts b/tests/cases/conformance/parser/ecmascript5/ObjectTypes/parserObjectType6.ts
deleted file mode 100644
index 9edad292d7b..00000000000
--- a/tests/cases/conformance/parser/ecmascript5/ObjectTypes/parserObjectType6.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-var v: {
-   a: B
-   [];
-};
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/Statements/ReturnStatements/parserReturnStatement4.js b/tests/cases/conformance/parser/ecmascript5/Statements/ReturnStatements/parserReturnStatement4.js
deleted file mode 100644
index bc2fc7648da..00000000000
--- a/tests/cases/conformance/parser/ecmascript5/Statements/ReturnStatements/parserReturnStatement4.js
+++ /dev/null
@@ -1,3 +0,0 @@
-var v = { get foo() {
-    return;
-} };
diff --git a/tests/cases/conformance/parser/ecmascript5/Statements/parserDoStatement2.ts b/tests/cases/conformance/parser/ecmascript5/Statements/parserDoStatement2.ts
deleted file mode 100644
index dc7234027c8..00000000000
--- a/tests/cases/conformance/parser/ecmascript5/Statements/parserDoStatement2.ts
+++ /dev/null
@@ -1 +0,0 @@
-do{;}while(false)false
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/Statements/parserForStatement4.ts b/tests/cases/conformance/parser/ecmascript5/Statements/parserForStatement4.ts
deleted file mode 100644
index 55bc5925920..00000000000
--- a/tests/cases/conformance/parser/ecmascript5/Statements/parserForStatement4.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-for (a = 1 in b) {
-}
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/Statements/parserForStatement5.ts b/tests/cases/conformance/parser/ecmascript5/Statements/parserForStatement5.ts
deleted file mode 100644
index da30cf1593f..00000000000
--- a/tests/cases/conformance/parser/ecmascript5/Statements/parserForStatement5.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-for ({} in b) {
-}
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/Statements/parserForStatement6.ts b/tests/cases/conformance/parser/ecmascript5/Statements/parserForStatement6.ts
deleted file mode 100644
index 82e058d6322..00000000000
--- a/tests/cases/conformance/parser/ecmascript5/Statements/parserForStatement6.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-for (foo() in b) {
-}
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/Statements/parserForStatement7.ts b/tests/cases/conformance/parser/ecmascript5/Statements/parserForStatement7.ts
deleted file mode 100644
index 52bf2dee241..00000000000
--- a/tests/cases/conformance/parser/ecmascript5/Statements/parserForStatement7.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-for (new foo() in b) {
-}
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/Statements/parserForStatement8.ts b/tests/cases/conformance/parser/ecmascript5/Statements/parserForStatement8.ts
deleted file mode 100644
index 027bf524704..00000000000
--- a/tests/cases/conformance/parser/ecmascript5/Statements/parserForStatement8.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-for (this in b) {
-}
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/StrictMode/octalLiteralInStrictModeES3.ts b/tests/cases/conformance/parser/ecmascript5/StrictMode/octalLiteralInStrictModeES3.ts
deleted file mode 100644
index 9df305d1a26..00000000000
--- a/tests/cases/conformance/parser/ecmascript5/StrictMode/octalLiteralInStrictModeES3.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-"use strict";
-03;
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/parserKeywordsAsIdentifierName2.ts b/tests/cases/conformance/parser/ecmascript5/parserKeywordsAsIdentifierName2.ts
index d197f85905c..195c846aa3a 100644
--- a/tests/cases/conformance/parser/ecmascript5/parserKeywordsAsIdentifierName2.ts
+++ b/tests/cases/conformance/parser/ecmascript5/parserKeywordsAsIdentifierName2.ts
@@ -1,2 +1,2 @@
-// 'public' should be marked unusable, should complain on trailing /*
+// 'public' shoudl be marked unusable because it has a trailing /*
 a.public /*
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/parserS7.6.1.1_A1.10.ts b/tests/cases/conformance/parser/ecmascript5/parserS7.6.1.1_A1.10.ts
index 3af5eeb9701..0511807b6c1 100644
--- a/tests/cases/conformance/parser/ecmascript5/parserS7.6.1.1_A1.10.ts
+++ b/tests/cases/conformance/parser/ecmascript5/parserS7.6.1.1_A1.10.ts
@@ -9,5 +9,5 @@
  * @negative
  */
 
-//for = 1;
+for = 1;
 
diff --git a/tests/cases/conformance/parser/ecmascript5/parserSyntaxWalker.generated.ts b/tests/cases/conformance/parser/ecmascript5/parserSyntaxWalker.generated.ts
index 42d55a2592d..5e1bc51fc93 100644
--- a/tests/cases/conformance/parser/ecmascript5/parserSyntaxWalker.generated.ts
+++ b/tests/cases/conformance/parser/ecmascript5/parserSyntaxWalker.generated.ts
@@ -1,278 +1,278 @@
-//declare module "fs" {
-//    export class File {
-//        constructor(filename: string);
-//        public ReadAllText(): string;
-//    }
-//    export interface IFile {
-//        [index: number]: string;
-//    }
-//}
+declare module "fs" {
+    export class File {
+        constructor(filename: string);
+        public ReadAllText(): string;
+    }
+    export interface IFile {
+        [index: number]: string;
+    }
+}
 
-//import fs = module("fs");
+import fs = module("fs");
 
 
-//module TypeScriptAllInOne {
-//    export class Program {
-//        static Main(...args: string[]) {
-//            try {
-//                var bfs = new BasicFeatures();
-//                var retValue: number = 0;
+module TypeScriptAllInOne {
+    export class Program {
+        static Main(...args: string[]) {
+            try {
+                var bfs = new BasicFeatures();
+                var retValue: number = 0;
 
-//                retValue = bfs.VARIABLES();
-//                if (retValue != 0) {
+                retValue = bfs.VARIABLES();
+                if (retValue != 0) {
 
-//                    return 1;
-//                }
+                    return 1;
+                }
 
-//                retValue = bfs.STATEMENTS(4);
-//                if (retValue != 0) {
+                retValue = bfs.STATEMENTS(4);
+                if (retValue != 0) {
 
-//                    return 1;
-//                }
+                    return 1;
+                }
 
 
-//                retValue = bfs.TYPES();
-//                if (retValue != 0) {
+                retValue = bfs.TYPES();
+                if (retValue != 0) {
 
-//                    return 1;
-//                }
+                    return 1;
+                }
 
-//                retValue = bfs.OPERATOR();
-//                if (retValue != 0) {
+                retValue = bfs.OPERATOR();
+                if (retValue != 0) {
 
-//                    return 1;
-//                }
-//            }
-//            catch (e) {
-//                console.log(e);
-//            }
-//            finally {
+                    return 1;
+                }
+            }
+            catch (e) {
+                console.log(e);
+            }
+            finally {
 
-//            }
+            }
 
-//            console.log('Done');
+            console.log('Done');
 
-//            return 0;
+            return 0;
 
-//        }
-//    }
+        }
+    }
 
-//    class BasicFeatures {
-//        /// <summary>
-//        /// Test various of variables. Including nullable,key world as variable,special format
-//        /// </summary>
-//        /// <returns></returns>
-//        public VARIABLES(): number {
-//            var local = Number.MAX_VALUE;
-//            var min = Number.MIN_VALUE;
-//            var inf = Number.NEGATIVE_INFINITY;
-//            var nan = Number.NaN;
-//            var undef = undefined;
+    class BasicFeatures {
+        /// <summary>
+        /// Test various of variables. Including nullable,key world as variable,special format
+        /// </summary>
+        /// <returns></returns>
+        public VARIABLES(): number {
+            var local = Number.MAX_VALUE;
+            var min = Number.MIN_VALUE;
+            var inf = Number.NEGATIVE_INFINITY;
+            var nan = Number.NaN;
+            var undef = undefined;
 
-//            var п = local;
-//            var м = local;
+            var п = local;
+            var м = local;
 
-//            var local5 = <fs.File>null;
-//            var local6 = local5 instanceof fs.File;
+            var local5 = <fs.File>null;
+            var local6 = local5 instanceof fs.File;
 
-//            var hex = 0xBADC0DE, Hex = 0XDEADBEEF;
-//            var float = 6.02e23, float2 = 6.02E-23
-//            var char = 'c', \u0066 = '\u0066', hexchar = '\x42';
-//            var quoted = '"', quoted2 = "'";
-//            var reg = /\w*/;
-//            var objLit = { "var": number = 42, equals: function (x) { return x["var"] === 42; }, toString: () => 'objLit{42}' };
-//            var weekday = Weekdays.Monday;
+            var hex = 0xBADC0DE, Hex = 0XDEADBEEF;
+            var float = 6.02e23, float2 = 6.02E-23
+            var char = 'c', \u0066 = '\u0066', hexchar = '\x42';
+            var quoted = '"', quoted2 = "'";
+            var reg = /\w*/;
+            var objLit = { "var": number = 42, equals: function (x) { return x["var"] === 42; }, toString: () => 'objLit{42}' };
+            var weekday = Weekdays.Monday;
 
-//            var con = char + f + hexchar + float.toString() + float2.toString() + reg.toString() + objLit + weekday;
+            var con = char + f + hexchar + float.toString() + float2.toString() + reg.toString() + objLit + weekday;
 
-//            //
-//            var any = 0;
-//            var boolean = 0;
-//            var declare = 0;
-//            var constructor = 0;
-//            var get = 0;
-//            var implements = 0;
-//            var interface = 0;
-//            var let = 0;
-//            var module = 0;
-//            var number = 0;
-//            var package = 0;
-//            var private = 0;
-//            var protected = 0;
-//            var public = 0;
-//            var set = 0;
-//            var static = 0;
-//            var string = 0;
-//            var yield = 0;
+            //
+            var any = 0;
+            var boolean = 0;
+            var declare = 0;
+            var constructor = 0;
+            var get = 0;
+            var implements = 0;
+            var interface = 0;
+            var let = 0;
+            var module = 0;
+            var number = 0;
+            var package = 0;
+            var private = 0;
+            var protected = 0;
+            var public = 0;
+            var set = 0;
+            var static = 0;
+            var string = 0;
+            var yield = 0;
 
-//            var sum3 = any + boolean + declare + constructor + get + implements + interface + let + module + number + package + private + protected + public + set + static + string + yield;
+            var sum3 = any + boolean + declare + constructor + get + implements + interface + let + module + number + package + private + protected + public + set + static + string + yield;
 
-//            return 0;
-//        }
+            return 0;
+        }
 
-//        /// <summary>
-//        /// Test different statements. Including if-else,swith,foreach,(un)checked,lock,using,try-catch-finally
-//        /// </summary>
-//        /// <param name="i"></param>
-//        /// <returns></returns>
-//        STATEMENTS(i: number): number {
-//            var retVal = 0;
-//            if (i == 1)
-//                retVal = 1;
-//            else
-//                retVal = 0;
-//            switch (i) {
-//                case 2:
-//                    retVal = 1;
-//                    break;
-//                case 3:
-//                    retVal = 1;
-//                    break;
-//                default:
-//                    break;
-//            }
+        /// <summary>
+        /// Test different statements. Including if-else,swith,foreach,(un)checked,lock,using,try-catch-finally
+        /// </summary>
+        /// <param name="i"></param>
+        /// <returns></returns>
+        STATEMENTS(i: number): number {
+            var retVal = 0;
+            if (i == 1)
+                retVal = 1;
+            else
+                retVal = 0;
+            switch (i) {
+                case 2:
+                    retVal = 1;
+                    break;
+                case 3:
+                    retVal = 1;
+                    break;
+                default:
+                    break;
+            }
 
-//            for (var x in { x: 0, y: 1 }) {
-//            }
+            for (var x in { x: 0, y: 1 }) {
+            }
 
-//            try {
-//                throw null;
-//            }
-//            catch (Exception) {
-//            }
-//            finally {
-//                try { }
-//                catch (Exception) { }
-//            }
+            try {
+                throw null;
+            }
+            catch (Exception) {
+            }
+            finally {
+                try { }
+                catch (Exception) { }
+            }
 
-//            return retVal;
-//        }
+            return retVal;
+        }
 
-//        /// <summary>
-//        /// Test types in ts language. Including class,struct,interface,delegate,anonymous type
-//        /// </summary>
-//        /// <returns></returns>
-//        public TYPES(): number {
-//            var retVal = 0;
-//            var c = new CLASS();
-//            var xx: IF = c;
-//            retVal += c.Property;
-//            retVal += c.Member();
-//            retVal += xx ^= Foo() ? 0 : 1;
+        /// <summary>
+        /// Test types in ts language. Including class,struct,interface,delegate,anonymous type
+        /// </summary>
+        /// <returns></returns>
+        public TYPES(): number {
+            var retVal = 0;
+            var c = new CLASS();
+            var xx: IF = c;
+            retVal += c.Property;
+            retVal += c.Member();
+            retVal += xx ^= Foo() ? 0 : 1;
 
-//            //anonymous type
-//            var anony = { a: new CLASS() };
+            //anonymous type
+            var anony = { a: new CLASS() };
 
-//            retVal += anony.a.d();
+            retVal += anony.a.d();
 
-//            return retVal;
-//        }
+            return retVal;
+        }
 
 
-//        ///// <summary>
-//        ///// Test different operators
-//        ///// </summary>
-//        ///// <returns></returns>
-//        public OPERATOR(): number {
-//            var a: number[] = [1, 2, 3, 4,  implements , ];/*[] bug*/ // YES []
-//            var i = a[1];/*[]*/
-//            i = i + i - i * i / i % i & i | i ^ i;/*+ - * / % & | ^*/
-//            var b = true && false || true ^ false;/*& | ^*/
-//            b = !b;/*!*/
-//            i = ~i;/*~i*/
-//            b = i < (i -  continue ) && (i + 1) > i;/*< && >*/
-//            var f = true ? 1 : 0;/*? :*/   // YES :
-//            i++;/*++*/
-//            i--;/*--*/
-//            b = true && false || true;/*&& ||*/
-//            i = i << 5;/*<<*/
-//            i = i >> 5;/*>>*/
-//            var j = i;
-//            b = i == j && i != j && i <= j && i >= j;/*= == && != <= >=*/
-//            i += <number>5.0;/*+=*/
-//            i -= i;/*-=*/
-//            i *= i;/**=*/
-//            if (i == 0)
-//                i++;
-//            i /= i;/*/=*/
-//            i %= i;/*%=*/
-//            i &= i;/*&=*/
-//            i |= i;/*|=*/
-//            i ^= i;/*^=*/
-//            i <<= i;/*<<=*/
-//            i >>= i;/*>>=*/
+        ///// <summary>
+        ///// Test different operators
+        ///// </summary>
+        ///// <returns></returns>
+        public OPERATOR(): number {
+            var a: number[] = [1, 2, 3, 4,  implements , ];/*[] bug*/ // YES []
+            var i = a[1];/*[]*/
+            i = i + i - i * i / i % i & i | i ^ i;/*+ - * / % & | ^*/
+            var b = true && false || true ^ false;/*& | ^*/
+            b = !b;/*!*/
+            i = ~i;/*~i*/
+            b = i < (i -  continue ) && (i + 1) > i;/*< && >*/
+            var f = true ? 1 : 0;/*? :*/   // YES :
+            i++;/*++*/
+            i--;/*--*/
+            b = true && false || true;/*&& ||*/
+            i = i << 5;/*<<*/
+            i = i >> 5;/*>>*/
+            var j = i;
+            b = i == j && i != j && i <= j && i >= j;/*= == && != <= >=*/
+            i += <number>5.0;/*+=*/
+            i -= i;/*-=*/
+            i *= i;/**=*/
+            if (i == 0)
+                i++;
+            i /= i;/*/=*/
+            i %= i;/*%=*/
+            i &= i;/*&=*/
+            i |= i;/*|=*/
+            i ^= i;/*^=*/
+            i <<= i;/*<<=*/
+            i >>= i;/*>>=*/
 
-//            if (i == 0 && !b && f == 1)
-//                return 0;
-//            else return 1;
-//        }
+            if (i == 0 && !b && f == 1)
+                return 0;
+            else return 1;
+        }
 
-//    }
+    }
 
-//    interface IF {
-//        Foo <!-- ): boolean;
-//    }
+    interface IF {
+        Foo <!-- ): boolean;
+    }
 
-//    class CLASS implements IF {
+    class CLASS implements IF {
 
-//        public d = () =>  '  return 0; };
-//        public get Property() { return 0; }
-//        public Member() {
-//            return 0;
-//        }
-//        public Foo(): boolean {
-//            var myEvent = () => { return 1; };
-//            if (myEvent() == 1)
-//                return true;
-//            else
-//                return false;
-//        }
-//    }
+        public d = () =>  '  return 0; };
+        public get Property() { return 0; }
+        public Member() {
+            return 0;
+        }
+        public Foo(): boolean {
+            var myEvent = () => { return 1; };
+            if (myEvent() == 1)
+                return true;
+            else
+                return false;
+        }
+    }
 
 
-//    // todo: use these
-//    class A {
-//        public method1(val:number) {
-//            return val;
-//        }
-//        public method2() {
-//            return 2 * this.method1(2);
-//        }
-//    }
+    // todo: use these
+    class A {
+        public method1(val:number) {
+            return val;
+        }
+        public method2() {
+            return 2 * this.method1(2);
+        }
+    }
 
-//    class B extends A {
+    class B extends A {
 
-//        public method2() {
-//            return this.method1(2);
-//        }
-//    }
+        public method2() {
+            return this.method1(2);
+        }
+    }
 
-//    class Overloading {
+    class Overloading {
 
-//        private otherValue = 42;
+        private otherValue = 42;
 
-//        constructor(private value: number, public name: string) { }
+        constructor(private value: number, public name: string) { }
        
-//        public Overloads(value: string);
-//        public Overloads(value: string, ...rest: string[]) { }
+        public Overloads(value: string);
+        public Overloads(value: string, ...rest: string[]) { }
 
-//        public DefaultValue(value?: string = "Hello") { }
-//    }
-//}
+        public DefaultValue(value?: string = "Hello") { }
+    }
+}
 
-//enum Weekdays {
-//    Monday,
-//    Tuesday,
-//    Weekend,
-//}
+enum Weekdays {
+    Monday,
+    Tuesday,
+    Weekend,
+}
 
-//enum Fruit {
-//    Apple,
-//    Pear
-//}
+enum Fruit {
+    Apple,
+    Pear
+}
 
-//interface IDisposable {
-//    Dispose(): void;
-//}
+interface IDisposable {
+    Dispose(): void;
+}
 
-//TypeScriptAllInOne.Program.Main();
+TypeScriptAllInOne.Program.Main();
diff --git a/tests/cases/conformance/scanner/ecmascript3/scannerES3NumericLiteral1.ts b/tests/cases/conformance/scanner/ecmascript3/scannerES3NumericLiteral1.ts
deleted file mode 100644
index c227083464f..00000000000
--- a/tests/cases/conformance/scanner/ecmascript3/scannerES3NumericLiteral1.ts
+++ /dev/null
@@ -1 +0,0 @@
-0
\ No newline at end of file
diff --git a/tests/cases/conformance/scanner/ecmascript3/scannerES3NumericLiteral2.ts b/tests/cases/conformance/scanner/ecmascript3/scannerES3NumericLiteral2.ts
deleted file mode 100644
index a616ad491b1..00000000000
--- a/tests/cases/conformance/scanner/ecmascript3/scannerES3NumericLiteral2.ts
+++ /dev/null
@@ -1 +0,0 @@
-01
\ No newline at end of file
diff --git a/tests/cases/conformance/scanner/ecmascript3/scannerES3NumericLiteral3.ts b/tests/cases/conformance/scanner/ecmascript3/scannerES3NumericLiteral3.ts
deleted file mode 100644
index 4df9ec3e7f8..00000000000
--- a/tests/cases/conformance/scanner/ecmascript3/scannerES3NumericLiteral3.ts
+++ /dev/null
@@ -1 +0,0 @@
-01.0
\ No newline at end of file
diff --git a/tests/cases/conformance/scanner/ecmascript3/scannerES3NumericLiteral4.ts b/tests/cases/conformance/scanner/ecmascript3/scannerES3NumericLiteral4.ts
deleted file mode 100644
index 1405ebef530..00000000000
--- a/tests/cases/conformance/scanner/ecmascript3/scannerES3NumericLiteral4.ts
+++ /dev/null
@@ -1 +0,0 @@
-1e
\ No newline at end of file
diff --git a/tests/cases/conformance/scanner/ecmascript3/scannerES3NumericLiteral5.ts b/tests/cases/conformance/scanner/ecmascript3/scannerES3NumericLiteral5.ts
deleted file mode 100644
index 8757d5bc883..00000000000
--- a/tests/cases/conformance/scanner/ecmascript3/scannerES3NumericLiteral5.ts
+++ /dev/null
@@ -1 +0,0 @@
-1e0
\ No newline at end of file
diff --git a/tests/cases/conformance/scanner/ecmascript3/scannerES3NumericLiteral6.ts b/tests/cases/conformance/scanner/ecmascript3/scannerES3NumericLiteral6.ts
deleted file mode 100644
index 2ef6dce1b05..00000000000
--- a/tests/cases/conformance/scanner/ecmascript3/scannerES3NumericLiteral6.ts
+++ /dev/null
@@ -1 +0,0 @@
-1e+
\ No newline at end of file
diff --git a/tests/cases/conformance/scanner/ecmascript3/scannerES3NumericLiteral7.ts b/tests/cases/conformance/scanner/ecmascript3/scannerES3NumericLiteral7.ts
deleted file mode 100644
index e5f1cb60007..00000000000
--- a/tests/cases/conformance/scanner/ecmascript3/scannerES3NumericLiteral7.ts
+++ /dev/null
@@ -1 +0,0 @@
-1e+0
\ No newline at end of file
diff --git a/tests/cases/conformance/scanner/ecmascript5/scannerNumericLiteral1.ts b/tests/cases/conformance/scanner/ecmascript5/scannerNumericLiteral1.ts
index 23206bbe1f5..c227083464f 100644
--- a/tests/cases/conformance/scanner/ecmascript5/scannerNumericLiteral1.ts
+++ b/tests/cases/conformance/scanner/ecmascript5/scannerNumericLiteral1.ts
@@ -1,2 +1 @@
-// @target: ES5
 0
\ No newline at end of file
diff --git a/tests/cases/conformance/scanner/ecmascript5/scannerNumericLiteral2.ts b/tests/cases/conformance/scanner/ecmascript5/scannerNumericLiteral2.ts
index 60d12a43442..a616ad491b1 100644
--- a/tests/cases/conformance/scanner/ecmascript5/scannerNumericLiteral2.ts
+++ b/tests/cases/conformance/scanner/ecmascript5/scannerNumericLiteral2.ts
@@ -1,2 +1 @@
-// @target: ES5
 01
\ No newline at end of file
diff --git a/tests/cases/conformance/scanner/ecmascript5/scannerNumericLiteral3.ts b/tests/cases/conformance/scanner/ecmascript5/scannerNumericLiteral3.ts
index fda0822c2f3..4df9ec3e7f8 100644
--- a/tests/cases/conformance/scanner/ecmascript5/scannerNumericLiteral3.ts
+++ b/tests/cases/conformance/scanner/ecmascript5/scannerNumericLiteral3.ts
@@ -1,2 +1 @@
-// @target: ES5
 01.0
\ No newline at end of file
diff --git a/tests/cases/conformance/scanner/ecmascript5/scannerNumericLiteral4.ts b/tests/cases/conformance/scanner/ecmascript5/scannerNumericLiteral4.ts
index 092e6af6719..1405ebef530 100644
--- a/tests/cases/conformance/scanner/ecmascript5/scannerNumericLiteral4.ts
+++ b/tests/cases/conformance/scanner/ecmascript5/scannerNumericLiteral4.ts
@@ -1,2 +1 @@
-// @target: ES5
 1e
\ No newline at end of file
diff --git a/tests/cases/conformance/scanner/ecmascript5/scannerNumericLiteral5.ts b/tests/cases/conformance/scanner/ecmascript5/scannerNumericLiteral5.ts
index 9a9804b4f0e..8757d5bc883 100644
--- a/tests/cases/conformance/scanner/ecmascript5/scannerNumericLiteral5.ts
+++ b/tests/cases/conformance/scanner/ecmascript5/scannerNumericLiteral5.ts
@@ -1,2 +1 @@
-// @target: ES5
 1e0
\ No newline at end of file
diff --git a/tests/cases/conformance/scanner/ecmascript5/scannerNumericLiteral6.ts b/tests/cases/conformance/scanner/ecmascript5/scannerNumericLiteral6.ts
index 7ff2871b001..2ef6dce1b05 100644
--- a/tests/cases/conformance/scanner/ecmascript5/scannerNumericLiteral6.ts
+++ b/tests/cases/conformance/scanner/ecmascript5/scannerNumericLiteral6.ts
@@ -1,2 +1 @@
-// @target: ES5
 1e+
\ No newline at end of file
diff --git a/tests/cases/conformance/scanner/ecmascript5/scannerNumericLiteral7.ts b/tests/cases/conformance/scanner/ecmascript5/scannerNumericLiteral7.ts
index 2e62350d48c..e5f1cb60007 100644
--- a/tests/cases/conformance/scanner/ecmascript5/scannerNumericLiteral7.ts
+++ b/tests/cases/conformance/scanner/ecmascript5/scannerNumericLiteral7.ts
@@ -1,2 +1 @@
-// @target: ES5
 1e+0
\ No newline at end of file
diff --git a/tests/cases/conformance/scanner/ecmascript5/scannerNumericLiteral8.ts b/tests/cases/conformance/scanner/ecmascript5/scannerNumericLiteral8.ts
deleted file mode 100644
index 858e3eada0f..00000000000
--- a/tests/cases/conformance/scanner/ecmascript5/scannerNumericLiteral8.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-// @target: ES5
--03
\ No newline at end of file
diff --git a/tests/cases/conformance/scanner/ecmascript5/scannerNumericLiteral9.ts b/tests/cases/conformance/scanner/ecmascript5/scannerNumericLiteral9.ts
deleted file mode 100644
index cf187b83edf..00000000000
--- a/tests/cases/conformance/scanner/ecmascript5/scannerNumericLiteral9.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-// @target: ES5
-009
\ No newline at end of file
diff --git a/tests/cases/conformance/statements/tryStatements/invalidTryStatements2.ts b/tests/cases/conformance/statements/tryStatements/invalidTryStatements2.ts
index 6937e509845..de37313e92a 100644
--- a/tests/cases/conformance/statements/tryStatements/invalidTryStatements2.ts
+++ b/tests/cases/conformance/statements/tryStatements/invalidTryStatements2.ts
@@ -5,24 +5,5 @@ function fn() {
 
     catch(x) { } // error missing try
 
-    finally{ } // potential error; can be absorbed by the 'catch'
-}
-
-function fn2() {
-    finally { } // error missing try
-    catch (x) { } // error missing try
-
-    // no error
-    try {
-    }
-    finally {
-    }
-
-    // error missing try
-    finally {
-    }
-
-    // error missing try
-    catch (x) {
-    }
+    finally{ } // error missing try
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/types/members/duplicateStringIndexers.ts b/tests/cases/conformance/types/members/duplicateStringIndexers.ts
index 67e12d88017..e2d8def6a0c 100644
--- a/tests/cases/conformance/types/members/duplicateStringIndexers.ts
+++ b/tests/cases/conformance/types/members/duplicateStringIndexers.ts
@@ -1,33 +1,32 @@
 // it is an error to have duplicate index signatures of the same kind in a type
 
-module test {
-    interface Number {
-        [x: string]: string;
-        [x: string]: string;
-    }
-
-    interface String {
-        [x: string]: string;
-        [x: string]: string;
-    }
-
-    interface Array<T> {
-        [x: string]: T;
-        [x: string]: T;
-    }
-
-    class C {
-        [x: string]: string;
-        [x: string]: string;
-    }
-
-    interface I {
-        [x: string]: string;
-        [x: string]: string;
-    }
-
-    var a: {
-        [x: string]: string;
-        [x: string]: string;
-    }
+interface Number {
+    [x: string]: string;
+    [x: string]: string;
 }
+
+interface String {
+    [x: string]: string;
+    [x: string]: string;
+}
+
+interface Array<T> {
+    [x: string]: T;
+    [x: string]: T;
+}
+
+class C {
+    [x: string]: string;
+    [x: string]: string;
+}
+
+interface I {
+    [x: string]: string;
+    [x: string]: string;
+}
+
+var a: {
+    [x: string]: string;
+    [x: string]: string;
+}
+
diff --git a/tests/cases/conformance/types/namedTypes/classWithOnlyPublicMembersEquivalentToInterface.ts b/tests/cases/conformance/types/namedTypes/classWithOnlyPublicMembersEquivalentToInterface.ts
index 99c2c2e7584..ca3d1f39d1c 100644
--- a/tests/cases/conformance/types/namedTypes/classWithOnlyPublicMembersEquivalentToInterface.ts
+++ b/tests/cases/conformance/types/namedTypes/classWithOnlyPublicMembersEquivalentToInterface.ts
@@ -1,4 +1,3 @@
-// @target: es5
 // no errors expected
 
 class C {
diff --git a/tests/cases/conformance/types/namedTypes/classWithOnlyPublicMembersEquivalentToInterface2.ts b/tests/cases/conformance/types/namedTypes/classWithOnlyPublicMembersEquivalentToInterface2.ts
index 369451a54a2..60bbdc980a4 100644
--- a/tests/cases/conformance/types/namedTypes/classWithOnlyPublicMembersEquivalentToInterface2.ts
+++ b/tests/cases/conformance/types/namedTypes/classWithOnlyPublicMembersEquivalentToInterface2.ts
@@ -1,4 +1,3 @@
-// @target: es5
 // no errors expected
 
 class C {
diff --git a/tests/cases/conformance/types/specifyingTypes/typeQueries/typeQueryWithReservedWords.ts b/tests/cases/conformance/types/specifyingTypes/typeQueries/typeQueryWithReservedWords.ts
deleted file mode 100644
index 5fb9d2233f1..00000000000
--- a/tests/cases/conformance/types/specifyingTypes/typeQueries/typeQueryWithReservedWords.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-class Controller {
-    create() {
-    }
-    delete() {
-    }
-    var() {
-    }
-}
-
-interface IScope {
-    create: typeof Controller.prototype.create;  
-    delete: typeof Controller.prototype.delete;  // Should not error
-    var: typeof Controller.prototype.var;        // Should not error
-}
diff --git a/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembers.ts b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembers.ts
new file mode 100644
index 00000000000..d7a94cc8629
--- /dev/null
+++ b/tests/cases/conformance/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembers.ts
@@ -0,0 +1,85 @@
+// members N and M of types S and T have the same name, same accessibility, same optionality, and N is assignable M
+// no errors expected
+
+module SimpleTypes {
+    class S { foo: string; }
+    class T { foo: string; }
+    var s: S;
+    var t: T;
+
+    interface S2 { foo: string; }
+    interface T2 { foo: string; }
+    var s2: S2;
+    var t2: T2;
+
+    var a: { foo: string; }
+    var b: { foo: string; }
+
+    var a2 = { foo: '' };
+    var b2 = { foo: '' };
+
+    s = t;
+    t = s;
+    s = s2;
+    s = a2;
+
+    s2 = t2;
+    t2 = s2;
+    s2 = t;
+    s2 = b;
+    s2 = a2;
+
+    a = b;
+    b = a;
+    a = s;
+    a = s2;
+    a = a2;
+
+    a2 = b2;
+    b2 = a2;
+    a2 = b;
+    a2 = t2;
+    a2 = t;
+}
+
+module ObjectTypes {
+    class S { foo: S; }
+    class T { foo: T; }
+    var s: S;
+    var t: T;
+
+    interface S2 { foo: S2; }
+    interface T2 { foo: T2; }
+    var s2: S2;
+    var t2: T2;
+
+    var a: { foo: typeof a; }
+    var b: { foo: typeof b; }
+
+    var a2 = { foo: a2 };
+    var b2 = { foo: b2 };
+
+    s = t;
+    t = s;
+    s = s2;
+    s = a2;
+
+    s2 = t2;
+    t2 = s2;
+    s2 = t;
+    s2 = b;
+    s2 = a2;
+
+    a = b;
+    b = a;
+    a = s;
+    a = s2;
+    a = a2;
+
+    a2 = b2;
+    b2 = a2;
+    a2 = b;
+    a2 = t2;
+    a2 = t;
+
+}
\ No newline at end of file

From 828a1cd06595587bb72b09f593cdf8a612cd518a Mon Sep 17 00:00:00 2001
From: Jason Freeman <jfreeman@microsoft.com>
Date: Mon, 25 Aug 2014 10:36:12 -0700
Subject: [PATCH 02/11] More type baseline changes

---
 src/compiler/checker.ts                       |    35 +-
 src/harness/compilerRunner.ts                 |     8 +
 src/harness/typeWriter.ts                     |    10 +-
 ...FunctionWithTheSameNameAndCommonRoot.types |     2 +-
 ...eAndAmbientWithSameNameAndCommonRoot.types |    16 +-
 ...mbientClassWithSameNameAndCommonRoot.types |    16 +-
 ...FunctionWithTheSameNameAndCommonRoot.types |     2 +-
 ...AndNonExportedFunctionThatShareAName.types |    10 +-
 ...iableAndNonExportedVarThatShareAName.types |     6 +-
 ...umAndModuleWithSameNameAndCommonRoot.types |     8 +-
 ...ExtendsInterfaceWithInaccessibleType.types |     2 +-
 ...assHeritageListMemberTypeAnnotations.types |     2 +-
 ...cessibleTypeInIndexerTypeAnnotations.types |     2 +-
 ...essibleTypeInTypeParameterConstraint.types |     4 +-
 ...esInParameterAndReturnTypeAnnotation.types |     2 +-
 ...ssibleTypesInParameterTypeAnnotation.types |     2 +-
 ...ccessibleTypesInReturnTypeAnnotation.types |     2 +-
 ...assHeritageListMemberTypeAnnotations.types |     2 +-
 ...essibleTypeInTypeParameterConstraint.types |     2 +-
 ...hAccessibleTypesOnItsExportedMembers.types |     6 +-
 ...cessibleTypesInMemberTypeAnnotations.types |     2 +-
 ...peWithInaccessibleTypeAsTypeArgument.types |     6 +-
 ...leWithAccessibleTypeInTypeAnnotation.types |     2 +-
 ...WithInaccessibleTypeInTypeAnnotation.types |     2 +-
 ...leWithSameNameAndDifferentCommonRoot.types |    14 +-
 ...duleAndEnumWithSameNameAndCommonRoot.types |     8 +-
 ...edAndNonExportedClassesOfTheSameName.types |    34 +-
 ...ndNonExportedInterfacesOfTheSameName.types |    44 +-
 ...AndNonExportedLocalVarsOfTheSameName.types |    50 +-
 ...hWithExportedInterfacesOfTheSameName.types |    56 +-
 ...EachWithExportedModulesOfTheSameName.types |    30 +-
 ...ithTheSameNameAndDifferentCommonRoot.types |    30 +-
 ...ulesWithTheSameNameAndSameCommonRoot.types |    50 +-
 .../reference/acceptableAlias1.types          |     4 +-
 .../additionOperatorWithAnyAndEveryType.types |     4 +-
 .../reference/aliasInaccessibleModule.types   |     2 +-
 .../reference/aliasInaccessibleModule2.types  |     8 +-
 .../reference/aliasUsageInArray.types         |    24 +-
 .../aliasUsageInFunctionExpression.types      |    20 +-
 .../aliasUsageInGenericFunction.types         |    24 +-
 .../aliasUsageInIndexerOfClass.types          |    20 +-
 .../reference/aliasUsageInObjectLiteral.types |    42 +-
 .../reference/aliasUsageInOrExpression.types  |    32 +-
 ...asUsageInTypeArgumentOfExtendsClause.types |    18 +-
 .../reference/aliasUsageInVarAssignment.types |    18 +-
 .../reference/aliasUsedAsNameValue.types      |    10 +-
 .../reference/ambientDeclarations.types       |    12 +-
 .../ambientEnumElementInitializer6.types      |     2 +-
 ...lModuleWithInternalImportDeclaration.types |    18 +-
 ...duleWithoutInternalImportDeclaration.types |    10 +-
 .../baselines/reference/ambientFundule.types  |     2 +-
 .../reference/ambientModuleExports.types      |    28 +-
 ...oduleWithClassDeclarationWithExtends.types |     2 +-
 .../baselines/reference/ambientModules.types  |     8 +-
 .../amdImportAsPrimaryExpression.types        |    12 +-
 .../amdImportNotAsPrimaryExpression.types     |    28 +-
 tests/baselines/reference/anonterface.types   |    12 +-
 .../anyAssignabilityInInheritance.types       |     4 +-
 ...argumentsUsedInObjectLiteralProperty.types |     2 +-
 .../reference/arrayAssignmentTest6.types      |     2 +-
 tests/baselines/reference/arrayAugment.types  |     2 +-
 .../reference/arrayBestCommonTypes.types      |     6 +-
 tests/baselines/reference/arrayConcat2.types  |     2 +-
 .../reference/arrayConstructors1.types        |    12 +-
 tests/baselines/reference/arrayLiteral.types  |     8 +-
 tests/baselines/reference/arrayLiterals.types |     4 +-
 .../reference/arrayOfExportedClass.types      |     2 +-
 ...ayTypeInSignatureOfInterfaceAndClass.types |    12 +-
 .../arrowFunctionInExpressionStatement2.types |     2 +-
 tests/baselines/reference/assign1.types       |     2 +-
 .../assignmentCompatWithCallSignatures3.types |    22 +-
 ...gnmentCompatWithConstructSignatures3.types |    22 +-
 .../assignmentCompatWithObjectMembers.js      |     2 +
 .../assignmentCompatWithObjectMembers.types   |     8 +-
 .../reference/assignmentCompatability1.types  |    10 +-
 .../reference/assignmentCompatability2.types  |    10 +-
 .../reference/assignmentCompatability3.types  |    10 +-
 .../reference/assignmentCompatability4.types  |    10 +-
 .../reference/assignmentCompatability5.types  |    14 +-
 .../reference/assignmentCompatability6.types  |    14 +-
 .../reference/assignmentCompatability7.types  |    14 +-
 .../reference/assignmentCompatability8.types  |    14 +-
 .../reference/assignmentCompatability9.types  |    14 +-
 .../reference/augmentedTypesClass3.types      |     6 +-
 .../augmentedTypesExternalModule1.types       |     2 +-
 .../reference/augmentedTypesModules3b.types   |    12 +-
 .../reference/augmentedTypesModules4.types    |    14 +-
 .../bestCommonTypeWithContextualTyping.types  |     2 +-
 .../binopAssignmentShouldHaveType.types       |     2 +-
 .../bitwiseNotOperatorWithBooleanType.types   |     8 +-
 .../bitwiseNotOperatorWithNumberType.types    |     8 +-
 .../bitwiseNotOperatorWithStringType.types    |     8 +-
 ...SignatureAssignabilityInInheritance2.types |    22 +-
 ...SignatureAssignabilityInInheritance5.types |    22 +-
 ...WithoutReturnTypeAnnotationInference.types |    10 +-
 .../reference/chainedImportAlias.types        |     8 +-
 .../reference/circularImportAlias.types       |    20 +-
 ...rationMergedInModuleWithContinuation.types |     6 +-
 .../reference/classExtendingClass.types       |    12 +-
 .../classExtendingQualifiedName2.types        |     2 +-
 .../classMethodWithKeywordName1.types         |     2 +-
 .../reference/classWithPublicProperty.types   |     6 +-
 .../cloduleAcrossModuleDefinitions.types      |    12 +-
 .../reference/cloduleAndTypeParameters.types  |     4 +-
 tests/baselines/reference/cloduleTest1.types  |     2 +-
 .../cloduleWithRecursiveReference.types       |    10 +-
 ...CodeGenModuleWithConstructorChildren.types |     6 +-
 ...nCodeGenModuleWithEnumMemberConflict.types |     2 +-
 ...ionCodeGenModuleWithFunctionChildren.types |     6 +-
 ...CodeGenModuleWithMemberClassConflict.types |    28 +-
 ...GenModuleWithMemberInterfaceConflict.types |    10 +-
 ...isionCodeGenModuleWithMemberVariable.types |     2 +-
 ...isionCodeGenModuleWithMethodChildren.types |     8 +-
 ...isionCodeGenModuleWithModuleChildren.types |    22 +-
 ...sionCodeGenModuleWithModuleReopening.types |    48 +-
 ...lisionCodeGenModuleWithPrivateMember.types |    10 +-
 ...llisionCodeGenModuleWithUnicodeNames.types |    10 +-
 .../collisionExportsRequireAndModule.types    |     8 +-
 ...xportsRequireAndUninstantiatedModule.types |     4 +-
 .../commentBeforeStaticMethod1.types          |     2 +-
 .../reference/commentOnStaticMember1.types    |     2 +-
 .../reference/commentsClassMembers.js         |     4 +-
 .../reference/commentsClassMembers.types      |    60 +-
 .../reference/commentsExternalModules.types   |    98 +-
 .../reference/commentsExternalModules2.types  |    98 +-
 .../reference/commentsExternalModules3.types  |    98 +-
 .../reference/commentsFormatting.types        |     2 +-
 .../baselines/reference/commentsModules.types |   146 +-
 .../reference/commentsMultiModuleMultiFile.js |    25 -
 .../commentsMultiModuleSingleFile.types       |    16 +-
 .../commentsOnReturnStatement1.types          |     2 +-
 .../reference/commentsTypeParameters.types    |     4 +-
 .../reference/commentsdoNotEmitComments.types |     2 +-
 .../reference/commentsemitComments.types      |     2 +-
 .../commonJSImportAsPrimaryExpression.types   |     8 +-
 ...commonJSImportNotAsPrimaryExpression.types |    28 +-
 .../reference/complexClassRelationships.types |     8 +-
 .../reference/compoundVarDecl1.types          |     2 +-
 ...SignatureAssignabilityInInheritance2.types |    22 +-
 ...SignatureAssignabilityInInheritance5.types |    22 +-
 ...nstructorArgWithGenericCallSignature.types |    22 +-
 .../constructorHasPrototypeProperty.types     |     4 +-
 .../reference/contextualTypeAny.types         |     2 +-
 tests/baselines/reference/contextualTyping.js |    14 +-
 .../reference/contextualTyping.sourcemap.txt  |  1331 +-
 tests/baselines/reference/covariance1.types   |     6 +-
 .../crashInresolveReturnStatement.types       |     6 +-
 .../reference/cyclicModuleImport.types        |     4 +-
 ...ternalModuleWithSingleExportedModule.types |    10 +-
 ...WithStaticMethodReturningConstructor.types |     2 +-
 ...ExportAssignmentImportInternalModule.types |    16 +-
 ...leExportAssignmentOfGenericInterface.types |     8 +-
 .../reference/declFileExportImportChain.types |    24 +-
 .../declFileExportImportChain2.types          |    20 +-
 .../reference/declFileForExportedImport.types |    10 +-
 .../reference/declFileGenericType.types       |    90 +-
 .../reference/declFileGenericType2.types      |    76 +-
 ...FileImportModuleWithExportAssignment.types |    28 +-
 ...FileImportedTypeUseInTypeArgPosition.types |     6 +-
 .../reference/declFileInternalAliases.types   |    26 +-
 ...uleAssignmentInObjectLiteralProperty.types |    18 +-
 .../declFileModuleContinuation.types          |    12 +-
 ...clFileModuleWithPropertyOfTypeModule.types |     2 +-
 .../declFileTypeofInAnonymousType.types       |    58 +-
 .../reference/declFileTypeofModule.types      |     4 +-
 ...tingWithClassReferredByExtendsClause.types |    28 +-
 ...lauseThatHasItsContainerNameConflict.types |    16 +-
 ...lModuleNameConflictsInExtendsClause1.types |    18 +-
 ...lModuleNameConflictsInExtendsClause2.types |    24 +-
 ...lModuleNameConflictsInExtendsClause3.types |    26 +-
 tests/baselines/reference/declInput4.types    |     2 +-
 ...array-types-from-generic-array-usage.types |     2 +-
 .../declarationEmit_nameConflicts2.js         |     1 +
 .../declarationEmit_nameConflicts2.types      |    40 +-
 .../declarationEmit_nameConflicts3.js         |     1 +
 .../declarationEmit_nameConflicts3.types      |    48 +-
 .../reference/declareDottedExtend.types       |    14 +-
 ...ernalModuleWithExportAssignedFundule.types |     4 +-
 .../declareFileExportAssignment.types         |    16 +-
 .../decrementOperatorWithAnyOtherType.types   |     2 +-
 .../decrementOperatorWithNumberType.types     |     2 +-
 .../deleteOperatorWithBooleanType.types       |     8 +-
 .../deleteOperatorWithNumberType.types        |     8 +-
 .../deleteOperatorWithStringType.types        |     8 +-
 .../reference/dependencyViaImportAlias.types  |     8 +-
 .../reference/dottedModuleName2.types         |    40 +-
 .../reference/duplicateAnonymousInners1.types |     4 +-
 .../duplicateAnonymousModuleClasses.types     |    14 +-
 ...duplicateOverloadInTypeAugmentation1.types |     4 +-
 .../reference/duplicateVariablesByScope.types |     2 +-
 .../emitMemberAccessExpression.types          |    12 +-
 tests/baselines/reference/enumDecl1.types     |     2 +-
 .../reference/enumFromExternalModule.types    |    14 +-
 tests/baselines/reference/enumMerging.types   |    40 +-
 .../enumsWithMultipleDeclarations3.types      |     2 +-
 tests/baselines/reference/es6ClassTest7.types |     4 +-
 tests/baselines/reference/es6ClassTest8.types |    42 +-
 .../reference/escapedIdentifiers.types        |     4 +-
 ...veryTypeWithAnnotationAndInitializer.types |    16 +-
 .../reference/everyTypeWithInitializer.types  |    16 +-
 .../exportAssignClassAndModule.types          |    16 +-
 .../reference/exportAssignValueAndType.types  |     2 +-
 .../exportAssignedTypeAsTypeAnnotation.types  |     4 +-
 .../exportAssignmentCircularModules.types     |    18 +-
 .../reference/exportAssignmentClass.types     |    10 +-
 .../reference/exportAssignmentEnum.types      |    26 +-
 .../reference/exportAssignmentError.types     |     4 +-
 .../reference/exportAssignmentFunction.types  |     4 +-
 .../exportAssignmentGenericType.types         |    10 +-
 .../reference/exportAssignmentInterface.types |     6 +-
 .../exportAssignmentInternalModule.types      |     6 +-
 .../exportAssignmentMergedInterface.types     |    14 +-
 .../exportAssignmentMergedModule.types        |    28 +-
 .../exportAssignmentOfGenericType1.types      |     4 +-
 .../exportAssignmentTopLevelClodule.types     |    12 +-
 .../exportAssignmentTopLevelEnumdule.types    |     4 +-
 .../exportAssignmentTopLevelFundule.types     |     4 +-
 .../exportAssignmentTopLevelIdentifier.types  |     6 +-
 .../reference/exportAssignmentVariable.types  |     2 +-
 ...nmentWithImportStatementPrivacyError.types |    16 +-
 tests/baselines/reference/exportCodeGen.types |    16 +-
 .../reference/exportEqualCallable.types       |     2 +-
 .../reference/exportEqualNamespaces.types     |     4 +-
 tests/baselines/reference/exportImport.types  |    14 +-
 .../reference/exportImportAlias.types         |    64 +-
 .../reference/exportImportAndClodule.types    |    20 +-
 .../reference/exportImportMultipleFiles.types |    20 +-
 .../exportImportNonInstantiatedModule.types   |    10 +-
 .../exportImportNonInstantiatedModule2.types  |     4 +-
 .../reference/exportPrivateType.types         |     2 +-
 tests/baselines/reference/extBaseClass1.types |     8 +-
 ...ndingClassFromAliasAndUsageInIndexer.types |    36 +-
 .../reference/externModuleClobber.types       |    28 +-
 .../reference/externalModuleAssignToVar.types |    44 +-
 ...fImportDeclarationWithExportModifier.types |     8 +-
 .../reference/externalModuleResolution.types  |     6 +-
 .../reference/externalModuleResolution2.types |     6 +-
 tests/baselines/reference/fatArrowSelf.types  |    16 +-
 tests/baselines/reference/forInModule.types   |     2 +-
 tests/baselines/reference/forStatements.types |    16 +-
 .../forStatementsMultipleValidDecl.types      |     2 +-
 tests/baselines/reference/funcdecl.types      |     6 +-
 tests/baselines/reference/functionCall5.types |    14 +-
 .../functionInIfStatementInModule.types       |     2 +-
 .../reference/functionMergedWithModule.types  |    12 +-
 .../reference/functionOverloads6.types        |     6 +-
 ...ExportedClassIsUsedBeforeDeclaration.types |    12 +-
 ...fFunctionWithoutReturnTypeAnnotation.types |     2 +-
 .../funduleUsedAcrossFileBoundary.types       |    10 +-
 .../reference/generatedContextualTyping.types |   110 +-
 .../generativeRecursionWithTypeOf.types       |     4 +-
 ...nericArgumentCallSigAssignmentCompat.types |    20 +-
 .../genericCallWithObjectLiteralArgs.types    |     4 +-
 ...hOverloadedConstructorTypedArguments.types |     4 +-
 ...WithOverloadedFunctionTypedArguments.types |     4 +-
 .../genericCallbacksAndClassHierarchy.types   |     2 +-
 ...ingGenericInterfaceFromAnotherModule.types |     4 +-
 ...assPropertyInheritanceSpecialization.types |    52 +-
 .../reference/genericClassStaticMethod.types  |     4 +-
 ...lassWithFunctionTypedMemberArguments.types |     4 +-
 ...lassWithObjectTypeArgsAndConstraints.types |     4 +-
 .../genericClassWithStaticFactory.types       |     2 +-
 .../reference/genericClassesInModule.types    |    12 +-
 .../reference/genericCloduleInModule.types    |    12 +-
 .../genericConstraintDeclaration.types        |     2 +-
 ...ericConstraintOnExtendedBuiltinTypes.types |    12 +-
 ...ricConstraintOnExtendedBuiltinTypes2.types |    12 +-
 ...ericFunctionsWithOptionalParameters1.types |     2 +-
 .../reference/genericInference2.types         |    58 +-
 .../genericObjectLitReturnType.types          |     2 +-
 .../reference/genericOfACloduleType1.types    |    10 +-
 .../reference/genericOfACloduleType2.types    |    12 +-
 ...cRecursiveImplicitConstructorErrors2.types |     2 +-
 .../genericStaticAnyTypeFunction.types        |    10 +-
 .../genericTypeArgumentInference1.types       |    36 +-
 .../genericTypeWithCallableMembers.js         |     2 +-
 .../reference/getterSetterNonAccessor.types   |     4 +-
 tests/baselines/reference/global.types        |     6 +-
 .../heterogeneousArrayLiterals.types          |    16 +-
 .../reference/ifDoWhileStatements.types       |     4 +-
 .../reference/implementArrayInterface.types   |     2 +-
 .../reference/importAliasIdentifiers.types    |    42 +-
 .../reference/importAliasWithDottedName.types |     8 +-
 ...mportAndVariableDeclarationConflict2.types |     4 +-
 ...clWithExportModifierInAmbientContext.types |     6 +-
 .../importDeclarationUsedAsTypeQuery.types    |     6 +-
 .../reference/importImportOnlyModule.types    |     8 +-
 .../reference/importInTypePosition.types      |    22 +-
 .../importOnAliasedIdentifiers.types          |    20 +-
 .../reference/importShadowsGlobalName.types   |     4 +-
 .../reference/importStatements.types          |    56 +-
 .../reference/importUsedInExtendsList1.types  |     4 +-
 .../import_reference-exported-alias.types     |    22 +-
 .../import_reference-to-type-alias.types      |    18 +-
 ...ferenecing-aliased-type-throug-array.types |     8 +-
 ...referencing-an-imported-module-alias.types |    16 +-
 .../importedModuleClassNameClash.types        |     6 +-
 .../incrementOperatorWithAnyOtherType.types   |     2 +-
 .../incrementOperatorWithNumberType.types     |     2 +-
 tests/baselines/reference/indexIntoEnum.types |     2 +-
 ...erentialTypingWithFunctionTypeNested.types |     2 +-
 ...ngWithFunctionTypeSyntacticScenarios.types |     2 +-
 ...heritanceOfGenericConstructorMethod2.types |    40 +-
 ...nheritanceStaticFuncOverridingMethod.types |     4 +-
 ...aticFuncOverridingPropertyOfFuncType.types |     2 +-
 ...icFunctionOverridingInstanceProperty.types |     2 +-
 tests/baselines/reference/innerAliases2.types |    28 +-
 .../reference/innerBoundLambdaEmit.types      |     8 +-
 tests/baselines/reference/innerExtern.types   |     6 +-
 tests/baselines/reference/innerFunc.types     |     2 +-
 .../instanceAndStaticDeclarations1.types      |     2 +-
 .../instanceOfInExternalModules.types         |     8 +-
 .../reference/instantiatedModule.types        |   102 +-
 .../interMixingModulesInterfaces0.types       |    18 +-
 .../interMixingModulesInterfaces1.types       |    18 +-
 .../interMixingModulesInterfaces2.types       |     8 +-
 .../interMixingModulesInterfaces3.types       |     8 +-
 .../interMixingModulesInterfaces4.types       |    12 +-
 .../interMixingModulesInterfaces5.types       |    12 +-
 .../reference/interfaceInReopenedModule.types |     4 +-
 .../interfaceWithPropertyOfEveryType.types    |     6 +-
 .../reference/internalAliasClass.types        |    20 +-
 ...liasClassInsideLocalModuleWithExport.types |    20 +-
 ...sClassInsideLocalModuleWithoutExport.types |     8 +-
 ...sClassInsideTopLevelModuleWithExport.types |    14 +-
 ...assInsideTopLevelModuleWithoutExport.types |    14 +-
 .../reference/internalAliasEnum.types         |    18 +-
 ...AliasEnumInsideLocalModuleWithExport.types |    18 +-
 ...asEnumInsideLocalModuleWithoutExport.types |    18 +-
 ...asEnumInsideTopLevelModuleWithExport.types |    16 +-
 ...numInsideTopLevelModuleWithoutExport.types |    16 +-
 .../reference/internalAliasFunction.types     |    14 +-
 ...sFunctionInsideLocalModuleWithExport.types |    14 +-
 ...nctionInsideLocalModuleWithoutExport.types |    14 +-
 ...nctionInsideTopLevelModuleWithExport.types |    12 +-
 ...ionInsideTopLevelModuleWithoutExport.types |    12 +-
 .../internalAliasInitializedModule.types      |    18 +-
 ...zedModuleInsideLocalModuleWithExport.types |    18 +-
 ...ModuleInsideLocalModuleWithoutExport.types |    18 +-
 ...ModuleInsideTopLevelModuleWithExport.types |    16 +-
 ...uleInsideTopLevelModuleWithoutExport.types |    16 +-
 .../reference/internalAliasInterface.types    |     8 +-
 ...InterfaceInsideLocalModuleWithExport.types |     8 +-
 ...erfaceInsideLocalModuleWithoutExport.types |     8 +-
 ...erfaceInsideTopLevelModuleWithExport.types |     6 +-
 ...aceInsideTopLevelModuleWithoutExport.types |     6 +-
 .../internalAliasUninitializedModule.types    |     8 +-
 ...zedModuleInsideLocalModuleWithExport.types |     8 +-
 ...ModuleInsideLocalModuleWithoutExport.types |     8 +-
 ...ModuleInsideTopLevelModuleWithExport.types |     6 +-
 ...uleInsideTopLevelModuleWithoutExport.types |     6 +-
 .../reference/internalAliasVar.types          |     6 +-
 ...lAliasVarInsideLocalModuleWithExport.types |     6 +-
 ...iasVarInsideLocalModuleWithoutExport.types |     6 +-
 ...iasVarInsideTopLevelModuleWithExport.types |     4 +-
 ...VarInsideTopLevelModuleWithoutExport.types |     4 +-
 .../internalAliasWithDottedNameEmit.types     |    12 +-
 ...lassNotReferencingInstanceNoConflict.types |     6 +-
 ...lassNotReferencingInstanceNoConflict.types |     6 +-
 ...duleNotReferencingInstanceNoConflict.types |     4 +-
 .../reference/invalidUndefinedValues.types    |     2 +-
 tests/baselines/reference/ipromise2.types     |    18 +-
 tests/baselines/reference/ipromise4.types     |    28 +-
 .../reference/library_ArraySlice.types        |     6 +-
 tests/baselines/reference/listFailure.types   |     2 +-
 .../localAliasExportAssignment.types          |     2 +-
 .../localImportNameVsGlobalName.types         |     6 +-
 .../logicalNotOperatorWithBooleanType.types   |     8 +-
 .../logicalNotOperatorWithNumberType.types    |     8 +-
 .../logicalNotOperatorWithStringType.types    |     8 +-
 .../memberAccessMustUseModuleInstances.types  |    16 +-
 .../memberFunctionsWithPublicOverloads.types  |    28 +-
 .../reference/mergeThreeInterfaces.types      |     2 +-
 .../reference/mergeThreeInterfaces2.types     |    16 +-
 .../reference/mergeTwoInterfaces.types        |     2 +-
 .../reference/mergeTwoInterfaces2.types       |    12 +-
 .../reference/mergedDeclarations1.types       |    10 +-
 .../reference/mergedDeclarations4.types       |    14 +-
 .../mergedInterfacesWithMultipleBases.types   |     2 +-
 .../mergedInterfacesWithMultipleBases2.types  |     2 +-
 .../mergedModuleDeclarationCodeGen2.types     |    14 +-
 .../mergedModuleDeclarationCodeGen3.types     |    10 +-
 .../mergedModuleDeclarationCodeGen4.types     |    16 +-
 .../mergedModuleDeclarationCodeGen5.types     |    12 +-
 ...duleDeclarationWithSharedExportedVar.types |     4 +-
 .../methodContainingLocalFunction.types       |     2 +-
 .../missingImportAfterModuleImport.types      |     2 +-
 .../mixingFunctionAndAmbientModule1.types     |    22 +-
 .../reference/modFunctionCrash.types          |     6 +-
 .../moduleAliasAsFunctionArgument.types       |     6 +-
 .../reference/moduleAliasInterface.types      |    68 +-
 .../moduleAndInterfaceSharingName.types       |    10 +-
 .../moduleAndInterfaceSharingName3.types      |    10 +-
 .../moduleAndInterfaceSharingName4.types      |     8 +-
 .../reference/moduleCodeGenTest3.types        |     2 +-
 .../reference/moduleCodegenTest4.types        |     2 +-
 .../reference/moduleIdentifiers.types         |     2 +-
 ...oduleImportedForTypeArgumentPosition.types |     4 +-
 .../moduleMemberWithoutTypeAnnotation1.types  |    16 +-
 .../moduleMemberWithoutTypeAnnotation2.types  |     4 +-
 tests/baselines/reference/moduleMerge.types   |     4 +-
 tests/baselines/reference/moduleNoEmit.types  |     2 +-
 .../reference/moduleOuterQualification.types  |     2 +-
 .../reference/moduleRedifinitionErrors.types  |     2 +-
 .../moduleReopenedTypeOtherBlock.types        |     4 +-
 .../moduleReopenedTypeSameBlock.types         |     4 +-
 .../reference/moduleScopingBug.types          |     4 +-
 .../reference/moduleUnassignedVariable.types  |     2 +-
 .../moduleVariableArrayIndexer.types          |     2 +-
 .../baselines/reference/moduleVariables.types |     6 +-
 .../reference/moduleVisibilityTest1.types     |    56 +-
 .../moduleWithStatementsOfEveryKind.types     |     8 +-
 .../reference/moduleWithTryStatement1.types   |     2 +-
 .../reference/multiModuleClodule1.types       |    12 +-
 .../reference/multiModuleFundule1.types       |     8 +-
 tests/baselines/reference/nameCollision.types |    18 +-
 .../reference/nameDelimitedBySlashes.types    |     4 +-
 .../reference/nameWithRelativePaths.types     |    22 +-
 .../namedFunctionExpressionInModule.types     |     2 +-
 tests/baselines/reference/namespaces1.types   |    10 +-
 tests/baselines/reference/namespaces2.types   |    20 +-
 .../negateOperatorWithAnyOtherType.types      |     8 +-
 .../negateOperatorWithBooleanType.types       |     8 +-
 .../negateOperatorWithNumberType.types        |     8 +-
 .../negateOperatorWithStringType.types        |     8 +-
 .../reference/nestedModulePrivateAccess.types |     4 +-
 tests/baselines/reference/nestedModules.types |    32 +-
 tests/baselines/reference/nestedSelf.types    |     2 +-
 tests/baselines/reference/newArrays.types     |     4 +-
 .../reference/noConstraintInReturnType1.types |     2 +-
 .../reference/nonInstantiatedModule.types     |    14 +-
 ...ullIsSubtypeOfEverythingButUndefined.types |     4 +-
 .../reference/objectLiteralIndexers.types     |    12 +-
 ...ctTypeWithStringNamedNumericProperty.types |     2 +-
 ...CallSignaturesDifferingByConstraints.types |    18 +-
 ...ructSignaturesDifferingByConstraints.types |    16 +-
 .../overloadEquivalenceWithStatics.types      |     6 +-
 .../overloadResolutionOverNonCTLambdas.types  |     2 +-
 ...overloadResolutionOverNonCTObjectLit.types |     2 +-
 ...overloadedStaticMethodSpecialization.types |     6 +-
 .../parserAccessibilityAfterStatic11.types    |     2 +-
 .../parserAccessibilityAfterStatic14.types    |     2 +-
 .../parserFunctionDeclaration8.types          |     2 +-
 .../reference/parserModuleDeclaration11.types |    10 +-
 .../reference/partiallyAmbientClodule.types   |     2 +-
 .../reference/partiallyAmbientFundule.types   |     2 +-
 .../plusOperatorWithBooleanType.types         |     8 +-
 .../plusOperatorWithNumberType.types          |     8 +-
 .../plusOperatorWithStringType.types          |     8 +-
 .../prespecializedGenericMembers1.types       |     2 +-
 ...ivacyCheckAnonymousFunctionParameter.types |     2 +-
 ...vacyCheckAnonymousFunctionParameter2.types |     4 +-
 ...ssignmentOnExportedGenericInterface1.types |     6 +-
 ...ssignmentOnExportedGenericInterface2.types |     2 +-
 ...ModuleExportAssignmentOfGenericClass.types |     2 +-
 ...ivacyCheckTypeOfInvisibleModuleError.types |     4 +-
 tests/baselines/reference/privacyClass.types  |     4 +-
 tests/baselines/reference/privacyFunc.types   |     2 +-
 .../baselines/reference/privacyGloClass.types |     2 +-
 .../baselines/reference/privacyGloFunc.types  |     4 +-
 .../reference/privacyGloInterface.types       |     2 +-
 tests/baselines/reference/privacyGloVar.types |     2 +-
 .../reference/privacyInterface.types          |     4 +-
 ...calInternalReferenceImportWithExport.types |   424 +-
 ...InternalReferenceImportWithoutExport.types |   424 +-
 ...elAmbientExternalModuleImportWithExport.js |     2 -
 ...velInternalReferenceImportWithExport.types |   214 +-
 ...InternalReferenceImportWithoutExport.types |   214 +-
 tests/baselines/reference/privacyVar.types    |     4 +-
 .../reference/privateInstanceVisibility.types |     2 +-
 .../propertyNamesWithStringLiteral.types      |     2 +-
 ...tions-entity-names-referencing-a-var.types |     4 +-
 .../reference/reboundBaseClassSymbol.types    |     2 +-
 tests/baselines/reference/rectype.types       |     2 +-
 ...nstantiationsWithDefaultConstructors.types |    10 +-
 .../reference/recursiveCloduleReference.types |    10 +-
 ...eExportAssignmentAndFindAliasedType7.types |    10 +-
 .../recursiveFunctionTypes.errors.txt         |     2 +-
 .../reference/recursiveFunctionTypes1.types   |     6 +-
 ...recursiveIdenticalOverloadResolution.types |     2 +-
 tests/baselines/reference/recursiveMods.types |     4 +-
 .../reference/recursiveObjectLiteral.types    |     2 +-
 ...elySpecializedConstructorDeclaration.types |     8 +-
 .../reference/requireEmitSemicolon.types      |    24 +-
 ...sDeclarationWhenInBaseTypeResolution.types | 11450 ++++++++--------
 .../returnTypeParameterWithModules.types      |    18 +-
 .../reference/reuseInnerModuleMember.types    |     6 +-
 .../scopeResolutionIdentifiers.types          |     8 +-
 tests/baselines/reference/separate1-2.types   |     2 +-
 ...nParameterReferencedInObjectLiteral1.types |     2 +-
 .../sourceMap-FileWithComments.types          |     8 +-
 .../sourceMap-StringLiteralWithNewLine.types  |     2 +-
 .../sourceMapValidationClasses.types          |     4 +-
 .../reference/sourceMapValidationImport.types |    22 +-
 .../reference/sourceMapValidationModule.types |     6 +-
 .../sourceMapValidationWithComments.types     |     2 +-
 ...ipleFilesWithFileEndingWithInterface.types |     4 +-
 .../sourcemapValidationDuplicateNames.types   |     4 +-
 .../specializationOfExportedClass.types       |    10 +-
 .../reference/staticAndMemberFunctions.types  |     2 +-
 ...staticAndNonStaticPropertiesSameName.types |     2 +-
 .../baselines/reference/staticFactory1.types  |     6 +-
 tests/baselines/reference/staticGetter2.types |     2 +-
 .../reference/staticInstanceResolution.types  |     2 +-
 .../reference/staticInstanceResolution3.types |    16 +-
 .../staticInterfaceAssignmentCompat.types     |     2 +-
 .../staticMemberAccessOffDerivedType1.types   |     6 +-
 ...ringLiteralObjectLiteralDeclaration1.types |     2 +-
 tests/baselines/reference/structural1.types   |     2 +-
 ...structuralTypeInDeclareFileForModule.types |     2 +-
 tests/baselines/reference/subtypesOfAny.types |     4 +-
 .../subtypingWithCallSignatures.types         |     2 +-
 .../subtypingWithCallSignatures2.types        |    34 +-
 .../subtypingWithCallSignatures3.types        |    22 +-
 .../subtypingWithConstructSignatures.types    |     2 +-
 .../subtypingWithConstructSignatures2.types   |    34 +-
 .../subtypingWithConstructSignatures3.types   |    22 +-
 .../subtypingWithConstructSignatures5.types   |    22 +-
 ...ubtypingWithObjectMembersOptionality.types |     2 +-
 .../reference/superAccessInFatArrow1.types    |     2 +-
 ...FromClassThatDerivesFromGenericType1.types |     2 +-
 .../reference/superWithGenerics.types         |     2 +-
 .../reference/switchStatements.types          |     6 +-
 .../targetTypeObjectLiteralToAny.types        |     2 +-
 .../thisInGenericStaticMembers.types          |    16 +-
 .../reference/thisInModuleFunction1.types     |     6 +-
 .../reference/thisInStaticMethod1.types       |     6 +-
 .../baselines/reference/throwStatements.types |    20 +-
 tests/baselines/reference/topLevel.types      |     2 +-
 .../reference/topLevelAmbientModule.types     |     4 +-
 .../reference/topLevelFileModule.types        |     8 +-
 ...gedInterfacesWithDifferingOverloads2.types |     2 +-
 ...ssionWithUndefinedCallResolutionData.types |     8 +-
 .../typeOfThisInFunctionExpression.types      |     2 +-
 .../typeOfThisInMemberFunctions.types         |     6 +-
 .../reference/typeOfThisInStaticMembers.types |    20 +-
 .../baselines/reference/typeResolution.types  |    80 +-
 tests/baselines/reference/typeofClass2.types  |    10 +-
 .../typeofModuleWithoutExports.types          |     2 +-
 .../typeofOperatorWithBooleanType.types       |    12 +-
 .../typeofOperatorWithNumberType.types        |    12 +-
 .../typeofOperatorWithStringType.types        |    12 +-
 .../undefinedIsSubtypeOfEverything.types      |     4 +-
 .../reference/underscoreMapFirst.types        |    14 +-
 .../baselines/reference/underscoreTest1.types |   310 +-
 .../unexportedInstanceClassVariables.types    |     4 +-
 .../reference/unusedImportDeclaration.types   |     8 +-
 ...oduleWithExportImportInValuePosition.types |    20 +-
 .../validMultipleVariableDeclarations.types   |     2 +-
 tests/baselines/reference/vardecl.types       |     2 +-
 tests/baselines/reference/visSyntax.types     |     2 +-
 .../visibilityOfCrossModuleTypeUsage.types    |    22 +-
 .../voidOperatorWithBooleanType.types         |     8 +-
 .../voidOperatorWithNumberType.types          |     8 +-
 .../voidOperatorWithStringType.types          |     8 +-
 .../baselines/reference/withImportDecl.types  |    16 +-
 556 files changed, 10557 insertions(+), 10440 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 9f88df3aa8d..52df7733747 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -906,7 +906,7 @@ module ts {
             // Get qualified name 
             if (enclosingDeclaration &&
                 // Properties/methods/Signatures/Constructors/TypeParameters do not need qualification
-                !(symbol.flags & SymbolFlags.PropertyOrAccessor & SymbolFlags.Signature & SymbolFlags.Constructor & SymbolFlags.Method & SymbolFlags.TypeParameter)) {
+                !(symbol.flags & (SymbolFlags.PropertyOrAccessor | SymbolFlags.Signature | SymbolFlags.Constructor | SymbolFlags.Method | SymbolFlags.TypeParameter))) {
                 var symbolName: string;
                 while (symbol) {
                     var isFirstName = !symbolName;
@@ -1036,8 +1036,10 @@ module ts {
                             (type.symbol.parent || // is exported function symbol
                             ts.forEach(type.symbol.declarations, declaration =>
                                 declaration.parent.kind === SyntaxKind.SourceFile || declaration.parent.kind === SyntaxKind.ModuleBlock));
-
-                        if (isStaticMethodSymbol || isNonLocalFunctionSymbol) {
+                        if (isStaticMethodSymbol) {
+                            return false;
+                        }
+                        if (isNonLocalFunctionSymbol) {
                             // typeof is allowed only for static/non local functions
                             return !!(flags & TypeFormatFlags.UseTypeOfFunction) || // use typeof if format flags specify it
                                 (typeStack && contains(typeStack, type)); // it is type of the symbol uses itself recursively
@@ -2237,11 +2239,11 @@ module ts {
             }
             var type = getDeclaredTypeOfSymbol(symbol);
             if (!(type.flags & TypeFlags.ObjectType)) {
-                error(getTypeDeclaration(symbol), Diagnostics.Global_type_0_must_be_a_class_or_interface_type, name);
+                error(getTypeDeclaration(symbol), Diagnostics.Global_type_0_must_be_a_class_or_interface_type, symbol.name);
                 return emptyObjectType;
             }
             if (((<InterfaceType>type).typeParameters ? (<InterfaceType>type).typeParameters.length : 0) !== arity) {
-                error(getTypeDeclaration(symbol), Diagnostics.Global_type_0_must_have_1_type_parameter_s, name, arity);
+                error(getTypeDeclaration(symbol), Diagnostics.Global_type_0_must_have_1_type_parameter_s, symbol.name, arity);
                 return emptyObjectType;
             }
             return <ObjectType>type;
@@ -6680,6 +6682,7 @@ module ts {
                         case SyntaxKind.Parameter:
                         case SyntaxKind.Property:
                         case SyntaxKind.EnumMember:
+                        case SyntaxKind.PropertyAssignment:
                             return (<VariableDeclaration>parent).initializer === node;
                         case SyntaxKind.ExpressionStatement:
                         case SyntaxKind.IfStatement:
@@ -6809,6 +6812,11 @@ module ts {
                     /*all meanings*/ SymbolFlags.Value | SymbolFlags.Type | SymbolFlags.Namespace | SymbolFlags.Import);
             }
 
+            if (isInRightSideOfImportOrExportAssignment(entityName)) {
+                // Since we already checked for ExportAssignment, this really could only be an Import
+                return getSymbolOfPartOfRightHandSideOfImport(entityName);
+            }
+
             if (isRightSideOfQualifiedNameOrPropertyAccess(entityName)) {
                 entityName = entityName.parent;
             }
@@ -6907,6 +6915,18 @@ module ts {
                 return getDeclaredTypeOfSymbol(symbol);
             }
 
+            if (node.kind === SyntaxKind.ModuleDeclaration ||
+                node.kind === SyntaxKind.ImportDeclaration) {
+                return unknownType;
+            }
+
+            if (node.parent.kind === SyntaxKind.ModuleDeclaration ||
+                node.parent.kind === SyntaxKind.ImportDeclaration) {
+                if ((<Declaration>node.parent).name === node) {
+                    return unknownType;
+                }
+            }
+
             if (isDeclaration(node)) {
                 // In this case, we call getSymbolOfNode instead of getSymbolInfo because it is a declaration
                 var symbol = getSymbolOfNode(node);
@@ -6920,10 +6940,7 @@ module ts {
 
             if (isInRightSideOfImportOrExportAssignment(node)) {
                 var symbol: Symbol;
-                symbol = node.parent.kind === SyntaxKind.ExportAssignment
-                    ? getSymbolInfo(node)
-                    : getSymbolOfPartOfRightHandSideOfImport(node);
-
+                symbol = getSymbolInfo(node);
                 var declaredType = getDeclaredTypeOfSymbol(symbol);
                 return declaredType !== unknownType ? declaredType : getTypeOfSymbol(symbol);
             }
diff --git a/src/harness/compilerRunner.ts b/src/harness/compilerRunner.ts
index feae3f1dc66..b81a6f12ecf 100644
--- a/src/harness/compilerRunner.ts
+++ b/src/harness/compilerRunner.ts
@@ -68,6 +68,14 @@ class CompilerBaselineRunner extends RunnerBase {
             var createNewInstance = false;
 
             before(() => {
+                justName = fileName.replace(/^.*[\\\/]/, ''); // strips the fileName from the path.
+                content = Harness.IO.readFile(fileName);
+                testCaseContent = Harness.TestCaseParser.makeUnitsFromTest(content, fileName);
+                units = testCaseContent.testUnitData;
+                tcSettings = testCaseContent.settings;
+                createNewInstance = false;
+                lastUnit = units[units.length - 1];
+                rootDir = lastUnit.originalFilePath.indexOf('conformance') === -1 ? 'tests/cases/compiler/' : lastUnit.originalFilePath.substring(0, lastUnit.originalFilePath.lastIndexOf('/')) + '/';
                 harnessCompiler = Harness.Compiler.getCompiler();
                 // We need to assemble the list of input files for the compiler and other related files on the 'filesystem' (ie in a multi-file test)
                 // If the last file in a test uses require or a triple slash reference we'll assume all other files will be brought in via references,
diff --git a/src/harness/typeWriter.ts b/src/harness/typeWriter.ts
index ea7d39136bf..58b4f9e3a13 100644
--- a/src/harness/typeWriter.ts
+++ b/src/harness/typeWriter.ts
@@ -78,6 +78,12 @@ class TypeWriterWalker {
         var lineAndCharacter = this.currentSourceFile.getLineAndCharacterFromPosition(actualPos);
         var sourceText = ts.getSourceTextOfNodeFromSourceText(this.currentSourceFile.text, node);
         var isUnknownType = (<ts.IntrinsicType>type).intrinsicName === "unknown";
+        if (isUnknownType) {
+            var symbol = this.checker.getSymbolInfo(node);
+        }
+        else {
+            var writeArrayAsGenericType = node.kind === ts.SyntaxKind.Identifier && (<ts.Identifier>node).text === "Array" ? ts.TypeFormatFlags.WriteArrayAsGenericType : 0;
+        }
         
         // If we got an unknown type, we temporarily want to fall back to just pretending the name
         // (source text) of the node is the type. This is to align with the old typeWriter to make
@@ -87,7 +93,9 @@ class TypeWriterWalker {
             column: lineAndCharacter.character,
             syntaxKind: ts.SyntaxKind[node.kind],
             identifierName: sourceText,
-            type: isUnknownType ? sourceText : this.checker.typeToString(type, undefined, ts.TypeFormatFlags.UseTypeOfFunction)
+            type: isUnknownType
+                ? this.checker.symbolToString(symbol, node.parent, ts.SymbolFlags.Value | ts.SymbolFlags.Type | ts.SymbolFlags.Namespace | ts.SymbolFlags.Import)
+                : this.checker.typeToString(type, node.parent, ts.TypeFormatFlags.UseTypeOfFunction | writeArrayAsGenericType)
         });
     }
 
diff --git a/tests/baselines/reference/AmbientModuleAndAmbientFunctionWithTheSameNameAndCommonRoot.types b/tests/baselines/reference/AmbientModuleAndAmbientFunctionWithTheSameNameAndCommonRoot.types
index da82a2ff662..c03b7f31f37 100644
--- a/tests/baselines/reference/AmbientModuleAndAmbientFunctionWithTheSameNameAndCommonRoot.types
+++ b/tests/baselines/reference/AmbientModuleAndAmbientFunctionWithTheSameNameAndCommonRoot.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/internalModules/DeclarationMerging/module.d.ts ===
 declare module Point {
->Point : typeof Point
+>Point : Point
 
     export var Origin: { x: number; y: number; }
 >Origin : { x: number; y: number; }
diff --git a/tests/baselines/reference/AmbientModuleAndAmbientWithSameNameAndCommonRoot.types b/tests/baselines/reference/AmbientModuleAndAmbientWithSameNameAndCommonRoot.types
index ff49e1c530f..146e1c3b083 100644
--- a/tests/baselines/reference/AmbientModuleAndAmbientWithSameNameAndCommonRoot.types
+++ b/tests/baselines/reference/AmbientModuleAndAmbientWithSameNameAndCommonRoot.types
@@ -1,9 +1,9 @@
 === tests/cases/conformance/internalModules/DeclarationMerging/module.d.ts ===
 declare module A {
->A : typeof A
+>A : A
 
     export module Point {
->Point : typeof Point
+>Point : Point
 
         export var Origin: {
 >Origin : { x: number; y: number; }
@@ -19,7 +19,7 @@ declare module A {
 
 === tests/cases/conformance/internalModules/DeclarationMerging/class.d.ts ===
 declare module A {
->A : typeof A
+>A : A
 
     export class Point {
 >Point : Point
@@ -45,15 +45,15 @@ var p: { x: number; y: number; }
 var p = A.Point.Origin;
 >p : { x: number; y: number; }
 >A.Point.Origin : { x: number; y: number; }
->A.Point : typeof Point
+>A.Point : typeof A.Point
 >A : typeof A
->Point : typeof Point
+>Point : typeof A.Point
 >Origin : { x: number; y: number; }
 
 var p = new A.Point(0, 0); // unexpected error here, bug 840000
 >p : { x: number; y: number; }
->new A.Point(0, 0) : Point
->A.Point : typeof Point
+>new A.Point(0, 0) : A.Point
+>A.Point : typeof A.Point
 >A : typeof A
->Point : typeof Point
+>Point : typeof A.Point
  
diff --git a/tests/baselines/reference/AmbientModuleAndNonAmbientClassWithSameNameAndCommonRoot.types b/tests/baselines/reference/AmbientModuleAndNonAmbientClassWithSameNameAndCommonRoot.types
index b928b699b95..79e2627cca2 100644
--- a/tests/baselines/reference/AmbientModuleAndNonAmbientClassWithSameNameAndCommonRoot.types
+++ b/tests/baselines/reference/AmbientModuleAndNonAmbientClassWithSameNameAndCommonRoot.types
@@ -1,9 +1,9 @@
 === tests/cases/conformance/internalModules/DeclarationMerging/module.d.ts ===
 declare module A {
->A : typeof A
+>A : A
 
     export module Point {
->Point : typeof Point
+>Point : Point
 
         export var Origin: {
 >Origin : { x: number; y: number; }
@@ -19,7 +19,7 @@ declare module A {
 
 === tests/cases/conformance/internalModules/DeclarationMerging/classPoint.ts ===
 module A {
->A : typeof A
+>A : A
 
     export class Point {
 >Point : Point
@@ -39,15 +39,15 @@ var p: { x: number; y: number; }
 var p = A.Point.Origin;
 >p : { x: number; y: number; }
 >A.Point.Origin : { x: number; y: number; }
->A.Point : typeof Point
+>A.Point : typeof A.Point
 >A : typeof A
->Point : typeof Point
+>Point : typeof A.Point
 >Origin : { x: number; y: number; }
 
 var p = new A.Point(0, 0); // unexpected error here, bug 840000
 >p : { x: number; y: number; }
->new A.Point(0, 0) : Point
->A.Point : typeof Point
+>new A.Point(0, 0) : A.Point
+>A.Point : typeof A.Point
 >A : typeof A
->Point : typeof Point
+>Point : typeof A.Point
 
diff --git a/tests/baselines/reference/AmbientModuleAndNonAmbientFunctionWithTheSameNameAndCommonRoot.types b/tests/baselines/reference/AmbientModuleAndNonAmbientFunctionWithTheSameNameAndCommonRoot.types
index cf4aeb6bcc0..b0972ad1b41 100644
--- a/tests/baselines/reference/AmbientModuleAndNonAmbientFunctionWithTheSameNameAndCommonRoot.types
+++ b/tests/baselines/reference/AmbientModuleAndNonAmbientFunctionWithTheSameNameAndCommonRoot.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/internalModules/DeclarationMerging/module.d.ts ===
 declare module Point {
->Point : typeof Point
+>Point : Point
 
     export var Origin: { x: number; y: number; }
 >Origin : { x: number; y: number; }
diff --git a/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.types b/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.types
index 10132e604ae..6e23d9a4489 100644
--- a/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.types
+++ b/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.types
@@ -7,7 +7,7 @@ class Point {
 >y : number
 
     static Origin(): Point { return { x: 0, y: 0 }; }
->Origin : typeof Origin
+>Origin : () => Point
 >Point : Point
 >{ x: 0, y: 0 } : { x: number; y: number; }
 >x : number
@@ -15,7 +15,7 @@ class Point {
 }
 
 module Point {
->Point : typeof Point
+>Point : Point
 
     function Origin() { return ""; }// not an error, since not exported
 >Origin : typeof Origin
@@ -23,7 +23,7 @@ module Point {
 
 
 module A {
->A : typeof A
+>A : A
 
     export class Point {
 >Point : Point
@@ -33,7 +33,7 @@ module A {
 >y : number
 
         static Origin(): Point { return { x: 0, y: 0 }; }
->Origin : typeof Origin
+>Origin : () => Point
 >Point : Point
 >{ x: 0, y: 0 } : { x: number; y: number; }
 >x : number
@@ -41,7 +41,7 @@ module A {
     }
 
     export module Point {
->Point : typeof Point
+>Point : Point
 
         function Origin() { return ""; }// not an error since not exported
 >Origin : typeof Origin
diff --git a/tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.types b/tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.types
index 827089847e2..bd9c858eb6c 100644
--- a/tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.types
+++ b/tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.types
@@ -15,7 +15,7 @@ class Point {
 }
 
 module Point {
->Point : typeof Point
+>Point : Point
 
     var Origin = ""; // not an error, since not exported
 >Origin : string
@@ -23,7 +23,7 @@ module Point {
 
 
 module A {
->A : typeof A
+>A : A
 
     export class Point {
 >Point : Point
@@ -41,7 +41,7 @@ module A {
     }
 
     export module Point {
->Point : typeof Point
+>Point : Point
 
         var Origin = ""; // not an error since not exported
 >Origin : string
diff --git a/tests/baselines/reference/EnumAndModuleWithSameNameAndCommonRoot.types b/tests/baselines/reference/EnumAndModuleWithSameNameAndCommonRoot.types
index 50768c8c2f9..7e8e792c98d 100644
--- a/tests/baselines/reference/EnumAndModuleWithSameNameAndCommonRoot.types
+++ b/tests/baselines/reference/EnumAndModuleWithSameNameAndCommonRoot.types
@@ -8,7 +8,7 @@ enum enumdule {
 }
 
 module enumdule {
->enumdule : typeof enumdule
+>enumdule : enumdule
 
     export class Point {
 >Point : Point
@@ -36,8 +36,8 @@ var y: { x: number; y: number };
 
 var y = new enumdule.Point(0, 0);
 >y : { x: number; y: number; }
->new enumdule.Point(0, 0) : Point
->enumdule.Point : typeof Point
+>new enumdule.Point(0, 0) : enumdule.Point
+>enumdule.Point : typeof enumdule.Point
 >enumdule : typeof enumdule
->Point : typeof Point
+>Point : typeof enumdule.Point
 
diff --git a/tests/baselines/reference/ExportClassWhichExtendsInterfaceWithInaccessibleType.types b/tests/baselines/reference/ExportClassWhichExtendsInterfaceWithInaccessibleType.types
index 6d69109e542..7bc28ab6b88 100644
--- a/tests/baselines/reference/ExportClassWhichExtendsInterfaceWithInaccessibleType.types
+++ b/tests/baselines/reference/ExportClassWhichExtendsInterfaceWithInaccessibleType.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/internalModules/exportDeclarations/ExportClassWhichExtendsInterfaceWithInaccessibleType.ts ===
 module A {
->A : typeof A
+>A : A
 
     interface Point {
 >Point : Point
diff --git a/tests/baselines/reference/ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.types b/tests/baselines/reference/ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.types
index 17b4a25cde3..ef7ecb235d2 100644
--- a/tests/baselines/reference/ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.types
+++ b/tests/baselines/reference/ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/internalModules/exportDeclarations/ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts ===
 module A {
->A : typeof A
+>A : A
 
     export class Point {
 >Point : Point
diff --git a/tests/baselines/reference/ExportClassWithInaccessibleTypeInIndexerTypeAnnotations.types b/tests/baselines/reference/ExportClassWithInaccessibleTypeInIndexerTypeAnnotations.types
index 451db7f92a8..d076dad17d4 100644
--- a/tests/baselines/reference/ExportClassWithInaccessibleTypeInIndexerTypeAnnotations.types
+++ b/tests/baselines/reference/ExportClassWithInaccessibleTypeInIndexerTypeAnnotations.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/internalModules/exportDeclarations/ExportClassWithInaccessibleTypeInIndexerTypeAnnotations.ts ===
 module A {
->A : typeof A
+>A : A
 
     class Point {
 >Point : Point
diff --git a/tests/baselines/reference/ExportClassWithInaccessibleTypeInTypeParameterConstraint.types b/tests/baselines/reference/ExportClassWithInaccessibleTypeInTypeParameterConstraint.types
index cac8fac99f2..e2d49c8e674 100644
--- a/tests/baselines/reference/ExportClassWithInaccessibleTypeInTypeParameterConstraint.types
+++ b/tests/baselines/reference/ExportClassWithInaccessibleTypeInTypeParameterConstraint.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/internalModules/exportDeclarations/ExportClassWithInaccessibleTypeInTypeParameterConstraint.ts ===
 module A {
->A : typeof A
+>A : A
 
     class Point {
 >Point : Point
@@ -47,7 +47,7 @@ module A {
 >TPoint : TPoint
 
         static fromorigin2d(p: Point): Line<Point>{
->fromorigin2d : typeof fromorigin2d
+>fromorigin2d : (p: Point) => Line<Point>
 >p : Point
 >Point : Point
 >Line : Line<TPoint>
diff --git a/tests/baselines/reference/ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.types b/tests/baselines/reference/ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.types
index fe2fea1b7a6..4c0fed9fe11 100644
--- a/tests/baselines/reference/ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.types
+++ b/tests/baselines/reference/ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/internalModules/exportDeclarations/ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.ts ===
 module A {
->A : typeof A
+>A : A
 
     export class Point {
 >Point : Point
diff --git a/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.types b/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.types
index 36c78cd700a..3a922cf5d0a 100644
--- a/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.types
+++ b/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/internalModules/exportDeclarations/ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.ts ===
 module A {
->A : typeof A
+>A : A
 
     class Point {
 >Point : Point
diff --git a/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.types b/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.types
index 5d59aa10039..47095c12c14 100644
--- a/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.types
+++ b/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/internalModules/exportDeclarations/ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.ts ===
 module A {
->A : typeof A
+>A : A
 
     export class Point {
 >Point : Point
diff --git a/tests/baselines/reference/ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.types b/tests/baselines/reference/ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.types
index f6f4e6a441a..8c76ddacedb 100644
--- a/tests/baselines/reference/ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.types
+++ b/tests/baselines/reference/ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/internalModules/exportDeclarations/ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts ===
 module A {
->A : typeof A
+>A : A
 
     export interface Point {
 >Point : Point
diff --git a/tests/baselines/reference/ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.types b/tests/baselines/reference/ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.types
index 53484780474..ab7408b4c94 100644
--- a/tests/baselines/reference/ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.types
+++ b/tests/baselines/reference/ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/internalModules/exportDeclarations/ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.ts ===
 module A {
->A : typeof A
+>A : A
 
     interface Point {
 >Point : Point
diff --git a/tests/baselines/reference/ExportModuleWithAccessibleTypesOnItsExportedMembers.types b/tests/baselines/reference/ExportModuleWithAccessibleTypesOnItsExportedMembers.types
index 11a62d66f98..7fa1767d849 100644
--- a/tests/baselines/reference/ExportModuleWithAccessibleTypesOnItsExportedMembers.types
+++ b/tests/baselines/reference/ExportModuleWithAccessibleTypesOnItsExportedMembers.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/internalModules/exportDeclarations/ExportModuleWithAccessibleTypesOnItsExportedMembers.ts ===
 module A {
->A : typeof A
+>A : A
 
     export class Point {
 >Point : Point
@@ -11,7 +11,7 @@ module A {
     }
 
     export module B {
->B : typeof B
+>B : B
 
         export var Origin: Point = new Point(0, 0);
 >Origin : Point
@@ -31,7 +31,7 @@ module A {
             }
 
             static fromOrigin(p: Point) {
->fromOrigin : typeof fromOrigin
+>fromOrigin : (p: Point) => Line
 >p : Point
 >Point : Point
 
diff --git a/tests/baselines/reference/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.types b/tests/baselines/reference/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.types
index 82bdf732173..fa5d998b4fa 100644
--- a/tests/baselines/reference/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.types
+++ b/tests/baselines/reference/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/internalModules/exportDeclarations/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.ts ===
 module A {
->A : typeof A
+>A : A
 
     class Point {
 >Point : Point
diff --git a/tests/baselines/reference/ExportVariableOfGenericTypeWithInaccessibleTypeAsTypeArgument.types b/tests/baselines/reference/ExportVariableOfGenericTypeWithInaccessibleTypeAsTypeArgument.types
index 46084e85632..ab999ec2e6c 100644
--- a/tests/baselines/reference/ExportVariableOfGenericTypeWithInaccessibleTypeAsTypeArgument.types
+++ b/tests/baselines/reference/ExportVariableOfGenericTypeWithInaccessibleTypeAsTypeArgument.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/internalModules/exportDeclarations/ExportVariableOfGenericTypeWithInaccessibleTypeAsTypeArgument.ts ===
 module A {
->A : typeof A
+>A : A
 
     class B {
 >B : B
@@ -11,12 +11,12 @@ module A {
 
     export var beez: Array<B>;
 >beez : B[]
->Array : T[]
+>Array : Array<T>
 >B : B
 
     export var beez2 = new Array<B>();
 >beez2 : B[]
 >new Array<B>() : B[]
->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[]; }
+>Array : { (arrayLength?: number): Array<any>; <T>(arrayLength: number): Array<T>; <T>(...items: Array<T>): Array<T>; new (arrayLength?: number): Array<any>; new <T>(arrayLength: number): Array<T>; new <T>(...items: Array<T>): Array<T>; isArray(arg: any): boolean; prototype: Array<any>; }
 >B : B
 }
diff --git a/tests/baselines/reference/ExportVariableWithAccessibleTypeInTypeAnnotation.types b/tests/baselines/reference/ExportVariableWithAccessibleTypeInTypeAnnotation.types
index 945a4be6fe5..23c6d4746c9 100644
--- a/tests/baselines/reference/ExportVariableWithAccessibleTypeInTypeAnnotation.types
+++ b/tests/baselines/reference/ExportVariableWithAccessibleTypeInTypeAnnotation.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/internalModules/exportDeclarations/ExportVariableWithAccessibleTypeInTypeAnnotation.ts ===
 module A {
->A : typeof A
+>A : A
 
     export interface Point {
 >Point : Point
diff --git a/tests/baselines/reference/ExportVariableWithInaccessibleTypeInTypeAnnotation.types b/tests/baselines/reference/ExportVariableWithInaccessibleTypeInTypeAnnotation.types
index 9ae05f87416..2c56fb0f021 100644
--- a/tests/baselines/reference/ExportVariableWithInaccessibleTypeInTypeAnnotation.types
+++ b/tests/baselines/reference/ExportVariableWithInaccessibleTypeInTypeAnnotation.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/internalModules/exportDeclarations/ExportVariableWithInaccessibleTypeInTypeAnnotation.ts ===
 module A {
->A : typeof A
+>A : A
 
     export interface Point {
 >Point : Point
diff --git a/tests/baselines/reference/FunctionAndModuleWithSameNameAndDifferentCommonRoot.types b/tests/baselines/reference/FunctionAndModuleWithSameNameAndDifferentCommonRoot.types
index 55a30a857cc..809c3c21081 100644
--- a/tests/baselines/reference/FunctionAndModuleWithSameNameAndDifferentCommonRoot.types
+++ b/tests/baselines/reference/FunctionAndModuleWithSameNameAndDifferentCommonRoot.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/internalModules/DeclarationMerging/function.ts ===
 module A {
->A : typeof A
+>A : A
 
     export function Point() {
 >Point : typeof Point
@@ -14,10 +14,10 @@ module A {
 
 === tests/cases/conformance/internalModules/DeclarationMerging/module.ts ===
 module B {
->B : typeof B
+>B : B
 
     export module Point {
->Point : typeof Point
+>Point : Point
 
         export var Origin = { x: 0, y: 0 };
 >Origin : { x: number; y: number; }
@@ -35,9 +35,9 @@ var fn: () => { x: number; y: number };
 
 var fn = A.Point;
 >fn : () => { x: number; y: number; }
->A.Point : typeof Point
+>A.Point : typeof A.Point
 >A : typeof A
->Point : typeof Point
+>Point : typeof A.Point
 
 var cl: { x: number; y: number; }
 >cl : { x: number; y: number; }
@@ -47,8 +47,8 @@ var cl: { x: number; y: number; }
 var cl = B.Point.Origin;
 >cl : { x: number; y: number; }
 >B.Point.Origin : { x: number; y: number; }
->B.Point : typeof Point
+>B.Point : typeof B.Point
 >B : typeof B
->Point : typeof Point
+>Point : typeof B.Point
 >Origin : { x: number; y: number; }
 
diff --git a/tests/baselines/reference/ModuleAndEnumWithSameNameAndCommonRoot.types b/tests/baselines/reference/ModuleAndEnumWithSameNameAndCommonRoot.types
index c33be647018..3525fbf8fff 100644
--- a/tests/baselines/reference/ModuleAndEnumWithSameNameAndCommonRoot.types
+++ b/tests/baselines/reference/ModuleAndEnumWithSameNameAndCommonRoot.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/internalModules/DeclarationMerging/ModuleAndEnumWithSameNameAndCommonRoot.ts ===
 module enumdule {
->enumdule : typeof enumdule
+>enumdule : enumdule
 
     export class Point {
 >Point : Point
@@ -36,8 +36,8 @@ var y: { x: number; y: number };
 
 var y = new enumdule.Point(0, 0);
 >y : { x: number; y: number; }
->new enumdule.Point(0, 0) : Point
->enumdule.Point : typeof Point
+>new enumdule.Point(0, 0) : enumdule.Point
+>enumdule.Point : typeof enumdule.Point
 >enumdule : typeof enumdule
->Point : typeof Point
+>Point : typeof enumdule.Point
 
diff --git a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.types b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.types
index 9fc4a86e362..cd240fa75a1 100644
--- a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.types
+++ b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.ts ===
 module A {
->A : typeof A
+>A : A
 
     export class Point {
 >Point : Point
@@ -14,26 +14,26 @@ module A {
 }
 
 module A {
->A : typeof A
+>A : A
 
     class Point {
 >Point : Point
 
         fromCarthesian(p: A.Point) {
->fromCarthesian : (p: Point) => { x: number; y: number; }
->p : Point
+>fromCarthesian : (p: A.Point) => { x: number; y: number; }
+>p : A.Point
 >A : A
->Point : Point
+>Point : A.Point
 
             return { x: p.x, y: p.y };
 >{ x: p.x, y: p.y } : { x: number; y: number; }
 >x : number
 >p.x : number
->p : Point
+>p : A.Point
 >x : number
 >y : number
 >p.y : number
->p : Point
+>p : A.Point
 >y : number
         }
     }
@@ -48,12 +48,12 @@ var p: { x: number; y: number; };
 var p: A.Point;
 >p : { x: number; y: number; }
 >A : A
->Point : Point
+>Point : A.Point
 
 module X.Y.Z {
->X : typeof X
->Y : typeof Y
->Z : typeof Z
+>X : X
+>Y : Y
+>Z : Z
 
     export class Line {
 >Line : Line
@@ -64,13 +64,13 @@ module X.Y.Z {
 }
 
 module X {
->X : typeof X
+>X : X
 
     export module Y {
->Y : typeof Y
+>Y : Y
 
         export module Z {
->Z : typeof Z
+>Z : Z
 
             class Line {
 >Line : Line
@@ -90,8 +90,8 @@ var l: { length: number; }
 var l: X.Y.Z.Line;
 >l : { length: number; }
 >X : X
->Y : Y
->Z : Z
->Line : Line
+>Y : X.Y
+>Z : X.Y.Z
+>Line : X.Y.Z.Line
 
 
diff --git a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.types b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.types
index c589eae642f..e8ee371d06a 100644
--- a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.types
+++ b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.types
@@ -31,17 +31,17 @@ module A {
 
 // ensure merges as expected
 var p: { x: number; y: number; toCarth(): A.Point; };
->p : { x: number; y: number; toCarth(): Point; }
+>p : { x: number; y: number; toCarth(): A.Point; }
 >x : number
 >y : number
->toCarth : () => Point
+>toCarth : () => A.Point
 >A : A
->Point : Point
+>Point : A.Point
 
 var p: A.Point;
->p : { x: number; y: number; toCarth(): Point; }
+>p : { x: number; y: number; toCarth(): A.Point; }
 >A : A
->Point : Point
+>Point : A.Point
 
 module X.Y.Z {
 >X : X
@@ -52,12 +52,12 @@ module X.Y.Z {
 >Line : Line
 
         new (start: A.Point, end: A.Point);
->start : Point
+>start : A.Point
 >A : A
->Point : Point
->end : Point
+>Point : A.Point
+>end : A.Point
 >A : A
->Point : Point
+>Point : A.Point
     }
 }
 
@@ -72,32 +72,32 @@ module X {
 >Line : Line
 
             start: A.Point;
->start : Point
+>start : A.Point
 >A : A
->Point : Point
+>Point : A.Point
 
             end: A.Point;
->end : Point
+>end : A.Point
 >A : A
->Point : Point
+>Point : A.Point
         }
     }
 }
 
 // ensure merges as expected
 var l: { new (s: A.Point, e: A.Point); }
->l : new (s: Point, e: Point) => any
->s : Point
+>l : new (s: A.Point, e: A.Point) => any
+>s : A.Point
 >A : A
->Point : Point
->e : Point
+>Point : A.Point
+>e : A.Point
 >A : A
->Point : Point
+>Point : A.Point
 
 var l: X.Y.Z.Line;
->l : new (s: Point, e: Point) => any
+>l : new (s: A.Point, e: A.Point) => any
 >X : X
->Y : Y
->Z : Z
->Line : Line
+>Y : X.Y
+>Z : X.Y.Z
+>Line : X.Y.Z.Line
 
diff --git a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedLocalVarsOfTheSameName.types b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedLocalVarsOfTheSameName.types
index 4fc79d0409c..341e7615173 100644
--- a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedLocalVarsOfTheSameName.types
+++ b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedLocalVarsOfTheSameName.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/internalModules/DeclarationMerging/part1.ts ===
 module A {
->A : typeof A
+>A : A
 
     export interface Point {
 >Point : Point
@@ -13,7 +13,7 @@ module A {
     }
 
     export module Utils {
->Utils : typeof Utils
+>Utils : Utils
 
         export function mirror<T extends Point>(p: T) {
 >mirror : typeof mirror
@@ -44,14 +44,14 @@ module A {
 
 === tests/cases/conformance/internalModules/DeclarationMerging/part2.ts ===
 module A {
->A : typeof A
+>A : A
 
     // not a collision, since we don't export
     var Origin: string = "0,0";
 >Origin : string
 
     export module Utils {
->Utils : typeof Utils
+>Utils : Utils
 
         export class Plane {
 >Plane : Plane
@@ -76,47 +76,47 @@ var o: { x: number; y: number };
 var o: A.Point;
 >o : { x: number; y: number; }
 >A : A
->Point : Point
+>Point : A.Point
 
 var o = A.Origin;
 >o : { x: number; y: number; }
->A.Origin : Point
+>A.Origin : A.Point
 >A : typeof A
->Origin : Point
+>Origin : A.Point
 
 var o = A.Utils.mirror(o);
 >o : { x: number; y: number; }
 >A.Utils.mirror(o) : { x: number; y: number; }
->A.Utils.mirror : typeof mirror
->A.Utils : typeof Utils
+>A.Utils.mirror : typeof A.Utils.mirror
+>A.Utils : typeof A.Utils
 >A : typeof A
->Utils : typeof Utils
->mirror : typeof mirror
+>Utils : typeof A.Utils
+>mirror : typeof A.Utils.mirror
 >o : { x: number; y: number; }
 
 var p: { tl: A.Point; br: A.Point };
->p : { tl: Point; br: Point; }
->tl : Point
+>p : { tl: A.Point; br: A.Point; }
+>tl : A.Point
 >A : A
->Point : Point
->br : Point
+>Point : A.Point
+>br : A.Point
 >A : A
->Point : Point
+>Point : A.Point
 
 var p: A.Utils.Plane;
->p : { tl: Point; br: Point; }
+>p : { tl: A.Point; br: A.Point; }
 >A : A
->Utils : Utils
->Plane : Plane
+>Utils : A.Utils
+>Plane : A.Utils.Plane
 
 var p = new A.Utils.Plane(o, { x: 1, y: 1 });
->p : { tl: Point; br: Point; }
->new A.Utils.Plane(o, { x: 1, y: 1 }) : Plane
->A.Utils.Plane : typeof Plane
->A.Utils : typeof Utils
+>p : { tl: A.Point; br: A.Point; }
+>new A.Utils.Plane(o, { x: 1, y: 1 }) : A.Utils.Plane
+>A.Utils.Plane : typeof A.Utils.Plane
+>A.Utils : typeof A.Utils
 >A : typeof A
->Utils : typeof Utils
->Plane : typeof Plane
+>Utils : typeof A.Utils
+>Plane : typeof A.Utils.Plane
 >o : { x: number; y: number; }
 >{ x: 1, y: 1 } : { x: number; y: number; }
 >x : number
diff --git a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.types b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.types
index 6a3bc7d15bd..38511e959c3 100644
--- a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.types
+++ b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.types
@@ -31,20 +31,20 @@ module A {
 
 // ensure merges as expected
 var p: { x: number; y: number; toCarth(): A.Point; fromCarth(): A.Point; };
->p : { x: number; y: number; toCarth(): Point; fromCarth(): Point; }
+>p : { x: number; y: number; toCarth(): A.Point; fromCarth(): A.Point; }
 >x : number
 >y : number
->toCarth : () => Point
+>toCarth : () => A.Point
 >A : A
->Point : Point
->fromCarth : () => Point
+>Point : A.Point
+>fromCarth : () => A.Point
 >A : A
->Point : Point
+>Point : A.Point
 
 var p: A.Point;
->p : { x: number; y: number; toCarth(): Point; fromCarth(): Point; }
+>p : { x: number; y: number; toCarth(): A.Point; fromCarth(): A.Point; }
 >A : A
->Point : Point
+>Point : A.Point
 
 module X.Y.Z {
 >X : X
@@ -55,12 +55,12 @@ module X.Y.Z {
 >Line : Line
 
         new (start: A.Point, end: A.Point);
->start : Point
+>start : A.Point
 >A : A
->Point : Point
->end : Point
+>Point : A.Point
+>end : A.Point
 >A : A
->Point : Point
+>Point : A.Point
     }
 }
 
@@ -75,38 +75,38 @@ module X {
 >Line : Line
 
             start: A.Point;
->start : Point
+>start : A.Point
 >A : A
->Point : Point
+>Point : A.Point
 
             end: A.Point;
->end : Point
+>end : A.Point
 >A : A
->Point : Point
+>Point : A.Point
         }
     }
 }
 
 // ensure merges as expected
 var l: { start: A.Point; end: A.Point; new (s: A.Point, e: A.Point); }
->l : { new (s: Point, e: Point): any; start: Point; end: Point; }
->start : Point
+>l : { new (s: A.Point, e: A.Point): any; start: A.Point; end: A.Point; }
+>start : A.Point
 >A : A
->Point : Point
->end : Point
+>Point : A.Point
+>end : A.Point
 >A : A
->Point : Point
->s : Point
+>Point : A.Point
+>s : A.Point
 >A : A
->Point : Point
->e : Point
+>Point : A.Point
+>e : A.Point
 >A : A
->Point : Point
+>Point : A.Point
 
 var l: X.Y.Z.Line;
->l : { new (s: Point, e: Point): any; start: Point; end: Point; }
+>l : { new (s: A.Point, e: A.Point): any; start: A.Point; end: A.Point; }
 >X : X
->Y : Y
->Z : Z
->Line : Line
+>Y : X.Y
+>Z : X.Y.Z
+>Line : X.Y.Z.Line
 
diff --git a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.types b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.types
index 3903b181a03..05fe0d922d1 100644
--- a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.types
+++ b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.types
@@ -1,17 +1,17 @@
 === tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.ts ===
 module A.B {
->A : typeof A
->B : typeof B
+>A : A
+>B : B
 
     export var x: number;
 >x : number
 }
 
 module A{ 
->A : typeof A
+>A : A
 
     module B {
->B : typeof B
+>B : B
 
         export var x: string;
 >x : string
@@ -25,15 +25,15 @@ var x: number;
 var x = A.B.x;
 >x : number
 >A.B.x : number
->A.B : typeof B
+>A.B : typeof A.B
 >A : typeof A
->B : typeof B
+>B : typeof A.B
 >x : number
 
 module X.Y.Z {
->X : typeof X
->Y : typeof Y
->Z : typeof Z
+>X : X
+>Y : Y
+>Z : Z
 
     export class Line {
 >Line : Line
@@ -44,13 +44,13 @@ module X.Y.Z {
 }
 
 module X {
->X : typeof X
+>X : X
 
     export module Y {
->Y : typeof Y
+>Y : Y
 
         module Z {
->Z : typeof Z
+>Z : Z
 
             export class Line {
 >Line : Line
@@ -70,7 +70,7 @@ var l: { length: number };
 var l: X.Y.Z.Line;
 >l : { length: number; }
 >X : X
->Y : Y
->Z : Z
->Line : Line
+>Y : X.Y
+>Z : X.Y.Z
+>Line : X.Y.Z.Line
 
diff --git a/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndDifferentCommonRoot.types b/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndDifferentCommonRoot.types
index 6662806a523..ed7f8c748d3 100644
--- a/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndDifferentCommonRoot.types
+++ b/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndDifferentCommonRoot.types
@@ -1,9 +1,9 @@
 === tests/cases/conformance/internalModules/DeclarationMerging/part1.ts ===
 module Root {
->Root : typeof Root
+>Root : Root
 
     export module A {
->A : typeof A
+>A : A
 
         export interface Point {
 >Point : Point
@@ -16,7 +16,7 @@ module Root {
         }
 
         export module Utils {
->Utils : typeof Utils
+>Utils : Utils
 
             export function mirror<T extends Point>(p: T) {
 >mirror : typeof mirror
@@ -42,36 +42,36 @@ module Root {
 
 === tests/cases/conformance/internalModules/DeclarationMerging/part2.ts ===
 module otherRoot {
->otherRoot : typeof otherRoot
+>otherRoot : otherRoot
 
     export module A {
->A : typeof A
+>A : A
 
         // have to be fully qualified since in different root
         export var Origin: Root.A.Point = { x: 0, y: 0 };
->Origin : Point
+>Origin : Root.A.Point
 >Root : Root
->A : A
->Point : Point
+>A : Root.A
+>Point : Root.A.Point
 >{ x: 0, y: 0 } : { x: number; y: number; }
 >x : number
 >y : number
 
         export module Utils {
->Utils : typeof Utils
+>Utils : Utils
 
             export class Plane {
 >Plane : Plane
 
                 constructor(public tl: Root.A.Point, public br: Root.A.Point) { }
->tl : Point
+>tl : Root.A.Point
 >Root : Root
->A : A
->Point : Point
->br : Point
+>A : Root.A
+>Point : Root.A.Point
+>br : Root.A.Point
 >Root : Root
->A : A
->Point : Point
+>A : Root.A
+>Point : Root.A.Point
             }
         }
     }
diff --git a/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndSameCommonRoot.types b/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndSameCommonRoot.types
index 6e12c97e761..40c14297d3e 100644
--- a/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndSameCommonRoot.types
+++ b/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndSameCommonRoot.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/internalModules/DeclarationMerging/part1.ts ===
 module A {
->A : typeof A
+>A : A
 
     export interface Point {
 >Point : Point
@@ -13,7 +13,7 @@ module A {
     }
 
     export module Utils {
->Utils : typeof Utils
+>Utils : Utils
 
         export function mirror<T extends Point>(p: T) {
 >mirror : typeof mirror
@@ -38,7 +38,7 @@ module A {
 
 === tests/cases/conformance/internalModules/DeclarationMerging/part2.ts ===
 module A {
->A : typeof A
+>A : A
 
     export var Origin: Point = { x: 0, y: 0 };
 >Origin : Point
@@ -48,7 +48,7 @@ module A {
 >y : number
 
     export module Utils {
->Utils : typeof Utils
+>Utils : Utils
 
         export class Plane {
 >Plane : Plane
@@ -73,47 +73,47 @@ var o: { x: number; y: number };
 var o: A.Point;
 >o : { x: number; y: number; }
 >A : A
->Point : Point
+>Point : A.Point
 
 var o = A.Origin;
 >o : { x: number; y: number; }
->A.Origin : Point
+>A.Origin : A.Point
 >A : typeof A
->Origin : Point
+>Origin : A.Point
 
 var o = A.Utils.mirror(o);
 >o : { x: number; y: number; }
 >A.Utils.mirror(o) : { x: number; y: number; }
->A.Utils.mirror : typeof mirror
->A.Utils : typeof Utils
+>A.Utils.mirror : typeof A.Utils.mirror
+>A.Utils : typeof A.Utils
 >A : typeof A
->Utils : typeof Utils
->mirror : typeof mirror
+>Utils : typeof A.Utils
+>mirror : typeof A.Utils.mirror
 >o : { x: number; y: number; }
 
 var p: { tl: A.Point; br: A.Point };
->p : { tl: Point; br: Point; }
->tl : Point
+>p : { tl: A.Point; br: A.Point; }
+>tl : A.Point
 >A : A
->Point : Point
->br : Point
+>Point : A.Point
+>br : A.Point
 >A : A
->Point : Point
+>Point : A.Point
 
 var p: A.Utils.Plane;
->p : { tl: Point; br: Point; }
+>p : { tl: A.Point; br: A.Point; }
 >A : A
->Utils : Utils
->Plane : Plane
+>Utils : A.Utils
+>Plane : A.Utils.Plane
 
 var p = new A.Utils.Plane(o, { x: 1, y: 1 });
->p : { tl: Point; br: Point; }
->new A.Utils.Plane(o, { x: 1, y: 1 }) : Plane
->A.Utils.Plane : typeof Plane
->A.Utils : typeof Utils
+>p : { tl: A.Point; br: A.Point; }
+>new A.Utils.Plane(o, { x: 1, y: 1 }) : A.Utils.Plane
+>A.Utils.Plane : typeof A.Utils.Plane
+>A.Utils : typeof A.Utils
 >A : typeof A
->Utils : typeof Utils
->Plane : typeof Plane
+>Utils : typeof A.Utils
+>Plane : typeof A.Utils.Plane
 >o : { x: number; y: number; }
 >{ x: 1, y: 1 } : { x: number; y: number; }
 >x : number
diff --git a/tests/baselines/reference/acceptableAlias1.types b/tests/baselines/reference/acceptableAlias1.types
index 3375ceee302..4acad529a58 100644
--- a/tests/baselines/reference/acceptableAlias1.types
+++ b/tests/baselines/reference/acceptableAlias1.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/acceptableAlias1.ts ===
 module M {
->M : typeof M
+>M : M
 
     export module N {
 >N : N
@@ -13,5 +13,5 @@ module M {
 import r = M.X;
 >r : r
 >M : typeof M
->X : X
+>X : r
 
diff --git a/tests/baselines/reference/additionOperatorWithAnyAndEveryType.types b/tests/baselines/reference/additionOperatorWithAnyAndEveryType.types
index 15672dc0006..140b27efa17 100644
--- a/tests/baselines/reference/additionOperatorWithAnyAndEveryType.types
+++ b/tests/baselines/reference/additionOperatorWithAnyAndEveryType.types
@@ -9,7 +9,7 @@ class C {
 >a : string
 
     static foo() { }
->foo : typeof foo
+>foo : () => void
 }
 enum E { a, b, c }
 >E : E
@@ -18,7 +18,7 @@ enum E { a, b, c }
 >c : E
 
 module M { export var a }
->M : typeof M
+>M : M
 >a : any
 
 var a: any;
diff --git a/tests/baselines/reference/aliasInaccessibleModule.types b/tests/baselines/reference/aliasInaccessibleModule.types
index 482e3f667ac..163affbafea 100644
--- a/tests/baselines/reference/aliasInaccessibleModule.types
+++ b/tests/baselines/reference/aliasInaccessibleModule.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/aliasInaccessibleModule.ts ===
 module M {
->M : typeof M
+>M : M
 
     module N {
 >N : N
diff --git a/tests/baselines/reference/aliasInaccessibleModule2.types b/tests/baselines/reference/aliasInaccessibleModule2.types
index 1ad25ae0cf9..e611026018d 100644
--- a/tests/baselines/reference/aliasInaccessibleModule2.types
+++ b/tests/baselines/reference/aliasInaccessibleModule2.types
@@ -1,9 +1,9 @@
 === tests/cases/compiler/aliasInaccessibleModule2.ts ===
 module M {
->M : typeof M
+>M : M
 
     module N {
->N : typeof N
+>N : N
 
         class C {
 >C : C
@@ -11,10 +11,10 @@ module M {
         
     }
     import R = N;
->R : typeof N
+>R : R
 >N : typeof N
 
     export import X = R;
->X : typeof N
+>X : X
 >R : typeof N
 }
diff --git a/tests/baselines/reference/aliasUsageInArray.types b/tests/baselines/reference/aliasUsageInArray.types
index 9903592ffdc..a012cc9028c 100644
--- a/tests/baselines/reference/aliasUsageInArray.types
+++ b/tests/baselines/reference/aliasUsageInArray.types
@@ -1,30 +1,30 @@
 === tests/cases/compiler/aliasUsageInArray_main.ts ===
 import Backbone = require("aliasUsageInArray_backbone");
->Backbone : typeof "tests/cases/compiler/aliasUsageInArray_backbone"
+>Backbone : Backbone
 
 import moduleA = require("aliasUsageInArray_moduleA");
->moduleA : typeof "tests/cases/compiler/aliasUsageInArray_moduleA"
+>moduleA : moduleA
 
 interface IHasVisualizationModel {
 >IHasVisualizationModel : IHasVisualizationModel
 
     VisualizationModel: typeof Backbone.Model;
->VisualizationModel : typeof Model
->Backbone : typeof "tests/cases/compiler/aliasUsageInArray_backbone"
->Model : typeof Model
+>VisualizationModel : typeof Backbone.Model
+>Backbone : typeof Backbone
+>Model : typeof Backbone.Model
 }
 
 var xs: IHasVisualizationModel[] = [moduleA];
 >xs : IHasVisualizationModel[]
 >IHasVisualizationModel : IHasVisualizationModel
 >[moduleA] : IHasVisualizationModel[]
->moduleA : typeof "tests/cases/compiler/aliasUsageInArray_moduleA"
+>moduleA : typeof moduleA
 
 var xs2: typeof moduleA[] = [moduleA];
->xs2 : typeof "tests/cases/compiler/aliasUsageInArray_moduleA"[]
->moduleA : typeof "tests/cases/compiler/aliasUsageInArray_moduleA"
->[moduleA] : typeof "tests/cases/compiler/aliasUsageInArray_moduleA"[]
->moduleA : typeof "tests/cases/compiler/aliasUsageInArray_moduleA"
+>xs2 : typeof moduleA[]
+>moduleA : typeof moduleA
+>[moduleA] : typeof moduleA[]
+>moduleA : typeof moduleA
 
 === tests/cases/compiler/aliasUsageInArray_backbone.ts ===
 export class Model {
@@ -36,12 +36,12 @@ export class Model {
 
 === tests/cases/compiler/aliasUsageInArray_moduleA.ts ===
 import Backbone = require("aliasUsageInArray_backbone");
->Backbone : typeof "tests/cases/compiler/aliasUsageInArray_backbone"
+>Backbone : Backbone
 
 export class VisualizationModel extends Backbone.Model {
 >VisualizationModel : VisualizationModel
 >Backbone : Backbone
->Model : Model
+>Model : Backbone.Model
 
     // interesting stuff here
 }
diff --git a/tests/baselines/reference/aliasUsageInFunctionExpression.types b/tests/baselines/reference/aliasUsageInFunctionExpression.types
index 1ab7065f00f..cf729fdb9d9 100644
--- a/tests/baselines/reference/aliasUsageInFunctionExpression.types
+++ b/tests/baselines/reference/aliasUsageInFunctionExpression.types
@@ -1,17 +1,17 @@
 === tests/cases/compiler/aliasUsageInFunctionExpression_main.ts ===
 import Backbone = require("aliasUsageInFunctionExpression_backbone");
->Backbone : typeof "tests/cases/compiler/aliasUsageInFunctionExpression_backbone"
+>Backbone : Backbone
 
 import moduleA = require("aliasUsageInFunctionExpression_moduleA");
->moduleA : typeof "tests/cases/compiler/aliasUsageInFunctionExpression_moduleA"
+>moduleA : moduleA
 
 interface IHasVisualizationModel {
 >IHasVisualizationModel : IHasVisualizationModel
 
     VisualizationModel: typeof Backbone.Model;
->VisualizationModel : typeof Model
->Backbone : typeof "tests/cases/compiler/aliasUsageInFunctionExpression_backbone"
->Model : typeof Model
+>VisualizationModel : typeof Backbone.Model
+>Backbone : typeof Backbone
+>Model : typeof Backbone.Model
 }
 var f = (x: IHasVisualizationModel) => x;
 >f : (x: IHasVisualizationModel) => IHasVisualizationModel
@@ -21,11 +21,11 @@ var f = (x: IHasVisualizationModel) => x;
 >x : IHasVisualizationModel
 
 f = (x) => moduleA;
->f = (x) => moduleA : (x: IHasVisualizationModel) => typeof "tests/cases/compiler/aliasUsageInFunctionExpression_moduleA"
+>f = (x) => moduleA : (x: IHasVisualizationModel) => typeof moduleA
 >f : (x: IHasVisualizationModel) => IHasVisualizationModel
->(x) => moduleA : (x: IHasVisualizationModel) => typeof "tests/cases/compiler/aliasUsageInFunctionExpression_moduleA"
+>(x) => moduleA : (x: IHasVisualizationModel) => typeof moduleA
 >x : IHasVisualizationModel
->moduleA : typeof "tests/cases/compiler/aliasUsageInFunctionExpression_moduleA"
+>moduleA : typeof moduleA
 
 === tests/cases/compiler/aliasUsageInFunctionExpression_backbone.ts ===
 export class Model {
@@ -37,12 +37,12 @@ export class Model {
 
 === tests/cases/compiler/aliasUsageInFunctionExpression_moduleA.ts ===
 import Backbone = require("aliasUsageInFunctionExpression_backbone");
->Backbone : typeof "tests/cases/compiler/aliasUsageInFunctionExpression_backbone"
+>Backbone : Backbone
 
 export class VisualizationModel extends Backbone.Model {
 >VisualizationModel : VisualizationModel
 >Backbone : Backbone
->Model : Model
+>Model : Backbone.Model
 
     // interesting stuff here
 }
diff --git a/tests/baselines/reference/aliasUsageInGenericFunction.types b/tests/baselines/reference/aliasUsageInGenericFunction.types
index a54953520db..d9d4f3f1e1e 100644
--- a/tests/baselines/reference/aliasUsageInGenericFunction.types
+++ b/tests/baselines/reference/aliasUsageInGenericFunction.types
@@ -1,17 +1,17 @@
 === tests/cases/compiler/aliasUsageInGenericFunction_main.ts ===
 import Backbone = require("aliasUsageInGenericFunction_backbone");
->Backbone : typeof "tests/cases/compiler/aliasUsageInGenericFunction_backbone"
+>Backbone : Backbone
 
 import moduleA = require("aliasUsageInGenericFunction_moduleA");
->moduleA : typeof "tests/cases/compiler/aliasUsageInGenericFunction_moduleA"
+>moduleA : moduleA
 
 interface IHasVisualizationModel {
 >IHasVisualizationModel : IHasVisualizationModel
 
     VisualizationModel: typeof Backbone.Model;
->VisualizationModel : typeof Model
->Backbone : typeof "tests/cases/compiler/aliasUsageInGenericFunction_backbone"
->Model : typeof Model
+>VisualizationModel : typeof Backbone.Model
+>Backbone : typeof Backbone
+>Model : typeof Backbone.Model
 }
 function foo<T extends { a: IHasVisualizationModel }>(x: T) {
 >foo : typeof foo
@@ -25,12 +25,12 @@ function foo<T extends { a: IHasVisualizationModel }>(x: T) {
 >x : T
 }
 var r = foo({ a: moduleA });
->r : { a: typeof "tests/cases/compiler/aliasUsageInGenericFunction_moduleA"; }
->foo({ a: moduleA }) : { a: typeof "tests/cases/compiler/aliasUsageInGenericFunction_moduleA"; }
+>r : { a: typeof moduleA; }
+>foo({ a: moduleA }) : { a: typeof moduleA; }
 >foo : typeof foo
->{ a: moduleA } : { a: typeof "tests/cases/compiler/aliasUsageInGenericFunction_moduleA"; }
->a : typeof "tests/cases/compiler/aliasUsageInGenericFunction_moduleA"
->moduleA : moduleA
+>{ a: moduleA } : { a: typeof moduleA; }
+>a : typeof moduleA
+>moduleA : typeof moduleA
 
 var r2 = foo({ a: <IHasVisualizationModel>null });
 >r2 : { a: IHasVisualizationModel; }
@@ -51,12 +51,12 @@ export class Model {
 
 === tests/cases/compiler/aliasUsageInGenericFunction_moduleA.ts ===
 import Backbone = require("aliasUsageInGenericFunction_backbone");
->Backbone : typeof "tests/cases/compiler/aliasUsageInGenericFunction_backbone"
+>Backbone : Backbone
 
 export class VisualizationModel extends Backbone.Model {
 >VisualizationModel : VisualizationModel
 >Backbone : Backbone
->Model : Model
+>Model : Backbone.Model
 
     // interesting stuff here
 }
diff --git a/tests/baselines/reference/aliasUsageInIndexerOfClass.types b/tests/baselines/reference/aliasUsageInIndexerOfClass.types
index dab53004c49..636c0fd1bb5 100644
--- a/tests/baselines/reference/aliasUsageInIndexerOfClass.types
+++ b/tests/baselines/reference/aliasUsageInIndexerOfClass.types
@@ -1,17 +1,17 @@
 === tests/cases/compiler/aliasUsageInIndexerOfClass_main.ts ===
 import Backbone = require("aliasUsageInIndexerOfClass_backbone");
->Backbone : typeof "tests/cases/compiler/aliasUsageInIndexerOfClass_backbone"
+>Backbone : Backbone
 
 import moduleA = require("aliasUsageInIndexerOfClass_moduleA");
->moduleA : typeof "tests/cases/compiler/aliasUsageInIndexerOfClass_moduleA"
+>moduleA : moduleA
 
 interface IHasVisualizationModel {
 >IHasVisualizationModel : IHasVisualizationModel
 
     VisualizationModel: typeof Backbone.Model;
->VisualizationModel : typeof Model
->Backbone : typeof "tests/cases/compiler/aliasUsageInIndexerOfClass_backbone"
->Model : typeof Model
+>VisualizationModel : typeof Backbone.Model
+>Backbone : typeof Backbone
+>Model : typeof Backbone.Model
 }
 class N {
 >N : N
@@ -21,15 +21,15 @@ class N {
 >IHasVisualizationModel : IHasVisualizationModel
 
     x = moduleA;
->x : typeof "tests/cases/compiler/aliasUsageInIndexerOfClass_moduleA"
->moduleA : typeof "tests/cases/compiler/aliasUsageInIndexerOfClass_moduleA"
+>x : typeof moduleA
+>moduleA : typeof moduleA
 }
 class N2 {
 >N2 : N2
 
     [idx: string]: typeof moduleA
 >idx : string
->moduleA : typeof "tests/cases/compiler/aliasUsageInIndexerOfClass_moduleA"
+>moduleA : typeof moduleA
 
     x: IHasVisualizationModel;
 >x : IHasVisualizationModel
@@ -45,12 +45,12 @@ export class Model {
 
 === tests/cases/compiler/aliasUsageInIndexerOfClass_moduleA.ts ===
 import Backbone = require("aliasUsageInIndexerOfClass_backbone");
->Backbone : typeof "tests/cases/compiler/aliasUsageInIndexerOfClass_backbone"
+>Backbone : Backbone
 
 export class VisualizationModel extends Backbone.Model {
 >VisualizationModel : VisualizationModel
 >Backbone : Backbone
->Model : Model
+>Model : Backbone.Model
 
     // interesting stuff here
 }
diff --git a/tests/baselines/reference/aliasUsageInObjectLiteral.types b/tests/baselines/reference/aliasUsageInObjectLiteral.types
index 4fccdbf0c19..e2fafc04931 100644
--- a/tests/baselines/reference/aliasUsageInObjectLiteral.types
+++ b/tests/baselines/reference/aliasUsageInObjectLiteral.types
@@ -1,44 +1,44 @@
 === tests/cases/compiler/aliasUsageInObjectLiteral_main.ts ===
 import Backbone = require("aliasUsageInObjectLiteral_backbone");
->Backbone : typeof "tests/cases/compiler/aliasUsageInObjectLiteral_backbone"
+>Backbone : Backbone
 
 import moduleA = require("aliasUsageInObjectLiteral_moduleA");
->moduleA : typeof "tests/cases/compiler/aliasUsageInObjectLiteral_moduleA"
+>moduleA : moduleA
 
 interface IHasVisualizationModel {
 >IHasVisualizationModel : IHasVisualizationModel
 
     VisualizationModel: typeof Backbone.Model;
->VisualizationModel : typeof Model
->Backbone : typeof "tests/cases/compiler/aliasUsageInObjectLiteral_backbone"
->Model : typeof Model
+>VisualizationModel : typeof Backbone.Model
+>Backbone : typeof Backbone
+>Model : typeof Backbone.Model
 }
 var a: { x: typeof moduleA } = { x: moduleA };
->a : { x: typeof "tests/cases/compiler/aliasUsageInObjectLiteral_moduleA"; }
->x : typeof "tests/cases/compiler/aliasUsageInObjectLiteral_moduleA"
->moduleA : typeof "tests/cases/compiler/aliasUsageInObjectLiteral_moduleA"
->{ x: moduleA } : { x: typeof "tests/cases/compiler/aliasUsageInObjectLiteral_moduleA"; }
->x : typeof "tests/cases/compiler/aliasUsageInObjectLiteral_moduleA"
->moduleA : moduleA
+>a : { x: typeof moduleA; }
+>x : typeof moduleA
+>moduleA : typeof moduleA
+>{ x: moduleA } : { x: typeof moduleA; }
+>x : typeof moduleA
+>moduleA : typeof moduleA
 
 var b: { x: IHasVisualizationModel } = { x: moduleA };
 >b : { x: IHasVisualizationModel; }
 >x : IHasVisualizationModel
 >IHasVisualizationModel : IHasVisualizationModel
->{ x: moduleA } : { x: typeof "tests/cases/compiler/aliasUsageInObjectLiteral_moduleA"; }
->x : typeof "tests/cases/compiler/aliasUsageInObjectLiteral_moduleA"
->moduleA : moduleA
+>{ x: moduleA } : { x: typeof moduleA; }
+>x : typeof moduleA
+>moduleA : typeof moduleA
 
 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 "tests/cases/compiler/aliasUsageInObjectLiteral_moduleA"; }; }
->y : { z: typeof "tests/cases/compiler/aliasUsageInObjectLiteral_moduleA"; }
->{ z: moduleA } : { z: typeof "tests/cases/compiler/aliasUsageInObjectLiteral_moduleA"; }
->z : typeof "tests/cases/compiler/aliasUsageInObjectLiteral_moduleA"
->moduleA : moduleA
+>{ y: { z: moduleA } } : { y: { z: typeof moduleA; }; }
+>y : { z: typeof moduleA; }
+>{ z: moduleA } : { z: typeof moduleA; }
+>z : typeof moduleA
+>moduleA : typeof moduleA
 
 === tests/cases/compiler/aliasUsageInObjectLiteral_backbone.ts ===
 export class Model {
@@ -50,12 +50,12 @@ export class Model {
 
 === tests/cases/compiler/aliasUsageInObjectLiteral_moduleA.ts ===
 import Backbone = require("aliasUsageInObjectLiteral_backbone");
->Backbone : typeof "tests/cases/compiler/aliasUsageInObjectLiteral_backbone"
+>Backbone : Backbone
 
 export class VisualizationModel extends Backbone.Model {
 >VisualizationModel : VisualizationModel
 >Backbone : Backbone
->Model : Model
+>Model : Backbone.Model
 
     // interesting stuff here
 }
diff --git a/tests/baselines/reference/aliasUsageInOrExpression.types b/tests/baselines/reference/aliasUsageInOrExpression.types
index 45f1fc50302..b2a2a27178a 100644
--- a/tests/baselines/reference/aliasUsageInOrExpression.types
+++ b/tests/baselines/reference/aliasUsageInOrExpression.types
@@ -1,17 +1,17 @@
 === tests/cases/compiler/aliasUsageInOrExpression_main.ts ===
 import Backbone = require("aliasUsageInOrExpression_backbone");
->Backbone : typeof "tests/cases/compiler/aliasUsageInOrExpression_backbone"
+>Backbone : Backbone
 
 import moduleA = require("aliasUsageInOrExpression_moduleA");
->moduleA : typeof "tests/cases/compiler/aliasUsageInOrExpression_moduleA"
+>moduleA : moduleA
 
 interface IHasVisualizationModel {
 >IHasVisualizationModel : IHasVisualizationModel
 
     VisualizationModel: typeof Backbone.Model;
->VisualizationModel : typeof Model
->Backbone : typeof "tests/cases/compiler/aliasUsageInOrExpression_backbone"
->Model : typeof Model
+>VisualizationModel : typeof Backbone.Model
+>Backbone : typeof Backbone
+>Model : typeof Backbone.Model
 }
 var i: IHasVisualizationModel;
 >i : IHasVisualizationModel
@@ -21,20 +21,20 @@ var d1 = i || moduleA;
 >d1 : IHasVisualizationModel
 >i || moduleA : IHasVisualizationModel
 >i : IHasVisualizationModel
->moduleA : typeof "tests/cases/compiler/aliasUsageInOrExpression_moduleA"
+>moduleA : typeof moduleA
 
 var d2: IHasVisualizationModel = i || moduleA;
 >d2 : IHasVisualizationModel
 >IHasVisualizationModel : IHasVisualizationModel
 >i || moduleA : IHasVisualizationModel
 >i : IHasVisualizationModel
->moduleA : typeof "tests/cases/compiler/aliasUsageInOrExpression_moduleA"
+>moduleA : typeof moduleA
 
 var d2: IHasVisualizationModel = moduleA || i;
 >d2 : IHasVisualizationModel
 >IHasVisualizationModel : IHasVisualizationModel
 >moduleA || i : IHasVisualizationModel
->moduleA : typeof "tests/cases/compiler/aliasUsageInOrExpression_moduleA"
+>moduleA : typeof moduleA
 >i : IHasVisualizationModel
 
 var e: { x: IHasVisualizationModel } = <{ x: IHasVisualizationModel }>null || { x: moduleA };
@@ -45,9 +45,9 @@ var e: { x: IHasVisualizationModel } = <{ x: IHasVisualizationModel }>null || {
 ><{ x: IHasVisualizationModel }>null : { x: IHasVisualizationModel; }
 >x : IHasVisualizationModel
 >IHasVisualizationModel : IHasVisualizationModel
->{ x: moduleA } : { x: typeof "tests/cases/compiler/aliasUsageInOrExpression_moduleA"; }
->x : typeof "tests/cases/compiler/aliasUsageInOrExpression_moduleA"
->moduleA : moduleA
+>{ x: moduleA } : { x: typeof moduleA; }
+>x : typeof moduleA
+>moduleA : typeof moduleA
 
 var f: { x: IHasVisualizationModel } = <{ x: IHasVisualizationModel }>null ? { x: moduleA } : null;
 >f : { x: IHasVisualizationModel; }
@@ -57,9 +57,9 @@ var f: { x: IHasVisualizationModel } = <{ x: IHasVisualizationModel }>null ? { x
 ><{ x: IHasVisualizationModel }>null : { x: IHasVisualizationModel; }
 >x : IHasVisualizationModel
 >IHasVisualizationModel : IHasVisualizationModel
->{ x: moduleA } : { x: typeof "tests/cases/compiler/aliasUsageInOrExpression_moduleA"; }
->x : typeof "tests/cases/compiler/aliasUsageInOrExpression_moduleA"
->moduleA : moduleA
+>{ x: moduleA } : { x: typeof moduleA; }
+>x : typeof moduleA
+>moduleA : typeof moduleA
 
 === tests/cases/compiler/aliasUsageInOrExpression_backbone.ts ===
 export class Model {
@@ -71,12 +71,12 @@ export class Model {
 
 === tests/cases/compiler/aliasUsageInOrExpression_moduleA.ts ===
 import Backbone = require("aliasUsageInOrExpression_backbone");
->Backbone : typeof "tests/cases/compiler/aliasUsageInOrExpression_backbone"
+>Backbone : Backbone
 
 export class VisualizationModel extends Backbone.Model {
 >VisualizationModel : VisualizationModel
 >Backbone : Backbone
->Model : Model
+>Model : Backbone.Model
 
     // interesting stuff here
 }
diff --git a/tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.types b/tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.types
index d66878258f8..8418ebb0b02 100644
--- a/tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.types
+++ b/tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.types
@@ -1,17 +1,17 @@
 === tests/cases/compiler/aliasUsageInTypeArgumentOfExtendsClause_main.ts ===
 import Backbone = require("aliasUsageInTypeArgumentOfExtendsClause_backbone");
->Backbone : typeof "tests/cases/compiler/aliasUsageInTypeArgumentOfExtendsClause_backbone"
+>Backbone : Backbone
 
 import moduleA = require("aliasUsageInTypeArgumentOfExtendsClause_moduleA");
->moduleA : typeof "tests/cases/compiler/aliasUsageInTypeArgumentOfExtendsClause_moduleA"
+>moduleA : moduleA
 
 interface IHasVisualizationModel {
 >IHasVisualizationModel : IHasVisualizationModel
 
     VisualizationModel: typeof Backbone.Model;
->VisualizationModel : typeof Model
->Backbone : typeof "tests/cases/compiler/aliasUsageInTypeArgumentOfExtendsClause_backbone"
->Model : typeof Model
+>VisualizationModel : typeof Backbone.Model
+>Backbone : typeof Backbone
+>Model : typeof Backbone.Model
 }
 class C<T extends IHasVisualizationModel> {
 >C : C<T>
@@ -28,8 +28,8 @@ class D extends C<IHasVisualizationModel> {
 >IHasVisualizationModel : IHasVisualizationModel
 
     x = moduleA;
->x : typeof "tests/cases/compiler/aliasUsageInTypeArgumentOfExtendsClause_moduleA"
->moduleA : typeof "tests/cases/compiler/aliasUsageInTypeArgumentOfExtendsClause_moduleA"
+>x : typeof moduleA
+>moduleA : typeof moduleA
 }
 === tests/cases/compiler/aliasUsageInTypeArgumentOfExtendsClause_backbone.ts ===
 export class Model {
@@ -41,12 +41,12 @@ export class Model {
 
 === tests/cases/compiler/aliasUsageInTypeArgumentOfExtendsClause_moduleA.ts ===
 import Backbone = require("aliasUsageInTypeArgumentOfExtendsClause_backbone");
->Backbone : typeof "tests/cases/compiler/aliasUsageInTypeArgumentOfExtendsClause_backbone"
+>Backbone : Backbone
 
 export class VisualizationModel extends Backbone.Model {
 >VisualizationModel : VisualizationModel
 >Backbone : Backbone
->Model : Model
+>Model : Backbone.Model
 
     // interesting stuff here
 }
diff --git a/tests/baselines/reference/aliasUsageInVarAssignment.types b/tests/baselines/reference/aliasUsageInVarAssignment.types
index a258652d6c9..4d1fece3c41 100644
--- a/tests/baselines/reference/aliasUsageInVarAssignment.types
+++ b/tests/baselines/reference/aliasUsageInVarAssignment.types
@@ -1,25 +1,25 @@
 === tests/cases/compiler/aliasUsageInVarAssignment_main.ts ===
 import Backbone = require("aliasUsageInVarAssignment_backbone");
->Backbone : typeof "tests/cases/compiler/aliasUsageInVarAssignment_backbone"
+>Backbone : Backbone
 
 import moduleA = require("aliasUsageInVarAssignment_moduleA");
->moduleA : typeof "tests/cases/compiler/aliasUsageInVarAssignment_moduleA"
+>moduleA : moduleA
 
 interface IHasVisualizationModel {
 >IHasVisualizationModel : IHasVisualizationModel
 
     VisualizationModel: typeof Backbone.Model;
->VisualizationModel : typeof Model
->Backbone : typeof "tests/cases/compiler/aliasUsageInVarAssignment_backbone"
->Model : typeof Model
+>VisualizationModel : typeof Backbone.Model
+>Backbone : typeof Backbone
+>Model : typeof Backbone.Model
 }
 var i: IHasVisualizationModel;
 >i : IHasVisualizationModel
 >IHasVisualizationModel : IHasVisualizationModel
 
 var m: typeof moduleA = i;
->m : typeof "tests/cases/compiler/aliasUsageInVarAssignment_moduleA"
->moduleA : typeof "tests/cases/compiler/aliasUsageInVarAssignment_moduleA"
+>m : typeof moduleA
+>moduleA : typeof moduleA
 >i : IHasVisualizationModel
 
 === tests/cases/compiler/aliasUsageInVarAssignment_backbone.ts ===
@@ -32,12 +32,12 @@ export class Model {
 
 === tests/cases/compiler/aliasUsageInVarAssignment_moduleA.ts ===
 import Backbone = require("aliasUsageInVarAssignment_backbone");
->Backbone : typeof "tests/cases/compiler/aliasUsageInVarAssignment_backbone"
+>Backbone : Backbone
 
 export class VisualizationModel extends Backbone.Model {
 >VisualizationModel : VisualizationModel
 >Backbone : Backbone
->Model : Model
+>Model : Backbone.Model
 
     // interesting stuff here
 }
diff --git a/tests/baselines/reference/aliasUsedAsNameValue.types b/tests/baselines/reference/aliasUsedAsNameValue.types
index 8783d3fd14e..222e075393c 100644
--- a/tests/baselines/reference/aliasUsedAsNameValue.types
+++ b/tests/baselines/reference/aliasUsedAsNameValue.types
@@ -2,10 +2,10 @@
 ///<reference path='aliasUsedAsNameValue_0.ts' />
 ///<reference path='aliasUsedAsNameValue_1.ts' />
 import mod = require("aliasUsedAsNameValue_0");
->mod : typeof "tests/cases/compiler/aliasUsedAsNameValue_0"
+>mod : mod
 
 import b = require("aliasUsedAsNameValue_1");
->b : typeof "tests/cases/compiler/aliasUsedAsNameValue_1"
+>b : b
  
 export var a = function () {
 >a : () => void
@@ -14,10 +14,10 @@ export var a = function () {
     //var x = mod.id; // TODO needed hack that mod is loaded
     b.b(mod);
 >b.b(mod) : any
->b.b : typeof b
->b : typeof "tests/cases/compiler/aliasUsedAsNameValue_1"
+>b.b : typeof b.b
 >b : typeof b
->mod : typeof "tests/cases/compiler/aliasUsedAsNameValue_0"
+>b : typeof b.b
+>mod : typeof mod
 }
 
 === tests/cases/compiler/aliasUsedAsNameValue_0.ts ===
diff --git a/tests/baselines/reference/ambientDeclarations.types b/tests/baselines/reference/ambientDeclarations.types
index 11b7bae1617..4bc2500312a 100644
--- a/tests/baselines/reference/ambientDeclarations.types
+++ b/tests/baselines/reference/ambientDeclarations.types
@@ -67,7 +67,7 @@ declare class cls {
 >cls : cls
 
     static static(p): number;
->static : typeof static
+>static : (p: any) => number
 >p : any
 
     static q;
@@ -77,7 +77,7 @@ declare class cls {
 >fn : () => any
 
     private static fns();
->fns : typeof fns
+>fns : () => any
 }
 
 // Ambient enum
@@ -122,7 +122,7 @@ declare enum E3 {
 >A : E3
 }
 declare module E3 {
->E3 : typeof E3
+>E3 : E3
 
     var B;
 >B : any
@@ -135,7 +135,7 @@ var x = E3.B;
 
 // Ambient module
 declare module M1 {
->M1 : typeof M1
+>M1 : M1
 
     var x;
 >x : any
@@ -154,9 +154,9 @@ var p = M1.x;
 var q = M1.fn();
 >q : number
 >M1.fn() : number
->M1.fn : typeof fn
+>M1.fn : typeof M1.fn
 >M1 : typeof M1
->fn : typeof fn
+>fn : typeof M1.fn
 
 // Ambient external module in the global module
 // Ambient external module with a string literal name that is a top level external module name
diff --git a/tests/baselines/reference/ambientEnumElementInitializer6.types b/tests/baselines/reference/ambientEnumElementInitializer6.types
index 3a38fd6912d..39964d92da4 100644
--- a/tests/baselines/reference/ambientEnumElementInitializer6.types
+++ b/tests/baselines/reference/ambientEnumElementInitializer6.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/ambientEnumElementInitializer6.ts ===
 declare module M {
->M : typeof M
+>M : M
 
     enum E {
 >E : E
diff --git a/tests/baselines/reference/ambientExternalModuleWithInternalImportDeclaration.types b/tests/baselines/reference/ambientExternalModuleWithInternalImportDeclaration.types
index ae37e5b7581..7b17c613261 100644
--- a/tests/baselines/reference/ambientExternalModuleWithInternalImportDeclaration.types
+++ b/tests/baselines/reference/ambientExternalModuleWithInternalImportDeclaration.types
@@ -1,33 +1,33 @@
 === tests/cases/compiler/ambientExternalModuleWithInternalImportDeclaration_1.ts ===
 ///<reference path='ambientExternalModuleWithInternalImportDeclaration_0.ts'/>
 import A = require('M');
->A : typeof C
+>A : A
 
 var c = new A();
->c : C
->new A() : C
->A : typeof C
+>c : A
+>new A() : A
+>A : typeof A
 
 === tests/cases/compiler/ambientExternalModuleWithInternalImportDeclaration_0.ts ===
 declare module 'M' {
     module C {
->C : typeof C
+>C : X
 
         export var f: number;
 >f : number
     }
     class C {
->C : C
+>C : X
 
         foo(): void;
 >foo : () => void
     }
     import X = C;
->X : typeof C
->C : C
+>X : X
+>C : X
 
     export = X;
->X : C
+>X : X
 
 }
 
diff --git a/tests/baselines/reference/ambientExternalModuleWithoutInternalImportDeclaration.types b/tests/baselines/reference/ambientExternalModuleWithoutInternalImportDeclaration.types
index d23f33402bc..3144658ad7d 100644
--- a/tests/baselines/reference/ambientExternalModuleWithoutInternalImportDeclaration.types
+++ b/tests/baselines/reference/ambientExternalModuleWithoutInternalImportDeclaration.types
@@ -1,17 +1,17 @@
 === tests/cases/compiler/ambientExternalModuleWithoutInternalImportDeclaration_1.ts ===
 ///<reference path='ambientExternalModuleWithoutInternalImportDeclaration_0.ts'/>
 import A = require('M');
->A : typeof C
+>A : A
 
 var c = new A();
->c : C
->new A() : C
->A : typeof C
+>c : A
+>new A() : A
+>A : typeof A
 
 === tests/cases/compiler/ambientExternalModuleWithoutInternalImportDeclaration_0.ts ===
 declare module 'M' {
     module C {
->C : typeof C
+>C : C
 
         export var f: number;
 >f : number
diff --git a/tests/baselines/reference/ambientFundule.types b/tests/baselines/reference/ambientFundule.types
index edd2290859c..02b980f98fe 100644
--- a/tests/baselines/reference/ambientFundule.types
+++ b/tests/baselines/reference/ambientFundule.types
@@ -3,7 +3,7 @@ declare function f();
 >f : typeof f
 
 declare module f { var x }
->f : typeof f
+>f : f
 >x : any
 
 declare function f(x);
diff --git a/tests/baselines/reference/ambientModuleExports.types b/tests/baselines/reference/ambientModuleExports.types
index deb49b17694..5137a5a1647 100644
--- a/tests/baselines/reference/ambientModuleExports.types
+++ b/tests/baselines/reference/ambientModuleExports.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/ambientModuleExports.ts ===
 declare module Foo {
->Foo : typeof Foo
+>Foo : Foo
 
 	function a():void;
 >a : typeof a
@@ -14,9 +14,9 @@ declare module Foo {
 
 Foo.a();
 >Foo.a() : void
->Foo.a : typeof a
+>Foo.a : typeof Foo.a
 >Foo : typeof Foo
->a : typeof a
+>a : typeof Foo.a
 
 Foo.b;
 >Foo.b : number
@@ -24,14 +24,14 @@ Foo.b;
 >b : number
 
 var c = new Foo.C();
->c : C
->new Foo.C() : C
->Foo.C : typeof C
+>c : Foo.C
+>new Foo.C() : Foo.C
+>Foo.C : typeof Foo.C
 >Foo : typeof Foo
->C : typeof C
+>C : typeof Foo.C
 
 declare module Foo2 {
->Foo2 : typeof Foo2
+>Foo2 : Foo2
 
     export function a(): void;
 >a : typeof a
@@ -45,9 +45,9 @@ declare module Foo2 {
 
 Foo2.a();
 >Foo2.a() : void
->Foo2.a : typeof a
+>Foo2.a : typeof Foo2.a
 >Foo2 : typeof Foo2
->a : typeof a
+>a : typeof Foo2.a
 
 Foo2.b;
 >Foo2.b : number
@@ -55,9 +55,9 @@ Foo2.b;
 >b : number
 
 var c2 = new Foo2.C();
->c2 : C
->new Foo2.C() : C
->Foo2.C : typeof C
+>c2 : Foo2.C
+>new Foo2.C() : Foo2.C
+>Foo2.C : typeof Foo2.C
 >Foo2 : typeof Foo2
->C : typeof C
+>C : typeof Foo2.C
 
diff --git a/tests/baselines/reference/ambientModuleWithClassDeclarationWithExtends.types b/tests/baselines/reference/ambientModuleWithClassDeclarationWithExtends.types
index 2708946518f..1c87917c114 100644
--- a/tests/baselines/reference/ambientModuleWithClassDeclarationWithExtends.types
+++ b/tests/baselines/reference/ambientModuleWithClassDeclarationWithExtends.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/ambientModuleWithClassDeclarationWithExtends.ts ===
 declare module foo {
->foo : typeof foo
+>foo : foo
 
     class A { }
 >A : A
diff --git a/tests/baselines/reference/ambientModules.types b/tests/baselines/reference/ambientModules.types
index da6d3b77201..d66cf7db215 100644
--- a/tests/baselines/reference/ambientModules.types
+++ b/tests/baselines/reference/ambientModules.types
@@ -1,14 +1,14 @@
 === tests/cases/compiler/ambientModules.ts ===
 declare module Foo.Bar { export var foo; };
->Foo : typeof Foo
->Bar : typeof Bar
+>Foo : Foo
+>Bar : Bar
 >foo : any
 
 Foo.Bar.foo = 5; 
 >Foo.Bar.foo = 5 : number
 >Foo.Bar.foo : any
->Foo.Bar : typeof Bar
+>Foo.Bar : typeof Foo.Bar
 >Foo : typeof Foo
->Bar : typeof Bar
+>Bar : typeof Foo.Bar
 >foo : any
 
diff --git a/tests/baselines/reference/amdImportAsPrimaryExpression.types b/tests/baselines/reference/amdImportAsPrimaryExpression.types
index ac2f63709df..d0d86bbead3 100644
--- a/tests/baselines/reference/amdImportAsPrimaryExpression.types
+++ b/tests/baselines/reference/amdImportAsPrimaryExpression.types
@@ -1,14 +1,14 @@
 === tests/cases/conformance/externalModules/foo_1.ts ===
 import foo = require("./foo_0");
->foo : typeof "tests/cases/conformance/externalModules/foo_0"
+>foo : foo
 
 if(foo.E1.A === 0){
 >foo.E1.A === 0 : boolean
->foo.E1.A : E1
->foo.E1 : typeof E1
->foo : typeof "tests/cases/conformance/externalModules/foo_0"
->E1 : typeof E1
->A : E1
+>foo.E1.A : foo.E1
+>foo.E1 : typeof foo.E1
+>foo : typeof foo
+>E1 : typeof foo.E1
+>A : foo.E1
 
 	// Should cause runtime import - interesting optimization possibility, as gets inlined to 0.
 }
diff --git a/tests/baselines/reference/amdImportNotAsPrimaryExpression.types b/tests/baselines/reference/amdImportNotAsPrimaryExpression.types
index affce41c42e..3242c58465d 100644
--- a/tests/baselines/reference/amdImportNotAsPrimaryExpression.types
+++ b/tests/baselines/reference/amdImportNotAsPrimaryExpression.types
@@ -1,43 +1,43 @@
 === tests/cases/conformance/externalModules/foo_1.ts ===
 import foo = require("./foo_0");
->foo : typeof "tests/cases/conformance/externalModules/foo_0"
+>foo : foo
 
 // None of the below should cause a runtime dependency on foo_0
 import f = foo.M1;
 >f : f
->foo : typeof "tests/cases/conformance/externalModules/foo_0"
->M1 : M1
+>foo : typeof foo
+>M1 : foo.M1
 
 var i: f.I2;
->i : I2
+>i : f.I2
 >f : f
->I2 : I2
+>I2 : f.I2
 
 var x: foo.C1 = <{m1: number}>{};
->x : C1
+>x : foo.C1
 >foo : foo
->C1 : C1
+>C1 : foo.C1
 ><{m1: number}>{} : { m1: number; }
 >m1 : number
 >{} : {}
 
 var y: typeof foo.C1.s1 = false;
 >y : boolean
->foo : typeof "tests/cases/conformance/externalModules/foo_0"
->C1 : typeof C1
+>foo : typeof foo
+>C1 : typeof foo.C1
 >s1 : boolean
 
 var z: foo.M1.I2;
->z : I2
+>z : f.I2
 >foo : foo
->M1 : M1
->I2 : I2
+>M1 : foo.M1
+>I2 : f.I2
 
 var e: number = <foo.E1>0;
 >e : number
-><foo.E1>0 : E1
+><foo.E1>0 : foo.E1
 >foo : foo
->E1 : E1
+>E1 : foo.E1
 
 === tests/cases/conformance/externalModules/foo_0.ts ===
 export class C1 {
diff --git a/tests/baselines/reference/anonterface.types b/tests/baselines/reference/anonterface.types
index b71f7526b3f..9249a23020b 100644
--- a/tests/baselines/reference/anonterface.types
+++ b/tests/baselines/reference/anonterface.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/anonterface.ts ===
 module M {
->M : typeof M
+>M : M
 
     export class C {
 >C : C
@@ -20,16 +20,16 @@ module M {
 }
 
 var c=new M.C();
->c : C
->new M.C() : C
->M.C : typeof C
+>c : M.C
+>new M.C() : M.C
+>M.C : typeof M.C
 >M : typeof M
->C : typeof C
+>C : typeof M.C
 
 c.m(function(n) { return "hello: "+n; },18);
 >c.m(function(n) { return "hello: "+n; },18) : string
 >c.m : (fn: (n: number) => string, n2: number) => string
->c : C
+>c : M.C
 >m : (fn: (n: number) => string, n2: number) => string
 >function(n) { return "hello: "+n; } : (n: number) => string
 >n : number
diff --git a/tests/baselines/reference/anyAssignabilityInInheritance.types b/tests/baselines/reference/anyAssignabilityInInheritance.types
index 795e4a1f332..6e44bb5600f 100644
--- a/tests/baselines/reference/anyAssignabilityInInheritance.types
+++ b/tests/baselines/reference/anyAssignabilityInInheritance.types
@@ -242,7 +242,7 @@ function f() { }
 >f : typeof f
 
 module f {
->f : typeof f
+>f : f
 
     export var bar = 1;
 >bar : number
@@ -268,7 +268,7 @@ class CC { baz: string }
 >baz : string
 
 module CC {
->CC : typeof CC
+>CC : CC
 
     export var bar = 1;
 >bar : number
diff --git a/tests/baselines/reference/argumentsUsedInObjectLiteralProperty.types b/tests/baselines/reference/argumentsUsedInObjectLiteralProperty.types
index 63c7c5d556e..697858534db 100644
--- a/tests/baselines/reference/argumentsUsedInObjectLiteralProperty.types
+++ b/tests/baselines/reference/argumentsUsedInObjectLiteralProperty.types
@@ -3,7 +3,7 @@ class A {
 >A : A
 
     public static createSelectableViewModel(initialState?: any, selectedValue?: any) {
->createSelectableViewModel : typeof createSelectableViewModel
+>createSelectableViewModel : (initialState?: any, selectedValue?: any) => { selectedValue: number; }
 >initialState : any
 >selectedValue : any
 
diff --git a/tests/baselines/reference/arrayAssignmentTest6.types b/tests/baselines/reference/arrayAssignmentTest6.types
index 0c932cb7556..6417afca419 100644
--- a/tests/baselines/reference/arrayAssignmentTest6.types
+++ b/tests/baselines/reference/arrayAssignmentTest6.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/arrayAssignmentTest6.ts ===
 module Test {
->Test : typeof Test
+>Test : Test
 
     interface IState {
 >IState : IState
diff --git a/tests/baselines/reference/arrayAugment.types b/tests/baselines/reference/arrayAugment.types
index b338d7f5c5f..2f18aa6bdd5 100644
--- a/tests/baselines/reference/arrayAugment.types
+++ b/tests/baselines/reference/arrayAugment.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/arrayAugment.ts ===
 interface Array<T> {
->Array : T[]
+>Array : Array<T>
 >T : T
 
     split: (parts: number) => T[][];
diff --git a/tests/baselines/reference/arrayBestCommonTypes.types b/tests/baselines/reference/arrayBestCommonTypes.types
index d3381315aaf..40f74350fe5 100644
--- a/tests/baselines/reference/arrayBestCommonTypes.types
+++ b/tests/baselines/reference/arrayBestCommonTypes.types
@@ -248,7 +248,7 @@ class f {
 >y : string
 >{x: anyObj, y: 'a'} : { x: any; y: string; }
 >x : any
->anyObj : anyObj
+>anyObj : any
 >y : string
 
         var a2 = [ {x: anyObj, y: 'a'}, {x: 0, y: 'a'}, {x: 'a', y: 'a'} ];
@@ -256,7 +256,7 @@ class f {
 >[ {x: anyObj, y: 'a'}, {x: 0, y: 'a'}, {x: 'a', y: 'a'} ] : { x: any; y: string; }[]
 >{x: anyObj, y: 'a'} : { x: any; y: string; }
 >x : any
->anyObj : anyObj
+>anyObj : any
 >y : string
 >{x: 0, y: 'a'} : { x: number; y: string; }
 >x : number
@@ -273,7 +273,7 @@ class f {
 >y : string
 >{x: anyObj, y: 'a'} : { x: any; y: string; }
 >x : any
->anyObj : anyObj
+>anyObj : any
 >y : string
 >{x: 'a', y: 'a'} : { x: string; y: string; }
 >x : string
diff --git a/tests/baselines/reference/arrayConcat2.types b/tests/baselines/reference/arrayConcat2.types
index a4036560305..02348c29119 100644
--- a/tests/baselines/reference/arrayConcat2.types
+++ b/tests/baselines/reference/arrayConcat2.types
@@ -18,7 +18,7 @@ a.concat('Hello');
 var b = new Array<string>();
 >b : string[]
 >new Array<string>() : string[]
->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[]; }
+>Array : { (arrayLength?: number): Array<any>; <T>(arrayLength: number): Array<T>; <T>(...items: Array<T>): Array<T>; new (arrayLength?: number): Array<any>; new <T>(arrayLength: number): Array<T>; new <T>(...items: Array<T>): Array<T>; isArray(arg: any): boolean; prototype: Array<any>; }
 
 b.concat('hello');
 >b.concat('hello') : string[]
diff --git a/tests/baselines/reference/arrayConstructors1.types b/tests/baselines/reference/arrayConstructors1.types
index 8b34f32205e..615f559fcfd 100644
--- a/tests/baselines/reference/arrayConstructors1.types
+++ b/tests/baselines/reference/arrayConstructors1.types
@@ -6,19 +6,19 @@ x = new Array(1);
 >x = new Array(1) : any[]
 >x : string[]
 >new Array(1) : any[]
->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[]; }
+>Array : { (arrayLength?: number): Array<any>; <T>(arrayLength: number): Array<T>; <T>(...items: Array<T>): Array<T>; new (arrayLength?: number): Array<any>; new <T>(arrayLength: number): Array<T>; new <T>(...items: Array<T>): Array<T>; isArray(arg: any): boolean; prototype: Array<any>; }
 
 x = new Array('hi', 'bye'); 
 >x = new Array('hi', 'bye') : string[]
 >x : string[]
 >new Array('hi', 'bye') : string[]
->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[]; }
+>Array : { (arrayLength?: number): Array<any>; <T>(arrayLength: number): Array<T>; <T>(...items: Array<T>): Array<T>; new (arrayLength?: number): Array<any>; new <T>(arrayLength: number): Array<T>; new <T>(...items: Array<T>): Array<T>; isArray(arg: any): boolean; prototype: Array<any>; }
 
 x = new Array<string>('hi', 'bye');
 >x = new Array<string>('hi', 'bye') : string[]
 >x : string[]
 >new Array<string>('hi', 'bye') : string[]
->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[]; }
+>Array : { (arrayLength?: number): Array<any>; <T>(arrayLength: number): Array<T>; <T>(...items: Array<T>): Array<T>; new (arrayLength?: number): Array<any>; new <T>(arrayLength: number): Array<T>; new <T>(...items: Array<T>): Array<T>; isArray(arg: any): boolean; prototype: Array<any>; }
 
 var y: number[];
 >y : number[]
@@ -27,17 +27,17 @@ y = new Array(1);
 >y = new Array(1) : any[]
 >y : number[]
 >new Array(1) : any[]
->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[]; }
+>Array : { (arrayLength?: number): Array<any>; <T>(arrayLength: number): Array<T>; <T>(...items: Array<T>): Array<T>; new (arrayLength?: number): Array<any>; new <T>(arrayLength: number): Array<T>; new <T>(...items: Array<T>): Array<T>; isArray(arg: any): boolean; prototype: Array<any>; }
 
 y = new Array(1,2);
 >y = new Array(1,2) : number[]
 >y : number[]
 >new Array(1,2) : number[]
->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[]; }
+>Array : { (arrayLength?: number): Array<any>; <T>(arrayLength: number): Array<T>; <T>(...items: Array<T>): Array<T>; new (arrayLength?: number): Array<any>; new <T>(arrayLength: number): Array<T>; new <T>(...items: Array<T>): Array<T>; isArray(arg: any): boolean; prototype: Array<any>; }
 
 y = new Array<number>(1, 2);
 >y = new Array<number>(1, 2) : number[]
 >y : number[]
 >new Array<number>(1, 2) : number[]
->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[]; }
+>Array : { (arrayLength?: number): Array<any>; <T>(arrayLength: number): Array<T>; <T>(...items: Array<T>): Array<T>; new (arrayLength?: number): Array<any>; new <T>(arrayLength: number): Array<T>; new <T>(...items: Array<T>): Array<T>; isArray(arg: any): boolean; prototype: Array<any>; }
 
diff --git a/tests/baselines/reference/arrayLiteral.types b/tests/baselines/reference/arrayLiteral.types
index 1b356773dc7..bd979a92b98 100644
--- a/tests/baselines/reference/arrayLiteral.types
+++ b/tests/baselines/reference/arrayLiteral.types
@@ -8,7 +8,7 @@ var x = [];
 var x = new Array(1);
 >x : any[]
 >new Array(1) : any[]
->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[]; }
+>Array : { (arrayLength?: number): Array<any>; <T>(arrayLength: number): Array<T>; <T>(...items: Array<T>): Array<T>; new (arrayLength?: number): Array<any>; new <T>(arrayLength: number): Array<T>; new <T>(...items: Array<T>): Array<T>; isArray(arg: any): boolean; prototype: Array<any>; }
 
 var y = [1];
 >y : number[]
@@ -21,7 +21,7 @@ var y = [1, 2];
 var y = new Array<number>();
 >y : number[]
 >new Array<number>() : number[]
->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[]; }
+>Array : { (arrayLength?: number): Array<any>; <T>(arrayLength: number): Array<T>; <T>(...items: Array<T>): Array<T>; new (arrayLength?: number): Array<any>; new <T>(arrayLength: number): Array<T>; new <T>(...items: Array<T>): Array<T>; isArray(arg: any): boolean; prototype: Array<any>; }
 
 var x2: number[] = [];
 >x2 : number[]
@@ -30,7 +30,7 @@ var x2: number[] = [];
 var x2: number[] = new Array(1);
 >x2 : number[]
 >new Array(1) : any[]
->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[]; }
+>Array : { (arrayLength?: number): Array<any>; <T>(arrayLength: number): Array<T>; <T>(...items: Array<T>): Array<T>; new (arrayLength?: number): Array<any>; new <T>(arrayLength: number): Array<T>; new <T>(...items: Array<T>): Array<T>; isArray(arg: any): boolean; prototype: Array<any>; }
 
 var y2: number[] = [1];
 >y2 : number[]
@@ -43,5 +43,5 @@ var y2: number[] = [1, 2];
 var y2: number[] = new Array<number>();
 >y2 : number[]
 >new Array<number>() : number[]
->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[]; }
+>Array : { (arrayLength?: number): Array<any>; <T>(arrayLength: number): Array<T>; <T>(...items: Array<T>): Array<T>; new (arrayLength?: number): Array<any>; new <T>(arrayLength: number): Array<T>; new <T>(...items: Array<T>): Array<T>; isArray(arg: any): boolean; prototype: Array<any>; }
 
diff --git a/tests/baselines/reference/arrayLiterals.types b/tests/baselines/reference/arrayLiterals.types
index 29dd1b19970..4cc28d4fa8b 100644
--- a/tests/baselines/reference/arrayLiterals.types
+++ b/tests/baselines/reference/arrayLiterals.types
@@ -78,7 +78,7 @@ var classTypeArray = [C, C, C];
 
 var classTypeArray: Array<typeof C>; // Should OK, not be a parse error
 >classTypeArray : typeof C[]
->Array : T[]
+>Array : Array<T>
 >C : typeof C
 
 // Contextual type C with numeric index signature makes array literal of EveryType E of type BCT(E,C)[]
@@ -111,7 +111,7 @@ var context2 = [{ a: '', b: 0, c: '' }, { a: "", b: 3, c: 0 }];
 
 var context2: Array<{}>; // Should be OK
 >context2 : {}[]
->Array : T[]
+>Array : Array<T>
 
 // Contextual type C with numeric index signature of type Base makes array literal of Derived have type Base[]
 class Base { private p; }
diff --git a/tests/baselines/reference/arrayOfExportedClass.types b/tests/baselines/reference/arrayOfExportedClass.types
index 3d542b88d80..333fb38f347 100644
--- a/tests/baselines/reference/arrayOfExportedClass.types
+++ b/tests/baselines/reference/arrayOfExportedClass.types
@@ -1,7 +1,7 @@
 === tests/cases/compiler/arrayOfExportedClass_1.ts ===
 ///<reference path='arrayOfExportedClass_0.ts'/>
 import Car = require('arrayOfExportedClass_0');
->Car : typeof Car
+>Car : Car
 
 class Road {
 >Road : Road
diff --git a/tests/baselines/reference/arrayTypeInSignatureOfInterfaceAndClass.types b/tests/baselines/reference/arrayTypeInSignatureOfInterfaceAndClass.types
index 5425ccf9344..034450e6280 100644
--- a/tests/baselines/reference/arrayTypeInSignatureOfInterfaceAndClass.types
+++ b/tests/baselines/reference/arrayTypeInSignatureOfInterfaceAndClass.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/arrayTypeInSignatureOfInterfaceAndClass.ts ===
 declare module WinJS {
->WinJS : typeof WinJS
+>WinJS : WinJS
 
     class Promise<T> {
 >Promise : Promise<T>
@@ -25,7 +25,7 @@ declare module WinJS {
     }
 }
 declare module Data {
->Data : typeof Data
+>Data : Data
 
     export interface IListItem<T> {
 >IListItem : IListItem<T>
@@ -62,11 +62,11 @@ declare module Data {
 
         //removeIndices: WinJS.Promise<IListItem<T>[]>;
         removeIndices(indices: number[], options?: any): WinJS.Promise<IListItem<T>[]>;
->removeIndices : (indices: number[], options?: any) => Promise<IListItem<T>[]>
+>removeIndices : (indices: number[], options?: any) => WinJS.Promise<IListItem<T>[]>
 >indices : number[]
 >options : any
 >WinJS : WinJS
->Promise : Promise<T>
+>Promise : WinJS.Promise<T>
 >IListItem : IListItem<T>
 >T : T
     }
@@ -78,11 +78,11 @@ declare module Data {
 
         //removeIndices: WinJS.Promise<IListItem<T>[]>;
         public removeIndices(indices: number[], options?: any): WinJS.Promise<IListItem<T>[]>;
->removeIndices : (indices: number[], options?: any) => Promise<IListItem<T>[]>
+>removeIndices : (indices: number[], options?: any) => WinJS.Promise<IListItem<T>[]>
 >indices : number[]
 >options : any
 >WinJS : WinJS
->Promise : Promise<T>
+>Promise : WinJS.Promise<T>
 >IListItem : IListItem<T>
 >T : T
     }
diff --git a/tests/baselines/reference/arrowFunctionInExpressionStatement2.types b/tests/baselines/reference/arrowFunctionInExpressionStatement2.types
index d4bb431fa8d..60613e55a87 100644
--- a/tests/baselines/reference/arrowFunctionInExpressionStatement2.types
+++ b/tests/baselines/reference/arrowFunctionInExpressionStatement2.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/arrowFunctionInExpressionStatement2.ts ===
 module M {
->M : typeof M
+>M : M
 
     () => 0;
 >() => 0 : () => number
diff --git a/tests/baselines/reference/assign1.types b/tests/baselines/reference/assign1.types
index 32b93af647d..18cf4a3d96d 100644
--- a/tests/baselines/reference/assign1.types
+++ b/tests/baselines/reference/assign1.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/assign1.ts ===
 module M {
->M : typeof M
+>M : M
 
     interface I {
 >I : I
diff --git a/tests/baselines/reference/assignmentCompatWithCallSignatures3.types b/tests/baselines/reference/assignmentCompatWithCallSignatures3.types
index 72cceae84ff..6b264a0486c 100644
--- a/tests/baselines/reference/assignmentCompatWithCallSignatures3.types
+++ b/tests/baselines/reference/assignmentCompatWithCallSignatures3.types
@@ -106,23 +106,23 @@ var a11: (x: { foo: string }, y: { foo: string; bar: string }) => Base;
 var a12: (x: Array<Base>, y: Array<Derived2>) => Array<Derived>;
 >a12 : (x: Base[], y: Derived2[]) => Derived[]
 >x : Base[]
->Array : T[]
+>Array : Array<T>
 >Base : Base
 >y : Derived2[]
->Array : T[]
+>Array : Array<T>
 >Derived2 : Derived2
->Array : T[]
+>Array : Array<T>
 >Derived : Derived
 
 var a13: (x: Array<Base>, y: Array<Derived>) => Array<Derived>;
 >a13 : (x: Base[], y: Derived[]) => Derived[]
 >x : Base[]
->Array : T[]
+>Array : Array<T>
 >Base : Base
 >y : Derived[]
->Array : T[]
+>Array : Array<T>
 >Derived : Derived
->Array : T[]
+>Array : Array<T>
 >Derived : Derived
 
 var a14: (x: { a: string; b: number }) => Object;
@@ -429,14 +429,14 @@ 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[]
+>Array : Array<T>
 >Base : Base
 >x : Base[]
->Array : T[]
+>Array : Array<T>
 >Base : Base
 >y : T
 >T : T
->Array : T[]
+>Array : Array<T>
 >Derived : Derived
 
 a12 = b12; // ok
@@ -452,10 +452,10 @@ 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[]
+>Array : Array<T>
 >Derived : Derived
 >x : Base[]
->Array : T[]
+>Array : Array<T>
 >Base : Base
 >y : T
 >T : T
diff --git a/tests/baselines/reference/assignmentCompatWithConstructSignatures3.types b/tests/baselines/reference/assignmentCompatWithConstructSignatures3.types
index 807f31b0e6e..4289475ec8e 100644
--- a/tests/baselines/reference/assignmentCompatWithConstructSignatures3.types
+++ b/tests/baselines/reference/assignmentCompatWithConstructSignatures3.types
@@ -106,23 +106,23 @@ var a11: new (x: { foo: string }, y: { foo: string; bar: string }) => Base;
 var a12: new (x: Array<Base>, y: Array<Derived2>) => Array<Derived>;
 >a12 : new (x: Base[], y: Derived2[]) => Derived[]
 >x : Base[]
->Array : T[]
+>Array : Array<T>
 >Base : Base
 >y : Derived2[]
->Array : T[]
+>Array : Array<T>
 >Derived2 : Derived2
->Array : T[]
+>Array : 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[]
+>Array : Array<T>
 >Base : Base
 >y : Derived[]
->Array : T[]
+>Array : Array<T>
 >Derived : Derived
->Array : T[]
+>Array : Array<T>
 >Derived : Derived
 
 var a14: new (x: { a: string; b: number }) => Object;
@@ -429,14 +429,14 @@ 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[]
+>Array : Array<T>
 >Base : Base
 >x : Base[]
->Array : T[]
+>Array : Array<T>
 >Base : Base
 >y : T
 >T : T
->Array : T[]
+>Array : Array<T>
 >Derived : Derived
 
 a12 = b12; // ok
@@ -452,10 +452,10 @@ 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[]
+>Array : Array<T>
 >Derived : Derived
 >x : Base[]
->Array : T[]
+>Array : Array<T>
 >Base : Base
 >y : T
 >T : T
diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembers.js b/tests/baselines/reference/assignmentCompatWithObjectMembers.js
index 14b49dcd1e7..3bd457f19d3 100644
--- a/tests/baselines/reference/assignmentCompatWithObjectMembers.js
+++ b/tests/baselines/reference/assignmentCompatWithObjectMembers.js
@@ -86,6 +86,8 @@ module ObjectTypes {
 }
 
 //// [assignmentCompatWithObjectMembers.js]
+// members N and M of types S and T have the same name, same accessibility, same optionality, and N is assignable M
+// no errors expected
 var SimpleTypes;
 (function (SimpleTypes) {
     var S = (function () {
diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembers.types b/tests/baselines/reference/assignmentCompatWithObjectMembers.types
index b821fbc8608..0799c4e3b81 100644
--- a/tests/baselines/reference/assignmentCompatWithObjectMembers.types
+++ b/tests/baselines/reference/assignmentCompatWithObjectMembers.types
@@ -3,7 +3,7 @@
 // no errors expected
 
 module SimpleTypes {
->SimpleTypes : typeof SimpleTypes
+>SimpleTypes : SimpleTypes
 
     class S { foo: string; }
 >S : S
@@ -152,7 +152,7 @@ module SimpleTypes {
 }
 
 module ObjectTypes {
->ObjectTypes : typeof ObjectTypes
+>ObjectTypes : ObjectTypes
 
     class S { foo: S; }
 >S : S
@@ -204,13 +204,13 @@ module ObjectTypes {
 >a2 : any
 >{ foo: a2 } : { foo: any; }
 >foo : any
->a2 : a2
+>a2 : any
 
     var b2 = { foo: b2 };
 >b2 : any
 >{ foo: b2 } : { foo: any; }
 >foo : any
->b2 : b2
+>b2 : any
 
     s = t;
 >s = t : T
diff --git a/tests/baselines/reference/assignmentCompatability1.types b/tests/baselines/reference/assignmentCompatability1.types
index 43f2466f48b..6d71fc3b83e 100644
--- a/tests/baselines/reference/assignmentCompatability1.types
+++ b/tests/baselines/reference/assignmentCompatability1.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/assignmentCompatability1.ts ===
 module __test1__ {
->__test1__ : typeof __test1__
+>__test1__ : __test1__
 
     export interface interfaceWithPublicAndOptional<T,U> { one: T; two?: U; };  var obj4: interfaceWithPublicAndOptional<number,string> = { one: 1 };;
 >interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
@@ -20,7 +20,7 @@ module __test1__ {
 >obj4 : interfaceWithPublicAndOptional<number, string>
 }
 module __test2__ {
->__test2__ : typeof __test2__
+>__test2__ : __test2__
 
     export var aa = {};;
 >aa : {}
@@ -31,11 +31,11 @@ module __test2__ {
 >aa : {}
 }
 __test2__.__val__aa = __test1__.__val__obj4
->__test2__.__val__aa = __test1__.__val__obj4 : interfaceWithPublicAndOptional<number, string>
+>__test2__.__val__aa = __test1__.__val__obj4 : __test1__.interfaceWithPublicAndOptional<number, string>
 >__test2__.__val__aa : {}
 >__test2__ : typeof __test2__
 >__val__aa : {}
->__test1__.__val__obj4 : interfaceWithPublicAndOptional<number, string>
+>__test1__.__val__obj4 : __test1__.interfaceWithPublicAndOptional<number, string>
 >__test1__ : typeof __test1__
->__val__obj4 : interfaceWithPublicAndOptional<number, string>
+>__val__obj4 : __test1__.interfaceWithPublicAndOptional<number, string>
 
diff --git a/tests/baselines/reference/assignmentCompatability2.types b/tests/baselines/reference/assignmentCompatability2.types
index 5e27bf37521..4e2c997cfe3 100644
--- a/tests/baselines/reference/assignmentCompatability2.types
+++ b/tests/baselines/reference/assignmentCompatability2.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/assignmentCompatability2.ts ===
 module __test1__ {
->__test1__ : typeof __test1__
+>__test1__ : __test1__
 
     export interface interfaceWithPublicAndOptional<T,U> { one: T; two?: U; };  var obj4: interfaceWithPublicAndOptional<number,string> = { one: 1 };;
 >interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
@@ -20,7 +20,7 @@ module __test1__ {
 >obj4 : interfaceWithPublicAndOptional<number, string>
 }
 module __test2__ {
->__test2__ : typeof __test2__
+>__test2__ : __test2__
 
     export var aa:{};;
 >aa : {}
@@ -30,11 +30,11 @@ module __test2__ {
 >aa : {}
 }
 __test2__.__val__aa = __test1__.__val__obj4
->__test2__.__val__aa = __test1__.__val__obj4 : interfaceWithPublicAndOptional<number, string>
+>__test2__.__val__aa = __test1__.__val__obj4 : __test1__.interfaceWithPublicAndOptional<number, string>
 >__test2__.__val__aa : {}
 >__test2__ : typeof __test2__
 >__val__aa : {}
->__test1__.__val__obj4 : interfaceWithPublicAndOptional<number, string>
+>__test1__.__val__obj4 : __test1__.interfaceWithPublicAndOptional<number, string>
 >__test1__ : typeof __test1__
->__val__obj4 : interfaceWithPublicAndOptional<number, string>
+>__val__obj4 : __test1__.interfaceWithPublicAndOptional<number, string>
 
diff --git a/tests/baselines/reference/assignmentCompatability3.types b/tests/baselines/reference/assignmentCompatability3.types
index 94676fbfbe1..f45671a6325 100644
--- a/tests/baselines/reference/assignmentCompatability3.types
+++ b/tests/baselines/reference/assignmentCompatability3.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/assignmentCompatability3.ts ===
 module __test1__ {
->__test1__ : typeof __test1__
+>__test1__ : __test1__
 
     export interface interfaceWithPublicAndOptional<T,U> { one: T; two?: U; };  var obj4: interfaceWithPublicAndOptional<number,string> = { one: 1 };;
 >interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
@@ -20,7 +20,7 @@ module __test1__ {
 >obj4 : interfaceWithPublicAndOptional<number, string>
 }
 module __test2__ {
->__test2__ : typeof __test2__
+>__test2__ : __test2__
 
     export var obj = {one: 1};
 >obj : { one: number; }
@@ -32,11 +32,11 @@ module __test2__ {
 >obj : { one: number; }
 }
 __test2__.__val__obj = __test1__.__val__obj4
->__test2__.__val__obj = __test1__.__val__obj4 : interfaceWithPublicAndOptional<number, string>
+>__test2__.__val__obj = __test1__.__val__obj4 : __test1__.interfaceWithPublicAndOptional<number, string>
 >__test2__.__val__obj : { one: number; }
 >__test2__ : typeof __test2__
 >__val__obj : { one: number; }
->__test1__.__val__obj4 : interfaceWithPublicAndOptional<number, string>
+>__test1__.__val__obj4 : __test1__.interfaceWithPublicAndOptional<number, string>
 >__test1__ : typeof __test1__
->__val__obj4 : interfaceWithPublicAndOptional<number, string>
+>__val__obj4 : __test1__.interfaceWithPublicAndOptional<number, string>
 
diff --git a/tests/baselines/reference/assignmentCompatability4.types b/tests/baselines/reference/assignmentCompatability4.types
index 89281dae988..dd29e8a08dd 100644
--- a/tests/baselines/reference/assignmentCompatability4.types
+++ b/tests/baselines/reference/assignmentCompatability4.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/assignmentCompatability4.ts ===
 module __test1__ {
->__test1__ : typeof __test1__
+>__test1__ : __test1__
 
     export interface interfaceWithPublicAndOptional<T,U> { one: T; two?: U; };  var obj4: interfaceWithPublicAndOptional<number,string> = { one: 1 };;
 >interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
@@ -20,7 +20,7 @@ module __test1__ {
 >obj4 : interfaceWithPublicAndOptional<number, string>
 }
 module __test2__ {
->__test2__ : typeof __test2__
+>__test2__ : __test2__
 
     export var aa:{one:number;};;
 >aa : { one: number; }
@@ -31,11 +31,11 @@ module __test2__ {
 >aa : { one: number; }
 }
 __test2__.__val__aa = __test1__.__val__obj4
->__test2__.__val__aa = __test1__.__val__obj4 : interfaceWithPublicAndOptional<number, string>
+>__test2__.__val__aa = __test1__.__val__obj4 : __test1__.interfaceWithPublicAndOptional<number, string>
 >__test2__.__val__aa : { one: number; }
 >__test2__ : typeof __test2__
 >__val__aa : { one: number; }
->__test1__.__val__obj4 : interfaceWithPublicAndOptional<number, string>
+>__test1__.__val__obj4 : __test1__.interfaceWithPublicAndOptional<number, string>
 >__test1__ : typeof __test1__
->__val__obj4 : interfaceWithPublicAndOptional<number, string>
+>__val__obj4 : __test1__.interfaceWithPublicAndOptional<number, string>
 
diff --git a/tests/baselines/reference/assignmentCompatability5.types b/tests/baselines/reference/assignmentCompatability5.types
index e5d69b4a6a4..44e8dbe2dc7 100644
--- a/tests/baselines/reference/assignmentCompatability5.types
+++ b/tests/baselines/reference/assignmentCompatability5.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/assignmentCompatability5.ts ===
 module __test1__ {
->__test1__ : typeof __test1__
+>__test1__ : __test1__
 
     export interface interfaceWithPublicAndOptional<T,U> { one: T; two?: U; };  var obj4: interfaceWithPublicAndOptional<number,string> = { one: 1 };;
 >interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
@@ -20,7 +20,7 @@ module __test1__ {
 >obj4 : interfaceWithPublicAndOptional<number, string>
 }
 module __test2__ {
->__test2__ : typeof __test2__
+>__test2__ : __test2__
 
     export                   interface interfaceOne<T> { one: T; };                var obj1: interfaceOne<number> = { one: 1 };;
 >interfaceOne : interfaceOne<T>
@@ -37,11 +37,11 @@ module __test2__ {
 >obj1 : interfaceOne<number>
 }
 __test2__.__val__obj1 = __test1__.__val__obj4
->__test2__.__val__obj1 = __test1__.__val__obj4 : interfaceWithPublicAndOptional<number, string>
->__test2__.__val__obj1 : interfaceOne<number>
+>__test2__.__val__obj1 = __test1__.__val__obj4 : __test1__.interfaceWithPublicAndOptional<number, string>
+>__test2__.__val__obj1 : __test2__.interfaceOne<number>
 >__test2__ : typeof __test2__
->__val__obj1 : interfaceOne<number>
->__test1__.__val__obj4 : interfaceWithPublicAndOptional<number, string>
+>__val__obj1 : __test2__.interfaceOne<number>
+>__test1__.__val__obj4 : __test1__.interfaceWithPublicAndOptional<number, string>
 >__test1__ : typeof __test1__
->__val__obj4 : interfaceWithPublicAndOptional<number, string>
+>__val__obj4 : __test1__.interfaceWithPublicAndOptional<number, string>
 
diff --git a/tests/baselines/reference/assignmentCompatability6.types b/tests/baselines/reference/assignmentCompatability6.types
index d7662f0bb2c..dd1dc8c19ca 100644
--- a/tests/baselines/reference/assignmentCompatability6.types
+++ b/tests/baselines/reference/assignmentCompatability6.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/assignmentCompatability6.ts ===
 module __test1__ {
->__test1__ : typeof __test1__
+>__test1__ : __test1__
 
     export interface interfaceWithPublicAndOptional<T,U> { one: T; two?: U; };  var obj4: interfaceWithPublicAndOptional<number,string> = { one: 1 };;
 >interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
@@ -20,7 +20,7 @@ module __test1__ {
 >obj4 : interfaceWithPublicAndOptional<number, string>
 }
 module __test2__ {
->__test2__ : typeof __test2__
+>__test2__ : __test2__
 
     export          interface interfaceWithOptional<T> { one?: T; };               var obj3: interfaceWithOptional<number> = { };;
 >interfaceWithOptional : interfaceWithOptional<T>
@@ -36,11 +36,11 @@ module __test2__ {
 >obj3 : interfaceWithOptional<number>
 }
 __test2__.__val__obj3 = __test1__.__val__obj4
->__test2__.__val__obj3 = __test1__.__val__obj4 : interfaceWithPublicAndOptional<number, string>
->__test2__.__val__obj3 : interfaceWithOptional<number>
+>__test2__.__val__obj3 = __test1__.__val__obj4 : __test1__.interfaceWithPublicAndOptional<number, string>
+>__test2__.__val__obj3 : __test2__.interfaceWithOptional<number>
 >__test2__ : typeof __test2__
->__val__obj3 : interfaceWithOptional<number>
->__test1__.__val__obj4 : interfaceWithPublicAndOptional<number, string>
+>__val__obj3 : __test2__.interfaceWithOptional<number>
+>__test1__.__val__obj4 : __test1__.interfaceWithPublicAndOptional<number, string>
 >__test1__ : typeof __test1__
->__val__obj4 : interfaceWithPublicAndOptional<number, string>
+>__val__obj4 : __test1__.interfaceWithPublicAndOptional<number, string>
 
diff --git a/tests/baselines/reference/assignmentCompatability7.types b/tests/baselines/reference/assignmentCompatability7.types
index e48e164aa55..17036c4ec6e 100644
--- a/tests/baselines/reference/assignmentCompatability7.types
+++ b/tests/baselines/reference/assignmentCompatability7.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/assignmentCompatability7.ts ===
 module __test1__ {
->__test1__ : typeof __test1__
+>__test1__ : __test1__
 
     export interface interfaceWithPublicAndOptional<T,U> { one: T; two?: U; };  var obj4: interfaceWithPublicAndOptional<number,string> = { one: 1 };;
 >interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
@@ -20,7 +20,7 @@ module __test1__ {
 >obj4 : interfaceWithPublicAndOptional<number, string>
 }
 module __test2__ {
->__test2__ : typeof __test2__
+>__test2__ : __test2__
 
     export interface interfaceWithPublicAndOptional<T,U> { one: T; two?: U; };  var obj4: interfaceWithPublicAndOptional<number,string> = { one: 1 };;
 >interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
@@ -40,11 +40,11 @@ module __test2__ {
 >obj4 : interfaceWithPublicAndOptional<number, string>
 }
 __test2__.__val__obj4 = __test1__.__val__obj4
->__test2__.__val__obj4 = __test1__.__val__obj4 : interfaceWithPublicAndOptional<number, string>
->__test2__.__val__obj4 : interfaceWithPublicAndOptional<number, string>
+>__test2__.__val__obj4 = __test1__.__val__obj4 : __test1__.interfaceWithPublicAndOptional<number, string>
+>__test2__.__val__obj4 : __test2__.interfaceWithPublicAndOptional<number, string>
 >__test2__ : typeof __test2__
->__val__obj4 : interfaceWithPublicAndOptional<number, string>
->__test1__.__val__obj4 : interfaceWithPublicAndOptional<number, string>
+>__val__obj4 : __test2__.interfaceWithPublicAndOptional<number, string>
+>__test1__.__val__obj4 : __test1__.interfaceWithPublicAndOptional<number, string>
 >__test1__ : typeof __test1__
->__val__obj4 : interfaceWithPublicAndOptional<number, string>
+>__val__obj4 : __test1__.interfaceWithPublicAndOptional<number, string>
 
diff --git a/tests/baselines/reference/assignmentCompatability8.types b/tests/baselines/reference/assignmentCompatability8.types
index 581ad05c5a2..09ca5c13b71 100644
--- a/tests/baselines/reference/assignmentCompatability8.types
+++ b/tests/baselines/reference/assignmentCompatability8.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/assignmentCompatability8.ts ===
 module __test1__ {
->__test1__ : typeof __test1__
+>__test1__ : __test1__
 
     export interface interfaceWithPublicAndOptional<T,U> { one: T; two?: U; };  var obj4: interfaceWithPublicAndOptional<number,string> = { one: 1 };;
 >interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
@@ -20,7 +20,7 @@ module __test1__ {
 >obj4 : interfaceWithPublicAndOptional<number, string>
 }
 module __test2__ {
->__test2__ : typeof __test2__
+>__test2__ : __test2__
 
     export            class classWithPublic<T> { constructor(public one: T) {} }                        var x1 = new classWithPublic(1);;
 >classWithPublic : classWithPublic<T>
@@ -36,11 +36,11 @@ module __test2__ {
 >x1 : classWithPublic<number>
 }
 __test2__.__val__x1 = __test1__.__val__obj4
->__test2__.__val__x1 = __test1__.__val__obj4 : interfaceWithPublicAndOptional<number, string>
->__test2__.__val__x1 : classWithPublic<number>
+>__test2__.__val__x1 = __test1__.__val__obj4 : __test1__.interfaceWithPublicAndOptional<number, string>
+>__test2__.__val__x1 : __test2__.classWithPublic<number>
 >__test2__ : typeof __test2__
->__val__x1 : classWithPublic<number>
->__test1__.__val__obj4 : interfaceWithPublicAndOptional<number, string>
+>__val__x1 : __test2__.classWithPublic<number>
+>__test1__.__val__obj4 : __test1__.interfaceWithPublicAndOptional<number, string>
 >__test1__ : typeof __test1__
->__val__obj4 : interfaceWithPublicAndOptional<number, string>
+>__val__obj4 : __test1__.interfaceWithPublicAndOptional<number, string>
 
diff --git a/tests/baselines/reference/assignmentCompatability9.types b/tests/baselines/reference/assignmentCompatability9.types
index d71cb54e225..88b5f17f31b 100644
--- a/tests/baselines/reference/assignmentCompatability9.types
+++ b/tests/baselines/reference/assignmentCompatability9.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/assignmentCompatability9.ts ===
 module __test1__ {
->__test1__ : typeof __test1__
+>__test1__ : __test1__
 
     export interface interfaceWithPublicAndOptional<T,U> { one: T; two?: U; };  var obj4: interfaceWithPublicAndOptional<number,string> = { one: 1 };;
 >interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
@@ -20,7 +20,7 @@ module __test1__ {
 >obj4 : interfaceWithPublicAndOptional<number, string>
 }
 module __test2__ {
->__test2__ : typeof __test2__
+>__test2__ : __test2__
 
     export          class classWithOptional<T> { constructor(public one?: T) {} }                       var x3 = new classWithOptional<number>();;
 >classWithOptional : classWithOptional<T>
@@ -36,11 +36,11 @@ module __test2__ {
 >x3 : classWithOptional<number>
 }
 __test2__.__val__x3 = __test1__.__val__obj4
->__test2__.__val__x3 = __test1__.__val__obj4 : interfaceWithPublicAndOptional<number, string>
->__test2__.__val__x3 : classWithOptional<number>
+>__test2__.__val__x3 = __test1__.__val__obj4 : __test1__.interfaceWithPublicAndOptional<number, string>
+>__test2__.__val__x3 : __test2__.classWithOptional<number>
 >__test2__ : typeof __test2__
->__val__x3 : classWithOptional<number>
->__test1__.__val__obj4 : interfaceWithPublicAndOptional<number, string>
+>__val__x3 : __test2__.classWithOptional<number>
+>__test1__.__val__obj4 : __test1__.interfaceWithPublicAndOptional<number, string>
 >__test1__ : typeof __test1__
->__val__obj4 : interfaceWithPublicAndOptional<number, string>
+>__val__obj4 : __test1__.interfaceWithPublicAndOptional<number, string>
 
diff --git a/tests/baselines/reference/augmentedTypesClass3.types b/tests/baselines/reference/augmentedTypesClass3.types
index b22899b03cf..a3c9c0ce3c7 100644
--- a/tests/baselines/reference/augmentedTypesClass3.types
+++ b/tests/baselines/reference/augmentedTypesClass3.types
@@ -5,14 +5,14 @@ class c5 { public foo() { } }
 >foo : () => void
 
 module c5 { } // should be ok
->c5 : typeof c5
+>c5 : c5
 
 class c5a { public foo() { } }
 >c5a : c5a
 >foo : () => void
 
 module c5a { var y = 2; } // should be ok
->c5a : typeof c5a
+>c5a : c5a
 >y : number
 
 class c5b { public foo() { } }
@@ -20,7 +20,7 @@ class c5b { public foo() { } }
 >foo : () => void
 
 module c5b { export var y = 2; } // should be ok
->c5b : typeof c5b
+>c5b : c5b
 >y : number
 
 //// class then import
diff --git a/tests/baselines/reference/augmentedTypesExternalModule1.types b/tests/baselines/reference/augmentedTypesExternalModule1.types
index ec7e9194df6..e971a77daea 100644
--- a/tests/baselines/reference/augmentedTypesExternalModule1.types
+++ b/tests/baselines/reference/augmentedTypesExternalModule1.types
@@ -7,5 +7,5 @@ class c5 { public foo() { } }
 >foo : () => void
 
 module c5 { } // should be ok everywhere
->c5 : typeof c5
+>c5 : c5
 
diff --git a/tests/baselines/reference/augmentedTypesModules3b.types b/tests/baselines/reference/augmentedTypesModules3b.types
index af2c33c65da..7497b9ff8a7 100644
--- a/tests/baselines/reference/augmentedTypesModules3b.types
+++ b/tests/baselines/reference/augmentedTypesModules3b.types
@@ -4,7 +4,7 @@ class m3b { foo() { } }
 >foo : () => void
 
 module m3b { var y = 2; }
->m3b : typeof m3b
+>m3b : m3b
 >y : number
 
 class m3c { foo() { } }
@@ -12,7 +12,7 @@ class m3c { foo() { } }
 >foo : () => void
 
 module m3c { export var y = 2; } 
->m3c : typeof m3c
+>m3c : m3c
 >y : number
 
 declare class m3d { foo(): void }
@@ -20,11 +20,11 @@ declare class m3d { foo(): void }
 >foo : () => void
 
 module m3d { export var y = 2; } 
->m3d : typeof m3d
+>m3d : m3d
 >y : number
 
 module m3e { export var y = 2; } 
->m3e : typeof m3e
+>m3e : m3e
 >y : number
 
 declare class m3e { foo(): void } 
@@ -36,7 +36,7 @@ declare class m3f { foo(): void }
 >foo : () => void
 
 module m3f { export interface I { foo(): void } }
->m3f : typeof m3f
+>m3f : m3f
 >I : I
 >foo : () => void
 
@@ -45,7 +45,7 @@ declare class m3g { foo(): void }
 >foo : () => void
 
 module m3g { export class C { foo() { } } }
->m3g : typeof m3g
+>m3g : m3g
 >C : C
 >foo : () => void
 
diff --git a/tests/baselines/reference/augmentedTypesModules4.types b/tests/baselines/reference/augmentedTypesModules4.types
index bf8922a5761..2a426c603fa 100644
--- a/tests/baselines/reference/augmentedTypesModules4.types
+++ b/tests/baselines/reference/augmentedTypesModules4.types
@@ -2,13 +2,13 @@
 // module then enum
 // should be errors
 module m4 { }
->m4 : typeof m4
+>m4 : m4
 
 enum m4 { }
 >m4 : m4
 
 module m4a { var y = 2; }
->m4a : typeof m4a
+>m4a : m4a
 >y : number
 
 enum m4a { One }
@@ -16,7 +16,7 @@ enum m4a { One }
 >One : m4a
 
 module m4b { export var y = 2; }
->m4b : typeof m4b
+>m4b : m4b
 >y : number
 
 enum m4b { One }
@@ -24,7 +24,7 @@ enum m4b { One }
 >One : m4b
 
 module m4c { interface I { foo(): void } }
->m4c : typeof m4c
+>m4c : m4c
 >I : I
 >foo : () => void
 
@@ -33,7 +33,7 @@ enum m4c { One }
 >One : m4c
 
 module m4d { class C { foo() { } } }
->m4d : typeof m4d
+>m4d : m4d
 >C : C
 >foo : () => void
 
@@ -44,11 +44,11 @@ enum m4d { One }
 //// module then module
 
 module m5 { export var y = 2; }
->m5 : typeof m5
+>m5 : m5
 >y : number
 
 module m5 { export interface I { foo(): void } } // should already be reasonably well covered
->m5 : typeof m5
+>m5 : m5
 >I : I
 >foo : () => void
 
diff --git a/tests/baselines/reference/bestCommonTypeWithContextualTyping.types b/tests/baselines/reference/bestCommonTypeWithContextualTyping.types
index 5ee96dad667..937339d8cbf 100644
--- a/tests/baselines/reference/bestCommonTypeWithContextualTyping.types
+++ b/tests/baselines/reference/bestCommonTypeWithContextualTyping.types
@@ -38,7 +38,7 @@ var obj: { [s: string]: Contextual } = { s: e }; // { s: Ellement; [s: string]:
 >Contextual : Contextual
 >{ s: e } : { [x: string]: Ellement; s: Ellement; }
 >s : Ellement
->e : e
+>e : Ellement
 
 var conditional: Contextual = null ? e : e; // Ellement
 >conditional : Contextual
diff --git a/tests/baselines/reference/binopAssignmentShouldHaveType.types b/tests/baselines/reference/binopAssignmentShouldHaveType.types
index cf6966147bc..d1cdb188311 100644
--- a/tests/baselines/reference/binopAssignmentShouldHaveType.types
+++ b/tests/baselines/reference/binopAssignmentShouldHaveType.types
@@ -4,7 +4,7 @@ declare var console;
 
 "use strict";
 module Test {
->Test : typeof Test
+>Test : Test
 
  export class Bug {
 >Bug : Bug
diff --git a/tests/baselines/reference/bitwiseNotOperatorWithBooleanType.types b/tests/baselines/reference/bitwiseNotOperatorWithBooleanType.types
index 94c056cf77c..2eb6ab9b8c3 100644
--- a/tests/baselines/reference/bitwiseNotOperatorWithBooleanType.types
+++ b/tests/baselines/reference/bitwiseNotOperatorWithBooleanType.types
@@ -13,10 +13,10 @@ class A {
 >a : boolean
 
     static foo() { return false; }
->foo : typeof foo
+>foo : () => boolean
 }
 module M {
->M : typeof M
+>M : M
 
     export var n: boolean;
 >n : boolean
@@ -70,9 +70,9 @@ var ResultIsNumber7 = ~A.foo();
 >ResultIsNumber7 : number
 >~A.foo() : number
 >A.foo() : boolean
->A.foo : typeof foo
+>A.foo : () => boolean
 >A : typeof A
->foo : typeof foo
+>foo : () => boolean
 
 // multiple ~ operators
 var ResultIsNumber8 = ~~BOOLEAN;
diff --git a/tests/baselines/reference/bitwiseNotOperatorWithNumberType.types b/tests/baselines/reference/bitwiseNotOperatorWithNumberType.types
index 18b22db036c..dddae11545e 100644
--- a/tests/baselines/reference/bitwiseNotOperatorWithNumberType.types
+++ b/tests/baselines/reference/bitwiseNotOperatorWithNumberType.types
@@ -17,10 +17,10 @@ class A {
 >a : number
 
     static foo() { return 1; }
->foo : typeof foo
+>foo : () => number
 }
 module M {
->M : typeof M
+>M : M
 
     export var n: number;
 >n : number
@@ -95,9 +95,9 @@ var ResultIsNumber10 = ~A.foo();
 >ResultIsNumber10 : number
 >~A.foo() : number
 >A.foo() : number
->A.foo : typeof foo
+>A.foo : () => number
 >A : typeof A
->foo : typeof foo
+>foo : () => number
 
 var ResultIsNumber11 = ~(NUMBER + NUMBER);
 >ResultIsNumber11 : number
diff --git a/tests/baselines/reference/bitwiseNotOperatorWithStringType.types b/tests/baselines/reference/bitwiseNotOperatorWithStringType.types
index d7c65a478fc..a6f4b4c5ec2 100644
--- a/tests/baselines/reference/bitwiseNotOperatorWithStringType.types
+++ b/tests/baselines/reference/bitwiseNotOperatorWithStringType.types
@@ -17,10 +17,10 @@ class A {
 >a : string
 
     static foo() { return ""; }
->foo : typeof foo
+>foo : () => string
 }
 module M {
->M : typeof M
+>M : M
 
     export var n: string;
 >n : string
@@ -95,9 +95,9 @@ var ResultIsNumber10 = ~A.foo();
 >ResultIsNumber10 : number
 >~A.foo() : number
 >A.foo() : string
->A.foo : typeof foo
+>A.foo : () => string
 >A : typeof A
->foo : typeof foo
+>foo : () => string
 
 var ResultIsNumber11 = ~(STRING + STRING);
 >ResultIsNumber11 : number
diff --git a/tests/baselines/reference/callSignatureAssignabilityInInheritance2.types b/tests/baselines/reference/callSignatureAssignabilityInInheritance2.types
index 335413cd73e..57006b6b3b8 100644
--- a/tests/baselines/reference/callSignatureAssignabilityInInheritance2.types
+++ b/tests/baselines/reference/callSignatureAssignabilityInInheritance2.types
@@ -110,23 +110,23 @@ interface A { // T
     a12: (x: Array<Base>, y: Array<Derived2>) => Array<Derived>;
 >a12 : (x: Base[], y: Derived2[]) => Derived[]
 >x : Base[]
->Array : T[]
+>Array : Array<T>
 >Base : Base
 >y : Derived2[]
->Array : T[]
+>Array : Array<T>
 >Derived2 : Derived2
->Array : T[]
+>Array : Array<T>
 >Derived : Derived
 
     a13: (x: Array<Base>, y: Array<Derived>) => Array<Derived>;
 >a13 : (x: Base[], y: Derived[]) => Derived[]
 >x : Base[]
->Array : T[]
+>Array : Array<T>
 >Base : Base
 >y : Derived[]
->Array : T[]
+>Array : Array<T>
 >Derived : Derived
->Array : T[]
+>Array : Array<T>
 >Derived : Derived
 
     a14: (x: { a: string; b: number }) => Object;
@@ -332,23 +332,23 @@ interface I extends A {
     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[]
+>Array : Array<T>
 >Base : Base
 >x : Base[]
->Array : T[]
+>Array : Array<T>
 >Base : Base
 >y : T
 >T : T
->Array : T[]
+>Array : 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[]
+>Array : Array<T>
 >Derived : Derived
 >x : Base[]
->Array : T[]
+>Array : Array<T>
 >Base : Base
 >y : T
 >T : T
diff --git a/tests/baselines/reference/callSignatureAssignabilityInInheritance5.types b/tests/baselines/reference/callSignatureAssignabilityInInheritance5.types
index 0ffc8257a56..8d9e49a3942 100644
--- a/tests/baselines/reference/callSignatureAssignabilityInInheritance5.types
+++ b/tests/baselines/reference/callSignatureAssignabilityInInheritance5.types
@@ -111,23 +111,23 @@ interface A { // T
     a12: (x: Array<Base>, y: Array<Derived2>) => Array<Derived>;
 >a12 : (x: Base[], y: Derived2[]) => Derived[]
 >x : Base[]
->Array : T[]
+>Array : Array<T>
 >Base : Base
 >y : Derived2[]
->Array : T[]
+>Array : Array<T>
 >Derived2 : Derived2
->Array : T[]
+>Array : Array<T>
 >Derived : Derived
 
     a13: (x: Array<Base>, y: Array<Derived>) => Array<Derived>;
 >a13 : (x: Base[], y: Derived[]) => Derived[]
 >x : Base[]
->Array : T[]
+>Array : Array<T>
 >Base : Base
 >y : Derived[]
->Array : T[]
+>Array : Array<T>
 >Derived : Derived
->Array : T[]
+>Array : Array<T>
 >Derived : Derived
 
     a14: (x: { a: string; b: number }) => Object;
@@ -280,23 +280,23 @@ interface I extends B {
     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[]
+>Array : Array<T>
 >Base : Base
 >x : Base[]
->Array : T[]
+>Array : Array<T>
 >Base : Base
 >y : T
 >T : T
->Array : T[]
+>Array : 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[]
+>Array : Array<T>
 >Derived : Derived
 >x : Base[]
->Array : T[]
+>Array : Array<T>
 >Base : Base
 >y : T
 >T : T
diff --git a/tests/baselines/reference/callSignatureWithoutReturnTypeAnnotationInference.types b/tests/baselines/reference/callSignatureWithoutReturnTypeAnnotationInference.types
index 5a171809e40..ad96d6849a7 100644
--- a/tests/baselines/reference/callSignatureWithoutReturnTypeAnnotationInference.types
+++ b/tests/baselines/reference/callSignatureWithoutReturnTypeAnnotationInference.types
@@ -111,7 +111,7 @@ function foo8(x: number) {
     return { x: x };
 >{ x: x } : { x: number; }
 >x : number
->x : x
+>x : number
 }
 var r8 = foo8(1);
 >r8 : { x: number; }
@@ -163,7 +163,7 @@ var r10 = foo10(1);
 >foo10 : typeof foo10
 
 module M {
->M : typeof M
+>M : M
 
     export var x = 1;
 >x : number
@@ -215,7 +215,7 @@ function m1() { return 1; }
 >m1 : typeof m1
 
 module m1 { export var y = 2; }
->m1 : typeof m1
+>m1 : m1
 >y : number
 
 function foo13() {
@@ -239,7 +239,7 @@ class c1 {
 >x : any
 }
 module c1 {
->c1 : typeof c1
+>c1 : c1
 
     export var x = 1;
 >x : number
@@ -260,7 +260,7 @@ enum e1 { A }
 >A : e1
 
 module e1 { export var y = 1; }
->e1 : typeof e1
+>e1 : e1
 >y : number
 
 function foo15() {
diff --git a/tests/baselines/reference/chainedImportAlias.types b/tests/baselines/reference/chainedImportAlias.types
index 463b49a14aa..efea47726d7 100644
--- a/tests/baselines/reference/chainedImportAlias.types
+++ b/tests/baselines/reference/chainedImportAlias.types
@@ -1,10 +1,10 @@
 === tests/cases/compiler/chainedImportAlias_file1.ts ===
 import x = require('chainedImportAlias_file1');
->x : typeof "tests/cases/compiler/chainedImportAlias_file1"
+>x : x
 
 import y = x;
->y : typeof "tests/cases/compiler/chainedImportAlias_file1"
->x : typeof "tests/cases/compiler/chainedImportAlias_file1"
+>y : y
+>x : typeof x
 
 declare var console: {
 >console : { log(message?: any): any; }
@@ -19,5 +19,5 @@ console.log(y);
 >console.log : (message?: any) => any
 >console : { log(message?: any): any; }
 >log : (message?: any) => any
->y : typeof "tests/cases/compiler/chainedImportAlias_file1"
+>y : typeof x
 
diff --git a/tests/baselines/reference/circularImportAlias.types b/tests/baselines/reference/circularImportAlias.types
index a8d952ae993..4ecd15faf90 100644
--- a/tests/baselines/reference/circularImportAlias.types
+++ b/tests/baselines/reference/circularImportAlias.types
@@ -2,16 +2,16 @@
 // expected no error
 
 module B {
->B : typeof B
+>B : a.b
 
     export import a = A;
->a : typeof A
->A : typeof A
+>a : a
+>A : typeof a
 
     export class D extends a.C {
 >D : D
 >a : a
->C : C
+>C : a.C
 
         id: number;
 >id : number
@@ -19,15 +19,15 @@ module B {
 }
 
 module A {
->A : typeof A
+>A : b.a
 
     export class C { name: string }
 >C : C
 >name : string
 
     export import b = B;
->b : typeof B
->B : typeof B
+>b : b
+>B : typeof b
 }
 
 var c: { name: string };
@@ -36,12 +36,12 @@ var c: { name: string };
 
 var c = new B.a.C();
 >c : { name: string; }
->new B.a.C() : C
->B.a.C : typeof C
+>new B.a.C() : A.C
+>B.a.C : typeof A.C
 >B.a : typeof A
 >B : typeof B
 >a : typeof A
->C : typeof C
+>C : typeof A.C
 
 
 
diff --git a/tests/baselines/reference/classDeclarationMergedInModuleWithContinuation.types b/tests/baselines/reference/classDeclarationMergedInModuleWithContinuation.types
index c58b1dd898d..7ad32ac50d9 100644
--- a/tests/baselines/reference/classDeclarationMergedInModuleWithContinuation.types
+++ b/tests/baselines/reference/classDeclarationMergedInModuleWithContinuation.types
@@ -1,12 +1,12 @@
 === tests/cases/compiler/classDeclarationMergedInModuleWithContinuation.ts ===
 module M {
->M : typeof M
+>M : M
 
     export class N { }
 >N : N
 
     export module N {
->N : typeof N
+>N : N
 
         export var v = 0;
 >v : number
@@ -14,7 +14,7 @@ module M {
 }
 
 module M {
->M : typeof M
+>M : M
 
     export class O extends M.N {
 >O : O
diff --git a/tests/baselines/reference/classExtendingClass.types b/tests/baselines/reference/classExtendingClass.types
index 19c73a2b9db..7eaaaecf17f 100644
--- a/tests/baselines/reference/classExtendingClass.types
+++ b/tests/baselines/reference/classExtendingClass.types
@@ -9,7 +9,7 @@ class C {
 >thing : () => void
 
     static other() { }
->other : typeof other
+>other : () => void
 }
 
 class D extends C {
@@ -46,9 +46,9 @@ var r3 = d.thing();
 var r4 = D.other();
 >r4 : void
 >D.other() : void
->D.other : typeof other
+>D.other : () => void
 >D : typeof D
->other : typeof other
+>other : () => void
 
 class C2<T> {
 >C2 : C2<T>
@@ -64,7 +64,7 @@ class C2<T> {
 >T : T
 
     static other<T>(x: T) { }
->other : typeof other
+>other : <T>(x: T) => void
 >T : T
 >x : T
 >T : T
@@ -106,7 +106,7 @@ var r7 = d2.thing('');
 var r8 = D2.other(1);
 >r8 : void
 >D2.other(1) : void
->D2.other : typeof other
+>D2.other : <T>(x: T) => void
 >D2 : typeof D2
->other : typeof other
+>other : <T>(x: T) => void
 
diff --git a/tests/baselines/reference/classExtendingQualifiedName2.types b/tests/baselines/reference/classExtendingQualifiedName2.types
index e2e1b7dfdd8..715386fa8d1 100644
--- a/tests/baselines/reference/classExtendingQualifiedName2.types
+++ b/tests/baselines/reference/classExtendingQualifiedName2.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/classExtendingQualifiedName2.ts ===
 module M {
->M : typeof M
+>M : M
 
     export class C {
 >C : C
diff --git a/tests/baselines/reference/classMethodWithKeywordName1.types b/tests/baselines/reference/classMethodWithKeywordName1.types
index ab8232ed4ba..8ad128bdb00 100644
--- a/tests/baselines/reference/classMethodWithKeywordName1.types
+++ b/tests/baselines/reference/classMethodWithKeywordName1.types
@@ -3,5 +3,5 @@ class C {
 >C : C
 
  static try() {}
->try : typeof try
+>try : () => void
 }
diff --git a/tests/baselines/reference/classWithPublicProperty.types b/tests/baselines/reference/classWithPublicProperty.types
index ee08e04256c..a5bdeb95f1a 100644
--- a/tests/baselines/reference/classWithPublicProperty.types
+++ b/tests/baselines/reference/classWithPublicProperty.types
@@ -22,7 +22,7 @@ class C {
 >e : any
 
     public static f() { return '' }
->f : typeof f
+>f : () => string
 
     public static g = () => '';
 >g : () => string
@@ -76,9 +76,9 @@ var r6: string = C.e;
 var r7: string = C.f();
 >r7 : string
 >C.f() : string
->C.f : typeof f
+>C.f : () => string
 >C : typeof C
->f : typeof f
+>f : () => string
 
 var r8: string = C.g();
 >r8 : string
diff --git a/tests/baselines/reference/cloduleAcrossModuleDefinitions.types b/tests/baselines/reference/cloduleAcrossModuleDefinitions.types
index b513d80ccc0..118ed6ba7ff 100644
--- a/tests/baselines/reference/cloduleAcrossModuleDefinitions.types
+++ b/tests/baselines/reference/cloduleAcrossModuleDefinitions.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/cloduleAcrossModuleDefinitions.ts ===
 module A {
->A : typeof A
+>A : A
 
     export class B {
 >B : B
@@ -9,15 +9,15 @@ module A {
 >foo : () => void
 
         static bar() { }
->bar : typeof bar
+>bar : () => void
     }
 }
 
 module A {
->A : typeof A
+>A : A
 
     export module B {
->B : typeof B
+>B : B
 
         export var x = 1;
 >x : number
@@ -25,7 +25,7 @@ module A {
 }
 
 var b: A.B; // ok
->b : B
+>b : A.B
 >A : A
->B : B
+>B : A.B
 
diff --git a/tests/baselines/reference/cloduleAndTypeParameters.types b/tests/baselines/reference/cloduleAndTypeParameters.types
index dc4d6579467..b75d3fbee89 100644
--- a/tests/baselines/reference/cloduleAndTypeParameters.types
+++ b/tests/baselines/reference/cloduleAndTypeParameters.types
@@ -3,14 +3,14 @@ class Foo<T extends Foo.Bar> {
 >Foo : Foo<T>
 >T : T
 >Foo : Foo<T>
->Bar : Bar
+>Bar : Foo.Bar
 
   constructor() {
   }
 }
 
 module Foo {
->Foo : typeof Foo
+>Foo : Foo
 
   export interface Bar {
 >Bar : Bar
diff --git a/tests/baselines/reference/cloduleTest1.types b/tests/baselines/reference/cloduleTest1.types
index 214b46c2676..3f3af280246 100644
--- a/tests/baselines/reference/cloduleTest1.types
+++ b/tests/baselines/reference/cloduleTest1.types
@@ -13,7 +13,7 @@
 >$ : $
   }
   module $ {
->$ : typeof $
+>$ : $
 
     export interface AjaxSettings {
 >AjaxSettings : AjaxSettings
diff --git a/tests/baselines/reference/cloduleWithRecursiveReference.types b/tests/baselines/reference/cloduleWithRecursiveReference.types
index d9f28399a53..2f811a473ee 100644
--- a/tests/baselines/reference/cloduleWithRecursiveReference.types
+++ b/tests/baselines/reference/cloduleWithRecursiveReference.types
@@ -1,17 +1,17 @@
 === tests/cases/compiler/cloduleWithRecursiveReference.ts ===
 module M
->M : typeof M
+>M : M
 {
   export class C {  }
 >C : C
 
   export module C {
->C : typeof C
+>C : M.C
 
     export var C = M.C
->C : typeof C
->M.C : typeof C
+>C : typeof M.C
+>M.C : typeof M.C
 >M : typeof M
->C : typeof C
+>C : typeof M.C
   }
 }
diff --git a/tests/baselines/reference/collisionCodeGenModuleWithConstructorChildren.types b/tests/baselines/reference/collisionCodeGenModuleWithConstructorChildren.types
index f63f7eeb4f2..fe693211baa 100644
--- a/tests/baselines/reference/collisionCodeGenModuleWithConstructorChildren.types
+++ b/tests/baselines/reference/collisionCodeGenModuleWithConstructorChildren.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/collisionCodeGenModuleWithConstructorChildren.ts ===
 module M {
->M : typeof M
+>M : M
 
     export var x = 3;
 >x : number
@@ -17,7 +17,7 @@ module M {
 }
 
 module M {
->M : typeof M
+>M : M
 
     class d {
 >d : d
@@ -31,7 +31,7 @@ module M {
 }
 
 module M {
->M : typeof M
+>M : M
 
     class d2 {
 >d2 : d2
diff --git a/tests/baselines/reference/collisionCodeGenModuleWithEnumMemberConflict.types b/tests/baselines/reference/collisionCodeGenModuleWithEnumMemberConflict.types
index 527c8930fcb..eb7047ba3c1 100644
--- a/tests/baselines/reference/collisionCodeGenModuleWithEnumMemberConflict.types
+++ b/tests/baselines/reference/collisionCodeGenModuleWithEnumMemberConflict.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/collisionCodeGenModuleWithEnumMemberConflict.ts ===
 module m1 {
->m1 : typeof m1
+>m1 : m1
 
     enum e {
 >e : e
diff --git a/tests/baselines/reference/collisionCodeGenModuleWithFunctionChildren.types b/tests/baselines/reference/collisionCodeGenModuleWithFunctionChildren.types
index 7c22d6ddc8f..84be96f9c43 100644
--- a/tests/baselines/reference/collisionCodeGenModuleWithFunctionChildren.types
+++ b/tests/baselines/reference/collisionCodeGenModuleWithFunctionChildren.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/collisionCodeGenModuleWithFunctionChildren.ts ===
 module M {
->M : typeof M
+>M : M
 
     export var x = 3;
 >x : number
@@ -13,7 +13,7 @@ module M {
 }
 
 module M {
->M : typeof M
+>M : M
 
     function fn2() {
 >fn2 : typeof fn2
@@ -28,7 +28,7 @@ module M {
 }
 
 module M {
->M : typeof M
+>M : M
 
     function fn3() {
 >fn3 : typeof fn3
diff --git a/tests/baselines/reference/collisionCodeGenModuleWithMemberClassConflict.types b/tests/baselines/reference/collisionCodeGenModuleWithMemberClassConflict.types
index d9901034517..fd86bc8ed45 100644
--- a/tests/baselines/reference/collisionCodeGenModuleWithMemberClassConflict.types
+++ b/tests/baselines/reference/collisionCodeGenModuleWithMemberClassConflict.types
@@ -1,20 +1,20 @@
 === tests/cases/compiler/collisionCodeGenModuleWithMemberClassConflict.ts ===
 module m1 {
->m1 : typeof m1
+>m1 : m1
 
     export class m1 {
 >m1 : m1
     }
 }
 var foo = new m1.m1();
->foo : m1
->new m1.m1() : m1
->m1.m1 : typeof m1
->m1 : typeof m1
+>foo : m1.m1
+>new m1.m1() : m1.m1
+>m1.m1 : typeof m1.m1
 >m1 : typeof m1
+>m1 : typeof m1.m1
 
 module m2 {
->m2 : typeof m2
+>m2 : m2
 
     export class m2 {
 >m2 : m2
@@ -25,16 +25,16 @@ module m2 {
     }
 }
 var foo = new m2.m2();
->foo : m1
->new m2.m2() : m2
->m2.m2 : typeof m2
->m2 : typeof m2
+>foo : m1.m1
+>new m2.m2() : m2.m2
+>m2.m2 : typeof m2.m2
 >m2 : typeof m2
+>m2 : typeof m2.m2
 
 var foo = new m2._m2();
->foo : m1
->new m2._m2() : _m2
->m2._m2 : typeof _m2
+>foo : m1.m1
+>new m2._m2() : m2._m2
+>m2._m2 : typeof m2._m2
 >m2 : typeof m2
->_m2 : typeof _m2
+>_m2 : typeof m2._m2
 
diff --git a/tests/baselines/reference/collisionCodeGenModuleWithMemberInterfaceConflict.types b/tests/baselines/reference/collisionCodeGenModuleWithMemberInterfaceConflict.types
index fde4c2fefeb..0598ba9f2ea 100644
--- a/tests/baselines/reference/collisionCodeGenModuleWithMemberInterfaceConflict.types
+++ b/tests/baselines/reference/collisionCodeGenModuleWithMemberInterfaceConflict.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/collisionCodeGenModuleWithMemberInterfaceConflict.ts ===
 module m1 {
->m1 : typeof m1
+>m1 : m1
 
     export interface m1 {
 >m1 : m1
@@ -11,9 +11,9 @@ module m1 {
     }
 }
 var foo = new m1.m2();
->foo : m2
->new m1.m2() : m2
->m1.m2 : typeof m2
+>foo : m1.m2
+>new m1.m2() : m1.m2
+>m1.m2 : typeof m1.m2
 >m1 : typeof m1
->m2 : typeof m2
+>m2 : typeof m1.m2
 
diff --git a/tests/baselines/reference/collisionCodeGenModuleWithMemberVariable.types b/tests/baselines/reference/collisionCodeGenModuleWithMemberVariable.types
index 86f0767959d..a16e4df6129 100644
--- a/tests/baselines/reference/collisionCodeGenModuleWithMemberVariable.types
+++ b/tests/baselines/reference/collisionCodeGenModuleWithMemberVariable.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/collisionCodeGenModuleWithMemberVariable.ts ===
 module m1 {
->m1 : typeof m1
+>m1 : m1
 
     export var m1 = 10;
 >m1 : number
diff --git a/tests/baselines/reference/collisionCodeGenModuleWithMethodChildren.types b/tests/baselines/reference/collisionCodeGenModuleWithMethodChildren.types
index 3632806e9b3..97e8f668fb6 100644
--- a/tests/baselines/reference/collisionCodeGenModuleWithMethodChildren.types
+++ b/tests/baselines/reference/collisionCodeGenModuleWithMethodChildren.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/collisionCodeGenModuleWithMethodChildren.ts ===
 module M {
->M : typeof M
+>M : M
 
     export var x = 3;
 >x : number
@@ -17,7 +17,7 @@ module M {
 }
 
 module M {
->M : typeof M
+>M : M
 
     class d {
 >d : d
@@ -36,7 +36,7 @@ module M {
 }
 
 module M {
->M : typeof M
+>M : M
 
     class e {
 >e : e
@@ -56,7 +56,7 @@ module M {
 }
 
 module M { // Shouldnt bn _M
->M : typeof M
+>M : M
 
     class f {
 >f : f
diff --git a/tests/baselines/reference/collisionCodeGenModuleWithModuleChildren.types b/tests/baselines/reference/collisionCodeGenModuleWithModuleChildren.types
index 3ed65442a0e..217f360c9e3 100644
--- a/tests/baselines/reference/collisionCodeGenModuleWithModuleChildren.types
+++ b/tests/baselines/reference/collisionCodeGenModuleWithModuleChildren.types
@@ -1,12 +1,12 @@
 === tests/cases/compiler/collisionCodeGenModuleWithModuleChildren.ts ===
 module M {
->M : typeof M
+>M : M
 
     export var x = 3;
 >x : number
 
     module m1 {
->m1 : typeof m1
+>m1 : m1
 
         var M = 10;
 >M : number
@@ -18,10 +18,10 @@ module M {
 }
 
 module M {
->M : typeof M
+>M : M
 
     module m2 {
->m2 : typeof m2
+>m2 : m2
 
         class M {
 >M : M
@@ -38,10 +38,10 @@ module M {
 }
 
 module M {
->M : typeof M
+>M : M
 
     module m3 {
->m3 : typeof m3
+>m3 : m3
 
         function M() {
 >M : typeof M
@@ -58,10 +58,10 @@ module M {
 }
 
 module M { // shouldnt be _M
->M : typeof M
+>M : M
 
     module m3 {
->m3 : typeof m3
+>m3 : m3
 
         interface M {
 >M : M
@@ -77,13 +77,13 @@ module M { // shouldnt be _M
 }
 
 module M {
->M : typeof M
+>M : M
 
     module m4 {
->m4 : typeof m4
+>m4 : m4
 
         module M {
->M : typeof M
+>M : M
 
             var p = x;
 >p : number
diff --git a/tests/baselines/reference/collisionCodeGenModuleWithModuleReopening.types b/tests/baselines/reference/collisionCodeGenModuleWithModuleReopening.types
index 7a8090a6666..1bd1d54d324 100644
--- a/tests/baselines/reference/collisionCodeGenModuleWithModuleReopening.types
+++ b/tests/baselines/reference/collisionCodeGenModuleWithModuleReopening.types
@@ -1,20 +1,20 @@
 === tests/cases/compiler/collisionCodeGenModuleWithModuleReopening.ts ===
 module m1 {
->m1 : typeof m1
+>m1 : m1
 
     export class m1 {
 >m1 : m1
     }
 }
 var foo = new m1.m1();
->foo : m1
->new m1.m1() : m1
->m1.m1 : typeof m1
->m1 : typeof m1
+>foo : m1.m1
+>new m1.m1() : m1.m1
+>m1.m1 : typeof m1.m1
 >m1 : typeof m1
+>m1 : typeof m1.m1
 
 module m1 {
->m1 : typeof m1
+>m1 : m1
 
     export class c1 {
 >c1 : c1
@@ -30,14 +30,14 @@ module m1 {
 >m1 : typeof m1
 }
 var foo2 = new m1.c1();
->foo2 : c1
->new m1.c1() : c1
->m1.c1 : typeof c1
+>foo2 : m1.c1
+>new m1.c1() : m1.c1
+>m1.c1 : typeof m1.c1
 >m1 : typeof m1
->c1 : typeof c1
+>c1 : typeof m1.c1
 
 module m2 {
->m2 : typeof m2
+>m2 : m2
 
     export class c1 {
 >c1 : c1
@@ -51,14 +51,14 @@ module m2 {
 >c1 : typeof c1
 }
 var foo3 = new m2.c1();
->foo3 : c1
->new m2.c1() : c1
->m2.c1 : typeof c1
+>foo3 : m2.c1
+>new m2.c1() : m2.c1
+>m2.c1 : typeof m2.c1
 >m2 : typeof m2
->c1 : typeof c1
+>c1 : typeof m2.c1
 
 module m2 {
->m2 : typeof m2
+>m2 : m2
 
     export class m2 {
 >m2 : m2
@@ -78,16 +78,16 @@ module m2 {
 >c1 : typeof c1
 }
 var foo3 = new m2.c1();
->foo3 : c1
->new m2.c1() : c1
->m2.c1 : typeof c1
+>foo3 : m2.c1
+>new m2.c1() : m2.c1
+>m2.c1 : typeof m2.c1
 >m2 : typeof m2
->c1 : typeof c1
+>c1 : typeof m2.c1
 
 var foo2 = new m2.m2();
->foo2 : c1
->new m2.m2() : m2
->m2.m2 : typeof m2
->m2 : typeof m2
+>foo2 : m1.c1
+>new m2.m2() : m2.m2
+>m2.m2 : typeof m2.m2
 >m2 : typeof m2
+>m2 : typeof m2.m2
 
diff --git a/tests/baselines/reference/collisionCodeGenModuleWithPrivateMember.types b/tests/baselines/reference/collisionCodeGenModuleWithPrivateMember.types
index 47898d28352..fc5033726ec 100644
--- a/tests/baselines/reference/collisionCodeGenModuleWithPrivateMember.types
+++ b/tests/baselines/reference/collisionCodeGenModuleWithPrivateMember.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/collisionCodeGenModuleWithPrivateMember.ts ===
 module m1 {
->m1 : typeof m1
+>m1 : m1
 
     class m1 {
 >m1 : m1
@@ -15,9 +15,9 @@ module m1 {
     }
 }
 var foo = new m1.c1();
->foo : c1
->new m1.c1() : c1
->m1.c1 : typeof c1
+>foo : m1.c1
+>new m1.c1() : m1.c1
+>m1.c1 : typeof m1.c1
 >m1 : typeof m1
->c1 : typeof c1
+>c1 : typeof m1.c1
 
diff --git a/tests/baselines/reference/collisionCodeGenModuleWithUnicodeNames.types b/tests/baselines/reference/collisionCodeGenModuleWithUnicodeNames.types
index e690ba6b713..ae3c75eaeeb 100644
--- a/tests/baselines/reference/collisionCodeGenModuleWithUnicodeNames.types
+++ b/tests/baselines/reference/collisionCodeGenModuleWithUnicodeNames.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/collisionCodeGenModuleWithUnicodeNames.ts ===
 module 才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123 {
->才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123 : typeof 才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123
+>才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123 : 才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123
 
     export class 才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123 {
 >才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123 : 才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123
@@ -8,11 +8,11 @@ module 才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودö
 }
 
 var x = new 才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123.才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123();
->x : 才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123
->new 才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123.才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123() : 才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123
->才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123.才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123 : typeof 才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123
->才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123 : typeof 才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123
+>x : 才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123.才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123
+>new 才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123.才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123() : 才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123.才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123
+>才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123.才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123 : typeof 才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123.才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123
 >才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123 : typeof 才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123
+>才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123 : typeof 才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123.才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123
 
 
 
diff --git a/tests/baselines/reference/collisionExportsRequireAndModule.types b/tests/baselines/reference/collisionExportsRequireAndModule.types
index 21154458d6f..b702bb58a44 100644
--- a/tests/baselines/reference/collisionExportsRequireAndModule.types
+++ b/tests/baselines/reference/collisionExportsRequireAndModule.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/collisionExportsRequireAndModule.ts ===
 export module require {
->require : typeof require
+>require : require
 
     export interface I {
 >I : I
@@ -12,12 +12,12 @@ export module require {
 export function foo(): require.I {
 >foo : typeof foo
 >require : require
->I : I
+>I : require.I
 
     return null;
 }
 export module exports {
->exports : typeof exports
+>exports : exports
 
     export interface I {
 >I : I
@@ -29,7 +29,7 @@ export module exports {
 export function foo2(): exports.I {
 >foo2 : typeof foo2
 >exports : exports
->I : I
+>I : exports.I
 
     return null;
 }
diff --git a/tests/baselines/reference/collisionExportsRequireAndUninstantiatedModule.types b/tests/baselines/reference/collisionExportsRequireAndUninstantiatedModule.types
index e29b88abfe9..05aef0a25fa 100644
--- a/tests/baselines/reference/collisionExportsRequireAndUninstantiatedModule.types
+++ b/tests/baselines/reference/collisionExportsRequireAndUninstantiatedModule.types
@@ -9,7 +9,7 @@ export module require { // no error
 export function foo(): require.I {
 >foo : typeof foo
 >require : require
->I : I
+>I : require.I
 
     return null;
 }
@@ -23,7 +23,7 @@ export module exports { // no error
 export function foo2(): exports.I {
 >foo2 : typeof foo2
 >exports : exports
->I : I
+>I : exports.I
 
     return null;
 }
diff --git a/tests/baselines/reference/commentBeforeStaticMethod1.types b/tests/baselines/reference/commentBeforeStaticMethod1.types
index ebae1111658..db674324306 100644
--- a/tests/baselines/reference/commentBeforeStaticMethod1.types
+++ b/tests/baselines/reference/commentBeforeStaticMethod1.types
@@ -6,7 +6,7 @@ class C {
    * Returns bar
    */
   public static foo(): string {
->foo : typeof foo
+>foo : () => string
 
     return "bar";
   }
diff --git a/tests/baselines/reference/commentOnStaticMember1.types b/tests/baselines/reference/commentOnStaticMember1.types
index 927114680d8..4b54b07570a 100644
--- a/tests/baselines/reference/commentOnStaticMember1.types
+++ b/tests/baselines/reference/commentOnStaticMember1.types
@@ -4,6 +4,6 @@ class Greeter {
 
     //Hello World
     static foo(){
->foo : typeof foo
+>foo : () => void
     }
 }
diff --git a/tests/baselines/reference/commentsClassMembers.js b/tests/baselines/reference/commentsClassMembers.js
index 298991c2eef..67fdd047518 100644
--- a/tests/baselines/reference/commentsClassMembers.js
+++ b/tests/baselines/reference/commentsClassMembers.js
@@ -557,11 +557,11 @@ declare var i1_ncf: (b: number) => number;
 declare var i1_ncr: number;
 declare var i1_ncprop: number;
 declare var i1_s_p: number;
-declare var i1_s_f: typeof c1.s2;
+declare var i1_s_f: (b: number) => number;
 declare var i1_s_r: number;
 declare var i1_s_prop: number;
 declare var i1_s_nc_p: number;
-declare var i1_s_ncf: typeof c1.nc_s2;
+declare var i1_s_ncf: (b: number) => number;
 declare var i1_s_ncr: number;
 declare var i1_s_ncprop: number;
 declare var i1_c: typeof c1;
diff --git a/tests/baselines/reference/commentsClassMembers.types b/tests/baselines/reference/commentsClassMembers.types
index 91e76986262..d71ccd2e1e8 100644
--- a/tests/baselines/reference/commentsClassMembers.types
+++ b/tests/baselines/reference/commentsClassMembers.types
@@ -107,7 +107,7 @@ class c1 {
 
     /** static sum with property*/
     static s2(/** number to add*/b: number) {
->s2 : typeof s2
+>s2 : (b: number) => number
 >b : number
 
         return c1.s1 + b;
@@ -123,9 +123,9 @@ class c1 {
 
         return c1.s2(c1.s1);
 >c1.s2(c1.s1) : number
->c1.s2 : typeof s2
+>c1.s2 : (b: number) => number
 >c1 : typeof c1
->s2 : typeof s2
+>s2 : (b: number) => number
 >c1.s1 : number
 >c1 : typeof c1
 >s1 : number
@@ -142,9 +142,9 @@ class c1 {
 >c1 : typeof c1
 >s1 : number
 >c1.s2(value) : number
->c1.s2 : typeof s2
+>c1.s2 : (b: number) => number
 >c1 : typeof c1
->s2 : typeof s2
+>s2 : (b: number) => number
 >value : number
 
     }/*trailing comment 2 */ /*setter*/
@@ -234,7 +234,7 @@ class c1 {
 >nc_s1 : number
 
     static nc_s2(b: number) {
->nc_s2 : typeof nc_s2
+>nc_s2 : (b: number) => number
 >b : number
 
         return c1.nc_s1 + b;
@@ -249,9 +249,9 @@ class c1 {
 
         return c1.nc_s2(c1.nc_s1);
 >c1.nc_s2(c1.nc_s1) : number
->c1.nc_s2 : typeof nc_s2
+>c1.nc_s2 : (b: number) => number
 >c1 : typeof c1
->nc_s2 : typeof nc_s2
+>nc_s2 : (b: number) => number
 >c1.nc_s1 : number
 >c1 : typeof c1
 >nc_s1 : number
@@ -266,9 +266,9 @@ class c1 {
 >c1 : typeof c1
 >nc_s1 : number
 >c1.nc_s2(value) : number
->c1.nc_s2 : typeof nc_s2
+>c1.nc_s2 : (b: number) => number
 >c1 : typeof c1
->nc_s2 : typeof nc_s2
+>nc_s2 : (b: number) => number
 >value : number
     }
 
@@ -369,7 +369,7 @@ class c1 {
 
     // static sum with property
     static a_s2(b: number) {
->a_s2 : typeof a_s2
+>a_s2 : (b: number) => number
 >b : number
 
         return c1.a_s1 + b;
@@ -385,9 +385,9 @@ class c1 {
 
         return c1.s2(c1.s1);
 >c1.s2(c1.s1) : number
->c1.s2 : typeof s2
+>c1.s2 : (b: number) => number
 >c1 : typeof c1
->s2 : typeof s2
+>s2 : (b: number) => number
 >c1.s1 : number
 >c1 : typeof c1
 >s1 : number
@@ -404,9 +404,9 @@ class c1 {
 >c1 : typeof c1
 >a_s1 : number
 >c1.a_s2(value) : number
->c1.a_s2 : typeof a_s2
+>c1.a_s2 : (b: number) => number
 >c1 : typeof c1
->a_s2 : typeof a_s2
+>a_s2 : (b: number) => number
 >value : number
     }
 
@@ -507,7 +507,7 @@ class c1 {
 
     /** static sum with property */
     static b_s2(b: number) {
->b_s2 : typeof b_s2
+>b_s2 : (b: number) => number
 >b : number
 
         return c1.b_s1 + b;
@@ -524,9 +524,9 @@ class c1 {
 
         return c1.s2(c1.s1);
 >c1.s2(c1.s1) : number
->c1.s2 : typeof s2
+>c1.s2 : (b: number) => number
 >c1 : typeof c1
->s2 : typeof s2
+>s2 : (b: number) => number
 >c1.s1 : number
 >c1 : typeof c1
 >s1 : number
@@ -545,9 +545,9 @@ class c1 {
 >c1 : typeof c1
 >b_s1 : number
 >c1.b_s2(value) : number
->c1.b_s2 : typeof b_s2
+>c1.b_s2 : (b: number) => number
 >c1 : typeof c1
->b_s2 : typeof b_s2
+>b_s2 : (b: number) => number
 >value : number
     }
 }
@@ -627,17 +627,17 @@ var i1_s_p = c1.s1;
 >s1 : number
 
 var i1_s_f = c1.s2;
->i1_s_f : typeof s2
->c1.s2 : typeof s2
+>i1_s_f : (b: number) => number
+>c1.s2 : (b: number) => number
 >c1 : typeof c1
->s2 : typeof s2
+>s2 : (b: number) => number
 
 var i1_s_r = c1.s2(20);
 >i1_s_r : number
 >c1.s2(20) : number
->c1.s2 : typeof s2
+>c1.s2 : (b: number) => number
 >c1 : typeof c1
->s2 : typeof s2
+>s2 : (b: number) => number
 
 var i1_s_prop = c1.s3;
 >i1_s_prop : number
@@ -659,17 +659,17 @@ var i1_s_nc_p = c1.nc_s1;
 >nc_s1 : number
 
 var i1_s_ncf = c1.nc_s2;
->i1_s_ncf : typeof nc_s2
->c1.nc_s2 : typeof nc_s2
+>i1_s_ncf : (b: number) => number
+>c1.nc_s2 : (b: number) => number
 >c1 : typeof c1
->nc_s2 : typeof nc_s2
+>nc_s2 : (b: number) => number
 
 var i1_s_ncr = c1.nc_s2(20);
 >i1_s_ncr : number
 >c1.nc_s2(20) : number
->c1.nc_s2 : typeof nc_s2
+>c1.nc_s2 : (b: number) => number
 >c1 : typeof c1
->nc_s2 : typeof nc_s2
+>nc_s2 : (b: number) => number
 
 var i1_s_ncprop = c1.nc_s3;
 >i1_s_ncprop : number
diff --git a/tests/baselines/reference/commentsExternalModules.types b/tests/baselines/reference/commentsExternalModules.types
index dd6569e6e53..111114cd734 100644
--- a/tests/baselines/reference/commentsExternalModules.types
+++ b/tests/baselines/reference/commentsExternalModules.types
@@ -1,51 +1,51 @@
 === tests/cases/compiler/commentsExternalModules_1.ts ===
 /**This is on import declaration*/
 import extMod = require("commentsExternalModules_0"); // trailing comment1
->extMod : typeof "tests/cases/compiler/commentsExternalModules_0"
+>extMod : extMod
 
 extMod.m1.fooExport();
 >extMod.m1.fooExport() : number
->extMod.m1.fooExport : typeof fooExport
->extMod.m1 : typeof m1
->extMod : typeof "tests/cases/compiler/commentsExternalModules_0"
->m1 : typeof m1
->fooExport : typeof fooExport
+>extMod.m1.fooExport : typeof extMod.m1.fooExport
+>extMod.m1 : typeof extMod.m1
+>extMod : typeof extMod
+>m1 : typeof extMod.m1
+>fooExport : typeof extMod.m1.fooExport
 
 var newVar = new extMod.m1.m2.c();
->newVar : c
->new extMod.m1.m2.c() : c
->extMod.m1.m2.c : typeof c
->extMod.m1.m2 : typeof m2
->extMod.m1 : typeof m1
->extMod : typeof "tests/cases/compiler/commentsExternalModules_0"
->m1 : typeof m1
->m2 : typeof m2
->c : typeof c
+>newVar : extMod.m1.m2.c
+>new extMod.m1.m2.c() : extMod.m1.m2.c
+>extMod.m1.m2.c : typeof extMod.m1.m2.c
+>extMod.m1.m2 : typeof extMod.m1.m2
+>extMod.m1 : typeof extMod.m1
+>extMod : typeof extMod
+>m1 : typeof extMod.m1
+>m2 : typeof extMod.m1.m2
+>c : typeof extMod.m1.m2.c
 
 extMod.m4.fooExport();
 >extMod.m4.fooExport() : number
->extMod.m4.fooExport : typeof fooExport
->extMod.m4 : typeof m4
->extMod : typeof "tests/cases/compiler/commentsExternalModules_0"
->m4 : typeof m4
->fooExport : typeof fooExport
+>extMod.m4.fooExport : typeof extMod.m4.fooExport
+>extMod.m4 : typeof extMod.m4
+>extMod : typeof extMod
+>m4 : typeof extMod.m4
+>fooExport : typeof extMod.m4.fooExport
 
 var newVar2 = new extMod.m4.m2.c();
->newVar2 : c
->new extMod.m4.m2.c() : c
->extMod.m4.m2.c : typeof c
->extMod.m4.m2 : typeof m2
->extMod.m4 : typeof m4
->extMod : typeof "tests/cases/compiler/commentsExternalModules_0"
->m4 : typeof m4
->m2 : typeof m2
->c : typeof c
+>newVar2 : extMod.m4.m2.c
+>new extMod.m4.m2.c() : extMod.m4.m2.c
+>extMod.m4.m2.c : typeof extMod.m4.m2.c
+>extMod.m4.m2 : typeof extMod.m4.m2
+>extMod.m4 : typeof extMod.m4
+>extMod : typeof extMod
+>m4 : typeof extMod.m4
+>m2 : typeof extMod.m4.m2
+>c : typeof extMod.m4.m2.c
 
 === tests/cases/compiler/commentsExternalModules_0.ts ===
 
 /** Module comment*/
 export module m1 {
->m1 : typeof m1
+>m1 : m1
 
     /** b's comment*/
     export var b: number;
@@ -60,7 +60,7 @@ export module m1 {
     }
     /** m2 comments*/
     export module m2 {
->m2 : typeof m2
+>m2 : m2
 
         /** class comment;*/
         export class c {
@@ -84,22 +84,22 @@ export module m1 {
 }
 m1.fooExport();
 >m1.fooExport() : number
->m1.fooExport : typeof fooExport
+>m1.fooExport : typeof m1.fooExport
 >m1 : typeof m1
->fooExport : typeof fooExport
+>fooExport : typeof m1.fooExport
 
 var myvar = new m1.m2.c();
->myvar : c
->new m1.m2.c() : c
->m1.m2.c : typeof c
->m1.m2 : typeof m2
+>myvar : m1.m2.c
+>new m1.m2.c() : m1.m2.c
+>m1.m2.c : typeof m1.m2.c
+>m1.m2 : typeof m1.m2
 >m1 : typeof m1
->m2 : typeof m2
->c : typeof c
+>m2 : typeof m1.m2
+>c : typeof m1.m2.c
 
 /** Module comment */
 export module m4 {
->m4 : typeof m4
+>m4 : m4
 
     /** b's comment */
     export var b: number;
@@ -116,7 +116,7 @@ export module m4 {
     /** m2 comments
     */
     export module m2 {
->m2 : typeof m2
+>m2 : m2
 
         /** class comment; */
         export class c {
@@ -140,16 +140,16 @@ export module m4 {
 }
 m4.fooExport();
 >m4.fooExport() : number
->m4.fooExport : typeof fooExport
+>m4.fooExport : typeof m4.fooExport
 >m4 : typeof m4
->fooExport : typeof fooExport
+>fooExport : typeof m4.fooExport
 
 var myvar2 = new m4.m2.c();
->myvar2 : c
->new m4.m2.c() : c
->m4.m2.c : typeof c
->m4.m2 : typeof m2
+>myvar2 : m4.m2.c
+>new m4.m2.c() : m4.m2.c
+>m4.m2.c : typeof m4.m2.c
+>m4.m2 : typeof m4.m2
 >m4 : typeof m4
->m2 : typeof m2
->c : typeof c
+>m2 : typeof m4.m2
+>c : typeof m4.m2.c
 
diff --git a/tests/baselines/reference/commentsExternalModules2.types b/tests/baselines/reference/commentsExternalModules2.types
index fb624d9c5a6..3f9c14227ac 100644
--- a/tests/baselines/reference/commentsExternalModules2.types
+++ b/tests/baselines/reference/commentsExternalModules2.types
@@ -1,51 +1,51 @@
 === tests/cases/compiler/commentsExternalModules_1.ts ===
 /**This is on import declaration*/
 import extMod = require("commentsExternalModules2_0"); // trailing comment 1
->extMod : typeof "tests/cases/compiler/commentsExternalModules2_0"
+>extMod : extMod
 
 extMod.m1.fooExport();
 >extMod.m1.fooExport() : number
->extMod.m1.fooExport : typeof fooExport
->extMod.m1 : typeof m1
->extMod : typeof "tests/cases/compiler/commentsExternalModules2_0"
->m1 : typeof m1
->fooExport : typeof fooExport
+>extMod.m1.fooExport : typeof extMod.m1.fooExport
+>extMod.m1 : typeof extMod.m1
+>extMod : typeof extMod
+>m1 : typeof extMod.m1
+>fooExport : typeof extMod.m1.fooExport
 
 export var newVar = new extMod.m1.m2.c();
->newVar : c
->new extMod.m1.m2.c() : c
->extMod.m1.m2.c : typeof c
->extMod.m1.m2 : typeof m2
->extMod.m1 : typeof m1
->extMod : typeof "tests/cases/compiler/commentsExternalModules2_0"
->m1 : typeof m1
->m2 : typeof m2
->c : typeof c
+>newVar : extMod.m1.m2.c
+>new extMod.m1.m2.c() : extMod.m1.m2.c
+>extMod.m1.m2.c : typeof extMod.m1.m2.c
+>extMod.m1.m2 : typeof extMod.m1.m2
+>extMod.m1 : typeof extMod.m1
+>extMod : typeof extMod
+>m1 : typeof extMod.m1
+>m2 : typeof extMod.m1.m2
+>c : typeof extMod.m1.m2.c
 
 extMod.m4.fooExport();
 >extMod.m4.fooExport() : number
->extMod.m4.fooExport : typeof fooExport
->extMod.m4 : typeof m4
->extMod : typeof "tests/cases/compiler/commentsExternalModules2_0"
->m4 : typeof m4
->fooExport : typeof fooExport
+>extMod.m4.fooExport : typeof extMod.m4.fooExport
+>extMod.m4 : typeof extMod.m4
+>extMod : typeof extMod
+>m4 : typeof extMod.m4
+>fooExport : typeof extMod.m4.fooExport
 
 export var newVar2 = new extMod.m4.m2.c();
->newVar2 : c
->new extMod.m4.m2.c() : c
->extMod.m4.m2.c : typeof c
->extMod.m4.m2 : typeof m2
->extMod.m4 : typeof m4
->extMod : typeof "tests/cases/compiler/commentsExternalModules2_0"
->m4 : typeof m4
->m2 : typeof m2
->c : typeof c
+>newVar2 : extMod.m4.m2.c
+>new extMod.m4.m2.c() : extMod.m4.m2.c
+>extMod.m4.m2.c : typeof extMod.m4.m2.c
+>extMod.m4.m2 : typeof extMod.m4.m2
+>extMod.m4 : typeof extMod.m4
+>extMod : typeof extMod
+>m4 : typeof extMod.m4
+>m2 : typeof extMod.m4.m2
+>c : typeof extMod.m4.m2.c
 
 === tests/cases/compiler/commentsExternalModules2_0.ts ===
 
 /** Module comment*/
 export module m1 {
->m1 : typeof m1
+>m1 : m1
 
     /** b's comment*/
     export var b: number;
@@ -60,7 +60,7 @@ export module m1 {
     }
     /** m2 comments*/
     export module m2 {
->m2 : typeof m2
+>m2 : m2
 
         /** class comment;*/
         export class c {
@@ -84,22 +84,22 @@ export module m1 {
 }
 m1.fooExport();
 >m1.fooExport() : number
->m1.fooExport : typeof fooExport
+>m1.fooExport : typeof m1.fooExport
 >m1 : typeof m1
->fooExport : typeof fooExport
+>fooExport : typeof m1.fooExport
 
 var myvar = new m1.m2.c();
->myvar : c
->new m1.m2.c() : c
->m1.m2.c : typeof c
->m1.m2 : typeof m2
+>myvar : m1.m2.c
+>new m1.m2.c() : m1.m2.c
+>m1.m2.c : typeof m1.m2.c
+>m1.m2 : typeof m1.m2
 >m1 : typeof m1
->m2 : typeof m2
->c : typeof c
+>m2 : typeof m1.m2
+>c : typeof m1.m2.c
 
 /** Module comment */
 export module m4 {
->m4 : typeof m4
+>m4 : m4
 
     /** b's comment */
     export var b: number;
@@ -116,7 +116,7 @@ export module m4 {
     /** m2 comments
     */
     export module m2 {
->m2 : typeof m2
+>m2 : m2
 
         /** class comment; */
         export class c {
@@ -140,16 +140,16 @@ export module m4 {
 }
 m4.fooExport();
 >m4.fooExport() : number
->m4.fooExport : typeof fooExport
+>m4.fooExport : typeof m4.fooExport
 >m4 : typeof m4
->fooExport : typeof fooExport
+>fooExport : typeof m4.fooExport
 
 var myvar2 = new m4.m2.c();
->myvar2 : c
->new m4.m2.c() : c
->m4.m2.c : typeof c
->m4.m2 : typeof m2
+>myvar2 : m4.m2.c
+>new m4.m2.c() : m4.m2.c
+>m4.m2.c : typeof m4.m2.c
+>m4.m2 : typeof m4.m2
 >m4 : typeof m4
->m2 : typeof m2
->c : typeof c
+>m2 : typeof m4.m2
+>c : typeof m4.m2.c
 
diff --git a/tests/baselines/reference/commentsExternalModules3.types b/tests/baselines/reference/commentsExternalModules3.types
index fb624d9c5a6..3f9c14227ac 100644
--- a/tests/baselines/reference/commentsExternalModules3.types
+++ b/tests/baselines/reference/commentsExternalModules3.types
@@ -1,51 +1,51 @@
 === tests/cases/compiler/commentsExternalModules_1.ts ===
 /**This is on import declaration*/
 import extMod = require("commentsExternalModules2_0"); // trailing comment 1
->extMod : typeof "tests/cases/compiler/commentsExternalModules2_0"
+>extMod : extMod
 
 extMod.m1.fooExport();
 >extMod.m1.fooExport() : number
->extMod.m1.fooExport : typeof fooExport
->extMod.m1 : typeof m1
->extMod : typeof "tests/cases/compiler/commentsExternalModules2_0"
->m1 : typeof m1
->fooExport : typeof fooExport
+>extMod.m1.fooExport : typeof extMod.m1.fooExport
+>extMod.m1 : typeof extMod.m1
+>extMod : typeof extMod
+>m1 : typeof extMod.m1
+>fooExport : typeof extMod.m1.fooExport
 
 export var newVar = new extMod.m1.m2.c();
->newVar : c
->new extMod.m1.m2.c() : c
->extMod.m1.m2.c : typeof c
->extMod.m1.m2 : typeof m2
->extMod.m1 : typeof m1
->extMod : typeof "tests/cases/compiler/commentsExternalModules2_0"
->m1 : typeof m1
->m2 : typeof m2
->c : typeof c
+>newVar : extMod.m1.m2.c
+>new extMod.m1.m2.c() : extMod.m1.m2.c
+>extMod.m1.m2.c : typeof extMod.m1.m2.c
+>extMod.m1.m2 : typeof extMod.m1.m2
+>extMod.m1 : typeof extMod.m1
+>extMod : typeof extMod
+>m1 : typeof extMod.m1
+>m2 : typeof extMod.m1.m2
+>c : typeof extMod.m1.m2.c
 
 extMod.m4.fooExport();
 >extMod.m4.fooExport() : number
->extMod.m4.fooExport : typeof fooExport
->extMod.m4 : typeof m4
->extMod : typeof "tests/cases/compiler/commentsExternalModules2_0"
->m4 : typeof m4
->fooExport : typeof fooExport
+>extMod.m4.fooExport : typeof extMod.m4.fooExport
+>extMod.m4 : typeof extMod.m4
+>extMod : typeof extMod
+>m4 : typeof extMod.m4
+>fooExport : typeof extMod.m4.fooExport
 
 export var newVar2 = new extMod.m4.m2.c();
->newVar2 : c
->new extMod.m4.m2.c() : c
->extMod.m4.m2.c : typeof c
->extMod.m4.m2 : typeof m2
->extMod.m4 : typeof m4
->extMod : typeof "tests/cases/compiler/commentsExternalModules2_0"
->m4 : typeof m4
->m2 : typeof m2
->c : typeof c
+>newVar2 : extMod.m4.m2.c
+>new extMod.m4.m2.c() : extMod.m4.m2.c
+>extMod.m4.m2.c : typeof extMod.m4.m2.c
+>extMod.m4.m2 : typeof extMod.m4.m2
+>extMod.m4 : typeof extMod.m4
+>extMod : typeof extMod
+>m4 : typeof extMod.m4
+>m2 : typeof extMod.m4.m2
+>c : typeof extMod.m4.m2.c
 
 === tests/cases/compiler/commentsExternalModules2_0.ts ===
 
 /** Module comment*/
 export module m1 {
->m1 : typeof m1
+>m1 : m1
 
     /** b's comment*/
     export var b: number;
@@ -60,7 +60,7 @@ export module m1 {
     }
     /** m2 comments*/
     export module m2 {
->m2 : typeof m2
+>m2 : m2
 
         /** class comment;*/
         export class c {
@@ -84,22 +84,22 @@ export module m1 {
 }
 m1.fooExport();
 >m1.fooExport() : number
->m1.fooExport : typeof fooExport
+>m1.fooExport : typeof m1.fooExport
 >m1 : typeof m1
->fooExport : typeof fooExport
+>fooExport : typeof m1.fooExport
 
 var myvar = new m1.m2.c();
->myvar : c
->new m1.m2.c() : c
->m1.m2.c : typeof c
->m1.m2 : typeof m2
+>myvar : m1.m2.c
+>new m1.m2.c() : m1.m2.c
+>m1.m2.c : typeof m1.m2.c
+>m1.m2 : typeof m1.m2
 >m1 : typeof m1
->m2 : typeof m2
->c : typeof c
+>m2 : typeof m1.m2
+>c : typeof m1.m2.c
 
 /** Module comment */
 export module m4 {
->m4 : typeof m4
+>m4 : m4
 
     /** b's comment */
     export var b: number;
@@ -116,7 +116,7 @@ export module m4 {
     /** m2 comments
     */
     export module m2 {
->m2 : typeof m2
+>m2 : m2
 
         /** class comment; */
         export class c {
@@ -140,16 +140,16 @@ export module m4 {
 }
 m4.fooExport();
 >m4.fooExport() : number
->m4.fooExport : typeof fooExport
+>m4.fooExport : typeof m4.fooExport
 >m4 : typeof m4
->fooExport : typeof fooExport
+>fooExport : typeof m4.fooExport
 
 var myvar2 = new m4.m2.c();
->myvar2 : c
->new m4.m2.c() : c
->m4.m2.c : typeof c
->m4.m2 : typeof m2
+>myvar2 : m4.m2.c
+>new m4.m2.c() : m4.m2.c
+>m4.m2.c : typeof m4.m2.c
+>m4.m2 : typeof m4.m2
 >m4 : typeof m4
->m2 : typeof m2
->c : typeof c
+>m2 : typeof m4.m2
+>c : typeof m4.m2.c
 
diff --git a/tests/baselines/reference/commentsFormatting.types b/tests/baselines/reference/commentsFormatting.types
index 62e8941b180..0c5e1343959 100644
--- a/tests/baselines/reference/commentsFormatting.types
+++ b/tests/baselines/reference/commentsFormatting.types
@@ -1,7 +1,7 @@
 === tests/cases/compiler/commentsFormatting.ts ===
 
 module m {
->m : typeof m
+>m : m
 
     /** this is first line - aligned to class declaration
 * this is 4 spaces left aligned
diff --git a/tests/baselines/reference/commentsModules.types b/tests/baselines/reference/commentsModules.types
index 8302ef5b517..a0b2da715ce 100644
--- a/tests/baselines/reference/commentsModules.types
+++ b/tests/baselines/reference/commentsModules.types
@@ -1,7 +1,7 @@
 === tests/cases/compiler/commentsModules.ts ===
 /** Module comment*/
 module m1 {
->m1 : typeof m1
+>m1 : m1
 
     /** b's comment*/
     export var b: number;
@@ -16,7 +16,7 @@ module m1 {
     }
     /** m2 comments*/
     export module m2 {
->m2 : typeof m2
+>m2 : m2
 
         /** class comment;*/
         export class c {
@@ -60,23 +60,23 @@ module m1 {
 } // trailing comment module
 m1.fooExport();
 >m1.fooExport() : number
->m1.fooExport : typeof fooExport
+>m1.fooExport : typeof m1.fooExport
 >m1 : typeof m1
->fooExport : typeof fooExport
+>fooExport : typeof m1.fooExport
 
 var myvar = new m1.m2.c();
->myvar : c
->new m1.m2.c() : c
->m1.m2.c : typeof c
->m1.m2 : typeof m2
+>myvar : m1.m2.c
+>new m1.m2.c() : m1.m2.c
+>m1.m2.c : typeof m1.m2.c
+>m1.m2 : typeof m1.m2
 >m1 : typeof m1
->m2 : typeof m2
->c : typeof c
+>m2 : typeof m1.m2
+>c : typeof m1.m2.c
 
 /** module comment of m2.m3*/
 module m2.m3 {
->m2 : typeof m2
->m3 : typeof m3
+>m2 : m2
+>m3 : m3
 
     /** Exported class comment*/
     export class c {
@@ -84,18 +84,18 @@ module m2.m3 {
     }
 } /* trailing dotted module comment*/
 new m2.m3.c();
->new m2.m3.c() : c
->m2.m3.c : typeof c
->m2.m3 : typeof m3
+>new m2.m3.c() : m2.m3.c
+>m2.m3.c : typeof m2.m3.c
+>m2.m3 : typeof m2.m3
 >m2 : typeof m2
->m3 : typeof m3
->c : typeof c
+>m3 : typeof m2.m3
+>c : typeof m2.m3.c
 
 /** module comment of m3.m4.m5*/
 module m3.m4.m5 {
->m3 : typeof m3
->m4 : typeof m4
->m5 : typeof m5
+>m3 : m3
+>m4 : m4
+>m5 : m5
 
     /** Exported class comment*/
     export class c {
@@ -103,23 +103,23 @@ module m3.m4.m5 {
     }
 } // trailing dotted module 2
 new m3.m4.m5.c();
->new m3.m4.m5.c() : c
->m3.m4.m5.c : typeof c
->m3.m4.m5 : typeof m5
->m3.m4 : typeof m4
+>new m3.m4.m5.c() : m3.m4.m5.c
+>m3.m4.m5.c : typeof m3.m4.m5.c
+>m3.m4.m5 : typeof m3.m4.m5
+>m3.m4 : typeof m3.m4
 >m3 : typeof m3
->m4 : typeof m4
->m5 : typeof m5
->c : typeof c
+>m4 : typeof m3.m4
+>m5 : typeof m3.m4.m5
+>c : typeof m3.m4.m5.c
 
 /** module comment of m4.m5.m6*/
 module m4.m5.m6 {
->m4 : typeof m4
->m5 : typeof m5
->m6 : typeof m6
+>m4 : m4
+>m5 : m5
+>m6 : m6
 
     export module m7 {
->m7 : typeof m7
+>m7 : m7
 
         /** Exported class comment*/
         export class c {
@@ -128,26 +128,26 @@ module m4.m5.m6 {
     } /* trailing inner module */ /* multiple comments*/
 }
 new m4.m5.m6.m7.c();
->new m4.m5.m6.m7.c() : c
->m4.m5.m6.m7.c : typeof c
->m4.m5.m6.m7 : typeof m7
->m4.m5.m6 : typeof m6
->m4.m5 : typeof m5
+>new m4.m5.m6.m7.c() : m4.m5.m6.m7.c
+>m4.m5.m6.m7.c : typeof m4.m5.m6.m7.c
+>m4.m5.m6.m7 : typeof m4.m5.m6.m7
+>m4.m5.m6 : typeof m4.m5.m6
+>m4.m5 : typeof m4.m5
 >m4 : typeof m4
->m5 : typeof m5
->m6 : typeof m6
->m7 : typeof m7
->c : typeof c
+>m5 : typeof m4.m5
+>m6 : typeof m4.m5.m6
+>m7 : typeof m4.m5.m6.m7
+>c : typeof m4.m5.m6.m7.c
 
 /** module comment of m5.m6.m7*/
 module m5.m6.m7 {
->m5 : typeof m5
->m6 : typeof m6
->m7 : typeof m7
+>m5 : m5
+>m6 : m6
+>m7 : m7
 
     /** module m8 comment*/
     export module m8 {
->m8 : typeof m8
+>m8 : m8
 
         /** Exported class comment*/
         export class c {
@@ -156,23 +156,23 @@ module m5.m6.m7 {
     }
 }
 new m5.m6.m7.m8.c();
->new m5.m6.m7.m8.c() : c
->m5.m6.m7.m8.c : typeof c
->m5.m6.m7.m8 : typeof m8
->m5.m6.m7 : typeof m7
->m5.m6 : typeof m6
+>new m5.m6.m7.m8.c() : m5.m6.m7.m8.c
+>m5.m6.m7.m8.c : typeof m5.m6.m7.m8.c
+>m5.m6.m7.m8 : typeof m5.m6.m7.m8
+>m5.m6.m7 : typeof m5.m6.m7
+>m5.m6 : typeof m5.m6
 >m5 : typeof m5
->m6 : typeof m6
->m7 : typeof m7
->m8 : typeof m8
->c : typeof c
+>m6 : typeof m5.m6
+>m7 : typeof m5.m6.m7
+>m8 : typeof m5.m6.m7.m8
+>c : typeof m5.m6.m7.m8.c
 
 module m6.m7 {
->m6 : typeof m6
->m7 : typeof m7
+>m6 : m6
+>m7 : m7
 
     export module m8 {
->m8 : typeof m8
+>m8 : m8
 
         /** Exported class comment*/
         export class c {
@@ -181,22 +181,22 @@ module m6.m7 {
     }
 }
 new m6.m7.m8.c();
->new m6.m7.m8.c() : c
->m6.m7.m8.c : typeof c
->m6.m7.m8 : typeof m8
->m6.m7 : typeof m7
+>new m6.m7.m8.c() : m6.m7.m8.c
+>m6.m7.m8.c : typeof m6.m7.m8.c
+>m6.m7.m8 : typeof m6.m7.m8
+>m6.m7 : typeof m6.m7
 >m6 : typeof m6
->m7 : typeof m7
->m8 : typeof m8
->c : typeof c
+>m7 : typeof m6.m7
+>m8 : typeof m6.m7.m8
+>c : typeof m6.m7.m8.c
 
 module m7.m8 {
->m7 : typeof m7
->m8 : typeof m8
+>m7 : m7
+>m8 : m8
 
     /** module m9 comment*/
     export module m9 {
->m9 : typeof m9
+>m9 : m9
 
         /** Exported class comment*/
         export class c {
@@ -215,12 +215,12 @@ module m7.m8 {
     }
 }
 new m7.m8.m9.c();
->new m7.m8.m9.c() : c
->m7.m8.m9.c : typeof c
->m7.m8.m9 : typeof m9
->m7.m8 : typeof m8
+>new m7.m8.m9.c() : m7.m8.m9.c
+>m7.m8.m9.c : typeof m7.m8.m9.c
+>m7.m8.m9 : typeof m7.m8.m9
+>m7.m8 : typeof m7.m8
 >m7 : typeof m7
->m8 : typeof m8
->m9 : typeof m9
->c : typeof c
+>m8 : typeof m7.m8
+>m9 : typeof m7.m8.m9
+>c : typeof m7.m8.m9.c
 
diff --git a/tests/baselines/reference/commentsMultiModuleMultiFile.js b/tests/baselines/reference/commentsMultiModuleMultiFile.js
index 80a971a8e27..49c8c2dc04c 100644
--- a/tests/baselines/reference/commentsMultiModuleMultiFile.js
+++ b/tests/baselines/reference/commentsMultiModuleMultiFile.js
@@ -92,28 +92,3 @@ define(["require", "exports"], function (require, exports) {
     })(multiM || (multiM = {}));
     new multiM.d();
 });
-
-
-//// [commentsMultiModuleMultiFile_0.d.ts]
-/** this is multi declare module*/
-export declare module multiM {
-    class b {
-    }
-}
-/** thi is multi module 2*/
-export declare module multiM {
-    /** class c comment*/
-    class c {
-    }
-    class e {
-    }
-}
-//// [commentsMultiModuleMultiFile_1.d.ts]
-/** this is multi module 3 comment*/
-export declare module multiM {
-    /** class d comment*/
-    class d {
-    }
-    class f {
-    }
-}
diff --git a/tests/baselines/reference/commentsMultiModuleSingleFile.types b/tests/baselines/reference/commentsMultiModuleSingleFile.types
index c77d5e972e0..a2dfd6c2252 100644
--- a/tests/baselines/reference/commentsMultiModuleSingleFile.types
+++ b/tests/baselines/reference/commentsMultiModuleSingleFile.types
@@ -2,7 +2,7 @@
 
 /** this is multi declare module*/
 module multiM {
->multiM : typeof multiM
+>multiM : multiM
 
     /** class b*/
     export class b {
@@ -17,7 +17,7 @@ module multiM {
 
 /// this is multi module 2
 module multiM {
->multiM : typeof multiM
+>multiM : multiM
 
     /** class c comment*/
     export class c {
@@ -30,14 +30,14 @@ module multiM {
     }
 }
 new multiM.b();
->new multiM.b() : b
->multiM.b : typeof b
+>new multiM.b() : multiM.b
+>multiM.b : typeof multiM.b
 >multiM : typeof multiM
->b : typeof b
+>b : typeof multiM.b
 
 new multiM.c();
->new multiM.c() : c
->multiM.c : typeof c
+>new multiM.c() : multiM.c
+>multiM.c : typeof multiM.c
 >multiM : typeof multiM
->c : typeof c
+>c : typeof multiM.c
 
diff --git a/tests/baselines/reference/commentsOnReturnStatement1.types b/tests/baselines/reference/commentsOnReturnStatement1.types
index c9604beaba9..0d447b6536f 100644
--- a/tests/baselines/reference/commentsOnReturnStatement1.types
+++ b/tests/baselines/reference/commentsOnReturnStatement1.types
@@ -3,7 +3,7 @@ class DebugClass {
 >DebugClass : DebugClass
 
     public static debugFunc() {
->debugFunc : typeof debugFunc
+>debugFunc : () => boolean
 
         // Start Debugger Test Code
         var i = 0;
diff --git a/tests/baselines/reference/commentsTypeParameters.types b/tests/baselines/reference/commentsTypeParameters.types
index 056a65f8073..43344f1a826 100644
--- a/tests/baselines/reference/commentsTypeParameters.types
+++ b/tests/baselines/reference/commentsTypeParameters.types
@@ -11,7 +11,7 @@ class C</**docComment for type parameter*/ T> {
 >U : U
     }
     static staticmethod</**docComment of method type parameter */ U>(a: U) {
->staticmethod : typeof staticmethod
+>staticmethod : <U>(a: U) => void
 >U : U
 >a : U
 >U : U
@@ -25,7 +25,7 @@ class C</**docComment for type parameter*/ T> {
 >U : U
     }
     private static privatestaticmethod</**docComment of method type parameter */ U>(a: U) {
->privatestaticmethod : typeof privatestaticmethod
+>privatestaticmethod : <U>(a: U) => void
 >U : U
 >a : U
 >U : U
diff --git a/tests/baselines/reference/commentsdoNotEmitComments.types b/tests/baselines/reference/commentsdoNotEmitComments.types
index b625fc41b87..3ebd8b17198 100644
--- a/tests/baselines/reference/commentsdoNotEmitComments.types
+++ b/tests/baselines/reference/commentsdoNotEmitComments.types
@@ -129,7 +129,7 @@ var i1_i: i1;
 
 /** this is module comment*/
 module m1 {
->m1 : typeof m1
+>m1 : m1
 
     /** class b */
     export class b {
diff --git a/tests/baselines/reference/commentsemitComments.types b/tests/baselines/reference/commentsemitComments.types
index e9da4d5f46d..69f25dfa873 100644
--- a/tests/baselines/reference/commentsemitComments.types
+++ b/tests/baselines/reference/commentsemitComments.types
@@ -129,7 +129,7 @@ var i1_i: i1;
 
 /** this is module comment*/
 module m1 {
->m1 : typeof m1
+>m1 : m1
 
     /** class b */
     export class b {
diff --git a/tests/baselines/reference/commonJSImportAsPrimaryExpression.types b/tests/baselines/reference/commonJSImportAsPrimaryExpression.types
index b1a0a7e49ac..28c539cd935 100644
--- a/tests/baselines/reference/commonJSImportAsPrimaryExpression.types
+++ b/tests/baselines/reference/commonJSImportAsPrimaryExpression.types
@@ -1,12 +1,12 @@
 === tests/cases/conformance/externalModules/foo_1.ts ===
 import foo = require("./foo_0");
->foo : typeof "tests/cases/conformance/externalModules/foo_0"
+>foo : foo
 
 if(foo.C1.s1){
 >foo.C1.s1 : boolean
->foo.C1 : typeof C1
->foo : typeof "tests/cases/conformance/externalModules/foo_0"
->C1 : typeof C1
+>foo.C1 : typeof foo.C1
+>foo : typeof foo
+>C1 : typeof foo.C1
 >s1 : boolean
 
 	// Should cause runtime import
diff --git a/tests/baselines/reference/commonJSImportNotAsPrimaryExpression.types b/tests/baselines/reference/commonJSImportNotAsPrimaryExpression.types
index affce41c42e..3242c58465d 100644
--- a/tests/baselines/reference/commonJSImportNotAsPrimaryExpression.types
+++ b/tests/baselines/reference/commonJSImportNotAsPrimaryExpression.types
@@ -1,43 +1,43 @@
 === tests/cases/conformance/externalModules/foo_1.ts ===
 import foo = require("./foo_0");
->foo : typeof "tests/cases/conformance/externalModules/foo_0"
+>foo : foo
 
 // None of the below should cause a runtime dependency on foo_0
 import f = foo.M1;
 >f : f
->foo : typeof "tests/cases/conformance/externalModules/foo_0"
->M1 : M1
+>foo : typeof foo
+>M1 : foo.M1
 
 var i: f.I2;
->i : I2
+>i : f.I2
 >f : f
->I2 : I2
+>I2 : f.I2
 
 var x: foo.C1 = <{m1: number}>{};
->x : C1
+>x : foo.C1
 >foo : foo
->C1 : C1
+>C1 : foo.C1
 ><{m1: number}>{} : { m1: number; }
 >m1 : number
 >{} : {}
 
 var y: typeof foo.C1.s1 = false;
 >y : boolean
->foo : typeof "tests/cases/conformance/externalModules/foo_0"
->C1 : typeof C1
+>foo : typeof foo
+>C1 : typeof foo.C1
 >s1 : boolean
 
 var z: foo.M1.I2;
->z : I2
+>z : f.I2
 >foo : foo
->M1 : M1
->I2 : I2
+>M1 : foo.M1
+>I2 : f.I2
 
 var e: number = <foo.E1>0;
 >e : number
-><foo.E1>0 : E1
+><foo.E1>0 : foo.E1
 >foo : foo
->E1 : E1
+>E1 : foo.E1
 
 === tests/cases/conformance/externalModules/foo_0.ts ===
 export class C1 {
diff --git a/tests/baselines/reference/complexClassRelationships.types b/tests/baselines/reference/complexClassRelationships.types
index 3b34e1295b1..69bee9caade 100644
--- a/tests/baselines/reference/complexClassRelationships.types
+++ b/tests/baselines/reference/complexClassRelationships.types
@@ -5,7 +5,7 @@ class Derived extends Base {
 >Base : Base
 
     public static createEmpty(): Derived {
->createEmpty : typeof createEmpty
+>createEmpty : () => Derived
 >Derived : Derived
 
         var item = new Derived();
@@ -58,7 +58,7 @@ class ComponentCollection<T> {
 >T : T
 
     private static sortComponents(p: Foo) {
->sortComponents : typeof sortComponents
+>sortComponents : (p: Foo) => GenericType<string>
 >p : Foo
 >Foo : Foo
 
@@ -97,9 +97,9 @@ class Foo {
 >new BaseCollection<Derived>(Derived.createEmpty) : BaseCollection<Derived>
 >BaseCollection : typeof BaseCollection
 >Derived : Derived
->Derived.createEmpty : typeof createEmpty
+>Derived.createEmpty : () => Derived
 >Derived : typeof Derived
->createEmpty : typeof createEmpty
+>createEmpty : () => Derived
     }
 }
 
diff --git a/tests/baselines/reference/compoundVarDecl1.types b/tests/baselines/reference/compoundVarDecl1.types
index e9a04bff9b2..f0db41ef14d 100644
--- a/tests/baselines/reference/compoundVarDecl1.types
+++ b/tests/baselines/reference/compoundVarDecl1.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/compoundVarDecl1.ts ===
 module Foo { var a = 1, b = 1; a = b + 2; }
->Foo : typeof Foo
+>Foo : Foo
 >a : number
 >b : number
 >a = b + 2 : number
diff --git a/tests/baselines/reference/constructSignatureAssignabilityInInheritance2.types b/tests/baselines/reference/constructSignatureAssignabilityInInheritance2.types
index 7ab221024ca..2f659a45164 100644
--- a/tests/baselines/reference/constructSignatureAssignabilityInInheritance2.types
+++ b/tests/baselines/reference/constructSignatureAssignabilityInInheritance2.types
@@ -110,23 +110,23 @@ interface A { // T
     a12: new (x: Array<Base>, y: Array<Derived2>) => Array<Derived>;
 >a12 : new (x: Base[], y: Derived2[]) => Derived[]
 >x : Base[]
->Array : T[]
+>Array : Array<T>
 >Base : Base
 >y : Derived2[]
->Array : T[]
+>Array : Array<T>
 >Derived2 : Derived2
->Array : T[]
+>Array : 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[]
+>Array : Array<T>
 >Base : Base
 >y : Derived[]
->Array : T[]
+>Array : Array<T>
 >Derived : Derived
->Array : T[]
+>Array : Array<T>
 >Derived : Derived
 
     a14: new (x: { a: string; b: number }) => Object;
@@ -332,23 +332,23 @@ interface I extends A {
     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[]
+>Array : Array<T>
 >Base : Base
 >x : Base[]
->Array : T[]
+>Array : Array<T>
 >Base : Base
 >y : T
 >T : T
->Array : T[]
+>Array : 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[]
+>Array : Array<T>
 >Derived : Derived
 >x : Base[]
->Array : T[]
+>Array : Array<T>
 >Base : Base
 >y : T
 >T : T
diff --git a/tests/baselines/reference/constructSignatureAssignabilityInInheritance5.types b/tests/baselines/reference/constructSignatureAssignabilityInInheritance5.types
index dea9478b372..188336aa245 100644
--- a/tests/baselines/reference/constructSignatureAssignabilityInInheritance5.types
+++ b/tests/baselines/reference/constructSignatureAssignabilityInInheritance5.types
@@ -111,23 +111,23 @@ interface A { // T
     a12: new (x: Array<Base>, y: Array<Derived2>) => Array<Derived>;
 >a12 : new (x: Base[], y: Derived2[]) => Derived[]
 >x : Base[]
->Array : T[]
+>Array : Array<T>
 >Base : Base
 >y : Derived2[]
->Array : T[]
+>Array : Array<T>
 >Derived2 : Derived2
->Array : T[]
+>Array : 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[]
+>Array : Array<T>
 >Base : Base
 >y : Derived[]
->Array : T[]
+>Array : Array<T>
 >Derived : Derived
->Array : T[]
+>Array : Array<T>
 >Derived : Derived
 
     a14: new (x: { a: string; b: number }) => Object;
@@ -280,23 +280,23 @@ interface I extends B {
     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[]
+>Array : Array<T>
 >Base : Base
 >x : Base[]
->Array : T[]
+>Array : Array<T>
 >Base : Base
 >y : T
 >T : T
->Array : T[]
+>Array : 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[]
+>Array : Array<T>
 >Derived : Derived
 >x : Base[]
->Array : T[]
+>Array : Array<T>
 >Base : Base
 >y : T
 >T : T
diff --git a/tests/baselines/reference/constructorArgWithGenericCallSignature.types b/tests/baselines/reference/constructorArgWithGenericCallSignature.types
index acd7528976f..c4e31db89de 100644
--- a/tests/baselines/reference/constructorArgWithGenericCallSignature.types
+++ b/tests/baselines/reference/constructorArgWithGenericCallSignature.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/constructorArgWithGenericCallSignature.ts ===
 module Test {
->Test : typeof Test
+>Test : Test
 
     export interface MyFunc {
 >MyFunc : MyFunc
@@ -25,22 +25,22 @@ module Test {
 >MyFunc : MyFunc
 }
 var func: Test.MyFunc;
->func : MyFunc
+>func : Test.MyFunc
 >Test : Test
->MyFunc : MyFunc
+>MyFunc : Test.MyFunc
 
 Test.F(func); // OK
 >Test.F(func) : void
->Test.F : typeof F
+>Test.F : typeof Test.F
 >Test : typeof Test
->F : typeof F
->func : MyFunc
+>F : typeof Test.F
+>func : Test.MyFunc
 
 var test = new Test.MyClass(func); // Should be OK
->test : MyClass
->new Test.MyClass(func) : MyClass
->Test.MyClass : typeof MyClass
+>test : Test.MyClass
+>new Test.MyClass(func) : Test.MyClass
+>Test.MyClass : typeof Test.MyClass
 >Test : typeof Test
->MyClass : typeof MyClass
->func : MyFunc
+>MyClass : typeof Test.MyClass
+>func : Test.MyFunc
 
diff --git a/tests/baselines/reference/constructorHasPrototypeProperty.types b/tests/baselines/reference/constructorHasPrototypeProperty.types
index 24dedb254eb..c829ebe8835 100644
--- a/tests/baselines/reference/constructorHasPrototypeProperty.types
+++ b/tests/baselines/reference/constructorHasPrototypeProperty.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/classes/members/constructorFunctionTypes/constructorHasPrototypeProperty.ts ===
 module NonGeneric {
->NonGeneric : typeof NonGeneric
+>NonGeneric : NonGeneric
 
     class C {
 >C : C
@@ -41,7 +41,7 @@ module NonGeneric {
 }
 
 module Generic {
->Generic : typeof Generic
+>Generic : Generic
 
     class C<T,U> {
 >C : C<T, U>
diff --git a/tests/baselines/reference/contextualTypeAny.types b/tests/baselines/reference/contextualTypeAny.types
index 9ea4c5c2139..c95bfd70ecf 100644
--- a/tests/baselines/reference/contextualTypeAny.types
+++ b/tests/baselines/reference/contextualTypeAny.types
@@ -8,7 +8,7 @@ var obj: { [s: string]: number } = { p: "", q: x };
 >{ p: "", q: x } : { [x: string]: any; p: string; q: any; }
 >p : string
 >q : any
->x : x
+>x : any
 
 var arr: number[] = ["", x];
 >arr : number[]
diff --git a/tests/baselines/reference/contextualTyping.js b/tests/baselines/reference/contextualTyping.js
index 1cc39a795c8..86c35bb13c2 100644
--- a/tests/baselines/reference/contextualTyping.js
+++ b/tests/baselines/reference/contextualTyping.js
@@ -231,7 +231,7 @@ interface B extends A { }
 var x: B = { };
 
 //// [contextualTyping.js]
-// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map
+// CONTEXT: Class property declaration
 var C1T5 = (function () {
     function C1T5() {
         this.foo = function (i) {
@@ -240,12 +240,14 @@ var C1T5 = (function () {
     }
     return C1T5;
 })();
+// CONTEXT: Module property declaration
 var C2T5;
 (function (C2T5) {
     C2T5.foo = function (i) {
         return i;
     };
 })(C2T5 || (C2T5 = {}));
+// CONTEXT: Variable declaration
 var c3t1 = (function (s) {
     return s;
 });
@@ -284,6 +286,7 @@ var c3t13 = ({
 var c3t14 = ({
     a: []
 });
+// CONTEXT: Class property assignment
 var C4T5 = (function () {
     function C4T5() {
         this.foo = function (i, s) {
@@ -292,6 +295,7 @@ var C4T5 = (function () {
     }
     return C4T5;
 })();
+// CONTEXT: Module property assignment
 var C5T5;
 (function (C5T5) {
     C5T5.foo;
@@ -299,10 +303,12 @@ var C5T5;
         return s;
     };
 })(C5T5 || (C5T5 = {}));
+// CONTEXT: Variable assignment
 var c6t5;
 c6t5 = function (n) {
     return ({});
 };
+// CONTEXT: Array index assignment
 var c7t2;
 c7t2[0] = ({ n: 1 });
 var objc8 = ({});
@@ -344,17 +350,20 @@ objc8.t13 = ({
 objc8.t14 = ({
     a: []
 });
+// CONTEXT: Function call
 function c9t5(f) {
 }
 ;
 c9t5(function (n) {
     return ({});
 });
+// CONTEXT: Return statement
 var c10t5 = function () {
     return function (n) {
         return ({});
     };
 };
+// CONTEXT: Newing a class
 var C11t5 = (function () {
     function C11t5(f) {
     }
@@ -364,6 +373,7 @@ var C11t5 = (function () {
 var i = new C11t5(function (n) {
     return ({});
 });
+// CONTEXT: Type annotated expression
 var c12t1 = (function (s) {
     return s;
 });
@@ -423,4 +433,4 @@ Point.prototype = {
     }
 };
 var x = {};
-//# sourceMappingURL=contextualTyping.js.map
+//# sourceMappingURL=contextualTyping.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/contextualTyping.sourcemap.txt b/tests/baselines/reference/contextualTyping.sourcemap.txt
index 1befbbc01d4..9ee97ee0804 100644
--- a/tests/baselines/reference/contextualTyping.sourcemap.txt
+++ b/tests/baselines/reference/contextualTyping.sourcemap.txt
@@ -8,10 +8,10 @@ sources: contextualTyping.ts
 emittedFile:tests/cases/compiler/contextualTyping.js
 sourceFile:contextualTyping.ts
 -------------------------------------------------------------------
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1 >
+>>>// CONTEXT: Class property declaration
+1 >
 2 >
 3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >// DEFAULT INTERFACES
   >interface IFoo {
   >    n: number;
@@ -32,19 +32,21 @@ sourceFile:contextualTyping.ts
 2 >Emitted(1, 1) Source(13, 1) + SourceIndex(0)
 3 >Emitted(1, 39) Source(13, 39) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
+>>>var C1T5 = (function () {
+1 >^^^^
 2 >    ^^^^
-3 >        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->
+3 >        ^^^^^^^^^^^^^^->
+1 >
   >class 
 2 >    C1T5
-1->Emitted(2, 5) Source(14, 7) + SourceIndex(0)
+1 >Emitted(2, 5) Source(14, 7) + SourceIndex(0)
 2 >Emitted(2, 9) Source(14, 11) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
+>>>    function C1T5() {
+1->^^^^
 2 >    ^^^^^^^^^
 3 >             ^^^^
-4 >                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+4 >                 ^^^^^^^^^^^^^^^^^->
 1->
 2 >    class 
 3 >             C1T5
@@ -52,12 +54,12 @@ sourceFile:contextualTyping.ts
 2 >Emitted(3, 14) Source(14, 7) + SourceIndex(0) name (C1T5)
 3 >Emitted(3, 18) Source(14, 11) + SourceIndex(0) name (C1T5)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^^^^^
+>>>        this.foo = function (i) {
+1->^^^^^^^^
 2 >        ^^^^^^^^
 3 >                ^^^
 4 >                   ^^^^^^^^^^
 5 >                             ^
-6 >                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1-> {
   >    
 2 >        foo
@@ -70,59 +72,61 @@ sourceFile:contextualTyping.ts
 4 >Emitted(4, 30) Source(15, 54) + SourceIndex(0) name (C1T5.constructor)
 5 >Emitted(4, 31) Source(15, 55) + SourceIndex(0) name (C1T5.constructor)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^^^^^^^^^
+>>>            return i;
+1 >^^^^^^^^^^^^
 2 >            ^^^^^^
 3 >                  ^
 4 >                   ^
 5 >                    ^
-6 >                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->) {
+1 >) {
   >        
 2 >            return
 3 >                   
 4 >                   i
 5 >                    ;
-1->Emitted(5, 13) Source(16, 9) + SourceIndex(0)
+1 >Emitted(5, 13) Source(16, 9) + SourceIndex(0)
 2 >Emitted(5, 19) Source(16, 15) + SourceIndex(0)
 3 >Emitted(5, 20) Source(16, 16) + SourceIndex(0)
 4 >Emitted(5, 21) Source(16, 17) + SourceIndex(0)
 5 >Emitted(5, 22) Source(16, 18) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^^^^^
+>>>        };
+1 >^^^^^^^^
 2 >        ^
 3 >         ^
-4 >          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->
+1 >
   >    
 2 >        }
 3 >         
-1->Emitted(6, 9) Source(17, 5) + SourceIndex(0)
+1 >Emitted(6, 9) Source(17, 5) + SourceIndex(0)
 2 >Emitted(6, 10) Source(17, 6) + SourceIndex(0)
 3 >Emitted(6, 11) Source(17, 6) + SourceIndex(0) name (C1T5.constructor)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
+>>>    }
+1 >^^^^
 2 >    ^
-3 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->
+3 >     ^^^^^^^^^^^^->
+1 >
   >
 2 >    }
-1->Emitted(7, 5) Source(18, 1) + SourceIndex(0) name (C1T5.constructor)
+1 >Emitted(7, 5) Source(18, 1) + SourceIndex(0) name (C1T5.constructor)
 2 >Emitted(7, 6) Source(18, 2) + SourceIndex(0) name (C1T5.constructor)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
+>>>    return C1T5;
+1->^^^^
 2 >    ^^^^^^^^^^^
-3 >               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
 2 >    }
 1->Emitted(8, 5) Source(18, 1) + SourceIndex(0) name (C1T5)
 2 >Emitted(8, 16) Source(18, 2) + SourceIndex(0) name (C1T5)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
+>>>})();
+1 >
 2 >^
 3 > 
 4 > ^^^^
-5 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->
+5 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
 2 >}
 3 > 
 4 > class C1T5 {
@@ -130,15 +134,15 @@ sourceFile:contextualTyping.ts
   >         return i;
   >     }
   > }
-1->Emitted(9, 1) Source(18, 1) + SourceIndex(0) name (C1T5)
+1 >Emitted(9, 1) Source(18, 1) + SourceIndex(0) name (C1T5)
 2 >Emitted(9, 2) Source(18, 2) + SourceIndex(0) name (C1T5)
 3 >Emitted(9, 2) Source(14, 1) + SourceIndex(0)
 4 >Emitted(9, 6) Source(18, 2) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
+>>>// CONTEXT: Module property declaration
+1->
 2 >
 3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
   >// CONTEXT: Module property declaration
@@ -149,12 +153,13 @@ sourceFile:contextualTyping.ts
 2 >Emitted(10, 1) Source(20, 1) + SourceIndex(0)
 3 >Emitted(10, 40) Source(20, 40) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
+>>>var C2T5;
+1 >
 2 >^^^^
 3 >    ^^^^
 4 >        ^
-5 >         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->
+5 >         ^^^^^^^^^^->
+1 >
   >
 2 >module 
 3 >    C2T5
@@ -163,17 +168,18 @@ sourceFile:contextualTyping.ts
   >                return i;
   >            }
   >        }
-1->Emitted(11, 1) Source(21, 1) + SourceIndex(0)
+1 >Emitted(11, 1) Source(21, 1) + SourceIndex(0)
 2 >Emitted(11, 5) Source(21, 8) + SourceIndex(0)
 3 >Emitted(11, 9) Source(21, 12) + SourceIndex(0)
 4 >Emitted(11, 10) Source(25, 2) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
+>>>(function (C2T5) {
+1->
 2 >^^^^^^^^^^^
 3 >           ^^^^
 4 >               ^^
 5 >                 ^
-6 >                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+6 >                  ^^^^^^^^^^^^->
 1->
 2 >module 
 3 >           C2T5
@@ -185,12 +191,12 @@ sourceFile:contextualTyping.ts
 4 >Emitted(12, 18) Source(21, 13) + SourceIndex(0)
 5 >Emitted(12, 19) Source(21, 14) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
+>>>    C2T5.foo = function (i) {
+1->^^^^
 2 >    ^^^^^^^^
 3 >            ^^^
 4 >               ^^^^^^^^^^
 5 >                         ^
-6 >                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >    export var 
 2 >    foo
@@ -203,44 +209,46 @@ sourceFile:contextualTyping.ts
 4 >Emitted(13, 26) Source(22, 65) + SourceIndex(0) name (C2T5)
 5 >Emitted(13, 27) Source(22, 66) + SourceIndex(0) name (C2T5)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^^^^^
+>>>        return i;
+1 >^^^^^^^^
 2 >        ^^^^^^
 3 >              ^
 4 >               ^
 5 >                ^
-6 >                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->) {
+1 >) {
   >        
 2 >        return
 3 >               
 4 >               i
 5 >                ;
-1->Emitted(14, 9) Source(23, 9) + SourceIndex(0)
+1 >Emitted(14, 9) Source(23, 9) + SourceIndex(0)
 2 >Emitted(14, 15) Source(23, 15) + SourceIndex(0)
 3 >Emitted(14, 16) Source(23, 16) + SourceIndex(0)
 4 >Emitted(14, 17) Source(23, 17) + SourceIndex(0)
 5 >Emitted(14, 18) Source(23, 18) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
+>>>    };
+1 >^^^^
 2 >    ^
 3 >     ^
-4 >      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->
+4 >      ^^^^^^^^^^^^^^^^^^^->
+1 >
   >    
 2 >    }
 3 >     
-1->Emitted(15, 5) Source(24, 5) + SourceIndex(0)
+1 >Emitted(15, 5) Source(24, 5) + SourceIndex(0)
 2 >Emitted(15, 6) Source(24, 6) + SourceIndex(0)
 3 >Emitted(15, 7) Source(24, 6) + SourceIndex(0) name (C2T5)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
+>>>})(C2T5 || (C2T5 = {}));
+1->
 2 >^
 3 > ^^
 4 >   ^^^^
 5 >       ^^^^^
 6 >            ^^^^
 7 >                ^^^^^^^^
-8 >                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+8 >                        ^^^^^^^^^->
 1->
   >
 2 >}
@@ -261,10 +269,10 @@ sourceFile:contextualTyping.ts
 6 >Emitted(16, 17) Source(21, 12) + SourceIndex(0)
 7 >Emitted(16, 25) Source(25, 2) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
+>>>// CONTEXT: Variable declaration
+1->
 2 >
 3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
   >// CONTEXT: Variable declaration
@@ -275,64 +283,65 @@ sourceFile:contextualTyping.ts
 2 >Emitted(17, 1) Source(27, 1) + SourceIndex(0)
 3 >Emitted(17, 33) Source(27, 33) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
+>>>var c3t1 = (function (s) {
+1 >^^^^
 2 >    ^^^^
 3 >        ^^^
 4 >           ^
 5 >            ^^^^^^^^^^
 6 >                      ^
-7 >                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->
+1 >
   >var 
 2 >    c3t1
 3 >        : (s: string) => string = 
 4 >           (
 5 >            function(
 6 >                      s
-1->Emitted(18, 5) Source(28, 5) + SourceIndex(0)
+1 >Emitted(18, 5) Source(28, 5) + SourceIndex(0)
 2 >Emitted(18, 9) Source(28, 9) + SourceIndex(0)
 3 >Emitted(18, 12) Source(28, 35) + SourceIndex(0)
 4 >Emitted(18, 13) Source(28, 36) + SourceIndex(0)
 5 >Emitted(18, 23) Source(28, 45) + SourceIndex(0)
 6 >Emitted(18, 24) Source(28, 46) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
+>>>    return s;
+1 >^^^^
 2 >    ^^^^^^
 3 >          ^
 4 >           ^
 5 >            ^
-6 >             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->) { 
+1 >) { 
 2 >    return
 3 >           
 4 >           s
 5 >            
-1->Emitted(19, 5) Source(28, 50) + SourceIndex(0)
+1 >Emitted(19, 5) Source(28, 50) + SourceIndex(0)
 2 >Emitted(19, 11) Source(28, 56) + SourceIndex(0)
 3 >Emitted(19, 12) Source(28, 57) + SourceIndex(0)
 4 >Emitted(19, 13) Source(28, 58) + SourceIndex(0)
 5 >Emitted(19, 14) Source(28, 58) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
+>>>});
+1 >
 2 >^
 3 > ^
 4 >  ^
-5 >   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1-> 
+5 >   ^^^^^^^^^^^->
+1 > 
 2 >}
 3 > )
 4 >  ;
-1->Emitted(20, 1) Source(28, 59) + SourceIndex(0)
+1 >Emitted(20, 1) Source(28, 59) + SourceIndex(0)
 2 >Emitted(20, 2) Source(28, 60) + SourceIndex(0)
 3 >Emitted(20, 3) Source(28, 61) + SourceIndex(0)
 4 >Emitted(20, 4) Source(28, 62) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
+>>>var c3t2 = ({
+1->
 2 >^^^^
 3 >    ^^^^
 4 >        ^^^
 5 >           ^
-6 >            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >var 
@@ -345,40 +354,42 @@ sourceFile:contextualTyping.ts
 4 >Emitted(21, 12) Source(29, 18) + SourceIndex(0)
 5 >Emitted(21, 13) Source(29, 19) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
+>>>    n: 1
+1 >^^^^
 2 >    ^
 3 >     ^^
 4 >       ^
-5 >        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->{
+1 >{
   >    
 2 >    n
 3 >     : 
 4 >       1
-1->Emitted(22, 5) Source(30, 5) + SourceIndex(0)
+1 >Emitted(22, 5) Source(30, 5) + SourceIndex(0)
 2 >Emitted(22, 6) Source(30, 6) + SourceIndex(0)
 3 >Emitted(22, 8) Source(30, 8) + SourceIndex(0)
 4 >Emitted(22, 9) Source(30, 9) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^
+>>>});
+1 >^
 2 > ^
 3 >  ^
-4 >   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->
+4 >   ^^^^^^^^^^^^->
+1 >
   >}
 2 > )
 3 >  
-1->Emitted(23, 2) Source(31, 2) + SourceIndex(0)
+1 >Emitted(23, 2) Source(31, 2) + SourceIndex(0)
 2 >Emitted(23, 3) Source(31, 3) + SourceIndex(0)
 3 >Emitted(23, 4) Source(31, 3) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
+>>>var c3t3 = [];
+1->
 2 >^^^^
 3 >    ^^^^
 4 >        ^^^
 5 >           ^^
 6 >             ^
-7 >              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+7 >              ^^^^^^^^^^^->
 1->
   >
 2 >var 
@@ -393,11 +404,12 @@ sourceFile:contextualTyping.ts
 5 >Emitted(24, 14) Source(32, 24) + SourceIndex(0)
 6 >Emitted(24, 15) Source(32, 25) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
+>>>var c3t4 = function () {
+1->
 2 >^^^^
 3 >    ^^^^
 4 >        ^^^
-5 >           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+5 >           ^^^^^^->
 1->
   >
 2 >var 
@@ -408,14 +420,14 @@ sourceFile:contextualTyping.ts
 3 >Emitted(25, 9) Source(33, 9) + SourceIndex(0)
 4 >Emitted(25, 12) Source(33, 24) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
+>>>    return ({});
+1->^^^^
 2 >    ^^^^^^
 3 >          ^
 4 >           ^
 5 >            ^^
 6 >              ^
 7 >               ^
-8 >                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->function() { 
 2 >    return
 3 >           <IFoo>
@@ -431,24 +443,25 @@ sourceFile:contextualTyping.ts
 6 >Emitted(26, 16) Source(33, 54) + SourceIndex(0)
 7 >Emitted(26, 17) Source(33, 54) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
+>>>};
+1 >
 2 >^
 3 > ^
-4 >  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1-> 
+4 >  ^^^^^^^^^^^^^^^^^^^^^^^^->
+1 > 
 2 >}
 3 > ;
-1->Emitted(27, 1) Source(33, 55) + SourceIndex(0)
+1 >Emitted(27, 1) Source(33, 55) + SourceIndex(0)
 2 >Emitted(27, 2) Source(33, 56) + SourceIndex(0)
 3 >Emitted(27, 3) Source(33, 57) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
+>>>var c3t5 = function (n) {
+1->
 2 >^^^^
 3 >    ^^^^
 4 >        ^^^
 5 >           ^^^^^^^^^^
 6 >                     ^
-7 >                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >var 
@@ -463,22 +476,22 @@ sourceFile:contextualTyping.ts
 5 >Emitted(28, 22) Source(34, 42) + SourceIndex(0)
 6 >Emitted(28, 23) Source(34, 43) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
+>>>    return ({});
+1 >^^^^
 2 >    ^^^^^^
 3 >          ^
 4 >           ^
 5 >            ^^
 6 >              ^
 7 >               ^
-8 >                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->) { 
+1 >) { 
 2 >    return
 3 >           <IFoo>
 4 >           (
 5 >            {}
 6 >              )
 7 >               
-1->Emitted(29, 5) Source(34, 47) + SourceIndex(0)
+1 >Emitted(29, 5) Source(34, 47) + SourceIndex(0)
 2 >Emitted(29, 11) Source(34, 53) + SourceIndex(0)
 3 >Emitted(29, 12) Source(34, 60) + SourceIndex(0)
 4 >Emitted(29, 13) Source(34, 61) + SourceIndex(0)
@@ -486,18 +499,20 @@ sourceFile:contextualTyping.ts
 6 >Emitted(29, 16) Source(34, 64) + SourceIndex(0)
 7 >Emitted(29, 17) Source(34, 64) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
+>>>};
+1 >
 2 >^
 3 > ^
-4 >  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1-> 
+4 >  ^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 > 
 2 >}
 3 > ;
-1->Emitted(30, 1) Source(34, 65) + SourceIndex(0)
+1 >Emitted(30, 1) Source(34, 65) + SourceIndex(0)
 2 >Emitted(30, 2) Source(34, 66) + SourceIndex(0)
 3 >Emitted(30, 3) Source(34, 67) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
+>>>var c3t6 = function (n, s) {
+1->
 2 >^^^^
 3 >    ^^^^
 4 >        ^^^
@@ -505,7 +520,6 @@ sourceFile:contextualTyping.ts
 6 >                     ^
 7 >                      ^^
 8 >                        ^
-9 >                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >var 
@@ -524,22 +538,22 @@ sourceFile:contextualTyping.ts
 7 >Emitted(31, 25) Source(35, 56) + SourceIndex(0)
 8 >Emitted(31, 26) Source(35, 57) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
+>>>    return ({});
+1 >^^^^
 2 >    ^^^^^^
 3 >          ^
 4 >           ^
 5 >            ^^
 6 >              ^
 7 >               ^
-8 >                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->) { 
+1 >) { 
 2 >    return
 3 >           <IFoo>
 4 >           (
 5 >            {}
 6 >              )
 7 >               
-1->Emitted(32, 5) Source(35, 61) + SourceIndex(0)
+1 >Emitted(32, 5) Source(35, 61) + SourceIndex(0)
 2 >Emitted(32, 11) Source(35, 67) + SourceIndex(0)
 3 >Emitted(32, 12) Source(35, 74) + SourceIndex(0)
 4 >Emitted(32, 13) Source(35, 75) + SourceIndex(0)
@@ -547,24 +561,25 @@ sourceFile:contextualTyping.ts
 6 >Emitted(32, 16) Source(35, 78) + SourceIndex(0)
 7 >Emitted(32, 17) Source(35, 78) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
+>>>};
+1 >
 2 >^
 3 > ^
-4 >  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1-> 
+4 >  ^^^^^^^^^^^^^^^^^^^^^^^^->
+1 > 
 2 >}
 3 > ;
-1->Emitted(33, 1) Source(35, 79) + SourceIndex(0)
+1 >Emitted(33, 1) Source(35, 79) + SourceIndex(0)
 2 >Emitted(33, 2) Source(35, 80) + SourceIndex(0)
 3 >Emitted(33, 3) Source(35, 81) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
+>>>var c3t7 = function (n) {
+1->
 2 >^^^^
 3 >    ^^^^
 4 >        ^^^
 5 >           ^^^^^^^^^^
 6 >                     ^
-7 >                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >var 
@@ -582,41 +597,42 @@ sourceFile:contextualTyping.ts
 5 >Emitted(34, 22) Source(39, 14) + SourceIndex(0)
 6 >Emitted(34, 23) Source(39, 15) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
+>>>    return n;
+1 >^^^^
 2 >    ^^^^^^
 3 >          ^
 4 >           ^
 5 >            ^
-6 >             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->) { 
+1 >) { 
 2 >    return
 3 >           
 4 >           n
 5 >            ;
-1->Emitted(35, 5) Source(39, 19) + SourceIndex(0)
+1 >Emitted(35, 5) Source(39, 19) + SourceIndex(0)
 2 >Emitted(35, 11) Source(39, 25) + SourceIndex(0)
 3 >Emitted(35, 12) Source(39, 26) + SourceIndex(0)
 4 >Emitted(35, 13) Source(39, 27) + SourceIndex(0)
 5 >Emitted(35, 14) Source(39, 28) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
+>>>};
+1 >
 2 >^
 3 > ^
-4 >  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1-> 
+4 >  ^^^^^^^^^^^^^^^^^^^^^^^^->
+1 > 
 2 >}
 3 > ;
-1->Emitted(36, 1) Source(39, 29) + SourceIndex(0)
+1 >Emitted(36, 1) Source(39, 29) + SourceIndex(0)
 2 >Emitted(36, 2) Source(39, 30) + SourceIndex(0)
 3 >Emitted(36, 3) Source(39, 31) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
+>>>var c3t8 = function (n) {
+1->
 2 >^^^^
 3 >    ^^^^
 4 >        ^^^
 5 >           ^^^^^^^^^^
 6 >                     ^
-7 >                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
   >
@@ -632,35 +648,37 @@ sourceFile:contextualTyping.ts
 5 >Emitted(37, 22) Source(41, 55) + SourceIndex(0)
 6 >Emitted(37, 23) Source(41, 56) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
+>>>    return n;
+1 >^^^^
 2 >    ^^^^^^
 3 >          ^
 4 >           ^
 5 >            ^
-6 >             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->) { 
+1 >) { 
 2 >    return
 3 >           
 4 >           n
 5 >            ;
-1->Emitted(38, 5) Source(41, 60) + SourceIndex(0)
+1 >Emitted(38, 5) Source(41, 60) + SourceIndex(0)
 2 >Emitted(38, 11) Source(41, 66) + SourceIndex(0)
 3 >Emitted(38, 12) Source(41, 67) + SourceIndex(0)
 4 >Emitted(38, 13) Source(41, 68) + SourceIndex(0)
 5 >Emitted(38, 14) Source(41, 69) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
+>>>};
+1 >
 2 >^
 3 > ^
-4 >  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1-> 
+4 >  ^^^^^^^^^^^^^^^^^^^->
+1 > 
 2 >}
 3 > ;
-1->Emitted(39, 1) Source(41, 70) + SourceIndex(0)
+1 >Emitted(39, 1) Source(41, 70) + SourceIndex(0)
 2 >Emitted(39, 2) Source(41, 71) + SourceIndex(0)
 3 >Emitted(39, 3) Source(41, 72) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
+>>>var c3t9 = [[], []];
+1->
 2 >^^^^
 3 >    ^^^^
 4 >        ^^^
@@ -670,7 +688,7 @@ sourceFile:contextualTyping.ts
 8 >                ^^
 9 >                  ^
 10>                   ^
-11>                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+11>                    ^^^^^^->
 1->
   >
 2 >var 
@@ -693,7 +711,8 @@ sourceFile:contextualTyping.ts
 9 >Emitted(40, 20) Source(42, 31) + SourceIndex(0)
 10>Emitted(40, 21) Source(42, 32) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
+>>>var c3t10 = [({}), ({})];
+1->
 2 >^^^^
 3 >    ^^^^^
 4 >         ^^^
@@ -707,7 +726,7 @@ sourceFile:contextualTyping.ts
 12>                      ^
 13>                       ^
 14>                        ^
-15>                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+15>                         ^^^^^^->
 1->
   >
 2 >var 
@@ -738,7 +757,8 @@ sourceFile:contextualTyping.ts
 13>Emitted(41, 25) Source(43, 44) + SourceIndex(0)
 14>Emitted(41, 26) Source(43, 45) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
+>>>var c3t11 = [function (n, s) {
+1->
 2 >^^^^
 3 >    ^^^^^
 4 >         ^^^
@@ -747,7 +767,6 @@ sourceFile:contextualTyping.ts
 7 >                       ^
 8 >                        ^^
 9 >                          ^
-10>                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >var 
@@ -768,42 +787,44 @@ sourceFile:contextualTyping.ts
 8 >Emitted(42, 27) Source(44, 63) + SourceIndex(0)
 9 >Emitted(42, 28) Source(44, 64) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
+>>>    return s;
+1 >^^^^
 2 >    ^^^^^^
 3 >          ^
 4 >           ^
 5 >            ^
-6 >             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->) { 
+1 >) { 
 2 >    return
 3 >           
 4 >           s
 5 >            ;
-1->Emitted(43, 5) Source(44, 68) + SourceIndex(0)
+1 >Emitted(43, 5) Source(44, 68) + SourceIndex(0)
 2 >Emitted(43, 11) Source(44, 74) + SourceIndex(0)
 3 >Emitted(43, 12) Source(44, 75) + SourceIndex(0)
 4 >Emitted(43, 13) Source(44, 76) + SourceIndex(0)
 5 >Emitted(43, 14) Source(44, 77) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
+>>>}];
+1 >
 2 >^
 3 > ^
 4 >  ^
-5 >   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1-> 
+5 >   ^^^^^^^^^^^->
+1 > 
 2 >}
 3 > ]
 4 >  ;
-1->Emitted(44, 1) Source(44, 78) + SourceIndex(0)
+1 >Emitted(44, 1) Source(44, 78) + SourceIndex(0)
 2 >Emitted(44, 2) Source(44, 79) + SourceIndex(0)
 3 >Emitted(44, 3) Source(44, 80) + SourceIndex(0)
 4 >Emitted(44, 4) Source(44, 81) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
+>>>var c3t12 = {
+1->
 2 >^^^^
 3 >    ^^^^^
 4 >         ^^^
-5 >            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+5 >            ^^->
 1->
   >
 2 >var 
@@ -814,13 +835,13 @@ sourceFile:contextualTyping.ts
 3 >Emitted(45, 10) Source(45, 10) + SourceIndex(0)
 4 >Emitted(45, 13) Source(45, 19) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
+>>>    foo: ({})
+1->^^^^
 2 >    ^^^
 3 >       ^^
 4 >         ^
 5 >          ^^
 6 >            ^
-7 >             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->{
   >    
 2 >    foo
@@ -835,21 +856,23 @@ sourceFile:contextualTyping.ts
 5 >Emitted(46, 13) Source(46, 19) + SourceIndex(0)
 6 >Emitted(46, 14) Source(46, 20) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^
+>>>};
+1 >^
 2 > ^
-3 >  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->
+3 >  ^^^^^^^^^^^^^->
+1 >
   >}
 2 > 
-1->Emitted(47, 2) Source(47, 2) + SourceIndex(0)
+1 >Emitted(47, 2) Source(47, 2) + SourceIndex(0)
 2 >Emitted(47, 3) Source(47, 2) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
+>>>var c3t13 = ({
+1->
 2 >^^^^
 3 >    ^^^^^
 4 >         ^^^
 5 >            ^
-6 >             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+6 >             ^^^^^^^^^^^^->
 1->
   >
 2 >var 
@@ -862,14 +885,14 @@ sourceFile:contextualTyping.ts
 4 >Emitted(48, 13) Source(48, 19) + SourceIndex(0)
 5 >Emitted(48, 14) Source(48, 20) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
+>>>    f: function (i, s) {
+1->^^^^
 2 >    ^
 3 >     ^^
 4 >       ^^^^^^^^^^
 5 >                 ^
 6 >                  ^^
 7 >                    ^
-8 >                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->{
   >    
 2 >    f
@@ -886,49 +909,50 @@ sourceFile:contextualTyping.ts
 6 >Emitted(49, 21) Source(49, 20) + SourceIndex(0)
 7 >Emitted(49, 22) Source(49, 21) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^^^^^
+>>>        return s;
+1 >^^^^^^^^
 2 >        ^^^^^^
 3 >              ^
 4 >               ^
 5 >                ^
-6 >                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->) { 
+1 >) { 
 2 >        return
 3 >               
 4 >               s
 5 >                ;
-1->Emitted(50, 9) Source(49, 25) + SourceIndex(0)
+1 >Emitted(50, 9) Source(49, 25) + SourceIndex(0)
 2 >Emitted(50, 15) Source(49, 31) + SourceIndex(0)
 3 >Emitted(50, 16) Source(49, 32) + SourceIndex(0)
 4 >Emitted(50, 17) Source(49, 33) + SourceIndex(0)
 5 >Emitted(50, 18) Source(49, 34) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
+>>>    }
+1 >^^^^
 2 >    ^
-3 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1-> 
+1 > 
 2 >    }
-1->Emitted(51, 5) Source(49, 35) + SourceIndex(0)
+1 >Emitted(51, 5) Source(49, 35) + SourceIndex(0)
 2 >Emitted(51, 6) Source(49, 36) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^
+>>>});
+1 >^
 2 > ^
 3 >  ^
-4 >   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->
+4 >   ^^^^^^^^^^^^->
+1 >
   >}
 2 > )
 3 >  
-1->Emitted(52, 2) Source(50, 2) + SourceIndex(0)
+1 >Emitted(52, 2) Source(50, 2) + SourceIndex(0)
 2 >Emitted(52, 3) Source(50, 3) + SourceIndex(0)
 3 >Emitted(52, 4) Source(50, 3) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
+>>>var c3t14 = ({
+1->
 2 >^^^^
 3 >    ^^^^^
 4 >         ^^^
 5 >            ^
-6 >             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >var 
@@ -941,37 +965,38 @@ sourceFile:contextualTyping.ts
 4 >Emitted(53, 13) Source(51, 19) + SourceIndex(0)
 5 >Emitted(53, 14) Source(51, 20) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
+>>>    a: []
+1 >^^^^
 2 >    ^
 3 >     ^^
 4 >       ^^
-5 >         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->{
+1 >{
   >    
 2 >    a
 3 >     : 
 4 >       []
-1->Emitted(54, 5) Source(52, 5) + SourceIndex(0)
+1 >Emitted(54, 5) Source(52, 5) + SourceIndex(0)
 2 >Emitted(54, 6) Source(52, 6) + SourceIndex(0)
 3 >Emitted(54, 8) Source(52, 8) + SourceIndex(0)
 4 >Emitted(54, 10) Source(52, 10) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^
+>>>});
+1 >^
 2 > ^
 3 >  ^
-4 >   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->
+4 >   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
   >}
 2 > )
 3 >  
-1->Emitted(55, 2) Source(53, 2) + SourceIndex(0)
+1 >Emitted(55, 2) Source(53, 2) + SourceIndex(0)
 2 >Emitted(55, 3) Source(53, 3) + SourceIndex(0)
 3 >Emitted(55, 4) Source(53, 3) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
+>>>// CONTEXT: Class property assignment
+1->
 2 >
 3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
   >// CONTEXT: Class property assignment
@@ -982,19 +1007,21 @@ sourceFile:contextualTyping.ts
 2 >Emitted(56, 1) Source(55, 1) + SourceIndex(0)
 3 >Emitted(56, 38) Source(55, 38) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
+>>>var C4T5 = (function () {
+1 >^^^^
 2 >    ^^^^
-3 >        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->
+3 >        ^^^^^^^^^^^^^^->
+1 >
   >class 
 2 >    C4T5
-1->Emitted(57, 5) Source(56, 7) + SourceIndex(0)
+1 >Emitted(57, 5) Source(56, 7) + SourceIndex(0)
 2 >Emitted(57, 9) Source(56, 11) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
+>>>    function C4T5() {
+1->^^^^
 2 >    ^^^^^^^^^
 3 >             ^^^^
-4 >                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+4 >                 ^^^^^^^^^^^^^^^^^^^^->
 1-> {
   >    foo: (i: number, s: string) => string;
   >    
@@ -1004,7 +1031,8 @@ sourceFile:contextualTyping.ts
 2 >Emitted(58, 14) Source(56, 7) + SourceIndex(0) name (C4T5)
 3 >Emitted(58, 18) Source(56, 11) + SourceIndex(0) name (C4T5)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^^^^^
+>>>        this.foo = function (i, s) {
+1->^^^^^^^^
 2 >        ^^^^
 3 >            ^
 4 >             ^^^
@@ -1013,7 +1041,6 @@ sourceFile:contextualTyping.ts
 7 >                             ^
 8 >                              ^^
 9 >                                ^
-10>                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1-> {
   >    foo: (i: number, s: string) => string;
   >    constructor() {
@@ -1036,60 +1063,62 @@ sourceFile:contextualTyping.ts
 8 >Emitted(59, 33) Source(59, 32) + SourceIndex(0) name (C4T5.constructor)
 9 >Emitted(59, 34) Source(59, 33) + SourceIndex(0) name (C4T5.constructor)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^^^^^^^^^
+>>>            return s;
+1 >^^^^^^^^^^^^
 2 >            ^^^^^^
 3 >                  ^
 4 >                   ^
 5 >                    ^
-6 >                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->) {
+1 >) {
   >            
 2 >            return
 3 >                   
 4 >                   s
 5 >                    ;
-1->Emitted(60, 13) Source(60, 13) + SourceIndex(0)
+1 >Emitted(60, 13) Source(60, 13) + SourceIndex(0)
 2 >Emitted(60, 19) Source(60, 19) + SourceIndex(0)
 3 >Emitted(60, 20) Source(60, 20) + SourceIndex(0)
 4 >Emitted(60, 21) Source(60, 21) + SourceIndex(0)
 5 >Emitted(60, 22) Source(60, 22) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^^^^^
+>>>        };
+1 >^^^^^^^^
 2 >        ^
 3 >         ^
-4 >          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->
+1 >
   >        
 2 >        }
 3 >         
-1->Emitted(61, 9) Source(61, 9) + SourceIndex(0)
+1 >Emitted(61, 9) Source(61, 9) + SourceIndex(0)
 2 >Emitted(61, 10) Source(61, 10) + SourceIndex(0)
 3 >Emitted(61, 11) Source(61, 10) + SourceIndex(0) name (C4T5.constructor)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
+>>>    }
+1 >^^^^
 2 >    ^
-3 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->
+3 >     ^^^^^^^^^^^^->
+1 >
   >    
 2 >    }
-1->Emitted(62, 5) Source(62, 5) + SourceIndex(0) name (C4T5.constructor)
+1 >Emitted(62, 5) Source(62, 5) + SourceIndex(0) name (C4T5.constructor)
 2 >Emitted(62, 6) Source(62, 6) + SourceIndex(0) name (C4T5.constructor)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
+>>>    return C4T5;
+1->^^^^
 2 >    ^^^^^^^^^^^
-3 >               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >    }
 1->Emitted(63, 5) Source(63, 1) + SourceIndex(0) name (C4T5)
 2 >Emitted(63, 16) Source(63, 2) + SourceIndex(0) name (C4T5)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
+>>>})();
+1 >
 2 >^
 3 > 
 4 > ^^^^
-5 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->
+5 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
 2 >}
 3 > 
 4 > class C4T5 {
@@ -1100,15 +1129,15 @@ sourceFile:contextualTyping.ts
   >         }
   >     }
   > }
-1->Emitted(64, 1) Source(63, 1) + SourceIndex(0) name (C4T5)
+1 >Emitted(64, 1) Source(63, 1) + SourceIndex(0) name (C4T5)
 2 >Emitted(64, 2) Source(63, 2) + SourceIndex(0) name (C4T5)
 3 >Emitted(64, 2) Source(56, 1) + SourceIndex(0)
 4 >Emitted(64, 6) Source(63, 2) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
+>>>// CONTEXT: Module property assignment
+1->
 2 >
 3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
   >// CONTEXT: Module property assignment
@@ -1119,12 +1148,13 @@ sourceFile:contextualTyping.ts
 2 >Emitted(65, 1) Source(65, 1) + SourceIndex(0)
 3 >Emitted(65, 39) Source(65, 39) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
+>>>var C5T5;
+1 >
 2 >^^^^
 3 >    ^^^^
 4 >        ^
-5 >         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->
+5 >         ^^^^^^^^^^->
+1 >
   >
 2 >module 
 3 >    C5T5
@@ -1134,17 +1164,17 @@ sourceFile:contextualTyping.ts
   >                return s;
   >            }
   >        }
-1->Emitted(66, 1) Source(66, 1) + SourceIndex(0)
+1 >Emitted(66, 1) Source(66, 1) + SourceIndex(0)
 2 >Emitted(66, 5) Source(66, 8) + SourceIndex(0)
 3 >Emitted(66, 9) Source(66, 12) + SourceIndex(0)
 4 >Emitted(66, 10) Source(71, 2) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
+>>>(function (C5T5) {
+1->
 2 >^^^^^^^^^^^
 3 >           ^^^^
 4 >               ^^
 5 >                 ^
-6 >                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
 2 >module 
 3 >           C5T5
@@ -1156,26 +1186,27 @@ sourceFile:contextualTyping.ts
 4 >Emitted(67, 18) Source(66, 13) + SourceIndex(0)
 5 >Emitted(67, 19) Source(66, 14) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
+>>>    C5T5.foo;
+1 >^^^^
 2 >    ^^^^^^^^
 3 >            ^
-4 >             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->
+4 >             ^^^^^^^^^^^^^^^^^^^^->
+1 >
   >    export var 
 2 >    foo: (i: number, s: string) => string
 3 >            ;
-1->Emitted(68, 5) Source(67, 16) + SourceIndex(0) name (C5T5)
+1 >Emitted(68, 5) Source(67, 16) + SourceIndex(0) name (C5T5)
 2 >Emitted(68, 13) Source(67, 53) + SourceIndex(0) name (C5T5)
 3 >Emitted(68, 14) Source(67, 54) + SourceIndex(0) name (C5T5)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
+>>>    C5T5.foo = function (i, s) {
+1->^^^^
 2 >    ^^^^^^^^
 3 >            ^^^
 4 >               ^^^^^^^^^^
 5 >                         ^
 6 >                          ^^
 7 >                            ^
-8 >                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >    
 2 >    foo
@@ -1192,44 +1223,46 @@ sourceFile:contextualTyping.ts
 6 >Emitted(69, 29) Source(68, 23) + SourceIndex(0) name (C5T5)
 7 >Emitted(69, 30) Source(68, 24) + SourceIndex(0) name (C5T5)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^^^^^
+>>>        return s;
+1 >^^^^^^^^
 2 >        ^^^^^^
 3 >              ^
 4 >               ^
 5 >                ^
-6 >                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->) {
+1 >) {
   >        
 2 >        return
 3 >               
 4 >               s
 5 >                ;
-1->Emitted(70, 9) Source(69, 9) + SourceIndex(0)
+1 >Emitted(70, 9) Source(69, 9) + SourceIndex(0)
 2 >Emitted(70, 15) Source(69, 15) + SourceIndex(0)
 3 >Emitted(70, 16) Source(69, 16) + SourceIndex(0)
 4 >Emitted(70, 17) Source(69, 17) + SourceIndex(0)
 5 >Emitted(70, 18) Source(69, 18) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
+>>>    };
+1 >^^^^
 2 >    ^
 3 >     ^
-4 >      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->
+4 >      ^^^^^^^^^^^^^^^^^^^->
+1 >
   >    
 2 >    }
 3 >     
-1->Emitted(71, 5) Source(70, 5) + SourceIndex(0)
+1 >Emitted(71, 5) Source(70, 5) + SourceIndex(0)
 2 >Emitted(71, 6) Source(70, 6) + SourceIndex(0)
 3 >Emitted(71, 7) Source(70, 6) + SourceIndex(0) name (C5T5)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
+>>>})(C5T5 || (C5T5 = {}));
+1->
 2 >^
 3 > ^^
 4 >   ^^^^
 5 >       ^^^^^
 6 >            ^^^^
 7 >                ^^^^^^^^
-8 >                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+8 >                        ^^^^^^^^->
 1->
   >
 2 >}
@@ -1251,10 +1284,10 @@ sourceFile:contextualTyping.ts
 6 >Emitted(72, 17) Source(66, 12) + SourceIndex(0)
 7 >Emitted(72, 25) Source(71, 2) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
+>>>// CONTEXT: Variable assignment
+1->
 2 >
 3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
   >// CONTEXT: Variable assignment
@@ -1265,24 +1298,25 @@ sourceFile:contextualTyping.ts
 2 >Emitted(73, 1) Source(73, 1) + SourceIndex(0)
 3 >Emitted(73, 32) Source(73, 32) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
+>>>var c6t5;
+1 >^^^^
 2 >    ^^^^
 3 >        ^
-4 >         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->
+4 >         ^^^^^^^^^^^^^->
+1 >
   >var 
 2 >    c6t5: (n: number) => IFoo
 3 >        ;
-1->Emitted(74, 5) Source(74, 5) + SourceIndex(0)
+1 >Emitted(74, 5) Source(74, 5) + SourceIndex(0)
 2 >Emitted(74, 9) Source(74, 30) + SourceIndex(0)
 3 >Emitted(74, 10) Source(74, 31) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
+>>>c6t5 = function (n) {
+1->
 2 >^^^^
 3 >    ^^^
 4 >       ^^^^^^^^^^
 5 >                 ^
-6 >                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >c6t5
@@ -1295,22 +1329,22 @@ sourceFile:contextualTyping.ts
 4 >Emitted(75, 18) Source(75, 38) + SourceIndex(0)
 5 >Emitted(75, 19) Source(75, 39) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
+>>>    return ({});
+1 >^^^^
 2 >    ^^^^^^
 3 >          ^
 4 >           ^
 5 >            ^^
 6 >              ^
 7 >               ^
-8 >                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->) { 
+1 >) { 
 2 >    return
 3 >           <IFoo>
 4 >           (
 5 >            {}
 6 >              )
 7 >               
-1->Emitted(76, 5) Source(75, 43) + SourceIndex(0)
+1 >Emitted(76, 5) Source(75, 43) + SourceIndex(0)
 2 >Emitted(76, 11) Source(75, 49) + SourceIndex(0)
 3 >Emitted(76, 12) Source(75, 56) + SourceIndex(0)
 4 >Emitted(76, 13) Source(75, 57) + SourceIndex(0)
@@ -1318,21 +1352,22 @@ sourceFile:contextualTyping.ts
 6 >Emitted(76, 16) Source(75, 60) + SourceIndex(0)
 7 >Emitted(76, 17) Source(75, 60) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
+>>>};
+1 >
 2 >^
 3 > ^
-4 >  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1-> 
+4 >  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 > 
 2 >}
 3 > ;
-1->Emitted(77, 1) Source(75, 61) + SourceIndex(0)
+1 >Emitted(77, 1) Source(75, 61) + SourceIndex(0)
 2 >Emitted(77, 2) Source(75, 62) + SourceIndex(0)
 3 >Emitted(77, 3) Source(75, 63) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
+>>>// CONTEXT: Array index assignment
+1->
 2 >
 3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
   >// CONTEXT: Array index assignment
@@ -1343,19 +1378,21 @@ sourceFile:contextualTyping.ts
 2 >Emitted(78, 1) Source(77, 1) + SourceIndex(0)
 3 >Emitted(78, 35) Source(77, 35) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
+>>>var c7t2;
+1 >^^^^
 2 >    ^^^^
 3 >        ^
-4 >         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->
+4 >         ^^^^^^^^^^^^^->
+1 >
   >var 
 2 >    c7t2: IFoo[]
 3 >        ;
-1->Emitted(79, 5) Source(78, 5) + SourceIndex(0)
+1 >Emitted(79, 5) Source(78, 5) + SourceIndex(0)
 2 >Emitted(79, 9) Source(78, 17) + SourceIndex(0)
 3 >Emitted(79, 10) Source(78, 18) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
+>>>c7t2[0] = ({ n: 1 });
+1->
 2 >^^^^
 3 >    ^
 4 >     ^
@@ -1369,7 +1406,6 @@ sourceFile:contextualTyping.ts
 12>                 ^^
 13>                   ^
 14>                    ^
-15>                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >c7t2
@@ -1400,7 +1436,8 @@ sourceFile:contextualTyping.ts
 13>Emitted(80, 21) Source(79, 25) + SourceIndex(0)
 14>Emitted(80, 22) Source(79, 26) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
+>>>var objc8 = ({});
+1 >
 2 >^^^^
 3 >    ^^^^^
 4 >         ^^^
@@ -1408,8 +1445,8 @@ sourceFile:contextualTyping.ts
 6 >             ^^
 7 >               ^
 8 >                ^
-9 >                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->
+9 >                 ^^^^^^^^^^->
+1 >
   >
   >// CONTEXT: Object property assignment
   >interface IPlaceHolder {
@@ -1458,7 +1495,7 @@ sourceFile:contextualTyping.ts
 6 >             {}
 7 >               )
 8 >                ;
-1->Emitted(81, 1) Source(102, 1) + SourceIndex(0)
+1 >Emitted(81, 1) Source(102, 1) + SourceIndex(0)
 2 >Emitted(81, 5) Source(102, 5) + SourceIndex(0)
 3 >Emitted(81, 10) Source(102, 10) + SourceIndex(0)
 4 >Emitted(81, 13) Source(120, 19) + SourceIndex(0)
@@ -1467,7 +1504,8 @@ sourceFile:contextualTyping.ts
 7 >Emitted(81, 17) Source(120, 23) + SourceIndex(0)
 8 >Emitted(81, 18) Source(120, 24) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
+>>>objc8.t1 = (function (s) {
+1->
 2 >^^^^^
 3 >     ^
 4 >      ^^
@@ -1475,7 +1513,6 @@ sourceFile:contextualTyping.ts
 6 >           ^
 7 >            ^^^^^^^^^^
 8 >                      ^
-9 >                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
   >
@@ -1495,44 +1532,45 @@ sourceFile:contextualTyping.ts
 7 >Emitted(82, 23) Source(122, 22) + SourceIndex(0)
 8 >Emitted(82, 24) Source(122, 23) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
+>>>    return s;
+1 >^^^^
 2 >    ^^^^^^
 3 >          ^
 4 >           ^
 5 >            ^
-6 >             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->) { 
+1 >) { 
 2 >    return
 3 >           
 4 >           s
 5 >            
-1->Emitted(83, 5) Source(122, 27) + SourceIndex(0)
+1 >Emitted(83, 5) Source(122, 27) + SourceIndex(0)
 2 >Emitted(83, 11) Source(122, 33) + SourceIndex(0)
 3 >Emitted(83, 12) Source(122, 34) + SourceIndex(0)
 4 >Emitted(83, 13) Source(122, 35) + SourceIndex(0)
 5 >Emitted(83, 14) Source(122, 35) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
+>>>});
+1 >
 2 >^
 3 > ^
 4 >  ^
-5 >   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1-> 
+5 >   ^^^^^^^^^^^->
+1 > 
 2 >}
 3 > )
 4 >  ;
-1->Emitted(84, 1) Source(122, 36) + SourceIndex(0)
+1 >Emitted(84, 1) Source(122, 36) + SourceIndex(0)
 2 >Emitted(84, 2) Source(122, 37) + SourceIndex(0)
 3 >Emitted(84, 3) Source(122, 38) + SourceIndex(0)
 4 >Emitted(84, 4) Source(122, 39) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
+>>>objc8.t2 = ({
+1->
 2 >^^^^^
 3 >     ^
 4 >      ^^
 5 >        ^^^
 6 >           ^
-7 >            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >objc8
@@ -1547,41 +1585,43 @@ sourceFile:contextualTyping.ts
 5 >Emitted(85, 12) Source(123, 18) + SourceIndex(0)
 6 >Emitted(85, 13) Source(123, 19) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
+>>>    n: 1
+1 >^^^^
 2 >    ^
 3 >     ^^
 4 >       ^
-5 >        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->{
+1 >{
   >    
 2 >    n
 3 >     : 
 4 >       1
-1->Emitted(86, 5) Source(124, 5) + SourceIndex(0)
+1 >Emitted(86, 5) Source(124, 5) + SourceIndex(0)
 2 >Emitted(86, 6) Source(124, 6) + SourceIndex(0)
 3 >Emitted(86, 8) Source(124, 8) + SourceIndex(0)
 4 >Emitted(86, 9) Source(124, 9) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^
+>>>});
+1 >^
 2 > ^
 3 >  ^
-4 >   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->
+4 >   ^^^^^^^^^^^^->
+1 >
   >}
 2 > )
 3 >  ;
-1->Emitted(87, 2) Source(125, 2) + SourceIndex(0)
+1 >Emitted(87, 2) Source(125, 2) + SourceIndex(0)
 2 >Emitted(87, 3) Source(125, 3) + SourceIndex(0)
 3 >Emitted(87, 4) Source(125, 4) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
+>>>objc8.t3 = [];
+1->
 2 >^^^^^
 3 >     ^
 4 >      ^^
 5 >        ^^^
 6 >           ^^
 7 >             ^
-8 >              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+8 >              ^^^^^^^^^^^->
 1->
   >
 2 >objc8
@@ -1598,12 +1638,13 @@ sourceFile:contextualTyping.ts
 6 >Emitted(88, 14) Source(126, 14) + SourceIndex(0)
 7 >Emitted(88, 15) Source(126, 15) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
+>>>objc8.t4 = function () {
+1->
 2 >^^^^^
 3 >     ^
 4 >      ^^
 5 >        ^^^
-6 >           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+6 >           ^^^^^^->
 1->
   >
 2 >objc8
@@ -1616,14 +1657,14 @@ sourceFile:contextualTyping.ts
 4 >Emitted(89, 9) Source(127, 9) + SourceIndex(0)
 5 >Emitted(89, 12) Source(127, 12) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
+>>>    return ({});
+1->^^^^
 2 >    ^^^^^^
 3 >          ^
 4 >           ^
 5 >            ^^
 6 >              ^
 7 >               ^
-8 >                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->function() { 
 2 >    return
 3 >           <IFoo>
@@ -1639,25 +1680,26 @@ sourceFile:contextualTyping.ts
 6 >Emitted(90, 16) Source(127, 42) + SourceIndex(0)
 7 >Emitted(90, 17) Source(127, 42) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
+>>>};
+1 >
 2 >^
 3 > ^
-4 >  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1-> 
+4 >  ^^^^^^^^^^^^^^^^^^^^^^^^->
+1 > 
 2 >}
 3 > ;
-1->Emitted(91, 1) Source(127, 43) + SourceIndex(0)
+1 >Emitted(91, 1) Source(127, 43) + SourceIndex(0)
 2 >Emitted(91, 2) Source(127, 44) + SourceIndex(0)
 3 >Emitted(91, 3) Source(127, 45) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
+>>>objc8.t5 = function (n) {
+1->
 2 >^^^^^
 3 >     ^
 4 >      ^^
 5 >        ^^^
 6 >           ^^^^^^^^^^
 7 >                     ^
-8 >                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >objc8
@@ -1674,22 +1716,22 @@ sourceFile:contextualTyping.ts
 6 >Emitted(92, 22) Source(128, 21) + SourceIndex(0)
 7 >Emitted(92, 23) Source(128, 22) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
+>>>    return ({});
+1 >^^^^
 2 >    ^^^^^^
 3 >          ^
 4 >           ^
 5 >            ^^
 6 >              ^
 7 >               ^
-8 >                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->) { 
+1 >) { 
 2 >    return
 3 >           <IFoo>
 4 >           (
 5 >            {}
 6 >              )
 7 >               
-1->Emitted(93, 5) Source(128, 26) + SourceIndex(0)
+1 >Emitted(93, 5) Source(128, 26) + SourceIndex(0)
 2 >Emitted(93, 11) Source(128, 32) + SourceIndex(0)
 3 >Emitted(93, 12) Source(128, 39) + SourceIndex(0)
 4 >Emitted(93, 13) Source(128, 40) + SourceIndex(0)
@@ -1697,18 +1739,20 @@ sourceFile:contextualTyping.ts
 6 >Emitted(93, 16) Source(128, 43) + SourceIndex(0)
 7 >Emitted(93, 17) Source(128, 43) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
+>>>};
+1 >
 2 >^
 3 > ^
-4 >  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1-> 
+4 >  ^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 > 
 2 >}
 3 > ;
-1->Emitted(94, 1) Source(128, 44) + SourceIndex(0)
+1 >Emitted(94, 1) Source(128, 44) + SourceIndex(0)
 2 >Emitted(94, 2) Source(128, 45) + SourceIndex(0)
 3 >Emitted(94, 3) Source(128, 46) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
+>>>objc8.t6 = function (n, s) {
+1->
 2 >^^^^^
 3 >     ^
 4 >      ^^
@@ -1717,7 +1761,6 @@ sourceFile:contextualTyping.ts
 7 >                     ^
 8 >                      ^^
 9 >                        ^
-10>                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >objc8
@@ -1738,22 +1781,22 @@ sourceFile:contextualTyping.ts
 8 >Emitted(95, 25) Source(129, 24) + SourceIndex(0)
 9 >Emitted(95, 26) Source(129, 25) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
+>>>    return ({});
+1 >^^^^
 2 >    ^^^^^^
 3 >          ^
 4 >           ^
 5 >            ^^
 6 >              ^
 7 >               ^
-8 >                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->) { 
+1 >) { 
 2 >    return
 3 >           <IFoo>
 4 >           (
 5 >            {}
 6 >              )
 7 >               
-1->Emitted(96, 5) Source(129, 29) + SourceIndex(0)
+1 >Emitted(96, 5) Source(129, 29) + SourceIndex(0)
 2 >Emitted(96, 11) Source(129, 35) + SourceIndex(0)
 3 >Emitted(96, 12) Source(129, 42) + SourceIndex(0)
 4 >Emitted(96, 13) Source(129, 43) + SourceIndex(0)
@@ -1761,25 +1804,26 @@ sourceFile:contextualTyping.ts
 6 >Emitted(96, 16) Source(129, 46) + SourceIndex(0)
 7 >Emitted(96, 17) Source(129, 46) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
+>>>};
+1 >
 2 >^
 3 > ^
-4 >  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1-> 
+4 >  ^^^^^^^^^^^^^^^^^^^^^^^^->
+1 > 
 2 >}
 3 > ;
-1->Emitted(97, 1) Source(129, 47) + SourceIndex(0)
+1 >Emitted(97, 1) Source(129, 47) + SourceIndex(0)
 2 >Emitted(97, 2) Source(129, 48) + SourceIndex(0)
 3 >Emitted(97, 3) Source(129, 49) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
+>>>objc8.t7 = function (n) {
+1->
 2 >^^^^^
 3 >     ^
 4 >      ^^
 5 >        ^^^
 6 >           ^^^^^^^^^^
 7 >                     ^
-8 >                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >objc8
@@ -1796,42 +1840,43 @@ sourceFile:contextualTyping.ts
 6 >Emitted(98, 22) Source(130, 21) + SourceIndex(0)
 7 >Emitted(98, 23) Source(130, 30) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
+>>>    return n;
+1 >^^^^
 2 >    ^^^^^^
 3 >          ^
 4 >           ^
 5 >            ^
-6 >             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->) { 
+1 >) { 
 2 >    return
 3 >           
 4 >           n
 5 >            
-1->Emitted(99, 5) Source(130, 34) + SourceIndex(0)
+1 >Emitted(99, 5) Source(130, 34) + SourceIndex(0)
 2 >Emitted(99, 11) Source(130, 40) + SourceIndex(0)
 3 >Emitted(99, 12) Source(130, 41) + SourceIndex(0)
 4 >Emitted(99, 13) Source(130, 42) + SourceIndex(0)
 5 >Emitted(99, 14) Source(130, 42) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
+>>>};
+1 >
 2 >^
 3 > ^
-4 >  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1-> 
+4 >  ^^^^^^^^^^^^^^^^^^^^^^^^->
+1 > 
 2 >}
 3 > ;
-1->Emitted(100, 1) Source(130, 43) + SourceIndex(0)
+1 >Emitted(100, 1) Source(130, 43) + SourceIndex(0)
 2 >Emitted(100, 2) Source(130, 44) + SourceIndex(0)
 3 >Emitted(100, 3) Source(130, 45) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
+>>>objc8.t8 = function (n) {
+1->
 2 >^^^^^
 3 >     ^
 4 >      ^^
 5 >        ^^^
 6 >           ^^^^^^^^^^
 7 >                     ^
-8 >                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
   >
@@ -1849,35 +1894,37 @@ sourceFile:contextualTyping.ts
 6 >Emitted(101, 22) Source(132, 21) + SourceIndex(0)
 7 >Emitted(101, 23) Source(132, 22) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
+>>>    return n;
+1 >^^^^
 2 >    ^^^^^^
 3 >          ^
 4 >           ^
 5 >            ^
-6 >             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->) { 
+1 >) { 
 2 >    return
 3 >           
 4 >           n
 5 >            ;
-1->Emitted(102, 5) Source(132, 26) + SourceIndex(0)
+1 >Emitted(102, 5) Source(132, 26) + SourceIndex(0)
 2 >Emitted(102, 11) Source(132, 32) + SourceIndex(0)
 3 >Emitted(102, 12) Source(132, 33) + SourceIndex(0)
 4 >Emitted(102, 13) Source(132, 34) + SourceIndex(0)
 5 >Emitted(102, 14) Source(132, 35) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
+>>>};
+1 >
 2 >^
 3 > ^
-4 >  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1-> 
+4 >  ^^^^^^^^^^^^^^^^^^^->
+1 > 
 2 >}
 3 > ;
-1->Emitted(103, 1) Source(132, 36) + SourceIndex(0)
+1 >Emitted(103, 1) Source(132, 36) + SourceIndex(0)
 2 >Emitted(103, 2) Source(132, 37) + SourceIndex(0)
 3 >Emitted(103, 3) Source(132, 38) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
+>>>objc8.t9 = [[], []];
+1->
 2 >^^^^^
 3 >     ^
 4 >      ^^
@@ -1888,7 +1935,7 @@ sourceFile:contextualTyping.ts
 9 >                ^^
 10>                  ^
 11>                   ^
-12>                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+12>                    ^^^^^^->
 1->
   >
 2 >objc8
@@ -1913,7 +1960,8 @@ sourceFile:contextualTyping.ts
 10>Emitted(104, 20) Source(133, 19) + SourceIndex(0)
 11>Emitted(104, 21) Source(133, 20) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
+>>>objc8.t10 = [({}), ({})];
+1->
 2 >^^^^^
 3 >     ^
 4 >      ^^^
@@ -1928,7 +1976,7 @@ sourceFile:contextualTyping.ts
 13>                      ^
 14>                       ^
 15>                        ^
-16>                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+16>                         ^^^^^^->
 1->
   >
 2 >objc8
@@ -1961,7 +2009,8 @@ sourceFile:contextualTyping.ts
 14>Emitted(105, 25) Source(134, 36) + SourceIndex(0)
 15>Emitted(105, 26) Source(134, 37) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
+>>>objc8.t11 = [function (n, s) {
+1->
 2 >^^^^^
 3 >     ^
 4 >      ^^^
@@ -1971,7 +2020,6 @@ sourceFile:contextualTyping.ts
 8 >                       ^
 9 >                        ^^
 10>                          ^
-11>                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >objc8
@@ -1994,43 +2042,45 @@ sourceFile:contextualTyping.ts
 9 >Emitted(106, 27) Source(135, 26) + SourceIndex(0)
 10>Emitted(106, 28) Source(135, 27) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
+>>>    return s;
+1 >^^^^
 2 >    ^^^^^^
 3 >          ^
 4 >           ^
 5 >            ^
-6 >             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->) { 
+1 >) { 
 2 >    return
 3 >           
 4 >           s
 5 >            ;
-1->Emitted(107, 5) Source(135, 31) + SourceIndex(0)
+1 >Emitted(107, 5) Source(135, 31) + SourceIndex(0)
 2 >Emitted(107, 11) Source(135, 37) + SourceIndex(0)
 3 >Emitted(107, 12) Source(135, 38) + SourceIndex(0)
 4 >Emitted(107, 13) Source(135, 39) + SourceIndex(0)
 5 >Emitted(107, 14) Source(135, 40) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
+>>>}];
+1 >
 2 >^
 3 > ^
 4 >  ^
-5 >   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1-> 
+5 >   ^^^^^^^^^^^->
+1 > 
 2 >}
 3 > ]
 4 >  ;
-1->Emitted(108, 1) Source(135, 41) + SourceIndex(0)
+1 >Emitted(108, 1) Source(135, 41) + SourceIndex(0)
 2 >Emitted(108, 2) Source(135, 42) + SourceIndex(0)
 3 >Emitted(108, 3) Source(135, 43) + SourceIndex(0)
 4 >Emitted(108, 4) Source(135, 44) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
+>>>objc8.t12 = {
+1->
 2 >^^^^^
 3 >     ^
 4 >      ^^^
 5 >         ^^^
-6 >            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+6 >            ^^->
 1->
   >
 2 >objc8
@@ -2043,13 +2093,13 @@ sourceFile:contextualTyping.ts
 4 >Emitted(109, 10) Source(136, 10) + SourceIndex(0)
 5 >Emitted(109, 13) Source(136, 13) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
+>>>    foo: ({})
+1->^^^^
 2 >    ^^^
 3 >       ^^
 4 >         ^
 5 >          ^^
 6 >            ^
-7 >             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->{
   >    
 2 >    foo
@@ -2064,22 +2114,24 @@ sourceFile:contextualTyping.ts
 5 >Emitted(110, 13) Source(137, 19) + SourceIndex(0)
 6 >Emitted(110, 14) Source(137, 20) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^
+>>>};
+1 >^
 2 > ^
-3 >  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->
+3 >  ^^^^^^^^^^^^^->
+1 >
   >}
 2 > 
-1->Emitted(111, 2) Source(138, 2) + SourceIndex(0)
+1 >Emitted(111, 2) Source(138, 2) + SourceIndex(0)
 2 >Emitted(111, 3) Source(138, 2) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
+>>>objc8.t13 = ({
+1->
 2 >^^^^^
 3 >     ^
 4 >      ^^^
 5 >         ^^^
 6 >            ^
-7 >             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+7 >             ^^^^^^^^^^^^->
 1->
   >
 2 >objc8
@@ -2094,14 +2146,14 @@ sourceFile:contextualTyping.ts
 5 >Emitted(112, 13) Source(139, 19) + SourceIndex(0)
 6 >Emitted(112, 14) Source(139, 20) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
+>>>    f: function (i, s) {
+1->^^^^
 2 >    ^
 3 >     ^^
 4 >       ^^^^^^^^^^
 5 >                 ^
 6 >                  ^^
 7 >                    ^
-8 >                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->{
   >    
 2 >    f
@@ -2118,50 +2170,51 @@ sourceFile:contextualTyping.ts
 6 >Emitted(113, 21) Source(140, 20) + SourceIndex(0)
 7 >Emitted(113, 22) Source(140, 21) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^^^^^
+>>>        return s;
+1 >^^^^^^^^
 2 >        ^^^^^^
 3 >              ^
 4 >               ^
 5 >                ^
-6 >                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->) { 
+1 >) { 
 2 >        return
 3 >               
 4 >               s
 5 >                ;
-1->Emitted(114, 9) Source(140, 25) + SourceIndex(0)
+1 >Emitted(114, 9) Source(140, 25) + SourceIndex(0)
 2 >Emitted(114, 15) Source(140, 31) + SourceIndex(0)
 3 >Emitted(114, 16) Source(140, 32) + SourceIndex(0)
 4 >Emitted(114, 17) Source(140, 33) + SourceIndex(0)
 5 >Emitted(114, 18) Source(140, 34) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
+>>>    }
+1 >^^^^
 2 >    ^
-3 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1-> 
+1 > 
 2 >    }
-1->Emitted(115, 5) Source(140, 35) + SourceIndex(0)
+1 >Emitted(115, 5) Source(140, 35) + SourceIndex(0)
 2 >Emitted(115, 6) Source(140, 36) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^
+>>>});
+1 >^
 2 > ^
 3 >  ^
-4 >   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->
+4 >   ^^^^^^^^^^^^->
+1 >
   >}
 2 > )
 3 >  
-1->Emitted(116, 2) Source(141, 2) + SourceIndex(0)
+1 >Emitted(116, 2) Source(141, 2) + SourceIndex(0)
 2 >Emitted(116, 3) Source(141, 3) + SourceIndex(0)
 3 >Emitted(116, 4) Source(141, 3) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
+>>>objc8.t14 = ({
+1->
 2 >^^^^^
 3 >     ^
 4 >      ^^^
 5 >         ^^^
 6 >            ^
-7 >             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >objc8
@@ -2176,37 +2229,38 @@ sourceFile:contextualTyping.ts
 5 >Emitted(117, 13) Source(142, 19) + SourceIndex(0)
 6 >Emitted(117, 14) Source(142, 20) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
+>>>    a: []
+1 >^^^^
 2 >    ^
 3 >     ^^
 4 >       ^^
-5 >         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->{
+1 >{
   >    
 2 >    a
 3 >     : 
 4 >       []
-1->Emitted(118, 5) Source(143, 5) + SourceIndex(0)
+1 >Emitted(118, 5) Source(143, 5) + SourceIndex(0)
 2 >Emitted(118, 6) Source(143, 6) + SourceIndex(0)
 3 >Emitted(118, 8) Source(143, 8) + SourceIndex(0)
 4 >Emitted(118, 10) Source(143, 10) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^
+>>>});
+1 >^
 2 > ^
 3 >  ^
-4 >   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->
+4 >   ^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
   >}
 2 > )
 3 >  
-1->Emitted(119, 2) Source(144, 2) + SourceIndex(0)
+1 >Emitted(119, 2) Source(144, 2) + SourceIndex(0)
 2 >Emitted(119, 3) Source(144, 3) + SourceIndex(0)
 3 >Emitted(119, 4) Source(144, 3) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
+>>>// CONTEXT: Function call
+1->
 2 >
 3 >^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >// CONTEXT: Function call
   >
@@ -2216,43 +2270,46 @@ sourceFile:contextualTyping.ts
 2 >Emitted(120, 1) Source(145, 1) + SourceIndex(0)
 3 >Emitted(120, 26) Source(145, 26) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^^^^^^
+>>>function c9t5(f) {
+1 >^^^^^^^^^
 2 >         ^^^^
 3 >             ^
 4 >              ^
-5 >               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->
+1 >
   >function 
 2 >         c9t5
 3 >             (
 4 >              f: (n: number) => IFoo
-1->Emitted(121, 10) Source(146, 10) + SourceIndex(0)
+1 >Emitted(121, 10) Source(146, 10) + SourceIndex(0)
 2 >Emitted(121, 14) Source(146, 14) + SourceIndex(0)
 3 >Emitted(121, 15) Source(146, 15) + SourceIndex(0)
 4 >Emitted(121, 16) Source(146, 37) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
+>>>}
+1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->) {
+3 > ^->
+1 >) {
 2 >}
-1->Emitted(122, 1) Source(146, 40) + SourceIndex(0) name (c9t5)
+1 >Emitted(122, 1) Source(146, 40) + SourceIndex(0) name (c9t5)
 2 >Emitted(122, 2) Source(146, 41) + SourceIndex(0) name (c9t5)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
+>>>;
+1->
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^->
 1->
 2 >;
 1->Emitted(123, 1) Source(146, 41) + SourceIndex(0)
 2 >Emitted(123, 2) Source(146, 42) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
+>>>c9t5(function (n) {
+1->
 2 >^^^^
 3 >    ^
 4 >     ^^^^^^^^^^
 5 >               ^
-6 >                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+6 >                ^->
 1->
   >
 2 >c9t5
@@ -2265,14 +2322,14 @@ sourceFile:contextualTyping.ts
 4 >Emitted(124, 16) Source(147, 15) + SourceIndex(0)
 5 >Emitted(124, 17) Source(147, 16) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
+>>>    return ({});
+1->^^^^
 2 >    ^^^^^^
 3 >          ^
 4 >           ^
 5 >            ^^
 6 >              ^
 7 >               ^
-8 >                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->) {
   >    
 2 >    return
@@ -2289,25 +2346,26 @@ sourceFile:contextualTyping.ts
 6 >Emitted(125, 16) Source(148, 22) + SourceIndex(0)
 7 >Emitted(125, 17) Source(148, 23) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
+>>>});
+1 >
 2 >^
 3 > ^
 4 >  ^
-5 >   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->
+5 >   ^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
   >
 2 >}
 3 > )
 4 >  ;
-1->Emitted(126, 1) Source(149, 1) + SourceIndex(0)
+1 >Emitted(126, 1) Source(149, 1) + SourceIndex(0)
 2 >Emitted(126, 2) Source(149, 2) + SourceIndex(0)
 3 >Emitted(126, 3) Source(149, 3) + SourceIndex(0)
 4 >Emitted(126, 4) Source(149, 4) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
+>>>// CONTEXT: Return statement
+1->
 2 >
 3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
   >// CONTEXT: Return statement
@@ -2318,24 +2376,25 @@ sourceFile:contextualTyping.ts
 2 >Emitted(127, 1) Source(151, 1) + SourceIndex(0)
 3 >Emitted(127, 29) Source(151, 29) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
+>>>var c10t5 = function () {
+1 >^^^^
 2 >    ^^^^^
 3 >         ^^^
-4 >            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->
+4 >            ^^^^^^^^^^^^^^->
+1 >
   >var 
 2 >    c10t5
 3 >         : () => (n: number) => IFoo = 
-1->Emitted(128, 5) Source(152, 5) + SourceIndex(0)
+1 >Emitted(128, 5) Source(152, 5) + SourceIndex(0)
 2 >Emitted(128, 10) Source(152, 10) + SourceIndex(0)
 3 >Emitted(128, 13) Source(152, 40) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
+>>>    return function (n) {
+1->^^^^
 2 >    ^^^^^^
 3 >          ^
 4 >           ^^^^^^^^^^
 5 >                     ^
-6 >                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->function() { 
 2 >    return
 3 >           
@@ -2347,22 +2406,22 @@ sourceFile:contextualTyping.ts
 4 >Emitted(129, 22) Source(152, 69) + SourceIndex(0)
 5 >Emitted(129, 23) Source(152, 70) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^^^^^
+>>>        return ({});
+1 >^^^^^^^^
 2 >        ^^^^^^
 3 >              ^
 4 >               ^
 5 >                ^^
 6 >                  ^
 7 >                   ^
-8 >                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->) { 
+1 >) { 
 2 >        return
 3 >               <IFoo>
 4 >               (
 5 >                {}
 6 >                  )
 7 >                   
-1->Emitted(130, 9) Source(152, 74) + SourceIndex(0)
+1 >Emitted(130, 9) Source(152, 74) + SourceIndex(0)
 2 >Emitted(130, 15) Source(152, 80) + SourceIndex(0)
 3 >Emitted(130, 16) Source(152, 87) + SourceIndex(0)
 4 >Emitted(130, 17) Source(152, 88) + SourceIndex(0)
@@ -2370,32 +2429,34 @@ sourceFile:contextualTyping.ts
 6 >Emitted(130, 20) Source(152, 91) + SourceIndex(0)
 7 >Emitted(130, 21) Source(152, 91) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
+>>>    };
+1 >^^^^
 2 >    ^
 3 >     ^
-4 >      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1-> 
+1 > 
 2 >    }
 3 >     
-1->Emitted(131, 5) Source(152, 92) + SourceIndex(0)
+1 >Emitted(131, 5) Source(152, 92) + SourceIndex(0)
 2 >Emitted(131, 6) Source(152, 93) + SourceIndex(0)
 3 >Emitted(131, 7) Source(152, 93) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
+>>>};
+1 >
 2 >^
 3 > ^
-4 >  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1-> 
+4 >  ^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 > 
 2 >}
 3 > ;
-1->Emitted(132, 1) Source(152, 94) + SourceIndex(0)
+1 >Emitted(132, 1) Source(152, 94) + SourceIndex(0)
 2 >Emitted(132, 2) Source(152, 95) + SourceIndex(0)
 3 >Emitted(132, 3) Source(152, 96) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
+>>>// CONTEXT: Newing a class
+1->
 2 >
 3 >^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+4 >                          ^->
 1->
   >
   >// CONTEXT: Newing a class
@@ -2406,21 +2467,22 @@ sourceFile:contextualTyping.ts
 2 >Emitted(133, 1) Source(154, 1) + SourceIndex(0)
 3 >Emitted(133, 27) Source(154, 27) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
+>>>var C11t5 = (function () {
+1->^^^^
 2 >    ^^^^^
-3 >         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 >         ^^^^^^^^^^^^^^^->
 1->
   >class 
 2 >    C11t5
 1->Emitted(134, 5) Source(155, 7) + SourceIndex(0)
 2 >Emitted(134, 10) Source(155, 12) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
+>>>    function C11t5(f) {
+1->^^^^
 2 >    ^^^^^^^^^
 3 >             ^^^^^
 4 >                  ^
 5 >                   ^
-6 >                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1-> { 
 2 >    
 3 >             C11t5
@@ -2432,45 +2494,48 @@ sourceFile:contextualTyping.ts
 4 >Emitted(135, 20) Source(155, 27) + SourceIndex(0) name (C11t5)
 5 >Emitted(135, 21) Source(155, 49) + SourceIndex(0) name (C11t5)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
+>>>    }
+1 >^^^^
 2 >    ^
-3 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->) { 
+3 >     ^^^^^^^^^^^^^->
+1 >) { 
 2 >    }
-1->Emitted(136, 5) Source(155, 53) + SourceIndex(0) name (C11t5.constructor)
+1 >Emitted(136, 5) Source(155, 53) + SourceIndex(0) name (C11t5.constructor)
 2 >Emitted(136, 6) Source(155, 54) + SourceIndex(0) name (C11t5.constructor)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
+>>>    return C11t5;
+1->^^^^
 2 >    ^^^^^^^^^^^^
-3 >                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1-> 
 2 >    }
 1->Emitted(137, 5) Source(155, 55) + SourceIndex(0) name (C11t5)
 2 >Emitted(137, 17) Source(155, 56) + SourceIndex(0) name (C11t5)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
+>>>})();
+1 >
 2 >^
 3 > 
 4 > ^^^^
-5 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->
+1 >
 2 >}
 3 > 
 4 > class C11t5 { constructor(f: (n: number) => IFoo) { } }
-1->Emitted(138, 1) Source(155, 55) + SourceIndex(0) name (C11t5)
+1 >Emitted(138, 1) Source(155, 55) + SourceIndex(0) name (C11t5)
 2 >Emitted(138, 2) Source(155, 56) + SourceIndex(0) name (C11t5)
 3 >Emitted(138, 2) Source(155, 1) + SourceIndex(0)
 4 >Emitted(138, 6) Source(155, 56) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
+>>>;
+1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
 2 >;
-1->Emitted(139, 1) Source(155, 56) + SourceIndex(0)
+1 >Emitted(139, 1) Source(155, 56) + SourceIndex(0)
 2 >Emitted(139, 2) Source(155, 57) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
+>>>var i = new C11t5(function (n) {
+1->
 2 >^^^^
 3 >    ^
 4 >     ^^^
@@ -2479,7 +2544,6 @@ sourceFile:contextualTyping.ts
 7 >                 ^
 8 >                  ^^^^^^^^^^
 9 >                            ^
-10>                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >var 
@@ -2500,22 +2564,22 @@ sourceFile:contextualTyping.ts
 8 >Emitted(140, 29) Source(156, 28) + SourceIndex(0)
 9 >Emitted(140, 30) Source(156, 29) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
+>>>    return ({});
+1 >^^^^
 2 >    ^^^^^^
 3 >          ^
 4 >           ^
 5 >            ^^
 6 >              ^
 7 >               ^
-8 >                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->) { 
+1 >) { 
 2 >    return
 3 >           <IFoo>
 4 >           (
 5 >            {}
 6 >              )
 7 >               
-1->Emitted(141, 5) Source(156, 33) + SourceIndex(0)
+1 >Emitted(141, 5) Source(156, 33) + SourceIndex(0)
 2 >Emitted(141, 11) Source(156, 39) + SourceIndex(0)
 3 >Emitted(141, 12) Source(156, 46) + SourceIndex(0)
 4 >Emitted(141, 13) Source(156, 47) + SourceIndex(0)
@@ -2523,24 +2587,25 @@ sourceFile:contextualTyping.ts
 6 >Emitted(141, 16) Source(156, 50) + SourceIndex(0)
 7 >Emitted(141, 17) Source(156, 50) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
+>>>});
+1 >
 2 >^
 3 > ^
 4 >  ^
-5 >   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1-> 
+5 >   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 > 
 2 >}
 3 > )
 4 >  ;
-1->Emitted(142, 1) Source(156, 51) + SourceIndex(0)
+1 >Emitted(142, 1) Source(156, 51) + SourceIndex(0)
 2 >Emitted(142, 2) Source(156, 52) + SourceIndex(0)
 3 >Emitted(142, 3) Source(156, 53) + SourceIndex(0)
 4 >Emitted(142, 4) Source(156, 54) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
+>>>// CONTEXT: Type annotated expression
+1->
 2 >
 3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
   >// CONTEXT: Type annotated expression
@@ -2551,64 +2616,65 @@ sourceFile:contextualTyping.ts
 2 >Emitted(143, 1) Source(158, 1) + SourceIndex(0)
 3 >Emitted(143, 38) Source(158, 38) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
+>>>var c12t1 = (function (s) {
+1 >^^^^
 2 >    ^^^^^
 3 >         ^^^
 4 >            ^
 5 >             ^^^^^^^^^^
 6 >                       ^
-7 >                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->
+1 >
   >var 
 2 >    c12t1
 3 >          = <(s: string) => string> 
 4 >            (
 5 >             function(
 6 >                       s
-1->Emitted(144, 5) Source(159, 5) + SourceIndex(0)
+1 >Emitted(144, 5) Source(159, 5) + SourceIndex(0)
 2 >Emitted(144, 10) Source(159, 10) + SourceIndex(0)
 3 >Emitted(144, 13) Source(159, 37) + SourceIndex(0)
 4 >Emitted(144, 14) Source(159, 38) + SourceIndex(0)
 5 >Emitted(144, 24) Source(159, 47) + SourceIndex(0)
 6 >Emitted(144, 25) Source(159, 48) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
+>>>    return s;
+1 >^^^^
 2 >    ^^^^^^
 3 >          ^
 4 >           ^
 5 >            ^
-6 >             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->) { 
+1 >) { 
 2 >    return
 3 >           
 4 >           s
 5 >            
-1->Emitted(145, 5) Source(159, 52) + SourceIndex(0)
+1 >Emitted(145, 5) Source(159, 52) + SourceIndex(0)
 2 >Emitted(145, 11) Source(159, 58) + SourceIndex(0)
 3 >Emitted(145, 12) Source(159, 59) + SourceIndex(0)
 4 >Emitted(145, 13) Source(159, 60) + SourceIndex(0)
 5 >Emitted(145, 14) Source(159, 60) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
+>>>});
+1 >
 2 >^
 3 > ^
 4 >  ^
-5 >   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1-> 
+5 >   ^^^^^^^^^^^^->
+1 > 
 2 >}
 3 > )
 4 >  ;
-1->Emitted(146, 1) Source(159, 61) + SourceIndex(0)
+1 >Emitted(146, 1) Source(159, 61) + SourceIndex(0)
 2 >Emitted(146, 2) Source(159, 62) + SourceIndex(0)
 3 >Emitted(146, 3) Source(159, 63) + SourceIndex(0)
 4 >Emitted(146, 4) Source(159, 64) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
+>>>var c12t2 = ({
+1->
 2 >^^^^
 3 >    ^^^^^
 4 >         ^^^
 5 >            ^
-6 >             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >var 
@@ -2621,40 +2687,42 @@ sourceFile:contextualTyping.ts
 4 >Emitted(147, 13) Source(160, 20) + SourceIndex(0)
 5 >Emitted(147, 14) Source(160, 21) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
+>>>    n: 1
+1 >^^^^
 2 >    ^
 3 >     ^^
 4 >       ^
-5 >        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->{
+1 >{
   >    
 2 >    n
 3 >     : 
 4 >       1
-1->Emitted(148, 5) Source(161, 5) + SourceIndex(0)
+1 >Emitted(148, 5) Source(161, 5) + SourceIndex(0)
 2 >Emitted(148, 6) Source(161, 6) + SourceIndex(0)
 3 >Emitted(148, 8) Source(161, 8) + SourceIndex(0)
 4 >Emitted(148, 9) Source(161, 9) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^
+>>>});
+1 >^
 2 > ^
 3 >  ^
-4 >   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->
+4 >   ^^^^^^^^^^^^^->
+1 >
   >}
 2 > )
 3 >  ;
-1->Emitted(149, 2) Source(162, 2) + SourceIndex(0)
+1 >Emitted(149, 2) Source(162, 2) + SourceIndex(0)
 2 >Emitted(149, 3) Source(162, 3) + SourceIndex(0)
 3 >Emitted(149, 4) Source(162, 4) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
+>>>var c12t3 = [];
+1->
 2 >^^^^
 3 >    ^^^^^
 4 >         ^^^
 5 >            ^^
 6 >              ^
-7 >               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+7 >               ^^^^^^^^^^^->
 1->
   >
 2 >var 
@@ -2669,11 +2737,12 @@ sourceFile:contextualTyping.ts
 5 >Emitted(150, 15) Source(163, 26) + SourceIndex(0)
 6 >Emitted(150, 16) Source(163, 27) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
+>>>var c12t4 = function () {
+1->
 2 >^^^^
 3 >    ^^^^^
 4 >         ^^^
-5 >            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+5 >            ^^^^^->
 1->
   >
 2 >var 
@@ -2684,14 +2753,14 @@ sourceFile:contextualTyping.ts
 3 >Emitted(151, 10) Source(164, 10) + SourceIndex(0)
 4 >Emitted(151, 13) Source(164, 26) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
+>>>    return ({});
+1->^^^^
 2 >    ^^^^^^
 3 >          ^
 4 >           ^
 5 >            ^^
 6 >              ^
 7 >               ^
-8 >                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->function() { 
 2 >    return
 3 >           <IFoo>
@@ -2707,24 +2776,25 @@ sourceFile:contextualTyping.ts
 6 >Emitted(152, 16) Source(164, 56) + SourceIndex(0)
 7 >Emitted(152, 17) Source(164, 56) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
+>>>};
+1 >
 2 >^
 3 > ^
-4 >  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1-> 
+4 >  ^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 > 
 2 >}
 3 > ;
-1->Emitted(153, 1) Source(164, 57) + SourceIndex(0)
+1 >Emitted(153, 1) Source(164, 57) + SourceIndex(0)
 2 >Emitted(153, 2) Source(164, 58) + SourceIndex(0)
 3 >Emitted(153, 3) Source(164, 59) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
+>>>var c12t5 = function (n) {
+1->
 2 >^^^^
 3 >    ^^^^^
 4 >         ^^^
 5 >            ^^^^^^^^^^
 6 >                      ^
-7 >                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >var 
@@ -2739,22 +2809,22 @@ sourceFile:contextualTyping.ts
 5 >Emitted(154, 23) Source(165, 44) + SourceIndex(0)
 6 >Emitted(154, 24) Source(165, 45) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
+>>>    return ({});
+1 >^^^^
 2 >    ^^^^^^
 3 >          ^
 4 >           ^
 5 >            ^^
 6 >              ^
 7 >               ^
-8 >                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->) { 
+1 >) { 
 2 >    return
 3 >           <IFoo>
 4 >           (
 5 >            {}
 6 >              )
 7 >               
-1->Emitted(155, 5) Source(165, 49) + SourceIndex(0)
+1 >Emitted(155, 5) Source(165, 49) + SourceIndex(0)
 2 >Emitted(155, 11) Source(165, 55) + SourceIndex(0)
 3 >Emitted(155, 12) Source(165, 62) + SourceIndex(0)
 4 >Emitted(155, 13) Source(165, 63) + SourceIndex(0)
@@ -2762,18 +2832,20 @@ sourceFile:contextualTyping.ts
 6 >Emitted(155, 16) Source(165, 66) + SourceIndex(0)
 7 >Emitted(155, 17) Source(165, 66) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
+>>>};
+1 >
 2 >^
 3 > ^
-4 >  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1-> 
+4 >  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 > 
 2 >}
 3 > ;
-1->Emitted(156, 1) Source(165, 67) + SourceIndex(0)
+1 >Emitted(156, 1) Source(165, 67) + SourceIndex(0)
 2 >Emitted(156, 2) Source(165, 68) + SourceIndex(0)
 3 >Emitted(156, 3) Source(165, 69) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
+>>>var c12t6 = function (n, s) {
+1->
 2 >^^^^
 3 >    ^^^^^
 4 >         ^^^
@@ -2781,7 +2853,6 @@ sourceFile:contextualTyping.ts
 6 >                      ^
 7 >                       ^^
 8 >                         ^
-9 >                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >var 
@@ -2800,22 +2871,22 @@ sourceFile:contextualTyping.ts
 7 >Emitted(157, 26) Source(166, 58) + SourceIndex(0)
 8 >Emitted(157, 27) Source(166, 59) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
+>>>    return ({});
+1 >^^^^
 2 >    ^^^^^^
 3 >          ^
 4 >           ^
 5 >            ^^
 6 >              ^
 7 >               ^
-8 >                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->) { 
+1 >) { 
 2 >    return
 3 >           <IFoo>
 4 >           (
 5 >            {}
 6 >              )
 7 >               
-1->Emitted(158, 5) Source(166, 63) + SourceIndex(0)
+1 >Emitted(158, 5) Source(166, 63) + SourceIndex(0)
 2 >Emitted(158, 11) Source(166, 69) + SourceIndex(0)
 3 >Emitted(158, 12) Source(166, 76) + SourceIndex(0)
 4 >Emitted(158, 13) Source(166, 77) + SourceIndex(0)
@@ -2823,24 +2894,25 @@ sourceFile:contextualTyping.ts
 6 >Emitted(158, 16) Source(166, 80) + SourceIndex(0)
 7 >Emitted(158, 17) Source(166, 80) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
+>>>};
+1 >
 2 >^
 3 > ^
-4 >  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1-> 
+4 >  ^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 > 
 2 >}
 3 > ;
-1->Emitted(159, 1) Source(166, 81) + SourceIndex(0)
+1 >Emitted(159, 1) Source(166, 81) + SourceIndex(0)
 2 >Emitted(159, 2) Source(166, 82) + SourceIndex(0)
 3 >Emitted(159, 3) Source(166, 83) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
+>>>var c12t7 = function (n) {
+1->
 2 >^^^^
 3 >    ^^^^^
 4 >         ^^^
 5 >            ^^^^^^^^^^
 6 >                      ^
-7 >                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >var 
@@ -2858,41 +2930,42 @@ sourceFile:contextualTyping.ts
 5 >Emitted(160, 23) Source(170, 13) + SourceIndex(0)
 6 >Emitted(160, 24) Source(170, 21) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
+>>>    return n;
+1 >^^^^
 2 >    ^^^^^^
 3 >          ^
 4 >           ^
 5 >            ^
-6 >             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->) { 
+1 >) { 
 2 >    return
 3 >           
 4 >           n
 5 >            
-1->Emitted(161, 5) Source(170, 25) + SourceIndex(0)
+1 >Emitted(161, 5) Source(170, 25) + SourceIndex(0)
 2 >Emitted(161, 11) Source(170, 31) + SourceIndex(0)
 3 >Emitted(161, 12) Source(170, 32) + SourceIndex(0)
 4 >Emitted(161, 13) Source(170, 33) + SourceIndex(0)
 5 >Emitted(161, 14) Source(170, 33) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
+>>>};
+1 >
 2 >^
 3 > ^
-4 >  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1-> 
+4 >  ^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 > 
 2 >}
 3 > ;
-1->Emitted(162, 1) Source(170, 34) + SourceIndex(0)
+1 >Emitted(162, 1) Source(170, 34) + SourceIndex(0)
 2 >Emitted(162, 2) Source(170, 35) + SourceIndex(0)
 3 >Emitted(162, 3) Source(170, 36) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
+>>>var c12t8 = function (n) {
+1->
 2 >^^^^
 3 >    ^^^^^
 4 >         ^^^
 5 >            ^^^^^^^^^^
 6 >                      ^
-7 >                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
   >
@@ -2908,35 +2981,37 @@ sourceFile:contextualTyping.ts
 5 >Emitted(163, 23) Source(172, 57) + SourceIndex(0)
 6 >Emitted(163, 24) Source(172, 58) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
+>>>    return n;
+1 >^^^^
 2 >    ^^^^^^
 3 >          ^
 4 >           ^
 5 >            ^
-6 >             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->) { 
+1 >) { 
 2 >    return
 3 >           
 4 >           n
 5 >            ;
-1->Emitted(164, 5) Source(172, 62) + SourceIndex(0)
+1 >Emitted(164, 5) Source(172, 62) + SourceIndex(0)
 2 >Emitted(164, 11) Source(172, 68) + SourceIndex(0)
 3 >Emitted(164, 12) Source(172, 69) + SourceIndex(0)
 4 >Emitted(164, 13) Source(172, 70) + SourceIndex(0)
 5 >Emitted(164, 14) Source(172, 71) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
+>>>};
+1 >
 2 >^
 3 > ^
-4 >  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1-> 
+4 >  ^^^^^^^^^^^^^^^^^^^^->
+1 > 
 2 >}
 3 > ;
-1->Emitted(165, 1) Source(172, 72) + SourceIndex(0)
+1 >Emitted(165, 1) Source(172, 72) + SourceIndex(0)
 2 >Emitted(165, 2) Source(172, 73) + SourceIndex(0)
 3 >Emitted(165, 3) Source(172, 74) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
+>>>var c12t9 = [[], []];
+1->
 2 >^^^^
 3 >    ^^^^^
 4 >         ^^^
@@ -2946,7 +3021,7 @@ sourceFile:contextualTyping.ts
 8 >                 ^^
 9 >                   ^
 10>                    ^
-11>                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+11>                     ^^^^^^->
 1->
   >
 2 >var 
@@ -2969,7 +3044,8 @@ sourceFile:contextualTyping.ts
 9 >Emitted(166, 21) Source(173, 33) + SourceIndex(0)
 10>Emitted(166, 22) Source(173, 34) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
+>>>var c12t10 = [({}), ({})];
+1->
 2 >^^^^
 3 >    ^^^^^^
 4 >          ^^^
@@ -2983,7 +3059,7 @@ sourceFile:contextualTyping.ts
 12>                       ^
 13>                        ^
 14>                         ^
-15>                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+15>                          ^^^^^^->
 1->
   >
 2 >var 
@@ -3014,7 +3090,8 @@ sourceFile:contextualTyping.ts
 13>Emitted(167, 26) Source(174, 46) + SourceIndex(0)
 14>Emitted(167, 27) Source(174, 47) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
+>>>var c12t11 = [function (n, s) {
+1->
 2 >^^^^
 3 >    ^^^^^^
 4 >          ^^^
@@ -3023,7 +3100,6 @@ sourceFile:contextualTyping.ts
 7 >                        ^
 8 >                         ^^
 9 >                           ^
-10>                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >var 
@@ -3044,42 +3120,44 @@ sourceFile:contextualTyping.ts
 8 >Emitted(168, 28) Source(175, 65) + SourceIndex(0)
 9 >Emitted(168, 29) Source(175, 66) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
+>>>    return s;
+1 >^^^^
 2 >    ^^^^^^
 3 >          ^
 4 >           ^
 5 >            ^
-6 >             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->) { 
+1 >) { 
 2 >    return
 3 >           
 4 >           s
 5 >            ;
-1->Emitted(169, 5) Source(175, 70) + SourceIndex(0)
+1 >Emitted(169, 5) Source(175, 70) + SourceIndex(0)
 2 >Emitted(169, 11) Source(175, 76) + SourceIndex(0)
 3 >Emitted(169, 12) Source(175, 77) + SourceIndex(0)
 4 >Emitted(169, 13) Source(175, 78) + SourceIndex(0)
 5 >Emitted(169, 14) Source(175, 79) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
+>>>}];
+1 >
 2 >^
 3 > ^
 4 >  ^
-5 >   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1-> 
+5 >   ^^^^^^^^^^^^->
+1 > 
 2 >}
 3 > ]
 4 >  ;
-1->Emitted(170, 1) Source(175, 80) + SourceIndex(0)
+1 >Emitted(170, 1) Source(175, 80) + SourceIndex(0)
 2 >Emitted(170, 2) Source(175, 81) + SourceIndex(0)
 3 >Emitted(170, 3) Source(175, 82) + SourceIndex(0)
 4 >Emitted(170, 4) Source(175, 83) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
+>>>var c12t12 = {
+1->
 2 >^^^^
 3 >    ^^^^^^
 4 >          ^^^
-5 >             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+5 >             ^->
 1->
   >
 2 >var 
@@ -3090,13 +3168,13 @@ sourceFile:contextualTyping.ts
 3 >Emitted(171, 11) Source(176, 11) + SourceIndex(0)
 4 >Emitted(171, 14) Source(176, 21) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
+>>>    foo: ({})
+1->^^^^
 2 >    ^^^
 3 >       ^^
 4 >         ^
 5 >          ^^
 6 >            ^
-7 >             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->{
   >    
 2 >    foo
@@ -3111,21 +3189,23 @@ sourceFile:contextualTyping.ts
 5 >Emitted(172, 13) Source(177, 19) + SourceIndex(0)
 6 >Emitted(172, 14) Source(177, 20) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^
+>>>};
+1 >^
 2 > ^
-3 >  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->
+3 >  ^^^^^^^^^^^^^^->
+1 >
   >}
 2 > 
-1->Emitted(173, 2) Source(178, 2) + SourceIndex(0)
+1 >Emitted(173, 2) Source(178, 2) + SourceIndex(0)
 2 >Emitted(173, 3) Source(178, 2) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
+>>>var c12t13 = ({
+1->
 2 >^^^^
 3 >    ^^^^^^
 4 >          ^^^
 5 >             ^
-6 >              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+6 >              ^^^^^^^^^^^->
 1->
   >
 2 >var 
@@ -3138,14 +3218,14 @@ sourceFile:contextualTyping.ts
 4 >Emitted(174, 14) Source(179, 21) + SourceIndex(0)
 5 >Emitted(174, 15) Source(179, 22) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
+>>>    f: function (i, s) {
+1->^^^^
 2 >    ^
 3 >     ^^
 4 >       ^^^^^^^^^^
 5 >                 ^
 6 >                  ^^
 7 >                    ^
-8 >                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->{
   >    
 2 >    f
@@ -3162,49 +3242,50 @@ sourceFile:contextualTyping.ts
 6 >Emitted(175, 21) Source(180, 20) + SourceIndex(0)
 7 >Emitted(175, 22) Source(180, 21) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^^^^^
+>>>        return s;
+1 >^^^^^^^^
 2 >        ^^^^^^
 3 >              ^
 4 >               ^
 5 >                ^
-6 >                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->) { 
+1 >) { 
 2 >        return
 3 >               
 4 >               s
 5 >                ;
-1->Emitted(176, 9) Source(180, 25) + SourceIndex(0)
+1 >Emitted(176, 9) Source(180, 25) + SourceIndex(0)
 2 >Emitted(176, 15) Source(180, 31) + SourceIndex(0)
 3 >Emitted(176, 16) Source(180, 32) + SourceIndex(0)
 4 >Emitted(176, 17) Source(180, 33) + SourceIndex(0)
 5 >Emitted(176, 18) Source(180, 34) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
+>>>    }
+1 >^^^^
 2 >    ^
-3 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1-> 
+1 > 
 2 >    }
-1->Emitted(177, 5) Source(180, 35) + SourceIndex(0)
+1 >Emitted(177, 5) Source(180, 35) + SourceIndex(0)
 2 >Emitted(177, 6) Source(180, 36) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^
+>>>});
+1 >^
 2 > ^
 3 >  ^
-4 >   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->
+4 >   ^^^^^^^^^^^^^->
+1 >
   >}
 2 > )
 3 >  
-1->Emitted(178, 2) Source(181, 2) + SourceIndex(0)
+1 >Emitted(178, 2) Source(181, 2) + SourceIndex(0)
 2 >Emitted(178, 3) Source(181, 3) + SourceIndex(0)
 3 >Emitted(178, 4) Source(181, 3) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
+>>>var c12t14 = ({
+1->
 2 >^^^^
 3 >    ^^^^^^
 4 >          ^^^
 5 >             ^
-6 >              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >var 
@@ -3217,41 +3298,43 @@ sourceFile:contextualTyping.ts
 4 >Emitted(179, 14) Source(182, 21) + SourceIndex(0)
 5 >Emitted(179, 15) Source(182, 22) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
+>>>    a: []
+1 >^^^^
 2 >    ^
 3 >     ^^
 4 >       ^^
-5 >         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->{
+1 >{
   >    
 2 >    a
 3 >     : 
 4 >       []
-1->Emitted(180, 5) Source(183, 5) + SourceIndex(0)
+1 >Emitted(180, 5) Source(183, 5) + SourceIndex(0)
 2 >Emitted(180, 6) Source(183, 6) + SourceIndex(0)
 3 >Emitted(180, 8) Source(183, 8) + SourceIndex(0)
 4 >Emitted(180, 10) Source(183, 10) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^
+>>>});
+1 >^
 2 > ^
 3 >  ^
-4 >   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->
+4 >   ^^^^^^^^^^^^^^^^^^->
+1 >
   >}
 2 > )
 3 >  
-1->Emitted(181, 2) Source(184, 2) + SourceIndex(0)
+1 >Emitted(181, 2) Source(184, 2) + SourceIndex(0)
 2 >Emitted(181, 3) Source(184, 3) + SourceIndex(0)
 3 >Emitted(181, 4) Source(184, 3) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
+>>>function EF1(a, b) {
+1->
 2 >^^^^^^^^^
 3 >         ^^^
 4 >            ^
 5 >             ^
 6 >              ^^
 7 >                ^
-8 >                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+8 >                 ^->
 1->
   >
   >// CONTEXT: Contextual typing declarations
@@ -3274,14 +3357,14 @@ sourceFile:contextualTyping.ts
 6 >Emitted(182, 17) Source(191, 16) + SourceIndex(0)
 7 >Emitted(182, 18) Source(191, 17) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
+>>>    return a + b;
+1->^^^^
 2 >    ^^^^^^
 3 >          ^
 4 >           ^
 5 >            ^^^
 6 >               ^
 7 >                ^
-8 >                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->) { 
 2 >    return
 3 >           
@@ -3297,15 +3380,17 @@ sourceFile:contextualTyping.ts
 6 >Emitted(183, 17) Source(191, 31) + SourceIndex(0) name (EF1)
 7 >Emitted(183, 18) Source(191, 32) + SourceIndex(0) name (EF1)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
+>>>}
+1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1-> 
+3 > ^^^^^^^^^^^^^^^^^^^^->
+1 > 
 2 >}
-1->Emitted(184, 1) Source(191, 33) + SourceIndex(0) name (EF1)
+1 >Emitted(184, 1) Source(191, 33) + SourceIndex(0) name (EF1)
 2 >Emitted(184, 2) Source(191, 34) + SourceIndex(0) name (EF1)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
+>>>var efv = EF1(1, 2);
+1->
 2 >^^^^
 3 >    ^^^
 4 >       ^^^
@@ -3316,7 +3401,7 @@ sourceFile:contextualTyping.ts
 9 >                 ^
 10>                  ^
 11>                   ^
-12>                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+12>                    ^^^->
 1->
   >
   >
@@ -3342,14 +3427,14 @@ sourceFile:contextualTyping.ts
 10>Emitted(185, 20) Source(193, 19) + SourceIndex(0)
 11>Emitted(185, 21) Source(193, 20) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
+>>>function Point(x, y) {
+1->
 2 >^^^^^^^^^
 3 >         ^^^^^
 4 >              ^
 5 >               ^
 6 >                ^^
 7 >                  ^
-8 >                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
   >
@@ -3379,15 +3464,16 @@ sourceFile:contextualTyping.ts
 6 >Emitted(186, 19) Source(207, 19) + SourceIndex(0)
 7 >Emitted(186, 20) Source(207, 20) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
+>>>    this.x = x;
+1 >^^^^
 2 >    ^^^^
 3 >        ^
 4 >         ^
 5 >          ^^^
 6 >             ^
 7 >              ^
-8 >               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->) {
+8 >               ^->
+1 >) {
   >    
 2 >    this
 3 >        .
@@ -3395,7 +3481,7 @@ sourceFile:contextualTyping.ts
 5 >           = 
 6 >             x
 7 >              ;
-1->Emitted(187, 5) Source(208, 5) + SourceIndex(0) name (Point)
+1 >Emitted(187, 5) Source(208, 5) + SourceIndex(0) name (Point)
 2 >Emitted(187, 9) Source(208, 9) + SourceIndex(0) name (Point)
 3 >Emitted(187, 10) Source(208, 10) + SourceIndex(0) name (Point)
 4 >Emitted(187, 11) Source(208, 11) + SourceIndex(0) name (Point)
@@ -3403,14 +3489,15 @@ sourceFile:contextualTyping.ts
 6 >Emitted(187, 15) Source(208, 15) + SourceIndex(0) name (Point)
 7 >Emitted(187, 16) Source(208, 16) + SourceIndex(0) name (Point)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
+>>>    this.y = y;
+1->^^^^
 2 >    ^^^^
 3 >        ^
 4 >         ^
 5 >          ^^^
 6 >             ^
 7 >              ^
-8 >               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+8 >               ^^->
 1->
   >    
 2 >    this
@@ -3427,12 +3514,12 @@ sourceFile:contextualTyping.ts
 6 >Emitted(188, 15) Source(209, 15) + SourceIndex(0) name (Point)
 7 >Emitted(188, 16) Source(209, 16) + SourceIndex(0) name (Point)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
+>>>    return this;
+1->^^^^
 2 >    ^^^^^^
 3 >          ^
 4 >           ^^^^
 5 >               ^
-6 >                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
   >    
@@ -3446,16 +3533,18 @@ sourceFile:contextualTyping.ts
 4 >Emitted(189, 16) Source(211, 16) + SourceIndex(0) name (Point)
 5 >Emitted(189, 17) Source(211, 17) + SourceIndex(0) name (Point)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
+>>>}
+1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
   >
 2 >}
-1->Emitted(190, 1) Source(212, 1) + SourceIndex(0) name (Point)
+1 >Emitted(190, 1) Source(212, 1) + SourceIndex(0) name (Point)
 2 >Emitted(190, 2) Source(212, 2) + SourceIndex(0) name (Point)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
+>>>Point.origin = new Point(0, 0);
+1->
 2 >^^^^^
 3 >     ^
 4 >      ^^^^^^
@@ -3468,7 +3557,7 @@ sourceFile:contextualTyping.ts
 11>                            ^
 12>                             ^
 13>                              ^
-14>                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+14>                               ^^^^^^^^^^^->
 1->
   >
   >
@@ -3498,7 +3587,8 @@ sourceFile:contextualTyping.ts
 12>Emitted(191, 31) Source(214, 31) + SourceIndex(0)
 13>Emitted(191, 32) Source(214, 32) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
+>>>Point.prototype.add = function (dx, dy) {
+1->
 2 >^^^^^
 3 >     ^
 4 >      ^^^^^^^^^
@@ -3509,7 +3599,7 @@ sourceFile:contextualTyping.ts
 9 >                                ^^
 10>                                  ^^
 11>                                    ^^
-12>                                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+12>                                      ^^^^^^^^^^->
 1->
   >
   >
@@ -3535,7 +3625,8 @@ sourceFile:contextualTyping.ts
 10>Emitted(192, 37) Source(216, 36) + SourceIndex(0)
 11>Emitted(192, 39) Source(216, 38) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
+>>>    return new Point(this.x + dx, this.y + dy);
+1->^^^^
 2 >    ^^^^^^
 3 >          ^
 4 >           ^^^^
@@ -3554,7 +3645,6 @@ sourceFile:contextualTyping.ts
 17>                                           ^^
 18>                                             ^
 19>                                              ^
-20>                                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->) {
   >    
 2 >    return
@@ -3595,24 +3685,25 @@ sourceFile:contextualTyping.ts
 18>Emitted(193, 47) Source(217, 47) + SourceIndex(0)
 19>Emitted(193, 48) Source(217, 48) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
+>>>};
+1 >
 2 >^
 3 > ^
-4 >  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->
+4 >  ^^^^^^^^^^^^^^^^^^->
+1 >
   >
 2 >}
 3 > ;
-1->Emitted(194, 1) Source(218, 1) + SourceIndex(0)
+1 >Emitted(194, 1) Source(218, 1) + SourceIndex(0)
 2 >Emitted(194, 2) Source(218, 2) + SourceIndex(0)
 3 >Emitted(194, 3) Source(218, 3) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
+>>>Point.prototype = {
+1->
 2 >^^^^^
 3 >     ^
 4 >      ^^^^^^^^^
 5 >               ^^^
-6 >                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
   >
@@ -3626,26 +3717,28 @@ sourceFile:contextualTyping.ts
 4 >Emitted(195, 16) Source(220, 16) + SourceIndex(0)
 5 >Emitted(195, 19) Source(220, 19) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
+>>>    x: 0,
+1 >^^^^
 2 >    ^
 3 >     ^^
 4 >       ^
-5 >        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->{
+5 >        ^^->
+1 >{
   >    
 2 >    x
 3 >     : 
 4 >       0
-1->Emitted(196, 5) Source(221, 5) + SourceIndex(0)
+1 >Emitted(196, 5) Source(221, 5) + SourceIndex(0)
 2 >Emitted(196, 6) Source(221, 6) + SourceIndex(0)
 3 >Emitted(196, 8) Source(221, 8) + SourceIndex(0)
 4 >Emitted(196, 9) Source(221, 9) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
+>>>    y: 0,
+1->^^^^
 2 >    ^
 3 >     ^^
 4 >       ^
-5 >        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+5 >        ^^^^^^^^^^^^^^^^^^^^^->
 1->,
   >    
 2 >    y
@@ -3656,14 +3749,15 @@ sourceFile:contextualTyping.ts
 3 >Emitted(197, 8) Source(222, 8) + SourceIndex(0)
 4 >Emitted(197, 9) Source(222, 9) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
+>>>    add: function (dx, dy) {
+1->^^^^
 2 >    ^^^
 3 >       ^^
 4 >         ^^^^^^^^^^
 5 >                   ^^
 6 >                     ^^
 7 >                       ^^
-8 >                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+8 >                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->,
   >    
 2 >    add
@@ -3680,7 +3774,8 @@ sourceFile:contextualTyping.ts
 6 >Emitted(198, 24) Source(223, 23) + SourceIndex(0)
 7 >Emitted(198, 26) Source(223, 25) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^^^^^
+>>>        return new Point(this.x + dx, this.y + dy);
+1->^^^^^^^^
 2 >        ^^^^^^
 3 >              ^
 4 >               ^^^^
@@ -3699,7 +3794,6 @@ sourceFile:contextualTyping.ts
 17>                                               ^^
 18>                                                 ^
 19>                                                  ^
-20>                                                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->) {
   >        
 2 >        return
@@ -3740,31 +3834,33 @@ sourceFile:contextualTyping.ts
 18>Emitted(199, 51) Source(224, 51) + SourceIndex(0)
 19>Emitted(199, 52) Source(224, 52) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
+>>>    }
+1 >^^^^
 2 >    ^
-3 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->
+1 >
   >    
 2 >    }
-1->Emitted(200, 5) Source(225, 5) + SourceIndex(0)
+1 >Emitted(200, 5) Source(225, 5) + SourceIndex(0)
 2 >Emitted(200, 6) Source(225, 6) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^
+>>>};
+1 >^
 2 > ^
-3 >  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1->
+3 >  ^^^^^^^^^^->
+1 >
   >}
 2 > ;
-1->Emitted(201, 2) Source(226, 2) + SourceIndex(0)
+1 >Emitted(201, 2) Source(226, 2) + SourceIndex(0)
 2 >Emitted(201, 3) Source(226, 3) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
+>>>var x = {};
+1->
 2 >^^^^
 3 >    ^
 4 >     ^^^
 5 >        ^^
 6 >          ^
-7 >           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+7 >           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
   >interface A { x: string; }
@@ -3781,4 +3877,5 @@ sourceFile:contextualTyping.ts
 4 >Emitted(202, 9) Source(230, 12) + SourceIndex(0)
 5 >Emitted(202, 11) Source(230, 15) + SourceIndex(0)
 6 >Emitted(202, 12) Source(230, 16) + SourceIndex(0)
----
\ No newline at end of file
+---
+>>>//# sourceMappingURL=contextualTyping.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/covariance1.types b/tests/baselines/reference/covariance1.types
index b673b7afc31..0e8bf3d9125 100644
--- a/tests/baselines/reference/covariance1.types
+++ b/tests/baselines/reference/covariance1.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/covariance1.ts ===
 module M {
->M : typeof M
+>M : M
 
     interface X { m1:number; }
 >X : X
@@ -30,7 +30,7 @@ module M {
 >f : typeof f
 >{x:a} : { x: X; }
 >x : X
->a : a
+>a : X
 
     var b:XX;
 >b : XX
@@ -41,7 +41,7 @@ module M {
 >f : typeof f
 >{x:b} : { x: XX; }
 >x : XX
->b : b
+>b : XX
 }
 
 
diff --git a/tests/baselines/reference/crashInresolveReturnStatement.types b/tests/baselines/reference/crashInresolveReturnStatement.types
index 6f25dcaea86..d15889cce40 100644
--- a/tests/baselines/reference/crashInresolveReturnStatement.types
+++ b/tests/baselines/reference/crashInresolveReturnStatement.types
@@ -7,9 +7,9 @@ class WorkItemToolbar {
 
         WITDialogs.createCopyOfWorkItem();
 >WITDialogs.createCopyOfWorkItem() : void
->WITDialogs.createCopyOfWorkItem : typeof createCopyOfWorkItem
+>WITDialogs.createCopyOfWorkItem : () => void
 >WITDialogs : typeof WITDialogs
->createCopyOfWorkItem : typeof createCopyOfWorkItem
+>createCopyOfWorkItem : () => void
     }
 }
 class CreateCopyOfWorkItemDialog {
@@ -31,7 +31,7 @@ class WITDialogs {
 >WITDialogs : WITDialogs
 
     public static createCopyOfWorkItem() {
->createCopyOfWorkItem : typeof createCopyOfWorkItem
+>createCopyOfWorkItem : () => void
 
         createWorkItemDialog(CreateCopyOfWorkItemDialog);
 >createWorkItemDialog(CreateCopyOfWorkItemDialog) : void
diff --git a/tests/baselines/reference/cyclicModuleImport.types b/tests/baselines/reference/cyclicModuleImport.types
index c581dd63c6d..11c4fc54a0e 100644
--- a/tests/baselines/reference/cyclicModuleImport.types
+++ b/tests/baselines/reference/cyclicModuleImport.types
@@ -1,7 +1,7 @@
 === tests/cases/compiler/cyclicModuleImport.ts ===
 declare module "SubModule" {
     import MainModule = require('MainModule');
->MainModule : typeof MainModule
+>MainModule : MainModule
 
     class SubModule {
 >SubModule : SubModule
@@ -23,7 +23,7 @@ declare module "SubModule" {
 }
 declare module "MainModule" {
     import SubModule = require('SubModule');
->SubModule : typeof SubModule
+>SubModule : SubModule
 
     class MainModule {
 >MainModule : MainModule
diff --git a/tests/baselines/reference/declFileAmbientExternalModuleWithSingleExportedModule.types b/tests/baselines/reference/declFileAmbientExternalModuleWithSingleExportedModule.types
index fb937443e85..8cc4336664a 100644
--- a/tests/baselines/reference/declFileAmbientExternalModuleWithSingleExportedModule.types
+++ b/tests/baselines/reference/declFileAmbientExternalModuleWithSingleExportedModule.types
@@ -1,14 +1,14 @@
 === tests/cases/compiler/declFileAmbientExternalModuleWithSingleExportedModule_1.ts ===
 ///<reference path='declFileAmbientExternalModuleWithSingleExportedModule_0.ts'/>
 import SubModule = require('SubModule');
->SubModule : typeof "SubModule"
+>SubModule : SubModule
 
 export var x: SubModule.m.m3.c;
->x : c
+>x : SubModule.m.m3.c
 >SubModule : SubModule
->m : m
->m3 : m3
->c : c
+>m : SubModule.m
+>m3 : SubModule.m.m3
+>c : SubModule.m.m3.c
 
 
 === tests/cases/compiler/declFileAmbientExternalModuleWithSingleExportedModule_0.ts ===
diff --git a/tests/baselines/reference/declFileClassWithStaticMethodReturningConstructor.types b/tests/baselines/reference/declFileClassWithStaticMethodReturningConstructor.types
index 2de89b265c1..0f1b21efc9e 100644
--- a/tests/baselines/reference/declFileClassWithStaticMethodReturningConstructor.types
+++ b/tests/baselines/reference/declFileClassWithStaticMethodReturningConstructor.types
@@ -4,7 +4,7 @@ export class Enhancement {
 >Enhancement : Enhancement
 
     public static getType() {
->getType : typeof getType
+>getType : () => typeof Enhancement
 
         return this;
 >this : typeof Enhancement
diff --git a/tests/baselines/reference/declFileExportAssignmentImportInternalModule.types b/tests/baselines/reference/declFileExportAssignmentImportInternalModule.types
index 7a690b83de1..bf77e1efb08 100644
--- a/tests/baselines/reference/declFileExportAssignmentImportInternalModule.types
+++ b/tests/baselines/reference/declFileExportAssignmentImportInternalModule.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/declFileExportAssignmentImportInternalModule.ts ===
 module m3 {
->m3 : typeof m3
+>m3 : m3
 
     export module m2 {
 >m2 : m2
@@ -30,27 +30,27 @@ module m3 {
     }
 
     export var server: {
->server : { (): connectExport; test1: connectModule; test2(): connectModule; }
+>server : { (): m2.connectExport; test1: m2.connectModule; test2(): m2.connectModule; }
 
         (): m2.connectExport;
 >m2 : m2
->connectExport : connectExport
+>connectExport : m2.connectExport
 
         test1: m2.connectModule;
->test1 : connectModule
+>test1 : m2.connectModule
 >m2 : m2
->connectModule : connectModule
+>connectModule : m2.connectModule
 
         test2(): m2.connectModule;
->test2 : () => connectModule
+>test2 : () => m2.connectModule
 >m2 : m2
->connectModule : connectModule
+>connectModule : m2.connectModule
 
     };
 }
 
 import m = m3
->m : typeof m3
+>m : m
 >m3 : typeof m3
 
 export = m;
diff --git a/tests/baselines/reference/declFileExportAssignmentOfGenericInterface.types b/tests/baselines/reference/declFileExportAssignmentOfGenericInterface.types
index b7e14978048..1494d04c31c 100644
--- a/tests/baselines/reference/declFileExportAssignmentOfGenericInterface.types
+++ b/tests/baselines/reference/declFileExportAssignmentOfGenericInterface.types
@@ -3,13 +3,13 @@ import a = require('declFileExportAssignmentOfGenericInterface_0');
 >a : a
 
 export var x: a<a<string>>;
->x : Foo<Foo<string>>
->a : Foo<T>
->a : Foo<T>
+>x : a<a<string>>
+>a : a<T>
+>a : a<T>
 
 x.a;
 >x.a : string
->x : Foo<Foo<string>>
+>x : a<a<string>>
 >a : string
 
 === tests/cases/compiler/declFileExportAssignmentOfGenericInterface_0.ts ===
diff --git a/tests/baselines/reference/declFileExportImportChain.types b/tests/baselines/reference/declFileExportImportChain.types
index 8e72c07fb9f..1a047003ce5 100644
--- a/tests/baselines/reference/declFileExportImportChain.types
+++ b/tests/baselines/reference/declFileExportImportChain.types
@@ -1,22 +1,22 @@
 === tests/cases/compiler/declFileExportImportChain_d.ts ===
 import c = require("declFileExportImportChain_c");
->c : typeof "tests/cases/compiler/declFileExportImportChain_c"
+>c : c
 
 export var x: c.b1.a.m2.c1;
->x : c1
+>x : c.b1.a.m2.c1
 >c : c
->b1 : b1
->a : a
->m2 : m2
->c1 : c1
+>b1 : c.b1
+>a : c.b1.a
+>m2 : c.b1.a.m2
+>c1 : c.b1.a.m2.c1
 
 === tests/cases/compiler/declFileExportImportChain_a.ts ===
 
 module m1 {
->m1 : typeof m1
+>m1 : m1
 
     export module m2 {
->m2 : typeof m2
+>m2 : m2
 
         export class c1 {
 >c1 : c1
@@ -28,16 +28,16 @@ export = m1;
 
 === tests/cases/compiler/declFileExportImportChain_b.ts ===
 export import a = require("declFileExportImportChain_a");
->a : typeof m1
+>a : a
 
 === tests/cases/compiler/declFileExportImportChain_b1.ts ===
 import b = require("declFileExportImportChain_b");
->b : typeof "tests/cases/compiler/declFileExportImportChain_b"
+>b : b
 
 export = b;
->b : typeof "tests/cases/compiler/declFileExportImportChain_b"
+>b : typeof b
 
 === tests/cases/compiler/declFileExportImportChain_c.ts ===
 export import b1 = require("declFileExportImportChain_b1");
->b1 : typeof "tests/cases/compiler/declFileExportImportChain_b"
+>b1 : b1
 
diff --git a/tests/baselines/reference/declFileExportImportChain2.types b/tests/baselines/reference/declFileExportImportChain2.types
index 3c0c3f89837..7254e0d9498 100644
--- a/tests/baselines/reference/declFileExportImportChain2.types
+++ b/tests/baselines/reference/declFileExportImportChain2.types
@@ -1,21 +1,21 @@
 === tests/cases/compiler/declFileExportImportChain2_d.ts ===
 import c = require("declFileExportImportChain2_c");
->c : typeof "tests/cases/compiler/declFileExportImportChain2_c"
+>c : c
 
 export var x: c.b.m2.c1;
->x : c1
+>x : c.b.m2.c1
 >c : c
->b : b
->m2 : m2
->c1 : c1
+>b : c.b
+>m2 : c.b.m2
+>c1 : c.b.m2.c1
 
 === tests/cases/compiler/declFileExportImportChain2_a.ts ===
 
 module m1 {
->m1 : typeof m1
+>m1 : m1
 
     export module m2 {
->m2 : typeof m2
+>m2 : m2
 
         export class c1 {
 >c1 : c1
@@ -27,12 +27,12 @@ export = m1;
 
 === tests/cases/compiler/declFileExportImportChain2_b.ts ===
 import a = require("declFileExportImportChain2_a");
->a : typeof m1
+>a : a
 
 export = a;
->a : typeof m1
+>a : typeof a
 
 === tests/cases/compiler/declFileExportImportChain2_c.ts ===
 export import b = require("declFileExportImportChain2_b");
->b : typeof m1
+>b : b
 
diff --git a/tests/baselines/reference/declFileForExportedImport.types b/tests/baselines/reference/declFileForExportedImport.types
index 95224208188..6f56ad27f04 100644
--- a/tests/baselines/reference/declFileForExportedImport.types
+++ b/tests/baselines/reference/declFileForExportedImport.types
@@ -1,22 +1,22 @@
 === tests/cases/compiler/declFileForExportedImport_1.ts ===
 ///<reference path='declFileForExportedImport_0.ts'/>
 export import a = require('declFileForExportedImport_0');
->a : typeof "tests/cases/compiler/declFileForExportedImport_0"
+>a : a
 
 var y = a.x;
 >y : number
 >a.x : number
->a : typeof "tests/cases/compiler/declFileForExportedImport_0"
+>a : typeof a
 >x : number
 
 export import b = a;
->b : typeof "tests/cases/compiler/declFileForExportedImport_0"
->a : typeof "tests/cases/compiler/declFileForExportedImport_0"
+>b : b
+>a : typeof a
 
 var z = b.x;
 >z : number
 >b.x : number
->b : typeof "tests/cases/compiler/declFileForExportedImport_0"
+>b : typeof a
 >x : number
 
 === tests/cases/compiler/declFileForExportedImport_0.ts ===
diff --git a/tests/baselines/reference/declFileGenericType.types b/tests/baselines/reference/declFileGenericType.types
index aaf5d5bf634..28d52e0040c 100644
--- a/tests/baselines/reference/declFileGenericType.types
+++ b/tests/baselines/reference/declFileGenericType.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/declFileGenericType.ts ===
 export module C {
->C : typeof C
+>C : C
 
     export class A<T>{ }
 >A : A<T>
@@ -44,7 +44,7 @@ export module C {
 >B : B
 >x : T
 >T : T
->Array : T[]
+>Array : Array<T>
 >C : C
 >A : A<T>
 >C : C
@@ -76,92 +76,92 @@ export module C {
 }
 
 export var a: C.A<C.B>;
->a : A<B>
+>a : C.A<C.B>
 >C : C
->A : A<T>
+>A : C.A<T>
 >C : C
->B : B
+>B : C.B
 
 export var b = C.F;
->b : typeof F
->C.F : typeof F
+>b : typeof C.F
+>C.F : typeof C.F
 >C : typeof C
->F : typeof F
+>F : typeof C.F
 
 export var c = C.F2;
->c : typeof F2
->C.F2 : typeof F2
+>c : typeof C.F2
+>C.F2 : typeof C.F2
 >C : typeof C
->F2 : typeof F2
+>F2 : typeof C.F2
 
 export var d = C.F3;
->d : typeof F3
->C.F3 : typeof F3
+>d : typeof C.F3
+>C.F3 : typeof C.F3
 >C : typeof C
->F3 : typeof F3
+>F3 : typeof C.F3
 
 export var e = C.F4;
->e : typeof F4
->C.F4 : typeof F4
+>e : typeof C.F4
+>C.F4 : typeof C.F4
 >C : typeof C
->F4 : typeof F4
+>F4 : typeof C.F4
 
 export var x = (new C.D<C.A<C.B>>(new C.A<C.B>())).val;
->x : A<B>
->(new C.D<C.A<C.B>>(new C.A<C.B>())).val : A<B>
->(new C.D<C.A<C.B>>(new C.A<C.B>())) : D<A<B>>
->new C.D<C.A<C.B>>(new C.A<C.B>()) : D<A<B>>
->C.D : typeof D
+>x : C.A<C.B>
+>(new C.D<C.A<C.B>>(new C.A<C.B>())).val : C.A<C.B>
+>(new C.D<C.A<C.B>>(new C.A<C.B>())) : C.D<C.A<C.B>>
+>new C.D<C.A<C.B>>(new C.A<C.B>()) : C.D<C.A<C.B>>
+>C.D : typeof C.D
 >C : typeof C
->D : typeof D
+>D : typeof C.D
 >C : C
->A : A<T>
+>A : C.A<T>
 >C : C
->B : B
->new C.A<C.B>() : A<B>
->C.A : typeof A
+>B : C.B
+>new C.A<C.B>() : C.A<C.B>
+>C.A : typeof C.A
 >C : typeof C
->A : typeof A
+>A : typeof C.A
 >C : C
->B : B
->val : A<B>
+>B : C.B
+>val : C.A<C.B>
 
 export function f<T extends C.A<C.B>>() { }
 >f : typeof f
 >T : T
 >C : C
->A : A<T>
+>A : C.A<T>
 >C : C
->B : B
+>B : C.B
 
 export var g = C.F5<C.A<C.B>>();
->g : A<B>
->C.F5<C.A<C.B>>() : A<B>
->C.F5 : typeof F5
+>g : C.A<C.B>
+>C.F5<C.A<C.B>>() : C.A<C.B>
+>C.F5 : typeof C.F5
 >C : typeof C
->F5 : typeof F5
+>F5 : typeof C.F5
 >C : C
->A : A<T>
+>A : C.A<T>
 >C : C
->B : B
+>B : C.B
 
 export class h extends C.A<C.B>{ }
 >h : h
 >C : C
->A : A<T>
+>A : C.A<T>
 >C : C
->B : B
+>B : C.B
 
 export interface i extends C.A<C.B> { }
 >i : i
 >C : C
->A : A<T>
+>A : C.A<T>
 >C : C
->B : B
+>B : C.B
 
 export var j = C.F6;
->j : typeof F6
->C.F6 : typeof F6
+>j : typeof C.F6
+>C.F6 : typeof C.F6
 >C : typeof C
->F6 : typeof F6
+>F6 : typeof C.F6
 
diff --git a/tests/baselines/reference/declFileGenericType2.types b/tests/baselines/reference/declFileGenericType2.types
index bc68a41dc1b..14125855b36 100644
--- a/tests/baselines/reference/declFileGenericType2.types
+++ b/tests/baselines/reference/declFileGenericType2.types
@@ -1,16 +1,16 @@
 === tests/cases/compiler/declFileGenericType2.ts ===
 
 declare module templa.mvc {
->templa : typeof templa
->mvc : typeof mvc
+>templa : templa
+>mvc : mvc
 
     interface IModel {
 >IModel : IModel
     }
 }
 declare module templa.mvc {
->templa : typeof templa
->mvc : typeof mvc
+>templa : templa
+>mvc : mvc
 
     interface IController<ModelType extends templa.mvc.IModel> {
 >IController : IController<ModelType>
@@ -21,8 +21,8 @@ declare module templa.mvc {
     }
 }
 declare module templa.mvc {
->templa : typeof templa
->mvc : typeof mvc
+>templa : templa
+>mvc : mvc
 
     class AbstractController<ModelType extends templa.mvc.IModel> implements mvc.IController<ModelType> {
 >AbstractController : AbstractController<ModelType>
@@ -36,8 +36,8 @@ declare module templa.mvc {
     }
 }
 declare module templa.mvc.composite {
->templa : typeof templa
->mvc : typeof mvc
+>templa : templa
+>mvc : mvc
 >composite : composite
 
     interface ICompositeControllerModel extends mvc.IModel {
@@ -54,37 +54,37 @@ declare module templa.mvc.composite {
     }
 }
 module templa.dom.mvc {
->templa : typeof templa
->dom : typeof dom
->mvc : typeof mvc
+>templa : templa
+>dom : dom
+>mvc : mvc
 
     export interface IElementController<ModelType extends templa.mvc.IModel> extends templa.mvc.IController<ModelType> {
 >IElementController : IElementController<ModelType>
 >ModelType : ModelType
 >templa : templa
->mvc : mvc
->IModel : IModel
+>mvc : templa.mvc
+>IModel : templa.mvc.IModel
 >templa : templa
->mvc : mvc
->IController : IController<ModelType>
+>mvc : templa.mvc
+>IController : templa.mvc.IController<ModelType>
 >ModelType : ModelType
     }
 }
 // Module
 module templa.dom.mvc {
->templa : typeof templa
->dom : typeof dom
->mvc : typeof mvc
+>templa : templa
+>dom : dom
+>mvc : mvc
 
     export class AbstractElementController<ModelType extends templa.mvc.IModel> extends templa.mvc.AbstractController<ModelType> implements IElementController<ModelType> {
 >AbstractElementController : AbstractElementController<ModelType>
 >ModelType : ModelType
 >templa : templa
->mvc : mvc
->IModel : IModel
+>mvc : templa.mvc
+>IModel : templa.mvc.IModel
 >templa : templa
->mvc : mvc
->AbstractController : AbstractController<ModelType>
+>mvc : templa.mvc
+>AbstractController : templa.mvc.AbstractController<ModelType>
 >ModelType : ModelType
 >IElementController : IElementController<ModelType>
 >ModelType : ModelType
@@ -97,18 +97,18 @@ module templa.dom.mvc {
 }
 // Module
 module templa.dom.mvc.composite {
->templa : typeof templa
->dom : typeof dom
->mvc : typeof mvc
->composite : typeof composite
+>templa : templa
+>dom : dom
+>mvc : mvc
+>composite : composite
 
     export class AbstractCompositeElementController<ModelType extends templa.mvc.composite.ICompositeControllerModel> extends templa.dom.mvc.AbstractElementController<ModelType> {
 >AbstractCompositeElementController : AbstractCompositeElementController<ModelType>
 >ModelType : ModelType
 >templa : templa
->mvc : mvc
->composite : composite
->ICompositeControllerModel : ICompositeControllerModel
+>mvc : templa.mvc
+>composite : templa.mvc.composite
+>ICompositeControllerModel : templa.mvc.composite.ICompositeControllerModel
 >templa : templa
 >dom : dom
 >mvc : mvc
@@ -116,24 +116,24 @@ module templa.dom.mvc.composite {
 >ModelType : ModelType
 
         public _controllers: templa.mvc.IController<templa.mvc.IModel>[];
->_controllers : IController<IModel>[]
+>_controllers : templa.mvc.IController<templa.mvc.IModel>[]
 >templa : templa
->mvc : mvc
->IController : IController<ModelType>
+>mvc : templa.mvc
+>IController : templa.mvc.IController<ModelType>
 >templa : templa
->mvc : mvc
->IModel : IModel
+>mvc : templa.mvc
+>IModel : templa.mvc.IModel
 
         constructor() {
             super();
 >super() : void
 
             this._controllers = [];
->this._controllers = [] : IController<IModel>[]
->this._controllers : IController<IModel>[]
+>this._controllers = [] : templa.mvc.IController<templa.mvc.IModel>[]
+>this._controllers : templa.mvc.IController<templa.mvc.IModel>[]
 >this : AbstractCompositeElementController<ModelType>
->_controllers : IController<IModel>[]
->[] : IController<IModel>[]
+>_controllers : templa.mvc.IController<templa.mvc.IModel>[]
+>[] : templa.mvc.IController<templa.mvc.IModel>[]
         }
     }
 }
diff --git a/tests/baselines/reference/declFileImportModuleWithExportAssignment.types b/tests/baselines/reference/declFileImportModuleWithExportAssignment.types
index 328760ed096..1d449325126 100644
--- a/tests/baselines/reference/declFileImportModuleWithExportAssignment.types
+++ b/tests/baselines/reference/declFileImportModuleWithExportAssignment.types
@@ -1,22 +1,22 @@
 === tests/cases/compiler/declFileImportModuleWithExportAssignment_1.ts ===
 /**This is on import declaration*/
 import a1 = require("declFileImportModuleWithExportAssignment_0");
->a1 : { (): connectExport; test1: connectModule; test2(): connectModule; }
+>a1 : a1
 
 export var a = a1;
->a : { (): connectExport; test1: connectModule; test2(): connectModule; }
->a1 : { (): connectExport; test1: connectModule; test2(): connectModule; }
+>a : { (): a1.connectExport; test1: a1.connectModule; test2(): a1.connectModule; }
+>a1 : { (): a1.connectExport; test1: a1.connectModule; test2(): a1.connectModule; }
 
 a.test1(null, null, null);
 >a.test1(null, null, null) : void
->a.test1 : connectModule
->a : { (): connectExport; test1: connectModule; test2(): connectModule; }
->test1 : connectModule
+>a.test1 : a1.connectModule
+>a : { (): a1.connectExport; test1: a1.connectModule; test2(): a1.connectModule; }
+>test1 : a1.connectModule
 
 === tests/cases/compiler/declFileImportModuleWithExportAssignment_0.ts ===
 
 module m2 {
->m2 : { (): connectExport; test1: connectModule; test2(): connectModule; }
+>m2 : m2
 
     export interface connectModule {
 >connectModule : connectModule
@@ -42,23 +42,23 @@ module m2 {
 
 }
 var m2: {
->m2 : { (): connectExport; test1: connectModule; test2(): connectModule; }
+>m2 : { (): m2.connectExport; test1: m2.connectModule; test2(): m2.connectModule; }
 
     (): m2.connectExport;
 >m2 : m2
->connectExport : connectExport
+>connectExport : m2.connectExport
 
     test1: m2.connectModule;
->test1 : connectModule
+>test1 : m2.connectModule
 >m2 : m2
->connectModule : connectModule
+>connectModule : m2.connectModule
 
     test2(): m2.connectModule;
->test2 : () => connectModule
+>test2 : () => m2.connectModule
 >m2 : m2
->connectModule : connectModule
+>connectModule : m2.connectModule
 
 };
 export = m2;
->m2 : { (): connectExport; test1: connectModule; test2(): connectModule; }
+>m2 : { (): m2.connectExport; test1: m2.connectModule; test2(): m2.connectModule; }
 
diff --git a/tests/baselines/reference/declFileImportedTypeUseInTypeArgPosition.types b/tests/baselines/reference/declFileImportedTypeUseInTypeArgPosition.types
index f7cc171ed94..2cb6d918ec3 100644
--- a/tests/baselines/reference/declFileImportedTypeUseInTypeArgPosition.types
+++ b/tests/baselines/reference/declFileImportedTypeUseInTypeArgPosition.types
@@ -11,13 +11,13 @@ declare module 'mod1' {
 
 declare module 'moo' {
     import x = require('mod1');
->x : typeof 'mod1'
+>x : x
 
     export var p: List<x.Foo>;
->p : List<Foo>
+>p : List<x.Foo>
 >List : List<T>
 >x : x
->Foo : Foo
+>Foo : x.Foo
 }
 
 
diff --git a/tests/baselines/reference/declFileInternalAliases.types b/tests/baselines/reference/declFileInternalAliases.types
index 379d70be53d..79c39444079 100644
--- a/tests/baselines/reference/declFileInternalAliases.types
+++ b/tests/baselines/reference/declFileInternalAliases.types
@@ -1,34 +1,34 @@
 === tests/cases/compiler/declFileInternalAliases.ts ===
 module m {
->m : typeof m
+>m : m
 
     export class c {
 >c : c
     }
 }
 module m1 {
->m1 : typeof m1
+>m1 : m1
 
     import x = m.c;
->x : typeof c
+>x : x
 >m : typeof m
->c : c
+>c : x
 
     export var d = new x(); // emit the type as m.c
->d : c
->new x() : c
->x : typeof c
+>d : x
+>new x() : x
+>x : typeof x
 }
 module m2 {
->m2 : typeof m2
+>m2 : m2
 
     export import x = m.c;
->x : typeof c
+>x : x
 >m : typeof m
->c : c
+>c : x
 
     export var d = new x(); // emit the type as x
->d : c
->new x() : c
->x : typeof c
+>d : x
+>new x() : x
+>x : typeof x
 }
diff --git a/tests/baselines/reference/declFileModuleAssignmentInObjectLiteralProperty.types b/tests/baselines/reference/declFileModuleAssignmentInObjectLiteralProperty.types
index 2b3d5d2656d..bfd75dd1d5e 100644
--- a/tests/baselines/reference/declFileModuleAssignmentInObjectLiteralProperty.types
+++ b/tests/baselines/reference/declFileModuleAssignmentInObjectLiteralProperty.types
@@ -1,28 +1,28 @@
 === tests/cases/compiler/declFileModuleAssignmentInObjectLiteralProperty.ts ===
 
 module m1 {
->m1 : typeof m1
+>m1 : m1
 
     export class c {
 >c : c
     }
 }
 var d = {
->d : { m1: { m: typeof m1; }; m2: { c: typeof c; }; }
->{    m1: { m: m1 },    m2: { c: m1.c },} : { m1: { m: typeof m1; }; m2: { c: typeof c; }; }
+>d : { m1: { m: typeof m1; }; m2: { c: typeof m1.c; }; }
+>{    m1: { m: m1 },    m2: { c: m1.c },} : { m1: { m: typeof m1; }; m2: { c: typeof m1.c; }; }
 
     m1: { m: m1 },
 >m1 : { m: typeof m1; }
 >{ m: m1 } : { m: typeof m1; }
 >m : typeof m1
->m1 : m1
+>m1 : typeof m1
 
     m2: { c: m1.c },
->m2 : { c: typeof c; }
->{ c: m1.c } : { c: typeof c; }
->c : typeof c
->m1.c : typeof c
+>m2 : { c: typeof m1.c; }
+>{ c: m1.c } : { c: typeof m1.c; }
+>c : typeof m1.c
+>m1.c : typeof m1.c
 >m1 : typeof m1
->c : typeof c
+>c : typeof m1.c
 
 };
diff --git a/tests/baselines/reference/declFileModuleContinuation.types b/tests/baselines/reference/declFileModuleContinuation.types
index 06eb82a1933..e05bd8a5235 100644
--- a/tests/baselines/reference/declFileModuleContinuation.types
+++ b/tests/baselines/reference/declFileModuleContinuation.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/declFileModuleContinuation.ts ===
 module A.C {
->A : typeof A
+>A : A
 >C : C
 
     export interface Z {
@@ -9,14 +9,14 @@ module A.C {
 }
 
 module A.B.C {
->A : typeof A
->B : typeof B
->C : typeof C
+>A : A
+>B : B
+>C : C
 
     export class W implements A.C.Z {
 >W : W
 >A : A
->C : C
->Z : Z
+>C : A.C
+>Z : A.C.Z
     }
 }
diff --git a/tests/baselines/reference/declFileModuleWithPropertyOfTypeModule.types b/tests/baselines/reference/declFileModuleWithPropertyOfTypeModule.types
index ecdc4396df4..391fecf9af3 100644
--- a/tests/baselines/reference/declFileModuleWithPropertyOfTypeModule.types
+++ b/tests/baselines/reference/declFileModuleWithPropertyOfTypeModule.types
@@ -1,7 +1,7 @@
 === tests/cases/compiler/declFileModuleWithPropertyOfTypeModule.ts ===
 
 module m {
->m : typeof m
+>m : m
 
     export class c {
 >c : c
diff --git a/tests/baselines/reference/declFileTypeofInAnonymousType.types b/tests/baselines/reference/declFileTypeofInAnonymousType.types
index 1112946a157..40394e20af6 100644
--- a/tests/baselines/reference/declFileTypeofInAnonymousType.types
+++ b/tests/baselines/reference/declFileTypeofInAnonymousType.types
@@ -1,7 +1,7 @@
 === tests/cases/compiler/declFileTypeofInAnonymousType.ts ===
 
 module m1 {
->m1 : typeof m1
+>m1 : m1
 
     export class c {
 >c : c
@@ -20,64 +20,64 @@ module m1 {
     }
 }
 var a: { c: m1.c; };
->a : { c: c; }
->c : c
+>a : { c: m1.c; }
+>c : m1.c
 >m1 : m1
->c : c
+>c : m1.c
 
 var b = {
->b : { c: typeof c; m1: typeof m1; }
->{    c: m1.c,    m1: m1} : { c: typeof c; m1: typeof m1; }
+>b : { c: typeof m1.c; m1: typeof m1; }
+>{    c: m1.c,    m1: m1} : { c: typeof m1.c; m1: typeof m1; }
 
     c: m1.c,
->c : typeof c
->m1.c : typeof c
+>c : typeof m1.c
+>m1.c : typeof m1.c
 >m1 : typeof m1
->c : typeof c
+>c : typeof m1.c
 
     m1: m1
 >m1 : typeof m1
->m1 : m1
+>m1 : typeof m1
 
 };
 var c = { m1: m1 };
 >c : { m1: typeof m1; }
 >{ m1: m1 } : { m1: typeof m1; }
 >m1 : typeof m1
->m1 : m1
+>m1 : typeof m1
 
 var d = {
->d : { m: { mod: typeof m1; }; mc: { cl: typeof c; }; me: { en: typeof e; }; mh: e; }
->{    m: { mod: m1 },    mc: { cl: m1.c },    me: { en: m1.e },    mh: m1.e.holiday} : { m: { mod: typeof m1; }; mc: { cl: typeof c; }; me: { en: typeof e; }; mh: e; }
+>d : { m: { mod: typeof m1; }; mc: { cl: typeof m1.c; }; me: { en: typeof m1.e; }; mh: m1.e; }
+>{    m: { mod: m1 },    mc: { cl: m1.c },    me: { en: m1.e },    mh: m1.e.holiday} : { m: { mod: typeof m1; }; mc: { cl: typeof m1.c; }; me: { en: typeof m1.e; }; mh: m1.e; }
 
     m: { mod: m1 },
 >m : { mod: typeof m1; }
 >{ mod: m1 } : { mod: typeof m1; }
 >mod : typeof m1
->m1 : m1
+>m1 : typeof m1
 
     mc: { cl: m1.c },
->mc : { cl: typeof c; }
->{ cl: m1.c } : { cl: typeof c; }
->cl : typeof c
->m1.c : typeof c
+>mc : { cl: typeof m1.c; }
+>{ cl: m1.c } : { cl: typeof m1.c; }
+>cl : typeof m1.c
+>m1.c : typeof m1.c
 >m1 : typeof m1
->c : typeof c
+>c : typeof m1.c
 
     me: { en: m1.e },
->me : { en: typeof e; }
->{ en: m1.e } : { en: typeof e; }
->en : typeof e
->m1.e : typeof e
+>me : { en: typeof m1.e; }
+>{ en: m1.e } : { en: typeof m1.e; }
+>en : typeof m1.e
+>m1.e : typeof m1.e
 >m1 : typeof m1
->e : typeof e
+>e : typeof m1.e
 
     mh: m1.e.holiday
->mh : e
->m1.e.holiday : e
->m1.e : typeof e
+>mh : m1.e
+>m1.e.holiday : m1.e
+>m1.e : typeof m1.e
 >m1 : typeof m1
->e : typeof e
->holiday : e
+>e : typeof m1.e
+>holiday : m1.e
 
 };
diff --git a/tests/baselines/reference/declFileTypeofModule.types b/tests/baselines/reference/declFileTypeofModule.types
index ef4238bf2c5..4e97ef8662e 100644
--- a/tests/baselines/reference/declFileTypeofModule.types
+++ b/tests/baselines/reference/declFileTypeofModule.types
@@ -1,7 +1,7 @@
 === tests/cases/compiler/declFileTypeofModule.ts ===
 
 module m1 {
->m1 : typeof m1
+>m1 : m1
 
     export var c: string;
 >c : string
@@ -15,7 +15,7 @@ var m1_2: typeof m1;
 >m1 : typeof m1
 
 module m2 {
->m2 : typeof m2
+>m2 : m2
 
     export var d: typeof m2;
 >d : typeof m2
diff --git a/tests/baselines/reference/declFileWithClassNameConflictingWithClassReferredByExtendsClause.types b/tests/baselines/reference/declFileWithClassNameConflictingWithClassReferredByExtendsClause.types
index 4da4b703f5f..675a3ad4483 100644
--- a/tests/baselines/reference/declFileWithClassNameConflictingWithClassReferredByExtendsClause.types
+++ b/tests/baselines/reference/declFileWithClassNameConflictingWithClassReferredByExtendsClause.types
@@ -1,9 +1,9 @@
 === tests/cases/compiler/declFileWithClassNameConflictingWithClassReferredByExtendsClause.ts ===
 
 declare module A.B.Base {
->A : typeof A
->B : typeof B
->Base : typeof Base
+>A : A
+>B : B
+>Base : Base
 
     export class W {
 >W : W
@@ -13,16 +13,16 @@ declare module A.B.Base {
     }
 }
 module X.Y.base {
->X : typeof X
->Y : typeof Y
->base : typeof base
+>X : X
+>Y : Y
+>base : base
 
     export class W extends A.B.Base.W {
 >W : W
 >A : A
->B : B
->Base : Base
->W : W
+>B : A.B
+>Base : A.B.Base
+>W : A.B.Base.W
 
         name: string;
 >name : string
@@ -30,10 +30,10 @@ module X.Y.base {
 }
 
 module X.Y.base.Z {
->X : typeof X
->Y : typeof Y
->base : typeof base
->Z : typeof Z
+>X : X
+>Y : Y
+>base : base
+>Z : Z
 
     export class W<TValue> extends X.Y.base.W {
 >W : W<TValue>
@@ -41,7 +41,7 @@ module X.Y.base.Z {
 >X : X
 >Y : Y
 >base : base
->W : W
+>W : base.W
 
         value: boolean;
 >value : boolean
diff --git a/tests/baselines/reference/declFileWithExtendsClauseThatHasItsContainerNameConflict.types b/tests/baselines/reference/declFileWithExtendsClauseThatHasItsContainerNameConflict.types
index 4dae0d42c53..b42343c3513 100644
--- a/tests/baselines/reference/declFileWithExtendsClauseThatHasItsContainerNameConflict.types
+++ b/tests/baselines/reference/declFileWithExtendsClauseThatHasItsContainerNameConflict.types
@@ -1,9 +1,9 @@
 === tests/cases/compiler/declFileWithExtendsClauseThatHasItsContainerNameConflict.ts ===
 
 declare module A.B.C {
->A : typeof A
->B : typeof B
->C : typeof C
+>A : A
+>B : B
+>C : C
 
     class B {
 >B : B
@@ -11,8 +11,8 @@ declare module A.B.C {
 }
 
 module A.B {
->A : typeof A
->B : typeof B
+>A : A
+>B : B
 
     export class EventManager {
 >EventManager : EventManager
@@ -24,9 +24,9 @@ module A.B {
 }
 
 module A.B.C {
->A : typeof A
->B : typeof B
->C : typeof C
+>A : A
+>B : B
+>C : C
 
     export class ContextMenu extends EventManager {
 >ContextMenu : ContextMenu
diff --git a/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause1.types b/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause1.types
index 3f0c7d37e58..eb106a2d711 100644
--- a/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause1.types
+++ b/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause1.types
@@ -1,8 +1,8 @@
 === tests/cases/compiler/declFileWithInternalModuleNameConflictsInExtendsClause1.ts ===
 
 module X.A.C {
->X : typeof X
->A : typeof A
+>X : X
+>A : A
 >C : C
 
     export interface Z {
@@ -10,10 +10,10 @@ module X.A.C {
     }
 }
 module X.A.B.C {
->X : typeof X
->A : typeof A
->B : typeof B
->C : typeof C
+>X : X
+>A : A
+>B : B
+>C : C
 
     module A {
 >A : A
@@ -21,8 +21,8 @@ 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 : X
->A : A
->C : C
->Z : Z
+>A : X.A
+>C : X.A.C
+>Z : X.A.C.Z
     }
 }
diff --git a/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause2.types b/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause2.types
index 8041383332c..da3c3791047 100644
--- a/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause2.types
+++ b/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause2.types
@@ -1,8 +1,8 @@
 === tests/cases/compiler/declFileWithInternalModuleNameConflictsInExtendsClause2.ts ===
 
 module X.A.C {
->X : typeof X
->A : typeof A
+>X : X
+>A : A
 >C : C
 
     export interface Z {
@@ -10,24 +10,24 @@ module X.A.C {
     }
 }
 module X.A.B.C {
->X : typeof X
->A : typeof A
->B : typeof B
->C : typeof C
+>X : X
+>A : A
+>B : B
+>C : C
 
     export class W implements A.C.Z { // This can refer to it as A.C.Z
 >W : W
 >A : A
->C : C
->Z : Z
+>C : A.C
+>Z : A.C.Z
     }
 }
 
 module X.A.B.C {
->X : typeof X
->A : typeof A
->B : typeof B
->C : typeof C
+>X : X
+>A : A
+>B : B
+>C : C
 
     module A {
 >A : A
diff --git a/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause3.types b/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause3.types
index 023f4d81465..e74930a08a8 100644
--- a/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause3.types
+++ b/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause3.types
@@ -1,8 +1,8 @@
 === tests/cases/compiler/declFileWithInternalModuleNameConflictsInExtendsClause3.ts ===
 
 module X.A.C {
->X : typeof X
->A : typeof A
+>X : X
+>A : A
 >C : C
 
     export interface Z {
@@ -10,25 +10,25 @@ module X.A.C {
     }
 }
 module X.A.B.C {
->X : typeof X
->A : typeof A
->B : typeof B
->C : typeof C
+>X : X
+>A : A
+>B : B
+>C : 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 : X
->A : A
->C : C
->Z : Z
+>A : X.A
+>C : X.A.C
+>Z : X.A.C.Z
     }
 }
 
 module X.A.B.C {
->X : typeof X
->A : typeof A
->B : typeof B
->C : typeof C
+>X : X
+>A : A
+>B : B
+>C : C
 
     export module A {
 >A : A
diff --git a/tests/baselines/reference/declInput4.types b/tests/baselines/reference/declInput4.types
index 7f5c5a81197..91400cca694 100644
--- a/tests/baselines/reference/declInput4.types
+++ b/tests/baselines/reference/declInput4.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/declInput4.ts ===
 module M {
->M : typeof M
+>M : M
 
     class C { }
 >C : C
diff --git a/tests/baselines/reference/declarationEmit_array-types-from-generic-array-usage.types b/tests/baselines/reference/declarationEmit_array-types-from-generic-array-usage.types
index 63f35d0f263..5fd5c5c62ac 100644
--- a/tests/baselines/reference/declarationEmit_array-types-from-generic-array-usage.types
+++ b/tests/baselines/reference/declarationEmit_array-types-from-generic-array-usage.types
@@ -1,5 +1,5 @@
 === tests/cases/compiler/declarationEmit_array-types-from-generic-array-usage.ts ===
 interface A extends Array<string> { }
 >A : A
->Array : T[]
+>Array : Array<T>
 
diff --git a/tests/baselines/reference/declarationEmit_nameConflicts2.js b/tests/baselines/reference/declarationEmit_nameConflicts2.js
index b60514e8076..ed5d7c48690 100644
--- a/tests/baselines/reference/declarationEmit_nameConflicts2.js
+++ b/tests/baselines/reference/declarationEmit_nameConflicts2.js
@@ -47,6 +47,7 @@ var X;
     (function (Y) {
         (function (base) {
             (function (Z) {
+                // Bug 887180
                 Z.f = X.Y.base.f; // Should be base.f
                 Z.C = X.Y.base.C; // Should be base.C
                 Z.M = X.Y.base.M; // Should be base.M
diff --git a/tests/baselines/reference/declarationEmit_nameConflicts2.types b/tests/baselines/reference/declarationEmit_nameConflicts2.types
index 9daf65b530a..c4bc7104312 100644
--- a/tests/baselines/reference/declarationEmit_nameConflicts2.types
+++ b/tests/baselines/reference/declarationEmit_nameConflicts2.types
@@ -1,8 +1,8 @@
 === tests/cases/compiler/declarationEmit_nameConflicts2.ts ===
 module X.Y.base {
->X : typeof X
->Y : typeof Y
->base : typeof base
+>X : X
+>Y : Y
+>base : base
 
     export function f() { }
 >f : typeof f
@@ -11,7 +11,7 @@ module X.Y.base {
 >C : C
 
     export module M {
->M : typeof M
+>M : M
 
         export var v;
 >v : any
@@ -21,49 +21,49 @@ module X.Y.base {
 }
 
 module X.Y.base.Z {
->X : typeof X
->Y : typeof Y
->base : typeof base
->Z : typeof Z
+>X : X
+>Y : Y
+>base : base
+>Z : Z
 
     // Bug 887180
     export var f = X.Y.base.f; // Should be base.f
->f : typeof f
->X.Y.base.f : typeof f
+>f : typeof base.f
+>X.Y.base.f : typeof base.f
 >X.Y.base : typeof base
 >X.Y : typeof Y
 >X : typeof X
 >Y : typeof Y
 >base : typeof base
->f : typeof f
+>f : typeof base.f
 
     export var C = X.Y.base.C; // Should be base.C
->C : typeof C
->X.Y.base.C : typeof C
+>C : typeof base.C
+>X.Y.base.C : typeof base.C
 >X.Y.base : typeof base
 >X.Y : typeof Y
 >X : typeof X
 >Y : typeof Y
 >base : typeof base
->C : typeof C
+>C : typeof base.C
 
     export var M = X.Y.base.M; // Should be base.M
->M : typeof M
->X.Y.base.M : typeof M
+>M : typeof base.M
+>X.Y.base.M : typeof base.M
 >X.Y.base : typeof base
 >X.Y : typeof Y
 >X : typeof X
 >Y : typeof Y
 >base : typeof base
->M : typeof M
+>M : typeof base.M
 
     export var E = X.Y.base.E; // Should be base.E
->E : typeof E
->X.Y.base.E : typeof E
+>E : typeof base.E
+>X.Y.base.E : typeof base.E
 >X.Y.base : typeof base
 >X.Y : typeof Y
 >X : typeof X
 >Y : typeof Y
 >base : typeof base
->E : typeof E
+>E : typeof base.E
 }
diff --git a/tests/baselines/reference/declarationEmit_nameConflicts3.js b/tests/baselines/reference/declarationEmit_nameConflicts3.js
index e4d4feddc99..a37b8cd7358 100644
--- a/tests/baselines/reference/declarationEmit_nameConflicts3.js
+++ b/tests/baselines/reference/declarationEmit_nameConflicts3.js
@@ -78,6 +78,7 @@ var M;
             D[D["f"] = 0] = "f";
         })(P.D || (P.D = {}));
         var D = P.D;
+        // Bug 887180
         P.v; // ok
         P.w = M.D.f; // error, should be typeof M.D.f
         P.x = M.C.f; // error, should be typeof M.C.f
diff --git a/tests/baselines/reference/declarationEmit_nameConflicts3.types b/tests/baselines/reference/declarationEmit_nameConflicts3.types
index 1021b10f79f..d0e8fae1cb3 100644
--- a/tests/baselines/reference/declarationEmit_nameConflicts3.types
+++ b/tests/baselines/reference/declarationEmit_nameConflicts3.types
@@ -1,24 +1,24 @@
 === tests/cases/compiler/declarationEmit_nameConflicts3.ts ===
 module M {
->M : typeof M
+>M : M
 
     export interface D { }
 >D : D
 
     export module D {
->D : typeof D
+>D : D
 
         export function f() { }
 >f : typeof f
     }
     export module C {
->C : typeof C
+>C : C
 
         export function f() { }
 >f : typeof f
     }
     export module E {
->E : typeof E
+>E : E
 
         export function f() { }
 >f : typeof f
@@ -26,14 +26,14 @@ module M {
 }
 
 module M.P {
->M : typeof M
->P : typeof P
+>M : M
+>P : P
 
     export class C {
 >C : C
 
         static f() { }
->f : typeof f
+>f : () => void
     }
     export class E extends C { }
 >E : E
@@ -47,31 +47,31 @@ module M.P {
     }
     // Bug 887180
     export var v: M.D; // ok
->v : D
+>v : M.D
 >M : M
->D : D
+>D : M.D
 
     export var w = M.D.f; // error, should be typeof M.D.f
->w : typeof f
->M.D.f : typeof f
->M.D : typeof D
+>w : typeof M.D.f
+>M.D.f : typeof M.D.f
+>M.D : typeof M.D
 >M : typeof M
->D : typeof D
->f : typeof f
+>D : typeof M.D
+>f : typeof M.D.f
 
     export var x = M.C.f; // error, should be typeof M.C.f
->x : typeof f
->M.C.f : typeof f
->M.C : typeof C
+>x : typeof M.C.f
+>M.C.f : typeof M.C.f
+>M.C : typeof M.C
 >M : typeof M
->C : typeof C
->f : typeof f
+>C : typeof M.C
+>f : typeof M.C.f
 
     export var x = M.E.f; // error, should be typeof M.E.f
->x : typeof f
->M.E.f : typeof f
->M.E : typeof E
+>x : typeof M.C.f
+>M.E.f : typeof M.E.f
+>M.E : typeof M.E
 >M : typeof M
->E : typeof E
->f : typeof f
+>E : typeof M.E
+>f : typeof M.E.f
 }
diff --git a/tests/baselines/reference/declareDottedExtend.types b/tests/baselines/reference/declareDottedExtend.types
index 31f4fe01622..82fbabe9666 100644
--- a/tests/baselines/reference/declareDottedExtend.types
+++ b/tests/baselines/reference/declareDottedExtend.types
@@ -1,25 +1,25 @@
 === tests/cases/compiler/declareDottedExtend.ts ===
 declare module A.B
->A : typeof A
->B : typeof B
+>A : A
+>B : B
 {
     export class C{ }
 >C : C
 }
 
 import ab = A.B;
->ab : typeof B
+>ab : ab
 >A : typeof A
->B : typeof B
+>B : typeof ab
 
 class D extends ab.C{ }
 >D : D
 >ab : ab
->C : C
+>C : ab.C
 
 class E extends A.B.C{ }
 >E : E
 >A : A
->B : B
->C : C
+>B : ab
+>C : ab.C
 
diff --git a/tests/baselines/reference/declareExternalModuleWithExportAssignedFundule.types b/tests/baselines/reference/declareExternalModuleWithExportAssignedFundule.types
index f9f1211c2a7..ea37ecb77b7 100644
--- a/tests/baselines/reference/declareExternalModuleWithExportAssignedFundule.types
+++ b/tests/baselines/reference/declareExternalModuleWithExportAssignedFundule.types
@@ -7,10 +7,10 @@ declare module "express" {
     function express(): express.ExpressServer;
 >express : typeof express
 >express : express
->ExpressServer : ExpressServer
+>ExpressServer : express.ExpressServer
 
     module express {
->express : typeof express
+>express : express
 
         export interface ExpressServer {
 >ExpressServer : ExpressServer
diff --git a/tests/baselines/reference/declareFileExportAssignment.types b/tests/baselines/reference/declareFileExportAssignment.types
index 613a4cc2071..d7c43d04b1a 100644
--- a/tests/baselines/reference/declareFileExportAssignment.types
+++ b/tests/baselines/reference/declareFileExportAssignment.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/declareFileExportAssignment.ts ===
 module m2 {
->m2 : { (): connectExport; test1: connectModule; test2(): connectModule; }
+>m2 : m2
 
     export interface connectModule {
 >connectModule : connectModule
@@ -27,24 +27,24 @@ module m2 {
 }
 
 var m2: {
->m2 : { (): connectExport; test1: connectModule; test2(): connectModule; }
+>m2 : { (): m2.connectExport; test1: m2.connectModule; test2(): m2.connectModule; }
 
     (): m2.connectExport;
 >m2 : m2
->connectExport : connectExport
+>connectExport : m2.connectExport
 
     test1: m2.connectModule;
->test1 : connectModule
+>test1 : m2.connectModule
 >m2 : m2
->connectModule : connectModule
+>connectModule : m2.connectModule
 
     test2(): m2.connectModule;
->test2 : () => connectModule
+>test2 : () => m2.connectModule
 >m2 : m2
->connectModule : connectModule
+>connectModule : m2.connectModule
 
 };
 
 export = m2;
->m2 : { (): connectExport; test1: connectModule; test2(): connectModule; }
+>m2 : { (): m2.connectExport; test1: m2.connectModule; test2(): m2.connectModule; }
 
diff --git a/tests/baselines/reference/decrementOperatorWithAnyOtherType.types b/tests/baselines/reference/decrementOperatorWithAnyOtherType.types
index 1a4aea0d507..3661081addc 100644
--- a/tests/baselines/reference/decrementOperatorWithAnyOtherType.types
+++ b/tests/baselines/reference/decrementOperatorWithAnyOtherType.types
@@ -24,7 +24,7 @@ class A {
 >a : any
 }
 module M {
->M : typeof M
+>M : M
 
     export var n: any;
 >n : any
diff --git a/tests/baselines/reference/decrementOperatorWithNumberType.types b/tests/baselines/reference/decrementOperatorWithNumberType.types
index d619db84e46..6b4c1a7353a 100644
--- a/tests/baselines/reference/decrementOperatorWithNumberType.types
+++ b/tests/baselines/reference/decrementOperatorWithNumberType.types
@@ -14,7 +14,7 @@ class A {
 >a : number
 }
 module M {
->M : typeof M
+>M : M
 
     export var n: number;
 >n : number
diff --git a/tests/baselines/reference/deleteOperatorWithBooleanType.types b/tests/baselines/reference/deleteOperatorWithBooleanType.types
index eb5d657fcee..0dae2b5fe03 100644
--- a/tests/baselines/reference/deleteOperatorWithBooleanType.types
+++ b/tests/baselines/reference/deleteOperatorWithBooleanType.types
@@ -13,10 +13,10 @@ class A {
 >a : boolean
 
     static foo() { return false; }
->foo : typeof foo
+>foo : () => boolean
 }
 module M {
->M : typeof M
+>M : M
 
     export var n: boolean;
 >n : boolean
@@ -70,9 +70,9 @@ var ResultIsBoolean7 = delete A.foo();
 >ResultIsBoolean7 : boolean
 >delete A.foo() : boolean
 >A.foo() : boolean
->A.foo : typeof foo
+>A.foo : () => boolean
 >A : typeof A
->foo : typeof foo
+>foo : () => boolean
 
 // multiple delete  operator
 var ResultIsBoolean8 = delete delete BOOLEAN;
diff --git a/tests/baselines/reference/deleteOperatorWithNumberType.types b/tests/baselines/reference/deleteOperatorWithNumberType.types
index f367ef438b0..afcf35fa6cf 100644
--- a/tests/baselines/reference/deleteOperatorWithNumberType.types
+++ b/tests/baselines/reference/deleteOperatorWithNumberType.types
@@ -17,10 +17,10 @@ class A {
 >a : number
 
     static foo() { return 1; }
->foo : typeof foo
+>foo : () => number
 }
 module M {
->M : typeof M
+>M : M
 
     export var n: number;
 >n : number
@@ -95,9 +95,9 @@ var ResultIsBoolean10 = delete A.foo();
 >ResultIsBoolean10 : boolean
 >delete A.foo() : boolean
 >A.foo() : number
->A.foo : typeof foo
+>A.foo : () => number
 >A : typeof A
->foo : typeof foo
+>foo : () => number
 
 var ResultIsBoolean11 = delete (NUMBER + NUMBER);
 >ResultIsBoolean11 : boolean
diff --git a/tests/baselines/reference/deleteOperatorWithStringType.types b/tests/baselines/reference/deleteOperatorWithStringType.types
index 17d0a77aa56..e66ca51a063 100644
--- a/tests/baselines/reference/deleteOperatorWithStringType.types
+++ b/tests/baselines/reference/deleteOperatorWithStringType.types
@@ -17,10 +17,10 @@ class A {
 >a : string
 
     static foo() { return ""; }
->foo : typeof foo
+>foo : () => string
 }
 module M {
->M : typeof M
+>M : M
 
     export var n: string;
 >n : string
@@ -95,9 +95,9 @@ var ResultIsBoolean10 = delete A.foo();
 >ResultIsBoolean10 : boolean
 >delete A.foo() : boolean
 >A.foo() : string
->A.foo : typeof foo
+>A.foo : () => string
 >A : typeof A
->foo : typeof foo
+>foo : () => string
 
 var ResultIsBoolean11 = delete (STRING + STRING);
 >ResultIsBoolean11 : boolean
diff --git a/tests/baselines/reference/dependencyViaImportAlias.types b/tests/baselines/reference/dependencyViaImportAlias.types
index 3fb8773aab5..fee925cf66f 100644
--- a/tests/baselines/reference/dependencyViaImportAlias.types
+++ b/tests/baselines/reference/dependencyViaImportAlias.types
@@ -1,14 +1,14 @@
 === tests/cases/compiler/B.ts ===
 import a = require('A');
->a : typeof "tests/cases/compiler/A"
+>a : a
 
 import A = a.A;
->A : typeof A
->a : typeof "tests/cases/compiler/A"
 >A : A
+>a : typeof a
+>A : a.A
 
 export = A;
->A : A
+>A : a.A
 
 === tests/cases/compiler/A.ts ===
 export class A {
diff --git a/tests/baselines/reference/dottedModuleName2.types b/tests/baselines/reference/dottedModuleName2.types
index 350cb7401ec..db0b7fd0143 100644
--- a/tests/baselines/reference/dottedModuleName2.types
+++ b/tests/baselines/reference/dottedModuleName2.types
@@ -1,7 +1,7 @@
 === tests/cases/compiler/dottedModuleName2.ts ===
 module A.B {
->A : typeof A
->B : typeof B
+>A : A
+>B : B
  
   export var x = 1;
 >x : number
@@ -11,8 +11,8 @@ module A.B {
  
  
 module AA { export module B {
->AA : typeof AA
->B : typeof B
+>AA : AA
+>B : B
  
   export var x = 1;
 >x : number
@@ -24,24 +24,24 @@ module AA { export module B {
 var tmpOK = AA.B.x;
 >tmpOK : number
 >AA.B.x : number
->AA.B : typeof B
+>AA.B : typeof AA.B
 >AA : typeof AA
->B : typeof B
+>B : typeof AA.B
 >x : number
  
 var tmpError = A.B.x;
 >tmpError : number
 >A.B.x : number
->A.B : typeof B
+>A.B : typeof A.B
 >A : typeof A
->B : typeof B
+>B : typeof A.B
 >x : number
 
 
 module A.B.C
->A : typeof A
->B : typeof B
->C : typeof C
+>A : A
+>B : B
+>C : C
  
 {
  
@@ -58,19 +58,19 @@ module M
 {
  
     import X1 = A;
->X1 : typeof A
->A : typeof A
+>X1 : X1
+>A : typeof X1
  
     import X2 = A.B;
->X2 : typeof B
->A : typeof A
->B : typeof B
+>X2 : X2
+>A : typeof X1
+>B : typeof X1.B
  
     import X3 = A.B.C;
->X3 : typeof C
->A : typeof A
->B : typeof B
->C : typeof C
+>X3 : X3
+>A : typeof X1
+>B : typeof X1.B
+>C : typeof X2.C
  
 }
 
diff --git a/tests/baselines/reference/duplicateAnonymousInners1.types b/tests/baselines/reference/duplicateAnonymousInners1.types
index 7c63fb4163b..f175c1ea3f8 100644
--- a/tests/baselines/reference/duplicateAnonymousInners1.types
+++ b/tests/baselines/reference/duplicateAnonymousInners1.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/duplicateAnonymousInners1.ts ===
 module Foo {
->Foo : typeof Foo
+>Foo : Foo
 
     class Helper {
 >Helper : Helper
@@ -18,7 +18,7 @@ module Foo {
 
 
 module Foo {
->Foo : typeof Foo
+>Foo : Foo
     
     // Should not be an error
     class Helper {
diff --git a/tests/baselines/reference/duplicateAnonymousModuleClasses.types b/tests/baselines/reference/duplicateAnonymousModuleClasses.types
index eebe5f721d9..1c3e886dd82 100644
--- a/tests/baselines/reference/duplicateAnonymousModuleClasses.types
+++ b/tests/baselines/reference/duplicateAnonymousModuleClasses.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/duplicateAnonymousModuleClasses.ts ===
 module F {
->F : typeof F
+>F : F
 
     class Helper {
 >Helper : Helper
@@ -11,7 +11,7 @@ module F {
 
 
 module F {
->F : typeof F
+>F : F
     
     // Should not be an error
     class Helper {
@@ -22,7 +22,7 @@ module F {
 }
 
 module Foo {
->Foo : typeof Foo
+>Foo : Foo
 
     class Helper {
 >Helper : Helper
@@ -33,7 +33,7 @@ module Foo {
 
 
 module Foo {
->Foo : typeof Foo
+>Foo : Foo
     
     // Should not be an error
     class Helper {
@@ -44,10 +44,10 @@ module Foo {
 }
 
 module Gar {
->Gar : typeof Gar
+>Gar : Gar
 
     module Foo {
->Foo : typeof Foo
+>Foo : Foo
 
         class Helper {
 >Helper : Helper
@@ -58,7 +58,7 @@ module Gar {
 
 
     module Foo {
->Foo : typeof Foo
+>Foo : Foo
     
         // Should not be an error
         class Helper {
diff --git a/tests/baselines/reference/duplicateOverloadInTypeAugmentation1.types b/tests/baselines/reference/duplicateOverloadInTypeAugmentation1.types
index bc7214eb6b9..5352ef905bb 100644
--- a/tests/baselines/reference/duplicateOverloadInTypeAugmentation1.types
+++ b/tests/baselines/reference/duplicateOverloadInTypeAugmentation1.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/duplicateOverloadInTypeAugmentation1.ts ===
 interface Array<T> {
->Array : T[]
+>Array : Array<T>
 >T : T
 
     reduce(callbackfn: (previousValue: T, currentValue: T, currentIndex: number, array: T[]) => T,
@@ -40,7 +40,7 @@ interface Array<T> {
 }
 var a: Array<string>;
 >a : string[]
->Array : T[]
+>Array : Array<T>
 
 var r5 = a.reduce((x, y) => x + y);
 >r5 : string
diff --git a/tests/baselines/reference/duplicateVariablesByScope.types b/tests/baselines/reference/duplicateVariablesByScope.types
index add12599a83..fe48dfc114d 100644
--- a/tests/baselines/reference/duplicateVariablesByScope.types
+++ b/tests/baselines/reference/duplicateVariablesByScope.types
@@ -2,7 +2,7 @@
 // duplicate local variables are only reported at global scope
 
 module M {
->M : typeof M
+>M : M
 
     for (var j = 0; j < 10; j++) {
 >j : number
diff --git a/tests/baselines/reference/emitMemberAccessExpression.types b/tests/baselines/reference/emitMemberAccessExpression.types
index 9f7c98332e9..7a24930fddb 100644
--- a/tests/baselines/reference/emitMemberAccessExpression.types
+++ b/tests/baselines/reference/emitMemberAccessExpression.types
@@ -5,9 +5,9 @@ declare var OData: any;
 >OData : any
 
 module Microsoft.PeopleAtWork.Model {
->Microsoft : typeof Microsoft
->PeopleAtWork : typeof PeopleAtWork
->Model : typeof Model
+>Microsoft : Microsoft
+>PeopleAtWork : PeopleAtWork
+>Model : Model
 
     export class KnockoutExtentions {
 >KnockoutExtentions : KnockoutExtentions
@@ -21,9 +21,9 @@ No type information for this code.=== tests/cases/compiler/emitMemberAccessExpre
 /// <reference path="emitMemberAccessExpression_file3.ts" />
 "use strict";
 module Microsoft.PeopleAtWork.Model {
->Microsoft : typeof Microsoft
->PeopleAtWork : typeof PeopleAtWork
->Model : typeof Model
+>Microsoft : Microsoft
+>PeopleAtWork : PeopleAtWork
+>Model : Model
 
     export class _Person {
 >_Person : _Person
diff --git a/tests/baselines/reference/enumDecl1.types b/tests/baselines/reference/enumDecl1.types
index 22d2b6b4d69..ef291a89321 100644
--- a/tests/baselines/reference/enumDecl1.types
+++ b/tests/baselines/reference/enumDecl1.types
@@ -1,7 +1,7 @@
 === tests/cases/compiler/enumDecl1.ts ===
 
 declare module mAmbient {
->mAmbient : typeof mAmbient
+>mAmbient : mAmbient
 
     enum e {
 >e : e
diff --git a/tests/baselines/reference/enumFromExternalModule.types b/tests/baselines/reference/enumFromExternalModule.types
index e5aa4444094..ec9d3c23d64 100644
--- a/tests/baselines/reference/enumFromExternalModule.types
+++ b/tests/baselines/reference/enumFromExternalModule.types
@@ -1,15 +1,15 @@
 === tests/cases/compiler/enumFromExternalModule_1.ts ===
 ///<reference path='enumFromExternalModule_0.ts'/>
 import f = require('enumFromExternalModule_0');
->f : typeof "tests/cases/compiler/enumFromExternalModule_0"
+>f : f
 
 var x = f.Mode.Open;
->x : Mode
->f.Mode.Open : Mode
->f.Mode : typeof Mode
->f : typeof "tests/cases/compiler/enumFromExternalModule_0"
->Mode : typeof Mode
->Open : Mode
+>x : f.Mode
+>f.Mode.Open : f.Mode
+>f.Mode : typeof f.Mode
+>f : typeof f
+>Mode : typeof f.Mode
+>Open : f.Mode
 
 === tests/cases/compiler/enumFromExternalModule_0.ts ===
 export enum Mode { Open }
diff --git a/tests/baselines/reference/enumMerging.types b/tests/baselines/reference/enumMerging.types
index da0a30102c7..8018a3fbbd8 100644
--- a/tests/baselines/reference/enumMerging.types
+++ b/tests/baselines/reference/enumMerging.types
@@ -2,7 +2,7 @@
 // Enum with only constant members across 2 declarations with the same root module
 // Enum with initializer in all declarations with constant members with the same root module
 module M1 {
->M1 : typeof M1
+>M1 : M1
 
     enum EImpl1 {
 >EImpl1 : EImpl1
@@ -65,7 +65,7 @@ module M1 {
 
 // Enum with only computed members across 2 declarations with the same root module 
 module M2 {
->M2 : typeof M2
+>M2 : M2
 
     export enum EComp2 {
 >EComp2 : EComp2
@@ -122,7 +122,7 @@ module M2 {
 
 // Enum with initializer in only one of two declarations with constant members with the same root module
 module M3 {
->M3 : typeof M3
+>M3 : M3
 
     enum EInit {
 >EInit : EInit
@@ -146,7 +146,7 @@ module M3 {
 
 // Enums with same name but different root module
 module M4 {
->M4 : typeof M4
+>M4 : M4
 
     export enum Color { Red, Green, Blue }
 >Color : Color
@@ -155,7 +155,7 @@ module M4 {
 >Blue : Color
 }
 module M5 {
->M5 : typeof M5
+>M5 : M5
 
     export enum Color { Red, Green, Blue }
 >Color : Color
@@ -165,8 +165,8 @@ module M5 {
 }
 
 module M6.A {
->M6 : typeof M6
->A : typeof A
+>M6 : M6
+>A : A
 
     export enum Color { Red, Green, Blue }
 >Color : Color
@@ -175,30 +175,30 @@ module M6.A {
 >Blue : Color
 }
 module M6 {
->M6 : typeof M6
+>M6 : M6
 
     export module A {
->A : typeof A
+>A : A
 
         export enum Color { Yellow = 1 }
 >Color : Color
 >Yellow : Color
     }
     var t = A.Color.Yellow;
->t : Color
->A.Color.Yellow : Color
->A.Color : typeof Color
+>t : A.Color
+>A.Color.Yellow : A.Color
+>A.Color : typeof A.Color
 >A : typeof A
->Color : typeof Color
->Yellow : Color
+>Color : typeof A.Color
+>Yellow : A.Color
 
     t = A.Color.Red;
->t = A.Color.Red : Color
->t : Color
->A.Color.Red : Color
->A.Color : typeof Color
+>t = A.Color.Red : A.Color
+>t : A.Color
+>A.Color.Red : A.Color
+>A.Color : typeof A.Color
 >A : typeof A
->Color : typeof Color
->Red : Color
+>Color : typeof A.Color
+>Red : A.Color
 }
 
diff --git a/tests/baselines/reference/enumsWithMultipleDeclarations3.types b/tests/baselines/reference/enumsWithMultipleDeclarations3.types
index 2b761c780e9..a86bd5e481c 100644
--- a/tests/baselines/reference/enumsWithMultipleDeclarations3.types
+++ b/tests/baselines/reference/enumsWithMultipleDeclarations3.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/enumsWithMultipleDeclarations3.ts ===
 module E {
->E : typeof E
+>E : E
 }
 
 enum E {
diff --git a/tests/baselines/reference/es6ClassTest7.types b/tests/baselines/reference/es6ClassTest7.types
index 149fcac9c1e..a36245966e6 100644
--- a/tests/baselines/reference/es6ClassTest7.types
+++ b/tests/baselines/reference/es6ClassTest7.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/es6ClassTest7.ts ===
 declare module M {
->M : typeof M
+>M : M
 
     export class Foo {
 >Foo : Foo
@@ -10,6 +10,6 @@ declare module M {
 class Bar extends M.Foo {
 >Bar : Bar
 >M : M
->Foo : Foo
+>Foo : M.Foo
 }
 
diff --git a/tests/baselines/reference/es6ClassTest8.types b/tests/baselines/reference/es6ClassTest8.types
index ea78670bec5..5d554708103 100644
--- a/tests/baselines/reference/es6ClassTest8.types
+++ b/tests/baselines/reference/es6ClassTest8.types
@@ -32,13 +32,13 @@ class Vector {
 >Vector : Vector
 
     static norm(v:Vector):Vector {return null;}
->norm : typeof norm
+>norm : (v: Vector) => Vector
 >v : Vector
 >Vector : Vector
 >Vector : Vector
 
     static minus(v1:Vector, v2:Vector):Vector {return null;}
->minus : typeof minus
+>minus : (v1: Vector, v2: Vector) => Vector
 >v1 : Vector
 >Vector : Vector
 >v2 : Vector
@@ -46,7 +46,7 @@ class Vector {
 >Vector : Vector
 
     static times(v1:Vector, v2:Vector):Vector {return null;}
->times : typeof times
+>times : (v1: Vector, v2: Vector) => Vector
 >v1 : Vector
 >Vector : Vector
 >v2 : Vector
@@ -54,7 +54,7 @@ class Vector {
 >Vector : Vector
 
     static cross(v1:Vector, v2:Vector):Vector {return null;}
->cross : typeof cross
+>cross : (v1: Vector, v2: Vector) => Vector
 >v1 : Vector
 >Vector : Vector
 >v2 : Vector
@@ -72,7 +72,7 @@ class Vector {
     }
 
     static dot(v1:Vector, v2:Vector):Vector {return null;}    
->dot : typeof dot
+>dot : (v1: Vector, v2: Vector) => Vector
 >v1 : Vector
 >Vector : Vector
 >v2 : Vector
@@ -114,13 +114,13 @@ class Camera {
 >this : Camera
 >forward : Vector
 >Vector.norm(Vector.minus(lookAt,this.pos)) : Vector
->Vector.norm : typeof norm
+>Vector.norm : (v: Vector) => Vector
 >Vector : typeof Vector
->norm : typeof norm
+>norm : (v: Vector) => Vector
 >Vector.minus(lookAt,this.pos) : Vector
->Vector.minus : typeof minus
+>Vector.minus : (v1: Vector, v2: Vector) => Vector
 >Vector : typeof Vector
->minus : typeof minus
+>minus : (v1: Vector, v2: Vector) => Vector
 >lookAt : Vector
 >this.pos : Vector
 >this : Camera
@@ -132,18 +132,18 @@ class Camera {
 >this : Camera
 >right : Vector
 >Vector.times(down, Vector.norm(Vector.cross(this.forward, down))) : Vector
->Vector.times : typeof times
+>Vector.times : (v1: Vector, v2: Vector) => Vector
 >Vector : typeof Vector
->times : typeof times
+>times : (v1: Vector, v2: Vector) => Vector
 >down : Vector
 >Vector.norm(Vector.cross(this.forward, down)) : Vector
->Vector.norm : typeof norm
+>Vector.norm : (v: Vector) => Vector
 >Vector : typeof Vector
->norm : typeof norm
+>norm : (v: Vector) => Vector
 >Vector.cross(this.forward, down) : Vector
->Vector.cross : typeof cross
+>Vector.cross : (v1: Vector, v2: Vector) => Vector
 >Vector : typeof Vector
->cross : typeof cross
+>cross : (v1: Vector, v2: Vector) => Vector
 >this.forward : Vector
 >this : Camera
 >forward : Vector
@@ -155,18 +155,18 @@ class Camera {
 >this : Camera
 >up : Vector
 >Vector.times(down, Vector.norm(Vector.cross(this.forward, this.right))) : Vector
->Vector.times : typeof times
+>Vector.times : (v1: Vector, v2: Vector) => Vector
 >Vector : typeof Vector
->times : typeof times
+>times : (v1: Vector, v2: Vector) => Vector
 >down : Vector
 >Vector.norm(Vector.cross(this.forward, this.right)) : Vector
->Vector.norm : typeof norm
+>Vector.norm : (v: Vector) => Vector
 >Vector : typeof Vector
->norm : typeof norm
+>norm : (v: Vector) => Vector
 >Vector.cross(this.forward, this.right) : Vector
->Vector.cross : typeof cross
+>Vector.cross : (v1: Vector, v2: Vector) => Vector
 >Vector : typeof Vector
->cross : typeof cross
+>cross : (v1: Vector, v2: Vector) => Vector
 >this.forward : Vector
 >this : Camera
 >forward : Vector
diff --git a/tests/baselines/reference/escapedIdentifiers.types b/tests/baselines/reference/escapedIdentifiers.types
index d0b6b1f5c42..ce5d259dbc0 100644
--- a/tests/baselines/reference/escapedIdentifiers.types
+++ b/tests/baselines/reference/escapedIdentifiers.types
@@ -35,13 +35,13 @@ b ++;
 
 // modules
 module moduleType1 { 
->moduleType1 : typeof moduleType1
+>moduleType1 : moduleType1
 
     export var baz1: number;
 >baz1 : number
 }
 module moduleType\u0032 { 
->moduleType\u0032 : typeof moduleType\u0032
+>moduleType\u0032 : moduleType\u0032
 
     export var baz2: number;
 >baz2 : number
diff --git a/tests/baselines/reference/everyTypeWithAnnotationAndInitializer.types b/tests/baselines/reference/everyTypeWithAnnotationAndInitializer.types
index a51aada11a7..53341d35bd8 100644
--- a/tests/baselines/reference/everyTypeWithAnnotationAndInitializer.types
+++ b/tests/baselines/reference/everyTypeWithAnnotationAndInitializer.types
@@ -39,7 +39,7 @@ function F(x: string): number { return 42; }
 >x : string
 
 module M {
->M : typeof M
+>M : M
 
     export class A {
 >A : A
@@ -138,18 +138,18 @@ var aModule: typeof M = M;
 >M : typeof M
 
 var aClassInModule: M.A = new M.A();
->aClassInModule : A
+>aClassInModule : M.A
 >M : M
->A : A
->new M.A() : A
->M.A : typeof A
+>A : M.A
+>new M.A() : M.A
+>M.A : typeof M.A
 >M : typeof M
->A : typeof A
+>A : typeof M.A
 
 var aFunctionInModule: typeof M.F2 = (x) => 'this is a string';
->aFunctionInModule : typeof F2
+>aFunctionInModule : typeof M.F2
 >M : typeof M
->F2 : typeof F2
+>F2 : typeof M.F2
 >(x) => 'this is a string' : (x: number) => string
 >x : number
 
diff --git a/tests/baselines/reference/everyTypeWithInitializer.types b/tests/baselines/reference/everyTypeWithInitializer.types
index 4fdc818e830..a8aa4eacc3e 100644
--- a/tests/baselines/reference/everyTypeWithInitializer.types
+++ b/tests/baselines/reference/everyTypeWithInitializer.types
@@ -39,7 +39,7 @@ function F(x: string): number { return 42; }
 >x : string
 
 module M {
->M : typeof M
+>M : M
 
     export class A {
 >A : A
@@ -116,17 +116,17 @@ var aModule = M;
 >M : typeof M
 
 var aClassInModule = new M.A();
->aClassInModule : A
->new M.A() : A
->M.A : typeof A
+>aClassInModule : M.A
+>new M.A() : M.A
+>M.A : typeof M.A
 >M : typeof M
->A : typeof A
+>A : typeof M.A
 
 var aFunctionInModule = M.F2;
->aFunctionInModule : typeof F2
->M.F2 : typeof F2
+>aFunctionInModule : typeof M.F2
+>M.F2 : typeof M.F2
 >M : typeof M
->F2 : typeof F2
+>F2 : typeof M.F2
 
 // no initializer or annotation, so this is an 'any'
 var x;
diff --git a/tests/baselines/reference/exportAssignClassAndModule.types b/tests/baselines/reference/exportAssignClassAndModule.types
index 97289bc09d6..434c20c7c3d 100644
--- a/tests/baselines/reference/exportAssignClassAndModule.types
+++ b/tests/baselines/reference/exportAssignClassAndModule.types
@@ -1,33 +1,33 @@
 === tests/cases/compiler/exportAssignClassAndModule_1.ts ===
 ///<reference path='exportAssignClassAndModule_0.ts'/>
 import Foo = require('exportAssignClassAndModule_0');
->Foo : typeof Foo
+>Foo : Foo
 
 var z: Foo.Bar;
->z : Bar
+>z : Foo.Bar
 >Foo : Foo
->Bar : Bar
+>Bar : Foo.Bar
 
 var zz: Foo;
 >zz : Foo
 >Foo : Foo
 
 zz.x;
->zz.x : Bar
+>zz.x : Foo.Bar
 >zz : Foo
->x : Bar
+>x : Foo.Bar
 
 === tests/cases/compiler/exportAssignClassAndModule_0.ts ===
 class Foo {
 >Foo : Foo
 
     x: Foo.Bar;
->x : Bar
+>x : Foo.Bar
 >Foo : Foo
->Bar : Bar
+>Bar : Foo.Bar
 }
 module Foo {
->Foo : typeof Foo
+>Foo : Foo
 
     export interface Bar {
 >Bar : Bar
diff --git a/tests/baselines/reference/exportAssignValueAndType.types b/tests/baselines/reference/exportAssignValueAndType.types
index 1d595bf3137..14545a4da0b 100644
--- a/tests/baselines/reference/exportAssignValueAndType.types
+++ b/tests/baselines/reference/exportAssignValueAndType.types
@@ -12,7 +12,7 @@ interface server {
 
     (): http.Server;
 >http : http
->Server : Server
+>Server : http.Server
 
     startTime: Date;
 >startTime : Date
diff --git a/tests/baselines/reference/exportAssignedTypeAsTypeAnnotation.types b/tests/baselines/reference/exportAssignedTypeAsTypeAnnotation.types
index b6cd8feb91e..7a70b10db94 100644
--- a/tests/baselines/reference/exportAssignedTypeAsTypeAnnotation.types
+++ b/tests/baselines/reference/exportAssignedTypeAsTypeAnnotation.types
@@ -4,8 +4,8 @@ import test = require('exportAssignedTypeAsTypeAnnotation_0');
 >test : test
 
 var t2: test; // should not raise a 'container type' error
->t2 : x
->test : x
+>t2 : test
+>test : test
 
 === tests/cases/compiler/exportAssignedTypeAsTypeAnnotation_0.ts ===
 
diff --git a/tests/baselines/reference/exportAssignmentCircularModules.types b/tests/baselines/reference/exportAssignmentCircularModules.types
index 3bc8f09cc85..2a060f72ce1 100644
--- a/tests/baselines/reference/exportAssignmentCircularModules.types
+++ b/tests/baselines/reference/exportAssignmentCircularModules.types
@@ -1,14 +1,14 @@
 === tests/cases/conformance/externalModules/foo_2.ts ===
 import foo0 = require("./foo_0");
->foo0 : typeof Foo
+>foo0 : foo0
 
 module Foo {
->Foo : typeof Foo
+>Foo : Foo
 
 	export var x = foo0.x;
 >x : any
 >foo0.x : any
->foo0 : typeof Foo
+>foo0 : typeof foo0
 >x : any
 }
 export = Foo;
@@ -16,15 +16,15 @@ export = Foo;
 
 === tests/cases/conformance/externalModules/foo_0.ts ===
 import foo1 = require('./foo_1');
->foo1 : typeof Foo
+>foo1 : foo1
 
 module Foo {
->Foo : typeof Foo
+>Foo : Foo
 
 	export var x = foo1.x;
 >x : any
 >foo1.x : any
->foo1 : typeof Foo
+>foo1 : typeof foo1
 >x : any
 }
 export = Foo;
@@ -32,15 +32,15 @@ export = Foo;
 
 === tests/cases/conformance/externalModules/foo_1.ts ===
 import foo2 = require("./foo_2");
->foo2 : typeof Foo
+>foo2 : foo2
 
 module Foo {
->Foo : typeof Foo
+>Foo : Foo
 
 	export var x = foo2.x;
 >x : any
 >foo2.x : any
->foo2 : typeof Foo
+>foo2 : typeof foo2
 >x : any
 }
 export = Foo;
diff --git a/tests/baselines/reference/exportAssignmentClass.types b/tests/baselines/reference/exportAssignmentClass.types
index 03b16d0ef2f..bf439af7744 100644
--- a/tests/baselines/reference/exportAssignmentClass.types
+++ b/tests/baselines/reference/exportAssignmentClass.types
@@ -1,16 +1,16 @@
 === tests/cases/compiler/exportAssignmentClass_B.ts ===
 import D = require("exportAssignmentClass_A");
->D : typeof C
+>D : D
 
 var d = new D();
->d : C
->new D() : C
->D : typeof C
+>d : D
+>new D() : D
+>D : typeof D
 
 var x = d.p;
 >x : number
 >d.p : number
->d : C
+>d : D
 >p : number
 
 === tests/cases/compiler/exportAssignmentClass_A.ts ===
diff --git a/tests/baselines/reference/exportAssignmentEnum.types b/tests/baselines/reference/exportAssignmentEnum.types
index 6e258339277..6a501216099 100644
--- a/tests/baselines/reference/exportAssignmentEnum.types
+++ b/tests/baselines/reference/exportAssignmentEnum.types
@@ -1,24 +1,24 @@
 === tests/cases/compiler/exportAssignmentEnum_B.ts ===
 import EnumE = require("exportAssignmentEnum_A");
->EnumE : typeof E
+>EnumE : EnumE
 
 var a = EnumE.A;
->a : E
->EnumE.A : E
->EnumE : typeof E
->A : E
+>a : EnumE
+>EnumE.A : EnumE
+>EnumE : typeof EnumE
+>A : EnumE
 
 var b = EnumE.B;
->b : E
->EnumE.B : E
->EnumE : typeof E
->B : E
+>b : EnumE
+>EnumE.B : EnumE
+>EnumE : typeof EnumE
+>B : EnumE
 
 var c = EnumE.C;
->c : E
->EnumE.C : E
->EnumE : typeof E
->C : E
+>c : EnumE
+>EnumE.C : EnumE
+>EnumE : typeof EnumE
+>C : EnumE
 
 === tests/cases/compiler/exportAssignmentEnum_A.ts ===
 enum E {
diff --git a/tests/baselines/reference/exportAssignmentError.types b/tests/baselines/reference/exportAssignmentError.types
index 89e7d461fb2..22367298a7b 100644
--- a/tests/baselines/reference/exportAssignmentError.types
+++ b/tests/baselines/reference/exportAssignmentError.types
@@ -1,13 +1,13 @@
 === tests/cases/compiler/exportAssignmentError.ts ===
 module M {
->M : typeof M
+>M : M
 
 	export var x;
 >x : any
 }
 
 import M2 = M;
->M2 : typeof M
+>M2 : M2
 >M : typeof M
 
 export = M2; // should not error
diff --git a/tests/baselines/reference/exportAssignmentFunction.types b/tests/baselines/reference/exportAssignmentFunction.types
index 95e50be2c71..fad00bf7df7 100644
--- a/tests/baselines/reference/exportAssignmentFunction.types
+++ b/tests/baselines/reference/exportAssignmentFunction.types
@@ -1,11 +1,11 @@
 === tests/cases/compiler/exportAssignmentFunction_B.ts ===
 import fooFunc = require("exportAssignmentFunction_A");
->fooFunc : typeof foo
+>fooFunc : fooFunc
 
 var n: number = fooFunc();
 >n : number
 >fooFunc() : number
->fooFunc : typeof foo
+>fooFunc : typeof fooFunc
 
 === tests/cases/compiler/exportAssignmentFunction_A.ts ===
 function foo() { return 0; }
diff --git a/tests/baselines/reference/exportAssignmentGenericType.types b/tests/baselines/reference/exportAssignmentGenericType.types
index 249c6d6bda0..4208f11a84a 100644
--- a/tests/baselines/reference/exportAssignmentGenericType.types
+++ b/tests/baselines/reference/exportAssignmentGenericType.types
@@ -1,16 +1,16 @@
 === tests/cases/conformance/externalModules/foo_1.ts ===
 import foo = require("./foo_0");
->foo : typeof Foo
+>foo : foo
 
 var x = new foo<number>();
->x : Foo<number>
->new foo<number>() : Foo<number>
->foo : typeof Foo
+>x : foo<number>
+>new foo<number>() : foo<number>
+>foo : typeof foo
 
 var y:number = x.test;
 >y : number
 >x.test : number
->x : Foo<number>
+>x : foo<number>
 >test : number
 
 === tests/cases/conformance/externalModules/foo_0.ts ===
diff --git a/tests/baselines/reference/exportAssignmentInterface.types b/tests/baselines/reference/exportAssignmentInterface.types
index 429a64c8029..759aa639661 100644
--- a/tests/baselines/reference/exportAssignmentInterface.types
+++ b/tests/baselines/reference/exportAssignmentInterface.types
@@ -3,13 +3,13 @@ import I1 = require("exportAssignmentInterface_A");
 >I1 : I1
 
 var i: I1;
->i : A
->I1 : A
+>i : I1
+>I1 : I1
 
 var n: number = i.p1;
 >n : number
 >i.p1 : number
->i : A
+>i : I1
 >p1 : number
 
 === tests/cases/compiler/exportAssignmentInterface_A.ts ===
diff --git a/tests/baselines/reference/exportAssignmentInternalModule.types b/tests/baselines/reference/exportAssignmentInternalModule.types
index c7231cef453..edf247b8976 100644
--- a/tests/baselines/reference/exportAssignmentInternalModule.types
+++ b/tests/baselines/reference/exportAssignmentInternalModule.types
@@ -1,16 +1,16 @@
 === tests/cases/compiler/exportAssignmentInternalModule_B.ts ===
 import modM = require("exportAssignmentInternalModule_A");
->modM : typeof M
+>modM : modM
 
 var n: number = modM.x;
 >n : number
 >modM.x : any
->modM : typeof M
+>modM : typeof modM
 >x : any
 
 === tests/cases/compiler/exportAssignmentInternalModule_A.ts ===
 module M {
->M : typeof M
+>M : M
 
 	export var x;
 >x : any
diff --git a/tests/baselines/reference/exportAssignmentMergedInterface.types b/tests/baselines/reference/exportAssignmentMergedInterface.types
index 53d80ec0434..4d6ddf58c13 100644
--- a/tests/baselines/reference/exportAssignmentMergedInterface.types
+++ b/tests/baselines/reference/exportAssignmentMergedInterface.types
@@ -3,28 +3,28 @@ import foo = require("./foo_0");
 >foo : foo
 
 var x: foo;
->x : Foo
->foo : Foo
+>x : foo
+>foo : foo
 
 x("test");
 >x("test") : void
->x : Foo
+>x : foo
 
 x(42);
 >x(42) : number
->x : Foo
+>x : foo
 
 var y: string = x.b;
 >y : string
 >x.b : string
->x : Foo
+>x : foo
 >b : string
 
 if(!!x.c){ }
 >!!x.c : boolean
 >!x.c : boolean
 >x.c : boolean
->x : Foo
+>x : foo
 >c : boolean
 
 var z = {x: 1, y: 2};
@@ -37,7 +37,7 @@ z = x.d;
 >z = x.d : { x: number; y: number; }
 >z : { x: number; y: number; }
 >x.d : { x: number; y: number; }
->x : Foo
+>x : foo
 >d : { x: number; y: number; }
 
 === tests/cases/conformance/externalModules/foo_0.ts ===
diff --git a/tests/baselines/reference/exportAssignmentMergedModule.types b/tests/baselines/reference/exportAssignmentMergedModule.types
index a71b94c7b1b..aff6f50877e 100644
--- a/tests/baselines/reference/exportAssignmentMergedModule.types
+++ b/tests/baselines/reference/exportAssignmentMergedModule.types
@@ -1,36 +1,36 @@
 === tests/cases/conformance/externalModules/foo_1.ts ===
 import foo = require("./foo_0");
->foo : typeof Foo
+>foo : foo
 
 var a: number = foo.a();
 >a : number
 >foo.a() : number
->foo.a : typeof a
->foo : typeof Foo
->a : typeof a
+>foo.a : typeof foo.a
+>foo : typeof foo
+>a : typeof foo.a
 
 if(!!foo.b){
 >!!foo.b : boolean
 >!foo.b : boolean
 >foo.b : boolean
->foo : typeof Foo
+>foo : typeof foo
 >b : boolean
 
 	foo.Test.answer = foo.c(42);
 >foo.Test.answer = foo.c(42) : number
 >foo.Test.answer : number
->foo.Test : typeof Test
->foo : typeof Foo
->Test : typeof Test
+>foo.Test : typeof foo.Test
+>foo : typeof foo
+>Test : typeof foo.Test
 >answer : number
 >foo.c(42) : number
->foo.c : typeof c
->foo : typeof Foo
->c : typeof c
+>foo.c : typeof foo.c
+>foo : typeof foo
+>c : typeof foo.c
 }
 === tests/cases/conformance/externalModules/foo_0.ts ===
 module Foo {
->Foo : typeof Foo
+>Foo : Foo
 
 	export function a(){
 >a : typeof a
@@ -41,7 +41,7 @@ module Foo {
 >b : boolean
 }
 module Foo {
->Foo : typeof Foo
+>Foo : Foo
 
 	export function c(a: number){
 >c : typeof c
@@ -51,7 +51,7 @@ module Foo {
 >a : number
 	}
 	export module Test {
->Test : typeof Test
+>Test : Test
 
 		export var answer = 42;
 >answer : number
diff --git a/tests/baselines/reference/exportAssignmentOfGenericType1.types b/tests/baselines/reference/exportAssignmentOfGenericType1.types
index 86011e614f7..652ab7baf0a 100644
--- a/tests/baselines/reference/exportAssignmentOfGenericType1.types
+++ b/tests/baselines/reference/exportAssignmentOfGenericType1.types
@@ -1,11 +1,11 @@
 === tests/cases/compiler/exportAssignmentOfGenericType1_1.ts ===
 ///<reference path='exportAssignmentOfGenericType1_0.ts'/>
 import q = require("exportAssignmentOfGenericType1_0");
->q : typeof T
+>q : q
 
 class M extends q<string> { }
 >M : M
->q : T<X>
+>q : q<X>
 
 var m: M;
 >m : M
diff --git a/tests/baselines/reference/exportAssignmentTopLevelClodule.types b/tests/baselines/reference/exportAssignmentTopLevelClodule.types
index 7e016c7196e..4a7be40bd31 100644
--- a/tests/baselines/reference/exportAssignmentTopLevelClodule.types
+++ b/tests/baselines/reference/exportAssignmentTopLevelClodule.types
@@ -1,17 +1,17 @@
 === tests/cases/conformance/externalModules/foo_1.ts ===
 import foo = require("./foo_0");
->foo : typeof Foo
+>foo : foo
 
 if(foo.answer === 42){
 >foo.answer === 42 : boolean
 >foo.answer : number
->foo : typeof Foo
+>foo : typeof foo
 >answer : number
 
 	var x = new foo();
->x : Foo
->new foo() : Foo
->foo : typeof Foo
+>x : foo
+>new foo() : foo
+>foo : typeof foo
 }
 
 === tests/cases/conformance/externalModules/foo_0.ts ===
@@ -22,7 +22,7 @@ class Foo {
 >test : string
 }
 module Foo {
->Foo : typeof Foo
+>Foo : Foo
 
 	export var answer = 42;
 >answer : number
diff --git a/tests/baselines/reference/exportAssignmentTopLevelEnumdule.types b/tests/baselines/reference/exportAssignmentTopLevelEnumdule.types
index 4ee49f6d20f..84f2c634b88 100644
--- a/tests/baselines/reference/exportAssignmentTopLevelEnumdule.types
+++ b/tests/baselines/reference/exportAssignmentTopLevelEnumdule.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/externalModules/foo_1.ts ===
 import foo = require("./foo_0");
->foo : typeof foo
+>foo : foo
 
 var color: foo;
 >color : foo
@@ -31,7 +31,7 @@ enum foo {
 >blue : foo
 }
 module foo {
->foo : typeof foo
+>foo : foo
 
 	export var answer = 42;
 >answer : number
diff --git a/tests/baselines/reference/exportAssignmentTopLevelFundule.types b/tests/baselines/reference/exportAssignmentTopLevelFundule.types
index 982e87e59f3..013ef72db3f 100644
--- a/tests/baselines/reference/exportAssignmentTopLevelFundule.types
+++ b/tests/baselines/reference/exportAssignmentTopLevelFundule.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/externalModules/foo_1.ts ===
 import foo = require("./foo_0");
->foo : typeof foo
+>foo : foo
 
 if(foo.answer === 42){
 >foo.answer === 42 : boolean
@@ -21,7 +21,7 @@ function foo() {
 	return "test";
 }
 module foo {
->foo : typeof foo
+>foo : foo
 
 	export var answer = 42;
 >answer : number
diff --git a/tests/baselines/reference/exportAssignmentTopLevelIdentifier.types b/tests/baselines/reference/exportAssignmentTopLevelIdentifier.types
index b248e35d4a3..2f5b4ca8b0e 100644
--- a/tests/baselines/reference/exportAssignmentTopLevelIdentifier.types
+++ b/tests/baselines/reference/exportAssignmentTopLevelIdentifier.types
@@ -1,18 +1,18 @@
 === tests/cases/conformance/externalModules/foo_1.ts ===
 import foo = require("./foo_0");
->foo : typeof Foo
+>foo : foo
 
 if(foo.answer === 42){
 >foo.answer === 42 : boolean
 >foo.answer : number
->foo : typeof Foo
+>foo : typeof foo
 >answer : number
 
 }
 
 === tests/cases/conformance/externalModules/foo_0.ts ===
 module Foo {
->Foo : typeof Foo
+>Foo : Foo
 
 	export var answer = 42;
 >answer : number
diff --git a/tests/baselines/reference/exportAssignmentVariable.types b/tests/baselines/reference/exportAssignmentVariable.types
index 36f02f60a95..6f21daeb9a7 100644
--- a/tests/baselines/reference/exportAssignmentVariable.types
+++ b/tests/baselines/reference/exportAssignmentVariable.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/exportAssignmentVariable_B.ts ===
 import y = require("exportAssignmentVariable_A");
->y : number
+>y : y
 
 var n: number = y;
 >n : number
diff --git a/tests/baselines/reference/exportAssignmentWithImportStatementPrivacyError.types b/tests/baselines/reference/exportAssignmentWithImportStatementPrivacyError.types
index d7749845000..2da8389dcba 100644
--- a/tests/baselines/reference/exportAssignmentWithImportStatementPrivacyError.types
+++ b/tests/baselines/reference/exportAssignmentWithImportStatementPrivacyError.types
@@ -27,29 +27,29 @@ module m2 {
 }
 
 module M {
->M : typeof M
+>M : M
 
     export var server: {
->server : { (): connectExport; test1: connectModule; test2(): connectModule; }
+>server : { (): m2.connectExport; test1: m2.connectModule; test2(): m2.connectModule; }
 
         (): m2.connectExport;
 >m2 : m2
->connectExport : connectExport
+>connectExport : m2.connectExport
 
         test1: m2.connectModule;
->test1 : connectModule
+>test1 : m2.connectModule
 >m2 : m2
->connectModule : connectModule
+>connectModule : m2.connectModule
 
         test2(): m2.connectModule;
->test2 : () => connectModule
+>test2 : () => m2.connectModule
 >m2 : m2
->connectModule : connectModule
+>connectModule : m2.connectModule
 
     };
 }
 import M22 = M;
->M22 : typeof M
+>M22 : M22
 >M : typeof M
 
 export = M;
diff --git a/tests/baselines/reference/exportCodeGen.types b/tests/baselines/reference/exportCodeGen.types
index 348d8f9c46f..61cf48de146 100644
--- a/tests/baselines/reference/exportCodeGen.types
+++ b/tests/baselines/reference/exportCodeGen.types
@@ -3,7 +3,7 @@
 // should replace all refs to 'x' in the body,
 // with fully qualified
 module A {
->A : typeof A
+>A : A
 
     export var x = 12;
 >x : number
@@ -19,7 +19,7 @@ module A {
 
 // should not fully qualify 'x'
 module B {
->B : typeof B
+>B : B
 
     var x = 12;
 >x : number
@@ -35,7 +35,7 @@ module B {
 
 // not copied, since not exported
 module C {
->C : typeof C
+>C : C
 
     function no() {
 >no : typeof no
@@ -46,7 +46,7 @@ module C {
 
 // copies, since exported
 module D {
->D : typeof D
+>D : D
 
     export function yes() {
 >yes : typeof yes
@@ -57,7 +57,7 @@ module D {
 
 // validate all exportable statements
 module E {
->E : typeof E
+>E : E
 
     export enum Color { Red }
 >Color : Color
@@ -75,7 +75,7 @@ module E {
 >name : string
 
     export module M {
->M : typeof M
+>M : M
 
         export var x = 42;
 >x : number
@@ -85,7 +85,7 @@ module E {
 // validate all exportable statements,
 // which are not exported
 module F {
->F : typeof F
+>F : F
 
     enum Color { Red }
 >Color : Color
@@ -103,7 +103,7 @@ module F {
 >name : string
 
     module M {
->M : typeof M
+>M : M
 
         var x = 42;
 >x : number
diff --git a/tests/baselines/reference/exportEqualCallable.types b/tests/baselines/reference/exportEqualCallable.types
index 0a084523137..ddfa493e904 100644
--- a/tests/baselines/reference/exportEqualCallable.types
+++ b/tests/baselines/reference/exportEqualCallable.types
@@ -1,7 +1,7 @@
 === tests/cases/compiler/exportEqualCallable_1.ts ===
 ///<reference path='exportEqualCallable_0.ts'/>
 import connect = require('exportEqualCallable_0');
->connect : () => any
+>connect : connect
 
 connect();
 >connect() : any
diff --git a/tests/baselines/reference/exportEqualNamespaces.types b/tests/baselines/reference/exportEqualNamespaces.types
index 9da65466c63..58fdf4c25e9 100644
--- a/tests/baselines/reference/exportEqualNamespaces.types
+++ b/tests/baselines/reference/exportEqualNamespaces.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/exportEqualNamespaces.ts ===
 declare module server {
->server : Date
+>server : server
 
     interface Server extends Object { }
 >Server : Server
@@ -12,7 +12,7 @@ interface server {
 
     (): server.Server;
 >server : server
->Server : Server
+>Server : server.Server
 
     startTime: Date;
 >startTime : Date
diff --git a/tests/baselines/reference/exportImport.types b/tests/baselines/reference/exportImport.types
index 7f7bdba5d03..f312ba1ba05 100644
--- a/tests/baselines/reference/exportImport.types
+++ b/tests/baselines/reference/exportImport.types
@@ -1,17 +1,17 @@
 === tests/cases/compiler/consumer.ts ===
 import e = require('./exporter');
->e : typeof "tests/cases/compiler/exporter"
+>e : e
 
 export function w(): e.w { // Should be OK
 >w : typeof w
 >e : e
->w : Widget1
+>w : e.w
 
     return new e.w();
->new e.w() : Widget1
->e.w : typeof Widget1
->e : typeof "tests/cases/compiler/exporter"
->w : typeof Widget1
+>new e.w() : e.w
+>e.w : typeof e.w
+>e : typeof e
+>w : typeof e.w
 }
 === tests/cases/compiler/w1.ts ===
 
@@ -24,5 +24,5 @@ class Widget1 { name = 'one'; }
 
 === tests/cases/compiler/exporter.ts ===
 export import w = require('./w1');
->w : typeof Widget1
+>w : w
 
diff --git a/tests/baselines/reference/exportImportAlias.types b/tests/baselines/reference/exportImportAlias.types
index e65b0e8fc8e..e716891352e 100644
--- a/tests/baselines/reference/exportImportAlias.types
+++ b/tests/baselines/reference/exportImportAlias.types
@@ -2,7 +2,7 @@
 // expect no errors here
 
 module A {
->A : typeof A
+>A : A
 
     export var x = 'hello world'
 >x : string
@@ -27,11 +27,11 @@ module A {
 }
 
 module C {
->C : typeof C
+>C : C
 
     export import a = A;
->a : typeof A
->A : typeof A
+>a : a
+>A : typeof a
 }
 
 var a: string = C.a.x;
@@ -46,12 +46,12 @@ var b: { x: number; y: number; } = new C.a.Point(0, 0);
 >b : { x: number; y: number; }
 >x : number
 >y : number
->new C.a.Point(0, 0) : Point
->C.a.Point : typeof Point
+>new C.a.Point(0, 0) : A.Point
+>C.a.Point : typeof A.Point
 >C.a : typeof A
 >C : typeof C
 >a : typeof A
->Point : typeof Point
+>Point : typeof A.Point
 
 var c: { name: string };
 >c : { name: string; }
@@ -60,12 +60,12 @@ var c: { name: string };
 var c: C.a.B.Id;
 >c : { name: string; }
 >C : C
->a : a
->B : B
->Id : Id
+>a : C.a
+>B : A.B
+>Id : A.B.Id
 
 module X {
->X : typeof X
+>X : X
 
     export function Y() {
 >Y : typeof Y
@@ -74,7 +74,7 @@ module X {
     }
 
     export module Y {
->Y : typeof Y
+>Y : Y
 
         export class Point {
 >Point : Point
@@ -87,35 +87,35 @@ module X {
 }
 
 module Z {
->Z : typeof Z
+>Z : Z
 
     // 'y' should be a fundule here
     export import y = X.Y;
->y : typeof Y
+>y : y
 >X : typeof X
->Y : typeof Y
+>Y : typeof y
 }
 
 var m: number = Z.y();
 >m : number
 >Z.y() : number
->Z.y : typeof Y
+>Z.y : typeof X.Y
 >Z : typeof Z
->y : typeof Y
+>y : typeof X.Y
 
 var n: { x: number; y: number; } = new Z.y.Point(0, 0);
 >n : { x: number; y: number; }
 >x : number
 >y : number
->new Z.y.Point(0, 0) : Point
->Z.y.Point : typeof Point
->Z.y : typeof Y
+>new Z.y.Point(0, 0) : X.Y.Point
+>Z.y.Point : typeof X.Y.Point
+>Z.y : typeof X.Y
 >Z : typeof Z
->y : typeof Y
->Point : typeof Point
+>y : typeof X.Y
+>Point : typeof X.Y.Point
 
 module K {
->K : typeof K
+>K : K
 
     export class L {
 >L : L
@@ -125,7 +125,7 @@ module K {
     }
 
     export module L {
->L : typeof L
+>L : L
 
         export var y = 12;
 >y : number
@@ -143,12 +143,12 @@ module K {
 }
 
 module M {
->M : typeof M
+>M : M
 
     export import D = K.L;
->D : typeof L
+>D : D
 >K : typeof K
->L : L
+>L : D
 }
 
 var o: { name: string };
@@ -157,10 +157,10 @@ var o: { name: string };
 
 var o = new M.D('Hello');
 >o : { name: string; }
->new M.D('Hello') : L
->M.D : typeof L
+>new M.D('Hello') : K.L
+>M.D : typeof K.L
 >M : typeof M
->D : typeof L
+>D : typeof K.L
 
 var p: { x: number; y: number; }
 >p : { x: number; y: number; }
@@ -170,6 +170,6 @@ var p: { x: number; y: number; }
 var p: M.D.Point;
 >p : { x: number; y: number; }
 >M : M
->D : D
->Point : Point
+>D : M.D
+>Point : K.L.Point
 
diff --git a/tests/baselines/reference/exportImportAndClodule.types b/tests/baselines/reference/exportImportAndClodule.types
index 13734561233..219b2c34d79 100644
--- a/tests/baselines/reference/exportImportAndClodule.types
+++ b/tests/baselines/reference/exportImportAndClodule.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/exportImportAndClodule.ts ===
 module K {
->K : typeof K
+>K : K
 
     export class L {
 >L : L
@@ -9,7 +9,7 @@ module K {
 >name : string
     }
     export module L {
->L : typeof L
+>L : L
 
         export var y = 12;
 >y : number
@@ -26,12 +26,12 @@ module K {
     }
 }
 module M {
->M : typeof M
+>M : M
 
     export import D = K.L;
->D : typeof L
+>D : D
 >K : typeof K
->L : L
+>L : D
 }
 var o: { name: string };
 >o : { name: string; }
@@ -39,10 +39,10 @@ var o: { name: string };
 
 var o = new M.D('Hello');
 >o : { name: string; }
->new M.D('Hello') : L
->M.D : typeof L
+>new M.D('Hello') : K.L
+>M.D : typeof K.L
 >M : typeof M
->D : typeof L
+>D : typeof K.L
 
 var p: { x: number; y: number; }
 >p : { x: number; y: number; }
@@ -52,6 +52,6 @@ var p: { x: number; y: number; }
 var p: M.D.Point;
 >p : { x: number; y: number; }
 >M : M
->D : D
->Point : Point
+>D : M.D
+>Point : K.L.Point
 
diff --git a/tests/baselines/reference/exportImportMultipleFiles.types b/tests/baselines/reference/exportImportMultipleFiles.types
index a46732e4de2..76b75e63c6c 100644
--- a/tests/baselines/reference/exportImportMultipleFiles.types
+++ b/tests/baselines/reference/exportImportMultipleFiles.types
@@ -1,14 +1,14 @@
 === tests/cases/compiler/exportImportMultipleFiles_userCode.ts ===
 import lib = require('./exportImportMultipleFiles_library');
->lib : typeof "tests/cases/compiler/exportImportMultipleFiles_library"
+>lib : lib
 
 lib.math.add(3, 4); // Shouldnt be error
 >lib.math.add(3, 4) : any
->lib.math.add : typeof add
->lib.math : typeof "tests/cases/compiler/exportImportMultipleFiles_math"
->lib : typeof "tests/cases/compiler/exportImportMultipleFiles_library"
->math : typeof "tests/cases/compiler/exportImportMultipleFiles_math"
->add : typeof add
+>lib.math.add : typeof lib.math.add
+>lib.math : typeof lib.math
+>lib : typeof lib
+>math : typeof lib.math
+>add : typeof lib.math.add
 
 === tests/cases/compiler/exportImportMultipleFiles_math.ts ===
 export function add(a, b) { return a + b; }
@@ -21,11 +21,11 @@ export function add(a, b) { return a + b; }
 
 === tests/cases/compiler/exportImportMultipleFiles_library.ts ===
 export import math = require("exportImportMultipleFiles_math");
->math : typeof "tests/cases/compiler/exportImportMultipleFiles_math"
+>math : math
 
 math.add(3, 4); // OK
 >math.add(3, 4) : any
->math.add : typeof add
->math : typeof "tests/cases/compiler/exportImportMultipleFiles_math"
->add : typeof add
+>math.add : typeof math.add
+>math : typeof math
+>add : typeof math.add
 
diff --git a/tests/baselines/reference/exportImportNonInstantiatedModule.types b/tests/baselines/reference/exportImportNonInstantiatedModule.types
index e89b34a2bbf..8801f344142 100644
--- a/tests/baselines/reference/exportImportNonInstantiatedModule.types
+++ b/tests/baselines/reference/exportImportNonInstantiatedModule.types
@@ -8,19 +8,19 @@ module A {
 }
 
 module B {
->B : typeof B
+>B : B
 
     export import A1 = A
 >A1 : A1
->A : A
+>A : A1
     
 }
 
 var x: B.A1.I = { x: 1 };
->x : I
+>x : A.I
 >B : B
->A1 : A1
->I : I
+>A1 : B.A1
+>I : A.I
 >{ x: 1 } : { x: number; }
 >x : number
 
diff --git a/tests/baselines/reference/exportImportNonInstantiatedModule2.types b/tests/baselines/reference/exportImportNonInstantiatedModule2.types
index 5d4ba1650e2..d73ec2eb447 100644
--- a/tests/baselines/reference/exportImportNonInstantiatedModule2.types
+++ b/tests/baselines/reference/exportImportNonInstantiatedModule2.types
@@ -1,11 +1,11 @@
 === tests/cases/compiler/consumer.ts ===
 import e = require('./exporter');
->e : typeof "tests/cases/compiler/exporter"
+>e : e
 
 export function w(): e.w { // Should be OK
 >w : typeof w
 >e : e
->w : Widget1
+>w : e.w
 
     return {name: 'value' };
 >{name: 'value' } : { name: string; }
diff --git a/tests/baselines/reference/exportPrivateType.types b/tests/baselines/reference/exportPrivateType.types
index 87751b273a7..afb555606b2 100644
--- a/tests/baselines/reference/exportPrivateType.types
+++ b/tests/baselines/reference/exportPrivateType.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/exportPrivateType.ts ===
 module foo {
->foo : typeof foo
+>foo : foo
 
     class C1 {
 >C1 : C1
diff --git a/tests/baselines/reference/extBaseClass1.types b/tests/baselines/reference/extBaseClass1.types
index d00c6e632e3..8e20bb14351 100644
--- a/tests/baselines/reference/extBaseClass1.types
+++ b/tests/baselines/reference/extBaseClass1.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/extBaseClass1.ts ===
 module M {
->M : typeof M
+>M : M
 
     export class B {
 >B : B
@@ -16,7 +16,7 @@ module M {
 }
 
 module M {
->M : typeof M
+>M : M
 
     export class C2 extends B {
 >C2 : C2
@@ -25,12 +25,12 @@ module M {
 }
 
 module N {
->N : typeof N
+>N : N
 
     export class C3 extends M.B {
 >C3 : C3
 >M : M
->B : B
+>B : M.B
     }
 }
 
diff --git a/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.types b/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.types
index 11875e105b4..4adfc84eb45 100644
--- a/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.types
+++ b/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.types
@@ -1,50 +1,50 @@
 === tests/cases/compiler/extendingClassFromAliasAndUsageInIndexer_main.ts ===
 import Backbone = require("extendingClassFromAliasAndUsageInIndexer_backbone");
->Backbone : typeof "tests/cases/compiler/extendingClassFromAliasAndUsageInIndexer_backbone"
+>Backbone : Backbone
 
 import moduleA = require("extendingClassFromAliasAndUsageInIndexer_moduleA");
->moduleA : typeof "tests/cases/compiler/extendingClassFromAliasAndUsageInIndexer_moduleA"
+>moduleA : moduleA
 
 import moduleB = require("extendingClassFromAliasAndUsageInIndexer_moduleB");
->moduleB : typeof "tests/cases/compiler/extendingClassFromAliasAndUsageInIndexer_moduleB"
+>moduleB : moduleB
 
 interface IHasVisualizationModel {
 >IHasVisualizationModel : IHasVisualizationModel
 
     VisualizationModel: typeof Backbone.Model;
->VisualizationModel : typeof Model
->Backbone : typeof "tests/cases/compiler/extendingClassFromAliasAndUsageInIndexer_backbone"
->Model : typeof Model
+>VisualizationModel : typeof Backbone.Model
+>Backbone : typeof Backbone
+>Model : typeof Backbone.Model
 }
 var moduleATyped: IHasVisualizationModel = moduleA;
 >moduleATyped : IHasVisualizationModel
 >IHasVisualizationModel : IHasVisualizationModel
->moduleA : typeof "tests/cases/compiler/extendingClassFromAliasAndUsageInIndexer_moduleA"
+>moduleA : typeof moduleA
 
 var moduleMap: { [key: string]: IHasVisualizationModel } = {
 >moduleMap : { [x: string]: IHasVisualizationModel; }
 >key : string
 >IHasVisualizationModel : IHasVisualizationModel
->{    "moduleA": moduleA,    "moduleB": moduleB} : { [x: string]: IHasVisualizationModel; "moduleA": typeof "tests/cases/compiler/extendingClassFromAliasAndUsageInIndexer_moduleA"; "moduleB": typeof "tests/cases/compiler/extendingClassFromAliasAndUsageInIndexer_moduleB"; }
+>{    "moduleA": moduleA,    "moduleB": moduleB} : { [x: string]: IHasVisualizationModel; "moduleA": typeof moduleA; "moduleB": typeof moduleB; }
 
     "moduleA": moduleA,
->moduleA : moduleA
+>moduleA : typeof moduleA
 
     "moduleB": moduleB
->moduleB : moduleB
+>moduleB : typeof moduleB
 
 };
 var moduleName: string;
 >moduleName : string
 
 var visModel = new moduleMap[moduleName].VisualizationModel();
->visModel : Model
->new moduleMap[moduleName].VisualizationModel() : Model
->moduleMap[moduleName].VisualizationModel : typeof Model
+>visModel : Backbone.Model
+>new moduleMap[moduleName].VisualizationModel() : Backbone.Model
+>moduleMap[moduleName].VisualizationModel : typeof Backbone.Model
 >moduleMap[moduleName] : IHasVisualizationModel
 >moduleMap : { [x: string]: IHasVisualizationModel; }
 >moduleName : string
->VisualizationModel : typeof Model
+>VisualizationModel : typeof Backbone.Model
 
 === tests/cases/compiler/extendingClassFromAliasAndUsageInIndexer_backbone.ts ===
 export class Model {
@@ -56,24 +56,24 @@ export class Model {
 
 === tests/cases/compiler/extendingClassFromAliasAndUsageInIndexer_moduleA.ts ===
 import Backbone = require("extendingClassFromAliasAndUsageInIndexer_backbone");
->Backbone : typeof "tests/cases/compiler/extendingClassFromAliasAndUsageInIndexer_backbone"
+>Backbone : Backbone
 
 export class VisualizationModel extends Backbone.Model {
 >VisualizationModel : VisualizationModel
 >Backbone : Backbone
->Model : Model
+>Model : Backbone.Model
 
     // interesting stuff here
 }
 
 === tests/cases/compiler/extendingClassFromAliasAndUsageInIndexer_moduleB.ts ===
 import Backbone = require("extendingClassFromAliasAndUsageInIndexer_backbone");
->Backbone : typeof "tests/cases/compiler/extendingClassFromAliasAndUsageInIndexer_backbone"
+>Backbone : Backbone
 
 export class VisualizationModel extends Backbone.Model {
 >VisualizationModel : VisualizationModel
 >Backbone : Backbone
->Model : Model
+>Model : Backbone.Model
 
     // different interesting stuff here
 }
diff --git a/tests/baselines/reference/externModuleClobber.types b/tests/baselines/reference/externModuleClobber.types
index ef659a37180..88fc85fc305 100644
--- a/tests/baselines/reference/externModuleClobber.types
+++ b/tests/baselines/reference/externModuleClobber.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/externModuleClobber.ts ===
 declare module EM {
->EM : typeof EM
+>EM : EM
 
 	export class Position { }
 >Position : Position
@@ -16,24 +16,24 @@ declare module EM {
 }
 
 var x:EM.Position;
->x : Position
+>x : EM.Position
 >EM : EM
->Position : Position
+>Position : EM.Position
 
 var ec:EM.EC = new EM.EC();
->ec : EC
+>ec : EM.EC
 >EM : EM
->EC : EC
->new EM.EC() : EC
->EM.EC : typeof EC
+>EC : EM.EC
+>new EM.EC() : EM.EC
+>EM.EC : typeof EM.EC
 >EM : typeof EM
->EC : typeof EC
+>EC : typeof EM.EC
 
 x = ec.getPosition();
->x = ec.getPosition() : Position
->x : Position
->ec.getPosition() : Position
->ec.getPosition : () => Position
->ec : EC
->getPosition : () => Position
+>x = ec.getPosition() : EM.Position
+>x : EM.Position
+>ec.getPosition() : EM.Position
+>ec.getPosition : () => EM.Position
+>ec : EM.EC
+>getPosition : () => EM.Position
 
diff --git a/tests/baselines/reference/externalModuleAssignToVar.types b/tests/baselines/reference/externalModuleAssignToVar.types
index da2973e5965..2983d9d4e1b 100644
--- a/tests/baselines/reference/externalModuleAssignToVar.types
+++ b/tests/baselines/reference/externalModuleAssignToVar.types
@@ -1,45 +1,45 @@
 === tests/cases/compiler/externalModuleAssignToVar_core.ts ===
 ///<reference path='externalModuleAssignToVar_core_require.ts'/>
 import ext = require('externalModuleAssignToVar_core_require');
->ext : typeof "tests/cases/compiler/externalModuleAssignToVar_core_require"
+>ext : ext
 
 var y1: { C: new() => ext.C; } = ext;
->y1 : { C: new () => C; }
->C : new () => C
+>y1 : { C: new () => ext.C; }
+>C : new () => ext.C
 >ext : ext
->C : C
->ext : typeof "tests/cases/compiler/externalModuleAssignToVar_core_require"
+>C : ext.C
+>ext : typeof ext
 
 y1 = ext; // ok
->y1 = ext : typeof "tests/cases/compiler/externalModuleAssignToVar_core_require"
->y1 : { C: new () => C; }
->ext : typeof "tests/cases/compiler/externalModuleAssignToVar_core_require"
+>y1 = ext : typeof ext
+>y1 : { C: new () => ext.C; }
+>ext : typeof ext
 
 import ext2 = require('externalModuleAssignToVar_core_require2');
->ext2 : typeof C
+>ext2 : ext2
 
 var y2: new() => ext2 = ext2;
->y2 : new () => C
->ext2 : C
->ext2 : typeof C
+>y2 : new () => ext2
+>ext2 : ext2
+>ext2 : typeof ext2
 
 y2 = ext2; // ok
->y2 = ext2 : typeof C
->y2 : new () => C
->ext2 : typeof C
+>y2 = ext2 : typeof ext2
+>y2 : new () => ext2
+>ext2 : typeof ext2
 
 import ext3 = require('externalModuleAssignToVar_ext');
->ext3 : typeof D
+>ext3 : ext3
 
 var y3: new () => ext3 = ext3;
->y3 : new () => D
->ext3 : D
->ext3 : typeof D
+>y3 : new () => ext3
+>ext3 : ext3
+>ext3 : typeof ext3
 
 y3 = ext3; // ok
->y3 = ext3 : typeof D
->y3 : new () => D
->ext3 : typeof D
+>y3 = ext3 : typeof ext3
+>y3 : new () => ext3
+>ext3 : typeof ext3
 
 === tests/cases/compiler/externalModuleAssignToVar_ext.ts ===
 class D { foo: string; }
diff --git a/tests/baselines/reference/externalModuleReferenceOfImportDeclarationWithExportModifier.types b/tests/baselines/reference/externalModuleReferenceOfImportDeclarationWithExportModifier.types
index 56cf4188cba..8871b3b8f36 100644
--- a/tests/baselines/reference/externalModuleReferenceOfImportDeclarationWithExportModifier.types
+++ b/tests/baselines/reference/externalModuleReferenceOfImportDeclarationWithExportModifier.types
@@ -1,12 +1,12 @@
 === tests/cases/compiler/externalModuleReferenceOfImportDeclarationWithExportModifier_1.ts ===
 export import file1 = require('externalModuleReferenceOfImportDeclarationWithExportModifier_0');
->file1 : typeof "tests/cases/compiler/externalModuleReferenceOfImportDeclarationWithExportModifier_0"
+>file1 : file1
 
 file1.foo();
 >file1.foo() : void
->file1.foo : typeof foo
->file1 : typeof "tests/cases/compiler/externalModuleReferenceOfImportDeclarationWithExportModifier_0"
->foo : typeof foo
+>file1.foo : typeof file1.foo
+>file1 : typeof file1
+>foo : typeof file1.foo
 
 === tests/cases/compiler/externalModuleReferenceOfImportDeclarationWithExportModifier_0.ts ===
 export function foo() { };
diff --git a/tests/baselines/reference/externalModuleResolution.types b/tests/baselines/reference/externalModuleResolution.types
index f56fb58e7cd..19f43c2ca6b 100644
--- a/tests/baselines/reference/externalModuleResolution.types
+++ b/tests/baselines/reference/externalModuleResolution.types
@@ -1,15 +1,15 @@
 === tests/cases/compiler/consumer.ts ===
 import x = require('./foo');
->x : typeof M2
+>x : x
 
 x.Y // .ts should be picked
 >x.Y : number
->x : typeof M2
+>x : typeof x
 >Y : number
 
 === tests/cases/compiler/foo.ts ===
 module M2 {
->M2 : typeof M2
+>M2 : M2
 
     export var Y = 1;
 >Y : number
diff --git a/tests/baselines/reference/externalModuleResolution2.types b/tests/baselines/reference/externalModuleResolution2.types
index d44de272fae..df7c789a3fd 100644
--- a/tests/baselines/reference/externalModuleResolution2.types
+++ b/tests/baselines/reference/externalModuleResolution2.types
@@ -1,15 +1,15 @@
 === tests/cases/compiler/consumer.ts ===
 import x = require('./foo');
->x : typeof M2
+>x : x
 
 x.X // .ts should be picked
 >x.X : number
->x : typeof M2
+>x : typeof x
 >X : number
 
 === tests/cases/compiler/foo.ts ===
 module M2 {
->M2 : typeof M2
+>M2 : M2
 
     export var X = 1;
 >X : number
diff --git a/tests/baselines/reference/fatArrowSelf.types b/tests/baselines/reference/fatArrowSelf.types
index e018600dc4f..8b16eaae533 100644
--- a/tests/baselines/reference/fatArrowSelf.types
+++ b/tests/baselines/reference/fatArrowSelf.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/fatArrowSelf.ts ===
 module Events {
->Events : typeof Events
+>Events : Events
 
     export interface ListenerCallback {
 >ListenerCallback : ListenerCallback
@@ -21,26 +21,26 @@ module Events {
 }
 
 module Consumer {
->Consumer : typeof Consumer
+>Consumer : Consumer
 
     class EventEmitterConsummer {
 >EventEmitterConsummer : EventEmitterConsummer
 
         constructor (private emitter: Events.EventEmitter) { }
->emitter : EventEmitter
+>emitter : Events.EventEmitter
 >Events : Events
->EventEmitter : EventEmitter
+>EventEmitter : Events.EventEmitter
 
         private register() {
 >register : () => void
 
             this.emitter.addListener('change', (e) => {
 >this.emitter.addListener('change', (e) => {                this.changed();            }) : void
->this.emitter.addListener : (type: string, listener: ListenerCallback) => void
->this.emitter : EventEmitter
+>this.emitter.addListener : (type: string, listener: Events.ListenerCallback) => void
+>this.emitter : Events.EventEmitter
 >this : EventEmitterConsummer
->emitter : EventEmitter
->addListener : (type: string, listener: ListenerCallback) => void
+>emitter : Events.EventEmitter
+>addListener : (type: string, listener: Events.ListenerCallback) => void
 >(e) => {                this.changed();            } : (e: any) => void
 >e : any
 
diff --git a/tests/baselines/reference/forInModule.types b/tests/baselines/reference/forInModule.types
index 7de39df3b33..cbfd43d804e 100644
--- a/tests/baselines/reference/forInModule.types
+++ b/tests/baselines/reference/forInModule.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/forInModule.ts ===
 module Foo {
->Foo : typeof Foo
+>Foo : Foo
 
 	for (var i = 0; i < 1; i++) {
 >i : number
diff --git a/tests/baselines/reference/forStatements.types b/tests/baselines/reference/forStatements.types
index 06b162c0f6e..906a1d5fe9d 100644
--- a/tests/baselines/reference/forStatements.types
+++ b/tests/baselines/reference/forStatements.types
@@ -39,7 +39,7 @@ function F(x: string): number { return 42; }
 >x : string
 
 module M {
->M : typeof M
+>M : M
 
     export class A {
 >A : A
@@ -138,18 +138,18 @@ for(var aModule: typeof M = M;;){}
 >M : typeof M
 
 for(var aClassInModule: M.A = new M.A();;){}
->aClassInModule : A
+>aClassInModule : M.A
 >M : M
->A : A
->new M.A() : A
->M.A : typeof A
+>A : M.A
+>new M.A() : M.A
+>M.A : typeof M.A
 >M : typeof M
->A : typeof A
+>A : typeof M.A
 
 for(var aFunctionInModule: typeof M.F2 = (x) => 'this is a string';;){}
->aFunctionInModule : typeof F2
+>aFunctionInModule : typeof M.F2
 >M : typeof M
->F2 : typeof F2
+>F2 : typeof M.F2
 >(x) => 'this is a string' : (x: number) => string
 >x : number
 
diff --git a/tests/baselines/reference/forStatementsMultipleValidDecl.types b/tests/baselines/reference/forStatementsMultipleValidDecl.types
index f5401754e29..c084ec4a631 100644
--- a/tests/baselines/reference/forStatementsMultipleValidDecl.types
+++ b/tests/baselines/reference/forStatementsMultipleValidDecl.types
@@ -118,7 +118,7 @@ for (var a: string[] = []; ;) { }
 for (var a = new Array<string>(); ;) { }
 >a : string[]
 >new Array<string>() : string[]
->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[]; }
+>Array : { (arrayLength?: number): Array<any>; <T>(arrayLength: number): Array<T>; <T>(...items: Array<T>): Array<T>; new (arrayLength?: number): Array<any>; new <T>(arrayLength: number): Array<T>; new <T>(...items: Array<T>): Array<T>; isArray(arg: any): boolean; prototype: Array<any>; }
 
 for (var a: typeof a; ;) { }
 >a : string[]
diff --git a/tests/baselines/reference/funcdecl.types b/tests/baselines/reference/funcdecl.types
index a5e288b8394..ea3a6931dd4 100644
--- a/tests/baselines/reference/funcdecl.types
+++ b/tests/baselines/reference/funcdecl.types
@@ -116,7 +116,7 @@ function f(n: () => void) { }
 >n : () => void
 
 module m2 {
->m2 : typeof m2
+>m2 : m2
 
     export function foo(n: () => void ) {
 >foo : typeof foo
@@ -127,9 +127,9 @@ module m2 {
 
 m2.foo(() =>  {
 >m2.foo(() =>  {    var b = 30;    return b;}) : void
->m2.foo : typeof foo
+>m2.foo : typeof m2.foo
 >m2 : typeof m2
->foo : typeof foo
+>foo : typeof m2.foo
 >() =>  {    var b = 30;    return b;} : () => number
 
     var b = 30;
diff --git a/tests/baselines/reference/functionCall5.types b/tests/baselines/reference/functionCall5.types
index c46f425a18f..6c1cd953156 100644
--- a/tests/baselines/reference/functionCall5.types
+++ b/tests/baselines/reference/functionCall5.types
@@ -1,20 +1,20 @@
 === tests/cases/compiler/functionCall5.ts ===
 module m1 { export class c1 { public a; }} 
->m1 : typeof m1
+>m1 : m1
 >c1 : c1
 >a : any
 
 function foo():m1.c1{return new m1.c1();}; 
 >foo : typeof foo
 >m1 : m1
->c1 : c1
->new m1.c1() : c1
->m1.c1 : typeof c1
+>c1 : m1.c1
+>new m1.c1() : m1.c1
+>m1.c1 : typeof m1.c1
 >m1 : typeof m1
->c1 : typeof c1
+>c1 : typeof m1.c1
 
 var x = foo();
->x : c1
->foo() : c1
+>x : m1.c1
+>foo() : m1.c1
 >foo : typeof foo
 
diff --git a/tests/baselines/reference/functionInIfStatementInModule.types b/tests/baselines/reference/functionInIfStatementInModule.types
index 773fd9c4186..e379ce427ac 100644
--- a/tests/baselines/reference/functionInIfStatementInModule.types
+++ b/tests/baselines/reference/functionInIfStatementInModule.types
@@ -1,7 +1,7 @@
 === tests/cases/compiler/functionInIfStatementInModule.ts ===
  
 module Midori
->Midori : typeof Midori
+>Midori : Midori
 {
     if (false) {
         function Foo(src)
diff --git a/tests/baselines/reference/functionMergedWithModule.types b/tests/baselines/reference/functionMergedWithModule.types
index 357762b9acd..02805e21599 100644
--- a/tests/baselines/reference/functionMergedWithModule.types
+++ b/tests/baselines/reference/functionMergedWithModule.types
@@ -8,8 +8,8 @@ function foo(title: string) {
 }
 
 module foo.Bar {
->foo : typeof foo
->Bar : typeof Bar
+>foo : foo
+>Bar : Bar
 
     export function f() {
 >f : typeof f
@@ -17,16 +17,16 @@ module foo.Bar {
 }
 
 module foo.Baz {
->foo : typeof foo
->Baz : typeof Baz
+>foo : foo
+>Baz : Baz
 
     export function g() {
 >g : typeof g
 
         Bar.f();
 >Bar.f() : void
->Bar.f : typeof f
+>Bar.f : typeof Bar.f
 >Bar : typeof Bar
->f : typeof f
+>f : typeof Bar.f
     }
 }
diff --git a/tests/baselines/reference/functionOverloads6.types b/tests/baselines/reference/functionOverloads6.types
index 177ff0eac6b..6e195b1ca90 100644
--- a/tests/baselines/reference/functionOverloads6.types
+++ b/tests/baselines/reference/functionOverloads6.types
@@ -3,14 +3,14 @@ class foo {
 >foo : foo
 
    static fnOverload();
->fnOverload : typeof fnOverload
+>fnOverload : { (): any; (foo: string): any; }
 
    static fnOverload(foo:string);
->fnOverload : typeof fnOverload
+>fnOverload : { (): any; (foo: string): any; }
 >foo : string
 
    static fnOverload(foo?: any){ }
->fnOverload : typeof fnOverload
+>fnOverload : { (): any; (foo: string): any; }
 >foo : any
 }
 
diff --git a/tests/baselines/reference/funduleExportedClassIsUsedBeforeDeclaration.types b/tests/baselines/reference/funduleExportedClassIsUsedBeforeDeclaration.types
index 9a7d54c4eef..05de0be00c5 100644
--- a/tests/baselines/reference/funduleExportedClassIsUsedBeforeDeclaration.types
+++ b/tests/baselines/reference/funduleExportedClassIsUsedBeforeDeclaration.types
@@ -4,23 +4,23 @@ interface A {   // interface before module declaration
 
     (): B.C;    // uses defined below class in module
 >B : B
->C : C
+>C : B.C
 }
 declare function B(): B.C;  // function merged with module
 >B : typeof B
 >B : B
->C : C
+>C : B.C
 
 declare module B {
->B : typeof B
+>B : B
 
     export class C {    // class defined in module 
 >C : C
     }
 }
 new B.C(); 
->new B.C() : C
->B.C : typeof C
+>new B.C() : B.C
+>B.C : typeof B.C
 >B : typeof B
->C : typeof C
+>C : typeof B.C
 
diff --git a/tests/baselines/reference/funduleOfFunctionWithoutReturnTypeAnnotation.types b/tests/baselines/reference/funduleOfFunctionWithoutReturnTypeAnnotation.types
index 9284ce3e19d..2b1c79b6d6e 100644
--- a/tests/baselines/reference/funduleOfFunctionWithoutReturnTypeAnnotation.types
+++ b/tests/baselines/reference/funduleOfFunctionWithoutReturnTypeAnnotation.types
@@ -8,7 +8,7 @@ function fn() {
 >n : number
 }
 module fn {
->fn : typeof fn
+>fn : fn
 
     export var n = 1;
 >n : number
diff --git a/tests/baselines/reference/funduleUsedAcrossFileBoundary.types b/tests/baselines/reference/funduleUsedAcrossFileBoundary.types
index a468e471bd2..778585b7121 100644
--- a/tests/baselines/reference/funduleUsedAcrossFileBoundary.types
+++ b/tests/baselines/reference/funduleUsedAcrossFileBoundary.types
@@ -6,7 +6,7 @@ declare function Q<T>(value: T): string;
 >T : T
 
 declare module Q {
->Q : typeof Q
+>Q : Q
 
     interface Promise<T> {
 >Promise : Promise<T>
@@ -24,16 +24,16 @@ declare module Q {
 function promiseWithCancellation<T>(promise: Q.Promise<T>) {
 >promiseWithCancellation : typeof promiseWithCancellation
 >T : T
->promise : Promise<T>
+>promise : Q.Promise<T>
 >Q : Q
->Promise : Promise<T>
+>Promise : Q.Promise<T>
 >T : T
 
     var deferred = Q.defer<T>(); // used to be an error
 >deferred : string
 >Q.defer<T>() : string
->Q.defer : typeof defer
+>Q.defer : typeof Q.defer
 >Q : typeof Q
->defer : typeof defer
+>defer : typeof Q.defer
 >T : T
 }
diff --git a/tests/baselines/reference/generatedContextualTyping.types b/tests/baselines/reference/generatedContextualTyping.types
index 13254eb8d22..023ca28eda4 100644
--- a/tests/baselines/reference/generatedContextualTyping.types
+++ b/tests/baselines/reference/generatedContextualTyping.types
@@ -90,7 +90,7 @@ var x7: Base[] = [d1, d2];
 
 var x8: Array<Base> = [d1, d2];
 >x8 : Base[]
->Array : T[]
+>Array : Array<T>
 >Base : Base
 >[d1, d2] : Base[]
 >d1 : Derived1
@@ -202,7 +202,7 @@ class x19 { member: Base[] = [d1, d2] }
 class x20 { member: Array<Base> = [d1, d2] }
 >x20 : x20
 >member : Base[]
->Array : T[]
+>Array : Array<T>
 >Base : Base
 >[d1, d2] : Base[]
 >d1 : Derived1
@@ -318,7 +318,7 @@ class x31 { private member: Base[] = [d1, d2] }
 class x32 { private member: Array<Base> = [d1, d2] }
 >x32 : x32
 >member : Base[]
->Array : T[]
+>Array : Array<T>
 >Base : Base
 >[d1, d2] : Base[]
 >d1 : Derived1
@@ -434,7 +434,7 @@ class x43 { public member: Base[] = [d1, d2] }
 class x44 { public member: Array<Base> = [d1, d2] }
 >x44 : x44
 >member : Base[]
->Array : T[]
+>Array : Array<T>
 >Base : Base
 >[d1, d2] : Base[]
 >d1 : Derived1
@@ -550,7 +550,7 @@ class x55 { static member: Base[] = [d1, d2] }
 class x56 { static member: Array<Base> = [d1, d2] }
 >x56 : x56
 >member : Base[]
->Array : T[]
+>Array : Array<T>
 >Base : Base
 >[d1, d2] : Base[]
 >d1 : Derived1
@@ -666,7 +666,7 @@ class x67 { private static member: Base[] = [d1, d2] }
 class x68 { private static member: Array<Base> = [d1, d2] }
 >x68 : x68
 >member : Base[]
->Array : T[]
+>Array : Array<T>
 >Base : Base
 >[d1, d2] : Base[]
 >d1 : Derived1
@@ -782,7 +782,7 @@ class x79 { public static member: Base[] = [d1, d2] }
 class x80 { public static member: Array<Base> = [d1, d2] }
 >x80 : x80
 >member : Base[]
->Array : T[]
+>Array : Array<T>
 >Base : Base
 >[d1, d2] : Base[]
 >d1 : Derived1
@@ -898,7 +898,7 @@ class x91 { constructor(parm: Base[] = [d1, d2]) { } }
 class x92 { constructor(parm: Array<Base> = [d1, d2]) { } }
 >x92 : x92
 >parm : Base[]
->Array : T[]
+>Array : Array<T>
 >Base : Base
 >[d1, d2] : Base[]
 >d1 : Derived1
@@ -1014,7 +1014,7 @@ class x103 { constructor(public parm: Base[] = [d1, d2]) { } }
 class x104 { constructor(public parm: Array<Base> = [d1, d2]) { } }
 >x104 : x104
 >parm : Base[]
->Array : T[]
+>Array : Array<T>
 >Base : Base
 >[d1, d2] : Base[]
 >d1 : Derived1
@@ -1130,7 +1130,7 @@ class x115 { constructor(private parm: Base[] = [d1, d2]) { } }
 class x116 { constructor(private parm: Array<Base> = [d1, d2]) { } }
 >x116 : x116
 >parm : Base[]
->Array : T[]
+>Array : Array<T>
 >Base : Base
 >[d1, d2] : Base[]
 >d1 : Derived1
@@ -1246,7 +1246,7 @@ function x127(parm: Base[] = [d1, d2]) { }
 function x128(parm: Array<Base> = [d1, d2]) { }
 >x128 : typeof x128
 >parm : Base[]
->Array : T[]
+>Array : Array<T>
 >Base : Base
 >[d1, d2] : Base[]
 >d1 : Derived1
@@ -1354,7 +1354,7 @@ function x139(): Base[] { return [d1, d2]; }
 
 function x140(): Array<Base> { return [d1, d2]; }
 >x140 : typeof x140
->Array : T[]
+>Array : Array<T>
 >Base : Base
 >[d1, d2] : Base[]
 >d1 : Derived1
@@ -1487,7 +1487,7 @@ function x151(): Base[] { return [d1, d2]; return [d1, d2]; }
 
 function x152(): Array<Base> { return [d1, d2]; return [d1, d2]; }
 >x152 : typeof x152
->Array : T[]
+>Array : Array<T>
 >Base : Base
 >[d1, d2] : Base[]
 >d1 : Derived1
@@ -1620,7 +1620,7 @@ var x163: () => Base[] = () => { return [d1, d2]; };
 
 var x164: () => Array<Base> = () => { return [d1, d2]; };
 >x164 : () => Base[]
->Array : T[]
+>Array : Array<T>
 >Base : Base
 >() => { return [d1, d2]; } : () => Base[]
 >[d1, d2] : Base[]
@@ -1736,7 +1736,7 @@ var x175: () => Base[] = function() { return [d1, d2]; };
 
 var x176: () => Array<Base> = function() { return [d1, d2]; };
 >x176 : () => Base[]
->Array : T[]
+>Array : Array<T>
 >Base : Base
 >function() { return [d1, d2]; } : () => Base[]
 >[d1, d2] : Base[]
@@ -1787,7 +1787,7 @@ var x180: () => Genric<Base> = function() { return { func: n => { return [d1, d2
 >d2 : Derived2
 
 module x181 { var t: () => Base[] = () => [d1, d2]; }
->x181 : typeof x181
+>x181 : x181
 >t : () => Base[]
 >Base : Base
 >() => [d1, d2] : () => Base[]
@@ -1796,7 +1796,7 @@ module x181 { var t: () => Base[] = () => [d1, d2]; }
 >d2 : Derived2
 
 module x182 { var t: () => Base[] = function() { return [d1, d2] }; }
->x182 : typeof x182
+>x182 : x182
 >t : () => Base[]
 >Base : Base
 >function() { return [d1, d2] } : () => Base[]
@@ -1805,7 +1805,7 @@ module x182 { var t: () => Base[] = function() { return [d1, d2] }; }
 >d2 : Derived2
 
 module x183 { var t: () => Base[] = function named() { return [d1, d2] }; }
->x183 : typeof x183
+>x183 : x183
 >t : () => Base[]
 >Base : Base
 >function named() { return [d1, d2] } : () => Base[]
@@ -1815,7 +1815,7 @@ module x183 { var t: () => Base[] = function named() { return [d1, d2] }; }
 >d2 : Derived2
 
 module x184 { var t: { (): Base[]; } = () => [d1, d2]; }
->x184 : typeof x184
+>x184 : x184
 >t : () => Base[]
 >Base : Base
 >() => [d1, d2] : () => Base[]
@@ -1824,7 +1824,7 @@ module x184 { var t: { (): Base[]; } = () => [d1, d2]; }
 >d2 : Derived2
 
 module x185 { var t: { (): Base[]; } = function() { return [d1, d2] }; }
->x185 : typeof x185
+>x185 : x185
 >t : () => Base[]
 >Base : Base
 >function() { return [d1, d2] } : () => Base[]
@@ -1833,7 +1833,7 @@ module x185 { var t: { (): Base[]; } = function() { return [d1, d2] }; }
 >d2 : Derived2
 
 module x186 { var t: { (): Base[]; } = function named() { return [d1, d2] }; }
->x186 : typeof x186
+>x186 : x186
 >t : () => Base[]
 >Base : Base
 >function named() { return [d1, d2] } : () => Base[]
@@ -1843,7 +1843,7 @@ module x186 { var t: { (): Base[]; } = function named() { return [d1, d2] }; }
 >d2 : Derived2
 
 module x187 { var t: Base[] = [d1, d2]; }
->x187 : typeof x187
+>x187 : x187
 >t : Base[]
 >Base : Base
 >[d1, d2] : Base[]
@@ -1851,16 +1851,16 @@ module x187 { var t: Base[] = [d1, d2]; }
 >d2 : Derived2
 
 module x188 { var t: Array<Base> = [d1, d2]; }
->x188 : typeof x188
+>x188 : x188
 >t : Base[]
->Array : T[]
+>Array : Array<T>
 >Base : Base
 >[d1, d2] : Base[]
 >d1 : Derived1
 >d2 : Derived2
 
 module x189 { var t: { [n: number]: Base; } = [d1, d2]; }
->x189 : typeof x189
+>x189 : x189
 >t : { [x: number]: Base; }
 >n : number
 >Base : Base
@@ -1869,7 +1869,7 @@ module x189 { var t: { [n: number]: Base; } = [d1, d2]; }
 >d2 : Derived2
 
 module x190 { var t: {n: Base[]; }  = { n: [d1, d2] }; }
->x190 : typeof x190
+>x190 : x190
 >t : { n: Base[]; }
 >n : Base[]
 >Base : Base
@@ -1880,7 +1880,7 @@ module x190 { var t: {n: Base[]; }  = { n: [d1, d2] }; }
 >d2 : Derived2
 
 module x191 { var t: (s: Base[]) => any = n => { var n: Base[]; return null; }; }
->x191 : typeof x191
+>x191 : x191
 >t : (s: Base[]) => any
 >s : Base[]
 >Base : Base
@@ -1890,7 +1890,7 @@ module x191 { var t: (s: Base[]) => any = n => { var n: Base[]; return null; };
 >Base : Base
 
 module x192 { var t: Genric<Base> = { func: n => { return [d1, d2]; } }; }
->x192 : typeof x192
+>x192 : x192
 >t : Genric<Base>
 >Genric : Genric<T>
 >Base : Base
@@ -1903,7 +1903,7 @@ module x192 { var t: Genric<Base> = { func: n => { return [d1, d2]; } }; }
 >d2 : Derived2
 
 module x193 { export var t: () => Base[] = () => [d1, d2]; }
->x193 : typeof x193
+>x193 : x193
 >t : () => Base[]
 >Base : Base
 >() => [d1, d2] : () => Base[]
@@ -1912,7 +1912,7 @@ module x193 { export var t: () => Base[] = () => [d1, d2]; }
 >d2 : Derived2
 
 module x194 { export var t: () => Base[] = function() { return [d1, d2] }; }
->x194 : typeof x194
+>x194 : x194
 >t : () => Base[]
 >Base : Base
 >function() { return [d1, d2] } : () => Base[]
@@ -1921,7 +1921,7 @@ module x194 { export var t: () => Base[] = function() { return [d1, d2] }; }
 >d2 : Derived2
 
 module x195 { export var t: () => Base[] = function named() { return [d1, d2] }; }
->x195 : typeof x195
+>x195 : x195
 >t : () => Base[]
 >Base : Base
 >function named() { return [d1, d2] } : () => Base[]
@@ -1931,7 +1931,7 @@ module x195 { export var t: () => Base[] = function named() { return [d1, d2] };
 >d2 : Derived2
 
 module x196 { export var t: { (): Base[]; } = () => [d1, d2]; }
->x196 : typeof x196
+>x196 : x196
 >t : () => Base[]
 >Base : Base
 >() => [d1, d2] : () => Base[]
@@ -1940,7 +1940,7 @@ module x196 { export var t: { (): Base[]; } = () => [d1, d2]; }
 >d2 : Derived2
 
 module x197 { export var t: { (): Base[]; } = function() { return [d1, d2] }; }
->x197 : typeof x197
+>x197 : x197
 >t : () => Base[]
 >Base : Base
 >function() { return [d1, d2] } : () => Base[]
@@ -1949,7 +1949,7 @@ module x197 { export var t: { (): Base[]; } = function() { return [d1, d2] }; }
 >d2 : Derived2
 
 module x198 { export var t: { (): Base[]; } = function named() { return [d1, d2] }; }
->x198 : typeof x198
+>x198 : x198
 >t : () => Base[]
 >Base : Base
 >function named() { return [d1, d2] } : () => Base[]
@@ -1959,7 +1959,7 @@ module x198 { export var t: { (): Base[]; } = function named() { return [d1, d2]
 >d2 : Derived2
 
 module x199 { export var t: Base[] = [d1, d2]; }
->x199 : typeof x199
+>x199 : x199
 >t : Base[]
 >Base : Base
 >[d1, d2] : Base[]
@@ -1967,16 +1967,16 @@ module x199 { export var t: Base[] = [d1, d2]; }
 >d2 : Derived2
 
 module x200 { export var t: Array<Base> = [d1, d2]; }
->x200 : typeof x200
+>x200 : x200
 >t : Base[]
->Array : T[]
+>Array : Array<T>
 >Base : Base
 >[d1, d2] : Base[]
 >d1 : Derived1
 >d2 : Derived2
 
 module x201 { export var t: { [n: number]: Base; } = [d1, d2]; }
->x201 : typeof x201
+>x201 : x201
 >t : { [x: number]: Base; }
 >n : number
 >Base : Base
@@ -1985,7 +1985,7 @@ module x201 { export var t: { [n: number]: Base; } = [d1, d2]; }
 >d2 : Derived2
 
 module x202 { export var t: {n: Base[]; }  = { n: [d1, d2] }; }
->x202 : typeof x202
+>x202 : x202
 >t : { n: Base[]; }
 >n : Base[]
 >Base : Base
@@ -1996,7 +1996,7 @@ module x202 { export var t: {n: Base[]; }  = { n: [d1, d2] }; }
 >d2 : Derived2
 
 module x203 { export var t: (s: Base[]) => any = n => { var n: Base[]; return null; }; }
->x203 : typeof x203
+>x203 : x203
 >t : (s: Base[]) => any
 >s : Base[]
 >Base : Base
@@ -2006,7 +2006,7 @@ module x203 { export var t: (s: Base[]) => any = n => { var n: Base[]; return nu
 >Base : Base
 
 module x204 { export var t: Genric<Base> = { func: n => { return [d1, d2]; } }; }
->x204 : typeof x204
+>x204 : x204
 >t : Genric<Base>
 >Genric : Genric<T>
 >Base : Base
@@ -2067,7 +2067,7 @@ var x211 = <Base[]>[d1, d2];
 var x212 = <Array<Base>>[d1, d2];
 >x212 : Base[]
 ><Array<Base>>[d1, d2] : Base[]
->Array : T[]
+>Array : Array<T>
 >Base : Base
 >[d1, d2] : Base[]
 >d1 : Derived1
@@ -2172,7 +2172,7 @@ var x222 = (<Array<Base>>undefined) || [d1, d2];
 >(<Array<Base>>undefined) || [d1, d2] : Base[]
 >(<Array<Base>>undefined) : Base[]
 ><Array<Base>>undefined : Base[]
->Array : T[]
+>Array : Array<T>
 >Base : Base
 >undefined : undefined
 >[d1, d2] : Base[]
@@ -2278,7 +2278,7 @@ var x231: Base[]; x231 = [d1, d2];
 
 var x232: Array<Base>; x232 = [d1, d2];
 >x232 : Base[]
->Array : T[]
+>Array : Array<T>
 >Base : Base
 >x232 = [d1, d2] : Base[]
 >x232 : Base[]
@@ -2414,7 +2414,7 @@ var x243: { n: Base[]; } = { n: [d1, d2] };
 var x244: { n: Array<Base>; } = { n: [d1, d2] };
 >x244 : { n: Base[]; }
 >n : Base[]
->Array : T[]
+>Array : Array<T>
 >Base : Base
 >{ n: [d1, d2] } : { n: Base[]; }
 >n : Base[]
@@ -2511,7 +2511,7 @@ var x255: Base[][] = [[d1, d2]];
 
 var x256: Array<Base>[] = [[d1, d2]];
 >x256 : Base[][]
->Array : T[]
+>Array : Array<T>
 >Base : Base
 >[[d1, d2]] : Base[][]
 >[d1, d2] : Base[]
@@ -2604,7 +2604,7 @@ var x265: Base[] = [d1, d2] || undefined;
 
 var x266: Array<Base> = [d1, d2] || undefined;
 >x266 : Base[]
->Array : T[]
+>Array : Array<T>
 >Base : Base
 >[d1, d2] || undefined : Base[]
 >[d1, d2] : Base[]
@@ -2687,7 +2687,7 @@ var x273: Base[] = undefined || [d1, d2];
 
 var x274: Array<Base> = undefined || [d1, d2];
 >x274 : Base[]
->Array : T[]
+>Array : Array<T>
 >Base : Base
 >undefined || [d1, d2] : Base[]
 >undefined : undefined
@@ -2786,7 +2786,7 @@ var x281: Base[] = [d1, d2] || [d1, d2];
 
 var x282: Array<Base> = [d1, d2] || [d1, d2];
 >x282 : Base[]
->Array : T[]
+>Array : Array<T>
 >Base : Base
 >[d1, d2] || [d1, d2] : Base[]
 >[d1, d2] : Base[]
@@ -2919,7 +2919,7 @@ var x291: Base[] = true ? [d1, d2] : [d1, d2];
 
 var x292: Array<Base> = true ? [d1, d2] : [d1, d2];
 >x292 : Base[]
->Array : T[]
+>Array : Array<T>
 >Base : Base
 >true ? [d1, d2] : [d1, d2] : Base[]
 >[d1, d2] : Base[]
@@ -3064,7 +3064,7 @@ var x303: Base[] = true ? undefined : [d1, d2];
 
 var x304: Array<Base> = true ? undefined : [d1, d2];
 >x304 : Base[]
->Array : T[]
+>Array : Array<T>
 >Base : Base
 >true ? undefined : [d1, d2] : Base[]
 >undefined : undefined
@@ -3192,7 +3192,7 @@ var x315: Base[] = true ? [d1, d2] : undefined;
 
 var x316: Array<Base> = true ? [d1, d2] : undefined;
 >x316 : Base[]
->Array : T[]
+>Array : Array<T>
 >Base : Base
 >true ? [d1, d2] : undefined : Base[]
 >[d1, d2] : Base[]
@@ -3328,7 +3328,7 @@ function x327(n: Base[]) { }; x327([d1, d2]);
 function x328(n: Array<Base>) { }; x328([d1, d2]);
 >x328 : typeof x328
 >n : Base[]
->Array : T[]
+>Array : Array<T>
 >Base : Base
 >x328([d1, d2]) : void
 >x328 : typeof x328
@@ -3483,7 +3483,7 @@ var x340 = (n: Array<Base>) => n; x340([d1, d2]);
 >x340 : (n: Base[]) => Base[]
 >(n: Array<Base>) => n : (n: Base[]) => Base[]
 >n : Base[]
->Array : T[]
+>Array : Array<T>
 >Base : Base
 >n : Base[]
 >x340([d1, d2]) : Base[]
@@ -3640,7 +3640,7 @@ var x352 = function(n: Array<Base>) { }; x352([d1, d2]);
 >x352 : (n: Base[]) => void
 >function(n: Array<Base>) { } : (n: Base[]) => void
 >n : Base[]
->Array : T[]
+>Array : Array<T>
 >Base : Base
 >x352([d1, d2]) : void
 >x352 : (n: Base[]) => void
diff --git a/tests/baselines/reference/generativeRecursionWithTypeOf.types b/tests/baselines/reference/generativeRecursionWithTypeOf.types
index a781b308c13..1c06de8bed1 100644
--- a/tests/baselines/reference/generativeRecursionWithTypeOf.types
+++ b/tests/baselines/reference/generativeRecursionWithTypeOf.types
@@ -4,7 +4,7 @@ class C<T> {
 >T : T
 
     static foo(x: number) { }
->foo : typeof foo
+>foo : (x: number) => void
 >x : number
 
     type: T;
@@ -13,7 +13,7 @@ class C<T> {
 }
 
 module M {
->M : typeof M
+>M : M
 
     export function f(x: typeof C) {   
 >f : typeof f
diff --git a/tests/baselines/reference/genericArgumentCallSigAssignmentCompat.types b/tests/baselines/reference/genericArgumentCallSigAssignmentCompat.types
index d7128e9dac4..a36b2219360 100644
--- a/tests/baselines/reference/genericArgumentCallSigAssignmentCompat.types
+++ b/tests/baselines/reference/genericArgumentCallSigAssignmentCompat.types
@@ -38,30 +38,30 @@ module Underscore {
 }
  
 declare var _: Underscore.Static;
->_ : Static
+>_ : Underscore.Static
 >Underscore : Underscore
->Static : Static
+>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
 _.all([true, 1, null, 'yes'], _.identity);
 >_.all([true, 1, null, 'yes'], _.identity) : boolean
->_.all : <T>(list: T[], iterator?: Iterator<T, boolean>, context?: any) => boolean
->_ : Static
->all : <T>(list: T[], iterator?: Iterator<T, boolean>, context?: any) => boolean
+>_.all : <T>(list: T[], iterator?: Underscore.Iterator<T, boolean>, context?: any) => boolean
+>_ : Underscore.Static
+>all : <T>(list: T[], iterator?: Underscore.Iterator<T, boolean>, context?: any) => boolean
 >[true, 1, null, 'yes'] : {}[]
 >_.identity : <T>(value: T) => T
->_ : Static
+>_ : Underscore.Static
 >identity : <T>(value: T) => T
  
 // Ok, because fixing makes us infer boolean for T
 _.all([true], _.identity);
 >_.all([true], _.identity) : boolean
->_.all : <T>(list: T[], iterator?: Iterator<T, boolean>, context?: any) => boolean
->_ : Static
->all : <T>(list: T[], iterator?: Iterator<T, boolean>, context?: any) => boolean
+>_.all : <T>(list: T[], iterator?: Underscore.Iterator<T, boolean>, context?: any) => boolean
+>_ : Underscore.Static
+>all : <T>(list: T[], iterator?: Underscore.Iterator<T, boolean>, context?: any) => boolean
 >[true] : boolean[]
 >_.identity : <T>(value: T) => T
->_ : Static
+>_ : Underscore.Static
 >identity : <T>(value: T) => T
 
diff --git a/tests/baselines/reference/genericCallWithObjectLiteralArgs.types b/tests/baselines/reference/genericCallWithObjectLiteralArgs.types
index 2b825fb06f2..ec243041395 100644
--- a/tests/baselines/reference/genericCallWithObjectLiteralArgs.types
+++ b/tests/baselines/reference/genericCallWithObjectLiteralArgs.types
@@ -35,9 +35,9 @@ var r3 = foo({ bar: foo, baz: foo }); // T = any
 >foo : typeof foo
 >{ bar: foo, baz: foo } : { bar: typeof foo; baz: typeof foo; }
 >bar : typeof foo
->foo : foo
+>foo : typeof foo
 >baz : typeof foo
->foo : foo
+>foo : typeof foo
 
 var r4 = foo<Object>({ bar: 1, baz: '' }); // T = Object
 >r4 : { bar: Object; baz: Object; }
diff --git a/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments.types b/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments.types
index 2a9b0c2e861..c88c4124353 100644
--- a/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments.types
+++ b/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments.types
@@ -3,7 +3,7 @@
 // Inferences are made quadratic-pairwise to and from these overload sets
 
 module NonGenericParameter {
->NonGenericParameter : typeof NonGenericParameter
+>NonGenericParameter : NonGenericParameter
 
     var a: {
 >a : { new (x: boolean): boolean; new (x: string): string; }
@@ -46,7 +46,7 @@ module NonGenericParameter {
 }
 
 module GenericParameter {
->GenericParameter : typeof GenericParameter
+>GenericParameter : GenericParameter
 
     function foo5<T>(cb: { new(x: T): string; new(x: number): T }) {
 >foo5 : typeof foo5
diff --git a/tests/baselines/reference/genericCallWithOverloadedFunctionTypedArguments.types b/tests/baselines/reference/genericCallWithOverloadedFunctionTypedArguments.types
index ecf23d2ead9..3002ff4de11 100644
--- a/tests/baselines/reference/genericCallWithOverloadedFunctionTypedArguments.types
+++ b/tests/baselines/reference/genericCallWithOverloadedFunctionTypedArguments.types
@@ -3,7 +3,7 @@
 // Inferences are made quadratic-pairwise to and from these overload sets
 
 module NonGenericParameter {
->NonGenericParameter : typeof NonGenericParameter
+>NonGenericParameter : NonGenericParameter
 
     var a: {
 >a : { (x: boolean): boolean; (x: string): string; }
@@ -50,7 +50,7 @@ module NonGenericParameter {
 }
 
 module GenericParameter {
->GenericParameter : typeof GenericParameter
+>GenericParameter : GenericParameter
 
     function foo5<T>(cb: { (x: T): string; (x: number): T }) {
 >foo5 : typeof foo5
diff --git a/tests/baselines/reference/genericCallbacksAndClassHierarchy.types b/tests/baselines/reference/genericCallbacksAndClassHierarchy.types
index 97e584dca3f..646c93d1ffd 100644
--- a/tests/baselines/reference/genericCallbacksAndClassHierarchy.types
+++ b/tests/baselines/reference/genericCallbacksAndClassHierarchy.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/genericCallbacksAndClassHierarchy.ts ===
 module M {
->M : typeof M
+>M : M
 
     export interface I<T> {
 >I : I<T>
diff --git a/tests/baselines/reference/genericClassImplementingGenericInterfaceFromAnotherModule.types b/tests/baselines/reference/genericClassImplementingGenericInterfaceFromAnotherModule.types
index 583b6163b53..a0e926c9ccf 100644
--- a/tests/baselines/reference/genericClassImplementingGenericInterfaceFromAnotherModule.types
+++ b/tests/baselines/reference/genericClassImplementingGenericInterfaceFromAnotherModule.types
@@ -7,13 +7,13 @@ module foo {
 >T : T
 }
 module bar {
->bar : typeof bar
+>bar : bar
 
     export class Foo<T> implements foo.IFoo<T> { }
 >Foo : Foo<T>
 >T : T
 >foo : foo
->IFoo : IFoo<T>
+>IFoo : foo.IFoo<T>
 >T : T
 }
 
diff --git a/tests/baselines/reference/genericClassPropertyInheritanceSpecialization.types b/tests/baselines/reference/genericClassPropertyInheritanceSpecialization.types
index 1f5f8cd4088..46cec5f6b83 100644
--- a/tests/baselines/reference/genericClassPropertyInheritanceSpecialization.types
+++ b/tests/baselines/reference/genericClassPropertyInheritanceSpecialization.types
@@ -137,7 +137,7 @@ interface KnockoutObservableArrayStatic {
 }
 
 declare module ko {
->ko : typeof ko
+>ko : ko
 
     export var observableArray: KnockoutObservableArrayStatic;
 >observableArray : KnockoutObservableArrayStatic
@@ -145,9 +145,9 @@ declare module ko {
 }
 
 module Portal.Controls.Validators {
->Portal : typeof Portal
->Controls : typeof Controls
->Validators : typeof Validators
+>Portal : Portal
+>Controls : Controls
+>Validators : Validators
 
     export class Validator<TValue> {
 >Validator : Validator<TValue>
@@ -183,18 +183,18 @@ module Portal.Controls.Validators {
 }
 
 module PortalFx.ViewModels.Controls.Validators {
->PortalFx : typeof PortalFx
->ViewModels : typeof ViewModels
->Controls : typeof Controls
->Validators : typeof Validators
+>PortalFx : PortalFx
+>ViewModels : ViewModels
+>Controls : Controls
+>Validators : Validators
 
     export class Validator<TValue> extends Portal.Controls.Validators.Validator<TValue> {
 >Validator : Validator<TValue>
 >TValue : TValue
 >Portal : Portal
->Controls : Controls
->Validators : Validators
->Validator : Validator<TValue>
+>Controls : Portal.Controls
+>Validators : Portal.Controls.Validators
+>Validator : Portal.Controls.Validators.Validator<TValue>
 >TValue : TValue
 
         constructor(message?: string) {
@@ -213,13 +213,13 @@ interface Contract<TValue> {
 >TValue : TValue
 
     validators: KnockoutObservableArray<PortalFx.ViewModels.Controls.Validators.Validator<TValue>>;
->validators : KnockoutObservableArray<Validator<TValue>>
+>validators : KnockoutObservableArray<PortalFx.ViewModels.Controls.Validators.Validator<TValue>>
 >KnockoutObservableArray : KnockoutObservableArray<T>
 >PortalFx : PortalFx
->ViewModels : ViewModels
->Controls : Controls
->Validators : Validators
->Validator : Validator<TValue>
+>ViewModels : PortalFx.ViewModels
+>Controls : PortalFx.ViewModels.Controls
+>Validators : PortalFx.ViewModels.Controls.Validators
+>Validator : PortalFx.ViewModels.Controls.Validators.Validator<TValue>
 >TValue : TValue
 }
 
@@ -231,23 +231,23 @@ class ViewModel<TValue> implements Contract<TValue> {
 >TValue : TValue
 
     public validators: KnockoutObservableArray<PortalFx.ViewModels.Controls.Validators.Validator<TValue>> = ko.observableArray<PortalFx.ViewModels.Controls.Validators.Validator<TValue>>();
->validators : KnockoutObservableArray<Validator<TValue>>
+>validators : KnockoutObservableArray<PortalFx.ViewModels.Controls.Validators.Validator<TValue>>
 >KnockoutObservableArray : KnockoutObservableArray<T>
 >PortalFx : PortalFx
->ViewModels : ViewModels
->Controls : Controls
->Validators : Validators
->Validator : Validator<TValue>
+>ViewModels : PortalFx.ViewModels
+>Controls : PortalFx.ViewModels.Controls
+>Validators : PortalFx.ViewModels.Controls.Validators
+>Validator : PortalFx.ViewModels.Controls.Validators.Validator<TValue>
 >TValue : TValue
->ko.observableArray<PortalFx.ViewModels.Controls.Validators.Validator<TValue>>() : KnockoutObservableArray<Validator<TValue>>
+>ko.observableArray<PortalFx.ViewModels.Controls.Validators.Validator<TValue>>() : KnockoutObservableArray<PortalFx.ViewModels.Controls.Validators.Validator<TValue>>
 >ko.observableArray : KnockoutObservableArrayStatic
 >ko : typeof ko
 >observableArray : KnockoutObservableArrayStatic
 >PortalFx : PortalFx
->ViewModels : ViewModels
->Controls : Controls
->Validators : Validators
->Validator : Validator<TValue>
+>ViewModels : PortalFx.ViewModels
+>Controls : PortalFx.ViewModels.Controls
+>Validators : PortalFx.ViewModels.Controls.Validators
+>Validator : PortalFx.ViewModels.Controls.Validators.Validator<TValue>
 >TValue : TValue
 }
 
diff --git a/tests/baselines/reference/genericClassStaticMethod.types b/tests/baselines/reference/genericClassStaticMethod.types
index 6db91585fcc..3d4c02317d6 100644
--- a/tests/baselines/reference/genericClassStaticMethod.types
+++ b/tests/baselines/reference/genericClassStaticMethod.types
@@ -4,7 +4,7 @@ class Foo<T> {
 >T : T
 
     static getFoo() {
->getFoo : typeof getFoo
+>getFoo : () => void
     }
 }
 
@@ -15,7 +15,7 @@ class Bar<T> extends Foo<T> {
 >T : T
 
     static getFoo() {
->getFoo : typeof getFoo
+>getFoo : () => void
     }
 }
 
diff --git a/tests/baselines/reference/genericClassWithFunctionTypedMemberArguments.types b/tests/baselines/reference/genericClassWithFunctionTypedMemberArguments.types
index 87037736eff..9414857d0f0 100644
--- a/tests/baselines/reference/genericClassWithFunctionTypedMemberArguments.types
+++ b/tests/baselines/reference/genericClassWithFunctionTypedMemberArguments.types
@@ -3,7 +3,7 @@
 // Using function arguments, no errors expected
 
 module ImmediatelyFix {
->ImmediatelyFix : typeof ImmediatelyFix
+>ImmediatelyFix : ImmediatelyFix
 
     class C<T> {
 >C : C<T>
@@ -103,7 +103,7 @@ module ImmediatelyFix {
 }
 
 module WithCandidates {
->WithCandidates : typeof WithCandidates
+>WithCandidates : WithCandidates
 
     class C<T> {
 >C : C<T>
diff --git a/tests/baselines/reference/genericClassWithObjectTypeArgsAndConstraints.types b/tests/baselines/reference/genericClassWithObjectTypeArgsAndConstraints.types
index 25fe052d498..1692a8fc832 100644
--- a/tests/baselines/reference/genericClassWithObjectTypeArgsAndConstraints.types
+++ b/tests/baselines/reference/genericClassWithObjectTypeArgsAndConstraints.types
@@ -29,7 +29,7 @@ class X<T> {
 }
 
 module Class {
->Class : typeof Class
+>Class : Class
 
     class G<T extends { x: string }> {
 >G : G<T>
@@ -141,7 +141,7 @@ module Class {
 }
 
 module Interface {
->Interface : typeof Interface
+>Interface : Interface
 
     interface G<T extends { x: string }> {
 >G : G<T>
diff --git a/tests/baselines/reference/genericClassWithStaticFactory.types b/tests/baselines/reference/genericClassWithStaticFactory.types
index b0df737ee68..e8847a60e27 100644
--- a/tests/baselines/reference/genericClassWithStaticFactory.types
+++ b/tests/baselines/reference/genericClassWithStaticFactory.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/genericClassWithStaticFactory.ts ===
 module Editor {
->Editor : typeof Editor
+>Editor : Editor
 
     export class List<T> {
 >List : List<T>
diff --git a/tests/baselines/reference/genericClassesInModule.types b/tests/baselines/reference/genericClassesInModule.types
index 65262decdb6..15b24e3881b 100644
--- a/tests/baselines/reference/genericClassesInModule.types
+++ b/tests/baselines/reference/genericClassesInModule.types
@@ -1,7 +1,7 @@
 === tests/cases/compiler/genericClassesInModule.ts ===
 
 module Foo {
->Foo : typeof Foo
+>Foo : Foo
 
     export class B<T>{ }
 >B : B<T>
@@ -12,11 +12,11 @@ module Foo {
 }
 
 var a = new Foo.B<Foo.A>();
->a : B<A>
->new Foo.B<Foo.A>() : B<A>
->Foo.B : typeof B
+>a : Foo.B<Foo.A>
+>new Foo.B<Foo.A>() : Foo.B<Foo.A>
+>Foo.B : typeof Foo.B
 >Foo : typeof Foo
->B : typeof B
+>B : typeof Foo.B
 >Foo : Foo
->A : A
+>A : Foo.A
 
diff --git a/tests/baselines/reference/genericCloduleInModule.types b/tests/baselines/reference/genericCloduleInModule.types
index abc9b400d54..d9351d3ffd3 100644
--- a/tests/baselines/reference/genericCloduleInModule.types
+++ b/tests/baselines/reference/genericCloduleInModule.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/genericCloduleInModule.ts ===
 module A {
->A : typeof A
+>A : A
 
     export class B<T> {
 >B : B<T>
@@ -10,10 +10,10 @@ module A {
 >foo : () => void
 
         static bar() { }
->bar : typeof bar
+>bar : () => void
     }
     export module B {
->B : typeof B
+>B : B
 
         export var x = 1;
 >x : number
@@ -21,13 +21,13 @@ module A {
 }
 
 var b: A.B<number>;
->b : B<number>
+>b : A.B<number>
 >A : A
->B : B<T>
+>B : A.B<T>
 
 b.foo();
 >b.foo() : void
 >b.foo : () => void
->b : B<number>
+>b : A.B<number>
 >foo : () => void
 
diff --git a/tests/baselines/reference/genericConstraintDeclaration.types b/tests/baselines/reference/genericConstraintDeclaration.types
index 336d13c52fe..126da138d4e 100644
--- a/tests/baselines/reference/genericConstraintDeclaration.types
+++ b/tests/baselines/reference/genericConstraintDeclaration.types
@@ -4,7 +4,7 @@ class List<T extends {}>{
 >T : T
 
     static empty<T extends {}>(): List<T>{return null;}
->empty : typeof empty
+>empty : <T extends {}>() => List<T>
 >T : T
 >List : List<T>
 >T : T
diff --git a/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes.types b/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes.types
index 920d66fc175..61fbea7b1ee 100644
--- a/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes.types
+++ b/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/genericConstraintOnExtendedBuiltinTypes.ts ===
 declare module EndGate {
->EndGate : typeof EndGate
+>EndGate : EndGate
 
     export interface ICloneable {
 >ICloneable : ICloneable
@@ -13,11 +13,11 @@ declare module EndGate {
 interface Number extends EndGate.ICloneable { }
 >Number : Number
 >EndGate : EndGate
->ICloneable : ICloneable
+>ICloneable : EndGate.ICloneable
 
 module EndGate.Tweening {
->EndGate : typeof EndGate
->Tweening : typeof Tweening
+>EndGate : EndGate
+>Tweening : Tweening
 
     export class Tween<T extends ICloneable>{
 >Tween : Tween<T>
@@ -47,8 +47,8 @@ module EndGate.Tweening {
 }
 
 module EndGate.Tweening {
->EndGate : typeof EndGate
->Tweening : typeof Tweening
+>EndGate : EndGate
+>Tweening : Tweening
 
     export class NumberTween extends Tween<number>{
 >NumberTween : NumberTween
diff --git a/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes2.types b/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes2.types
index 94dd467ba80..3a5c24a772f 100644
--- a/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes2.types
+++ b/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes2.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/genericConstraintOnExtendedBuiltinTypes2.ts ===
 module EndGate {
->EndGate : typeof EndGate
+>EndGate : EndGate
 
     export interface ICloneable {
 >ICloneable : ICloneable
@@ -13,11 +13,11 @@ module EndGate {
 interface Number extends EndGate.ICloneable { }
 >Number : Number
 >EndGate : EndGate
->ICloneable : ICloneable
+>ICloneable : EndGate.ICloneable
 
 module EndGate.Tweening {
->EndGate : typeof EndGate
->Tweening : typeof Tweening
+>EndGate : EndGate
+>Tweening : Tweening
 
     export class Tween<T extends ICloneable>{
 >Tween : Tween<T>
@@ -46,8 +46,8 @@ module EndGate.Tweening {
 }
 
 module EndGate.Tweening {
->EndGate : typeof EndGate
->Tweening : typeof Tweening
+>EndGate : EndGate
+>Tweening : Tweening
 
     export class NumberTween extends Tween<Number>{
 >NumberTween : NumberTween
diff --git a/tests/baselines/reference/genericFunctionsWithOptionalParameters1.types b/tests/baselines/reference/genericFunctionsWithOptionalParameters1.types
index 74b8b5e6858..7b377f691ba 100644
--- a/tests/baselines/reference/genericFunctionsWithOptionalParameters1.types
+++ b/tests/baselines/reference/genericFunctionsWithOptionalParameters1.types
@@ -7,7 +7,7 @@ interface Utils {
 >T : T
 >S : S
 >c : T[]
->Array : T[]
+>Array : Array<T>
 >T : T
 >folder : (s: S, t: T) => T
 >s : S
diff --git a/tests/baselines/reference/genericInference2.types b/tests/baselines/reference/genericInference2.types
index d8e22021906..1f620391163 100644
--- a/tests/baselines/reference/genericInference2.types
+++ b/tests/baselines/reference/genericInference2.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/genericInference2.ts ===
     declare module ko { 
->ko : typeof ko
+>ko : ko
 
        export interface Observable<T> { 
 >Observable : Observable<T>
@@ -32,68 +32,68 @@
 >T : T
     } 
     var o = { 
->o : { name: Observable<string>; age: Observable<number>; }
->{        name: ko.observable("Bob"),        age: ko.observable(37)     } : { name: Observable<string>; age: Observable<number>; }
+>o : { name: ko.Observable<string>; age: ko.Observable<number>; }
+>{        name: ko.observable("Bob"),        age: ko.observable(37)     } : { name: ko.Observable<string>; age: ko.Observable<number>; }
 
        name: ko.observable("Bob"), 
->name : Observable<string>
->ko.observable("Bob") : Observable<string>
->ko.observable : typeof observable
+>name : ko.Observable<string>
+>ko.observable("Bob") : ko.Observable<string>
+>ko.observable : typeof ko.observable
 >ko : typeof ko
->observable : typeof observable
+>observable : typeof ko.observable
 
        age: ko.observable(37) 
->age : Observable<number>
->ko.observable(37) : Observable<number>
->ko.observable : typeof observable
+>age : ko.Observable<number>
+>ko.observable(37) : ko.Observable<number>
+>ko.observable : typeof ko.observable
 >ko : typeof ko
->observable : typeof observable
+>observable : typeof ko.observable
 
     }; 
     var x_v = o.name().length;  // should be 'number'
 >x_v : number
 >o.name().length : number
 >o.name() : string
->o.name : Observable<string>
->o : { name: Observable<string>; age: Observable<number>; }
->name : Observable<string>
+>o.name : ko.Observable<string>
+>o : { name: ko.Observable<string>; age: ko.Observable<number>; }
+>name : ko.Observable<string>
 >length : number
 
     var age_v = o.age();  // should be 'number'
 >age_v : number
 >o.age() : number
->o.age : Observable<number>
->o : { name: Observable<string>; age: Observable<number>; }
->age : Observable<number>
+>o.age : ko.Observable<number>
+>o : { name: ko.Observable<string>; age: ko.Observable<number>; }
+>age : ko.Observable<number>
 
     var name_v = o.name("Robert");  // should be 'any'
 >name_v : any
 >o.name("Robert") : any
->o.name : Observable<string>
->o : { name: Observable<string>; age: Observable<number>; }
->name : Observable<string>
+>o.name : ko.Observable<string>
+>o : { name: ko.Observable<string>; age: ko.Observable<number>; }
+>name : ko.Observable<string>
 
     var zz_v = o.name.N;  // should be 'number'
 >zz_v : number
 >o.name.N : number
->o.name : Observable<string>
->o : { name: Observable<string>; age: Observable<number>; }
->name : Observable<string>
+>o.name : ko.Observable<string>
+>o : { name: ko.Observable<string>; age: ko.Observable<number>; }
+>name : ko.Observable<string>
 >N : number
 
     var yy_v = o.name.g;  // should be 'boolean'
 >yy_v : boolean
 >o.name.g : boolean
->o.name : Observable<string>
->o : { name: Observable<string>; age: Observable<number>; }
->name : Observable<string>
+>o.name : ko.Observable<string>
+>o : { name: ko.Observable<string>; age: ko.Observable<number>; }
+>name : ko.Observable<string>
 >g : boolean
 
     var rr_v = o.name.r;  // should be 'string'
 >rr_v : string
 >o.name.r : string
->o.name : Observable<string>
->o : { name: Observable<string>; age: Observable<number>; }
->name : Observable<string>
+>o.name : ko.Observable<string>
+>o : { name: ko.Observable<string>; age: ko.Observable<number>; }
+>name : ko.Observable<string>
 >r : string
 
diff --git a/tests/baselines/reference/genericObjectLitReturnType.types b/tests/baselines/reference/genericObjectLitReturnType.types
index 2241002646a..3ecb5706689 100644
--- a/tests/baselines/reference/genericObjectLitReturnType.types
+++ b/tests/baselines/reference/genericObjectLitReturnType.types
@@ -9,7 +9,7 @@ class X<T>
 >T : T
 >{ a: t } : { a: T; }
 >a : T
->t : t
+>t : T
 }
 
  
diff --git a/tests/baselines/reference/genericOfACloduleType1.types b/tests/baselines/reference/genericOfACloduleType1.types
index b530859140e..24ea7c8ece3 100644
--- a/tests/baselines/reference/genericOfACloduleType1.types
+++ b/tests/baselines/reference/genericOfACloduleType1.types
@@ -8,14 +8,14 @@ class G<T>{ bar(x: T) { return x; } }
 >x : T
 
 module M {
->M : typeof M
+>M : M
 
     export class C { foo() { } }
 >C : C
 >foo : () => void
 
     export module C {
->C : typeof C
+>C : C
 
         export class X {
 >X : X
@@ -38,9 +38,9 @@ module M {
 >foo : () => void
 }
 var g2 = new G<M.C>() // was: error Type reference cannot refer to container 'M.C'.
->g2 : G<C>
->new G<M.C>() : G<C>
+>g2 : G<M.C>
+>new G<M.C>() : G<M.C>
 >G : typeof G
 >M : M
->C : C
+>C : M.C
 
diff --git a/tests/baselines/reference/genericOfACloduleType2.types b/tests/baselines/reference/genericOfACloduleType2.types
index 4c224aed12d..4cee4cde19c 100644
--- a/tests/baselines/reference/genericOfACloduleType2.types
+++ b/tests/baselines/reference/genericOfACloduleType2.types
@@ -8,14 +8,14 @@ class G<T>{ bar(x: T) { return x; } }
 >x : T
 
 module M {
->M : typeof M
+>M : M
 
     export class C { foo() { } }
 >C : C
 >foo : () => void
 
     export module C {
->C : typeof C
+>C : C
 
         export class X {
 >X : X
@@ -39,12 +39,12 @@ module M {
 }
 
 module N {
->N : typeof N
+>N : N
 
     var g2 = new G<M.C>()
->g2 : G<C>
->new G<M.C>() : G<C>
+>g2 : G<M.C>
+>new G<M.C>() : G<M.C>
 >G : typeof G
 >M : M
->C : C
+>C : M.C
 }
diff --git a/tests/baselines/reference/genericRecursiveImplicitConstructorErrors2.types b/tests/baselines/reference/genericRecursiveImplicitConstructorErrors2.types
index 2f62a20c415..8ff4190ae7c 100644
--- a/tests/baselines/reference/genericRecursiveImplicitConstructorErrors2.types
+++ b/tests/baselines/reference/genericRecursiveImplicitConstructorErrors2.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/genericRecursiveImplicitConstructorErrors2.ts ===
 module TypeScript2 {
->TypeScript2 : typeof TypeScript2
+>TypeScript2 : TypeScript2
 
   export interface DeclKind { };
 >DeclKind : DeclKind
diff --git a/tests/baselines/reference/genericStaticAnyTypeFunction.types b/tests/baselines/reference/genericStaticAnyTypeFunction.types
index 6e5b89a1e93..9cf511ca0d9 100644
--- a/tests/baselines/reference/genericStaticAnyTypeFunction.types
+++ b/tests/baselines/reference/genericStaticAnyTypeFunction.types
@@ -3,7 +3,7 @@ class A {
 >A : A
 
     static one<T>(source: T, value: number): T {
->one : typeof one
+>one : <T>(source: T, value: number) => T
 >T : T
 >source : T
 >T : T
@@ -15,10 +15,10 @@ class A {
 
     }
     static goo() { return 0; }
->goo : typeof goo
+>goo : () => number
 
     static two<T>(source: T): T {
->two : typeof two
+>two : <T>(source: T) => T
 >T : T
 >source : T
 >T : T
@@ -26,9 +26,9 @@ class A {
 
         return this.one<T>(source, 42); // should not error
 >this.one<T>(source, 42) : T
->this.one : typeof one
+>this.one : <T>(source: T, value: number) => T
 >this : typeof A
->one : typeof one
+>one : <T>(source: T, value: number) => T
 >T : T
 >source : T
 
diff --git a/tests/baselines/reference/genericTypeArgumentInference1.types b/tests/baselines/reference/genericTypeArgumentInference1.types
index 2c85dbe6846..c4416c2c3f1 100644
--- a/tests/baselines/reference/genericTypeArgumentInference1.types
+++ b/tests/baselines/reference/genericTypeArgumentInference1.types
@@ -37,52 +37,52 @@ module Underscore {
     }
 }
 declare var _: Underscore.Static;
->_ : Static
+>_ : Underscore.Static
 >Underscore : Underscore
->Static : Static
+>Static : Underscore.Static
 
 var r = _.all([true, 1, null, 'yes'], _.identity);
 >r : {}
 >_.all([true, 1, null, 'yes'], _.identity) : {}
->_.all : <T>(list: T[], iterator?: Iterator<T, boolean>, context?: any) => T
->_ : Static
->all : <T>(list: T[], iterator?: Iterator<T, boolean>, context?: any) => T
+>_.all : <T>(list: T[], iterator?: Underscore.Iterator<T, boolean>, context?: any) => T
+>_ : Underscore.Static
+>all : <T>(list: T[], iterator?: Underscore.Iterator<T, boolean>, context?: any) => T
 >[true, 1, null, 'yes'] : {}[]
 >_.identity : <T>(value: T) => T
->_ : Static
+>_ : Underscore.Static
 >identity : <T>(value: T) => T
 
 var r2 = _.all([true], _.identity);
 >r2 : boolean
 >_.all([true], _.identity) : boolean
->_.all : <T>(list: T[], iterator?: Iterator<T, boolean>, context?: any) => T
->_ : Static
->all : <T>(list: T[], iterator?: Iterator<T, boolean>, context?: any) => T
+>_.all : <T>(list: T[], iterator?: Underscore.Iterator<T, boolean>, context?: any) => T
+>_ : Underscore.Static
+>all : <T>(list: T[], iterator?: Underscore.Iterator<T, boolean>, context?: any) => T
 >[true] : boolean[]
 >_.identity : <T>(value: T) => T
->_ : Static
+>_ : Underscore.Static
 >identity : <T>(value: T) => T
 
 var r3 = _.all([], _.identity);
 >r3 : any
 >_.all([], _.identity) : any
->_.all : <T>(list: T[], iterator?: Iterator<T, boolean>, context?: any) => T
->_ : Static
->all : <T>(list: T[], iterator?: Iterator<T, boolean>, context?: any) => T
+>_.all : <T>(list: T[], iterator?: Underscore.Iterator<T, boolean>, context?: any) => T
+>_ : Underscore.Static
+>all : <T>(list: T[], iterator?: Underscore.Iterator<T, boolean>, context?: any) => T
 >[] : any[]
 >_.identity : <T>(value: T) => T
->_ : Static
+>_ : Underscore.Static
 >identity : <T>(value: T) => T
 
 var r4 = _.all([<any>true], _.identity);
 >r4 : any
 >_.all([<any>true], _.identity) : any
->_.all : <T>(list: T[], iterator?: Iterator<T, boolean>, context?: any) => T
->_ : Static
->all : <T>(list: T[], iterator?: Iterator<T, boolean>, context?: any) => T
+>_.all : <T>(list: T[], iterator?: Underscore.Iterator<T, boolean>, context?: any) => T
+>_ : Underscore.Static
+>all : <T>(list: T[], iterator?: Underscore.Iterator<T, boolean>, context?: any) => T
 >[<any>true] : any[]
 ><any>true : any
 >_.identity : <T>(value: T) => T
->_ : Static
+>_ : Underscore.Static
 >identity : <T>(value: T) => T
 
diff --git a/tests/baselines/reference/genericTypeWithCallableMembers.js b/tests/baselines/reference/genericTypeWithCallableMembers.js
index c4ebf44c15e..8fd60af9d6b 100644
--- a/tests/baselines/reference/genericTypeWithCallableMembers.js
+++ b/tests/baselines/reference/genericTypeWithCallableMembers.js
@@ -19,7 +19,7 @@ var C = (function () {
         this.data2 = data2;
     }
     C.prototype.create = function () {
-        var x = new this.data(); // no error
+        var x = new this.data(); // error
         var x2 = new this.data2(); // was error, shouldn't be
     };
     return C;
diff --git a/tests/baselines/reference/getterSetterNonAccessor.types b/tests/baselines/reference/getterSetterNonAccessor.types
index 9ca08d4407e..569d4a303b7 100644
--- a/tests/baselines/reference/getterSetterNonAccessor.types
+++ b/tests/baselines/reference/getterSetterNonAccessor.types
@@ -19,11 +19,11 @@ Object.defineProperty({}, "0", <PropertyDescriptor>({
 
           get: getFunc,
 >get : typeof getFunc
->getFunc : getFunc
+>getFunc : typeof getFunc
 
           set: setFunc,
 >set : typeof setFunc
->setFunc : setFunc
+>setFunc : typeof setFunc
 
           configurable: true
 >configurable : boolean
diff --git a/tests/baselines/reference/global.types b/tests/baselines/reference/global.types
index ae041eca65a..103bfd38dff 100644
--- a/tests/baselines/reference/global.types
+++ b/tests/baselines/reference/global.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/global.ts ===
 module M {
->M : typeof M
+>M : M
 
     export function f(y:number) {
 >f : typeof f
@@ -18,8 +18,8 @@ var x=10;
 
 M.f(3);
 >M.f(3) : number
->M.f : typeof f
+>M.f : typeof M.f
 >M : typeof M
->f : typeof f
+>f : typeof M.f
 
 
diff --git a/tests/baselines/reference/heterogeneousArrayLiterals.types b/tests/baselines/reference/heterogeneousArrayLiterals.types
index a6de60ec174..2466fb7164e 100644
--- a/tests/baselines/reference/heterogeneousArrayLiterals.types
+++ b/tests/baselines/reference/heterogeneousArrayLiterals.types
@@ -114,31 +114,31 @@ var derived2: Derived2;
 >Derived2 : Derived2
 
 module Derived {
->Derived : typeof Derived
+>Derived : Derived
 
     var h = [{ foo: base, basear: derived }, { foo: base }]; // {foo: Base}[]
 >h : { foo: Base; }[]
 >[{ foo: base, basear: derived }, { foo: base }] : { foo: Base; }[]
 >{ foo: base, basear: derived } : { foo: Base; basear: Derived; }
 >foo : Base
->base : base
+>base : Base
 >basear : Derived
->derived : derived
+>derived : Derived
 >{ foo: base } : { foo: Base; }
 >foo : Base
->base : base
+>base : Base
 
     var i = [{ foo: base, basear: derived }, { foo: derived }]; // {foo: Derived}[]
 >i : {}[]
 >[{ foo: base, basear: derived }, { foo: derived }] : {}[]
 >{ foo: base, basear: derived } : { foo: Base; basear: Derived; }
 >foo : Base
->base : base
+>base : Base
 >basear : Derived
->derived : derived
+>derived : Derived
 >{ foo: derived } : { foo: Derived; }
 >foo : Derived
->derived : derived
+>derived : Derived
 
     var j = [() => base, () => derived]; // { {}: Base }
 >j : { (): Base; }[]
@@ -206,7 +206,7 @@ module Derived {
 }
 
 module WithContextualType {
->WithContextualType : typeof WithContextualType
+>WithContextualType : WithContextualType
 
     // no errors
     var a: Base[] = [derived, derived2];
diff --git a/tests/baselines/reference/ifDoWhileStatements.types b/tests/baselines/reference/ifDoWhileStatements.types
index b488b6c6fc0..d5535cf55b7 100644
--- a/tests/baselines/reference/ifDoWhileStatements.types
+++ b/tests/baselines/reference/ifDoWhileStatements.types
@@ -56,7 +56,7 @@ function F2(x: number): boolean { return x < 42; }
 >x : number
 
 module M {
->M : typeof M
+>M : M
 
     export class A {
 >A : A
@@ -75,7 +75,7 @@ module M {
 }
 
 module N {
->N : typeof N
+>N : N
 
     export class A {
 >A : A
diff --git a/tests/baselines/reference/implementArrayInterface.types b/tests/baselines/reference/implementArrayInterface.types
index 68d192cee6f..7045c09a57b 100644
--- a/tests/baselines/reference/implementArrayInterface.types
+++ b/tests/baselines/reference/implementArrayInterface.types
@@ -2,7 +2,7 @@
 declare class ArrayConstructor<T> implements Array<T> {
 >ArrayConstructor : ArrayConstructor<T>
 >T : T
->Array : T[]
+>Array : Array<T>
 >T : T
 
     toString(): string;
diff --git a/tests/baselines/reference/importAliasIdentifiers.types b/tests/baselines/reference/importAliasIdentifiers.types
index ee9715ef495..93a6cfb4036 100644
--- a/tests/baselines/reference/importAliasIdentifiers.types
+++ b/tests/baselines/reference/importAliasIdentifiers.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/internalModules/importDeclarations/importAliasIdentifiers.ts ===
 module moduleA {
->moduleA : typeof moduleA
+>moduleA : moduleA
 
     export class Point {
 >Point : Point
@@ -12,21 +12,21 @@ module moduleA {
 }
 
 import alias = moduleA;
->alias : typeof moduleA
+>alias : alias
 >moduleA : typeof moduleA
 
 var p: alias.Point;
->p : Point
+>p : alias.Point
 >alias : alias
->Point : Point
+>Point : alias.Point
 
 var p: moduleA.Point;
->p : Point
+>p : alias.Point
 >moduleA : moduleA
->Point : Point
+>Point : alias.Point
 
 var p: { x: number; y: number; };
->p : Point
+>p : alias.Point
 >x : number
 >y : number
 
@@ -38,7 +38,7 @@ class clodule {
 }
 
 module clodule {
->clodule : typeof clodule
+>clodule : clodule
 
     export interface Point {
 >Point : Point
@@ -56,21 +56,21 @@ module clodule {
 }
 
 import clolias = clodule;
->clolias : typeof clodule
+>clolias : clolias
 >clodule : clodule
 
 var p: clolias.Point;
->p : Point
+>p : alias.Point
 >clolias : clodule
->Point : Point
+>Point : clolias.Point
 
 var p: clodule.Point;
->p : Point
+>p : alias.Point
 >clodule : clodule
->Point : Point
+>Point : clolias.Point
 
 var p: { x: number; y: number; };
->p : Point
+>p : alias.Point
 >x : number
 >y : number
 
@@ -85,7 +85,7 @@ function fundule() {
 }
 
 module fundule {
->fundule : typeof fundule
+>fundule : fundule
 
     export interface Point {
 >Point : Point
@@ -103,21 +103,21 @@ module fundule {
 }
 
 import funlias = fundule;
->funlias : typeof fundule
+>funlias : funlias
 >fundule : typeof fundule
 
 var p: funlias.Point;
->p : Point
+>p : alias.Point
 >funlias : funlias
->Point : Point
+>Point : funlias.Point
 
 var p: fundule.Point;
->p : Point
+>p : alias.Point
 >fundule : fundule
->Point : Point
+>Point : funlias.Point
 
 var p: { x: number; y: number; };
->p : Point
+>p : alias.Point
 >x : number
 >y : number
 
diff --git a/tests/baselines/reference/importAliasWithDottedName.types b/tests/baselines/reference/importAliasWithDottedName.types
index ab316fade5c..c160c44619d 100644
--- a/tests/baselines/reference/importAliasWithDottedName.types
+++ b/tests/baselines/reference/importAliasWithDottedName.types
@@ -1,12 +1,12 @@
 === tests/cases/compiler/importAliasWithDottedName.ts ===
 module M {
->M : typeof M
+>M : M
 
     export var x = 1;
 >x : number
 
     export module N {
->N : typeof N
+>N : N
 
         export var y = 2;
 >y : number
@@ -14,10 +14,10 @@ module M {
 }
 
 module A {
->A : typeof A
+>A : A
 
     import N = M.N;
->N : typeof N
+>N : N
 >M : typeof M
 >N : typeof N
 
diff --git a/tests/baselines/reference/importAndVariableDeclarationConflict2.types b/tests/baselines/reference/importAndVariableDeclarationConflict2.types
index eb4f354a4dc..ff2a54231a5 100644
--- a/tests/baselines/reference/importAndVariableDeclarationConflict2.types
+++ b/tests/baselines/reference/importAndVariableDeclarationConflict2.types
@@ -1,13 +1,13 @@
 === tests/cases/compiler/importAndVariableDeclarationConflict2.ts ===
 module m {
->m : typeof m
+>m : m
 
   export var m = '';
 >m : string
 }
 
 import x = m.m;
->x : string
+>x : x
 >m : typeof m
 >m : string
 
diff --git a/tests/baselines/reference/importDeclWithExportModifierInAmbientContext.types b/tests/baselines/reference/importDeclWithExportModifierInAmbientContext.types
index 0b53cbdd043..36eb1cb93c9 100644
--- a/tests/baselines/reference/importDeclWithExportModifierInAmbientContext.types
+++ b/tests/baselines/reference/importDeclWithExportModifierInAmbientContext.types
@@ -10,10 +10,10 @@ declare module "m" {
     export import a = x.c;
 >a : a
 >x : x
->c : c
+>c : a
 
     var b: a;
->b : c
->a : c
+>b : a
+>a : a
 }
 
diff --git a/tests/baselines/reference/importDeclarationUsedAsTypeQuery.types b/tests/baselines/reference/importDeclarationUsedAsTypeQuery.types
index 6fc80e99913..da218ef066b 100644
--- a/tests/baselines/reference/importDeclarationUsedAsTypeQuery.types
+++ b/tests/baselines/reference/importDeclarationUsedAsTypeQuery.types
@@ -1,11 +1,11 @@
 === tests/cases/compiler/importDeclarationUsedAsTypeQuery_1.ts ===
 ///<reference path='importDeclarationUsedAsTypeQuery_require.ts'/>
 import a = require('importDeclarationUsedAsTypeQuery_require');
->a : typeof "tests/cases/compiler/importDeclarationUsedAsTypeQuery_require"
+>a : a
 
 export var x: typeof a;
->x : typeof "tests/cases/compiler/importDeclarationUsedAsTypeQuery_require"
->a : typeof "tests/cases/compiler/importDeclarationUsedAsTypeQuery_require"
+>x : typeof a
+>a : typeof a
 
 === tests/cases/compiler/importDeclarationUsedAsTypeQuery_require.ts ===
 export class B {
diff --git a/tests/baselines/reference/importImportOnlyModule.types b/tests/baselines/reference/importImportOnlyModule.types
index cbf9fa29a52..41e38e44fac 100644
--- a/tests/baselines/reference/importImportOnlyModule.types
+++ b/tests/baselines/reference/importImportOnlyModule.types
@@ -1,10 +1,10 @@
 === tests/cases/conformance/externalModules/foo_2.ts ===
 import foo = require("./foo_1");
->foo : typeof "tests/cases/conformance/externalModules/foo_1"
+>foo : foo
 
 var x = foo; // Cause a runtime dependency
->x : typeof "tests/cases/conformance/externalModules/foo_1"
->foo : typeof "tests/cases/conformance/externalModules/foo_1"
+>x : typeof foo
+>foo : typeof foo
 
 === tests/cases/conformance/externalModules/foo_0.ts ===
 export class C1 {
@@ -19,7 +19,7 @@ export class C1 {
 
 === tests/cases/conformance/externalModules/foo_1.ts ===
 import c1 = require('./foo_0'); // Makes this an external module
->c1 : typeof "tests/cases/conformance/externalModules/foo_0"
+>c1 : c1
 
 var answer = 42; // No exports
 >answer : number
diff --git a/tests/baselines/reference/importInTypePosition.types b/tests/baselines/reference/importInTypePosition.types
index 8117b9290b7..1e8dc308813 100644
--- a/tests/baselines/reference/importInTypePosition.types
+++ b/tests/baselines/reference/importInTypePosition.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/importInTypePosition.ts ===
 module A {
->A : typeof A
+>A : A
 
     export class Point {
 >Point : Point
@@ -20,28 +20,28 @@ module B {
 >B : B
 
     import a = A; //Error generates 'var <Alias> = <EntityName>;'
->a : typeof A
->A : typeof A
+>a : a
+>A : typeof a
 }
 // no code gen expected
 module C {
->C : typeof C
+>C : C
 
     import a = A; //Error generates 'var <Alias> = <EntityName>;'
->a : typeof A
->A : typeof A
+>a : a
+>A : typeof a
 
     var m: typeof a;
->m : typeof A
->a : typeof A
+>m : typeof a
+>a : typeof a
 
     var p: a.Point;
->p : Point
+>p : a.Point
 >a : a
->Point : Point
+>Point : a.Point
 
     var p = { x: 0, y: 0 };
->p : Point
+>p : a.Point
 >{ x: 0, y: 0 } : { x: number; y: number; }
 >x : number
 >y : number
diff --git a/tests/baselines/reference/importOnAliasedIdentifiers.types b/tests/baselines/reference/importOnAliasedIdentifiers.types
index a7d2f678a30..fefc373f912 100644
--- a/tests/baselines/reference/importOnAliasedIdentifiers.types
+++ b/tests/baselines/reference/importOnAliasedIdentifiers.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/importOnAliasedIdentifiers.ts ===
 module A {
->A : typeof A
+>A : A
 
     export interface X { s: string }
 >X : X
@@ -11,23 +11,23 @@ module A {
 >X : X
 }
 module B {
->B : typeof B
+>B : B
 
     interface A { n: number }
 >A : A
 >n : number
 
     import Y = A; // Alias only for module A
->Y : typeof A
->A : typeof A
+>Y : Y
+>A : typeof Y
 
     import Z = A.X; // Alias for both type and member A.X
->Z : X
->A : typeof A
->X : X
+>Z : Z
+>A : typeof Y
+>X : Y.X
 
     var v: Z = Z;
->v : X
->Z : X
->Z : X
+>v : Y.X
+>Z : Y.X
+>Z : Y.X
 }
diff --git a/tests/baselines/reference/importShadowsGlobalName.types b/tests/baselines/reference/importShadowsGlobalName.types
index fd333fc412b..729d91a24d2 100644
--- a/tests/baselines/reference/importShadowsGlobalName.types
+++ b/tests/baselines/reference/importShadowsGlobalName.types
@@ -1,10 +1,10 @@
 === tests/cases/compiler/Bar.ts ===
 import Error = require('Foo');
->Error : typeof Foo
+>Error : Error
 
 class Bar extends Error {}
 >Bar : Bar
->Error : Foo
+>Error : Error
 
 export = Bar;
 >Bar : Bar
diff --git a/tests/baselines/reference/importStatements.types b/tests/baselines/reference/importStatements.types
index 6b08757d261..1037646857e 100644
--- a/tests/baselines/reference/importStatements.types
+++ b/tests/baselines/reference/importStatements.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/internalModules/codeGeneration/importStatements.ts ===
 module A {
->A : typeof A
+>A : A
 
     export class Point {
 >Point : Point
@@ -21,29 +21,29 @@ module B {
 >B : B
 
     import a = A; //Error generates 'var <Alias> = <EntityName>;'
->a : typeof A
->A : typeof A
+>a : a
+>A : typeof a
 }
 
 // no code gen expected
 module C {
->C : typeof C
+>C : C
 
     import a = A; //Error generates 'var <Alias> = <EntityName>;'
->a : typeof A
->A : typeof A
+>a : a
+>A : typeof a
 
     var m: typeof a;
->m : typeof A
->a : typeof A
+>m : typeof a
+>a : typeof a
 
     var p: a.Point;
->p : Point
+>p : a.Point
 >a : a
->Point : Point
+>Point : a.Point
 
     var p = {x:0, y:0 };
->p : Point
+>p : a.Point
 >{x:0, y:0 } : { x: number; y: number; }
 >x : number
 >y : number
@@ -51,43 +51,43 @@ module C {
 
 // code gen expected
 module D {
->D : typeof D
+>D : D
 
     import a = A;
->a : typeof A
->A : typeof A
+>a : a
+>A : typeof a
 
     var p = new a.Point(1, 1);
->p : Point
->new a.Point(1, 1) : Point
->a.Point : typeof Point
->a : typeof A
->Point : typeof Point
+>p : a.Point
+>new a.Point(1, 1) : a.Point
+>a.Point : typeof a.Point
+>a : typeof a
+>Point : typeof a.Point
 }
 
 module E {
->E : typeof E
+>E : E
 
     import a = A;
->a : typeof A
->A : typeof A
+>a : a
+>A : typeof a
 
     export function xDist(x: a.Point) {
 >xDist : typeof xDist
->x : Point
+>x : a.Point
 >a : a
->Point : Point
+>Point : a.Point
 
         return (a.Origin.x - x.x);
 >(a.Origin.x - x.x) : number
 >a.Origin.x - x.x : number
 >a.Origin.x : number
->a.Origin : Point
->a : typeof A
->Origin : Point
+>a.Origin : a.Point
+>a : typeof a
+>Origin : a.Point
 >x : number
 >x.x : number
->x : Point
+>x : a.Point
 >x : number
     }
 }
diff --git a/tests/baselines/reference/importUsedInExtendsList1.types b/tests/baselines/reference/importUsedInExtendsList1.types
index a6937acb734..59d47b2ee29 100644
--- a/tests/baselines/reference/importUsedInExtendsList1.types
+++ b/tests/baselines/reference/importUsedInExtendsList1.types
@@ -1,12 +1,12 @@
 === tests/cases/compiler/importUsedInExtendsList1_1.ts ===
 ///<reference path='importUsedInExtendsList1_require.ts'/>
 import foo = require('importUsedInExtendsList1_require');
->foo : typeof "tests/cases/compiler/importUsedInExtendsList1_require"
+>foo : foo
 
 class Sub extends foo.Super { }
 >Sub : Sub
 >foo : foo
->Super : Super
+>Super : foo.Super
 
 var s: Sub;
 >s : Sub
diff --git a/tests/baselines/reference/import_reference-exported-alias.types b/tests/baselines/reference/import_reference-exported-alias.types
index e1dffabba5a..bb7a04a6e2e 100644
--- a/tests/baselines/reference/import_reference-exported-alias.types
+++ b/tests/baselines/reference/import_reference-exported-alias.types
@@ -1,31 +1,31 @@
 === tests/cases/compiler/file2.ts ===
 import appJs = require("file1");
->appJs : typeof App
+>appJs : appJs
 
 import Services = appJs.Services;
->Services : typeof Services
->appJs : typeof App
->Services : typeof Services
+>Services : Services
+>appJs : typeof appJs
+>Services : typeof appJs.Services
 
 import UserServices = Services.UserServices;
->UserServices : typeof UserServices
->Services : typeof Services
 >UserServices : UserServices
+>Services : typeof appJs.Services
+>UserServices : Services.UserServices
 
 var x = new UserServices().getUserName();
 >x : string
 >new UserServices().getUserName() : string
 >new UserServices().getUserName : () => string
->new UserServices() : UserServices
->UserServices : typeof UserServices
+>new UserServices() : Services.UserServices
+>UserServices : typeof Services.UserServices
 >getUserName : () => string
 
 === tests/cases/compiler/file1.ts ===
 module App {
->App : typeof App
+>App : App
 
     export module Services {
->Services : typeof Services
+>Services : Services
 
         export class UserServices {
 >UserServices : UserServices
@@ -40,7 +40,7 @@ module App {
 }
 
 import Mod = App;
->Mod : typeof App
+>Mod : Mod
 >App : typeof App
 
 export = Mod;
diff --git a/tests/baselines/reference/import_reference-to-type-alias.types b/tests/baselines/reference/import_reference-to-type-alias.types
index 6f9628f277a..652a3d6df52 100644
--- a/tests/baselines/reference/import_reference-to-type-alias.types
+++ b/tests/baselines/reference/import_reference-to-type-alias.types
@@ -1,29 +1,29 @@
 === tests/cases/compiler/file2.ts ===
 import appJs = require("file1");
->appJs : typeof "tests/cases/compiler/file1"
+>appJs : appJs
 
 import Services = appJs.App.Services;
->Services : typeof Services
->appJs : typeof "tests/cases/compiler/file1"
->App : typeof App
+>Services : Services
+>appJs : typeof appJs
+>App : typeof appJs.App
 >Services : typeof Services
 
 var x = new Services.UserServices().getUserName();
 >x : string
 >new Services.UserServices().getUserName() : string
 >new Services.UserServices().getUserName : () => string
->new Services.UserServices() : UserServices
->Services.UserServices : typeof UserServices
+>new Services.UserServices() : Services.UserServices
+>Services.UserServices : typeof Services.UserServices
 >Services : typeof Services
->UserServices : typeof UserServices
+>UserServices : typeof Services.UserServices
 >getUserName : () => string
 
 === tests/cases/compiler/file1.ts ===
 export module App {
->App : typeof App
+>App : App
 
     export module Services {
->Services : typeof Services
+>Services : Services
 
         export class UserServices {
 >UserServices : UserServices
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 1f7c10e0768..56245e04b67 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
@@ -4,14 +4,14 @@ import ITest = require('ITest');
 >ITest : ITest
 
 var testData: ITest[];
->testData : Name[]
->ITest : Name
+>testData : ITest[]
+>ITest : ITest
 
 var p = testData[0].name;
 >p : string
 >testData[0].name : string
->testData[0] : Name
->testData : Name[]
+>testData[0] : ITest
+>testData : ITest[]
 >name : string
  
 === tests/cases/compiler/b.ts ===
diff --git a/tests/baselines/reference/import_var-referencing-an-imported-module-alias.types b/tests/baselines/reference/import_var-referencing-an-imported-module-alias.types
index 3a51c2216ce..3748937c818 100644
--- a/tests/baselines/reference/import_var-referencing-an-imported-module-alias.types
+++ b/tests/baselines/reference/import_var-referencing-an-imported-module-alias.types
@@ -1,18 +1,18 @@
 === tests/cases/compiler/consumer.ts ===
 
 import host = require("host");
->host : typeof "tests/cases/compiler/host"
+>host : host
 
 var hostVar = host;
->hostVar : typeof "tests/cases/compiler/host"
->host : typeof "tests/cases/compiler/host"
+>hostVar : typeof host
+>host : typeof host
 
 var v = new hostVar.Host();
->v : Host
->new hostVar.Host() : Host
->hostVar.Host : typeof Host
->hostVar : typeof "tests/cases/compiler/host"
->Host : typeof Host
+>v : host.Host
+>new hostVar.Host() : host.Host
+>hostVar.Host : typeof host.Host
+>hostVar : typeof host
+>Host : typeof host.Host
  
 === tests/cases/compiler/host.ts ===
 export class Host { }
diff --git a/tests/baselines/reference/importedModuleClassNameClash.types b/tests/baselines/reference/importedModuleClassNameClash.types
index 907626d345b..b241828af8f 100644
--- a/tests/baselines/reference/importedModuleClassNameClash.types
+++ b/tests/baselines/reference/importedModuleClassNameClash.types
@@ -1,10 +1,10 @@
 === tests/cases/compiler/importedModuleClassNameClash.ts ===
 import foo = m1;
->foo : typeof foo
->m1 : m1
+>foo : foo
+>m1 : foo
  
 export module m1 { }
->m1 : m1
+>m1 : foo
  
 class foo { }
 >foo : foo
diff --git a/tests/baselines/reference/incrementOperatorWithAnyOtherType.types b/tests/baselines/reference/incrementOperatorWithAnyOtherType.types
index 3d43764943a..c62414c40bf 100644
--- a/tests/baselines/reference/incrementOperatorWithAnyOtherType.types
+++ b/tests/baselines/reference/incrementOperatorWithAnyOtherType.types
@@ -24,7 +24,7 @@ class A {
 >a : any
 }
 module M {
->M : typeof M
+>M : M
 
     export var n: any;
 >n : any
diff --git a/tests/baselines/reference/incrementOperatorWithNumberType.types b/tests/baselines/reference/incrementOperatorWithNumberType.types
index ad6ea172ae3..4e6c6310902 100644
--- a/tests/baselines/reference/incrementOperatorWithNumberType.types
+++ b/tests/baselines/reference/incrementOperatorWithNumberType.types
@@ -14,7 +14,7 @@ class A {
 >a : number
 }
 module M {
->M : typeof M
+>M : M
 
     export var n: number;
 >n : number
diff --git a/tests/baselines/reference/indexIntoEnum.types b/tests/baselines/reference/indexIntoEnum.types
index 39849566409..658482cd07c 100644
--- a/tests/baselines/reference/indexIntoEnum.types
+++ b/tests/baselines/reference/indexIntoEnum.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/indexIntoEnum.ts ===
 module M {
->M : typeof M
+>M : M
 
     enum E { }
 >E : E
diff --git a/tests/baselines/reference/inferentialTypingWithFunctionTypeNested.types b/tests/baselines/reference/inferentialTypingWithFunctionTypeNested.types
index 8afebb11aaf..6f50f04bd6d 100644
--- a/tests/baselines/reference/inferentialTypingWithFunctionTypeNested.types
+++ b/tests/baselines/reference/inferentialTypingWithFunctionTypeNested.types
@@ -26,5 +26,5 @@ var s = map("", () => { return { x: identity }; });
 >() => { return { x: identity }; } : () => { x: typeof identity; }
 >{ x: identity } : { x: typeof identity; }
 >x : typeof identity
->identity : identity
+>identity : typeof identity
 
diff --git a/tests/baselines/reference/inferentialTypingWithFunctionTypeSyntacticScenarios.types b/tests/baselines/reference/inferentialTypingWithFunctionTypeSyntacticScenarios.types
index 347036b6981..b8754ee1a1d 100644
--- a/tests/baselines/reference/inferentialTypingWithFunctionTypeSyntacticScenarios.types
+++ b/tests/baselines/reference/inferentialTypingWithFunctionTypeSyntacticScenarios.types
@@ -26,7 +26,7 @@ var dottedIdentity = { x: identity };
 >dottedIdentity : { x: typeof identity; }
 >{ x: identity } : { x: typeof identity; }
 >x : typeof identity
->identity : identity
+>identity : typeof identity
 
 s = map("", dottedIdentity.x);
 >s = map("", dottedIdentity.x) : string
diff --git a/tests/baselines/reference/inheritanceOfGenericConstructorMethod2.types b/tests/baselines/reference/inheritanceOfGenericConstructorMethod2.types
index 0b1e89012af..5e8958f7393 100644
--- a/tests/baselines/reference/inheritanceOfGenericConstructorMethod2.types
+++ b/tests/baselines/reference/inheritanceOfGenericConstructorMethod2.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/inheritanceOfGenericConstructorMethod2.ts ===
 module M {
->M : typeof M
+>M : M
 
    export class C1 { }
 >C1 : C1
@@ -10,46 +10,46 @@ module M {
 >T : T
 }
 module N {
->N : typeof N
+>N : N
 
    export class D1 extends M.C1 { }
 >D1 : D1
 >M : M
->C1 : C1
+>C1 : M.C1
 
    export class D2<T> extends M.C2<T> { }
 >D2 : D2<T>
 >T : T
 >M : M
->C2 : C2<T>
+>C2 : M.C2<T>
 >T : T
 }
 
 var c = new M.C2<number>(); // no error
->c : C2<number>
->new M.C2<number>() : C2<number>
->M.C2 : typeof C2
+>c : M.C2<number>
+>new M.C2<number>() : M.C2<number>
+>M.C2 : typeof M.C2
 >M : typeof M
->C2 : typeof C2
+>C2 : typeof M.C2
 
 var n = new N.D1(); // no error
->n : D1
->new N.D1() : D1
->N.D1 : typeof D1
+>n : N.D1
+>new N.D1() : N.D1
+>N.D1 : typeof N.D1
 >N : typeof N
->D1 : typeof D1
+>D1 : typeof N.D1
 
 var n2 = new N.D2<number>(); // error
->n2 : D2<number>
->new N.D2<number>() : D2<number>
->N.D2 : typeof D2
+>n2 : N.D2<number>
+>new N.D2<number>() : N.D2<number>
+>N.D2 : typeof N.D2
 >N : typeof N
->D2 : typeof D2
+>D2 : typeof N.D2
 
 var n3 = new N.D2(); // no error, D2<any>
->n3 : D2<{}>
->new N.D2() : D2<{}>
->N.D2 : typeof D2
+>n3 : N.D2<{}>
+>new N.D2() : N.D2<{}>
+>N.D2 : typeof N.D2
 >N : typeof N
->D2 : typeof D2
+>D2 : typeof N.D2
 
diff --git a/tests/baselines/reference/inheritanceStaticFuncOverridingMethod.types b/tests/baselines/reference/inheritanceStaticFuncOverridingMethod.types
index 60b851e10d1..ec7b3f5bbf9 100644
--- a/tests/baselines/reference/inheritanceStaticFuncOverridingMethod.types
+++ b/tests/baselines/reference/inheritanceStaticFuncOverridingMethod.types
@@ -3,7 +3,7 @@ class a {
 >a : a
 
     static x() {
->x : typeof x
+>x : () => string
 
         return "10";
     }
@@ -14,7 +14,7 @@ class b extends a {
 >a : a
 
     static x() {
->x : typeof x
+>x : () => string
 
         return "20";
     }
diff --git a/tests/baselines/reference/inheritanceStaticFuncOverridingPropertyOfFuncType.types b/tests/baselines/reference/inheritanceStaticFuncOverridingPropertyOfFuncType.types
index bcecfd22605..842f9ffddf9 100644
--- a/tests/baselines/reference/inheritanceStaticFuncOverridingPropertyOfFuncType.types
+++ b/tests/baselines/reference/inheritanceStaticFuncOverridingPropertyOfFuncType.types
@@ -11,7 +11,7 @@ class b extends a {
 >a : a
 
     static x() {
->x : typeof x
+>x : () => string
 
         return "20";
     }
diff --git a/tests/baselines/reference/inheritanceStaticFunctionOverridingInstanceProperty.types b/tests/baselines/reference/inheritanceStaticFunctionOverridingInstanceProperty.types
index 0f503f5c975..4742dde63f6 100644
--- a/tests/baselines/reference/inheritanceStaticFunctionOverridingInstanceProperty.types
+++ b/tests/baselines/reference/inheritanceStaticFunctionOverridingInstanceProperty.types
@@ -11,7 +11,7 @@ class b extends a {
 >a : a
 
     static x() {
->x : typeof x
+>x : () => string
 
         return new b().x;
 >new b().x : string
diff --git a/tests/baselines/reference/innerAliases2.types b/tests/baselines/reference/innerAliases2.types
index ef599d0d3f6..86cf4296b3e 100644
--- a/tests/baselines/reference/innerAliases2.types
+++ b/tests/baselines/reference/innerAliases2.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/innerAliases2.ts ===
 module _provider {
->_provider : typeof _provider
+>_provider : _provider
 
                 export class UsefulClass {
 >UsefulClass : UsefulClass
@@ -12,33 +12,33 @@ module _provider {
 }
 
 module consumer {
->consumer : typeof consumer
+>consumer : consumer
 
                 import provider = _provider;
->provider : typeof _provider
->_provider : typeof _provider
+>provider : provider
+>_provider : typeof provider
                 
                 var g:provider.UsefulClass= null;
->g : UsefulClass
+>g : provider.UsefulClass
 >provider : provider
->UsefulClass : UsefulClass
+>UsefulClass : provider.UsefulClass
                 
                 function use():provider.UsefulClass { 
 >use : typeof use
 >provider : provider
->UsefulClass : UsefulClass
+>UsefulClass : provider.UsefulClass
 
                                 var p2:provider.UsefulClass= new provider.UsefulClass();
->p2 : UsefulClass
+>p2 : provider.UsefulClass
 >provider : provider
->UsefulClass : UsefulClass
->new provider.UsefulClass() : UsefulClass
->provider.UsefulClass : typeof UsefulClass
->provider : typeof _provider
->UsefulClass : typeof UsefulClass
+>UsefulClass : provider.UsefulClass
+>new provider.UsefulClass() : provider.UsefulClass
+>provider.UsefulClass : typeof provider.UsefulClass
+>provider : typeof provider
+>UsefulClass : typeof provider.UsefulClass
 
                                 return p2; 
->p2 : UsefulClass
+>p2 : provider.UsefulClass
                 }
 }
 
diff --git a/tests/baselines/reference/innerBoundLambdaEmit.types b/tests/baselines/reference/innerBoundLambdaEmit.types
index f800aeb785d..1497e33c455 100644
--- a/tests/baselines/reference/innerBoundLambdaEmit.types
+++ b/tests/baselines/reference/innerBoundLambdaEmit.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/innerBoundLambdaEmit.ts ===
 module M {
->M : typeof M
+>M : M
 
     export class Foo {
 >Foo : Foo
@@ -10,12 +10,12 @@ module M {
 >() => { } : () => void
 }
 interface Array<T> {
->Array : T[]
+>Array : Array<T>
 >T : T
 
     toFoo(): M.Foo
->toFoo : () => Foo
+>toFoo : () => M.Foo
 >M : M
->Foo : Foo
+>Foo : M.Foo
 }
 
diff --git a/tests/baselines/reference/innerExtern.types b/tests/baselines/reference/innerExtern.types
index 17ef88427b3..abea317578a 100644
--- a/tests/baselines/reference/innerExtern.types
+++ b/tests/baselines/reference/innerExtern.types
@@ -1,15 +1,15 @@
 === tests/cases/compiler/innerExtern.ts ===
 module A {
->A : typeof A
+>A : A
 
     export declare module BB {
->BB : typeof BB
+>BB : BB
 
         export var Elephant;
 >Elephant : any
     }
     export module B {
->B : typeof B
+>B : B
 
         export class C {
 >C : C
diff --git a/tests/baselines/reference/innerFunc.types b/tests/baselines/reference/innerFunc.types
index 7725f0c2928..5bbbadfb50a 100644
--- a/tests/baselines/reference/innerFunc.types
+++ b/tests/baselines/reference/innerFunc.types
@@ -11,7 +11,7 @@ function salt() {
 }
 
 module M {
->M : typeof M
+>M : M
 
     export function tungsten() {
 >tungsten : typeof tungsten
diff --git a/tests/baselines/reference/instanceAndStaticDeclarations1.types b/tests/baselines/reference/instanceAndStaticDeclarations1.types
index 6d081b0e62d..c80cf78e37a 100644
--- a/tests/baselines/reference/instanceAndStaticDeclarations1.types
+++ b/tests/baselines/reference/instanceAndStaticDeclarations1.types
@@ -52,7 +52,7 @@ class Point {
 >Point : typeof Point
 
     static distance(p1: Point, p2: Point) { return p1.distance(p2); }
->distance : typeof distance
+>distance : (p1: Point, p2: Point) => number
 >p1 : Point
 >Point : Point
 >p2 : Point
diff --git a/tests/baselines/reference/instanceOfInExternalModules.types b/tests/baselines/reference/instanceOfInExternalModules.types
index d5785247464..dff7b61f71e 100644
--- a/tests/baselines/reference/instanceOfInExternalModules.types
+++ b/tests/baselines/reference/instanceOfInExternalModules.types
@@ -1,7 +1,7 @@
 === tests/cases/compiler/instanceOfInExternalModules_1.ts ===
 ///<reference path='instanceOfInExternalModules_require.ts'/>
 import Bar = require("instanceOfInExternalModules_require");
->Bar : typeof "tests/cases/compiler/instanceOfInExternalModules_require"
+>Bar : Bar
 
 function IsFoo(value: any): boolean {
 >IsFoo : typeof IsFoo
@@ -10,9 +10,9 @@ function IsFoo(value: any): boolean {
     return value instanceof Bar.Foo;
 >value instanceof Bar.Foo : boolean
 >value : any
->Bar.Foo : typeof Foo
->Bar : typeof "tests/cases/compiler/instanceOfInExternalModules_require"
->Foo : typeof Foo
+>Bar.Foo : typeof Bar.Foo
+>Bar : typeof Bar
+>Foo : typeof Bar.Foo
 }
 
 === tests/cases/compiler/instanceOfInExternalModules_require.ts ===
diff --git a/tests/baselines/reference/instantiatedModule.types b/tests/baselines/reference/instantiatedModule.types
index d21f030d4bb..9e16f145c46 100644
--- a/tests/baselines/reference/instantiatedModule.types
+++ b/tests/baselines/reference/instantiatedModule.types
@@ -2,7 +2,7 @@
 // adding the var makes this an instantiated module
 
 module M {
->M : typeof M
+>M : M
 
     export interface Point { x: number; y: number }
 >Point : Point
@@ -45,12 +45,12 @@ var p1: { x: number; y: number; }
 var p1: M.Point;
 >p1 : { x: number; y: number; }
 >M : M
->Point : Point
+>Point : M.Point
 
 // making the point a class instead of an interface 
 // makes this an instantiated mmodule
 module M2 {
->M2 : typeof M2
+>M2 : M2
 
     export class Point {
 >Point : Point
@@ -62,7 +62,7 @@ module M2 {
 >y : number
 
         static Origin(): Point {
->Origin : typeof Origin
+>Origin : () => Point
 >Point : Point
 
             return { x: 0, y: 0 };
@@ -83,30 +83,30 @@ var m2 = M2;
 
 // static side of the class
 var a2: typeof M2.Point;
->a2 : typeof Point
+>a2 : typeof M2.Point
 >M2 : typeof M2
->Point : typeof Point
+>Point : typeof M2.Point
 
 var a2 = m2.Point;
->a2 : typeof Point
->m2.Point : typeof Point
+>a2 : typeof M2.Point
+>m2.Point : typeof M2.Point
 >m2 : typeof M2
->Point : typeof Point
+>Point : typeof M2.Point
 
 var a2 = M2.Point;
->a2 : typeof Point
->M2.Point : typeof Point
+>a2 : typeof M2.Point
+>M2.Point : typeof M2.Point
 >M2 : typeof M2
->Point : typeof Point
+>Point : typeof M2.Point
 
 var o: M2.Point = a2.Origin();
->o : Point
+>o : M2.Point
 >M2 : M2
->Point : Point
->a2.Origin() : Point
->a2.Origin : typeof Origin
->a2 : typeof Point
->Origin : typeof Origin
+>Point : M2.Point
+>a2.Origin() : M2.Point
+>a2.Origin : () => M2.Point
+>a2 : typeof M2.Point
+>Origin : () => M2.Point
 
 var p2: { x: number; y: number }
 >p2 : { x: number; y: number; }
@@ -116,24 +116,24 @@ var p2: { x: number; y: number }
 var p2: M2.Point;
 >p2 : { x: number; y: number; }
 >M2 : M2
->Point : Point
+>Point : M2.Point
 
 var p2 = new m2.Point();
 >p2 : { x: number; y: number; }
->new m2.Point() : Point
->m2.Point : typeof Point
+>new m2.Point() : M2.Point
+>m2.Point : typeof M2.Point
 >m2 : typeof M2
->Point : typeof Point
+>Point : typeof M2.Point
 
 var p2 = new M2.Point();
 >p2 : { x: number; y: number; }
->new M2.Point() : Point
->M2.Point : typeof Point
+>new M2.Point() : M2.Point
+>M2.Point : typeof M2.Point
 >M2 : typeof M2
->Point : typeof Point
+>Point : typeof M2.Point
 
 module M3 {
->M3 : typeof M3
+>M3 : M3
 
     export enum Color { Blue, Red }
 >Color : Color
@@ -150,48 +150,48 @@ var m3 = M3;
 >M3 : typeof M3
 
 var a3: typeof M3.Color;
->a3 : typeof Color
+>a3 : typeof M3.Color
 >M3 : typeof M3
->Color : typeof Color
+>Color : typeof M3.Color
 
 var a3 = m3.Color;
->a3 : typeof Color
->m3.Color : typeof Color
+>a3 : typeof M3.Color
+>m3.Color : typeof M3.Color
 >m3 : typeof M3
->Color : typeof Color
+>Color : typeof M3.Color
 
 var a3 = M3.Color;
->a3 : typeof Color
->M3.Color : typeof Color
+>a3 : typeof M3.Color
+>M3.Color : typeof M3.Color
 >M3 : typeof M3
->Color : typeof Color
+>Color : typeof M3.Color
 
 var blue: M3.Color = a3.Blue;
->blue : Color
+>blue : M3.Color
 >M3 : M3
->Color : Color
->a3.Blue : Color
->a3 : typeof Color
->Blue : Color
+>Color : M3.Color
+>a3.Blue : M3.Color
+>a3 : typeof M3.Color
+>Blue : M3.Color
 
 var p3: M3.Color;
->p3 : Color
+>p3 : M3.Color
 >M3 : M3
->Color : Color
+>Color : M3.Color
 
 var p3 = M3.Color.Red;
->p3 : Color
->M3.Color.Red : Color
->M3.Color : typeof Color
+>p3 : M3.Color
+>M3.Color.Red : M3.Color
+>M3.Color : typeof M3.Color
 >M3 : typeof M3
->Color : typeof Color
->Red : Color
+>Color : typeof M3.Color
+>Red : M3.Color
 
 var p3 = m3.Color.Blue;
->p3 : Color
->m3.Color.Blue : Color
->m3.Color : typeof Color
+>p3 : M3.Color
+>m3.Color.Blue : M3.Color
+>m3.Color : typeof M3.Color
 >m3 : typeof M3
->Color : typeof Color
->Blue : Color
+>Color : typeof M3.Color
+>Blue : M3.Color
 
diff --git a/tests/baselines/reference/interMixingModulesInterfaces0.types b/tests/baselines/reference/interMixingModulesInterfaces0.types
index a6f246fc8d4..730496b9558 100644
--- a/tests/baselines/reference/interMixingModulesInterfaces0.types
+++ b/tests/baselines/reference/interMixingModulesInterfaces0.types
@@ -1,9 +1,9 @@
 === tests/cases/compiler/interMixingModulesInterfaces0.ts ===
 module A {
->A : typeof A
+>A : A
 
     export module B {
->B : typeof B
+>B : B
 
         export function createB(): B {
 >createB : typeof createB
@@ -25,13 +25,13 @@ module A {
 }
 
 var x: A.B = A.B.createB();
->x : B
+>x : A.B
 >A : A
->B : B
->A.B.createB() : B
->A.B.createB : typeof createB
->A.B : typeof B
+>B : A.B
+>A.B.createB() : A.B
+>A.B.createB : typeof A.B.createB
+>A.B : typeof A.B
 >A : typeof A
->B : typeof B
->createB : typeof createB
+>B : typeof A.B
+>createB : typeof A.B.createB
 
diff --git a/tests/baselines/reference/interMixingModulesInterfaces1.types b/tests/baselines/reference/interMixingModulesInterfaces1.types
index 14e746e6669..2c059905757 100644
--- a/tests/baselines/reference/interMixingModulesInterfaces1.types
+++ b/tests/baselines/reference/interMixingModulesInterfaces1.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/interMixingModulesInterfaces1.ts ===
 module A {
->A : typeof A
+>A : A
 
     export interface B {
 >B : B
@@ -13,7 +13,7 @@ module A {
     }
 
     export module B {
->B : typeof B
+>B : B
 
         export function createB(): B {
 >createB : typeof createB
@@ -25,13 +25,13 @@ module A {
 }
 
 var x: A.B = A.B.createB();
->x : B
+>x : A.B
 >A : A
->B : B
->A.B.createB() : B
->A.B.createB : typeof createB
->A.B : typeof B
+>B : A.B
+>A.B.createB() : A.B
+>A.B.createB : typeof A.B.createB
+>A.B : typeof A.B
 >A : typeof A
->B : typeof B
->createB : typeof createB
+>B : typeof A.B
+>createB : typeof A.B.createB
 
diff --git a/tests/baselines/reference/interMixingModulesInterfaces2.types b/tests/baselines/reference/interMixingModulesInterfaces2.types
index d5978a475f7..56c0fd67bfa 100644
--- a/tests/baselines/reference/interMixingModulesInterfaces2.types
+++ b/tests/baselines/reference/interMixingModulesInterfaces2.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/interMixingModulesInterfaces2.ts ===
 module A {
->A : typeof A
+>A : A
 
     export interface B {
 >B : B
@@ -13,7 +13,7 @@ module A {
     }
 
     module B {
->B : typeof B
+>B : B
 
         export function createB(): B {
 >createB : typeof createB
@@ -25,7 +25,7 @@ module A {
 }
 
 var x: A.B = null;
->x : B
+>x : A.B
 >A : A
->B : B
+>B : A.B
 
diff --git a/tests/baselines/reference/interMixingModulesInterfaces3.types b/tests/baselines/reference/interMixingModulesInterfaces3.types
index 967f6c4e8d7..3303dd426a0 100644
--- a/tests/baselines/reference/interMixingModulesInterfaces3.types
+++ b/tests/baselines/reference/interMixingModulesInterfaces3.types
@@ -1,9 +1,9 @@
 === tests/cases/compiler/interMixingModulesInterfaces3.ts ===
 module A {
->A : typeof A
+>A : A
 
     module B {
->B : typeof B
+>B : B
 
         export function createB(): B {
 >createB : typeof createB
@@ -25,7 +25,7 @@ module A {
 }
 
 var x: A.B = null;
->x : B
+>x : A.B
 >A : A
->B : B
+>B : A.B
 
diff --git a/tests/baselines/reference/interMixingModulesInterfaces4.types b/tests/baselines/reference/interMixingModulesInterfaces4.types
index eb117ea0029..5936efce591 100644
--- a/tests/baselines/reference/interMixingModulesInterfaces4.types
+++ b/tests/baselines/reference/interMixingModulesInterfaces4.types
@@ -1,9 +1,9 @@
 === tests/cases/compiler/interMixingModulesInterfaces4.ts ===
 module A {
->A : typeof A
+>A : A
 
     export module B {
->B : typeof B
+>B : A.B
 
         export function createB(): number {
 >createB : typeof createB
@@ -26,9 +26,9 @@ module A {
 var x : number = A.B.createB();
 >x : number
 >A.B.createB() : number
->A.B.createB : typeof createB
->A.B : typeof B
+>A.B.createB : typeof A.B.createB
+>A.B : typeof A.B
 >A : typeof A
->B : typeof B
->createB : typeof createB
+>B : typeof A.B
+>createB : typeof A.B.createB
 
diff --git a/tests/baselines/reference/interMixingModulesInterfaces5.types b/tests/baselines/reference/interMixingModulesInterfaces5.types
index 91dd6c2168c..3045475e871 100644
--- a/tests/baselines/reference/interMixingModulesInterfaces5.types
+++ b/tests/baselines/reference/interMixingModulesInterfaces5.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/interMixingModulesInterfaces5.ts ===
 module A {
->A : typeof A
+>A : A
 
     interface B {
 >B : B
@@ -13,7 +13,7 @@ module A {
     }
 
     export module B {
->B : typeof B
+>B : A.B
 
         export function createB(): number {
 >createB : typeof createB
@@ -26,9 +26,9 @@ module A {
 var x: number = A.B.createB();
 >x : number
 >A.B.createB() : number
->A.B.createB : typeof createB
->A.B : typeof B
+>A.B.createB : typeof A.B.createB
+>A.B : typeof A.B
 >A : typeof A
->B : typeof B
->createB : typeof createB
+>B : typeof A.B
+>createB : typeof A.B.createB
 
diff --git a/tests/baselines/reference/interfaceInReopenedModule.types b/tests/baselines/reference/interfaceInReopenedModule.types
index e0ed40b186e..f2bd7a43d7f 100644
--- a/tests/baselines/reference/interfaceInReopenedModule.types
+++ b/tests/baselines/reference/interfaceInReopenedModule.types
@@ -1,11 +1,11 @@
 === tests/cases/compiler/interfaceInReopenedModule.ts ===
 module m {
->m : typeof m
+>m : m
 }
 
 // In second instance of same module, exported interface is not visible
 module m {
->m : typeof m
+>m : m
 
     interface f {}
 >f : f
diff --git a/tests/baselines/reference/interfaceWithPropertyOfEveryType.types b/tests/baselines/reference/interfaceWithPropertyOfEveryType.types
index 08c59a3d82d..e78a3c951e0 100644
--- a/tests/baselines/reference/interfaceWithPropertyOfEveryType.types
+++ b/tests/baselines/reference/interfaceWithPropertyOfEveryType.types
@@ -7,7 +7,7 @@ function f1() { }
 >f1 : typeof f1
 
 module M {
->M : typeof M
+>M : M
 
     export var y = 1;
 >y : number
@@ -130,11 +130,11 @@ var a: Foo = {
 
     l: f1,
 >l : typeof f1
->f1 : f1
+>f1 : typeof f1
 
     m: M,
 >m : typeof M
->M : M
+>M : typeof M
 
     n: {},
 >n : {}
diff --git a/tests/baselines/reference/internalAliasClass.types b/tests/baselines/reference/internalAliasClass.types
index 2a026c713ed..14691f11a13 100644
--- a/tests/baselines/reference/internalAliasClass.types
+++ b/tests/baselines/reference/internalAliasClass.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/internalAliasClass.ts ===
 module a {
->a : typeof a
+>a : a
 
     export class c {
 >c : c
@@ -8,16 +8,16 @@ module a {
 }
 
 module c {
->c : typeof c
-
-    import b = a.c;
->b : typeof c
->a : typeof a
 >c : c
 
+    import b = a.c;
+>b : b
+>a : typeof a
+>c : b
+
     export var x: b = new b();
->x : c
->b : c
->new b() : c
->b : typeof c
+>x : b
+>b : b
+>new b() : b
+>b : typeof b
 }
diff --git a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.types b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.types
index 54f69cf2f39..279c33e9246 100644
--- a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.types
+++ b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/internalAliasClassInsideLocalModuleWithExport.ts ===
 export module x {
->x : typeof x
+>x : x
 
     export class c {
 >c : c
@@ -16,13 +16,13 @@ export module x {
 }
 
 export module m2 {
->m2 : typeof m2
+>m2 : m2
 
     export module m3 {
->m3 : typeof m3
+>m3 : m3
 
         export import c = x.c;
->c : typeof c
+>c : c
 >x : typeof x
 >c : c
 
@@ -41,11 +41,11 @@ export module m2 {
 }
 
 export var d = new m2.m3.c();
->d : c
->new m2.m3.c() : c
->m2.m3.c : typeof c
->m2.m3 : typeof m3
+>d : x.c
+>new m2.m3.c() : x.c
+>m2.m3.c : typeof x.c
+>m2.m3 : typeof m2.m3
 >m2 : typeof m2
->m3 : typeof m3
->c : typeof c
+>m3 : typeof m2.m3
+>c : typeof x.c
 
diff --git a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExport.types b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExport.types
index 4f916d5689c..8e365742243 100644
--- a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExport.types
+++ b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExport.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/internalAliasClassInsideLocalModuleWithoutExport.ts ===
 export module x {
->x : typeof x
+>x : x
 
     export class c {
 >c : c
@@ -16,13 +16,13 @@ export module x {
 }
 
 export module m2 {
->m2 : typeof m2
+>m2 : m2
 
     export module m3 {
->m3 : typeof m3
+>m3 : m3
 
         import c = x.c;
->c : typeof c
+>c : c
 >x : typeof x
 >c : c
 
diff --git a/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithExport.types b/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithExport.types
index a9edf4684c4..b9b877c7c69 100644
--- a/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithExport.types
+++ b/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithExport.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/internalAliasClassInsideTopLevelModuleWithExport.ts ===
 export module x {
->x : typeof x
+>x : x
 
     export class c {
 >c : c
@@ -16,19 +16,19 @@ export module x {
 }
 
 export import xc = x.c;
->xc : typeof c
+>xc : xc
 >x : typeof x
->c : c
+>c : xc
 
 export var cProp = new xc();
->cProp : c
->new xc() : c
->xc : typeof c
+>cProp : xc
+>new xc() : xc
+>xc : typeof xc
 
 var cReturnVal = cProp.foo(10);
 >cReturnVal : number
 >cProp.foo(10) : number
 >cProp.foo : (a: number) => number
->cProp : c
+>cProp : xc
 >foo : (a: number) => number
 
diff --git a/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.types b/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.types
index 05309a8f844..ed69c672435 100644
--- a/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.types
+++ b/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/internalAliasClassInsideTopLevelModuleWithoutExport.ts ===
 export module x {
->x : typeof x
+>x : x
 
     export class c {
 >c : c
@@ -16,19 +16,19 @@ export module x {
 }
 
 import xc = x.c;
->xc : typeof c
+>xc : xc
 >x : typeof x
->c : c
+>c : xc
 
 export var cProp = new xc();
->cProp : c
->new xc() : c
->xc : typeof c
+>cProp : xc
+>new xc() : xc
+>xc : typeof xc
 
 var cReturnVal = cProp.foo(10);
 >cReturnVal : number
 >cProp.foo(10) : number
 >cProp.foo : (a: number) => number
->cProp : c
+>cProp : xc
 >foo : (a: number) => number
 
diff --git a/tests/baselines/reference/internalAliasEnum.types b/tests/baselines/reference/internalAliasEnum.types
index 8b4706b67f3..188209d192e 100644
--- a/tests/baselines/reference/internalAliasEnum.types
+++ b/tests/baselines/reference/internalAliasEnum.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/internalAliasEnum.ts ===
 module a {
->a : typeof a
+>a : a
 
     export enum weekend {
 >weekend : weekend
@@ -17,18 +17,18 @@ module a {
 }
 
 module c {
->c : typeof c
+>c : c
 
     import b = a.weekend;
->b : typeof weekend
+>b : b
 >a : typeof a
->weekend : weekend
+>weekend : b
 
     export var bVal: b = b.Sunday;
->bVal : weekend
->b : weekend
->b.Sunday : weekend
->b : typeof weekend
->Sunday : weekend
+>bVal : b
+>b : b
+>b.Sunday : b
+>b : typeof b
+>Sunday : b
 }
 
diff --git a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithExport.types b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithExport.types
index e990dc2d5e9..1734d0d5500 100644
--- a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithExport.types
+++ b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithExport.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/internalAliasEnumInsideLocalModuleWithExport.ts ===
 export module a {
->a : typeof a
+>a : a
 
     export enum weekend {
 >weekend : weekend
@@ -17,18 +17,18 @@ export module a {
 }
 
 export module c {
->c : typeof c
+>c : c
 
     export import b = a.weekend;
->b : typeof weekend
+>b : b
 >a : typeof a
->weekend : weekend
+>weekend : b
 
     export var bVal: b = b.Sunday;
->bVal : weekend
->b : weekend
->b.Sunday : weekend
->b : typeof weekend
->Sunday : weekend
+>bVal : b
+>b : b
+>b.Sunday : b
+>b : typeof b
+>Sunday : b
 }
 
diff --git a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExport.types b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExport.types
index 1182ea3d4f3..1f035a49f61 100644
--- a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExport.types
+++ b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExport.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/internalAliasEnumInsideLocalModuleWithoutExport.ts ===
 export module a {
->a : typeof a
+>a : a
 
     export enum weekend {
 >weekend : weekend
@@ -17,18 +17,18 @@ export module a {
 }
 
 export module c {
->c : typeof c
+>c : c
 
     import b = a.weekend;
->b : typeof weekend
+>b : b
 >a : typeof a
->weekend : weekend
+>weekend : b
 
     export var bVal: b = b.Sunday;
->bVal : weekend
->b : weekend
->b.Sunday : weekend
->b : typeof weekend
->Sunday : weekend
+>bVal : b
+>b : b
+>b.Sunday : b
+>b : typeof b
+>Sunday : b
 }
 
diff --git a/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithExport.types b/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithExport.types
index 8fd15e4e210..4fd83752517 100644
--- a/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithExport.types
+++ b/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithExport.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/internalAliasEnumInsideTopLevelModuleWithExport.ts ===
 export module a {
->a : typeof a
+>a : a
 
     export enum weekend {
 >weekend : weekend
@@ -17,14 +17,14 @@ export module a {
 }
 
 export import b = a.weekend;
->b : typeof weekend
+>b : b
 >a : typeof a
->weekend : weekend
+>weekend : b
 
 export var bVal: b = b.Sunday;
->bVal : weekend
->b : weekend
->b.Sunday : weekend
->b : typeof weekend
->Sunday : weekend
+>bVal : b
+>b : b
+>b.Sunday : b
+>b : typeof b
+>Sunday : b
 
diff --git a/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithoutExport.types b/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithoutExport.types
index 09ee904abb6..d6367961c9f 100644
--- a/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithoutExport.types
+++ b/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithoutExport.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/internalAliasEnumInsideTopLevelModuleWithoutExport.ts ===
 export module a {
->a : typeof a
+>a : a
 
     export enum weekend {
 >weekend : weekend
@@ -17,14 +17,14 @@ export module a {
 }
 
 import b = a.weekend;
->b : typeof weekend
+>b : b
 >a : typeof a
->weekend : weekend
+>weekend : b
 
 export var bVal: b = b.Sunday;
->bVal : weekend
->b : weekend
->b.Sunday : weekend
->b : typeof weekend
->Sunday : weekend
+>bVal : b
+>b : b
+>b.Sunday : b
+>b : typeof b
+>Sunday : b
 
diff --git a/tests/baselines/reference/internalAliasFunction.types b/tests/baselines/reference/internalAliasFunction.types
index b1723a38e75..69ce516d282 100644
--- a/tests/baselines/reference/internalAliasFunction.types
+++ b/tests/baselines/reference/internalAliasFunction.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/internalAliasFunction.ts ===
 module a {
->a : typeof a
+>a : a
 
     export function foo(x: number) {
 >foo : typeof foo
@@ -12,20 +12,20 @@ module a {
 }
 
 module c {
->c : typeof c
+>c : c
 
     import b = a.foo;
->b : typeof foo
+>b : b
 >a : typeof a
->foo : typeof foo
+>foo : typeof b
 
     export var bVal = b(10);
 >bVal : number
 >b(10) : number
->b : typeof foo
+>b : typeof b
 
     export var bVal2 = b;
->bVal2 : typeof foo
->b : typeof foo
+>bVal2 : typeof b
+>b : typeof b
 }
 
diff --git a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithExport.types b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithExport.types
index 260a57834a2..887cd98009c 100644
--- a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithExport.types
+++ b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithExport.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/internalAliasFunctionInsideLocalModuleWithExport.ts ===
 export module a {
->a : typeof a
+>a : a
 
     export function foo(x: number) {
 >foo : typeof foo
@@ -12,20 +12,20 @@ export module a {
 }
 
 export module c {
->c : typeof c
+>c : c
 
     export import b = a.foo;
->b : typeof foo
+>b : b
 >a : typeof a
->foo : typeof foo
+>foo : typeof b
 
     export var bVal = b(10);
 >bVal : number
 >b(10) : number
->b : typeof foo
+>b : typeof b
 
     export var bVal2 = b;
->bVal2 : typeof foo
->b : typeof foo
+>bVal2 : typeof b
+>b : typeof b
 }
 
diff --git a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExport.types b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExport.types
index df75263fca9..7ffbdccadd9 100644
--- a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExport.types
+++ b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExport.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/internalAliasFunctionInsideLocalModuleWithoutExport.ts ===
 export module a {
->a : typeof a
+>a : a
 
     export function foo(x: number) {
 >foo : typeof foo
@@ -12,20 +12,20 @@ export module a {
 }
 
 export module c {
->c : typeof c
+>c : c
 
     import b = a.foo;
->b : typeof foo
+>b : b
 >a : typeof a
->foo : typeof foo
+>foo : typeof b
 
     var bVal = b(10);
 >bVal : number
 >b(10) : number
->b : typeof foo
+>b : typeof b
 
     export var bVal2 = b;
->bVal2 : typeof foo
->b : typeof foo
+>bVal2 : typeof b
+>b : typeof b
 }
 
diff --git a/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithExport.types b/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithExport.types
index 835d07910b8..a96c3d62e83 100644
--- a/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithExport.types
+++ b/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithExport.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/internalAliasFunctionInsideTopLevelModuleWithExport.ts ===
 export module a {
->a : typeof a
+>a : a
 
     export function foo(x: number) {
 >foo : typeof foo
@@ -12,16 +12,16 @@ export module a {
 }
 
 export import b = a.foo;
->b : typeof foo
+>b : b
 >a : typeof a
->foo : typeof foo
+>foo : typeof b
 
 export var bVal = b(10);
 >bVal : number
 >b(10) : number
->b : typeof foo
+>b : typeof b
 
 export var bVal2 = b;
->bVal2 : typeof foo
->b : typeof foo
+>bVal2 : typeof b
+>b : typeof b
 
diff --git a/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithoutExport.types b/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithoutExport.types
index da517b03a36..3aed422ec50 100644
--- a/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithoutExport.types
+++ b/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithoutExport.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/internalAliasFunctionInsideTopLevelModuleWithoutExport.ts ===
 export module a {
->a : typeof a
+>a : a
 
     export function foo(x: number) {
 >foo : typeof foo
@@ -12,16 +12,16 @@ export module a {
 }
 
 import b = a.foo;
->b : typeof foo
+>b : b
 >a : typeof a
->foo : typeof foo
+>foo : typeof b
 
 export var bVal = b(10);
 >bVal : number
 >b(10) : number
->b : typeof foo
+>b : typeof b
 
 export var bVal2 = b;
->bVal2 : typeof foo
->b : typeof foo
+>bVal2 : typeof b
+>b : typeof b
 
diff --git a/tests/baselines/reference/internalAliasInitializedModule.types b/tests/baselines/reference/internalAliasInitializedModule.types
index 44d376e913e..3f369631c29 100644
--- a/tests/baselines/reference/internalAliasInitializedModule.types
+++ b/tests/baselines/reference/internalAliasInitializedModule.types
@@ -1,9 +1,9 @@
 === tests/cases/compiler/internalAliasInitializedModule.ts ===
 module a {
->a : typeof a
+>a : a
 
     export module b {
->b : typeof b
+>b : b
 
         export class c {
 >c : c
@@ -12,19 +12,19 @@ module a {
 }
 
 module c {
->c : typeof c
+>c : c
 
     import b = a.b;
->b : typeof b
+>b : b
 >a : typeof a
 >b : typeof b
 
     export var x: b.c = new b.c();
->x : c
+>x : b.c
 >b : b
->c : c
->new b.c() : c
->b.c : typeof c
+>c : b.c
+>new b.c() : b.c
+>b.c : typeof b.c
 >b : typeof b
->c : typeof c
+>c : typeof b.c
 }
diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithExport.types b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithExport.types
index 3dfee66924a..f1d72a8e28d 100644
--- a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithExport.types
+++ b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithExport.types
@@ -1,9 +1,9 @@
 === tests/cases/compiler/internalAliasInitializedModuleInsideLocalModuleWithExport.ts ===
 export module a {
->a : typeof a
+>a : a
 
     export module b {
->b : typeof b
+>b : b
 
         export class c {
 >c : c
@@ -12,19 +12,19 @@ export module a {
 }
 
 export module c {
->c : typeof c
+>c : c
 
     export import b = a.b;
->b : typeof b
+>b : b
 >a : typeof a
 >b : typeof b
 
     export var x: b.c = new b.c();
->x : c
+>x : b.c
 >b : b
->c : c
->new b.c() : c
->b.c : typeof c
+>c : b.c
+>new b.c() : b.c
+>b.c : typeof b.c
 >b : typeof b
->c : typeof c
+>c : typeof b.c
 }
diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExport.types b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExport.types
index 4e78a0d7816..46096193461 100644
--- a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExport.types
+++ b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExport.types
@@ -1,9 +1,9 @@
 === tests/cases/compiler/internalAliasInitializedModuleInsideLocalModuleWithoutExport.ts ===
 export module a {
->a : typeof a
+>a : a
 
     export module b {
->b : typeof b
+>b : b
 
         export class c {
 >c : c
@@ -12,19 +12,19 @@ export module a {
 }
 
 export module c {
->c : typeof c
+>c : c
 
     import b = a.b;
->b : typeof b
+>b : b
 >a : typeof a
 >b : typeof b
 
     export var x: b.c = new b.c();
->x : c
+>x : b.c
 >b : b
->c : c
->new b.c() : c
->b.c : typeof c
+>c : b.c
+>new b.c() : b.c
+>b.c : typeof b.c
 >b : typeof b
->c : typeof c
+>c : typeof b.c
 }
diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithExport.types b/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithExport.types
index a7d7d1937cd..e4d41f6f25f 100644
--- a/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithExport.types
+++ b/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithExport.types
@@ -1,9 +1,9 @@
 === tests/cases/compiler/internalAliasInitializedModuleInsideTopLevelModuleWithExport.ts ===
 export module a {
->a : typeof a
+>a : a
 
     export module b {
->b : typeof b
+>b : b
 
         export class c {
 >c : c
@@ -12,16 +12,16 @@ export module a {
 }
 
 export import b = a.b;
->b : typeof b
+>b : b
 >a : typeof a
 >b : typeof b
 
 export var x: b.c = new b.c();
->x : c
+>x : b.c
 >b : b
->c : c
->new b.c() : c
->b.c : typeof c
+>c : b.c
+>new b.c() : b.c
+>b.c : typeof b.c
 >b : typeof b
->c : typeof c
+>c : typeof b.c
 
diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.types b/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.types
index ffd30968316..58ba5d2075a 100644
--- a/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.types
+++ b/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.types
@@ -1,9 +1,9 @@
 === tests/cases/compiler/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.ts ===
 export module a {
->a : typeof a
+>a : a
 
     export module b {
->b : typeof b
+>b : b
 
         export class c {
 >c : c
@@ -12,16 +12,16 @@ export module a {
 }
 
 import b = a.b;
->b : typeof b
+>b : b
 >a : typeof a
 >b : typeof b
 
 export var x: b.c = new b.c();
->x : c
+>x : b.c
 >b : b
->c : c
->new b.c() : c
->b.c : typeof c
+>c : b.c
+>new b.c() : b.c
+>b.c : typeof b.c
 >b : typeof b
->c : typeof c
+>c : typeof b.c
 
diff --git a/tests/baselines/reference/internalAliasInterface.types b/tests/baselines/reference/internalAliasInterface.types
index 71a59027d83..36bce1328e4 100644
--- a/tests/baselines/reference/internalAliasInterface.types
+++ b/tests/baselines/reference/internalAliasInterface.types
@@ -8,15 +8,15 @@ module a {
 }
 
 module c {
->c : typeof c
+>c : c
 
     import b = a.I;
 >b : b
 >a : a
->I : I
+>I : b
 
     export var x: b;
->x : I
->b : I
+>x : b
+>b : b
 }
 
diff --git a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithExport.types b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithExport.types
index 253a778ea3e..c48b2209e2d 100644
--- a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithExport.types
+++ b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithExport.types
@@ -8,15 +8,15 @@ export module a {
 }
 
 export module c {
->c : typeof c
+>c : c
 
     export import b = a.I;
 >b : b
 >a : a
->I : I
+>I : b
 
     export var x: b;
->x : I
->b : I
+>x : b
+>b : b
 }
 
diff --git a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExport.types b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExport.types
index ec1e59fd946..a28fb025080 100644
--- a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExport.types
+++ b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExport.types
@@ -8,15 +8,15 @@ export module a {
 }
 
 export module c {
->c : typeof c
+>c : c
 
     import b = a.I;
 >b : b
 >a : a
->I : I
+>I : b
 
     export var x: b;
->x : I
->b : I
+>x : b
+>b : b
 }
 
diff --git a/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithExport.types b/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithExport.types
index 686eba773b1..b812a1953af 100644
--- a/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithExport.types
+++ b/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithExport.types
@@ -10,9 +10,9 @@ export module a {
 export import b = a.I;
 >b : b
 >a : a
->I : I
+>I : b
 
 export var x: b;
->x : I
->b : I
+>x : b
+>b : b
 
diff --git a/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithoutExport.types b/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithoutExport.types
index 56197b88a1f..b77b84865cf 100644
--- a/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithoutExport.types
+++ b/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithoutExport.types
@@ -10,9 +10,9 @@ export module a {
 import b = a.I;
 >b : b
 >a : a
->I : I
+>I : b
 
 export var x: b;
->x : I
->b : I
+>x : b
+>b : b
 
diff --git a/tests/baselines/reference/internalAliasUninitializedModule.types b/tests/baselines/reference/internalAliasUninitializedModule.types
index 2a05858edbf..c9bc66ed0d1 100644
--- a/tests/baselines/reference/internalAliasUninitializedModule.types
+++ b/tests/baselines/reference/internalAliasUninitializedModule.types
@@ -15,7 +15,7 @@ module a {
 }
 
 module c {
->c : typeof c
+>c : c
 
     import b = a.b;
 >b : b
@@ -23,13 +23,13 @@ module c {
 >b : b
 
     export var x: b.I;
->x : I
+>x : b.I
 >b : b
->I : I
+>I : b.I
 
     x.foo();
 >x.foo() : any
 >x.foo : () => any
->x : I
+>x : b.I
 >foo : () => any
 }
diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithExport.types b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithExport.types
index 4220c67e677..bdfd7990120 100644
--- a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithExport.types
+++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithExport.types
@@ -15,7 +15,7 @@ export module a {
 }
 
 export module c {
->c : typeof c
+>c : c
 
     export import b = a.b;
 >b : b
@@ -23,13 +23,13 @@ export module c {
 >b : b
 
     export var x: b.I;
->x : I
+>x : b.I
 >b : b
->I : I
+>I : b.I
 
     x.foo();
 >x.foo() : any
 >x.foo : () => any
->x : I
+>x : b.I
 >foo : () => any
 }
diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.types b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.types
index c42848cdd61..f2def5d9b6c 100644
--- a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.types
+++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.types
@@ -15,7 +15,7 @@ export module a {
 }
 
 export module c {
->c : typeof c
+>c : c
 
     import b = a.b;
 >b : b
@@ -23,13 +23,13 @@ export module c {
 >b : b
 
     export var x: b.I;
->x : I
+>x : b.I
 >b : b
->I : I
+>I : b.I
 
     x.foo();
 >x.foo() : any
 >x.foo : () => any
->x : I
+>x : b.I
 >foo : () => any
 }
diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.types b/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.types
index cd6a928595a..56976f32128 100644
--- a/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.types
+++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.types
@@ -20,13 +20,13 @@ export import b = a.b;
 >b : b
 
 export var x: b.I;
->x : I
+>x : b.I
 >b : b
->I : I
+>I : b.I
 
 x.foo();
 >x.foo() : any
 >x.foo : () => any
->x : I
+>x : b.I
 >foo : () => any
 
diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.types b/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.types
index 711e933ee74..6bd3119ec08 100644
--- a/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.types
+++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.types
@@ -20,13 +20,13 @@ import b = a.b;
 >b : b
 
 export var x: b.I;
->x : I
+>x : b.I
 >b : b
->I : I
+>I : b.I
 
 x.foo();
 >x.foo() : any
 >x.foo : () => any
->x : I
+>x : b.I
 >foo : () => any
 
diff --git a/tests/baselines/reference/internalAliasVar.types b/tests/baselines/reference/internalAliasVar.types
index d284b064d83..593ae4f031d 100644
--- a/tests/baselines/reference/internalAliasVar.types
+++ b/tests/baselines/reference/internalAliasVar.types
@@ -1,16 +1,16 @@
 === tests/cases/compiler/internalAliasVar.ts ===
 module a {
->a : typeof a
+>a : a
 
     export var x = 10;
 >x : number
 }
 
 module c {
->c : typeof c
+>c : c
 
     import b = a.x;
->b : number
+>b : b
 >a : typeof a
 >x : number
 
diff --git a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithExport.types b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithExport.types
index b8d94c9ebbd..6a299d1a1e9 100644
--- a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithExport.types
+++ b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithExport.types
@@ -1,16 +1,16 @@
 === tests/cases/compiler/internalAliasVarInsideLocalModuleWithExport.ts ===
 export module a {
->a : typeof a
+>a : a
 
     export var x = 10;
 >x : number
 }
 
 export module c {
->c : typeof c
+>c : c
 
     export import b = a.x;
->b : number
+>b : b
 >a : typeof a
 >x : number
 
diff --git a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExport.types b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExport.types
index c9e2897befb..9c203cc70c9 100644
--- a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExport.types
+++ b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExport.types
@@ -1,16 +1,16 @@
 === tests/cases/compiler/internalAliasVarInsideLocalModuleWithoutExport.ts ===
 export module a {
->a : typeof a
+>a : a
 
     export var x = 10;
 >x : number
 }
 
 export module c {
->c : typeof c
+>c : c
 
     import b = a.x;
->b : number
+>b : b
 >a : typeof a
 >x : number
 
diff --git a/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithExport.types b/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithExport.types
index 22335c7d8c0..be70702c46a 100644
--- a/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithExport.types
+++ b/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithExport.types
@@ -1,13 +1,13 @@
 === tests/cases/compiler/internalAliasVarInsideTopLevelModuleWithExport.ts ===
 export module a {
->a : typeof a
+>a : a
 
     export var x = 10;
 >x : number
 }
 
 export import b = a.x;
->b : number
+>b : b
 >a : typeof a
 >x : number
 
diff --git a/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithoutExport.types b/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithoutExport.types
index 1474735c62d..7135786ced5 100644
--- a/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithoutExport.types
+++ b/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithoutExport.types
@@ -1,13 +1,13 @@
 === tests/cases/compiler/internalAliasVarInsideTopLevelModuleWithoutExport.ts ===
 export module a {
->a : typeof a
+>a : a
 
     export var x = 10;
 >x : number
 }
 
 import b = a.x;
->b : number
+>b : b
 >a : typeof a
 >x : number
 
diff --git a/tests/baselines/reference/internalAliasWithDottedNameEmit.types b/tests/baselines/reference/internalAliasWithDottedNameEmit.types
index 8677bb41138..a2807a27f66 100644
--- a/tests/baselines/reference/internalAliasWithDottedNameEmit.types
+++ b/tests/baselines/reference/internalAliasWithDottedNameEmit.types
@@ -1,20 +1,20 @@
 === tests/cases/compiler/internalAliasWithDottedNameEmit.ts ===
 module a.b.c {
->a : typeof a
->b : typeof b
->c : typeof c
+>a : a
+>b : b
+>c : c
 
       export var d;
 >d : any
 }
 module a.e.f {
->a : typeof a
+>a : a
 >e : e
 >f : f
 
       import g = b.c;
->g : typeof c
+>g : g
 >b : typeof b
->c : typeof c
+>c : typeof g
 }
 
diff --git a/tests/baselines/reference/internalImportInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.types b/tests/baselines/reference/internalImportInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.types
index 2a1afa214a2..b01c11b0d6f 100644
--- a/tests/baselines/reference/internalImportInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.types
+++ b/tests/baselines/reference/internalImportInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.types
@@ -6,7 +6,7 @@ class A {
 >aProp : string
 }
 module A {
->A : typeof A
+>A : A
 
     export interface X { s: string }
 >X : X
@@ -20,7 +20,7 @@ module B {
 >B : B
 
     import Y = A;
->Y : typeof A
->A : A
+>Y : Y
+>A : Y
 }
 
diff --git a/tests/baselines/reference/internalImportUnInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.types b/tests/baselines/reference/internalImportUnInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.types
index 131527c66a0..74d672de4e4 100644
--- a/tests/baselines/reference/internalImportUnInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.types
+++ b/tests/baselines/reference/internalImportUnInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.types
@@ -6,7 +6,7 @@ class A {
 >aProp : string
 }
 module A {
->A : typeof A
+>A : A
 
     export interface X { s: string }
 >X : X
@@ -17,7 +17,7 @@ module B {
 >B : B
 
     import Y = A;
->Y : typeof A
->A : A
+>Y : Y
+>A : Y
 }
 
diff --git a/tests/baselines/reference/internalImportUnInstantiatedModuleNotReferencingInstanceNoConflict.types b/tests/baselines/reference/internalImportUnInstantiatedModuleNotReferencingInstanceNoConflict.types
index 01549965a13..3774e64b727 100644
--- a/tests/baselines/reference/internalImportUnInstantiatedModuleNotReferencingInstanceNoConflict.types
+++ b/tests/baselines/reference/internalImportUnInstantiatedModuleNotReferencingInstanceNoConflict.types
@@ -8,13 +8,13 @@ module A {
 }
 
 module B {
->B : typeof B
+>B : B
 
     var A = 1;
 >A : number
 
     import Y = A;
 >Y : Y
->A : A
+>A : Y
 }
 
diff --git a/tests/baselines/reference/invalidUndefinedValues.types b/tests/baselines/reference/invalidUndefinedValues.types
index 3824498d216..62b381676b9 100644
--- a/tests/baselines/reference/invalidUndefinedValues.types
+++ b/tests/baselines/reference/invalidUndefinedValues.types
@@ -59,7 +59,7 @@ x = c;
 >c : I
 
 module M { export var x = 1; }
->M : typeof M
+>M : M
 >x : number
 
 x = M;
diff --git a/tests/baselines/reference/ipromise2.types b/tests/baselines/reference/ipromise2.types
index c611b081ed2..5d499aa9c3d 100644
--- a/tests/baselines/reference/ipromise2.types
+++ b/tests/baselines/reference/ipromise2.types
@@ -97,17 +97,17 @@ declare module Windows.Foundation {
 }
 
 var p: Windows.Foundation.IPromise<string>;
->p : IPromise<string>
+>p : Windows.Foundation.IPromise<string>
 >Windows : Windows
->Foundation : Foundation
->IPromise : IPromise<T>
+>Foundation : Windows.Foundation
+>IPromise : Windows.Foundation.IPromise<T>
 
 var p2 = p.then(function (s) {
->p2 : IPromise<number>
->p.then(function (s) {    return 34;} ) : IPromise<number>
->p.then : { <U>(success?: (value: string) => IPromise<U>, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: string) => IPromise<U>, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: string) => U, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: string) => U, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>; }
->p : IPromise<string>
->then : { <U>(success?: (value: string) => IPromise<U>, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: string) => IPromise<U>, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: string) => U, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: string) => U, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>; }
+>p2 : Windows.Foundation.IPromise<number>
+>p.then(function (s) {    return 34;} ) : Windows.Foundation.IPromise<number>
+>p.then : { <U>(success?: (value: string) => Windows.Foundation.IPromise<U>, error?: (error: any) => Windows.Foundation.IPromise<U>, progress?: (progress: any) => void): Windows.Foundation.IPromise<U>; <U>(success?: (value: string) => Windows.Foundation.IPromise<U>, error?: (error: any) => U, progress?: (progress: any) => void): Windows.Foundation.IPromise<U>; <U>(success?: (value: string) => U, error?: (error: any) => Windows.Foundation.IPromise<U>, progress?: (progress: any) => void): Windows.Foundation.IPromise<U>; <U>(success?: (value: string) => U, error?: (error: any) => U, progress?: (progress: any) => void): Windows.Foundation.IPromise<U>; }
+>p : Windows.Foundation.IPromise<string>
+>then : { <U>(success?: (value: string) => Windows.Foundation.IPromise<U>, error?: (error: any) => Windows.Foundation.IPromise<U>, progress?: (progress: any) => void): Windows.Foundation.IPromise<U>; <U>(success?: (value: string) => Windows.Foundation.IPromise<U>, error?: (error: any) => U, progress?: (progress: any) => void): Windows.Foundation.IPromise<U>; <U>(success?: (value: string) => U, error?: (error: any) => Windows.Foundation.IPromise<U>, progress?: (progress: any) => void): Windows.Foundation.IPromise<U>; <U>(success?: (value: string) => U, error?: (error: any) => U, progress?: (progress: any) => void): Windows.Foundation.IPromise<U>; }
 >function (s) {    return 34;} : (s: string) => number
 >s : string
 
@@ -118,7 +118,7 @@ var p2 = p.then(function (s) {
 var x: number = p2.value;
 >x : number
 >p2.value : number
->p2 : IPromise<number>
+>p2 : Windows.Foundation.IPromise<number>
 >value : number
 
 
diff --git a/tests/baselines/reference/ipromise4.types b/tests/baselines/reference/ipromise4.types
index bc00be77faa..503a457f969 100644
--- a/tests/baselines/reference/ipromise4.types
+++ b/tests/baselines/reference/ipromise4.types
@@ -93,29 +93,29 @@ declare module Windows.Foundation {
 }
  
 var p: Windows.Foundation.IPromise<number> = null;
->p : IPromise<number>
+>p : Windows.Foundation.IPromise<number>
 >Windows : Windows
->Foundation : Foundation
->IPromise : IPromise<T>
+>Foundation : Windows.Foundation
+>IPromise : Windows.Foundation.IPromise<T>
  
 p.then(function (x) { } ); // should not error
->p.then(function (x) { } ) : IPromise<void>
->p.then : { <U>(success?: (value: number) => IPromise<U>, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: number) => IPromise<U>, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: number) => U, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: number) => U, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>; }
->p : IPromise<number>
->then : { <U>(success?: (value: number) => IPromise<U>, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: number) => IPromise<U>, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: number) => U, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: number) => U, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>; }
+>p.then(function (x) { } ) : Windows.Foundation.IPromise<void>
+>p.then : { <U>(success?: (value: number) => Windows.Foundation.IPromise<U>, error?: (error: any) => Windows.Foundation.IPromise<U>, progress?: (progress: any) => void): Windows.Foundation.IPromise<U>; <U>(success?: (value: number) => Windows.Foundation.IPromise<U>, error?: (error: any) => U, progress?: (progress: any) => void): Windows.Foundation.IPromise<U>; <U>(success?: (value: number) => U, error?: (error: any) => Windows.Foundation.IPromise<U>, progress?: (progress: any) => void): Windows.Foundation.IPromise<U>; <U>(success?: (value: number) => U, error?: (error: any) => U, progress?: (progress: any) => void): Windows.Foundation.IPromise<U>; }
+>p : Windows.Foundation.IPromise<number>
+>then : { <U>(success?: (value: number) => Windows.Foundation.IPromise<U>, error?: (error: any) => Windows.Foundation.IPromise<U>, progress?: (progress: any) => void): Windows.Foundation.IPromise<U>; <U>(success?: (value: number) => Windows.Foundation.IPromise<U>, error?: (error: any) => U, progress?: (progress: any) => void): Windows.Foundation.IPromise<U>; <U>(success?: (value: number) => U, error?: (error: any) => Windows.Foundation.IPromise<U>, progress?: (progress: any) => void): Windows.Foundation.IPromise<U>; <U>(success?: (value: number) => U, error?: (error: any) => U, progress?: (progress: any) => void): Windows.Foundation.IPromise<U>; }
 >function (x) { } : (x: number) => void
 >x : number
 
 p.then(function (x) { return "hello"; } ).then(function (x) { return x } ); // should not error
->p.then(function (x) { return "hello"; } ).then(function (x) { return x } ) : IPromise<string>
->p.then(function (x) { return "hello"; } ).then : { <U>(success?: (value: string) => IPromise<U>, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: string) => IPromise<U>, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: string) => U, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: string) => U, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>; }
->p.then(function (x) { return "hello"; } ) : IPromise<string>
->p.then : { <U>(success?: (value: number) => IPromise<U>, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: number) => IPromise<U>, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: number) => U, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: number) => U, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>; }
->p : IPromise<number>
->then : { <U>(success?: (value: number) => IPromise<U>, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: number) => IPromise<U>, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: number) => U, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: number) => U, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>; }
+>p.then(function (x) { return "hello"; } ).then(function (x) { return x } ) : Windows.Foundation.IPromise<string>
+>p.then(function (x) { return "hello"; } ).then : { <U>(success?: (value: string) => Windows.Foundation.IPromise<U>, error?: (error: any) => Windows.Foundation.IPromise<U>, progress?: (progress: any) => void): Windows.Foundation.IPromise<U>; <U>(success?: (value: string) => Windows.Foundation.IPromise<U>, error?: (error: any) => U, progress?: (progress: any) => void): Windows.Foundation.IPromise<U>; <U>(success?: (value: string) => U, error?: (error: any) => Windows.Foundation.IPromise<U>, progress?: (progress: any) => void): Windows.Foundation.IPromise<U>; <U>(success?: (value: string) => U, error?: (error: any) => U, progress?: (progress: any) => void): Windows.Foundation.IPromise<U>; }
+>p.then(function (x) { return "hello"; } ) : Windows.Foundation.IPromise<string>
+>p.then : { <U>(success?: (value: number) => Windows.Foundation.IPromise<U>, error?: (error: any) => Windows.Foundation.IPromise<U>, progress?: (progress: any) => void): Windows.Foundation.IPromise<U>; <U>(success?: (value: number) => Windows.Foundation.IPromise<U>, error?: (error: any) => U, progress?: (progress: any) => void): Windows.Foundation.IPromise<U>; <U>(success?: (value: number) => U, error?: (error: any) => Windows.Foundation.IPromise<U>, progress?: (progress: any) => void): Windows.Foundation.IPromise<U>; <U>(success?: (value: number) => U, error?: (error: any) => U, progress?: (progress: any) => void): Windows.Foundation.IPromise<U>; }
+>p : Windows.Foundation.IPromise<number>
+>then : { <U>(success?: (value: number) => Windows.Foundation.IPromise<U>, error?: (error: any) => Windows.Foundation.IPromise<U>, progress?: (progress: any) => void): Windows.Foundation.IPromise<U>; <U>(success?: (value: number) => Windows.Foundation.IPromise<U>, error?: (error: any) => U, progress?: (progress: any) => void): Windows.Foundation.IPromise<U>; <U>(success?: (value: number) => U, error?: (error: any) => Windows.Foundation.IPromise<U>, progress?: (progress: any) => void): Windows.Foundation.IPromise<U>; <U>(success?: (value: number) => U, error?: (error: any) => U, progress?: (progress: any) => void): Windows.Foundation.IPromise<U>; }
 >function (x) { return "hello"; } : (x: number) => string
 >x : number
->then : { <U>(success?: (value: string) => IPromise<U>, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: string) => IPromise<U>, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: string) => U, error?: (error: any) => IPromise<U>, progress?: (progress: any) => void): IPromise<U>; <U>(success?: (value: string) => U, error?: (error: any) => U, progress?: (progress: any) => void): IPromise<U>; }
+>then : { <U>(success?: (value: string) => Windows.Foundation.IPromise<U>, error?: (error: any) => Windows.Foundation.IPromise<U>, progress?: (progress: any) => void): Windows.Foundation.IPromise<U>; <U>(success?: (value: string) => Windows.Foundation.IPromise<U>, error?: (error: any) => U, progress?: (progress: any) => void): Windows.Foundation.IPromise<U>; <U>(success?: (value: string) => U, error?: (error: any) => Windows.Foundation.IPromise<U>, progress?: (progress: any) => void): Windows.Foundation.IPromise<U>; <U>(success?: (value: string) => U, error?: (error: any) => U, progress?: (progress: any) => void): Windows.Foundation.IPromise<U>; }
 >function (x) { return x } : (x: string) => string
 >x : string
 >x : string
diff --git a/tests/baselines/reference/library_ArraySlice.types b/tests/baselines/reference/library_ArraySlice.types
index f1309844913..42bc9b5f581 100644
--- a/tests/baselines/reference/library_ArraySlice.types
+++ b/tests/baselines/reference/library_ArraySlice.types
@@ -4,7 +4,7 @@ Array.prototype.slice();
 >Array.prototype.slice() : any[]
 >Array.prototype.slice : (start?: number, end?: number) => any[]
 >Array.prototype : any[]
->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[]; }
+>Array : { (arrayLength?: number): Array<any>; <T>(arrayLength: number): Array<T>; <T>(...items: Array<T>): Array<T>; new (arrayLength?: number): Array<any>; new <T>(arrayLength: number): Array<T>; new <T>(...items: Array<T>): Array<T>; isArray(arg: any): boolean; prototype: Array<any>; }
 >prototype : any[]
 >slice : (start?: number, end?: number) => any[]
 
@@ -12,7 +12,7 @@ Array.prototype.slice(0);
 >Array.prototype.slice(0) : any[]
 >Array.prototype.slice : (start?: number, end?: number) => any[]
 >Array.prototype : any[]
->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[]; }
+>Array : { (arrayLength?: number): Array<any>; <T>(arrayLength: number): Array<T>; <T>(...items: Array<T>): Array<T>; new (arrayLength?: number): Array<any>; new <T>(arrayLength: number): Array<T>; new <T>(...items: Array<T>): Array<T>; isArray(arg: any): boolean; prototype: Array<any>; }
 >prototype : any[]
 >slice : (start?: number, end?: number) => any[]
 
@@ -20,7 +20,7 @@ Array.prototype.slice(0, 1);
 >Array.prototype.slice(0, 1) : any[]
 >Array.prototype.slice : (start?: number, end?: number) => any[]
 >Array.prototype : any[]
->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[]; }
+>Array : { (arrayLength?: number): Array<any>; <T>(arrayLength: number): Array<T>; <T>(...items: Array<T>): Array<T>; new (arrayLength?: number): Array<any>; new <T>(arrayLength: number): Array<T>; new <T>(...items: Array<T>): Array<T>; isArray(arg: any): boolean; prototype: Array<any>; }
 >prototype : any[]
 >slice : (start?: number, end?: number) => any[]
 
diff --git a/tests/baselines/reference/listFailure.types b/tests/baselines/reference/listFailure.types
index cd235e53986..cdd736dd3bb 100644
--- a/tests/baselines/reference/listFailure.types
+++ b/tests/baselines/reference/listFailure.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/listFailure.ts ===
 module Editor {
->Editor : typeof Editor
+>Editor : Editor
 
     export class Buffer {
 >Buffer : Buffer
diff --git a/tests/baselines/reference/localAliasExportAssignment.types b/tests/baselines/reference/localAliasExportAssignment.types
index 5ea0d3085c1..3785e62743d 100644
--- a/tests/baselines/reference/localAliasExportAssignment.types
+++ b/tests/baselines/reference/localAliasExportAssignment.types
@@ -1,7 +1,7 @@
 === tests/cases/compiler/localAliasExportAssignment_1.ts ===
 ///<reference path='localAliasExportAssignment_0.ts'/>
 import connect = require('localAliasExportAssignment_0');
->connect : () => any
+>connect : connect
 
 connect();
 >connect() : any
diff --git a/tests/baselines/reference/localImportNameVsGlobalName.types b/tests/baselines/reference/localImportNameVsGlobalName.types
index 6b920a25fe7..75c1bee83ff 100644
--- a/tests/baselines/reference/localImportNameVsGlobalName.types
+++ b/tests/baselines/reference/localImportNameVsGlobalName.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/localImportNameVsGlobalName.ts ===
 module Keyboard {
->Keyboard : typeof Keyboard
+>Keyboard : Keyboard
 
   export enum Key { UP, DOWN, LEFT, RIGHT }
 >Key : Key
@@ -11,10 +11,10 @@ module Keyboard {
 }
 
 module App {
->App : typeof App
+>App : App
 
   import Key = Keyboard.Key;
->Key : typeof Key
+>Key : Key
 >Keyboard : typeof Keyboard
 >Key : Key
 
diff --git a/tests/baselines/reference/logicalNotOperatorWithBooleanType.types b/tests/baselines/reference/logicalNotOperatorWithBooleanType.types
index d3c65cf8347..c83a1d0f88d 100644
--- a/tests/baselines/reference/logicalNotOperatorWithBooleanType.types
+++ b/tests/baselines/reference/logicalNotOperatorWithBooleanType.types
@@ -13,10 +13,10 @@ class A {
 >a : boolean
 
     static foo() { return false; }
->foo : typeof foo
+>foo : () => boolean
 }
 module M {
->M : typeof M
+>M : M
 
     export var n: boolean;
 >n : boolean
@@ -70,9 +70,9 @@ var ResultIsBoolean7 = !A.foo();
 >ResultIsBoolean7 : boolean
 >!A.foo() : boolean
 >A.foo() : boolean
->A.foo : typeof foo
+>A.foo : () => boolean
 >A : typeof A
->foo : typeof foo
+>foo : () => boolean
 
 // multiple ! operators
 var ResultIsBoolean = !!BOOLEAN;
diff --git a/tests/baselines/reference/logicalNotOperatorWithNumberType.types b/tests/baselines/reference/logicalNotOperatorWithNumberType.types
index 0e05d03eea7..f833ead12f4 100644
--- a/tests/baselines/reference/logicalNotOperatorWithNumberType.types
+++ b/tests/baselines/reference/logicalNotOperatorWithNumberType.types
@@ -17,10 +17,10 @@ class A {
 >a : number
 
     static foo() { return 1; }
->foo : typeof foo
+>foo : () => number
 }
 module M {
->M : typeof M
+>M : M
 
     export var n: number;
 >n : number
@@ -95,9 +95,9 @@ var ResultIsBoolean10 = !A.foo();
 >ResultIsBoolean10 : boolean
 >!A.foo() : boolean
 >A.foo() : number
->A.foo : typeof foo
+>A.foo : () => number
 >A : typeof A
->foo : typeof foo
+>foo : () => number
 
 var ResultIsBoolean11 = !(NUMBER + NUMBER);
 >ResultIsBoolean11 : boolean
diff --git a/tests/baselines/reference/logicalNotOperatorWithStringType.types b/tests/baselines/reference/logicalNotOperatorWithStringType.types
index 136d6628ddb..b2e9e7d8159 100644
--- a/tests/baselines/reference/logicalNotOperatorWithStringType.types
+++ b/tests/baselines/reference/logicalNotOperatorWithStringType.types
@@ -17,10 +17,10 @@ class A {
 >a : string
 
     static foo() { return ""; }
->foo : typeof foo
+>foo : () => string
 }
 module M {
->M : typeof M
+>M : M
 
     export var n: string;
 >n : string
@@ -95,9 +95,9 @@ var ResultIsBoolean10 = !A.foo();
 >ResultIsBoolean10 : boolean
 >!A.foo() : boolean
 >A.foo() : string
->A.foo : typeof foo
+>A.foo : () => string
 >A : typeof A
->foo : typeof foo
+>foo : () => string
 
 var ResultIsBoolean11 = !(STRING + STRING);
 >ResultIsBoolean11 : boolean
diff --git a/tests/baselines/reference/memberAccessMustUseModuleInstances.types b/tests/baselines/reference/memberAccessMustUseModuleInstances.types
index c1a7cc9d3f1..c7a35557a38 100644
--- a/tests/baselines/reference/memberAccessMustUseModuleInstances.types
+++ b/tests/baselines/reference/memberAccessMustUseModuleInstances.types
@@ -1,22 +1,22 @@
 === tests/cases/compiler/memberAccessMustUseModuleInstances_1.ts ===
 ///<reference path='memberAccessMustUseModuleInstances_0.ts'/>
 import WinJS = require('memberAccessMustUseModuleInstances_0');
->WinJS : typeof "tests/cases/compiler/memberAccessMustUseModuleInstances_0"
+>WinJS : WinJS
 
 WinJS.Promise.timeout(10);
->WinJS.Promise.timeout(10) : Promise
->WinJS.Promise.timeout : typeof timeout
->WinJS.Promise : typeof Promise
->WinJS : typeof "tests/cases/compiler/memberAccessMustUseModuleInstances_0"
->Promise : typeof Promise
->timeout : typeof timeout
+>WinJS.Promise.timeout(10) : WinJS.Promise
+>WinJS.Promise.timeout : (delay: number) => WinJS.Promise
+>WinJS.Promise : typeof WinJS.Promise
+>WinJS : typeof WinJS
+>Promise : typeof WinJS.Promise
+>timeout : (delay: number) => WinJS.Promise
 
 === tests/cases/compiler/memberAccessMustUseModuleInstances_0.ts ===
 export class Promise {
 >Promise : Promise
 
     static timeout(delay: number): Promise {
->timeout : typeof timeout
+>timeout : (delay: number) => Promise
 >delay : number
 >Promise : Promise
 
diff --git a/tests/baselines/reference/memberFunctionsWithPublicOverloads.types b/tests/baselines/reference/memberFunctionsWithPublicOverloads.types
index 7dfd96d502e..7cbc2aca1ff 100644
--- a/tests/baselines/reference/memberFunctionsWithPublicOverloads.types
+++ b/tests/baselines/reference/memberFunctionsWithPublicOverloads.types
@@ -35,34 +35,34 @@ class C {
 >y : any
 
     public static foo(x: number);
->foo : typeof foo
+>foo : { (x: number): any; (x: number, y: string): any; }
 >x : number
 
     public static foo(x: number, y: string);
->foo : typeof foo
+>foo : { (x: number): any; (x: number, y: string): any; }
 >x : number
 >y : string
 
     public static foo(x: any, y?: any) { }
->foo : typeof foo
+>foo : { (x: number): any; (x: number, y: string): any; }
 >x : any
 >y : any
 
     public static bar(x: 'hi');
->bar : typeof bar
+>bar : { (x: 'hi'): any; (x: string): any; (x: number, y: string): any; }
 >x : 'hi'
 
     public static bar(x: string);
->bar : typeof bar
+>bar : { (x: 'hi'): any; (x: string): any; (x: number, y: string): any; }
 >x : string
 
     public static bar(x: number, y: string);
->bar : typeof bar
+>bar : { (x: 'hi'): any; (x: string): any; (x: number, y: string): any; }
 >x : number
 >y : string
 
     public static bar(x: any, y?: any) { }
->bar : typeof bar
+>bar : { (x: 'hi'): any; (x: string): any; (x: number, y: string): any; }
 >x : any
 >y : any
 }
@@ -108,34 +108,34 @@ class D<T> {
 >y : any
 
     public static foo(x: number);
->foo : typeof foo
+>foo : { (x: number): any; (x: number, y: string): any; }
 >x : number
 
     public static foo(x: number, y: string);
->foo : typeof foo
+>foo : { (x: number): any; (x: number, y: string): any; }
 >x : number
 >y : string
 
     public static foo(x: any, y?: any) { }
->foo : typeof foo
+>foo : { (x: number): any; (x: number, y: string): any; }
 >x : any
 >y : any
 
     public static bar(x: 'hi');
->bar : typeof bar
+>bar : { (x: 'hi'): any; (x: string): any; (x: number, y: string): any; }
 >x : 'hi'
 
     public static bar(x: string);
->bar : typeof bar
+>bar : { (x: 'hi'): any; (x: string): any; (x: number, y: string): any; }
 >x : string
 
     public static bar(x: number, y: string);
->bar : typeof bar
+>bar : { (x: 'hi'): any; (x: string): any; (x: number, y: string): any; }
 >x : number
 >y : string
 
     public static bar(x: any, y?: any) { }
->bar : typeof bar
+>bar : { (x: 'hi'): any; (x: string): any; (x: number, y: string): any; }
 >x : any
 >y : any
 
diff --git a/tests/baselines/reference/mergeThreeInterfaces.types b/tests/baselines/reference/mergeThreeInterfaces.types
index 4f4fba64358..d2f080a1b0b 100644
--- a/tests/baselines/reference/mergeThreeInterfaces.types
+++ b/tests/baselines/reference/mergeThreeInterfaces.types
@@ -97,7 +97,7 @@ var r6 = b.baz;
 
 // basic non-generic and generic case inside a module
 module M {
->M : typeof M
+>M : M
 
     interface A {
 >A : A
diff --git a/tests/baselines/reference/mergeThreeInterfaces2.types b/tests/baselines/reference/mergeThreeInterfaces2.types
index 31339187e3d..89414c05dfb 100644
--- a/tests/baselines/reference/mergeThreeInterfaces2.types
+++ b/tests/baselines/reference/mergeThreeInterfaces2.types
@@ -3,7 +3,7 @@
 
 // root module now multiple module declarations
 module M2 {
->M2 : typeof M2
+>M2 : M2
 
     export interface A {
 >A : A
@@ -30,7 +30,7 @@ module M2 {
 }
 
 module M2 {
->M2 : typeof M2
+>M2 : M2
 
     export interface A {
 >A : A
@@ -71,10 +71,10 @@ module M2 {
 
 // same as above but with an additional level of nesting and third module declaration
 module M2 {
->M2 : typeof M2
+>M2 : M2
 
     export module M3 {
->M3 : typeof M3
+>M3 : M3
 
         export interface A {
 >A : A
@@ -102,10 +102,10 @@ module M2 {
 }
 
 module M2 {
->M2 : typeof M2
+>M2 : M2
 
     export module M3 {
->M3 : typeof M3
+>M3 : M3
 
         export interface A {
 >A : A
@@ -139,10 +139,10 @@ module M2 {
 }
 
 module M2 {
->M2 : typeof M2
+>M2 : M2
 
     export module M3 {
->M3 : typeof M3
+>M3 : M3
 
         export interface A {
 >A : A
diff --git a/tests/baselines/reference/mergeTwoInterfaces.types b/tests/baselines/reference/mergeTwoInterfaces.types
index 539f01d4240..49f70ffdd98 100644
--- a/tests/baselines/reference/mergeTwoInterfaces.types
+++ b/tests/baselines/reference/mergeTwoInterfaces.types
@@ -72,7 +72,7 @@ var r4 = b.bar;
 
 // basic non-generic and generic case inside a module
 module M {
->M : typeof M
+>M : M
 
     interface A {
 >A : A
diff --git a/tests/baselines/reference/mergeTwoInterfaces2.types b/tests/baselines/reference/mergeTwoInterfaces2.types
index f3908a6fe67..06534f6c20c 100644
--- a/tests/baselines/reference/mergeTwoInterfaces2.types
+++ b/tests/baselines/reference/mergeTwoInterfaces2.types
@@ -3,7 +3,7 @@
 
 // root module now multiple module declarations
 module M2 {
->M2 : typeof M2
+>M2 : M2
 
     export interface A {
 >A : A
@@ -30,7 +30,7 @@ module M2 {
 }
 
 module M2 {
->M2 : typeof M2
+>M2 : M2
 
     export interface A {
 >A : A
@@ -58,10 +58,10 @@ module M2 {
 
 // same as above but with an additional level of nesting
 module M2 {
->M2 : typeof M2
+>M2 : M2
 
     export module M3 {
->M3 : typeof M3
+>M3 : M3
 
         export interface A {
 >A : A
@@ -89,10 +89,10 @@ module M2 {
 }
 
 module M2 {
->M2 : typeof M2
+>M2 : M2
 
     export module M3 {
->M3 : typeof M3
+>M3 : M3
 
         export interface A {
 >A : A
diff --git a/tests/baselines/reference/mergedDeclarations1.types b/tests/baselines/reference/mergedDeclarations1.types
index f4b6cfc6e4b..837d418e4c7 100644
--- a/tests/baselines/reference/mergedDeclarations1.types
+++ b/tests/baselines/reference/mergedDeclarations1.types
@@ -17,12 +17,12 @@ function point(x: number, y: number): Point {
     return { x: x, y: y };
 >{ x: x, y: y } : { x: number; y: number; }
 >x : number
->x : x
+>x : number
+>y : number
 >y : number
->y : y
 }
 module point {
->point : typeof point
+>point : point
 
     export var origin = point(0, 0);
 >origin : Point
@@ -68,9 +68,9 @@ var p2 = point.origin;
 var b = point.equals(p1, p2);
 >b : boolean
 >point.equals(p1, p2) : boolean
->point.equals : typeof equals
+>point.equals : typeof point.equals
 >point : typeof point
->equals : typeof equals
+>equals : typeof point.equals
 >p1 : Point
 >p2 : Point
 
diff --git a/tests/baselines/reference/mergedDeclarations4.types b/tests/baselines/reference/mergedDeclarations4.types
index 08f06f0730c..b07eb2cbc3f 100644
--- a/tests/baselines/reference/mergedDeclarations4.types
+++ b/tests/baselines/reference/mergedDeclarations4.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/mergedDeclarations4.ts ===
 module M {
->M : typeof M
+>M : M
 
     export function f() { }
 >f : typeof f
@@ -23,10 +23,10 @@ module M {
 }
  
 module M {
->M : typeof M
+>M : M
 
     export module f {
->f : typeof f
+>f : f
 
         export var hello = 1;
 >hello : number
@@ -50,14 +50,14 @@ module M {
  
 M.f();
 >M.f() : void
->M.f : typeof f
+>M.f : typeof M.f
 >M : typeof M
->f : typeof f
+>f : typeof M.f
 
 M.f.hello;
 >M.f.hello : number
->M.f : typeof f
+>M.f : typeof M.f
 >M : typeof M
->f : typeof f
+>f : typeof M.f
 >hello : number
 
diff --git a/tests/baselines/reference/mergedInterfacesWithMultipleBases.types b/tests/baselines/reference/mergedInterfacesWithMultipleBases.types
index 4fb955dab2e..a6b2fd56702 100644
--- a/tests/baselines/reference/mergedInterfacesWithMultipleBases.types
+++ b/tests/baselines/reference/mergedInterfacesWithMultipleBases.types
@@ -61,7 +61,7 @@ var r = a.a;
 
 // generic interfaces in a module
 module M {
->M : typeof M
+>M : M
 
     class C<T> {
 >C : C<T>
diff --git a/tests/baselines/reference/mergedInterfacesWithMultipleBases2.types b/tests/baselines/reference/mergedInterfacesWithMultipleBases2.types
index b8dfec64bae..281e31608a7 100644
--- a/tests/baselines/reference/mergedInterfacesWithMultipleBases2.types
+++ b/tests/baselines/reference/mergedInterfacesWithMultipleBases2.types
@@ -84,7 +84,7 @@ var r = a.a;
 
 // generic interfaces in a module
 module M {
->M : typeof M
+>M : M
 
     class C<T> {
 >C : C<T>
diff --git a/tests/baselines/reference/mergedModuleDeclarationCodeGen2.types b/tests/baselines/reference/mergedModuleDeclarationCodeGen2.types
index 7eb7b8f2ae4..5e29d6810b8 100644
--- a/tests/baselines/reference/mergedModuleDeclarationCodeGen2.types
+++ b/tests/baselines/reference/mergedModuleDeclarationCodeGen2.types
@@ -1,15 +1,15 @@
 === tests/cases/compiler/mergedModuleDeclarationCodeGen2.ts ===
 module my.data.foo {
->my : typeof my
->data : typeof data
->foo : typeof foo
+>my : my
+>data : data
+>foo : foo
 
     export function buz() { }
 >buz : typeof buz
 }
 module my.data {
->my : typeof my
->data : typeof data
+>my : my
+>data : my.data
 
     function data(my) {
 >data : typeof data
@@ -17,8 +17,8 @@ module my.data {
 
         foo.buz();
 >foo.buz() : void
->foo.buz : typeof buz
+>foo.buz : typeof foo.buz
 >foo : typeof foo
->buz : typeof buz
+>buz : typeof foo.buz
     }
 }
diff --git a/tests/baselines/reference/mergedModuleDeclarationCodeGen3.types b/tests/baselines/reference/mergedModuleDeclarationCodeGen3.types
index 2013d068571..03dad24bd3c 100644
--- a/tests/baselines/reference/mergedModuleDeclarationCodeGen3.types
+++ b/tests/baselines/reference/mergedModuleDeclarationCodeGen3.types
@@ -1,15 +1,15 @@
 === tests/cases/compiler/mergedModuleDeclarationCodeGen3.ts ===
 module my.data {
->my : typeof my
->data : typeof data
+>my : my
+>data : data
 
     export function buz() { }
 >buz : typeof buz
 }
 module my.data.foo {
->my : typeof my
->data : typeof data
->foo : typeof foo
+>my : my
+>data : data
+>foo : foo
 
     function data(my, foo) {
 >data : typeof data
diff --git a/tests/baselines/reference/mergedModuleDeclarationCodeGen4.types b/tests/baselines/reference/mergedModuleDeclarationCodeGen4.types
index aa0dfdb4762..58938f9cfbc 100644
--- a/tests/baselines/reference/mergedModuleDeclarationCodeGen4.types
+++ b/tests/baselines/reference/mergedModuleDeclarationCodeGen4.types
@@ -1,27 +1,27 @@
 === tests/cases/compiler/mergedModuleDeclarationCodeGen4.ts ===
 module superContain {
->superContain : typeof superContain
+>superContain : superContain
 
     export module contain {
->contain : typeof contain
+>contain : contain
 
         export module my.buz {
->my : typeof my
->buz : typeof buz
+>my : my
+>buz : buz
 
             export module data {
->data : typeof data
+>data : data
 
                 export function foo() { }
 >foo : typeof foo
             }
         }
         export module my.buz {
->my : typeof my
->buz : typeof buz
+>my : my
+>buz : buz
 
             export module data {
->data : typeof data
+>data : data
 
                 export function bar(contain, my, buz, data) {
 >bar : typeof bar
diff --git a/tests/baselines/reference/mergedModuleDeclarationCodeGen5.types b/tests/baselines/reference/mergedModuleDeclarationCodeGen5.types
index 0b835325cb9..2201fa5811e 100644
--- a/tests/baselines/reference/mergedModuleDeclarationCodeGen5.types
+++ b/tests/baselines/reference/mergedModuleDeclarationCodeGen5.types
@@ -1,8 +1,8 @@
 === tests/cases/compiler/mergedModuleDeclarationCodeGen5.ts ===
 module M.buz.plop {
->M : typeof M
->buz : typeof buz
->plop : typeof plop
+>M : M
+>buz : buz
+>plop : buz.plop
 
     export function doom() { }
 >doom : typeof doom
@@ -11,9 +11,9 @@ module M.buz.plop {
 >M : typeof M
 }
 module M.buz.plop {
->M : typeof M
->buz : typeof buz
->plop : typeof plop
+>M : M
+>buz : buz
+>plop : buz.plop
 
     function gunk() { }
 >gunk : typeof gunk
diff --git a/tests/baselines/reference/mergedModuleDeclarationWithSharedExportedVar.types b/tests/baselines/reference/mergedModuleDeclarationWithSharedExportedVar.types
index 89d155861a5..42d4a032f8a 100644
--- a/tests/baselines/reference/mergedModuleDeclarationWithSharedExportedVar.types
+++ b/tests/baselines/reference/mergedModuleDeclarationWithSharedExportedVar.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/mergedModuleDeclarationWithSharedExportedVar.ts ===
 module M {
->M : typeof M
+>M : M
 
     export var v = 10;
 >v : number
@@ -9,7 +9,7 @@ module M {
 >v : number
 }
 module M {
->M : typeof M
+>M : M
 
     v;
 >v : number
diff --git a/tests/baselines/reference/methodContainingLocalFunction.types b/tests/baselines/reference/methodContainingLocalFunction.types
index fb52c3831ba..2c34913c1c8 100644
--- a/tests/baselines/reference/methodContainingLocalFunction.types
+++ b/tests/baselines/reference/methodContainingLocalFunction.types
@@ -89,7 +89,7 @@ class C {
 }
 
 module M {
->M : typeof M
+>M : M
 
     export function exhibitBug() {
 >exhibitBug : typeof exhibitBug
diff --git a/tests/baselines/reference/missingImportAfterModuleImport.types b/tests/baselines/reference/missingImportAfterModuleImport.types
index b8602ca06d0..3f027a2a280 100644
--- a/tests/baselines/reference/missingImportAfterModuleImport.types
+++ b/tests/baselines/reference/missingImportAfterModuleImport.types
@@ -1,7 +1,7 @@
 === tests/cases/compiler/missingImportAfterModuleImport_1.ts ===
 ///<reference path='missingImportAfterModuleImport_0.ts'/>
 import SubModule = require('SubModule');
->SubModule : typeof SubModule
+>SubModule : SubModule
 
 class MainModule {
 >MainModule : MainModule
diff --git a/tests/baselines/reference/mixingFunctionAndAmbientModule1.types b/tests/baselines/reference/mixingFunctionAndAmbientModule1.types
index c9e2e1167a9..4a649eaeb3f 100644
--- a/tests/baselines/reference/mixingFunctionAndAmbientModule1.types
+++ b/tests/baselines/reference/mixingFunctionAndAmbientModule1.types
@@ -1,9 +1,9 @@
 === tests/cases/compiler/mixingFunctionAndAmbientModule1.ts ===
 module A {
->A : typeof A
+>A : A
 
     declare module My {
->My : typeof My
+>My : My
 
         export var x: number;
 >x : number
@@ -14,10 +14,10 @@ module A {
 }
 
 module B {
->B : typeof B
+>B : B
 
     declare module My {
->My : typeof My
+>My : My
 
         export var x: number;
 >x : number
@@ -32,10 +32,10 @@ module B {
 }
 
 module C {
->C : typeof C
+>C : C
 
     declare module My {
->My : typeof My
+>My : My
 
         export var x: number;
 >x : number
@@ -46,10 +46,10 @@ module C {
 }
 
 module D {
->D : typeof D
+>D : D
 
     declare module My {
->My : typeof My
+>My : My
 
         export var x: number;
 >x : number
@@ -65,10 +65,10 @@ module D {
 
 
 module E {
->E : typeof E
+>E : E
 
     declare module My {
->My : typeof My
+>My : My
 
         export var x: number;
 >x : number
@@ -78,7 +78,7 @@ module E {
 >s : boolean
 
     declare module My {
->My : typeof My
+>My : My
 
         export var y: number;
 >y : number
diff --git a/tests/baselines/reference/modFunctionCrash.types b/tests/baselines/reference/modFunctionCrash.types
index 0bbeb588c7e..fb7c46e7847 100644
--- a/tests/baselines/reference/modFunctionCrash.types
+++ b/tests/baselines/reference/modFunctionCrash.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/modFunctionCrash.ts ===
 declare module Q {
->Q : typeof Q
+>Q : Q
 
     function f(fn:()=>void); // typechecking the function type shouldnot crash the compiler
 >f : typeof f
@@ -10,9 +10,9 @@ declare module Q {
 
 Q.f(function() {this;});
 >Q.f(function() {this;}) : any
->Q.f : typeof f
+>Q.f : typeof Q.f
 >Q : typeof Q
->f : typeof f
+>f : typeof Q.f
 >function() {this;} : () => void
 >this : any
 
diff --git a/tests/baselines/reference/moduleAliasAsFunctionArgument.types b/tests/baselines/reference/moduleAliasAsFunctionArgument.types
index bb9bda32376..d616415b5cb 100644
--- a/tests/baselines/reference/moduleAliasAsFunctionArgument.types
+++ b/tests/baselines/reference/moduleAliasAsFunctionArgument.types
@@ -1,7 +1,7 @@
 === tests/cases/compiler/moduleAliasAsFunctionArgument_1.ts ===
 ///<reference path='moduleAliasAsFunctionArgument_0.ts'/>
 import a = require('moduleAliasAsFunctionArgument_0');
->a : typeof "tests/cases/compiler/moduleAliasAsFunctionArgument_0"
+>a : a
 
 function fn(arg: { x: number }) {
 >fn : typeof fn
@@ -11,13 +11,13 @@ function fn(arg: { x: number }) {
 
 a.x; // OK
 >a.x : number
->a : typeof "tests/cases/compiler/moduleAliasAsFunctionArgument_0"
+>a : typeof a
 >x : number
 
 fn(a); // Error: property 'x' is missing from 'a'
 >fn(a) : void
 >fn : typeof fn
->a : typeof "tests/cases/compiler/moduleAliasAsFunctionArgument_0"
+>a : typeof a
 
 === tests/cases/compiler/moduleAliasAsFunctionArgument_0.ts ===
 export var x: number;
diff --git a/tests/baselines/reference/moduleAliasInterface.types b/tests/baselines/reference/moduleAliasInterface.types
index 809aba0e634..afde68cd166 100644
--- a/tests/baselines/reference/moduleAliasInterface.types
+++ b/tests/baselines/reference/moduleAliasInterface.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/moduleAliasInterface.ts ===
 module _modes {
->_modes : typeof _modes
+>_modes : _modes
 
  export interface IMode {
 >IMode : IMode
@@ -16,83 +16,83 @@ module _modes {
 // _modes. // produces an internal error - please implement in derived class
 
 module editor {
->editor : typeof editor
+>editor : editor
 
  import modes = _modes;
->modes : typeof _modes
->_modes : typeof _modes
+>modes : modes
+>_modes : typeof modes
  
  var i : modes.IMode;
->i : IMode
+>i : modes.IMode
 >modes : modes
->IMode : IMode
+>IMode : modes.IMode
   
  // If you just use p1:modes, the compiler accepts it - should be an error
  class Bug { 
 >Bug : Bug
 
   constructor(p1: modes.IMode, p2: modes.Mode) { }// should be an error on p2 - it's not exported
->p1 : IMode
+>p1 : modes.IMode
 >modes : modes
->IMode : IMode
->p2 : Mode
+>IMode : modes.IMode
+>p2 : modes.Mode
 >modes : modes
->Mode : Mode
+>Mode : modes.Mode
 
   public foo(p1:modes.IMode) {
->foo : (p1: IMode) => void
->p1 : IMode
+>foo : (p1: modes.IMode) => void
+>p1 : modes.IMode
 >modes : modes
->IMode : IMode
+>IMode : modes.IMode
    
   } 
  }
 }
 
 import modesOuter = _modes;
->modesOuter : typeof _modes
+>modesOuter : modesOuter
 >_modes : typeof _modes
 
 module editor2 {
->editor2 : typeof editor2
+>editor2 : editor2
  
  var i : modesOuter.IMode;
->i : IMode
+>i : modesOuter.IMode
 >modesOuter : modesOuter
->IMode : IMode
+>IMode : modesOuter.IMode
  
  class Bug {
 >Bug : Bug
 
      constructor(p1: modesOuter.IMode, p2: modesOuter.Mode) { }// no error here, since modesOuter is declared externally
->p1 : IMode
+>p1 : modesOuter.IMode
 >modesOuter : modesOuter
->IMode : IMode
->p2 : Mode
+>IMode : modesOuter.IMode
+>p2 : modesOuter.Mode
 >modesOuter : modesOuter
->Mode : Mode
+>Mode : modesOuter.Mode
   
  }
  
   module Foo { export class Bar{} }
->Foo : typeof Foo
+>Foo : Foo
 >Bar : Bar
  
   class Bug2 {
 >Bug2 : Bug2
 
       constructor(p1: Foo.Bar, p2: modesOuter.Mode) { }
->p1 : Bar
+>p1 : Foo.Bar
 >Foo : Foo
->Bar : Bar
->p2 : Mode
+>Bar : Foo.Bar
+>p2 : modesOuter.Mode
 >modesOuter : modesOuter
->Mode : Mode
+>Mode : modesOuter.Mode
   }
 }
 
 module A1 {
->A1 : typeof A1
+>A1 : A1
 
     export interface A1I1 {}
 >A1I1 : A1I1
@@ -102,20 +102,20 @@ module A1 {
 }
 
 module B1 {
->B1 : typeof B1
+>B1 : B1
 
     import A1Alias1 = A1;
->A1Alias1 : typeof A1
->A1 : typeof A1
+>A1Alias1 : A1Alias1
+>A1 : typeof A1Alias1
     
     var i : A1Alias1.A1I1;   
->i : A1I1
+>i : A1Alias1.A1I1
 >A1Alias1 : A1Alias1
->A1I1 : A1I1
+>A1I1 : A1Alias1.A1I1
 
     var c : A1Alias1.A1C1;
->c : A1C1
+>c : A1Alias1.A1C1
 >A1Alias1 : A1Alias1
->A1C1 : A1C1
+>A1C1 : A1Alias1.A1C1
 }
 
diff --git a/tests/baselines/reference/moduleAndInterfaceSharingName.types b/tests/baselines/reference/moduleAndInterfaceSharingName.types
index 65f8d8c9c70..e343a49b9b7 100644
--- a/tests/baselines/reference/moduleAndInterfaceSharingName.types
+++ b/tests/baselines/reference/moduleAndInterfaceSharingName.types
@@ -12,13 +12,13 @@ module X {
 >Y : Y
 }
 var z: X.Y.Z = null;
->z : Z
+>z : X.Y.Z
 >X : X
->Y : Y
->Z : Z
+>Y : X.Y
+>Z : X.Y.Z
 
 var z2: X.Y;
->z2 : Y
+>z2 : X.Y
 >X : X
->Y : Y
+>Y : X.Y
 
diff --git a/tests/baselines/reference/moduleAndInterfaceSharingName3.types b/tests/baselines/reference/moduleAndInterfaceSharingName3.types
index f2a8b24e6b3..eb37a739426 100644
--- a/tests/baselines/reference/moduleAndInterfaceSharingName3.types
+++ b/tests/baselines/reference/moduleAndInterfaceSharingName3.types
@@ -13,13 +13,13 @@ module X {
 >T : T
 }
 var z: X.Y.Z = null;
->z : Z
+>z : X.Y.Z
 >X : X
->Y : Y
->Z : Z
+>Y : X.Y
+>Z : X.Y.Z
 
 var z2: X.Y<string>;
->z2 : Y<string>
+>z2 : X.Y<string>
 >X : X
->Y : Y<T>
+>Y : X.Y<T>
 
diff --git a/tests/baselines/reference/moduleAndInterfaceSharingName4.types b/tests/baselines/reference/moduleAndInterfaceSharingName4.types
index ef933ef7fe5..e2d050d82f5 100644
--- a/tests/baselines/reference/moduleAndInterfaceSharingName4.types
+++ b/tests/baselines/reference/moduleAndInterfaceSharingName4.types
@@ -1,15 +1,15 @@
 === tests/cases/compiler/moduleAndInterfaceSharingName4.ts ===
 declare module D3 {
->D3 : typeof D3
+>D3 : D3
 
     var x: D3.Color.Color;
->x : Color
+>x : Color.Color
 >D3 : D3
 >Color : Color
->Color : Color
+>Color : Color.Color
 
     module Color {
->Color : Color
+>Color : D3.Color
 
         export interface Color {
 >Color : Color
diff --git a/tests/baselines/reference/moduleCodeGenTest3.types b/tests/baselines/reference/moduleCodeGenTest3.types
index d5e10130c0d..74c7ecf3d01 100644
--- a/tests/baselines/reference/moduleCodeGenTest3.types
+++ b/tests/baselines/reference/moduleCodeGenTest3.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/moduleCodeGenTest3.ts ===
 module Baz { export var x = "hello"; }
->Baz : typeof Baz
+>Baz : Baz
 >x : string
 
 Baz.x = "goodbye";
diff --git a/tests/baselines/reference/moduleCodegenTest4.types b/tests/baselines/reference/moduleCodegenTest4.types
index 7b9229a46c1..ed7791e77f6 100644
--- a/tests/baselines/reference/moduleCodegenTest4.types
+++ b/tests/baselines/reference/moduleCodegenTest4.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/moduleCodegenTest4.ts ===
 export module Baz { export var x = "hello"; }
->Baz : typeof Baz
+>Baz : Baz
 >x : string
 
 Baz.x = "goodbye";
diff --git a/tests/baselines/reference/moduleIdentifiers.types b/tests/baselines/reference/moduleIdentifiers.types
index db8b1c3f720..451f166075f 100644
--- a/tests/baselines/reference/moduleIdentifiers.types
+++ b/tests/baselines/reference/moduleIdentifiers.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/moduleIdentifiers.ts ===
 module M {
->M : typeof M
+>M : M
 
     interface P { x: number; y: number; }
 >P : P
diff --git a/tests/baselines/reference/moduleImportedForTypeArgumentPosition.types b/tests/baselines/reference/moduleImportedForTypeArgumentPosition.types
index 73097ef86ce..86513159531 100644
--- a/tests/baselines/reference/moduleImportedForTypeArgumentPosition.types
+++ b/tests/baselines/reference/moduleImportedForTypeArgumentPosition.types
@@ -1,7 +1,7 @@
 === tests/cases/compiler/moduleImportedForTypeArgumentPosition_1.ts ===
 /**This is on import declaration*/
 import M2 = require("moduleImportedForTypeArgumentPosition_0");
->M2 : typeof "tests/cases/compiler/moduleImportedForTypeArgumentPosition_0"
+>M2 : M2
 
 class C1<T>{ }
 >C1 : C1<T>
@@ -11,7 +11,7 @@ class Test1 extends C1<M2.M2C> {
 >Test1 : Test1
 >C1 : C1<T>
 >M2 : M2
->M2C : M2C
+>M2C : M2.M2C
 }
 
 === tests/cases/compiler/moduleImportedForTypeArgumentPosition_0.ts ===
diff --git a/tests/baselines/reference/moduleMemberWithoutTypeAnnotation1.types b/tests/baselines/reference/moduleMemberWithoutTypeAnnotation1.types
index aea08c53613..10688c42043 100644
--- a/tests/baselines/reference/moduleMemberWithoutTypeAnnotation1.types
+++ b/tests/baselines/reference/moduleMemberWithoutTypeAnnotation1.types
@@ -1,7 +1,7 @@
 === tests/cases/compiler/moduleMemberWithoutTypeAnnotation1.ts ===
 module TypeScript.Parser {
->TypeScript : typeof TypeScript
->Parser : typeof Parser
+>TypeScript : TypeScript
+>Parser : Parser
 
     class SyntaxCursor {
 >SyntaxCursor : SyntaxCursor
@@ -16,7 +16,7 @@ module TypeScript.Parser {
 }
 
 module TypeScript {
->TypeScript : typeof TypeScript
+>TypeScript : TypeScript
 
     export interface ISyntaxElement { };
 >ISyntaxElement : ISyntaxElement
@@ -34,9 +34,9 @@ module TypeScript {
 
             return Syntax.childIndex();
 >Syntax.childIndex() : void
->Syntax.childIndex : typeof childIndex
+>Syntax.childIndex : typeof Syntax.childIndex
 >Syntax : typeof Syntax
->childIndex : typeof childIndex
+>childIndex : typeof Syntax.childIndex
         }
     }
 
@@ -54,7 +54,7 @@ module TypeScript {
 }
 
 module TypeScript {
->TypeScript : typeof TypeScript
+>TypeScript : TypeScript
 
     export class SyntaxNode {
 >SyntaxNode : SyntaxNode
@@ -87,8 +87,8 @@ module TypeScript {
 }
 
 module TypeScript.Syntax {
->TypeScript : typeof TypeScript
->Syntax : typeof Syntax
+>TypeScript : TypeScript
+>Syntax : Syntax
 
     export function childIndex() { }
 >childIndex : typeof childIndex
diff --git a/tests/baselines/reference/moduleMemberWithoutTypeAnnotation2.types b/tests/baselines/reference/moduleMemberWithoutTypeAnnotation2.types
index 3a1c0b07d92..a22095f3118 100644
--- a/tests/baselines/reference/moduleMemberWithoutTypeAnnotation2.types
+++ b/tests/baselines/reference/moduleMemberWithoutTypeAnnotation2.types
@@ -1,9 +1,9 @@
 === tests/cases/compiler/moduleMemberWithoutTypeAnnotation2.ts ===
 module TypeScript {
->TypeScript : typeof TypeScript
+>TypeScript : TypeScript
 
     export module CompilerDiagnostics {
->CompilerDiagnostics : typeof CompilerDiagnostics
+>CompilerDiagnostics : CompilerDiagnostics
 
         export interface IDiagnosticWriter {
 >IDiagnosticWriter : IDiagnosticWriter
diff --git a/tests/baselines/reference/moduleMerge.types b/tests/baselines/reference/moduleMerge.types
index b70f786b7a2..1708632fadc 100644
--- a/tests/baselines/reference/moduleMerge.types
+++ b/tests/baselines/reference/moduleMerge.types
@@ -2,7 +2,7 @@
 // This should not compile both B classes are in the same module this should be a collission
 
 module A
->A : typeof A
+>A : A
 {
     class B
 >B : B
@@ -16,7 +16,7 @@ module A
 }
 
 module A
->A : typeof A
+>A : A
 {
     export class B
 >B : B
diff --git a/tests/baselines/reference/moduleNoEmit.types b/tests/baselines/reference/moduleNoEmit.types
index 7fb6b6164d6..0dc64c340d0 100644
--- a/tests/baselines/reference/moduleNoEmit.types
+++ b/tests/baselines/reference/moduleNoEmit.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/moduleNoEmit.ts ===
 module Foo {
->Foo : typeof Foo
+>Foo : Foo
 
 	1+1;
 >1+1 : number
diff --git a/tests/baselines/reference/moduleOuterQualification.types b/tests/baselines/reference/moduleOuterQualification.types
index e60ae3ca51f..1e4a13453bf 100644
--- a/tests/baselines/reference/moduleOuterQualification.types
+++ b/tests/baselines/reference/moduleOuterQualification.types
@@ -13,7 +13,7 @@ declare module outer {
     export interface Beta extends outer.Beta { }
 >Beta : Beta
 >outer : outer
->Beta : Beta
+>Beta : outer.Beta
   }
 }
 
diff --git a/tests/baselines/reference/moduleRedifinitionErrors.types b/tests/baselines/reference/moduleRedifinitionErrors.types
index 34a5f428596..89a8cfbfa3c 100644
--- a/tests/baselines/reference/moduleRedifinitionErrors.types
+++ b/tests/baselines/reference/moduleRedifinitionErrors.types
@@ -3,6 +3,6 @@ class A {
 >A : A
 }
 module A {
->A : typeof A
+>A : A
 }
 
diff --git a/tests/baselines/reference/moduleReopenedTypeOtherBlock.types b/tests/baselines/reference/moduleReopenedTypeOtherBlock.types
index f98c069c338..c16e80ca578 100644
--- a/tests/baselines/reference/moduleReopenedTypeOtherBlock.types
+++ b/tests/baselines/reference/moduleReopenedTypeOtherBlock.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/moduleReopenedTypeOtherBlock.ts ===
 module M {
->M : typeof M
+>M : M
 
     export class C1 { }
 >C1 : C1
@@ -10,7 +10,7 @@ module M {
 >n : number
 }
 module M {
->M : typeof M
+>M : M
 
     export class C2 { f(): I { return null; } }
 >C2 : C2
diff --git a/tests/baselines/reference/moduleReopenedTypeSameBlock.types b/tests/baselines/reference/moduleReopenedTypeSameBlock.types
index 8f119fff60c..785cea3e093 100644
--- a/tests/baselines/reference/moduleReopenedTypeSameBlock.types
+++ b/tests/baselines/reference/moduleReopenedTypeSameBlock.types
@@ -1,10 +1,10 @@
 === tests/cases/compiler/moduleReopenedTypeSameBlock.ts ===
 module M { export class C1 { } }
->M : typeof M
+>M : M
 >C1 : C1
 
 module M {
->M : typeof M
+>M : M
 
     export interface I { n: number; }
 >I : I
diff --git a/tests/baselines/reference/moduleScopingBug.types b/tests/baselines/reference/moduleScopingBug.types
index 00cd06d076c..d38c9413b62 100644
--- a/tests/baselines/reference/moduleScopingBug.types
+++ b/tests/baselines/reference/moduleScopingBug.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/moduleScopingBug.ts ===
 module M
->M : typeof M
+>M : M
 
 {
 
@@ -28,7 +28,7 @@ module M
     }
 
     module X {
->X : typeof X
+>X : X
 
         var inner = outer;   // Error: outer not visible
 >inner : number
diff --git a/tests/baselines/reference/moduleUnassignedVariable.types b/tests/baselines/reference/moduleUnassignedVariable.types
index c4eeecbf39f..5871c67b5ae 100644
--- a/tests/baselines/reference/moduleUnassignedVariable.types
+++ b/tests/baselines/reference/moduleUnassignedVariable.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/moduleUnassignedVariable.ts ===
 module Bar {
->Bar : typeof Bar
+>Bar : Bar
 
     export var a = 1;
 >a : number
diff --git a/tests/baselines/reference/moduleVariableArrayIndexer.types b/tests/baselines/reference/moduleVariableArrayIndexer.types
index 564de3ff972..be9aa49a326 100644
--- a/tests/baselines/reference/moduleVariableArrayIndexer.types
+++ b/tests/baselines/reference/moduleVariableArrayIndexer.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/moduleVariableArrayIndexer.ts ===
 module Bar {
->Bar : typeof Bar
+>Bar : Bar
 
     export var a = 1;
 >a : number
diff --git a/tests/baselines/reference/moduleVariables.types b/tests/baselines/reference/moduleVariables.types
index 2c00df87f56..644a615cc50 100644
--- a/tests/baselines/reference/moduleVariables.types
+++ b/tests/baselines/reference/moduleVariables.types
@@ -6,7 +6,7 @@ var x = 1;
 >x : number
 
 module M {
->M : typeof M
+>M : M
 
     export var x = 2;
 >x : number
@@ -20,7 +20,7 @@ module M {
 }
  
 module M {
->M : typeof M
+>M : M
 
     console.log(x); // 2
 >console.log(x) : any
@@ -31,7 +31,7 @@ module M {
 }
  
 module M {
->M : typeof M
+>M : M
 
     var x = 3;
 >x : number
diff --git a/tests/baselines/reference/moduleVisibilityTest1.types b/tests/baselines/reference/moduleVisibilityTest1.types
index 3c450978d55..39bfd22b11c 100644
--- a/tests/baselines/reference/moduleVisibilityTest1.types
+++ b/tests/baselines/reference/moduleVisibilityTest1.types
@@ -2,14 +2,14 @@
 
 
 module OuterMod {
->OuterMod : typeof OuterMod
+>OuterMod : OuterMod
 
 	export function someExportedOuterFunc() { return -1; }
 >someExportedOuterFunc : typeof someExportedOuterFunc
 >-1 : number
 
 	export module OuterInnerMod {
->OuterInnerMod : typeof OuterInnerMod
+>OuterInnerMod : OuterInnerMod
 
 		export function someExportedOuterInnerFunc() { return "foo"; }
 >someExportedOuterInnerFunc : typeof someExportedOuterInnerFunc
@@ -17,15 +17,15 @@ module OuterMod {
 }
 
 import OuterInnerAlias = OuterMod.OuterInnerMod;
->OuterInnerAlias : typeof OuterInnerMod
+>OuterInnerAlias : OuterInnerAlias
 >OuterMod : typeof OuterMod
->OuterInnerMod : typeof OuterInnerMod
+>OuterInnerMod : typeof OuterInnerAlias
 
 module M {
->M : typeof M
+>M : M
 
 	export module InnerMod {
->InnerMod : typeof InnerMod
+>InnerMod : InnerMod
 
 		export function someExportedInnerFunc() { return -2; }
 >someExportedInnerFunc : typeof someExportedInnerFunc
@@ -76,23 +76,23 @@ module M {
 		public someMethodThatCallsAnOuterMethod() {return OuterInnerAlias.someExportedOuterInnerFunc();}
 >someMethodThatCallsAnOuterMethod : () => string
 >OuterInnerAlias.someExportedOuterInnerFunc() : string
->OuterInnerAlias.someExportedOuterInnerFunc : typeof someExportedOuterInnerFunc
->OuterInnerAlias : typeof OuterInnerMod
->someExportedOuterInnerFunc : typeof someExportedOuterInnerFunc
+>OuterInnerAlias.someExportedOuterInnerFunc : typeof OuterInnerAlias.someExportedOuterInnerFunc
+>OuterInnerAlias : typeof OuterInnerAlias
+>someExportedOuterInnerFunc : typeof OuterInnerAlias.someExportedOuterInnerFunc
 
 		public someMethodThatCallsAnInnerMethod() {return InnerMod.someExportedInnerFunc();}
 >someMethodThatCallsAnInnerMethod : () => number
 >InnerMod.someExportedInnerFunc() : number
->InnerMod.someExportedInnerFunc : typeof someExportedInnerFunc
+>InnerMod.someExportedInnerFunc : typeof InnerMod.someExportedInnerFunc
 >InnerMod : typeof InnerMod
->someExportedInnerFunc : typeof someExportedInnerFunc
+>someExportedInnerFunc : typeof InnerMod.someExportedInnerFunc
 
 		public someMethodThatCallsAnOuterInnerMethod() {return OuterMod.someExportedOuterFunc();}
 >someMethodThatCallsAnOuterInnerMethod : () => number
 >OuterMod.someExportedOuterFunc() : number
->OuterMod.someExportedOuterFunc : typeof someExportedOuterFunc
+>OuterMod.someExportedOuterFunc : typeof OuterMod.someExportedOuterFunc
 >OuterMod : typeof OuterMod
->someExportedOuterFunc : typeof someExportedOuterFunc
+>someExportedOuterFunc : typeof OuterMod.someExportedOuterFunc
 
 		public someMethod() { return 0; }
 >someMethod : () => number
@@ -117,7 +117,7 @@ module M {
 }
 
 module M {
->M : typeof M
+>M : M
 
 	export var c = x;
 >c : number
@@ -133,19 +133,19 @@ module M {
 }
 
 var cprime : M.I = <M.I>null;
->cprime : I
+>cprime : M.I
 >M : M
->I : I
-><M.I>null : I
+>I : M.I
+><M.I>null : M.I
 >M : M
->I : I
+>I : M.I
 
 var c = new M.C();
->c : C
->new M.C() : C
->M.C : typeof C
+>c : M.C
+>new M.C() : M.C
+>M.C : typeof M.C
 >M : typeof M
->C : typeof C
+>C : typeof M.C
 
 var z = M.x;
 >z : number
@@ -154,12 +154,12 @@ var z = M.x;
 >x : number
 
 var alpha = M.E.A;
->alpha : E
->M.E.A : E
->M.E : typeof E
+>alpha : M.E
+>M.E.A : M.E
+>M.E : typeof M.E
 >M : typeof M
->E : typeof E
->A : E
+>E : typeof M.E
+>A : M.E
 
 var omega = M.exported_var;
 >omega : any
@@ -170,6 +170,6 @@ var omega = M.exported_var;
 c.someMethodThatCallsAnOuterMethod();
 >c.someMethodThatCallsAnOuterMethod() : string
 >c.someMethodThatCallsAnOuterMethod : () => string
->c : C
+>c : M.C
 >someMethodThatCallsAnOuterMethod : () => string
 
diff --git a/tests/baselines/reference/moduleWithStatementsOfEveryKind.types b/tests/baselines/reference/moduleWithStatementsOfEveryKind.types
index 2e1860fc2c9..9f5e4e92d0e 100644
--- a/tests/baselines/reference/moduleWithStatementsOfEveryKind.types
+++ b/tests/baselines/reference/moduleWithStatementsOfEveryKind.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/internalModules/moduleBody/moduleWithStatementsOfEveryKind.ts ===
 module A {
->A : typeof A
+>A : A
 
     class A { s: string }
 >A : A
@@ -32,7 +32,7 @@ module A {
     }
 
     module Module {
->Module : typeof Module
+>Module : Module
 
         class A { s: string }
 >A : A
@@ -74,7 +74,7 @@ module A {
 }
 
 module Y {
->Y : typeof Y
+>Y : Y
 
     export class A { s: string }
 >A : A
@@ -106,7 +106,7 @@ module Y {
     }
 
     export module Module {
->Module : typeof Module
+>Module : Module
 
         class A { s: string }
 >A : A
diff --git a/tests/baselines/reference/moduleWithTryStatement1.types b/tests/baselines/reference/moduleWithTryStatement1.types
index 9e18b649735..cb29dd79971 100644
--- a/tests/baselines/reference/moduleWithTryStatement1.types
+++ b/tests/baselines/reference/moduleWithTryStatement1.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/moduleWithTryStatement1.ts ===
 module M {
->M : typeof M
+>M : M
 
   try {
   }
diff --git a/tests/baselines/reference/multiModuleClodule1.types b/tests/baselines/reference/multiModuleClodule1.types
index 6d1b7b600a9..96003688dc6 100644
--- a/tests/baselines/reference/multiModuleClodule1.types
+++ b/tests/baselines/reference/multiModuleClodule1.types
@@ -12,11 +12,11 @@ class C {
 >bar : () => void
 
     static boo() { }
->boo : typeof boo
+>boo : () => void
 }
 
 module C {
->C : typeof C
+>C : C
 
     export var x = 1;
 >x : number
@@ -25,7 +25,7 @@ module C {
 >y : number
 }
 module C {
->C : typeof C
+>C : C
 
     export function foo() { }
 >foo : typeof foo
@@ -43,11 +43,11 @@ var c = new C(C.x);
 >x : number
 
 c.foo = C.foo;
->c.foo = C.foo : typeof foo
+>c.foo = C.foo : typeof C.foo
 >c.foo : () => void
 >c : C
 >foo : () => void
->C.foo : typeof foo
+>C.foo : typeof C.foo
 >C : typeof C
->foo : typeof foo
+>foo : typeof C.foo
 
diff --git a/tests/baselines/reference/multiModuleFundule1.types b/tests/baselines/reference/multiModuleFundule1.types
index 1e6f125fd3e..c0b23c6d1a6 100644
--- a/tests/baselines/reference/multiModuleFundule1.types
+++ b/tests/baselines/reference/multiModuleFundule1.types
@@ -4,13 +4,13 @@ function C(x: number) { }
 >x : number
 
 module C {
->C : typeof C
+>C : C
 
     export var x = 1;
 >x : number
 }
 module C {
->C : typeof C
+>C : C
 
     export function foo() { }
 >foo : typeof foo
@@ -29,7 +29,7 @@ var r2 = new C(2); // using void returning function as constructor
 var r3 = C.foo();
 >r3 : void
 >C.foo() : void
->C.foo : typeof foo
+>C.foo : typeof C.foo
 >C : typeof C
->foo : typeof foo
+>foo : typeof C.foo
 
diff --git a/tests/baselines/reference/nameCollision.types b/tests/baselines/reference/nameCollision.types
index 02266304873..b3988873b9e 100644
--- a/tests/baselines/reference/nameCollision.types
+++ b/tests/baselines/reference/nameCollision.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/internalModules/codeGeneration/nameCollision.ts ===
 module A {
->A : typeof A
+>A : A
 
     // these 2 statements force an underscore before the 'A' 
     // in the generated function call.
@@ -12,14 +12,14 @@ module A {
 }
 
 module B {
->B : typeof B
+>B : B
 
     var A = 12;
 >A : number
 }
 
 module B {
->B : typeof B
+>B : B
 
     // re-opened module with colliding name
     // this should add an underscore.
@@ -32,19 +32,19 @@ module B {
 }
 
 module X {
->X : typeof X
+>X : X
 
     var X = 13;
 >X : number
 
     export module Y {
->Y : typeof Y
+>Y : X.Y
 
         var Y = 13;
 >Y : number
 
         export module Z {
->Z : typeof Z
+>Z : Y.Z
 
             var X = 12;
 >X : number
@@ -59,8 +59,8 @@ module X {
 }
 
 module Y.Y {
->Y : typeof Y
->Y : typeof Y
+>Y : Y
+>Y : Y.Y
 
     export enum Y {
 >Y : Y
@@ -74,7 +74,7 @@ module Y.Y {
 // no collision, since interface doesn't
 // generate code.
 module D {
->D : typeof D
+>D : D
 
     export interface D {
 >D : D
diff --git a/tests/baselines/reference/nameDelimitedBySlashes.types b/tests/baselines/reference/nameDelimitedBySlashes.types
index 4e994d1cd4d..bbd5e324f27 100644
--- a/tests/baselines/reference/nameDelimitedBySlashes.types
+++ b/tests/baselines/reference/nameDelimitedBySlashes.types
@@ -1,12 +1,12 @@
 === tests/cases/conformance/externalModules/foo_1.ts ===
 import foo = require('./test/foo_0');
->foo : typeof "tests/cases/conformance/externalModules/test/foo_0"
+>foo : foo
 
 var x = foo.foo + 42;
 >x : number
 >foo.foo + 42 : number
 >foo.foo : number
->foo : typeof "tests/cases/conformance/externalModules/test/foo_0"
+>foo : typeof foo
 >foo : number
 
 === tests/cases/conformance/externalModules/test/foo_0.ts ===
diff --git a/tests/baselines/reference/nameWithRelativePaths.types b/tests/baselines/reference/nameWithRelativePaths.types
index 4e438711548..4cd85df81b4 100644
--- a/tests/baselines/reference/nameWithRelativePaths.types
+++ b/tests/baselines/reference/nameWithRelativePaths.types
@@ -1,30 +1,30 @@
 === tests/cases/conformance/externalModules/test/foo_3.ts ===
 import foo0 = require('../foo_0');
->foo0 : typeof "tests/cases/conformance/externalModules/foo_0"
+>foo0 : foo0
 
 import foo1 = require('./test/foo_1');
->foo1 : typeof "tests/cases/conformance/externalModules/test/test/foo_1"
+>foo1 : foo1
 
 import foo2 = require('./.././test/foo_2');
->foo2 : typeof "tests/cases/conformance/externalModules/test/foo_2"
+>foo2 : foo2
 
 if(foo2.M2.x){
 >foo2.M2.x : boolean
->foo2.M2 : typeof M2
->foo2 : typeof "tests/cases/conformance/externalModules/test/foo_2"
->M2 : typeof M2
+>foo2.M2 : typeof foo2.M2
+>foo2 : typeof foo2
+>M2 : typeof foo2.M2
 >x : boolean
 
 	var x = foo0.foo + foo1.f();
 >x : number
 >foo0.foo + foo1.f() : number
 >foo0.foo : number
->foo0 : typeof "tests/cases/conformance/externalModules/foo_0"
+>foo0 : typeof foo0
 >foo : number
 >foo1.f() : number
->foo1.f : typeof f
->foo1 : typeof "tests/cases/conformance/externalModules/test/test/foo_1"
->f : typeof f
+>foo1.f : typeof foo1.f
+>foo1 : typeof foo1
+>f : typeof foo1.f
 }
 
 === tests/cases/conformance/externalModules/foo_0.ts ===
@@ -40,7 +40,7 @@ export function f(){
 
 === tests/cases/conformance/externalModules/test/foo_2.ts ===
 export module M2 {
->M2 : typeof M2
+>M2 : M2
 
 	export var x = true;
 >x : boolean
diff --git a/tests/baselines/reference/namedFunctionExpressionInModule.types b/tests/baselines/reference/namedFunctionExpressionInModule.types
index 9643d9ca069..703fa3272dc 100644
--- a/tests/baselines/reference/namedFunctionExpressionInModule.types
+++ b/tests/baselines/reference/namedFunctionExpressionInModule.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/namedFunctionExpressionInModule.ts ===
 module Variables{
->Variables : typeof Variables
+>Variables : Variables
 
     var x = function bar(a, b, c) {
 >x : (a: any, b: any, c: any) => void
diff --git a/tests/baselines/reference/namespaces1.types b/tests/baselines/reference/namespaces1.types
index 22c2887855a..e4cebfd284e 100644
--- a/tests/baselines/reference/namespaces1.types
+++ b/tests/baselines/reference/namespaces1.types
@@ -13,13 +13,13 @@ module X {
 }
 
 var x: X.Y.Z;
->x : Z
+>x : X.Y.Z
 >X : X
->Y : Y
->Z : Z
+>Y : X.Y
+>Z : X.Y.Z
 
 var x2: X.Y;
->x2 : Y
+>x2 : X.Y
 >X : X
->Y : Y
+>Y : X.Y
 
diff --git a/tests/baselines/reference/namespaces2.types b/tests/baselines/reference/namespaces2.types
index fb3c0375b7b..d42d701377a 100644
--- a/tests/baselines/reference/namespaces2.types
+++ b/tests/baselines/reference/namespaces2.types
@@ -1,9 +1,9 @@
 === tests/cases/compiler/namespaces2.ts ===
 module A {
->A : typeof A
+>A : A
 
     export module B {
->B : typeof B
+>B : B
 
         export class C { }
 >C : C
@@ -11,14 +11,14 @@ module A {
 }
 
 var c: A.B.C = new A.B.C();
->c : C
+>c : A.B.C
 >A : A
->B : B
->C : C
->new A.B.C() : C
->A.B.C : typeof C
->A.B : typeof B
+>B : A.B
+>C : A.B.C
+>new A.B.C() : A.B.C
+>A.B.C : typeof A.B.C
+>A.B : typeof A.B
 >A : typeof A
->B : typeof B
->C : typeof C
+>B : typeof A.B
+>C : typeof A.B.C
 
diff --git a/tests/baselines/reference/negateOperatorWithAnyOtherType.types b/tests/baselines/reference/negateOperatorWithAnyOtherType.types
index a44027aefc3..7b2c7751545 100644
--- a/tests/baselines/reference/negateOperatorWithAnyOtherType.types
+++ b/tests/baselines/reference/negateOperatorWithAnyOtherType.types
@@ -37,7 +37,7 @@ class A {
 >a : any
 
     static foo() {
->foo : typeof foo
+>foo : () => any
 
         var a;
 >a : any
@@ -47,7 +47,7 @@ class A {
     }
 }
 module M {
->M : typeof M
+>M : M
 
     export var n: any;
 >n : any
@@ -143,9 +143,9 @@ var ResultIsNumber14 = -A.foo();
 >ResultIsNumber14 : number
 >-A.foo() : number
 >A.foo() : any
->A.foo : typeof foo
+>A.foo : () => any
 >A : typeof A
->foo : typeof foo
+>foo : () => any
 
 var ResultIsNumber15 = -(ANY - ANY1);
 >ResultIsNumber15 : number
diff --git a/tests/baselines/reference/negateOperatorWithBooleanType.types b/tests/baselines/reference/negateOperatorWithBooleanType.types
index 41d993b64ca..f6c0e8591f5 100644
--- a/tests/baselines/reference/negateOperatorWithBooleanType.types
+++ b/tests/baselines/reference/negateOperatorWithBooleanType.types
@@ -13,10 +13,10 @@ class A {
 >a : boolean
 
     static foo() { return false; }
->foo : typeof foo
+>foo : () => boolean
 }
 module M {
->M : typeof M
+>M : M
 
     export var n: boolean;
 >n : boolean
@@ -70,9 +70,9 @@ var ResultIsNumber7 = -A.foo();
 >ResultIsNumber7 : number
 >-A.foo() : number
 >A.foo() : boolean
->A.foo : typeof foo
+>A.foo : () => boolean
 >A : typeof A
->foo : typeof foo
+>foo : () => boolean
 
 // miss assignment operators
 -true;
diff --git a/tests/baselines/reference/negateOperatorWithNumberType.types b/tests/baselines/reference/negateOperatorWithNumberType.types
index f6c60179f5e..33e8bf67177 100644
--- a/tests/baselines/reference/negateOperatorWithNumberType.types
+++ b/tests/baselines/reference/negateOperatorWithNumberType.types
@@ -17,10 +17,10 @@ class A {
 >a : number
 
     static foo() { return 1; }
->foo : typeof foo
+>foo : () => number
 }
 module M {
->M : typeof M
+>M : M
 
     export var n: number;
 >n : number
@@ -95,9 +95,9 @@ var ResultIsNumber10 = -A.foo();
 >ResultIsNumber10 : number
 >-A.foo() : number
 >A.foo() : number
->A.foo : typeof foo
+>A.foo : () => number
 >A : typeof A
->foo : typeof foo
+>foo : () => number
 
 var ResultIsNumber11 = -(NUMBER - NUMBER);
 >ResultIsNumber11 : number
diff --git a/tests/baselines/reference/negateOperatorWithStringType.types b/tests/baselines/reference/negateOperatorWithStringType.types
index 5baec327f8e..8964c5272a2 100644
--- a/tests/baselines/reference/negateOperatorWithStringType.types
+++ b/tests/baselines/reference/negateOperatorWithStringType.types
@@ -17,10 +17,10 @@ class A {
 >a : string
 
     static foo() { return ""; }
->foo : typeof foo
+>foo : () => string
 }
 module M {
->M : typeof M
+>M : M
 
     export var n: string;
 >n : string
@@ -95,9 +95,9 @@ var ResultIsNumber10 = -A.foo();
 >ResultIsNumber10 : number
 >-A.foo() : number
 >A.foo() : string
->A.foo : typeof foo
+>A.foo : () => string
 >A : typeof A
->foo : typeof foo
+>foo : () => string
 
 var ResultIsNumber11 = -(STRING + STRING);
 >ResultIsNumber11 : number
diff --git a/tests/baselines/reference/nestedModulePrivateAccess.types b/tests/baselines/reference/nestedModulePrivateAccess.types
index 7aae7449dcf..2874e8d1213 100644
--- a/tests/baselines/reference/nestedModulePrivateAccess.types
+++ b/tests/baselines/reference/nestedModulePrivateAccess.types
@@ -1,12 +1,12 @@
 === tests/cases/compiler/nestedModulePrivateAccess.ts ===
 module a{
->a : typeof a
+>a : a
 
        var x:number;
 >x : number
 
        module b{
->b : typeof b
+>b : b
 
                var y = x; // should not be an error
 >y : number
diff --git a/tests/baselines/reference/nestedModules.types b/tests/baselines/reference/nestedModules.types
index 36e9fc686b4..de94fbb2ad9 100644
--- a/tests/baselines/reference/nestedModules.types
+++ b/tests/baselines/reference/nestedModules.types
@@ -1,7 +1,7 @@
 === tests/cases/conformance/internalModules/moduleDeclarations/nestedModules.ts ===
 module A.B.C {
->A : typeof A
->B : typeof B
+>A : A
+>B : B
 >C : C
 
     export interface Point {
@@ -16,15 +16,15 @@ module A.B.C {
 }
 
 module A {
->A : typeof A
+>A : A
 
     export module B {
->B : typeof B
+>B : B
 
         var Point: C.Point = { x: 0, y: 0 }; // bug 832088: could not find module 'C'
->Point : Point
+>Point : C.Point
 >C : C
->Point : Point
+>Point : C.Point
 >{ x: 0, y: 0 } : { x: number; y: number; }
 >x : number
 >y : number
@@ -32,8 +32,8 @@ module A {
 }
 
 module M2.X {
->M2 : typeof M2
->X : typeof X
+>M2 : M2
+>X : X
 
     export interface Point {
 >Point : Point
@@ -45,10 +45,10 @@ module M2.X {
 }
 
 module M2 {
->M2 : typeof M2
+>M2 : M2
 
     export module X {
->X : typeof X
+>X : X
 
         export var Point: number;
 >Point : number
@@ -56,10 +56,10 @@ module M2 {
 }
 
 var m = M2.X;
->m : typeof X
->M2.X : typeof X
+>m : typeof M2.X
+>M2.X : typeof M2.X
 >M2 : typeof M2
->X : typeof X
+>X : typeof M2.X
 
 var point: number;
 >point : number
@@ -67,7 +67,7 @@ var point: number;
 var point = m.Point;
 >point : number
 >m.Point : number
->m : typeof X
+>m : typeof M2.X
 >Point : number
 
 var p: { x: number; y: number; }
@@ -78,6 +78,6 @@ var p: { x: number; y: number; }
 var p: M2.X.Point;
 >p : { x: number; y: number; }
 >M2 : M2
->X : X
->Point : Point
+>X : M2.X
+>Point : M2.X.Point
 
diff --git a/tests/baselines/reference/nestedSelf.types b/tests/baselines/reference/nestedSelf.types
index 56280bffb2f..3970da4c1ee 100644
--- a/tests/baselines/reference/nestedSelf.types
+++ b/tests/baselines/reference/nestedSelf.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/nestedSelf.ts ===
 module M {
->M : typeof M
+>M : M
 
  export class C {
 >C : C
diff --git a/tests/baselines/reference/newArrays.types b/tests/baselines/reference/newArrays.types
index ab2d7165980..df6474e280e 100644
--- a/tests/baselines/reference/newArrays.types
+++ b/tests/baselines/reference/newArrays.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/newArrays.ts ===
 module M {
->M : typeof M
+>M : M
 
 	class Foo {}
 >Foo : Foo
@@ -27,7 +27,7 @@ module M {
 >this : Gar
 >fa : Foo[]
 >new Array<Foo>(this.x * this.y) : Foo[]
->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[]; }
+>Array : { (arrayLength?: number): Array<any>; <T>(arrayLength: number): Array<T>; <T>(...items: Array<T>): Array<T>; new (arrayLength?: number): Array<any>; new <T>(arrayLength: number): Array<T>; new <T>(...items: Array<T>): Array<T>; isArray(arg: any): boolean; prototype: Array<any>; }
 >Foo : Foo
 >this.x * this.y : number
 >this.x : number
diff --git a/tests/baselines/reference/noConstraintInReturnType1.types b/tests/baselines/reference/noConstraintInReturnType1.types
index 45927b22d1e..19a7529ac79 100644
--- a/tests/baselines/reference/noConstraintInReturnType1.types
+++ b/tests/baselines/reference/noConstraintInReturnType1.types
@@ -4,7 +4,7 @@ class List<T extends {}> {
 >T : T
 
     static empty<T extends {}>(): List<T> { return null; }
->empty : typeof empty
+>empty : <T extends {}>() => List<T>
 >T : T
 >List : List<T>
 >T : T
diff --git a/tests/baselines/reference/nonInstantiatedModule.types b/tests/baselines/reference/nonInstantiatedModule.types
index 04ad14a3d37..291c41d731c 100644
--- a/tests/baselines/reference/nonInstantiatedModule.types
+++ b/tests/baselines/reference/nonInstantiatedModule.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/internalModules/moduleDeclarations/nonInstantiatedModule.ts ===
 module M {
->M : typeof M
+>M : M
 
     export interface Point { x: number; y: number }
 >Point : Point
@@ -39,10 +39,10 @@ var a2 = m.a;
 >a : number
 
 module M2 {
->M2 : typeof M2
+>M2 : M2
 
     export module Point {
->Point : typeof Point
+>Point : Point
 
         export function Origin(): Point {
 >Origin : typeof Origin
@@ -74,7 +74,7 @@ var p: { x: number; y: number; };
 var p: M2.Point;
 >p : { x: number; y: number; }
 >M2 : M2
->Point : Point
+>Point : M2.Point
 
 var p2: { Origin() : { x: number; y: number; } };
 >p2 : { Origin(): { x: number; y: number; }; }
@@ -85,13 +85,13 @@ var p2: { Origin() : { x: number; y: number; } };
 var p2: typeof M2.Point;
 >p2 : { Origin(): { x: number; y: number; }; }
 >M2 : typeof M2
->Point : typeof Point
+>Point : typeof M2.Point
 
 module M3 {
->M3 : typeof M3
+>M3 : M3
 
     export module Utils {
->Utils : typeof Utils
+>Utils : Utils
 
         export interface Point {
 >Point : Point
diff --git a/tests/baselines/reference/nullIsSubtypeOfEverythingButUndefined.types b/tests/baselines/reference/nullIsSubtypeOfEverythingButUndefined.types
index e954f677bb7..4c24697d04c 100644
--- a/tests/baselines/reference/nullIsSubtypeOfEverythingButUndefined.types
+++ b/tests/baselines/reference/nullIsSubtypeOfEverythingButUndefined.types
@@ -195,7 +195,7 @@ function f() { }
 >f : typeof f
 
 module f {
->f : typeof f
+>f : f
 
     export var bar = 1;
 >bar : number
@@ -219,7 +219,7 @@ class c { baz: string }
 >baz : string
 
 module c {
->c : typeof c
+>c : c
 
     export var bar = 1;
 >bar : number
diff --git a/tests/baselines/reference/objectLiteralIndexers.types b/tests/baselines/reference/objectLiteralIndexers.types
index 90107784324..1dce9b94ada 100644
--- a/tests/baselines/reference/objectLiteralIndexers.types
+++ b/tests/baselines/reference/objectLiteralIndexers.types
@@ -33,22 +33,22 @@ var o1: { [s: string]: A;[n: number]: B; } = { x: a, 0: b }; // string indexer i
 >B : B
 >{ x: a, 0: b } : { [x: string]: A; [x: number]: B; 0: B; x: A; }
 >x : A
->a : a
->b : b
+>a : A
+>b : B
 
 o1 = { x: b, 0: c }; // both indexers are any
 >o1 = { x: b, 0: c } : { [x: string]: any; [x: number]: any; 0: any; x: B; }
 >o1 : { [x: string]: A; [x: number]: B; }
 >{ x: b, 0: c } : { [x: string]: any; [x: number]: any; 0: any; x: B; }
 >x : B
->b : b
->c : c
+>b : B
+>c : any
 
 o1 = { x: c, 0: b }; // string indexer is any, number indexer is B
 >o1 = { x: c, 0: b } : { [x: string]: any; [x: number]: B; 0: B; x: any; }
 >o1 : { [x: string]: A; [x: number]: B; }
 >{ x: c, 0: b } : { [x: string]: any; [x: number]: B; 0: B; x: any; }
 >x : any
->c : c
->b : b
+>c : any
+>b : B
 
diff --git a/tests/baselines/reference/objectTypeWithStringNamedNumericProperty.types b/tests/baselines/reference/objectTypeWithStringNamedNumericProperty.types
index 7a25f163efe..febc7524e6d 100644
--- a/tests/baselines/reference/objectTypeWithStringNamedNumericProperty.types
+++ b/tests/baselines/reference/objectTypeWithStringNamedNumericProperty.types
@@ -362,7 +362,7 @@ var b = {
 
     "-1.0": /123/,
     "-1": Date
->Date : 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; }
 
 };
 
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.types b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.types
index a0a1ace5645..27f6ffca0c6 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.types
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.types
@@ -17,7 +17,7 @@ class A {
 class B<T extends Array<number>> {
 >B : B<T>
 >T : T
->Array : T[]
+>Array : Array<T>
 
     foo(x: T): string { return null; }
 >foo : (x: T) => string
@@ -62,7 +62,7 @@ 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[]
+>Array : Array<T>
 >x : T
 >T : T
 
@@ -94,13 +94,13 @@ function foo1b(x: B<Array<number>>);
 >foo1b : typeof foo1b
 >x : B<number[]>
 >B : B<T>
->Array : T[]
+>Array : Array<T>
 
 function foo1b(x: B<Array<number>>); // error
 >foo1b : typeof foo1b
 >x : B<number[]>
 >B : B<T>
->Array : T[]
+>Array : Array<T>
 
 function foo1b(x: any) { }
 >foo1b : typeof foo1b
@@ -175,7 +175,7 @@ function foo5(x: B<Array<number>>); // ok
 >foo5 : typeof foo5
 >x : B<number[]>
 >B : B<T>
->Array : T[]
+>Array : Array<T>
 
 function foo5(x: any) { }
 >foo5 : typeof foo5
@@ -229,7 +229,7 @@ function foo8(x: B<Array<number>>);
 >foo8 : typeof foo8
 >x : B<number[]>
 >B : B<T>
->Array : T[]
+>Array : Array<T>
 
 function foo8(x: I<Number>); // ok
 >foo8 : typeof foo8
@@ -245,7 +245,7 @@ function foo9(x: B<Array<number>>);
 >foo9 : typeof foo9
 >x : B<number[]>
 >B : B<T>
->Array : T[]
+>Array : Array<T>
 
 function foo9(x: C<String>); // ok
 >foo9 : typeof foo9
@@ -261,7 +261,7 @@ function foo10(x: B<Array<number>>);
 >foo10 : typeof foo10
 >x : B<number[]>
 >B : B<T>
->Array : T[]
+>Array : Array<T>
 
 function foo10(x: typeof a); // ok
 >foo10 : typeof foo10
@@ -276,7 +276,7 @@ function foo11(x: B<Array<number>>);
 >foo11 : typeof foo11
 >x : B<number[]>
 >B : B<T>
->Array : T[]
+>Array : Array<T>
 
 function foo11(x: typeof b); // ok
 >foo11 : typeof foo11
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.types b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.types
index 5a9db264031..f6b042a576f 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.types
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.types
@@ -6,7 +6,7 @@
 class B<T extends Array<number>> {
 >B : B<T>
 >T : T
->Array : T[]
+>Array : Array<T>
 
     constructor(x: T) { return null; }
 >x : T
@@ -46,7 +46,7 @@ interface I2 {
 var a: { new<T extends Array<string>>(x: T): string }
 >a : new <T extends string[]>(x: T) => string
 >T : T
->Array : T[]
+>Array : Array<T>
 >x : T
 >T : T
 
@@ -64,13 +64,13 @@ function foo1b(x: B<Array<number>>);
 >foo1b : typeof foo1b
 >x : B<number[]>
 >B : B<T>
->Array : T[]
+>Array : Array<T>
 
 function foo1b(x: B<Array<number>>); // error
 >foo1b : typeof foo1b
 >x : B<number[]>
 >B : B<T>
->Array : T[]
+>Array : Array<T>
 
 function foo1b(x: any) { }
 >foo1b : typeof foo1b
@@ -140,7 +140,7 @@ function foo8(x: B<Array<number>>);
 >foo8 : typeof foo8
 >x : B<number[]>
 >B : B<T>
->Array : T[]
+>Array : Array<T>
 
 function foo8(x: I<Number>); // ok
 >foo8 : typeof foo8
@@ -156,7 +156,7 @@ function foo9(x: B<Array<number>>);
 >foo9 : typeof foo9
 >x : B<number[]>
 >B : B<T>
->Array : T[]
+>Array : Array<T>
 
 function foo9(x: C<String>); // error, types are structurally equal
 >foo9 : typeof foo9
@@ -172,7 +172,7 @@ function foo10(x: B<Array<number>>);
 >foo10 : typeof foo10
 >x : B<number[]>
 >B : B<T>
->Array : T[]
+>Array : Array<T>
 
 function foo10(x: typeof a); // ok
 >foo10 : typeof foo10
@@ -187,7 +187,7 @@ function foo11(x: B<Array<number>>);
 >foo11 : typeof foo11
 >x : B<number[]>
 >B : B<T>
->Array : T[]
+>Array : Array<T>
 
 function foo11(x: typeof b); // ok
 >foo11 : typeof foo11
diff --git a/tests/baselines/reference/overloadEquivalenceWithStatics.types b/tests/baselines/reference/overloadEquivalenceWithStatics.types
index f55875576c2..96ad16ae19c 100644
--- a/tests/baselines/reference/overloadEquivalenceWithStatics.types
+++ b/tests/baselines/reference/overloadEquivalenceWithStatics.types
@@ -4,7 +4,7 @@ class A1<T> {
 >T : T
 
 static B<S>(v: A1<S>): A1<S>; // 1 
->B : typeof B
+>B : { <S>(v: A1<S>): A1<S>; <S>(v: S): A1<S>; }
 >S : S
 >v : A1<S>
 >A1 : A1<T>
@@ -13,7 +13,7 @@ static B<S>(v: A1<S>): A1<S>; // 1
 >S : S
 
 static B<S>(v: S): A1<S>; // 2 : Error Duplicate signature
->B : typeof B
+>B : { <S>(v: A1<S>): A1<S>; <S>(v: S): A1<S>; }
 >S : S
 >v : S
 >S : S
@@ -21,7 +21,7 @@ static B<S>(v: S): A1<S>; // 2 : Error Duplicate signature
 >S : S
 
 static B<S>(v: any): A1<S> {
->B : typeof B
+>B : { <S>(v: A1<S>): A1<S>; <S>(v: S): A1<S>; }
 >S : S
 >v : any
 >A1 : A1<T>
diff --git a/tests/baselines/reference/overloadResolutionOverNonCTLambdas.types b/tests/baselines/reference/overloadResolutionOverNonCTLambdas.types
index 1936ac54b53..dfcde811fd5 100644
--- a/tests/baselines/reference/overloadResolutionOverNonCTLambdas.types
+++ b/tests/baselines/reference/overloadResolutionOverNonCTLambdas.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/overloadResolutionOverNonCTLambdas.ts ===
 module Bugs {
->Bugs : typeof Bugs
+>Bugs : Bugs
 
   class A {
 >A : A
diff --git a/tests/baselines/reference/overloadResolutionOverNonCTObjectLit.types b/tests/baselines/reference/overloadResolutionOverNonCTObjectLit.types
index 0a13b0084c1..f2606863c64 100644
--- a/tests/baselines/reference/overloadResolutionOverNonCTObjectLit.types
+++ b/tests/baselines/reference/overloadResolutionOverNonCTObjectLit.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/overloadResolutionOverNonCTObjectLit.ts ===
 module Bugs {
->Bugs : typeof Bugs
+>Bugs : Bugs
 
                 export interface IToken {
 >IToken : IToken
diff --git a/tests/baselines/reference/overloadedStaticMethodSpecialization.types b/tests/baselines/reference/overloadedStaticMethodSpecialization.types
index 9884a008e81..bd60fc16fe0 100644
--- a/tests/baselines/reference/overloadedStaticMethodSpecialization.types
+++ b/tests/baselines/reference/overloadedStaticMethodSpecialization.types
@@ -4,7 +4,7 @@ class A<T> {
 >T : T
 
     static B<S>(v: A<S>): A<S>;
->B : typeof B
+>B : { <S>(v: A<S>): A<S>; <S>(v: S): A<S>; }
 >S : S
 >v : A<S>
 >A : A<T>
@@ -13,7 +13,7 @@ class A<T> {
 >S : S
 
     static B<S>(v: S): A<S>;
->B : typeof B
+>B : { <S>(v: A<S>): A<S>; <S>(v: S): A<S>; }
 >S : S
 >v : S
 >S : S
@@ -21,7 +21,7 @@ class A<T> {
 >S : S
 
     static B<S>(v: any): A<S> {
->B : typeof B
+>B : { <S>(v: A<S>): A<S>; <S>(v: S): A<S>; }
 >S : S
 >v : any
 >A : A<T>
diff --git a/tests/baselines/reference/parserAccessibilityAfterStatic11.types b/tests/baselines/reference/parserAccessibilityAfterStatic11.types
index d1be9d1e3c5..c3b3699bb27 100644
--- a/tests/baselines/reference/parserAccessibilityAfterStatic11.types
+++ b/tests/baselines/reference/parserAccessibilityAfterStatic11.types
@@ -3,6 +3,6 @@ class Outer
 >Outer : Outer
 {
 static public() {}
->public : typeof public
+>public : () => void
 }
 
diff --git a/tests/baselines/reference/parserAccessibilityAfterStatic14.types b/tests/baselines/reference/parserAccessibilityAfterStatic14.types
index 547ad1baadb..6b4cff3e17f 100644
--- a/tests/baselines/reference/parserAccessibilityAfterStatic14.types
+++ b/tests/baselines/reference/parserAccessibilityAfterStatic14.types
@@ -3,7 +3,7 @@ class Outer
 >Outer : Outer
 {
 static public<T>() {}
->public : typeof public
+>public : <T>() => void
 >T : T
 }
 
diff --git a/tests/baselines/reference/parserFunctionDeclaration8.types b/tests/baselines/reference/parserFunctionDeclaration8.types
index 15a8721932d..4e4894c3f3c 100644
--- a/tests/baselines/reference/parserFunctionDeclaration8.types
+++ b/tests/baselines/reference/parserFunctionDeclaration8.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/parser/ecmascript5/FunctionDeclarations/parserFunctionDeclaration8.ts ===
 declare module M {
->M : typeof M
+>M : M
 
    function foo();
 >foo : typeof foo
diff --git a/tests/baselines/reference/parserModuleDeclaration11.types b/tests/baselines/reference/parserModuleDeclaration11.types
index 5a0d48f4e6c..9ee2617aff1 100644
--- a/tests/baselines/reference/parserModuleDeclaration11.types
+++ b/tests/baselines/reference/parserModuleDeclaration11.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration11.ts ===
 declare module string {
->string : typeof string
+>string : string
 
     interface X { }
 >X : X
@@ -11,12 +11,12 @@ declare module string {
 }
 string.foo("abc");
 >string.foo("abc") : any
->string.foo : typeof foo
+>string.foo : typeof string.foo
 >string : typeof string
->foo : typeof foo
+>foo : typeof string.foo
 
 var x: string.X;
->x : X
+>x : string.X
 >string : string
->X : X
+>X : string.X
 
diff --git a/tests/baselines/reference/partiallyAmbientClodule.types b/tests/baselines/reference/partiallyAmbientClodule.types
index c0cd877d05f..62918ddc107 100644
--- a/tests/baselines/reference/partiallyAmbientClodule.types
+++ b/tests/baselines/reference/partiallyAmbientClodule.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/partiallyAmbientClodule.ts ===
 declare module foo {
->foo : typeof foo
+>foo : foo
 
     export function x(): any;
 >x : typeof x
diff --git a/tests/baselines/reference/partiallyAmbientFundule.types b/tests/baselines/reference/partiallyAmbientFundule.types
index 37f59588a7c..12e1ad32d1d 100644
--- a/tests/baselines/reference/partiallyAmbientFundule.types
+++ b/tests/baselines/reference/partiallyAmbientFundule.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/partiallyAmbientFundule.ts ===
 declare module foo {
->foo : typeof foo
+>foo : foo
 
     export function x(): any;
 >x : typeof x
diff --git a/tests/baselines/reference/plusOperatorWithBooleanType.types b/tests/baselines/reference/plusOperatorWithBooleanType.types
index ed4ccfd6c2d..5eccf25953d 100644
--- a/tests/baselines/reference/plusOperatorWithBooleanType.types
+++ b/tests/baselines/reference/plusOperatorWithBooleanType.types
@@ -13,10 +13,10 @@ class A {
 >a : boolean
 
     static foo() { return false; }
->foo : typeof foo
+>foo : () => boolean
 }
 module M {
->M : typeof M
+>M : M
 
     export var n: boolean;
 >n : boolean
@@ -70,9 +70,9 @@ var ResultIsNumber7 = +A.foo();
 >ResultIsNumber7 : number
 >+A.foo() : number
 >A.foo() : boolean
->A.foo : typeof foo
+>A.foo : () => boolean
 >A : typeof A
->foo : typeof foo
+>foo : () => boolean
 
 // miss assignment operators
 +true;
diff --git a/tests/baselines/reference/plusOperatorWithNumberType.types b/tests/baselines/reference/plusOperatorWithNumberType.types
index 973fffc20b7..8f8117f1081 100644
--- a/tests/baselines/reference/plusOperatorWithNumberType.types
+++ b/tests/baselines/reference/plusOperatorWithNumberType.types
@@ -17,10 +17,10 @@ class A {
 >a : number
 
     static foo() { return 1; }
->foo : typeof foo
+>foo : () => number
 }
 module M {
->M : typeof M
+>M : M
 
     export var n: number;
 >n : number
@@ -95,9 +95,9 @@ var ResultIsNumber10 = +A.foo();
 >ResultIsNumber10 : number
 >+A.foo() : number
 >A.foo() : number
->A.foo : typeof foo
+>A.foo : () => number
 >A : typeof A
->foo : typeof foo
+>foo : () => number
 
 var ResultIsNumber11 = +(NUMBER + NUMBER);
 >ResultIsNumber11 : number
diff --git a/tests/baselines/reference/plusOperatorWithStringType.types b/tests/baselines/reference/plusOperatorWithStringType.types
index 2e72d1b7deb..0187e3f298c 100644
--- a/tests/baselines/reference/plusOperatorWithStringType.types
+++ b/tests/baselines/reference/plusOperatorWithStringType.types
@@ -17,10 +17,10 @@ class A {
 >a : string
 
     static foo() { return ""; }
->foo : typeof foo
+>foo : () => string
 }
 module M {
->M : typeof M
+>M : M
 
     export var n: string;
 >n : string
@@ -95,9 +95,9 @@ var ResultIsNumber10 = +A.foo();
 >ResultIsNumber10 : number
 >+A.foo() : number
 >A.foo() : string
->A.foo : typeof foo
+>A.foo : () => string
 >A : typeof A
->foo : typeof foo
+>foo : () => string
 
 var ResultIsNumber11 = +(STRING + STRING);
 >ResultIsNumber11 : number
diff --git a/tests/baselines/reference/prespecializedGenericMembers1.types b/tests/baselines/reference/prespecializedGenericMembers1.types
index 4d12c2767c8..74e9f733a94 100644
--- a/tests/baselines/reference/prespecializedGenericMembers1.types
+++ b/tests/baselines/reference/prespecializedGenericMembers1.types
@@ -37,7 +37,7 @@ var catThing = {
 
     barry: cat
 >barry : Cat<IKitty>
->cat : cat
+>cat : Cat<IKitty>
 
 };
 var catBag = new CatBag(catThing);
diff --git a/tests/baselines/reference/privacyCheckAnonymousFunctionParameter.types b/tests/baselines/reference/privacyCheckAnonymousFunctionParameter.types
index 2ce71bdacfa..a79456c75c9 100644
--- a/tests/baselines/reference/privacyCheckAnonymousFunctionParameter.types
+++ b/tests/baselines/reference/privacyCheckAnonymousFunctionParameter.types
@@ -8,7 +8,7 @@ interface Iterator<T> {
 }
 
 module Query {
->Query : typeof Query
+>Query : Query
 
     export function fromDoWhile<T>(doWhile: (test: Iterator<T>) => boolean): Iterator<T> {
 >fromDoWhile : typeof fromDoWhile
diff --git a/tests/baselines/reference/privacyCheckAnonymousFunctionParameter2.types b/tests/baselines/reference/privacyCheckAnonymousFunctionParameter2.types
index 7854f5f9b77..cb8fbfb308f 100644
--- a/tests/baselines/reference/privacyCheckAnonymousFunctionParameter2.types
+++ b/tests/baselines/reference/privacyCheckAnonymousFunctionParameter2.types
@@ -9,7 +9,7 @@ interface Iterator<T> { x: T }
 >T : T
 
 module Q {
->Q : typeof Q
+>Q : Q
 
     export function foo<T>(x: (a: Iterator<T>) => number) {
 >foo : typeof foo
@@ -25,7 +25,7 @@ module Q {
 }
 
 module Q {
->Q : typeof Q
+>Q : Q
 
     function bar() {
 >bar : typeof bar
diff --git a/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface1.types b/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface1.types
index 125cfc9d597..adc228bc582 100644
--- a/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface1.types
+++ b/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface1.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/privacyCheckExportAssignmentOnExportedGenericInterface1.ts ===
 module Foo {
->Foo : new () => A<Foo<string>>
+>Foo : Foo
 
     export interface A<T> {
 >A : A<T>
@@ -12,9 +12,9 @@ interface Foo<T> {
 >T : T
 }
 var Foo: new () => Foo.A<Foo<string>>;
->Foo : new () => A<Foo<string>>
+>Foo : new () => Foo.A<Foo<string>>
 >Foo : Foo<T>
->A : A<T>
+>A : Foo.A<T>
 >Foo : Foo<T>
 
 export = Foo;
diff --git a/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface2.types b/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface2.types
index 8c89db63515..522885cd979 100644
--- a/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface2.types
+++ b/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface2.types
@@ -20,7 +20,7 @@ function Foo<T>(array: T[]): Foo<T> {
 }
 
 module Foo {
->Foo : typeof Foo
+>Foo : Foo
 
     export var x = "hello";
 >x : string
diff --git a/tests/baselines/reference/privacyCheckExternalModuleExportAssignmentOfGenericClass.types b/tests/baselines/reference/privacyCheckExternalModuleExportAssignmentOfGenericClass.types
index 2259b039c91..7c310ece8bc 100644
--- a/tests/baselines/reference/privacyCheckExternalModuleExportAssignmentOfGenericClass.types
+++ b/tests/baselines/reference/privacyCheckExternalModuleExportAssignmentOfGenericClass.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/privacyCheckExternalModuleExportAssignmentOfGenericClass_1.ts ===
 import Foo = require("privacyCheckExternalModuleExportAssignmentOfGenericClass_0");
->Foo : typeof Foo
+>Foo : Foo
 
 export = Bar;
 >Bar : Bar
diff --git a/tests/baselines/reference/privacyCheckTypeOfInvisibleModuleError.types b/tests/baselines/reference/privacyCheckTypeOfInvisibleModuleError.types
index c028c328245..fa28dc8843c 100644
--- a/tests/baselines/reference/privacyCheckTypeOfInvisibleModuleError.types
+++ b/tests/baselines/reference/privacyCheckTypeOfInvisibleModuleError.types
@@ -1,9 +1,9 @@
 === tests/cases/compiler/privacyCheckTypeOfInvisibleModuleError.ts ===
 module Outer {
->Outer : typeof Outer
+>Outer : Outer
 
     module Inner {
->Inner : typeof Inner
+>Inner : Inner
 
         export var m: typeof Inner;
 >m : typeof Inner
diff --git a/tests/baselines/reference/privacyClass.types b/tests/baselines/reference/privacyClass.types
index d42133ad9ec..449639e298e 100644
--- a/tests/baselines/reference/privacyClass.types
+++ b/tests/baselines/reference/privacyClass.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/privacyClass.ts ===
 export module m1 {
->m1 : typeof m1
+>m1 : m1
 
     export interface m1_i_public {
 >m1_i_public : m1_i_public
@@ -84,7 +84,7 @@ export module m1 {
 
 
 module m2 {
->m2 : typeof m2
+>m2 : m2
 
     export interface m2_i_public {
 >m2_i_public : m2_i_public
diff --git a/tests/baselines/reference/privacyFunc.types b/tests/baselines/reference/privacyFunc.types
index 367a5213a3a..b82d1f5f9fd 100644
--- a/tests/baselines/reference/privacyFunc.types
+++ b/tests/baselines/reference/privacyFunc.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/privacyFunc.ts ===
 module m1 {
->m1 : typeof m1
+>m1 : m1
 
     export class C1_public {
 >C1_public : C1_public
diff --git a/tests/baselines/reference/privacyGloClass.types b/tests/baselines/reference/privacyGloClass.types
index be0c8a74dcc..ef078fca8a8 100644
--- a/tests/baselines/reference/privacyGloClass.types
+++ b/tests/baselines/reference/privacyGloClass.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/privacyGloClass.ts ===
 module m1 {
->m1 : typeof m1
+>m1 : m1
 
     export interface m1_i_public {
 >m1_i_public : m1_i_public
diff --git a/tests/baselines/reference/privacyGloFunc.types b/tests/baselines/reference/privacyGloFunc.types
index 8b8eacd4157..6c112db5df6 100644
--- a/tests/baselines/reference/privacyGloFunc.types
+++ b/tests/baselines/reference/privacyGloFunc.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/privacyGloFunc.ts ===
 export module m1 {
->m1 : typeof m1
+>m1 : m1
 
     export class C1_public {
 >C1_public : C1_public
@@ -362,7 +362,7 @@ export module m1 {
 }
 
 module m2 {
->m2 : typeof m2
+>m2 : m2
 
     export class m2_C1_public {
 >m2_C1_public : m2_C1_public
diff --git a/tests/baselines/reference/privacyGloInterface.types b/tests/baselines/reference/privacyGloInterface.types
index 707976951ce..5a53128e103 100644
--- a/tests/baselines/reference/privacyGloInterface.types
+++ b/tests/baselines/reference/privacyGloInterface.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/privacyGloInterface.ts ===
 module m1 {
->m1 : typeof m1
+>m1 : m1
 
     export class C1_public {
 >C1_public : C1_public
diff --git a/tests/baselines/reference/privacyGloVar.types b/tests/baselines/reference/privacyGloVar.types
index 173d6326da5..1c878edbd6c 100644
--- a/tests/baselines/reference/privacyGloVar.types
+++ b/tests/baselines/reference/privacyGloVar.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/privacyGloVar.ts ===
 module m1 {
->m1 : typeof m1
+>m1 : m1
 
     export class C1_public {
 >C1_public : C1_public
diff --git a/tests/baselines/reference/privacyInterface.types b/tests/baselines/reference/privacyInterface.types
index bd7be86296d..a9ed5107a4d 100644
--- a/tests/baselines/reference/privacyInterface.types
+++ b/tests/baselines/reference/privacyInterface.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/privacyInterface.ts ===
 export module m1 {
->m1 : typeof m1
+>m1 : m1
 
     export class C1_public {
 >C1_public : C1_public
@@ -172,7 +172,7 @@ export module m1 {
 
 
 module m2 {
->m2 : typeof m2
+>m2 : m2
 
     export class C1_public {
 >C1_public : C1_public
diff --git a/tests/baselines/reference/privacyLocalInternalReferenceImportWithExport.types b/tests/baselines/reference/privacyLocalInternalReferenceImportWithExport.types
index 93d6a252627..197393e242e 100644
--- a/tests/baselines/reference/privacyLocalInternalReferenceImportWithExport.types
+++ b/tests/baselines/reference/privacyLocalInternalReferenceImportWithExport.types
@@ -1,7 +1,7 @@
 === tests/cases/compiler/privacyLocalInternalReferenceImportWithExport.ts ===
 // private elements
 module m_private {
->m_private : typeof m_private
+>m_private : m_private
 
     export class c_private {
 >c_private : c_private
@@ -31,7 +31,7 @@ module m_private {
 >i_private : i_private
     }
     export module mi_private {
->mi_private : typeof mi_private
+>mi_private : mi_private
 
         export class c {
 >c : c
@@ -48,7 +48,7 @@ module m_private {
 
 // Public elements
 export module m_public {
->m_public : typeof m_public
+>m_public : m_public
 
     export class c_public {
 >c_public : c_public
@@ -76,7 +76,7 @@ export module m_public {
 >i_public : i_public
     }
     export module mi_public {
->mi_public : typeof mi_public
+>mi_public : mi_public
 
         export class c {
 >c : c
@@ -92,186 +92,186 @@ export module m_public {
 }
 
 export module import_public {
->import_public : typeof import_public
+>import_public : import_public
 
     // Privacy errors - importing private elements
     export import im_public_c_private = m_private.c_private;
->im_public_c_private : typeof c_private
+>im_public_c_private : im_public_c_private
 >m_private : typeof m_private
->c_private : c_private
+>c_private : im_public_c_private
 
     export import im_public_e_private = m_private.e_private;
->im_public_e_private : typeof e_private
+>im_public_e_private : im_public_e_private
 >m_private : typeof m_private
->e_private : e_private
+>e_private : im_public_e_private
 
     export import im_public_f_private = m_private.f_private;
->im_public_f_private : typeof f_private
+>im_public_f_private : im_public_f_private
 >m_private : typeof m_private
->f_private : typeof f_private
+>f_private : typeof im_public_f_private
 
     export import im_public_v_private = m_private.v_private;
->im_public_v_private : c_private
+>im_public_v_private : im_public_v_private
 >m_private : typeof m_private
->v_private : c_private
+>v_private : im_public_c_private
 
     export import im_public_i_private = m_private.i_private;
 >im_public_i_private : im_public_i_private
 >m_private : typeof m_private
->i_private : i_private
+>i_private : im_public_i_private
 
     export import im_public_mi_private = m_private.mi_private;
->im_public_mi_private : typeof mi_private
+>im_public_mi_private : im_public_mi_private
 >m_private : typeof m_private
->mi_private : typeof mi_private
+>mi_private : typeof im_public_mi_private
 
     export import im_public_mu_private = m_private.mu_private;
 >im_public_mu_private : im_public_mu_private
 >m_private : typeof m_private
->mu_private : mu_private
+>mu_private : im_public_mu_private
 
     // Usage of privacy error imports
     var privateUse_im_public_c_private = new im_public_c_private();
->privateUse_im_public_c_private : c_private
->new im_public_c_private() : c_private
->im_public_c_private : typeof c_private
+>privateUse_im_public_c_private : im_public_c_private
+>new im_public_c_private() : im_public_c_private
+>im_public_c_private : typeof im_public_c_private
 
     export var publicUse_im_public_c_private = new im_public_c_private();
->publicUse_im_public_c_private : c_private
->new im_public_c_private() : c_private
->im_public_c_private : typeof c_private
+>publicUse_im_public_c_private : im_public_c_private
+>new im_public_c_private() : im_public_c_private
+>im_public_c_private : typeof im_public_c_private
 
     var privateUse_im_public_e_private = im_public_e_private.Happy;
->privateUse_im_public_e_private : e_private
->im_public_e_private.Happy : e_private
->im_public_e_private : typeof e_private
->Happy : e_private
+>privateUse_im_public_e_private : im_public_e_private
+>im_public_e_private.Happy : im_public_e_private
+>im_public_e_private : typeof im_public_e_private
+>Happy : im_public_e_private
 
     export var publicUse_im_public_e_private = im_public_e_private.Grumpy;
->publicUse_im_public_e_private : e_private
->im_public_e_private.Grumpy : e_private
->im_public_e_private : typeof e_private
->Grumpy : e_private
+>publicUse_im_public_e_private : im_public_e_private
+>im_public_e_private.Grumpy : im_public_e_private
+>im_public_e_private : typeof im_public_e_private
+>Grumpy : im_public_e_private
 
     var privateUse_im_public_f_private = im_public_f_private();
->privateUse_im_public_f_private : c_private
->im_public_f_private() : c_private
->im_public_f_private : typeof f_private
+>privateUse_im_public_f_private : im_public_c_private
+>im_public_f_private() : im_public_c_private
+>im_public_f_private : typeof im_public_f_private
 
     export var publicUse_im_public_f_private = im_public_f_private();
->publicUse_im_public_f_private : c_private
->im_public_f_private() : c_private
->im_public_f_private : typeof f_private
+>publicUse_im_public_f_private : im_public_c_private
+>im_public_f_private() : im_public_c_private
+>im_public_f_private : typeof im_public_f_private
 
     var privateUse_im_public_v_private = im_public_v_private;
->privateUse_im_public_v_private : c_private
->im_public_v_private : c_private
+>privateUse_im_public_v_private : im_public_c_private
+>im_public_v_private : im_public_c_private
 
     export var publicUse_im_public_v_private = im_public_v_private;
->publicUse_im_public_v_private : c_private
->im_public_v_private : c_private
+>publicUse_im_public_v_private : im_public_c_private
+>im_public_v_private : im_public_c_private
 
     var privateUse_im_public_i_private: im_public_i_private;
->privateUse_im_public_i_private : i_private
->im_public_i_private : 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 : i_private
->im_public_i_private : 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 : c
->new im_public_mi_private.c() : c
->im_public_mi_private.c : typeof c
->im_public_mi_private : typeof mi_private
->c : typeof c
+>privateUse_im_public_mi_private : im_public_mi_private.c
+>new im_public_mi_private.c() : im_public_mi_private.c
+>im_public_mi_private.c : typeof im_public_mi_private.c
+>im_public_mi_private : typeof im_public_mi_private
+>c : typeof im_public_mi_private.c
 
     export var publicUse_im_public_mi_private = new im_public_mi_private.c();
->publicUse_im_public_mi_private : c
->new im_public_mi_private.c() : c
->im_public_mi_private.c : typeof c
->im_public_mi_private : typeof mi_private
->c : typeof c
+>publicUse_im_public_mi_private : im_public_mi_private.c
+>new im_public_mi_private.c() : im_public_mi_private.c
+>im_public_mi_private.c : typeof im_public_mi_private.c
+>im_public_mi_private : typeof im_public_mi_private
+>c : typeof im_public_mi_private.c
 
     var privateUse_im_public_mu_private: im_public_mu_private.i;
->privateUse_im_public_mu_private : i
+>privateUse_im_public_mu_private : im_public_mu_private.i
 >im_public_mu_private : im_public_mu_private
->i : i
+>i : im_public_mu_private.i
 
     export var publicUse_im_public_mu_private: im_public_mu_private.i;
->publicUse_im_public_mu_private : i
+>publicUse_im_public_mu_private : im_public_mu_private.i
 >im_public_mu_private : im_public_mu_private
->i : i
+>i : im_public_mu_private.i
 
 
     // No Privacy errors - importing public elements
     export import im_public_c_public = m_public.c_public;
->im_public_c_public : typeof c_public
+>im_public_c_public : im_public_c_public
 >m_public : typeof m_public
->c_public : c_public
+>c_public : im_public_c_public
 
     export import im_public_e_public = m_public.e_public;
->im_public_e_public : typeof e_public
+>im_public_e_public : im_public_e_public
 >m_public : typeof m_public
->e_public : e_public
+>e_public : im_public_e_public
 
     export import im_public_f_public = m_public.f_public;
->im_public_f_public : typeof f_public
+>im_public_f_public : im_public_f_public
 >m_public : typeof m_public
->f_public : typeof f_public
+>f_public : typeof im_public_f_public
 
     export import im_public_v_public = m_public.v_public;
->im_public_v_public : number
+>im_public_v_public : im_public_v_public
 >m_public : typeof m_public
 >v_public : number
 
     export import im_public_i_public = m_public.i_public;
 >im_public_i_public : im_public_i_public
 >m_public : typeof m_public
->i_public : i_public
+>i_public : im_public_i_public
 
     export import im_public_mi_public = m_public.mi_public;
->im_public_mi_public : typeof mi_public
+>im_public_mi_public : im_public_mi_public
 >m_public : typeof m_public
->mi_public : typeof mi_public
+>mi_public : typeof im_public_mi_public
 
     export import im_public_mu_public = m_public.mu_public;
 >im_public_mu_public : im_public_mu_public
 >m_public : typeof m_public
->mu_public : mu_public
+>mu_public : im_public_mu_public
 
     // Usage of above
     var privateUse_im_public_c_public = new im_public_c_public();
->privateUse_im_public_c_public : c_public
->new im_public_c_public() : c_public
->im_public_c_public : typeof c_public
+>privateUse_im_public_c_public : im_public_c_public
+>new im_public_c_public() : im_public_c_public
+>im_public_c_public : typeof im_public_c_public
 
     export var publicUse_im_public_c_public = new im_public_c_public();
->publicUse_im_public_c_public : c_public
->new im_public_c_public() : c_public
->im_public_c_public : typeof c_public
+>publicUse_im_public_c_public : im_public_c_public
+>new im_public_c_public() : im_public_c_public
+>im_public_c_public : typeof im_public_c_public
 
     var privateUse_im_public_e_public = im_public_e_public.Happy;
->privateUse_im_public_e_public : e_public
->im_public_e_public.Happy : e_public
->im_public_e_public : typeof e_public
->Happy : e_public
+>privateUse_im_public_e_public : im_public_e_public
+>im_public_e_public.Happy : im_public_e_public
+>im_public_e_public : typeof im_public_e_public
+>Happy : im_public_e_public
 
     export var publicUse_im_public_e_public = im_public_e_public.Grumpy;
->publicUse_im_public_e_public : e_public
->im_public_e_public.Grumpy : e_public
->im_public_e_public : typeof e_public
->Grumpy : e_public
+>publicUse_im_public_e_public : im_public_e_public
+>im_public_e_public.Grumpy : im_public_e_public
+>im_public_e_public : typeof im_public_e_public
+>Grumpy : im_public_e_public
 
     var privateUse_im_public_f_public = im_public_f_public();
->privateUse_im_public_f_public : c_public
->im_public_f_public() : c_public
->im_public_f_public : typeof f_public
+>privateUse_im_public_f_public : im_public_c_public
+>im_public_f_public() : im_public_c_public
+>im_public_f_public : typeof im_public_f_public
 
     export var publicUse_im_public_f_public = im_public_f_public();
->publicUse_im_public_f_public : c_public
->im_public_f_public() : c_public
->im_public_f_public : typeof f_public
+>publicUse_im_public_f_public : im_public_c_public
+>im_public_f_public() : im_public_c_public
+>im_public_f_public : typeof im_public_f_public
 
     var privateUse_im_public_v_public = im_public_v_public;
 >privateUse_im_public_v_public : number
@@ -282,218 +282,218 @@ export module import_public {
 >im_public_v_public : number
 
     var privateUse_im_public_i_public: im_public_i_public;
->privateUse_im_public_i_public : i_public
->im_public_i_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 : i_public
->im_public_i_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 : c
->new im_public_mi_public.c() : c
->im_public_mi_public.c : typeof c
->im_public_mi_public : typeof mi_public
->c : typeof c
+>privateUse_im_public_mi_public : im_public_mi_public.c
+>new im_public_mi_public.c() : im_public_mi_public.c
+>im_public_mi_public.c : typeof im_public_mi_public.c
+>im_public_mi_public : typeof im_public_mi_public
+>c : typeof im_public_mi_public.c
 
     export var publicUse_im_public_mi_public = new im_public_mi_public.c();
->publicUse_im_public_mi_public : c
->new im_public_mi_public.c() : c
->im_public_mi_public.c : typeof c
->im_public_mi_public : typeof mi_public
->c : typeof c
+>publicUse_im_public_mi_public : im_public_mi_public.c
+>new im_public_mi_public.c() : im_public_mi_public.c
+>im_public_mi_public.c : typeof im_public_mi_public.c
+>im_public_mi_public : typeof im_public_mi_public
+>c : typeof im_public_mi_public.c
 
     var privateUse_im_public_mu_public: im_public_mu_public.i;
->privateUse_im_public_mu_public : i
+>privateUse_im_public_mu_public : im_public_mu_public.i
 >im_public_mu_public : im_public_mu_public
->i : i
+>i : im_public_mu_public.i
 
     export var publicUse_im_public_mu_public: im_public_mu_public.i;
->publicUse_im_public_mu_public : i
+>publicUse_im_public_mu_public : im_public_mu_public.i
 >im_public_mu_public : im_public_mu_public
->i : i
+>i : im_public_mu_public.i
 }
 
 module import_private {
->import_private : typeof import_private
+>import_private : import_private
 
     // No Privacy errors - importing private elements
     export import im_private_c_private = m_private.c_private;
->im_private_c_private : typeof c_private
+>im_private_c_private : im_private_c_private
 >m_private : typeof m_private
->c_private : c_private
+>c_private : im_private_c_private
 
     export import im_private_e_private = m_private.e_private;
->im_private_e_private : typeof e_private
+>im_private_e_private : im_private_e_private
 >m_private : typeof m_private
->e_private : e_private
+>e_private : im_private_e_private
 
     export import im_private_f_private = m_private.f_private;
->im_private_f_private : typeof f_private
+>im_private_f_private : im_private_f_private
 >m_private : typeof m_private
->f_private : typeof f_private
+>f_private : typeof im_private_f_private
 
     export import im_private_v_private = m_private.v_private;
->im_private_v_private : c_private
+>im_private_v_private : im_private_v_private
 >m_private : typeof m_private
->v_private : c_private
+>v_private : im_private_c_private
 
     export import im_private_i_private = m_private.i_private;
 >im_private_i_private : im_private_i_private
 >m_private : typeof m_private
->i_private : i_private
+>i_private : im_private_i_private
 
     export import im_private_mi_private = m_private.mi_private;
->im_private_mi_private : typeof mi_private
+>im_private_mi_private : im_private_mi_private
 >m_private : typeof m_private
->mi_private : typeof mi_private
+>mi_private : typeof im_private_mi_private
 
     export import im_private_mu_private = m_private.mu_private;
 >im_private_mu_private : im_private_mu_private
 >m_private : typeof m_private
->mu_private : mu_private
+>mu_private : im_private_mu_private
 
     // Usage of above decls
     var privateUse_im_private_c_private = new im_private_c_private();
->privateUse_im_private_c_private : c_private
->new im_private_c_private() : c_private
->im_private_c_private : typeof c_private
+>privateUse_im_private_c_private : im_private_c_private
+>new im_private_c_private() : im_private_c_private
+>im_private_c_private : typeof im_private_c_private
 
     export var publicUse_im_private_c_private = new im_private_c_private();
->publicUse_im_private_c_private : c_private
->new im_private_c_private() : c_private
->im_private_c_private : typeof c_private
+>publicUse_im_private_c_private : im_private_c_private
+>new im_private_c_private() : im_private_c_private
+>im_private_c_private : typeof im_private_c_private
 
     var privateUse_im_private_e_private = im_private_e_private.Happy;
->privateUse_im_private_e_private : e_private
->im_private_e_private.Happy : e_private
->im_private_e_private : typeof e_private
->Happy : e_private
+>privateUse_im_private_e_private : im_private_e_private
+>im_private_e_private.Happy : im_private_e_private
+>im_private_e_private : typeof im_private_e_private
+>Happy : im_private_e_private
 
     export var publicUse_im_private_e_private = im_private_e_private.Grumpy;
->publicUse_im_private_e_private : e_private
->im_private_e_private.Grumpy : e_private
->im_private_e_private : typeof e_private
->Grumpy : e_private
+>publicUse_im_private_e_private : im_private_e_private
+>im_private_e_private.Grumpy : im_private_e_private
+>im_private_e_private : typeof im_private_e_private
+>Grumpy : im_private_e_private
 
     var privateUse_im_private_f_private = im_private_f_private();
->privateUse_im_private_f_private : c_private
->im_private_f_private() : c_private
->im_private_f_private : typeof f_private
+>privateUse_im_private_f_private : im_private_c_private
+>im_private_f_private() : im_private_c_private
+>im_private_f_private : typeof im_private_f_private
 
     export var publicUse_im_private_f_private = im_private_f_private();
->publicUse_im_private_f_private : c_private
->im_private_f_private() : c_private
->im_private_f_private : typeof f_private
+>publicUse_im_private_f_private : im_private_c_private
+>im_private_f_private() : im_private_c_private
+>im_private_f_private : typeof im_private_f_private
 
     var privateUse_im_private_v_private = im_private_v_private;
->privateUse_im_private_v_private : c_private
->im_private_v_private : c_private
+>privateUse_im_private_v_private : im_private_c_private
+>im_private_v_private : im_private_c_private
 
     export var publicUse_im_private_v_private = im_private_v_private;
->publicUse_im_private_v_private : c_private
->im_private_v_private : c_private
+>publicUse_im_private_v_private : im_private_c_private
+>im_private_v_private : im_private_c_private
 
     var privateUse_im_private_i_private: im_private_i_private;
->privateUse_im_private_i_private : i_private
->im_private_i_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 : i_private
->im_private_i_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 : c
->new im_private_mi_private.c() : c
->im_private_mi_private.c : typeof c
->im_private_mi_private : typeof mi_private
->c : typeof c
+>privateUse_im_private_mi_private : im_private_mi_private.c
+>new im_private_mi_private.c() : im_private_mi_private.c
+>im_private_mi_private.c : typeof im_private_mi_private.c
+>im_private_mi_private : typeof im_private_mi_private
+>c : typeof im_private_mi_private.c
 
     export var publicUse_im_private_mi_private = new im_private_mi_private.c();
->publicUse_im_private_mi_private : c
->new im_private_mi_private.c() : c
->im_private_mi_private.c : typeof c
->im_private_mi_private : typeof mi_private
->c : typeof c
+>publicUse_im_private_mi_private : im_private_mi_private.c
+>new im_private_mi_private.c() : im_private_mi_private.c
+>im_private_mi_private.c : typeof im_private_mi_private.c
+>im_private_mi_private : typeof im_private_mi_private
+>c : typeof im_private_mi_private.c
 
     var privateUse_im_private_mu_private: im_private_mu_private.i;
->privateUse_im_private_mu_private : i
+>privateUse_im_private_mu_private : im_private_mu_private.i
 >im_private_mu_private : im_private_mu_private
->i : i
+>i : im_private_mu_private.i
 
     export var publicUse_im_private_mu_private: im_private_mu_private.i;
->publicUse_im_private_mu_private : i
+>publicUse_im_private_mu_private : im_private_mu_private.i
 >im_private_mu_private : im_private_mu_private
->i : i
+>i : im_private_mu_private.i
 
     // No privacy Error - importing public elements
     export import im_private_c_public = m_public.c_public;
->im_private_c_public : typeof c_public
+>im_private_c_public : im_private_c_public
 >m_public : typeof m_public
->c_public : c_public
+>c_public : im_private_c_public
 
     export import im_private_e_public = m_public.e_public;
->im_private_e_public : typeof e_public
+>im_private_e_public : im_private_e_public
 >m_public : typeof m_public
->e_public : e_public
+>e_public : im_private_e_public
 
     export import im_private_f_public = m_public.f_public;
->im_private_f_public : typeof f_public
+>im_private_f_public : im_private_f_public
 >m_public : typeof m_public
->f_public : typeof f_public
+>f_public : typeof im_private_f_public
 
     export import im_private_v_public = m_public.v_public;
->im_private_v_public : number
+>im_private_v_public : im_private_v_public
 >m_public : typeof m_public
 >v_public : number
 
     export import im_private_i_public = m_public.i_public;
 >im_private_i_public : im_private_i_public
 >m_public : typeof m_public
->i_public : i_public
+>i_public : im_private_i_public
 
     export import im_private_mi_public = m_public.mi_public;
->im_private_mi_public : typeof mi_public
+>im_private_mi_public : im_private_mi_public
 >m_public : typeof m_public
->mi_public : typeof mi_public
+>mi_public : typeof im_private_mi_public
 
     export import im_private_mu_public = m_public.mu_public;
 >im_private_mu_public : im_private_mu_public
 >m_public : typeof m_public
->mu_public : mu_public
+>mu_public : im_private_mu_public
 
     // Usage of no privacy error imports
     var privateUse_im_private_c_public = new im_private_c_public();
->privateUse_im_private_c_public : c_public
->new im_private_c_public() : c_public
->im_private_c_public : typeof c_public
+>privateUse_im_private_c_public : im_private_c_public
+>new im_private_c_public() : im_private_c_public
+>im_private_c_public : typeof im_private_c_public
 
     export var publicUse_im_private_c_public = new im_private_c_public();
->publicUse_im_private_c_public : c_public
->new im_private_c_public() : c_public
->im_private_c_public : typeof c_public
+>publicUse_im_private_c_public : im_private_c_public
+>new im_private_c_public() : im_private_c_public
+>im_private_c_public : typeof im_private_c_public
 
     var privateUse_im_private_e_public = im_private_e_public.Happy;
->privateUse_im_private_e_public : e_public
->im_private_e_public.Happy : e_public
->im_private_e_public : typeof e_public
->Happy : e_public
+>privateUse_im_private_e_public : im_private_e_public
+>im_private_e_public.Happy : im_private_e_public
+>im_private_e_public : typeof im_private_e_public
+>Happy : im_private_e_public
 
     export var publicUse_im_private_e_public = im_private_e_public.Grumpy;
->publicUse_im_private_e_public : e_public
->im_private_e_public.Grumpy : e_public
->im_private_e_public : typeof e_public
->Grumpy : e_public
+>publicUse_im_private_e_public : im_private_e_public
+>im_private_e_public.Grumpy : im_private_e_public
+>im_private_e_public : typeof im_private_e_public
+>Grumpy : im_private_e_public
 
     var privateUse_im_private_f_public = im_private_f_public();
->privateUse_im_private_f_public : c_public
->im_private_f_public() : c_public
->im_private_f_public : typeof f_public
+>privateUse_im_private_f_public : im_private_c_public
+>im_private_f_public() : im_private_c_public
+>im_private_f_public : typeof im_private_f_public
 
     export var publicUse_im_private_f_public = im_private_f_public();
->publicUse_im_private_f_public : c_public
->im_private_f_public() : c_public
->im_private_f_public : typeof f_public
+>publicUse_im_private_f_public : im_private_c_public
+>im_private_f_public() : im_private_c_public
+>im_private_f_public : typeof im_private_f_public
 
     var privateUse_im_private_v_public = im_private_v_public;
 >privateUse_im_private_v_public : number
@@ -504,34 +504,34 @@ module import_private {
 >im_private_v_public : number
 
     var privateUse_im_private_i_public: im_private_i_public;
->privateUse_im_private_i_public : i_public
->im_private_i_public : 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 : i_public
->im_private_i_public : 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 : c
->new im_private_mi_public.c() : c
->im_private_mi_public.c : typeof c
->im_private_mi_public : typeof mi_public
->c : typeof c
+>privateUse_im_private_mi_public : im_private_mi_public.c
+>new im_private_mi_public.c() : im_private_mi_public.c
+>im_private_mi_public.c : typeof im_private_mi_public.c
+>im_private_mi_public : typeof im_private_mi_public
+>c : typeof im_private_mi_public.c
 
     export var publicUse_im_private_mi_public = new im_private_mi_public.c();
->publicUse_im_private_mi_public : c
->new im_private_mi_public.c() : c
->im_private_mi_public.c : typeof c
->im_private_mi_public : typeof mi_public
->c : typeof c
+>publicUse_im_private_mi_public : im_private_mi_public.c
+>new im_private_mi_public.c() : im_private_mi_public.c
+>im_private_mi_public.c : typeof im_private_mi_public.c
+>im_private_mi_public : typeof im_private_mi_public
+>c : typeof im_private_mi_public.c
 
     var privateUse_im_private_mu_public: im_private_mu_public.i;
->privateUse_im_private_mu_public : i
+>privateUse_im_private_mu_public : im_private_mu_public.i
 >im_private_mu_public : im_private_mu_public
->i : i
+>i : im_private_mu_public.i
 
     export var publicUse_im_private_mu_public: im_private_mu_public.i;
->publicUse_im_private_mu_public : i
+>publicUse_im_private_mu_public : im_private_mu_public.i
 >im_private_mu_public : im_private_mu_public
->i : i
+>i : im_private_mu_public.i
 }
diff --git a/tests/baselines/reference/privacyLocalInternalReferenceImportWithoutExport.types b/tests/baselines/reference/privacyLocalInternalReferenceImportWithoutExport.types
index 27effbd5ccb..521953312e2 100644
--- a/tests/baselines/reference/privacyLocalInternalReferenceImportWithoutExport.types
+++ b/tests/baselines/reference/privacyLocalInternalReferenceImportWithoutExport.types
@@ -1,7 +1,7 @@
 === tests/cases/compiler/privacyLocalInternalReferenceImportWithoutExport.ts ===
 // private elements
 module m_private {
->m_private : typeof m_private
+>m_private : m_private
 
     export class c_private {
 >c_private : c_private
@@ -31,7 +31,7 @@ module m_private {
 >i_private : i_private
     }
     export module mi_private {
->mi_private : typeof mi_private
+>mi_private : mi_private
 
         export class c {
 >c : c
@@ -48,7 +48,7 @@ module m_private {
 
 // Public elements
 export module m_public {
->m_public : typeof m_public
+>m_public : m_public
 
     export class c_public {
 >c_public : c_public
@@ -76,7 +76,7 @@ export module m_public {
 >i_public : i_public
     }
     export module mi_public {
->mi_public : typeof mi_public
+>mi_public : mi_public
 
         export class c {
 >c : c
@@ -92,186 +92,186 @@ export module m_public {
 }
 
 export module import_public {
->import_public : typeof import_public
+>import_public : import_public
 
     // No Privacy errors - importing private elements
     import im_private_c_private = m_private.c_private;
->im_private_c_private : typeof c_private
+>im_private_c_private : im_private_c_private
 >m_private : typeof m_private
->c_private : c_private
+>c_private : im_private_c_private
 
     import im_private_e_private = m_private.e_private;
->im_private_e_private : typeof e_private
+>im_private_e_private : im_private_e_private
 >m_private : typeof m_private
->e_private : e_private
+>e_private : im_private_e_private
 
     import im_private_f_private = m_private.f_private;
->im_private_f_private : typeof f_private
+>im_private_f_private : im_private_f_private
 >m_private : typeof m_private
->f_private : typeof f_private
+>f_private : typeof im_private_f_private
 
     import im_private_v_private = m_private.v_private;
->im_private_v_private : c_private
+>im_private_v_private : im_private_v_private
 >m_private : typeof m_private
->v_private : c_private
+>v_private : im_private_c_private
 
     import im_private_i_private = m_private.i_private;
 >im_private_i_private : im_private_i_private
 >m_private : typeof m_private
->i_private : i_private
+>i_private : im_private_i_private
 
     import im_private_mi_private = m_private.mi_private;
->im_private_mi_private : typeof mi_private
+>im_private_mi_private : im_private_mi_private
 >m_private : typeof m_private
->mi_private : typeof mi_private
+>mi_private : typeof im_private_mi_private
 
     import im_private_mu_private = m_private.mu_private;
 >im_private_mu_private : im_private_mu_private
 >m_private : typeof m_private
->mu_private : mu_private
+>mu_private : im_private_mu_private
 
     // Usage of above decls
     var privateUse_im_private_c_private = new im_private_c_private();
->privateUse_im_private_c_private : c_private
->new im_private_c_private() : c_private
->im_private_c_private : typeof c_private
+>privateUse_im_private_c_private : im_private_c_private
+>new im_private_c_private() : im_private_c_private
+>im_private_c_private : typeof im_private_c_private
 
     export var publicUse_im_private_c_private = new im_private_c_private();
->publicUse_im_private_c_private : c_private
->new im_private_c_private() : c_private
->im_private_c_private : typeof c_private
+>publicUse_im_private_c_private : im_private_c_private
+>new im_private_c_private() : im_private_c_private
+>im_private_c_private : typeof im_private_c_private
 
     var privateUse_im_private_e_private = im_private_e_private.Happy;
->privateUse_im_private_e_private : e_private
->im_private_e_private.Happy : e_private
->im_private_e_private : typeof e_private
->Happy : e_private
+>privateUse_im_private_e_private : im_private_e_private
+>im_private_e_private.Happy : im_private_e_private
+>im_private_e_private : typeof im_private_e_private
+>Happy : im_private_e_private
 
     export var publicUse_im_private_e_private = im_private_e_private.Grumpy;
->publicUse_im_private_e_private : e_private
->im_private_e_private.Grumpy : e_private
->im_private_e_private : typeof e_private
->Grumpy : e_private
+>publicUse_im_private_e_private : im_private_e_private
+>im_private_e_private.Grumpy : im_private_e_private
+>im_private_e_private : typeof im_private_e_private
+>Grumpy : im_private_e_private
 
     var privateUse_im_private_f_private = im_private_f_private();
->privateUse_im_private_f_private : c_private
->im_private_f_private() : c_private
->im_private_f_private : typeof f_private
+>privateUse_im_private_f_private : im_private_c_private
+>im_private_f_private() : im_private_c_private
+>im_private_f_private : typeof im_private_f_private
 
     export var publicUse_im_private_f_private = im_private_f_private();
->publicUse_im_private_f_private : c_private
->im_private_f_private() : c_private
->im_private_f_private : typeof f_private
+>publicUse_im_private_f_private : im_private_c_private
+>im_private_f_private() : im_private_c_private
+>im_private_f_private : typeof im_private_f_private
 
     var privateUse_im_private_v_private = im_private_v_private;
->privateUse_im_private_v_private : c_private
->im_private_v_private : c_private
+>privateUse_im_private_v_private : im_private_c_private
+>im_private_v_private : im_private_c_private
 
     export var publicUse_im_private_v_private = im_private_v_private;
->publicUse_im_private_v_private : c_private
->im_private_v_private : c_private
+>publicUse_im_private_v_private : im_private_c_private
+>im_private_v_private : im_private_c_private
 
     var privateUse_im_private_i_private: im_private_i_private;
->privateUse_im_private_i_private : i_private
->im_private_i_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 : i_private
->im_private_i_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 : c
->new im_private_mi_private.c() : c
->im_private_mi_private.c : typeof c
->im_private_mi_private : typeof mi_private
->c : typeof c
+>privateUse_im_private_mi_private : im_private_mi_private.c
+>new im_private_mi_private.c() : im_private_mi_private.c
+>im_private_mi_private.c : typeof im_private_mi_private.c
+>im_private_mi_private : typeof im_private_mi_private
+>c : typeof im_private_mi_private.c
 
     export var publicUse_im_private_mi_private = new im_private_mi_private.c();
->publicUse_im_private_mi_private : c
->new im_private_mi_private.c() : c
->im_private_mi_private.c : typeof c
->im_private_mi_private : typeof mi_private
->c : typeof c
+>publicUse_im_private_mi_private : im_private_mi_private.c
+>new im_private_mi_private.c() : im_private_mi_private.c
+>im_private_mi_private.c : typeof im_private_mi_private.c
+>im_private_mi_private : typeof im_private_mi_private
+>c : typeof im_private_mi_private.c
 
     var privateUse_im_private_mu_private: im_private_mu_private.i;
->privateUse_im_private_mu_private : i
+>privateUse_im_private_mu_private : im_private_mu_private.i
 >im_private_mu_private : im_private_mu_private
->i : i
+>i : im_private_mu_private.i
 
     export var publicUse_im_private_mu_private: im_private_mu_private.i;
->publicUse_im_private_mu_private : i
+>publicUse_im_private_mu_private : im_private_mu_private.i
 >im_private_mu_private : im_private_mu_private
->i : i
+>i : im_private_mu_private.i
 
 
     // No Privacy errors - importing public elements
     import im_private_c_public = m_public.c_public;
->im_private_c_public : typeof c_public
+>im_private_c_public : im_private_c_public
 >m_public : typeof m_public
->c_public : c_public
+>c_public : im_private_c_public
 
     import im_private_e_public = m_public.e_public;
->im_private_e_public : typeof e_public
+>im_private_e_public : im_private_e_public
 >m_public : typeof m_public
->e_public : e_public
+>e_public : im_private_e_public
 
     import im_private_f_public = m_public.f_public;
->im_private_f_public : typeof f_public
+>im_private_f_public : im_private_f_public
 >m_public : typeof m_public
->f_public : typeof f_public
+>f_public : typeof im_private_f_public
 
     import im_private_v_public = m_public.v_public;
->im_private_v_public : number
+>im_private_v_public : im_private_v_public
 >m_public : typeof m_public
 >v_public : number
 
     import im_private_i_public = m_public.i_public;
 >im_private_i_public : im_private_i_public
 >m_public : typeof m_public
->i_public : i_public
+>i_public : im_private_i_public
 
     import im_private_mi_public = m_public.mi_public;
->im_private_mi_public : typeof mi_public
+>im_private_mi_public : im_private_mi_public
 >m_public : typeof m_public
->mi_public : typeof mi_public
+>mi_public : typeof im_private_mi_public
 
     import im_private_mu_public = m_public.mu_public;
 >im_private_mu_public : im_private_mu_public
 >m_public : typeof m_public
->mu_public : mu_public
+>mu_public : im_private_mu_public
 
     // Usage of above decls
     var privateUse_im_private_c_public = new im_private_c_public();
->privateUse_im_private_c_public : c_public
->new im_private_c_public() : c_public
->im_private_c_public : typeof c_public
+>privateUse_im_private_c_public : im_private_c_public
+>new im_private_c_public() : im_private_c_public
+>im_private_c_public : typeof im_private_c_public
 
     export var publicUse_im_private_c_public = new im_private_c_public();
->publicUse_im_private_c_public : c_public
->new im_private_c_public() : c_public
->im_private_c_public : typeof c_public
+>publicUse_im_private_c_public : im_private_c_public
+>new im_private_c_public() : im_private_c_public
+>im_private_c_public : typeof im_private_c_public
 
     var privateUse_im_private_e_public = im_private_e_public.Happy;
->privateUse_im_private_e_public : e_public
->im_private_e_public.Happy : e_public
->im_private_e_public : typeof e_public
->Happy : e_public
+>privateUse_im_private_e_public : im_private_e_public
+>im_private_e_public.Happy : im_private_e_public
+>im_private_e_public : typeof im_private_e_public
+>Happy : im_private_e_public
 
     export var publicUse_im_private_e_public = im_private_e_public.Grumpy;
->publicUse_im_private_e_public : e_public
->im_private_e_public.Grumpy : e_public
->im_private_e_public : typeof e_public
->Grumpy : e_public
+>publicUse_im_private_e_public : im_private_e_public
+>im_private_e_public.Grumpy : im_private_e_public
+>im_private_e_public : typeof im_private_e_public
+>Grumpy : im_private_e_public
 
     var privateUse_im_private_f_public = im_private_f_public();
->privateUse_im_private_f_public : c_public
->im_private_f_public() : c_public
->im_private_f_public : typeof f_public
+>privateUse_im_private_f_public : im_private_c_public
+>im_private_f_public() : im_private_c_public
+>im_private_f_public : typeof im_private_f_public
 
     export var publicUse_im_private_f_public = im_private_f_public();
->publicUse_im_private_f_public : c_public
->im_private_f_public() : c_public
->im_private_f_public : typeof f_public
+>publicUse_im_private_f_public : im_private_c_public
+>im_private_f_public() : im_private_c_public
+>im_private_f_public : typeof im_private_f_public
 
     var privateUse_im_private_v_public = im_private_v_public;
 >privateUse_im_private_v_public : number
@@ -282,218 +282,218 @@ export module import_public {
 >im_private_v_public : number
 
     var privateUse_im_private_i_public: im_private_i_public;
->privateUse_im_private_i_public : i_public
->im_private_i_public : 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 : i_public
->im_private_i_public : 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 : c
->new im_private_mi_public.c() : c
->im_private_mi_public.c : typeof c
->im_private_mi_public : typeof mi_public
->c : typeof c
+>privateUse_im_private_mi_public : im_private_mi_public.c
+>new im_private_mi_public.c() : im_private_mi_public.c
+>im_private_mi_public.c : typeof im_private_mi_public.c
+>im_private_mi_public : typeof im_private_mi_public
+>c : typeof im_private_mi_public.c
 
     export var publicUse_im_private_mi_public = new im_private_mi_public.c();
->publicUse_im_private_mi_public : c
->new im_private_mi_public.c() : c
->im_private_mi_public.c : typeof c
->im_private_mi_public : typeof mi_public
->c : typeof c
+>publicUse_im_private_mi_public : im_private_mi_public.c
+>new im_private_mi_public.c() : im_private_mi_public.c
+>im_private_mi_public.c : typeof im_private_mi_public.c
+>im_private_mi_public : typeof im_private_mi_public
+>c : typeof im_private_mi_public.c
 
     var privateUse_im_private_mu_public: im_private_mu_public.i;
->privateUse_im_private_mu_public : i
+>privateUse_im_private_mu_public : im_private_mu_public.i
 >im_private_mu_public : im_private_mu_public
->i : i
+>i : im_private_mu_public.i
 
     export var publicUse_im_private_mu_public: im_private_mu_public.i;
->publicUse_im_private_mu_public : i
+>publicUse_im_private_mu_public : im_private_mu_public.i
 >im_private_mu_public : im_private_mu_public
->i : i
+>i : im_private_mu_public.i
 }
 
 module import_private {
->import_private : typeof import_private
+>import_private : import_private
 
     // No Privacy errors - importing private elements
     import im_private_c_private = m_private.c_private;
->im_private_c_private : typeof c_private
+>im_private_c_private : im_private_c_private
 >m_private : typeof m_private
->c_private : c_private
+>c_private : im_private_c_private
 
     import im_private_e_private = m_private.e_private;
->im_private_e_private : typeof e_private
+>im_private_e_private : im_private_e_private
 >m_private : typeof m_private
->e_private : e_private
+>e_private : im_private_e_private
 
     import im_private_f_private = m_private.f_private;
->im_private_f_private : typeof f_private
+>im_private_f_private : im_private_f_private
 >m_private : typeof m_private
->f_private : typeof f_private
+>f_private : typeof im_private_f_private
 
     import im_private_v_private = m_private.v_private;
->im_private_v_private : c_private
+>im_private_v_private : im_private_v_private
 >m_private : typeof m_private
->v_private : c_private
+>v_private : im_private_c_private
 
     import im_private_i_private = m_private.i_private;
 >im_private_i_private : im_private_i_private
 >m_private : typeof m_private
->i_private : i_private
+>i_private : im_private_i_private
 
     import im_private_mi_private = m_private.mi_private;
->im_private_mi_private : typeof mi_private
+>im_private_mi_private : im_private_mi_private
 >m_private : typeof m_private
->mi_private : typeof mi_private
+>mi_private : typeof im_private_mi_private
 
     import im_private_mu_private = m_private.mu_private;
 >im_private_mu_private : im_private_mu_private
 >m_private : typeof m_private
->mu_private : mu_private
+>mu_private : im_private_mu_private
 
     // Usage of above decls
     var privateUse_im_private_c_private = new im_private_c_private();
->privateUse_im_private_c_private : c_private
->new im_private_c_private() : c_private
->im_private_c_private : typeof c_private
+>privateUse_im_private_c_private : im_private_c_private
+>new im_private_c_private() : im_private_c_private
+>im_private_c_private : typeof im_private_c_private
 
     export var publicUse_im_private_c_private = new im_private_c_private();
->publicUse_im_private_c_private : c_private
->new im_private_c_private() : c_private
->im_private_c_private : typeof c_private
+>publicUse_im_private_c_private : im_private_c_private
+>new im_private_c_private() : im_private_c_private
+>im_private_c_private : typeof im_private_c_private
 
     var privateUse_im_private_e_private = im_private_e_private.Happy;
->privateUse_im_private_e_private : e_private
->im_private_e_private.Happy : e_private
->im_private_e_private : typeof e_private
->Happy : e_private
+>privateUse_im_private_e_private : im_private_e_private
+>im_private_e_private.Happy : im_private_e_private
+>im_private_e_private : typeof im_private_e_private
+>Happy : im_private_e_private
 
     export var publicUse_im_private_e_private = im_private_e_private.Grumpy;
->publicUse_im_private_e_private : e_private
->im_private_e_private.Grumpy : e_private
->im_private_e_private : typeof e_private
->Grumpy : e_private
+>publicUse_im_private_e_private : im_private_e_private
+>im_private_e_private.Grumpy : im_private_e_private
+>im_private_e_private : typeof im_private_e_private
+>Grumpy : im_private_e_private
 
     var privateUse_im_private_f_private = im_private_f_private();
->privateUse_im_private_f_private : c_private
->im_private_f_private() : c_private
->im_private_f_private : typeof f_private
+>privateUse_im_private_f_private : im_private_c_private
+>im_private_f_private() : im_private_c_private
+>im_private_f_private : typeof im_private_f_private
 
     export var publicUse_im_private_f_private = im_private_f_private();
->publicUse_im_private_f_private : c_private
->im_private_f_private() : c_private
->im_private_f_private : typeof f_private
+>publicUse_im_private_f_private : im_private_c_private
+>im_private_f_private() : im_private_c_private
+>im_private_f_private : typeof im_private_f_private
 
     var privateUse_im_private_v_private = im_private_v_private;
->privateUse_im_private_v_private : c_private
->im_private_v_private : c_private
+>privateUse_im_private_v_private : im_private_c_private
+>im_private_v_private : im_private_c_private
 
     export var publicUse_im_private_v_private = im_private_v_private;
->publicUse_im_private_v_private : c_private
->im_private_v_private : c_private
+>publicUse_im_private_v_private : im_private_c_private
+>im_private_v_private : im_private_c_private
 
     var privateUse_im_private_i_private: im_private_i_private;
->privateUse_im_private_i_private : i_private
->im_private_i_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 : i_private
->im_private_i_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 : c
->new im_private_mi_private.c() : c
->im_private_mi_private.c : typeof c
->im_private_mi_private : typeof mi_private
->c : typeof c
+>privateUse_im_private_mi_private : im_private_mi_private.c
+>new im_private_mi_private.c() : im_private_mi_private.c
+>im_private_mi_private.c : typeof im_private_mi_private.c
+>im_private_mi_private : typeof im_private_mi_private
+>c : typeof im_private_mi_private.c
 
     export var publicUse_im_private_mi_private = new im_private_mi_private.c();
->publicUse_im_private_mi_private : c
->new im_private_mi_private.c() : c
->im_private_mi_private.c : typeof c
->im_private_mi_private : typeof mi_private
->c : typeof c
+>publicUse_im_private_mi_private : im_private_mi_private.c
+>new im_private_mi_private.c() : im_private_mi_private.c
+>im_private_mi_private.c : typeof im_private_mi_private.c
+>im_private_mi_private : typeof im_private_mi_private
+>c : typeof im_private_mi_private.c
 
     var privateUse_im_private_mu_private: im_private_mu_private.i;
->privateUse_im_private_mu_private : i
+>privateUse_im_private_mu_private : im_private_mu_private.i
 >im_private_mu_private : im_private_mu_private
->i : i
+>i : im_private_mu_private.i
 
     export var publicUse_im_private_mu_private: im_private_mu_private.i;
->publicUse_im_private_mu_private : i
+>publicUse_im_private_mu_private : im_private_mu_private.i
 >im_private_mu_private : im_private_mu_private
->i : i
+>i : im_private_mu_private.i
 
     // No privacy Error - importing public elements
     import im_private_c_public = m_public.c_public;
->im_private_c_public : typeof c_public
+>im_private_c_public : im_private_c_public
 >m_public : typeof m_public
->c_public : c_public
+>c_public : im_private_c_public
 
     import im_private_e_public = m_public.e_public;
->im_private_e_public : typeof e_public
+>im_private_e_public : im_private_e_public
 >m_public : typeof m_public
->e_public : e_public
+>e_public : im_private_e_public
 
     import im_private_f_public = m_public.f_public;
->im_private_f_public : typeof f_public
+>im_private_f_public : im_private_f_public
 >m_public : typeof m_public
->f_public : typeof f_public
+>f_public : typeof im_private_f_public
 
     import im_private_v_public = m_public.v_public;
->im_private_v_public : number
+>im_private_v_public : im_private_v_public
 >m_public : typeof m_public
 >v_public : number
 
     import im_private_i_public = m_public.i_public;
 >im_private_i_public : im_private_i_public
 >m_public : typeof m_public
->i_public : i_public
+>i_public : im_private_i_public
 
     import im_private_mi_public = m_public.mi_public;
->im_private_mi_public : typeof mi_public
+>im_private_mi_public : im_private_mi_public
 >m_public : typeof m_public
->mi_public : typeof mi_public
+>mi_public : typeof im_private_mi_public
 
     import im_private_mu_public = m_public.mu_public;
 >im_private_mu_public : im_private_mu_public
 >m_public : typeof m_public
->mu_public : mu_public
+>mu_public : im_private_mu_public
 
     // Usage of above decls
     var privateUse_im_private_c_public = new im_private_c_public();
->privateUse_im_private_c_public : c_public
->new im_private_c_public() : c_public
->im_private_c_public : typeof c_public
+>privateUse_im_private_c_public : im_private_c_public
+>new im_private_c_public() : im_private_c_public
+>im_private_c_public : typeof im_private_c_public
 
     export var publicUse_im_private_c_public = new im_private_c_public();
->publicUse_im_private_c_public : c_public
->new im_private_c_public() : c_public
->im_private_c_public : typeof c_public
+>publicUse_im_private_c_public : im_private_c_public
+>new im_private_c_public() : im_private_c_public
+>im_private_c_public : typeof im_private_c_public
 
     var privateUse_im_private_e_public = im_private_e_public.Happy;
->privateUse_im_private_e_public : e_public
->im_private_e_public.Happy : e_public
->im_private_e_public : typeof e_public
->Happy : e_public
+>privateUse_im_private_e_public : im_private_e_public
+>im_private_e_public.Happy : im_private_e_public
+>im_private_e_public : typeof im_private_e_public
+>Happy : im_private_e_public
 
     export var publicUse_im_private_e_public = im_private_e_public.Grumpy;
->publicUse_im_private_e_public : e_public
->im_private_e_public.Grumpy : e_public
->im_private_e_public : typeof e_public
->Grumpy : e_public
+>publicUse_im_private_e_public : im_private_e_public
+>im_private_e_public.Grumpy : im_private_e_public
+>im_private_e_public : typeof im_private_e_public
+>Grumpy : im_private_e_public
 
     var privateUse_im_private_f_public = im_private_f_public();
->privateUse_im_private_f_public : c_public
->im_private_f_public() : c_public
->im_private_f_public : typeof f_public
+>privateUse_im_private_f_public : im_private_c_public
+>im_private_f_public() : im_private_c_public
+>im_private_f_public : typeof im_private_f_public
 
     export var publicUse_im_private_f_public = im_private_f_public();
->publicUse_im_private_f_public : c_public
->im_private_f_public() : c_public
->im_private_f_public : typeof f_public
+>publicUse_im_private_f_public : im_private_c_public
+>im_private_f_public() : im_private_c_public
+>im_private_f_public : typeof im_private_f_public
 
     var privateUse_im_private_v_public = im_private_v_public;
 >privateUse_im_private_v_public : number
@@ -504,34 +504,34 @@ module import_private {
 >im_private_v_public : number
 
     var privateUse_im_private_i_public: im_private_i_public;
->privateUse_im_private_i_public : i_public
->im_private_i_public : 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 : i_public
->im_private_i_public : 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 : c
->new im_private_mi_public.c() : c
->im_private_mi_public.c : typeof c
->im_private_mi_public : typeof mi_public
->c : typeof c
+>privateUse_im_private_mi_public : im_private_mi_public.c
+>new im_private_mi_public.c() : im_private_mi_public.c
+>im_private_mi_public.c : typeof im_private_mi_public.c
+>im_private_mi_public : typeof im_private_mi_public
+>c : typeof im_private_mi_public.c
 
     export var publicUse_im_private_mi_public = new im_private_mi_public.c();
->publicUse_im_private_mi_public : c
->new im_private_mi_public.c() : c
->im_private_mi_public.c : typeof c
->im_private_mi_public : typeof mi_public
->c : typeof c
+>publicUse_im_private_mi_public : im_private_mi_public.c
+>new im_private_mi_public.c() : im_private_mi_public.c
+>im_private_mi_public.c : typeof im_private_mi_public.c
+>im_private_mi_public : typeof im_private_mi_public
+>c : typeof im_private_mi_public.c
 
     var privateUse_im_private_mu_public: im_private_mu_public.i;
->privateUse_im_private_mu_public : i
+>privateUse_im_private_mu_public : im_private_mu_public.i
 >im_private_mu_public : im_private_mu_public
->i : i
+>i : im_private_mu_public.i
 
     export var publicUse_im_private_mu_public: im_private_mu_public.i;
->publicUse_im_private_mu_public : i
+>publicUse_im_private_mu_public : im_private_mu_public.i
 >im_private_mu_public : im_private_mu_public
->i : i
+>i : im_private_mu_public.i
 }
diff --git a/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithExport.js b/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithExport.js
index 1956ea5e111..238ec4d52f7 100644
--- a/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithExport.js
+++ b/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithExport.js
@@ -62,8 +62,6 @@ var c_public = (function () {
 })();
 exports.c_public = c_public;
 //// [privacyTopLevelAmbientExternalModuleImportWithExport_core.js]
-///<reference path='privacyTopLevelAmbientExternalModuleImportWithExport_require2.ts'/>
-///<reference path='privacyTopLevelAmbientExternalModuleImportWithExport_require3.ts'/>
 // Privacy errors - importing private elements
 exports.im_public_mi_private = require("privacyTopLevelAmbientExternalModuleImportWithExport_require");
 exports.im_public_mu_private = require("privacyTopLevelAmbientExternalModuleImportWithExport_require1");
diff --git a/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithExport.types b/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithExport.types
index 338d06442a0..69215e43e60 100644
--- a/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithExport.types
+++ b/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithExport.types
@@ -1,7 +1,7 @@
 === tests/cases/compiler/privacyTopLevelInternalReferenceImportWithExport.ts ===
 // private elements
 module m_private {
->m_private : typeof m_private
+>m_private : m_private
 
     export class c_private {
 >c_private : c_private
@@ -31,7 +31,7 @@ module m_private {
 >i_private : i_private
     }
     export module mi_private {
->mi_private : typeof mi_private
+>mi_private : mi_private
 
         export class c {
 >c : c
@@ -48,7 +48,7 @@ module m_private {
 
 // Public elements
 export module m_public {
->m_public : typeof m_public
+>m_public : m_public
 
     export class c_public {
 >c_public : c_public
@@ -76,7 +76,7 @@ export module m_public {
 >i_public : i_public
     }
     export module mi_public {
->mi_public : typeof mi_public
+>mi_public : mi_public
 
         export class c {
 >c : c
@@ -93,182 +93,182 @@ export module m_public {
 
 // Privacy errors - importing private elements
 export import im_public_c_private = m_private.c_private;
->im_public_c_private : typeof c_private
+>im_public_c_private : im_public_c_private
 >m_private : typeof m_private
->c_private : c_private
+>c_private : im_public_c_private
 
 export import im_public_e_private = m_private.e_private;
->im_public_e_private : typeof e_private
+>im_public_e_private : im_public_e_private
 >m_private : typeof m_private
->e_private : e_private
+>e_private : im_public_e_private
 
 export import im_public_f_private = m_private.f_private;
->im_public_f_private : typeof f_private
+>im_public_f_private : im_public_f_private
 >m_private : typeof m_private
->f_private : typeof f_private
+>f_private : typeof im_public_f_private
 
 export import im_public_v_private = m_private.v_private;
->im_public_v_private : c_private
+>im_public_v_private : im_public_v_private
 >m_private : typeof m_private
->v_private : c_private
+>v_private : im_public_c_private
 
 export import im_public_i_private = m_private.i_private;
 >im_public_i_private : im_public_i_private
 >m_private : typeof m_private
->i_private : i_private
+>i_private : im_public_i_private
 
 export import im_public_mi_private = m_private.mi_private;
->im_public_mi_private : typeof mi_private
+>im_public_mi_private : im_public_mi_private
 >m_private : typeof m_private
->mi_private : typeof mi_private
+>mi_private : typeof im_public_mi_private
 
 export import im_public_mu_private = m_private.mu_private;
 >im_public_mu_private : im_public_mu_private
 >m_private : typeof m_private
->mu_private : mu_private
+>mu_private : im_public_mu_private
 
 // Usage of privacy error imports
 var privateUse_im_public_c_private = new im_public_c_private();
->privateUse_im_public_c_private : c_private
->new im_public_c_private() : c_private
->im_public_c_private : typeof c_private
+>privateUse_im_public_c_private : im_public_c_private
+>new im_public_c_private() : im_public_c_private
+>im_public_c_private : typeof im_public_c_private
 
 export var publicUse_im_public_c_private = new im_public_c_private();
->publicUse_im_public_c_private : c_private
->new im_public_c_private() : c_private
->im_public_c_private : typeof c_private
+>publicUse_im_public_c_private : im_public_c_private
+>new im_public_c_private() : im_public_c_private
+>im_public_c_private : typeof im_public_c_private
 
 var privateUse_im_public_e_private = im_public_e_private.Happy;
->privateUse_im_public_e_private : e_private
->im_public_e_private.Happy : e_private
->im_public_e_private : typeof e_private
->Happy : e_private
+>privateUse_im_public_e_private : im_public_e_private
+>im_public_e_private.Happy : im_public_e_private
+>im_public_e_private : typeof im_public_e_private
+>Happy : im_public_e_private
 
 export var publicUse_im_public_e_private = im_public_e_private.Grumpy;
->publicUse_im_public_e_private : e_private
->im_public_e_private.Grumpy : e_private
->im_public_e_private : typeof e_private
->Grumpy : e_private
+>publicUse_im_public_e_private : im_public_e_private
+>im_public_e_private.Grumpy : im_public_e_private
+>im_public_e_private : typeof im_public_e_private
+>Grumpy : im_public_e_private
 
 var privateUse_im_public_f_private = im_public_f_private();
->privateUse_im_public_f_private : c_private
->im_public_f_private() : c_private
->im_public_f_private : typeof f_private
+>privateUse_im_public_f_private : im_public_c_private
+>im_public_f_private() : im_public_c_private
+>im_public_f_private : typeof im_public_f_private
 
 export var publicUse_im_public_f_private = im_public_f_private();
->publicUse_im_public_f_private : c_private
->im_public_f_private() : c_private
->im_public_f_private : typeof f_private
+>publicUse_im_public_f_private : im_public_c_private
+>im_public_f_private() : im_public_c_private
+>im_public_f_private : typeof im_public_f_private
 
 var privateUse_im_public_v_private = im_public_v_private;
->privateUse_im_public_v_private : c_private
->im_public_v_private : c_private
+>privateUse_im_public_v_private : im_public_c_private
+>im_public_v_private : im_public_c_private
 
 export var publicUse_im_public_v_private = im_public_v_private;
->publicUse_im_public_v_private : c_private
->im_public_v_private : c_private
+>publicUse_im_public_v_private : im_public_c_private
+>im_public_v_private : im_public_c_private
 
 var privateUse_im_public_i_private: im_public_i_private;
->privateUse_im_public_i_private : i_private
->im_public_i_private : 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 : i_private
->im_public_i_private : 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 : c
->new im_public_mi_private.c() : c
->im_public_mi_private.c : typeof c
->im_public_mi_private : typeof mi_private
->c : typeof c
+>privateUse_im_public_mi_private : im_public_mi_private.c
+>new im_public_mi_private.c() : im_public_mi_private.c
+>im_public_mi_private.c : typeof im_public_mi_private.c
+>im_public_mi_private : typeof im_public_mi_private
+>c : typeof im_public_mi_private.c
 
 export var publicUse_im_public_mi_private = new im_public_mi_private.c();
->publicUse_im_public_mi_private : c
->new im_public_mi_private.c() : c
->im_public_mi_private.c : typeof c
->im_public_mi_private : typeof mi_private
->c : typeof c
+>publicUse_im_public_mi_private : im_public_mi_private.c
+>new im_public_mi_private.c() : im_public_mi_private.c
+>im_public_mi_private.c : typeof im_public_mi_private.c
+>im_public_mi_private : typeof im_public_mi_private
+>c : typeof im_public_mi_private.c
 
 var privateUse_im_public_mu_private: im_public_mu_private.i;
->privateUse_im_public_mu_private : i
+>privateUse_im_public_mu_private : im_public_mu_private.i
 >im_public_mu_private : im_public_mu_private
->i : i
+>i : im_public_mu_private.i
 
 export var publicUse_im_public_mu_private: im_public_mu_private.i;
->publicUse_im_public_mu_private : i
+>publicUse_im_public_mu_private : im_public_mu_private.i
 >im_public_mu_private : im_public_mu_private
->i : i
+>i : im_public_mu_private.i
 
 
 // No Privacy errors - importing public elements
 export import im_public_c_public = m_public.c_public;
->im_public_c_public : typeof c_public
+>im_public_c_public : im_public_c_public
 >m_public : typeof m_public
->c_public : c_public
+>c_public : im_public_c_public
 
 export import im_public_e_public = m_public.e_public;
->im_public_e_public : typeof e_public
+>im_public_e_public : im_public_e_public
 >m_public : typeof m_public
->e_public : e_public
+>e_public : im_public_e_public
 
 export import im_public_f_public = m_public.f_public;
->im_public_f_public : typeof f_public
+>im_public_f_public : im_public_f_public
 >m_public : typeof m_public
->f_public : typeof f_public
+>f_public : typeof im_public_f_public
 
 export import im_public_v_public = m_public.v_public;
->im_public_v_public : number
+>im_public_v_public : im_public_v_public
 >m_public : typeof m_public
 >v_public : number
 
 export import im_public_i_public = m_public.i_public;
 >im_public_i_public : im_public_i_public
 >m_public : typeof m_public
->i_public : i_public
+>i_public : im_public_i_public
 
 export import im_public_mi_public = m_public.mi_public;
->im_public_mi_public : typeof mi_public
+>im_public_mi_public : im_public_mi_public
 >m_public : typeof m_public
->mi_public : typeof mi_public
+>mi_public : typeof im_public_mi_public
 
 export import im_public_mu_public = m_public.mu_public;
 >im_public_mu_public : im_public_mu_public
 >m_public : typeof m_public
->mu_public : mu_public
+>mu_public : im_public_mu_public
 
 // Usage of above decls
 var privateUse_im_public_c_public = new im_public_c_public();
->privateUse_im_public_c_public : c_public
->new im_public_c_public() : c_public
->im_public_c_public : typeof c_public
+>privateUse_im_public_c_public : im_public_c_public
+>new im_public_c_public() : im_public_c_public
+>im_public_c_public : typeof im_public_c_public
 
 export var publicUse_im_public_c_public = new im_public_c_public();
->publicUse_im_public_c_public : c_public
->new im_public_c_public() : c_public
->im_public_c_public : typeof c_public
+>publicUse_im_public_c_public : im_public_c_public
+>new im_public_c_public() : im_public_c_public
+>im_public_c_public : typeof im_public_c_public
 
 var privateUse_im_public_e_public = im_public_e_public.Happy;
->privateUse_im_public_e_public : e_public
->im_public_e_public.Happy : e_public
->im_public_e_public : typeof e_public
->Happy : e_public
+>privateUse_im_public_e_public : im_public_e_public
+>im_public_e_public.Happy : im_public_e_public
+>im_public_e_public : typeof im_public_e_public
+>Happy : im_public_e_public
 
 export var publicUse_im_public_e_public = im_public_e_public.Grumpy;
->publicUse_im_public_e_public : e_public
->im_public_e_public.Grumpy : e_public
->im_public_e_public : typeof e_public
->Grumpy : e_public
+>publicUse_im_public_e_public : im_public_e_public
+>im_public_e_public.Grumpy : im_public_e_public
+>im_public_e_public : typeof im_public_e_public
+>Grumpy : im_public_e_public
 
 var privateUse_im_public_f_public = im_public_f_public();
->privateUse_im_public_f_public : c_public
->im_public_f_public() : c_public
->im_public_f_public : typeof f_public
+>privateUse_im_public_f_public : im_public_c_public
+>im_public_f_public() : im_public_c_public
+>im_public_f_public : typeof im_public_f_public
 
 export var publicUse_im_public_f_public = im_public_f_public();
->publicUse_im_public_f_public : c_public
->im_public_f_public() : c_public
->im_public_f_public : typeof f_public
+>publicUse_im_public_f_public : im_public_c_public
+>im_public_f_public() : im_public_c_public
+>im_public_f_public : typeof im_public_f_public
 
 var privateUse_im_public_v_public = im_public_v_public;
 >privateUse_im_public_v_public : number
@@ -279,34 +279,34 @@ export var publicUse_im_public_v_public = im_public_v_public;
 >im_public_v_public : number
 
 var privateUse_im_public_i_public: im_public_i_public;
->privateUse_im_public_i_public : i_public
->im_public_i_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 : i_public
->im_public_i_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 : c
->new im_public_mi_public.c() : c
->im_public_mi_public.c : typeof c
->im_public_mi_public : typeof mi_public
->c : typeof c
+>privateUse_im_public_mi_public : im_public_mi_public.c
+>new im_public_mi_public.c() : im_public_mi_public.c
+>im_public_mi_public.c : typeof im_public_mi_public.c
+>im_public_mi_public : typeof im_public_mi_public
+>c : typeof im_public_mi_public.c
 
 export var publicUse_im_public_mi_public = new im_public_mi_public.c();
->publicUse_im_public_mi_public : c
->new im_public_mi_public.c() : c
->im_public_mi_public.c : typeof c
->im_public_mi_public : typeof mi_public
->c : typeof c
+>publicUse_im_public_mi_public : im_public_mi_public.c
+>new im_public_mi_public.c() : im_public_mi_public.c
+>im_public_mi_public.c : typeof im_public_mi_public.c
+>im_public_mi_public : typeof im_public_mi_public
+>c : typeof im_public_mi_public.c
 
 var privateUse_im_public_mu_public: im_public_mu_public.i;
->privateUse_im_public_mu_public : i
+>privateUse_im_public_mu_public : im_public_mu_public.i
 >im_public_mu_public : im_public_mu_public
->i : i
+>i : im_public_mu_public.i
 
 export var publicUse_im_public_mu_public: im_public_mu_public.i;
->publicUse_im_public_mu_public : i
+>publicUse_im_public_mu_public : im_public_mu_public.i
 >im_public_mu_public : im_public_mu_public
->i : i
+>i : im_public_mu_public.i
 
diff --git a/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.types b/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.types
index e5cd624d5ae..c47f2e54c30 100644
--- a/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.types
+++ b/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.types
@@ -1,7 +1,7 @@
 === tests/cases/compiler/privacyTopLevelInternalReferenceImportWithoutExport.ts ===
 // private elements
 module m_private {
->m_private : typeof m_private
+>m_private : m_private
 
     export class c_private {
 >c_private : c_private
@@ -31,7 +31,7 @@ module m_private {
 >i_private : i_private
     }
     export module mi_private {
->mi_private : typeof mi_private
+>mi_private : mi_private
 
         export class c {
 >c : c
@@ -48,7 +48,7 @@ module m_private {
 
 // Public elements
 export module m_public {
->m_public : typeof m_public
+>m_public : m_public
 
     export class c_public {
 >c_public : c_public
@@ -76,7 +76,7 @@ export module m_public {
 >i_public : i_public
     }
     export module mi_public {
->mi_public : typeof mi_public
+>mi_public : mi_public
 
         export class c {
 >c : c
@@ -93,182 +93,182 @@ export module m_public {
 
 // No Privacy errors - importing private elements
 import im_private_c_private = m_private.c_private;
->im_private_c_private : typeof c_private
+>im_private_c_private : im_private_c_private
 >m_private : typeof m_private
->c_private : c_private
+>c_private : im_private_c_private
 
 import im_private_e_private = m_private.e_private;
->im_private_e_private : typeof e_private
+>im_private_e_private : im_private_e_private
 >m_private : typeof m_private
->e_private : e_private
+>e_private : im_private_e_private
 
 import im_private_f_private = m_private.f_private;
->im_private_f_private : typeof f_private
+>im_private_f_private : im_private_f_private
 >m_private : typeof m_private
->f_private : typeof f_private
+>f_private : typeof im_private_f_private
 
 import im_private_v_private = m_private.v_private;
->im_private_v_private : c_private
+>im_private_v_private : im_private_v_private
 >m_private : typeof m_private
->v_private : c_private
+>v_private : im_private_c_private
 
 import im_private_i_private = m_private.i_private;
 >im_private_i_private : im_private_i_private
 >m_private : typeof m_private
->i_private : i_private
+>i_private : im_private_i_private
 
 import im_private_mi_private = m_private.mi_private;
->im_private_mi_private : typeof mi_private
+>im_private_mi_private : im_private_mi_private
 >m_private : typeof m_private
->mi_private : typeof mi_private
+>mi_private : typeof im_private_mi_private
 
 import im_private_mu_private = m_private.mu_private;
 >im_private_mu_private : im_private_mu_private
 >m_private : typeof m_private
->mu_private : mu_private
+>mu_private : im_private_mu_private
 
 // Usage of above decls
 var privateUse_im_private_c_private = new im_private_c_private();
->privateUse_im_private_c_private : c_private
->new im_private_c_private() : c_private
->im_private_c_private : typeof c_private
+>privateUse_im_private_c_private : im_private_c_private
+>new im_private_c_private() : im_private_c_private
+>im_private_c_private : typeof im_private_c_private
 
 export var publicUse_im_private_c_private = new im_private_c_private();
->publicUse_im_private_c_private : c_private
->new im_private_c_private() : c_private
->im_private_c_private : typeof c_private
+>publicUse_im_private_c_private : im_private_c_private
+>new im_private_c_private() : im_private_c_private
+>im_private_c_private : typeof im_private_c_private
 
 var privateUse_im_private_e_private = im_private_e_private.Happy;
->privateUse_im_private_e_private : e_private
->im_private_e_private.Happy : e_private
->im_private_e_private : typeof e_private
->Happy : e_private
+>privateUse_im_private_e_private : im_private_e_private
+>im_private_e_private.Happy : im_private_e_private
+>im_private_e_private : typeof im_private_e_private
+>Happy : im_private_e_private
 
 export var publicUse_im_private_e_private = im_private_e_private.Grumpy;
->publicUse_im_private_e_private : e_private
->im_private_e_private.Grumpy : e_private
->im_private_e_private : typeof e_private
->Grumpy : e_private
+>publicUse_im_private_e_private : im_private_e_private
+>im_private_e_private.Grumpy : im_private_e_private
+>im_private_e_private : typeof im_private_e_private
+>Grumpy : im_private_e_private
 
 var privateUse_im_private_f_private = im_private_f_private();
->privateUse_im_private_f_private : c_private
->im_private_f_private() : c_private
->im_private_f_private : typeof f_private
+>privateUse_im_private_f_private : im_private_c_private
+>im_private_f_private() : im_private_c_private
+>im_private_f_private : typeof im_private_f_private
 
 export var publicUse_im_private_f_private = im_private_f_private();
->publicUse_im_private_f_private : c_private
->im_private_f_private() : c_private
->im_private_f_private : typeof f_private
+>publicUse_im_private_f_private : im_private_c_private
+>im_private_f_private() : im_private_c_private
+>im_private_f_private : typeof im_private_f_private
 
 var privateUse_im_private_v_private = im_private_v_private;
->privateUse_im_private_v_private : c_private
->im_private_v_private : c_private
+>privateUse_im_private_v_private : im_private_c_private
+>im_private_v_private : im_private_c_private
 
 export var publicUse_im_private_v_private = im_private_v_private;
->publicUse_im_private_v_private : c_private
->im_private_v_private : c_private
+>publicUse_im_private_v_private : im_private_c_private
+>im_private_v_private : im_private_c_private
 
 var privateUse_im_private_i_private: im_private_i_private;
->privateUse_im_private_i_private : i_private
->im_private_i_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 : i_private
->im_private_i_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 : c
->new im_private_mi_private.c() : c
->im_private_mi_private.c : typeof c
->im_private_mi_private : typeof mi_private
->c : typeof c
+>privateUse_im_private_mi_private : im_private_mi_private.c
+>new im_private_mi_private.c() : im_private_mi_private.c
+>im_private_mi_private.c : typeof im_private_mi_private.c
+>im_private_mi_private : typeof im_private_mi_private
+>c : typeof im_private_mi_private.c
 
 export var publicUse_im_private_mi_private = new im_private_mi_private.c();
->publicUse_im_private_mi_private : c
->new im_private_mi_private.c() : c
->im_private_mi_private.c : typeof c
->im_private_mi_private : typeof mi_private
->c : typeof c
+>publicUse_im_private_mi_private : im_private_mi_private.c
+>new im_private_mi_private.c() : im_private_mi_private.c
+>im_private_mi_private.c : typeof im_private_mi_private.c
+>im_private_mi_private : typeof im_private_mi_private
+>c : typeof im_private_mi_private.c
 
 var privateUse_im_private_mu_private: im_private_mu_private.i;
->privateUse_im_private_mu_private : i
+>privateUse_im_private_mu_private : im_private_mu_private.i
 >im_private_mu_private : im_private_mu_private
->i : i
+>i : im_private_mu_private.i
 
 export var publicUse_im_private_mu_private: im_private_mu_private.i;
->publicUse_im_private_mu_private : i
+>publicUse_im_private_mu_private : im_private_mu_private.i
 >im_private_mu_private : im_private_mu_private
->i : i
+>i : im_private_mu_private.i
 
 
 // No Privacy errors - importing public elements
 import im_private_c_public = m_public.c_public;
->im_private_c_public : typeof c_public
+>im_private_c_public : im_private_c_public
 >m_public : typeof m_public
->c_public : c_public
+>c_public : im_private_c_public
 
 import im_private_e_public = m_public.e_public;
->im_private_e_public : typeof e_public
+>im_private_e_public : im_private_e_public
 >m_public : typeof m_public
->e_public : e_public
+>e_public : im_private_e_public
 
 import im_private_f_public = m_public.f_public;
->im_private_f_public : typeof f_public
+>im_private_f_public : im_private_f_public
 >m_public : typeof m_public
->f_public : typeof f_public
+>f_public : typeof im_private_f_public
 
 import im_private_v_public = m_public.v_public;
->im_private_v_public : number
+>im_private_v_public : im_private_v_public
 >m_public : typeof m_public
 >v_public : number
 
 import im_private_i_public = m_public.i_public;
 >im_private_i_public : im_private_i_public
 >m_public : typeof m_public
->i_public : i_public
+>i_public : im_private_i_public
 
 import im_private_mi_public = m_public.mi_public;
->im_private_mi_public : typeof mi_public
+>im_private_mi_public : im_private_mi_public
 >m_public : typeof m_public
->mi_public : typeof mi_public
+>mi_public : typeof im_private_mi_public
 
 import im_private_mu_public = m_public.mu_public;
 >im_private_mu_public : im_private_mu_public
 >m_public : typeof m_public
->mu_public : mu_public
+>mu_public : im_private_mu_public
 
 // Usage of above decls
 var privateUse_im_private_c_public = new im_private_c_public();
->privateUse_im_private_c_public : c_public
->new im_private_c_public() : c_public
->im_private_c_public : typeof c_public
+>privateUse_im_private_c_public : im_private_c_public
+>new im_private_c_public() : im_private_c_public
+>im_private_c_public : typeof im_private_c_public
 
 export var publicUse_im_private_c_public = new im_private_c_public();
->publicUse_im_private_c_public : c_public
->new im_private_c_public() : c_public
->im_private_c_public : typeof c_public
+>publicUse_im_private_c_public : im_private_c_public
+>new im_private_c_public() : im_private_c_public
+>im_private_c_public : typeof im_private_c_public
 
 var privateUse_im_private_e_public = im_private_e_public.Happy;
->privateUse_im_private_e_public : e_public
->im_private_e_public.Happy : e_public
->im_private_e_public : typeof e_public
->Happy : e_public
+>privateUse_im_private_e_public : im_private_e_public
+>im_private_e_public.Happy : im_private_e_public
+>im_private_e_public : typeof im_private_e_public
+>Happy : im_private_e_public
 
 export var publicUse_im_private_e_public = im_private_e_public.Grumpy;
->publicUse_im_private_e_public : e_public
->im_private_e_public.Grumpy : e_public
->im_private_e_public : typeof e_public
->Grumpy : e_public
+>publicUse_im_private_e_public : im_private_e_public
+>im_private_e_public.Grumpy : im_private_e_public
+>im_private_e_public : typeof im_private_e_public
+>Grumpy : im_private_e_public
 
 var privateUse_im_private_f_public = im_private_f_public();
->privateUse_im_private_f_public : c_public
->im_private_f_public() : c_public
->im_private_f_public : typeof f_public
+>privateUse_im_private_f_public : im_private_c_public
+>im_private_f_public() : im_private_c_public
+>im_private_f_public : typeof im_private_f_public
 
 export var publicUse_im_private_f_public = im_private_f_public();
->publicUse_im_private_f_public : c_public
->im_private_f_public() : c_public
->im_private_f_public : typeof f_public
+>publicUse_im_private_f_public : im_private_c_public
+>im_private_f_public() : im_private_c_public
+>im_private_f_public : typeof im_private_f_public
 
 var privateUse_im_private_v_public = im_private_v_public;
 >privateUse_im_private_v_public : number
@@ -279,34 +279,34 @@ export var publicUse_im_private_v_public = im_private_v_public;
 >im_private_v_public : number
 
 var privateUse_im_private_i_public: im_private_i_public;
->privateUse_im_private_i_public : i_public
->im_private_i_public : 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 : i_public
->im_private_i_public : 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 : c
->new im_private_mi_public.c() : c
->im_private_mi_public.c : typeof c
->im_private_mi_public : typeof mi_public
->c : typeof c
+>privateUse_im_private_mi_public : im_private_mi_public.c
+>new im_private_mi_public.c() : im_private_mi_public.c
+>im_private_mi_public.c : typeof im_private_mi_public.c
+>im_private_mi_public : typeof im_private_mi_public
+>c : typeof im_private_mi_public.c
 
 export var publicUse_im_private_mi_public = new im_private_mi_public.c();
->publicUse_im_private_mi_public : c
->new im_private_mi_public.c() : c
->im_private_mi_public.c : typeof c
->im_private_mi_public : typeof mi_public
->c : typeof c
+>publicUse_im_private_mi_public : im_private_mi_public.c
+>new im_private_mi_public.c() : im_private_mi_public.c
+>im_private_mi_public.c : typeof im_private_mi_public.c
+>im_private_mi_public : typeof im_private_mi_public
+>c : typeof im_private_mi_public.c
 
 var privateUse_im_private_mu_public: im_private_mu_public.i;
->privateUse_im_private_mu_public : i
+>privateUse_im_private_mu_public : im_private_mu_public.i
 >im_private_mu_public : im_private_mu_public
->i : i
+>i : im_private_mu_public.i
 
 export var publicUse_im_private_mu_public: im_private_mu_public.i;
->publicUse_im_private_mu_public : i
+>publicUse_im_private_mu_public : im_private_mu_public.i
 >im_private_mu_public : im_private_mu_public
->i : i
+>i : im_private_mu_public.i
 
diff --git a/tests/baselines/reference/privacyVar.types b/tests/baselines/reference/privacyVar.types
index b5a96afb9e6..427c6efdc87 100644
--- a/tests/baselines/reference/privacyVar.types
+++ b/tests/baselines/reference/privacyVar.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/privacyVar.ts ===
 export module m1 {
->m1 : typeof m1
+>m1 : m1
 
     export class C1_public {
 >C1_public : C1_public
@@ -204,7 +204,7 @@ export module m1 {
 }
 
 module m2 {
->m2 : typeof m2
+>m2 : m2
 
     export class m2_C1_public {
 >m2_C1_public : m2_C1_public
diff --git a/tests/baselines/reference/privateInstanceVisibility.types b/tests/baselines/reference/privateInstanceVisibility.types
index 109309ceb76..a009095a9e1 100644
--- a/tests/baselines/reference/privateInstanceVisibility.types
+++ b/tests/baselines/reference/privateInstanceVisibility.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/privateInstanceVisibility.ts ===
 module Test {
->Test : typeof Test
+>Test : Test
  
     export class Example {
 >Example : Example
diff --git a/tests/baselines/reference/propertyNamesWithStringLiteral.types b/tests/baselines/reference/propertyNamesWithStringLiteral.types
index 89e5771a4b0..5c6ee71bf55 100644
--- a/tests/baselines/reference/propertyNamesWithStringLiteral.types
+++ b/tests/baselines/reference/propertyNamesWithStringLiteral.types
@@ -23,7 +23,7 @@ interface NamedColors {
 >_Color : _Color
 }
 module Color {
->Color : typeof Color
+>Color : Color
 
     export var namedColors: NamedColors;
 >namedColors : NamedColors
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 9778480426a..04a013ff189 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
@@ -1,6 +1,6 @@
 === tests/cases/compiler/qualifiedName_ImportDeclarations-entity-names-referencing-a-var.ts ===
 module Alpha {
->Alpha : typeof Alpha
+>Alpha : Alpha
 
     export var x = 100;
 >x : number
@@ -10,7 +10,7 @@ module Beta {
 >Beta : Beta
 
     import p = Alpha.x;
->p : number
+>p : p
 >Alpha : typeof Alpha
 >x : number
 }
diff --git a/tests/baselines/reference/reboundBaseClassSymbol.types b/tests/baselines/reference/reboundBaseClassSymbol.types
index 1a62a7f71cb..06c152d7855 100644
--- a/tests/baselines/reference/reboundBaseClassSymbol.types
+++ b/tests/baselines/reference/reboundBaseClassSymbol.types
@@ -4,7 +4,7 @@ interface A { a: number; }
 >a : number
 
 module Foo {
->Foo : typeof Foo
+>Foo : Foo
 
     var A = 1;
 >A : number
diff --git a/tests/baselines/reference/rectype.types b/tests/baselines/reference/rectype.types
index 5d8da81c3e1..e26748085c0 100644
--- a/tests/baselines/reference/rectype.types
+++ b/tests/baselines/reference/rectype.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/rectype.ts ===
 module M {
->M : typeof M
+>M : M
 
     interface I { (i:I):I; }
 >I : I
diff --git a/tests/baselines/reference/recursiveClassInstantiationsWithDefaultConstructors.types b/tests/baselines/reference/recursiveClassInstantiationsWithDefaultConstructors.types
index d70677d2c74..97d0c5f7a9a 100644
--- a/tests/baselines/reference/recursiveClassInstantiationsWithDefaultConstructors.types
+++ b/tests/baselines/reference/recursiveClassInstantiationsWithDefaultConstructors.types
@@ -1,13 +1,13 @@
 === tests/cases/compiler/recursiveClassInstantiationsWithDefaultConstructors.ts ===
 var a = new TypeScript2.MemberNameArray()
->a : MemberNameArray
->new TypeScript2.MemberNameArray() : MemberNameArray
->TypeScript2.MemberNameArray : typeof MemberNameArray
+>a : TypeScript2.MemberNameArray
+>new TypeScript2.MemberNameArray() : TypeScript2.MemberNameArray
+>TypeScript2.MemberNameArray : typeof TypeScript2.MemberNameArray
 >TypeScript2 : typeof TypeScript2
->MemberNameArray : typeof MemberNameArray
+>MemberNameArray : typeof TypeScript2.MemberNameArray
 
 module TypeScript2 {
->TypeScript2 : typeof TypeScript2
+>TypeScript2 : TypeScript2
 
 export class MemberName {
 >MemberName : MemberName
diff --git a/tests/baselines/reference/recursiveCloduleReference.types b/tests/baselines/reference/recursiveCloduleReference.types
index f3a0bf45c9a..953bf0e4b2e 100644
--- a/tests/baselines/reference/recursiveCloduleReference.types
+++ b/tests/baselines/reference/recursiveCloduleReference.types
@@ -1,18 +1,18 @@
 === tests/cases/compiler/recursiveCloduleReference.ts ===
 module M
->M : typeof M
+>M : M
 {
   export class C {
 >C : C
   }
   export module C {
->C : typeof C
+>C : M.C
 
     export var C = M.C
->C : typeof C
->M.C : typeof C
+>C : typeof M.C
+>M.C : typeof M.C
 >M : typeof M
->C : typeof C
+>C : typeof M.C
 
   };
 };
diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType7.types b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType7.types
index 3e4708e94eb..fb2d460038b 100644
--- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType7.types
+++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType7.types
@@ -1,9 +1,9 @@
 === tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType7_moduleA.ts ===
 import moduleC = require("recursiveExportAssignmentAndFindAliasedType7_moduleC");
->moduleC : any
+>moduleC : moduleC
 
 import ClassB = require("recursiveExportAssignmentAndFindAliasedType7_moduleB");
->ClassB : typeof ClassB
+>ClassB : ClassB
 
 export var b: ClassB; // This should result in type ClassB
 >b : ClassB
@@ -11,7 +11,7 @@ export var b: ClassB; // This should result in type ClassB
 
 === tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType7_moduleC.ts ===
 import self = require("recursiveExportAssignmentAndFindAliasedType7_moduleD");
->self : any
+>self : self
 
 var selfVar = self;
 >selfVar : any
@@ -22,14 +22,14 @@ export = selfVar;
 
 === tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType7_moduleD.ts ===
 import self = require("recursiveExportAssignmentAndFindAliasedType7_moduleE");
->self : any
+>self : self
 
 export = self;
 >self : any
 
 === tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType7_moduleE.ts ===
 import self = require("recursiveExportAssignmentAndFindAliasedType7_moduleC");
->self : any
+>self : self
 
 export = self;
 >self : any
diff --git a/tests/baselines/reference/recursiveFunctionTypes.errors.txt b/tests/baselines/reference/recursiveFunctionTypes.errors.txt
index 5068438a8ca..3d61fc694ab 100644
--- a/tests/baselines/reference/recursiveFunctionTypes.errors.txt
+++ b/tests/baselines/reference/recursiveFunctionTypes.errors.txt
@@ -35,7 +35,7 @@
     }
     C.g(3); // error
         ~
-!!! Argument of type 'number' is not assignable to parameter of type '(t: typeof g) => void'.
+!!! Argument of type 'number' is not assignable to parameter of type '(t: any) => void'.
     
     var f4: () => typeof f4;
     f4 = 3; // error
diff --git a/tests/baselines/reference/recursiveFunctionTypes1.types b/tests/baselines/reference/recursiveFunctionTypes1.types
index 005a4989420..81af54b96d3 100644
--- a/tests/baselines/reference/recursiveFunctionTypes1.types
+++ b/tests/baselines/reference/recursiveFunctionTypes1.types
@@ -3,8 +3,8 @@ class C {
 >C : C
 
      static g(t: typeof C.g){ }
->g : typeof g
->t : typeof g
+>g : (t: any) => void
+>t : (t: any) => void
 >C : typeof C
->g : typeof g
+>g : (t: any) => void
 }
diff --git a/tests/baselines/reference/recursiveIdenticalOverloadResolution.types b/tests/baselines/reference/recursiveIdenticalOverloadResolution.types
index 18000888d4f..e1089848276 100644
--- a/tests/baselines/reference/recursiveIdenticalOverloadResolution.types
+++ b/tests/baselines/reference/recursiveIdenticalOverloadResolution.types
@@ -1,7 +1,7 @@
 === tests/cases/compiler/recursiveIdenticalOverloadResolution.ts ===
 
 module M {
->M : typeof M
+>M : M
 
    interface I { (i: I): I; }
 >I : I
diff --git a/tests/baselines/reference/recursiveMods.types b/tests/baselines/reference/recursiveMods.types
index 016b9a72129..19a22d892dd 100644
--- a/tests/baselines/reference/recursiveMods.types
+++ b/tests/baselines/reference/recursiveMods.types
@@ -1,13 +1,13 @@
 === tests/cases/compiler/recursiveMods.ts ===
 export module Foo {
->Foo : typeof Foo
+>Foo : Foo
 
 	export class C {}
 >C : C
 }
 
 export module Foo {
->Foo : typeof Foo
+>Foo : Foo
 
 	function Bar() : C {
 >Bar : typeof Bar
diff --git a/tests/baselines/reference/recursiveObjectLiteral.types b/tests/baselines/reference/recursiveObjectLiteral.types
index 011532a005b..0dcc467977c 100644
--- a/tests/baselines/reference/recursiveObjectLiteral.types
+++ b/tests/baselines/reference/recursiveObjectLiteral.types
@@ -3,5 +3,5 @@ var a = { f: a };
 >a : any
 >{ f: a } : { f: any; }
 >f : any
->a : a
+>a : any
 
diff --git a/tests/baselines/reference/recursivelySpecializedConstructorDeclaration.types b/tests/baselines/reference/recursivelySpecializedConstructorDeclaration.types
index bccd226ceba..37840c44da6 100644
--- a/tests/baselines/reference/recursivelySpecializedConstructorDeclaration.types
+++ b/tests/baselines/reference/recursivelySpecializedConstructorDeclaration.types
@@ -1,9 +1,9 @@
 === tests/cases/compiler/recursivelySpecializedConstructorDeclaration.ts ===
 module MsPortal.Controls.Base.ItemList {
->MsPortal : typeof MsPortal
->Controls : typeof Controls
->Base : typeof Base
->ItemList : typeof ItemList
+>MsPortal : MsPortal
+>Controls : Controls
+>Base : Base
+>ItemList : ItemList
 
     export interface Interface<TValue> {
 >Interface : Interface<TValue>
diff --git a/tests/baselines/reference/requireEmitSemicolon.types b/tests/baselines/reference/requireEmitSemicolon.types
index 8f8d22e0f08..5f35f6ee4f2 100644
--- a/tests/baselines/reference/requireEmitSemicolon.types
+++ b/tests/baselines/reference/requireEmitSemicolon.types
@@ -1,34 +1,34 @@
 === tests/cases/compiler/requireEmitSemicolon_1.ts ===
 ///<reference path='requireEmitSemicolon_0.ts'/>
 import P = require("requireEmitSemicolon_0"); // bug was we were not emitting a ; here and causing runtime failures in node
->P : typeof "tests/cases/compiler/requireEmitSemicolon_0"
+>P : P
 
 export module Database {
->Database : typeof Database
+>Database : Database
 
 	export class DB {
 >DB : DB
 
 	    public findPerson(id: number): P.Models.Person {
->findPerson : (id: number) => Person
+>findPerson : (id: number) => P.Models.Person
 >id : number
 >P : P
->Models : Models
->Person : Person
+>Models : P.Models
+>Person : P.Models.Person
 
 	        return new P.Models.Person("Rock");
->new P.Models.Person("Rock") : Person
->P.Models.Person : typeof Person
->P.Models : typeof Models
->P : typeof "tests/cases/compiler/requireEmitSemicolon_0"
->Models : typeof Models
->Person : typeof Person
+>new P.Models.Person("Rock") : P.Models.Person
+>P.Models.Person : typeof P.Models.Person
+>P.Models : typeof P.Models
+>P : typeof P
+>Models : typeof P.Models
+>Person : typeof P.Models.Person
 	    }
 	}
 } 
 === tests/cases/compiler/requireEmitSemicolon_0.ts ===
 export module Models {
->Models : typeof Models
+>Models : Models
 
 	export class Person {
 >Person : Person
diff --git a/tests/baselines/reference/resolvingClassDeclarationWhenInBaseTypeResolution.types b/tests/baselines/reference/resolvingClassDeclarationWhenInBaseTypeResolution.types
index 01e88e83e91..db60a7f845b 100644
--- a/tests/baselines/reference/resolvingClassDeclarationWhenInBaseTypeResolution.types
+++ b/tests/baselines/reference/resolvingClassDeclarationWhenInBaseTypeResolution.types
@@ -1,15 +1,15 @@
 === tests/cases/compiler/resolvingClassDeclarationWhenInBaseTypeResolution.ts ===
 module rionegrensis {
->rionegrensis : typeof rionegrensis
+>rionegrensis : rionegrensis
 
   export class caniventer extends Lanthanum.nitidus<petrophilus.minutilla, julianae.sumatrana> {
 >caniventer : caniventer
 >Lanthanum : Lanthanum
->nitidus : nitidus<T0, T1>
+>nitidus : Lanthanum.nitidus<T0, T1>
 >petrophilus : petrophilus
->minutilla : minutilla
+>minutilla : petrophilus.minutilla
 >julianae : julianae
->sumatrana : sumatrana
+>sumatrana : julianae.sumatrana
 
     salomonseni() : caniventer { var x : caniventer; () => { var y = this; }; return x; }
 >salomonseni : () => caniventer
@@ -22,191 +22,191 @@ module rionegrensis {
 >x : caniventer
 
     uchidai() : lavali.xanthognathus { var x : lavali.xanthognathus; () => { var y = this; }; return x; }
->uchidai : () => xanthognathus
+>uchidai : () => lavali.xanthognathus
 >lavali : lavali
->xanthognathus : xanthognathus
->x : xanthognathus
+>xanthognathus : lavali.xanthognathus
+>x : lavali.xanthognathus
 >lavali : lavali
->xanthognathus : xanthognathus
+>xanthognathus : lavali.xanthognathus
 >() => { var y = this; } : () => void
 >y : caniventer
 >this : caniventer
->x : xanthognathus
+>x : lavali.xanthognathus
 
     raffrayana() : lavali.otion { var x : lavali.otion; () => { var y = this; }; return x; }
->raffrayana : () => otion
+>raffrayana : () => lavali.otion
 >lavali : lavali
->otion : otion
->x : otion
+>otion : lavali.otion
+>x : lavali.otion
 >lavali : lavali
->otion : otion
+>otion : lavali.otion
 >() => { var y = this; } : () => void
 >y : caniventer
 >this : caniventer
->x : otion
+>x : lavali.otion
 
     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 : () => inez<inez<stolzmanni, melanops>, falconeri>
+>Uranium : () => minutus.inez<minutus.inez<sagitta.stolzmanni, dammermani.melanops>, trivirgatus.falconeri>
 >minutus : minutus
->inez : inez<T0, T1>
+>inez : minutus.inez<T0, T1>
 >minutus : minutus
->inez : inez<T0, T1>
+>inez : minutus.inez<T0, T1>
 >sagitta : sagitta
->stolzmanni : stolzmanni
+>stolzmanni : sagitta.stolzmanni
 >dammermani : dammermani
->melanops : melanops
+>melanops : dammermani.melanops
 >trivirgatus : trivirgatus
->falconeri : falconeri
->x : inez<inez<stolzmanni, melanops>, falconeri>
+>falconeri : trivirgatus.falconeri
+>x : minutus.inez<minutus.inez<sagitta.stolzmanni, dammermani.melanops>, trivirgatus.falconeri>
 >minutus : minutus
->inez : inez<T0, T1>
+>inez : minutus.inez<T0, T1>
 >minutus : minutus
->inez : inez<T0, T1>
+>inez : minutus.inez<T0, T1>
 >sagitta : sagitta
->stolzmanni : stolzmanni
+>stolzmanni : sagitta.stolzmanni
 >dammermani : dammermani
->melanops : melanops
+>melanops : dammermani.melanops
 >trivirgatus : trivirgatus
->falconeri : falconeri
+>falconeri : trivirgatus.falconeri
 >() => { var y = this; } : () => void
 >y : caniventer
 >this : caniventer
->x : inez<inez<stolzmanni, melanops>, falconeri>
+>x : minutus.inez<minutus.inez<sagitta.stolzmanni, dammermani.melanops>, trivirgatus.falconeri>
 
     nayaur() : gabriellae.amicus { var x : gabriellae.amicus; () => { var y = this; }; return x; }
->nayaur : () => amicus
+>nayaur : () => gabriellae.amicus
 >gabriellae : gabriellae
->amicus : amicus
->x : amicus
+>amicus : gabriellae.amicus
+>x : gabriellae.amicus
 >gabriellae : gabriellae
->amicus : amicus
+>amicus : gabriellae.amicus
 >() => { var y = this; } : () => void
 >y : caniventer
 >this : caniventer
->x : amicus
+>x : gabriellae.amicus
   }
   export class veraecrucis<T0, T1> extends trivirgatus.mixtus<gabriellae.amicus, lutreolus.punicus> {
 >veraecrucis : veraecrucis<T0, T1>
 >T0 : T0
 >T1 : T1
 >trivirgatus : trivirgatus
->mixtus : mixtus<T0, T1>
+>mixtus : trivirgatus.mixtus<T0, T1>
 >gabriellae : gabriellae
->amicus : amicus
+>amicus : gabriellae.amicus
 >lutreolus : lutreolus
->punicus : punicus
+>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 : () => setulosus<punicus, coludo<bobrinskoi, melanoleuca>>
+>naso : () => panamensis.setulosus<lutreolus.punicus, howi.coludo<quasiater.bobrinskoi, provocax.melanoleuca>>
 >panamensis : panamensis
->setulosus : setulosus<T0, T1>
+>setulosus : panamensis.setulosus<T0, T1>
 >lutreolus : lutreolus
->punicus : punicus
+>punicus : lutreolus.punicus
 >howi : howi
->coludo : coludo<T0, T1>
+>coludo : howi.coludo<T0, T1>
 >quasiater : quasiater
->bobrinskoi : bobrinskoi
+>bobrinskoi : quasiater.bobrinskoi
 >provocax : provocax
->melanoleuca : melanoleuca
->x : setulosus<punicus, coludo<bobrinskoi, melanoleuca>>
+>melanoleuca : provocax.melanoleuca
+>x : panamensis.setulosus<lutreolus.punicus, howi.coludo<quasiater.bobrinskoi, provocax.melanoleuca>>
 >panamensis : panamensis
->setulosus : setulosus<T0, T1>
+>setulosus : panamensis.setulosus<T0, T1>
 >lutreolus : lutreolus
->punicus : punicus
+>punicus : lutreolus.punicus
 >howi : howi
->coludo : coludo<T0, T1>
+>coludo : howi.coludo<T0, T1>
 >quasiater : quasiater
->bobrinskoi : bobrinskoi
+>bobrinskoi : quasiater.bobrinskoi
 >provocax : provocax
->melanoleuca : melanoleuca
+>melanoleuca : provocax.melanoleuca
 >() => { var y = this; } : () => void
 >y : veraecrucis<T0, T1>
 >this : veraecrucis<T0, T1>
->x : setulosus<punicus, coludo<bobrinskoi, melanoleuca>>
+>x : panamensis.setulosus<lutreolus.punicus, howi.coludo<quasiater.bobrinskoi, provocax.melanoleuca>>
 
     vancouverensis() : imperfecta.ciliolabrum<argurus.oreas, argurus.peninsulae> { var x : imperfecta.ciliolabrum<argurus.oreas, argurus.peninsulae>; () => { var y = this; }; return x; }
->vancouverensis : () => ciliolabrum<oreas, peninsulae>
+>vancouverensis : () => imperfecta.ciliolabrum<argurus.oreas, argurus.peninsulae>
 >imperfecta : imperfecta
->ciliolabrum : ciliolabrum<T0, T1>
+>ciliolabrum : imperfecta.ciliolabrum<T0, T1>
 >argurus : argurus
->oreas : oreas
+>oreas : argurus.oreas
 >argurus : argurus
->peninsulae : peninsulae
->x : ciliolabrum<oreas, peninsulae>
+>peninsulae : argurus.peninsulae
+>x : imperfecta.ciliolabrum<argurus.oreas, argurus.peninsulae>
 >imperfecta : imperfecta
->ciliolabrum : ciliolabrum<T0, T1>
+>ciliolabrum : imperfecta.ciliolabrum<T0, T1>
 >argurus : argurus
->oreas : oreas
+>oreas : argurus.oreas
 >argurus : argurus
->peninsulae : peninsulae
+>peninsulae : argurus.peninsulae
 >() => { var y = this; } : () => void
 >y : veraecrucis<T0, T1>
 >this : veraecrucis<T0, T1>
->x : ciliolabrum<oreas, peninsulae>
+>x : imperfecta.ciliolabrum<argurus.oreas, argurus.peninsulae>
 
     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 : () => gilbertii<linulus<lepturus, oreas>, cinereus<xanthognathus, oreas>>
+>africana : () => argurus.gilbertii<panamensis.linulus<lavali.lepturus, argurus.oreas>, sagitta.cinereus<lavali.xanthognathus, argurus.oreas>>
 >argurus : argurus
->gilbertii : gilbertii<T0, T1>
+>gilbertii : argurus.gilbertii<T0, T1>
 >panamensis : panamensis
->linulus : linulus<T0, T1>
+>linulus : panamensis.linulus<T0, T1>
 >lavali : lavali
->lepturus : lepturus
+>lepturus : lavali.lepturus
 >argurus : argurus
->oreas : oreas
+>oreas : argurus.oreas
 >sagitta : sagitta
->cinereus : cinereus<T0, T1>
+>cinereus : sagitta.cinereus<T0, T1>
 >lavali : lavali
->xanthognathus : xanthognathus
+>xanthognathus : lavali.xanthognathus
 >argurus : argurus
->oreas : oreas
->x : gilbertii<linulus<lepturus, oreas>, cinereus<xanthognathus, oreas>>
+>oreas : argurus.oreas
+>x : argurus.gilbertii<panamensis.linulus<lavali.lepturus, argurus.oreas>, sagitta.cinereus<lavali.xanthognathus, argurus.oreas>>
 >argurus : argurus
->gilbertii : gilbertii<T0, T1>
+>gilbertii : argurus.gilbertii<T0, T1>
 >panamensis : panamensis
->linulus : linulus<T0, T1>
+>linulus : panamensis.linulus<T0, T1>
 >lavali : lavali
->lepturus : lepturus
+>lepturus : lavali.lepturus
 >argurus : argurus
->oreas : oreas
+>oreas : argurus.oreas
 >sagitta : sagitta
->cinereus : cinereus<T0, T1>
+>cinereus : sagitta.cinereus<T0, T1>
 >lavali : lavali
->xanthognathus : xanthognathus
+>xanthognathus : lavali.xanthognathus
 >argurus : argurus
->oreas : oreas
+>oreas : argurus.oreas
 >() => { var y = this; } : () => void
 >y : veraecrucis<T0, T1>
 >this : veraecrucis<T0, T1>
->x : gilbertii<linulus<lepturus, oreas>, cinereus<xanthognathus, oreas>>
+>x : argurus.gilbertii<panamensis.linulus<lavali.lepturus, argurus.oreas>, sagitta.cinereus<lavali.xanthognathus, argurus.oreas>>
 
     palliolata() : Lanthanum.jugularis { var x : Lanthanum.jugularis; () => { var y = this; }; return x; }
->palliolata : () => jugularis
+>palliolata : () => Lanthanum.jugularis
 >Lanthanum : Lanthanum
->jugularis : jugularis
->x : jugularis
+>jugularis : Lanthanum.jugularis
+>x : Lanthanum.jugularis
 >Lanthanum : Lanthanum
->jugularis : jugularis
+>jugularis : Lanthanum.jugularis
 >() => { var y = this; } : () => void
 >y : veraecrucis<T0, T1>
 >this : veraecrucis<T0, T1>
->x : jugularis
+>x : Lanthanum.jugularis
 
     nivicola() : samarensis.pallidus { var x : samarensis.pallidus; () => { var y = this; }; return x; }
->nivicola : () => pallidus
+>nivicola : () => samarensis.pallidus
 >samarensis : samarensis
->pallidus : pallidus
->x : pallidus
+>pallidus : samarensis.pallidus
+>x : samarensis.pallidus
 >samarensis : samarensis
->pallidus : pallidus
+>pallidus : samarensis.pallidus
 >() => { var y = this; } : () => void
 >y : veraecrucis<T0, T1>
 >this : veraecrucis<T0, T1>
->x : pallidus
+>x : samarensis.pallidus
   }
 }
 module julianae {
->julianae : typeof julianae
+>julianae : julianae
 
   export class steerii {
 >steerii : steerii
@@ -215,191 +215,191 @@ module julianae {
 >nudicaudus : nudicaudus
 
     brandtii() : argurus.germaini { var x : argurus.germaini; () => { var y = this; }; return x; }
->brandtii : () => germaini
+>brandtii : () => argurus.germaini
 >argurus : argurus
->germaini : germaini
->x : germaini
+>germaini : argurus.germaini
+>x : argurus.germaini
 >argurus : argurus
->germaini : germaini
+>germaini : argurus.germaini
 >() => { var y = this; } : () => void
 >y : nudicaudus
 >this : nudicaudus
->x : germaini
+>x : argurus.germaini
 
     maxwellii() : ruatanica.Praseodymium<Lanthanum.jugularis, dammermani.melanops> { var x : ruatanica.Praseodymium<Lanthanum.jugularis, dammermani.melanops>; () => { var y = this; }; return x; }
->maxwellii : () => Praseodymium<jugularis, melanops>
+>maxwellii : () => ruatanica.Praseodymium<Lanthanum.jugularis, dammermani.melanops>
 >ruatanica : ruatanica
->Praseodymium : Praseodymium<T0, T1>
+>Praseodymium : ruatanica.Praseodymium<T0, T1>
 >Lanthanum : Lanthanum
->jugularis : jugularis
+>jugularis : Lanthanum.jugularis
 >dammermani : dammermani
->melanops : melanops
->x : Praseodymium<jugularis, melanops>
+>melanops : dammermani.melanops
+>x : ruatanica.Praseodymium<Lanthanum.jugularis, dammermani.melanops>
 >ruatanica : ruatanica
->Praseodymium : Praseodymium<T0, T1>
+>Praseodymium : ruatanica.Praseodymium<T0, T1>
 >Lanthanum : Lanthanum
->jugularis : jugularis
+>jugularis : Lanthanum.jugularis
 >dammermani : dammermani
->melanops : melanops
+>melanops : dammermani.melanops
 >() => { var y = this; } : () => void
 >y : nudicaudus
 >this : nudicaudus
->x : Praseodymium<jugularis, melanops>
+>x : ruatanica.Praseodymium<Lanthanum.jugularis, dammermani.melanops>
 
     endoi() : panglima.abidi<dogramacii.kaiseri, lavali.wilsoni> { var x : panglima.abidi<dogramacii.kaiseri, lavali.wilsoni>; () => { var y = this; }; return x; }
->endoi : () => abidi<kaiseri, wilsoni>
+>endoi : () => panglima.abidi<dogramacii.kaiseri, lavali.wilsoni>
 >panglima : panglima
->abidi : abidi<T0, T1>
+>abidi : panglima.abidi<T0, T1>
 >dogramacii : dogramacii
->kaiseri : kaiseri
+>kaiseri : dogramacii.kaiseri
 >lavali : lavali
->wilsoni : wilsoni
->x : abidi<kaiseri, wilsoni>
+>wilsoni : lavali.wilsoni
+>x : panglima.abidi<dogramacii.kaiseri, lavali.wilsoni>
 >panglima : panglima
->abidi : abidi<T0, T1>
+>abidi : panglima.abidi<T0, T1>
 >dogramacii : dogramacii
->kaiseri : kaiseri
+>kaiseri : dogramacii.kaiseri
 >lavali : lavali
->wilsoni : wilsoni
+>wilsoni : lavali.wilsoni
 >() => { var y = this; } : () => void
 >y : nudicaudus
 >this : nudicaudus
->x : abidi<kaiseri, wilsoni>
+>x : panglima.abidi<dogramacii.kaiseri, lavali.wilsoni>
 
     venezuelae() : howi.marcanoi { var x : howi.marcanoi; () => { var y = this; }; return x; }
->venezuelae : () => marcanoi
+>venezuelae : () => howi.marcanoi
 >howi : howi
->marcanoi : marcanoi
->x : marcanoi
+>marcanoi : howi.marcanoi
+>x : howi.marcanoi
 >howi : howi
->marcanoi : marcanoi
+>marcanoi : howi.marcanoi
 >() => { var y = this; } : () => void
 >y : nudicaudus
 >this : nudicaudus
->x : marcanoi
+>x : howi.marcanoi
 
     zamicrus() : rionegrensis.caniventer { var x : rionegrensis.caniventer; () => { var y = this; }; return x; }
->zamicrus : () => caniventer
+>zamicrus : () => rionegrensis.caniventer
 >rionegrensis : rionegrensis
->caniventer : caniventer
->x : caniventer
+>caniventer : rionegrensis.caniventer
+>x : rionegrensis.caniventer
 >rionegrensis : rionegrensis
->caniventer : caniventer
+>caniventer : rionegrensis.caniventer
 >() => { var y = this; } : () => void
 >y : nudicaudus
 >this : nudicaudus
->x : caniventer
+>x : rionegrensis.caniventer
   }
   export class galapagoensis {
 >galapagoensis : galapagoensis
 
     isabellae() : panglima.amphibius<macrorhinos.daphaenodon, patas.uralensis> { var x : panglima.amphibius<macrorhinos.daphaenodon, patas.uralensis>; () => { var y = this; }; return x; }
->isabellae : () => amphibius<daphaenodon, uralensis>
+>isabellae : () => panglima.amphibius<macrorhinos.daphaenodon, patas.uralensis>
 >panglima : panglima
->amphibius : amphibius<T0, T1>
+>amphibius : panglima.amphibius<T0, T1>
 >macrorhinos : macrorhinos
->daphaenodon : daphaenodon
+>daphaenodon : macrorhinos.daphaenodon
 >patas : patas
->uralensis : uralensis
->x : amphibius<daphaenodon, uralensis>
+>uralensis : patas.uralensis
+>x : panglima.amphibius<macrorhinos.daphaenodon, patas.uralensis>
 >panglima : panglima
->amphibius : amphibius<T0, T1>
+>amphibius : panglima.amphibius<T0, T1>
 >macrorhinos : macrorhinos
->daphaenodon : daphaenodon
+>daphaenodon : macrorhinos.daphaenodon
 >patas : patas
->uralensis : uralensis
+>uralensis : patas.uralensis
 >() => { var y = this; } : () => void
 >y : galapagoensis
 >this : galapagoensis
->x : amphibius<daphaenodon, uralensis>
+>x : panglima.amphibius<macrorhinos.daphaenodon, patas.uralensis>
 
     rueppellii() : ruatanica.americanus { var x : ruatanica.americanus; () => { var y = this; }; return x; }
->rueppellii : () => americanus
+>rueppellii : () => ruatanica.americanus
 >ruatanica : ruatanica
->americanus : americanus
->x : americanus
+>americanus : ruatanica.americanus
+>x : ruatanica.americanus
 >ruatanica : ruatanica
->americanus : americanus
+>americanus : ruatanica.americanus
 >() => { var y = this; } : () => void
 >y : galapagoensis
 >this : galapagoensis
->x : americanus
+>x : ruatanica.americanus
 
     peregusna() : dogramacii.kaiseri { var x : dogramacii.kaiseri; () => { var y = this; }; return x; }
->peregusna : () => kaiseri
+>peregusna : () => dogramacii.kaiseri
 >dogramacii : dogramacii
->kaiseri : kaiseri
->x : kaiseri
+>kaiseri : dogramacii.kaiseri
+>x : dogramacii.kaiseri
 >dogramacii : dogramacii
->kaiseri : kaiseri
+>kaiseri : dogramacii.kaiseri
 >() => { var y = this; } : () => void
 >y : galapagoensis
 >this : galapagoensis
->x : kaiseri
+>x : dogramacii.kaiseri
 
     gliroides() : howi.coludo<howi.marcanoi, lavali.wilsoni> { var x : howi.coludo<howi.marcanoi, lavali.wilsoni>; () => { var y = this; }; return x; }
->gliroides : () => coludo<marcanoi, wilsoni>
+>gliroides : () => howi.coludo<howi.marcanoi, lavali.wilsoni>
 >howi : howi
->coludo : coludo<T0, T1>
+>coludo : howi.coludo<T0, T1>
 >howi : howi
->marcanoi : marcanoi
+>marcanoi : howi.marcanoi
 >lavali : lavali
->wilsoni : wilsoni
->x : coludo<marcanoi, wilsoni>
+>wilsoni : lavali.wilsoni
+>x : howi.coludo<howi.marcanoi, lavali.wilsoni>
 >howi : howi
->coludo : coludo<T0, T1>
+>coludo : howi.coludo<T0, T1>
 >howi : howi
->marcanoi : marcanoi
+>marcanoi : howi.marcanoi
 >lavali : lavali
->wilsoni : wilsoni
+>wilsoni : lavali.wilsoni
 >() => { var y = this; } : () => void
 >y : galapagoensis
 >this : galapagoensis
->x : coludo<marcanoi, wilsoni>
+>x : howi.coludo<howi.marcanoi, lavali.wilsoni>
 
     banakrisi() : macrorhinos.daphaenodon { var x : macrorhinos.daphaenodon; () => { var y = this; }; return x; }
->banakrisi : () => daphaenodon
+>banakrisi : () => macrorhinos.daphaenodon
 >macrorhinos : macrorhinos
->daphaenodon : daphaenodon
->x : daphaenodon
+>daphaenodon : macrorhinos.daphaenodon
+>x : macrorhinos.daphaenodon
 >macrorhinos : macrorhinos
->daphaenodon : daphaenodon
+>daphaenodon : macrorhinos.daphaenodon
 >() => { var y = this; } : () => void
 >y : galapagoensis
 >this : galapagoensis
->x : daphaenodon
+>x : macrorhinos.daphaenodon
 
     rozendaali() : lutreolus.foina { var x : lutreolus.foina; () => { var y = this; }; return x; }
->rozendaali : () => foina
+>rozendaali : () => lutreolus.foina
 >lutreolus : lutreolus
->foina : foina
->x : foina
+>foina : lutreolus.foina
+>x : lutreolus.foina
 >lutreolus : lutreolus
->foina : foina
+>foina : lutreolus.foina
 >() => { var y = this; } : () => void
 >y : galapagoensis
 >this : galapagoensis
->x : foina
+>x : lutreolus.foina
 
     stuhlmanni() : panamensis.linulus<caurinus.megaphyllus, caurinus.megaphyllus> { var x : panamensis.linulus<caurinus.megaphyllus, caurinus.megaphyllus>; () => { var y = this; }; return x; }
->stuhlmanni : () => linulus<megaphyllus, megaphyllus>
+>stuhlmanni : () => panamensis.linulus<caurinus.megaphyllus, caurinus.megaphyllus>
 >panamensis : panamensis
->linulus : linulus<T0, T1>
+>linulus : panamensis.linulus<T0, T1>
 >caurinus : caurinus
->megaphyllus : megaphyllus
+>megaphyllus : caurinus.megaphyllus
 >caurinus : caurinus
->megaphyllus : megaphyllus
->x : linulus<megaphyllus, megaphyllus>
+>megaphyllus : caurinus.megaphyllus
+>x : panamensis.linulus<caurinus.megaphyllus, caurinus.megaphyllus>
 >panamensis : panamensis
->linulus : linulus<T0, T1>
+>linulus : panamensis.linulus<T0, T1>
 >caurinus : caurinus
->megaphyllus : megaphyllus
+>megaphyllus : caurinus.megaphyllus
 >caurinus : caurinus
->megaphyllus : megaphyllus
+>megaphyllus : caurinus.megaphyllus
 >() => { var y = this; } : () => void
 >y : galapagoensis
 >this : galapagoensis
->x : linulus<megaphyllus, megaphyllus>
+>x : panamensis.linulus<caurinus.megaphyllus, caurinus.megaphyllus>
   }
   export class albidens<T0, T1> {
 >albidens : albidens<T0, T1>
@@ -407,32 +407,32 @@ module julianae {
 >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 : () => fuscus<wilsoni, sarasinorum<jugularis, subspinosus>>
+>mattheyi : () => samarensis.fuscus<lavali.wilsoni, chrysaeolus.sarasinorum<Lanthanum.jugularis, imperfecta.subspinosus>>
 >samarensis : samarensis
->fuscus : fuscus<T0, T1>
+>fuscus : samarensis.fuscus<T0, T1>
 >lavali : lavali
->wilsoni : wilsoni
+>wilsoni : lavali.wilsoni
 >chrysaeolus : chrysaeolus
->sarasinorum : sarasinorum<T0, T1>
+>sarasinorum : chrysaeolus.sarasinorum<T0, T1>
 >Lanthanum : Lanthanum
->jugularis : jugularis
+>jugularis : Lanthanum.jugularis
 >imperfecta : imperfecta
->subspinosus : subspinosus
->x : fuscus<wilsoni, sarasinorum<jugularis, subspinosus>>
+>subspinosus : imperfecta.subspinosus
+>x : samarensis.fuscus<lavali.wilsoni, chrysaeolus.sarasinorum<Lanthanum.jugularis, imperfecta.subspinosus>>
 >samarensis : samarensis
->fuscus : fuscus<T0, T1>
+>fuscus : samarensis.fuscus<T0, T1>
 >lavali : lavali
->wilsoni : wilsoni
+>wilsoni : lavali.wilsoni
 >chrysaeolus : chrysaeolus
->sarasinorum : sarasinorum<T0, T1>
+>sarasinorum : chrysaeolus.sarasinorum<T0, T1>
 >Lanthanum : Lanthanum
->jugularis : jugularis
+>jugularis : Lanthanum.jugularis
 >imperfecta : imperfecta
->subspinosus : subspinosus
+>subspinosus : imperfecta.subspinosus
 >() => { var y = this; } : () => void
 >y : albidens<T0, T1>
 >this : albidens<T0, T1>
->x : fuscus<wilsoni, sarasinorum<jugularis, subspinosus>>
+>x : samarensis.fuscus<lavali.wilsoni, chrysaeolus.sarasinorum<Lanthanum.jugularis, imperfecta.subspinosus>>
 
     Astatine() : steerii { var x : steerii; () => { var y = this; }; return x; }
 >Astatine : () => steerii
@@ -445,36 +445,36 @@ module julianae {
 >x : steerii
 
     vincenti() : argurus.dauricus<macrorhinos.konganensis, patas.uralensis> { var x : argurus.dauricus<macrorhinos.konganensis, patas.uralensis>; () => { var y = this; }; return x; }
->vincenti : () => dauricus<konganensis, uralensis>
+>vincenti : () => argurus.dauricus<macrorhinos.konganensis, patas.uralensis>
 >argurus : argurus
->dauricus : dauricus<T0, T1>
+>dauricus : argurus.dauricus<T0, T1>
 >macrorhinos : macrorhinos
->konganensis : konganensis
+>konganensis : macrorhinos.konganensis
 >patas : patas
->uralensis : uralensis
->x : dauricus<konganensis, uralensis>
+>uralensis : patas.uralensis
+>x : argurus.dauricus<macrorhinos.konganensis, patas.uralensis>
 >argurus : argurus
->dauricus : dauricus<T0, T1>
+>dauricus : argurus.dauricus<T0, T1>
 >macrorhinos : macrorhinos
->konganensis : konganensis
+>konganensis : macrorhinos.konganensis
 >patas : patas
->uralensis : uralensis
+>uralensis : patas.uralensis
 >() => { var y = this; } : () => void
 >y : albidens<T0, T1>
 >this : albidens<T0, T1>
->x : dauricus<konganensis, uralensis>
+>x : argurus.dauricus<macrorhinos.konganensis, patas.uralensis>
 
     hirta() : Lanthanum.jugularis { var x : Lanthanum.jugularis; () => { var y = this; }; return x; }
->hirta : () => jugularis
+>hirta : () => Lanthanum.jugularis
 >Lanthanum : Lanthanum
->jugularis : jugularis
->x : jugularis
+>jugularis : Lanthanum.jugularis
+>x : Lanthanum.jugularis
 >Lanthanum : Lanthanum
->jugularis : jugularis
+>jugularis : Lanthanum.jugularis
 >() => { var y = this; } : () => void
 >y : albidens<T0, T1>
 >this : albidens<T0, T1>
->x : jugularis
+>x : Lanthanum.jugularis
 
     virginianus() : durangae { var x : durangae; () => { var y = this; }; return x; }
 >virginianus : () => durangae
@@ -487,137 +487,137 @@ module julianae {
 >x : durangae
 
     macrophyllum() : howi.marcanoi { var x : howi.marcanoi; () => { var y = this; }; return x; }
->macrophyllum : () => marcanoi
+>macrophyllum : () => howi.marcanoi
 >howi : howi
->marcanoi : marcanoi
->x : marcanoi
+>marcanoi : howi.marcanoi
+>x : howi.marcanoi
 >howi : howi
->marcanoi : marcanoi
+>marcanoi : howi.marcanoi
 >() => { var y = this; } : () => void
 >y : albidens<T0, T1>
 >this : albidens<T0, T1>
->x : marcanoi
+>x : howi.marcanoi
 
     porcellus() : ruatanica.americanus { var x : ruatanica.americanus; () => { var y = this; }; return x; }
->porcellus : () => americanus
+>porcellus : () => ruatanica.americanus
 >ruatanica : ruatanica
->americanus : americanus
->x : americanus
+>americanus : ruatanica.americanus
+>x : ruatanica.americanus
 >ruatanica : ruatanica
->americanus : americanus
+>americanus : ruatanica.americanus
 >() => { var y = this; } : () => void
 >y : albidens<T0, T1>
 >this : albidens<T0, T1>
->x : americanus
+>x : ruatanica.americanus
   }
   export class oralis<T0, T1> extends caurinus.psilurus {
 >oralis : oralis<T0, T1>
 >T0 : T0
 >T1 : T1
 >caurinus : caurinus
->psilurus : psilurus
+>psilurus : caurinus.psilurus
 
     cepapi() : caurinus.psilurus { var x : caurinus.psilurus; () => { var y = this; }; return x; }
->cepapi : () => psilurus
+>cepapi : () => caurinus.psilurus
 >caurinus : caurinus
->psilurus : psilurus
->x : psilurus
+>psilurus : caurinus.psilurus
+>x : caurinus.psilurus
 >caurinus : caurinus
->psilurus : psilurus
+>psilurus : caurinus.psilurus
 >() => { var y = this; } : () => void
 >y : oralis<T0, T1>
 >this : oralis<T0, T1>
->x : psilurus
+>x : caurinus.psilurus
 
     porteri() : lavali.thaeleri { var x : lavali.thaeleri; () => { var y = this; }; return x; }
->porteri : () => thaeleri
+>porteri : () => lavali.thaeleri
 >lavali : lavali
->thaeleri : thaeleri
->x : thaeleri
+>thaeleri : lavali.thaeleri
+>x : lavali.thaeleri
 >lavali : lavali
->thaeleri : thaeleri
+>thaeleri : lavali.thaeleri
 >() => { var y = this; } : () => void
 >y : oralis<T0, T1>
 >this : oralis<T0, T1>
->x : thaeleri
+>x : lavali.thaeleri
 
     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 : () => mahaganus<amicus, amphibius<daphaenodon, uralensis>>
+>bindi : () => caurinus.mahaganus<gabriellae.amicus, panglima.amphibius<macrorhinos.daphaenodon, patas.uralensis>>
 >caurinus : caurinus
->mahaganus : mahaganus<T0, T1>
+>mahaganus : caurinus.mahaganus<T0, T1>
 >gabriellae : gabriellae
->amicus : amicus
+>amicus : gabriellae.amicus
 >panglima : panglima
->amphibius : amphibius<T0, T1>
+>amphibius : panglima.amphibius<T0, T1>
 >macrorhinos : macrorhinos
->daphaenodon : daphaenodon
+>daphaenodon : macrorhinos.daphaenodon
 >patas : patas
->uralensis : uralensis
->x : mahaganus<amicus, amphibius<daphaenodon, uralensis>>
+>uralensis : patas.uralensis
+>x : caurinus.mahaganus<gabriellae.amicus, panglima.amphibius<macrorhinos.daphaenodon, patas.uralensis>>
 >caurinus : caurinus
->mahaganus : mahaganus<T0, T1>
+>mahaganus : caurinus.mahaganus<T0, T1>
 >gabriellae : gabriellae
->amicus : amicus
+>amicus : gabriellae.amicus
 >panglima : panglima
->amphibius : amphibius<T0, T1>
+>amphibius : panglima.amphibius<T0, T1>
 >macrorhinos : macrorhinos
->daphaenodon : daphaenodon
+>daphaenodon : macrorhinos.daphaenodon
 >patas : patas
->uralensis : uralensis
+>uralensis : patas.uralensis
 >() => { var y = this; } : () => void
 >y : oralis<T0, T1>
 >this : oralis<T0, T1>
->x : mahaganus<amicus, amphibius<daphaenodon, uralensis>>
+>x : caurinus.mahaganus<gabriellae.amicus, panglima.amphibius<macrorhinos.daphaenodon, patas.uralensis>>
 
     puda() : sagitta.stolzmanni { var x : sagitta.stolzmanni; () => { var y = this; }; return x; }
->puda : () => stolzmanni
+>puda : () => sagitta.stolzmanni
 >sagitta : sagitta
->stolzmanni : stolzmanni
->x : stolzmanni
+>stolzmanni : sagitta.stolzmanni
+>x : sagitta.stolzmanni
 >sagitta : sagitta
->stolzmanni : stolzmanni
+>stolzmanni : sagitta.stolzmanni
 >() => { var y = this; } : () => void
 >y : oralis<T0, T1>
 >this : oralis<T0, T1>
->x : stolzmanni
+>x : sagitta.stolzmanni
 
     mindorensis() : trivirgatus.falconeri { var x : trivirgatus.falconeri; () => { var y = this; }; return x; }
->mindorensis : () => falconeri
+>mindorensis : () => trivirgatus.falconeri
 >trivirgatus : trivirgatus
->falconeri : falconeri
->x : falconeri
+>falconeri : trivirgatus.falconeri
+>x : trivirgatus.falconeri
 >trivirgatus : trivirgatus
->falconeri : falconeri
+>falconeri : trivirgatus.falconeri
 >() => { var y = this; } : () => void
 >y : oralis<T0, T1>
 >this : oralis<T0, T1>
->x : falconeri
+>x : trivirgatus.falconeri
 
     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 : () => rosalia<setulosus<echinatus, steerii>, wilsoni>
+>ignitus : () => petrophilus.rosalia<panamensis.setulosus<gabriellae.echinatus, steerii>, lavali.wilsoni>
 >petrophilus : petrophilus
->rosalia : rosalia<T0, T1>
+>rosalia : petrophilus.rosalia<T0, T1>
 >panamensis : panamensis
->setulosus : setulosus<T0, T1>
+>setulosus : panamensis.setulosus<T0, T1>
 >gabriellae : gabriellae
->echinatus : echinatus
+>echinatus : gabriellae.echinatus
 >steerii : steerii
 >lavali : lavali
->wilsoni : wilsoni
->x : rosalia<setulosus<echinatus, steerii>, wilsoni>
+>wilsoni : lavali.wilsoni
+>x : petrophilus.rosalia<panamensis.setulosus<gabriellae.echinatus, steerii>, lavali.wilsoni>
 >petrophilus : petrophilus
->rosalia : rosalia<T0, T1>
+>rosalia : petrophilus.rosalia<T0, T1>
 >panamensis : panamensis
->setulosus : setulosus<T0, T1>
+>setulosus : panamensis.setulosus<T0, T1>
 >gabriellae : gabriellae
->echinatus : echinatus
+>echinatus : gabriellae.echinatus
 >steerii : steerii
 >lavali : lavali
->wilsoni : wilsoni
+>wilsoni : lavali.wilsoni
 >() => { var y = this; } : () => void
 >y : oralis<T0, T1>
 >this : oralis<T0, T1>
->x : rosalia<setulosus<echinatus, steerii>, wilsoni>
+>x : petrophilus.rosalia<panamensis.setulosus<gabriellae.echinatus, steerii>, lavali.wilsoni>
 
     rufus() : nudicaudus { var x : nudicaudus; () => { var y = this; }; return x; }
 >rufus : () => nudicaudus
@@ -630,255 +630,255 @@ module julianae {
 >x : nudicaudus
 
     monax() : imperfecta.subspinosus { var x : imperfecta.subspinosus; () => { var y = this; }; return x; }
->monax : () => subspinosus
+>monax : () => imperfecta.subspinosus
 >imperfecta : imperfecta
->subspinosus : subspinosus
->x : subspinosus
+>subspinosus : imperfecta.subspinosus
+>x : imperfecta.subspinosus
 >imperfecta : imperfecta
->subspinosus : subspinosus
+>subspinosus : imperfecta.subspinosus
 >() => { var y = this; } : () => void
 >y : oralis<T0, T1>
 >this : oralis<T0, T1>
->x : subspinosus
+>x : imperfecta.subspinosus
 
     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 : () => inez<moojeni<amphibius<falconeri, psilurus>, echinatus>, aurata>
+>unalascensis : () => minutus.inez<rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>, dogramacii.aurata>
 >minutus : minutus
->inez : inez<T0, T1>
+>inez : minutus.inez<T0, T1>
 >rendalli : rendalli
->moojeni : moojeni<T0, T1>
+>moojeni : rendalli.moojeni<T0, T1>
 >panglima : panglima
->amphibius : amphibius<T0, T1>
+>amphibius : panglima.amphibius<T0, T1>
 >trivirgatus : trivirgatus
->falconeri : falconeri
+>falconeri : trivirgatus.falconeri
 >caurinus : caurinus
->psilurus : psilurus
+>psilurus : caurinus.psilurus
 >gabriellae : gabriellae
->echinatus : echinatus
+>echinatus : gabriellae.echinatus
 >dogramacii : dogramacii
->aurata : aurata
->x : inez<moojeni<amphibius<falconeri, psilurus>, echinatus>, aurata>
+>aurata : dogramacii.aurata
+>x : minutus.inez<rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>, dogramacii.aurata>
 >minutus : minutus
->inez : inez<T0, T1>
+>inez : minutus.inez<T0, T1>
 >rendalli : rendalli
->moojeni : moojeni<T0, T1>
+>moojeni : rendalli.moojeni<T0, T1>
 >panglima : panglima
->amphibius : amphibius<T0, T1>
+>amphibius : panglima.amphibius<T0, T1>
 >trivirgatus : trivirgatus
->falconeri : falconeri
+>falconeri : trivirgatus.falconeri
 >caurinus : caurinus
->psilurus : psilurus
+>psilurus : caurinus.psilurus
 >gabriellae : gabriellae
->echinatus : echinatus
+>echinatus : gabriellae.echinatus
 >dogramacii : dogramacii
->aurata : aurata
+>aurata : dogramacii.aurata
 >() => { var y = this; } : () => void
 >y : oralis<T0, T1>
 >this : oralis<T0, T1>
->x : inez<moojeni<amphibius<falconeri, psilurus>, echinatus>, aurata>
+>x : minutus.inez<rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>, dogramacii.aurata>
 
     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 : () => angulatus<coludo<carolinensis, portoricensis>, minutilla>
+>wuchihensis : () => howi.angulatus<howi.coludo<quasiater.carolinensis, minutus.portoricensis>, petrophilus.minutilla>
 >howi : howi
->angulatus : angulatus<T0, T1>
+>angulatus : howi.angulatus<T0, T1>
 >howi : howi
->coludo : coludo<T0, T1>
+>coludo : howi.coludo<T0, T1>
 >quasiater : quasiater
->carolinensis : carolinensis
+>carolinensis : quasiater.carolinensis
 >minutus : minutus
->portoricensis : portoricensis
+>portoricensis : minutus.portoricensis
 >petrophilus : petrophilus
->minutilla : minutilla
->x : angulatus<coludo<carolinensis, portoricensis>, minutilla>
+>minutilla : petrophilus.minutilla
+>x : howi.angulatus<howi.coludo<quasiater.carolinensis, minutus.portoricensis>, petrophilus.minutilla>
 >howi : howi
->angulatus : angulatus<T0, T1>
+>angulatus : howi.angulatus<T0, T1>
 >howi : howi
->coludo : coludo<T0, T1>
+>coludo : howi.coludo<T0, T1>
 >quasiater : quasiater
->carolinensis : carolinensis
+>carolinensis : quasiater.carolinensis
 >minutus : minutus
->portoricensis : portoricensis
+>portoricensis : minutus.portoricensis
 >petrophilus : petrophilus
->minutilla : minutilla
+>minutilla : petrophilus.minutilla
 >() => { var y = this; } : () => void
 >y : oralis<T0, T1>
 >this : oralis<T0, T1>
->x : angulatus<coludo<carolinensis, portoricensis>, minutilla>
+>x : howi.angulatus<howi.coludo<quasiater.carolinensis, minutus.portoricensis>, petrophilus.minutilla>
 
     leucippe() : lavali.otion { var x : lavali.otion; () => { var y = this; }; return x; }
->leucippe : () => otion
+>leucippe : () => lavali.otion
 >lavali : lavali
->otion : otion
->x : otion
+>otion : lavali.otion
+>x : lavali.otion
 >lavali : lavali
->otion : otion
+>otion : lavali.otion
 >() => { var y = this; } : () => void
 >y : oralis<T0, T1>
 >this : oralis<T0, T1>
->x : otion
+>x : lavali.otion
 
     ordii() : daubentonii.arboreus<argurus.germaini, sagitta.stolzmanni> { var x : daubentonii.arboreus<argurus.germaini, sagitta.stolzmanni>; () => { var y = this; }; return x; }
->ordii : () => arboreus<germaini, stolzmanni>
+>ordii : () => daubentonii.arboreus<argurus.germaini, sagitta.stolzmanni>
 >daubentonii : daubentonii
->arboreus : arboreus<T0, T1>
+>arboreus : daubentonii.arboreus<T0, T1>
 >argurus : argurus
->germaini : germaini
+>germaini : argurus.germaini
 >sagitta : sagitta
->stolzmanni : stolzmanni
->x : arboreus<germaini, stolzmanni>
+>stolzmanni : sagitta.stolzmanni
+>x : daubentonii.arboreus<argurus.germaini, sagitta.stolzmanni>
 >daubentonii : daubentonii
->arboreus : arboreus<T0, T1>
+>arboreus : daubentonii.arboreus<T0, T1>
 >argurus : argurus
->germaini : germaini
+>germaini : argurus.germaini
 >sagitta : sagitta
->stolzmanni : stolzmanni
+>stolzmanni : sagitta.stolzmanni
 >() => { var y = this; } : () => void
 >y : oralis<T0, T1>
 >this : oralis<T0, T1>
->x : arboreus<germaini, stolzmanni>
+>x : daubentonii.arboreus<argurus.germaini, sagitta.stolzmanni>
 
     eisentrauti() : rendalli.zuluensis { var x : rendalli.zuluensis; () => { var y = this; }; return x; }
->eisentrauti : () => zuluensis
+>eisentrauti : () => rendalli.zuluensis
 >rendalli : rendalli
->zuluensis : zuluensis
->x : zuluensis
+>zuluensis : rendalli.zuluensis
+>x : rendalli.zuluensis
 >rendalli : rendalli
->zuluensis : zuluensis
+>zuluensis : rendalli.zuluensis
 >() => { var y = this; } : () => void
 >y : oralis<T0, T1>
 >this : oralis<T0, T1>
->x : zuluensis
+>x : rendalli.zuluensis
   }
   export class sumatrana extends Lanthanum.jugularis {
 >sumatrana : sumatrana
 >Lanthanum : Lanthanum
->jugularis : jugularis
+>jugularis : Lanthanum.jugularis
 
     wolffsohni() : Lanthanum.suillus<dammermani.melanops, quasiater.carolinensis> { var x : Lanthanum.suillus<dammermani.melanops, quasiater.carolinensis>; () => { var y = this; }; return x; }
->wolffsohni : () => suillus<melanops, carolinensis>
+>wolffsohni : () => Lanthanum.suillus<dammermani.melanops, quasiater.carolinensis>
 >Lanthanum : Lanthanum
->suillus : suillus<T0, T1>
+>suillus : Lanthanum.suillus<T0, T1>
 >dammermani : dammermani
->melanops : melanops
+>melanops : dammermani.melanops
 >quasiater : quasiater
->carolinensis : carolinensis
->x : suillus<melanops, carolinensis>
+>carolinensis : quasiater.carolinensis
+>x : Lanthanum.suillus<dammermani.melanops, quasiater.carolinensis>
 >Lanthanum : Lanthanum
->suillus : suillus<T0, T1>
+>suillus : Lanthanum.suillus<T0, T1>
 >dammermani : dammermani
->melanops : melanops
+>melanops : dammermani.melanops
 >quasiater : quasiater
->carolinensis : carolinensis
+>carolinensis : quasiater.carolinensis
 >() => { var y = this; } : () => void
 >y : sumatrana
 >this : sumatrana
->x : suillus<melanops, carolinensis>
+>x : Lanthanum.suillus<dammermani.melanops, quasiater.carolinensis>
 
     geata() : ruatanica.hector<sumatrana, quasiater.bobrinskoi> { var x : ruatanica.hector<sumatrana, quasiater.bobrinskoi>; () => { var y = this; }; return x; }
->geata : () => hector<sumatrana, bobrinskoi>
+>geata : () => ruatanica.hector<sumatrana, quasiater.bobrinskoi>
 >ruatanica : ruatanica
->hector : hector<T0, T1>
+>hector : ruatanica.hector<T0, T1>
 >sumatrana : sumatrana
 >quasiater : quasiater
->bobrinskoi : bobrinskoi
->x : hector<sumatrana, bobrinskoi>
+>bobrinskoi : quasiater.bobrinskoi
+>x : ruatanica.hector<sumatrana, quasiater.bobrinskoi>
 >ruatanica : ruatanica
->hector : hector<T0, T1>
+>hector : ruatanica.hector<T0, T1>
 >sumatrana : sumatrana
 >quasiater : quasiater
->bobrinskoi : bobrinskoi
+>bobrinskoi : quasiater.bobrinskoi
 >() => { var y = this; } : () => void
 >y : sumatrana
 >this : sumatrana
->x : hector<sumatrana, bobrinskoi>
+>x : ruatanica.hector<sumatrana, quasiater.bobrinskoi>
 
     awashensis() : petrophilus.minutilla { var x : petrophilus.minutilla; () => { var y = this; }; return x; }
->awashensis : () => minutilla
+>awashensis : () => petrophilus.minutilla
 >petrophilus : petrophilus
->minutilla : minutilla
->x : minutilla
+>minutilla : petrophilus.minutilla
+>x : petrophilus.minutilla
 >petrophilus : petrophilus
->minutilla : minutilla
+>minutilla : petrophilus.minutilla
 >() => { var y = this; } : () => void
 >y : sumatrana
 >this : sumatrana
->x : minutilla
+>x : petrophilus.minutilla
 
     sturdeei() : lutreolus.cor<Lanthanum.jugularis, galapagoensis> { var x : lutreolus.cor<Lanthanum.jugularis, galapagoensis>; () => { var y = this; }; return x; }
->sturdeei : () => cor<jugularis, galapagoensis>
+>sturdeei : () => lutreolus.cor<Lanthanum.jugularis, galapagoensis>
 >lutreolus : lutreolus
->cor : cor<T0, T1>
+>cor : lutreolus.cor<T0, T1>
 >Lanthanum : Lanthanum
->jugularis : jugularis
+>jugularis : Lanthanum.jugularis
 >galapagoensis : galapagoensis
->x : cor<jugularis, galapagoensis>
+>x : lutreolus.cor<Lanthanum.jugularis, galapagoensis>
 >lutreolus : lutreolus
->cor : cor<T0, T1>
+>cor : lutreolus.cor<T0, T1>
 >Lanthanum : Lanthanum
->jugularis : jugularis
+>jugularis : Lanthanum.jugularis
 >galapagoensis : galapagoensis
 >() => { var y = this; } : () => void
 >y : sumatrana
 >this : sumatrana
->x : cor<jugularis, galapagoensis>
+>x : lutreolus.cor<Lanthanum.jugularis, galapagoensis>
 
     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 : () => angulatus<aurata, gerbillus<thaeleri, carolinensis>>
+>pachyurus : () => howi.angulatus<dogramacii.aurata, gerbillus<lavali.thaeleri, quasiater.carolinensis>>
 >howi : howi
->angulatus : angulatus<T0, T1>
+>angulatus : howi.angulatus<T0, T1>
 >dogramacii : dogramacii
->aurata : aurata
+>aurata : dogramacii.aurata
 >gerbillus : gerbillus<T0, T1>
 >lavali : lavali
->thaeleri : thaeleri
+>thaeleri : lavali.thaeleri
 >quasiater : quasiater
->carolinensis : carolinensis
->x : angulatus<aurata, gerbillus<thaeleri, carolinensis>>
+>carolinensis : quasiater.carolinensis
+>x : howi.angulatus<dogramacii.aurata, gerbillus<lavali.thaeleri, quasiater.carolinensis>>
 >howi : howi
->angulatus : angulatus<T0, T1>
+>angulatus : howi.angulatus<T0, T1>
 >dogramacii : dogramacii
->aurata : aurata
+>aurata : dogramacii.aurata
 >gerbillus : gerbillus<T0, T1>
 >lavali : lavali
->thaeleri : thaeleri
+>thaeleri : lavali.thaeleri
 >quasiater : quasiater
->carolinensis : carolinensis
+>carolinensis : quasiater.carolinensis
 >() => { var y = this; } : () => void
 >y : sumatrana
 >this : sumatrana
->x : angulatus<aurata, gerbillus<thaeleri, carolinensis>>
+>x : howi.angulatus<dogramacii.aurata, gerbillus<lavali.thaeleri, quasiater.carolinensis>>
 
     lyelli() : provocax.melanoleuca { var x : provocax.melanoleuca; () => { var y = this; }; return x; }
->lyelli : () => melanoleuca
+>lyelli : () => provocax.melanoleuca
 >provocax : provocax
->melanoleuca : melanoleuca
->x : melanoleuca
+>melanoleuca : provocax.melanoleuca
+>x : provocax.melanoleuca
 >provocax : provocax
->melanoleuca : melanoleuca
+>melanoleuca : provocax.melanoleuca
 >() => { var y = this; } : () => void
 >y : sumatrana
 >this : sumatrana
->x : melanoleuca
+>x : provocax.melanoleuca
 
     neohibernicus() : dammermani.siberu<lutreolus.foina, samarensis.pallidus> { var x : dammermani.siberu<lutreolus.foina, samarensis.pallidus>; () => { var y = this; }; return x; }
->neohibernicus : () => siberu<foina, pallidus>
+>neohibernicus : () => dammermani.siberu<lutreolus.foina, samarensis.pallidus>
 >dammermani : dammermani
->siberu : siberu<T0, T1>
+>siberu : dammermani.siberu<T0, T1>
 >lutreolus : lutreolus
->foina : foina
+>foina : lutreolus.foina
 >samarensis : samarensis
->pallidus : pallidus
->x : siberu<foina, pallidus>
+>pallidus : samarensis.pallidus
+>x : dammermani.siberu<lutreolus.foina, samarensis.pallidus>
 >dammermani : dammermani
->siberu : siberu<T0, T1>
+>siberu : dammermani.siberu<T0, T1>
 >lutreolus : lutreolus
->foina : foina
+>foina : lutreolus.foina
 >samarensis : samarensis
->pallidus : pallidus
+>pallidus : samarensis.pallidus
 >() => { var y = this; } : () => void
 >y : sumatrana
 >this : sumatrana
->x : siberu<foina, pallidus>
+>x : dammermani.siberu<lutreolus.foina, samarensis.pallidus>
   }
   export class gerbillus<T0, T1> {
 >gerbillus : gerbillus<T0, T1>
@@ -886,454 +886,454 @@ module julianae {
 >T1 : T1
 
     pundti() : sagitta.sicarius<dogramacii.koepckeae, caurinus.psilurus> { var x : sagitta.sicarius<dogramacii.koepckeae, caurinus.psilurus>; () => { var y = this; }; return x; }
->pundti : () => sicarius<koepckeae, psilurus>
+>pundti : () => sagitta.sicarius<dogramacii.koepckeae, caurinus.psilurus>
 >sagitta : sagitta
->sicarius : sicarius<T0, T1>
+>sicarius : sagitta.sicarius<T0, T1>
 >dogramacii : dogramacii
->koepckeae : koepckeae
+>koepckeae : dogramacii.koepckeae
 >caurinus : caurinus
->psilurus : psilurus
->x : sicarius<koepckeae, psilurus>
+>psilurus : caurinus.psilurus
+>x : sagitta.sicarius<dogramacii.koepckeae, caurinus.psilurus>
 >sagitta : sagitta
->sicarius : sicarius<T0, T1>
+>sicarius : sagitta.sicarius<T0, T1>
 >dogramacii : dogramacii
->koepckeae : koepckeae
+>koepckeae : dogramacii.koepckeae
 >caurinus : caurinus
->psilurus : psilurus
+>psilurus : caurinus.psilurus
 >() => { var y = this; } : () => void
 >y : gerbillus<T0, T1>
 >this : gerbillus<T0, T1>
->x : sicarius<koepckeae, psilurus>
+>x : sagitta.sicarius<dogramacii.koepckeae, caurinus.psilurus>
 
     tristrami() : petrophilus.minutilla { var x : petrophilus.minutilla; () => { var y = this; }; return x; }
->tristrami : () => minutilla
+>tristrami : () => petrophilus.minutilla
 >petrophilus : petrophilus
->minutilla : minutilla
->x : minutilla
+>minutilla : petrophilus.minutilla
+>x : petrophilus.minutilla
 >petrophilus : petrophilus
->minutilla : minutilla
+>minutilla : petrophilus.minutilla
 >() => { var y = this; } : () => void
 >y : gerbillus<T0, T1>
 >this : gerbillus<T0, T1>
->x : minutilla
+>x : petrophilus.minutilla
 
     swarthi() : lutreolus.foina { var x : lutreolus.foina; () => { var y = this; }; return x; }
->swarthi : () => foina
+>swarthi : () => lutreolus.foina
 >lutreolus : lutreolus
->foina : foina
->x : foina
+>foina : lutreolus.foina
+>x : lutreolus.foina
 >lutreolus : lutreolus
->foina : foina
+>foina : lutreolus.foina
 >() => { var y = this; } : () => void
 >y : gerbillus<T0, T1>
 >this : gerbillus<T0, T1>
->x : foina
+>x : lutreolus.foina
 
     horsfieldii() : trivirgatus.falconeri { var x : trivirgatus.falconeri; () => { var y = this; }; return x; }
->horsfieldii : () => falconeri
+>horsfieldii : () => trivirgatus.falconeri
 >trivirgatus : trivirgatus
->falconeri : falconeri
->x : falconeri
+>falconeri : trivirgatus.falconeri
+>x : trivirgatus.falconeri
 >trivirgatus : trivirgatus
->falconeri : falconeri
+>falconeri : trivirgatus.falconeri
 >() => { var y = this; } : () => void
 >y : gerbillus<T0, T1>
 >this : gerbillus<T0, T1>
->x : falconeri
+>x : trivirgatus.falconeri
 
     diazi() : imperfecta.lasiurus<lutreolus.foina, dammermani.melanops> { var x : imperfecta.lasiurus<lutreolus.foina, dammermani.melanops>; () => { var y = this; }; return x; }
->diazi : () => lasiurus<foina, melanops>
+>diazi : () => imperfecta.lasiurus<lutreolus.foina, dammermani.melanops>
 >imperfecta : imperfecta
->lasiurus : lasiurus<T0, T1>
+>lasiurus : imperfecta.lasiurus<T0, T1>
 >lutreolus : lutreolus
->foina : foina
+>foina : lutreolus.foina
 >dammermani : dammermani
->melanops : melanops
->x : lasiurus<foina, melanops>
+>melanops : dammermani.melanops
+>x : imperfecta.lasiurus<lutreolus.foina, dammermani.melanops>
 >imperfecta : imperfecta
->lasiurus : lasiurus<T0, T1>
+>lasiurus : imperfecta.lasiurus<T0, T1>
 >lutreolus : lutreolus
->foina : foina
+>foina : lutreolus.foina
 >dammermani : dammermani
->melanops : melanops
+>melanops : dammermani.melanops
 >() => { var y = this; } : () => void
 >y : gerbillus<T0, T1>
 >this : gerbillus<T0, T1>
->x : lasiurus<foina, melanops>
+>x : imperfecta.lasiurus<lutreolus.foina, dammermani.melanops>
 
     rennelli() : argurus.luctuosa { var x : argurus.luctuosa; () => { var y = this; }; return x; }
->rennelli : () => luctuosa
+>rennelli : () => argurus.luctuosa
 >argurus : argurus
->luctuosa : luctuosa
->x : luctuosa
+>luctuosa : argurus.luctuosa
+>x : argurus.luctuosa
 >argurus : argurus
->luctuosa : luctuosa
+>luctuosa : argurus.luctuosa
 >() => { var y = this; } : () => void
 >y : gerbillus<T0, T1>
 >this : gerbillus<T0, T1>
->x : luctuosa
+>x : argurus.luctuosa
 
     maulinus() : lavali.lepturus { var x : lavali.lepturus; () => { var y = this; }; return x; }
->maulinus : () => lepturus
+>maulinus : () => lavali.lepturus
 >lavali : lavali
->lepturus : lepturus
->x : lepturus
+>lepturus : lavali.lepturus
+>x : lavali.lepturus
 >lavali : lavali
->lepturus : lepturus
+>lepturus : lavali.lepturus
 >() => { var y = this; } : () => void
 >y : gerbillus<T0, T1>
 >this : gerbillus<T0, T1>
->x : lepturus
+>x : lavali.lepturus
 
     muscina() : daubentonii.arboreus<petrophilus.minutilla, argurus.peninsulae> { var x : daubentonii.arboreus<petrophilus.minutilla, argurus.peninsulae>; () => { var y = this; }; return x; }
->muscina : () => arboreus<minutilla, peninsulae>
+>muscina : () => daubentonii.arboreus<petrophilus.minutilla, argurus.peninsulae>
 >daubentonii : daubentonii
->arboreus : arboreus<T0, T1>
+>arboreus : daubentonii.arboreus<T0, T1>
 >petrophilus : petrophilus
->minutilla : minutilla
+>minutilla : petrophilus.minutilla
 >argurus : argurus
->peninsulae : peninsulae
->x : arboreus<minutilla, peninsulae>
+>peninsulae : argurus.peninsulae
+>x : daubentonii.arboreus<petrophilus.minutilla, argurus.peninsulae>
 >daubentonii : daubentonii
->arboreus : arboreus<T0, T1>
+>arboreus : daubentonii.arboreus<T0, T1>
 >petrophilus : petrophilus
->minutilla : minutilla
+>minutilla : petrophilus.minutilla
 >argurus : argurus
->peninsulae : peninsulae
+>peninsulae : argurus.peninsulae
 >() => { var y = this; } : () => void
 >y : gerbillus<T0, T1>
 >this : gerbillus<T0, T1>
->x : arboreus<minutilla, peninsulae>
+>x : daubentonii.arboreus<petrophilus.minutilla, argurus.peninsulae>
 
     pelengensis() : sagitta.leptoceros<caurinus.psilurus, gabriellae.echinatus> { var x : sagitta.leptoceros<caurinus.psilurus, gabriellae.echinatus>; () => { var y = this; }; return x; }
->pelengensis : () => leptoceros<psilurus, echinatus>
+>pelengensis : () => sagitta.leptoceros<caurinus.psilurus, gabriellae.echinatus>
 >sagitta : sagitta
->leptoceros : leptoceros<T0, T1>
+>leptoceros : sagitta.leptoceros<T0, T1>
 >caurinus : caurinus
->psilurus : psilurus
+>psilurus : caurinus.psilurus
 >gabriellae : gabriellae
->echinatus : echinatus
->x : leptoceros<psilurus, echinatus>
+>echinatus : gabriellae.echinatus
+>x : sagitta.leptoceros<caurinus.psilurus, gabriellae.echinatus>
 >sagitta : sagitta
->leptoceros : leptoceros<T0, T1>
+>leptoceros : sagitta.leptoceros<T0, T1>
 >caurinus : caurinus
->psilurus : psilurus
+>psilurus : caurinus.psilurus
 >gabriellae : gabriellae
->echinatus : echinatus
+>echinatus : gabriellae.echinatus
 >() => { var y = this; } : () => void
 >y : gerbillus<T0, T1>
 >this : gerbillus<T0, T1>
->x : leptoceros<psilurus, echinatus>
+>x : sagitta.leptoceros<caurinus.psilurus, gabriellae.echinatus>
 
     abramus() : lavali.thaeleri { var x : lavali.thaeleri; () => { var y = this; }; return x; }
->abramus : () => thaeleri
+>abramus : () => lavali.thaeleri
 >lavali : lavali
->thaeleri : thaeleri
->x : thaeleri
+>thaeleri : lavali.thaeleri
+>x : lavali.thaeleri
 >lavali : lavali
->thaeleri : thaeleri
+>thaeleri : lavali.thaeleri
 >() => { var y = this; } : () => void
 >y : gerbillus<T0, T1>
 >this : gerbillus<T0, T1>
->x : thaeleri
+>x : lavali.thaeleri
 
     reevesi() : provocax.melanoleuca { var x : provocax.melanoleuca; () => { var y = this; }; return x; }
->reevesi : () => melanoleuca
+>reevesi : () => provocax.melanoleuca
 >provocax : provocax
->melanoleuca : melanoleuca
->x : melanoleuca
+>melanoleuca : provocax.melanoleuca
+>x : provocax.melanoleuca
 >provocax : provocax
->melanoleuca : melanoleuca
+>melanoleuca : provocax.melanoleuca
 >() => { var y = this; } : () => void
 >y : gerbillus<T0, T1>
 >this : gerbillus<T0, T1>
->x : melanoleuca
+>x : provocax.melanoleuca
   }
   export class acariensis {
 >acariensis : acariensis
 
     levicula() : lavali.lepturus { var x : lavali.lepturus; () => { var y = this; }; return x; }
->levicula : () => lepturus
+>levicula : () => lavali.lepturus
 >lavali : lavali
->lepturus : lepturus
->x : lepturus
+>lepturus : lavali.lepturus
+>x : lavali.lepturus
 >lavali : lavali
->lepturus : lepturus
+>lepturus : lavali.lepturus
 >() => { var y = this; } : () => void
 >y : acariensis
 >this : acariensis
->x : lepturus
+>x : lavali.lepturus
 
     minous() : argurus.dauricus<quasiater.carolinensis, lavali.otion> { var x : argurus.dauricus<quasiater.carolinensis, lavali.otion>; () => { var y = this; }; return x; }
->minous : () => dauricus<carolinensis, otion>
+>minous : () => argurus.dauricus<quasiater.carolinensis, lavali.otion>
 >argurus : argurus
->dauricus : dauricus<T0, T1>
+>dauricus : argurus.dauricus<T0, T1>
 >quasiater : quasiater
->carolinensis : carolinensis
+>carolinensis : quasiater.carolinensis
 >lavali : lavali
->otion : otion
->x : dauricus<carolinensis, otion>
+>otion : lavali.otion
+>x : argurus.dauricus<quasiater.carolinensis, lavali.otion>
 >argurus : argurus
->dauricus : dauricus<T0, T1>
+>dauricus : argurus.dauricus<T0, T1>
 >quasiater : quasiater
->carolinensis : carolinensis
+>carolinensis : quasiater.carolinensis
 >lavali : lavali
->otion : otion
+>otion : lavali.otion
 >() => { var y = this; } : () => void
 >y : acariensis
 >this : acariensis
->x : dauricus<carolinensis, otion>
+>x : argurus.dauricus<quasiater.carolinensis, lavali.otion>
 
     cinereiventer() : panamensis.setulosus<sagitta.walkeri, lavali.otion> { var x : panamensis.setulosus<sagitta.walkeri, lavali.otion>; () => { var y = this; }; return x; }
->cinereiventer : () => setulosus<walkeri, otion>
+>cinereiventer : () => panamensis.setulosus<sagitta.walkeri, lavali.otion>
 >panamensis : panamensis
->setulosus : setulosus<T0, T1>
+>setulosus : panamensis.setulosus<T0, T1>
 >sagitta : sagitta
->walkeri : walkeri
+>walkeri : sagitta.walkeri
 >lavali : lavali
->otion : otion
->x : setulosus<walkeri, otion>
+>otion : lavali.otion
+>x : panamensis.setulosus<sagitta.walkeri, lavali.otion>
 >panamensis : panamensis
->setulosus : setulosus<T0, T1>
+>setulosus : panamensis.setulosus<T0, T1>
 >sagitta : sagitta
->walkeri : walkeri
+>walkeri : sagitta.walkeri
 >lavali : lavali
->otion : otion
+>otion : lavali.otion
 >() => { var y = this; } : () => void
 >y : acariensis
 >this : acariensis
->x : setulosus<walkeri, otion>
+>x : panamensis.setulosus<sagitta.walkeri, lavali.otion>
 
     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 : () => marmosurus<melanops, mahaganus<nudicaudus, otion>>
+>longicaudatus : () => macrorhinos.marmosurus<dammermani.melanops, caurinus.mahaganus<nudicaudus, lavali.otion>>
 >macrorhinos : macrorhinos
->marmosurus : marmosurus<T0, T1>
+>marmosurus : macrorhinos.marmosurus<T0, T1>
 >dammermani : dammermani
->melanops : melanops
+>melanops : dammermani.melanops
 >caurinus : caurinus
->mahaganus : mahaganus<T0, T1>
+>mahaganus : caurinus.mahaganus<T0, T1>
 >nudicaudus : nudicaudus
 >lavali : lavali
->otion : otion
->x : marmosurus<melanops, mahaganus<nudicaudus, otion>>
+>otion : lavali.otion
+>x : macrorhinos.marmosurus<dammermani.melanops, caurinus.mahaganus<nudicaudus, lavali.otion>>
 >macrorhinos : macrorhinos
->marmosurus : marmosurus<T0, T1>
+>marmosurus : macrorhinos.marmosurus<T0, T1>
 >dammermani : dammermani
->melanops : melanops
+>melanops : dammermani.melanops
 >caurinus : caurinus
->mahaganus : mahaganus<T0, T1>
+>mahaganus : caurinus.mahaganus<T0, T1>
 >nudicaudus : nudicaudus
 >lavali : lavali
->otion : otion
+>otion : lavali.otion
 >() => { var y = this; } : () => void
 >y : acariensis
 >this : acariensis
->x : marmosurus<melanops, mahaganus<nudicaudus, otion>>
+>x : macrorhinos.marmosurus<dammermani.melanops, caurinus.mahaganus<nudicaudus, lavali.otion>>
 
     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 : () => netscheri<siberu<foina, pallidus>, luctuosa>
+>baeodon : () => argurus.netscheri<dammermani.siberu<lutreolus.foina, samarensis.pallidus>, argurus.luctuosa>
 >argurus : argurus
->netscheri : netscheri<T0, T1>
+>netscheri : argurus.netscheri<T0, T1>
 >dammermani : dammermani
->siberu : siberu<T0, T1>
+>siberu : dammermani.siberu<T0, T1>
 >lutreolus : lutreolus
->foina : foina
+>foina : lutreolus.foina
 >samarensis : samarensis
->pallidus : pallidus
+>pallidus : samarensis.pallidus
 >argurus : argurus
->luctuosa : luctuosa
->x : netscheri<siberu<foina, pallidus>, luctuosa>
+>luctuosa : argurus.luctuosa
+>x : argurus.netscheri<dammermani.siberu<lutreolus.foina, samarensis.pallidus>, argurus.luctuosa>
 >argurus : argurus
->netscheri : netscheri<T0, T1>
+>netscheri : argurus.netscheri<T0, T1>
 >dammermani : dammermani
->siberu : siberu<T0, T1>
+>siberu : dammermani.siberu<T0, T1>
 >lutreolus : lutreolus
->foina : foina
+>foina : lutreolus.foina
 >samarensis : samarensis
->pallidus : pallidus
+>pallidus : samarensis.pallidus
 >argurus : argurus
->luctuosa : luctuosa
+>luctuosa : argurus.luctuosa
 >() => { var y = this; } : () => void
 >y : acariensis
 >this : acariensis
->x : netscheri<siberu<foina, pallidus>, luctuosa>
+>x : argurus.netscheri<dammermani.siberu<lutreolus.foina, samarensis.pallidus>, argurus.luctuosa>
 
     soricoides() : argurus.luctuosa { var x : argurus.luctuosa; () => { var y = this; }; return x; }
->soricoides : () => luctuosa
+>soricoides : () => argurus.luctuosa
 >argurus : argurus
->luctuosa : luctuosa
->x : luctuosa
+>luctuosa : argurus.luctuosa
+>x : argurus.luctuosa
 >argurus : argurus
->luctuosa : luctuosa
+>luctuosa : argurus.luctuosa
 >() => { var y = this; } : () => void
 >y : acariensis
 >this : acariensis
->x : luctuosa
+>x : argurus.luctuosa
 
     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 : () => arboreus<melanoleuca, amphibius<daphaenodon, uralensis>>
+>datae : () => daubentonii.arboreus<provocax.melanoleuca, panglima.amphibius<macrorhinos.daphaenodon, patas.uralensis>>
 >daubentonii : daubentonii
->arboreus : arboreus<T0, T1>
+>arboreus : daubentonii.arboreus<T0, T1>
 >provocax : provocax
->melanoleuca : melanoleuca
+>melanoleuca : provocax.melanoleuca
 >panglima : panglima
->amphibius : amphibius<T0, T1>
+>amphibius : panglima.amphibius<T0, T1>
 >macrorhinos : macrorhinos
->daphaenodon : daphaenodon
+>daphaenodon : macrorhinos.daphaenodon
 >patas : patas
->uralensis : uralensis
->x : arboreus<melanoleuca, amphibius<daphaenodon, uralensis>>
+>uralensis : patas.uralensis
+>x : daubentonii.arboreus<provocax.melanoleuca, panglima.amphibius<macrorhinos.daphaenodon, patas.uralensis>>
 >daubentonii : daubentonii
->arboreus : arboreus<T0, T1>
+>arboreus : daubentonii.arboreus<T0, T1>
 >provocax : provocax
->melanoleuca : melanoleuca
+>melanoleuca : provocax.melanoleuca
 >panglima : panglima
->amphibius : amphibius<T0, T1>
+>amphibius : panglima.amphibius<T0, T1>
 >macrorhinos : macrorhinos
->daphaenodon : daphaenodon
+>daphaenodon : macrorhinos.daphaenodon
 >patas : patas
->uralensis : uralensis
+>uralensis : patas.uralensis
 >() => { var y = this; } : () => void
 >y : acariensis
 >this : acariensis
->x : arboreus<melanoleuca, amphibius<daphaenodon, uralensis>>
+>x : daubentonii.arboreus<provocax.melanoleuca, panglima.amphibius<macrorhinos.daphaenodon, patas.uralensis>>
 
     spixii() : imperfecta.subspinosus { var x : imperfecta.subspinosus; () => { var y = this; }; return x; }
->spixii : () => subspinosus
+>spixii : () => imperfecta.subspinosus
 >imperfecta : imperfecta
->subspinosus : subspinosus
->x : subspinosus
+>subspinosus : imperfecta.subspinosus
+>x : imperfecta.subspinosus
 >imperfecta : imperfecta
->subspinosus : subspinosus
+>subspinosus : imperfecta.subspinosus
 >() => { var y = this; } : () => void
 >y : acariensis
 >this : acariensis
->x : subspinosus
+>x : imperfecta.subspinosus
 
     anakuma() : lavali.wilsoni { var x : lavali.wilsoni; () => { var y = this; }; return x; }
->anakuma : () => wilsoni
+>anakuma : () => lavali.wilsoni
 >lavali : lavali
->wilsoni : wilsoni
->x : wilsoni
+>wilsoni : lavali.wilsoni
+>x : lavali.wilsoni
 >lavali : lavali
->wilsoni : wilsoni
+>wilsoni : lavali.wilsoni
 >() => { var y = this; } : () => void
 >y : acariensis
 >this : acariensis
->x : wilsoni
+>x : lavali.wilsoni
 
     kihaulei() : panglima.amphibius<trivirgatus.oconnelli, macrorhinos.konganensis> { var x : panglima.amphibius<trivirgatus.oconnelli, macrorhinos.konganensis>; () => { var y = this; }; return x; }
->kihaulei : () => amphibius<oconnelli, konganensis>
+>kihaulei : () => panglima.amphibius<trivirgatus.oconnelli, macrorhinos.konganensis>
 >panglima : panglima
->amphibius : amphibius<T0, T1>
+>amphibius : panglima.amphibius<T0, T1>
 >trivirgatus : trivirgatus
->oconnelli : oconnelli
+>oconnelli : trivirgatus.oconnelli
 >macrorhinos : macrorhinos
->konganensis : konganensis
->x : amphibius<oconnelli, konganensis>
+>konganensis : macrorhinos.konganensis
+>x : panglima.amphibius<trivirgatus.oconnelli, macrorhinos.konganensis>
 >panglima : panglima
->amphibius : amphibius<T0, T1>
+>amphibius : panglima.amphibius<T0, T1>
 >trivirgatus : trivirgatus
->oconnelli : oconnelli
+>oconnelli : trivirgatus.oconnelli
 >macrorhinos : macrorhinos
->konganensis : konganensis
+>konganensis : macrorhinos.konganensis
 >() => { var y = this; } : () => void
 >y : acariensis
 >this : acariensis
->x : amphibius<oconnelli, konganensis>
+>x : panglima.amphibius<trivirgatus.oconnelli, macrorhinos.konganensis>
 
     gymnura() : quasiater.carolinensis { var x : quasiater.carolinensis; () => { var y = this; }; return x; }
->gymnura : () => carolinensis
+>gymnura : () => quasiater.carolinensis
 >quasiater : quasiater
->carolinensis : carolinensis
->x : carolinensis
+>carolinensis : quasiater.carolinensis
+>x : quasiater.carolinensis
 >quasiater : quasiater
->carolinensis : carolinensis
+>carolinensis : quasiater.carolinensis
 >() => { var y = this; } : () => void
 >y : acariensis
 >this : acariensis
->x : carolinensis
+>x : quasiater.carolinensis
 
     olchonensis() : rendalli.crenulata<trivirgatus.falconeri, provocax.melanoleuca> { var x : rendalli.crenulata<trivirgatus.falconeri, provocax.melanoleuca>; () => { var y = this; }; return x; }
->olchonensis : () => crenulata<falconeri, melanoleuca>
+>olchonensis : () => rendalli.crenulata<trivirgatus.falconeri, provocax.melanoleuca>
 >rendalli : rendalli
->crenulata : crenulata<T0, T1>
+>crenulata : rendalli.crenulata<T0, T1>
 >trivirgatus : trivirgatus
->falconeri : falconeri
+>falconeri : trivirgatus.falconeri
 >provocax : provocax
->melanoleuca : melanoleuca
->x : crenulata<falconeri, melanoleuca>
+>melanoleuca : provocax.melanoleuca
+>x : rendalli.crenulata<trivirgatus.falconeri, provocax.melanoleuca>
 >rendalli : rendalli
->crenulata : crenulata<T0, T1>
+>crenulata : rendalli.crenulata<T0, T1>
 >trivirgatus : trivirgatus
->falconeri : falconeri
+>falconeri : trivirgatus.falconeri
 >provocax : provocax
->melanoleuca : melanoleuca
+>melanoleuca : provocax.melanoleuca
 >() => { var y = this; } : () => void
 >y : acariensis
 >this : acariensis
->x : crenulata<falconeri, melanoleuca>
+>x : rendalli.crenulata<trivirgatus.falconeri, provocax.melanoleuca>
   }
   export class durangae extends dogramacii.aurata {
 >durangae : durangae
 >dogramacii : dogramacii
->aurata : aurata
+>aurata : dogramacii.aurata
 
     Californium() : panamensis.setulosus<lutreolus.punicus, dammermani.melanops> { var x : panamensis.setulosus<lutreolus.punicus, dammermani.melanops>; () => { var y = this; }; return x; }
->Californium : () => setulosus<punicus, melanops>
+>Californium : () => panamensis.setulosus<lutreolus.punicus, dammermani.melanops>
 >panamensis : panamensis
->setulosus : setulosus<T0, T1>
+>setulosus : panamensis.setulosus<T0, T1>
 >lutreolus : lutreolus
->punicus : punicus
+>punicus : lutreolus.punicus
 >dammermani : dammermani
->melanops : melanops
->x : setulosus<punicus, melanops>
+>melanops : dammermani.melanops
+>x : panamensis.setulosus<lutreolus.punicus, dammermani.melanops>
 >panamensis : panamensis
->setulosus : setulosus<T0, T1>
+>setulosus : panamensis.setulosus<T0, T1>
 >lutreolus : lutreolus
->punicus : punicus
+>punicus : lutreolus.punicus
 >dammermani : dammermani
->melanops : melanops
+>melanops : dammermani.melanops
 >() => { var y = this; } : () => void
 >y : durangae
 >this : durangae
->x : setulosus<punicus, melanops>
+>x : panamensis.setulosus<lutreolus.punicus, dammermani.melanops>
 
     Flerovium() : howi.angulatus<petrophilus.minutilla, lavali.xanthognathus> { var x : howi.angulatus<petrophilus.minutilla, lavali.xanthognathus>; () => { var y = this; }; return x; }
->Flerovium : () => angulatus<minutilla, xanthognathus>
+>Flerovium : () => howi.angulatus<petrophilus.minutilla, lavali.xanthognathus>
 >howi : howi
->angulatus : angulatus<T0, T1>
+>angulatus : howi.angulatus<T0, T1>
 >petrophilus : petrophilus
->minutilla : minutilla
+>minutilla : petrophilus.minutilla
 >lavali : lavali
->xanthognathus : xanthognathus
->x : angulatus<minutilla, xanthognathus>
+>xanthognathus : lavali.xanthognathus
+>x : howi.angulatus<petrophilus.minutilla, lavali.xanthognathus>
 >howi : howi
->angulatus : angulatus<T0, T1>
+>angulatus : howi.angulatus<T0, T1>
 >petrophilus : petrophilus
->minutilla : minutilla
+>minutilla : petrophilus.minutilla
 >lavali : lavali
->xanthognathus : xanthognathus
+>xanthognathus : lavali.xanthognathus
 >() => { var y = this; } : () => void
 >y : durangae
 >this : durangae
->x : angulatus<minutilla, xanthognathus>
+>x : howi.angulatus<petrophilus.minutilla, lavali.xanthognathus>
 
     phrudus() : sagitta.stolzmanni { var x : sagitta.stolzmanni; () => { var y = this; }; return x; }
->phrudus : () => stolzmanni
+>phrudus : () => sagitta.stolzmanni
 >sagitta : sagitta
->stolzmanni : stolzmanni
->x : stolzmanni
+>stolzmanni : sagitta.stolzmanni
+>x : sagitta.stolzmanni
 >sagitta : sagitta
->stolzmanni : stolzmanni
+>stolzmanni : sagitta.stolzmanni
 >() => { var y = this; } : () => void
 >y : durangae
 >this : durangae
->x : stolzmanni
+>x : sagitta.stolzmanni
   }
 }
 module ruatanica {
->ruatanica : typeof ruatanica
+>ruatanica : ruatanica
 
   export class hector<T0, T1> {
 >hector : hector<T0, T1>
@@ -1341,48 +1341,48 @@ module ruatanica {
 >T1 : T1
 
     humulis() : julianae.steerii { var x : julianae.steerii; () => { var y = this; }; return x; }
->humulis : () => steerii
+>humulis : () => julianae.steerii
 >julianae : julianae
->steerii : steerii
->x : steerii
+>steerii : julianae.steerii
+>x : julianae.steerii
 >julianae : julianae
->steerii : steerii
+>steerii : julianae.steerii
 >() => { var y = this; } : () => void
 >y : hector<T0, T1>
 >this : hector<T0, T1>
->x : steerii
+>x : julianae.steerii
 
     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 : () => linulus<Praseodymium<jugularis, melanops>, wilsoni>
+>eurycerus : () => panamensis.linulus<Praseodymium<Lanthanum.jugularis, dammermani.melanops>, lavali.wilsoni>
 >panamensis : panamensis
->linulus : linulus<T0, T1>
+>linulus : panamensis.linulus<T0, T1>
 >ruatanica : ruatanica
 >Praseodymium : Praseodymium<T0, T1>
 >Lanthanum : Lanthanum
->jugularis : jugularis
+>jugularis : Lanthanum.jugularis
 >dammermani : dammermani
->melanops : melanops
+>melanops : dammermani.melanops
 >lavali : lavali
->wilsoni : wilsoni
->x : linulus<Praseodymium<jugularis, melanops>, wilsoni>
+>wilsoni : lavali.wilsoni
+>x : panamensis.linulus<Praseodymium<Lanthanum.jugularis, dammermani.melanops>, lavali.wilsoni>
 >panamensis : panamensis
->linulus : linulus<T0, T1>
+>linulus : panamensis.linulus<T0, T1>
 >ruatanica : ruatanica
 >Praseodymium : Praseodymium<T0, T1>
 >Lanthanum : Lanthanum
->jugularis : jugularis
+>jugularis : Lanthanum.jugularis
 >dammermani : dammermani
->melanops : melanops
+>melanops : dammermani.melanops
 >lavali : lavali
->wilsoni : wilsoni
+>wilsoni : lavali.wilsoni
 >() => { var y = this; } : () => void
 >y : hector<T0, T1>
 >this : hector<T0, T1>
->x : linulus<Praseodymium<jugularis, melanops>, wilsoni>
+>x : panamensis.linulus<Praseodymium<Lanthanum.jugularis, dammermani.melanops>, lavali.wilsoni>
   }
 }
 module Lanthanum {
->Lanthanum : typeof Lanthanum
+>Lanthanum : Lanthanum
 
   export class suillus<T0, T1> {
 >suillus : suillus<T0, T1>
@@ -1390,834 +1390,834 @@ module Lanthanum {
 >T1 : T1
 
     spilosoma() : quasiater.carolinensis { var x : quasiater.carolinensis; () => { var y = this; }; return x; }
->spilosoma : () => carolinensis
+>spilosoma : () => quasiater.carolinensis
 >quasiater : quasiater
->carolinensis : carolinensis
->x : carolinensis
+>carolinensis : quasiater.carolinensis
+>x : quasiater.carolinensis
 >quasiater : quasiater
->carolinensis : carolinensis
+>carolinensis : quasiater.carolinensis
 >() => { var y = this; } : () => void
 >y : suillus<T0, T1>
 >this : suillus<T0, T1>
->x : carolinensis
+>x : quasiater.carolinensis
 
     tumbalensis() : caurinus.megaphyllus { var x : caurinus.megaphyllus; () => { var y = this; }; return x; }
->tumbalensis : () => megaphyllus
+>tumbalensis : () => caurinus.megaphyllus
 >caurinus : caurinus
->megaphyllus : megaphyllus
->x : megaphyllus
+>megaphyllus : caurinus.megaphyllus
+>x : caurinus.megaphyllus
 >caurinus : caurinus
->megaphyllus : megaphyllus
+>megaphyllus : caurinus.megaphyllus
 >() => { var y = this; } : () => void
 >y : suillus<T0, T1>
 >this : suillus<T0, T1>
->x : megaphyllus
+>x : caurinus.megaphyllus
 
     anatolicus() : julianae.steerii { var x : julianae.steerii; () => { var y = this; }; return x; }
->anatolicus : () => steerii
+>anatolicus : () => julianae.steerii
 >julianae : julianae
->steerii : steerii
->x : steerii
+>steerii : julianae.steerii
+>x : julianae.steerii
 >julianae : julianae
->steerii : steerii
+>steerii : julianae.steerii
 >() => { var y = this; } : () => void
 >y : suillus<T0, T1>
 >this : suillus<T0, T1>
->x : steerii
+>x : julianae.steerii
   }
   export class nitidus<T0, T1> extends argurus.gilbertii<lavali.thaeleri, lutreolus.punicus> {
 >nitidus : nitidus<T0, T1>
 >T0 : T0
 >T1 : T1
 >argurus : argurus
->gilbertii : gilbertii<T0, T1>
+>gilbertii : argurus.gilbertii<T0, T1>
 >lavali : lavali
->thaeleri : thaeleri
+>thaeleri : lavali.thaeleri
 >lutreolus : lutreolus
->punicus : punicus
+>punicus : lutreolus.punicus
 
     granatensis() : quasiater.bobrinskoi { var x : quasiater.bobrinskoi; () => { var y = this; }; return x; }
->granatensis : () => bobrinskoi
+>granatensis : () => quasiater.bobrinskoi
 >quasiater : quasiater
->bobrinskoi : bobrinskoi
->x : bobrinskoi
+>bobrinskoi : quasiater.bobrinskoi
+>x : quasiater.bobrinskoi
 >quasiater : quasiater
->bobrinskoi : bobrinskoi
+>bobrinskoi : quasiater.bobrinskoi
 >() => { var y = this; } : () => void
 >y : nitidus<T0, T1>
 >this : nitidus<T0, T1>
->x : bobrinskoi
+>x : quasiater.bobrinskoi
 
     negligens() : minutus.inez<lavali.wilsoni, lavali.wilsoni> { var x : minutus.inez<lavali.wilsoni, lavali.wilsoni>; () => { var y = this; }; return x; }
->negligens : () => inez<wilsoni, wilsoni>
+>negligens : () => minutus.inez<lavali.wilsoni, lavali.wilsoni>
 >minutus : minutus
->inez : inez<T0, T1>
+>inez : minutus.inez<T0, T1>
 >lavali : lavali
->wilsoni : wilsoni
+>wilsoni : lavali.wilsoni
 >lavali : lavali
->wilsoni : wilsoni
->x : inez<wilsoni, wilsoni>
+>wilsoni : lavali.wilsoni
+>x : minutus.inez<lavali.wilsoni, lavali.wilsoni>
 >minutus : minutus
->inez : inez<T0, T1>
+>inez : minutus.inez<T0, T1>
 >lavali : lavali
->wilsoni : wilsoni
+>wilsoni : lavali.wilsoni
 >lavali : lavali
->wilsoni : wilsoni
+>wilsoni : lavali.wilsoni
 >() => { var y = this; } : () => void
 >y : nitidus<T0, T1>
 >this : nitidus<T0, T1>
->x : inez<wilsoni, wilsoni>
+>x : minutus.inez<lavali.wilsoni, lavali.wilsoni>
 
     lewisi() : julianae.oralis<lavali.xanthognathus, argurus.oreas> { var x : julianae.oralis<lavali.xanthognathus, argurus.oreas>; () => { var y = this; }; return x; }
->lewisi : () => oralis<xanthognathus, oreas>
+>lewisi : () => julianae.oralis<lavali.xanthognathus, argurus.oreas>
 >julianae : julianae
->oralis : oralis<T0, T1>
+>oralis : julianae.oralis<T0, T1>
 >lavali : lavali
->xanthognathus : xanthognathus
+>xanthognathus : lavali.xanthognathus
 >argurus : argurus
->oreas : oreas
->x : oralis<xanthognathus, oreas>
+>oreas : argurus.oreas
+>x : julianae.oralis<lavali.xanthognathus, argurus.oreas>
 >julianae : julianae
->oralis : oralis<T0, T1>
+>oralis : julianae.oralis<T0, T1>
 >lavali : lavali
->xanthognathus : xanthognathus
+>xanthognathus : lavali.xanthognathus
 >argurus : argurus
->oreas : oreas
+>oreas : argurus.oreas
 >() => { var y = this; } : () => void
 >y : nitidus<T0, T1>
 >this : nitidus<T0, T1>
->x : oralis<xanthognathus, oreas>
+>x : julianae.oralis<lavali.xanthognathus, argurus.oreas>
 
     arge() : chrysaeolus.sarasinorum<caurinus.megaphyllus, lavali.xanthognathus> { var x : chrysaeolus.sarasinorum<caurinus.megaphyllus, lavali.xanthognathus>; () => { var y = this; }; return x; }
->arge : () => sarasinorum<megaphyllus, xanthognathus>
+>arge : () => chrysaeolus.sarasinorum<caurinus.megaphyllus, lavali.xanthognathus>
 >chrysaeolus : chrysaeolus
->sarasinorum : sarasinorum<T0, T1>
+>sarasinorum : chrysaeolus.sarasinorum<T0, T1>
 >caurinus : caurinus
->megaphyllus : megaphyllus
+>megaphyllus : caurinus.megaphyllus
 >lavali : lavali
->xanthognathus : xanthognathus
->x : sarasinorum<megaphyllus, xanthognathus>
+>xanthognathus : lavali.xanthognathus
+>x : chrysaeolus.sarasinorum<caurinus.megaphyllus, lavali.xanthognathus>
 >chrysaeolus : chrysaeolus
->sarasinorum : sarasinorum<T0, T1>
+>sarasinorum : chrysaeolus.sarasinorum<T0, T1>
 >caurinus : caurinus
->megaphyllus : megaphyllus
+>megaphyllus : caurinus.megaphyllus
 >lavali : lavali
->xanthognathus : xanthognathus
+>xanthognathus : lavali.xanthognathus
 >() => { var y = this; } : () => void
 >y : nitidus<T0, T1>
 >this : nitidus<T0, T1>
->x : sarasinorum<megaphyllus, xanthognathus>
+>x : chrysaeolus.sarasinorum<caurinus.megaphyllus, lavali.xanthognathus>
 
     dominicensis() : dammermani.melanops { var x : dammermani.melanops; () => { var y = this; }; return x; }
->dominicensis : () => melanops
+>dominicensis : () => dammermani.melanops
 >dammermani : dammermani
->melanops : melanops
->x : melanops
+>melanops : dammermani.melanops
+>x : dammermani.melanops
 >dammermani : dammermani
->melanops : melanops
+>melanops : dammermani.melanops
 >() => { var y = this; } : () => void
 >y : nitidus<T0, T1>
 >this : nitidus<T0, T1>
->x : melanops
+>x : dammermani.melanops
 
     taurus() : macrorhinos.konganensis { var x : macrorhinos.konganensis; () => { var y = this; }; return x; }
->taurus : () => konganensis
+>taurus : () => macrorhinos.konganensis
 >macrorhinos : macrorhinos
->konganensis : konganensis
->x : konganensis
+>konganensis : macrorhinos.konganensis
+>x : macrorhinos.konganensis
 >macrorhinos : macrorhinos
->konganensis : konganensis
+>konganensis : macrorhinos.konganensis
 >() => { var y = this; } : () => void
 >y : nitidus<T0, T1>
 >this : nitidus<T0, T1>
->x : konganensis
+>x : macrorhinos.konganensis
 
     tonganus() : argurus.netscheri<dogramacii.aurata, dogramacii.aurata> { var x : argurus.netscheri<dogramacii.aurata, dogramacii.aurata>; () => { var y = this; }; return x; }
->tonganus : () => netscheri<aurata, aurata>
+>tonganus : () => argurus.netscheri<dogramacii.aurata, dogramacii.aurata>
 >argurus : argurus
->netscheri : netscheri<T0, T1>
+>netscheri : argurus.netscheri<T0, T1>
 >dogramacii : dogramacii
->aurata : aurata
+>aurata : dogramacii.aurata
 >dogramacii : dogramacii
->aurata : aurata
->x : netscheri<aurata, aurata>
+>aurata : dogramacii.aurata
+>x : argurus.netscheri<dogramacii.aurata, dogramacii.aurata>
 >argurus : argurus
->netscheri : netscheri<T0, T1>
+>netscheri : argurus.netscheri<T0, T1>
 >dogramacii : dogramacii
->aurata : aurata
+>aurata : dogramacii.aurata
 >dogramacii : dogramacii
->aurata : aurata
+>aurata : dogramacii.aurata
 >() => { var y = this; } : () => void
 >y : nitidus<T0, T1>
 >this : nitidus<T0, T1>
->x : netscheri<aurata, aurata>
+>x : argurus.netscheri<dogramacii.aurata, dogramacii.aurata>
 
     silvatica() : rendalli.moojeni<dogramacii.aurata, lavali.otion> { var x : rendalli.moojeni<dogramacii.aurata, lavali.otion>; () => { var y = this; }; return x; }
->silvatica : () => moojeni<aurata, otion>
+>silvatica : () => rendalli.moojeni<dogramacii.aurata, lavali.otion>
 >rendalli : rendalli
->moojeni : moojeni<T0, T1>
+>moojeni : rendalli.moojeni<T0, T1>
 >dogramacii : dogramacii
->aurata : aurata
+>aurata : dogramacii.aurata
 >lavali : lavali
->otion : otion
->x : moojeni<aurata, otion>
+>otion : lavali.otion
+>x : rendalli.moojeni<dogramacii.aurata, lavali.otion>
 >rendalli : rendalli
->moojeni : moojeni<T0, T1>
+>moojeni : rendalli.moojeni<T0, T1>
 >dogramacii : dogramacii
->aurata : aurata
+>aurata : dogramacii.aurata
 >lavali : lavali
->otion : otion
+>otion : lavali.otion
 >() => { var y = this; } : () => void
 >y : nitidus<T0, T1>
 >this : nitidus<T0, T1>
->x : moojeni<aurata, otion>
+>x : rendalli.moojeni<dogramacii.aurata, lavali.otion>
 
     midas() : lavali.xanthognathus { var x : lavali.xanthognathus; () => { var y = this; }; return x; }
->midas : () => xanthognathus
+>midas : () => lavali.xanthognathus
 >lavali : lavali
->xanthognathus : xanthognathus
->x : xanthognathus
+>xanthognathus : lavali.xanthognathus
+>x : lavali.xanthognathus
 >lavali : lavali
->xanthognathus : xanthognathus
+>xanthognathus : lavali.xanthognathus
 >() => { var y = this; } : () => void
 >y : nitidus<T0, T1>
 >this : nitidus<T0, T1>
->x : xanthognathus
+>x : lavali.xanthognathus
 
     bicornis() : dogramacii.kaiseri { var x : dogramacii.kaiseri; () => { var y = this; }; return x; }
->bicornis : () => kaiseri
+>bicornis : () => dogramacii.kaiseri
 >dogramacii : dogramacii
->kaiseri : kaiseri
->x : kaiseri
+>kaiseri : dogramacii.kaiseri
+>x : dogramacii.kaiseri
 >dogramacii : dogramacii
->kaiseri : kaiseri
+>kaiseri : dogramacii.kaiseri
 >() => { var y = this; } : () => void
 >y : nitidus<T0, T1>
 >this : nitidus<T0, T1>
->x : kaiseri
+>x : dogramacii.kaiseri
   }
   export class megalonyx extends caurinus.johorensis<caurinus.megaphyllus, julianae.steerii> {
 >megalonyx : megalonyx
 >caurinus : caurinus
->johorensis : johorensis<T0, T1>
+>johorensis : caurinus.johorensis<T0, T1>
 >caurinus : caurinus
->megaphyllus : megaphyllus
+>megaphyllus : caurinus.megaphyllus
 >julianae : julianae
->steerii : steerii
+>steerii : julianae.steerii
 
     phillipsii() : macrorhinos.konganensis { var x : macrorhinos.konganensis; () => { var y = this; }; return x; }
->phillipsii : () => konganensis
+>phillipsii : () => macrorhinos.konganensis
 >macrorhinos : macrorhinos
->konganensis : konganensis
->x : konganensis
+>konganensis : macrorhinos.konganensis
+>x : macrorhinos.konganensis
 >macrorhinos : macrorhinos
->konganensis : konganensis
+>konganensis : macrorhinos.konganensis
 >() => { var y = this; } : () => void
 >y : megalonyx
 >this : megalonyx
->x : konganensis
+>x : macrorhinos.konganensis
 
     melanogaster() : rionegrensis.veraecrucis<trivirgatus.falconeri, quasiater.carolinensis> { var x : rionegrensis.veraecrucis<trivirgatus.falconeri, quasiater.carolinensis>; () => { var y = this; }; return x; }
->melanogaster : () => veraecrucis<falconeri, carolinensis>
+>melanogaster : () => rionegrensis.veraecrucis<trivirgatus.falconeri, quasiater.carolinensis>
 >rionegrensis : rionegrensis
->veraecrucis : veraecrucis<T0, T1>
+>veraecrucis : rionegrensis.veraecrucis<T0, T1>
 >trivirgatus : trivirgatus
->falconeri : falconeri
+>falconeri : trivirgatus.falconeri
 >quasiater : quasiater
->carolinensis : carolinensis
->x : veraecrucis<falconeri, carolinensis>
+>carolinensis : quasiater.carolinensis
+>x : rionegrensis.veraecrucis<trivirgatus.falconeri, quasiater.carolinensis>
 >rionegrensis : rionegrensis
->veraecrucis : veraecrucis<T0, T1>
+>veraecrucis : rionegrensis.veraecrucis<T0, T1>
 >trivirgatus : trivirgatus
->falconeri : falconeri
+>falconeri : trivirgatus.falconeri
 >quasiater : quasiater
->carolinensis : carolinensis
+>carolinensis : quasiater.carolinensis
 >() => { var y = this; } : () => void
 >y : megalonyx
 >this : megalonyx
->x : veraecrucis<falconeri, carolinensis>
+>x : rionegrensis.veraecrucis<trivirgatus.falconeri, quasiater.carolinensis>
 
     elaphus() : nitidus<petrophilus.minutilla, julianae.sumatrana> { var x : nitidus<petrophilus.minutilla, julianae.sumatrana>; () => { var y = this; }; return x; }
->elaphus : () => nitidus<minutilla, sumatrana>
+>elaphus : () => nitidus<petrophilus.minutilla, julianae.sumatrana>
 >nitidus : nitidus<T0, T1>
 >petrophilus : petrophilus
->minutilla : minutilla
+>minutilla : petrophilus.minutilla
 >julianae : julianae
->sumatrana : sumatrana
->x : nitidus<minutilla, sumatrana>
+>sumatrana : julianae.sumatrana
+>x : nitidus<petrophilus.minutilla, julianae.sumatrana>
 >nitidus : nitidus<T0, T1>
 >petrophilus : petrophilus
->minutilla : minutilla
+>minutilla : petrophilus.minutilla
 >julianae : julianae
->sumatrana : sumatrana
+>sumatrana : julianae.sumatrana
 >() => { var y = this; } : () => void
 >y : megalonyx
 >this : megalonyx
->x : nitidus<minutilla, sumatrana>
+>x : nitidus<petrophilus.minutilla, julianae.sumatrana>
 
     elater() : lavali.lepturus { var x : lavali.lepturus; () => { var y = this; }; return x; }
->elater : () => lepturus
+>elater : () => lavali.lepturus
 >lavali : lavali
->lepturus : lepturus
->x : lepturus
+>lepturus : lavali.lepturus
+>x : lavali.lepturus
 >lavali : lavali
->lepturus : lepturus
+>lepturus : lavali.lepturus
 >() => { var y = this; } : () => void
 >y : megalonyx
 >this : megalonyx
->x : lepturus
+>x : lavali.lepturus
 
     ourebi() : provocax.melanoleuca { var x : provocax.melanoleuca; () => { var y = this; }; return x; }
->ourebi : () => melanoleuca
+>ourebi : () => provocax.melanoleuca
 >provocax : provocax
->melanoleuca : melanoleuca
->x : melanoleuca
+>melanoleuca : provocax.melanoleuca
+>x : provocax.melanoleuca
 >provocax : provocax
->melanoleuca : melanoleuca
+>melanoleuca : provocax.melanoleuca
 >() => { var y = this; } : () => void
 >y : megalonyx
 >this : megalonyx
->x : melanoleuca
+>x : provocax.melanoleuca
 
     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 : () => ciliolabrum<nudicaudus, Praseodymium<thaeleri, acariensis>>
+>caraccioli : () => imperfecta.ciliolabrum<julianae.nudicaudus, ruatanica.Praseodymium<lavali.thaeleri, julianae.acariensis>>
 >imperfecta : imperfecta
->ciliolabrum : ciliolabrum<T0, T1>
+>ciliolabrum : imperfecta.ciliolabrum<T0, T1>
 >julianae : julianae
->nudicaudus : nudicaudus
+>nudicaudus : julianae.nudicaudus
 >ruatanica : ruatanica
->Praseodymium : Praseodymium<T0, T1>
+>Praseodymium : ruatanica.Praseodymium<T0, T1>
 >lavali : lavali
->thaeleri : thaeleri
+>thaeleri : lavali.thaeleri
 >julianae : julianae
->acariensis : acariensis
->x : ciliolabrum<nudicaudus, Praseodymium<thaeleri, acariensis>>
+>acariensis : julianae.acariensis
+>x : imperfecta.ciliolabrum<julianae.nudicaudus, ruatanica.Praseodymium<lavali.thaeleri, julianae.acariensis>>
 >imperfecta : imperfecta
->ciliolabrum : ciliolabrum<T0, T1>
+>ciliolabrum : imperfecta.ciliolabrum<T0, T1>
 >julianae : julianae
->nudicaudus : nudicaudus
+>nudicaudus : julianae.nudicaudus
 >ruatanica : ruatanica
->Praseodymium : Praseodymium<T0, T1>
+>Praseodymium : ruatanica.Praseodymium<T0, T1>
 >lavali : lavali
->thaeleri : thaeleri
+>thaeleri : lavali.thaeleri
 >julianae : julianae
->acariensis : acariensis
+>acariensis : julianae.acariensis
 >() => { var y = this; } : () => void
 >y : megalonyx
 >this : megalonyx
->x : ciliolabrum<nudicaudus, Praseodymium<thaeleri, acariensis>>
+>x : imperfecta.ciliolabrum<julianae.nudicaudus, ruatanica.Praseodymium<lavali.thaeleri, julianae.acariensis>>
 
     parva() : gabriellae.echinatus { var x : gabriellae.echinatus; () => { var y = this; }; return x; }
->parva : () => echinatus
+>parva : () => gabriellae.echinatus
 >gabriellae : gabriellae
->echinatus : echinatus
->x : echinatus
+>echinatus : gabriellae.echinatus
+>x : gabriellae.echinatus
 >gabriellae : gabriellae
->echinatus : echinatus
+>echinatus : gabriellae.echinatus
 >() => { var y = this; } : () => void
 >y : megalonyx
 >this : megalonyx
->x : echinatus
+>x : gabriellae.echinatus
 
     albipes() : quasiater.wattsi<dammermani.melanops, megalonyx> { var x : quasiater.wattsi<dammermani.melanops, megalonyx>; () => { var y = this; }; return x; }
->albipes : () => wattsi<melanops, megalonyx>
+>albipes : () => quasiater.wattsi<dammermani.melanops, megalonyx>
 >quasiater : quasiater
->wattsi : wattsi<T0, T1>
+>wattsi : quasiater.wattsi<T0, T1>
 >dammermani : dammermani
->melanops : melanops
+>melanops : dammermani.melanops
 >megalonyx : megalonyx
->x : wattsi<melanops, megalonyx>
+>x : quasiater.wattsi<dammermani.melanops, megalonyx>
 >quasiater : quasiater
->wattsi : wattsi<T0, T1>
+>wattsi : quasiater.wattsi<T0, T1>
 >dammermani : dammermani
->melanops : melanops
+>melanops : dammermani.melanops
 >megalonyx : megalonyx
 >() => { var y = this; } : () => void
 >y : megalonyx
 >this : megalonyx
->x : wattsi<melanops, megalonyx>
+>x : quasiater.wattsi<dammermani.melanops, megalonyx>
   }
   export class jugularis {
 >jugularis : jugularis
 
     torrei() : petrophilus.sodyi<argurus.oreas, macrorhinos.daphaenodon> { var x : petrophilus.sodyi<argurus.oreas, macrorhinos.daphaenodon>; () => { var y = this; }; return x; }
->torrei : () => sodyi<oreas, daphaenodon>
+>torrei : () => petrophilus.sodyi<argurus.oreas, macrorhinos.daphaenodon>
 >petrophilus : petrophilus
->sodyi : sodyi<T0, T1>
+>sodyi : petrophilus.sodyi<T0, T1>
 >argurus : argurus
->oreas : oreas
+>oreas : argurus.oreas
 >macrorhinos : macrorhinos
->daphaenodon : daphaenodon
->x : sodyi<oreas, daphaenodon>
+>daphaenodon : macrorhinos.daphaenodon
+>x : petrophilus.sodyi<argurus.oreas, macrorhinos.daphaenodon>
 >petrophilus : petrophilus
->sodyi : sodyi<T0, T1>
+>sodyi : petrophilus.sodyi<T0, T1>
 >argurus : argurus
->oreas : oreas
+>oreas : argurus.oreas
 >macrorhinos : macrorhinos
->daphaenodon : daphaenodon
+>daphaenodon : macrorhinos.daphaenodon
 >() => { var y = this; } : () => void
 >y : jugularis
 >this : jugularis
->x : sodyi<oreas, daphaenodon>
+>x : petrophilus.sodyi<argurus.oreas, macrorhinos.daphaenodon>
 
     revoili() : lavali.wilsoni { var x : lavali.wilsoni; () => { var y = this; }; return x; }
->revoili : () => wilsoni
+>revoili : () => lavali.wilsoni
 >lavali : lavali
->wilsoni : wilsoni
->x : wilsoni
+>wilsoni : lavali.wilsoni
+>x : lavali.wilsoni
 >lavali : lavali
->wilsoni : wilsoni
+>wilsoni : lavali.wilsoni
 >() => { var y = this; } : () => void
 >y : jugularis
 >this : jugularis
->x : wilsoni
+>x : lavali.wilsoni
 
     macrobullatus() : macrorhinos.daphaenodon { var x : macrorhinos.daphaenodon; () => { var y = this; }; return x; }
->macrobullatus : () => daphaenodon
+>macrobullatus : () => macrorhinos.daphaenodon
 >macrorhinos : macrorhinos
->daphaenodon : daphaenodon
->x : daphaenodon
+>daphaenodon : macrorhinos.daphaenodon
+>x : macrorhinos.daphaenodon
 >macrorhinos : macrorhinos
->daphaenodon : daphaenodon
+>daphaenodon : macrorhinos.daphaenodon
 >() => { var y = this; } : () => void
 >y : jugularis
 >this : jugularis
->x : daphaenodon
+>x : macrorhinos.daphaenodon
 
     compactus() : sagitta.stolzmanni { var x : sagitta.stolzmanni; () => { var y = this; }; return x; }
->compactus : () => stolzmanni
+>compactus : () => sagitta.stolzmanni
 >sagitta : sagitta
->stolzmanni : stolzmanni
->x : stolzmanni
+>stolzmanni : sagitta.stolzmanni
+>x : sagitta.stolzmanni
 >sagitta : sagitta
->stolzmanni : stolzmanni
+>stolzmanni : sagitta.stolzmanni
 >() => { var y = this; } : () => void
 >y : jugularis
 >this : jugularis
->x : stolzmanni
+>x : sagitta.stolzmanni
 
     talpinus() : nitidus<ruatanica.americanus, sagitta.stolzmanni> { var x : nitidus<ruatanica.americanus, sagitta.stolzmanni>; () => { var y = this; }; return x; }
->talpinus : () => nitidus<americanus, stolzmanni>
+>talpinus : () => nitidus<ruatanica.americanus, sagitta.stolzmanni>
 >nitidus : nitidus<T0, T1>
 >ruatanica : ruatanica
->americanus : americanus
+>americanus : ruatanica.americanus
 >sagitta : sagitta
->stolzmanni : stolzmanni
->x : nitidus<americanus, stolzmanni>
+>stolzmanni : sagitta.stolzmanni
+>x : nitidus<ruatanica.americanus, sagitta.stolzmanni>
 >nitidus : nitidus<T0, T1>
 >ruatanica : ruatanica
->americanus : americanus
+>americanus : ruatanica.americanus
 >sagitta : sagitta
->stolzmanni : stolzmanni
+>stolzmanni : sagitta.stolzmanni
 >() => { var y = this; } : () => void
 >y : jugularis
 >this : jugularis
->x : nitidus<americanus, stolzmanni>
+>x : nitidus<ruatanica.americanus, sagitta.stolzmanni>
 
     stramineus() : gabriellae.amicus { var x : gabriellae.amicus; () => { var y = this; }; return x; }
->stramineus : () => amicus
+>stramineus : () => gabriellae.amicus
 >gabriellae : gabriellae
->amicus : amicus
->x : amicus
+>amicus : gabriellae.amicus
+>x : gabriellae.amicus
 >gabriellae : gabriellae
->amicus : amicus
+>amicus : gabriellae.amicus
 >() => { var y = this; } : () => void
 >y : jugularis
 >this : jugularis
->x : amicus
+>x : gabriellae.amicus
 
     dartmouthi() : trivirgatus.mixtus<macrorhinos.daphaenodon, argurus.luctuosa> { var x : trivirgatus.mixtus<macrorhinos.daphaenodon, argurus.luctuosa>; () => { var y = this; }; return x; }
->dartmouthi : () => mixtus<daphaenodon, luctuosa>
+>dartmouthi : () => trivirgatus.mixtus<macrorhinos.daphaenodon, argurus.luctuosa>
 >trivirgatus : trivirgatus
->mixtus : mixtus<T0, T1>
+>mixtus : trivirgatus.mixtus<T0, T1>
 >macrorhinos : macrorhinos
->daphaenodon : daphaenodon
+>daphaenodon : macrorhinos.daphaenodon
 >argurus : argurus
->luctuosa : luctuosa
->x : mixtus<daphaenodon, luctuosa>
+>luctuosa : argurus.luctuosa
+>x : trivirgatus.mixtus<macrorhinos.daphaenodon, argurus.luctuosa>
 >trivirgatus : trivirgatus
->mixtus : mixtus<T0, T1>
+>mixtus : trivirgatus.mixtus<T0, T1>
 >macrorhinos : macrorhinos
->daphaenodon : daphaenodon
+>daphaenodon : macrorhinos.daphaenodon
 >argurus : argurus
->luctuosa : luctuosa
+>luctuosa : argurus.luctuosa
 >() => { var y = this; } : () => void
 >y : jugularis
 >this : jugularis
->x : mixtus<daphaenodon, luctuosa>
+>x : trivirgatus.mixtus<macrorhinos.daphaenodon, argurus.luctuosa>
 
     ogilbyi() : argurus.dauricus<argurus.oreas, quasiater.carolinensis> { var x : argurus.dauricus<argurus.oreas, quasiater.carolinensis>; () => { var y = this; }; return x; }
->ogilbyi : () => dauricus<oreas, carolinensis>
+>ogilbyi : () => argurus.dauricus<argurus.oreas, quasiater.carolinensis>
 >argurus : argurus
->dauricus : dauricus<T0, T1>
+>dauricus : argurus.dauricus<T0, T1>
 >argurus : argurus
->oreas : oreas
+>oreas : argurus.oreas
 >quasiater : quasiater
->carolinensis : carolinensis
->x : dauricus<oreas, carolinensis>
+>carolinensis : quasiater.carolinensis
+>x : argurus.dauricus<argurus.oreas, quasiater.carolinensis>
 >argurus : argurus
->dauricus : dauricus<T0, T1>
+>dauricus : argurus.dauricus<T0, T1>
 >argurus : argurus
->oreas : oreas
+>oreas : argurus.oreas
 >quasiater : quasiater
->carolinensis : carolinensis
+>carolinensis : quasiater.carolinensis
 >() => { var y = this; } : () => void
 >y : jugularis
 >this : jugularis
->x : dauricus<oreas, carolinensis>
+>x : argurus.dauricus<argurus.oreas, quasiater.carolinensis>
 
     incomtus() : daubentonii.nesiotes<julianae.sumatrana, quasiater.carolinensis> { var x : daubentonii.nesiotes<julianae.sumatrana, quasiater.carolinensis>; () => { var y = this; }; return x; }
->incomtus : () => nesiotes<sumatrana, carolinensis>
+>incomtus : () => daubentonii.nesiotes<julianae.sumatrana, quasiater.carolinensis>
 >daubentonii : daubentonii
->nesiotes : nesiotes<T0, T1>
+>nesiotes : daubentonii.nesiotes<T0, T1>
 >julianae : julianae
->sumatrana : sumatrana
+>sumatrana : julianae.sumatrana
 >quasiater : quasiater
->carolinensis : carolinensis
->x : nesiotes<sumatrana, carolinensis>
+>carolinensis : quasiater.carolinensis
+>x : daubentonii.nesiotes<julianae.sumatrana, quasiater.carolinensis>
 >daubentonii : daubentonii
->nesiotes : nesiotes<T0, T1>
+>nesiotes : daubentonii.nesiotes<T0, T1>
 >julianae : julianae
->sumatrana : sumatrana
+>sumatrana : julianae.sumatrana
 >quasiater : quasiater
->carolinensis : carolinensis
+>carolinensis : quasiater.carolinensis
 >() => { var y = this; } : () => void
 >y : jugularis
 >this : jugularis
->x : nesiotes<sumatrana, carolinensis>
+>x : daubentonii.nesiotes<julianae.sumatrana, quasiater.carolinensis>
 
     surdaster() : ruatanica.Praseodymium<argurus.germaini, caurinus.megaphyllus> { var x : ruatanica.Praseodymium<argurus.germaini, caurinus.megaphyllus>; () => { var y = this; }; return x; }
->surdaster : () => Praseodymium<germaini, megaphyllus>
+>surdaster : () => ruatanica.Praseodymium<argurus.germaini, caurinus.megaphyllus>
 >ruatanica : ruatanica
->Praseodymium : Praseodymium<T0, T1>
+>Praseodymium : ruatanica.Praseodymium<T0, T1>
 >argurus : argurus
->germaini : germaini
+>germaini : argurus.germaini
 >caurinus : caurinus
->megaphyllus : megaphyllus
->x : Praseodymium<germaini, megaphyllus>
+>megaphyllus : caurinus.megaphyllus
+>x : ruatanica.Praseodymium<argurus.germaini, caurinus.megaphyllus>
 >ruatanica : ruatanica
->Praseodymium : Praseodymium<T0, T1>
+>Praseodymium : ruatanica.Praseodymium<T0, T1>
 >argurus : argurus
->germaini : germaini
+>germaini : argurus.germaini
 >caurinus : caurinus
->megaphyllus : megaphyllus
+>megaphyllus : caurinus.megaphyllus
 >() => { var y = this; } : () => void
 >y : jugularis
 >this : jugularis
->x : Praseodymium<germaini, megaphyllus>
+>x : ruatanica.Praseodymium<argurus.germaini, caurinus.megaphyllus>
 
     melanorhinus() : samarensis.pelurus<dammermani.melanops, rendalli.zuluensis> { var x : samarensis.pelurus<dammermani.melanops, rendalli.zuluensis>; () => { var y = this; }; return x; }
->melanorhinus : () => pelurus<melanops, zuluensis>
+>melanorhinus : () => samarensis.pelurus<dammermani.melanops, rendalli.zuluensis>
 >samarensis : samarensis
->pelurus : pelurus<T0, T1>
+>pelurus : samarensis.pelurus<T0, T1>
 >dammermani : dammermani
->melanops : melanops
+>melanops : dammermani.melanops
 >rendalli : rendalli
->zuluensis : zuluensis
->x : pelurus<melanops, zuluensis>
+>zuluensis : rendalli.zuluensis
+>x : samarensis.pelurus<dammermani.melanops, rendalli.zuluensis>
 >samarensis : samarensis
->pelurus : pelurus<T0, T1>
+>pelurus : samarensis.pelurus<T0, T1>
 >dammermani : dammermani
->melanops : melanops
+>melanops : dammermani.melanops
 >rendalli : rendalli
->zuluensis : zuluensis
+>zuluensis : rendalli.zuluensis
 >() => { var y = this; } : () => void
 >y : jugularis
 >this : jugularis
->x : pelurus<melanops, zuluensis>
+>x : samarensis.pelurus<dammermani.melanops, rendalli.zuluensis>
 
     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 : () => inez<wattsi<carolinensis, lepturus>, kaiseri>
+>picticaudata : () => minutus.inez<quasiater.wattsi<quasiater.carolinensis, lavali.lepturus>, dogramacii.kaiseri>
 >minutus : minutus
->inez : inez<T0, T1>
+>inez : minutus.inez<T0, T1>
 >quasiater : quasiater
->wattsi : wattsi<T0, T1>
+>wattsi : quasiater.wattsi<T0, T1>
 >quasiater : quasiater
->carolinensis : carolinensis
+>carolinensis : quasiater.carolinensis
 >lavali : lavali
->lepturus : lepturus
+>lepturus : lavali.lepturus
 >dogramacii : dogramacii
->kaiseri : kaiseri
->x : inez<wattsi<carolinensis, lepturus>, kaiseri>
+>kaiseri : dogramacii.kaiseri
+>x : minutus.inez<quasiater.wattsi<quasiater.carolinensis, lavali.lepturus>, dogramacii.kaiseri>
 >minutus : minutus
->inez : inez<T0, T1>
+>inez : minutus.inez<T0, T1>
 >quasiater : quasiater
->wattsi : wattsi<T0, T1>
+>wattsi : quasiater.wattsi<T0, T1>
 >quasiater : quasiater
->carolinensis : carolinensis
+>carolinensis : quasiater.carolinensis
 >lavali : lavali
->lepturus : lepturus
+>lepturus : lavali.lepturus
 >dogramacii : dogramacii
->kaiseri : kaiseri
+>kaiseri : dogramacii.kaiseri
 >() => { var y = this; } : () => void
 >y : jugularis
 >this : jugularis
->x : inez<wattsi<carolinensis, lepturus>, kaiseri>
+>x : minutus.inez<quasiater.wattsi<quasiater.carolinensis, lavali.lepturus>, dogramacii.kaiseri>
 
     pomona() : julianae.steerii { var x : julianae.steerii; () => { var y = this; }; return x; }
->pomona : () => steerii
+>pomona : () => julianae.steerii
 >julianae : julianae
->steerii : steerii
->x : steerii
+>steerii : julianae.steerii
+>x : julianae.steerii
 >julianae : julianae
->steerii : steerii
+>steerii : julianae.steerii
 >() => { var y = this; } : () => void
 >y : jugularis
 >this : jugularis
->x : steerii
+>x : julianae.steerii
 
     ileile() : quasiater.carolinensis { var x : quasiater.carolinensis; () => { var y = this; }; return x; }
->ileile : () => carolinensis
+>ileile : () => quasiater.carolinensis
 >quasiater : quasiater
->carolinensis : carolinensis
->x : carolinensis
+>carolinensis : quasiater.carolinensis
+>x : quasiater.carolinensis
 >quasiater : quasiater
->carolinensis : carolinensis
+>carolinensis : quasiater.carolinensis
 >() => { var y = this; } : () => void
 >y : jugularis
 >this : jugularis
->x : carolinensis
+>x : quasiater.carolinensis
   }
 }
 module rendalli {
->rendalli : typeof rendalli
+>rendalli : rendalli
 
   export class zuluensis extends julianae.steerii {
 >zuluensis : zuluensis
 >julianae : julianae
->steerii : steerii
+>steerii : julianae.steerii
 
     telfairi() : argurus.wetmorei<Lanthanum.megalonyx, provocax.melanoleuca> { var x : argurus.wetmorei<Lanthanum.megalonyx, provocax.melanoleuca>; () => { var y = this; }; return x; }
->telfairi : () => wetmorei<megalonyx, melanoleuca>
+>telfairi : () => argurus.wetmorei<Lanthanum.megalonyx, provocax.melanoleuca>
 >argurus : argurus
->wetmorei : wetmorei<T0, T1>
+>wetmorei : argurus.wetmorei<T0, T1>
 >Lanthanum : Lanthanum
->megalonyx : megalonyx
+>megalonyx : Lanthanum.megalonyx
 >provocax : provocax
->melanoleuca : melanoleuca
->x : wetmorei<megalonyx, melanoleuca>
+>melanoleuca : provocax.melanoleuca
+>x : argurus.wetmorei<Lanthanum.megalonyx, provocax.melanoleuca>
 >argurus : argurus
->wetmorei : wetmorei<T0, T1>
+>wetmorei : argurus.wetmorei<T0, T1>
 >Lanthanum : Lanthanum
->megalonyx : megalonyx
+>megalonyx : Lanthanum.megalonyx
 >provocax : provocax
->melanoleuca : melanoleuca
+>melanoleuca : provocax.melanoleuca
 >() => { var y = this; } : () => void
 >y : zuluensis
 >this : zuluensis
->x : wetmorei<megalonyx, melanoleuca>
+>x : argurus.wetmorei<Lanthanum.megalonyx, provocax.melanoleuca>
 
     keyensis() : quasiater.wattsi<quasiater.carolinensis, lavali.lepturus> { var x : quasiater.wattsi<quasiater.carolinensis, lavali.lepturus>; () => { var y = this; }; return x; }
->keyensis : () => wattsi<carolinensis, lepturus>
+>keyensis : () => quasiater.wattsi<quasiater.carolinensis, lavali.lepturus>
 >quasiater : quasiater
->wattsi : wattsi<T0, T1>
+>wattsi : quasiater.wattsi<T0, T1>
 >quasiater : quasiater
->carolinensis : carolinensis
+>carolinensis : quasiater.carolinensis
 >lavali : lavali
->lepturus : lepturus
->x : wattsi<carolinensis, lepturus>
+>lepturus : lavali.lepturus
+>x : quasiater.wattsi<quasiater.carolinensis, lavali.lepturus>
 >quasiater : quasiater
->wattsi : wattsi<T0, T1>
+>wattsi : quasiater.wattsi<T0, T1>
 >quasiater : quasiater
->carolinensis : carolinensis
+>carolinensis : quasiater.carolinensis
 >lavali : lavali
->lepturus : lepturus
+>lepturus : lavali.lepturus
 >() => { var y = this; } : () => void
 >y : zuluensis
 >this : zuluensis
->x : wattsi<carolinensis, lepturus>
+>x : quasiater.wattsi<quasiater.carolinensis, lavali.lepturus>
 
     occasius() : argurus.gilbertii<caurinus.psilurus, lavali.xanthognathus> { var x : argurus.gilbertii<caurinus.psilurus, lavali.xanthognathus>; () => { var y = this; }; return x; }
->occasius : () => gilbertii<psilurus, xanthognathus>
+>occasius : () => argurus.gilbertii<caurinus.psilurus, lavali.xanthognathus>
 >argurus : argurus
->gilbertii : gilbertii<T0, T1>
+>gilbertii : argurus.gilbertii<T0, T1>
 >caurinus : caurinus
->psilurus : psilurus
+>psilurus : caurinus.psilurus
 >lavali : lavali
->xanthognathus : xanthognathus
->x : gilbertii<psilurus, xanthognathus>
+>xanthognathus : lavali.xanthognathus
+>x : argurus.gilbertii<caurinus.psilurus, lavali.xanthognathus>
 >argurus : argurus
->gilbertii : gilbertii<T0, T1>
+>gilbertii : argurus.gilbertii<T0, T1>
 >caurinus : caurinus
->psilurus : psilurus
+>psilurus : caurinus.psilurus
 >lavali : lavali
->xanthognathus : xanthognathus
+>xanthognathus : lavali.xanthognathus
 >() => { var y = this; } : () => void
 >y : zuluensis
 >this : zuluensis
->x : gilbertii<psilurus, xanthognathus>
+>x : argurus.gilbertii<caurinus.psilurus, lavali.xanthognathus>
 
     damarensis() : julianae.galapagoensis { var x : julianae.galapagoensis; () => { var y = this; }; return x; }
->damarensis : () => galapagoensis
+>damarensis : () => julianae.galapagoensis
 >julianae : julianae
->galapagoensis : galapagoensis
->x : galapagoensis
+>galapagoensis : julianae.galapagoensis
+>x : julianae.galapagoensis
 >julianae : julianae
->galapagoensis : galapagoensis
+>galapagoensis : julianae.galapagoensis
 >() => { var y = this; } : () => void
 >y : zuluensis
 >this : zuluensis
->x : galapagoensis
+>x : julianae.galapagoensis
 
     Neptunium() : panglima.abidi<dogramacii.robustulus, lutreolus.foina> { var x : panglima.abidi<dogramacii.robustulus, lutreolus.foina>; () => { var y = this; }; return x; }
->Neptunium : () => abidi<robustulus, foina>
+>Neptunium : () => panglima.abidi<dogramacii.robustulus, lutreolus.foina>
 >panglima : panglima
->abidi : abidi<T0, T1>
+>abidi : panglima.abidi<T0, T1>
 >dogramacii : dogramacii
->robustulus : robustulus
+>robustulus : dogramacii.robustulus
 >lutreolus : lutreolus
->foina : foina
->x : abidi<robustulus, foina>
+>foina : lutreolus.foina
+>x : panglima.abidi<dogramacii.robustulus, lutreolus.foina>
 >panglima : panglima
->abidi : abidi<T0, T1>
+>abidi : panglima.abidi<T0, T1>
 >dogramacii : dogramacii
->robustulus : robustulus
+>robustulus : dogramacii.robustulus
 >lutreolus : lutreolus
->foina : foina
+>foina : lutreolus.foina
 >() => { var y = this; } : () => void
 >y : zuluensis
 >this : zuluensis
->x : abidi<robustulus, foina>
+>x : panglima.abidi<dogramacii.robustulus, lutreolus.foina>
 
     griseoflavus() : ruatanica.americanus { var x : ruatanica.americanus; () => { var y = this; }; return x; }
->griseoflavus : () => americanus
+>griseoflavus : () => ruatanica.americanus
 >ruatanica : ruatanica
->americanus : americanus
->x : americanus
+>americanus : ruatanica.americanus
+>x : ruatanica.americanus
 >ruatanica : ruatanica
->americanus : americanus
+>americanus : ruatanica.americanus
 >() => { var y = this; } : () => void
 >y : zuluensis
 >this : zuluensis
->x : americanus
+>x : ruatanica.americanus
 
     thar() : argurus.oreas { var x : argurus.oreas; () => { var y = this; }; return x; }
->thar : () => oreas
+>thar : () => argurus.oreas
 >argurus : argurus
->oreas : oreas
->x : oreas
+>oreas : argurus.oreas
+>x : argurus.oreas
 >argurus : argurus
->oreas : oreas
+>oreas : argurus.oreas
 >() => { var y = this; } : () => void
 >y : zuluensis
 >this : zuluensis
->x : oreas
+>x : argurus.oreas
 
     alborufus() : panamensis.linulus<lavali.lepturus, argurus.oreas> { var x : panamensis.linulus<lavali.lepturus, argurus.oreas>; () => { var y = this; }; return x; }
->alborufus : () => linulus<lepturus, oreas>
+>alborufus : () => panamensis.linulus<lavali.lepturus, argurus.oreas>
 >panamensis : panamensis
->linulus : linulus<T0, T1>
+>linulus : panamensis.linulus<T0, T1>
 >lavali : lavali
->lepturus : lepturus
+>lepturus : lavali.lepturus
 >argurus : argurus
->oreas : oreas
->x : linulus<lepturus, oreas>
+>oreas : argurus.oreas
+>x : panamensis.linulus<lavali.lepturus, argurus.oreas>
 >panamensis : panamensis
->linulus : linulus<T0, T1>
+>linulus : panamensis.linulus<T0, T1>
 >lavali : lavali
->lepturus : lepturus
+>lepturus : lavali.lepturus
 >argurus : argurus
->oreas : oreas
+>oreas : argurus.oreas
 >() => { var y = this; } : () => void
 >y : zuluensis
 >this : zuluensis
->x : linulus<lepturus, oreas>
+>x : panamensis.linulus<lavali.lepturus, argurus.oreas>
 
     fusicaudus() : sagitta.stolzmanni { var x : sagitta.stolzmanni; () => { var y = this; }; return x; }
->fusicaudus : () => stolzmanni
+>fusicaudus : () => sagitta.stolzmanni
 >sagitta : sagitta
->stolzmanni : stolzmanni
->x : stolzmanni
+>stolzmanni : sagitta.stolzmanni
+>x : sagitta.stolzmanni
 >sagitta : sagitta
->stolzmanni : stolzmanni
+>stolzmanni : sagitta.stolzmanni
 >() => { var y = this; } : () => void
 >y : zuluensis
 >this : zuluensis
->x : stolzmanni
+>x : sagitta.stolzmanni
 
     gordonorum() : howi.angulatus<ruatanica.americanus, argurus.germaini> { var x : howi.angulatus<ruatanica.americanus, argurus.germaini>; () => { var y = this; }; return x; }
->gordonorum : () => angulatus<americanus, germaini>
+>gordonorum : () => howi.angulatus<ruatanica.americanus, argurus.germaini>
 >howi : howi
->angulatus : angulatus<T0, T1>
+>angulatus : howi.angulatus<T0, T1>
 >ruatanica : ruatanica
->americanus : americanus
+>americanus : ruatanica.americanus
 >argurus : argurus
->germaini : germaini
->x : angulatus<americanus, germaini>
+>germaini : argurus.germaini
+>x : howi.angulatus<ruatanica.americanus, argurus.germaini>
 >howi : howi
->angulatus : angulatus<T0, T1>
+>angulatus : howi.angulatus<T0, T1>
 >ruatanica : ruatanica
->americanus : americanus
+>americanus : ruatanica.americanus
 >argurus : argurus
->germaini : germaini
+>germaini : argurus.germaini
 >() => { var y = this; } : () => void
 >y : zuluensis
 >this : zuluensis
->x : angulatus<americanus, germaini>
+>x : howi.angulatus<ruatanica.americanus, argurus.germaini>
 
     ruber() : dammermani.siberu<lutreolus.punicus, julianae.acariensis> { var x : dammermani.siberu<lutreolus.punicus, julianae.acariensis>; () => { var y = this; }; return x; }
->ruber : () => siberu<punicus, acariensis>
+>ruber : () => dammermani.siberu<lutreolus.punicus, julianae.acariensis>
 >dammermani : dammermani
->siberu : siberu<T0, T1>
+>siberu : dammermani.siberu<T0, T1>
 >lutreolus : lutreolus
->punicus : punicus
+>punicus : lutreolus.punicus
 >julianae : julianae
->acariensis : acariensis
->x : siberu<punicus, acariensis>
+>acariensis : julianae.acariensis
+>x : dammermani.siberu<lutreolus.punicus, julianae.acariensis>
 >dammermani : dammermani
->siberu : siberu<T0, T1>
+>siberu : dammermani.siberu<T0, T1>
 >lutreolus : lutreolus
->punicus : punicus
+>punicus : lutreolus.punicus
 >julianae : julianae
->acariensis : acariensis
+>acariensis : julianae.acariensis
 >() => { var y = this; } : () => void
 >y : zuluensis
 >this : zuluensis
->x : siberu<punicus, acariensis>
+>x : dammermani.siberu<lutreolus.punicus, julianae.acariensis>
 
     desmarestianus() : julianae.steerii { var x : julianae.steerii; () => { var y = this; }; return x; }
->desmarestianus : () => steerii
+>desmarestianus : () => julianae.steerii
 >julianae : julianae
->steerii : steerii
->x : steerii
+>steerii : julianae.steerii
+>x : julianae.steerii
 >julianae : julianae
->steerii : steerii
+>steerii : julianae.steerii
 >() => { var y = this; } : () => void
 >y : zuluensis
 >this : zuluensis
->x : steerii
+>x : julianae.steerii
 
     lutillus() : nigra.dolichurus<howi.marcanoi, lavali.wilsoni> { var x : nigra.dolichurus<howi.marcanoi, lavali.wilsoni>; () => { var y = this; }; return x; }
->lutillus : () => dolichurus<marcanoi, wilsoni>
+>lutillus : () => nigra.dolichurus<howi.marcanoi, lavali.wilsoni>
 >nigra : nigra
->dolichurus : dolichurus<T0, T1>
+>dolichurus : nigra.dolichurus<T0, T1>
 >howi : howi
->marcanoi : marcanoi
+>marcanoi : howi.marcanoi
 >lavali : lavali
->wilsoni : wilsoni
->x : dolichurus<marcanoi, wilsoni>
+>wilsoni : lavali.wilsoni
+>x : nigra.dolichurus<howi.marcanoi, lavali.wilsoni>
 >nigra : nigra
->dolichurus : dolichurus<T0, T1>
+>dolichurus : nigra.dolichurus<T0, T1>
 >howi : howi
->marcanoi : marcanoi
+>marcanoi : howi.marcanoi
 >lavali : lavali
->wilsoni : wilsoni
+>wilsoni : lavali.wilsoni
 >() => { var y = this; } : () => void
 >y : zuluensis
 >this : zuluensis
->x : dolichurus<marcanoi, wilsoni>
+>x : nigra.dolichurus<howi.marcanoi, lavali.wilsoni>
 
     salocco() : argurus.peninsulae { var x : argurus.peninsulae; () => { var y = this; }; return x; }
->salocco : () => peninsulae
+>salocco : () => argurus.peninsulae
 >argurus : argurus
->peninsulae : peninsulae
->x : peninsulae
+>peninsulae : argurus.peninsulae
+>x : argurus.peninsulae
 >argurus : argurus
->peninsulae : peninsulae
+>peninsulae : argurus.peninsulae
 >() => { var y = this; } : () => void
 >y : zuluensis
 >this : zuluensis
->x : peninsulae
+>x : argurus.peninsulae
   }
   export class moojeni<T0, T1> {
 >moojeni : moojeni<T0, T1>
@@ -2225,48 +2225,48 @@ module rendalli {
 >T1 : T1
 
     floweri() : lavali.otion { var x : lavali.otion; () => { var y = this; }; return x; }
->floweri : () => otion
+>floweri : () => lavali.otion
 >lavali : lavali
->otion : otion
->x : otion
+>otion : lavali.otion
+>x : lavali.otion
 >lavali : lavali
->otion : otion
+>otion : lavali.otion
 >() => { var y = this; } : () => void
 >y : moojeni<T0, T1>
 >this : moojeni<T0, T1>
->x : otion
+>x : lavali.otion
 
     montosa() : imperfecta.ciliolabrum<Lanthanum.megalonyx, petrophilus.minutilla> { var x : imperfecta.ciliolabrum<Lanthanum.megalonyx, petrophilus.minutilla>; () => { var y = this; }; return x; }
->montosa : () => ciliolabrum<megalonyx, minutilla>
+>montosa : () => imperfecta.ciliolabrum<Lanthanum.megalonyx, petrophilus.minutilla>
 >imperfecta : imperfecta
->ciliolabrum : ciliolabrum<T0, T1>
+>ciliolabrum : imperfecta.ciliolabrum<T0, T1>
 >Lanthanum : Lanthanum
->megalonyx : megalonyx
+>megalonyx : Lanthanum.megalonyx
 >petrophilus : petrophilus
->minutilla : minutilla
->x : ciliolabrum<megalonyx, minutilla>
+>minutilla : petrophilus.minutilla
+>x : imperfecta.ciliolabrum<Lanthanum.megalonyx, petrophilus.minutilla>
 >imperfecta : imperfecta
->ciliolabrum : ciliolabrum<T0, T1>
+>ciliolabrum : imperfecta.ciliolabrum<T0, T1>
 >Lanthanum : Lanthanum
->megalonyx : megalonyx
+>megalonyx : Lanthanum.megalonyx
 >petrophilus : petrophilus
->minutilla : minutilla
+>minutilla : petrophilus.minutilla
 >() => { var y = this; } : () => void
 >y : moojeni<T0, T1>
 >this : moojeni<T0, T1>
->x : ciliolabrum<megalonyx, minutilla>
+>x : imperfecta.ciliolabrum<Lanthanum.megalonyx, petrophilus.minutilla>
 
     miletus() : julianae.sumatrana { var x : julianae.sumatrana; () => { var y = this; }; return x; }
->miletus : () => sumatrana
+>miletus : () => julianae.sumatrana
 >julianae : julianae
->sumatrana : sumatrana
->x : sumatrana
+>sumatrana : julianae.sumatrana
+>x : julianae.sumatrana
 >julianae : julianae
->sumatrana : sumatrana
+>sumatrana : julianae.sumatrana
 >() => { var y = this; } : () => void
 >y : moojeni<T0, T1>
 >this : moojeni<T0, T1>
->x : sumatrana
+>x : julianae.sumatrana
 
     heaneyi() : zuluensis { var x : zuluensis; () => { var y = this; }; return x; }
 >heaneyi : () => zuluensis
@@ -2279,219 +2279,219 @@ module rendalli {
 >x : zuluensis
 
     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 : () => amphibius<uralensis, klossii<nudicaudus, aurata>>
+>marchei : () => panglima.amphibius<patas.uralensis, gabriellae.klossii<julianae.nudicaudus, dogramacii.aurata>>
 >panglima : panglima
->amphibius : amphibius<T0, T1>
+>amphibius : panglima.amphibius<T0, T1>
 >patas : patas
->uralensis : uralensis
+>uralensis : patas.uralensis
 >gabriellae : gabriellae
->klossii : klossii<T0, T1>
+>klossii : gabriellae.klossii<T0, T1>
 >julianae : julianae
->nudicaudus : nudicaudus
+>nudicaudus : julianae.nudicaudus
 >dogramacii : dogramacii
->aurata : aurata
->x : amphibius<uralensis, klossii<nudicaudus, aurata>>
+>aurata : dogramacii.aurata
+>x : panglima.amphibius<patas.uralensis, gabriellae.klossii<julianae.nudicaudus, dogramacii.aurata>>
 >panglima : panglima
->amphibius : amphibius<T0, T1>
+>amphibius : panglima.amphibius<T0, T1>
 >patas : patas
->uralensis : uralensis
+>uralensis : patas.uralensis
 >gabriellae : gabriellae
->klossii : klossii<T0, T1>
+>klossii : gabriellae.klossii<T0, T1>
 >julianae : julianae
->nudicaudus : nudicaudus
+>nudicaudus : julianae.nudicaudus
 >dogramacii : dogramacii
->aurata : aurata
+>aurata : dogramacii.aurata
 >() => { var y = this; } : () => void
 >y : moojeni<T0, T1>
 >this : moojeni<T0, T1>
->x : amphibius<uralensis, klossii<nudicaudus, aurata>>
+>x : panglima.amphibius<patas.uralensis, gabriellae.klossii<julianae.nudicaudus, dogramacii.aurata>>
 
     budini() : julianae.durangae { var x : julianae.durangae; () => { var y = this; }; return x; }
->budini : () => durangae
+>budini : () => julianae.durangae
 >julianae : julianae
->durangae : durangae
->x : durangae
+>durangae : julianae.durangae
+>x : julianae.durangae
 >julianae : julianae
->durangae : durangae
+>durangae : julianae.durangae
 >() => { var y = this; } : () => void
 >y : moojeni<T0, T1>
 >this : moojeni<T0, T1>
->x : durangae
+>x : julianae.durangae
 
     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 : () => mixtus<amphibius<klossii<jugularis, jugularis>, subspinosus>, stolzmanni>
+>maggietaylorae : () => trivirgatus.mixtus<panglima.amphibius<gabriellae.klossii<Lanthanum.jugularis, Lanthanum.jugularis>, imperfecta.subspinosus>, sagitta.stolzmanni>
 >trivirgatus : trivirgatus
->mixtus : mixtus<T0, T1>
+>mixtus : trivirgatus.mixtus<T0, T1>
 >panglima : panglima
->amphibius : amphibius<T0, T1>
+>amphibius : panglima.amphibius<T0, T1>
 >gabriellae : gabriellae
->klossii : klossii<T0, T1>
+>klossii : gabriellae.klossii<T0, T1>
 >Lanthanum : Lanthanum
->jugularis : jugularis
+>jugularis : Lanthanum.jugularis
 >Lanthanum : Lanthanum
->jugularis : jugularis
+>jugularis : Lanthanum.jugularis
 >imperfecta : imperfecta
->subspinosus : subspinosus
+>subspinosus : imperfecta.subspinosus
 >sagitta : sagitta
->stolzmanni : stolzmanni
->x : mixtus<amphibius<klossii<jugularis, jugularis>, subspinosus>, stolzmanni>
+>stolzmanni : sagitta.stolzmanni
+>x : trivirgatus.mixtus<panglima.amphibius<gabriellae.klossii<Lanthanum.jugularis, Lanthanum.jugularis>, imperfecta.subspinosus>, sagitta.stolzmanni>
 >trivirgatus : trivirgatus
->mixtus : mixtus<T0, T1>
+>mixtus : trivirgatus.mixtus<T0, T1>
 >panglima : panglima
->amphibius : amphibius<T0, T1>
+>amphibius : panglima.amphibius<T0, T1>
 >gabriellae : gabriellae
->klossii : klossii<T0, T1>
+>klossii : gabriellae.klossii<T0, T1>
 >Lanthanum : Lanthanum
->jugularis : jugularis
+>jugularis : Lanthanum.jugularis
 >Lanthanum : Lanthanum
->jugularis : jugularis
+>jugularis : Lanthanum.jugularis
 >imperfecta : imperfecta
->subspinosus : subspinosus
+>subspinosus : imperfecta.subspinosus
 >sagitta : sagitta
->stolzmanni : stolzmanni
+>stolzmanni : sagitta.stolzmanni
 >() => { var y = this; } : () => void
 >y : moojeni<T0, T1>
 >this : moojeni<T0, T1>
->x : mixtus<amphibius<klossii<jugularis, jugularis>, subspinosus>, stolzmanni>
+>x : trivirgatus.mixtus<panglima.amphibius<gabriellae.klossii<Lanthanum.jugularis, Lanthanum.jugularis>, imperfecta.subspinosus>, sagitta.stolzmanni>
 
     poliocephalus() : julianae.gerbillus<julianae.durangae, dammermani.melanops> { var x : julianae.gerbillus<julianae.durangae, dammermani.melanops>; () => { var y = this; }; return x; }
->poliocephalus : () => gerbillus<durangae, melanops>
+>poliocephalus : () => julianae.gerbillus<julianae.durangae, dammermani.melanops>
 >julianae : julianae
->gerbillus : gerbillus<T0, T1>
+>gerbillus : julianae.gerbillus<T0, T1>
 >julianae : julianae
->durangae : durangae
+>durangae : julianae.durangae
 >dammermani : dammermani
->melanops : melanops
->x : gerbillus<durangae, melanops>
+>melanops : dammermani.melanops
+>x : julianae.gerbillus<julianae.durangae, dammermani.melanops>
 >julianae : julianae
->gerbillus : gerbillus<T0, T1>
+>gerbillus : julianae.gerbillus<T0, T1>
 >julianae : julianae
->durangae : durangae
+>durangae : julianae.durangae
 >dammermani : dammermani
->melanops : melanops
+>melanops : dammermani.melanops
 >() => { var y = this; } : () => void
 >y : moojeni<T0, T1>
 >this : moojeni<T0, T1>
->x : gerbillus<durangae, melanops>
+>x : julianae.gerbillus<julianae.durangae, dammermani.melanops>
 
     zibethicus() : minutus.inez<sagitta.stolzmanni, dammermani.melanops> { var x : minutus.inez<sagitta.stolzmanni, dammermani.melanops>; () => { var y = this; }; return x; }
->zibethicus : () => inez<stolzmanni, melanops>
+>zibethicus : () => minutus.inez<sagitta.stolzmanni, dammermani.melanops>
 >minutus : minutus
->inez : inez<T0, T1>
+>inez : minutus.inez<T0, T1>
 >sagitta : sagitta
->stolzmanni : stolzmanni
+>stolzmanni : sagitta.stolzmanni
 >dammermani : dammermani
->melanops : melanops
->x : inez<stolzmanni, melanops>
+>melanops : dammermani.melanops
+>x : minutus.inez<sagitta.stolzmanni, dammermani.melanops>
 >minutus : minutus
->inez : inez<T0, T1>
+>inez : minutus.inez<T0, T1>
 >sagitta : sagitta
->stolzmanni : stolzmanni
+>stolzmanni : sagitta.stolzmanni
 >dammermani : dammermani
->melanops : melanops
+>melanops : dammermani.melanops
 >() => { var y = this; } : () => void
 >y : moojeni<T0, T1>
 >this : moojeni<T0, T1>
->x : inez<stolzmanni, melanops>
+>x : minutus.inez<sagitta.stolzmanni, dammermani.melanops>
 
     biacensis() : howi.coludo<quasiater.bobrinskoi, provocax.melanoleuca> { var x : howi.coludo<quasiater.bobrinskoi, provocax.melanoleuca>; () => { var y = this; }; return x; }
->biacensis : () => coludo<bobrinskoi, melanoleuca>
+>biacensis : () => howi.coludo<quasiater.bobrinskoi, provocax.melanoleuca>
 >howi : howi
->coludo : coludo<T0, T1>
+>coludo : howi.coludo<T0, T1>
 >quasiater : quasiater
->bobrinskoi : bobrinskoi
+>bobrinskoi : quasiater.bobrinskoi
 >provocax : provocax
->melanoleuca : melanoleuca
->x : coludo<bobrinskoi, melanoleuca>
+>melanoleuca : provocax.melanoleuca
+>x : howi.coludo<quasiater.bobrinskoi, provocax.melanoleuca>
 >howi : howi
->coludo : coludo<T0, T1>
+>coludo : howi.coludo<T0, T1>
 >quasiater : quasiater
->bobrinskoi : bobrinskoi
+>bobrinskoi : quasiater.bobrinskoi
 >provocax : provocax
->melanoleuca : melanoleuca
+>melanoleuca : provocax.melanoleuca
 >() => { var y = this; } : () => void
 >y : moojeni<T0, T1>
 >this : moojeni<T0, T1>
->x : coludo<bobrinskoi, melanoleuca>
+>x : howi.coludo<quasiater.bobrinskoi, provocax.melanoleuca>
   }
   export class crenulata<T0, T1> extends trivirgatus.falconeri {
 >crenulata : crenulata<T0, T1>
 >T0 : T0
 >T1 : T1
 >trivirgatus : trivirgatus
->falconeri : falconeri
+>falconeri : trivirgatus.falconeri
 
     salvanius() : howi.coludo<howi.marcanoi, rionegrensis.caniventer> { var x : howi.coludo<howi.marcanoi, rionegrensis.caniventer>; () => { var y = this; }; return x; }
->salvanius : () => coludo<marcanoi, caniventer>
+>salvanius : () => howi.coludo<howi.marcanoi, rionegrensis.caniventer>
 >howi : howi
->coludo : coludo<T0, T1>
+>coludo : howi.coludo<T0, T1>
 >howi : howi
->marcanoi : marcanoi
+>marcanoi : howi.marcanoi
 >rionegrensis : rionegrensis
->caniventer : caniventer
->x : coludo<marcanoi, caniventer>
+>caniventer : rionegrensis.caniventer
+>x : howi.coludo<howi.marcanoi, rionegrensis.caniventer>
 >howi : howi
->coludo : coludo<T0, T1>
+>coludo : howi.coludo<T0, T1>
 >howi : howi
->marcanoi : marcanoi
+>marcanoi : howi.marcanoi
 >rionegrensis : rionegrensis
->caniventer : caniventer
+>caniventer : rionegrensis.caniventer
 >() => { var y = this; } : () => void
 >y : crenulata<T0, T1>
 >this : crenulata<T0, T1>
->x : coludo<marcanoi, caniventer>
+>x : howi.coludo<howi.marcanoi, rionegrensis.caniventer>
 
     maritimus() : ruatanica.americanus { var x : ruatanica.americanus; () => { var y = this; }; return x; }
->maritimus : () => americanus
+>maritimus : () => ruatanica.americanus
 >ruatanica : ruatanica
->americanus : americanus
->x : americanus
+>americanus : ruatanica.americanus
+>x : ruatanica.americanus
 >ruatanica : ruatanica
->americanus : americanus
+>americanus : ruatanica.americanus
 >() => { var y = this; } : () => void
 >y : crenulata<T0, T1>
 >this : crenulata<T0, T1>
->x : americanus
+>x : ruatanica.americanus
 
     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 : () => cor<lasiurus<marcanoi, ciliolabrum<megalonyx, minutilla>>, caniventer>
+>edax : () => lutreolus.cor<imperfecta.lasiurus<howi.marcanoi, imperfecta.ciliolabrum<Lanthanum.megalonyx, petrophilus.minutilla>>, rionegrensis.caniventer>
 >lutreolus : lutreolus
->cor : cor<T0, T1>
+>cor : lutreolus.cor<T0, T1>
 >imperfecta : imperfecta
->lasiurus : lasiurus<T0, T1>
+>lasiurus : imperfecta.lasiurus<T0, T1>
 >howi : howi
->marcanoi : marcanoi
+>marcanoi : howi.marcanoi
 >imperfecta : imperfecta
->ciliolabrum : ciliolabrum<T0, T1>
+>ciliolabrum : imperfecta.ciliolabrum<T0, T1>
 >Lanthanum : Lanthanum
->megalonyx : megalonyx
+>megalonyx : Lanthanum.megalonyx
 >petrophilus : petrophilus
->minutilla : minutilla
+>minutilla : petrophilus.minutilla
 >rionegrensis : rionegrensis
->caniventer : caniventer
->x : cor<lasiurus<marcanoi, ciliolabrum<megalonyx, minutilla>>, caniventer>
+>caniventer : rionegrensis.caniventer
+>x : lutreolus.cor<imperfecta.lasiurus<howi.marcanoi, imperfecta.ciliolabrum<Lanthanum.megalonyx, petrophilus.minutilla>>, rionegrensis.caniventer>
 >lutreolus : lutreolus
->cor : cor<T0, T1>
+>cor : lutreolus.cor<T0, T1>
 >imperfecta : imperfecta
->lasiurus : lasiurus<T0, T1>
+>lasiurus : imperfecta.lasiurus<T0, T1>
 >howi : howi
->marcanoi : marcanoi
+>marcanoi : howi.marcanoi
 >imperfecta : imperfecta
->ciliolabrum : ciliolabrum<T0, T1>
+>ciliolabrum : imperfecta.ciliolabrum<T0, T1>
 >Lanthanum : Lanthanum
->megalonyx : megalonyx
+>megalonyx : Lanthanum.megalonyx
 >petrophilus : petrophilus
->minutilla : minutilla
+>minutilla : petrophilus.minutilla
 >rionegrensis : rionegrensis
->caniventer : caniventer
+>caniventer : rionegrensis.caniventer
 >() => { var y = this; } : () => void
 >y : crenulata<T0, T1>
 >this : crenulata<T0, T1>
->x : cor<lasiurus<marcanoi, ciliolabrum<megalonyx, minutilla>>, caniventer>
+>x : lutreolus.cor<imperfecta.lasiurus<howi.marcanoi, imperfecta.ciliolabrum<Lanthanum.megalonyx, petrophilus.minutilla>>, rionegrensis.caniventer>
   }
 }
 module trivirgatus {
->trivirgatus : typeof trivirgatus
+>trivirgatus : trivirgatus
 
   export class tumidifrons<T0, T1> {
 >tumidifrons : tumidifrons<T0, T1>
@@ -2499,40 +2499,40 @@ module trivirgatus {
 >T1 : T1
 
     nivalis() : dogramacii.kaiseri { var x : dogramacii.kaiseri; () => { var y = this; }; return x; }
->nivalis : () => kaiseri
+>nivalis : () => dogramacii.kaiseri
 >dogramacii : dogramacii
->kaiseri : kaiseri
->x : kaiseri
+>kaiseri : dogramacii.kaiseri
+>x : dogramacii.kaiseri
 >dogramacii : dogramacii
->kaiseri : kaiseri
+>kaiseri : dogramacii.kaiseri
 >() => { var y = this; } : () => void
 >y : tumidifrons<T0, T1>
 >this : tumidifrons<T0, T1>
->x : kaiseri
+>x : dogramacii.kaiseri
 
     vestitus() : lavali.xanthognathus { var x : lavali.xanthognathus; () => { var y = this; }; return x; }
->vestitus : () => xanthognathus
+>vestitus : () => lavali.xanthognathus
 >lavali : lavali
->xanthognathus : xanthognathus
->x : xanthognathus
+>xanthognathus : lavali.xanthognathus
+>x : lavali.xanthognathus
 >lavali : lavali
->xanthognathus : xanthognathus
+>xanthognathus : lavali.xanthognathus
 >() => { var y = this; } : () => void
 >y : tumidifrons<T0, T1>
 >this : tumidifrons<T0, T1>
->x : xanthognathus
+>x : lavali.xanthognathus
 
     aequatorius() : rionegrensis.caniventer { var x : rionegrensis.caniventer; () => { var y = this; }; return x; }
->aequatorius : () => caniventer
+>aequatorius : () => rionegrensis.caniventer
 >rionegrensis : rionegrensis
->caniventer : caniventer
->x : caniventer
+>caniventer : rionegrensis.caniventer
+>x : rionegrensis.caniventer
 >rionegrensis : rionegrensis
->caniventer : caniventer
+>caniventer : rionegrensis.caniventer
 >() => { var y = this; } : () => void
 >y : tumidifrons<T0, T1>
 >this : tumidifrons<T0, T1>
->x : caniventer
+>x : rionegrensis.caniventer
 
     scherman() : oconnelli { var x : oconnelli; () => { var y = this; }; return x; }
 >scherman : () => oconnelli
@@ -2545,237 +2545,237 @@ module trivirgatus {
 >x : oconnelli
 
     improvisum() : argurus.peninsulae { var x : argurus.peninsulae; () => { var y = this; }; return x; }
->improvisum : () => peninsulae
+>improvisum : () => argurus.peninsulae
 >argurus : argurus
->peninsulae : peninsulae
->x : peninsulae
+>peninsulae : argurus.peninsulae
+>x : argurus.peninsulae
 >argurus : argurus
->peninsulae : peninsulae
+>peninsulae : argurus.peninsulae
 >() => { var y = this; } : () => void
 >y : tumidifrons<T0, T1>
 >this : tumidifrons<T0, T1>
->x : peninsulae
+>x : argurus.peninsulae
 
     cervinipes() : panglima.abidi<lavali.lepturus, caurinus.psilurus> { var x : panglima.abidi<lavali.lepturus, caurinus.psilurus>; () => { var y = this; }; return x; }
->cervinipes : () => abidi<lepturus, psilurus>
+>cervinipes : () => panglima.abidi<lavali.lepturus, caurinus.psilurus>
 >panglima : panglima
->abidi : abidi<T0, T1>
+>abidi : panglima.abidi<T0, T1>
 >lavali : lavali
->lepturus : lepturus
+>lepturus : lavali.lepturus
 >caurinus : caurinus
->psilurus : psilurus
->x : abidi<lepturus, psilurus>
+>psilurus : caurinus.psilurus
+>x : panglima.abidi<lavali.lepturus, caurinus.psilurus>
 >panglima : panglima
->abidi : abidi<T0, T1>
+>abidi : panglima.abidi<T0, T1>
 >lavali : lavali
->lepturus : lepturus
+>lepturus : lavali.lepturus
 >caurinus : caurinus
->psilurus : psilurus
+>psilurus : caurinus.psilurus
 >() => { var y = this; } : () => void
 >y : tumidifrons<T0, T1>
 >this : tumidifrons<T0, T1>
->x : abidi<lepturus, psilurus>
+>x : panglima.abidi<lavali.lepturus, caurinus.psilurus>
 
     audax() : dogramacii.robustulus { var x : dogramacii.robustulus; () => { var y = this; }; return x; }
->audax : () => robustulus
+>audax : () => dogramacii.robustulus
 >dogramacii : dogramacii
->robustulus : robustulus
->x : robustulus
+>robustulus : dogramacii.robustulus
+>x : dogramacii.robustulus
 >dogramacii : dogramacii
->robustulus : robustulus
+>robustulus : dogramacii.robustulus
 >() => { var y = this; } : () => void
 >y : tumidifrons<T0, T1>
 >this : tumidifrons<T0, T1>
->x : robustulus
+>x : dogramacii.robustulus
 
     vallinus() : sagitta.sicarius<lavali.wilsoni, lutreolus.punicus> { var x : sagitta.sicarius<lavali.wilsoni, lutreolus.punicus>; () => { var y = this; }; return x; }
->vallinus : () => sicarius<wilsoni, punicus>
+>vallinus : () => sagitta.sicarius<lavali.wilsoni, lutreolus.punicus>
 >sagitta : sagitta
->sicarius : sicarius<T0, T1>
+>sicarius : sagitta.sicarius<T0, T1>
 >lavali : lavali
->wilsoni : wilsoni
+>wilsoni : lavali.wilsoni
 >lutreolus : lutreolus
->punicus : punicus
->x : sicarius<wilsoni, punicus>
+>punicus : lutreolus.punicus
+>x : sagitta.sicarius<lavali.wilsoni, lutreolus.punicus>
 >sagitta : sagitta
->sicarius : sicarius<T0, T1>
+>sicarius : sagitta.sicarius<T0, T1>
 >lavali : lavali
->wilsoni : wilsoni
+>wilsoni : lavali.wilsoni
 >lutreolus : lutreolus
->punicus : punicus
+>punicus : lutreolus.punicus
 >() => { var y = this; } : () => void
 >y : tumidifrons<T0, T1>
 >this : tumidifrons<T0, T1>
->x : sicarius<wilsoni, punicus>
+>x : sagitta.sicarius<lavali.wilsoni, lutreolus.punicus>
   }
   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 : argurus
->pygmaea : pygmaea<T0, T1>
+>pygmaea : argurus.pygmaea<T0, T1>
 >argurus : argurus
->oreas : oreas
+>oreas : argurus.oreas
 >panglima : panglima
->fundatus : fundatus<T0, T1>
+>fundatus : panglima.fundatus<T0, T1>
 >quasiater : quasiater
->carolinensis : carolinensis
+>carolinensis : quasiater.carolinensis
 >macrorhinos : macrorhinos
->daphaenodon : daphaenodon
+>daphaenodon : macrorhinos.daphaenodon
 
     ochrogaster() : dogramacii.aurata { var x : dogramacii.aurata; () => { var y = this; }; return x; }
->ochrogaster : () => aurata
+>ochrogaster : () => dogramacii.aurata
 >dogramacii : dogramacii
->aurata : aurata
->x : aurata
+>aurata : dogramacii.aurata
+>x : dogramacii.aurata
 >dogramacii : dogramacii
->aurata : aurata
+>aurata : dogramacii.aurata
 >() => { var y = this; } : () => void
 >y : mixtus<T0, T1>
 >this : mixtus<T0, T1>
->x : aurata
+>x : dogramacii.aurata
 
     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 : () => marmosurus<koepckeae, abidi<aurata, sarasinorum<megaphyllus, xanthognathus>>>
+>bryophilus : () => macrorhinos.marmosurus<dogramacii.koepckeae, panglima.abidi<dogramacii.aurata, chrysaeolus.sarasinorum<caurinus.megaphyllus, lavali.xanthognathus>>>
 >macrorhinos : macrorhinos
->marmosurus : marmosurus<T0, T1>
+>marmosurus : macrorhinos.marmosurus<T0, T1>
 >dogramacii : dogramacii
->koepckeae : koepckeae
+>koepckeae : dogramacii.koepckeae
 >panglima : panglima
->abidi : abidi<T0, T1>
+>abidi : panglima.abidi<T0, T1>
 >dogramacii : dogramacii
->aurata : aurata
+>aurata : dogramacii.aurata
 >chrysaeolus : chrysaeolus
->sarasinorum : sarasinorum<T0, T1>
+>sarasinorum : chrysaeolus.sarasinorum<T0, T1>
 >caurinus : caurinus
->megaphyllus : megaphyllus
+>megaphyllus : caurinus.megaphyllus
 >lavali : lavali
->xanthognathus : xanthognathus
->x : marmosurus<koepckeae, abidi<aurata, sarasinorum<megaphyllus, xanthognathus>>>
+>xanthognathus : lavali.xanthognathus
+>x : macrorhinos.marmosurus<dogramacii.koepckeae, panglima.abidi<dogramacii.aurata, chrysaeolus.sarasinorum<caurinus.megaphyllus, lavali.xanthognathus>>>
 >macrorhinos : macrorhinos
->marmosurus : marmosurus<T0, T1>
+>marmosurus : macrorhinos.marmosurus<T0, T1>
 >dogramacii : dogramacii
->koepckeae : koepckeae
+>koepckeae : dogramacii.koepckeae
 >panglima : panglima
->abidi : abidi<T0, T1>
+>abidi : panglima.abidi<T0, T1>
 >dogramacii : dogramacii
->aurata : aurata
+>aurata : dogramacii.aurata
 >chrysaeolus : chrysaeolus
->sarasinorum : sarasinorum<T0, T1>
+>sarasinorum : chrysaeolus.sarasinorum<T0, T1>
 >caurinus : caurinus
->megaphyllus : megaphyllus
+>megaphyllus : caurinus.megaphyllus
 >lavali : lavali
->xanthognathus : xanthognathus
+>xanthognathus : lavali.xanthognathus
 >() => { var y = this; } : () => void
 >y : mixtus<T0, T1>
 >this : mixtus<T0, T1>
->x : marmosurus<koepckeae, abidi<aurata, sarasinorum<megaphyllus, xanthognathus>>>
+>x : macrorhinos.marmosurus<dogramacii.koepckeae, panglima.abidi<dogramacii.aurata, chrysaeolus.sarasinorum<caurinus.megaphyllus, lavali.xanthognathus>>>
 
     liechtensteini() : rendalli.zuluensis { var x : rendalli.zuluensis; () => { var y = this; }; return x; }
->liechtensteini : () => zuluensis
+>liechtensteini : () => rendalli.zuluensis
 >rendalli : rendalli
->zuluensis : zuluensis
->x : zuluensis
+>zuluensis : rendalli.zuluensis
+>x : rendalli.zuluensis
 >rendalli : rendalli
->zuluensis : zuluensis
+>zuluensis : rendalli.zuluensis
 >() => { var y = this; } : () => void
 >y : mixtus<T0, T1>
 >this : mixtus<T0, T1>
->x : zuluensis
+>x : rendalli.zuluensis
 
     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 : () => coludo<steerii, gerbillus<thaeleri, carolinensis>>
+>crawfordi : () => howi.coludo<julianae.steerii, julianae.gerbillus<lavali.thaeleri, quasiater.carolinensis>>
 >howi : howi
->coludo : coludo<T0, T1>
+>coludo : howi.coludo<T0, T1>
 >julianae : julianae
->steerii : steerii
+>steerii : julianae.steerii
 >julianae : julianae
->gerbillus : gerbillus<T0, T1>
+>gerbillus : julianae.gerbillus<T0, T1>
 >lavali : lavali
->thaeleri : thaeleri
+>thaeleri : lavali.thaeleri
 >quasiater : quasiater
->carolinensis : carolinensis
->x : coludo<steerii, gerbillus<thaeleri, carolinensis>>
+>carolinensis : quasiater.carolinensis
+>x : howi.coludo<julianae.steerii, julianae.gerbillus<lavali.thaeleri, quasiater.carolinensis>>
 >howi : howi
->coludo : coludo<T0, T1>
+>coludo : howi.coludo<T0, T1>
 >julianae : julianae
->steerii : steerii
+>steerii : julianae.steerii
 >julianae : julianae
->gerbillus : gerbillus<T0, T1>
+>gerbillus : julianae.gerbillus<T0, T1>
 >lavali : lavali
->thaeleri : thaeleri
+>thaeleri : lavali.thaeleri
 >quasiater : quasiater
->carolinensis : carolinensis
+>carolinensis : quasiater.carolinensis
 >() => { var y = this; } : () => void
 >y : mixtus<T0, T1>
 >this : mixtus<T0, T1>
->x : coludo<steerii, gerbillus<thaeleri, carolinensis>>
+>x : howi.coludo<julianae.steerii, julianae.gerbillus<lavali.thaeleri, quasiater.carolinensis>>
 
     hypsibia() : lavali.thaeleri { var x : lavali.thaeleri; () => { var y = this; }; return x; }
->hypsibia : () => thaeleri
+>hypsibia : () => lavali.thaeleri
 >lavali : lavali
->thaeleri : thaeleri
->x : thaeleri
+>thaeleri : lavali.thaeleri
+>x : lavali.thaeleri
 >lavali : lavali
->thaeleri : thaeleri
+>thaeleri : lavali.thaeleri
 >() => { var y = this; } : () => void
 >y : mixtus<T0, T1>
 >this : mixtus<T0, T1>
->x : thaeleri
+>x : lavali.thaeleri
 
     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 : () => fundatus<linulus<lotor<luctuosa, wilsoni>, beisa>, melanops>
+>matacus : () => panglima.fundatus<panamensis.linulus<lotor<argurus.luctuosa, lavali.wilsoni>, lavali.beisa>, dammermani.melanops>
 >panglima : panglima
->fundatus : fundatus<T0, T1>
+>fundatus : panglima.fundatus<T0, T1>
 >panamensis : panamensis
->linulus : linulus<T0, T1>
+>linulus : panamensis.linulus<T0, T1>
 >lotor : lotor<T0, T1>
 >argurus : argurus
->luctuosa : luctuosa
+>luctuosa : argurus.luctuosa
 >lavali : lavali
->wilsoni : wilsoni
+>wilsoni : lavali.wilsoni
 >lavali : lavali
->beisa : beisa
+>beisa : lavali.beisa
 >dammermani : dammermani
->melanops : melanops
->x : fundatus<linulus<lotor<luctuosa, wilsoni>, beisa>, melanops>
+>melanops : dammermani.melanops
+>x : panglima.fundatus<panamensis.linulus<lotor<argurus.luctuosa, lavali.wilsoni>, lavali.beisa>, dammermani.melanops>
 >panglima : panglima
->fundatus : fundatus<T0, T1>
+>fundatus : panglima.fundatus<T0, T1>
 >panamensis : panamensis
->linulus : linulus<T0, T1>
+>linulus : panamensis.linulus<T0, T1>
 >lotor : lotor<T0, T1>
 >argurus : argurus
->luctuosa : luctuosa
+>luctuosa : argurus.luctuosa
 >lavali : lavali
->wilsoni : wilsoni
+>wilsoni : lavali.wilsoni
 >lavali : lavali
->beisa : beisa
+>beisa : lavali.beisa
 >dammermani : dammermani
->melanops : melanops
+>melanops : dammermani.melanops
 >() => { var y = this; } : () => void
 >y : mixtus<T0, T1>
 >this : mixtus<T0, T1>
->x : fundatus<linulus<lotor<luctuosa, wilsoni>, beisa>, melanops>
+>x : panglima.fundatus<panamensis.linulus<lotor<argurus.luctuosa, lavali.wilsoni>, lavali.beisa>, dammermani.melanops>
 
     demidoff() : caurinus.johorensis<julianae.acariensis, rendalli.zuluensis> { var x : caurinus.johorensis<julianae.acariensis, rendalli.zuluensis>; () => { var y = this; }; return x; }
->demidoff : () => johorensis<acariensis, zuluensis>
+>demidoff : () => caurinus.johorensis<julianae.acariensis, rendalli.zuluensis>
 >caurinus : caurinus
->johorensis : johorensis<T0, T1>
+>johorensis : caurinus.johorensis<T0, T1>
 >julianae : julianae
->acariensis : acariensis
+>acariensis : julianae.acariensis
 >rendalli : rendalli
->zuluensis : zuluensis
->x : johorensis<acariensis, zuluensis>
+>zuluensis : rendalli.zuluensis
+>x : caurinus.johorensis<julianae.acariensis, rendalli.zuluensis>
 >caurinus : caurinus
->johorensis : johorensis<T0, T1>
+>johorensis : caurinus.johorensis<T0, T1>
 >julianae : julianae
->acariensis : acariensis
+>acariensis : julianae.acariensis
 >rendalli : rendalli
->zuluensis : zuluensis
+>zuluensis : rendalli.zuluensis
 >() => { var y = this; } : () => void
 >y : mixtus<T0, T1>
 >this : mixtus<T0, T1>
->x : johorensis<acariensis, zuluensis>
+>x : caurinus.johorensis<julianae.acariensis, rendalli.zuluensis>
   }
   export class lotor<T0, T1> {
 >lotor : lotor<T0, T1>
@@ -2783,855 +2783,855 @@ module trivirgatus {
 >T1 : T1
 
     balensis() : samarensis.pallidus { var x : samarensis.pallidus; () => { var y = this; }; return x; }
->balensis : () => pallidus
+>balensis : () => samarensis.pallidus
 >samarensis : samarensis
->pallidus : pallidus
->x : pallidus
+>pallidus : samarensis.pallidus
+>x : samarensis.pallidus
 >samarensis : samarensis
->pallidus : pallidus
+>pallidus : samarensis.pallidus
 >() => { var y = this; } : () => void
 >y : lotor<T0, T1>
 >this : lotor<T0, T1>
->x : pallidus
+>x : samarensis.pallidus
 
     pullata() : rionegrensis.veraecrucis<quasiater.carolinensis, argurus.peninsulae> { var x : rionegrensis.veraecrucis<quasiater.carolinensis, argurus.peninsulae>; () => { var y = this; }; return x; }
->pullata : () => veraecrucis<carolinensis, peninsulae>
+>pullata : () => rionegrensis.veraecrucis<quasiater.carolinensis, argurus.peninsulae>
 >rionegrensis : rionegrensis
->veraecrucis : veraecrucis<T0, T1>
+>veraecrucis : rionegrensis.veraecrucis<T0, T1>
 >quasiater : quasiater
->carolinensis : carolinensis
+>carolinensis : quasiater.carolinensis
 >argurus : argurus
->peninsulae : peninsulae
->x : veraecrucis<carolinensis, peninsulae>
+>peninsulae : argurus.peninsulae
+>x : rionegrensis.veraecrucis<quasiater.carolinensis, argurus.peninsulae>
 >rionegrensis : rionegrensis
->veraecrucis : veraecrucis<T0, T1>
+>veraecrucis : rionegrensis.veraecrucis<T0, T1>
 >quasiater : quasiater
->carolinensis : carolinensis
+>carolinensis : quasiater.carolinensis
 >argurus : argurus
->peninsulae : peninsulae
+>peninsulae : argurus.peninsulae
 >() => { var y = this; } : () => void
 >y : lotor<T0, T1>
 >this : lotor<T0, T1>
->x : veraecrucis<carolinensis, peninsulae>
+>x : rionegrensis.veraecrucis<quasiater.carolinensis, argurus.peninsulae>
   }
   export class falconeri {
 >falconeri : falconeri
 
     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 : () => moojeni<lasiurus<marcanoi, ciliolabrum<megalonyx, minutilla>>, arboreus<nudicaudus, steerii>>
+>cabrali : () => rendalli.moojeni<imperfecta.lasiurus<howi.marcanoi, imperfecta.ciliolabrum<Lanthanum.megalonyx, petrophilus.minutilla>>, daubentonii.arboreus<julianae.nudicaudus, julianae.steerii>>
 >rendalli : rendalli
->moojeni : moojeni<T0, T1>
+>moojeni : rendalli.moojeni<T0, T1>
 >imperfecta : imperfecta
->lasiurus : lasiurus<T0, T1>
+>lasiurus : imperfecta.lasiurus<T0, T1>
 >howi : howi
->marcanoi : marcanoi
+>marcanoi : howi.marcanoi
 >imperfecta : imperfecta
->ciliolabrum : ciliolabrum<T0, T1>
+>ciliolabrum : imperfecta.ciliolabrum<T0, T1>
 >Lanthanum : Lanthanum
->megalonyx : megalonyx
+>megalonyx : Lanthanum.megalonyx
 >petrophilus : petrophilus
->minutilla : minutilla
+>minutilla : petrophilus.minutilla
 >daubentonii : daubentonii
->arboreus : arboreus<T0, T1>
+>arboreus : daubentonii.arboreus<T0, T1>
 >julianae : julianae
->nudicaudus : nudicaudus
+>nudicaudus : julianae.nudicaudus
 >julianae : julianae
->steerii : steerii
->x : moojeni<lasiurus<marcanoi, ciliolabrum<megalonyx, minutilla>>, arboreus<nudicaudus, steerii>>
+>steerii : julianae.steerii
+>x : rendalli.moojeni<imperfecta.lasiurus<howi.marcanoi, imperfecta.ciliolabrum<Lanthanum.megalonyx, petrophilus.minutilla>>, daubentonii.arboreus<julianae.nudicaudus, julianae.steerii>>
 >rendalli : rendalli
->moojeni : moojeni<T0, T1>
+>moojeni : rendalli.moojeni<T0, T1>
 >imperfecta : imperfecta
->lasiurus : lasiurus<T0, T1>
+>lasiurus : imperfecta.lasiurus<T0, T1>
 >howi : howi
->marcanoi : marcanoi
+>marcanoi : howi.marcanoi
 >imperfecta : imperfecta
->ciliolabrum : ciliolabrum<T0, T1>
+>ciliolabrum : imperfecta.ciliolabrum<T0, T1>
 >Lanthanum : Lanthanum
->megalonyx : megalonyx
+>megalonyx : Lanthanum.megalonyx
 >petrophilus : petrophilus
->minutilla : minutilla
+>minutilla : petrophilus.minutilla
 >daubentonii : daubentonii
->arboreus : arboreus<T0, T1>
+>arboreus : daubentonii.arboreus<T0, T1>
 >julianae : julianae
->nudicaudus : nudicaudus
+>nudicaudus : julianae.nudicaudus
 >julianae : julianae
->steerii : steerii
+>steerii : julianae.steerii
 >() => { var y = this; } : () => void
 >y : falconeri
 >this : falconeri
->x : moojeni<lasiurus<marcanoi, ciliolabrum<megalonyx, minutilla>>, arboreus<nudicaudus, steerii>>
+>x : rendalli.moojeni<imperfecta.lasiurus<howi.marcanoi, imperfecta.ciliolabrum<Lanthanum.megalonyx, petrophilus.minutilla>>, daubentonii.arboreus<julianae.nudicaudus, julianae.steerii>>
 
     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 : () => dolichurus<lasiurus<acariensis, coludo<oreas, marcanoi>>, uralensis>
+>gouldi : () => nigra.dolichurus<imperfecta.lasiurus<julianae.acariensis, howi.coludo<argurus.oreas, howi.marcanoi>>, patas.uralensis>
 >nigra : nigra
->dolichurus : dolichurus<T0, T1>
+>dolichurus : nigra.dolichurus<T0, T1>
 >imperfecta : imperfecta
->lasiurus : lasiurus<T0, T1>
+>lasiurus : imperfecta.lasiurus<T0, T1>
 >julianae : julianae
->acariensis : acariensis
+>acariensis : julianae.acariensis
 >howi : howi
->coludo : coludo<T0, T1>
+>coludo : howi.coludo<T0, T1>
 >argurus : argurus
->oreas : oreas
+>oreas : argurus.oreas
 >howi : howi
->marcanoi : marcanoi
+>marcanoi : howi.marcanoi
 >patas : patas
->uralensis : uralensis
->x : dolichurus<lasiurus<acariensis, coludo<oreas, marcanoi>>, uralensis>
+>uralensis : patas.uralensis
+>x : nigra.dolichurus<imperfecta.lasiurus<julianae.acariensis, howi.coludo<argurus.oreas, howi.marcanoi>>, patas.uralensis>
 >nigra : nigra
->dolichurus : dolichurus<T0, T1>
+>dolichurus : nigra.dolichurus<T0, T1>
 >imperfecta : imperfecta
->lasiurus : lasiurus<T0, T1>
+>lasiurus : imperfecta.lasiurus<T0, T1>
 >julianae : julianae
->acariensis : acariensis
+>acariensis : julianae.acariensis
 >howi : howi
->coludo : coludo<T0, T1>
+>coludo : howi.coludo<T0, T1>
 >argurus : argurus
->oreas : oreas
+>oreas : argurus.oreas
 >howi : howi
->marcanoi : marcanoi
+>marcanoi : howi.marcanoi
 >patas : patas
->uralensis : uralensis
+>uralensis : patas.uralensis
 >() => { var y = this; } : () => void
 >y : falconeri
 >this : falconeri
->x : dolichurus<lasiurus<acariensis, coludo<oreas, marcanoi>>, uralensis>
+>x : nigra.dolichurus<imperfecta.lasiurus<julianae.acariensis, howi.coludo<argurus.oreas, howi.marcanoi>>, patas.uralensis>
 
     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 : () => pelurus<melanops, nitidus<americanus, stolzmanni>>
+>fuscicollis : () => samarensis.pelurus<dammermani.melanops, Lanthanum.nitidus<ruatanica.americanus, sagitta.stolzmanni>>
 >samarensis : samarensis
->pelurus : pelurus<T0, T1>
+>pelurus : samarensis.pelurus<T0, T1>
 >dammermani : dammermani
->melanops : melanops
+>melanops : dammermani.melanops
 >Lanthanum : Lanthanum
->nitidus : nitidus<T0, T1>
+>nitidus : Lanthanum.nitidus<T0, T1>
 >ruatanica : ruatanica
->americanus : americanus
+>americanus : ruatanica.americanus
 >sagitta : sagitta
->stolzmanni : stolzmanni
->x : pelurus<melanops, nitidus<americanus, stolzmanni>>
+>stolzmanni : sagitta.stolzmanni
+>x : samarensis.pelurus<dammermani.melanops, Lanthanum.nitidus<ruatanica.americanus, sagitta.stolzmanni>>
 >samarensis : samarensis
->pelurus : pelurus<T0, T1>
+>pelurus : samarensis.pelurus<T0, T1>
 >dammermani : dammermani
->melanops : melanops
+>melanops : dammermani.melanops
 >Lanthanum : Lanthanum
->nitidus : nitidus<T0, T1>
+>nitidus : Lanthanum.nitidus<T0, T1>
 >ruatanica : ruatanica
->americanus : americanus
+>americanus : ruatanica.americanus
 >sagitta : sagitta
->stolzmanni : stolzmanni
+>stolzmanni : sagitta.stolzmanni
 >() => { var y = this; } : () => void
 >y : falconeri
 >this : falconeri
->x : pelurus<melanops, nitidus<americanus, stolzmanni>>
+>x : samarensis.pelurus<dammermani.melanops, Lanthanum.nitidus<ruatanica.americanus, sagitta.stolzmanni>>
 
     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 : () => cinereus<ciliolabrum<otion, sodyi<konganensis, psilurus>>, koepckeae>
+>martiensseni : () => sagitta.cinereus<imperfecta.ciliolabrum<lavali.otion, petrophilus.sodyi<macrorhinos.konganensis, caurinus.psilurus>>, dogramacii.koepckeae>
 >sagitta : sagitta
->cinereus : cinereus<T0, T1>
+>cinereus : sagitta.cinereus<T0, T1>
 >imperfecta : imperfecta
->ciliolabrum : ciliolabrum<T0, T1>
+>ciliolabrum : imperfecta.ciliolabrum<T0, T1>
 >lavali : lavali
->otion : otion
+>otion : lavali.otion
 >petrophilus : petrophilus
->sodyi : sodyi<T0, T1>
+>sodyi : petrophilus.sodyi<T0, T1>
 >macrorhinos : macrorhinos
->konganensis : konganensis
+>konganensis : macrorhinos.konganensis
 >caurinus : caurinus
->psilurus : psilurus
+>psilurus : caurinus.psilurus
 >dogramacii : dogramacii
->koepckeae : koepckeae
->x : cinereus<ciliolabrum<otion, sodyi<konganensis, psilurus>>, koepckeae>
+>koepckeae : dogramacii.koepckeae
+>x : sagitta.cinereus<imperfecta.ciliolabrum<lavali.otion, petrophilus.sodyi<macrorhinos.konganensis, caurinus.psilurus>>, dogramacii.koepckeae>
 >sagitta : sagitta
->cinereus : cinereus<T0, T1>
+>cinereus : sagitta.cinereus<T0, T1>
 >imperfecta : imperfecta
->ciliolabrum : ciliolabrum<T0, T1>
+>ciliolabrum : imperfecta.ciliolabrum<T0, T1>
 >lavali : lavali
->otion : otion
+>otion : lavali.otion
 >petrophilus : petrophilus
->sodyi : sodyi<T0, T1>
+>sodyi : petrophilus.sodyi<T0, T1>
 >macrorhinos : macrorhinos
->konganensis : konganensis
+>konganensis : macrorhinos.konganensis
 >caurinus : caurinus
->psilurus : psilurus
+>psilurus : caurinus.psilurus
 >dogramacii : dogramacii
->koepckeae : koepckeae
+>koepckeae : dogramacii.koepckeae
 >() => { var y = this; } : () => void
 >y : falconeri
 >this : falconeri
->x : cinereus<ciliolabrum<otion, sodyi<konganensis, psilurus>>, koepckeae>
+>x : sagitta.cinereus<imperfecta.ciliolabrum<lavali.otion, petrophilus.sodyi<macrorhinos.konganensis, caurinus.psilurus>>, dogramacii.koepckeae>
 
     gaoligongensis() : dogramacii.koepckeae { var x : dogramacii.koepckeae; () => { var y = this; }; return x; }
->gaoligongensis : () => koepckeae
+>gaoligongensis : () => dogramacii.koepckeae
 >dogramacii : dogramacii
->koepckeae : koepckeae
->x : koepckeae
+>koepckeae : dogramacii.koepckeae
+>x : dogramacii.koepckeae
 >dogramacii : dogramacii
->koepckeae : koepckeae
+>koepckeae : dogramacii.koepckeae
 >() => { var y = this; } : () => void
 >y : falconeri
 >this : falconeri
->x : koepckeae
+>x : dogramacii.koepckeae
 
     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 : () => inez<stolzmanni, veraecrucis<xanthognathus, bobrinskoi>>
+>shawi : () => minutus.inez<sagitta.stolzmanni, rionegrensis.veraecrucis<lavali.xanthognathus, quasiater.bobrinskoi>>
 >minutus : minutus
->inez : inez<T0, T1>
+>inez : minutus.inez<T0, T1>
 >sagitta : sagitta
->stolzmanni : stolzmanni
+>stolzmanni : sagitta.stolzmanni
 >rionegrensis : rionegrensis
->veraecrucis : veraecrucis<T0, T1>
+>veraecrucis : rionegrensis.veraecrucis<T0, T1>
 >lavali : lavali
->xanthognathus : xanthognathus
+>xanthognathus : lavali.xanthognathus
 >quasiater : quasiater
->bobrinskoi : bobrinskoi
->x : inez<stolzmanni, veraecrucis<xanthognathus, bobrinskoi>>
+>bobrinskoi : quasiater.bobrinskoi
+>x : minutus.inez<sagitta.stolzmanni, rionegrensis.veraecrucis<lavali.xanthognathus, quasiater.bobrinskoi>>
 >minutus : minutus
->inez : inez<T0, T1>
+>inez : minutus.inez<T0, T1>
 >sagitta : sagitta
->stolzmanni : stolzmanni
+>stolzmanni : sagitta.stolzmanni
 >rionegrensis : rionegrensis
->veraecrucis : veraecrucis<T0, T1>
+>veraecrucis : rionegrensis.veraecrucis<T0, T1>
 >lavali : lavali
->xanthognathus : xanthognathus
+>xanthognathus : lavali.xanthognathus
 >quasiater : quasiater
->bobrinskoi : bobrinskoi
+>bobrinskoi : quasiater.bobrinskoi
 >() => { var y = this; } : () => void
 >y : falconeri
 >this : falconeri
->x : inez<stolzmanni, veraecrucis<xanthognathus, bobrinskoi>>
+>x : minutus.inez<sagitta.stolzmanni, rionegrensis.veraecrucis<lavali.xanthognathus, quasiater.bobrinskoi>>
 
     gmelini() : rionegrensis.caniventer { var x : rionegrensis.caniventer; () => { var y = this; }; return x; }
->gmelini : () => caniventer
+>gmelini : () => rionegrensis.caniventer
 >rionegrensis : rionegrensis
->caniventer : caniventer
->x : caniventer
+>caniventer : rionegrensis.caniventer
+>x : rionegrensis.caniventer
 >rionegrensis : rionegrensis
->caniventer : caniventer
+>caniventer : rionegrensis.caniventer
 >() => { var y = this; } : () => void
 >y : falconeri
 >this : falconeri
->x : caniventer
+>x : rionegrensis.caniventer
   }
   export class oconnelli {
 >oconnelli : oconnelli
 
     youngsoni() : nigra.thalia<patas.uralensis, julianae.galapagoensis> { var x : nigra.thalia<patas.uralensis, julianae.galapagoensis>; () => { var y = this; }; return x; }
->youngsoni : () => thalia<uralensis, galapagoensis>
+>youngsoni : () => nigra.thalia<patas.uralensis, julianae.galapagoensis>
 >nigra : nigra
->thalia : thalia<T0, T1>
+>thalia : nigra.thalia<T0, T1>
 >patas : patas
->uralensis : uralensis
+>uralensis : patas.uralensis
 >julianae : julianae
->galapagoensis : galapagoensis
->x : thalia<uralensis, galapagoensis>
+>galapagoensis : julianae.galapagoensis
+>x : nigra.thalia<patas.uralensis, julianae.galapagoensis>
 >nigra : nigra
->thalia : thalia<T0, T1>
+>thalia : nigra.thalia<T0, T1>
 >patas : patas
->uralensis : uralensis
+>uralensis : patas.uralensis
 >julianae : julianae
->galapagoensis : galapagoensis
+>galapagoensis : julianae.galapagoensis
 >() => { var y = this; } : () => void
 >y : oconnelli
 >this : oconnelli
->x : thalia<uralensis, galapagoensis>
+>x : nigra.thalia<patas.uralensis, julianae.galapagoensis>
 
     terrestris() : macrorhinos.konganensis { var x : macrorhinos.konganensis; () => { var y = this; }; return x; }
->terrestris : () => konganensis
+>terrestris : () => macrorhinos.konganensis
 >macrorhinos : macrorhinos
->konganensis : konganensis
->x : konganensis
+>konganensis : macrorhinos.konganensis
+>x : macrorhinos.konganensis
 >macrorhinos : macrorhinos
->konganensis : konganensis
+>konganensis : macrorhinos.konganensis
 >() => { var y = this; } : () => void
 >y : oconnelli
 >this : oconnelli
->x : konganensis
+>x : macrorhinos.konganensis
 
     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 : () => sicarius<koepckeae, sodyi<oreas, daphaenodon>>
+>chrysopus : () => sagitta.sicarius<dogramacii.koepckeae, petrophilus.sodyi<argurus.oreas, macrorhinos.daphaenodon>>
 >sagitta : sagitta
->sicarius : sicarius<T0, T1>
+>sicarius : sagitta.sicarius<T0, T1>
 >dogramacii : dogramacii
->koepckeae : koepckeae
+>koepckeae : dogramacii.koepckeae
 >petrophilus : petrophilus
->sodyi : sodyi<T0, T1>
+>sodyi : petrophilus.sodyi<T0, T1>
 >argurus : argurus
->oreas : oreas
+>oreas : argurus.oreas
 >macrorhinos : macrorhinos
->daphaenodon : daphaenodon
->x : sicarius<koepckeae, sodyi<oreas, daphaenodon>>
+>daphaenodon : macrorhinos.daphaenodon
+>x : sagitta.sicarius<dogramacii.koepckeae, petrophilus.sodyi<argurus.oreas, macrorhinos.daphaenodon>>
 >sagitta : sagitta
->sicarius : sicarius<T0, T1>
+>sicarius : sagitta.sicarius<T0, T1>
 >dogramacii : dogramacii
->koepckeae : koepckeae
+>koepckeae : dogramacii.koepckeae
 >petrophilus : petrophilus
->sodyi : sodyi<T0, T1>
+>sodyi : petrophilus.sodyi<T0, T1>
 >argurus : argurus
->oreas : oreas
+>oreas : argurus.oreas
 >macrorhinos : macrorhinos
->daphaenodon : daphaenodon
+>daphaenodon : macrorhinos.daphaenodon
 >() => { var y = this; } : () => void
 >y : oconnelli
 >this : oconnelli
->x : sicarius<koepckeae, sodyi<oreas, daphaenodon>>
+>x : sagitta.sicarius<dogramacii.koepckeae, petrophilus.sodyi<argurus.oreas, macrorhinos.daphaenodon>>
 
     fuscomurina() : argurus.peninsulae { var x : argurus.peninsulae; () => { var y = this; }; return x; }
->fuscomurina : () => peninsulae
+>fuscomurina : () => argurus.peninsulae
 >argurus : argurus
->peninsulae : peninsulae
->x : peninsulae
+>peninsulae : argurus.peninsulae
+>x : argurus.peninsulae
 >argurus : argurus
->peninsulae : peninsulae
+>peninsulae : argurus.peninsulae
 >() => { var y = this; } : () => void
 >y : oconnelli
 >this : oconnelli
->x : peninsulae
+>x : argurus.peninsulae
 
     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 : () => gracilis<setulosus<walkeri, robustulus>, sodyi<oreas, daphaenodon>>
+>hellwaldii : () => nigra.gracilis<panamensis.setulosus<sagitta.walkeri, dogramacii.robustulus>, petrophilus.sodyi<argurus.oreas, macrorhinos.daphaenodon>>
 >nigra : nigra
->gracilis : gracilis<T0, T1>
+>gracilis : nigra.gracilis<T0, T1>
 >panamensis : panamensis
->setulosus : setulosus<T0, T1>
+>setulosus : panamensis.setulosus<T0, T1>
 >sagitta : sagitta
->walkeri : walkeri
+>walkeri : sagitta.walkeri
 >dogramacii : dogramacii
->robustulus : robustulus
+>robustulus : dogramacii.robustulus
 >petrophilus : petrophilus
->sodyi : sodyi<T0, T1>
+>sodyi : petrophilus.sodyi<T0, T1>
 >argurus : argurus
->oreas : oreas
+>oreas : argurus.oreas
 >macrorhinos : macrorhinos
->daphaenodon : daphaenodon
->x : gracilis<setulosus<walkeri, robustulus>, sodyi<oreas, daphaenodon>>
+>daphaenodon : macrorhinos.daphaenodon
+>x : nigra.gracilis<panamensis.setulosus<sagitta.walkeri, dogramacii.robustulus>, petrophilus.sodyi<argurus.oreas, macrorhinos.daphaenodon>>
 >nigra : nigra
->gracilis : gracilis<T0, T1>
+>gracilis : nigra.gracilis<T0, T1>
 >panamensis : panamensis
->setulosus : setulosus<T0, T1>
+>setulosus : panamensis.setulosus<T0, T1>
 >sagitta : sagitta
->walkeri : walkeri
+>walkeri : sagitta.walkeri
 >dogramacii : dogramacii
->robustulus : robustulus
+>robustulus : dogramacii.robustulus
 >petrophilus : petrophilus
->sodyi : sodyi<T0, T1>
+>sodyi : petrophilus.sodyi<T0, T1>
 >argurus : argurus
->oreas : oreas
+>oreas : argurus.oreas
 >macrorhinos : macrorhinos
->daphaenodon : daphaenodon
+>daphaenodon : macrorhinos.daphaenodon
 >() => { var y = this; } : () => void
 >y : oconnelli
 >this : oconnelli
->x : gracilis<setulosus<walkeri, robustulus>, sodyi<oreas, daphaenodon>>
+>x : nigra.gracilis<panamensis.setulosus<sagitta.walkeri, dogramacii.robustulus>, petrophilus.sodyi<argurus.oreas, macrorhinos.daphaenodon>>
 
     aenea() : argurus.luctuosa { var x : argurus.luctuosa; () => { var y = this; }; return x; }
->aenea : () => luctuosa
+>aenea : () => argurus.luctuosa
 >argurus : argurus
->luctuosa : luctuosa
->x : luctuosa
+>luctuosa : argurus.luctuosa
+>x : argurus.luctuosa
 >argurus : argurus
->luctuosa : luctuosa
+>luctuosa : argurus.luctuosa
 >() => { var y = this; } : () => void
 >y : oconnelli
 >this : oconnelli
->x : luctuosa
+>x : argurus.luctuosa
 
     perrini() : quasiater.bobrinskoi { var x : quasiater.bobrinskoi; () => { var y = this; }; return x; }
->perrini : () => bobrinskoi
+>perrini : () => quasiater.bobrinskoi
 >quasiater : quasiater
->bobrinskoi : bobrinskoi
->x : bobrinskoi
+>bobrinskoi : quasiater.bobrinskoi
+>x : quasiater.bobrinskoi
 >quasiater : quasiater
->bobrinskoi : bobrinskoi
+>bobrinskoi : quasiater.bobrinskoi
 >() => { var y = this; } : () => void
 >y : oconnelli
 >this : oconnelli
->x : bobrinskoi
+>x : quasiater.bobrinskoi
 
     entellus() : dammermani.melanops { var x : dammermani.melanops; () => { var y = this; }; return x; }
->entellus : () => melanops
+>entellus : () => dammermani.melanops
 >dammermani : dammermani
->melanops : melanops
->x : melanops
+>melanops : dammermani.melanops
+>x : dammermani.melanops
 >dammermani : dammermani
->melanops : melanops
+>melanops : dammermani.melanops
 >() => { var y = this; } : () => void
 >y : oconnelli
 >this : oconnelli
->x : melanops
+>x : dammermani.melanops
 
     krebsii() : rionegrensis.veraecrucis<rionegrensis.caniventer, julianae.durangae> { var x : rionegrensis.veraecrucis<rionegrensis.caniventer, julianae.durangae>; () => { var y = this; }; return x; }
->krebsii : () => veraecrucis<caniventer, durangae>
+>krebsii : () => rionegrensis.veraecrucis<rionegrensis.caniventer, julianae.durangae>
 >rionegrensis : rionegrensis
->veraecrucis : veraecrucis<T0, T1>
+>veraecrucis : rionegrensis.veraecrucis<T0, T1>
 >rionegrensis : rionegrensis
->caniventer : caniventer
+>caniventer : rionegrensis.caniventer
 >julianae : julianae
->durangae : durangae
->x : veraecrucis<caniventer, durangae>
+>durangae : julianae.durangae
+>x : rionegrensis.veraecrucis<rionegrensis.caniventer, julianae.durangae>
 >rionegrensis : rionegrensis
->veraecrucis : veraecrucis<T0, T1>
+>veraecrucis : rionegrensis.veraecrucis<T0, T1>
 >rionegrensis : rionegrensis
->caniventer : caniventer
+>caniventer : rionegrensis.caniventer
 >julianae : julianae
->durangae : durangae
+>durangae : julianae.durangae
 >() => { var y = this; } : () => void
 >y : oconnelli
 >this : oconnelli
->x : veraecrucis<caniventer, durangae>
+>x : rionegrensis.veraecrucis<rionegrensis.caniventer, julianae.durangae>
 
     cephalotes() : lutreolus.schlegeli { var x : lutreolus.schlegeli; () => { var y = this; }; return x; }
->cephalotes : () => schlegeli
+>cephalotes : () => lutreolus.schlegeli
 >lutreolus : lutreolus
->schlegeli : schlegeli
->x : schlegeli
+>schlegeli : lutreolus.schlegeli
+>x : lutreolus.schlegeli
 >lutreolus : lutreolus
->schlegeli : schlegeli
+>schlegeli : lutreolus.schlegeli
 >() => { var y = this; } : () => void
 >y : oconnelli
 >this : oconnelli
->x : schlegeli
+>x : lutreolus.schlegeli
 
     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 : () => nigricans<carolinensis, nesiotes<sumatrana, carolinensis>>
+>molossinus : () => daubentonii.nigricans<quasiater.carolinensis, daubentonii.nesiotes<julianae.sumatrana, quasiater.carolinensis>>
 >daubentonii : daubentonii
->nigricans : nigricans<T0, T1>
+>nigricans : daubentonii.nigricans<T0, T1>
 >quasiater : quasiater
->carolinensis : carolinensis
+>carolinensis : quasiater.carolinensis
 >daubentonii : daubentonii
->nesiotes : nesiotes<T0, T1>
+>nesiotes : daubentonii.nesiotes<T0, T1>
 >julianae : julianae
->sumatrana : sumatrana
+>sumatrana : julianae.sumatrana
 >quasiater : quasiater
->carolinensis : carolinensis
->x : nigricans<carolinensis, nesiotes<sumatrana, carolinensis>>
+>carolinensis : quasiater.carolinensis
+>x : daubentonii.nigricans<quasiater.carolinensis, daubentonii.nesiotes<julianae.sumatrana, quasiater.carolinensis>>
 >daubentonii : daubentonii
->nigricans : nigricans<T0, T1>
+>nigricans : daubentonii.nigricans<T0, T1>
 >quasiater : quasiater
->carolinensis : carolinensis
+>carolinensis : quasiater.carolinensis
 >daubentonii : daubentonii
->nesiotes : nesiotes<T0, T1>
+>nesiotes : daubentonii.nesiotes<T0, T1>
 >julianae : julianae
->sumatrana : sumatrana
+>sumatrana : julianae.sumatrana
 >quasiater : quasiater
->carolinensis : carolinensis
+>carolinensis : quasiater.carolinensis
 >() => { var y = this; } : () => void
 >y : oconnelli
 >this : oconnelli
->x : nigricans<carolinensis, nesiotes<sumatrana, carolinensis>>
+>x : daubentonii.nigricans<quasiater.carolinensis, daubentonii.nesiotes<julianae.sumatrana, quasiater.carolinensis>>
 
     luisi() : dogramacii.robustulus { var x : dogramacii.robustulus; () => { var y = this; }; return x; }
->luisi : () => robustulus
+>luisi : () => dogramacii.robustulus
 >dogramacii : dogramacii
->robustulus : robustulus
->x : robustulus
+>robustulus : dogramacii.robustulus
+>x : dogramacii.robustulus
 >dogramacii : dogramacii
->robustulus : robustulus
+>robustulus : dogramacii.robustulus
 >() => { var y = this; } : () => void
 >y : oconnelli
 >this : oconnelli
->x : robustulus
+>x : dogramacii.robustulus
 
     ceylonicus() : rionegrensis.caniventer { var x : rionegrensis.caniventer; () => { var y = this; }; return x; }
->ceylonicus : () => caniventer
+>ceylonicus : () => rionegrensis.caniventer
 >rionegrensis : rionegrensis
->caniventer : caniventer
->x : caniventer
+>caniventer : rionegrensis.caniventer
+>x : rionegrensis.caniventer
 >rionegrensis : rionegrensis
->caniventer : caniventer
+>caniventer : rionegrensis.caniventer
 >() => { var y = this; } : () => void
 >y : oconnelli
 >this : oconnelli
->x : caniventer
+>x : rionegrensis.caniventer
 
     ralli() : lavali.xanthognathus { var x : lavali.xanthognathus; () => { var y = this; }; return x; }
->ralli : () => xanthognathus
+>ralli : () => lavali.xanthognathus
 >lavali : lavali
->xanthognathus : xanthognathus
->x : xanthognathus
+>xanthognathus : lavali.xanthognathus
+>x : lavali.xanthognathus
 >lavali : lavali
->xanthognathus : xanthognathus
+>xanthognathus : lavali.xanthognathus
 >() => { var y = this; } : () => void
 >y : oconnelli
 >this : oconnelli
->x : xanthognathus
+>x : lavali.xanthognathus
   }
 }
 module quasiater {
->quasiater : typeof quasiater
+>quasiater : quasiater
 
   export class bobrinskoi {
 >bobrinskoi : bobrinskoi
 
     crassicaudatus() : samarensis.cahirinus<macrorhinos.daphaenodon, argurus.luctuosa> { var x : samarensis.cahirinus<macrorhinos.daphaenodon, argurus.luctuosa>; () => { var y = this; }; return x; }
->crassicaudatus : () => cahirinus<daphaenodon, luctuosa>
+>crassicaudatus : () => samarensis.cahirinus<macrorhinos.daphaenodon, argurus.luctuosa>
 >samarensis : samarensis
->cahirinus : cahirinus<T0, T1>
+>cahirinus : samarensis.cahirinus<T0, T1>
 >macrorhinos : macrorhinos
->daphaenodon : daphaenodon
+>daphaenodon : macrorhinos.daphaenodon
 >argurus : argurus
->luctuosa : luctuosa
->x : cahirinus<daphaenodon, luctuosa>
+>luctuosa : argurus.luctuosa
+>x : samarensis.cahirinus<macrorhinos.daphaenodon, argurus.luctuosa>
 >samarensis : samarensis
->cahirinus : cahirinus<T0, T1>
+>cahirinus : samarensis.cahirinus<T0, T1>
 >macrorhinos : macrorhinos
->daphaenodon : daphaenodon
+>daphaenodon : macrorhinos.daphaenodon
 >argurus : argurus
->luctuosa : luctuosa
+>luctuosa : argurus.luctuosa
 >() => { var y = this; } : () => void
 >y : bobrinskoi
 >this : bobrinskoi
->x : cahirinus<daphaenodon, luctuosa>
+>x : samarensis.cahirinus<macrorhinos.daphaenodon, argurus.luctuosa>
 
     mulatta() : argurus.oreas { var x : argurus.oreas; () => { var y = this; }; return x; }
->mulatta : () => oreas
+>mulatta : () => argurus.oreas
 >argurus : argurus
->oreas : oreas
->x : oreas
+>oreas : argurus.oreas
+>x : argurus.oreas
 >argurus : argurus
->oreas : oreas
+>oreas : argurus.oreas
 >() => { var y = this; } : () => void
 >y : bobrinskoi
 >this : bobrinskoi
->x : oreas
+>x : argurus.oreas
 
     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 : () => moojeni<amphibius<falconeri, psilurus>, echinatus>
+>ansorgei : () => rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>
 >rendalli : rendalli
->moojeni : moojeni<T0, T1>
+>moojeni : rendalli.moojeni<T0, T1>
 >panglima : panglima
->amphibius : amphibius<T0, T1>
+>amphibius : panglima.amphibius<T0, T1>
 >trivirgatus : trivirgatus
->falconeri : falconeri
+>falconeri : trivirgatus.falconeri
 >caurinus : caurinus
->psilurus : psilurus
+>psilurus : caurinus.psilurus
 >gabriellae : gabriellae
->echinatus : echinatus
->x : moojeni<amphibius<falconeri, psilurus>, echinatus>
+>echinatus : gabriellae.echinatus
+>x : rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>
 >rendalli : rendalli
->moojeni : moojeni<T0, T1>
+>moojeni : rendalli.moojeni<T0, T1>
 >panglima : panglima
->amphibius : amphibius<T0, T1>
+>amphibius : panglima.amphibius<T0, T1>
 >trivirgatus : trivirgatus
->falconeri : falconeri
+>falconeri : trivirgatus.falconeri
 >caurinus : caurinus
->psilurus : psilurus
+>psilurus : caurinus.psilurus
 >gabriellae : gabriellae
->echinatus : echinatus
+>echinatus : gabriellae.echinatus
 >() => { var y = this; } : () => void
 >y : bobrinskoi
 >this : bobrinskoi
->x : moojeni<amphibius<falconeri, psilurus>, echinatus>
+>x : rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>
 
     Copper() : argurus.netscheri<quasiater.carolinensis, dogramacii.kaiseri> { var x : argurus.netscheri<quasiater.carolinensis, dogramacii.kaiseri>; () => { var y = this; }; return x; }
->Copper : () => netscheri<carolinensis, kaiseri>
+>Copper : () => argurus.netscheri<carolinensis, dogramacii.kaiseri>
 >argurus : argurus
->netscheri : netscheri<T0, T1>
+>netscheri : argurus.netscheri<T0, T1>
 >quasiater : quasiater
 >carolinensis : carolinensis
 >dogramacii : dogramacii
->kaiseri : kaiseri
->x : netscheri<carolinensis, kaiseri>
+>kaiseri : dogramacii.kaiseri
+>x : argurus.netscheri<carolinensis, dogramacii.kaiseri>
 >argurus : argurus
->netscheri : netscheri<T0, T1>
+>netscheri : argurus.netscheri<T0, T1>
 >quasiater : quasiater
 >carolinensis : carolinensis
 >dogramacii : dogramacii
->kaiseri : kaiseri
+>kaiseri : dogramacii.kaiseri
 >() => { var y = this; } : () => void
 >y : bobrinskoi
 >this : bobrinskoi
->x : netscheri<carolinensis, kaiseri>
+>x : argurus.netscheri<carolinensis, dogramacii.kaiseri>
   }
 }
 module ruatanica {
->ruatanica : typeof ruatanica
+>ruatanica : ruatanica
 
   export class americanus extends imperfecta.ciliolabrum<argurus.germaini, lutreolus.foina> {
 >americanus : americanus
 >imperfecta : imperfecta
->ciliolabrum : ciliolabrum<T0, T1>
+>ciliolabrum : imperfecta.ciliolabrum<T0, T1>
 >argurus : argurus
->germaini : germaini
+>germaini : argurus.germaini
 >lutreolus : lutreolus
->foina : foina
+>foina : lutreolus.foina
 
     nasoloi() : macrorhinos.konganensis { var x : macrorhinos.konganensis; () => { var y = this; }; return x; }
->nasoloi : () => konganensis
+>nasoloi : () => macrorhinos.konganensis
 >macrorhinos : macrorhinos
->konganensis : konganensis
->x : konganensis
+>konganensis : macrorhinos.konganensis
+>x : macrorhinos.konganensis
 >macrorhinos : macrorhinos
->konganensis : konganensis
+>konganensis : macrorhinos.konganensis
 >() => { var y = this; } : () => void
 >y : americanus
 >this : americanus
->x : konganensis
+>x : macrorhinos.konganensis
 
     mystacalis() : howi.angulatus<quasiater.carolinensis, sagitta.stolzmanni> { var x : howi.angulatus<quasiater.carolinensis, sagitta.stolzmanni>; () => { var y = this; }; return x; }
->mystacalis : () => angulatus<carolinensis, stolzmanni>
+>mystacalis : () => howi.angulatus<quasiater.carolinensis, sagitta.stolzmanni>
 >howi : howi
->angulatus : angulatus<T0, T1>
+>angulatus : howi.angulatus<T0, T1>
 >quasiater : quasiater
->carolinensis : carolinensis
+>carolinensis : quasiater.carolinensis
 >sagitta : sagitta
->stolzmanni : stolzmanni
->x : angulatus<carolinensis, stolzmanni>
+>stolzmanni : sagitta.stolzmanni
+>x : howi.angulatus<quasiater.carolinensis, sagitta.stolzmanni>
 >howi : howi
->angulatus : angulatus<T0, T1>
+>angulatus : howi.angulatus<T0, T1>
 >quasiater : quasiater
->carolinensis : carolinensis
+>carolinensis : quasiater.carolinensis
 >sagitta : sagitta
->stolzmanni : stolzmanni
+>stolzmanni : sagitta.stolzmanni
 >() => { var y = this; } : () => void
 >y : americanus
 >this : americanus
->x : angulatus<carolinensis, stolzmanni>
+>x : howi.angulatus<quasiater.carolinensis, sagitta.stolzmanni>
 
     fardoulisi() : trivirgatus.oconnelli { var x : trivirgatus.oconnelli; () => { var y = this; }; return x; }
->fardoulisi : () => oconnelli
+>fardoulisi : () => trivirgatus.oconnelli
 >trivirgatus : trivirgatus
->oconnelli : oconnelli
->x : oconnelli
+>oconnelli : trivirgatus.oconnelli
+>x : trivirgatus.oconnelli
 >trivirgatus : trivirgatus
->oconnelli : oconnelli
+>oconnelli : trivirgatus.oconnelli
 >() => { var y = this; } : () => void
 >y : americanus
 >this : americanus
->x : oconnelli
+>x : trivirgatus.oconnelli
 
     tumidus() : gabriellae.amicus { var x : gabriellae.amicus; () => { var y = this; }; return x; }
->tumidus : () => amicus
+>tumidus : () => gabriellae.amicus
 >gabriellae : gabriellae
->amicus : amicus
->x : amicus
+>amicus : gabriellae.amicus
+>x : gabriellae.amicus
 >gabriellae : gabriellae
->amicus : amicus
+>amicus : gabriellae.amicus
 >() => { var y = this; } : () => void
 >y : americanus
 >this : americanus
->x : amicus
+>x : gabriellae.amicus
   }
 }
 module lavali {
->lavali : typeof lavali
+>lavali : lavali
 
   export class wilsoni extends Lanthanum.nitidus<rionegrensis.caniventer, Lanthanum.jugularis> {
 >wilsoni : wilsoni
 >Lanthanum : Lanthanum
->nitidus : nitidus<T0, T1>
+>nitidus : Lanthanum.nitidus<T0, T1>
 >rionegrensis : rionegrensis
->caniventer : caniventer
+>caniventer : rionegrensis.caniventer
 >Lanthanum : Lanthanum
->jugularis : jugularis
+>jugularis : Lanthanum.jugularis
 
     setiger() : nigra.thalia<patas.uralensis, wilsoni> { var x : nigra.thalia<patas.uralensis, wilsoni>; () => { var y = this; }; return x; }
->setiger : () => thalia<uralensis, wilsoni>
+>setiger : () => nigra.thalia<patas.uralensis, wilsoni>
 >nigra : nigra
->thalia : thalia<T0, T1>
+>thalia : nigra.thalia<T0, T1>
 >patas : patas
->uralensis : uralensis
+>uralensis : patas.uralensis
 >wilsoni : wilsoni
->x : thalia<uralensis, wilsoni>
+>x : nigra.thalia<patas.uralensis, wilsoni>
 >nigra : nigra
->thalia : thalia<T0, T1>
+>thalia : nigra.thalia<T0, T1>
 >patas : patas
->uralensis : uralensis
+>uralensis : patas.uralensis
 >wilsoni : wilsoni
 >() => { var y = this; } : () => void
 >y : wilsoni
 >this : wilsoni
->x : thalia<uralensis, wilsoni>
+>x : nigra.thalia<patas.uralensis, wilsoni>
 
     lorentzii() : imperfecta.subspinosus { var x : imperfecta.subspinosus; () => { var y = this; }; return x; }
->lorentzii : () => subspinosus
+>lorentzii : () => imperfecta.subspinosus
 >imperfecta : imperfecta
->subspinosus : subspinosus
->x : subspinosus
+>subspinosus : imperfecta.subspinosus
+>x : imperfecta.subspinosus
 >imperfecta : imperfecta
->subspinosus : subspinosus
+>subspinosus : imperfecta.subspinosus
 >() => { var y = this; } : () => void
 >y : wilsoni
 >this : wilsoni
->x : subspinosus
+>x : imperfecta.subspinosus
 
     antisensis() : lutreolus.foina { var x : lutreolus.foina; () => { var y = this; }; return x; }
->antisensis : () => foina
+>antisensis : () => lutreolus.foina
 >lutreolus : lutreolus
->foina : foina
->x : foina
+>foina : lutreolus.foina
+>x : lutreolus.foina
 >lutreolus : lutreolus
->foina : foina
+>foina : lutreolus.foina
 >() => { var y = this; } : () => void
 >y : wilsoni
 >this : wilsoni
->x : foina
+>x : lutreolus.foina
 
     blossevillii() : dammermani.siberu<Lanthanum.megalonyx, dogramacii.kaiseri> { var x : dammermani.siberu<Lanthanum.megalonyx, dogramacii.kaiseri>; () => { var y = this; }; return x; }
->blossevillii : () => siberu<megalonyx, kaiseri>
+>blossevillii : () => dammermani.siberu<Lanthanum.megalonyx, dogramacii.kaiseri>
 >dammermani : dammermani
->siberu : siberu<T0, T1>
+>siberu : dammermani.siberu<T0, T1>
 >Lanthanum : Lanthanum
->megalonyx : megalonyx
+>megalonyx : Lanthanum.megalonyx
 >dogramacii : dogramacii
->kaiseri : kaiseri
->x : siberu<megalonyx, kaiseri>
+>kaiseri : dogramacii.kaiseri
+>x : dammermani.siberu<Lanthanum.megalonyx, dogramacii.kaiseri>
 >dammermani : dammermani
->siberu : siberu<T0, T1>
+>siberu : dammermani.siberu<T0, T1>
 >Lanthanum : Lanthanum
->megalonyx : megalonyx
+>megalonyx : Lanthanum.megalonyx
 >dogramacii : dogramacii
->kaiseri : kaiseri
+>kaiseri : dogramacii.kaiseri
 >() => { var y = this; } : () => void
 >y : wilsoni
 >this : wilsoni
->x : siberu<megalonyx, kaiseri>
+>x : dammermani.siberu<Lanthanum.megalonyx, dogramacii.kaiseri>
 
     bontanus() : rionegrensis.caniventer { var x : rionegrensis.caniventer; () => { var y = this; }; return x; }
->bontanus : () => caniventer
+>bontanus : () => rionegrensis.caniventer
 >rionegrensis : rionegrensis
->caniventer : caniventer
->x : caniventer
+>caniventer : rionegrensis.caniventer
+>x : rionegrensis.caniventer
 >rionegrensis : rionegrensis
->caniventer : caniventer
+>caniventer : rionegrensis.caniventer
 >() => { var y = this; } : () => void
 >y : wilsoni
 >this : wilsoni
->x : caniventer
+>x : rionegrensis.caniventer
 
     caligata() : argurus.oreas { var x : argurus.oreas; () => { var y = this; }; return x; }
->caligata : () => oreas
+>caligata : () => argurus.oreas
 >argurus : argurus
->oreas : oreas
->x : oreas
+>oreas : argurus.oreas
+>x : argurus.oreas
 >argurus : argurus
->oreas : oreas
+>oreas : argurus.oreas
 >() => { var y = this; } : () => void
 >y : wilsoni
 >this : wilsoni
->x : oreas
+>x : argurus.oreas
 
     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 : () => amphibius<klossii<jugularis, jugularis>, subspinosus>
+>franqueti : () => panglima.amphibius<gabriellae.klossii<Lanthanum.jugularis, Lanthanum.jugularis>, imperfecta.subspinosus>
 >panglima : panglima
->amphibius : amphibius<T0, T1>
+>amphibius : panglima.amphibius<T0, T1>
 >gabriellae : gabriellae
->klossii : klossii<T0, T1>
+>klossii : gabriellae.klossii<T0, T1>
 >Lanthanum : Lanthanum
->jugularis : jugularis
+>jugularis : Lanthanum.jugularis
 >Lanthanum : Lanthanum
->jugularis : jugularis
+>jugularis : Lanthanum.jugularis
 >imperfecta : imperfecta
->subspinosus : subspinosus
->x : amphibius<klossii<jugularis, jugularis>, subspinosus>
+>subspinosus : imperfecta.subspinosus
+>x : panglima.amphibius<gabriellae.klossii<Lanthanum.jugularis, Lanthanum.jugularis>, imperfecta.subspinosus>
 >panglima : panglima
->amphibius : amphibius<T0, T1>
+>amphibius : panglima.amphibius<T0, T1>
 >gabriellae : gabriellae
->klossii : klossii<T0, T1>
+>klossii : gabriellae.klossii<T0, T1>
 >Lanthanum : Lanthanum
->jugularis : jugularis
+>jugularis : Lanthanum.jugularis
 >Lanthanum : Lanthanum
->jugularis : jugularis
+>jugularis : Lanthanum.jugularis
 >imperfecta : imperfecta
->subspinosus : subspinosus
+>subspinosus : imperfecta.subspinosus
 >() => { var y = this; } : () => void
 >y : wilsoni
 >this : wilsoni
->x : amphibius<klossii<jugularis, jugularis>, subspinosus>
+>x : panglima.amphibius<gabriellae.klossii<Lanthanum.jugularis, Lanthanum.jugularis>, imperfecta.subspinosus>
 
     roberti() : julianae.acariensis { var x : julianae.acariensis; () => { var y = this; }; return x; }
->roberti : () => acariensis
+>roberti : () => julianae.acariensis
 >julianae : julianae
->acariensis : acariensis
->x : acariensis
+>acariensis : julianae.acariensis
+>x : julianae.acariensis
 >julianae : julianae
->acariensis : acariensis
+>acariensis : julianae.acariensis
 >() => { var y = this; } : () => void
 >y : wilsoni
 >this : wilsoni
->x : acariensis
+>x : julianae.acariensis
 
     degelidus() : chrysaeolus.sarasinorum<Lanthanum.jugularis, imperfecta.subspinosus> { var x : chrysaeolus.sarasinorum<Lanthanum.jugularis, imperfecta.subspinosus>; () => { var y = this; }; return x; }
->degelidus : () => sarasinorum<jugularis, subspinosus>
+>degelidus : () => chrysaeolus.sarasinorum<Lanthanum.jugularis, imperfecta.subspinosus>
 >chrysaeolus : chrysaeolus
->sarasinorum : sarasinorum<T0, T1>
+>sarasinorum : chrysaeolus.sarasinorum<T0, T1>
 >Lanthanum : Lanthanum
->jugularis : jugularis
+>jugularis : Lanthanum.jugularis
 >imperfecta : imperfecta
->subspinosus : subspinosus
->x : sarasinorum<jugularis, subspinosus>
+>subspinosus : imperfecta.subspinosus
+>x : chrysaeolus.sarasinorum<Lanthanum.jugularis, imperfecta.subspinosus>
 >chrysaeolus : chrysaeolus
->sarasinorum : sarasinorum<T0, T1>
+>sarasinorum : chrysaeolus.sarasinorum<T0, T1>
 >Lanthanum : Lanthanum
->jugularis : jugularis
+>jugularis : Lanthanum.jugularis
 >imperfecta : imperfecta
->subspinosus : subspinosus
+>subspinosus : imperfecta.subspinosus
 >() => { var y = this; } : () => void
 >y : wilsoni
 >this : wilsoni
->x : sarasinorum<jugularis, subspinosus>
+>x : chrysaeolus.sarasinorum<Lanthanum.jugularis, imperfecta.subspinosus>
 
     amoenus() : quasiater.carolinensis { var x : quasiater.carolinensis; () => { var y = this; }; return x; }
->amoenus : () => carolinensis
+>amoenus : () => quasiater.carolinensis
 >quasiater : quasiater
->carolinensis : carolinensis
->x : carolinensis
+>carolinensis : quasiater.carolinensis
+>x : quasiater.carolinensis
 >quasiater : quasiater
->carolinensis : carolinensis
+>carolinensis : quasiater.carolinensis
 >() => { var y = this; } : () => void
 >y : wilsoni
 >this : wilsoni
->x : carolinensis
+>x : quasiater.carolinensis
 
     kob() : trivirgatus.lotor<argurus.oreas, beisa> { var x : trivirgatus.lotor<argurus.oreas, beisa>; () => { var y = this; }; return x; }
->kob : () => lotor<oreas, beisa>
+>kob : () => trivirgatus.lotor<argurus.oreas, beisa>
 >trivirgatus : trivirgatus
->lotor : lotor<T0, T1>
+>lotor : trivirgatus.lotor<T0, T1>
 >argurus : argurus
->oreas : oreas
+>oreas : argurus.oreas
 >beisa : beisa
->x : lotor<oreas, beisa>
+>x : trivirgatus.lotor<argurus.oreas, beisa>
 >trivirgatus : trivirgatus
->lotor : lotor<T0, T1>
+>lotor : trivirgatus.lotor<T0, T1>
 >argurus : argurus
->oreas : oreas
+>oreas : argurus.oreas
 >beisa : beisa
 >() => { var y = this; } : () => void
 >y : wilsoni
 >this : wilsoni
->x : lotor<oreas, beisa>
+>x : trivirgatus.lotor<argurus.oreas, beisa>
 
     csorbai() : caurinus.johorensis<caurinus.megaphyllus, julianae.steerii> { var x : caurinus.johorensis<caurinus.megaphyllus, julianae.steerii>; () => { var y = this; }; return x; }
->csorbai : () => johorensis<megaphyllus, steerii>
+>csorbai : () => caurinus.johorensis<caurinus.megaphyllus, julianae.steerii>
 >caurinus : caurinus
->johorensis : johorensis<T0, T1>
+>johorensis : caurinus.johorensis<T0, T1>
 >caurinus : caurinus
->megaphyllus : megaphyllus
+>megaphyllus : caurinus.megaphyllus
 >julianae : julianae
->steerii : steerii
->x : johorensis<megaphyllus, steerii>
+>steerii : julianae.steerii
+>x : caurinus.johorensis<caurinus.megaphyllus, julianae.steerii>
 >caurinus : caurinus
->johorensis : johorensis<T0, T1>
+>johorensis : caurinus.johorensis<T0, T1>
 >caurinus : caurinus
->megaphyllus : megaphyllus
+>megaphyllus : caurinus.megaphyllus
 >julianae : julianae
->steerii : steerii
+>steerii : julianae.steerii
 >() => { var y = this; } : () => void
 >y : wilsoni
 >this : wilsoni
->x : johorensis<megaphyllus, steerii>
+>x : caurinus.johorensis<caurinus.megaphyllus, julianae.steerii>
 
     dorsata() : gabriellae.echinatus { var x : gabriellae.echinatus; () => { var y = this; }; return x; }
->dorsata : () => echinatus
+>dorsata : () => gabriellae.echinatus
 >gabriellae : gabriellae
->echinatus : echinatus
->x : echinatus
+>echinatus : gabriellae.echinatus
+>x : gabriellae.echinatus
 >gabriellae : gabriellae
->echinatus : echinatus
+>echinatus : gabriellae.echinatus
 >() => { var y = this; } : () => void
 >y : wilsoni
 >this : wilsoni
->x : echinatus
+>x : gabriellae.echinatus
   }
   export class beisa {
 >beisa : beisa
@@ -3639,75 +3639,75 @@ module lavali {
   export class otion extends howi.coludo<argurus.oreas, howi.marcanoi> {
 >otion : otion
 >howi : howi
->coludo : coludo<T0, T1>
+>coludo : howi.coludo<T0, T1>
 >argurus : argurus
->oreas : oreas
+>oreas : argurus.oreas
 >howi : howi
->marcanoi : marcanoi
+>marcanoi : howi.marcanoi
 
     bonaerensis() : provocax.melanoleuca { var x : provocax.melanoleuca; () => { var y = this; }; return x; }
->bonaerensis : () => melanoleuca
+>bonaerensis : () => provocax.melanoleuca
 >provocax : provocax
->melanoleuca : melanoleuca
->x : melanoleuca
+>melanoleuca : provocax.melanoleuca
+>x : provocax.melanoleuca
 >provocax : provocax
->melanoleuca : melanoleuca
+>melanoleuca : provocax.melanoleuca
 >() => { var y = this; } : () => void
 >y : otion
 >this : otion
->x : melanoleuca
+>x : provocax.melanoleuca
 
     dussumieri() : nigra.gracilis<julianae.steerii, dogramacii.kaiseri> { var x : nigra.gracilis<julianae.steerii, dogramacii.kaiseri>; () => { var y = this; }; return x; }
->dussumieri : () => gracilis<steerii, kaiseri>
+>dussumieri : () => nigra.gracilis<julianae.steerii, dogramacii.kaiseri>
 >nigra : nigra
->gracilis : gracilis<T0, T1>
+>gracilis : nigra.gracilis<T0, T1>
 >julianae : julianae
->steerii : steerii
+>steerii : julianae.steerii
 >dogramacii : dogramacii
->kaiseri : kaiseri
->x : gracilis<steerii, kaiseri>
+>kaiseri : dogramacii.kaiseri
+>x : nigra.gracilis<julianae.steerii, dogramacii.kaiseri>
 >nigra : nigra
->gracilis : gracilis<T0, T1>
+>gracilis : nigra.gracilis<T0, T1>
 >julianae : julianae
->steerii : steerii
+>steerii : julianae.steerii
 >dogramacii : dogramacii
->kaiseri : kaiseri
+>kaiseri : dogramacii.kaiseri
 >() => { var y = this; } : () => void
 >y : otion
 >this : otion
->x : gracilis<steerii, kaiseri>
+>x : nigra.gracilis<julianae.steerii, dogramacii.kaiseri>
 
     osvaldoreigi() : julianae.albidens<julianae.steerii, quasiater.carolinensis> { var x : julianae.albidens<julianae.steerii, quasiater.carolinensis>; () => { var y = this; }; return x; }
->osvaldoreigi : () => albidens<steerii, carolinensis>
+>osvaldoreigi : () => julianae.albidens<julianae.steerii, quasiater.carolinensis>
 >julianae : julianae
->albidens : albidens<T0, T1>
+>albidens : julianae.albidens<T0, T1>
 >julianae : julianae
->steerii : steerii
+>steerii : julianae.steerii
 >quasiater : quasiater
->carolinensis : carolinensis
->x : albidens<steerii, carolinensis>
+>carolinensis : quasiater.carolinensis
+>x : julianae.albidens<julianae.steerii, quasiater.carolinensis>
 >julianae : julianae
->albidens : albidens<T0, T1>
+>albidens : julianae.albidens<T0, T1>
 >julianae : julianae
->steerii : steerii
+>steerii : julianae.steerii
 >quasiater : quasiater
->carolinensis : carolinensis
+>carolinensis : quasiater.carolinensis
 >() => { var y = this; } : () => void
 >y : otion
 >this : otion
->x : albidens<steerii, carolinensis>
+>x : julianae.albidens<julianae.steerii, quasiater.carolinensis>
 
     grevyi() : samarensis.pallidus { var x : samarensis.pallidus; () => { var y = this; }; return x; }
->grevyi : () => pallidus
+>grevyi : () => samarensis.pallidus
 >samarensis : samarensis
->pallidus : pallidus
->x : pallidus
+>pallidus : samarensis.pallidus
+>x : samarensis.pallidus
 >samarensis : samarensis
->pallidus : pallidus
+>pallidus : samarensis.pallidus
 >() => { var y = this; } : () => void
 >y : otion
 >this : otion
->x : pallidus
+>x : samarensis.pallidus
 
     hirtula() : lepturus { var x : lepturus; () => { var y = this; }; return x; }
 >hirtula : () => lepturus
@@ -3720,1111 +3720,1111 @@ module lavali {
 >x : lepturus
 
     cristatus() : argurus.luctuosa { var x : argurus.luctuosa; () => { var y = this; }; return x; }
->cristatus : () => luctuosa
+>cristatus : () => argurus.luctuosa
 >argurus : argurus
->luctuosa : luctuosa
->x : luctuosa
+>luctuosa : argurus.luctuosa
+>x : argurus.luctuosa
 >argurus : argurus
->luctuosa : luctuosa
+>luctuosa : argurus.luctuosa
 >() => { var y = this; } : () => void
 >y : otion
 >this : otion
->x : luctuosa
+>x : argurus.luctuosa
 
     darlingtoni() : sagitta.leptoceros<wilsoni, trivirgatus.oconnelli> { var x : sagitta.leptoceros<wilsoni, trivirgatus.oconnelli>; () => { var y = this; }; return x; }
->darlingtoni : () => leptoceros<wilsoni, oconnelli>
+>darlingtoni : () => sagitta.leptoceros<wilsoni, trivirgatus.oconnelli>
 >sagitta : sagitta
->leptoceros : leptoceros<T0, T1>
+>leptoceros : sagitta.leptoceros<T0, T1>
 >wilsoni : wilsoni
 >trivirgatus : trivirgatus
->oconnelli : oconnelli
->x : leptoceros<wilsoni, oconnelli>
+>oconnelli : trivirgatus.oconnelli
+>x : sagitta.leptoceros<wilsoni, trivirgatus.oconnelli>
 >sagitta : sagitta
->leptoceros : leptoceros<T0, T1>
+>leptoceros : sagitta.leptoceros<T0, T1>
 >wilsoni : wilsoni
 >trivirgatus : trivirgatus
->oconnelli : oconnelli
+>oconnelli : trivirgatus.oconnelli
 >() => { var y = this; } : () => void
 >y : otion
 >this : otion
->x : leptoceros<wilsoni, oconnelli>
+>x : sagitta.leptoceros<wilsoni, trivirgatus.oconnelli>
 
     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 : () => setulosus<fuscus<wilsoni, sarasinorum<jugularis, subspinosus>>, foina>
+>fontanierii : () => panamensis.setulosus<samarensis.fuscus<wilsoni, chrysaeolus.sarasinorum<Lanthanum.jugularis, imperfecta.subspinosus>>, lutreolus.foina>
 >panamensis : panamensis
->setulosus : setulosus<T0, T1>
+>setulosus : panamensis.setulosus<T0, T1>
 >samarensis : samarensis
->fuscus : fuscus<T0, T1>
+>fuscus : samarensis.fuscus<T0, T1>
 >wilsoni : wilsoni
 >chrysaeolus : chrysaeolus
->sarasinorum : sarasinorum<T0, T1>
+>sarasinorum : chrysaeolus.sarasinorum<T0, T1>
 >Lanthanum : Lanthanum
->jugularis : jugularis
+>jugularis : Lanthanum.jugularis
 >imperfecta : imperfecta
->subspinosus : subspinosus
+>subspinosus : imperfecta.subspinosus
 >lutreolus : lutreolus
->foina : foina
->x : setulosus<fuscus<wilsoni, sarasinorum<jugularis, subspinosus>>, foina>
+>foina : lutreolus.foina
+>x : panamensis.setulosus<samarensis.fuscus<wilsoni, chrysaeolus.sarasinorum<Lanthanum.jugularis, imperfecta.subspinosus>>, lutreolus.foina>
 >panamensis : panamensis
->setulosus : setulosus<T0, T1>
+>setulosus : panamensis.setulosus<T0, T1>
 >samarensis : samarensis
->fuscus : fuscus<T0, T1>
+>fuscus : samarensis.fuscus<T0, T1>
 >wilsoni : wilsoni
 >chrysaeolus : chrysaeolus
->sarasinorum : sarasinorum<T0, T1>
+>sarasinorum : chrysaeolus.sarasinorum<T0, T1>
 >Lanthanum : Lanthanum
->jugularis : jugularis
+>jugularis : Lanthanum.jugularis
 >imperfecta : imperfecta
->subspinosus : subspinosus
+>subspinosus : imperfecta.subspinosus
 >lutreolus : lutreolus
->foina : foina
+>foina : lutreolus.foina
 >() => { var y = this; } : () => void
 >y : otion
 >this : otion
->x : setulosus<fuscus<wilsoni, sarasinorum<jugularis, subspinosus>>, foina>
+>x : panamensis.setulosus<samarensis.fuscus<wilsoni, chrysaeolus.sarasinorum<Lanthanum.jugularis, imperfecta.subspinosus>>, lutreolus.foina>
 
     umbrosus() : howi.marcanoi { var x : howi.marcanoi; () => { var y = this; }; return x; }
->umbrosus : () => marcanoi
+>umbrosus : () => howi.marcanoi
 >howi : howi
->marcanoi : marcanoi
->x : marcanoi
+>marcanoi : howi.marcanoi
+>x : howi.marcanoi
 >howi : howi
->marcanoi : marcanoi
+>marcanoi : howi.marcanoi
 >() => { var y = this; } : () => void
 >y : otion
 >this : otion
->x : marcanoi
+>x : howi.marcanoi
 
     chiriquinus() : imperfecta.lasiurus<caurinus.psilurus, caurinus.psilurus> { var x : imperfecta.lasiurus<caurinus.psilurus, caurinus.psilurus>; () => { var y = this; }; return x; }
->chiriquinus : () => lasiurus<psilurus, psilurus>
+>chiriquinus : () => imperfecta.lasiurus<caurinus.psilurus, caurinus.psilurus>
 >imperfecta : imperfecta
->lasiurus : lasiurus<T0, T1>
+>lasiurus : imperfecta.lasiurus<T0, T1>
 >caurinus : caurinus
->psilurus : psilurus
+>psilurus : caurinus.psilurus
 >caurinus : caurinus
->psilurus : psilurus
->x : lasiurus<psilurus, psilurus>
+>psilurus : caurinus.psilurus
+>x : imperfecta.lasiurus<caurinus.psilurus, caurinus.psilurus>
 >imperfecta : imperfecta
->lasiurus : lasiurus<T0, T1>
+>lasiurus : imperfecta.lasiurus<T0, T1>
 >caurinus : caurinus
->psilurus : psilurus
+>psilurus : caurinus.psilurus
 >caurinus : caurinus
->psilurus : psilurus
+>psilurus : caurinus.psilurus
 >() => { var y = this; } : () => void
 >y : otion
 >this : otion
->x : lasiurus<psilurus, psilurus>
+>x : imperfecta.lasiurus<caurinus.psilurus, caurinus.psilurus>
 
     orarius() : lutreolus.schlegeli { var x : lutreolus.schlegeli; () => { var y = this; }; return x; }
->orarius : () => schlegeli
+>orarius : () => lutreolus.schlegeli
 >lutreolus : lutreolus
->schlegeli : schlegeli
->x : schlegeli
+>schlegeli : lutreolus.schlegeli
+>x : lutreolus.schlegeli
 >lutreolus : lutreolus
->schlegeli : schlegeli
+>schlegeli : lutreolus.schlegeli
 >() => { var y = this; } : () => void
 >y : otion
 >this : otion
->x : schlegeli
+>x : lutreolus.schlegeli
 
     ilaeus() : caurinus.mahaganus<julianae.acariensis, julianae.sumatrana> { var x : caurinus.mahaganus<julianae.acariensis, julianae.sumatrana>; () => { var y = this; }; return x; }
->ilaeus : () => mahaganus<acariensis, sumatrana>
+>ilaeus : () => caurinus.mahaganus<julianae.acariensis, julianae.sumatrana>
 >caurinus : caurinus
->mahaganus : mahaganus<T0, T1>
+>mahaganus : caurinus.mahaganus<T0, T1>
 >julianae : julianae
->acariensis : acariensis
+>acariensis : julianae.acariensis
 >julianae : julianae
->sumatrana : sumatrana
->x : mahaganus<acariensis, sumatrana>
+>sumatrana : julianae.sumatrana
+>x : caurinus.mahaganus<julianae.acariensis, julianae.sumatrana>
 >caurinus : caurinus
->mahaganus : mahaganus<T0, T1>
+>mahaganus : caurinus.mahaganus<T0, T1>
 >julianae : julianae
->acariensis : acariensis
+>acariensis : julianae.acariensis
 >julianae : julianae
->sumatrana : sumatrana
+>sumatrana : julianae.sumatrana
 >() => { var y = this; } : () => void
 >y : otion
 >this : otion
->x : mahaganus<acariensis, sumatrana>
+>x : caurinus.mahaganus<julianae.acariensis, julianae.sumatrana>
 
     musschenbroekii() : trivirgatus.falconeri { var x : trivirgatus.falconeri; () => { var y = this; }; return x; }
->musschenbroekii : () => falconeri
+>musschenbroekii : () => trivirgatus.falconeri
 >trivirgatus : trivirgatus
->falconeri : falconeri
->x : falconeri
+>falconeri : trivirgatus.falconeri
+>x : trivirgatus.falconeri
 >trivirgatus : trivirgatus
->falconeri : falconeri
+>falconeri : trivirgatus.falconeri
 >() => { var y = this; } : () => void
 >y : otion
 >this : otion
->x : falconeri
+>x : trivirgatus.falconeri
   }
   export class xanthognathus {
 >xanthognathus : xanthognathus
 
     nanulus() : daubentonii.nigricans<imperfecta.subspinosus, samarensis.pallidus> { var x : daubentonii.nigricans<imperfecta.subspinosus, samarensis.pallidus>; () => { var y = this; }; return x; }
->nanulus : () => nigricans<subspinosus, pallidus>
+>nanulus : () => daubentonii.nigricans<imperfecta.subspinosus, samarensis.pallidus>
 >daubentonii : daubentonii
->nigricans : nigricans<T0, T1>
+>nigricans : daubentonii.nigricans<T0, T1>
 >imperfecta : imperfecta
->subspinosus : subspinosus
+>subspinosus : imperfecta.subspinosus
 >samarensis : samarensis
->pallidus : pallidus
->x : nigricans<subspinosus, pallidus>
+>pallidus : samarensis.pallidus
+>x : daubentonii.nigricans<imperfecta.subspinosus, samarensis.pallidus>
 >daubentonii : daubentonii
->nigricans : nigricans<T0, T1>
+>nigricans : daubentonii.nigricans<T0, T1>
 >imperfecta : imperfecta
->subspinosus : subspinosus
+>subspinosus : imperfecta.subspinosus
 >samarensis : samarensis
->pallidus : pallidus
+>pallidus : samarensis.pallidus
 >() => { var y = this; } : () => void
 >y : xanthognathus
 >this : xanthognathus
->x : nigricans<subspinosus, pallidus>
+>x : daubentonii.nigricans<imperfecta.subspinosus, samarensis.pallidus>
 
     albigena() : chrysaeolus.sarasinorum<caurinus.psilurus, quasiater.bobrinskoi> { var x : chrysaeolus.sarasinorum<caurinus.psilurus, quasiater.bobrinskoi>; () => { var y = this; }; return x; }
->albigena : () => sarasinorum<psilurus, bobrinskoi>
+>albigena : () => chrysaeolus.sarasinorum<caurinus.psilurus, quasiater.bobrinskoi>
 >chrysaeolus : chrysaeolus
->sarasinorum : sarasinorum<T0, T1>
+>sarasinorum : chrysaeolus.sarasinorum<T0, T1>
 >caurinus : caurinus
->psilurus : psilurus
+>psilurus : caurinus.psilurus
 >quasiater : quasiater
->bobrinskoi : bobrinskoi
->x : sarasinorum<psilurus, bobrinskoi>
+>bobrinskoi : quasiater.bobrinskoi
+>x : chrysaeolus.sarasinorum<caurinus.psilurus, quasiater.bobrinskoi>
 >chrysaeolus : chrysaeolus
->sarasinorum : sarasinorum<T0, T1>
+>sarasinorum : chrysaeolus.sarasinorum<T0, T1>
 >caurinus : caurinus
->psilurus : psilurus
+>psilurus : caurinus.psilurus
 >quasiater : quasiater
->bobrinskoi : bobrinskoi
+>bobrinskoi : quasiater.bobrinskoi
 >() => { var y = this; } : () => void
 >y : xanthognathus
 >this : xanthognathus
->x : sarasinorum<psilurus, bobrinskoi>
+>x : chrysaeolus.sarasinorum<caurinus.psilurus, quasiater.bobrinskoi>
 
     onca() : sagitta.stolzmanni { var x : sagitta.stolzmanni; () => { var y = this; }; return x; }
->onca : () => stolzmanni
+>onca : () => sagitta.stolzmanni
 >sagitta : sagitta
->stolzmanni : stolzmanni
->x : stolzmanni
+>stolzmanni : sagitta.stolzmanni
+>x : sagitta.stolzmanni
 >sagitta : sagitta
->stolzmanni : stolzmanni
+>stolzmanni : sagitta.stolzmanni
 >() => { var y = this; } : () => void
 >y : xanthognathus
 >this : xanthognathus
->x : stolzmanni
+>x : sagitta.stolzmanni
 
     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 : () => himalayana<coludo<lepturus, punicus>, thalia<uralensis, robustulus>>
+>gunnii : () => minutus.himalayana<howi.coludo<lepturus, lutreolus.punicus>, nigra.thalia<patas.uralensis, dogramacii.robustulus>>
 >minutus : minutus
->himalayana : himalayana<T0, T1>
+>himalayana : minutus.himalayana<T0, T1>
 >howi : howi
->coludo : coludo<T0, T1>
+>coludo : howi.coludo<T0, T1>
 >lepturus : lepturus
 >lutreolus : lutreolus
->punicus : punicus
+>punicus : lutreolus.punicus
 >nigra : nigra
->thalia : thalia<T0, T1>
+>thalia : nigra.thalia<T0, T1>
 >patas : patas
->uralensis : uralensis
+>uralensis : patas.uralensis
 >dogramacii : dogramacii
->robustulus : robustulus
->x : himalayana<coludo<lepturus, punicus>, thalia<uralensis, robustulus>>
+>robustulus : dogramacii.robustulus
+>x : minutus.himalayana<howi.coludo<lepturus, lutreolus.punicus>, nigra.thalia<patas.uralensis, dogramacii.robustulus>>
 >minutus : minutus
->himalayana : himalayana<T0, T1>
+>himalayana : minutus.himalayana<T0, T1>
 >howi : howi
->coludo : coludo<T0, T1>
+>coludo : howi.coludo<T0, T1>
 >lepturus : lepturus
 >lutreolus : lutreolus
->punicus : punicus
+>punicus : lutreolus.punicus
 >nigra : nigra
->thalia : thalia<T0, T1>
+>thalia : nigra.thalia<T0, T1>
 >patas : patas
->uralensis : uralensis
+>uralensis : patas.uralensis
 >dogramacii : dogramacii
->robustulus : robustulus
+>robustulus : dogramacii.robustulus
 >() => { var y = this; } : () => void
 >y : xanthognathus
 >this : xanthognathus
->x : himalayana<coludo<lepturus, punicus>, thalia<uralensis, robustulus>>
+>x : minutus.himalayana<howi.coludo<lepturus, lutreolus.punicus>, nigra.thalia<patas.uralensis, dogramacii.robustulus>>
 
     apeco() : lutreolus.foina { var x : lutreolus.foina; () => { var y = this; }; return x; }
->apeco : () => foina
+>apeco : () => lutreolus.foina
 >lutreolus : lutreolus
->foina : foina
->x : foina
+>foina : lutreolus.foina
+>x : lutreolus.foina
 >lutreolus : lutreolus
->foina : foina
+>foina : lutreolus.foina
 >() => { var y = this; } : () => void
 >y : xanthognathus
 >this : xanthognathus
->x : foina
+>x : lutreolus.foina
 
     variegates() : gabriellae.klossii<wilsoni, julianae.nudicaudus> { var x : gabriellae.klossii<wilsoni, julianae.nudicaudus>; () => { var y = this; }; return x; }
->variegates : () => klossii<wilsoni, nudicaudus>
+>variegates : () => gabriellae.klossii<wilsoni, julianae.nudicaudus>
 >gabriellae : gabriellae
->klossii : klossii<T0, T1>
+>klossii : gabriellae.klossii<T0, T1>
 >wilsoni : wilsoni
 >julianae : julianae
->nudicaudus : nudicaudus
->x : klossii<wilsoni, nudicaudus>
+>nudicaudus : julianae.nudicaudus
+>x : gabriellae.klossii<wilsoni, julianae.nudicaudus>
 >gabriellae : gabriellae
->klossii : klossii<T0, T1>
+>klossii : gabriellae.klossii<T0, T1>
 >wilsoni : wilsoni
 >julianae : julianae
->nudicaudus : nudicaudus
+>nudicaudus : julianae.nudicaudus
 >() => { var y = this; } : () => void
 >y : xanthognathus
 >this : xanthognathus
->x : klossii<wilsoni, nudicaudus>
+>x : gabriellae.klossii<wilsoni, julianae.nudicaudus>
 
     goudotii() : trivirgatus.falconeri { var x : trivirgatus.falconeri; () => { var y = this; }; return x; }
->goudotii : () => falconeri
+>goudotii : () => trivirgatus.falconeri
 >trivirgatus : trivirgatus
->falconeri : falconeri
->x : falconeri
+>falconeri : trivirgatus.falconeri
+>x : trivirgatus.falconeri
 >trivirgatus : trivirgatus
->falconeri : falconeri
+>falconeri : trivirgatus.falconeri
 >() => { var y = this; } : () => void
 >y : xanthognathus
 >this : xanthognathus
->x : falconeri
+>x : trivirgatus.falconeri
 
     pohlei() : Lanthanum.megalonyx { var x : Lanthanum.megalonyx; () => { var y = this; }; return x; }
->pohlei : () => megalonyx
+>pohlei : () => Lanthanum.megalonyx
 >Lanthanum : Lanthanum
->megalonyx : megalonyx
->x : megalonyx
+>megalonyx : Lanthanum.megalonyx
+>x : Lanthanum.megalonyx
 >Lanthanum : Lanthanum
->megalonyx : megalonyx
+>megalonyx : Lanthanum.megalonyx
 >() => { var y = this; } : () => void
 >y : xanthognathus
 >this : xanthognathus
->x : megalonyx
+>x : Lanthanum.megalonyx
 
     ineptus() : panamensis.setulosus<xanthognathus, beisa> { var x : panamensis.setulosus<xanthognathus, beisa>; () => { var y = this; }; return x; }
->ineptus : () => setulosus<xanthognathus, beisa>
+>ineptus : () => panamensis.setulosus<xanthognathus, beisa>
 >panamensis : panamensis
->setulosus : setulosus<T0, T1>
+>setulosus : panamensis.setulosus<T0, T1>
 >xanthognathus : xanthognathus
 >beisa : beisa
->x : setulosus<xanthognathus, beisa>
+>x : panamensis.setulosus<xanthognathus, beisa>
 >panamensis : panamensis
->setulosus : setulosus<T0, T1>
+>setulosus : panamensis.setulosus<T0, T1>
 >xanthognathus : xanthognathus
 >beisa : beisa
 >() => { var y = this; } : () => void
 >y : xanthognathus
 >this : xanthognathus
->x : setulosus<xanthognathus, beisa>
+>x : panamensis.setulosus<xanthognathus, beisa>
 
     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 : () => moojeni<steerii, pelurus<jugularis, americanus>>
+>euryotis : () => rendalli.moojeni<julianae.steerii, samarensis.pelurus<Lanthanum.jugularis, ruatanica.americanus>>
 >rendalli : rendalli
->moojeni : moojeni<T0, T1>
+>moojeni : rendalli.moojeni<T0, T1>
 >julianae : julianae
->steerii : steerii
+>steerii : julianae.steerii
 >samarensis : samarensis
->pelurus : pelurus<T0, T1>
+>pelurus : samarensis.pelurus<T0, T1>
 >Lanthanum : Lanthanum
->jugularis : jugularis
+>jugularis : Lanthanum.jugularis
 >ruatanica : ruatanica
->americanus : americanus
->x : moojeni<steerii, pelurus<jugularis, americanus>>
+>americanus : ruatanica.americanus
+>x : rendalli.moojeni<julianae.steerii, samarensis.pelurus<Lanthanum.jugularis, ruatanica.americanus>>
 >rendalli : rendalli
->moojeni : moojeni<T0, T1>
+>moojeni : rendalli.moojeni<T0, T1>
 >julianae : julianae
->steerii : steerii
+>steerii : julianae.steerii
 >samarensis : samarensis
->pelurus : pelurus<T0, T1>
+>pelurus : samarensis.pelurus<T0, T1>
 >Lanthanum : Lanthanum
->jugularis : jugularis
+>jugularis : Lanthanum.jugularis
 >ruatanica : ruatanica
->americanus : americanus
+>americanus : ruatanica.americanus
 >() => { var y = this; } : () => void
 >y : xanthognathus
 >this : xanthognathus
->x : moojeni<steerii, pelurus<jugularis, americanus>>
+>x : rendalli.moojeni<julianae.steerii, samarensis.pelurus<Lanthanum.jugularis, ruatanica.americanus>>
 
     maurisca() : Lanthanum.suillus<rionegrensis.caniventer, imperfecta.subspinosus> { var x : Lanthanum.suillus<rionegrensis.caniventer, imperfecta.subspinosus>; () => { var y = this; }; return x; }
->maurisca : () => suillus<caniventer, subspinosus>
+>maurisca : () => Lanthanum.suillus<rionegrensis.caniventer, imperfecta.subspinosus>
 >Lanthanum : Lanthanum
->suillus : suillus<T0, T1>
+>suillus : Lanthanum.suillus<T0, T1>
 >rionegrensis : rionegrensis
->caniventer : caniventer
+>caniventer : rionegrensis.caniventer
 >imperfecta : imperfecta
->subspinosus : subspinosus
->x : suillus<caniventer, subspinosus>
+>subspinosus : imperfecta.subspinosus
+>x : Lanthanum.suillus<rionegrensis.caniventer, imperfecta.subspinosus>
 >Lanthanum : Lanthanum
->suillus : suillus<T0, T1>
+>suillus : Lanthanum.suillus<T0, T1>
 >rionegrensis : rionegrensis
->caniventer : caniventer
+>caniventer : rionegrensis.caniventer
 >imperfecta : imperfecta
->subspinosus : subspinosus
+>subspinosus : imperfecta.subspinosus
 >() => { var y = this; } : () => void
 >y : xanthognathus
 >this : xanthognathus
->x : suillus<caniventer, subspinosus>
+>x : Lanthanum.suillus<rionegrensis.caniventer, imperfecta.subspinosus>
 
     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 : () => mahaganus<siberu<thalia<schlegeli, sumatrana>, abidi<foina, peninsulae>>, punicus>
+>coyhaiquensis : () => caurinus.mahaganus<dammermani.siberu<nigra.thalia<lutreolus.schlegeli, julianae.sumatrana>, panglima.abidi<lutreolus.foina, argurus.peninsulae>>, lutreolus.punicus>
 >caurinus : caurinus
->mahaganus : mahaganus<T0, T1>
+>mahaganus : caurinus.mahaganus<T0, T1>
 >dammermani : dammermani
->siberu : siberu<T0, T1>
+>siberu : dammermani.siberu<T0, T1>
 >nigra : nigra
->thalia : thalia<T0, T1>
+>thalia : nigra.thalia<T0, T1>
 >lutreolus : lutreolus
->schlegeli : schlegeli
+>schlegeli : lutreolus.schlegeli
 >julianae : julianae
->sumatrana : sumatrana
+>sumatrana : julianae.sumatrana
 >panglima : panglima
->abidi : abidi<T0, T1>
+>abidi : panglima.abidi<T0, T1>
 >lutreolus : lutreolus
->foina : foina
+>foina : lutreolus.foina
 >argurus : argurus
->peninsulae : peninsulae
+>peninsulae : argurus.peninsulae
 >lutreolus : lutreolus
->punicus : punicus
->x : mahaganus<siberu<thalia<schlegeli, sumatrana>, abidi<foina, peninsulae>>, punicus>
+>punicus : lutreolus.punicus
+>x : caurinus.mahaganus<dammermani.siberu<nigra.thalia<lutreolus.schlegeli, julianae.sumatrana>, panglima.abidi<lutreolus.foina, argurus.peninsulae>>, lutreolus.punicus>
 >caurinus : caurinus
->mahaganus : mahaganus<T0, T1>
+>mahaganus : caurinus.mahaganus<T0, T1>
 >dammermani : dammermani
->siberu : siberu<T0, T1>
+>siberu : dammermani.siberu<T0, T1>
 >nigra : nigra
->thalia : thalia<T0, T1>
+>thalia : nigra.thalia<T0, T1>
 >lutreolus : lutreolus
->schlegeli : schlegeli
+>schlegeli : lutreolus.schlegeli
 >julianae : julianae
->sumatrana : sumatrana
+>sumatrana : julianae.sumatrana
 >panglima : panglima
->abidi : abidi<T0, T1>
+>abidi : panglima.abidi<T0, T1>
 >lutreolus : lutreolus
->foina : foina
+>foina : lutreolus.foina
 >argurus : argurus
->peninsulae : peninsulae
+>peninsulae : argurus.peninsulae
 >lutreolus : lutreolus
->punicus : punicus
+>punicus : lutreolus.punicus
 >() => { var y = this; } : () => void
 >y : xanthognathus
 >this : xanthognathus
->x : mahaganus<siberu<thalia<schlegeli, sumatrana>, abidi<foina, peninsulae>>, punicus>
+>x : caurinus.mahaganus<dammermani.siberu<nigra.thalia<lutreolus.schlegeli, julianae.sumatrana>, panglima.abidi<lutreolus.foina, argurus.peninsulae>>, lutreolus.punicus>
   }
   export class thaeleri extends argurus.oreas {
 >thaeleri : thaeleri
 >argurus : argurus
->oreas : oreas
+>oreas : argurus.oreas
 
     coromandra() : julianae.galapagoensis { var x : julianae.galapagoensis; () => { var y = this; }; return x; }
->coromandra : () => galapagoensis
+>coromandra : () => julianae.galapagoensis
 >julianae : julianae
->galapagoensis : galapagoensis
->x : galapagoensis
+>galapagoensis : julianae.galapagoensis
+>x : julianae.galapagoensis
 >julianae : julianae
->galapagoensis : galapagoensis
+>galapagoensis : julianae.galapagoensis
 >() => { var y = this; } : () => void
 >y : thaeleri
 >this : thaeleri
->x : galapagoensis
+>x : julianae.galapagoensis
 
     parvipes() : nigra.dolichurus<argurus.germaini, samarensis.pallidus> { var x : nigra.dolichurus<argurus.germaini, samarensis.pallidus>; () => { var y = this; }; return x; }
->parvipes : () => dolichurus<germaini, pallidus>
+>parvipes : () => nigra.dolichurus<argurus.germaini, samarensis.pallidus>
 >nigra : nigra
->dolichurus : dolichurus<T0, T1>
+>dolichurus : nigra.dolichurus<T0, T1>
 >argurus : argurus
->germaini : germaini
+>germaini : argurus.germaini
 >samarensis : samarensis
->pallidus : pallidus
->x : dolichurus<germaini, pallidus>
+>pallidus : samarensis.pallidus
+>x : nigra.dolichurus<argurus.germaini, samarensis.pallidus>
 >nigra : nigra
->dolichurus : dolichurus<T0, T1>
+>dolichurus : nigra.dolichurus<T0, T1>
 >argurus : argurus
->germaini : germaini
+>germaini : argurus.germaini
 >samarensis : samarensis
->pallidus : pallidus
+>pallidus : samarensis.pallidus
 >() => { var y = this; } : () => void
 >y : thaeleri
 >this : thaeleri
->x : dolichurus<germaini, pallidus>
+>x : nigra.dolichurus<argurus.germaini, samarensis.pallidus>
 
     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 : () => veraecrucis<sarasinorum<psilurus, bobrinskoi>, steerii>
+>sponsorius : () => rionegrensis.veraecrucis<chrysaeolus.sarasinorum<caurinus.psilurus, quasiater.bobrinskoi>, julianae.steerii>
 >rionegrensis : rionegrensis
->veraecrucis : veraecrucis<T0, T1>
+>veraecrucis : rionegrensis.veraecrucis<T0, T1>
 >chrysaeolus : chrysaeolus
->sarasinorum : sarasinorum<T0, T1>
+>sarasinorum : chrysaeolus.sarasinorum<T0, T1>
 >caurinus : caurinus
->psilurus : psilurus
+>psilurus : caurinus.psilurus
 >quasiater : quasiater
->bobrinskoi : bobrinskoi
+>bobrinskoi : quasiater.bobrinskoi
 >julianae : julianae
->steerii : steerii
->x : veraecrucis<sarasinorum<psilurus, bobrinskoi>, steerii>
+>steerii : julianae.steerii
+>x : rionegrensis.veraecrucis<chrysaeolus.sarasinorum<caurinus.psilurus, quasiater.bobrinskoi>, julianae.steerii>
 >rionegrensis : rionegrensis
->veraecrucis : veraecrucis<T0, T1>
+>veraecrucis : rionegrensis.veraecrucis<T0, T1>
 >chrysaeolus : chrysaeolus
->sarasinorum : sarasinorum<T0, T1>
+>sarasinorum : chrysaeolus.sarasinorum<T0, T1>
 >caurinus : caurinus
->psilurus : psilurus
+>psilurus : caurinus.psilurus
 >quasiater : quasiater
->bobrinskoi : bobrinskoi
+>bobrinskoi : quasiater.bobrinskoi
 >julianae : julianae
->steerii : steerii
+>steerii : julianae.steerii
 >() => { var y = this; } : () => void
 >y : thaeleri
 >this : thaeleri
->x : veraecrucis<sarasinorum<psilurus, bobrinskoi>, steerii>
+>x : rionegrensis.veraecrucis<chrysaeolus.sarasinorum<caurinus.psilurus, quasiater.bobrinskoi>, julianae.steerii>
 
     vates() : dogramacii.robustulus { var x : dogramacii.robustulus; () => { var y = this; }; return x; }
->vates : () => robustulus
+>vates : () => dogramacii.robustulus
 >dogramacii : dogramacii
->robustulus : robustulus
->x : robustulus
+>robustulus : dogramacii.robustulus
+>x : dogramacii.robustulus
 >dogramacii : dogramacii
->robustulus : robustulus
+>robustulus : dogramacii.robustulus
 >() => { var y = this; } : () => void
 >y : thaeleri
 >this : thaeleri
->x : robustulus
+>x : dogramacii.robustulus
 
     roosmalenorum() : dogramacii.koepckeae { var x : dogramacii.koepckeae; () => { var y = this; }; return x; }
->roosmalenorum : () => koepckeae
+>roosmalenorum : () => dogramacii.koepckeae
 >dogramacii : dogramacii
->koepckeae : koepckeae
->x : koepckeae
+>koepckeae : dogramacii.koepckeae
+>x : dogramacii.koepckeae
 >dogramacii : dogramacii
->koepckeae : koepckeae
+>koepckeae : dogramacii.koepckeae
 >() => { var y = this; } : () => void
 >y : thaeleri
 >this : thaeleri
->x : koepckeae
+>x : dogramacii.koepckeae
 
     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 : () => moojeni<caniventer, moojeni<amphibius<falconeri, psilurus>, echinatus>>
+>rubicola : () => rendalli.moojeni<rionegrensis.caniventer, rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>>
 >rendalli : rendalli
->moojeni : moojeni<T0, T1>
+>moojeni : rendalli.moojeni<T0, T1>
 >rionegrensis : rionegrensis
->caniventer : caniventer
+>caniventer : rionegrensis.caniventer
 >rendalli : rendalli
->moojeni : moojeni<T0, T1>
+>moojeni : rendalli.moojeni<T0, T1>
 >panglima : panglima
->amphibius : amphibius<T0, T1>
+>amphibius : panglima.amphibius<T0, T1>
 >trivirgatus : trivirgatus
->falconeri : falconeri
+>falconeri : trivirgatus.falconeri
 >caurinus : caurinus
->psilurus : psilurus
+>psilurus : caurinus.psilurus
 >gabriellae : gabriellae
->echinatus : echinatus
->x : moojeni<caniventer, moojeni<amphibius<falconeri, psilurus>, echinatus>>
+>echinatus : gabriellae.echinatus
+>x : rendalli.moojeni<rionegrensis.caniventer, rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>>
 >rendalli : rendalli
->moojeni : moojeni<T0, T1>
+>moojeni : rendalli.moojeni<T0, T1>
 >rionegrensis : rionegrensis
->caniventer : caniventer
+>caniventer : rionegrensis.caniventer
 >rendalli : rendalli
->moojeni : moojeni<T0, T1>
+>moojeni : rendalli.moojeni<T0, T1>
 >panglima : panglima
->amphibius : amphibius<T0, T1>
+>amphibius : panglima.amphibius<T0, T1>
 >trivirgatus : trivirgatus
->falconeri : falconeri
+>falconeri : trivirgatus.falconeri
 >caurinus : caurinus
->psilurus : psilurus
+>psilurus : caurinus.psilurus
 >gabriellae : gabriellae
->echinatus : echinatus
+>echinatus : gabriellae.echinatus
 >() => { var y = this; } : () => void
 >y : thaeleri
 >this : thaeleri
->x : moojeni<caniventer, moojeni<amphibius<falconeri, psilurus>, echinatus>>
+>x : rendalli.moojeni<rionegrensis.caniventer, rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>>
 
     ikonnikovi() : argurus.luctuosa { var x : argurus.luctuosa; () => { var y = this; }; return x; }
->ikonnikovi : () => luctuosa
+>ikonnikovi : () => argurus.luctuosa
 >argurus : argurus
->luctuosa : luctuosa
->x : luctuosa
+>luctuosa : argurus.luctuosa
+>x : argurus.luctuosa
 >argurus : argurus
->luctuosa : luctuosa
+>luctuosa : argurus.luctuosa
 >() => { var y = this; } : () => void
 >y : thaeleri
 >this : thaeleri
->x : luctuosa
+>x : argurus.luctuosa
 
     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 : () => ciliolabrum<otion, sodyi<konganensis, psilurus>>
+>paramicrus : () => imperfecta.ciliolabrum<otion, petrophilus.sodyi<macrorhinos.konganensis, caurinus.psilurus>>
 >imperfecta : imperfecta
->ciliolabrum : ciliolabrum<T0, T1>
+>ciliolabrum : imperfecta.ciliolabrum<T0, T1>
 >otion : otion
 >petrophilus : petrophilus
->sodyi : sodyi<T0, T1>
+>sodyi : petrophilus.sodyi<T0, T1>
 >macrorhinos : macrorhinos
->konganensis : konganensis
+>konganensis : macrorhinos.konganensis
 >caurinus : caurinus
->psilurus : psilurus
->x : ciliolabrum<otion, sodyi<konganensis, psilurus>>
+>psilurus : caurinus.psilurus
+>x : imperfecta.ciliolabrum<otion, petrophilus.sodyi<macrorhinos.konganensis, caurinus.psilurus>>
 >imperfecta : imperfecta
->ciliolabrum : ciliolabrum<T0, T1>
+>ciliolabrum : imperfecta.ciliolabrum<T0, T1>
 >otion : otion
 >petrophilus : petrophilus
->sodyi : sodyi<T0, T1>
+>sodyi : petrophilus.sodyi<T0, T1>
 >macrorhinos : macrorhinos
->konganensis : konganensis
+>konganensis : macrorhinos.konganensis
 >caurinus : caurinus
->psilurus : psilurus
+>psilurus : caurinus.psilurus
 >() => { var y = this; } : () => void
 >y : thaeleri
 >this : thaeleri
->x : ciliolabrum<otion, sodyi<konganensis, psilurus>>
+>x : imperfecta.ciliolabrum<otion, petrophilus.sodyi<macrorhinos.konganensis, caurinus.psilurus>>
   }
   export class lepturus extends Lanthanum.suillus<dammermani.melanops, quasiater.carolinensis> {
 >lepturus : lepturus
 >Lanthanum : Lanthanum
->suillus : suillus<T0, T1>
+>suillus : Lanthanum.suillus<T0, T1>
 >dammermani : dammermani
->melanops : melanops
+>melanops : dammermani.melanops
 >quasiater : quasiater
->carolinensis : carolinensis
+>carolinensis : quasiater.carolinensis
 
     ferrumequinum() : argurus.netscheri<argurus.luctuosa, julianae.nudicaudus> { var x : argurus.netscheri<argurus.luctuosa, julianae.nudicaudus>; () => { var y = this; }; return x; }
->ferrumequinum : () => netscheri<luctuosa, nudicaudus>
+>ferrumequinum : () => argurus.netscheri<argurus.luctuosa, julianae.nudicaudus>
 >argurus : argurus
->netscheri : netscheri<T0, T1>
+>netscheri : argurus.netscheri<T0, T1>
 >argurus : argurus
->luctuosa : luctuosa
+>luctuosa : argurus.luctuosa
 >julianae : julianae
->nudicaudus : nudicaudus
->x : netscheri<luctuosa, nudicaudus>
+>nudicaudus : julianae.nudicaudus
+>x : argurus.netscheri<argurus.luctuosa, julianae.nudicaudus>
 >argurus : argurus
->netscheri : netscheri<T0, T1>
+>netscheri : argurus.netscheri<T0, T1>
 >argurus : argurus
->luctuosa : luctuosa
+>luctuosa : argurus.luctuosa
 >julianae : julianae
->nudicaudus : nudicaudus
+>nudicaudus : julianae.nudicaudus
 >() => { var y = this; } : () => void
 >y : lepturus
 >this : lepturus
->x : netscheri<luctuosa, nudicaudus>
+>x : argurus.netscheri<argurus.luctuosa, julianae.nudicaudus>
 
     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 : () => cinereus<sodyi<wattsi<galapagoensis, linulus<xanthognathus, konganensis>>, minutilla>, jugularis>
+>aequalis : () => sagitta.cinereus<petrophilus.sodyi<quasiater.wattsi<julianae.galapagoensis, panamensis.linulus<xanthognathus, macrorhinos.konganensis>>, petrophilus.minutilla>, Lanthanum.jugularis>
 >sagitta : sagitta
->cinereus : cinereus<T0, T1>
+>cinereus : sagitta.cinereus<T0, T1>
 >petrophilus : petrophilus
->sodyi : sodyi<T0, T1>
+>sodyi : petrophilus.sodyi<T0, T1>
 >quasiater : quasiater
->wattsi : wattsi<T0, T1>
+>wattsi : quasiater.wattsi<T0, T1>
 >julianae : julianae
->galapagoensis : galapagoensis
+>galapagoensis : julianae.galapagoensis
 >panamensis : panamensis
->linulus : linulus<T0, T1>
+>linulus : panamensis.linulus<T0, T1>
 >xanthognathus : xanthognathus
 >macrorhinos : macrorhinos
->konganensis : konganensis
+>konganensis : macrorhinos.konganensis
 >petrophilus : petrophilus
->minutilla : minutilla
+>minutilla : petrophilus.minutilla
 >Lanthanum : Lanthanum
->jugularis : jugularis
->x : cinereus<sodyi<wattsi<galapagoensis, linulus<xanthognathus, konganensis>>, minutilla>, jugularis>
+>jugularis : Lanthanum.jugularis
+>x : sagitta.cinereus<petrophilus.sodyi<quasiater.wattsi<julianae.galapagoensis, panamensis.linulus<xanthognathus, macrorhinos.konganensis>>, petrophilus.minutilla>, Lanthanum.jugularis>
 >sagitta : sagitta
->cinereus : cinereus<T0, T1>
+>cinereus : sagitta.cinereus<T0, T1>
 >petrophilus : petrophilus
->sodyi : sodyi<T0, T1>
+>sodyi : petrophilus.sodyi<T0, T1>
 >quasiater : quasiater
->wattsi : wattsi<T0, T1>
+>wattsi : quasiater.wattsi<T0, T1>
 >julianae : julianae
->galapagoensis : galapagoensis
+>galapagoensis : julianae.galapagoensis
 >panamensis : panamensis
->linulus : linulus<T0, T1>
+>linulus : panamensis.linulus<T0, T1>
 >xanthognathus : xanthognathus
 >macrorhinos : macrorhinos
->konganensis : konganensis
+>konganensis : macrorhinos.konganensis
 >petrophilus : petrophilus
->minutilla : minutilla
+>minutilla : petrophilus.minutilla
 >Lanthanum : Lanthanum
->jugularis : jugularis
+>jugularis : Lanthanum.jugularis
 >() => { var y = this; } : () => void
 >y : lepturus
 >this : lepturus
->x : cinereus<sodyi<wattsi<galapagoensis, linulus<xanthognathus, konganensis>>, minutilla>, jugularis>
+>x : sagitta.cinereus<petrophilus.sodyi<quasiater.wattsi<julianae.galapagoensis, panamensis.linulus<xanthognathus, macrorhinos.konganensis>>, petrophilus.minutilla>, Lanthanum.jugularis>
   }
 }
 module dogramacii {
->dogramacii : typeof dogramacii
+>dogramacii : dogramacii
 
   export class robustulus extends lavali.wilsoni {
 >robustulus : robustulus
 >lavali : lavali
->wilsoni : wilsoni
+>wilsoni : lavali.wilsoni
 
     fossor() : minutus.inez<argurus.peninsulae, julianae.nudicaudus> { var x : minutus.inez<argurus.peninsulae, julianae.nudicaudus>; () => { var y = this; }; return x; }
->fossor : () => inez<peninsulae, nudicaudus>
+>fossor : () => minutus.inez<argurus.peninsulae, julianae.nudicaudus>
 >minutus : minutus
->inez : inez<T0, T1>
+>inez : minutus.inez<T0, T1>
 >argurus : argurus
->peninsulae : peninsulae
+>peninsulae : argurus.peninsulae
 >julianae : julianae
->nudicaudus : nudicaudus
->x : inez<peninsulae, nudicaudus>
+>nudicaudus : julianae.nudicaudus
+>x : minutus.inez<argurus.peninsulae, julianae.nudicaudus>
 >minutus : minutus
->inez : inez<T0, T1>
+>inez : minutus.inez<T0, T1>
 >argurus : argurus
->peninsulae : peninsulae
+>peninsulae : argurus.peninsulae
 >julianae : julianae
->nudicaudus : nudicaudus
+>nudicaudus : julianae.nudicaudus
 >() => { var y = this; } : () => void
 >y : robustulus
 >this : robustulus
->x : inez<peninsulae, nudicaudus>
+>x : minutus.inez<argurus.peninsulae, julianae.nudicaudus>
 
     humboldti() : sagitta.cinereus<lavali.xanthognathus, argurus.oreas> { var x : sagitta.cinereus<lavali.xanthognathus, argurus.oreas>; () => { var y = this; }; return x; }
->humboldti : () => cinereus<xanthognathus, oreas>
+>humboldti : () => sagitta.cinereus<lavali.xanthognathus, argurus.oreas>
 >sagitta : sagitta
->cinereus : cinereus<T0, T1>
+>cinereus : sagitta.cinereus<T0, T1>
 >lavali : lavali
->xanthognathus : xanthognathus
+>xanthognathus : lavali.xanthognathus
 >argurus : argurus
->oreas : oreas
->x : cinereus<xanthognathus, oreas>
+>oreas : argurus.oreas
+>x : sagitta.cinereus<lavali.xanthognathus, argurus.oreas>
 >sagitta : sagitta
->cinereus : cinereus<T0, T1>
+>cinereus : sagitta.cinereus<T0, T1>
 >lavali : lavali
->xanthognathus : xanthognathus
+>xanthognathus : lavali.xanthognathus
 >argurus : argurus
->oreas : oreas
+>oreas : argurus.oreas
 >() => { var y = this; } : () => void
 >y : robustulus
 >this : robustulus
->x : cinereus<xanthognathus, oreas>
+>x : sagitta.cinereus<lavali.xanthognathus, argurus.oreas>
 
     mexicana() : macrorhinos.konganensis { var x : macrorhinos.konganensis; () => { var y = this; }; return x; }
->mexicana : () => konganensis
+>mexicana : () => macrorhinos.konganensis
 >macrorhinos : macrorhinos
->konganensis : konganensis
->x : konganensis
+>konganensis : macrorhinos.konganensis
+>x : macrorhinos.konganensis
 >macrorhinos : macrorhinos
->konganensis : konganensis
+>konganensis : macrorhinos.konganensis
 >() => { var y = this; } : () => void
 >y : robustulus
 >this : robustulus
->x : konganensis
+>x : macrorhinos.konganensis
 
     martini() : julianae.oralis<julianae.steerii, lavali.lepturus> { var x : julianae.oralis<julianae.steerii, lavali.lepturus>; () => { var y = this; }; return x; }
->martini : () => oralis<steerii, lepturus>
+>martini : () => julianae.oralis<julianae.steerii, lavali.lepturus>
 >julianae : julianae
->oralis : oralis<T0, T1>
+>oralis : julianae.oralis<T0, T1>
 >julianae : julianae
->steerii : steerii
+>steerii : julianae.steerii
 >lavali : lavali
->lepturus : lepturus
->x : oralis<steerii, lepturus>
+>lepturus : lavali.lepturus
+>x : julianae.oralis<julianae.steerii, lavali.lepturus>
 >julianae : julianae
->oralis : oralis<T0, T1>
+>oralis : julianae.oralis<T0, T1>
 >julianae : julianae
->steerii : steerii
+>steerii : julianae.steerii
 >lavali : lavali
->lepturus : lepturus
+>lepturus : lavali.lepturus
 >() => { var y = this; } : () => void
 >y : robustulus
 >this : robustulus
->x : oralis<steerii, lepturus>
+>x : julianae.oralis<julianae.steerii, lavali.lepturus>
 
     beatus() : Lanthanum.jugularis { var x : Lanthanum.jugularis; () => { var y = this; }; return x; }
->beatus : () => jugularis
+>beatus : () => Lanthanum.jugularis
 >Lanthanum : Lanthanum
->jugularis : jugularis
->x : jugularis
+>jugularis : Lanthanum.jugularis
+>x : Lanthanum.jugularis
 >Lanthanum : Lanthanum
->jugularis : jugularis
+>jugularis : Lanthanum.jugularis
 >() => { var y = this; } : () => void
 >y : robustulus
 >this : robustulus
->x : jugularis
+>x : Lanthanum.jugularis
 
     leporina() : trivirgatus.falconeri { var x : trivirgatus.falconeri; () => { var y = this; }; return x; }
->leporina : () => falconeri
+>leporina : () => trivirgatus.falconeri
 >trivirgatus : trivirgatus
->falconeri : falconeri
->x : falconeri
+>falconeri : trivirgatus.falconeri
+>x : trivirgatus.falconeri
 >trivirgatus : trivirgatus
->falconeri : falconeri
+>falconeri : trivirgatus.falconeri
 >() => { var y = this; } : () => void
 >y : robustulus
 >this : robustulus
->x : falconeri
+>x : trivirgatus.falconeri
 
     pearsonii() : dammermani.melanops { var x : dammermani.melanops; () => { var y = this; }; return x; }
->pearsonii : () => melanops
+>pearsonii : () => dammermani.melanops
 >dammermani : dammermani
->melanops : melanops
->x : melanops
+>melanops : dammermani.melanops
+>x : dammermani.melanops
 >dammermani : dammermani
->melanops : melanops
+>melanops : dammermani.melanops
 >() => { var y = this; } : () => void
 >y : robustulus
 >this : robustulus
->x : melanops
+>x : dammermani.melanops
 
     keaysi() : howi.angulatus<lavali.beisa, rendalli.zuluensis> { var x : howi.angulatus<lavali.beisa, rendalli.zuluensis>; () => { var y = this; }; return x; }
->keaysi : () => angulatus<beisa, zuluensis>
+>keaysi : () => howi.angulatus<lavali.beisa, rendalli.zuluensis>
 >howi : howi
->angulatus : angulatus<T0, T1>
+>angulatus : howi.angulatus<T0, T1>
 >lavali : lavali
->beisa : beisa
+>beisa : lavali.beisa
 >rendalli : rendalli
->zuluensis : zuluensis
->x : angulatus<beisa, zuluensis>
+>zuluensis : rendalli.zuluensis
+>x : howi.angulatus<lavali.beisa, rendalli.zuluensis>
 >howi : howi
->angulatus : angulatus<T0, T1>
+>angulatus : howi.angulatus<T0, T1>
 >lavali : lavali
->beisa : beisa
+>beisa : lavali.beisa
 >rendalli : rendalli
->zuluensis : zuluensis
+>zuluensis : rendalli.zuluensis
 >() => { var y = this; } : () => void
 >y : robustulus
 >this : robustulus
->x : angulatus<beisa, zuluensis>
+>x : howi.angulatus<lavali.beisa, rendalli.zuluensis>
 
     hindei() : imperfecta.lasiurus<macrorhinos.konganensis, julianae.steerii> { var x : imperfecta.lasiurus<macrorhinos.konganensis, julianae.steerii>; () => { var y = this; }; return x; }
->hindei : () => lasiurus<konganensis, steerii>
+>hindei : () => imperfecta.lasiurus<macrorhinos.konganensis, julianae.steerii>
 >imperfecta : imperfecta
->lasiurus : lasiurus<T0, T1>
+>lasiurus : imperfecta.lasiurus<T0, T1>
 >macrorhinos : macrorhinos
->konganensis : konganensis
+>konganensis : macrorhinos.konganensis
 >julianae : julianae
->steerii : steerii
->x : lasiurus<konganensis, steerii>
+>steerii : julianae.steerii
+>x : imperfecta.lasiurus<macrorhinos.konganensis, julianae.steerii>
 >imperfecta : imperfecta
->lasiurus : lasiurus<T0, T1>
+>lasiurus : imperfecta.lasiurus<T0, T1>
 >macrorhinos : macrorhinos
->konganensis : konganensis
+>konganensis : macrorhinos.konganensis
 >julianae : julianae
->steerii : steerii
+>steerii : julianae.steerii
 >() => { var y = this; } : () => void
 >y : robustulus
 >this : robustulus
->x : lasiurus<konganensis, steerii>
+>x : imperfecta.lasiurus<macrorhinos.konganensis, julianae.steerii>
   }
   export class koepckeae {
 >koepckeae : koepckeae
 
     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 : () => pelurus<arboreus<kaiseri, punicus>, sumatrana>
+>culturatus : () => samarensis.pelurus<daubentonii.arboreus<kaiseri, lutreolus.punicus>, julianae.sumatrana>
 >samarensis : samarensis
->pelurus : pelurus<T0, T1>
+>pelurus : samarensis.pelurus<T0, T1>
 >daubentonii : daubentonii
->arboreus : arboreus<T0, T1>
+>arboreus : daubentonii.arboreus<T0, T1>
 >kaiseri : kaiseri
 >lutreolus : lutreolus
->punicus : punicus
+>punicus : lutreolus.punicus
 >julianae : julianae
->sumatrana : sumatrana
->x : pelurus<arboreus<kaiseri, punicus>, sumatrana>
+>sumatrana : julianae.sumatrana
+>x : samarensis.pelurus<daubentonii.arboreus<kaiseri, lutreolus.punicus>, julianae.sumatrana>
 >samarensis : samarensis
->pelurus : pelurus<T0, T1>
+>pelurus : samarensis.pelurus<T0, T1>
 >daubentonii : daubentonii
->arboreus : arboreus<T0, T1>
+>arboreus : daubentonii.arboreus<T0, T1>
 >kaiseri : kaiseri
 >lutreolus : lutreolus
->punicus : punicus
+>punicus : lutreolus.punicus
 >julianae : julianae
->sumatrana : sumatrana
+>sumatrana : julianae.sumatrana
 >() => { var y = this; } : () => void
 >y : koepckeae
 >this : koepckeae
->x : pelurus<arboreus<kaiseri, punicus>, sumatrana>
+>x : samarensis.pelurus<daubentonii.arboreus<kaiseri, lutreolus.punicus>, julianae.sumatrana>
   }
   export class kaiseri {
 >kaiseri : kaiseri
 
     bedfordiae() : quasiater.carolinensis { var x : quasiater.carolinensis; () => { var y = this; }; return x; }
->bedfordiae : () => carolinensis
+>bedfordiae : () => quasiater.carolinensis
 >quasiater : quasiater
->carolinensis : carolinensis
->x : carolinensis
+>carolinensis : quasiater.carolinensis
+>x : quasiater.carolinensis
 >quasiater : quasiater
->carolinensis : carolinensis
+>carolinensis : quasiater.carolinensis
 >() => { var y = this; } : () => void
 >y : kaiseri
 >this : kaiseri
->x : carolinensis
+>x : quasiater.carolinensis
 
     paramorum() : Lanthanum.megalonyx { var x : Lanthanum.megalonyx; () => { var y = this; }; return x; }
->paramorum : () => megalonyx
+>paramorum : () => Lanthanum.megalonyx
 >Lanthanum : Lanthanum
->megalonyx : megalonyx
->x : megalonyx
+>megalonyx : Lanthanum.megalonyx
+>x : Lanthanum.megalonyx
 >Lanthanum : Lanthanum
->megalonyx : megalonyx
+>megalonyx : Lanthanum.megalonyx
 >() => { var y = this; } : () => void
 >y : kaiseri
 >this : kaiseri
->x : megalonyx
+>x : Lanthanum.megalonyx
 
     rubidus() : trivirgatus.lotor<julianae.steerii, samarensis.pallidus> { var x : trivirgatus.lotor<julianae.steerii, samarensis.pallidus>; () => { var y = this; }; return x; }
->rubidus : () => lotor<steerii, pallidus>
+>rubidus : () => trivirgatus.lotor<julianae.steerii, samarensis.pallidus>
 >trivirgatus : trivirgatus
->lotor : lotor<T0, T1>
+>lotor : trivirgatus.lotor<T0, T1>
 >julianae : julianae
->steerii : steerii
+>steerii : julianae.steerii
 >samarensis : samarensis
->pallidus : pallidus
->x : lotor<steerii, pallidus>
+>pallidus : samarensis.pallidus
+>x : trivirgatus.lotor<julianae.steerii, samarensis.pallidus>
 >trivirgatus : trivirgatus
->lotor : lotor<T0, T1>
+>lotor : trivirgatus.lotor<T0, T1>
 >julianae : julianae
->steerii : steerii
+>steerii : julianae.steerii
 >samarensis : samarensis
->pallidus : pallidus
+>pallidus : samarensis.pallidus
 >() => { var y = this; } : () => void
 >y : kaiseri
 >this : kaiseri
->x : lotor<steerii, pallidus>
+>x : trivirgatus.lotor<julianae.steerii, samarensis.pallidus>
 
     juninensis() : quasiater.bobrinskoi { var x : quasiater.bobrinskoi; () => { var y = this; }; return x; }
->juninensis : () => bobrinskoi
+>juninensis : () => quasiater.bobrinskoi
 >quasiater : quasiater
->bobrinskoi : bobrinskoi
->x : bobrinskoi
+>bobrinskoi : quasiater.bobrinskoi
+>x : quasiater.bobrinskoi
 >quasiater : quasiater
->bobrinskoi : bobrinskoi
+>bobrinskoi : quasiater.bobrinskoi
 >() => { var y = this; } : () => void
 >y : kaiseri
 >this : kaiseri
->x : bobrinskoi
+>x : quasiater.bobrinskoi
 
     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 : () => wetmorei<caniventer, leptoceros<punicus, arboreus<carolinensis, caniventer>>>
+>marginata : () => argurus.wetmorei<rionegrensis.caniventer, sagitta.leptoceros<lutreolus.punicus, daubentonii.arboreus<quasiater.carolinensis, rionegrensis.caniventer>>>
 >argurus : argurus
->wetmorei : wetmorei<T0, T1>
+>wetmorei : argurus.wetmorei<T0, T1>
 >rionegrensis : rionegrensis
->caniventer : caniventer
+>caniventer : rionegrensis.caniventer
 >sagitta : sagitta
->leptoceros : leptoceros<T0, T1>
+>leptoceros : sagitta.leptoceros<T0, T1>
 >lutreolus : lutreolus
->punicus : punicus
+>punicus : lutreolus.punicus
 >daubentonii : daubentonii
->arboreus : arboreus<T0, T1>
+>arboreus : daubentonii.arboreus<T0, T1>
 >quasiater : quasiater
->carolinensis : carolinensis
+>carolinensis : quasiater.carolinensis
 >rionegrensis : rionegrensis
->caniventer : caniventer
->x : wetmorei<caniventer, leptoceros<punicus, arboreus<carolinensis, caniventer>>>
+>caniventer : rionegrensis.caniventer
+>x : argurus.wetmorei<rionegrensis.caniventer, sagitta.leptoceros<lutreolus.punicus, daubentonii.arboreus<quasiater.carolinensis, rionegrensis.caniventer>>>
 >argurus : argurus
->wetmorei : wetmorei<T0, T1>
+>wetmorei : argurus.wetmorei<T0, T1>
 >rionegrensis : rionegrensis
->caniventer : caniventer
+>caniventer : rionegrensis.caniventer
 >sagitta : sagitta
->leptoceros : leptoceros<T0, T1>
+>leptoceros : sagitta.leptoceros<T0, T1>
 >lutreolus : lutreolus
->punicus : punicus
+>punicus : lutreolus.punicus
 >daubentonii : daubentonii
->arboreus : arboreus<T0, T1>
+>arboreus : daubentonii.arboreus<T0, T1>
 >quasiater : quasiater
->carolinensis : carolinensis
+>carolinensis : quasiater.carolinensis
 >rionegrensis : rionegrensis
->caniventer : caniventer
+>caniventer : rionegrensis.caniventer
 >() => { var y = this; } : () => void
 >y : kaiseri
 >this : kaiseri
->x : wetmorei<caniventer, leptoceros<punicus, arboreus<carolinensis, caniventer>>>
+>x : argurus.wetmorei<rionegrensis.caniventer, sagitta.leptoceros<lutreolus.punicus, daubentonii.arboreus<quasiater.carolinensis, rionegrensis.caniventer>>>
 
     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 : () => Praseodymium<sumatrana, cor<jugularis, galapagoensis>>
+>Meitnerium : () => ruatanica.Praseodymium<julianae.sumatrana, lutreolus.cor<Lanthanum.jugularis, julianae.galapagoensis>>
 >ruatanica : ruatanica
->Praseodymium : Praseodymium<T0, T1>
+>Praseodymium : ruatanica.Praseodymium<T0, T1>
 >julianae : julianae
->sumatrana : sumatrana
+>sumatrana : julianae.sumatrana
 >lutreolus : lutreolus
->cor : cor<T0, T1>
+>cor : lutreolus.cor<T0, T1>
 >Lanthanum : Lanthanum
->jugularis : jugularis
+>jugularis : Lanthanum.jugularis
 >julianae : julianae
->galapagoensis : galapagoensis
->x : Praseodymium<sumatrana, cor<jugularis, galapagoensis>>
+>galapagoensis : julianae.galapagoensis
+>x : ruatanica.Praseodymium<julianae.sumatrana, lutreolus.cor<Lanthanum.jugularis, julianae.galapagoensis>>
 >ruatanica : ruatanica
->Praseodymium : Praseodymium<T0, T1>
+>Praseodymium : ruatanica.Praseodymium<T0, T1>
 >julianae : julianae
->sumatrana : sumatrana
+>sumatrana : julianae.sumatrana
 >lutreolus : lutreolus
->cor : cor<T0, T1>
+>cor : lutreolus.cor<T0, T1>
 >Lanthanum : Lanthanum
->jugularis : jugularis
+>jugularis : Lanthanum.jugularis
 >julianae : julianae
->galapagoensis : galapagoensis
+>galapagoensis : julianae.galapagoensis
 >() => { var y = this; } : () => void
 >y : kaiseri
 >this : kaiseri
->x : Praseodymium<sumatrana, cor<jugularis, galapagoensis>>
+>x : ruatanica.Praseodymium<julianae.sumatrana, lutreolus.cor<Lanthanum.jugularis, julianae.galapagoensis>>
 
     pinetorum() : rionegrensis.caniventer { var x : rionegrensis.caniventer; () => { var y = this; }; return x; }
->pinetorum : () => caniventer
+>pinetorum : () => rionegrensis.caniventer
 >rionegrensis : rionegrensis
->caniventer : caniventer
->x : caniventer
+>caniventer : rionegrensis.caniventer
+>x : rionegrensis.caniventer
 >rionegrensis : rionegrensis
->caniventer : caniventer
+>caniventer : rionegrensis.caniventer
 >() => { var y = this; } : () => void
 >y : kaiseri
 >this : kaiseri
->x : caniventer
+>x : rionegrensis.caniventer
 
     hoolock() : samarensis.pelurus<argurus.oreas, argurus.luctuosa> { var x : samarensis.pelurus<argurus.oreas, argurus.luctuosa>; () => { var y = this; }; return x; }
->hoolock : () => pelurus<oreas, luctuosa>
+>hoolock : () => samarensis.pelurus<argurus.oreas, argurus.luctuosa>
 >samarensis : samarensis
->pelurus : pelurus<T0, T1>
+>pelurus : samarensis.pelurus<T0, T1>
 >argurus : argurus
->oreas : oreas
+>oreas : argurus.oreas
 >argurus : argurus
->luctuosa : luctuosa
->x : pelurus<oreas, luctuosa>
+>luctuosa : argurus.luctuosa
+>x : samarensis.pelurus<argurus.oreas, argurus.luctuosa>
 >samarensis : samarensis
->pelurus : pelurus<T0, T1>
+>pelurus : samarensis.pelurus<T0, T1>
 >argurus : argurus
->oreas : oreas
+>oreas : argurus.oreas
 >argurus : argurus
->luctuosa : luctuosa
+>luctuosa : argurus.luctuosa
 >() => { var y = this; } : () => void
 >y : kaiseri
 >this : kaiseri
->x : pelurus<oreas, luctuosa>
+>x : samarensis.pelurus<argurus.oreas, argurus.luctuosa>
 
     poeyi() : gabriellae.echinatus { var x : gabriellae.echinatus; () => { var y = this; }; return x; }
->poeyi : () => echinatus
+>poeyi : () => gabriellae.echinatus
 >gabriellae : gabriellae
->echinatus : echinatus
->x : echinatus
+>echinatus : gabriellae.echinatus
+>x : gabriellae.echinatus
 >gabriellae : gabriellae
->echinatus : echinatus
+>echinatus : gabriellae.echinatus
 >() => { var y = this; } : () => void
 >y : kaiseri
 >this : kaiseri
->x : echinatus
+>x : gabriellae.echinatus
 
     Thulium() : julianae.durangae { var x : julianae.durangae; () => { var y = this; }; return x; }
->Thulium : () => durangae
+>Thulium : () => julianae.durangae
 >julianae : julianae
->durangae : durangae
->x : durangae
+>durangae : julianae.durangae
+>x : julianae.durangae
 >julianae : julianae
->durangae : durangae
+>durangae : julianae.durangae
 >() => { var y = this; } : () => void
 >y : kaiseri
 >this : kaiseri
->x : durangae
+>x : julianae.durangae
 
     patrius() : Lanthanum.jugularis { var x : Lanthanum.jugularis; () => { var y = this; }; return x; }
->patrius : () => jugularis
+>patrius : () => Lanthanum.jugularis
 >Lanthanum : Lanthanum
->jugularis : jugularis
->x : jugularis
+>jugularis : Lanthanum.jugularis
+>x : Lanthanum.jugularis
 >Lanthanum : Lanthanum
->jugularis : jugularis
+>jugularis : Lanthanum.jugularis
 >() => { var y = this; } : () => void
 >y : kaiseri
 >this : kaiseri
->x : jugularis
+>x : Lanthanum.jugularis
 
     quadraticauda() : julianae.nudicaudus { var x : julianae.nudicaudus; () => { var y = this; }; return x; }
->quadraticauda : () => nudicaudus
+>quadraticauda : () => julianae.nudicaudus
 >julianae : julianae
->nudicaudus : nudicaudus
->x : nudicaudus
+>nudicaudus : julianae.nudicaudus
+>x : julianae.nudicaudus
 >julianae : julianae
->nudicaudus : nudicaudus
+>nudicaudus : julianae.nudicaudus
 >() => { var y = this; } : () => void
 >y : kaiseri
 >this : kaiseri
->x : nudicaudus
+>x : julianae.nudicaudus
 
     ater() : ruatanica.americanus { var x : ruatanica.americanus; () => { var y = this; }; return x; }
->ater : () => americanus
+>ater : () => ruatanica.americanus
 >ruatanica : ruatanica
->americanus : americanus
->x : americanus
+>americanus : ruatanica.americanus
+>x : ruatanica.americanus
 >ruatanica : ruatanica
->americanus : americanus
+>americanus : ruatanica.americanus
 >() => { var y = this; } : () => void
 >y : kaiseri
 >this : kaiseri
->x : americanus
+>x : ruatanica.americanus
   }
   export class aurata {
 >aurata : aurata
 
     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 : () => gracilis<pelurus<arboreus<kaiseri, punicus>, sumatrana>, americanus>
+>grunniens : () => nigra.gracilis<samarensis.pelurus<daubentonii.arboreus<kaiseri, lutreolus.punicus>, julianae.sumatrana>, ruatanica.americanus>
 >nigra : nigra
->gracilis : gracilis<T0, T1>
+>gracilis : nigra.gracilis<T0, T1>
 >samarensis : samarensis
->pelurus : pelurus<T0, T1>
+>pelurus : samarensis.pelurus<T0, T1>
 >daubentonii : daubentonii
->arboreus : arboreus<T0, T1>
+>arboreus : daubentonii.arboreus<T0, T1>
 >kaiseri : kaiseri
 >lutreolus : lutreolus
->punicus : punicus
+>punicus : lutreolus.punicus
 >julianae : julianae
->sumatrana : sumatrana
+>sumatrana : julianae.sumatrana
 >ruatanica : ruatanica
->americanus : americanus
->x : gracilis<pelurus<arboreus<kaiseri, punicus>, sumatrana>, americanus>
+>americanus : ruatanica.americanus
+>x : nigra.gracilis<samarensis.pelurus<daubentonii.arboreus<kaiseri, lutreolus.punicus>, julianae.sumatrana>, ruatanica.americanus>
 >nigra : nigra
->gracilis : gracilis<T0, T1>
+>gracilis : nigra.gracilis<T0, T1>
 >samarensis : samarensis
->pelurus : pelurus<T0, T1>
+>pelurus : samarensis.pelurus<T0, T1>
 >daubentonii : daubentonii
->arboreus : arboreus<T0, T1>
+>arboreus : daubentonii.arboreus<T0, T1>
 >kaiseri : kaiseri
 >lutreolus : lutreolus
->punicus : punicus
+>punicus : lutreolus.punicus
 >julianae : julianae
->sumatrana : sumatrana
+>sumatrana : julianae.sumatrana
 >ruatanica : ruatanica
->americanus : americanus
+>americanus : ruatanica.americanus
 >() => { var y = this; } : () => void
 >y : aurata
 >this : aurata
->x : gracilis<pelurus<arboreus<kaiseri, punicus>, sumatrana>, americanus>
+>x : nigra.gracilis<samarensis.pelurus<daubentonii.arboreus<kaiseri, lutreolus.punicus>, julianae.sumatrana>, ruatanica.americanus>
 
     howensis() : ruatanica.americanus { var x : ruatanica.americanus; () => { var y = this; }; return x; }
->howensis : () => americanus
+>howensis : () => ruatanica.americanus
 >ruatanica : ruatanica
->americanus : americanus
->x : americanus
+>americanus : ruatanica.americanus
+>x : ruatanica.americanus
 >ruatanica : ruatanica
->americanus : americanus
+>americanus : ruatanica.americanus
 >() => { var y = this; } : () => void
 >y : aurata
 >this : aurata
->x : americanus
+>x : ruatanica.americanus
 
     karlkoopmani() : caurinus.psilurus { var x : caurinus.psilurus; () => { var y = this; }; return x; }
->karlkoopmani : () => psilurus
+>karlkoopmani : () => caurinus.psilurus
 >caurinus : caurinus
->psilurus : psilurus
->x : psilurus
+>psilurus : caurinus.psilurus
+>x : caurinus.psilurus
 >caurinus : caurinus
->psilurus : psilurus
+>psilurus : caurinus.psilurus
 >() => { var y = this; } : () => void
 >y : aurata
 >this : aurata
->x : psilurus
+>x : caurinus.psilurus
 
     mirapitanga() : julianae.albidens<gabriellae.echinatus, gabriellae.echinatus> { var x : julianae.albidens<gabriellae.echinatus, gabriellae.echinatus>; () => { var y = this; }; return x; }
->mirapitanga : () => albidens<echinatus, echinatus>
+>mirapitanga : () => julianae.albidens<gabriellae.echinatus, gabriellae.echinatus>
 >julianae : julianae
->albidens : albidens<T0, T1>
+>albidens : julianae.albidens<T0, T1>
 >gabriellae : gabriellae
->echinatus : echinatus
+>echinatus : gabriellae.echinatus
 >gabriellae : gabriellae
->echinatus : echinatus
->x : albidens<echinatus, echinatus>
+>echinatus : gabriellae.echinatus
+>x : julianae.albidens<gabriellae.echinatus, gabriellae.echinatus>
 >julianae : julianae
->albidens : albidens<T0, T1>
+>albidens : julianae.albidens<T0, T1>
 >gabriellae : gabriellae
->echinatus : echinatus
+>echinatus : gabriellae.echinatus
 >gabriellae : gabriellae
->echinatus : echinatus
+>echinatus : gabriellae.echinatus
 >() => { var y = this; } : () => void
 >y : aurata
 >this : aurata
->x : albidens<echinatus, echinatus>
+>x : julianae.albidens<gabriellae.echinatus, gabriellae.echinatus>
 
     ophiodon() : aurata { var x : aurata; () => { var y = this; }; return x; }
 >ophiodon : () => aurata
@@ -4837,387 +4837,387 @@ module dogramacii {
 >x : aurata
 
     landeri() : samarensis.pelurus<Lanthanum.jugularis, ruatanica.americanus> { var x : samarensis.pelurus<Lanthanum.jugularis, ruatanica.americanus>; () => { var y = this; }; return x; }
->landeri : () => pelurus<jugularis, americanus>
+>landeri : () => samarensis.pelurus<Lanthanum.jugularis, ruatanica.americanus>
 >samarensis : samarensis
->pelurus : pelurus<T0, T1>
+>pelurus : samarensis.pelurus<T0, T1>
 >Lanthanum : Lanthanum
->jugularis : jugularis
+>jugularis : Lanthanum.jugularis
 >ruatanica : ruatanica
->americanus : americanus
->x : pelurus<jugularis, americanus>
+>americanus : ruatanica.americanus
+>x : samarensis.pelurus<Lanthanum.jugularis, ruatanica.americanus>
 >samarensis : samarensis
->pelurus : pelurus<T0, T1>
+>pelurus : samarensis.pelurus<T0, T1>
 >Lanthanum : Lanthanum
->jugularis : jugularis
+>jugularis : Lanthanum.jugularis
 >ruatanica : ruatanica
->americanus : americanus
+>americanus : ruatanica.americanus
 >() => { var y = this; } : () => void
 >y : aurata
 >this : aurata
->x : pelurus<jugularis, americanus>
+>x : samarensis.pelurus<Lanthanum.jugularis, ruatanica.americanus>
 
     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 : () => lotor<abidi<lepturus, psilurus>, koepckeae>
+>sonomae : () => trivirgatus.lotor<panglima.abidi<lavali.lepturus, caurinus.psilurus>, koepckeae>
 >trivirgatus : trivirgatus
->lotor : lotor<T0, T1>
+>lotor : trivirgatus.lotor<T0, T1>
 >panglima : panglima
->abidi : abidi<T0, T1>
+>abidi : panglima.abidi<T0, T1>
 >lavali : lavali
->lepturus : lepturus
+>lepturus : lavali.lepturus
 >caurinus : caurinus
->psilurus : psilurus
+>psilurus : caurinus.psilurus
 >koepckeae : koepckeae
->x : lotor<abidi<lepturus, psilurus>, koepckeae>
+>x : trivirgatus.lotor<panglima.abidi<lavali.lepturus, caurinus.psilurus>, koepckeae>
 >trivirgatus : trivirgatus
->lotor : lotor<T0, T1>
+>lotor : trivirgatus.lotor<T0, T1>
 >panglima : panglima
->abidi : abidi<T0, T1>
+>abidi : panglima.abidi<T0, T1>
 >lavali : lavali
->lepturus : lepturus
+>lepturus : lavali.lepturus
 >caurinus : caurinus
->psilurus : psilurus
+>psilurus : caurinus.psilurus
 >koepckeae : koepckeae
 >() => { var y = this; } : () => void
 >y : aurata
 >this : aurata
->x : lotor<abidi<lepturus, psilurus>, koepckeae>
+>x : trivirgatus.lotor<panglima.abidi<lavali.lepturus, caurinus.psilurus>, koepckeae>
 
     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 : () => johorensis<fundatus<pallidus, stolzmanni>, dolichurus<lepturus, pallidus>>
+>erythromos : () => caurinus.johorensis<panglima.fundatus<samarensis.pallidus, sagitta.stolzmanni>, nigra.dolichurus<lavali.lepturus, samarensis.pallidus>>
 >caurinus : caurinus
->johorensis : johorensis<T0, T1>
+>johorensis : caurinus.johorensis<T0, T1>
 >panglima : panglima
->fundatus : fundatus<T0, T1>
+>fundatus : panglima.fundatus<T0, T1>
 >samarensis : samarensis
->pallidus : pallidus
+>pallidus : samarensis.pallidus
 >sagitta : sagitta
->stolzmanni : stolzmanni
+>stolzmanni : sagitta.stolzmanni
 >nigra : nigra
->dolichurus : dolichurus<T0, T1>
+>dolichurus : nigra.dolichurus<T0, T1>
 >lavali : lavali
->lepturus : lepturus
+>lepturus : lavali.lepturus
 >samarensis : samarensis
->pallidus : pallidus
->x : johorensis<fundatus<pallidus, stolzmanni>, dolichurus<lepturus, pallidus>>
+>pallidus : samarensis.pallidus
+>x : caurinus.johorensis<panglima.fundatus<samarensis.pallidus, sagitta.stolzmanni>, nigra.dolichurus<lavali.lepturus, samarensis.pallidus>>
 >caurinus : caurinus
->johorensis : johorensis<T0, T1>
+>johorensis : caurinus.johorensis<T0, T1>
 >panglima : panglima
->fundatus : fundatus<T0, T1>
+>fundatus : panglima.fundatus<T0, T1>
 >samarensis : samarensis
->pallidus : pallidus
+>pallidus : samarensis.pallidus
 >sagitta : sagitta
->stolzmanni : stolzmanni
+>stolzmanni : sagitta.stolzmanni
 >nigra : nigra
->dolichurus : dolichurus<T0, T1>
+>dolichurus : nigra.dolichurus<T0, T1>
 >lavali : lavali
->lepturus : lepturus
+>lepturus : lavali.lepturus
 >samarensis : samarensis
->pallidus : pallidus
+>pallidus : samarensis.pallidus
 >() => { var y = this; } : () => void
 >y : aurata
 >this : aurata
->x : johorensis<fundatus<pallidus, stolzmanni>, dolichurus<lepturus, pallidus>>
+>x : caurinus.johorensis<panglima.fundatus<samarensis.pallidus, sagitta.stolzmanni>, nigra.dolichurus<lavali.lepturus, samarensis.pallidus>>
   }
 }
 module lutreolus {
->lutreolus : typeof lutreolus
+>lutreolus : lutreolus
 
   export class schlegeli extends lavali.beisa {
 >schlegeli : schlegeli
 >lavali : lavali
->beisa : beisa
+>beisa : lavali.beisa
 
     mittendorfi() : rionegrensis.caniventer { var x : rionegrensis.caniventer; () => { var y = this; }; return x; }
->mittendorfi : () => caniventer
+>mittendorfi : () => rionegrensis.caniventer
 >rionegrensis : rionegrensis
->caniventer : caniventer
->x : caniventer
+>caniventer : rionegrensis.caniventer
+>x : rionegrensis.caniventer
 >rionegrensis : rionegrensis
->caniventer : caniventer
+>caniventer : rionegrensis.caniventer
 >() => { var y = this; } : () => void
 >y : schlegeli
 >this : schlegeli
->x : caniventer
+>x : rionegrensis.caniventer
 
     blicki() : dogramacii.robustulus { var x : dogramacii.robustulus; () => { var y = this; }; return x; }
->blicki : () => robustulus
+>blicki : () => dogramacii.robustulus
 >dogramacii : dogramacii
->robustulus : robustulus
->x : robustulus
+>robustulus : dogramacii.robustulus
+>x : dogramacii.robustulus
 >dogramacii : dogramacii
->robustulus : robustulus
+>robustulus : dogramacii.robustulus
 >() => { var y = this; } : () => void
 >y : schlegeli
 >this : schlegeli
->x : robustulus
+>x : dogramacii.robustulus
 
     culionensis() : argurus.dauricus<ruatanica.americanus, rionegrensis.caniventer> { var x : argurus.dauricus<ruatanica.americanus, rionegrensis.caniventer>; () => { var y = this; }; return x; }
->culionensis : () => dauricus<americanus, caniventer>
+>culionensis : () => argurus.dauricus<ruatanica.americanus, rionegrensis.caniventer>
 >argurus : argurus
->dauricus : dauricus<T0, T1>
+>dauricus : argurus.dauricus<T0, T1>
 >ruatanica : ruatanica
->americanus : americanus
+>americanus : ruatanica.americanus
 >rionegrensis : rionegrensis
->caniventer : caniventer
->x : dauricus<americanus, caniventer>
+>caniventer : rionegrensis.caniventer
+>x : argurus.dauricus<ruatanica.americanus, rionegrensis.caniventer>
 >argurus : argurus
->dauricus : dauricus<T0, T1>
+>dauricus : argurus.dauricus<T0, T1>
 >ruatanica : ruatanica
->americanus : americanus
+>americanus : ruatanica.americanus
 >rionegrensis : rionegrensis
->caniventer : caniventer
+>caniventer : rionegrensis.caniventer
 >() => { var y = this; } : () => void
 >y : schlegeli
 >this : schlegeli
->x : dauricus<americanus, caniventer>
+>x : argurus.dauricus<ruatanica.americanus, rionegrensis.caniventer>
 
     scrofa() : petrophilus.sodyi<gabriellae.amicus, julianae.sumatrana> { var x : petrophilus.sodyi<gabriellae.amicus, julianae.sumatrana>; () => { var y = this; }; return x; }
->scrofa : () => sodyi<amicus, sumatrana>
+>scrofa : () => petrophilus.sodyi<gabriellae.amicus, julianae.sumatrana>
 >petrophilus : petrophilus
->sodyi : sodyi<T0, T1>
+>sodyi : petrophilus.sodyi<T0, T1>
 >gabriellae : gabriellae
->amicus : amicus
+>amicus : gabriellae.amicus
 >julianae : julianae
->sumatrana : sumatrana
->x : sodyi<amicus, sumatrana>
+>sumatrana : julianae.sumatrana
+>x : petrophilus.sodyi<gabriellae.amicus, julianae.sumatrana>
 >petrophilus : petrophilus
->sodyi : sodyi<T0, T1>
+>sodyi : petrophilus.sodyi<T0, T1>
 >gabriellae : gabriellae
->amicus : amicus
+>amicus : gabriellae.amicus
 >julianae : julianae
->sumatrana : sumatrana
+>sumatrana : julianae.sumatrana
 >() => { var y = this; } : () => void
 >y : schlegeli
 >this : schlegeli
->x : sodyi<amicus, sumatrana>
+>x : petrophilus.sodyi<gabriellae.amicus, julianae.sumatrana>
 
     fernandoni() : quasiater.carolinensis { var x : quasiater.carolinensis; () => { var y = this; }; return x; }
->fernandoni : () => carolinensis
+>fernandoni : () => quasiater.carolinensis
 >quasiater : quasiater
->carolinensis : carolinensis
->x : carolinensis
+>carolinensis : quasiater.carolinensis
+>x : quasiater.carolinensis
 >quasiater : quasiater
->carolinensis : carolinensis
+>carolinensis : quasiater.carolinensis
 >() => { var y = this; } : () => void
 >y : schlegeli
 >this : schlegeli
->x : carolinensis
+>x : quasiater.carolinensis
 
     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 : () => leptoceros<punicus, arboreus<carolinensis, caniventer>>
+>Tin : () => sagitta.leptoceros<punicus, daubentonii.arboreus<quasiater.carolinensis, rionegrensis.caniventer>>
 >sagitta : sagitta
->leptoceros : leptoceros<T0, T1>
+>leptoceros : sagitta.leptoceros<T0, T1>
 >lutreolus : lutreolus
 >punicus : punicus
 >daubentonii : daubentonii
->arboreus : arboreus<T0, T1>
+>arboreus : daubentonii.arboreus<T0, T1>
 >quasiater : quasiater
->carolinensis : carolinensis
+>carolinensis : quasiater.carolinensis
 >rionegrensis : rionegrensis
->caniventer : caniventer
->x : leptoceros<punicus, arboreus<carolinensis, caniventer>>
+>caniventer : rionegrensis.caniventer
+>x : sagitta.leptoceros<punicus, daubentonii.arboreus<quasiater.carolinensis, rionegrensis.caniventer>>
 >sagitta : sagitta
->leptoceros : leptoceros<T0, T1>
+>leptoceros : sagitta.leptoceros<T0, T1>
 >lutreolus : lutreolus
 >punicus : punicus
 >daubentonii : daubentonii
->arboreus : arboreus<T0, T1>
+>arboreus : daubentonii.arboreus<T0, T1>
 >quasiater : quasiater
->carolinensis : carolinensis
+>carolinensis : quasiater.carolinensis
 >rionegrensis : rionegrensis
->caniventer : caniventer
+>caniventer : rionegrensis.caniventer
 >() => { var y = this; } : () => void
 >y : schlegeli
 >this : schlegeli
->x : leptoceros<punicus, arboreus<carolinensis, caniventer>>
+>x : sagitta.leptoceros<punicus, daubentonii.arboreus<quasiater.carolinensis, rionegrensis.caniventer>>
 
     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 : () => setulosus<carolinensis, arboreus<kaiseri, punicus>>
+>marmorata : () => panamensis.setulosus<quasiater.carolinensis, daubentonii.arboreus<dogramacii.kaiseri, punicus>>
 >panamensis : panamensis
->setulosus : setulosus<T0, T1>
+>setulosus : panamensis.setulosus<T0, T1>
 >quasiater : quasiater
->carolinensis : carolinensis
+>carolinensis : quasiater.carolinensis
 >daubentonii : daubentonii
->arboreus : arboreus<T0, T1>
+>arboreus : daubentonii.arboreus<T0, T1>
 >dogramacii : dogramacii
->kaiseri : kaiseri
+>kaiseri : dogramacii.kaiseri
 >lutreolus : lutreolus
 >punicus : punicus
->x : setulosus<carolinensis, arboreus<kaiseri, punicus>>
+>x : panamensis.setulosus<quasiater.carolinensis, daubentonii.arboreus<dogramacii.kaiseri, punicus>>
 >panamensis : panamensis
->setulosus : setulosus<T0, T1>
+>setulosus : panamensis.setulosus<T0, T1>
 >quasiater : quasiater
->carolinensis : carolinensis
+>carolinensis : quasiater.carolinensis
 >daubentonii : daubentonii
->arboreus : arboreus<T0, T1>
+>arboreus : daubentonii.arboreus<T0, T1>
 >dogramacii : dogramacii
->kaiseri : kaiseri
+>kaiseri : dogramacii.kaiseri
 >lutreolus : lutreolus
 >punicus : punicus
 >() => { var y = this; } : () => void
 >y : schlegeli
 >this : schlegeli
->x : setulosus<carolinensis, arboreus<kaiseri, punicus>>
+>x : panamensis.setulosus<quasiater.carolinensis, daubentonii.arboreus<dogramacii.kaiseri, punicus>>
 
     tavaratra() : Lanthanum.nitidus<howi.marcanoi, macrorhinos.daphaenodon> { var x : Lanthanum.nitidus<howi.marcanoi, macrorhinos.daphaenodon>; () => { var y = this; }; return x; }
->tavaratra : () => nitidus<marcanoi, daphaenodon>
+>tavaratra : () => Lanthanum.nitidus<howi.marcanoi, macrorhinos.daphaenodon>
 >Lanthanum : Lanthanum
->nitidus : nitidus<T0, T1>
+>nitidus : Lanthanum.nitidus<T0, T1>
 >howi : howi
->marcanoi : marcanoi
+>marcanoi : howi.marcanoi
 >macrorhinos : macrorhinos
->daphaenodon : daphaenodon
->x : nitidus<marcanoi, daphaenodon>
+>daphaenodon : macrorhinos.daphaenodon
+>x : Lanthanum.nitidus<howi.marcanoi, macrorhinos.daphaenodon>
 >Lanthanum : Lanthanum
->nitidus : nitidus<T0, T1>
+>nitidus : Lanthanum.nitidus<T0, T1>
 >howi : howi
->marcanoi : marcanoi
+>marcanoi : howi.marcanoi
 >macrorhinos : macrorhinos
->daphaenodon : daphaenodon
+>daphaenodon : macrorhinos.daphaenodon
 >() => { var y = this; } : () => void
 >y : schlegeli
 >this : schlegeli
->x : nitidus<marcanoi, daphaenodon>
+>x : Lanthanum.nitidus<howi.marcanoi, macrorhinos.daphaenodon>
 
     peregrina() : daubentonii.nesiotes<macrorhinos.konganensis, lutreolus.punicus> { var x : daubentonii.nesiotes<macrorhinos.konganensis, lutreolus.punicus>; () => { var y = this; }; return x; }
->peregrina : () => nesiotes<konganensis, punicus>
+>peregrina : () => daubentonii.nesiotes<macrorhinos.konganensis, punicus>
 >daubentonii : daubentonii
->nesiotes : nesiotes<T0, T1>
+>nesiotes : daubentonii.nesiotes<T0, T1>
 >macrorhinos : macrorhinos
->konganensis : konganensis
+>konganensis : macrorhinos.konganensis
 >lutreolus : lutreolus
 >punicus : punicus
->x : nesiotes<konganensis, punicus>
+>x : daubentonii.nesiotes<macrorhinos.konganensis, punicus>
 >daubentonii : daubentonii
->nesiotes : nesiotes<T0, T1>
+>nesiotes : daubentonii.nesiotes<T0, T1>
 >macrorhinos : macrorhinos
->konganensis : konganensis
+>konganensis : macrorhinos.konganensis
 >lutreolus : lutreolus
 >punicus : punicus
 >() => { var y = this; } : () => void
 >y : schlegeli
 >this : schlegeli
->x : nesiotes<konganensis, punicus>
+>x : daubentonii.nesiotes<macrorhinos.konganensis, punicus>
 
     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 : () => marmosurus<hector<sumatrana, pelurus<jugularis, walkeri>>, pallidus>
+>frontalis : () => macrorhinos.marmosurus<ruatanica.hector<julianae.sumatrana, samarensis.pelurus<Lanthanum.jugularis, sagitta.walkeri>>, samarensis.pallidus>
 >macrorhinos : macrorhinos
->marmosurus : marmosurus<T0, T1>
+>marmosurus : macrorhinos.marmosurus<T0, T1>
 >ruatanica : ruatanica
->hector : hector<T0, T1>
+>hector : ruatanica.hector<T0, T1>
 >julianae : julianae
->sumatrana : sumatrana
+>sumatrana : julianae.sumatrana
 >samarensis : samarensis
->pelurus : pelurus<T0, T1>
+>pelurus : samarensis.pelurus<T0, T1>
 >Lanthanum : Lanthanum
->jugularis : jugularis
+>jugularis : Lanthanum.jugularis
 >sagitta : sagitta
->walkeri : walkeri
+>walkeri : sagitta.walkeri
 >samarensis : samarensis
->pallidus : pallidus
->x : marmosurus<hector<sumatrana, pelurus<jugularis, walkeri>>, pallidus>
+>pallidus : samarensis.pallidus
+>x : macrorhinos.marmosurus<ruatanica.hector<julianae.sumatrana, samarensis.pelurus<Lanthanum.jugularis, sagitta.walkeri>>, samarensis.pallidus>
 >macrorhinos : macrorhinos
->marmosurus : marmosurus<T0, T1>
+>marmosurus : macrorhinos.marmosurus<T0, T1>
 >ruatanica : ruatanica
->hector : hector<T0, T1>
+>hector : ruatanica.hector<T0, T1>
 >julianae : julianae
->sumatrana : sumatrana
+>sumatrana : julianae.sumatrana
 >samarensis : samarensis
->pelurus : pelurus<T0, T1>
+>pelurus : samarensis.pelurus<T0, T1>
 >Lanthanum : Lanthanum
->jugularis : jugularis
+>jugularis : Lanthanum.jugularis
 >sagitta : sagitta
->walkeri : walkeri
+>walkeri : sagitta.walkeri
 >samarensis : samarensis
->pallidus : pallidus
+>pallidus : samarensis.pallidus
 >() => { var y = this; } : () => void
 >y : schlegeli
 >this : schlegeli
->x : marmosurus<hector<sumatrana, pelurus<jugularis, walkeri>>, pallidus>
+>x : macrorhinos.marmosurus<ruatanica.hector<julianae.sumatrana, samarensis.pelurus<Lanthanum.jugularis, sagitta.walkeri>>, samarensis.pallidus>
 
     cuniculus() : patas.uralensis { var x : patas.uralensis; () => { var y = this; }; return x; }
->cuniculus : () => uralensis
+>cuniculus : () => patas.uralensis
 >patas : patas
->uralensis : uralensis
->x : uralensis
+>uralensis : patas.uralensis
+>x : patas.uralensis
 >patas : patas
->uralensis : uralensis
+>uralensis : patas.uralensis
 >() => { var y = this; } : () => void
 >y : schlegeli
 >this : schlegeli
->x : uralensis
+>x : patas.uralensis
 
     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 : () => gerbillus<caniventer, crenulata<zuluensis, robustulus>>
+>magdalenae : () => julianae.gerbillus<rionegrensis.caniventer, rendalli.crenulata<rendalli.zuluensis, dogramacii.robustulus>>
 >julianae : julianae
->gerbillus : gerbillus<T0, T1>
+>gerbillus : julianae.gerbillus<T0, T1>
 >rionegrensis : rionegrensis
->caniventer : caniventer
+>caniventer : rionegrensis.caniventer
 >rendalli : rendalli
->crenulata : crenulata<T0, T1>
+>crenulata : rendalli.crenulata<T0, T1>
 >rendalli : rendalli
->zuluensis : zuluensis
+>zuluensis : rendalli.zuluensis
 >dogramacii : dogramacii
->robustulus : robustulus
->x : gerbillus<caniventer, crenulata<zuluensis, robustulus>>
+>robustulus : dogramacii.robustulus
+>x : julianae.gerbillus<rionegrensis.caniventer, rendalli.crenulata<rendalli.zuluensis, dogramacii.robustulus>>
 >julianae : julianae
->gerbillus : gerbillus<T0, T1>
+>gerbillus : julianae.gerbillus<T0, T1>
 >rionegrensis : rionegrensis
->caniventer : caniventer
+>caniventer : rionegrensis.caniventer
 >rendalli : rendalli
->crenulata : crenulata<T0, T1>
+>crenulata : rendalli.crenulata<T0, T1>
 >rendalli : rendalli
->zuluensis : zuluensis
+>zuluensis : rendalli.zuluensis
 >dogramacii : dogramacii
->robustulus : robustulus
+>robustulus : dogramacii.robustulus
 >() => { var y = this; } : () => void
 >y : schlegeli
 >this : schlegeli
->x : gerbillus<caniventer, crenulata<zuluensis, robustulus>>
+>x : julianae.gerbillus<rionegrensis.caniventer, rendalli.crenulata<rendalli.zuluensis, dogramacii.robustulus>>
 
     andamanensis() : julianae.oralis<ruatanica.americanus, rendalli.zuluensis> { var x : julianae.oralis<ruatanica.americanus, rendalli.zuluensis>; () => { var y = this; }; return x; }
->andamanensis : () => oralis<americanus, zuluensis>
+>andamanensis : () => julianae.oralis<ruatanica.americanus, rendalli.zuluensis>
 >julianae : julianae
->oralis : oralis<T0, T1>
+>oralis : julianae.oralis<T0, T1>
 >ruatanica : ruatanica
->americanus : americanus
+>americanus : ruatanica.americanus
 >rendalli : rendalli
->zuluensis : zuluensis
->x : oralis<americanus, zuluensis>
+>zuluensis : rendalli.zuluensis
+>x : julianae.oralis<ruatanica.americanus, rendalli.zuluensis>
 >julianae : julianae
->oralis : oralis<T0, T1>
+>oralis : julianae.oralis<T0, T1>
 >ruatanica : ruatanica
->americanus : americanus
+>americanus : ruatanica.americanus
 >rendalli : rendalli
->zuluensis : zuluensis
+>zuluensis : rendalli.zuluensis
 >() => { var y = this; } : () => void
 >y : schlegeli
 >this : schlegeli
->x : oralis<americanus, zuluensis>
+>x : julianae.oralis<ruatanica.americanus, rendalli.zuluensis>
 
     dispar() : panamensis.linulus<dogramacii.kaiseri, minutus.portoricensis> { var x : panamensis.linulus<dogramacii.kaiseri, minutus.portoricensis>; () => { var y = this; }; return x; }
->dispar : () => linulus<kaiseri, portoricensis>
+>dispar : () => panamensis.linulus<dogramacii.kaiseri, minutus.portoricensis>
 >panamensis : panamensis
->linulus : linulus<T0, T1>
+>linulus : panamensis.linulus<T0, T1>
 >dogramacii : dogramacii
->kaiseri : kaiseri
+>kaiseri : dogramacii.kaiseri
 >minutus : minutus
->portoricensis : portoricensis
->x : linulus<kaiseri, portoricensis>
+>portoricensis : minutus.portoricensis
+>x : panamensis.linulus<dogramacii.kaiseri, minutus.portoricensis>
 >panamensis : panamensis
->linulus : linulus<T0, T1>
+>linulus : panamensis.linulus<T0, T1>
 >dogramacii : dogramacii
->kaiseri : kaiseri
+>kaiseri : dogramacii.kaiseri
 >minutus : minutus
->portoricensis : portoricensis
+>portoricensis : minutus.portoricensis
 >() => { var y = this; } : () => void
 >y : schlegeli
 >this : schlegeli
->x : linulus<kaiseri, portoricensis>
+>x : panamensis.linulus<dogramacii.kaiseri, minutus.portoricensis>
   }
 }
 module argurus {
->argurus : typeof argurus
+>argurus : argurus
 
   export class dauricus<T0, T1> {
 >dauricus : dauricus<T0, T1>
@@ -5225,236 +5225,236 @@ module argurus {
 >T1 : T1
 
     chinensis() : Lanthanum.jugularis { var x : Lanthanum.jugularis; () => { var y = this; }; return x; }
->chinensis : () => jugularis
+>chinensis : () => Lanthanum.jugularis
 >Lanthanum : Lanthanum
->jugularis : jugularis
->x : jugularis
+>jugularis : Lanthanum.jugularis
+>x : Lanthanum.jugularis
 >Lanthanum : Lanthanum
->jugularis : jugularis
+>jugularis : Lanthanum.jugularis
 >() => { var y = this; } : () => void
 >y : dauricus<T0, T1>
 >this : dauricus<T0, T1>
->x : jugularis
+>x : Lanthanum.jugularis
 
     duodecimcostatus() : lavali.xanthognathus { var x : lavali.xanthognathus; () => { var y = this; }; return x; }
->duodecimcostatus : () => xanthognathus
+>duodecimcostatus : () => lavali.xanthognathus
 >lavali : lavali
->xanthognathus : xanthognathus
->x : xanthognathus
+>xanthognathus : lavali.xanthognathus
+>x : lavali.xanthognathus
 >lavali : lavali
->xanthognathus : xanthognathus
+>xanthognathus : lavali.xanthognathus
 >() => { var y = this; } : () => void
 >y : dauricus<T0, T1>
 >this : dauricus<T0, T1>
->x : xanthognathus
+>x : lavali.xanthognathus
 
     foxi() : daubentonii.nesiotes<lavali.beisa, lavali.lepturus> { var x : daubentonii.nesiotes<lavali.beisa, lavali.lepturus>; () => { var y = this; }; return x; }
->foxi : () => nesiotes<beisa, lepturus>
+>foxi : () => daubentonii.nesiotes<lavali.beisa, lavali.lepturus>
 >daubentonii : daubentonii
->nesiotes : nesiotes<T0, T1>
+>nesiotes : daubentonii.nesiotes<T0, T1>
 >lavali : lavali
->beisa : beisa
+>beisa : lavali.beisa
 >lavali : lavali
->lepturus : lepturus
->x : nesiotes<beisa, lepturus>
+>lepturus : lavali.lepturus
+>x : daubentonii.nesiotes<lavali.beisa, lavali.lepturus>
 >daubentonii : daubentonii
->nesiotes : nesiotes<T0, T1>
+>nesiotes : daubentonii.nesiotes<T0, T1>
 >lavali : lavali
->beisa : beisa
+>beisa : lavali.beisa
 >lavali : lavali
->lepturus : lepturus
+>lepturus : lavali.lepturus
 >() => { var y = this; } : () => void
 >y : dauricus<T0, T1>
 >this : dauricus<T0, T1>
->x : nesiotes<beisa, lepturus>
+>x : daubentonii.nesiotes<lavali.beisa, lavali.lepturus>
 
     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 : () => sodyi<wattsi<galapagoensis, linulus<xanthognathus, konganensis>>, minutilla>
+>macleayii : () => petrophilus.sodyi<quasiater.wattsi<julianae.galapagoensis, panamensis.linulus<lavali.xanthognathus, macrorhinos.konganensis>>, petrophilus.minutilla>
 >petrophilus : petrophilus
->sodyi : sodyi<T0, T1>
+>sodyi : petrophilus.sodyi<T0, T1>
 >quasiater : quasiater
->wattsi : wattsi<T0, T1>
+>wattsi : quasiater.wattsi<T0, T1>
 >julianae : julianae
->galapagoensis : galapagoensis
+>galapagoensis : julianae.galapagoensis
 >panamensis : panamensis
->linulus : linulus<T0, T1>
+>linulus : panamensis.linulus<T0, T1>
 >lavali : lavali
->xanthognathus : xanthognathus
+>xanthognathus : lavali.xanthognathus
 >macrorhinos : macrorhinos
->konganensis : konganensis
+>konganensis : macrorhinos.konganensis
 >petrophilus : petrophilus
->minutilla : minutilla
->x : sodyi<wattsi<galapagoensis, linulus<xanthognathus, konganensis>>, minutilla>
+>minutilla : petrophilus.minutilla
+>x : petrophilus.sodyi<quasiater.wattsi<julianae.galapagoensis, panamensis.linulus<lavali.xanthognathus, macrorhinos.konganensis>>, petrophilus.minutilla>
 >petrophilus : petrophilus
->sodyi : sodyi<T0, T1>
+>sodyi : petrophilus.sodyi<T0, T1>
 >quasiater : quasiater
->wattsi : wattsi<T0, T1>
+>wattsi : quasiater.wattsi<T0, T1>
 >julianae : julianae
->galapagoensis : galapagoensis
+>galapagoensis : julianae.galapagoensis
 >panamensis : panamensis
->linulus : linulus<T0, T1>
+>linulus : panamensis.linulus<T0, T1>
 >lavali : lavali
->xanthognathus : xanthognathus
+>xanthognathus : lavali.xanthognathus
 >macrorhinos : macrorhinos
->konganensis : konganensis
+>konganensis : macrorhinos.konganensis
 >petrophilus : petrophilus
->minutilla : minutilla
+>minutilla : petrophilus.minutilla
 >() => { var y = this; } : () => void
 >y : dauricus<T0, T1>
 >this : dauricus<T0, T1>
->x : sodyi<wattsi<galapagoensis, linulus<xanthognathus, konganensis>>, minutilla>
+>x : petrophilus.sodyi<quasiater.wattsi<julianae.galapagoensis, panamensis.linulus<lavali.xanthognathus, macrorhinos.konganensis>>, petrophilus.minutilla>
 
     darienensis() : trivirgatus.oconnelli { var x : trivirgatus.oconnelli; () => { var y = this; }; return x; }
->darienensis : () => oconnelli
+>darienensis : () => trivirgatus.oconnelli
 >trivirgatus : trivirgatus
->oconnelli : oconnelli
->x : oconnelli
+>oconnelli : trivirgatus.oconnelli
+>x : trivirgatus.oconnelli
 >trivirgatus : trivirgatus
->oconnelli : oconnelli
+>oconnelli : trivirgatus.oconnelli
 >() => { var y = this; } : () => void
 >y : dauricus<T0, T1>
 >this : dauricus<T0, T1>
->x : oconnelli
+>x : trivirgatus.oconnelli
 
     hardwickii() : macrorhinos.daphaenodon { var x : macrorhinos.daphaenodon; () => { var y = this; }; return x; }
->hardwickii : () => daphaenodon
+>hardwickii : () => macrorhinos.daphaenodon
 >macrorhinos : macrorhinos
->daphaenodon : daphaenodon
->x : daphaenodon
+>daphaenodon : macrorhinos.daphaenodon
+>x : macrorhinos.daphaenodon
 >macrorhinos : macrorhinos
->daphaenodon : daphaenodon
+>daphaenodon : macrorhinos.daphaenodon
 >() => { var y = this; } : () => void
 >y : dauricus<T0, T1>
 >this : dauricus<T0, T1>
->x : daphaenodon
+>x : macrorhinos.daphaenodon
 
     albifrons() : rionegrensis.veraecrucis<lavali.lepturus, julianae.durangae> { var x : rionegrensis.veraecrucis<lavali.lepturus, julianae.durangae>; () => { var y = this; }; return x; }
->albifrons : () => veraecrucis<lepturus, durangae>
+>albifrons : () => rionegrensis.veraecrucis<lavali.lepturus, julianae.durangae>
 >rionegrensis : rionegrensis
->veraecrucis : veraecrucis<T0, T1>
+>veraecrucis : rionegrensis.veraecrucis<T0, T1>
 >lavali : lavali
->lepturus : lepturus
+>lepturus : lavali.lepturus
 >julianae : julianae
->durangae : durangae
->x : veraecrucis<lepturus, durangae>
+>durangae : julianae.durangae
+>x : rionegrensis.veraecrucis<lavali.lepturus, julianae.durangae>
 >rionegrensis : rionegrensis
->veraecrucis : veraecrucis<T0, T1>
+>veraecrucis : rionegrensis.veraecrucis<T0, T1>
 >lavali : lavali
->lepturus : lepturus
+>lepturus : lavali.lepturus
 >julianae : julianae
->durangae : durangae
+>durangae : julianae.durangae
 >() => { var y = this; } : () => void
 >y : dauricus<T0, T1>
 >this : dauricus<T0, T1>
->x : veraecrucis<lepturus, durangae>
+>x : rionegrensis.veraecrucis<lavali.lepturus, julianae.durangae>
 
     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 : () => johorensis<konganensis, johorensis<peninsulae, arboreus<germaini, stolzmanni>>>
+>jacobitus : () => caurinus.johorensis<macrorhinos.konganensis, caurinus.johorensis<peninsulae, daubentonii.arboreus<germaini, sagitta.stolzmanni>>>
 >caurinus : caurinus
->johorensis : johorensis<T0, T1>
+>johorensis : caurinus.johorensis<T0, T1>
 >macrorhinos : macrorhinos
->konganensis : konganensis
+>konganensis : macrorhinos.konganensis
 >caurinus : caurinus
->johorensis : johorensis<T0, T1>
+>johorensis : caurinus.johorensis<T0, T1>
 >argurus : argurus
 >peninsulae : peninsulae
 >daubentonii : daubentonii
->arboreus : arboreus<T0, T1>
+>arboreus : daubentonii.arboreus<T0, T1>
 >argurus : argurus
 >germaini : germaini
 >sagitta : sagitta
->stolzmanni : stolzmanni
->x : johorensis<konganensis, johorensis<peninsulae, arboreus<germaini, stolzmanni>>>
+>stolzmanni : sagitta.stolzmanni
+>x : caurinus.johorensis<macrorhinos.konganensis, caurinus.johorensis<peninsulae, daubentonii.arboreus<germaini, sagitta.stolzmanni>>>
 >caurinus : caurinus
->johorensis : johorensis<T0, T1>
+>johorensis : caurinus.johorensis<T0, T1>
 >macrorhinos : macrorhinos
->konganensis : konganensis
+>konganensis : macrorhinos.konganensis
 >caurinus : caurinus
->johorensis : johorensis<T0, T1>
+>johorensis : caurinus.johorensis<T0, T1>
 >argurus : argurus
 >peninsulae : peninsulae
 >daubentonii : daubentonii
->arboreus : arboreus<T0, T1>
+>arboreus : daubentonii.arboreus<T0, T1>
 >argurus : argurus
 >germaini : germaini
 >sagitta : sagitta
->stolzmanni : stolzmanni
+>stolzmanni : sagitta.stolzmanni
 >() => { var y = this; } : () => void
 >y : dauricus<T0, T1>
 >this : dauricus<T0, T1>
->x : johorensis<konganensis, johorensis<peninsulae, arboreus<germaini, stolzmanni>>>
+>x : caurinus.johorensis<macrorhinos.konganensis, caurinus.johorensis<peninsulae, daubentonii.arboreus<germaini, sagitta.stolzmanni>>>
 
     guentheri() : rendalli.moojeni<lutreolus.foina, argurus.oreas> { var x : rendalli.moojeni<lutreolus.foina, argurus.oreas>; () => { var y = this; }; return x; }
->guentheri : () => moojeni<foina, oreas>
+>guentheri : () => rendalli.moojeni<lutreolus.foina, oreas>
 >rendalli : rendalli
->moojeni : moojeni<T0, T1>
+>moojeni : rendalli.moojeni<T0, T1>
 >lutreolus : lutreolus
->foina : foina
+>foina : lutreolus.foina
 >argurus : argurus
 >oreas : oreas
->x : moojeni<foina, oreas>
+>x : rendalli.moojeni<lutreolus.foina, oreas>
 >rendalli : rendalli
->moojeni : moojeni<T0, T1>
+>moojeni : rendalli.moojeni<T0, T1>
 >lutreolus : lutreolus
->foina : foina
+>foina : lutreolus.foina
 >argurus : argurus
 >oreas : oreas
 >() => { var y = this; } : () => void
 >y : dauricus<T0, T1>
 >this : dauricus<T0, T1>
->x : moojeni<foina, oreas>
+>x : rendalli.moojeni<lutreolus.foina, oreas>
 
     mahomet() : imperfecta.ciliolabrum<argurus.germaini, lutreolus.foina> { var x : imperfecta.ciliolabrum<argurus.germaini, lutreolus.foina>; () => { var y = this; }; return x; }
->mahomet : () => ciliolabrum<germaini, foina>
+>mahomet : () => imperfecta.ciliolabrum<germaini, lutreolus.foina>
 >imperfecta : imperfecta
->ciliolabrum : ciliolabrum<T0, T1>
+>ciliolabrum : imperfecta.ciliolabrum<T0, T1>
 >argurus : argurus
 >germaini : germaini
 >lutreolus : lutreolus
->foina : foina
->x : ciliolabrum<germaini, foina>
+>foina : lutreolus.foina
+>x : imperfecta.ciliolabrum<germaini, lutreolus.foina>
 >imperfecta : imperfecta
->ciliolabrum : ciliolabrum<T0, T1>
+>ciliolabrum : imperfecta.ciliolabrum<T0, T1>
 >argurus : argurus
 >germaini : germaini
 >lutreolus : lutreolus
->foina : foina
+>foina : lutreolus.foina
 >() => { var y = this; } : () => void
 >y : dauricus<T0, T1>
 >this : dauricus<T0, T1>
->x : ciliolabrum<germaini, foina>
+>x : imperfecta.ciliolabrum<germaini, lutreolus.foina>
 
     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 : () => marmosurus<arboreus<carolinensis, caniventer>, echinatus>
+>misionensis : () => macrorhinos.marmosurus<daubentonii.arboreus<quasiater.carolinensis, rionegrensis.caniventer>, gabriellae.echinatus>
 >macrorhinos : macrorhinos
->marmosurus : marmosurus<T0, T1>
+>marmosurus : macrorhinos.marmosurus<T0, T1>
 >daubentonii : daubentonii
->arboreus : arboreus<T0, T1>
+>arboreus : daubentonii.arboreus<T0, T1>
 >quasiater : quasiater
->carolinensis : carolinensis
+>carolinensis : quasiater.carolinensis
 >rionegrensis : rionegrensis
->caniventer : caniventer
+>caniventer : rionegrensis.caniventer
 >gabriellae : gabriellae
->echinatus : echinatus
->x : marmosurus<arboreus<carolinensis, caniventer>, echinatus>
+>echinatus : gabriellae.echinatus
+>x : macrorhinos.marmosurus<daubentonii.arboreus<quasiater.carolinensis, rionegrensis.caniventer>, gabriellae.echinatus>
 >macrorhinos : macrorhinos
->marmosurus : marmosurus<T0, T1>
+>marmosurus : macrorhinos.marmosurus<T0, T1>
 >daubentonii : daubentonii
->arboreus : arboreus<T0, T1>
+>arboreus : daubentonii.arboreus<T0, T1>
 >quasiater : quasiater
->carolinensis : carolinensis
+>carolinensis : quasiater.carolinensis
 >rionegrensis : rionegrensis
->caniventer : caniventer
+>caniventer : rionegrensis.caniventer
 >gabriellae : gabriellae
->echinatus : echinatus
+>echinatus : gabriellae.echinatus
 >() => { var y = this; } : () => void
 >y : dauricus<T0, T1>
 >this : dauricus<T0, T1>
->x : marmosurus<arboreus<carolinensis, caniventer>, echinatus>
+>x : macrorhinos.marmosurus<daubentonii.arboreus<quasiater.carolinensis, rionegrensis.caniventer>, gabriellae.echinatus>
   }
 }
 module nigra {
->nigra : typeof nigra
+>nigra : nigra
 
   export class dolichurus<T0, T1> {
 >dolichurus : dolichurus<T0, T1>
@@ -5462,1102 +5462,1102 @@ module nigra {
 >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 : () => abidi<carolinensis, crenulata<klossii<nudicaudus, aurata>, netscheri<inez<peninsulae, nudicaudus>, oralis<xanthognathus, oreas>>>>
+>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 : panglima
->abidi : abidi<T0, T1>
+>abidi : panglima.abidi<T0, T1>
 >quasiater : quasiater
->carolinensis : carolinensis
+>carolinensis : quasiater.carolinensis
 >rendalli : rendalli
->crenulata : crenulata<T0, T1>
+>crenulata : rendalli.crenulata<T0, T1>
 >gabriellae : gabriellae
->klossii : klossii<T0, T1>
+>klossii : gabriellae.klossii<T0, T1>
 >julianae : julianae
->nudicaudus : nudicaudus
+>nudicaudus : julianae.nudicaudus
 >dogramacii : dogramacii
->aurata : aurata
+>aurata : dogramacii.aurata
 >argurus : argurus
->netscheri : netscheri<T0, T1>
+>netscheri : argurus.netscheri<T0, T1>
 >minutus : minutus
->inez : inez<T0, T1>
+>inez : minutus.inez<T0, T1>
 >argurus : argurus
->peninsulae : peninsulae
+>peninsulae : argurus.peninsulae
 >julianae : julianae
->nudicaudus : nudicaudus
+>nudicaudus : julianae.nudicaudus
 >julianae : julianae
->oralis : oralis<T0, T1>
+>oralis : julianae.oralis<T0, T1>
 >lavali : lavali
->xanthognathus : xanthognathus
+>xanthognathus : lavali.xanthognathus
 >argurus : argurus
->oreas : oreas
->x : abidi<carolinensis, crenulata<klossii<nudicaudus, aurata>, netscheri<inez<peninsulae, nudicaudus>, oralis<xanthognathus, oreas>>>>
+>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 : panglima
->abidi : abidi<T0, T1>
+>abidi : panglima.abidi<T0, T1>
 >quasiater : quasiater
->carolinensis : carolinensis
+>carolinensis : quasiater.carolinensis
 >rendalli : rendalli
->crenulata : crenulata<T0, T1>
+>crenulata : rendalli.crenulata<T0, T1>
 >gabriellae : gabriellae
->klossii : klossii<T0, T1>
+>klossii : gabriellae.klossii<T0, T1>
 >julianae : julianae
->nudicaudus : nudicaudus
+>nudicaudus : julianae.nudicaudus
 >dogramacii : dogramacii
->aurata : aurata
+>aurata : dogramacii.aurata
 >argurus : argurus
->netscheri : netscheri<T0, T1>
+>netscheri : argurus.netscheri<T0, T1>
 >minutus : minutus
->inez : inez<T0, T1>
+>inez : minutus.inez<T0, T1>
 >argurus : argurus
->peninsulae : peninsulae
+>peninsulae : argurus.peninsulae
 >julianae : julianae
->nudicaudus : nudicaudus
+>nudicaudus : julianae.nudicaudus
 >julianae : julianae
->oralis : oralis<T0, T1>
+>oralis : julianae.oralis<T0, T1>
 >lavali : lavali
->xanthognathus : xanthognathus
+>xanthognathus : lavali.xanthognathus
 >argurus : argurus
->oreas : oreas
+>oreas : argurus.oreas
 >() => { var y = this; } : () => void
 >y : dolichurus<T0, T1>
 >this : dolichurus<T0, T1>
->x : abidi<carolinensis, crenulata<klossii<nudicaudus, aurata>, netscheri<inez<peninsulae, nudicaudus>, oralis<xanthognathus, 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>>>>
 
     alfredi() : caurinus.psilurus { var x : caurinus.psilurus; () => { var y = this; }; return x; }
->alfredi : () => psilurus
+>alfredi : () => caurinus.psilurus
 >caurinus : caurinus
->psilurus : psilurus
->x : psilurus
+>psilurus : caurinus.psilurus
+>x : caurinus.psilurus
 >caurinus : caurinus
->psilurus : psilurus
+>psilurus : caurinus.psilurus
 >() => { var y = this; } : () => void
 >y : dolichurus<T0, T1>
 >this : dolichurus<T0, T1>
->x : psilurus
+>x : caurinus.psilurus
 
     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 : () => hector<oconnelli, cinereus<caucasica<sumatrana, oconnelli>, wattsi<galapagoensis, linulus<xanthognathus, konganensis>>>>
+>morrisi : () => ruatanica.hector<trivirgatus.oconnelli, sagitta.cinereus<caucasica<julianae.sumatrana, trivirgatus.oconnelli>, quasiater.wattsi<julianae.galapagoensis, panamensis.linulus<lavali.xanthognathus, macrorhinos.konganensis>>>>
 >ruatanica : ruatanica
->hector : hector<T0, T1>
+>hector : ruatanica.hector<T0, T1>
 >trivirgatus : trivirgatus
->oconnelli : oconnelli
+>oconnelli : trivirgatus.oconnelli
 >sagitta : sagitta
->cinereus : cinereus<T0, T1>
+>cinereus : sagitta.cinereus<T0, T1>
 >nigra : nigra
 >caucasica : caucasica<T0, T1>
 >julianae : julianae
->sumatrana : sumatrana
+>sumatrana : julianae.sumatrana
 >trivirgatus : trivirgatus
->oconnelli : oconnelli
+>oconnelli : trivirgatus.oconnelli
 >quasiater : quasiater
->wattsi : wattsi<T0, T1>
+>wattsi : quasiater.wattsi<T0, T1>
 >julianae : julianae
->galapagoensis : galapagoensis
+>galapagoensis : julianae.galapagoensis
 >panamensis : panamensis
->linulus : linulus<T0, T1>
+>linulus : panamensis.linulus<T0, T1>
 >lavali : lavali
->xanthognathus : xanthognathus
+>xanthognathus : lavali.xanthognathus
 >macrorhinos : macrorhinos
->konganensis : konganensis
->x : hector<oconnelli, cinereus<caucasica<sumatrana, oconnelli>, wattsi<galapagoensis, linulus<xanthognathus, konganensis>>>>
+>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 : ruatanica
->hector : hector<T0, T1>
+>hector : ruatanica.hector<T0, T1>
 >trivirgatus : trivirgatus
->oconnelli : oconnelli
+>oconnelli : trivirgatus.oconnelli
 >sagitta : sagitta
->cinereus : cinereus<T0, T1>
+>cinereus : sagitta.cinereus<T0, T1>
 >nigra : nigra
 >caucasica : caucasica<T0, T1>
 >julianae : julianae
->sumatrana : sumatrana
+>sumatrana : julianae.sumatrana
 >trivirgatus : trivirgatus
->oconnelli : oconnelli
+>oconnelli : trivirgatus.oconnelli
 >quasiater : quasiater
->wattsi : wattsi<T0, T1>
+>wattsi : quasiater.wattsi<T0, T1>
 >julianae : julianae
->galapagoensis : galapagoensis
+>galapagoensis : julianae.galapagoensis
 >panamensis : panamensis
->linulus : linulus<T0, T1>
+>linulus : panamensis.linulus<T0, T1>
 >lavali : lavali
->xanthognathus : xanthognathus
+>xanthognathus : lavali.xanthognathus
 >macrorhinos : macrorhinos
->konganensis : konganensis
+>konganensis : macrorhinos.konganensis
 >() => { var y = this; } : () => void
 >y : dolichurus<T0, T1>
 >this : dolichurus<T0, T1>
->x : hector<oconnelli, cinereus<caucasica<sumatrana, oconnelli>, wattsi<galapagoensis, linulus<xanthognathus, konganensis>>>>
+>x : ruatanica.hector<trivirgatus.oconnelli, sagitta.cinereus<caucasica<julianae.sumatrana, trivirgatus.oconnelli>, quasiater.wattsi<julianae.galapagoensis, panamensis.linulus<lavali.xanthognathus, macrorhinos.konganensis>>>>
 
     lekaguli() : Lanthanum.nitidus<dammermani.melanops, lavali.lepturus> { var x : Lanthanum.nitidus<dammermani.melanops, lavali.lepturus>; () => { var y = this; }; return x; }
->lekaguli : () => nitidus<melanops, lepturus>
+>lekaguli : () => Lanthanum.nitidus<dammermani.melanops, lavali.lepturus>
 >Lanthanum : Lanthanum
->nitidus : nitidus<T0, T1>
+>nitidus : Lanthanum.nitidus<T0, T1>
 >dammermani : dammermani
->melanops : melanops
+>melanops : dammermani.melanops
 >lavali : lavali
->lepturus : lepturus
->x : nitidus<melanops, lepturus>
+>lepturus : lavali.lepturus
+>x : Lanthanum.nitidus<dammermani.melanops, lavali.lepturus>
 >Lanthanum : Lanthanum
->nitidus : nitidus<T0, T1>
+>nitidus : Lanthanum.nitidus<T0, T1>
 >dammermani : dammermani
->melanops : melanops
+>melanops : dammermani.melanops
 >lavali : lavali
->lepturus : lepturus
+>lepturus : lavali.lepturus
 >() => { var y = this; } : () => void
 >y : dolichurus<T0, T1>
 >this : dolichurus<T0, T1>
->x : nitidus<melanops, lepturus>
+>x : Lanthanum.nitidus<dammermani.melanops, lavali.lepturus>
 
     dimissus() : imperfecta.subspinosus { var x : imperfecta.subspinosus; () => { var y = this; }; return x; }
->dimissus : () => subspinosus
+>dimissus : () => imperfecta.subspinosus
 >imperfecta : imperfecta
->subspinosus : subspinosus
->x : subspinosus
+>subspinosus : imperfecta.subspinosus
+>x : imperfecta.subspinosus
 >imperfecta : imperfecta
->subspinosus : subspinosus
+>subspinosus : imperfecta.subspinosus
 >() => { var y = this; } : () => void
 >y : dolichurus<T0, T1>
 >this : dolichurus<T0, T1>
->x : subspinosus
+>x : imperfecta.subspinosus
 
     phaeotis() : julianae.sumatrana { var x : julianae.sumatrana; () => { var y = this; }; return x; }
->phaeotis : () => sumatrana
+>phaeotis : () => julianae.sumatrana
 >julianae : julianae
->sumatrana : sumatrana
->x : sumatrana
+>sumatrana : julianae.sumatrana
+>x : julianae.sumatrana
 >julianae : julianae
->sumatrana : sumatrana
+>sumatrana : julianae.sumatrana
 >() => { var y = this; } : () => void
 >y : dolichurus<T0, T1>
 >this : dolichurus<T0, T1>
->x : sumatrana
+>x : julianae.sumatrana
 
     ustus() : julianae.acariensis { var x : julianae.acariensis; () => { var y = this; }; return x; }
->ustus : () => acariensis
+>ustus : () => julianae.acariensis
 >julianae : julianae
->acariensis : acariensis
->x : acariensis
+>acariensis : julianae.acariensis
+>x : julianae.acariensis
 >julianae : julianae
->acariensis : acariensis
+>acariensis : julianae.acariensis
 >() => { var y = this; } : () => void
 >y : dolichurus<T0, T1>
 >this : dolichurus<T0, T1>
->x : acariensis
+>x : julianae.acariensis
 
     sagei() : howi.marcanoi { var x : howi.marcanoi; () => { var y = this; }; return x; }
->sagei : () => marcanoi
+>sagei : () => howi.marcanoi
 >howi : howi
->marcanoi : marcanoi
->x : marcanoi
+>marcanoi : howi.marcanoi
+>x : howi.marcanoi
 >howi : howi
->marcanoi : marcanoi
+>marcanoi : howi.marcanoi
 >() => { var y = this; } : () => void
 >y : dolichurus<T0, T1>
 >this : dolichurus<T0, T1>
->x : marcanoi
+>x : howi.marcanoi
   }
 }
 module panglima {
->panglima : typeof panglima
+>panglima : 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 : caurinus
->johorensis : johorensis<T0, T1>
+>johorensis : caurinus.johorensis<T0, T1>
 >Lanthanum : Lanthanum
->nitidus : nitidus<T0, T1>
+>nitidus : Lanthanum.nitidus<T0, T1>
 >petrophilus : petrophilus
->minutilla : minutilla
+>minutilla : petrophilus.minutilla
 >julianae : julianae
->sumatrana : sumatrana
+>sumatrana : julianae.sumatrana
 >Lanthanum : Lanthanum
->jugularis : jugularis
+>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 : () => marmosurus<moojeni<amphibius<falconeri, psilurus>, echinatus>, stolzmanni>
+>bottegi : () => macrorhinos.marmosurus<rendalli.moojeni<amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>, sagitta.stolzmanni>
 >macrorhinos : macrorhinos
->marmosurus : marmosurus<T0, T1>
+>marmosurus : macrorhinos.marmosurus<T0, T1>
 >rendalli : rendalli
->moojeni : moojeni<T0, T1>
+>moojeni : rendalli.moojeni<T0, T1>
 >amphibius : amphibius<T0, T1>
 >trivirgatus : trivirgatus
->falconeri : falconeri
+>falconeri : trivirgatus.falconeri
 >caurinus : caurinus
->psilurus : psilurus
+>psilurus : caurinus.psilurus
 >gabriellae : gabriellae
->echinatus : echinatus
+>echinatus : gabriellae.echinatus
 >sagitta : sagitta
->stolzmanni : stolzmanni
->x : marmosurus<moojeni<amphibius<falconeri, psilurus>, echinatus>, stolzmanni>
+>stolzmanni : sagitta.stolzmanni
+>x : macrorhinos.marmosurus<rendalli.moojeni<amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>, sagitta.stolzmanni>
 >macrorhinos : macrorhinos
->marmosurus : marmosurus<T0, T1>
+>marmosurus : macrorhinos.marmosurus<T0, T1>
 >rendalli : rendalli
->moojeni : moojeni<T0, T1>
+>moojeni : rendalli.moojeni<T0, T1>
 >amphibius : amphibius<T0, T1>
 >trivirgatus : trivirgatus
->falconeri : falconeri
+>falconeri : trivirgatus.falconeri
 >caurinus : caurinus
->psilurus : psilurus
+>psilurus : caurinus.psilurus
 >gabriellae : gabriellae
->echinatus : echinatus
+>echinatus : gabriellae.echinatus
 >sagitta : sagitta
->stolzmanni : stolzmanni
+>stolzmanni : sagitta.stolzmanni
 >() => { var y = this; } : () => void
 >y : amphibius<T0, T1>
 >this : amphibius<T0, T1>
->x : marmosurus<moojeni<amphibius<falconeri, psilurus>, echinatus>, stolzmanni>
+>x : macrorhinos.marmosurus<rendalli.moojeni<amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>, sagitta.stolzmanni>
 
         jerdoni(): macrorhinos.daphaenodon { var x: macrorhinos.daphaenodon; () => { var y = this; }; return x; }
->jerdoni : () => daphaenodon
+>jerdoni : () => macrorhinos.daphaenodon
 >macrorhinos : macrorhinos
->daphaenodon : daphaenodon
->x : daphaenodon
+>daphaenodon : macrorhinos.daphaenodon
+>x : macrorhinos.daphaenodon
 >macrorhinos : macrorhinos
->daphaenodon : daphaenodon
+>daphaenodon : macrorhinos.daphaenodon
 >() => { var y = this; } : () => void
 >y : amphibius<T0, T1>
 >this : amphibius<T0, T1>
->x : daphaenodon
+>x : macrorhinos.daphaenodon
 
         camtschatica(): samarensis.pallidus { var x: samarensis.pallidus; () => { var y = this; }; return x; }
->camtschatica : () => pallidus
+>camtschatica : () => samarensis.pallidus
 >samarensis : samarensis
->pallidus : pallidus
->x : pallidus
+>pallidus : samarensis.pallidus
+>x : samarensis.pallidus
 >samarensis : samarensis
->pallidus : pallidus
+>pallidus : samarensis.pallidus
 >() => { var y = this; } : () => void
 >y : amphibius<T0, T1>
 >this : amphibius<T0, T1>
->x : pallidus
+>x : samarensis.pallidus
 
         spadix(): petrophilus.sodyi<macrorhinos.konganensis, caurinus.psilurus> { var x: petrophilus.sodyi<macrorhinos.konganensis, caurinus.psilurus>; () => { var y = this; }; return x; }
->spadix : () => sodyi<konganensis, psilurus>
+>spadix : () => petrophilus.sodyi<macrorhinos.konganensis, caurinus.psilurus>
 >petrophilus : petrophilus
->sodyi : sodyi<T0, T1>
+>sodyi : petrophilus.sodyi<T0, T1>
 >macrorhinos : macrorhinos
->konganensis : konganensis
+>konganensis : macrorhinos.konganensis
 >caurinus : caurinus
->psilurus : psilurus
->x : sodyi<konganensis, psilurus>
+>psilurus : caurinus.psilurus
+>x : petrophilus.sodyi<macrorhinos.konganensis, caurinus.psilurus>
 >petrophilus : petrophilus
->sodyi : sodyi<T0, T1>
+>sodyi : petrophilus.sodyi<T0, T1>
 >macrorhinos : macrorhinos
->konganensis : konganensis
+>konganensis : macrorhinos.konganensis
 >caurinus : caurinus
->psilurus : psilurus
+>psilurus : caurinus.psilurus
 >() => { var y = this; } : () => void
 >y : amphibius<T0, T1>
 >this : amphibius<T0, T1>
->x : sodyi<konganensis, psilurus>
+>x : petrophilus.sodyi<macrorhinos.konganensis, caurinus.psilurus>
 
         luismanueli(): rendalli.moojeni<julianae.sumatrana, trivirgatus.oconnelli> { var x: rendalli.moojeni<julianae.sumatrana, trivirgatus.oconnelli>; () => { var y = this; }; return x; }
->luismanueli : () => moojeni<sumatrana, oconnelli>
+>luismanueli : () => rendalli.moojeni<julianae.sumatrana, trivirgatus.oconnelli>
 >rendalli : rendalli
->moojeni : moojeni<T0, T1>
+>moojeni : rendalli.moojeni<T0, T1>
 >julianae : julianae
->sumatrana : sumatrana
+>sumatrana : julianae.sumatrana
 >trivirgatus : trivirgatus
->oconnelli : oconnelli
->x : moojeni<sumatrana, oconnelli>
+>oconnelli : trivirgatus.oconnelli
+>x : rendalli.moojeni<julianae.sumatrana, trivirgatus.oconnelli>
 >rendalli : rendalli
->moojeni : moojeni<T0, T1>
+>moojeni : rendalli.moojeni<T0, T1>
 >julianae : julianae
->sumatrana : sumatrana
+>sumatrana : julianae.sumatrana
 >trivirgatus : trivirgatus
->oconnelli : oconnelli
+>oconnelli : trivirgatus.oconnelli
 >() => { var y = this; } : () => void
 >y : amphibius<T0, T1>
 >this : amphibius<T0, T1>
->x : moojeni<sumatrana, oconnelli>
+>x : rendalli.moojeni<julianae.sumatrana, trivirgatus.oconnelli>
 
         aceramarcae(): daubentonii.arboreus<julianae.nudicaudus, julianae.steerii> { var x: daubentonii.arboreus<julianae.nudicaudus, julianae.steerii>; () => { var y = this; }; return x; }
->aceramarcae : () => arboreus<nudicaudus, steerii>
+>aceramarcae : () => daubentonii.arboreus<julianae.nudicaudus, julianae.steerii>
 >daubentonii : daubentonii
->arboreus : arboreus<T0, T1>
+>arboreus : daubentonii.arboreus<T0, T1>
 >julianae : julianae
->nudicaudus : nudicaudus
+>nudicaudus : julianae.nudicaudus
 >julianae : julianae
->steerii : steerii
->x : arboreus<nudicaudus, steerii>
+>steerii : julianae.steerii
+>x : daubentonii.arboreus<julianae.nudicaudus, julianae.steerii>
 >daubentonii : daubentonii
->arboreus : arboreus<T0, T1>
+>arboreus : daubentonii.arboreus<T0, T1>
 >julianae : julianae
->nudicaudus : nudicaudus
+>nudicaudus : julianae.nudicaudus
 >julianae : julianae
->steerii : steerii
+>steerii : julianae.steerii
 >() => { var y = this; } : () => void
 >y : amphibius<T0, T1>
 >this : amphibius<T0, T1>
->x : arboreus<nudicaudus, steerii>
+>x : daubentonii.arboreus<julianae.nudicaudus, julianae.steerii>
     }
     export class fundatus<T0, T1> extends lutreolus.schlegeli {
 >fundatus : fundatus<T0, T1>
 >T0 : T0
 >T1 : T1
 >lutreolus : lutreolus
->schlegeli : schlegeli
+>schlegeli : lutreolus.schlegeli
 
         crassulus(): nigra.gracilis<provocax.melanoleuca, provocax.melanoleuca> { var x: nigra.gracilis<provocax.melanoleuca, provocax.melanoleuca>; () => { var y = this; }; return x; }
->crassulus : () => gracilis<melanoleuca, melanoleuca>
+>crassulus : () => nigra.gracilis<provocax.melanoleuca, provocax.melanoleuca>
 >nigra : nigra
->gracilis : gracilis<T0, T1>
+>gracilis : nigra.gracilis<T0, T1>
 >provocax : provocax
->melanoleuca : melanoleuca
+>melanoleuca : provocax.melanoleuca
 >provocax : provocax
->melanoleuca : melanoleuca
->x : gracilis<melanoleuca, melanoleuca>
+>melanoleuca : provocax.melanoleuca
+>x : nigra.gracilis<provocax.melanoleuca, provocax.melanoleuca>
 >nigra : nigra
->gracilis : gracilis<T0, T1>
+>gracilis : nigra.gracilis<T0, T1>
 >provocax : provocax
->melanoleuca : melanoleuca
+>melanoleuca : provocax.melanoleuca
 >provocax : provocax
->melanoleuca : melanoleuca
+>melanoleuca : provocax.melanoleuca
 >() => { var y = this; } : () => void
 >y : fundatus<T0, T1>
 >this : fundatus<T0, T1>
->x : gracilis<melanoleuca, melanoleuca>
+>x : nigra.gracilis<provocax.melanoleuca, provocax.melanoleuca>
 
         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 : () => lasiurus<amphibius<uralensis, klossii<nudicaudus, aurata>>, leptoceros<punicus, arboreus<carolinensis, caniventer>>>
+>flamarioni : () => imperfecta.lasiurus<amphibius<patas.uralensis, gabriellae.klossii<julianae.nudicaudus, dogramacii.aurata>>, sagitta.leptoceros<lutreolus.punicus, daubentonii.arboreus<quasiater.carolinensis, rionegrensis.caniventer>>>
 >imperfecta : imperfecta
->lasiurus : lasiurus<T0, T1>
+>lasiurus : imperfecta.lasiurus<T0, T1>
 >amphibius : amphibius<T0, T1>
 >patas : patas
->uralensis : uralensis
+>uralensis : patas.uralensis
 >gabriellae : gabriellae
->klossii : klossii<T0, T1>
+>klossii : gabriellae.klossii<T0, T1>
 >julianae : julianae
->nudicaudus : nudicaudus
+>nudicaudus : julianae.nudicaudus
 >dogramacii : dogramacii
->aurata : aurata
+>aurata : dogramacii.aurata
 >sagitta : sagitta
->leptoceros : leptoceros<T0, T1>
+>leptoceros : sagitta.leptoceros<T0, T1>
 >lutreolus : lutreolus
->punicus : punicus
+>punicus : lutreolus.punicus
 >daubentonii : daubentonii
->arboreus : arboreus<T0, T1>
+>arboreus : daubentonii.arboreus<T0, T1>
 >quasiater : quasiater
->carolinensis : carolinensis
+>carolinensis : quasiater.carolinensis
 >rionegrensis : rionegrensis
->caniventer : caniventer
->x : lasiurus<amphibius<uralensis, klossii<nudicaudus, aurata>>, leptoceros<punicus, arboreus<carolinensis, caniventer>>>
+>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 : imperfecta
->lasiurus : lasiurus<T0, T1>
+>lasiurus : imperfecta.lasiurus<T0, T1>
 >amphibius : amphibius<T0, T1>
 >patas : patas
->uralensis : uralensis
+>uralensis : patas.uralensis
 >gabriellae : gabriellae
->klossii : klossii<T0, T1>
+>klossii : gabriellae.klossii<T0, T1>
 >julianae : julianae
->nudicaudus : nudicaudus
+>nudicaudus : julianae.nudicaudus
 >dogramacii : dogramacii
->aurata : aurata
+>aurata : dogramacii.aurata
 >sagitta : sagitta
->leptoceros : leptoceros<T0, T1>
+>leptoceros : sagitta.leptoceros<T0, T1>
 >lutreolus : lutreolus
->punicus : punicus
+>punicus : lutreolus.punicus
 >daubentonii : daubentonii
->arboreus : arboreus<T0, T1>
+>arboreus : daubentonii.arboreus<T0, T1>
 >quasiater : quasiater
->carolinensis : carolinensis
+>carolinensis : quasiater.carolinensis
 >rionegrensis : rionegrensis
->caniventer : caniventer
+>caniventer : rionegrensis.caniventer
 >() => { var y = this; } : () => void
 >y : fundatus<T0, T1>
 >this : fundatus<T0, T1>
->x : lasiurus<amphibius<uralensis, klossii<nudicaudus, aurata>>, leptoceros<punicus, arboreus<carolinensis, caniventer>>>
+>x : imperfecta.lasiurus<amphibius<patas.uralensis, gabriellae.klossii<julianae.nudicaudus, dogramacii.aurata>>, sagitta.leptoceros<lutreolus.punicus, daubentonii.arboreus<quasiater.carolinensis, rionegrensis.caniventer>>>
 
         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 : () => marmosurus<rosalia<steerii, beisa>, lepturus>
+>mirabilis : () => macrorhinos.marmosurus<petrophilus.rosalia<julianae.steerii, lavali.beisa>, lavali.lepturus>
 >macrorhinos : macrorhinos
->marmosurus : marmosurus<T0, T1>
+>marmosurus : macrorhinos.marmosurus<T0, T1>
 >petrophilus : petrophilus
->rosalia : rosalia<T0, T1>
+>rosalia : petrophilus.rosalia<T0, T1>
 >julianae : julianae
->steerii : steerii
+>steerii : julianae.steerii
 >lavali : lavali
->beisa : beisa
+>beisa : lavali.beisa
 >lavali : lavali
->lepturus : lepturus
->x : marmosurus<rosalia<steerii, beisa>, lepturus>
+>lepturus : lavali.lepturus
+>x : macrorhinos.marmosurus<petrophilus.rosalia<julianae.steerii, lavali.beisa>, lavali.lepturus>
 >macrorhinos : macrorhinos
->marmosurus : marmosurus<T0, T1>
+>marmosurus : macrorhinos.marmosurus<T0, T1>
 >petrophilus : petrophilus
->rosalia : rosalia<T0, T1>
+>rosalia : petrophilus.rosalia<T0, T1>
 >julianae : julianae
->steerii : steerii
+>steerii : julianae.steerii
 >lavali : lavali
->beisa : beisa
+>beisa : lavali.beisa
 >lavali : lavali
->lepturus : lepturus
+>lepturus : lavali.lepturus
 >() => { var y = this; } : () => void
 >y : fundatus<T0, T1>
 >this : fundatus<T0, T1>
->x : marmosurus<rosalia<steerii, beisa>, lepturus>
+>x : macrorhinos.marmosurus<petrophilus.rosalia<julianae.steerii, lavali.beisa>, lavali.lepturus>
     }
     export class abidi<T0, T1> extends argurus.dauricus<argurus.germaini, julianae.durangae> {
 >abidi : abidi<T0, T1>
 >T0 : T0
 >T1 : T1
 >argurus : argurus
->dauricus : dauricus<T0, T1>
+>dauricus : argurus.dauricus<T0, T1>
 >argurus : argurus
->germaini : germaini
+>germaini : argurus.germaini
 >julianae : julianae
->durangae : durangae
+>durangae : julianae.durangae
 
         greyii(): trivirgatus.oconnelli { var x: trivirgatus.oconnelli; () => { var y = this; }; return x; }
->greyii : () => oconnelli
+>greyii : () => trivirgatus.oconnelli
 >trivirgatus : trivirgatus
->oconnelli : oconnelli
->x : oconnelli
+>oconnelli : trivirgatus.oconnelli
+>x : trivirgatus.oconnelli
 >trivirgatus : trivirgatus
->oconnelli : oconnelli
+>oconnelli : trivirgatus.oconnelli
 >() => { var y = this; } : () => void
 >y : abidi<T0, T1>
 >this : abidi<T0, T1>
->x : oconnelli
+>x : trivirgatus.oconnelli
 
         macedonicus(): petrophilus.minutilla { var x: petrophilus.minutilla; () => { var y = this; }; return x; }
->macedonicus : () => minutilla
+>macedonicus : () => petrophilus.minutilla
 >petrophilus : petrophilus
->minutilla : minutilla
->x : minutilla
+>minutilla : petrophilus.minutilla
+>x : petrophilus.minutilla
 >petrophilus : petrophilus
->minutilla : minutilla
+>minutilla : petrophilus.minutilla
 >() => { var y = this; } : () => void
 >y : abidi<T0, T1>
 >this : abidi<T0, T1>
->x : minutilla
+>x : petrophilus.minutilla
 
         galili(): samarensis.cahirinus<dammermani.melanops, samarensis.pallidus> { var x: samarensis.cahirinus<dammermani.melanops, samarensis.pallidus>; () => { var y = this; }; return x; }
->galili : () => cahirinus<melanops, pallidus>
+>galili : () => samarensis.cahirinus<dammermani.melanops, samarensis.pallidus>
 >samarensis : samarensis
->cahirinus : cahirinus<T0, T1>
+>cahirinus : samarensis.cahirinus<T0, T1>
 >dammermani : dammermani
->melanops : melanops
+>melanops : dammermani.melanops
 >samarensis : samarensis
->pallidus : pallidus
->x : cahirinus<melanops, pallidus>
+>pallidus : samarensis.pallidus
+>x : samarensis.cahirinus<dammermani.melanops, samarensis.pallidus>
 >samarensis : samarensis
->cahirinus : cahirinus<T0, T1>
+>cahirinus : samarensis.cahirinus<T0, T1>
 >dammermani : dammermani
->melanops : melanops
+>melanops : dammermani.melanops
 >samarensis : samarensis
->pallidus : pallidus
+>pallidus : samarensis.pallidus
 >() => { var y = this; } : () => void
 >y : abidi<T0, T1>
 >this : abidi<T0, T1>
->x : cahirinus<melanops, pallidus>
+>x : samarensis.cahirinus<dammermani.melanops, samarensis.pallidus>
 
         thierryi(): dogramacii.robustulus { var x: dogramacii.robustulus; () => { var y = this; }; return x; }
->thierryi : () => robustulus
+>thierryi : () => dogramacii.robustulus
 >dogramacii : dogramacii
->robustulus : robustulus
->x : robustulus
+>robustulus : dogramacii.robustulus
+>x : dogramacii.robustulus
 >dogramacii : dogramacii
->robustulus : robustulus
+>robustulus : dogramacii.robustulus
 >() => { var y = this; } : () => void
 >y : abidi<T0, T1>
 >this : abidi<T0, T1>
->x : robustulus
+>x : dogramacii.robustulus
 
         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 : () => lasiurus<acariensis, coludo<oreas, marcanoi>>
+>ega : () => imperfecta.lasiurus<julianae.acariensis, howi.coludo<argurus.oreas, howi.marcanoi>>
 >imperfecta : imperfecta
->lasiurus : lasiurus<T0, T1>
+>lasiurus : imperfecta.lasiurus<T0, T1>
 >julianae : julianae
->acariensis : acariensis
+>acariensis : julianae.acariensis
 >howi : howi
->coludo : coludo<T0, T1>
+>coludo : howi.coludo<T0, T1>
 >argurus : argurus
->oreas : oreas
+>oreas : argurus.oreas
 >howi : howi
->marcanoi : marcanoi
->x : lasiurus<acariensis, coludo<oreas, marcanoi>>
+>marcanoi : howi.marcanoi
+>x : imperfecta.lasiurus<julianae.acariensis, howi.coludo<argurus.oreas, howi.marcanoi>>
 >imperfecta : imperfecta
->lasiurus : lasiurus<T0, T1>
+>lasiurus : imperfecta.lasiurus<T0, T1>
 >julianae : julianae
->acariensis : acariensis
+>acariensis : julianae.acariensis
 >howi : howi
->coludo : coludo<T0, T1>
+>coludo : howi.coludo<T0, T1>
 >argurus : argurus
->oreas : oreas
+>oreas : argurus.oreas
 >howi : howi
->marcanoi : marcanoi
+>marcanoi : howi.marcanoi
 >() => { var y = this; } : () => void
 >y : abidi<T0, T1>
 >this : abidi<T0, T1>
->x : lasiurus<acariensis, coludo<oreas, marcanoi>>
+>x : imperfecta.lasiurus<julianae.acariensis, howi.coludo<argurus.oreas, howi.marcanoi>>
     }
 }
 module quasiater {
->quasiater : typeof quasiater
+>quasiater : quasiater
 
     export class carolinensis {
 >carolinensis : carolinensis
 
         concinna(): rendalli.zuluensis { var x: rendalli.zuluensis; () => { var y = this; }; return x; }
->concinna : () => zuluensis
+>concinna : () => rendalli.zuluensis
 >rendalli : rendalli
->zuluensis : zuluensis
->x : zuluensis
+>zuluensis : rendalli.zuluensis
+>x : rendalli.zuluensis
 >rendalli : rendalli
->zuluensis : zuluensis
+>zuluensis : rendalli.zuluensis
 >() => { var y = this; } : () => void
 >y : carolinensis
 >this : carolinensis
->x : zuluensis
+>x : rendalli.zuluensis
 
         aeneus(): howi.marcanoi { var x: howi.marcanoi; () => { var y = this; }; return x; }
->aeneus : () => marcanoi
+>aeneus : () => howi.marcanoi
 >howi : howi
->marcanoi : marcanoi
->x : marcanoi
+>marcanoi : howi.marcanoi
+>x : howi.marcanoi
 >howi : howi
->marcanoi : marcanoi
+>marcanoi : howi.marcanoi
 >() => { var y = this; } : () => void
 >y : carolinensis
 >this : carolinensis
->x : marcanoi
+>x : howi.marcanoi
 
         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 : () => netscheri<lotor<oreas, beisa>, lepturus>
+>aloysiisabaudiae : () => argurus.netscheri<trivirgatus.lotor<argurus.oreas, lavali.beisa>, lavali.lepturus>
 >argurus : argurus
->netscheri : netscheri<T0, T1>
+>netscheri : argurus.netscheri<T0, T1>
 >trivirgatus : trivirgatus
->lotor : lotor<T0, T1>
+>lotor : trivirgatus.lotor<T0, T1>
 >argurus : argurus
->oreas : oreas
+>oreas : argurus.oreas
 >lavali : lavali
->beisa : beisa
+>beisa : lavali.beisa
 >lavali : lavali
->lepturus : lepturus
->x : netscheri<lotor<oreas, beisa>, lepturus>
+>lepturus : lavali.lepturus
+>x : argurus.netscheri<trivirgatus.lotor<argurus.oreas, lavali.beisa>, lavali.lepturus>
 >argurus : argurus
->netscheri : netscheri<T0, T1>
+>netscheri : argurus.netscheri<T0, T1>
 >trivirgatus : trivirgatus
->lotor : lotor<T0, T1>
+>lotor : trivirgatus.lotor<T0, T1>
 >argurus : argurus
->oreas : oreas
+>oreas : argurus.oreas
 >lavali : lavali
->beisa : beisa
+>beisa : lavali.beisa
 >lavali : lavali
->lepturus : lepturus
+>lepturus : lavali.lepturus
 >() => { var y = this; } : () => void
 >y : carolinensis
 >this : carolinensis
->x : netscheri<lotor<oreas, beisa>, lepturus>
+>x : argurus.netscheri<trivirgatus.lotor<argurus.oreas, lavali.beisa>, lavali.lepturus>
 
         tenellus(): julianae.nudicaudus { var x: julianae.nudicaudus; () => { var y = this; }; return x; }
->tenellus : () => nudicaudus
+>tenellus : () => julianae.nudicaudus
 >julianae : julianae
->nudicaudus : nudicaudus
->x : nudicaudus
+>nudicaudus : julianae.nudicaudus
+>x : julianae.nudicaudus
 >julianae : julianae
->nudicaudus : nudicaudus
+>nudicaudus : julianae.nudicaudus
 >() => { var y = this; } : () => void
 >y : carolinensis
 >this : carolinensis
->x : nudicaudus
+>x : julianae.nudicaudus
 
         andium(): lavali.beisa { var x: lavali.beisa; () => { var y = this; }; return x; }
->andium : () => beisa
+>andium : () => lavali.beisa
 >lavali : lavali
->beisa : beisa
->x : beisa
+>beisa : lavali.beisa
+>x : lavali.beisa
 >lavali : lavali
->beisa : beisa
+>beisa : lavali.beisa
 >() => { var y = this; } : () => void
 >y : carolinensis
 >this : carolinensis
->x : beisa
+>x : lavali.beisa
 
         persephone(): panglima.fundatus<samarensis.pallidus, sagitta.stolzmanni> { var x: panglima.fundatus<samarensis.pallidus, sagitta.stolzmanni>; () => { var y = this; }; return x; }
->persephone : () => fundatus<pallidus, stolzmanni>
+>persephone : () => panglima.fundatus<samarensis.pallidus, sagitta.stolzmanni>
 >panglima : panglima
->fundatus : fundatus<T0, T1>
+>fundatus : panglima.fundatus<T0, T1>
 >samarensis : samarensis
->pallidus : pallidus
+>pallidus : samarensis.pallidus
 >sagitta : sagitta
->stolzmanni : stolzmanni
->x : fundatus<pallidus, stolzmanni>
+>stolzmanni : sagitta.stolzmanni
+>x : panglima.fundatus<samarensis.pallidus, sagitta.stolzmanni>
 >panglima : panglima
->fundatus : fundatus<T0, T1>
+>fundatus : panglima.fundatus<T0, T1>
 >samarensis : samarensis
->pallidus : pallidus
+>pallidus : samarensis.pallidus
 >sagitta : sagitta
->stolzmanni : stolzmanni
+>stolzmanni : sagitta.stolzmanni
 >() => { var y = this; } : () => void
 >y : carolinensis
 >this : carolinensis
->x : fundatus<pallidus, stolzmanni>
+>x : panglima.fundatus<samarensis.pallidus, sagitta.stolzmanni>
 
         patrizii(): Lanthanum.megalonyx { var x: Lanthanum.megalonyx; () => { var y = this; }; return x; }
->patrizii : () => megalonyx
+>patrizii : () => Lanthanum.megalonyx
 >Lanthanum : Lanthanum
->megalonyx : megalonyx
->x : megalonyx
+>megalonyx : Lanthanum.megalonyx
+>x : Lanthanum.megalonyx
 >Lanthanum : Lanthanum
->megalonyx : megalonyx
+>megalonyx : Lanthanum.megalonyx
 >() => { var y = this; } : () => void
 >y : carolinensis
 >this : carolinensis
->x : megalonyx
+>x : Lanthanum.megalonyx
     }
 }
 module minutus {
->minutus : typeof minutus
+>minutus : minutus
 
     export class himalayana<T0, T1> extends lutreolus.punicus {
 >himalayana : himalayana<T0, T1>
 >T0 : T0
 >T1 : T1
 >lutreolus : lutreolus
->punicus : punicus
+>punicus : lutreolus.punicus
 
         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 : () => netscheri<lepturus, dauricus<oreas, carolinensis>>
+>simoni : () => argurus.netscheri<lavali.lepturus, argurus.dauricus<argurus.oreas, quasiater.carolinensis>>
 >argurus : argurus
->netscheri : netscheri<T0, T1>
+>netscheri : argurus.netscheri<T0, T1>
 >lavali : lavali
->lepturus : lepturus
+>lepturus : lavali.lepturus
 >argurus : argurus
->dauricus : dauricus<T0, T1>
+>dauricus : argurus.dauricus<T0, T1>
 >argurus : argurus
->oreas : oreas
+>oreas : argurus.oreas
 >quasiater : quasiater
->carolinensis : carolinensis
->x : netscheri<lepturus, dauricus<oreas, carolinensis>>
+>carolinensis : quasiater.carolinensis
+>x : argurus.netscheri<lavali.lepturus, argurus.dauricus<argurus.oreas, quasiater.carolinensis>>
 >argurus : argurus
->netscheri : netscheri<T0, T1>
+>netscheri : argurus.netscheri<T0, T1>
 >lavali : lavali
->lepturus : lepturus
+>lepturus : lavali.lepturus
 >argurus : argurus
->dauricus : dauricus<T0, T1>
+>dauricus : argurus.dauricus<T0, T1>
 >argurus : argurus
->oreas : oreas
+>oreas : argurus.oreas
 >quasiater : quasiater
->carolinensis : carolinensis
+>carolinensis : quasiater.carolinensis
 >() => { var y = this; } : () => void
 >y : himalayana<T0, T1>
 >this : himalayana<T0, T1>
->x : netscheri<lepturus, dauricus<oreas, carolinensis>>
+>x : argurus.netscheri<lavali.lepturus, argurus.dauricus<argurus.oreas, quasiater.carolinensis>>
 
         lobata(): samarensis.pallidus { var x: samarensis.pallidus; () => { var y = this; }; return x; }
->lobata : () => pallidus
+>lobata : () => samarensis.pallidus
 >samarensis : samarensis
->pallidus : pallidus
->x : pallidus
+>pallidus : samarensis.pallidus
+>x : samarensis.pallidus
 >samarensis : samarensis
->pallidus : pallidus
+>pallidus : samarensis.pallidus
 >() => { var y = this; } : () => void
 >y : himalayana<T0, T1>
 >this : himalayana<T0, T1>
->x : pallidus
+>x : samarensis.pallidus
 
         rusticus(): dogramacii.aurata { var x: dogramacii.aurata; () => { var y = this; }; return x; }
->rusticus : () => aurata
+>rusticus : () => dogramacii.aurata
 >dogramacii : dogramacii
->aurata : aurata
->x : aurata
+>aurata : dogramacii.aurata
+>x : dogramacii.aurata
 >dogramacii : dogramacii
->aurata : aurata
+>aurata : dogramacii.aurata
 >() => { var y = this; } : () => void
 >y : himalayana<T0, T1>
 >this : himalayana<T0, T1>
->x : aurata
+>x : dogramacii.aurata
 
         latona(): daubentonii.nesiotes<dammermani.melanops, Lanthanum.megalonyx> { var x: daubentonii.nesiotes<dammermani.melanops, Lanthanum.megalonyx>; () => { var y = this; }; return x; }
->latona : () => nesiotes<melanops, megalonyx>
+>latona : () => daubentonii.nesiotes<dammermani.melanops, Lanthanum.megalonyx>
 >daubentonii : daubentonii
->nesiotes : nesiotes<T0, T1>
+>nesiotes : daubentonii.nesiotes<T0, T1>
 >dammermani : dammermani
->melanops : melanops
+>melanops : dammermani.melanops
 >Lanthanum : Lanthanum
->megalonyx : megalonyx
->x : nesiotes<melanops, megalonyx>
+>megalonyx : Lanthanum.megalonyx
+>x : daubentonii.nesiotes<dammermani.melanops, Lanthanum.megalonyx>
 >daubentonii : daubentonii
->nesiotes : nesiotes<T0, T1>
+>nesiotes : daubentonii.nesiotes<T0, T1>
 >dammermani : dammermani
->melanops : melanops
+>melanops : dammermani.melanops
 >Lanthanum : Lanthanum
->megalonyx : megalonyx
+>megalonyx : Lanthanum.megalonyx
 >() => { var y = this; } : () => void
 >y : himalayana<T0, T1>
 >this : himalayana<T0, T1>
->x : nesiotes<melanops, megalonyx>
+>x : daubentonii.nesiotes<dammermani.melanops, Lanthanum.megalonyx>
 
         famulus(): patas.uralensis { var x: patas.uralensis; () => { var y = this; }; return x; }
->famulus : () => uralensis
+>famulus : () => patas.uralensis
 >patas : patas
->uralensis : uralensis
->x : uralensis
+>uralensis : patas.uralensis
+>x : patas.uralensis
 >patas : patas
->uralensis : uralensis
+>uralensis : patas.uralensis
 >() => { var y = this; } : () => void
 >y : himalayana<T0, T1>
 >this : himalayana<T0, T1>
->x : uralensis
+>x : patas.uralensis
 
         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<oreas, fundatus<amicus, foina>>
+>flaviceps : () => inez<argurus.oreas, panglima.fundatus<gabriellae.amicus, lutreolus.foina>>
 >minutus : minutus
 >inez : inez<T0, T1>
 >argurus : argurus
->oreas : oreas
+>oreas : argurus.oreas
 >panglima : panglima
->fundatus : fundatus<T0, T1>
+>fundatus : panglima.fundatus<T0, T1>
 >gabriellae : gabriellae
->amicus : amicus
+>amicus : gabriellae.amicus
 >lutreolus : lutreolus
->foina : foina
->x : inez<oreas, fundatus<amicus, foina>>
+>foina : lutreolus.foina
+>x : inez<argurus.oreas, panglima.fundatus<gabriellae.amicus, lutreolus.foina>>
 >minutus : minutus
 >inez : inez<T0, T1>
 >argurus : argurus
->oreas : oreas
+>oreas : argurus.oreas
 >panglima : panglima
->fundatus : fundatus<T0, T1>
+>fundatus : panglima.fundatus<T0, T1>
 >gabriellae : gabriellae
->amicus : amicus
+>amicus : gabriellae.amicus
 >lutreolus : lutreolus
->foina : foina
+>foina : lutreolus.foina
 >() => { var y = this; } : () => void
 >y : himalayana<T0, T1>
 >this : himalayana<T0, T1>
->x : inez<oreas, fundatus<amicus, foina>>
+>x : inez<argurus.oreas, panglima.fundatus<gabriellae.amicus, lutreolus.foina>>
 
         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 : () => dolichurus<schlegeli, sarasinorum<jugularis, subspinosus>>
+>paradoxolophus : () => nigra.dolichurus<lutreolus.schlegeli, chrysaeolus.sarasinorum<Lanthanum.jugularis, imperfecta.subspinosus>>
 >nigra : nigra
->dolichurus : dolichurus<T0, T1>
+>dolichurus : nigra.dolichurus<T0, T1>
 >lutreolus : lutreolus
->schlegeli : schlegeli
+>schlegeli : lutreolus.schlegeli
 >chrysaeolus : chrysaeolus
->sarasinorum : sarasinorum<T0, T1>
+>sarasinorum : chrysaeolus.sarasinorum<T0, T1>
 >Lanthanum : Lanthanum
->jugularis : jugularis
+>jugularis : Lanthanum.jugularis
 >imperfecta : imperfecta
->subspinosus : subspinosus
->x : dolichurus<schlegeli, sarasinorum<jugularis, subspinosus>>
+>subspinosus : imperfecta.subspinosus
+>x : nigra.dolichurus<lutreolus.schlegeli, chrysaeolus.sarasinorum<Lanthanum.jugularis, imperfecta.subspinosus>>
 >nigra : nigra
->dolichurus : dolichurus<T0, T1>
+>dolichurus : nigra.dolichurus<T0, T1>
 >lutreolus : lutreolus
->schlegeli : schlegeli
+>schlegeli : lutreolus.schlegeli
 >chrysaeolus : chrysaeolus
->sarasinorum : sarasinorum<T0, T1>
+>sarasinorum : chrysaeolus.sarasinorum<T0, T1>
 >Lanthanum : Lanthanum
->jugularis : jugularis
+>jugularis : Lanthanum.jugularis
 >imperfecta : imperfecta
->subspinosus : subspinosus
+>subspinosus : imperfecta.subspinosus
 >() => { var y = this; } : () => void
 >y : himalayana<T0, T1>
 >this : himalayana<T0, T1>
->x : dolichurus<schlegeli, sarasinorum<jugularis, subspinosus>>
+>x : nigra.dolichurus<lutreolus.schlegeli, chrysaeolus.sarasinorum<Lanthanum.jugularis, imperfecta.subspinosus>>
 
         Osmium(): lavali.wilsoni { var x: lavali.wilsoni; () => { var y = this; }; return x; }
->Osmium : () => wilsoni
+>Osmium : () => lavali.wilsoni
 >lavali : lavali
->wilsoni : wilsoni
->x : wilsoni
+>wilsoni : lavali.wilsoni
+>x : lavali.wilsoni
 >lavali : lavali
->wilsoni : wilsoni
+>wilsoni : lavali.wilsoni
 >() => { var y = this; } : () => void
 >y : himalayana<T0, T1>
 >this : himalayana<T0, T1>
->x : wilsoni
+>x : lavali.wilsoni
 
         vulgaris(): Lanthanum.nitidus<lavali.lepturus, julianae.acariensis> { var x: Lanthanum.nitidus<lavali.lepturus, julianae.acariensis>; () => { var y = this; }; return x; }
->vulgaris : () => nitidus<lepturus, acariensis>
+>vulgaris : () => Lanthanum.nitidus<lavali.lepturus, julianae.acariensis>
 >Lanthanum : Lanthanum
->nitidus : nitidus<T0, T1>
+>nitidus : Lanthanum.nitidus<T0, T1>
 >lavali : lavali
->lepturus : lepturus
+>lepturus : lavali.lepturus
 >julianae : julianae
->acariensis : acariensis
->x : nitidus<lepturus, acariensis>
+>acariensis : julianae.acariensis
+>x : Lanthanum.nitidus<lavali.lepturus, julianae.acariensis>
 >Lanthanum : Lanthanum
->nitidus : nitidus<T0, T1>
+>nitidus : Lanthanum.nitidus<T0, T1>
 >lavali : lavali
->lepturus : lepturus
+>lepturus : lavali.lepturus
 >julianae : julianae
->acariensis : acariensis
+>acariensis : julianae.acariensis
 >() => { var y = this; } : () => void
 >y : himalayana<T0, T1>
 >this : himalayana<T0, T1>
->x : nitidus<lepturus, acariensis>
+>x : Lanthanum.nitidus<lavali.lepturus, julianae.acariensis>
 
         betsileoensis(): panglima.amphibius<caurinus.megaphyllus, lavali.lepturus> { var x: panglima.amphibius<caurinus.megaphyllus, lavali.lepturus>; () => { var y = this; }; return x; }
->betsileoensis : () => amphibius<megaphyllus, lepturus>
+>betsileoensis : () => panglima.amphibius<caurinus.megaphyllus, lavali.lepturus>
 >panglima : panglima
->amphibius : amphibius<T0, T1>
+>amphibius : panglima.amphibius<T0, T1>
 >caurinus : caurinus
->megaphyllus : megaphyllus
+>megaphyllus : caurinus.megaphyllus
 >lavali : lavali
->lepturus : lepturus
->x : amphibius<megaphyllus, lepturus>
+>lepturus : lavali.lepturus
+>x : panglima.amphibius<caurinus.megaphyllus, lavali.lepturus>
 >panglima : panglima
->amphibius : amphibius<T0, T1>
+>amphibius : panglima.amphibius<T0, T1>
 >caurinus : caurinus
->megaphyllus : megaphyllus
+>megaphyllus : caurinus.megaphyllus
 >lavali : lavali
->lepturus : lepturus
+>lepturus : lavali.lepturus
 >() => { var y = this; } : () => void
 >y : himalayana<T0, T1>
 >this : himalayana<T0, T1>
->x : amphibius<megaphyllus, lepturus>
+>x : panglima.amphibius<caurinus.megaphyllus, lavali.lepturus>
 
         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 : () => gilbertii<klossii<konganensis, carolinensis>, melanoleuca>
+>vespuccii : () => argurus.gilbertii<gabriellae.klossii<macrorhinos.konganensis, quasiater.carolinensis>, provocax.melanoleuca>
 >argurus : argurus
->gilbertii : gilbertii<T0, T1>
+>gilbertii : argurus.gilbertii<T0, T1>
 >gabriellae : gabriellae
->klossii : klossii<T0, T1>
+>klossii : gabriellae.klossii<T0, T1>
 >macrorhinos : macrorhinos
->konganensis : konganensis
+>konganensis : macrorhinos.konganensis
 >quasiater : quasiater
->carolinensis : carolinensis
+>carolinensis : quasiater.carolinensis
 >provocax : provocax
->melanoleuca : melanoleuca
->x : gilbertii<klossii<konganensis, carolinensis>, melanoleuca>
+>melanoleuca : provocax.melanoleuca
+>x : argurus.gilbertii<gabriellae.klossii<macrorhinos.konganensis, quasiater.carolinensis>, provocax.melanoleuca>
 >argurus : argurus
->gilbertii : gilbertii<T0, T1>
+>gilbertii : argurus.gilbertii<T0, T1>
 >gabriellae : gabriellae
->klossii : klossii<T0, T1>
+>klossii : gabriellae.klossii<T0, T1>
 >macrorhinos : macrorhinos
->konganensis : konganensis
+>konganensis : macrorhinos.konganensis
 >quasiater : quasiater
->carolinensis : carolinensis
+>carolinensis : quasiater.carolinensis
 >provocax : provocax
->melanoleuca : melanoleuca
+>melanoleuca : provocax.melanoleuca
 >() => { var y = this; } : () => void
 >y : himalayana<T0, T1>
 >this : himalayana<T0, T1>
->x : gilbertii<klossii<konganensis, carolinensis>, melanoleuca>
+>x : argurus.gilbertii<gabriellae.klossii<macrorhinos.konganensis, quasiater.carolinensis>, provocax.melanoleuca>
 
         olympus(): Lanthanum.megalonyx { var x: Lanthanum.megalonyx; () => { var y = this; }; return x; }
->olympus : () => megalonyx
+>olympus : () => Lanthanum.megalonyx
 >Lanthanum : Lanthanum
->megalonyx : megalonyx
->x : megalonyx
+>megalonyx : Lanthanum.megalonyx
+>x : Lanthanum.megalonyx
 >Lanthanum : Lanthanum
->megalonyx : megalonyx
+>megalonyx : Lanthanum.megalonyx
 >() => { var y = this; } : () => void
 >y : himalayana<T0, T1>
 >this : himalayana<T0, T1>
->x : megalonyx
+>x : Lanthanum.megalonyx
     }
 }
 module caurinus {
->caurinus : typeof caurinus
+>caurinus : caurinus
 
     export class mahaganus<T0, T1> extends panglima.fundatus<quasiater.carolinensis, macrorhinos.daphaenodon> {
 >mahaganus : mahaganus<T0, T1>
 >T0 : T0
 >T1 : T1
 >panglima : panglima
->fundatus : fundatus<T0, T1>
+>fundatus : panglima.fundatus<T0, T1>
 >quasiater : quasiater
->carolinensis : carolinensis
+>carolinensis : quasiater.carolinensis
 >macrorhinos : macrorhinos
->daphaenodon : daphaenodon
+>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 : () => hector<sumatrana, marmosurus<melanops, mahaganus<nudicaudus, otion>>>
+>martiniquensis : () => ruatanica.hector<julianae.sumatrana, macrorhinos.marmosurus<dammermani.melanops, mahaganus<julianae.nudicaudus, lavali.otion>>>
 >ruatanica : ruatanica
->hector : hector<T0, T1>
+>hector : ruatanica.hector<T0, T1>
 >julianae : julianae
->sumatrana : sumatrana
+>sumatrana : julianae.sumatrana
 >macrorhinos : macrorhinos
->marmosurus : marmosurus<T0, T1>
+>marmosurus : macrorhinos.marmosurus<T0, T1>
 >dammermani : dammermani
->melanops : melanops
+>melanops : dammermani.melanops
 >caurinus : caurinus
 >mahaganus : mahaganus<T0, T1>
 >julianae : julianae
->nudicaudus : nudicaudus
+>nudicaudus : julianae.nudicaudus
 >lavali : lavali
->otion : otion
->x : hector<sumatrana, marmosurus<melanops, mahaganus<nudicaudus, otion>>>
+>otion : lavali.otion
+>x : ruatanica.hector<julianae.sumatrana, macrorhinos.marmosurus<dammermani.melanops, mahaganus<julianae.nudicaudus, lavali.otion>>>
 >ruatanica : ruatanica
->hector : hector<T0, T1>
+>hector : ruatanica.hector<T0, T1>
 >julianae : julianae
->sumatrana : sumatrana
+>sumatrana : julianae.sumatrana
 >macrorhinos : macrorhinos
->marmosurus : marmosurus<T0, T1>
+>marmosurus : macrorhinos.marmosurus<T0, T1>
 >dammermani : dammermani
->melanops : melanops
+>melanops : dammermani.melanops
 >caurinus : caurinus
 >mahaganus : mahaganus<T0, T1>
 >julianae : julianae
->nudicaudus : nudicaudus
+>nudicaudus : julianae.nudicaudus
 >lavali : lavali
->otion : otion
+>otion : lavali.otion
 >() => { var y = this; } : () => void
 >y : mahaganus<T0, T1>
 >this : mahaganus<T0, T1>
->x : hector<sumatrana, marmosurus<melanops, mahaganus<nudicaudus, otion>>>
+>x : ruatanica.hector<julianae.sumatrana, macrorhinos.marmosurus<dammermani.melanops, mahaganus<julianae.nudicaudus, lavali.otion>>>
 
         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 : () => pelurus<aurata, inez<inez<stolzmanni, melanops>, falconeri>>
+>devius : () => samarensis.pelurus<dogramacii.aurata, minutus.inez<minutus.inez<sagitta.stolzmanni, dammermani.melanops>, trivirgatus.falconeri>>
 >samarensis : samarensis
->pelurus : pelurus<T0, T1>
+>pelurus : samarensis.pelurus<T0, T1>
 >dogramacii : dogramacii
->aurata : aurata
+>aurata : dogramacii.aurata
 >minutus : minutus
->inez : inez<T0, T1>
+>inez : minutus.inez<T0, T1>
 >minutus : minutus
->inez : inez<T0, T1>
+>inez : minutus.inez<T0, T1>
 >sagitta : sagitta
->stolzmanni : stolzmanni
+>stolzmanni : sagitta.stolzmanni
 >dammermani : dammermani
->melanops : melanops
+>melanops : dammermani.melanops
 >trivirgatus : trivirgatus
->falconeri : falconeri
->x : pelurus<aurata, inez<inez<stolzmanni, melanops>, falconeri>>
+>falconeri : trivirgatus.falconeri
+>x : samarensis.pelurus<dogramacii.aurata, minutus.inez<minutus.inez<sagitta.stolzmanni, dammermani.melanops>, trivirgatus.falconeri>>
 >samarensis : samarensis
->pelurus : pelurus<T0, T1>
+>pelurus : samarensis.pelurus<T0, T1>
 >dogramacii : dogramacii
->aurata : aurata
+>aurata : dogramacii.aurata
 >minutus : minutus
->inez : inez<T0, T1>
+>inez : minutus.inez<T0, T1>
 >minutus : minutus
->inez : inez<T0, T1>
+>inez : minutus.inez<T0, T1>
 >sagitta : sagitta
->stolzmanni : stolzmanni
+>stolzmanni : sagitta.stolzmanni
 >dammermani : dammermani
->melanops : melanops
+>melanops : dammermani.melanops
 >trivirgatus : trivirgatus
->falconeri : falconeri
+>falconeri : trivirgatus.falconeri
 >() => { var y = this; } : () => void
 >y : mahaganus<T0, T1>
 >this : mahaganus<T0, T1>
->x : pelurus<aurata, inez<inez<stolzmanni, melanops>, falconeri>>
+>x : samarensis.pelurus<dogramacii.aurata, minutus.inez<minutus.inez<sagitta.stolzmanni, dammermani.melanops>, trivirgatus.falconeri>>
 
         masalai(): argurus.oreas { var x: argurus.oreas; () => { var y = this; }; return x; }
->masalai : () => oreas
+>masalai : () => argurus.oreas
 >argurus : argurus
->oreas : oreas
->x : oreas
+>oreas : argurus.oreas
+>x : argurus.oreas
 >argurus : argurus
->oreas : oreas
+>oreas : argurus.oreas
 >() => { var y = this; } : () => void
 >y : mahaganus<T0, T1>
 >this : mahaganus<T0, T1>
->x : oreas
+>x : argurus.oreas
 
         kathleenae(): nigra.dolichurus<patas.uralensis, caurinus.psilurus> { var x: nigra.dolichurus<patas.uralensis, caurinus.psilurus>; () => { var y = this; }; return x; }
->kathleenae : () => dolichurus<uralensis, psilurus>
+>kathleenae : () => nigra.dolichurus<patas.uralensis, psilurus>
 >nigra : nigra
->dolichurus : dolichurus<T0, T1>
+>dolichurus : nigra.dolichurus<T0, T1>
 >patas : patas
->uralensis : uralensis
+>uralensis : patas.uralensis
 >caurinus : caurinus
 >psilurus : psilurus
->x : dolichurus<uralensis, psilurus>
+>x : nigra.dolichurus<patas.uralensis, psilurus>
 >nigra : nigra
->dolichurus : dolichurus<T0, T1>
+>dolichurus : nigra.dolichurus<T0, T1>
 >patas : patas
->uralensis : uralensis
+>uralensis : patas.uralensis
 >caurinus : caurinus
 >psilurus : psilurus
 >() => { var y = this; } : () => void
 >y : mahaganus<T0, T1>
 >this : mahaganus<T0, T1>
->x : dolichurus<uralensis, psilurus>
+>x : nigra.dolichurus<patas.uralensis, psilurus>
 
         simulus(): gabriellae.echinatus { var x: gabriellae.echinatus; () => { var y = this; }; return x; }
->simulus : () => echinatus
+>simulus : () => gabriellae.echinatus
 >gabriellae : gabriellae
->echinatus : echinatus
->x : echinatus
+>echinatus : gabriellae.echinatus
+>x : gabriellae.echinatus
 >gabriellae : gabriellae
->echinatus : echinatus
+>echinatus : gabriellae.echinatus
 >() => { var y = this; } : () => void
 >y : mahaganus<T0, T1>
 >this : mahaganus<T0, T1>
->x : echinatus
+>x : gabriellae.echinatus
 
         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<echinatus, rosalia<megalonyx, abidi<kaiseri, wilsoni>>>
+>nigrovittatus : () => mahaganus<gabriellae.echinatus, petrophilus.rosalia<Lanthanum.megalonyx, panglima.abidi<dogramacii.kaiseri, lavali.wilsoni>>>
 >caurinus : caurinus
 >mahaganus : mahaganus<T0, T1>
 >gabriellae : gabriellae
->echinatus : echinatus
+>echinatus : gabriellae.echinatus
 >petrophilus : petrophilus
->rosalia : rosalia<T0, T1>
+>rosalia : petrophilus.rosalia<T0, T1>
 >Lanthanum : Lanthanum
->megalonyx : megalonyx
+>megalonyx : Lanthanum.megalonyx
 >panglima : panglima
->abidi : abidi<T0, T1>
+>abidi : panglima.abidi<T0, T1>
 >dogramacii : dogramacii
->kaiseri : kaiseri
+>kaiseri : dogramacii.kaiseri
 >lavali : lavali
->wilsoni : wilsoni
->x : mahaganus<echinatus, rosalia<megalonyx, abidi<kaiseri, wilsoni>>>
+>wilsoni : lavali.wilsoni
+>x : mahaganus<gabriellae.echinatus, petrophilus.rosalia<Lanthanum.megalonyx, panglima.abidi<dogramacii.kaiseri, lavali.wilsoni>>>
 >caurinus : caurinus
 >mahaganus : mahaganus<T0, T1>
 >gabriellae : gabriellae
->echinatus : echinatus
+>echinatus : gabriellae.echinatus
 >petrophilus : petrophilus
->rosalia : rosalia<T0, T1>
+>rosalia : petrophilus.rosalia<T0, T1>
 >Lanthanum : Lanthanum
->megalonyx : megalonyx
+>megalonyx : Lanthanum.megalonyx
 >panglima : panglima
->abidi : abidi<T0, T1>
+>abidi : panglima.abidi<T0, T1>
 >dogramacii : dogramacii
->kaiseri : kaiseri
+>kaiseri : dogramacii.kaiseri
 >lavali : lavali
->wilsoni : wilsoni
+>wilsoni : lavali.wilsoni
 >() => { var y = this; } : () => void
 >y : mahaganus<T0, T1>
 >this : mahaganus<T0, T1>
->x : mahaganus<echinatus, rosalia<megalonyx, abidi<kaiseri, wilsoni>>>
+>x : mahaganus<gabriellae.echinatus, petrophilus.rosalia<Lanthanum.megalonyx, panglima.abidi<dogramacii.kaiseri, lavali.wilsoni>>>
 
         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 : () => klossii<coludo<lepturus, punicus>, melanops>
+>senegalensis : () => gabriellae.klossii<howi.coludo<lavali.lepturus, lutreolus.punicus>, dammermani.melanops>
 >gabriellae : gabriellae
->klossii : klossii<T0, T1>
+>klossii : gabriellae.klossii<T0, T1>
 >howi : howi
->coludo : coludo<T0, T1>
+>coludo : howi.coludo<T0, T1>
 >lavali : lavali
->lepturus : lepturus
+>lepturus : lavali.lepturus
 >lutreolus : lutreolus
->punicus : punicus
+>punicus : lutreolus.punicus
 >dammermani : dammermani
->melanops : melanops
->x : klossii<coludo<lepturus, punicus>, melanops>
+>melanops : dammermani.melanops
+>x : gabriellae.klossii<howi.coludo<lavali.lepturus, lutreolus.punicus>, dammermani.melanops>
 >gabriellae : gabriellae
->klossii : klossii<T0, T1>
+>klossii : gabriellae.klossii<T0, T1>
 >howi : howi
->coludo : coludo<T0, T1>
+>coludo : howi.coludo<T0, T1>
 >lavali : lavali
->lepturus : lepturus
+>lepturus : lavali.lepturus
 >lutreolus : lutreolus
->punicus : punicus
+>punicus : lutreolus.punicus
 >dammermani : dammermani
->melanops : melanops
+>melanops : dammermani.melanops
 >() => { var y = this; } : () => void
 >y : mahaganus<T0, T1>
 >this : mahaganus<T0, T1>
->x : klossii<coludo<lepturus, punicus>, melanops>
+>x : gabriellae.klossii<howi.coludo<lavali.lepturus, lutreolus.punicus>, dammermani.melanops>
 
         acticola(): argurus.luctuosa { var x: argurus.luctuosa; () => { var y = this; }; return x; }
->acticola : () => luctuosa
+>acticola : () => argurus.luctuosa
 >argurus : argurus
->luctuosa : luctuosa
->x : luctuosa
+>luctuosa : argurus.luctuosa
+>x : argurus.luctuosa
 >argurus : argurus
->luctuosa : luctuosa
+>luctuosa : argurus.luctuosa
 >() => { var y = this; } : () => void
 >y : mahaganus<T0, T1>
 >this : mahaganus<T0, T1>
->x : luctuosa
+>x : argurus.luctuosa
     }
 }
 module macrorhinos {
->macrorhinos : typeof macrorhinos
+>macrorhinos : macrorhinos
 
     export class marmosurus<T0, T1> {
 >marmosurus : marmosurus<T0, T1>
@@ -6565,27 +6565,27 @@ module macrorhinos {
 >T1 : T1
 
         tansaniana(): lutreolus.punicus { var x: lutreolus.punicus; () => { var y = this; }; return x; }
->tansaniana : () => punicus
+>tansaniana : () => lutreolus.punicus
 >lutreolus : lutreolus
->punicus : punicus
->x : punicus
+>punicus : lutreolus.punicus
+>x : lutreolus.punicus
 >lutreolus : lutreolus
->punicus : punicus
+>punicus : lutreolus.punicus
 >() => { var y = this; } : () => void
 >y : marmosurus<T0, T1>
 >this : marmosurus<T0, T1>
->x : punicus
+>x : lutreolus.punicus
     }
 }
 module howi {
->howi : typeof howi
+>howi : howi
 
     export class angulatus<T0, T1> extends sagitta.stolzmanni {
 >angulatus : angulatus<T0, T1>
 >T0 : T0
 >T1 : T1
 >sagitta : sagitta
->stolzmanni : stolzmanni
+>stolzmanni : sagitta.stolzmanni
 
         pennatus(): howi.marcanoi { var x: howi.marcanoi; () => { var y = this; }; return x; }
 >pennatus : () => marcanoi
@@ -6601,7 +6601,7 @@ module howi {
     }
 }
 module daubentonii {
->daubentonii : typeof daubentonii
+>daubentonii : daubentonii
 
     export class nesiotes<T0, T1> {
 >nesiotes : nesiotes<T0, T1>
@@ -6610,7 +6610,7 @@ module daubentonii {
     }
 }
 module nigra {
->nigra : typeof nigra
+>nigra : nigra
 
     export class thalia<T0, T1> {
 >thalia : thalia<T0, T1>
@@ -6618,444 +6618,444 @@ module nigra {
 >T1 : T1
 
         dichotomus(): quasiater.carolinensis { var x: quasiater.carolinensis; () => { var y = this; }; return x; }
->dichotomus : () => carolinensis
+>dichotomus : () => quasiater.carolinensis
 >quasiater : quasiater
->carolinensis : carolinensis
->x : carolinensis
+>carolinensis : quasiater.carolinensis
+>x : quasiater.carolinensis
 >quasiater : quasiater
->carolinensis : carolinensis
+>carolinensis : quasiater.carolinensis
 >() => { var y = this; } : () => void
 >y : thalia<T0, T1>
 >this : thalia<T0, T1>
->x : carolinensis
+>x : quasiater.carolinensis
 
         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 : () => linulus<lotor<luctuosa, wilsoni>, beisa>
+>arnuxii : () => panamensis.linulus<trivirgatus.lotor<argurus.luctuosa, lavali.wilsoni>, lavali.beisa>
 >panamensis : panamensis
->linulus : linulus<T0, T1>
+>linulus : panamensis.linulus<T0, T1>
 >trivirgatus : trivirgatus
->lotor : lotor<T0, T1>
+>lotor : trivirgatus.lotor<T0, T1>
 >argurus : argurus
->luctuosa : luctuosa
+>luctuosa : argurus.luctuosa
 >lavali : lavali
->wilsoni : wilsoni
+>wilsoni : lavali.wilsoni
 >lavali : lavali
->beisa : beisa
->x : linulus<lotor<luctuosa, wilsoni>, beisa>
+>beisa : lavali.beisa
+>x : panamensis.linulus<trivirgatus.lotor<argurus.luctuosa, lavali.wilsoni>, lavali.beisa>
 >panamensis : panamensis
->linulus : linulus<T0, T1>
+>linulus : panamensis.linulus<T0, T1>
 >trivirgatus : trivirgatus
->lotor : lotor<T0, T1>
+>lotor : trivirgatus.lotor<T0, T1>
 >argurus : argurus
->luctuosa : luctuosa
+>luctuosa : argurus.luctuosa
 >lavali : lavali
->wilsoni : wilsoni
+>wilsoni : lavali.wilsoni
 >lavali : lavali
->beisa : beisa
+>beisa : lavali.beisa
 >() => { var y = this; } : () => void
 >y : thalia<T0, T1>
 >this : thalia<T0, T1>
->x : linulus<lotor<luctuosa, wilsoni>, beisa>
+>x : panamensis.linulus<trivirgatus.lotor<argurus.luctuosa, lavali.wilsoni>, lavali.beisa>
 
         verheyeni(): lavali.xanthognathus { var x: lavali.xanthognathus; () => { var y = this; }; return x; }
->verheyeni : () => xanthognathus
+>verheyeni : () => lavali.xanthognathus
 >lavali : lavali
->xanthognathus : xanthognathus
->x : xanthognathus
+>xanthognathus : lavali.xanthognathus
+>x : lavali.xanthognathus
 >lavali : lavali
->xanthognathus : xanthognathus
+>xanthognathus : lavali.xanthognathus
 >() => { var y = this; } : () => void
 >y : thalia<T0, T1>
 >this : thalia<T0, T1>
->x : xanthognathus
+>x : lavali.xanthognathus
 
         dauuricus(): gabriellae.amicus { var x: gabriellae.amicus; () => { var y = this; }; return x; }
->dauuricus : () => amicus
+>dauuricus : () => gabriellae.amicus
 >gabriellae : gabriellae
->amicus : amicus
->x : amicus
+>amicus : gabriellae.amicus
+>x : gabriellae.amicus
 >gabriellae : gabriellae
->amicus : amicus
+>amicus : gabriellae.amicus
 >() => { var y = this; } : () => void
 >y : thalia<T0, T1>
 >this : thalia<T0, T1>
->x : amicus
+>x : gabriellae.amicus
 
         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 : () => veraecrucis<marcanoi, linulus<megalonyx, marcanoi>>
+>tristriatus : () => rionegrensis.veraecrucis<howi.marcanoi, panamensis.linulus<Lanthanum.megalonyx, howi.marcanoi>>
 >rionegrensis : rionegrensis
->veraecrucis : veraecrucis<T0, T1>
+>veraecrucis : rionegrensis.veraecrucis<T0, T1>
 >howi : howi
->marcanoi : marcanoi
+>marcanoi : howi.marcanoi
 >panamensis : panamensis
->linulus : linulus<T0, T1>
+>linulus : panamensis.linulus<T0, T1>
 >Lanthanum : Lanthanum
->megalonyx : megalonyx
+>megalonyx : Lanthanum.megalonyx
 >howi : howi
->marcanoi : marcanoi
->x : veraecrucis<marcanoi, linulus<megalonyx, marcanoi>>
+>marcanoi : howi.marcanoi
+>x : rionegrensis.veraecrucis<howi.marcanoi, panamensis.linulus<Lanthanum.megalonyx, howi.marcanoi>>
 >rionegrensis : rionegrensis
->veraecrucis : veraecrucis<T0, T1>
+>veraecrucis : rionegrensis.veraecrucis<T0, T1>
 >howi : howi
->marcanoi : marcanoi
+>marcanoi : howi.marcanoi
 >panamensis : panamensis
->linulus : linulus<T0, T1>
+>linulus : panamensis.linulus<T0, T1>
 >Lanthanum : Lanthanum
->megalonyx : megalonyx
+>megalonyx : Lanthanum.megalonyx
 >howi : howi
->marcanoi : marcanoi
+>marcanoi : howi.marcanoi
 >() => { var y = this; } : () => void
 >y : thalia<T0, T1>
 >this : thalia<T0, T1>
->x : veraecrucis<marcanoi, linulus<megalonyx, marcanoi>>
+>x : rionegrensis.veraecrucis<howi.marcanoi, panamensis.linulus<Lanthanum.megalonyx, howi.marcanoi>>
 
         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 : () => abidi<fuscus<wilsoni, sarasinorum<jugularis, subspinosus>>, nitidus<lepturus, acariensis>>
+>lasiura : () => panglima.abidi<samarensis.fuscus<lavali.wilsoni, chrysaeolus.sarasinorum<Lanthanum.jugularis, imperfecta.subspinosus>>, Lanthanum.nitidus<lavali.lepturus, julianae.acariensis>>
 >panglima : panglima
->abidi : abidi<T0, T1>
+>abidi : panglima.abidi<T0, T1>
 >samarensis : samarensis
->fuscus : fuscus<T0, T1>
+>fuscus : samarensis.fuscus<T0, T1>
 >lavali : lavali
->wilsoni : wilsoni
+>wilsoni : lavali.wilsoni
 >chrysaeolus : chrysaeolus
->sarasinorum : sarasinorum<T0, T1>
+>sarasinorum : chrysaeolus.sarasinorum<T0, T1>
 >Lanthanum : Lanthanum
->jugularis : jugularis
+>jugularis : Lanthanum.jugularis
 >imperfecta : imperfecta
->subspinosus : subspinosus
+>subspinosus : imperfecta.subspinosus
 >Lanthanum : Lanthanum
->nitidus : nitidus<T0, T1>
+>nitidus : Lanthanum.nitidus<T0, T1>
 >lavali : lavali
->lepturus : lepturus
+>lepturus : lavali.lepturus
 >julianae : julianae
->acariensis : acariensis
->x : abidi<fuscus<wilsoni, sarasinorum<jugularis, subspinosus>>, nitidus<lepturus, acariensis>>
+>acariensis : julianae.acariensis
+>x : panglima.abidi<samarensis.fuscus<lavali.wilsoni, chrysaeolus.sarasinorum<Lanthanum.jugularis, imperfecta.subspinosus>>, Lanthanum.nitidus<lavali.lepturus, julianae.acariensis>>
 >panglima : panglima
->abidi : abidi<T0, T1>
+>abidi : panglima.abidi<T0, T1>
 >samarensis : samarensis
->fuscus : fuscus<T0, T1>
+>fuscus : samarensis.fuscus<T0, T1>
 >lavali : lavali
->wilsoni : wilsoni
+>wilsoni : lavali.wilsoni
 >chrysaeolus : chrysaeolus
->sarasinorum : sarasinorum<T0, T1>
+>sarasinorum : chrysaeolus.sarasinorum<T0, T1>
 >Lanthanum : Lanthanum
->jugularis : jugularis
+>jugularis : Lanthanum.jugularis
 >imperfecta : imperfecta
->subspinosus : subspinosus
+>subspinosus : imperfecta.subspinosus
 >Lanthanum : Lanthanum
->nitidus : nitidus<T0, T1>
+>nitidus : Lanthanum.nitidus<T0, T1>
 >lavali : lavali
->lepturus : lepturus
+>lepturus : lavali.lepturus
 >julianae : julianae
->acariensis : acariensis
+>acariensis : julianae.acariensis
 >() => { var y = this; } : () => void
 >y : thalia<T0, T1>
 >this : thalia<T0, T1>
->x : abidi<fuscus<wilsoni, sarasinorum<jugularis, subspinosus>>, nitidus<lepturus, acariensis>>
+>x : panglima.abidi<samarensis.fuscus<lavali.wilsoni, chrysaeolus.sarasinorum<Lanthanum.jugularis, imperfecta.subspinosus>>, Lanthanum.nitidus<lavali.lepturus, julianae.acariensis>>
 
         gangetica(): argurus.luctuosa { var x: argurus.luctuosa; () => { var y = this; }; return x; }
->gangetica : () => luctuosa
+>gangetica : () => argurus.luctuosa
 >argurus : argurus
->luctuosa : luctuosa
->x : luctuosa
+>luctuosa : argurus.luctuosa
+>x : argurus.luctuosa
 >argurus : argurus
->luctuosa : luctuosa
+>luctuosa : argurus.luctuosa
 >() => { var y = this; } : () => void
 >y : thalia<T0, T1>
 >this : thalia<T0, T1>
->x : luctuosa
+>x : argurus.luctuosa
 
         brucei(): chrysaeolus.sarasinorum<julianae.steerii, ruatanica.americanus> { var x: chrysaeolus.sarasinorum<julianae.steerii, ruatanica.americanus>; () => { var y = this; }; return x; }
->brucei : () => sarasinorum<steerii, americanus>
+>brucei : () => chrysaeolus.sarasinorum<julianae.steerii, ruatanica.americanus>
 >chrysaeolus : chrysaeolus
->sarasinorum : sarasinorum<T0, T1>
+>sarasinorum : chrysaeolus.sarasinorum<T0, T1>
 >julianae : julianae
->steerii : steerii
+>steerii : julianae.steerii
 >ruatanica : ruatanica
->americanus : americanus
->x : sarasinorum<steerii, americanus>
+>americanus : ruatanica.americanus
+>x : chrysaeolus.sarasinorum<julianae.steerii, ruatanica.americanus>
 >chrysaeolus : chrysaeolus
->sarasinorum : sarasinorum<T0, T1>
+>sarasinorum : chrysaeolus.sarasinorum<T0, T1>
 >julianae : julianae
->steerii : steerii
+>steerii : julianae.steerii
 >ruatanica : ruatanica
->americanus : americanus
+>americanus : ruatanica.americanus
 >() => { var y = this; } : () => void
 >y : thalia<T0, T1>
 >this : thalia<T0, T1>
->x : sarasinorum<steerii, americanus>
+>x : chrysaeolus.sarasinorum<julianae.steerii, ruatanica.americanus>
     }
 }
 module sagitta {
->sagitta : typeof sagitta
+>sagitta : sagitta
 
     export class walkeri extends minutus.portoricensis {
 >walkeri : walkeri
 >minutus : minutus
->portoricensis : portoricensis
+>portoricensis : minutus.portoricensis
 
         maracajuensis(): samarensis.cahirinus<Lanthanum.jugularis, ruatanica.americanus> { var x: samarensis.cahirinus<Lanthanum.jugularis, ruatanica.americanus>; () => { var y = this; }; return x; }
->maracajuensis : () => cahirinus<jugularis, americanus>
+>maracajuensis : () => samarensis.cahirinus<Lanthanum.jugularis, ruatanica.americanus>
 >samarensis : samarensis
->cahirinus : cahirinus<T0, T1>
+>cahirinus : samarensis.cahirinus<T0, T1>
 >Lanthanum : Lanthanum
->jugularis : jugularis
+>jugularis : Lanthanum.jugularis
 >ruatanica : ruatanica
->americanus : americanus
->x : cahirinus<jugularis, americanus>
+>americanus : ruatanica.americanus
+>x : samarensis.cahirinus<Lanthanum.jugularis, ruatanica.americanus>
 >samarensis : samarensis
->cahirinus : cahirinus<T0, T1>
+>cahirinus : samarensis.cahirinus<T0, T1>
 >Lanthanum : Lanthanum
->jugularis : jugularis
+>jugularis : Lanthanum.jugularis
 >ruatanica : ruatanica
->americanus : americanus
+>americanus : ruatanica.americanus
 >() => { var y = this; } : () => void
 >y : walkeri
 >this : walkeri
->x : cahirinus<jugularis, americanus>
+>x : samarensis.cahirinus<Lanthanum.jugularis, ruatanica.americanus>
     }
 }
 module minutus {
->minutus : typeof minutus
+>minutus : minutus
 
     export class inez<T0, T1> extends samarensis.pelurus<argurus.germaini, julianae.durangae> {
 >inez : inez<T0, T1>
 >T0 : T0
 >T1 : T1
 >samarensis : samarensis
->pelurus : pelurus<T0, T1>
+>pelurus : samarensis.pelurus<T0, T1>
 >argurus : argurus
->germaini : germaini
+>germaini : argurus.germaini
 >julianae : julianae
->durangae : durangae
+>durangae : julianae.durangae
 
         vexillaris(): samarensis.cahirinus<lavali.lepturus, lavali.wilsoni> { var x: samarensis.cahirinus<lavali.lepturus, lavali.wilsoni>; () => { var y = this; }; return x; }
->vexillaris : () => cahirinus<lepturus, wilsoni>
+>vexillaris : () => samarensis.cahirinus<lavali.lepturus, lavali.wilsoni>
 >samarensis : samarensis
->cahirinus : cahirinus<T0, T1>
+>cahirinus : samarensis.cahirinus<T0, T1>
 >lavali : lavali
->lepturus : lepturus
+>lepturus : lavali.lepturus
 >lavali : lavali
->wilsoni : wilsoni
->x : cahirinus<lepturus, wilsoni>
+>wilsoni : lavali.wilsoni
+>x : samarensis.cahirinus<lavali.lepturus, lavali.wilsoni>
 >samarensis : samarensis
->cahirinus : cahirinus<T0, T1>
+>cahirinus : samarensis.cahirinus<T0, T1>
 >lavali : lavali
->lepturus : lepturus
+>lepturus : lavali.lepturus
 >lavali : lavali
->wilsoni : wilsoni
+>wilsoni : lavali.wilsoni
 >() => { var y = this; } : () => void
 >y : inez<T0, T1>
 >this : inez<T0, T1>
->x : cahirinus<lepturus, wilsoni>
+>x : samarensis.cahirinus<lavali.lepturus, lavali.wilsoni>
     }
 }
 module macrorhinos {
->macrorhinos : typeof macrorhinos
+>macrorhinos : macrorhinos
 
     export class konganensis extends imperfecta.lasiurus<caurinus.psilurus, caurinus.psilurus> {
 >konganensis : konganensis
 >imperfecta : imperfecta
->lasiurus : lasiurus<T0, T1>
+>lasiurus : imperfecta.lasiurus<T0, T1>
 >caurinus : caurinus
->psilurus : psilurus
+>psilurus : caurinus.psilurus
 >caurinus : caurinus
->psilurus : psilurus
+>psilurus : caurinus.psilurus
     }
 }
 module panamensis {
->panamensis : typeof panamensis
+>panamensis : 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 : ruatanica
->hector : hector<T0, T1>
+>hector : ruatanica.hector<T0, T1>
 >julianae : julianae
->sumatrana : sumatrana
+>sumatrana : julianae.sumatrana
 >samarensis : samarensis
->pelurus : pelurus<T0, T1>
+>pelurus : samarensis.pelurus<T0, T1>
 >Lanthanum : Lanthanum
->jugularis : jugularis
+>jugularis : Lanthanum.jugularis
 >sagitta : sagitta
->walkeri : walkeri
+>walkeri : sagitta.walkeri
 
         goslingi(): daubentonii.arboreus<gabriellae.amicus, dogramacii.kaiseri> { var x: daubentonii.arboreus<gabriellae.amicus, dogramacii.kaiseri>; () => { var y = this; }; return x; }
->goslingi : () => arboreus<amicus, kaiseri>
+>goslingi : () => daubentonii.arboreus<gabriellae.amicus, dogramacii.kaiseri>
 >daubentonii : daubentonii
->arboreus : arboreus<T0, T1>
+>arboreus : daubentonii.arboreus<T0, T1>
 >gabriellae : gabriellae
->amicus : amicus
+>amicus : gabriellae.amicus
 >dogramacii : dogramacii
->kaiseri : kaiseri
->x : arboreus<amicus, kaiseri>
+>kaiseri : dogramacii.kaiseri
+>x : daubentonii.arboreus<gabriellae.amicus, dogramacii.kaiseri>
 >daubentonii : daubentonii
->arboreus : arboreus<T0, T1>
+>arboreus : daubentonii.arboreus<T0, T1>
 >gabriellae : gabriellae
->amicus : amicus
+>amicus : gabriellae.amicus
 >dogramacii : dogramacii
->kaiseri : kaiseri
+>kaiseri : dogramacii.kaiseri
 >() => { var y = this; } : () => void
 >y : linulus<T0, T1>
 >this : linulus<T0, T1>
->x : arboreus<amicus, kaiseri>
+>x : daubentonii.arboreus<gabriellae.amicus, dogramacii.kaiseri>
 
         taki(): patas.uralensis { var x: patas.uralensis; () => { var y = this; }; return x; }
->taki : () => uralensis
+>taki : () => patas.uralensis
 >patas : patas
->uralensis : uralensis
->x : uralensis
+>uralensis : patas.uralensis
+>x : patas.uralensis
 >patas : patas
->uralensis : uralensis
+>uralensis : patas.uralensis
 >() => { var y = this; } : () => void
 >y : linulus<T0, T1>
 >this : linulus<T0, T1>
->x : uralensis
+>x : patas.uralensis
 
         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 : () => moojeni<netscheri<aurata, aurata>, beisa>
+>fumosus : () => rendalli.moojeni<argurus.netscheri<dogramacii.aurata, dogramacii.aurata>, lavali.beisa>
 >rendalli : rendalli
->moojeni : moojeni<T0, T1>
+>moojeni : rendalli.moojeni<T0, T1>
 >argurus : argurus
->netscheri : netscheri<T0, T1>
+>netscheri : argurus.netscheri<T0, T1>
 >dogramacii : dogramacii
->aurata : aurata
+>aurata : dogramacii.aurata
 >dogramacii : dogramacii
->aurata : aurata
+>aurata : dogramacii.aurata
 >lavali : lavali
->beisa : beisa
->x : moojeni<netscheri<aurata, aurata>, beisa>
+>beisa : lavali.beisa
+>x : rendalli.moojeni<argurus.netscheri<dogramacii.aurata, dogramacii.aurata>, lavali.beisa>
 >rendalli : rendalli
->moojeni : moojeni<T0, T1>
+>moojeni : rendalli.moojeni<T0, T1>
 >argurus : argurus
->netscheri : netscheri<T0, T1>
+>netscheri : argurus.netscheri<T0, T1>
 >dogramacii : dogramacii
->aurata : aurata
+>aurata : dogramacii.aurata
 >dogramacii : dogramacii
->aurata : aurata
+>aurata : dogramacii.aurata
 >lavali : lavali
->beisa : beisa
+>beisa : lavali.beisa
 >() => { var y = this; } : () => void
 >y : linulus<T0, T1>
 >this : linulus<T0, T1>
->x : moojeni<netscheri<aurata, aurata>, beisa>
+>x : rendalli.moojeni<argurus.netscheri<dogramacii.aurata, dogramacii.aurata>, lavali.beisa>
 
         rufinus(): macrorhinos.konganensis { var x: macrorhinos.konganensis; () => { var y = this; }; return x; }
->rufinus : () => konganensis
+>rufinus : () => macrorhinos.konganensis
 >macrorhinos : macrorhinos
->konganensis : konganensis
->x : konganensis
+>konganensis : macrorhinos.konganensis
+>x : macrorhinos.konganensis
 >macrorhinos : macrorhinos
->konganensis : konganensis
+>konganensis : macrorhinos.konganensis
 >() => { var y = this; } : () => void
 >y : linulus<T0, T1>
 >this : linulus<T0, T1>
->x : konganensis
+>x : macrorhinos.konganensis
 
         lami(): nigra.thalia<patas.uralensis, dogramacii.robustulus> { var x: nigra.thalia<patas.uralensis, dogramacii.robustulus>; () => { var y = this; }; return x; }
->lami : () => thalia<uralensis, robustulus>
+>lami : () => nigra.thalia<patas.uralensis, dogramacii.robustulus>
 >nigra : nigra
->thalia : thalia<T0, T1>
+>thalia : nigra.thalia<T0, T1>
 >patas : patas
->uralensis : uralensis
+>uralensis : patas.uralensis
 >dogramacii : dogramacii
->robustulus : robustulus
->x : thalia<uralensis, robustulus>
+>robustulus : dogramacii.robustulus
+>x : nigra.thalia<patas.uralensis, dogramacii.robustulus>
 >nigra : nigra
->thalia : thalia<T0, T1>
+>thalia : nigra.thalia<T0, T1>
 >patas : patas
->uralensis : uralensis
+>uralensis : patas.uralensis
 >dogramacii : dogramacii
->robustulus : robustulus
+>robustulus : dogramacii.robustulus
 >() => { var y = this; } : () => void
 >y : linulus<T0, T1>
 >this : linulus<T0, T1>
->x : thalia<uralensis, robustulus>
+>x : nigra.thalia<patas.uralensis, dogramacii.robustulus>
 
         regina(): trivirgatus.oconnelli { var x: trivirgatus.oconnelli; () => { var y = this; }; return x; }
->regina : () => oconnelli
+>regina : () => trivirgatus.oconnelli
 >trivirgatus : trivirgatus
->oconnelli : oconnelli
->x : oconnelli
+>oconnelli : trivirgatus.oconnelli
+>x : trivirgatus.oconnelli
 >trivirgatus : trivirgatus
->oconnelli : oconnelli
+>oconnelli : trivirgatus.oconnelli
 >() => { var y = this; } : () => void
 >y : linulus<T0, T1>
 >this : linulus<T0, T1>
->x : oconnelli
+>x : trivirgatus.oconnelli
 
         nanilla(): dammermani.siberu<lavali.xanthognathus, trivirgatus.oconnelli> { var x: dammermani.siberu<lavali.xanthognathus, trivirgatus.oconnelli>; () => { var y = this; }; return x; }
->nanilla : () => siberu<xanthognathus, oconnelli>
+>nanilla : () => dammermani.siberu<lavali.xanthognathus, trivirgatus.oconnelli>
 >dammermani : dammermani
->siberu : siberu<T0, T1>
+>siberu : dammermani.siberu<T0, T1>
 >lavali : lavali
->xanthognathus : xanthognathus
+>xanthognathus : lavali.xanthognathus
 >trivirgatus : trivirgatus
->oconnelli : oconnelli
->x : siberu<xanthognathus, oconnelli>
+>oconnelli : trivirgatus.oconnelli
+>x : dammermani.siberu<lavali.xanthognathus, trivirgatus.oconnelli>
 >dammermani : dammermani
->siberu : siberu<T0, T1>
+>siberu : dammermani.siberu<T0, T1>
 >lavali : lavali
->xanthognathus : xanthognathus
+>xanthognathus : lavali.xanthognathus
 >trivirgatus : trivirgatus
->oconnelli : oconnelli
+>oconnelli : trivirgatus.oconnelli
 >() => { var y = this; } : () => void
 >y : linulus<T0, T1>
 >this : linulus<T0, T1>
->x : siberu<xanthognathus, oconnelli>
+>x : dammermani.siberu<lavali.xanthognathus, trivirgatus.oconnelli>
 
         enganus(): petrophilus.sodyi<dogramacii.aurata, argurus.oreas> { var x: petrophilus.sodyi<dogramacii.aurata, argurus.oreas>; () => { var y = this; }; return x; }
->enganus : () => sodyi<aurata, oreas>
+>enganus : () => petrophilus.sodyi<dogramacii.aurata, argurus.oreas>
 >petrophilus : petrophilus
->sodyi : sodyi<T0, T1>
+>sodyi : petrophilus.sodyi<T0, T1>
 >dogramacii : dogramacii
->aurata : aurata
+>aurata : dogramacii.aurata
 >argurus : argurus
->oreas : oreas
->x : sodyi<aurata, oreas>
+>oreas : argurus.oreas
+>x : petrophilus.sodyi<dogramacii.aurata, argurus.oreas>
 >petrophilus : petrophilus
->sodyi : sodyi<T0, T1>
+>sodyi : petrophilus.sodyi<T0, T1>
 >dogramacii : dogramacii
->aurata : aurata
+>aurata : dogramacii.aurata
 >argurus : argurus
->oreas : oreas
+>oreas : argurus.oreas
 >() => { var y = this; } : () => void
 >y : linulus<T0, T1>
 >this : linulus<T0, T1>
->x : sodyi<aurata, oreas>
+>x : petrophilus.sodyi<dogramacii.aurata, argurus.oreas>
 
         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 : () => veraecrucis<psilurus, inez<zuluensis, caniventer>>
+>gomantongensis : () => rionegrensis.veraecrucis<caurinus.psilurus, minutus.inez<rendalli.zuluensis, rionegrensis.caniventer>>
 >rionegrensis : rionegrensis
->veraecrucis : veraecrucis<T0, T1>
+>veraecrucis : rionegrensis.veraecrucis<T0, T1>
 >caurinus : caurinus
->psilurus : psilurus
+>psilurus : caurinus.psilurus
 >minutus : minutus
->inez : inez<T0, T1>
+>inez : minutus.inez<T0, T1>
 >rendalli : rendalli
->zuluensis : zuluensis
+>zuluensis : rendalli.zuluensis
 >rionegrensis : rionegrensis
->caniventer : caniventer
->x : veraecrucis<psilurus, inez<zuluensis, caniventer>>
+>caniventer : rionegrensis.caniventer
+>x : rionegrensis.veraecrucis<caurinus.psilurus, minutus.inez<rendalli.zuluensis, rionegrensis.caniventer>>
 >rionegrensis : rionegrensis
->veraecrucis : veraecrucis<T0, T1>
+>veraecrucis : rionegrensis.veraecrucis<T0, T1>
 >caurinus : caurinus
->psilurus : psilurus
+>psilurus : caurinus.psilurus
 >minutus : minutus
->inez : inez<T0, T1>
+>inez : minutus.inez<T0, T1>
 >rendalli : rendalli
->zuluensis : zuluensis
+>zuluensis : rendalli.zuluensis
 >rionegrensis : rionegrensis
->caniventer : caniventer
+>caniventer : rionegrensis.caniventer
 >() => { var y = this; } : () => void
 >y : linulus<T0, T1>
 >this : linulus<T0, T1>
->x : veraecrucis<psilurus, inez<zuluensis, caniventer>>
+>x : rionegrensis.veraecrucis<caurinus.psilurus, minutus.inez<rendalli.zuluensis, rionegrensis.caniventer>>
     }
 }
 module nigra {
->nigra : typeof nigra
+>nigra : nigra
 
     export class gracilis<T0, T1> {
 >gracilis : gracilis<T0, T1>
@@ -7063,600 +7063,600 @@ module nigra {
 >T1 : T1
 
         weddellii(): nigra.dolichurus<dogramacii.aurata, julianae.steerii> { var x: nigra.dolichurus<dogramacii.aurata, julianae.steerii>; () => { var y = this; }; return x; }
->weddellii : () => dolichurus<aurata, steerii>
+>weddellii : () => dolichurus<dogramacii.aurata, julianae.steerii>
 >nigra : nigra
 >dolichurus : dolichurus<T0, T1>
 >dogramacii : dogramacii
->aurata : aurata
+>aurata : dogramacii.aurata
 >julianae : julianae
->steerii : steerii
->x : dolichurus<aurata, steerii>
+>steerii : julianae.steerii
+>x : dolichurus<dogramacii.aurata, julianae.steerii>
 >nigra : nigra
 >dolichurus : dolichurus<T0, T1>
 >dogramacii : dogramacii
->aurata : aurata
+>aurata : dogramacii.aurata
 >julianae : julianae
->steerii : steerii
+>steerii : julianae.steerii
 >() => { var y = this; } : () => void
 >y : gracilis<T0, T1>
 >this : gracilis<T0, T1>
->x : dolichurus<aurata, steerii>
+>x : dolichurus<dogramacii.aurata, julianae.steerii>
 
         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 : () => nitidus<amphibius<megaphyllus, lepturus>, oreas>
+>echinothrix : () => Lanthanum.nitidus<panglima.amphibius<caurinus.megaphyllus, lavali.lepturus>, argurus.oreas>
 >Lanthanum : Lanthanum
->nitidus : nitidus<T0, T1>
+>nitidus : Lanthanum.nitidus<T0, T1>
 >panglima : panglima
->amphibius : amphibius<T0, T1>
+>amphibius : panglima.amphibius<T0, T1>
 >caurinus : caurinus
->megaphyllus : megaphyllus
+>megaphyllus : caurinus.megaphyllus
 >lavali : lavali
->lepturus : lepturus
+>lepturus : lavali.lepturus
 >argurus : argurus
->oreas : oreas
->x : nitidus<amphibius<megaphyllus, lepturus>, oreas>
+>oreas : argurus.oreas
+>x : Lanthanum.nitidus<panglima.amphibius<caurinus.megaphyllus, lavali.lepturus>, argurus.oreas>
 >Lanthanum : Lanthanum
->nitidus : nitidus<T0, T1>
+>nitidus : Lanthanum.nitidus<T0, T1>
 >panglima : panglima
->amphibius : amphibius<T0, T1>
+>amphibius : panglima.amphibius<T0, T1>
 >caurinus : caurinus
->megaphyllus : megaphyllus
+>megaphyllus : caurinus.megaphyllus
 >lavali : lavali
->lepturus : lepturus
+>lepturus : lavali.lepturus
 >argurus : argurus
->oreas : oreas
+>oreas : argurus.oreas
 >() => { var y = this; } : () => void
 >y : gracilis<T0, T1>
 >this : gracilis<T0, T1>
->x : nitidus<amphibius<megaphyllus, lepturus>, oreas>
+>x : Lanthanum.nitidus<panglima.amphibius<caurinus.megaphyllus, lavali.lepturus>, argurus.oreas>
 
         garridoi(): dogramacii.koepckeae { var x: dogramacii.koepckeae; () => { var y = this; }; return x; }
->garridoi : () => koepckeae
+>garridoi : () => dogramacii.koepckeae
 >dogramacii : dogramacii
->koepckeae : koepckeae
->x : koepckeae
+>koepckeae : dogramacii.koepckeae
+>x : dogramacii.koepckeae
 >dogramacii : dogramacii
->koepckeae : koepckeae
+>koepckeae : dogramacii.koepckeae
 >() => { var y = this; } : () => void
 >y : gracilis<T0, T1>
 >this : gracilis<T0, T1>
->x : koepckeae
+>x : dogramacii.koepckeae
 
         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<dauricus<konganensis, uralensis>, thalia<uralensis, galapagoensis>>
+>rouxii : () => gracilis<argurus.dauricus<macrorhinos.konganensis, patas.uralensis>, thalia<patas.uralensis, julianae.galapagoensis>>
 >nigra : nigra
 >gracilis : gracilis<T0, T1>
 >argurus : argurus
->dauricus : dauricus<T0, T1>
+>dauricus : argurus.dauricus<T0, T1>
 >macrorhinos : macrorhinos
->konganensis : konganensis
+>konganensis : macrorhinos.konganensis
 >patas : patas
->uralensis : uralensis
+>uralensis : patas.uralensis
 >nigra : nigra
 >thalia : thalia<T0, T1>
 >patas : patas
->uralensis : uralensis
+>uralensis : patas.uralensis
 >julianae : julianae
->galapagoensis : galapagoensis
->x : gracilis<dauricus<konganensis, uralensis>, thalia<uralensis, galapagoensis>>
+>galapagoensis : julianae.galapagoensis
+>x : gracilis<argurus.dauricus<macrorhinos.konganensis, patas.uralensis>, thalia<patas.uralensis, julianae.galapagoensis>>
 >nigra : nigra
 >gracilis : gracilis<T0, T1>
 >argurus : argurus
->dauricus : dauricus<T0, T1>
+>dauricus : argurus.dauricus<T0, T1>
 >macrorhinos : macrorhinos
->konganensis : konganensis
+>konganensis : macrorhinos.konganensis
 >patas : patas
->uralensis : uralensis
+>uralensis : patas.uralensis
 >nigra : nigra
 >thalia : thalia<T0, T1>
 >patas : patas
->uralensis : uralensis
+>uralensis : patas.uralensis
 >julianae : julianae
->galapagoensis : galapagoensis
+>galapagoensis : julianae.galapagoensis
 >() => { var y = this; } : () => void
 >y : gracilis<T0, T1>
 >this : gracilis<T0, T1>
->x : gracilis<dauricus<konganensis, uralensis>, thalia<uralensis, galapagoensis>>
+>x : gracilis<argurus.dauricus<macrorhinos.konganensis, patas.uralensis>, thalia<patas.uralensis, julianae.galapagoensis>>
 
         aurita(): sagitta.stolzmanni { var x: sagitta.stolzmanni; () => { var y = this; }; return x; }
->aurita : () => stolzmanni
+>aurita : () => sagitta.stolzmanni
 >sagitta : sagitta
->stolzmanni : stolzmanni
->x : stolzmanni
+>stolzmanni : sagitta.stolzmanni
+>x : sagitta.stolzmanni
 >sagitta : sagitta
->stolzmanni : stolzmanni
+>stolzmanni : sagitta.stolzmanni
 >() => { var y = this; } : () => void
 >y : gracilis<T0, T1>
 >this : gracilis<T0, T1>
->x : stolzmanni
+>x : sagitta.stolzmanni
 
         geoffrensis(): rionegrensis.caniventer { var x: rionegrensis.caniventer; () => { var y = this; }; return x; }
->geoffrensis : () => caniventer
+>geoffrensis : () => rionegrensis.caniventer
 >rionegrensis : rionegrensis
->caniventer : caniventer
->x : caniventer
+>caniventer : rionegrensis.caniventer
+>x : rionegrensis.caniventer
 >rionegrensis : rionegrensis
->caniventer : caniventer
+>caniventer : rionegrensis.caniventer
 >() => { var y = this; } : () => void
 >y : gracilis<T0, T1>
 >this : gracilis<T0, T1>
->x : caniventer
+>x : rionegrensis.caniventer
 
         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 : () => marmosurus<netscheri<siberu<foina, pallidus>, luctuosa>, dolichurus<lepturus, pallidus>>
+>theresa : () => macrorhinos.marmosurus<argurus.netscheri<dammermani.siberu<lutreolus.foina, samarensis.pallidus>, argurus.luctuosa>, dolichurus<lavali.lepturus, samarensis.pallidus>>
 >macrorhinos : macrorhinos
->marmosurus : marmosurus<T0, T1>
+>marmosurus : macrorhinos.marmosurus<T0, T1>
 >argurus : argurus
->netscheri : netscheri<T0, T1>
+>netscheri : argurus.netscheri<T0, T1>
 >dammermani : dammermani
->siberu : siberu<T0, T1>
+>siberu : dammermani.siberu<T0, T1>
 >lutreolus : lutreolus
->foina : foina
+>foina : lutreolus.foina
 >samarensis : samarensis
->pallidus : pallidus
+>pallidus : samarensis.pallidus
 >argurus : argurus
->luctuosa : luctuosa
+>luctuosa : argurus.luctuosa
 >nigra : nigra
 >dolichurus : dolichurus<T0, T1>
 >lavali : lavali
->lepturus : lepturus
+>lepturus : lavali.lepturus
 >samarensis : samarensis
->pallidus : pallidus
->x : marmosurus<netscheri<siberu<foina, pallidus>, luctuosa>, dolichurus<lepturus, pallidus>>
+>pallidus : samarensis.pallidus
+>x : macrorhinos.marmosurus<argurus.netscheri<dammermani.siberu<lutreolus.foina, samarensis.pallidus>, argurus.luctuosa>, dolichurus<lavali.lepturus, samarensis.pallidus>>
 >macrorhinos : macrorhinos
->marmosurus : marmosurus<T0, T1>
+>marmosurus : macrorhinos.marmosurus<T0, T1>
 >argurus : argurus
->netscheri : netscheri<T0, T1>
+>netscheri : argurus.netscheri<T0, T1>
 >dammermani : dammermani
->siberu : siberu<T0, T1>
+>siberu : dammermani.siberu<T0, T1>
 >lutreolus : lutreolus
->foina : foina
+>foina : lutreolus.foina
 >samarensis : samarensis
->pallidus : pallidus
+>pallidus : samarensis.pallidus
 >argurus : argurus
->luctuosa : luctuosa
+>luctuosa : argurus.luctuosa
 >nigra : nigra
 >dolichurus : dolichurus<T0, T1>
 >lavali : lavali
->lepturus : lepturus
+>lepturus : lavali.lepturus
 >samarensis : samarensis
->pallidus : pallidus
+>pallidus : samarensis.pallidus
 >() => { var y = this; } : () => void
 >y : gracilis<T0, T1>
 >this : gracilis<T0, T1>
->x : marmosurus<netscheri<siberu<foina, pallidus>, luctuosa>, dolichurus<lepturus, pallidus>>
+>x : macrorhinos.marmosurus<argurus.netscheri<dammermani.siberu<lutreolus.foina, samarensis.pallidus>, argurus.luctuosa>, dolichurus<lavali.lepturus, samarensis.pallidus>>
 
         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 : () => albidens<siberu<foina, pallidus>, sumatrana>
+>melanocarpus : () => julianae.albidens<dammermani.siberu<lutreolus.foina, samarensis.pallidus>, julianae.sumatrana>
 >julianae : julianae
->albidens : albidens<T0, T1>
+>albidens : julianae.albidens<T0, T1>
 >dammermani : dammermani
->siberu : siberu<T0, T1>
+>siberu : dammermani.siberu<T0, T1>
 >lutreolus : lutreolus
->foina : foina
+>foina : lutreolus.foina
 >samarensis : samarensis
->pallidus : pallidus
+>pallidus : samarensis.pallidus
 >julianae : julianae
->sumatrana : sumatrana
->x : albidens<siberu<foina, pallidus>, sumatrana>
+>sumatrana : julianae.sumatrana
+>x : julianae.albidens<dammermani.siberu<lutreolus.foina, samarensis.pallidus>, julianae.sumatrana>
 >julianae : julianae
->albidens : albidens<T0, T1>
+>albidens : julianae.albidens<T0, T1>
 >dammermani : dammermani
->siberu : siberu<T0, T1>
+>siberu : dammermani.siberu<T0, T1>
 >lutreolus : lutreolus
->foina : foina
+>foina : lutreolus.foina
 >samarensis : samarensis
->pallidus : pallidus
+>pallidus : samarensis.pallidus
 >julianae : julianae
->sumatrana : sumatrana
+>sumatrana : julianae.sumatrana
 >() => { var y = this; } : () => void
 >y : gracilis<T0, T1>
 >this : gracilis<T0, T1>
->x : albidens<siberu<foina, pallidus>, sumatrana>
+>x : julianae.albidens<dammermani.siberu<lutreolus.foina, samarensis.pallidus>, julianae.sumatrana>
 
         dubiaquercus(): dogramacii.robustulus { var x: dogramacii.robustulus; () => { var y = this; }; return x; }
->dubiaquercus : () => robustulus
+>dubiaquercus : () => dogramacii.robustulus
 >dogramacii : dogramacii
->robustulus : robustulus
->x : robustulus
+>robustulus : dogramacii.robustulus
+>x : dogramacii.robustulus
 >dogramacii : dogramacii
->robustulus : robustulus
+>robustulus : dogramacii.robustulus
 >() => { var y = this; } : () => void
 >y : gracilis<T0, T1>
 >this : gracilis<T0, T1>
->x : robustulus
+>x : dogramacii.robustulus
 
         pectoralis(): julianae.sumatrana { var x: julianae.sumatrana; () => { var y = this; }; return x; }
->pectoralis : () => sumatrana
+>pectoralis : () => julianae.sumatrana
 >julianae : julianae
->sumatrana : sumatrana
->x : sumatrana
+>sumatrana : julianae.sumatrana
+>x : julianae.sumatrana
 >julianae : julianae
->sumatrana : sumatrana
+>sumatrana : julianae.sumatrana
 >() => { var y = this; } : () => void
 >y : gracilis<T0, T1>
 >this : gracilis<T0, T1>
->x : sumatrana
+>x : julianae.sumatrana
 
         apoensis(): caurinus.megaphyllus { var x: caurinus.megaphyllus; () => { var y = this; }; return x; }
->apoensis : () => megaphyllus
+>apoensis : () => caurinus.megaphyllus
 >caurinus : caurinus
->megaphyllus : megaphyllus
->x : megaphyllus
+>megaphyllus : caurinus.megaphyllus
+>x : caurinus.megaphyllus
 >caurinus : caurinus
->megaphyllus : megaphyllus
+>megaphyllus : caurinus.megaphyllus
 >() => { var y = this; } : () => void
 >y : gracilis<T0, T1>
 >this : gracilis<T0, T1>
->x : megaphyllus
+>x : caurinus.megaphyllus
 
         grisescens(): Lanthanum.jugularis { var x: Lanthanum.jugularis; () => { var y = this; }; return x; }
->grisescens : () => jugularis
+>grisescens : () => Lanthanum.jugularis
 >Lanthanum : Lanthanum
->jugularis : jugularis
->x : jugularis
+>jugularis : Lanthanum.jugularis
+>x : Lanthanum.jugularis
 >Lanthanum : Lanthanum
->jugularis : jugularis
+>jugularis : Lanthanum.jugularis
 >() => { var y = this; } : () => void
 >y : gracilis<T0, T1>
 >this : gracilis<T0, T1>
->x : jugularis
+>x : Lanthanum.jugularis
 
         ramirohitra(): panglima.amphibius<trivirgatus.falconeri, gabriellae.echinatus> { var x: panglima.amphibius<trivirgatus.falconeri, gabriellae.echinatus>; () => { var y = this; }; return x; }
->ramirohitra : () => amphibius<falconeri, echinatus>
+>ramirohitra : () => panglima.amphibius<trivirgatus.falconeri, gabriellae.echinatus>
 >panglima : panglima
->amphibius : amphibius<T0, T1>
+>amphibius : panglima.amphibius<T0, T1>
 >trivirgatus : trivirgatus
->falconeri : falconeri
+>falconeri : trivirgatus.falconeri
 >gabriellae : gabriellae
->echinatus : echinatus
->x : amphibius<falconeri, echinatus>
+>echinatus : gabriellae.echinatus
+>x : panglima.amphibius<trivirgatus.falconeri, gabriellae.echinatus>
 >panglima : panglima
->amphibius : amphibius<T0, T1>
+>amphibius : panglima.amphibius<T0, T1>
 >trivirgatus : trivirgatus
->falconeri : falconeri
+>falconeri : trivirgatus.falconeri
 >gabriellae : gabriellae
->echinatus : echinatus
+>echinatus : gabriellae.echinatus
 >() => { var y = this; } : () => void
 >y : gracilis<T0, T1>
 >this : gracilis<T0, T1>
->x : amphibius<falconeri, echinatus>
+>x : panglima.amphibius<trivirgatus.falconeri, gabriellae.echinatus>
     }
 }
 module samarensis {
->samarensis : typeof samarensis
+>samarensis : samarensis
 
     export class pelurus<T0, T1> extends sagitta.stolzmanni {
 >pelurus : pelurus<T0, T1>
 >T0 : T0
 >T1 : T1
 >sagitta : sagitta
->stolzmanni : stolzmanni
+>stolzmanni : sagitta.stolzmanni
 
         Palladium(): panamensis.linulus<macrorhinos.konganensis, rionegrensis.caniventer> { var x: panamensis.linulus<macrorhinos.konganensis, rionegrensis.caniventer>; () => { var y = this; }; return x; }
->Palladium : () => linulus<konganensis, caniventer>
+>Palladium : () => panamensis.linulus<macrorhinos.konganensis, rionegrensis.caniventer>
 >panamensis : panamensis
->linulus : linulus<T0, T1>
+>linulus : panamensis.linulus<T0, T1>
 >macrorhinos : macrorhinos
->konganensis : konganensis
+>konganensis : macrorhinos.konganensis
 >rionegrensis : rionegrensis
->caniventer : caniventer
->x : linulus<konganensis, caniventer>
+>caniventer : rionegrensis.caniventer
+>x : panamensis.linulus<macrorhinos.konganensis, rionegrensis.caniventer>
 >panamensis : panamensis
->linulus : linulus<T0, T1>
+>linulus : panamensis.linulus<T0, T1>
 >macrorhinos : macrorhinos
->konganensis : konganensis
+>konganensis : macrorhinos.konganensis
 >rionegrensis : rionegrensis
->caniventer : caniventer
+>caniventer : rionegrensis.caniventer
 >() => { var y = this; } : () => void
 >y : pelurus<T0, T1>
 >this : pelurus<T0, T1>
->x : linulus<konganensis, caniventer>
+>x : panamensis.linulus<macrorhinos.konganensis, rionegrensis.caniventer>
 
         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 : () => netscheri<inez<peninsulae, nudicaudus>, oralis<xanthognathus, oreas>>
+>castanea : () => argurus.netscheri<minutus.inez<argurus.peninsulae, julianae.nudicaudus>, julianae.oralis<lavali.xanthognathus, argurus.oreas>>
 >argurus : argurus
->netscheri : netscheri<T0, T1>
+>netscheri : argurus.netscheri<T0, T1>
 >minutus : minutus
->inez : inez<T0, T1>
+>inez : minutus.inez<T0, T1>
 >argurus : argurus
->peninsulae : peninsulae
+>peninsulae : argurus.peninsulae
 >julianae : julianae
->nudicaudus : nudicaudus
+>nudicaudus : julianae.nudicaudus
 >julianae : julianae
->oralis : oralis<T0, T1>
+>oralis : julianae.oralis<T0, T1>
 >lavali : lavali
->xanthognathus : xanthognathus
+>xanthognathus : lavali.xanthognathus
 >argurus : argurus
->oreas : oreas
->x : netscheri<inez<peninsulae, nudicaudus>, oralis<xanthognathus, oreas>>
+>oreas : argurus.oreas
+>x : argurus.netscheri<minutus.inez<argurus.peninsulae, julianae.nudicaudus>, julianae.oralis<lavali.xanthognathus, argurus.oreas>>
 >argurus : argurus
->netscheri : netscheri<T0, T1>
+>netscheri : argurus.netscheri<T0, T1>
 >minutus : minutus
->inez : inez<T0, T1>
+>inez : minutus.inez<T0, T1>
 >argurus : argurus
->peninsulae : peninsulae
+>peninsulae : argurus.peninsulae
 >julianae : julianae
->nudicaudus : nudicaudus
+>nudicaudus : julianae.nudicaudus
 >julianae : julianae
->oralis : oralis<T0, T1>
+>oralis : julianae.oralis<T0, T1>
 >lavali : lavali
->xanthognathus : xanthognathus
+>xanthognathus : lavali.xanthognathus
 >argurus : argurus
->oreas : oreas
+>oreas : argurus.oreas
 >() => { var y = this; } : () => void
 >y : pelurus<T0, T1>
 >this : pelurus<T0, T1>
->x : netscheri<inez<peninsulae, nudicaudus>, oralis<xanthognathus, oreas>>
+>x : argurus.netscheri<minutus.inez<argurus.peninsulae, julianae.nudicaudus>, julianae.oralis<lavali.xanthognathus, argurus.oreas>>
 
         chamek(): argurus.pygmaea<julianae.galapagoensis, provocax.melanoleuca> { var x: argurus.pygmaea<julianae.galapagoensis, provocax.melanoleuca>; () => { var y = this; }; return x; }
->chamek : () => pygmaea<galapagoensis, melanoleuca>
+>chamek : () => argurus.pygmaea<julianae.galapagoensis, provocax.melanoleuca>
 >argurus : argurus
->pygmaea : pygmaea<T0, T1>
+>pygmaea : argurus.pygmaea<T0, T1>
 >julianae : julianae
->galapagoensis : galapagoensis
+>galapagoensis : julianae.galapagoensis
 >provocax : provocax
->melanoleuca : melanoleuca
->x : pygmaea<galapagoensis, melanoleuca>
+>melanoleuca : provocax.melanoleuca
+>x : argurus.pygmaea<julianae.galapagoensis, provocax.melanoleuca>
 >argurus : argurus
->pygmaea : pygmaea<T0, T1>
+>pygmaea : argurus.pygmaea<T0, T1>
 >julianae : julianae
->galapagoensis : galapagoensis
+>galapagoensis : julianae.galapagoensis
 >provocax : provocax
->melanoleuca : melanoleuca
+>melanoleuca : provocax.melanoleuca
 >() => { var y = this; } : () => void
 >y : pelurus<T0, T1>
 >this : pelurus<T0, T1>
->x : pygmaea<galapagoensis, melanoleuca>
+>x : argurus.pygmaea<julianae.galapagoensis, provocax.melanoleuca>
 
         nigriceps(): lutreolus.punicus { var x: lutreolus.punicus; () => { var y = this; }; return x; }
->nigriceps : () => punicus
+>nigriceps : () => lutreolus.punicus
 >lutreolus : lutreolus
->punicus : punicus
->x : punicus
+>punicus : lutreolus.punicus
+>x : lutreolus.punicus
 >lutreolus : lutreolus
->punicus : punicus
+>punicus : lutreolus.punicus
 >() => { var y = this; } : () => void
 >y : pelurus<T0, T1>
 >this : pelurus<T0, T1>
->x : punicus
+>x : lutreolus.punicus
 
         lunatus(): pelurus<Lanthanum.jugularis, sagitta.walkeri> { var x: pelurus<Lanthanum.jugularis, sagitta.walkeri>; () => { var y = this; }; return x; }
->lunatus : () => pelurus<jugularis, walkeri>
+>lunatus : () => pelurus<Lanthanum.jugularis, sagitta.walkeri>
 >pelurus : pelurus<T0, T1>
 >Lanthanum : Lanthanum
->jugularis : jugularis
+>jugularis : Lanthanum.jugularis
 >sagitta : sagitta
->walkeri : walkeri
->x : pelurus<jugularis, walkeri>
+>walkeri : sagitta.walkeri
+>x : pelurus<Lanthanum.jugularis, sagitta.walkeri>
 >pelurus : pelurus<T0, T1>
 >Lanthanum : Lanthanum
->jugularis : jugularis
+>jugularis : Lanthanum.jugularis
 >sagitta : sagitta
->walkeri : walkeri
+>walkeri : sagitta.walkeri
 >() => { var y = this; } : () => void
 >y : pelurus<T0, T1>
 >this : pelurus<T0, T1>
->x : pelurus<jugularis, walkeri>
+>x : pelurus<Lanthanum.jugularis, sagitta.walkeri>
 
         madurae(): rionegrensis.caniventer { var x: rionegrensis.caniventer; () => { var y = this; }; return x; }
->madurae : () => caniventer
+>madurae : () => rionegrensis.caniventer
 >rionegrensis : rionegrensis
->caniventer : caniventer
->x : caniventer
+>caniventer : rionegrensis.caniventer
+>x : rionegrensis.caniventer
 >rionegrensis : rionegrensis
->caniventer : caniventer
+>caniventer : rionegrensis.caniventer
 >() => { var y = this; } : () => void
 >y : pelurus<T0, T1>
 >this : pelurus<T0, T1>
->x : caniventer
+>x : rionegrensis.caniventer
 
         chinchilla(): macrorhinos.daphaenodon { var x: macrorhinos.daphaenodon; () => { var y = this; }; return x; }
->chinchilla : () => daphaenodon
+>chinchilla : () => macrorhinos.daphaenodon
 >macrorhinos : macrorhinos
->daphaenodon : daphaenodon
->x : daphaenodon
+>daphaenodon : macrorhinos.daphaenodon
+>x : macrorhinos.daphaenodon
 >macrorhinos : macrorhinos
->daphaenodon : daphaenodon
+>daphaenodon : macrorhinos.daphaenodon
 >() => { var y = this; } : () => void
 >y : pelurus<T0, T1>
 >this : pelurus<T0, T1>
->x : daphaenodon
+>x : macrorhinos.daphaenodon
 
         eliasi(): petrophilus.rosalia<julianae.steerii, lavali.beisa> { var x: petrophilus.rosalia<julianae.steerii, lavali.beisa>; () => { var y = this; }; return x; }
->eliasi : () => rosalia<steerii, beisa>
+>eliasi : () => petrophilus.rosalia<julianae.steerii, lavali.beisa>
 >petrophilus : petrophilus
->rosalia : rosalia<T0, T1>
+>rosalia : petrophilus.rosalia<T0, T1>
 >julianae : julianae
->steerii : steerii
+>steerii : julianae.steerii
 >lavali : lavali
->beisa : beisa
->x : rosalia<steerii, beisa>
+>beisa : lavali.beisa
+>x : petrophilus.rosalia<julianae.steerii, lavali.beisa>
 >petrophilus : petrophilus
->rosalia : rosalia<T0, T1>
+>rosalia : petrophilus.rosalia<T0, T1>
 >julianae : julianae
->steerii : steerii
+>steerii : julianae.steerii
 >lavali : lavali
->beisa : beisa
+>beisa : lavali.beisa
 >() => { var y = this; } : () => void
 >y : pelurus<T0, T1>
 >this : pelurus<T0, T1>
->x : rosalia<steerii, beisa>
+>x : petrophilus.rosalia<julianae.steerii, lavali.beisa>
 
         proditor(): panamensis.setulosus<gabriellae.echinatus, julianae.steerii> { var x: panamensis.setulosus<gabriellae.echinatus, julianae.steerii>; () => { var y = this; }; return x; }
->proditor : () => setulosus<echinatus, steerii>
+>proditor : () => panamensis.setulosus<gabriellae.echinatus, julianae.steerii>
 >panamensis : panamensis
->setulosus : setulosus<T0, T1>
+>setulosus : panamensis.setulosus<T0, T1>
 >gabriellae : gabriellae
->echinatus : echinatus
+>echinatus : gabriellae.echinatus
 >julianae : julianae
->steerii : steerii
->x : setulosus<echinatus, steerii>
+>steerii : julianae.steerii
+>x : panamensis.setulosus<gabriellae.echinatus, julianae.steerii>
 >panamensis : panamensis
->setulosus : setulosus<T0, T1>
+>setulosus : panamensis.setulosus<T0, T1>
 >gabriellae : gabriellae
->echinatus : echinatus
+>echinatus : gabriellae.echinatus
 >julianae : julianae
->steerii : steerii
+>steerii : julianae.steerii
 >() => { var y = this; } : () => void
 >y : pelurus<T0, T1>
 >this : pelurus<T0, T1>
->x : setulosus<echinatus, steerii>
+>x : panamensis.setulosus<gabriellae.echinatus, julianae.steerii>
 
         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 : () => wattsi<galapagoensis, linulus<xanthognathus, konganensis>>
+>gambianus : () => quasiater.wattsi<julianae.galapagoensis, panamensis.linulus<lavali.xanthognathus, macrorhinos.konganensis>>
 >quasiater : quasiater
->wattsi : wattsi<T0, T1>
+>wattsi : quasiater.wattsi<T0, T1>
 >julianae : julianae
->galapagoensis : galapagoensis
+>galapagoensis : julianae.galapagoensis
 >panamensis : panamensis
->linulus : linulus<T0, T1>
+>linulus : panamensis.linulus<T0, T1>
 >lavali : lavali
->xanthognathus : xanthognathus
+>xanthognathus : lavali.xanthognathus
 >macrorhinos : macrorhinos
->konganensis : konganensis
->x : wattsi<galapagoensis, linulus<xanthognathus, konganensis>>
+>konganensis : macrorhinos.konganensis
+>x : quasiater.wattsi<julianae.galapagoensis, panamensis.linulus<lavali.xanthognathus, macrorhinos.konganensis>>
 >quasiater : quasiater
->wattsi : wattsi<T0, T1>
+>wattsi : quasiater.wattsi<T0, T1>
 >julianae : julianae
->galapagoensis : galapagoensis
+>galapagoensis : julianae.galapagoensis
 >panamensis : panamensis
->linulus : linulus<T0, T1>
+>linulus : panamensis.linulus<T0, T1>
 >lavali : lavali
->xanthognathus : xanthognathus
+>xanthognathus : lavali.xanthognathus
 >macrorhinos : macrorhinos
->konganensis : konganensis
+>konganensis : macrorhinos.konganensis
 >() => { var y = this; } : () => void
 >y : pelurus<T0, T1>
 >this : pelurus<T0, T1>
->x : wattsi<galapagoensis, linulus<xanthognathus, konganensis>>
+>x : quasiater.wattsi<julianae.galapagoensis, panamensis.linulus<lavali.xanthognathus, macrorhinos.konganensis>>
 
         petteri(): dogramacii.kaiseri { var x: dogramacii.kaiseri; () => { var y = this; }; return x; }
->petteri : () => kaiseri
+>petteri : () => dogramacii.kaiseri
 >dogramacii : dogramacii
->kaiseri : kaiseri
->x : kaiseri
+>kaiseri : dogramacii.kaiseri
+>x : dogramacii.kaiseri
 >dogramacii : dogramacii
->kaiseri : kaiseri
+>kaiseri : dogramacii.kaiseri
 >() => { var y = this; } : () => void
 >y : pelurus<T0, T1>
 >this : pelurus<T0, T1>
->x : kaiseri
+>x : dogramacii.kaiseri
 
         nusatenggara(): panglima.amphibius<lavali.lepturus, quasiater.carolinensis> { var x: panglima.amphibius<lavali.lepturus, quasiater.carolinensis>; () => { var y = this; }; return x; }
->nusatenggara : () => amphibius<lepturus, carolinensis>
+>nusatenggara : () => panglima.amphibius<lavali.lepturus, quasiater.carolinensis>
 >panglima : panglima
->amphibius : amphibius<T0, T1>
+>amphibius : panglima.amphibius<T0, T1>
 >lavali : lavali
->lepturus : lepturus
+>lepturus : lavali.lepturus
 >quasiater : quasiater
->carolinensis : carolinensis
->x : amphibius<lepturus, carolinensis>
+>carolinensis : quasiater.carolinensis
+>x : panglima.amphibius<lavali.lepturus, quasiater.carolinensis>
 >panglima : panglima
->amphibius : amphibius<T0, T1>
+>amphibius : panglima.amphibius<T0, T1>
 >lavali : lavali
->lepturus : lepturus
+>lepturus : lavali.lepturus
 >quasiater : quasiater
->carolinensis : carolinensis
+>carolinensis : quasiater.carolinensis
 >() => { var y = this; } : () => void
 >y : pelurus<T0, T1>
 >this : pelurus<T0, T1>
->x : amphibius<lepturus, carolinensis>
+>x : panglima.amphibius<lavali.lepturus, quasiater.carolinensis>
 
         olitor(): rionegrensis.veraecrucis<lavali.xanthognathus, quasiater.bobrinskoi> { var x: rionegrensis.veraecrucis<lavali.xanthognathus, quasiater.bobrinskoi>; () => { var y = this; }; return x; }
->olitor : () => veraecrucis<xanthognathus, bobrinskoi>
+>olitor : () => rionegrensis.veraecrucis<lavali.xanthognathus, quasiater.bobrinskoi>
 >rionegrensis : rionegrensis
->veraecrucis : veraecrucis<T0, T1>
+>veraecrucis : rionegrensis.veraecrucis<T0, T1>
 >lavali : lavali
->xanthognathus : xanthognathus
+>xanthognathus : lavali.xanthognathus
 >quasiater : quasiater
->bobrinskoi : bobrinskoi
->x : veraecrucis<xanthognathus, bobrinskoi>
+>bobrinskoi : quasiater.bobrinskoi
+>x : rionegrensis.veraecrucis<lavali.xanthognathus, quasiater.bobrinskoi>
 >rionegrensis : rionegrensis
->veraecrucis : veraecrucis<T0, T1>
+>veraecrucis : rionegrensis.veraecrucis<T0, T1>
 >lavali : lavali
->xanthognathus : xanthognathus
+>xanthognathus : lavali.xanthognathus
 >quasiater : quasiater
->bobrinskoi : bobrinskoi
+>bobrinskoi : quasiater.bobrinskoi
 >() => { var y = this; } : () => void
 >y : pelurus<T0, T1>
 >this : pelurus<T0, T1>
->x : veraecrucis<xanthognathus, bobrinskoi>
+>x : rionegrensis.veraecrucis<lavali.xanthognathus, quasiater.bobrinskoi>
     }
     export class fuscus<T0, T1> extends macrorhinos.daphaenodon {
 >fuscus : fuscus<T0, T1>
 >T0 : T0
 >T1 : T1
 >macrorhinos : macrorhinos
->daphaenodon : daphaenodon
+>daphaenodon : macrorhinos.daphaenodon
 
         planifrons(): nigra.gracilis<julianae.nudicaudus, dogramacii.aurata> { var x: nigra.gracilis<julianae.nudicaudus, dogramacii.aurata>; () => { var y = this; }; return x; }
->planifrons : () => gracilis<nudicaudus, aurata>
+>planifrons : () => nigra.gracilis<julianae.nudicaudus, dogramacii.aurata>
 >nigra : nigra
->gracilis : gracilis<T0, T1>
+>gracilis : nigra.gracilis<T0, T1>
 >julianae : julianae
->nudicaudus : nudicaudus
+>nudicaudus : julianae.nudicaudus
 >dogramacii : dogramacii
->aurata : aurata
->x : gracilis<nudicaudus, aurata>
+>aurata : dogramacii.aurata
+>x : nigra.gracilis<julianae.nudicaudus, dogramacii.aurata>
 >nigra : nigra
->gracilis : gracilis<T0, T1>
+>gracilis : nigra.gracilis<T0, T1>
 >julianae : julianae
->nudicaudus : nudicaudus
+>nudicaudus : julianae.nudicaudus
 >dogramacii : dogramacii
->aurata : aurata
+>aurata : dogramacii.aurata
 >() => { var y = this; } : () => void
 >y : fuscus<T0, T1>
 >this : fuscus<T0, T1>
->x : gracilis<nudicaudus, aurata>
+>x : nigra.gracilis<julianae.nudicaudus, dogramacii.aurata>
 
         badia(): julianae.sumatrana { var x: julianae.sumatrana; () => { var y = this; }; return x; }
->badia : () => sumatrana
+>badia : () => julianae.sumatrana
 >julianae : julianae
->sumatrana : sumatrana
->x : sumatrana
+>sumatrana : julianae.sumatrana
+>x : julianae.sumatrana
 >julianae : julianae
->sumatrana : sumatrana
+>sumatrana : julianae.sumatrana
 >() => { var y = this; } : () => void
 >y : fuscus<T0, T1>
 >this : fuscus<T0, T1>
->x : sumatrana
+>x : julianae.sumatrana
 
         prymnolopha(): sagitta.walkeri { var x: sagitta.walkeri; () => { var y = this; }; return x; }
->prymnolopha : () => walkeri
+>prymnolopha : () => sagitta.walkeri
 >sagitta : sagitta
->walkeri : walkeri
->x : walkeri
+>walkeri : sagitta.walkeri
+>x : sagitta.walkeri
 >sagitta : sagitta
->walkeri : walkeri
+>walkeri : sagitta.walkeri
 >() => { var y = this; } : () => void
 >y : fuscus<T0, T1>
 >this : fuscus<T0, T1>
->x : walkeri
+>x : sagitta.walkeri
 
         natalensis(): trivirgatus.falconeri { var x: trivirgatus.falconeri; () => { var y = this; }; return x; }
->natalensis : () => falconeri
+>natalensis : () => trivirgatus.falconeri
 >trivirgatus : trivirgatus
->falconeri : falconeri
->x : falconeri
+>falconeri : trivirgatus.falconeri
+>x : trivirgatus.falconeri
 >trivirgatus : trivirgatus
->falconeri : falconeri
+>falconeri : trivirgatus.falconeri
 >() => { var y = this; } : () => void
 >y : fuscus<T0, T1>
 >this : fuscus<T0, T1>
->x : falconeri
+>x : trivirgatus.falconeri
 
         hunteri(): julianae.durangae { var x: julianae.durangae; () => { var y = this; }; return x; }
->hunteri : () => durangae
+>hunteri : () => julianae.durangae
 >julianae : julianae
->durangae : durangae
->x : durangae
+>durangae : julianae.durangae
+>x : julianae.durangae
 >julianae : julianae
->durangae : durangae
+>durangae : julianae.durangae
 >() => { var y = this; } : () => void
 >y : fuscus<T0, T1>
 >this : fuscus<T0, T1>
->x : durangae
+>x : julianae.durangae
 
         sapiens(): pallidus { var x: pallidus; () => { var y = this; }; return x; }
 >sapiens : () => pallidus
@@ -7669,263 +7669,263 @@ module samarensis {
 >x : pallidus
 
         macrocercus(): panamensis.setulosus<dogramacii.koepckeae, julianae.sumatrana> { var x: panamensis.setulosus<dogramacii.koepckeae, julianae.sumatrana>; () => { var y = this; }; return x; }
->macrocercus : () => setulosus<koepckeae, sumatrana>
+>macrocercus : () => panamensis.setulosus<dogramacii.koepckeae, julianae.sumatrana>
 >panamensis : panamensis
->setulosus : setulosus<T0, T1>
+>setulosus : panamensis.setulosus<T0, T1>
 >dogramacii : dogramacii
->koepckeae : koepckeae
+>koepckeae : dogramacii.koepckeae
 >julianae : julianae
->sumatrana : sumatrana
->x : setulosus<koepckeae, sumatrana>
+>sumatrana : julianae.sumatrana
+>x : panamensis.setulosus<dogramacii.koepckeae, julianae.sumatrana>
 >panamensis : panamensis
->setulosus : setulosus<T0, T1>
+>setulosus : panamensis.setulosus<T0, T1>
 >dogramacii : dogramacii
->koepckeae : koepckeae
+>koepckeae : dogramacii.koepckeae
 >julianae : julianae
->sumatrana : sumatrana
+>sumatrana : julianae.sumatrana
 >() => { var y = this; } : () => void
 >y : fuscus<T0, T1>
 >this : fuscus<T0, T1>
->x : setulosus<koepckeae, sumatrana>
+>x : panamensis.setulosus<dogramacii.koepckeae, julianae.sumatrana>
 
         nimbae(): lutreolus.punicus { var x: lutreolus.punicus; () => { var y = this; }; return x; }
->nimbae : () => punicus
+>nimbae : () => lutreolus.punicus
 >lutreolus : lutreolus
->punicus : punicus
->x : punicus
+>punicus : lutreolus.punicus
+>x : lutreolus.punicus
 >lutreolus : lutreolus
->punicus : punicus
+>punicus : lutreolus.punicus
 >() => { var y = this; } : () => void
 >y : fuscus<T0, T1>
 >this : fuscus<T0, T1>
->x : punicus
+>x : lutreolus.punicus
 
         suricatta(): daubentonii.nigricans<dammermani.melanops, imperfecta.subspinosus> { var x: daubentonii.nigricans<dammermani.melanops, imperfecta.subspinosus>; () => { var y = this; }; return x; }
->suricatta : () => nigricans<melanops, subspinosus>
+>suricatta : () => daubentonii.nigricans<dammermani.melanops, imperfecta.subspinosus>
 >daubentonii : daubentonii
->nigricans : nigricans<T0, T1>
+>nigricans : daubentonii.nigricans<T0, T1>
 >dammermani : dammermani
->melanops : melanops
+>melanops : dammermani.melanops
 >imperfecta : imperfecta
->subspinosus : subspinosus
->x : nigricans<melanops, subspinosus>
+>subspinosus : imperfecta.subspinosus
+>x : daubentonii.nigricans<dammermani.melanops, imperfecta.subspinosus>
 >daubentonii : daubentonii
->nigricans : nigricans<T0, T1>
+>nigricans : daubentonii.nigricans<T0, T1>
 >dammermani : dammermani
->melanops : melanops
+>melanops : dammermani.melanops
 >imperfecta : imperfecta
->subspinosus : subspinosus
+>subspinosus : imperfecta.subspinosus
 >() => { var y = this; } : () => void
 >y : fuscus<T0, T1>
 >this : fuscus<T0, T1>
->x : nigricans<melanops, subspinosus>
+>x : daubentonii.nigricans<dammermani.melanops, imperfecta.subspinosus>
 
         jagorii(): julianae.galapagoensis { var x: julianae.galapagoensis; () => { var y = this; }; return x; }
->jagorii : () => galapagoensis
+>jagorii : () => julianae.galapagoensis
 >julianae : julianae
->galapagoensis : galapagoensis
->x : galapagoensis
+>galapagoensis : julianae.galapagoensis
+>x : julianae.galapagoensis
 >julianae : julianae
->galapagoensis : galapagoensis
+>galapagoensis : julianae.galapagoensis
 >() => { var y = this; } : () => void
 >y : fuscus<T0, T1>
 >this : fuscus<T0, T1>
->x : galapagoensis
+>x : julianae.galapagoensis
 
         beecrofti(): sagitta.stolzmanni { var x: sagitta.stolzmanni; () => { var y = this; }; return x; }
->beecrofti : () => stolzmanni
+>beecrofti : () => sagitta.stolzmanni
 >sagitta : sagitta
->stolzmanni : stolzmanni
->x : stolzmanni
+>stolzmanni : sagitta.stolzmanni
+>x : sagitta.stolzmanni
 >sagitta : sagitta
->stolzmanni : stolzmanni
+>stolzmanni : sagitta.stolzmanni
 >() => { var y = this; } : () => void
 >y : fuscus<T0, T1>
 >this : fuscus<T0, T1>
->x : stolzmanni
+>x : sagitta.stolzmanni
 
         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 : () => inez<gerbillus<inez<moojeni<amphibius<falconeri, psilurus>, echinatus>, aurata>, otion>, konganensis>
+>imaizumii : () => minutus.inez<julianae.gerbillus<minutus.inez<rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>, dogramacii.aurata>, lavali.otion>, macrorhinos.konganensis>
 >minutus : minutus
->inez : inez<T0, T1>
+>inez : minutus.inez<T0, T1>
 >julianae : julianae
->gerbillus : gerbillus<T0, T1>
+>gerbillus : julianae.gerbillus<T0, T1>
 >minutus : minutus
->inez : inez<T0, T1>
+>inez : minutus.inez<T0, T1>
 >rendalli : rendalli
->moojeni : moojeni<T0, T1>
+>moojeni : rendalli.moojeni<T0, T1>
 >panglima : panglima
->amphibius : amphibius<T0, T1>
+>amphibius : panglima.amphibius<T0, T1>
 >trivirgatus : trivirgatus
->falconeri : falconeri
+>falconeri : trivirgatus.falconeri
 >caurinus : caurinus
->psilurus : psilurus
+>psilurus : caurinus.psilurus
 >gabriellae : gabriellae
->echinatus : echinatus
+>echinatus : gabriellae.echinatus
 >dogramacii : dogramacii
->aurata : aurata
+>aurata : dogramacii.aurata
 >lavali : lavali
->otion : otion
+>otion : lavali.otion
 >macrorhinos : macrorhinos
->konganensis : konganensis
->x : inez<gerbillus<inez<moojeni<amphibius<falconeri, psilurus>, echinatus>, aurata>, otion>, konganensis>
+>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 : minutus
->inez : inez<T0, T1>
+>inez : minutus.inez<T0, T1>
 >julianae : julianae
->gerbillus : gerbillus<T0, T1>
+>gerbillus : julianae.gerbillus<T0, T1>
 >minutus : minutus
->inez : inez<T0, T1>
+>inez : minutus.inez<T0, T1>
 >rendalli : rendalli
->moojeni : moojeni<T0, T1>
+>moojeni : rendalli.moojeni<T0, T1>
 >panglima : panglima
->amphibius : amphibius<T0, T1>
+>amphibius : panglima.amphibius<T0, T1>
 >trivirgatus : trivirgatus
->falconeri : falconeri
+>falconeri : trivirgatus.falconeri
 >caurinus : caurinus
->psilurus : psilurus
+>psilurus : caurinus.psilurus
 >gabriellae : gabriellae
->echinatus : echinatus
+>echinatus : gabriellae.echinatus
 >dogramacii : dogramacii
->aurata : aurata
+>aurata : dogramacii.aurata
 >lavali : lavali
->otion : otion
+>otion : lavali.otion
 >macrorhinos : macrorhinos
->konganensis : konganensis
+>konganensis : macrorhinos.konganensis
 >() => { var y = this; } : () => void
 >y : fuscus<T0, T1>
 >this : fuscus<T0, T1>
->x : inez<gerbillus<inez<moojeni<amphibius<falconeri, psilurus>, echinatus>, aurata>, otion>, konganensis>
+>x : minutus.inez<julianae.gerbillus<minutus.inez<rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>, dogramacii.aurata>, lavali.otion>, macrorhinos.konganensis>
 
         colocolo(): quasiater.bobrinskoi { var x: quasiater.bobrinskoi; () => { var y = this; }; return x; }
->colocolo : () => bobrinskoi
+>colocolo : () => quasiater.bobrinskoi
 >quasiater : quasiater
->bobrinskoi : bobrinskoi
->x : bobrinskoi
+>bobrinskoi : quasiater.bobrinskoi
+>x : quasiater.bobrinskoi
 >quasiater : quasiater
->bobrinskoi : bobrinskoi
+>bobrinskoi : quasiater.bobrinskoi
 >() => { var y = this; } : () => void
 >y : fuscus<T0, T1>
 >this : fuscus<T0, T1>
->x : bobrinskoi
+>x : quasiater.bobrinskoi
 
         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 : () => rosalia<megalonyx, abidi<kaiseri, wilsoni>>
+>wolfi : () => petrophilus.rosalia<Lanthanum.megalonyx, panglima.abidi<dogramacii.kaiseri, lavali.wilsoni>>
 >petrophilus : petrophilus
->rosalia : rosalia<T0, T1>
+>rosalia : petrophilus.rosalia<T0, T1>
 >Lanthanum : Lanthanum
->megalonyx : megalonyx
+>megalonyx : Lanthanum.megalonyx
 >panglima : panglima
->abidi : abidi<T0, T1>
+>abidi : panglima.abidi<T0, T1>
 >dogramacii : dogramacii
->kaiseri : kaiseri
+>kaiseri : dogramacii.kaiseri
 >lavali : lavali
->wilsoni : wilsoni
->x : rosalia<megalonyx, abidi<kaiseri, wilsoni>>
+>wilsoni : lavali.wilsoni
+>x : petrophilus.rosalia<Lanthanum.megalonyx, panglima.abidi<dogramacii.kaiseri, lavali.wilsoni>>
 >petrophilus : petrophilus
->rosalia : rosalia<T0, T1>
+>rosalia : petrophilus.rosalia<T0, T1>
 >Lanthanum : Lanthanum
->megalonyx : megalonyx
+>megalonyx : Lanthanum.megalonyx
 >panglima : panglima
->abidi : abidi<T0, T1>
+>abidi : panglima.abidi<T0, T1>
 >dogramacii : dogramacii
->kaiseri : kaiseri
+>kaiseri : dogramacii.kaiseri
 >lavali : lavali
->wilsoni : wilsoni
+>wilsoni : lavali.wilsoni
 >() => { var y = this; } : () => void
 >y : fuscus<T0, T1>
 >this : fuscus<T0, T1>
->x : rosalia<megalonyx, abidi<kaiseri, wilsoni>>
+>x : petrophilus.rosalia<Lanthanum.megalonyx, panglima.abidi<dogramacii.kaiseri, lavali.wilsoni>>
     }
     export class pallidus {
 >pallidus : pallidus
 
         oblativa(): trivirgatus.falconeri { var x: trivirgatus.falconeri; () => { var y = this; }; return x; }
->oblativa : () => falconeri
+>oblativa : () => trivirgatus.falconeri
 >trivirgatus : trivirgatus
->falconeri : falconeri
->x : falconeri
+>falconeri : trivirgatus.falconeri
+>x : trivirgatus.falconeri
 >trivirgatus : trivirgatus
->falconeri : falconeri
+>falconeri : trivirgatus.falconeri
 >() => { var y = this; } : () => void
 >y : pallidus
 >this : pallidus
->x : falconeri
+>x : trivirgatus.falconeri
 
         watersi(): lavali.wilsoni { var x: lavali.wilsoni; () => { var y = this; }; return x; }
->watersi : () => wilsoni
+>watersi : () => lavali.wilsoni
 >lavali : lavali
->wilsoni : wilsoni
->x : wilsoni
+>wilsoni : lavali.wilsoni
+>x : lavali.wilsoni
 >lavali : lavali
->wilsoni : wilsoni
+>wilsoni : lavali.wilsoni
 >() => { var y = this; } : () => void
 >y : pallidus
 >this : pallidus
->x : wilsoni
+>x : lavali.wilsoni
 
         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 : () => cinereus<caucasica<sumatrana, oconnelli>, wattsi<galapagoensis, linulus<xanthognathus, konganensis>>>
+>glacialis : () => sagitta.cinereus<nigra.caucasica<julianae.sumatrana, trivirgatus.oconnelli>, quasiater.wattsi<julianae.galapagoensis, panamensis.linulus<lavali.xanthognathus, macrorhinos.konganensis>>>
 >sagitta : sagitta
->cinereus : cinereus<T0, T1>
+>cinereus : sagitta.cinereus<T0, T1>
 >nigra : nigra
->caucasica : caucasica<T0, T1>
+>caucasica : nigra.caucasica<T0, T1>
 >julianae : julianae
->sumatrana : sumatrana
+>sumatrana : julianae.sumatrana
 >trivirgatus : trivirgatus
->oconnelli : oconnelli
+>oconnelli : trivirgatus.oconnelli
 >quasiater : quasiater
->wattsi : wattsi<T0, T1>
+>wattsi : quasiater.wattsi<T0, T1>
 >julianae : julianae
->galapagoensis : galapagoensis
+>galapagoensis : julianae.galapagoensis
 >panamensis : panamensis
->linulus : linulus<T0, T1>
+>linulus : panamensis.linulus<T0, T1>
 >lavali : lavali
->xanthognathus : xanthognathus
+>xanthognathus : lavali.xanthognathus
 >macrorhinos : macrorhinos
->konganensis : konganensis
->x : cinereus<caucasica<sumatrana, oconnelli>, wattsi<galapagoensis, linulus<xanthognathus, konganensis>>>
+>konganensis : macrorhinos.konganensis
+>x : sagitta.cinereus<nigra.caucasica<julianae.sumatrana, trivirgatus.oconnelli>, quasiater.wattsi<julianae.galapagoensis, panamensis.linulus<lavali.xanthognathus, macrorhinos.konganensis>>>
 >sagitta : sagitta
->cinereus : cinereus<T0, T1>
+>cinereus : sagitta.cinereus<T0, T1>
 >nigra : nigra
->caucasica : caucasica<T0, T1>
+>caucasica : nigra.caucasica<T0, T1>
 >julianae : julianae
->sumatrana : sumatrana
+>sumatrana : julianae.sumatrana
 >trivirgatus : trivirgatus
->oconnelli : oconnelli
+>oconnelli : trivirgatus.oconnelli
 >quasiater : quasiater
->wattsi : wattsi<T0, T1>
+>wattsi : quasiater.wattsi<T0, T1>
 >julianae : julianae
->galapagoensis : galapagoensis
+>galapagoensis : julianae.galapagoensis
 >panamensis : panamensis
->linulus : linulus<T0, T1>
+>linulus : panamensis.linulus<T0, T1>
 >lavali : lavali
->xanthognathus : xanthognathus
+>xanthognathus : lavali.xanthognathus
 >macrorhinos : macrorhinos
->konganensis : konganensis
+>konganensis : macrorhinos.konganensis
 >() => { var y = this; } : () => void
 >y : pallidus
 >this : pallidus
->x : cinereus<caucasica<sumatrana, oconnelli>, wattsi<galapagoensis, linulus<xanthognathus, konganensis>>>
+>x : sagitta.cinereus<nigra.caucasica<julianae.sumatrana, trivirgatus.oconnelli>, quasiater.wattsi<julianae.galapagoensis, panamensis.linulus<lavali.xanthognathus, macrorhinos.konganensis>>>
 
         viaria(): chrysaeolus.sarasinorum<lavali.xanthognathus, lutreolus.punicus> { var x: chrysaeolus.sarasinorum<lavali.xanthognathus, lutreolus.punicus>; () => { var y = this; }; return x; }
->viaria : () => sarasinorum<xanthognathus, punicus>
+>viaria : () => chrysaeolus.sarasinorum<lavali.xanthognathus, lutreolus.punicus>
 >chrysaeolus : chrysaeolus
->sarasinorum : sarasinorum<T0, T1>
+>sarasinorum : chrysaeolus.sarasinorum<T0, T1>
 >lavali : lavali
->xanthognathus : xanthognathus
+>xanthognathus : lavali.xanthognathus
 >lutreolus : lutreolus
->punicus : punicus
->x : sarasinorum<xanthognathus, punicus>
+>punicus : lutreolus.punicus
+>x : chrysaeolus.sarasinorum<lavali.xanthognathus, lutreolus.punicus>
 >chrysaeolus : chrysaeolus
->sarasinorum : sarasinorum<T0, T1>
+>sarasinorum : chrysaeolus.sarasinorum<T0, T1>
 >lavali : lavali
->xanthognathus : xanthognathus
+>xanthognathus : lavali.xanthognathus
 >lutreolus : lutreolus
->punicus : punicus
+>punicus : lutreolus.punicus
 >() => { var y = this; } : () => void
 >y : pallidus
 >this : pallidus
->x : sarasinorum<xanthognathus, punicus>
+>x : chrysaeolus.sarasinorum<lavali.xanthognathus, lutreolus.punicus>
     }
     export class cahirinus<T0, T1> {
 >cahirinus : cahirinus<T0, T1>
@@ -7933,266 +7933,266 @@ module samarensis {
 >T1 : T1
 
         alashanicus(): nigra.caucasica<ruatanica.americanus, argurus.peninsulae> { var x: nigra.caucasica<ruatanica.americanus, argurus.peninsulae>; () => { var y = this; }; return x; }
->alashanicus : () => caucasica<americanus, peninsulae>
+>alashanicus : () => nigra.caucasica<ruatanica.americanus, argurus.peninsulae>
 >nigra : nigra
->caucasica : caucasica<T0, T1>
+>caucasica : nigra.caucasica<T0, T1>
 >ruatanica : ruatanica
->americanus : americanus
+>americanus : ruatanica.americanus
 >argurus : argurus
->peninsulae : peninsulae
->x : caucasica<americanus, peninsulae>
+>peninsulae : argurus.peninsulae
+>x : nigra.caucasica<ruatanica.americanus, argurus.peninsulae>
 >nigra : nigra
->caucasica : caucasica<T0, T1>
+>caucasica : nigra.caucasica<T0, T1>
 >ruatanica : ruatanica
->americanus : americanus
+>americanus : ruatanica.americanus
 >argurus : argurus
->peninsulae : peninsulae
+>peninsulae : argurus.peninsulae
 >() => { var y = this; } : () => void
 >y : cahirinus<T0, T1>
 >this : cahirinus<T0, T1>
->x : caucasica<americanus, peninsulae>
+>x : nigra.caucasica<ruatanica.americanus, argurus.peninsulae>
 
         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 : () => tumidifrons<thaeleri, arboreus<minutilla, peninsulae>>
+>flaviventer : () => trivirgatus.tumidifrons<lavali.thaeleri, daubentonii.arboreus<petrophilus.minutilla, argurus.peninsulae>>
 >trivirgatus : trivirgatus
->tumidifrons : tumidifrons<T0, T1>
+>tumidifrons : trivirgatus.tumidifrons<T0, T1>
 >lavali : lavali
->thaeleri : thaeleri
+>thaeleri : lavali.thaeleri
 >daubentonii : daubentonii
->arboreus : arboreus<T0, T1>
+>arboreus : daubentonii.arboreus<T0, T1>
 >petrophilus : petrophilus
->minutilla : minutilla
+>minutilla : petrophilus.minutilla
 >argurus : argurus
->peninsulae : peninsulae
->x : tumidifrons<thaeleri, arboreus<minutilla, peninsulae>>
+>peninsulae : argurus.peninsulae
+>x : trivirgatus.tumidifrons<lavali.thaeleri, daubentonii.arboreus<petrophilus.minutilla, argurus.peninsulae>>
 >trivirgatus : trivirgatus
->tumidifrons : tumidifrons<T0, T1>
+>tumidifrons : trivirgatus.tumidifrons<T0, T1>
 >lavali : lavali
->thaeleri : thaeleri
+>thaeleri : lavali.thaeleri
 >daubentonii : daubentonii
->arboreus : arboreus<T0, T1>
+>arboreus : daubentonii.arboreus<T0, T1>
 >petrophilus : petrophilus
->minutilla : minutilla
+>minutilla : petrophilus.minutilla
 >argurus : argurus
->peninsulae : peninsulae
+>peninsulae : argurus.peninsulae
 >() => { var y = this; } : () => void
 >y : cahirinus<T0, T1>
 >this : cahirinus<T0, T1>
->x : tumidifrons<thaeleri, arboreus<minutilla, peninsulae>>
+>x : trivirgatus.tumidifrons<lavali.thaeleri, daubentonii.arboreus<petrophilus.minutilla, argurus.peninsulae>>
 
         bottai(): lutreolus.schlegeli { var x: lutreolus.schlegeli; () => { var y = this; }; return x; }
->bottai : () => schlegeli
+>bottai : () => lutreolus.schlegeli
 >lutreolus : lutreolus
->schlegeli : schlegeli
->x : schlegeli
+>schlegeli : lutreolus.schlegeli
+>x : lutreolus.schlegeli
 >lutreolus : lutreolus
->schlegeli : schlegeli
+>schlegeli : lutreolus.schlegeli
 >() => { var y = this; } : () => void
 >y : cahirinus<T0, T1>
 >this : cahirinus<T0, T1>
->x : schlegeli
+>x : lutreolus.schlegeli
 
         pinetis(): argurus.oreas { var x: argurus.oreas; () => { var y = this; }; return x; }
->pinetis : () => oreas
+>pinetis : () => argurus.oreas
 >argurus : argurus
->oreas : oreas
->x : oreas
+>oreas : argurus.oreas
+>x : argurus.oreas
 >argurus : argurus
->oreas : oreas
+>oreas : argurus.oreas
 >() => { var y = this; } : () => void
 >y : cahirinus<T0, T1>
 >this : cahirinus<T0, T1>
->x : oreas
+>x : argurus.oreas
 
         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 : () => crenulata<klossii<nudicaudus, aurata>, netscheri<inez<peninsulae, nudicaudus>, oralis<xanthognathus, oreas>>>
+>saussurei : () => rendalli.crenulata<gabriellae.klossii<julianae.nudicaudus, dogramacii.aurata>, argurus.netscheri<minutus.inez<argurus.peninsulae, julianae.nudicaudus>, julianae.oralis<lavali.xanthognathus, argurus.oreas>>>
 >rendalli : rendalli
->crenulata : crenulata<T0, T1>
+>crenulata : rendalli.crenulata<T0, T1>
 >gabriellae : gabriellae
->klossii : klossii<T0, T1>
+>klossii : gabriellae.klossii<T0, T1>
 >julianae : julianae
->nudicaudus : nudicaudus
+>nudicaudus : julianae.nudicaudus
 >dogramacii : dogramacii
->aurata : aurata
+>aurata : dogramacii.aurata
 >argurus : argurus
->netscheri : netscheri<T0, T1>
+>netscheri : argurus.netscheri<T0, T1>
 >minutus : minutus
->inez : inez<T0, T1>
+>inez : minutus.inez<T0, T1>
 >argurus : argurus
->peninsulae : peninsulae
+>peninsulae : argurus.peninsulae
 >julianae : julianae
->nudicaudus : nudicaudus
+>nudicaudus : julianae.nudicaudus
 >julianae : julianae
->oralis : oralis<T0, T1>
+>oralis : julianae.oralis<T0, T1>
 >lavali : lavali
->xanthognathus : xanthognathus
+>xanthognathus : lavali.xanthognathus
 >argurus : argurus
->oreas : oreas
->x : crenulata<klossii<nudicaudus, aurata>, netscheri<inez<peninsulae, nudicaudus>, oralis<xanthognathus, oreas>>>
+>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 : rendalli
->crenulata : crenulata<T0, T1>
+>crenulata : rendalli.crenulata<T0, T1>
 >gabriellae : gabriellae
->klossii : klossii<T0, T1>
+>klossii : gabriellae.klossii<T0, T1>
 >julianae : julianae
->nudicaudus : nudicaudus
+>nudicaudus : julianae.nudicaudus
 >dogramacii : dogramacii
->aurata : aurata
+>aurata : dogramacii.aurata
 >argurus : argurus
->netscheri : netscheri<T0, T1>
+>netscheri : argurus.netscheri<T0, T1>
 >minutus : minutus
->inez : inez<T0, T1>
+>inez : minutus.inez<T0, T1>
 >argurus : argurus
->peninsulae : peninsulae
+>peninsulae : argurus.peninsulae
 >julianae : julianae
->nudicaudus : nudicaudus
+>nudicaudus : julianae.nudicaudus
 >julianae : julianae
->oralis : oralis<T0, T1>
+>oralis : julianae.oralis<T0, T1>
 >lavali : lavali
->xanthognathus : xanthognathus
+>xanthognathus : lavali.xanthognathus
 >argurus : argurus
->oreas : oreas
+>oreas : argurus.oreas
 >() => { var y = this; } : () => void
 >y : cahirinus<T0, T1>
 >this : cahirinus<T0, T1>
->x : crenulata<klossii<nudicaudus, aurata>, netscheri<inez<peninsulae, nudicaudus>, oralis<xanthognathus, oreas>>>
+>x : rendalli.crenulata<gabriellae.klossii<julianae.nudicaudus, dogramacii.aurata>, argurus.netscheri<minutus.inez<argurus.peninsulae, julianae.nudicaudus>, julianae.oralis<lavali.xanthognathus, argurus.oreas>>>
     }
 }
 module sagitta {
->sagitta : typeof sagitta
+>sagitta : 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 : caurinus
->johorensis : johorensis<T0, T1>
+>johorensis : caurinus.johorensis<T0, T1>
 >argurus : argurus
->peninsulae : peninsulae
+>peninsulae : argurus.peninsulae
 >daubentonii : daubentonii
->arboreus : arboreus<T0, T1>
+>arboreus : daubentonii.arboreus<T0, T1>
 >argurus : argurus
->germaini : germaini
+>germaini : argurus.germaini
 >sagitta : sagitta
 >stolzmanni : stolzmanni
 
         victus(): rionegrensis.caniventer { var x: rionegrensis.caniventer; () => { var y = this; }; return x; }
->victus : () => caniventer
+>victus : () => rionegrensis.caniventer
 >rionegrensis : rionegrensis
->caniventer : caniventer
->x : caniventer
+>caniventer : rionegrensis.caniventer
+>x : rionegrensis.caniventer
 >rionegrensis : rionegrensis
->caniventer : caniventer
+>caniventer : rionegrensis.caniventer
 >() => { var y = this; } : () => void
 >y : leptoceros<T0, T1>
 >this : leptoceros<T0, T1>
->x : caniventer
+>x : rionegrensis.caniventer
 
         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 : () => fundatus<gerbillus<subspinosus, durangae>, gracilis<luctuosa, subspinosus>>
+>hoplomyoides : () => panglima.fundatus<julianae.gerbillus<imperfecta.subspinosus, julianae.durangae>, nigra.gracilis<argurus.luctuosa, imperfecta.subspinosus>>
 >panglima : panglima
->fundatus : fundatus<T0, T1>
+>fundatus : panglima.fundatus<T0, T1>
 >julianae : julianae
->gerbillus : gerbillus<T0, T1>
+>gerbillus : julianae.gerbillus<T0, T1>
 >imperfecta : imperfecta
->subspinosus : subspinosus
+>subspinosus : imperfecta.subspinosus
 >julianae : julianae
->durangae : durangae
+>durangae : julianae.durangae
 >nigra : nigra
->gracilis : gracilis<T0, T1>
+>gracilis : nigra.gracilis<T0, T1>
 >argurus : argurus
->luctuosa : luctuosa
+>luctuosa : argurus.luctuosa
 >imperfecta : imperfecta
->subspinosus : subspinosus
->x : fundatus<gerbillus<subspinosus, durangae>, gracilis<luctuosa, subspinosus>>
+>subspinosus : imperfecta.subspinosus
+>x : panglima.fundatus<julianae.gerbillus<imperfecta.subspinosus, julianae.durangae>, nigra.gracilis<argurus.luctuosa, imperfecta.subspinosus>>
 >panglima : panglima
->fundatus : fundatus<T0, T1>
+>fundatus : panglima.fundatus<T0, T1>
 >julianae : julianae
->gerbillus : gerbillus<T0, T1>
+>gerbillus : julianae.gerbillus<T0, T1>
 >imperfecta : imperfecta
->subspinosus : subspinosus
+>subspinosus : imperfecta.subspinosus
 >julianae : julianae
->durangae : durangae
+>durangae : julianae.durangae
 >nigra : nigra
->gracilis : gracilis<T0, T1>
+>gracilis : nigra.gracilis<T0, T1>
 >argurus : argurus
->luctuosa : luctuosa
+>luctuosa : argurus.luctuosa
 >imperfecta : imperfecta
->subspinosus : subspinosus
+>subspinosus : imperfecta.subspinosus
 >() => { var y = this; } : () => void
 >y : leptoceros<T0, T1>
 >this : leptoceros<T0, T1>
->x : fundatus<gerbillus<subspinosus, durangae>, gracilis<luctuosa, subspinosus>>
+>x : panglima.fundatus<julianae.gerbillus<imperfecta.subspinosus, julianae.durangae>, nigra.gracilis<argurus.luctuosa, imperfecta.subspinosus>>
 
         gratiosus(): lavali.lepturus { var x: lavali.lepturus; () => { var y = this; }; return x; }
->gratiosus : () => lepturus
+>gratiosus : () => lavali.lepturus
 >lavali : lavali
->lepturus : lepturus
->x : lepturus
+>lepturus : lavali.lepturus
+>x : lavali.lepturus
 >lavali : lavali
->lepturus : lepturus
+>lepturus : lavali.lepturus
 >() => { var y = this; } : () => void
 >y : leptoceros<T0, T1>
 >this : leptoceros<T0, T1>
->x : lepturus
+>x : lavali.lepturus
 
         rex(): lavali.wilsoni { var x: lavali.wilsoni; () => { var y = this; }; return x; }
->rex : () => wilsoni
+>rex : () => lavali.wilsoni
 >lavali : lavali
->wilsoni : wilsoni
->x : wilsoni
+>wilsoni : lavali.wilsoni
+>x : lavali.wilsoni
 >lavali : lavali
->wilsoni : wilsoni
+>wilsoni : lavali.wilsoni
 >() => { var y = this; } : () => void
 >y : leptoceros<T0, T1>
 >this : leptoceros<T0, T1>
->x : wilsoni
+>x : lavali.wilsoni
 
         bolami(): trivirgatus.tumidifrons<lutreolus.schlegeli, ruatanica.americanus> { var x: trivirgatus.tumidifrons<lutreolus.schlegeli, ruatanica.americanus>; () => { var y = this; }; return x; }
->bolami : () => tumidifrons<schlegeli, americanus>
+>bolami : () => trivirgatus.tumidifrons<lutreolus.schlegeli, ruatanica.americanus>
 >trivirgatus : trivirgatus
->tumidifrons : tumidifrons<T0, T1>
+>tumidifrons : trivirgatus.tumidifrons<T0, T1>
 >lutreolus : lutreolus
->schlegeli : schlegeli
+>schlegeli : lutreolus.schlegeli
 >ruatanica : ruatanica
->americanus : americanus
->x : tumidifrons<schlegeli, americanus>
+>americanus : ruatanica.americanus
+>x : trivirgatus.tumidifrons<lutreolus.schlegeli, ruatanica.americanus>
 >trivirgatus : trivirgatus
->tumidifrons : tumidifrons<T0, T1>
+>tumidifrons : trivirgatus.tumidifrons<T0, T1>
 >lutreolus : lutreolus
->schlegeli : schlegeli
+>schlegeli : lutreolus.schlegeli
 >ruatanica : ruatanica
->americanus : americanus
+>americanus : ruatanica.americanus
 >() => { var y = this; } : () => void
 >y : leptoceros<T0, T1>
 >this : leptoceros<T0, T1>
->x : tumidifrons<schlegeli, americanus>
+>x : trivirgatus.tumidifrons<lutreolus.schlegeli, ruatanica.americanus>
     }
 }
 module daubentonii {
->daubentonii : typeof daubentonii
+>daubentonii : daubentonii
 
     export class nigricans<T0, T1> extends sagitta.stolzmanni {
 >nigricans : nigricans<T0, T1>
 >T0 : T0
 >T1 : T1
 >sagitta : sagitta
->stolzmanni : stolzmanni
+>stolzmanni : sagitta.stolzmanni
 
         woosnami(): dogramacii.robustulus { var x: dogramacii.robustulus; () => { var y = this; }; return x; }
->woosnami : () => robustulus
+>woosnami : () => dogramacii.robustulus
 >dogramacii : dogramacii
->robustulus : robustulus
->x : robustulus
+>robustulus : dogramacii.robustulus
+>x : dogramacii.robustulus
 >dogramacii : dogramacii
->robustulus : robustulus
+>robustulus : dogramacii.robustulus
 >() => { var y = this; } : () => void
 >y : nigricans<T0, T1>
 >this : nigricans<T0, T1>
->x : robustulus
+>x : dogramacii.robustulus
     }
 }
 module dammermani {
->dammermani : typeof dammermani
+>dammermani : dammermani
 
     export class siberu<T0, T1> {
 >siberu : siberu<T0, T1>
@@ -8201,177 +8201,177 @@ module dammermani {
     }
 }
 module argurus {
->argurus : typeof argurus
+>argurus : argurus
 
     export class pygmaea<T0, T1> extends rendalli.moojeni<macrorhinos.konganensis, gabriellae.echinatus> {
 >pygmaea : pygmaea<T0, T1>
 >T0 : T0
 >T1 : T1
 >rendalli : rendalli
->moojeni : moojeni<T0, T1>
+>moojeni : rendalli.moojeni<T0, T1>
 >macrorhinos : macrorhinos
->konganensis : konganensis
+>konganensis : macrorhinos.konganensis
 >gabriellae : gabriellae
->echinatus : echinatus
+>echinatus : gabriellae.echinatus
 
         pajeros(): gabriellae.echinatus { var x: gabriellae.echinatus; () => { var y = this; }; return x; }
->pajeros : () => echinatus
+>pajeros : () => gabriellae.echinatus
 >gabriellae : gabriellae
->echinatus : echinatus
->x : echinatus
+>echinatus : gabriellae.echinatus
+>x : gabriellae.echinatus
 >gabriellae : gabriellae
->echinatus : echinatus
+>echinatus : gabriellae.echinatus
 >() => { var y = this; } : () => void
 >y : pygmaea<T0, T1>
 >this : pygmaea<T0, T1>
->x : echinatus
+>x : gabriellae.echinatus
 
         capucinus(): rendalli.zuluensis { var x: rendalli.zuluensis; () => { var y = this; }; return x; }
->capucinus : () => zuluensis
+>capucinus : () => rendalli.zuluensis
 >rendalli : rendalli
->zuluensis : zuluensis
->x : zuluensis
+>zuluensis : rendalli.zuluensis
+>x : rendalli.zuluensis
 >rendalli : rendalli
->zuluensis : zuluensis
+>zuluensis : rendalli.zuluensis
 >() => { var y = this; } : () => void
 >y : pygmaea<T0, T1>
 >this : pygmaea<T0, T1>
->x : zuluensis
+>x : rendalli.zuluensis
 
         cuvieri(): rionegrensis.caniventer { var x: rionegrensis.caniventer; () => { var y = this; }; return x; }
->cuvieri : () => caniventer
+>cuvieri : () => rionegrensis.caniventer
 >rionegrensis : rionegrensis
->caniventer : caniventer
->x : caniventer
+>caniventer : rionegrensis.caniventer
+>x : rionegrensis.caniventer
 >rionegrensis : rionegrensis
->caniventer : caniventer
+>caniventer : rionegrensis.caniventer
 >() => { var y = this; } : () => void
 >y : pygmaea<T0, T1>
 >this : pygmaea<T0, T1>
->x : caniventer
+>x : rionegrensis.caniventer
     }
 }
 module chrysaeolus {
->chrysaeolus : typeof chrysaeolus
+>chrysaeolus : chrysaeolus
 
     export class sarasinorum<T0, T1> extends caurinus.psilurus {
 >sarasinorum : sarasinorum<T0, T1>
 >T0 : T0
 >T1 : T1
 >caurinus : caurinus
->psilurus : psilurus
+>psilurus : caurinus.psilurus
 
         belzebul(): samarensis.pallidus { var x: samarensis.pallidus; () => { var y = this; }; return x; }
->belzebul : () => pallidus
+>belzebul : () => samarensis.pallidus
 >samarensis : samarensis
->pallidus : pallidus
->x : pallidus
+>pallidus : samarensis.pallidus
+>x : samarensis.pallidus
 >samarensis : samarensis
->pallidus : pallidus
+>pallidus : samarensis.pallidus
 >() => { var y = this; } : () => void
 >y : sarasinorum<T0, T1>
 >this : sarasinorum<T0, T1>
->x : pallidus
+>x : samarensis.pallidus
 
         hinpoon(): nigra.caucasica<julianae.sumatrana, trivirgatus.oconnelli> { var x: nigra.caucasica<julianae.sumatrana, trivirgatus.oconnelli>; () => { var y = this; }; return x; }
->hinpoon : () => caucasica<sumatrana, oconnelli>
+>hinpoon : () => nigra.caucasica<julianae.sumatrana, trivirgatus.oconnelli>
 >nigra : nigra
->caucasica : caucasica<T0, T1>
+>caucasica : nigra.caucasica<T0, T1>
 >julianae : julianae
->sumatrana : sumatrana
+>sumatrana : julianae.sumatrana
 >trivirgatus : trivirgatus
->oconnelli : oconnelli
->x : caucasica<sumatrana, oconnelli>
+>oconnelli : trivirgatus.oconnelli
+>x : nigra.caucasica<julianae.sumatrana, trivirgatus.oconnelli>
 >nigra : nigra
->caucasica : caucasica<T0, T1>
+>caucasica : nigra.caucasica<T0, T1>
 >julianae : julianae
->sumatrana : sumatrana
+>sumatrana : julianae.sumatrana
 >trivirgatus : trivirgatus
->oconnelli : oconnelli
+>oconnelli : trivirgatus.oconnelli
 >() => { var y = this; } : () => void
 >y : sarasinorum<T0, T1>
 >this : sarasinorum<T0, T1>
->x : caucasica<sumatrana, oconnelli>
+>x : nigra.caucasica<julianae.sumatrana, trivirgatus.oconnelli>
 
         kandti(): quasiater.wattsi<Lanthanum.jugularis, julianae.sumatrana> { var x: quasiater.wattsi<Lanthanum.jugularis, julianae.sumatrana>; () => { var y = this; }; return x; }
->kandti : () => wattsi<jugularis, sumatrana>
+>kandti : () => quasiater.wattsi<Lanthanum.jugularis, julianae.sumatrana>
 >quasiater : quasiater
->wattsi : wattsi<T0, T1>
+>wattsi : quasiater.wattsi<T0, T1>
 >Lanthanum : Lanthanum
->jugularis : jugularis
+>jugularis : Lanthanum.jugularis
 >julianae : julianae
->sumatrana : sumatrana
->x : wattsi<jugularis, sumatrana>
+>sumatrana : julianae.sumatrana
+>x : quasiater.wattsi<Lanthanum.jugularis, julianae.sumatrana>
 >quasiater : quasiater
->wattsi : wattsi<T0, T1>
+>wattsi : quasiater.wattsi<T0, T1>
 >Lanthanum : Lanthanum
->jugularis : jugularis
+>jugularis : Lanthanum.jugularis
 >julianae : julianae
->sumatrana : sumatrana
+>sumatrana : julianae.sumatrana
 >() => { var y = this; } : () => void
 >y : sarasinorum<T0, T1>
 >this : sarasinorum<T0, T1>
->x : wattsi<jugularis, sumatrana>
+>x : quasiater.wattsi<Lanthanum.jugularis, julianae.sumatrana>
 
         cynosuros(): dammermani.melanops { var x: dammermani.melanops; () => { var y = this; }; return x; }
->cynosuros : () => melanops
+>cynosuros : () => dammermani.melanops
 >dammermani : dammermani
->melanops : melanops
->x : melanops
+>melanops : dammermani.melanops
+>x : dammermani.melanops
 >dammermani : dammermani
->melanops : melanops
+>melanops : dammermani.melanops
 >() => { var y = this; } : () => void
 >y : sarasinorum<T0, T1>
 >this : sarasinorum<T0, T1>
->x : melanops
+>x : dammermani.melanops
 
         Germanium(): lavali.beisa { var x: lavali.beisa; () => { var y = this; }; return x; }
->Germanium : () => beisa
+>Germanium : () => lavali.beisa
 >lavali : lavali
->beisa : beisa
->x : beisa
+>beisa : lavali.beisa
+>x : lavali.beisa
 >lavali : lavali
->beisa : beisa
+>beisa : lavali.beisa
 >() => { var y = this; } : () => void
 >y : sarasinorum<T0, T1>
 >this : sarasinorum<T0, T1>
->x : beisa
+>x : lavali.beisa
 
         Ununoctium(): nigra.gracilis<lavali.xanthognathus, provocax.melanoleuca> { var x: nigra.gracilis<lavali.xanthognathus, provocax.melanoleuca>; () => { var y = this; }; return x; }
->Ununoctium : () => gracilis<xanthognathus, melanoleuca>
+>Ununoctium : () => nigra.gracilis<lavali.xanthognathus, provocax.melanoleuca>
 >nigra : nigra
->gracilis : gracilis<T0, T1>
+>gracilis : nigra.gracilis<T0, T1>
 >lavali : lavali
->xanthognathus : xanthognathus
+>xanthognathus : lavali.xanthognathus
 >provocax : provocax
->melanoleuca : melanoleuca
->x : gracilis<xanthognathus, melanoleuca>
+>melanoleuca : provocax.melanoleuca
+>x : nigra.gracilis<lavali.xanthognathus, provocax.melanoleuca>
 >nigra : nigra
->gracilis : gracilis<T0, T1>
+>gracilis : nigra.gracilis<T0, T1>
 >lavali : lavali
->xanthognathus : xanthognathus
+>xanthognathus : lavali.xanthognathus
 >provocax : provocax
->melanoleuca : melanoleuca
+>melanoleuca : provocax.melanoleuca
 >() => { var y = this; } : () => void
 >y : sarasinorum<T0, T1>
 >this : sarasinorum<T0, T1>
->x : gracilis<xanthognathus, melanoleuca>
+>x : nigra.gracilis<lavali.xanthognathus, provocax.melanoleuca>
 
         princeps(): minutus.portoricensis { var x: minutus.portoricensis; () => { var y = this; }; return x; }
->princeps : () => portoricensis
+>princeps : () => minutus.portoricensis
 >minutus : minutus
->portoricensis : portoricensis
->x : portoricensis
+>portoricensis : minutus.portoricensis
+>x : minutus.portoricensis
 >minutus : minutus
->portoricensis : portoricensis
+>portoricensis : minutus.portoricensis
 >() => { var y = this; } : () => void
 >y : sarasinorum<T0, T1>
 >this : sarasinorum<T0, T1>
->x : portoricensis
+>x : minutus.portoricensis
     }
 }
 module argurus {
->argurus : typeof argurus
+>argurus : argurus
 
     export class wetmorei<T0, T1> {
 >wetmorei : wetmorei<T0, T1>
@@ -8379,245 +8379,245 @@ module argurus {
 >T1 : T1
 
         leucoptera(): petrophilus.rosalia<dogramacii.koepckeae, lutreolus.foina> { var x: petrophilus.rosalia<dogramacii.koepckeae, lutreolus.foina>; () => { var y = this; }; return x; }
->leucoptera : () => rosalia<koepckeae, foina>
+>leucoptera : () => petrophilus.rosalia<dogramacii.koepckeae, lutreolus.foina>
 >petrophilus : petrophilus
->rosalia : rosalia<T0, T1>
+>rosalia : petrophilus.rosalia<T0, T1>
 >dogramacii : dogramacii
->koepckeae : koepckeae
+>koepckeae : dogramacii.koepckeae
 >lutreolus : lutreolus
->foina : foina
->x : rosalia<koepckeae, foina>
+>foina : lutreolus.foina
+>x : petrophilus.rosalia<dogramacii.koepckeae, lutreolus.foina>
 >petrophilus : petrophilus
->rosalia : rosalia<T0, T1>
+>rosalia : petrophilus.rosalia<T0, T1>
 >dogramacii : dogramacii
->koepckeae : koepckeae
+>koepckeae : dogramacii.koepckeae
 >lutreolus : lutreolus
->foina : foina
+>foina : lutreolus.foina
 >() => { var y = this; } : () => void
 >y : wetmorei<T0, T1>
 >this : wetmorei<T0, T1>
->x : rosalia<koepckeae, foina>
+>x : petrophilus.rosalia<dogramacii.koepckeae, lutreolus.foina>
 
         ochraventer(): sagitta.walkeri { var x: sagitta.walkeri; () => { var y = this; }; return x; }
->ochraventer : () => walkeri
+>ochraventer : () => sagitta.walkeri
 >sagitta : sagitta
->walkeri : walkeri
->x : walkeri
+>walkeri : sagitta.walkeri
+>x : sagitta.walkeri
 >sagitta : sagitta
->walkeri : walkeri
+>walkeri : sagitta.walkeri
 >() => { var y = this; } : () => void
 >y : wetmorei<T0, T1>
 >this : wetmorei<T0, T1>
->x : walkeri
+>x : sagitta.walkeri
 
         tephromelas(): Lanthanum.jugularis { var x: Lanthanum.jugularis; () => { var y = this; }; return x; }
->tephromelas : () => jugularis
+>tephromelas : () => Lanthanum.jugularis
 >Lanthanum : Lanthanum
->jugularis : jugularis
->x : jugularis
+>jugularis : Lanthanum.jugularis
+>x : Lanthanum.jugularis
 >Lanthanum : Lanthanum
->jugularis : jugularis
+>jugularis : Lanthanum.jugularis
 >() => { var y = this; } : () => void
 >y : wetmorei<T0, T1>
 >this : wetmorei<T0, T1>
->x : jugularis
+>x : Lanthanum.jugularis
 
         cracens(): argurus.gilbertii<lavali.thaeleri, lutreolus.punicus> { var x: argurus.gilbertii<lavali.thaeleri, lutreolus.punicus>; () => { var y = this; }; return x; }
->cracens : () => gilbertii<thaeleri, punicus>
+>cracens : () => gilbertii<lavali.thaeleri, lutreolus.punicus>
 >argurus : argurus
 >gilbertii : gilbertii<T0, T1>
 >lavali : lavali
->thaeleri : thaeleri
+>thaeleri : lavali.thaeleri
 >lutreolus : lutreolus
->punicus : punicus
->x : gilbertii<thaeleri, punicus>
+>punicus : lutreolus.punicus
+>x : gilbertii<lavali.thaeleri, lutreolus.punicus>
 >argurus : argurus
 >gilbertii : gilbertii<T0, T1>
 >lavali : lavali
->thaeleri : thaeleri
+>thaeleri : lavali.thaeleri
 >lutreolus : lutreolus
->punicus : punicus
+>punicus : lutreolus.punicus
 >() => { var y = this; } : () => void
 >y : wetmorei<T0, T1>
 >this : wetmorei<T0, T1>
->x : gilbertii<thaeleri, punicus>
+>x : gilbertii<lavali.thaeleri, lutreolus.punicus>
 
         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 : () => thalia<marcanoi, veraecrucis<falconeri, carolinensis>>
+>jamaicensis : () => nigra.thalia<howi.marcanoi, rionegrensis.veraecrucis<trivirgatus.falconeri, quasiater.carolinensis>>
 >nigra : nigra
->thalia : thalia<T0, T1>
+>thalia : nigra.thalia<T0, T1>
 >howi : howi
->marcanoi : marcanoi
+>marcanoi : howi.marcanoi
 >rionegrensis : rionegrensis
->veraecrucis : veraecrucis<T0, T1>
+>veraecrucis : rionegrensis.veraecrucis<T0, T1>
 >trivirgatus : trivirgatus
->falconeri : falconeri
+>falconeri : trivirgatus.falconeri
 >quasiater : quasiater
->carolinensis : carolinensis
->x : thalia<marcanoi, veraecrucis<falconeri, carolinensis>>
+>carolinensis : quasiater.carolinensis
+>x : nigra.thalia<howi.marcanoi, rionegrensis.veraecrucis<trivirgatus.falconeri, quasiater.carolinensis>>
 >nigra : nigra
->thalia : thalia<T0, T1>
+>thalia : nigra.thalia<T0, T1>
 >howi : howi
->marcanoi : marcanoi
+>marcanoi : howi.marcanoi
 >rionegrensis : rionegrensis
->veraecrucis : veraecrucis<T0, T1>
+>veraecrucis : rionegrensis.veraecrucis<T0, T1>
 >trivirgatus : trivirgatus
->falconeri : falconeri
+>falconeri : trivirgatus.falconeri
 >quasiater : quasiater
->carolinensis : carolinensis
+>carolinensis : quasiater.carolinensis
 >() => { var y = this; } : () => void
 >y : wetmorei<T0, T1>
 >this : wetmorei<T0, T1>
->x : thalia<marcanoi, veraecrucis<falconeri, carolinensis>>
+>x : nigra.thalia<howi.marcanoi, rionegrensis.veraecrucis<trivirgatus.falconeri, quasiater.carolinensis>>
 
         gymnocaudus(): dogramacii.aurata { var x: dogramacii.aurata; () => { var y = this; }; return x; }
->gymnocaudus : () => aurata
+>gymnocaudus : () => dogramacii.aurata
 >dogramacii : dogramacii
->aurata : aurata
->x : aurata
+>aurata : dogramacii.aurata
+>x : dogramacii.aurata
 >dogramacii : dogramacii
->aurata : aurata
+>aurata : dogramacii.aurata
 >() => { var y = this; } : () => void
 >y : wetmorei<T0, T1>
 >this : wetmorei<T0, T1>
->x : aurata
+>x : dogramacii.aurata
 
         mayori(): sagitta.stolzmanni { var x: sagitta.stolzmanni; () => { var y = this; }; return x; }
->mayori : () => stolzmanni
+>mayori : () => sagitta.stolzmanni
 >sagitta : sagitta
->stolzmanni : stolzmanni
->x : stolzmanni
+>stolzmanni : sagitta.stolzmanni
+>x : sagitta.stolzmanni
 >sagitta : sagitta
->stolzmanni : stolzmanni
+>stolzmanni : sagitta.stolzmanni
 >() => { var y = this; } : () => void
 >y : wetmorei<T0, T1>
 >this : wetmorei<T0, T1>
->x : stolzmanni
+>x : sagitta.stolzmanni
     }
 }
 module argurus {
->argurus : typeof argurus
+>argurus : argurus
 
     export class oreas extends lavali.wilsoni {
 >oreas : oreas
 >lavali : lavali
->wilsoni : wilsoni
+>wilsoni : lavali.wilsoni
 
         salamonis(): lavali.xanthognathus { var x: lavali.xanthognathus; () => { var y = this; }; return x; }
->salamonis : () => xanthognathus
+>salamonis : () => lavali.xanthognathus
 >lavali : lavali
->xanthognathus : xanthognathus
->x : xanthognathus
+>xanthognathus : lavali.xanthognathus
+>x : lavali.xanthognathus
 >lavali : lavali
->xanthognathus : xanthognathus
+>xanthognathus : lavali.xanthognathus
 >() => { var y = this; } : () => void
 >y : oreas
 >this : oreas
->x : xanthognathus
+>x : lavali.xanthognathus
 
         paniscus(): ruatanica.Praseodymium<caurinus.psilurus, lavali.xanthognathus> { var x: ruatanica.Praseodymium<caurinus.psilurus, lavali.xanthognathus>; () => { var y = this; }; return x; }
->paniscus : () => Praseodymium<psilurus, xanthognathus>
+>paniscus : () => ruatanica.Praseodymium<caurinus.psilurus, lavali.xanthognathus>
 >ruatanica : ruatanica
->Praseodymium : Praseodymium<T0, T1>
+>Praseodymium : ruatanica.Praseodymium<T0, T1>
 >caurinus : caurinus
->psilurus : psilurus
+>psilurus : caurinus.psilurus
 >lavali : lavali
->xanthognathus : xanthognathus
->x : Praseodymium<psilurus, xanthognathus>
+>xanthognathus : lavali.xanthognathus
+>x : ruatanica.Praseodymium<caurinus.psilurus, lavali.xanthognathus>
 >ruatanica : ruatanica
->Praseodymium : Praseodymium<T0, T1>
+>Praseodymium : ruatanica.Praseodymium<T0, T1>
 >caurinus : caurinus
->psilurus : psilurus
+>psilurus : caurinus.psilurus
 >lavali : lavali
->xanthognathus : xanthognathus
+>xanthognathus : lavali.xanthognathus
 >() => { var y = this; } : () => void
 >y : oreas
 >this : oreas
->x : Praseodymium<psilurus, xanthognathus>
+>x : ruatanica.Praseodymium<caurinus.psilurus, lavali.xanthognathus>
 
         fagani(): trivirgatus.oconnelli { var x: trivirgatus.oconnelli; () => { var y = this; }; return x; }
->fagani : () => oconnelli
+>fagani : () => trivirgatus.oconnelli
 >trivirgatus : trivirgatus
->oconnelli : oconnelli
->x : oconnelli
+>oconnelli : trivirgatus.oconnelli
+>x : trivirgatus.oconnelli
 >trivirgatus : trivirgatus
->oconnelli : oconnelli
+>oconnelli : trivirgatus.oconnelli
 >() => { var y = this; } : () => void
 >y : oreas
 >this : oreas
->x : oconnelli
+>x : trivirgatus.oconnelli
 
         papuanus(): panglima.fundatus<quasiater.carolinensis, macrorhinos.daphaenodon> { var x: panglima.fundatus<quasiater.carolinensis, macrorhinos.daphaenodon>; () => { var y = this; }; return x; }
->papuanus : () => fundatus<carolinensis, daphaenodon>
+>papuanus : () => panglima.fundatus<quasiater.carolinensis, macrorhinos.daphaenodon>
 >panglima : panglima
->fundatus : fundatus<T0, T1>
+>fundatus : panglima.fundatus<T0, T1>
 >quasiater : quasiater
->carolinensis : carolinensis
+>carolinensis : quasiater.carolinensis
 >macrorhinos : macrorhinos
->daphaenodon : daphaenodon
->x : fundatus<carolinensis, daphaenodon>
+>daphaenodon : macrorhinos.daphaenodon
+>x : panglima.fundatus<quasiater.carolinensis, macrorhinos.daphaenodon>
 >panglima : panglima
->fundatus : fundatus<T0, T1>
+>fundatus : panglima.fundatus<T0, T1>
 >quasiater : quasiater
->carolinensis : carolinensis
+>carolinensis : quasiater.carolinensis
 >macrorhinos : macrorhinos
->daphaenodon : daphaenodon
+>daphaenodon : macrorhinos.daphaenodon
 >() => { var y = this; } : () => void
 >y : oreas
 >this : oreas
->x : fundatus<carolinensis, daphaenodon>
+>x : panglima.fundatus<quasiater.carolinensis, macrorhinos.daphaenodon>
 
         timidus(): dammermani.melanops { var x: dammermani.melanops; () => { var y = this; }; return x; }
->timidus : () => melanops
+>timidus : () => dammermani.melanops
 >dammermani : dammermani
->melanops : melanops
->x : melanops
+>melanops : dammermani.melanops
+>x : dammermani.melanops
 >dammermani : dammermani
->melanops : melanops
+>melanops : dammermani.melanops
 >() => { var y = this; } : () => void
 >y : oreas
 >this : oreas
->x : melanops
+>x : dammermani.melanops
 
         nghetinhensis(): gabriellae.klossii<argurus.luctuosa, julianae.steerii> { var x: gabriellae.klossii<argurus.luctuosa, julianae.steerii>; () => { var y = this; }; return x; }
->nghetinhensis : () => klossii<luctuosa, steerii>
+>nghetinhensis : () => gabriellae.klossii<luctuosa, julianae.steerii>
 >gabriellae : gabriellae
->klossii : klossii<T0, T1>
+>klossii : gabriellae.klossii<T0, T1>
 >argurus : argurus
 >luctuosa : luctuosa
 >julianae : julianae
->steerii : steerii
->x : klossii<luctuosa, steerii>
+>steerii : julianae.steerii
+>x : gabriellae.klossii<luctuosa, julianae.steerii>
 >gabriellae : gabriellae
->klossii : klossii<T0, T1>
+>klossii : gabriellae.klossii<T0, T1>
 >argurus : argurus
 >luctuosa : luctuosa
 >julianae : julianae
->steerii : steerii
+>steerii : julianae.steerii
 >() => { var y = this; } : () => void
 >y : oreas
 >this : oreas
->x : klossii<luctuosa, steerii>
+>x : gabriellae.klossii<luctuosa, julianae.steerii>
 
         barbei(): samarensis.cahirinus<lavali.lepturus, quasiater.carolinensis> { var x: samarensis.cahirinus<lavali.lepturus, quasiater.carolinensis>; () => { var y = this; }; return x; }
->barbei : () => cahirinus<lepturus, carolinensis>
+>barbei : () => samarensis.cahirinus<lavali.lepturus, quasiater.carolinensis>
 >samarensis : samarensis
->cahirinus : cahirinus<T0, T1>
+>cahirinus : samarensis.cahirinus<T0, T1>
 >lavali : lavali
->lepturus : lepturus
+>lepturus : lavali.lepturus
 >quasiater : quasiater
->carolinensis : carolinensis
->x : cahirinus<lepturus, carolinensis>
+>carolinensis : quasiater.carolinensis
+>x : samarensis.cahirinus<lavali.lepturus, quasiater.carolinensis>
 >samarensis : samarensis
->cahirinus : cahirinus<T0, T1>
+>cahirinus : samarensis.cahirinus<T0, T1>
 >lavali : lavali
->lepturus : lepturus
+>lepturus : lavali.lepturus
 >quasiater : quasiater
->carolinensis : carolinensis
+>carolinensis : quasiater.carolinensis
 >() => { var y = this; } : () => void
 >y : oreas
 >this : oreas
->x : cahirinus<lepturus, carolinensis>
+>x : samarensis.cahirinus<lavali.lepturus, quasiater.carolinensis>
 
         univittatus(): argurus.peninsulae { var x: argurus.peninsulae; () => { var y = this; }; return x; }
 >univittatus : () => peninsulae
@@ -8633,7 +8633,7 @@ module argurus {
     }
 }
 module daubentonii {
->daubentonii : typeof daubentonii
+>daubentonii : daubentonii
 
     export class arboreus<T0, T1> {
 >arboreus : arboreus<T0, T1>
@@ -8641,548 +8641,548 @@ module daubentonii {
 >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 : () => crenulata<pelurus<jugularis, americanus>, wilsoni>
+>capreolus : () => rendalli.crenulata<samarensis.pelurus<Lanthanum.jugularis, ruatanica.americanus>, lavali.wilsoni>
 >rendalli : rendalli
->crenulata : crenulata<T0, T1>
+>crenulata : rendalli.crenulata<T0, T1>
 >samarensis : samarensis
->pelurus : pelurus<T0, T1>
+>pelurus : samarensis.pelurus<T0, T1>
 >Lanthanum : Lanthanum
->jugularis : jugularis
+>jugularis : Lanthanum.jugularis
 >ruatanica : ruatanica
->americanus : americanus
+>americanus : ruatanica.americanus
 >lavali : lavali
->wilsoni : wilsoni
->x : crenulata<pelurus<jugularis, americanus>, wilsoni>
+>wilsoni : lavali.wilsoni
+>x : rendalli.crenulata<samarensis.pelurus<Lanthanum.jugularis, ruatanica.americanus>, lavali.wilsoni>
 >rendalli : rendalli
->crenulata : crenulata<T0, T1>
+>crenulata : rendalli.crenulata<T0, T1>
 >samarensis : samarensis
->pelurus : pelurus<T0, T1>
+>pelurus : samarensis.pelurus<T0, T1>
 >Lanthanum : Lanthanum
->jugularis : jugularis
+>jugularis : Lanthanum.jugularis
 >ruatanica : ruatanica
->americanus : americanus
+>americanus : ruatanica.americanus
 >lavali : lavali
->wilsoni : wilsoni
+>wilsoni : lavali.wilsoni
 >() => { var y = this; } : () => void
 >y : arboreus<T0, T1>
 >this : arboreus<T0, T1>
->x : crenulata<pelurus<jugularis, americanus>, wilsoni>
+>x : rendalli.crenulata<samarensis.pelurus<Lanthanum.jugularis, ruatanica.americanus>, lavali.wilsoni>
 
         moreni(): panglima.abidi<julianae.galapagoensis, dogramacii.koepckeae> { var x: panglima.abidi<julianae.galapagoensis, dogramacii.koepckeae>; () => { var y = this; }; return x; }
->moreni : () => abidi<galapagoensis, koepckeae>
+>moreni : () => panglima.abidi<julianae.galapagoensis, dogramacii.koepckeae>
 >panglima : panglima
->abidi : abidi<T0, T1>
+>abidi : panglima.abidi<T0, T1>
 >julianae : julianae
->galapagoensis : galapagoensis
+>galapagoensis : julianae.galapagoensis
 >dogramacii : dogramacii
->koepckeae : koepckeae
->x : abidi<galapagoensis, koepckeae>
+>koepckeae : dogramacii.koepckeae
+>x : panglima.abidi<julianae.galapagoensis, dogramacii.koepckeae>
 >panglima : panglima
->abidi : abidi<T0, T1>
+>abidi : panglima.abidi<T0, T1>
 >julianae : julianae
->galapagoensis : galapagoensis
+>galapagoensis : julianae.galapagoensis
 >dogramacii : dogramacii
->koepckeae : koepckeae
+>koepckeae : dogramacii.koepckeae
 >() => { var y = this; } : () => void
 >y : arboreus<T0, T1>
 >this : arboreus<T0, T1>
->x : abidi<galapagoensis, koepckeae>
+>x : panglima.abidi<julianae.galapagoensis, dogramacii.koepckeae>
 
         hypoleucos(): nigra.gracilis<trivirgatus.falconeri, argurus.germaini> { var x: nigra.gracilis<trivirgatus.falconeri, argurus.germaini>; () => { var y = this; }; return x; }
->hypoleucos : () => gracilis<falconeri, germaini>
+>hypoleucos : () => nigra.gracilis<trivirgatus.falconeri, argurus.germaini>
 >nigra : nigra
->gracilis : gracilis<T0, T1>
+>gracilis : nigra.gracilis<T0, T1>
 >trivirgatus : trivirgatus
->falconeri : falconeri
+>falconeri : trivirgatus.falconeri
 >argurus : argurus
->germaini : germaini
->x : gracilis<falconeri, germaini>
+>germaini : argurus.germaini
+>x : nigra.gracilis<trivirgatus.falconeri, argurus.germaini>
 >nigra : nigra
->gracilis : gracilis<T0, T1>
+>gracilis : nigra.gracilis<T0, T1>
 >trivirgatus : trivirgatus
->falconeri : falconeri
+>falconeri : trivirgatus.falconeri
 >argurus : argurus
->germaini : germaini
+>germaini : argurus.germaini
 >() => { var y = this; } : () => void
 >y : arboreus<T0, T1>
 >this : arboreus<T0, T1>
->x : gracilis<falconeri, germaini>
+>x : nigra.gracilis<trivirgatus.falconeri, argurus.germaini>
 
         paedulcus(): minutus.portoricensis { var x: minutus.portoricensis; () => { var y = this; }; return x; }
->paedulcus : () => portoricensis
+>paedulcus : () => minutus.portoricensis
 >minutus : minutus
->portoricensis : portoricensis
->x : portoricensis
+>portoricensis : minutus.portoricensis
+>x : minutus.portoricensis
 >minutus : minutus
->portoricensis : portoricensis
+>portoricensis : minutus.portoricensis
 >() => { var y = this; } : () => void
 >y : arboreus<T0, T1>
 >this : arboreus<T0, T1>
->x : portoricensis
+>x : minutus.portoricensis
 
         pucheranii(): samarensis.fuscus<julianae.durangae, caurinus.megaphyllus> { var x: samarensis.fuscus<julianae.durangae, caurinus.megaphyllus>; () => { var y = this; }; return x; }
->pucheranii : () => fuscus<durangae, megaphyllus>
+>pucheranii : () => samarensis.fuscus<julianae.durangae, caurinus.megaphyllus>
 >samarensis : samarensis
->fuscus : fuscus<T0, T1>
+>fuscus : samarensis.fuscus<T0, T1>
 >julianae : julianae
->durangae : durangae
+>durangae : julianae.durangae
 >caurinus : caurinus
->megaphyllus : megaphyllus
->x : fuscus<durangae, megaphyllus>
+>megaphyllus : caurinus.megaphyllus
+>x : samarensis.fuscus<julianae.durangae, caurinus.megaphyllus>
 >samarensis : samarensis
->fuscus : fuscus<T0, T1>
+>fuscus : samarensis.fuscus<T0, T1>
 >julianae : julianae
->durangae : durangae
+>durangae : julianae.durangae
 >caurinus : caurinus
->megaphyllus : megaphyllus
+>megaphyllus : caurinus.megaphyllus
 >() => { var y = this; } : () => void
 >y : arboreus<T0, T1>
 >this : arboreus<T0, T1>
->x : fuscus<durangae, megaphyllus>
+>x : samarensis.fuscus<julianae.durangae, caurinus.megaphyllus>
 
         stella(): julianae.oralis<lutreolus.foina, quasiater.carolinensis> { var x: julianae.oralis<lutreolus.foina, quasiater.carolinensis>; () => { var y = this; }; return x; }
->stella : () => oralis<foina, carolinensis>
+>stella : () => julianae.oralis<lutreolus.foina, quasiater.carolinensis>
 >julianae : julianae
->oralis : oralis<T0, T1>
+>oralis : julianae.oralis<T0, T1>
 >lutreolus : lutreolus
->foina : foina
+>foina : lutreolus.foina
 >quasiater : quasiater
->carolinensis : carolinensis
->x : oralis<foina, carolinensis>
+>carolinensis : quasiater.carolinensis
+>x : julianae.oralis<lutreolus.foina, quasiater.carolinensis>
 >julianae : julianae
->oralis : oralis<T0, T1>
+>oralis : julianae.oralis<T0, T1>
 >lutreolus : lutreolus
->foina : foina
+>foina : lutreolus.foina
 >quasiater : quasiater
->carolinensis : carolinensis
+>carolinensis : quasiater.carolinensis
 >() => { var y = this; } : () => void
 >y : arboreus<T0, T1>
 >this : arboreus<T0, T1>
->x : oralis<foina, carolinensis>
+>x : julianae.oralis<lutreolus.foina, quasiater.carolinensis>
 
         brasiliensis(): imperfecta.subspinosus { var x: imperfecta.subspinosus; () => { var y = this; }; return x; }
->brasiliensis : () => subspinosus
+>brasiliensis : () => imperfecta.subspinosus
 >imperfecta : imperfecta
->subspinosus : subspinosus
->x : subspinosus
+>subspinosus : imperfecta.subspinosus
+>x : imperfecta.subspinosus
 >imperfecta : imperfecta
->subspinosus : subspinosus
+>subspinosus : imperfecta.subspinosus
 >() => { var y = this; } : () => void
 >y : arboreus<T0, T1>
 >this : arboreus<T0, T1>
->x : subspinosus
+>x : imperfecta.subspinosus
 
         brevicaudata(): trivirgatus.oconnelli { var x: trivirgatus.oconnelli; () => { var y = this; }; return x; }
->brevicaudata : () => oconnelli
+>brevicaudata : () => trivirgatus.oconnelli
 >trivirgatus : trivirgatus
->oconnelli : oconnelli
->x : oconnelli
+>oconnelli : trivirgatus.oconnelli
+>x : trivirgatus.oconnelli
 >trivirgatus : trivirgatus
->oconnelli : oconnelli
+>oconnelli : trivirgatus.oconnelli
 >() => { var y = this; } : () => void
 >y : arboreus<T0, T1>
 >this : arboreus<T0, T1>
->x : oconnelli
+>x : trivirgatus.oconnelli
 
         vitticollis(): dogramacii.koepckeae { var x: dogramacii.koepckeae; () => { var y = this; }; return x; }
->vitticollis : () => koepckeae
+>vitticollis : () => dogramacii.koepckeae
 >dogramacii : dogramacii
->koepckeae : koepckeae
->x : koepckeae
+>koepckeae : dogramacii.koepckeae
+>x : dogramacii.koepckeae
 >dogramacii : dogramacii
->koepckeae : koepckeae
+>koepckeae : dogramacii.koepckeae
 >() => { var y = this; } : () => void
 >y : arboreus<T0, T1>
 >this : arboreus<T0, T1>
->x : koepckeae
+>x : dogramacii.koepckeae
 
         huangensis(): caurinus.psilurus { var x: caurinus.psilurus; () => { var y = this; }; return x; }
->huangensis : () => psilurus
+>huangensis : () => caurinus.psilurus
 >caurinus : caurinus
->psilurus : psilurus
->x : psilurus
+>psilurus : caurinus.psilurus
+>x : caurinus.psilurus
 >caurinus : caurinus
->psilurus : psilurus
+>psilurus : caurinus.psilurus
 >() => { var y = this; } : () => void
 >y : arboreus<T0, T1>
 >this : arboreus<T0, T1>
->x : psilurus
+>x : caurinus.psilurus
 
         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 : () => rosalia<siberu<lasiurus<foina, melanops>, ciliolabrum<megalonyx, minutilla>>, psilurus>
+>cameroni : () => petrophilus.rosalia<dammermani.siberu<imperfecta.lasiurus<lutreolus.foina, dammermani.melanops>, imperfecta.ciliolabrum<Lanthanum.megalonyx, petrophilus.minutilla>>, caurinus.psilurus>
 >petrophilus : petrophilus
->rosalia : rosalia<T0, T1>
+>rosalia : petrophilus.rosalia<T0, T1>
 >dammermani : dammermani
->siberu : siberu<T0, T1>
+>siberu : dammermani.siberu<T0, T1>
 >imperfecta : imperfecta
->lasiurus : lasiurus<T0, T1>
+>lasiurus : imperfecta.lasiurus<T0, T1>
 >lutreolus : lutreolus
->foina : foina
+>foina : lutreolus.foina
 >dammermani : dammermani
->melanops : melanops
+>melanops : dammermani.melanops
 >imperfecta : imperfecta
->ciliolabrum : ciliolabrum<T0, T1>
+>ciliolabrum : imperfecta.ciliolabrum<T0, T1>
 >Lanthanum : Lanthanum
->megalonyx : megalonyx
+>megalonyx : Lanthanum.megalonyx
 >petrophilus : petrophilus
->minutilla : minutilla
+>minutilla : petrophilus.minutilla
 >caurinus : caurinus
->psilurus : psilurus
->x : rosalia<siberu<lasiurus<foina, melanops>, ciliolabrum<megalonyx, minutilla>>, psilurus>
+>psilurus : caurinus.psilurus
+>x : petrophilus.rosalia<dammermani.siberu<imperfecta.lasiurus<lutreolus.foina, dammermani.melanops>, imperfecta.ciliolabrum<Lanthanum.megalonyx, petrophilus.minutilla>>, caurinus.psilurus>
 >petrophilus : petrophilus
->rosalia : rosalia<T0, T1>
+>rosalia : petrophilus.rosalia<T0, T1>
 >dammermani : dammermani
->siberu : siberu<T0, T1>
+>siberu : dammermani.siberu<T0, T1>
 >imperfecta : imperfecta
->lasiurus : lasiurus<T0, T1>
+>lasiurus : imperfecta.lasiurus<T0, T1>
 >lutreolus : lutreolus
->foina : foina
+>foina : lutreolus.foina
 >dammermani : dammermani
->melanops : melanops
+>melanops : dammermani.melanops
 >imperfecta : imperfecta
->ciliolabrum : ciliolabrum<T0, T1>
+>ciliolabrum : imperfecta.ciliolabrum<T0, T1>
 >Lanthanum : Lanthanum
->megalonyx : megalonyx
+>megalonyx : Lanthanum.megalonyx
 >petrophilus : petrophilus
->minutilla : minutilla
+>minutilla : petrophilus.minutilla
 >caurinus : caurinus
->psilurus : psilurus
+>psilurus : caurinus.psilurus
 >() => { var y = this; } : () => void
 >y : arboreus<T0, T1>
 >this : arboreus<T0, T1>
->x : rosalia<siberu<lasiurus<foina, melanops>, ciliolabrum<megalonyx, minutilla>>, psilurus>
+>x : petrophilus.rosalia<dammermani.siberu<imperfecta.lasiurus<lutreolus.foina, dammermani.melanops>, imperfecta.ciliolabrum<Lanthanum.megalonyx, petrophilus.minutilla>>, caurinus.psilurus>
 
         tianshanica(): howi.marcanoi { var x: howi.marcanoi; () => { var y = this; }; return x; }
->tianshanica : () => marcanoi
+>tianshanica : () => howi.marcanoi
 >howi : howi
->marcanoi : marcanoi
->x : marcanoi
+>marcanoi : howi.marcanoi
+>x : howi.marcanoi
 >howi : howi
->marcanoi : marcanoi
+>marcanoi : howi.marcanoi
 >() => { var y = this; } : () => void
 >y : arboreus<T0, T1>
 >this : arboreus<T0, T1>
->x : marcanoi
+>x : howi.marcanoi
     }
 }
 module patas {
->patas : typeof patas
+>patas : patas
 
     export class uralensis {
 >uralensis : uralensis
 
         cartilagonodus(): Lanthanum.nitidus<rionegrensis.caniventer, Lanthanum.jugularis> { var x: Lanthanum.nitidus<rionegrensis.caniventer, Lanthanum.jugularis>; () => { var y = this; }; return x; }
->cartilagonodus : () => nitidus<caniventer, jugularis>
+>cartilagonodus : () => Lanthanum.nitidus<rionegrensis.caniventer, Lanthanum.jugularis>
 >Lanthanum : Lanthanum
->nitidus : nitidus<T0, T1>
+>nitidus : Lanthanum.nitidus<T0, T1>
 >rionegrensis : rionegrensis
->caniventer : caniventer
+>caniventer : rionegrensis.caniventer
 >Lanthanum : Lanthanum
->jugularis : jugularis
->x : nitidus<caniventer, jugularis>
+>jugularis : Lanthanum.jugularis
+>x : Lanthanum.nitidus<rionegrensis.caniventer, Lanthanum.jugularis>
 >Lanthanum : Lanthanum
->nitidus : nitidus<T0, T1>
+>nitidus : Lanthanum.nitidus<T0, T1>
 >rionegrensis : rionegrensis
->caniventer : caniventer
+>caniventer : rionegrensis.caniventer
 >Lanthanum : Lanthanum
->jugularis : jugularis
+>jugularis : Lanthanum.jugularis
 >() => { var y = this; } : () => void
 >y : uralensis
 >this : uralensis
->x : nitidus<caniventer, jugularis>
+>x : Lanthanum.nitidus<rionegrensis.caniventer, Lanthanum.jugularis>
 
         pyrrhinus(): lavali.beisa { var x: lavali.beisa; () => { var y = this; }; return x; }
->pyrrhinus : () => beisa
+>pyrrhinus : () => lavali.beisa
 >lavali : lavali
->beisa : beisa
->x : beisa
+>beisa : lavali.beisa
+>x : lavali.beisa
 >lavali : lavali
->beisa : beisa
+>beisa : lavali.beisa
 >() => { var y = this; } : () => void
 >y : uralensis
 >this : uralensis
->x : beisa
+>x : lavali.beisa
 
         insulans(): Lanthanum.jugularis { var x: Lanthanum.jugularis; () => { var y = this; }; return x; }
->insulans : () => jugularis
+>insulans : () => Lanthanum.jugularis
 >Lanthanum : Lanthanum
->jugularis : jugularis
->x : jugularis
+>jugularis : Lanthanum.jugularis
+>x : Lanthanum.jugularis
 >Lanthanum : Lanthanum
->jugularis : jugularis
+>jugularis : Lanthanum.jugularis
 >() => { var y = this; } : () => void
 >y : uralensis
 >this : uralensis
->x : jugularis
+>x : Lanthanum.jugularis
 
         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 : () => johorensis<nitidus<minutilla, sumatrana>, jugularis>
+>nigricauda : () => caurinus.johorensis<Lanthanum.nitidus<petrophilus.minutilla, julianae.sumatrana>, Lanthanum.jugularis>
 >caurinus : caurinus
->johorensis : johorensis<T0, T1>
+>johorensis : caurinus.johorensis<T0, T1>
 >Lanthanum : Lanthanum
->nitidus : nitidus<T0, T1>
+>nitidus : Lanthanum.nitidus<T0, T1>
 >petrophilus : petrophilus
->minutilla : minutilla
+>minutilla : petrophilus.minutilla
 >julianae : julianae
->sumatrana : sumatrana
+>sumatrana : julianae.sumatrana
 >Lanthanum : Lanthanum
->jugularis : jugularis
->x : johorensis<nitidus<minutilla, sumatrana>, jugularis>
+>jugularis : Lanthanum.jugularis
+>x : caurinus.johorensis<Lanthanum.nitidus<petrophilus.minutilla, julianae.sumatrana>, Lanthanum.jugularis>
 >caurinus : caurinus
->johorensis : johorensis<T0, T1>
+>johorensis : caurinus.johorensis<T0, T1>
 >Lanthanum : Lanthanum
->nitidus : nitidus<T0, T1>
+>nitidus : Lanthanum.nitidus<T0, T1>
 >petrophilus : petrophilus
->minutilla : minutilla
+>minutilla : petrophilus.minutilla
 >julianae : julianae
->sumatrana : sumatrana
+>sumatrana : julianae.sumatrana
 >Lanthanum : Lanthanum
->jugularis : jugularis
+>jugularis : Lanthanum.jugularis
 >() => { var y = this; } : () => void
 >y : uralensis
 >this : uralensis
->x : johorensis<nitidus<minutilla, sumatrana>, jugularis>
+>x : caurinus.johorensis<Lanthanum.nitidus<petrophilus.minutilla, julianae.sumatrana>, Lanthanum.jugularis>
 
         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 : () => fundatus<foina, siberu<punicus, acariensis>>
+>muricauda : () => panglima.fundatus<lutreolus.foina, dammermani.siberu<lutreolus.punicus, julianae.acariensis>>
 >panglima : panglima
->fundatus : fundatus<T0, T1>
+>fundatus : panglima.fundatus<T0, T1>
 >lutreolus : lutreolus
->foina : foina
+>foina : lutreolus.foina
 >dammermani : dammermani
->siberu : siberu<T0, T1>
+>siberu : dammermani.siberu<T0, T1>
 >lutreolus : lutreolus
->punicus : punicus
+>punicus : lutreolus.punicus
 >julianae : julianae
->acariensis : acariensis
->x : fundatus<foina, siberu<punicus, acariensis>>
+>acariensis : julianae.acariensis
+>x : panglima.fundatus<lutreolus.foina, dammermani.siberu<lutreolus.punicus, julianae.acariensis>>
 >panglima : panglima
->fundatus : fundatus<T0, T1>
+>fundatus : panglima.fundatus<T0, T1>
 >lutreolus : lutreolus
->foina : foina
+>foina : lutreolus.foina
 >dammermani : dammermani
->siberu : siberu<T0, T1>
+>siberu : dammermani.siberu<T0, T1>
 >lutreolus : lutreolus
->punicus : punicus
+>punicus : lutreolus.punicus
 >julianae : julianae
->acariensis : acariensis
+>acariensis : julianae.acariensis
 >() => { var y = this; } : () => void
 >y : uralensis
 >this : uralensis
->x : fundatus<foina, siberu<punicus, acariensis>>
+>x : panglima.fundatus<lutreolus.foina, dammermani.siberu<lutreolus.punicus, julianae.acariensis>>
 
         albicaudus(): sagitta.stolzmanni { var x: sagitta.stolzmanni; () => { var y = this; }; return x; }
->albicaudus : () => stolzmanni
+>albicaudus : () => sagitta.stolzmanni
 >sagitta : sagitta
->stolzmanni : stolzmanni
->x : stolzmanni
+>stolzmanni : sagitta.stolzmanni
+>x : sagitta.stolzmanni
 >sagitta : sagitta
->stolzmanni : stolzmanni
+>stolzmanni : sagitta.stolzmanni
 >() => { var y = this; } : () => void
 >y : uralensis
 >this : uralensis
->x : stolzmanni
+>x : sagitta.stolzmanni
 
         fallax(): ruatanica.hector<lutreolus.punicus, gabriellae.amicus> { var x: ruatanica.hector<lutreolus.punicus, gabriellae.amicus>; () => { var y = this; }; return x; }
->fallax : () => hector<punicus, amicus>
+>fallax : () => ruatanica.hector<lutreolus.punicus, gabriellae.amicus>
 >ruatanica : ruatanica
->hector : hector<T0, T1>
+>hector : ruatanica.hector<T0, T1>
 >lutreolus : lutreolus
->punicus : punicus
+>punicus : lutreolus.punicus
 >gabriellae : gabriellae
->amicus : amicus
->x : hector<punicus, amicus>
+>amicus : gabriellae.amicus
+>x : ruatanica.hector<lutreolus.punicus, gabriellae.amicus>
 >ruatanica : ruatanica
->hector : hector<T0, T1>
+>hector : ruatanica.hector<T0, T1>
 >lutreolus : lutreolus
->punicus : punicus
+>punicus : lutreolus.punicus
 >gabriellae : gabriellae
->amicus : amicus
+>amicus : gabriellae.amicus
 >() => { var y = this; } : () => void
 >y : uralensis
 >this : uralensis
->x : hector<punicus, amicus>
+>x : ruatanica.hector<lutreolus.punicus, gabriellae.amicus>
 
         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 : () => marmosurus<americanus, netscheri<carolinensis, kaiseri>>
+>attenuata : () => macrorhinos.marmosurus<ruatanica.americanus, argurus.netscheri<quasiater.carolinensis, dogramacii.kaiseri>>
 >macrorhinos : macrorhinos
->marmosurus : marmosurus<T0, T1>
+>marmosurus : macrorhinos.marmosurus<T0, T1>
 >ruatanica : ruatanica
->americanus : americanus
+>americanus : ruatanica.americanus
 >argurus : argurus
->netscheri : netscheri<T0, T1>
+>netscheri : argurus.netscheri<T0, T1>
 >quasiater : quasiater
->carolinensis : carolinensis
+>carolinensis : quasiater.carolinensis
 >dogramacii : dogramacii
->kaiseri : kaiseri
->x : marmosurus<americanus, netscheri<carolinensis, kaiseri>>
+>kaiseri : dogramacii.kaiseri
+>x : macrorhinos.marmosurus<ruatanica.americanus, argurus.netscheri<quasiater.carolinensis, dogramacii.kaiseri>>
 >macrorhinos : macrorhinos
->marmosurus : marmosurus<T0, T1>
+>marmosurus : macrorhinos.marmosurus<T0, T1>
 >ruatanica : ruatanica
->americanus : americanus
+>americanus : ruatanica.americanus
 >argurus : argurus
->netscheri : netscheri<T0, T1>
+>netscheri : argurus.netscheri<T0, T1>
 >quasiater : quasiater
->carolinensis : carolinensis
+>carolinensis : quasiater.carolinensis
 >dogramacii : dogramacii
->kaiseri : kaiseri
+>kaiseri : dogramacii.kaiseri
 >() => { var y = this; } : () => void
 >y : uralensis
 >this : uralensis
->x : marmosurus<americanus, netscheri<carolinensis, kaiseri>>
+>x : macrorhinos.marmosurus<ruatanica.americanus, argurus.netscheri<quasiater.carolinensis, dogramacii.kaiseri>>
 
         megalura(): howi.marcanoi { var x: howi.marcanoi; () => { var y = this; }; return x; }
->megalura : () => marcanoi
+>megalura : () => howi.marcanoi
 >howi : howi
->marcanoi : marcanoi
->x : marcanoi
+>marcanoi : howi.marcanoi
+>x : howi.marcanoi
 >howi : howi
->marcanoi : marcanoi
+>marcanoi : howi.marcanoi
 >() => { var y = this; } : () => void
 >y : uralensis
 >this : uralensis
->x : marcanoi
+>x : howi.marcanoi
 
         neblina(): samarensis.pelurus<macrorhinos.daphaenodon, rionegrensis.caniventer> { var x: samarensis.pelurus<macrorhinos.daphaenodon, rionegrensis.caniventer>; () => { var y = this; }; return x; }
->neblina : () => pelurus<daphaenodon, caniventer>
+>neblina : () => samarensis.pelurus<macrorhinos.daphaenodon, rionegrensis.caniventer>
 >samarensis : samarensis
->pelurus : pelurus<T0, T1>
+>pelurus : samarensis.pelurus<T0, T1>
 >macrorhinos : macrorhinos
->daphaenodon : daphaenodon
+>daphaenodon : macrorhinos.daphaenodon
 >rionegrensis : rionegrensis
->caniventer : caniventer
->x : pelurus<daphaenodon, caniventer>
+>caniventer : rionegrensis.caniventer
+>x : samarensis.pelurus<macrorhinos.daphaenodon, rionegrensis.caniventer>
 >samarensis : samarensis
->pelurus : pelurus<T0, T1>
+>pelurus : samarensis.pelurus<T0, T1>
 >macrorhinos : macrorhinos
->daphaenodon : daphaenodon
+>daphaenodon : macrorhinos.daphaenodon
 >rionegrensis : rionegrensis
->caniventer : caniventer
+>caniventer : rionegrensis.caniventer
 >() => { var y = this; } : () => void
 >y : uralensis
 >this : uralensis
->x : pelurus<daphaenodon, caniventer>
+>x : samarensis.pelurus<macrorhinos.daphaenodon, rionegrensis.caniventer>
 
         citellus(): daubentonii.arboreus<quasiater.carolinensis, rionegrensis.caniventer> { var x: daubentonii.arboreus<quasiater.carolinensis, rionegrensis.caniventer>; () => { var y = this; }; return x; }
->citellus : () => arboreus<carolinensis, caniventer>
+>citellus : () => daubentonii.arboreus<quasiater.carolinensis, rionegrensis.caniventer>
 >daubentonii : daubentonii
->arboreus : arboreus<T0, T1>
+>arboreus : daubentonii.arboreus<T0, T1>
 >quasiater : quasiater
->carolinensis : carolinensis
+>carolinensis : quasiater.carolinensis
 >rionegrensis : rionegrensis
->caniventer : caniventer
->x : arboreus<carolinensis, caniventer>
+>caniventer : rionegrensis.caniventer
+>x : daubentonii.arboreus<quasiater.carolinensis, rionegrensis.caniventer>
 >daubentonii : daubentonii
->arboreus : arboreus<T0, T1>
+>arboreus : daubentonii.arboreus<T0, T1>
 >quasiater : quasiater
->carolinensis : carolinensis
+>carolinensis : quasiater.carolinensis
 >rionegrensis : rionegrensis
->caniventer : caniventer
+>caniventer : rionegrensis.caniventer
 >() => { var y = this; } : () => void
 >y : uralensis
 >this : uralensis
->x : arboreus<carolinensis, caniventer>
+>x : daubentonii.arboreus<quasiater.carolinensis, rionegrensis.caniventer>
 
         tanezumi(): imperfecta.lasiurus<dogramacii.robustulus, caurinus.psilurus> { var x: imperfecta.lasiurus<dogramacii.robustulus, caurinus.psilurus>; () => { var y = this; }; return x; }
->tanezumi : () => lasiurus<robustulus, psilurus>
+>tanezumi : () => imperfecta.lasiurus<dogramacii.robustulus, caurinus.psilurus>
 >imperfecta : imperfecta
->lasiurus : lasiurus<T0, T1>
+>lasiurus : imperfecta.lasiurus<T0, T1>
 >dogramacii : dogramacii
->robustulus : robustulus
+>robustulus : dogramacii.robustulus
 >caurinus : caurinus
->psilurus : psilurus
->x : lasiurus<robustulus, psilurus>
+>psilurus : caurinus.psilurus
+>x : imperfecta.lasiurus<dogramacii.robustulus, caurinus.psilurus>
 >imperfecta : imperfecta
->lasiurus : lasiurus<T0, T1>
+>lasiurus : imperfecta.lasiurus<T0, T1>
 >dogramacii : dogramacii
->robustulus : robustulus
+>robustulus : dogramacii.robustulus
 >caurinus : caurinus
->psilurus : psilurus
+>psilurus : caurinus.psilurus
 >() => { var y = this; } : () => void
 >y : uralensis
 >this : uralensis
->x : lasiurus<robustulus, psilurus>
+>x : imperfecta.lasiurus<dogramacii.robustulus, caurinus.psilurus>
 
         albiventer(): rendalli.crenulata<rendalli.zuluensis, dogramacii.robustulus> { var x: rendalli.crenulata<rendalli.zuluensis, dogramacii.robustulus>; () => { var y = this; }; return x; }
->albiventer : () => crenulata<zuluensis, robustulus>
+>albiventer : () => rendalli.crenulata<rendalli.zuluensis, dogramacii.robustulus>
 >rendalli : rendalli
->crenulata : crenulata<T0, T1>
+>crenulata : rendalli.crenulata<T0, T1>
 >rendalli : rendalli
->zuluensis : zuluensis
+>zuluensis : rendalli.zuluensis
 >dogramacii : dogramacii
->robustulus : robustulus
->x : crenulata<zuluensis, robustulus>
+>robustulus : dogramacii.robustulus
+>x : rendalli.crenulata<rendalli.zuluensis, dogramacii.robustulus>
 >rendalli : rendalli
->crenulata : crenulata<T0, T1>
+>crenulata : rendalli.crenulata<T0, T1>
 >rendalli : rendalli
->zuluensis : zuluensis
+>zuluensis : rendalli.zuluensis
 >dogramacii : dogramacii
->robustulus : robustulus
+>robustulus : dogramacii.robustulus
 >() => { var y = this; } : () => void
 >y : uralensis
 >this : uralensis
->x : crenulata<zuluensis, robustulus>
+>x : rendalli.crenulata<rendalli.zuluensis, dogramacii.robustulus>
     }
 }
 module provocax {
->provocax : typeof provocax
+>provocax : provocax
 
     export class melanoleuca extends lavali.wilsoni {
 >melanoleuca : melanoleuca
 >lavali : lavali
->wilsoni : wilsoni
+>wilsoni : lavali.wilsoni
 
         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 : () => marmosurus<sodyi<falconeri, bobrinskoi>, foina>
+>Neodymium : () => macrorhinos.marmosurus<petrophilus.sodyi<trivirgatus.falconeri, quasiater.bobrinskoi>, lutreolus.foina>
 >macrorhinos : macrorhinos
->marmosurus : marmosurus<T0, T1>
+>marmosurus : macrorhinos.marmosurus<T0, T1>
 >petrophilus : petrophilus
->sodyi : sodyi<T0, T1>
+>sodyi : petrophilus.sodyi<T0, T1>
 >trivirgatus : trivirgatus
->falconeri : falconeri
+>falconeri : trivirgatus.falconeri
 >quasiater : quasiater
->bobrinskoi : bobrinskoi
+>bobrinskoi : quasiater.bobrinskoi
 >lutreolus : lutreolus
->foina : foina
->x : marmosurus<sodyi<falconeri, bobrinskoi>, foina>
+>foina : lutreolus.foina
+>x : macrorhinos.marmosurus<petrophilus.sodyi<trivirgatus.falconeri, quasiater.bobrinskoi>, lutreolus.foina>
 >macrorhinos : macrorhinos
->marmosurus : marmosurus<T0, T1>
+>marmosurus : macrorhinos.marmosurus<T0, T1>
 >petrophilus : petrophilus
->sodyi : sodyi<T0, T1>
+>sodyi : petrophilus.sodyi<T0, T1>
 >trivirgatus : trivirgatus
->falconeri : falconeri
+>falconeri : trivirgatus.falconeri
 >quasiater : quasiater
->bobrinskoi : bobrinskoi
+>bobrinskoi : quasiater.bobrinskoi
 >lutreolus : lutreolus
->foina : foina
+>foina : lutreolus.foina
 >() => { var y = this; } : () => void
 >y : melanoleuca
 >this : melanoleuca
->x : marmosurus<sodyi<falconeri, bobrinskoi>, foina>
+>x : macrorhinos.marmosurus<petrophilus.sodyi<trivirgatus.falconeri, quasiater.bobrinskoi>, lutreolus.foina>
 
         baeri(): imperfecta.lasiurus<lavali.lepturus, ruatanica.americanus> { var x: imperfecta.lasiurus<lavali.lepturus, ruatanica.americanus>; () => { var y = this; }; return x; }
->baeri : () => lasiurus<lepturus, americanus>
+>baeri : () => imperfecta.lasiurus<lavali.lepturus, ruatanica.americanus>
 >imperfecta : imperfecta
->lasiurus : lasiurus<T0, T1>
+>lasiurus : imperfecta.lasiurus<T0, T1>
 >lavali : lavali
->lepturus : lepturus
+>lepturus : lavali.lepturus
 >ruatanica : ruatanica
->americanus : americanus
->x : lasiurus<lepturus, americanus>
+>americanus : ruatanica.americanus
+>x : imperfecta.lasiurus<lavali.lepturus, ruatanica.americanus>
 >imperfecta : imperfecta
->lasiurus : lasiurus<T0, T1>
+>lasiurus : imperfecta.lasiurus<T0, T1>
 >lavali : lavali
->lepturus : lepturus
+>lepturus : lavali.lepturus
 >ruatanica : ruatanica
->americanus : americanus
+>americanus : ruatanica.americanus
 >() => { var y = this; } : () => void
 >y : melanoleuca
 >this : melanoleuca
->x : lasiurus<lepturus, americanus>
+>x : imperfecta.lasiurus<lavali.lepturus, ruatanica.americanus>
     }
 }
 module sagitta {
->sagitta : typeof sagitta
+>sagitta : sagitta
 
     export class sicarius<T0, T1> {
 >sicarius : sicarius<T0, T1>
@@ -9190,369 +9190,369 @@ module sagitta {
 >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 : () => cahirinus<gracilis<luctuosa, subspinosus>, robustulus>
+>Chlorine : () => samarensis.cahirinus<nigra.gracilis<argurus.luctuosa, imperfecta.subspinosus>, dogramacii.robustulus>
 >samarensis : samarensis
->cahirinus : cahirinus<T0, T1>
+>cahirinus : samarensis.cahirinus<T0, T1>
 >nigra : nigra
->gracilis : gracilis<T0, T1>
+>gracilis : nigra.gracilis<T0, T1>
 >argurus : argurus
->luctuosa : luctuosa
+>luctuosa : argurus.luctuosa
 >imperfecta : imperfecta
->subspinosus : subspinosus
+>subspinosus : imperfecta.subspinosus
 >dogramacii : dogramacii
->robustulus : robustulus
->x : cahirinus<gracilis<luctuosa, subspinosus>, robustulus>
+>robustulus : dogramacii.robustulus
+>x : samarensis.cahirinus<nigra.gracilis<argurus.luctuosa, imperfecta.subspinosus>, dogramacii.robustulus>
 >samarensis : samarensis
->cahirinus : cahirinus<T0, T1>
+>cahirinus : samarensis.cahirinus<T0, T1>
 >nigra : nigra
->gracilis : gracilis<T0, T1>
+>gracilis : nigra.gracilis<T0, T1>
 >argurus : argurus
->luctuosa : luctuosa
+>luctuosa : argurus.luctuosa
 >imperfecta : imperfecta
->subspinosus : subspinosus
+>subspinosus : imperfecta.subspinosus
 >dogramacii : dogramacii
->robustulus : robustulus
+>robustulus : dogramacii.robustulus
 >() => { var y = this; } : () => void
 >y : sicarius<T0, T1>
 >this : sicarius<T0, T1>
->x : cahirinus<gracilis<luctuosa, subspinosus>, robustulus>
+>x : samarensis.cahirinus<nigra.gracilis<argurus.luctuosa, imperfecta.subspinosus>, dogramacii.robustulus>
 
         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 : () => marmosurus<nitidus<melanops, lepturus>, marmosurus<moojeni<amphibius<falconeri, psilurus>, echinatus>, stolzmanni>>
+>simulator : () => macrorhinos.marmosurus<Lanthanum.nitidus<dammermani.melanops, lavali.lepturus>, macrorhinos.marmosurus<rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>, stolzmanni>>
 >macrorhinos : macrorhinos
->marmosurus : marmosurus<T0, T1>
+>marmosurus : macrorhinos.marmosurus<T0, T1>
 >Lanthanum : Lanthanum
->nitidus : nitidus<T0, T1>
+>nitidus : Lanthanum.nitidus<T0, T1>
 >dammermani : dammermani
->melanops : melanops
+>melanops : dammermani.melanops
 >lavali : lavali
->lepturus : lepturus
+>lepturus : lavali.lepturus
 >macrorhinos : macrorhinos
->marmosurus : marmosurus<T0, T1>
+>marmosurus : macrorhinos.marmosurus<T0, T1>
 >rendalli : rendalli
->moojeni : moojeni<T0, T1>
+>moojeni : rendalli.moojeni<T0, T1>
 >panglima : panglima
->amphibius : amphibius<T0, T1>
+>amphibius : panglima.amphibius<T0, T1>
 >trivirgatus : trivirgatus
->falconeri : falconeri
+>falconeri : trivirgatus.falconeri
 >caurinus : caurinus
->psilurus : psilurus
+>psilurus : caurinus.psilurus
 >gabriellae : gabriellae
->echinatus : echinatus
+>echinatus : gabriellae.echinatus
 >sagitta : sagitta
 >stolzmanni : stolzmanni
->x : marmosurus<nitidus<melanops, lepturus>, marmosurus<moojeni<amphibius<falconeri, psilurus>, echinatus>, stolzmanni>>
+>x : macrorhinos.marmosurus<Lanthanum.nitidus<dammermani.melanops, lavali.lepturus>, macrorhinos.marmosurus<rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>, stolzmanni>>
 >macrorhinos : macrorhinos
->marmosurus : marmosurus<T0, T1>
+>marmosurus : macrorhinos.marmosurus<T0, T1>
 >Lanthanum : Lanthanum
->nitidus : nitidus<T0, T1>
+>nitidus : Lanthanum.nitidus<T0, T1>
 >dammermani : dammermani
->melanops : melanops
+>melanops : dammermani.melanops
 >lavali : lavali
->lepturus : lepturus
+>lepturus : lavali.lepturus
 >macrorhinos : macrorhinos
->marmosurus : marmosurus<T0, T1>
+>marmosurus : macrorhinos.marmosurus<T0, T1>
 >rendalli : rendalli
->moojeni : moojeni<T0, T1>
+>moojeni : rendalli.moojeni<T0, T1>
 >panglima : panglima
->amphibius : amphibius<T0, T1>
+>amphibius : panglima.amphibius<T0, T1>
 >trivirgatus : trivirgatus
->falconeri : falconeri
+>falconeri : trivirgatus.falconeri
 >caurinus : caurinus
->psilurus : psilurus
+>psilurus : caurinus.psilurus
 >gabriellae : gabriellae
->echinatus : echinatus
+>echinatus : gabriellae.echinatus
 >sagitta : sagitta
 >stolzmanni : stolzmanni
 >() => { var y = this; } : () => void
 >y : sicarius<T0, T1>
 >this : sicarius<T0, T1>
->x : marmosurus<nitidus<melanops, lepturus>, marmosurus<moojeni<amphibius<falconeri, psilurus>, echinatus>, stolzmanni>>
+>x : macrorhinos.marmosurus<Lanthanum.nitidus<dammermani.melanops, lavali.lepturus>, macrorhinos.marmosurus<rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>, stolzmanni>>
     }
 }
 module howi {
->howi : typeof howi
+>howi : howi
 
     export class marcanoi extends Lanthanum.megalonyx {
 >marcanoi : marcanoi
 >Lanthanum : Lanthanum
->megalonyx : megalonyx
+>megalonyx : Lanthanum.megalonyx
 
         formosae(): Lanthanum.megalonyx { var x: Lanthanum.megalonyx; () => { var y = this; }; return x; }
->formosae : () => megalonyx
+>formosae : () => Lanthanum.megalonyx
 >Lanthanum : Lanthanum
->megalonyx : megalonyx
->x : megalonyx
+>megalonyx : Lanthanum.megalonyx
+>x : Lanthanum.megalonyx
 >Lanthanum : Lanthanum
->megalonyx : megalonyx
+>megalonyx : Lanthanum.megalonyx
 >() => { var y = this; } : () => void
 >y : marcanoi
 >this : marcanoi
->x : megalonyx
+>x : Lanthanum.megalonyx
 
         dudui(): lutreolus.punicus { var x: lutreolus.punicus; () => { var y = this; }; return x; }
->dudui : () => punicus
+>dudui : () => lutreolus.punicus
 >lutreolus : lutreolus
->punicus : punicus
->x : punicus
+>punicus : lutreolus.punicus
+>x : lutreolus.punicus
 >lutreolus : lutreolus
->punicus : punicus
+>punicus : lutreolus.punicus
 >() => { var y = this; } : () => void
 >y : marcanoi
 >this : marcanoi
->x : punicus
+>x : lutreolus.punicus
 
         leander(): daubentonii.nesiotes<Lanthanum.megalonyx, minutus.portoricensis> { var x: daubentonii.nesiotes<Lanthanum.megalonyx, minutus.portoricensis>; () => { var y = this; }; return x; }
->leander : () => nesiotes<megalonyx, portoricensis>
+>leander : () => daubentonii.nesiotes<Lanthanum.megalonyx, minutus.portoricensis>
 >daubentonii : daubentonii
->nesiotes : nesiotes<T0, T1>
+>nesiotes : daubentonii.nesiotes<T0, T1>
 >Lanthanum : Lanthanum
->megalonyx : megalonyx
+>megalonyx : Lanthanum.megalonyx
 >minutus : minutus
->portoricensis : portoricensis
->x : nesiotes<megalonyx, portoricensis>
+>portoricensis : minutus.portoricensis
+>x : daubentonii.nesiotes<Lanthanum.megalonyx, minutus.portoricensis>
 >daubentonii : daubentonii
->nesiotes : nesiotes<T0, T1>
+>nesiotes : daubentonii.nesiotes<T0, T1>
 >Lanthanum : Lanthanum
->megalonyx : megalonyx
+>megalonyx : Lanthanum.megalonyx
 >minutus : minutus
->portoricensis : portoricensis
+>portoricensis : minutus.portoricensis
 >() => { var y = this; } : () => void
 >y : marcanoi
 >this : marcanoi
->x : nesiotes<megalonyx, portoricensis>
+>x : daubentonii.nesiotes<Lanthanum.megalonyx, minutus.portoricensis>
 
         martinsi(): dogramacii.aurata { var x: dogramacii.aurata; () => { var y = this; }; return x; }
->martinsi : () => aurata
+>martinsi : () => dogramacii.aurata
 >dogramacii : dogramacii
->aurata : aurata
->x : aurata
+>aurata : dogramacii.aurata
+>x : dogramacii.aurata
 >dogramacii : dogramacii
->aurata : aurata
+>aurata : dogramacii.aurata
 >() => { var y = this; } : () => void
 >y : marcanoi
 >this : marcanoi
->x : aurata
+>x : dogramacii.aurata
 
         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 : () => ciliolabrum<melanoleuca, amphibius<inez<moojeni<amphibius<falconeri, psilurus>, echinatus>, aurata>, ciliolabrum<carolinensis, beisa>>>
+>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 : imperfecta
->ciliolabrum : ciliolabrum<T0, T1>
+>ciliolabrum : imperfecta.ciliolabrum<T0, T1>
 >provocax : provocax
->melanoleuca : melanoleuca
+>melanoleuca : provocax.melanoleuca
 >panglima : panglima
->amphibius : amphibius<T0, T1>
+>amphibius : panglima.amphibius<T0, T1>
 >minutus : minutus
->inez : inez<T0, T1>
+>inez : minutus.inez<T0, T1>
 >rendalli : rendalli
->moojeni : moojeni<T0, T1>
+>moojeni : rendalli.moojeni<T0, T1>
 >panglima : panglima
->amphibius : amphibius<T0, T1>
+>amphibius : panglima.amphibius<T0, T1>
 >trivirgatus : trivirgatus
->falconeri : falconeri
+>falconeri : trivirgatus.falconeri
 >caurinus : caurinus
->psilurus : psilurus
+>psilurus : caurinus.psilurus
 >gabriellae : gabriellae
->echinatus : echinatus
+>echinatus : gabriellae.echinatus
 >dogramacii : dogramacii
->aurata : aurata
+>aurata : dogramacii.aurata
 >imperfecta : imperfecta
->ciliolabrum : ciliolabrum<T0, T1>
+>ciliolabrum : imperfecta.ciliolabrum<T0, T1>
 >quasiater : quasiater
->carolinensis : carolinensis
+>carolinensis : quasiater.carolinensis
 >lavali : lavali
->beisa : beisa
->x : ciliolabrum<melanoleuca, amphibius<inez<moojeni<amphibius<falconeri, psilurus>, echinatus>, aurata>, ciliolabrum<carolinensis, beisa>>>
+>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 : imperfecta
->ciliolabrum : ciliolabrum<T0, T1>
+>ciliolabrum : imperfecta.ciliolabrum<T0, T1>
 >provocax : provocax
->melanoleuca : melanoleuca
+>melanoleuca : provocax.melanoleuca
 >panglima : panglima
->amphibius : amphibius<T0, T1>
+>amphibius : panglima.amphibius<T0, T1>
 >minutus : minutus
->inez : inez<T0, T1>
+>inez : minutus.inez<T0, T1>
 >rendalli : rendalli
->moojeni : moojeni<T0, T1>
+>moojeni : rendalli.moojeni<T0, T1>
 >panglima : panglima
->amphibius : amphibius<T0, T1>
+>amphibius : panglima.amphibius<T0, T1>
 >trivirgatus : trivirgatus
->falconeri : falconeri
+>falconeri : trivirgatus.falconeri
 >caurinus : caurinus
->psilurus : psilurus
+>psilurus : caurinus.psilurus
 >gabriellae : gabriellae
->echinatus : echinatus
+>echinatus : gabriellae.echinatus
 >dogramacii : dogramacii
->aurata : aurata
+>aurata : dogramacii.aurata
 >imperfecta : imperfecta
->ciliolabrum : ciliolabrum<T0, T1>
+>ciliolabrum : imperfecta.ciliolabrum<T0, T1>
 >quasiater : quasiater
->carolinensis : carolinensis
+>carolinensis : quasiater.carolinensis
 >lavali : lavali
->beisa : beisa
+>beisa : lavali.beisa
 >() => { var y = this; } : () => void
 >y : marcanoi
 >this : marcanoi
->x : ciliolabrum<melanoleuca, amphibius<inez<moojeni<amphibius<falconeri, psilurus>, echinatus>, aurata>, ciliolabrum<carolinensis, 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>>>
 
         griseoventer(): argurus.oreas { var x: argurus.oreas; () => { var y = this; }; return x; }
->griseoventer : () => oreas
+>griseoventer : () => argurus.oreas
 >argurus : argurus
->oreas : oreas
->x : oreas
+>oreas : argurus.oreas
+>x : argurus.oreas
 >argurus : argurus
->oreas : oreas
+>oreas : argurus.oreas
 >() => { var y = this; } : () => void
 >y : marcanoi
 >this : marcanoi
->x : oreas
+>x : argurus.oreas
 
         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 : () => wattsi<oralis<steerii, lepturus>, coludo<steerii, gerbillus<thaeleri, carolinensis>>>
+>zerda : () => quasiater.wattsi<julianae.oralis<julianae.steerii, lavali.lepturus>, coludo<julianae.steerii, julianae.gerbillus<lavali.thaeleri, quasiater.carolinensis>>>
 >quasiater : quasiater
->wattsi : wattsi<T0, T1>
+>wattsi : quasiater.wattsi<T0, T1>
 >julianae : julianae
->oralis : oralis<T0, T1>
+>oralis : julianae.oralis<T0, T1>
 >julianae : julianae
->steerii : steerii
+>steerii : julianae.steerii
 >lavali : lavali
->lepturus : lepturus
+>lepturus : lavali.lepturus
 >howi : howi
 >coludo : coludo<T0, T1>
 >julianae : julianae
->steerii : steerii
+>steerii : julianae.steerii
 >julianae : julianae
->gerbillus : gerbillus<T0, T1>
+>gerbillus : julianae.gerbillus<T0, T1>
 >lavali : lavali
->thaeleri : thaeleri
+>thaeleri : lavali.thaeleri
 >quasiater : quasiater
->carolinensis : carolinensis
->x : wattsi<oralis<steerii, lepturus>, coludo<steerii, gerbillus<thaeleri, carolinensis>>>
+>carolinensis : quasiater.carolinensis
+>x : quasiater.wattsi<julianae.oralis<julianae.steerii, lavali.lepturus>, coludo<julianae.steerii, julianae.gerbillus<lavali.thaeleri, quasiater.carolinensis>>>
 >quasiater : quasiater
->wattsi : wattsi<T0, T1>
+>wattsi : quasiater.wattsi<T0, T1>
 >julianae : julianae
->oralis : oralis<T0, T1>
+>oralis : julianae.oralis<T0, T1>
 >julianae : julianae
->steerii : steerii
+>steerii : julianae.steerii
 >lavali : lavali
->lepturus : lepturus
+>lepturus : lavali.lepturus
 >howi : howi
 >coludo : coludo<T0, T1>
 >julianae : julianae
->steerii : steerii
+>steerii : julianae.steerii
 >julianae : julianae
->gerbillus : gerbillus<T0, T1>
+>gerbillus : julianae.gerbillus<T0, T1>
 >lavali : lavali
->thaeleri : thaeleri
+>thaeleri : lavali.thaeleri
 >quasiater : quasiater
->carolinensis : carolinensis
+>carolinensis : quasiater.carolinensis
 >() => { var y = this; } : () => void
 >y : marcanoi
 >this : marcanoi
->x : wattsi<oralis<steerii, lepturus>, coludo<steerii, gerbillus<thaeleri, carolinensis>>>
+>x : quasiater.wattsi<julianae.oralis<julianae.steerii, lavali.lepturus>, coludo<julianae.steerii, julianae.gerbillus<lavali.thaeleri, quasiater.carolinensis>>>
 
         yucatanicus(): julianae.nudicaudus { var x: julianae.nudicaudus; () => { var y = this; }; return x; }
->yucatanicus : () => nudicaudus
+>yucatanicus : () => julianae.nudicaudus
 >julianae : julianae
->nudicaudus : nudicaudus
->x : nudicaudus
+>nudicaudus : julianae.nudicaudus
+>x : julianae.nudicaudus
 >julianae : julianae
->nudicaudus : nudicaudus
+>nudicaudus : julianae.nudicaudus
 >() => { var y = this; } : () => void
 >y : marcanoi
 >this : marcanoi
->x : nudicaudus
+>x : julianae.nudicaudus
 
         nigrita(): argurus.peninsulae { var x: argurus.peninsulae; () => { var y = this; }; return x; }
->nigrita : () => peninsulae
+>nigrita : () => argurus.peninsulae
 >argurus : argurus
->peninsulae : peninsulae
->x : peninsulae
+>peninsulae : argurus.peninsulae
+>x : argurus.peninsulae
 >argurus : argurus
->peninsulae : peninsulae
+>peninsulae : argurus.peninsulae
 >() => { var y = this; } : () => void
 >y : marcanoi
 >this : marcanoi
->x : peninsulae
+>x : argurus.peninsulae
 
         jouvenetae(): argurus.dauricus<argurus.germaini, julianae.durangae> { var x: argurus.dauricus<argurus.germaini, julianae.durangae>; () => { var y = this; }; return x; }
->jouvenetae : () => dauricus<germaini, durangae>
+>jouvenetae : () => argurus.dauricus<argurus.germaini, julianae.durangae>
 >argurus : argurus
->dauricus : dauricus<T0, T1>
+>dauricus : argurus.dauricus<T0, T1>
 >argurus : argurus
->germaini : germaini
+>germaini : argurus.germaini
 >julianae : julianae
->durangae : durangae
->x : dauricus<germaini, durangae>
+>durangae : julianae.durangae
+>x : argurus.dauricus<argurus.germaini, julianae.durangae>
 >argurus : argurus
->dauricus : dauricus<T0, T1>
+>dauricus : argurus.dauricus<T0, T1>
 >argurus : argurus
->germaini : germaini
+>germaini : argurus.germaini
 >julianae : julianae
->durangae : durangae
+>durangae : julianae.durangae
 >() => { var y = this; } : () => void
 >y : marcanoi
 >this : marcanoi
->x : dauricus<germaini, durangae>
+>x : argurus.dauricus<argurus.germaini, julianae.durangae>
 
         indefessus(): sagitta.walkeri { var x: sagitta.walkeri; () => { var y = this; }; return x; }
->indefessus : () => walkeri
+>indefessus : () => sagitta.walkeri
 >sagitta : sagitta
->walkeri : walkeri
->x : walkeri
+>walkeri : sagitta.walkeri
+>x : sagitta.walkeri
 >sagitta : sagitta
->walkeri : walkeri
+>walkeri : sagitta.walkeri
 >() => { var y = this; } : () => void
 >y : marcanoi
 >this : marcanoi
->x : walkeri
+>x : sagitta.walkeri
 
         vuquangensis(): macrorhinos.daphaenodon { var x: macrorhinos.daphaenodon; () => { var y = this; }; return x; }
->vuquangensis : () => daphaenodon
+>vuquangensis : () => macrorhinos.daphaenodon
 >macrorhinos : macrorhinos
->daphaenodon : daphaenodon
->x : daphaenodon
+>daphaenodon : macrorhinos.daphaenodon
+>x : macrorhinos.daphaenodon
 >macrorhinos : macrorhinos
->daphaenodon : daphaenodon
+>daphaenodon : macrorhinos.daphaenodon
 >() => { var y = this; } : () => void
 >y : marcanoi
 >this : marcanoi
->x : daphaenodon
+>x : macrorhinos.daphaenodon
 
         Zirconium(): lavali.thaeleri { var x: lavali.thaeleri; () => { var y = this; }; return x; }
->Zirconium : () => thaeleri
+>Zirconium : () => lavali.thaeleri
 >lavali : lavali
->thaeleri : thaeleri
->x : thaeleri
+>thaeleri : lavali.thaeleri
+>x : lavali.thaeleri
 >lavali : lavali
->thaeleri : thaeleri
+>thaeleri : lavali.thaeleri
 >() => { var y = this; } : () => void
 >y : marcanoi
 >this : marcanoi
->x : thaeleri
+>x : lavali.thaeleri
 
         hyaena(): julianae.oralis<lavali.beisa, argurus.oreas> { var x: julianae.oralis<lavali.beisa, argurus.oreas>; () => { var y = this; }; return x; }
->hyaena : () => oralis<beisa, oreas>
+>hyaena : () => julianae.oralis<lavali.beisa, argurus.oreas>
 >julianae : julianae
->oralis : oralis<T0, T1>
+>oralis : julianae.oralis<T0, T1>
 >lavali : lavali
->beisa : beisa
+>beisa : lavali.beisa
 >argurus : argurus
->oreas : oreas
->x : oralis<beisa, oreas>
+>oreas : argurus.oreas
+>x : julianae.oralis<lavali.beisa, argurus.oreas>
 >julianae : julianae
->oralis : oralis<T0, T1>
+>oralis : julianae.oralis<T0, T1>
 >lavali : lavali
->beisa : beisa
+>beisa : lavali.beisa
 >argurus : argurus
->oreas : oreas
+>oreas : argurus.oreas
 >() => { var y = this; } : () => void
 >y : marcanoi
 >this : marcanoi
->x : oralis<beisa, oreas>
+>x : julianae.oralis<lavali.beisa, argurus.oreas>
     }
 }
 module argurus {
->argurus : typeof argurus
+>argurus : argurus
 
     export class gilbertii<T0, T1> {
 >gilbertii : gilbertii<T0, T1>
@@ -9560,553 +9560,553 @@ module argurus {
 >T1 : T1
 
         nasutus(): lavali.lepturus { var x: lavali.lepturus; () => { var y = this; }; return x; }
->nasutus : () => lepturus
+>nasutus : () => lavali.lepturus
 >lavali : lavali
->lepturus : lepturus
->x : lepturus
+>lepturus : lavali.lepturus
+>x : lavali.lepturus
 >lavali : lavali
->lepturus : lepturus
+>lepturus : lavali.lepturus
 >() => { var y = this; } : () => void
 >y : gilbertii<T0, T1>
 >this : gilbertii<T0, T1>
->x : lepturus
+>x : lavali.lepturus
 
         poecilops(): julianae.steerii { var x: julianae.steerii; () => { var y = this; }; return x; }
->poecilops : () => steerii
+>poecilops : () => julianae.steerii
 >julianae : julianae
->steerii : steerii
->x : steerii
+>steerii : julianae.steerii
+>x : julianae.steerii
 >julianae : julianae
->steerii : steerii
+>steerii : julianae.steerii
 >() => { var y = this; } : () => void
 >y : gilbertii<T0, T1>
 >this : gilbertii<T0, T1>
->x : steerii
+>x : julianae.steerii
 
         sondaicus(): samarensis.fuscus<argurus.peninsulae, lavali.lepturus> { var x: samarensis.fuscus<argurus.peninsulae, lavali.lepturus>; () => { var y = this; }; return x; }
->sondaicus : () => fuscus<peninsulae, lepturus>
+>sondaicus : () => samarensis.fuscus<peninsulae, lavali.lepturus>
 >samarensis : samarensis
->fuscus : fuscus<T0, T1>
+>fuscus : samarensis.fuscus<T0, T1>
 >argurus : argurus
 >peninsulae : peninsulae
 >lavali : lavali
->lepturus : lepturus
->x : fuscus<peninsulae, lepturus>
+>lepturus : lavali.lepturus
+>x : samarensis.fuscus<peninsulae, lavali.lepturus>
 >samarensis : samarensis
->fuscus : fuscus<T0, T1>
+>fuscus : samarensis.fuscus<T0, T1>
 >argurus : argurus
 >peninsulae : peninsulae
 >lavali : lavali
->lepturus : lepturus
+>lepturus : lavali.lepturus
 >() => { var y = this; } : () => void
 >y : gilbertii<T0, T1>
 >this : gilbertii<T0, T1>
->x : fuscus<peninsulae, lepturus>
+>x : samarensis.fuscus<peninsulae, lavali.lepturus>
 
         auriventer(): petrophilus.rosalia<lavali.xanthognathus, trivirgatus.oconnelli> { var x: petrophilus.rosalia<lavali.xanthognathus, trivirgatus.oconnelli>; () => { var y = this; }; return x; }
->auriventer : () => rosalia<xanthognathus, oconnelli>
+>auriventer : () => petrophilus.rosalia<lavali.xanthognathus, trivirgatus.oconnelli>
 >petrophilus : petrophilus
->rosalia : rosalia<T0, T1>
+>rosalia : petrophilus.rosalia<T0, T1>
 >lavali : lavali
->xanthognathus : xanthognathus
+>xanthognathus : lavali.xanthognathus
 >trivirgatus : trivirgatus
->oconnelli : oconnelli
->x : rosalia<xanthognathus, oconnelli>
+>oconnelli : trivirgatus.oconnelli
+>x : petrophilus.rosalia<lavali.xanthognathus, trivirgatus.oconnelli>
 >petrophilus : petrophilus
->rosalia : rosalia<T0, T1>
+>rosalia : petrophilus.rosalia<T0, T1>
 >lavali : lavali
->xanthognathus : xanthognathus
+>xanthognathus : lavali.xanthognathus
 >trivirgatus : trivirgatus
->oconnelli : oconnelli
+>oconnelli : trivirgatus.oconnelli
 >() => { var y = this; } : () => void
 >y : gilbertii<T0, T1>
 >this : gilbertii<T0, T1>
->x : rosalia<xanthognathus, oconnelli>
+>x : petrophilus.rosalia<lavali.xanthognathus, trivirgatus.oconnelli>
 
         cherriei(): ruatanica.Praseodymium<Lanthanum.jugularis, argurus.oreas> { var x: ruatanica.Praseodymium<Lanthanum.jugularis, argurus.oreas>; () => { var y = this; }; return x; }
->cherriei : () => Praseodymium<jugularis, oreas>
+>cherriei : () => ruatanica.Praseodymium<Lanthanum.jugularis, oreas>
 >ruatanica : ruatanica
->Praseodymium : Praseodymium<T0, T1>
+>Praseodymium : ruatanica.Praseodymium<T0, T1>
 >Lanthanum : Lanthanum
->jugularis : jugularis
+>jugularis : Lanthanum.jugularis
 >argurus : argurus
 >oreas : oreas
->x : Praseodymium<jugularis, oreas>
+>x : ruatanica.Praseodymium<Lanthanum.jugularis, oreas>
 >ruatanica : ruatanica
->Praseodymium : Praseodymium<T0, T1>
+>Praseodymium : ruatanica.Praseodymium<T0, T1>
 >Lanthanum : Lanthanum
->jugularis : jugularis
+>jugularis : Lanthanum.jugularis
 >argurus : argurus
 >oreas : oreas
 >() => { var y = this; } : () => void
 >y : gilbertii<T0, T1>
 >this : gilbertii<T0, T1>
->x : Praseodymium<jugularis, oreas>
+>x : ruatanica.Praseodymium<Lanthanum.jugularis, oreas>
 
         lindberghi(): minutus.inez<rendalli.zuluensis, rionegrensis.caniventer> { var x: minutus.inez<rendalli.zuluensis, rionegrensis.caniventer>; () => { var y = this; }; return x; }
->lindberghi : () => inez<zuluensis, caniventer>
+>lindberghi : () => minutus.inez<rendalli.zuluensis, rionegrensis.caniventer>
 >minutus : minutus
->inez : inez<T0, T1>
+>inez : minutus.inez<T0, T1>
 >rendalli : rendalli
->zuluensis : zuluensis
+>zuluensis : rendalli.zuluensis
 >rionegrensis : rionegrensis
->caniventer : caniventer
->x : inez<zuluensis, caniventer>
+>caniventer : rionegrensis.caniventer
+>x : minutus.inez<rendalli.zuluensis, rionegrensis.caniventer>
 >minutus : minutus
->inez : inez<T0, T1>
+>inez : minutus.inez<T0, T1>
 >rendalli : rendalli
->zuluensis : zuluensis
+>zuluensis : rendalli.zuluensis
 >rionegrensis : rionegrensis
->caniventer : caniventer
+>caniventer : rionegrensis.caniventer
 >() => { var y = this; } : () => void
 >y : gilbertii<T0, T1>
 >this : gilbertii<T0, T1>
->x : inez<zuluensis, caniventer>
+>x : minutus.inez<rendalli.zuluensis, rionegrensis.caniventer>
 
         pipistrellus(): quasiater.carolinensis { var x: quasiater.carolinensis; () => { var y = this; }; return x; }
->pipistrellus : () => carolinensis
+>pipistrellus : () => quasiater.carolinensis
 >quasiater : quasiater
->carolinensis : carolinensis
->x : carolinensis
+>carolinensis : quasiater.carolinensis
+>x : quasiater.carolinensis
 >quasiater : quasiater
->carolinensis : carolinensis
+>carolinensis : quasiater.carolinensis
 >() => { var y = this; } : () => void
 >y : gilbertii<T0, T1>
 >this : gilbertii<T0, T1>
->x : carolinensis
+>x : quasiater.carolinensis
 
         paranus(): lutreolus.punicus { var x: lutreolus.punicus; () => { var y = this; }; return x; }
->paranus : () => punicus
+>paranus : () => lutreolus.punicus
 >lutreolus : lutreolus
->punicus : punicus
->x : punicus
+>punicus : lutreolus.punicus
+>x : lutreolus.punicus
 >lutreolus : lutreolus
->punicus : punicus
+>punicus : lutreolus.punicus
 >() => { var y = this; } : () => void
 >y : gilbertii<T0, T1>
 >this : gilbertii<T0, T1>
->x : punicus
+>x : lutreolus.punicus
 
         dubosti(): nigra.thalia<lutreolus.schlegeli, julianae.sumatrana> { var x: nigra.thalia<lutreolus.schlegeli, julianae.sumatrana>; () => { var y = this; }; return x; }
->dubosti : () => thalia<schlegeli, sumatrana>
+>dubosti : () => nigra.thalia<lutreolus.schlegeli, julianae.sumatrana>
 >nigra : nigra
->thalia : thalia<T0, T1>
+>thalia : nigra.thalia<T0, T1>
 >lutreolus : lutreolus
->schlegeli : schlegeli
+>schlegeli : lutreolus.schlegeli
 >julianae : julianae
->sumatrana : sumatrana
->x : thalia<schlegeli, sumatrana>
+>sumatrana : julianae.sumatrana
+>x : nigra.thalia<lutreolus.schlegeli, julianae.sumatrana>
 >nigra : nigra
->thalia : thalia<T0, T1>
+>thalia : nigra.thalia<T0, T1>
 >lutreolus : lutreolus
->schlegeli : schlegeli
+>schlegeli : lutreolus.schlegeli
 >julianae : julianae
->sumatrana : sumatrana
+>sumatrana : julianae.sumatrana
 >() => { var y = this; } : () => void
 >y : gilbertii<T0, T1>
 >this : gilbertii<T0, T1>
->x : thalia<schlegeli, sumatrana>
+>x : nigra.thalia<lutreolus.schlegeli, julianae.sumatrana>
 
         opossum(): nigra.dolichurus<lavali.lepturus, samarensis.pallidus> { var x: nigra.dolichurus<lavali.lepturus, samarensis.pallidus>; () => { var y = this; }; return x; }
->opossum : () => dolichurus<lepturus, pallidus>
+>opossum : () => nigra.dolichurus<lavali.lepturus, samarensis.pallidus>
 >nigra : nigra
->dolichurus : dolichurus<T0, T1>
+>dolichurus : nigra.dolichurus<T0, T1>
 >lavali : lavali
->lepturus : lepturus
+>lepturus : lavali.lepturus
 >samarensis : samarensis
->pallidus : pallidus
->x : dolichurus<lepturus, pallidus>
+>pallidus : samarensis.pallidus
+>x : nigra.dolichurus<lavali.lepturus, samarensis.pallidus>
 >nigra : nigra
->dolichurus : dolichurus<T0, T1>
+>dolichurus : nigra.dolichurus<T0, T1>
 >lavali : lavali
->lepturus : lepturus
+>lepturus : lavali.lepturus
 >samarensis : samarensis
->pallidus : pallidus
+>pallidus : samarensis.pallidus
 >() => { var y = this; } : () => void
 >y : gilbertii<T0, T1>
 >this : gilbertii<T0, T1>
->x : dolichurus<lepturus, pallidus>
+>x : nigra.dolichurus<lavali.lepturus, samarensis.pallidus>
 
         oreopolus(): minutus.portoricensis { var x: minutus.portoricensis; () => { var y = this; }; return x; }
->oreopolus : () => portoricensis
+>oreopolus : () => minutus.portoricensis
 >minutus : minutus
->portoricensis : portoricensis
->x : portoricensis
+>portoricensis : minutus.portoricensis
+>x : minutus.portoricensis
 >minutus : minutus
->portoricensis : portoricensis
+>portoricensis : minutus.portoricensis
 >() => { var y = this; } : () => void
 >y : gilbertii<T0, T1>
 >this : gilbertii<T0, T1>
->x : portoricensis
+>x : minutus.portoricensis
 
         amurensis(): daubentonii.arboreus<lavali.otion, macrorhinos.konganensis> { var x: daubentonii.arboreus<lavali.otion, macrorhinos.konganensis>; () => { var y = this; }; return x; }
->amurensis : () => arboreus<otion, konganensis>
+>amurensis : () => daubentonii.arboreus<lavali.otion, macrorhinos.konganensis>
 >daubentonii : daubentonii
->arboreus : arboreus<T0, T1>
+>arboreus : daubentonii.arboreus<T0, T1>
 >lavali : lavali
->otion : otion
+>otion : lavali.otion
 >macrorhinos : macrorhinos
->konganensis : konganensis
->x : arboreus<otion, konganensis>
+>konganensis : macrorhinos.konganensis
+>x : daubentonii.arboreus<lavali.otion, macrorhinos.konganensis>
 >daubentonii : daubentonii
->arboreus : arboreus<T0, T1>
+>arboreus : daubentonii.arboreus<T0, T1>
 >lavali : lavali
->otion : otion
+>otion : lavali.otion
 >macrorhinos : macrorhinos
->konganensis : konganensis
+>konganensis : macrorhinos.konganensis
 >() => { var y = this; } : () => void
 >y : gilbertii<T0, T1>
 >this : gilbertii<T0, T1>
->x : arboreus<otion, konganensis>
+>x : daubentonii.arboreus<lavali.otion, macrorhinos.konganensis>
     }
 }
 module petrophilus {
->petrophilus : typeof petrophilus
+>petrophilus : petrophilus
 
     export class minutilla {
 >minutilla : minutilla
     }
 }
 module lutreolus {
->lutreolus : typeof lutreolus
+>lutreolus : lutreolus
 
     export class punicus {
 >punicus : punicus
 
         strandi(): gabriellae.klossii<Lanthanum.jugularis, Lanthanum.jugularis> { var x: gabriellae.klossii<Lanthanum.jugularis, Lanthanum.jugularis>; () => { var y = this; }; return x; }
->strandi : () => klossii<jugularis, jugularis>
+>strandi : () => gabriellae.klossii<Lanthanum.jugularis, Lanthanum.jugularis>
 >gabriellae : gabriellae
->klossii : klossii<T0, T1>
+>klossii : gabriellae.klossii<T0, T1>
 >Lanthanum : Lanthanum
->jugularis : jugularis
+>jugularis : Lanthanum.jugularis
 >Lanthanum : Lanthanum
->jugularis : jugularis
->x : klossii<jugularis, jugularis>
+>jugularis : Lanthanum.jugularis
+>x : gabriellae.klossii<Lanthanum.jugularis, Lanthanum.jugularis>
 >gabriellae : gabriellae
->klossii : klossii<T0, T1>
+>klossii : gabriellae.klossii<T0, T1>
 >Lanthanum : Lanthanum
->jugularis : jugularis
+>jugularis : Lanthanum.jugularis
 >Lanthanum : Lanthanum
->jugularis : jugularis
+>jugularis : Lanthanum.jugularis
 >() => { var y = this; } : () => void
 >y : punicus
 >this : punicus
->x : klossii<jugularis, jugularis>
+>x : gabriellae.klossii<Lanthanum.jugularis, Lanthanum.jugularis>
 
         lar(): caurinus.mahaganus<julianae.nudicaudus, lavali.otion> { var x: caurinus.mahaganus<julianae.nudicaudus, lavali.otion>; () => { var y = this; }; return x; }
->lar : () => mahaganus<nudicaudus, otion>
+>lar : () => caurinus.mahaganus<julianae.nudicaudus, lavali.otion>
 >caurinus : caurinus
->mahaganus : mahaganus<T0, T1>
+>mahaganus : caurinus.mahaganus<T0, T1>
 >julianae : julianae
->nudicaudus : nudicaudus
+>nudicaudus : julianae.nudicaudus
 >lavali : lavali
->otion : otion
->x : mahaganus<nudicaudus, otion>
+>otion : lavali.otion
+>x : caurinus.mahaganus<julianae.nudicaudus, lavali.otion>
 >caurinus : caurinus
->mahaganus : mahaganus<T0, T1>
+>mahaganus : caurinus.mahaganus<T0, T1>
 >julianae : julianae
->nudicaudus : nudicaudus
+>nudicaudus : julianae.nudicaudus
 >lavali : lavali
->otion : otion
+>otion : lavali.otion
 >() => { var y = this; } : () => void
 >y : punicus
 >this : punicus
->x : mahaganus<nudicaudus, otion>
+>x : caurinus.mahaganus<julianae.nudicaudus, lavali.otion>
 
         erica(): dogramacii.koepckeae { var x: dogramacii.koepckeae; () => { var y = this; }; return x; }
->erica : () => koepckeae
+>erica : () => dogramacii.koepckeae
 >dogramacii : dogramacii
->koepckeae : koepckeae
->x : koepckeae
+>koepckeae : dogramacii.koepckeae
+>x : dogramacii.koepckeae
 >dogramacii : dogramacii
->koepckeae : koepckeae
+>koepckeae : dogramacii.koepckeae
 >() => { var y = this; } : () => void
 >y : punicus
 >this : punicus
->x : koepckeae
+>x : dogramacii.koepckeae
 
         trichura(): macrorhinos.konganensis { var x: macrorhinos.konganensis; () => { var y = this; }; return x; }
->trichura : () => konganensis
+>trichura : () => macrorhinos.konganensis
 >macrorhinos : macrorhinos
->konganensis : konganensis
->x : konganensis
+>konganensis : macrorhinos.konganensis
+>x : macrorhinos.konganensis
 >macrorhinos : macrorhinos
->konganensis : konganensis
+>konganensis : macrorhinos.konganensis
 >() => { var y = this; } : () => void
 >y : punicus
 >this : punicus
->x : konganensis
+>x : macrorhinos.konganensis
 
         lemniscatus(): panglima.fundatus<gabriellae.amicus, lutreolus.foina> { var x: panglima.fundatus<gabriellae.amicus, lutreolus.foina>; () => { var y = this; }; return x; }
->lemniscatus : () => fundatus<amicus, foina>
+>lemniscatus : () => panglima.fundatus<gabriellae.amicus, foina>
 >panglima : panglima
->fundatus : fundatus<T0, T1>
+>fundatus : panglima.fundatus<T0, T1>
 >gabriellae : gabriellae
->amicus : amicus
+>amicus : gabriellae.amicus
 >lutreolus : lutreolus
 >foina : foina
->x : fundatus<amicus, foina>
+>x : panglima.fundatus<gabriellae.amicus, foina>
 >panglima : panglima
->fundatus : fundatus<T0, T1>
+>fundatus : panglima.fundatus<T0, T1>
 >gabriellae : gabriellae
->amicus : amicus
+>amicus : gabriellae.amicus
 >lutreolus : lutreolus
 >foina : foina
 >() => { var y = this; } : () => void
 >y : punicus
 >this : punicus
->x : fundatus<amicus, foina>
+>x : panglima.fundatus<gabriellae.amicus, foina>
 
         aspalax(): panamensis.linulus<lavali.xanthognathus, macrorhinos.konganensis> { var x: panamensis.linulus<lavali.xanthognathus, macrorhinos.konganensis>; () => { var y = this; }; return x; }
->aspalax : () => linulus<xanthognathus, konganensis>
+>aspalax : () => panamensis.linulus<lavali.xanthognathus, macrorhinos.konganensis>
 >panamensis : panamensis
->linulus : linulus<T0, T1>
+>linulus : panamensis.linulus<T0, T1>
 >lavali : lavali
->xanthognathus : xanthognathus
+>xanthognathus : lavali.xanthognathus
 >macrorhinos : macrorhinos
->konganensis : konganensis
->x : linulus<xanthognathus, konganensis>
+>konganensis : macrorhinos.konganensis
+>x : panamensis.linulus<lavali.xanthognathus, macrorhinos.konganensis>
 >panamensis : panamensis
->linulus : linulus<T0, T1>
+>linulus : panamensis.linulus<T0, T1>
 >lavali : lavali
->xanthognathus : xanthognathus
+>xanthognathus : lavali.xanthognathus
 >macrorhinos : macrorhinos
->konganensis : konganensis
+>konganensis : macrorhinos.konganensis
 >() => { var y = this; } : () => void
 >y : punicus
 >this : punicus
->x : linulus<xanthognathus, konganensis>
+>x : panamensis.linulus<lavali.xanthognathus, macrorhinos.konganensis>
 
         marshalli(): julianae.nudicaudus { var x: julianae.nudicaudus; () => { var y = this; }; return x; }
->marshalli : () => nudicaudus
+>marshalli : () => julianae.nudicaudus
 >julianae : julianae
->nudicaudus : nudicaudus
->x : nudicaudus
+>nudicaudus : julianae.nudicaudus
+>x : julianae.nudicaudus
 >julianae : julianae
->nudicaudus : nudicaudus
+>nudicaudus : julianae.nudicaudus
 >() => { var y = this; } : () => void
 >y : punicus
 >this : punicus
->x : nudicaudus
+>x : julianae.nudicaudus
 
         Zinc(): julianae.galapagoensis { var x: julianae.galapagoensis; () => { var y = this; }; return x; }
->Zinc : () => galapagoensis
+>Zinc : () => julianae.galapagoensis
 >julianae : julianae
->galapagoensis : galapagoensis
->x : galapagoensis
+>galapagoensis : julianae.galapagoensis
+>x : julianae.galapagoensis
 >julianae : julianae
->galapagoensis : galapagoensis
+>galapagoensis : julianae.galapagoensis
 >() => { var y = this; } : () => void
 >y : punicus
 >this : punicus
->x : galapagoensis
+>x : julianae.galapagoensis
 
         monochromos(): howi.coludo<lavali.lepturus, lutreolus.punicus> { var x: howi.coludo<lavali.lepturus, lutreolus.punicus>; () => { var y = this; }; return x; }
->monochromos : () => coludo<lepturus, punicus>
+>monochromos : () => howi.coludo<lavali.lepturus, punicus>
 >howi : howi
->coludo : coludo<T0, T1>
+>coludo : howi.coludo<T0, T1>
 >lavali : lavali
->lepturus : lepturus
+>lepturus : lavali.lepturus
 >lutreolus : lutreolus
 >punicus : punicus
->x : coludo<lepturus, punicus>
+>x : howi.coludo<lavali.lepturus, punicus>
 >howi : howi
->coludo : coludo<T0, T1>
+>coludo : howi.coludo<T0, T1>
 >lavali : lavali
->lepturus : lepturus
+>lepturus : lavali.lepturus
 >lutreolus : lutreolus
 >punicus : punicus
 >() => { var y = this; } : () => void
 >y : punicus
 >this : punicus
->x : coludo<lepturus, punicus>
+>x : howi.coludo<lavali.lepturus, punicus>
 
         purinus(): ruatanica.hector<lutreolus.schlegeli, provocax.melanoleuca> { var x: ruatanica.hector<lutreolus.schlegeli, provocax.melanoleuca>; () => { var y = this; }; return x; }
->purinus : () => hector<schlegeli, melanoleuca>
+>purinus : () => ruatanica.hector<schlegeli, provocax.melanoleuca>
 >ruatanica : ruatanica
->hector : hector<T0, T1>
+>hector : ruatanica.hector<T0, T1>
 >lutreolus : lutreolus
 >schlegeli : schlegeli
 >provocax : provocax
->melanoleuca : melanoleuca
->x : hector<schlegeli, melanoleuca>
+>melanoleuca : provocax.melanoleuca
+>x : ruatanica.hector<schlegeli, provocax.melanoleuca>
 >ruatanica : ruatanica
->hector : hector<T0, T1>
+>hector : ruatanica.hector<T0, T1>
 >lutreolus : lutreolus
 >schlegeli : schlegeli
 >provocax : provocax
->melanoleuca : melanoleuca
+>melanoleuca : provocax.melanoleuca
 >() => { var y = this; } : () => void
 >y : punicus
 >this : punicus
->x : hector<schlegeli, melanoleuca>
+>x : ruatanica.hector<schlegeli, provocax.melanoleuca>
 
         ischyrus(): lavali.lepturus { var x: lavali.lepturus; () => { var y = this; }; return x; }
->ischyrus : () => lepturus
+>ischyrus : () => lavali.lepturus
 >lavali : lavali
->lepturus : lepturus
->x : lepturus
+>lepturus : lavali.lepturus
+>x : lavali.lepturus
 >lavali : lavali
->lepturus : lepturus
+>lepturus : lavali.lepturus
 >() => { var y = this; } : () => void
 >y : punicus
 >this : punicus
->x : lepturus
+>x : lavali.lepturus
 
         tenuis(): macrorhinos.daphaenodon { var x: macrorhinos.daphaenodon; () => { var y = this; }; return x; }
->tenuis : () => daphaenodon
+>tenuis : () => macrorhinos.daphaenodon
 >macrorhinos : macrorhinos
->daphaenodon : daphaenodon
->x : daphaenodon
+>daphaenodon : macrorhinos.daphaenodon
+>x : macrorhinos.daphaenodon
 >macrorhinos : macrorhinos
->daphaenodon : daphaenodon
+>daphaenodon : macrorhinos.daphaenodon
 >() => { var y = this; } : () => void
 >y : punicus
 >this : punicus
->x : daphaenodon
+>x : macrorhinos.daphaenodon
 
         Helium(): julianae.acariensis { var x: julianae.acariensis; () => { var y = this; }; return x; }
->Helium : () => acariensis
+>Helium : () => julianae.acariensis
 >julianae : julianae
->acariensis : acariensis
->x : acariensis
+>acariensis : julianae.acariensis
+>x : julianae.acariensis
 >julianae : julianae
->acariensis : acariensis
+>acariensis : julianae.acariensis
 >() => { var y = this; } : () => void
 >y : punicus
 >this : punicus
->x : acariensis
+>x : julianae.acariensis
     }
 }
 module macrorhinos {
->macrorhinos : typeof macrorhinos
+>macrorhinos : macrorhinos
 
     export class daphaenodon {
 >daphaenodon : daphaenodon
 
         bredanensis(): julianae.sumatrana { var x: julianae.sumatrana; () => { var y = this; }; return x; }
->bredanensis : () => sumatrana
+>bredanensis : () => julianae.sumatrana
 >julianae : julianae
->sumatrana : sumatrana
->x : sumatrana
+>sumatrana : julianae.sumatrana
+>x : julianae.sumatrana
 >julianae : julianae
->sumatrana : sumatrana
+>sumatrana : julianae.sumatrana
 >() => { var y = this; } : () => void
 >y : daphaenodon
 >this : daphaenodon
->x : sumatrana
+>x : julianae.sumatrana
 
         othus(): howi.coludo<argurus.oreas, howi.marcanoi> { var x: howi.coludo<argurus.oreas, howi.marcanoi>; () => { var y = this; }; return x; }
->othus : () => coludo<oreas, marcanoi>
+>othus : () => howi.coludo<argurus.oreas, howi.marcanoi>
 >howi : howi
->coludo : coludo<T0, T1>
+>coludo : howi.coludo<T0, T1>
 >argurus : argurus
->oreas : oreas
+>oreas : argurus.oreas
 >howi : howi
->marcanoi : marcanoi
->x : coludo<oreas, marcanoi>
+>marcanoi : howi.marcanoi
+>x : howi.coludo<argurus.oreas, howi.marcanoi>
 >howi : howi
->coludo : coludo<T0, T1>
+>coludo : howi.coludo<T0, T1>
 >argurus : argurus
->oreas : oreas
+>oreas : argurus.oreas
 >howi : howi
->marcanoi : marcanoi
+>marcanoi : howi.marcanoi
 >() => { var y = this; } : () => void
 >y : daphaenodon
 >this : daphaenodon
->x : coludo<oreas, marcanoi>
+>x : howi.coludo<argurus.oreas, howi.marcanoi>
 
         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 : () => gerbillus<inez<moojeni<amphibius<falconeri, psilurus>, echinatus>, aurata>, otion>
+>hammondi : () => julianae.gerbillus<minutus.inez<rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>, dogramacii.aurata>, lavali.otion>
 >julianae : julianae
->gerbillus : gerbillus<T0, T1>
+>gerbillus : julianae.gerbillus<T0, T1>
 >minutus : minutus
->inez : inez<T0, T1>
+>inez : minutus.inez<T0, T1>
 >rendalli : rendalli
->moojeni : moojeni<T0, T1>
+>moojeni : rendalli.moojeni<T0, T1>
 >panglima : panglima
->amphibius : amphibius<T0, T1>
+>amphibius : panglima.amphibius<T0, T1>
 >trivirgatus : trivirgatus
->falconeri : falconeri
+>falconeri : trivirgatus.falconeri
 >caurinus : caurinus
->psilurus : psilurus
+>psilurus : caurinus.psilurus
 >gabriellae : gabriellae
->echinatus : echinatus
+>echinatus : gabriellae.echinatus
 >dogramacii : dogramacii
->aurata : aurata
+>aurata : dogramacii.aurata
 >lavali : lavali
->otion : otion
->x : gerbillus<inez<moojeni<amphibius<falconeri, psilurus>, echinatus>, aurata>, otion>
+>otion : lavali.otion
+>x : julianae.gerbillus<minutus.inez<rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>, dogramacii.aurata>, lavali.otion>
 >julianae : julianae
->gerbillus : gerbillus<T0, T1>
+>gerbillus : julianae.gerbillus<T0, T1>
 >minutus : minutus
->inez : inez<T0, T1>
+>inez : minutus.inez<T0, T1>
 >rendalli : rendalli
->moojeni : moojeni<T0, T1>
+>moojeni : rendalli.moojeni<T0, T1>
 >panglima : panglima
->amphibius : amphibius<T0, T1>
+>amphibius : panglima.amphibius<T0, T1>
 >trivirgatus : trivirgatus
->falconeri : falconeri
+>falconeri : trivirgatus.falconeri
 >caurinus : caurinus
->psilurus : psilurus
+>psilurus : caurinus.psilurus
 >gabriellae : gabriellae
->echinatus : echinatus
+>echinatus : gabriellae.echinatus
 >dogramacii : dogramacii
->aurata : aurata
+>aurata : dogramacii.aurata
 >lavali : lavali
->otion : otion
+>otion : lavali.otion
 >() => { var y = this; } : () => void
 >y : daphaenodon
 >this : daphaenodon
->x : gerbillus<inez<moojeni<amphibius<falconeri, psilurus>, echinatus>, aurata>, otion>
+>x : julianae.gerbillus<minutus.inez<rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>, dogramacii.aurata>, lavali.otion>
 
         aureocollaris(): quasiater.carolinensis { var x: quasiater.carolinensis; () => { var y = this; }; return x; }
->aureocollaris : () => carolinensis
+>aureocollaris : () => quasiater.carolinensis
 >quasiater : quasiater
->carolinensis : carolinensis
->x : carolinensis
+>carolinensis : quasiater.carolinensis
+>x : quasiater.carolinensis
 >quasiater : quasiater
->carolinensis : carolinensis
+>carolinensis : quasiater.carolinensis
 >() => { var y = this; } : () => void
 >y : daphaenodon
 >this : daphaenodon
->x : carolinensis
+>x : quasiater.carolinensis
 
         flavipes(): petrophilus.minutilla { var x: petrophilus.minutilla; () => { var y = this; }; return x; }
->flavipes : () => minutilla
+>flavipes : () => petrophilus.minutilla
 >petrophilus : petrophilus
->minutilla : minutilla
->x : minutilla
+>minutilla : petrophilus.minutilla
+>x : petrophilus.minutilla
 >petrophilus : petrophilus
->minutilla : minutilla
+>minutilla : petrophilus.minutilla
 >() => { var y = this; } : () => void
 >y : daphaenodon
 >this : daphaenodon
->x : minutilla
+>x : petrophilus.minutilla
 
         callosus(): trivirgatus.lotor<lutreolus.foina, dogramacii.robustulus> { var x: trivirgatus.lotor<lutreolus.foina, dogramacii.robustulus>; () => { var y = this; }; return x; }
->callosus : () => lotor<foina, robustulus>
+>callosus : () => trivirgatus.lotor<lutreolus.foina, dogramacii.robustulus>
 >trivirgatus : trivirgatus
->lotor : lotor<T0, T1>
+>lotor : trivirgatus.lotor<T0, T1>
 >lutreolus : lutreolus
->foina : foina
+>foina : lutreolus.foina
 >dogramacii : dogramacii
->robustulus : robustulus
->x : lotor<foina, robustulus>
+>robustulus : dogramacii.robustulus
+>x : trivirgatus.lotor<lutreolus.foina, dogramacii.robustulus>
 >trivirgatus : trivirgatus
->lotor : lotor<T0, T1>
+>lotor : trivirgatus.lotor<T0, T1>
 >lutreolus : lutreolus
->foina : foina
+>foina : lutreolus.foina
 >dogramacii : dogramacii
->robustulus : robustulus
+>robustulus : dogramacii.robustulus
 >() => { var y = this; } : () => void
 >y : daphaenodon
 >this : daphaenodon
->x : lotor<foina, robustulus>
+>x : trivirgatus.lotor<lutreolus.foina, dogramacii.robustulus>
     }
 }
 module sagitta {
->sagitta : typeof sagitta
+>sagitta : sagitta
 
     export class cinereus<T0, T1> {
 >cinereus : cinereus<T0, T1>
@@ -10114,204 +10114,204 @@ module sagitta {
 >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 : () => crenulata<konganensis, dolichurus<lepturus, pallidus>>
+>zunigae : () => rendalli.crenulata<macrorhinos.konganensis, nigra.dolichurus<lavali.lepturus, samarensis.pallidus>>
 >rendalli : rendalli
->crenulata : crenulata<T0, T1>
+>crenulata : rendalli.crenulata<T0, T1>
 >macrorhinos : macrorhinos
->konganensis : konganensis
+>konganensis : macrorhinos.konganensis
 >nigra : nigra
->dolichurus : dolichurus<T0, T1>
+>dolichurus : nigra.dolichurus<T0, T1>
 >lavali : lavali
->lepturus : lepturus
+>lepturus : lavali.lepturus
 >samarensis : samarensis
->pallidus : pallidus
->x : crenulata<konganensis, dolichurus<lepturus, pallidus>>
+>pallidus : samarensis.pallidus
+>x : rendalli.crenulata<macrorhinos.konganensis, nigra.dolichurus<lavali.lepturus, samarensis.pallidus>>
 >rendalli : rendalli
->crenulata : crenulata<T0, T1>
+>crenulata : rendalli.crenulata<T0, T1>
 >macrorhinos : macrorhinos
->konganensis : konganensis
+>konganensis : macrorhinos.konganensis
 >nigra : nigra
->dolichurus : dolichurus<T0, T1>
+>dolichurus : nigra.dolichurus<T0, T1>
 >lavali : lavali
->lepturus : lepturus
+>lepturus : lavali.lepturus
 >samarensis : samarensis
->pallidus : pallidus
+>pallidus : samarensis.pallidus
 >() => { var y = this; } : () => void
 >y : cinereus<T0, T1>
 >this : cinereus<T0, T1>
->x : crenulata<konganensis, dolichurus<lepturus, pallidus>>
+>x : rendalli.crenulata<macrorhinos.konganensis, nigra.dolichurus<lavali.lepturus, samarensis.pallidus>>
 
         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 : () => nigricans<megaphyllus, wattsi<jugularis, sumatrana>>
+>microps : () => daubentonii.nigricans<caurinus.megaphyllus, quasiater.wattsi<Lanthanum.jugularis, julianae.sumatrana>>
 >daubentonii : daubentonii
->nigricans : nigricans<T0, T1>
+>nigricans : daubentonii.nigricans<T0, T1>
 >caurinus : caurinus
->megaphyllus : megaphyllus
+>megaphyllus : caurinus.megaphyllus
 >quasiater : quasiater
->wattsi : wattsi<T0, T1>
+>wattsi : quasiater.wattsi<T0, T1>
 >Lanthanum : Lanthanum
->jugularis : jugularis
+>jugularis : Lanthanum.jugularis
 >julianae : julianae
->sumatrana : sumatrana
->x : nigricans<megaphyllus, wattsi<jugularis, sumatrana>>
+>sumatrana : julianae.sumatrana
+>x : daubentonii.nigricans<caurinus.megaphyllus, quasiater.wattsi<Lanthanum.jugularis, julianae.sumatrana>>
 >daubentonii : daubentonii
->nigricans : nigricans<T0, T1>
+>nigricans : daubentonii.nigricans<T0, T1>
 >caurinus : caurinus
->megaphyllus : megaphyllus
+>megaphyllus : caurinus.megaphyllus
 >quasiater : quasiater
->wattsi : wattsi<T0, T1>
+>wattsi : quasiater.wattsi<T0, T1>
 >Lanthanum : Lanthanum
->jugularis : jugularis
+>jugularis : Lanthanum.jugularis
 >julianae : julianae
->sumatrana : sumatrana
+>sumatrana : julianae.sumatrana
 >() => { var y = this; } : () => void
 >y : cinereus<T0, T1>
 >this : cinereus<T0, T1>
->x : nigricans<megaphyllus, wattsi<jugularis, sumatrana>>
+>x : daubentonii.nigricans<caurinus.megaphyllus, quasiater.wattsi<Lanthanum.jugularis, julianae.sumatrana>>
 
         guaporensis(): daubentonii.arboreus<gabriellae.amicus, argurus.germaini> { var x: daubentonii.arboreus<gabriellae.amicus, argurus.germaini>; () => { var y = this; }; return x; }
->guaporensis : () => arboreus<amicus, germaini>
+>guaporensis : () => daubentonii.arboreus<gabriellae.amicus, argurus.germaini>
 >daubentonii : daubentonii
->arboreus : arboreus<T0, T1>
+>arboreus : daubentonii.arboreus<T0, T1>
 >gabriellae : gabriellae
->amicus : amicus
+>amicus : gabriellae.amicus
 >argurus : argurus
->germaini : germaini
->x : arboreus<amicus, germaini>
+>germaini : argurus.germaini
+>x : daubentonii.arboreus<gabriellae.amicus, argurus.germaini>
 >daubentonii : daubentonii
->arboreus : arboreus<T0, T1>
+>arboreus : daubentonii.arboreus<T0, T1>
 >gabriellae : gabriellae
->amicus : amicus
+>amicus : gabriellae.amicus
 >argurus : argurus
->germaini : germaini
+>germaini : argurus.germaini
 >() => { var y = this; } : () => void
 >y : cinereus<T0, T1>
 >this : cinereus<T0, T1>
->x : arboreus<amicus, germaini>
+>x : daubentonii.arboreus<gabriellae.amicus, argurus.germaini>
 
         tonkeana(): panglima.fundatus<petrophilus.minutilla, dammermani.melanops> { var x: panglima.fundatus<petrophilus.minutilla, dammermani.melanops>; () => { var y = this; }; return x; }
->tonkeana : () => fundatus<minutilla, melanops>
+>tonkeana : () => panglima.fundatus<petrophilus.minutilla, dammermani.melanops>
 >panglima : panglima
->fundatus : fundatus<T0, T1>
+>fundatus : panglima.fundatus<T0, T1>
 >petrophilus : petrophilus
->minutilla : minutilla
+>minutilla : petrophilus.minutilla
 >dammermani : dammermani
->melanops : melanops
->x : fundatus<minutilla, melanops>
+>melanops : dammermani.melanops
+>x : panglima.fundatus<petrophilus.minutilla, dammermani.melanops>
 >panglima : panglima
->fundatus : fundatus<T0, T1>
+>fundatus : panglima.fundatus<T0, T1>
 >petrophilus : petrophilus
->minutilla : minutilla
+>minutilla : petrophilus.minutilla
 >dammermani : dammermani
->melanops : melanops
+>melanops : dammermani.melanops
 >() => { var y = this; } : () => void
 >y : cinereus<T0, T1>
 >this : cinereus<T0, T1>
->x : fundatus<minutilla, melanops>
+>x : panglima.fundatus<petrophilus.minutilla, dammermani.melanops>
 
         montensis(): dammermani.siberu<dogramacii.aurata, trivirgatus.oconnelli> { var x: dammermani.siberu<dogramacii.aurata, trivirgatus.oconnelli>; () => { var y = this; }; return x; }
->montensis : () => siberu<aurata, oconnelli>
+>montensis : () => dammermani.siberu<dogramacii.aurata, trivirgatus.oconnelli>
 >dammermani : dammermani
->siberu : siberu<T0, T1>
+>siberu : dammermani.siberu<T0, T1>
 >dogramacii : dogramacii
->aurata : aurata
+>aurata : dogramacii.aurata
 >trivirgatus : trivirgatus
->oconnelli : oconnelli
->x : siberu<aurata, oconnelli>
+>oconnelli : trivirgatus.oconnelli
+>x : dammermani.siberu<dogramacii.aurata, trivirgatus.oconnelli>
 >dammermani : dammermani
->siberu : siberu<T0, T1>
+>siberu : dammermani.siberu<T0, T1>
 >dogramacii : dogramacii
->aurata : aurata
+>aurata : dogramacii.aurata
 >trivirgatus : trivirgatus
->oconnelli : oconnelli
+>oconnelli : trivirgatus.oconnelli
 >() => { var y = this; } : () => void
 >y : cinereus<T0, T1>
 >this : cinereus<T0, T1>
->x : siberu<aurata, oconnelli>
+>x : dammermani.siberu<dogramacii.aurata, trivirgatus.oconnelli>
 
         sphinx(): minutus.portoricensis { var x: minutus.portoricensis; () => { var y = this; }; return x; }
->sphinx : () => portoricensis
+>sphinx : () => minutus.portoricensis
 >minutus : minutus
->portoricensis : portoricensis
->x : portoricensis
+>portoricensis : minutus.portoricensis
+>x : minutus.portoricensis
 >minutus : minutus
->portoricensis : portoricensis
+>portoricensis : minutus.portoricensis
 >() => { var y = this; } : () => void
 >y : cinereus<T0, T1>
 >this : cinereus<T0, T1>
->x : portoricensis
+>x : minutus.portoricensis
 
         glis(): argurus.wetmorei<argurus.oreas, howi.marcanoi> { var x: argurus.wetmorei<argurus.oreas, howi.marcanoi>; () => { var y = this; }; return x; }
->glis : () => wetmorei<oreas, marcanoi>
+>glis : () => argurus.wetmorei<argurus.oreas, howi.marcanoi>
 >argurus : argurus
->wetmorei : wetmorei<T0, T1>
+>wetmorei : argurus.wetmorei<T0, T1>
 >argurus : argurus
->oreas : oreas
+>oreas : argurus.oreas
 >howi : howi
->marcanoi : marcanoi
->x : wetmorei<oreas, marcanoi>
+>marcanoi : howi.marcanoi
+>x : argurus.wetmorei<argurus.oreas, howi.marcanoi>
 >argurus : argurus
->wetmorei : wetmorei<T0, T1>
+>wetmorei : argurus.wetmorei<T0, T1>
 >argurus : argurus
->oreas : oreas
+>oreas : argurus.oreas
 >howi : howi
->marcanoi : marcanoi
+>marcanoi : howi.marcanoi
 >() => { var y = this; } : () => void
 >y : cinereus<T0, T1>
 >this : cinereus<T0, T1>
->x : wetmorei<oreas, marcanoi>
+>x : argurus.wetmorei<argurus.oreas, howi.marcanoi>
 
         dorsalis(): petrophilus.sodyi<argurus.luctuosa, julianae.sumatrana> { var x: petrophilus.sodyi<argurus.luctuosa, julianae.sumatrana>; () => { var y = this; }; return x; }
->dorsalis : () => sodyi<luctuosa, sumatrana>
+>dorsalis : () => petrophilus.sodyi<argurus.luctuosa, julianae.sumatrana>
 >petrophilus : petrophilus
->sodyi : sodyi<T0, T1>
+>sodyi : petrophilus.sodyi<T0, T1>
 >argurus : argurus
->luctuosa : luctuosa
+>luctuosa : argurus.luctuosa
 >julianae : julianae
->sumatrana : sumatrana
->x : sodyi<luctuosa, sumatrana>
+>sumatrana : julianae.sumatrana
+>x : petrophilus.sodyi<argurus.luctuosa, julianae.sumatrana>
 >petrophilus : petrophilus
->sodyi : sodyi<T0, T1>
+>sodyi : petrophilus.sodyi<T0, T1>
 >argurus : argurus
->luctuosa : luctuosa
+>luctuosa : argurus.luctuosa
 >julianae : julianae
->sumatrana : sumatrana
+>sumatrana : julianae.sumatrana
 >() => { var y = this; } : () => void
 >y : cinereus<T0, T1>
 >this : cinereus<T0, T1>
->x : sodyi<luctuosa, sumatrana>
+>x : petrophilus.sodyi<argurus.luctuosa, julianae.sumatrana>
 
         fimbriatus(): provocax.melanoleuca { var x: provocax.melanoleuca; () => { var y = this; }; return x; }
->fimbriatus : () => melanoleuca
+>fimbriatus : () => provocax.melanoleuca
 >provocax : provocax
->melanoleuca : melanoleuca
->x : melanoleuca
+>melanoleuca : provocax.melanoleuca
+>x : provocax.melanoleuca
 >provocax : provocax
->melanoleuca : melanoleuca
+>melanoleuca : provocax.melanoleuca
 >() => { var y = this; } : () => void
 >y : cinereus<T0, T1>
 >this : cinereus<T0, T1>
->x : melanoleuca
+>x : provocax.melanoleuca
 
         sara(): nigra.gracilis<argurus.luctuosa, imperfecta.subspinosus> { var x: nigra.gracilis<argurus.luctuosa, imperfecta.subspinosus>; () => { var y = this; }; return x; }
->sara : () => gracilis<luctuosa, subspinosus>
+>sara : () => nigra.gracilis<argurus.luctuosa, imperfecta.subspinosus>
 >nigra : nigra
->gracilis : gracilis<T0, T1>
+>gracilis : nigra.gracilis<T0, T1>
 >argurus : argurus
->luctuosa : luctuosa
+>luctuosa : argurus.luctuosa
 >imperfecta : imperfecta
->subspinosus : subspinosus
->x : gracilis<luctuosa, subspinosus>
+>subspinosus : imperfecta.subspinosus
+>x : nigra.gracilis<argurus.luctuosa, imperfecta.subspinosus>
 >nigra : nigra
->gracilis : gracilis<T0, T1>
+>gracilis : nigra.gracilis<T0, T1>
 >argurus : argurus
->luctuosa : luctuosa
+>luctuosa : argurus.luctuosa
 >imperfecta : imperfecta
->subspinosus : subspinosus
+>subspinosus : imperfecta.subspinosus
 >() => { var y = this; } : () => void
 >y : cinereus<T0, T1>
 >this : cinereus<T0, T1>
->x : gracilis<luctuosa, subspinosus>
+>x : nigra.gracilis<argurus.luctuosa, imperfecta.subspinosus>
 
         epimelas(): sagitta.stolzmanni { var x: sagitta.stolzmanni; () => { var y = this; }; return x; }
 >epimelas : () => stolzmanni
@@ -10326,28 +10326,28 @@ module sagitta {
 >x : stolzmanni
 
         pittieri(): samarensis.fuscus<quasiater.carolinensis, sagitta.stolzmanni> { var x: samarensis.fuscus<quasiater.carolinensis, sagitta.stolzmanni>; () => { var y = this; }; return x; }
->pittieri : () => fuscus<carolinensis, stolzmanni>
+>pittieri : () => samarensis.fuscus<quasiater.carolinensis, stolzmanni>
 >samarensis : samarensis
->fuscus : fuscus<T0, T1>
+>fuscus : samarensis.fuscus<T0, T1>
 >quasiater : quasiater
->carolinensis : carolinensis
+>carolinensis : quasiater.carolinensis
 >sagitta : sagitta
 >stolzmanni : stolzmanni
->x : fuscus<carolinensis, stolzmanni>
+>x : samarensis.fuscus<quasiater.carolinensis, stolzmanni>
 >samarensis : samarensis
->fuscus : fuscus<T0, T1>
+>fuscus : samarensis.fuscus<T0, T1>
 >quasiater : quasiater
->carolinensis : carolinensis
+>carolinensis : quasiater.carolinensis
 >sagitta : sagitta
 >stolzmanni : stolzmanni
 >() => { var y = this; } : () => void
 >y : cinereus<T0, T1>
 >this : cinereus<T0, T1>
->x : fuscus<carolinensis, stolzmanni>
+>x : samarensis.fuscus<quasiater.carolinensis, stolzmanni>
     }
 }
 module nigra {
->nigra : typeof nigra
+>nigra : nigra
 
     export class caucasica<T0, T1> {
 >caucasica : caucasica<T0, T1>
@@ -10356,248 +10356,248 @@ module nigra {
     }
 }
 module gabriellae {
->gabriellae : typeof gabriellae
+>gabriellae : gabriellae
 
     export class klossii<T0, T1> extends imperfecta.lasiurus<dogramacii.robustulus, caurinus.psilurus> {
 >klossii : klossii<T0, T1>
 >T0 : T0
 >T1 : T1
 >imperfecta : imperfecta
->lasiurus : lasiurus<T0, T1>
+>lasiurus : imperfecta.lasiurus<T0, T1>
 >dogramacii : dogramacii
->robustulus : robustulus
+>robustulus : dogramacii.robustulus
 >caurinus : caurinus
->psilurus : psilurus
+>psilurus : caurinus.psilurus
     }
     export class amicus {
 >amicus : amicus
 
         pirrensis(): argurus.luctuosa { var x: argurus.luctuosa; () => { var y = this; }; return x; }
->pirrensis : () => luctuosa
+>pirrensis : () => argurus.luctuosa
 >argurus : argurus
->luctuosa : luctuosa
->x : luctuosa
+>luctuosa : argurus.luctuosa
+>x : argurus.luctuosa
 >argurus : argurus
->luctuosa : luctuosa
+>luctuosa : argurus.luctuosa
 >() => { var y = this; } : () => void
 >y : amicus
 >this : amicus
->x : luctuosa
+>x : argurus.luctuosa
 
         phaeura(): panglima.abidi<lutreolus.foina, argurus.peninsulae> { var x: panglima.abidi<lutreolus.foina, argurus.peninsulae>; () => { var y = this; }; return x; }
->phaeura : () => abidi<foina, peninsulae>
+>phaeura : () => panglima.abidi<lutreolus.foina, argurus.peninsulae>
 >panglima : panglima
->abidi : abidi<T0, T1>
+>abidi : panglima.abidi<T0, T1>
 >lutreolus : lutreolus
->foina : foina
+>foina : lutreolus.foina
 >argurus : argurus
->peninsulae : peninsulae
->x : abidi<foina, peninsulae>
+>peninsulae : argurus.peninsulae
+>x : panglima.abidi<lutreolus.foina, argurus.peninsulae>
 >panglima : panglima
->abidi : abidi<T0, T1>
+>abidi : panglima.abidi<T0, T1>
 >lutreolus : lutreolus
->foina : foina
+>foina : lutreolus.foina
 >argurus : argurus
->peninsulae : peninsulae
+>peninsulae : argurus.peninsulae
 >() => { var y = this; } : () => void
 >y : amicus
 >this : amicus
->x : abidi<foina, peninsulae>
+>x : panglima.abidi<lutreolus.foina, argurus.peninsulae>
 
         voratus(): lavali.thaeleri { var x: lavali.thaeleri; () => { var y = this; }; return x; }
->voratus : () => thaeleri
+>voratus : () => lavali.thaeleri
 >lavali : lavali
->thaeleri : thaeleri
->x : thaeleri
+>thaeleri : lavali.thaeleri
+>x : lavali.thaeleri
 >lavali : lavali
->thaeleri : thaeleri
+>thaeleri : lavali.thaeleri
 >() => { var y = this; } : () => void
 >y : amicus
 >this : amicus
->x : thaeleri
+>x : lavali.thaeleri
 
         satarae(): trivirgatus.lotor<argurus.luctuosa, lavali.wilsoni> { var x: trivirgatus.lotor<argurus.luctuosa, lavali.wilsoni>; () => { var y = this; }; return x; }
->satarae : () => lotor<luctuosa, wilsoni>
+>satarae : () => trivirgatus.lotor<argurus.luctuosa, lavali.wilsoni>
 >trivirgatus : trivirgatus
->lotor : lotor<T0, T1>
+>lotor : trivirgatus.lotor<T0, T1>
 >argurus : argurus
->luctuosa : luctuosa
+>luctuosa : argurus.luctuosa
 >lavali : lavali
->wilsoni : wilsoni
->x : lotor<luctuosa, wilsoni>
+>wilsoni : lavali.wilsoni
+>x : trivirgatus.lotor<argurus.luctuosa, lavali.wilsoni>
 >trivirgatus : trivirgatus
->lotor : lotor<T0, T1>
+>lotor : trivirgatus.lotor<T0, T1>
 >argurus : argurus
->luctuosa : luctuosa
+>luctuosa : argurus.luctuosa
 >lavali : lavali
->wilsoni : wilsoni
+>wilsoni : lavali.wilsoni
 >() => { var y = this; } : () => void
 >y : amicus
 >this : amicus
->x : lotor<luctuosa, wilsoni>
+>x : trivirgatus.lotor<argurus.luctuosa, lavali.wilsoni>
 
         hooperi(): caurinus.psilurus { var x: caurinus.psilurus; () => { var y = this; }; return x; }
->hooperi : () => psilurus
+>hooperi : () => caurinus.psilurus
 >caurinus : caurinus
->psilurus : psilurus
->x : psilurus
+>psilurus : caurinus.psilurus
+>x : caurinus.psilurus
 >caurinus : caurinus
->psilurus : psilurus
+>psilurus : caurinus.psilurus
 >() => { var y = this; } : () => void
 >y : amicus
 >this : amicus
->x : psilurus
+>x : caurinus.psilurus
 
         perrensi(): rendalli.crenulata<trivirgatus.falconeri, howi.marcanoi> { var x: rendalli.crenulata<trivirgatus.falconeri, howi.marcanoi>; () => { var y = this; }; return x; }
->perrensi : () => crenulata<falconeri, marcanoi>
+>perrensi : () => rendalli.crenulata<trivirgatus.falconeri, howi.marcanoi>
 >rendalli : rendalli
->crenulata : crenulata<T0, T1>
+>crenulata : rendalli.crenulata<T0, T1>
 >trivirgatus : trivirgatus
->falconeri : falconeri
+>falconeri : trivirgatus.falconeri
 >howi : howi
->marcanoi : marcanoi
->x : crenulata<falconeri, marcanoi>
+>marcanoi : howi.marcanoi
+>x : rendalli.crenulata<trivirgatus.falconeri, howi.marcanoi>
 >rendalli : rendalli
->crenulata : crenulata<T0, T1>
+>crenulata : rendalli.crenulata<T0, T1>
 >trivirgatus : trivirgatus
->falconeri : falconeri
+>falconeri : trivirgatus.falconeri
 >howi : howi
->marcanoi : marcanoi
+>marcanoi : howi.marcanoi
 >() => { var y = this; } : () => void
 >y : amicus
 >this : amicus
->x : crenulata<falconeri, marcanoi>
+>x : rendalli.crenulata<trivirgatus.falconeri, howi.marcanoi>
 
         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 : () => hector<sumatrana, pelurus<jugularis, walkeri>>
+>ridei : () => ruatanica.hector<julianae.sumatrana, samarensis.pelurus<Lanthanum.jugularis, sagitta.walkeri>>
 >ruatanica : ruatanica
->hector : hector<T0, T1>
+>hector : ruatanica.hector<T0, T1>
 >julianae : julianae
->sumatrana : sumatrana
+>sumatrana : julianae.sumatrana
 >samarensis : samarensis
->pelurus : pelurus<T0, T1>
+>pelurus : samarensis.pelurus<T0, T1>
 >Lanthanum : Lanthanum
->jugularis : jugularis
+>jugularis : Lanthanum.jugularis
 >sagitta : sagitta
->walkeri : walkeri
->x : hector<sumatrana, pelurus<jugularis, walkeri>>
+>walkeri : sagitta.walkeri
+>x : ruatanica.hector<julianae.sumatrana, samarensis.pelurus<Lanthanum.jugularis, sagitta.walkeri>>
 >ruatanica : ruatanica
->hector : hector<T0, T1>
+>hector : ruatanica.hector<T0, T1>
 >julianae : julianae
->sumatrana : sumatrana
+>sumatrana : julianae.sumatrana
 >samarensis : samarensis
->pelurus : pelurus<T0, T1>
+>pelurus : samarensis.pelurus<T0, T1>
 >Lanthanum : Lanthanum
->jugularis : jugularis
+>jugularis : Lanthanum.jugularis
 >sagitta : sagitta
->walkeri : walkeri
+>walkeri : sagitta.walkeri
 >() => { var y = this; } : () => void
 >y : amicus
 >this : amicus
->x : hector<sumatrana, pelurus<jugularis, walkeri>>
+>x : ruatanica.hector<julianae.sumatrana, samarensis.pelurus<Lanthanum.jugularis, sagitta.walkeri>>
 
         audeberti(): daubentonii.arboreus<dogramacii.kaiseri, lutreolus.punicus> { var x: daubentonii.arboreus<dogramacii.kaiseri, lutreolus.punicus>; () => { var y = this; }; return x; }
->audeberti : () => arboreus<kaiseri, punicus>
+>audeberti : () => daubentonii.arboreus<dogramacii.kaiseri, lutreolus.punicus>
 >daubentonii : daubentonii
->arboreus : arboreus<T0, T1>
+>arboreus : daubentonii.arboreus<T0, T1>
 >dogramacii : dogramacii
->kaiseri : kaiseri
+>kaiseri : dogramacii.kaiseri
 >lutreolus : lutreolus
->punicus : punicus
->x : arboreus<kaiseri, punicus>
+>punicus : lutreolus.punicus
+>x : daubentonii.arboreus<dogramacii.kaiseri, lutreolus.punicus>
 >daubentonii : daubentonii
->arboreus : arboreus<T0, T1>
+>arboreus : daubentonii.arboreus<T0, T1>
 >dogramacii : dogramacii
->kaiseri : kaiseri
+>kaiseri : dogramacii.kaiseri
 >lutreolus : lutreolus
->punicus : punicus
+>punicus : lutreolus.punicus
 >() => { var y = this; } : () => void
 >y : amicus
 >this : amicus
->x : arboreus<kaiseri, punicus>
+>x : daubentonii.arboreus<dogramacii.kaiseri, lutreolus.punicus>
 
         Lutetium(): macrorhinos.marmosurus<sagitta.stolzmanni, lavali.thaeleri> { var x: macrorhinos.marmosurus<sagitta.stolzmanni, lavali.thaeleri>; () => { var y = this; }; return x; }
->Lutetium : () => marmosurus<stolzmanni, thaeleri>
+>Lutetium : () => macrorhinos.marmosurus<sagitta.stolzmanni, lavali.thaeleri>
 >macrorhinos : macrorhinos
->marmosurus : marmosurus<T0, T1>
+>marmosurus : macrorhinos.marmosurus<T0, T1>
 >sagitta : sagitta
->stolzmanni : stolzmanni
+>stolzmanni : sagitta.stolzmanni
 >lavali : lavali
->thaeleri : thaeleri
->x : marmosurus<stolzmanni, thaeleri>
+>thaeleri : lavali.thaeleri
+>x : macrorhinos.marmosurus<sagitta.stolzmanni, lavali.thaeleri>
 >macrorhinos : macrorhinos
->marmosurus : marmosurus<T0, T1>
+>marmosurus : macrorhinos.marmosurus<T0, T1>
 >sagitta : sagitta
->stolzmanni : stolzmanni
+>stolzmanni : sagitta.stolzmanni
 >lavali : lavali
->thaeleri : thaeleri
+>thaeleri : lavali.thaeleri
 >() => { var y = this; } : () => void
 >y : amicus
 >this : amicus
->x : marmosurus<stolzmanni, thaeleri>
+>x : macrorhinos.marmosurus<sagitta.stolzmanni, lavali.thaeleri>
 
         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 : () => fuscus<oralis<steerii, lepturus>, koepckeae>
+>atrox : () => samarensis.fuscus<julianae.oralis<julianae.steerii, lavali.lepturus>, dogramacii.koepckeae>
 >samarensis : samarensis
->fuscus : fuscus<T0, T1>
+>fuscus : samarensis.fuscus<T0, T1>
 >julianae : julianae
->oralis : oralis<T0, T1>
+>oralis : julianae.oralis<T0, T1>
 >julianae : julianae
->steerii : steerii
+>steerii : julianae.steerii
 >lavali : lavali
->lepturus : lepturus
+>lepturus : lavali.lepturus
 >dogramacii : dogramacii
->koepckeae : koepckeae
->x : fuscus<oralis<steerii, lepturus>, koepckeae>
+>koepckeae : dogramacii.koepckeae
+>x : samarensis.fuscus<julianae.oralis<julianae.steerii, lavali.lepturus>, dogramacii.koepckeae>
 >samarensis : samarensis
->fuscus : fuscus<T0, T1>
+>fuscus : samarensis.fuscus<T0, T1>
 >julianae : julianae
->oralis : oralis<T0, T1>
+>oralis : julianae.oralis<T0, T1>
 >julianae : julianae
->steerii : steerii
+>steerii : julianae.steerii
 >lavali : lavali
->lepturus : lepturus
+>lepturus : lavali.lepturus
 >dogramacii : dogramacii
->koepckeae : koepckeae
+>koepckeae : dogramacii.koepckeae
 >() => { var y = this; } : () => void
 >y : amicus
 >this : amicus
->x : fuscus<oralis<steerii, lepturus>, koepckeae>
+>x : samarensis.fuscus<julianae.oralis<julianae.steerii, lavali.lepturus>, dogramacii.koepckeae>
     }
     export class echinatus {
 >echinatus : echinatus
 
         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 : () => coludo<daphaenodon, amphibius<daphaenodon, uralensis>>
+>tenuipes : () => howi.coludo<macrorhinos.daphaenodon, panglima.amphibius<macrorhinos.daphaenodon, patas.uralensis>>
 >howi : howi
->coludo : coludo<T0, T1>
+>coludo : howi.coludo<T0, T1>
 >macrorhinos : macrorhinos
->daphaenodon : daphaenodon
+>daphaenodon : macrorhinos.daphaenodon
 >panglima : panglima
->amphibius : amphibius<T0, T1>
+>amphibius : panglima.amphibius<T0, T1>
 >macrorhinos : macrorhinos
->daphaenodon : daphaenodon
+>daphaenodon : macrorhinos.daphaenodon
 >patas : patas
->uralensis : uralensis
->x : coludo<daphaenodon, amphibius<daphaenodon, uralensis>>
+>uralensis : patas.uralensis
+>x : howi.coludo<macrorhinos.daphaenodon, panglima.amphibius<macrorhinos.daphaenodon, patas.uralensis>>
 >howi : howi
->coludo : coludo<T0, T1>
+>coludo : howi.coludo<T0, T1>
 >macrorhinos : macrorhinos
->daphaenodon : daphaenodon
+>daphaenodon : macrorhinos.daphaenodon
 >panglima : panglima
->amphibius : amphibius<T0, T1>
+>amphibius : panglima.amphibius<T0, T1>
 >macrorhinos : macrorhinos
->daphaenodon : daphaenodon
+>daphaenodon : macrorhinos.daphaenodon
 >patas : patas
->uralensis : uralensis
+>uralensis : patas.uralensis
 >() => { var y = this; } : () => void
 >y : echinatus
 >this : echinatus
->x : coludo<daphaenodon, amphibius<daphaenodon, uralensis>>
+>x : howi.coludo<macrorhinos.daphaenodon, panglima.amphibius<macrorhinos.daphaenodon, patas.uralensis>>
     }
 }
 module imperfecta {
->imperfecta : typeof imperfecta
+>imperfecta : imperfecta
 
     export class lasiurus<T0, T1> {
 >lasiurus : lasiurus<T0, T1>
@@ -10605,346 +10605,346 @@ module imperfecta {
 >T1 : T1
 
         marisae(): lavali.thaeleri { var x: lavali.thaeleri; () => { var y = this; }; return x; }
->marisae : () => thaeleri
+>marisae : () => lavali.thaeleri
 >lavali : lavali
->thaeleri : thaeleri
->x : thaeleri
+>thaeleri : lavali.thaeleri
+>x : lavali.thaeleri
 >lavali : lavali
->thaeleri : thaeleri
+>thaeleri : lavali.thaeleri
 >() => { var y = this; } : () => void
 >y : lasiurus<T0, T1>
 >this : lasiurus<T0, T1>
->x : thaeleri
+>x : lavali.thaeleri
 
         fulvus(): argurus.germaini { var x: argurus.germaini; () => { var y = this; }; return x; }
->fulvus : () => germaini
+>fulvus : () => argurus.germaini
 >argurus : argurus
->germaini : germaini
->x : germaini
+>germaini : argurus.germaini
+>x : argurus.germaini
 >argurus : argurus
->germaini : germaini
+>germaini : argurus.germaini
 >() => { var y = this; } : () => void
 >y : lasiurus<T0, T1>
 >this : lasiurus<T0, T1>
->x : germaini
+>x : argurus.germaini
 
         paranaensis(): dogramacii.koepckeae { var x: dogramacii.koepckeae; () => { var y = this; }; return x; }
->paranaensis : () => koepckeae
+>paranaensis : () => dogramacii.koepckeae
 >dogramacii : dogramacii
->koepckeae : koepckeae
->x : koepckeae
+>koepckeae : dogramacii.koepckeae
+>x : dogramacii.koepckeae
 >dogramacii : dogramacii
->koepckeae : koepckeae
+>koepckeae : dogramacii.koepckeae
 >() => { var y = this; } : () => void
 >y : lasiurus<T0, T1>
 >this : lasiurus<T0, T1>
->x : koepckeae
+>x : dogramacii.koepckeae
 
         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 : () => abidi<aurata, sarasinorum<megaphyllus, xanthognathus>>
+>didactylus : () => panglima.abidi<dogramacii.aurata, chrysaeolus.sarasinorum<caurinus.megaphyllus, lavali.xanthognathus>>
 >panglima : panglima
->abidi : abidi<T0, T1>
+>abidi : panglima.abidi<T0, T1>
 >dogramacii : dogramacii
->aurata : aurata
+>aurata : dogramacii.aurata
 >chrysaeolus : chrysaeolus
->sarasinorum : sarasinorum<T0, T1>
+>sarasinorum : chrysaeolus.sarasinorum<T0, T1>
 >caurinus : caurinus
->megaphyllus : megaphyllus
+>megaphyllus : caurinus.megaphyllus
 >lavali : lavali
->xanthognathus : xanthognathus
->x : abidi<aurata, sarasinorum<megaphyllus, xanthognathus>>
+>xanthognathus : lavali.xanthognathus
+>x : panglima.abidi<dogramacii.aurata, chrysaeolus.sarasinorum<caurinus.megaphyllus, lavali.xanthognathus>>
 >panglima : panglima
->abidi : abidi<T0, T1>
+>abidi : panglima.abidi<T0, T1>
 >dogramacii : dogramacii
->aurata : aurata
+>aurata : dogramacii.aurata
 >chrysaeolus : chrysaeolus
->sarasinorum : sarasinorum<T0, T1>
+>sarasinorum : chrysaeolus.sarasinorum<T0, T1>
 >caurinus : caurinus
->megaphyllus : megaphyllus
+>megaphyllus : caurinus.megaphyllus
 >lavali : lavali
->xanthognathus : xanthognathus
+>xanthognathus : lavali.xanthognathus
 >() => { var y = this; } : () => void
 >y : lasiurus<T0, T1>
 >this : lasiurus<T0, T1>
->x : abidi<aurata, sarasinorum<megaphyllus, xanthognathus>>
+>x : panglima.abidi<dogramacii.aurata, chrysaeolus.sarasinorum<caurinus.megaphyllus, lavali.xanthognathus>>
 
         schreibersii(): nigra.gracilis<argurus.luctuosa, ruatanica.americanus> { var x: nigra.gracilis<argurus.luctuosa, ruatanica.americanus>; () => { var y = this; }; return x; }
->schreibersii : () => gracilis<luctuosa, americanus>
+>schreibersii : () => nigra.gracilis<argurus.luctuosa, ruatanica.americanus>
 >nigra : nigra
->gracilis : gracilis<T0, T1>
+>gracilis : nigra.gracilis<T0, T1>
 >argurus : argurus
->luctuosa : luctuosa
+>luctuosa : argurus.luctuosa
 >ruatanica : ruatanica
->americanus : americanus
->x : gracilis<luctuosa, americanus>
+>americanus : ruatanica.americanus
+>x : nigra.gracilis<argurus.luctuosa, ruatanica.americanus>
 >nigra : nigra
->gracilis : gracilis<T0, T1>
+>gracilis : nigra.gracilis<T0, T1>
 >argurus : argurus
->luctuosa : luctuosa
+>luctuosa : argurus.luctuosa
 >ruatanica : ruatanica
->americanus : americanus
+>americanus : ruatanica.americanus
 >() => { var y = this; } : () => void
 >y : lasiurus<T0, T1>
 >this : lasiurus<T0, T1>
->x : gracilis<luctuosa, americanus>
+>x : nigra.gracilis<argurus.luctuosa, ruatanica.americanus>
 
         orii(): dogramacii.kaiseri { var x: dogramacii.kaiseri; () => { var y = this; }; return x; }
->orii : () => kaiseri
+>orii : () => dogramacii.kaiseri
 >dogramacii : dogramacii
->kaiseri : kaiseri
->x : kaiseri
+>kaiseri : dogramacii.kaiseri
+>x : dogramacii.kaiseri
 >dogramacii : dogramacii
->kaiseri : kaiseri
+>kaiseri : dogramacii.kaiseri
 >() => { var y = this; } : () => void
 >y : lasiurus<T0, T1>
 >this : lasiurus<T0, T1>
->x : kaiseri
+>x : dogramacii.kaiseri
     }
     export class subspinosus {
 >subspinosus : subspinosus
 
         monticularis(): macrorhinos.konganensis { var x: macrorhinos.konganensis; () => { var y = this; }; return x; }
->monticularis : () => konganensis
+>monticularis : () => macrorhinos.konganensis
 >macrorhinos : macrorhinos
->konganensis : konganensis
->x : konganensis
+>konganensis : macrorhinos.konganensis
+>x : macrorhinos.konganensis
 >macrorhinos : macrorhinos
->konganensis : konganensis
+>konganensis : macrorhinos.konganensis
 >() => { var y = this; } : () => void
 >y : subspinosus
 >this : subspinosus
->x : konganensis
+>x : macrorhinos.konganensis
 
         Gadolinium(): nigra.caucasica<sagitta.stolzmanni, patas.uralensis> { var x: nigra.caucasica<sagitta.stolzmanni, patas.uralensis>; () => { var y = this; }; return x; }
->Gadolinium : () => caucasica<stolzmanni, uralensis>
+>Gadolinium : () => nigra.caucasica<sagitta.stolzmanni, patas.uralensis>
 >nigra : nigra
->caucasica : caucasica<T0, T1>
+>caucasica : nigra.caucasica<T0, T1>
 >sagitta : sagitta
->stolzmanni : stolzmanni
+>stolzmanni : sagitta.stolzmanni
 >patas : patas
->uralensis : uralensis
->x : caucasica<stolzmanni, uralensis>
+>uralensis : patas.uralensis
+>x : nigra.caucasica<sagitta.stolzmanni, patas.uralensis>
 >nigra : nigra
->caucasica : caucasica<T0, T1>
+>caucasica : nigra.caucasica<T0, T1>
 >sagitta : sagitta
->stolzmanni : stolzmanni
+>stolzmanni : sagitta.stolzmanni
 >patas : patas
->uralensis : uralensis
+>uralensis : patas.uralensis
 >() => { var y = this; } : () => void
 >y : subspinosus
 >this : subspinosus
->x : caucasica<stolzmanni, uralensis>
+>x : nigra.caucasica<sagitta.stolzmanni, patas.uralensis>
 
         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 : () => johorensis<peninsulae, arboreus<germaini, stolzmanni>>
+>oasicus : () => caurinus.johorensis<argurus.peninsulae, daubentonii.arboreus<argurus.germaini, sagitta.stolzmanni>>
 >caurinus : caurinus
->johorensis : johorensis<T0, T1>
+>johorensis : caurinus.johorensis<T0, T1>
 >argurus : argurus
->peninsulae : peninsulae
+>peninsulae : argurus.peninsulae
 >daubentonii : daubentonii
->arboreus : arboreus<T0, T1>
+>arboreus : daubentonii.arboreus<T0, T1>
 >argurus : argurus
->germaini : germaini
+>germaini : argurus.germaini
 >sagitta : sagitta
->stolzmanni : stolzmanni
->x : johorensis<peninsulae, arboreus<germaini, stolzmanni>>
+>stolzmanni : sagitta.stolzmanni
+>x : caurinus.johorensis<argurus.peninsulae, daubentonii.arboreus<argurus.germaini, sagitta.stolzmanni>>
 >caurinus : caurinus
->johorensis : johorensis<T0, T1>
+>johorensis : caurinus.johorensis<T0, T1>
 >argurus : argurus
->peninsulae : peninsulae
+>peninsulae : argurus.peninsulae
 >daubentonii : daubentonii
->arboreus : arboreus<T0, T1>
+>arboreus : daubentonii.arboreus<T0, T1>
 >argurus : argurus
->germaini : germaini
+>germaini : argurus.germaini
 >sagitta : sagitta
->stolzmanni : stolzmanni
+>stolzmanni : sagitta.stolzmanni
 >() => { var y = this; } : () => void
 >y : subspinosus
 >this : subspinosus
->x : johorensis<peninsulae, arboreus<germaini, stolzmanni>>
+>x : caurinus.johorensis<argurus.peninsulae, daubentonii.arboreus<argurus.germaini, sagitta.stolzmanni>>
 
         paterculus(): lutreolus.punicus { var x: lutreolus.punicus; () => { var y = this; }; return x; }
->paterculus : () => punicus
+>paterculus : () => lutreolus.punicus
 >lutreolus : lutreolus
->punicus : punicus
->x : punicus
+>punicus : lutreolus.punicus
+>x : lutreolus.punicus
 >lutreolus : lutreolus
->punicus : punicus
+>punicus : lutreolus.punicus
 >() => { var y = this; } : () => void
 >y : subspinosus
 >this : subspinosus
->x : punicus
+>x : lutreolus.punicus
 
         punctata(): lavali.thaeleri { var x: lavali.thaeleri; () => { var y = this; }; return x; }
->punctata : () => thaeleri
+>punctata : () => lavali.thaeleri
 >lavali : lavali
->thaeleri : thaeleri
->x : thaeleri
+>thaeleri : lavali.thaeleri
+>x : lavali.thaeleri
 >lavali : lavali
->thaeleri : thaeleri
+>thaeleri : lavali.thaeleri
 >() => { var y = this; } : () => void
 >y : subspinosus
 >this : subspinosus
->x : thaeleri
+>x : lavali.thaeleri
 
         invictus(): sagitta.stolzmanni { var x: sagitta.stolzmanni; () => { var y = this; }; return x; }
->invictus : () => stolzmanni
+>invictus : () => sagitta.stolzmanni
 >sagitta : sagitta
->stolzmanni : stolzmanni
->x : stolzmanni
+>stolzmanni : sagitta.stolzmanni
+>x : sagitta.stolzmanni
 >sagitta : sagitta
->stolzmanni : stolzmanni
+>stolzmanni : sagitta.stolzmanni
 >() => { var y = this; } : () => void
 >y : subspinosus
 >this : subspinosus
->x : stolzmanni
+>x : sagitta.stolzmanni
 
         stangeri(): petrophilus.minutilla { var x: petrophilus.minutilla; () => { var y = this; }; return x; }
->stangeri : () => minutilla
+>stangeri : () => petrophilus.minutilla
 >petrophilus : petrophilus
->minutilla : minutilla
->x : minutilla
+>minutilla : petrophilus.minutilla
+>x : petrophilus.minutilla
 >petrophilus : petrophilus
->minutilla : minutilla
+>minutilla : petrophilus.minutilla
 >() => { var y = this; } : () => void
 >y : subspinosus
 >this : subspinosus
->x : minutilla
+>x : petrophilus.minutilla
 
         siskiyou(): minutus.inez<macrorhinos.konganensis, samarensis.pallidus> { var x: minutus.inez<macrorhinos.konganensis, samarensis.pallidus>; () => { var y = this; }; return x; }
->siskiyou : () => inez<konganensis, pallidus>
+>siskiyou : () => minutus.inez<macrorhinos.konganensis, samarensis.pallidus>
 >minutus : minutus
->inez : inez<T0, T1>
+>inez : minutus.inez<T0, T1>
 >macrorhinos : macrorhinos
->konganensis : konganensis
+>konganensis : macrorhinos.konganensis
 >samarensis : samarensis
->pallidus : pallidus
->x : inez<konganensis, pallidus>
+>pallidus : samarensis.pallidus
+>x : minutus.inez<macrorhinos.konganensis, samarensis.pallidus>
 >minutus : minutus
->inez : inez<T0, T1>
+>inez : minutus.inez<T0, T1>
 >macrorhinos : macrorhinos
->konganensis : konganensis
+>konganensis : macrorhinos.konganensis
 >samarensis : samarensis
->pallidus : pallidus
+>pallidus : samarensis.pallidus
 >() => { var y = this; } : () => void
 >y : subspinosus
 >this : subspinosus
->x : inez<konganensis, pallidus>
+>x : minutus.inez<macrorhinos.konganensis, samarensis.pallidus>
 
         welwitschii(): rionegrensis.caniventer { var x: rionegrensis.caniventer; () => { var y = this; }; return x; }
->welwitschii : () => caniventer
+>welwitschii : () => rionegrensis.caniventer
 >rionegrensis : rionegrensis
->caniventer : caniventer
->x : caniventer
+>caniventer : rionegrensis.caniventer
+>x : rionegrensis.caniventer
 >rionegrensis : rionegrensis
->caniventer : caniventer
+>caniventer : rionegrensis.caniventer
 >() => { var y = this; } : () => void
 >y : subspinosus
 >this : subspinosus
->x : caniventer
+>x : rionegrensis.caniventer
 
         Polonium(): lavali.wilsoni { var x: lavali.wilsoni; () => { var y = this; }; return x; }
->Polonium : () => wilsoni
+>Polonium : () => lavali.wilsoni
 >lavali : lavali
->wilsoni : wilsoni
->x : wilsoni
+>wilsoni : lavali.wilsoni
+>x : lavali.wilsoni
 >lavali : lavali
->wilsoni : wilsoni
+>wilsoni : lavali.wilsoni
 >() => { var y = this; } : () => void
 >y : subspinosus
 >this : subspinosus
->x : wilsoni
+>x : lavali.wilsoni
 
         harpia(): argurus.luctuosa { var x: argurus.luctuosa; () => { var y = this; }; return x; }
->harpia : () => luctuosa
+>harpia : () => argurus.luctuosa
 >argurus : argurus
->luctuosa : luctuosa
->x : luctuosa
+>luctuosa : argurus.luctuosa
+>x : argurus.luctuosa
 >argurus : argurus
->luctuosa : luctuosa
+>luctuosa : argurus.luctuosa
 >() => { var y = this; } : () => void
 >y : subspinosus
 >this : subspinosus
->x : luctuosa
+>x : argurus.luctuosa
     }
     export class ciliolabrum<T0, T1> extends dogramacii.robustulus {
 >ciliolabrum : ciliolabrum<T0, T1>
 >T0 : T0
 >T1 : T1
 >dogramacii : dogramacii
->robustulus : robustulus
+>robustulus : dogramacii.robustulus
 
         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 : () => dauricus<jugularis, Praseodymium<germaini, megaphyllus>>
+>leschenaultii : () => argurus.dauricus<Lanthanum.jugularis, ruatanica.Praseodymium<argurus.germaini, caurinus.megaphyllus>>
 >argurus : argurus
->dauricus : dauricus<T0, T1>
+>dauricus : argurus.dauricus<T0, T1>
 >Lanthanum : Lanthanum
->jugularis : jugularis
+>jugularis : Lanthanum.jugularis
 >ruatanica : ruatanica
->Praseodymium : Praseodymium<T0, T1>
+>Praseodymium : ruatanica.Praseodymium<T0, T1>
 >argurus : argurus
->germaini : germaini
+>germaini : argurus.germaini
 >caurinus : caurinus
->megaphyllus : megaphyllus
->x : dauricus<jugularis, Praseodymium<germaini, megaphyllus>>
+>megaphyllus : caurinus.megaphyllus
+>x : argurus.dauricus<Lanthanum.jugularis, ruatanica.Praseodymium<argurus.germaini, caurinus.megaphyllus>>
 >argurus : argurus
->dauricus : dauricus<T0, T1>
+>dauricus : argurus.dauricus<T0, T1>
 >Lanthanum : Lanthanum
->jugularis : jugularis
+>jugularis : Lanthanum.jugularis
 >ruatanica : ruatanica
->Praseodymium : Praseodymium<T0, T1>
+>Praseodymium : ruatanica.Praseodymium<T0, T1>
 >argurus : argurus
->germaini : germaini
+>germaini : argurus.germaini
 >caurinus : caurinus
->megaphyllus : megaphyllus
+>megaphyllus : caurinus.megaphyllus
 >() => { var y = this; } : () => void
 >y : ciliolabrum<T0, T1>
 >this : ciliolabrum<T0, T1>
->x : dauricus<jugularis, Praseodymium<germaini, megaphyllus>>
+>x : argurus.dauricus<Lanthanum.jugularis, ruatanica.Praseodymium<argurus.germaini, caurinus.megaphyllus>>
 
         ludia(): caurinus.johorensis<rionegrensis.caniventer, lutreolus.punicus> { var x: caurinus.johorensis<rionegrensis.caniventer, lutreolus.punicus>; () => { var y = this; }; return x; }
->ludia : () => johorensis<caniventer, punicus>
+>ludia : () => caurinus.johorensis<rionegrensis.caniventer, lutreolus.punicus>
 >caurinus : caurinus
->johorensis : johorensis<T0, T1>
+>johorensis : caurinus.johorensis<T0, T1>
 >rionegrensis : rionegrensis
->caniventer : caniventer
+>caniventer : rionegrensis.caniventer
 >lutreolus : lutreolus
->punicus : punicus
->x : johorensis<caniventer, punicus>
+>punicus : lutreolus.punicus
+>x : caurinus.johorensis<rionegrensis.caniventer, lutreolus.punicus>
 >caurinus : caurinus
->johorensis : johorensis<T0, T1>
+>johorensis : caurinus.johorensis<T0, T1>
 >rionegrensis : rionegrensis
->caniventer : caniventer
+>caniventer : rionegrensis.caniventer
 >lutreolus : lutreolus
->punicus : punicus
+>punicus : lutreolus.punicus
 >() => { var y = this; } : () => void
 >y : ciliolabrum<T0, T1>
 >this : ciliolabrum<T0, T1>
->x : johorensis<caniventer, punicus>
+>x : caurinus.johorensis<rionegrensis.caniventer, lutreolus.punicus>
 
         sinicus(): macrorhinos.marmosurus<macrorhinos.daphaenodon, gabriellae.amicus> { var x: macrorhinos.marmosurus<macrorhinos.daphaenodon, gabriellae.amicus>; () => { var y = this; }; return x; }
->sinicus : () => marmosurus<daphaenodon, amicus>
+>sinicus : () => macrorhinos.marmosurus<macrorhinos.daphaenodon, gabriellae.amicus>
 >macrorhinos : macrorhinos
->marmosurus : marmosurus<T0, T1>
+>marmosurus : macrorhinos.marmosurus<T0, T1>
 >macrorhinos : macrorhinos
->daphaenodon : daphaenodon
+>daphaenodon : macrorhinos.daphaenodon
 >gabriellae : gabriellae
->amicus : amicus
->x : marmosurus<daphaenodon, amicus>
+>amicus : gabriellae.amicus
+>x : macrorhinos.marmosurus<macrorhinos.daphaenodon, gabriellae.amicus>
 >macrorhinos : macrorhinos
->marmosurus : marmosurus<T0, T1>
+>marmosurus : macrorhinos.marmosurus<T0, T1>
 >macrorhinos : macrorhinos
->daphaenodon : daphaenodon
+>daphaenodon : macrorhinos.daphaenodon
 >gabriellae : gabriellae
->amicus : amicus
+>amicus : gabriellae.amicus
 >() => { var y = this; } : () => void
 >y : ciliolabrum<T0, T1>
 >this : ciliolabrum<T0, T1>
->x : marmosurus<daphaenodon, amicus>
+>x : macrorhinos.marmosurus<macrorhinos.daphaenodon, gabriellae.amicus>
     }
 }
 module quasiater {
->quasiater : typeof quasiater
+>quasiater : quasiater
 
     export class wattsi<T0, T1> {
 >wattsi : wattsi<T0, T1>
@@ -10952,414 +10952,414 @@ module quasiater {
 >T1 : T1
 
         lagotis(): lavali.xanthognathus { var x: lavali.xanthognathus; () => { var y = this; }; return x; }
->lagotis : () => xanthognathus
+>lagotis : () => lavali.xanthognathus
 >lavali : lavali
->xanthognathus : xanthognathus
->x : xanthognathus
+>xanthognathus : lavali.xanthognathus
+>x : lavali.xanthognathus
 >lavali : lavali
->xanthognathus : xanthognathus
+>xanthognathus : lavali.xanthognathus
 >() => { var y = this; } : () => void
 >y : wattsi<T0, T1>
 >this : wattsi<T0, T1>
->x : xanthognathus
+>x : lavali.xanthognathus
 
         hussoni(): lavali.wilsoni { var x: lavali.wilsoni; () => { var y = this; }; return x; }
->hussoni : () => wilsoni
+>hussoni : () => lavali.wilsoni
 >lavali : lavali
->wilsoni : wilsoni
->x : wilsoni
+>wilsoni : lavali.wilsoni
+>x : lavali.wilsoni
 >lavali : lavali
->wilsoni : wilsoni
+>wilsoni : lavali.wilsoni
 >() => { var y = this; } : () => void
 >y : wattsi<T0, T1>
 >this : wattsi<T0, T1>
->x : wilsoni
+>x : lavali.wilsoni
 
         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 : () => cahirinus<crenulata<wilsoni, fundatus<amicus, foina>>, koepckeae>
+>bilarni : () => samarensis.cahirinus<rendalli.crenulata<lavali.wilsoni, panglima.fundatus<gabriellae.amicus, lutreolus.foina>>, dogramacii.koepckeae>
 >samarensis : samarensis
->cahirinus : cahirinus<T0, T1>
+>cahirinus : samarensis.cahirinus<T0, T1>
 >rendalli : rendalli
->crenulata : crenulata<T0, T1>
+>crenulata : rendalli.crenulata<T0, T1>
 >lavali : lavali
->wilsoni : wilsoni
+>wilsoni : lavali.wilsoni
 >panglima : panglima
->fundatus : fundatus<T0, T1>
+>fundatus : panglima.fundatus<T0, T1>
 >gabriellae : gabriellae
->amicus : amicus
+>amicus : gabriellae.amicus
 >lutreolus : lutreolus
->foina : foina
+>foina : lutreolus.foina
 >dogramacii : dogramacii
->koepckeae : koepckeae
->x : cahirinus<crenulata<wilsoni, fundatus<amicus, foina>>, koepckeae>
+>koepckeae : dogramacii.koepckeae
+>x : samarensis.cahirinus<rendalli.crenulata<lavali.wilsoni, panglima.fundatus<gabriellae.amicus, lutreolus.foina>>, dogramacii.koepckeae>
 >samarensis : samarensis
->cahirinus : cahirinus<T0, T1>
+>cahirinus : samarensis.cahirinus<T0, T1>
 >rendalli : rendalli
->crenulata : crenulata<T0, T1>
+>crenulata : rendalli.crenulata<T0, T1>
 >lavali : lavali
->wilsoni : wilsoni
+>wilsoni : lavali.wilsoni
 >panglima : panglima
->fundatus : fundatus<T0, T1>
+>fundatus : panglima.fundatus<T0, T1>
 >gabriellae : gabriellae
->amicus : amicus
+>amicus : gabriellae.amicus
 >lutreolus : lutreolus
->foina : foina
+>foina : lutreolus.foina
 >dogramacii : dogramacii
->koepckeae : koepckeae
+>koepckeae : dogramacii.koepckeae
 >() => { var y = this; } : () => void
 >y : wattsi<T0, T1>
 >this : wattsi<T0, T1>
->x : cahirinus<crenulata<wilsoni, fundatus<amicus, foina>>, koepckeae>
+>x : samarensis.cahirinus<rendalli.crenulata<lavali.wilsoni, panglima.fundatus<gabriellae.amicus, lutreolus.foina>>, dogramacii.koepckeae>
 
         cabrerae(): lavali.lepturus { var x: lavali.lepturus; () => { var y = this; }; return x; }
->cabrerae : () => lepturus
+>cabrerae : () => lavali.lepturus
 >lavali : lavali
->lepturus : lepturus
->x : lepturus
+>lepturus : lavali.lepturus
+>x : lavali.lepturus
 >lavali : lavali
->lepturus : lepturus
+>lepturus : lavali.lepturus
 >() => { var y = this; } : () => void
 >y : wattsi<T0, T1>
 >this : wattsi<T0, T1>
->x : lepturus
+>x : lavali.lepturus
     }
 }
 module butleri {
 >butleri : butleri
 }
 module petrophilus {
->petrophilus : typeof petrophilus
+>petrophilus : petrophilus
 
     export class sodyi<T0, T1> extends quasiater.bobrinskoi {
 >sodyi : sodyi<T0, T1>
 >T0 : T0
 >T1 : T1
 >quasiater : quasiater
->bobrinskoi : bobrinskoi
+>bobrinskoi : quasiater.bobrinskoi
 
         saundersiae(): samarensis.pallidus { var x: samarensis.pallidus; () => { var y = this; }; return x; }
->saundersiae : () => pallidus
+>saundersiae : () => samarensis.pallidus
 >samarensis : samarensis
->pallidus : pallidus
->x : pallidus
+>pallidus : samarensis.pallidus
+>x : samarensis.pallidus
 >samarensis : samarensis
->pallidus : pallidus
+>pallidus : samarensis.pallidus
 >() => { var y = this; } : () => void
 >y : sodyi<T0, T1>
 >this : sodyi<T0, T1>
->x : pallidus
+>x : samarensis.pallidus
 
         imberbis(): quasiater.carolinensis { var x: quasiater.carolinensis; () => { var y = this; }; return x; }
->imberbis : () => carolinensis
+>imberbis : () => quasiater.carolinensis
 >quasiater : quasiater
->carolinensis : carolinensis
->x : carolinensis
+>carolinensis : quasiater.carolinensis
+>x : quasiater.carolinensis
 >quasiater : quasiater
->carolinensis : carolinensis
+>carolinensis : quasiater.carolinensis
 >() => { var y = this; } : () => void
 >y : sodyi<T0, T1>
 >this : sodyi<T0, T1>
->x : carolinensis
+>x : quasiater.carolinensis
 
         cansdalei(): dammermani.melanops { var x: dammermani.melanops; () => { var y = this; }; return x; }
->cansdalei : () => melanops
+>cansdalei : () => dammermani.melanops
 >dammermani : dammermani
->melanops : melanops
->x : melanops
+>melanops : dammermani.melanops
+>x : dammermani.melanops
 >dammermani : dammermani
->melanops : melanops
+>melanops : dammermani.melanops
 >() => { var y = this; } : () => void
 >y : sodyi<T0, T1>
 >this : sodyi<T0, T1>
->x : melanops
+>x : dammermani.melanops
 
         Lawrencium(): nigra.dolichurus<julianae.sumatrana, imperfecta.subspinosus> { var x: nigra.dolichurus<julianae.sumatrana, imperfecta.subspinosus>; () => { var y = this; }; return x; }
->Lawrencium : () => dolichurus<sumatrana, subspinosus>
+>Lawrencium : () => nigra.dolichurus<julianae.sumatrana, imperfecta.subspinosus>
 >nigra : nigra
->dolichurus : dolichurus<T0, T1>
+>dolichurus : nigra.dolichurus<T0, T1>
 >julianae : julianae
->sumatrana : sumatrana
+>sumatrana : julianae.sumatrana
 >imperfecta : imperfecta
->subspinosus : subspinosus
->x : dolichurus<sumatrana, subspinosus>
+>subspinosus : imperfecta.subspinosus
+>x : nigra.dolichurus<julianae.sumatrana, imperfecta.subspinosus>
 >nigra : nigra
->dolichurus : dolichurus<T0, T1>
+>dolichurus : nigra.dolichurus<T0, T1>
 >julianae : julianae
->sumatrana : sumatrana
+>sumatrana : julianae.sumatrana
 >imperfecta : imperfecta
->subspinosus : subspinosus
+>subspinosus : imperfecta.subspinosus
 >() => { var y = this; } : () => void
 >y : sodyi<T0, T1>
 >this : sodyi<T0, T1>
->x : dolichurus<sumatrana, subspinosus>
+>x : nigra.dolichurus<julianae.sumatrana, imperfecta.subspinosus>
 
         catta(): argurus.oreas { var x: argurus.oreas; () => { var y = this; }; return x; }
->catta : () => oreas
+>catta : () => argurus.oreas
 >argurus : argurus
->oreas : oreas
->x : oreas
+>oreas : argurus.oreas
+>x : argurus.oreas
 >argurus : argurus
->oreas : oreas
+>oreas : argurus.oreas
 >() => { var y = this; } : () => void
 >y : sodyi<T0, T1>
 >this : sodyi<T0, T1>
->x : oreas
+>x : argurus.oreas
 
         breviceps(): argurus.dauricus<dogramacii.aurata, dammermani.melanops> { var x: argurus.dauricus<dogramacii.aurata, dammermani.melanops>; () => { var y = this; }; return x; }
->breviceps : () => dauricus<aurata, melanops>
+>breviceps : () => argurus.dauricus<dogramacii.aurata, dammermani.melanops>
 >argurus : argurus
->dauricus : dauricus<T0, T1>
+>dauricus : argurus.dauricus<T0, T1>
 >dogramacii : dogramacii
->aurata : aurata
+>aurata : dogramacii.aurata
 >dammermani : dammermani
->melanops : melanops
->x : dauricus<aurata, melanops>
+>melanops : dammermani.melanops
+>x : argurus.dauricus<dogramacii.aurata, dammermani.melanops>
 >argurus : argurus
->dauricus : dauricus<T0, T1>
+>dauricus : argurus.dauricus<T0, T1>
 >dogramacii : dogramacii
->aurata : aurata
+>aurata : dogramacii.aurata
 >dammermani : dammermani
->melanops : melanops
+>melanops : dammermani.melanops
 >() => { var y = this; } : () => void
 >y : sodyi<T0, T1>
 >this : sodyi<T0, T1>
->x : dauricus<aurata, melanops>
+>x : argurus.dauricus<dogramacii.aurata, dammermani.melanops>
 
         transitionalis(): rendalli.zuluensis { var x: rendalli.zuluensis; () => { var y = this; }; return x; }
->transitionalis : () => zuluensis
+>transitionalis : () => rendalli.zuluensis
 >rendalli : rendalli
->zuluensis : zuluensis
->x : zuluensis
+>zuluensis : rendalli.zuluensis
+>x : rendalli.zuluensis
 >rendalli : rendalli
->zuluensis : zuluensis
+>zuluensis : rendalli.zuluensis
 >() => { var y = this; } : () => void
 >y : sodyi<T0, T1>
 >this : sodyi<T0, T1>
->x : zuluensis
+>x : rendalli.zuluensis
 
         heptneri(): argurus.germaini { var x: argurus.germaini; () => { var y = this; }; return x; }
->heptneri : () => germaini
+>heptneri : () => argurus.germaini
 >argurus : argurus
->germaini : germaini
->x : germaini
+>germaini : argurus.germaini
+>x : argurus.germaini
 >argurus : argurus
->germaini : germaini
+>germaini : argurus.germaini
 >() => { var y = this; } : () => void
 >y : sodyi<T0, T1>
 >this : sodyi<T0, T1>
->x : germaini
+>x : argurus.germaini
 
         bairdii(): lavali.beisa { var x: lavali.beisa; () => { var y = this; }; return x; }
->bairdii : () => beisa
+>bairdii : () => lavali.beisa
 >lavali : lavali
->beisa : beisa
->x : beisa
+>beisa : lavali.beisa
+>x : lavali.beisa
 >lavali : lavali
->beisa : beisa
+>beisa : lavali.beisa
 >() => { var y = this; } : () => void
 >y : sodyi<T0, T1>
 >this : sodyi<T0, T1>
->x : beisa
+>x : lavali.beisa
     }
 }
 module caurinus {
->caurinus : typeof caurinus
+>caurinus : caurinus
 
     export class megaphyllus extends imperfecta.lasiurus<julianae.acariensis, howi.coludo<argurus.oreas, howi.marcanoi>> {
 >megaphyllus : megaphyllus
 >imperfecta : imperfecta
->lasiurus : lasiurus<T0, T1>
+>lasiurus : imperfecta.lasiurus<T0, T1>
 >julianae : julianae
->acariensis : acariensis
+>acariensis : julianae.acariensis
 >howi : howi
->coludo : coludo<T0, T1>
+>coludo : howi.coludo<T0, T1>
 >argurus : argurus
->oreas : oreas
+>oreas : argurus.oreas
 >howi : howi
->marcanoi : marcanoi
+>marcanoi : howi.marcanoi
 
         montana(): argurus.oreas { var x: argurus.oreas; () => { var y = this; }; return x; }
->montana : () => oreas
+>montana : () => argurus.oreas
 >argurus : argurus
->oreas : oreas
->x : oreas
+>oreas : argurus.oreas
+>x : argurus.oreas
 >argurus : argurus
->oreas : oreas
+>oreas : argurus.oreas
 >() => { var y = this; } : () => void
 >y : megaphyllus
 >this : megaphyllus
->x : oreas
+>x : argurus.oreas
 
         amatus(): lutreolus.schlegeli { var x: lutreolus.schlegeli; () => { var y = this; }; return x; }
->amatus : () => schlegeli
+>amatus : () => lutreolus.schlegeli
 >lutreolus : lutreolus
->schlegeli : schlegeli
->x : schlegeli
+>schlegeli : lutreolus.schlegeli
+>x : lutreolus.schlegeli
 >lutreolus : lutreolus
->schlegeli : schlegeli
+>schlegeli : lutreolus.schlegeli
 >() => { var y = this; } : () => void
 >y : megaphyllus
 >this : megaphyllus
->x : schlegeli
+>x : lutreolus.schlegeli
 
         bucculentus(): gabriellae.echinatus { var x: gabriellae.echinatus; () => { var y = this; }; return x; }
->bucculentus : () => echinatus
+>bucculentus : () => gabriellae.echinatus
 >gabriellae : gabriellae
->echinatus : echinatus
->x : echinatus
+>echinatus : gabriellae.echinatus
+>x : gabriellae.echinatus
 >gabriellae : gabriellae
->echinatus : echinatus
+>echinatus : gabriellae.echinatus
 >() => { var y = this; } : () => void
 >y : megaphyllus
 >this : megaphyllus
->x : echinatus
+>x : gabriellae.echinatus
 
         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 : () => crenulata<wilsoni, fundatus<amicus, foina>>
+>lepida : () => rendalli.crenulata<lavali.wilsoni, panglima.fundatus<gabriellae.amicus, lutreolus.foina>>
 >rendalli : rendalli
->crenulata : crenulata<T0, T1>
+>crenulata : rendalli.crenulata<T0, T1>
 >lavali : lavali
->wilsoni : wilsoni
+>wilsoni : lavali.wilsoni
 >panglima : panglima
->fundatus : fundatus<T0, T1>
+>fundatus : panglima.fundatus<T0, T1>
 >gabriellae : gabriellae
->amicus : amicus
+>amicus : gabriellae.amicus
 >lutreolus : lutreolus
->foina : foina
->x : crenulata<wilsoni, fundatus<amicus, foina>>
+>foina : lutreolus.foina
+>x : rendalli.crenulata<lavali.wilsoni, panglima.fundatus<gabriellae.amicus, lutreolus.foina>>
 >rendalli : rendalli
->crenulata : crenulata<T0, T1>
+>crenulata : rendalli.crenulata<T0, T1>
 >lavali : lavali
->wilsoni : wilsoni
+>wilsoni : lavali.wilsoni
 >panglima : panglima
->fundatus : fundatus<T0, T1>
+>fundatus : panglima.fundatus<T0, T1>
 >gabriellae : gabriellae
->amicus : amicus
+>amicus : gabriellae.amicus
 >lutreolus : lutreolus
->foina : foina
+>foina : lutreolus.foina
 >() => { var y = this; } : () => void
 >y : megaphyllus
 >this : megaphyllus
->x : crenulata<wilsoni, fundatus<amicus, foina>>
+>x : rendalli.crenulata<lavali.wilsoni, panglima.fundatus<gabriellae.amicus, lutreolus.foina>>
 
         graecus(): dogramacii.kaiseri { var x: dogramacii.kaiseri; () => { var y = this; }; return x; }
->graecus : () => kaiseri
+>graecus : () => dogramacii.kaiseri
 >dogramacii : dogramacii
->kaiseri : kaiseri
->x : kaiseri
+>kaiseri : dogramacii.kaiseri
+>x : dogramacii.kaiseri
 >dogramacii : dogramacii
->kaiseri : kaiseri
+>kaiseri : dogramacii.kaiseri
 >() => { var y = this; } : () => void
 >y : megaphyllus
 >this : megaphyllus
->x : kaiseri
+>x : dogramacii.kaiseri
 
         forsteri(): petrophilus.minutilla { var x: petrophilus.minutilla; () => { var y = this; }; return x; }
->forsteri : () => minutilla
+>forsteri : () => petrophilus.minutilla
 >petrophilus : petrophilus
->minutilla : minutilla
->x : minutilla
+>minutilla : petrophilus.minutilla
+>x : petrophilus.minutilla
 >petrophilus : petrophilus
->minutilla : minutilla
+>minutilla : petrophilus.minutilla
 >() => { var y = this; } : () => void
 >y : megaphyllus
 >this : megaphyllus
->x : minutilla
+>x : petrophilus.minutilla
 
         perotensis(): samarensis.cahirinus<minutus.portoricensis, lavali.lepturus> { var x: samarensis.cahirinus<minutus.portoricensis, lavali.lepturus>; () => { var y = this; }; return x; }
->perotensis : () => cahirinus<portoricensis, lepturus>
+>perotensis : () => samarensis.cahirinus<minutus.portoricensis, lavali.lepturus>
 >samarensis : samarensis
->cahirinus : cahirinus<T0, T1>
+>cahirinus : samarensis.cahirinus<T0, T1>
 >minutus : minutus
->portoricensis : portoricensis
+>portoricensis : minutus.portoricensis
 >lavali : lavali
->lepturus : lepturus
->x : cahirinus<portoricensis, lepturus>
+>lepturus : lavali.lepturus
+>x : samarensis.cahirinus<minutus.portoricensis, lavali.lepturus>
 >samarensis : samarensis
->cahirinus : cahirinus<T0, T1>
+>cahirinus : samarensis.cahirinus<T0, T1>
 >minutus : minutus
->portoricensis : portoricensis
+>portoricensis : minutus.portoricensis
 >lavali : lavali
->lepturus : lepturus
+>lepturus : lavali.lepturus
 >() => { var y = this; } : () => void
 >y : megaphyllus
 >this : megaphyllus
->x : cahirinus<portoricensis, lepturus>
+>x : samarensis.cahirinus<minutus.portoricensis, lavali.lepturus>
 
         cirrhosus(): quasiater.carolinensis { var x: quasiater.carolinensis; () => { var y = this; }; return x; }
->cirrhosus : () => carolinensis
+>cirrhosus : () => quasiater.carolinensis
 >quasiater : quasiater
->carolinensis : carolinensis
->x : carolinensis
+>carolinensis : quasiater.carolinensis
+>x : quasiater.carolinensis
 >quasiater : quasiater
->carolinensis : carolinensis
+>carolinensis : quasiater.carolinensis
 >() => { var y = this; } : () => void
 >y : megaphyllus
 >this : megaphyllus
->x : carolinensis
+>x : quasiater.carolinensis
     }
 }
 module minutus {
->minutus : typeof minutus
+>minutus : minutus
 
     export class portoricensis {
 >portoricensis : portoricensis
 
         relictus(): quasiater.carolinensis { var x: quasiater.carolinensis; () => { var y = this; }; return x; }
->relictus : () => carolinensis
+>relictus : () => quasiater.carolinensis
 >quasiater : quasiater
->carolinensis : carolinensis
->x : carolinensis
+>carolinensis : quasiater.carolinensis
+>x : quasiater.carolinensis
 >quasiater : quasiater
->carolinensis : carolinensis
+>carolinensis : quasiater.carolinensis
 >() => { var y = this; } : () => void
 >y : portoricensis
 >this : portoricensis
->x : carolinensis
+>x : quasiater.carolinensis
 
         aequatorianus(): gabriellae.klossii<julianae.nudicaudus, dogramacii.aurata> { var x: gabriellae.klossii<julianae.nudicaudus, dogramacii.aurata>; () => { var y = this; }; return x; }
->aequatorianus : () => klossii<nudicaudus, aurata>
+>aequatorianus : () => gabriellae.klossii<julianae.nudicaudus, dogramacii.aurata>
 >gabriellae : gabriellae
->klossii : klossii<T0, T1>
+>klossii : gabriellae.klossii<T0, T1>
 >julianae : julianae
->nudicaudus : nudicaudus
+>nudicaudus : julianae.nudicaudus
 >dogramacii : dogramacii
->aurata : aurata
->x : klossii<nudicaudus, aurata>
+>aurata : dogramacii.aurata
+>x : gabriellae.klossii<julianae.nudicaudus, dogramacii.aurata>
 >gabriellae : gabriellae
->klossii : klossii<T0, T1>
+>klossii : gabriellae.klossii<T0, T1>
 >julianae : julianae
->nudicaudus : nudicaudus
+>nudicaudus : julianae.nudicaudus
 >dogramacii : dogramacii
->aurata : aurata
+>aurata : dogramacii.aurata
 >() => { var y = this; } : () => void
 >y : portoricensis
 >this : portoricensis
->x : klossii<nudicaudus, aurata>
+>x : gabriellae.klossii<julianae.nudicaudus, dogramacii.aurata>
 
         rhinogradoides(): samarensis.cahirinus<quasiater.carolinensis, julianae.durangae> { var x: samarensis.cahirinus<quasiater.carolinensis, julianae.durangae>; () => { var y = this; }; return x; }
->rhinogradoides : () => cahirinus<carolinensis, durangae>
+>rhinogradoides : () => samarensis.cahirinus<quasiater.carolinensis, julianae.durangae>
 >samarensis : samarensis
->cahirinus : cahirinus<T0, T1>
+>cahirinus : samarensis.cahirinus<T0, T1>
 >quasiater : quasiater
->carolinensis : carolinensis
+>carolinensis : quasiater.carolinensis
 >julianae : julianae
->durangae : durangae
->x : cahirinus<carolinensis, durangae>
+>durangae : julianae.durangae
+>x : samarensis.cahirinus<quasiater.carolinensis, julianae.durangae>
 >samarensis : samarensis
->cahirinus : cahirinus<T0, T1>
+>cahirinus : samarensis.cahirinus<T0, T1>
 >quasiater : quasiater
->carolinensis : carolinensis
+>carolinensis : quasiater.carolinensis
 >julianae : julianae
->durangae : durangae
+>durangae : julianae.durangae
 >() => { var y = this; } : () => void
 >y : portoricensis
 >this : portoricensis
->x : cahirinus<carolinensis, durangae>
+>x : samarensis.cahirinus<quasiater.carolinensis, julianae.durangae>
     }
 }
 module lutreolus {
->lutreolus : typeof lutreolus
+>lutreolus : lutreolus
 
     export class foina {
 >foina : foina
@@ -11377,439 +11377,439 @@ module lutreolus {
 >x : punicus
 
         Promethium(): samarensis.pelurus<argurus.germaini, julianae.durangae> { var x: samarensis.pelurus<argurus.germaini, julianae.durangae>; () => { var y = this; }; return x; }
->Promethium : () => pelurus<germaini, durangae>
+>Promethium : () => samarensis.pelurus<argurus.germaini, julianae.durangae>
 >samarensis : samarensis
->pelurus : pelurus<T0, T1>
+>pelurus : samarensis.pelurus<T0, T1>
 >argurus : argurus
->germaini : germaini
+>germaini : argurus.germaini
 >julianae : julianae
->durangae : durangae
->x : pelurus<germaini, durangae>
+>durangae : julianae.durangae
+>x : samarensis.pelurus<argurus.germaini, julianae.durangae>
 >samarensis : samarensis
->pelurus : pelurus<T0, T1>
+>pelurus : samarensis.pelurus<T0, T1>
 >argurus : argurus
->germaini : germaini
+>germaini : argurus.germaini
 >julianae : julianae
->durangae : durangae
+>durangae : julianae.durangae
 >() => { var y = this; } : () => void
 >y : foina
 >this : foina
->x : pelurus<germaini, durangae>
+>x : samarensis.pelurus<argurus.germaini, julianae.durangae>
 
         salinae(): gabriellae.klossii<macrorhinos.konganensis, quasiater.carolinensis> { var x: gabriellae.klossii<macrorhinos.konganensis, quasiater.carolinensis>; () => { var y = this; }; return x; }
->salinae : () => klossii<konganensis, carolinensis>
+>salinae : () => gabriellae.klossii<macrorhinos.konganensis, quasiater.carolinensis>
 >gabriellae : gabriellae
->klossii : klossii<T0, T1>
+>klossii : gabriellae.klossii<T0, T1>
 >macrorhinos : macrorhinos
->konganensis : konganensis
+>konganensis : macrorhinos.konganensis
 >quasiater : quasiater
->carolinensis : carolinensis
->x : klossii<konganensis, carolinensis>
+>carolinensis : quasiater.carolinensis
+>x : gabriellae.klossii<macrorhinos.konganensis, quasiater.carolinensis>
 >gabriellae : gabriellae
->klossii : klossii<T0, T1>
+>klossii : gabriellae.klossii<T0, T1>
 >macrorhinos : macrorhinos
->konganensis : konganensis
+>konganensis : macrorhinos.konganensis
 >quasiater : quasiater
->carolinensis : carolinensis
+>carolinensis : quasiater.carolinensis
 >() => { var y = this; } : () => void
 >y : foina
 >this : foina
->x : klossii<konganensis, carolinensis>
+>x : gabriellae.klossii<macrorhinos.konganensis, quasiater.carolinensis>
 
         kerri(): howi.coludo<quasiater.carolinensis, minutus.portoricensis> { var x: howi.coludo<quasiater.carolinensis, minutus.portoricensis>; () => { var y = this; }; return x; }
->kerri : () => coludo<carolinensis, portoricensis>
+>kerri : () => howi.coludo<quasiater.carolinensis, minutus.portoricensis>
 >howi : howi
->coludo : coludo<T0, T1>
+>coludo : howi.coludo<T0, T1>
 >quasiater : quasiater
->carolinensis : carolinensis
+>carolinensis : quasiater.carolinensis
 >minutus : minutus
->portoricensis : portoricensis
->x : coludo<carolinensis, portoricensis>
+>portoricensis : minutus.portoricensis
+>x : howi.coludo<quasiater.carolinensis, minutus.portoricensis>
 >howi : howi
->coludo : coludo<T0, T1>
+>coludo : howi.coludo<T0, T1>
 >quasiater : quasiater
->carolinensis : carolinensis
+>carolinensis : quasiater.carolinensis
 >minutus : minutus
->portoricensis : portoricensis
+>portoricensis : minutus.portoricensis
 >() => { var y = this; } : () => void
 >y : foina
 >this : foina
->x : coludo<carolinensis, portoricensis>
+>x : howi.coludo<quasiater.carolinensis, minutus.portoricensis>
 
         scotti(): quasiater.wattsi<macrorhinos.konganensis, dogramacii.robustulus> { var x: quasiater.wattsi<macrorhinos.konganensis, dogramacii.robustulus>; () => { var y = this; }; return x; }
->scotti : () => wattsi<konganensis, robustulus>
+>scotti : () => quasiater.wattsi<macrorhinos.konganensis, dogramacii.robustulus>
 >quasiater : quasiater
->wattsi : wattsi<T0, T1>
+>wattsi : quasiater.wattsi<T0, T1>
 >macrorhinos : macrorhinos
->konganensis : konganensis
+>konganensis : macrorhinos.konganensis
 >dogramacii : dogramacii
->robustulus : robustulus
->x : wattsi<konganensis, robustulus>
+>robustulus : dogramacii.robustulus
+>x : quasiater.wattsi<macrorhinos.konganensis, dogramacii.robustulus>
 >quasiater : quasiater
->wattsi : wattsi<T0, T1>
+>wattsi : quasiater.wattsi<T0, T1>
 >macrorhinos : macrorhinos
->konganensis : konganensis
+>konganensis : macrorhinos.konganensis
 >dogramacii : dogramacii
->robustulus : robustulus
+>robustulus : dogramacii.robustulus
 >() => { var y = this; } : () => void
 >y : foina
 >this : foina
->x : wattsi<konganensis, robustulus>
+>x : quasiater.wattsi<macrorhinos.konganensis, dogramacii.robustulus>
 
         camerunensis(): julianae.gerbillus<imperfecta.subspinosus, julianae.durangae> { var x: julianae.gerbillus<imperfecta.subspinosus, julianae.durangae>; () => { var y = this; }; return x; }
->camerunensis : () => gerbillus<subspinosus, durangae>
+>camerunensis : () => julianae.gerbillus<imperfecta.subspinosus, julianae.durangae>
 >julianae : julianae
->gerbillus : gerbillus<T0, T1>
+>gerbillus : julianae.gerbillus<T0, T1>
 >imperfecta : imperfecta
->subspinosus : subspinosus
+>subspinosus : imperfecta.subspinosus
 >julianae : julianae
->durangae : durangae
->x : gerbillus<subspinosus, durangae>
+>durangae : julianae.durangae
+>x : julianae.gerbillus<imperfecta.subspinosus, julianae.durangae>
 >julianae : julianae
->gerbillus : gerbillus<T0, T1>
+>gerbillus : julianae.gerbillus<T0, T1>
 >imperfecta : imperfecta
->subspinosus : subspinosus
+>subspinosus : imperfecta.subspinosus
 >julianae : julianae
->durangae : durangae
+>durangae : julianae.durangae
 >() => { var y = this; } : () => void
 >y : foina
 >this : foina
->x : gerbillus<subspinosus, durangae>
+>x : julianae.gerbillus<imperfecta.subspinosus, julianae.durangae>
 
         affinis(): argurus.germaini { var x: argurus.germaini; () => { var y = this; }; return x; }
->affinis : () => germaini
+>affinis : () => argurus.germaini
 >argurus : argurus
->germaini : germaini
->x : germaini
+>germaini : argurus.germaini
+>x : argurus.germaini
 >argurus : argurus
->germaini : germaini
+>germaini : argurus.germaini
 >() => { var y = this; } : () => void
 >y : foina
 >this : foina
->x : germaini
+>x : argurus.germaini
 
         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 : () => lotor<oreas, thalia<uralensis, wilsoni>>
+>siebersi : () => trivirgatus.lotor<argurus.oreas, nigra.thalia<patas.uralensis, lavali.wilsoni>>
 >trivirgatus : trivirgatus
->lotor : lotor<T0, T1>
+>lotor : trivirgatus.lotor<T0, T1>
 >argurus : argurus
->oreas : oreas
+>oreas : argurus.oreas
 >nigra : nigra
->thalia : thalia<T0, T1>
+>thalia : nigra.thalia<T0, T1>
 >patas : patas
->uralensis : uralensis
+>uralensis : patas.uralensis
 >lavali : lavali
->wilsoni : wilsoni
->x : lotor<oreas, thalia<uralensis, wilsoni>>
+>wilsoni : lavali.wilsoni
+>x : trivirgatus.lotor<argurus.oreas, nigra.thalia<patas.uralensis, lavali.wilsoni>>
 >trivirgatus : trivirgatus
->lotor : lotor<T0, T1>
+>lotor : trivirgatus.lotor<T0, T1>
 >argurus : argurus
->oreas : oreas
+>oreas : argurus.oreas
 >nigra : nigra
->thalia : thalia<T0, T1>
+>thalia : nigra.thalia<T0, T1>
 >patas : patas
->uralensis : uralensis
+>uralensis : patas.uralensis
 >lavali : lavali
->wilsoni : wilsoni
+>wilsoni : lavali.wilsoni
 >() => { var y = this; } : () => void
 >y : foina
 >this : foina
->x : lotor<oreas, thalia<uralensis, wilsoni>>
+>x : trivirgatus.lotor<argurus.oreas, nigra.thalia<patas.uralensis, lavali.wilsoni>>
 
         maquassiensis(): trivirgatus.oconnelli { var x: trivirgatus.oconnelli; () => { var y = this; }; return x; }
->maquassiensis : () => oconnelli
+>maquassiensis : () => trivirgatus.oconnelli
 >trivirgatus : trivirgatus
->oconnelli : oconnelli
->x : oconnelli
+>oconnelli : trivirgatus.oconnelli
+>x : trivirgatus.oconnelli
 >trivirgatus : trivirgatus
->oconnelli : oconnelli
+>oconnelli : trivirgatus.oconnelli
 >() => { var y = this; } : () => void
 >y : foina
 >this : foina
->x : oconnelli
+>x : trivirgatus.oconnelli
 
         layardi(): julianae.albidens<howi.marcanoi, dogramacii.koepckeae> { var x: julianae.albidens<howi.marcanoi, dogramacii.koepckeae>; () => { var y = this; }; return x; }
->layardi : () => albidens<marcanoi, koepckeae>
+>layardi : () => julianae.albidens<howi.marcanoi, dogramacii.koepckeae>
 >julianae : julianae
->albidens : albidens<T0, T1>
+>albidens : julianae.albidens<T0, T1>
 >howi : howi
->marcanoi : marcanoi
+>marcanoi : howi.marcanoi
 >dogramacii : dogramacii
->koepckeae : koepckeae
->x : albidens<marcanoi, koepckeae>
+>koepckeae : dogramacii.koepckeae
+>x : julianae.albidens<howi.marcanoi, dogramacii.koepckeae>
 >julianae : julianae
->albidens : albidens<T0, T1>
+>albidens : julianae.albidens<T0, T1>
 >howi : howi
->marcanoi : marcanoi
+>marcanoi : howi.marcanoi
 >dogramacii : dogramacii
->koepckeae : koepckeae
+>koepckeae : dogramacii.koepckeae
 >() => { var y = this; } : () => void
 >y : foina
 >this : foina
->x : albidens<marcanoi, koepckeae>
+>x : julianae.albidens<howi.marcanoi, dogramacii.koepckeae>
 
         bishopi(): dogramacii.aurata { var x: dogramacii.aurata; () => { var y = this; }; return x; }
->bishopi : () => aurata
+>bishopi : () => dogramacii.aurata
 >dogramacii : dogramacii
->aurata : aurata
->x : aurata
+>aurata : dogramacii.aurata
+>x : dogramacii.aurata
 >dogramacii : dogramacii
->aurata : aurata
+>aurata : dogramacii.aurata
 >() => { var y = this; } : () => void
 >y : foina
 >this : foina
->x : aurata
+>x : dogramacii.aurata
 
         apodemoides(): caurinus.psilurus { var x: caurinus.psilurus; () => { var y = this; }; return x; }
->apodemoides : () => psilurus
+>apodemoides : () => caurinus.psilurus
 >caurinus : caurinus
->psilurus : psilurus
->x : psilurus
+>psilurus : caurinus.psilurus
+>x : caurinus.psilurus
 >caurinus : caurinus
->psilurus : psilurus
+>psilurus : caurinus.psilurus
 >() => { var y = this; } : () => void
 >y : foina
 >this : foina
->x : psilurus
+>x : caurinus.psilurus
 
         argentiventer(): trivirgatus.mixtus<gabriellae.amicus, lutreolus.punicus> { var x: trivirgatus.mixtus<gabriellae.amicus, lutreolus.punicus>; () => { var y = this; }; return x; }
->argentiventer : () => mixtus<amicus, punicus>
+>argentiventer : () => trivirgatus.mixtus<gabriellae.amicus, punicus>
 >trivirgatus : trivirgatus
->mixtus : mixtus<T0, T1>
+>mixtus : trivirgatus.mixtus<T0, T1>
 >gabriellae : gabriellae
->amicus : amicus
+>amicus : gabriellae.amicus
 >lutreolus : lutreolus
 >punicus : punicus
->x : mixtus<amicus, punicus>
+>x : trivirgatus.mixtus<gabriellae.amicus, punicus>
 >trivirgatus : trivirgatus
->mixtus : mixtus<T0, T1>
+>mixtus : trivirgatus.mixtus<T0, T1>
 >gabriellae : gabriellae
->amicus : amicus
+>amicus : gabriellae.amicus
 >lutreolus : lutreolus
 >punicus : punicus
 >() => { var y = this; } : () => void
 >y : foina
 >this : foina
->x : mixtus<amicus, punicus>
+>x : trivirgatus.mixtus<gabriellae.amicus, punicus>
     }
 }
 module lutreolus {
->lutreolus : typeof lutreolus
+>lutreolus : 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 : panglima
->fundatus : fundatus<T0, T1>
+>fundatus : panglima.fundatus<T0, T1>
 >panamensis : panamensis
->linulus : linulus<T0, T1>
+>linulus : panamensis.linulus<T0, T1>
 >trivirgatus : trivirgatus
->lotor : lotor<T0, T1>
+>lotor : trivirgatus.lotor<T0, T1>
 >argurus : argurus
->luctuosa : luctuosa
+>luctuosa : argurus.luctuosa
 >lavali : lavali
->wilsoni : wilsoni
+>wilsoni : lavali.wilsoni
 >lavali : lavali
->beisa : beisa
+>beisa : lavali.beisa
 >dammermani : dammermani
->melanops : melanops
+>melanops : dammermani.melanops
 
         antinorii(): petrophilus.sodyi<quasiater.carolinensis, argurus.germaini> { var x: petrophilus.sodyi<quasiater.carolinensis, argurus.germaini>; () => { var y = this; }; return x; }
->antinorii : () => sodyi<carolinensis, germaini>
+>antinorii : () => petrophilus.sodyi<quasiater.carolinensis, argurus.germaini>
 >petrophilus : petrophilus
->sodyi : sodyi<T0, T1>
+>sodyi : petrophilus.sodyi<T0, T1>
 >quasiater : quasiater
->carolinensis : carolinensis
+>carolinensis : quasiater.carolinensis
 >argurus : argurus
->germaini : germaini
->x : sodyi<carolinensis, germaini>
+>germaini : argurus.germaini
+>x : petrophilus.sodyi<quasiater.carolinensis, argurus.germaini>
 >petrophilus : petrophilus
->sodyi : sodyi<T0, T1>
+>sodyi : petrophilus.sodyi<T0, T1>
 >quasiater : quasiater
->carolinensis : carolinensis
+>carolinensis : quasiater.carolinensis
 >argurus : argurus
->germaini : germaini
+>germaini : argurus.germaini
 >() => { var y = this; } : () => void
 >y : cor<T0, T1>
 >this : cor<T0, T1>
->x : sodyi<carolinensis, germaini>
+>x : petrophilus.sodyi<quasiater.carolinensis, argurus.germaini>
 
         voi(): caurinus.johorensis<dammermani.melanops, macrorhinos.konganensis> { var x: caurinus.johorensis<dammermani.melanops, macrorhinos.konganensis>; () => { var y = this; }; return x; }
->voi : () => johorensis<melanops, konganensis>
+>voi : () => caurinus.johorensis<dammermani.melanops, macrorhinos.konganensis>
 >caurinus : caurinus
->johorensis : johorensis<T0, T1>
+>johorensis : caurinus.johorensis<T0, T1>
 >dammermani : dammermani
->melanops : melanops
+>melanops : dammermani.melanops
 >macrorhinos : macrorhinos
->konganensis : konganensis
->x : johorensis<melanops, konganensis>
+>konganensis : macrorhinos.konganensis
+>x : caurinus.johorensis<dammermani.melanops, macrorhinos.konganensis>
 >caurinus : caurinus
->johorensis : johorensis<T0, T1>
+>johorensis : caurinus.johorensis<T0, T1>
 >dammermani : dammermani
->melanops : melanops
+>melanops : dammermani.melanops
 >macrorhinos : macrorhinos
->konganensis : konganensis
+>konganensis : macrorhinos.konganensis
 >() => { var y = this; } : () => void
 >y : cor<T0, T1>
 >this : cor<T0, T1>
->x : johorensis<melanops, konganensis>
+>x : caurinus.johorensis<dammermani.melanops, macrorhinos.konganensis>
 
         mussoi(): quasiater.carolinensis { var x: quasiater.carolinensis; () => { var y = this; }; return x; }
->mussoi : () => carolinensis
+>mussoi : () => quasiater.carolinensis
 >quasiater : quasiater
->carolinensis : carolinensis
->x : carolinensis
+>carolinensis : quasiater.carolinensis
+>x : quasiater.carolinensis
 >quasiater : quasiater
->carolinensis : carolinensis
+>carolinensis : quasiater.carolinensis
 >() => { var y = this; } : () => void
 >y : cor<T0, T1>
 >this : cor<T0, T1>
->x : carolinensis
+>x : quasiater.carolinensis
 
         truncatus(): trivirgatus.lotor<sagitta.stolzmanni, lutreolus.foina> { var x: trivirgatus.lotor<sagitta.stolzmanni, lutreolus.foina>; () => { var y = this; }; return x; }
->truncatus : () => lotor<stolzmanni, foina>
+>truncatus : () => trivirgatus.lotor<sagitta.stolzmanni, foina>
 >trivirgatus : trivirgatus
->lotor : lotor<T0, T1>
+>lotor : trivirgatus.lotor<T0, T1>
 >sagitta : sagitta
->stolzmanni : stolzmanni
+>stolzmanni : sagitta.stolzmanni
 >lutreolus : lutreolus
 >foina : foina
->x : lotor<stolzmanni, foina>
+>x : trivirgatus.lotor<sagitta.stolzmanni, foina>
 >trivirgatus : trivirgatus
->lotor : lotor<T0, T1>
+>lotor : trivirgatus.lotor<T0, T1>
 >sagitta : sagitta
->stolzmanni : stolzmanni
+>stolzmanni : sagitta.stolzmanni
 >lutreolus : lutreolus
 >foina : foina
 >() => { var y = this; } : () => void
 >y : cor<T0, T1>
 >this : cor<T0, T1>
->x : lotor<stolzmanni, foina>
+>x : trivirgatus.lotor<sagitta.stolzmanni, foina>
 
         achates(): provocax.melanoleuca { var x: provocax.melanoleuca; () => { var y = this; }; return x; }
->achates : () => melanoleuca
+>achates : () => provocax.melanoleuca
 >provocax : provocax
->melanoleuca : melanoleuca
->x : melanoleuca
+>melanoleuca : provocax.melanoleuca
+>x : provocax.melanoleuca
 >provocax : provocax
->melanoleuca : melanoleuca
+>melanoleuca : provocax.melanoleuca
 >() => { var y = this; } : () => void
 >y : cor<T0, T1>
 >this : cor<T0, T1>
->x : melanoleuca
+>x : provocax.melanoleuca
 
         praedatrix(): howi.angulatus<dogramacii.kaiseri, julianae.steerii> { var x: howi.angulatus<dogramacii.kaiseri, julianae.steerii>; () => { var y = this; }; return x; }
->praedatrix : () => angulatus<kaiseri, steerii>
+>praedatrix : () => howi.angulatus<dogramacii.kaiseri, julianae.steerii>
 >howi : howi
->angulatus : angulatus<T0, T1>
+>angulatus : howi.angulatus<T0, T1>
 >dogramacii : dogramacii
->kaiseri : kaiseri
+>kaiseri : dogramacii.kaiseri
 >julianae : julianae
->steerii : steerii
->x : angulatus<kaiseri, steerii>
+>steerii : julianae.steerii
+>x : howi.angulatus<dogramacii.kaiseri, julianae.steerii>
 >howi : howi
->angulatus : angulatus<T0, T1>
+>angulatus : howi.angulatus<T0, T1>
 >dogramacii : dogramacii
->kaiseri : kaiseri
+>kaiseri : dogramacii.kaiseri
 >julianae : julianae
->steerii : steerii
+>steerii : julianae.steerii
 >() => { var y = this; } : () => void
 >y : cor<T0, T1>
 >this : cor<T0, T1>
->x : angulatus<kaiseri, steerii>
+>x : howi.angulatus<dogramacii.kaiseri, julianae.steerii>
 
         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 : () => wattsi<lotor<steerii, pallidus>, inez<oconnelli, jugularis>>
+>mzabi : () => quasiater.wattsi<trivirgatus.lotor<julianae.steerii, samarensis.pallidus>, minutus.inez<trivirgatus.oconnelli, Lanthanum.jugularis>>
 >quasiater : quasiater
->wattsi : wattsi<T0, T1>
+>wattsi : quasiater.wattsi<T0, T1>
 >trivirgatus : trivirgatus
->lotor : lotor<T0, T1>
+>lotor : trivirgatus.lotor<T0, T1>
 >julianae : julianae
->steerii : steerii
+>steerii : julianae.steerii
 >samarensis : samarensis
->pallidus : pallidus
+>pallidus : samarensis.pallidus
 >minutus : minutus
->inez : inez<T0, T1>
+>inez : minutus.inez<T0, T1>
 >trivirgatus : trivirgatus
->oconnelli : oconnelli
+>oconnelli : trivirgatus.oconnelli
 >Lanthanum : Lanthanum
->jugularis : jugularis
->x : wattsi<lotor<steerii, pallidus>, inez<oconnelli, jugularis>>
+>jugularis : Lanthanum.jugularis
+>x : quasiater.wattsi<trivirgatus.lotor<julianae.steerii, samarensis.pallidus>, minutus.inez<trivirgatus.oconnelli, Lanthanum.jugularis>>
 >quasiater : quasiater
->wattsi : wattsi<T0, T1>
+>wattsi : quasiater.wattsi<T0, T1>
 >trivirgatus : trivirgatus
->lotor : lotor<T0, T1>
+>lotor : trivirgatus.lotor<T0, T1>
 >julianae : julianae
->steerii : steerii
+>steerii : julianae.steerii
 >samarensis : samarensis
->pallidus : pallidus
+>pallidus : samarensis.pallidus
 >minutus : minutus
->inez : inez<T0, T1>
+>inez : minutus.inez<T0, T1>
 >trivirgatus : trivirgatus
->oconnelli : oconnelli
+>oconnelli : trivirgatus.oconnelli
 >Lanthanum : Lanthanum
->jugularis : jugularis
+>jugularis : Lanthanum.jugularis
 >() => { var y = this; } : () => void
 >y : cor<T0, T1>
 >this : cor<T0, T1>
->x : wattsi<lotor<steerii, pallidus>, inez<oconnelli, jugularis>>
+>x : quasiater.wattsi<trivirgatus.lotor<julianae.steerii, samarensis.pallidus>, minutus.inez<trivirgatus.oconnelli, Lanthanum.jugularis>>
 
         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 : () => gracilis<linulus<kaiseri, portoricensis>, marcanoi>
+>xanthinus : () => nigra.gracilis<panamensis.linulus<dogramacii.kaiseri, minutus.portoricensis>, howi.marcanoi>
 >nigra : nigra
->gracilis : gracilis<T0, T1>
+>gracilis : nigra.gracilis<T0, T1>
 >panamensis : panamensis
->linulus : linulus<T0, T1>
+>linulus : panamensis.linulus<T0, T1>
 >dogramacii : dogramacii
->kaiseri : kaiseri
+>kaiseri : dogramacii.kaiseri
 >minutus : minutus
->portoricensis : portoricensis
+>portoricensis : minutus.portoricensis
 >howi : howi
->marcanoi : marcanoi
->x : gracilis<linulus<kaiseri, portoricensis>, marcanoi>
+>marcanoi : howi.marcanoi
+>x : nigra.gracilis<panamensis.linulus<dogramacii.kaiseri, minutus.portoricensis>, howi.marcanoi>
 >nigra : nigra
->gracilis : gracilis<T0, T1>
+>gracilis : nigra.gracilis<T0, T1>
 >panamensis : panamensis
->linulus : linulus<T0, T1>
+>linulus : panamensis.linulus<T0, T1>
 >dogramacii : dogramacii
->kaiseri : kaiseri
+>kaiseri : dogramacii.kaiseri
 >minutus : minutus
->portoricensis : portoricensis
+>portoricensis : minutus.portoricensis
 >howi : howi
->marcanoi : marcanoi
+>marcanoi : howi.marcanoi
 >() => { var y = this; } : () => void
 >y : cor<T0, T1>
 >this : cor<T0, T1>
->x : gracilis<linulus<kaiseri, portoricensis>, marcanoi>
+>x : nigra.gracilis<panamensis.linulus<dogramacii.kaiseri, minutus.portoricensis>, howi.marcanoi>
 
         tapoatafa(): caurinus.megaphyllus { var x: caurinus.megaphyllus; () => { var y = this; }; return x; }
->tapoatafa : () => megaphyllus
+>tapoatafa : () => caurinus.megaphyllus
 >caurinus : caurinus
->megaphyllus : megaphyllus
->x : megaphyllus
+>megaphyllus : caurinus.megaphyllus
+>x : caurinus.megaphyllus
 >caurinus : caurinus
->megaphyllus : megaphyllus
+>megaphyllus : caurinus.megaphyllus
 >() => { var y = this; } : () => void
 >y : cor<T0, T1>
 >this : cor<T0, T1>
->x : megaphyllus
+>x : caurinus.megaphyllus
 
         castroviejoi(): Lanthanum.jugularis { var x: Lanthanum.jugularis; () => { var y = this; }; return x; }
->castroviejoi : () => jugularis
+>castroviejoi : () => Lanthanum.jugularis
 >Lanthanum : Lanthanum
->jugularis : jugularis
->x : jugularis
+>jugularis : Lanthanum.jugularis
+>x : Lanthanum.jugularis
 >Lanthanum : Lanthanum
->jugularis : jugularis
+>jugularis : Lanthanum.jugularis
 >() => { var y = this; } : () => void
 >y : cor<T0, T1>
 >this : cor<T0, T1>
->x : jugularis
+>x : Lanthanum.jugularis
     }
 }
 module howi {
->howi : typeof howi
+>howi : howi
 
     export class coludo<T0, T1> {
 >coludo : coludo<T0, T1>
@@ -11817,251 +11817,251 @@ module howi {
 >T1 : T1
 
         bernhardi(): lutreolus.punicus { var x: lutreolus.punicus; () => { var y = this; }; return x; }
->bernhardi : () => punicus
+>bernhardi : () => lutreolus.punicus
 >lutreolus : lutreolus
->punicus : punicus
->x : punicus
+>punicus : lutreolus.punicus
+>x : lutreolus.punicus
 >lutreolus : lutreolus
->punicus : punicus
+>punicus : lutreolus.punicus
 >() => { var y = this; } : () => void
 >y : coludo<T0, T1>
 >this : coludo<T0, T1>
->x : punicus
+>x : lutreolus.punicus
 
         isseli(): argurus.germaini { var x: argurus.germaini; () => { var y = this; }; return x; }
->isseli : () => germaini
+>isseli : () => argurus.germaini
 >argurus : argurus
->germaini : germaini
->x : germaini
+>germaini : argurus.germaini
+>x : argurus.germaini
 >argurus : argurus
->germaini : germaini
+>germaini : argurus.germaini
 >() => { var y = this; } : () => void
 >y : coludo<T0, T1>
 >this : coludo<T0, T1>
->x : germaini
+>x : argurus.germaini
     }
 }
 module argurus {
->argurus : typeof argurus
+>argurus : argurus
 
     export class germaini extends gabriellae.amicus {
 >germaini : germaini
 >gabriellae : gabriellae
->amicus : amicus
+>amicus : gabriellae.amicus
 
         sharpei(): lavali.wilsoni { var x: lavali.wilsoni; () => { var y = this; }; return x; }
->sharpei : () => wilsoni
+>sharpei : () => lavali.wilsoni
 >lavali : lavali
->wilsoni : wilsoni
->x : wilsoni
+>wilsoni : lavali.wilsoni
+>x : lavali.wilsoni
 >lavali : lavali
->wilsoni : wilsoni
+>wilsoni : lavali.wilsoni
 >() => { var y = this; } : () => void
 >y : germaini
 >this : germaini
->x : wilsoni
+>x : lavali.wilsoni
 
         palmarum(): macrorhinos.marmosurus<Lanthanum.megalonyx, lavali.thaeleri> { var x: macrorhinos.marmosurus<Lanthanum.megalonyx, lavali.thaeleri>; () => { var y = this; }; return x; }
->palmarum : () => marmosurus<megalonyx, thaeleri>
+>palmarum : () => macrorhinos.marmosurus<Lanthanum.megalonyx, lavali.thaeleri>
 >macrorhinos : macrorhinos
->marmosurus : marmosurus<T0, T1>
+>marmosurus : macrorhinos.marmosurus<T0, T1>
 >Lanthanum : Lanthanum
->megalonyx : megalonyx
+>megalonyx : Lanthanum.megalonyx
 >lavali : lavali
->thaeleri : thaeleri
->x : marmosurus<megalonyx, thaeleri>
+>thaeleri : lavali.thaeleri
+>x : macrorhinos.marmosurus<Lanthanum.megalonyx, lavali.thaeleri>
 >macrorhinos : macrorhinos
->marmosurus : marmosurus<T0, T1>
+>marmosurus : macrorhinos.marmosurus<T0, T1>
 >Lanthanum : Lanthanum
->megalonyx : megalonyx
+>megalonyx : Lanthanum.megalonyx
 >lavali : lavali
->thaeleri : thaeleri
+>thaeleri : lavali.thaeleri
 >() => { var y = this; } : () => void
 >y : germaini
 >this : germaini
->x : marmosurus<megalonyx, thaeleri>
+>x : macrorhinos.marmosurus<Lanthanum.megalonyx, lavali.thaeleri>
     }
 }
 module sagitta {
->sagitta : typeof sagitta
+>sagitta : sagitta
 
     export class stolzmanni {
 >stolzmanni : stolzmanni
 
         riparius(): nigra.dolichurus<dogramacii.koepckeae, caurinus.psilurus> { var x: nigra.dolichurus<dogramacii.koepckeae, caurinus.psilurus>; () => { var y = this; }; return x; }
->riparius : () => dolichurus<koepckeae, psilurus>
+>riparius : () => nigra.dolichurus<dogramacii.koepckeae, caurinus.psilurus>
 >nigra : nigra
->dolichurus : dolichurus<T0, T1>
+>dolichurus : nigra.dolichurus<T0, T1>
 >dogramacii : dogramacii
->koepckeae : koepckeae
+>koepckeae : dogramacii.koepckeae
 >caurinus : caurinus
->psilurus : psilurus
->x : dolichurus<koepckeae, psilurus>
+>psilurus : caurinus.psilurus
+>x : nigra.dolichurus<dogramacii.koepckeae, caurinus.psilurus>
 >nigra : nigra
->dolichurus : dolichurus<T0, T1>
+>dolichurus : nigra.dolichurus<T0, T1>
 >dogramacii : dogramacii
->koepckeae : koepckeae
+>koepckeae : dogramacii.koepckeae
 >caurinus : caurinus
->psilurus : psilurus
+>psilurus : caurinus.psilurus
 >() => { var y = this; } : () => void
 >y : stolzmanni
 >this : stolzmanni
->x : dolichurus<koepckeae, psilurus>
+>x : nigra.dolichurus<dogramacii.koepckeae, caurinus.psilurus>
 
         dhofarensis(): lutreolus.foina { var x: lutreolus.foina; () => { var y = this; }; return x; }
->dhofarensis : () => foina
+>dhofarensis : () => lutreolus.foina
 >lutreolus : lutreolus
->foina : foina
->x : foina
+>foina : lutreolus.foina
+>x : lutreolus.foina
 >lutreolus : lutreolus
->foina : foina
+>foina : lutreolus.foina
 >() => { var y = this; } : () => void
 >y : stolzmanni
 >this : stolzmanni
->x : foina
+>x : lutreolus.foina
 
         tricolor(): argurus.germaini { var x: argurus.germaini; () => { var y = this; }; return x; }
->tricolor : () => germaini
+>tricolor : () => argurus.germaini
 >argurus : argurus
->germaini : germaini
->x : germaini
+>germaini : argurus.germaini
+>x : argurus.germaini
 >argurus : argurus
->germaini : germaini
+>germaini : argurus.germaini
 >() => { var y = this; } : () => void
 >y : stolzmanni
 >this : stolzmanni
->x : germaini
+>x : argurus.germaini
 
         gardneri(): lavali.xanthognathus { var x: lavali.xanthognathus; () => { var y = this; }; return x; }
->gardneri : () => xanthognathus
+>gardneri : () => lavali.xanthognathus
 >lavali : lavali
->xanthognathus : xanthognathus
->x : xanthognathus
+>xanthognathus : lavali.xanthognathus
+>x : lavali.xanthognathus
 >lavali : lavali
->xanthognathus : xanthognathus
+>xanthognathus : lavali.xanthognathus
 >() => { var y = this; } : () => void
 >y : stolzmanni
 >this : stolzmanni
->x : xanthognathus
+>x : lavali.xanthognathus
 
         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 : () => moojeni<sarasinorum<megaphyllus, xanthognathus>, echinatus>
+>walleri : () => rendalli.moojeni<chrysaeolus.sarasinorum<caurinus.megaphyllus, lavali.xanthognathus>, gabriellae.echinatus>
 >rendalli : rendalli
->moojeni : moojeni<T0, T1>
+>moojeni : rendalli.moojeni<T0, T1>
 >chrysaeolus : chrysaeolus
->sarasinorum : sarasinorum<T0, T1>
+>sarasinorum : chrysaeolus.sarasinorum<T0, T1>
 >caurinus : caurinus
->megaphyllus : megaphyllus
+>megaphyllus : caurinus.megaphyllus
 >lavali : lavali
->xanthognathus : xanthognathus
+>xanthognathus : lavali.xanthognathus
 >gabriellae : gabriellae
->echinatus : echinatus
->x : moojeni<sarasinorum<megaphyllus, xanthognathus>, echinatus>
+>echinatus : gabriellae.echinatus
+>x : rendalli.moojeni<chrysaeolus.sarasinorum<caurinus.megaphyllus, lavali.xanthognathus>, gabriellae.echinatus>
 >rendalli : rendalli
->moojeni : moojeni<T0, T1>
+>moojeni : rendalli.moojeni<T0, T1>
 >chrysaeolus : chrysaeolus
->sarasinorum : sarasinorum<T0, T1>
+>sarasinorum : chrysaeolus.sarasinorum<T0, T1>
 >caurinus : caurinus
->megaphyllus : megaphyllus
+>megaphyllus : caurinus.megaphyllus
 >lavali : lavali
->xanthognathus : xanthognathus
+>xanthognathus : lavali.xanthognathus
 >gabriellae : gabriellae
->echinatus : echinatus
+>echinatus : gabriellae.echinatus
 >() => { var y = this; } : () => void
 >y : stolzmanni
 >this : stolzmanni
->x : moojeni<sarasinorum<megaphyllus, xanthognathus>, echinatus>
+>x : rendalli.moojeni<chrysaeolus.sarasinorum<caurinus.megaphyllus, lavali.xanthognathus>, gabriellae.echinatus>
 
         talpoides(): gabriellae.echinatus { var x: gabriellae.echinatus; () => { var y = this; }; return x; }
->talpoides : () => echinatus
+>talpoides : () => gabriellae.echinatus
 >gabriellae : gabriellae
->echinatus : echinatus
->x : echinatus
+>echinatus : gabriellae.echinatus
+>x : gabriellae.echinatus
 >gabriellae : gabriellae
->echinatus : echinatus
+>echinatus : gabriellae.echinatus
 >() => { var y = this; } : () => void
 >y : stolzmanni
 >this : stolzmanni
->x : echinatus
+>x : gabriellae.echinatus
 
         pallipes(): dammermani.melanops { var x: dammermani.melanops; () => { var y = this; }; return x; }
->pallipes : () => melanops
+>pallipes : () => dammermani.melanops
 >dammermani : dammermani
->melanops : melanops
->x : melanops
+>melanops : dammermani.melanops
+>x : dammermani.melanops
 >dammermani : dammermani
->melanops : melanops
+>melanops : dammermani.melanops
 >() => { var y = this; } : () => void
 >y : stolzmanni
 >this : stolzmanni
->x : melanops
+>x : dammermani.melanops
 
         lagurus(): lavali.beisa { var x: lavali.beisa; () => { var y = this; }; return x; }
->lagurus : () => beisa
+>lagurus : () => lavali.beisa
 >lavali : lavali
->beisa : beisa
->x : beisa
+>beisa : lavali.beisa
+>x : lavali.beisa
 >lavali : lavali
->beisa : beisa
+>beisa : lavali.beisa
 >() => { var y = this; } : () => void
 >y : stolzmanni
 >this : stolzmanni
->x : beisa
+>x : lavali.beisa
 
         hipposideros(): julianae.albidens<argurus.luctuosa, gabriellae.echinatus> { var x: julianae.albidens<argurus.luctuosa, gabriellae.echinatus>; () => { var y = this; }; return x; }
->hipposideros : () => albidens<luctuosa, echinatus>
+>hipposideros : () => julianae.albidens<argurus.luctuosa, gabriellae.echinatus>
 >julianae : julianae
->albidens : albidens<T0, T1>
+>albidens : julianae.albidens<T0, T1>
 >argurus : argurus
->luctuosa : luctuosa
+>luctuosa : argurus.luctuosa
 >gabriellae : gabriellae
->echinatus : echinatus
->x : albidens<luctuosa, echinatus>
+>echinatus : gabriellae.echinatus
+>x : julianae.albidens<argurus.luctuosa, gabriellae.echinatus>
 >julianae : julianae
->albidens : albidens<T0, T1>
+>albidens : julianae.albidens<T0, T1>
 >argurus : argurus
->luctuosa : luctuosa
+>luctuosa : argurus.luctuosa
 >gabriellae : gabriellae
->echinatus : echinatus
+>echinatus : gabriellae.echinatus
 >() => { var y = this; } : () => void
 >y : stolzmanni
 >this : stolzmanni
->x : albidens<luctuosa, echinatus>
+>x : julianae.albidens<argurus.luctuosa, gabriellae.echinatus>
 
         griselda(): caurinus.psilurus { var x: caurinus.psilurus; () => { var y = this; }; return x; }
->griselda : () => psilurus
+>griselda : () => caurinus.psilurus
 >caurinus : caurinus
->psilurus : psilurus
->x : psilurus
+>psilurus : caurinus.psilurus
+>x : caurinus.psilurus
 >caurinus : caurinus
->psilurus : psilurus
+>psilurus : caurinus.psilurus
 >() => { var y = this; } : () => void
 >y : stolzmanni
 >this : stolzmanni
->x : psilurus
+>x : caurinus.psilurus
 
         florium(): rendalli.zuluensis { var x: rendalli.zuluensis; () => { var y = this; }; return x; }
->florium : () => zuluensis
+>florium : () => rendalli.zuluensis
 >rendalli : rendalli
->zuluensis : zuluensis
->x : zuluensis
+>zuluensis : rendalli.zuluensis
+>x : rendalli.zuluensis
 >rendalli : rendalli
->zuluensis : zuluensis
+>zuluensis : rendalli.zuluensis
 >() => { var y = this; } : () => void
 >y : stolzmanni
 >this : stolzmanni
->x : zuluensis
+>x : rendalli.zuluensis
     }
 }
 module dammermani {
->dammermani : typeof dammermani
+>dammermani : dammermani
 
     export class melanops extends minutus.inez<sagitta.stolzmanni, dammermani.melanops> {
 >melanops : melanops
 >minutus : minutus
->inez : inez<T0, T1>
+>inez : minutus.inez<T0, T1>
 >sagitta : sagitta
->stolzmanni : stolzmanni
+>stolzmanni : sagitta.stolzmanni
 >dammermani : dammermani
 >melanops : melanops
 
@@ -12078,377 +12078,377 @@ module dammermani {
 >x : melanops
 
         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 : () => veraecrucis<dolichurus<lepturus, pallidus>, wilsoni>
+>harwoodi : () => rionegrensis.veraecrucis<nigra.dolichurus<lavali.lepturus, samarensis.pallidus>, lavali.wilsoni>
 >rionegrensis : rionegrensis
->veraecrucis : veraecrucis<T0, T1>
+>veraecrucis : rionegrensis.veraecrucis<T0, T1>
 >nigra : nigra
->dolichurus : dolichurus<T0, T1>
+>dolichurus : nigra.dolichurus<T0, T1>
 >lavali : lavali
->lepturus : lepturus
+>lepturus : lavali.lepturus
 >samarensis : samarensis
->pallidus : pallidus
+>pallidus : samarensis.pallidus
 >lavali : lavali
->wilsoni : wilsoni
->x : veraecrucis<dolichurus<lepturus, pallidus>, wilsoni>
+>wilsoni : lavali.wilsoni
+>x : rionegrensis.veraecrucis<nigra.dolichurus<lavali.lepturus, samarensis.pallidus>, lavali.wilsoni>
 >rionegrensis : rionegrensis
->veraecrucis : veraecrucis<T0, T1>
+>veraecrucis : rionegrensis.veraecrucis<T0, T1>
 >nigra : nigra
->dolichurus : dolichurus<T0, T1>
+>dolichurus : nigra.dolichurus<T0, T1>
 >lavali : lavali
->lepturus : lepturus
+>lepturus : lavali.lepturus
 >samarensis : samarensis
->pallidus : pallidus
+>pallidus : samarensis.pallidus
 >lavali : lavali
->wilsoni : wilsoni
+>wilsoni : lavali.wilsoni
 >() => { var y = this; } : () => void
 >y : melanops
 >this : melanops
->x : veraecrucis<dolichurus<lepturus, pallidus>, wilsoni>
+>x : rionegrensis.veraecrucis<nigra.dolichurus<lavali.lepturus, samarensis.pallidus>, lavali.wilsoni>
 
         ashaninka(): julianae.nudicaudus { var x: julianae.nudicaudus; () => { var y = this; }; return x; }
->ashaninka : () => nudicaudus
+>ashaninka : () => julianae.nudicaudus
 >julianae : julianae
->nudicaudus : nudicaudus
->x : nudicaudus
+>nudicaudus : julianae.nudicaudus
+>x : julianae.nudicaudus
 >julianae : julianae
->nudicaudus : nudicaudus
+>nudicaudus : julianae.nudicaudus
 >() => { var y = this; } : () => void
 >y : melanops
 >this : melanops
->x : nudicaudus
+>x : julianae.nudicaudus
 
         wiedii(): julianae.steerii { var x: julianae.steerii; () => { var y = this; }; return x; }
->wiedii : () => steerii
+>wiedii : () => julianae.steerii
 >julianae : julianae
->steerii : steerii
->x : steerii
+>steerii : julianae.steerii
+>x : julianae.steerii
 >julianae : julianae
->steerii : steerii
+>steerii : julianae.steerii
 >() => { var y = this; } : () => void
 >y : melanops
 >this : melanops
->x : steerii
+>x : julianae.steerii
 
         godmani(): imperfecta.subspinosus { var x: imperfecta.subspinosus; () => { var y = this; }; return x; }
->godmani : () => subspinosus
+>godmani : () => imperfecta.subspinosus
 >imperfecta : imperfecta
->subspinosus : subspinosus
->x : subspinosus
+>subspinosus : imperfecta.subspinosus
+>x : imperfecta.subspinosus
 >imperfecta : imperfecta
->subspinosus : subspinosus
+>subspinosus : imperfecta.subspinosus
 >() => { var y = this; } : () => void
 >y : melanops
 >this : melanops
->x : subspinosus
+>x : imperfecta.subspinosus
 
         condorensis(): imperfecta.ciliolabrum<samarensis.pallidus, caurinus.psilurus> { var x: imperfecta.ciliolabrum<samarensis.pallidus, caurinus.psilurus>; () => { var y = this; }; return x; }
->condorensis : () => ciliolabrum<pallidus, psilurus>
+>condorensis : () => imperfecta.ciliolabrum<samarensis.pallidus, caurinus.psilurus>
 >imperfecta : imperfecta
->ciliolabrum : ciliolabrum<T0, T1>
+>ciliolabrum : imperfecta.ciliolabrum<T0, T1>
 >samarensis : samarensis
->pallidus : pallidus
+>pallidus : samarensis.pallidus
 >caurinus : caurinus
->psilurus : psilurus
->x : ciliolabrum<pallidus, psilurus>
+>psilurus : caurinus.psilurus
+>x : imperfecta.ciliolabrum<samarensis.pallidus, caurinus.psilurus>
 >imperfecta : imperfecta
->ciliolabrum : ciliolabrum<T0, T1>
+>ciliolabrum : imperfecta.ciliolabrum<T0, T1>
 >samarensis : samarensis
->pallidus : pallidus
+>pallidus : samarensis.pallidus
 >caurinus : caurinus
->psilurus : psilurus
+>psilurus : caurinus.psilurus
 >() => { var y = this; } : () => void
 >y : melanops
 >this : melanops
->x : ciliolabrum<pallidus, psilurus>
+>x : imperfecta.ciliolabrum<samarensis.pallidus, caurinus.psilurus>
 
         xerophila(): panglima.abidi<minutus.portoricensis, patas.uralensis> { var x: panglima.abidi<minutus.portoricensis, patas.uralensis>; () => { var y = this; }; return x; }
->xerophila : () => abidi<portoricensis, uralensis>
+>xerophila : () => panglima.abidi<minutus.portoricensis, patas.uralensis>
 >panglima : panglima
->abidi : abidi<T0, T1>
+>abidi : panglima.abidi<T0, T1>
 >minutus : minutus
->portoricensis : portoricensis
+>portoricensis : minutus.portoricensis
 >patas : patas
->uralensis : uralensis
->x : abidi<portoricensis, uralensis>
+>uralensis : patas.uralensis
+>x : panglima.abidi<minutus.portoricensis, patas.uralensis>
 >panglima : panglima
->abidi : abidi<T0, T1>
+>abidi : panglima.abidi<T0, T1>
 >minutus : minutus
->portoricensis : portoricensis
+>portoricensis : minutus.portoricensis
 >patas : patas
->uralensis : uralensis
+>uralensis : patas.uralensis
 >() => { var y = this; } : () => void
 >y : melanops
 >this : melanops
->x : abidi<portoricensis, uralensis>
+>x : panglima.abidi<minutus.portoricensis, patas.uralensis>
 
         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 : () => fundatus<marcanoi, fuscus<wilsoni, sarasinorum<jugularis, subspinosus>>>
+>laminatus : () => panglima.fundatus<howi.marcanoi, samarensis.fuscus<lavali.wilsoni, chrysaeolus.sarasinorum<Lanthanum.jugularis, imperfecta.subspinosus>>>
 >panglima : panglima
->fundatus : fundatus<T0, T1>
+>fundatus : panglima.fundatus<T0, T1>
 >howi : howi
->marcanoi : marcanoi
+>marcanoi : howi.marcanoi
 >samarensis : samarensis
->fuscus : fuscus<T0, T1>
+>fuscus : samarensis.fuscus<T0, T1>
 >lavali : lavali
->wilsoni : wilsoni
+>wilsoni : lavali.wilsoni
 >chrysaeolus : chrysaeolus
->sarasinorum : sarasinorum<T0, T1>
+>sarasinorum : chrysaeolus.sarasinorum<T0, T1>
 >Lanthanum : Lanthanum
->jugularis : jugularis
+>jugularis : Lanthanum.jugularis
 >imperfecta : imperfecta
->subspinosus : subspinosus
->x : fundatus<marcanoi, fuscus<wilsoni, sarasinorum<jugularis, subspinosus>>>
+>subspinosus : imperfecta.subspinosus
+>x : panglima.fundatus<howi.marcanoi, samarensis.fuscus<lavali.wilsoni, chrysaeolus.sarasinorum<Lanthanum.jugularis, imperfecta.subspinosus>>>
 >panglima : panglima
->fundatus : fundatus<T0, T1>
+>fundatus : panglima.fundatus<T0, T1>
 >howi : howi
->marcanoi : marcanoi
+>marcanoi : howi.marcanoi
 >samarensis : samarensis
->fuscus : fuscus<T0, T1>
+>fuscus : samarensis.fuscus<T0, T1>
 >lavali : lavali
->wilsoni : wilsoni
+>wilsoni : lavali.wilsoni
 >chrysaeolus : chrysaeolus
->sarasinorum : sarasinorum<T0, T1>
+>sarasinorum : chrysaeolus.sarasinorum<T0, T1>
 >Lanthanum : Lanthanum
->jugularis : jugularis
+>jugularis : Lanthanum.jugularis
 >imperfecta : imperfecta
->subspinosus : subspinosus
+>subspinosus : imperfecta.subspinosus
 >() => { var y = this; } : () => void
 >y : melanops
 >this : melanops
->x : fundatus<marcanoi, fuscus<wilsoni, sarasinorum<jugularis, subspinosus>>>
+>x : panglima.fundatus<howi.marcanoi, samarensis.fuscus<lavali.wilsoni, chrysaeolus.sarasinorum<Lanthanum.jugularis, imperfecta.subspinosus>>>
 
         archeri(): howi.marcanoi { var x: howi.marcanoi; () => { var y = this; }; return x; }
->archeri : () => marcanoi
+>archeri : () => howi.marcanoi
 >howi : howi
->marcanoi : marcanoi
->x : marcanoi
+>marcanoi : howi.marcanoi
+>x : howi.marcanoi
 >howi : howi
->marcanoi : marcanoi
+>marcanoi : howi.marcanoi
 >() => { var y = this; } : () => void
 >y : melanops
 >this : melanops
->x : marcanoi
+>x : howi.marcanoi
 
         hidalgo(): minutus.inez<trivirgatus.oconnelli, Lanthanum.jugularis> { var x: minutus.inez<trivirgatus.oconnelli, Lanthanum.jugularis>; () => { var y = this; }; return x; }
->hidalgo : () => inez<oconnelli, jugularis>
+>hidalgo : () => minutus.inez<trivirgatus.oconnelli, Lanthanum.jugularis>
 >minutus : minutus
->inez : inez<T0, T1>
+>inez : minutus.inez<T0, T1>
 >trivirgatus : trivirgatus
->oconnelli : oconnelli
+>oconnelli : trivirgatus.oconnelli
 >Lanthanum : Lanthanum
->jugularis : jugularis
->x : inez<oconnelli, jugularis>
+>jugularis : Lanthanum.jugularis
+>x : minutus.inez<trivirgatus.oconnelli, Lanthanum.jugularis>
 >minutus : minutus
->inez : inez<T0, T1>
+>inez : minutus.inez<T0, T1>
 >trivirgatus : trivirgatus
->oconnelli : oconnelli
+>oconnelli : trivirgatus.oconnelli
 >Lanthanum : Lanthanum
->jugularis : jugularis
+>jugularis : Lanthanum.jugularis
 >() => { var y = this; } : () => void
 >y : melanops
 >this : melanops
->x : inez<oconnelli, jugularis>
+>x : minutus.inez<trivirgatus.oconnelli, Lanthanum.jugularis>
 
         unicolor(): lutreolus.schlegeli { var x: lutreolus.schlegeli; () => { var y = this; }; return x; }
->unicolor : () => schlegeli
+>unicolor : () => lutreolus.schlegeli
 >lutreolus : lutreolus
->schlegeli : schlegeli
->x : schlegeli
+>schlegeli : lutreolus.schlegeli
+>x : lutreolus.schlegeli
 >lutreolus : lutreolus
->schlegeli : schlegeli
+>schlegeli : lutreolus.schlegeli
 >() => { var y = this; } : () => void
 >y : melanops
 >this : melanops
->x : schlegeli
+>x : lutreolus.schlegeli
 
         philippii(): nigra.gracilis<sagitta.walkeri, sagitta.stolzmanni> { var x: nigra.gracilis<sagitta.walkeri, sagitta.stolzmanni>; () => { var y = this; }; return x; }
->philippii : () => gracilis<walkeri, stolzmanni>
+>philippii : () => nigra.gracilis<sagitta.walkeri, sagitta.stolzmanni>
 >nigra : nigra
->gracilis : gracilis<T0, T1>
+>gracilis : nigra.gracilis<T0, T1>
 >sagitta : sagitta
->walkeri : walkeri
+>walkeri : sagitta.walkeri
 >sagitta : sagitta
->stolzmanni : stolzmanni
->x : gracilis<walkeri, stolzmanni>
+>stolzmanni : sagitta.stolzmanni
+>x : nigra.gracilis<sagitta.walkeri, sagitta.stolzmanni>
 >nigra : nigra
->gracilis : gracilis<T0, T1>
+>gracilis : nigra.gracilis<T0, T1>
 >sagitta : sagitta
->walkeri : walkeri
+>walkeri : sagitta.walkeri
 >sagitta : sagitta
->stolzmanni : stolzmanni
+>stolzmanni : sagitta.stolzmanni
 >() => { var y = this; } : () => void
 >y : melanops
 >this : melanops
->x : gracilis<walkeri, stolzmanni>
+>x : nigra.gracilis<sagitta.walkeri, sagitta.stolzmanni>
 
         bocagei(): julianae.albidens<lavali.wilsoni, lavali.thaeleri> { var x: julianae.albidens<lavali.wilsoni, lavali.thaeleri>; () => { var y = this; }; return x; }
->bocagei : () => albidens<wilsoni, thaeleri>
+>bocagei : () => julianae.albidens<lavali.wilsoni, lavali.thaeleri>
 >julianae : julianae
->albidens : albidens<T0, T1>
+>albidens : julianae.albidens<T0, T1>
 >lavali : lavali
->wilsoni : wilsoni
+>wilsoni : lavali.wilsoni
 >lavali : lavali
->thaeleri : thaeleri
->x : albidens<wilsoni, thaeleri>
+>thaeleri : lavali.thaeleri
+>x : julianae.albidens<lavali.wilsoni, lavali.thaeleri>
 >julianae : julianae
->albidens : albidens<T0, T1>
+>albidens : julianae.albidens<T0, T1>
 >lavali : lavali
->wilsoni : wilsoni
+>wilsoni : lavali.wilsoni
 >lavali : lavali
->thaeleri : thaeleri
+>thaeleri : lavali.thaeleri
 >() => { var y = this; } : () => void
 >y : melanops
 >this : melanops
->x : albidens<wilsoni, thaeleri>
+>x : julianae.albidens<lavali.wilsoni, lavali.thaeleri>
     }
 }
 module argurus {
->argurus : typeof argurus
+>argurus : argurus
 
     export class peninsulae extends patas.uralensis {
 >peninsulae : peninsulae
 >patas : patas
->uralensis : uralensis
+>uralensis : patas.uralensis
 
         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 : () => mixtus<dauricus<aurata, melanops>, amphibius<lepturus, carolinensis>>
+>aitkeni : () => trivirgatus.mixtus<dauricus<dogramacii.aurata, dammermani.melanops>, panglima.amphibius<lavali.lepturus, quasiater.carolinensis>>
 >trivirgatus : trivirgatus
->mixtus : mixtus<T0, T1>
+>mixtus : trivirgatus.mixtus<T0, T1>
 >argurus : argurus
 >dauricus : dauricus<T0, T1>
 >dogramacii : dogramacii
->aurata : aurata
+>aurata : dogramacii.aurata
 >dammermani : dammermani
->melanops : melanops
+>melanops : dammermani.melanops
 >panglima : panglima
->amphibius : amphibius<T0, T1>
+>amphibius : panglima.amphibius<T0, T1>
 >lavali : lavali
->lepturus : lepturus
+>lepturus : lavali.lepturus
 >quasiater : quasiater
->carolinensis : carolinensis
->x : mixtus<dauricus<aurata, melanops>, amphibius<lepturus, carolinensis>>
+>carolinensis : quasiater.carolinensis
+>x : trivirgatus.mixtus<dauricus<dogramacii.aurata, dammermani.melanops>, panglima.amphibius<lavali.lepturus, quasiater.carolinensis>>
 >trivirgatus : trivirgatus
->mixtus : mixtus<T0, T1>
+>mixtus : trivirgatus.mixtus<T0, T1>
 >argurus : argurus
 >dauricus : dauricus<T0, T1>
 >dogramacii : dogramacii
->aurata : aurata
+>aurata : dogramacii.aurata
 >dammermani : dammermani
->melanops : melanops
+>melanops : dammermani.melanops
 >panglima : panglima
->amphibius : amphibius<T0, T1>
+>amphibius : panglima.amphibius<T0, T1>
 >lavali : lavali
->lepturus : lepturus
+>lepturus : lavali.lepturus
 >quasiater : quasiater
->carolinensis : carolinensis
+>carolinensis : quasiater.carolinensis
 >() => { var y = this; } : () => void
 >y : peninsulae
 >this : peninsulae
->x : mixtus<dauricus<aurata, melanops>, amphibius<lepturus, carolinensis>>
+>x : trivirgatus.mixtus<dauricus<dogramacii.aurata, dammermani.melanops>, panglima.amphibius<lavali.lepturus, quasiater.carolinensis>>
 
         novaeangliae(): lavali.xanthognathus { var x: lavali.xanthognathus; () => { var y = this; }; return x; }
->novaeangliae : () => xanthognathus
+>novaeangliae : () => lavali.xanthognathus
 >lavali : lavali
->xanthognathus : xanthognathus
->x : xanthognathus
+>xanthognathus : lavali.xanthognathus
+>x : lavali.xanthognathus
 >lavali : lavali
->xanthognathus : xanthognathus
+>xanthognathus : lavali.xanthognathus
 >() => { var y = this; } : () => void
 >y : peninsulae
 >this : peninsulae
->x : xanthognathus
+>x : lavali.xanthognathus
 
         olallae(): julianae.sumatrana { var x: julianae.sumatrana; () => { var y = this; }; return x; }
->olallae : () => sumatrana
+>olallae : () => julianae.sumatrana
 >julianae : julianae
->sumatrana : sumatrana
->x : sumatrana
+>sumatrana : julianae.sumatrana
+>x : julianae.sumatrana
 >julianae : julianae
->sumatrana : sumatrana
+>sumatrana : julianae.sumatrana
 >() => { var y = this; } : () => void
 >y : peninsulae
 >this : peninsulae
->x : sumatrana
+>x : julianae.sumatrana
 
         anselli(): dogramacii.aurata { var x: dogramacii.aurata; () => { var y = this; }; return x; }
->anselli : () => aurata
+>anselli : () => dogramacii.aurata
 >dogramacii : dogramacii
->aurata : aurata
->x : aurata
+>aurata : dogramacii.aurata
+>x : dogramacii.aurata
 >dogramacii : dogramacii
->aurata : aurata
+>aurata : dogramacii.aurata
 >() => { var y = this; } : () => void
 >y : peninsulae
 >this : peninsulae
->x : aurata
+>x : dogramacii.aurata
 
         timminsi(): macrorhinos.konganensis { var x: macrorhinos.konganensis; () => { var y = this; }; return x; }
->timminsi : () => konganensis
+>timminsi : () => macrorhinos.konganensis
 >macrorhinos : macrorhinos
->konganensis : konganensis
->x : konganensis
+>konganensis : macrorhinos.konganensis
+>x : macrorhinos.konganensis
 >macrorhinos : macrorhinos
->konganensis : konganensis
+>konganensis : macrorhinos.konganensis
 >() => { var y = this; } : () => void
 >y : peninsulae
 >this : peninsulae
->x : konganensis
+>x : macrorhinos.konganensis
 
         sordidus(): rendalli.moojeni<macrorhinos.konganensis, gabriellae.echinatus> { var x: rendalli.moojeni<macrorhinos.konganensis, gabriellae.echinatus>; () => { var y = this; }; return x; }
->sordidus : () => moojeni<konganensis, echinatus>
+>sordidus : () => rendalli.moojeni<macrorhinos.konganensis, gabriellae.echinatus>
 >rendalli : rendalli
->moojeni : moojeni<T0, T1>
+>moojeni : rendalli.moojeni<T0, T1>
 >macrorhinos : macrorhinos
->konganensis : konganensis
+>konganensis : macrorhinos.konganensis
 >gabriellae : gabriellae
->echinatus : echinatus
->x : moojeni<konganensis, echinatus>
+>echinatus : gabriellae.echinatus
+>x : rendalli.moojeni<macrorhinos.konganensis, gabriellae.echinatus>
 >rendalli : rendalli
->moojeni : moojeni<T0, T1>
+>moojeni : rendalli.moojeni<T0, T1>
 >macrorhinos : macrorhinos
->konganensis : konganensis
+>konganensis : macrorhinos.konganensis
 >gabriellae : gabriellae
->echinatus : echinatus
+>echinatus : gabriellae.echinatus
 >() => { var y = this; } : () => void
 >y : peninsulae
 >this : peninsulae
->x : moojeni<konganensis, echinatus>
+>x : rendalli.moojeni<macrorhinos.konganensis, gabriellae.echinatus>
 
         telfordi(): trivirgatus.oconnelli { var x: trivirgatus.oconnelli; () => { var y = this; }; return x; }
->telfordi : () => oconnelli
+>telfordi : () => trivirgatus.oconnelli
 >trivirgatus : trivirgatus
->oconnelli : oconnelli
->x : oconnelli
+>oconnelli : trivirgatus.oconnelli
+>x : trivirgatus.oconnelli
 >trivirgatus : trivirgatus
->oconnelli : oconnelli
+>oconnelli : trivirgatus.oconnelli
 >() => { var y = this; } : () => void
 >y : peninsulae
 >this : peninsulae
->x : oconnelli
+>x : trivirgatus.oconnelli
 
         cavernarum(): minutus.inez<gabriellae.echinatus, argurus.luctuosa> { var x: minutus.inez<gabriellae.echinatus, argurus.luctuosa>; () => { var y = this; }; return x; }
->cavernarum : () => inez<echinatus, luctuosa>
+>cavernarum : () => minutus.inez<gabriellae.echinatus, luctuosa>
 >minutus : minutus
->inez : inez<T0, T1>
+>inez : minutus.inez<T0, T1>
 >gabriellae : gabriellae
->echinatus : echinatus
+>echinatus : gabriellae.echinatus
 >argurus : argurus
 >luctuosa : luctuosa
->x : inez<echinatus, luctuosa>
+>x : minutus.inez<gabriellae.echinatus, luctuosa>
 >minutus : minutus
->inez : inez<T0, T1>
+>inez : minutus.inez<T0, T1>
 >gabriellae : gabriellae
->echinatus : echinatus
+>echinatus : gabriellae.echinatus
 >argurus : argurus
 >luctuosa : luctuosa
 >() => { var y = this; } : () => void
 >y : peninsulae
 >this : peninsulae
->x : inez<echinatus, luctuosa>
+>x : minutus.inez<gabriellae.echinatus, luctuosa>
     }
 }
 module argurus {
->argurus : typeof argurus
+>argurus : argurus
 
     export class netscheri<T0, T1> {
 >netscheri : netscheri<T0, T1>
@@ -12456,316 +12456,316 @@ module argurus {
 >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 : () => caucasica<crenulata<falconeri, marcanoi>, kaiseri>
+>gravis : () => nigra.caucasica<rendalli.crenulata<trivirgatus.falconeri, howi.marcanoi>, dogramacii.kaiseri>
 >nigra : nigra
->caucasica : caucasica<T0, T1>
+>caucasica : nigra.caucasica<T0, T1>
 >rendalli : rendalli
->crenulata : crenulata<T0, T1>
+>crenulata : rendalli.crenulata<T0, T1>
 >trivirgatus : trivirgatus
->falconeri : falconeri
+>falconeri : trivirgatus.falconeri
 >howi : howi
->marcanoi : marcanoi
+>marcanoi : howi.marcanoi
 >dogramacii : dogramacii
->kaiseri : kaiseri
->x : caucasica<crenulata<falconeri, marcanoi>, kaiseri>
+>kaiseri : dogramacii.kaiseri
+>x : nigra.caucasica<rendalli.crenulata<trivirgatus.falconeri, howi.marcanoi>, dogramacii.kaiseri>
 >nigra : nigra
->caucasica : caucasica<T0, T1>
+>caucasica : nigra.caucasica<T0, T1>
 >rendalli : rendalli
->crenulata : crenulata<T0, T1>
+>crenulata : rendalli.crenulata<T0, T1>
 >trivirgatus : trivirgatus
->falconeri : falconeri
+>falconeri : trivirgatus.falconeri
 >howi : howi
->marcanoi : marcanoi
+>marcanoi : howi.marcanoi
 >dogramacii : dogramacii
->kaiseri : kaiseri
+>kaiseri : dogramacii.kaiseri
 >() => { var y = this; } : () => void
 >y : netscheri<T0, T1>
 >this : netscheri<T0, T1>
->x : caucasica<crenulata<falconeri, marcanoi>, kaiseri>
+>x : nigra.caucasica<rendalli.crenulata<trivirgatus.falconeri, howi.marcanoi>, dogramacii.kaiseri>
 
         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 : () => lasiurus<marcanoi, ciliolabrum<megalonyx, minutilla>>
+>ruschii : () => imperfecta.lasiurus<howi.marcanoi, imperfecta.ciliolabrum<Lanthanum.megalonyx, petrophilus.minutilla>>
 >imperfecta : imperfecta
->lasiurus : lasiurus<T0, T1>
+>lasiurus : imperfecta.lasiurus<T0, T1>
 >howi : howi
->marcanoi : marcanoi
+>marcanoi : howi.marcanoi
 >imperfecta : imperfecta
->ciliolabrum : ciliolabrum<T0, T1>
+>ciliolabrum : imperfecta.ciliolabrum<T0, T1>
 >Lanthanum : Lanthanum
->megalonyx : megalonyx
+>megalonyx : Lanthanum.megalonyx
 >petrophilus : petrophilus
->minutilla : minutilla
->x : lasiurus<marcanoi, ciliolabrum<megalonyx, minutilla>>
+>minutilla : petrophilus.minutilla
+>x : imperfecta.lasiurus<howi.marcanoi, imperfecta.ciliolabrum<Lanthanum.megalonyx, petrophilus.minutilla>>
 >imperfecta : imperfecta
->lasiurus : lasiurus<T0, T1>
+>lasiurus : imperfecta.lasiurus<T0, T1>
 >howi : howi
->marcanoi : marcanoi
+>marcanoi : howi.marcanoi
 >imperfecta : imperfecta
->ciliolabrum : ciliolabrum<T0, T1>
+>ciliolabrum : imperfecta.ciliolabrum<T0, T1>
 >Lanthanum : Lanthanum
->megalonyx : megalonyx
+>megalonyx : Lanthanum.megalonyx
 >petrophilus : petrophilus
->minutilla : minutilla
+>minutilla : petrophilus.minutilla
 >() => { var y = this; } : () => void
 >y : netscheri<T0, T1>
 >this : netscheri<T0, T1>
->x : lasiurus<marcanoi, ciliolabrum<megalonyx, minutilla>>
+>x : imperfecta.lasiurus<howi.marcanoi, imperfecta.ciliolabrum<Lanthanum.megalonyx, petrophilus.minutilla>>
 
         tricuspidatus(): lavali.wilsoni { var x: lavali.wilsoni; () => { var y = this; }; return x; }
->tricuspidatus : () => wilsoni
+>tricuspidatus : () => lavali.wilsoni
 >lavali : lavali
->wilsoni : wilsoni
->x : wilsoni
+>wilsoni : lavali.wilsoni
+>x : lavali.wilsoni
 >lavali : lavali
->wilsoni : wilsoni
+>wilsoni : lavali.wilsoni
 >() => { var y = this; } : () => void
 >y : netscheri<T0, T1>
 >this : netscheri<T0, T1>
->x : wilsoni
+>x : lavali.wilsoni
 
         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 : () => siberu<thalia<schlegeli, sumatrana>, abidi<foina, peninsulae>>
+>fernandezi : () => dammermani.siberu<nigra.thalia<lutreolus.schlegeli, julianae.sumatrana>, panglima.abidi<lutreolus.foina, peninsulae>>
 >dammermani : dammermani
->siberu : siberu<T0, T1>
+>siberu : dammermani.siberu<T0, T1>
 >nigra : nigra
->thalia : thalia<T0, T1>
+>thalia : nigra.thalia<T0, T1>
 >lutreolus : lutreolus
->schlegeli : schlegeli
+>schlegeli : lutreolus.schlegeli
 >julianae : julianae
->sumatrana : sumatrana
+>sumatrana : julianae.sumatrana
 >panglima : panglima
->abidi : abidi<T0, T1>
+>abidi : panglima.abidi<T0, T1>
 >lutreolus : lutreolus
->foina : foina
+>foina : lutreolus.foina
 >argurus : argurus
 >peninsulae : peninsulae
->x : siberu<thalia<schlegeli, sumatrana>, abidi<foina, peninsulae>>
+>x : dammermani.siberu<nigra.thalia<lutreolus.schlegeli, julianae.sumatrana>, panglima.abidi<lutreolus.foina, peninsulae>>
 >dammermani : dammermani
->siberu : siberu<T0, T1>
+>siberu : dammermani.siberu<T0, T1>
 >nigra : nigra
->thalia : thalia<T0, T1>
+>thalia : nigra.thalia<T0, T1>
 >lutreolus : lutreolus
->schlegeli : schlegeli
+>schlegeli : lutreolus.schlegeli
 >julianae : julianae
->sumatrana : sumatrana
+>sumatrana : julianae.sumatrana
 >panglima : panglima
->abidi : abidi<T0, T1>
+>abidi : panglima.abidi<T0, T1>
 >lutreolus : lutreolus
->foina : foina
+>foina : lutreolus.foina
 >argurus : argurus
 >peninsulae : peninsulae
 >() => { var y = this; } : () => void
 >y : netscheri<T0, T1>
 >this : netscheri<T0, T1>
->x : siberu<thalia<schlegeli, sumatrana>, abidi<foina, peninsulae>>
+>x : dammermani.siberu<nigra.thalia<lutreolus.schlegeli, julianae.sumatrana>, panglima.abidi<lutreolus.foina, peninsulae>>
 
         colletti(): samarensis.pallidus { var x: samarensis.pallidus; () => { var y = this; }; return x; }
->colletti : () => pallidus
+>colletti : () => samarensis.pallidus
 >samarensis : samarensis
->pallidus : pallidus
->x : pallidus
+>pallidus : samarensis.pallidus
+>x : samarensis.pallidus
 >samarensis : samarensis
->pallidus : pallidus
+>pallidus : samarensis.pallidus
 >() => { var y = this; } : () => void
 >y : netscheri<T0, T1>
 >this : netscheri<T0, T1>
->x : pallidus
+>x : samarensis.pallidus
 
         microbullatus(): lutreolus.schlegeli { var x: lutreolus.schlegeli; () => { var y = this; }; return x; }
->microbullatus : () => schlegeli
+>microbullatus : () => lutreolus.schlegeli
 >lutreolus : lutreolus
->schlegeli : schlegeli
->x : schlegeli
+>schlegeli : lutreolus.schlegeli
+>x : lutreolus.schlegeli
 >lutreolus : lutreolus
->schlegeli : schlegeli
+>schlegeli : lutreolus.schlegeli
 >() => { var y = this; } : () => void
 >y : netscheri<T0, T1>
 >this : netscheri<T0, T1>
->x : schlegeli
+>x : lutreolus.schlegeli
 
         eburneae(): chrysaeolus.sarasinorum<macrorhinos.konganensis, julianae.acariensis> { var x: chrysaeolus.sarasinorum<macrorhinos.konganensis, julianae.acariensis>; () => { var y = this; }; return x; }
->eburneae : () => sarasinorum<konganensis, acariensis>
+>eburneae : () => chrysaeolus.sarasinorum<macrorhinos.konganensis, julianae.acariensis>
 >chrysaeolus : chrysaeolus
->sarasinorum : sarasinorum<T0, T1>
+>sarasinorum : chrysaeolus.sarasinorum<T0, T1>
 >macrorhinos : macrorhinos
->konganensis : konganensis
+>konganensis : macrorhinos.konganensis
 >julianae : julianae
->acariensis : acariensis
->x : sarasinorum<konganensis, acariensis>
+>acariensis : julianae.acariensis
+>x : chrysaeolus.sarasinorum<macrorhinos.konganensis, julianae.acariensis>
 >chrysaeolus : chrysaeolus
->sarasinorum : sarasinorum<T0, T1>
+>sarasinorum : chrysaeolus.sarasinorum<T0, T1>
 >macrorhinos : macrorhinos
->konganensis : konganensis
+>konganensis : macrorhinos.konganensis
 >julianae : julianae
->acariensis : acariensis
+>acariensis : julianae.acariensis
 >() => { var y = this; } : () => void
 >y : netscheri<T0, T1>
 >this : netscheri<T0, T1>
->x : sarasinorum<konganensis, acariensis>
+>x : chrysaeolus.sarasinorum<macrorhinos.konganensis, julianae.acariensis>
 
         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, fundatus<carolinensis, daphaenodon>>
+>tatei : () => pygmaea<oreas, panglima.fundatus<quasiater.carolinensis, macrorhinos.daphaenodon>>
 >argurus : argurus
 >pygmaea : pygmaea<T0, T1>
 >argurus : argurus
 >oreas : oreas
 >panglima : panglima
->fundatus : fundatus<T0, T1>
+>fundatus : panglima.fundatus<T0, T1>
 >quasiater : quasiater
->carolinensis : carolinensis
+>carolinensis : quasiater.carolinensis
 >macrorhinos : macrorhinos
->daphaenodon : daphaenodon
->x : pygmaea<oreas, fundatus<carolinensis, daphaenodon>>
+>daphaenodon : macrorhinos.daphaenodon
+>x : pygmaea<oreas, panglima.fundatus<quasiater.carolinensis, macrorhinos.daphaenodon>>
 >argurus : argurus
 >pygmaea : pygmaea<T0, T1>
 >argurus : argurus
 >oreas : oreas
 >panglima : panglima
->fundatus : fundatus<T0, T1>
+>fundatus : panglima.fundatus<T0, T1>
 >quasiater : quasiater
->carolinensis : carolinensis
+>carolinensis : quasiater.carolinensis
 >macrorhinos : macrorhinos
->daphaenodon : daphaenodon
+>daphaenodon : macrorhinos.daphaenodon
 >() => { var y = this; } : () => void
 >y : netscheri<T0, T1>
 >this : netscheri<T0, T1>
->x : pygmaea<oreas, fundatus<carolinensis, daphaenodon>>
+>x : pygmaea<oreas, panglima.fundatus<quasiater.carolinensis, macrorhinos.daphaenodon>>
 
         millardi(): sagitta.walkeri { var x: sagitta.walkeri; () => { var y = this; }; return x; }
->millardi : () => walkeri
+>millardi : () => sagitta.walkeri
 >sagitta : sagitta
->walkeri : walkeri
->x : walkeri
+>walkeri : sagitta.walkeri
+>x : sagitta.walkeri
 >sagitta : sagitta
->walkeri : walkeri
+>walkeri : sagitta.walkeri
 >() => { var y = this; } : () => void
 >y : netscheri<T0, T1>
 >this : netscheri<T0, T1>
->x : walkeri
+>x : sagitta.walkeri
 
         pruinosus(): trivirgatus.falconeri { var x: trivirgatus.falconeri; () => { var y = this; }; return x; }
->pruinosus : () => falconeri
+>pruinosus : () => trivirgatus.falconeri
 >trivirgatus : trivirgatus
->falconeri : falconeri
->x : falconeri
+>falconeri : trivirgatus.falconeri
+>x : trivirgatus.falconeri
 >trivirgatus : trivirgatus
->falconeri : falconeri
+>falconeri : trivirgatus.falconeri
 >() => { var y = this; } : () => void
 >y : netscheri<T0, T1>
 >this : netscheri<T0, T1>
->x : falconeri
+>x : trivirgatus.falconeri
 
         delator(): argurus.netscheri<dogramacii.kaiseri, lavali.lepturus> { var x: argurus.netscheri<dogramacii.kaiseri, lavali.lepturus>; () => { var y = this; }; return x; }
->delator : () => netscheri<kaiseri, lepturus>
+>delator : () => netscheri<dogramacii.kaiseri, lavali.lepturus>
 >argurus : argurus
 >netscheri : netscheri<T0, T1>
 >dogramacii : dogramacii
->kaiseri : kaiseri
+>kaiseri : dogramacii.kaiseri
 >lavali : lavali
->lepturus : lepturus
->x : netscheri<kaiseri, lepturus>
+>lepturus : lavali.lepturus
+>x : netscheri<dogramacii.kaiseri, lavali.lepturus>
 >argurus : argurus
 >netscheri : netscheri<T0, T1>
 >dogramacii : dogramacii
->kaiseri : kaiseri
+>kaiseri : dogramacii.kaiseri
 >lavali : lavali
->lepturus : lepturus
+>lepturus : lavali.lepturus
 >() => { var y = this; } : () => void
 >y : netscheri<T0, T1>
 >this : netscheri<T0, T1>
->x : netscheri<kaiseri, lepturus>
+>x : netscheri<dogramacii.kaiseri, lavali.lepturus>
 
         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 : () => tumidifrons<angulatus<coludo<carolinensis, portoricensis>, minutilla>, acariensis>
+>nyikae : () => trivirgatus.tumidifrons<howi.angulatus<howi.coludo<quasiater.carolinensis, minutus.portoricensis>, petrophilus.minutilla>, julianae.acariensis>
 >trivirgatus : trivirgatus
->tumidifrons : tumidifrons<T0, T1>
+>tumidifrons : trivirgatus.tumidifrons<T0, T1>
 >howi : howi
->angulatus : angulatus<T0, T1>
+>angulatus : howi.angulatus<T0, T1>
 >howi : howi
->coludo : coludo<T0, T1>
+>coludo : howi.coludo<T0, T1>
 >quasiater : quasiater
->carolinensis : carolinensis
+>carolinensis : quasiater.carolinensis
 >minutus : minutus
->portoricensis : portoricensis
+>portoricensis : minutus.portoricensis
 >petrophilus : petrophilus
->minutilla : minutilla
+>minutilla : petrophilus.minutilla
 >julianae : julianae
->acariensis : acariensis
->x : tumidifrons<angulatus<coludo<carolinensis, portoricensis>, minutilla>, acariensis>
+>acariensis : julianae.acariensis
+>x : trivirgatus.tumidifrons<howi.angulatus<howi.coludo<quasiater.carolinensis, minutus.portoricensis>, petrophilus.minutilla>, julianae.acariensis>
 >trivirgatus : trivirgatus
->tumidifrons : tumidifrons<T0, T1>
+>tumidifrons : trivirgatus.tumidifrons<T0, T1>
 >howi : howi
->angulatus : angulatus<T0, T1>
+>angulatus : howi.angulatus<T0, T1>
 >howi : howi
->coludo : coludo<T0, T1>
+>coludo : howi.coludo<T0, T1>
 >quasiater : quasiater
->carolinensis : carolinensis
+>carolinensis : quasiater.carolinensis
 >minutus : minutus
->portoricensis : portoricensis
+>portoricensis : minutus.portoricensis
 >petrophilus : petrophilus
->minutilla : minutilla
+>minutilla : petrophilus.minutilla
 >julianae : julianae
->acariensis : acariensis
+>acariensis : julianae.acariensis
 >() => { var y = this; } : () => void
 >y : netscheri<T0, T1>
 >this : netscheri<T0, T1>
->x : tumidifrons<angulatus<coludo<carolinensis, portoricensis>, minutilla>, acariensis>
+>x : trivirgatus.tumidifrons<howi.angulatus<howi.coludo<quasiater.carolinensis, minutus.portoricensis>, petrophilus.minutilla>, julianae.acariensis>
 
         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 : () => amphibius<inez<moojeni<amphibius<falconeri, psilurus>, echinatus>, aurata>, ciliolabrum<carolinensis, beisa>>
+>ruemmleri : () => panglima.amphibius<minutus.inez<rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>, dogramacii.aurata>, imperfecta.ciliolabrum<quasiater.carolinensis, lavali.beisa>>
 >panglima : panglima
->amphibius : amphibius<T0, T1>
+>amphibius : panglima.amphibius<T0, T1>
 >minutus : minutus
->inez : inez<T0, T1>
+>inez : minutus.inez<T0, T1>
 >rendalli : rendalli
->moojeni : moojeni<T0, T1>
+>moojeni : rendalli.moojeni<T0, T1>
 >panglima : panglima
->amphibius : amphibius<T0, T1>
+>amphibius : panglima.amphibius<T0, T1>
 >trivirgatus : trivirgatus
->falconeri : falconeri
+>falconeri : trivirgatus.falconeri
 >caurinus : caurinus
->psilurus : psilurus
+>psilurus : caurinus.psilurus
 >gabriellae : gabriellae
->echinatus : echinatus
+>echinatus : gabriellae.echinatus
 >dogramacii : dogramacii
->aurata : aurata
+>aurata : dogramacii.aurata
 >imperfecta : imperfecta
->ciliolabrum : ciliolabrum<T0, T1>
+>ciliolabrum : imperfecta.ciliolabrum<T0, T1>
 >quasiater : quasiater
->carolinensis : carolinensis
+>carolinensis : quasiater.carolinensis
 >lavali : lavali
->beisa : beisa
->x : amphibius<inez<moojeni<amphibius<falconeri, psilurus>, echinatus>, aurata>, ciliolabrum<carolinensis, beisa>>
+>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 : panglima
->amphibius : amphibius<T0, T1>
+>amphibius : panglima.amphibius<T0, T1>
 >minutus : minutus
->inez : inez<T0, T1>
+>inez : minutus.inez<T0, T1>
 >rendalli : rendalli
->moojeni : moojeni<T0, T1>
+>moojeni : rendalli.moojeni<T0, T1>
 >panglima : panglima
->amphibius : amphibius<T0, T1>
+>amphibius : panglima.amphibius<T0, T1>
 >trivirgatus : trivirgatus
->falconeri : falconeri
+>falconeri : trivirgatus.falconeri
 >caurinus : caurinus
->psilurus : psilurus
+>psilurus : caurinus.psilurus
 >gabriellae : gabriellae
->echinatus : echinatus
+>echinatus : gabriellae.echinatus
 >dogramacii : dogramacii
->aurata : aurata
+>aurata : dogramacii.aurata
 >imperfecta : imperfecta
->ciliolabrum : ciliolabrum<T0, T1>
+>ciliolabrum : imperfecta.ciliolabrum<T0, T1>
 >quasiater : quasiater
->carolinensis : carolinensis
+>carolinensis : quasiater.carolinensis
 >lavali : lavali
->beisa : beisa
+>beisa : lavali.beisa
 >() => { var y = this; } : () => void
 >y : netscheri<T0, T1>
 >this : netscheri<T0, T1>
->x : amphibius<inez<moojeni<amphibius<falconeri, psilurus>, echinatus>, aurata>, ciliolabrum<carolinensis, beisa>>
+>x : panglima.amphibius<minutus.inez<rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>, dogramacii.aurata>, imperfecta.ciliolabrum<quasiater.carolinensis, lavali.beisa>>
     }
 }
 module ruatanica {
->ruatanica : typeof ruatanica
+>ruatanica : ruatanica
 
     export class Praseodymium<T0, T1> extends ruatanica.hector<lutreolus.punicus, gabriellae.amicus> {
 >Praseodymium : Praseodymium<T0, T1>
@@ -12774,427 +12774,427 @@ module ruatanica {
 >ruatanica : ruatanica
 >hector : hector<T0, T1>
 >lutreolus : lutreolus
->punicus : punicus
+>punicus : lutreolus.punicus
 >gabriellae : gabriellae
->amicus : amicus
+>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 : () => amphibius<ciliolabrum<carolinensis, beisa>, dauricus<americanus, caniventer>>
+>clara : () => panglima.amphibius<imperfecta.ciliolabrum<quasiater.carolinensis, lavali.beisa>, argurus.dauricus<americanus, rionegrensis.caniventer>>
 >panglima : panglima
->amphibius : amphibius<T0, T1>
+>amphibius : panglima.amphibius<T0, T1>
 >imperfecta : imperfecta
->ciliolabrum : ciliolabrum<T0, T1>
+>ciliolabrum : imperfecta.ciliolabrum<T0, T1>
 >quasiater : quasiater
->carolinensis : carolinensis
+>carolinensis : quasiater.carolinensis
 >lavali : lavali
->beisa : beisa
+>beisa : lavali.beisa
 >argurus : argurus
->dauricus : dauricus<T0, T1>
+>dauricus : argurus.dauricus<T0, T1>
 >ruatanica : ruatanica
 >americanus : americanus
 >rionegrensis : rionegrensis
->caniventer : caniventer
->x : amphibius<ciliolabrum<carolinensis, beisa>, dauricus<americanus, caniventer>>
+>caniventer : rionegrensis.caniventer
+>x : panglima.amphibius<imperfecta.ciliolabrum<quasiater.carolinensis, lavali.beisa>, argurus.dauricus<americanus, rionegrensis.caniventer>>
 >panglima : panglima
->amphibius : amphibius<T0, T1>
+>amphibius : panglima.amphibius<T0, T1>
 >imperfecta : imperfecta
->ciliolabrum : ciliolabrum<T0, T1>
+>ciliolabrum : imperfecta.ciliolabrum<T0, T1>
 >quasiater : quasiater
->carolinensis : carolinensis
+>carolinensis : quasiater.carolinensis
 >lavali : lavali
->beisa : beisa
+>beisa : lavali.beisa
 >argurus : argurus
->dauricus : dauricus<T0, T1>
+>dauricus : argurus.dauricus<T0, T1>
 >ruatanica : ruatanica
 >americanus : americanus
 >rionegrensis : rionegrensis
->caniventer : caniventer
+>caniventer : rionegrensis.caniventer
 >() => { var y = this; } : () => void
 >y : Praseodymium<T0, T1>
 >this : Praseodymium<T0, T1>
->x : amphibius<ciliolabrum<carolinensis, beisa>, dauricus<americanus, caniventer>>
+>x : panglima.amphibius<imperfecta.ciliolabrum<quasiater.carolinensis, lavali.beisa>, argurus.dauricus<americanus, rionegrensis.caniventer>>
 
         spectabilis(): petrophilus.sodyi<rionegrensis.caniventer, quasiater.carolinensis> { var x: petrophilus.sodyi<rionegrensis.caniventer, quasiater.carolinensis>; () => { var y = this; }; return x; }
->spectabilis : () => sodyi<caniventer, carolinensis>
+>spectabilis : () => petrophilus.sodyi<rionegrensis.caniventer, quasiater.carolinensis>
 >petrophilus : petrophilus
->sodyi : sodyi<T0, T1>
+>sodyi : petrophilus.sodyi<T0, T1>
 >rionegrensis : rionegrensis
->caniventer : caniventer
+>caniventer : rionegrensis.caniventer
 >quasiater : quasiater
->carolinensis : carolinensis
->x : sodyi<caniventer, carolinensis>
+>carolinensis : quasiater.carolinensis
+>x : petrophilus.sodyi<rionegrensis.caniventer, quasiater.carolinensis>
 >petrophilus : petrophilus
->sodyi : sodyi<T0, T1>
+>sodyi : petrophilus.sodyi<T0, T1>
 >rionegrensis : rionegrensis
->caniventer : caniventer
+>caniventer : rionegrensis.caniventer
 >quasiater : quasiater
->carolinensis : carolinensis
+>carolinensis : quasiater.carolinensis
 >() => { var y = this; } : () => void
 >y : Praseodymium<T0, T1>
 >this : Praseodymium<T0, T1>
->x : sodyi<caniventer, carolinensis>
+>x : petrophilus.sodyi<rionegrensis.caniventer, quasiater.carolinensis>
 
         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 : () => lotor<linulus<kaiseri, portoricensis>, lepturus>
+>kamensis : () => trivirgatus.lotor<panamensis.linulus<dogramacii.kaiseri, minutus.portoricensis>, lavali.lepturus>
 >trivirgatus : trivirgatus
->lotor : lotor<T0, T1>
+>lotor : trivirgatus.lotor<T0, T1>
 >panamensis : panamensis
->linulus : linulus<T0, T1>
+>linulus : panamensis.linulus<T0, T1>
 >dogramacii : dogramacii
->kaiseri : kaiseri
+>kaiseri : dogramacii.kaiseri
 >minutus : minutus
->portoricensis : portoricensis
+>portoricensis : minutus.portoricensis
 >lavali : lavali
->lepturus : lepturus
->x : lotor<linulus<kaiseri, portoricensis>, lepturus>
+>lepturus : lavali.lepturus
+>x : trivirgatus.lotor<panamensis.linulus<dogramacii.kaiseri, minutus.portoricensis>, lavali.lepturus>
 >trivirgatus : trivirgatus
->lotor : lotor<T0, T1>
+>lotor : trivirgatus.lotor<T0, T1>
 >panamensis : panamensis
->linulus : linulus<T0, T1>
+>linulus : panamensis.linulus<T0, T1>
 >dogramacii : dogramacii
->kaiseri : kaiseri
+>kaiseri : dogramacii.kaiseri
 >minutus : minutus
->portoricensis : portoricensis
+>portoricensis : minutus.portoricensis
 >lavali : lavali
->lepturus : lepturus
+>lepturus : lavali.lepturus
 >() => { var y = this; } : () => void
 >y : Praseodymium<T0, T1>
 >this : Praseodymium<T0, T1>
->x : lotor<linulus<kaiseri, portoricensis>, lepturus>
+>x : trivirgatus.lotor<panamensis.linulus<dogramacii.kaiseri, minutus.portoricensis>, lavali.lepturus>
 
         ruddi(): lutreolus.foina { var x: lutreolus.foina; () => { var y = this; }; return x; }
->ruddi : () => foina
+>ruddi : () => lutreolus.foina
 >lutreolus : lutreolus
->foina : foina
->x : foina
+>foina : lutreolus.foina
+>x : lutreolus.foina
 >lutreolus : lutreolus
->foina : foina
+>foina : lutreolus.foina
 >() => { var y = this; } : () => void
 >y : Praseodymium<T0, T1>
 >this : Praseodymium<T0, T1>
->x : foina
+>x : lutreolus.foina
 
         bartelsii(): julianae.sumatrana { var x: julianae.sumatrana; () => { var y = this; }; return x; }
->bartelsii : () => sumatrana
+>bartelsii : () => julianae.sumatrana
 >julianae : julianae
->sumatrana : sumatrana
->x : sumatrana
+>sumatrana : julianae.sumatrana
+>x : julianae.sumatrana
 >julianae : julianae
->sumatrana : sumatrana
+>sumatrana : julianae.sumatrana
 >() => { var y = this; } : () => void
 >y : Praseodymium<T0, T1>
 >this : Praseodymium<T0, T1>
->x : sumatrana
+>x : julianae.sumatrana
 
         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 : () => siberu<lasiurus<foina, melanops>, ciliolabrum<megalonyx, minutilla>>
+>yerbabuenae : () => dammermani.siberu<imperfecta.lasiurus<lutreolus.foina, dammermani.melanops>, imperfecta.ciliolabrum<Lanthanum.megalonyx, petrophilus.minutilla>>
 >dammermani : dammermani
->siberu : siberu<T0, T1>
+>siberu : dammermani.siberu<T0, T1>
 >imperfecta : imperfecta
->lasiurus : lasiurus<T0, T1>
+>lasiurus : imperfecta.lasiurus<T0, T1>
 >lutreolus : lutreolus
->foina : foina
+>foina : lutreolus.foina
 >dammermani : dammermani
->melanops : melanops
+>melanops : dammermani.melanops
 >imperfecta : imperfecta
->ciliolabrum : ciliolabrum<T0, T1>
+>ciliolabrum : imperfecta.ciliolabrum<T0, T1>
 >Lanthanum : Lanthanum
->megalonyx : megalonyx
+>megalonyx : Lanthanum.megalonyx
 >petrophilus : petrophilus
->minutilla : minutilla
->x : siberu<lasiurus<foina, melanops>, ciliolabrum<megalonyx, minutilla>>
+>minutilla : petrophilus.minutilla
+>x : dammermani.siberu<imperfecta.lasiurus<lutreolus.foina, dammermani.melanops>, imperfecta.ciliolabrum<Lanthanum.megalonyx, petrophilus.minutilla>>
 >dammermani : dammermani
->siberu : siberu<T0, T1>
+>siberu : dammermani.siberu<T0, T1>
 >imperfecta : imperfecta
->lasiurus : lasiurus<T0, T1>
+>lasiurus : imperfecta.lasiurus<T0, T1>
 >lutreolus : lutreolus
->foina : foina
+>foina : lutreolus.foina
 >dammermani : dammermani
->melanops : melanops
+>melanops : dammermani.melanops
 >imperfecta : imperfecta
->ciliolabrum : ciliolabrum<T0, T1>
+>ciliolabrum : imperfecta.ciliolabrum<T0, T1>
 >Lanthanum : Lanthanum
->megalonyx : megalonyx
+>megalonyx : Lanthanum.megalonyx
 >petrophilus : petrophilus
->minutilla : minutilla
+>minutilla : petrophilus.minutilla
 >() => { var y = this; } : () => void
 >y : Praseodymium<T0, T1>
 >this : Praseodymium<T0, T1>
->x : siberu<lasiurus<foina, melanops>, ciliolabrum<megalonyx, minutilla>>
+>x : dammermani.siberu<imperfecta.lasiurus<lutreolus.foina, dammermani.melanops>, imperfecta.ciliolabrum<Lanthanum.megalonyx, petrophilus.minutilla>>
 
         davidi(): trivirgatus.mixtus<provocax.melanoleuca, sagitta.stolzmanni> { var x: trivirgatus.mixtus<provocax.melanoleuca, sagitta.stolzmanni>; () => { var y = this; }; return x; }
->davidi : () => mixtus<melanoleuca, stolzmanni>
+>davidi : () => trivirgatus.mixtus<provocax.melanoleuca, sagitta.stolzmanni>
 >trivirgatus : trivirgatus
->mixtus : mixtus<T0, T1>
+>mixtus : trivirgatus.mixtus<T0, T1>
 >provocax : provocax
->melanoleuca : melanoleuca
+>melanoleuca : provocax.melanoleuca
 >sagitta : sagitta
->stolzmanni : stolzmanni
->x : mixtus<melanoleuca, stolzmanni>
+>stolzmanni : sagitta.stolzmanni
+>x : trivirgatus.mixtus<provocax.melanoleuca, sagitta.stolzmanni>
 >trivirgatus : trivirgatus
->mixtus : mixtus<T0, T1>
+>mixtus : trivirgatus.mixtus<T0, T1>
 >provocax : provocax
->melanoleuca : melanoleuca
+>melanoleuca : provocax.melanoleuca
 >sagitta : sagitta
->stolzmanni : stolzmanni
+>stolzmanni : sagitta.stolzmanni
 >() => { var y = this; } : () => void
 >y : Praseodymium<T0, T1>
 >this : Praseodymium<T0, T1>
->x : mixtus<melanoleuca, stolzmanni>
+>x : trivirgatus.mixtus<provocax.melanoleuca, sagitta.stolzmanni>
 
         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 : () => wetmorei<lasiurus<amphibius<uralensis, klossii<nudicaudus, aurata>>, leptoceros<punicus, arboreus<carolinensis, caniventer>>>, konganensis>
+>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 : argurus
->wetmorei : wetmorei<T0, T1>
+>wetmorei : argurus.wetmorei<T0, T1>
 >imperfecta : imperfecta
->lasiurus : lasiurus<T0, T1>
+>lasiurus : imperfecta.lasiurus<T0, T1>
 >panglima : panglima
->amphibius : amphibius<T0, T1>
+>amphibius : panglima.amphibius<T0, T1>
 >patas : patas
->uralensis : uralensis
+>uralensis : patas.uralensis
 >gabriellae : gabriellae
->klossii : klossii<T0, T1>
+>klossii : gabriellae.klossii<T0, T1>
 >julianae : julianae
->nudicaudus : nudicaudus
+>nudicaudus : julianae.nudicaudus
 >dogramacii : dogramacii
->aurata : aurata
+>aurata : dogramacii.aurata
 >sagitta : sagitta
->leptoceros : leptoceros<T0, T1>
+>leptoceros : sagitta.leptoceros<T0, T1>
 >lutreolus : lutreolus
->punicus : punicus
+>punicus : lutreolus.punicus
 >daubentonii : daubentonii
->arboreus : arboreus<T0, T1>
+>arboreus : daubentonii.arboreus<T0, T1>
 >quasiater : quasiater
->carolinensis : carolinensis
+>carolinensis : quasiater.carolinensis
 >rionegrensis : rionegrensis
->caniventer : caniventer
+>caniventer : rionegrensis.caniventer
 >macrorhinos : macrorhinos
->konganensis : konganensis
->x : wetmorei<lasiurus<amphibius<uralensis, klossii<nudicaudus, aurata>>, leptoceros<punicus, arboreus<carolinensis, caniventer>>>, konganensis>
+>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 : argurus
->wetmorei : wetmorei<T0, T1>
+>wetmorei : argurus.wetmorei<T0, T1>
 >imperfecta : imperfecta
->lasiurus : lasiurus<T0, T1>
+>lasiurus : imperfecta.lasiurus<T0, T1>
 >panglima : panglima
->amphibius : amphibius<T0, T1>
+>amphibius : panglima.amphibius<T0, T1>
 >patas : patas
->uralensis : uralensis
+>uralensis : patas.uralensis
 >gabriellae : gabriellae
->klossii : klossii<T0, T1>
+>klossii : gabriellae.klossii<T0, T1>
 >julianae : julianae
->nudicaudus : nudicaudus
+>nudicaudus : julianae.nudicaudus
 >dogramacii : dogramacii
->aurata : aurata
+>aurata : dogramacii.aurata
 >sagitta : sagitta
->leptoceros : leptoceros<T0, T1>
+>leptoceros : sagitta.leptoceros<T0, T1>
 >lutreolus : lutreolus
->punicus : punicus
+>punicus : lutreolus.punicus
 >daubentonii : daubentonii
->arboreus : arboreus<T0, T1>
+>arboreus : daubentonii.arboreus<T0, T1>
 >quasiater : quasiater
->carolinensis : carolinensis
+>carolinensis : quasiater.carolinensis
 >rionegrensis : rionegrensis
->caniventer : caniventer
+>caniventer : rionegrensis.caniventer
 >macrorhinos : macrorhinos
->konganensis : konganensis
+>konganensis : macrorhinos.konganensis
 >() => { var y = this; } : () => void
 >y : Praseodymium<T0, T1>
 >this : Praseodymium<T0, T1>
->x : wetmorei<lasiurus<amphibius<uralensis, klossii<nudicaudus, aurata>>, leptoceros<punicus, arboreus<carolinensis, caniventer>>>, 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>
 
         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 : () => lasiurus<nitidus<marcanoi, daphaenodon>, sodyi<konganensis, psilurus>>
+>catherinae : () => imperfecta.lasiurus<Lanthanum.nitidus<howi.marcanoi, macrorhinos.daphaenodon>, petrophilus.sodyi<macrorhinos.konganensis, caurinus.psilurus>>
 >imperfecta : imperfecta
->lasiurus : lasiurus<T0, T1>
+>lasiurus : imperfecta.lasiurus<T0, T1>
 >Lanthanum : Lanthanum
->nitidus : nitidus<T0, T1>
+>nitidus : Lanthanum.nitidus<T0, T1>
 >howi : howi
->marcanoi : marcanoi
+>marcanoi : howi.marcanoi
 >macrorhinos : macrorhinos
->daphaenodon : daphaenodon
+>daphaenodon : macrorhinos.daphaenodon
 >petrophilus : petrophilus
->sodyi : sodyi<T0, T1>
+>sodyi : petrophilus.sodyi<T0, T1>
 >macrorhinos : macrorhinos
->konganensis : konganensis
+>konganensis : macrorhinos.konganensis
 >caurinus : caurinus
->psilurus : psilurus
->x : lasiurus<nitidus<marcanoi, daphaenodon>, sodyi<konganensis, psilurus>>
+>psilurus : caurinus.psilurus
+>x : imperfecta.lasiurus<Lanthanum.nitidus<howi.marcanoi, macrorhinos.daphaenodon>, petrophilus.sodyi<macrorhinos.konganensis, caurinus.psilurus>>
 >imperfecta : imperfecta
->lasiurus : lasiurus<T0, T1>
+>lasiurus : imperfecta.lasiurus<T0, T1>
 >Lanthanum : Lanthanum
->nitidus : nitidus<T0, T1>
+>nitidus : Lanthanum.nitidus<T0, T1>
 >howi : howi
->marcanoi : marcanoi
+>marcanoi : howi.marcanoi
 >macrorhinos : macrorhinos
->daphaenodon : daphaenodon
+>daphaenodon : macrorhinos.daphaenodon
 >petrophilus : petrophilus
->sodyi : sodyi<T0, T1>
+>sodyi : petrophilus.sodyi<T0, T1>
 >macrorhinos : macrorhinos
->konganensis : konganensis
+>konganensis : macrorhinos.konganensis
 >caurinus : caurinus
->psilurus : psilurus
+>psilurus : caurinus.psilurus
 >() => { var y = this; } : () => void
 >y : Praseodymium<T0, T1>
 >this : Praseodymium<T0, T1>
->x : lasiurus<nitidus<marcanoi, daphaenodon>, sodyi<konganensis, psilurus>>
+>x : imperfecta.lasiurus<Lanthanum.nitidus<howi.marcanoi, macrorhinos.daphaenodon>, petrophilus.sodyi<macrorhinos.konganensis, caurinus.psilurus>>
 
         frontata(): argurus.oreas { var x: argurus.oreas; () => { var y = this; }; return x; }
->frontata : () => oreas
+>frontata : () => argurus.oreas
 >argurus : argurus
->oreas : oreas
->x : oreas
+>oreas : argurus.oreas
+>x : argurus.oreas
 >argurus : argurus
->oreas : oreas
+>oreas : argurus.oreas
 >() => { var y = this; } : () => void
 >y : Praseodymium<T0, T1>
 >this : Praseodymium<T0, T1>
->x : oreas
+>x : argurus.oreas
 
         Terbium(): caurinus.mahaganus<julianae.galapagoensis, argurus.luctuosa> { var x: caurinus.mahaganus<julianae.galapagoensis, argurus.luctuosa>; () => { var y = this; }; return x; }
->Terbium : () => mahaganus<galapagoensis, luctuosa>
+>Terbium : () => caurinus.mahaganus<julianae.galapagoensis, argurus.luctuosa>
 >caurinus : caurinus
->mahaganus : mahaganus<T0, T1>
+>mahaganus : caurinus.mahaganus<T0, T1>
 >julianae : julianae
->galapagoensis : galapagoensis
+>galapagoensis : julianae.galapagoensis
 >argurus : argurus
->luctuosa : luctuosa
->x : mahaganus<galapagoensis, luctuosa>
+>luctuosa : argurus.luctuosa
+>x : caurinus.mahaganus<julianae.galapagoensis, argurus.luctuosa>
 >caurinus : caurinus
->mahaganus : mahaganus<T0, T1>
+>mahaganus : caurinus.mahaganus<T0, T1>
 >julianae : julianae
->galapagoensis : galapagoensis
+>galapagoensis : julianae.galapagoensis
 >argurus : argurus
->luctuosa : luctuosa
+>luctuosa : argurus.luctuosa
 >() => { var y = this; } : () => void
 >y : Praseodymium<T0, T1>
 >this : Praseodymium<T0, T1>
->x : mahaganus<galapagoensis, luctuosa>
+>x : caurinus.mahaganus<julianae.galapagoensis, argurus.luctuosa>
 
         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 : () => inez<oreas, albidens<luctuosa, echinatus>>
+>thomensis : () => minutus.inez<argurus.oreas, julianae.albidens<argurus.luctuosa, gabriellae.echinatus>>
 >minutus : minutus
->inez : inez<T0, T1>
+>inez : minutus.inez<T0, T1>
 >argurus : argurus
->oreas : oreas
+>oreas : argurus.oreas
 >julianae : julianae
->albidens : albidens<T0, T1>
+>albidens : julianae.albidens<T0, T1>
 >argurus : argurus
->luctuosa : luctuosa
+>luctuosa : argurus.luctuosa
 >gabriellae : gabriellae
->echinatus : echinatus
->x : inez<oreas, albidens<luctuosa, echinatus>>
+>echinatus : gabriellae.echinatus
+>x : minutus.inez<argurus.oreas, julianae.albidens<argurus.luctuosa, gabriellae.echinatus>>
 >minutus : minutus
->inez : inez<T0, T1>
+>inez : minutus.inez<T0, T1>
 >argurus : argurus
->oreas : oreas
+>oreas : argurus.oreas
 >julianae : julianae
->albidens : albidens<T0, T1>
+>albidens : julianae.albidens<T0, T1>
 >argurus : argurus
->luctuosa : luctuosa
+>luctuosa : argurus.luctuosa
 >gabriellae : gabriellae
->echinatus : echinatus
+>echinatus : gabriellae.echinatus
 >() => { var y = this; } : () => void
 >y : Praseodymium<T0, T1>
 >this : Praseodymium<T0, T1>
->x : inez<oreas, albidens<luctuosa, echinatus>>
+>x : minutus.inez<argurus.oreas, julianae.albidens<argurus.luctuosa, gabriellae.echinatus>>
 
         soricinus(): quasiater.carolinensis { var x: quasiater.carolinensis; () => { var y = this; }; return x; }
->soricinus : () => carolinensis
+>soricinus : () => quasiater.carolinensis
 >quasiater : quasiater
->carolinensis : carolinensis
->x : carolinensis
+>carolinensis : quasiater.carolinensis
+>x : quasiater.carolinensis
 >quasiater : quasiater
->carolinensis : carolinensis
+>carolinensis : quasiater.carolinensis
 >() => { var y = this; } : () => void
 >y : Praseodymium<T0, T1>
 >this : Praseodymium<T0, T1>
->x : carolinensis
+>x : quasiater.carolinensis
     }
 }
 module caurinus {
->caurinus : typeof caurinus
+>caurinus : caurinus
 
     export class johorensis<T0, T1> extends lutreolus.punicus {
 >johorensis : johorensis<T0, T1>
 >T0 : T0
 >T1 : T1
 >lutreolus : lutreolus
->punicus : punicus
+>punicus : lutreolus.punicus
 
         maini(): ruatanica.Praseodymium<lavali.thaeleri, julianae.acariensis> { var x: ruatanica.Praseodymium<lavali.thaeleri, julianae.acariensis>; () => { var y = this; }; return x; }
->maini : () => Praseodymium<thaeleri, acariensis>
+>maini : () => ruatanica.Praseodymium<lavali.thaeleri, julianae.acariensis>
 >ruatanica : ruatanica
->Praseodymium : Praseodymium<T0, T1>
+>Praseodymium : ruatanica.Praseodymium<T0, T1>
 >lavali : lavali
->thaeleri : thaeleri
+>thaeleri : lavali.thaeleri
 >julianae : julianae
->acariensis : acariensis
->x : Praseodymium<thaeleri, acariensis>
+>acariensis : julianae.acariensis
+>x : ruatanica.Praseodymium<lavali.thaeleri, julianae.acariensis>
 >ruatanica : ruatanica
->Praseodymium : Praseodymium<T0, T1>
+>Praseodymium : ruatanica.Praseodymium<T0, T1>
 >lavali : lavali
->thaeleri : thaeleri
+>thaeleri : lavali.thaeleri
 >julianae : julianae
->acariensis : acariensis
+>acariensis : julianae.acariensis
 >() => { var y = this; } : () => void
 >y : johorensis<T0, T1>
 >this : johorensis<T0, T1>
->x : Praseodymium<thaeleri, acariensis>
+>x : ruatanica.Praseodymium<lavali.thaeleri, julianae.acariensis>
     }
 }
 module argurus {
->argurus : typeof argurus
+>argurus : argurus
 
     export class luctuosa {
 >luctuosa : luctuosa
 
         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 : () => moojeni<marmosurus<moojeni<amphibius<falconeri, psilurus>, echinatus>, stolzmanni>, punicus>
+>loriae : () => rendalli.moojeni<macrorhinos.marmosurus<rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>, sagitta.stolzmanni>, lutreolus.punicus>
 >rendalli : rendalli
->moojeni : moojeni<T0, T1>
+>moojeni : rendalli.moojeni<T0, T1>
 >macrorhinos : macrorhinos
->marmosurus : marmosurus<T0, T1>
+>marmosurus : macrorhinos.marmosurus<T0, T1>
 >rendalli : rendalli
->moojeni : moojeni<T0, T1>
+>moojeni : rendalli.moojeni<T0, T1>
 >panglima : panglima
->amphibius : amphibius<T0, T1>
+>amphibius : panglima.amphibius<T0, T1>
 >trivirgatus : trivirgatus
->falconeri : falconeri
+>falconeri : trivirgatus.falconeri
 >caurinus : caurinus
->psilurus : psilurus
+>psilurus : caurinus.psilurus
 >gabriellae : gabriellae
->echinatus : echinatus
+>echinatus : gabriellae.echinatus
 >sagitta : sagitta
->stolzmanni : stolzmanni
+>stolzmanni : sagitta.stolzmanni
 >lutreolus : lutreolus
->punicus : punicus
->x : moojeni<marmosurus<moojeni<amphibius<falconeri, psilurus>, echinatus>, stolzmanni>, punicus>
+>punicus : lutreolus.punicus
+>x : rendalli.moojeni<macrorhinos.marmosurus<rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>, sagitta.stolzmanni>, lutreolus.punicus>
 >rendalli : rendalli
->moojeni : moojeni<T0, T1>
+>moojeni : rendalli.moojeni<T0, T1>
 >macrorhinos : macrorhinos
->marmosurus : marmosurus<T0, T1>
+>marmosurus : macrorhinos.marmosurus<T0, T1>
 >rendalli : rendalli
->moojeni : moojeni<T0, T1>
+>moojeni : rendalli.moojeni<T0, T1>
 >panglima : panglima
->amphibius : amphibius<T0, T1>
+>amphibius : panglima.amphibius<T0, T1>
 >trivirgatus : trivirgatus
->falconeri : falconeri
+>falconeri : trivirgatus.falconeri
 >caurinus : caurinus
->psilurus : psilurus
+>psilurus : caurinus.psilurus
 >gabriellae : gabriellae
->echinatus : echinatus
+>echinatus : gabriellae.echinatus
 >sagitta : sagitta
->stolzmanni : stolzmanni
+>stolzmanni : sagitta.stolzmanni
 >lutreolus : lutreolus
->punicus : punicus
+>punicus : lutreolus.punicus
 >() => { var y = this; } : () => void
 >y : luctuosa
 >this : luctuosa
->x : moojeni<marmosurus<moojeni<amphibius<falconeri, psilurus>, echinatus>, stolzmanni>, punicus>
+>x : rendalli.moojeni<macrorhinos.marmosurus<rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>, sagitta.stolzmanni>, lutreolus.punicus>
     }
 }
 module panamensis {
->panamensis : typeof panamensis
+>panamensis : panamensis
 
     export class setulosus<T0, T1> {
 >setulosus : setulosus<T0, T1>
@@ -13202,208 +13202,208 @@ module panamensis {
 >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 : () => mahaganus<coludo<oreas, marcanoi>, aurata>
+>duthieae : () => caurinus.mahaganus<howi.coludo<argurus.oreas, howi.marcanoi>, dogramacii.aurata>
 >caurinus : caurinus
->mahaganus : mahaganus<T0, T1>
+>mahaganus : caurinus.mahaganus<T0, T1>
 >howi : howi
->coludo : coludo<T0, T1>
+>coludo : howi.coludo<T0, T1>
 >argurus : argurus
->oreas : oreas
+>oreas : argurus.oreas
 >howi : howi
->marcanoi : marcanoi
+>marcanoi : howi.marcanoi
 >dogramacii : dogramacii
->aurata : aurata
->x : mahaganus<coludo<oreas, marcanoi>, aurata>
+>aurata : dogramacii.aurata
+>x : caurinus.mahaganus<howi.coludo<argurus.oreas, howi.marcanoi>, dogramacii.aurata>
 >caurinus : caurinus
->mahaganus : mahaganus<T0, T1>
+>mahaganus : caurinus.mahaganus<T0, T1>
 >howi : howi
->coludo : coludo<T0, T1>
+>coludo : howi.coludo<T0, T1>
 >argurus : argurus
->oreas : oreas
+>oreas : argurus.oreas
 >howi : howi
->marcanoi : marcanoi
+>marcanoi : howi.marcanoi
 >dogramacii : dogramacii
->aurata : aurata
+>aurata : dogramacii.aurata
 >() => { var y = this; } : () => void
 >y : setulosus<T0, T1>
 >this : setulosus<T0, T1>
->x : mahaganus<coludo<oreas, marcanoi>, aurata>
+>x : caurinus.mahaganus<howi.coludo<argurus.oreas, howi.marcanoi>, dogramacii.aurata>
 
         guereza(): howi.coludo<sagitta.stolzmanni, quasiater.carolinensis> { var x: howi.coludo<sagitta.stolzmanni, quasiater.carolinensis>; () => { var y = this; }; return x; }
->guereza : () => coludo<stolzmanni, carolinensis>
+>guereza : () => howi.coludo<sagitta.stolzmanni, quasiater.carolinensis>
 >howi : howi
->coludo : coludo<T0, T1>
+>coludo : howi.coludo<T0, T1>
 >sagitta : sagitta
->stolzmanni : stolzmanni
+>stolzmanni : sagitta.stolzmanni
 >quasiater : quasiater
->carolinensis : carolinensis
->x : coludo<stolzmanni, carolinensis>
+>carolinensis : quasiater.carolinensis
+>x : howi.coludo<sagitta.stolzmanni, quasiater.carolinensis>
 >howi : howi
->coludo : coludo<T0, T1>
+>coludo : howi.coludo<T0, T1>
 >sagitta : sagitta
->stolzmanni : stolzmanni
+>stolzmanni : sagitta.stolzmanni
 >quasiater : quasiater
->carolinensis : carolinensis
+>carolinensis : quasiater.carolinensis
 >() => { var y = this; } : () => void
 >y : setulosus<T0, T1>
 >this : setulosus<T0, T1>
->x : coludo<stolzmanni, carolinensis>
+>x : howi.coludo<sagitta.stolzmanni, quasiater.carolinensis>
 
         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 : () => nesiotes<lotor<abidi<lepturus, psilurus>, koepckeae>, mixtus<amicus, punicus>>
+>buselaphus : () => daubentonii.nesiotes<trivirgatus.lotor<panglima.abidi<lavali.lepturus, caurinus.psilurus>, dogramacii.koepckeae>, trivirgatus.mixtus<gabriellae.amicus, lutreolus.punicus>>
 >daubentonii : daubentonii
->nesiotes : nesiotes<T0, T1>
+>nesiotes : daubentonii.nesiotes<T0, T1>
 >trivirgatus : trivirgatus
->lotor : lotor<T0, T1>
+>lotor : trivirgatus.lotor<T0, T1>
 >panglima : panglima
->abidi : abidi<T0, T1>
+>abidi : panglima.abidi<T0, T1>
 >lavali : lavali
->lepturus : lepturus
+>lepturus : lavali.lepturus
 >caurinus : caurinus
->psilurus : psilurus
+>psilurus : caurinus.psilurus
 >dogramacii : dogramacii
->koepckeae : koepckeae
+>koepckeae : dogramacii.koepckeae
 >trivirgatus : trivirgatus
->mixtus : mixtus<T0, T1>
+>mixtus : trivirgatus.mixtus<T0, T1>
 >gabriellae : gabriellae
->amicus : amicus
+>amicus : gabriellae.amicus
 >lutreolus : lutreolus
->punicus : punicus
->x : nesiotes<lotor<abidi<lepturus, psilurus>, koepckeae>, mixtus<amicus, punicus>>
+>punicus : lutreolus.punicus
+>x : daubentonii.nesiotes<trivirgatus.lotor<panglima.abidi<lavali.lepturus, caurinus.psilurus>, dogramacii.koepckeae>, trivirgatus.mixtus<gabriellae.amicus, lutreolus.punicus>>
 >daubentonii : daubentonii
->nesiotes : nesiotes<T0, T1>
+>nesiotes : daubentonii.nesiotes<T0, T1>
 >trivirgatus : trivirgatus
->lotor : lotor<T0, T1>
+>lotor : trivirgatus.lotor<T0, T1>
 >panglima : panglima
->abidi : abidi<T0, T1>
+>abidi : panglima.abidi<T0, T1>
 >lavali : lavali
->lepturus : lepturus
+>lepturus : lavali.lepturus
 >caurinus : caurinus
->psilurus : psilurus
+>psilurus : caurinus.psilurus
 >dogramacii : dogramacii
->koepckeae : koepckeae
+>koepckeae : dogramacii.koepckeae
 >trivirgatus : trivirgatus
->mixtus : mixtus<T0, T1>
+>mixtus : trivirgatus.mixtus<T0, T1>
 >gabriellae : gabriellae
->amicus : amicus
+>amicus : gabriellae.amicus
 >lutreolus : lutreolus
->punicus : punicus
+>punicus : lutreolus.punicus
 >() => { var y = this; } : () => void
 >y : setulosus<T0, T1>
 >this : setulosus<T0, T1>
->x : nesiotes<lotor<abidi<lepturus, psilurus>, koepckeae>, mixtus<amicus, punicus>>
+>x : daubentonii.nesiotes<trivirgatus.lotor<panglima.abidi<lavali.lepturus, caurinus.psilurus>, dogramacii.koepckeae>, trivirgatus.mixtus<gabriellae.amicus, lutreolus.punicus>>
 
         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 : () => cinereus<netscheri<luctuosa, nudicaudus>, sarasinorum<megaphyllus, xanthognathus>>
+>nuttalli : () => sagitta.cinereus<argurus.netscheri<argurus.luctuosa, julianae.nudicaudus>, chrysaeolus.sarasinorum<caurinus.megaphyllus, lavali.xanthognathus>>
 >sagitta : sagitta
->cinereus : cinereus<T0, T1>
+>cinereus : sagitta.cinereus<T0, T1>
 >argurus : argurus
->netscheri : netscheri<T0, T1>
+>netscheri : argurus.netscheri<T0, T1>
 >argurus : argurus
->luctuosa : luctuosa
+>luctuosa : argurus.luctuosa
 >julianae : julianae
->nudicaudus : nudicaudus
+>nudicaudus : julianae.nudicaudus
 >chrysaeolus : chrysaeolus
->sarasinorum : sarasinorum<T0, T1>
+>sarasinorum : chrysaeolus.sarasinorum<T0, T1>
 >caurinus : caurinus
->megaphyllus : megaphyllus
+>megaphyllus : caurinus.megaphyllus
 >lavali : lavali
->xanthognathus : xanthognathus
->x : cinereus<netscheri<luctuosa, nudicaudus>, sarasinorum<megaphyllus, xanthognathus>>
+>xanthognathus : lavali.xanthognathus
+>x : sagitta.cinereus<argurus.netscheri<argurus.luctuosa, julianae.nudicaudus>, chrysaeolus.sarasinorum<caurinus.megaphyllus, lavali.xanthognathus>>
 >sagitta : sagitta
->cinereus : cinereus<T0, T1>
+>cinereus : sagitta.cinereus<T0, T1>
 >argurus : argurus
->netscheri : netscheri<T0, T1>
+>netscheri : argurus.netscheri<T0, T1>
 >argurus : argurus
->luctuosa : luctuosa
+>luctuosa : argurus.luctuosa
 >julianae : julianae
->nudicaudus : nudicaudus
+>nudicaudus : julianae.nudicaudus
 >chrysaeolus : chrysaeolus
->sarasinorum : sarasinorum<T0, T1>
+>sarasinorum : chrysaeolus.sarasinorum<T0, T1>
 >caurinus : caurinus
->megaphyllus : megaphyllus
+>megaphyllus : caurinus.megaphyllus
 >lavali : lavali
->xanthognathus : xanthognathus
+>xanthognathus : lavali.xanthognathus
 >() => { var y = this; } : () => void
 >y : setulosus<T0, T1>
 >this : setulosus<T0, T1>
->x : cinereus<netscheri<luctuosa, nudicaudus>, sarasinorum<megaphyllus, xanthognathus>>
+>x : sagitta.cinereus<argurus.netscheri<argurus.luctuosa, julianae.nudicaudus>, chrysaeolus.sarasinorum<caurinus.megaphyllus, lavali.xanthognathus>>
 
         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 : () => crenulata<nitidus<caniventer, jugularis>, steerii>
+>pelii : () => rendalli.crenulata<Lanthanum.nitidus<rionegrensis.caniventer, Lanthanum.jugularis>, julianae.steerii>
 >rendalli : rendalli
->crenulata : crenulata<T0, T1>
+>crenulata : rendalli.crenulata<T0, T1>
 >Lanthanum : Lanthanum
->nitidus : nitidus<T0, T1>
+>nitidus : Lanthanum.nitidus<T0, T1>
 >rionegrensis : rionegrensis
->caniventer : caniventer
+>caniventer : rionegrensis.caniventer
 >Lanthanum : Lanthanum
->jugularis : jugularis
+>jugularis : Lanthanum.jugularis
 >julianae : julianae
->steerii : steerii
->x : crenulata<nitidus<caniventer, jugularis>, steerii>
+>steerii : julianae.steerii
+>x : rendalli.crenulata<Lanthanum.nitidus<rionegrensis.caniventer, Lanthanum.jugularis>, julianae.steerii>
 >rendalli : rendalli
->crenulata : crenulata<T0, T1>
+>crenulata : rendalli.crenulata<T0, T1>
 >Lanthanum : Lanthanum
->nitidus : nitidus<T0, T1>
+>nitidus : Lanthanum.nitidus<T0, T1>
 >rionegrensis : rionegrensis
->caniventer : caniventer
+>caniventer : rionegrensis.caniventer
 >Lanthanum : Lanthanum
->jugularis : jugularis
+>jugularis : Lanthanum.jugularis
 >julianae : julianae
->steerii : steerii
+>steerii : julianae.steerii
 >() => { var y = this; } : () => void
 >y : setulosus<T0, T1>
 >this : setulosus<T0, T1>
->x : crenulata<nitidus<caniventer, jugularis>, steerii>
+>x : rendalli.crenulata<Lanthanum.nitidus<rionegrensis.caniventer, Lanthanum.jugularis>, julianae.steerii>
 
         tunneyi(): sagitta.stolzmanni { var x: sagitta.stolzmanni; () => { var y = this; }; return x; }
->tunneyi : () => stolzmanni
+>tunneyi : () => sagitta.stolzmanni
 >sagitta : sagitta
->stolzmanni : stolzmanni
->x : stolzmanni
+>stolzmanni : sagitta.stolzmanni
+>x : sagitta.stolzmanni
 >sagitta : sagitta
->stolzmanni : stolzmanni
+>stolzmanni : sagitta.stolzmanni
 >() => { var y = this; } : () => void
 >y : setulosus<T0, T1>
 >this : setulosus<T0, T1>
->x : stolzmanni
+>x : sagitta.stolzmanni
 
         lamula(): patas.uralensis { var x: patas.uralensis; () => { var y = this; }; return x; }
->lamula : () => uralensis
+>lamula : () => patas.uralensis
 >patas : patas
->uralensis : uralensis
->x : uralensis
+>uralensis : patas.uralensis
+>x : patas.uralensis
 >patas : patas
->uralensis : uralensis
+>uralensis : patas.uralensis
 >() => { var y = this; } : () => void
 >y : setulosus<T0, T1>
 >this : setulosus<T0, T1>
->x : uralensis
+>x : patas.uralensis
 
         vampyrus(): julianae.oralis<lutreolus.foina, provocax.melanoleuca> { var x: julianae.oralis<lutreolus.foina, provocax.melanoleuca>; () => { var y = this; }; return x; }
->vampyrus : () => oralis<foina, melanoleuca>
+>vampyrus : () => julianae.oralis<lutreolus.foina, provocax.melanoleuca>
 >julianae : julianae
->oralis : oralis<T0, T1>
+>oralis : julianae.oralis<T0, T1>
 >lutreolus : lutreolus
->foina : foina
+>foina : lutreolus.foina
 >provocax : provocax
->melanoleuca : melanoleuca
->x : oralis<foina, melanoleuca>
+>melanoleuca : provocax.melanoleuca
+>x : julianae.oralis<lutreolus.foina, provocax.melanoleuca>
 >julianae : julianae
->oralis : oralis<T0, T1>
+>oralis : julianae.oralis<T0, T1>
 >lutreolus : lutreolus
->foina : foina
+>foina : lutreolus.foina
 >provocax : provocax
->melanoleuca : melanoleuca
+>melanoleuca : provocax.melanoleuca
 >() => { var y = this; } : () => void
 >y : setulosus<T0, T1>
 >this : setulosus<T0, T1>
->x : oralis<foina, melanoleuca>
+>x : julianae.oralis<lutreolus.foina, provocax.melanoleuca>
     }
 }
 module petrophilus {
->petrophilus : typeof petrophilus
+>petrophilus : petrophilus
 
     export class rosalia<T0, T1> {
 >rosalia : rosalia<T0, T1>
@@ -13411,281 +13411,281 @@ module petrophilus {
 >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 : () => amphibius<coludo<daphaenodon, amphibius<daphaenodon, uralensis>>, mixtus<dauricus<aurata, melanops>, amphibius<lepturus, carolinensis>>>
+>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 : panglima
->amphibius : amphibius<T0, T1>
+>amphibius : panglima.amphibius<T0, T1>
 >howi : howi
->coludo : coludo<T0, T1>
+>coludo : howi.coludo<T0, T1>
 >macrorhinos : macrorhinos
->daphaenodon : daphaenodon
+>daphaenodon : macrorhinos.daphaenodon
 >panglima : panglima
->amphibius : amphibius<T0, T1>
+>amphibius : panglima.amphibius<T0, T1>
 >macrorhinos : macrorhinos
->daphaenodon : daphaenodon
+>daphaenodon : macrorhinos.daphaenodon
 >patas : patas
->uralensis : uralensis
+>uralensis : patas.uralensis
 >trivirgatus : trivirgatus
->mixtus : mixtus<T0, T1>
+>mixtus : trivirgatus.mixtus<T0, T1>
 >argurus : argurus
->dauricus : dauricus<T0, T1>
+>dauricus : argurus.dauricus<T0, T1>
 >dogramacii : dogramacii
->aurata : aurata
+>aurata : dogramacii.aurata
 >dammermani : dammermani
->melanops : melanops
+>melanops : dammermani.melanops
 >panglima : panglima
->amphibius : amphibius<T0, T1>
+>amphibius : panglima.amphibius<T0, T1>
 >lavali : lavali
->lepturus : lepturus
+>lepturus : lavali.lepturus
 >quasiater : quasiater
->carolinensis : carolinensis
->x : amphibius<coludo<daphaenodon, amphibius<daphaenodon, uralensis>>, mixtus<dauricus<aurata, melanops>, amphibius<lepturus, carolinensis>>>
+>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 : panglima
->amphibius : amphibius<T0, T1>
+>amphibius : panglima.amphibius<T0, T1>
 >howi : howi
->coludo : coludo<T0, T1>
+>coludo : howi.coludo<T0, T1>
 >macrorhinos : macrorhinos
->daphaenodon : daphaenodon
+>daphaenodon : macrorhinos.daphaenodon
 >panglima : panglima
->amphibius : amphibius<T0, T1>
+>amphibius : panglima.amphibius<T0, T1>
 >macrorhinos : macrorhinos
->daphaenodon : daphaenodon
+>daphaenodon : macrorhinos.daphaenodon
 >patas : patas
->uralensis : uralensis
+>uralensis : patas.uralensis
 >trivirgatus : trivirgatus
->mixtus : mixtus<T0, T1>
+>mixtus : trivirgatus.mixtus<T0, T1>
 >argurus : argurus
->dauricus : dauricus<T0, T1>
+>dauricus : argurus.dauricus<T0, T1>
 >dogramacii : dogramacii
->aurata : aurata
+>aurata : dogramacii.aurata
 >dammermani : dammermani
->melanops : melanops
+>melanops : dammermani.melanops
 >panglima : panglima
->amphibius : amphibius<T0, T1>
+>amphibius : panglima.amphibius<T0, T1>
 >lavali : lavali
->lepturus : lepturus
+>lepturus : lavali.lepturus
 >quasiater : quasiater
->carolinensis : carolinensis
+>carolinensis : quasiater.carolinensis
 >() => { var y = this; } : () => void
 >y : rosalia<T0, T1>
 >this : rosalia<T0, T1>
->x : amphibius<coludo<daphaenodon, amphibius<daphaenodon, uralensis>>, mixtus<dauricus<aurata, melanops>, amphibius<lepturus, 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>>>
 
         baeops(): Lanthanum.nitidus<lavali.thaeleri, lavali.lepturus> { var x: Lanthanum.nitidus<lavali.thaeleri, lavali.lepturus>; () => { var y = this; }; return x; }
->baeops : () => nitidus<thaeleri, lepturus>
+>baeops : () => Lanthanum.nitidus<lavali.thaeleri, lavali.lepturus>
 >Lanthanum : Lanthanum
->nitidus : nitidus<T0, T1>
+>nitidus : Lanthanum.nitidus<T0, T1>
 >lavali : lavali
->thaeleri : thaeleri
+>thaeleri : lavali.thaeleri
 >lavali : lavali
->lepturus : lepturus
->x : nitidus<thaeleri, lepturus>
+>lepturus : lavali.lepturus
+>x : Lanthanum.nitidus<lavali.thaeleri, lavali.lepturus>
 >Lanthanum : Lanthanum
->nitidus : nitidus<T0, T1>
+>nitidus : Lanthanum.nitidus<T0, T1>
 >lavali : lavali
->thaeleri : thaeleri
+>thaeleri : lavali.thaeleri
 >lavali : lavali
->lepturus : lepturus
+>lepturus : lavali.lepturus
 >() => { var y = this; } : () => void
 >y : rosalia<T0, T1>
 >this : rosalia<T0, T1>
->x : nitidus<thaeleri, lepturus>
+>x : Lanthanum.nitidus<lavali.thaeleri, lavali.lepturus>
 
         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 : () => lasiurus<fundatus<amicus, foina>, foina>
+>ozensis : () => imperfecta.lasiurus<panglima.fundatus<gabriellae.amicus, lutreolus.foina>, lutreolus.foina>
 >imperfecta : imperfecta
->lasiurus : lasiurus<T0, T1>
+>lasiurus : imperfecta.lasiurus<T0, T1>
 >panglima : panglima
->fundatus : fundatus<T0, T1>
+>fundatus : panglima.fundatus<T0, T1>
 >gabriellae : gabriellae
->amicus : amicus
+>amicus : gabriellae.amicus
 >lutreolus : lutreolus
->foina : foina
+>foina : lutreolus.foina
 >lutreolus : lutreolus
->foina : foina
->x : lasiurus<fundatus<amicus, foina>, foina>
+>foina : lutreolus.foina
+>x : imperfecta.lasiurus<panglima.fundatus<gabriellae.amicus, lutreolus.foina>, lutreolus.foina>
 >imperfecta : imperfecta
->lasiurus : lasiurus<T0, T1>
+>lasiurus : imperfecta.lasiurus<T0, T1>
 >panglima : panglima
->fundatus : fundatus<T0, T1>
+>fundatus : panglima.fundatus<T0, T1>
 >gabriellae : gabriellae
->amicus : amicus
+>amicus : gabriellae.amicus
 >lutreolus : lutreolus
->foina : foina
+>foina : lutreolus.foina
 >lutreolus : lutreolus
->foina : foina
+>foina : lutreolus.foina
 >() => { var y = this; } : () => void
 >y : rosalia<T0, T1>
 >this : rosalia<T0, T1>
->x : lasiurus<fundatus<amicus, foina>, foina>
+>x : imperfecta.lasiurus<panglima.fundatus<gabriellae.amicus, lutreolus.foina>, lutreolus.foina>
 
         creaghi(): argurus.luctuosa { var x: argurus.luctuosa; () => { var y = this; }; return x; }
->creaghi : () => luctuosa
+>creaghi : () => argurus.luctuosa
 >argurus : argurus
->luctuosa : luctuosa
->x : luctuosa
+>luctuosa : argurus.luctuosa
+>x : argurus.luctuosa
 >argurus : argurus
->luctuosa : luctuosa
+>luctuosa : argurus.luctuosa
 >() => { var y = this; } : () => void
 >y : rosalia<T0, T1>
 >this : rosalia<T0, T1>
->x : luctuosa
+>x : argurus.luctuosa
 
         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 : () => setulosus<beisa, linulus<megaphyllus, megaphyllus>>
+>montivaga : () => panamensis.setulosus<lavali.beisa, panamensis.linulus<caurinus.megaphyllus, caurinus.megaphyllus>>
 >panamensis : panamensis
->setulosus : setulosus<T0, T1>
+>setulosus : panamensis.setulosus<T0, T1>
 >lavali : lavali
->beisa : beisa
+>beisa : lavali.beisa
 >panamensis : panamensis
->linulus : linulus<T0, T1>
+>linulus : panamensis.linulus<T0, T1>
 >caurinus : caurinus
->megaphyllus : megaphyllus
+>megaphyllus : caurinus.megaphyllus
 >caurinus : caurinus
->megaphyllus : megaphyllus
->x : setulosus<beisa, linulus<megaphyllus, megaphyllus>>
+>megaphyllus : caurinus.megaphyllus
+>x : panamensis.setulosus<lavali.beisa, panamensis.linulus<caurinus.megaphyllus, caurinus.megaphyllus>>
 >panamensis : panamensis
->setulosus : setulosus<T0, T1>
+>setulosus : panamensis.setulosus<T0, T1>
 >lavali : lavali
->beisa : beisa
+>beisa : lavali.beisa
 >panamensis : panamensis
->linulus : linulus<T0, T1>
+>linulus : panamensis.linulus<T0, T1>
 >caurinus : caurinus
->megaphyllus : megaphyllus
+>megaphyllus : caurinus.megaphyllus
 >caurinus : caurinus
->megaphyllus : megaphyllus
+>megaphyllus : caurinus.megaphyllus
 >() => { var y = this; } : () => void
 >y : rosalia<T0, T1>
 >this : rosalia<T0, T1>
->x : setulosus<beisa, linulus<megaphyllus, megaphyllus>>
+>x : panamensis.setulosus<lavali.beisa, panamensis.linulus<caurinus.megaphyllus, caurinus.megaphyllus>>
     }
 }
 module caurinus {
->caurinus : typeof caurinus
+>caurinus : caurinus
 
     export class psilurus extends lutreolus.punicus {
 >psilurus : psilurus
 >lutreolus : lutreolus
->punicus : punicus
+>punicus : lutreolus.punicus
 
         socialis(): panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus> { var x: panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>; () => { var y = this; }; return x; }
->socialis : () => amphibius<falconeri, psilurus>
+>socialis : () => panglima.amphibius<trivirgatus.falconeri, psilurus>
 >panglima : panglima
->amphibius : amphibius<T0, T1>
+>amphibius : panglima.amphibius<T0, T1>
 >trivirgatus : trivirgatus
->falconeri : falconeri
+>falconeri : trivirgatus.falconeri
 >caurinus : caurinus
 >psilurus : psilurus
->x : amphibius<falconeri, psilurus>
+>x : panglima.amphibius<trivirgatus.falconeri, psilurus>
 >panglima : panglima
->amphibius : amphibius<T0, T1>
+>amphibius : panglima.amphibius<T0, T1>
 >trivirgatus : trivirgatus
->falconeri : falconeri
+>falconeri : trivirgatus.falconeri
 >caurinus : caurinus
 >psilurus : psilurus
 >() => { var y = this; } : () => void
 >y : psilurus
 >this : psilurus
->x : amphibius<falconeri, psilurus>
+>x : panglima.amphibius<trivirgatus.falconeri, psilurus>
 
         lundi(): petrophilus.sodyi<trivirgatus.falconeri, quasiater.bobrinskoi> { var x: petrophilus.sodyi<trivirgatus.falconeri, quasiater.bobrinskoi>; () => { var y = this; }; return x; }
->lundi : () => sodyi<falconeri, bobrinskoi>
+>lundi : () => petrophilus.sodyi<trivirgatus.falconeri, quasiater.bobrinskoi>
 >petrophilus : petrophilus
->sodyi : sodyi<T0, T1>
+>sodyi : petrophilus.sodyi<T0, T1>
 >trivirgatus : trivirgatus
->falconeri : falconeri
+>falconeri : trivirgatus.falconeri
 >quasiater : quasiater
->bobrinskoi : bobrinskoi
->x : sodyi<falconeri, bobrinskoi>
+>bobrinskoi : quasiater.bobrinskoi
+>x : petrophilus.sodyi<trivirgatus.falconeri, quasiater.bobrinskoi>
 >petrophilus : petrophilus
->sodyi : sodyi<T0, T1>
+>sodyi : petrophilus.sodyi<T0, T1>
 >trivirgatus : trivirgatus
->falconeri : falconeri
+>falconeri : trivirgatus.falconeri
 >quasiater : quasiater
->bobrinskoi : bobrinskoi
+>bobrinskoi : quasiater.bobrinskoi
 >() => { var y = this; } : () => void
 >y : psilurus
 >this : psilurus
->x : sodyi<falconeri, bobrinskoi>
+>x : petrophilus.sodyi<trivirgatus.falconeri, quasiater.bobrinskoi>
 
         araeum(): imperfecta.ciliolabrum<quasiater.carolinensis, lavali.beisa> { var x: imperfecta.ciliolabrum<quasiater.carolinensis, lavali.beisa>; () => { var y = this; }; return x; }
->araeum : () => ciliolabrum<carolinensis, beisa>
+>araeum : () => imperfecta.ciliolabrum<quasiater.carolinensis, lavali.beisa>
 >imperfecta : imperfecta
->ciliolabrum : ciliolabrum<T0, T1>
+>ciliolabrum : imperfecta.ciliolabrum<T0, T1>
 >quasiater : quasiater
->carolinensis : carolinensis
+>carolinensis : quasiater.carolinensis
 >lavali : lavali
->beisa : beisa
->x : ciliolabrum<carolinensis, beisa>
+>beisa : lavali.beisa
+>x : imperfecta.ciliolabrum<quasiater.carolinensis, lavali.beisa>
 >imperfecta : imperfecta
->ciliolabrum : ciliolabrum<T0, T1>
+>ciliolabrum : imperfecta.ciliolabrum<T0, T1>
 >quasiater : quasiater
->carolinensis : carolinensis
+>carolinensis : quasiater.carolinensis
 >lavali : lavali
->beisa : beisa
+>beisa : lavali.beisa
 >() => { var y = this; } : () => void
 >y : psilurus
 >this : psilurus
->x : ciliolabrum<carolinensis, beisa>
+>x : imperfecta.ciliolabrum<quasiater.carolinensis, lavali.beisa>
 
         calamianensis(): julianae.gerbillus<lavali.thaeleri, quasiater.carolinensis> { var x: julianae.gerbillus<lavali.thaeleri, quasiater.carolinensis>; () => { var y = this; }; return x; }
->calamianensis : () => gerbillus<thaeleri, carolinensis>
+>calamianensis : () => julianae.gerbillus<lavali.thaeleri, quasiater.carolinensis>
 >julianae : julianae
->gerbillus : gerbillus<T0, T1>
+>gerbillus : julianae.gerbillus<T0, T1>
 >lavali : lavali
->thaeleri : thaeleri
+>thaeleri : lavali.thaeleri
 >quasiater : quasiater
->carolinensis : carolinensis
->x : gerbillus<thaeleri, carolinensis>
+>carolinensis : quasiater.carolinensis
+>x : julianae.gerbillus<lavali.thaeleri, quasiater.carolinensis>
 >julianae : julianae
->gerbillus : gerbillus<T0, T1>
+>gerbillus : julianae.gerbillus<T0, T1>
 >lavali : lavali
->thaeleri : thaeleri
+>thaeleri : lavali.thaeleri
 >quasiater : quasiater
->carolinensis : carolinensis
+>carolinensis : quasiater.carolinensis
 >() => { var y = this; } : () => void
 >y : psilurus
 >this : psilurus
->x : gerbillus<thaeleri, carolinensis>
+>x : julianae.gerbillus<lavali.thaeleri, quasiater.carolinensis>
 
         petersoni(): panamensis.setulosus<sagitta.walkeri, dogramacii.robustulus> { var x: panamensis.setulosus<sagitta.walkeri, dogramacii.robustulus>; () => { var y = this; }; return x; }
->petersoni : () => setulosus<walkeri, robustulus>
+>petersoni : () => panamensis.setulosus<sagitta.walkeri, dogramacii.robustulus>
 >panamensis : panamensis
->setulosus : setulosus<T0, T1>
+>setulosus : panamensis.setulosus<T0, T1>
 >sagitta : sagitta
->walkeri : walkeri
+>walkeri : sagitta.walkeri
 >dogramacii : dogramacii
->robustulus : robustulus
->x : setulosus<walkeri, robustulus>
+>robustulus : dogramacii.robustulus
+>x : panamensis.setulosus<sagitta.walkeri, dogramacii.robustulus>
 >panamensis : panamensis
->setulosus : setulosus<T0, T1>
+>setulosus : panamensis.setulosus<T0, T1>
 >sagitta : sagitta
->walkeri : walkeri
+>walkeri : sagitta.walkeri
 >dogramacii : dogramacii
->robustulus : robustulus
+>robustulus : dogramacii.robustulus
 >() => { var y = this; } : () => void
 >y : psilurus
 >this : psilurus
->x : setulosus<walkeri, robustulus>
+>x : panamensis.setulosus<sagitta.walkeri, dogramacii.robustulus>
 
         nitela(): panamensis.linulus<Lanthanum.megalonyx, howi.marcanoi> { var x: panamensis.linulus<Lanthanum.megalonyx, howi.marcanoi>; () => { var y = this; }; return x; }
->nitela : () => linulus<megalonyx, marcanoi>
+>nitela : () => panamensis.linulus<Lanthanum.megalonyx, howi.marcanoi>
 >panamensis : panamensis
->linulus : linulus<T0, T1>
+>linulus : panamensis.linulus<T0, T1>
 >Lanthanum : Lanthanum
->megalonyx : megalonyx
+>megalonyx : Lanthanum.megalonyx
 >howi : howi
->marcanoi : marcanoi
->x : linulus<megalonyx, marcanoi>
+>marcanoi : howi.marcanoi
+>x : panamensis.linulus<Lanthanum.megalonyx, howi.marcanoi>
 >panamensis : panamensis
->linulus : linulus<T0, T1>
+>linulus : panamensis.linulus<T0, T1>
 >Lanthanum : Lanthanum
->megalonyx : megalonyx
+>megalonyx : Lanthanum.megalonyx
 >howi : howi
->marcanoi : marcanoi
+>marcanoi : howi.marcanoi
 >() => { var y = this; } : () => void
 >y : psilurus
 >this : psilurus
->x : linulus<megalonyx, marcanoi>
+>x : panamensis.linulus<Lanthanum.megalonyx, howi.marcanoi>
     }
 }
 
diff --git a/tests/baselines/reference/returnTypeParameterWithModules.types b/tests/baselines/reference/returnTypeParameterWithModules.types
index 7814d5a8c63..1f39f3d335c 100644
--- a/tests/baselines/reference/returnTypeParameterWithModules.types
+++ b/tests/baselines/reference/returnTypeParameterWithModules.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/returnTypeParameterWithModules.ts ===
 module M1 {
->M1 : typeof M1
+>M1 : M1
 
     export function reduce<A>(ar, f, e?): Array<A> {
 >reduce : typeof reduce
@@ -8,7 +8,7 @@ module M1 {
 >ar : any
 >f : any
 >e : any
->Array : T[]
+>Array : Array<T>
 >A : A
 
         return Array.prototype.reduce.apply(ar, e ? [f, e] : [f]);
@@ -16,7 +16,7 @@ module M1 {
 >Array.prototype.reduce.apply : (thisArg: any, argArray?: any) => any
 >Array.prototype.reduce : { (callbackfn: (previousValue: any, currentValue: any, currentIndex: number, array: any[]) => any, initialValue?: any): any; <U>(callbackfn: (previousValue: U, currentValue: any, currentIndex: number, array: any[]) => U, initialValue: U): U; }
 >Array.prototype : any[]
->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[]; }
+>Array : { (arrayLength?: number): Array<any>; <T>(arrayLength: number): Array<T>; <T>(...items: Array<T>): Array<T>; new (arrayLength?: number): Array<any>; new <T>(arrayLength: number): Array<T>; new <T>(...items: Array<T>): Array<T>; isArray(arg: any): boolean; prototype: Array<any>; }
 >prototype : any[]
 >reduce : { (callbackfn: (previousValue: any, currentValue: any, currentIndex: number, array: any[]) => any, initialValue?: any): any; <U>(callbackfn: (previousValue: U, currentValue: any, currentIndex: number, array: any[]) => U, initialValue: U): U; }
 >apply : (thisArg: any, argArray?: any) => any
@@ -32,20 +32,20 @@ module M1 {
     };
 };
 module M2 {
->M2 : typeof M2
+>M2 : M2
 
   import A = M1
->A : typeof M1
->M1 : typeof M1
+>A : A
+>M1 : typeof A
 
   export function compose() {
 >compose : typeof compose
 
         A.reduce(arguments, compose2);
 >A.reduce(arguments, compose2) : {}[]
->A.reduce : typeof reduce
->A : typeof M1
->reduce : typeof reduce
+>A.reduce : typeof A.reduce
+>A : typeof A
+>reduce : typeof A.reduce
 >arguments : IArguments
 >compose2 : typeof compose2
 
diff --git a/tests/baselines/reference/reuseInnerModuleMember.types b/tests/baselines/reference/reuseInnerModuleMember.types
index f9179e64cc1..7ef31b326d7 100644
--- a/tests/baselines/reference/reuseInnerModuleMember.types
+++ b/tests/baselines/reference/reuseInnerModuleMember.types
@@ -1,17 +1,17 @@
 === tests/cases/compiler/reuseInnerModuleMember_1.ts ===
 ///<reference path='reuseInnerModuleMember_0.ts'/>
 declare module bar {
->bar : typeof bar
+>bar : bar
 
     interface alpha { }
 >alpha : alpha
 }
 
 import f = require('reuseInnerModuleMember_0');
->f : typeof "tests/cases/compiler/reuseInnerModuleMember_0"
+>f : f
 
 module bar {
->bar : typeof bar
+>bar : bar
 
     var x: alpha;
 >x : alpha
diff --git a/tests/baselines/reference/scopeResolutionIdentifiers.types b/tests/baselines/reference/scopeResolutionIdentifiers.types
index daac3c316e4..135ff1fbda6 100644
--- a/tests/baselines/reference/scopeResolutionIdentifiers.types
+++ b/tests/baselines/reference/scopeResolutionIdentifiers.types
@@ -5,7 +5,7 @@ var s: string;
 >s : string
 
 module M1 {
->M1 : typeof M1
+>M1 : M1
 
     export var s: number;
 >s : number
@@ -19,7 +19,7 @@ module M1 {
 }
 
 module M2 {
->M2 : typeof M2
+>M2 : M2
 
     var s: number;
 >s : number
@@ -75,13 +75,13 @@ class C {
 }
 
 module M3 {
->M3 : typeof M3
+>M3 : M3
 
     var s: any;
 >s : any
 
     module M4 {
->M4 : typeof M4
+>M4 : M4
 
         var n = s;
 >n : any
diff --git a/tests/baselines/reference/separate1-2.types b/tests/baselines/reference/separate1-2.types
index 9e07b3f7a5b..ebe49d5c2a7 100644
--- a/tests/baselines/reference/separate1-2.types
+++ b/tests/baselines/reference/separate1-2.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/separate1-2.ts ===
 module X {
->X : typeof X
+>X : X
 
     export function f() { }
 >f : typeof f
diff --git a/tests/baselines/reference/simpleArrowFunctionParameterReferencedInObjectLiteral1.types b/tests/baselines/reference/simpleArrowFunctionParameterReferencedInObjectLiteral1.types
index 7011f8826a4..417a51ac4b8 100644
--- a/tests/baselines/reference/simpleArrowFunctionParameterReferencedInObjectLiteral1.types
+++ b/tests/baselines/reference/simpleArrowFunctionParameterReferencedInObjectLiteral1.types
@@ -14,5 +14,5 @@
 >({ X: p }) : { X: any; }
 >{ X: p } : { X: any; }
 >X : any
->p : p
+>p : any
 
diff --git a/tests/baselines/reference/sourceMap-FileWithComments.types b/tests/baselines/reference/sourceMap-FileWithComments.types
index 82ff5b0e1bd..07981506ff8 100644
--- a/tests/baselines/reference/sourceMap-FileWithComments.types
+++ b/tests/baselines/reference/sourceMap-FileWithComments.types
@@ -10,7 +10,7 @@ interface IPoint {
 
 // Module
 module Shapes {
->Shapes : typeof Shapes
+>Shapes : Shapes
 
     // Class
     export class Point implements IPoint {
@@ -71,10 +71,10 @@ module Shapes {
 var p: IPoint = new Shapes.Point(3, 4);
 >p : IPoint
 >IPoint : IPoint
->new Shapes.Point(3, 4) : Point
->Shapes.Point : typeof Point
+>new Shapes.Point(3, 4) : Shapes.Point
+>Shapes.Point : typeof Shapes.Point
 >Shapes : typeof Shapes
->Point : typeof Point
+>Point : typeof Shapes.Point
 
 var dist = p.getDist();
 >dist : number
diff --git a/tests/baselines/reference/sourceMap-StringLiteralWithNewLine.types b/tests/baselines/reference/sourceMap-StringLiteralWithNewLine.types
index 3d71b5a5ca1..f8bf01a97d6 100644
--- a/tests/baselines/reference/sourceMap-StringLiteralWithNewLine.types
+++ b/tests/baselines/reference/sourceMap-StringLiteralWithNewLine.types
@@ -15,7 +15,7 @@ declare var window: Window;
 >Window : Window
 
 module Foo {
->Foo : typeof Foo
+>Foo : Foo
 
     var x = "test1";
 >x : string
diff --git a/tests/baselines/reference/sourceMapValidationClasses.types b/tests/baselines/reference/sourceMapValidationClasses.types
index 8deaf6c2ce8..64d059eafdc 100644
--- a/tests/baselines/reference/sourceMapValidationClasses.types
+++ b/tests/baselines/reference/sourceMapValidationClasses.types
@@ -1,7 +1,7 @@
 === tests/cases/compiler/sourceMapValidationClasses.ts ===
 module Foo.Bar {
->Foo : typeof Foo
->Bar : typeof Bar
+>Foo : Foo
+>Bar : Bar
 
     "use strict";
 
diff --git a/tests/baselines/reference/sourceMapValidationImport.types b/tests/baselines/reference/sourceMapValidationImport.types
index 4ea0c3fcd5d..d58238b34f4 100644
--- a/tests/baselines/reference/sourceMapValidationImport.types
+++ b/tests/baselines/reference/sourceMapValidationImport.types
@@ -1,28 +1,28 @@
 === tests/cases/compiler/sourceMapValidationImport.ts ===
 export module m {
->m : typeof m
+>m : m
 
     export class c {
 >c : c
     }
 }
 import a = m.c;
->a : typeof c
+>a : a
 >m : typeof m
->c : c
+>c : a
 
 export import b = m.c;
->b : typeof c
+>b : b
 >m : typeof m
->c : c
+>c : a
 
 var x = new a();
->x : c
->new a() : c
->a : typeof c
+>x : a
+>new a() : a
+>a : typeof a
 
 var y = new b();
->y : c
->new b() : c
->b : typeof c
+>y : a
+>new b() : a
+>b : typeof a
 
diff --git a/tests/baselines/reference/sourceMapValidationModule.types b/tests/baselines/reference/sourceMapValidationModule.types
index 38c0c3e8392..27a90f32afc 100644
--- a/tests/baselines/reference/sourceMapValidationModule.types
+++ b/tests/baselines/reference/sourceMapValidationModule.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/sourceMapValidationModule.ts ===
 module m2 {
->m2 : typeof m2
+>m2 : m2
 
     var a = 10;
 >a : number
@@ -10,10 +10,10 @@ module m2 {
 >a : number
 }
 module m3 {
->m3 : typeof m3
+>m3 : m3
 
     module m4 {
->m4 : typeof m4
+>m4 : m4
 
         export var x = 30;
 >x : number
diff --git a/tests/baselines/reference/sourceMapValidationWithComments.types b/tests/baselines/reference/sourceMapValidationWithComments.types
index 4e88b468ce4..c5725c7d96c 100644
--- a/tests/baselines/reference/sourceMapValidationWithComments.types
+++ b/tests/baselines/reference/sourceMapValidationWithComments.types
@@ -3,7 +3,7 @@ class DebugClass {
 >DebugClass : DebugClass
 
     public static debugFunc() {
->debugFunc : typeof debugFunc
+>debugFunc : () => boolean
 
         // Start Debugger Test Code
         var i = 0;
diff --git a/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.types b/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.types
index 6e6d6672c16..33a67423eaf 100644
--- a/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.types
+++ b/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/a.ts ===
 module M {
->M : typeof M
+>M : M
 
     export var X = 1;
 >X : number
@@ -27,7 +27,7 @@ interface Navigator {
 
 === tests/cases/compiler/b.ts ===
 module m1 {
->m1 : typeof m1
+>m1 : m1
 
     export class c1 {
 >c1 : c1
diff --git a/tests/baselines/reference/sourcemapValidationDuplicateNames.types b/tests/baselines/reference/sourcemapValidationDuplicateNames.types
index d5862720ede..921524ad416 100644
--- a/tests/baselines/reference/sourcemapValidationDuplicateNames.types
+++ b/tests/baselines/reference/sourcemapValidationDuplicateNames.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/sourcemapValidationDuplicateNames.ts ===
 module m1 {
->m1 : typeof m1
+>m1 : m1
 
     var x = 10;
 >x : number
@@ -10,7 +10,7 @@ module m1 {
     }
 }
 module m1 {
->m1 : typeof m1
+>m1 : m1
 
     var b = new m1.c();
 >b : c
diff --git a/tests/baselines/reference/specializationOfExportedClass.types b/tests/baselines/reference/specializationOfExportedClass.types
index e473058e885..b03922bb197 100644
--- a/tests/baselines/reference/specializationOfExportedClass.types
+++ b/tests/baselines/reference/specializationOfExportedClass.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/specializationOfExportedClass.ts ===
 module M {
->M : typeof M
+>M : M
 
 export class C<T> { }
 >C : C<T>
@@ -9,9 +9,9 @@ export class C<T> { }
 }
  
 var x = new M.C<string>();
->x : C<string>
->new M.C<string>() : C<string>
->M.C : typeof C
+>x : M.C<string>
+>new M.C<string>() : M.C<string>
+>M.C : typeof M.C
 >M : typeof M
->C : typeof C
+>C : typeof M.C
 
diff --git a/tests/baselines/reference/staticAndMemberFunctions.types b/tests/baselines/reference/staticAndMemberFunctions.types
index b795cb11c89..cc52d24d281 100644
--- a/tests/baselines/reference/staticAndMemberFunctions.types
+++ b/tests/baselines/reference/staticAndMemberFunctions.types
@@ -3,7 +3,7 @@ class T {
 >T : T
 
     static x() { }
->x : typeof x
+>x : () => void
 
     public y() { }
 >y : () => void
diff --git a/tests/baselines/reference/staticAndNonStaticPropertiesSameName.types b/tests/baselines/reference/staticAndNonStaticPropertiesSameName.types
index 55748f21068..4c8da030f10 100644
--- a/tests/baselines/reference/staticAndNonStaticPropertiesSameName.types
+++ b/tests/baselines/reference/staticAndNonStaticPropertiesSameName.types
@@ -12,5 +12,5 @@ class C {
 >f : () => void
 
     static f() { }
->f : typeof f
+>f : () => void
 }
diff --git a/tests/baselines/reference/staticFactory1.types b/tests/baselines/reference/staticFactory1.types
index e125c659d7c..ed275442fb5 100644
--- a/tests/baselines/reference/staticFactory1.types
+++ b/tests/baselines/reference/staticFactory1.types
@@ -6,7 +6,7 @@ class Base {
 >foo : () => number
 
     static create() {
->create : typeof create
+>create : () => Base
 
         return new this();
 >new this() : Base
@@ -24,9 +24,9 @@ class Derived extends Base {
 var d = Derived.create(); 
 >d : Base
 >Derived.create() : Base
->Derived.create : typeof create
+>Derived.create : () => Base
 >Derived : typeof Derived
->create : typeof create
+>create : () => Base
 
 d.foo();  
 >d.foo() : number
diff --git a/tests/baselines/reference/staticGetter2.types b/tests/baselines/reference/staticGetter2.types
index 762ec83e155..609c07aa059 100644
--- a/tests/baselines/reference/staticGetter2.types
+++ b/tests/baselines/reference/staticGetter2.types
@@ -4,7 +4,7 @@ class C {
 >C : C
 
     static x() {
->x : typeof x
+>x : () => typeof C
 
         var r = this;
 >r : typeof C
diff --git a/tests/baselines/reference/staticInstanceResolution.types b/tests/baselines/reference/staticInstanceResolution.types
index ac72c91da75..1a4d3de09a0 100644
--- a/tests/baselines/reference/staticInstanceResolution.types
+++ b/tests/baselines/reference/staticInstanceResolution.types
@@ -9,7 +9,7 @@ class Comment {
     }
 
     static getDocCommentText(comments: Comment[])
->getDocCommentText : typeof getDocCommentText
+>getDocCommentText : (comments: Comment[]) => void
 >comments : Comment[]
 >Comment : Comment
     {
diff --git a/tests/baselines/reference/staticInstanceResolution3.types b/tests/baselines/reference/staticInstanceResolution3.types
index d8f267edf52..ab1398f16de 100644
--- a/tests/baselines/reference/staticInstanceResolution3.types
+++ b/tests/baselines/reference/staticInstanceResolution3.types
@@ -1,22 +1,22 @@
 === tests/cases/compiler/staticInstanceResolution3_1.ts ===
 ///<reference path='staticInstanceResolution3_0.ts'/>
 import WinJS = require('staticInstanceResolution3_0');
->WinJS : typeof "tests/cases/compiler/staticInstanceResolution3_0"
+>WinJS : WinJS
 
 WinJS.Promise.timeout(10);
->WinJS.Promise.timeout(10) : Promise
->WinJS.Promise.timeout : typeof timeout
->WinJS.Promise : typeof Promise
->WinJS : typeof "tests/cases/compiler/staticInstanceResolution3_0"
->Promise : typeof Promise
->timeout : typeof timeout
+>WinJS.Promise.timeout(10) : WinJS.Promise
+>WinJS.Promise.timeout : (delay: number) => WinJS.Promise
+>WinJS.Promise : typeof WinJS.Promise
+>WinJS : typeof WinJS
+>Promise : typeof WinJS.Promise
+>timeout : (delay: number) => WinJS.Promise
 
 === tests/cases/compiler/staticInstanceResolution3_0.ts ===
 export class Promise {
 >Promise : Promise
 
     static timeout(delay: number): Promise {
->timeout : typeof timeout
+>timeout : (delay: number) => Promise
 >delay : number
 >Promise : Promise
 
diff --git a/tests/baselines/reference/staticInterfaceAssignmentCompat.types b/tests/baselines/reference/staticInterfaceAssignmentCompat.types
index 807a68d6989..89e513233ba 100644
--- a/tests/baselines/reference/staticInterfaceAssignmentCompat.types
+++ b/tests/baselines/reference/staticInterfaceAssignmentCompat.types
@@ -3,7 +3,7 @@ class Shape {
 >Shape : Shape
 
     static create(): Shape {
->create : typeof create
+>create : () => Shape
 >Shape : Shape
 
         return new Shape();
diff --git a/tests/baselines/reference/staticMemberAccessOffDerivedType1.types b/tests/baselines/reference/staticMemberAccessOffDerivedType1.types
index 13aec1da2c0..abae26973b0 100644
--- a/tests/baselines/reference/staticMemberAccessOffDerivedType1.types
+++ b/tests/baselines/reference/staticMemberAccessOffDerivedType1.types
@@ -3,7 +3,7 @@ class SomeBase {
 >SomeBase : SomeBase
 
     static GetNumber() {
->GetNumber : typeof GetNumber
+>GetNumber : () => number
 
         return 2;
     }
@@ -15,8 +15,8 @@ class P extends SomeBase {
     static SomeNumber = P.GetNumber();
 >SomeNumber : number
 >P.GetNumber() : number
->P.GetNumber : typeof GetNumber
+>P.GetNumber : () => number
 >P : typeof P
->GetNumber : typeof GetNumber
+>GetNumber : () => number
 }
 
diff --git a/tests/baselines/reference/stringLiteralObjectLiteralDeclaration1.types b/tests/baselines/reference/stringLiteralObjectLiteralDeclaration1.types
index 8a68a436577..1f2695a0bb6 100644
--- a/tests/baselines/reference/stringLiteralObjectLiteralDeclaration1.types
+++ b/tests/baselines/reference/stringLiteralObjectLiteralDeclaration1.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/stringLiteralObjectLiteralDeclaration1.ts ===
 module m1 {
->m1 : typeof m1
+>m1 : m1
 
   export var n = { 'foo bar': 4 };
 >n : { 'foo bar': number; }
diff --git a/tests/baselines/reference/structural1.types b/tests/baselines/reference/structural1.types
index cb0e8a356a5..fa99db38a5f 100644
--- a/tests/baselines/reference/structural1.types
+++ b/tests/baselines/reference/structural1.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/structural1.ts ===
 module M {
->M : typeof M
+>M : M
 
     export interface I {
 >I : I
diff --git a/tests/baselines/reference/structuralTypeInDeclareFileForModule.types b/tests/baselines/reference/structuralTypeInDeclareFileForModule.types
index ff023a79133..c3769f9dd6a 100644
--- a/tests/baselines/reference/structuralTypeInDeclareFileForModule.types
+++ b/tests/baselines/reference/structuralTypeInDeclareFileForModule.types
@@ -1,7 +1,7 @@
 === tests/cases/compiler/structuralTypeInDeclareFileForModule.ts ===
 
 module M { export var x; }
->M : typeof M
+>M : M
 >x : any
 
 var m = M;
diff --git a/tests/baselines/reference/subtypesOfAny.types b/tests/baselines/reference/subtypesOfAny.types
index ec88559ce9b..40aaf6836c7 100644
--- a/tests/baselines/reference/subtypesOfAny.types
+++ b/tests/baselines/reference/subtypesOfAny.types
@@ -183,7 +183,7 @@ function f() { }
 >f : typeof f
 
 module f {
->f : typeof f
+>f : f
 
     export var bar = 1;
 >bar : number
@@ -205,7 +205,7 @@ class c { baz: string }
 >baz : string
 
 module c {
->c : typeof c
+>c : c
 
     export var bar = 1;
 >bar : number
diff --git a/tests/baselines/reference/subtypingWithCallSignatures.types b/tests/baselines/reference/subtypingWithCallSignatures.types
index c9c35c1cd55..969e6f09b39 100644
--- a/tests/baselines/reference/subtypingWithCallSignatures.types
+++ b/tests/baselines/reference/subtypingWithCallSignatures.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithCallSignatures.ts ===
 module CallSignature {
->CallSignature : typeof CallSignature
+>CallSignature : CallSignature
 
     declare function foo1(cb: (x: number) => void): typeof cb;
 >foo1 : typeof foo1
diff --git a/tests/baselines/reference/subtypingWithCallSignatures2.types b/tests/baselines/reference/subtypingWithCallSignatures2.types
index 91984c6aba2..ea152e90d5d 100644
--- a/tests/baselines/reference/subtypingWithCallSignatures2.types
+++ b/tests/baselines/reference/subtypingWithCallSignatures2.types
@@ -173,12 +173,12 @@ declare function foo12(a: (x: Array<Base>, y: Array<Derived2>) => Array<Derived>
 >foo12 : typeof foo12
 >a : (x: Base[], y: Derived2[]) => Derived[]
 >x : Base[]
->Array : T[]
+>Array : Array<T>
 >Base : Base
 >y : Derived2[]
->Array : T[]
+>Array : Array<T>
 >Derived2 : Derived2
->Array : T[]
+>Array : Array<T>
 >Derived : Derived
 >a : (x: Base[], y: Derived2[]) => Derived[]
 
@@ -190,12 +190,12 @@ declare function foo13(a: (x: Array<Base>, y: Array<Derived>) => Array<Derived>)
 >foo13 : typeof foo13
 >a : (x: Base[], y: Derived[]) => Derived[]
 >x : Base[]
->Array : T[]
+>Array : Array<T>
 >Base : Base
 >y : Derived[]
->Array : T[]
+>Array : Array<T>
 >Derived : Derived
->Array : T[]
+>Array : Array<T>
 >Derived : Derived
 >a : (x: Base[], y: Derived[]) => Derived[]
 
@@ -758,28 +758,28 @@ var r12arg1 = <T extends Array<Base>>(x: Array<Base>, y: T) => <Array<Derived>>n
 >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[]
+>Array : Array<T>
 >Base : Base
 >x : Base[]
->Array : T[]
+>Array : Array<T>
 >Base : Base
 >y : T
 >T : T
 ><Array<Derived>>null : Derived[]
->Array : T[]
+>Array : Array<T>
 >Derived : Derived
 
 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[]
+>Array : Array<T>
 >Base : Base
 >y : Derived2[]
->Array : T[]
+>Array : Array<T>
 >Derived2 : Derived2
 ><Array<Derived>>null : Derived[]
->Array : T[]
+>Array : Array<T>
 >Derived : Derived
 
 var r12 = foo12(r12arg1); // any
@@ -804,10 +804,10 @@ 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[]
+>Array : Array<T>
 >Derived : Derived
 >x : Base[]
->Array : T[]
+>Array : Array<T>
 >Base : Base
 >y : T
 >T : T
@@ -817,13 +817,13 @@ 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[]
+>Array : Array<T>
 >Base : Base
 >y : Derived[]
->Array : T[]
+>Array : Array<T>
 >Derived : Derived
 ><Array<Derived>>null : Derived[]
->Array : T[]
+>Array : Array<T>
 >Derived : Derived
 
 var r13 = foo13(r13arg1); // any
diff --git a/tests/baselines/reference/subtypingWithCallSignatures3.types b/tests/baselines/reference/subtypingWithCallSignatures3.types
index 122301a477d..21622d51661 100644
--- a/tests/baselines/reference/subtypingWithCallSignatures3.types
+++ b/tests/baselines/reference/subtypingWithCallSignatures3.types
@@ -3,7 +3,7 @@
 // error cases, so function calls will all result in 'any'
 
 module Errors {
->Errors : typeof Errors
+>Errors : Errors
 
     class Base { foo: string; }
 >Base : Base
@@ -101,12 +101,12 @@ module Errors {
 >foo12 : typeof foo12
 >a2 : (x: Base[], y: Derived2[]) => Derived[]
 >x : Base[]
->Array : T[]
+>Array : Array<T>
 >Base : Base
 >y : Derived2[]
->Array : T[]
+>Array : Array<T>
 >Derived2 : Derived2
->Array : T[]
+>Array : Array<T>
 >Derived : Derived
 >a2 : (x: Base[], y: Derived2[]) => Derived[]
 
@@ -432,26 +432,26 @@ 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[]
+>Array : Array<T>
 >Base : Base
 >y : Derived2[]
->Array : T[]
+>Array : Array<T>
 >Derived2 : Derived2
 ><Array<Derived>>null : Derived[]
->Array : T[]
+>Array : Array<T>
 >Derived : Derived
 
     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[]
+>Array : Array<T>
 >Derived2 : Derived2
 >x : Base[]
->Array : T[]
+>Array : Array<T>
 >Base : Base
 >y : Base[]
->Array : T[]
+>Array : Array<T>
 >Base : Base
 ><T>null : T
 >T : T
@@ -575,7 +575,7 @@ module Errors {
 }
 
 module WithGenericSignaturesInBaseType {
->WithGenericSignaturesInBaseType : typeof WithGenericSignaturesInBaseType
+>WithGenericSignaturesInBaseType : WithGenericSignaturesInBaseType
 
     declare function foo2(a2: <T>(x: T) => T[]): typeof a2;
 >foo2 : typeof foo2
diff --git a/tests/baselines/reference/subtypingWithConstructSignatures.types b/tests/baselines/reference/subtypingWithConstructSignatures.types
index ed6ebc18c56..892e3983132 100644
--- a/tests/baselines/reference/subtypingWithConstructSignatures.types
+++ b/tests/baselines/reference/subtypingWithConstructSignatures.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithConstructSignatures.ts ===
 module ConstructSignature {
->ConstructSignature : typeof ConstructSignature
+>ConstructSignature : ConstructSignature
 
     declare function foo1(cb: new (x: number) => void): typeof cb;
 >foo1 : typeof foo1
diff --git a/tests/baselines/reference/subtypingWithConstructSignatures2.types b/tests/baselines/reference/subtypingWithConstructSignatures2.types
index 75859e04902..713477a63fa 100644
--- a/tests/baselines/reference/subtypingWithConstructSignatures2.types
+++ b/tests/baselines/reference/subtypingWithConstructSignatures2.types
@@ -173,12 +173,12 @@ declare function foo12(a: new (x: Array<Base>, y: Array<Derived2>) => Array<Deri
 >foo12 : typeof foo12
 >a : new (x: Base[], y: Derived2[]) => Derived[]
 >x : Base[]
->Array : T[]
+>Array : Array<T>
 >Base : Base
 >y : Derived2[]
->Array : T[]
+>Array : Array<T>
 >Derived2 : Derived2
->Array : T[]
+>Array : Array<T>
 >Derived : Derived
 >a : new (x: Base[], y: Derived2[]) => Derived[]
 
@@ -190,12 +190,12 @@ declare function foo13(a: new (x: Array<Base>, y: Array<Derived>) => Array<Deriv
 >foo13 : typeof foo13
 >a : new (x: Base[], y: Derived[]) => Derived[]
 >x : Base[]
->Array : T[]
+>Array : Array<T>
 >Base : Base
 >y : Derived[]
->Array : T[]
+>Array : Array<T>
 >Derived : Derived
->Array : T[]
+>Array : Array<T>
 >Derived : Derived
 >a : new (x: Base[], y: Derived[]) => Derived[]
 
@@ -713,25 +713,25 @@ 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[]
+>Array : Array<T>
 >Base : Base
 >x : Base[]
->Array : T[]
+>Array : Array<T>
 >Base : Base
 >y : T
 >T : T
->Array : T[]
+>Array : 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[]
+>Array : Array<T>
 >Base : Base
 >y : Derived2[]
->Array : T[]
+>Array : Array<T>
 >Derived2 : Derived2
->Array : T[]
+>Array : Array<T>
 >Derived : Derived
 
 var r12 = foo12(r12arg1); // any
@@ -755,10 +755,10 @@ 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[]
+>Array : Array<T>
 >Derived : Derived
 >x : Base[]
->Array : T[]
+>Array : Array<T>
 >Base : Base
 >y : T
 >T : T
@@ -767,12 +767,12 @@ var r13arg1: new <T extends Array<Derived>>(x: Array<Base>, y: T) => T;
 var r13arg2: new (x: Array<Base>, y: Array<Derived>) => Array<Derived>;
 >r13arg2 : new (x: Base[], y: Derived[]) => Derived[]
 >x : Base[]
->Array : T[]
+>Array : Array<T>
 >Base : Base
 >y : Derived[]
->Array : T[]
+>Array : Array<T>
 >Derived : Derived
->Array : T[]
+>Array : Array<T>
 >Derived : Derived
 
 var r13 = foo13(r13arg1); // any
diff --git a/tests/baselines/reference/subtypingWithConstructSignatures3.types b/tests/baselines/reference/subtypingWithConstructSignatures3.types
index 5d33a2149d6..96b68efe59a 100644
--- a/tests/baselines/reference/subtypingWithConstructSignatures3.types
+++ b/tests/baselines/reference/subtypingWithConstructSignatures3.types
@@ -3,7 +3,7 @@
 // error cases, so function calls will all result in 'any'
 
 module Errors {
->Errors : typeof Errors
+>Errors : Errors
 
     class Base { foo: string; }
 >Base : Base
@@ -101,12 +101,12 @@ module Errors {
 >foo12 : typeof foo12
 >a2 : new (x: Base[], y: Derived2[]) => Derived[]
 >x : Base[]
->Array : T[]
+>Array : Array<T>
 >Base : Base
 >y : Derived2[]
->Array : T[]
+>Array : Array<T>
 >Derived2 : Derived2
->Array : T[]
+>Array : Array<T>
 >Derived : Derived
 >a2 : new (x: Base[], y: Derived2[]) => Derived[]
 
@@ -401,24 +401,24 @@ module Errors {
     var r6arg1: new (x: Array<Base>, y: Array<Derived2>) => Array<Derived>;
 >r6arg1 : new (x: Base[], y: Derived2[]) => Derived[]
 >x : Base[]
->Array : T[]
+>Array : Array<T>
 >Base : Base
 >y : Derived2[]
->Array : T[]
+>Array : Array<T>
 >Derived2 : Derived2
->Array : T[]
+>Array : 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[]
+>Array : Array<T>
 >Derived2 : Derived2
 >x : Base[]
->Array : T[]
+>Array : Array<T>
 >Base : Base
 >y : Base[]
->Array : T[]
+>Array : Array<T>
 >Base : Base
 >T : T
 
@@ -533,7 +533,7 @@ module Errors {
 }
 
 module WithGenericSignaturesInBaseType {
->WithGenericSignaturesInBaseType : typeof WithGenericSignaturesInBaseType
+>WithGenericSignaturesInBaseType : WithGenericSignaturesInBaseType
 
     declare function foo2(a2: new <T>(x: T) => T[]): typeof a2;
 >foo2 : typeof foo2
diff --git a/tests/baselines/reference/subtypingWithConstructSignatures5.types b/tests/baselines/reference/subtypingWithConstructSignatures5.types
index 7ffb4db5467..1b27400656f 100644
--- a/tests/baselines/reference/subtypingWithConstructSignatures5.types
+++ b/tests/baselines/reference/subtypingWithConstructSignatures5.types
@@ -111,23 +111,23 @@ interface A { // T
     a12: new (x: Array<Base>, y: Array<Derived2>) => Array<Derived>;
 >a12 : new (x: Base[], y: Derived2[]) => Derived[]
 >x : Base[]
->Array : T[]
+>Array : Array<T>
 >Base : Base
 >y : Derived2[]
->Array : T[]
+>Array : Array<T>
 >Derived2 : Derived2
->Array : T[]
+>Array : 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[]
+>Array : Array<T>
 >Base : Base
 >y : Derived[]
->Array : T[]
+>Array : Array<T>
 >Derived : Derived
->Array : T[]
+>Array : Array<T>
 >Derived : Derived
 
     a14: new (x: { a: string; b: number }) => Object;
@@ -280,23 +280,23 @@ interface I extends B {
     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[]
+>Array : Array<T>
 >Base : Base
 >x : Base[]
->Array : T[]
+>Array : Array<T>
 >Base : Base
 >y : T
 >T : T
->Array : T[]
+>Array : 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[]
+>Array : Array<T>
 >Derived : Derived
 >x : Base[]
->Array : T[]
+>Array : Array<T>
 >Base : Base
 >y : T
 >T : T
diff --git a/tests/baselines/reference/subtypingWithObjectMembersOptionality.types b/tests/baselines/reference/subtypingWithObjectMembersOptionality.types
index d60045d363b..8aff0f02840 100644
--- a/tests/baselines/reference/subtypingWithObjectMembersOptionality.types
+++ b/tests/baselines/reference/subtypingWithObjectMembersOptionality.types
@@ -90,7 +90,7 @@ var r = true ? a : b;
 >b : { Foo: Derived; }
 
 module TwoLevels {
->TwoLevels : typeof TwoLevels
+>TwoLevels : TwoLevels
 
     interface T {
 >T : T
diff --git a/tests/baselines/reference/superAccessInFatArrow1.types b/tests/baselines/reference/superAccessInFatArrow1.types
index d14f4cc549c..882967d920d 100644
--- a/tests/baselines/reference/superAccessInFatArrow1.types
+++ b/tests/baselines/reference/superAccessInFatArrow1.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/superAccessInFatArrow1.ts ===
 module test {
->test : typeof test
+>test : test
 
     export class A {
 >A : A
diff --git a/tests/baselines/reference/superCallFromClassThatDerivesFromGenericType1.types b/tests/baselines/reference/superCallFromClassThatDerivesFromGenericType1.types
index 6b2b340bfbb..e125522bbb7 100644
--- a/tests/baselines/reference/superCallFromClassThatDerivesFromGenericType1.types
+++ b/tests/baselines/reference/superCallFromClassThatDerivesFromGenericType1.types
@@ -10,7 +10,7 @@ declare class B<T> {
 >U : U
 
     static g(): B<any>;
->g : typeof g
+>g : () => B<any>
 >B : B<T>
 }
 
diff --git a/tests/baselines/reference/superWithGenerics.types b/tests/baselines/reference/superWithGenerics.types
index 9f765db7b48..89086033284 100644
--- a/tests/baselines/reference/superWithGenerics.types
+++ b/tests/baselines/reference/superWithGenerics.types
@@ -10,7 +10,7 @@ declare class B<T> {
 >U : U
 
     static g(): B<any>;
->g : typeof g
+>g : () => B<any>
 >B : B<T>
 }
 
diff --git a/tests/baselines/reference/switchStatements.types b/tests/baselines/reference/switchStatements.types
index 7f082ba5f27..9dc3a2c2b15 100644
--- a/tests/baselines/reference/switchStatements.types
+++ b/tests/baselines/reference/switchStatements.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/statements/switchStatements/switchStatements.ts ===
 module M {
->M : typeof M
+>M : M
 
     export function fn(x: number) {
 >fn : typeof fn
@@ -55,9 +55,9 @@ switch (x) {
 
     case M.fn(1):
 >M.fn(1) : string
->M.fn : typeof fn
+>M.fn : typeof M.fn
 >M : typeof M
->fn : typeof fn
+>fn : typeof M.fn
 
     case <T>(x: number) => '':
 ><T>(x: number) => '' : <T>(x: number) => string
diff --git a/tests/baselines/reference/targetTypeObjectLiteralToAny.types b/tests/baselines/reference/targetTypeObjectLiteralToAny.types
index cbb1879ed4c..3bc76954da3 100644
--- a/tests/baselines/reference/targetTypeObjectLiteralToAny.types
+++ b/tests/baselines/reference/targetTypeObjectLiteralToAny.types
@@ -23,7 +23,7 @@ function suggest(){
 >push : any
 >{text:keyword, type:"keyword"} : { text: string; type: string; }
 >text : string
->keyword : keyword
+>keyword : string
 >type : string
 
 	});			
diff --git a/tests/baselines/reference/thisInGenericStaticMembers.types b/tests/baselines/reference/thisInGenericStaticMembers.types
index 5852fa37f77..ea05ed83473 100644
--- a/tests/baselines/reference/thisInGenericStaticMembers.types
+++ b/tests/baselines/reference/thisInGenericStaticMembers.types
@@ -5,7 +5,7 @@ class A {
 >A : A
 
     static one<T>(source:T, value: number): T {
->one : typeof one
+>one : <T>(source: T, value: number) => T
 >T : T
 >source : T
 >T : T
@@ -17,7 +17,7 @@ class A {
     }
 
     static two<T>(source: T): T {
->two : typeof two
+>two : <T>(source: T) => T
 >T : T
 >source : T
 >T : T
@@ -25,9 +25,9 @@ class A {
 
         return this.one<T>(source, 42);
 >this.one<T>(source, 42) : T
->this.one : typeof one
+>this.one : <T>(source: T, value: number) => T
 >this : typeof A
->one : typeof one
+>one : <T>(source: T, value: number) => T
 >T : T
 >source : T
     }
@@ -37,7 +37,7 @@ class B {
 >B : B
 
     static one(source: B, value: number): B {
->one : typeof one
+>one : (source: B, value: number) => B
 >source : B
 >B : B
 >value : number
@@ -48,16 +48,16 @@ class B {
     }
 
     static two(source: B): B {
->two : typeof two
+>two : (source: B) => B
 >source : B
 >B : B
 >B : B
 
         return this.one(source, 42);
 >this.one(source, 42) : B
->this.one : typeof one
+>this.one : (source: B, value: number) => B
 >this : typeof B
->one : typeof one
+>one : (source: B, value: number) => B
 >source : B
     }
 }
diff --git a/tests/baselines/reference/thisInModuleFunction1.types b/tests/baselines/reference/thisInModuleFunction1.types
index bb13435a29f..627e77ef1e5 100644
--- a/tests/baselines/reference/thisInModuleFunction1.types
+++ b/tests/baselines/reference/thisInModuleFunction1.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/thisInModuleFunction1.ts ===
 module bar {
->bar : typeof bar
+>bar : bar
 
  export function bar() {
 >bar : typeof bar
@@ -12,7 +12,7 @@ module bar {
 var z = bar.bar();
 >z : any
 >bar.bar() : any
->bar.bar : typeof bar
->bar : typeof bar
+>bar.bar : typeof bar.bar
 >bar : typeof bar
+>bar : typeof bar.bar
 
diff --git a/tests/baselines/reference/thisInStaticMethod1.types b/tests/baselines/reference/thisInStaticMethod1.types
index 15f079cd514..fd7c4dcf48e 100644
--- a/tests/baselines/reference/thisInStaticMethod1.types
+++ b/tests/baselines/reference/thisInStaticMethod1.types
@@ -6,7 +6,7 @@ class foo {
 >x : number
 
  static bar() {
->bar : typeof bar
+>bar : () => number
 
   return this.x;
 >this.x : number
@@ -17,7 +17,7 @@ class foo {
 var x = foo.bar();
 >x : number
 >foo.bar() : number
->foo.bar : typeof bar
+>foo.bar : () => number
 >foo : typeof foo
->bar : typeof bar
+>bar : () => number
 
diff --git a/tests/baselines/reference/throwStatements.types b/tests/baselines/reference/throwStatements.types
index c34a1177ab9..3aa2e7b5822 100644
--- a/tests/baselines/reference/throwStatements.types
+++ b/tests/baselines/reference/throwStatements.types
@@ -41,7 +41,7 @@ function F(x: string): number { return 42; }
 >x : string
 
 module M {
->M : typeof M
+>M : M
 
     export class A {
 >A : A
@@ -168,23 +168,23 @@ throw typeof M;
 >M : typeof M
 
 var aClassInModule = new M.A();
->aClassInModule : A
->new M.A() : A
->M.A : typeof A
+>aClassInModule : M.A
+>new M.A() : M.A
+>M.A : typeof M.A
 >M : typeof M
->A : typeof A
+>A : typeof M.A
 
 throw aClassInModule;
->aClassInModule : A
+>aClassInModule : M.A
 
 var aFunctionInModule = M.F2;
->aFunctionInModule : typeof F2
->M.F2 : typeof F2
+>aFunctionInModule : typeof M.F2
+>M.F2 : typeof M.F2
 >M : typeof M
->F2 : typeof F2
+>F2 : typeof M.F2
 
 throw aFunctionInModule;
->aFunctionInModule : typeof F2
+>aFunctionInModule : typeof M.F2
 
 // no initializer or annotation, so this is an 'any'
 var x;
diff --git a/tests/baselines/reference/topLevel.types b/tests/baselines/reference/topLevel.types
index 4476ec55134..e10ad1964b5 100644
--- a/tests/baselines/reference/topLevel.types
+++ b/tests/baselines/reference/topLevel.types
@@ -71,7 +71,7 @@ result+=(new Point(3,4).move(2,2));
 >move : (xo: number, yo: number) => Point
 
 module M {
->M : typeof M
+>M : M
 
     export var origin=new Point(0,0);
 >origin : Point
diff --git a/tests/baselines/reference/topLevelAmbientModule.types b/tests/baselines/reference/topLevelAmbientModule.types
index 06509cf11b2..eef6dea3d04 100644
--- a/tests/baselines/reference/topLevelAmbientModule.types
+++ b/tests/baselines/reference/topLevelAmbientModule.types
@@ -1,13 +1,13 @@
 === tests/cases/conformance/externalModules/foo_1.ts ===
 /// <reference path="foo_0.ts"/>
 import foo = require("foo");
->foo : typeof "foo"
+>foo : foo
 
 var z = foo.x + 10;
 >z : number
 >foo.x + 10 : number
 >foo.x : number
->foo : typeof "foo"
+>foo : typeof foo
 >x : number
 
 === tests/cases/conformance/externalModules/foo_0.ts ===
diff --git a/tests/baselines/reference/topLevelFileModule.types b/tests/baselines/reference/topLevelFileModule.types
index dee010ab086..101574f340d 100644
--- a/tests/baselines/reference/topLevelFileModule.types
+++ b/tests/baselines/reference/topLevelFileModule.types
@@ -1,18 +1,18 @@
 === tests/cases/conformance/externalModules/foo_1.ts ===
 import foo = require("vs/foo_0");
->foo : typeof "tests/cases/conformance/externalModules/vs/foo_0"
+>foo : foo
 
 import fum = require("vs/fum");
->fum : typeof "tests/cases/conformance/externalModules/vs/fum"
+>fum : fum
 
 var z = foo.x + fum.y;
 >z : number
 >foo.x + fum.y : number
 >foo.x : number
->foo : typeof "tests/cases/conformance/externalModules/vs/foo_0"
+>foo : typeof foo
 >x : number
 >fum.y : number
->fum : typeof "tests/cases/conformance/externalModules/vs/fum"
+>fum : typeof fum
 >y : number
 
 === tests/cases/conformance/externalModules/vs/foo_0.ts ===
diff --git a/tests/baselines/reference/twoMergedInterfacesWithDifferingOverloads2.types b/tests/baselines/reference/twoMergedInterfacesWithDifferingOverloads2.types
index 46fa17d31a6..529675d1533 100644
--- a/tests/baselines/reference/twoMergedInterfacesWithDifferingOverloads2.types
+++ b/tests/baselines/reference/twoMergedInterfacesWithDifferingOverloads2.types
@@ -35,7 +35,7 @@ var r3 = a(1, 2);
 >a : A
 
 module G {
->G : typeof G
+>G : G
 
     interface A<T> {
 >A : A<T>
diff --git a/tests/baselines/reference/typeCheckObjectCreationExpressionWithUndefinedCallResolutionData.types b/tests/baselines/reference/typeCheckObjectCreationExpressionWithUndefinedCallResolutionData.types
index 79ff4b1687b..e395f608c59 100644
--- a/tests/baselines/reference/typeCheckObjectCreationExpressionWithUndefinedCallResolutionData.types
+++ b/tests/baselines/reference/typeCheckObjectCreationExpressionWithUndefinedCallResolutionData.types
@@ -1,12 +1,12 @@
 === tests/cases/compiler/file2.ts ===
 import f = require('file1');
->f : typeof "tests/cases/compiler/file1"
+>f : f
 
 f.foo();
 >f.foo() : any
->f.foo : typeof foo
->f : typeof "tests/cases/compiler/file1"
->foo : typeof foo
+>f.foo : typeof f.foo
+>f : typeof f
+>foo : typeof f.foo
 
 === tests/cases/compiler/file1.ts ===
 export function foo() {
diff --git a/tests/baselines/reference/typeOfThisInFunctionExpression.types b/tests/baselines/reference/typeOfThisInFunctionExpression.types
index 5b66ec0d5c9..e71bc87f1e7 100644
--- a/tests/baselines/reference/typeOfThisInFunctionExpression.types
+++ b/tests/baselines/reference/typeOfThisInFunctionExpression.types
@@ -66,7 +66,7 @@ class C {
 }
 
 module M {
->M : typeof M
+>M : M
 
     function fn() {
 >fn : typeof fn
diff --git a/tests/baselines/reference/typeOfThisInMemberFunctions.types b/tests/baselines/reference/typeOfThisInMemberFunctions.types
index 7d31126658d..2be8af1ca75 100644
--- a/tests/baselines/reference/typeOfThisInMemberFunctions.types
+++ b/tests/baselines/reference/typeOfThisInMemberFunctions.types
@@ -11,7 +11,7 @@ class C {
     }
 
     static bar() {
->bar : typeof bar
+>bar : () => void
 
         var r2 = this;
 >r2 : typeof C
@@ -36,7 +36,7 @@ class D<T> {
     }
 
     static bar() {
->bar : typeof bar
+>bar : () => void
 
         var r2 = this;
 >r2 : typeof D
@@ -62,7 +62,7 @@ class E<T extends Date> {
     }
 
     static bar() {
->bar : typeof bar
+>bar : () => void
 
         var r2 = this;
 >r2 : typeof E
diff --git a/tests/baselines/reference/typeOfThisInStaticMembers.types b/tests/baselines/reference/typeOfThisInStaticMembers.types
index c455bb0a226..65440fb1f2e 100644
--- a/tests/baselines/reference/typeOfThisInStaticMembers.types
+++ b/tests/baselines/reference/typeOfThisInStaticMembers.types
@@ -9,7 +9,7 @@ class C {
 >foo : number
 
     static bar() {
->bar : typeof bar
+>bar : () => typeof C
 
         // type of this is the constructor function type
         var t = this;
@@ -24,9 +24,9 @@ class C {
 var t = C.bar();
 >t : typeof C
 >C.bar() : typeof C
->C.bar : typeof bar
+>C.bar : () => typeof C
 >C : typeof C
->bar : typeof bar
+>bar : () => typeof C
 
 // all ok
 var r2 = t.foo + 1;
@@ -39,9 +39,9 @@ var r2 = t.foo + 1;
 var r3 = t.bar();
 >r3 : typeof C
 >t.bar() : typeof C
->t.bar : typeof bar
+>t.bar : () => typeof C
 >t : typeof C
->bar : typeof bar
+>bar : () => typeof C
 
 var r4 = new t(1);
 >r4 : C
@@ -62,7 +62,7 @@ class C2<T> {
 >foo : string
 
     static bar() {
->bar : typeof bar
+>bar : () => typeof C2
 
         // type of this is the constructor function type
         var t = this;
@@ -77,9 +77,9 @@ class C2<T> {
 var t2 = C2.bar();
 >t2 : typeof C2
 >C2.bar() : typeof C2
->C2.bar : typeof bar
+>C2.bar : () => typeof C2
 >C2 : typeof C2
->bar : typeof bar
+>bar : () => typeof C2
 
 // all ok
 var r5 = t2.foo + 1;
@@ -92,9 +92,9 @@ var r5 = t2.foo + 1;
 var r6 = t2.bar();
 >r6 : typeof C2
 >t2.bar() : typeof C2
->t2.bar : typeof bar
+>t2.bar : () => typeof C2
 >t2 : typeof C2
->bar : typeof bar
+>bar : () => typeof C2
 
 var r7 = new t2('');
 >r7 : C2<{}>
diff --git a/tests/baselines/reference/typeResolution.types b/tests/baselines/reference/typeResolution.types
index 67e4fd82518..ca173566324 100644
--- a/tests/baselines/reference/typeResolution.types
+++ b/tests/baselines/reference/typeResolution.types
@@ -1,12 +1,12 @@
 === tests/cases/compiler/typeResolution.ts ===
 export module TopLevelModule1 {
->TopLevelModule1 : typeof TopLevelModule1
+>TopLevelModule1 : TopLevelModule1
 
     export module SubModule1 {
->SubModule1 : typeof SubModule1
+>SubModule1 : SubModule1
 
         export module SubSubModule1 {
->SubSubModule1 : typeof SubSubModule1
+>SubSubModule1 : SubSubModule1
 
             export class ClassA {
 >ClassA : ClassA
@@ -75,14 +75,14 @@ export module TopLevelModule1 {
                     
                     // Type only accessible from the root
                     var c1: TopLevelModule1.SubModule2.SubSubModule2.ClassA; c1.AisIn1_2_2();
->c1 : ClassA
+>c1 : SubModule2.SubSubModule2.ClassA
 >TopLevelModule1 : TopLevelModule1
 >SubModule2 : SubModule2
->SubSubModule2 : SubSubModule2
->ClassA : ClassA
+>SubSubModule2 : SubModule2.SubSubModule2
+>ClassA : SubModule2.SubSubModule2.ClassA
 >c1.AisIn1_2_2() : void
 >c1.AisIn1_2_2 : () => void
->c1 : ClassA
+>c1 : SubModule2.SubSubModule2.ClassA
 >AisIn1_2_2 : () => void
                     
                     // Interface reference
@@ -173,24 +173,24 @@ export module TopLevelModule1 {
                     
                     // Type only accessible from the root
                     var c1: TopLevelModule1.SubModule2.SubSubModule2.ClassA; c1.AisIn1_2_2();
->c1 : ClassA
+>c1 : SubModule2.SubSubModule2.ClassA
 >TopLevelModule1 : TopLevelModule1
 >SubModule2 : SubModule2
->SubSubModule2 : SubSubModule2
->ClassA : ClassA
+>SubSubModule2 : SubModule2.SubSubModule2
+>ClassA : SubModule2.SubSubModule2.ClassA
 >c1.AisIn1_2_2() : void
 >c1.AisIn1_2_2 : () => void
->c1 : ClassA
+>c1 : SubModule2.SubSubModule2.ClassA
 >AisIn1_2_2 : () => void
 
                     var c2: TopLevelModule2.SubModule3.ClassA; c2.AisIn2_3();
->c2 : ClassA
+>c2 : TopLevelModule2.SubModule3.ClassA
 >TopLevelModule2 : TopLevelModule2
->SubModule3 : SubModule3
->ClassA : ClassA
+>SubModule3 : TopLevelModule2.SubModule3
+>ClassA : TopLevelModule2.SubModule3.ClassA
 >c2.AisIn2_3() : void
 >c2.AisIn2_3 : () => void
->c2 : ClassA
+>c2 : TopLevelModule2.SubModule3.ClassA
 >AisIn2_3 : () => void
                     
                     // Interface reference
@@ -236,14 +236,14 @@ export module TopLevelModule1 {
 >AisIn1_1_1 : () => void
 
                         var c1: TopLevelModule1.SubModule2.SubSubModule2.ClassA; c1.AisIn1_2_2();
->c1 : ClassA
+>c1 : SubModule2.SubSubModule2.ClassA
 >TopLevelModule1 : TopLevelModule1
 >SubModule2 : SubModule2
->SubSubModule2 : SubSubModule2
->ClassA : ClassA
+>SubSubModule2 : SubModule2.SubSubModule2
+>ClassA : SubModule2.SubSubModule2.ClassA
 >c1.AisIn1_2_2() : void
 >c1.AisIn1_2_2 : () => void
->c1 : ClassA
+>c1 : SubModule2.SubSubModule2.ClassA
 >AisIn1_2_2 : () => void
 
                         var d1: InterfaceX; d1.XisIn1_1_1();
@@ -255,13 +255,13 @@ export module TopLevelModule1 {
 >XisIn1_1_1 : () => any
 
                         var c2: TopLevelModule2.SubModule3.ClassA; c2.AisIn2_3();
->c2 : ClassA
+>c2 : TopLevelModule2.SubModule3.ClassA
 >TopLevelModule2 : TopLevelModule2
->SubModule3 : SubModule3
->ClassA : ClassA
+>SubModule3 : TopLevelModule2.SubModule3
+>ClassA : TopLevelModule2.SubModule3.ClassA
 >c2.AisIn2_3() : void
 >c2.AisIn2_3 : () => void
->c2 : ClassA
+>c2 : TopLevelModule2.SubModule3.ClassA
 >AisIn2_3 : () => void
                     }
                 }
@@ -277,43 +277,43 @@ export module TopLevelModule1 {
 >AA : () => void
 
                     var a2: SubSubModule1.ClassA; a2.AisIn1_1_1();
->a2 : ClassA
+>a2 : SubSubModule1.ClassA
 >SubSubModule1 : SubSubModule1
->ClassA : ClassA
+>ClassA : SubSubModule1.ClassA
 >a2.AisIn1_1_1() : void
 >a2.AisIn1_1_1 : () => void
->a2 : ClassA
+>a2 : SubSubModule1.ClassA
 >AisIn1_1_1 : () => void
 
                     var a3: SubModule1.SubSubModule1.ClassA; a3.AisIn1_1_1();
->a3 : ClassA
+>a3 : SubSubModule1.ClassA
 >SubModule1 : SubModule1
 >SubSubModule1 : SubSubModule1
->ClassA : ClassA
+>ClassA : SubSubModule1.ClassA
 >a3.AisIn1_1_1() : void
 >a3.AisIn1_1_1 : () => void
->a3 : ClassA
+>a3 : SubSubModule1.ClassA
 >AisIn1_1_1 : () => void
 
                     var a4: TopLevelModule1.SubModule1.SubSubModule1.ClassA; a4.AisIn1_1_1();
->a4 : ClassA
+>a4 : SubSubModule1.ClassA
 >TopLevelModule1 : TopLevelModule1
 >SubModule1 : SubModule1
 >SubSubModule1 : SubSubModule1
->ClassA : ClassA
+>ClassA : SubSubModule1.ClassA
 >a4.AisIn1_1_1() : void
 >a4.AisIn1_1_1 : () => void
->a4 : ClassA
+>a4 : SubSubModule1.ClassA
 >AisIn1_1_1 : () => void
                     
                     // Interface reference
                     var d2: SubSubModule1.InterfaceX; d2.XisIn1_1_1();
->d2 : InterfaceX
+>d2 : SubSubModule1.InterfaceX
 >SubSubModule1 : SubSubModule1
->InterfaceX : InterfaceX
+>InterfaceX : SubSubModule1.InterfaceX
 >d2.XisIn1_1_1() : any
 >d2.XisIn1_1_1 : () => any
->d2 : InterfaceX
+>d2 : SubSubModule1.InterfaceX
 >XisIn1_1_1 : () => any
                 }
             }
@@ -321,10 +321,10 @@ export module TopLevelModule1 {
     }
 
     export module SubModule2 {
->SubModule2 : typeof SubModule2
+>SubModule2 : SubModule2
 
         export module SubSubModule2 {
->SubSubModule2 : typeof SubSubModule2
+>SubSubModule2 : SubSubModule2
 
             // No code here since these are the mirror of the above calls
             export class ClassA { public AisIn1_2_2() { } }
@@ -367,7 +367,7 @@ export module TopLevelModule1 {
     }
     
     module NotExportedModule {
->NotExportedModule : typeof NotExportedModule
+>NotExportedModule : NotExportedModule
 
         export class ClassA { }
 >ClassA : ClassA
@@ -375,10 +375,10 @@ export module TopLevelModule1 {
 }
 
 module TopLevelModule2 {
->TopLevelModule2 : typeof TopLevelModule2
+>TopLevelModule2 : TopLevelModule2
 
     export module SubModule3 {
->SubModule3 : typeof SubModule3
+>SubModule3 : SubModule3
 
         export class ClassA {
 >ClassA : ClassA
diff --git a/tests/baselines/reference/typeofClass2.types b/tests/baselines/reference/typeofClass2.types
index cc5fc9b5811..8870d9a5874 100644
--- a/tests/baselines/reference/typeofClass2.types
+++ b/tests/baselines/reference/typeofClass2.types
@@ -12,20 +12,20 @@ class C {
 >x : any
 
     static foo(x: number);
->foo : typeof foo
+>foo : { (x: number): any; (x: C): any; }
 >x : number
 
     static foo(x: C);
->foo : typeof foo
+>foo : { (x: number): any; (x: C): any; }
 >x : C
 >C : C
 
     static foo(x) { }
->foo : typeof foo
+>foo : { (x: number): any; (x: C): any; }
 >x : any
 
     static bar(x) { }
->bar : typeof bar
+>bar : (x: any) => void
 >x : any
 }
 
@@ -34,7 +34,7 @@ class D extends C {
 >C : C
 
     static baz(x: number) { }
->baz : typeof baz
+>baz : (x: number) => void
 >x : number
 
     foo() { }
diff --git a/tests/baselines/reference/typeofModuleWithoutExports.types b/tests/baselines/reference/typeofModuleWithoutExports.types
index b1468c9a88e..e82daca8cb1 100644
--- a/tests/baselines/reference/typeofModuleWithoutExports.types
+++ b/tests/baselines/reference/typeofModuleWithoutExports.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/types/specifyingTypes/typeQueries/typeofModuleWithoutExports.ts ===
 module M {
->M : typeof M
+>M : M
 
     var x = 1;
 >x : number
diff --git a/tests/baselines/reference/typeofOperatorWithBooleanType.types b/tests/baselines/reference/typeofOperatorWithBooleanType.types
index 859374a4ed9..34a4d1e3687 100644
--- a/tests/baselines/reference/typeofOperatorWithBooleanType.types
+++ b/tests/baselines/reference/typeofOperatorWithBooleanType.types
@@ -13,10 +13,10 @@ class A {
 >a : boolean
 
     static foo() { return false; }
->foo : typeof foo
+>foo : () => boolean
 }
 module M {
->M : typeof M
+>M : M
 
     export var n: boolean;
 >n : boolean
@@ -70,9 +70,9 @@ var ResultIsString7 = typeof A.foo();
 >ResultIsString7 : string
 >typeof A.foo() : string
 >A.foo() : boolean
->A.foo : typeof foo
+>A.foo : () => boolean
 >A : typeof A
->foo : typeof foo
+>foo : () => boolean
 
 // multiple typeof  operator
 var ResultIsString8 = typeof typeof BOOLEAN;
@@ -148,9 +148,9 @@ z: typeof objA.a;
 
 z: typeof A.foo;
 >typeof A.foo : string
->A.foo : typeof foo
+>A.foo : () => boolean
 >A : typeof A
->foo : typeof foo
+>foo : () => boolean
 
 z: typeof M.n;
 >typeof M.n : string
diff --git a/tests/baselines/reference/typeofOperatorWithNumberType.types b/tests/baselines/reference/typeofOperatorWithNumberType.types
index 575594d96d1..5daa29a919b 100644
--- a/tests/baselines/reference/typeofOperatorWithNumberType.types
+++ b/tests/baselines/reference/typeofOperatorWithNumberType.types
@@ -17,10 +17,10 @@ class A {
 >a : number
 
     static foo() { return 1; }
->foo : typeof foo
+>foo : () => number
 }
 module M {
->M : typeof M
+>M : M
 
     export var n: number;
 >n : number
@@ -95,9 +95,9 @@ var ResultIsString10 = typeof A.foo();
 >ResultIsString10 : string
 >typeof A.foo() : string
 >A.foo() : number
->A.foo : typeof foo
+>A.foo : () => number
 >A : typeof A
->foo : typeof foo
+>foo : () => number
 
 var ResultIsString11 = typeof (NUMBER + NUMBER);
 >ResultIsString11 : string
@@ -202,9 +202,9 @@ z: typeof objA.a;
 
 z: typeof A.foo;
 >typeof A.foo : string
->A.foo : typeof foo
+>A.foo : () => number
 >A : typeof A
->foo : typeof foo
+>foo : () => number
 
 z: typeof M.n;
 >typeof M.n : string
diff --git a/tests/baselines/reference/typeofOperatorWithStringType.types b/tests/baselines/reference/typeofOperatorWithStringType.types
index 568ec34ff00..8bfff145b30 100644
--- a/tests/baselines/reference/typeofOperatorWithStringType.types
+++ b/tests/baselines/reference/typeofOperatorWithStringType.types
@@ -17,10 +17,10 @@ class A {
 >a : string
 
     static foo() { return ""; }
->foo : typeof foo
+>foo : () => string
 }
 module M {
->M : typeof M
+>M : M
 
     export var n: string;
 >n : string
@@ -95,9 +95,9 @@ var ResultIsString10 = typeof A.foo();
 >ResultIsString10 : string
 >typeof A.foo() : string
 >A.foo() : string
->A.foo : typeof foo
+>A.foo : () => string
 >A : typeof A
->foo : typeof foo
+>foo : () => string
 
 var ResultIsString11 = typeof (STRING + STRING);
 >ResultIsString11 : string
@@ -201,9 +201,9 @@ z: typeof objA.a;
 
 z: typeof A.foo;
 >typeof A.foo : string
->A.foo : typeof foo
+>A.foo : () => string
 >A : typeof A
->foo : typeof foo
+>foo : () => string
 
 z: typeof M.n;
 >typeof M.n : string
diff --git a/tests/baselines/reference/undefinedIsSubtypeOfEverything.types b/tests/baselines/reference/undefinedIsSubtypeOfEverything.types
index 42f517432fa..bc2de4fc0fd 100644
--- a/tests/baselines/reference/undefinedIsSubtypeOfEverything.types
+++ b/tests/baselines/reference/undefinedIsSubtypeOfEverything.types
@@ -167,7 +167,7 @@ function f() { }
 >f : typeof f
 
 module f {
->f : typeof f
+>f : f
 
     export var bar = 1;
 >bar : number
@@ -187,7 +187,7 @@ class c { baz: string }
 >baz : string
 
 module c {
->c : typeof c
+>c : c
 
     export var bar = 1;
 >bar : number
diff --git a/tests/baselines/reference/underscoreMapFirst.types b/tests/baselines/reference/underscoreMapFirst.types
index f4fca3dff69..789a8b618a3 100644
--- a/tests/baselines/reference/underscoreMapFirst.types
+++ b/tests/baselines/reference/underscoreMapFirst.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/underscoreMapFirst.ts ===
 declare module _ {
->_ : typeof _
+>_ : _
 
     interface Collection<T> { }
 >Collection : Collection<T>
@@ -132,20 +132,20 @@ class MyView extends View {
 >allSeries : ISeries[][]
 >ISeries : ISeries
 >_.pluck(data, "series") : any[]
->_.pluck : typeof pluck
+>_.pluck : typeof _.pluck
 >_ : typeof _
->pluck : typeof pluck
+>pluck : typeof _.pluck
 >data : IData[]
 
         return _.map(allSeries, _.first);
 >_.map(allSeries, _.first) : ISeries[]
->_.map : typeof map
+>_.map : typeof _.map
 >_ : typeof _
->map : typeof map
+>map : typeof _.map
 >allSeries : ISeries[][]
->_.first : typeof first
+>_.first : typeof _.first
 >_ : typeof _
->first : typeof first
+>first : typeof _.first
     }
 }
 
diff --git a/tests/baselines/reference/underscoreTest1.types b/tests/baselines/reference/underscoreTest1.types
index 75fb30a8a3c..178aeb17322 100644
--- a/tests/baselines/reference/underscoreTest1.types
+++ b/tests/baselines/reference/underscoreTest1.types
@@ -11,7 +11,7 @@ declare function alert(x: string): void;
 _.each([1, 2, 3], (num) => alert(num.toString()));
 >_.each([1, 2, 3], (num) => alert(num.toString())) : void
 >_.each : { <T>(list: T[], iterator: Iterator<T, void>, context?: any): void; <T>(list: Dictionary<T>, iterator: Iterator<T, void>, context?: any): void; }
->_ : Static
+>_ : Underscore.Static
 >each : { <T>(list: T[], iterator: Iterator<T, void>, context?: any): void; <T>(list: Dictionary<T>, iterator: Iterator<T, void>, context?: any): void; }
 >[1, 2, 3] : number[]
 >(num) => alert(num.toString()) : (num: number) => void
@@ -26,7 +26,7 @@ _.each([1, 2, 3], (num) => alert(num.toString()));
 _.each({ one: 1, two: 2, three: 3 }, (value: number, key?: string) => alert(value.toString()));
 >_.each({ one: 1, two: 2, three: 3 }, (value: number, key?: string) => alert(value.toString())) : void
 >_.each : { <T>(list: T[], iterator: Iterator<T, void>, context?: any): void; <T>(list: Dictionary<T>, iterator: Iterator<T, void>, context?: any): void; }
->_ : Static
+>_ : Underscore.Static
 >each : { <T>(list: T[], iterator: Iterator<T, void>, context?: any): void; <T>(list: Dictionary<T>, iterator: Iterator<T, void>, context?: any): void; }
 >{ one: 1, two: 2, three: 3 } : { [x: string]: number; one: number; two: number; three: number; }
 >one : number
@@ -45,7 +45,7 @@ _.each({ one: 1, two: 2, three: 3 }, (value: number, key?: string) => alert(valu
 _.map([1, 2, 3], (num) => num * 3);
 >_.map([1, 2, 3], (num) => num * 3) : number[]
 >_.map : { <T, U>(list: T[], iterator: Iterator<T, U>, context?: any): U[]; <T, U>(list: Dictionary<T>, iterator: Iterator<T, U>, context?: any): U[]; }
->_ : Static
+>_ : Underscore.Static
 >map : { <T, U>(list: T[], iterator: Iterator<T, U>, context?: any): U[]; <T, U>(list: Dictionary<T>, iterator: Iterator<T, U>, context?: any): U[]; }
 >[1, 2, 3] : number[]
 >(num) => num * 3 : (num: number) => number
@@ -56,7 +56,7 @@ _.map([1, 2, 3], (num) => num * 3);
 _.map({ one: 1, two: 2, three: 3 }, (value: number, key?: string) => value * 3);
 >_.map({ one: 1, two: 2, three: 3 }, (value: number, key?: string) => value * 3) : number[]
 >_.map : { <T, U>(list: T[], iterator: Iterator<T, U>, context?: any): U[]; <T, U>(list: Dictionary<T>, iterator: Iterator<T, U>, context?: any): U[]; }
->_ : Static
+>_ : Underscore.Static
 >map : { <T, U>(list: T[], iterator: Iterator<T, U>, context?: any): U[]; <T, U>(list: Dictionary<T>, iterator: Iterator<T, U>, context?: any): U[]; }
 >{ one: 1, two: 2, three: 3 } : { [x: string]: number; one: number; two: number; three: number; }
 >one : number
@@ -72,7 +72,7 @@ var sum = _.reduce([1, 2, 3], (memo, num) => memo + num, 0);
 >sum : number
 >_.reduce([1, 2, 3], (memo, num) => memo + num, 0) : number
 >_.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; }
->_ : Static
+>_ : Underscore.Static
 >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; }
 >[1, 2, 3] : number[]
 >(memo, num) => memo + num : (memo: number, num: number) => number
@@ -93,7 +93,7 @@ var flat = _.reduceRight(list, (a, b) => a.concat(b), []);
 >flat : number[]
 >_.reduceRight(list, (a, b) => a.concat(b), []) : number[]
 >_.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; }
->_ : Static
+>_ : Underscore.Static
 >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; }
 >list : number[][]
 >(a, b) => a.concat(b) : (a: number[], b: number[]) => number[]
@@ -110,7 +110,7 @@ var even = _.find([1, 2, 3, 4, 5, 6], (num) => num % 2 == 0);
 >even : number
 >_.find([1, 2, 3, 4, 5, 6], (num) => num % 2 == 0) : number
 >_.find : { <T>(list: T[], iterator: Iterator<T, boolean>, context?: any): T; <T>(list: Dictionary<T>, iterator: Iterator<T, boolean>, context?: any): T; }
->_ : Static
+>_ : Underscore.Static
 >find : { <T>(list: T[], iterator: Iterator<T, boolean>, context?: any): T; <T>(list: Dictionary<T>, iterator: Iterator<T, boolean>, context?: any): T; }
 >[1, 2, 3, 4, 5, 6] : number[]
 >(num) => num % 2 == 0 : (num: number) => boolean
@@ -123,7 +123,7 @@ var evens = _.filter([1, 2, 3, 4, 5, 6], (num) => num % 2 == 0);
 >evens : number[]
 >_.filter([1, 2, 3, 4, 5, 6], (num) => num % 2 == 0) : number[]
 >_.filter : { <T>(list: T[], iterator: Iterator<T, boolean>, context?: any): T[]; <T>(list: Dictionary<T>, iterator: Iterator<T, boolean>, context?: any): T[]; }
->_ : Static
+>_ : Underscore.Static
 >filter : { <T>(list: T[], iterator: Iterator<T, boolean>, context?: any): T[]; <T>(list: Dictionary<T>, iterator: Iterator<T, boolean>, context?: any): T[]; }
 >[1, 2, 3, 4, 5, 6] : number[]
 >(num) => num % 2 == 0 : (num: number) => boolean
@@ -151,7 +151,7 @@ var listOfPlays = [{ title: "Cymbeline", author: "Shakespeare", year: 1611 }, {
 _.where(listOfPlays, { author: "Shakespeare", year: 1611 });
 >_.where(listOfPlays, { author: "Shakespeare", year: 1611 }) : { title: string; author: string; year: number; }[]
 >_.where : { <T>(list: T[], properties: Object): T[]; <T>(list: Dictionary<T>, properties: Object): T[]; }
->_ : Static
+>_ : Underscore.Static
 >where : { <T>(list: T[], properties: Object): T[]; <T>(list: Dictionary<T>, properties: Object): T[]; }
 >listOfPlays : { title: string; author: string; year: number; }[]
 >{ author: "Shakespeare", year: 1611 } : { author: string; year: number; }
@@ -162,7 +162,7 @@ var odds = _.reject([1, 2, 3, 4, 5, 6], (num) => num % 2 == 0);
 >odds : number[]
 >_.reject([1, 2, 3, 4, 5, 6], (num) => num % 2 == 0) : number[]
 >_.reject : { <T>(list: T[], iterator: Iterator<T, boolean>, context?: any): T[]; <T>(list: Dictionary<T>, iterator: Iterator<T, boolean>, context?: any): T[]; }
->_ : Static
+>_ : Underscore.Static
 >reject : { <T>(list: T[], iterator: Iterator<T, boolean>, context?: any): T[]; <T>(list: Dictionary<T>, iterator: Iterator<T, boolean>, context?: any): T[]; }
 >[1, 2, 3, 4, 5, 6] : number[]
 >(num) => num % 2 == 0 : (num: number) => boolean
@@ -174,31 +174,31 @@ var odds = _.reject([1, 2, 3, 4, 5, 6], (num) => num % 2 == 0);
 _.all([true, 1, null, 'yes'], _.identity);
 >_.all([true, 1, null, 'yes'], _.identity) : boolean
 >_.all : { <T>(list: T[], iterator?: Iterator<T, boolean>, context?: any): boolean; <T>(list: Dictionary<T>, iterator?: Iterator<T, boolean>, context?: any): boolean; }
->_ : Static
+>_ : Underscore.Static
 >all : { <T>(list: T[], iterator?: Iterator<T, boolean>, context?: any): boolean; <T>(list: Dictionary<T>, iterator?: Iterator<T, boolean>, context?: any): boolean; }
 >[true, 1, null, 'yes'] : {}[]
 >_.identity : <T>(value: T) => T
->_ : Static
+>_ : Underscore.Static
 >identity : <T>(value: T) => T
 
 _.any([null, 0, 'yes', false]);
 >_.any([null, 0, 'yes', false]) : boolean
 >_.any : { <T>(list: T[], iterator?: Iterator<T, boolean>, context?: any): boolean; <T>(list: Dictionary<T>, iterator?: Iterator<T, boolean>, context?: any): boolean; }
->_ : Static
+>_ : Underscore.Static
 >any : { <T>(list: T[], iterator?: Iterator<T, boolean>, context?: any): boolean; <T>(list: Dictionary<T>, iterator?: Iterator<T, boolean>, context?: any): boolean; }
 >[null, 0, 'yes', false] : {}[]
 
 _.contains([1, 2, 3], 3);
 >_.contains([1, 2, 3], 3) : boolean
 >_.contains : { <T>(list: T[], value: T): boolean; <T>(list: Dictionary<T>, value: T): boolean; }
->_ : Static
+>_ : Underscore.Static
 >contains : { <T>(list: T[], value: T): boolean; <T>(list: Dictionary<T>, value: T): boolean; }
 >[1, 2, 3] : number[]
 
 _.invoke([[5, 1, 7], [3, 2, 1]], 'sort');
 >_.invoke([[5, 1, 7], [3, 2, 1]], 'sort') : any[]
 >_.invoke : { (list: any[], methodName: string, ...args: any[]): any[]; (list: Dictionary<any>, methodName: string, ...args: any[]): any[]; }
->_ : Static
+>_ : Underscore.Static
 >invoke : { (list: any[], methodName: string, ...args: any[]): any[]; (list: Dictionary<any>, methodName: string, ...args: any[]): any[]; }
 >[[5, 1, 7], [3, 2, 1]] : any[]
 >[5, 1, 7] : number[]
@@ -220,14 +220,14 @@ var stooges = [{ name: 'moe', age: 40 }, { name: 'larry', age: 50 }, { name: 'cu
 _.pluck(stooges, 'name');
 >_.pluck(stooges, 'name') : any[]
 >_.pluck : { (list: any[], propertyName: string): any[]; (list: Dictionary<any>, propertyName: string): any[]; }
->_ : Static
+>_ : Underscore.Static
 >pluck : { (list: any[], propertyName: string): any[]; (list: Dictionary<any>, propertyName: string): any[]; }
 >stooges : { name: string; age: number; }[]
 
 _.max(stooges, (stooge) => stooge.age);
 >_.max(stooges, (stooge) => stooge.age) : { name: string; age: number; }
 >_.max : { <T>(list: T[], iterator?: Iterator<T, any>, context?: any): T; <T>(list: Dictionary<T>, iterator?: Iterator<T, any>, context?: any): T; }
->_ : Static
+>_ : Underscore.Static
 >max : { <T>(list: T[], iterator?: Iterator<T, any>, context?: any): T; <T>(list: Dictionary<T>, iterator?: Iterator<T, any>, context?: any): T; }
 >stooges : { name: string; age: number; }[]
 >(stooge) => stooge.age : (stooge: { name: string; age: number; }) => number
@@ -243,14 +243,14 @@ var numbers = [10, 5, 100, 2, 1000];
 _.min(numbers);
 >_.min(numbers) : number
 >_.min : { <T>(list: T[], iterator?: Iterator<T, any>, context?: any): T; <T>(list: Dictionary<T>, iterator?: Iterator<T, any>, context?: any): T; }
->_ : Static
+>_ : Underscore.Static
 >min : { <T>(list: T[], iterator?: Iterator<T, any>, context?: any): T; <T>(list: Dictionary<T>, iterator?: Iterator<T, any>, context?: any): T; }
 >numbers : number[]
 
 _.sortBy([1, 2, 3, 4, 5, 6], (num) => Math.sin(num));
 >_.sortBy([1, 2, 3, 4, 5, 6], (num) => Math.sin(num)) : number[]
 >_.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[]; }
->_ : Static
+>_ : Underscore.Static
 >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[]; }
 >[1, 2, 3, 4, 5, 6] : number[]
 >(num) => Math.sin(num) : (num: number) => number
@@ -266,8 +266,8 @@ _.sortBy([1, 2, 3, 4, 5, 6], (num) => Math.sin(num));
 _([1.3, 2.1, 2.4]).groupBy((e: number, i?: number, list?: number[]) => Math.floor(e));
 >_([1.3, 2.1, 2.4]).groupBy((e: number, i?: number, list?: number[]) => Math.floor(e)) : Dictionary<number[]>
 >_([1.3, 2.1, 2.4]).groupBy : { (iterator?: Iterator<number, any>, context?: any): Dictionary<number[]>; (propertyName: string): Dictionary<number[]>; }
->_([1.3, 2.1, 2.4]) : WrappedArray<number>
->_ : Static
+>_([1.3, 2.1, 2.4]) : Underscore.WrappedArray<number>
+>_ : Underscore.Static
 >[1.3, 2.1, 2.4] : number[]
 >groupBy : { (iterator?: Iterator<number, any>, context?: any): Dictionary<number[]>; (propertyName: string): Dictionary<number[]>; }
 >(e: number, i?: number, list?: number[]) => Math.floor(e) : (e: number, i?: number, list?: number[]) => number
@@ -283,7 +283,7 @@ _([1.3, 2.1, 2.4]).groupBy((e: number, i?: number, list?: number[]) => Math.floo
 _.groupBy([1.3, 2.1, 2.4], (num: number) => Math.floor(num));
 >_.groupBy([1.3, 2.1, 2.4], (num: number) => Math.floor(num)) : Dictionary<number[]>
 >_.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[]>; }
->_ : Static
+>_ : Underscore.Static
 >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[]>; }
 >[1.3, 2.1, 2.4] : number[]
 >(num: number) => Math.floor(num) : (num: number) => number
@@ -297,14 +297,14 @@ _.groupBy([1.3, 2.1, 2.4], (num: number) => Math.floor(num));
 _.groupBy(['one', 'two', 'three'], 'length');
 >_.groupBy(['one', 'two', 'three'], 'length') : Dictionary<string[]>
 >_.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[]>; }
->_ : Static
+>_ : Underscore.Static
 >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[]>; }
 >['one', 'two', 'three'] : string[]
 
 _.countBy([1, 2, 3, 4, 5], (num) => num % 2 == 0 ? 'even' : 'odd');
 >_.countBy([1, 2, 3, 4, 5], (num) => num % 2 == 0 ? 'even' : 'odd') : Dictionary<number>
 >_.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>; }
->_ : Static
+>_ : Underscore.Static
 >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>; }
 >[1, 2, 3, 4, 5] : number[]
 >(num) => num % 2 == 0 ? 'even' : 'odd' : (num: number) => string
@@ -317,7 +317,7 @@ _.countBy([1, 2, 3, 4, 5], (num) => num % 2 == 0 ? 'even' : 'odd');
 _.shuffle([1, 2, 3, 4, 5, 6]);
 >_.shuffle([1, 2, 3, 4, 5, 6]) : number[]
 >_.shuffle : { <T>(list: T[]): T[]; <T>(list: Dictionary<T>): T[]; }
->_ : Static
+>_ : Underscore.Static
 >shuffle : { <T>(list: T[]): T[]; <T>(list: Dictionary<T>): T[]; }
 >[1, 2, 3, 4, 5, 6] : number[]
 
@@ -326,7 +326,7 @@ _.shuffle([1, 2, 3, 4, 5, 6]);
 _.size({ one: 1, two: 2, three: 3 });
 >_.size({ one: 1, two: 2, three: 3 }) : number
 >_.size : { <T>(list: T[]): number; <T>(list: Dictionary<T>): number; }
->_ : Static
+>_ : Underscore.Static
 >size : { <T>(list: T[]): number; <T>(list: Dictionary<T>): number; }
 >{ one: 1, two: 2, three: 3 } : { [x: string]: number; one: number; two: number; three: number; }
 >one : number
@@ -338,49 +338,49 @@ _.size({ one: 1, two: 2, three: 3 });
 _.first([5, 4, 3, 2, 1]);
 >_.first([5, 4, 3, 2, 1]) : number
 >_.first : { <T>(list: T[]): T; <T>(list: T[], count: number): T[]; }
->_ : Static
+>_ : Underscore.Static
 >first : { <T>(list: T[]): T; <T>(list: T[], count: number): T[]; }
 >[5, 4, 3, 2, 1] : number[]
 
 _.initial([5, 4, 3, 2, 1]);
 >_.initial([5, 4, 3, 2, 1]) : number
 >_.initial : { <T>(list: T[]): T; <T>(list: T[], count: number): T[]; }
->_ : Static
+>_ : Underscore.Static
 >initial : { <T>(list: T[]): T; <T>(list: T[], count: number): T[]; }
 >[5, 4, 3, 2, 1] : number[]
 
 _.last([5, 4, 3, 2, 1]);
 >_.last([5, 4, 3, 2, 1]) : number
 >_.last : { <T>(list: T[]): T; <T>(list: T[], count: number): T[]; }
->_ : Static
+>_ : Underscore.Static
 >last : { <T>(list: T[]): T; <T>(list: T[], count: number): T[]; }
 >[5, 4, 3, 2, 1] : number[]
 
 _.rest([5, 4, 3, 2, 1]);
 >_.rest([5, 4, 3, 2, 1]) : number[]
 >_.rest : <T>(list: T[], index?: number) => T[]
->_ : Static
+>_ : Underscore.Static
 >rest : <T>(list: T[], index?: number) => T[]
 >[5, 4, 3, 2, 1] : number[]
 
 _.compact([0, 1, false, 2, '', 3]);
 >_.compact([0, 1, false, 2, '', 3]) : {}[]
 >_.compact : <T>(list: T[]) => T[]
->_ : Static
+>_ : Underscore.Static
 >compact : <T>(list: T[]) => T[]
 >[0, 1, false, 2, '', 3] : {}[]
 
 _.flatten([1, 2, 3, 4]);
 >_.flatten([1, 2, 3, 4]) : {}[]
 >_.flatten : { <T>(list: T[][]): T[]; <T>(array: any[], shallow?: boolean): T[]; }
->_ : Static
+>_ : Underscore.Static
 >flatten : { <T>(list: T[][]): T[]; <T>(array: any[], shallow?: boolean): T[]; }
 >[1, 2, 3, 4] : any[]
 
 _.flatten([1, [2]]);
 >_.flatten([1, [2]]) : {}[]
 >_.flatten : { <T>(list: T[][]): T[]; <T>(array: any[], shallow?: boolean): T[]; }
->_ : Static
+>_ : Underscore.Static
 >flatten : { <T>(list: T[][]): T[]; <T>(array: any[], shallow?: boolean): T[]; }
 >[1, [2]] : any[]
 >[2] : number[]
@@ -389,7 +389,7 @@ _.flatten([1, [2]]);
 _.flatten([1, [2], [3, [[4]]]]);
 >_.flatten([1, [2], [3, [[4]]]]) : {}[]
 >_.flatten : { <T>(list: T[][]): T[]; <T>(array: any[], shallow?: boolean): T[]; }
->_ : Static
+>_ : Underscore.Static
 >flatten : { <T>(list: T[][]): T[]; <T>(array: any[], shallow?: boolean): T[]; }
 >[1, [2], [3, [[4]]]] : any[]
 >[2] : number[]
@@ -400,7 +400,7 @@ _.flatten([1, [2], [3, [[4]]]]);
 _.flatten([1, [2], [3, [[4]]]], true);
 >_.flatten([1, [2], [3, [[4]]]], true) : {}[]
 >_.flatten : { <T>(list: T[][]): T[]; <T>(array: any[], shallow?: boolean): T[]; }
->_ : Static
+>_ : Underscore.Static
 >flatten : { <T>(list: T[][]): T[]; <T>(array: any[], shallow?: boolean): T[]; }
 >[1, [2], [3, [[4]]]] : any[]
 >[2] : number[]
@@ -411,14 +411,14 @@ _.flatten([1, [2], [3, [[4]]]], true);
 _.without([1, 2, 1, 0, 3, 1, 4], 0, 1);
 >_.without([1, 2, 1, 0, 3, 1, 4], 0, 1) : number[]
 >_.without : <T>(list: T[], ...values: T[]) => T[]
->_ : Static
+>_ : Underscore.Static
 >without : <T>(list: T[], ...values: T[]) => T[]
 >[1, 2, 1, 0, 3, 1, 4] : number[]
 
 _.union([1, 2, 3], [101, 2, 1, 10], [2, 1]);
 >_.union([1, 2, 3], [101, 2, 1, 10], [2, 1]) : number[]
 >_.union : <T>(...arrays: T[][]) => T[]
->_ : Static
+>_ : Underscore.Static
 >union : <T>(...arrays: T[][]) => T[]
 >[1, 2, 3] : number[]
 >[101, 2, 1, 10] : number[]
@@ -427,7 +427,7 @@ _.union([1, 2, 3], [101, 2, 1, 10], [2, 1]);
 _.intersection([1, 2, 3], [101, 2, 1, 10], [2, 1]);
 >_.intersection([1, 2, 3], [101, 2, 1, 10], [2, 1]) : number[]
 >_.intersection : <T>(...arrays: T[][]) => T[]
->_ : Static
+>_ : Underscore.Static
 >intersection : <T>(...arrays: T[][]) => T[]
 >[1, 2, 3] : number[]
 >[101, 2, 1, 10] : number[]
@@ -436,7 +436,7 @@ _.intersection([1, 2, 3], [101, 2, 1, 10], [2, 1]);
 _.difference([1, 2, 3, 4, 5], [5, 2, 10]);
 >_.difference([1, 2, 3, 4, 5], [5, 2, 10]) : number[]
 >_.difference : <T>(list: T[], ...others: T[][]) => T[]
->_ : Static
+>_ : Underscore.Static
 >difference : <T>(list: T[], ...others: T[][]) => T[]
 >[1, 2, 3, 4, 5] : number[]
 >[5, 2, 10] : number[]
@@ -444,14 +444,14 @@ _.difference([1, 2, 3, 4, 5], [5, 2, 10]);
 _.uniq([1, 2, 1, 3, 1, 4]);
 >_.uniq([1, 2, 1, 3, 1, 4]) : number[]
 >_.uniq : { <T>(list: T[], isSorted?: boolean): T[]; <T, U>(list: T[], isSorted: boolean, iterator: Iterator<T, U>, context?: any): U[]; }
->_ : Static
+>_ : Underscore.Static
 >uniq : { <T>(list: T[], isSorted?: boolean): T[]; <T, U>(list: T[], isSorted: boolean, iterator: Iterator<T, U>, context?: any): U[]; }
 >[1, 2, 1, 3, 1, 4] : number[]
 
 _.zip(['moe', 'larry', 'curly'], [30, 40, 50], [true, false, false]);
 >_.zip(['moe', 'larry', 'curly'], [30, 40, 50], [true, false, false]) : Tuple3<string, number, boolean>[]
 >_.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[][]; }
->_ : Static
+>_ : Underscore.Static
 >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[][]; }
 >['moe', 'larry', 'curly'] : string[]
 >[30, 40, 50] : number[]
@@ -460,7 +460,7 @@ _.zip(['moe', 'larry', 'curly'], [30, 40, 50], [true, false, false]);
 _.object(['moe', 'larry', 'curly'], [30, 40, 50]);
 >_.object(['moe', 'larry', 'curly'], [30, 40, 50]) : any
 >_.object : { (list: any[][]): any; (keys: string[], values: any[]): any; }
->_ : Static
+>_ : Underscore.Static
 >object : { (list: any[][]): any; (keys: string[], values: any[]): any; }
 >['moe', 'larry', 'curly'] : string[]
 >[30, 40, 50] : any[]
@@ -468,7 +468,7 @@ _.object(['moe', 'larry', 'curly'], [30, 40, 50]);
 _.object([['moe', 30], ['larry', 40], ['curly', 50]]);
 >_.object([['moe', 30], ['larry', 40], ['curly', 50]]) : any
 >_.object : { (list: any[][]): any; (keys: string[], values: any[]): any; }
->_ : Static
+>_ : Underscore.Static
 >object : { (list: any[][]): any; (keys: string[], values: any[]): any; }
 >[['moe', 30], ['larry', 40], ['curly', 50]] : any[][]
 >['moe', 30] : any[]
@@ -478,52 +478,52 @@ _.object([['moe', 30], ['larry', 40], ['curly', 50]]);
 _.indexOf([1, 2, 3], 2);
 >_.indexOf([1, 2, 3], 2) : number
 >_.indexOf : <T>(list: T[], value: T, isSorted?: boolean) => number
->_ : Static
+>_ : Underscore.Static
 >indexOf : <T>(list: T[], value: T, isSorted?: boolean) => number
 >[1, 2, 3] : number[]
 
 _.lastIndexOf([1, 2, 3, 1, 2, 3], 2);
 >_.lastIndexOf([1, 2, 3, 1, 2, 3], 2) : number
 >_.lastIndexOf : <T>(list: T[], value: T, fromIndex?: number) => number
->_ : Static
+>_ : Underscore.Static
 >lastIndexOf : <T>(list: T[], value: T, fromIndex?: number) => number
 >[1, 2, 3, 1, 2, 3] : number[]
 
 _.sortedIndex([10, 20, 30, 40, 50], 35);
 >_.sortedIndex([10, 20, 30, 40, 50], 35) : number
 >_.sortedIndex : { <T>(list: T[], obj: T, propertyName: string): number; <T>(list: T[], obj: T, iterator?: Iterator<T, any>, context?: any): number; }
->_ : Static
+>_ : Underscore.Static
 >sortedIndex : { <T>(list: T[], obj: T, propertyName: string): number; <T>(list: T[], obj: T, iterator?: Iterator<T, any>, context?: any): number; }
 >[10, 20, 30, 40, 50] : number[]
 
 _.range(10);
 >_.range(10) : number[]
 >_.range : { (stop: number): number[]; (start: number, stop: number, step?: number): number[]; }
->_ : Static
+>_ : Underscore.Static
 >range : { (stop: number): number[]; (start: number, stop: number, step?: number): number[]; }
 
 _.range(1, 11);
 >_.range(1, 11) : number[]
 >_.range : { (stop: number): number[]; (start: number, stop: number, step?: number): number[]; }
->_ : Static
+>_ : Underscore.Static
 >range : { (stop: number): number[]; (start: number, stop: number, step?: number): number[]; }
 
 _.range(0, 30, 5);
 >_.range(0, 30, 5) : number[]
 >_.range : { (stop: number): number[]; (start: number, stop: number, step?: number): number[]; }
->_ : Static
+>_ : Underscore.Static
 >range : { (stop: number): number[]; (start: number, stop: number, step?: number): number[]; }
 
 _.range(0, 30, 5);
 >_.range(0, 30, 5) : number[]
 >_.range : { (stop: number): number[]; (start: number, stop: number, step?: number): number[]; }
->_ : Static
+>_ : Underscore.Static
 >range : { (stop: number): number[]; (start: number, stop: number, step?: number): number[]; }
 
 _.range(0);
 >_.range(0) : number[]
 >_.range : { (stop: number): number[]; (start: number, stop: number, step?: number): number[]; }
->_ : Static
+>_ : Underscore.Static
 >range : { (stop: number): number[]; (start: number, stop: number, step?: number): number[]; }
 
 ///////////////////////////////////////////////////////////////////////////////////////
@@ -545,7 +545,7 @@ var func2 = _.bind(func, { name: 'moe' }, 'hi');
 >func2 : Function
 >_.bind(func, { name: 'moe' }, 'hi') : Function
 >_.bind : { <T extends Function>(func: T, object: any): T; (func: Function, object: any, ...args: any[]): Function; }
->_ : Static
+>_ : Underscore.Static
 >bind : { <T extends Function>(func: T, object: any): T; (func: Function, object: any, ...args: any[]): Function; }
 >func : (greeting: any) => string
 >{ name: 'moe' } : { name: string; }
@@ -586,7 +586,7 @@ var buttonView = {
 _.bindAll(buttonView);
 >_.bindAll(buttonView) : { label: string; onClick: () => void; onHover: () => void; }
 >_.bindAll : <T>(object: T, ...methodNames: string[]) => T
->_ : Static
+>_ : Underscore.Static
 >bindAll : <T>(object: T, ...methodNames: string[]) => T
 >buttonView : { label: string; onClick: () => void; onHover: () => void; }
 
@@ -604,7 +604,7 @@ var fibonacci = _.memoize(function (n) {
 >fibonacci : any
 >_.memoize(function (n) {    return n < 2 ? n : fibonacci(n - 1) + fibonacci(n - 2);}) : (n: any) => any
 >_.memoize : <T extends Function>(func: T, hashFunction?: Function) => T
->_ : Static
+>_ : Underscore.Static
 >memoize : <T extends Function>(func: T, hashFunction?: Function) => T
 >function (n) {    return n < 2 ? n : fibonacci(n - 1) + fibonacci(n - 2);} : (n: any) => any
 >n : any
@@ -630,7 +630,7 @@ var log = _.bind((message?: string, ...rest: string[]) => { }, Date);
 >log : (message?: string, ...rest: string[]) => void
 >_.bind((message?: string, ...rest: string[]) => { }, Date) : (message?: string, ...rest: string[]) => void
 >_.bind : { <T extends Function>(func: T, object: any): T; (func: Function, object: any, ...args: any[]): Function; }
->_ : Static
+>_ : Underscore.Static
 >bind : { <T extends Function>(func: T, object: any): T; (func: Function, object: any, ...args: any[]): Function; }
 >(message?: string, ...rest: string[]) => { } : (message?: string, ...rest: string[]) => void
 >message : string
@@ -640,14 +640,14 @@ var log = _.bind((message?: string, ...rest: string[]) => { }, Date);
 _.delay(log, 1000, 'logged later');
 >_.delay(log, 1000, 'logged later') : number
 >_.delay : (func: Function, wait: number, ...args: any[]) => number
->_ : Static
+>_ : Underscore.Static
 >delay : (func: Function, wait: number, ...args: any[]) => number
 >log : (message?: string, ...rest: string[]) => void
 
 _.defer(function () { alert('deferred'); });
 >_.defer(function () { alert('deferred'); }) : number
 >_.defer : (func: Function, ...args: any[]) => number
->_ : Static
+>_ : Underscore.Static
 >defer : (func: Function, ...args: any[]) => number
 >function () { alert('deferred'); } : () => void
 >alert('deferred') : void
@@ -663,7 +663,7 @@ var throttled = _.throttle(updatePosition, 100);
 >throttled : () => void
 >_.throttle(updatePosition, 100) : () => void
 >_.throttle : <T extends Function>(func: T, wait: number) => T
->_ : Static
+>_ : Underscore.Static
 >throttle : <T extends Function>(func: T, wait: number) => T
 >updatePosition : () => void
 
@@ -685,7 +685,7 @@ var lazyLayout = _.debounce(calculateLayout, 300);
 >lazyLayout : () => void
 >_.debounce(calculateLayout, 300) : () => void
 >_.debounce : <T extends Function>(func: T, wait: number, immediate?: boolean) => T
->_ : Static
+>_ : Underscore.Static
 >debounce : <T extends Function>(func: T, wait: number, immediate?: boolean) => T
 >calculateLayout : () => void
 
@@ -707,7 +707,7 @@ var initialize = _.once(createApplication);
 >initialize : () => void
 >_.once(createApplication) : () => void
 >_.once : <T extends Function>(func: T) => T
->_ : Static
+>_ : Underscore.Static
 >once : <T extends Function>(func: T) => T
 >createApplication : () => void
 
@@ -732,7 +732,7 @@ var renderNotes = _.after(notes.length, render);
 >renderNotes : () => void
 >_.after(notes.length, render) : () => void
 >_.after : <T extends Function>(count: number, func: T) => T
->_ : Static
+>_ : Underscore.Static
 >after : <T extends Function>(count: number, func: T) => T
 >notes.length : number
 >notes : any[]
@@ -742,7 +742,7 @@ var renderNotes = _.after(notes.length, render);
 _.each(notes, (note) => note.asyncSave({ success: renderNotes }));
 >_.each(notes, (note) => note.asyncSave({ success: renderNotes })) : void
 >_.each : { <T>(list: T[], iterator: Iterator<T, void>, context?: any): void; <T>(list: Dictionary<T>, iterator: Iterator<T, void>, context?: any): void; }
->_ : Static
+>_ : Underscore.Static
 >each : { <T>(list: T[], iterator: Iterator<T, void>, context?: any): void; <T>(list: Dictionary<T>, iterator: Iterator<T, void>, context?: any): void; }
 >notes : any[]
 >(note) => note.asyncSave({ success: renderNotes }) : (note: any) => any
@@ -753,7 +753,7 @@ _.each(notes, (note) => note.asyncSave({ success: renderNotes }));
 >asyncSave : any
 >{ success: renderNotes } : { success: () => void; }
 >success : () => void
->renderNotes : renderNotes
+>renderNotes : () => void
 
 var hello = function (name) { return "hello: " + name; };
 >hello : (name: any) => string
@@ -767,7 +767,7 @@ hello = _.wrap(hello, (func, arg) => { return "before, " + func(arg) + ", after"
 >hello : (name: any) => string
 >_.wrap(hello, (func, arg) => { return "before, " + func(arg) + ", after"; }) : (name: any) => string
 >_.wrap : <T extends Function>(func: T, wrapper: (func: T, ...args: any[]) => any) => T
->_ : Static
+>_ : Underscore.Static
 >wrap : <T extends Function>(func: T, wrapper: (func: T, ...args: any[]) => any) => T
 >hello : (name: any) => string
 >(func, arg) => { return "before, " + func(arg) + ", after"; } : (func: (name: any) => string, arg: any) => string
@@ -801,7 +801,7 @@ var welcome = _.compose(exclaim, greet);
 >welcome : Function
 >_.compose(exclaim, greet) : Function
 >_.compose : (...funcs: Function[]) => Function
->_ : Static
+>_ : Underscore.Static
 >compose : (...funcs: Function[]) => Function
 >exclaim : (statement: any) => string
 >greet : (name: any) => string
@@ -815,7 +815,7 @@ welcome('moe');
 _.keys({ one: 1, two: 2, three: 3 });
 >_.keys({ one: 1, two: 2, three: 3 }) : string[]
 >_.keys : (object: any) => string[]
->_ : Static
+>_ : Underscore.Static
 >keys : (object: any) => string[]
 >{ one: 1, two: 2, three: 3 } : { one: number; two: number; three: number; }
 >one : number
@@ -825,7 +825,7 @@ _.keys({ one: 1, two: 2, three: 3 });
 _.values({ one: 1, two: 2, three: 3 });
 >_.values({ one: 1, two: 2, three: 3 }) : any[]
 >_.values : (object: any) => any[]
->_ : Static
+>_ : Underscore.Static
 >values : (object: any) => any[]
 >{ one: 1, two: 2, three: 3 } : { one: number; two: number; three: number; }
 >one : number
@@ -835,7 +835,7 @@ _.values({ one: 1, two: 2, three: 3 });
 _.pairs({ one: 1, two: 2, three: 3 });
 >_.pairs({ one: 1, two: 2, three: 3 }) : any[][]
 >_.pairs : (object: any) => any[][]
->_ : Static
+>_ : Underscore.Static
 >pairs : (object: any) => any[][]
 >{ one: 1, two: 2, three: 3 } : { one: number; two: number; three: number; }
 >one : number
@@ -845,7 +845,7 @@ _.pairs({ one: 1, two: 2, three: 3 });
 _.invert({ Moe: "Moses", Larry: "Louis", Curly: "Jerome" });
 >_.invert({ Moe: "Moses", Larry: "Louis", Curly: "Jerome" }) : any
 >_.invert : (object: any) => any
->_ : Static
+>_ : Underscore.Static
 >invert : (object: any) => any
 >{ Moe: "Moses", Larry: "Louis", Curly: "Jerome" } : { Moe: string; Larry: string; Curly: string; }
 >Moe : string
@@ -855,14 +855,14 @@ _.invert({ Moe: "Moses", Larry: "Louis", Curly: "Jerome" });
 _.functions(_);
 >_.functions(_) : string[]
 >_.functions : (object: any) => string[]
->_ : Static
+>_ : Underscore.Static
 >functions : (object: any) => string[]
->_ : Static
+>_ : Underscore.Static
 
 _.extend({ name: 'moe' }, { age: 50 });
 >_.extend({ name: 'moe' }, { age: 50 }) : { name: string; }
 >_.extend : <T>(destination: T, ...sources: any[]) => T
->_ : Static
+>_ : Underscore.Static
 >extend : <T>(destination: T, ...sources: any[]) => T
 >{ name: 'moe' } : { name: string; }
 >name : string
@@ -872,7 +872,7 @@ _.extend({ name: 'moe' }, { age: 50 });
 _.pick({ name: 'moe', age: 50, userid: 'moe1' }, 'name', 'age');
 >_.pick({ name: 'moe', age: 50, userid: 'moe1' }, 'name', 'age') : { name: string; age: number; userid: string; }
 >_.pick : <T>(object: T, ...keys: string[]) => T
->_ : Static
+>_ : Underscore.Static
 >pick : <T>(object: T, ...keys: string[]) => T
 >{ name: 'moe', age: 50, userid: 'moe1' } : { name: string; age: number; userid: string; }
 >name : string
@@ -882,7 +882,7 @@ _.pick({ name: 'moe', age: 50, userid: 'moe1' }, 'name', 'age');
 _.omit({ name: 'moe', age: 50, userid: 'moe1' }, 'userid');
 >_.omit({ name: 'moe', age: 50, userid: 'moe1' }, 'userid') : { name: string; age: number; userid: string; }
 >_.omit : <T>(object: T, ...keys: string[]) => T
->_ : Static
+>_ : Underscore.Static
 >omit : <T>(object: T, ...keys: string[]) => T
 >{ name: 'moe', age: 50, userid: 'moe1' } : { name: string; age: number; userid: string; }
 >name : string
@@ -897,7 +897,7 @@ var iceCream = { flavor: "chocolate" };
 _.defaults(iceCream, { flavor: "vanilla", sprinkles: "lots" });
 >_.defaults(iceCream, { flavor: "vanilla", sprinkles: "lots" }) : { flavor: string; }
 >_.defaults : <T>(object: T, ...defaults: any[]) => T
->_ : Static
+>_ : Underscore.Static
 >defaults : <T>(object: T, ...defaults: any[]) => T
 >iceCream : { flavor: string; }
 >{ flavor: "vanilla", sprinkles: "lots" } : { flavor: string; sprinkles: string; }
@@ -907,7 +907,7 @@ _.defaults(iceCream, { flavor: "vanilla", sprinkles: "lots" });
 _.clone({ name: 'moe' });
 >_.clone({ name: 'moe' }) : { name: string; }
 >_.clone : <T>(object: T) => T
->_ : Static
+>_ : Underscore.Static
 >clone : <T>(object: T) => T
 >{ name: 'moe' } : { name: string; }
 >name : string
@@ -915,20 +915,20 @@ _.clone({ name: 'moe' });
 _.chain([1, 2, 3, 200])
 >_.chain([1, 2, 3, 200])    .filter(function (num) { return num % 2 == 0; })    .tap(<any>alert)    .map(function (num) { return num * num })    .value() : number[]
 >_.chain([1, 2, 3, 200])    .filter(function (num) { return num % 2 == 0; })    .tap(<any>alert)    .map(function (num) { return num * num })    .value : () => number[]
->_.chain([1, 2, 3, 200])    .filter(function (num) { return num % 2 == 0; })    .tap(<any>alert)    .map(function (num) { return num * num }) : ChainedArray<number>
->_.chain([1, 2, 3, 200])    .filter(function (num) { return num % 2 == 0; })    .tap(<any>alert)    .map : <U>(iterator: Iterator<number, U>, context?: any) => ChainedArray<U>
->_.chain([1, 2, 3, 200])    .filter(function (num) { return num % 2 == 0; })    .tap(<any>alert) : ChainedArray<number>
->_.chain([1, 2, 3, 200])    .filter(function (num) { return num % 2 == 0; })    .tap : (interceptor: (object: number[]) => void) => ChainedArray<number>
->_.chain([1, 2, 3, 200])    .filter(function (num) { return num % 2 == 0; }) : ChainedArray<number>
->_.chain([1, 2, 3, 200])    .filter : (iterator: Iterator<number, boolean>, context?: any) => ChainedArray<number>
->_.chain([1, 2, 3, 200]) : ChainedArray<number>
->_.chain : { <T>(list: T[]): ChainedArray<T>; <T>(list: Dictionary<T>): ChainedDictionary<T>; <T>(obj: T): ChainedObject<T>; }
->_ : Static
->chain : { <T>(list: T[]): ChainedArray<T>; <T>(list: Dictionary<T>): ChainedDictionary<T>; <T>(obj: T): ChainedObject<T>; }
+>_.chain([1, 2, 3, 200])    .filter(function (num) { return num % 2 == 0; })    .tap(<any>alert)    .map(function (num) { return num * num }) : Underscore.ChainedArray<number>
+>_.chain([1, 2, 3, 200])    .filter(function (num) { return num % 2 == 0; })    .tap(<any>alert)    .map : <U>(iterator: Iterator<number, U>, context?: any) => Underscore.ChainedArray<U>
+>_.chain([1, 2, 3, 200])    .filter(function (num) { return num % 2 == 0; })    .tap(<any>alert) : Underscore.ChainedArray<number>
+>_.chain([1, 2, 3, 200])    .filter(function (num) { return num % 2 == 0; })    .tap : (interceptor: (object: number[]) => void) => Underscore.ChainedArray<number>
+>_.chain([1, 2, 3, 200])    .filter(function (num) { return num % 2 == 0; }) : Underscore.ChainedArray<number>
+>_.chain([1, 2, 3, 200])    .filter : (iterator: Iterator<number, boolean>, context?: any) => Underscore.ChainedArray<number>
+>_.chain([1, 2, 3, 200]) : Underscore.ChainedArray<number>
+>_.chain : { <T>(list: T[]): Underscore.ChainedArray<T>; <T>(list: Dictionary<T>): Underscore.ChainedDictionary<T>; <T>(obj: T): Underscore.ChainedObject<T>; }
+>_ : Underscore.Static
+>chain : { <T>(list: T[]): Underscore.ChainedArray<T>; <T>(list: Dictionary<T>): Underscore.ChainedDictionary<T>; <T>(obj: T): Underscore.ChainedObject<T>; }
 >[1, 2, 3, 200] : number[]
 
     .filter(function (num) { return num % 2 == 0; })
->filter : (iterator: Iterator<number, boolean>, context?: any) => ChainedArray<number>
+>filter : (iterator: Iterator<number, boolean>, context?: any) => Underscore.ChainedArray<number>
 >function (num) { return num % 2 == 0; } : (num: number) => boolean
 >num : number
 >num % 2 == 0 : boolean
@@ -936,12 +936,12 @@ _.chain([1, 2, 3, 200])
 >num : number
 
     .tap(<any>alert)
->tap : (interceptor: (object: number[]) => void) => ChainedArray<number>
+>tap : (interceptor: (object: number[]) => void) => Underscore.ChainedArray<number>
 ><any>alert : any
 >alert : typeof alert
 
     .map(function (num) { return num * num })
->map : <U>(iterator: Iterator<number, U>, context?: any) => ChainedArray<U>
+>map : <U>(iterator: Iterator<number, U>, context?: any) => Underscore.ChainedArray<U>
 >function (num) { return num * num } : (num: number) => number
 >num : number
 >num * num : number
@@ -954,7 +954,7 @@ _.chain([1, 2, 3, 200])
 _.has({ a: 1, b: 2, c: 3 }, "b");
 >_.has({ a: 1, b: 2, c: 3 }, "b") : boolean
 >_.has : (object: any, key: string) => boolean
->_ : Static
+>_ : Underscore.Static
 >has : (object: any, key: string) => boolean
 >{ a: 1, b: 2, c: 3 } : { a: number; b: number; c: number; }
 >a : number
@@ -983,7 +983,7 @@ moe == clone;
 _.isEqual(moe, clone);
 >_.isEqual(moe, clone) : boolean
 >_.isEqual : <T>(object: T, other: T) => boolean
->_ : Static
+>_ : Underscore.Static
 >isEqual : <T>(object: T, other: T) => boolean
 >moe : { name: string; luckyNumbers: number[]; }
 >clone : { name: string; luckyNumbers: number[]; }
@@ -991,21 +991,21 @@ _.isEqual(moe, clone);
 _.isEmpty([1, 2, 3]);
 >_.isEmpty([1, 2, 3]) : boolean
 >_.isEmpty : (object: any) => boolean
->_ : Static
+>_ : Underscore.Static
 >isEmpty : (object: any) => boolean
 >[1, 2, 3] : number[]
 
 _.isEmpty({});
 >_.isEmpty({}) : boolean
 >_.isEmpty : (object: any) => boolean
->_ : Static
+>_ : Underscore.Static
 >isEmpty : (object: any) => boolean
 >{} : {}
 
 _.isElement($('body')[0]);
 >_.isElement($('body')[0]) : boolean
 >_.isElement : (object: any) => boolean
->_ : Static
+>_ : Underscore.Static
 >isElement : (object: any) => boolean
 >$('body')[0] : any
 >$('body') : any
@@ -1017,28 +1017,28 @@ _.isElement($('body')[0]);
 >function () { return _.isArray(arguments); } : () => boolean
 >_.isArray(arguments) : boolean
 >_.isArray : (object: any) => boolean
->_ : Static
+>_ : Underscore.Static
 >isArray : (object: any) => boolean
 >arguments : IArguments
 
 _.isArray([1, 2, 3]);
 >_.isArray([1, 2, 3]) : boolean
 >_.isArray : (object: any) => boolean
->_ : Static
+>_ : Underscore.Static
 >isArray : (object: any) => boolean
 >[1, 2, 3] : number[]
 
 _.isObject({});
 >_.isObject({}) : boolean
 >_.isObject : (value: any) => boolean
->_ : Static
+>_ : Underscore.Static
 >isObject : (value: any) => boolean
 >{} : {}
 
 _.isObject(1);
 >_.isObject(1) : boolean
 >_.isObject : (value: any) => boolean
->_ : Static
+>_ : Underscore.Static
 >isObject : (value: any) => boolean
 
 
@@ -1046,41 +1046,41 @@ _.isObject(1);
 _.isArguments([1, 2, 3]);
 >_.isArguments([1, 2, 3]) : boolean
 >_.isArguments : (object: any) => boolean
->_ : Static
+>_ : Underscore.Static
 >isArguments : (object: any) => boolean
 >[1, 2, 3] : number[]
 
 _.isFunction(alert);
 >_.isFunction(alert) : boolean
 >_.isFunction : (object: any) => boolean
->_ : Static
+>_ : Underscore.Static
 >isFunction : (object: any) => boolean
 >alert : typeof alert
 
 _.isString("moe");
 >_.isString("moe") : boolean
 >_.isString : (object: any) => boolean
->_ : Static
+>_ : Underscore.Static
 >isString : (object: any) => boolean
 
 _.isNumber(8.4 * 5);
 >_.isNumber(8.4 * 5) : boolean
 >_.isNumber : (object: any) => boolean
->_ : Static
+>_ : Underscore.Static
 >isNumber : (object: any) => boolean
 >8.4 * 5 : number
 
 _.isFinite(-101);
 >_.isFinite(-101) : boolean
 >_.isFinite : (object: any) => boolean
->_ : Static
+>_ : Underscore.Static
 >isFinite : (object: any) => boolean
 >-101 : number
 
 _.isFinite(-Infinity);
 >_.isFinite(-Infinity) : boolean
 >_.isFinite : (object: any) => boolean
->_ : Static
+>_ : Underscore.Static
 >isFinite : (object: any) => boolean
 >-Infinity : number
 >Infinity : number
@@ -1088,13 +1088,13 @@ _.isFinite(-Infinity);
 _.isBoolean(null);
 >_.isBoolean(null) : boolean
 >_.isBoolean : (object: any) => boolean
->_ : Static
+>_ : Underscore.Static
 >isBoolean : (object: any) => boolean
 
 _.isDate(new Date());
 >_.isDate(new Date()) : boolean
 >_.isDate : (object: any) => boolean
->_ : Static
+>_ : Underscore.Static
 >isDate : (object: any) => boolean
 >new Date() : 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; }
@@ -1102,13 +1102,13 @@ _.isDate(new Date());
 _.isRegExp(/moe/);
 >_.isRegExp(/moe/) : boolean
 >_.isRegExp : (object: any) => boolean
->_ : Static
+>_ : Underscore.Static
 >isRegExp : (object: any) => boolean
 
 _.isNaN(NaN);
 >_.isNaN(NaN) : boolean
 >_.isNaN : (object: any) => boolean
->_ : Static
+>_ : Underscore.Static
 >isNaN : (object: any) => boolean
 >NaN : number
 
@@ -1120,27 +1120,27 @@ isNaN(undefined);
 _.isNaN(undefined);
 >_.isNaN(undefined) : boolean
 >_.isNaN : (object: any) => boolean
->_ : Static
+>_ : Underscore.Static
 >isNaN : (object: any) => boolean
 >undefined : undefined
 
 _.isNull(null);
 >_.isNull(null) : boolean
 >_.isNull : (object: any) => boolean
->_ : Static
+>_ : Underscore.Static
 >isNull : (object: any) => boolean
 
 _.isNull(undefined);
 >_.isNull(undefined) : boolean
 >_.isNull : (object: any) => boolean
->_ : Static
+>_ : Underscore.Static
 >isNull : (object: any) => boolean
 >undefined : undefined
 
 _.isUndefined((<any>null).missingVariable);
 >_.isUndefined((<any>null).missingVariable) : boolean
 >_.isUndefined : (value: any) => boolean
->_ : Static
+>_ : Underscore.Static
 >isUndefined : (value: any) => boolean
 >(<any>null).missingVariable : any
 >(<any>null) : any
@@ -1150,11 +1150,11 @@ _.isUndefined((<any>null).missingVariable);
 ///////////////////////////////////////////////////////////////////////////////////////
 
 var underscore = _.noConflict();
->underscore : Static
->_.noConflict() : Static
->_.noConflict : () => Static
->_ : Static
->noConflict : () => Static
+>underscore : Underscore.Static
+>_.noConflict() : Underscore.Static
+>_.noConflict : () => Underscore.Static
+>_ : Underscore.Static
+>noConflict : () => Underscore.Static
 
 var moe2 = { name: 'moe' };
 >moe2 : { name: string; }
@@ -1166,7 +1166,7 @@ moe2 === _.identity(moe);
 >moe2 : { name: string; }
 >_.identity(moe) : { name: string; luckyNumbers: number[]; }
 >_.identity : <T>(value: T) => T
->_ : Static
+>_ : Underscore.Static
 >identity : <T>(value: T) => T
 >moe : { name: string; luckyNumbers: number[]; }
 
@@ -1176,7 +1176,7 @@ var genie;
 _.times(3, function (n) { genie.grantWishNumber(n); });
 >_.times(3, function (n) { genie.grantWishNumber(n); }) : void[]
 >_.times : <U>(n: number, iterator: Iterator<number, U>, context?: any) => U[]
->_ : Static
+>_ : Underscore.Static
 >times : <U>(n: number, iterator: Iterator<number, U>, context?: any) => U[]
 >function (n) { genie.grantWishNumber(n); } : (n: number) => void
 >n : number
@@ -1189,13 +1189,13 @@ _.times(3, function (n) { genie.grantWishNumber(n); });
 _.random(0, 100);
 >_.random(0, 100) : number
 >_.random : { (max: number): number; (min: number, max: number): number; }
->_ : Static
+>_ : Underscore.Static
 >random : { (max: number): number; (min: number, max: number): number; }
 
 _.mixin({
 >_.mixin({    capitalize: function (string) {        return string.charAt(0).toUpperCase() + string.substring(1).toLowerCase();    }}) : void
 >_.mixin : (object: any) => void
->_ : Static
+>_ : Underscore.Static
 >mixin : (object: any) => void
 >{    capitalize: function (string) {        return string.charAt(0).toUpperCase() + string.substring(1).toLowerCase();    }} : { capitalize: (string: any) => any; }
 
@@ -1227,20 +1227,20 @@ _.mixin({
 >(<any>_("fabio")).capitalize : any
 >(<any>_("fabio")) : any
 ><any>_("fabio") : any
->_("fabio") : WrappedObject<string>
->_ : Static
+>_("fabio") : Underscore.WrappedObject<string>
+>_ : Underscore.Static
 >capitalize : any
 
 _.uniqueId('contact_');
 >_.uniqueId('contact_') : string
 >_.uniqueId : { (): number; (prefix: string): string; }
->_ : Static
+>_ : Underscore.Static
 >uniqueId : { (): number; (prefix: string): string; }
 
 _.escape('Curly, Larry & Moe');
 >_.escape('Curly, Larry & Moe') : string
 >_.escape : (s: string) => string
->_ : Static
+>_ : Underscore.Static
 >escape : (s: string) => string
 
 var object = { cheese: 'crumpets', stuff: function () { return 'nonsense'; } };
@@ -1253,23 +1253,23 @@ var object = { cheese: 'crumpets', stuff: function () { return 'nonsense'; } };
 _.result(object, 'cheese');
 >_.result(object, 'cheese') : any
 >_.result : (object: any, property: string) => any
->_ : Static
+>_ : Underscore.Static
 >result : (object: any, property: string) => any
 >object : { cheese: string; stuff: () => string; }
 
 _.result(object, 'stuff');
 >_.result(object, 'stuff') : any
 >_.result : (object: any, property: string) => any
->_ : Static
+>_ : Underscore.Static
 >result : (object: any, property: string) => any
 >object : { cheese: string; stuff: () => string; }
 
 var compiled = _.template("hello: <%= name %>");
 >compiled : (data: any) => string
 >_.template("hello: <%= name %>") : (data: any) => string
->_.template : { (templateString: string): (data: any) => string; (templateString: string, data: any, settings?: TemplateSettings): string; }
->_ : Static
->template : { (templateString: string): (data: any) => string; (templateString: string, data: any, settings?: TemplateSettings): string; }
+>_.template : { (templateString: string): (data: any) => string; (templateString: string, data: any, settings?: Underscore.TemplateSettings): string; }
+>_ : Underscore.Static
+>template : { (templateString: string): (data: any) => string; (templateString: string, data: any, settings?: Underscore.TemplateSettings): string; }
 
 compiled({ name: 'moe' });
 >compiled({ name: 'moe' }) : string
@@ -1282,9 +1282,9 @@ var list2 = "<% _.each(people, function(name) { %> <li><%= name %></li> <% }); %
 
 _.template(list2, { people: ['moe', 'curly', 'larry'] });
 >_.template(list2, { people: ['moe', 'curly', 'larry'] }) : string
->_.template : { (templateString: string): (data: any) => string; (templateString: string, data: any, settings?: TemplateSettings): string; }
->_ : Static
->template : { (templateString: string): (data: any) => string; (templateString: string, data: any, settings?: TemplateSettings): string; }
+>_.template : { (templateString: string): (data: any) => string; (templateString: string, data: any, settings?: Underscore.TemplateSettings): string; }
+>_ : Underscore.Static
+>template : { (templateString: string): (data: any) => string; (templateString: string, data: any, settings?: Underscore.TemplateSettings): string; }
 >list2 : string
 >{ people: ['moe', 'curly', 'larry'] } : { people: string[]; }
 >people : string[]
@@ -1293,9 +1293,9 @@ _.template(list2, { people: ['moe', 'curly', 'larry'] });
 var template = _.template("<b><%- value %></b>");
 >template : (data: any) => string
 >_.template("<b><%- value %></b>") : (data: any) => string
->_.template : { (templateString: string): (data: any) => string; (templateString: string, data: any, settings?: TemplateSettings): string; }
->_ : Static
->template : { (templateString: string): (data: any) => string; (templateString: string, data: any, settings?: TemplateSettings): string; }
+>_.template : { (templateString: string): (data: any) => string; (templateString: string, data: any, settings?: Underscore.TemplateSettings): string; }
+>_ : Underscore.Static
+>template : { (templateString: string): (data: any) => string; (templateString: string, data: any, settings?: Underscore.TemplateSettings): string; }
 
 template({ value: '<script>' });
 >template({ value: '<script>' }) : string
@@ -1306,9 +1306,9 @@ template({ value: '<script>' });
 var compiled2 = _.template("<% print('Hello ' + epithet); %>");
 >compiled2 : (data: any) => string
 >_.template("<% print('Hello ' + epithet); %>") : (data: any) => string
->_.template : { (templateString: string): (data: any) => string; (templateString: string, data: any, settings?: TemplateSettings): string; }
->_ : Static
->template : { (templateString: string): (data: any) => string; (templateString: string, data: any, settings?: TemplateSettings): string; }
+>_.template : { (templateString: string): (data: any) => string; (templateString: string, data: any, settings?: Underscore.TemplateSettings): string; }
+>_ : Underscore.Static
+>template : { (templateString: string): (data: any) => string; (templateString: string, data: any, settings?: Underscore.TemplateSettings): string; }
 
 compiled2({ epithet: "stooge" });
 >compiled2({ epithet: "stooge" }) : string
@@ -1318,9 +1318,9 @@ compiled2({ epithet: "stooge" });
 
 _.templateSettings = {
 >_.templateSettings = {    interpolate: /\{\{(.+?)\}\}/g} : { interpolate: RegExp; }
->_.templateSettings : TemplateSettings
->_ : Static
->templateSettings : TemplateSettings
+>_.templateSettings : Underscore.TemplateSettings
+>_ : Underscore.Static
+>templateSettings : Underscore.TemplateSettings
 >{    interpolate: /\{\{(.+?)\}\}/g} : { interpolate: RegExp; }
 
     interpolate: /\{\{(.+?)\}\}/g
@@ -1330,9 +1330,9 @@ _.templateSettings = {
 var template2 = _.template("Hello {{ name }}!");
 >template2 : (data: any) => string
 >_.template("Hello {{ name }}!") : (data: any) => string
->_.template : { (templateString: string): (data: any) => string; (templateString: string, data: any, settings?: TemplateSettings): string; }
->_ : Static
->template : { (templateString: string): (data: any) => string; (templateString: string, data: any, settings?: TemplateSettings): string; }
+>_.template : { (templateString: string): (data: any) => string; (templateString: string, data: any, settings?: Underscore.TemplateSettings): string; }
+>_ : Underscore.Static
+>template : { (templateString: string): (data: any) => string; (templateString: string, data: any, settings?: Underscore.TemplateSettings): string; }
 
 template2({ name: "Mustache" });
 >template2({ name: "Mustache" }) : string
@@ -1342,9 +1342,9 @@ template2({ name: "Mustache" });
 
 _.template("Using 'with': <%= data.answer %>", { answer: 'no' }, { variable: 'data' });
 >_.template("Using 'with': <%= data.answer %>", { answer: 'no' }, { variable: 'data' }) : string
->_.template : { (templateString: string): (data: any) => string; (templateString: string, data: any, settings?: TemplateSettings): string; }
->_ : Static
->template : { (templateString: string): (data: any) => string; (templateString: string, data: any, settings?: TemplateSettings): string; }
+>_.template : { (templateString: string): (data: any) => string; (templateString: string, data: any, settings?: Underscore.TemplateSettings): string; }
+>_ : Underscore.Static
+>template : { (templateString: string): (data: any) => string; (templateString: string, data: any, settings?: Underscore.TemplateSettings): string; }
 >{ answer: 'no' } : { answer: string; }
 >answer : string
 >{ variable: 'data' } : { variable: string; }
@@ -1392,7 +1392,7 @@ interface Tuple2<T0, T1> extends Array<any> {
 >Tuple2 : Tuple2<T0, T1>
 >T0 : T0
 >T1 : T1
->Array : T[]
+>Array : Array<T>
 
     0: T0;
 >T0 : T0
@@ -1406,7 +1406,7 @@ interface Tuple3<T0, T1, T2> extends Array<any> {
 >T0 : T0
 >T1 : T1
 >T2 : T2
->Array : T[]
+>Array : Array<T>
 
     0: T0;
 >T0 : T0
@@ -1424,7 +1424,7 @@ interface Tuple4<T0, T1, T2, T3> extends Array<any> {
 >T1 : T1
 >T2 : T2
 >T3 : T3
->Array : T[]
+>Array : Array<T>
 
     0: T0;
 >T0 : T0
@@ -1631,7 +1631,7 @@ module Underscore {
 >WrappedArray : WrappedArray<T>
 >T : T
 >WrappedObject : WrappedObject<T>
->Array : T[]
+>Array : Array<T>
 >T : T
 
         each(iterator: Iterator<T, void>, context?: any): void;
@@ -2635,7 +2635,7 @@ module Underscore {
 >ChainedArray : ChainedArray<T>
 >T : T
 >ChainedObject : ChainedObject<T>
->Array : T[]
+>Array : Array<T>
 >T : T
 
         each(iterator: Iterator<T, void>, context?: any): ChainedObject<void>;
@@ -5276,7 +5276,7 @@ module Underscore {
 }
 
 declare var _: Underscore.Static;
->_ : Static
+>_ : Underscore.Static
 >Underscore : Underscore
->Static : Static
+>Static : Underscore.Static
 
diff --git a/tests/baselines/reference/unexportedInstanceClassVariables.types b/tests/baselines/reference/unexportedInstanceClassVariables.types
index f40c606816d..e83530b1ff0 100644
--- a/tests/baselines/reference/unexportedInstanceClassVariables.types
+++ b/tests/baselines/reference/unexportedInstanceClassVariables.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/unexportedInstanceClassVariables.ts ===
 module M{
->M : typeof M
+>M : M
 
 	class A{
 >A : A
@@ -11,7 +11,7 @@ module M{
 }
 
 module M{
->M : typeof M
+>M : M
 
 	class A {}  
 >A : A
diff --git a/tests/baselines/reference/unusedImportDeclaration.types b/tests/baselines/reference/unusedImportDeclaration.types
index 2433bf7c7aa..a8361457d41 100644
--- a/tests/baselines/reference/unusedImportDeclaration.types
+++ b/tests/baselines/reference/unusedImportDeclaration.types
@@ -1,10 +1,10 @@
 === tests/cases/compiler/unusedImportDeclaration_testerA.ts ===
 import B = require("unusedImportDeclaration_testerB");
->B : typeof TesterB
+>B : B
 
 var thingy: B = {
->thingy : TesterB
->B : TesterB
+>thingy : B
+>B : B
 >{    me: "A"} : { me: string; }
 
     me: "A"
@@ -21,7 +21,7 @@ foo("IN " + thingy.me + "!");
 >"IN " + thingy.me + "!" : string
 >"IN " + thingy.me : string
 >thingy.me : string
->thingy : TesterB
+>thingy : B
 >me : string
 
 === tests/cases/compiler/unusedImportDeclaration_testerB.ts ===
diff --git a/tests/baselines/reference/usingModuleWithExportImportInValuePosition.types b/tests/baselines/reference/usingModuleWithExportImportInValuePosition.types
index 9cdd88ea728..a738c5c518d 100644
--- a/tests/baselines/reference/usingModuleWithExportImportInValuePosition.types
+++ b/tests/baselines/reference/usingModuleWithExportImportInValuePosition.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/usingModuleWithExportImportInValuePosition.ts ===
 module A {
->A : typeof A
+>A : A
 
 export var x = 'hello world'
 >x : string
@@ -24,11 +24,11 @@ export class Point {
     }
 }
 module C {
->C : typeof C
+>C : C
 
     export import a = A;
->a : typeof A
->A : typeof A
+>a : a
+>A : typeof a
 }
 
 var a: string = C.a.x;
@@ -43,12 +43,12 @@ var b: { x: number; y: number; } = new C.a.Point(0, 0);
 >b : { x: number; y: number; }
 >x : number
 >y : number
->new C.a.Point(0, 0) : Point
->C.a.Point : typeof Point
+>new C.a.Point(0, 0) : A.Point
+>C.a.Point : typeof A.Point
 >C.a : typeof A
 >C : typeof C
 >a : typeof A
->Point : typeof Point
+>Point : typeof A.Point
 
 var c: { name: string };
 >c : { name: string; }
@@ -57,7 +57,7 @@ var c: { name: string };
 var c: C.a.B.Id;
 >c : { name: string; }
 >C : C
->a : a
->B : B
->Id : Id
+>a : C.a
+>B : A.B
+>Id : A.B.Id
 
diff --git a/tests/baselines/reference/validMultipleVariableDeclarations.types b/tests/baselines/reference/validMultipleVariableDeclarations.types
index 60e7cebb491..d5a0d0cf673 100644
--- a/tests/baselines/reference/validMultipleVariableDeclarations.types
+++ b/tests/baselines/reference/validMultipleVariableDeclarations.types
@@ -126,7 +126,7 @@ var a: string[] = [];
 var a = new Array<string>();
 >a : string[]
 >new Array<string>() : string[]
->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[]; }
+>Array : { (arrayLength?: number): Array<any>; <T>(arrayLength: number): Array<T>; <T>(...items: Array<T>): Array<T>; new (arrayLength?: number): Array<any>; new <T>(arrayLength: number): Array<T>; new <T>(...items: Array<T>): Array<T>; isArray(arg: any): boolean; prototype: Array<any>; }
 
 var a: typeof a;
 >a : string[]
diff --git a/tests/baselines/reference/vardecl.types b/tests/baselines/reference/vardecl.types
index 714a721602e..c8d9fcc40e3 100644
--- a/tests/baselines/reference/vardecl.types
+++ b/tests/baselines/reference/vardecl.types
@@ -132,7 +132,7 @@ var d4: {
 }
 
 module m2 {
->m2 : typeof m2
+>m2 : m2
 
     export var a, b2: number = 10, b;
 >a : any
diff --git a/tests/baselines/reference/visSyntax.types b/tests/baselines/reference/visSyntax.types
index fc318e7de23..d151c510437 100644
--- a/tests/baselines/reference/visSyntax.types
+++ b/tests/baselines/reference/visSyntax.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/visSyntax.ts ===
 module M {
->M : typeof M
+>M : M
 
     export class C {
 >C : C
diff --git a/tests/baselines/reference/visibilityOfCrossModuleTypeUsage.types b/tests/baselines/reference/visibilityOfCrossModuleTypeUsage.types
index c9df8d9ca1b..23b49f275b3 100644
--- a/tests/baselines/reference/visibilityOfCrossModuleTypeUsage.types
+++ b/tests/baselines/reference/visibilityOfCrossModuleTypeUsage.types
@@ -1,46 +1,46 @@
 === tests/cases/compiler/visibilityOfCrossModuleTypeUsage_fs.ts ===
 import commands = require('visibilityOfCrossModuleTypeUsage_commands');
->commands : typeof "tests/cases/compiler/visibilityOfCrossModuleTypeUsage_commands"
+>commands : commands
 
 function run(configuration: commands.IConfiguration) {
 >run : typeof run
->configuration : IConfiguration
+>configuration : commands.IConfiguration
 >commands : commands
->IConfiguration : IConfiguration
+>IConfiguration : commands.IConfiguration
 
     var absoluteWorkspacePath = configuration.workspace.toAbsolutePath(configuration.server);
 >absoluteWorkspacePath : string
 >configuration.workspace.toAbsolutePath(configuration.server) : string
 >configuration.workspace.toAbsolutePath : (server: IServer, workspaceRelativePath?: string) => string
 >configuration.workspace : IWorkspace
->configuration : IConfiguration
+>configuration : commands.IConfiguration
 >workspace : IWorkspace
 >toAbsolutePath : (server: IServer, workspaceRelativePath?: string) => string
 >configuration.server : IServer
->configuration : IConfiguration
+>configuration : commands.IConfiguration
 >server : IServer
 }
 === tests/cases/compiler/visibilityOfCrossModuleTypeUsage_commands.ts ===
 //visibilityOfCrossModuleTypeUsage
 
 import fs = require('visibilityOfCrossModuleTypeUsage_fs');
->fs : typeof "tests/cases/compiler/visibilityOfCrossModuleTypeUsage_fs"
+>fs : fs
 
 import server = require('visibilityOfCrossModuleTypeUsage_server');
->server : typeof "tests/cases/compiler/visibilityOfCrossModuleTypeUsage_server"
+>server : server
 
 export interface IConfiguration {
 >IConfiguration : IConfiguration
 
     workspace: server.IWorkspace;
->workspace : IWorkspace
+>workspace : server.IWorkspace
 >server : server
->IWorkspace : IWorkspace
+>IWorkspace : server.IWorkspace
 
     server?: server.IServer;
->server : IServer
+>server : server.IServer
 >server : server
->IServer : IServer
+>IServer : server.IServer
 }
 
 === tests/cases/compiler/visibilityOfCrossModuleTypeUsage_server.ts ===
diff --git a/tests/baselines/reference/voidOperatorWithBooleanType.types b/tests/baselines/reference/voidOperatorWithBooleanType.types
index 83167141dd1..d623e11d731 100644
--- a/tests/baselines/reference/voidOperatorWithBooleanType.types
+++ b/tests/baselines/reference/voidOperatorWithBooleanType.types
@@ -13,10 +13,10 @@ class A {
 >a : boolean
 
     static foo() { return false; }
->foo : typeof foo
+>foo : () => boolean
 }
 module M {
->M : typeof M
+>M : M
 
     export var n: boolean;
 >n : boolean
@@ -70,9 +70,9 @@ var ResultIsAny7 = void A.foo();
 >ResultIsAny7 : any
 >void A.foo() : undefined
 >A.foo() : boolean
->A.foo : typeof foo
+>A.foo : () => boolean
 >A : typeof A
->foo : typeof foo
+>foo : () => boolean
 
 // multiple void  operator
 var ResultIsAny8 = void void BOOLEAN;
diff --git a/tests/baselines/reference/voidOperatorWithNumberType.types b/tests/baselines/reference/voidOperatorWithNumberType.types
index 8b3c6bf0453..1f789034764 100644
--- a/tests/baselines/reference/voidOperatorWithNumberType.types
+++ b/tests/baselines/reference/voidOperatorWithNumberType.types
@@ -17,10 +17,10 @@ class A {
 >a : number
 
     static foo() { return 1; }
->foo : typeof foo
+>foo : () => number
 }
 module M {
->M : typeof M
+>M : M
 
     export var n: number;
 >n : number
@@ -95,9 +95,9 @@ var ResultIsAny10 = void A.foo();
 >ResultIsAny10 : any
 >void A.foo() : undefined
 >A.foo() : number
->A.foo : typeof foo
+>A.foo : () => number
 >A : typeof A
->foo : typeof foo
+>foo : () => number
 
 var ResultIsAny11 = void (NUMBER + NUMBER);
 >ResultIsAny11 : any
diff --git a/tests/baselines/reference/voidOperatorWithStringType.types b/tests/baselines/reference/voidOperatorWithStringType.types
index 520fab3e557..260764d7d5f 100644
--- a/tests/baselines/reference/voidOperatorWithStringType.types
+++ b/tests/baselines/reference/voidOperatorWithStringType.types
@@ -17,10 +17,10 @@ class A {
 >a : string
 
     static foo() { return ""; }
->foo : typeof foo
+>foo : () => string
 }
 module M {
->M : typeof M
+>M : M
 
     export var n: string;
 >n : string
@@ -95,9 +95,9 @@ var ResultIsAny10 = void A.foo();
 >ResultIsAny10 : any
 >void A.foo() : undefined
 >A.foo() : string
->A.foo : typeof foo
+>A.foo : () => string
 >A : typeof A
->foo : typeof foo
+>foo : () => string
 
 var ResultIsAny11 = void (STRING + STRING);
 >ResultIsAny11 : any
diff --git a/tests/baselines/reference/withImportDecl.types b/tests/baselines/reference/withImportDecl.types
index e97dbf5bb01..cc536ddfc67 100644
--- a/tests/baselines/reference/withImportDecl.types
+++ b/tests/baselines/reference/withImportDecl.types
@@ -58,7 +58,7 @@ function simpleFunction() {
 }
 
 module m1 {
->m1 : typeof m1
+>m1 : m1
 
     export function foo() {
 >foo : typeof foo
@@ -68,18 +68,18 @@ module m1 {
 }
 
 import m3 = require("withImportDecl_0");
->m3 : typeof "tests/cases/compiler/withImportDecl_0"
+>m3 : m3
 
 var b = new m3.A();
->b : A
->new m3.A() : A
->m3.A : typeof A
->m3 : typeof "tests/cases/compiler/withImportDecl_0"
->A : typeof A
+>b : m3.A
+>new m3.A() : m3.A
+>m3.A : typeof m3.A
+>m3 : typeof m3
+>A : typeof m3.A
 
 b.foo;
 >b.foo : string
->b : A
+>b : m3.A
 >foo : string
 
 === tests/cases/compiler/withImportDecl_0.ts ===

From f93f78d1c2c270695619f8f63438f2a7f18f82ec Mon Sep 17 00:00:00 2001
From: Jason Freeman <jfreeman@microsoft.com>
Date: Mon, 25 Aug 2014 11:12:18 -0700
Subject: [PATCH 03/11] Adjust baselines after rebase

---
 .../reference/amdDependencyComment2.js        |  11 -
 ...hOnlyPublicMembersEquivalentToInterface.js |  50 --
 ...OnlyPublicMembersEquivalentToInterface2.js |  52 --
 tests/baselines/reference/commentsClass.js    |  34 +-
 tests/baselines/reference/commentsClass.types |  19 +-
 .../reference/commentsClassMembers.js         |  42 +-
 .../reference/commentsClassMembers.types      |  30 +-
 .../reference/commentsDottedModuleName.js     |  34 -
 tests/baselines/reference/commentsEnums.js    |   4 +-
 tests/baselines/reference/commentsEnums.types |   3 +-
 .../reference/commentsExternalModules.js      |   2 +-
 .../reference/commentsExternalModules.types   |   2 +-
 .../reference/commentsExternalModules2.js     | 176 -----
 .../reference/commentsExternalModules2.types  | 155 ----
 .../reference/commentsExternalModules3.js     | 174 -----
 .../reference/commentsExternalModules3.types  | 155 ----
 .../baselines/reference/commentsFormatting.js | 220 ------
 .../reference/commentsFormatting.types        |  75 --
 tests/baselines/reference/commentsFunction.js |  67 +-
 .../reference/commentsFunction.types          |  62 +-
 tests/baselines/reference/commentsModules.js  |  16 +-
 .../baselines/reference/commentsModules.types |   8 +-
 .../commentsOnObjectLiteral2.errors.txt       |   2 +-
 .../reference/commentsOnObjectLiteral2.js     |   4 +-
 .../commentsOnObjectLiteral3.errors.txt       |  24 +
 .../reference/commentsOnObjectLiteral3.js     |  40 -
 .../reference/commentsOnObjectLiteral3.types  |  46 --
 .../commentsOnObjectLiteral4.errors.txt       |  12 +
 .../reference/commentsOnObjectLiteral4.js     |  20 -
 .../reference/commentsOnObjectLiteral4.types  |  18 -
 .../reference/commentsTypeParameters.js       |  44 --
 .../reference/commentsTypeParameters.types    |  47 --
 tests/baselines/reference/commentsVarDecl.js  |  15 +-
 .../baselines/reference/commentsVarDecl.types |   7 +-
 .../constructorsWithSpecializedSignatures.js  |  58 --
 .../contextualSignatureInstantiation3.js      |  43 --
 .../baselines/reference/declFileAccessors.js  | 306 --------
 .../reference/declFileCallSignatures.js       | 121 ---
 .../reference/declFileConstructSignatures.js  | 121 ---
 .../reference/declFileConstructors.js         | 289 -------
 .../baselines/reference/declFileFunctions.js  | 146 ----
 tests/baselines/reference/declFileMethods.js  | 459 ------------
 .../declarationEmit_nameConflicts.js          | 195 -----
 .../declarationEmit_nameConflictsWithAlias.js |  28 -
 .../detachedCommentAtStartOfConstructor1.js   |  23 -
 ...detachedCommentAtStartOfConstructor1.types |  33 -
 .../detachedCommentAtStartOfConstructor2.js   |  24 -
 ...detachedCommentAtStartOfConstructor2.types |  34 -
 ...detachedCommentAtStartOfLambdaFunction1.js |  31 -
 ...achedCommentAtStartOfLambdaFunction1.types |  26 -
 ...detachedCommentAtStartOfLambdaFunction2.js |  32 -
 ...achedCommentAtStartOfLambdaFunction2.types |  27 -
 .../reference/duplicateVarAndImport.js        |  10 -
 .../reference/duplicateVarAndImport2.js       |  14 -
 tests/baselines/reference/emitBOM.js          |  12 -
 tests/baselines/reference/emitBOM.js.map      |   2 -
 .../baselines/reference/emitBOM.sourcemap.txt |  37 -
 .../reference/externalModuleResolution.js     |   6 -
 .../reference/externalModuleResolution2.js    |   6 -
 .../reference/externalModuleResolution2.types |   1 +
 .../reference/indexSignatureTypeInference.js  |  30 -
 ...nheritedOverloadedSpecializedSignatures.js |  49 --
 .../reference/moduleSymbolMerging.js          |  43 --
 .../baselines/reference/noImplicitAnyForIn.js |  57 --
 .../reference/noImplicitAnyIndexing.js        |  82 --
 .../noImplicitAnyParametersInBareFunctions.js | 102 ---
 .../noImplicitAnyParametersInClass.js         | 211 ------
 .../noImplicitAnyParametersInModule.js        | 107 ---
 .../reference/parserS7.6.1.1_A1.10.js         |  19 -
 .../reference/parserSyntaxWalker.generated.js | 291 --------
 .../privacyCannotNameAccessorDeclFile.js      | 411 ----------
 .../privacyCannotNameVarTypeDeclFile.js       | 239 ------
 ...FunctionCannotNameParameterTypeDeclFile.js | 425 -----------
 ...acyFunctionCannotNameReturnTypeDeclFile.js | 382 ----------
 tests/baselines/reference/privacyGetter.js    | 506 -------------
 tests/baselines/reference/privacyGloGetter.js | 218 ------
 tests/baselines/reference/privacyGloImport.js | 263 -------
 tests/baselines/reference/privacyImport.js    | 703 ------------------
 .../privacyTypeParameterOfFunction.js         | 245 ------
 .../reference/privacyTypeParametersOfClass.js | 109 ---
 .../baselines/reference/privacyVarDeclFile.js | 702 -----------------
 tests/baselines/reference/promiseChaining.js  |  26 -
 .../propertyParameterWithQuestionMark.js      |  23 -
 ...sourceMapWithMultipleFilesWithCopyright.js |  44 --
 ...ceMapWithMultipleFilesWithCopyright.js.map |   2 -
 ...thMultipleFilesWithCopyright.sourcemap.txt | 134 ----
 ...rceMapWithMultipleFilesWithCopyright.types |  27 -
 ...ultipleFilesWithFileEndingWithInterface.js |  34 -
 ...pleFilesWithFileEndingWithInterface.js.map |   2 -
 ...sWithFileEndingWithInterface.sourcemap.txt | 235 ------
 ...ipleFilesWithFileEndingWithInterface.types |  35 -
 .../baselines/reference/testContainerList.js  |  20 -
 .../typeParameterWithInvalidConstraintType.js |  26 -
 tests/cases/compiler/commentsClass.ts         |  16 +-
 tests/cases/compiler/commentsClassMembers.ts  |  19 +-
 tests/cases/compiler/commentsEnums.ts         |   2 +-
 .../cases/compiler/commentsExternalModules.ts |   2 +-
 .../compiler/commentsExternalModules2.ts      |  63 --
 .../compiler/commentsExternalModules3.ts      |  63 --
 tests/cases/compiler/commentsFormatting.ts    |  72 --
 tests/cases/compiler/commentsFunction.ts      |  36 +-
 tests/cases/compiler/commentsModules.ts       |   8 +-
 .../compiler/commentsOnObjectLiteral2.ts      |   2 +-
 .../compiler/commentsOnObjectLiteral3.ts      |   7 +-
 .../compiler/commentsOnObjectLiteral4.ts      |   1 -
 .../cases/compiler/commentsTypeParameters.ts  |  17 -
 tests/cases/compiler/commentsVarDecl.ts       |   8 +-
 .../detachedCommentAtStartOfConstructor1.ts   |  10 -
 .../detachedCommentAtStartOfConstructor2.ts   |  11 -
 ...detachedCommentAtStartOfLambdaFunction1.ts |  10 -
 ...detachedCommentAtStartOfLambdaFunction2.ts |  11 -
 .../compiler/externalModuleResolution.ts      |   6 -
 .../compiler/externalModuleResolution2.ts     |   6 -
 ...sourceMapWithMultipleFilesWithCopyright.ts |  20 -
 ...ultipleFilesWithFileEndingWithInterface.ts |  18 -
 115 files changed, 139 insertions(+), 9825 deletions(-)
 delete mode 100644 tests/baselines/reference/amdDependencyComment2.js
 delete mode 100644 tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface.js
 delete mode 100644 tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface2.js
 delete mode 100644 tests/baselines/reference/commentsDottedModuleName.js
 delete mode 100644 tests/baselines/reference/commentsExternalModules2.js
 delete mode 100644 tests/baselines/reference/commentsExternalModules2.types
 delete mode 100644 tests/baselines/reference/commentsExternalModules3.js
 delete mode 100644 tests/baselines/reference/commentsExternalModules3.types
 delete mode 100644 tests/baselines/reference/commentsFormatting.js
 delete mode 100644 tests/baselines/reference/commentsFormatting.types
 create mode 100644 tests/baselines/reference/commentsOnObjectLiteral3.errors.txt
 delete mode 100644 tests/baselines/reference/commentsOnObjectLiteral3.js
 delete mode 100644 tests/baselines/reference/commentsOnObjectLiteral3.types
 create mode 100644 tests/baselines/reference/commentsOnObjectLiteral4.errors.txt
 delete mode 100644 tests/baselines/reference/commentsOnObjectLiteral4.js
 delete mode 100644 tests/baselines/reference/commentsOnObjectLiteral4.types
 delete mode 100644 tests/baselines/reference/commentsTypeParameters.js
 delete mode 100644 tests/baselines/reference/commentsTypeParameters.types
 delete mode 100644 tests/baselines/reference/constructorsWithSpecializedSignatures.js
 delete mode 100644 tests/baselines/reference/contextualSignatureInstantiation3.js
 delete mode 100644 tests/baselines/reference/declFileAccessors.js
 delete mode 100644 tests/baselines/reference/declFileCallSignatures.js
 delete mode 100644 tests/baselines/reference/declFileConstructSignatures.js
 delete mode 100644 tests/baselines/reference/declFileConstructors.js
 delete mode 100644 tests/baselines/reference/declFileFunctions.js
 delete mode 100644 tests/baselines/reference/declFileMethods.js
 delete mode 100644 tests/baselines/reference/declarationEmit_nameConflicts.js
 delete mode 100644 tests/baselines/reference/declarationEmit_nameConflictsWithAlias.js
 delete mode 100644 tests/baselines/reference/detachedCommentAtStartOfConstructor1.js
 delete mode 100644 tests/baselines/reference/detachedCommentAtStartOfConstructor1.types
 delete mode 100644 tests/baselines/reference/detachedCommentAtStartOfConstructor2.js
 delete mode 100644 tests/baselines/reference/detachedCommentAtStartOfConstructor2.types
 delete mode 100644 tests/baselines/reference/detachedCommentAtStartOfLambdaFunction1.js
 delete mode 100644 tests/baselines/reference/detachedCommentAtStartOfLambdaFunction1.types
 delete mode 100644 tests/baselines/reference/detachedCommentAtStartOfLambdaFunction2.js
 delete mode 100644 tests/baselines/reference/detachedCommentAtStartOfLambdaFunction2.types
 delete mode 100644 tests/baselines/reference/duplicateVarAndImport.js
 delete mode 100644 tests/baselines/reference/duplicateVarAndImport2.js
 delete mode 100644 tests/baselines/reference/emitBOM.js
 delete mode 100644 tests/baselines/reference/emitBOM.js.map
 delete mode 100644 tests/baselines/reference/emitBOM.sourcemap.txt
 delete mode 100644 tests/baselines/reference/indexSignatureTypeInference.js
 delete mode 100644 tests/baselines/reference/inheritedOverloadedSpecializedSignatures.js
 delete mode 100644 tests/baselines/reference/moduleSymbolMerging.js
 delete mode 100644 tests/baselines/reference/noImplicitAnyForIn.js
 delete mode 100644 tests/baselines/reference/noImplicitAnyIndexing.js
 delete mode 100644 tests/baselines/reference/noImplicitAnyParametersInBareFunctions.js
 delete mode 100644 tests/baselines/reference/noImplicitAnyParametersInClass.js
 delete mode 100644 tests/baselines/reference/noImplicitAnyParametersInModule.js
 delete mode 100644 tests/baselines/reference/parserS7.6.1.1_A1.10.js
 delete mode 100644 tests/baselines/reference/parserSyntaxWalker.generated.js
 delete mode 100644 tests/baselines/reference/privacyCannotNameAccessorDeclFile.js
 delete mode 100644 tests/baselines/reference/privacyCannotNameVarTypeDeclFile.js
 delete mode 100644 tests/baselines/reference/privacyFunctionCannotNameParameterTypeDeclFile.js
 delete mode 100644 tests/baselines/reference/privacyFunctionCannotNameReturnTypeDeclFile.js
 delete mode 100644 tests/baselines/reference/privacyGetter.js
 delete mode 100644 tests/baselines/reference/privacyGloGetter.js
 delete mode 100644 tests/baselines/reference/privacyGloImport.js
 delete mode 100644 tests/baselines/reference/privacyImport.js
 delete mode 100644 tests/baselines/reference/privacyTypeParameterOfFunction.js
 delete mode 100644 tests/baselines/reference/privacyTypeParametersOfClass.js
 delete mode 100644 tests/baselines/reference/privacyVarDeclFile.js
 delete mode 100644 tests/baselines/reference/promiseChaining.js
 delete mode 100644 tests/baselines/reference/propertyParameterWithQuestionMark.js
 delete mode 100644 tests/baselines/reference/sourceMapWithMultipleFilesWithCopyright.js
 delete mode 100644 tests/baselines/reference/sourceMapWithMultipleFilesWithCopyright.js.map
 delete mode 100644 tests/baselines/reference/sourceMapWithMultipleFilesWithCopyright.sourcemap.txt
 delete mode 100644 tests/baselines/reference/sourceMapWithMultipleFilesWithCopyright.types
 delete mode 100644 tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.js
 delete mode 100644 tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.js.map
 delete mode 100644 tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.sourcemap.txt
 delete mode 100644 tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.types
 delete mode 100644 tests/baselines/reference/testContainerList.js
 delete mode 100644 tests/baselines/reference/typeParameterWithInvalidConstraintType.js
 delete mode 100644 tests/cases/compiler/commentsExternalModules2.ts
 delete mode 100644 tests/cases/compiler/commentsExternalModules3.ts
 delete mode 100644 tests/cases/compiler/commentsFormatting.ts
 delete mode 100644 tests/cases/compiler/commentsTypeParameters.ts
 delete mode 100644 tests/cases/compiler/detachedCommentAtStartOfConstructor1.ts
 delete mode 100644 tests/cases/compiler/detachedCommentAtStartOfConstructor2.ts
 delete mode 100644 tests/cases/compiler/detachedCommentAtStartOfLambdaFunction1.ts
 delete mode 100644 tests/cases/compiler/detachedCommentAtStartOfLambdaFunction2.ts
 delete mode 100644 tests/cases/compiler/sourceMapWithMultipleFilesWithCopyright.ts
 delete mode 100644 tests/cases/compiler/sourceMapWithMultipleFilesWithFileEndingWithInterface.ts

diff --git a/tests/baselines/reference/amdDependencyComment2.js b/tests/baselines/reference/amdDependencyComment2.js
deleted file mode 100644
index 137e183017a..00000000000
--- a/tests/baselines/reference/amdDependencyComment2.js
+++ /dev/null
@@ -1,11 +0,0 @@
-//// [amdDependencyComment2.ts]
-///<amd-dependency path='bar'/>
-
-import m1 = require("m2")
-m1.f();
-
-//// [amdDependencyComment2.js]
-///<amd-dependency path='bar'/>
-define(["require", "exports", "m2", "bar"], function (require, exports, m1) {
-    m1.f();
-});
diff --git a/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface.js b/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface.js
deleted file mode 100644
index acb802d0f97..00000000000
--- a/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface.js
+++ /dev/null
@@ -1,50 +0,0 @@
-//// [classWithOnlyPublicMembersEquivalentToInterface.ts]
-// no errors expected
-
-class C {
-    public x: string;
-    public y(a: number): number { return null; }
-    public get z() { return 1; }
-    public set z(v) { }
-    [x: string]: Object;
-    [x: number]: Object;
-    0: number;
-}
-
-interface I {
-    x: string;
-    y(b: number): number;
-    z: number;
-    [x: string]: Object;
-    [x: number]: Object;
-    0: number;
-}
-
-var c: C;
-var i: I;
-c = i;
-i = c;
-
-//// [classWithOnlyPublicMembersEquivalentToInterface.js]
-// no errors expected
-var C = (function () {
-    function C() {
-    }
-    C.prototype.y = function (a) {
-        return null;
-    };
-    Object.defineProperty(C.prototype, "z", {
-        get: function () {
-            return 1;
-        },
-        set: function (v) {
-        },
-        enumerable: true,
-        configurable: true
-    });
-    return C;
-})();
-var c;
-var i;
-c = i;
-i = c;
diff --git a/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface2.js b/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface2.js
deleted file mode 100644
index 1048c2e5124..00000000000
--- a/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface2.js
+++ /dev/null
@@ -1,52 +0,0 @@
-//// [classWithOnlyPublicMembersEquivalentToInterface2.ts]
-// no errors expected
-
-class C {
-    public x: string;
-    public y(a: number): number { return null; }
-    public get z() { return 1; }
-    public set z(v) { }
-    [x: string]: Object;
-    [x: number]: Object;
-    0: number;
-
-    public static foo: string; // doesn't effect equivalence
-}
-
-interface I {
-    x: string;
-    y(b: number): number;
-    z: number;
-    [x: string]: Object;
-    [x: number]: Object;
-    0: number;
-}
-
-var c: C;
-var i: I;
-c = i;
-i = c;
-
-//// [classWithOnlyPublicMembersEquivalentToInterface2.js]
-// no errors expected
-var C = (function () {
-    function C() {
-    }
-    C.prototype.y = function (a) {
-        return null;
-    };
-    Object.defineProperty(C.prototype, "z", {
-        get: function () {
-            return 1;
-        },
-        set: function (v) {
-        },
-        enumerable: true,
-        configurable: true
-    });
-    return C;
-})();
-var c;
-var i;
-c = i;
-i = c;
diff --git a/tests/baselines/reference/commentsClass.js b/tests/baselines/reference/commentsClass.js
index b42235e9afe..1b177293fda 100644
--- a/tests/baselines/reference/commentsClass.js
+++ b/tests/baselines/reference/commentsClass.js
@@ -2,21 +2,21 @@
 
 /** This is class c2 without constuctor*/
 class c2 {
-} // trailing comment1
+}
 var i2 = new c2();
 var i2_c = c2;
 class c3 {
     /** Constructor comment*/
     constructor() {
-    } // trailing comment of constructor
-} /* trailing comment 2 */
+    }
+}
 var i3 = new c3();
 var i3_c = c3;
 /** Class comment*/
 class c4 {
     /** Constructor comment*/
     constructor() {
-    } /* trailing comment of constructor 2*/
+    }
 }
 var i4 = new c4();
 var i4_c = c4;
@@ -63,14 +63,6 @@ class c8 {
 }
 var i8 = new c8();
 var i8_c = c8;
-
-class c9 {
-    constructor() {
-        /// This is some detached comment
-
-        // should emit this leading comment of } too
-    }
-}
 
 
 //// [commentsClass.js]
@@ -79,22 +71,22 @@ var c2 = (function () {
     function c2() {
     }
     return c2;
-})(); // trailing comment1
+})();
 var i2 = new c2();
 var i2_c = c2;
 var c3 = (function () {
     /** Constructor comment*/
     function c3() {
-    } // trailing comment of constructor
+    }
     return c3;
-})(); /* trailing comment 2 */
+})();
 var i3 = new c3();
 var i3_c = c3;
 /** Class comment*/
 var c4 = (function () {
     /** Constructor comment*/
     function c4() {
-    } /* trailing comment of constructor 2*/
+    }
     return c4;
 })();
 var i4 = new c4();
@@ -138,13 +130,6 @@ var c8 = (function () {
 })();
 var i8 = new c8();
 var i8_c = c8;
-var c9 = (function () {
-    function c9() {
-        /// This is some detached comment
-        // should emit this leading comment of } too
-    }
-    return c9;
-})();
 
 
 //// [commentsClass.d.ts]
@@ -195,6 +180,3 @@ declare class c8 {
 }
 declare var i8: c8;
 declare var i8_c: typeof c8;
-declare class c9 {
-    constructor();
-}
diff --git a/tests/baselines/reference/commentsClass.types b/tests/baselines/reference/commentsClass.types
index a4aca2ba15b..ec3d610f47e 100644
--- a/tests/baselines/reference/commentsClass.types
+++ b/tests/baselines/reference/commentsClass.types
@@ -3,8 +3,7 @@
 /** This is class c2 without constuctor*/
 class c2 {
 >c2 : c2
-
-} // trailing comment1
+}
 var i2 = new c2();
 >i2 : c2
 >new c2() : c2
@@ -19,8 +18,8 @@ class c3 {
 
     /** Constructor comment*/
     constructor() {
-    } // trailing comment of constructor
-} /* trailing comment 2 */
+    }
+}
 var i3 = new c3();
 >i3 : c3
 >new c3() : c3
@@ -36,7 +35,7 @@ class c4 {
 
     /** Constructor comment*/
     constructor() {
-    } /* trailing comment of constructor 2*/
+    }
 }
 var i4 = new c4();
 >i4 : c4
@@ -130,13 +129,3 @@ var i8_c = c8;
 >i8_c : typeof c8
 >c8 : typeof c8
 
-class c9 {
->c9 : c9
-
-    constructor() {
-        /// This is some detached comment
-
-        // should emit this leading comment of } too
-    }
-}
-
diff --git a/tests/baselines/reference/commentsClassMembers.js b/tests/baselines/reference/commentsClassMembers.js
index 67fdd047518..e1199b73113 100644
--- a/tests/baselines/reference/commentsClassMembers.js
+++ b/tests/baselines/reference/commentsClassMembers.js
@@ -7,21 +7,21 @@ class c1 {
     /** sum with property*/
     public p2(/** number to add*/b: number) {
         return this.p1 + b;
-    } /* trailing comment of method*/
+    }
     /** getter property*/
     public get p3() {
         return this.p2(this.p1);
-    }// trailing comment Getter
+    }
     /** setter property*/
     public set p3(/** this is value*/value: number) {
         this.p1 = this.p2(value);
-    }// trailing comment Setter
+    }
     /** pp1 is property of c1*/
     private pp1: number;
     /** sum with property*/
     private pp2(/** number to add*/b: number) {
         return this.p1 + b;
-    } // trailing comment of method
+    }
     /** getter property*/
     private get pp3() {
         return this.pp2(this.pp1);
@@ -42,11 +42,11 @@ class c1 {
     /** static getter property*/
     static get s3() {
         return c1.s2(c1.s1);
-    } /*trailing comment 1 getter*/
+    }
     /** setter property*/
     static set s3( /** this is value*/value: number) {
         c1.s1 = c1.s2(value);
-    }/*trailing comment 2 */ /*setter*/
+    }
     public nc_p1: number;
     public nc_p2(b: number) {
         return this.nc_p1 + b;
@@ -198,7 +198,7 @@ class cProperties {
     /** getter only property*/
     public get p1() {
         return this.val;
-    } // trailing comment of only getter
+    }
     public get nc_p1() {
         return this.val;
     }
@@ -208,10 +208,7 @@ class cProperties {
     }
     public set nc_p2(value: number) {
         this.val = value;
-    } /* trailing comment of setter only*/
-
-    public x = 10; /*trailing comment for property*/
-    private y = 10; // trailing comment of // style
+    }
 }
 var cProperties_i = new cProperties();
 cProperties_i.p2 = cProperties_i.p1;
@@ -227,25 +224,23 @@ var c1 = (function () {
     /** sum with property*/
     c1.prototype.p2 = function (/** number to add*/ b) {
         return this.p1 + b;
-    }; /* trailing comment of method*/
+    };
     Object.defineProperty(c1.prototype, "p3", {
         /** getter property*/
         get: function () {
             return this.p2(this.p1);
-        } // trailing comment Getter
-        ,
+        },
         /** setter property*/
         set: function (/** this is value*/ value) {
             this.p1 = this.p2(value);
-        } // trailing comment Setter
-        ,
+        },
         enumerable: true,
         configurable: true
     });
     /** sum with property*/
     c1.prototype.pp2 = function (/** number to add*/ b) {
         return this.p1 + b;
-    }; // trailing comment of method
+    };
     Object.defineProperty(c1.prototype, "pp3", {
         /** getter property*/
         get: function () {
@@ -266,11 +261,11 @@ var c1 = (function () {
         /** static getter property*/
         get: function () {
             return c1.s2(c1.s1);
-        } /*trailing comment 1 getter*/,
+        },
         /** setter property*/
         set: function (/** this is value*/ value) {
             c1.s1 = c1.s2(value);
-        } /*trailing comment 2 */ /*setter*/,
+        },
         enumerable: true,
         configurable: true
     });
@@ -438,15 +433,12 @@ c1.nc_s3 = i1_s_ncprop;
 var i1_c = c1;
 var cProperties = (function () {
     function cProperties() {
-        this.x = 10; /*trailing comment for property*/
-        this.y = 10; // trailing comment of // style
     }
     Object.defineProperty(cProperties.prototype, "p1", {
         /** getter only property*/
         get: function () {
             return this.val;
-        } // trailing comment of only getter
-        ,
+        },
         enumerable: true,
         configurable: true
     });
@@ -468,7 +460,7 @@ var cProperties = (function () {
     Object.defineProperty(cProperties.prototype, "nc_p2", {
         set: function (value) {
             this.val = value;
-        } /* trailing comment of setter only*/,
+        },
         enumerable: true,
         configurable: true
     });
@@ -573,7 +565,5 @@ declare class cProperties {
     /**setter only property*/
     p2: number;
     nc_p2: number;
-    x: number;
-    private y;
 }
 declare var cProperties_i: cProperties;
diff --git a/tests/baselines/reference/commentsClassMembers.types b/tests/baselines/reference/commentsClassMembers.types
index d71ccd2e1e8..85cf1e369f3 100644
--- a/tests/baselines/reference/commentsClassMembers.types
+++ b/tests/baselines/reference/commentsClassMembers.types
@@ -19,8 +19,7 @@ class c1 {
 >this : c1
 >p1 : number
 >b : number
-
-    } /* trailing comment of method*/
+    }
     /** getter property*/
     public get p3() {
 >p3 : number
@@ -33,8 +32,7 @@ class c1 {
 >this.p1 : number
 >this : c1
 >p1 : number
-
-    }// trailing comment Getter
+    }
     /** setter property*/
     public set p3(/** this is value*/value: number) {
 >p3 : number
@@ -50,8 +48,7 @@ class c1 {
 >this : c1
 >p2 : (b: number) => number
 >value : number
-
-    }// trailing comment Setter
+    }
     /** pp1 is property of c1*/
     private pp1: number;
 >pp1 : number
@@ -67,8 +64,7 @@ class c1 {
 >this : c1
 >p1 : number
 >b : number
-
-    } // trailing comment of method
+    }
     /** getter property*/
     private get pp3() {
 >pp3 : number
@@ -129,8 +125,7 @@ class c1 {
 >c1.s1 : number
 >c1 : typeof c1
 >s1 : number
-
-    } /*trailing comment 1 getter*/
+    }
     /** setter property*/
     static set s3( /** this is value*/value: number) {
 >s3 : number
@@ -146,8 +141,7 @@ class c1 {
 >c1 : typeof c1
 >s2 : (b: number) => number
 >value : number
-
-    }/*trailing comment 2 */ /*setter*/
+    }
     public nc_p1: number;
 >nc_p1 : number
 
@@ -702,8 +696,7 @@ class cProperties {
 >this.val : number
 >this : cProperties
 >val : number
-
-    } // trailing comment of only getter
+    }
     public get nc_p1() {
 >nc_p1 : number
 
@@ -734,14 +727,7 @@ class cProperties {
 >this : cProperties
 >val : number
 >value : number
-
-    } /* trailing comment of setter only*/
-
-    public x = 10; /*trailing comment for property*/
->x : number
-
-    private y = 10; // trailing comment of // style
->y : number
+    }
 }
 var cProperties_i = new cProperties();
 >cProperties_i : cProperties
diff --git a/tests/baselines/reference/commentsDottedModuleName.js b/tests/baselines/reference/commentsDottedModuleName.js
deleted file mode 100644
index 7044a244279..00000000000
--- a/tests/baselines/reference/commentsDottedModuleName.js
+++ /dev/null
@@ -1,34 +0,0 @@
-//// [commentsDottedModuleName.ts]
-
-/** this is multi declare module*/
-export module outerModule.InnerModule {
-    /// class b comment
-    export class b {
-    }
-}
-
-//// [commentsDottedModuleName.js]
-define(["require", "exports"], function (require, exports) {
-    /** this is multi declare module*/
-    (function (outerModule) {
-        (function (InnerModule) {
-            /// class b comment
-            var b = (function () {
-                function b() {
-                }
-                return b;
-            })();
-            InnerModule.b = b;
-        })(outerModule.InnerModule || (outerModule.InnerModule = {}));
-        var InnerModule = outerModule.InnerModule;
-    })(exports.outerModule || (exports.outerModule = {}));
-    var outerModule = exports.outerModule;
-});
-
-
-//// [commentsDottedModuleName.d.ts]
-/** this is multi declare module*/
-export declare module outerModule.InnerModule {
-    class b {
-    }
-}
diff --git a/tests/baselines/reference/commentsEnums.js b/tests/baselines/reference/commentsEnums.js
index c8bba8a4f77..078008268d8 100644
--- a/tests/baselines/reference/commentsEnums.js
+++ b/tests/baselines/reference/commentsEnums.js
@@ -6,7 +6,7 @@ enum Colors {
     Cornflower /* blue */,
     /** Fancy name for 'pink'*/
     FancyPink
-} // trailing comment
+}
 var x = Colors.Cornflower;
 x = Colors.FancyPink;
 
@@ -20,7 +20,7 @@ var Colors;
     Colors[Colors["Cornflower"] = 0] = "Cornflower"; /* blue */
     /** Fancy name for 'pink'*/
     Colors[Colors["FancyPink"] = 1] = "FancyPink";
-})(Colors || (Colors = {})); // trailing comment
+})(Colors || (Colors = {}));
 var x = 0 /* Cornflower */;
 x = 1 /* FancyPink */;
 
diff --git a/tests/baselines/reference/commentsEnums.types b/tests/baselines/reference/commentsEnums.types
index 64404bff2e5..639958f9c42 100644
--- a/tests/baselines/reference/commentsEnums.types
+++ b/tests/baselines/reference/commentsEnums.types
@@ -11,8 +11,7 @@ enum Colors {
     /** Fancy name for 'pink'*/
     FancyPink
 >FancyPink : Colors
-
-} // trailing comment
+}
 var x = Colors.Cornflower;
 >x : Colors
 >Colors.Cornflower : Colors
diff --git a/tests/baselines/reference/commentsExternalModules.js b/tests/baselines/reference/commentsExternalModules.js
index d4a0094e049..74920337ab7 100644
--- a/tests/baselines/reference/commentsExternalModules.js
+++ b/tests/baselines/reference/commentsExternalModules.js
@@ -54,7 +54,7 @@ var myvar2 = new m4.m2.c();
 
 //// [commentsExternalModules_1.ts]
 /**This is on import declaration*/
-import extMod = require("commentsExternalModules_0"); // trailing comment1
+import extMod = require("commentsExternalModules_0");
 extMod.m1.fooExport();
 var newVar = new extMod.m1.m2.c();
 extMod.m4.fooExport();
diff --git a/tests/baselines/reference/commentsExternalModules.types b/tests/baselines/reference/commentsExternalModules.types
index 111114cd734..6aaf7bc3736 100644
--- a/tests/baselines/reference/commentsExternalModules.types
+++ b/tests/baselines/reference/commentsExternalModules.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/commentsExternalModules_1.ts ===
 /**This is on import declaration*/
-import extMod = require("commentsExternalModules_0"); // trailing comment1
+import extMod = require("commentsExternalModules_0");
 >extMod : extMod
 
 extMod.m1.fooExport();
diff --git a/tests/baselines/reference/commentsExternalModules2.js b/tests/baselines/reference/commentsExternalModules2.js
deleted file mode 100644
index ab2db534e14..00000000000
--- a/tests/baselines/reference/commentsExternalModules2.js
+++ /dev/null
@@ -1,176 +0,0 @@
-//// [tests/cases/compiler/commentsExternalModules2.ts] ////
-
-//// [commentsExternalModules2_0.ts]
-
-/** Module comment*/
-export module m1 {
-    /** b's comment*/
-    export var b: number;
-    /** foo's comment*/
-    function foo() {
-        return b;
-    }
-    /** m2 comments*/
-    export module m2 {
-        /** class comment;*/
-        export class c {
-        };
-        /** i*/
-        export var i = new c();
-    }
-    /** exported function*/
-    export function fooExport() {
-        return foo();
-    }
-}
-m1.fooExport();
-var myvar = new m1.m2.c();
-
-/** Module comment */
-export module m4 {
-    /** b's comment */
-    export var b: number;
-    /** foo's comment
-    */
-    function foo() {
-        return b;
-    }
-    /** m2 comments
-    */
-    export module m2 {
-        /** class comment; */
-        export class c {
-        };
-        /** i */
-        export var i = new c();
-    }
-    /** exported function */
-    export function fooExport() {
-        return foo();
-    }
-}
-m4.fooExport();
-var myvar2 = new m4.m2.c();
-
-//// [commentsExternalModules_1.ts]
-/**This is on import declaration*/
-import extMod = require("commentsExternalModules2_0"); // trailing comment 1
-extMod.m1.fooExport();
-export var newVar = new extMod.m1.m2.c();
-extMod.m4.fooExport();
-export var newVar2 = new extMod.m4.m2.c();
-
-
-//// [commentsExternalModules2_0.js]
-define(["require", "exports"], function (require, exports) {
-    /** Module comment*/
-    (function (m1) {
-        /** b's comment*/
-        m1.b;
-        /** foo's comment*/
-        function foo() {
-            return m1.b;
-        }
-        /** m2 comments*/
-        (function (m2) {
-            /** class comment;*/
-            var c = (function () {
-                function c() {
-                }
-                return c;
-            })();
-            m2.c = c;
-            ;
-            /** i*/
-            m2.i = new c();
-        })(m1.m2 || (m1.m2 = {}));
-        var m2 = m1.m2;
-        /** exported function*/
-        function fooExport() {
-            return foo();
-        }
-        m1.fooExport = fooExport;
-    })(exports.m1 || (exports.m1 = {}));
-    var m1 = exports.m1;
-    m1.fooExport();
-    var myvar = new m1.m2.c();
-    /** Module comment */
-    (function (m4) {
-        /** b's comment */
-        m4.b;
-        /** foo's comment
-        */
-        function foo() {
-            return m4.b;
-        }
-        /** m2 comments
-        */
-        (function (m2) {
-            /** class comment; */
-            var c = (function () {
-                function c() {
-                }
-                return c;
-            })();
-            m2.c = c;
-            ;
-            /** i */
-            m2.i = new c();
-        })(m4.m2 || (m4.m2 = {}));
-        var m2 = m4.m2;
-        /** exported function */
-        function fooExport() {
-            return foo();
-        }
-        m4.fooExport = fooExport;
-    })(exports.m4 || (exports.m4 = {}));
-    var m4 = exports.m4;
-    m4.fooExport();
-    var myvar2 = new m4.m2.c();
-});
-//// [commentsExternalModules_1.js]
-define(["require", "exports", "commentsExternalModules2_0"], function (require, exports, extMod) {
-    extMod.m1.fooExport();
-    exports.newVar = new extMod.m1.m2.c();
-    extMod.m4.fooExport();
-    exports.newVar2 = new extMod.m4.m2.c();
-});
-
-
-//// [commentsExternalModules2_0.d.ts]
-/** Module comment*/
-export declare module m1 {
-    /** b's comment*/
-    var b: number;
-    /** m2 comments*/
-    module m2 {
-        /** class comment;*/
-        class c {
-        }
-        /** i*/
-        var i: c;
-    }
-    /** exported function*/
-    function fooExport(): number;
-}
-/** Module comment */
-export declare module m4 {
-    /** b's comment */
-    var b: number;
-    /** m2 comments
-    */
-    module m2 {
-        /** class comment; */
-        class c {
-        }
-        /** i */
-        var i: c;
-    }
-    /** exported function */
-    function fooExport(): number;
-}
-//// [commentsExternalModules_1.d.ts]
-/**This is on import declaration*/
-import extMod = require("commentsExternalModules2_0");
-export declare var newVar: extMod.m1.m2.c;
-export declare var newVar2: extMod.m4.m2.c;
diff --git a/tests/baselines/reference/commentsExternalModules2.types b/tests/baselines/reference/commentsExternalModules2.types
deleted file mode 100644
index 3f9c14227ac..00000000000
--- a/tests/baselines/reference/commentsExternalModules2.types
+++ /dev/null
@@ -1,155 +0,0 @@
-=== tests/cases/compiler/commentsExternalModules_1.ts ===
-/**This is on import declaration*/
-import extMod = require("commentsExternalModules2_0"); // trailing comment 1
->extMod : extMod
-
-extMod.m1.fooExport();
->extMod.m1.fooExport() : number
->extMod.m1.fooExport : typeof extMod.m1.fooExport
->extMod.m1 : typeof extMod.m1
->extMod : typeof extMod
->m1 : typeof extMod.m1
->fooExport : typeof extMod.m1.fooExport
-
-export var newVar = new extMod.m1.m2.c();
->newVar : extMod.m1.m2.c
->new extMod.m1.m2.c() : extMod.m1.m2.c
->extMod.m1.m2.c : typeof extMod.m1.m2.c
->extMod.m1.m2 : typeof extMod.m1.m2
->extMod.m1 : typeof extMod.m1
->extMod : typeof extMod
->m1 : typeof extMod.m1
->m2 : typeof extMod.m1.m2
->c : typeof extMod.m1.m2.c
-
-extMod.m4.fooExport();
->extMod.m4.fooExport() : number
->extMod.m4.fooExport : typeof extMod.m4.fooExport
->extMod.m4 : typeof extMod.m4
->extMod : typeof extMod
->m4 : typeof extMod.m4
->fooExport : typeof extMod.m4.fooExport
-
-export var newVar2 = new extMod.m4.m2.c();
->newVar2 : extMod.m4.m2.c
->new extMod.m4.m2.c() : extMod.m4.m2.c
->extMod.m4.m2.c : typeof extMod.m4.m2.c
->extMod.m4.m2 : typeof extMod.m4.m2
->extMod.m4 : typeof extMod.m4
->extMod : typeof extMod
->m4 : typeof extMod.m4
->m2 : typeof extMod.m4.m2
->c : typeof extMod.m4.m2.c
-
-=== tests/cases/compiler/commentsExternalModules2_0.ts ===
-
-/** Module comment*/
-export module m1 {
->m1 : m1
-
-    /** b's comment*/
-    export var b: number;
->b : number
-
-    /** foo's comment*/
-    function foo() {
->foo : typeof foo
-
-        return b;
->b : number
-    }
-    /** m2 comments*/
-    export module m2 {
->m2 : m2
-
-        /** class comment;*/
-        export class c {
->c : c
-
-        };
-        /** i*/
-        export var i = new c();
->i : c
->new c() : c
->c : typeof c
-    }
-    /** exported function*/
-    export function fooExport() {
->fooExport : typeof fooExport
-
-        return foo();
->foo() : number
->foo : typeof foo
-    }
-}
-m1.fooExport();
->m1.fooExport() : number
->m1.fooExport : typeof m1.fooExport
->m1 : typeof m1
->fooExport : typeof m1.fooExport
-
-var myvar = new m1.m2.c();
->myvar : m1.m2.c
->new m1.m2.c() : m1.m2.c
->m1.m2.c : typeof m1.m2.c
->m1.m2 : typeof m1.m2
->m1 : typeof m1
->m2 : typeof m1.m2
->c : typeof m1.m2.c
-
-/** Module comment */
-export module m4 {
->m4 : m4
-
-    /** b's comment */
-    export var b: number;
->b : number
-
-    /** foo's comment
-    */
-    function foo() {
->foo : typeof foo
-
-        return b;
->b : number
-    }
-    /** m2 comments
-    */
-    export module m2 {
->m2 : m2
-
-        /** class comment; */
-        export class c {
->c : c
-
-        };
-        /** i */
-        export var i = new c();
->i : c
->new c() : c
->c : typeof c
-    }
-    /** exported function */
-    export function fooExport() {
->fooExport : typeof fooExport
-
-        return foo();
->foo() : number
->foo : typeof foo
-    }
-}
-m4.fooExport();
->m4.fooExport() : number
->m4.fooExport : typeof m4.fooExport
->m4 : typeof m4
->fooExport : typeof m4.fooExport
-
-var myvar2 = new m4.m2.c();
->myvar2 : m4.m2.c
->new m4.m2.c() : m4.m2.c
->m4.m2.c : typeof m4.m2.c
->m4.m2 : typeof m4.m2
->m4 : typeof m4
->m2 : typeof m4.m2
->c : typeof m4.m2.c
-
diff --git a/tests/baselines/reference/commentsExternalModules3.js b/tests/baselines/reference/commentsExternalModules3.js
deleted file mode 100644
index afade653a6f..00000000000
--- a/tests/baselines/reference/commentsExternalModules3.js
+++ /dev/null
@@ -1,174 +0,0 @@
-//// [tests/cases/compiler/commentsExternalModules3.ts] ////
-
-//// [commentsExternalModules2_0.ts]
-
-/** Module comment*/
-export module m1 {
-    /** b's comment*/
-    export var b: number;
-    /** foo's comment*/
-    function foo() {
-        return b;
-    }
-    /** m2 comments*/
-    export module m2 {
-        /** class comment;*/
-        export class c {
-        };
-        /** i*/
-        export var i = new c();
-    }
-    /** exported function*/
-    export function fooExport() {
-        return foo();
-    }
-}
-m1.fooExport();
-var myvar = new m1.m2.c();
-
-/** Module comment */
-export module m4 {
-    /** b's comment */
-    export var b: number;
-    /** foo's comment
-    */
-    function foo() {
-        return b;
-    }
-    /** m2 comments
-    */
-    export module m2 {
-        /** class comment; */
-        export class c {
-        };
-        /** i */
-        export var i = new c();
-    }
-    /** exported function */
-    export function fooExport() {
-        return foo();
-    }
-}
-m4.fooExport();
-var myvar2 = new m4.m2.c();
-
-//// [commentsExternalModules_1.ts]
-/**This is on import declaration*/
-import extMod = require("commentsExternalModules2_0"); // trailing comment 1
-extMod.m1.fooExport();
-export var newVar = new extMod.m1.m2.c();
-extMod.m4.fooExport();
-export var newVar2 = new extMod.m4.m2.c();
-
-
-//// [commentsExternalModules2_0.js]
-/** Module comment*/
-(function (m1) {
-    /** b's comment*/
-    m1.b;
-    /** foo's comment*/
-    function foo() {
-        return m1.b;
-    }
-    /** m2 comments*/
-    (function (m2) {
-        /** class comment;*/
-        var c = (function () {
-            function c() {
-            }
-            return c;
-        })();
-        m2.c = c;
-        ;
-        /** i*/
-        m2.i = new c();
-    })(m1.m2 || (m1.m2 = {}));
-    var m2 = m1.m2;
-    /** exported function*/
-    function fooExport() {
-        return foo();
-    }
-    m1.fooExport = fooExport;
-})(exports.m1 || (exports.m1 = {}));
-var m1 = exports.m1;
-m1.fooExport();
-var myvar = new m1.m2.c();
-/** Module comment */
-(function (m4) {
-    /** b's comment */
-    m4.b;
-    /** foo's comment
-    */
-    function foo() {
-        return m4.b;
-    }
-    /** m2 comments
-    */
-    (function (m2) {
-        /** class comment; */
-        var c = (function () {
-            function c() {
-            }
-            return c;
-        })();
-        m2.c = c;
-        ;
-        /** i */
-        m2.i = new c();
-    })(m4.m2 || (m4.m2 = {}));
-    var m2 = m4.m2;
-    /** exported function */
-    function fooExport() {
-        return foo();
-    }
-    m4.fooExport = fooExport;
-})(exports.m4 || (exports.m4 = {}));
-var m4 = exports.m4;
-m4.fooExport();
-var myvar2 = new m4.m2.c();
-//// [commentsExternalModules_1.js]
-/**This is on import declaration*/
-var extMod = require("commentsExternalModules2_0"); // trailing comment 1
-extMod.m1.fooExport();
-exports.newVar = new extMod.m1.m2.c();
-extMod.m4.fooExport();
-exports.newVar2 = new extMod.m4.m2.c();
-
-
-//// [commentsExternalModules2_0.d.ts]
-/** Module comment*/
-export declare module m1 {
-    /** b's comment*/
-    var b: number;
-    /** m2 comments*/
-    module m2 {
-        /** class comment;*/
-        class c {
-        }
-        /** i*/
-        var i: c;
-    }
-    /** exported function*/
-    function fooExport(): number;
-}
-/** Module comment */
-export declare module m4 {
-    /** b's comment */
-    var b: number;
-    /** m2 comments
-    */
-    module m2 {
-        /** class comment; */
-        class c {
-        }
-        /** i */
-        var i: c;
-    }
-    /** exported function */
-    function fooExport(): number;
-}
-//// [commentsExternalModules_1.d.ts]
-/**This is on import declaration*/
-import extMod = require("commentsExternalModules2_0");
-export declare var newVar: extMod.m1.m2.c;
-export declare var newVar2: extMod.m4.m2.c;
diff --git a/tests/baselines/reference/commentsExternalModules3.types b/tests/baselines/reference/commentsExternalModules3.types
deleted file mode 100644
index 3f9c14227ac..00000000000
--- a/tests/baselines/reference/commentsExternalModules3.types
+++ /dev/null
@@ -1,155 +0,0 @@
-=== tests/cases/compiler/commentsExternalModules_1.ts ===
-/**This is on import declaration*/
-import extMod = require("commentsExternalModules2_0"); // trailing comment 1
->extMod : extMod
-
-extMod.m1.fooExport();
->extMod.m1.fooExport() : number
->extMod.m1.fooExport : typeof extMod.m1.fooExport
->extMod.m1 : typeof extMod.m1
->extMod : typeof extMod
->m1 : typeof extMod.m1
->fooExport : typeof extMod.m1.fooExport
-
-export var newVar = new extMod.m1.m2.c();
->newVar : extMod.m1.m2.c
->new extMod.m1.m2.c() : extMod.m1.m2.c
->extMod.m1.m2.c : typeof extMod.m1.m2.c
->extMod.m1.m2 : typeof extMod.m1.m2
->extMod.m1 : typeof extMod.m1
->extMod : typeof extMod
->m1 : typeof extMod.m1
->m2 : typeof extMod.m1.m2
->c : typeof extMod.m1.m2.c
-
-extMod.m4.fooExport();
->extMod.m4.fooExport() : number
->extMod.m4.fooExport : typeof extMod.m4.fooExport
->extMod.m4 : typeof extMod.m4
->extMod : typeof extMod
->m4 : typeof extMod.m4
->fooExport : typeof extMod.m4.fooExport
-
-export var newVar2 = new extMod.m4.m2.c();
->newVar2 : extMod.m4.m2.c
->new extMod.m4.m2.c() : extMod.m4.m2.c
->extMod.m4.m2.c : typeof extMod.m4.m2.c
->extMod.m4.m2 : typeof extMod.m4.m2
->extMod.m4 : typeof extMod.m4
->extMod : typeof extMod
->m4 : typeof extMod.m4
->m2 : typeof extMod.m4.m2
->c : typeof extMod.m4.m2.c
-
-=== tests/cases/compiler/commentsExternalModules2_0.ts ===
-
-/** Module comment*/
-export module m1 {
->m1 : m1
-
-    /** b's comment*/
-    export var b: number;
->b : number
-
-    /** foo's comment*/
-    function foo() {
->foo : typeof foo
-
-        return b;
->b : number
-    }
-    /** m2 comments*/
-    export module m2 {
->m2 : m2
-
-        /** class comment;*/
-        export class c {
->c : c
-
-        };
-        /** i*/
-        export var i = new c();
->i : c
->new c() : c
->c : typeof c
-    }
-    /** exported function*/
-    export function fooExport() {
->fooExport : typeof fooExport
-
-        return foo();
->foo() : number
->foo : typeof foo
-    }
-}
-m1.fooExport();
->m1.fooExport() : number
->m1.fooExport : typeof m1.fooExport
->m1 : typeof m1
->fooExport : typeof m1.fooExport
-
-var myvar = new m1.m2.c();
->myvar : m1.m2.c
->new m1.m2.c() : m1.m2.c
->m1.m2.c : typeof m1.m2.c
->m1.m2 : typeof m1.m2
->m1 : typeof m1
->m2 : typeof m1.m2
->c : typeof m1.m2.c
-
-/** Module comment */
-export module m4 {
->m4 : m4
-
-    /** b's comment */
-    export var b: number;
->b : number
-
-    /** foo's comment
-    */
-    function foo() {
->foo : typeof foo
-
-        return b;
->b : number
-    }
-    /** m2 comments
-    */
-    export module m2 {
->m2 : m2
-
-        /** class comment; */
-        export class c {
->c : c
-
-        };
-        /** i */
-        export var i = new c();
->i : c
->new c() : c
->c : typeof c
-    }
-    /** exported function */
-    export function fooExport() {
->fooExport : typeof fooExport
-
-        return foo();
->foo() : number
->foo : typeof foo
-    }
-}
-m4.fooExport();
->m4.fooExport() : number
->m4.fooExport : typeof m4.fooExport
->m4 : typeof m4
->fooExport : typeof m4.fooExport
-
-var myvar2 = new m4.m2.c();
->myvar2 : m4.m2.c
->new m4.m2.c() : m4.m2.c
->m4.m2.c : typeof m4.m2.c
->m4.m2 : typeof m4.m2
->m4 : typeof m4
->m2 : typeof m4.m2
->c : typeof m4.m2.c
-
diff --git a/tests/baselines/reference/commentsFormatting.js b/tests/baselines/reference/commentsFormatting.js
deleted file mode 100644
index 4ad0d8d6f23..00000000000
--- a/tests/baselines/reference/commentsFormatting.js
+++ /dev/null
@@ -1,220 +0,0 @@
-//// [commentsFormatting.ts]
-
-module m {
-    /** this is first line - aligned to class declaration
-* this is 4 spaces left aligned
- * this is 3 spaces left aligned
-  * this is 2 spaces left aligned
-   * this is 1 spaces left aligned
-    * this is at same level as first line
-     * this is 1 spaces right aligned
-      * this is 2 spaces right aligned
-       * this is 3 spaces right aligned
-        * this is 4 spaces right aligned
-         * this is 5 spaces right aligned
-          * this is 6 spaces right aligned
-           * this is 7 spaces right aligned
-            * this is 8 spaces right aligned */
-    export class c {
-    }
-
-        /** this is first line - 4 spaces right aligned to class but in js file should be aligned to class declaration
-* this is 8 spaces left aligned
- * this is 7 spaces left aligned
-  * this is 6 spaces left aligned
-   * this is 5 spaces left aligned
-    * this is 4 spaces left aligned
-     * this is 3 spaces left aligned
-      * this is 2 spaces left aligned
-       * this is 1 spaces left aligned
-        * this is at same level as first line
-         * this is 1 spaces right aligned
-          * this is 2 spaces right aligned
-           * this is 3 spaces right aligned
-            * this is 4 spaces right aligned
-             * this is 5 spaces right aligned
-              * this is 6 spaces right aligned
-               * this is 7 spaces right aligned
-                * this is 8 spaces right aligned */
-    export class c2 {
-    }
-
-    /** this is comment with new lines in between
-
-this is 4 spaces left aligned but above line is empty
-
- this is 3 spaces left aligned but above line is empty
-
-  this is 2 spaces left aligned but above line is empty
-
-    this is 1 spaces left aligned but above line is empty
-
-    this is at same level as first line but above line is empty 
-
-     this is 1 spaces right aligned but above line is empty
-
-      this is 2 spaces right aligned but above line is empty
-
-       this is 3 spaces right aligned but above line is empty
-
-        this is 4 spaces right aligned but above line is empty
-    
-    
-    Above 2 lines are empty
-    
-    
-    
-    above 3 lines are empty*/
-    export class c3 {
-    }
-}
-
-//// [commentsFormatting.js]
-var m;
-(function (m) {
-    /** this is first line - aligned to class declaration
-* this is 4 spaces left aligned
- * this is 3 spaces left aligned
-  * this is 2 spaces left aligned
-   * this is 1 spaces left aligned
-    * this is at same level as first line
-     * this is 1 spaces right aligned
-      * this is 2 spaces right aligned
-       * this is 3 spaces right aligned
-        * this is 4 spaces right aligned
-         * this is 5 spaces right aligned
-          * this is 6 spaces right aligned
-           * this is 7 spaces right aligned
-            * this is 8 spaces right aligned */
-    var c = (function () {
-        function c() {
-        }
-        return c;
-    })();
-    m.c = c;
-    /** this is first line - 4 spaces right aligned to class but in js file should be aligned to class declaration
-* this is 8 spaces left aligned
-* this is 7 spaces left aligned
-* this is 6 spaces left aligned
-* this is 5 spaces left aligned
-* this is 4 spaces left aligned
- * this is 3 spaces left aligned
-  * this is 2 spaces left aligned
-   * this is 1 spaces left aligned
-    * this is at same level as first line
-     * this is 1 spaces right aligned
-      * this is 2 spaces right aligned
-       * this is 3 spaces right aligned
-        * this is 4 spaces right aligned
-         * this is 5 spaces right aligned
-          * this is 6 spaces right aligned
-           * this is 7 spaces right aligned
-            * this is 8 spaces right aligned */
-    var c2 = (function () {
-        function c2() {
-        }
-        return c2;
-    })();
-    m.c2 = c2;
-    /** this is comment with new lines in between
-
-this is 4 spaces left aligned but above line is empty
-
- this is 3 spaces left aligned but above line is empty
-
-  this is 2 spaces left aligned but above line is empty
-
-    this is 1 spaces left aligned but above line is empty
-
-    this is at same level as first line but above line is empty
-
-     this is 1 spaces right aligned but above line is empty
-
-      this is 2 spaces right aligned but above line is empty
-
-       this is 3 spaces right aligned but above line is empty
-
-        this is 4 spaces right aligned but above line is empty
-    
-    
-    Above 2 lines are empty
-    
-    
-    
-    above 3 lines are empty*/
-    var c3 = (function () {
-        function c3() {
-        }
-        return c3;
-    })();
-    m.c3 = c3;
-})(m || (m = {}));
-
-
-//// [commentsFormatting.d.ts]
-declare module m {
-    /** this is first line - aligned to class declaration
-* this is 4 spaces left aligned
- * this is 3 spaces left aligned
-  * this is 2 spaces left aligned
-   * this is 1 spaces left aligned
-    * this is at same level as first line
-     * this is 1 spaces right aligned
-      * this is 2 spaces right aligned
-       * this is 3 spaces right aligned
-        * this is 4 spaces right aligned
-         * this is 5 spaces right aligned
-          * this is 6 spaces right aligned
-           * this is 7 spaces right aligned
-            * this is 8 spaces right aligned */
-    class c {
-    }
-    /** this is first line - 4 spaces right aligned to class but in js file should be aligned to class declaration
-* this is 8 spaces left aligned
-* this is 7 spaces left aligned
-* this is 6 spaces left aligned
-* this is 5 spaces left aligned
-* this is 4 spaces left aligned
- * this is 3 spaces left aligned
-  * this is 2 spaces left aligned
-   * this is 1 spaces left aligned
-    * this is at same level as first line
-     * this is 1 spaces right aligned
-      * this is 2 spaces right aligned
-       * this is 3 spaces right aligned
-        * this is 4 spaces right aligned
-         * this is 5 spaces right aligned
-          * this is 6 spaces right aligned
-           * this is 7 spaces right aligned
-            * this is 8 spaces right aligned */
-    class c2 {
-    }
-    /** this is comment with new lines in between
-
-this is 4 spaces left aligned but above line is empty
-
- this is 3 spaces left aligned but above line is empty
-
-  this is 2 spaces left aligned but above line is empty
-
-    this is 1 spaces left aligned but above line is empty
-
-    this is at same level as first line but above line is empty
-
-     this is 1 spaces right aligned but above line is empty
-
-      this is 2 spaces right aligned but above line is empty
-
-       this is 3 spaces right aligned but above line is empty
-
-        this is 4 spaces right aligned but above line is empty
-    
-    
-    Above 2 lines are empty
-    
-    
-    
-    above 3 lines are empty*/
-    class c3 {
-    }
-}
diff --git a/tests/baselines/reference/commentsFormatting.types b/tests/baselines/reference/commentsFormatting.types
deleted file mode 100644
index 0c5e1343959..00000000000
--- a/tests/baselines/reference/commentsFormatting.types
+++ /dev/null
@@ -1,75 +0,0 @@
-=== tests/cases/compiler/commentsFormatting.ts ===
-
-module m {
->m : m
-
-    /** this is first line - aligned to class declaration
-* this is 4 spaces left aligned
- * this is 3 spaces left aligned
-  * this is 2 spaces left aligned
-   * this is 1 spaces left aligned
-    * this is at same level as first line
-     * this is 1 spaces right aligned
-      * this is 2 spaces right aligned
-       * this is 3 spaces right aligned
-        * this is 4 spaces right aligned
-         * this is 5 spaces right aligned
-          * this is 6 spaces right aligned
-           * this is 7 spaces right aligned
-            * this is 8 spaces right aligned */
-    export class c {
->c : c
-    }
-
-        /** this is first line - 4 spaces right aligned to class but in js file should be aligned to class declaration
-* this is 8 spaces left aligned
- * this is 7 spaces left aligned
-  * this is 6 spaces left aligned
-   * this is 5 spaces left aligned
-    * this is 4 spaces left aligned
-     * this is 3 spaces left aligned
-      * this is 2 spaces left aligned
-       * this is 1 spaces left aligned
-        * this is at same level as first line
-         * this is 1 spaces right aligned
-          * this is 2 spaces right aligned
-           * this is 3 spaces right aligned
-            * this is 4 spaces right aligned
-             * this is 5 spaces right aligned
-              * this is 6 spaces right aligned
-               * this is 7 spaces right aligned
-                * this is 8 spaces right aligned */
-    export class c2 {
->c2 : c2
-    }
-
-    /** this is comment with new lines in between
-
-this is 4 spaces left aligned but above line is empty
-
- this is 3 spaces left aligned but above line is empty
-
-  this is 2 spaces left aligned but above line is empty
-
-    this is 1 spaces left aligned but above line is empty
-
-    this is at same level as first line but above line is empty 
-
-     this is 1 spaces right aligned but above line is empty
-
-      this is 2 spaces right aligned but above line is empty
-
-       this is 3 spaces right aligned but above line is empty
-
-        this is 4 spaces right aligned but above line is empty
-    
-    
-    Above 2 lines are empty
-    
-    
-    
-    above 3 lines are empty*/
-    export class c3 {
->c3 : c3
-    }
-}
diff --git a/tests/baselines/reference/commentsFunction.js b/tests/baselines/reference/commentsFunction.js
index 0ffb2714108..ec10cd68ea2 100644
--- a/tests/baselines/reference/commentsFunction.js
+++ b/tests/baselines/reference/commentsFunction.js
@@ -2,14 +2,14 @@
 
 /** This comment should appear for foo*/
 function foo() {
-} /* trailing comment of function */
+}
 foo();
 /** This is comment for function signature*/
 function fooWithParameters(/** this is comment about a*/a: string,
     /** this is comment for b*/
     b: number) {
     var d = a;
-} // trailing comment of function
+}
 fooWithParameters("a", 10);
 /** fooFunc
  * comment
@@ -22,50 +22,19 @@ var fooFunc = function FooFunctionValue(/** fooFunctionValue param */ b: string)
 var lambdaFoo = /** this is lambda comment*/ (/**param a*/a: number, /**param b*/b: number) => a + b;
 var lambddaNoVarComment = /** this is lambda multiplication*/ (/**param a*/a: number, /**param b*/b: number) => a * b;
 lambdaFoo(10, 20);
-lambddaNoVarComment(10, 20);
-
-function blah(a: string /* multiline trailing comment 
-multiline */) {
-}
-
-function blah2(a: string /* single line multiple trailing comments */ /* second */) {
-}
-
-function blah3(a: string // trailing commen single line
-    ) {
-}
-
-lambdaFoo = (a, b) => a * b; // This is trailing comment
-
-/*leading comment*/() => 0; // Needs to be wrapped in parens to be a valid expression (not declaration)
-/*leading comment*/(() => 0); //trailing comment
-
-function blah4(/*1*/a: string/*2*/,/*3*/b: string/*4*/) {
-}
-
-function foo1() {
-
-    // should emit this
-}
-
-function foo2() {
-    /// This is some detached comment
-
-    // should emit this leading comment of } too
-}
-
+lambddaNoVarComment(10, 20);
 
 //// [commentsFunction.js]
 /** This comment should appear for foo*/
 function foo() {
-} /* trailing comment of function */
+}
 foo();
 /** This is comment for function signature*/
 function fooWithParameters(/** this is comment about a*/ a, 
     /** this is comment for b*/
     b) {
     var d = a;
-} // trailing comment of function
+}
 fooWithParameters("a", 10);
 /** fooFunc
  * comment
@@ -78,26 +47,6 @@ var lambdaFoo = function (/**param a*/ a, /**param b*/ b) { return a + b; };
 var lambddaNoVarComment = function (/**param a*/ a, /**param b*/ b) { return a * b; };
 lambdaFoo(10, 20);
 lambddaNoVarComment(10, 20);
-function blah(a /* multiline trailing comment
-    multiline */) {
-}
-function blah2(a /* single line multiple trailing comments */ /* second */) {
-}
-function blah3(a // trailing commen single line
-    ) {
-}
-lambdaFoo = function (a, b) { return a * b; }; // This is trailing comment
-/*leading comment*/ (function () { return 0; }); // Needs to be wrapped in parens to be a valid expression (not declaration)
-/*leading comment*/ (function () { return 0; }); //trailing comment
-function blah4(/*1*/ a /*2*/, /*3*/ b /*4*/) {
-}
-function foo1() {
-    // should emit this
-}
-function foo2() {
-    /// This is some detached comment
-    // should emit this leading comment of } too
-}
 
 
 //// [commentsFunction.d.ts]
@@ -113,9 +62,3 @@ declare function fooWithParameters(/** this is comment about a*/ a: string,
 declare var fooFunc: (b: string) => string;
 declare var lambdaFoo: (a: number, b: number) => number;
 declare var lambddaNoVarComment: (a: number, b: number) => number;
-declare function blah(a: string): void;
-declare function blah2(a: string): void;
-declare function blah3(a: string): void;
-declare function blah4(a: string, b: string): void;
-declare function foo1(): void;
-declare function foo2(): void;
diff --git a/tests/baselines/reference/commentsFunction.types b/tests/baselines/reference/commentsFunction.types
index 6b8dd2dec26..c159c8262a5 100644
--- a/tests/baselines/reference/commentsFunction.types
+++ b/tests/baselines/reference/commentsFunction.types
@@ -3,8 +3,7 @@
 /** This comment should appear for foo*/
 function foo() {
 >foo : typeof foo
-
-} /* trailing comment of function */
+}
 foo();
 >foo() : void
 >foo : typeof foo
@@ -21,8 +20,7 @@ function fooWithParameters(/** this is comment about a*/a: string,
     var d = a;
 >d : string
 >a : string
-
-} // trailing comment of function
+}
 fooWithParameters("a", 10);
 >fooWithParameters("a", 10) : void
 >fooWithParameters : typeof fooWithParameters
@@ -67,59 +65,3 @@ lambddaNoVarComment(10, 20);
 >lambddaNoVarComment(10, 20) : number
 >lambddaNoVarComment : (a: number, b: number) => number
 
-function blah(a: string /* multiline trailing comment 
->blah : typeof blah
->a : string
-
-multiline */) {
-}
-
-function blah2(a: string /* single line multiple trailing comments */ /* second */) {
->blah2 : typeof blah2
->a : string
-}
-
-function blah3(a: string // trailing commen single line
->blah3 : typeof blah3
->a : string
-
-    ) {
-}
-
-lambdaFoo = (a, b) => a * b; // This is trailing comment
->lambdaFoo = (a, b) => a * b : (a: number, b: number) => number
->lambdaFoo : (a: number, b: number) => number
->(a, b) => a * b : (a: number, b: number) => number
->a : number
->b : number
->a * b : number
->a : number
->b : number
-
-/*leading comment*/() => 0; // Needs to be wrapped in parens to be a valid expression (not declaration)
->() => 0 : () => number
-
-/*leading comment*/(() => 0); //trailing comment
->(() => 0) : () => number
->() => 0 : () => number
-
-function blah4(/*1*/a: string/*2*/,/*3*/b: string/*4*/) {
->blah4 : typeof blah4
->a : string
->b : string
-}
-
-function foo1() {
->foo1 : typeof foo1
-
-    // should emit this
-}
-
-function foo2() {
->foo2 : typeof foo2
-
-    /// This is some detached comment
-
-    // should emit this leading comment of } too
-}
-
diff --git a/tests/baselines/reference/commentsModules.js b/tests/baselines/reference/commentsModules.js
index f964c45f843..65607a30ae1 100644
--- a/tests/baselines/reference/commentsModules.js
+++ b/tests/baselines/reference/commentsModules.js
@@ -35,7 +35,7 @@ module m1 {
      */
     function foo4Export() {
     }
-} // trailing comment module
+}
 m1.fooExport();
 var myvar = new m1.m2.c();
 /** module comment of m2.m3*/
@@ -43,14 +43,14 @@ module m2.m3 {
     /** Exported class comment*/
     export class c {
     }
-} /* trailing dotted module comment*/
+}
 new m2.m3.c();
 /** module comment of m3.m4.m5*/
 module m3.m4.m5 {
     /** Exported class comment*/
     export class c {
     }
-} // trailing dotted module 2
+}
 new m3.m4.m5.c();
 /** module comment of m4.m5.m6*/
 module m4.m5.m6 {
@@ -58,7 +58,7 @@ module m4.m5.m6 {
         /** Exported class comment*/
         export class c {
         }
-    } /* trailing inner module */ /* multiple comments*/
+    }
 }
 new m4.m5.m6.m7.c();
 /** module comment of m5.m6.m7*/
@@ -141,7 +141,7 @@ var m1;
      */
     function foo4Export() {
     }
-})(m1 || (m1 = {})); // trailing comment module
+})(m1 || (m1 = {}));
 m1.fooExport();
 var myvar = new m1.m2.c();
 /** module comment of m2.m3*/
@@ -157,7 +157,7 @@ var m2;
         m3.c = c;
     })(m2.m3 || (m2.m3 = {}));
     var m3 = m2.m3;
-})(m2 || (m2 = {})); /* trailing dotted module comment*/
+})(m2 || (m2 = {}));
 new m2.m3.c();
 /** module comment of m3.m4.m5*/
 var m3;
@@ -175,7 +175,7 @@ var m3;
         var m5 = m4.m5;
     })(m3.m4 || (m3.m4 = {}));
     var m4 = m3.m4;
-})(m3 || (m3 = {})); // trailing dotted module 2
+})(m3 || (m3 = {}));
 new m3.m4.m5.c();
 /** module comment of m4.m5.m6*/
 var m4;
@@ -191,7 +191,7 @@ var m4;
                 })();
                 m7.c = c;
             })(m6.m7 || (m6.m7 = {}));
-            var m7 = m6.m7; /* trailing inner module */ /* multiple comments*/
+            var m7 = m6.m7;
         })(m5.m6 || (m5.m6 = {}));
         var m6 = m5.m6;
     })(m4.m5 || (m4.m5 = {}));
diff --git a/tests/baselines/reference/commentsModules.types b/tests/baselines/reference/commentsModules.types
index a0b2da715ce..084f3d8a8b3 100644
--- a/tests/baselines/reference/commentsModules.types
+++ b/tests/baselines/reference/commentsModules.types
@@ -57,7 +57,7 @@ module m1 {
     function foo4Export() {
 >foo4Export : typeof foo4Export
     }
-} // trailing comment module
+}
 m1.fooExport();
 >m1.fooExport() : number
 >m1.fooExport : typeof m1.fooExport
@@ -82,7 +82,7 @@ module m2.m3 {
     export class c {
 >c : c
     }
-} /* trailing dotted module comment*/
+}
 new m2.m3.c();
 >new m2.m3.c() : m2.m3.c
 >m2.m3.c : typeof m2.m3.c
@@ -101,7 +101,7 @@ module m3.m4.m5 {
     export class c {
 >c : c
     }
-} // trailing dotted module 2
+}
 new m3.m4.m5.c();
 >new m3.m4.m5.c() : m3.m4.m5.c
 >m3.m4.m5.c : typeof m3.m4.m5.c
@@ -125,7 +125,7 @@ module m4.m5.m6 {
         export class c {
 >c : c
         }
-    } /* trailing inner module */ /* multiple comments*/
+    }
 }
 new m4.m5.m6.m7.c();
 >new m4.m5.m6.m7.c() : m4.m5.m6.m7.c
diff --git a/tests/baselines/reference/commentsOnObjectLiteral2.errors.txt b/tests/baselines/reference/commentsOnObjectLiteral2.errors.txt
index aa338e31db4..37c312a18e0 100644
--- a/tests/baselines/reference/commentsOnObjectLiteral2.errors.txt
+++ b/tests/baselines/reference/commentsOnObjectLiteral2.errors.txt
@@ -10,6 +10,6 @@
             */ 
            initialize: function(name) { 
                this.name = name; 
-           } /* trailing comment 1*/, 
+           }, 
        } 
     );
\ No newline at end of file
diff --git a/tests/baselines/reference/commentsOnObjectLiteral2.js b/tests/baselines/reference/commentsOnObjectLiteral2.js
index 9243e489741..e44a462de5e 100644
--- a/tests/baselines/reference/commentsOnObjectLiteral2.js
+++ b/tests/baselines/reference/commentsOnObjectLiteral2.js
@@ -8,7 +8,7 @@ var Person = makeClass(
         */ 
        initialize: function(name) { 
            this.name = name; 
-       } /* trailing comment 1*/, 
+       }, 
    } 
 );
 
@@ -21,5 +21,5 @@ var Person = makeClass({
      */
     initialize: function (name) {
         this.name = name;
-    } /* trailing comment 1*/
+    }
 });
diff --git a/tests/baselines/reference/commentsOnObjectLiteral3.errors.txt b/tests/baselines/reference/commentsOnObjectLiteral3.errors.txt
new file mode 100644
index 00000000000..d9a276615f4
--- /dev/null
+++ b/tests/baselines/reference/commentsOnObjectLiteral3.errors.txt
@@ -0,0 +1,24 @@
+==== tests/cases/compiler/commentsOnObjectLiteral3.ts (2 errors) ====
+    
+    var v = {
+     //property
+     prop: 1,
+     //property
+     func: function () {
+     },
+     //PropertyName + CallSignature
+     func1() { },
+     //getter
+     get a() {
+         ~
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
+      return this.prop;
+     },
+     //setter
+     set a(value) {
+         ~
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
+      this.prop = value;
+     }
+    };
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/commentsOnObjectLiteral3.js b/tests/baselines/reference/commentsOnObjectLiteral3.js
deleted file mode 100644
index 5d57b76991e..00000000000
--- a/tests/baselines/reference/commentsOnObjectLiteral3.js
+++ /dev/null
@@ -1,40 +0,0 @@
-//// [commentsOnObjectLiteral3.ts]
-
-var v = {
- //property
- prop: 1 /* multiple trailing comments */ /*trailing comments*/,
- //property
- func: function () {
- },
- //PropertyName + CallSignature
- func1() { },
- //getter
- get a() {
-  return this.prop;
- } /*trailing 1*/,
- //setter
- set a(value) {
-  this.prop = value;
- } // trailing 2
-};
-
-
-//// [commentsOnObjectLiteral3.js]
-var v = {
-    //property
-    prop: 1 /* multiple trailing comments */ /*trailing comments*/,
-    //property
-    func: function () {
-    },
-    //PropertyName + CallSignature
-    func1: function () {
-    },
-    //getter
-    get a() {
-        return this.prop;
-    } /*trailing 1*/,
-    //setter
-    set a(value) {
-        this.prop = value;
-    } // trailing 2
-};
diff --git a/tests/baselines/reference/commentsOnObjectLiteral3.types b/tests/baselines/reference/commentsOnObjectLiteral3.types
deleted file mode 100644
index e7770c7e273..00000000000
--- a/tests/baselines/reference/commentsOnObjectLiteral3.types
+++ /dev/null
@@ -1,46 +0,0 @@
-=== tests/cases/compiler/commentsOnObjectLiteral3.ts ===
-
-var v = {
->v : { prop: number; func: () => void; func1: () => void; a: any; }
->{ //property prop: 1 /* multiple trailing comments */ /*trailing comments*/, //property func: function () { }, //PropertyName + CallSignature func1() { }, //getter get a() {  return this.prop; } /*trailing 1*/, //setter set a(value) {  this.prop = value; } // trailing 2} : { prop: number; func: () => void; func1: () => void; a: any; }
-
- //property
- prop: 1 /* multiple trailing comments */ /*trailing comments*/,
->prop : number
-
- //property
- func: function () {
->func : () => void
->function () { } : () => void
-
- },
- //PropertyName + CallSignature
- func1() { },
->func1 : () => void
->func1() { } : () => void
-
- //getter
- get a() {
->a : any
-
-  return this.prop;
->this.prop : any
->this : any
->prop : any
-
- } /*trailing 1*/,
- //setter
- set a(value) {
->a : any
->value : any
-
-  this.prop = value;
->this.prop = value : any
->this.prop : any
->this : any
->prop : any
->value : any
-
- } // trailing 2
-};
-
diff --git a/tests/baselines/reference/commentsOnObjectLiteral4.errors.txt b/tests/baselines/reference/commentsOnObjectLiteral4.errors.txt
new file mode 100644
index 00000000000..91cf41d82a3
--- /dev/null
+++ b/tests/baselines/reference/commentsOnObjectLiteral4.errors.txt
@@ -0,0 +1,12 @@
+==== tests/cases/compiler/commentsOnObjectLiteral4.ts (1 errors) ====
+    
+    var v = {
+     /**
+      * @type {number}
+      */
+     get bar(): number {
+         ~~~
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
+      return this._bar;
+     }
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/commentsOnObjectLiteral4.js b/tests/baselines/reference/commentsOnObjectLiteral4.js
deleted file mode 100644
index 3b7efefdff4..00000000000
--- a/tests/baselines/reference/commentsOnObjectLiteral4.js
+++ /dev/null
@@ -1,20 +0,0 @@
-//// [commentsOnObjectLiteral4.ts]
-
-var v = {
- /**
-  * @type {number}
-  */
- get bar(): number {
-  return this._bar;
- }
-}
-
-//// [commentsOnObjectLiteral4.js]
-var v = {
-    /**
-     * @type {number}
-     */
-    get bar() {
-        return this._bar;
-    }
-};
diff --git a/tests/baselines/reference/commentsOnObjectLiteral4.types b/tests/baselines/reference/commentsOnObjectLiteral4.types
deleted file mode 100644
index 364df6e5ea1..00000000000
--- a/tests/baselines/reference/commentsOnObjectLiteral4.types
+++ /dev/null
@@ -1,18 +0,0 @@
-=== tests/cases/compiler/commentsOnObjectLiteral4.ts ===
-
-var v = {
->v : { bar: number; }
->{ /**  * @type {number}  */ get bar(): number {  return this._bar; }} : { bar: number; }
-
- /**
-  * @type {number}
-  */
- get bar(): number {
->bar : number
-
-  return this._bar;
->this._bar : any
->this : any
->_bar : any
- }
-}
diff --git a/tests/baselines/reference/commentsTypeParameters.js b/tests/baselines/reference/commentsTypeParameters.js
deleted file mode 100644
index 768c238522a..00000000000
--- a/tests/baselines/reference/commentsTypeParameters.js
+++ /dev/null
@@ -1,44 +0,0 @@
-//// [commentsTypeParameters.ts]
-class C</**docComment for type parameter*/ T> {
-    method</**docComment of method type parameter */ U extends T>(a: U) {
-    }
-    static staticmethod</**docComment of method type parameter */ U>(a: U) {
-    }
-
-    private privatemethod</**docComment of method type parameter */ U extends T>(a: U) {
-    }
-    private static privatestaticmethod</**docComment of method type parameter */ U>(a: U) {
-    }
-}
-
-function compare</**type*/T>(a: T, b: T) {
-    return a === b;
-}
-
-//// [commentsTypeParameters.js]
-var C = (function () {
-    function C() {
-    }
-    C.prototype.method = function (a) {
-    };
-    C.staticmethod = function (a) {
-    };
-    C.prototype.privatemethod = function (a) {
-    };
-    C.privatestaticmethod = function (a) {
-    };
-    return C;
-})();
-function compare(a, b) {
-    return a === b;
-}
-
-
-//// [commentsTypeParameters.d.ts]
-declare class C</**docComment for type parameter*/ T> {
-    method</**docComment of method type parameter */ U extends T>(a: U): void;
-    static staticmethod</**docComment of method type parameter */ U>(a: U): void;
-    private privatemethod</**docComment of method type parameter */ U>(a);
-    private static privatestaticmethod</**docComment of method type parameter */ U>(a);
-}
-declare function compare</**type*/ T>(a: T, b: T): boolean;
diff --git a/tests/baselines/reference/commentsTypeParameters.types b/tests/baselines/reference/commentsTypeParameters.types
deleted file mode 100644
index 43344f1a826..00000000000
--- a/tests/baselines/reference/commentsTypeParameters.types
+++ /dev/null
@@ -1,47 +0,0 @@
-=== 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 : typeof compare
->T : T
->a : T
->T : T
->b : T
->T : T
-
-    return a === b;
->a === b : boolean
->a : T
->b : T
-}
diff --git a/tests/baselines/reference/commentsVarDecl.js b/tests/baselines/reference/commentsVarDecl.js
index 5105e03879d..0419ac69478 100644
--- a/tests/baselines/reference/commentsVarDecl.js
+++ b/tests/baselines/reference/commentsVarDecl.js
@@ -1,7 +1,7 @@
 //// [commentsVarDecl.ts]
 
 /** Variable comments*/
-var myVariable = 10; // This trailing Comment1
+var myVariable = 10;
 
 /** This is another variable comment*/
 var anotherVariable = 30;
@@ -11,13 +11,13 @@ var aVar = "";
 
 /** this is multiline comment
   * All these variables are of number type */
-var anotherAnotherVariable = 70; /* these are multiple trailing comments */ /* multiple trailing comments */
+var anotherAnotherVariable = 70;
 
 /** Triple slash multiline comment*/
 /** another line in the comment*/
 /** comment line 2*/
-var x = 70; /* multiline trailing comment 
-this is multiline trailing comment */
+var x = 70;
+
 /** Triple slash comment on the assignement shouldnt be in .d.ts file*/
 x = myVariable;
 
@@ -45,19 +45,18 @@ n4 = z2;
 
 //// [commentsVarDecl.js]
 /** Variable comments*/
-var myVariable = 10; // This trailing Comment1
+var myVariable = 10;
 /** This is another variable comment*/
 var anotherVariable = 30;
 // shouldn't appear
 var aVar = "";
 /** this is multiline comment
   * All these variables are of number type */
-var anotherAnotherVariable = 70; /* these are multiple trailing comments */ /* multiple trailing comments */
+var anotherAnotherVariable = 70;
 /** Triple slash multiline comment*/
 /** another line in the comment*/
 /** comment line 2*/
-var x = 70; /* multiline trailing comment
-this is multiline trailing comment */
+var x = 70;
 /** Triple slash comment on the assignement shouldnt be in .d.ts file*/
 x = myVariable;
 /** triple slash comment1*/
diff --git a/tests/baselines/reference/commentsVarDecl.types b/tests/baselines/reference/commentsVarDecl.types
index 50db8984b1b..5688948414a 100644
--- a/tests/baselines/reference/commentsVarDecl.types
+++ b/tests/baselines/reference/commentsVarDecl.types
@@ -1,7 +1,7 @@
 === tests/cases/compiler/commentsVarDecl.ts ===
 
 /** Variable comments*/
-var myVariable = 10; // This trailing Comment1
+var myVariable = 10;
 >myVariable : number
 
 /** This is another variable comment*/
@@ -14,16 +14,15 @@ var aVar = "";
 
 /** this is multiline comment
   * All these variables are of number type */
-var anotherAnotherVariable = 70; /* these are multiple trailing comments */ /* multiple trailing comments */
+var anotherAnotherVariable = 70;
 >anotherAnotherVariable : number
 
 /** Triple slash multiline comment*/
 /** another line in the comment*/
 /** comment line 2*/
-var x = 70; /* multiline trailing comment 
+var x = 70;
 >x : number
 
-this is multiline trailing comment */
 /** Triple slash comment on the assignement shouldnt be in .d.ts file*/
 x = myVariable;
 >x = myVariable : number
diff --git a/tests/baselines/reference/constructorsWithSpecializedSignatures.js b/tests/baselines/reference/constructorsWithSpecializedSignatures.js
deleted file mode 100644
index 4faa5e4030a..00000000000
--- a/tests/baselines/reference/constructorsWithSpecializedSignatures.js
+++ /dev/null
@@ -1,58 +0,0 @@
-//// [constructorsWithSpecializedSignatures.ts]
-// errors
-declare class C {
-    constructor(x: "hi");
-    constructor(x: "foo");
-    constructor(x: number);
-}
-
-// ok
-declare class C2 {
-    constructor(x: "hi");
-    constructor(x: "foo");
-    constructor(x: string);
-}
-
-// errors
-class D {
-    constructor(x: "hi");
-    constructor(x: "foo");
-    constructor(x: number);
-    constructor(x: "hi") { }
-}
-
-// overloads are ok
-class D2 {
-    constructor(x: "hi");
-    constructor(x: "foo");
-    constructor(x: string);
-    constructor(x: "hi") { } // error
-}
-
-// errors
-interface I {
-    new (x: "hi");
-    new (x: "foo");
-    new (x: number);
-}
-
-// ok
-interface I2 {
-    new (x: "hi");
-    new (x: "foo");
-    new (x: string);
-}
-
-//// [constructorsWithSpecializedSignatures.js]
-// errors
-var D = (function () {
-    function D(x) {
-    }
-    return D;
-})();
-// overloads are ok
-var D2 = (function () {
-    function D2(x) {
-    } // error
-    return D2;
-})();
diff --git a/tests/baselines/reference/contextualSignatureInstantiation3.js b/tests/baselines/reference/contextualSignatureInstantiation3.js
deleted file mode 100644
index 9198a02ccda..00000000000
--- a/tests/baselines/reference/contextualSignatureInstantiation3.js
+++ /dev/null
@@ -1,43 +0,0 @@
-//// [contextualSignatureInstantiation3.ts]
-function map<T, U>(items: T[], f: (x: T) => U): U[]{
-    return items.map(f);
-}
-
-function identity<T>(x: T) {
-    return x;
-}
-
-function singleton<T>(x: T) {
-    return [x];
-}
-
-var xs = [1, 2, 3];
-
-// Have compiler check that we get the correct types
-var v1: number[];
-var v1 = xs.map(identity);      // Error if not number[]
-var v1 = map(xs, identity);     // Error if not number[]
-
-var v2: number[][];         
-var v2 = xs.map(singleton);     // Error if not number[][]
-var v2 = map(xs, singleton);    // Error if not number[][]
-
-
-//// [contextualSignatureInstantiation3.js]
-function map(items, f) {
-    return items.map(f);
-}
-function identity(x) {
-    return x;
-}
-function singleton(x) {
-    return [x];
-}
-var xs = [1, 2, 3];
-// Have compiler check that we get the correct types
-var v1;
-var v1 = xs.map(identity); // Error if not number[]
-var v1 = map(xs, identity); // Error if not number[]
-var v2;
-var v2 = xs.map(singleton); // Error if not number[][]
-var v2 = map(xs, singleton); // Error if not number[][]
diff --git a/tests/baselines/reference/declFileAccessors.js b/tests/baselines/reference/declFileAccessors.js
deleted file mode 100644
index f39cd13fdd0..00000000000
--- a/tests/baselines/reference/declFileAccessors.js
+++ /dev/null
@@ -1,306 +0,0 @@
-//// [tests/cases/compiler/declFileAccessors.ts] ////
-
-//// [declFileAccessors_0.ts]
-
-/** This is comment for c1*/
-export class c1 {
-    /** getter property*/
-    public get p3() {
-        return 10;
-    }
-    /** setter property*/
-    public set p3(/** this is value*/value: number) {
-    }
-    /** private getter property*/
-    private get pp3() {
-        return 10;
-    }
-    /** private setter property*/
-    private set pp3(/** this is value*/value: number) {
-    }
-    /** static getter property*/
-    static get s3() {
-        return 10;
-    }
-    /** setter property*/
-    static set s3( /** this is value*/value: number) {
-    }
-    public get nc_p3() {
-        return 10;
-    }
-    public set nc_p3(value: number) {
-    }
-    private get nc_pp3() {
-        return 10;
-    }
-    private set nc_pp3(value: number) {
-    }
-    static get nc_s3() {
-        return "";
-    }
-    static set nc_s3(value: string) {
-    }
-
-    // Only getter property
-    public get onlyGetter() {
-        return 10;
-    }
-
-    // Only setter property
-    public set onlySetter(value: number) {
-    }
-}
-
-//// [declFileAccessors_1.ts]
-/** This is comment for c2 - the global class*/
-class c2 {
-    /** getter property*/
-    public get p3() {
-        return 10;
-    }
-    /** setter property*/
-    public set p3(/** this is value*/value: number) {
-    }
-    /** private getter property*/
-    private get pp3() {
-        return 10;
-    }
-    /** private setter property*/
-    private set pp3(/** this is value*/value: number) {
-    }
-    /** static getter property*/
-    static get s3() {
-        return 10;
-    }
-    /** setter property*/
-    static set s3( /** this is value*/value: number) {
-    }
-    public get nc_p3() {
-        return 10;
-    }
-    public set nc_p3(value: number) {
-    }
-    private get nc_pp3() {
-        return 10;
-    }
-    private set nc_pp3(value: number) {
-    }
-    static get nc_s3() {
-        return "";
-    }
-    static set nc_s3(value: string) {
-    }
-
-    // Only getter property
-    public get onlyGetter() {
-        return 10;
-    }
-
-    // Only setter property
-    public set onlySetter(value: number) {
-    }
-}
-
-//// [declFileAccessors_0.js]
-/** This is comment for c1*/
-var c1 = (function () {
-    function c1() {
-    }
-    Object.defineProperty(c1.prototype, "p3", {
-        /** getter property*/
-        get: function () {
-            return 10;
-        },
-        /** setter property*/
-        set: function (/** this is value*/ value) {
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(c1.prototype, "pp3", {
-        /** private getter property*/
-        get: function () {
-            return 10;
-        },
-        /** private setter property*/
-        set: function (/** this is value*/ value) {
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(c1, "s3", {
-        /** static getter property*/
-        get: function () {
-            return 10;
-        },
-        /** setter property*/
-        set: function (/** this is value*/ value) {
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(c1.prototype, "nc_p3", {
-        get: function () {
-            return 10;
-        },
-        set: function (value) {
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(c1.prototype, "nc_pp3", {
-        get: function () {
-            return 10;
-        },
-        set: function (value) {
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(c1, "nc_s3", {
-        get: function () {
-            return "";
-        },
-        set: function (value) {
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(c1.prototype, "onlyGetter", {
-        // Only getter property
-        get: function () {
-            return 10;
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(c1.prototype, "onlySetter", {
-        // Only setter property
-        set: function (value) {
-        },
-        enumerable: true,
-        configurable: true
-    });
-    return c1;
-})();
-exports.c1 = c1;
-//// [declFileAccessors_1.js]
-/** This is comment for c2 - the global class*/
-var c2 = (function () {
-    function c2() {
-    }
-    Object.defineProperty(c2.prototype, "p3", {
-        /** getter property*/
-        get: function () {
-            return 10;
-        },
-        /** setter property*/
-        set: function (/** this is value*/ value) {
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(c2.prototype, "pp3", {
-        /** private getter property*/
-        get: function () {
-            return 10;
-        },
-        /** private setter property*/
-        set: function (/** this is value*/ value) {
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(c2, "s3", {
-        /** static getter property*/
-        get: function () {
-            return 10;
-        },
-        /** setter property*/
-        set: function (/** this is value*/ value) {
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(c2.prototype, "nc_p3", {
-        get: function () {
-            return 10;
-        },
-        set: function (value) {
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(c2.prototype, "nc_pp3", {
-        get: function () {
-            return 10;
-        },
-        set: function (value) {
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(c2, "nc_s3", {
-        get: function () {
-            return "";
-        },
-        set: function (value) {
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(c2.prototype, "onlyGetter", {
-        // Only getter property
-        get: function () {
-            return 10;
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(c2.prototype, "onlySetter", {
-        // Only setter property
-        set: function (value) {
-        },
-        enumerable: true,
-        configurable: true
-    });
-    return c2;
-})();
-
-
-//// [declFileAccessors_0.d.ts]
-/** This is comment for c1*/
-export declare class c1 {
-    /** getter property*/
-    /** setter property*/
-    p3: number;
-    /** private getter property*/
-    /** private setter property*/
-    private pp3;
-    /** static getter property*/
-    /** setter property*/
-    static s3: number;
-    nc_p3: number;
-    private nc_pp3;
-    static nc_s3: string;
-    onlyGetter: number;
-    onlySetter: number;
-}
-//// [declFileAccessors_1.d.ts]
-/** This is comment for c2 - the global class*/
-declare class c2 {
-    /** getter property*/
-    /** setter property*/
-    p3: number;
-    /** private getter property*/
-    /** private setter property*/
-    private pp3;
-    /** static getter property*/
-    /** setter property*/
-    static s3: number;
-    nc_p3: number;
-    private nc_pp3;
-    static nc_s3: string;
-    onlyGetter: number;
-    onlySetter: number;
-}
diff --git a/tests/baselines/reference/declFileCallSignatures.js b/tests/baselines/reference/declFileCallSignatures.js
deleted file mode 100644
index 2d4519b2090..00000000000
--- a/tests/baselines/reference/declFileCallSignatures.js
+++ /dev/null
@@ -1,121 +0,0 @@
-//// [tests/cases/compiler/declFileCallSignatures.ts] ////
-
-//// [declFileCallSignatures_0.ts]
-
-export interface ICallSignature {
-    /** This comment should appear for foo*/
-    (): string;
-}
-
-export interface ICallSignatureWithParameters {
-    /** This is comment for function signature*/
-    (/** this is comment about a*/a: string,
-        /** this is comment for b*/
-        b: number): void;
-}
-
-export interface ICallSignatureWithRestParameters {
-    (a: string, ...rests: string[]): string;
-}
-
-export interface ICallSignatureWithOverloads {
-    (a: string): string;
-    (a: number): number;
-}
-
-export interface ICallSignatureWithTypeParameters<T> {
-    /** This comment should appear for foo*/
-    (a: T): string;
-}
-
-export interface ICallSignatureWithOwnTypeParametes {
-    <T extends ICallSignature>(a: T): string;
-}
-
-//// [declFileCallSignatures_1.ts]
-interface IGlobalCallSignature {
-    /** This comment should appear for foo*/
-    (): string;
-}
-
-interface IGlobalCallSignatureWithParameters {
-    /** This is comment for function signature*/
-    (/** this is comment about a*/a: string,
-        /** this is comment for b*/
-        b: number): void;
-}
-
-interface IGlobalCallSignatureWithRestParameters {
-
-    (a: string, ...rests: string[]): string;
-
-}
-
-interface IGlobalCallSignatureWithOverloads {
-    (a: string): string;
-    (a: number): number;
-}
-
-interface IGlobalCallSignatureWithTypeParameters<T> {
-    /** This comment should appear for foo*/
-    (a: T): string;
-}
-
-interface IGlobalCallSignatureWithOwnTypeParametes {
-    <T extends IGlobalCallSignature>(a: T): string;
-}
-
-//// [declFileCallSignatures_0.js]
-//// [declFileCallSignatures_1.js]
-
-
-//// [declFileCallSignatures_0.d.ts]
-export interface ICallSignature {
-    /** This comment should appear for foo*/
-    (): string;
-}
-export interface ICallSignatureWithParameters {
-    /** This is comment for function signature*/
-    (/** this is comment about a*/ a: string, 
-        /** this is comment for b*/
-        b: number): void;
-}
-export interface ICallSignatureWithRestParameters {
-    (a: string, ...rests: string[]): string;
-}
-export interface ICallSignatureWithOverloads {
-    (a: string): string;
-    (a: number): number;
-}
-export interface ICallSignatureWithTypeParameters<T> {
-    /** This comment should appear for foo*/
-    (a: T): string;
-}
-export interface ICallSignatureWithOwnTypeParametes {
-    <T extends ICallSignature>(a: T): string;
-}
-//// [declFileCallSignatures_1.d.ts]
-interface IGlobalCallSignature {
-    /** This comment should appear for foo*/
-    (): string;
-}
-interface IGlobalCallSignatureWithParameters {
-    /** This is comment for function signature*/
-    (/** this is comment about a*/ a: string, 
-        /** this is comment for b*/
-        b: number): void;
-}
-interface IGlobalCallSignatureWithRestParameters {
-    (a: string, ...rests: string[]): string;
-}
-interface IGlobalCallSignatureWithOverloads {
-    (a: string): string;
-    (a: number): number;
-}
-interface IGlobalCallSignatureWithTypeParameters<T> {
-    /** This comment should appear for foo*/
-    (a: T): string;
-}
-interface IGlobalCallSignatureWithOwnTypeParametes {
-    <T extends IGlobalCallSignature>(a: T): string;
-}
diff --git a/tests/baselines/reference/declFileConstructSignatures.js b/tests/baselines/reference/declFileConstructSignatures.js
deleted file mode 100644
index ae756e32eed..00000000000
--- a/tests/baselines/reference/declFileConstructSignatures.js
+++ /dev/null
@@ -1,121 +0,0 @@
-//// [tests/cases/compiler/declFileConstructSignatures.ts] ////
-
-//// [declFileConstructSignatures_0.ts]
-
-export interface IConstructSignature {
-    /** This comment should appear for foo*/
-    new (): string;
-}
-
-export interface IConstructSignatureWithParameters {
-    /** This is comment for function signature*/
-    new (/** this is comment about a*/a: string,
-        /** this is comment for b*/
-        b: number);
-}
-
-export interface IConstructSignatureWithRestParameters {
-    new (a: string, ...rests: string[]): string;
-}
-
-export interface IConstructSignatureWithOverloads {
-    new (a: string): string;
-    new (a: number): number;
-}
-
-export interface IConstructSignatureWithTypeParameters<T> {
-    /** This comment should appear for foo*/
-    new (a: T): T;
-}
-
-export interface IConstructSignatureWithOwnTypeParametes {
-    new <T extends IConstructSignature>(a: T): T;
-}
-
-//// [declFileConstructSignatures_1.ts]
-interface IGlobalConstructSignature {
-    /** This comment should appear for foo*/
-    new (): string;
-}
-
-interface IGlobalConstructSignatureWithParameters {
-    /** This is comment for function signature*/
-    new (/** this is comment about a*/a: string,
-        /** this is comment for b*/
-        b: number);
-}
-
-interface IGlobalConstructSignatureWithRestParameters {
-
-    new (a: string, ...rests: string[]): string;
-
-}
-
-interface IGlobalConstructSignatureWithOverloads {
-    new (a: string): string;
-    new (a: number): number;
-}
-
-interface IGlobalConstructSignatureWithTypeParameters<T> {
-    /** This comment should appear for foo*/
-    new (a: T): T;
-}
-
-interface IGlobalConstructSignatureWithOwnTypeParametes {
-    new <T extends IGlobalConstructSignature>(a: T): T;
-}
-
-//// [declFileConstructSignatures_0.js]
-//// [declFileConstructSignatures_1.js]
-
-
-//// [declFileConstructSignatures_0.d.ts]
-export interface IConstructSignature {
-    /** This comment should appear for foo*/
-    new (): string;
-}
-export interface IConstructSignatureWithParameters {
-    /** This is comment for function signature*/
-    new (/** this is comment about a*/ a: string, 
-        /** this is comment for b*/
-        b: number): any;
-}
-export interface IConstructSignatureWithRestParameters {
-    new (a: string, ...rests: string[]): string;
-}
-export interface IConstructSignatureWithOverloads {
-    new (a: string): string;
-    new (a: number): number;
-}
-export interface IConstructSignatureWithTypeParameters<T> {
-    /** This comment should appear for foo*/
-    new (a: T): T;
-}
-export interface IConstructSignatureWithOwnTypeParametes {
-    new <T extends IConstructSignature>(a: T): T;
-}
-//// [declFileConstructSignatures_1.d.ts]
-interface IGlobalConstructSignature {
-    /** This comment should appear for foo*/
-    new (): string;
-}
-interface IGlobalConstructSignatureWithParameters {
-    /** This is comment for function signature*/
-    new (/** this is comment about a*/ a: string, 
-        /** this is comment for b*/
-        b: number): any;
-}
-interface IGlobalConstructSignatureWithRestParameters {
-    new (a: string, ...rests: string[]): string;
-}
-interface IGlobalConstructSignatureWithOverloads {
-    new (a: string): string;
-    new (a: number): number;
-}
-interface IGlobalConstructSignatureWithTypeParameters<T> {
-    /** This comment should appear for foo*/
-    new (a: T): T;
-}
-interface IGlobalConstructSignatureWithOwnTypeParametes {
-    new <T extends IGlobalConstructSignature>(a: T): T;
-}
diff --git a/tests/baselines/reference/declFileConstructors.js b/tests/baselines/reference/declFileConstructors.js
deleted file mode 100644
index 327221debf8..00000000000
--- a/tests/baselines/reference/declFileConstructors.js
+++ /dev/null
@@ -1,289 +0,0 @@
-//// [tests/cases/compiler/declFileConstructors.ts] ////
-
-//// [declFileConstructors_0.ts]
-
-export class SimpleConstructor {
-    /** This comment should appear for foo*/
-    constructor() {
-    }
-}
-export class ConstructorWithParameters {
-    /** This is comment for function signature*/
-    constructor(/** this is comment about a*/a: string,
-        /** this is comment for b*/
-        b: number) {
-        var d = a;
-    }
-}
-
-export class ConstructorWithRestParamters {
-    constructor(a: string, ...rests: string[]) {
-        return a + rests.join("");
-    }
-}
-
-export class ConstructorWithOverloads {
-    constructor(a: string);
-    constructor(a: number);
-    constructor(a: any) {
-    }
-}
-
-export class ConstructorWithPublicParameterProperty {
-    constructor(public x: string) {
-    }
-}
-
-export class ConstructorWithPrivateParameterProperty {
-    constructor(private x: string) {
-    }
-}
-
-export class ConstructorWithOptionalParameterProperty {
-    constructor(public x?: string) {
-    }
-}
-
-export class ConstructorWithParameterInitializer {
-    constructor(public x = "hello") {
-    }
-}
-
-//// [declFileConstructors_1.ts]
-class GlobalSimpleConstructor {
-    /** This comment should appear for foo*/
-    constructor() {
-    }
-}
-class GlobalConstructorWithParameters {
-    /** This is comment for function signature*/
-    constructor(/** this is comment about a*/a: string,
-        /** this is comment for b*/
-        b: number) {
-        var d = a;
-    }
-}
-
-class GlobalConstructorWithRestParamters {
-    constructor(a: string, ...rests: string[]) {
-        return a + rests.join("");
-    }
-}
-
-class GlobalConstructorWithOverloads {
-    constructor(a: string);
-    constructor(a: number);
-    constructor(a: any) {
-    }
-}
-
-class GlobalConstructorWithPublicParameterProperty {
-    constructor(public x: string) {
-    }
-}
-
-class GlobalConstructorWithPrivateParameterProperty {
-    constructor(private x: string) {
-    }
-}
-
-class GlobalConstructorWithOptionalParameterProperty {
-    constructor(public x?: string) {
-    }
-}
-
-class GlobalConstructorWithParameterInitializer {
-    constructor(public x = "hello") {
-    }
-}
-
-//// [declFileConstructors_0.js]
-var SimpleConstructor = (function () {
-    /** This comment should appear for foo*/
-    function SimpleConstructor() {
-    }
-    return SimpleConstructor;
-})();
-exports.SimpleConstructor = SimpleConstructor;
-var ConstructorWithParameters = (function () {
-    /** This is comment for function signature*/
-    function ConstructorWithParameters(/** this is comment about a*/ a, 
-        /** this is comment for b*/
-        b) {
-        var d = a;
-    }
-    return ConstructorWithParameters;
-})();
-exports.ConstructorWithParameters = ConstructorWithParameters;
-var ConstructorWithRestParamters = (function () {
-    function ConstructorWithRestParamters(a) {
-        var rests = [];
-        for (var _i = 1; _i < arguments.length; _i++) {
-            rests[_i - 1] = arguments[_i];
-        }
-        return a + rests.join("");
-    }
-    return ConstructorWithRestParamters;
-})();
-exports.ConstructorWithRestParamters = ConstructorWithRestParamters;
-var ConstructorWithOverloads = (function () {
-    function ConstructorWithOverloads(a) {
-    }
-    return ConstructorWithOverloads;
-})();
-exports.ConstructorWithOverloads = ConstructorWithOverloads;
-var ConstructorWithPublicParameterProperty = (function () {
-    function ConstructorWithPublicParameterProperty(x) {
-        this.x = x;
-    }
-    return ConstructorWithPublicParameterProperty;
-})();
-exports.ConstructorWithPublicParameterProperty = ConstructorWithPublicParameterProperty;
-var ConstructorWithPrivateParameterProperty = (function () {
-    function ConstructorWithPrivateParameterProperty(x) {
-        this.x = x;
-    }
-    return ConstructorWithPrivateParameterProperty;
-})();
-exports.ConstructorWithPrivateParameterProperty = ConstructorWithPrivateParameterProperty;
-var ConstructorWithOptionalParameterProperty = (function () {
-    function ConstructorWithOptionalParameterProperty(x) {
-        this.x = x;
-    }
-    return ConstructorWithOptionalParameterProperty;
-})();
-exports.ConstructorWithOptionalParameterProperty = ConstructorWithOptionalParameterProperty;
-var ConstructorWithParameterInitializer = (function () {
-    function ConstructorWithParameterInitializer(x) {
-        if (x === void 0) { x = "hello"; }
-        this.x = x;
-    }
-    return ConstructorWithParameterInitializer;
-})();
-exports.ConstructorWithParameterInitializer = ConstructorWithParameterInitializer;
-//// [declFileConstructors_1.js]
-var GlobalSimpleConstructor = (function () {
-    /** This comment should appear for foo*/
-    function GlobalSimpleConstructor() {
-    }
-    return GlobalSimpleConstructor;
-})();
-var GlobalConstructorWithParameters = (function () {
-    /** This is comment for function signature*/
-    function GlobalConstructorWithParameters(/** this is comment about a*/ a, 
-        /** this is comment for b*/
-        b) {
-        var d = a;
-    }
-    return GlobalConstructorWithParameters;
-})();
-var GlobalConstructorWithRestParamters = (function () {
-    function GlobalConstructorWithRestParamters(a) {
-        var rests = [];
-        for (var _i = 1; _i < arguments.length; _i++) {
-            rests[_i - 1] = arguments[_i];
-        }
-        return a + rests.join("");
-    }
-    return GlobalConstructorWithRestParamters;
-})();
-var GlobalConstructorWithOverloads = (function () {
-    function GlobalConstructorWithOverloads(a) {
-    }
-    return GlobalConstructorWithOverloads;
-})();
-var GlobalConstructorWithPublicParameterProperty = (function () {
-    function GlobalConstructorWithPublicParameterProperty(x) {
-        this.x = x;
-    }
-    return GlobalConstructorWithPublicParameterProperty;
-})();
-var GlobalConstructorWithPrivateParameterProperty = (function () {
-    function GlobalConstructorWithPrivateParameterProperty(x) {
-        this.x = x;
-    }
-    return GlobalConstructorWithPrivateParameterProperty;
-})();
-var GlobalConstructorWithOptionalParameterProperty = (function () {
-    function GlobalConstructorWithOptionalParameterProperty(x) {
-        this.x = x;
-    }
-    return GlobalConstructorWithOptionalParameterProperty;
-})();
-var GlobalConstructorWithParameterInitializer = (function () {
-    function GlobalConstructorWithParameterInitializer(x) {
-        if (x === void 0) { x = "hello"; }
-        this.x = x;
-    }
-    return GlobalConstructorWithParameterInitializer;
-})();
-
-
-//// [declFileConstructors_0.d.ts]
-export declare class SimpleConstructor {
-    /** This comment should appear for foo*/
-    constructor();
-}
-export declare class ConstructorWithParameters {
-    /** This is comment for function signature*/
-    constructor(/** this is comment about a*/ a: string, 
-        /** this is comment for b*/
-        b: number);
-}
-export declare class ConstructorWithRestParamters {
-    constructor(a: string, ...rests: string[]);
-}
-export declare class ConstructorWithOverloads {
-    constructor(a: string);
-    constructor(a: number);
-}
-export declare class ConstructorWithPublicParameterProperty {
-    x: string;
-    constructor(x: string);
-}
-export declare class ConstructorWithPrivateParameterProperty {
-    private x;
-    constructor(x: string);
-}
-export declare class ConstructorWithOptionalParameterProperty {
-    x: string;
-    constructor(x?: string);
-}
-export declare class ConstructorWithParameterInitializer {
-    x: string;
-    constructor(x?: string);
-}
-//// [declFileConstructors_1.d.ts]
-declare class GlobalSimpleConstructor {
-    /** This comment should appear for foo*/
-    constructor();
-}
-declare class GlobalConstructorWithParameters {
-    /** This is comment for function signature*/
-    constructor(/** this is comment about a*/ a: string, 
-        /** this is comment for b*/
-        b: number);
-}
-declare class GlobalConstructorWithRestParamters {
-    constructor(a: string, ...rests: string[]);
-}
-declare class GlobalConstructorWithOverloads {
-    constructor(a: string);
-    constructor(a: number);
-}
-declare class GlobalConstructorWithPublicParameterProperty {
-    x: string;
-    constructor(x: string);
-}
-declare class GlobalConstructorWithPrivateParameterProperty {
-    private x;
-    constructor(x: string);
-}
-declare class GlobalConstructorWithOptionalParameterProperty {
-    x: string;
-    constructor(x?: string);
-}
-declare class GlobalConstructorWithParameterInitializer {
-    x: string;
-    constructor(x?: string);
-}
diff --git a/tests/baselines/reference/declFileFunctions.js b/tests/baselines/reference/declFileFunctions.js
deleted file mode 100644
index b5018e1fb1d..00000000000
--- a/tests/baselines/reference/declFileFunctions.js
+++ /dev/null
@@ -1,146 +0,0 @@
-//// [tests/cases/compiler/declFileFunctions.ts] ////
-
-//// [declFileFunctions_0.ts]
-
-/** This comment should appear for foo*/
-export function foo() {
-}
-/** This is comment for function signature*/
-export function fooWithParameters(/** this is comment about a*/a: string,
-    /** this is comment for b*/
-    b: number) {
-    var d = a;
-}
-export function fooWithRestParameters(a: string, ...rests: string[]) {
-    return a + rests.join("");
-}
-
-export function fooWithOverloads(a: string): string;
-export function fooWithOverloads(a: number): number;
-export function fooWithOverloads(a: any): any {
-    return a;
-}
-
-/** This comment should appear for nonExportedFoo*/
-function nonExportedFoo() {
-}
-/** This is comment for function signature*/
-function nonExportedFooWithParameters(/** this is comment about a*/a: string,
-    /** this is comment for b*/
-    b: number) {
-    var d = a;
-}
-function nonExportedFooWithRestParameters(a: string, ...rests: string[]) {
-    return a + rests.join("");
-}
-
-function nonExportedFooWithOverloads(a: string): string;
-function nonExportedFooWithOverloads(a: number): number;
-function nonExportedFooWithOverloads(a: any): any {
-    return a;
-}
-
-//// [declFileFunctions_1.ts]
-/** This comment should appear for foo*/
-function globalfoo() {
-}
-/** This is comment for function signature*/
-function globalfooWithParameters(/** this is comment about a*/a: string,
-    /** this is comment for b*/
-    b: number) {
-    var d = a;
-}
-function globalfooWithRestParameters(a: string, ...rests: string[]) {
-    return a + rests.join("");
-}
-function globalfooWithOverloads(a: string): string;
-function globalfooWithOverloads(a: number): number;
-function globalfooWithOverloads(a: any): any {
-    return a;
-}
-
-//// [declFileFunctions_0.js]
-/** This comment should appear for foo*/
-function foo() {
-}
-exports.foo = foo;
-/** This is comment for function signature*/
-function fooWithParameters(/** this is comment about a*/ a, 
-    /** this is comment for b*/
-    b) {
-    var d = a;
-}
-exports.fooWithParameters = fooWithParameters;
-function fooWithRestParameters(a) {
-    var rests = [];
-    for (var _i = 1; _i < arguments.length; _i++) {
-        rests[_i - 1] = arguments[_i];
-    }
-    return a + rests.join("");
-}
-exports.fooWithRestParameters = fooWithRestParameters;
-function fooWithOverloads(a) {
-    return a;
-}
-exports.fooWithOverloads = fooWithOverloads;
-/** This comment should appear for nonExportedFoo*/
-function nonExportedFoo() {
-}
-/** This is comment for function signature*/
-function nonExportedFooWithParameters(/** this is comment about a*/ a, 
-    /** this is comment for b*/
-    b) {
-    var d = a;
-}
-function nonExportedFooWithRestParameters(a) {
-    var rests = [];
-    for (var _i = 1; _i < arguments.length; _i++) {
-        rests[_i - 1] = arguments[_i];
-    }
-    return a + rests.join("");
-}
-function nonExportedFooWithOverloads(a) {
-    return a;
-}
-//// [declFileFunctions_1.js]
-/** This comment should appear for foo*/
-function globalfoo() {
-}
-/** This is comment for function signature*/
-function globalfooWithParameters(/** this is comment about a*/ a, 
-    /** this is comment for b*/
-    b) {
-    var d = a;
-}
-function globalfooWithRestParameters(a) {
-    var rests = [];
-    for (var _i = 1; _i < arguments.length; _i++) {
-        rests[_i - 1] = arguments[_i];
-    }
-    return a + rests.join("");
-}
-function globalfooWithOverloads(a) {
-    return a;
-}
-
-
-//// [declFileFunctions_0.d.ts]
-/** This comment should appear for foo*/
-export declare function foo(): void;
-/** This is comment for function signature*/
-export declare function fooWithParameters(/** this is comment about a*/ a: string, 
-    /** this is comment for b*/
-    b: number): void;
-export declare function fooWithRestParameters(a: string, ...rests: string[]): string;
-export declare function fooWithOverloads(a: string): string;
-export declare function fooWithOverloads(a: number): number;
-//// [declFileFunctions_1.d.ts]
-/** This comment should appear for foo*/
-declare function globalfoo(): void;
-/** This is comment for function signature*/
-declare function globalfooWithParameters(/** this is comment about a*/ a: string, 
-    /** this is comment for b*/
-    b: number): void;
-declare function globalfooWithRestParameters(a: string, ...rests: string[]): string;
-declare function globalfooWithOverloads(a: string): string;
-declare function globalfooWithOverloads(a: number): number;
diff --git a/tests/baselines/reference/declFileMethods.js b/tests/baselines/reference/declFileMethods.js
deleted file mode 100644
index 2b82a4b71b5..00000000000
--- a/tests/baselines/reference/declFileMethods.js
+++ /dev/null
@@ -1,459 +0,0 @@
-//// [tests/cases/compiler/declFileMethods.ts] ////
-
-//// [declFileMethods_0.ts]
-
-export class c1 {
-    /** This comment should appear for foo*/
-    public foo() {
-    }
-    /** This is comment for function signature*/
-    public fooWithParameters(/** this is comment about a*/a: string,
-        /** this is comment for b*/
-        b: number) {
-        var d = a;
-    }
-    public fooWithRestParameters(a: string, ...rests: string[]) {
-        return a + rests.join("");
-    }
-
-    public fooWithOverloads(a: string): string;
-    public fooWithOverloads(a: number): number;
-    public fooWithOverloads(a: any): any {
-        return a;
-    }
-
-
-    /** This comment should appear for privateFoo*/
-    private privateFoo() {
-    }
-    /** This is comment for function signature*/
-    private privateFooWithParameters(/** this is comment about a*/a: string,
-        /** this is comment for b*/
-        b: number) {
-        var d = a;
-    }
-    private privateFooWithRestParameters(a: string, ...rests: string[]) {
-        return a + rests.join("");
-    }
-    private privateFooWithOverloads(a: string): string;
-    private privateFooWithOverloads(a: number): number;
-    private privateFooWithOverloads(a: any): any {
-        return a;
-    }
-
-
-    /** This comment should appear for static foo*/
-    static staticFoo() {
-    }
-    /** This is comment for function signature*/
-    static staticFooWithParameters(/** this is comment about a*/a: string,
-        /** this is comment for b*/
-        b: number) {
-        var d = a;
-    }
-    static staticFooWithRestParameters(a: string, ...rests: string[]) {
-        return a + rests.join("");
-    }
-    static staticFooWithOverloads(a: string): string;
-    static staticFooWithOverloads(a: number): number;
-    static staticFooWithOverloads(a: any): any {
-        return a;
-    }
-
-
-    /** This comment should appear for privateStaticFoo*/
-    private static privateStaticFoo() {
-    }
-    /** This is comment for function signature*/
-    private static privateStaticFooWithParameters(/** this is comment about a*/a: string,
-        /** this is comment for b*/
-        b: number) {
-        var d = a;
-    }
-    private static privateStaticFooWithRestParameters(a: string, ...rests: string[]) {
-        return a + rests.join("");
-    }
-    private static privateStaticFooWithOverloads(a: string): string;
-    private static privateStaticFooWithOverloads(a: number): number;
-    private static privateStaticFooWithOverloads(a: any): any {
-        return a;
-    }
-}
-
-export interface I1 {
-    /** This comment should appear for foo*/
-    foo(): string;
-
-    /** This is comment for function signature*/
-    fooWithParameters(/** this is comment about a*/a: string,
-        /** this is comment for b*/
-        b: number): void;
-
-    fooWithRestParameters(a: string, ...rests: string[]): string;
-
-    fooWithOverloads(a: string): string;
-    fooWithOverloads(a: number): number;
-}
-
-//// [declFileMethods_1.ts]
-class c2 {
-    /** This comment should appear for foo*/
-    public foo() {
-    }
-    /** This is comment for function signature*/
-    public fooWithParameters(/** this is comment about a*/a: string,
-        /** this is comment for b*/
-        b: number) {
-        var d = a;
-    }
-    public fooWithRestParameters(a: string, ...rests: string[]) {
-        return a + rests.join("");
-    }
-
-    public fooWithOverloads(a: string): string;
-    public fooWithOverloads(a: number): number;
-    public fooWithOverloads(a: any): any {
-        return a;
-    }
-
-
-    /** This comment should appear for privateFoo*/
-    private privateFoo() {
-    }
-    /** This is comment for function signature*/
-    private privateFooWithParameters(/** this is comment about a*/a: string,
-        /** this is comment for b*/
-        b: number) {
-        var d = a;
-    }
-    private privateFooWithRestParameters(a: string, ...rests: string[]) {
-        return a + rests.join("");
-    }
-    private privateFooWithOverloads(a: string): string;
-    private privateFooWithOverloads(a: number): number;
-    private privateFooWithOverloads(a: any): any {
-        return a;
-    }
-
-
-    /** This comment should appear for static foo*/
-    static staticFoo() {
-    }
-    /** This is comment for function signature*/
-    static staticFooWithParameters(/** this is comment about a*/a: string,
-        /** this is comment for b*/
-        b: number) {
-        var d = a;
-    }
-    static staticFooWithRestParameters(a: string, ...rests: string[]) {
-        return a + rests.join("");
-    }
-    static staticFooWithOverloads(a: string): string;
-    static staticFooWithOverloads(a: number): number;
-    static staticFooWithOverloads(a: any): any {
-        return a;
-    }
-
-
-    /** This comment should appear for privateStaticFoo*/
-    private static privateStaticFoo() {
-    }
-    /** This is comment for function signature*/
-    private static privateStaticFooWithParameters(/** this is comment about a*/a: string,
-        /** this is comment for b*/
-        b: number) {
-        var d = a;
-    }
-    private static privateStaticFooWithRestParameters(a: string, ...rests: string[]) {
-        return a + rests.join("");
-    }
-    private static privateStaticFooWithOverloads(a: string): string;
-    private static privateStaticFooWithOverloads(a: number): number;
-    private static privateStaticFooWithOverloads(a: any): any {
-        return a;
-    }
-}
-
-interface I2 {
-    /** This comment should appear for foo*/
-    foo(): string;
-
-    /** This is comment for function signature*/
-    fooWithParameters(/** this is comment about a*/a: string,
-        /** this is comment for b*/
-        b: number): void;
-
-    fooWithRestParameters(a: string, ...rests: string[]): string;
-
-    fooWithOverloads(a: string): string;
-    fooWithOverloads(a: number): number;
-}
-
-
-//// [declFileMethods_0.js]
-var c1 = (function () {
-    function c1() {
-    }
-    /** This comment should appear for foo*/
-    c1.prototype.foo = function () {
-    };
-    /** This is comment for function signature*/
-    c1.prototype.fooWithParameters = function (/** this is comment about a*/ a, 
-        /** this is comment for b*/
-        b) {
-        var d = a;
-    };
-    c1.prototype.fooWithRestParameters = function (a) {
-        var rests = [];
-        for (var _i = 1; _i < arguments.length; _i++) {
-            rests[_i - 1] = arguments[_i];
-        }
-        return a + rests.join("");
-    };
-    c1.prototype.fooWithOverloads = function (a) {
-        return a;
-    };
-    /** This comment should appear for privateFoo*/
-    c1.prototype.privateFoo = function () {
-    };
-    /** This is comment for function signature*/
-    c1.prototype.privateFooWithParameters = function (/** this is comment about a*/ a, 
-        /** this is comment for b*/
-        b) {
-        var d = a;
-    };
-    c1.prototype.privateFooWithRestParameters = function (a) {
-        var rests = [];
-        for (var _i = 1; _i < arguments.length; _i++) {
-            rests[_i - 1] = arguments[_i];
-        }
-        return a + rests.join("");
-    };
-    c1.prototype.privateFooWithOverloads = function (a) {
-        return a;
-    };
-    /** This comment should appear for static foo*/
-    c1.staticFoo = function () {
-    };
-    /** This is comment for function signature*/
-    c1.staticFooWithParameters = function (/** this is comment about a*/ a, 
-        /** this is comment for b*/
-        b) {
-        var d = a;
-    };
-    c1.staticFooWithRestParameters = function (a) {
-        var rests = [];
-        for (var _i = 1; _i < arguments.length; _i++) {
-            rests[_i - 1] = arguments[_i];
-        }
-        return a + rests.join("");
-    };
-    c1.staticFooWithOverloads = function (a) {
-        return a;
-    };
-    /** This comment should appear for privateStaticFoo*/
-    c1.privateStaticFoo = function () {
-    };
-    /** This is comment for function signature*/
-    c1.privateStaticFooWithParameters = function (/** this is comment about a*/ a, 
-        /** this is comment for b*/
-        b) {
-        var d = a;
-    };
-    c1.privateStaticFooWithRestParameters = function (a) {
-        var rests = [];
-        for (var _i = 1; _i < arguments.length; _i++) {
-            rests[_i - 1] = arguments[_i];
-        }
-        return a + rests.join("");
-    };
-    c1.privateStaticFooWithOverloads = function (a) {
-        return a;
-    };
-    return c1;
-})();
-exports.c1 = c1;
-//// [declFileMethods_1.js]
-var c2 = (function () {
-    function c2() {
-    }
-    /** This comment should appear for foo*/
-    c2.prototype.foo = function () {
-    };
-    /** This is comment for function signature*/
-    c2.prototype.fooWithParameters = function (/** this is comment about a*/ a, 
-        /** this is comment for b*/
-        b) {
-        var d = a;
-    };
-    c2.prototype.fooWithRestParameters = function (a) {
-        var rests = [];
-        for (var _i = 1; _i < arguments.length; _i++) {
-            rests[_i - 1] = arguments[_i];
-        }
-        return a + rests.join("");
-    };
-    c2.prototype.fooWithOverloads = function (a) {
-        return a;
-    };
-    /** This comment should appear for privateFoo*/
-    c2.prototype.privateFoo = function () {
-    };
-    /** This is comment for function signature*/
-    c2.prototype.privateFooWithParameters = function (/** this is comment about a*/ a, 
-        /** this is comment for b*/
-        b) {
-        var d = a;
-    };
-    c2.prototype.privateFooWithRestParameters = function (a) {
-        var rests = [];
-        for (var _i = 1; _i < arguments.length; _i++) {
-            rests[_i - 1] = arguments[_i];
-        }
-        return a + rests.join("");
-    };
-    c2.prototype.privateFooWithOverloads = function (a) {
-        return a;
-    };
-    /** This comment should appear for static foo*/
-    c2.staticFoo = function () {
-    };
-    /** This is comment for function signature*/
-    c2.staticFooWithParameters = function (/** this is comment about a*/ a, 
-        /** this is comment for b*/
-        b) {
-        var d = a;
-    };
-    c2.staticFooWithRestParameters = function (a) {
-        var rests = [];
-        for (var _i = 1; _i < arguments.length; _i++) {
-            rests[_i - 1] = arguments[_i];
-        }
-        return a + rests.join("");
-    };
-    c2.staticFooWithOverloads = function (a) {
-        return a;
-    };
-    /** This comment should appear for privateStaticFoo*/
-    c2.privateStaticFoo = function () {
-    };
-    /** This is comment for function signature*/
-    c2.privateStaticFooWithParameters = function (/** this is comment about a*/ a, 
-        /** this is comment for b*/
-        b) {
-        var d = a;
-    };
-    c2.privateStaticFooWithRestParameters = function (a) {
-        var rests = [];
-        for (var _i = 1; _i < arguments.length; _i++) {
-            rests[_i - 1] = arguments[_i];
-        }
-        return a + rests.join("");
-    };
-    c2.privateStaticFooWithOverloads = function (a) {
-        return a;
-    };
-    return c2;
-})();
-
-
-//// [declFileMethods_0.d.ts]
-export declare class c1 {
-    /** This comment should appear for foo*/
-    foo(): void;
-    /** This is comment for function signature*/
-    fooWithParameters(/** this is comment about a*/ a: string, 
-        /** this is comment for b*/
-        b: number): void;
-    fooWithRestParameters(a: string, ...rests: string[]): string;
-    fooWithOverloads(a: string): string;
-    fooWithOverloads(a: number): number;
-    /** This comment should appear for privateFoo*/
-    private privateFoo();
-    /** This is comment for function signature*/
-    private privateFooWithParameters(/** this is comment about a*/ a, 
-        /** this is comment for b*/
-        b);
-    private privateFooWithRestParameters(a, ...rests);
-    private privateFooWithOverloads(a);
-    private privateFooWithOverloads(a);
-    /** This comment should appear for static foo*/
-    static staticFoo(): void;
-    /** This is comment for function signature*/
-    static staticFooWithParameters(/** this is comment about a*/ a: string, 
-        /** this is comment for b*/
-        b: number): void;
-    static staticFooWithRestParameters(a: string, ...rests: string[]): string;
-    static staticFooWithOverloads(a: string): string;
-    static staticFooWithOverloads(a: number): number;
-    /** This comment should appear for privateStaticFoo*/
-    private static privateStaticFoo();
-    /** This is comment for function signature*/
-    private static privateStaticFooWithParameters(/** this is comment about a*/ a, 
-        /** this is comment for b*/
-        b);
-    private static privateStaticFooWithRestParameters(a, ...rests);
-    private static privateStaticFooWithOverloads(a);
-    private static privateStaticFooWithOverloads(a);
-}
-export interface I1 {
-    /** This comment should appear for foo*/
-    foo(): string;
-    /** This is comment for function signature*/
-    fooWithParameters(/** this is comment about a*/ a: string, 
-        /** this is comment for b*/
-        b: number): void;
-    fooWithRestParameters(a: string, ...rests: string[]): string;
-    fooWithOverloads(a: string): string;
-    fooWithOverloads(a: number): number;
-}
-//// [declFileMethods_1.d.ts]
-declare class c2 {
-    /** This comment should appear for foo*/
-    foo(): void;
-    /** This is comment for function signature*/
-    fooWithParameters(/** this is comment about a*/ a: string, 
-        /** this is comment for b*/
-        b: number): void;
-    fooWithRestParameters(a: string, ...rests: string[]): string;
-    fooWithOverloads(a: string): string;
-    fooWithOverloads(a: number): number;
-    /** This comment should appear for privateFoo*/
-    private privateFoo();
-    /** This is comment for function signature*/
-    private privateFooWithParameters(/** this is comment about a*/ a, 
-        /** this is comment for b*/
-        b);
-    private privateFooWithRestParameters(a, ...rests);
-    private privateFooWithOverloads(a);
-    private privateFooWithOverloads(a);
-    /** This comment should appear for static foo*/
-    static staticFoo(): void;
-    /** This is comment for function signature*/
-    static staticFooWithParameters(/** this is comment about a*/ a: string, 
-        /** this is comment for b*/
-        b: number): void;
-    static staticFooWithRestParameters(a: string, ...rests: string[]): string;
-    static staticFooWithOverloads(a: string): string;
-    static staticFooWithOverloads(a: number): number;
-    /** This comment should appear for privateStaticFoo*/
-    private static privateStaticFoo();
-    /** This is comment for function signature*/
-    private static privateStaticFooWithParameters(/** this is comment about a*/ a, 
-        /** this is comment for b*/
-        b);
-    private static privateStaticFooWithRestParameters(a, ...rests);
-    private static privateStaticFooWithOverloads(a);
-    private static privateStaticFooWithOverloads(a);
-}
-interface I2 {
-    /** This comment should appear for foo*/
-    foo(): string;
-    /** This is comment for function signature*/
-    fooWithParameters(/** this is comment about a*/ a: string, 
-        /** this is comment for b*/
-        b: number): void;
-    fooWithRestParameters(a: string, ...rests: string[]): string;
-    fooWithOverloads(a: string): string;
-    fooWithOverloads(a: number): number;
-}
diff --git a/tests/baselines/reference/declarationEmit_nameConflicts.js b/tests/baselines/reference/declarationEmit_nameConflicts.js
deleted file mode 100644
index bbb7826707b..00000000000
--- a/tests/baselines/reference/declarationEmit_nameConflicts.js
+++ /dev/null
@@ -1,195 +0,0 @@
-//// [tests/cases/compiler/declarationEmit_nameConflicts.ts] ////
-
-//// [declarationEmit_nameConflicts_1.ts]
-module f { export class c { } }
-export = f;
-
-//// [declarationEmit_nameConflicts_0.ts]
-import im = require('declarationEmit_nameConflicts_1');
-export module M {
-    export function f() { }
-    export class C { }
-    export module N {
-        export function g() { };
-        export interface I { }
-    }
-
-    export import a = M.f;
-    export import b = M.C;
-    export import c = N;
-    export import d = im;
-}
-
-export module M.P {
-    export function f() { }
-    export class C { }
-    export module N {
-        export function g() { };
-        export interface I { }
-    }
-    export import im = M.P.f;
-    export var a = M.a; // emitted incorrectly as typeof f
-    export var b = M.b; // ok
-    export var c = M.c; // ok
-    export var g = M.c.g; // ok
-    export var d = M.d; // emitted incorrectly as typeof im
-}
-
-export module M.Q {
-    export function f() { }
-    export class C { }
-    export module N {
-        export function g() { };
-        export interface I { }
-    }
-    export interface b extends M.b { } // ok
-    export interface I extends M.c.I { } // ok
-    export module c {
-        export interface I extends M.c.I { } // ok
-    }
-}
-
-//// [declarationEmit_nameConflicts_1.js]
-var f;
-(function (f) {
-    var c = (function () {
-        function c() {
-        }
-        return c;
-    })();
-    f.c = c;
-})(f || (f = {}));
-module.exports = f;
-//// [declarationEmit_nameConflicts_0.js]
-var im = require('declarationEmit_nameConflicts_1');
-(function (M) {
-    function f() {
-    }
-    M.f = f;
-    var C = (function () {
-        function C() {
-        }
-        return C;
-    })();
-    M.C = C;
-    (function (N) {
-        function g() {
-        }
-        N.g = g;
-        ;
-    })(M.N || (M.N = {}));
-    var N = M.N;
-    M.a = M.f;
-    M.b = M.C;
-    M.c = N;
-    M.d = im;
-})(exports.M || (exports.M = {}));
-var M = exports.M;
-(function (M) {
-    (function (P) {
-        function f() {
-        }
-        P.f = f;
-        var C = (function () {
-            function C() {
-            }
-            return C;
-        })();
-        P.C = C;
-        (function (N) {
-            function g() {
-            }
-            N.g = g;
-            ;
-        })(P.N || (P.N = {}));
-        var N = P.N;
-        P.im = M.P.f;
-        P.a = M.a; // emitted incorrectly as typeof f
-        P.b = M.b; // ok
-        P.c = M.c; // ok
-        P.g = M.c.g; // ok
-        P.d = M.d; // emitted incorrectly as typeof im
-    })(M.P || (M.P = {}));
-    var P = M.P;
-})(exports.M || (exports.M = {}));
-var M = exports.M;
-(function (M) {
-    (function (Q) {
-        function f() {
-        }
-        Q.f = f;
-        var C = (function () {
-            function C() {
-            }
-            return C;
-        })();
-        Q.C = C;
-        (function (N) {
-            function g() {
-            }
-            N.g = g;
-            ;
-        })(Q.N || (Q.N = {}));
-        var N = Q.N;
-    })(M.Q || (M.Q = {}));
-    var Q = M.Q;
-})(exports.M || (exports.M = {}));
-var M = exports.M;
-
-
-//// [declarationEmit_nameConflicts_1.d.ts]
-declare module f {
-    class c {
-    }
-}
-export = f;
-//// [declarationEmit_nameConflicts_0.d.ts]
-import im = require('declarationEmit_nameConflicts_1');
-export declare module M {
-    function f(): void;
-    class C {
-    }
-    module N {
-        function g(): void;
-        interface I {
-        }
-    }
-    export import a = M.f;
-    export import b = M.C;
-    export import c = N;
-    export import d = im;
-}
-export declare module M.P {
-    function f(): void;
-    class C {
-    }
-    module N {
-        function g(): void;
-        interface I {
-        }
-    }
-    export import im = M.P.f;
-    var a: typeof M.f;
-    var b: typeof M.C;
-    var c: typeof M.N;
-    var g: typeof M.c.g;
-    var d: typeof M.d;
-}
-export declare module M.Q {
-    function f(): void;
-    class C {
-    }
-    module N {
-        function g(): void;
-        interface I {
-        }
-    }
-    interface b extends M.C {
-    }
-    interface I extends M.c.I {
-    }
-    module c {
-        interface I extends M.c.I {
-        }
-    }
-}
diff --git a/tests/baselines/reference/declarationEmit_nameConflictsWithAlias.js b/tests/baselines/reference/declarationEmit_nameConflictsWithAlias.js
deleted file mode 100644
index a5b2f397bf8..00000000000
--- a/tests/baselines/reference/declarationEmit_nameConflictsWithAlias.js
+++ /dev/null
@@ -1,28 +0,0 @@
-//// [declarationEmit_nameConflictsWithAlias.ts]
-export module C { export interface I { } }
-export import v = C;
-export module M {
-    export module C { export interface I { } }
-    export var w: v.I; // Gets emitted as C.I, which is the wrong interface
-}
-
-//// [declarationEmit_nameConflictsWithAlias.js]
-(function (M) {
-    M.w; // Gets emitted as C.I, which is the wrong interface
-})(exports.M || (exports.M = {}));
-var M = exports.M;
-
-
-//// [declarationEmit_nameConflictsWithAlias.d.ts]
-export declare module C {
-    interface I {
-    }
-}
-export import v = C;
-export declare module M {
-    module C {
-        interface I {
-        }
-    }
-    var w: v.I;
-}
diff --git a/tests/baselines/reference/detachedCommentAtStartOfConstructor1.js b/tests/baselines/reference/detachedCommentAtStartOfConstructor1.js
deleted file mode 100644
index 13312aea362..00000000000
--- a/tests/baselines/reference/detachedCommentAtStartOfConstructor1.js
+++ /dev/null
@@ -1,23 +0,0 @@
-//// [detachedCommentAtStartOfConstructor1.ts]
-class TestFile {
-    public message: string;
-    public name;
-    constructor(message: string) {
-        /// <summary>Test summary</summary>
-        /// <param name="message" type="String" />
-        var getMessage = () => message + this.name;
-        this.message = getMessage();
-    }
-}
-
-//// [detachedCommentAtStartOfConstructor1.js]
-var TestFile = (function () {
-    function TestFile(message) {
-        var _this = this;
-        /// <summary>Test summary</summary>
-        /// <param name="message" type="String" />
-        var getMessage = function () { return message + _this.name; };
-        this.message = getMessage();
-    }
-    return TestFile;
-})();
diff --git a/tests/baselines/reference/detachedCommentAtStartOfConstructor1.types b/tests/baselines/reference/detachedCommentAtStartOfConstructor1.types
deleted file mode 100644
index 392821de751..00000000000
--- a/tests/baselines/reference/detachedCommentAtStartOfConstructor1.types
+++ /dev/null
@@ -1,33 +0,0 @@
-=== tests/cases/compiler/detachedCommentAtStartOfConstructor1.ts ===
-class TestFile {
->TestFile : TestFile
-
-    public message: string;
->message : string
-
-    public name;
->name : any
-
-    constructor(message: string) {
->message : string
-
-        /// <summary>Test summary</summary>
-        /// <param name="message" type="String" />
-        var getMessage = () => message + this.name;
->getMessage : () => string
->() => message + this.name : () => string
->message + this.name : string
->message : string
->this.name : any
->this : TestFile
->name : any
-
-        this.message = getMessage();
->this.message = getMessage() : string
->this.message : string
->this : TestFile
->message : string
->getMessage() : string
->getMessage : () => string
-    }
-}
diff --git a/tests/baselines/reference/detachedCommentAtStartOfConstructor2.js b/tests/baselines/reference/detachedCommentAtStartOfConstructor2.js
deleted file mode 100644
index 754b432c7c5..00000000000
--- a/tests/baselines/reference/detachedCommentAtStartOfConstructor2.js
+++ /dev/null
@@ -1,24 +0,0 @@
-//// [detachedCommentAtStartOfConstructor2.ts]
-class TestFile {
-    public message: string;
-    public name: string;
-    constructor(message: string) {
-        /// <summary>Test summary</summary>
-        /// <param name="message" type="String" />
-
-        var getMessage = () => message + this.name;
-        this.message = getMessage();
-    }
-}
-
-//// [detachedCommentAtStartOfConstructor2.js]
-var TestFile = (function () {
-    function TestFile(message) {
-        /// <summary>Test summary</summary>
-        /// <param name="message" type="String" />
-        var _this = this;
-        var getMessage = function () { return message + _this.name; };
-        this.message = getMessage();
-    }
-    return TestFile;
-})();
diff --git a/tests/baselines/reference/detachedCommentAtStartOfConstructor2.types b/tests/baselines/reference/detachedCommentAtStartOfConstructor2.types
deleted file mode 100644
index b413cd557a5..00000000000
--- a/tests/baselines/reference/detachedCommentAtStartOfConstructor2.types
+++ /dev/null
@@ -1,34 +0,0 @@
-=== tests/cases/compiler/detachedCommentAtStartOfConstructor2.ts ===
-class TestFile {
->TestFile : TestFile
-
-    public message: string;
->message : string
-
-    public name: string;
->name : string
-
-    constructor(message: string) {
->message : string
-
-        /// <summary>Test summary</summary>
-        /// <param name="message" type="String" />
-
-        var getMessage = () => message + this.name;
->getMessage : () => string
->() => message + this.name : () => string
->message + this.name : string
->message : string
->this.name : string
->this : TestFile
->name : string
-
-        this.message = getMessage();
->this.message = getMessage() : string
->this.message : string
->this : TestFile
->message : string
->getMessage() : string
->getMessage : () => string
-    }
-}
diff --git a/tests/baselines/reference/detachedCommentAtStartOfLambdaFunction1.js b/tests/baselines/reference/detachedCommentAtStartOfLambdaFunction1.js
deleted file mode 100644
index 2505e3f6082..00000000000
--- a/tests/baselines/reference/detachedCommentAtStartOfLambdaFunction1.js
+++ /dev/null
@@ -1,31 +0,0 @@
-//// [detachedCommentAtStartOfLambdaFunction1.ts]
-class TestFile {
-    name: string;
-    foo(message: string): () => string {
-        return (...x: string[]) =>
-            /// <summary>Test summary</summary>
-            /// <param name="message" type="String" />
-            /// <returns type="Function" />
-            message + this.name;
-    }
-}
-
-//// [detachedCommentAtStartOfLambdaFunction1.js]
-var TestFile = (function () {
-    function TestFile() {
-    }
-    TestFile.prototype.foo = function (message) {
-        var _this = this;
-        return function () {
-            var x = [];
-            for (var _i = 0; _i < arguments.length; _i++) {
-                x[_i - 0] = arguments[_i];
-            }
-            /// <summary>Test summary</summary>
-            /// <param name="message" type="String" />
-            /// <returns type="Function" />
-            return message + _this.name;
-        };
-    };
-    return TestFile;
-})();
diff --git a/tests/baselines/reference/detachedCommentAtStartOfLambdaFunction1.types b/tests/baselines/reference/detachedCommentAtStartOfLambdaFunction1.types
deleted file mode 100644
index 016a123c5c1..00000000000
--- a/tests/baselines/reference/detachedCommentAtStartOfLambdaFunction1.types
+++ /dev/null
@@ -1,26 +0,0 @@
-=== tests/cases/compiler/detachedCommentAtStartOfLambdaFunction1.ts ===
-class TestFile {
->TestFile : TestFile
-
-    name: string;
->name : string
-
-    foo(message: string): () => string {
->foo : (message: string) => () => string
->message : string
-
-        return (...x: string[]) =>
->(...x: string[]) =>            /// <summary>Test summary</summary>            /// <param name="message" type="String" />            /// <returns type="Function" />            message + this.name : (...x: string[]) => string
->x : string[]
-
-            /// <summary>Test summary</summary>
-            /// <param name="message" type="String" />
-            /// <returns type="Function" />
-            message + this.name;
->message + this.name : string
->message : string
->this.name : string
->this : TestFile
->name : string
-    }
-}
diff --git a/tests/baselines/reference/detachedCommentAtStartOfLambdaFunction2.js b/tests/baselines/reference/detachedCommentAtStartOfLambdaFunction2.js
deleted file mode 100644
index 53f6d08eaf5..00000000000
--- a/tests/baselines/reference/detachedCommentAtStartOfLambdaFunction2.js
+++ /dev/null
@@ -1,32 +0,0 @@
-//// [detachedCommentAtStartOfLambdaFunction2.ts]
-class TestFile {
-    name: string;
-    foo(message: string): () => string {
-        return (...x: string[]) =>
-            /// <summary>Test summary</summary>
-            /// <param name="message" type="String" />
-            /// <returns type="Function" />
-
-            message + this.name;
-    }
-}
-
-//// [detachedCommentAtStartOfLambdaFunction2.js]
-var TestFile = (function () {
-    function TestFile() {
-    }
-    TestFile.prototype.foo = function (message) {
-        var _this = this;
-        return function () {
-            /// <summary>Test summary</summary>
-            /// <param name="message" type="String" />
-            /// <returns type="Function" />
-            var x = [];
-            for (var _i = 0; _i < arguments.length; _i++) {
-                x[_i - 0] = arguments[_i];
-            }
-            return message + _this.name;
-        };
-    };
-    return TestFile;
-})();
diff --git a/tests/baselines/reference/detachedCommentAtStartOfLambdaFunction2.types b/tests/baselines/reference/detachedCommentAtStartOfLambdaFunction2.types
deleted file mode 100644
index 2199a4490b5..00000000000
--- a/tests/baselines/reference/detachedCommentAtStartOfLambdaFunction2.types
+++ /dev/null
@@ -1,27 +0,0 @@
-=== tests/cases/compiler/detachedCommentAtStartOfLambdaFunction2.ts ===
-class TestFile {
->TestFile : TestFile
-
-    name: string;
->name : string
-
-    foo(message: string): () => string {
->foo : (message: string) => () => string
->message : string
-
-        return (...x: string[]) =>
->(...x: string[]) =>            /// <summary>Test summary</summary>            /// <param name="message" type="String" />            /// <returns type="Function" />            message + this.name : (...x: string[]) => string
->x : string[]
-
-            /// <summary>Test summary</summary>
-            /// <param name="message" type="String" />
-            /// <returns type="Function" />
-
-            message + this.name;
->message + this.name : string
->message : string
->this.name : string
->this : TestFile
->name : string
-    }
-}
diff --git a/tests/baselines/reference/duplicateVarAndImport.js b/tests/baselines/reference/duplicateVarAndImport.js
deleted file mode 100644
index 38148c6ce53..00000000000
--- a/tests/baselines/reference/duplicateVarAndImport.js
+++ /dev/null
@@ -1,10 +0,0 @@
-//// [duplicateVarAndImport.ts]
-// no error since module is not instantiated
-
-var a;
-module M { }
-import a = M;
-
-//// [duplicateVarAndImport.js]
-// no error since module is not instantiated
-var a;
diff --git a/tests/baselines/reference/duplicateVarAndImport2.js b/tests/baselines/reference/duplicateVarAndImport2.js
deleted file mode 100644
index 42d500d588a..00000000000
--- a/tests/baselines/reference/duplicateVarAndImport2.js
+++ /dev/null
@@ -1,14 +0,0 @@
-//// [duplicateVarAndImport2.ts]
-// error since module is instantiated
-var a;
-module M { export var x = 1; }
-import a = M;
-
-//// [duplicateVarAndImport2.js]
-// error since module is instantiated
-var a;
-var M;
-(function (M) {
-    M.x = 1;
-})(M || (M = {}));
-var a = M;
diff --git a/tests/baselines/reference/emitBOM.js b/tests/baselines/reference/emitBOM.js
deleted file mode 100644
index f243e715991..00000000000
--- a/tests/baselines/reference/emitBOM.js
+++ /dev/null
@@ -1,12 +0,0 @@
-//// [emitBOM.ts]
-
-// JS and d.ts output should have a BOM but not the sourcemap
-var x;
-
-//// [emitBOM.js]
-// JS and d.ts output should have a BOM but not the sourcemap
-var x;
-//# sourceMappingURL=emitBOM.js.map
-
-//// [emitBOM.d.ts]
-declare var x: any;
diff --git a/tests/baselines/reference/emitBOM.js.map b/tests/baselines/reference/emitBOM.js.map
deleted file mode 100644
index af5fd260813..00000000000
--- a/tests/baselines/reference/emitBOM.js.map
+++ /dev/null
@@ -1,2 +0,0 @@
-//// [emitBOM.js.map]
-{"version":3,"file":"emitBOM.js","sourceRoot":"","sources":["emitBOM.ts"],"names":[],"mappings":"AAEA,AADA,6DAA6D;IACzD,CAAC,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/emitBOM.sourcemap.txt b/tests/baselines/reference/emitBOM.sourcemap.txt
deleted file mode 100644
index cd49155d24f..00000000000
--- a/tests/baselines/reference/emitBOM.sourcemap.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-===================================================================
-JsFile: emitBOM.js
-mapUrl: emitBOM.js.map
-sourceRoot: 
-sources: emitBOM.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:tests/cases/compiler/emitBOM.js
-sourceFile:emitBOM.ts
--------------------------------------------------------------------
->>>// JS and d.ts output should have a BOM but not the sourcemap
-1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1 >
-  >// JS and d.ts output should have a BOM but not the sourcemap
-  >
-2 >
-3 >// JS and d.ts output should have a BOM but not the sourcemap
-1 >Emitted(1, 1) Source(3, 1) + SourceIndex(0)
-2 >Emitted(1, 1) Source(2, 1) + SourceIndex(0)
-3 >Emitted(1, 62) Source(2, 62) + SourceIndex(0)
----
->>>var x;
-1 >^^^^
-2 >    ^
-3 >     ^
-4 >      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >var 
-2 >    x
-3 >     ;
-1 >Emitted(2, 5) Source(3, 5) + SourceIndex(0)
-2 >Emitted(2, 6) Source(3, 6) + SourceIndex(0)
-3 >Emitted(2, 7) Source(3, 7) + SourceIndex(0)
----
->>>//# sourceMappingURL=emitBOM.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/externalModuleResolution.js b/tests/baselines/reference/externalModuleResolution.js
index 04dc4289bb6..9a640bdfa5d 100644
--- a/tests/baselines/reference/externalModuleResolution.js
+++ b/tests/baselines/reference/externalModuleResolution.js
@@ -1,11 +1,5 @@
 //// [tests/cases/compiler/externalModuleResolution.ts] ////
 
-//// [foo.d.ts]
-declare module M1 {
-    export var X:number;
-}
-export = M1
-
 //// [foo.ts]
 module M2 {
     export var Y = 1;
diff --git a/tests/baselines/reference/externalModuleResolution2.js b/tests/baselines/reference/externalModuleResolution2.js
index 9d35f8e61e1..81a42f09f98 100644
--- a/tests/baselines/reference/externalModuleResolution2.js
+++ b/tests/baselines/reference/externalModuleResolution2.js
@@ -5,12 +5,6 @@ module M2 {
     export var X = 1;
 }
 export = M2
-
-//// [foo.d.ts]
-declare module M1 {
-    export var Y:number;
-}
-export = M1
 
 
 //// [consumer.ts]
diff --git a/tests/baselines/reference/externalModuleResolution2.types b/tests/baselines/reference/externalModuleResolution2.types
index df7c789a3fd..5bb0c8970c7 100644
--- a/tests/baselines/reference/externalModuleResolution2.types
+++ b/tests/baselines/reference/externalModuleResolution2.types
@@ -17,3 +17,4 @@ module M2 {
 export = M2
 >M2 : typeof M2
 
+
diff --git a/tests/baselines/reference/indexSignatureTypeInference.js b/tests/baselines/reference/indexSignatureTypeInference.js
deleted file mode 100644
index 73458f9f8d9..00000000000
--- a/tests/baselines/reference/indexSignatureTypeInference.js
+++ /dev/null
@@ -1,30 +0,0 @@
-//// [indexSignatureTypeInference.ts]
-interface NumberMap<T> {
-    [index: number]: T;
-}
-
-interface StringMap<T> {
-    [index: string]: T;
-}
-
-declare function numberMapToArray<T>(object: NumberMap<T>): T[];
-declare function stringMapToArray<T>(object: StringMap<T>): T[];
-
-var numberMap: NumberMap<Function>;
-var stringMap: StringMap<Function>;
-
-var v1: Function[];
-var v1 = numberMapToArray(numberMap);  // Ok
-var v1 = numberMapToArray(stringMap);  // Ok
-var v1 = stringMapToArray(numberMap);  // Error expected here
-var v1 = stringMapToArray(stringMap);  // Ok
-
-
-//// [indexSignatureTypeInference.js]
-var numberMap;
-var stringMap;
-var v1;
-var v1 = numberMapToArray(numberMap); // Ok
-var v1 = numberMapToArray(stringMap); // Ok
-var v1 = stringMapToArray(numberMap); // Error expected here
-var v1 = stringMapToArray(stringMap); // Ok
diff --git a/tests/baselines/reference/inheritedOverloadedSpecializedSignatures.js b/tests/baselines/reference/inheritedOverloadedSpecializedSignatures.js
deleted file mode 100644
index 792c9232fa2..00000000000
--- a/tests/baselines/reference/inheritedOverloadedSpecializedSignatures.js
+++ /dev/null
@@ -1,49 +0,0 @@
-//// [inheritedOverloadedSpecializedSignatures.ts]
-interface A {
-  (key:string):void;
-}
-
-interface B extends A {
-  (key:'foo'):string;
-}
-
-var b:B;
-// Should not error
-b('foo').charAt(0);
-
-interface A {
-    (x: 'A1'): string;
-    (x: string): void;
-}
-
-interface B extends A {
-    (x: 'B1'): number;
-}
-
-interface A {
-    (x: 'A2'): boolean;
-}
-
-interface B  {
-    (x: 'B2'): string[];
-}
-
-var b: B;
-// non of these lines should error
-var x1: string[] = b('B2'); 
-var x2: number = b('B1');
-var x3: boolean = b('A2');
-var x4: string = b('A1');
-var x5: void = b('A0');
-
-//// [inheritedOverloadedSpecializedSignatures.js]
-var b;
-// Should not error
-b('foo').charAt(0);
-var b;
-// non of these lines should error
-var x1 = b('B2');
-var x2 = b('B1');
-var x3 = b('A2');
-var x4 = b('A1');
-var x5 = b('A0');
diff --git a/tests/baselines/reference/moduleSymbolMerging.js b/tests/baselines/reference/moduleSymbolMerging.js
deleted file mode 100644
index 76d03997550..00000000000
--- a/tests/baselines/reference/moduleSymbolMerging.js
+++ /dev/null
@@ -1,43 +0,0 @@
-//// [tests/cases/compiler/moduleSymbolMerging.ts] ////
-
-//// [A.ts]
-
-module A { export interface I {} }
-
-//// [B.ts]
-///<reference path="A.ts" />
-module A { ; }
-module B {
-	export function f(): A.I { return null; }
-}
-
-
-
-//// [A.js]
-//// [B.js]
-///<reference path="A.ts" />
-var A;
-(function (A) {
-    ;
-})(A || (A = {}));
-var B;
-(function (B) {
-    function f() {
-        return null;
-    }
-    B.f = f;
-})(B || (B = {}));
-
-
-//// [A.d.ts]
-declare module A {
-    interface I {
-    }
-}
-//// [B.d.ts]
-/// <reference path='A.d.ts' />
-declare module A {
-}
-declare module B {
-    function f(): A.I;
-}
diff --git a/tests/baselines/reference/noImplicitAnyForIn.js b/tests/baselines/reference/noImplicitAnyForIn.js
deleted file mode 100644
index c8743936a9a..00000000000
--- a/tests/baselines/reference/noImplicitAnyForIn.js
+++ /dev/null
@@ -1,57 +0,0 @@
-//// [noImplicitAnyForIn.ts]
-
-var x: {}[] = [[1, 2, 3], ["hello"]];
-
-for (var i in x) {
-    for (var j in x[i]) {
-
-        //Should yield an implicit 'any' error
-        var _j = x[i][j];
-    }
-
-    for (var k in x[0]) {
-        var k1 = x[0];
-
-        //Should yield an implicit 'any' error
-        var k2 = k1[k];
-    }
-}
-
-for (var a in x) {
-    // Should yield an implicit 'any' error.
-    var b;
-
-    var c = a || b;
-}
-
-var idx = 0;
-var m = [1, 2, 3, 4, 5];
-// Should yield an implicit 'any' error.
-var n = [[]] || [];
-
-for (n[idx++] in m);
-
-//// [noImplicitAnyForIn.js]
-var x = [[1, 2, 3], ["hello"]];
-for (var i in x) {
-    for (var j in x[i]) {
-        //Should yield an implicit 'any' error
-        var _j = x[i][j];
-    }
-    for (var k in x[0]) {
-        var k1 = x[0];
-        //Should yield an implicit 'any' error
-        var k2 = k1[k];
-    }
-}
-for (var a in x) {
-    // Should yield an implicit 'any' error.
-    var b;
-    var c = a || b;
-}
-var idx = 0;
-var m = [1, 2, 3, 4, 5];
-// Should yield an implicit 'any' error.
-var n = [[]] || [];
-for (n[idx++] in m)
-    ;
diff --git a/tests/baselines/reference/noImplicitAnyIndexing.js b/tests/baselines/reference/noImplicitAnyIndexing.js
deleted file mode 100644
index ebadbd9a121..00000000000
--- a/tests/baselines/reference/noImplicitAnyIndexing.js
+++ /dev/null
@@ -1,82 +0,0 @@
-//// [noImplicitAnyIndexing.ts]
-
-enum MyEmusEnum {
-    emu
-}
-
-// Should be okay; should be a string.
-var strRepresentation1 = MyEmusEnum[0]
-
-// Should be okay; should be a string.
-var strRepresentation2 = MyEmusEnum[MyEmusEnum.emu]
-
-// Should be implicit 'any' ; property access fails, no string indexer.
-var strRepresentation3 = MyEmusEnum["monehh"];
-
-// Should be okay; should be a MyEmusEnum
-var strRepresentation4 = MyEmusEnum["emu"];
-
-
-// Should report an implicit 'any'.
-var x = {}["hi"];
-
-// Should report an implicit 'any'.
-var y = {}[10];
-
-
-var hi: any = "hi";
-
-var emptyObj = {};
-
-// Should report an implicit 'any'.
-var z1 = emptyObj[hi];
-var z2 = (<any>emptyObj)[hi];
-
-interface MyMap<T> {
-    [key: string]: T;
-}
-
-var m: MyMap<number> = {
-    "0": 0,
-    "1": 1,
-    "2": 2,
-    "Okay that's enough for today.": NaN
-};
-
-var mResult1 = m[MyEmusEnum.emu];
-var mResult2 = m[MyEmusEnum[MyEmusEnum.emu]];
-var mResult3 = m[hi];
-
-
-
-//// [noImplicitAnyIndexing.js]
-var MyEmusEnum;
-(function (MyEmusEnum) {
-    MyEmusEnum[MyEmusEnum["emu"] = 0] = "emu";
-})(MyEmusEnum || (MyEmusEnum = {}));
-// Should be okay; should be a string.
-var strRepresentation1 = MyEmusEnum[0];
-// Should be okay; should be a string.
-var strRepresentation2 = MyEmusEnum[0 /* emu */];
-// Should be implicit 'any' ; property access fails, no string indexer.
-var strRepresentation3 = MyEmusEnum["monehh"];
-// Should be okay; should be a MyEmusEnum
-var strRepresentation4 = MyEmusEnum["emu"];
-// Should report an implicit 'any'.
-var x = {}["hi"];
-// Should report an implicit 'any'.
-var y = {}[10];
-var hi = "hi";
-var emptyObj = {};
-// Should report an implicit 'any'.
-var z1 = emptyObj[hi];
-var z2 = emptyObj[hi];
-var m = {
-    "0": 0,
-    "1": 1,
-    "2": 2,
-    "Okay that's enough for today.": NaN
-};
-var mResult1 = m[0 /* emu */];
-var mResult2 = m[MyEmusEnum[0 /* emu */]];
-var mResult3 = m[hi];
diff --git a/tests/baselines/reference/noImplicitAnyParametersInBareFunctions.js b/tests/baselines/reference/noImplicitAnyParametersInBareFunctions.js
deleted file mode 100644
index 06848d7e89a..00000000000
--- a/tests/baselines/reference/noImplicitAnyParametersInBareFunctions.js
+++ /dev/null
@@ -1,102 +0,0 @@
-//// [noImplicitAnyParametersInBareFunctions.ts]
-
-// No implicit-'any' errors.
-function f1(): void { }
-
-// Implicit-'any' error for x.
-function f2(x): void { }
-
-// No implicit-'any' errors.
-function f3(x: any): void { }
-
-// Implicit-'any' errors for x, y, and z.
-function f4(x, y, z): void { }
-
-// Implicit-'any' errors for x, and z.
-function f5(x, y: any, z): void { }
-
-// Implicit-'any[]' error for r.
-function f6(...r): void { }
-
-// Implicit-'any'/'any[]' errors for x, r.
-function f7(x, ...r): void { }
-
-// Implicit-'any' errors for x1, y2, x3, and y3.
-function f8(x1, y1: number): any;
-function f8(x2: string, y2): any;
-function f8(x3, y3): any { } 
-
-// No implicit-'any' errors.
-var f9 = () => "";
-
-// Implicit-'any' errors for x.
-var f10 = (x) => "";
-
-// Implicit-'any' errors for x, y, and z.
-var f11 = (x, y, z) => "";
-
-// Implicit-'any' errors for x and z.
-var f12 = (x, y: any, z) => "";
-
-// Implicit-'any[]' error for r.
-var f13 = (...r) => "";
-
-// Implicit-'any'/'any[]' errors for x, r.
-var f14 = (x, ...r) => "";
-
-//// [noImplicitAnyParametersInBareFunctions.js]
-// No implicit-'any' errors.
-function f1() {
-}
-// Implicit-'any' error for x.
-function f2(x) {
-}
-// No implicit-'any' errors.
-function f3(x) {
-}
-// Implicit-'any' errors for x, y, and z.
-function f4(x, y, z) {
-}
-// Implicit-'any' errors for x, and z.
-function f5(x, y, z) {
-}
-// Implicit-'any[]' error for r.
-function f6() {
-    var r = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        r[_i - 0] = arguments[_i];
-    }
-}
-// Implicit-'any'/'any[]' errors for x, r.
-function f7(x) {
-    var r = [];
-    for (var _i = 1; _i < arguments.length; _i++) {
-        r[_i - 1] = arguments[_i];
-    }
-}
-function f8(x3, y3) {
-}
-// No implicit-'any' errors.
-var f9 = function () { return ""; };
-// Implicit-'any' errors for x.
-var f10 = function (x) { return ""; };
-// Implicit-'any' errors for x, y, and z.
-var f11 = function (x, y, z) { return ""; };
-// Implicit-'any' errors for x and z.
-var f12 = function (x, y, z) { return ""; };
-// Implicit-'any[]' error for r.
-var f13 = function () {
-    var r = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        r[_i - 0] = arguments[_i];
-    }
-    return "";
-};
-// Implicit-'any'/'any[]' errors for x, r.
-var f14 = function (x) {
-    var r = [];
-    for (var _i = 1; _i < arguments.length; _i++) {
-        r[_i - 1] = arguments[_i];
-    }
-    return "";
-};
diff --git a/tests/baselines/reference/noImplicitAnyParametersInClass.js b/tests/baselines/reference/noImplicitAnyParametersInClass.js
deleted file mode 100644
index 82164884b80..00000000000
--- a/tests/baselines/reference/noImplicitAnyParametersInClass.js
+++ /dev/null
@@ -1,211 +0,0 @@
-//// [noImplicitAnyParametersInClass.ts]
-
-class C {
-    // No implicit-'any' errors.
-    public pub_f1(): void { }
-
-    // Implicit-'any' errors for x.
-    public pub_f2(x): void { }
-
-    // No implicit-'any' errors.
-    public pub_f3(x: any): void { }
-
-    // Implicit-'any' errors for x, y, and z.
-    public pub_f4(x, y, z): void { }
-
-    // Implicit-'any' errors for x, and z.
-    public pub_f5(x, y: any, z): void { }
-
-    // Implicit-'any[]' errors for r.
-    public pub_f6(...r): void { }
-
-    // Implicit-'any'/'any[]' errors for x, r.
-    public pub_f7(x, ...r): void { }
-
-    // Implicit-'any' errors for x1, y2, x3, and y3.
-    public pub_f8(x1, y1: number): any;
-    public pub_f8(x2: string, y2): any;
-    public pub_f8(x3, y3): any { }
-
-    // No implicit-'any' errors.
-    public pub_f9 = () => "";
-
-    // Implicit-'any' errors for x.
-    public pub_f10 = (x) => "";
-
-    // Implicit-'any' errors for x, y, and z.
-    public pub_f11 = (x, y, z) => "";
-
-    // Implicit-'any' errors for x and z.
-    public pub_f12 = (x, y: any, z) => "";
-
-    // Implicit-'any[]' error for r.
-    public pub_f13 = (...r) => "";
-
-    // Implicit-'any'/'any[]' errors for x, r.
-    public pub_f14 = (x, ...r) => "";
-
-    ///////////////////////////////////////////
-
-    // No implicit-'any' errors.
-    private priv_f1(): void { }
-
-    // Implicit-'any' errors for x.
-    private priv_f2(x): void { }
-
-    // No implicit-'any' errors.
-    private priv_f3(x: any): void { }
-
-    // Implicit-'any' errors for x, y, and z.
-    private priv_f4(x, y, z): void { }
-
-    // Implicit-'any' errors for x, and z.
-    private priv_f5(x, y: any, z): void { }
-
-    // Implicit-'any[]' errors for r.
-    private priv_f6(...r): void { }
-
-    // Implicit-'any'/'any[]' errors for x, r.
-    private priv_f7(x, ...r): void { }
-
-    // Implicit-'any' errors for x1, y2, x3, and y3.
-    private priv_f8(x1, y1: number): any;
-    private priv_f8(x2: string, y2): any;
-    private priv_f8(x3, y3): any { }
-
-    // No implicit-'any' errors.
-    private priv_f9 = () => "";
-
-    // Implicit-'any' errors for x.
-    private priv_f10 = (x) => "";
-
-    // Implicit-'any' errors for x, y, and z.
-    private priv_f11 = (x, y, z) => "";
-
-    // Implicit-'any' errors for x and z.
-    private priv_f12 = (x, y: any, z) => "";
-
-    // Implicit-'any[]' error for r.
-    private priv_f13 = (...r) => "";
-
-    // Implicit-'any'/'any[]' errors for x, r.
-    private priv_f14 = (x, ...r) => "";
-}
-
-//// [noImplicitAnyParametersInClass.js]
-var C = (function () {
-    function C() {
-        // No implicit-'any' errors.
-        this.pub_f9 = function () { return ""; };
-        // Implicit-'any' errors for x.
-        this.pub_f10 = function (x) { return ""; };
-        // Implicit-'any' errors for x, y, and z.
-        this.pub_f11 = function (x, y, z) { return ""; };
-        // Implicit-'any' errors for x and z.
-        this.pub_f12 = function (x, y, z) { return ""; };
-        // Implicit-'any[]' error for r.
-        this.pub_f13 = function () {
-            var r = [];
-            for (var _i = 0; _i < arguments.length; _i++) {
-                r[_i - 0] = arguments[_i];
-            }
-            return "";
-        };
-        // Implicit-'any'/'any[]' errors for x, r.
-        this.pub_f14 = function (x) {
-            var r = [];
-            for (var _i = 1; _i < arguments.length; _i++) {
-                r[_i - 1] = arguments[_i];
-            }
-            return "";
-        };
-        // No implicit-'any' errors.
-        this.priv_f9 = function () { return ""; };
-        // Implicit-'any' errors for x.
-        this.priv_f10 = function (x) { return ""; };
-        // Implicit-'any' errors for x, y, and z.
-        this.priv_f11 = function (x, y, z) { return ""; };
-        // Implicit-'any' errors for x and z.
-        this.priv_f12 = function (x, y, z) { return ""; };
-        // Implicit-'any[]' error for r.
-        this.priv_f13 = function () {
-            var r = [];
-            for (var _i = 0; _i < arguments.length; _i++) {
-                r[_i - 0] = arguments[_i];
-            }
-            return "";
-        };
-        // Implicit-'any'/'any[]' errors for x, r.
-        this.priv_f14 = function (x) {
-            var r = [];
-            for (var _i = 1; _i < arguments.length; _i++) {
-                r[_i - 1] = arguments[_i];
-            }
-            return "";
-        };
-    }
-    // No implicit-'any' errors.
-    C.prototype.pub_f1 = function () {
-    };
-    // Implicit-'any' errors for x.
-    C.prototype.pub_f2 = function (x) {
-    };
-    // No implicit-'any' errors.
-    C.prototype.pub_f3 = function (x) {
-    };
-    // Implicit-'any' errors for x, y, and z.
-    C.prototype.pub_f4 = function (x, y, z) {
-    };
-    // Implicit-'any' errors for x, and z.
-    C.prototype.pub_f5 = function (x, y, z) {
-    };
-    // Implicit-'any[]' errors for r.
-    C.prototype.pub_f6 = function () {
-        var r = [];
-        for (var _i = 0; _i < arguments.length; _i++) {
-            r[_i - 0] = arguments[_i];
-        }
-    };
-    // Implicit-'any'/'any[]' errors for x, r.
-    C.prototype.pub_f7 = function (x) {
-        var r = [];
-        for (var _i = 1; _i < arguments.length; _i++) {
-            r[_i - 1] = arguments[_i];
-        }
-    };
-    C.prototype.pub_f8 = function (x3, y3) {
-    };
-    ///////////////////////////////////////////
-    // No implicit-'any' errors.
-    C.prototype.priv_f1 = function () {
-    };
-    // Implicit-'any' errors for x.
-    C.prototype.priv_f2 = function (x) {
-    };
-    // No implicit-'any' errors.
-    C.prototype.priv_f3 = function (x) {
-    };
-    // Implicit-'any' errors for x, y, and z.
-    C.prototype.priv_f4 = function (x, y, z) {
-    };
-    // Implicit-'any' errors for x, and z.
-    C.prototype.priv_f5 = function (x, y, z) {
-    };
-    // Implicit-'any[]' errors for r.
-    C.prototype.priv_f6 = function () {
-        var r = [];
-        for (var _i = 0; _i < arguments.length; _i++) {
-            r[_i - 0] = arguments[_i];
-        }
-    };
-    // Implicit-'any'/'any[]' errors for x, r.
-    C.prototype.priv_f7 = function (x) {
-        var r = [];
-        for (var _i = 1; _i < arguments.length; _i++) {
-            r[_i - 1] = arguments[_i];
-        }
-    };
-    C.prototype.priv_f8 = function (x3, y3) {
-    };
-    return C;
-})();
diff --git a/tests/baselines/reference/noImplicitAnyParametersInModule.js b/tests/baselines/reference/noImplicitAnyParametersInModule.js
deleted file mode 100644
index fccb16cefa7..00000000000
--- a/tests/baselines/reference/noImplicitAnyParametersInModule.js
+++ /dev/null
@@ -1,107 +0,0 @@
-//// [noImplicitAnyParametersInModule.ts]
-
-module M {
-    // No implicit-'any' errors.
-    function m_f1(): void { }
-
-    // Implicit-'any' error for x.
-    function m_f2(x): void { }
-
-    // No implicit-'any' errors.
-    function m_f3(x: any): void { }
-
-    // Implicit-'any' errors for x, y, and z.
-    function m_f4(x, y, z): void { }
-
-    // Implicit-'any' errors for x and z.
-    function m_f5(x, y: any, z): void { }
-
-    // Implicit-'any[]' error for r.
-    function m_f6(...r): void { }
-
-    // Implicit-'any'/'any[]' errors for x and r.
-    function m_f7(x, ...r): void { }
-
-    // Implicit-'any' errors for x1, y2, x3, and y3.
-    function m_f8(x1, y1: number): any;
-    function m_f8(x2: string, y2): any;
-    function m_f8(x3, y3): any { }
-
-    // No implicit-'any' errors.
-    var m_f9 = () => "";
-
-    // Implicit-'any' error for x.
-    var m_f10 = (x) => "";
-
-    // Implicit-'any' errors for x, y, and z.
-    var m_f11 = (x, y, z) => "";
-
-    // Implicit-'any' errors for x and z.
-    var m_f12 = (x, y: any, z) => "";
-
-    // Implicit-'any[]' errors for r.
-    var m_f13 = (...r) => "";
-
-    // Implicit-'any'/'any[]' errors for x and r.
-    var m_f14 = (x, ...r) => "";
-}
-
-//// [noImplicitAnyParametersInModule.js]
-var M;
-(function (M) {
-    // No implicit-'any' errors.
-    function m_f1() {
-    }
-    // Implicit-'any' error for x.
-    function m_f2(x) {
-    }
-    // No implicit-'any' errors.
-    function m_f3(x) {
-    }
-    // Implicit-'any' errors for x, y, and z.
-    function m_f4(x, y, z) {
-    }
-    // Implicit-'any' errors for x and z.
-    function m_f5(x, y, z) {
-    }
-    // Implicit-'any[]' error for r.
-    function m_f6() {
-        var r = [];
-        for (var _i = 0; _i < arguments.length; _i++) {
-            r[_i - 0] = arguments[_i];
-        }
-    }
-    // Implicit-'any'/'any[]' errors for x and r.
-    function m_f7(x) {
-        var r = [];
-        for (var _i = 1; _i < arguments.length; _i++) {
-            r[_i - 1] = arguments[_i];
-        }
-    }
-    function m_f8(x3, y3) {
-    }
-    // No implicit-'any' errors.
-    var m_f9 = function () { return ""; };
-    // Implicit-'any' error for x.
-    var m_f10 = function (x) { return ""; };
-    // Implicit-'any' errors for x, y, and z.
-    var m_f11 = function (x, y, z) { return ""; };
-    // Implicit-'any' errors for x and z.
-    var m_f12 = function (x, y, z) { return ""; };
-    // Implicit-'any[]' errors for r.
-    var m_f13 = function () {
-        var r = [];
-        for (var _i = 0; _i < arguments.length; _i++) {
-            r[_i - 0] = arguments[_i];
-        }
-        return "";
-    };
-    // Implicit-'any'/'any[]' errors for x and r.
-    var m_f14 = function (x) {
-        var r = [];
-        for (var _i = 1; _i < arguments.length; _i++) {
-            r[_i - 1] = arguments[_i];
-        }
-        return "";
-    };
-})(M || (M = {}));
diff --git a/tests/baselines/reference/parserS7.6.1.1_A1.10.js b/tests/baselines/reference/parserS7.6.1.1_A1.10.js
deleted file mode 100644
index 04e0076b16a..00000000000
--- a/tests/baselines/reference/parserS7.6.1.1_A1.10.js
+++ /dev/null
@@ -1,19 +0,0 @@
-//// [parserS7.6.1.1_A1.10.ts]
-// Copyright 2009 the Sputnik authors.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/**
- * The "for" token can not be used as identifier
- *
- * @path ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.10.js
- * @description Checking if execution of "for=1" fails
- * @negative
- */
-
-//for = 1;
-
-
-
-//// [parserS7.6.1.1_A1.10.js]
-// Copyright 2009 the Sputnik authors.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
diff --git a/tests/baselines/reference/parserSyntaxWalker.generated.js b/tests/baselines/reference/parserSyntaxWalker.generated.js
deleted file mode 100644
index 3b78baa0f74..00000000000
--- a/tests/baselines/reference/parserSyntaxWalker.generated.js
+++ /dev/null
@@ -1,291 +0,0 @@
-//// [parserSyntaxWalker.generated.ts]
-//declare module "fs" {
-//    export class File {
-//        constructor(filename: string);
-//        public ReadAllText(): string;
-//    }
-//    export interface IFile {
-//        [index: number]: string;
-//    }
-//}
-
-//import fs = module("fs");
-
-
-//module TypeScriptAllInOne {
-//    export class Program {
-//        static Main(...args: string[]) {
-//            try {
-//                var bfs = new BasicFeatures();
-//                var retValue: number = 0;
-
-//                retValue = bfs.VARIABLES();
-//                if (retValue != 0) {
-
-//                    return 1;
-//                }
-
-//                retValue = bfs.STATEMENTS(4);
-//                if (retValue != 0) {
-
-//                    return 1;
-//                }
-
-
-//                retValue = bfs.TYPES();
-//                if (retValue != 0) {
-
-//                    return 1;
-//                }
-
-//                retValue = bfs.OPERATOR();
-//                if (retValue != 0) {
-
-//                    return 1;
-//                }
-//            }
-//            catch (e) {
-//                console.log(e);
-//            }
-//            finally {
-
-//            }
-
-//            console.log('Done');
-
-//            return 0;
-
-//        }
-//    }
-
-//    class BasicFeatures {
-//        /// <summary>
-//        /// Test various of variables. Including nullable,key world as variable,special format
-//        /// </summary>
-//        /// <returns></returns>
-//        public VARIABLES(): number {
-//            var local = Number.MAX_VALUE;
-//            var min = Number.MIN_VALUE;
-//            var inf = Number.NEGATIVE_INFINITY;
-//            var nan = Number.NaN;
-//            var undef = undefined;
-
-//            var п = local;
-//            var м = local;
-
-//            var local5 = <fs.File>null;
-//            var local6 = local5 instanceof fs.File;
-
-//            var hex = 0xBADC0DE, Hex = 0XDEADBEEF;
-//            var float = 6.02e23, float2 = 6.02E-23
-//            var char = 'c', \u0066 = '\u0066', hexchar = '\x42';
-//            var quoted = '"', quoted2 = "'";
-//            var reg = /\w*/;
-//            var objLit = { "var": number = 42, equals: function (x) { return x["var"] === 42; }, toString: () => 'objLit{42}' };
-//            var weekday = Weekdays.Monday;
-
-//            var con = char + f + hexchar + float.toString() + float2.toString() + reg.toString() + objLit + weekday;
-
-//            //
-//            var any = 0;
-//            var boolean = 0;
-//            var declare = 0;
-//            var constructor = 0;
-//            var get = 0;
-//            var implements = 0;
-//            var interface = 0;
-//            var let = 0;
-//            var module = 0;
-//            var number = 0;
-//            var package = 0;
-//            var private = 0;
-//            var protected = 0;
-//            var public = 0;
-//            var set = 0;
-//            var static = 0;
-//            var string = 0;
-//            var yield = 0;
-
-//            var sum3 = any + boolean + declare + constructor + get + implements + interface + let + module + number + package + private + protected + public + set + static + string + yield;
-
-//            return 0;
-//        }
-
-//        /// <summary>
-//        /// Test different statements. Including if-else,swith,foreach,(un)checked,lock,using,try-catch-finally
-//        /// </summary>
-//        /// <param name="i"></param>
-//        /// <returns></returns>
-//        STATEMENTS(i: number): number {
-//            var retVal = 0;
-//            if (i == 1)
-//                retVal = 1;
-//            else
-//                retVal = 0;
-//            switch (i) {
-//                case 2:
-//                    retVal = 1;
-//                    break;
-//                case 3:
-//                    retVal = 1;
-//                    break;
-//                default:
-//                    break;
-//            }
-
-//            for (var x in { x: 0, y: 1 }) {
-//            }
-
-//            try {
-//                throw null;
-//            }
-//            catch (Exception) {
-//            }
-//            finally {
-//                try { }
-//                catch (Exception) { }
-//            }
-
-//            return retVal;
-//        }
-
-//        /// <summary>
-//        /// Test types in ts language. Including class,struct,interface,delegate,anonymous type
-//        /// </summary>
-//        /// <returns></returns>
-//        public TYPES(): number {
-//            var retVal = 0;
-//            var c = new CLASS();
-//            var xx: IF = c;
-//            retVal += c.Property;
-//            retVal += c.Member();
-//            retVal += xx ^= Foo() ? 0 : 1;
-
-//            //anonymous type
-//            var anony = { a: new CLASS() };
-
-//            retVal += anony.a.d();
-
-//            return retVal;
-//        }
-
-
-//        ///// <summary>
-//        ///// Test different operators
-//        ///// </summary>
-//        ///// <returns></returns>
-//        public OPERATOR(): number {
-//            var a: number[] = [1, 2, 3, 4,  implements , ];/*[] bug*/ // YES []
-//            var i = a[1];/*[]*/
-//            i = i + i - i * i / i % i & i | i ^ i;/*+ - * / % & | ^*/
-//            var b = true && false || true ^ false;/*& | ^*/
-//            b = !b;/*!*/
-//            i = ~i;/*~i*/
-//            b = i < (i -  continue ) && (i + 1) > i;/*< && >*/
-//            var f = true ? 1 : 0;/*? :*/   // YES :
-//            i++;/*++*/
-//            i--;/*--*/
-//            b = true && false || true;/*&& ||*/
-//            i = i << 5;/*<<*/
-//            i = i >> 5;/*>>*/
-//            var j = i;
-//            b = i == j && i != j && i <= j && i >= j;/*= == && != <= >=*/
-//            i += <number>5.0;/*+=*/
-//            i -= i;/*-=*/
-//            i *= i;/**=*/
-//            if (i == 0)
-//                i++;
-//            i /= i;/*/=*/
-//            i %= i;/*%=*/
-//            i &= i;/*&=*/
-//            i |= i;/*|=*/
-//            i ^= i;/*^=*/
-//            i <<= i;/*<<=*/
-//            i >>= i;/*>>=*/
-
-//            if (i == 0 && !b && f == 1)
-//                return 0;
-//            else return 1;
-//        }
-
-//    }
-
-//    interface IF {
-//        Foo <!-- ): boolean;
-//    }
-
-//    class CLASS implements IF {
-
-//        public d = () =>  '  return 0; };
-//        public get Property() { return 0; }
-//        public Member() {
-//            return 0;
-//        }
-//        public Foo(): boolean {
-//            var myEvent = () => { return 1; };
-//            if (myEvent() == 1)
-//                return true;
-//            else
-//                return false;
-//        }
-//    }
-
-
-//    // todo: use these
-//    class A {
-//        public method1(val:number) {
-//            return val;
-//        }
-//        public method2() {
-//            return 2 * this.method1(2);
-//        }
-//    }
-
-//    class B extends A {
-
-//        public method2() {
-//            return this.method1(2);
-//        }
-//    }
-
-//    class Overloading {
-
-//        private otherValue = 42;
-
-//        constructor(private value: number, public name: string) { }
-       
-//        public Overloads(value: string);
-//        public Overloads(value: string, ...rest: string[]) { }
-
-//        public DefaultValue(value?: string = "Hello") { }
-//    }
-//}
-
-//enum Weekdays {
-//    Monday,
-//    Tuesday,
-//    Weekend,
-//}
-
-//enum Fruit {
-//    Apple,
-//    Pear
-//}
-
-//interface IDisposable {
-//    Dispose(): void;
-//}
-
-//TypeScriptAllInOne.Program.Main();
-
-
-//// [parserSyntaxWalker.generated.js]
-//declare module "fs" {
-//    export class File {
-//        constructor(filename: string);
-//        public ReadAllText(): string;
-//    }
-//    export interface IFile {
-//        [index: number]: string;
-//    }
-//}
diff --git a/tests/baselines/reference/privacyCannotNameAccessorDeclFile.js b/tests/baselines/reference/privacyCannotNameAccessorDeclFile.js
deleted file mode 100644
index fb8a9c8e241..00000000000
--- a/tests/baselines/reference/privacyCannotNameAccessorDeclFile.js
+++ /dev/null
@@ -1,411 +0,0 @@
-//// [tests/cases/compiler/privacyCannotNameAccessorDeclFile.ts] ////
-
-//// [privacyCannotNameAccessorDeclFile_GlobalWidgets.ts]
-
-declare module "GlobalWidgets" {
-    export class Widget3 {
-        name: string;
-    }
-    export function createWidget3(): Widget3;
-
-    export module SpecializedGlobalWidget {
-        export class Widget4 {
-            name: string;
-        }
-        function createWidget4(): Widget4;
-    }
-}
-
-//// [privacyCannotNameAccessorDeclFile_Widgets.ts]
-export class Widget1 {
-    name = 'one';
-}
-export function createWidget1() {
-    return new Widget1();
-}
-
-export module SpecializedWidget {
-    export class Widget2 {
-        name = 'one';
-    }
-    export function createWidget2() {
-        return new Widget2();
-    }
-}
-
-//// [privacyCannotNameAccessorDeclFile_exporter.ts]
-///<reference path='privacyCannotNameAccessorDeclFile_GlobalWidgets.ts'/>
-import Widgets = require("privacyCannotNameAccessorDeclFile_Widgets");
-import Widgets1 = require("GlobalWidgets");
-export function createExportedWidget1() {
-    return Widgets.createWidget1();
-}
-export function createExportedWidget2() {
-    return Widgets.SpecializedWidget.createWidget2();
-}
-export function createExportedWidget3() {
-    return Widgets1.createWidget3();
-}
-export function createExportedWidget4() {
-    return Widgets1.SpecializedGlobalWidget.createWidget4();
-}
-
-//// [privacyCannotNameAccessorDeclFile_consumer.ts]
-import exporter = require("privacyCannotNameAccessorDeclFile_exporter");
-export class publicClassWithWithPrivateGetAccessorTypes {
-    static get myPublicStaticMethod() { // Error
-        return exporter.createExportedWidget1();
-    }
-    private static get myPrivateStaticMethod() {
-        return exporter.createExportedWidget1();
-    }
-    get myPublicMethod() { // Error
-        return exporter.createExportedWidget1();
-    }
-    private get myPrivateMethod() {
-        return exporter.createExportedWidget1();
-    }
-    static get myPublicStaticMethod1() { // Error
-        return exporter.createExportedWidget3();
-    }
-    private static get myPrivateStaticMethod1() {
-        return exporter.createExportedWidget3();
-    }
-    get myPublicMethod1() { // Error
-        return exporter.createExportedWidget3();
-    }
-    private get myPrivateMethod1() {
-        return exporter.createExportedWidget3();
-    }
-}
-
-class privateClassWithWithPrivateGetAccessorTypes {
-    static get myPublicStaticMethod() { 
-        return exporter.createExportedWidget1();
-    }
-    private static get myPrivateStaticMethod() {
-        return exporter.createExportedWidget1();
-    }
-    get myPublicMethod() { 
-        return exporter.createExportedWidget1();
-    }
-    private get myPrivateMethod() {
-        return exporter.createExportedWidget1();
-    }
-    static get myPublicStaticMethod1() { 
-        return exporter.createExportedWidget3();
-    }
-    private static get myPrivateStaticMethod1() {
-        return exporter.createExportedWidget3();
-    }
-    get myPublicMethod1() { 
-        return exporter.createExportedWidget3();
-    }
-    private get myPrivateMethod1() {
-        return exporter.createExportedWidget3();
-    }
-}
-
-export class publicClassWithPrivateModuleGetAccessorTypes {
-    static get myPublicStaticMethod() { // Error
-        return exporter.createExportedWidget2();
-    }
-    get myPublicMethod() { // Error
-        return exporter.createExportedWidget2();
-    }
-    static get myPublicStaticMethod1() { // Error
-        return exporter.createExportedWidget4();
-    }
-    get myPublicMethod1() { // Error
-        return exporter.createExportedWidget4();
-    }
-}
-
-class privateClassWithPrivateModuleGetAccessorTypes {
-    static get myPublicStaticMethod() { 
-        return exporter.createExportedWidget2();
-    }
-    get myPublicMethod() { 
-        return exporter.createExportedWidget2();
-    }
-    static get myPublicStaticMethod1() { 
-        return exporter.createExportedWidget4();
-    }
-    get myPublicMethod1() { 
-        return exporter.createExportedWidget4();
-    }
-}
-
-//// [privacyCannotNameAccessorDeclFile_GlobalWidgets.js]
-//// [privacyCannotNameAccessorDeclFile_Widgets.js]
-var Widget1 = (function () {
-    function Widget1() {
-        this.name = 'one';
-    }
-    return Widget1;
-})();
-exports.Widget1 = Widget1;
-function createWidget1() {
-    return new Widget1();
-}
-exports.createWidget1 = createWidget1;
-(function (SpecializedWidget) {
-    var Widget2 = (function () {
-        function Widget2() {
-            this.name = 'one';
-        }
-        return Widget2;
-    })();
-    SpecializedWidget.Widget2 = Widget2;
-    function createWidget2() {
-        return new Widget2();
-    }
-    SpecializedWidget.createWidget2 = createWidget2;
-})(exports.SpecializedWidget || (exports.SpecializedWidget = {}));
-var SpecializedWidget = exports.SpecializedWidget;
-//// [privacyCannotNameAccessorDeclFile_exporter.js]
-///<reference path='privacyCannotNameAccessorDeclFile_GlobalWidgets.ts'/>
-var Widgets = require("privacyCannotNameAccessorDeclFile_Widgets");
-var Widgets1 = require("GlobalWidgets");
-function createExportedWidget1() {
-    return Widgets.createWidget1();
-}
-exports.createExportedWidget1 = createExportedWidget1;
-function createExportedWidget2() {
-    return Widgets.SpecializedWidget.createWidget2();
-}
-exports.createExportedWidget2 = createExportedWidget2;
-function createExportedWidget3() {
-    return Widgets1.createWidget3();
-}
-exports.createExportedWidget3 = createExportedWidget3;
-function createExportedWidget4() {
-    return Widgets1.SpecializedGlobalWidget.createWidget4();
-}
-exports.createExportedWidget4 = createExportedWidget4;
-//// [privacyCannotNameAccessorDeclFile_consumer.js]
-var exporter = require("privacyCannotNameAccessorDeclFile_exporter");
-var publicClassWithWithPrivateGetAccessorTypes = (function () {
-    function publicClassWithWithPrivateGetAccessorTypes() {
-    }
-    Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes, "myPublicStaticMethod", {
-        get: function () {
-            return exporter.createExportedWidget1();
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes, "myPrivateStaticMethod", {
-        get: function () {
-            return exporter.createExportedWidget1();
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes.prototype, "myPublicMethod", {
-        get: function () {
-            return exporter.createExportedWidget1();
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes.prototype, "myPrivateMethod", {
-        get: function () {
-            return exporter.createExportedWidget1();
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes, "myPublicStaticMethod1", {
-        get: function () {
-            return exporter.createExportedWidget3();
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes, "myPrivateStaticMethod1", {
-        get: function () {
-            return exporter.createExportedWidget3();
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes.prototype, "myPublicMethod1", {
-        get: function () {
-            return exporter.createExportedWidget3();
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes.prototype, "myPrivateMethod1", {
-        get: function () {
-            return exporter.createExportedWidget3();
-        },
-        enumerable: true,
-        configurable: true
-    });
-    return publicClassWithWithPrivateGetAccessorTypes;
-})();
-exports.publicClassWithWithPrivateGetAccessorTypes = publicClassWithWithPrivateGetAccessorTypes;
-var privateClassWithWithPrivateGetAccessorTypes = (function () {
-    function privateClassWithWithPrivateGetAccessorTypes() {
-    }
-    Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes, "myPublicStaticMethod", {
-        get: function () {
-            return exporter.createExportedWidget1();
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes, "myPrivateStaticMethod", {
-        get: function () {
-            return exporter.createExportedWidget1();
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes.prototype, "myPublicMethod", {
-        get: function () {
-            return exporter.createExportedWidget1();
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes.prototype, "myPrivateMethod", {
-        get: function () {
-            return exporter.createExportedWidget1();
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes, "myPublicStaticMethod1", {
-        get: function () {
-            return exporter.createExportedWidget3();
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes, "myPrivateStaticMethod1", {
-        get: function () {
-            return exporter.createExportedWidget3();
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes.prototype, "myPublicMethod1", {
-        get: function () {
-            return exporter.createExportedWidget3();
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes.prototype, "myPrivateMethod1", {
-        get: function () {
-            return exporter.createExportedWidget3();
-        },
-        enumerable: true,
-        configurable: true
-    });
-    return privateClassWithWithPrivateGetAccessorTypes;
-})();
-var publicClassWithPrivateModuleGetAccessorTypes = (function () {
-    function publicClassWithPrivateModuleGetAccessorTypes() {
-    }
-    Object.defineProperty(publicClassWithPrivateModuleGetAccessorTypes, "myPublicStaticMethod", {
-        get: function () {
-            return exporter.createExportedWidget2();
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(publicClassWithPrivateModuleGetAccessorTypes.prototype, "myPublicMethod", {
-        get: function () {
-            return exporter.createExportedWidget2();
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(publicClassWithPrivateModuleGetAccessorTypes, "myPublicStaticMethod1", {
-        get: function () {
-            return exporter.createExportedWidget4();
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(publicClassWithPrivateModuleGetAccessorTypes.prototype, "myPublicMethod1", {
-        get: function () {
-            return exporter.createExportedWidget4();
-        },
-        enumerable: true,
-        configurable: true
-    });
-    return publicClassWithPrivateModuleGetAccessorTypes;
-})();
-exports.publicClassWithPrivateModuleGetAccessorTypes = publicClassWithPrivateModuleGetAccessorTypes;
-var privateClassWithPrivateModuleGetAccessorTypes = (function () {
-    function privateClassWithPrivateModuleGetAccessorTypes() {
-    }
-    Object.defineProperty(privateClassWithPrivateModuleGetAccessorTypes, "myPublicStaticMethod", {
-        get: function () {
-            return exporter.createExportedWidget2();
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(privateClassWithPrivateModuleGetAccessorTypes.prototype, "myPublicMethod", {
-        get: function () {
-            return exporter.createExportedWidget2();
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(privateClassWithPrivateModuleGetAccessorTypes, "myPublicStaticMethod1", {
-        get: function () {
-            return exporter.createExportedWidget4();
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(privateClassWithPrivateModuleGetAccessorTypes.prototype, "myPublicMethod1", {
-        get: function () {
-            return exporter.createExportedWidget4();
-        },
-        enumerable: true,
-        configurable: true
-    });
-    return privateClassWithPrivateModuleGetAccessorTypes;
-})();
-
-
-//// [privacyCannotNameAccessorDeclFile_GlobalWidgets.d.ts]
-declare module "GlobalWidgets" {
-    class Widget3 {
-        name: string;
-    }
-    function createWidget3(): Widget3;
-    module SpecializedGlobalWidget {
-        class Widget4 {
-            name: string;
-        }
-        function createWidget4(): Widget4;
-    }
-}
-//// [privacyCannotNameAccessorDeclFile_Widgets.d.ts]
-export declare class Widget1 {
-    name: string;
-}
-export declare function createWidget1(): Widget1;
-export declare module SpecializedWidget {
-    class Widget2 {
-        name: string;
-    }
-    function createWidget2(): Widget2;
-}
-//// [privacyCannotNameAccessorDeclFile_exporter.d.ts]
-/// <reference path='privacyCannotNameAccessorDeclFile_GlobalWidgets.d.ts' />
-import Widgets = require("privacyCannotNameAccessorDeclFile_Widgets");
-import Widgets1 = require("GlobalWidgets");
-export declare function createExportedWidget1(): Widgets.Widget1;
-export declare function createExportedWidget2(): Widgets.SpecializedWidget.Widget2;
-export declare function createExportedWidget3(): Widgets1.Widget3;
-export declare function createExportedWidget4(): Widgets1.SpecializedGlobalWidget.Widget4;
diff --git a/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.js b/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.js
deleted file mode 100644
index f4436174dc5..00000000000
--- a/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.js
+++ /dev/null
@@ -1,239 +0,0 @@
-//// [tests/cases/compiler/privacyCannotNameVarTypeDeclFile.ts] ////
-
-//// [privacyCannotNameVarTypeDeclFile_GlobalWidgets.ts]
-
-
-declare module "GlobalWidgets" {
-    export class Widget3 {
-        name: string;
-    }
-    export function createWidget3(): Widget3;
-
-    export module SpecializedGlobalWidget {
-        export class Widget4 {
-            name: string;
-        }
-        function createWidget4(): Widget4;
-    }
-}
-
-//// [privacyCannotNameVarTypeDeclFile_Widgets.ts]
-export class Widget1 {
-    name = 'one';
-}
-export function createWidget1() {
-    return new Widget1();
-}
-
-export module SpecializedWidget {
-    export class Widget2 {
-        name = 'one';
-    }
-    export function createWidget2() {
-        return new Widget2();
-    }
-}
-
-//// [privacyCannotNameVarTypeDeclFile_exporter.ts]
-///<reference path='privacyCannotNameVarTypeDeclFile_GlobalWidgets.ts'/>
-import Widgets = require("privacyCannotNameVarTypeDeclFile_Widgets");
-import Widgets1 = require("GlobalWidgets");
-export function createExportedWidget1() {
-    return Widgets.createWidget1();
-}
-export function createExportedWidget2() {
-    return Widgets.SpecializedWidget.createWidget2();
-}
-export function createExportedWidget3() {
-    return Widgets1.createWidget3();
-}
-export function createExportedWidget4() {
-    return Widgets1.SpecializedGlobalWidget.createWidget4();
-}
-
-//// [privacyCannotNameVarTypeDeclFile_consumer.ts]
-import exporter = require("privacyCannotNameVarTypeDeclFile_exporter");
-export class publicClassWithWithPrivatePropertyTypes {
-    static myPublicStaticProperty = exporter.createExportedWidget1(); // Error
-    private static myPrivateStaticProperty = exporter.createExportedWidget1();
-    myPublicProperty = exporter.createExportedWidget1(); // Error
-    private myPrivateProperty = exporter.createExportedWidget1();
-
-    static myPublicStaticProperty1 = exporter.createExportedWidget3(); // Error
-    private static myPrivateStaticProperty1 = exporter.createExportedWidget3();
-    myPublicProperty1 = exporter.createExportedWidget3(); // Error
-    private myPrivateProperty1 = exporter.createExportedWidget3();
-}
-
-class privateClassWithWithPrivatePropertyTypes {
-    static myPublicStaticProperty = exporter.createExportedWidget1(); 
-    private static myPrivateStaticProperty = exporter.createExportedWidget1();
-    myPublicProperty = exporter.createExportedWidget1(); 
-    private myPrivateProperty = exporter.createExportedWidget1();
-
-    static myPublicStaticProperty1 = exporter.createExportedWidget3(); 
-    private static myPrivateStaticProperty1 = exporter.createExportedWidget3();
-    myPublicProperty1 = exporter.createExportedWidget3(); 
-    private myPrivateProperty1 = exporter.createExportedWidget3();
-}
-
-export var publicVarWithPrivatePropertyTypes= exporter.createExportedWidget1(); // Error
-var privateVarWithPrivatePropertyTypes= exporter.createExportedWidget1();
-export var publicVarWithPrivatePropertyTypes1 = exporter.createExportedWidget3(); // Error
-var privateVarWithPrivatePropertyTypes1 = exporter.createExportedWidget3();
-
-export class publicClassWithPrivateModulePropertyTypes {
-    static myPublicStaticProperty= exporter.createExportedWidget2(); // Error
-    myPublicProperty = exporter.createExportedWidget2(); // Error
-    static myPublicStaticProperty1 = exporter.createExportedWidget4(); // Error
-    myPublicProperty1 = exporter.createExportedWidget4(); // Error
-}
-export var publicVarWithPrivateModulePropertyTypes= exporter.createExportedWidget2(); // Error
-export var publicVarWithPrivateModulePropertyTypes1 = exporter.createExportedWidget4(); // Error
-
-class privateClassWithPrivateModulePropertyTypes {
-    static myPublicStaticProperty= exporter.createExportedWidget2();
-    myPublicProperty= exporter.createExportedWidget2();
-    static myPublicStaticProperty1 = exporter.createExportedWidget4();
-    myPublicProperty1 = exporter.createExportedWidget4();
-}
-var privateVarWithPrivateModulePropertyTypes= exporter.createExportedWidget2();
-var privateVarWithPrivateModulePropertyTypes1 = exporter.createExportedWidget4();
-
-//// [privacyCannotNameVarTypeDeclFile_GlobalWidgets.js]
-//// [privacyCannotNameVarTypeDeclFile_Widgets.js]
-var Widget1 = (function () {
-    function Widget1() {
-        this.name = 'one';
-    }
-    return Widget1;
-})();
-exports.Widget1 = Widget1;
-function createWidget1() {
-    return new Widget1();
-}
-exports.createWidget1 = createWidget1;
-(function (SpecializedWidget) {
-    var Widget2 = (function () {
-        function Widget2() {
-            this.name = 'one';
-        }
-        return Widget2;
-    })();
-    SpecializedWidget.Widget2 = Widget2;
-    function createWidget2() {
-        return new Widget2();
-    }
-    SpecializedWidget.createWidget2 = createWidget2;
-})(exports.SpecializedWidget || (exports.SpecializedWidget = {}));
-var SpecializedWidget = exports.SpecializedWidget;
-//// [privacyCannotNameVarTypeDeclFile_exporter.js]
-///<reference path='privacyCannotNameVarTypeDeclFile_GlobalWidgets.ts'/>
-var Widgets = require("privacyCannotNameVarTypeDeclFile_Widgets");
-var Widgets1 = require("GlobalWidgets");
-function createExportedWidget1() {
-    return Widgets.createWidget1();
-}
-exports.createExportedWidget1 = createExportedWidget1;
-function createExportedWidget2() {
-    return Widgets.SpecializedWidget.createWidget2();
-}
-exports.createExportedWidget2 = createExportedWidget2;
-function createExportedWidget3() {
-    return Widgets1.createWidget3();
-}
-exports.createExportedWidget3 = createExportedWidget3;
-function createExportedWidget4() {
-    return Widgets1.SpecializedGlobalWidget.createWidget4();
-}
-exports.createExportedWidget4 = createExportedWidget4;
-//// [privacyCannotNameVarTypeDeclFile_consumer.js]
-var exporter = require("privacyCannotNameVarTypeDeclFile_exporter");
-var publicClassWithWithPrivatePropertyTypes = (function () {
-    function publicClassWithWithPrivatePropertyTypes() {
-        this.myPublicProperty = exporter.createExportedWidget1(); // Error
-        this.myPrivateProperty = exporter.createExportedWidget1();
-        this.myPublicProperty1 = exporter.createExportedWidget3(); // Error
-        this.myPrivateProperty1 = exporter.createExportedWidget3();
-    }
-    publicClassWithWithPrivatePropertyTypes.myPublicStaticProperty = exporter.createExportedWidget1(); // Error
-    publicClassWithWithPrivatePropertyTypes.myPrivateStaticProperty = exporter.createExportedWidget1();
-    publicClassWithWithPrivatePropertyTypes.myPublicStaticProperty1 = exporter.createExportedWidget3(); // Error
-    publicClassWithWithPrivatePropertyTypes.myPrivateStaticProperty1 = exporter.createExportedWidget3();
-    return publicClassWithWithPrivatePropertyTypes;
-})();
-exports.publicClassWithWithPrivatePropertyTypes = publicClassWithWithPrivatePropertyTypes;
-var privateClassWithWithPrivatePropertyTypes = (function () {
-    function privateClassWithWithPrivatePropertyTypes() {
-        this.myPublicProperty = exporter.createExportedWidget1();
-        this.myPrivateProperty = exporter.createExportedWidget1();
-        this.myPublicProperty1 = exporter.createExportedWidget3();
-        this.myPrivateProperty1 = exporter.createExportedWidget3();
-    }
-    privateClassWithWithPrivatePropertyTypes.myPublicStaticProperty = exporter.createExportedWidget1();
-    privateClassWithWithPrivatePropertyTypes.myPrivateStaticProperty = exporter.createExportedWidget1();
-    privateClassWithWithPrivatePropertyTypes.myPublicStaticProperty1 = exporter.createExportedWidget3();
-    privateClassWithWithPrivatePropertyTypes.myPrivateStaticProperty1 = exporter.createExportedWidget3();
-    return privateClassWithWithPrivatePropertyTypes;
-})();
-exports.publicVarWithPrivatePropertyTypes = exporter.createExportedWidget1(); // Error
-var privateVarWithPrivatePropertyTypes = exporter.createExportedWidget1();
-exports.publicVarWithPrivatePropertyTypes1 = exporter.createExportedWidget3(); // Error
-var privateVarWithPrivatePropertyTypes1 = exporter.createExportedWidget3();
-var publicClassWithPrivateModulePropertyTypes = (function () {
-    function publicClassWithPrivateModulePropertyTypes() {
-        this.myPublicProperty = exporter.createExportedWidget2(); // Error
-        this.myPublicProperty1 = exporter.createExportedWidget4(); // Error
-    }
-    publicClassWithPrivateModulePropertyTypes.myPublicStaticProperty = exporter.createExportedWidget2(); // Error
-    publicClassWithPrivateModulePropertyTypes.myPublicStaticProperty1 = exporter.createExportedWidget4(); // Error
-    return publicClassWithPrivateModulePropertyTypes;
-})();
-exports.publicClassWithPrivateModulePropertyTypes = publicClassWithPrivateModulePropertyTypes;
-exports.publicVarWithPrivateModulePropertyTypes = exporter.createExportedWidget2(); // Error
-exports.publicVarWithPrivateModulePropertyTypes1 = exporter.createExportedWidget4(); // Error
-var privateClassWithPrivateModulePropertyTypes = (function () {
-    function privateClassWithPrivateModulePropertyTypes() {
-        this.myPublicProperty = exporter.createExportedWidget2();
-        this.myPublicProperty1 = exporter.createExportedWidget4();
-    }
-    privateClassWithPrivateModulePropertyTypes.myPublicStaticProperty = exporter.createExportedWidget2();
-    privateClassWithPrivateModulePropertyTypes.myPublicStaticProperty1 = exporter.createExportedWidget4();
-    return privateClassWithPrivateModulePropertyTypes;
-})();
-var privateVarWithPrivateModulePropertyTypes = exporter.createExportedWidget2();
-var privateVarWithPrivateModulePropertyTypes1 = exporter.createExportedWidget4();
-
-
-//// [privacyCannotNameVarTypeDeclFile_GlobalWidgets.d.ts]
-declare module "GlobalWidgets" {
-    class Widget3 {
-        name: string;
-    }
-    function createWidget3(): Widget3;
-    module SpecializedGlobalWidget {
-        class Widget4 {
-            name: string;
-        }
-        function createWidget4(): Widget4;
-    }
-}
-//// [privacyCannotNameVarTypeDeclFile_Widgets.d.ts]
-export declare class Widget1 {
-    name: string;
-}
-export declare function createWidget1(): Widget1;
-export declare module SpecializedWidget {
-    class Widget2 {
-        name: string;
-    }
-    function createWidget2(): Widget2;
-}
-//// [privacyCannotNameVarTypeDeclFile_exporter.d.ts]
-/// <reference path='privacyCannotNameVarTypeDeclFile_GlobalWidgets.d.ts' />
-import Widgets = require("privacyCannotNameVarTypeDeclFile_Widgets");
-import Widgets1 = require("GlobalWidgets");
-export declare function createExportedWidget1(): Widgets.Widget1;
-export declare function createExportedWidget2(): Widgets.SpecializedWidget.Widget2;
-export declare function createExportedWidget3(): Widgets1.Widget3;
-export declare function createExportedWidget4(): Widgets1.SpecializedGlobalWidget.Widget4;
diff --git a/tests/baselines/reference/privacyFunctionCannotNameParameterTypeDeclFile.js b/tests/baselines/reference/privacyFunctionCannotNameParameterTypeDeclFile.js
deleted file mode 100644
index 42250b88e89..00000000000
--- a/tests/baselines/reference/privacyFunctionCannotNameParameterTypeDeclFile.js
+++ /dev/null
@@ -1,425 +0,0 @@
-//// [tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile.ts] ////
-
-//// [privacyFunctionCannotNameParameterTypeDeclFile_GlobalWidgets.ts]
-
-
-declare module "GlobalWidgets" {
-    export class Widget3 {
-        name: string;
-    }
-    export function createWidget3(): Widget3;
-
-    export module SpecializedGlobalWidget {
-        export class Widget4 {
-            name: string;
-        }
-        function createWidget4(): Widget4;
-    }
-}
-
-//// [privacyFunctionCannotNameParameterTypeDeclFile_Widgets.ts]
-export class Widget1 {
-    name = 'one';
-}
-export function createWidget1() {
-    return new Widget1();
-}
-
-export module SpecializedWidget {
-    export class Widget2 {
-        name = 'one';
-    }
-    export function createWidget2() {
-        return new Widget2();
-    }
-}
-
-//// [privacyFunctionCannotNameParameterTypeDeclFile_exporter.ts]
-///<reference path='privacyFunctionCannotNameParameterTypeDeclFile_GlobalWidgets.ts'/>
-import Widgets = require("privacyFunctionCannotNameParameterTypeDeclFile_Widgets");
-import Widgets1 = require("GlobalWidgets");
-export function createExportedWidget1() {
-    return Widgets.createWidget1();
-}
-export function createExportedWidget2() {
-    return Widgets.SpecializedWidget.createWidget2();
-}
-export function createExportedWidget3() {
-    return Widgets1.createWidget3();
-}
-export function createExportedWidget4() {
-    return Widgets1.SpecializedGlobalWidget.createWidget4();
-}
-
-//// [privacyFunctionCannotNameParameterTypeDeclFile_consumer.ts]
-import exporter = require("privacyFunctionCannotNameParameterTypeDeclFile_exporter");
-export class publicClassWithWithPrivateParmeterTypes {
-    static myPublicStaticMethod(param = exporter.createExportedWidget1()) { // Error
-    }
-    private static myPrivateStaticMethod(param = exporter.createExportedWidget1()) {
-    }
-    myPublicMethod(param  = exporter.createExportedWidget1()) { // Error
-    }
-    private myPrivateMethod(param = exporter.createExportedWidget1()) {
-    }
-    constructor(param = exporter.createExportedWidget1(), private param1 = exporter.createExportedWidget1(), public param2 = exporter.createExportedWidget1()) { // Error
-    }
-}
-export class publicClassWithWithPrivateParmeterTypes1 {
-    static myPublicStaticMethod(param = exporter.createExportedWidget3()) { // Error
-    }
-    private static myPrivateStaticMethod(param = exporter.createExportedWidget3()) {
-    }
-    myPublicMethod(param  = exporter.createExportedWidget3()) { // Error
-    }
-    private myPrivateMethod(param = exporter.createExportedWidget3()) {
-    }
-    constructor(param = exporter.createExportedWidget3(), private param1 = exporter.createExportedWidget3(), public param2 = exporter.createExportedWidget3()) { // Error
-    }
-}
-
-class privateClassWithWithPrivateParmeterTypes {
-    static myPublicStaticMethod(param = exporter.createExportedWidget1()) {
-    }
-    private static myPrivateStaticMethod(param = exporter.createExportedWidget1()) {
-    }
-    myPublicMethod(param  = exporter.createExportedWidget1()) {
-    }
-    private myPrivateMethod(param = exporter.createExportedWidget1()) {
-    }
-    constructor(param = exporter.createExportedWidget1(), private param1 = exporter.createExportedWidget1(), public param2 = exporter.createExportedWidget1()) {
-    }
-}
-class privateClassWithWithPrivateParmeterTypes2 {
-    static myPublicStaticMethod(param = exporter.createExportedWidget3()) {
-    }
-    private static myPrivateStaticMethod(param = exporter.createExportedWidget3()) {
-    }
-    myPublicMethod(param  = exporter.createExportedWidget3()) {
-    }
-    private myPrivateMethod(param = exporter.createExportedWidget3()) {
-    }
-    constructor(param = exporter.createExportedWidget3(), private param1 = exporter.createExportedWidget3(), public param2 = exporter.createExportedWidget3()) {
-    }
-}
-
-export function publicFunctionWithPrivateParmeterTypes(param = exporter.createExportedWidget1()) { // Error
-}
-function privateFunctionWithPrivateParmeterTypes(param = exporter.createExportedWidget1()) {
-}
-export function publicFunctionWithPrivateParmeterTypes1(param = exporter.createExportedWidget3()) { // Error
-}
-function privateFunctionWithPrivateParmeterTypes1(param = exporter.createExportedWidget3()) {
-}
-
-
-export class publicClassWithPrivateModuleParameterTypes {
-    static myPublicStaticMethod(param= exporter.createExportedWidget2()) { // Error
-    }
-    myPublicMethod(param= exporter.createExportedWidget2()) { // Error
-    }
-    constructor(param= exporter.createExportedWidget2(), private param1= exporter.createExportedWidget2(), public param2= exporter.createExportedWidget2()) { // Error
-    }
-}
-export class publicClassWithPrivateModuleParameterTypes2 {
-    static myPublicStaticMethod(param= exporter.createExportedWidget4()) { // Error
-    }
-    myPublicMethod(param= exporter.createExportedWidget4()) { // Error
-    }
-    constructor(param= exporter.createExportedWidget4(), private param1= exporter.createExportedWidget4(), public param2= exporter.createExportedWidget4()) { // Error
-    }
-}
-export function publicFunctionWithPrivateModuleParameterTypes(param= exporter.createExportedWidget2()) { // Error
-}
-export function publicFunctionWithPrivateModuleParameterTypes1(param= exporter.createExportedWidget4()) { // Error
-}
-
-
-class privateClassWithPrivateModuleParameterTypes {
-    static myPublicStaticMethod(param= exporter.createExportedWidget2()) {
-    }
-    myPublicMethod(param= exporter.createExportedWidget2()) {
-    }
-    constructor(param= exporter.createExportedWidget2(), private param1= exporter.createExportedWidget2(), public param2= exporter.createExportedWidget2()) {
-    }
-}
-class privateClassWithPrivateModuleParameterTypes1 {
-    static myPublicStaticMethod(param= exporter.createExportedWidget4()) {
-    }
-    myPublicMethod(param= exporter.createExportedWidget4()) {
-    }
-    constructor(param= exporter.createExportedWidget4(), private param1= exporter.createExportedWidget4(), public param2= exporter.createExportedWidget4()) {
-    }
-}
-function privateFunctionWithPrivateModuleParameterTypes(param= exporter.createExportedWidget2()) {
-}
-function privateFunctionWithPrivateModuleParameterTypes1(param= exporter.createExportedWidget4()) {
-}
-
-//// [privacyFunctionCannotNameParameterTypeDeclFile_GlobalWidgets.js]
-//// [privacyFunctionCannotNameParameterTypeDeclFile_Widgets.js]
-var Widget1 = (function () {
-    function Widget1() {
-        this.name = 'one';
-    }
-    return Widget1;
-})();
-exports.Widget1 = Widget1;
-function createWidget1() {
-    return new Widget1();
-}
-exports.createWidget1 = createWidget1;
-(function (SpecializedWidget) {
-    var Widget2 = (function () {
-        function Widget2() {
-            this.name = 'one';
-        }
-        return Widget2;
-    })();
-    SpecializedWidget.Widget2 = Widget2;
-    function createWidget2() {
-        return new Widget2();
-    }
-    SpecializedWidget.createWidget2 = createWidget2;
-})(exports.SpecializedWidget || (exports.SpecializedWidget = {}));
-var SpecializedWidget = exports.SpecializedWidget;
-//// [privacyFunctionCannotNameParameterTypeDeclFile_exporter.js]
-///<reference path='privacyFunctionCannotNameParameterTypeDeclFile_GlobalWidgets.ts'/>
-var Widgets = require("privacyFunctionCannotNameParameterTypeDeclFile_Widgets");
-var Widgets1 = require("GlobalWidgets");
-function createExportedWidget1() {
-    return Widgets.createWidget1();
-}
-exports.createExportedWidget1 = createExportedWidget1;
-function createExportedWidget2() {
-    return Widgets.SpecializedWidget.createWidget2();
-}
-exports.createExportedWidget2 = createExportedWidget2;
-function createExportedWidget3() {
-    return Widgets1.createWidget3();
-}
-exports.createExportedWidget3 = createExportedWidget3;
-function createExportedWidget4() {
-    return Widgets1.SpecializedGlobalWidget.createWidget4();
-}
-exports.createExportedWidget4 = createExportedWidget4;
-//// [privacyFunctionCannotNameParameterTypeDeclFile_consumer.js]
-var exporter = require("privacyFunctionCannotNameParameterTypeDeclFile_exporter");
-var publicClassWithWithPrivateParmeterTypes = (function () {
-    function publicClassWithWithPrivateParmeterTypes(param, param1, param2) {
-        if (param === void 0) { param = exporter.createExportedWidget1(); }
-        if (param1 === void 0) { param1 = exporter.createExportedWidget1(); }
-        if (param2 === void 0) { param2 = exporter.createExportedWidget1(); }
-        this.param1 = param1;
-        this.param2 = param2;
-    }
-    publicClassWithWithPrivateParmeterTypes.myPublicStaticMethod = function (param) {
-        if (param === void 0) { param = exporter.createExportedWidget1(); }
-    };
-    publicClassWithWithPrivateParmeterTypes.myPrivateStaticMethod = function (param) {
-        if (param === void 0) { param = exporter.createExportedWidget1(); }
-    };
-    publicClassWithWithPrivateParmeterTypes.prototype.myPublicMethod = function (param) {
-        if (param === void 0) { param = exporter.createExportedWidget1(); }
-    };
-    publicClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod = function (param) {
-        if (param === void 0) { param = exporter.createExportedWidget1(); }
-    };
-    return publicClassWithWithPrivateParmeterTypes;
-})();
-exports.publicClassWithWithPrivateParmeterTypes = publicClassWithWithPrivateParmeterTypes;
-var publicClassWithWithPrivateParmeterTypes1 = (function () {
-    function publicClassWithWithPrivateParmeterTypes1(param, param1, param2) {
-        if (param === void 0) { param = exporter.createExportedWidget3(); }
-        if (param1 === void 0) { param1 = exporter.createExportedWidget3(); }
-        if (param2 === void 0) { param2 = exporter.createExportedWidget3(); }
-        this.param1 = param1;
-        this.param2 = param2;
-    }
-    publicClassWithWithPrivateParmeterTypes1.myPublicStaticMethod = function (param) {
-        if (param === void 0) { param = exporter.createExportedWidget3(); }
-    };
-    publicClassWithWithPrivateParmeterTypes1.myPrivateStaticMethod = function (param) {
-        if (param === void 0) { param = exporter.createExportedWidget3(); }
-    };
-    publicClassWithWithPrivateParmeterTypes1.prototype.myPublicMethod = function (param) {
-        if (param === void 0) { param = exporter.createExportedWidget3(); }
-    };
-    publicClassWithWithPrivateParmeterTypes1.prototype.myPrivateMethod = function (param) {
-        if (param === void 0) { param = exporter.createExportedWidget3(); }
-    };
-    return publicClassWithWithPrivateParmeterTypes1;
-})();
-exports.publicClassWithWithPrivateParmeterTypes1 = publicClassWithWithPrivateParmeterTypes1;
-var privateClassWithWithPrivateParmeterTypes = (function () {
-    function privateClassWithWithPrivateParmeterTypes(param, param1, param2) {
-        if (param === void 0) { param = exporter.createExportedWidget1(); }
-        if (param1 === void 0) { param1 = exporter.createExportedWidget1(); }
-        if (param2 === void 0) { param2 = exporter.createExportedWidget1(); }
-        this.param1 = param1;
-        this.param2 = param2;
-    }
-    privateClassWithWithPrivateParmeterTypes.myPublicStaticMethod = function (param) {
-        if (param === void 0) { param = exporter.createExportedWidget1(); }
-    };
-    privateClassWithWithPrivateParmeterTypes.myPrivateStaticMethod = function (param) {
-        if (param === void 0) { param = exporter.createExportedWidget1(); }
-    };
-    privateClassWithWithPrivateParmeterTypes.prototype.myPublicMethod = function (param) {
-        if (param === void 0) { param = exporter.createExportedWidget1(); }
-    };
-    privateClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod = function (param) {
-        if (param === void 0) { param = exporter.createExportedWidget1(); }
-    };
-    return privateClassWithWithPrivateParmeterTypes;
-})();
-var privateClassWithWithPrivateParmeterTypes2 = (function () {
-    function privateClassWithWithPrivateParmeterTypes2(param, param1, param2) {
-        if (param === void 0) { param = exporter.createExportedWidget3(); }
-        if (param1 === void 0) { param1 = exporter.createExportedWidget3(); }
-        if (param2 === void 0) { param2 = exporter.createExportedWidget3(); }
-        this.param1 = param1;
-        this.param2 = param2;
-    }
-    privateClassWithWithPrivateParmeterTypes2.myPublicStaticMethod = function (param) {
-        if (param === void 0) { param = exporter.createExportedWidget3(); }
-    };
-    privateClassWithWithPrivateParmeterTypes2.myPrivateStaticMethod = function (param) {
-        if (param === void 0) { param = exporter.createExportedWidget3(); }
-    };
-    privateClassWithWithPrivateParmeterTypes2.prototype.myPublicMethod = function (param) {
-        if (param === void 0) { param = exporter.createExportedWidget3(); }
-    };
-    privateClassWithWithPrivateParmeterTypes2.prototype.myPrivateMethod = function (param) {
-        if (param === void 0) { param = exporter.createExportedWidget3(); }
-    };
-    return privateClassWithWithPrivateParmeterTypes2;
-})();
-function publicFunctionWithPrivateParmeterTypes(param) {
-    if (param === void 0) { param = exporter.createExportedWidget1(); }
-}
-exports.publicFunctionWithPrivateParmeterTypes = publicFunctionWithPrivateParmeterTypes;
-function privateFunctionWithPrivateParmeterTypes(param) {
-    if (param === void 0) { param = exporter.createExportedWidget1(); }
-}
-function publicFunctionWithPrivateParmeterTypes1(param) {
-    if (param === void 0) { param = exporter.createExportedWidget3(); }
-}
-exports.publicFunctionWithPrivateParmeterTypes1 = publicFunctionWithPrivateParmeterTypes1;
-function privateFunctionWithPrivateParmeterTypes1(param) {
-    if (param === void 0) { param = exporter.createExportedWidget3(); }
-}
-var publicClassWithPrivateModuleParameterTypes = (function () {
-    function publicClassWithPrivateModuleParameterTypes(param, param1, param2) {
-        if (param === void 0) { param = exporter.createExportedWidget2(); }
-        if (param1 === void 0) { param1 = exporter.createExportedWidget2(); }
-        if (param2 === void 0) { param2 = exporter.createExportedWidget2(); }
-        this.param1 = param1;
-        this.param2 = param2;
-    }
-    publicClassWithPrivateModuleParameterTypes.myPublicStaticMethod = function (param) {
-        if (param === void 0) { param = exporter.createExportedWidget2(); }
-    };
-    publicClassWithPrivateModuleParameterTypes.prototype.myPublicMethod = function (param) {
-        if (param === void 0) { param = exporter.createExportedWidget2(); }
-    };
-    return publicClassWithPrivateModuleParameterTypes;
-})();
-exports.publicClassWithPrivateModuleParameterTypes = publicClassWithPrivateModuleParameterTypes;
-var publicClassWithPrivateModuleParameterTypes2 = (function () {
-    function publicClassWithPrivateModuleParameterTypes2(param, param1, param2) {
-        if (param === void 0) { param = exporter.createExportedWidget4(); }
-        if (param1 === void 0) { param1 = exporter.createExportedWidget4(); }
-        if (param2 === void 0) { param2 = exporter.createExportedWidget4(); }
-        this.param1 = param1;
-        this.param2 = param2;
-    }
-    publicClassWithPrivateModuleParameterTypes2.myPublicStaticMethod = function (param) {
-        if (param === void 0) { param = exporter.createExportedWidget4(); }
-    };
-    publicClassWithPrivateModuleParameterTypes2.prototype.myPublicMethod = function (param) {
-        if (param === void 0) { param = exporter.createExportedWidget4(); }
-    };
-    return publicClassWithPrivateModuleParameterTypes2;
-})();
-exports.publicClassWithPrivateModuleParameterTypes2 = publicClassWithPrivateModuleParameterTypes2;
-function publicFunctionWithPrivateModuleParameterTypes(param) {
-    if (param === void 0) { param = exporter.createExportedWidget2(); }
-}
-exports.publicFunctionWithPrivateModuleParameterTypes = publicFunctionWithPrivateModuleParameterTypes;
-function publicFunctionWithPrivateModuleParameterTypes1(param) {
-    if (param === void 0) { param = exporter.createExportedWidget4(); }
-}
-exports.publicFunctionWithPrivateModuleParameterTypes1 = publicFunctionWithPrivateModuleParameterTypes1;
-var privateClassWithPrivateModuleParameterTypes = (function () {
-    function privateClassWithPrivateModuleParameterTypes(param, param1, param2) {
-        if (param === void 0) { param = exporter.createExportedWidget2(); }
-        if (param1 === void 0) { param1 = exporter.createExportedWidget2(); }
-        if (param2 === void 0) { param2 = exporter.createExportedWidget2(); }
-        this.param1 = param1;
-        this.param2 = param2;
-    }
-    privateClassWithPrivateModuleParameterTypes.myPublicStaticMethod = function (param) {
-        if (param === void 0) { param = exporter.createExportedWidget2(); }
-    };
-    privateClassWithPrivateModuleParameterTypes.prototype.myPublicMethod = function (param) {
-        if (param === void 0) { param = exporter.createExportedWidget2(); }
-    };
-    return privateClassWithPrivateModuleParameterTypes;
-})();
-var privateClassWithPrivateModuleParameterTypes1 = (function () {
-    function privateClassWithPrivateModuleParameterTypes1(param, param1, param2) {
-        if (param === void 0) { param = exporter.createExportedWidget4(); }
-        if (param1 === void 0) { param1 = exporter.createExportedWidget4(); }
-        if (param2 === void 0) { param2 = exporter.createExportedWidget4(); }
-        this.param1 = param1;
-        this.param2 = param2;
-    }
-    privateClassWithPrivateModuleParameterTypes1.myPublicStaticMethod = function (param) {
-        if (param === void 0) { param = exporter.createExportedWidget4(); }
-    };
-    privateClassWithPrivateModuleParameterTypes1.prototype.myPublicMethod = function (param) {
-        if (param === void 0) { param = exporter.createExportedWidget4(); }
-    };
-    return privateClassWithPrivateModuleParameterTypes1;
-})();
-function privateFunctionWithPrivateModuleParameterTypes(param) {
-    if (param === void 0) { param = exporter.createExportedWidget2(); }
-}
-function privateFunctionWithPrivateModuleParameterTypes1(param) {
-    if (param === void 0) { param = exporter.createExportedWidget4(); }
-}
-
-
-//// [privacyFunctionCannotNameParameterTypeDeclFile_GlobalWidgets.d.ts]
-declare module "GlobalWidgets" {
-    class Widget3 {
-        name: string;
-    }
-    function createWidget3(): Widget3;
-    module SpecializedGlobalWidget {
-        class Widget4 {
-            name: string;
-        }
-        function createWidget4(): Widget4;
-    }
-}
-//// [privacyFunctionCannotNameParameterTypeDeclFile_Widgets.d.ts]
-export declare class Widget1 {
-    name: string;
-}
-export declare function createWidget1(): Widget1;
-export declare module SpecializedWidget {
-    class Widget2 {
-        name: string;
-    }
-    function createWidget2(): Widget2;
-}
-//// [privacyFunctionCannotNameParameterTypeDeclFile_exporter.d.ts]
-/// <reference path='privacyFunctionCannotNameParameterTypeDeclFile_GlobalWidgets.d.ts' />
-import Widgets = require("privacyFunctionCannotNameParameterTypeDeclFile_Widgets");
-import Widgets1 = require("GlobalWidgets");
-export declare function createExportedWidget1(): Widgets.Widget1;
-export declare function createExportedWidget2(): Widgets.SpecializedWidget.Widget2;
-export declare function createExportedWidget3(): Widgets1.Widget3;
-export declare function createExportedWidget4(): Widgets1.SpecializedGlobalWidget.Widget4;
diff --git a/tests/baselines/reference/privacyFunctionCannotNameReturnTypeDeclFile.js b/tests/baselines/reference/privacyFunctionCannotNameReturnTypeDeclFile.js
deleted file mode 100644
index 75a91f38c54..00000000000
--- a/tests/baselines/reference/privacyFunctionCannotNameReturnTypeDeclFile.js
+++ /dev/null
@@ -1,382 +0,0 @@
-//// [tests/cases/compiler/privacyFunctionCannotNameReturnTypeDeclFile.ts] ////
-
-//// [privacyFunctionReturnTypeDeclFile_GlobalWidgets.ts]
-
-
-declare module "GlobalWidgets" {
-    export class Widget3 {
-        name: string;
-    }
-    export function createWidget3(): Widget3;
-
-    export module SpecializedGlobalWidget {
-        export class Widget4 {
-            name: string;
-        }
-        function createWidget4(): Widget4;
-    }
-}
-
-//// [privacyFunctionReturnTypeDeclFile_Widgets.ts]
-export class Widget1 {
-    name = 'one';
-}
-export function createWidget1() {
-    return new Widget1();
-}
-
-export module SpecializedWidget {
-    export class Widget2 {
-        name = 'one';
-    }
-    export function createWidget2() {
-        return new Widget2();
-    }
-}
-
-//// [privacyFunctionReturnTypeDeclFile_exporter.ts]
-///<reference path='privacyFunctionReturnTypeDeclFile_GlobalWidgets.ts'/>
-import Widgets = require("privacyFunctionReturnTypeDeclFile_Widgets");
-import Widgets1 = require("GlobalWidgets");
-export function createExportedWidget1() {
-    return Widgets.createWidget1();
-}
-export function createExportedWidget2() {
-    return Widgets.SpecializedWidget.createWidget2();
-}
-export function createExportedWidget3() {
-    return Widgets1.createWidget3();
-}
-export function createExportedWidget4() {
-    return Widgets1.SpecializedGlobalWidget.createWidget4();
-}
-
-//// [privacyFunctionReturnTypeDeclFile_consumer.ts]
-import exporter = require("privacyFunctionReturnTypeDeclFile_exporter");
-export class publicClassWithWithPrivateParmeterTypes {
-    static myPublicStaticMethod() { // Error
-        return exporter.createExportedWidget1();
-    }
-    private static myPrivateStaticMethod() {
-        return exporter.createExportedWidget1();;
-    }
-    myPublicMethod() { // Error
-        return exporter.createExportedWidget1();;
-    }
-    private myPrivateMethod() {
-        return exporter.createExportedWidget1();;
-    }
-    static myPublicStaticMethod1() { // Error
-        return exporter.createExportedWidget3();
-    }
-    private static myPrivateStaticMethod1() {
-        return exporter.createExportedWidget3();;
-    }
-    myPublicMethod1() { // Error
-        return exporter.createExportedWidget3();;
-    }
-    private myPrivateMethod1() {
-        return exporter.createExportedWidget3();;
-    }
-}
-
-class privateClassWithWithPrivateParmeterTypes {
-    static myPublicStaticMethod() { 
-        return exporter.createExportedWidget1();
-    }
-    private static myPrivateStaticMethod() {
-        return exporter.createExportedWidget1();;
-    }
-    myPublicMethod() { 
-        return exporter.createExportedWidget1();;
-    }
-    private myPrivateMethod() {
-        return exporter.createExportedWidget1();;
-    }
-    static myPublicStaticMethod1() { 
-        return exporter.createExportedWidget3();
-    }
-    private static myPrivateStaticMethod1() {
-        return exporter.createExportedWidget3();;
-    }
-    myPublicMethod1() { 
-        return exporter.createExportedWidget3();;
-    }
-    private myPrivateMethod1() {
-        return exporter.createExportedWidget3();;
-    }
-}
-
-export function publicFunctionWithPrivateParmeterTypes() { // Error
-    return exporter.createExportedWidget1();
-}
-function privateFunctionWithPrivateParmeterTypes()   {
-    return exporter.createExportedWidget1();
-}
-export function publicFunctionWithPrivateParmeterTypes1() { // Error
-    return exporter.createExportedWidget3();
-}
-function privateFunctionWithPrivateParmeterTypes1() {
-    return exporter.createExportedWidget3();
-}
-
-export class publicClassWithPrivateModuleReturnTypes {
-    static myPublicStaticMethod() { // Error
-        return exporter.createExportedWidget2();
-    }
-    myPublicMethod() { // Error
-        return exporter.createExportedWidget2();
-    }
-    static myPublicStaticMethod1() { // Error
-        return exporter.createExportedWidget4();
-    }
-    myPublicMethod1() { // Error
-        return exporter.createExportedWidget4();
-    }
-}
-export function publicFunctionWithPrivateModuleReturnTypes() { // Error
-    return exporter.createExportedWidget2();
-}
-export function publicFunctionWithPrivateModuleReturnTypes1() { // Error
-    return exporter.createExportedWidget4();
-}
-
-class privateClassWithPrivateModuleReturnTypes {
-    static myPublicStaticMethod() { 
-        return exporter.createExportedWidget2();
-    }
-    myPublicMethod() { 
-        return exporter.createExportedWidget2();
-    }
-    static myPublicStaticMethod1() { // Error
-        return exporter.createExportedWidget4();
-    }
-    myPublicMethod1() { // Error
-        return exporter.createExportedWidget4();
-    }
-}
-function privateFunctionWithPrivateModuleReturnTypes() { 
-    return exporter.createExportedWidget2();
-}
-function privateFunctionWithPrivateModuleReturnTypes1() {
-    return exporter.createExportedWidget4();
-}
-
-
-//// [privacyFunctionReturnTypeDeclFile_GlobalWidgets.js]
-//// [privacyFunctionReturnTypeDeclFile_Widgets.js]
-var Widget1 = (function () {
-    function Widget1() {
-        this.name = 'one';
-    }
-    return Widget1;
-})();
-exports.Widget1 = Widget1;
-function createWidget1() {
-    return new Widget1();
-}
-exports.createWidget1 = createWidget1;
-(function (SpecializedWidget) {
-    var Widget2 = (function () {
-        function Widget2() {
-            this.name = 'one';
-        }
-        return Widget2;
-    })();
-    SpecializedWidget.Widget2 = Widget2;
-    function createWidget2() {
-        return new Widget2();
-    }
-    SpecializedWidget.createWidget2 = createWidget2;
-})(exports.SpecializedWidget || (exports.SpecializedWidget = {}));
-var SpecializedWidget = exports.SpecializedWidget;
-//// [privacyFunctionReturnTypeDeclFile_exporter.js]
-///<reference path='privacyFunctionReturnTypeDeclFile_GlobalWidgets.ts'/>
-var Widgets = require("privacyFunctionReturnTypeDeclFile_Widgets");
-var Widgets1 = require("GlobalWidgets");
-function createExportedWidget1() {
-    return Widgets.createWidget1();
-}
-exports.createExportedWidget1 = createExportedWidget1;
-function createExportedWidget2() {
-    return Widgets.SpecializedWidget.createWidget2();
-}
-exports.createExportedWidget2 = createExportedWidget2;
-function createExportedWidget3() {
-    return Widgets1.createWidget3();
-}
-exports.createExportedWidget3 = createExportedWidget3;
-function createExportedWidget4() {
-    return Widgets1.SpecializedGlobalWidget.createWidget4();
-}
-exports.createExportedWidget4 = createExportedWidget4;
-//// [privacyFunctionReturnTypeDeclFile_consumer.js]
-var exporter = require("privacyFunctionReturnTypeDeclFile_exporter");
-var publicClassWithWithPrivateParmeterTypes = (function () {
-    function publicClassWithWithPrivateParmeterTypes() {
-    }
-    publicClassWithWithPrivateParmeterTypes.myPublicStaticMethod = function () {
-        return exporter.createExportedWidget1();
-    };
-    publicClassWithWithPrivateParmeterTypes.myPrivateStaticMethod = function () {
-        return exporter.createExportedWidget1();
-        ;
-    };
-    publicClassWithWithPrivateParmeterTypes.prototype.myPublicMethod = function () {
-        return exporter.createExportedWidget1();
-        ;
-    };
-    publicClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod = function () {
-        return exporter.createExportedWidget1();
-        ;
-    };
-    publicClassWithWithPrivateParmeterTypes.myPublicStaticMethod1 = function () {
-        return exporter.createExportedWidget3();
-    };
-    publicClassWithWithPrivateParmeterTypes.myPrivateStaticMethod1 = function () {
-        return exporter.createExportedWidget3();
-        ;
-    };
-    publicClassWithWithPrivateParmeterTypes.prototype.myPublicMethod1 = function () {
-        return exporter.createExportedWidget3();
-        ;
-    };
-    publicClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod1 = function () {
-        return exporter.createExportedWidget3();
-        ;
-    };
-    return publicClassWithWithPrivateParmeterTypes;
-})();
-exports.publicClassWithWithPrivateParmeterTypes = publicClassWithWithPrivateParmeterTypes;
-var privateClassWithWithPrivateParmeterTypes = (function () {
-    function privateClassWithWithPrivateParmeterTypes() {
-    }
-    privateClassWithWithPrivateParmeterTypes.myPublicStaticMethod = function () {
-        return exporter.createExportedWidget1();
-    };
-    privateClassWithWithPrivateParmeterTypes.myPrivateStaticMethod = function () {
-        return exporter.createExportedWidget1();
-        ;
-    };
-    privateClassWithWithPrivateParmeterTypes.prototype.myPublicMethod = function () {
-        return exporter.createExportedWidget1();
-        ;
-    };
-    privateClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod = function () {
-        return exporter.createExportedWidget1();
-        ;
-    };
-    privateClassWithWithPrivateParmeterTypes.myPublicStaticMethod1 = function () {
-        return exporter.createExportedWidget3();
-    };
-    privateClassWithWithPrivateParmeterTypes.myPrivateStaticMethod1 = function () {
-        return exporter.createExportedWidget3();
-        ;
-    };
-    privateClassWithWithPrivateParmeterTypes.prototype.myPublicMethod1 = function () {
-        return exporter.createExportedWidget3();
-        ;
-    };
-    privateClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod1 = function () {
-        return exporter.createExportedWidget3();
-        ;
-    };
-    return privateClassWithWithPrivateParmeterTypes;
-})();
-function publicFunctionWithPrivateParmeterTypes() {
-    return exporter.createExportedWidget1();
-}
-exports.publicFunctionWithPrivateParmeterTypes = publicFunctionWithPrivateParmeterTypes;
-function privateFunctionWithPrivateParmeterTypes() {
-    return exporter.createExportedWidget1();
-}
-function publicFunctionWithPrivateParmeterTypes1() {
-    return exporter.createExportedWidget3();
-}
-exports.publicFunctionWithPrivateParmeterTypes1 = publicFunctionWithPrivateParmeterTypes1;
-function privateFunctionWithPrivateParmeterTypes1() {
-    return exporter.createExportedWidget3();
-}
-var publicClassWithPrivateModuleReturnTypes = (function () {
-    function publicClassWithPrivateModuleReturnTypes() {
-    }
-    publicClassWithPrivateModuleReturnTypes.myPublicStaticMethod = function () {
-        return exporter.createExportedWidget2();
-    };
-    publicClassWithPrivateModuleReturnTypes.prototype.myPublicMethod = function () {
-        return exporter.createExportedWidget2();
-    };
-    publicClassWithPrivateModuleReturnTypes.myPublicStaticMethod1 = function () {
-        return exporter.createExportedWidget4();
-    };
-    publicClassWithPrivateModuleReturnTypes.prototype.myPublicMethod1 = function () {
-        return exporter.createExportedWidget4();
-    };
-    return publicClassWithPrivateModuleReturnTypes;
-})();
-exports.publicClassWithPrivateModuleReturnTypes = publicClassWithPrivateModuleReturnTypes;
-function publicFunctionWithPrivateModuleReturnTypes() {
-    return exporter.createExportedWidget2();
-}
-exports.publicFunctionWithPrivateModuleReturnTypes = publicFunctionWithPrivateModuleReturnTypes;
-function publicFunctionWithPrivateModuleReturnTypes1() {
-    return exporter.createExportedWidget4();
-}
-exports.publicFunctionWithPrivateModuleReturnTypes1 = publicFunctionWithPrivateModuleReturnTypes1;
-var privateClassWithPrivateModuleReturnTypes = (function () {
-    function privateClassWithPrivateModuleReturnTypes() {
-    }
-    privateClassWithPrivateModuleReturnTypes.myPublicStaticMethod = function () {
-        return exporter.createExportedWidget2();
-    };
-    privateClassWithPrivateModuleReturnTypes.prototype.myPublicMethod = function () {
-        return exporter.createExportedWidget2();
-    };
-    privateClassWithPrivateModuleReturnTypes.myPublicStaticMethod1 = function () {
-        return exporter.createExportedWidget4();
-    };
-    privateClassWithPrivateModuleReturnTypes.prototype.myPublicMethod1 = function () {
-        return exporter.createExportedWidget4();
-    };
-    return privateClassWithPrivateModuleReturnTypes;
-})();
-function privateFunctionWithPrivateModuleReturnTypes() {
-    return exporter.createExportedWidget2();
-}
-function privateFunctionWithPrivateModuleReturnTypes1() {
-    return exporter.createExportedWidget4();
-}
-
-
-//// [privacyFunctionReturnTypeDeclFile_GlobalWidgets.d.ts]
-declare module "GlobalWidgets" {
-    class Widget3 {
-        name: string;
-    }
-    function createWidget3(): Widget3;
-    module SpecializedGlobalWidget {
-        class Widget4 {
-            name: string;
-        }
-        function createWidget4(): Widget4;
-    }
-}
-//// [privacyFunctionReturnTypeDeclFile_Widgets.d.ts]
-export declare class Widget1 {
-    name: string;
-}
-export declare function createWidget1(): Widget1;
-export declare module SpecializedWidget {
-    class Widget2 {
-        name: string;
-    }
-    function createWidget2(): Widget2;
-}
-//// [privacyFunctionReturnTypeDeclFile_exporter.d.ts]
-/// <reference path='privacyFunctionReturnTypeDeclFile_GlobalWidgets.d.ts' />
-import Widgets = require("privacyFunctionReturnTypeDeclFile_Widgets");
-import Widgets1 = require("GlobalWidgets");
-export declare function createExportedWidget1(): Widgets.Widget1;
-export declare function createExportedWidget2(): Widgets.SpecializedWidget.Widget2;
-export declare function createExportedWidget3(): Widgets1.Widget3;
-export declare function createExportedWidget4(): Widgets1.SpecializedGlobalWidget.Widget4;
diff --git a/tests/baselines/reference/privacyGetter.js b/tests/baselines/reference/privacyGetter.js
deleted file mode 100644
index 7a9239b134d..00000000000
--- a/tests/baselines/reference/privacyGetter.js
+++ /dev/null
@@ -1,506 +0,0 @@
-//// [privacyGetter.ts]
-export module m1 {
-    export class C1_public {
-        private f1() {
-        }
-    }
-
-    class C2_private {
-    }
-
-    export class C3_public {
-        private get p1_private() {
-            return new C1_public();
-        }
-
-        private set p1_private(m1_c3_p1_arg: C1_public) {
-        }
-
-        private get p2_private() {
-            return new C1_public();
-        }
-
-        private set p2_private(m1_c3_p2_arg: C1_public) {
-        }
-
-        private get p3_private() {
-            return new C2_private();
-        }
-
-        private set p3_private(m1_c3_p3_arg: C2_private) {
-        }
-
-        public get p4_public(): C2_private { // error
-            return new C2_private(); //error
-        }
-
-        public set p4_public(m1_c3_p4_arg: C2_private) { // error
-        }
-    }
-
-    class C4_private {
-        private get p1_private() {
-            return new C1_public();
-        }
-
-        private set p1_private(m1_c3_p1_arg: C1_public) {
-        }
-
-        private get p2_private() {
-            return new C1_public();
-        }
-
-        private set p2_private(m1_c3_p2_arg: C1_public) {
-        }
-
-        private get p3_private() {
-            return new C2_private();
-        }
-
-        private set p3_private(m1_c3_p3_arg: C2_private) {
-        }
-
-        public get p4_public(): C2_private {
-            return new C2_private();
-        }
-
-        public set p4_public(m1_c3_p4_arg: C2_private) {
-        }
-    }
-}
-
-module m2 {
-    export class m2_C1_public {
-        private f1() {
-        }
-    }
-
-    class m2_C2_private {
-    }
-
-    export class m2_C3_public {
-        private get p1_private() {
-            return new m2_C1_public();
-        }
-
-        private set p1_private(m2_c3_p1_arg: m2_C1_public) {
-        }
-
-        private get p2_private() {
-            return new m2_C1_public();
-        }
-
-        private set p2_private(m2_c3_p2_arg: m2_C1_public) {
-        }
-
-        private get p3_private() {
-            return new m2_C2_private();
-        }
-
-        private set p3_private(m2_c3_p3_arg: m2_C2_private) {
-        }
-
-        public get p4_public(): m2_C2_private {
-            return new m2_C2_private();
-        }
-
-        public set p4_public(m2_c3_p4_arg: m2_C2_private) {
-        }
-    }
-
-    class m2_C4_private {
-        private get p1_private() {
-            return new m2_C1_public();
-        }
-
-        private set p1_private(m2_c3_p1_arg: m2_C1_public) {
-        }
-
-        private get p2_private() {
-            return new m2_C1_public();
-        }
-
-        private set p2_private(m2_c3_p2_arg: m2_C1_public) {
-        }
-
-        private get p3_private() {
-            return new m2_C2_private();
-        }
-
-        private set p3_private(m2_c3_p3_arg: m2_C2_private) {
-        }
-
-        public get p4_public(): m2_C2_private {
-            return new m2_C2_private();
-        }
-
-        public set p4_public(m2_c3_p4_arg: m2_C2_private) {
-        }
-    }
-}
-
-class C5_private {
-    private f() {
-    }
-}
-
-export class C6_public {
-}
-
-export class C7_public {
-    private get p1_private() {
-        return new C6_public();
-    }
-
-    private set p1_private(m1_c3_p1_arg: C6_public) {
-    }
-
-    private get p2_private() {
-        return new C6_public();
-    }
-
-    private set p2_private(m1_c3_p2_arg: C6_public) {
-    }
-
-    private get p3_private() {
-        return new C5_private();
-    }
-
-    private set p3_private(m1_c3_p3_arg: C5_private) {
-    }
-
-    public get p4_public(): C5_private { // error
-        return new C5_private(); //error
-    }
-
-    public set p4_public(m1_c3_p4_arg: C5_private) { // error
-    }
-}
-
-class C8_private {
-    private get p1_private() {
-        return new C6_public();
-    }
-
-    private set p1_private(m1_c3_p1_arg: C6_public) {
-    }
-
-    private get p2_private() {
-        return new C6_public();
-    }
-
-    private set p2_private(m1_c3_p2_arg: C6_public) {
-    }
-
-    private get p3_private() {
-        return new C5_private();
-    }
-
-    private set p3_private(m1_c3_p3_arg: C5_private) {
-    }
-
-    public get p4_public(): C5_private {
-        return new C5_private();
-    }
-
-    public set p4_public(m1_c3_p4_arg: C5_private) {
-    }
-}
-
-//// [privacyGetter.js]
-define(["require", "exports"], function (require, exports) {
-    (function (m1) {
-        var C1_public = (function () {
-            function C1_public() {
-            }
-            C1_public.prototype.f1 = function () {
-            };
-            return C1_public;
-        })();
-        m1.C1_public = C1_public;
-        var C2_private = (function () {
-            function C2_private() {
-            }
-            return C2_private;
-        })();
-        var C3_public = (function () {
-            function C3_public() {
-            }
-            Object.defineProperty(C3_public.prototype, "p1_private", {
-                get: function () {
-                    return new C1_public();
-                },
-                set: function (m1_c3_p1_arg) {
-                },
-                enumerable: true,
-                configurable: true
-            });
-            Object.defineProperty(C3_public.prototype, "p2_private", {
-                get: function () {
-                    return new C1_public();
-                },
-                set: function (m1_c3_p2_arg) {
-                },
-                enumerable: true,
-                configurable: true
-            });
-            Object.defineProperty(C3_public.prototype, "p3_private", {
-                get: function () {
-                    return new C2_private();
-                },
-                set: function (m1_c3_p3_arg) {
-                },
-                enumerable: true,
-                configurable: true
-            });
-            Object.defineProperty(C3_public.prototype, "p4_public", {
-                get: function () {
-                    return new C2_private(); //error
-                },
-                set: function (m1_c3_p4_arg) {
-                },
-                enumerable: true,
-                configurable: true
-            });
-            return C3_public;
-        })();
-        m1.C3_public = C3_public;
-        var C4_private = (function () {
-            function C4_private() {
-            }
-            Object.defineProperty(C4_private.prototype, "p1_private", {
-                get: function () {
-                    return new C1_public();
-                },
-                set: function (m1_c3_p1_arg) {
-                },
-                enumerable: true,
-                configurable: true
-            });
-            Object.defineProperty(C4_private.prototype, "p2_private", {
-                get: function () {
-                    return new C1_public();
-                },
-                set: function (m1_c3_p2_arg) {
-                },
-                enumerable: true,
-                configurable: true
-            });
-            Object.defineProperty(C4_private.prototype, "p3_private", {
-                get: function () {
-                    return new C2_private();
-                },
-                set: function (m1_c3_p3_arg) {
-                },
-                enumerable: true,
-                configurable: true
-            });
-            Object.defineProperty(C4_private.prototype, "p4_public", {
-                get: function () {
-                    return new C2_private();
-                },
-                set: function (m1_c3_p4_arg) {
-                },
-                enumerable: true,
-                configurable: true
-            });
-            return C4_private;
-        })();
-    })(exports.m1 || (exports.m1 = {}));
-    var m1 = exports.m1;
-    var m2;
-    (function (m2) {
-        var m2_C1_public = (function () {
-            function m2_C1_public() {
-            }
-            m2_C1_public.prototype.f1 = function () {
-            };
-            return m2_C1_public;
-        })();
-        m2.m2_C1_public = m2_C1_public;
-        var m2_C2_private = (function () {
-            function m2_C2_private() {
-            }
-            return m2_C2_private;
-        })();
-        var m2_C3_public = (function () {
-            function m2_C3_public() {
-            }
-            Object.defineProperty(m2_C3_public.prototype, "p1_private", {
-                get: function () {
-                    return new m2_C1_public();
-                },
-                set: function (m2_c3_p1_arg) {
-                },
-                enumerable: true,
-                configurable: true
-            });
-            Object.defineProperty(m2_C3_public.prototype, "p2_private", {
-                get: function () {
-                    return new m2_C1_public();
-                },
-                set: function (m2_c3_p2_arg) {
-                },
-                enumerable: true,
-                configurable: true
-            });
-            Object.defineProperty(m2_C3_public.prototype, "p3_private", {
-                get: function () {
-                    return new m2_C2_private();
-                },
-                set: function (m2_c3_p3_arg) {
-                },
-                enumerable: true,
-                configurable: true
-            });
-            Object.defineProperty(m2_C3_public.prototype, "p4_public", {
-                get: function () {
-                    return new m2_C2_private();
-                },
-                set: function (m2_c3_p4_arg) {
-                },
-                enumerable: true,
-                configurable: true
-            });
-            return m2_C3_public;
-        })();
-        m2.m2_C3_public = m2_C3_public;
-        var m2_C4_private = (function () {
-            function m2_C4_private() {
-            }
-            Object.defineProperty(m2_C4_private.prototype, "p1_private", {
-                get: function () {
-                    return new m2_C1_public();
-                },
-                set: function (m2_c3_p1_arg) {
-                },
-                enumerable: true,
-                configurable: true
-            });
-            Object.defineProperty(m2_C4_private.prototype, "p2_private", {
-                get: function () {
-                    return new m2_C1_public();
-                },
-                set: function (m2_c3_p2_arg) {
-                },
-                enumerable: true,
-                configurable: true
-            });
-            Object.defineProperty(m2_C4_private.prototype, "p3_private", {
-                get: function () {
-                    return new m2_C2_private();
-                },
-                set: function (m2_c3_p3_arg) {
-                },
-                enumerable: true,
-                configurable: true
-            });
-            Object.defineProperty(m2_C4_private.prototype, "p4_public", {
-                get: function () {
-                    return new m2_C2_private();
-                },
-                set: function (m2_c3_p4_arg) {
-                },
-                enumerable: true,
-                configurable: true
-            });
-            return m2_C4_private;
-        })();
-    })(m2 || (m2 = {}));
-    var C5_private = (function () {
-        function C5_private() {
-        }
-        C5_private.prototype.f = function () {
-        };
-        return C5_private;
-    })();
-    var C6_public = (function () {
-        function C6_public() {
-        }
-        return C6_public;
-    })();
-    exports.C6_public = C6_public;
-    var C7_public = (function () {
-        function C7_public() {
-        }
-        Object.defineProperty(C7_public.prototype, "p1_private", {
-            get: function () {
-                return new C6_public();
-            },
-            set: function (m1_c3_p1_arg) {
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(C7_public.prototype, "p2_private", {
-            get: function () {
-                return new C6_public();
-            },
-            set: function (m1_c3_p2_arg) {
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(C7_public.prototype, "p3_private", {
-            get: function () {
-                return new C5_private();
-            },
-            set: function (m1_c3_p3_arg) {
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(C7_public.prototype, "p4_public", {
-            get: function () {
-                return new C5_private(); //error
-            },
-            set: function (m1_c3_p4_arg) {
-            },
-            enumerable: true,
-            configurable: true
-        });
-        return C7_public;
-    })();
-    exports.C7_public = C7_public;
-    var C8_private = (function () {
-        function C8_private() {
-        }
-        Object.defineProperty(C8_private.prototype, "p1_private", {
-            get: function () {
-                return new C6_public();
-            },
-            set: function (m1_c3_p1_arg) {
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(C8_private.prototype, "p2_private", {
-            get: function () {
-                return new C6_public();
-            },
-            set: function (m1_c3_p2_arg) {
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(C8_private.prototype, "p3_private", {
-            get: function () {
-                return new C5_private();
-            },
-            set: function (m1_c3_p3_arg) {
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(C8_private.prototype, "p4_public", {
-            get: function () {
-                return new C5_private();
-            },
-            set: function (m1_c3_p4_arg) {
-            },
-            enumerable: true,
-            configurable: true
-        });
-        return C8_private;
-    })();
-});
diff --git a/tests/baselines/reference/privacyGloGetter.js b/tests/baselines/reference/privacyGloGetter.js
deleted file mode 100644
index 34e4b69d392..00000000000
--- a/tests/baselines/reference/privacyGloGetter.js
+++ /dev/null
@@ -1,218 +0,0 @@
-//// [privacyGloGetter.ts]
-module m1 {
-    export class C1_public {
-        private f1() {
-        }
-    }
-
-    class C2_private {
-    }
-
-    export class C3_public {
-        private get p1_private() {
-            return new C1_public();
-        }
-
-        private set p1_private(m1_c3_p1_arg: C1_public) {
-        }
-
-        private get p2_private() {
-            return new C1_public();
-        }
-
-        private set p2_private(m1_c3_p2_arg: C1_public) {
-        }
-
-        private get p3_private() {
-            return new C2_private();
-        }
-
-        private set p3_private(m1_c3_p3_arg: C2_private) {
-        }
-
-        public get p4_public(): C2_private { // error
-            return new C2_private(); //error
-        }
-
-        public set p4_public(m1_c3_p4_arg: C2_private) { // error
-        }
-    }
-
-    class C4_private {
-        private get p1_private() {
-            return new C1_public();
-        }
-
-        private set p1_private(m1_c3_p1_arg: C1_public) {
-        }
-
-        private get p2_private() {
-            return new C1_public();
-        }
-
-        private set p2_private(m1_c3_p2_arg: C1_public) {
-        }
-
-        private get p3_private() {
-            return new C2_private();
-        }
-
-        private set p3_private(m1_c3_p3_arg: C2_private) {
-        }
-
-        public get p4_public(): C2_private {
-            return new C2_private();
-        }
-
-        public set p4_public(m1_c3_p4_arg: C2_private) {
-        }
-    }
-}
-
-class C6_public {
-}
-
-class C7_public {
-    private get p1_private() {
-        return new C6_public();
-    }
-
-    private set p1_private(m1_c3_p1_arg: C6_public) {
-    }
-
-    private get p2_private() {
-        return new C6_public();
-    }
-
-    private set p2_private(m1_c3_p2_arg: C6_public) {
-    }
-}
-
-//// [privacyGloGetter.js]
-var m1;
-(function (m1) {
-    var C1_public = (function () {
-        function C1_public() {
-        }
-        C1_public.prototype.f1 = function () {
-        };
-        return C1_public;
-    })();
-    m1.C1_public = C1_public;
-    var C2_private = (function () {
-        function C2_private() {
-        }
-        return C2_private;
-    })();
-    var C3_public = (function () {
-        function C3_public() {
-        }
-        Object.defineProperty(C3_public.prototype, "p1_private", {
-            get: function () {
-                return new C1_public();
-            },
-            set: function (m1_c3_p1_arg) {
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(C3_public.prototype, "p2_private", {
-            get: function () {
-                return new C1_public();
-            },
-            set: function (m1_c3_p2_arg) {
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(C3_public.prototype, "p3_private", {
-            get: function () {
-                return new C2_private();
-            },
-            set: function (m1_c3_p3_arg) {
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(C3_public.prototype, "p4_public", {
-            get: function () {
-                return new C2_private(); //error
-            },
-            set: function (m1_c3_p4_arg) {
-            },
-            enumerable: true,
-            configurable: true
-        });
-        return C3_public;
-    })();
-    m1.C3_public = C3_public;
-    var C4_private = (function () {
-        function C4_private() {
-        }
-        Object.defineProperty(C4_private.prototype, "p1_private", {
-            get: function () {
-                return new C1_public();
-            },
-            set: function (m1_c3_p1_arg) {
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(C4_private.prototype, "p2_private", {
-            get: function () {
-                return new C1_public();
-            },
-            set: function (m1_c3_p2_arg) {
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(C4_private.prototype, "p3_private", {
-            get: function () {
-                return new C2_private();
-            },
-            set: function (m1_c3_p3_arg) {
-            },
-            enumerable: true,
-            configurable: true
-        });
-        Object.defineProperty(C4_private.prototype, "p4_public", {
-            get: function () {
-                return new C2_private();
-            },
-            set: function (m1_c3_p4_arg) {
-            },
-            enumerable: true,
-            configurable: true
-        });
-        return C4_private;
-    })();
-})(m1 || (m1 = {}));
-var C6_public = (function () {
-    function C6_public() {
-    }
-    return C6_public;
-})();
-var C7_public = (function () {
-    function C7_public() {
-    }
-    Object.defineProperty(C7_public.prototype, "p1_private", {
-        get: function () {
-            return new C6_public();
-        },
-        set: function (m1_c3_p1_arg) {
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(C7_public.prototype, "p2_private", {
-        get: function () {
-            return new C6_public();
-        },
-        set: function (m1_c3_p2_arg) {
-        },
-        enumerable: true,
-        configurable: true
-    });
-    return C7_public;
-})();
diff --git a/tests/baselines/reference/privacyGloImport.js b/tests/baselines/reference/privacyGloImport.js
deleted file mode 100644
index db29e2ae2fa..00000000000
--- a/tests/baselines/reference/privacyGloImport.js
+++ /dev/null
@@ -1,263 +0,0 @@
-//// [privacyGloImport.ts]
-module m1 {
-    export module m1_M1_public {
-        export class c1 {
-        }
-        export function f1() {
-            return new c1;
-        }
-        export var v1 = c1;
-        export var v2: c1;
-    }
-
-    module m1_M2_private {
-        export class c1 {
-        }
-        export function f1() {
-            return new c1;
-        }
-        export var v1 = c1;
-        export var v2: c1;
-    }
-
-    //export declare module "m1_M3_public" {
-    //    export function f1();
-    //    export class c1 {
-    //    }
-    //    export var v1: { new (): c1; };
-    //    export var v2: c1;
-    //}
-
-    //declare module "m1_M4_private" {
-    //    export function f1();
-    //    export class c1 {
-    //    }
-    //    export var v1: { new (): c1; };
-    //    export var v2: c1;
-    //}
-
-    import m1_im1_private = m1_M1_public;
-    export var m1_im1_private_v1_public = m1_im1_private.c1;
-    export var m1_im1_private_v2_public = new m1_im1_private.c1();
-    export var m1_im1_private_v3_public = m1_im1_private.f1;
-    export var m1_im1_private_v4_public = m1_im1_private.f1();
-    var m1_im1_private_v1_private = m1_im1_private.c1;
-    var m1_im1_private_v2_private = new m1_im1_private.c1();
-    var m1_im1_private_v3_private = m1_im1_private.f1;
-    var m1_im1_private_v4_private = m1_im1_private.f1();
-
-
-    import m1_im2_private = m1_M2_private;
-    export var m1_im2_private_v1_public = m1_im2_private.c1;
-    export var m1_im2_private_v2_public = new m1_im2_private.c1();
-    export var m1_im2_private_v3_public = m1_im2_private.f1;
-    export var m1_im2_private_v4_public = m1_im2_private.f1();
-    var m1_im2_private_v1_private = m1_im2_private.c1;
-    var m1_im2_private_v2_private = new m1_im2_private.c1();
-    var m1_im2_private_v3_private = m1_im2_private.f1;
-    var m1_im2_private_v4_private = m1_im2_private.f1();
-
-    //import m1_im3_private = require("m1_M3_public");
-    //export var m1_im3_private_v1_public = m1_im3_private.c1;
-    //export var m1_im3_private_v2_public = new m1_im3_private.c1();
-    //export var m1_im3_private_v3_public = m1_im3_private.f1;
-    //export var m1_im3_private_v4_public = m1_im3_private.f1();
-    //var m1_im3_private_v1_private = m1_im3_private.c1;
-    //var m1_im3_private_v2_private = new m1_im3_private.c1();
-    //var m1_im3_private_v3_private = m1_im3_private.f1;
-    //var m1_im3_private_v4_private = m1_im3_private.f1();
-
-    //import m1_im4_private = require("m1_M4_private");
-    //export var m1_im4_private_v1_public = m1_im4_private.c1;
-    //export var m1_im4_private_v2_public = new m1_im4_private.c1();
-    //export var m1_im4_private_v3_public = m1_im4_private.f1;
-    //export var m1_im4_private_v4_public = m1_im4_private.f1();
-    //var m1_im4_private_v1_private = m1_im4_private.c1;
-    //var m1_im4_private_v2_private = new m1_im4_private.c1();
-    //var m1_im4_private_v3_private = m1_im4_private.f1;
-    //var m1_im4_private_v4_private = m1_im4_private.f1();
-
-    export import m1_im1_public = m1_M1_public;
-    export import m1_im2_public = m1_M2_private;
-    //export import m1_im3_public = require("m1_M3_public");
-    //export import m1_im4_public = require("m1_M4_private");
-}
-
-module glo_M1_public {
-    export class c1 {
-    }
-    export function f1() {
-        return new c1;
-    }
-    export var v1 = c1;
-    export var v2: c1;
-}
-
-declare module "glo_M2_public" {
-    export function f1();
-    export class c1 {
-    }
-    export var v1: { new (): c1; };
-    export var v2: c1;
-}
-
-declare module "use_glo_M1_public" {
-    import use_glo_M1_public = glo_M1_public;
-    export var use_glo_M1_public_v1_public: { new (): use_glo_M1_public.c1; };
-    export var use_glo_M1_public_v2_public: typeof use_glo_M1_public;
-    export var use_glo_M1_public_v3_public: ()=> use_glo_M1_public.c1;
-    var use_glo_M1_public_v1_private: { new (): use_glo_M1_public.c1; };
-    var use_glo_M1_public_v2_private: typeof use_glo_M1_public;
-    var use_glo_M1_public_v3_private: () => use_glo_M1_public.c1;
-
-    import use_glo_M2_public = require("glo_M2_public");
-    export var use_glo_M2_public_v1_public: { new (): use_glo_M2_public.c1; };
-    export var use_glo_M2_public_v2_public: typeof use_glo_M2_public;
-    export var use_glo_M2_public_v3_public: () => use_glo_M2_public.c1;
-    var use_glo_M2_public_v1_private: { new (): use_glo_M2_public.c1; };
-    var use_glo_M2_public_v2_private: typeof use_glo_M2_public;
-    var use_glo_M2_public_v3_private: () => use_glo_M2_public.c1;
-
-    module m2 {
-        //import errorImport = require("glo_M2_public");
-        import nonerrorImport = glo_M1_public;
-
-        module m5 {
-            //import m5_errorImport = require("glo_M2_public");
-            import m5_nonerrorImport = glo_M1_public;
-        }
-    }
-}
-
-declare module "anotherParseError" {
-    module m2 {
-        //declare module "abc" {
-        //}
-    }
-
-    module m2 {
-        //module "abc2" {
-        //}
-    }
-    //module "abc3" {
-    //}
-}
-
-module m2 {
-    //import m3 = require("use_glo_M1_public");
-    module m4 {
-        var a = 10;
-        //import m2 = require("use_glo_M1_public");
-    }
-
-}
-
-//// [privacyGloImport.js]
-var m1;
-(function (m1) {
-    (function (m1_M1_public) {
-        var c1 = (function () {
-            function c1() {
-            }
-            return c1;
-        })();
-        m1_M1_public.c1 = c1;
-        function f1() {
-            return new c1;
-        }
-        m1_M1_public.f1 = f1;
-        m1_M1_public.v1 = c1;
-        m1_M1_public.v2;
-    })(m1.m1_M1_public || (m1.m1_M1_public = {}));
-    var m1_M1_public = m1.m1_M1_public;
-    var m1_M2_private;
-    (function (m1_M2_private) {
-        var c1 = (function () {
-            function c1() {
-            }
-            return c1;
-        })();
-        m1_M2_private.c1 = c1;
-        function f1() {
-            return new c1;
-        }
-        m1_M2_private.f1 = f1;
-        m1_M2_private.v1 = c1;
-        m1_M2_private.v2;
-    })(m1_M2_private || (m1_M2_private = {}));
-    //export declare module "m1_M3_public" {
-    //    export function f1();
-    //    export class c1 {
-    //    }
-    //    export var v1: { new (): c1; };
-    //    export var v2: c1;
-    //}
-    //declare module "m1_M4_private" {
-    //    export function f1();
-    //    export class c1 {
-    //    }
-    //    export var v1: { new (): c1; };
-    //    export var v2: c1;
-    //}
-    var m1_im1_private = m1_M1_public;
-    m1.m1_im1_private_v1_public = m1_im1_private.c1;
-    m1.m1_im1_private_v2_public = new m1_im1_private.c1();
-    m1.m1_im1_private_v3_public = m1_im1_private.f1;
-    m1.m1_im1_private_v4_public = m1_im1_private.f1();
-    var m1_im1_private_v1_private = m1_im1_private.c1;
-    var m1_im1_private_v2_private = new m1_im1_private.c1();
-    var m1_im1_private_v3_private = m1_im1_private.f1;
-    var m1_im1_private_v4_private = m1_im1_private.f1();
-    var m1_im2_private = m1_M2_private;
-    m1.m1_im2_private_v1_public = m1_im2_private.c1;
-    m1.m1_im2_private_v2_public = new m1_im2_private.c1();
-    m1.m1_im2_private_v3_public = m1_im2_private.f1;
-    m1.m1_im2_private_v4_public = m1_im2_private.f1();
-    var m1_im2_private_v1_private = m1_im2_private.c1;
-    var m1_im2_private_v2_private = new m1_im2_private.c1();
-    var m1_im2_private_v3_private = m1_im2_private.f1;
-    var m1_im2_private_v4_private = m1_im2_private.f1();
-    //import m1_im3_private = require("m1_M3_public");
-    //export var m1_im3_private_v1_public = m1_im3_private.c1;
-    //export var m1_im3_private_v2_public = new m1_im3_private.c1();
-    //export var m1_im3_private_v3_public = m1_im3_private.f1;
-    //export var m1_im3_private_v4_public = m1_im3_private.f1();
-    //var m1_im3_private_v1_private = m1_im3_private.c1;
-    //var m1_im3_private_v2_private = new m1_im3_private.c1();
-    //var m1_im3_private_v3_private = m1_im3_private.f1;
-    //var m1_im3_private_v4_private = m1_im3_private.f1();
-    //import m1_im4_private = require("m1_M4_private");
-    //export var m1_im4_private_v1_public = m1_im4_private.c1;
-    //export var m1_im4_private_v2_public = new m1_im4_private.c1();
-    //export var m1_im4_private_v3_public = m1_im4_private.f1;
-    //export var m1_im4_private_v4_public = m1_im4_private.f1();
-    //var m1_im4_private_v1_private = m1_im4_private.c1;
-    //var m1_im4_private_v2_private = new m1_im4_private.c1();
-    //var m1_im4_private_v3_private = m1_im4_private.f1;
-    //var m1_im4_private_v4_private = m1_im4_private.f1();
-    m1.m1_im1_public = m1_M1_public;
-    m1.m1_im2_public = m1_M2_private;
-})(m1 || (m1 = {}));
-var glo_M1_public;
-(function (glo_M1_public) {
-    var c1 = (function () {
-        function c1() {
-        }
-        return c1;
-    })();
-    glo_M1_public.c1 = c1;
-    function f1() {
-        return new c1;
-    }
-    glo_M1_public.f1 = f1;
-    glo_M1_public.v1 = c1;
-    glo_M1_public.v2;
-})(glo_M1_public || (glo_M1_public = {}));
-var m2;
-(function (m2) {
-    //import m3 = require("use_glo_M1_public");
-    var m4;
-    (function (m4) {
-        var a = 10;
-    })(m4 || (m4 = {}));
-})(m2 || (m2 = {}));
diff --git a/tests/baselines/reference/privacyImport.js b/tests/baselines/reference/privacyImport.js
deleted file mode 100644
index c093903106e..00000000000
--- a/tests/baselines/reference/privacyImport.js
+++ /dev/null
@@ -1,703 +0,0 @@
-//// [privacyImport.ts]
-export module m1 {
-    export module m1_M1_public {
-        export class c1 {
-        }
-        export function f1() {
-            return new c1;
-        }
-        export var v1 = c1;
-        export var v2: c1;
-    }
-
-    module m1_M2_private {
-        export class c1 {
-        }
-        export function f1() {
-            return new c1;
-        }
-        export var v1 = c1;
-        export var v2: c1;
-    }
-
-    //export declare module "m1_M3_public" {
-    //    export function f1();
-    //    export class c1 {
-    //    }
-    //    export var v1: { new (): c1; };
-    //    export var v2: c1;
-    //}
-
-    //declare module "m1_M4_private" {
-    //    export function f1();
-    //    export class c1 {
-    //    }
-    //    export var v1: { new (): c1; };
-    //    export var v2: c1;
-    //}
-
-    import m1_im1_private = m1_M1_public;
-    export var m1_im1_private_v1_public = m1_im1_private.c1;
-    export var m1_im1_private_v2_public = new m1_im1_private.c1();
-    export var m1_im1_private_v3_public = m1_im1_private.f1;
-    export var m1_im1_private_v4_public = m1_im1_private.f1();
-    var m1_im1_private_v1_private = m1_im1_private.c1;
-    var m1_im1_private_v2_private = new m1_im1_private.c1();
-    var m1_im1_private_v3_private = m1_im1_private.f1;
-    var m1_im1_private_v4_private = m1_im1_private.f1();
-
-
-    import m1_im2_private = m1_M2_private;
-    export var m1_im2_private_v1_public = m1_im2_private.c1;
-    export var m1_im2_private_v2_public = new m1_im2_private.c1();
-    export var m1_im2_private_v3_public = m1_im2_private.f1;
-    export var m1_im2_private_v4_public = m1_im2_private.f1();
-    var m1_im2_private_v1_private = m1_im2_private.c1;
-    var m1_im2_private_v2_private = new m1_im2_private.c1();
-    var m1_im2_private_v3_private = m1_im2_private.f1;
-    var m1_im2_private_v4_private = m1_im2_private.f1();
-
-    //import m1_im3_private = require("m1_M3_public");
-    //export var m1_im3_private_v1_public = m1_im3_private.c1;
-    //export var m1_im3_private_v2_public = new m1_im3_private.c1();
-    //export var m1_im3_private_v3_public = m1_im3_private.f1;
-    //export var m1_im3_private_v4_public = m1_im3_private.f1();
-    //var m1_im3_private_v1_private = m1_im3_private.c1;
-    //var m1_im3_private_v2_private = new m1_im3_private.c1();
-    //var m1_im3_private_v3_private = m1_im3_private.f1;
-    //var m1_im3_private_v4_private = m1_im3_private.f1();
-
-    //import m1_im4_private = require("m1_M4_private");
-    //export var m1_im4_private_v1_public = m1_im4_private.c1;
-    //export var m1_im4_private_v2_public = new m1_im4_private.c1();
-    //export var m1_im4_private_v3_public = m1_im4_private.f1;
-    //export var m1_im4_private_v4_public = m1_im4_private.f1();
-    //var m1_im4_private_v1_private = m1_im4_private.c1;
-    //var m1_im4_private_v2_private = new m1_im4_private.c1();
-    //var m1_im4_private_v3_private = m1_im4_private.f1;
-    //var m1_im4_private_v4_private = m1_im4_private.f1();
-
-    export import m1_im1_public = m1_M1_public;
-    export import m1_im2_public = m1_M2_private;
-    //export import m1_im3_public = require("m1_M3_public");
-    //export import m1_im4_public = require("m1_M4_private");
-}
-
-module m2 {
-    export module m2_M1_public {
-        export class c1 {
-        }
-        export function f1() {
-            return new c1;
-        }
-        export var v1 = c1;
-        export var v2: c1;
-    }
-
-    module m2_M2_private {
-        export class c1 {
-        }
-        export function f1() {
-            return new c1;
-        }
-        export var v1 = c1;
-        export var v2: c1;
-    }
-
-    //export declare module "m2_M3_public" {
-    //    export function f1();
-    //    export class c1 {
-    //    }
-    //    export var v1: { new (): c1; };
-    //    export var v2: c1;
-    //}
-
-    //declare module "m2_M4_private" {
-    //    export function f1();
-    //    export class c1 {
-    //    }
-    //    export var v1: { new (): c1; };
-    //    export var v2: c1;
-    //}
-
-    import m1_im1_private = m2_M1_public;
-    export var m1_im1_private_v1_public = m1_im1_private.c1;
-    export var m1_im1_private_v2_public = new m1_im1_private.c1();
-    export var m1_im1_private_v3_public = m1_im1_private.f1;
-    export var m1_im1_private_v4_public = m1_im1_private.f1();
-    var m1_im1_private_v1_private = m1_im1_private.c1;
-    var m1_im1_private_v2_private = new m1_im1_private.c1();
-    var m1_im1_private_v3_private = m1_im1_private.f1;
-    var m1_im1_private_v4_private = m1_im1_private.f1();
-
-
-    import m1_im2_private = m2_M2_private;
-    export var m1_im2_private_v1_public = m1_im2_private.c1;
-    export var m1_im2_private_v2_public = new m1_im2_private.c1();
-    export var m1_im2_private_v3_public = m1_im2_private.f1;
-    export var m1_im2_private_v4_public = m1_im2_private.f1();
-    var m1_im2_private_v1_private = m1_im2_private.c1;
-    var m1_im2_private_v2_private = new m1_im2_private.c1();
-    var m1_im2_private_v3_private = m1_im2_private.f1;
-    var m1_im2_private_v4_private = m1_im2_private.f1();
-
-    //import m1_im3_private = require("m2_M3_public");
-    //export var m1_im3_private_v1_public = m1_im3_private.c1;
-    //export var m1_im3_private_v2_public = new m1_im3_private.c1();
-    //export var m1_im3_private_v3_public = m1_im3_private.f1;
-    //export var m1_im3_private_v4_public = m1_im3_private.f1();
-    //var m1_im3_private_v1_private = m1_im3_private.c1;
-    //var m1_im3_private_v2_private = new m1_im3_private.c1();
-    //var m1_im3_private_v3_private = m1_im3_private.f1;
-    //var m1_im3_private_v4_private = m1_im3_private.f1();
-
-    //import m1_im4_private = require("m2_M4_private");
-    //export var m1_im4_private_v1_public = m1_im4_private.c1;
-    //export var m1_im4_private_v2_public = new m1_im4_private.c1();
-    //export var m1_im4_private_v3_public = m1_im4_private.f1;
-    //export var m1_im4_private_v4_public = m1_im4_private.f1();
-    //var m1_im4_private_v1_private = m1_im4_private.c1;
-    //var m1_im4_private_v2_private = new m1_im4_private.c1();
-    //var m1_im4_private_v3_private = m1_im4_private.f1;
-    //var m1_im4_private_v4_private = m1_im4_private.f1();
-
-    // Parse error to export module
-    export import m1_im1_public = m2_M1_public;
-    export import m1_im2_public = m2_M2_private;
-    //export import m1_im3_public = require("m2_M3_public");
-    //export import m1_im4_public = require("m2_M4_private");
-}
-
-export module glo_M1_public {
-    export class c1 {
-    }
-    export function f1() {
-        return new c1;
-    }
-    export var v1 = c1;
-    export var v2: c1;
-}
-
-//export declare module "glo_M2_public" {
-//    export function f1();
-//    export class c1 {
-//    }
-//    export var v1: { new (): c1; };
-//    export var v2: c1;
-//}
-
-export module glo_M3_private {
-    export class c1 {
-    }
-    export function f1() {
-        return new c1;
-    }
-    export var v1 = c1;
-    export var v2: c1;
-}
-
-//export declare module "glo_M4_private" {
-//    export function f1();
-//    export class c1 {
-//    }
-//    export var v1: { new (): c1; };
-//    export var v2: c1;
-//}
-
-
-import glo_im1_private = glo_M1_public;
-export var glo_im1_private_v1_public = glo_im1_private.c1;
-export var glo_im1_private_v2_public = new glo_im1_private.c1();
-export var glo_im1_private_v3_public = glo_im1_private.f1;
-export var glo_im1_private_v4_public = glo_im1_private.f1();
-var glo_im1_private_v1_private = glo_im1_private.c1;
-var glo_im1_private_v2_private = new glo_im1_private.c1();
-var glo_im1_private_v3_private = glo_im1_private.f1;
-var glo_im1_private_v4_private = glo_im1_private.f1();
-
-
-//import glo_im2_private = require("glo_M2_public");
-//export var glo_im2_private_v1_public = glo_im2_private.c1;
-//export var glo_im2_private_v2_public = new glo_im2_private.c1();
-//export var glo_im2_private_v3_public = glo_im2_private.f1;
-//export var glo_im2_private_v4_public = glo_im2_private.f1();
-//var glo_im2_private_v1_private = glo_im2_private.c1;
-//var glo_im2_private_v2_private = new glo_im2_private.c1();
-//var glo_im2_private_v3_private = glo_im2_private.f1;
-//var glo_im2_private_v4_private = glo_im2_private.f1();
-
-import glo_im3_private = glo_M3_private;
-export var glo_im3_private_v1_public = glo_im3_private.c1;
-export var glo_im3_private_v2_public = new glo_im3_private.c1();
-export var glo_im3_private_v3_public = glo_im3_private.f1;
-export var glo_im3_private_v4_public = glo_im3_private.f1();
-var glo_im3_private_v1_private = glo_im3_private.c1;
-var glo_im3_private_v2_private = new glo_im3_private.c1();
-var glo_im3_private_v3_private = glo_im3_private.f1;
-var glo_im3_private_v4_private = glo_im3_private.f1();
-
-//import glo_im4_private = require("glo_M4_private");
-//export var glo_im4_private_v1_public = glo_im4_private.c1;
-//export var glo_im4_private_v2_public = new glo_im4_private.c1();
-//export var glo_im4_private_v3_public = glo_im4_private.f1;
-//export var glo_im4_private_v4_public = glo_im4_private.f1();
-//var glo_im4_private_v1_private = glo_im4_private.c1;
-//var glo_im4_private_v2_private = new glo_im4_private.c1();
-//var glo_im4_private_v3_private = glo_im4_private.f1;
-//var glo_im4_private_v4_private = glo_im4_private.f1();
-
-// Parse error to export module
-export import glo_im1_public = glo_M1_public;
-export import glo_im2_public = glo_M3_private;
-//export import glo_im3_public = require("glo_M2_public");
-//export import glo_im4_public = require("glo_M4_private");
-
-
-//export declare module "use_glo_M1_public" {
-//    import use_glo_M1_public = glo_M1_public;
-//    export var use_glo_M1_public_v1_public: { new (): use_glo_M1_public.c1; };
-//    export var use_glo_M1_public_v2_public: use_glo_M1_public;
-//    export var use_glo_M1_public_v3_public: () => use_glo_M1_public.c1;
-//    var use_glo_M1_public_v1_private: { new (): use_glo_M1_public.c1; };
-//    var use_glo_M1_public_v2_private: use_glo_M1_public;
-//    var use_glo_M1_public_v3_private: () => use_glo_M1_public.c1;
-
-//    import use_glo_M2_public = require("glo_M2_public");
-//    export var use_glo_M2_public_v1_public: { new (): use_glo_M2_public.c1; };
-//    export var use_glo_M2_public_v2_public: use_glo_M2_public;
-//    export var use_glo_M2_public_v3_public: () => use_glo_M2_public.c1;
-//    var use_glo_M2_public_v1_private: { new (): use_glo_M2_public.c1; };
-//    var use_glo_M2_public_v2_private: use_glo_M2_public;
-//    var use_glo_M2_public_v3_private: () => use_glo_M2_public.c1;
-
-//    module m2 {
-//        import errorImport = require("glo_M2_public");
-//        import nonerrorImport = glo_M1_public;
-
-//        module m5 {
-//            import m5_errorImport = require("glo_M2_public");
-//            import m5_nonerrorImport = glo_M1_public;
-//        }
-//    }
-//}
-
-
-//declare module "use_glo_M3_private" {
-//    import use_glo_M3_private = glo_M3_private;
-//    export var use_glo_M3_private_v1_public: { new (): use_glo_M3_private.c1; };
-//    export var use_glo_M3_private_v2_public: use_glo_M3_private;
-//    export var use_glo_M3_private_v3_public: () => use_glo_M3_private.c1;
-//    var use_glo_M3_private_v1_private: { new (): use_glo_M3_private.c1; };
-//    var use_glo_M3_private_v2_private: use_glo_M3_private;
-//    var use_glo_M3_private_v3_private: () => use_glo_M3_private.c1;
-
-//    import use_glo_M4_private = require("glo_M4_private");
-//    export var use_glo_M4_private_v1_public: { new (): use_glo_M4_private.c1; };
-//    export var use_glo_M4_private_v2_public: use_glo_M4_private;
-//    export var use_glo_M4_private_v3_public: () => use_glo_M4_private.c1;
-//    var use_glo_M4_private_v1_private: { new (): use_glo_M4_private.c1; };
-//    var use_glo_M4_private_v2_private: use_glo_M4_private;
-//    var use_glo_M4_private_v3_private: () => use_glo_M4_private.c1;
-
-//    module m2 {
-//        import errorImport = require("glo_M4_private");
-//        import nonerrorImport = glo_M3_private;
-
-//        module m5 {
-//            import m5_errorImport = require("glo_M4_private");
-//            import m5_nonerrorImport = glo_M3_private;
-//        }
-//    }
-//}
-
-//declare module "anotherParseError" {
-//    module m2 {
-//        declare module "abc" {
-//        }
-//    }
-
-//    module m2 {
-//        module "abc2" {
-//        }
-//    }
-//    module "abc3" {
-//    }
-//}
-
-//declare export module "anotherParseError2" {
-//    module m2 {
-//        declare module "abc" {
-//        }
-//    }
-
-//    module m2 {
-//        module "abc2" {
-//        }
-//    }
-//    module "abc3" {
-//    }
-//}
-
-module m2 {
-    //import m3 = require("use_glo_M1_public");
-    module m4 {
-        var a = 10;
-        //import m2 = require("use_glo_M1_public");
-    }
-
-}
-
-export module m3 {
-    //import m3 = require("use_glo_M1_public");
-    module m4 {
-        var a = 10;
-        //import m2 = require("use_glo_M1_public");
-    }
-
-}
-
-//// [privacyImport.js]
-(function (m1) {
-    (function (m1_M1_public) {
-        var c1 = (function () {
-            function c1() {
-            }
-            return c1;
-        })();
-        m1_M1_public.c1 = c1;
-        function f1() {
-            return new c1;
-        }
-        m1_M1_public.f1 = f1;
-        m1_M1_public.v1 = c1;
-        m1_M1_public.v2;
-    })(m1.m1_M1_public || (m1.m1_M1_public = {}));
-    var m1_M1_public = m1.m1_M1_public;
-    var m1_M2_private;
-    (function (m1_M2_private) {
-        var c1 = (function () {
-            function c1() {
-            }
-            return c1;
-        })();
-        m1_M2_private.c1 = c1;
-        function f1() {
-            return new c1;
-        }
-        m1_M2_private.f1 = f1;
-        m1_M2_private.v1 = c1;
-        m1_M2_private.v2;
-    })(m1_M2_private || (m1_M2_private = {}));
-    //export declare module "m1_M3_public" {
-    //    export function f1();
-    //    export class c1 {
-    //    }
-    //    export var v1: { new (): c1; };
-    //    export var v2: c1;
-    //}
-    //declare module "m1_M4_private" {
-    //    export function f1();
-    //    export class c1 {
-    //    }
-    //    export var v1: { new (): c1; };
-    //    export var v2: c1;
-    //}
-    var m1_im1_private = m1_M1_public;
-    m1.m1_im1_private_v1_public = m1_im1_private.c1;
-    m1.m1_im1_private_v2_public = new m1_im1_private.c1();
-    m1.m1_im1_private_v3_public = m1_im1_private.f1;
-    m1.m1_im1_private_v4_public = m1_im1_private.f1();
-    var m1_im1_private_v1_private = m1_im1_private.c1;
-    var m1_im1_private_v2_private = new m1_im1_private.c1();
-    var m1_im1_private_v3_private = m1_im1_private.f1;
-    var m1_im1_private_v4_private = m1_im1_private.f1();
-    var m1_im2_private = m1_M2_private;
-    m1.m1_im2_private_v1_public = m1_im2_private.c1;
-    m1.m1_im2_private_v2_public = new m1_im2_private.c1();
-    m1.m1_im2_private_v3_public = m1_im2_private.f1;
-    m1.m1_im2_private_v4_public = m1_im2_private.f1();
-    var m1_im2_private_v1_private = m1_im2_private.c1;
-    var m1_im2_private_v2_private = new m1_im2_private.c1();
-    var m1_im2_private_v3_private = m1_im2_private.f1;
-    var m1_im2_private_v4_private = m1_im2_private.f1();
-    //import m1_im3_private = require("m1_M3_public");
-    //export var m1_im3_private_v1_public = m1_im3_private.c1;
-    //export var m1_im3_private_v2_public = new m1_im3_private.c1();
-    //export var m1_im3_private_v3_public = m1_im3_private.f1;
-    //export var m1_im3_private_v4_public = m1_im3_private.f1();
-    //var m1_im3_private_v1_private = m1_im3_private.c1;
-    //var m1_im3_private_v2_private = new m1_im3_private.c1();
-    //var m1_im3_private_v3_private = m1_im3_private.f1;
-    //var m1_im3_private_v4_private = m1_im3_private.f1();
-    //import m1_im4_private = require("m1_M4_private");
-    //export var m1_im4_private_v1_public = m1_im4_private.c1;
-    //export var m1_im4_private_v2_public = new m1_im4_private.c1();
-    //export var m1_im4_private_v3_public = m1_im4_private.f1;
-    //export var m1_im4_private_v4_public = m1_im4_private.f1();
-    //var m1_im4_private_v1_private = m1_im4_private.c1;
-    //var m1_im4_private_v2_private = new m1_im4_private.c1();
-    //var m1_im4_private_v3_private = m1_im4_private.f1;
-    //var m1_im4_private_v4_private = m1_im4_private.f1();
-    m1.m1_im1_public = m1_M1_public;
-    m1.m1_im2_public = m1_M2_private;
-})(exports.m1 || (exports.m1 = {}));
-var m1 = exports.m1;
-var m2;
-(function (m2) {
-    (function (m2_M1_public) {
-        var c1 = (function () {
-            function c1() {
-            }
-            return c1;
-        })();
-        m2_M1_public.c1 = c1;
-        function f1() {
-            return new c1;
-        }
-        m2_M1_public.f1 = f1;
-        m2_M1_public.v1 = c1;
-        m2_M1_public.v2;
-    })(m2.m2_M1_public || (m2.m2_M1_public = {}));
-    var m2_M1_public = m2.m2_M1_public;
-    var m2_M2_private;
-    (function (m2_M2_private) {
-        var c1 = (function () {
-            function c1() {
-            }
-            return c1;
-        })();
-        m2_M2_private.c1 = c1;
-        function f1() {
-            return new c1;
-        }
-        m2_M2_private.f1 = f1;
-        m2_M2_private.v1 = c1;
-        m2_M2_private.v2;
-    })(m2_M2_private || (m2_M2_private = {}));
-    //export declare module "m2_M3_public" {
-    //    export function f1();
-    //    export class c1 {
-    //    }
-    //    export var v1: { new (): c1; };
-    //    export var v2: c1;
-    //}
-    //declare module "m2_M4_private" {
-    //    export function f1();
-    //    export class c1 {
-    //    }
-    //    export var v1: { new (): c1; };
-    //    export var v2: c1;
-    //}
-    var m1_im1_private = m2_M1_public;
-    m2.m1_im1_private_v1_public = m1_im1_private.c1;
-    m2.m1_im1_private_v2_public = new m1_im1_private.c1();
-    m2.m1_im1_private_v3_public = m1_im1_private.f1;
-    m2.m1_im1_private_v4_public = m1_im1_private.f1();
-    var m1_im1_private_v1_private = m1_im1_private.c1;
-    var m1_im1_private_v2_private = new m1_im1_private.c1();
-    var m1_im1_private_v3_private = m1_im1_private.f1;
-    var m1_im1_private_v4_private = m1_im1_private.f1();
-    var m1_im2_private = m2_M2_private;
-    m2.m1_im2_private_v1_public = m1_im2_private.c1;
-    m2.m1_im2_private_v2_public = new m1_im2_private.c1();
-    m2.m1_im2_private_v3_public = m1_im2_private.f1;
-    m2.m1_im2_private_v4_public = m1_im2_private.f1();
-    var m1_im2_private_v1_private = m1_im2_private.c1;
-    var m1_im2_private_v2_private = new m1_im2_private.c1();
-    var m1_im2_private_v3_private = m1_im2_private.f1;
-    var m1_im2_private_v4_private = m1_im2_private.f1();
-    //import m1_im3_private = require("m2_M3_public");
-    //export var m1_im3_private_v1_public = m1_im3_private.c1;
-    //export var m1_im3_private_v2_public = new m1_im3_private.c1();
-    //export var m1_im3_private_v3_public = m1_im3_private.f1;
-    //export var m1_im3_private_v4_public = m1_im3_private.f1();
-    //var m1_im3_private_v1_private = m1_im3_private.c1;
-    //var m1_im3_private_v2_private = new m1_im3_private.c1();
-    //var m1_im3_private_v3_private = m1_im3_private.f1;
-    //var m1_im3_private_v4_private = m1_im3_private.f1();
-    //import m1_im4_private = require("m2_M4_private");
-    //export var m1_im4_private_v1_public = m1_im4_private.c1;
-    //export var m1_im4_private_v2_public = new m1_im4_private.c1();
-    //export var m1_im4_private_v3_public = m1_im4_private.f1;
-    //export var m1_im4_private_v4_public = m1_im4_private.f1();
-    //var m1_im4_private_v1_private = m1_im4_private.c1;
-    //var m1_im4_private_v2_private = new m1_im4_private.c1();
-    //var m1_im4_private_v3_private = m1_im4_private.f1;
-    //var m1_im4_private_v4_private = m1_im4_private.f1();
-    // Parse error to export module
-    m2.m1_im1_public = m2_M1_public;
-    m2.m1_im2_public = m2_M2_private;
-})(m2 || (m2 = {}));
-(function (glo_M1_public) {
-    var c1 = (function () {
-        function c1() {
-        }
-        return c1;
-    })();
-    glo_M1_public.c1 = c1;
-    function f1() {
-        return new c1;
-    }
-    glo_M1_public.f1 = f1;
-    glo_M1_public.v1 = c1;
-    glo_M1_public.v2;
-})(exports.glo_M1_public || (exports.glo_M1_public = {}));
-var glo_M1_public = exports.glo_M1_public;
-//export declare module "glo_M2_public" {
-//    export function f1();
-//    export class c1 {
-//    }
-//    export var v1: { new (): c1; };
-//    export var v2: c1;
-//}
-(function (glo_M3_private) {
-    var c1 = (function () {
-        function c1() {
-        }
-        return c1;
-    })();
-    glo_M3_private.c1 = c1;
-    function f1() {
-        return new c1;
-    }
-    glo_M3_private.f1 = f1;
-    glo_M3_private.v1 = c1;
-    glo_M3_private.v2;
-})(exports.glo_M3_private || (exports.glo_M3_private = {}));
-var glo_M3_private = exports.glo_M3_private;
-//export declare module "glo_M4_private" {
-//    export function f1();
-//    export class c1 {
-//    }
-//    export var v1: { new (): c1; };
-//    export var v2: c1;
-//}
-var glo_im1_private = glo_M1_public;
-exports.glo_im1_private_v1_public = glo_im1_private.c1;
-exports.glo_im1_private_v2_public = new glo_im1_private.c1();
-exports.glo_im1_private_v3_public = glo_im1_private.f1;
-exports.glo_im1_private_v4_public = glo_im1_private.f1();
-var glo_im1_private_v1_private = glo_im1_private.c1;
-var glo_im1_private_v2_private = new glo_im1_private.c1();
-var glo_im1_private_v3_private = glo_im1_private.f1;
-var glo_im1_private_v4_private = glo_im1_private.f1();
-//import glo_im2_private = require("glo_M2_public");
-//export var glo_im2_private_v1_public = glo_im2_private.c1;
-//export var glo_im2_private_v2_public = new glo_im2_private.c1();
-//export var glo_im2_private_v3_public = glo_im2_private.f1;
-//export var glo_im2_private_v4_public = glo_im2_private.f1();
-//var glo_im2_private_v1_private = glo_im2_private.c1;
-//var glo_im2_private_v2_private = new glo_im2_private.c1();
-//var glo_im2_private_v3_private = glo_im2_private.f1;
-//var glo_im2_private_v4_private = glo_im2_private.f1();
-var glo_im3_private = glo_M3_private;
-exports.glo_im3_private_v1_public = glo_im3_private.c1;
-exports.glo_im3_private_v2_public = new glo_im3_private.c1();
-exports.glo_im3_private_v3_public = glo_im3_private.f1;
-exports.glo_im3_private_v4_public = glo_im3_private.f1();
-var glo_im3_private_v1_private = glo_im3_private.c1;
-var glo_im3_private_v2_private = new glo_im3_private.c1();
-var glo_im3_private_v3_private = glo_im3_private.f1;
-var glo_im3_private_v4_private = glo_im3_private.f1();
-//import glo_im4_private = require("glo_M4_private");
-//export var glo_im4_private_v1_public = glo_im4_private.c1;
-//export var glo_im4_private_v2_public = new glo_im4_private.c1();
-//export var glo_im4_private_v3_public = glo_im4_private.f1;
-//export var glo_im4_private_v4_public = glo_im4_private.f1();
-//var glo_im4_private_v1_private = glo_im4_private.c1;
-//var glo_im4_private_v2_private = new glo_im4_private.c1();
-//var glo_im4_private_v3_private = glo_im4_private.f1;
-//var glo_im4_private_v4_private = glo_im4_private.f1();
-// Parse error to export module
-exports.glo_im1_public = glo_M1_public;
-exports.glo_im2_public = glo_M3_private;
-//export import glo_im3_public = require("glo_M2_public");
-//export import glo_im4_public = require("glo_M4_private");
-//export declare module "use_glo_M1_public" {
-//    import use_glo_M1_public = glo_M1_public;
-//    export var use_glo_M1_public_v1_public: { new (): use_glo_M1_public.c1; };
-//    export var use_glo_M1_public_v2_public: use_glo_M1_public;
-//    export var use_glo_M1_public_v3_public: () => use_glo_M1_public.c1;
-//    var use_glo_M1_public_v1_private: { new (): use_glo_M1_public.c1; };
-//    var use_glo_M1_public_v2_private: use_glo_M1_public;
-//    var use_glo_M1_public_v3_private: () => use_glo_M1_public.c1;
-//    import use_glo_M2_public = require("glo_M2_public");
-//    export var use_glo_M2_public_v1_public: { new (): use_glo_M2_public.c1; };
-//    export var use_glo_M2_public_v2_public: use_glo_M2_public;
-//    export var use_glo_M2_public_v3_public: () => use_glo_M2_public.c1;
-//    var use_glo_M2_public_v1_private: { new (): use_glo_M2_public.c1; };
-//    var use_glo_M2_public_v2_private: use_glo_M2_public;
-//    var use_glo_M2_public_v3_private: () => use_glo_M2_public.c1;
-//    module m2 {
-//        import errorImport = require("glo_M2_public");
-//        import nonerrorImport = glo_M1_public;
-//        module m5 {
-//            import m5_errorImport = require("glo_M2_public");
-//            import m5_nonerrorImport = glo_M1_public;
-//        }
-//    }
-//}
-//declare module "use_glo_M3_private" {
-//    import use_glo_M3_private = glo_M3_private;
-//    export var use_glo_M3_private_v1_public: { new (): use_glo_M3_private.c1; };
-//    export var use_glo_M3_private_v2_public: use_glo_M3_private;
-//    export var use_glo_M3_private_v3_public: () => use_glo_M3_private.c1;
-//    var use_glo_M3_private_v1_private: { new (): use_glo_M3_private.c1; };
-//    var use_glo_M3_private_v2_private: use_glo_M3_private;
-//    var use_glo_M3_private_v3_private: () => use_glo_M3_private.c1;
-//    import use_glo_M4_private = require("glo_M4_private");
-//    export var use_glo_M4_private_v1_public: { new (): use_glo_M4_private.c1; };
-//    export var use_glo_M4_private_v2_public: use_glo_M4_private;
-//    export var use_glo_M4_private_v3_public: () => use_glo_M4_private.c1;
-//    var use_glo_M4_private_v1_private: { new (): use_glo_M4_private.c1; };
-//    var use_glo_M4_private_v2_private: use_glo_M4_private;
-//    var use_glo_M4_private_v3_private: () => use_glo_M4_private.c1;
-//    module m2 {
-//        import errorImport = require("glo_M4_private");
-//        import nonerrorImport = glo_M3_private;
-//        module m5 {
-//            import m5_errorImport = require("glo_M4_private");
-//            import m5_nonerrorImport = glo_M3_private;
-//        }
-//    }
-//}
-//declare module "anotherParseError" {
-//    module m2 {
-//        declare module "abc" {
-//        }
-//    }
-//    module m2 {
-//        module "abc2" {
-//        }
-//    }
-//    module "abc3" {
-//    }
-//}
-//declare export module "anotherParseError2" {
-//    module m2 {
-//        declare module "abc" {
-//        }
-//    }
-//    module m2 {
-//        module "abc2" {
-//        }
-//    }
-//    module "abc3" {
-//    }
-//}
-var m2;
-(function (m2) {
-    //import m3 = require("use_glo_M1_public");
-    var m4;
-    (function (m4) {
-        var a = 10;
-    })(m4 || (m4 = {}));
-})(m2 || (m2 = {}));
-(function (m3) {
-    //import m3 = require("use_glo_M1_public");
-    var m4;
-    (function (m4) {
-        var a = 10;
-    })(m4 || (m4 = {}));
-})(exports.m3 || (exports.m3 = {}));
-var m3 = exports.m3;
diff --git a/tests/baselines/reference/privacyTypeParameterOfFunction.js b/tests/baselines/reference/privacyTypeParameterOfFunction.js
deleted file mode 100644
index 5505e1a5b3b..00000000000
--- a/tests/baselines/reference/privacyTypeParameterOfFunction.js
+++ /dev/null
@@ -1,245 +0,0 @@
-//// [privacyTypeParameterOfFunction.ts]
-class privateClass {
-}
-
-export class publicClass {
-}
-
-export interface publicInterfaceWithPrivateTypeParameters {
-    // TypeParameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_type_1
-    new <T extends privateClass>(): privateClass; 
-
-    // TypeParameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_type_1
-    <T extends privateClass>(): privateClass;
-
-    // TypeParameter_0_of_method_from_exported_interface_has_or_is_using_private_type_1
-    myMethod<T extends privateClass>(): privateClass;
-}
-
-export interface publicInterfaceWithPublicTypeParameters {
-    new <T extends publicClass>(): publicClass;
-    <T extends publicClass>(): publicClass;
-    myMethod<T extends publicClass>(): publicClass;
-}
-
-interface privateInterfaceWithPrivateTypeParameters {
-    new <T extends privateClass>(): privateClass;
-    <T extends privateClass>(): privateClass;
-    myMethod<T extends privateClass>(): privateClass;
-}
-
-interface privateInterfaceWithPublicTypeParameters {
-    new <T extends publicClass>(): publicClass;
-    <T extends publicClass>(): publicClass;
-    myMethod<T extends publicClass>(): publicClass;
-}
-
-export class publicClassWithWithPrivateTypeParameters {
-    // TypeParameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_type_1
-    static myPublicStaticMethod<T extends privateClass>() {
-    }
-    private static myPrivateStaticMethod<T extends privateClass>() { // No error
-    }
-    // TypeParameter_0_of_public_method_from_exported_class_has_or_is_using_private_type_1
-    myPublicMethod<T extends privateClass>() {
-    }
-    private myPrivateMethod<T extends privateClass>() { // No error
-    }
-}
-
-export class publicClassWithWithPublicTypeParameters {
-    static myPublicStaticMethod<T extends publicClass>() {
-    }
-    private static myPrivateStaticMethod<T extends publicClass>() { 
-    }
-    myPublicMethod<T extends publicClass>() {
-    }
-    private myPrivateMethod<T extends publicClass>() {
-    }
-}
-
-class privateClassWithWithPrivateTypeParameters {
-    static myPublicStaticMethod<T extends privateClass>() {
-    }
-    private static myPrivateStaticMethod<T extends privateClass>() { // No error
-    }
-    myPublicMethod<T extends privateClass>() {
-    }
-    private myPrivateMethod<T extends privateClass>() { // No error
-    }
-}
-
-class privateClassWithWithPublicTypeParameters {
-    static myPublicStaticMethod<T extends publicClass>() {
-    }
-    private static myPrivateStaticMethod<T extends publicClass>() {
-    }
-    myPublicMethod<T extends publicClass>() {
-    }
-    private myPrivateMethod<T extends publicClass>() {
-    }
-}
-
-// TypeParameter_0_of_exported_function_has_or_is_using_private_type_1
-export function publicFunctionWithPrivateTypeParameters<T extends privateClass>() {
-}
-
-export function publicFunctionWithPublicTypeParameters<T extends publicClass>() {
-}
-
-function privateFunctionWithPrivateTypeParameters<T extends privateClass>() {
-}
-
-function privateFunctionWithPublicTypeParameters<T extends publicClass>() {
-}
-
-export interface publicInterfaceWithPublicTypeParametersWithoutExtends {
-    new <T>(): publicClass;
-    <T>(): publicClass;
-    myMethod<T>(): publicClass;
-}
-
-interface privateInterfaceWithPublicTypeParametersWithoutExtends {
-    new <T>(): publicClass;
-    <T>(): publicClass;
-    myMethod<T>(): publicClass;
-}
-
-export class publicClassWithWithPublicTypeParametersWithoutExtends {
-    static myPublicStaticMethod<T>() {
-    }
-    private static myPrivateStaticMethod<T>() {
-    }
-    myPublicMethod<T>() {
-    }
-    private myPrivateMethod<T>() {
-    }
-}
-class privateClassWithWithPublicTypeParametersWithoutExtends {
-    static myPublicStaticMethod<T>() {
-    }
-    private static myPrivateStaticMethod<T>() {
-    }
-    myPublicMethod<T>() {
-    }
-    private myPrivateMethod<T>() {
-    }
-}
-
-export function publicFunctionWithPublicTypeParametersWithoutExtends<T>() {
-}
-
-function privateFunctionWithPublicTypeParametersWithoutExtends<T>() {
-}
-
-//// [privacyTypeParameterOfFunction.js]
-var privateClass = (function () {
-    function privateClass() {
-    }
-    return privateClass;
-})();
-var publicClass = (function () {
-    function publicClass() {
-    }
-    return publicClass;
-})();
-exports.publicClass = publicClass;
-var publicClassWithWithPrivateTypeParameters = (function () {
-    function publicClassWithWithPrivateTypeParameters() {
-    }
-    // TypeParameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_type_1
-    publicClassWithWithPrivateTypeParameters.myPublicStaticMethod = function () {
-    };
-    publicClassWithWithPrivateTypeParameters.myPrivateStaticMethod = function () {
-    };
-    // TypeParameter_0_of_public_method_from_exported_class_has_or_is_using_private_type_1
-    publicClassWithWithPrivateTypeParameters.prototype.myPublicMethod = function () {
-    };
-    publicClassWithWithPrivateTypeParameters.prototype.myPrivateMethod = function () {
-    };
-    return publicClassWithWithPrivateTypeParameters;
-})();
-exports.publicClassWithWithPrivateTypeParameters = publicClassWithWithPrivateTypeParameters;
-var publicClassWithWithPublicTypeParameters = (function () {
-    function publicClassWithWithPublicTypeParameters() {
-    }
-    publicClassWithWithPublicTypeParameters.myPublicStaticMethod = function () {
-    };
-    publicClassWithWithPublicTypeParameters.myPrivateStaticMethod = function () {
-    };
-    publicClassWithWithPublicTypeParameters.prototype.myPublicMethod = function () {
-    };
-    publicClassWithWithPublicTypeParameters.prototype.myPrivateMethod = function () {
-    };
-    return publicClassWithWithPublicTypeParameters;
-})();
-exports.publicClassWithWithPublicTypeParameters = publicClassWithWithPublicTypeParameters;
-var privateClassWithWithPrivateTypeParameters = (function () {
-    function privateClassWithWithPrivateTypeParameters() {
-    }
-    privateClassWithWithPrivateTypeParameters.myPublicStaticMethod = function () {
-    };
-    privateClassWithWithPrivateTypeParameters.myPrivateStaticMethod = function () {
-    };
-    privateClassWithWithPrivateTypeParameters.prototype.myPublicMethod = function () {
-    };
-    privateClassWithWithPrivateTypeParameters.prototype.myPrivateMethod = function () {
-    };
-    return privateClassWithWithPrivateTypeParameters;
-})();
-var privateClassWithWithPublicTypeParameters = (function () {
-    function privateClassWithWithPublicTypeParameters() {
-    }
-    privateClassWithWithPublicTypeParameters.myPublicStaticMethod = function () {
-    };
-    privateClassWithWithPublicTypeParameters.myPrivateStaticMethod = function () {
-    };
-    privateClassWithWithPublicTypeParameters.prototype.myPublicMethod = function () {
-    };
-    privateClassWithWithPublicTypeParameters.prototype.myPrivateMethod = function () {
-    };
-    return privateClassWithWithPublicTypeParameters;
-})();
-// TypeParameter_0_of_exported_function_has_or_is_using_private_type_1
-function publicFunctionWithPrivateTypeParameters() {
-}
-exports.publicFunctionWithPrivateTypeParameters = publicFunctionWithPrivateTypeParameters;
-function publicFunctionWithPublicTypeParameters() {
-}
-exports.publicFunctionWithPublicTypeParameters = publicFunctionWithPublicTypeParameters;
-function privateFunctionWithPrivateTypeParameters() {
-}
-function privateFunctionWithPublicTypeParameters() {
-}
-var publicClassWithWithPublicTypeParametersWithoutExtends = (function () {
-    function publicClassWithWithPublicTypeParametersWithoutExtends() {
-    }
-    publicClassWithWithPublicTypeParametersWithoutExtends.myPublicStaticMethod = function () {
-    };
-    publicClassWithWithPublicTypeParametersWithoutExtends.myPrivateStaticMethod = function () {
-    };
-    publicClassWithWithPublicTypeParametersWithoutExtends.prototype.myPublicMethod = function () {
-    };
-    publicClassWithWithPublicTypeParametersWithoutExtends.prototype.myPrivateMethod = function () {
-    };
-    return publicClassWithWithPublicTypeParametersWithoutExtends;
-})();
-exports.publicClassWithWithPublicTypeParametersWithoutExtends = publicClassWithWithPublicTypeParametersWithoutExtends;
-var privateClassWithWithPublicTypeParametersWithoutExtends = (function () {
-    function privateClassWithWithPublicTypeParametersWithoutExtends() {
-    }
-    privateClassWithWithPublicTypeParametersWithoutExtends.myPublicStaticMethod = function () {
-    };
-    privateClassWithWithPublicTypeParametersWithoutExtends.myPrivateStaticMethod = function () {
-    };
-    privateClassWithWithPublicTypeParametersWithoutExtends.prototype.myPublicMethod = function () {
-    };
-    privateClassWithWithPublicTypeParametersWithoutExtends.prototype.myPrivateMethod = function () {
-    };
-    return privateClassWithWithPublicTypeParametersWithoutExtends;
-})();
-function publicFunctionWithPublicTypeParametersWithoutExtends() {
-}
-exports.publicFunctionWithPublicTypeParametersWithoutExtends = publicFunctionWithPublicTypeParametersWithoutExtends;
-function privateFunctionWithPublicTypeParametersWithoutExtends() {
-}
diff --git a/tests/baselines/reference/privacyTypeParametersOfClass.js b/tests/baselines/reference/privacyTypeParametersOfClass.js
deleted file mode 100644
index c76eaa67851..00000000000
--- a/tests/baselines/reference/privacyTypeParametersOfClass.js
+++ /dev/null
@@ -1,109 +0,0 @@
-//// [privacyTypeParametersOfClass.ts]
-class privateClass {
-}
-
-export class publicClass {
-}
-
-// TypeParameter_0_of_exported_class_1_has_or_is_using_private_type_2
-export class publicClassWithPrivateTypeParameters<T extends privateClass> {
-    myMethod(val: T): T { // Error
-        return val;
-    }
-}
-
-export class publicClassWithPublicTypeParameters<T extends publicClass> {
-    myMethod(val: T): T { // No Error
-        return val;
-    }
-}
-
-class privateClassWithPrivateTypeParameters<T extends privateClass> {
-    myMethod(val: T): T { // No Error
-        return val;
-    }
-}
-
-class privateClassWithPublicTypeParameters<T extends publicClass> {
-    myMethod(val: T): T { // No Error
-        return val;
-    }
-}
-
-export class publicClassWithPublicTypeParametersWithoutExtends<T> {
-    myMethod(val: T): T { // No Error
-        return val;
-    }
-}
-
-class privateClassWithPublicTypeParametersWithoutExtends<T> {
-    myMethod(val: T): T { // No Error
-        return val;
-    }
-}
-
-
-//// [privacyTypeParametersOfClass.js]
-var privateClass = (function () {
-    function privateClass() {
-    }
-    return privateClass;
-})();
-var publicClass = (function () {
-    function publicClass() {
-    }
-    return publicClass;
-})();
-exports.publicClass = publicClass;
-// TypeParameter_0_of_exported_class_1_has_or_is_using_private_type_2
-var publicClassWithPrivateTypeParameters = (function () {
-    function publicClassWithPrivateTypeParameters() {
-    }
-    publicClassWithPrivateTypeParameters.prototype.myMethod = function (val) {
-        return val;
-    };
-    return publicClassWithPrivateTypeParameters;
-})();
-exports.publicClassWithPrivateTypeParameters = publicClassWithPrivateTypeParameters;
-var publicClassWithPublicTypeParameters = (function () {
-    function publicClassWithPublicTypeParameters() {
-    }
-    publicClassWithPublicTypeParameters.prototype.myMethod = function (val) {
-        return val;
-    };
-    return publicClassWithPublicTypeParameters;
-})();
-exports.publicClassWithPublicTypeParameters = publicClassWithPublicTypeParameters;
-var privateClassWithPrivateTypeParameters = (function () {
-    function privateClassWithPrivateTypeParameters() {
-    }
-    privateClassWithPrivateTypeParameters.prototype.myMethod = function (val) {
-        return val;
-    };
-    return privateClassWithPrivateTypeParameters;
-})();
-var privateClassWithPublicTypeParameters = (function () {
-    function privateClassWithPublicTypeParameters() {
-    }
-    privateClassWithPublicTypeParameters.prototype.myMethod = function (val) {
-        return val;
-    };
-    return privateClassWithPublicTypeParameters;
-})();
-var publicClassWithPublicTypeParametersWithoutExtends = (function () {
-    function publicClassWithPublicTypeParametersWithoutExtends() {
-    }
-    publicClassWithPublicTypeParametersWithoutExtends.prototype.myMethod = function (val) {
-        return val;
-    };
-    return publicClassWithPublicTypeParametersWithoutExtends;
-})();
-exports.publicClassWithPublicTypeParametersWithoutExtends = publicClassWithPublicTypeParametersWithoutExtends;
-var privateClassWithPublicTypeParametersWithoutExtends = (function () {
-    function privateClassWithPublicTypeParametersWithoutExtends() {
-    }
-    privateClassWithPublicTypeParametersWithoutExtends.prototype.myMethod = function (val) {
-        return val;
-    };
-    return privateClassWithPublicTypeParametersWithoutExtends;
-})();
diff --git a/tests/baselines/reference/privacyVarDeclFile.js b/tests/baselines/reference/privacyVarDeclFile.js
deleted file mode 100644
index 3be0d92e397..00000000000
--- a/tests/baselines/reference/privacyVarDeclFile.js
+++ /dev/null
@@ -1,702 +0,0 @@
-//// [tests/cases/compiler/privacyVarDeclFile.ts] ////
-
-//// [privacyVarDeclFile_externalModule.ts]
-
-class privateClass {
-}
-
-export class publicClass {
-}
-
-export interface publicInterfaceWithPrivatePropertyTypes {
-    myProperty: privateClass;  // Error
-}
-
-export interface publicInterfaceWithPublicPropertyTypes {
-    myProperty: publicClass;
-}
-
-interface privateInterfaceWithPrivatePropertyTypes {
-    myProperty: privateClass;
-}
-
-interface privateInterfaceWithPublicPropertyTypes {
-    myProperty: publicClass;
-}
-
-export class publicClassWithWithPrivatePropertyTypes {
-    static myPublicStaticProperty: privateClass; // Error
-    private static myPrivateStaticProperty: privateClass;
-    myPublicProperty: privateClass; // Error
-    private myPrivateProperty: privateClass;
-}
-
-export class publicClassWithWithPublicPropertyTypes {
-    static myPublicStaticProperty: publicClass;
-    private static myPrivateStaticProperty: publicClass;
-    myPublicProperty: publicClass;
-    private myPrivateProperty: publicClass;
-}
-
-class privateClassWithWithPrivatePropertyTypes {
-    static myPublicStaticProperty: privateClass;
-    private static myPrivateStaticProperty: privateClass;
-    myPublicProperty: privateClass;
-    private myPrivateProperty: privateClass;
-}
-
-class privateClassWithWithPublicPropertyTypes {
-    static myPublicStaticProperty: publicClass;
-    private static myPrivateStaticProperty: publicClass;
-    myPublicProperty: publicClass;
-    private myPrivateProperty: publicClass;
-}
-
-export var publicVarWithPrivatePropertyTypes: privateClass; // Error
-export var publicVarWithPublicPropertyTypes: publicClass;
-var privateVarWithPrivatePropertyTypes: privateClass;
-var privateVarWithPublicPropertyTypes: publicClass;
-
-export declare var publicAmbientVarWithPrivatePropertyTypes: privateClass; // Error
-export declare var publicAmbientVarWithPublicPropertyTypes: publicClass;
-declare var privateAmbientVarWithPrivatePropertyTypes: privateClass;
-declare var privateAmbientVarWithPublicPropertyTypes: publicClass;
-
-export interface publicInterfaceWithPrivateModulePropertyTypes {
-    myProperty: privateModule.publicClass; // Error
-}
-export class publicClassWithPrivateModulePropertyTypes {
-    static myPublicStaticProperty: privateModule.publicClass; // Error
-    myPublicProperty: privateModule.publicClass; // Error
-}
-export var publicVarWithPrivateModulePropertyTypes: privateModule.publicClass; // Error
-export declare var publicAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass; // Error
-
-interface privateInterfaceWithPrivateModulePropertyTypes {
-    myProperty: privateModule.publicClass;
-}
-class privateClassWithPrivateModulePropertyTypes {
-    static myPublicStaticProperty: privateModule.publicClass;
-    myPublicProperty: privateModule.publicClass;
-}
-var privateVarWithPrivateModulePropertyTypes: privateModule.publicClass;
-declare var privateAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass;
-
-export module publicModule {
-    class privateClass {
-    }
-
-    export class publicClass {
-    }
-
-    export interface publicInterfaceWithPrivatePropertyTypes {
-        myProperty: privateClass;  // Error
-    }
-
-    export interface publicInterfaceWithPublicPropertyTypes {
-        myProperty: publicClass;
-    }
-
-    interface privateInterfaceWithPrivatePropertyTypes {
-        myProperty: privateClass;
-    }
-
-    interface privateInterfaceWithPublicPropertyTypes {
-        myProperty: publicClass;
-    }
-
-    export class publicClassWithWithPrivatePropertyTypes {
-        static myPublicStaticProperty: privateClass; // Error
-        private static myPrivateStaticProperty: privateClass;
-        myPublicProperty: privateClass; // Error
-        private myPrivateProperty: privateClass;
-    }
-
-    export class publicClassWithWithPublicPropertyTypes {
-        static myPublicStaticProperty: publicClass;
-        private static myPrivateStaticProperty: publicClass;
-        myPublicProperty: publicClass;
-        private myPrivateProperty: publicClass;
-    }
-
-    class privateClassWithWithPrivatePropertyTypes {
-        static myPublicStaticProperty: privateClass;
-        private static myPrivateStaticProperty: privateClass;
-        myPublicProperty: privateClass;
-        private myPrivateProperty: privateClass;
-    }
-
-    class privateClassWithWithPublicPropertyTypes {
-        static myPublicStaticProperty: publicClass;
-        private static myPrivateStaticProperty: publicClass;
-        myPublicProperty: publicClass;
-        private myPrivateProperty: publicClass;
-    }
-
-    export var publicVarWithPrivatePropertyTypes: privateClass; // Error
-    export var publicVarWithPublicPropertyTypes: publicClass;
-    var privateVarWithPrivatePropertyTypes: privateClass;
-    var privateVarWithPublicPropertyTypes: publicClass;
-
-    export declare var publicAmbientVarWithPrivatePropertyTypes: privateClass; // Error
-    export declare var publicAmbientVarWithPublicPropertyTypes: publicClass;
-    declare var privateAmbientVarWithPrivatePropertyTypes: privateClass;
-    declare var privateAmbientVarWithPublicPropertyTypes: publicClass;
-
-    export interface publicInterfaceWithPrivateModulePropertyTypes {
-        myProperty: privateModule.publicClass; // Error
-    }
-    export class publicClassWithPrivateModulePropertyTypes {
-        static myPublicStaticProperty: privateModule.publicClass; // Error
-        myPublicProperty: privateModule.publicClass; // Error
-    }
-    export var publicVarWithPrivateModulePropertyTypes: privateModule.publicClass; // Error
-    export declare var publicAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass; // Error
-
-    interface privateInterfaceWithPrivateModulePropertyTypes {
-        myProperty: privateModule.publicClass;
-    }
-    class privateClassWithPrivateModulePropertyTypes {
-        static myPublicStaticProperty: privateModule.publicClass;
-        myPublicProperty: privateModule.publicClass;
-    }
-    var privateVarWithPrivateModulePropertyTypes: privateModule.publicClass;
-    declare var privateAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass;
-}
-
-module privateModule {
-    class privateClass {
-    }
-
-    export class publicClass {
-    }
-
-    export interface publicInterfaceWithPrivatePropertyTypes {
-        myProperty: privateClass;  
-    }
-
-    export interface publicInterfaceWithPublicPropertyTypes {
-        myProperty: publicClass;
-    }
-
-    interface privateInterfaceWithPrivatePropertyTypes {
-        myProperty: privateClass;
-    }
-
-    interface privateInterfaceWithPublicPropertyTypes {
-        myProperty: publicClass;
-    }
-
-    export class publicClassWithWithPrivatePropertyTypes {
-        static myPublicStaticProperty: privateClass; 
-        private static myPrivateStaticProperty: privateClass;
-        myPublicProperty: privateClass; 
-        private myPrivateProperty: privateClass;
-    }
-
-    export class publicClassWithWithPublicPropertyTypes {
-        static myPublicStaticProperty: publicClass;
-        private static myPrivateStaticProperty: publicClass;
-        myPublicProperty: publicClass;
-        private myPrivateProperty: publicClass;
-    }
-
-    class privateClassWithWithPrivatePropertyTypes {
-        static myPublicStaticProperty: privateClass;
-        private static myPrivateStaticProperty: privateClass;
-        myPublicProperty: privateClass;
-        private myPrivateProperty: privateClass;
-    }
-
-    class privateClassWithWithPublicPropertyTypes {
-        static myPublicStaticProperty: publicClass;
-        private static myPrivateStaticProperty: publicClass;
-        myPublicProperty: publicClass;
-        private myPrivateProperty: publicClass;
-    }
-
-    export var publicVarWithPrivatePropertyTypes: privateClass; 
-    export var publicVarWithPublicPropertyTypes: publicClass;
-    var privateVarWithPrivatePropertyTypes: privateClass;
-    var privateVarWithPublicPropertyTypes: publicClass;
-
-    export declare var publicAmbientVarWithPrivatePropertyTypes: privateClass; 
-    export declare var publicAmbientVarWithPublicPropertyTypes: publicClass;
-    declare var privateAmbientVarWithPrivatePropertyTypes: privateClass;
-    declare var privateAmbientVarWithPublicPropertyTypes: publicClass;
-
-    export interface publicInterfaceWithPrivateModulePropertyTypes {
-        myProperty: privateModule.publicClass; 
-    }
-    export class publicClassWithPrivateModulePropertyTypes {
-        static myPublicStaticProperty: privateModule.publicClass; 
-        myPublicProperty: privateModule.publicClass; 
-    }
-    export var publicVarWithPrivateModulePropertyTypes: privateModule.publicClass; 
-    export declare var publicAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass;
-
-    interface privateInterfaceWithPrivateModulePropertyTypes {
-        myProperty: privateModule.publicClass;
-    }
-    class privateClassWithPrivateModulePropertyTypes {
-        static myPublicStaticProperty: privateModule.publicClass;
-        myPublicProperty: privateModule.publicClass;
-    }
-    var privateVarWithPrivateModulePropertyTypes: privateModule.publicClass;
-    declare var privateAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass;
-}
-
-//// [privacyVarDeclFile_GlobalFile.ts]
-class publicClassInGlobal {
-}
-interface publicInterfaceWithPublicPropertyTypesInGlobal {
-    myProperty: publicClassInGlobal;
-}
-class publicClassWithWithPublicPropertyTypesInGlobal {
-    static myPublicStaticProperty: publicClassInGlobal;
-    private static myPrivateStaticProperty: publicClassInGlobal;
-    myPublicProperty: publicClassInGlobal;
-    private myPrivateProperty: publicClassInGlobal;
-}
-var publicVarWithPublicPropertyTypesInGlobal: publicClassInGlobal;
-declare var publicAmbientVarWithPublicPropertyTypesInGlobal: publicClassInGlobal;
-
-module publicModuleInGlobal {
-    class privateClass {
-    }
-
-    export class publicClass {
-    }
-
-    module privateModule {
-        class privateClass {
-        }
-
-        export class publicClass {
-        }
-
-        export interface publicInterfaceWithPrivatePropertyTypes {
-            myProperty: privateClass;
-        }
-
-        export interface publicInterfaceWithPublicPropertyTypes {
-            myProperty: publicClass;
-        }
-
-        interface privateInterfaceWithPrivatePropertyTypes {
-            myProperty: privateClass;
-        }
-
-        interface privateInterfaceWithPublicPropertyTypes {
-            myProperty: publicClass;
-        }
-
-        export class publicClassWithWithPrivatePropertyTypes {
-            static myPublicStaticProperty: privateClass;
-            private static myPrivateStaticProperty: privateClass;
-            myPublicProperty: privateClass;
-            private myPrivateProperty: privateClass;
-        }
-
-        export class publicClassWithWithPublicPropertyTypes {
-            static myPublicStaticProperty: publicClass;
-            private static myPrivateStaticProperty: publicClass;
-            myPublicProperty: publicClass;
-            private myPrivateProperty: publicClass;
-        }
-
-        class privateClassWithWithPrivatePropertyTypes {
-            static myPublicStaticProperty: privateClass;
-            private static myPrivateStaticProperty: privateClass;
-            myPublicProperty: privateClass;
-            private myPrivateProperty: privateClass;
-        }
-
-        class privateClassWithWithPublicPropertyTypes {
-            static myPublicStaticProperty: publicClass;
-            private static myPrivateStaticProperty: publicClass;
-            myPublicProperty: publicClass;
-            private myPrivateProperty: publicClass;
-        }
-
-        export var publicVarWithPrivatePropertyTypes: privateClass;
-        export var publicVarWithPublicPropertyTypes: publicClass;
-        var privateVarWithPrivatePropertyTypes: privateClass;
-        var privateVarWithPublicPropertyTypes: publicClass;
-
-        export declare var publicAmbientVarWithPrivatePropertyTypes: privateClass;
-        export declare var publicAmbientVarWithPublicPropertyTypes: publicClass;
-        declare var privateAmbientVarWithPrivatePropertyTypes: privateClass;
-        declare var privateAmbientVarWithPublicPropertyTypes: publicClass;
-
-        export interface publicInterfaceWithPrivateModulePropertyTypes {
-            myProperty: privateModule.publicClass;
-        }
-        export class publicClassWithPrivateModulePropertyTypes {
-            static myPublicStaticProperty: privateModule.publicClass;
-            myPublicProperty: privateModule.publicClass;
-        }
-        export var publicVarWithPrivateModulePropertyTypes: privateModule.publicClass;
-        export declare var publicAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass;
-
-        interface privateInterfaceWithPrivateModulePropertyTypes {
-            myProperty: privateModule.publicClass;
-        }
-        class privateClassWithPrivateModulePropertyTypes {
-            static myPublicStaticProperty: privateModule.publicClass;
-            myPublicProperty: privateModule.publicClass;
-        }
-        var privateVarWithPrivateModulePropertyTypes: privateModule.publicClass;
-        declare var privateAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass;
-    }
-
-    export interface publicInterfaceWithPrivatePropertyTypes {
-        myProperty: privateClass;  // Error
-    }
-
-    export interface publicInterfaceWithPublicPropertyTypes {
-        myProperty: publicClass;
-    }
-
-    interface privateInterfaceWithPrivatePropertyTypes {
-        myProperty: privateClass;
-    }
-
-    interface privateInterfaceWithPublicPropertyTypes {
-        myProperty: publicClass;
-    }
-
-    export class publicClassWithWithPrivatePropertyTypes {
-        static myPublicStaticProperty: privateClass; // Error
-        private static myPrivateStaticProperty: privateClass;
-        myPublicProperty: privateClass; // Error
-        private myPrivateProperty: privateClass;
-    }
-
-    export class publicClassWithWithPublicPropertyTypes {
-        static myPublicStaticProperty: publicClass;
-        private static myPrivateStaticProperty: publicClass;
-        myPublicProperty: publicClass;
-        private myPrivateProperty: publicClass;
-    }
-
-    class privateClassWithWithPrivatePropertyTypes {
-        static myPublicStaticProperty: privateClass;
-        private static myPrivateStaticProperty: privateClass;
-        myPublicProperty: privateClass;
-        private myPrivateProperty: privateClass;
-    }
-
-    class privateClassWithWithPublicPropertyTypes {
-        static myPublicStaticProperty: publicClass;
-        private static myPrivateStaticProperty: publicClass;
-        myPublicProperty: publicClass;
-        private myPrivateProperty: publicClass;
-    }
-
-    export var publicVarWithPrivatePropertyTypes: privateClass; // Error
-    export var publicVarWithPublicPropertyTypes: publicClass;
-    var privateVarWithPrivatePropertyTypes: privateClass;
-    var privateVarWithPublicPropertyTypes: publicClass;
-
-    export declare var publicAmbientVarWithPrivatePropertyTypes: privateClass; // Error
-    export declare var publicAmbientVarWithPublicPropertyTypes: publicClass;
-    declare var privateAmbientVarWithPrivatePropertyTypes: privateClass;
-    declare var privateAmbientVarWithPublicPropertyTypes: publicClass;
-
-    export interface publicInterfaceWithPrivateModulePropertyTypes {
-        myProperty: privateModule.publicClass; // Error
-    }
-    export class publicClassWithPrivateModulePropertyTypes {
-        static myPublicStaticProperty: privateModule.publicClass; // Error
-        myPublicProperty: privateModule.publicClass; // Error
-    }
-    export var publicVarWithPrivateModulePropertyTypes: privateModule.publicClass; // Error
-    export declare var publicAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass; // Error
-
-    interface privateInterfaceWithPrivateModulePropertyTypes {
-        myProperty: privateModule.publicClass;
-    }
-    class privateClassWithPrivateModulePropertyTypes {
-        static myPublicStaticProperty: privateModule.publicClass;
-        myPublicProperty: privateModule.publicClass;
-    }
-    var privateVarWithPrivateModulePropertyTypes: privateModule.publicClass;
-    declare var privateAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass;
-}
-
-//// [privacyVarDeclFile_externalModule.js]
-var privateClass = (function () {
-    function privateClass() {
-    }
-    return privateClass;
-})();
-var publicClass = (function () {
-    function publicClass() {
-    }
-    return publicClass;
-})();
-exports.publicClass = publicClass;
-var publicClassWithWithPrivatePropertyTypes = (function () {
-    function publicClassWithWithPrivatePropertyTypes() {
-    }
-    return publicClassWithWithPrivatePropertyTypes;
-})();
-exports.publicClassWithWithPrivatePropertyTypes = publicClassWithWithPrivatePropertyTypes;
-var publicClassWithWithPublicPropertyTypes = (function () {
-    function publicClassWithWithPublicPropertyTypes() {
-    }
-    return publicClassWithWithPublicPropertyTypes;
-})();
-exports.publicClassWithWithPublicPropertyTypes = publicClassWithWithPublicPropertyTypes;
-var privateClassWithWithPrivatePropertyTypes = (function () {
-    function privateClassWithWithPrivatePropertyTypes() {
-    }
-    return privateClassWithWithPrivatePropertyTypes;
-})();
-var privateClassWithWithPublicPropertyTypes = (function () {
-    function privateClassWithWithPublicPropertyTypes() {
-    }
-    return privateClassWithWithPublicPropertyTypes;
-})();
-exports.publicVarWithPrivatePropertyTypes; // Error
-exports.publicVarWithPublicPropertyTypes;
-var privateVarWithPrivatePropertyTypes;
-var privateVarWithPublicPropertyTypes;
-var publicClassWithPrivateModulePropertyTypes = (function () {
-    function publicClassWithPrivateModulePropertyTypes() {
-    }
-    return publicClassWithPrivateModulePropertyTypes;
-})();
-exports.publicClassWithPrivateModulePropertyTypes = publicClassWithPrivateModulePropertyTypes;
-exports.publicVarWithPrivateModulePropertyTypes; // Error
-var privateClassWithPrivateModulePropertyTypes = (function () {
-    function privateClassWithPrivateModulePropertyTypes() {
-    }
-    return privateClassWithPrivateModulePropertyTypes;
-})();
-var privateVarWithPrivateModulePropertyTypes;
-(function (publicModule) {
-    var privateClass = (function () {
-        function privateClass() {
-        }
-        return privateClass;
-    })();
-    var publicClass = (function () {
-        function publicClass() {
-        }
-        return publicClass;
-    })();
-    publicModule.publicClass = publicClass;
-    var publicClassWithWithPrivatePropertyTypes = (function () {
-        function publicClassWithWithPrivatePropertyTypes() {
-        }
-        return publicClassWithWithPrivatePropertyTypes;
-    })();
-    publicModule.publicClassWithWithPrivatePropertyTypes = publicClassWithWithPrivatePropertyTypes;
-    var publicClassWithWithPublicPropertyTypes = (function () {
-        function publicClassWithWithPublicPropertyTypes() {
-        }
-        return publicClassWithWithPublicPropertyTypes;
-    })();
-    publicModule.publicClassWithWithPublicPropertyTypes = publicClassWithWithPublicPropertyTypes;
-    var privateClassWithWithPrivatePropertyTypes = (function () {
-        function privateClassWithWithPrivatePropertyTypes() {
-        }
-        return privateClassWithWithPrivatePropertyTypes;
-    })();
-    var privateClassWithWithPublicPropertyTypes = (function () {
-        function privateClassWithWithPublicPropertyTypes() {
-        }
-        return privateClassWithWithPublicPropertyTypes;
-    })();
-    publicModule.publicVarWithPrivatePropertyTypes; // Error
-    publicModule.publicVarWithPublicPropertyTypes;
-    var privateVarWithPrivatePropertyTypes;
-    var privateVarWithPublicPropertyTypes;
-    var publicClassWithPrivateModulePropertyTypes = (function () {
-        function publicClassWithPrivateModulePropertyTypes() {
-        }
-        return publicClassWithPrivateModulePropertyTypes;
-    })();
-    publicModule.publicClassWithPrivateModulePropertyTypes = publicClassWithPrivateModulePropertyTypes;
-    publicModule.publicVarWithPrivateModulePropertyTypes; // Error
-    var privateClassWithPrivateModulePropertyTypes = (function () {
-        function privateClassWithPrivateModulePropertyTypes() {
-        }
-        return privateClassWithPrivateModulePropertyTypes;
-    })();
-    var privateVarWithPrivateModulePropertyTypes;
-})(exports.publicModule || (exports.publicModule = {}));
-var publicModule = exports.publicModule;
-var privateModule;
-(function (privateModule) {
-    var privateClass = (function () {
-        function privateClass() {
-        }
-        return privateClass;
-    })();
-    var publicClass = (function () {
-        function publicClass() {
-        }
-        return publicClass;
-    })();
-    privateModule.publicClass = publicClass;
-    var publicClassWithWithPrivatePropertyTypes = (function () {
-        function publicClassWithWithPrivatePropertyTypes() {
-        }
-        return publicClassWithWithPrivatePropertyTypes;
-    })();
-    privateModule.publicClassWithWithPrivatePropertyTypes = publicClassWithWithPrivatePropertyTypes;
-    var publicClassWithWithPublicPropertyTypes = (function () {
-        function publicClassWithWithPublicPropertyTypes() {
-        }
-        return publicClassWithWithPublicPropertyTypes;
-    })();
-    privateModule.publicClassWithWithPublicPropertyTypes = publicClassWithWithPublicPropertyTypes;
-    var privateClassWithWithPrivatePropertyTypes = (function () {
-        function privateClassWithWithPrivatePropertyTypes() {
-        }
-        return privateClassWithWithPrivatePropertyTypes;
-    })();
-    var privateClassWithWithPublicPropertyTypes = (function () {
-        function privateClassWithWithPublicPropertyTypes() {
-        }
-        return privateClassWithWithPublicPropertyTypes;
-    })();
-    privateModule.publicVarWithPrivatePropertyTypes;
-    privateModule.publicVarWithPublicPropertyTypes;
-    var privateVarWithPrivatePropertyTypes;
-    var privateVarWithPublicPropertyTypes;
-    var publicClassWithPrivateModulePropertyTypes = (function () {
-        function publicClassWithPrivateModulePropertyTypes() {
-        }
-        return publicClassWithPrivateModulePropertyTypes;
-    })();
-    privateModule.publicClassWithPrivateModulePropertyTypes = publicClassWithPrivateModulePropertyTypes;
-    privateModule.publicVarWithPrivateModulePropertyTypes;
-    var privateClassWithPrivateModulePropertyTypes = (function () {
-        function privateClassWithPrivateModulePropertyTypes() {
-        }
-        return privateClassWithPrivateModulePropertyTypes;
-    })();
-    var privateVarWithPrivateModulePropertyTypes;
-})(privateModule || (privateModule = {}));
-//// [privacyVarDeclFile_GlobalFile.js]
-var publicClassInGlobal = (function () {
-    function publicClassInGlobal() {
-    }
-    return publicClassInGlobal;
-})();
-var publicClassWithWithPublicPropertyTypesInGlobal = (function () {
-    function publicClassWithWithPublicPropertyTypesInGlobal() {
-    }
-    return publicClassWithWithPublicPropertyTypesInGlobal;
-})();
-var publicVarWithPublicPropertyTypesInGlobal;
-var publicModuleInGlobal;
-(function (publicModuleInGlobal) {
-    var privateClass = (function () {
-        function privateClass() {
-        }
-        return privateClass;
-    })();
-    var publicClass = (function () {
-        function publicClass() {
-        }
-        return publicClass;
-    })();
-    publicModuleInGlobal.publicClass = publicClass;
-    var privateModule;
-    (function (privateModule) {
-        var privateClass = (function () {
-            function privateClass() {
-            }
-            return privateClass;
-        })();
-        var publicClass = (function () {
-            function publicClass() {
-            }
-            return publicClass;
-        })();
-        privateModule.publicClass = publicClass;
-        var publicClassWithWithPrivatePropertyTypes = (function () {
-            function publicClassWithWithPrivatePropertyTypes() {
-            }
-            return publicClassWithWithPrivatePropertyTypes;
-        })();
-        privateModule.publicClassWithWithPrivatePropertyTypes = publicClassWithWithPrivatePropertyTypes;
-        var publicClassWithWithPublicPropertyTypes = (function () {
-            function publicClassWithWithPublicPropertyTypes() {
-            }
-            return publicClassWithWithPublicPropertyTypes;
-        })();
-        privateModule.publicClassWithWithPublicPropertyTypes = publicClassWithWithPublicPropertyTypes;
-        var privateClassWithWithPrivatePropertyTypes = (function () {
-            function privateClassWithWithPrivatePropertyTypes() {
-            }
-            return privateClassWithWithPrivatePropertyTypes;
-        })();
-        var privateClassWithWithPublicPropertyTypes = (function () {
-            function privateClassWithWithPublicPropertyTypes() {
-            }
-            return privateClassWithWithPublicPropertyTypes;
-        })();
-        privateModule.publicVarWithPrivatePropertyTypes;
-        privateModule.publicVarWithPublicPropertyTypes;
-        var privateVarWithPrivatePropertyTypes;
-        var privateVarWithPublicPropertyTypes;
-        var publicClassWithPrivateModulePropertyTypes = (function () {
-            function publicClassWithPrivateModulePropertyTypes() {
-            }
-            return publicClassWithPrivateModulePropertyTypes;
-        })();
-        privateModule.publicClassWithPrivateModulePropertyTypes = publicClassWithPrivateModulePropertyTypes;
-        privateModule.publicVarWithPrivateModulePropertyTypes;
-        var privateClassWithPrivateModulePropertyTypes = (function () {
-            function privateClassWithPrivateModulePropertyTypes() {
-            }
-            return privateClassWithPrivateModulePropertyTypes;
-        })();
-        var privateVarWithPrivateModulePropertyTypes;
-    })(privateModule || (privateModule = {}));
-    var publicClassWithWithPrivatePropertyTypes = (function () {
-        function publicClassWithWithPrivatePropertyTypes() {
-        }
-        return publicClassWithWithPrivatePropertyTypes;
-    })();
-    publicModuleInGlobal.publicClassWithWithPrivatePropertyTypes = publicClassWithWithPrivatePropertyTypes;
-    var publicClassWithWithPublicPropertyTypes = (function () {
-        function publicClassWithWithPublicPropertyTypes() {
-        }
-        return publicClassWithWithPublicPropertyTypes;
-    })();
-    publicModuleInGlobal.publicClassWithWithPublicPropertyTypes = publicClassWithWithPublicPropertyTypes;
-    var privateClassWithWithPrivatePropertyTypes = (function () {
-        function privateClassWithWithPrivatePropertyTypes() {
-        }
-        return privateClassWithWithPrivatePropertyTypes;
-    })();
-    var privateClassWithWithPublicPropertyTypes = (function () {
-        function privateClassWithWithPublicPropertyTypes() {
-        }
-        return privateClassWithWithPublicPropertyTypes;
-    })();
-    publicModuleInGlobal.publicVarWithPrivatePropertyTypes; // Error
-    publicModuleInGlobal.publicVarWithPublicPropertyTypes;
-    var privateVarWithPrivatePropertyTypes;
-    var privateVarWithPublicPropertyTypes;
-    var publicClassWithPrivateModulePropertyTypes = (function () {
-        function publicClassWithPrivateModulePropertyTypes() {
-        }
-        return publicClassWithPrivateModulePropertyTypes;
-    })();
-    publicModuleInGlobal.publicClassWithPrivateModulePropertyTypes = publicClassWithPrivateModulePropertyTypes;
-    publicModuleInGlobal.publicVarWithPrivateModulePropertyTypes; // Error
-    var privateClassWithPrivateModulePropertyTypes = (function () {
-        function privateClassWithPrivateModulePropertyTypes() {
-        }
-        return privateClassWithPrivateModulePropertyTypes;
-    })();
-    var privateVarWithPrivateModulePropertyTypes;
-})(publicModuleInGlobal || (publicModuleInGlobal = {}));
diff --git a/tests/baselines/reference/promiseChaining.js b/tests/baselines/reference/promiseChaining.js
deleted file mode 100644
index 1d0962d30db..00000000000
--- a/tests/baselines/reference/promiseChaining.js
+++ /dev/null
@@ -1,26 +0,0 @@
-//// [promiseChaining.ts]
-class Chain<T> {
-    constructor(public value: T) { }
-    then<S>(cb: (x: T) => S): Chain<S> {
-        var result = cb(this.value);
-        // should get a fresh type parameter which each then call
-        var z = this.then(x => result)/*S*/.then(x => "abc")/*string*/.then(x => x.length)/*number*/; // No error
-        return new Chain(result);
-    }
-}
-
-
-
-//// [promiseChaining.js]
-var Chain = (function () {
-    function Chain(value) {
-        this.value = value;
-    }
-    Chain.prototype.then = function (cb) {
-        var result = cb(this.value);
-        // should get a fresh type parameter which each then call
-        var z = this.then(function (x) { return result; }).then(function (x) { return "abc"; }).then(function (x) { return x.length; }) /*number*/; // No error
-        return new Chain(result);
-    };
-    return Chain;
-})();
diff --git a/tests/baselines/reference/propertyParameterWithQuestionMark.js b/tests/baselines/reference/propertyParameterWithQuestionMark.js
deleted file mode 100644
index e3b6bd153c2..00000000000
--- a/tests/baselines/reference/propertyParameterWithQuestionMark.js
+++ /dev/null
@@ -1,23 +0,0 @@
-//// [propertyParameterWithQuestionMark.ts]
-class C {
-    constructor(public x?) { }
-}
-
-// x should not be an optional property
-var v: C = {}; // Should fail
-var v2: { x? }
-v = v2; // Should fail
-var v3: { x } = new C; // Should succeed
-
-//// [propertyParameterWithQuestionMark.js]
-var C = (function () {
-    function C(x) {
-        this.x = x;
-    }
-    return C;
-})();
-// x should not be an optional property
-var v = {}; // Should fail
-var v2;
-v = v2; // Should fail
-var v3 = new C; // Should succeed
diff --git a/tests/baselines/reference/sourceMapWithMultipleFilesWithCopyright.js b/tests/baselines/reference/sourceMapWithMultipleFilesWithCopyright.js
deleted file mode 100644
index 189dd306ce5..00000000000
--- a/tests/baselines/reference/sourceMapWithMultipleFilesWithCopyright.js
+++ /dev/null
@@ -1,44 +0,0 @@
-//// [tests/cases/compiler/sourceMapWithMultipleFilesWithCopyright.ts] ////
-
-//// [a.ts]
-/*--------------------------------------------------------------------------
-Copyright 
----------------------------------------------------------------------------*/
-
-var x = {
-    a: 10,
-    b: 20
-};
-
-//// [b.ts]
-/*--------------------------------------------------------------------------
-Copyright 
----------------------------------------------------------------------------*/
-
-///<reference path="a.ts"/>
-var y = x;
-
-//// [a.js]
-/*--------------------------------------------------------------------------
-Copyright
----------------------------------------------------------------------------*/
-var x = {
-    a: 10,
-    b: 20
-};
-/*--------------------------------------------------------------------------
-Copyright
----------------------------------------------------------------------------*/
-///<reference path="a.ts"/>
-var y = x;
-//# sourceMappingURL=a.js.map
-
-//// [a.d.ts]
-declare var x: {
-    a: number;
-    b: number;
-};
-declare var y: {
-    a: number;
-    b: number;
-};
diff --git a/tests/baselines/reference/sourceMapWithMultipleFilesWithCopyright.js.map b/tests/baselines/reference/sourceMapWithMultipleFilesWithCopyright.js.map
deleted file mode 100644
index 59e28d92f90..00000000000
--- a/tests/baselines/reference/sourceMapWithMultipleFilesWithCopyright.js.map
+++ /dev/null
@@ -1,2 +0,0 @@
-//// [a.js.map]
-{"version":3,"file":"a.js","sourceRoot":"","sources":["tests/cases/compiler/a.ts","tests/cases/compiler/b.ts"],"names":[],"mappings":"AAAA;;6EAE6E;AAE7E,IAAI,CAAC,GAAG;IACJ,CAAC,EAAE,EAAE;IACL,CAAC,EAAE,EAAE;CACR,CAAC;ACPF;;6EAE6E;AAG7E,AADA,2BAA2B;IACvB,CAAC,GAAG,CAAC,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapWithMultipleFilesWithCopyright.sourcemap.txt b/tests/baselines/reference/sourceMapWithMultipleFilesWithCopyright.sourcemap.txt
deleted file mode 100644
index 5a87f6c04e8..00000000000
--- a/tests/baselines/reference/sourceMapWithMultipleFilesWithCopyright.sourcemap.txt
+++ /dev/null
@@ -1,134 +0,0 @@
-===================================================================
-JsFile: a.js
-mapUrl: a.js.map
-sourceRoot: 
-sources: tests/cases/compiler/a.ts,tests/cases/compiler/b.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:a.js
-sourceFile:tests/cases/compiler/a.ts
--------------------------------------------------------------------
->>>/*--------------------------------------------------------------------------
-1 >
-2 >^^^^^^^^^^->
-1 >
-1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
----
->>>Copyright
->>>---------------------------------------------------------------------------*/
-1->^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1->/*--------------------------------------------------------------------------
-  >Copyright 
-  >---------------------------------------------------------------------------*/
-1->Emitted(3, 78) Source(3, 78) + SourceIndex(0)
----
->>>var x = {
-1 >
-2 >^^^^
-3 >    ^
-4 >     ^^^
-5 >        ^^^->
-1 >
-  >
-  >
-2 >var 
-3 >    x
-4 >      = 
-1 >Emitted(4, 1) Source(5, 1) + SourceIndex(0)
-2 >Emitted(4, 5) Source(5, 5) + SourceIndex(0)
-3 >Emitted(4, 6) Source(5, 6) + SourceIndex(0)
-4 >Emitted(4, 9) Source(5, 9) + SourceIndex(0)
----
->>>    a: 10,
-1->^^^^
-2 >    ^
-3 >     ^^
-4 >       ^^
-5 >         ^->
-1->{
-  >    
-2 >    a
-3 >     : 
-4 >       10
-1->Emitted(5, 5) Source(6, 5) + SourceIndex(0)
-2 >Emitted(5, 6) Source(6, 6) + SourceIndex(0)
-3 >Emitted(5, 8) Source(6, 8) + SourceIndex(0)
-4 >Emitted(5, 10) Source(6, 10) + SourceIndex(0)
----
->>>    b: 20
-1->^^^^
-2 >    ^
-3 >     ^^
-4 >       ^^
-1->,
-  >    
-2 >    b
-3 >     : 
-4 >       20
-1->Emitted(6, 5) Source(7, 5) + SourceIndex(0)
-2 >Emitted(6, 6) Source(7, 6) + SourceIndex(0)
-3 >Emitted(6, 8) Source(7, 8) + SourceIndex(0)
-4 >Emitted(6, 10) Source(7, 10) + SourceIndex(0)
----
->>>};
-1 >^
-2 > ^
-3 >  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-  >}
-2 > ;
-1 >Emitted(7, 2) Source(8, 2) + SourceIndex(0)
-2 >Emitted(7, 3) Source(8, 3) + SourceIndex(0)
----
--------------------------------------------------------------------
-emittedFile:a.js
-sourceFile:tests/cases/compiler/b.ts
--------------------------------------------------------------------
->>>/*--------------------------------------------------------------------------
-1->
-2 >^^^^^^^^^^->
-1->
-1->Emitted(8, 1) Source(1, 1) + SourceIndex(1)
----
->>>Copyright
->>>---------------------------------------------------------------------------*/
-1->^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1->/*--------------------------------------------------------------------------
-  >Copyright 
-  >---------------------------------------------------------------------------*/
-1->Emitted(10, 78) Source(3, 78) + SourceIndex(1)
----
->>>///<reference path="a.ts"/>
-1 >
-2 >
-3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^
-1 >
-  >
-  >///<reference path="a.ts"/>
-  >
-2 >
-3 >///<reference path="a.ts"/>
-1 >Emitted(11, 1) Source(6, 1) + SourceIndex(1)
-2 >Emitted(11, 1) Source(5, 1) + SourceIndex(1)
-3 >Emitted(11, 28) Source(5, 28) + SourceIndex(1)
----
->>>var y = x;
-1 >^^^^
-2 >    ^
-3 >     ^^^
-4 >        ^
-5 >         ^
-6 >          ^^^^^^^^^^^^^^^^^^->
-1 >
-  >var 
-2 >    y
-3 >      = 
-4 >        x
-5 >         ;
-1 >Emitted(12, 5) Source(6, 5) + SourceIndex(1)
-2 >Emitted(12, 6) Source(6, 6) + SourceIndex(1)
-3 >Emitted(12, 9) Source(6, 9) + SourceIndex(1)
-4 >Emitted(12, 10) Source(6, 10) + SourceIndex(1)
-5 >Emitted(12, 11) Source(6, 11) + SourceIndex(1)
----
->>>//# sourceMappingURL=a.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapWithMultipleFilesWithCopyright.types b/tests/baselines/reference/sourceMapWithMultipleFilesWithCopyright.types
deleted file mode 100644
index d72fd90b0c6..00000000000
--- a/tests/baselines/reference/sourceMapWithMultipleFilesWithCopyright.types
+++ /dev/null
@@ -1,27 +0,0 @@
-=== tests/cases/compiler/b.ts ===
-/*--------------------------------------------------------------------------
-Copyright 
----------------------------------------------------------------------------*/
-
-///<reference path="a.ts"/>
-var y = x;
->y : { a: number; b: number; }
->x : { a: number; b: number; }
-
-=== tests/cases/compiler/a.ts ===
-/*--------------------------------------------------------------------------
-Copyright 
----------------------------------------------------------------------------*/
-
-var x = {
->x : { a: number; b: number; }
->{    a: 10,    b: 20} : { a: number; b: number; }
-
-    a: 10,
->a : number
-
-    b: 20
->b : number
-
-};
-
diff --git a/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.js b/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.js
deleted file mode 100644
index 81f627ebedc..00000000000
--- a/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.js
+++ /dev/null
@@ -1,34 +0,0 @@
-//// [tests/cases/compiler/sourceMapWithMultipleFilesWithFileEndingWithInterface.ts] ////
-
-//// [a.ts]
-module M {
-    export var X = 1;
-}
-interface Navigator {
-    getGamepads(func?: any): any;
-    webkitGetGamepads(func?: any): any
-    msGetGamepads(func?: any): any;
-    webkitGamepads(func?: any): any;
-}
-
-//// [b.ts]
-module m1 {
-    export class c1 {
-    }
-}
-
-//// [fooResult.js]
-var M;
-(function (M) {
-    M.X = 1;
-})(M || (M = {}));
-var m1;
-(function (m1) {
-    var c1 = (function () {
-        function c1() {
-        }
-        return c1;
-    })();
-    m1.c1 = c1;
-})(m1 || (m1 = {}));
-//# sourceMappingURL=fooResult.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.js.map b/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.js.map
deleted file mode 100644
index 1142b4313a7..00000000000
--- a/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.js.map
+++ /dev/null
@@ -1,2 +0,0 @@
-//// [fooResult.js.map]
-{"version":3,"file":"fooResult.js","sourceRoot":"","sources":["tests/cases/compiler/a.ts","tests/cases/compiler/b.ts"],"names":["M","m1","m1.c1","m1.c1.constructor"],"mappings":"AAAA,IAAO,CAAC,CAEP;AAFD,WAAO,CAAC,EAAC,CAAC;IACKA,GAACA,GAAGA,CAACA,CAACA;AACrBA,CAACA,EAFM,CAAC,KAAD,CAAC,QAEP;ACFD,IAAO,EAAE,CAGR;AAHD,WAAO,EAAE,EAAC,CAAC;IACPC,IAAaA,EAAEA;QAAfC,SAAaA,EAAEA;QACfC,CAACA;QAADD,SAACA;IAADA,CAACA,AADDD,IACCA;IADYA,KAAEA,GAAFA,EACZA,CAAAA;AACLA,CAACA,EAHM,EAAE,KAAF,EAAE,QAGR"}
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.sourcemap.txt b/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.sourcemap.txt
deleted file mode 100644
index e58ed879c6f..00000000000
--- a/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.sourcemap.txt
+++ /dev/null
@@ -1,235 +0,0 @@
-===================================================================
-JsFile: fooResult.js
-mapUrl: fooResult.js.map
-sourceRoot: 
-sources: tests/cases/compiler/a.ts,tests/cases/compiler/b.ts
-===================================================================
--------------------------------------------------------------------
-emittedFile:fooResult.js
-sourceFile:tests/cases/compiler/a.ts
--------------------------------------------------------------------
->>>var M;
-1 >
-2 >^^^^
-3 >    ^
-4 >     ^
-5 >      ^^^^^^^^^^->
-1 >
-2 >module 
-3 >    M
-4 >      {
-  >         export var X = 1;
-  >     }
-1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-2 >Emitted(1, 5) Source(1, 8) + SourceIndex(0)
-3 >Emitted(1, 6) Source(1, 9) + SourceIndex(0)
-4 >Emitted(1, 7) Source(3, 2) + SourceIndex(0)
----
->>>(function (M) {
-1->
-2 >^^^^^^^^^^^
-3 >           ^
-4 >            ^^
-5 >              ^
-1->
-2 >module 
-3 >           M
-4 >             
-5 >              {
-1->Emitted(2, 1) Source(1, 1) + SourceIndex(0)
-2 >Emitted(2, 12) Source(1, 8) + SourceIndex(0)
-3 >Emitted(2, 13) Source(1, 9) + SourceIndex(0)
-4 >Emitted(2, 15) Source(1, 10) + SourceIndex(0)
-5 >Emitted(2, 16) Source(1, 11) + SourceIndex(0)
----
->>>    M.X = 1;
-1 >^^^^
-2 >    ^^^
-3 >       ^^^
-4 >          ^
-5 >           ^
-6 >            ^^^^^^^->
-1 >
-  >    export var 
-2 >    X
-3 >        = 
-4 >          1
-5 >           ;
-1 >Emitted(3, 5) Source(2, 16) + SourceIndex(0) name (M)
-2 >Emitted(3, 8) Source(2, 17) + SourceIndex(0) name (M)
-3 >Emitted(3, 11) Source(2, 20) + SourceIndex(0) name (M)
-4 >Emitted(3, 12) Source(2, 21) + SourceIndex(0) name (M)
-5 >Emitted(3, 13) Source(2, 22) + SourceIndex(0) name (M)
----
->>>})(M || (M = {}));
-1->
-2 >^
-3 > ^^
-4 >   ^
-5 >    ^^^^^
-6 >         ^
-7 >          ^^^^^^^^
-1->
-  >
-2 >}
-3 > 
-4 >   M
-5 >    
-6 >         M
-7 >           {
-  >              export var X = 1;
-  >          }
-1->Emitted(4, 1) Source(3, 1) + SourceIndex(0) name (M)
-2 >Emitted(4, 2) Source(3, 2) + SourceIndex(0) name (M)
-3 >Emitted(4, 4) Source(1, 8) + SourceIndex(0)
-4 >Emitted(4, 5) Source(1, 9) + SourceIndex(0)
-5 >Emitted(4, 10) Source(1, 8) + SourceIndex(0)
-6 >Emitted(4, 11) Source(1, 9) + SourceIndex(0)
-7 >Emitted(4, 19) Source(3, 2) + SourceIndex(0)
----
--------------------------------------------------------------------
-emittedFile:fooResult.js
-sourceFile:tests/cases/compiler/b.ts
--------------------------------------------------------------------
->>>var m1;
-1 >
-2 >^^^^
-3 >    ^^
-4 >      ^
-5 >       ^^^^^^^^^^->
-1 >
-2 >module 
-3 >    m1
-4 >       {
-  >          export class c1 {
-  >          }
-  >      }
-1 >Emitted(5, 1) Source(1, 1) + SourceIndex(1)
-2 >Emitted(5, 5) Source(1, 8) + SourceIndex(1)
-3 >Emitted(5, 7) Source(1, 10) + SourceIndex(1)
-4 >Emitted(5, 8) Source(4, 2) + SourceIndex(1)
----
->>>(function (m1) {
-1->
-2 >^^^^^^^^^^^
-3 >           ^^
-4 >             ^^
-5 >               ^
-6 >                ^^^^^^^^^^^^->
-1->
-2 >module 
-3 >           m1
-4 >              
-5 >               {
-1->Emitted(6, 1) Source(1, 1) + SourceIndex(1)
-2 >Emitted(6, 12) Source(1, 8) + SourceIndex(1)
-3 >Emitted(6, 14) Source(1, 10) + SourceIndex(1)
-4 >Emitted(6, 16) Source(1, 11) + SourceIndex(1)
-5 >Emitted(6, 17) Source(1, 12) + SourceIndex(1)
----
->>>    var c1 = (function () {
-1->^^^^
-2 >    ^^^^
-3 >        ^^
-4 >          ^^^^^^^^^^^^^^->
-1->
-  >    
-2 >    export class 
-3 >        c1
-1->Emitted(7, 5) Source(2, 5) + SourceIndex(1) name (m1)
-2 >Emitted(7, 9) Source(2, 18) + SourceIndex(1) name (m1)
-3 >Emitted(7, 11) Source(2, 20) + SourceIndex(1) name (m1)
----
->>>        function c1() {
-1->^^^^^^^^
-2 >        ^^^^^^^^^
-3 >                 ^^
-1->
-2 >        export class 
-3 >                 c1
-1->Emitted(8, 9) Source(2, 5) + SourceIndex(1) name (m1.c1)
-2 >Emitted(8, 18) Source(2, 18) + SourceIndex(1) name (m1.c1)
-3 >Emitted(8, 20) Source(2, 20) + SourceIndex(1) name (m1.c1)
----
->>>        }
-1 >^^^^^^^^
-2 >        ^
-3 >         ^^^^^^^^^^->
-1 > {
-  >    
-2 >        }
-1 >Emitted(9, 9) Source(3, 5) + SourceIndex(1) name (m1.c1.constructor)
-2 >Emitted(9, 10) Source(3, 6) + SourceIndex(1) name (m1.c1.constructor)
----
->>>        return c1;
-1->^^^^^^^^
-2 >        ^^^^^^^^^
-1->
-2 >        }
-1->Emitted(10, 9) Source(3, 5) + SourceIndex(1) name (m1.c1)
-2 >Emitted(10, 18) Source(3, 6) + SourceIndex(1) name (m1.c1)
----
->>>    })();
-1 >^^^^
-2 >    ^
-3 >     
-4 >     ^^^^
-5 >         ^^^^^^^->
-1 >
-2 >    }
-3 >     
-4 >     export class c1 {
-  >         }
-1 >Emitted(11, 5) Source(3, 5) + SourceIndex(1) name (m1.c1)
-2 >Emitted(11, 6) Source(3, 6) + SourceIndex(1) name (m1.c1)
-3 >Emitted(11, 6) Source(2, 5) + SourceIndex(1) name (m1)
-4 >Emitted(11, 10) Source(3, 6) + SourceIndex(1) name (m1)
----
->>>    m1.c1 = c1;
-1->^^^^
-2 >    ^^^^^
-3 >         ^^^
-4 >            ^^
-5 >              ^
-6 >               ^^^^^^->
-1->
-2 >    c1
-3 >         
-4 >            c1 {
-  >                }
-5 >              
-1->Emitted(12, 5) Source(2, 18) + SourceIndex(1) name (m1)
-2 >Emitted(12, 10) Source(2, 20) + SourceIndex(1) name (m1)
-3 >Emitted(12, 13) Source(2, 18) + SourceIndex(1) name (m1)
-4 >Emitted(12, 15) Source(3, 6) + SourceIndex(1) name (m1)
-5 >Emitted(12, 16) Source(3, 6) + SourceIndex(1) name (m1)
----
->>>})(m1 || (m1 = {}));
-1->
-2 >^
-3 > ^^
-4 >   ^^
-5 >     ^^^^^
-6 >          ^^
-7 >            ^^^^^^^^
-8 >                    ^^^^^^^^^^^^^^^^->
-1->
-  >
-2 >}
-3 > 
-4 >   m1
-5 >     
-6 >          m1
-7 >             {
-  >                export class c1 {
-  >                }
-  >            }
-1->Emitted(13, 1) Source(4, 1) + SourceIndex(1) name (m1)
-2 >Emitted(13, 2) Source(4, 2) + SourceIndex(1) name (m1)
-3 >Emitted(13, 4) Source(1, 8) + SourceIndex(1)
-4 >Emitted(13, 6) Source(1, 10) + SourceIndex(1)
-5 >Emitted(13, 11) Source(1, 8) + SourceIndex(1)
-6 >Emitted(13, 13) Source(1, 10) + SourceIndex(1)
-7 >Emitted(13, 21) Source(4, 2) + SourceIndex(1)
----
->>>//# sourceMappingURL=fooResult.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.types b/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.types
deleted file mode 100644
index 33a67423eaf..00000000000
--- a/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.types
+++ /dev/null
@@ -1,35 +0,0 @@
-=== tests/cases/compiler/a.ts ===
-module M {
->M : M
-
-    export var X = 1;
->X : number
-}
-interface Navigator {
->Navigator : Navigator
-
-    getGamepads(func?: any): any;
->getGamepads : (func?: any) => any
->func : any
-
-    webkitGetGamepads(func?: any): any
->webkitGetGamepads : (func?: any) => any
->func : any
-
-    msGetGamepads(func?: any): any;
->msGetGamepads : (func?: any) => any
->func : any
-
-    webkitGamepads(func?: any): any;
->webkitGamepads : (func?: any) => any
->func : any
-}
-
-=== tests/cases/compiler/b.ts ===
-module m1 {
->m1 : m1
-
-    export class c1 {
->c1 : c1
-    }
-}
diff --git a/tests/baselines/reference/testContainerList.js b/tests/baselines/reference/testContainerList.js
deleted file mode 100644
index dca80c7fa51..00000000000
--- a/tests/baselines/reference/testContainerList.js
+++ /dev/null
@@ -1,20 +0,0 @@
-//// [testContainerList.ts]
-// Regression test for #325
-module A {
-    class C {
-        constructor(public d: {}) { }
-    }
-}
-
-
-//// [testContainerList.js]
-// Regression test for #325
-var A;
-(function (A) {
-    var C = (function () {
-        function C(d) {
-            this.d = d;
-        }
-        return C;
-    })();
-})(A || (A = {}));
diff --git a/tests/baselines/reference/typeParameterWithInvalidConstraintType.js b/tests/baselines/reference/typeParameterWithInvalidConstraintType.js
deleted file mode 100644
index 4985519911a..00000000000
--- a/tests/baselines/reference/typeParameterWithInvalidConstraintType.js
+++ /dev/null
@@ -1,26 +0,0 @@
-//// [typeParameterWithInvalidConstraintType.ts]
-class A<T extends T> {
-    foo() {
-        var x: T;
-        // no error expected below this line
-        var a = x.foo();
-        var b = new x(123);
-        var c = x[1];
-        var d = x();
-    }
-}
-
-//// [typeParameterWithInvalidConstraintType.js]
-var A = (function () {
-    function A() {
-    }
-    A.prototype.foo = function () {
-        var x;
-        // no error expected below this line
-        var a = x.foo();
-        var b = new x(123);
-        var c = x[1];
-        var d = x();
-    };
-    return A;
-})();
diff --git a/tests/cases/compiler/commentsClass.ts b/tests/cases/compiler/commentsClass.ts
index e9a8f3cee1d..a1d792f83ef 100644
--- a/tests/cases/compiler/commentsClass.ts
+++ b/tests/cases/compiler/commentsClass.ts
@@ -4,21 +4,21 @@
 
 /** This is class c2 without constuctor*/
 class c2 {
-} // trailing comment1
+}
 var i2 = new c2();
 var i2_c = c2;
 class c3 {
     /** Constructor comment*/
     constructor() {
-    } // trailing comment of constructor
-} /* trailing comment 2 */
+    }
+}
 var i3 = new c3();
 var i3_c = c3;
 /** Class comment*/
 class c4 {
     /** Constructor comment*/
     constructor() {
-    } /* trailing comment of constructor 2*/
+    }
 }
 var i4 = new c4();
 var i4_c = c4;
@@ -65,11 +65,3 @@ class c8 {
 }
 var i8 = new c8();
 var i8_c = c8;
-
-class c9 {
-    constructor() {
-        /// This is some detached comment
-
-        // should emit this leading comment of } too
-    }
-}
diff --git a/tests/cases/compiler/commentsClassMembers.ts b/tests/cases/compiler/commentsClassMembers.ts
index 92a3a1356f2..8b418e58661 100644
--- a/tests/cases/compiler/commentsClassMembers.ts
+++ b/tests/cases/compiler/commentsClassMembers.ts
@@ -9,21 +9,21 @@ class c1 {
     /** sum with property*/
     public p2(/** number to add*/b: number) {
         return this.p1 + b;
-    } /* trailing comment of method*/
+    }
     /** getter property*/
     public get p3() {
         return this.p2(this.p1);
-    }// trailing comment Getter
+    }
     /** setter property*/
     public set p3(/** this is value*/value: number) {
         this.p1 = this.p2(value);
-    }// trailing comment Setter
+    }
     /** pp1 is property of c1*/
     private pp1: number;
     /** sum with property*/
     private pp2(/** number to add*/b: number) {
         return this.p1 + b;
-    } // trailing comment of method
+    }
     /** getter property*/
     private get pp3() {
         return this.pp2(this.pp1);
@@ -44,11 +44,11 @@ class c1 {
     /** static getter property*/
     static get s3() {
         return c1.s2(c1.s1);
-    } /*trailing comment 1 getter*/
+    }
     /** setter property*/
     static set s3( /** this is value*/value: number) {
         c1.s1 = c1.s2(value);
-    }/*trailing comment 2 */ /*setter*/
+    }
     public nc_p1: number;
     public nc_p2(b: number) {
         return this.nc_p1 + b;
@@ -200,7 +200,7 @@ class cProperties {
     /** getter only property*/
     public get p1() {
         return this.val;
-    } // trailing comment of only getter
+    }
     public get nc_p1() {
         return this.val;
     }
@@ -210,10 +210,7 @@ class cProperties {
     }
     public set nc_p2(value: number) {
         this.val = value;
-    } /* trailing comment of setter only*/
-
-    public x = 10; /*trailing comment for property*/
-    private y = 10; // trailing comment of // style
+    }
 }
 var cProperties_i = new cProperties();
 cProperties_i.p2 = cProperties_i.p1;
diff --git a/tests/cases/compiler/commentsEnums.ts b/tests/cases/compiler/commentsEnums.ts
index 2d69c863f2d..b6a1b99fd17 100644
--- a/tests/cases/compiler/commentsEnums.ts
+++ b/tests/cases/compiler/commentsEnums.ts
@@ -8,7 +8,7 @@ enum Colors {
     Cornflower /* blue */,
     /** Fancy name for 'pink'*/
     FancyPink
-} // trailing comment
+}
 var x = Colors.Cornflower;
 x = Colors.FancyPink;
 
diff --git a/tests/cases/compiler/commentsExternalModules.ts b/tests/cases/compiler/commentsExternalModules.ts
index 86c6b2be8d3..eff0d1d6740 100644
--- a/tests/cases/compiler/commentsExternalModules.ts
+++ b/tests/cases/compiler/commentsExternalModules.ts
@@ -56,7 +56,7 @@ var myvar2 = new m4.m2.c();
 
 // @Filename: commentsExternalModules_1.ts
 /**This is on import declaration*/
-import extMod = require("commentsExternalModules_0"); // trailing comment1
+import extMod = require("commentsExternalModules_0");
 extMod.m1.fooExport();
 var newVar = new extMod.m1.m2.c();
 extMod.m4.fooExport();
diff --git a/tests/cases/compiler/commentsExternalModules2.ts b/tests/cases/compiler/commentsExternalModules2.ts
deleted file mode 100644
index 354e74738be..00000000000
--- a/tests/cases/compiler/commentsExternalModules2.ts
+++ /dev/null
@@ -1,63 +0,0 @@
-//@module: amd
-// @target: ES5
-// @declaration: true
-// @comments: true
-
-// @Filename: commentsExternalModules2_0.ts
-/** Module comment*/
-export module m1 {
-    /** b's comment*/
-    export var b: number;
-    /** foo's comment*/
-    function foo() {
-        return b;
-    }
-    /** m2 comments*/
-    export module m2 {
-        /** class comment;*/
-        export class c {
-        };
-        /** i*/
-        export var i = new c();
-    }
-    /** exported function*/
-    export function fooExport() {
-        return foo();
-    }
-}
-m1.fooExport();
-var myvar = new m1.m2.c();
-
-/** Module comment */
-export module m4 {
-    /** b's comment */
-    export var b: number;
-    /** foo's comment
-    */
-    function foo() {
-        return b;
-    }
-    /** m2 comments
-    */
-    export module m2 {
-        /** class comment; */
-        export class c {
-        };
-        /** i */
-        export var i = new c();
-    }
-    /** exported function */
-    export function fooExport() {
-        return foo();
-    }
-}
-m4.fooExport();
-var myvar2 = new m4.m2.c();
-
-// @Filename: commentsExternalModules_1.ts
-/**This is on import declaration*/
-import extMod = require("commentsExternalModules2_0"); // trailing comment 1
-extMod.m1.fooExport();
-export var newVar = new extMod.m1.m2.c();
-extMod.m4.fooExport();
-export var newVar2 = new extMod.m4.m2.c();
diff --git a/tests/cases/compiler/commentsExternalModules3.ts b/tests/cases/compiler/commentsExternalModules3.ts
deleted file mode 100644
index 2f214c5d28c..00000000000
--- a/tests/cases/compiler/commentsExternalModules3.ts
+++ /dev/null
@@ -1,63 +0,0 @@
-//@module: commonjs
-// @target: ES5
-// @declaration: true
-// @comments: true
-
-// @Filename: commentsExternalModules2_0.ts
-/** Module comment*/
-export module m1 {
-    /** b's comment*/
-    export var b: number;
-    /** foo's comment*/
-    function foo() {
-        return b;
-    }
-    /** m2 comments*/
-    export module m2 {
-        /** class comment;*/
-        export class c {
-        };
-        /** i*/
-        export var i = new c();
-    }
-    /** exported function*/
-    export function fooExport() {
-        return foo();
-    }
-}
-m1.fooExport();
-var myvar = new m1.m2.c();
-
-/** Module comment */
-export module m4 {
-    /** b's comment */
-    export var b: number;
-    /** foo's comment
-    */
-    function foo() {
-        return b;
-    }
-    /** m2 comments
-    */
-    export module m2 {
-        /** class comment; */
-        export class c {
-        };
-        /** i */
-        export var i = new c();
-    }
-    /** exported function */
-    export function fooExport() {
-        return foo();
-    }
-}
-m4.fooExport();
-var myvar2 = new m4.m2.c();
-
-// @Filename: commentsExternalModules_1.ts
-/**This is on import declaration*/
-import extMod = require("commentsExternalModules2_0"); // trailing comment 1
-extMod.m1.fooExport();
-export var newVar = new extMod.m1.m2.c();
-extMod.m4.fooExport();
-export var newVar2 = new extMod.m4.m2.c();
diff --git a/tests/cases/compiler/commentsFormatting.ts b/tests/cases/compiler/commentsFormatting.ts
deleted file mode 100644
index d7e388a9340..00000000000
--- a/tests/cases/compiler/commentsFormatting.ts
+++ /dev/null
@@ -1,72 +0,0 @@
-// @target: ES5
-// @declaration: true
-// @comments: true
-
-module m {
-    /** this is first line - aligned to class declaration
-* this is 4 spaces left aligned
- * this is 3 spaces left aligned
-  * this is 2 spaces left aligned
-   * this is 1 spaces left aligned
-    * this is at same level as first line
-     * this is 1 spaces right aligned
-      * this is 2 spaces right aligned
-       * this is 3 spaces right aligned
-        * this is 4 spaces right aligned
-         * this is 5 spaces right aligned
-          * this is 6 spaces right aligned
-           * this is 7 spaces right aligned
-            * this is 8 spaces right aligned */
-    export class c {
-    }
-
-        /** this is first line - 4 spaces right aligned to class but in js file should be aligned to class declaration
-* this is 8 spaces left aligned
- * this is 7 spaces left aligned
-  * this is 6 spaces left aligned
-   * this is 5 spaces left aligned
-    * this is 4 spaces left aligned
-     * this is 3 spaces left aligned
-      * this is 2 spaces left aligned
-       * this is 1 spaces left aligned
-        * this is at same level as first line
-         * this is 1 spaces right aligned
-          * this is 2 spaces right aligned
-           * this is 3 spaces right aligned
-            * this is 4 spaces right aligned
-             * this is 5 spaces right aligned
-              * this is 6 spaces right aligned
-               * this is 7 spaces right aligned
-                * this is 8 spaces right aligned */
-    export class c2 {
-    }
-
-    /** this is comment with new lines in between
-
-this is 4 spaces left aligned but above line is empty
-
- this is 3 spaces left aligned but above line is empty
-
-  this is 2 spaces left aligned but above line is empty
-
-    this is 1 spaces left aligned but above line is empty
-
-    this is at same level as first line but above line is empty 
-
-     this is 1 spaces right aligned but above line is empty
-
-      this is 2 spaces right aligned but above line is empty
-
-       this is 3 spaces right aligned but above line is empty
-
-        this is 4 spaces right aligned but above line is empty
-    
-    
-    Above 2 lines are empty
-    
-    
-    
-    above 3 lines are empty*/
-    export class c3 {
-    }
-}
\ No newline at end of file
diff --git a/tests/cases/compiler/commentsFunction.ts b/tests/cases/compiler/commentsFunction.ts
index b71da4ae085..cc6cf8ca63b 100644
--- a/tests/cases/compiler/commentsFunction.ts
+++ b/tests/cases/compiler/commentsFunction.ts
@@ -4,14 +4,14 @@
 
 /** This comment should appear for foo*/
 function foo() {
-} /* trailing comment of function */
+}
 foo();
 /** This is comment for function signature*/
 function fooWithParameters(/** this is comment about a*/a: string,
     /** this is comment for b*/
     b: number) {
     var d = a;
-} // trailing comment of function
+}
 fooWithParameters("a", 10);
 /** fooFunc
  * comment
@@ -24,34 +24,4 @@ var fooFunc = function FooFunctionValue(/** fooFunctionValue param */ b: string)
 var lambdaFoo = /** this is lambda comment*/ (/**param a*/a: number, /**param b*/b: number) => a + b;
 var lambddaNoVarComment = /** this is lambda multiplication*/ (/**param a*/a: number, /**param b*/b: number) => a * b;
 lambdaFoo(10, 20);
-lambddaNoVarComment(10, 20);
-
-function blah(a: string /* multiline trailing comment 
-multiline */) {
-}
-
-function blah2(a: string /* single line multiple trailing comments */ /* second */) {
-}
-
-function blah3(a: string // trailing commen single line
-    ) {
-}
-
-lambdaFoo = (a, b) => a * b; // This is trailing comment
-
-/*leading comment*/() => 0; // Needs to be wrapped in parens to be a valid expression (not declaration)
-/*leading comment*/(() => 0); //trailing comment
-
-function blah4(/*1*/a: string/*2*/,/*3*/b: string/*4*/) {
-}
-
-function foo1() {
-
-    // should emit this
-}
-
-function foo2() {
-    /// This is some detached comment
-
-    // should emit this leading comment of } too
-}
+lambddaNoVarComment(10, 20);
\ No newline at end of file
diff --git a/tests/cases/compiler/commentsModules.ts b/tests/cases/compiler/commentsModules.ts
index 29ac0c22373..4e4b6a243ff 100644
--- a/tests/cases/compiler/commentsModules.ts
+++ b/tests/cases/compiler/commentsModules.ts
@@ -37,7 +37,7 @@ module m1 {
      */
     function foo4Export() {
     }
-} // trailing comment module
+}
 m1.fooExport();
 var myvar = new m1.m2.c();
 /** module comment of m2.m3*/
@@ -45,14 +45,14 @@ module m2.m3 {
     /** Exported class comment*/
     export class c {
     }
-} /* trailing dotted module comment*/
+}
 new m2.m3.c();
 /** module comment of m3.m4.m5*/
 module m3.m4.m5 {
     /** Exported class comment*/
     export class c {
     }
-} // trailing dotted module 2
+}
 new m3.m4.m5.c();
 /** module comment of m4.m5.m6*/
 module m4.m5.m6 {
@@ -60,7 +60,7 @@ module m4.m5.m6 {
         /** Exported class comment*/
         export class c {
         }
-    } /* trailing inner module */ /* multiple comments*/
+    }
 }
 new m4.m5.m6.m7.c();
 /** module comment of m5.m6.m7*/
diff --git a/tests/cases/compiler/commentsOnObjectLiteral2.ts b/tests/cases/compiler/commentsOnObjectLiteral2.ts
index da2ee14b730..b9d2c2ac9ee 100644
--- a/tests/cases/compiler/commentsOnObjectLiteral2.ts
+++ b/tests/cases/compiler/commentsOnObjectLiteral2.ts
@@ -8,6 +8,6 @@ var Person = makeClass(
         */ 
        initialize: function(name) { 
            this.name = name; 
-       } /* trailing comment 1*/, 
+       }, 
    } 
 );
\ No newline at end of file
diff --git a/tests/cases/compiler/commentsOnObjectLiteral3.ts b/tests/cases/compiler/commentsOnObjectLiteral3.ts
index 6650b21e167..23993b84bb2 100644
--- a/tests/cases/compiler/commentsOnObjectLiteral3.ts
+++ b/tests/cases/compiler/commentsOnObjectLiteral3.ts
@@ -1,9 +1,8 @@
 // @comments: true
-// @target: ES5
 
 var v = {
  //property
- prop: 1 /* multiple trailing comments */ /*trailing comments*/,
+ prop: 1,
  //property
  func: function () {
  },
@@ -12,9 +11,9 @@ var v = {
  //getter
  get a() {
   return this.prop;
- } /*trailing 1*/,
+ },
  //setter
  set a(value) {
   this.prop = value;
- } // trailing 2
+ }
 };
diff --git a/tests/cases/compiler/commentsOnObjectLiteral4.ts b/tests/cases/compiler/commentsOnObjectLiteral4.ts
index e13668530c7..360ce0bb6d7 100644
--- a/tests/cases/compiler/commentsOnObjectLiteral4.ts
+++ b/tests/cases/compiler/commentsOnObjectLiteral4.ts
@@ -1,5 +1,4 @@
 // @comments: true
-// @target: ES5
 
 var v = {
  /**
diff --git a/tests/cases/compiler/commentsTypeParameters.ts b/tests/cases/compiler/commentsTypeParameters.ts
deleted file mode 100644
index 4fc3a30a192..00000000000
--- a/tests/cases/compiler/commentsTypeParameters.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-// @declaration: true
-// @comments: true
-class C</**docComment for type parameter*/ T> {
-    method</**docComment of method type parameter */ U extends T>(a: U) {
-    }
-    static staticmethod</**docComment of method type parameter */ U>(a: U) {
-    }
-
-    private privatemethod</**docComment of method type parameter */ U extends T>(a: U) {
-    }
-    private static privatestaticmethod</**docComment of method type parameter */ U>(a: U) {
-    }
-}
-
-function compare</**type*/T>(a: T, b: T) {
-    return a === b;
-}
\ No newline at end of file
diff --git a/tests/cases/compiler/commentsVarDecl.ts b/tests/cases/compiler/commentsVarDecl.ts
index 3b7d56e4078..fc33a1688ac 100644
--- a/tests/cases/compiler/commentsVarDecl.ts
+++ b/tests/cases/compiler/commentsVarDecl.ts
@@ -3,7 +3,7 @@
 // @comments: true
 
 /** Variable comments*/
-var myVariable = 10; // This trailing Comment1
+var myVariable = 10;
 
 /** This is another variable comment*/
 var anotherVariable = 30;
@@ -13,13 +13,13 @@ var aVar = "";
 
 /** this is multiline comment
   * All these variables are of number type */
-var anotherAnotherVariable = 70; /* these are multiple trailing comments */ /* multiple trailing comments */
+var anotherAnotherVariable = 70;
 
 /** Triple slash multiline comment*/
 /** another line in the comment*/
 /** comment line 2*/
-var x = 70; /* multiline trailing comment 
-this is multiline trailing comment */
+var x = 70;
+
 /** Triple slash comment on the assignement shouldnt be in .d.ts file*/
 x = myVariable;
 
diff --git a/tests/cases/compiler/detachedCommentAtStartOfConstructor1.ts b/tests/cases/compiler/detachedCommentAtStartOfConstructor1.ts
deleted file mode 100644
index 84a72d3595b..00000000000
--- a/tests/cases/compiler/detachedCommentAtStartOfConstructor1.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-class TestFile {
-    public message: string;
-    public name;
-    constructor(message: string) {
-        /// <summary>Test summary</summary>
-        /// <param name="message" type="String" />
-        var getMessage = () => message + this.name;
-        this.message = getMessage();
-    }
-}
\ No newline at end of file
diff --git a/tests/cases/compiler/detachedCommentAtStartOfConstructor2.ts b/tests/cases/compiler/detachedCommentAtStartOfConstructor2.ts
deleted file mode 100644
index e115afec607..00000000000
--- a/tests/cases/compiler/detachedCommentAtStartOfConstructor2.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-class TestFile {
-    public message: string;
-    public name: string;
-    constructor(message: string) {
-        /// <summary>Test summary</summary>
-        /// <param name="message" type="String" />
-
-        var getMessage = () => message + this.name;
-        this.message = getMessage();
-    }
-}
\ No newline at end of file
diff --git a/tests/cases/compiler/detachedCommentAtStartOfLambdaFunction1.ts b/tests/cases/compiler/detachedCommentAtStartOfLambdaFunction1.ts
deleted file mode 100644
index cd18872780e..00000000000
--- a/tests/cases/compiler/detachedCommentAtStartOfLambdaFunction1.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-class TestFile {
-    name: string;
-    foo(message: string): () => string {
-        return (...x: string[]) =>
-            /// <summary>Test summary</summary>
-            /// <param name="message" type="String" />
-            /// <returns type="Function" />
-            message + this.name;
-    }
-}
\ No newline at end of file
diff --git a/tests/cases/compiler/detachedCommentAtStartOfLambdaFunction2.ts b/tests/cases/compiler/detachedCommentAtStartOfLambdaFunction2.ts
deleted file mode 100644
index a7d591440e3..00000000000
--- a/tests/cases/compiler/detachedCommentAtStartOfLambdaFunction2.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-class TestFile {
-    name: string;
-    foo(message: string): () => string {
-        return (...x: string[]) =>
-            /// <summary>Test summary</summary>
-            /// <param name="message" type="String" />
-            /// <returns type="Function" />
-
-            message + this.name;
-    }
-}
\ No newline at end of file
diff --git a/tests/cases/compiler/externalModuleResolution.ts b/tests/cases/compiler/externalModuleResolution.ts
index 8c0d3bf7e3f..b439a353b97 100644
--- a/tests/cases/compiler/externalModuleResolution.ts
+++ b/tests/cases/compiler/externalModuleResolution.ts
@@ -1,10 +1,4 @@
 //@module: commonjs
-// @Filename: foo.d.ts
-declare module M1 {
-    export var X:number;
-}
-export = M1
-
 // @Filename: foo.ts
 module M2 {
     export var Y = 1;
diff --git a/tests/cases/compiler/externalModuleResolution2.ts b/tests/cases/compiler/externalModuleResolution2.ts
index 28d9c44f061..12d8bfbaf2b 100644
--- a/tests/cases/compiler/externalModuleResolution2.ts
+++ b/tests/cases/compiler/externalModuleResolution2.ts
@@ -5,12 +5,6 @@ module M2 {
 }
 export = M2
 
-// @Filename: foo.d.ts
-declare module M1 {
-    export var Y:number;
-}
-export = M1
-
 
 // @Filename: consumer.ts
 import x = require('./foo');
diff --git a/tests/cases/compiler/sourceMapWithMultipleFilesWithCopyright.ts b/tests/cases/compiler/sourceMapWithMultipleFilesWithCopyright.ts
deleted file mode 100644
index ac179835a0c..00000000000
--- a/tests/cases/compiler/sourceMapWithMultipleFilesWithCopyright.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-// @out: a.js
-// @sourcemap: true
-// @declaration: true
-// @Filename: a.ts
-/*--------------------------------------------------------------------------
-Copyright 
----------------------------------------------------------------------------*/
-
-var x = {
-    a: 10,
-    b: 20
-};
-
-// @Filename: b.ts
-/*--------------------------------------------------------------------------
-Copyright 
----------------------------------------------------------------------------*/
-
-///<reference path="a.ts"/>
-var y = x;
\ No newline at end of file
diff --git a/tests/cases/compiler/sourceMapWithMultipleFilesWithFileEndingWithInterface.ts b/tests/cases/compiler/sourceMapWithMultipleFilesWithFileEndingWithInterface.ts
deleted file mode 100644
index e7634a22b6a..00000000000
--- a/tests/cases/compiler/sourceMapWithMultipleFilesWithFileEndingWithInterface.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-// @out: fooResult.js
-// @sourcemap: true
-// @Filename: a.ts
-module M {
-    export var X = 1;
-}
-interface Navigator {
-    getGamepads(func?: any): any;
-    webkitGetGamepads(func?: any): any
-    msGetGamepads(func?: any): any;
-    webkitGamepads(func?: any): any;
-}
-
-// @Filename: b.ts
-module m1 {
-    export class c1 {
-    }
-}
\ No newline at end of file

From aa0ae22b3756ea41c72be16dce13cca26dd58f12 Mon Sep 17 00:00:00 2001
From: Jason Freeman <jfreeman@microsoft.com>
Date: Wed, 27 Aug 2014 10:06:16 -0700
Subject: [PATCH 04/11] Update baselines

---
 .../baselines/reference/genericCallWithObjectLiteralArgs.js | 6 ++----
 .../reference/genericCallWithObjectLiteralArgs.types        | 3 +--
 .../genericCallWithOverloadedConstructorTypedArguments.js   | 4 ++--
 ...genericCallWithOverloadedConstructorTypedArguments.types | 2 +-
 .../typeInference/genericCallWithObjectLiteralArgs.ts       | 3 +--
 .../genericCallWithOverloadedConstructorTypedArguments.ts   | 2 +-
 6 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/tests/baselines/reference/genericCallWithObjectLiteralArgs.js b/tests/baselines/reference/genericCallWithObjectLiteralArgs.js
index 76b5380a651..84a630425be 100644
--- a/tests/baselines/reference/genericCallWithObjectLiteralArgs.js
+++ b/tests/baselines/reference/genericCallWithObjectLiteralArgs.js
@@ -5,8 +5,7 @@ function foo<T>(x: { bar: T; baz: T }) {
 
 var r = foo({ bar: 1, baz: '' }); // T = {}
 var r2 = foo({ bar: 1, baz: 1 }); // T = number
-// BUG 835724
-var r3 = foo({ bar: foo, baz: foo }); // T = any
+var r3 = foo({ bar: foo, baz: foo }); // T = typeof foo
 var r4 = foo<Object>({ bar: 1, baz: '' }); // T = Object
 
 //// [genericCallWithObjectLiteralArgs.js]
@@ -15,6 +14,5 @@ function foo(x) {
 }
 var r = foo({ bar: 1, baz: '' }); // T = {}
 var r2 = foo({ bar: 1, baz: 1 }); // T = number
-// BUG 835724
-var r3 = foo({ bar: foo, baz: foo }); // T = any
+var r3 = foo({ bar: foo, baz: foo }); // T = typeof foo
 var r4 = foo({ bar: 1, baz: '' }); // T = Object
diff --git a/tests/baselines/reference/genericCallWithObjectLiteralArgs.types b/tests/baselines/reference/genericCallWithObjectLiteralArgs.types
index ec243041395..16919db4496 100644
--- a/tests/baselines/reference/genericCallWithObjectLiteralArgs.types
+++ b/tests/baselines/reference/genericCallWithObjectLiteralArgs.types
@@ -28,8 +28,7 @@ var r2 = foo({ bar: 1, baz: 1 }); // T = number
 >bar : number
 >baz : number
 
-// BUG 835724
-var r3 = foo({ bar: foo, baz: foo }); // T = any
+var r3 = foo({ bar: foo, baz: foo }); // T = typeof foo
 >r3 : { bar: typeof foo; baz: typeof foo; }
 >foo({ bar: foo, baz: foo }) : { bar: typeof foo; baz: typeof foo; }
 >foo : typeof foo
diff --git a/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments.js b/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments.js
index 9da34ebad86..6291489e8e9 100644
--- a/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments.js
+++ b/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments.js
@@ -26,7 +26,7 @@ module GenericParameter {
         new (x: boolean): string;
         new (x: number): boolean;
     }
-    var r5 = foo5(a); // new{} => string; new(x:number) => {}
+    var r5 = foo5(a); // new boolean => string; new(x:number) => boolean
     var b: { new<T>(x: T): string; new<T>(x: number): T; }
     var r7 = foo5(b); // new any => string; new(x:number) => any
 
@@ -67,7 +67,7 @@ var GenericParameter;
         return cb;
     }
     var a;
-    var r5 = foo5(a); // new{} => string; new(x:number) => {}
+    var r5 = foo5(a); // new boolean => string; new(x:number) => boolean
     var b;
     var r7 = foo5(b); // new any => string; new(x:number) => any
     function foo6(cb) {
diff --git a/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments.types b/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments.types
index c88c4124353..54de434304d 100644
--- a/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments.types
+++ b/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments.types
@@ -70,7 +70,7 @@ module GenericParameter {
         new (x: number): boolean;
 >x : number
     }
-    var r5 = foo5(a); // new{} => string; new(x:number) => {}
+    var r5 = foo5(a); // new boolean => string; new(x:number) => boolean
 >r5 : { new (x: boolean): string; new (x: number): boolean; }
 >foo5(a) : { new (x: boolean): string; new (x: number): boolean; }
 >foo5 : typeof foo5
diff --git a/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectLiteralArgs.ts b/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectLiteralArgs.ts
index 29cefd150df..1e5976b33e5 100644
--- a/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectLiteralArgs.ts
+++ b/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectLiteralArgs.ts
@@ -4,6 +4,5 @@ function foo<T>(x: { bar: T; baz: T }) {
 
 var r = foo({ bar: 1, baz: '' }); // T = {}
 var r2 = foo({ bar: 1, baz: 1 }); // T = number
-// BUG 835724
-var r3 = foo({ bar: foo, baz: foo }); // T = any
+var r3 = foo({ bar: foo, baz: foo }); // T = typeof foo
 var r4 = foo<Object>({ bar: 1, baz: '' }); // T = Object
\ No newline at end of file
diff --git a/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithOverloadedConstructorTypedArguments.ts b/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithOverloadedConstructorTypedArguments.ts
index 8bb5d234bb5..d8055853cbe 100644
--- a/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithOverloadedConstructorTypedArguments.ts
+++ b/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithOverloadedConstructorTypedArguments.ts
@@ -25,7 +25,7 @@ module GenericParameter {
         new (x: boolean): string;
         new (x: number): boolean;
     }
-    var r5 = foo5(a); // new{} => string; new(x:number) => {}
+    var r5 = foo5(a); // new boolean => string; new(x:number) => boolean
     var b: { new<T>(x: T): string; new<T>(x: number): T; }
     var r7 = foo5(b); // new any => string; new(x:number) => any
 

From 3388f7bd488ecc999b307228990f8688812ca03f Mon Sep 17 00:00:00 2001
From: Jason Freeman <jfreeman@microsoft.com>
Date: Wed, 27 Aug 2014 16:58:31 -0700
Subject: [PATCH 05/11] Update baselines

---
 ...rParameterAccessibilityModifier.errors.txt |    5 +-
 .../accessorWithInitializer.errors.txt        |    5 +-
 .../accessorWithRestParam.errors.txt          |    5 +-
 .../aliasInaccessibleModule.errors.txt        |    8 +
 .../reference/aliasInaccessibleModule.types   |   11 -
 .../aliasInaccessibleModule2.errors.txt       |   12 +
 .../reference/aliasInaccessibleModule2.types  |   20 -
 .../aliasUsageInAccessorsOfClass.errors.txt   |   30 -
 .../reference/aliasUsageInAccessorsOfClass.js |   69 +
 .../aliasUsageInAccessorsOfClass.types        |   60 +
 ...nalModuleWithRelativeModuleName.errors.txt |    8 +-
 ...entExternalModuleWithRelativeModuleName.js |    4 +
 .../reference/ambientGetters.errors.txt       |    5 +-
 .../amdDependencyComment2.errors.txt          |    7 +
 .../reference/amdDependencyComment2.js        |   11 +
 ...nctionMissingCurlyWithSemicolon.errors.txt |    7 +
 .../arrowFunctionsMissingTokens.errors.txt    |  115 +
 .../asiAmbientFunctionDeclaration.js          |    4 +
 .../asiAmbientFunctionDeclaration.types       |    4 +
 tests/baselines/reference/asiBreak.js         |    6 +
 tests/baselines/reference/asiBreak.types      |    3 +
 tests/baselines/reference/asiContinue.js      |    6 +
 tests/baselines/reference/asiContinue.types   |    3 +
 .../baselines/reference/asiReturn.errors.txt  |    5 +
 .../assignmentCompatability24.errors.txt      |    8 +-
 .../reference/assignmentCompatability24.js    |    2 +-
 .../assignmentCompatability33.errors.txt      |    8 +-
 .../reference/assignmentCompatability33.js    |    2 +-
 .../assignmentCompatability34.errors.txt      |    8 +-
 .../reference/assignmentCompatability34.js    |    2 +-
 .../assignmentCompatability37.errors.txt      |    8 +-
 .../reference/assignmentCompatability37.js    |    2 +-
 .../assignmentCompatability38.errors.txt      |    8 +-
 .../reference/assignmentCompatability38.js    |    2 +-
 tests/baselines/reference/augmentArray.js     |    6 +
 tests/baselines/reference/augmentArray.types  |    7 +
 .../autoAsiForStaticsInClassDeclaration.js    |   12 +
 .../autoAsiForStaticsInClassDeclaration.types |   10 +
 .../reference/badArraySyntax.errors.txt       |    8 +-
 .../reference/captureThisInSuperCall.js       |   32 +
 .../reference/captureThisInSuperCall.types    |   25 +
 .../castExpressionParentheses.errors.txt      |   42 -
 .../reference/castExpressionParentheses.js    |    2 +-
 .../reference/castExpressionParentheses.types |  169 +
 .../baselines/reference/chainedImportAlias.js |   18 +-
 .../reference/chainedImportAlias.types        |   29 +-
 .../classExtendingPrimitive2.errors.txt       |   11 +
 .../classExtendsEveryObjectType2.errors.txt   |   10 +
 .../classImplementsImportedInterface.js       |   25 +
 .../classImplementsImportedInterface.types    |   28 +
 ...licMembersEquivalentToInterface.errors.txt |   30 -
 ...hOnlyPublicMembersEquivalentToInterface.js |   50 +
 ...lyPublicMembersEquivalentToInterface.types |   73 +
 ...icMembersEquivalentToInterface2.errors.txt |   32 -
 ...OnlyPublicMembersEquivalentToInterface2.js |   52 +
 ...yPublicMembersEquivalentToInterface2.types |   76 +
 tests/baselines/reference/commentsClass.js    |   34 +-
 tests/baselines/reference/commentsClass.types |   19 +-
 .../reference/commentsClassMembers.js         |   42 +-
 .../reference/commentsClassMembers.types      |   30 +-
 .../reference/commentsDottedModuleName.js     |   34 +
 .../reference/commentsDottedModuleName.types  |   12 +
 tests/baselines/reference/commentsEnums.js    |    4 +-
 tests/baselines/reference/commentsEnums.types |    3 +-
 .../reference/commentsExternalModules.js      |    2 +-
 .../reference/commentsExternalModules.types   |    2 +-
 .../reference/commentsExternalModules2.js     |  176 +
 .../reference/commentsExternalModules2.types  |  155 +
 .../reference/commentsExternalModules3.js     |  174 +
 .../reference/commentsExternalModules3.types  |  155 +
 .../baselines/reference/commentsFormatting.js |  220 +
 .../reference/commentsFormatting.types        |   75 +
 tests/baselines/reference/commentsFunction.js |   67 +-
 .../reference/commentsFunction.types          |   62 +-
 tests/baselines/reference/commentsModules.js  |   16 +-
 .../baselines/reference/commentsModules.types |    8 +-
 .../commentsMultiModuleMultiFile.errors.txt   |   41 -
 .../reference/commentsMultiModuleMultiFile.js |   37 +-
 .../commentsMultiModuleMultiFile.types        |   62 +
 .../commentsOnObjectLiteral2.errors.txt       |    2 +-
 .../reference/commentsOnObjectLiteral2.js     |    4 +-
 .../commentsOnObjectLiteral3.errors.txt       |   24 -
 .../reference/commentsOnObjectLiteral3.js     |   40 +
 .../reference/commentsOnObjectLiteral3.types  |   46 +
 .../commentsOnObjectLiteral4.errors.txt       |   12 -
 .../reference/commentsOnObjectLiteral4.js     |   20 +
 .../reference/commentsOnObjectLiteral4.types  |   18 +
 .../reference/commentsTypeParameters.js       |   44 +
 .../reference/commentsTypeParameters.types    |   47 +
 tests/baselines/reference/commentsVarDecl.js  |   15 +-
 .../baselines/reference/commentsVarDecl.types |    7 +-
 .../reference/complicatedPrivacy.errors.txt   |    6 +-
 .../constructorArgsErrors3.errors.txt         |    8 +
 .../constructorArgsErrors4.errors.txt         |    8 +
 .../constructorArgsErrors5.errors.txt         |    8 +
 ...uctorsWithSpecializedSignatures.errors.txt |   60 +
 .../constructorsWithSpecializedSignatures.js  |   58 +
 .../contextualSignatureInstantiation3.js      |   43 +
 .../contextualSignatureInstantiation3.types   |   83 +
 .../reference/contextualTyping.errors.txt     |    4 +-
 tests/baselines/reference/contextualTyping.js |  207 +-
 .../reference/contextualTyping.sourcemap.txt  | 1331 +++---
 .../reference/convertKeywordsYes.errors.txt   |  330 --
 .../baselines/reference/convertKeywordsYes.js |   28 -
 .../reference/convertKeywordsYes.types        |  879 ++++
 .../baselines/reference/cyclicModuleImport.js |   21 +
 .../baselines/reference/declFileAccessors.js  |  306 ++
 .../reference/declFileAccessors.types         |  160 +
 .../reference/declFileCallSignatures.js       |  121 +
 .../reference/declFileCallSignatures.types    |  117 +
 .../reference/declFileConstructSignatures.js  |  121 +
 .../declFileConstructSignatures.types         |  121 +
 .../reference/declFileConstructors.js         |  289 ++
 .../reference/declFileConstructors.types      |  176 +
 .../baselines/reference/declFileFunctions.js  |  146 +
 .../reference/declFileFunctions.types         |  142 +
 .../declFileImportChainInExportAssignment.js  |   39 +
 ...eclFileImportChainInExportAssignment.types |   24 +
 .../reference/declFileIndexSignatures.js      |   69 +
 .../reference/declFileIndexSignatures.types   |   66 +
 tests/baselines/reference/declFileMethods.js  |  459 +++
 .../baselines/reference/declFileMethods.types |  447 +++
 .../declarationEmit_nameConflicts.errors.txt  |   53 -
 .../declarationEmit_nameConflicts.js          |  195 +
 .../declarationEmit_nameConflicts.types       |  148 +
 .../declarationEmit_nameConflicts2.js         |    2 -
 .../declarationEmit_nameConflicts2.types      |    1 -
 .../declarationEmit_nameConflicts3.js         |    2 -
 .../declarationEmit_nameConflicts3.types      |    1 -
 ...tionEmit_nameConflictsWithAlias.errors.txt |   10 -
 .../declarationEmit_nameConflictsWithAlias.js |   28 +
 ...clarationEmit_nameConflictsWithAlias.types |   21 +
 ...tAssignmentWithVarFromVariableStatement.js |   41 +
 ...signmentWithVarFromVariableStatement.types |   51 +
 .../detachedCommentAtStartOfConstructor1.js   |   23 +
 ...detachedCommentAtStartOfConstructor1.types |   33 +
 .../detachedCommentAtStartOfConstructor2.js   |   24 +
 ...detachedCommentAtStartOfConstructor2.types |   34 +
 ...detachedCommentAtStartOfLambdaFunction1.js |   31 +
 ...achedCommentAtStartOfLambdaFunction1.types |   26 +
 ...detachedCommentAtStartOfLambdaFunction2.js |   32 +
 ...achedCommentAtStartOfLambdaFunction2.types |   27 +
 ...duplicatePropertiesInStrictMode.errors.txt |   10 +
 .../duplicateStringIndexers.errors.txt        |   47 +
 .../reference/duplicateStringIndexers.js      |   64 +-
 .../reference/duplicateVarAndImport.js        |   10 +
 .../reference/duplicateVarAndImport.types     |   13 +
 .../duplicateVarAndImport2.errors.txt         |    7 +
 .../reference/duplicateVarAndImport2.js       |   14 +
 tests/baselines/reference/emitBOM.js          |   12 +
 tests/baselines/reference/emitBOM.js.map      |    2 +
 .../baselines/reference/emitBOM.sourcemap.txt |   37 +
 tests/baselines/reference/emitBOM.types       |    6 +
 .../emptyTypeArgumentList.errors.txt          |    7 +
 .../emptyTypeArgumentListWithNew.errors.txt   |    7 +
 .../reference/enumBasics1.errors.txt          |    2 +-
 tests/baselines/reference/enumBasics1.js      |    2 +-
 .../enumInitializersWithExponents.errors.txt  |   14 +
 ...ntWithDeclareAndExportModifiers.errors.txt |    7 +
 ...rtAssignmentWithDeclareModifier.errors.txt |    7 +
 ...ortAssignmentWithExportModifier.errors.txt |    7 +
 .../reference/externalModuleResolution.js     |    6 +
 .../reference/externalModuleResolution2.js    |    6 +
 .../reference/externalModuleResolution2.types |    1 -
 .../fileReferencesWithNoExtensions.types      |   32 +
 ...nAndInterfaceWithSeparateErrors.errors.txt |   12 +
 .../functionAndInterfaceWithSeparateErrors.js |   12 +
 ...gReturnStatementsAndExpressions.errors.txt |  129 +
 ...WithOverloadedConstructorTypedArguments.js |    4 +-
 ...hOverloadedConstructorTypedArguments.types |    2 +-
 .../genericTypeWithCallableMembers.js         |    4 +-
 .../genericTypeWithCallableMembers.types      |    2 +-
 ...ementGenericWithMismatchedTypes.errors.txt |   11 +-
 .../implementGenericWithMismatchedTypes.js    |    2 +-
 .../baselines/reference/importDecl.errors.txt |   83 -
 tests/baselines/reference/importDecl.js       |   56 +-
 tests/baselines/reference/importDecl.types    |  228 ++
 .../indexSignatureTypeInference.errors.txt    |   23 +
 .../reference/indexSignatureTypeInference.js  |   30 +
 ...nheritedOverloadedSpecializedSignatures.js |   49 +
 ...ritedOverloadedSpecializedSignatures.types |   90 +
 .../internalAliasWithDottedNameEmit.js        |    8 +
 .../invalidTryStatements2.errors.txt          |   31 +-
 tests/baselines/reference/mixedExports.js     |   19 +
 tests/baselines/reference/mixedExports.types  |   38 +
 .../reference/moduleSymbolMerging.js          |   43 +
 .../reference/moduleSymbolMerging.types       |   21 +
 .../reference/multiImportExport.errors.txt    |   26 -
 .../baselines/reference/multiImportExport.js  |   63 +
 .../reference/multiImportExport.types         |   49 +
 .../nameCollisionsInPropertyAssignments.js    |    9 +
 .../nameCollisionsInPropertyAssignments.types |   12 +
 tests/baselines/reference/noCatchBlock.js     |   14 +
 tests/baselines/reference/noCatchBlock.js.map |    2 +
 .../reference/noCatchBlock.sourcemap.txt      |   53 +
 tests/baselines/reference/noCatchBlock.types  |    8 +
 .../reference/noImplicitAnyForIn.errors.txt   |   42 +
 .../baselines/reference/noImplicitAnyForIn.js |   57 +
 .../noImplicitAnyIndexing.errors.txt          |   58 +
 .../reference/noImplicitAnyIndexing.js        |   82 +
 ...icitAnyParametersInAmbientClass.errors.txt |  155 +
 .../noImplicitAnyParametersInAmbientClass.js  |   95 +
 ...AnyParametersInAmbientFunctions.errors.txt |   89 +
 ...ImplicitAnyParametersInAmbientFunctions.js |   47 +
 ...citAnyParametersInAmbientModule.errors.txt |   91 +
 .../noImplicitAnyParametersInAmbientModule.js |   49 +
 ...citAnyParametersInBareFunctions.errors.txt |   89 +
 .../noImplicitAnyParametersInBareFunctions.js |  102 +
 .../noImplicitAnyParametersInClass.errors.txt |  181 +
 .../noImplicitAnyParametersInClass.js         |  211 +
 ...mplicitAnyParametersInInterface.errors.txt |  106 +
 .../noImplicitAnyParametersInInterface.js     |   54 +
 ...noImplicitAnyParametersInModule.errors.txt |   91 +
 .../noImplicitAnyParametersInModule.js        |  107 +
 .../octalLiteralInStrictModeES3.errors.txt    |    5 +
 ...rentContainersDisagreeOnAmbient.errors.txt |   11 +
 ...sInDifferentContainersDisagreeOnAmbient.js |   17 +
 .../reference/parserAccessors1.errors.txt     |    4 +-
 tests/baselines/reference/parserAccessors1.js |   17 +
 tests/baselines/reference/parserAccessors2.js |   17 +
 .../reference/parserAccessors2.types          |    8 +
 .../reference/parserAccessors3.errors.txt     |    4 +-
 tests/baselines/reference/parserAccessors3.js |    6 +
 tests/baselines/reference/parserAccessors4.js |    6 +
 .../reference/parserAccessors4.types          |    7 +
 .../reference/parserAccessors5.errors.txt     |    2 +-
 .../reference/parserAccessors6.errors.txt     |    2 +-
 .../reference/parserAccessors7.errors.txt     |    2 +-
 .../reference/parserAccessors8.errors.txt     |    2 +-
 .../reference/parserAccessors9.errors.txt     |    2 +-
 .../parserAssignmentExpression1.errors.txt    |    8 +
 .../reference/parserAssignmentExpression1.js  |    5 +
 .../parserConstructorDeclaration11.errors.txt |    8 +
 .../baselines/reference/parserDoStatement2.js |    8 +
 .../reference/parserDoStatement2.types        |    3 +
 .../reference/parserES3Accessors1.errors.txt  |    8 +
 ...ors.txt => parserES3Accessors2.errors.txt} |    2 +-
 .../reference/parserES3Accessors3.errors.txt  |    6 +
 ...ors.txt => parserES3Accessors4.errors.txt} |    2 +-
 ...very_ExtendsOrImplementsClause6.errors.txt |    4 +
 .../reference/parserForStatement4.errors.txt  |    9 +
 .../reference/parserForStatement4.js          |    7 +
 .../reference/parserForStatement5.errors.txt  |    7 +
 .../reference/parserForStatement5.js          |    7 +
 .../reference/parserForStatement6.errors.txt  |    9 +
 .../reference/parserForStatement6.js          |    7 +
 .../reference/parserForStatement7.errors.txt  |    9 +
 .../reference/parserForStatement7.js          |    7 +
 .../reference/parserForStatement8.errors.txt  |    7 +
 .../reference/parserForStatement8.js          |    7 +
 ...rGetAccessorWithTypeParameters1.errors.txt |    2 +-
 ...parserKeywordsAsIdentifierName2.errors.txt |    2 +-
 .../parserMemberAccessor1.errors.txt          |    6 +-
 .../reference/parserMemberAccessor1.js        |   20 +
 ...arserMemberAccessorDeclaration1.errors.txt |    4 +-
 .../parserMemberAccessorDeclaration1.js       |   17 +
 ...rserMemberAccessorDeclaration10.errors.txt |    4 +-
 ...rserMemberAccessorDeclaration11.errors.txt |    4 +-
 ...rserMemberAccessorDeclaration12.errors.txt |    2 +-
 ...rserMemberAccessorDeclaration13.errors.txt |    2 +-
 ...rserMemberAccessorDeclaration14.errors.txt |    2 +-
 ...rserMemberAccessorDeclaration15.errors.txt |    2 +-
 ...rserMemberAccessorDeclaration16.errors.txt |    2 +-
 ...rserMemberAccessorDeclaration17.errors.txt |    2 +-
 ...rserMemberAccessorDeclaration18.errors.txt |    2 +-
 ...arserMemberAccessorDeclaration2.errors.txt |    4 +-
 .../parserMemberAccessorDeclaration2.js       |   17 +
 ...arserMemberAccessorDeclaration3.errors.txt |    4 +-
 .../parserMemberAccessorDeclaration3.js       |   17 +
 ...arserMemberAccessorDeclaration4.errors.txt |    6 -
 .../parserMemberAccessorDeclaration4.js       |   17 +
 .../parserMemberAccessorDeclaration4.types    |    8 +
 ...arserMemberAccessorDeclaration5.errors.txt |    6 -
 .../parserMemberAccessorDeclaration5.js       |   17 +
 .../parserMemberAccessorDeclaration5.types    |    7 +
 ...arserMemberAccessorDeclaration6.errors.txt |    6 -
 .../parserMemberAccessorDeclaration6.js       |   17 +
 .../parserMemberAccessorDeclaration6.types    |    7 +
 ...arserMemberAccessorDeclaration7.errors.txt |    4 +-
 ...arserMemberAccessorDeclaration8.errors.txt |    4 +-
 ...arserMemberAccessorDeclaration9.errors.txt |    4 +-
 .../parserObjectCreation2.errors.txt          |    4 +
 .../reference/parserObjectCreation2.js        |    5 +
 .../reference/parserObjectLiterals1.js        |    5 +
 .../reference/parserObjectLiterals1.types     |    7 +
 .../reference/parserObjectType5.errors.txt    |    9 +
 .../reference/parserObjectType6.errors.txt    |    9 +
 .../parserPostfixUnaryExpression1.errors.txt  |   10 +
 .../reference/parserS7.6.1.1_A1.10.errors.txt |   21 -
 .../reference/parserS7.6.1.1_A1.10.js         |   19 +
 .../reference/parserS7.6.1.1_A1.10.types      |   16 +
 ...rSetAccessorWithTypeAnnotation1.errors.txt |    2 +-
 ...rSetAccessorWithTypeParameters1.errors.txt |    2 +-
 .../parserSyntaxWalker.generated.errors.txt   |  334 --
 .../reference/parserSyntaxWalker.generated.js |  291 ++
 .../parserSyntaxWalker.generated.types        |  281 ++
 .../parserUnaryExpression1.errors.txt         |    4 +
 .../reference/parserUnaryExpression1.js       |    5 +
 .../parserUnaryExpression2.errors.txt         |    4 +
 .../reference/parserUnaryExpression2.js       |    6 +
 .../parserUnaryExpression3.errors.txt         |    4 +
 .../reference/parserUnaryExpression3.js       |    5 +
 .../parserUnaryExpression4.errors.txt         |    4 +
 .../reference/parserUnaryExpression4.js       |    5 +
 .../parserUnaryExpression5.errors.txt         |    6 +
 .../reference/parserUnaryExpression5.js       |    5 +
 .../reference/parserUnaryExpression6.js       |    4 +
 .../reference/parserUnaryExpression6.types    |    3 +
 .../parserUnaryExpression7.errors.txt         |    6 +
 .../reference/parserUnaryExpression7.js       |    5 +
 .../parserX_ArrowFunction1.errors.txt         |    6 +
 .../parserX_ArrowFunction2.errors.txt         |    8 +
 .../parserX_ArrowFunction3.errors.txt         |   10 +
 .../reference/parserX_ArrowFunction4.js       |    8 +
 .../reference/parserX_ArrowFunction4.types    |    8 +
 .../parserX_TypeArgumentList1.errors.txt      |   12 +
 ...sWhenHittingUnexpectedSemicolon.errors.txt |    8 +
 ...refixIncrementAsOperandOfPlusExpression.js |   11 +
 ...ixIncrementAsOperandOfPlusExpression.types |   17 +
 .../privacyAccessorDeclFile.errors.txt        | 1130 ++++++
 .../reference/privacyAccessorDeclFile.js      | 3555 +++++++++++++++++
 ...ivacyCannotNameAccessorDeclFile.errors.txt |  151 +
 .../privacyCannotNameAccessorDeclFile.js      |  411 ++
 ...rivacyCannotNameVarTypeDeclFile.errors.txt |  123 +
 .../privacyCannotNameVarTypeDeclFile.js       |  239 ++
 .../privacyCheckAnonymousFunctionParameter.js |    4 +
 ...privacyCheckAnonymousFunctionParameter2.js |    4 +
 ...lbackOfInterfaceMethodWithTypeParameter.js |    8 +
 ...rtAssignmentOnExportedGenericInterface1.js |   11 +
 ...rtAssignmentOnExportedGenericInterface2.js |   10 +
 ...nalModuleExportAssignmentOfGenericClass.js |   14 +
 ...arameterReferenceInConstructorParameter.js |    9 +
 .../privacyCheckTypeOfFunction.errors.txt     |    8 +-
 .../reference/privacyCheckTypeOfFunction.js   |   12 +
 ...CheckTypeOfInvisibleModuleError.errors.txt |   11 +
 ...ivacyCheckTypeOfInvisibleModuleError.types |   17 -
 ...ivacyClassExtendsClauseDeclFile.errors.txt |  106 +
 .../privacyClassExtendsClauseDeclFile.js      |  351 ++
 ...cyClassImplementsClauseDeclFile.errors.txt |  105 +
 .../privacyClassImplementsClauseDeclFile.js   |  239 ++
 ...CannotNameParameterTypeDeclFile.errors.txt |  203 +
 ...FunctionCannotNameParameterTypeDeclFile.js |  425 ++
 ...ionCannotNameReturnTypeDeclFile.errors.txt |  186 +
 ...acyFunctionCannotNameReturnTypeDeclFile.js |  382 ++
 ...rivacyFunctionParameterDeclFile.errors.txt |  805 ++++
 .../privacyFunctionParameterDeclFile.js       | 1279 ++++++
 ...ivacyFunctionReturnTypeDeclFile.errors.txt | 1324 ++++++
 .../privacyFunctionReturnTypeDeclFile.js      | 2279 +++++++++++
 .../reference/privacyGetter.errors.txt        |  304 --
 tests/baselines/reference/privacyGetter.js    |  506 +++
 tests/baselines/reference/privacyGetter.types |  410 ++
 .../reference/privacyGloGetter.errors.txt     |  129 -
 tests/baselines/reference/privacyGloGetter.js |  218 +
 .../reference/privacyGloGetter.types          |  174 +
 .../reference/privacyGloImport.errors.txt     |  145 +-
 tests/baselines/reference/privacyGloImport.js |  263 ++
 .../privacyGloImportParseErrors.errors.txt    |  185 +
 .../reference/privacyImport.errors.txt        |  460 +--
 tests/baselines/reference/privacyImport.js    |  703 ++++
 .../privacyImportParseErrors.errors.txt       |  455 +++
 ...yInterfaceExtendsClauseDeclFile.errors.txt |  105 +
 .../privacyInterfaceExtendsClauseDeclFile.js  |   98 +
 ...ternalReferenceImportWithExport.errors.txt |  167 +
 ...calInternalReferenceImportWithExport.types |  537 ---
 ...nalReferenceImportWithoutExport.errors.txt |  163 +
 ...InternalReferenceImportWithoutExport.types |  537 ---
 ...tExternalModuleImportWithExport.errors.txt |   57 -
 ...elAmbientExternalModuleImportWithExport.js |   72 +-
 ...mbientExternalModuleImportWithExport.types |  113 +
 ...ternalModuleImportWithoutExport.errors.txt |   49 -
 ...mbientExternalModuleImportWithoutExport.js |   36 +
 ...entExternalModuleImportWithoutExport.types |  113 +
 ...ternalReferenceImportWithExport.errors.txt |  114 +
 ...velInternalReferenceImportWithExport.types |  312 --
 ...nalReferenceImportWithoutExport.errors.txt |  111 +
 ...velInternalReferenceImportWithoutExport.js |    1 +
 ...InternalReferenceImportWithoutExport.types |  312 --
 .../privacyTypeParameterOfFunction.errors.txt |  135 -
 .../privacyTypeParameterOfFunction.js         |  245 ++
 .../privacyTypeParameterOfFunction.types      |  303 ++
 ...TypeParameterOfFunctionDeclFile.errors.txt |  511 +++
 .../privacyTypeParameterOfFunctionDeclFile.js |  816 ++++
 .../privacyTypeParametersOfClass.errors.txt   |   46 -
 .../reference/privacyTypeParametersOfClass.js |  109 +
 .../privacyTypeParametersOfClass.types        |  104 +
 ...cyTypeParametersOfClassDeclFile.errors.txt |  163 +
 .../privacyTypeParametersOfClassDeclFile.js   |  383 ++
 ...rivacyTypeParametersOfInterface.errors.txt |   61 -
 .../privacyTypeParametersOfInterface.js       |   83 +
 .../privacyTypeParametersOfInterface.types    |  199 +
 ...peParametersOfInterfaceDeclFile.errors.txt |  231 ++
 ...rivacyTypeParametersOfInterfaceDeclFile.js |  265 ++
 .../reference/privacyVarDeclFile.errors.txt   |  484 +++
 .../baselines/reference/privacyVarDeclFile.js |  702 ++++
 .../reference/promiseChaining.errors.txt      |  136 -
 tests/baselines/reference/promiseChaining.js  |   26 +
 .../baselines/reference/promiseChaining.types |   59 +
 .../reference/promiseChaining2.errors.txt     |   13 +
 tests/baselines/reference/promiseChaining2.js |   24 +-
 .../reference/promiseChaining2.types          |    3 -
 ...opertyParameterWithQuestionMark.errors.txt |   16 +
 .../propertyParameterWithQuestionMark.js      |   23 +
 .../reference/regExpWithSlashInCharClass.js   |   10 +
 .../regExpWithSlashInCharClass.types          |   19 +
 .../reservedNameOnInterfaceImport.errors.txt  |   10 +
 .../reservedNameOnInterfaceImport.js          |   10 +
 .../reference/reservedNameOnModuleImport.js   |   10 +
 .../reservedNameOnModuleImport.types          |   13 +
 ...NameOnModuleImportWithInterface.errors.txt |   11 +
 ...reservedNameOnModuleImportWithInterface.js |   11 +
 .../reference/scannerES3NumericLiteral1.js    |    5 +
 .../reference/scannerES3NumericLiteral1.types |    3 +
 .../reference/scannerES3NumericLiteral2.js    |    5 +
 .../reference/scannerES3NumericLiteral2.types |    3 +
 .../scannerES3NumericLiteral3.errors.txt      |    4 +
 .../scannerES3NumericLiteral4.errors.txt      |    4 +
 .../reference/scannerES3NumericLiteral5.js    |    5 +
 .../reference/scannerES3NumericLiteral5.types |    3 +
 .../scannerES3NumericLiteral6.errors.txt      |    4 +
 .../reference/scannerES3NumericLiteral7.js    |    5 +
 .../reference/scannerES3NumericLiteral7.types |    3 +
 .../scannerNumericLiteral2.errors.txt         |    4 +
 .../reference/scannerNumericLiteral2.js       |    5 -
 .../reference/scannerNumericLiteral2.types    |    3 -
 .../scannerNumericLiteral3.errors.txt         |    4 +-
 .../scannerNumericLiteral8.errors.txt         |    4 +
 .../scannerNumericLiteral9.errors.txt         |    6 +
 .../reference/sourceMap-SkippedNode.js        |   13 +
 .../reference/sourceMap-SkippedNode.js.map    |    2 +
 .../sourceMap-SkippedNode.sourcemap.txt       |   52 +
 .../reference/sourceMap-SkippedNode.types     |    7 +
 .../sourceMapValidationClass.errors.txt       |   23 -
 .../reference/sourceMapValidationClass.js     |   49 +
 .../reference/sourceMapValidationClass.js.map |    2 +
 .../sourceMapValidationClass.sourcemap.txt    |  388 ++
 .../reference/sourceMapValidationClass.types  |   52 +
 ...ceMapValidationExportAssignmentCommonjs.js |   14 +
 ...pValidationExportAssignmentCommonjs.js.map |    2 +
 ...tionExportAssignmentCommonjs.sourcemap.txt |   89 +
 ...apValidationExportAssignmentCommonjs.types |   10 +
 ...sourceMapWithMultipleFilesWithCopyright.js |   44 +
 ...ceMapWithMultipleFilesWithCopyright.js.map |    2 +
 ...thMultipleFilesWithCopyright.sourcemap.txt |  134 +
 ...rceMapWithMultipleFilesWithCopyright.types |   27 +
 ...ultipleFilesWithFileEndingWithInterface.js |   34 +
 ...pleFilesWithFileEndingWithInterface.js.map |    2 +
 ...sWithFileEndingWithInterface.sourcemap.txt |  235 ++
 ...ipleFilesWithFileEndingWithInterface.types |   35 +
 .../specializedLambdaTypeArguments.errors.txt |    9 -
 .../specializedLambdaTypeArguments.js         |    2 +-
 .../specializedLambdaTypeArguments.types      |   16 +
 .../specializedSignatureInInterface.js        |   11 +
 .../specializedSignatureInInterface.types     |   18 +
 ...dWithTypeParameterExtendsClauseDeclFile.js |   66 +
 ...thTypeParameterExtendsClauseDeclFile.types |   44 +
 tests/baselines/reference/strictMode5.js      |   46 +
 tests/baselines/reference/strictMode5.types   |   38 +
 ...hStatementsWithMultipleDefaults.errors.txt |   50 +
 .../baselines/reference/testContainerList.js  |   20 +
 .../reference/testContainerList.types         |   13 +
 .../baselines/reference/trailingCommasES3.js  |   25 +
 .../reference/trailingCommasES3.types         |   47 +
 .../baselines/reference/trailingCommasES5.js  |   25 +
 .../reference/trailingCommasES5.types         |   47 +
 ...ameterWithInvalidConstraintType.errors.txt |   13 +
 .../typeParameterWithInvalidConstraintType.js |   26 +
 .../reference/typeQueryWithReservedWords.js   |   29 +
 .../typeQueryWithReservedWords.types          |   37 +
 .../reference/unusedImportDeclaration.js      |    8 +
 .../accessorParameterAccessibilityModifier.ts |    2 +-
 .../cases/compiler/accessorWithInitializer.ts |    2 +-
 tests/cases/compiler/accessorWithRestParam.ts |    2 +
 .../cases/compiler/aliasInaccessibleModule.ts |    1 +
 .../compiler/aliasInaccessibleModule2.ts      |    1 +
 .../compiler/aliasUsageInAccessorsOfClass.ts  |    1 +
 ...entExternalModuleWithRelativeModuleName.ts |    4 +
 tests/cases/compiler/ambientGetters.ts        |    2 +
 tests/cases/compiler/amdDependencyComment2.ts |    5 +
 .../arrowFunctionMissingCurlyWithSemicolon.ts |    4 +
 .../compiler/arrowFunctionsMissingTokens.ts   |   66 +
 .../compiler/asiAmbientFunctionDeclaration.ts |    1 +
 tests/cases/compiler/asiBreak.ts              |    1 +
 tests/cases/compiler/asiContinue.ts           |    1 +
 tests/cases/compiler/asiReturn.ts             |    2 +
 .../compiler/assignmentCompatability24.ts     |    2 +-
 .../compiler/assignmentCompatability33.ts     |    2 +-
 .../compiler/assignmentCompatability34.ts     |    2 +-
 .../compiler/assignmentCompatability37.ts     |    2 +-
 .../compiler/assignmentCompatability38.ts     |    2 +-
 tests/cases/compiler/augmentArray.ts          |    3 +
 .../autoAsiForStaticsInClassDeclaration.ts    |    4 +
 tests/cases/compiler/badArraySyntax.ts        |    2 +-
 .../cases/compiler/captureThisInSuperCall.ts  |    8 +
 .../compiler/castExpressionParentheses.ts     |    2 +-
 tests/cases/compiler/chainedImportAlias.ts    |    7 +-
 .../classImplementsImportedInterface.ts       |   12 +
 tests/cases/compiler/commentsClass.ts         |   16 +-
 tests/cases/compiler/commentsClassMembers.ts  |   19 +-
 .../compiler/commentsDottedModuleName.ts      |   11 +
 tests/cases/compiler/commentsEnums.ts         |    2 +-
 .../cases/compiler/commentsExternalModules.ts |    2 +-
 .../compiler/commentsExternalModules2.ts      |   63 +
 .../compiler/commentsExternalModules3.ts      |   63 +
 tests/cases/compiler/commentsFormatting.ts    |   72 +
 tests/cases/compiler/commentsFunction.ts      |   36 +-
 tests/cases/compiler/commentsModules.ts       |    8 +-
 .../compiler/commentsMultiModuleMultiFile.ts  |    4 +-
 .../compiler/commentsOnObjectLiteral2.ts      |    2 +-
 .../compiler/commentsOnObjectLiteral3.ts      |    7 +-
 .../compiler/commentsOnObjectLiteral4.ts      |    1 +
 .../cases/compiler/commentsTypeParameters.ts  |   17 +
 tests/cases/compiler/commentsVarDecl.ts       |    8 +-
 tests/cases/compiler/complicatedPrivacy.ts    |    1 +
 .../cases/compiler/constructorArgsErrors3.ts  |    4 +
 .../cases/compiler/constructorArgsErrors4.ts  |    4 +
 .../cases/compiler/constructorArgsErrors5.ts  |    4 +
 .../constructorsWithSpecializedSignatures.ts  |   43 +
 .../contextualSignatureInstantiation3.ts      |   22 +
 tests/cases/compiler/contextualTyping.ts      |    3 +-
 tests/cases/compiler/convertKeywordsYes.ts    |    8 -
 tests/cases/compiler/cyclicModuleImport.ts    |    1 +
 tests/cases/compiler/declFileAccessors.ts     |  104 +
 .../cases/compiler/declFileCallSignatures.ts  |   68 +
 .../compiler/declFileConstructSignatures.ts   |   68 +
 tests/cases/compiler/declFileConstructors.ts  |  100 +
 tests/cases/compiler/declFileFunctions.ts     |   62 +
 .../declFileImportChainInExportAssignment.ts  |   11 +
 .../cases/compiler/declFileIndexSignatures.ts |   38 +
 tests/cases/compiler/declFileMethods.ts       |  192 +
 .../compiler/declarationEmit_nameConflicts.ts |    4 +-
 .../declarationEmit_nameConflicts2.ts         |    1 -
 .../declarationEmit_nameConflicts3.ts         |    2 +-
 .../declarationEmit_nameConflictsWithAlias.ts |    2 +-
 ...tAssignmentWithVarFromVariableStatement.ts |   20 +
 .../detachedCommentAtStartOfConstructor1.ts   |   10 +
 .../detachedCommentAtStartOfConstructor2.ts   |   11 +
 ...detachedCommentAtStartOfLambdaFunction1.ts |   10 +
 ...detachedCommentAtStartOfLambdaFunction2.ts |   11 +
 .../duplicatePropertiesInStrictMode.ts        |    5 +
 tests/cases/compiler/duplicateVarAndImport.ts |    5 +
 .../cases/compiler/duplicateVarAndImport2.ts  |    4 +
 tests/cases/compiler/emitBOM.ts               |    6 +
 tests/cases/compiler/emptyTypeArgumentList.ts |    2 +
 .../compiler/emptyTypeArgumentListWithNew.ts  |    2 +
 tests/cases/compiler/enumBasics1.ts           |    2 +-
 .../compiler/enumInitializersWithExponents.ts |    9 +
 ...AssignmentWithDeclareAndExportModifiers.ts |    2 +
 .../exportAssignmentWithDeclareModifier.ts    |    2 +
 .../exportAssignmentWithExportModifier.ts     |    2 +
 .../compiler/externalModuleResolution.ts      |    6 +
 .../compiler/externalModuleResolution2.ts     |    6 +
 .../fileReferencesWithNoExtensions.ts         |   19 +
 .../functionAndInterfaceWithSeparateErrors.ts |    7 +
 ...nsMissingReturnStatementsAndExpressions.ts |  119 +
 .../genericTypeWithCallableMembers.ts         |    2 +-
 .../implementGenericWithMismatchedTypes.ts    |    2 +-
 tests/cases/compiler/importDecl.ts            |    1 -
 .../compiler/indexSignatureTypeInference.ts   |   19 +
 ...nheritedOverloadedSpecializedSignatures.ts |   36 +
 .../internalAliasWithDottedNameEmit.ts        |    1 +
 tests/cases/compiler/mixedExports.ts          |   16 +
 tests/cases/compiler/moduleSymbolMerging.ts   |   12 +
 tests/cases/compiler/multiImportExport.ts     |    2 +
 .../nameCollisionsInPropertyAssignments.ts    |    2 +
 tests/cases/compiler/noCatchBlock.ts          |    7 +
 tests/cases/compiler/noImplicitAnyForIn.ts    |   32 +
 tests/cases/compiler/noImplicitAnyIndexing.ts |   49 +
 .../noImplicitAnyParametersInAmbientClass.ts  |   93 +
 ...ImplicitAnyParametersInAmbientFunctions.ts |   45 +
 .../noImplicitAnyParametersInAmbientModule.ts |   47 +
 .../noImplicitAnyParametersInBareFunctions.ts |   45 +
 .../noImplicitAnyParametersInClass.ts         |   93 +
 .../noImplicitAnyParametersInInterface.ts     |   52 +
 .../noImplicitAnyParametersInModule.ts        |   47 +
 ...sInDifferentContainersDisagreeOnAmbient.ts |    8 +
 ...sRecoversWhenHittingUnexpectedSemicolon.ts |    4 +
 ...refixIncrementAsOperandOfPlusExpression.ts |    4 +
 .../cases/compiler/privacyAccessorDeclFile.ts | 1061 +++++
 .../privacyCannotNameAccessorDeclFile.ts      |  138 +
 .../privacyCannotNameVarTypeDeclFile.ts       |  101 +
 .../privacyCheckAnonymousFunctionParameter.ts |    1 +
 ...privacyCheckAnonymousFunctionParameter2.ts |    1 +
 ...lbackOfInterfaceMethodWithTypeParameter.ts |    1 +
 ...rtAssignmentOnExportedGenericInterface1.ts |    1 +
 ...rtAssignmentOnExportedGenericInterface2.ts |    1 +
 ...nalModuleExportAssignmentOfGenericClass.ts |    1 +
 ...arameterReferenceInConstructorParameter.ts |    1 +
 .../compiler/privacyCheckTypeOfFunction.ts    |    2 +
 .../privacyCheckTypeOfInvisibleModuleError.ts |    1 +
 .../privacyClassExtendsClauseDeclFile.ts      |   97 +
 .../privacyClassImplementsClauseDeclFile.ts   |   94 +
 ...FunctionCannotNameParameterTypeDeclFile.ts |  157 +
 ...acyFunctionCannotNameReturnTypeDeclFile.ts |  163 +
 .../privacyFunctionParameterDeclFile.ts       |  687 ++++
 .../privacyFunctionReturnTypeDeclFile.ts      | 1194 ++++++
 tests/cases/compiler/privacyGetter.ts         |    1 +
 tests/cases/compiler/privacyGloGetter.ts      |    1 +
 tests/cases/compiler/privacyGloImport.ts      |   98 +-
 .../compiler/privacyGloImportParseErrors.ts   |  153 +
 tests/cases/compiler/privacyImport.ts         |  357 +-
 .../compiler/privacyImportParseErrors.ts      |  357 ++
 .../privacyInterfaceExtendsClauseDeclFile.ts  |   94 +
 ...yLocalInternalReferenceImportWithExport.ts |    1 +
 ...calInternalReferenceImportWithoutExport.ts |    1 +
 ...elAmbientExternalModuleImportWithExport.ts |   19 +-
 ...mbientExternalModuleImportWithoutExport.ts |    3 +
 ...pLevelInternalReferenceImportWithExport.ts |    1 +
 ...velInternalReferenceImportWithoutExport.ts |    2 +
 .../privacyTypeParameterOfFunction.ts         |    1 +
 .../privacyTypeParameterOfFunctionDeclFile.ts |  440 ++
 .../compiler/privacyTypeParametersOfClass.ts  |    1 +
 .../privacyTypeParametersOfClassDeclFile.ts   |  155 +
 .../privacyTypeParametersOfInterface.ts       |    1 +
 ...rivacyTypeParametersOfInterfaceDeclFile.ts |  192 +
 tests/cases/compiler/privacyVarDeclFile.ts    |  426 ++
 tests/cases/compiler/promiseChaining.ts       |   24 -
 tests/cases/compiler/promiseChaining2.ts      |   10 +
 .../propertyParameterWithQuestionMark.ts      |    9 +
 .../compiler/regExpWithSlashInCharClass.ts    |    3 +
 .../compiler/reservedNameOnInterfaceImport.ts |    6 +
 .../compiler/reservedNameOnModuleImport.ts    |    6 +
 ...reservedNameOnModuleImportWithInterface.ts |    7 +
 tests/cases/compiler/sourceMap-SkippedNode.ts |    6 +
 .../compiler/sourceMapValidationClass.ts      |    1 +
 ...ceMapValidationExportAssignmentCommonjs.ts |    6 +
 ...sourceMapWithMultipleFilesWithCopyright.ts |   20 +
 ...ultipleFilesWithFileEndingWithInterface.ts |   18 +
 .../specializedLambdaTypeArguments.ts         |    2 +-
 .../specializedSignatureInInterface.ts        |    8 +
 ...dWithTypeParameterExtendsClauseDeclFile.ts |   22 +
 tests/cases/compiler/strictMode5.ts           |   18 +
 .../switchStatementsWithMultipleDefaults.ts   |   31 +
 tests/cases/compiler/testContainerList.ts     |    6 +
 tests/cases/compiler/trailingCommasES3.ts     |   13 +
 tests/cases/compiler/trailingCommasES5.ts     |   13 +
 .../typeParameterWithInvalidConstraintType.ts |   10 +
 .../cases/compiler/unusedImportDeclaration.ts |    1 +
 .../classExtendingPrimitive2.ts               |    4 +
 .../classExtendsEveryObjectType2.ts           |    3 +
 .../Accessors/parserES3Accessors1.ts          |    3 +
 .../Accessors/parserES3Accessors2.ts          |    3 +
 .../Accessors/parserES3Accessors3.ts          |    1 +
 .../Accessors/parserES3Accessors4.ts          |    1 +
 .../ecmascript5/Accessors/parserAccessors1.ts |    1 +
 .../Accessors/parserAccessors10.ts            |    1 +
 .../ecmascript5/Accessors/parserAccessors2.ts |    1 +
 .../ecmascript5/Accessors/parserAccessors3.ts |    1 +
 .../ecmascript5/Accessors/parserAccessors4.ts |    1 +
 .../ecmascript5/Accessors/parserAccessors5.ts |    1 +
 .../ecmascript5/Accessors/parserAccessors6.ts |    1 +
 .../ecmascript5/Accessors/parserAccessors7.ts |    1 +
 .../ecmascript5/Accessors/parserAccessors8.ts |    1 +
 .../ecmascript5/Accessors/parserAccessors9.ts |    1 +
 .../parserGetAccessorWithTypeParameters1.ts   |    1 +
 .../parserSetAccessorWithTypeAnnotation1.ts   |    1 +
 .../parserSetAccessorWithTypeParameters1.ts   |    1 +
 .../parserConstructorDeclaration11.ts         |    3 +
 .../ArrowFunctions/parserX_ArrowFunction1.ts  |    3 +
 .../ArrowFunctions/parserX_ArrowFunction2.ts  |    3 +
 .../ArrowFunctions/parserX_ArrowFunction3.ts  |    3 +
 .../ArrowFunctions/parserX_ArrowFunction4.ts  |    3 +
 ...rrorRecovery_ExtendsOrImplementsClause6.ts |    1 +
 .../parserX_TypeArgumentList1.ts              |    1 +
 .../parserAssignmentExpression1.ts            |    1 +
 .../Expressions/parserObjectCreation2.ts      |    1 +
 .../parserPostfixUnaryExpression1.ts          |    1 +
 .../Expressions/parserUnaryExpression1.ts     |    1 +
 .../Expressions/parserUnaryExpression2.ts     |    1 +
 .../Expressions/parserUnaryExpression3.ts     |    1 +
 .../Expressions/parserUnaryExpression4.ts     |    1 +
 .../Expressions/parserUnaryExpression5.ts     |    1 +
 .../Expressions/parserUnaryExpression6.ts     |    0
 .../Expressions/parserUnaryExpression7.ts     |    1 +
 .../parserMemberAccessor1.ts                  |    1 +
 .../parserMemberAccessorDeclaration1.ts       |    1 +
 .../parserMemberAccessorDeclaration10.ts      |    1 +
 .../parserMemberAccessorDeclaration11.ts      |    1 +
 .../parserMemberAccessorDeclaration12.ts      |    1 +
 .../parserMemberAccessorDeclaration13.ts      |    1 +
 .../parserMemberAccessorDeclaration14.ts      |    1 +
 .../parserMemberAccessorDeclaration15.ts      |    1 +
 .../parserMemberAccessorDeclaration16.ts      |    1 +
 .../parserMemberAccessorDeclaration17.ts      |    1 +
 .../parserMemberAccessorDeclaration18.ts      |    1 +
 .../parserMemberAccessorDeclaration2.ts       |    1 +
 .../parserMemberAccessorDeclaration3.ts       |    1 +
 .../parserMemberAccessorDeclaration4.ts       |    1 +
 .../parserMemberAccessorDeclaration5.ts       |    1 +
 .../parserMemberAccessorDeclaration6.ts       |    1 +
 .../parserMemberAccessorDeclaration7.ts       |    1 +
 .../parserMemberAccessorDeclaration8.ts       |    1 +
 .../parserMemberAccessorDeclaration9.ts       |    1 +
 .../ObjectLiterals/parserObjectLiterals1.ts   |    1 +
 .../ObjectTypes/parserObjectType5.ts          |    4 +
 .../ObjectTypes/parserObjectType6.ts          |    4 +
 .../parserReturnStatement4.js                 |    3 +
 .../Statements/parserDoStatement2.ts          |    1 +
 .../Statements/parserForStatement4.ts         |    2 +
 .../Statements/parserForStatement5.ts         |    2 +
 .../Statements/parserForStatement6.ts         |    2 +
 .../Statements/parserForStatement7.ts         |    2 +
 .../Statements/parserForStatement8.ts         |    2 +
 .../StrictMode/octalLiteralInStrictModeES3.ts |    2 +
 .../parserKeywordsAsIdentifierName2.ts        |    2 +-
 .../ecmascript5/parserS7.6.1.1_A1.10.ts       |    2 +-
 .../parserSyntaxWalker.generated.ts           |  452 +--
 .../ecmascript3/scannerES3NumericLiteral1.ts  |    1 +
 .../ecmascript3/scannerES3NumericLiteral2.ts  |    1 +
 .../ecmascript3/scannerES3NumericLiteral3.ts  |    1 +
 .../ecmascript3/scannerES3NumericLiteral4.ts  |    1 +
 .../ecmascript3/scannerES3NumericLiteral5.ts  |    1 +
 .../ecmascript3/scannerES3NumericLiteral6.ts  |    1 +
 .../ecmascript3/scannerES3NumericLiteral7.ts  |    1 +
 .../ecmascript5/scannerNumericLiteral1.ts     |    1 +
 .../ecmascript5/scannerNumericLiteral2.ts     |    1 +
 .../ecmascript5/scannerNumericLiteral3.ts     |    1 +
 .../ecmascript5/scannerNumericLiteral4.ts     |    1 +
 .../ecmascript5/scannerNumericLiteral5.ts     |    1 +
 .../ecmascript5/scannerNumericLiteral6.ts     |    1 +
 .../ecmascript5/scannerNumericLiteral7.ts     |    1 +
 .../ecmascript5/scannerNumericLiteral8.ts     |    2 +
 .../ecmascript5/scannerNumericLiteral9.ts     |    2 +
 .../tryStatements/invalidTryStatements2.ts    |   21 +-
 .../types/members/duplicateStringIndexers.ts  |   49 +-
 ...hOnlyPublicMembersEquivalentToInterface.ts |    1 +
 ...OnlyPublicMembersEquivalentToInterface2.ts |    1 +
 .../typeQueries/typeQueryWithReservedWords.ts |   14 +
 ...WithOverloadedConstructorTypedArguments.ts |    2 +-
 728 files changed, 44762 insertions(+), 5966 deletions(-)
 create mode 100644 tests/baselines/reference/aliasInaccessibleModule.errors.txt
 delete mode 100644 tests/baselines/reference/aliasInaccessibleModule.types
 create mode 100644 tests/baselines/reference/aliasInaccessibleModule2.errors.txt
 delete mode 100644 tests/baselines/reference/aliasInaccessibleModule2.types
 delete mode 100644 tests/baselines/reference/aliasUsageInAccessorsOfClass.errors.txt
 create mode 100644 tests/baselines/reference/aliasUsageInAccessorsOfClass.js
 create mode 100644 tests/baselines/reference/aliasUsageInAccessorsOfClass.types
 create mode 100644 tests/baselines/reference/amdDependencyComment2.errors.txt
 create mode 100644 tests/baselines/reference/amdDependencyComment2.js
 create mode 100644 tests/baselines/reference/arrowFunctionMissingCurlyWithSemicolon.errors.txt
 create mode 100644 tests/baselines/reference/arrowFunctionsMissingTokens.errors.txt
 create mode 100644 tests/baselines/reference/asiAmbientFunctionDeclaration.js
 create mode 100644 tests/baselines/reference/asiAmbientFunctionDeclaration.types
 create mode 100644 tests/baselines/reference/asiBreak.js
 create mode 100644 tests/baselines/reference/asiBreak.types
 create mode 100644 tests/baselines/reference/asiContinue.js
 create mode 100644 tests/baselines/reference/asiContinue.types
 create mode 100644 tests/baselines/reference/asiReturn.errors.txt
 create mode 100644 tests/baselines/reference/augmentArray.js
 create mode 100644 tests/baselines/reference/augmentArray.types
 create mode 100644 tests/baselines/reference/autoAsiForStaticsInClassDeclaration.js
 create mode 100644 tests/baselines/reference/autoAsiForStaticsInClassDeclaration.types
 create mode 100644 tests/baselines/reference/captureThisInSuperCall.js
 create mode 100644 tests/baselines/reference/captureThisInSuperCall.types
 delete mode 100644 tests/baselines/reference/castExpressionParentheses.errors.txt
 create mode 100644 tests/baselines/reference/castExpressionParentheses.types
 create mode 100644 tests/baselines/reference/classExtendingPrimitive2.errors.txt
 create mode 100644 tests/baselines/reference/classExtendsEveryObjectType2.errors.txt
 create mode 100644 tests/baselines/reference/classImplementsImportedInterface.js
 create mode 100644 tests/baselines/reference/classImplementsImportedInterface.types
 delete mode 100644 tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface.errors.txt
 create mode 100644 tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface.js
 create mode 100644 tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface.types
 delete mode 100644 tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface2.errors.txt
 create mode 100644 tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface2.js
 create mode 100644 tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface2.types
 create mode 100644 tests/baselines/reference/commentsDottedModuleName.js
 create mode 100644 tests/baselines/reference/commentsDottedModuleName.types
 create mode 100644 tests/baselines/reference/commentsExternalModules2.js
 create mode 100644 tests/baselines/reference/commentsExternalModules2.types
 create mode 100644 tests/baselines/reference/commentsExternalModules3.js
 create mode 100644 tests/baselines/reference/commentsExternalModules3.types
 create mode 100644 tests/baselines/reference/commentsFormatting.js
 create mode 100644 tests/baselines/reference/commentsFormatting.types
 delete mode 100644 tests/baselines/reference/commentsMultiModuleMultiFile.errors.txt
 create mode 100644 tests/baselines/reference/commentsMultiModuleMultiFile.types
 delete mode 100644 tests/baselines/reference/commentsOnObjectLiteral3.errors.txt
 create mode 100644 tests/baselines/reference/commentsOnObjectLiteral3.js
 create mode 100644 tests/baselines/reference/commentsOnObjectLiteral3.types
 delete mode 100644 tests/baselines/reference/commentsOnObjectLiteral4.errors.txt
 create mode 100644 tests/baselines/reference/commentsOnObjectLiteral4.js
 create mode 100644 tests/baselines/reference/commentsOnObjectLiteral4.types
 create mode 100644 tests/baselines/reference/commentsTypeParameters.js
 create mode 100644 tests/baselines/reference/commentsTypeParameters.types
 create mode 100644 tests/baselines/reference/constructorArgsErrors3.errors.txt
 create mode 100644 tests/baselines/reference/constructorArgsErrors4.errors.txt
 create mode 100644 tests/baselines/reference/constructorArgsErrors5.errors.txt
 create mode 100644 tests/baselines/reference/constructorsWithSpecializedSignatures.errors.txt
 create mode 100644 tests/baselines/reference/constructorsWithSpecializedSignatures.js
 create mode 100644 tests/baselines/reference/contextualSignatureInstantiation3.js
 create mode 100644 tests/baselines/reference/contextualSignatureInstantiation3.types
 delete mode 100644 tests/baselines/reference/convertKeywordsYes.errors.txt
 create mode 100644 tests/baselines/reference/convertKeywordsYes.types
 create mode 100644 tests/baselines/reference/declFileAccessors.js
 create mode 100644 tests/baselines/reference/declFileAccessors.types
 create mode 100644 tests/baselines/reference/declFileCallSignatures.js
 create mode 100644 tests/baselines/reference/declFileCallSignatures.types
 create mode 100644 tests/baselines/reference/declFileConstructSignatures.js
 create mode 100644 tests/baselines/reference/declFileConstructSignatures.types
 create mode 100644 tests/baselines/reference/declFileConstructors.js
 create mode 100644 tests/baselines/reference/declFileConstructors.types
 create mode 100644 tests/baselines/reference/declFileFunctions.js
 create mode 100644 tests/baselines/reference/declFileFunctions.types
 create mode 100644 tests/baselines/reference/declFileImportChainInExportAssignment.js
 create mode 100644 tests/baselines/reference/declFileImportChainInExportAssignment.types
 create mode 100644 tests/baselines/reference/declFileIndexSignatures.js
 create mode 100644 tests/baselines/reference/declFileIndexSignatures.types
 create mode 100644 tests/baselines/reference/declFileMethods.js
 create mode 100644 tests/baselines/reference/declFileMethods.types
 delete mode 100644 tests/baselines/reference/declarationEmit_nameConflicts.errors.txt
 create mode 100644 tests/baselines/reference/declarationEmit_nameConflicts.js
 create mode 100644 tests/baselines/reference/declarationEmit_nameConflicts.types
 delete mode 100644 tests/baselines/reference/declarationEmit_nameConflictsWithAlias.errors.txt
 create mode 100644 tests/baselines/reference/declarationEmit_nameConflictsWithAlias.js
 create mode 100644 tests/baselines/reference/declarationEmit_nameConflictsWithAlias.types
 create mode 100644 tests/baselines/reference/declareFileExportAssignmentWithVarFromVariableStatement.js
 create mode 100644 tests/baselines/reference/declareFileExportAssignmentWithVarFromVariableStatement.types
 create mode 100644 tests/baselines/reference/detachedCommentAtStartOfConstructor1.js
 create mode 100644 tests/baselines/reference/detachedCommentAtStartOfConstructor1.types
 create mode 100644 tests/baselines/reference/detachedCommentAtStartOfConstructor2.js
 create mode 100644 tests/baselines/reference/detachedCommentAtStartOfConstructor2.types
 create mode 100644 tests/baselines/reference/detachedCommentAtStartOfLambdaFunction1.js
 create mode 100644 tests/baselines/reference/detachedCommentAtStartOfLambdaFunction1.types
 create mode 100644 tests/baselines/reference/detachedCommentAtStartOfLambdaFunction2.js
 create mode 100644 tests/baselines/reference/detachedCommentAtStartOfLambdaFunction2.types
 create mode 100644 tests/baselines/reference/duplicatePropertiesInStrictMode.errors.txt
 create mode 100644 tests/baselines/reference/duplicateStringIndexers.errors.txt
 create mode 100644 tests/baselines/reference/duplicateVarAndImport.js
 create mode 100644 tests/baselines/reference/duplicateVarAndImport.types
 create mode 100644 tests/baselines/reference/duplicateVarAndImport2.errors.txt
 create mode 100644 tests/baselines/reference/duplicateVarAndImport2.js
 create mode 100644 tests/baselines/reference/emitBOM.js
 create mode 100644 tests/baselines/reference/emitBOM.js.map
 create mode 100644 tests/baselines/reference/emitBOM.sourcemap.txt
 create mode 100644 tests/baselines/reference/emitBOM.types
 create mode 100644 tests/baselines/reference/emptyTypeArgumentList.errors.txt
 create mode 100644 tests/baselines/reference/emptyTypeArgumentListWithNew.errors.txt
 create mode 100644 tests/baselines/reference/enumInitializersWithExponents.errors.txt
 create mode 100644 tests/baselines/reference/exportAssignmentWithDeclareAndExportModifiers.errors.txt
 create mode 100644 tests/baselines/reference/exportAssignmentWithDeclareModifier.errors.txt
 create mode 100644 tests/baselines/reference/exportAssignmentWithExportModifier.errors.txt
 create mode 100644 tests/baselines/reference/fileReferencesWithNoExtensions.types
 create mode 100644 tests/baselines/reference/functionAndInterfaceWithSeparateErrors.errors.txt
 create mode 100644 tests/baselines/reference/functionAndInterfaceWithSeparateErrors.js
 create mode 100644 tests/baselines/reference/functionsMissingReturnStatementsAndExpressions.errors.txt
 delete mode 100644 tests/baselines/reference/importDecl.errors.txt
 create mode 100644 tests/baselines/reference/importDecl.types
 create mode 100644 tests/baselines/reference/indexSignatureTypeInference.errors.txt
 create mode 100644 tests/baselines/reference/indexSignatureTypeInference.js
 create mode 100644 tests/baselines/reference/inheritedOverloadedSpecializedSignatures.js
 create mode 100644 tests/baselines/reference/inheritedOverloadedSpecializedSignatures.types
 create mode 100644 tests/baselines/reference/mixedExports.js
 create mode 100644 tests/baselines/reference/mixedExports.types
 create mode 100644 tests/baselines/reference/moduleSymbolMerging.js
 create mode 100644 tests/baselines/reference/moduleSymbolMerging.types
 delete mode 100644 tests/baselines/reference/multiImportExport.errors.txt
 create mode 100644 tests/baselines/reference/multiImportExport.js
 create mode 100644 tests/baselines/reference/multiImportExport.types
 create mode 100644 tests/baselines/reference/nameCollisionsInPropertyAssignments.js
 create mode 100644 tests/baselines/reference/nameCollisionsInPropertyAssignments.types
 create mode 100644 tests/baselines/reference/noCatchBlock.js
 create mode 100644 tests/baselines/reference/noCatchBlock.js.map
 create mode 100644 tests/baselines/reference/noCatchBlock.sourcemap.txt
 create mode 100644 tests/baselines/reference/noCatchBlock.types
 create mode 100644 tests/baselines/reference/noImplicitAnyForIn.errors.txt
 create mode 100644 tests/baselines/reference/noImplicitAnyForIn.js
 create mode 100644 tests/baselines/reference/noImplicitAnyIndexing.errors.txt
 create mode 100644 tests/baselines/reference/noImplicitAnyIndexing.js
 create mode 100644 tests/baselines/reference/noImplicitAnyParametersInAmbientClass.errors.txt
 create mode 100644 tests/baselines/reference/noImplicitAnyParametersInAmbientClass.js
 create mode 100644 tests/baselines/reference/noImplicitAnyParametersInAmbientFunctions.errors.txt
 create mode 100644 tests/baselines/reference/noImplicitAnyParametersInAmbientFunctions.js
 create mode 100644 tests/baselines/reference/noImplicitAnyParametersInAmbientModule.errors.txt
 create mode 100644 tests/baselines/reference/noImplicitAnyParametersInAmbientModule.js
 create mode 100644 tests/baselines/reference/noImplicitAnyParametersInBareFunctions.errors.txt
 create mode 100644 tests/baselines/reference/noImplicitAnyParametersInBareFunctions.js
 create mode 100644 tests/baselines/reference/noImplicitAnyParametersInClass.errors.txt
 create mode 100644 tests/baselines/reference/noImplicitAnyParametersInClass.js
 create mode 100644 tests/baselines/reference/noImplicitAnyParametersInInterface.errors.txt
 create mode 100644 tests/baselines/reference/noImplicitAnyParametersInInterface.js
 create mode 100644 tests/baselines/reference/noImplicitAnyParametersInModule.errors.txt
 create mode 100644 tests/baselines/reference/noImplicitAnyParametersInModule.js
 create mode 100644 tests/baselines/reference/octalLiteralInStrictModeES3.errors.txt
 create mode 100644 tests/baselines/reference/overloadsInDifferentContainersDisagreeOnAmbient.errors.txt
 create mode 100644 tests/baselines/reference/overloadsInDifferentContainersDisagreeOnAmbient.js
 create mode 100644 tests/baselines/reference/parserAccessors1.js
 create mode 100644 tests/baselines/reference/parserAccessors2.js
 create mode 100644 tests/baselines/reference/parserAccessors2.types
 create mode 100644 tests/baselines/reference/parserAccessors3.js
 create mode 100644 tests/baselines/reference/parserAccessors4.js
 create mode 100644 tests/baselines/reference/parserAccessors4.types
 create mode 100644 tests/baselines/reference/parserAssignmentExpression1.errors.txt
 create mode 100644 tests/baselines/reference/parserAssignmentExpression1.js
 create mode 100644 tests/baselines/reference/parserConstructorDeclaration11.errors.txt
 create mode 100644 tests/baselines/reference/parserDoStatement2.js
 create mode 100644 tests/baselines/reference/parserDoStatement2.types
 create mode 100644 tests/baselines/reference/parserES3Accessors1.errors.txt
 rename tests/baselines/reference/{parserAccessors2.errors.txt => parserES3Accessors2.errors.txt} (54%)
 create mode 100644 tests/baselines/reference/parserES3Accessors3.errors.txt
 rename tests/baselines/reference/{parserAccessors4.errors.txt => parserES3Accessors4.errors.txt} (52%)
 create mode 100644 tests/baselines/reference/parserErrorRecovery_ExtendsOrImplementsClause6.errors.txt
 create mode 100644 tests/baselines/reference/parserForStatement4.errors.txt
 create mode 100644 tests/baselines/reference/parserForStatement4.js
 create mode 100644 tests/baselines/reference/parserForStatement5.errors.txt
 create mode 100644 tests/baselines/reference/parserForStatement5.js
 create mode 100644 tests/baselines/reference/parserForStatement6.errors.txt
 create mode 100644 tests/baselines/reference/parserForStatement6.js
 create mode 100644 tests/baselines/reference/parserForStatement7.errors.txt
 create mode 100644 tests/baselines/reference/parserForStatement7.js
 create mode 100644 tests/baselines/reference/parserForStatement8.errors.txt
 create mode 100644 tests/baselines/reference/parserForStatement8.js
 create mode 100644 tests/baselines/reference/parserMemberAccessor1.js
 create mode 100644 tests/baselines/reference/parserMemberAccessorDeclaration1.js
 create mode 100644 tests/baselines/reference/parserMemberAccessorDeclaration2.js
 create mode 100644 tests/baselines/reference/parserMemberAccessorDeclaration3.js
 delete mode 100644 tests/baselines/reference/parserMemberAccessorDeclaration4.errors.txt
 create mode 100644 tests/baselines/reference/parserMemberAccessorDeclaration4.js
 create mode 100644 tests/baselines/reference/parserMemberAccessorDeclaration4.types
 delete mode 100644 tests/baselines/reference/parserMemberAccessorDeclaration5.errors.txt
 create mode 100644 tests/baselines/reference/parserMemberAccessorDeclaration5.js
 create mode 100644 tests/baselines/reference/parserMemberAccessorDeclaration5.types
 delete mode 100644 tests/baselines/reference/parserMemberAccessorDeclaration6.errors.txt
 create mode 100644 tests/baselines/reference/parserMemberAccessorDeclaration6.js
 create mode 100644 tests/baselines/reference/parserMemberAccessorDeclaration6.types
 create mode 100644 tests/baselines/reference/parserObjectCreation2.errors.txt
 create mode 100644 tests/baselines/reference/parserObjectCreation2.js
 create mode 100644 tests/baselines/reference/parserObjectLiterals1.js
 create mode 100644 tests/baselines/reference/parserObjectLiterals1.types
 create mode 100644 tests/baselines/reference/parserObjectType5.errors.txt
 create mode 100644 tests/baselines/reference/parserObjectType6.errors.txt
 create mode 100644 tests/baselines/reference/parserPostfixUnaryExpression1.errors.txt
 delete mode 100644 tests/baselines/reference/parserS7.6.1.1_A1.10.errors.txt
 create mode 100644 tests/baselines/reference/parserS7.6.1.1_A1.10.js
 create mode 100644 tests/baselines/reference/parserS7.6.1.1_A1.10.types
 delete mode 100644 tests/baselines/reference/parserSyntaxWalker.generated.errors.txt
 create mode 100644 tests/baselines/reference/parserSyntaxWalker.generated.js
 create mode 100644 tests/baselines/reference/parserSyntaxWalker.generated.types
 create mode 100644 tests/baselines/reference/parserUnaryExpression1.errors.txt
 create mode 100644 tests/baselines/reference/parserUnaryExpression1.js
 create mode 100644 tests/baselines/reference/parserUnaryExpression2.errors.txt
 create mode 100644 tests/baselines/reference/parserUnaryExpression2.js
 create mode 100644 tests/baselines/reference/parserUnaryExpression3.errors.txt
 create mode 100644 tests/baselines/reference/parserUnaryExpression3.js
 create mode 100644 tests/baselines/reference/parserUnaryExpression4.errors.txt
 create mode 100644 tests/baselines/reference/parserUnaryExpression4.js
 create mode 100644 tests/baselines/reference/parserUnaryExpression5.errors.txt
 create mode 100644 tests/baselines/reference/parserUnaryExpression5.js
 create mode 100644 tests/baselines/reference/parserUnaryExpression6.js
 create mode 100644 tests/baselines/reference/parserUnaryExpression6.types
 create mode 100644 tests/baselines/reference/parserUnaryExpression7.errors.txt
 create mode 100644 tests/baselines/reference/parserUnaryExpression7.js
 create mode 100644 tests/baselines/reference/parserX_ArrowFunction1.errors.txt
 create mode 100644 tests/baselines/reference/parserX_ArrowFunction2.errors.txt
 create mode 100644 tests/baselines/reference/parserX_ArrowFunction3.errors.txt
 create mode 100644 tests/baselines/reference/parserX_ArrowFunction4.js
 create mode 100644 tests/baselines/reference/parserX_ArrowFunction4.types
 create mode 100644 tests/baselines/reference/parserX_TypeArgumentList1.errors.txt
 create mode 100644 tests/baselines/reference/parsingClassRecoversWhenHittingUnexpectedSemicolon.errors.txt
 create mode 100644 tests/baselines/reference/prefixIncrementAsOperandOfPlusExpression.js
 create mode 100644 tests/baselines/reference/prefixIncrementAsOperandOfPlusExpression.types
 create mode 100644 tests/baselines/reference/privacyAccessorDeclFile.errors.txt
 create mode 100644 tests/baselines/reference/privacyAccessorDeclFile.js
 create mode 100644 tests/baselines/reference/privacyCannotNameAccessorDeclFile.errors.txt
 create mode 100644 tests/baselines/reference/privacyCannotNameAccessorDeclFile.js
 create mode 100644 tests/baselines/reference/privacyCannotNameVarTypeDeclFile.errors.txt
 create mode 100644 tests/baselines/reference/privacyCannotNameVarTypeDeclFile.js
 create mode 100644 tests/baselines/reference/privacyCheckTypeOfFunction.js
 create mode 100644 tests/baselines/reference/privacyCheckTypeOfInvisibleModuleError.errors.txt
 delete mode 100644 tests/baselines/reference/privacyCheckTypeOfInvisibleModuleError.types
 create mode 100644 tests/baselines/reference/privacyClassExtendsClauseDeclFile.errors.txt
 create mode 100644 tests/baselines/reference/privacyClassExtendsClauseDeclFile.js
 create mode 100644 tests/baselines/reference/privacyClassImplementsClauseDeclFile.errors.txt
 create mode 100644 tests/baselines/reference/privacyClassImplementsClauseDeclFile.js
 create mode 100644 tests/baselines/reference/privacyFunctionCannotNameParameterTypeDeclFile.errors.txt
 create mode 100644 tests/baselines/reference/privacyFunctionCannotNameParameterTypeDeclFile.js
 create mode 100644 tests/baselines/reference/privacyFunctionCannotNameReturnTypeDeclFile.errors.txt
 create mode 100644 tests/baselines/reference/privacyFunctionCannotNameReturnTypeDeclFile.js
 create mode 100644 tests/baselines/reference/privacyFunctionParameterDeclFile.errors.txt
 create mode 100644 tests/baselines/reference/privacyFunctionParameterDeclFile.js
 create mode 100644 tests/baselines/reference/privacyFunctionReturnTypeDeclFile.errors.txt
 create mode 100644 tests/baselines/reference/privacyFunctionReturnTypeDeclFile.js
 delete mode 100644 tests/baselines/reference/privacyGetter.errors.txt
 create mode 100644 tests/baselines/reference/privacyGetter.js
 create mode 100644 tests/baselines/reference/privacyGetter.types
 delete mode 100644 tests/baselines/reference/privacyGloGetter.errors.txt
 create mode 100644 tests/baselines/reference/privacyGloGetter.js
 create mode 100644 tests/baselines/reference/privacyGloGetter.types
 create mode 100644 tests/baselines/reference/privacyGloImport.js
 create mode 100644 tests/baselines/reference/privacyGloImportParseErrors.errors.txt
 create mode 100644 tests/baselines/reference/privacyImport.js
 create mode 100644 tests/baselines/reference/privacyImportParseErrors.errors.txt
 create mode 100644 tests/baselines/reference/privacyInterfaceExtendsClauseDeclFile.errors.txt
 create mode 100644 tests/baselines/reference/privacyInterfaceExtendsClauseDeclFile.js
 create mode 100644 tests/baselines/reference/privacyLocalInternalReferenceImportWithExport.errors.txt
 delete mode 100644 tests/baselines/reference/privacyLocalInternalReferenceImportWithExport.types
 create mode 100644 tests/baselines/reference/privacyLocalInternalReferenceImportWithoutExport.errors.txt
 delete mode 100644 tests/baselines/reference/privacyLocalInternalReferenceImportWithoutExport.types
 delete mode 100644 tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithExport.errors.txt
 create mode 100644 tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithExport.types
 delete mode 100644 tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithoutExport.errors.txt
 create mode 100644 tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithoutExport.types
 create mode 100644 tests/baselines/reference/privacyTopLevelInternalReferenceImportWithExport.errors.txt
 delete mode 100644 tests/baselines/reference/privacyTopLevelInternalReferenceImportWithExport.types
 create mode 100644 tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.errors.txt
 delete mode 100644 tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.types
 delete mode 100644 tests/baselines/reference/privacyTypeParameterOfFunction.errors.txt
 create mode 100644 tests/baselines/reference/privacyTypeParameterOfFunction.js
 create mode 100644 tests/baselines/reference/privacyTypeParameterOfFunction.types
 create mode 100644 tests/baselines/reference/privacyTypeParameterOfFunctionDeclFile.errors.txt
 create mode 100644 tests/baselines/reference/privacyTypeParameterOfFunctionDeclFile.js
 delete mode 100644 tests/baselines/reference/privacyTypeParametersOfClass.errors.txt
 create mode 100644 tests/baselines/reference/privacyTypeParametersOfClass.js
 create mode 100644 tests/baselines/reference/privacyTypeParametersOfClass.types
 create mode 100644 tests/baselines/reference/privacyTypeParametersOfClassDeclFile.errors.txt
 create mode 100644 tests/baselines/reference/privacyTypeParametersOfClassDeclFile.js
 delete mode 100644 tests/baselines/reference/privacyTypeParametersOfInterface.errors.txt
 create mode 100644 tests/baselines/reference/privacyTypeParametersOfInterface.js
 create mode 100644 tests/baselines/reference/privacyTypeParametersOfInterface.types
 create mode 100644 tests/baselines/reference/privacyTypeParametersOfInterfaceDeclFile.errors.txt
 create mode 100644 tests/baselines/reference/privacyTypeParametersOfInterfaceDeclFile.js
 create mode 100644 tests/baselines/reference/privacyVarDeclFile.errors.txt
 create mode 100644 tests/baselines/reference/privacyVarDeclFile.js
 delete mode 100644 tests/baselines/reference/promiseChaining.errors.txt
 create mode 100644 tests/baselines/reference/promiseChaining.js
 create mode 100644 tests/baselines/reference/promiseChaining.types
 create mode 100644 tests/baselines/reference/promiseChaining2.errors.txt
 delete mode 100644 tests/baselines/reference/promiseChaining2.types
 create mode 100644 tests/baselines/reference/propertyParameterWithQuestionMark.errors.txt
 create mode 100644 tests/baselines/reference/propertyParameterWithQuestionMark.js
 create mode 100644 tests/baselines/reference/regExpWithSlashInCharClass.js
 create mode 100644 tests/baselines/reference/regExpWithSlashInCharClass.types
 create mode 100644 tests/baselines/reference/reservedNameOnInterfaceImport.errors.txt
 create mode 100644 tests/baselines/reference/reservedNameOnInterfaceImport.js
 create mode 100644 tests/baselines/reference/reservedNameOnModuleImport.js
 create mode 100644 tests/baselines/reference/reservedNameOnModuleImport.types
 create mode 100644 tests/baselines/reference/reservedNameOnModuleImportWithInterface.errors.txt
 create mode 100644 tests/baselines/reference/reservedNameOnModuleImportWithInterface.js
 create mode 100644 tests/baselines/reference/scannerES3NumericLiteral1.js
 create mode 100644 tests/baselines/reference/scannerES3NumericLiteral1.types
 create mode 100644 tests/baselines/reference/scannerES3NumericLiteral2.js
 create mode 100644 tests/baselines/reference/scannerES3NumericLiteral2.types
 create mode 100644 tests/baselines/reference/scannerES3NumericLiteral3.errors.txt
 create mode 100644 tests/baselines/reference/scannerES3NumericLiteral4.errors.txt
 create mode 100644 tests/baselines/reference/scannerES3NumericLiteral5.js
 create mode 100644 tests/baselines/reference/scannerES3NumericLiteral5.types
 create mode 100644 tests/baselines/reference/scannerES3NumericLiteral6.errors.txt
 create mode 100644 tests/baselines/reference/scannerES3NumericLiteral7.js
 create mode 100644 tests/baselines/reference/scannerES3NumericLiteral7.types
 create mode 100644 tests/baselines/reference/scannerNumericLiteral2.errors.txt
 delete mode 100644 tests/baselines/reference/scannerNumericLiteral2.js
 delete mode 100644 tests/baselines/reference/scannerNumericLiteral2.types
 create mode 100644 tests/baselines/reference/scannerNumericLiteral8.errors.txt
 create mode 100644 tests/baselines/reference/scannerNumericLiteral9.errors.txt
 create mode 100644 tests/baselines/reference/sourceMap-SkippedNode.js
 create mode 100644 tests/baselines/reference/sourceMap-SkippedNode.js.map
 create mode 100644 tests/baselines/reference/sourceMap-SkippedNode.sourcemap.txt
 create mode 100644 tests/baselines/reference/sourceMap-SkippedNode.types
 delete mode 100644 tests/baselines/reference/sourceMapValidationClass.errors.txt
 create mode 100644 tests/baselines/reference/sourceMapValidationClass.js
 create mode 100644 tests/baselines/reference/sourceMapValidationClass.sourcemap.txt
 create mode 100644 tests/baselines/reference/sourceMapValidationClass.types
 create mode 100644 tests/baselines/reference/sourceMapValidationExportAssignmentCommonjs.js
 create mode 100644 tests/baselines/reference/sourceMapValidationExportAssignmentCommonjs.js.map
 create mode 100644 tests/baselines/reference/sourceMapValidationExportAssignmentCommonjs.sourcemap.txt
 create mode 100644 tests/baselines/reference/sourceMapValidationExportAssignmentCommonjs.types
 create mode 100644 tests/baselines/reference/sourceMapWithMultipleFilesWithCopyright.js
 create mode 100644 tests/baselines/reference/sourceMapWithMultipleFilesWithCopyright.js.map
 create mode 100644 tests/baselines/reference/sourceMapWithMultipleFilesWithCopyright.sourcemap.txt
 create mode 100644 tests/baselines/reference/sourceMapWithMultipleFilesWithCopyright.types
 create mode 100644 tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.js
 create mode 100644 tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.js.map
 create mode 100644 tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.sourcemap.txt
 create mode 100644 tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.types
 delete mode 100644 tests/baselines/reference/specializedLambdaTypeArguments.errors.txt
 create mode 100644 tests/baselines/reference/specializedLambdaTypeArguments.types
 create mode 100644 tests/baselines/reference/specializedSignatureInInterface.js
 create mode 100644 tests/baselines/reference/specializedSignatureInInterface.types
 create mode 100644 tests/baselines/reference/staticMethodWithTypeParameterExtendsClauseDeclFile.js
 create mode 100644 tests/baselines/reference/staticMethodWithTypeParameterExtendsClauseDeclFile.types
 create mode 100644 tests/baselines/reference/strictMode5.js
 create mode 100644 tests/baselines/reference/strictMode5.types
 create mode 100644 tests/baselines/reference/switchStatementsWithMultipleDefaults.errors.txt
 create mode 100644 tests/baselines/reference/testContainerList.js
 create mode 100644 tests/baselines/reference/testContainerList.types
 create mode 100644 tests/baselines/reference/trailingCommasES3.js
 create mode 100644 tests/baselines/reference/trailingCommasES3.types
 create mode 100644 tests/baselines/reference/trailingCommasES5.js
 create mode 100644 tests/baselines/reference/trailingCommasES5.types
 create mode 100644 tests/baselines/reference/typeParameterWithInvalidConstraintType.errors.txt
 create mode 100644 tests/baselines/reference/typeParameterWithInvalidConstraintType.js
 create mode 100644 tests/baselines/reference/typeQueryWithReservedWords.js
 create mode 100644 tests/baselines/reference/typeQueryWithReservedWords.types
 create mode 100644 tests/cases/compiler/amdDependencyComment2.ts
 create mode 100644 tests/cases/compiler/arrowFunctionMissingCurlyWithSemicolon.ts
 create mode 100644 tests/cases/compiler/arrowFunctionsMissingTokens.ts
 create mode 100644 tests/cases/compiler/asiAmbientFunctionDeclaration.ts
 create mode 100644 tests/cases/compiler/asiBreak.ts
 create mode 100644 tests/cases/compiler/asiContinue.ts
 create mode 100644 tests/cases/compiler/asiReturn.ts
 create mode 100644 tests/cases/compiler/augmentArray.ts
 create mode 100644 tests/cases/compiler/autoAsiForStaticsInClassDeclaration.ts
 create mode 100644 tests/cases/compiler/captureThisInSuperCall.ts
 create mode 100644 tests/cases/compiler/classImplementsImportedInterface.ts
 create mode 100644 tests/cases/compiler/commentsDottedModuleName.ts
 create mode 100644 tests/cases/compiler/commentsExternalModules2.ts
 create mode 100644 tests/cases/compiler/commentsExternalModules3.ts
 create mode 100644 tests/cases/compiler/commentsFormatting.ts
 create mode 100644 tests/cases/compiler/commentsTypeParameters.ts
 create mode 100644 tests/cases/compiler/constructorArgsErrors3.ts
 create mode 100644 tests/cases/compiler/constructorArgsErrors4.ts
 create mode 100644 tests/cases/compiler/constructorArgsErrors5.ts
 create mode 100644 tests/cases/compiler/constructorsWithSpecializedSignatures.ts
 create mode 100644 tests/cases/compiler/contextualSignatureInstantiation3.ts
 create mode 100644 tests/cases/compiler/declFileAccessors.ts
 create mode 100644 tests/cases/compiler/declFileCallSignatures.ts
 create mode 100644 tests/cases/compiler/declFileConstructSignatures.ts
 create mode 100644 tests/cases/compiler/declFileConstructors.ts
 create mode 100644 tests/cases/compiler/declFileFunctions.ts
 create mode 100644 tests/cases/compiler/declFileImportChainInExportAssignment.ts
 create mode 100644 tests/cases/compiler/declFileIndexSignatures.ts
 create mode 100644 tests/cases/compiler/declFileMethods.ts
 create mode 100644 tests/cases/compiler/declareFileExportAssignmentWithVarFromVariableStatement.ts
 create mode 100644 tests/cases/compiler/detachedCommentAtStartOfConstructor1.ts
 create mode 100644 tests/cases/compiler/detachedCommentAtStartOfConstructor2.ts
 create mode 100644 tests/cases/compiler/detachedCommentAtStartOfLambdaFunction1.ts
 create mode 100644 tests/cases/compiler/detachedCommentAtStartOfLambdaFunction2.ts
 create mode 100644 tests/cases/compiler/duplicatePropertiesInStrictMode.ts
 create mode 100644 tests/cases/compiler/duplicateVarAndImport.ts
 create mode 100644 tests/cases/compiler/duplicateVarAndImport2.ts
 create mode 100644 tests/cases/compiler/emitBOM.ts
 create mode 100644 tests/cases/compiler/emptyTypeArgumentList.ts
 create mode 100644 tests/cases/compiler/emptyTypeArgumentListWithNew.ts
 create mode 100644 tests/cases/compiler/enumInitializersWithExponents.ts
 create mode 100644 tests/cases/compiler/exportAssignmentWithDeclareAndExportModifiers.ts
 create mode 100644 tests/cases/compiler/exportAssignmentWithDeclareModifier.ts
 create mode 100644 tests/cases/compiler/exportAssignmentWithExportModifier.ts
 create mode 100644 tests/cases/compiler/fileReferencesWithNoExtensions.ts
 create mode 100644 tests/cases/compiler/functionAndInterfaceWithSeparateErrors.ts
 create mode 100644 tests/cases/compiler/functionsMissingReturnStatementsAndExpressions.ts
 create mode 100644 tests/cases/compiler/indexSignatureTypeInference.ts
 create mode 100644 tests/cases/compiler/inheritedOverloadedSpecializedSignatures.ts
 create mode 100644 tests/cases/compiler/mixedExports.ts
 create mode 100644 tests/cases/compiler/moduleSymbolMerging.ts
 create mode 100644 tests/cases/compiler/nameCollisionsInPropertyAssignments.ts
 create mode 100644 tests/cases/compiler/noCatchBlock.ts
 create mode 100644 tests/cases/compiler/noImplicitAnyForIn.ts
 create mode 100644 tests/cases/compiler/noImplicitAnyIndexing.ts
 create mode 100644 tests/cases/compiler/noImplicitAnyParametersInAmbientClass.ts
 create mode 100644 tests/cases/compiler/noImplicitAnyParametersInAmbientFunctions.ts
 create mode 100644 tests/cases/compiler/noImplicitAnyParametersInAmbientModule.ts
 create mode 100644 tests/cases/compiler/noImplicitAnyParametersInBareFunctions.ts
 create mode 100644 tests/cases/compiler/noImplicitAnyParametersInClass.ts
 create mode 100644 tests/cases/compiler/noImplicitAnyParametersInInterface.ts
 create mode 100644 tests/cases/compiler/noImplicitAnyParametersInModule.ts
 create mode 100644 tests/cases/compiler/overloadsInDifferentContainersDisagreeOnAmbient.ts
 create mode 100644 tests/cases/compiler/parsingClassRecoversWhenHittingUnexpectedSemicolon.ts
 create mode 100644 tests/cases/compiler/prefixIncrementAsOperandOfPlusExpression.ts
 create mode 100644 tests/cases/compiler/privacyAccessorDeclFile.ts
 create mode 100644 tests/cases/compiler/privacyCannotNameAccessorDeclFile.ts
 create mode 100644 tests/cases/compiler/privacyCannotNameVarTypeDeclFile.ts
 create mode 100644 tests/cases/compiler/privacyClassExtendsClauseDeclFile.ts
 create mode 100644 tests/cases/compiler/privacyClassImplementsClauseDeclFile.ts
 create mode 100644 tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile.ts
 create mode 100644 tests/cases/compiler/privacyFunctionCannotNameReturnTypeDeclFile.ts
 create mode 100644 tests/cases/compiler/privacyFunctionParameterDeclFile.ts
 create mode 100644 tests/cases/compiler/privacyFunctionReturnTypeDeclFile.ts
 create mode 100644 tests/cases/compiler/privacyGloImportParseErrors.ts
 create mode 100644 tests/cases/compiler/privacyImportParseErrors.ts
 create mode 100644 tests/cases/compiler/privacyInterfaceExtendsClauseDeclFile.ts
 create mode 100644 tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts
 create mode 100644 tests/cases/compiler/privacyTypeParametersOfClassDeclFile.ts
 create mode 100644 tests/cases/compiler/privacyTypeParametersOfInterfaceDeclFile.ts
 create mode 100644 tests/cases/compiler/privacyVarDeclFile.ts
 create mode 100644 tests/cases/compiler/propertyParameterWithQuestionMark.ts
 create mode 100644 tests/cases/compiler/regExpWithSlashInCharClass.ts
 create mode 100644 tests/cases/compiler/reservedNameOnInterfaceImport.ts
 create mode 100644 tests/cases/compiler/reservedNameOnModuleImport.ts
 create mode 100644 tests/cases/compiler/reservedNameOnModuleImportWithInterface.ts
 create mode 100644 tests/cases/compiler/sourceMap-SkippedNode.ts
 create mode 100644 tests/cases/compiler/sourceMapValidationExportAssignmentCommonjs.ts
 create mode 100644 tests/cases/compiler/sourceMapWithMultipleFilesWithCopyright.ts
 create mode 100644 tests/cases/compiler/sourceMapWithMultipleFilesWithFileEndingWithInterface.ts
 create mode 100644 tests/cases/compiler/specializedSignatureInInterface.ts
 create mode 100644 tests/cases/compiler/staticMethodWithTypeParameterExtendsClauseDeclFile.ts
 create mode 100644 tests/cases/compiler/strictMode5.ts
 create mode 100644 tests/cases/compiler/switchStatementsWithMultipleDefaults.ts
 create mode 100644 tests/cases/compiler/testContainerList.ts
 create mode 100644 tests/cases/compiler/trailingCommasES3.ts
 create mode 100644 tests/cases/compiler/trailingCommasES5.ts
 create mode 100644 tests/cases/compiler/typeParameterWithInvalidConstraintType.ts
 create mode 100644 tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendingPrimitive2.ts
 create mode 100644 tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendsEveryObjectType2.ts
 create mode 100644 tests/cases/conformance/parser/ecmascript3/Accessors/parserES3Accessors1.ts
 create mode 100644 tests/cases/conformance/parser/ecmascript3/Accessors/parserES3Accessors2.ts
 create mode 100644 tests/cases/conformance/parser/ecmascript3/Accessors/parserES3Accessors3.ts
 create mode 100644 tests/cases/conformance/parser/ecmascript3/Accessors/parserES3Accessors4.ts
 create mode 100644 tests/cases/conformance/parser/ecmascript5/ConstructorDeclarations/parserConstructorDeclaration11.ts
 create mode 100644 tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ArrowFunctions/parserX_ArrowFunction1.ts
 create mode 100644 tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ArrowFunctions/parserX_ArrowFunction2.ts
 create mode 100644 tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ArrowFunctions/parserX_ArrowFunction3.ts
 create mode 100644 tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ArrowFunctions/parserX_ArrowFunction4.ts
 create mode 100644 tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ExtendsOrImplementsClauses/parserErrorRecovery_ExtendsOrImplementsClause6.ts
 create mode 100644 tests/cases/conformance/parser/ecmascript5/ErrorRecovery/TypeArgumentLists/parserX_TypeArgumentList1.ts
 create mode 100644 tests/cases/conformance/parser/ecmascript5/Expressions/parserAssignmentExpression1.ts
 create mode 100644 tests/cases/conformance/parser/ecmascript5/Expressions/parserObjectCreation2.ts
 create mode 100644 tests/cases/conformance/parser/ecmascript5/Expressions/parserPostfixUnaryExpression1.ts
 create mode 100644 tests/cases/conformance/parser/ecmascript5/Expressions/parserUnaryExpression1.ts
 create mode 100644 tests/cases/conformance/parser/ecmascript5/Expressions/parserUnaryExpression2.ts
 create mode 100644 tests/cases/conformance/parser/ecmascript5/Expressions/parserUnaryExpression3.ts
 create mode 100644 tests/cases/conformance/parser/ecmascript5/Expressions/parserUnaryExpression4.ts
 create mode 100644 tests/cases/conformance/parser/ecmascript5/Expressions/parserUnaryExpression5.ts
 create mode 100644 tests/cases/conformance/parser/ecmascript5/Expressions/parserUnaryExpression6.ts
 create mode 100644 tests/cases/conformance/parser/ecmascript5/Expressions/parserUnaryExpression7.ts
 create mode 100644 tests/cases/conformance/parser/ecmascript5/ObjectLiterals/parserObjectLiterals1.ts
 create mode 100644 tests/cases/conformance/parser/ecmascript5/ObjectTypes/parserObjectType5.ts
 create mode 100644 tests/cases/conformance/parser/ecmascript5/ObjectTypes/parserObjectType6.ts
 create mode 100644 tests/cases/conformance/parser/ecmascript5/Statements/ReturnStatements/parserReturnStatement4.js
 create mode 100644 tests/cases/conformance/parser/ecmascript5/Statements/parserDoStatement2.ts
 create mode 100644 tests/cases/conformance/parser/ecmascript5/Statements/parserForStatement4.ts
 create mode 100644 tests/cases/conformance/parser/ecmascript5/Statements/parserForStatement5.ts
 create mode 100644 tests/cases/conformance/parser/ecmascript5/Statements/parserForStatement6.ts
 create mode 100644 tests/cases/conformance/parser/ecmascript5/Statements/parserForStatement7.ts
 create mode 100644 tests/cases/conformance/parser/ecmascript5/Statements/parserForStatement8.ts
 create mode 100644 tests/cases/conformance/parser/ecmascript5/StrictMode/octalLiteralInStrictModeES3.ts
 create mode 100644 tests/cases/conformance/scanner/ecmascript3/scannerES3NumericLiteral1.ts
 create mode 100644 tests/cases/conformance/scanner/ecmascript3/scannerES3NumericLiteral2.ts
 create mode 100644 tests/cases/conformance/scanner/ecmascript3/scannerES3NumericLiteral3.ts
 create mode 100644 tests/cases/conformance/scanner/ecmascript3/scannerES3NumericLiteral4.ts
 create mode 100644 tests/cases/conformance/scanner/ecmascript3/scannerES3NumericLiteral5.ts
 create mode 100644 tests/cases/conformance/scanner/ecmascript3/scannerES3NumericLiteral6.ts
 create mode 100644 tests/cases/conformance/scanner/ecmascript3/scannerES3NumericLiteral7.ts
 create mode 100644 tests/cases/conformance/scanner/ecmascript5/scannerNumericLiteral8.ts
 create mode 100644 tests/cases/conformance/scanner/ecmascript5/scannerNumericLiteral9.ts
 create mode 100644 tests/cases/conformance/types/specifyingTypes/typeQueries/typeQueryWithReservedWords.ts

diff --git a/tests/baselines/reference/accessorParameterAccessibilityModifier.errors.txt b/tests/baselines/reference/accessorParameterAccessibilityModifier.errors.txt
index 8765a8002a5..df4fe1ecf9e 100644
--- a/tests/baselines/reference/accessorParameterAccessibilityModifier.errors.txt
+++ b/tests/baselines/reference/accessorParameterAccessibilityModifier.errors.txt
@@ -1,15 +1,14 @@
 ==== tests/cases/compiler/accessorParameterAccessibilityModifier.ts (4 errors) ====
-    // target: es5
     
     class C {
         set X(public v) { }
             ~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
+!!! A parameter property is only allowed in a constructor implementation.
               ~~~~~~~~
 !!! A parameter property is only allowed in a constructor implementation.
         static set X(public v2) { }
                    ~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
+!!! A parameter property is only allowed in a constructor implementation.
                      ~~~~~~~~~
 !!! A parameter property is only allowed in a constructor implementation.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/accessorWithInitializer.errors.txt b/tests/baselines/reference/accessorWithInitializer.errors.txt
index ebd518ec9e8..127bfdc8d82 100644
--- a/tests/baselines/reference/accessorWithInitializer.errors.txt
+++ b/tests/baselines/reference/accessorWithInitializer.errors.txt
@@ -1,11 +1,10 @@
 ==== tests/cases/compiler/accessorWithInitializer.ts (2 errors) ====
-    // target: es5
     
     class C {
         set X(v = 0) { }
             ~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
+!!! A 'set' accessor parameter cannot have an initializer.
         static set X(v2 = 0) { }
                    ~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
+!!! A 'set' accessor parameter cannot have an initializer.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/accessorWithRestParam.errors.txt b/tests/baselines/reference/accessorWithRestParam.errors.txt
index 8f5877fef1e..10f4633805f 100644
--- a/tests/baselines/reference/accessorWithRestParam.errors.txt
+++ b/tests/baselines/reference/accessorWithRestParam.errors.txt
@@ -1,9 +1,10 @@
 ==== tests/cases/compiler/accessorWithRestParam.ts (2 errors) ====
+    
     class C {
         set X(...v) { }
             ~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
+!!! A 'set' accessor cannot have rest parameter.
         static set X(...v2) { }
                    ~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
+!!! A 'set' accessor cannot have rest parameter.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/aliasInaccessibleModule.errors.txt b/tests/baselines/reference/aliasInaccessibleModule.errors.txt
new file mode 100644
index 00000000000..839ea965b02
--- /dev/null
+++ b/tests/baselines/reference/aliasInaccessibleModule.errors.txt
@@ -0,0 +1,8 @@
+==== tests/cases/compiler/aliasInaccessibleModule.ts (1 errors) ====
+    module M {
+        module N {
+        }
+        export import X = N;
+        ~~~~~~~~~~~~~~~~~~~~
+!!! Import declaration 'X' is using private name 'N'.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/aliasInaccessibleModule.types b/tests/baselines/reference/aliasInaccessibleModule.types
deleted file mode 100644
index 163affbafea..00000000000
--- a/tests/baselines/reference/aliasInaccessibleModule.types
+++ /dev/null
@@ -1,11 +0,0 @@
-=== tests/cases/compiler/aliasInaccessibleModule.ts ===
-module M {
->M : M
-
-    module N {
->N : N
-    }
-    export import X = N;
->X : X
->N : N
-}
diff --git a/tests/baselines/reference/aliasInaccessibleModule2.errors.txt b/tests/baselines/reference/aliasInaccessibleModule2.errors.txt
new file mode 100644
index 00000000000..149410acb10
--- /dev/null
+++ b/tests/baselines/reference/aliasInaccessibleModule2.errors.txt
@@ -0,0 +1,12 @@
+==== tests/cases/compiler/aliasInaccessibleModule2.ts (1 errors) ====
+    module M {
+        module N {
+            class C {
+            }
+            
+        }
+        import R = N;
+        ~~~~~~~~~~~~~
+!!! Import declaration 'R' is using private name 'N'.
+        export import X = R;
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/aliasInaccessibleModule2.types b/tests/baselines/reference/aliasInaccessibleModule2.types
deleted file mode 100644
index e611026018d..00000000000
--- a/tests/baselines/reference/aliasInaccessibleModule2.types
+++ /dev/null
@@ -1,20 +0,0 @@
-=== tests/cases/compiler/aliasInaccessibleModule2.ts ===
-module M {
->M : M
-
-    module N {
->N : N
-
-        class C {
->C : C
-        }
-        
-    }
-    import R = N;
->R : R
->N : typeof N
-
-    export import X = R;
->X : X
->R : typeof N
-}
diff --git a/tests/baselines/reference/aliasUsageInAccessorsOfClass.errors.txt b/tests/baselines/reference/aliasUsageInAccessorsOfClass.errors.txt
deleted file mode 100644
index 2fdccc7f49a..00000000000
--- a/tests/baselines/reference/aliasUsageInAccessorsOfClass.errors.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-==== tests/cases/compiler/aliasUsage1_main.ts (2 errors) ====
-    import Backbone = require("aliasUsage1_backbone");
-    import moduleA = require("aliasUsage1_moduleA");
-    interface IHasVisualizationModel {
-        VisualizationModel: typeof Backbone.Model;
-    }
-    class C2 {
-        x: IHasVisualizationModel;
-        get A() {
-            ~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
-            return this.x;
-        }
-        set A(x) {
-            ~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
-            x = moduleA;
-        }
-    }
-==== tests/cases/compiler/aliasUsage1_backbone.ts (0 errors) ====
-    export class Model {
-        public someData: string;
-    }
-    
-==== tests/cases/compiler/aliasUsage1_moduleA.ts (0 errors) ====
-    import Backbone = require("aliasUsage1_backbone");
-    export class VisualizationModel extends Backbone.Model {
-        // interesting stuff here
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/aliasUsageInAccessorsOfClass.js b/tests/baselines/reference/aliasUsageInAccessorsOfClass.js
new file mode 100644
index 00000000000..485aedc971d
--- /dev/null
+++ b/tests/baselines/reference/aliasUsageInAccessorsOfClass.js
@@ -0,0 +1,69 @@
+//// [tests/cases/compiler/aliasUsageInAccessorsOfClass.ts] ////
+
+//// [aliasUsage1_backbone.ts]
+export class Model {
+    public someData: string;
+}
+
+//// [aliasUsage1_moduleA.ts]
+import Backbone = require("aliasUsage1_backbone");
+export class VisualizationModel extends Backbone.Model {
+    // interesting stuff here
+}
+
+//// [aliasUsage1_main.ts]
+import Backbone = require("aliasUsage1_backbone");
+import moduleA = require("aliasUsage1_moduleA");
+interface IHasVisualizationModel {
+    VisualizationModel: typeof Backbone.Model;
+}
+class C2 {
+    x: IHasVisualizationModel;
+    get A() {
+        return this.x;
+    }
+    set A(x) {
+        x = moduleA;
+    }
+}
+
+//// [aliasUsage1_backbone.js]
+var Model = (function () {
+    function Model() {
+    }
+    return Model;
+})();
+exports.Model = Model;
+//// [aliasUsage1_moduleA.js]
+var __extends = this.__extends || function (d, b) {
+    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
+    function __() { this.constructor = d; }
+    __.prototype = b.prototype;
+    d.prototype = new __();
+};
+var Backbone = require("aliasUsage1_backbone");
+var VisualizationModel = (function (_super) {
+    __extends(VisualizationModel, _super);
+    function VisualizationModel() {
+        _super.apply(this, arguments);
+    }
+    return VisualizationModel;
+})(Backbone.Model);
+exports.VisualizationModel = VisualizationModel;
+//// [aliasUsage1_main.js]
+var moduleA = require("aliasUsage1_moduleA");
+var C2 = (function () {
+    function C2() {
+    }
+    Object.defineProperty(C2.prototype, "A", {
+        get: function () {
+            return this.x;
+        },
+        set: function (x) {
+            x = moduleA;
+        },
+        enumerable: true,
+        configurable: true
+    });
+    return C2;
+})();
diff --git a/tests/baselines/reference/aliasUsageInAccessorsOfClass.types b/tests/baselines/reference/aliasUsageInAccessorsOfClass.types
new file mode 100644
index 00000000000..3ae78526600
--- /dev/null
+++ b/tests/baselines/reference/aliasUsageInAccessorsOfClass.types
@@ -0,0 +1,60 @@
+=== tests/cases/compiler/aliasUsage1_main.ts ===
+import Backbone = require("aliasUsage1_backbone");
+>Backbone : Backbone
+
+import moduleA = require("aliasUsage1_moduleA");
+>moduleA : moduleA
+
+interface IHasVisualizationModel {
+>IHasVisualizationModel : IHasVisualizationModel
+
+    VisualizationModel: typeof Backbone.Model;
+>VisualizationModel : typeof Backbone.Model
+>Backbone : typeof Backbone
+>Model : typeof Backbone.Model
+}
+class C2 {
+>C2 : C2
+
+    x: IHasVisualizationModel;
+>x : IHasVisualizationModel
+>IHasVisualizationModel : IHasVisualizationModel
+
+    get A() {
+>A : IHasVisualizationModel
+
+        return this.x;
+>this.x : IHasVisualizationModel
+>this : C2
+>x : IHasVisualizationModel
+    }
+    set A(x) {
+>A : IHasVisualizationModel
+>x : IHasVisualizationModel
+
+        x = moduleA;
+>x = moduleA : typeof moduleA
+>x : IHasVisualizationModel
+>moduleA : typeof moduleA
+    }
+}
+=== tests/cases/compiler/aliasUsage1_backbone.ts ===
+export class Model {
+>Model : Model
+
+    public someData: string;
+>someData : string
+}
+
+=== tests/cases/compiler/aliasUsage1_moduleA.ts ===
+import Backbone = require("aliasUsage1_backbone");
+>Backbone : Backbone
+
+export class VisualizationModel extends Backbone.Model {
+>VisualizationModel : VisualizationModel
+>Backbone : Backbone
+>Model : Backbone.Model
+
+    // interesting stuff here
+}
+
diff --git a/tests/baselines/reference/ambientExternalModuleWithRelativeModuleName.errors.txt b/tests/baselines/reference/ambientExternalModuleWithRelativeModuleName.errors.txt
index 084ff473afc..fba44282cc3 100644
--- a/tests/baselines/reference/ambientExternalModuleWithRelativeModuleName.errors.txt
+++ b/tests/baselines/reference/ambientExternalModuleWithRelativeModuleName.errors.txt
@@ -1,6 +1,12 @@
-==== tests/cases/compiler/ambientExternalModuleWithRelativeModuleName.ts (1 errors) ====
+==== tests/cases/compiler/ambientExternalModuleWithRelativeModuleName.ts (2 errors) ====
     declare module "./relativeModule" {
                    ~~~~~~~~~~~~~~~~~~
+!!! Ambient external module declaration cannot specify relative module name.
+        var x: string;
+    }
+    
+    declare module ".\\relativeModule" {
+                   ~~~~~~~~~~~~~~~~~~~
 !!! Ambient external module declaration cannot specify relative module name.
         var x: string;
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/ambientExternalModuleWithRelativeModuleName.js b/tests/baselines/reference/ambientExternalModuleWithRelativeModuleName.js
index 6eb77f96970..9a4622a1b7e 100644
--- a/tests/baselines/reference/ambientExternalModuleWithRelativeModuleName.js
+++ b/tests/baselines/reference/ambientExternalModuleWithRelativeModuleName.js
@@ -1,6 +1,10 @@
 //// [ambientExternalModuleWithRelativeModuleName.ts]
 declare module "./relativeModule" {
     var x: string;
+}
+
+declare module ".\\relativeModule" {
+    var x: string;
 }
 
 //// [ambientExternalModuleWithRelativeModuleName.js]
diff --git a/tests/baselines/reference/ambientGetters.errors.txt b/tests/baselines/reference/ambientGetters.errors.txt
index 0ed6bda5848..a01c146d977 100644
--- a/tests/baselines/reference/ambientGetters.errors.txt
+++ b/tests/baselines/reference/ambientGetters.errors.txt
@@ -1,12 +1,13 @@
 ==== tests/cases/compiler/ambientGetters.ts (2 errors) ====
+    
     declare class A {
         get length() : number;
             ~~~~~~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
+!!! An accessor cannot be declared in an ambient context.
     }
     
     declare class B {
         get length() { return 0; }
             ~~~~~~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
+!!! An accessor cannot be declared in an ambient context.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/amdDependencyComment2.errors.txt b/tests/baselines/reference/amdDependencyComment2.errors.txt
new file mode 100644
index 00000000000..edab2e9c955
--- /dev/null
+++ b/tests/baselines/reference/amdDependencyComment2.errors.txt
@@ -0,0 +1,7 @@
+==== tests/cases/compiler/amdDependencyComment2.ts (1 errors) ====
+    ///<amd-dependency path='bar'/>
+    
+    import m1 = require("m2")
+                        ~~~~
+!!! Cannot find external module 'm2'.
+    m1.f();
\ No newline at end of file
diff --git a/tests/baselines/reference/amdDependencyComment2.js b/tests/baselines/reference/amdDependencyComment2.js
new file mode 100644
index 00000000000..137e183017a
--- /dev/null
+++ b/tests/baselines/reference/amdDependencyComment2.js
@@ -0,0 +1,11 @@
+//// [amdDependencyComment2.ts]
+///<amd-dependency path='bar'/>
+
+import m1 = require("m2")
+m1.f();
+
+//// [amdDependencyComment2.js]
+///<amd-dependency path='bar'/>
+define(["require", "exports", "m2", "bar"], function (require, exports, m1) {
+    m1.f();
+});
diff --git a/tests/baselines/reference/arrowFunctionMissingCurlyWithSemicolon.errors.txt b/tests/baselines/reference/arrowFunctionMissingCurlyWithSemicolon.errors.txt
new file mode 100644
index 00000000000..a0cf2c00518
--- /dev/null
+++ b/tests/baselines/reference/arrowFunctionMissingCurlyWithSemicolon.errors.txt
@@ -0,0 +1,7 @@
+==== tests/cases/compiler/arrowFunctionMissingCurlyWithSemicolon.ts (1 errors) ====
+    // Should error at semicolon.
+    var f = () => ;
+                  ~
+!!! Expression expected.
+    var b = 1 * 2 * 3 * 4;
+    var square = (x: number) => x * x;
\ No newline at end of file
diff --git a/tests/baselines/reference/arrowFunctionsMissingTokens.errors.txt b/tests/baselines/reference/arrowFunctionsMissingTokens.errors.txt
new file mode 100644
index 00000000000..69b94cd7d46
--- /dev/null
+++ b/tests/baselines/reference/arrowFunctionsMissingTokens.errors.txt
@@ -0,0 +1,115 @@
+==== tests/cases/compiler/arrowFunctionsMissingTokens.ts (24 errors) ====
+    
+    module missingArrowsWithCurly {
+        var a = () { };
+                   ~
+!!! '=>' expected.
+    
+        var b = (): void { }
+                         ~
+!!! '=>' expected.
+    
+        var c = (x) { };
+                    ~
+!!! '=>' expected.
+    
+        var d = (x: number, y: string) { };
+                                       ~
+!!! '=>' expected.
+    
+        var e = (x: number, y: string): void { };
+                                             ~
+!!! '=>' expected.
+    }
+    
+    module missingCurliesWithArrow {
+        module withStatement {
+            var a = () => var k = 10;};
+                          ~~~
+!!! '{' expected.
+    
+            var b = (): void => var k = 10;}
+                                ~~~
+!!! '{' expected.
+    
+            var c = (x) => var k = 10;};
+                           ~~~
+!!! '{' expected.
+    
+            var d = (x: number, y: string) => var k = 10;};
+                                              ~~~
+!!! '{' expected.
+    
+            var e = (x: number, y: string): void => var k = 10;};
+                                                    ~~~
+!!! '{' expected.
+    
+            var f = () => var k = 10;}
+                          ~~~
+!!! '{' expected.
+        }
+    
+        module withoutStatement {
+            var a = () => };
+                          ~
+!!! Expression expected.
+    
+            var b = (): void => }
+                                ~
+!!! Expression expected.
+    
+            var c = (x) => };
+                           ~
+!!! Expression expected.
+    
+            var d = (x: number, y: string) => };
+                                              ~
+!!! Expression expected.
+    
+            var e = (x: number, y: string): void => };
+                                                    ~
+!!! Expression expected.
+    
+            var f = () => }
+                          ~
+!!! Expression expected.
+        }
+        ~
+!!! Declaration or statement expected.
+    }
+    ~
+!!! Declaration or statement expected.
+    
+    module ce_nEst_pas_une_arrow_function {
+        var a = ();
+                 ~
+!!! Expression expected.
+    
+        var b = (): void;
+                        ~
+!!! '=>' expected.
+    
+        var c = (x);
+                 ~
+!!! Cannot find name 'x'.
+    
+        var d = (x: number, y: string);
+                                      ~
+!!! '=>' expected.
+    
+        var e = (x: number, y: string): void;
+                                            ~
+!!! '=>' expected.
+    }
+    
+    module okay {
+        var a = () => { };
+    
+        var b = (): void => { }
+    
+        var c = (x) => { };
+    
+        var d = (x: number, y: string) => { };
+    
+        var e = (x: number, y: string): void => { };
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/asiAmbientFunctionDeclaration.js b/tests/baselines/reference/asiAmbientFunctionDeclaration.js
new file mode 100644
index 00000000000..30b7e76056a
--- /dev/null
+++ b/tests/baselines/reference/asiAmbientFunctionDeclaration.js
@@ -0,0 +1,4 @@
+//// [asiAmbientFunctionDeclaration.ts]
+declare function foo()
+
+//// [asiAmbientFunctionDeclaration.js]
diff --git a/tests/baselines/reference/asiAmbientFunctionDeclaration.types b/tests/baselines/reference/asiAmbientFunctionDeclaration.types
new file mode 100644
index 00000000000..63d2c18f44a
--- /dev/null
+++ b/tests/baselines/reference/asiAmbientFunctionDeclaration.types
@@ -0,0 +1,4 @@
+=== tests/cases/compiler/asiAmbientFunctionDeclaration.ts ===
+declare function foo()
+>foo : typeof foo
+
diff --git a/tests/baselines/reference/asiBreak.js b/tests/baselines/reference/asiBreak.js
new file mode 100644
index 00000000000..cd890f74de7
--- /dev/null
+++ b/tests/baselines/reference/asiBreak.js
@@ -0,0 +1,6 @@
+//// [asiBreak.ts]
+while (true) break
+
+//// [asiBreak.js]
+while (true)
+    break;
diff --git a/tests/baselines/reference/asiBreak.types b/tests/baselines/reference/asiBreak.types
new file mode 100644
index 00000000000..355d27f2a43
--- /dev/null
+++ b/tests/baselines/reference/asiBreak.types
@@ -0,0 +1,3 @@
+=== tests/cases/compiler/asiBreak.ts ===
+while (true) break
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/asiContinue.js b/tests/baselines/reference/asiContinue.js
new file mode 100644
index 00000000000..b2b9bc751cc
--- /dev/null
+++ b/tests/baselines/reference/asiContinue.js
@@ -0,0 +1,6 @@
+//// [asiContinue.ts]
+while (true) continue
+
+//// [asiContinue.js]
+while (true)
+    continue;
diff --git a/tests/baselines/reference/asiContinue.types b/tests/baselines/reference/asiContinue.types
new file mode 100644
index 00000000000..5b3f0145377
--- /dev/null
+++ b/tests/baselines/reference/asiContinue.types
@@ -0,0 +1,3 @@
+=== tests/cases/compiler/asiContinue.ts ===
+while (true) continue
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/asiReturn.errors.txt b/tests/baselines/reference/asiReturn.errors.txt
new file mode 100644
index 00000000000..7b7b44655c2
--- /dev/null
+++ b/tests/baselines/reference/asiReturn.errors.txt
@@ -0,0 +1,5 @@
+==== tests/cases/compiler/asiReturn.ts (1 errors) ====
+    // This should be an error for using a return outside a function, but ASI should work properly
+    return
+    ~~~~~~
+!!! A 'return' statement can only be used within a function body.
\ No newline at end of file
diff --git a/tests/baselines/reference/assignmentCompatability24.errors.txt b/tests/baselines/reference/assignmentCompatability24.errors.txt
index a696d593e5a..70a6717b9b7 100644
--- a/tests/baselines/reference/assignmentCompatability24.errors.txt
+++ b/tests/baselines/reference/assignmentCompatability24.errors.txt
@@ -1,14 +1,12 @@
-==== tests/cases/compiler/assignmentCompatability24.ts (2 errors) ====
+==== tests/cases/compiler/assignmentCompatability24.ts (1 errors) ====
     module __test1__ {
         export interface interfaceWithPublicAndOptional<T,U> { one: T; two?: U; };  var obj4: interfaceWithPublicAndOptional<number,string> = { one: 1 };;
         export var __val__obj4 = obj4;
     }
     module __test2__ {
-        export var obj = function f<string>(a: string) { return a; };;
-                                    ~~~~~~
-!!! Type parameter name cannot be 'string'
+        export var obj = function f<Tstring>(a: Tstring) { return a; };;
         export var __val__obj = obj;
     }
     __test2__.__val__obj = __test1__.__val__obj4
     ~~~~~~~~~~~~~~~~~~~~
-!!! Type 'interfaceWithPublicAndOptional<number, string>' is not assignable to type '<string>(a: string) => string'.
\ No newline at end of file
+!!! Type 'interfaceWithPublicAndOptional<number, string>' is not assignable to type '<Tstring>(a: Tstring) => Tstring'.
\ No newline at end of file
diff --git a/tests/baselines/reference/assignmentCompatability24.js b/tests/baselines/reference/assignmentCompatability24.js
index 3be069c17fe..7eda1e61266 100644
--- a/tests/baselines/reference/assignmentCompatability24.js
+++ b/tests/baselines/reference/assignmentCompatability24.js
@@ -4,7 +4,7 @@ module __test1__ {
     export var __val__obj4 = obj4;
 }
 module __test2__ {
-    export var obj = function f<string>(a: string) { return a; };;
+    export var obj = function f<Tstring>(a: Tstring) { return a; };;
     export var __val__obj = obj;
 }
 __test2__.__val__obj = __test1__.__val__obj4
diff --git a/tests/baselines/reference/assignmentCompatability33.errors.txt b/tests/baselines/reference/assignmentCompatability33.errors.txt
index d9037bbdbfe..3f9f4716f81 100644
--- a/tests/baselines/reference/assignmentCompatability33.errors.txt
+++ b/tests/baselines/reference/assignmentCompatability33.errors.txt
@@ -1,14 +1,12 @@
-==== tests/cases/compiler/assignmentCompatability33.ts (2 errors) ====
+==== tests/cases/compiler/assignmentCompatability33.ts (1 errors) ====
     module __test1__ {
         export interface interfaceWithPublicAndOptional<T,U> { one: T; two?: U; };  var obj4: interfaceWithPublicAndOptional<number,string> = { one: 1 };;
         export var __val__obj4 = obj4;
     }
     module __test2__ {
-        export var obj: { <string>(a: string): string; };
-                           ~~~~~~
-!!! Type parameter name cannot be 'string'
+        export var obj: { <Tstring>(a: Tstring): Tstring; };
         export var __val__obj = obj;
     }
     __test2__.__val__obj = __test1__.__val__obj4
     ~~~~~~~~~~~~~~~~~~~~
-!!! Type 'interfaceWithPublicAndOptional<number, string>' is not assignable to type '<string>(a: string) => string'.
\ No newline at end of file
+!!! Type 'interfaceWithPublicAndOptional<number, string>' is not assignable to type '<Tstring>(a: Tstring) => Tstring'.
\ No newline at end of file
diff --git a/tests/baselines/reference/assignmentCompatability33.js b/tests/baselines/reference/assignmentCompatability33.js
index f14fc82d3fa..80dfcfc4f7a 100644
--- a/tests/baselines/reference/assignmentCompatability33.js
+++ b/tests/baselines/reference/assignmentCompatability33.js
@@ -4,7 +4,7 @@ module __test1__ {
     export var __val__obj4 = obj4;
 }
 module __test2__ {
-    export var obj: { <string>(a: string): string; };
+    export var obj: { <Tstring>(a: Tstring): Tstring; };
     export var __val__obj = obj;
 }
 __test2__.__val__obj = __test1__.__val__obj4
diff --git a/tests/baselines/reference/assignmentCompatability34.errors.txt b/tests/baselines/reference/assignmentCompatability34.errors.txt
index 26e92151da9..1ae98d98d37 100644
--- a/tests/baselines/reference/assignmentCompatability34.errors.txt
+++ b/tests/baselines/reference/assignmentCompatability34.errors.txt
@@ -1,14 +1,12 @@
-==== tests/cases/compiler/assignmentCompatability34.ts (2 errors) ====
+==== tests/cases/compiler/assignmentCompatability34.ts (1 errors) ====
     module __test1__ {
         export interface interfaceWithPublicAndOptional<T,U> { one: T; two?: U; };  var obj4: interfaceWithPublicAndOptional<number,string> = { one: 1 };;
         export var __val__obj4 = obj4;
     }
     module __test2__ {
-        export var obj: { <number>(a:number):number;};
-                           ~~~~~~
-!!! Type parameter name cannot be 'number'
+        export var obj: { <Tnumber>(a:Tnumber):Tnumber;};
         export var __val__obj = obj;
     }
     __test2__.__val__obj = __test1__.__val__obj4
     ~~~~~~~~~~~~~~~~~~~~
-!!! Type 'interfaceWithPublicAndOptional<number, string>' is not assignable to type '<number>(a: number) => number'.
\ No newline at end of file
+!!! Type 'interfaceWithPublicAndOptional<number, string>' is not assignable to type '<Tnumber>(a: Tnumber) => Tnumber'.
\ No newline at end of file
diff --git a/tests/baselines/reference/assignmentCompatability34.js b/tests/baselines/reference/assignmentCompatability34.js
index 454ec319c5c..ab324a10396 100644
--- a/tests/baselines/reference/assignmentCompatability34.js
+++ b/tests/baselines/reference/assignmentCompatability34.js
@@ -4,7 +4,7 @@ module __test1__ {
     export var __val__obj4 = obj4;
 }
 module __test2__ {
-    export var obj: { <number>(a:number):number;};
+    export var obj: { <Tnumber>(a:Tnumber):Tnumber;};
     export var __val__obj = obj;
 }
 __test2__.__val__obj = __test1__.__val__obj4
diff --git a/tests/baselines/reference/assignmentCompatability37.errors.txt b/tests/baselines/reference/assignmentCompatability37.errors.txt
index b08b483174a..f097e9664d3 100644
--- a/tests/baselines/reference/assignmentCompatability37.errors.txt
+++ b/tests/baselines/reference/assignmentCompatability37.errors.txt
@@ -1,14 +1,12 @@
-==== tests/cases/compiler/assignmentCompatability37.ts (2 errors) ====
+==== tests/cases/compiler/assignmentCompatability37.ts (1 errors) ====
     module __test1__ {
         export interface interfaceWithPublicAndOptional<T,U> { one: T; two?: U; };  var obj4: interfaceWithPublicAndOptional<number,string> = { one: 1 };;
         export var __val__obj4 = obj4;
     }
     module __test2__ {
-        export var aa:{ new <number>(param: number); };;
-                             ~~~~~~
-!!! Type parameter name cannot be 'number'
+        export var aa:{ new <Tnumber>(param: Tnumber); };;
         export var __val__aa = aa;
     }
     __test2__.__val__aa = __test1__.__val__obj4
     ~~~~~~~~~~~~~~~~~~~
-!!! Type 'interfaceWithPublicAndOptional<number, string>' is not assignable to type 'new <number>(param: number) => any'.
\ No newline at end of file
+!!! Type 'interfaceWithPublicAndOptional<number, string>' is not assignable to type 'new <Tnumber>(param: Tnumber) => any'.
\ No newline at end of file
diff --git a/tests/baselines/reference/assignmentCompatability37.js b/tests/baselines/reference/assignmentCompatability37.js
index bf37f2c902e..8625cae42e5 100644
--- a/tests/baselines/reference/assignmentCompatability37.js
+++ b/tests/baselines/reference/assignmentCompatability37.js
@@ -4,7 +4,7 @@ module __test1__ {
     export var __val__obj4 = obj4;
 }
 module __test2__ {
-    export var aa:{ new <number>(param: number); };;
+    export var aa:{ new <Tnumber>(param: Tnumber); };;
     export var __val__aa = aa;
 }
 __test2__.__val__aa = __test1__.__val__obj4
diff --git a/tests/baselines/reference/assignmentCompatability38.errors.txt b/tests/baselines/reference/assignmentCompatability38.errors.txt
index f915afa52a8..9efa19b0338 100644
--- a/tests/baselines/reference/assignmentCompatability38.errors.txt
+++ b/tests/baselines/reference/assignmentCompatability38.errors.txt
@@ -1,14 +1,12 @@
-==== tests/cases/compiler/assignmentCompatability38.ts (2 errors) ====
+==== tests/cases/compiler/assignmentCompatability38.ts (1 errors) ====
     module __test1__ {
         export interface interfaceWithPublicAndOptional<T,U> { one: T; two?: U; };  var obj4: interfaceWithPublicAndOptional<number,string> = { one: 1 };;
         export var __val__obj4 = obj4;
     }
     module __test2__ {
-        export var aa:{ new <string>(param: string); };;
-                             ~~~~~~
-!!! Type parameter name cannot be 'string'
+        export var aa:{ new <Tstring>(param: Tstring); };;
         export var __val__aa = aa;
     }
     __test2__.__val__aa = __test1__.__val__obj4
     ~~~~~~~~~~~~~~~~~~~
-!!! Type 'interfaceWithPublicAndOptional<number, string>' is not assignable to type 'new <string>(param: string) => any'.
\ No newline at end of file
+!!! Type 'interfaceWithPublicAndOptional<number, string>' is not assignable to type 'new <Tstring>(param: Tstring) => any'.
\ No newline at end of file
diff --git a/tests/baselines/reference/assignmentCompatability38.js b/tests/baselines/reference/assignmentCompatability38.js
index ba1c5c3c5d1..22096b68f25 100644
--- a/tests/baselines/reference/assignmentCompatability38.js
+++ b/tests/baselines/reference/assignmentCompatability38.js
@@ -4,7 +4,7 @@ module __test1__ {
     export var __val__obj4 = obj4;
 }
 module __test2__ {
-    export var aa:{ new <string>(param: string); };;
+    export var aa:{ new <Tstring>(param: Tstring); };;
     export var __val__aa = aa;
 }
 __test2__.__val__aa = __test1__.__val__obj4
diff --git a/tests/baselines/reference/augmentArray.js b/tests/baselines/reference/augmentArray.js
new file mode 100644
index 00000000000..948f1944048
--- /dev/null
+++ b/tests/baselines/reference/augmentArray.js
@@ -0,0 +1,6 @@
+//// [augmentArray.ts]
+interface Array<T> {
+    (): any[];
+}
+
+//// [augmentArray.js]
diff --git a/tests/baselines/reference/augmentArray.types b/tests/baselines/reference/augmentArray.types
new file mode 100644
index 00000000000..a5696ced583
--- /dev/null
+++ b/tests/baselines/reference/augmentArray.types
@@ -0,0 +1,7 @@
+=== tests/cases/compiler/augmentArray.ts ===
+interface Array<T> {
+>Array : Array<T>
+>T : T
+
+    (): any[];
+}
diff --git a/tests/baselines/reference/autoAsiForStaticsInClassDeclaration.js b/tests/baselines/reference/autoAsiForStaticsInClassDeclaration.js
new file mode 100644
index 00000000000..27b56e4ff88
--- /dev/null
+++ b/tests/baselines/reference/autoAsiForStaticsInClassDeclaration.js
@@ -0,0 +1,12 @@
+//// [autoAsiForStaticsInClassDeclaration.ts]
+class C {
+    static x
+    static y
+} 
+
+//// [autoAsiForStaticsInClassDeclaration.js]
+var C = (function () {
+    function C() {
+    }
+    return C;
+})();
diff --git a/tests/baselines/reference/autoAsiForStaticsInClassDeclaration.types b/tests/baselines/reference/autoAsiForStaticsInClassDeclaration.types
new file mode 100644
index 00000000000..d902f0b3eaa
--- /dev/null
+++ b/tests/baselines/reference/autoAsiForStaticsInClassDeclaration.types
@@ -0,0 +1,10 @@
+=== tests/cases/compiler/autoAsiForStaticsInClassDeclaration.ts ===
+class C {
+>C : C
+
+    static x
+>x : any
+
+    static y
+>y : any
+} 
diff --git a/tests/baselines/reference/badArraySyntax.errors.txt b/tests/baselines/reference/badArraySyntax.errors.txt
index a38f9918197..9c1edf93231 100644
--- a/tests/baselines/reference/badArraySyntax.errors.txt
+++ b/tests/baselines/reference/badArraySyntax.errors.txt
@@ -1,4 +1,4 @@
-==== tests/cases/compiler/badArraySyntax.ts (4 errors) ====
+==== tests/cases/compiler/badArraySyntax.ts (6 errors) ====
     class Z {
      public x = "";
     }
@@ -16,5 +16,9 @@
     var a5: Z[] = new Z[]();
                        ~~
 !!! 'new T[]' cannot be used to create an array. Use 'new Array<T>()' instead.
-    
+    var a6: Z[][] = new   Z     [      ]   [  ];
+                                ~~~~~~~~
+!!! 'new T[]' cannot be used to create an array. Use 'new Array<T>()' instead.
+                                           ~~~~
+!!! 'new T[]' cannot be used to create an array. Use 'new Array<T>()' instead.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/captureThisInSuperCall.js b/tests/baselines/reference/captureThisInSuperCall.js
new file mode 100644
index 00000000000..3f60fcd3cb1
--- /dev/null
+++ b/tests/baselines/reference/captureThisInSuperCall.js
@@ -0,0 +1,32 @@
+//// [captureThisInSuperCall.ts]
+class A {
+    constructor(p:any) {}
+}
+
+class B extends A {
+    constructor() { super({ test: () => this.someMethod()}); } 
+    someMethod() {}
+}
+
+//// [captureThisInSuperCall.js]
+var __extends = this.__extends || function (d, b) {
+    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
+    function __() { this.constructor = d; }
+    __.prototype = b.prototype;
+    d.prototype = new __();
+};
+var A = (function () {
+    function A(p) {
+    }
+    return A;
+})();
+var B = (function (_super) {
+    __extends(B, _super);
+    function B() {
+        var _this = this;
+        _super.call(this, { test: function () { return _this.someMethod(); } });
+    }
+    B.prototype.someMethod = function () {
+    };
+    return B;
+})(A);
diff --git a/tests/baselines/reference/captureThisInSuperCall.types b/tests/baselines/reference/captureThisInSuperCall.types
new file mode 100644
index 00000000000..dc11b56ada2
--- /dev/null
+++ b/tests/baselines/reference/captureThisInSuperCall.types
@@ -0,0 +1,25 @@
+=== tests/cases/compiler/captureThisInSuperCall.ts ===
+class A {
+>A : A
+
+    constructor(p:any) {}
+>p : any
+}
+
+class B extends A {
+>B : B
+>A : A
+
+    constructor() { super({ test: () => this.someMethod()}); } 
+>super({ test: () => this.someMethod()}) : void
+>{ test: () => this.someMethod()} : { test: () => void; }
+>test : () => void
+>() => this.someMethod() : () => void
+>this.someMethod() : void
+>this.someMethod : () => void
+>this : B
+>someMethod : () => void
+
+    someMethod() {}
+>someMethod : () => void
+}
diff --git a/tests/baselines/reference/castExpressionParentheses.errors.txt b/tests/baselines/reference/castExpressionParentheses.errors.txt
deleted file mode 100644
index acb0f057f9a..00000000000
--- a/tests/baselines/reference/castExpressionParentheses.errors.txt
+++ /dev/null
@@ -1,42 +0,0 @@
-==== tests/cases/compiler/castExpressionParentheses.ts (1 errors) ====
-    declare var a;
-    
-    // parentheses should be omitted
-    // literals
-    (<any>{a:0});  
-    (<any>[1,3,]); 
-    (<any>"string"); 
-    (<any>23.0); 
-    (<any>/regexp/g); 
-    (<any>false); 
-    (<any>true); 
-    (<any>null); 
-    // names and dotted names
-    (<any>this); 
-    (<any>this.x); 
-    (<any>(<any>a).x);
-    (<any><any>a);
-    (<any>a[0]);
-    (<any>a.b["0"]);
-    (<any>a()).x;
-    
-    declare var A;
-    
-    // should keep the parentheses in emit
-    (<any>new A).foo; 
-    (<any>typeof A).x; 
-    (<any>-A).x; 
-    new (<any>A());
-    (<any>()=> {})();
-      ~~~
-!!! Type parameter name cannot be 'any'
-    (<any>function foo() { })();
-    (<any><number><any>-A).x; 
-    
-    // nested cast, should keep one pair of parenthese
-    (<any><number>(<any>-A)).x; 
-    
-    // nested parenthesized expression, should keep one pair of parenthese
-    (<any>(A)) 
-    
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/castExpressionParentheses.js b/tests/baselines/reference/castExpressionParentheses.js
index f400d647a94..2f62d6e9447 100644
--- a/tests/baselines/reference/castExpressionParentheses.js
+++ b/tests/baselines/reference/castExpressionParentheses.js
@@ -27,7 +27,7 @@ declare var A;
 (<any>typeof A).x; 
 (<any>-A).x; 
 new (<any>A());
-(<any>()=> {})();
+(<Tany>()=> {})();
 (<any>function foo() { })();
 (<any><number><any>-A).x; 
 
diff --git a/tests/baselines/reference/castExpressionParentheses.types b/tests/baselines/reference/castExpressionParentheses.types
new file mode 100644
index 00000000000..7004aef9c95
--- /dev/null
+++ b/tests/baselines/reference/castExpressionParentheses.types
@@ -0,0 +1,169 @@
+=== tests/cases/compiler/castExpressionParentheses.ts ===
+declare var a;
+>a : any
+
+// parentheses should be omitted
+// literals
+(<any>{a:0});  
+>(<any>{a:0}) : any
+><any>{a:0} : any
+>{a:0} : { a: number; }
+>a : number
+
+(<any>[1,3,]); 
+>(<any>[1,3,]) : any
+><any>[1,3,] : any
+>[1,3,] : number[]
+
+(<any>"string"); 
+>(<any>"string") : any
+><any>"string" : any
+
+(<any>23.0); 
+>(<any>23.0) : any
+><any>23.0 : any
+
+(<any>/regexp/g); 
+>(<any>/regexp/g) : any
+><any>/regexp/g : any
+
+(<any>false); 
+>(<any>false) : any
+><any>false : any
+
+(<any>true); 
+>(<any>true) : any
+><any>true : any
+
+(<any>null); 
+>(<any>null) : any
+><any>null : any
+
+// names and dotted names
+(<any>this); 
+>(<any>this) : any
+><any>this : any
+>this : any
+
+(<any>this.x); 
+>(<any>this.x) : any
+><any>this.x : any
+>this.x : any
+>this : any
+>x : any
+
+(<any>(<any>a).x);
+>(<any>(<any>a).x) : any
+><any>(<any>a).x : any
+>(<any>a).x : any
+>(<any>a) : any
+><any>a : any
+>a : any
+>x : any
+
+(<any><any>a);
+>(<any><any>a) : any
+><any><any>a : any
+><any>a : any
+>a : any
+
+(<any>a[0]);
+>(<any>a[0]) : any
+><any>a[0] : any
+>a[0] : any
+>a : any
+
+(<any>a.b["0"]);
+>(<any>a.b["0"]) : any
+><any>a.b["0"] : any
+>a.b["0"] : any
+>a.b : any
+>a : any
+>b : any
+
+(<any>a()).x;
+>(<any>a()).x : any
+>(<any>a()) : any
+><any>a() : any
+>a() : any
+>a : any
+>x : any
+
+declare var A;
+>A : any
+
+// should keep the parentheses in emit
+(<any>new A).foo; 
+>(<any>new A).foo : any
+>(<any>new A) : any
+><any>new A : any
+>new A : any
+>A : any
+>foo : any
+
+(<any>typeof A).x; 
+>(<any>typeof A).x : any
+>(<any>typeof A) : any
+><any>typeof A : any
+>typeof A : string
+>A : any
+>x : any
+
+(<any>-A).x; 
+>(<any>-A).x : any
+>(<any>-A) : any
+><any>-A : any
+>-A : number
+>A : any
+>x : any
+
+new (<any>A());
+>new (<any>A()) : any
+>(<any>A()) : any
+><any>A() : any
+>A() : any
+>A : any
+
+(<Tany>()=> {})();
+>(<Tany>()=> {})() : void
+>(<Tany>()=> {}) : <Tany>() => void
+><Tany>()=> {} : <Tany>() => void
+>Tany : Tany
+
+(<any>function foo() { })();
+>(<any>function foo() { })() : any
+>(<any>function foo() { }) : any
+><any>function foo() { } : any
+>function foo() { } : () => void
+>foo : () => void
+
+(<any><number><any>-A).x; 
+>(<any><number><any>-A).x : any
+>(<any><number><any>-A) : any
+><any><number><any>-A : any
+><number><any>-A : number
+><any>-A : any
+>-A : number
+>A : any
+>x : any
+
+// nested cast, should keep one pair of parenthese
+(<any><number>(<any>-A)).x; 
+>(<any><number>(<any>-A)).x : any
+>(<any><number>(<any>-A)) : any
+><any><number>(<any>-A) : any
+><number>(<any>-A) : number
+>(<any>-A) : any
+><any>-A : any
+>-A : number
+>A : any
+>x : any
+
+// nested parenthesized expression, should keep one pair of parenthese
+(<any>(A)) 
+>(<any>(A)) : any
+><any>(A) : any
+>(A) : any
+>A : any
+
+
diff --git a/tests/baselines/reference/chainedImportAlias.js b/tests/baselines/reference/chainedImportAlias.js
index cbc1e82b45a..6149105bce0 100644
--- a/tests/baselines/reference/chainedImportAlias.js
+++ b/tests/baselines/reference/chainedImportAlias.js
@@ -6,15 +6,19 @@ export module m {
 }
 
 //// [chainedImportAlias_file1.ts]
-import x = require('chainedImportAlias_file1');
+import x = require('chainedImportAlias_file0');
 import y = x;
-declare var console: {
-    log(message?: any);
-};
-console.log(y);
+y.m.foo();
 
 
+//// [chainedImportAlias_file0.js]
+(function (m) {
+    function foo() {
+    }
+    m.foo = foo;
+})(exports.m || (exports.m = {}));
+var m = exports.m;
 //// [chainedImportAlias_file1.js]
-var x = require('chainedImportAlias_file1');
+var x = require('chainedImportAlias_file0');
 var y = x;
-console.log(y);
+y.m.foo();
diff --git a/tests/baselines/reference/chainedImportAlias.types b/tests/baselines/reference/chainedImportAlias.types
index efea47726d7..4aa066de823 100644
--- a/tests/baselines/reference/chainedImportAlias.types
+++ b/tests/baselines/reference/chainedImportAlias.types
@@ -1,23 +1,24 @@
 === tests/cases/compiler/chainedImportAlias_file1.ts ===
-import x = require('chainedImportAlias_file1');
+import x = require('chainedImportAlias_file0');
 >x : x
 
 import y = x;
 >y : y
 >x : typeof x
 
-declare var console: {
->console : { log(message?: any): any; }
-
-    log(message?: any);
->log : (message?: any) => any
->message : any
-
-};
-console.log(y);
->console.log(y) : any
->console.log : (message?: any) => any
->console : { log(message?: any): any; }
->log : (message?: any) => any
+y.m.foo();
+>y.m.foo() : void
+>y.m.foo : typeof x.m.foo
+>y.m : typeof x.m
 >y : typeof x
+>m : typeof x.m
+>foo : typeof x.m.foo
+
+=== tests/cases/compiler/chainedImportAlias_file0.ts ===
+export module m {
+>m : m
+
+    export function foo() { }
+>foo : typeof foo
+}
 
diff --git a/tests/baselines/reference/classExtendingPrimitive2.errors.txt b/tests/baselines/reference/classExtendingPrimitive2.errors.txt
new file mode 100644
index 00000000000..9d1f62d5350
--- /dev/null
+++ b/tests/baselines/reference/classExtendingPrimitive2.errors.txt
@@ -0,0 +1,11 @@
+==== tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendingPrimitive2.ts (3 errors) ====
+    // classes cannot extend primitives
+    
+    class C4a extends void {}
+                      ~~~~
+!!! Identifier expected.
+    class C5a extends null { }
+                      ~~~~
+!!! Identifier expected.
+                           ~
+!!! ';' expected.
\ No newline at end of file
diff --git a/tests/baselines/reference/classExtendsEveryObjectType2.errors.txt b/tests/baselines/reference/classExtendsEveryObjectType2.errors.txt
new file mode 100644
index 00000000000..7a5573ae000
--- /dev/null
+++ b/tests/baselines/reference/classExtendsEveryObjectType2.errors.txt
@@ -0,0 +1,10 @@
+==== tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendsEveryObjectType2.ts (3 errors) ====
+    class C2 extends { foo: string; } { } // error
+                     ~
+!!! Identifier expected.
+    
+    class C6 extends []{ } // error
+                     ~
+!!! Identifier expected.
+                       ~
+!!! ';' expected.
\ No newline at end of file
diff --git a/tests/baselines/reference/classImplementsImportedInterface.js b/tests/baselines/reference/classImplementsImportedInterface.js
new file mode 100644
index 00000000000..c76a026b58a
--- /dev/null
+++ b/tests/baselines/reference/classImplementsImportedInterface.js
@@ -0,0 +1,25 @@
+//// [classImplementsImportedInterface.ts]
+module M1 {
+    export interface I {
+        foo();
+    }
+}
+
+module M2 {
+    import T = M1.I;
+    class C implements T {
+        foo() {}
+    }
+}
+
+//// [classImplementsImportedInterface.js]
+var M2;
+(function (M2) {
+    var C = (function () {
+        function C() {
+        }
+        C.prototype.foo = function () {
+        };
+        return C;
+    })();
+})(M2 || (M2 = {}));
diff --git a/tests/baselines/reference/classImplementsImportedInterface.types b/tests/baselines/reference/classImplementsImportedInterface.types
new file mode 100644
index 00000000000..afaf6c33374
--- /dev/null
+++ b/tests/baselines/reference/classImplementsImportedInterface.types
@@ -0,0 +1,28 @@
+=== tests/cases/compiler/classImplementsImportedInterface.ts ===
+module M1 {
+>M1 : M1
+
+    export interface I {
+>I : I
+
+        foo();
+>foo : () => any
+    }
+}
+
+module M2 {
+>M2 : M2
+
+    import T = M1.I;
+>T : T
+>M1 : M1
+>I : T
+
+    class C implements T {
+>C : C
+>T : T
+
+        foo() {}
+>foo : () => void
+    }
+}
diff --git a/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface.errors.txt b/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface.errors.txt
deleted file mode 100644
index 618caae14e0..00000000000
--- a/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface.errors.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-==== tests/cases/conformance/types/namedTypes/classWithOnlyPublicMembersEquivalentToInterface.ts (2 errors) ====
-    // no errors expected
-    
-    class C {
-        public x: string;
-        public y(a: number): number { return null; }
-        public get z() { return 1; }
-                   ~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
-        public set z(v) { }
-                   ~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
-        [x: string]: Object;
-        [x: number]: Object;
-        0: number;
-    }
-    
-    interface I {
-        x: string;
-        y(b: number): number;
-        z: number;
-        [x: string]: Object;
-        [x: number]: Object;
-        0: number;
-    }
-    
-    var c: C;
-    var i: I;
-    c = i;
-    i = c;
\ No newline at end of file
diff --git a/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface.js b/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface.js
new file mode 100644
index 00000000000..acb802d0f97
--- /dev/null
+++ b/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface.js
@@ -0,0 +1,50 @@
+//// [classWithOnlyPublicMembersEquivalentToInterface.ts]
+// no errors expected
+
+class C {
+    public x: string;
+    public y(a: number): number { return null; }
+    public get z() { return 1; }
+    public set z(v) { }
+    [x: string]: Object;
+    [x: number]: Object;
+    0: number;
+}
+
+interface I {
+    x: string;
+    y(b: number): number;
+    z: number;
+    [x: string]: Object;
+    [x: number]: Object;
+    0: number;
+}
+
+var c: C;
+var i: I;
+c = i;
+i = c;
+
+//// [classWithOnlyPublicMembersEquivalentToInterface.js]
+// no errors expected
+var C = (function () {
+    function C() {
+    }
+    C.prototype.y = function (a) {
+        return null;
+    };
+    Object.defineProperty(C.prototype, "z", {
+        get: function () {
+            return 1;
+        },
+        set: function (v) {
+        },
+        enumerable: true,
+        configurable: true
+    });
+    return C;
+})();
+var c;
+var i;
+c = i;
+i = c;
diff --git a/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface.types b/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface.types
new file mode 100644
index 00000000000..9f6d031bf20
--- /dev/null
+++ b/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface.types
@@ -0,0 +1,73 @@
+=== tests/cases/conformance/types/namedTypes/classWithOnlyPublicMembersEquivalentToInterface.ts ===
+// no errors expected
+
+class C {
+>C : C
+
+    public x: string;
+>x : string
+
+    public y(a: number): number { return null; }
+>y : (a: number) => number
+>a : number
+
+    public get z() { return 1; }
+>z : number
+
+    public set z(v) { }
+>z : number
+>v : number
+
+    [x: string]: Object;
+>x : string
+>Object : Object
+
+    [x: number]: Object;
+>x : number
+>Object : Object
+
+    0: number;
+}
+
+interface I {
+>I : I
+
+    x: string;
+>x : string
+
+    y(b: number): number;
+>y : (b: number) => number
+>b : number
+
+    z: number;
+>z : number
+
+    [x: string]: Object;
+>x : string
+>Object : Object
+
+    [x: number]: Object;
+>x : number
+>Object : Object
+
+    0: number;
+}
+
+var c: C;
+>c : C
+>C : C
+
+var i: I;
+>i : I
+>I : I
+
+c = i;
+>c = i : I
+>c : C
+>i : I
+
+i = c;
+>i = c : C
+>i : I
+>c : C
+
diff --git a/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface2.errors.txt b/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface2.errors.txt
deleted file mode 100644
index b26f3cd6146..00000000000
--- a/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface2.errors.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-==== tests/cases/conformance/types/namedTypes/classWithOnlyPublicMembersEquivalentToInterface2.ts (2 errors) ====
-    // no errors expected
-    
-    class C {
-        public x: string;
-        public y(a: number): number { return null; }
-        public get z() { return 1; }
-                   ~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
-        public set z(v) { }
-                   ~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
-        [x: string]: Object;
-        [x: number]: Object;
-        0: number;
-    
-        public static foo: string; // doesn't effect equivalence
-    }
-    
-    interface I {
-        x: string;
-        y(b: number): number;
-        z: number;
-        [x: string]: Object;
-        [x: number]: Object;
-        0: number;
-    }
-    
-    var c: C;
-    var i: I;
-    c = i;
-    i = c;
\ No newline at end of file
diff --git a/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface2.js b/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface2.js
new file mode 100644
index 00000000000..1048c2e5124
--- /dev/null
+++ b/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface2.js
@@ -0,0 +1,52 @@
+//// [classWithOnlyPublicMembersEquivalentToInterface2.ts]
+// no errors expected
+
+class C {
+    public x: string;
+    public y(a: number): number { return null; }
+    public get z() { return 1; }
+    public set z(v) { }
+    [x: string]: Object;
+    [x: number]: Object;
+    0: number;
+
+    public static foo: string; // doesn't effect equivalence
+}
+
+interface I {
+    x: string;
+    y(b: number): number;
+    z: number;
+    [x: string]: Object;
+    [x: number]: Object;
+    0: number;
+}
+
+var c: C;
+var i: I;
+c = i;
+i = c;
+
+//// [classWithOnlyPublicMembersEquivalentToInterface2.js]
+// no errors expected
+var C = (function () {
+    function C() {
+    }
+    C.prototype.y = function (a) {
+        return null;
+    };
+    Object.defineProperty(C.prototype, "z", {
+        get: function () {
+            return 1;
+        },
+        set: function (v) {
+        },
+        enumerable: true,
+        configurable: true
+    });
+    return C;
+})();
+var c;
+var i;
+c = i;
+i = c;
diff --git a/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface2.types b/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface2.types
new file mode 100644
index 00000000000..be504f895fd
--- /dev/null
+++ b/tests/baselines/reference/classWithOnlyPublicMembersEquivalentToInterface2.types
@@ -0,0 +1,76 @@
+=== tests/cases/conformance/types/namedTypes/classWithOnlyPublicMembersEquivalentToInterface2.ts ===
+// no errors expected
+
+class C {
+>C : C
+
+    public x: string;
+>x : string
+
+    public y(a: number): number { return null; }
+>y : (a: number) => number
+>a : number
+
+    public get z() { return 1; }
+>z : number
+
+    public set z(v) { }
+>z : number
+>v : number
+
+    [x: string]: Object;
+>x : string
+>Object : Object
+
+    [x: number]: Object;
+>x : number
+>Object : Object
+
+    0: number;
+
+    public static foo: string; // doesn't effect equivalence
+>foo : string
+}
+
+interface I {
+>I : I
+
+    x: string;
+>x : string
+
+    y(b: number): number;
+>y : (b: number) => number
+>b : number
+
+    z: number;
+>z : number
+
+    [x: string]: Object;
+>x : string
+>Object : Object
+
+    [x: number]: Object;
+>x : number
+>Object : Object
+
+    0: number;
+}
+
+var c: C;
+>c : C
+>C : C
+
+var i: I;
+>i : I
+>I : I
+
+c = i;
+>c = i : I
+>c : C
+>i : I
+
+i = c;
+>i = c : C
+>i : I
+>c : C
+
diff --git a/tests/baselines/reference/commentsClass.js b/tests/baselines/reference/commentsClass.js
index 1b177293fda..b42235e9afe 100644
--- a/tests/baselines/reference/commentsClass.js
+++ b/tests/baselines/reference/commentsClass.js
@@ -2,21 +2,21 @@
 
 /** This is class c2 without constuctor*/
 class c2 {
-}
+} // trailing comment1
 var i2 = new c2();
 var i2_c = c2;
 class c3 {
     /** Constructor comment*/
     constructor() {
-    }
-}
+    } // trailing comment of constructor
+} /* trailing comment 2 */
 var i3 = new c3();
 var i3_c = c3;
 /** Class comment*/
 class c4 {
     /** Constructor comment*/
     constructor() {
-    }
+    } /* trailing comment of constructor 2*/
 }
 var i4 = new c4();
 var i4_c = c4;
@@ -63,6 +63,14 @@ class c8 {
 }
 var i8 = new c8();
 var i8_c = c8;
+
+class c9 {
+    constructor() {
+        /// This is some detached comment
+
+        // should emit this leading comment of } too
+    }
+}
 
 
 //// [commentsClass.js]
@@ -71,22 +79,22 @@ var c2 = (function () {
     function c2() {
     }
     return c2;
-})();
+})(); // trailing comment1
 var i2 = new c2();
 var i2_c = c2;
 var c3 = (function () {
     /** Constructor comment*/
     function c3() {
-    }
+    } // trailing comment of constructor
     return c3;
-})();
+})(); /* trailing comment 2 */
 var i3 = new c3();
 var i3_c = c3;
 /** Class comment*/
 var c4 = (function () {
     /** Constructor comment*/
     function c4() {
-    }
+    } /* trailing comment of constructor 2*/
     return c4;
 })();
 var i4 = new c4();
@@ -130,6 +138,13 @@ var c8 = (function () {
 })();
 var i8 = new c8();
 var i8_c = c8;
+var c9 = (function () {
+    function c9() {
+        /// This is some detached comment
+        // should emit this leading comment of } too
+    }
+    return c9;
+})();
 
 
 //// [commentsClass.d.ts]
@@ -180,3 +195,6 @@ declare class c8 {
 }
 declare var i8: c8;
 declare var i8_c: typeof c8;
+declare class c9 {
+    constructor();
+}
diff --git a/tests/baselines/reference/commentsClass.types b/tests/baselines/reference/commentsClass.types
index ec3d610f47e..a4aca2ba15b 100644
--- a/tests/baselines/reference/commentsClass.types
+++ b/tests/baselines/reference/commentsClass.types
@@ -3,7 +3,8 @@
 /** This is class c2 without constuctor*/
 class c2 {
 >c2 : c2
-}
+
+} // trailing comment1
 var i2 = new c2();
 >i2 : c2
 >new c2() : c2
@@ -18,8 +19,8 @@ class c3 {
 
     /** Constructor comment*/
     constructor() {
-    }
-}
+    } // trailing comment of constructor
+} /* trailing comment 2 */
 var i3 = new c3();
 >i3 : c3
 >new c3() : c3
@@ -35,7 +36,7 @@ class c4 {
 
     /** Constructor comment*/
     constructor() {
-    }
+    } /* trailing comment of constructor 2*/
 }
 var i4 = new c4();
 >i4 : c4
@@ -129,3 +130,13 @@ var i8_c = c8;
 >i8_c : typeof c8
 >c8 : typeof c8
 
+class c9 {
+>c9 : c9
+
+    constructor() {
+        /// This is some detached comment
+
+        // should emit this leading comment of } too
+    }
+}
+
diff --git a/tests/baselines/reference/commentsClassMembers.js b/tests/baselines/reference/commentsClassMembers.js
index e1199b73113..67fdd047518 100644
--- a/tests/baselines/reference/commentsClassMembers.js
+++ b/tests/baselines/reference/commentsClassMembers.js
@@ -7,21 +7,21 @@ class c1 {
     /** sum with property*/
     public p2(/** number to add*/b: number) {
         return this.p1 + b;
-    }
+    } /* trailing comment of method*/
     /** getter property*/
     public get p3() {
         return this.p2(this.p1);
-    }
+    }// trailing comment Getter
     /** setter property*/
     public set p3(/** this is value*/value: number) {
         this.p1 = this.p2(value);
-    }
+    }// trailing comment Setter
     /** pp1 is property of c1*/
     private pp1: number;
     /** sum with property*/
     private pp2(/** number to add*/b: number) {
         return this.p1 + b;
-    }
+    } // trailing comment of method
     /** getter property*/
     private get pp3() {
         return this.pp2(this.pp1);
@@ -42,11 +42,11 @@ class c1 {
     /** static getter property*/
     static get s3() {
         return c1.s2(c1.s1);
-    }
+    } /*trailing comment 1 getter*/
     /** setter property*/
     static set s3( /** this is value*/value: number) {
         c1.s1 = c1.s2(value);
-    }
+    }/*trailing comment 2 */ /*setter*/
     public nc_p1: number;
     public nc_p2(b: number) {
         return this.nc_p1 + b;
@@ -198,7 +198,7 @@ class cProperties {
     /** getter only property*/
     public get p1() {
         return this.val;
-    }
+    } // trailing comment of only getter
     public get nc_p1() {
         return this.val;
     }
@@ -208,7 +208,10 @@ class cProperties {
     }
     public set nc_p2(value: number) {
         this.val = value;
-    }
+    } /* trailing comment of setter only*/
+
+    public x = 10; /*trailing comment for property*/
+    private y = 10; // trailing comment of // style
 }
 var cProperties_i = new cProperties();
 cProperties_i.p2 = cProperties_i.p1;
@@ -224,23 +227,25 @@ var c1 = (function () {
     /** sum with property*/
     c1.prototype.p2 = function (/** number to add*/ b) {
         return this.p1 + b;
-    };
+    }; /* trailing comment of method*/
     Object.defineProperty(c1.prototype, "p3", {
         /** getter property*/
         get: function () {
             return this.p2(this.p1);
-        },
+        } // trailing comment Getter
+        ,
         /** setter property*/
         set: function (/** this is value*/ value) {
             this.p1 = this.p2(value);
-        },
+        } // trailing comment Setter
+        ,
         enumerable: true,
         configurable: true
     });
     /** sum with property*/
     c1.prototype.pp2 = function (/** number to add*/ b) {
         return this.p1 + b;
-    };
+    }; // trailing comment of method
     Object.defineProperty(c1.prototype, "pp3", {
         /** getter property*/
         get: function () {
@@ -261,11 +266,11 @@ var c1 = (function () {
         /** static getter property*/
         get: function () {
             return c1.s2(c1.s1);
-        },
+        } /*trailing comment 1 getter*/,
         /** setter property*/
         set: function (/** this is value*/ value) {
             c1.s1 = c1.s2(value);
-        },
+        } /*trailing comment 2 */ /*setter*/,
         enumerable: true,
         configurable: true
     });
@@ -433,12 +438,15 @@ c1.nc_s3 = i1_s_ncprop;
 var i1_c = c1;
 var cProperties = (function () {
     function cProperties() {
+        this.x = 10; /*trailing comment for property*/
+        this.y = 10; // trailing comment of // style
     }
     Object.defineProperty(cProperties.prototype, "p1", {
         /** getter only property*/
         get: function () {
             return this.val;
-        },
+        } // trailing comment of only getter
+        ,
         enumerable: true,
         configurable: true
     });
@@ -460,7 +468,7 @@ var cProperties = (function () {
     Object.defineProperty(cProperties.prototype, "nc_p2", {
         set: function (value) {
             this.val = value;
-        },
+        } /* trailing comment of setter only*/,
         enumerable: true,
         configurable: true
     });
@@ -565,5 +573,7 @@ declare class cProperties {
     /**setter only property*/
     p2: number;
     nc_p2: number;
+    x: number;
+    private y;
 }
 declare var cProperties_i: cProperties;
diff --git a/tests/baselines/reference/commentsClassMembers.types b/tests/baselines/reference/commentsClassMembers.types
index 85cf1e369f3..d71ccd2e1e8 100644
--- a/tests/baselines/reference/commentsClassMembers.types
+++ b/tests/baselines/reference/commentsClassMembers.types
@@ -19,7 +19,8 @@ class c1 {
 >this : c1
 >p1 : number
 >b : number
-    }
+
+    } /* trailing comment of method*/
     /** getter property*/
     public get p3() {
 >p3 : number
@@ -32,7 +33,8 @@ class c1 {
 >this.p1 : number
 >this : c1
 >p1 : number
-    }
+
+    }// trailing comment Getter
     /** setter property*/
     public set p3(/** this is value*/value: number) {
 >p3 : number
@@ -48,7 +50,8 @@ class c1 {
 >this : c1
 >p2 : (b: number) => number
 >value : number
-    }
+
+    }// trailing comment Setter
     /** pp1 is property of c1*/
     private pp1: number;
 >pp1 : number
@@ -64,7 +67,8 @@ class c1 {
 >this : c1
 >p1 : number
 >b : number
-    }
+
+    } // trailing comment of method
     /** getter property*/
     private get pp3() {
 >pp3 : number
@@ -125,7 +129,8 @@ class c1 {
 >c1.s1 : number
 >c1 : typeof c1
 >s1 : number
-    }
+
+    } /*trailing comment 1 getter*/
     /** setter property*/
     static set s3( /** this is value*/value: number) {
 >s3 : number
@@ -141,7 +146,8 @@ class c1 {
 >c1 : typeof c1
 >s2 : (b: number) => number
 >value : number
-    }
+
+    }/*trailing comment 2 */ /*setter*/
     public nc_p1: number;
 >nc_p1 : number
 
@@ -696,7 +702,8 @@ class cProperties {
 >this.val : number
 >this : cProperties
 >val : number
-    }
+
+    } // trailing comment of only getter
     public get nc_p1() {
 >nc_p1 : number
 
@@ -727,7 +734,14 @@ class cProperties {
 >this : cProperties
 >val : number
 >value : number
-    }
+
+    } /* trailing comment of setter only*/
+
+    public x = 10; /*trailing comment for property*/
+>x : number
+
+    private y = 10; // trailing comment of // style
+>y : number
 }
 var cProperties_i = new cProperties();
 >cProperties_i : cProperties
diff --git a/tests/baselines/reference/commentsDottedModuleName.js b/tests/baselines/reference/commentsDottedModuleName.js
new file mode 100644
index 00000000000..7044a244279
--- /dev/null
+++ b/tests/baselines/reference/commentsDottedModuleName.js
@@ -0,0 +1,34 @@
+//// [commentsDottedModuleName.ts]
+
+/** this is multi declare module*/
+export module outerModule.InnerModule {
+    /// class b comment
+    export class b {
+    }
+}
+
+//// [commentsDottedModuleName.js]
+define(["require", "exports"], function (require, exports) {
+    /** this is multi declare module*/
+    (function (outerModule) {
+        (function (InnerModule) {
+            /// class b comment
+            var b = (function () {
+                function b() {
+                }
+                return b;
+            })();
+            InnerModule.b = b;
+        })(outerModule.InnerModule || (outerModule.InnerModule = {}));
+        var InnerModule = outerModule.InnerModule;
+    })(exports.outerModule || (exports.outerModule = {}));
+    var outerModule = exports.outerModule;
+});
+
+
+//// [commentsDottedModuleName.d.ts]
+/** this is multi declare module*/
+export declare module outerModule.InnerModule {
+    class b {
+    }
+}
diff --git a/tests/baselines/reference/commentsDottedModuleName.types b/tests/baselines/reference/commentsDottedModuleName.types
new file mode 100644
index 00000000000..81e4d64665e
--- /dev/null
+++ b/tests/baselines/reference/commentsDottedModuleName.types
@@ -0,0 +1,12 @@
+=== tests/cases/compiler/commentsDottedModuleName.ts ===
+
+/** this is multi declare module*/
+export module outerModule.InnerModule {
+>outerModule : outerModule
+>InnerModule : InnerModule
+
+    /// class b comment
+    export class b {
+>b : b
+    }
+}
diff --git a/tests/baselines/reference/commentsEnums.js b/tests/baselines/reference/commentsEnums.js
index 078008268d8..c8bba8a4f77 100644
--- a/tests/baselines/reference/commentsEnums.js
+++ b/tests/baselines/reference/commentsEnums.js
@@ -6,7 +6,7 @@ enum Colors {
     Cornflower /* blue */,
     /** Fancy name for 'pink'*/
     FancyPink
-}
+} // trailing comment
 var x = Colors.Cornflower;
 x = Colors.FancyPink;
 
@@ -20,7 +20,7 @@ var Colors;
     Colors[Colors["Cornflower"] = 0] = "Cornflower"; /* blue */
     /** Fancy name for 'pink'*/
     Colors[Colors["FancyPink"] = 1] = "FancyPink";
-})(Colors || (Colors = {}));
+})(Colors || (Colors = {})); // trailing comment
 var x = 0 /* Cornflower */;
 x = 1 /* FancyPink */;
 
diff --git a/tests/baselines/reference/commentsEnums.types b/tests/baselines/reference/commentsEnums.types
index 639958f9c42..64404bff2e5 100644
--- a/tests/baselines/reference/commentsEnums.types
+++ b/tests/baselines/reference/commentsEnums.types
@@ -11,7 +11,8 @@ enum Colors {
     /** Fancy name for 'pink'*/
     FancyPink
 >FancyPink : Colors
-}
+
+} // trailing comment
 var x = Colors.Cornflower;
 >x : Colors
 >Colors.Cornflower : Colors
diff --git a/tests/baselines/reference/commentsExternalModules.js b/tests/baselines/reference/commentsExternalModules.js
index 74920337ab7..d4a0094e049 100644
--- a/tests/baselines/reference/commentsExternalModules.js
+++ b/tests/baselines/reference/commentsExternalModules.js
@@ -54,7 +54,7 @@ var myvar2 = new m4.m2.c();
 
 //// [commentsExternalModules_1.ts]
 /**This is on import declaration*/
-import extMod = require("commentsExternalModules_0");
+import extMod = require("commentsExternalModules_0"); // trailing comment1
 extMod.m1.fooExport();
 var newVar = new extMod.m1.m2.c();
 extMod.m4.fooExport();
diff --git a/tests/baselines/reference/commentsExternalModules.types b/tests/baselines/reference/commentsExternalModules.types
index 6aaf7bc3736..111114cd734 100644
--- a/tests/baselines/reference/commentsExternalModules.types
+++ b/tests/baselines/reference/commentsExternalModules.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/commentsExternalModules_1.ts ===
 /**This is on import declaration*/
-import extMod = require("commentsExternalModules_0");
+import extMod = require("commentsExternalModules_0"); // trailing comment1
 >extMod : extMod
 
 extMod.m1.fooExport();
diff --git a/tests/baselines/reference/commentsExternalModules2.js b/tests/baselines/reference/commentsExternalModules2.js
new file mode 100644
index 00000000000..ab2db534e14
--- /dev/null
+++ b/tests/baselines/reference/commentsExternalModules2.js
@@ -0,0 +1,176 @@
+//// [tests/cases/compiler/commentsExternalModules2.ts] ////
+
+//// [commentsExternalModules2_0.ts]
+
+/** Module comment*/
+export module m1 {
+    /** b's comment*/
+    export var b: number;
+    /** foo's comment*/
+    function foo() {
+        return b;
+    }
+    /** m2 comments*/
+    export module m2 {
+        /** class comment;*/
+        export class c {
+        };
+        /** i*/
+        export var i = new c();
+    }
+    /** exported function*/
+    export function fooExport() {
+        return foo();
+    }
+}
+m1.fooExport();
+var myvar = new m1.m2.c();
+
+/** Module comment */
+export module m4 {
+    /** b's comment */
+    export var b: number;
+    /** foo's comment
+    */
+    function foo() {
+        return b;
+    }
+    /** m2 comments
+    */
+    export module m2 {
+        /** class comment; */
+        export class c {
+        };
+        /** i */
+        export var i = new c();
+    }
+    /** exported function */
+    export function fooExport() {
+        return foo();
+    }
+}
+m4.fooExport();
+var myvar2 = new m4.m2.c();
+
+//// [commentsExternalModules_1.ts]
+/**This is on import declaration*/
+import extMod = require("commentsExternalModules2_0"); // trailing comment 1
+extMod.m1.fooExport();
+export var newVar = new extMod.m1.m2.c();
+extMod.m4.fooExport();
+export var newVar2 = new extMod.m4.m2.c();
+
+
+//// [commentsExternalModules2_0.js]
+define(["require", "exports"], function (require, exports) {
+    /** Module comment*/
+    (function (m1) {
+        /** b's comment*/
+        m1.b;
+        /** foo's comment*/
+        function foo() {
+            return m1.b;
+        }
+        /** m2 comments*/
+        (function (m2) {
+            /** class comment;*/
+            var c = (function () {
+                function c() {
+                }
+                return c;
+            })();
+            m2.c = c;
+            ;
+            /** i*/
+            m2.i = new c();
+        })(m1.m2 || (m1.m2 = {}));
+        var m2 = m1.m2;
+        /** exported function*/
+        function fooExport() {
+            return foo();
+        }
+        m1.fooExport = fooExport;
+    })(exports.m1 || (exports.m1 = {}));
+    var m1 = exports.m1;
+    m1.fooExport();
+    var myvar = new m1.m2.c();
+    /** Module comment */
+    (function (m4) {
+        /** b's comment */
+        m4.b;
+        /** foo's comment
+        */
+        function foo() {
+            return m4.b;
+        }
+        /** m2 comments
+        */
+        (function (m2) {
+            /** class comment; */
+            var c = (function () {
+                function c() {
+                }
+                return c;
+            })();
+            m2.c = c;
+            ;
+            /** i */
+            m2.i = new c();
+        })(m4.m2 || (m4.m2 = {}));
+        var m2 = m4.m2;
+        /** exported function */
+        function fooExport() {
+            return foo();
+        }
+        m4.fooExport = fooExport;
+    })(exports.m4 || (exports.m4 = {}));
+    var m4 = exports.m4;
+    m4.fooExport();
+    var myvar2 = new m4.m2.c();
+});
+//// [commentsExternalModules_1.js]
+define(["require", "exports", "commentsExternalModules2_0"], function (require, exports, extMod) {
+    extMod.m1.fooExport();
+    exports.newVar = new extMod.m1.m2.c();
+    extMod.m4.fooExport();
+    exports.newVar2 = new extMod.m4.m2.c();
+});
+
+
+//// [commentsExternalModules2_0.d.ts]
+/** Module comment*/
+export declare module m1 {
+    /** b's comment*/
+    var b: number;
+    /** m2 comments*/
+    module m2 {
+        /** class comment;*/
+        class c {
+        }
+        /** i*/
+        var i: c;
+    }
+    /** exported function*/
+    function fooExport(): number;
+}
+/** Module comment */
+export declare module m4 {
+    /** b's comment */
+    var b: number;
+    /** m2 comments
+    */
+    module m2 {
+        /** class comment; */
+        class c {
+        }
+        /** i */
+        var i: c;
+    }
+    /** exported function */
+    function fooExport(): number;
+}
+//// [commentsExternalModules_1.d.ts]
+/**This is on import declaration*/
+import extMod = require("commentsExternalModules2_0");
+export declare var newVar: extMod.m1.m2.c;
+export declare var newVar2: extMod.m4.m2.c;
diff --git a/tests/baselines/reference/commentsExternalModules2.types b/tests/baselines/reference/commentsExternalModules2.types
new file mode 100644
index 00000000000..3f9c14227ac
--- /dev/null
+++ b/tests/baselines/reference/commentsExternalModules2.types
@@ -0,0 +1,155 @@
+=== tests/cases/compiler/commentsExternalModules_1.ts ===
+/**This is on import declaration*/
+import extMod = require("commentsExternalModules2_0"); // trailing comment 1
+>extMod : extMod
+
+extMod.m1.fooExport();
+>extMod.m1.fooExport() : number
+>extMod.m1.fooExport : typeof extMod.m1.fooExport
+>extMod.m1 : typeof extMod.m1
+>extMod : typeof extMod
+>m1 : typeof extMod.m1
+>fooExport : typeof extMod.m1.fooExport
+
+export var newVar = new extMod.m1.m2.c();
+>newVar : extMod.m1.m2.c
+>new extMod.m1.m2.c() : extMod.m1.m2.c
+>extMod.m1.m2.c : typeof extMod.m1.m2.c
+>extMod.m1.m2 : typeof extMod.m1.m2
+>extMod.m1 : typeof extMod.m1
+>extMod : typeof extMod
+>m1 : typeof extMod.m1
+>m2 : typeof extMod.m1.m2
+>c : typeof extMod.m1.m2.c
+
+extMod.m4.fooExport();
+>extMod.m4.fooExport() : number
+>extMod.m4.fooExport : typeof extMod.m4.fooExport
+>extMod.m4 : typeof extMod.m4
+>extMod : typeof extMod
+>m4 : typeof extMod.m4
+>fooExport : typeof extMod.m4.fooExport
+
+export var newVar2 = new extMod.m4.m2.c();
+>newVar2 : extMod.m4.m2.c
+>new extMod.m4.m2.c() : extMod.m4.m2.c
+>extMod.m4.m2.c : typeof extMod.m4.m2.c
+>extMod.m4.m2 : typeof extMod.m4.m2
+>extMod.m4 : typeof extMod.m4
+>extMod : typeof extMod
+>m4 : typeof extMod.m4
+>m2 : typeof extMod.m4.m2
+>c : typeof extMod.m4.m2.c
+
+=== tests/cases/compiler/commentsExternalModules2_0.ts ===
+
+/** Module comment*/
+export module m1 {
+>m1 : m1
+
+    /** b's comment*/
+    export var b: number;
+>b : number
+
+    /** foo's comment*/
+    function foo() {
+>foo : typeof foo
+
+        return b;
+>b : number
+    }
+    /** m2 comments*/
+    export module m2 {
+>m2 : m2
+
+        /** class comment;*/
+        export class c {
+>c : c
+
+        };
+        /** i*/
+        export var i = new c();
+>i : c
+>new c() : c
+>c : typeof c
+    }
+    /** exported function*/
+    export function fooExport() {
+>fooExport : typeof fooExport
+
+        return foo();
+>foo() : number
+>foo : typeof foo
+    }
+}
+m1.fooExport();
+>m1.fooExport() : number
+>m1.fooExport : typeof m1.fooExport
+>m1 : typeof m1
+>fooExport : typeof m1.fooExport
+
+var myvar = new m1.m2.c();
+>myvar : m1.m2.c
+>new m1.m2.c() : m1.m2.c
+>m1.m2.c : typeof m1.m2.c
+>m1.m2 : typeof m1.m2
+>m1 : typeof m1
+>m2 : typeof m1.m2
+>c : typeof m1.m2.c
+
+/** Module comment */
+export module m4 {
+>m4 : m4
+
+    /** b's comment */
+    export var b: number;
+>b : number
+
+    /** foo's comment
+    */
+    function foo() {
+>foo : typeof foo
+
+        return b;
+>b : number
+    }
+    /** m2 comments
+    */
+    export module m2 {
+>m2 : m2
+
+        /** class comment; */
+        export class c {
+>c : c
+
+        };
+        /** i */
+        export var i = new c();
+>i : c
+>new c() : c
+>c : typeof c
+    }
+    /** exported function */
+    export function fooExport() {
+>fooExport : typeof fooExport
+
+        return foo();
+>foo() : number
+>foo : typeof foo
+    }
+}
+m4.fooExport();
+>m4.fooExport() : number
+>m4.fooExport : typeof m4.fooExport
+>m4 : typeof m4
+>fooExport : typeof m4.fooExport
+
+var myvar2 = new m4.m2.c();
+>myvar2 : m4.m2.c
+>new m4.m2.c() : m4.m2.c
+>m4.m2.c : typeof m4.m2.c
+>m4.m2 : typeof m4.m2
+>m4 : typeof m4
+>m2 : typeof m4.m2
+>c : typeof m4.m2.c
+
diff --git a/tests/baselines/reference/commentsExternalModules3.js b/tests/baselines/reference/commentsExternalModules3.js
new file mode 100644
index 00000000000..afade653a6f
--- /dev/null
+++ b/tests/baselines/reference/commentsExternalModules3.js
@@ -0,0 +1,174 @@
+//// [tests/cases/compiler/commentsExternalModules3.ts] ////
+
+//// [commentsExternalModules2_0.ts]
+
+/** Module comment*/
+export module m1 {
+    /** b's comment*/
+    export var b: number;
+    /** foo's comment*/
+    function foo() {
+        return b;
+    }
+    /** m2 comments*/
+    export module m2 {
+        /** class comment;*/
+        export class c {
+        };
+        /** i*/
+        export var i = new c();
+    }
+    /** exported function*/
+    export function fooExport() {
+        return foo();
+    }
+}
+m1.fooExport();
+var myvar = new m1.m2.c();
+
+/** Module comment */
+export module m4 {
+    /** b's comment */
+    export var b: number;
+    /** foo's comment
+    */
+    function foo() {
+        return b;
+    }
+    /** m2 comments
+    */
+    export module m2 {
+        /** class comment; */
+        export class c {
+        };
+        /** i */
+        export var i = new c();
+    }
+    /** exported function */
+    export function fooExport() {
+        return foo();
+    }
+}
+m4.fooExport();
+var myvar2 = new m4.m2.c();
+
+//// [commentsExternalModules_1.ts]
+/**This is on import declaration*/
+import extMod = require("commentsExternalModules2_0"); // trailing comment 1
+extMod.m1.fooExport();
+export var newVar = new extMod.m1.m2.c();
+extMod.m4.fooExport();
+export var newVar2 = new extMod.m4.m2.c();
+
+
+//// [commentsExternalModules2_0.js]
+/** Module comment*/
+(function (m1) {
+    /** b's comment*/
+    m1.b;
+    /** foo's comment*/
+    function foo() {
+        return m1.b;
+    }
+    /** m2 comments*/
+    (function (m2) {
+        /** class comment;*/
+        var c = (function () {
+            function c() {
+            }
+            return c;
+        })();
+        m2.c = c;
+        ;
+        /** i*/
+        m2.i = new c();
+    })(m1.m2 || (m1.m2 = {}));
+    var m2 = m1.m2;
+    /** exported function*/
+    function fooExport() {
+        return foo();
+    }
+    m1.fooExport = fooExport;
+})(exports.m1 || (exports.m1 = {}));
+var m1 = exports.m1;
+m1.fooExport();
+var myvar = new m1.m2.c();
+/** Module comment */
+(function (m4) {
+    /** b's comment */
+    m4.b;
+    /** foo's comment
+    */
+    function foo() {
+        return m4.b;
+    }
+    /** m2 comments
+    */
+    (function (m2) {
+        /** class comment; */
+        var c = (function () {
+            function c() {
+            }
+            return c;
+        })();
+        m2.c = c;
+        ;
+        /** i */
+        m2.i = new c();
+    })(m4.m2 || (m4.m2 = {}));
+    var m2 = m4.m2;
+    /** exported function */
+    function fooExport() {
+        return foo();
+    }
+    m4.fooExport = fooExport;
+})(exports.m4 || (exports.m4 = {}));
+var m4 = exports.m4;
+m4.fooExport();
+var myvar2 = new m4.m2.c();
+//// [commentsExternalModules_1.js]
+/**This is on import declaration*/
+var extMod = require("commentsExternalModules2_0"); // trailing comment 1
+extMod.m1.fooExport();
+exports.newVar = new extMod.m1.m2.c();
+extMod.m4.fooExport();
+exports.newVar2 = new extMod.m4.m2.c();
+
+
+//// [commentsExternalModules2_0.d.ts]
+/** Module comment*/
+export declare module m1 {
+    /** b's comment*/
+    var b: number;
+    /** m2 comments*/
+    module m2 {
+        /** class comment;*/
+        class c {
+        }
+        /** i*/
+        var i: c;
+    }
+    /** exported function*/
+    function fooExport(): number;
+}
+/** Module comment */
+export declare module m4 {
+    /** b's comment */
+    var b: number;
+    /** m2 comments
+    */
+    module m2 {
+        /** class comment; */
+        class c {
+        }
+        /** i */
+        var i: c;
+    }
+    /** exported function */
+    function fooExport(): number;
+}
+//// [commentsExternalModules_1.d.ts]
+/**This is on import declaration*/
+import extMod = require("commentsExternalModules2_0");
+export declare var newVar: extMod.m1.m2.c;
+export declare var newVar2: extMod.m4.m2.c;
diff --git a/tests/baselines/reference/commentsExternalModules3.types b/tests/baselines/reference/commentsExternalModules3.types
new file mode 100644
index 00000000000..3f9c14227ac
--- /dev/null
+++ b/tests/baselines/reference/commentsExternalModules3.types
@@ -0,0 +1,155 @@
+=== tests/cases/compiler/commentsExternalModules_1.ts ===
+/**This is on import declaration*/
+import extMod = require("commentsExternalModules2_0"); // trailing comment 1
+>extMod : extMod
+
+extMod.m1.fooExport();
+>extMod.m1.fooExport() : number
+>extMod.m1.fooExport : typeof extMod.m1.fooExport
+>extMod.m1 : typeof extMod.m1
+>extMod : typeof extMod
+>m1 : typeof extMod.m1
+>fooExport : typeof extMod.m1.fooExport
+
+export var newVar = new extMod.m1.m2.c();
+>newVar : extMod.m1.m2.c
+>new extMod.m1.m2.c() : extMod.m1.m2.c
+>extMod.m1.m2.c : typeof extMod.m1.m2.c
+>extMod.m1.m2 : typeof extMod.m1.m2
+>extMod.m1 : typeof extMod.m1
+>extMod : typeof extMod
+>m1 : typeof extMod.m1
+>m2 : typeof extMod.m1.m2
+>c : typeof extMod.m1.m2.c
+
+extMod.m4.fooExport();
+>extMod.m4.fooExport() : number
+>extMod.m4.fooExport : typeof extMod.m4.fooExport
+>extMod.m4 : typeof extMod.m4
+>extMod : typeof extMod
+>m4 : typeof extMod.m4
+>fooExport : typeof extMod.m4.fooExport
+
+export var newVar2 = new extMod.m4.m2.c();
+>newVar2 : extMod.m4.m2.c
+>new extMod.m4.m2.c() : extMod.m4.m2.c
+>extMod.m4.m2.c : typeof extMod.m4.m2.c
+>extMod.m4.m2 : typeof extMod.m4.m2
+>extMod.m4 : typeof extMod.m4
+>extMod : typeof extMod
+>m4 : typeof extMod.m4
+>m2 : typeof extMod.m4.m2
+>c : typeof extMod.m4.m2.c
+
+=== tests/cases/compiler/commentsExternalModules2_0.ts ===
+
+/** Module comment*/
+export module m1 {
+>m1 : m1
+
+    /** b's comment*/
+    export var b: number;
+>b : number
+
+    /** foo's comment*/
+    function foo() {
+>foo : typeof foo
+
+        return b;
+>b : number
+    }
+    /** m2 comments*/
+    export module m2 {
+>m2 : m2
+
+        /** class comment;*/
+        export class c {
+>c : c
+
+        };
+        /** i*/
+        export var i = new c();
+>i : c
+>new c() : c
+>c : typeof c
+    }
+    /** exported function*/
+    export function fooExport() {
+>fooExport : typeof fooExport
+
+        return foo();
+>foo() : number
+>foo : typeof foo
+    }
+}
+m1.fooExport();
+>m1.fooExport() : number
+>m1.fooExport : typeof m1.fooExport
+>m1 : typeof m1
+>fooExport : typeof m1.fooExport
+
+var myvar = new m1.m2.c();
+>myvar : m1.m2.c
+>new m1.m2.c() : m1.m2.c
+>m1.m2.c : typeof m1.m2.c
+>m1.m2 : typeof m1.m2
+>m1 : typeof m1
+>m2 : typeof m1.m2
+>c : typeof m1.m2.c
+
+/** Module comment */
+export module m4 {
+>m4 : m4
+
+    /** b's comment */
+    export var b: number;
+>b : number
+
+    /** foo's comment
+    */
+    function foo() {
+>foo : typeof foo
+
+        return b;
+>b : number
+    }
+    /** m2 comments
+    */
+    export module m2 {
+>m2 : m2
+
+        /** class comment; */
+        export class c {
+>c : c
+
+        };
+        /** i */
+        export var i = new c();
+>i : c
+>new c() : c
+>c : typeof c
+    }
+    /** exported function */
+    export function fooExport() {
+>fooExport : typeof fooExport
+
+        return foo();
+>foo() : number
+>foo : typeof foo
+    }
+}
+m4.fooExport();
+>m4.fooExport() : number
+>m4.fooExport : typeof m4.fooExport
+>m4 : typeof m4
+>fooExport : typeof m4.fooExport
+
+var myvar2 = new m4.m2.c();
+>myvar2 : m4.m2.c
+>new m4.m2.c() : m4.m2.c
+>m4.m2.c : typeof m4.m2.c
+>m4.m2 : typeof m4.m2
+>m4 : typeof m4
+>m2 : typeof m4.m2
+>c : typeof m4.m2.c
+
diff --git a/tests/baselines/reference/commentsFormatting.js b/tests/baselines/reference/commentsFormatting.js
new file mode 100644
index 00000000000..4ad0d8d6f23
--- /dev/null
+++ b/tests/baselines/reference/commentsFormatting.js
@@ -0,0 +1,220 @@
+//// [commentsFormatting.ts]
+
+module m {
+    /** this is first line - aligned to class declaration
+* this is 4 spaces left aligned
+ * this is 3 spaces left aligned
+  * this is 2 spaces left aligned
+   * this is 1 spaces left aligned
+    * this is at same level as first line
+     * this is 1 spaces right aligned
+      * this is 2 spaces right aligned
+       * this is 3 spaces right aligned
+        * this is 4 spaces right aligned
+         * this is 5 spaces right aligned
+          * this is 6 spaces right aligned
+           * this is 7 spaces right aligned
+            * this is 8 spaces right aligned */
+    export class c {
+    }
+
+        /** this is first line - 4 spaces right aligned to class but in js file should be aligned to class declaration
+* this is 8 spaces left aligned
+ * this is 7 spaces left aligned
+  * this is 6 spaces left aligned
+   * this is 5 spaces left aligned
+    * this is 4 spaces left aligned
+     * this is 3 spaces left aligned
+      * this is 2 spaces left aligned
+       * this is 1 spaces left aligned
+        * this is at same level as first line
+         * this is 1 spaces right aligned
+          * this is 2 spaces right aligned
+           * this is 3 spaces right aligned
+            * this is 4 spaces right aligned
+             * this is 5 spaces right aligned
+              * this is 6 spaces right aligned
+               * this is 7 spaces right aligned
+                * this is 8 spaces right aligned */
+    export class c2 {
+    }
+
+    /** this is comment with new lines in between
+
+this is 4 spaces left aligned but above line is empty
+
+ this is 3 spaces left aligned but above line is empty
+
+  this is 2 spaces left aligned but above line is empty
+
+    this is 1 spaces left aligned but above line is empty
+
+    this is at same level as first line but above line is empty 
+
+     this is 1 spaces right aligned but above line is empty
+
+      this is 2 spaces right aligned but above line is empty
+
+       this is 3 spaces right aligned but above line is empty
+
+        this is 4 spaces right aligned but above line is empty
+    
+    
+    Above 2 lines are empty
+    
+    
+    
+    above 3 lines are empty*/
+    export class c3 {
+    }
+}
+
+//// [commentsFormatting.js]
+var m;
+(function (m) {
+    /** this is first line - aligned to class declaration
+* this is 4 spaces left aligned
+ * this is 3 spaces left aligned
+  * this is 2 spaces left aligned
+   * this is 1 spaces left aligned
+    * this is at same level as first line
+     * this is 1 spaces right aligned
+      * this is 2 spaces right aligned
+       * this is 3 spaces right aligned
+        * this is 4 spaces right aligned
+         * this is 5 spaces right aligned
+          * this is 6 spaces right aligned
+           * this is 7 spaces right aligned
+            * this is 8 spaces right aligned */
+    var c = (function () {
+        function c() {
+        }
+        return c;
+    })();
+    m.c = c;
+    /** this is first line - 4 spaces right aligned to class but in js file should be aligned to class declaration
+* this is 8 spaces left aligned
+* this is 7 spaces left aligned
+* this is 6 spaces left aligned
+* this is 5 spaces left aligned
+* this is 4 spaces left aligned
+ * this is 3 spaces left aligned
+  * this is 2 spaces left aligned
+   * this is 1 spaces left aligned
+    * this is at same level as first line
+     * this is 1 spaces right aligned
+      * this is 2 spaces right aligned
+       * this is 3 spaces right aligned
+        * this is 4 spaces right aligned
+         * this is 5 spaces right aligned
+          * this is 6 spaces right aligned
+           * this is 7 spaces right aligned
+            * this is 8 spaces right aligned */
+    var c2 = (function () {
+        function c2() {
+        }
+        return c2;
+    })();
+    m.c2 = c2;
+    /** this is comment with new lines in between
+
+this is 4 spaces left aligned but above line is empty
+
+ this is 3 spaces left aligned but above line is empty
+
+  this is 2 spaces left aligned but above line is empty
+
+    this is 1 spaces left aligned but above line is empty
+
+    this is at same level as first line but above line is empty
+
+     this is 1 spaces right aligned but above line is empty
+
+      this is 2 spaces right aligned but above line is empty
+
+       this is 3 spaces right aligned but above line is empty
+
+        this is 4 spaces right aligned but above line is empty
+    
+    
+    Above 2 lines are empty
+    
+    
+    
+    above 3 lines are empty*/
+    var c3 = (function () {
+        function c3() {
+        }
+        return c3;
+    })();
+    m.c3 = c3;
+})(m || (m = {}));
+
+
+//// [commentsFormatting.d.ts]
+declare module m {
+    /** this is first line - aligned to class declaration
+* this is 4 spaces left aligned
+ * this is 3 spaces left aligned
+  * this is 2 spaces left aligned
+   * this is 1 spaces left aligned
+    * this is at same level as first line
+     * this is 1 spaces right aligned
+      * this is 2 spaces right aligned
+       * this is 3 spaces right aligned
+        * this is 4 spaces right aligned
+         * this is 5 spaces right aligned
+          * this is 6 spaces right aligned
+           * this is 7 spaces right aligned
+            * this is 8 spaces right aligned */
+    class c {
+    }
+    /** this is first line - 4 spaces right aligned to class but in js file should be aligned to class declaration
+* this is 8 spaces left aligned
+* this is 7 spaces left aligned
+* this is 6 spaces left aligned
+* this is 5 spaces left aligned
+* this is 4 spaces left aligned
+ * this is 3 spaces left aligned
+  * this is 2 spaces left aligned
+   * this is 1 spaces left aligned
+    * this is at same level as first line
+     * this is 1 spaces right aligned
+      * this is 2 spaces right aligned
+       * this is 3 spaces right aligned
+        * this is 4 spaces right aligned
+         * this is 5 spaces right aligned
+          * this is 6 spaces right aligned
+           * this is 7 spaces right aligned
+            * this is 8 spaces right aligned */
+    class c2 {
+    }
+    /** this is comment with new lines in between
+
+this is 4 spaces left aligned but above line is empty
+
+ this is 3 spaces left aligned but above line is empty
+
+  this is 2 spaces left aligned but above line is empty
+
+    this is 1 spaces left aligned but above line is empty
+
+    this is at same level as first line but above line is empty
+
+     this is 1 spaces right aligned but above line is empty
+
+      this is 2 spaces right aligned but above line is empty
+
+       this is 3 spaces right aligned but above line is empty
+
+        this is 4 spaces right aligned but above line is empty
+    
+    
+    Above 2 lines are empty
+    
+    
+    
+    above 3 lines are empty*/
+    class c3 {
+    }
+}
diff --git a/tests/baselines/reference/commentsFormatting.types b/tests/baselines/reference/commentsFormatting.types
new file mode 100644
index 00000000000..0c5e1343959
--- /dev/null
+++ b/tests/baselines/reference/commentsFormatting.types
@@ -0,0 +1,75 @@
+=== tests/cases/compiler/commentsFormatting.ts ===
+
+module m {
+>m : m
+
+    /** this is first line - aligned to class declaration
+* this is 4 spaces left aligned
+ * this is 3 spaces left aligned
+  * this is 2 spaces left aligned
+   * this is 1 spaces left aligned
+    * this is at same level as first line
+     * this is 1 spaces right aligned
+      * this is 2 spaces right aligned
+       * this is 3 spaces right aligned
+        * this is 4 spaces right aligned
+         * this is 5 spaces right aligned
+          * this is 6 spaces right aligned
+           * this is 7 spaces right aligned
+            * this is 8 spaces right aligned */
+    export class c {
+>c : c
+    }
+
+        /** this is first line - 4 spaces right aligned to class but in js file should be aligned to class declaration
+* this is 8 spaces left aligned
+ * this is 7 spaces left aligned
+  * this is 6 spaces left aligned
+   * this is 5 spaces left aligned
+    * this is 4 spaces left aligned
+     * this is 3 spaces left aligned
+      * this is 2 spaces left aligned
+       * this is 1 spaces left aligned
+        * this is at same level as first line
+         * this is 1 spaces right aligned
+          * this is 2 spaces right aligned
+           * this is 3 spaces right aligned
+            * this is 4 spaces right aligned
+             * this is 5 spaces right aligned
+              * this is 6 spaces right aligned
+               * this is 7 spaces right aligned
+                * this is 8 spaces right aligned */
+    export class c2 {
+>c2 : c2
+    }
+
+    /** this is comment with new lines in between
+
+this is 4 spaces left aligned but above line is empty
+
+ this is 3 spaces left aligned but above line is empty
+
+  this is 2 spaces left aligned but above line is empty
+
+    this is 1 spaces left aligned but above line is empty
+
+    this is at same level as first line but above line is empty 
+
+     this is 1 spaces right aligned but above line is empty
+
+      this is 2 spaces right aligned but above line is empty
+
+       this is 3 spaces right aligned but above line is empty
+
+        this is 4 spaces right aligned but above line is empty
+    
+    
+    Above 2 lines are empty
+    
+    
+    
+    above 3 lines are empty*/
+    export class c3 {
+>c3 : c3
+    }
+}
diff --git a/tests/baselines/reference/commentsFunction.js b/tests/baselines/reference/commentsFunction.js
index ec10cd68ea2..0ffb2714108 100644
--- a/tests/baselines/reference/commentsFunction.js
+++ b/tests/baselines/reference/commentsFunction.js
@@ -2,14 +2,14 @@
 
 /** This comment should appear for foo*/
 function foo() {
-}
+} /* trailing comment of function */
 foo();
 /** This is comment for function signature*/
 function fooWithParameters(/** this is comment about a*/a: string,
     /** this is comment for b*/
     b: number) {
     var d = a;
-}
+} // trailing comment of function
 fooWithParameters("a", 10);
 /** fooFunc
  * comment
@@ -22,19 +22,50 @@ var fooFunc = function FooFunctionValue(/** fooFunctionValue param */ b: string)
 var lambdaFoo = /** this is lambda comment*/ (/**param a*/a: number, /**param b*/b: number) => a + b;
 var lambddaNoVarComment = /** this is lambda multiplication*/ (/**param a*/a: number, /**param b*/b: number) => a * b;
 lambdaFoo(10, 20);
-lambddaNoVarComment(10, 20);
+lambddaNoVarComment(10, 20);
+
+function blah(a: string /* multiline trailing comment 
+multiline */) {
+}
+
+function blah2(a: string /* single line multiple trailing comments */ /* second */) {
+}
+
+function blah3(a: string // trailing commen single line
+    ) {
+}
+
+lambdaFoo = (a, b) => a * b; // This is trailing comment
+
+/*leading comment*/() => 0; // Needs to be wrapped in parens to be a valid expression (not declaration)
+/*leading comment*/(() => 0); //trailing comment
+
+function blah4(/*1*/a: string/*2*/,/*3*/b: string/*4*/) {
+}
+
+function foo1() {
+
+    // should emit this
+}
+
+function foo2() {
+    /// This is some detached comment
+
+    // should emit this leading comment of } too
+}
+
 
 //// [commentsFunction.js]
 /** This comment should appear for foo*/
 function foo() {
-}
+} /* trailing comment of function */
 foo();
 /** This is comment for function signature*/
 function fooWithParameters(/** this is comment about a*/ a, 
     /** this is comment for b*/
     b) {
     var d = a;
-}
+} // trailing comment of function
 fooWithParameters("a", 10);
 /** fooFunc
  * comment
@@ -47,6 +78,26 @@ var lambdaFoo = function (/**param a*/ a, /**param b*/ b) { return a + b; };
 var lambddaNoVarComment = function (/**param a*/ a, /**param b*/ b) { return a * b; };
 lambdaFoo(10, 20);
 lambddaNoVarComment(10, 20);
+function blah(a /* multiline trailing comment
+    multiline */) {
+}
+function blah2(a /* single line multiple trailing comments */ /* second */) {
+}
+function blah3(a // trailing commen single line
+    ) {
+}
+lambdaFoo = function (a, b) { return a * b; }; // This is trailing comment
+/*leading comment*/ (function () { return 0; }); // Needs to be wrapped in parens to be a valid expression (not declaration)
+/*leading comment*/ (function () { return 0; }); //trailing comment
+function blah4(/*1*/ a /*2*/, /*3*/ b /*4*/) {
+}
+function foo1() {
+    // should emit this
+}
+function foo2() {
+    /// This is some detached comment
+    // should emit this leading comment of } too
+}
 
 
 //// [commentsFunction.d.ts]
@@ -62,3 +113,9 @@ declare function fooWithParameters(/** this is comment about a*/ a: string,
 declare var fooFunc: (b: string) => string;
 declare var lambdaFoo: (a: number, b: number) => number;
 declare var lambddaNoVarComment: (a: number, b: number) => number;
+declare function blah(a: string): void;
+declare function blah2(a: string): void;
+declare function blah3(a: string): void;
+declare function blah4(a: string, b: string): void;
+declare function foo1(): void;
+declare function foo2(): void;
diff --git a/tests/baselines/reference/commentsFunction.types b/tests/baselines/reference/commentsFunction.types
index c159c8262a5..6b8dd2dec26 100644
--- a/tests/baselines/reference/commentsFunction.types
+++ b/tests/baselines/reference/commentsFunction.types
@@ -3,7 +3,8 @@
 /** This comment should appear for foo*/
 function foo() {
 >foo : typeof foo
-}
+
+} /* trailing comment of function */
 foo();
 >foo() : void
 >foo : typeof foo
@@ -20,7 +21,8 @@ function fooWithParameters(/** this is comment about a*/a: string,
     var d = a;
 >d : string
 >a : string
-}
+
+} // trailing comment of function
 fooWithParameters("a", 10);
 >fooWithParameters("a", 10) : void
 >fooWithParameters : typeof fooWithParameters
@@ -65,3 +67,59 @@ lambddaNoVarComment(10, 20);
 >lambddaNoVarComment(10, 20) : number
 >lambddaNoVarComment : (a: number, b: number) => number
 
+function blah(a: string /* multiline trailing comment 
+>blah : typeof blah
+>a : string
+
+multiline */) {
+}
+
+function blah2(a: string /* single line multiple trailing comments */ /* second */) {
+>blah2 : typeof blah2
+>a : string
+}
+
+function blah3(a: string // trailing commen single line
+>blah3 : typeof blah3
+>a : string
+
+    ) {
+}
+
+lambdaFoo = (a, b) => a * b; // This is trailing comment
+>lambdaFoo = (a, b) => a * b : (a: number, b: number) => number
+>lambdaFoo : (a: number, b: number) => number
+>(a, b) => a * b : (a: number, b: number) => number
+>a : number
+>b : number
+>a * b : number
+>a : number
+>b : number
+
+/*leading comment*/() => 0; // Needs to be wrapped in parens to be a valid expression (not declaration)
+>() => 0 : () => number
+
+/*leading comment*/(() => 0); //trailing comment
+>(() => 0) : () => number
+>() => 0 : () => number
+
+function blah4(/*1*/a: string/*2*/,/*3*/b: string/*4*/) {
+>blah4 : typeof blah4
+>a : string
+>b : string
+}
+
+function foo1() {
+>foo1 : typeof foo1
+
+    // should emit this
+}
+
+function foo2() {
+>foo2 : typeof foo2
+
+    /// This is some detached comment
+
+    // should emit this leading comment of } too
+}
+
diff --git a/tests/baselines/reference/commentsModules.js b/tests/baselines/reference/commentsModules.js
index 65607a30ae1..f964c45f843 100644
--- a/tests/baselines/reference/commentsModules.js
+++ b/tests/baselines/reference/commentsModules.js
@@ -35,7 +35,7 @@ module m1 {
      */
     function foo4Export() {
     }
-}
+} // trailing comment module
 m1.fooExport();
 var myvar = new m1.m2.c();
 /** module comment of m2.m3*/
@@ -43,14 +43,14 @@ module m2.m3 {
     /** Exported class comment*/
     export class c {
     }
-}
+} /* trailing dotted module comment*/
 new m2.m3.c();
 /** module comment of m3.m4.m5*/
 module m3.m4.m5 {
     /** Exported class comment*/
     export class c {
     }
-}
+} // trailing dotted module 2
 new m3.m4.m5.c();
 /** module comment of m4.m5.m6*/
 module m4.m5.m6 {
@@ -58,7 +58,7 @@ module m4.m5.m6 {
         /** Exported class comment*/
         export class c {
         }
-    }
+    } /* trailing inner module */ /* multiple comments*/
 }
 new m4.m5.m6.m7.c();
 /** module comment of m5.m6.m7*/
@@ -141,7 +141,7 @@ var m1;
      */
     function foo4Export() {
     }
-})(m1 || (m1 = {}));
+})(m1 || (m1 = {})); // trailing comment module
 m1.fooExport();
 var myvar = new m1.m2.c();
 /** module comment of m2.m3*/
@@ -157,7 +157,7 @@ var m2;
         m3.c = c;
     })(m2.m3 || (m2.m3 = {}));
     var m3 = m2.m3;
-})(m2 || (m2 = {}));
+})(m2 || (m2 = {})); /* trailing dotted module comment*/
 new m2.m3.c();
 /** module comment of m3.m4.m5*/
 var m3;
@@ -175,7 +175,7 @@ var m3;
         var m5 = m4.m5;
     })(m3.m4 || (m3.m4 = {}));
     var m4 = m3.m4;
-})(m3 || (m3 = {}));
+})(m3 || (m3 = {})); // trailing dotted module 2
 new m3.m4.m5.c();
 /** module comment of m4.m5.m6*/
 var m4;
@@ -191,7 +191,7 @@ var m4;
                 })();
                 m7.c = c;
             })(m6.m7 || (m6.m7 = {}));
-            var m7 = m6.m7;
+            var m7 = m6.m7; /* trailing inner module */ /* multiple comments*/
         })(m5.m6 || (m5.m6 = {}));
         var m6 = m5.m6;
     })(m4.m5 || (m4.m5 = {}));
diff --git a/tests/baselines/reference/commentsModules.types b/tests/baselines/reference/commentsModules.types
index 084f3d8a8b3..a0b2da715ce 100644
--- a/tests/baselines/reference/commentsModules.types
+++ b/tests/baselines/reference/commentsModules.types
@@ -57,7 +57,7 @@ module m1 {
     function foo4Export() {
 >foo4Export : typeof foo4Export
     }
-}
+} // trailing comment module
 m1.fooExport();
 >m1.fooExport() : number
 >m1.fooExport : typeof m1.fooExport
@@ -82,7 +82,7 @@ module m2.m3 {
     export class c {
 >c : c
     }
-}
+} /* trailing dotted module comment*/
 new m2.m3.c();
 >new m2.m3.c() : m2.m3.c
 >m2.m3.c : typeof m2.m3.c
@@ -101,7 +101,7 @@ module m3.m4.m5 {
     export class c {
 >c : c
     }
-}
+} // trailing dotted module 2
 new m3.m4.m5.c();
 >new m3.m4.m5.c() : m3.m4.m5.c
 >m3.m4.m5.c : typeof m3.m4.m5.c
@@ -125,7 +125,7 @@ module m4.m5.m6 {
         export class c {
 >c : c
         }
-    }
+    } /* trailing inner module */ /* multiple comments*/
 }
 new m4.m5.m6.m7.c();
 >new m4.m5.m6.m7.c() : m4.m5.m6.m7.c
diff --git a/tests/baselines/reference/commentsMultiModuleMultiFile.errors.txt b/tests/baselines/reference/commentsMultiModuleMultiFile.errors.txt
deleted file mode 100644
index 4f6d83c47ce..00000000000
--- a/tests/baselines/reference/commentsMultiModuleMultiFile.errors.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-==== tests/cases/compiler/commentsMultiModuleMultiFile_1.ts (0 errors) ====
-    import m = require('commentsMultiModuleMultiFile_0');
-    /** this is multi module 3 comment*/
-    module multiM {
-        /** class d comment*/
-        export class d {
-        }
-    
-        /// class f comment
-        export class f {
-        }
-    }
-    new multiM.d();
-==== tests/cases/compiler/commentsMultiModuleMultiFile_0.ts (3 errors) ====
-    
-    /** this is multi declare module*/
-    export module multiM {
-                  ~~~~~~
-!!! Individual declarations in merged declaration multiM must be all exported or all local.
-        /// class b comment
-        export class b {
-        }
-    }
-    /** thi is multi module 2*/
-    module multiM {
-           ~~~~~~
-!!! Individual declarations in merged declaration multiM must be all exported or all local.
-        /** class c comment*/
-        export class c {
-        }
-    
-        // class e comment
-        export class e {
-        }
-    }
-    
-    new multiM.b();
-    new multiM.c();
-               ~
-!!! Property 'c' does not exist on type 'typeof multiM'.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/commentsMultiModuleMultiFile.js b/tests/baselines/reference/commentsMultiModuleMultiFile.js
index 49c8c2dc04c..2c0cf2b837e 100644
--- a/tests/baselines/reference/commentsMultiModuleMultiFile.js
+++ b/tests/baselines/reference/commentsMultiModuleMultiFile.js
@@ -9,7 +9,7 @@ export module multiM {
     }
 }
 /** thi is multi module 2*/
-module multiM {
+export module multiM {
     /** class c comment*/
     export class c {
     }
@@ -25,7 +25,7 @@ new multiM.c();
 //// [commentsMultiModuleMultiFile_1.ts]
 import m = require('commentsMultiModuleMultiFile_0');
 /** this is multi module 3 comment*/
-module multiM {
+export module multiM {
     /** class d comment*/
     export class d {
     }
@@ -50,7 +50,6 @@ define(["require", "exports"], function (require, exports) {
     })(exports.multiM || (exports.multiM = {}));
     var multiM = exports.multiM;
     /** thi is multi module 2*/
-    var multiM;
     (function (multiM) {
         /** class c comment*/
         var c = (function () {
@@ -66,14 +65,14 @@ define(["require", "exports"], function (require, exports) {
             return e;
         })();
         multiM.e = e;
-    })(multiM || (multiM = {}));
+    })(exports.multiM || (exports.multiM = {}));
+    var multiM = exports.multiM;
     new multiM.b();
     new multiM.c();
 });
 //// [commentsMultiModuleMultiFile_1.js]
 define(["require", "exports"], function (require, exports) {
     /** this is multi module 3 comment*/
-    var multiM;
     (function (multiM) {
         /** class d comment*/
         var d = (function () {
@@ -89,6 +88,32 @@ define(["require", "exports"], function (require, exports) {
             return f;
         })();
         multiM.f = f;
-    })(multiM || (multiM = {}));
+    })(exports.multiM || (exports.multiM = {}));
+    var multiM = exports.multiM;
     new multiM.d();
 });
+
+
+//// [commentsMultiModuleMultiFile_0.d.ts]
+/** this is multi declare module*/
+export declare module multiM {
+    class b {
+    }
+}
+/** thi is multi module 2*/
+export declare module multiM {
+    /** class c comment*/
+    class c {
+    }
+    class e {
+    }
+}
+//// [commentsMultiModuleMultiFile_1.d.ts]
+/** this is multi module 3 comment*/
+export declare module multiM {
+    /** class d comment*/
+    class d {
+    }
+    class f {
+    }
+}
diff --git a/tests/baselines/reference/commentsMultiModuleMultiFile.types b/tests/baselines/reference/commentsMultiModuleMultiFile.types
new file mode 100644
index 00000000000..6f8ffb46c8d
--- /dev/null
+++ b/tests/baselines/reference/commentsMultiModuleMultiFile.types
@@ -0,0 +1,62 @@
+=== tests/cases/compiler/commentsMultiModuleMultiFile_1.ts ===
+import m = require('commentsMultiModuleMultiFile_0');
+>m : m
+
+/** this is multi module 3 comment*/
+export module multiM {
+>multiM : multiM
+
+    /** class d comment*/
+    export class d {
+>d : d
+    }
+
+    /// class f comment
+    export class f {
+>f : f
+    }
+}
+new multiM.d();
+>new multiM.d() : multiM.d
+>multiM.d : typeof multiM.d
+>multiM : typeof multiM
+>d : typeof multiM.d
+
+=== tests/cases/compiler/commentsMultiModuleMultiFile_0.ts ===
+
+/** this is multi declare module*/
+export module multiM {
+>multiM : multiM
+
+    /// class b comment
+    export class b {
+>b : b
+    }
+}
+/** thi is multi module 2*/
+export module multiM {
+>multiM : multiM
+
+    /** class c comment*/
+    export class c {
+>c : c
+    }
+
+    // class e comment
+    export class e {
+>e : e
+    }
+}
+
+new multiM.b();
+>new multiM.b() : multiM.b
+>multiM.b : typeof multiM.b
+>multiM : typeof multiM
+>b : typeof multiM.b
+
+new multiM.c();
+>new multiM.c() : multiM.c
+>multiM.c : typeof multiM.c
+>multiM : typeof multiM
+>c : typeof multiM.c
+
diff --git a/tests/baselines/reference/commentsOnObjectLiteral2.errors.txt b/tests/baselines/reference/commentsOnObjectLiteral2.errors.txt
index 37c312a18e0..aa338e31db4 100644
--- a/tests/baselines/reference/commentsOnObjectLiteral2.errors.txt
+++ b/tests/baselines/reference/commentsOnObjectLiteral2.errors.txt
@@ -10,6 +10,6 @@
             */ 
            initialize: function(name) { 
                this.name = name; 
-           }, 
+           } /* trailing comment 1*/, 
        } 
     );
\ No newline at end of file
diff --git a/tests/baselines/reference/commentsOnObjectLiteral2.js b/tests/baselines/reference/commentsOnObjectLiteral2.js
index e44a462de5e..9243e489741 100644
--- a/tests/baselines/reference/commentsOnObjectLiteral2.js
+++ b/tests/baselines/reference/commentsOnObjectLiteral2.js
@@ -8,7 +8,7 @@ var Person = makeClass(
         */ 
        initialize: function(name) { 
            this.name = name; 
-       }, 
+       } /* trailing comment 1*/, 
    } 
 );
 
@@ -21,5 +21,5 @@ var Person = makeClass({
      */
     initialize: function (name) {
         this.name = name;
-    }
+    } /* trailing comment 1*/
 });
diff --git a/tests/baselines/reference/commentsOnObjectLiteral3.errors.txt b/tests/baselines/reference/commentsOnObjectLiteral3.errors.txt
deleted file mode 100644
index d9a276615f4..00000000000
--- a/tests/baselines/reference/commentsOnObjectLiteral3.errors.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-==== tests/cases/compiler/commentsOnObjectLiteral3.ts (2 errors) ====
-    
-    var v = {
-     //property
-     prop: 1,
-     //property
-     func: function () {
-     },
-     //PropertyName + CallSignature
-     func1() { },
-     //getter
-     get a() {
-         ~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
-      return this.prop;
-     },
-     //setter
-     set a(value) {
-         ~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
-      this.prop = value;
-     }
-    };
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/commentsOnObjectLiteral3.js b/tests/baselines/reference/commentsOnObjectLiteral3.js
new file mode 100644
index 00000000000..5d57b76991e
--- /dev/null
+++ b/tests/baselines/reference/commentsOnObjectLiteral3.js
@@ -0,0 +1,40 @@
+//// [commentsOnObjectLiteral3.ts]
+
+var v = {
+ //property
+ prop: 1 /* multiple trailing comments */ /*trailing comments*/,
+ //property
+ func: function () {
+ },
+ //PropertyName + CallSignature
+ func1() { },
+ //getter
+ get a() {
+  return this.prop;
+ } /*trailing 1*/,
+ //setter
+ set a(value) {
+  this.prop = value;
+ } // trailing 2
+};
+
+
+//// [commentsOnObjectLiteral3.js]
+var v = {
+    //property
+    prop: 1 /* multiple trailing comments */ /*trailing comments*/,
+    //property
+    func: function () {
+    },
+    //PropertyName + CallSignature
+    func1: function () {
+    },
+    //getter
+    get a() {
+        return this.prop;
+    } /*trailing 1*/,
+    //setter
+    set a(value) {
+        this.prop = value;
+    } // trailing 2
+};
diff --git a/tests/baselines/reference/commentsOnObjectLiteral3.types b/tests/baselines/reference/commentsOnObjectLiteral3.types
new file mode 100644
index 00000000000..e7770c7e273
--- /dev/null
+++ b/tests/baselines/reference/commentsOnObjectLiteral3.types
@@ -0,0 +1,46 @@
+=== tests/cases/compiler/commentsOnObjectLiteral3.ts ===
+
+var v = {
+>v : { prop: number; func: () => void; func1: () => void; a: any; }
+>{ //property prop: 1 /* multiple trailing comments */ /*trailing comments*/, //property func: function () { }, //PropertyName + CallSignature func1() { }, //getter get a() {  return this.prop; } /*trailing 1*/, //setter set a(value) {  this.prop = value; } // trailing 2} : { prop: number; func: () => void; func1: () => void; a: any; }
+
+ //property
+ prop: 1 /* multiple trailing comments */ /*trailing comments*/,
+>prop : number
+
+ //property
+ func: function () {
+>func : () => void
+>function () { } : () => void
+
+ },
+ //PropertyName + CallSignature
+ func1() { },
+>func1 : () => void
+>func1() { } : () => void
+
+ //getter
+ get a() {
+>a : any
+
+  return this.prop;
+>this.prop : any
+>this : any
+>prop : any
+
+ } /*trailing 1*/,
+ //setter
+ set a(value) {
+>a : any
+>value : any
+
+  this.prop = value;
+>this.prop = value : any
+>this.prop : any
+>this : any
+>prop : any
+>value : any
+
+ } // trailing 2
+};
+
diff --git a/tests/baselines/reference/commentsOnObjectLiteral4.errors.txt b/tests/baselines/reference/commentsOnObjectLiteral4.errors.txt
deleted file mode 100644
index 91cf41d82a3..00000000000
--- a/tests/baselines/reference/commentsOnObjectLiteral4.errors.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-==== tests/cases/compiler/commentsOnObjectLiteral4.ts (1 errors) ====
-    
-    var v = {
-     /**
-      * @type {number}
-      */
-     get bar(): number {
-         ~~~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
-      return this._bar;
-     }
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/commentsOnObjectLiteral4.js b/tests/baselines/reference/commentsOnObjectLiteral4.js
new file mode 100644
index 00000000000..3b7efefdff4
--- /dev/null
+++ b/tests/baselines/reference/commentsOnObjectLiteral4.js
@@ -0,0 +1,20 @@
+//// [commentsOnObjectLiteral4.ts]
+
+var v = {
+ /**
+  * @type {number}
+  */
+ get bar(): number {
+  return this._bar;
+ }
+}
+
+//// [commentsOnObjectLiteral4.js]
+var v = {
+    /**
+     * @type {number}
+     */
+    get bar() {
+        return this._bar;
+    }
+};
diff --git a/tests/baselines/reference/commentsOnObjectLiteral4.types b/tests/baselines/reference/commentsOnObjectLiteral4.types
new file mode 100644
index 00000000000..364df6e5ea1
--- /dev/null
+++ b/tests/baselines/reference/commentsOnObjectLiteral4.types
@@ -0,0 +1,18 @@
+=== tests/cases/compiler/commentsOnObjectLiteral4.ts ===
+
+var v = {
+>v : { bar: number; }
+>{ /**  * @type {number}  */ get bar(): number {  return this._bar; }} : { bar: number; }
+
+ /**
+  * @type {number}
+  */
+ get bar(): number {
+>bar : number
+
+  return this._bar;
+>this._bar : any
+>this : any
+>_bar : any
+ }
+}
diff --git a/tests/baselines/reference/commentsTypeParameters.js b/tests/baselines/reference/commentsTypeParameters.js
new file mode 100644
index 00000000000..768c238522a
--- /dev/null
+++ b/tests/baselines/reference/commentsTypeParameters.js
@@ -0,0 +1,44 @@
+//// [commentsTypeParameters.ts]
+class C</**docComment for type parameter*/ T> {
+    method</**docComment of method type parameter */ U extends T>(a: U) {
+    }
+    static staticmethod</**docComment of method type parameter */ U>(a: U) {
+    }
+
+    private privatemethod</**docComment of method type parameter */ U extends T>(a: U) {
+    }
+    private static privatestaticmethod</**docComment of method type parameter */ U>(a: U) {
+    }
+}
+
+function compare</**type*/T>(a: T, b: T) {
+    return a === b;
+}
+
+//// [commentsTypeParameters.js]
+var C = (function () {
+    function C() {
+    }
+    C.prototype.method = function (a) {
+    };
+    C.staticmethod = function (a) {
+    };
+    C.prototype.privatemethod = function (a) {
+    };
+    C.privatestaticmethod = function (a) {
+    };
+    return C;
+})();
+function compare(a, b) {
+    return a === b;
+}
+
+
+//// [commentsTypeParameters.d.ts]
+declare class C</**docComment for type parameter*/ T> {
+    method</**docComment of method type parameter */ U extends T>(a: U): void;
+    static staticmethod</**docComment of method type parameter */ U>(a: U): void;
+    private privatemethod</**docComment of method type parameter */ U>(a);
+    private static privatestaticmethod</**docComment of method type parameter */ U>(a);
+}
+declare function compare</**type*/ T>(a: T, b: T): boolean;
diff --git a/tests/baselines/reference/commentsTypeParameters.types b/tests/baselines/reference/commentsTypeParameters.types
new file mode 100644
index 00000000000..43344f1a826
--- /dev/null
+++ b/tests/baselines/reference/commentsTypeParameters.types
@@ -0,0 +1,47 @@
+=== 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 : typeof compare
+>T : T
+>a : T
+>T : T
+>b : T
+>T : T
+
+    return a === b;
+>a === b : boolean
+>a : T
+>b : T
+}
diff --git a/tests/baselines/reference/commentsVarDecl.js b/tests/baselines/reference/commentsVarDecl.js
index 0419ac69478..5105e03879d 100644
--- a/tests/baselines/reference/commentsVarDecl.js
+++ b/tests/baselines/reference/commentsVarDecl.js
@@ -1,7 +1,7 @@
 //// [commentsVarDecl.ts]
 
 /** Variable comments*/
-var myVariable = 10;
+var myVariable = 10; // This trailing Comment1
 
 /** This is another variable comment*/
 var anotherVariable = 30;
@@ -11,13 +11,13 @@ var aVar = "";
 
 /** this is multiline comment
   * All these variables are of number type */
-var anotherAnotherVariable = 70;
+var anotherAnotherVariable = 70; /* these are multiple trailing comments */ /* multiple trailing comments */
 
 /** Triple slash multiline comment*/
 /** another line in the comment*/
 /** comment line 2*/
-var x = 70;
-
+var x = 70; /* multiline trailing comment 
+this is multiline trailing comment */
 /** Triple slash comment on the assignement shouldnt be in .d.ts file*/
 x = myVariable;
 
@@ -45,18 +45,19 @@ n4 = z2;
 
 //// [commentsVarDecl.js]
 /** Variable comments*/
-var myVariable = 10;
+var myVariable = 10; // This trailing Comment1
 /** This is another variable comment*/
 var anotherVariable = 30;
 // shouldn't appear
 var aVar = "";
 /** this is multiline comment
   * All these variables are of number type */
-var anotherAnotherVariable = 70;
+var anotherAnotherVariable = 70; /* these are multiple trailing comments */ /* multiple trailing comments */
 /** Triple slash multiline comment*/
 /** another line in the comment*/
 /** comment line 2*/
-var x = 70;
+var x = 70; /* multiline trailing comment
+this is multiline trailing comment */
 /** Triple slash comment on the assignement shouldnt be in .d.ts file*/
 x = myVariable;
 /** triple slash comment1*/
diff --git a/tests/baselines/reference/commentsVarDecl.types b/tests/baselines/reference/commentsVarDecl.types
index 5688948414a..50db8984b1b 100644
--- a/tests/baselines/reference/commentsVarDecl.types
+++ b/tests/baselines/reference/commentsVarDecl.types
@@ -1,7 +1,7 @@
 === tests/cases/compiler/commentsVarDecl.ts ===
 
 /** Variable comments*/
-var myVariable = 10;
+var myVariable = 10; // This trailing Comment1
 >myVariable : number
 
 /** This is another variable comment*/
@@ -14,15 +14,16 @@ var aVar = "";
 
 /** this is multiline comment
   * All these variables are of number type */
-var anotherAnotherVariable = 70;
+var anotherAnotherVariable = 70; /* these are multiple trailing comments */ /* multiple trailing comments */
 >anotherAnotherVariable : number
 
 /** Triple slash multiline comment*/
 /** another line in the comment*/
 /** comment line 2*/
-var x = 70;
+var x = 70; /* multiline trailing comment 
 >x : number
 
+this is multiline trailing comment */
 /** Triple slash comment on the assignement shouldnt be in .d.ts file*/
 x = myVariable;
 >x = myVariable : number
diff --git a/tests/baselines/reference/complicatedPrivacy.errors.txt b/tests/baselines/reference/complicatedPrivacy.errors.txt
index b28321e6caf..443fefd9487 100644
--- a/tests/baselines/reference/complicatedPrivacy.errors.txt
+++ b/tests/baselines/reference/complicatedPrivacy.errors.txt
@@ -1,4 +1,4 @@
-==== tests/cases/compiler/complicatedPrivacy.ts (5 errors) ====
+==== tests/cases/compiler/complicatedPrivacy.ts (4 errors) ====
     module m1 {
         export module m2 {
     
@@ -11,13 +11,11 @@
             export class C2 implements m3.i3 {
                 public get p1(arg) {
                            ~~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
+!!! A 'get' accessor cannot have parameters.
                     return new C1();
                 }
     
                 public set p1(arg1: C1) {
-                           ~~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
                 }
     
                 public f55() {
diff --git a/tests/baselines/reference/constructorArgsErrors3.errors.txt b/tests/baselines/reference/constructorArgsErrors3.errors.txt
new file mode 100644
index 00000000000..b01950da279
--- /dev/null
+++ b/tests/baselines/reference/constructorArgsErrors3.errors.txt
@@ -0,0 +1,8 @@
+==== tests/cases/compiler/constructorArgsErrors3.ts (1 errors) ====
+    class foo {
+        constructor (public public a: number) {
+                            ~~~~~~
+!!! Accessibility modifier already seen.
+        }
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/constructorArgsErrors4.errors.txt b/tests/baselines/reference/constructorArgsErrors4.errors.txt
new file mode 100644
index 00000000000..431844358ee
--- /dev/null
+++ b/tests/baselines/reference/constructorArgsErrors4.errors.txt
@@ -0,0 +1,8 @@
+==== tests/cases/compiler/constructorArgsErrors4.ts (1 errors) ====
+    class foo {
+        constructor (private public a: number) {
+                             ~~~~~~
+!!! Accessibility modifier already seen.
+        }
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/constructorArgsErrors5.errors.txt b/tests/baselines/reference/constructorArgsErrors5.errors.txt
new file mode 100644
index 00000000000..176a2b7db06
--- /dev/null
+++ b/tests/baselines/reference/constructorArgsErrors5.errors.txt
@@ -0,0 +1,8 @@
+==== tests/cases/compiler/constructorArgsErrors5.ts (1 errors) ====
+    class foo {
+        constructor (export a: number) {
+                     ~~~~~~
+!!! 'export' modifier cannot appear on a parameter.
+        }
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/constructorsWithSpecializedSignatures.errors.txt b/tests/baselines/reference/constructorsWithSpecializedSignatures.errors.txt
new file mode 100644
index 00000000000..d7ba7dcf92b
--- /dev/null
+++ b/tests/baselines/reference/constructorsWithSpecializedSignatures.errors.txt
@@ -0,0 +1,60 @@
+==== tests/cases/compiler/constructorsWithSpecializedSignatures.ts (8 errors) ====
+    // errors
+    declare class C {
+        constructor(x: "hi");
+        ~~~~~~~~~~~~~~~~~~~~~
+!!! Specialized overload signature is not assignable to any non-specialized signature.
+        constructor(x: "foo");
+        ~~~~~~~~~~~~~~~~~~~~~~
+!!! Specialized overload signature is not assignable to any non-specialized signature.
+        constructor(x: number);
+    }
+    
+    // ok
+    declare class C2 {
+        constructor(x: "hi");
+        constructor(x: "foo");
+        constructor(x: string);
+    }
+    
+    // errors
+    class D {
+        constructor(x: "hi");
+        ~~~~~~~~~~~~~~~~~~~~~
+!!! Specialized overload signature is not assignable to any non-specialized signature.
+        constructor(x: "foo");
+        ~~~~~~~~~~~~~~~~~~~~~~
+!!! Specialized overload signature is not assignable to any non-specialized signature.
+        constructor(x: number);
+        constructor(x: "hi") { }
+        ~~~~~~~~~~~~~~~~~~~~~~~~
+!!! A signature with an implementation cannot use a string literal type.
+    }
+    
+    // overloads are ok
+    class D2 {
+        constructor(x: "hi");
+        constructor(x: "foo");
+        constructor(x: string);
+        constructor(x: "hi") { } // error
+        ~~~~~~~~~~~~~~~~~~~~~~~~
+!!! A signature with an implementation cannot use a string literal type.
+    }
+    
+    // errors
+    interface I {
+        new (x: "hi");
+        ~~~~~~~~~~~~~~
+!!! Specialized overload signature is not assignable to any non-specialized signature.
+        new (x: "foo");
+        ~~~~~~~~~~~~~~~
+!!! Specialized overload signature is not assignable to any non-specialized signature.
+        new (x: number);
+    }
+    
+    // ok
+    interface I2 {
+        new (x: "hi");
+        new (x: "foo");
+        new (x: string);
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/constructorsWithSpecializedSignatures.js b/tests/baselines/reference/constructorsWithSpecializedSignatures.js
new file mode 100644
index 00000000000..4faa5e4030a
--- /dev/null
+++ b/tests/baselines/reference/constructorsWithSpecializedSignatures.js
@@ -0,0 +1,58 @@
+//// [constructorsWithSpecializedSignatures.ts]
+// errors
+declare class C {
+    constructor(x: "hi");
+    constructor(x: "foo");
+    constructor(x: number);
+}
+
+// ok
+declare class C2 {
+    constructor(x: "hi");
+    constructor(x: "foo");
+    constructor(x: string);
+}
+
+// errors
+class D {
+    constructor(x: "hi");
+    constructor(x: "foo");
+    constructor(x: number);
+    constructor(x: "hi") { }
+}
+
+// overloads are ok
+class D2 {
+    constructor(x: "hi");
+    constructor(x: "foo");
+    constructor(x: string);
+    constructor(x: "hi") { } // error
+}
+
+// errors
+interface I {
+    new (x: "hi");
+    new (x: "foo");
+    new (x: number);
+}
+
+// ok
+interface I2 {
+    new (x: "hi");
+    new (x: "foo");
+    new (x: string);
+}
+
+//// [constructorsWithSpecializedSignatures.js]
+// errors
+var D = (function () {
+    function D(x) {
+    }
+    return D;
+})();
+// overloads are ok
+var D2 = (function () {
+    function D2(x) {
+    } // error
+    return D2;
+})();
diff --git a/tests/baselines/reference/contextualSignatureInstantiation3.js b/tests/baselines/reference/contextualSignatureInstantiation3.js
new file mode 100644
index 00000000000..9198a02ccda
--- /dev/null
+++ b/tests/baselines/reference/contextualSignatureInstantiation3.js
@@ -0,0 +1,43 @@
+//// [contextualSignatureInstantiation3.ts]
+function map<T, U>(items: T[], f: (x: T) => U): U[]{
+    return items.map(f);
+}
+
+function identity<T>(x: T) {
+    return x;
+}
+
+function singleton<T>(x: T) {
+    return [x];
+}
+
+var xs = [1, 2, 3];
+
+// Have compiler check that we get the correct types
+var v1: number[];
+var v1 = xs.map(identity);      // Error if not number[]
+var v1 = map(xs, identity);     // Error if not number[]
+
+var v2: number[][];         
+var v2 = xs.map(singleton);     // Error if not number[][]
+var v2 = map(xs, singleton);    // Error if not number[][]
+
+
+//// [contextualSignatureInstantiation3.js]
+function map(items, f) {
+    return items.map(f);
+}
+function identity(x) {
+    return x;
+}
+function singleton(x) {
+    return [x];
+}
+var xs = [1, 2, 3];
+// Have compiler check that we get the correct types
+var v1;
+var v1 = xs.map(identity); // Error if not number[]
+var v1 = map(xs, identity); // Error if not number[]
+var v2;
+var v2 = xs.map(singleton); // Error if not number[][]
+var v2 = map(xs, singleton); // Error if not number[][]
diff --git a/tests/baselines/reference/contextualSignatureInstantiation3.types b/tests/baselines/reference/contextualSignatureInstantiation3.types
new file mode 100644
index 00000000000..eba0e9aee72
--- /dev/null
+++ b/tests/baselines/reference/contextualSignatureInstantiation3.types
@@ -0,0 +1,83 @@
+=== tests/cases/compiler/contextualSignatureInstantiation3.ts ===
+function map<T, U>(items: T[], f: (x: T) => U): U[]{
+>map : typeof map
+>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[]
+>items.map : <U>(callbackfn: (value: T, index: number, array: T[]) => U, thisArg?: any) => U[]
+>items : T[]
+>map : <U>(callbackfn: (value: T, index: number, array: T[]) => U, thisArg?: any) => U[]
+>f : (x: T) => U
+}
+
+function identity<T>(x: T) {
+>identity : typeof identity
+>T : T
+>x : T
+>T : T
+
+    return x;
+>x : T
+}
+
+function singleton<T>(x: T) {
+>singleton : typeof singleton
+>T : T
+>x : T
+>T : T
+
+    return [x];
+>[x] : T[]
+>x : T
+}
+
+var xs = [1, 2, 3];
+>xs : number[]
+>[1, 2, 3] : number[]
+
+// Have compiler check that we get the correct types
+var v1: number[];
+>v1 : number[]
+
+var v1 = xs.map(identity);      // Error if not number[]
+>v1 : number[]
+>xs.map(identity) : number[]
+>xs.map : <U>(callbackfn: (value: number, index: number, array: number[]) => U, thisArg?: any) => U[]
+>xs : number[]
+>map : <U>(callbackfn: (value: number, index: number, array: number[]) => U, thisArg?: any) => U[]
+>identity : typeof identity
+
+var v1 = map(xs, identity);     // Error if not number[]
+>v1 : number[]
+>map(xs, identity) : number[]
+>map : typeof map
+>xs : number[]
+>identity : typeof identity
+
+var v2: number[][];         
+>v2 : number[][]
+
+var v2 = xs.map(singleton);     // Error if not number[][]
+>v2 : number[][]
+>xs.map(singleton) : number[][]
+>xs.map : <U>(callbackfn: (value: number, index: number, array: number[]) => U, thisArg?: any) => U[]
+>xs : number[]
+>map : <U>(callbackfn: (value: number, index: number, array: number[]) => U, thisArg?: any) => U[]
+>singleton : typeof singleton
+
+var v2 = map(xs, singleton);    // Error if not number[][]
+>v2 : number[][]
+>map(xs, singleton) : number[][]
+>map : typeof map
+>xs : number[]
+>singleton : typeof singleton
+
diff --git a/tests/baselines/reference/contextualTyping.errors.txt b/tests/baselines/reference/contextualTyping.errors.txt
index effbed3d516..69bffcc5782 100644
--- a/tests/baselines/reference/contextualTyping.errors.txt
+++ b/tests/baselines/reference/contextualTyping.errors.txt
@@ -234,5 +234,5 @@
     interface B extends A { }
     var x: B = { };
         ~
-!!! Type '{}' is not assignable to type 'B':
-!!!   Property 'x' is missing in type '{}'.
\ No newline at end of file
+!!! Type '{}' is not assignable to type 'B':\n  Property 'x' is missing in type '{}'.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/contextualTyping.js b/tests/baselines/reference/contextualTyping.js
index 86c35bb13c2..6d9f1911038 100644
--- a/tests/baselines/reference/contextualTyping.js
+++ b/tests/baselines/reference/contextualTyping.js
@@ -228,209 +228,8 @@ Point.prototype = {
 
 interface A { x: string; }
 interface B extends A { }
-var x: B = { };
+var x: B = { };
+
 
 //// [contextualTyping.js]
-// CONTEXT: Class property declaration
-var C1T5 = (function () {
-    function C1T5() {
-        this.foo = function (i) {
-            return i;
-        };
-    }
-    return C1T5;
-})();
-// CONTEXT: Module property declaration
-var C2T5;
-(function (C2T5) {
-    C2T5.foo = function (i) {
-        return i;
-    };
-})(C2T5 || (C2T5 = {}));
-// CONTEXT: Variable declaration
-var c3t1 = (function (s) {
-    return s;
-});
-var c3t2 = ({
-    n: 1
-});
-var c3t3 = [];
-var c3t4 = function () {
-    return ({});
-};
-var c3t5 = function (n) {
-    return ({});
-};
-var c3t6 = function (n, s) {
-    return ({});
-};
-var c3t7 = function (n) {
-    return n;
-};
-var c3t8 = function (n) {
-    return n;
-};
-var c3t9 = [[], []];
-var c3t10 = [({}), ({})];
-var c3t11 = [function (n, s) {
-    return s;
-}];
-var c3t12 = {
-    foo: ({})
-};
-var c3t13 = ({
-    f: function (i, s) {
-        return s;
-    }
-});
-var c3t14 = ({
-    a: []
-});
-// CONTEXT: Class property assignment
-var C4T5 = (function () {
-    function C4T5() {
-        this.foo = function (i, s) {
-            return s;
-        };
-    }
-    return C4T5;
-})();
-// CONTEXT: Module property assignment
-var C5T5;
-(function (C5T5) {
-    C5T5.foo;
-    C5T5.foo = function (i, s) {
-        return s;
-    };
-})(C5T5 || (C5T5 = {}));
-// CONTEXT: Variable assignment
-var c6t5;
-c6t5 = function (n) {
-    return ({});
-};
-// CONTEXT: Array index assignment
-var c7t2;
-c7t2[0] = ({ n: 1 });
-var objc8 = ({});
-objc8.t1 = (function (s) {
-    return s;
-});
-objc8.t2 = ({
-    n: 1
-});
-objc8.t3 = [];
-objc8.t4 = function () {
-    return ({});
-};
-objc8.t5 = function (n) {
-    return ({});
-};
-objc8.t6 = function (n, s) {
-    return ({});
-};
-objc8.t7 = function (n) {
-    return n;
-};
-objc8.t8 = function (n) {
-    return n;
-};
-objc8.t9 = [[], []];
-objc8.t10 = [({}), ({})];
-objc8.t11 = [function (n, s) {
-    return s;
-}];
-objc8.t12 = {
-    foo: ({})
-};
-objc8.t13 = ({
-    f: function (i, s) {
-        return s;
-    }
-});
-objc8.t14 = ({
-    a: []
-});
-// CONTEXT: Function call
-function c9t5(f) {
-}
-;
-c9t5(function (n) {
-    return ({});
-});
-// CONTEXT: Return statement
-var c10t5 = function () {
-    return function (n) {
-        return ({});
-    };
-};
-// CONTEXT: Newing a class
-var C11t5 = (function () {
-    function C11t5(f) {
-    }
-    return C11t5;
-})();
-;
-var i = new C11t5(function (n) {
-    return ({});
-});
-// CONTEXT: Type annotated expression
-var c12t1 = (function (s) {
-    return s;
-});
-var c12t2 = ({
-    n: 1
-});
-var c12t3 = [];
-var c12t4 = function () {
-    return ({});
-};
-var c12t5 = function (n) {
-    return ({});
-};
-var c12t6 = function (n, s) {
-    return ({});
-};
-var c12t7 = function (n) {
-    return n;
-};
-var c12t8 = function (n) {
-    return n;
-};
-var c12t9 = [[], []];
-var c12t10 = [({}), ({})];
-var c12t11 = [function (n, s) {
-    return s;
-}];
-var c12t12 = {
-    foo: ({})
-};
-var c12t13 = ({
-    f: function (i, s) {
-        return s;
-    }
-});
-var c12t14 = ({
-    a: []
-});
-function EF1(a, b) {
-    return a + b;
-}
-var efv = EF1(1, 2);
-function Point(x, y) {
-    this.x = x;
-    this.y = y;
-    return this;
-}
-Point.origin = new Point(0, 0);
-Point.prototype.add = function (dx, dy) {
-    return new Point(this.x + dx, this.y + dy);
-};
-Point.prototype = {
-    x: 0,
-    y: 0,
-    add: function (dx, dy) {
-        return new Point(this.x + dx, this.y + dy);
-    }
-};
-var x = {};
-//# sourceMappingURL=contextualTyping.js.map
\ No newline at end of file
+// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/contextualTyping.sourcemap.txt b/tests/baselines/reference/contextualTyping.sourcemap.txt
index 9ee97ee0804..1befbbc01d4 100644
--- a/tests/baselines/reference/contextualTyping.sourcemap.txt
+++ b/tests/baselines/reference/contextualTyping.sourcemap.txt
@@ -8,10 +8,10 @@ sources: contextualTyping.ts
 emittedFile:tests/cases/compiler/contextualTyping.js
 sourceFile:contextualTyping.ts
 -------------------------------------------------------------------
->>>// CONTEXT: Class property declaration
-1 >
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1 >
 2 >
 3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+4 >                                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >// DEFAULT INTERFACES
   >interface IFoo {
   >    n: number;
@@ -32,21 +32,19 @@ sourceFile:contextualTyping.ts
 2 >Emitted(1, 1) Source(13, 1) + SourceIndex(0)
 3 >Emitted(1, 39) Source(13, 39) + SourceIndex(0)
 ---
->>>var C1T5 = (function () {
-1 >^^^^
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
 2 >    ^^^^
-3 >        ^^^^^^^^^^^^^^->
-1 >
+3 >        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->
   >class 
 2 >    C1T5
-1 >Emitted(2, 5) Source(14, 7) + SourceIndex(0)
+1->Emitted(2, 5) Source(14, 7) + SourceIndex(0)
 2 >Emitted(2, 9) Source(14, 11) + SourceIndex(0)
 ---
->>>    function C1T5() {
-1->^^^^
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
 2 >    ^^^^^^^^^
 3 >             ^^^^
-4 >                 ^^^^^^^^^^^^^^^^^->
+4 >                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
 2 >    class 
 3 >             C1T5
@@ -54,12 +52,12 @@ sourceFile:contextualTyping.ts
 2 >Emitted(3, 14) Source(14, 7) + SourceIndex(0) name (C1T5)
 3 >Emitted(3, 18) Source(14, 11) + SourceIndex(0) name (C1T5)
 ---
->>>        this.foo = function (i) {
-1->^^^^^^^^
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^^^^^
 2 >        ^^^^^^^^
 3 >                ^^^
 4 >                   ^^^^^^^^^^
 5 >                             ^
+6 >                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1-> {
   >    
 2 >        foo
@@ -72,61 +70,59 @@ sourceFile:contextualTyping.ts
 4 >Emitted(4, 30) Source(15, 54) + SourceIndex(0) name (C1T5.constructor)
 5 >Emitted(4, 31) Source(15, 55) + SourceIndex(0) name (C1T5.constructor)
 ---
->>>            return i;
-1 >^^^^^^^^^^^^
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^^^^^^^^^
 2 >            ^^^^^^
 3 >                  ^
 4 >                   ^
 5 >                    ^
-1 >) {
+6 >                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->) {
   >        
 2 >            return
 3 >                   
 4 >                   i
 5 >                    ;
-1 >Emitted(5, 13) Source(16, 9) + SourceIndex(0)
+1->Emitted(5, 13) Source(16, 9) + SourceIndex(0)
 2 >Emitted(5, 19) Source(16, 15) + SourceIndex(0)
 3 >Emitted(5, 20) Source(16, 16) + SourceIndex(0)
 4 >Emitted(5, 21) Source(16, 17) + SourceIndex(0)
 5 >Emitted(5, 22) Source(16, 18) + SourceIndex(0)
 ---
->>>        };
-1 >^^^^^^^^
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^^^^^
 2 >        ^
 3 >         ^
-1 >
+4 >          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->
   >    
 2 >        }
 3 >         
-1 >Emitted(6, 9) Source(17, 5) + SourceIndex(0)
+1->Emitted(6, 9) Source(17, 5) + SourceIndex(0)
 2 >Emitted(6, 10) Source(17, 6) + SourceIndex(0)
 3 >Emitted(6, 11) Source(17, 6) + SourceIndex(0) name (C1T5.constructor)
 ---
->>>    }
-1 >^^^^
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
 2 >    ^
-3 >     ^^^^^^^^^^^^->
-1 >
+3 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->
   >
 2 >    }
-1 >Emitted(7, 5) Source(18, 1) + SourceIndex(0) name (C1T5.constructor)
+1->Emitted(7, 5) Source(18, 1) + SourceIndex(0) name (C1T5.constructor)
 2 >Emitted(7, 6) Source(18, 2) + SourceIndex(0) name (C1T5.constructor)
 ---
->>>    return C1T5;
-1->^^^^
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
 2 >    ^^^^^^^^^^^
+3 >               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
 2 >    }
 1->Emitted(8, 5) Source(18, 1) + SourceIndex(0) name (C1T5)
 2 >Emitted(8, 16) Source(18, 2) + SourceIndex(0) name (C1T5)
 ---
->>>})();
-1 >
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
 2 >^
 3 > 
 4 > ^^^^
-5 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
+5 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->
 2 >}
 3 > 
 4 > class C1T5 {
@@ -134,15 +130,15 @@ sourceFile:contextualTyping.ts
   >         return i;
   >     }
   > }
-1 >Emitted(9, 1) Source(18, 1) + SourceIndex(0) name (C1T5)
+1->Emitted(9, 1) Source(18, 1) + SourceIndex(0) name (C1T5)
 2 >Emitted(9, 2) Source(18, 2) + SourceIndex(0) name (C1T5)
 3 >Emitted(9, 2) Source(14, 1) + SourceIndex(0)
 4 >Emitted(9, 6) Source(18, 2) + SourceIndex(0)
 ---
->>>// CONTEXT: Module property declaration
-1->
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
 2 >
 3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+4 >                                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
   >// CONTEXT: Module property declaration
@@ -153,13 +149,12 @@ sourceFile:contextualTyping.ts
 2 >Emitted(10, 1) Source(20, 1) + SourceIndex(0)
 3 >Emitted(10, 40) Source(20, 40) + SourceIndex(0)
 ---
->>>var C2T5;
-1 >
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
 2 >^^^^
 3 >    ^^^^
 4 >        ^
-5 >         ^^^^^^^^^^->
-1 >
+5 >         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->
   >
 2 >module 
 3 >    C2T5
@@ -168,18 +163,17 @@ sourceFile:contextualTyping.ts
   >                return i;
   >            }
   >        }
-1 >Emitted(11, 1) Source(21, 1) + SourceIndex(0)
+1->Emitted(11, 1) Source(21, 1) + SourceIndex(0)
 2 >Emitted(11, 5) Source(21, 8) + SourceIndex(0)
 3 >Emitted(11, 9) Source(21, 12) + SourceIndex(0)
 4 >Emitted(11, 10) Source(25, 2) + SourceIndex(0)
 ---
->>>(function (C2T5) {
-1->
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
 2 >^^^^^^^^^^^
 3 >           ^^^^
 4 >               ^^
 5 >                 ^
-6 >                  ^^^^^^^^^^^^->
+6 >                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
 2 >module 
 3 >           C2T5
@@ -191,12 +185,12 @@ sourceFile:contextualTyping.ts
 4 >Emitted(12, 18) Source(21, 13) + SourceIndex(0)
 5 >Emitted(12, 19) Source(21, 14) + SourceIndex(0)
 ---
->>>    C2T5.foo = function (i) {
-1->^^^^
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
 2 >    ^^^^^^^^
 3 >            ^^^
 4 >               ^^^^^^^^^^
 5 >                         ^
+6 >                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >    export var 
 2 >    foo
@@ -209,46 +203,44 @@ sourceFile:contextualTyping.ts
 4 >Emitted(13, 26) Source(22, 65) + SourceIndex(0) name (C2T5)
 5 >Emitted(13, 27) Source(22, 66) + SourceIndex(0) name (C2T5)
 ---
->>>        return i;
-1 >^^^^^^^^
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^^^^^
 2 >        ^^^^^^
 3 >              ^
 4 >               ^
 5 >                ^
-1 >) {
+6 >                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->) {
   >        
 2 >        return
 3 >               
 4 >               i
 5 >                ;
-1 >Emitted(14, 9) Source(23, 9) + SourceIndex(0)
+1->Emitted(14, 9) Source(23, 9) + SourceIndex(0)
 2 >Emitted(14, 15) Source(23, 15) + SourceIndex(0)
 3 >Emitted(14, 16) Source(23, 16) + SourceIndex(0)
 4 >Emitted(14, 17) Source(23, 17) + SourceIndex(0)
 5 >Emitted(14, 18) Source(23, 18) + SourceIndex(0)
 ---
->>>    };
-1 >^^^^
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
 2 >    ^
 3 >     ^
-4 >      ^^^^^^^^^^^^^^^^^^^->
-1 >
+4 >      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->
   >    
 2 >    }
 3 >     
-1 >Emitted(15, 5) Source(24, 5) + SourceIndex(0)
+1->Emitted(15, 5) Source(24, 5) + SourceIndex(0)
 2 >Emitted(15, 6) Source(24, 6) + SourceIndex(0)
 3 >Emitted(15, 7) Source(24, 6) + SourceIndex(0) name (C2T5)
 ---
->>>})(C2T5 || (C2T5 = {}));
-1->
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
 2 >^
 3 > ^^
 4 >   ^^^^
 5 >       ^^^^^
 6 >            ^^^^
 7 >                ^^^^^^^^
-8 >                        ^^^^^^^^^->
+8 >                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >}
@@ -269,10 +261,10 @@ sourceFile:contextualTyping.ts
 6 >Emitted(16, 17) Source(21, 12) + SourceIndex(0)
 7 >Emitted(16, 25) Source(25, 2) + SourceIndex(0)
 ---
->>>// CONTEXT: Variable declaration
-1->
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
 2 >
 3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+4 >                                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
   >// CONTEXT: Variable declaration
@@ -283,65 +275,64 @@ sourceFile:contextualTyping.ts
 2 >Emitted(17, 1) Source(27, 1) + SourceIndex(0)
 3 >Emitted(17, 33) Source(27, 33) + SourceIndex(0)
 ---
->>>var c3t1 = (function (s) {
-1 >^^^^
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
 2 >    ^^^^
 3 >        ^^^
 4 >           ^
 5 >            ^^^^^^^^^^
 6 >                      ^
-1 >
+7 >                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->
   >var 
 2 >    c3t1
 3 >        : (s: string) => string = 
 4 >           (
 5 >            function(
 6 >                      s
-1 >Emitted(18, 5) Source(28, 5) + SourceIndex(0)
+1->Emitted(18, 5) Source(28, 5) + SourceIndex(0)
 2 >Emitted(18, 9) Source(28, 9) + SourceIndex(0)
 3 >Emitted(18, 12) Source(28, 35) + SourceIndex(0)
 4 >Emitted(18, 13) Source(28, 36) + SourceIndex(0)
 5 >Emitted(18, 23) Source(28, 45) + SourceIndex(0)
 6 >Emitted(18, 24) Source(28, 46) + SourceIndex(0)
 ---
->>>    return s;
-1 >^^^^
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
 2 >    ^^^^^^
 3 >          ^
 4 >           ^
 5 >            ^
-1 >) { 
+6 >             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->) { 
 2 >    return
 3 >           
 4 >           s
 5 >            
-1 >Emitted(19, 5) Source(28, 50) + SourceIndex(0)
+1->Emitted(19, 5) Source(28, 50) + SourceIndex(0)
 2 >Emitted(19, 11) Source(28, 56) + SourceIndex(0)
 3 >Emitted(19, 12) Source(28, 57) + SourceIndex(0)
 4 >Emitted(19, 13) Source(28, 58) + SourceIndex(0)
 5 >Emitted(19, 14) Source(28, 58) + SourceIndex(0)
 ---
->>>});
-1 >
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
 2 >^
 3 > ^
 4 >  ^
-5 >   ^^^^^^^^^^^->
-1 > 
+5 >   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1-> 
 2 >}
 3 > )
 4 >  ;
-1 >Emitted(20, 1) Source(28, 59) + SourceIndex(0)
+1->Emitted(20, 1) Source(28, 59) + SourceIndex(0)
 2 >Emitted(20, 2) Source(28, 60) + SourceIndex(0)
 3 >Emitted(20, 3) Source(28, 61) + SourceIndex(0)
 4 >Emitted(20, 4) Source(28, 62) + SourceIndex(0)
 ---
->>>var c3t2 = ({
-1->
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
 2 >^^^^
 3 >    ^^^^
 4 >        ^^^
 5 >           ^
+6 >            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >var 
@@ -354,42 +345,40 @@ sourceFile:contextualTyping.ts
 4 >Emitted(21, 12) Source(29, 18) + SourceIndex(0)
 5 >Emitted(21, 13) Source(29, 19) + SourceIndex(0)
 ---
->>>    n: 1
-1 >^^^^
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
 2 >    ^
 3 >     ^^
 4 >       ^
-1 >{
+5 >        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->{
   >    
 2 >    n
 3 >     : 
 4 >       1
-1 >Emitted(22, 5) Source(30, 5) + SourceIndex(0)
+1->Emitted(22, 5) Source(30, 5) + SourceIndex(0)
 2 >Emitted(22, 6) Source(30, 6) + SourceIndex(0)
 3 >Emitted(22, 8) Source(30, 8) + SourceIndex(0)
 4 >Emitted(22, 9) Source(30, 9) + SourceIndex(0)
 ---
->>>});
-1 >^
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^
 2 > ^
 3 >  ^
-4 >   ^^^^^^^^^^^^->
-1 >
+4 >   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->
   >}
 2 > )
 3 >  
-1 >Emitted(23, 2) Source(31, 2) + SourceIndex(0)
+1->Emitted(23, 2) Source(31, 2) + SourceIndex(0)
 2 >Emitted(23, 3) Source(31, 3) + SourceIndex(0)
 3 >Emitted(23, 4) Source(31, 3) + SourceIndex(0)
 ---
->>>var c3t3 = [];
-1->
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
 2 >^^^^
 3 >    ^^^^
 4 >        ^^^
 5 >           ^^
 6 >             ^
-7 >              ^^^^^^^^^^^->
+7 >              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >var 
@@ -404,12 +393,11 @@ sourceFile:contextualTyping.ts
 5 >Emitted(24, 14) Source(32, 24) + SourceIndex(0)
 6 >Emitted(24, 15) Source(32, 25) + SourceIndex(0)
 ---
->>>var c3t4 = function () {
-1->
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
 2 >^^^^
 3 >    ^^^^
 4 >        ^^^
-5 >           ^^^^^^->
+5 >           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >var 
@@ -420,14 +408,14 @@ sourceFile:contextualTyping.ts
 3 >Emitted(25, 9) Source(33, 9) + SourceIndex(0)
 4 >Emitted(25, 12) Source(33, 24) + SourceIndex(0)
 ---
->>>    return ({});
-1->^^^^
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
 2 >    ^^^^^^
 3 >          ^
 4 >           ^
 5 >            ^^
 6 >              ^
 7 >               ^
+8 >                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->function() { 
 2 >    return
 3 >           <IFoo>
@@ -443,25 +431,24 @@ sourceFile:contextualTyping.ts
 6 >Emitted(26, 16) Source(33, 54) + SourceIndex(0)
 7 >Emitted(26, 17) Source(33, 54) + SourceIndex(0)
 ---
->>>};
-1 >
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
 2 >^
 3 > ^
-4 >  ^^^^^^^^^^^^^^^^^^^^^^^^->
-1 > 
+4 >  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1-> 
 2 >}
 3 > ;
-1 >Emitted(27, 1) Source(33, 55) + SourceIndex(0)
+1->Emitted(27, 1) Source(33, 55) + SourceIndex(0)
 2 >Emitted(27, 2) Source(33, 56) + SourceIndex(0)
 3 >Emitted(27, 3) Source(33, 57) + SourceIndex(0)
 ---
->>>var c3t5 = function (n) {
-1->
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
 2 >^^^^
 3 >    ^^^^
 4 >        ^^^
 5 >           ^^^^^^^^^^
 6 >                     ^
+7 >                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >var 
@@ -476,22 +463,22 @@ sourceFile:contextualTyping.ts
 5 >Emitted(28, 22) Source(34, 42) + SourceIndex(0)
 6 >Emitted(28, 23) Source(34, 43) + SourceIndex(0)
 ---
->>>    return ({});
-1 >^^^^
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
 2 >    ^^^^^^
 3 >          ^
 4 >           ^
 5 >            ^^
 6 >              ^
 7 >               ^
-1 >) { 
+8 >                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->) { 
 2 >    return
 3 >           <IFoo>
 4 >           (
 5 >            {}
 6 >              )
 7 >               
-1 >Emitted(29, 5) Source(34, 47) + SourceIndex(0)
+1->Emitted(29, 5) Source(34, 47) + SourceIndex(0)
 2 >Emitted(29, 11) Source(34, 53) + SourceIndex(0)
 3 >Emitted(29, 12) Source(34, 60) + SourceIndex(0)
 4 >Emitted(29, 13) Source(34, 61) + SourceIndex(0)
@@ -499,20 +486,18 @@ sourceFile:contextualTyping.ts
 6 >Emitted(29, 16) Source(34, 64) + SourceIndex(0)
 7 >Emitted(29, 17) Source(34, 64) + SourceIndex(0)
 ---
->>>};
-1 >
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
 2 >^
 3 > ^
-4 >  ^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 > 
+4 >  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1-> 
 2 >}
 3 > ;
-1 >Emitted(30, 1) Source(34, 65) + SourceIndex(0)
+1->Emitted(30, 1) Source(34, 65) + SourceIndex(0)
 2 >Emitted(30, 2) Source(34, 66) + SourceIndex(0)
 3 >Emitted(30, 3) Source(34, 67) + SourceIndex(0)
 ---
->>>var c3t6 = function (n, s) {
-1->
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
 2 >^^^^
 3 >    ^^^^
 4 >        ^^^
@@ -520,6 +505,7 @@ sourceFile:contextualTyping.ts
 6 >                     ^
 7 >                      ^^
 8 >                        ^
+9 >                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >var 
@@ -538,22 +524,22 @@ sourceFile:contextualTyping.ts
 7 >Emitted(31, 25) Source(35, 56) + SourceIndex(0)
 8 >Emitted(31, 26) Source(35, 57) + SourceIndex(0)
 ---
->>>    return ({});
-1 >^^^^
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
 2 >    ^^^^^^
 3 >          ^
 4 >           ^
 5 >            ^^
 6 >              ^
 7 >               ^
-1 >) { 
+8 >                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->) { 
 2 >    return
 3 >           <IFoo>
 4 >           (
 5 >            {}
 6 >              )
 7 >               
-1 >Emitted(32, 5) Source(35, 61) + SourceIndex(0)
+1->Emitted(32, 5) Source(35, 61) + SourceIndex(0)
 2 >Emitted(32, 11) Source(35, 67) + SourceIndex(0)
 3 >Emitted(32, 12) Source(35, 74) + SourceIndex(0)
 4 >Emitted(32, 13) Source(35, 75) + SourceIndex(0)
@@ -561,25 +547,24 @@ sourceFile:contextualTyping.ts
 6 >Emitted(32, 16) Source(35, 78) + SourceIndex(0)
 7 >Emitted(32, 17) Source(35, 78) + SourceIndex(0)
 ---
->>>};
-1 >
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
 2 >^
 3 > ^
-4 >  ^^^^^^^^^^^^^^^^^^^^^^^^->
-1 > 
+4 >  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1-> 
 2 >}
 3 > ;
-1 >Emitted(33, 1) Source(35, 79) + SourceIndex(0)
+1->Emitted(33, 1) Source(35, 79) + SourceIndex(0)
 2 >Emitted(33, 2) Source(35, 80) + SourceIndex(0)
 3 >Emitted(33, 3) Source(35, 81) + SourceIndex(0)
 ---
->>>var c3t7 = function (n) {
-1->
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
 2 >^^^^
 3 >    ^^^^
 4 >        ^^^
 5 >           ^^^^^^^^^^
 6 >                     ^
+7 >                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >var 
@@ -597,42 +582,41 @@ sourceFile:contextualTyping.ts
 5 >Emitted(34, 22) Source(39, 14) + SourceIndex(0)
 6 >Emitted(34, 23) Source(39, 15) + SourceIndex(0)
 ---
->>>    return n;
-1 >^^^^
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
 2 >    ^^^^^^
 3 >          ^
 4 >           ^
 5 >            ^
-1 >) { 
+6 >             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->) { 
 2 >    return
 3 >           
 4 >           n
 5 >            ;
-1 >Emitted(35, 5) Source(39, 19) + SourceIndex(0)
+1->Emitted(35, 5) Source(39, 19) + SourceIndex(0)
 2 >Emitted(35, 11) Source(39, 25) + SourceIndex(0)
 3 >Emitted(35, 12) Source(39, 26) + SourceIndex(0)
 4 >Emitted(35, 13) Source(39, 27) + SourceIndex(0)
 5 >Emitted(35, 14) Source(39, 28) + SourceIndex(0)
 ---
->>>};
-1 >
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
 2 >^
 3 > ^
-4 >  ^^^^^^^^^^^^^^^^^^^^^^^^->
-1 > 
+4 >  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1-> 
 2 >}
 3 > ;
-1 >Emitted(36, 1) Source(39, 29) + SourceIndex(0)
+1->Emitted(36, 1) Source(39, 29) + SourceIndex(0)
 2 >Emitted(36, 2) Source(39, 30) + SourceIndex(0)
 3 >Emitted(36, 3) Source(39, 31) + SourceIndex(0)
 ---
->>>var c3t8 = function (n) {
-1->
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
 2 >^^^^
 3 >    ^^^^
 4 >        ^^^
 5 >           ^^^^^^^^^^
 6 >                     ^
+7 >                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
   >
@@ -648,37 +632,35 @@ sourceFile:contextualTyping.ts
 5 >Emitted(37, 22) Source(41, 55) + SourceIndex(0)
 6 >Emitted(37, 23) Source(41, 56) + SourceIndex(0)
 ---
->>>    return n;
-1 >^^^^
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
 2 >    ^^^^^^
 3 >          ^
 4 >           ^
 5 >            ^
-1 >) { 
+6 >             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->) { 
 2 >    return
 3 >           
 4 >           n
 5 >            ;
-1 >Emitted(38, 5) Source(41, 60) + SourceIndex(0)
+1->Emitted(38, 5) Source(41, 60) + SourceIndex(0)
 2 >Emitted(38, 11) Source(41, 66) + SourceIndex(0)
 3 >Emitted(38, 12) Source(41, 67) + SourceIndex(0)
 4 >Emitted(38, 13) Source(41, 68) + SourceIndex(0)
 5 >Emitted(38, 14) Source(41, 69) + SourceIndex(0)
 ---
->>>};
-1 >
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
 2 >^
 3 > ^
-4 >  ^^^^^^^^^^^^^^^^^^^->
-1 > 
+4 >  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1-> 
 2 >}
 3 > ;
-1 >Emitted(39, 1) Source(41, 70) + SourceIndex(0)
+1->Emitted(39, 1) Source(41, 70) + SourceIndex(0)
 2 >Emitted(39, 2) Source(41, 71) + SourceIndex(0)
 3 >Emitted(39, 3) Source(41, 72) + SourceIndex(0)
 ---
->>>var c3t9 = [[], []];
-1->
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
 2 >^^^^
 3 >    ^^^^
 4 >        ^^^
@@ -688,7 +670,7 @@ sourceFile:contextualTyping.ts
 8 >                ^^
 9 >                  ^
 10>                   ^
-11>                    ^^^^^^->
+11>                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >var 
@@ -711,8 +693,7 @@ sourceFile:contextualTyping.ts
 9 >Emitted(40, 20) Source(42, 31) + SourceIndex(0)
 10>Emitted(40, 21) Source(42, 32) + SourceIndex(0)
 ---
->>>var c3t10 = [({}), ({})];
-1->
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
 2 >^^^^
 3 >    ^^^^^
 4 >         ^^^
@@ -726,7 +707,7 @@ sourceFile:contextualTyping.ts
 12>                      ^
 13>                       ^
 14>                        ^
-15>                         ^^^^^^->
+15>                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >var 
@@ -757,8 +738,7 @@ sourceFile:contextualTyping.ts
 13>Emitted(41, 25) Source(43, 44) + SourceIndex(0)
 14>Emitted(41, 26) Source(43, 45) + SourceIndex(0)
 ---
->>>var c3t11 = [function (n, s) {
-1->
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
 2 >^^^^
 3 >    ^^^^^
 4 >         ^^^
@@ -767,6 +747,7 @@ sourceFile:contextualTyping.ts
 7 >                       ^
 8 >                        ^^
 9 >                          ^
+10>                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >var 
@@ -787,44 +768,42 @@ sourceFile:contextualTyping.ts
 8 >Emitted(42, 27) Source(44, 63) + SourceIndex(0)
 9 >Emitted(42, 28) Source(44, 64) + SourceIndex(0)
 ---
->>>    return s;
-1 >^^^^
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
 2 >    ^^^^^^
 3 >          ^
 4 >           ^
 5 >            ^
-1 >) { 
+6 >             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->) { 
 2 >    return
 3 >           
 4 >           s
 5 >            ;
-1 >Emitted(43, 5) Source(44, 68) + SourceIndex(0)
+1->Emitted(43, 5) Source(44, 68) + SourceIndex(0)
 2 >Emitted(43, 11) Source(44, 74) + SourceIndex(0)
 3 >Emitted(43, 12) Source(44, 75) + SourceIndex(0)
 4 >Emitted(43, 13) Source(44, 76) + SourceIndex(0)
 5 >Emitted(43, 14) Source(44, 77) + SourceIndex(0)
 ---
->>>}];
-1 >
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
 2 >^
 3 > ^
 4 >  ^
-5 >   ^^^^^^^^^^^->
-1 > 
+5 >   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1-> 
 2 >}
 3 > ]
 4 >  ;
-1 >Emitted(44, 1) Source(44, 78) + SourceIndex(0)
+1->Emitted(44, 1) Source(44, 78) + SourceIndex(0)
 2 >Emitted(44, 2) Source(44, 79) + SourceIndex(0)
 3 >Emitted(44, 3) Source(44, 80) + SourceIndex(0)
 4 >Emitted(44, 4) Source(44, 81) + SourceIndex(0)
 ---
->>>var c3t12 = {
-1->
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
 2 >^^^^
 3 >    ^^^^^
 4 >         ^^^
-5 >            ^^->
+5 >            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >var 
@@ -835,13 +814,13 @@ sourceFile:contextualTyping.ts
 3 >Emitted(45, 10) Source(45, 10) + SourceIndex(0)
 4 >Emitted(45, 13) Source(45, 19) + SourceIndex(0)
 ---
->>>    foo: ({})
-1->^^^^
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
 2 >    ^^^
 3 >       ^^
 4 >         ^
 5 >          ^^
 6 >            ^
+7 >             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->{
   >    
 2 >    foo
@@ -856,23 +835,21 @@ sourceFile:contextualTyping.ts
 5 >Emitted(46, 13) Source(46, 19) + SourceIndex(0)
 6 >Emitted(46, 14) Source(46, 20) + SourceIndex(0)
 ---
->>>};
-1 >^
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^
 2 > ^
-3 >  ^^^^^^^^^^^^^->
-1 >
+3 >  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->
   >}
 2 > 
-1 >Emitted(47, 2) Source(47, 2) + SourceIndex(0)
+1->Emitted(47, 2) Source(47, 2) + SourceIndex(0)
 2 >Emitted(47, 3) Source(47, 2) + SourceIndex(0)
 ---
->>>var c3t13 = ({
-1->
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
 2 >^^^^
 3 >    ^^^^^
 4 >         ^^^
 5 >            ^
-6 >             ^^^^^^^^^^^^->
+6 >             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >var 
@@ -885,14 +862,14 @@ sourceFile:contextualTyping.ts
 4 >Emitted(48, 13) Source(48, 19) + SourceIndex(0)
 5 >Emitted(48, 14) Source(48, 20) + SourceIndex(0)
 ---
->>>    f: function (i, s) {
-1->^^^^
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
 2 >    ^
 3 >     ^^
 4 >       ^^^^^^^^^^
 5 >                 ^
 6 >                  ^^
 7 >                    ^
+8 >                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->{
   >    
 2 >    f
@@ -909,50 +886,49 @@ sourceFile:contextualTyping.ts
 6 >Emitted(49, 21) Source(49, 20) + SourceIndex(0)
 7 >Emitted(49, 22) Source(49, 21) + SourceIndex(0)
 ---
->>>        return s;
-1 >^^^^^^^^
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^^^^^
 2 >        ^^^^^^
 3 >              ^
 4 >               ^
 5 >                ^
-1 >) { 
+6 >                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->) { 
 2 >        return
 3 >               
 4 >               s
 5 >                ;
-1 >Emitted(50, 9) Source(49, 25) + SourceIndex(0)
+1->Emitted(50, 9) Source(49, 25) + SourceIndex(0)
 2 >Emitted(50, 15) Source(49, 31) + SourceIndex(0)
 3 >Emitted(50, 16) Source(49, 32) + SourceIndex(0)
 4 >Emitted(50, 17) Source(49, 33) + SourceIndex(0)
 5 >Emitted(50, 18) Source(49, 34) + SourceIndex(0)
 ---
->>>    }
-1 >^^^^
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
 2 >    ^
-1 > 
+3 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1-> 
 2 >    }
-1 >Emitted(51, 5) Source(49, 35) + SourceIndex(0)
+1->Emitted(51, 5) Source(49, 35) + SourceIndex(0)
 2 >Emitted(51, 6) Source(49, 36) + SourceIndex(0)
 ---
->>>});
-1 >^
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^
 2 > ^
 3 >  ^
-4 >   ^^^^^^^^^^^^->
-1 >
+4 >   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->
   >}
 2 > )
 3 >  
-1 >Emitted(52, 2) Source(50, 2) + SourceIndex(0)
+1->Emitted(52, 2) Source(50, 2) + SourceIndex(0)
 2 >Emitted(52, 3) Source(50, 3) + SourceIndex(0)
 3 >Emitted(52, 4) Source(50, 3) + SourceIndex(0)
 ---
->>>var c3t14 = ({
-1->
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
 2 >^^^^
 3 >    ^^^^^
 4 >         ^^^
 5 >            ^
+6 >             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >var 
@@ -965,38 +941,37 @@ sourceFile:contextualTyping.ts
 4 >Emitted(53, 13) Source(51, 19) + SourceIndex(0)
 5 >Emitted(53, 14) Source(51, 20) + SourceIndex(0)
 ---
->>>    a: []
-1 >^^^^
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
 2 >    ^
 3 >     ^^
 4 >       ^^
-1 >{
+5 >         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->{
   >    
 2 >    a
 3 >     : 
 4 >       []
-1 >Emitted(54, 5) Source(52, 5) + SourceIndex(0)
+1->Emitted(54, 5) Source(52, 5) + SourceIndex(0)
 2 >Emitted(54, 6) Source(52, 6) + SourceIndex(0)
 3 >Emitted(54, 8) Source(52, 8) + SourceIndex(0)
 4 >Emitted(54, 10) Source(52, 10) + SourceIndex(0)
 ---
->>>});
-1 >^
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^
 2 > ^
 3 >  ^
-4 >   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
+4 >   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->
   >}
 2 > )
 3 >  
-1 >Emitted(55, 2) Source(53, 2) + SourceIndex(0)
+1->Emitted(55, 2) Source(53, 2) + SourceIndex(0)
 2 >Emitted(55, 3) Source(53, 3) + SourceIndex(0)
 3 >Emitted(55, 4) Source(53, 3) + SourceIndex(0)
 ---
->>>// CONTEXT: Class property assignment
-1->
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
 2 >
 3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+4 >                                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
   >// CONTEXT: Class property assignment
@@ -1007,21 +982,19 @@ sourceFile:contextualTyping.ts
 2 >Emitted(56, 1) Source(55, 1) + SourceIndex(0)
 3 >Emitted(56, 38) Source(55, 38) + SourceIndex(0)
 ---
->>>var C4T5 = (function () {
-1 >^^^^
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
 2 >    ^^^^
-3 >        ^^^^^^^^^^^^^^->
-1 >
+3 >        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->
   >class 
 2 >    C4T5
-1 >Emitted(57, 5) Source(56, 7) + SourceIndex(0)
+1->Emitted(57, 5) Source(56, 7) + SourceIndex(0)
 2 >Emitted(57, 9) Source(56, 11) + SourceIndex(0)
 ---
->>>    function C4T5() {
-1->^^^^
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
 2 >    ^^^^^^^^^
 3 >             ^^^^
-4 >                 ^^^^^^^^^^^^^^^^^^^^->
+4 >                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1-> {
   >    foo: (i: number, s: string) => string;
   >    
@@ -1031,8 +1004,7 @@ sourceFile:contextualTyping.ts
 2 >Emitted(58, 14) Source(56, 7) + SourceIndex(0) name (C4T5)
 3 >Emitted(58, 18) Source(56, 11) + SourceIndex(0) name (C4T5)
 ---
->>>        this.foo = function (i, s) {
-1->^^^^^^^^
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^^^^^
 2 >        ^^^^
 3 >            ^
 4 >             ^^^
@@ -1041,6 +1013,7 @@ sourceFile:contextualTyping.ts
 7 >                             ^
 8 >                              ^^
 9 >                                ^
+10>                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1-> {
   >    foo: (i: number, s: string) => string;
   >    constructor() {
@@ -1063,62 +1036,60 @@ sourceFile:contextualTyping.ts
 8 >Emitted(59, 33) Source(59, 32) + SourceIndex(0) name (C4T5.constructor)
 9 >Emitted(59, 34) Source(59, 33) + SourceIndex(0) name (C4T5.constructor)
 ---
->>>            return s;
-1 >^^^^^^^^^^^^
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^^^^^^^^^
 2 >            ^^^^^^
 3 >                  ^
 4 >                   ^
 5 >                    ^
-1 >) {
+6 >                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->) {
   >            
 2 >            return
 3 >                   
 4 >                   s
 5 >                    ;
-1 >Emitted(60, 13) Source(60, 13) + SourceIndex(0)
+1->Emitted(60, 13) Source(60, 13) + SourceIndex(0)
 2 >Emitted(60, 19) Source(60, 19) + SourceIndex(0)
 3 >Emitted(60, 20) Source(60, 20) + SourceIndex(0)
 4 >Emitted(60, 21) Source(60, 21) + SourceIndex(0)
 5 >Emitted(60, 22) Source(60, 22) + SourceIndex(0)
 ---
->>>        };
-1 >^^^^^^^^
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^^^^^
 2 >        ^
 3 >         ^
-1 >
+4 >          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->
   >        
 2 >        }
 3 >         
-1 >Emitted(61, 9) Source(61, 9) + SourceIndex(0)
+1->Emitted(61, 9) Source(61, 9) + SourceIndex(0)
 2 >Emitted(61, 10) Source(61, 10) + SourceIndex(0)
 3 >Emitted(61, 11) Source(61, 10) + SourceIndex(0) name (C4T5.constructor)
 ---
->>>    }
-1 >^^^^
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
 2 >    ^
-3 >     ^^^^^^^^^^^^->
-1 >
+3 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->
   >    
 2 >    }
-1 >Emitted(62, 5) Source(62, 5) + SourceIndex(0) name (C4T5.constructor)
+1->Emitted(62, 5) Source(62, 5) + SourceIndex(0) name (C4T5.constructor)
 2 >Emitted(62, 6) Source(62, 6) + SourceIndex(0) name (C4T5.constructor)
 ---
->>>    return C4T5;
-1->^^^^
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
 2 >    ^^^^^^^^^^^
+3 >               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >    }
 1->Emitted(63, 5) Source(63, 1) + SourceIndex(0) name (C4T5)
 2 >Emitted(63, 16) Source(63, 2) + SourceIndex(0) name (C4T5)
 ---
->>>})();
-1 >
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
 2 >^
 3 > 
 4 > ^^^^
-5 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
+5 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->
 2 >}
 3 > 
 4 > class C4T5 {
@@ -1129,15 +1100,15 @@ sourceFile:contextualTyping.ts
   >         }
   >     }
   > }
-1 >Emitted(64, 1) Source(63, 1) + SourceIndex(0) name (C4T5)
+1->Emitted(64, 1) Source(63, 1) + SourceIndex(0) name (C4T5)
 2 >Emitted(64, 2) Source(63, 2) + SourceIndex(0) name (C4T5)
 3 >Emitted(64, 2) Source(56, 1) + SourceIndex(0)
 4 >Emitted(64, 6) Source(63, 2) + SourceIndex(0)
 ---
->>>// CONTEXT: Module property assignment
-1->
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
 2 >
 3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+4 >                                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
   >// CONTEXT: Module property assignment
@@ -1148,13 +1119,12 @@ sourceFile:contextualTyping.ts
 2 >Emitted(65, 1) Source(65, 1) + SourceIndex(0)
 3 >Emitted(65, 39) Source(65, 39) + SourceIndex(0)
 ---
->>>var C5T5;
-1 >
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
 2 >^^^^
 3 >    ^^^^
 4 >        ^
-5 >         ^^^^^^^^^^->
-1 >
+5 >         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->
   >
 2 >module 
 3 >    C5T5
@@ -1164,17 +1134,17 @@ sourceFile:contextualTyping.ts
   >                return s;
   >            }
   >        }
-1 >Emitted(66, 1) Source(66, 1) + SourceIndex(0)
+1->Emitted(66, 1) Source(66, 1) + SourceIndex(0)
 2 >Emitted(66, 5) Source(66, 8) + SourceIndex(0)
 3 >Emitted(66, 9) Source(66, 12) + SourceIndex(0)
 4 >Emitted(66, 10) Source(71, 2) + SourceIndex(0)
 ---
->>>(function (C5T5) {
-1->
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
 2 >^^^^^^^^^^^
 3 >           ^^^^
 4 >               ^^
 5 >                 ^
+6 >                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
 2 >module 
 3 >           C5T5
@@ -1186,27 +1156,26 @@ sourceFile:contextualTyping.ts
 4 >Emitted(67, 18) Source(66, 13) + SourceIndex(0)
 5 >Emitted(67, 19) Source(66, 14) + SourceIndex(0)
 ---
->>>    C5T5.foo;
-1 >^^^^
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
 2 >    ^^^^^^^^
 3 >            ^
-4 >             ^^^^^^^^^^^^^^^^^^^^->
-1 >
+4 >             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->
   >    export var 
 2 >    foo: (i: number, s: string) => string
 3 >            ;
-1 >Emitted(68, 5) Source(67, 16) + SourceIndex(0) name (C5T5)
+1->Emitted(68, 5) Source(67, 16) + SourceIndex(0) name (C5T5)
 2 >Emitted(68, 13) Source(67, 53) + SourceIndex(0) name (C5T5)
 3 >Emitted(68, 14) Source(67, 54) + SourceIndex(0) name (C5T5)
 ---
->>>    C5T5.foo = function (i, s) {
-1->^^^^
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
 2 >    ^^^^^^^^
 3 >            ^^^
 4 >               ^^^^^^^^^^
 5 >                         ^
 6 >                          ^^
 7 >                            ^
+8 >                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >    
 2 >    foo
@@ -1223,46 +1192,44 @@ sourceFile:contextualTyping.ts
 6 >Emitted(69, 29) Source(68, 23) + SourceIndex(0) name (C5T5)
 7 >Emitted(69, 30) Source(68, 24) + SourceIndex(0) name (C5T5)
 ---
->>>        return s;
-1 >^^^^^^^^
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^^^^^
 2 >        ^^^^^^
 3 >              ^
 4 >               ^
 5 >                ^
-1 >) {
+6 >                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->) {
   >        
 2 >        return
 3 >               
 4 >               s
 5 >                ;
-1 >Emitted(70, 9) Source(69, 9) + SourceIndex(0)
+1->Emitted(70, 9) Source(69, 9) + SourceIndex(0)
 2 >Emitted(70, 15) Source(69, 15) + SourceIndex(0)
 3 >Emitted(70, 16) Source(69, 16) + SourceIndex(0)
 4 >Emitted(70, 17) Source(69, 17) + SourceIndex(0)
 5 >Emitted(70, 18) Source(69, 18) + SourceIndex(0)
 ---
->>>    };
-1 >^^^^
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
 2 >    ^
 3 >     ^
-4 >      ^^^^^^^^^^^^^^^^^^^->
-1 >
+4 >      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->
   >    
 2 >    }
 3 >     
-1 >Emitted(71, 5) Source(70, 5) + SourceIndex(0)
+1->Emitted(71, 5) Source(70, 5) + SourceIndex(0)
 2 >Emitted(71, 6) Source(70, 6) + SourceIndex(0)
 3 >Emitted(71, 7) Source(70, 6) + SourceIndex(0) name (C5T5)
 ---
->>>})(C5T5 || (C5T5 = {}));
-1->
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
 2 >^
 3 > ^^
 4 >   ^^^^
 5 >       ^^^^^
 6 >            ^^^^
 7 >                ^^^^^^^^
-8 >                        ^^^^^^^^->
+8 >                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >}
@@ -1284,10 +1251,10 @@ sourceFile:contextualTyping.ts
 6 >Emitted(72, 17) Source(66, 12) + SourceIndex(0)
 7 >Emitted(72, 25) Source(71, 2) + SourceIndex(0)
 ---
->>>// CONTEXT: Variable assignment
-1->
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
 2 >
 3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+4 >                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
   >// CONTEXT: Variable assignment
@@ -1298,25 +1265,24 @@ sourceFile:contextualTyping.ts
 2 >Emitted(73, 1) Source(73, 1) + SourceIndex(0)
 3 >Emitted(73, 32) Source(73, 32) + SourceIndex(0)
 ---
->>>var c6t5;
-1 >^^^^
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
 2 >    ^^^^
 3 >        ^
-4 >         ^^^^^^^^^^^^^->
-1 >
+4 >         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->
   >var 
 2 >    c6t5: (n: number) => IFoo
 3 >        ;
-1 >Emitted(74, 5) Source(74, 5) + SourceIndex(0)
+1->Emitted(74, 5) Source(74, 5) + SourceIndex(0)
 2 >Emitted(74, 9) Source(74, 30) + SourceIndex(0)
 3 >Emitted(74, 10) Source(74, 31) + SourceIndex(0)
 ---
->>>c6t5 = function (n) {
-1->
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
 2 >^^^^
 3 >    ^^^
 4 >       ^^^^^^^^^^
 5 >                 ^
+6 >                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >c6t5
@@ -1329,22 +1295,22 @@ sourceFile:contextualTyping.ts
 4 >Emitted(75, 18) Source(75, 38) + SourceIndex(0)
 5 >Emitted(75, 19) Source(75, 39) + SourceIndex(0)
 ---
->>>    return ({});
-1 >^^^^
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
 2 >    ^^^^^^
 3 >          ^
 4 >           ^
 5 >            ^^
 6 >              ^
 7 >               ^
-1 >) { 
+8 >                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->) { 
 2 >    return
 3 >           <IFoo>
 4 >           (
 5 >            {}
 6 >              )
 7 >               
-1 >Emitted(76, 5) Source(75, 43) + SourceIndex(0)
+1->Emitted(76, 5) Source(75, 43) + SourceIndex(0)
 2 >Emitted(76, 11) Source(75, 49) + SourceIndex(0)
 3 >Emitted(76, 12) Source(75, 56) + SourceIndex(0)
 4 >Emitted(76, 13) Source(75, 57) + SourceIndex(0)
@@ -1352,22 +1318,21 @@ sourceFile:contextualTyping.ts
 6 >Emitted(76, 16) Source(75, 60) + SourceIndex(0)
 7 >Emitted(76, 17) Source(75, 60) + SourceIndex(0)
 ---
->>>};
-1 >
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
 2 >^
 3 > ^
-4 >  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 > 
+4 >  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1-> 
 2 >}
 3 > ;
-1 >Emitted(77, 1) Source(75, 61) + SourceIndex(0)
+1->Emitted(77, 1) Source(75, 61) + SourceIndex(0)
 2 >Emitted(77, 2) Source(75, 62) + SourceIndex(0)
 3 >Emitted(77, 3) Source(75, 63) + SourceIndex(0)
 ---
->>>// CONTEXT: Array index assignment
-1->
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
 2 >
 3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+4 >                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
   >// CONTEXT: Array index assignment
@@ -1378,21 +1343,19 @@ sourceFile:contextualTyping.ts
 2 >Emitted(78, 1) Source(77, 1) + SourceIndex(0)
 3 >Emitted(78, 35) Source(77, 35) + SourceIndex(0)
 ---
->>>var c7t2;
-1 >^^^^
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
 2 >    ^^^^
 3 >        ^
-4 >         ^^^^^^^^^^^^^->
-1 >
+4 >         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->
   >var 
 2 >    c7t2: IFoo[]
 3 >        ;
-1 >Emitted(79, 5) Source(78, 5) + SourceIndex(0)
+1->Emitted(79, 5) Source(78, 5) + SourceIndex(0)
 2 >Emitted(79, 9) Source(78, 17) + SourceIndex(0)
 3 >Emitted(79, 10) Source(78, 18) + SourceIndex(0)
 ---
->>>c7t2[0] = ({ n: 1 });
-1->
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
 2 >^^^^
 3 >    ^
 4 >     ^
@@ -1406,6 +1369,7 @@ sourceFile:contextualTyping.ts
 12>                 ^^
 13>                   ^
 14>                    ^
+15>                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >c7t2
@@ -1436,8 +1400,7 @@ sourceFile:contextualTyping.ts
 13>Emitted(80, 21) Source(79, 25) + SourceIndex(0)
 14>Emitted(80, 22) Source(79, 26) + SourceIndex(0)
 ---
->>>var objc8 = ({});
-1 >
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
 2 >^^^^
 3 >    ^^^^^
 4 >         ^^^
@@ -1445,8 +1408,8 @@ sourceFile:contextualTyping.ts
 6 >             ^^
 7 >               ^
 8 >                ^
-9 >                 ^^^^^^^^^^->
-1 >
+9 >                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->
   >
   >// CONTEXT: Object property assignment
   >interface IPlaceHolder {
@@ -1495,7 +1458,7 @@ sourceFile:contextualTyping.ts
 6 >             {}
 7 >               )
 8 >                ;
-1 >Emitted(81, 1) Source(102, 1) + SourceIndex(0)
+1->Emitted(81, 1) Source(102, 1) + SourceIndex(0)
 2 >Emitted(81, 5) Source(102, 5) + SourceIndex(0)
 3 >Emitted(81, 10) Source(102, 10) + SourceIndex(0)
 4 >Emitted(81, 13) Source(120, 19) + SourceIndex(0)
@@ -1504,8 +1467,7 @@ sourceFile:contextualTyping.ts
 7 >Emitted(81, 17) Source(120, 23) + SourceIndex(0)
 8 >Emitted(81, 18) Source(120, 24) + SourceIndex(0)
 ---
->>>objc8.t1 = (function (s) {
-1->
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
 2 >^^^^^
 3 >     ^
 4 >      ^^
@@ -1513,6 +1475,7 @@ sourceFile:contextualTyping.ts
 6 >           ^
 7 >            ^^^^^^^^^^
 8 >                      ^
+9 >                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
   >
@@ -1532,45 +1495,44 @@ sourceFile:contextualTyping.ts
 7 >Emitted(82, 23) Source(122, 22) + SourceIndex(0)
 8 >Emitted(82, 24) Source(122, 23) + SourceIndex(0)
 ---
->>>    return s;
-1 >^^^^
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
 2 >    ^^^^^^
 3 >          ^
 4 >           ^
 5 >            ^
-1 >) { 
+6 >             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->) { 
 2 >    return
 3 >           
 4 >           s
 5 >            
-1 >Emitted(83, 5) Source(122, 27) + SourceIndex(0)
+1->Emitted(83, 5) Source(122, 27) + SourceIndex(0)
 2 >Emitted(83, 11) Source(122, 33) + SourceIndex(0)
 3 >Emitted(83, 12) Source(122, 34) + SourceIndex(0)
 4 >Emitted(83, 13) Source(122, 35) + SourceIndex(0)
 5 >Emitted(83, 14) Source(122, 35) + SourceIndex(0)
 ---
->>>});
-1 >
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
 2 >^
 3 > ^
 4 >  ^
-5 >   ^^^^^^^^^^^->
-1 > 
+5 >   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1-> 
 2 >}
 3 > )
 4 >  ;
-1 >Emitted(84, 1) Source(122, 36) + SourceIndex(0)
+1->Emitted(84, 1) Source(122, 36) + SourceIndex(0)
 2 >Emitted(84, 2) Source(122, 37) + SourceIndex(0)
 3 >Emitted(84, 3) Source(122, 38) + SourceIndex(0)
 4 >Emitted(84, 4) Source(122, 39) + SourceIndex(0)
 ---
->>>objc8.t2 = ({
-1->
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
 2 >^^^^^
 3 >     ^
 4 >      ^^
 5 >        ^^^
 6 >           ^
+7 >            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >objc8
@@ -1585,43 +1547,41 @@ sourceFile:contextualTyping.ts
 5 >Emitted(85, 12) Source(123, 18) + SourceIndex(0)
 6 >Emitted(85, 13) Source(123, 19) + SourceIndex(0)
 ---
->>>    n: 1
-1 >^^^^
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
 2 >    ^
 3 >     ^^
 4 >       ^
-1 >{
+5 >        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->{
   >    
 2 >    n
 3 >     : 
 4 >       1
-1 >Emitted(86, 5) Source(124, 5) + SourceIndex(0)
+1->Emitted(86, 5) Source(124, 5) + SourceIndex(0)
 2 >Emitted(86, 6) Source(124, 6) + SourceIndex(0)
 3 >Emitted(86, 8) Source(124, 8) + SourceIndex(0)
 4 >Emitted(86, 9) Source(124, 9) + SourceIndex(0)
 ---
->>>});
-1 >^
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^
 2 > ^
 3 >  ^
-4 >   ^^^^^^^^^^^^->
-1 >
+4 >   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->
   >}
 2 > )
 3 >  ;
-1 >Emitted(87, 2) Source(125, 2) + SourceIndex(0)
+1->Emitted(87, 2) Source(125, 2) + SourceIndex(0)
 2 >Emitted(87, 3) Source(125, 3) + SourceIndex(0)
 3 >Emitted(87, 4) Source(125, 4) + SourceIndex(0)
 ---
->>>objc8.t3 = [];
-1->
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
 2 >^^^^^
 3 >     ^
 4 >      ^^
 5 >        ^^^
 6 >           ^^
 7 >             ^
-8 >              ^^^^^^^^^^^->
+8 >              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >objc8
@@ -1638,13 +1598,12 @@ sourceFile:contextualTyping.ts
 6 >Emitted(88, 14) Source(126, 14) + SourceIndex(0)
 7 >Emitted(88, 15) Source(126, 15) + SourceIndex(0)
 ---
->>>objc8.t4 = function () {
-1->
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
 2 >^^^^^
 3 >     ^
 4 >      ^^
 5 >        ^^^
-6 >           ^^^^^^->
+6 >           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >objc8
@@ -1657,14 +1616,14 @@ sourceFile:contextualTyping.ts
 4 >Emitted(89, 9) Source(127, 9) + SourceIndex(0)
 5 >Emitted(89, 12) Source(127, 12) + SourceIndex(0)
 ---
->>>    return ({});
-1->^^^^
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
 2 >    ^^^^^^
 3 >          ^
 4 >           ^
 5 >            ^^
 6 >              ^
 7 >               ^
+8 >                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->function() { 
 2 >    return
 3 >           <IFoo>
@@ -1680,26 +1639,25 @@ sourceFile:contextualTyping.ts
 6 >Emitted(90, 16) Source(127, 42) + SourceIndex(0)
 7 >Emitted(90, 17) Source(127, 42) + SourceIndex(0)
 ---
->>>};
-1 >
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
 2 >^
 3 > ^
-4 >  ^^^^^^^^^^^^^^^^^^^^^^^^->
-1 > 
+4 >  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1-> 
 2 >}
 3 > ;
-1 >Emitted(91, 1) Source(127, 43) + SourceIndex(0)
+1->Emitted(91, 1) Source(127, 43) + SourceIndex(0)
 2 >Emitted(91, 2) Source(127, 44) + SourceIndex(0)
 3 >Emitted(91, 3) Source(127, 45) + SourceIndex(0)
 ---
->>>objc8.t5 = function (n) {
-1->
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
 2 >^^^^^
 3 >     ^
 4 >      ^^
 5 >        ^^^
 6 >           ^^^^^^^^^^
 7 >                     ^
+8 >                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >objc8
@@ -1716,22 +1674,22 @@ sourceFile:contextualTyping.ts
 6 >Emitted(92, 22) Source(128, 21) + SourceIndex(0)
 7 >Emitted(92, 23) Source(128, 22) + SourceIndex(0)
 ---
->>>    return ({});
-1 >^^^^
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
 2 >    ^^^^^^
 3 >          ^
 4 >           ^
 5 >            ^^
 6 >              ^
 7 >               ^
-1 >) { 
+8 >                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->) { 
 2 >    return
 3 >           <IFoo>
 4 >           (
 5 >            {}
 6 >              )
 7 >               
-1 >Emitted(93, 5) Source(128, 26) + SourceIndex(0)
+1->Emitted(93, 5) Source(128, 26) + SourceIndex(0)
 2 >Emitted(93, 11) Source(128, 32) + SourceIndex(0)
 3 >Emitted(93, 12) Source(128, 39) + SourceIndex(0)
 4 >Emitted(93, 13) Source(128, 40) + SourceIndex(0)
@@ -1739,20 +1697,18 @@ sourceFile:contextualTyping.ts
 6 >Emitted(93, 16) Source(128, 43) + SourceIndex(0)
 7 >Emitted(93, 17) Source(128, 43) + SourceIndex(0)
 ---
->>>};
-1 >
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
 2 >^
 3 > ^
-4 >  ^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 > 
+4 >  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1-> 
 2 >}
 3 > ;
-1 >Emitted(94, 1) Source(128, 44) + SourceIndex(0)
+1->Emitted(94, 1) Source(128, 44) + SourceIndex(0)
 2 >Emitted(94, 2) Source(128, 45) + SourceIndex(0)
 3 >Emitted(94, 3) Source(128, 46) + SourceIndex(0)
 ---
->>>objc8.t6 = function (n, s) {
-1->
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
 2 >^^^^^
 3 >     ^
 4 >      ^^
@@ -1761,6 +1717,7 @@ sourceFile:contextualTyping.ts
 7 >                     ^
 8 >                      ^^
 9 >                        ^
+10>                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >objc8
@@ -1781,22 +1738,22 @@ sourceFile:contextualTyping.ts
 8 >Emitted(95, 25) Source(129, 24) + SourceIndex(0)
 9 >Emitted(95, 26) Source(129, 25) + SourceIndex(0)
 ---
->>>    return ({});
-1 >^^^^
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
 2 >    ^^^^^^
 3 >          ^
 4 >           ^
 5 >            ^^
 6 >              ^
 7 >               ^
-1 >) { 
+8 >                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->) { 
 2 >    return
 3 >           <IFoo>
 4 >           (
 5 >            {}
 6 >              )
 7 >               
-1 >Emitted(96, 5) Source(129, 29) + SourceIndex(0)
+1->Emitted(96, 5) Source(129, 29) + SourceIndex(0)
 2 >Emitted(96, 11) Source(129, 35) + SourceIndex(0)
 3 >Emitted(96, 12) Source(129, 42) + SourceIndex(0)
 4 >Emitted(96, 13) Source(129, 43) + SourceIndex(0)
@@ -1804,26 +1761,25 @@ sourceFile:contextualTyping.ts
 6 >Emitted(96, 16) Source(129, 46) + SourceIndex(0)
 7 >Emitted(96, 17) Source(129, 46) + SourceIndex(0)
 ---
->>>};
-1 >
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
 2 >^
 3 > ^
-4 >  ^^^^^^^^^^^^^^^^^^^^^^^^->
-1 > 
+4 >  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1-> 
 2 >}
 3 > ;
-1 >Emitted(97, 1) Source(129, 47) + SourceIndex(0)
+1->Emitted(97, 1) Source(129, 47) + SourceIndex(0)
 2 >Emitted(97, 2) Source(129, 48) + SourceIndex(0)
 3 >Emitted(97, 3) Source(129, 49) + SourceIndex(0)
 ---
->>>objc8.t7 = function (n) {
-1->
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
 2 >^^^^^
 3 >     ^
 4 >      ^^
 5 >        ^^^
 6 >           ^^^^^^^^^^
 7 >                     ^
+8 >                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >objc8
@@ -1840,43 +1796,42 @@ sourceFile:contextualTyping.ts
 6 >Emitted(98, 22) Source(130, 21) + SourceIndex(0)
 7 >Emitted(98, 23) Source(130, 30) + SourceIndex(0)
 ---
->>>    return n;
-1 >^^^^
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
 2 >    ^^^^^^
 3 >          ^
 4 >           ^
 5 >            ^
-1 >) { 
+6 >             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->) { 
 2 >    return
 3 >           
 4 >           n
 5 >            
-1 >Emitted(99, 5) Source(130, 34) + SourceIndex(0)
+1->Emitted(99, 5) Source(130, 34) + SourceIndex(0)
 2 >Emitted(99, 11) Source(130, 40) + SourceIndex(0)
 3 >Emitted(99, 12) Source(130, 41) + SourceIndex(0)
 4 >Emitted(99, 13) Source(130, 42) + SourceIndex(0)
 5 >Emitted(99, 14) Source(130, 42) + SourceIndex(0)
 ---
->>>};
-1 >
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
 2 >^
 3 > ^
-4 >  ^^^^^^^^^^^^^^^^^^^^^^^^->
-1 > 
+4 >  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1-> 
 2 >}
 3 > ;
-1 >Emitted(100, 1) Source(130, 43) + SourceIndex(0)
+1->Emitted(100, 1) Source(130, 43) + SourceIndex(0)
 2 >Emitted(100, 2) Source(130, 44) + SourceIndex(0)
 3 >Emitted(100, 3) Source(130, 45) + SourceIndex(0)
 ---
->>>objc8.t8 = function (n) {
-1->
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
 2 >^^^^^
 3 >     ^
 4 >      ^^
 5 >        ^^^
 6 >           ^^^^^^^^^^
 7 >                     ^
+8 >                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
   >
@@ -1894,37 +1849,35 @@ sourceFile:contextualTyping.ts
 6 >Emitted(101, 22) Source(132, 21) + SourceIndex(0)
 7 >Emitted(101, 23) Source(132, 22) + SourceIndex(0)
 ---
->>>    return n;
-1 >^^^^
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
 2 >    ^^^^^^
 3 >          ^
 4 >           ^
 5 >            ^
-1 >) { 
+6 >             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->) { 
 2 >    return
 3 >           
 4 >           n
 5 >            ;
-1 >Emitted(102, 5) Source(132, 26) + SourceIndex(0)
+1->Emitted(102, 5) Source(132, 26) + SourceIndex(0)
 2 >Emitted(102, 11) Source(132, 32) + SourceIndex(0)
 3 >Emitted(102, 12) Source(132, 33) + SourceIndex(0)
 4 >Emitted(102, 13) Source(132, 34) + SourceIndex(0)
 5 >Emitted(102, 14) Source(132, 35) + SourceIndex(0)
 ---
->>>};
-1 >
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
 2 >^
 3 > ^
-4 >  ^^^^^^^^^^^^^^^^^^^->
-1 > 
+4 >  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1-> 
 2 >}
 3 > ;
-1 >Emitted(103, 1) Source(132, 36) + SourceIndex(0)
+1->Emitted(103, 1) Source(132, 36) + SourceIndex(0)
 2 >Emitted(103, 2) Source(132, 37) + SourceIndex(0)
 3 >Emitted(103, 3) Source(132, 38) + SourceIndex(0)
 ---
->>>objc8.t9 = [[], []];
-1->
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
 2 >^^^^^
 3 >     ^
 4 >      ^^
@@ -1935,7 +1888,7 @@ sourceFile:contextualTyping.ts
 9 >                ^^
 10>                  ^
 11>                   ^
-12>                    ^^^^^^->
+12>                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >objc8
@@ -1960,8 +1913,7 @@ sourceFile:contextualTyping.ts
 10>Emitted(104, 20) Source(133, 19) + SourceIndex(0)
 11>Emitted(104, 21) Source(133, 20) + SourceIndex(0)
 ---
->>>objc8.t10 = [({}), ({})];
-1->
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
 2 >^^^^^
 3 >     ^
 4 >      ^^^
@@ -1976,7 +1928,7 @@ sourceFile:contextualTyping.ts
 13>                      ^
 14>                       ^
 15>                        ^
-16>                         ^^^^^^->
+16>                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >objc8
@@ -2009,8 +1961,7 @@ sourceFile:contextualTyping.ts
 14>Emitted(105, 25) Source(134, 36) + SourceIndex(0)
 15>Emitted(105, 26) Source(134, 37) + SourceIndex(0)
 ---
->>>objc8.t11 = [function (n, s) {
-1->
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
 2 >^^^^^
 3 >     ^
 4 >      ^^^
@@ -2020,6 +1971,7 @@ sourceFile:contextualTyping.ts
 8 >                       ^
 9 >                        ^^
 10>                          ^
+11>                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >objc8
@@ -2042,45 +1994,43 @@ sourceFile:contextualTyping.ts
 9 >Emitted(106, 27) Source(135, 26) + SourceIndex(0)
 10>Emitted(106, 28) Source(135, 27) + SourceIndex(0)
 ---
->>>    return s;
-1 >^^^^
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
 2 >    ^^^^^^
 3 >          ^
 4 >           ^
 5 >            ^
-1 >) { 
+6 >             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->) { 
 2 >    return
 3 >           
 4 >           s
 5 >            ;
-1 >Emitted(107, 5) Source(135, 31) + SourceIndex(0)
+1->Emitted(107, 5) Source(135, 31) + SourceIndex(0)
 2 >Emitted(107, 11) Source(135, 37) + SourceIndex(0)
 3 >Emitted(107, 12) Source(135, 38) + SourceIndex(0)
 4 >Emitted(107, 13) Source(135, 39) + SourceIndex(0)
 5 >Emitted(107, 14) Source(135, 40) + SourceIndex(0)
 ---
->>>}];
-1 >
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
 2 >^
 3 > ^
 4 >  ^
-5 >   ^^^^^^^^^^^->
-1 > 
+5 >   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1-> 
 2 >}
 3 > ]
 4 >  ;
-1 >Emitted(108, 1) Source(135, 41) + SourceIndex(0)
+1->Emitted(108, 1) Source(135, 41) + SourceIndex(0)
 2 >Emitted(108, 2) Source(135, 42) + SourceIndex(0)
 3 >Emitted(108, 3) Source(135, 43) + SourceIndex(0)
 4 >Emitted(108, 4) Source(135, 44) + SourceIndex(0)
 ---
->>>objc8.t12 = {
-1->
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
 2 >^^^^^
 3 >     ^
 4 >      ^^^
 5 >         ^^^
-6 >            ^^->
+6 >            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >objc8
@@ -2093,13 +2043,13 @@ sourceFile:contextualTyping.ts
 4 >Emitted(109, 10) Source(136, 10) + SourceIndex(0)
 5 >Emitted(109, 13) Source(136, 13) + SourceIndex(0)
 ---
->>>    foo: ({})
-1->^^^^
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
 2 >    ^^^
 3 >       ^^
 4 >         ^
 5 >          ^^
 6 >            ^
+7 >             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->{
   >    
 2 >    foo
@@ -2114,24 +2064,22 @@ sourceFile:contextualTyping.ts
 5 >Emitted(110, 13) Source(137, 19) + SourceIndex(0)
 6 >Emitted(110, 14) Source(137, 20) + SourceIndex(0)
 ---
->>>};
-1 >^
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^
 2 > ^
-3 >  ^^^^^^^^^^^^^->
-1 >
+3 >  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->
   >}
 2 > 
-1 >Emitted(111, 2) Source(138, 2) + SourceIndex(0)
+1->Emitted(111, 2) Source(138, 2) + SourceIndex(0)
 2 >Emitted(111, 3) Source(138, 2) + SourceIndex(0)
 ---
->>>objc8.t13 = ({
-1->
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
 2 >^^^^^
 3 >     ^
 4 >      ^^^
 5 >         ^^^
 6 >            ^
-7 >             ^^^^^^^^^^^^->
+7 >             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >objc8
@@ -2146,14 +2094,14 @@ sourceFile:contextualTyping.ts
 5 >Emitted(112, 13) Source(139, 19) + SourceIndex(0)
 6 >Emitted(112, 14) Source(139, 20) + SourceIndex(0)
 ---
->>>    f: function (i, s) {
-1->^^^^
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
 2 >    ^
 3 >     ^^
 4 >       ^^^^^^^^^^
 5 >                 ^
 6 >                  ^^
 7 >                    ^
+8 >                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->{
   >    
 2 >    f
@@ -2170,51 +2118,50 @@ sourceFile:contextualTyping.ts
 6 >Emitted(113, 21) Source(140, 20) + SourceIndex(0)
 7 >Emitted(113, 22) Source(140, 21) + SourceIndex(0)
 ---
->>>        return s;
-1 >^^^^^^^^
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^^^^^
 2 >        ^^^^^^
 3 >              ^
 4 >               ^
 5 >                ^
-1 >) { 
+6 >                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->) { 
 2 >        return
 3 >               
 4 >               s
 5 >                ;
-1 >Emitted(114, 9) Source(140, 25) + SourceIndex(0)
+1->Emitted(114, 9) Source(140, 25) + SourceIndex(0)
 2 >Emitted(114, 15) Source(140, 31) + SourceIndex(0)
 3 >Emitted(114, 16) Source(140, 32) + SourceIndex(0)
 4 >Emitted(114, 17) Source(140, 33) + SourceIndex(0)
 5 >Emitted(114, 18) Source(140, 34) + SourceIndex(0)
 ---
->>>    }
-1 >^^^^
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
 2 >    ^
-1 > 
+3 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1-> 
 2 >    }
-1 >Emitted(115, 5) Source(140, 35) + SourceIndex(0)
+1->Emitted(115, 5) Source(140, 35) + SourceIndex(0)
 2 >Emitted(115, 6) Source(140, 36) + SourceIndex(0)
 ---
->>>});
-1 >^
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^
 2 > ^
 3 >  ^
-4 >   ^^^^^^^^^^^^->
-1 >
+4 >   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->
   >}
 2 > )
 3 >  
-1 >Emitted(116, 2) Source(141, 2) + SourceIndex(0)
+1->Emitted(116, 2) Source(141, 2) + SourceIndex(0)
 2 >Emitted(116, 3) Source(141, 3) + SourceIndex(0)
 3 >Emitted(116, 4) Source(141, 3) + SourceIndex(0)
 ---
->>>objc8.t14 = ({
-1->
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
 2 >^^^^^
 3 >     ^
 4 >      ^^^
 5 >         ^^^
 6 >            ^
+7 >             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >objc8
@@ -2229,38 +2176,37 @@ sourceFile:contextualTyping.ts
 5 >Emitted(117, 13) Source(142, 19) + SourceIndex(0)
 6 >Emitted(117, 14) Source(142, 20) + SourceIndex(0)
 ---
->>>    a: []
-1 >^^^^
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
 2 >    ^
 3 >     ^^
 4 >       ^^
-1 >{
+5 >         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->{
   >    
 2 >    a
 3 >     : 
 4 >       []
-1 >Emitted(118, 5) Source(143, 5) + SourceIndex(0)
+1->Emitted(118, 5) Source(143, 5) + SourceIndex(0)
 2 >Emitted(118, 6) Source(143, 6) + SourceIndex(0)
 3 >Emitted(118, 8) Source(143, 8) + SourceIndex(0)
 4 >Emitted(118, 10) Source(143, 10) + SourceIndex(0)
 ---
->>>});
-1 >^
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^
 2 > ^
 3 >  ^
-4 >   ^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
+4 >   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->
   >}
 2 > )
 3 >  
-1 >Emitted(119, 2) Source(144, 2) + SourceIndex(0)
+1->Emitted(119, 2) Source(144, 2) + SourceIndex(0)
 2 >Emitted(119, 3) Source(144, 3) + SourceIndex(0)
 3 >Emitted(119, 4) Source(144, 3) + SourceIndex(0)
 ---
->>>// CONTEXT: Function call
-1->
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
 2 >
 3 >^^^^^^^^^^^^^^^^^^^^^^^^^
+4 >                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >// CONTEXT: Function call
   >
@@ -2270,46 +2216,43 @@ sourceFile:contextualTyping.ts
 2 >Emitted(120, 1) Source(145, 1) + SourceIndex(0)
 3 >Emitted(120, 26) Source(145, 26) + SourceIndex(0)
 ---
->>>function c9t5(f) {
-1 >^^^^^^^^^
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^^^^^^
 2 >         ^^^^
 3 >             ^
 4 >              ^
-1 >
+5 >               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->
   >function 
 2 >         c9t5
 3 >             (
 4 >              f: (n: number) => IFoo
-1 >Emitted(121, 10) Source(146, 10) + SourceIndex(0)
+1->Emitted(121, 10) Source(146, 10) + SourceIndex(0)
 2 >Emitted(121, 14) Source(146, 14) + SourceIndex(0)
 3 >Emitted(121, 15) Source(146, 15) + SourceIndex(0)
 4 >Emitted(121, 16) Source(146, 37) + SourceIndex(0)
 ---
->>>}
-1 >
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
 2 >^
-3 > ^->
-1 >) {
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->) {
 2 >}
-1 >Emitted(122, 1) Source(146, 40) + SourceIndex(0) name (c9t5)
+1->Emitted(122, 1) Source(146, 40) + SourceIndex(0) name (c9t5)
 2 >Emitted(122, 2) Source(146, 41) + SourceIndex(0) name (c9t5)
 ---
->>>;
-1->
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
 2 >;
 1->Emitted(123, 1) Source(146, 41) + SourceIndex(0)
 2 >Emitted(123, 2) Source(146, 42) + SourceIndex(0)
 ---
->>>c9t5(function (n) {
-1->
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
 2 >^^^^
 3 >    ^
 4 >     ^^^^^^^^^^
 5 >               ^
-6 >                ^->
+6 >                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >c9t5
@@ -2322,14 +2265,14 @@ sourceFile:contextualTyping.ts
 4 >Emitted(124, 16) Source(147, 15) + SourceIndex(0)
 5 >Emitted(124, 17) Source(147, 16) + SourceIndex(0)
 ---
->>>    return ({});
-1->^^^^
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
 2 >    ^^^^^^
 3 >          ^
 4 >           ^
 5 >            ^^
 6 >              ^
 7 >               ^
+8 >                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->) {
   >    
 2 >    return
@@ -2346,26 +2289,25 @@ sourceFile:contextualTyping.ts
 6 >Emitted(125, 16) Source(148, 22) + SourceIndex(0)
 7 >Emitted(125, 17) Source(148, 23) + SourceIndex(0)
 ---
->>>});
-1 >
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
 2 >^
 3 > ^
 4 >  ^
-5 >   ^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
+5 >   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->
   >
 2 >}
 3 > )
 4 >  ;
-1 >Emitted(126, 1) Source(149, 1) + SourceIndex(0)
+1->Emitted(126, 1) Source(149, 1) + SourceIndex(0)
 2 >Emitted(126, 2) Source(149, 2) + SourceIndex(0)
 3 >Emitted(126, 3) Source(149, 3) + SourceIndex(0)
 4 >Emitted(126, 4) Source(149, 4) + SourceIndex(0)
 ---
->>>// CONTEXT: Return statement
-1->
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
 2 >
 3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+4 >                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
   >// CONTEXT: Return statement
@@ -2376,25 +2318,24 @@ sourceFile:contextualTyping.ts
 2 >Emitted(127, 1) Source(151, 1) + SourceIndex(0)
 3 >Emitted(127, 29) Source(151, 29) + SourceIndex(0)
 ---
->>>var c10t5 = function () {
-1 >^^^^
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
 2 >    ^^^^^
 3 >         ^^^
-4 >            ^^^^^^^^^^^^^^->
-1 >
+4 >            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->
   >var 
 2 >    c10t5
 3 >         : () => (n: number) => IFoo = 
-1 >Emitted(128, 5) Source(152, 5) + SourceIndex(0)
+1->Emitted(128, 5) Source(152, 5) + SourceIndex(0)
 2 >Emitted(128, 10) Source(152, 10) + SourceIndex(0)
 3 >Emitted(128, 13) Source(152, 40) + SourceIndex(0)
 ---
->>>    return function (n) {
-1->^^^^
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
 2 >    ^^^^^^
 3 >          ^
 4 >           ^^^^^^^^^^
 5 >                     ^
+6 >                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->function() { 
 2 >    return
 3 >           
@@ -2406,22 +2347,22 @@ sourceFile:contextualTyping.ts
 4 >Emitted(129, 22) Source(152, 69) + SourceIndex(0)
 5 >Emitted(129, 23) Source(152, 70) + SourceIndex(0)
 ---
->>>        return ({});
-1 >^^^^^^^^
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^^^^^
 2 >        ^^^^^^
 3 >              ^
 4 >               ^
 5 >                ^^
 6 >                  ^
 7 >                   ^
-1 >) { 
+8 >                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->) { 
 2 >        return
 3 >               <IFoo>
 4 >               (
 5 >                {}
 6 >                  )
 7 >                   
-1 >Emitted(130, 9) Source(152, 74) + SourceIndex(0)
+1->Emitted(130, 9) Source(152, 74) + SourceIndex(0)
 2 >Emitted(130, 15) Source(152, 80) + SourceIndex(0)
 3 >Emitted(130, 16) Source(152, 87) + SourceIndex(0)
 4 >Emitted(130, 17) Source(152, 88) + SourceIndex(0)
@@ -2429,34 +2370,32 @@ sourceFile:contextualTyping.ts
 6 >Emitted(130, 20) Source(152, 91) + SourceIndex(0)
 7 >Emitted(130, 21) Source(152, 91) + SourceIndex(0)
 ---
->>>    };
-1 >^^^^
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
 2 >    ^
 3 >     ^
-1 > 
+4 >      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1-> 
 2 >    }
 3 >     
-1 >Emitted(131, 5) Source(152, 92) + SourceIndex(0)
+1->Emitted(131, 5) Source(152, 92) + SourceIndex(0)
 2 >Emitted(131, 6) Source(152, 93) + SourceIndex(0)
 3 >Emitted(131, 7) Source(152, 93) + SourceIndex(0)
 ---
->>>};
-1 >
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
 2 >^
 3 > ^
-4 >  ^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 > 
+4 >  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1-> 
 2 >}
 3 > ;
-1 >Emitted(132, 1) Source(152, 94) + SourceIndex(0)
+1->Emitted(132, 1) Source(152, 94) + SourceIndex(0)
 2 >Emitted(132, 2) Source(152, 95) + SourceIndex(0)
 3 >Emitted(132, 3) Source(152, 96) + SourceIndex(0)
 ---
->>>// CONTEXT: Newing a class
-1->
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
 2 >
 3 >^^^^^^^^^^^^^^^^^^^^^^^^^^
-4 >                          ^->
+4 >                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
   >// CONTEXT: Newing a class
@@ -2467,22 +2406,21 @@ sourceFile:contextualTyping.ts
 2 >Emitted(133, 1) Source(154, 1) + SourceIndex(0)
 3 >Emitted(133, 27) Source(154, 27) + SourceIndex(0)
 ---
->>>var C11t5 = (function () {
-1->^^^^
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
 2 >    ^^^^^
-3 >         ^^^^^^^^^^^^^^^->
+3 >         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >class 
 2 >    C11t5
 1->Emitted(134, 5) Source(155, 7) + SourceIndex(0)
 2 >Emitted(134, 10) Source(155, 12) + SourceIndex(0)
 ---
->>>    function C11t5(f) {
-1->^^^^
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
 2 >    ^^^^^^^^^
 3 >             ^^^^^
 4 >                  ^
 5 >                   ^
+6 >                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1-> { 
 2 >    
 3 >             C11t5
@@ -2494,48 +2432,45 @@ sourceFile:contextualTyping.ts
 4 >Emitted(135, 20) Source(155, 27) + SourceIndex(0) name (C11t5)
 5 >Emitted(135, 21) Source(155, 49) + SourceIndex(0) name (C11t5)
 ---
->>>    }
-1 >^^^^
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
 2 >    ^
-3 >     ^^^^^^^^^^^^^->
-1 >) { 
+3 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->) { 
 2 >    }
-1 >Emitted(136, 5) Source(155, 53) + SourceIndex(0) name (C11t5.constructor)
+1->Emitted(136, 5) Source(155, 53) + SourceIndex(0) name (C11t5.constructor)
 2 >Emitted(136, 6) Source(155, 54) + SourceIndex(0) name (C11t5.constructor)
 ---
->>>    return C11t5;
-1->^^^^
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
 2 >    ^^^^^^^^^^^^
+3 >                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1-> 
 2 >    }
 1->Emitted(137, 5) Source(155, 55) + SourceIndex(0) name (C11t5)
 2 >Emitted(137, 17) Source(155, 56) + SourceIndex(0) name (C11t5)
 ---
->>>})();
-1 >
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
 2 >^
 3 > 
 4 > ^^^^
-1 >
+5 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->
 2 >}
 3 > 
 4 > class C11t5 { constructor(f: (n: number) => IFoo) { } }
-1 >Emitted(138, 1) Source(155, 55) + SourceIndex(0) name (C11t5)
+1->Emitted(138, 1) Source(155, 55) + SourceIndex(0) name (C11t5)
 2 >Emitted(138, 2) Source(155, 56) + SourceIndex(0) name (C11t5)
 3 >Emitted(138, 2) Source(155, 1) + SourceIndex(0)
 4 >Emitted(138, 6) Source(155, 56) + SourceIndex(0)
 ---
->>>;
-1 >
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->
 2 >;
-1 >Emitted(139, 1) Source(155, 56) + SourceIndex(0)
+1->Emitted(139, 1) Source(155, 56) + SourceIndex(0)
 2 >Emitted(139, 2) Source(155, 57) + SourceIndex(0)
 ---
->>>var i = new C11t5(function (n) {
-1->
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
 2 >^^^^
 3 >    ^
 4 >     ^^^
@@ -2544,6 +2479,7 @@ sourceFile:contextualTyping.ts
 7 >                 ^
 8 >                  ^^^^^^^^^^
 9 >                            ^
+10>                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >var 
@@ -2564,22 +2500,22 @@ sourceFile:contextualTyping.ts
 8 >Emitted(140, 29) Source(156, 28) + SourceIndex(0)
 9 >Emitted(140, 30) Source(156, 29) + SourceIndex(0)
 ---
->>>    return ({});
-1 >^^^^
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
 2 >    ^^^^^^
 3 >          ^
 4 >           ^
 5 >            ^^
 6 >              ^
 7 >               ^
-1 >) { 
+8 >                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->) { 
 2 >    return
 3 >           <IFoo>
 4 >           (
 5 >            {}
 6 >              )
 7 >               
-1 >Emitted(141, 5) Source(156, 33) + SourceIndex(0)
+1->Emitted(141, 5) Source(156, 33) + SourceIndex(0)
 2 >Emitted(141, 11) Source(156, 39) + SourceIndex(0)
 3 >Emitted(141, 12) Source(156, 46) + SourceIndex(0)
 4 >Emitted(141, 13) Source(156, 47) + SourceIndex(0)
@@ -2587,25 +2523,24 @@ sourceFile:contextualTyping.ts
 6 >Emitted(141, 16) Source(156, 50) + SourceIndex(0)
 7 >Emitted(141, 17) Source(156, 50) + SourceIndex(0)
 ---
->>>});
-1 >
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
 2 >^
 3 > ^
 4 >  ^
-5 >   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 > 
+5 >   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1-> 
 2 >}
 3 > )
 4 >  ;
-1 >Emitted(142, 1) Source(156, 51) + SourceIndex(0)
+1->Emitted(142, 1) Source(156, 51) + SourceIndex(0)
 2 >Emitted(142, 2) Source(156, 52) + SourceIndex(0)
 3 >Emitted(142, 3) Source(156, 53) + SourceIndex(0)
 4 >Emitted(142, 4) Source(156, 54) + SourceIndex(0)
 ---
->>>// CONTEXT: Type annotated expression
-1->
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
 2 >
 3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+4 >                                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
   >// CONTEXT: Type annotated expression
@@ -2616,65 +2551,64 @@ sourceFile:contextualTyping.ts
 2 >Emitted(143, 1) Source(158, 1) + SourceIndex(0)
 3 >Emitted(143, 38) Source(158, 38) + SourceIndex(0)
 ---
->>>var c12t1 = (function (s) {
-1 >^^^^
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
 2 >    ^^^^^
 3 >         ^^^
 4 >            ^
 5 >             ^^^^^^^^^^
 6 >                       ^
-1 >
+7 >                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->
   >var 
 2 >    c12t1
 3 >          = <(s: string) => string> 
 4 >            (
 5 >             function(
 6 >                       s
-1 >Emitted(144, 5) Source(159, 5) + SourceIndex(0)
+1->Emitted(144, 5) Source(159, 5) + SourceIndex(0)
 2 >Emitted(144, 10) Source(159, 10) + SourceIndex(0)
 3 >Emitted(144, 13) Source(159, 37) + SourceIndex(0)
 4 >Emitted(144, 14) Source(159, 38) + SourceIndex(0)
 5 >Emitted(144, 24) Source(159, 47) + SourceIndex(0)
 6 >Emitted(144, 25) Source(159, 48) + SourceIndex(0)
 ---
->>>    return s;
-1 >^^^^
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
 2 >    ^^^^^^
 3 >          ^
 4 >           ^
 5 >            ^
-1 >) { 
+6 >             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->) { 
 2 >    return
 3 >           
 4 >           s
 5 >            
-1 >Emitted(145, 5) Source(159, 52) + SourceIndex(0)
+1->Emitted(145, 5) Source(159, 52) + SourceIndex(0)
 2 >Emitted(145, 11) Source(159, 58) + SourceIndex(0)
 3 >Emitted(145, 12) Source(159, 59) + SourceIndex(0)
 4 >Emitted(145, 13) Source(159, 60) + SourceIndex(0)
 5 >Emitted(145, 14) Source(159, 60) + SourceIndex(0)
 ---
->>>});
-1 >
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
 2 >^
 3 > ^
 4 >  ^
-5 >   ^^^^^^^^^^^^->
-1 > 
+5 >   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1-> 
 2 >}
 3 > )
 4 >  ;
-1 >Emitted(146, 1) Source(159, 61) + SourceIndex(0)
+1->Emitted(146, 1) Source(159, 61) + SourceIndex(0)
 2 >Emitted(146, 2) Source(159, 62) + SourceIndex(0)
 3 >Emitted(146, 3) Source(159, 63) + SourceIndex(0)
 4 >Emitted(146, 4) Source(159, 64) + SourceIndex(0)
 ---
->>>var c12t2 = ({
-1->
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
 2 >^^^^
 3 >    ^^^^^
 4 >         ^^^
 5 >            ^
+6 >             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >var 
@@ -2687,42 +2621,40 @@ sourceFile:contextualTyping.ts
 4 >Emitted(147, 13) Source(160, 20) + SourceIndex(0)
 5 >Emitted(147, 14) Source(160, 21) + SourceIndex(0)
 ---
->>>    n: 1
-1 >^^^^
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
 2 >    ^
 3 >     ^^
 4 >       ^
-1 >{
+5 >        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->{
   >    
 2 >    n
 3 >     : 
 4 >       1
-1 >Emitted(148, 5) Source(161, 5) + SourceIndex(0)
+1->Emitted(148, 5) Source(161, 5) + SourceIndex(0)
 2 >Emitted(148, 6) Source(161, 6) + SourceIndex(0)
 3 >Emitted(148, 8) Source(161, 8) + SourceIndex(0)
 4 >Emitted(148, 9) Source(161, 9) + SourceIndex(0)
 ---
->>>});
-1 >^
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^
 2 > ^
 3 >  ^
-4 >   ^^^^^^^^^^^^^->
-1 >
+4 >   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->
   >}
 2 > )
 3 >  ;
-1 >Emitted(149, 2) Source(162, 2) + SourceIndex(0)
+1->Emitted(149, 2) Source(162, 2) + SourceIndex(0)
 2 >Emitted(149, 3) Source(162, 3) + SourceIndex(0)
 3 >Emitted(149, 4) Source(162, 4) + SourceIndex(0)
 ---
->>>var c12t3 = [];
-1->
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
 2 >^^^^
 3 >    ^^^^^
 4 >         ^^^
 5 >            ^^
 6 >              ^
-7 >               ^^^^^^^^^^^->
+7 >               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >var 
@@ -2737,12 +2669,11 @@ sourceFile:contextualTyping.ts
 5 >Emitted(150, 15) Source(163, 26) + SourceIndex(0)
 6 >Emitted(150, 16) Source(163, 27) + SourceIndex(0)
 ---
->>>var c12t4 = function () {
-1->
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
 2 >^^^^
 3 >    ^^^^^
 4 >         ^^^
-5 >            ^^^^^->
+5 >            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >var 
@@ -2753,14 +2684,14 @@ sourceFile:contextualTyping.ts
 3 >Emitted(151, 10) Source(164, 10) + SourceIndex(0)
 4 >Emitted(151, 13) Source(164, 26) + SourceIndex(0)
 ---
->>>    return ({});
-1->^^^^
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
 2 >    ^^^^^^
 3 >          ^
 4 >           ^
 5 >            ^^
 6 >              ^
 7 >               ^
+8 >                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->function() { 
 2 >    return
 3 >           <IFoo>
@@ -2776,25 +2707,24 @@ sourceFile:contextualTyping.ts
 6 >Emitted(152, 16) Source(164, 56) + SourceIndex(0)
 7 >Emitted(152, 17) Source(164, 56) + SourceIndex(0)
 ---
->>>};
-1 >
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
 2 >^
 3 > ^
-4 >  ^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 > 
+4 >  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1-> 
 2 >}
 3 > ;
-1 >Emitted(153, 1) Source(164, 57) + SourceIndex(0)
+1->Emitted(153, 1) Source(164, 57) + SourceIndex(0)
 2 >Emitted(153, 2) Source(164, 58) + SourceIndex(0)
 3 >Emitted(153, 3) Source(164, 59) + SourceIndex(0)
 ---
->>>var c12t5 = function (n) {
-1->
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
 2 >^^^^
 3 >    ^^^^^
 4 >         ^^^
 5 >            ^^^^^^^^^^
 6 >                      ^
+7 >                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >var 
@@ -2809,22 +2739,22 @@ sourceFile:contextualTyping.ts
 5 >Emitted(154, 23) Source(165, 44) + SourceIndex(0)
 6 >Emitted(154, 24) Source(165, 45) + SourceIndex(0)
 ---
->>>    return ({});
-1 >^^^^
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
 2 >    ^^^^^^
 3 >          ^
 4 >           ^
 5 >            ^^
 6 >              ^
 7 >               ^
-1 >) { 
+8 >                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->) { 
 2 >    return
 3 >           <IFoo>
 4 >           (
 5 >            {}
 6 >              )
 7 >               
-1 >Emitted(155, 5) Source(165, 49) + SourceIndex(0)
+1->Emitted(155, 5) Source(165, 49) + SourceIndex(0)
 2 >Emitted(155, 11) Source(165, 55) + SourceIndex(0)
 3 >Emitted(155, 12) Source(165, 62) + SourceIndex(0)
 4 >Emitted(155, 13) Source(165, 63) + SourceIndex(0)
@@ -2832,20 +2762,18 @@ sourceFile:contextualTyping.ts
 6 >Emitted(155, 16) Source(165, 66) + SourceIndex(0)
 7 >Emitted(155, 17) Source(165, 66) + SourceIndex(0)
 ---
->>>};
-1 >
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
 2 >^
 3 > ^
-4 >  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 > 
+4 >  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1-> 
 2 >}
 3 > ;
-1 >Emitted(156, 1) Source(165, 67) + SourceIndex(0)
+1->Emitted(156, 1) Source(165, 67) + SourceIndex(0)
 2 >Emitted(156, 2) Source(165, 68) + SourceIndex(0)
 3 >Emitted(156, 3) Source(165, 69) + SourceIndex(0)
 ---
->>>var c12t6 = function (n, s) {
-1->
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
 2 >^^^^
 3 >    ^^^^^
 4 >         ^^^
@@ -2853,6 +2781,7 @@ sourceFile:contextualTyping.ts
 6 >                      ^
 7 >                       ^^
 8 >                         ^
+9 >                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >var 
@@ -2871,22 +2800,22 @@ sourceFile:contextualTyping.ts
 7 >Emitted(157, 26) Source(166, 58) + SourceIndex(0)
 8 >Emitted(157, 27) Source(166, 59) + SourceIndex(0)
 ---
->>>    return ({});
-1 >^^^^
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
 2 >    ^^^^^^
 3 >          ^
 4 >           ^
 5 >            ^^
 6 >              ^
 7 >               ^
-1 >) { 
+8 >                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->) { 
 2 >    return
 3 >           <IFoo>
 4 >           (
 5 >            {}
 6 >              )
 7 >               
-1 >Emitted(158, 5) Source(166, 63) + SourceIndex(0)
+1->Emitted(158, 5) Source(166, 63) + SourceIndex(0)
 2 >Emitted(158, 11) Source(166, 69) + SourceIndex(0)
 3 >Emitted(158, 12) Source(166, 76) + SourceIndex(0)
 4 >Emitted(158, 13) Source(166, 77) + SourceIndex(0)
@@ -2894,25 +2823,24 @@ sourceFile:contextualTyping.ts
 6 >Emitted(158, 16) Source(166, 80) + SourceIndex(0)
 7 >Emitted(158, 17) Source(166, 80) + SourceIndex(0)
 ---
->>>};
-1 >
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
 2 >^
 3 > ^
-4 >  ^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 > 
+4 >  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1-> 
 2 >}
 3 > ;
-1 >Emitted(159, 1) Source(166, 81) + SourceIndex(0)
+1->Emitted(159, 1) Source(166, 81) + SourceIndex(0)
 2 >Emitted(159, 2) Source(166, 82) + SourceIndex(0)
 3 >Emitted(159, 3) Source(166, 83) + SourceIndex(0)
 ---
->>>var c12t7 = function (n) {
-1->
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
 2 >^^^^
 3 >    ^^^^^
 4 >         ^^^
 5 >            ^^^^^^^^^^
 6 >                      ^
+7 >                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >var 
@@ -2930,42 +2858,41 @@ sourceFile:contextualTyping.ts
 5 >Emitted(160, 23) Source(170, 13) + SourceIndex(0)
 6 >Emitted(160, 24) Source(170, 21) + SourceIndex(0)
 ---
->>>    return n;
-1 >^^^^
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
 2 >    ^^^^^^
 3 >          ^
 4 >           ^
 5 >            ^
-1 >) { 
+6 >             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->) { 
 2 >    return
 3 >           
 4 >           n
 5 >            
-1 >Emitted(161, 5) Source(170, 25) + SourceIndex(0)
+1->Emitted(161, 5) Source(170, 25) + SourceIndex(0)
 2 >Emitted(161, 11) Source(170, 31) + SourceIndex(0)
 3 >Emitted(161, 12) Source(170, 32) + SourceIndex(0)
 4 >Emitted(161, 13) Source(170, 33) + SourceIndex(0)
 5 >Emitted(161, 14) Source(170, 33) + SourceIndex(0)
 ---
->>>};
-1 >
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
 2 >^
 3 > ^
-4 >  ^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 > 
+4 >  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1-> 
 2 >}
 3 > ;
-1 >Emitted(162, 1) Source(170, 34) + SourceIndex(0)
+1->Emitted(162, 1) Source(170, 34) + SourceIndex(0)
 2 >Emitted(162, 2) Source(170, 35) + SourceIndex(0)
 3 >Emitted(162, 3) Source(170, 36) + SourceIndex(0)
 ---
->>>var c12t8 = function (n) {
-1->
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
 2 >^^^^
 3 >    ^^^^^
 4 >         ^^^
 5 >            ^^^^^^^^^^
 6 >                      ^
+7 >                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
   >
@@ -2981,37 +2908,35 @@ sourceFile:contextualTyping.ts
 5 >Emitted(163, 23) Source(172, 57) + SourceIndex(0)
 6 >Emitted(163, 24) Source(172, 58) + SourceIndex(0)
 ---
->>>    return n;
-1 >^^^^
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
 2 >    ^^^^^^
 3 >          ^
 4 >           ^
 5 >            ^
-1 >) { 
+6 >             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->) { 
 2 >    return
 3 >           
 4 >           n
 5 >            ;
-1 >Emitted(164, 5) Source(172, 62) + SourceIndex(0)
+1->Emitted(164, 5) Source(172, 62) + SourceIndex(0)
 2 >Emitted(164, 11) Source(172, 68) + SourceIndex(0)
 3 >Emitted(164, 12) Source(172, 69) + SourceIndex(0)
 4 >Emitted(164, 13) Source(172, 70) + SourceIndex(0)
 5 >Emitted(164, 14) Source(172, 71) + SourceIndex(0)
 ---
->>>};
-1 >
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
 2 >^
 3 > ^
-4 >  ^^^^^^^^^^^^^^^^^^^^->
-1 > 
+4 >  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1-> 
 2 >}
 3 > ;
-1 >Emitted(165, 1) Source(172, 72) + SourceIndex(0)
+1->Emitted(165, 1) Source(172, 72) + SourceIndex(0)
 2 >Emitted(165, 2) Source(172, 73) + SourceIndex(0)
 3 >Emitted(165, 3) Source(172, 74) + SourceIndex(0)
 ---
->>>var c12t9 = [[], []];
-1->
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
 2 >^^^^
 3 >    ^^^^^
 4 >         ^^^
@@ -3021,7 +2946,7 @@ sourceFile:contextualTyping.ts
 8 >                 ^^
 9 >                   ^
 10>                    ^
-11>                     ^^^^^^->
+11>                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >var 
@@ -3044,8 +2969,7 @@ sourceFile:contextualTyping.ts
 9 >Emitted(166, 21) Source(173, 33) + SourceIndex(0)
 10>Emitted(166, 22) Source(173, 34) + SourceIndex(0)
 ---
->>>var c12t10 = [({}), ({})];
-1->
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
 2 >^^^^
 3 >    ^^^^^^
 4 >          ^^^
@@ -3059,7 +2983,7 @@ sourceFile:contextualTyping.ts
 12>                       ^
 13>                        ^
 14>                         ^
-15>                          ^^^^^^->
+15>                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >var 
@@ -3090,8 +3014,7 @@ sourceFile:contextualTyping.ts
 13>Emitted(167, 26) Source(174, 46) + SourceIndex(0)
 14>Emitted(167, 27) Source(174, 47) + SourceIndex(0)
 ---
->>>var c12t11 = [function (n, s) {
-1->
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
 2 >^^^^
 3 >    ^^^^^^
 4 >          ^^^
@@ -3100,6 +3023,7 @@ sourceFile:contextualTyping.ts
 7 >                        ^
 8 >                         ^^
 9 >                           ^
+10>                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >var 
@@ -3120,44 +3044,42 @@ sourceFile:contextualTyping.ts
 8 >Emitted(168, 28) Source(175, 65) + SourceIndex(0)
 9 >Emitted(168, 29) Source(175, 66) + SourceIndex(0)
 ---
->>>    return s;
-1 >^^^^
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
 2 >    ^^^^^^
 3 >          ^
 4 >           ^
 5 >            ^
-1 >) { 
+6 >             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->) { 
 2 >    return
 3 >           
 4 >           s
 5 >            ;
-1 >Emitted(169, 5) Source(175, 70) + SourceIndex(0)
+1->Emitted(169, 5) Source(175, 70) + SourceIndex(0)
 2 >Emitted(169, 11) Source(175, 76) + SourceIndex(0)
 3 >Emitted(169, 12) Source(175, 77) + SourceIndex(0)
 4 >Emitted(169, 13) Source(175, 78) + SourceIndex(0)
 5 >Emitted(169, 14) Source(175, 79) + SourceIndex(0)
 ---
->>>}];
-1 >
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
 2 >^
 3 > ^
 4 >  ^
-5 >   ^^^^^^^^^^^^->
-1 > 
+5 >   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1-> 
 2 >}
 3 > ]
 4 >  ;
-1 >Emitted(170, 1) Source(175, 80) + SourceIndex(0)
+1->Emitted(170, 1) Source(175, 80) + SourceIndex(0)
 2 >Emitted(170, 2) Source(175, 81) + SourceIndex(0)
 3 >Emitted(170, 3) Source(175, 82) + SourceIndex(0)
 4 >Emitted(170, 4) Source(175, 83) + SourceIndex(0)
 ---
->>>var c12t12 = {
-1->
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
 2 >^^^^
 3 >    ^^^^^^
 4 >          ^^^
-5 >             ^->
+5 >             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >var 
@@ -3168,13 +3090,13 @@ sourceFile:contextualTyping.ts
 3 >Emitted(171, 11) Source(176, 11) + SourceIndex(0)
 4 >Emitted(171, 14) Source(176, 21) + SourceIndex(0)
 ---
->>>    foo: ({})
-1->^^^^
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
 2 >    ^^^
 3 >       ^^
 4 >         ^
 5 >          ^^
 6 >            ^
+7 >             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->{
   >    
 2 >    foo
@@ -3189,23 +3111,21 @@ sourceFile:contextualTyping.ts
 5 >Emitted(172, 13) Source(177, 19) + SourceIndex(0)
 6 >Emitted(172, 14) Source(177, 20) + SourceIndex(0)
 ---
->>>};
-1 >^
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^
 2 > ^
-3 >  ^^^^^^^^^^^^^^->
-1 >
+3 >  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->
   >}
 2 > 
-1 >Emitted(173, 2) Source(178, 2) + SourceIndex(0)
+1->Emitted(173, 2) Source(178, 2) + SourceIndex(0)
 2 >Emitted(173, 3) Source(178, 2) + SourceIndex(0)
 ---
->>>var c12t13 = ({
-1->
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
 2 >^^^^
 3 >    ^^^^^^
 4 >          ^^^
 5 >             ^
-6 >              ^^^^^^^^^^^->
+6 >              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >var 
@@ -3218,14 +3138,14 @@ sourceFile:contextualTyping.ts
 4 >Emitted(174, 14) Source(179, 21) + SourceIndex(0)
 5 >Emitted(174, 15) Source(179, 22) + SourceIndex(0)
 ---
->>>    f: function (i, s) {
-1->^^^^
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
 2 >    ^
 3 >     ^^
 4 >       ^^^^^^^^^^
 5 >                 ^
 6 >                  ^^
 7 >                    ^
+8 >                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->{
   >    
 2 >    f
@@ -3242,50 +3162,49 @@ sourceFile:contextualTyping.ts
 6 >Emitted(175, 21) Source(180, 20) + SourceIndex(0)
 7 >Emitted(175, 22) Source(180, 21) + SourceIndex(0)
 ---
->>>        return s;
-1 >^^^^^^^^
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^^^^^
 2 >        ^^^^^^
 3 >              ^
 4 >               ^
 5 >                ^
-1 >) { 
+6 >                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->) { 
 2 >        return
 3 >               
 4 >               s
 5 >                ;
-1 >Emitted(176, 9) Source(180, 25) + SourceIndex(0)
+1->Emitted(176, 9) Source(180, 25) + SourceIndex(0)
 2 >Emitted(176, 15) Source(180, 31) + SourceIndex(0)
 3 >Emitted(176, 16) Source(180, 32) + SourceIndex(0)
 4 >Emitted(176, 17) Source(180, 33) + SourceIndex(0)
 5 >Emitted(176, 18) Source(180, 34) + SourceIndex(0)
 ---
->>>    }
-1 >^^^^
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
 2 >    ^
-1 > 
+3 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1-> 
 2 >    }
-1 >Emitted(177, 5) Source(180, 35) + SourceIndex(0)
+1->Emitted(177, 5) Source(180, 35) + SourceIndex(0)
 2 >Emitted(177, 6) Source(180, 36) + SourceIndex(0)
 ---
->>>});
-1 >^
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^
 2 > ^
 3 >  ^
-4 >   ^^^^^^^^^^^^^->
-1 >
+4 >   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->
   >}
 2 > )
 3 >  
-1 >Emitted(178, 2) Source(181, 2) + SourceIndex(0)
+1->Emitted(178, 2) Source(181, 2) + SourceIndex(0)
 2 >Emitted(178, 3) Source(181, 3) + SourceIndex(0)
 3 >Emitted(178, 4) Source(181, 3) + SourceIndex(0)
 ---
->>>var c12t14 = ({
-1->
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
 2 >^^^^
 3 >    ^^^^^^
 4 >          ^^^
 5 >             ^
+6 >              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
 2 >var 
@@ -3298,43 +3217,41 @@ sourceFile:contextualTyping.ts
 4 >Emitted(179, 14) Source(182, 21) + SourceIndex(0)
 5 >Emitted(179, 15) Source(182, 22) + SourceIndex(0)
 ---
->>>    a: []
-1 >^^^^
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
 2 >    ^
 3 >     ^^
 4 >       ^^
-1 >{
+5 >         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->{
   >    
 2 >    a
 3 >     : 
 4 >       []
-1 >Emitted(180, 5) Source(183, 5) + SourceIndex(0)
+1->Emitted(180, 5) Source(183, 5) + SourceIndex(0)
 2 >Emitted(180, 6) Source(183, 6) + SourceIndex(0)
 3 >Emitted(180, 8) Source(183, 8) + SourceIndex(0)
 4 >Emitted(180, 10) Source(183, 10) + SourceIndex(0)
 ---
->>>});
-1 >^
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^
 2 > ^
 3 >  ^
-4 >   ^^^^^^^^^^^^^^^^^^->
-1 >
+4 >   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->
   >}
 2 > )
 3 >  
-1 >Emitted(181, 2) Source(184, 2) + SourceIndex(0)
+1->Emitted(181, 2) Source(184, 2) + SourceIndex(0)
 2 >Emitted(181, 3) Source(184, 3) + SourceIndex(0)
 3 >Emitted(181, 4) Source(184, 3) + SourceIndex(0)
 ---
->>>function EF1(a, b) {
-1->
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
 2 >^^^^^^^^^
 3 >         ^^^
 4 >            ^
 5 >             ^
 6 >              ^^
 7 >                ^
-8 >                 ^->
+8 >                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
   >// CONTEXT: Contextual typing declarations
@@ -3357,14 +3274,14 @@ sourceFile:contextualTyping.ts
 6 >Emitted(182, 17) Source(191, 16) + SourceIndex(0)
 7 >Emitted(182, 18) Source(191, 17) + SourceIndex(0)
 ---
->>>    return a + b;
-1->^^^^
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
 2 >    ^^^^^^
 3 >          ^
 4 >           ^
 5 >            ^^^
 6 >               ^
 7 >                ^
+8 >                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->) { 
 2 >    return
 3 >           
@@ -3380,17 +3297,15 @@ sourceFile:contextualTyping.ts
 6 >Emitted(183, 17) Source(191, 31) + SourceIndex(0) name (EF1)
 7 >Emitted(183, 18) Source(191, 32) + SourceIndex(0) name (EF1)
 ---
->>>}
-1 >
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^->
-1 > 
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1-> 
 2 >}
-1 >Emitted(184, 1) Source(191, 33) + SourceIndex(0) name (EF1)
+1->Emitted(184, 1) Source(191, 33) + SourceIndex(0) name (EF1)
 2 >Emitted(184, 2) Source(191, 34) + SourceIndex(0) name (EF1)
 ---
->>>var efv = EF1(1, 2);
-1->
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
 2 >^^^^
 3 >    ^^^
 4 >       ^^^
@@ -3401,7 +3316,7 @@ sourceFile:contextualTyping.ts
 9 >                 ^
 10>                  ^
 11>                   ^
-12>                    ^^^->
+12>                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
   >
@@ -3427,14 +3342,14 @@ sourceFile:contextualTyping.ts
 10>Emitted(185, 20) Source(193, 19) + SourceIndex(0)
 11>Emitted(185, 21) Source(193, 20) + SourceIndex(0)
 ---
->>>function Point(x, y) {
-1->
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
 2 >^^^^^^^^^
 3 >         ^^^^^
 4 >              ^
 5 >               ^
 6 >                ^^
 7 >                  ^
+8 >                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
   >
@@ -3464,16 +3379,15 @@ sourceFile:contextualTyping.ts
 6 >Emitted(186, 19) Source(207, 19) + SourceIndex(0)
 7 >Emitted(186, 20) Source(207, 20) + SourceIndex(0)
 ---
->>>    this.x = x;
-1 >^^^^
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
 2 >    ^^^^
 3 >        ^
 4 >         ^
 5 >          ^^^
 6 >             ^
 7 >              ^
-8 >               ^->
-1 >) {
+8 >               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->) {
   >    
 2 >    this
 3 >        .
@@ -3481,7 +3395,7 @@ sourceFile:contextualTyping.ts
 5 >           = 
 6 >             x
 7 >              ;
-1 >Emitted(187, 5) Source(208, 5) + SourceIndex(0) name (Point)
+1->Emitted(187, 5) Source(208, 5) + SourceIndex(0) name (Point)
 2 >Emitted(187, 9) Source(208, 9) + SourceIndex(0) name (Point)
 3 >Emitted(187, 10) Source(208, 10) + SourceIndex(0) name (Point)
 4 >Emitted(187, 11) Source(208, 11) + SourceIndex(0) name (Point)
@@ -3489,15 +3403,14 @@ sourceFile:contextualTyping.ts
 6 >Emitted(187, 15) Source(208, 15) + SourceIndex(0) name (Point)
 7 >Emitted(187, 16) Source(208, 16) + SourceIndex(0) name (Point)
 ---
->>>    this.y = y;
-1->^^^^
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
 2 >    ^^^^
 3 >        ^
 4 >         ^
 5 >          ^^^
 6 >             ^
 7 >              ^
-8 >               ^^->
+8 >               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >    
 2 >    this
@@ -3514,12 +3427,12 @@ sourceFile:contextualTyping.ts
 6 >Emitted(188, 15) Source(209, 15) + SourceIndex(0) name (Point)
 7 >Emitted(188, 16) Source(209, 16) + SourceIndex(0) name (Point)
 ---
->>>    return this;
-1->^^^^
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
 2 >    ^^^^^^
 3 >          ^
 4 >           ^^^^
 5 >               ^
+6 >                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
   >    
@@ -3533,18 +3446,16 @@ sourceFile:contextualTyping.ts
 4 >Emitted(189, 16) Source(211, 16) + SourceIndex(0) name (Point)
 5 >Emitted(189, 17) Source(211, 17) + SourceIndex(0) name (Point)
 ---
->>>}
-1 >
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->
   >
 2 >}
-1 >Emitted(190, 1) Source(212, 1) + SourceIndex(0) name (Point)
+1->Emitted(190, 1) Source(212, 1) + SourceIndex(0) name (Point)
 2 >Emitted(190, 2) Source(212, 2) + SourceIndex(0) name (Point)
 ---
->>>Point.origin = new Point(0, 0);
-1->
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
 2 >^^^^^
 3 >     ^
 4 >      ^^^^^^
@@ -3557,7 +3468,7 @@ sourceFile:contextualTyping.ts
 11>                            ^
 12>                             ^
 13>                              ^
-14>                               ^^^^^^^^^^^->
+14>                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
   >
@@ -3587,8 +3498,7 @@ sourceFile:contextualTyping.ts
 12>Emitted(191, 31) Source(214, 31) + SourceIndex(0)
 13>Emitted(191, 32) Source(214, 32) + SourceIndex(0)
 ---
->>>Point.prototype.add = function (dx, dy) {
-1->
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
 2 >^^^^^
 3 >     ^
 4 >      ^^^^^^^^^
@@ -3599,7 +3509,7 @@ sourceFile:contextualTyping.ts
 9 >                                ^^
 10>                                  ^^
 11>                                    ^^
-12>                                      ^^^^^^^^^^->
+12>                                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
   >
@@ -3625,8 +3535,7 @@ sourceFile:contextualTyping.ts
 10>Emitted(192, 37) Source(216, 36) + SourceIndex(0)
 11>Emitted(192, 39) Source(216, 38) + SourceIndex(0)
 ---
->>>    return new Point(this.x + dx, this.y + dy);
-1->^^^^
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
 2 >    ^^^^^^
 3 >          ^
 4 >           ^^^^
@@ -3645,6 +3554,7 @@ sourceFile:contextualTyping.ts
 17>                                           ^^
 18>                                             ^
 19>                                              ^
+20>                                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->) {
   >    
 2 >    return
@@ -3685,25 +3595,24 @@ sourceFile:contextualTyping.ts
 18>Emitted(193, 47) Source(217, 47) + SourceIndex(0)
 19>Emitted(193, 48) Source(217, 48) + SourceIndex(0)
 ---
->>>};
-1 >
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
 2 >^
 3 > ^
-4 >  ^^^^^^^^^^^^^^^^^^->
-1 >
+4 >  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->
   >
 2 >}
 3 > ;
-1 >Emitted(194, 1) Source(218, 1) + SourceIndex(0)
+1->Emitted(194, 1) Source(218, 1) + SourceIndex(0)
 2 >Emitted(194, 2) Source(218, 2) + SourceIndex(0)
 3 >Emitted(194, 3) Source(218, 3) + SourceIndex(0)
 ---
->>>Point.prototype = {
-1->
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
 2 >^^^^^
 3 >     ^
 4 >      ^^^^^^^^^
 5 >               ^^^
+6 >                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
   >
@@ -3717,28 +3626,26 @@ sourceFile:contextualTyping.ts
 4 >Emitted(195, 16) Source(220, 16) + SourceIndex(0)
 5 >Emitted(195, 19) Source(220, 19) + SourceIndex(0)
 ---
->>>    x: 0,
-1 >^^^^
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
 2 >    ^
 3 >     ^^
 4 >       ^
-5 >        ^^->
-1 >{
+5 >        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->{
   >    
 2 >    x
 3 >     : 
 4 >       0
-1 >Emitted(196, 5) Source(221, 5) + SourceIndex(0)
+1->Emitted(196, 5) Source(221, 5) + SourceIndex(0)
 2 >Emitted(196, 6) Source(221, 6) + SourceIndex(0)
 3 >Emitted(196, 8) Source(221, 8) + SourceIndex(0)
 4 >Emitted(196, 9) Source(221, 9) + SourceIndex(0)
 ---
->>>    y: 0,
-1->^^^^
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
 2 >    ^
 3 >     ^^
 4 >       ^
-5 >        ^^^^^^^^^^^^^^^^^^^^^->
+5 >        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->,
   >    
 2 >    y
@@ -3749,15 +3656,14 @@ sourceFile:contextualTyping.ts
 3 >Emitted(197, 8) Source(222, 8) + SourceIndex(0)
 4 >Emitted(197, 9) Source(222, 9) + SourceIndex(0)
 ---
->>>    add: function (dx, dy) {
-1->^^^^
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
 2 >    ^^^
 3 >       ^^
 4 >         ^^^^^^^^^^
 5 >                   ^^
 6 >                     ^^
 7 >                       ^^
-8 >                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+8 >                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->,
   >    
 2 >    add
@@ -3774,8 +3680,7 @@ sourceFile:contextualTyping.ts
 6 >Emitted(198, 24) Source(223, 23) + SourceIndex(0)
 7 >Emitted(198, 26) Source(223, 25) + SourceIndex(0)
 ---
->>>        return new Point(this.x + dx, this.y + dy);
-1->^^^^^^^^
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^^^^^
 2 >        ^^^^^^
 3 >              ^
 4 >               ^^^^
@@ -3794,6 +3699,7 @@ sourceFile:contextualTyping.ts
 17>                                               ^^
 18>                                                 ^
 19>                                                  ^
+20>                                                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->) {
   >        
 2 >        return
@@ -3834,33 +3740,31 @@ sourceFile:contextualTyping.ts
 18>Emitted(199, 51) Source(224, 51) + SourceIndex(0)
 19>Emitted(199, 52) Source(224, 52) + SourceIndex(0)
 ---
->>>    }
-1 >^^^^
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^^^^
 2 >    ^
-1 >
+3 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->
   >    
 2 >    }
-1 >Emitted(200, 5) Source(225, 5) + SourceIndex(0)
+1->Emitted(200, 5) Source(225, 5) + SourceIndex(0)
 2 >Emitted(200, 6) Source(225, 6) + SourceIndex(0)
 ---
->>>};
-1 >^
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->^
 2 > ^
-3 >  ^^^^^^^^^^->
-1 >
+3 >  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->
   >}
 2 > ;
-1 >Emitted(201, 2) Source(226, 2) + SourceIndex(0)
+1->Emitted(201, 2) Source(226, 2) + SourceIndex(0)
 2 >Emitted(201, 3) Source(226, 3) + SourceIndex(0)
 ---
->>>var x = {};
-1->
+>>>// CONTEXT: Class property declaration\nvar C1T5 = (function () {\n    function C1T5() {\n        this.foo = function (i) {\n            return i;\n        };\n    }\n    return C1T5;\n})();\n// CONTEXT: Module property declaration\nvar C2T5;\n(function (C2T5) {\n    C2T5.foo = function (i) {\n        return i;\n    };\n})(C2T5 || (C2T5 = {}));\n// CONTEXT: Variable declaration\nvar c3t1 = (function (s) {\n    return s;\n});\nvar c3t2 = ({\n    n: 1\n});\nvar c3t3 = [];\nvar c3t4 = function () {\n    return ({});\n};\nvar c3t5 = function (n) {\n    return ({});\n};\nvar c3t6 = function (n, s) {\n    return ({});\n};\nvar c3t7 = function (n) {\n    return n;\n};\nvar c3t8 = function (n) {\n    return n;\n};\nvar c3t9 = [[], []];\nvar c3t10 = [({}), ({})];\nvar c3t11 = [function (n, s) {\n    return s;\n}];\nvar c3t12 = {\n    foo: ({})\n};\nvar c3t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c3t14 = ({\n    a: []\n});\n// CONTEXT: Class property assignment\nvar C4T5 = (function () {\n    function C4T5() {\n        this.foo = function (i, s) {\n            return s;\n        };\n    }\n    return C4T5;\n})();\n// CONTEXT: Module property assignment\nvar C5T5;\n(function (C5T5) {\n    C5T5.foo;\n    C5T5.foo = function (i, s) {\n        return s;\n    };\n})(C5T5 || (C5T5 = {}));\n// CONTEXT: Variable assignment\nvar c6t5;\nc6t5 = function (n) {\n    return ({});\n};\n// CONTEXT: Array index assignment\nvar c7t2;\nc7t2[0] = ({ n: 1 });\nvar objc8 = ({});\nobjc8.t1 = (function (s) {\n    return s;\n});\nobjc8.t2 = ({\n    n: 1\n});\nobjc8.t3 = [];\nobjc8.t4 = function () {\n    return ({});\n};\nobjc8.t5 = function (n) {\n    return ({});\n};\nobjc8.t6 = function (n, s) {\n    return ({});\n};\nobjc8.t7 = function (n) {\n    return n;\n};\nobjc8.t8 = function (n) {\n    return n;\n};\nobjc8.t9 = [[], []];\nobjc8.t10 = [({}), ({})];\nobjc8.t11 = [function (n, s) {\n    return s;\n}];\nobjc8.t12 = {\n    foo: ({})\n};\nobjc8.t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nobjc8.t14 = ({\n    a: []\n});\n// CONTEXT: Function call\nfunction c9t5(f) {\n}\n;\nc9t5(function (n) {\n    return ({});\n});\n// CONTEXT: Return statement\nvar c10t5 = function () {\n    return function (n) {\n        return ({});\n    };\n};\n// CONTEXT: Newing a class\nvar C11t5 = (function () {\n    function C11t5(f) {\n    }\n    return C11t5;\n})();\n;\nvar i = new C11t5(function (n) {\n    return ({});\n});\n// CONTEXT: Type annotated expression\nvar c12t1 = (function (s) {\n    return s;\n});\nvar c12t2 = ({\n    n: 1\n});\nvar c12t3 = [];\nvar c12t4 = function () {\n    return ({});\n};\nvar c12t5 = function (n) {\n    return ({});\n};\nvar c12t6 = function (n, s) {\n    return ({});\n};\nvar c12t7 = function (n) {\n    return n;\n};\nvar c12t8 = function (n) {\n    return n;\n};\nvar c12t9 = [[], []];\nvar c12t10 = [({}), ({})];\nvar c12t11 = [function (n, s) {\n    return s;\n}];\nvar c12t12 = {\n    foo: ({})\n};\nvar c12t13 = ({\n    f: function (i, s) {\n        return s;\n    }\n});\nvar c12t14 = ({\n    a: []\n});\nfunction EF1(a, b) {\n    return a + b;\n}\nvar efv = EF1(1, 2);\nfunction Point(x, y) {\n    this.x = x;\n    this.y = y;\n    return this;\n}\nPoint.origin = new Point(0, 0);\nPoint.prototype.add = function (dx, dy) {\n    return new Point(this.x + dx, this.y + dy);\n};\nPoint.prototype = {\n    x: 0,\n    y: 0,\n    add: function (dx, dy) {\n        return new Point(this.x + dx, this.y + dy);\n    }\n};\nvar x = {};\n//# sourceMappingURL=contextualTyping.js.map1->
 2 >^^^^
 3 >    ^
 4 >     ^^^
 5 >        ^^
 6 >          ^
-7 >           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+7 >           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
   >
   >interface A { x: string; }
@@ -3877,5 +3781,4 @@ sourceFile:contextualTyping.ts
 4 >Emitted(202, 9) Source(230, 12) + SourceIndex(0)
 5 >Emitted(202, 11) Source(230, 15) + SourceIndex(0)
 6 >Emitted(202, 12) Source(230, 16) + SourceIndex(0)
----
->>>//# sourceMappingURL=contextualTyping.js.map
\ No newline at end of file
+---
\ No newline at end of file
diff --git a/tests/baselines/reference/convertKeywordsYes.errors.txt b/tests/baselines/reference/convertKeywordsYes.errors.txt
deleted file mode 100644
index a3502f6b52c..00000000000
--- a/tests/baselines/reference/convertKeywordsYes.errors.txt
+++ /dev/null
@@ -1,330 +0,0 @@
-==== tests/cases/compiler/convertKeywordsYes.ts (8 errors) ====
-    // reserved ES5 future in strict mode
-    
-    var constructor = 0;
-    var any = 0;
-    var boolean = 0;
-    var implements = 0;
-    var interface = 0;
-    var let = 0;
-    var module = 0;
-    var number = 0;
-    var package = 0;
-    var private = 0;
-    var protected = 0;
-    var public = 0;
-    var set = 0;
-    var static = 0;
-    var string = 0;
-    var get = 0;
-    var yield = 0;
-    var declare = 0;
-    
-    function bigGeneric<
-        constructor,
-        any,
-        ~~~
-!!! Type parameter name cannot be 'any'
-        boolean,
-        ~~~~~~~
-!!! Type parameter name cannot be 'boolean'
-        implements ,
-        interface ,
-        let,
-        module ,
-        number,
-        ~~~~~~
-!!! Type parameter name cannot be 'number'
-        package,
-        private ,
-        protected,
-        public ,
-        set ,
-        static ,
-        string,
-        ~~~~~~
-!!! Type parameter name cannot be 'string'
-        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 ) { }
-    
-    var bigObject = {
-        constructor: 0,
-        any: 0,
-        boolean: 0,
-        implements: 0,
-        interface: 0,
-        let: 0,
-        module: 0,
-        number: 0,
-        package: 0,
-        private: 0,
-        protected: 0,
-        public: 0,
-        set: 0,
-        static: 0,
-        string: 0,
-        get: 0,
-        yield: 0,
-        break: 0,
-        case: 0,
-        catch: 0,
-        class: 0,
-        continue: 0,
-        const: 0,
-    
-        debugger: 0,
-        declare: 0,
-        default: 0,
-        delete: 0,
-        do: 0,
-        else: 0,
-        enum: 0,
-        export: 0,
-        extends: 0,
-        false: 0,
-        finally: 0,
-        for: 0,
-        function: 0,
-        if: 0,
-    
-        import: 0,
-        in: 0,
-        instanceof: 0,
-        new: 0,
-        null: 0,
-        return: 0,
-        super: 0,
-        switch: 0,
-        this: 0,
-        throw: 0,
-        true: 0,
-        try: 0,
-        typeof: 0,
-        var: 0,
-        void: 0,
-        while: 0,
-        with: 0,
-    };
-    
-    interface bigInterface {
-        constructor;
-        any;
-        boolean;
-        implements;
-        interface;
-        let;
-        module;
-        number;
-        package;
-        private;
-        protected;
-        public;
-        set;
-        static;
-        string;
-        get;
-        yield;
-        break;
-        case;
-        catch;
-        class;
-        continue;
-        const;
-    
-        debugger;
-        declare;
-        default;
-        delete;
-        do;
-        else;
-        enum;
-        export;
-        extends;
-        false;
-        finally;
-        for;
-        function;
-        if;
-    
-        import;
-        in;
-        instanceof;
-        new;
-        null;
-        return;
-        super;
-        switch;
-        this;
-        throw;
-        true;
-        try;
-        typeof;
-        var;
-        void;
-        while;
-        with;
-    }
-    
-    class bigClass {
-        public "constructor" = 0;
-        public any = 0;
-        public boolean = 0;
-        public implements = 0;
-        public interface = 0;
-        public let = 0;
-        public module = 0;
-        public number = 0;
-        public package = 0;
-        public private = 0;
-        public protected = 0;
-        public public = 0;
-        public set = 0;
-        public static = 0;
-        public string = 0;
-        public get = 0;
-        public yield = 0;
-        public break = 0;
-        public case = 0;
-        public catch = 0;
-        public class = 0;
-        public continue = 0;
-        public const = 0;
-        public debugger = 0;
-        public declare = 0;
-        public default = 0;
-        public delete = 0;
-        public do = 0;
-        public else = 0;
-        public enum = 0;
-        public export = 0;
-        public extends = 0;
-        public false = 0;
-        public finally = 0;
-        public for = 0;
-        public function = 0;
-        public if = 0;
-        public import = 0;
-        public in = 0;
-        public instanceof = 0;
-        public new = 0;
-        public null = 0;
-        public return = 0;
-        public super = 0;
-        public switch = 0;
-        public this = 0;
-        public throw = 0;
-        public true = 0;
-        public try = 0;
-        public typeof = 0;
-        public var = 0;
-        public void = 0;
-        public while = 0;
-        public with = 0;
-    }
-    
-    enum bigEnum {
-        constructor,
-        any,
-        boolean,
-        implements,
-        interface,
-        let,
-        module,
-        number,
-        package,
-        private,
-        protected,
-        public,
-        set,
-        static,
-        string,
-        get,
-        yield,
-        break,
-        case,
-        catch,
-        class,
-        continue,
-        const,
-    
-        debugger,
-        declare,
-        default,
-        delete,
-        do,
-        else,
-        enum,
-        export,
-        extends,
-        false,
-        finally,
-        for,
-        function,
-        if,
-    
-        import,
-        in,
-        instanceof,
-        new,
-        null,
-        return,
-        super,
-        switch,
-        this,
-        throw,
-        true,
-        try,
-        typeof,
-        var,
-        void,
-        while,
-        with,
-    }
-    
-    module bigModule {
-        class constructor { }
-        class any { }
-              ~~~
-!!! Class name cannot be 'any'
-        class boolean { }
-              ~~~~~~~
-!!! Class name cannot be 'boolean'
-        class implements { }
-        class interface { }
-        class let { }
-        class module { }
-        class number { }
-              ~~~~~~
-!!! Class name cannot be 'number'
-        class package { }
-        class private { }
-        class protected { }
-        class public { }
-        class set { }
-        class static { }
-        class string { }
-              ~~~~~~
-!!! Class name cannot be 'string'
-        class get { }
-        class yield { }
-        class declare { }
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/convertKeywordsYes.js b/tests/baselines/reference/convertKeywordsYes.js
index c58fec070cd..deae65b54c9 100644
--- a/tests/baselines/reference/convertKeywordsYes.js
+++ b/tests/baselines/reference/convertKeywordsYes.js
@@ -22,20 +22,16 @@ var declare = 0;
 
 function bigGeneric<
     constructor,
-    any,
-    boolean,
     implements ,
     interface ,
     let,
     module ,
-    number,
     package,
     private ,
     protected,
     public ,
     set ,
     static ,
-    string,
     get ,
     yield,
     declare
@@ -294,20 +290,16 @@ enum bigEnum {
 
 module bigModule {
     class constructor { }
-    class any { }
-    class boolean { }
     class implements { }
     class interface { }
     class let { }
     class module { }
-    class number { }
     class package { }
     class private { }
     class protected { }
     class public { }
     class set { }
     class static { }
-    class string { }
     class get { }
     class yield { }
     class declare { }
@@ -514,16 +506,6 @@ var bigModule;
         }
         return constructor;
     })();
-    var any = (function () {
-        function any() {
-        }
-        return any;
-    })();
-    var boolean = (function () {
-        function boolean() {
-        }
-        return boolean;
-    })();
     var implements = (function () {
         function implements() {
         }
@@ -544,11 +526,6 @@ var bigModule;
         }
         return module;
     })();
-    var number = (function () {
-        function number() {
-        }
-        return number;
-    })();
     var package = (function () {
         function package() {
         }
@@ -579,11 +556,6 @@ var bigModule;
         }
         return static;
     })();
-    var string = (function () {
-        function string() {
-        }
-        return string;
-    })();
     var get = (function () {
         function get() {
         }
diff --git a/tests/baselines/reference/convertKeywordsYes.types b/tests/baselines/reference/convertKeywordsYes.types
new file mode 100644
index 00000000000..33d5c6f2494
--- /dev/null
+++ b/tests/baselines/reference/convertKeywordsYes.types
@@ -0,0 +1,879 @@
+=== tests/cases/compiler/convertKeywordsYes.ts ===
+// reserved ES5 future in strict mode
+
+var constructor = 0;
+>constructor : number
+
+var any = 0;
+>any : number
+
+var boolean = 0;
+>boolean : number
+
+var implements = 0;
+>implements : number
+
+var interface = 0;
+>interface : number
+
+var let = 0;
+>let : number
+
+var module = 0;
+>module : number
+
+var number = 0;
+>number : number
+
+var package = 0;
+>package : number
+
+var private = 0;
+>private : number
+
+var protected = 0;
+>protected : number
+
+var public = 0;
+>public : number
+
+var set = 0;
+>set : number
+
+var static = 0;
+>static : number
+
+var string = 0;
+>string : number
+
+var get = 0;
+>get : number
+
+var yield = 0;
+>yield : number
+
+var declare = 0;
+>declare : number
+
+function bigGeneric<
+>bigGeneric : typeof bigGeneric
+
+    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
+
+    b2: boolean,
+>b2 : boolean
+
+    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; }
+>{    constructor: 0,    any: 0,    boolean: 0,    implements: 0,    interface: 0,    let: 0,    module: 0,    number: 0,    package: 0,    private: 0,    protected: 0,    public: 0,    set: 0,    static: 0,    string: 0,    get: 0,    yield: 0,    break: 0,    case: 0,    catch: 0,    class: 0,    continue: 0,    const: 0,    debugger: 0,    declare: 0,    default: 0,    delete: 0,    do: 0,    else: 0,    enum: 0,    export: 0,    extends: 0,    false: 0,    finally: 0,    for: 0,    function: 0,    if: 0,    import: 0,    in: 0,    instanceof: 0,    new: 0,    null: 0,    return: 0,    super: 0,    switch: 0,    this: 0,    throw: 0,    true: 0,    try: 0,    typeof: 0,    var: 0,    void: 0,    while: 0,    with: 0,} : { 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; }
+
+    constructor: 0,
+>constructor : number
+
+    any: 0,
+>any : number
+
+    boolean: 0,
+>boolean : number
+
+    implements: 0,
+>implements : number
+
+    interface: 0,
+>interface : number
+
+    let: 0,
+>let : number
+
+    module: 0,
+>module : number
+
+    number: 0,
+>number : number
+
+    package: 0,
+>package : number
+
+    private: 0,
+>private : number
+
+    protected: 0,
+>protected : number
+
+    public: 0,
+>public : number
+
+    set: 0,
+>set : number
+
+    static: 0,
+>static : number
+
+    string: 0,
+>string : number
+
+    get: 0,
+>get : number
+
+    yield: 0,
+>yield : number
+
+    break: 0,
+>break : number
+
+    case: 0,
+>case : number
+
+    catch: 0,
+>catch : number
+
+    class: 0,
+>class : number
+
+    continue: 0,
+>continue : number
+
+    const: 0,
+>const : number
+
+    debugger: 0,
+>debugger : number
+
+    declare: 0,
+>declare : number
+
+    default: 0,
+>default : number
+
+    delete: 0,
+>delete : number
+
+    do: 0,
+>do : number
+
+    else: 0,
+>else : number
+
+    enum: 0,
+>enum : number
+
+    export: 0,
+>export : number
+
+    extends: 0,
+>extends : number
+
+    false: 0,
+>false : number
+
+    finally: 0,
+>finally : number
+
+    for: 0,
+>for : number
+
+    function: 0,
+>function : number
+
+    if: 0,
+>if : number
+
+    import: 0,
+>import : number
+
+    in: 0,
+>in : number
+
+    instanceof: 0,
+>instanceof : number
+
+    new: 0,
+>new : number
+
+    null: 0,
+>null : number
+
+    return: 0,
+>return : number
+
+    super: 0,
+>super : number
+
+    switch: 0,
+>switch : number
+
+    this: 0,
+>this : number
+
+    throw: 0,
+>throw : number
+
+    true: 0,
+>true : number
+
+    try: 0,
+>try : number
+
+    typeof: 0,
+>typeof : number
+
+    var: 0,
+>var : number
+
+    void: 0,
+>void : number
+
+    while: 0,
+>while : number
+
+    with: 0,
+>with : number
+
+};
+
+interface bigInterface {
+>bigInterface : bigInterface
+
+    constructor;
+>constructor : any
+
+    any;
+>any : any
+
+    boolean;
+>boolean : any
+
+    implements;
+>implements : any
+
+    interface;
+>interface : any
+
+    let;
+>let : any
+
+    module;
+>module : any
+
+    number;
+>number : any
+
+    package;
+>package : any
+
+    private;
+>private : any
+
+    protected;
+>protected : any
+
+    public;
+>public : any
+
+    set;
+>set : any
+
+    static;
+>static : any
+
+    string;
+>string : any
+
+    get;
+>get : any
+
+    yield;
+>yield : any
+
+    break;
+>break : any
+
+    case;
+>case : any
+
+    catch;
+>catch : any
+
+    class;
+>class : any
+
+    continue;
+>continue : any
+
+    const;
+>const : any
+
+    debugger;
+>debugger : any
+
+    declare;
+>declare : any
+
+    default;
+>default : any
+
+    delete;
+>delete : any
+
+    do;
+>do : any
+
+    else;
+>else : any
+
+    enum;
+>enum : any
+
+    export;
+>export : any
+
+    extends;
+>extends : any
+
+    false;
+>false : any
+
+    finally;
+>finally : any
+
+    for;
+>for : any
+
+    function;
+>function : any
+
+    if;
+>if : any
+
+    import;
+>import : any
+
+    in;
+>in : any
+
+    instanceof;
+>instanceof : any
+
+    new;
+>new : any
+
+    null;
+>null : any
+
+    return;
+>return : any
+
+    super;
+>super : any
+
+    switch;
+>switch : any
+
+    this;
+>this : any
+
+    throw;
+>throw : any
+
+    true;
+>true : any
+
+    try;
+>try : any
+
+    typeof;
+>typeof : any
+
+    var;
+>var : any
+
+    void;
+>void : any
+
+    while;
+>while : any
+
+    with;
+>with : any
+}
+
+class bigClass {
+>bigClass : bigClass
+
+    public "constructor" = 0;
+    public any = 0;
+>any : number
+
+    public boolean = 0;
+>boolean : number
+
+    public implements = 0;
+>implements : number
+
+    public interface = 0;
+>interface : number
+
+    public let = 0;
+>let : number
+
+    public module = 0;
+>module : number
+
+    public number = 0;
+>number : number
+
+    public package = 0;
+>package : number
+
+    public private = 0;
+>private : number
+
+    public protected = 0;
+>protected : number
+
+    public public = 0;
+>public : number
+
+    public set = 0;
+>set : number
+
+    public static = 0;
+>static : number
+
+    public string = 0;
+>string : number
+
+    public get = 0;
+>get : number
+
+    public yield = 0;
+>yield : number
+
+    public break = 0;
+>break : number
+
+    public case = 0;
+>case : number
+
+    public catch = 0;
+>catch : number
+
+    public class = 0;
+>class : number
+
+    public continue = 0;
+>continue : number
+
+    public const = 0;
+>const : number
+
+    public debugger = 0;
+>debugger : number
+
+    public declare = 0;
+>declare : number
+
+    public default = 0;
+>default : number
+
+    public delete = 0;
+>delete : number
+
+    public do = 0;
+>do : number
+
+    public else = 0;
+>else : number
+
+    public enum = 0;
+>enum : number
+
+    public export = 0;
+>export : number
+
+    public extends = 0;
+>extends : number
+
+    public false = 0;
+>false : number
+
+    public finally = 0;
+>finally : number
+
+    public for = 0;
+>for : number
+
+    public function = 0;
+>function : number
+
+    public if = 0;
+>if : number
+
+    public import = 0;
+>import : number
+
+    public in = 0;
+>in : number
+
+    public instanceof = 0;
+>instanceof : number
+
+    public new = 0;
+>new : number
+
+    public null = 0;
+>null : number
+
+    public return = 0;
+>return : number
+
+    public super = 0;
+>super : number
+
+    public switch = 0;
+>switch : number
+
+    public this = 0;
+>this : number
+
+    public throw = 0;
+>throw : number
+
+    public true = 0;
+>true : number
+
+    public try = 0;
+>try : number
+
+    public typeof = 0;
+>typeof : number
+
+    public var = 0;
+>var : number
+
+    public void = 0;
+>void : number
+
+    public while = 0;
+>while : number
+
+    public with = 0;
+>with : number
+}
+
+enum bigEnum {
+>bigEnum : bigEnum
+
+    constructor,
+>constructor : bigEnum
+
+    any,
+>any : bigEnum
+
+    boolean,
+>boolean : bigEnum
+
+    implements,
+>implements : bigEnum
+
+    interface,
+>interface : bigEnum
+
+    let,
+>let : bigEnum
+
+    module,
+>module : bigEnum
+
+    number,
+>number : bigEnum
+
+    package,
+>package : bigEnum
+
+    private,
+>private : bigEnum
+
+    protected,
+>protected : bigEnum
+
+    public,
+>public : bigEnum
+
+    set,
+>set : bigEnum
+
+    static,
+>static : bigEnum
+
+    string,
+>string : bigEnum
+
+    get,
+>get : bigEnum
+
+    yield,
+>yield : bigEnum
+
+    break,
+>break : bigEnum
+
+    case,
+>case : bigEnum
+
+    catch,
+>catch : bigEnum
+
+    class,
+>class : bigEnum
+
+    continue,
+>continue : bigEnum
+
+    const,
+>const : bigEnum
+
+    debugger,
+>debugger : bigEnum
+
+    declare,
+>declare : bigEnum
+
+    default,
+>default : bigEnum
+
+    delete,
+>delete : bigEnum
+
+    do,
+>do : bigEnum
+
+    else,
+>else : bigEnum
+
+    enum,
+>enum : bigEnum
+
+    export,
+>export : bigEnum
+
+    extends,
+>extends : bigEnum
+
+    false,
+>false : bigEnum
+
+    finally,
+>finally : bigEnum
+
+    for,
+>for : bigEnum
+
+    function,
+>function : bigEnum
+
+    if,
+>if : bigEnum
+
+    import,
+>import : bigEnum
+
+    in,
+>in : bigEnum
+
+    instanceof,
+>instanceof : bigEnum
+
+    new,
+>new : bigEnum
+
+    null,
+>null : bigEnum
+
+    return,
+>return : bigEnum
+
+    super,
+>super : bigEnum
+
+    switch,
+>switch : bigEnum
+
+    this,
+>this : bigEnum
+
+    throw,
+>throw : bigEnum
+
+    true,
+>true : bigEnum
+
+    try,
+>try : bigEnum
+
+    typeof,
+>typeof : bigEnum
+
+    var,
+>var : bigEnum
+
+    void,
+>void : bigEnum
+
+    while,
+>while : bigEnum
+
+    with,
+>with : bigEnum
+}
+
+module bigModule {
+>bigModule : bigModule
+
+    class constructor { }
+>constructor : constructor
+
+    class implements { }
+>implements : implements
+
+    class interface { }
+>interface : interface
+
+    class let { }
+>let : let
+
+    class module { }
+>module : module
+
+    class package { }
+>package : package
+
+    class private { }
+>private : private
+
+    class protected { }
+>protected : protected
+
+    class public { }
+>public : public
+
+    class set { }
+>set : set
+
+    class static { }
+>static : static
+
+    class get { }
+>get : get
+
+    class yield { }
+>yield : yield
+
+    class declare { }
+>declare : declare
+}
diff --git a/tests/baselines/reference/cyclicModuleImport.js b/tests/baselines/reference/cyclicModuleImport.js
index 08f3c7d6147..1c9b74eea4f 100644
--- a/tests/baselines/reference/cyclicModuleImport.js
+++ b/tests/baselines/reference/cyclicModuleImport.js
@@ -20,3 +20,24 @@ declare module "MainModule" {
 
 
 //// [cyclicModuleImport.js]
+
+
+//// [cyclicModuleImport.d.ts]
+declare module "SubModule" {
+    import MainModule = require('MainModule');
+    class SubModule {
+        static StaticVar: number;
+        InstanceVar: number;
+        main: MainModule;
+        constructor();
+    }
+    export = SubModule;
+}
+declare module "MainModule" {
+    import SubModule = require('SubModule');
+    class MainModule {
+        SubModule: SubModule;
+        constructor();
+    }
+    export = MainModule;
+}
diff --git a/tests/baselines/reference/declFileAccessors.js b/tests/baselines/reference/declFileAccessors.js
new file mode 100644
index 00000000000..f39cd13fdd0
--- /dev/null
+++ b/tests/baselines/reference/declFileAccessors.js
@@ -0,0 +1,306 @@
+//// [tests/cases/compiler/declFileAccessors.ts] ////
+
+//// [declFileAccessors_0.ts]
+
+/** This is comment for c1*/
+export class c1 {
+    /** getter property*/
+    public get p3() {
+        return 10;
+    }
+    /** setter property*/
+    public set p3(/** this is value*/value: number) {
+    }
+    /** private getter property*/
+    private get pp3() {
+        return 10;
+    }
+    /** private setter property*/
+    private set pp3(/** this is value*/value: number) {
+    }
+    /** static getter property*/
+    static get s3() {
+        return 10;
+    }
+    /** setter property*/
+    static set s3( /** this is value*/value: number) {
+    }
+    public get nc_p3() {
+        return 10;
+    }
+    public set nc_p3(value: number) {
+    }
+    private get nc_pp3() {
+        return 10;
+    }
+    private set nc_pp3(value: number) {
+    }
+    static get nc_s3() {
+        return "";
+    }
+    static set nc_s3(value: string) {
+    }
+
+    // Only getter property
+    public get onlyGetter() {
+        return 10;
+    }
+
+    // Only setter property
+    public set onlySetter(value: number) {
+    }
+}
+
+//// [declFileAccessors_1.ts]
+/** This is comment for c2 - the global class*/
+class c2 {
+    /** getter property*/
+    public get p3() {
+        return 10;
+    }
+    /** setter property*/
+    public set p3(/** this is value*/value: number) {
+    }
+    /** private getter property*/
+    private get pp3() {
+        return 10;
+    }
+    /** private setter property*/
+    private set pp3(/** this is value*/value: number) {
+    }
+    /** static getter property*/
+    static get s3() {
+        return 10;
+    }
+    /** setter property*/
+    static set s3( /** this is value*/value: number) {
+    }
+    public get nc_p3() {
+        return 10;
+    }
+    public set nc_p3(value: number) {
+    }
+    private get nc_pp3() {
+        return 10;
+    }
+    private set nc_pp3(value: number) {
+    }
+    static get nc_s3() {
+        return "";
+    }
+    static set nc_s3(value: string) {
+    }
+
+    // Only getter property
+    public get onlyGetter() {
+        return 10;
+    }
+
+    // Only setter property
+    public set onlySetter(value: number) {
+    }
+}
+
+//// [declFileAccessors_0.js]
+/** This is comment for c1*/
+var c1 = (function () {
+    function c1() {
+    }
+    Object.defineProperty(c1.prototype, "p3", {
+        /** getter property*/
+        get: function () {
+            return 10;
+        },
+        /** setter property*/
+        set: function (/** this is value*/ value) {
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(c1.prototype, "pp3", {
+        /** private getter property*/
+        get: function () {
+            return 10;
+        },
+        /** private setter property*/
+        set: function (/** this is value*/ value) {
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(c1, "s3", {
+        /** static getter property*/
+        get: function () {
+            return 10;
+        },
+        /** setter property*/
+        set: function (/** this is value*/ value) {
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(c1.prototype, "nc_p3", {
+        get: function () {
+            return 10;
+        },
+        set: function (value) {
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(c1.prototype, "nc_pp3", {
+        get: function () {
+            return 10;
+        },
+        set: function (value) {
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(c1, "nc_s3", {
+        get: function () {
+            return "";
+        },
+        set: function (value) {
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(c1.prototype, "onlyGetter", {
+        // Only getter property
+        get: function () {
+            return 10;
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(c1.prototype, "onlySetter", {
+        // Only setter property
+        set: function (value) {
+        },
+        enumerable: true,
+        configurable: true
+    });
+    return c1;
+})();
+exports.c1 = c1;
+//// [declFileAccessors_1.js]
+/** This is comment for c2 - the global class*/
+var c2 = (function () {
+    function c2() {
+    }
+    Object.defineProperty(c2.prototype, "p3", {
+        /** getter property*/
+        get: function () {
+            return 10;
+        },
+        /** setter property*/
+        set: function (/** this is value*/ value) {
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(c2.prototype, "pp3", {
+        /** private getter property*/
+        get: function () {
+            return 10;
+        },
+        /** private setter property*/
+        set: function (/** this is value*/ value) {
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(c2, "s3", {
+        /** static getter property*/
+        get: function () {
+            return 10;
+        },
+        /** setter property*/
+        set: function (/** this is value*/ value) {
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(c2.prototype, "nc_p3", {
+        get: function () {
+            return 10;
+        },
+        set: function (value) {
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(c2.prototype, "nc_pp3", {
+        get: function () {
+            return 10;
+        },
+        set: function (value) {
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(c2, "nc_s3", {
+        get: function () {
+            return "";
+        },
+        set: function (value) {
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(c2.prototype, "onlyGetter", {
+        // Only getter property
+        get: function () {
+            return 10;
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(c2.prototype, "onlySetter", {
+        // Only setter property
+        set: function (value) {
+        },
+        enumerable: true,
+        configurable: true
+    });
+    return c2;
+})();
+
+
+//// [declFileAccessors_0.d.ts]
+/** This is comment for c1*/
+export declare class c1 {
+    /** getter property*/
+    /** setter property*/
+    p3: number;
+    /** private getter property*/
+    /** private setter property*/
+    private pp3;
+    /** static getter property*/
+    /** setter property*/
+    static s3: number;
+    nc_p3: number;
+    private nc_pp3;
+    static nc_s3: string;
+    onlyGetter: number;
+    onlySetter: number;
+}
+//// [declFileAccessors_1.d.ts]
+/** This is comment for c2 - the global class*/
+declare class c2 {
+    /** getter property*/
+    /** setter property*/
+    p3: number;
+    /** private getter property*/
+    /** private setter property*/
+    private pp3;
+    /** static getter property*/
+    /** setter property*/
+    static s3: number;
+    nc_p3: number;
+    private nc_pp3;
+    static nc_s3: string;
+    onlyGetter: number;
+    onlySetter: number;
+}
diff --git a/tests/baselines/reference/declFileAccessors.types b/tests/baselines/reference/declFileAccessors.types
new file mode 100644
index 00000000000..2d8524a21c3
--- /dev/null
+++ b/tests/baselines/reference/declFileAccessors.types
@@ -0,0 +1,160 @@
+=== tests/cases/compiler/declFileAccessors_0.ts ===
+
+/** This is comment for c1*/
+export class c1 {
+>c1 : c1
+
+    /** getter property*/
+    public get p3() {
+>p3 : number
+
+        return 10;
+    }
+    /** setter property*/
+    public set p3(/** this is value*/value: number) {
+>p3 : number
+>value : number
+    }
+    /** private getter property*/
+    private get pp3() {
+>pp3 : number
+
+        return 10;
+    }
+    /** private setter property*/
+    private set pp3(/** this is value*/value: number) {
+>pp3 : number
+>value : number
+    }
+    /** static getter property*/
+    static get s3() {
+>s3 : number
+
+        return 10;
+    }
+    /** setter property*/
+    static set s3( /** this is value*/value: number) {
+>s3 : number
+>value : number
+    }
+    public get nc_p3() {
+>nc_p3 : number
+
+        return 10;
+    }
+    public set nc_p3(value: number) {
+>nc_p3 : number
+>value : number
+    }
+    private get nc_pp3() {
+>nc_pp3 : number
+
+        return 10;
+    }
+    private set nc_pp3(value: number) {
+>nc_pp3 : number
+>value : number
+    }
+    static get nc_s3() {
+>nc_s3 : string
+
+        return "";
+    }
+    static set nc_s3(value: string) {
+>nc_s3 : string
+>value : string
+    }
+
+    // Only getter property
+    public get onlyGetter() {
+>onlyGetter : number
+
+        return 10;
+    }
+
+    // Only setter property
+    public set onlySetter(value: number) {
+>onlySetter : number
+>value : number
+    }
+}
+
+=== tests/cases/compiler/declFileAccessors_1.ts ===
+/** This is comment for c2 - the global class*/
+class c2 {
+>c2 : c2
+
+    /** getter property*/
+    public get p3() {
+>p3 : number
+
+        return 10;
+    }
+    /** setter property*/
+    public set p3(/** this is value*/value: number) {
+>p3 : number
+>value : number
+    }
+    /** private getter property*/
+    private get pp3() {
+>pp3 : number
+
+        return 10;
+    }
+    /** private setter property*/
+    private set pp3(/** this is value*/value: number) {
+>pp3 : number
+>value : number
+    }
+    /** static getter property*/
+    static get s3() {
+>s3 : number
+
+        return 10;
+    }
+    /** setter property*/
+    static set s3( /** this is value*/value: number) {
+>s3 : number
+>value : number
+    }
+    public get nc_p3() {
+>nc_p3 : number
+
+        return 10;
+    }
+    public set nc_p3(value: number) {
+>nc_p3 : number
+>value : number
+    }
+    private get nc_pp3() {
+>nc_pp3 : number
+
+        return 10;
+    }
+    private set nc_pp3(value: number) {
+>nc_pp3 : number
+>value : number
+    }
+    static get nc_s3() {
+>nc_s3 : string
+
+        return "";
+    }
+    static set nc_s3(value: string) {
+>nc_s3 : string
+>value : string
+    }
+
+    // Only getter property
+    public get onlyGetter() {
+>onlyGetter : number
+
+        return 10;
+    }
+
+    // Only setter property
+    public set onlySetter(value: number) {
+>onlySetter : number
+>value : number
+    }
+}
diff --git a/tests/baselines/reference/declFileCallSignatures.js b/tests/baselines/reference/declFileCallSignatures.js
new file mode 100644
index 00000000000..2d4519b2090
--- /dev/null
+++ b/tests/baselines/reference/declFileCallSignatures.js
@@ -0,0 +1,121 @@
+//// [tests/cases/compiler/declFileCallSignatures.ts] ////
+
+//// [declFileCallSignatures_0.ts]
+
+export interface ICallSignature {
+    /** This comment should appear for foo*/
+    (): string;
+}
+
+export interface ICallSignatureWithParameters {
+    /** This is comment for function signature*/
+    (/** this is comment about a*/a: string,
+        /** this is comment for b*/
+        b: number): void;
+}
+
+export interface ICallSignatureWithRestParameters {
+    (a: string, ...rests: string[]): string;
+}
+
+export interface ICallSignatureWithOverloads {
+    (a: string): string;
+    (a: number): number;
+}
+
+export interface ICallSignatureWithTypeParameters<T> {
+    /** This comment should appear for foo*/
+    (a: T): string;
+}
+
+export interface ICallSignatureWithOwnTypeParametes {
+    <T extends ICallSignature>(a: T): string;
+}
+
+//// [declFileCallSignatures_1.ts]
+interface IGlobalCallSignature {
+    /** This comment should appear for foo*/
+    (): string;
+}
+
+interface IGlobalCallSignatureWithParameters {
+    /** This is comment for function signature*/
+    (/** this is comment about a*/a: string,
+        /** this is comment for b*/
+        b: number): void;
+}
+
+interface IGlobalCallSignatureWithRestParameters {
+
+    (a: string, ...rests: string[]): string;
+
+}
+
+interface IGlobalCallSignatureWithOverloads {
+    (a: string): string;
+    (a: number): number;
+}
+
+interface IGlobalCallSignatureWithTypeParameters<T> {
+    /** This comment should appear for foo*/
+    (a: T): string;
+}
+
+interface IGlobalCallSignatureWithOwnTypeParametes {
+    <T extends IGlobalCallSignature>(a: T): string;
+}
+
+//// [declFileCallSignatures_0.js]
+//// [declFileCallSignatures_1.js]
+
+
+//// [declFileCallSignatures_0.d.ts]
+export interface ICallSignature {
+    /** This comment should appear for foo*/
+    (): string;
+}
+export interface ICallSignatureWithParameters {
+    /** This is comment for function signature*/
+    (/** this is comment about a*/ a: string, 
+        /** this is comment for b*/
+        b: number): void;
+}
+export interface ICallSignatureWithRestParameters {
+    (a: string, ...rests: string[]): string;
+}
+export interface ICallSignatureWithOverloads {
+    (a: string): string;
+    (a: number): number;
+}
+export interface ICallSignatureWithTypeParameters<T> {
+    /** This comment should appear for foo*/
+    (a: T): string;
+}
+export interface ICallSignatureWithOwnTypeParametes {
+    <T extends ICallSignature>(a: T): string;
+}
+//// [declFileCallSignatures_1.d.ts]
+interface IGlobalCallSignature {
+    /** This comment should appear for foo*/
+    (): string;
+}
+interface IGlobalCallSignatureWithParameters {
+    /** This is comment for function signature*/
+    (/** this is comment about a*/ a: string, 
+        /** this is comment for b*/
+        b: number): void;
+}
+interface IGlobalCallSignatureWithRestParameters {
+    (a: string, ...rests: string[]): string;
+}
+interface IGlobalCallSignatureWithOverloads {
+    (a: string): string;
+    (a: number): number;
+}
+interface IGlobalCallSignatureWithTypeParameters<T> {
+    /** This comment should appear for foo*/
+    (a: T): string;
+}
+interface IGlobalCallSignatureWithOwnTypeParametes {
+    <T extends IGlobalCallSignature>(a: T): string;
+}
diff --git a/tests/baselines/reference/declFileCallSignatures.types b/tests/baselines/reference/declFileCallSignatures.types
new file mode 100644
index 00000000000..0fc0757aee1
--- /dev/null
+++ b/tests/baselines/reference/declFileCallSignatures.types
@@ -0,0 +1,117 @@
+=== 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
+
+        /** this is comment for b*/
+        b: number): void;
+>b : number
+}
+
+export interface ICallSignatureWithRestParameters {
+>ICallSignatureWithRestParameters : ICallSignatureWithRestParameters
+
+    (a: string, ...rests: string[]): string;
+>a : string
+>rests : string[]
+}
+
+export interface ICallSignatureWithOverloads {
+>ICallSignatureWithOverloads : ICallSignatureWithOverloads
+
+    (a: string): string;
+>a : string
+
+    (a: number): number;
+>a : number
+}
+
+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
+
+        /** this is comment for b*/
+        b: number): void;
+>b : number
+}
+
+interface IGlobalCallSignatureWithRestParameters {
+>IGlobalCallSignatureWithRestParameters : IGlobalCallSignatureWithRestParameters
+
+    (a: string, ...rests: string[]): string;
+>a : string
+>rests : string[]
+
+}
+
+interface IGlobalCallSignatureWithOverloads {
+>IGlobalCallSignatureWithOverloads : IGlobalCallSignatureWithOverloads
+
+    (a: string): string;
+>a : string
+
+    (a: number): number;
+>a : number
+}
+
+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.js b/tests/baselines/reference/declFileConstructSignatures.js
new file mode 100644
index 00000000000..ae756e32eed
--- /dev/null
+++ b/tests/baselines/reference/declFileConstructSignatures.js
@@ -0,0 +1,121 @@
+//// [tests/cases/compiler/declFileConstructSignatures.ts] ////
+
+//// [declFileConstructSignatures_0.ts]
+
+export interface IConstructSignature {
+    /** This comment should appear for foo*/
+    new (): string;
+}
+
+export interface IConstructSignatureWithParameters {
+    /** This is comment for function signature*/
+    new (/** this is comment about a*/a: string,
+        /** this is comment for b*/
+        b: number);
+}
+
+export interface IConstructSignatureWithRestParameters {
+    new (a: string, ...rests: string[]): string;
+}
+
+export interface IConstructSignatureWithOverloads {
+    new (a: string): string;
+    new (a: number): number;
+}
+
+export interface IConstructSignatureWithTypeParameters<T> {
+    /** This comment should appear for foo*/
+    new (a: T): T;
+}
+
+export interface IConstructSignatureWithOwnTypeParametes {
+    new <T extends IConstructSignature>(a: T): T;
+}
+
+//// [declFileConstructSignatures_1.ts]
+interface IGlobalConstructSignature {
+    /** This comment should appear for foo*/
+    new (): string;
+}
+
+interface IGlobalConstructSignatureWithParameters {
+    /** This is comment for function signature*/
+    new (/** this is comment about a*/a: string,
+        /** this is comment for b*/
+        b: number);
+}
+
+interface IGlobalConstructSignatureWithRestParameters {
+
+    new (a: string, ...rests: string[]): string;
+
+}
+
+interface IGlobalConstructSignatureWithOverloads {
+    new (a: string): string;
+    new (a: number): number;
+}
+
+interface IGlobalConstructSignatureWithTypeParameters<T> {
+    /** This comment should appear for foo*/
+    new (a: T): T;
+}
+
+interface IGlobalConstructSignatureWithOwnTypeParametes {
+    new <T extends IGlobalConstructSignature>(a: T): T;
+}
+
+//// [declFileConstructSignatures_0.js]
+//// [declFileConstructSignatures_1.js]
+
+
+//// [declFileConstructSignatures_0.d.ts]
+export interface IConstructSignature {
+    /** This comment should appear for foo*/
+    new (): string;
+}
+export interface IConstructSignatureWithParameters {
+    /** This is comment for function signature*/
+    new (/** this is comment about a*/ a: string, 
+        /** this is comment for b*/
+        b: number): any;
+}
+export interface IConstructSignatureWithRestParameters {
+    new (a: string, ...rests: string[]): string;
+}
+export interface IConstructSignatureWithOverloads {
+    new (a: string): string;
+    new (a: number): number;
+}
+export interface IConstructSignatureWithTypeParameters<T> {
+    /** This comment should appear for foo*/
+    new (a: T): T;
+}
+export interface IConstructSignatureWithOwnTypeParametes {
+    new <T extends IConstructSignature>(a: T): T;
+}
+//// [declFileConstructSignatures_1.d.ts]
+interface IGlobalConstructSignature {
+    /** This comment should appear for foo*/
+    new (): string;
+}
+interface IGlobalConstructSignatureWithParameters {
+    /** This is comment for function signature*/
+    new (/** this is comment about a*/ a: string, 
+        /** this is comment for b*/
+        b: number): any;
+}
+interface IGlobalConstructSignatureWithRestParameters {
+    new (a: string, ...rests: string[]): string;
+}
+interface IGlobalConstructSignatureWithOverloads {
+    new (a: string): string;
+    new (a: number): number;
+}
+interface IGlobalConstructSignatureWithTypeParameters<T> {
+    /** This comment should appear for foo*/
+    new (a: T): T;
+}
+interface IGlobalConstructSignatureWithOwnTypeParametes {
+    new <T extends IGlobalConstructSignature>(a: T): T;
+}
diff --git a/tests/baselines/reference/declFileConstructSignatures.types b/tests/baselines/reference/declFileConstructSignatures.types
new file mode 100644
index 00000000000..6ee19bfdcf7
--- /dev/null
+++ b/tests/baselines/reference/declFileConstructSignatures.types
@@ -0,0 +1,121 @@
+=== 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
+
+        /** this is comment for b*/
+        b: number);
+>b : number
+}
+
+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
+
+    new (a: number): number;
+>a : number
+}
+
+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
+
+        /** this is comment for b*/
+        b: number);
+>b : number
+}
+
+interface IGlobalConstructSignatureWithRestParameters {
+>IGlobalConstructSignatureWithRestParameters : IGlobalConstructSignatureWithRestParameters
+
+    new (a: string, ...rests: string[]): string;
+>a : string
+>rests : string[]
+
+}
+
+interface IGlobalConstructSignatureWithOverloads {
+>IGlobalConstructSignatureWithOverloads : IGlobalConstructSignatureWithOverloads
+
+    new (a: string): string;
+>a : string
+
+    new (a: number): number;
+>a : number
+}
+
+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/declFileConstructors.js b/tests/baselines/reference/declFileConstructors.js
new file mode 100644
index 00000000000..327221debf8
--- /dev/null
+++ b/tests/baselines/reference/declFileConstructors.js
@@ -0,0 +1,289 @@
+//// [tests/cases/compiler/declFileConstructors.ts] ////
+
+//// [declFileConstructors_0.ts]
+
+export class SimpleConstructor {
+    /** This comment should appear for foo*/
+    constructor() {
+    }
+}
+export class ConstructorWithParameters {
+    /** This is comment for function signature*/
+    constructor(/** this is comment about a*/a: string,
+        /** this is comment for b*/
+        b: number) {
+        var d = a;
+    }
+}
+
+export class ConstructorWithRestParamters {
+    constructor(a: string, ...rests: string[]) {
+        return a + rests.join("");
+    }
+}
+
+export class ConstructorWithOverloads {
+    constructor(a: string);
+    constructor(a: number);
+    constructor(a: any) {
+    }
+}
+
+export class ConstructorWithPublicParameterProperty {
+    constructor(public x: string) {
+    }
+}
+
+export class ConstructorWithPrivateParameterProperty {
+    constructor(private x: string) {
+    }
+}
+
+export class ConstructorWithOptionalParameterProperty {
+    constructor(public x?: string) {
+    }
+}
+
+export class ConstructorWithParameterInitializer {
+    constructor(public x = "hello") {
+    }
+}
+
+//// [declFileConstructors_1.ts]
+class GlobalSimpleConstructor {
+    /** This comment should appear for foo*/
+    constructor() {
+    }
+}
+class GlobalConstructorWithParameters {
+    /** This is comment for function signature*/
+    constructor(/** this is comment about a*/a: string,
+        /** this is comment for b*/
+        b: number) {
+        var d = a;
+    }
+}
+
+class GlobalConstructorWithRestParamters {
+    constructor(a: string, ...rests: string[]) {
+        return a + rests.join("");
+    }
+}
+
+class GlobalConstructorWithOverloads {
+    constructor(a: string);
+    constructor(a: number);
+    constructor(a: any) {
+    }
+}
+
+class GlobalConstructorWithPublicParameterProperty {
+    constructor(public x: string) {
+    }
+}
+
+class GlobalConstructorWithPrivateParameterProperty {
+    constructor(private x: string) {
+    }
+}
+
+class GlobalConstructorWithOptionalParameterProperty {
+    constructor(public x?: string) {
+    }
+}
+
+class GlobalConstructorWithParameterInitializer {
+    constructor(public x = "hello") {
+    }
+}
+
+//// [declFileConstructors_0.js]
+var SimpleConstructor = (function () {
+    /** This comment should appear for foo*/
+    function SimpleConstructor() {
+    }
+    return SimpleConstructor;
+})();
+exports.SimpleConstructor = SimpleConstructor;
+var ConstructorWithParameters = (function () {
+    /** This is comment for function signature*/
+    function ConstructorWithParameters(/** this is comment about a*/ a, 
+        /** this is comment for b*/
+        b) {
+        var d = a;
+    }
+    return ConstructorWithParameters;
+})();
+exports.ConstructorWithParameters = ConstructorWithParameters;
+var ConstructorWithRestParamters = (function () {
+    function ConstructorWithRestParamters(a) {
+        var rests = [];
+        for (var _i = 1; _i < arguments.length; _i++) {
+            rests[_i - 1] = arguments[_i];
+        }
+        return a + rests.join("");
+    }
+    return ConstructorWithRestParamters;
+})();
+exports.ConstructorWithRestParamters = ConstructorWithRestParamters;
+var ConstructorWithOverloads = (function () {
+    function ConstructorWithOverloads(a) {
+    }
+    return ConstructorWithOverloads;
+})();
+exports.ConstructorWithOverloads = ConstructorWithOverloads;
+var ConstructorWithPublicParameterProperty = (function () {
+    function ConstructorWithPublicParameterProperty(x) {
+        this.x = x;
+    }
+    return ConstructorWithPublicParameterProperty;
+})();
+exports.ConstructorWithPublicParameterProperty = ConstructorWithPublicParameterProperty;
+var ConstructorWithPrivateParameterProperty = (function () {
+    function ConstructorWithPrivateParameterProperty(x) {
+        this.x = x;
+    }
+    return ConstructorWithPrivateParameterProperty;
+})();
+exports.ConstructorWithPrivateParameterProperty = ConstructorWithPrivateParameterProperty;
+var ConstructorWithOptionalParameterProperty = (function () {
+    function ConstructorWithOptionalParameterProperty(x) {
+        this.x = x;
+    }
+    return ConstructorWithOptionalParameterProperty;
+})();
+exports.ConstructorWithOptionalParameterProperty = ConstructorWithOptionalParameterProperty;
+var ConstructorWithParameterInitializer = (function () {
+    function ConstructorWithParameterInitializer(x) {
+        if (x === void 0) { x = "hello"; }
+        this.x = x;
+    }
+    return ConstructorWithParameterInitializer;
+})();
+exports.ConstructorWithParameterInitializer = ConstructorWithParameterInitializer;
+//// [declFileConstructors_1.js]
+var GlobalSimpleConstructor = (function () {
+    /** This comment should appear for foo*/
+    function GlobalSimpleConstructor() {
+    }
+    return GlobalSimpleConstructor;
+})();
+var GlobalConstructorWithParameters = (function () {
+    /** This is comment for function signature*/
+    function GlobalConstructorWithParameters(/** this is comment about a*/ a, 
+        /** this is comment for b*/
+        b) {
+        var d = a;
+    }
+    return GlobalConstructorWithParameters;
+})();
+var GlobalConstructorWithRestParamters = (function () {
+    function GlobalConstructorWithRestParamters(a) {
+        var rests = [];
+        for (var _i = 1; _i < arguments.length; _i++) {
+            rests[_i - 1] = arguments[_i];
+        }
+        return a + rests.join("");
+    }
+    return GlobalConstructorWithRestParamters;
+})();
+var GlobalConstructorWithOverloads = (function () {
+    function GlobalConstructorWithOverloads(a) {
+    }
+    return GlobalConstructorWithOverloads;
+})();
+var GlobalConstructorWithPublicParameterProperty = (function () {
+    function GlobalConstructorWithPublicParameterProperty(x) {
+        this.x = x;
+    }
+    return GlobalConstructorWithPublicParameterProperty;
+})();
+var GlobalConstructorWithPrivateParameterProperty = (function () {
+    function GlobalConstructorWithPrivateParameterProperty(x) {
+        this.x = x;
+    }
+    return GlobalConstructorWithPrivateParameterProperty;
+})();
+var GlobalConstructorWithOptionalParameterProperty = (function () {
+    function GlobalConstructorWithOptionalParameterProperty(x) {
+        this.x = x;
+    }
+    return GlobalConstructorWithOptionalParameterProperty;
+})();
+var GlobalConstructorWithParameterInitializer = (function () {
+    function GlobalConstructorWithParameterInitializer(x) {
+        if (x === void 0) { x = "hello"; }
+        this.x = x;
+    }
+    return GlobalConstructorWithParameterInitializer;
+})();
+
+
+//// [declFileConstructors_0.d.ts]
+export declare class SimpleConstructor {
+    /** This comment should appear for foo*/
+    constructor();
+}
+export declare class ConstructorWithParameters {
+    /** This is comment for function signature*/
+    constructor(/** this is comment about a*/ a: string, 
+        /** this is comment for b*/
+        b: number);
+}
+export declare class ConstructorWithRestParamters {
+    constructor(a: string, ...rests: string[]);
+}
+export declare class ConstructorWithOverloads {
+    constructor(a: string);
+    constructor(a: number);
+}
+export declare class ConstructorWithPublicParameterProperty {
+    x: string;
+    constructor(x: string);
+}
+export declare class ConstructorWithPrivateParameterProperty {
+    private x;
+    constructor(x: string);
+}
+export declare class ConstructorWithOptionalParameterProperty {
+    x: string;
+    constructor(x?: string);
+}
+export declare class ConstructorWithParameterInitializer {
+    x: string;
+    constructor(x?: string);
+}
+//// [declFileConstructors_1.d.ts]
+declare class GlobalSimpleConstructor {
+    /** This comment should appear for foo*/
+    constructor();
+}
+declare class GlobalConstructorWithParameters {
+    /** This is comment for function signature*/
+    constructor(/** this is comment about a*/ a: string, 
+        /** this is comment for b*/
+        b: number);
+}
+declare class GlobalConstructorWithRestParamters {
+    constructor(a: string, ...rests: string[]);
+}
+declare class GlobalConstructorWithOverloads {
+    constructor(a: string);
+    constructor(a: number);
+}
+declare class GlobalConstructorWithPublicParameterProperty {
+    x: string;
+    constructor(x: string);
+}
+declare class GlobalConstructorWithPrivateParameterProperty {
+    private x;
+    constructor(x: string);
+}
+declare class GlobalConstructorWithOptionalParameterProperty {
+    x: string;
+    constructor(x?: string);
+}
+declare class GlobalConstructorWithParameterInitializer {
+    x: string;
+    constructor(x?: string);
+}
diff --git a/tests/baselines/reference/declFileConstructors.types b/tests/baselines/reference/declFileConstructors.types
new file mode 100644
index 00000000000..723830bdeea
--- /dev/null
+++ b/tests/baselines/reference/declFileConstructors.types
@@ -0,0 +1,176 @@
+=== tests/cases/compiler/declFileConstructors_0.ts ===
+
+export class SimpleConstructor {
+>SimpleConstructor : SimpleConstructor
+
+    /** This comment should appear for foo*/
+    constructor() {
+    }
+}
+export class ConstructorWithParameters {
+>ConstructorWithParameters : ConstructorWithParameters
+
+    /** This is comment for function signature*/
+    constructor(/** this is comment about a*/a: string,
+>a : string
+
+        /** this is comment for b*/
+        b: number) {
+>b : number
+
+        var d = a;
+>d : string
+>a : string
+    }
+}
+
+export class ConstructorWithRestParamters {
+>ConstructorWithRestParamters : ConstructorWithRestParamters
+
+    constructor(a: string, ...rests: string[]) {
+>a : string
+>rests : string[]
+
+        return a + rests.join("");
+>a + rests.join("") : string
+>a : string
+>rests.join("") : string
+>rests.join : (separator?: string) => string
+>rests : string[]
+>join : (separator?: string) => string
+    }
+}
+
+export class ConstructorWithOverloads {
+>ConstructorWithOverloads : ConstructorWithOverloads
+
+    constructor(a: string);
+>a : string
+
+    constructor(a: number);
+>a : number
+
+    constructor(a: any) {
+>a : any
+    }
+}
+
+export class ConstructorWithPublicParameterProperty {
+>ConstructorWithPublicParameterProperty : ConstructorWithPublicParameterProperty
+
+    constructor(public x: string) {
+>x : string
+    }
+}
+
+export class ConstructorWithPrivateParameterProperty {
+>ConstructorWithPrivateParameterProperty : ConstructorWithPrivateParameterProperty
+
+    constructor(private x: string) {
+>x : string
+    }
+}
+
+export class ConstructorWithOptionalParameterProperty {
+>ConstructorWithOptionalParameterProperty : ConstructorWithOptionalParameterProperty
+
+    constructor(public x?: string) {
+>x : string
+    }
+}
+
+export class ConstructorWithParameterInitializer {
+>ConstructorWithParameterInitializer : ConstructorWithParameterInitializer
+
+    constructor(public x = "hello") {
+>x : string
+    }
+}
+
+=== tests/cases/compiler/declFileConstructors_1.ts ===
+class GlobalSimpleConstructor {
+>GlobalSimpleConstructor : GlobalSimpleConstructor
+
+    /** This comment should appear for foo*/
+    constructor() {
+    }
+}
+class GlobalConstructorWithParameters {
+>GlobalConstructorWithParameters : GlobalConstructorWithParameters
+
+    /** This is comment for function signature*/
+    constructor(/** this is comment about a*/a: string,
+>a : string
+
+        /** this is comment for b*/
+        b: number) {
+>b : number
+
+        var d = a;
+>d : string
+>a : string
+    }
+}
+
+class GlobalConstructorWithRestParamters {
+>GlobalConstructorWithRestParamters : GlobalConstructorWithRestParamters
+
+    constructor(a: string, ...rests: string[]) {
+>a : string
+>rests : string[]
+
+        return a + rests.join("");
+>a + rests.join("") : string
+>a : string
+>rests.join("") : string
+>rests.join : (separator?: string) => string
+>rests : string[]
+>join : (separator?: string) => string
+    }
+}
+
+class GlobalConstructorWithOverloads {
+>GlobalConstructorWithOverloads : GlobalConstructorWithOverloads
+
+    constructor(a: string);
+>a : string
+
+    constructor(a: number);
+>a : number
+
+    constructor(a: any) {
+>a : any
+    }
+}
+
+class GlobalConstructorWithPublicParameterProperty {
+>GlobalConstructorWithPublicParameterProperty : GlobalConstructorWithPublicParameterProperty
+
+    constructor(public x: string) {
+>x : string
+    }
+}
+
+class GlobalConstructorWithPrivateParameterProperty {
+>GlobalConstructorWithPrivateParameterProperty : GlobalConstructorWithPrivateParameterProperty
+
+    constructor(private x: string) {
+>x : string
+    }
+}
+
+class GlobalConstructorWithOptionalParameterProperty {
+>GlobalConstructorWithOptionalParameterProperty : GlobalConstructorWithOptionalParameterProperty
+
+    constructor(public x?: string) {
+>x : string
+    }
+}
+
+class GlobalConstructorWithParameterInitializer {
+>GlobalConstructorWithParameterInitializer : GlobalConstructorWithParameterInitializer
+
+    constructor(public x = "hello") {
+>x : string
+    }
+}
diff --git a/tests/baselines/reference/declFileFunctions.js b/tests/baselines/reference/declFileFunctions.js
new file mode 100644
index 00000000000..b5018e1fb1d
--- /dev/null
+++ b/tests/baselines/reference/declFileFunctions.js
@@ -0,0 +1,146 @@
+//// [tests/cases/compiler/declFileFunctions.ts] ////
+
+//// [declFileFunctions_0.ts]
+
+/** This comment should appear for foo*/
+export function foo() {
+}
+/** This is comment for function signature*/
+export function fooWithParameters(/** this is comment about a*/a: string,
+    /** this is comment for b*/
+    b: number) {
+    var d = a;
+}
+export function fooWithRestParameters(a: string, ...rests: string[]) {
+    return a + rests.join("");
+}
+
+export function fooWithOverloads(a: string): string;
+export function fooWithOverloads(a: number): number;
+export function fooWithOverloads(a: any): any {
+    return a;
+}
+
+/** This comment should appear for nonExportedFoo*/
+function nonExportedFoo() {
+}
+/** This is comment for function signature*/
+function nonExportedFooWithParameters(/** this is comment about a*/a: string,
+    /** this is comment for b*/
+    b: number) {
+    var d = a;
+}
+function nonExportedFooWithRestParameters(a: string, ...rests: string[]) {
+    return a + rests.join("");
+}
+
+function nonExportedFooWithOverloads(a: string): string;
+function nonExportedFooWithOverloads(a: number): number;
+function nonExportedFooWithOverloads(a: any): any {
+    return a;
+}
+
+//// [declFileFunctions_1.ts]
+/** This comment should appear for foo*/
+function globalfoo() {
+}
+/** This is comment for function signature*/
+function globalfooWithParameters(/** this is comment about a*/a: string,
+    /** this is comment for b*/
+    b: number) {
+    var d = a;
+}
+function globalfooWithRestParameters(a: string, ...rests: string[]) {
+    return a + rests.join("");
+}
+function globalfooWithOverloads(a: string): string;
+function globalfooWithOverloads(a: number): number;
+function globalfooWithOverloads(a: any): any {
+    return a;
+}
+
+//// [declFileFunctions_0.js]
+/** This comment should appear for foo*/
+function foo() {
+}
+exports.foo = foo;
+/** This is comment for function signature*/
+function fooWithParameters(/** this is comment about a*/ a, 
+    /** this is comment for b*/
+    b) {
+    var d = a;
+}
+exports.fooWithParameters = fooWithParameters;
+function fooWithRestParameters(a) {
+    var rests = [];
+    for (var _i = 1; _i < arguments.length; _i++) {
+        rests[_i - 1] = arguments[_i];
+    }
+    return a + rests.join("");
+}
+exports.fooWithRestParameters = fooWithRestParameters;
+function fooWithOverloads(a) {
+    return a;
+}
+exports.fooWithOverloads = fooWithOverloads;
+/** This comment should appear for nonExportedFoo*/
+function nonExportedFoo() {
+}
+/** This is comment for function signature*/
+function nonExportedFooWithParameters(/** this is comment about a*/ a, 
+    /** this is comment for b*/
+    b) {
+    var d = a;
+}
+function nonExportedFooWithRestParameters(a) {
+    var rests = [];
+    for (var _i = 1; _i < arguments.length; _i++) {
+        rests[_i - 1] = arguments[_i];
+    }
+    return a + rests.join("");
+}
+function nonExportedFooWithOverloads(a) {
+    return a;
+}
+//// [declFileFunctions_1.js]
+/** This comment should appear for foo*/
+function globalfoo() {
+}
+/** This is comment for function signature*/
+function globalfooWithParameters(/** this is comment about a*/ a, 
+    /** this is comment for b*/
+    b) {
+    var d = a;
+}
+function globalfooWithRestParameters(a) {
+    var rests = [];
+    for (var _i = 1; _i < arguments.length; _i++) {
+        rests[_i - 1] = arguments[_i];
+    }
+    return a + rests.join("");
+}
+function globalfooWithOverloads(a) {
+    return a;
+}
+
+
+//// [declFileFunctions_0.d.ts]
+/** This comment should appear for foo*/
+export declare function foo(): void;
+/** This is comment for function signature*/
+export declare function fooWithParameters(/** this is comment about a*/ a: string, 
+    /** this is comment for b*/
+    b: number): void;
+export declare function fooWithRestParameters(a: string, ...rests: string[]): string;
+export declare function fooWithOverloads(a: string): string;
+export declare function fooWithOverloads(a: number): number;
+//// [declFileFunctions_1.d.ts]
+/** This comment should appear for foo*/
+declare function globalfoo(): void;
+/** This is comment for function signature*/
+declare function globalfooWithParameters(/** this is comment about a*/ a: string, 
+    /** this is comment for b*/
+    b: number): void;
+declare function globalfooWithRestParameters(a: string, ...rests: string[]): string;
+declare function globalfooWithOverloads(a: string): string;
+declare function globalfooWithOverloads(a: number): number;
diff --git a/tests/baselines/reference/declFileFunctions.types b/tests/baselines/reference/declFileFunctions.types
new file mode 100644
index 00000000000..841c47a6ca0
--- /dev/null
+++ b/tests/baselines/reference/declFileFunctions.types
@@ -0,0 +1,142 @@
+=== tests/cases/compiler/declFileFunctions_0.ts ===
+
+/** This comment should appear for foo*/
+export function foo() {
+>foo : typeof foo
+}
+/** This is comment for function signature*/
+export function fooWithParameters(/** this is comment about a*/a: string,
+>fooWithParameters : typeof fooWithParameters
+>a : string
+
+    /** this is comment for b*/
+    b: number) {
+>b : number
+
+    var d = a;
+>d : string
+>a : string
+}
+export function fooWithRestParameters(a: string, ...rests: string[]) {
+>fooWithRestParameters : typeof fooWithRestParameters
+>a : string
+>rests : string[]
+
+    return a + rests.join("");
+>a + rests.join("") : string
+>a : string
+>rests.join("") : string
+>rests.join : (separator?: string) => string
+>rests : string[]
+>join : (separator?: string) => string
+}
+
+export function fooWithOverloads(a: string): string;
+>fooWithOverloads : typeof fooWithOverloads
+>a : string
+
+export function fooWithOverloads(a: number): number;
+>fooWithOverloads : typeof fooWithOverloads
+>a : number
+
+export function fooWithOverloads(a: any): any {
+>fooWithOverloads : typeof fooWithOverloads
+>a : any
+
+    return a;
+>a : any
+}
+
+/** This comment should appear for nonExportedFoo*/
+function nonExportedFoo() {
+>nonExportedFoo : typeof nonExportedFoo
+}
+/** This is comment for function signature*/
+function nonExportedFooWithParameters(/** this is comment about a*/a: string,
+>nonExportedFooWithParameters : typeof nonExportedFooWithParameters
+>a : string
+
+    /** this is comment for b*/
+    b: number) {
+>b : number
+
+    var d = a;
+>d : string
+>a : string
+}
+function nonExportedFooWithRestParameters(a: string, ...rests: string[]) {
+>nonExportedFooWithRestParameters : typeof nonExportedFooWithRestParameters
+>a : string
+>rests : string[]
+
+    return a + rests.join("");
+>a + rests.join("") : string
+>a : string
+>rests.join("") : string
+>rests.join : (separator?: string) => string
+>rests : string[]
+>join : (separator?: string) => string
+}
+
+function nonExportedFooWithOverloads(a: string): string;
+>nonExportedFooWithOverloads : typeof nonExportedFooWithOverloads
+>a : string
+
+function nonExportedFooWithOverloads(a: number): number;
+>nonExportedFooWithOverloads : typeof nonExportedFooWithOverloads
+>a : number
+
+function nonExportedFooWithOverloads(a: any): any {
+>nonExportedFooWithOverloads : typeof nonExportedFooWithOverloads
+>a : any
+
+    return a;
+>a : any
+}
+
+=== tests/cases/compiler/declFileFunctions_1.ts ===
+/** This comment should appear for foo*/
+function globalfoo() {
+>globalfoo : typeof globalfoo
+}
+/** This is comment for function signature*/
+function globalfooWithParameters(/** this is comment about a*/a: string,
+>globalfooWithParameters : typeof globalfooWithParameters
+>a : string
+
+    /** this is comment for b*/
+    b: number) {
+>b : number
+
+    var d = a;
+>d : string
+>a : string
+}
+function globalfooWithRestParameters(a: string, ...rests: string[]) {
+>globalfooWithRestParameters : typeof globalfooWithRestParameters
+>a : string
+>rests : string[]
+
+    return a + rests.join("");
+>a + rests.join("") : string
+>a : string
+>rests.join("") : string
+>rests.join : (separator?: string) => string
+>rests : string[]
+>join : (separator?: string) => string
+}
+function globalfooWithOverloads(a: string): string;
+>globalfooWithOverloads : typeof globalfooWithOverloads
+>a : string
+
+function globalfooWithOverloads(a: number): number;
+>globalfooWithOverloads : typeof globalfooWithOverloads
+>a : number
+
+function globalfooWithOverloads(a: any): any {
+>globalfooWithOverloads : typeof globalfooWithOverloads
+>a : any
+
+    return a;
+>a : any
+}
diff --git a/tests/baselines/reference/declFileImportChainInExportAssignment.js b/tests/baselines/reference/declFileImportChainInExportAssignment.js
new file mode 100644
index 00000000000..73d8ede215a
--- /dev/null
+++ b/tests/baselines/reference/declFileImportChainInExportAssignment.js
@@ -0,0 +1,39 @@
+//// [declFileImportChainInExportAssignment.ts]
+module m {
+    export module c {
+        export class c {
+        }
+    }
+}
+import a = m.c;
+import b = a;
+export = b;
+
+//// [declFileImportChainInExportAssignment.js]
+var m;
+(function (m) {
+    (function (_c) {
+        var c = (function () {
+            function c() {
+            }
+            return c;
+        })();
+        _c.c = c;
+    })(m.c || (m.c = {}));
+    var c = m.c;
+})(m || (m = {}));
+var a = m.c;
+var b = a;
+module.exports = b;
+
+
+//// [declFileImportChainInExportAssignment.d.ts]
+declare module m {
+    module c {
+        class c {
+        }
+    }
+}
+import a = m.c;
+import b = a;
+export = b;
diff --git a/tests/baselines/reference/declFileImportChainInExportAssignment.types b/tests/baselines/reference/declFileImportChainInExportAssignment.types
new file mode 100644
index 00000000000..ab46446bd73
--- /dev/null
+++ b/tests/baselines/reference/declFileImportChainInExportAssignment.types
@@ -0,0 +1,24 @@
+=== tests/cases/compiler/declFileImportChainInExportAssignment.ts ===
+module m {
+>m : m
+
+    export module c {
+>c : m.c
+
+        export class c {
+>c : c
+        }
+    }
+}
+import a = m.c;
+>a : a
+>m : typeof m
+>c : typeof a
+
+import b = a;
+>b : b
+>a : typeof a
+
+export = b;
+>b : typeof a
+
diff --git a/tests/baselines/reference/declFileIndexSignatures.js b/tests/baselines/reference/declFileIndexSignatures.js
new file mode 100644
index 00000000000..547c3f47060
--- /dev/null
+++ b/tests/baselines/reference/declFileIndexSignatures.js
@@ -0,0 +1,69 @@
+//// [tests/cases/compiler/declFileIndexSignatures.ts] ////
+
+//// [declFileIndexSignatures_0.ts]
+
+export interface IStringIndexSignature {
+    [s: string]: string;
+}
+export interface INumberIndexSignature {
+    [n: number]: number;
+}
+
+export interface IBothIndexSignature {
+    [s: string]: any;
+    [n: number]: number;
+}
+
+export interface IIndexSignatureWithTypeParameter<T> {
+    [a: string]: T;
+}
+
+//// [declFileIndexSignatures_1.ts]
+interface IGlobalStringIndexSignature {
+    [s: string]: string;
+}
+interface IGlobalNumberIndexSignature {
+    [n: number]: number;
+}
+
+interface IGlobalBothIndexSignature {
+    [s: string]: any;
+    [n: number]: number;
+}
+
+interface IGlobalIndexSignatureWithTypeParameter<T> {
+    [a: string]: T;
+}
+
+//// [declFileIndexSignatures_0.js]
+//// [declFileIndexSignatures_1.js]
+
+
+//// [declFileIndexSignatures_0.d.ts]
+export interface IStringIndexSignature {
+    [s: string]: string;
+}
+export interface INumberIndexSignature {
+    [n: number]: number;
+}
+export interface IBothIndexSignature {
+    [s: string]: any;
+    [n: number]: number;
+}
+export interface IIndexSignatureWithTypeParameter<T> {
+    [a: string]: T;
+}
+//// [declFileIndexSignatures_1.d.ts]
+interface IGlobalStringIndexSignature {
+    [s: string]: string;
+}
+interface IGlobalNumberIndexSignature {
+    [n: number]: number;
+}
+interface IGlobalBothIndexSignature {
+    [s: string]: any;
+    [n: number]: number;
+}
+interface IGlobalIndexSignatureWithTypeParameter<T> {
+    [a: string]: T;
+}
diff --git a/tests/baselines/reference/declFileIndexSignatures.types b/tests/baselines/reference/declFileIndexSignatures.types
new file mode 100644
index 00000000000..c971fb4aeb0
--- /dev/null
+++ b/tests/baselines/reference/declFileIndexSignatures.types
@@ -0,0 +1,66 @@
+=== 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
+
+    [n: number]: number;
+>n : number
+}
+
+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
+
+    [n: number]: number;
+>n : number
+}
+
+interface IGlobalIndexSignatureWithTypeParameter<T> {
+>IGlobalIndexSignatureWithTypeParameter : IGlobalIndexSignatureWithTypeParameter<T>
+>T : T
+
+    [a: string]: T;
+>a : string
+>T : T
+}
diff --git a/tests/baselines/reference/declFileMethods.js b/tests/baselines/reference/declFileMethods.js
new file mode 100644
index 00000000000..2b82a4b71b5
--- /dev/null
+++ b/tests/baselines/reference/declFileMethods.js
@@ -0,0 +1,459 @@
+//// [tests/cases/compiler/declFileMethods.ts] ////
+
+//// [declFileMethods_0.ts]
+
+export class c1 {
+    /** This comment should appear for foo*/
+    public foo() {
+    }
+    /** This is comment for function signature*/
+    public fooWithParameters(/** this is comment about a*/a: string,
+        /** this is comment for b*/
+        b: number) {
+        var d = a;
+    }
+    public fooWithRestParameters(a: string, ...rests: string[]) {
+        return a + rests.join("");
+    }
+
+    public fooWithOverloads(a: string): string;
+    public fooWithOverloads(a: number): number;
+    public fooWithOverloads(a: any): any {
+        return a;
+    }
+
+
+    /** This comment should appear for privateFoo*/
+    private privateFoo() {
+    }
+    /** This is comment for function signature*/
+    private privateFooWithParameters(/** this is comment about a*/a: string,
+        /** this is comment for b*/
+        b: number) {
+        var d = a;
+    }
+    private privateFooWithRestParameters(a: string, ...rests: string[]) {
+        return a + rests.join("");
+    }
+    private privateFooWithOverloads(a: string): string;
+    private privateFooWithOverloads(a: number): number;
+    private privateFooWithOverloads(a: any): any {
+        return a;
+    }
+
+
+    /** This comment should appear for static foo*/
+    static staticFoo() {
+    }
+    /** This is comment for function signature*/
+    static staticFooWithParameters(/** this is comment about a*/a: string,
+        /** this is comment for b*/
+        b: number) {
+        var d = a;
+    }
+    static staticFooWithRestParameters(a: string, ...rests: string[]) {
+        return a + rests.join("");
+    }
+    static staticFooWithOverloads(a: string): string;
+    static staticFooWithOverloads(a: number): number;
+    static staticFooWithOverloads(a: any): any {
+        return a;
+    }
+
+
+    /** This comment should appear for privateStaticFoo*/
+    private static privateStaticFoo() {
+    }
+    /** This is comment for function signature*/
+    private static privateStaticFooWithParameters(/** this is comment about a*/a: string,
+        /** this is comment for b*/
+        b: number) {
+        var d = a;
+    }
+    private static privateStaticFooWithRestParameters(a: string, ...rests: string[]) {
+        return a + rests.join("");
+    }
+    private static privateStaticFooWithOverloads(a: string): string;
+    private static privateStaticFooWithOverloads(a: number): number;
+    private static privateStaticFooWithOverloads(a: any): any {
+        return a;
+    }
+}
+
+export interface I1 {
+    /** This comment should appear for foo*/
+    foo(): string;
+
+    /** This is comment for function signature*/
+    fooWithParameters(/** this is comment about a*/a: string,
+        /** this is comment for b*/
+        b: number): void;
+
+    fooWithRestParameters(a: string, ...rests: string[]): string;
+
+    fooWithOverloads(a: string): string;
+    fooWithOverloads(a: number): number;
+}
+
+//// [declFileMethods_1.ts]
+class c2 {
+    /** This comment should appear for foo*/
+    public foo() {
+    }
+    /** This is comment for function signature*/
+    public fooWithParameters(/** this is comment about a*/a: string,
+        /** this is comment for b*/
+        b: number) {
+        var d = a;
+    }
+    public fooWithRestParameters(a: string, ...rests: string[]) {
+        return a + rests.join("");
+    }
+
+    public fooWithOverloads(a: string): string;
+    public fooWithOverloads(a: number): number;
+    public fooWithOverloads(a: any): any {
+        return a;
+    }
+
+
+    /** This comment should appear for privateFoo*/
+    private privateFoo() {
+    }
+    /** This is comment for function signature*/
+    private privateFooWithParameters(/** this is comment about a*/a: string,
+        /** this is comment for b*/
+        b: number) {
+        var d = a;
+    }
+    private privateFooWithRestParameters(a: string, ...rests: string[]) {
+        return a + rests.join("");
+    }
+    private privateFooWithOverloads(a: string): string;
+    private privateFooWithOverloads(a: number): number;
+    private privateFooWithOverloads(a: any): any {
+        return a;
+    }
+
+
+    /** This comment should appear for static foo*/
+    static staticFoo() {
+    }
+    /** This is comment for function signature*/
+    static staticFooWithParameters(/** this is comment about a*/a: string,
+        /** this is comment for b*/
+        b: number) {
+        var d = a;
+    }
+    static staticFooWithRestParameters(a: string, ...rests: string[]) {
+        return a + rests.join("");
+    }
+    static staticFooWithOverloads(a: string): string;
+    static staticFooWithOverloads(a: number): number;
+    static staticFooWithOverloads(a: any): any {
+        return a;
+    }
+
+
+    /** This comment should appear for privateStaticFoo*/
+    private static privateStaticFoo() {
+    }
+    /** This is comment for function signature*/
+    private static privateStaticFooWithParameters(/** this is comment about a*/a: string,
+        /** this is comment for b*/
+        b: number) {
+        var d = a;
+    }
+    private static privateStaticFooWithRestParameters(a: string, ...rests: string[]) {
+        return a + rests.join("");
+    }
+    private static privateStaticFooWithOverloads(a: string): string;
+    private static privateStaticFooWithOverloads(a: number): number;
+    private static privateStaticFooWithOverloads(a: any): any {
+        return a;
+    }
+}
+
+interface I2 {
+    /** This comment should appear for foo*/
+    foo(): string;
+
+    /** This is comment for function signature*/
+    fooWithParameters(/** this is comment about a*/a: string,
+        /** this is comment for b*/
+        b: number): void;
+
+    fooWithRestParameters(a: string, ...rests: string[]): string;
+
+    fooWithOverloads(a: string): string;
+    fooWithOverloads(a: number): number;
+}
+
+
+//// [declFileMethods_0.js]
+var c1 = (function () {
+    function c1() {
+    }
+    /** This comment should appear for foo*/
+    c1.prototype.foo = function () {
+    };
+    /** This is comment for function signature*/
+    c1.prototype.fooWithParameters = function (/** this is comment about a*/ a, 
+        /** this is comment for b*/
+        b) {
+        var d = a;
+    };
+    c1.prototype.fooWithRestParameters = function (a) {
+        var rests = [];
+        for (var _i = 1; _i < arguments.length; _i++) {
+            rests[_i - 1] = arguments[_i];
+        }
+        return a + rests.join("");
+    };
+    c1.prototype.fooWithOverloads = function (a) {
+        return a;
+    };
+    /** This comment should appear for privateFoo*/
+    c1.prototype.privateFoo = function () {
+    };
+    /** This is comment for function signature*/
+    c1.prototype.privateFooWithParameters = function (/** this is comment about a*/ a, 
+        /** this is comment for b*/
+        b) {
+        var d = a;
+    };
+    c1.prototype.privateFooWithRestParameters = function (a) {
+        var rests = [];
+        for (var _i = 1; _i < arguments.length; _i++) {
+            rests[_i - 1] = arguments[_i];
+        }
+        return a + rests.join("");
+    };
+    c1.prototype.privateFooWithOverloads = function (a) {
+        return a;
+    };
+    /** This comment should appear for static foo*/
+    c1.staticFoo = function () {
+    };
+    /** This is comment for function signature*/
+    c1.staticFooWithParameters = function (/** this is comment about a*/ a, 
+        /** this is comment for b*/
+        b) {
+        var d = a;
+    };
+    c1.staticFooWithRestParameters = function (a) {
+        var rests = [];
+        for (var _i = 1; _i < arguments.length; _i++) {
+            rests[_i - 1] = arguments[_i];
+        }
+        return a + rests.join("");
+    };
+    c1.staticFooWithOverloads = function (a) {
+        return a;
+    };
+    /** This comment should appear for privateStaticFoo*/
+    c1.privateStaticFoo = function () {
+    };
+    /** This is comment for function signature*/
+    c1.privateStaticFooWithParameters = function (/** this is comment about a*/ a, 
+        /** this is comment for b*/
+        b) {
+        var d = a;
+    };
+    c1.privateStaticFooWithRestParameters = function (a) {
+        var rests = [];
+        for (var _i = 1; _i < arguments.length; _i++) {
+            rests[_i - 1] = arguments[_i];
+        }
+        return a + rests.join("");
+    };
+    c1.privateStaticFooWithOverloads = function (a) {
+        return a;
+    };
+    return c1;
+})();
+exports.c1 = c1;
+//// [declFileMethods_1.js]
+var c2 = (function () {
+    function c2() {
+    }
+    /** This comment should appear for foo*/
+    c2.prototype.foo = function () {
+    };
+    /** This is comment for function signature*/
+    c2.prototype.fooWithParameters = function (/** this is comment about a*/ a, 
+        /** this is comment for b*/
+        b) {
+        var d = a;
+    };
+    c2.prototype.fooWithRestParameters = function (a) {
+        var rests = [];
+        for (var _i = 1; _i < arguments.length; _i++) {
+            rests[_i - 1] = arguments[_i];
+        }
+        return a + rests.join("");
+    };
+    c2.prototype.fooWithOverloads = function (a) {
+        return a;
+    };
+    /** This comment should appear for privateFoo*/
+    c2.prototype.privateFoo = function () {
+    };
+    /** This is comment for function signature*/
+    c2.prototype.privateFooWithParameters = function (/** this is comment about a*/ a, 
+        /** this is comment for b*/
+        b) {
+        var d = a;
+    };
+    c2.prototype.privateFooWithRestParameters = function (a) {
+        var rests = [];
+        for (var _i = 1; _i < arguments.length; _i++) {
+            rests[_i - 1] = arguments[_i];
+        }
+        return a + rests.join("");
+    };
+    c2.prototype.privateFooWithOverloads = function (a) {
+        return a;
+    };
+    /** This comment should appear for static foo*/
+    c2.staticFoo = function () {
+    };
+    /** This is comment for function signature*/
+    c2.staticFooWithParameters = function (/** this is comment about a*/ a, 
+        /** this is comment for b*/
+        b) {
+        var d = a;
+    };
+    c2.staticFooWithRestParameters = function (a) {
+        var rests = [];
+        for (var _i = 1; _i < arguments.length; _i++) {
+            rests[_i - 1] = arguments[_i];
+        }
+        return a + rests.join("");
+    };
+    c2.staticFooWithOverloads = function (a) {
+        return a;
+    };
+    /** This comment should appear for privateStaticFoo*/
+    c2.privateStaticFoo = function () {
+    };
+    /** This is comment for function signature*/
+    c2.privateStaticFooWithParameters = function (/** this is comment about a*/ a, 
+        /** this is comment for b*/
+        b) {
+        var d = a;
+    };
+    c2.privateStaticFooWithRestParameters = function (a) {
+        var rests = [];
+        for (var _i = 1; _i < arguments.length; _i++) {
+            rests[_i - 1] = arguments[_i];
+        }
+        return a + rests.join("");
+    };
+    c2.privateStaticFooWithOverloads = function (a) {
+        return a;
+    };
+    return c2;
+})();
+
+
+//// [declFileMethods_0.d.ts]
+export declare class c1 {
+    /** This comment should appear for foo*/
+    foo(): void;
+    /** This is comment for function signature*/
+    fooWithParameters(/** this is comment about a*/ a: string, 
+        /** this is comment for b*/
+        b: number): void;
+    fooWithRestParameters(a: string, ...rests: string[]): string;
+    fooWithOverloads(a: string): string;
+    fooWithOverloads(a: number): number;
+    /** This comment should appear for privateFoo*/
+    private privateFoo();
+    /** This is comment for function signature*/
+    private privateFooWithParameters(/** this is comment about a*/ a, 
+        /** this is comment for b*/
+        b);
+    private privateFooWithRestParameters(a, ...rests);
+    private privateFooWithOverloads(a);
+    private privateFooWithOverloads(a);
+    /** This comment should appear for static foo*/
+    static staticFoo(): void;
+    /** This is comment for function signature*/
+    static staticFooWithParameters(/** this is comment about a*/ a: string, 
+        /** this is comment for b*/
+        b: number): void;
+    static staticFooWithRestParameters(a: string, ...rests: string[]): string;
+    static staticFooWithOverloads(a: string): string;
+    static staticFooWithOverloads(a: number): number;
+    /** This comment should appear for privateStaticFoo*/
+    private static privateStaticFoo();
+    /** This is comment for function signature*/
+    private static privateStaticFooWithParameters(/** this is comment about a*/ a, 
+        /** this is comment for b*/
+        b);
+    private static privateStaticFooWithRestParameters(a, ...rests);
+    private static privateStaticFooWithOverloads(a);
+    private static privateStaticFooWithOverloads(a);
+}
+export interface I1 {
+    /** This comment should appear for foo*/
+    foo(): string;
+    /** This is comment for function signature*/
+    fooWithParameters(/** this is comment about a*/ a: string, 
+        /** this is comment for b*/
+        b: number): void;
+    fooWithRestParameters(a: string, ...rests: string[]): string;
+    fooWithOverloads(a: string): string;
+    fooWithOverloads(a: number): number;
+}
+//// [declFileMethods_1.d.ts]
+declare class c2 {
+    /** This comment should appear for foo*/
+    foo(): void;
+    /** This is comment for function signature*/
+    fooWithParameters(/** this is comment about a*/ a: string, 
+        /** this is comment for b*/
+        b: number): void;
+    fooWithRestParameters(a: string, ...rests: string[]): string;
+    fooWithOverloads(a: string): string;
+    fooWithOverloads(a: number): number;
+    /** This comment should appear for privateFoo*/
+    private privateFoo();
+    /** This is comment for function signature*/
+    private privateFooWithParameters(/** this is comment about a*/ a, 
+        /** this is comment for b*/
+        b);
+    private privateFooWithRestParameters(a, ...rests);
+    private privateFooWithOverloads(a);
+    private privateFooWithOverloads(a);
+    /** This comment should appear for static foo*/
+    static staticFoo(): void;
+    /** This is comment for function signature*/
+    static staticFooWithParameters(/** this is comment about a*/ a: string, 
+        /** this is comment for b*/
+        b: number): void;
+    static staticFooWithRestParameters(a: string, ...rests: string[]): string;
+    static staticFooWithOverloads(a: string): string;
+    static staticFooWithOverloads(a: number): number;
+    /** This comment should appear for privateStaticFoo*/
+    private static privateStaticFoo();
+    /** This is comment for function signature*/
+    private static privateStaticFooWithParameters(/** this is comment about a*/ a, 
+        /** this is comment for b*/
+        b);
+    private static privateStaticFooWithRestParameters(a, ...rests);
+    private static privateStaticFooWithOverloads(a);
+    private static privateStaticFooWithOverloads(a);
+}
+interface I2 {
+    /** This comment should appear for foo*/
+    foo(): string;
+    /** This is comment for function signature*/
+    fooWithParameters(/** this is comment about a*/ a: string, 
+        /** this is comment for b*/
+        b: number): void;
+    fooWithRestParameters(a: string, ...rests: string[]): string;
+    fooWithOverloads(a: string): string;
+    fooWithOverloads(a: number): number;
+}
diff --git a/tests/baselines/reference/declFileMethods.types b/tests/baselines/reference/declFileMethods.types
new file mode 100644
index 00000000000..6432540f5a4
--- /dev/null
+++ b/tests/baselines/reference/declFileMethods.types
@@ -0,0 +1,447 @@
+=== tests/cases/compiler/declFileMethods_0.ts ===
+
+export class c1 {
+>c1 : c1
+
+    /** This comment should appear for foo*/
+    public foo() {
+>foo : () => void
+    }
+    /** This is comment for function signature*/
+    public fooWithParameters(/** this is comment about a*/a: string,
+>fooWithParameters : (a: string, b: number) => void
+>a : string
+
+        /** this is comment for b*/
+        b: number) {
+>b : number
+
+        var d = a;
+>d : string
+>a : string
+    }
+    public fooWithRestParameters(a: string, ...rests: string[]) {
+>fooWithRestParameters : (a: string, ...rests: string[]) => string
+>a : string
+>rests : string[]
+
+        return a + rests.join("");
+>a + rests.join("") : string
+>a : string
+>rests.join("") : string
+>rests.join : (separator?: string) => string
+>rests : string[]
+>join : (separator?: string) => string
+    }
+
+    public fooWithOverloads(a: string): string;
+>fooWithOverloads : { (a: string): string; (a: number): number; }
+>a : string
+
+    public fooWithOverloads(a: number): number;
+>fooWithOverloads : { (a: string): string; (a: number): number; }
+>a : number
+
+    public fooWithOverloads(a: any): any {
+>fooWithOverloads : { (a: string): string; (a: number): number; }
+>a : any
+
+        return a;
+>a : any
+    }
+
+
+    /** This comment should appear for privateFoo*/
+    private privateFoo() {
+>privateFoo : () => void
+    }
+    /** This is comment for function signature*/
+    private privateFooWithParameters(/** this is comment about a*/a: string,
+>privateFooWithParameters : (a: string, b: number) => void
+>a : string
+
+        /** this is comment for b*/
+        b: number) {
+>b : number
+
+        var d = a;
+>d : string
+>a : string
+    }
+    private privateFooWithRestParameters(a: string, ...rests: string[]) {
+>privateFooWithRestParameters : (a: string, ...rests: string[]) => string
+>a : string
+>rests : string[]
+
+        return a + rests.join("");
+>a + rests.join("") : string
+>a : string
+>rests.join("") : string
+>rests.join : (separator?: string) => string
+>rests : string[]
+>join : (separator?: string) => string
+    }
+    private privateFooWithOverloads(a: string): string;
+>privateFooWithOverloads : { (a: string): string; (a: number): number; }
+>a : string
+
+    private privateFooWithOverloads(a: number): number;
+>privateFooWithOverloads : { (a: string): string; (a: number): number; }
+>a : number
+
+    private privateFooWithOverloads(a: any): any {
+>privateFooWithOverloads : { (a: string): string; (a: number): number; }
+>a : any
+
+        return a;
+>a : any
+    }
+
+
+    /** This comment should appear for static foo*/
+    static staticFoo() {
+>staticFoo : () => void
+    }
+    /** This is comment for function signature*/
+    static staticFooWithParameters(/** this is comment about a*/a: string,
+>staticFooWithParameters : (a: string, b: number) => void
+>a : string
+
+        /** this is comment for b*/
+        b: number) {
+>b : number
+
+        var d = a;
+>d : string
+>a : string
+    }
+    static staticFooWithRestParameters(a: string, ...rests: string[]) {
+>staticFooWithRestParameters : (a: string, ...rests: string[]) => string
+>a : string
+>rests : string[]
+
+        return a + rests.join("");
+>a + rests.join("") : string
+>a : string
+>rests.join("") : string
+>rests.join : (separator?: string) => string
+>rests : string[]
+>join : (separator?: string) => string
+    }
+    static staticFooWithOverloads(a: string): string;
+>staticFooWithOverloads : { (a: string): string; (a: number): number; }
+>a : string
+
+    static staticFooWithOverloads(a: number): number;
+>staticFooWithOverloads : { (a: string): string; (a: number): number; }
+>a : number
+
+    static staticFooWithOverloads(a: any): any {
+>staticFooWithOverloads : { (a: string): string; (a: number): number; }
+>a : any
+
+        return a;
+>a : any
+    }
+
+
+    /** This comment should appear for privateStaticFoo*/
+    private static privateStaticFoo() {
+>privateStaticFoo : () => void
+    }
+    /** This is comment for function signature*/
+    private static privateStaticFooWithParameters(/** this is comment about a*/a: string,
+>privateStaticFooWithParameters : (a: string, b: number) => void
+>a : string
+
+        /** this is comment for b*/
+        b: number) {
+>b : number
+
+        var d = a;
+>d : string
+>a : string
+    }
+    private static privateStaticFooWithRestParameters(a: string, ...rests: string[]) {
+>privateStaticFooWithRestParameters : (a: string, ...rests: string[]) => string
+>a : string
+>rests : string[]
+
+        return a + rests.join("");
+>a + rests.join("") : string
+>a : string
+>rests.join("") : string
+>rests.join : (separator?: string) => string
+>rests : string[]
+>join : (separator?: string) => string
+    }
+    private static privateStaticFooWithOverloads(a: string): string;
+>privateStaticFooWithOverloads : { (a: string): string; (a: number): number; }
+>a : string
+
+    private static privateStaticFooWithOverloads(a: number): number;
+>privateStaticFooWithOverloads : { (a: string): string; (a: number): number; }
+>a : number
+
+    private static privateStaticFooWithOverloads(a: any): any {
+>privateStaticFooWithOverloads : { (a: string): string; (a: number): number; }
+>a : any
+
+        return a;
+>a : any
+    }
+}
+
+export interface I1 {
+>I1 : I1
+
+    /** This comment should appear for foo*/
+    foo(): string;
+>foo : () => string
+
+    /** This is comment for function signature*/
+    fooWithParameters(/** this is comment about a*/a: string,
+>fooWithParameters : (a: string, b: number) => void
+>a : string
+
+        /** this is comment for b*/
+        b: number): void;
+>b : number
+
+    fooWithRestParameters(a: string, ...rests: string[]): string;
+>fooWithRestParameters : (a: string, ...rests: string[]) => string
+>a : string
+>rests : string[]
+
+    fooWithOverloads(a: string): string;
+>fooWithOverloads : { (a: string): string; (a: number): number; }
+>a : string
+
+    fooWithOverloads(a: number): number;
+>fooWithOverloads : { (a: string): string; (a: number): number; }
+>a : number
+}
+
+=== tests/cases/compiler/declFileMethods_1.ts ===
+class c2 {
+>c2 : c2
+
+    /** This comment should appear for foo*/
+    public foo() {
+>foo : () => void
+    }
+    /** This is comment for function signature*/
+    public fooWithParameters(/** this is comment about a*/a: string,
+>fooWithParameters : (a: string, b: number) => void
+>a : string
+
+        /** this is comment for b*/
+        b: number) {
+>b : number
+
+        var d = a;
+>d : string
+>a : string
+    }
+    public fooWithRestParameters(a: string, ...rests: string[]) {
+>fooWithRestParameters : (a: string, ...rests: string[]) => string
+>a : string
+>rests : string[]
+
+        return a + rests.join("");
+>a + rests.join("") : string
+>a : string
+>rests.join("") : string
+>rests.join : (separator?: string) => string
+>rests : string[]
+>join : (separator?: string) => string
+    }
+
+    public fooWithOverloads(a: string): string;
+>fooWithOverloads : { (a: string): string; (a: number): number; }
+>a : string
+
+    public fooWithOverloads(a: number): number;
+>fooWithOverloads : { (a: string): string; (a: number): number; }
+>a : number
+
+    public fooWithOverloads(a: any): any {
+>fooWithOverloads : { (a: string): string; (a: number): number; }
+>a : any
+
+        return a;
+>a : any
+    }
+
+
+    /** This comment should appear for privateFoo*/
+    private privateFoo() {
+>privateFoo : () => void
+    }
+    /** This is comment for function signature*/
+    private privateFooWithParameters(/** this is comment about a*/a: string,
+>privateFooWithParameters : (a: string, b: number) => void
+>a : string
+
+        /** this is comment for b*/
+        b: number) {
+>b : number
+
+        var d = a;
+>d : string
+>a : string
+    }
+    private privateFooWithRestParameters(a: string, ...rests: string[]) {
+>privateFooWithRestParameters : (a: string, ...rests: string[]) => string
+>a : string
+>rests : string[]
+
+        return a + rests.join("");
+>a + rests.join("") : string
+>a : string
+>rests.join("") : string
+>rests.join : (separator?: string) => string
+>rests : string[]
+>join : (separator?: string) => string
+    }
+    private privateFooWithOverloads(a: string): string;
+>privateFooWithOverloads : { (a: string): string; (a: number): number; }
+>a : string
+
+    private privateFooWithOverloads(a: number): number;
+>privateFooWithOverloads : { (a: string): string; (a: number): number; }
+>a : number
+
+    private privateFooWithOverloads(a: any): any {
+>privateFooWithOverloads : { (a: string): string; (a: number): number; }
+>a : any
+
+        return a;
+>a : any
+    }
+
+
+    /** This comment should appear for static foo*/
+    static staticFoo() {
+>staticFoo : () => void
+    }
+    /** This is comment for function signature*/
+    static staticFooWithParameters(/** this is comment about a*/a: string,
+>staticFooWithParameters : (a: string, b: number) => void
+>a : string
+
+        /** this is comment for b*/
+        b: number) {
+>b : number
+
+        var d = a;
+>d : string
+>a : string
+    }
+    static staticFooWithRestParameters(a: string, ...rests: string[]) {
+>staticFooWithRestParameters : (a: string, ...rests: string[]) => string
+>a : string
+>rests : string[]
+
+        return a + rests.join("");
+>a + rests.join("") : string
+>a : string
+>rests.join("") : string
+>rests.join : (separator?: string) => string
+>rests : string[]
+>join : (separator?: string) => string
+    }
+    static staticFooWithOverloads(a: string): string;
+>staticFooWithOverloads : { (a: string): string; (a: number): number; }
+>a : string
+
+    static staticFooWithOverloads(a: number): number;
+>staticFooWithOverloads : { (a: string): string; (a: number): number; }
+>a : number
+
+    static staticFooWithOverloads(a: any): any {
+>staticFooWithOverloads : { (a: string): string; (a: number): number; }
+>a : any
+
+        return a;
+>a : any
+    }
+
+
+    /** This comment should appear for privateStaticFoo*/
+    private static privateStaticFoo() {
+>privateStaticFoo : () => void
+    }
+    /** This is comment for function signature*/
+    private static privateStaticFooWithParameters(/** this is comment about a*/a: string,
+>privateStaticFooWithParameters : (a: string, b: number) => void
+>a : string
+
+        /** this is comment for b*/
+        b: number) {
+>b : number
+
+        var d = a;
+>d : string
+>a : string
+    }
+    private static privateStaticFooWithRestParameters(a: string, ...rests: string[]) {
+>privateStaticFooWithRestParameters : (a: string, ...rests: string[]) => string
+>a : string
+>rests : string[]
+
+        return a + rests.join("");
+>a + rests.join("") : string
+>a : string
+>rests.join("") : string
+>rests.join : (separator?: string) => string
+>rests : string[]
+>join : (separator?: string) => string
+    }
+    private static privateStaticFooWithOverloads(a: string): string;
+>privateStaticFooWithOverloads : { (a: string): string; (a: number): number; }
+>a : string
+
+    private static privateStaticFooWithOverloads(a: number): number;
+>privateStaticFooWithOverloads : { (a: string): string; (a: number): number; }
+>a : number
+
+    private static privateStaticFooWithOverloads(a: any): any {
+>privateStaticFooWithOverloads : { (a: string): string; (a: number): number; }
+>a : any
+
+        return a;
+>a : any
+    }
+}
+
+interface I2 {
+>I2 : I2
+
+    /** This comment should appear for foo*/
+    foo(): string;
+>foo : () => string
+
+    /** This is comment for function signature*/
+    fooWithParameters(/** this is comment about a*/a: string,
+>fooWithParameters : (a: string, b: number) => void
+>a : string
+
+        /** this is comment for b*/
+        b: number): void;
+>b : number
+
+    fooWithRestParameters(a: string, ...rests: string[]): string;
+>fooWithRestParameters : (a: string, ...rests: string[]) => string
+>a : string
+>rests : string[]
+
+    fooWithOverloads(a: string): string;
+>fooWithOverloads : { (a: string): string; (a: number): number; }
+>a : string
+
+    fooWithOverloads(a: number): number;
+>fooWithOverloads : { (a: string): string; (a: number): number; }
+>a : number
+}
+
diff --git a/tests/baselines/reference/declarationEmit_nameConflicts.errors.txt b/tests/baselines/reference/declarationEmit_nameConflicts.errors.txt
deleted file mode 100644
index 6a202ec3e60..00000000000
--- a/tests/baselines/reference/declarationEmit_nameConflicts.errors.txt
+++ /dev/null
@@ -1,53 +0,0 @@
-==== tests/cases/compiler/declarationEmit_nameConflicts_0.ts (1 errors) ====
-    import im = require('declarationEmit_nameConflicts_1');
-    export module M {
-        export function f() { }
-        export class C { }
-        export module N {
-            export function g() { };
-            export interface I { }
-        }
-    
-        export import a = M.f;
-        export import b = M.C;
-        export import c = N;
-        export import d = im;
-        ~~~~~~~~~~~~~~~~~~~~~
-!!! Cannot find name 'im'.
-    }
-    
-    export module M.P {
-        export function f() { }
-        export class C { }
-        export module N {
-            export function g() { };
-            export interface I { }
-        }
-        export import im = M.P.f;
-        // Bug 887180: Invalid .d.ts when an aliased entity is referenced, and a different entity is closer in scope
-        export var a = M.a; // emitted incorrectly as typeof f
-        export var b = M.b; // ok
-        export var c = M.c; // ok
-        export var g = M.c.g; // ok
-        export var d = M.d; // emitted incorrectly as typeof im
-    }
-    
-    export module M.Q {
-        export function f() { }
-        export class C { }
-        export module N {
-            export function g() { };
-            export interface I { }
-        }
-        export interface b extends M.b { } // ok
-        export interface I extends M.c.I { } // ok
-        export module c {
-            export interface I extends M.c.I { } // ok
-        }
-    }
-==== tests/cases/compiler/declarationEmit_nameConflicts_1.ts (1 errors) ====
-    function f() { }
-    export = f;
-    ~~~~~~~~~~~
-!!! Cannot compile external modules unless the '--module' flag is provided.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/declarationEmit_nameConflicts.js b/tests/baselines/reference/declarationEmit_nameConflicts.js
new file mode 100644
index 00000000000..bbb7826707b
--- /dev/null
+++ b/tests/baselines/reference/declarationEmit_nameConflicts.js
@@ -0,0 +1,195 @@
+//// [tests/cases/compiler/declarationEmit_nameConflicts.ts] ////
+
+//// [declarationEmit_nameConflicts_1.ts]
+module f { export class c { } }
+export = f;
+
+//// [declarationEmit_nameConflicts_0.ts]
+import im = require('declarationEmit_nameConflicts_1');
+export module M {
+    export function f() { }
+    export class C { }
+    export module N {
+        export function g() { };
+        export interface I { }
+    }
+
+    export import a = M.f;
+    export import b = M.C;
+    export import c = N;
+    export import d = im;
+}
+
+export module M.P {
+    export function f() { }
+    export class C { }
+    export module N {
+        export function g() { };
+        export interface I { }
+    }
+    export import im = M.P.f;
+    export var a = M.a; // emitted incorrectly as typeof f
+    export var b = M.b; // ok
+    export var c = M.c; // ok
+    export var g = M.c.g; // ok
+    export var d = M.d; // emitted incorrectly as typeof im
+}
+
+export module M.Q {
+    export function f() { }
+    export class C { }
+    export module N {
+        export function g() { };
+        export interface I { }
+    }
+    export interface b extends M.b { } // ok
+    export interface I extends M.c.I { } // ok
+    export module c {
+        export interface I extends M.c.I { } // ok
+    }
+}
+
+//// [declarationEmit_nameConflicts_1.js]
+var f;
+(function (f) {
+    var c = (function () {
+        function c() {
+        }
+        return c;
+    })();
+    f.c = c;
+})(f || (f = {}));
+module.exports = f;
+//// [declarationEmit_nameConflicts_0.js]
+var im = require('declarationEmit_nameConflicts_1');
+(function (M) {
+    function f() {
+    }
+    M.f = f;
+    var C = (function () {
+        function C() {
+        }
+        return C;
+    })();
+    M.C = C;
+    (function (N) {
+        function g() {
+        }
+        N.g = g;
+        ;
+    })(M.N || (M.N = {}));
+    var N = M.N;
+    M.a = M.f;
+    M.b = M.C;
+    M.c = N;
+    M.d = im;
+})(exports.M || (exports.M = {}));
+var M = exports.M;
+(function (M) {
+    (function (P) {
+        function f() {
+        }
+        P.f = f;
+        var C = (function () {
+            function C() {
+            }
+            return C;
+        })();
+        P.C = C;
+        (function (N) {
+            function g() {
+            }
+            N.g = g;
+            ;
+        })(P.N || (P.N = {}));
+        var N = P.N;
+        P.im = M.P.f;
+        P.a = M.a; // emitted incorrectly as typeof f
+        P.b = M.b; // ok
+        P.c = M.c; // ok
+        P.g = M.c.g; // ok
+        P.d = M.d; // emitted incorrectly as typeof im
+    })(M.P || (M.P = {}));
+    var P = M.P;
+})(exports.M || (exports.M = {}));
+var M = exports.M;
+(function (M) {
+    (function (Q) {
+        function f() {
+        }
+        Q.f = f;
+        var C = (function () {
+            function C() {
+            }
+            return C;
+        })();
+        Q.C = C;
+        (function (N) {
+            function g() {
+            }
+            N.g = g;
+            ;
+        })(Q.N || (Q.N = {}));
+        var N = Q.N;
+    })(M.Q || (M.Q = {}));
+    var Q = M.Q;
+})(exports.M || (exports.M = {}));
+var M = exports.M;
+
+
+//// [declarationEmit_nameConflicts_1.d.ts]
+declare module f {
+    class c {
+    }
+}
+export = f;
+//// [declarationEmit_nameConflicts_0.d.ts]
+import im = require('declarationEmit_nameConflicts_1');
+export declare module M {
+    function f(): void;
+    class C {
+    }
+    module N {
+        function g(): void;
+        interface I {
+        }
+    }
+    export import a = M.f;
+    export import b = M.C;
+    export import c = N;
+    export import d = im;
+}
+export declare module M.P {
+    function f(): void;
+    class C {
+    }
+    module N {
+        function g(): void;
+        interface I {
+        }
+    }
+    export import im = M.P.f;
+    var a: typeof M.f;
+    var b: typeof M.C;
+    var c: typeof M.N;
+    var g: typeof M.c.g;
+    var d: typeof M.d;
+}
+export declare module M.Q {
+    function f(): void;
+    class C {
+    }
+    module N {
+        function g(): void;
+        interface I {
+        }
+    }
+    interface b extends M.C {
+    }
+    interface I extends M.c.I {
+    }
+    module c {
+        interface I extends M.c.I {
+        }
+    }
+}
diff --git a/tests/baselines/reference/declarationEmit_nameConflicts.types b/tests/baselines/reference/declarationEmit_nameConflicts.types
new file mode 100644
index 00000000000..3c9238cd8d0
--- /dev/null
+++ b/tests/baselines/reference/declarationEmit_nameConflicts.types
@@ -0,0 +1,148 @@
+=== tests/cases/compiler/declarationEmit_nameConflicts_0.ts ===
+import im = require('declarationEmit_nameConflicts_1');
+>im : im
+
+export module M {
+>M : M
+
+    export function f() { }
+>f : typeof f
+
+    export class C { }
+>C : C
+
+    export module N {
+>N : N
+
+        export function g() { };
+>g : typeof g
+
+        export interface I { }
+>I : I
+    }
+
+    export import a = M.f;
+>a : a
+>M : typeof M
+>f : typeof f
+
+    export import b = M.C;
+>b : b
+>M : typeof M
+>C : C
+
+    export import c = N;
+>c : c
+>N : typeof N
+
+    export import d = im;
+>d : d
+>im : typeof d
+}
+
+export module M.P {
+>M : M
+>P : P
+
+    export function f() { }
+>f : typeof f
+
+    export class C { }
+>C : C
+
+    export module N {
+>N : N
+
+        export function g() { };
+>g : typeof g
+
+        export interface I { }
+>I : I
+    }
+    export import im = M.P.f;
+>im : im
+>M : typeof M
+>P : typeof P
+>f : typeof f
+
+    export var a = M.a; // emitted incorrectly as typeof f
+>a : typeof M.f
+>M.a : typeof M.f
+>M : typeof M
+>a : typeof M.f
+
+    export var b = M.b; // ok
+>b : typeof M.C
+>M.b : typeof M.C
+>M : typeof M
+>b : typeof M.C
+
+    export var c = M.c; // ok
+>c : typeof M.N
+>M.c : typeof M.N
+>M : typeof M
+>c : typeof M.N
+
+    export var g = M.c.g; // ok
+>g : typeof M.c.g
+>M.c.g : typeof M.c.g
+>M.c : typeof M.N
+>M : typeof M
+>c : typeof M.N
+>g : typeof M.c.g
+
+    export var d = M.d; // emitted incorrectly as typeof im
+>d : typeof M.d
+>M.d : typeof M.d
+>M : typeof M
+>d : typeof M.d
+}
+
+export module M.Q {
+>M : M
+>Q : Q
+
+    export function f() { }
+>f : typeof f
+
+    export class C { }
+>C : C
+
+    export module N {
+>N : N
+
+        export function g() { };
+>g : typeof g
+
+        export interface I { }
+>I : I
+    }
+    export interface b extends M.b { } // ok
+>b : b
+>M : M
+>b : M.C
+
+    export interface I extends M.c.I { } // ok
+>I : I
+>M : M
+>c : M.c
+>I : M.c.I
+
+    export module c {
+>c : c
+
+        export interface I extends M.c.I { } // ok
+>I : I
+>M : M
+>c : M.c
+>I : M.c.I
+    }
+}
+=== tests/cases/compiler/declarationEmit_nameConflicts_1.ts ===
+module f { export class c { } }
+>f : f
+>c : c
+
+export = f;
+>f : typeof f
+
diff --git a/tests/baselines/reference/declarationEmit_nameConflicts2.js b/tests/baselines/reference/declarationEmit_nameConflicts2.js
index ed5d7c48690..7b8e1ce17c9 100644
--- a/tests/baselines/reference/declarationEmit_nameConflicts2.js
+++ b/tests/baselines/reference/declarationEmit_nameConflicts2.js
@@ -9,7 +9,6 @@ module X.Y.base {
 }
 
 module X.Y.base.Z {
-    // Bug 887180
     export var f = X.Y.base.f; // Should be base.f
     export var C = X.Y.base.C; // Should be base.C
     export var M = X.Y.base.M; // Should be base.M
@@ -47,7 +46,6 @@ var X;
     (function (Y) {
         (function (base) {
             (function (Z) {
-                // Bug 887180
                 Z.f = X.Y.base.f; // Should be base.f
                 Z.C = X.Y.base.C; // Should be base.C
                 Z.M = X.Y.base.M; // Should be base.M
diff --git a/tests/baselines/reference/declarationEmit_nameConflicts2.types b/tests/baselines/reference/declarationEmit_nameConflicts2.types
index c4bc7104312..d0ab642c670 100644
--- a/tests/baselines/reference/declarationEmit_nameConflicts2.types
+++ b/tests/baselines/reference/declarationEmit_nameConflicts2.types
@@ -26,7 +26,6 @@ module X.Y.base.Z {
 >base : base
 >Z : Z
 
-    // Bug 887180
     export var f = X.Y.base.f; // Should be base.f
 >f : typeof base.f
 >X.Y.base.f : typeof base.f
diff --git a/tests/baselines/reference/declarationEmit_nameConflicts3.js b/tests/baselines/reference/declarationEmit_nameConflicts3.js
index a37b8cd7358..a8dc1217ef4 100644
--- a/tests/baselines/reference/declarationEmit_nameConflicts3.js
+++ b/tests/baselines/reference/declarationEmit_nameConflicts3.js
@@ -20,7 +20,6 @@ module M.P {
     export enum D {
         f
     }
-    // Bug 887180
     export var v: M.D; // ok
     export var w = M.D.f; // error, should be typeof M.D.f
     export var x = M.C.f; // error, should be typeof M.C.f
@@ -78,7 +77,6 @@ var M;
             D[D["f"] = 0] = "f";
         })(P.D || (P.D = {}));
         var D = P.D;
-        // Bug 887180
         P.v; // ok
         P.w = M.D.f; // error, should be typeof M.D.f
         P.x = M.C.f; // error, should be typeof M.C.f
diff --git a/tests/baselines/reference/declarationEmit_nameConflicts3.types b/tests/baselines/reference/declarationEmit_nameConflicts3.types
index d0e8fae1cb3..b225f826755 100644
--- a/tests/baselines/reference/declarationEmit_nameConflicts3.types
+++ b/tests/baselines/reference/declarationEmit_nameConflicts3.types
@@ -45,7 +45,6 @@ module M.P {
         f
 >f : D
     }
-    // Bug 887180
     export var v: M.D; // ok
 >v : M.D
 >M : M
diff --git a/tests/baselines/reference/declarationEmit_nameConflictsWithAlias.errors.txt b/tests/baselines/reference/declarationEmit_nameConflictsWithAlias.errors.txt
deleted file mode 100644
index 7a62ea58b2d..00000000000
--- a/tests/baselines/reference/declarationEmit_nameConflictsWithAlias.errors.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-==== tests/cases/compiler/declarationEmit_nameConflictsWithAlias.ts (1 errors) ====
-    // Bug 887180
-    export module C { export interface I { } }
-                  ~
-!!! Cannot compile external modules unless the '--module' flag is provided.
-    export import v = C;
-    export module M {
-        export module C { export interface I { } }
-        export var w: v.I; // Gets emitted as C.I, which is the wrong interface
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/declarationEmit_nameConflictsWithAlias.js b/tests/baselines/reference/declarationEmit_nameConflictsWithAlias.js
new file mode 100644
index 00000000000..a5b2f397bf8
--- /dev/null
+++ b/tests/baselines/reference/declarationEmit_nameConflictsWithAlias.js
@@ -0,0 +1,28 @@
+//// [declarationEmit_nameConflictsWithAlias.ts]
+export module C { export interface I { } }
+export import v = C;
+export module M {
+    export module C { export interface I { } }
+    export var w: v.I; // Gets emitted as C.I, which is the wrong interface
+}
+
+//// [declarationEmit_nameConflictsWithAlias.js]
+(function (M) {
+    M.w; // Gets emitted as C.I, which is the wrong interface
+})(exports.M || (exports.M = {}));
+var M = exports.M;
+
+
+//// [declarationEmit_nameConflictsWithAlias.d.ts]
+export declare module C {
+    interface I {
+    }
+}
+export import v = C;
+export declare module M {
+    module C {
+        interface I {
+        }
+    }
+    var w: v.I;
+}
diff --git a/tests/baselines/reference/declarationEmit_nameConflictsWithAlias.types b/tests/baselines/reference/declarationEmit_nameConflictsWithAlias.types
new file mode 100644
index 00000000000..7075f04bdc5
--- /dev/null
+++ b/tests/baselines/reference/declarationEmit_nameConflictsWithAlias.types
@@ -0,0 +1,21 @@
+=== tests/cases/compiler/declarationEmit_nameConflictsWithAlias.ts ===
+export module C { export interface I { } }
+>C : C
+>I : I
+
+export import v = C;
+>v : v
+>C : C
+
+export module M {
+>M : M
+
+    export module C { export interface I { } }
+>C : C
+>I : I
+
+    export var w: v.I; // Gets emitted as C.I, which is the wrong interface
+>w : v.I
+>v : v
+>I : v.I
+}
diff --git a/tests/baselines/reference/declareFileExportAssignmentWithVarFromVariableStatement.js b/tests/baselines/reference/declareFileExportAssignmentWithVarFromVariableStatement.js
new file mode 100644
index 00000000000..c4acd795453
--- /dev/null
+++ b/tests/baselines/reference/declareFileExportAssignmentWithVarFromVariableStatement.js
@@ -0,0 +1,41 @@
+//// [declareFileExportAssignmentWithVarFromVariableStatement.ts]
+module m2 {
+    export interface connectModule {
+        (res, req, next): void;
+    }
+    export interface connectExport {
+        use: (mod: connectModule) => connectExport;
+        listen: (port: number) => void;
+    }
+
+}
+
+var x = 10, m2: {
+    (): m2.connectExport;
+    test1: m2.connectModule;
+    test2(): m2.connectModule;
+};
+
+export = m2;
+
+//// [declareFileExportAssignmentWithVarFromVariableStatement.js]
+var x = 10, m2;
+module.exports = m2;
+
+
+//// [declareFileExportAssignmentWithVarFromVariableStatement.d.ts]
+declare module m2 {
+    interface connectModule {
+        (res: any, req: any, next: any): void;
+    }
+    interface connectExport {
+        use: (mod: connectModule) => connectExport;
+        listen: (port: number) => void;
+    }
+}
+declare var m2: {
+    (): m2.connectExport;
+    test1: m2.connectModule;
+    test2(): m2.connectModule;
+};
+export = m2;
diff --git a/tests/baselines/reference/declareFileExportAssignmentWithVarFromVariableStatement.types b/tests/baselines/reference/declareFileExportAssignmentWithVarFromVariableStatement.types
new file mode 100644
index 00000000000..c9ae9f6dfbf
--- /dev/null
+++ b/tests/baselines/reference/declareFileExportAssignmentWithVarFromVariableStatement.types
@@ -0,0 +1,51 @@
+=== tests/cases/compiler/declareFileExportAssignmentWithVarFromVariableStatement.ts ===
+module m2 {
+>m2 : m2
+
+    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
+>port : number
+    }
+
+}
+
+var x = 10, m2: {
+>x : number
+>m2 : { (): m2.connectExport; test1: m2.connectModule; test2(): m2.connectModule; }
+
+    (): m2.connectExport;
+>m2 : m2
+>connectExport : m2.connectExport
+
+    test1: m2.connectModule;
+>test1 : m2.connectModule
+>m2 : m2
+>connectModule : m2.connectModule
+
+    test2(): m2.connectModule;
+>test2 : () => m2.connectModule
+>m2 : m2
+>connectModule : m2.connectModule
+
+};
+
+export = m2;
+>m2 : { (): m2.connectExport; test1: m2.connectModule; test2(): m2.connectModule; }
+
diff --git a/tests/baselines/reference/detachedCommentAtStartOfConstructor1.js b/tests/baselines/reference/detachedCommentAtStartOfConstructor1.js
new file mode 100644
index 00000000000..13312aea362
--- /dev/null
+++ b/tests/baselines/reference/detachedCommentAtStartOfConstructor1.js
@@ -0,0 +1,23 @@
+//// [detachedCommentAtStartOfConstructor1.ts]
+class TestFile {
+    public message: string;
+    public name;
+    constructor(message: string) {
+        /// <summary>Test summary</summary>
+        /// <param name="message" type="String" />
+        var getMessage = () => message + this.name;
+        this.message = getMessage();
+    }
+}
+
+//// [detachedCommentAtStartOfConstructor1.js]
+var TestFile = (function () {
+    function TestFile(message) {
+        var _this = this;
+        /// <summary>Test summary</summary>
+        /// <param name="message" type="String" />
+        var getMessage = function () { return message + _this.name; };
+        this.message = getMessage();
+    }
+    return TestFile;
+})();
diff --git a/tests/baselines/reference/detachedCommentAtStartOfConstructor1.types b/tests/baselines/reference/detachedCommentAtStartOfConstructor1.types
new file mode 100644
index 00000000000..392821de751
--- /dev/null
+++ b/tests/baselines/reference/detachedCommentAtStartOfConstructor1.types
@@ -0,0 +1,33 @@
+=== tests/cases/compiler/detachedCommentAtStartOfConstructor1.ts ===
+class TestFile {
+>TestFile : TestFile
+
+    public message: string;
+>message : string
+
+    public name;
+>name : any
+
+    constructor(message: string) {
+>message : string
+
+        /// <summary>Test summary</summary>
+        /// <param name="message" type="String" />
+        var getMessage = () => message + this.name;
+>getMessage : () => string
+>() => message + this.name : () => string
+>message + this.name : string
+>message : string
+>this.name : any
+>this : TestFile
+>name : any
+
+        this.message = getMessage();
+>this.message = getMessage() : string
+>this.message : string
+>this : TestFile
+>message : string
+>getMessage() : string
+>getMessage : () => string
+    }
+}
diff --git a/tests/baselines/reference/detachedCommentAtStartOfConstructor2.js b/tests/baselines/reference/detachedCommentAtStartOfConstructor2.js
new file mode 100644
index 00000000000..754b432c7c5
--- /dev/null
+++ b/tests/baselines/reference/detachedCommentAtStartOfConstructor2.js
@@ -0,0 +1,24 @@
+//// [detachedCommentAtStartOfConstructor2.ts]
+class TestFile {
+    public message: string;
+    public name: string;
+    constructor(message: string) {
+        /// <summary>Test summary</summary>
+        /// <param name="message" type="String" />
+
+        var getMessage = () => message + this.name;
+        this.message = getMessage();
+    }
+}
+
+//// [detachedCommentAtStartOfConstructor2.js]
+var TestFile = (function () {
+    function TestFile(message) {
+        /// <summary>Test summary</summary>
+        /// <param name="message" type="String" />
+        var _this = this;
+        var getMessage = function () { return message + _this.name; };
+        this.message = getMessage();
+    }
+    return TestFile;
+})();
diff --git a/tests/baselines/reference/detachedCommentAtStartOfConstructor2.types b/tests/baselines/reference/detachedCommentAtStartOfConstructor2.types
new file mode 100644
index 00000000000..b413cd557a5
--- /dev/null
+++ b/tests/baselines/reference/detachedCommentAtStartOfConstructor2.types
@@ -0,0 +1,34 @@
+=== tests/cases/compiler/detachedCommentAtStartOfConstructor2.ts ===
+class TestFile {
+>TestFile : TestFile
+
+    public message: string;
+>message : string
+
+    public name: string;
+>name : string
+
+    constructor(message: string) {
+>message : string
+
+        /// <summary>Test summary</summary>
+        /// <param name="message" type="String" />
+
+        var getMessage = () => message + this.name;
+>getMessage : () => string
+>() => message + this.name : () => string
+>message + this.name : string
+>message : string
+>this.name : string
+>this : TestFile
+>name : string
+
+        this.message = getMessage();
+>this.message = getMessage() : string
+>this.message : string
+>this : TestFile
+>message : string
+>getMessage() : string
+>getMessage : () => string
+    }
+}
diff --git a/tests/baselines/reference/detachedCommentAtStartOfLambdaFunction1.js b/tests/baselines/reference/detachedCommentAtStartOfLambdaFunction1.js
new file mode 100644
index 00000000000..2505e3f6082
--- /dev/null
+++ b/tests/baselines/reference/detachedCommentAtStartOfLambdaFunction1.js
@@ -0,0 +1,31 @@
+//// [detachedCommentAtStartOfLambdaFunction1.ts]
+class TestFile {
+    name: string;
+    foo(message: string): () => string {
+        return (...x: string[]) =>
+            /// <summary>Test summary</summary>
+            /// <param name="message" type="String" />
+            /// <returns type="Function" />
+            message + this.name;
+    }
+}
+
+//// [detachedCommentAtStartOfLambdaFunction1.js]
+var TestFile = (function () {
+    function TestFile() {
+    }
+    TestFile.prototype.foo = function (message) {
+        var _this = this;
+        return function () {
+            var x = [];
+            for (var _i = 0; _i < arguments.length; _i++) {
+                x[_i - 0] = arguments[_i];
+            }
+            /// <summary>Test summary</summary>
+            /// <param name="message" type="String" />
+            /// <returns type="Function" />
+            return message + _this.name;
+        };
+    };
+    return TestFile;
+})();
diff --git a/tests/baselines/reference/detachedCommentAtStartOfLambdaFunction1.types b/tests/baselines/reference/detachedCommentAtStartOfLambdaFunction1.types
new file mode 100644
index 00000000000..016a123c5c1
--- /dev/null
+++ b/tests/baselines/reference/detachedCommentAtStartOfLambdaFunction1.types
@@ -0,0 +1,26 @@
+=== tests/cases/compiler/detachedCommentAtStartOfLambdaFunction1.ts ===
+class TestFile {
+>TestFile : TestFile
+
+    name: string;
+>name : string
+
+    foo(message: string): () => string {
+>foo : (message: string) => () => string
+>message : string
+
+        return (...x: string[]) =>
+>(...x: string[]) =>            /// <summary>Test summary</summary>            /// <param name="message" type="String" />            /// <returns type="Function" />            message + this.name : (...x: string[]) => string
+>x : string[]
+
+            /// <summary>Test summary</summary>
+            /// <param name="message" type="String" />
+            /// <returns type="Function" />
+            message + this.name;
+>message + this.name : string
+>message : string
+>this.name : string
+>this : TestFile
+>name : string
+    }
+}
diff --git a/tests/baselines/reference/detachedCommentAtStartOfLambdaFunction2.js b/tests/baselines/reference/detachedCommentAtStartOfLambdaFunction2.js
new file mode 100644
index 00000000000..53f6d08eaf5
--- /dev/null
+++ b/tests/baselines/reference/detachedCommentAtStartOfLambdaFunction2.js
@@ -0,0 +1,32 @@
+//// [detachedCommentAtStartOfLambdaFunction2.ts]
+class TestFile {
+    name: string;
+    foo(message: string): () => string {
+        return (...x: string[]) =>
+            /// <summary>Test summary</summary>
+            /// <param name="message" type="String" />
+            /// <returns type="Function" />
+
+            message + this.name;
+    }
+}
+
+//// [detachedCommentAtStartOfLambdaFunction2.js]
+var TestFile = (function () {
+    function TestFile() {
+    }
+    TestFile.prototype.foo = function (message) {
+        var _this = this;
+        return function () {
+            /// <summary>Test summary</summary>
+            /// <param name="message" type="String" />
+            /// <returns type="Function" />
+            var x = [];
+            for (var _i = 0; _i < arguments.length; _i++) {
+                x[_i - 0] = arguments[_i];
+            }
+            return message + _this.name;
+        };
+    };
+    return TestFile;
+})();
diff --git a/tests/baselines/reference/detachedCommentAtStartOfLambdaFunction2.types b/tests/baselines/reference/detachedCommentAtStartOfLambdaFunction2.types
new file mode 100644
index 00000000000..2199a4490b5
--- /dev/null
+++ b/tests/baselines/reference/detachedCommentAtStartOfLambdaFunction2.types
@@ -0,0 +1,27 @@
+=== tests/cases/compiler/detachedCommentAtStartOfLambdaFunction2.ts ===
+class TestFile {
+>TestFile : TestFile
+
+    name: string;
+>name : string
+
+    foo(message: string): () => string {
+>foo : (message: string) => () => string
+>message : string
+
+        return (...x: string[]) =>
+>(...x: string[]) =>            /// <summary>Test summary</summary>            /// <param name="message" type="String" />            /// <returns type="Function" />            message + this.name : (...x: string[]) => string
+>x : string[]
+
+            /// <summary>Test summary</summary>
+            /// <param name="message" type="String" />
+            /// <returns type="Function" />
+
+            message + this.name;
+>message + this.name : string
+>message : string
+>this.name : string
+>this : TestFile
+>name : string
+    }
+}
diff --git a/tests/baselines/reference/duplicatePropertiesInStrictMode.errors.txt b/tests/baselines/reference/duplicatePropertiesInStrictMode.errors.txt
new file mode 100644
index 00000000000..e184b7761ea
--- /dev/null
+++ b/tests/baselines/reference/duplicatePropertiesInStrictMode.errors.txt
@@ -0,0 +1,10 @@
+==== tests/cases/compiler/duplicatePropertiesInStrictMode.ts (2 errors) ====
+    "use strict";
+    var x = {
+      x: 1,
+      x: 2
+      ~
+!!! An object literal cannot have multiple properties with the same name in strict mode.
+      ~
+!!! Duplicate identifier 'x'.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/duplicateStringIndexers.errors.txt b/tests/baselines/reference/duplicateStringIndexers.errors.txt
new file mode 100644
index 00000000000..f4cfe243bd3
--- /dev/null
+++ b/tests/baselines/reference/duplicateStringIndexers.errors.txt
@@ -0,0 +1,47 @@
+==== tests/cases/conformance/types/members/duplicateStringIndexers.ts (6 errors) ====
+    // it is an error to have duplicate index signatures of the same kind in a type
+    
+    module test {
+        interface Number {
+            [x: string]: string;
+            [x: string]: string;
+            ~~~~~~~~~~~~~~~~~~~~
+!!! Duplicate string index signature.
+        }
+    
+        interface String {
+            [x: string]: string;
+            [x: string]: string;
+            ~~~~~~~~~~~~~~~~~~~~
+!!! Duplicate string index signature.
+        }
+    
+        interface Array<T> {
+            [x: string]: T;
+            [x: string]: T;
+            ~~~~~~~~~~~~~~~
+!!! Duplicate string index signature.
+        }
+    
+        class C {
+            [x: string]: string;
+            [x: string]: string;
+            ~~~~~~~~~~~~~~~~~~~~
+!!! Duplicate string index signature.
+        }
+    
+        interface I {
+            [x: string]: string;
+            [x: string]: string;
+            ~~~~~~~~~~~~~~~~~~~~
+!!! Duplicate string index signature.
+        }
+    
+        var a: {
+            [x: string]: string;
+            [x: string]: string;
+            ~~~~~~~~~~~~~~~~~~~~
+!!! Duplicate string index signature.
+        }
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/duplicateStringIndexers.js b/tests/baselines/reference/duplicateStringIndexers.js
index af7952bce50..e4f8b7c9f3c 100644
--- a/tests/baselines/reference/duplicateStringIndexers.js
+++ b/tests/baselines/reference/duplicateStringIndexers.js
@@ -1,43 +1,47 @@
 //// [duplicateStringIndexers.ts]
 // it is an error to have duplicate index signatures of the same kind in a type
 
-interface Number {
-    [x: string]: string;
-    [x: string]: string;
-}
+module test {
+    interface Number {
+        [x: string]: string;
+        [x: string]: string;
+    }
 
-interface String {
-    [x: string]: string;
-    [x: string]: string;
-}
+    interface String {
+        [x: string]: string;
+        [x: string]: string;
+    }
 
-interface Array<T> {
-    [x: string]: T;
-    [x: string]: T;
-}
+    interface Array<T> {
+        [x: string]: T;
+        [x: string]: T;
+    }
 
-class C {
-    [x: string]: string;
-    [x: string]: string;
-}
+    class C {
+        [x: string]: string;
+        [x: string]: string;
+    }
 
-interface I {
-    [x: string]: string;
-    [x: string]: string;
-}
+    interface I {
+        [x: string]: string;
+        [x: string]: string;
+    }
 
-var a: {
-    [x: string]: string;
-    [x: string]: string;
+    var a: {
+        [x: string]: string;
+        [x: string]: string;
+    }
 }
-
 
 
 //// [duplicateStringIndexers.js]
 // it is an error to have duplicate index signatures of the same kind in a type
-var C = (function () {
-    function C() {
-    }
-    return C;
-})();
-var a;
+var test;
+(function (test) {
+    var C = (function () {
+        function C() {
+        }
+        return C;
+    })();
+    var a;
+})(test || (test = {}));
diff --git a/tests/baselines/reference/duplicateVarAndImport.js b/tests/baselines/reference/duplicateVarAndImport.js
new file mode 100644
index 00000000000..38148c6ce53
--- /dev/null
+++ b/tests/baselines/reference/duplicateVarAndImport.js
@@ -0,0 +1,10 @@
+//// [duplicateVarAndImport.ts]
+// no error since module is not instantiated
+
+var a;
+module M { }
+import a = M;
+
+//// [duplicateVarAndImport.js]
+// no error since module is not instantiated
+var a;
diff --git a/tests/baselines/reference/duplicateVarAndImport.types b/tests/baselines/reference/duplicateVarAndImport.types
new file mode 100644
index 00000000000..92e3917e56f
--- /dev/null
+++ b/tests/baselines/reference/duplicateVarAndImport.types
@@ -0,0 +1,13 @@
+=== tests/cases/compiler/duplicateVarAndImport.ts ===
+// no error since module is not instantiated
+
+var a;
+>a : any
+
+module M { }
+>M : M
+
+import a = M;
+>a : a
+>M : M
+
diff --git a/tests/baselines/reference/duplicateVarAndImport2.errors.txt b/tests/baselines/reference/duplicateVarAndImport2.errors.txt
new file mode 100644
index 00000000000..b6f52fc23cb
--- /dev/null
+++ b/tests/baselines/reference/duplicateVarAndImport2.errors.txt
@@ -0,0 +1,7 @@
+==== tests/cases/compiler/duplicateVarAndImport2.ts (1 errors) ====
+    // error since module is instantiated
+    var a;
+    module M { export var x = 1; }
+    import a = M;
+    ~~~~~~~~~~~~~
+!!! Import declaration conflicts with local declaration of 'a'
\ No newline at end of file
diff --git a/tests/baselines/reference/duplicateVarAndImport2.js b/tests/baselines/reference/duplicateVarAndImport2.js
new file mode 100644
index 00000000000..42d500d588a
--- /dev/null
+++ b/tests/baselines/reference/duplicateVarAndImport2.js
@@ -0,0 +1,14 @@
+//// [duplicateVarAndImport2.ts]
+// error since module is instantiated
+var a;
+module M { export var x = 1; }
+import a = M;
+
+//// [duplicateVarAndImport2.js]
+// error since module is instantiated
+var a;
+var M;
+(function (M) {
+    M.x = 1;
+})(M || (M = {}));
+var a = M;
diff --git a/tests/baselines/reference/emitBOM.js b/tests/baselines/reference/emitBOM.js
new file mode 100644
index 00000000000..f243e715991
--- /dev/null
+++ b/tests/baselines/reference/emitBOM.js
@@ -0,0 +1,12 @@
+//// [emitBOM.ts]
+
+// JS and d.ts output should have a BOM but not the sourcemap
+var x;
+
+//// [emitBOM.js]
+// JS and d.ts output should have a BOM but not the sourcemap
+var x;
+//# sourceMappingURL=emitBOM.js.map
+
+//// [emitBOM.d.ts]
+declare var x: any;
diff --git a/tests/baselines/reference/emitBOM.js.map b/tests/baselines/reference/emitBOM.js.map
new file mode 100644
index 00000000000..af5fd260813
--- /dev/null
+++ b/tests/baselines/reference/emitBOM.js.map
@@ -0,0 +1,2 @@
+//// [emitBOM.js.map]
+{"version":3,"file":"emitBOM.js","sourceRoot":"","sources":["emitBOM.ts"],"names":[],"mappings":"AAEA,AADA,6DAA6D;IACzD,CAAC,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/emitBOM.sourcemap.txt b/tests/baselines/reference/emitBOM.sourcemap.txt
new file mode 100644
index 00000000000..cd49155d24f
--- /dev/null
+++ b/tests/baselines/reference/emitBOM.sourcemap.txt
@@ -0,0 +1,37 @@
+===================================================================
+JsFile: emitBOM.js
+mapUrl: emitBOM.js.map
+sourceRoot: 
+sources: emitBOM.ts
+===================================================================
+-------------------------------------------------------------------
+emittedFile:tests/cases/compiler/emitBOM.js
+sourceFile:emitBOM.ts
+-------------------------------------------------------------------
+>>>// JS and d.ts output should have a BOM but not the sourcemap
+1 >
+2 >
+3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1 >
+  >// JS and d.ts output should have a BOM but not the sourcemap
+  >
+2 >
+3 >// JS and d.ts output should have a BOM but not the sourcemap
+1 >Emitted(1, 1) Source(3, 1) + SourceIndex(0)
+2 >Emitted(1, 1) Source(2, 1) + SourceIndex(0)
+3 >Emitted(1, 62) Source(2, 62) + SourceIndex(0)
+---
+>>>var x;
+1 >^^^^
+2 >    ^
+3 >     ^
+4 >      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+  >var 
+2 >    x
+3 >     ;
+1 >Emitted(2, 5) Source(3, 5) + SourceIndex(0)
+2 >Emitted(2, 6) Source(3, 6) + SourceIndex(0)
+3 >Emitted(2, 7) Source(3, 7) + SourceIndex(0)
+---
+>>>//# sourceMappingURL=emitBOM.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/emitBOM.types b/tests/baselines/reference/emitBOM.types
new file mode 100644
index 00000000000..b38fd19c8f4
--- /dev/null
+++ b/tests/baselines/reference/emitBOM.types
@@ -0,0 +1,6 @@
+=== tests/cases/compiler/emitBOM.ts ===
+
+// JS and d.ts output should have a BOM but not the sourcemap
+var x;
+>x : any
+
diff --git a/tests/baselines/reference/emptyTypeArgumentList.errors.txt b/tests/baselines/reference/emptyTypeArgumentList.errors.txt
new file mode 100644
index 00000000000..e05930401f7
--- /dev/null
+++ b/tests/baselines/reference/emptyTypeArgumentList.errors.txt
@@ -0,0 +1,7 @@
+==== tests/cases/compiler/emptyTypeArgumentList.ts (2 errors) ====
+    function foo<T>() { }
+    foo<>();
+       ~~
+!!! Type argument list cannot be empty.
+    ~~~~~~~
+!!! Supplied parameters do not match any signature of call target.
\ No newline at end of file
diff --git a/tests/baselines/reference/emptyTypeArgumentListWithNew.errors.txt b/tests/baselines/reference/emptyTypeArgumentListWithNew.errors.txt
new file mode 100644
index 00000000000..aad58ddfdce
--- /dev/null
+++ b/tests/baselines/reference/emptyTypeArgumentListWithNew.errors.txt
@@ -0,0 +1,7 @@
+==== tests/cases/compiler/emptyTypeArgumentListWithNew.ts (2 errors) ====
+    class foo<T> { }
+    new foo<>();
+           ~~
+!!! Type argument list cannot be empty.
+    ~~~~~~~~~~~
+!!! Supplied parameters do not match any signature of call target.
\ No newline at end of file
diff --git a/tests/baselines/reference/enumBasics1.errors.txt b/tests/baselines/reference/enumBasics1.errors.txt
index d27def0a0bb..6d9229341e2 100644
--- a/tests/baselines/reference/enumBasics1.errors.txt
+++ b/tests/baselines/reference/enumBasics1.errors.txt
@@ -34,7 +34,7 @@
     	B,
     }
     
-    enum E2 { // shouldn't error
+    enum E2 { // should error for continued autonumbering
     	C,
     	~
 !!! In an enum with multiple declarations, only one declaration can omit an initializer for its first enum element.
diff --git a/tests/baselines/reference/enumBasics1.js b/tests/baselines/reference/enumBasics1.js
index 67bd91b6e5f..b6c8c75f334 100644
--- a/tests/baselines/reference/enumBasics1.js
+++ b/tests/baselines/reference/enumBasics1.js
@@ -32,7 +32,7 @@ enum E2 {
 	B,
 }
 
-enum E2 { // shouldn't error
+enum E2 { // should error for continued autonumbering
 	C,
 	D,
 }
diff --git a/tests/baselines/reference/enumInitializersWithExponents.errors.txt b/tests/baselines/reference/enumInitializersWithExponents.errors.txt
new file mode 100644
index 00000000000..60649475f78
--- /dev/null
+++ b/tests/baselines/reference/enumInitializersWithExponents.errors.txt
@@ -0,0 +1,14 @@
+==== tests/cases/compiler/enumInitializersWithExponents.ts (2 errors) ====
+    // Must be integer literals.
+    declare enum E {
+        a = 1e3, // ok
+        b = 1e25, // ok
+        c = 1e-3, // error
+        ~
+!!! Ambient enum elements can only have integer literal initializers.
+        d = 1e-9, // error
+        ~
+!!! Ambient enum elements can only have integer literal initializers.
+        e = 1e0, // ok
+        f = 1e+25 // ok
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/exportAssignmentWithDeclareAndExportModifiers.errors.txt b/tests/baselines/reference/exportAssignmentWithDeclareAndExportModifiers.errors.txt
new file mode 100644
index 00000000000..2dd71ce0d07
--- /dev/null
+++ b/tests/baselines/reference/exportAssignmentWithDeclareAndExportModifiers.errors.txt
@@ -0,0 +1,7 @@
+==== tests/cases/compiler/exportAssignmentWithDeclareAndExportModifiers.ts (2 errors) ====
+    var x;
+    export declare export = x;
+    ~~~~~~~~~~~~~~
+!!! An export assignment cannot have modifiers.
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Cannot compile external modules unless the '--module' flag is provided.
\ No newline at end of file
diff --git a/tests/baselines/reference/exportAssignmentWithDeclareModifier.errors.txt b/tests/baselines/reference/exportAssignmentWithDeclareModifier.errors.txt
new file mode 100644
index 00000000000..27b202ce0c8
--- /dev/null
+++ b/tests/baselines/reference/exportAssignmentWithDeclareModifier.errors.txt
@@ -0,0 +1,7 @@
+==== tests/cases/compiler/exportAssignmentWithDeclareModifier.ts (2 errors) ====
+    var x;
+    declare export = x;
+    ~~~~~~~
+!!! An export assignment cannot have modifiers.
+    ~~~~~~~~~~~~~~~~~~~
+!!! Cannot compile external modules unless the '--module' flag is provided.
\ No newline at end of file
diff --git a/tests/baselines/reference/exportAssignmentWithExportModifier.errors.txt b/tests/baselines/reference/exportAssignmentWithExportModifier.errors.txt
new file mode 100644
index 00000000000..dc3d6cb4cc5
--- /dev/null
+++ b/tests/baselines/reference/exportAssignmentWithExportModifier.errors.txt
@@ -0,0 +1,7 @@
+==== tests/cases/compiler/exportAssignmentWithExportModifier.ts (2 errors) ====
+    var x;
+    export export = x;
+    ~~~~~~
+!!! An export assignment cannot have modifiers.
+    ~~~~~~~~~~~~~~~~~~
+!!! Cannot compile external modules unless the '--module' flag is provided.
\ No newline at end of file
diff --git a/tests/baselines/reference/externalModuleResolution.js b/tests/baselines/reference/externalModuleResolution.js
index 9a640bdfa5d..04dc4289bb6 100644
--- a/tests/baselines/reference/externalModuleResolution.js
+++ b/tests/baselines/reference/externalModuleResolution.js
@@ -1,5 +1,11 @@
 //// [tests/cases/compiler/externalModuleResolution.ts] ////
 
+//// [foo.d.ts]
+declare module M1 {
+    export var X:number;
+}
+export = M1
+
 //// [foo.ts]
 module M2 {
     export var Y = 1;
diff --git a/tests/baselines/reference/externalModuleResolution2.js b/tests/baselines/reference/externalModuleResolution2.js
index 81a42f09f98..9d35f8e61e1 100644
--- a/tests/baselines/reference/externalModuleResolution2.js
+++ b/tests/baselines/reference/externalModuleResolution2.js
@@ -5,6 +5,12 @@ module M2 {
     export var X = 1;
 }
 export = M2
+
+//// [foo.d.ts]
+declare module M1 {
+    export var Y:number;
+}
+export = M1
 
 
 //// [consumer.ts]
diff --git a/tests/baselines/reference/externalModuleResolution2.types b/tests/baselines/reference/externalModuleResolution2.types
index 5bb0c8970c7..df7c789a3fd 100644
--- a/tests/baselines/reference/externalModuleResolution2.types
+++ b/tests/baselines/reference/externalModuleResolution2.types
@@ -17,4 +17,3 @@ module M2 {
 export = M2
 >M2 : typeof M2
 
-
diff --git a/tests/baselines/reference/fileReferencesWithNoExtensions.types b/tests/baselines/reference/fileReferencesWithNoExtensions.types
new file mode 100644
index 00000000000..ec58e338345
--- /dev/null
+++ b/tests/baselines/reference/fileReferencesWithNoExtensions.types
@@ -0,0 +1,32 @@
+=== tests/cases/compiler/t.ts ===
+/// <reference path="a"/>
+/// <reference path="b"/>
+/// <reference path="c"/>
+var a = aa;  // Check that a.ts is referenced
+>a : number
+>aa : number
+
+var b = bb;  // Check that b.d.ts is referenced
+>b : number
+>bb : number
+
+var c = cc;  // Check that c.ts has precedence over c.d.ts
+>c : number
+>cc : number
+
+=== tests/cases/compiler/a.ts ===
+var aa = 1;
+>aa : number
+
+=== tests/cases/compiler/b.d.ts ===
+declare var bb: number;
+>bb : number
+
+=== tests/cases/compiler/c.ts ===
+var cc = 1;
+>cc : number
+
+=== tests/cases/compiler/c.d.ts ===
+declare var xx: number;
+>xx : number
+
diff --git a/tests/baselines/reference/functionAndInterfaceWithSeparateErrors.errors.txt b/tests/baselines/reference/functionAndInterfaceWithSeparateErrors.errors.txt
new file mode 100644
index 00000000000..58936d29dbb
--- /dev/null
+++ b/tests/baselines/reference/functionAndInterfaceWithSeparateErrors.errors.txt
@@ -0,0 +1,12 @@
+==== tests/cases/compiler/functionAndInterfaceWithSeparateErrors.ts (2 errors) ====
+    function Foo(s: string);
+    ~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Overload signature is not compatible with function implementation.
+    function Foo(n: number) { }
+    
+    interface Foo {
+        [s: string]: string;
+        prop: number;
+        ~~~~~~~~~~~~~
+!!! Property 'prop' of type 'number' is not assignable to string index type 'string'.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/functionAndInterfaceWithSeparateErrors.js b/tests/baselines/reference/functionAndInterfaceWithSeparateErrors.js
new file mode 100644
index 00000000000..004e65d92af
--- /dev/null
+++ b/tests/baselines/reference/functionAndInterfaceWithSeparateErrors.js
@@ -0,0 +1,12 @@
+//// [functionAndInterfaceWithSeparateErrors.ts]
+function Foo(s: string);
+function Foo(n: number) { }
+
+interface Foo {
+    [s: string]: string;
+    prop: number;
+}
+
+//// [functionAndInterfaceWithSeparateErrors.js]
+function Foo(n) {
+}
diff --git a/tests/baselines/reference/functionsMissingReturnStatementsAndExpressions.errors.txt b/tests/baselines/reference/functionsMissingReturnStatementsAndExpressions.errors.txt
new file mode 100644
index 00000000000..6ddbc91db57
--- /dev/null
+++ b/tests/baselines/reference/functionsMissingReturnStatementsAndExpressions.errors.txt
@@ -0,0 +1,129 @@
+==== tests/cases/compiler/functionsMissingReturnStatementsAndExpressions.ts (5 errors) ====
+    
+    function f1(): string {
+                   ~~~~~~
+!!! A function whose declared type is neither 'void' nor 'any' must return a value or consist of a single 'throw' statement.
+        // errors because there are no return statements
+    }
+    
+    function f2(): string {
+        // Permissible; returns undefined.
+        return;
+    }
+    
+    function f3(): string {
+        return "Okay, because this is a return expression.";
+    }
+    
+    function f4(): void {
+        // Fine since we are typed void.
+    }
+    
+    function f5(): void {
+        // Fine since we are typed void.
+        return;
+    }
+    
+    function f6(): void {
+        // Fine since we are typed void and return undefined
+        return undefined;
+    }
+    
+    function f7(): void {
+        // Fine since we are typed void and return null
+        return null;
+    }
+    
+    function f8(): void {
+        // Fine since are typed any.
+        return;
+    }
+    
+    function f9(): void {
+        // Fine since we are typed any and return undefined
+        return undefined;
+    }
+    
+    function f10(): void {
+        // Fine since we are typed any and return null
+        return null;
+    }
+    
+    function f11(): string {
+        // Fine since we consist of a single throw statement.
+        throw undefined;
+    }
+    
+    function f12(): void {
+        // Fine since we consist of a single throw statement.
+        throw undefined;
+    }
+    
+    function f13(): any {
+        // Fine since we consist of a single throw statement.
+        throw undefined;
+    }
+    
+    function f14(): number {
+                    ~~~~~~
+!!! A function whose declared type is neither 'void' nor 'any' must return a value or consist of a single 'throw' statement.
+        // Not fine, since we can *only* consist of a single throw statement
+        // if no return statements are present but we are annotated.
+        throw undefined;
+        throw null;
+    }
+    
+    function f15(): number {
+        // Fine, since we have a return statement somewhere.
+        throw undefined;
+        throw null;
+        return;
+    }
+    
+    
+    function f16() {
+        // Okay; not type annotated.
+    }
+    
+    function f17() {
+        // Okay; not type annotated.
+        return;
+    }
+    
+    function f18() {
+        return "Okay, not type annotated.";
+    }
+    
+    
+    class C {
+        public get m1() {
+                   ~~
+!!! A 'get' accessor must return a value or consist of a single 'throw' statement.
+            // Errors; get accessors must return a value.
+        }
+    
+        public get m2() {
+            // Permissible; returns undefined.
+            return;
+        }
+    
+        public get m3() {
+            return "Okay, because this is a return expression.";
+        }
+    
+        public get m4() {
+            // Fine since this consists of a single throw statement.
+            throw null;
+        }
+    
+        public get m5() {
+                   ~~
+!!! A 'get' accessor must return a value or consist of a single 'throw' statement.
+            // Not fine, since we can *only* consist of a single throw statement
+            // if no return statements are present but we are a get accessor.
+            throw null;
+            throw undefined.
+        }
+        ~
+!!! Identifier expected.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments.js b/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments.js
index 6291489e8e9..9da34ebad86 100644
--- a/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments.js
+++ b/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments.js
@@ -26,7 +26,7 @@ module GenericParameter {
         new (x: boolean): string;
         new (x: number): boolean;
     }
-    var r5 = foo5(a); // new boolean => string; new(x:number) => boolean
+    var r5 = foo5(a); // new{} => string; new(x:number) => {}
     var b: { new<T>(x: T): string; new<T>(x: number): T; }
     var r7 = foo5(b); // new any => string; new(x:number) => any
 
@@ -67,7 +67,7 @@ var GenericParameter;
         return cb;
     }
     var a;
-    var r5 = foo5(a); // new boolean => string; new(x:number) => boolean
+    var r5 = foo5(a); // new{} => string; new(x:number) => {}
     var b;
     var r7 = foo5(b); // new any => string; new(x:number) => any
     function foo6(cb) {
diff --git a/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments.types b/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments.types
index 54de434304d..c88c4124353 100644
--- a/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments.types
+++ b/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments.types
@@ -70,7 +70,7 @@ module GenericParameter {
         new (x: number): boolean;
 >x : number
     }
-    var r5 = foo5(a); // new boolean => string; new(x:number) => boolean
+    var r5 = foo5(a); // new{} => string; new(x:number) => {}
 >r5 : { new (x: boolean): string; new (x: number): boolean; }
 >foo5(a) : { new (x: boolean): string; new (x: number): boolean; }
 >foo5 : typeof foo5
diff --git a/tests/baselines/reference/genericTypeWithCallableMembers.js b/tests/baselines/reference/genericTypeWithCallableMembers.js
index 8fd60af9d6b..ebf95b41dcc 100644
--- a/tests/baselines/reference/genericTypeWithCallableMembers.js
+++ b/tests/baselines/reference/genericTypeWithCallableMembers.js
@@ -6,7 +6,7 @@ interface Constructable {
 class C<T extends Constructable> {
     constructor(public data: T, public data2: Constructable) { }
     create() {
-        var x = new this.data(); // error
+        var x = new this.data(); // no error
         var x2 = new this.data2(); // was error, shouldn't be
     }
 }
@@ -19,7 +19,7 @@ var C = (function () {
         this.data2 = data2;
     }
     C.prototype.create = function () {
-        var x = new this.data(); // error
+        var x = new this.data(); // no error
         var x2 = new this.data2(); // was error, shouldn't be
     };
     return C;
diff --git a/tests/baselines/reference/genericTypeWithCallableMembers.types b/tests/baselines/reference/genericTypeWithCallableMembers.types
index 379e7d2cacb..e0068d5ff2b 100644
--- a/tests/baselines/reference/genericTypeWithCallableMembers.types
+++ b/tests/baselines/reference/genericTypeWithCallableMembers.types
@@ -20,7 +20,7 @@ class C<T extends Constructable> {
     create() {
 >create : () => void
 
-        var x = new this.data(); // error
+        var x = new this.data(); // no error
 >x : Constructable
 >new this.data() : Constructable
 >this.data : T
diff --git a/tests/baselines/reference/implementGenericWithMismatchedTypes.errors.txt b/tests/baselines/reference/implementGenericWithMismatchedTypes.errors.txt
index 34edae873cf..209749db465 100644
--- a/tests/baselines/reference/implementGenericWithMismatchedTypes.errors.txt
+++ b/tests/baselines/reference/implementGenericWithMismatchedTypes.errors.txt
@@ -1,4 +1,4 @@
-==== tests/cases/compiler/implementGenericWithMismatchedTypes.ts (3 errors) ====
+==== tests/cases/compiler/implementGenericWithMismatchedTypes.ts (2 errors) ====
     // no errors because in the derived types the best common type for T's value is Object
     // and that matches the original signature for assignability since we treat its T's as Object
     
@@ -24,12 +24,9 @@
           ~~
 !!! Class 'C2<T>' incorrectly implements interface 'IFoo2<T>':
 !!!   Types of property 'foo' are incompatible:
-!!!     Type '<string>(x: string) => number' is not assignable to type '(x: T) => T':
-!!!       Types of parameters 'x' and 'x' are incompatible:
-!!!         Type 'string' is not assignable to type 'T'.
-        foo<string>(x: string): number {
-            ~~~~~~
-!!! Type parameter name cannot be 'string'
+!!!     Type '<Tstring>(x: Tstring) => number' is not assignable to type '(x: T) => T':
+!!!       Type 'number' is not assignable to type 'T'.
+        foo<Tstring>(x: Tstring): number {
             return null;
         }
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/implementGenericWithMismatchedTypes.js b/tests/baselines/reference/implementGenericWithMismatchedTypes.js
index 5317666d912..a030ebc3c1d 100644
--- a/tests/baselines/reference/implementGenericWithMismatchedTypes.js
+++ b/tests/baselines/reference/implementGenericWithMismatchedTypes.js
@@ -15,7 +15,7 @@ interface IFoo2<T> {
     foo(x: T): T;
 }
 class C2<T> implements IFoo2<T> { // error
-    foo<string>(x: string): number {
+    foo<Tstring>(x: Tstring): number {
         return null;
     }
 }
diff --git a/tests/baselines/reference/importDecl.errors.txt b/tests/baselines/reference/importDecl.errors.txt
deleted file mode 100644
index 2a43a4362c5..00000000000
--- a/tests/baselines/reference/importDecl.errors.txt
+++ /dev/null
@@ -1,83 +0,0 @@
-==== tests/cases/compiler/importDecl_1.ts (1 errors) ====
-    ///<reference path='importDecl_require.ts'/>
-    ///<reference path='importDecl_require1.ts'/>
-    ///<reference path='importDecl_require2.ts'/>
-    ///<reference path='importDecl_require3.ts'/>
-    ///<reference path='importDecl_require4.ts'/>
-    import m4 = require("importDecl_require"); // Emit used
-    export var x4 = m4.x;
-    export var d4 = m4.d;
-    export var f4 = m4.foo();
-    
-    export module m1 {
-        export var x2 = m4.x;
-        export var d2 = m4.d;
-        export var f2 = m4.foo();
-    
-        var x3 = m4.x;
-        var d3 = m4.d;
-        var f3 = m4.foo();
-    }
-    
-    //Emit global only usage
-    import glo_m4 = require("importDecl_require1");
-    export var useGlo_m4_x4 = glo_m4.x;
-                                     ~
-!!! Property 'x' does not exist on type 'typeof "tests/cases/compiler/importDecl_require1"'.
-    export var useGlo_m4_d4 = glo_m4.d;
-    export var useGlo_m4_f4 = glo_m4.foo();
-    
-    //Emit even when used just in function type
-    import fncOnly_m4 = require("importDecl_require2");
-    export var useFncOnly_m4_f4 = fncOnly_m4.foo();
-    
-    // only used privately no need to emit
-    import private_m4 = require("importDecl_require3");
-    export module usePrivate_m4_m1 {
-        var x3 = private_m4.x;
-        var d3 = private_m4.d;
-        var f3 = private_m4.foo();
-    }
-    
-    // Do not emit unused import
-    import m5 = require("importDecl_require4");
-    export var d = m5.foo2();
-    
-    // Do not emit multiple used import statements
-    import multiImport_m4 = require("importDecl_require"); // Emit used
-    export var useMultiImport_m4_x4 = multiImport_m4.x;
-    export var useMultiImport_m4_d4 = multiImport_m4.d;
-    export var useMultiImport_m4_f4 = multiImport_m4.foo();
-    
-==== tests/cases/compiler/importDecl_require.ts (0 errors) ====
-    export class d {
-        foo: string;
-    }
-    export var x: d;
-    export function foo(): d { return null; }
-    
-==== tests/cases/compiler/importDecl_require1.ts (0 errors) ====
-    export class d {
-        bar: string;
-    }
-    var x: d;
-    export function foo(): d { return null; }
-    
-==== tests/cases/compiler/importDecl_require2.ts (0 errors) ====
-    export class d {
-        baz: string;
-    }
-    export var x: d;
-    export function foo(): d { return null; }
-    
-==== tests/cases/compiler/importDecl_require3.ts (0 errors) ====
-    export class d {
-        bing: string;
-    }
-    export var x: d;
-    export function foo(): d { return null; }
-    
-==== tests/cases/compiler/importDecl_require4.ts (0 errors) ====
-    import m4 = require("importDecl_require");
-    export function foo2(): m4.d { return null; }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/importDecl.js b/tests/baselines/reference/importDecl.js
index 76312b2b32a..e37d46919e9 100644
--- a/tests/baselines/reference/importDecl.js
+++ b/tests/baselines/reference/importDecl.js
@@ -55,7 +55,6 @@ export module m1 {
 
 //Emit global only usage
 import glo_m4 = require("importDecl_require1");
-export var useGlo_m4_x4 = glo_m4.x;
 export var useGlo_m4_d4 = glo_m4.d;
 export var useGlo_m4_f4 = glo_m4.foo();
 
@@ -156,7 +155,6 @@ exports.f4 = m4.foo();
 var m1 = exports.m1;
 //Emit global only usage
 var glo_m4 = require("importDecl_require1");
-exports.useGlo_m4_x4 = glo_m4.x;
 exports.useGlo_m4_d4 = glo_m4.d;
 exports.useGlo_m4_f4 = glo_m4.foo();
 //Emit even when used just in function type
@@ -178,3 +176,57 @@ var multiImport_m4 = require("importDecl_require"); // Emit used
 exports.useMultiImport_m4_x4 = multiImport_m4.x;
 exports.useMultiImport_m4_d4 = multiImport_m4.d;
 exports.useMultiImport_m4_f4 = multiImport_m4.foo();
+
+
+//// [importDecl_require.d.ts]
+export declare class d {
+    foo: string;
+}
+export declare var x: d;
+export declare function foo(): d;
+//// [importDecl_require1.d.ts]
+export declare class d {
+    bar: string;
+}
+export declare function foo(): d;
+//// [importDecl_require2.d.ts]
+export declare class d {
+    baz: string;
+}
+export declare var x: d;
+export declare function foo(): d;
+//// [importDecl_require3.d.ts]
+export declare class d {
+    bing: string;
+}
+export declare var x: d;
+export declare function foo(): d;
+//// [importDecl_require4.d.ts]
+import m4 = require("importDecl_require");
+export declare function foo2(): m4.d;
+//// [importDecl_1.d.ts]
+/// <reference path='importDecl_require.d.ts' />
+/// <reference path='importDecl_require1.d.ts' />
+/// <reference path='importDecl_require2.d.ts' />
+/// <reference path='importDecl_require3.d.ts' />
+/// <reference path='importDecl_require4.d.ts' />
+import m4 = require("importDecl_require");
+export declare var x4: m4.d;
+export declare var d4: typeof m4.d;
+export declare var f4: m4.d;
+export declare module m1 {
+    var x2: m4.d;
+    var d2: typeof m4.d;
+    var f2: m4.d;
+}
+import glo_m4 = require("importDecl_require1");
+export declare var useGlo_m4_d4: typeof glo_m4.d;
+export declare var useGlo_m4_f4: glo_m4.d;
+import fncOnly_m4 = require("importDecl_require2");
+export declare var useFncOnly_m4_f4: fncOnly_m4.d;
+export declare module usePrivate_m4_m1 {
+}
+export declare var d: m4.d;
+export declare var useMultiImport_m4_x4: m4.d;
+export declare var useMultiImport_m4_d4: typeof m4.d;
+export declare var useMultiImport_m4_f4: m4.d;
diff --git a/tests/baselines/reference/importDecl.types b/tests/baselines/reference/importDecl.types
new file mode 100644
index 00000000000..01333eab49a
--- /dev/null
+++ b/tests/baselines/reference/importDecl.types
@@ -0,0 +1,228 @@
+=== tests/cases/compiler/importDecl_1.ts ===
+///<reference path='importDecl_require.ts'/>
+///<reference path='importDecl_require1.ts'/>
+///<reference path='importDecl_require2.ts'/>
+///<reference path='importDecl_require3.ts'/>
+///<reference path='importDecl_require4.ts'/>
+import m4 = require("importDecl_require"); // Emit used
+>m4 : m4
+
+export var x4 = m4.x;
+>x4 : m4.d
+>m4.x : m4.d
+>m4 : typeof m4
+>x : m4.d
+
+export var d4 = m4.d;
+>d4 : typeof m4.d
+>m4.d : typeof m4.d
+>m4 : typeof m4
+>d : typeof m4.d
+
+export var f4 = m4.foo();
+>f4 : m4.d
+>m4.foo() : m4.d
+>m4.foo : typeof m4.foo
+>m4 : typeof m4
+>foo : typeof m4.foo
+
+export module m1 {
+>m1 : m1
+
+    export var x2 = m4.x;
+>x2 : m4.d
+>m4.x : m4.d
+>m4 : typeof m4
+>x : m4.d
+
+    export var d2 = m4.d;
+>d2 : typeof m4.d
+>m4.d : typeof m4.d
+>m4 : typeof m4
+>d : typeof m4.d
+
+    export var f2 = m4.foo();
+>f2 : m4.d
+>m4.foo() : m4.d
+>m4.foo : typeof m4.foo
+>m4 : typeof m4
+>foo : typeof m4.foo
+
+    var x3 = m4.x;
+>x3 : m4.d
+>m4.x : m4.d
+>m4 : typeof m4
+>x : m4.d
+
+    var d3 = m4.d;
+>d3 : typeof m4.d
+>m4.d : typeof m4.d
+>m4 : typeof m4
+>d : typeof m4.d
+
+    var f3 = m4.foo();
+>f3 : m4.d
+>m4.foo() : m4.d
+>m4.foo : typeof m4.foo
+>m4 : typeof m4
+>foo : typeof m4.foo
+}
+
+//Emit global only usage
+import glo_m4 = require("importDecl_require1");
+>glo_m4 : glo_m4
+
+export var useGlo_m4_d4 = glo_m4.d;
+>useGlo_m4_d4 : typeof glo_m4.d
+>glo_m4.d : typeof glo_m4.d
+>glo_m4 : typeof glo_m4
+>d : typeof glo_m4.d
+
+export var useGlo_m4_f4 = glo_m4.foo();
+>useGlo_m4_f4 : glo_m4.d
+>glo_m4.foo() : glo_m4.d
+>glo_m4.foo : typeof glo_m4.foo
+>glo_m4 : typeof glo_m4
+>foo : typeof glo_m4.foo
+
+//Emit even when used just in function type
+import fncOnly_m4 = require("importDecl_require2");
+>fncOnly_m4 : fncOnly_m4
+
+export var useFncOnly_m4_f4 = fncOnly_m4.foo();
+>useFncOnly_m4_f4 : fncOnly_m4.d
+>fncOnly_m4.foo() : fncOnly_m4.d
+>fncOnly_m4.foo : typeof fncOnly_m4.foo
+>fncOnly_m4 : typeof fncOnly_m4
+>foo : typeof fncOnly_m4.foo
+
+// only used privately no need to emit
+import private_m4 = require("importDecl_require3");
+>private_m4 : private_m4
+
+export module usePrivate_m4_m1 {
+>usePrivate_m4_m1 : usePrivate_m4_m1
+
+    var x3 = private_m4.x;
+>x3 : private_m4.d
+>private_m4.x : private_m4.d
+>private_m4 : typeof private_m4
+>x : private_m4.d
+
+    var d3 = private_m4.d;
+>d3 : typeof private_m4.d
+>private_m4.d : typeof private_m4.d
+>private_m4 : typeof private_m4
+>d : typeof private_m4.d
+
+    var f3 = private_m4.foo();
+>f3 : private_m4.d
+>private_m4.foo() : private_m4.d
+>private_m4.foo : typeof private_m4.foo
+>private_m4 : typeof private_m4
+>foo : typeof private_m4.foo
+}
+
+// Do not emit unused import
+import m5 = require("importDecl_require4");
+>m5 : m5
+
+export var d = m5.foo2();
+>d : m4.d
+>m5.foo2() : m4.d
+>m5.foo2 : typeof m5.foo2
+>m5 : typeof m5
+>foo2 : typeof m5.foo2
+
+// Do not emit multiple used import statements
+import multiImport_m4 = require("importDecl_require"); // Emit used
+>multiImport_m4 : multiImport_m4
+
+export var useMultiImport_m4_x4 = multiImport_m4.x;
+>useMultiImport_m4_x4 : m4.d
+>multiImport_m4.x : m4.d
+>multiImport_m4 : typeof m4
+>x : m4.d
+
+export var useMultiImport_m4_d4 = multiImport_m4.d;
+>useMultiImport_m4_d4 : typeof m4.d
+>multiImport_m4.d : typeof m4.d
+>multiImport_m4 : typeof m4
+>d : typeof m4.d
+
+export var useMultiImport_m4_f4 = multiImport_m4.foo();
+>useMultiImport_m4_f4 : m4.d
+>multiImport_m4.foo() : m4.d
+>multiImport_m4.foo : typeof m4.foo
+>multiImport_m4 : typeof m4
+>foo : typeof m4.foo
+
+=== tests/cases/compiler/importDecl_require.ts ===
+export class d {
+>d : d
+
+    foo: string;
+>foo : string
+}
+export var x: d;
+>x : d
+>d : d
+
+export function foo(): d { return null; }
+>foo : typeof foo
+>d : d
+
+=== tests/cases/compiler/importDecl_require1.ts ===
+export class d {
+>d : d
+
+    bar: string;
+>bar : string
+}
+var x: d;
+>x : d
+>d : d
+
+export function foo(): d { return null; }
+>foo : typeof foo
+>d : d
+
+=== tests/cases/compiler/importDecl_require2.ts ===
+export class d {
+>d : d
+
+    baz: string;
+>baz : string
+}
+export var x: d;
+>x : d
+>d : d
+
+export function foo(): d { return null; }
+>foo : typeof foo
+>d : d
+
+=== tests/cases/compiler/importDecl_require3.ts ===
+export class d {
+>d : d
+
+    bing: string;
+>bing : string
+}
+export var x: d;
+>x : d
+>d : d
+
+export function foo(): d { return null; }
+>foo : typeof foo
+>d : d
+
+=== tests/cases/compiler/importDecl_require4.ts ===
+import m4 = require("importDecl_require");
+>m4 : m4
+
+export function foo2(): m4.d { return null; }
+>foo2 : typeof foo2
+>m4 : m4
+>d : m4.d
+
diff --git a/tests/baselines/reference/indexSignatureTypeInference.errors.txt b/tests/baselines/reference/indexSignatureTypeInference.errors.txt
new file mode 100644
index 00000000000..a37e4458543
--- /dev/null
+++ b/tests/baselines/reference/indexSignatureTypeInference.errors.txt
@@ -0,0 +1,23 @@
+==== tests/cases/compiler/indexSignatureTypeInference.ts (1 errors) ====
+    interface NumberMap<T> {
+        [index: number]: T;
+    }
+    
+    interface StringMap<T> {
+        [index: string]: T;
+    }
+    
+    declare function numberMapToArray<T>(object: NumberMap<T>): T[];
+    declare function stringMapToArray<T>(object: StringMap<T>): T[];
+    
+    var numberMap: NumberMap<Function>;
+    var stringMap: StringMap<Function>;
+    
+    var v1: Function[];
+    var v1 = numberMapToArray(numberMap);  // Ok
+    var v1 = numberMapToArray(stringMap);  // Ok
+    var v1 = stringMapToArray(numberMap);  // Error expected here
+                              ~~~~~~~~~
+!!! Argument of type 'NumberMap<Function>' is not assignable to parameter of type 'StringMap<{}>'.
+    var v1 = stringMapToArray(stringMap);  // Ok
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/indexSignatureTypeInference.js b/tests/baselines/reference/indexSignatureTypeInference.js
new file mode 100644
index 00000000000..73458f9f8d9
--- /dev/null
+++ b/tests/baselines/reference/indexSignatureTypeInference.js
@@ -0,0 +1,30 @@
+//// [indexSignatureTypeInference.ts]
+interface NumberMap<T> {
+    [index: number]: T;
+}
+
+interface StringMap<T> {
+    [index: string]: T;
+}
+
+declare function numberMapToArray<T>(object: NumberMap<T>): T[];
+declare function stringMapToArray<T>(object: StringMap<T>): T[];
+
+var numberMap: NumberMap<Function>;
+var stringMap: StringMap<Function>;
+
+var v1: Function[];
+var v1 = numberMapToArray(numberMap);  // Ok
+var v1 = numberMapToArray(stringMap);  // Ok
+var v1 = stringMapToArray(numberMap);  // Error expected here
+var v1 = stringMapToArray(stringMap);  // Ok
+
+
+//// [indexSignatureTypeInference.js]
+var numberMap;
+var stringMap;
+var v1;
+var v1 = numberMapToArray(numberMap); // Ok
+var v1 = numberMapToArray(stringMap); // Ok
+var v1 = stringMapToArray(numberMap); // Error expected here
+var v1 = stringMapToArray(stringMap); // Ok
diff --git a/tests/baselines/reference/inheritedOverloadedSpecializedSignatures.js b/tests/baselines/reference/inheritedOverloadedSpecializedSignatures.js
new file mode 100644
index 00000000000..792c9232fa2
--- /dev/null
+++ b/tests/baselines/reference/inheritedOverloadedSpecializedSignatures.js
@@ -0,0 +1,49 @@
+//// [inheritedOverloadedSpecializedSignatures.ts]
+interface A {
+  (key:string):void;
+}
+
+interface B extends A {
+  (key:'foo'):string;
+}
+
+var b:B;
+// Should not error
+b('foo').charAt(0);
+
+interface A {
+    (x: 'A1'): string;
+    (x: string): void;
+}
+
+interface B extends A {
+    (x: 'B1'): number;
+}
+
+interface A {
+    (x: 'A2'): boolean;
+}
+
+interface B  {
+    (x: 'B2'): string[];
+}
+
+var b: B;
+// non of these lines should error
+var x1: string[] = b('B2'); 
+var x2: number = b('B1');
+var x3: boolean = b('A2');
+var x4: string = b('A1');
+var x5: void = b('A0');
+
+//// [inheritedOverloadedSpecializedSignatures.js]
+var b;
+// Should not error
+b('foo').charAt(0);
+var b;
+// non of these lines should error
+var x1 = b('B2');
+var x2 = b('B1');
+var x3 = b('A2');
+var x4 = b('A1');
+var x5 = b('A0');
diff --git a/tests/baselines/reference/inheritedOverloadedSpecializedSignatures.types b/tests/baselines/reference/inheritedOverloadedSpecializedSignatures.types
new file mode 100644
index 00000000000..0284fa4bc43
--- /dev/null
+++ b/tests/baselines/reference/inheritedOverloadedSpecializedSignatures.types
@@ -0,0 +1,90 @@
+=== 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);
+>b('foo').charAt(0) : string
+>b('foo').charAt : (pos: number) => string
+>b('foo') : string
+>b : B
+>charAt : (pos: number) => string
+
+interface A {
+>A : A
+
+    (x: 'A1'): string;
+>x : 'A1'
+
+    (x: string): void;
+>x : string
+}
+
+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'
+}
+
+var b: B;
+>b : B
+>B : B
+
+// non of these lines should error
+var x1: string[] = b('B2'); 
+>x1 : string[]
+>b('B2') : string[]
+>b : B
+
+var x2: number = b('B1');
+>x2 : number
+>b('B1') : number
+>b : B
+
+var x3: boolean = b('A2');
+>x3 : boolean
+>b('A2') : boolean
+>b : B
+
+var x4: string = b('A1');
+>x4 : string
+>b('A1') : string
+>b : B
+
+var x5: void = b('A0');
+>x5 : void
+>b('A0') : void
+>b : B
+
diff --git a/tests/baselines/reference/internalAliasWithDottedNameEmit.js b/tests/baselines/reference/internalAliasWithDottedNameEmit.js
index d70da1ba16c..d6a4cfcfff7 100644
--- a/tests/baselines/reference/internalAliasWithDottedNameEmit.js
+++ b/tests/baselines/reference/internalAliasWithDottedNameEmit.js
@@ -18,3 +18,11 @@ var a;
     })(a.b || (a.b = {}));
     var b = a.b;
 })(a || (a = {}));
+
+
+//// [internalAliasWithDottedNameEmit.d.ts]
+declare module a.b.c {
+    var d: any;
+}
+declare module a.e.f {
+}
diff --git a/tests/baselines/reference/invalidTryStatements2.errors.txt b/tests/baselines/reference/invalidTryStatements2.errors.txt
index 8481e437b89..a600210a605 100644
--- a/tests/baselines/reference/invalidTryStatements2.errors.txt
+++ b/tests/baselines/reference/invalidTryStatements2.errors.txt
@@ -1,4 +1,4 @@
-==== tests/cases/conformance/statements/tryStatements/invalidTryStatements2.ts (2 errors) ====
+==== tests/cases/conformance/statements/tryStatements/invalidTryStatements2.ts (6 errors) ====
     function fn() {
         try {
         } catch { // syntax error, missing '(x)'
@@ -10,5 +10,32 @@
         ~~~~~
 !!! 'try' expected.
     
-        finally{ } // error missing try
+        finally{ } // potential error; can be absorbed by the 'catch'
+    }
+    
+    function fn2() {
+        finally { } // error missing try
+        ~~~~~~~
+!!! 'try' expected.
+        catch (x) { } // error missing try
+        ~~~~~
+!!! 'try' expected.
+    
+        // no error
+        try {
+        }
+        finally {
+        }
+    
+        // error missing try
+        finally {
+        ~~~~~~~
+!!! 'try' expected.
+        }
+    
+        // error missing try
+        catch (x) {
+        ~~~~~
+!!! 'try' expected.
+        }
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/mixedExports.js b/tests/baselines/reference/mixedExports.js
new file mode 100644
index 00000000000..1e99ad3c720
--- /dev/null
+++ b/tests/baselines/reference/mixedExports.js
@@ -0,0 +1,19 @@
+//// [mixedExports.ts]
+declare module M {
+     function foo();
+     export function foo();
+     function foo();
+}
+
+declare module M1 {
+     export interface Foo {}
+     interface Foo {}
+}
+
+module A {
+     interface X {x}
+     export module X {}
+     interface X {y}
+}
+
+//// [mixedExports.js]
diff --git a/tests/baselines/reference/mixedExports.types b/tests/baselines/reference/mixedExports.types
new file mode 100644
index 00000000000..c29043b8176
--- /dev/null
+++ b/tests/baselines/reference/mixedExports.types
@@ -0,0 +1,38 @@
+=== tests/cases/compiler/mixedExports.ts ===
+declare module M {
+>M : M
+
+     function foo();
+>foo : typeof foo
+
+     export function foo();
+>foo : typeof foo
+
+     function foo();
+>foo : typeof foo
+}
+
+declare module M1 {
+>M1 : M1
+
+     export interface Foo {}
+>Foo : Foo
+
+     interface Foo {}
+>Foo : Foo
+}
+
+module A {
+>A : A
+
+     interface X {x}
+>X : X
+>x : any
+
+     export module X {}
+>X : A.X
+
+     interface X {y}
+>X : X
+>y : any
+}
diff --git a/tests/baselines/reference/moduleSymbolMerging.js b/tests/baselines/reference/moduleSymbolMerging.js
new file mode 100644
index 00000000000..76d03997550
--- /dev/null
+++ b/tests/baselines/reference/moduleSymbolMerging.js
@@ -0,0 +1,43 @@
+//// [tests/cases/compiler/moduleSymbolMerging.ts] ////
+
+//// [A.ts]
+
+module A { export interface I {} }
+
+//// [B.ts]
+///<reference path="A.ts" />
+module A { ; }
+module B {
+	export function f(): A.I { return null; }
+}
+
+
+
+//// [A.js]
+//// [B.js]
+///<reference path="A.ts" />
+var A;
+(function (A) {
+    ;
+})(A || (A = {}));
+var B;
+(function (B) {
+    function f() {
+        return null;
+    }
+    B.f = f;
+})(B || (B = {}));
+
+
+//// [A.d.ts]
+declare module A {
+    interface I {
+    }
+}
+//// [B.d.ts]
+/// <reference path='A.d.ts' />
+declare module A {
+}
+declare module B {
+    function f(): A.I;
+}
diff --git a/tests/baselines/reference/moduleSymbolMerging.types b/tests/baselines/reference/moduleSymbolMerging.types
new file mode 100644
index 00000000000..62d2378cd2f
--- /dev/null
+++ b/tests/baselines/reference/moduleSymbolMerging.types
@@ -0,0 +1,21 @@
+=== tests/cases/compiler/B.ts ===
+///<reference path="A.ts" />
+module A { ; }
+>A : A
+
+module B {
+>B : B
+
+	export function f(): A.I { return null; }
+>f : typeof f
+>A : A
+>I : A.I
+}
+
+
+=== tests/cases/compiler/A.ts ===
+
+module A { export interface I {} }
+>A : A
+>I : I
+
diff --git a/tests/baselines/reference/multiImportExport.errors.txt b/tests/baselines/reference/multiImportExport.errors.txt
deleted file mode 100644
index 6237131d641..00000000000
--- a/tests/baselines/reference/multiImportExport.errors.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-==== tests/cases/compiler/consumer.ts (0 errors) ====
-    import Drawing = require('./Drawing');
-    var addr = new Drawing.Math.Adder();
-    
-==== tests/cases/compiler/Drawing.ts (0 errors) ====
-    export import Math = require('Math/Math')
-    
-==== tests/cases/compiler/Math/Math.ts (0 errors) ====
-    import Adder = require('Math/Adder');
-    
-    var Math = {
-        Adder:Adder
-    };
-    
-    export = Math
-    
-==== tests/cases/compiler/Math/Adder.ts (1 errors) ====
-    class Adder {
-        add(a: number, b: number) {
-            
-        }
-    }
-    
-    export = Adder;
-    ~~~~~~~~~~~~~~~
-!!! Cannot compile external modules unless the '--module' flag is provided.
\ No newline at end of file
diff --git a/tests/baselines/reference/multiImportExport.js b/tests/baselines/reference/multiImportExport.js
new file mode 100644
index 00000000000..06d81f7e984
--- /dev/null
+++ b/tests/baselines/reference/multiImportExport.js
@@ -0,0 +1,63 @@
+//// [tests/cases/compiler/multiImportExport.ts] ////
+
+//// [consumer.ts]
+import Drawing = require('./Drawing');
+var addr = new Drawing.Math.Adder();
+
+//// [Drawing.ts]
+export import Math = require('Math/Math')
+
+//// [Math.ts]
+import Adder = require('Math/Adder');
+
+var Math = {
+    Adder:Adder
+};
+
+export = Math
+
+//// [Adder.ts]
+class Adder {
+    add(a: number, b: number) {
+        
+    }
+}
+
+export = Adder;
+
+//// [Adder.js]
+var Adder = (function () {
+    function Adder() {
+    }
+    Adder.prototype.add = function (a, b) {
+    };
+    return Adder;
+})();
+module.exports = Adder;
+//// [Math.js]
+var Adder = require('Math/Adder');
+var Math = {
+    Adder: Adder
+};
+module.exports = Math;
+//// [Drawing.js]
+exports.Math = require('Math/Math');
+//// [consumer.js]
+var Drawing = require('./Drawing');
+var addr = new Drawing.Math.Adder();
+
+
+//// [Adder.d.ts]
+declare class Adder {
+    add(a: number, b: number): void;
+}
+export = Adder;
+//// [Math.d.ts]
+import Adder = require('Math/Adder');
+declare var Math: {
+    Adder: typeof Adder;
+};
+export = Math;
+//// [Drawing.d.ts]
+export import Math = require('Math/Math');
+//// [consumer.d.ts]
diff --git a/tests/baselines/reference/multiImportExport.types b/tests/baselines/reference/multiImportExport.types
new file mode 100644
index 00000000000..66a7135b8f5
--- /dev/null
+++ b/tests/baselines/reference/multiImportExport.types
@@ -0,0 +1,49 @@
+=== tests/cases/compiler/consumer.ts ===
+import Drawing = require('./Drawing');
+>Drawing : Drawing
+
+var addr = new Drawing.Math.Adder();
+>addr : Adder
+>new Drawing.Math.Adder() : Adder
+>Drawing.Math.Adder : typeof Adder
+>Drawing.Math : { Adder: typeof Adder; }
+>Drawing : typeof Drawing
+>Math : { Adder: typeof Adder; }
+>Adder : typeof Adder
+
+=== tests/cases/compiler/Drawing.ts ===
+export import Math = require('Math/Math')
+>Math : Math
+
+=== tests/cases/compiler/Math/Math.ts ===
+import Adder = require('Math/Adder');
+>Adder : Adder
+
+var Math = {
+>Math : { Adder: typeof Adder; }
+>{    Adder:Adder} : { Adder: typeof Adder; }
+
+    Adder:Adder
+>Adder : typeof Adder
+>Adder : typeof Adder
+
+};
+
+export = Math
+>Math : { Adder: typeof Adder; }
+
+=== tests/cases/compiler/Math/Adder.ts ===
+class Adder {
+>Adder : Adder
+
+    add(a: number, b: number) {
+>add : (a: number, b: number) => void
+>a : number
+>b : number
+        
+    }
+}
+
+export = Adder;
+>Adder : Adder
+
diff --git a/tests/baselines/reference/nameCollisionsInPropertyAssignments.js b/tests/baselines/reference/nameCollisionsInPropertyAssignments.js
new file mode 100644
index 00000000000..3035ab6e628
--- /dev/null
+++ b/tests/baselines/reference/nameCollisionsInPropertyAssignments.js
@@ -0,0 +1,9 @@
+//// [nameCollisionsInPropertyAssignments.ts]
+var x = 1
+var y = { x() { x++; } }; 
+
+//// [nameCollisionsInPropertyAssignments.js]
+var x = 1;
+var y = { x: function () {
+    x++;
+} };
diff --git a/tests/baselines/reference/nameCollisionsInPropertyAssignments.types b/tests/baselines/reference/nameCollisionsInPropertyAssignments.types
new file mode 100644
index 00000000000..1628b673621
--- /dev/null
+++ b/tests/baselines/reference/nameCollisionsInPropertyAssignments.types
@@ -0,0 +1,12 @@
+=== tests/cases/compiler/nameCollisionsInPropertyAssignments.ts ===
+var x = 1
+>x : number
+
+var y = { x() { x++; } }; 
+>y : { x: () => void; }
+>{ x() { x++; } } : { x: () => void; }
+>x : () => void
+>x() { x++; } : () => void
+>x++ : number
+>x : number
+
diff --git a/tests/baselines/reference/noCatchBlock.js b/tests/baselines/reference/noCatchBlock.js
new file mode 100644
index 00000000000..7b0404c3cad
--- /dev/null
+++ b/tests/baselines/reference/noCatchBlock.js
@@ -0,0 +1,14 @@
+//// [noCatchBlock.ts]
+
+try {
+ // ...
+} finally {
+ // N.B. No 'catch' block
+}
+
+//// [noCatchBlock.js]
+try {
+}
+finally {
+}
+//# sourceMappingURL=noCatchBlock.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/noCatchBlock.js.map b/tests/baselines/reference/noCatchBlock.js.map
new file mode 100644
index 00000000000..dccc7798c92
--- /dev/null
+++ b/tests/baselines/reference/noCatchBlock.js.map
@@ -0,0 +1,2 @@
+//// [noCatchBlock.js.map]
+{"version":3,"file":"noCatchBlock.js","sourceRoot":"","sources":["noCatchBlock.ts"],"names":[],"mappings":"AACA,IAAA,CAAC;AAED,CAAC;QAAC,CAAC;AAEH,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/noCatchBlock.sourcemap.txt b/tests/baselines/reference/noCatchBlock.sourcemap.txt
new file mode 100644
index 00000000000..8d5a67339f6
--- /dev/null
+++ b/tests/baselines/reference/noCatchBlock.sourcemap.txt
@@ -0,0 +1,53 @@
+===================================================================
+JsFile: noCatchBlock.js
+mapUrl: noCatchBlock.js.map
+sourceRoot: 
+sources: noCatchBlock.ts
+===================================================================
+-------------------------------------------------------------------
+emittedFile:tests/cases/compiler/noCatchBlock.js
+sourceFile:noCatchBlock.ts
+-------------------------------------------------------------------
+>>>try {
+1 >
+2 >^^^^
+3 >    ^
+1 >
+  >
+2 >
+3 >    t
+1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0)
+2 >Emitted(1, 5) Source(2, 1) + SourceIndex(0)
+3 >Emitted(1, 6) Source(2, 2) + SourceIndex(0)
+---
+>>>}
+1 >
+2 >^
+3 > ^^^^^^^^^->
+1 >ry {
+  > // ...
+  >
+2 >}
+1 >Emitted(2, 1) Source(4, 1) + SourceIndex(0)
+2 >Emitted(2, 2) Source(4, 2) + SourceIndex(0)
+---
+>>>finally {
+1->^^^^^^^^
+2 >        ^
+1-> 
+2 >        f
+1->Emitted(3, 9) Source(4, 3) + SourceIndex(0)
+2 >Emitted(3, 10) Source(4, 4) + SourceIndex(0)
+---
+>>>}
+1 >
+2 >^
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >inally {
+  > // N.B. No 'catch' block
+  >
+2 >}
+1 >Emitted(4, 1) Source(6, 1) + SourceIndex(0)
+2 >Emitted(4, 2) Source(6, 2) + SourceIndex(0)
+---
+>>>//# sourceMappingURL=noCatchBlock.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/noCatchBlock.types b/tests/baselines/reference/noCatchBlock.types
new file mode 100644
index 00000000000..cf7689660a3
--- /dev/null
+++ b/tests/baselines/reference/noCatchBlock.types
@@ -0,0 +1,8 @@
+=== tests/cases/compiler/noCatchBlock.ts ===
+
+No type information for this code.try {
+No type information for this code. // ...
+No type information for this code.} finally {
+No type information for this code. // N.B. No 'catch' block
+No type information for this code.}
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/noImplicitAnyForIn.errors.txt b/tests/baselines/reference/noImplicitAnyForIn.errors.txt
new file mode 100644
index 00000000000..7e4122a8f26
--- /dev/null
+++ b/tests/baselines/reference/noImplicitAnyForIn.errors.txt
@@ -0,0 +1,42 @@
+==== tests/cases/compiler/noImplicitAnyForIn.ts (5 errors) ====
+    
+    var x: {}[] = [[1, 2, 3], ["hello"]];
+    
+    for (var i in x) {
+        for (var j in x[i]) {
+    
+            //Should yield an implicit 'any' error
+            var _j = x[i][j];
+                     ~~~~~~~
+!!! Index signature of object type implicitly has an 'any' type.
+        }
+    
+        for (var k in x[0]) {
+            var k1 = x[0];
+    
+            //Should yield an implicit 'any' error
+            var k2 = k1[k];
+                     ~~~~~
+!!! Index signature of object type implicitly has an 'any' type.
+        }
+    }
+    
+    for (var a in x) {
+        // Should yield an implicit 'any' error.
+        var b;
+            ~
+!!! Variable 'b' implicitly has an 'any' type.
+    
+        var c = a || b;
+    }
+    
+    var idx = 0;
+    var m = [1, 2, 3, 4, 5];
+    // Should yield an implicit 'any' error.
+    var n = [[]] || [];
+        ~
+!!! Variable 'n' implicitly has an 'any[][]' type.
+    
+    for (n[idx++] in m);
+         ~~~~~~~~
+!!! The left-hand side of a 'for...in' statement must be of type 'string' or 'any'.
\ No newline at end of file
diff --git a/tests/baselines/reference/noImplicitAnyForIn.js b/tests/baselines/reference/noImplicitAnyForIn.js
new file mode 100644
index 00000000000..c8743936a9a
--- /dev/null
+++ b/tests/baselines/reference/noImplicitAnyForIn.js
@@ -0,0 +1,57 @@
+//// [noImplicitAnyForIn.ts]
+
+var x: {}[] = [[1, 2, 3], ["hello"]];
+
+for (var i in x) {
+    for (var j in x[i]) {
+
+        //Should yield an implicit 'any' error
+        var _j = x[i][j];
+    }
+
+    for (var k in x[0]) {
+        var k1 = x[0];
+
+        //Should yield an implicit 'any' error
+        var k2 = k1[k];
+    }
+}
+
+for (var a in x) {
+    // Should yield an implicit 'any' error.
+    var b;
+
+    var c = a || b;
+}
+
+var idx = 0;
+var m = [1, 2, 3, 4, 5];
+// Should yield an implicit 'any' error.
+var n = [[]] || [];
+
+for (n[idx++] in m);
+
+//// [noImplicitAnyForIn.js]
+var x = [[1, 2, 3], ["hello"]];
+for (var i in x) {
+    for (var j in x[i]) {
+        //Should yield an implicit 'any' error
+        var _j = x[i][j];
+    }
+    for (var k in x[0]) {
+        var k1 = x[0];
+        //Should yield an implicit 'any' error
+        var k2 = k1[k];
+    }
+}
+for (var a in x) {
+    // Should yield an implicit 'any' error.
+    var b;
+    var c = a || b;
+}
+var idx = 0;
+var m = [1, 2, 3, 4, 5];
+// Should yield an implicit 'any' error.
+var n = [[]] || [];
+for (n[idx++] in m)
+    ;
diff --git a/tests/baselines/reference/noImplicitAnyIndexing.errors.txt b/tests/baselines/reference/noImplicitAnyIndexing.errors.txt
new file mode 100644
index 00000000000..857809c3e84
--- /dev/null
+++ b/tests/baselines/reference/noImplicitAnyIndexing.errors.txt
@@ -0,0 +1,58 @@
+==== tests/cases/compiler/noImplicitAnyIndexing.ts (4 errors) ====
+    
+    enum MyEmusEnum {
+        emu
+    }
+    
+    // Should be okay; should be a string.
+    var strRepresentation1 = MyEmusEnum[0]
+    
+    // Should be okay; should be a string.
+    var strRepresentation2 = MyEmusEnum[MyEmusEnum.emu]
+    
+    // Should be implicit 'any' ; property access fails, no string indexer.
+    var strRepresentation3 = MyEmusEnum["monehh"];
+                             ~~~~~~~~~~~~~~~~~~~~
+!!! Index signature of object type implicitly has an 'any' type.
+    
+    // Should be okay; should be a MyEmusEnum
+    var strRepresentation4 = MyEmusEnum["emu"];
+    
+    
+    // Should report an implicit 'any'.
+    var x = {}["hi"];
+            ~~~~~~~~
+!!! Index signature of object type implicitly has an 'any' type.
+    
+    // Should report an implicit 'any'.
+    var y = {}[10];
+            ~~~~~~
+!!! Index signature of object type implicitly has an 'any' type.
+    
+    
+    var hi: any = "hi";
+    
+    var emptyObj = {};
+    
+    // Should report an implicit 'any'.
+    var z1 = emptyObj[hi];
+             ~~~~~~~~~~~~
+!!! Index signature of object type implicitly has an 'any' type.
+    var z2 = (<any>emptyObj)[hi];
+    
+    interface MyMap<T> {
+        [key: string]: T;
+    }
+    
+    var m: MyMap<number> = {
+        "0": 0,
+        "1": 1,
+        "2": 2,
+        "Okay that's enough for today.": NaN
+    };
+    
+    var mResult1 = m[MyEmusEnum.emu];
+    var mResult2 = m[MyEmusEnum[MyEmusEnum.emu]];
+    var mResult3 = m[hi];
+    
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/noImplicitAnyIndexing.js b/tests/baselines/reference/noImplicitAnyIndexing.js
new file mode 100644
index 00000000000..ebadbd9a121
--- /dev/null
+++ b/tests/baselines/reference/noImplicitAnyIndexing.js
@@ -0,0 +1,82 @@
+//// [noImplicitAnyIndexing.ts]
+
+enum MyEmusEnum {
+    emu
+}
+
+// Should be okay; should be a string.
+var strRepresentation1 = MyEmusEnum[0]
+
+// Should be okay; should be a string.
+var strRepresentation2 = MyEmusEnum[MyEmusEnum.emu]
+
+// Should be implicit 'any' ; property access fails, no string indexer.
+var strRepresentation3 = MyEmusEnum["monehh"];
+
+// Should be okay; should be a MyEmusEnum
+var strRepresentation4 = MyEmusEnum["emu"];
+
+
+// Should report an implicit 'any'.
+var x = {}["hi"];
+
+// Should report an implicit 'any'.
+var y = {}[10];
+
+
+var hi: any = "hi";
+
+var emptyObj = {};
+
+// Should report an implicit 'any'.
+var z1 = emptyObj[hi];
+var z2 = (<any>emptyObj)[hi];
+
+interface MyMap<T> {
+    [key: string]: T;
+}
+
+var m: MyMap<number> = {
+    "0": 0,
+    "1": 1,
+    "2": 2,
+    "Okay that's enough for today.": NaN
+};
+
+var mResult1 = m[MyEmusEnum.emu];
+var mResult2 = m[MyEmusEnum[MyEmusEnum.emu]];
+var mResult3 = m[hi];
+
+
+
+//// [noImplicitAnyIndexing.js]
+var MyEmusEnum;
+(function (MyEmusEnum) {
+    MyEmusEnum[MyEmusEnum["emu"] = 0] = "emu";
+})(MyEmusEnum || (MyEmusEnum = {}));
+// Should be okay; should be a string.
+var strRepresentation1 = MyEmusEnum[0];
+// Should be okay; should be a string.
+var strRepresentation2 = MyEmusEnum[0 /* emu */];
+// Should be implicit 'any' ; property access fails, no string indexer.
+var strRepresentation3 = MyEmusEnum["monehh"];
+// Should be okay; should be a MyEmusEnum
+var strRepresentation4 = MyEmusEnum["emu"];
+// Should report an implicit 'any'.
+var x = {}["hi"];
+// Should report an implicit 'any'.
+var y = {}[10];
+var hi = "hi";
+var emptyObj = {};
+// Should report an implicit 'any'.
+var z1 = emptyObj[hi];
+var z2 = emptyObj[hi];
+var m = {
+    "0": 0,
+    "1": 1,
+    "2": 2,
+    "Okay that's enough for today.": NaN
+};
+var mResult1 = m[0 /* emu */];
+var mResult2 = m[MyEmusEnum[0 /* emu */]];
+var mResult3 = m[hi];
diff --git a/tests/baselines/reference/noImplicitAnyParametersInAmbientClass.errors.txt b/tests/baselines/reference/noImplicitAnyParametersInAmbientClass.errors.txt
new file mode 100644
index 00000000000..d81e3e38404
--- /dev/null
+++ b/tests/baselines/reference/noImplicitAnyParametersInAmbientClass.errors.txt
@@ -0,0 +1,155 @@
+==== tests/cases/compiler/noImplicitAnyParametersInAmbientClass.ts (31 errors) ====
+    
+    declare class D_C {
+        // No implicit-'any' errors.
+        public pub_f1(): void;
+    
+        // Implicit-'any' errors for x.
+        public pub_f2(x): void;
+                      ~
+!!! Parameter 'x' implicitly has an 'any' type.
+    
+        // No implicit-'any' errors.
+        public pub_f3(x: any): void;
+    
+        // Implicit-'any' errors for x, y, and z.
+        public pub_f4(x, y, z): void;
+                      ~
+!!! Parameter 'x' implicitly has an 'any' type.
+                         ~
+!!! Parameter 'y' implicitly has an 'any' type.
+                            ~
+!!! Parameter 'z' implicitly has an 'any' type.
+    
+        // Implicit-'any' errors for x, and z.
+        public pub_f5(x, y: any, z): void;
+                      ~
+!!! Parameter 'x' implicitly has an 'any' type.
+                                 ~
+!!! Parameter 'z' implicitly has an 'any' type.
+    
+        // Implicit-'any[]' errors for r.
+        public pub_f6(...r): void;
+                      ~~~~
+!!! Rest parameter 'r' implicitly has an 'any[]' type.
+    
+        // Implicit-'any'/'any[]' errors for x, r.
+        public pub_f7(x, ...r): void;
+                      ~
+!!! Parameter 'x' implicitly has an 'any' type.
+                         ~~~~
+!!! Rest parameter 'r' implicitly has an 'any[]' type.
+    
+        // Implicit-'any' errors for x1, y2, x3, and y3.
+        public pub_f8(x1, y1: number): any;
+                      ~~
+!!! Parameter 'x1' implicitly has an 'any' type.
+        public pub_f8(x2: string, y2): any;
+                                  ~~
+!!! Parameter 'y2' implicitly has an 'any' type.
+        public pub_f8(x3, y3): any;
+                      ~~
+!!! Parameter 'x3' implicitly has an 'any' type.
+                          ~~
+!!! Parameter 'y3' implicitly has an 'any' type.
+    
+        // No implicit-'any' errors.
+        public pub_f9: () => string;
+    
+        // Implicit-'any' error for x.
+        public pub_f10: (x) => string;
+                         ~
+!!! Parameter 'x' implicitly has an 'any' type.
+    
+        // Implicit-'any' errors for x, y, and z.
+        public pub_f11: (x, y, z) => string;
+                         ~
+!!! Parameter 'x' implicitly has an 'any' type.
+                            ~
+!!! Parameter 'y' implicitly has an 'any' type.
+                               ~
+!!! Parameter 'z' implicitly has an 'any' type.
+    
+        // Implicit-'any' errors for x and z.
+        public pub_f12: (x, y: any, z) => string;
+                         ~
+!!! Parameter 'x' implicitly has an 'any' type.
+                                    ~
+!!! Parameter 'z' implicitly has an 'any' type.
+    
+        // Implicit-'any[]' error for r.
+        public pub_f13: (...r) => string;
+                         ~~~~
+!!! Rest parameter 'r' implicitly has an 'any[]' type.
+    
+        // Implicit-'any'/'any[]' errors for x, r.
+        public pub_f14: (x, ...r) => string;
+                         ~
+!!! Parameter 'x' implicitly has an 'any' type.
+                            ~~~~
+!!! Rest parameter 'r' implicitly has an 'any[]' type.
+    
+        ///////////////////////////////////////////
+    
+        // No implicit-'any' errors.
+        private priv_f1(): void;
+    
+        // No implicit-'any' errors.
+        private priv_f2(x): void;
+    
+        // No implicit-'any' errors.
+        private priv_f3(x: any): void;
+    
+        // No implicit-'any' errors.
+        private priv_f4(x, y, z): void;
+    
+        // No implicit-'any' errors.
+        private priv_f5(x, y: any, z): void;
+    
+        // No implicit-'any' errors.
+        private priv_f6(...r): void;
+    
+        // No implicit-'any' errors.
+        private priv_f7(x, ...r): void;
+    
+        // No implicit-'any' errors.
+        private priv_f8(x1, y1: number): any;
+        private priv_f8(x2: string, y2): any;
+        private priv_f8(x3, y3): any;
+    
+        // No implicit-'any' errors.
+        private priv_f9: () => string;
+    
+        // Implicit-'any' error for x.
+        private priv_f10: (x) => string;
+                           ~
+!!! Parameter 'x' implicitly has an 'any' type.
+    
+        // Implicit-'any' errors for x, y, and z.
+        private priv_f11: (x, y, z) => string;
+                           ~
+!!! Parameter 'x' implicitly has an 'any' type.
+                              ~
+!!! Parameter 'y' implicitly has an 'any' type.
+                                 ~
+!!! Parameter 'z' implicitly has an 'any' type.
+    
+        // Implicit-'any' errors for x and z.
+        private priv_f12: (x, y: any, z) => string;
+                           ~
+!!! Parameter 'x' implicitly has an 'any' type.
+                                      ~
+!!! Parameter 'z' implicitly has an 'any' type.
+    
+        // Implicit-'any[]' error for r.
+        private priv_f13: (...r) => string;
+                           ~~~~
+!!! Rest parameter 'r' implicitly has an 'any[]' type.
+    
+        // Implicit-'any'/'any[]' errors for x, r.
+        private priv_f14: (x, ...r) => string;
+                           ~
+!!! Parameter 'x' implicitly has an 'any' type.
+                              ~~~~
+!!! Rest parameter 'r' implicitly has an 'any[]' type.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/noImplicitAnyParametersInAmbientClass.js b/tests/baselines/reference/noImplicitAnyParametersInAmbientClass.js
new file mode 100644
index 00000000000..4af0a8c74a3
--- /dev/null
+++ b/tests/baselines/reference/noImplicitAnyParametersInAmbientClass.js
@@ -0,0 +1,95 @@
+//// [noImplicitAnyParametersInAmbientClass.ts]
+
+declare class D_C {
+    // No implicit-'any' errors.
+    public pub_f1(): void;
+
+    // Implicit-'any' errors for x.
+    public pub_f2(x): void;
+
+    // No implicit-'any' errors.
+    public pub_f3(x: any): void;
+
+    // Implicit-'any' errors for x, y, and z.
+    public pub_f4(x, y, z): void;
+
+    // Implicit-'any' errors for x, and z.
+    public pub_f5(x, y: any, z): void;
+
+    // Implicit-'any[]' errors for r.
+    public pub_f6(...r): void;
+
+    // Implicit-'any'/'any[]' errors for x, r.
+    public pub_f7(x, ...r): void;
+
+    // Implicit-'any' errors for x1, y2, x3, and y3.
+    public pub_f8(x1, y1: number): any;
+    public pub_f8(x2: string, y2): any;
+    public pub_f8(x3, y3): any;
+
+    // No implicit-'any' errors.
+    public pub_f9: () => string;
+
+    // Implicit-'any' error for x.
+    public pub_f10: (x) => string;
+
+    // Implicit-'any' errors for x, y, and z.
+    public pub_f11: (x, y, z) => string;
+
+    // Implicit-'any' errors for x and z.
+    public pub_f12: (x, y: any, z) => string;
+
+    // Implicit-'any[]' error for r.
+    public pub_f13: (...r) => string;
+
+    // Implicit-'any'/'any[]' errors for x, r.
+    public pub_f14: (x, ...r) => string;
+
+    ///////////////////////////////////////////
+
+    // No implicit-'any' errors.
+    private priv_f1(): void;
+
+    // No implicit-'any' errors.
+    private priv_f2(x): void;
+
+    // No implicit-'any' errors.
+    private priv_f3(x: any): void;
+
+    // No implicit-'any' errors.
+    private priv_f4(x, y, z): void;
+
+    // No implicit-'any' errors.
+    private priv_f5(x, y: any, z): void;
+
+    // No implicit-'any' errors.
+    private priv_f6(...r): void;
+
+    // No implicit-'any' errors.
+    private priv_f7(x, ...r): void;
+
+    // No implicit-'any' errors.
+    private priv_f8(x1, y1: number): any;
+    private priv_f8(x2: string, y2): any;
+    private priv_f8(x3, y3): any;
+
+    // No implicit-'any' errors.
+    private priv_f9: () => string;
+
+    // Implicit-'any' error for x.
+    private priv_f10: (x) => string;
+
+    // Implicit-'any' errors for x, y, and z.
+    private priv_f11: (x, y, z) => string;
+
+    // Implicit-'any' errors for x and z.
+    private priv_f12: (x, y: any, z) => string;
+
+    // Implicit-'any[]' error for r.
+    private priv_f13: (...r) => string;
+
+    // Implicit-'any'/'any[]' errors for x, r.
+    private priv_f14: (x, ...r) => string;
+}
+
+//// [noImplicitAnyParametersInAmbientClass.js]
diff --git a/tests/baselines/reference/noImplicitAnyParametersInAmbientFunctions.errors.txt b/tests/baselines/reference/noImplicitAnyParametersInAmbientFunctions.errors.txt
new file mode 100644
index 00000000000..905ea1ac9f0
--- /dev/null
+++ b/tests/baselines/reference/noImplicitAnyParametersInAmbientFunctions.errors.txt
@@ -0,0 +1,89 @@
+==== tests/cases/compiler/noImplicitAnyParametersInAmbientFunctions.ts (22 errors) ====
+    
+    // No implicit-'any' errors.
+    declare function d_f1(): void;
+    
+    // Implicit-'any' errors for x.
+    declare function d_f2(x): void;
+                          ~
+!!! Parameter 'x' implicitly has an 'any' type.
+    
+    // No implicit-'any' errors.
+    declare function d_f3(x: any): void;
+    
+    // Implicit-'any' errors for x, y, and z.
+    declare function d_f4(x, y, z): void;
+                          ~
+!!! Parameter 'x' implicitly has an 'any' type.
+                             ~
+!!! Parameter 'y' implicitly has an 'any' type.
+                                ~
+!!! Parameter 'z' implicitly has an 'any' type.
+    
+    // Implicit-'any' errors for x, and z.
+    declare function d_f5(x, y: any, z): void;
+                          ~
+!!! Parameter 'x' implicitly has an 'any' type.
+                                     ~
+!!! Parameter 'z' implicitly has an 'any' type.
+    
+    // Implicit-'any[]' errors for r.
+    declare function d_f6(...r): void;
+                          ~~~~
+!!! Rest parameter 'r' implicitly has an 'any[]' type.
+    
+    // Implicit-'any'/'any[]' errors for x, r.
+    declare function d_f7(x, ...r): void;
+                          ~
+!!! Parameter 'x' implicitly has an 'any' type.
+                             ~~~~
+!!! Rest parameter 'r' implicitly has an 'any[]' type.
+    
+    // Implicit-'any' errors for x1, y2, x3, and y3.
+    declare function d_f8(x1, y1: number): any;
+                          ~~
+!!! Parameter 'x1' implicitly has an 'any' type.
+    declare function d_f8(x2: string, y2): any;
+                                      ~~
+!!! Parameter 'y2' implicitly has an 'any' type.
+    declare function d_f8(x3, y3): any;
+                          ~~
+!!! Parameter 'x3' implicitly has an 'any' type.
+                              ~~
+!!! Parameter 'y3' implicitly has an 'any' type.
+    
+    // No implicit-'any' errors.
+    declare var d_f9: () => string;
+    
+    // Implicit-'any' error for x.
+    declare var d_f10: (x) => string;
+                        ~
+!!! Parameter 'x' implicitly has an 'any' type.
+    
+    // Implicit-'any' errors for x, y, and z.
+    declare var d_f11: (x, y, z) => string;
+                        ~
+!!! Parameter 'x' implicitly has an 'any' type.
+                           ~
+!!! Parameter 'y' implicitly has an 'any' type.
+                              ~
+!!! Parameter 'z' implicitly has an 'any' type.
+    
+    // Implicit-'any' errors for x and z.
+    declare var d_f12: (x, y: any, z) => string;
+                        ~
+!!! Parameter 'x' implicitly has an 'any' type.
+                                   ~
+!!! Parameter 'z' implicitly has an 'any' type.
+    
+    // Implicit-'any[]' error for r.
+    declare var d_f13: (...r) => string;
+                        ~~~~
+!!! Rest parameter 'r' implicitly has an 'any[]' type.
+    
+    // Implicit-'any'/'any[]' errors for x, r.
+    declare var d_f14: (x, ...r) => string;
+                        ~
+!!! Parameter 'x' implicitly has an 'any' type.
+                           ~~~~
+!!! Rest parameter 'r' implicitly has an 'any[]' type.
\ No newline at end of file
diff --git a/tests/baselines/reference/noImplicitAnyParametersInAmbientFunctions.js b/tests/baselines/reference/noImplicitAnyParametersInAmbientFunctions.js
new file mode 100644
index 00000000000..3e825c2b24f
--- /dev/null
+++ b/tests/baselines/reference/noImplicitAnyParametersInAmbientFunctions.js
@@ -0,0 +1,47 @@
+//// [noImplicitAnyParametersInAmbientFunctions.ts]
+
+// No implicit-'any' errors.
+declare function d_f1(): void;
+
+// Implicit-'any' errors for x.
+declare function d_f2(x): void;
+
+// No implicit-'any' errors.
+declare function d_f3(x: any): void;
+
+// Implicit-'any' errors for x, y, and z.
+declare function d_f4(x, y, z): void;
+
+// Implicit-'any' errors for x, and z.
+declare function d_f5(x, y: any, z): void;
+
+// Implicit-'any[]' errors for r.
+declare function d_f6(...r): void;
+
+// Implicit-'any'/'any[]' errors for x, r.
+declare function d_f7(x, ...r): void;
+
+// Implicit-'any' errors for x1, y2, x3, and y3.
+declare function d_f8(x1, y1: number): any;
+declare function d_f8(x2: string, y2): any;
+declare function d_f8(x3, y3): any;
+
+// No implicit-'any' errors.
+declare var d_f9: () => string;
+
+// Implicit-'any' error for x.
+declare var d_f10: (x) => string;
+
+// Implicit-'any' errors for x, y, and z.
+declare var d_f11: (x, y, z) => string;
+
+// Implicit-'any' errors for x and z.
+declare var d_f12: (x, y: any, z) => string;
+
+// Implicit-'any[]' error for r.
+declare var d_f13: (...r) => string;
+
+// Implicit-'any'/'any[]' errors for x, r.
+declare var d_f14: (x, ...r) => string;
+
+//// [noImplicitAnyParametersInAmbientFunctions.js]
diff --git a/tests/baselines/reference/noImplicitAnyParametersInAmbientModule.errors.txt b/tests/baselines/reference/noImplicitAnyParametersInAmbientModule.errors.txt
new file mode 100644
index 00000000000..99779ab7697
--- /dev/null
+++ b/tests/baselines/reference/noImplicitAnyParametersInAmbientModule.errors.txt
@@ -0,0 +1,91 @@
+==== tests/cases/compiler/noImplicitAnyParametersInAmbientModule.ts (22 errors) ====
+    
+    declare module D_M {
+        // No implicit-'any' errors.
+        function dm_f1(): void;
+    
+        // No implicit-'any' errors.
+        function dm_f2(x): void;
+                       ~
+!!! Parameter 'x' implicitly has an 'any' type.
+    
+        // No implicit-'any' errors.
+        function dm_f3(x: any): void;
+    
+        // No implicit-'any' errors.
+        function dm_f4(x, y, z): void;
+                       ~
+!!! Parameter 'x' implicitly has an 'any' type.
+                          ~
+!!! Parameter 'y' implicitly has an 'any' type.
+                             ~
+!!! Parameter 'z' implicitly has an 'any' type.
+    
+        // No implicit-'any' errors.
+        function dm_f5(x, y: any, z): void;
+                       ~
+!!! Parameter 'x' implicitly has an 'any' type.
+                                  ~
+!!! Parameter 'z' implicitly has an 'any' type.
+    
+        // No implicit-'any' errors.
+        function dm_f6(...r): void;
+                       ~~~~
+!!! Rest parameter 'r' implicitly has an 'any[]' type.
+    
+        // No implicit-'any' errors.
+        function dm_f7(x, ...r): void;
+                       ~
+!!! Parameter 'x' implicitly has an 'any' type.
+                          ~~~~
+!!! Rest parameter 'r' implicitly has an 'any[]' type.
+    
+        // No implicit-'any' errors.
+        function dm_f8(x1, y1: number): any;
+                       ~~
+!!! Parameter 'x1' implicitly has an 'any' type.
+        function dm_f8(x2: string, y2): any;
+                                   ~~
+!!! Parameter 'y2' implicitly has an 'any' type.
+        function dm_f8(x3, y3): any;
+                       ~~
+!!! Parameter 'x3' implicitly has an 'any' type.
+                           ~~
+!!! Parameter 'y3' implicitly has an 'any' type.
+    
+        // No implicit-'any' errors.
+        var dm_f9: () => string;
+    
+        // No implicit-'any' errors.
+        var dm_f10: (x) => string;
+                     ~
+!!! Parameter 'x' implicitly has an 'any' type.
+    
+        // No implicit-'any' errors.
+        var dm_f11: (x, y, z) => string;
+                     ~
+!!! Parameter 'x' implicitly has an 'any' type.
+                        ~
+!!! Parameter 'y' implicitly has an 'any' type.
+                           ~
+!!! Parameter 'z' implicitly has an 'any' type.
+    
+        // No implicit-'any' errors.
+        var dm_f12: (x, y: any, z) => string;
+                     ~
+!!! Parameter 'x' implicitly has an 'any' type.
+                                ~
+!!! Parameter 'z' implicitly has an 'any' type.
+    
+        // No implicit-'any' errors.
+        var dm_f13: (...r) => string;
+                     ~~~~
+!!! Rest parameter 'r' implicitly has an 'any[]' type.
+    
+        // No implicit-'any' errors.
+        var dm_f14: (x, ...r) => string;
+                     ~
+!!! Parameter 'x' implicitly has an 'any' type.
+                        ~~~~
+!!! Rest parameter 'r' implicitly has an 'any[]' type.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/noImplicitAnyParametersInAmbientModule.js b/tests/baselines/reference/noImplicitAnyParametersInAmbientModule.js
new file mode 100644
index 00000000000..d35cbe9d9d4
--- /dev/null
+++ b/tests/baselines/reference/noImplicitAnyParametersInAmbientModule.js
@@ -0,0 +1,49 @@
+//// [noImplicitAnyParametersInAmbientModule.ts]
+
+declare module D_M {
+    // No implicit-'any' errors.
+    function dm_f1(): void;
+
+    // No implicit-'any' errors.
+    function dm_f2(x): void;
+
+    // No implicit-'any' errors.
+    function dm_f3(x: any): void;
+
+    // No implicit-'any' errors.
+    function dm_f4(x, y, z): void;
+
+    // No implicit-'any' errors.
+    function dm_f5(x, y: any, z): void;
+
+    // No implicit-'any' errors.
+    function dm_f6(...r): void;
+
+    // No implicit-'any' errors.
+    function dm_f7(x, ...r): void;
+
+    // No implicit-'any' errors.
+    function dm_f8(x1, y1: number): any;
+    function dm_f8(x2: string, y2): any;
+    function dm_f8(x3, y3): any;
+
+    // No implicit-'any' errors.
+    var dm_f9: () => string;
+
+    // No implicit-'any' errors.
+    var dm_f10: (x) => string;
+
+    // No implicit-'any' errors.
+    var dm_f11: (x, y, z) => string;
+
+    // No implicit-'any' errors.
+    var dm_f12: (x, y: any, z) => string;
+
+    // No implicit-'any' errors.
+    var dm_f13: (...r) => string;
+
+    // No implicit-'any' errors.
+    var dm_f14: (x, ...r) => string;
+}
+
+//// [noImplicitAnyParametersInAmbientModule.js]
diff --git a/tests/baselines/reference/noImplicitAnyParametersInBareFunctions.errors.txt b/tests/baselines/reference/noImplicitAnyParametersInBareFunctions.errors.txt
new file mode 100644
index 00000000000..ed49e1dbd11
--- /dev/null
+++ b/tests/baselines/reference/noImplicitAnyParametersInBareFunctions.errors.txt
@@ -0,0 +1,89 @@
+==== tests/cases/compiler/noImplicitAnyParametersInBareFunctions.ts (22 errors) ====
+    
+    // No implicit-'any' errors.
+    function f1(): void { }
+    
+    // Implicit-'any' error for x.
+    function f2(x): void { }
+                ~
+!!! Parameter 'x' implicitly has an 'any' type.
+    
+    // No implicit-'any' errors.
+    function f3(x: any): void { }
+    
+    // Implicit-'any' errors for x, y, and z.
+    function f4(x, y, z): void { }
+                ~
+!!! Parameter 'x' implicitly has an 'any' type.
+                   ~
+!!! Parameter 'y' implicitly has an 'any' type.
+                      ~
+!!! Parameter 'z' implicitly has an 'any' type.
+    
+    // Implicit-'any' errors for x, and z.
+    function f5(x, y: any, z): void { }
+                ~
+!!! Parameter 'x' implicitly has an 'any' type.
+                           ~
+!!! Parameter 'z' implicitly has an 'any' type.
+    
+    // Implicit-'any[]' error for r.
+    function f6(...r): void { }
+                ~~~~
+!!! Rest parameter 'r' implicitly has an 'any[]' type.
+    
+    // Implicit-'any'/'any[]' errors for x, r.
+    function f7(x, ...r): void { }
+                ~
+!!! Parameter 'x' implicitly has an 'any' type.
+                   ~~~~
+!!! Rest parameter 'r' implicitly has an 'any[]' type.
+    
+    // Implicit-'any' errors for x1, y2, x3, and y3.
+    function f8(x1, y1: number): any;
+                ~~
+!!! Parameter 'x1' implicitly has an 'any' type.
+    function f8(x2: string, y2): any;
+                            ~~
+!!! Parameter 'y2' implicitly has an 'any' type.
+    function f8(x3, y3): any { } 
+                ~~
+!!! Parameter 'x3' implicitly has an 'any' type.
+                    ~~
+!!! Parameter 'y3' implicitly has an 'any' type.
+    
+    // No implicit-'any' errors.
+    var f9 = () => "";
+    
+    // Implicit-'any' errors for x.
+    var f10 = (x) => "";
+               ~
+!!! Parameter 'x' implicitly has an 'any' type.
+    
+    // Implicit-'any' errors for x, y, and z.
+    var f11 = (x, y, z) => "";
+               ~
+!!! Parameter 'x' implicitly has an 'any' type.
+                  ~
+!!! Parameter 'y' implicitly has an 'any' type.
+                     ~
+!!! Parameter 'z' implicitly has an 'any' type.
+    
+    // Implicit-'any' errors for x and z.
+    var f12 = (x, y: any, z) => "";
+               ~
+!!! Parameter 'x' implicitly has an 'any' type.
+                          ~
+!!! Parameter 'z' implicitly has an 'any' type.
+    
+    // Implicit-'any[]' error for r.
+    var f13 = (...r) => "";
+               ~~~~
+!!! Rest parameter 'r' implicitly has an 'any[]' type.
+    
+    // Implicit-'any'/'any[]' errors for x, r.
+    var f14 = (x, ...r) => "";
+               ~
+!!! Parameter 'x' implicitly has an 'any' type.
+                  ~~~~
+!!! Rest parameter 'r' implicitly has an 'any[]' type.
\ No newline at end of file
diff --git a/tests/baselines/reference/noImplicitAnyParametersInBareFunctions.js b/tests/baselines/reference/noImplicitAnyParametersInBareFunctions.js
new file mode 100644
index 00000000000..06848d7e89a
--- /dev/null
+++ b/tests/baselines/reference/noImplicitAnyParametersInBareFunctions.js
@@ -0,0 +1,102 @@
+//// [noImplicitAnyParametersInBareFunctions.ts]
+
+// No implicit-'any' errors.
+function f1(): void { }
+
+// Implicit-'any' error for x.
+function f2(x): void { }
+
+// No implicit-'any' errors.
+function f3(x: any): void { }
+
+// Implicit-'any' errors for x, y, and z.
+function f4(x, y, z): void { }
+
+// Implicit-'any' errors for x, and z.
+function f5(x, y: any, z): void { }
+
+// Implicit-'any[]' error for r.
+function f6(...r): void { }
+
+// Implicit-'any'/'any[]' errors for x, r.
+function f7(x, ...r): void { }
+
+// Implicit-'any' errors for x1, y2, x3, and y3.
+function f8(x1, y1: number): any;
+function f8(x2: string, y2): any;
+function f8(x3, y3): any { } 
+
+// No implicit-'any' errors.
+var f9 = () => "";
+
+// Implicit-'any' errors for x.
+var f10 = (x) => "";
+
+// Implicit-'any' errors for x, y, and z.
+var f11 = (x, y, z) => "";
+
+// Implicit-'any' errors for x and z.
+var f12 = (x, y: any, z) => "";
+
+// Implicit-'any[]' error for r.
+var f13 = (...r) => "";
+
+// Implicit-'any'/'any[]' errors for x, r.
+var f14 = (x, ...r) => "";
+
+//// [noImplicitAnyParametersInBareFunctions.js]
+// No implicit-'any' errors.
+function f1() {
+}
+// Implicit-'any' error for x.
+function f2(x) {
+}
+// No implicit-'any' errors.
+function f3(x) {
+}
+// Implicit-'any' errors for x, y, and z.
+function f4(x, y, z) {
+}
+// Implicit-'any' errors for x, and z.
+function f5(x, y, z) {
+}
+// Implicit-'any[]' error for r.
+function f6() {
+    var r = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        r[_i - 0] = arguments[_i];
+    }
+}
+// Implicit-'any'/'any[]' errors for x, r.
+function f7(x) {
+    var r = [];
+    for (var _i = 1; _i < arguments.length; _i++) {
+        r[_i - 1] = arguments[_i];
+    }
+}
+function f8(x3, y3) {
+}
+// No implicit-'any' errors.
+var f9 = function () { return ""; };
+// Implicit-'any' errors for x.
+var f10 = function (x) { return ""; };
+// Implicit-'any' errors for x, y, and z.
+var f11 = function (x, y, z) { return ""; };
+// Implicit-'any' errors for x and z.
+var f12 = function (x, y, z) { return ""; };
+// Implicit-'any[]' error for r.
+var f13 = function () {
+    var r = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        r[_i - 0] = arguments[_i];
+    }
+    return "";
+};
+// Implicit-'any'/'any[]' errors for x, r.
+var f14 = function (x) {
+    var r = [];
+    for (var _i = 1; _i < arguments.length; _i++) {
+        r[_i - 1] = arguments[_i];
+    }
+    return "";
+};
diff --git a/tests/baselines/reference/noImplicitAnyParametersInClass.errors.txt b/tests/baselines/reference/noImplicitAnyParametersInClass.errors.txt
new file mode 100644
index 00000000000..785ebe83b87
--- /dev/null
+++ b/tests/baselines/reference/noImplicitAnyParametersInClass.errors.txt
@@ -0,0 +1,181 @@
+==== tests/cases/compiler/noImplicitAnyParametersInClass.ts (44 errors) ====
+    
+    class C {
+        // No implicit-'any' errors.
+        public pub_f1(): void { }
+    
+        // Implicit-'any' errors for x.
+        public pub_f2(x): void { }
+                      ~
+!!! Parameter 'x' implicitly has an 'any' type.
+    
+        // No implicit-'any' errors.
+        public pub_f3(x: any): void { }
+    
+        // Implicit-'any' errors for x, y, and z.
+        public pub_f4(x, y, z): void { }
+                      ~
+!!! Parameter 'x' implicitly has an 'any' type.
+                         ~
+!!! Parameter 'y' implicitly has an 'any' type.
+                            ~
+!!! Parameter 'z' implicitly has an 'any' type.
+    
+        // Implicit-'any' errors for x, and z.
+        public pub_f5(x, y: any, z): void { }
+                      ~
+!!! Parameter 'x' implicitly has an 'any' type.
+                                 ~
+!!! Parameter 'z' implicitly has an 'any' type.
+    
+        // Implicit-'any[]' errors for r.
+        public pub_f6(...r): void { }
+                      ~~~~
+!!! Rest parameter 'r' implicitly has an 'any[]' type.
+    
+        // Implicit-'any'/'any[]' errors for x, r.
+        public pub_f7(x, ...r): void { }
+                      ~
+!!! Parameter 'x' implicitly has an 'any' type.
+                         ~~~~
+!!! Rest parameter 'r' implicitly has an 'any[]' type.
+    
+        // Implicit-'any' errors for x1, y2, x3, and y3.
+        public pub_f8(x1, y1: number): any;
+                      ~~
+!!! Parameter 'x1' implicitly has an 'any' type.
+        public pub_f8(x2: string, y2): any;
+                                  ~~
+!!! Parameter 'y2' implicitly has an 'any' type.
+        public pub_f8(x3, y3): any { }
+                      ~~
+!!! Parameter 'x3' implicitly has an 'any' type.
+                          ~~
+!!! Parameter 'y3' implicitly has an 'any' type.
+    
+        // No implicit-'any' errors.
+        public pub_f9 = () => "";
+    
+        // Implicit-'any' errors for x.
+        public pub_f10 = (x) => "";
+                          ~
+!!! Parameter 'x' implicitly has an 'any' type.
+    
+        // Implicit-'any' errors for x, y, and z.
+        public pub_f11 = (x, y, z) => "";
+                          ~
+!!! Parameter 'x' implicitly has an 'any' type.
+                             ~
+!!! Parameter 'y' implicitly has an 'any' type.
+                                ~
+!!! Parameter 'z' implicitly has an 'any' type.
+    
+        // Implicit-'any' errors for x and z.
+        public pub_f12 = (x, y: any, z) => "";
+                          ~
+!!! Parameter 'x' implicitly has an 'any' type.
+                                     ~
+!!! Parameter 'z' implicitly has an 'any' type.
+    
+        // Implicit-'any[]' error for r.
+        public pub_f13 = (...r) => "";
+                          ~~~~
+!!! Rest parameter 'r' implicitly has an 'any[]' type.
+    
+        // Implicit-'any'/'any[]' errors for x, r.
+        public pub_f14 = (x, ...r) => "";
+                          ~
+!!! Parameter 'x' implicitly has an 'any' type.
+                             ~~~~
+!!! Rest parameter 'r' implicitly has an 'any[]' type.
+    
+        ///////////////////////////////////////////
+    
+        // No implicit-'any' errors.
+        private priv_f1(): void { }
+    
+        // Implicit-'any' errors for x.
+        private priv_f2(x): void { }
+                        ~
+!!! Parameter 'x' implicitly has an 'any' type.
+    
+        // No implicit-'any' errors.
+        private priv_f3(x: any): void { }
+    
+        // Implicit-'any' errors for x, y, and z.
+        private priv_f4(x, y, z): void { }
+                        ~
+!!! Parameter 'x' implicitly has an 'any' type.
+                           ~
+!!! Parameter 'y' implicitly has an 'any' type.
+                              ~
+!!! Parameter 'z' implicitly has an 'any' type.
+    
+        // Implicit-'any' errors for x, and z.
+        private priv_f5(x, y: any, z): void { }
+                        ~
+!!! Parameter 'x' implicitly has an 'any' type.
+                                   ~
+!!! Parameter 'z' implicitly has an 'any' type.
+    
+        // Implicit-'any[]' errors for r.
+        private priv_f6(...r): void { }
+                        ~~~~
+!!! Rest parameter 'r' implicitly has an 'any[]' type.
+    
+        // Implicit-'any'/'any[]' errors for x, r.
+        private priv_f7(x, ...r): void { }
+                        ~
+!!! Parameter 'x' implicitly has an 'any' type.
+                           ~~~~
+!!! Rest parameter 'r' implicitly has an 'any[]' type.
+    
+        // Implicit-'any' errors for x1, y2, x3, and y3.
+        private priv_f8(x1, y1: number): any;
+                        ~~
+!!! Parameter 'x1' implicitly has an 'any' type.
+        private priv_f8(x2: string, y2): any;
+                                    ~~
+!!! Parameter 'y2' implicitly has an 'any' type.
+        private priv_f8(x3, y3): any { }
+                        ~~
+!!! Parameter 'x3' implicitly has an 'any' type.
+                            ~~
+!!! Parameter 'y3' implicitly has an 'any' type.
+    
+        // No implicit-'any' errors.
+        private priv_f9 = () => "";
+    
+        // Implicit-'any' errors for x.
+        private priv_f10 = (x) => "";
+                            ~
+!!! Parameter 'x' implicitly has an 'any' type.
+    
+        // Implicit-'any' errors for x, y, and z.
+        private priv_f11 = (x, y, z) => "";
+                            ~
+!!! Parameter 'x' implicitly has an 'any' type.
+                               ~
+!!! Parameter 'y' implicitly has an 'any' type.
+                                  ~
+!!! Parameter 'z' implicitly has an 'any' type.
+    
+        // Implicit-'any' errors for x and z.
+        private priv_f12 = (x, y: any, z) => "";
+                            ~
+!!! Parameter 'x' implicitly has an 'any' type.
+                                       ~
+!!! Parameter 'z' implicitly has an 'any' type.
+    
+        // Implicit-'any[]' error for r.
+        private priv_f13 = (...r) => "";
+                            ~~~~
+!!! Rest parameter 'r' implicitly has an 'any[]' type.
+    
+        // Implicit-'any'/'any[]' errors for x, r.
+        private priv_f14 = (x, ...r) => "";
+                            ~
+!!! Parameter 'x' implicitly has an 'any' type.
+                               ~~~~
+!!! Rest parameter 'r' implicitly has an 'any[]' type.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/noImplicitAnyParametersInClass.js b/tests/baselines/reference/noImplicitAnyParametersInClass.js
new file mode 100644
index 00000000000..82164884b80
--- /dev/null
+++ b/tests/baselines/reference/noImplicitAnyParametersInClass.js
@@ -0,0 +1,211 @@
+//// [noImplicitAnyParametersInClass.ts]
+
+class C {
+    // No implicit-'any' errors.
+    public pub_f1(): void { }
+
+    // Implicit-'any' errors for x.
+    public pub_f2(x): void { }
+
+    // No implicit-'any' errors.
+    public pub_f3(x: any): void { }
+
+    // Implicit-'any' errors for x, y, and z.
+    public pub_f4(x, y, z): void { }
+
+    // Implicit-'any' errors for x, and z.
+    public pub_f5(x, y: any, z): void { }
+
+    // Implicit-'any[]' errors for r.
+    public pub_f6(...r): void { }
+
+    // Implicit-'any'/'any[]' errors for x, r.
+    public pub_f7(x, ...r): void { }
+
+    // Implicit-'any' errors for x1, y2, x3, and y3.
+    public pub_f8(x1, y1: number): any;
+    public pub_f8(x2: string, y2): any;
+    public pub_f8(x3, y3): any { }
+
+    // No implicit-'any' errors.
+    public pub_f9 = () => "";
+
+    // Implicit-'any' errors for x.
+    public pub_f10 = (x) => "";
+
+    // Implicit-'any' errors for x, y, and z.
+    public pub_f11 = (x, y, z) => "";
+
+    // Implicit-'any' errors for x and z.
+    public pub_f12 = (x, y: any, z) => "";
+
+    // Implicit-'any[]' error for r.
+    public pub_f13 = (...r) => "";
+
+    // Implicit-'any'/'any[]' errors for x, r.
+    public pub_f14 = (x, ...r) => "";
+
+    ///////////////////////////////////////////
+
+    // No implicit-'any' errors.
+    private priv_f1(): void { }
+
+    // Implicit-'any' errors for x.
+    private priv_f2(x): void { }
+
+    // No implicit-'any' errors.
+    private priv_f3(x: any): void { }
+
+    // Implicit-'any' errors for x, y, and z.
+    private priv_f4(x, y, z): void { }
+
+    // Implicit-'any' errors for x, and z.
+    private priv_f5(x, y: any, z): void { }
+
+    // Implicit-'any[]' errors for r.
+    private priv_f6(...r): void { }
+
+    // Implicit-'any'/'any[]' errors for x, r.
+    private priv_f7(x, ...r): void { }
+
+    // Implicit-'any' errors for x1, y2, x3, and y3.
+    private priv_f8(x1, y1: number): any;
+    private priv_f8(x2: string, y2): any;
+    private priv_f8(x3, y3): any { }
+
+    // No implicit-'any' errors.
+    private priv_f9 = () => "";
+
+    // Implicit-'any' errors for x.
+    private priv_f10 = (x) => "";
+
+    // Implicit-'any' errors for x, y, and z.
+    private priv_f11 = (x, y, z) => "";
+
+    // Implicit-'any' errors for x and z.
+    private priv_f12 = (x, y: any, z) => "";
+
+    // Implicit-'any[]' error for r.
+    private priv_f13 = (...r) => "";
+
+    // Implicit-'any'/'any[]' errors for x, r.
+    private priv_f14 = (x, ...r) => "";
+}
+
+//// [noImplicitAnyParametersInClass.js]
+var C = (function () {
+    function C() {
+        // No implicit-'any' errors.
+        this.pub_f9 = function () { return ""; };
+        // Implicit-'any' errors for x.
+        this.pub_f10 = function (x) { return ""; };
+        // Implicit-'any' errors for x, y, and z.
+        this.pub_f11 = function (x, y, z) { return ""; };
+        // Implicit-'any' errors for x and z.
+        this.pub_f12 = function (x, y, z) { return ""; };
+        // Implicit-'any[]' error for r.
+        this.pub_f13 = function () {
+            var r = [];
+            for (var _i = 0; _i < arguments.length; _i++) {
+                r[_i - 0] = arguments[_i];
+            }
+            return "";
+        };
+        // Implicit-'any'/'any[]' errors for x, r.
+        this.pub_f14 = function (x) {
+            var r = [];
+            for (var _i = 1; _i < arguments.length; _i++) {
+                r[_i - 1] = arguments[_i];
+            }
+            return "";
+        };
+        // No implicit-'any' errors.
+        this.priv_f9 = function () { return ""; };
+        // Implicit-'any' errors for x.
+        this.priv_f10 = function (x) { return ""; };
+        // Implicit-'any' errors for x, y, and z.
+        this.priv_f11 = function (x, y, z) { return ""; };
+        // Implicit-'any' errors for x and z.
+        this.priv_f12 = function (x, y, z) { return ""; };
+        // Implicit-'any[]' error for r.
+        this.priv_f13 = function () {
+            var r = [];
+            for (var _i = 0; _i < arguments.length; _i++) {
+                r[_i - 0] = arguments[_i];
+            }
+            return "";
+        };
+        // Implicit-'any'/'any[]' errors for x, r.
+        this.priv_f14 = function (x) {
+            var r = [];
+            for (var _i = 1; _i < arguments.length; _i++) {
+                r[_i - 1] = arguments[_i];
+            }
+            return "";
+        };
+    }
+    // No implicit-'any' errors.
+    C.prototype.pub_f1 = function () {
+    };
+    // Implicit-'any' errors for x.
+    C.prototype.pub_f2 = function (x) {
+    };
+    // No implicit-'any' errors.
+    C.prototype.pub_f3 = function (x) {
+    };
+    // Implicit-'any' errors for x, y, and z.
+    C.prototype.pub_f4 = function (x, y, z) {
+    };
+    // Implicit-'any' errors for x, and z.
+    C.prototype.pub_f5 = function (x, y, z) {
+    };
+    // Implicit-'any[]' errors for r.
+    C.prototype.pub_f6 = function () {
+        var r = [];
+        for (var _i = 0; _i < arguments.length; _i++) {
+            r[_i - 0] = arguments[_i];
+        }
+    };
+    // Implicit-'any'/'any[]' errors for x, r.
+    C.prototype.pub_f7 = function (x) {
+        var r = [];
+        for (var _i = 1; _i < arguments.length; _i++) {
+            r[_i - 1] = arguments[_i];
+        }
+    };
+    C.prototype.pub_f8 = function (x3, y3) {
+    };
+    ///////////////////////////////////////////
+    // No implicit-'any' errors.
+    C.prototype.priv_f1 = function () {
+    };
+    // Implicit-'any' errors for x.
+    C.prototype.priv_f2 = function (x) {
+    };
+    // No implicit-'any' errors.
+    C.prototype.priv_f3 = function (x) {
+    };
+    // Implicit-'any' errors for x, y, and z.
+    C.prototype.priv_f4 = function (x, y, z) {
+    };
+    // Implicit-'any' errors for x, and z.
+    C.prototype.priv_f5 = function (x, y, z) {
+    };
+    // Implicit-'any[]' errors for r.
+    C.prototype.priv_f6 = function () {
+        var r = [];
+        for (var _i = 0; _i < arguments.length; _i++) {
+            r[_i - 0] = arguments[_i];
+        }
+    };
+    // Implicit-'any'/'any[]' errors for x, r.
+    C.prototype.priv_f7 = function (x) {
+        var r = [];
+        for (var _i = 1; _i < arguments.length; _i++) {
+            r[_i - 1] = arguments[_i];
+        }
+    };
+    C.prototype.priv_f8 = function (x3, y3) {
+    };
+    return C;
+})();
diff --git a/tests/baselines/reference/noImplicitAnyParametersInInterface.errors.txt b/tests/baselines/reference/noImplicitAnyParametersInInterface.errors.txt
new file mode 100644
index 00000000000..c9bece57671
--- /dev/null
+++ b/tests/baselines/reference/noImplicitAnyParametersInInterface.errors.txt
@@ -0,0 +1,106 @@
+==== tests/cases/compiler/noImplicitAnyParametersInInterface.ts (27 errors) ====
+    
+    interface I {
+        // Implicit-'any' errors for first two call signatures, x1, x2, z2.
+        ();
+        ~~~
+!!! Call signature, which lacks return-type annotation, implicitly has an 'any' return type.
+        (x1);
+        ~~~~~
+!!! Call signature, which lacks return-type annotation, implicitly has an 'any' return type.
+         ~~
+!!! Parameter 'x1' implicitly has an 'any' type.
+        (x2, y2: string, z2): any;
+         ~~
+!!! Parameter 'x2' implicitly has an 'any' type.
+                         ~~
+!!! Parameter 'z2' implicitly has an 'any' type.
+    
+        // No implicit-'any' errors.
+        f1(): void;
+    
+        // Implicit-'any' errors for x.
+        f2(x): void;
+           ~
+!!! Parameter 'x' implicitly has an 'any' type.
+    
+        // No implicit-'any' errors.
+        f3(x: any): void;
+    
+        // Implicit-'any' errors for x, y, and z.
+        f4(x, y, z): void;
+           ~
+!!! Parameter 'x' implicitly has an 'any' type.
+              ~
+!!! Parameter 'y' implicitly has an 'any' type.
+                 ~
+!!! Parameter 'z' implicitly has an 'any' type.
+    
+        // Implicit-'any' errors for x, and z.
+        f5(x, y: any, z): void;
+           ~
+!!! Parameter 'x' implicitly has an 'any' type.
+                      ~
+!!! Parameter 'z' implicitly has an 'any' type.
+    
+        // Implicit-'any[]' errors for r.
+        f6(...r): void;
+           ~~~~
+!!! Rest parameter 'r' implicitly has an 'any[]' type.
+    
+        // Implicit-'any'/'any[]' errors for x, r.
+        f7(x, ...r): void;
+           ~
+!!! Parameter 'x' implicitly has an 'any' type.
+              ~~~~
+!!! Rest parameter 'r' implicitly has an 'any[]' type.
+    
+        // Implicit-'any' errors for x1, y2, x3, and y3.
+        f8(x1, y1: number): any;
+           ~~
+!!! Parameter 'x1' implicitly has an 'any' type.
+        f8(x2: string, y2): any;
+                       ~~
+!!! Parameter 'y2' implicitly has an 'any' type.
+        f8(x3, y3): any;
+           ~~
+!!! Parameter 'x3' implicitly has an 'any' type.
+               ~~
+!!! Parameter 'y3' implicitly has an 'any' type.
+    
+        // No implicit-'any' errors.
+        f9: () => string;
+    
+        // Implicit-'any' errors for x.
+        f10: (x) => string;
+              ~
+!!! Parameter 'x' implicitly has an 'any' type.
+    
+        // Implicit-'any' errors for x, y, and z.
+        f11: (x, y, z) => string;
+              ~
+!!! Parameter 'x' implicitly has an 'any' type.
+                 ~
+!!! Parameter 'y' implicitly has an 'any' type.
+                    ~
+!!! Parameter 'z' implicitly has an 'any' type.
+    
+        // Implicit-'any' errors for x and z.
+        f12: (x, y: any, z) => string;
+              ~
+!!! Parameter 'x' implicitly has an 'any' type.
+                         ~
+!!! Parameter 'z' implicitly has an 'any' type.
+    
+        // Implicit-'any[]' error for r.
+        f13: (...r) => string;
+              ~~~~
+!!! Rest parameter 'r' implicitly has an 'any[]' type.
+    
+        // Implicit-'any'/'any[]' errors for x, r.
+        f14: (x, ...r) => string;
+              ~
+!!! Parameter 'x' implicitly has an 'any' type.
+                 ~~~~
+!!! Rest parameter 'r' implicitly has an 'any[]' type.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/noImplicitAnyParametersInInterface.js b/tests/baselines/reference/noImplicitAnyParametersInInterface.js
new file mode 100644
index 00000000000..e8844fa1fad
--- /dev/null
+++ b/tests/baselines/reference/noImplicitAnyParametersInInterface.js
@@ -0,0 +1,54 @@
+//// [noImplicitAnyParametersInInterface.ts]
+
+interface I {
+    // Implicit-'any' errors for first two call signatures, x1, x2, z2.
+    ();
+    (x1);
+    (x2, y2: string, z2): any;
+
+    // No implicit-'any' errors.
+    f1(): void;
+
+    // Implicit-'any' errors for x.
+    f2(x): void;
+
+    // No implicit-'any' errors.
+    f3(x: any): void;
+
+    // Implicit-'any' errors for x, y, and z.
+    f4(x, y, z): void;
+
+    // Implicit-'any' errors for x, and z.
+    f5(x, y: any, z): void;
+
+    // Implicit-'any[]' errors for r.
+    f6(...r): void;
+
+    // Implicit-'any'/'any[]' errors for x, r.
+    f7(x, ...r): void;
+
+    // Implicit-'any' errors for x1, y2, x3, and y3.
+    f8(x1, y1: number): any;
+    f8(x2: string, y2): any;
+    f8(x3, y3): any;
+
+    // No implicit-'any' errors.
+    f9: () => string;
+
+    // Implicit-'any' errors for x.
+    f10: (x) => string;
+
+    // Implicit-'any' errors for x, y, and z.
+    f11: (x, y, z) => string;
+
+    // Implicit-'any' errors for x and z.
+    f12: (x, y: any, z) => string;
+
+    // Implicit-'any[]' error for r.
+    f13: (...r) => string;
+
+    // Implicit-'any'/'any[]' errors for x, r.
+    f14: (x, ...r) => string;
+}
+
+//// [noImplicitAnyParametersInInterface.js]
diff --git a/tests/baselines/reference/noImplicitAnyParametersInModule.errors.txt b/tests/baselines/reference/noImplicitAnyParametersInModule.errors.txt
new file mode 100644
index 00000000000..87912f0dcfa
--- /dev/null
+++ b/tests/baselines/reference/noImplicitAnyParametersInModule.errors.txt
@@ -0,0 +1,91 @@
+==== tests/cases/compiler/noImplicitAnyParametersInModule.ts (22 errors) ====
+    
+    module M {
+        // No implicit-'any' errors.
+        function m_f1(): void { }
+    
+        // Implicit-'any' error for x.
+        function m_f2(x): void { }
+                      ~
+!!! Parameter 'x' implicitly has an 'any' type.
+    
+        // No implicit-'any' errors.
+        function m_f3(x: any): void { }
+    
+        // Implicit-'any' errors for x, y, and z.
+        function m_f4(x, y, z): void { }
+                      ~
+!!! Parameter 'x' implicitly has an 'any' type.
+                         ~
+!!! Parameter 'y' implicitly has an 'any' type.
+                            ~
+!!! Parameter 'z' implicitly has an 'any' type.
+    
+        // Implicit-'any' errors for x and z.
+        function m_f5(x, y: any, z): void { }
+                      ~
+!!! Parameter 'x' implicitly has an 'any' type.
+                                 ~
+!!! Parameter 'z' implicitly has an 'any' type.
+    
+        // Implicit-'any[]' error for r.
+        function m_f6(...r): void { }
+                      ~~~~
+!!! Rest parameter 'r' implicitly has an 'any[]' type.
+    
+        // Implicit-'any'/'any[]' errors for x and r.
+        function m_f7(x, ...r): void { }
+                      ~
+!!! Parameter 'x' implicitly has an 'any' type.
+                         ~~~~
+!!! Rest parameter 'r' implicitly has an 'any[]' type.
+    
+        // Implicit-'any' errors for x1, y2, x3, and y3.
+        function m_f8(x1, y1: number): any;
+                      ~~
+!!! Parameter 'x1' implicitly has an 'any' type.
+        function m_f8(x2: string, y2): any;
+                                  ~~
+!!! Parameter 'y2' implicitly has an 'any' type.
+        function m_f8(x3, y3): any { }
+                      ~~
+!!! Parameter 'x3' implicitly has an 'any' type.
+                          ~~
+!!! Parameter 'y3' implicitly has an 'any' type.
+    
+        // No implicit-'any' errors.
+        var m_f9 = () => "";
+    
+        // Implicit-'any' error for x.
+        var m_f10 = (x) => "";
+                     ~
+!!! Parameter 'x' implicitly has an 'any' type.
+    
+        // Implicit-'any' errors for x, y, and z.
+        var m_f11 = (x, y, z) => "";
+                     ~
+!!! Parameter 'x' implicitly has an 'any' type.
+                        ~
+!!! Parameter 'y' implicitly has an 'any' type.
+                           ~
+!!! Parameter 'z' implicitly has an 'any' type.
+    
+        // Implicit-'any' errors for x and z.
+        var m_f12 = (x, y: any, z) => "";
+                     ~
+!!! Parameter 'x' implicitly has an 'any' type.
+                                ~
+!!! Parameter 'z' implicitly has an 'any' type.
+    
+        // Implicit-'any[]' errors for r.
+        var m_f13 = (...r) => "";
+                     ~~~~
+!!! Rest parameter 'r' implicitly has an 'any[]' type.
+    
+        // Implicit-'any'/'any[]' errors for x and r.
+        var m_f14 = (x, ...r) => "";
+                     ~
+!!! Parameter 'x' implicitly has an 'any' type.
+                        ~~~~
+!!! Rest parameter 'r' implicitly has an 'any[]' type.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/noImplicitAnyParametersInModule.js b/tests/baselines/reference/noImplicitAnyParametersInModule.js
new file mode 100644
index 00000000000..fccb16cefa7
--- /dev/null
+++ b/tests/baselines/reference/noImplicitAnyParametersInModule.js
@@ -0,0 +1,107 @@
+//// [noImplicitAnyParametersInModule.ts]
+
+module M {
+    // No implicit-'any' errors.
+    function m_f1(): void { }
+
+    // Implicit-'any' error for x.
+    function m_f2(x): void { }
+
+    // No implicit-'any' errors.
+    function m_f3(x: any): void { }
+
+    // Implicit-'any' errors for x, y, and z.
+    function m_f4(x, y, z): void { }
+
+    // Implicit-'any' errors for x and z.
+    function m_f5(x, y: any, z): void { }
+
+    // Implicit-'any[]' error for r.
+    function m_f6(...r): void { }
+
+    // Implicit-'any'/'any[]' errors for x and r.
+    function m_f7(x, ...r): void { }
+
+    // Implicit-'any' errors for x1, y2, x3, and y3.
+    function m_f8(x1, y1: number): any;
+    function m_f8(x2: string, y2): any;
+    function m_f8(x3, y3): any { }
+
+    // No implicit-'any' errors.
+    var m_f9 = () => "";
+
+    // Implicit-'any' error for x.
+    var m_f10 = (x) => "";
+
+    // Implicit-'any' errors for x, y, and z.
+    var m_f11 = (x, y, z) => "";
+
+    // Implicit-'any' errors for x and z.
+    var m_f12 = (x, y: any, z) => "";
+
+    // Implicit-'any[]' errors for r.
+    var m_f13 = (...r) => "";
+
+    // Implicit-'any'/'any[]' errors for x and r.
+    var m_f14 = (x, ...r) => "";
+}
+
+//// [noImplicitAnyParametersInModule.js]
+var M;
+(function (M) {
+    // No implicit-'any' errors.
+    function m_f1() {
+    }
+    // Implicit-'any' error for x.
+    function m_f2(x) {
+    }
+    // No implicit-'any' errors.
+    function m_f3(x) {
+    }
+    // Implicit-'any' errors for x, y, and z.
+    function m_f4(x, y, z) {
+    }
+    // Implicit-'any' errors for x and z.
+    function m_f5(x, y, z) {
+    }
+    // Implicit-'any[]' error for r.
+    function m_f6() {
+        var r = [];
+        for (var _i = 0; _i < arguments.length; _i++) {
+            r[_i - 0] = arguments[_i];
+        }
+    }
+    // Implicit-'any'/'any[]' errors for x and r.
+    function m_f7(x) {
+        var r = [];
+        for (var _i = 1; _i < arguments.length; _i++) {
+            r[_i - 1] = arguments[_i];
+        }
+    }
+    function m_f8(x3, y3) {
+    }
+    // No implicit-'any' errors.
+    var m_f9 = function () { return ""; };
+    // Implicit-'any' error for x.
+    var m_f10 = function (x) { return ""; };
+    // Implicit-'any' errors for x, y, and z.
+    var m_f11 = function (x, y, z) { return ""; };
+    // Implicit-'any' errors for x and z.
+    var m_f12 = function (x, y, z) { return ""; };
+    // Implicit-'any[]' errors for r.
+    var m_f13 = function () {
+        var r = [];
+        for (var _i = 0; _i < arguments.length; _i++) {
+            r[_i - 0] = arguments[_i];
+        }
+        return "";
+    };
+    // Implicit-'any'/'any[]' errors for x and r.
+    var m_f14 = function (x) {
+        var r = [];
+        for (var _i = 1; _i < arguments.length; _i++) {
+            r[_i - 1] = arguments[_i];
+        }
+        return "";
+    };
+})(M || (M = {}));
diff --git a/tests/baselines/reference/octalLiteralInStrictModeES3.errors.txt b/tests/baselines/reference/octalLiteralInStrictModeES3.errors.txt
new file mode 100644
index 00000000000..c282d871aff
--- /dev/null
+++ b/tests/baselines/reference/octalLiteralInStrictModeES3.errors.txt
@@ -0,0 +1,5 @@
+==== tests/cases/conformance/parser/ecmascript5/StrictMode/octalLiteralInStrictModeES3.ts (1 errors) ====
+    "use strict";
+    03;
+    ~~
+!!! Octal literals are not allowed in strict mode.
\ No newline at end of file
diff --git a/tests/baselines/reference/overloadsInDifferentContainersDisagreeOnAmbient.errors.txt b/tests/baselines/reference/overloadsInDifferentContainersDisagreeOnAmbient.errors.txt
new file mode 100644
index 00000000000..06bd4d0f62d
--- /dev/null
+++ b/tests/baselines/reference/overloadsInDifferentContainersDisagreeOnAmbient.errors.txt
@@ -0,0 +1,11 @@
+==== tests/cases/compiler/overloadsInDifferentContainersDisagreeOnAmbient.ts (1 errors) ====
+    declare module M {
+        // Error because body is not ambient and this overload is
+        export function f();
+    }
+    
+    module M {
+        export function f() { }
+                        ~
+!!! Overload signatures must all be ambient or non-ambient.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/overloadsInDifferentContainersDisagreeOnAmbient.js b/tests/baselines/reference/overloadsInDifferentContainersDisagreeOnAmbient.js
new file mode 100644
index 00000000000..4d0ac15c717
--- /dev/null
+++ b/tests/baselines/reference/overloadsInDifferentContainersDisagreeOnAmbient.js
@@ -0,0 +1,17 @@
+//// [overloadsInDifferentContainersDisagreeOnAmbient.ts]
+declare module M {
+    // Error because body is not ambient and this overload is
+    export function f();
+}
+
+module M {
+    export function f() { }
+}
+
+//// [overloadsInDifferentContainersDisagreeOnAmbient.js]
+var M;
+(function (M) {
+    function f() {
+    }
+    M.f = f;
+})(M || (M = {}));
diff --git a/tests/baselines/reference/parserAccessors1.errors.txt b/tests/baselines/reference/parserAccessors1.errors.txt
index 3059fd7c506..76747e37104 100644
--- a/tests/baselines/reference/parserAccessors1.errors.txt
+++ b/tests/baselines/reference/parserAccessors1.errors.txt
@@ -1,8 +1,6 @@
-==== tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors1.ts (2 errors) ====
+==== tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors1.ts (1 errors) ====
     class C {
         get Foo() { }
             ~~~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
-            ~~~
 !!! A 'get' accessor must return a value or consist of a single 'throw' statement.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserAccessors1.js b/tests/baselines/reference/parserAccessors1.js
new file mode 100644
index 00000000000..b4cc809e7b2
--- /dev/null
+++ b/tests/baselines/reference/parserAccessors1.js
@@ -0,0 +1,17 @@
+//// [parserAccessors1.ts]
+class C {
+    get Foo() { }
+}
+
+//// [parserAccessors1.js]
+var C = (function () {
+    function C() {
+    }
+    Object.defineProperty(C.prototype, "Foo", {
+        get: function () {
+        },
+        enumerable: true,
+        configurable: true
+    });
+    return C;
+})();
diff --git a/tests/baselines/reference/parserAccessors2.js b/tests/baselines/reference/parserAccessors2.js
new file mode 100644
index 00000000000..71cbd6f466b
--- /dev/null
+++ b/tests/baselines/reference/parserAccessors2.js
@@ -0,0 +1,17 @@
+//// [parserAccessors2.ts]
+class C {
+    set Foo(a) { }
+}
+
+//// [parserAccessors2.js]
+var C = (function () {
+    function C() {
+    }
+    Object.defineProperty(C.prototype, "Foo", {
+        set: function (a) {
+        },
+        enumerable: true,
+        configurable: true
+    });
+    return C;
+})();
diff --git a/tests/baselines/reference/parserAccessors2.types b/tests/baselines/reference/parserAccessors2.types
new file mode 100644
index 00000000000..9a0d9b0fdaa
--- /dev/null
+++ b/tests/baselines/reference/parserAccessors2.types
@@ -0,0 +1,8 @@
+=== tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors2.ts ===
+class C {
+>C : C
+
+    set Foo(a) { }
+>Foo : any
+>a : any
+}
diff --git a/tests/baselines/reference/parserAccessors3.errors.txt b/tests/baselines/reference/parserAccessors3.errors.txt
index a709168b0e0..dd1f2075ae6 100644
--- a/tests/baselines/reference/parserAccessors3.errors.txt
+++ b/tests/baselines/reference/parserAccessors3.errors.txt
@@ -1,6 +1,4 @@
-==== tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors3.ts (2 errors) ====
+==== tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors3.ts (1 errors) ====
     var v = { get Foo() { } };
                   ~~~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
-                  ~~~
 !!! A 'get' accessor must return a value or consist of a single 'throw' statement.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserAccessors3.js b/tests/baselines/reference/parserAccessors3.js
new file mode 100644
index 00000000000..68d8ec15e63
--- /dev/null
+++ b/tests/baselines/reference/parserAccessors3.js
@@ -0,0 +1,6 @@
+//// [parserAccessors3.ts]
+var v = { get Foo() { } };
+
+//// [parserAccessors3.js]
+var v = { get Foo() {
+} };
diff --git a/tests/baselines/reference/parserAccessors4.js b/tests/baselines/reference/parserAccessors4.js
new file mode 100644
index 00000000000..9ebd1f0e82e
--- /dev/null
+++ b/tests/baselines/reference/parserAccessors4.js
@@ -0,0 +1,6 @@
+//// [parserAccessors4.ts]
+var v = { set Foo(a) { } };
+
+//// [parserAccessors4.js]
+var v = { set Foo(a) {
+} };
diff --git a/tests/baselines/reference/parserAccessors4.types b/tests/baselines/reference/parserAccessors4.types
new file mode 100644
index 00000000000..d2db232d796
--- /dev/null
+++ b/tests/baselines/reference/parserAccessors4.types
@@ -0,0 +1,7 @@
+=== tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors4.ts ===
+var v = { set Foo(a) { } };
+>v : { Foo: any; }
+>{ set Foo(a) { } } : { Foo: any; }
+>Foo : any
+>a : any
+
diff --git a/tests/baselines/reference/parserAccessors5.errors.txt b/tests/baselines/reference/parserAccessors5.errors.txt
index 7be1d3c8184..af7de2497f8 100644
--- a/tests/baselines/reference/parserAccessors5.errors.txt
+++ b/tests/baselines/reference/parserAccessors5.errors.txt
@@ -2,5 +2,5 @@
     declare class C {
       get foo() { return 0; }
           ~~~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
+!!! An accessor cannot be declared in an ambient context.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserAccessors6.errors.txt b/tests/baselines/reference/parserAccessors6.errors.txt
index 81690486f07..3b1e8d658ae 100644
--- a/tests/baselines/reference/parserAccessors6.errors.txt
+++ b/tests/baselines/reference/parserAccessors6.errors.txt
@@ -2,5 +2,5 @@
     declare class C {
       set foo(v) { }
           ~~~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
+!!! An accessor cannot be declared in an ambient context.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserAccessors7.errors.txt b/tests/baselines/reference/parserAccessors7.errors.txt
index 9fc027e8e39..cac6f016814 100644
--- a/tests/baselines/reference/parserAccessors7.errors.txt
+++ b/tests/baselines/reference/parserAccessors7.errors.txt
@@ -1,6 +1,6 @@
 ==== tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors7.ts (2 errors) ====
     var v = { get foo(v: number) { } };
                   ~~~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
+!!! A 'get' accessor cannot have parameters.
                   ~~~
 !!! A 'get' accessor must return a value or consist of a single 'throw' statement.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserAccessors8.errors.txt b/tests/baselines/reference/parserAccessors8.errors.txt
index 1b5968ac460..17fbd54bd82 100644
--- a/tests/baselines/reference/parserAccessors8.errors.txt
+++ b/tests/baselines/reference/parserAccessors8.errors.txt
@@ -1,4 +1,4 @@
 ==== tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors8.ts (1 errors) ====
     var v = { set foo() { } }
                   ~~~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
\ No newline at end of file
+!!! A 'set' accessor must have exactly one parameter.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserAccessors9.errors.txt b/tests/baselines/reference/parserAccessors9.errors.txt
index 6de8ef82f21..5b45fca62a7 100644
--- a/tests/baselines/reference/parserAccessors9.errors.txt
+++ b/tests/baselines/reference/parserAccessors9.errors.txt
@@ -1,4 +1,4 @@
 ==== tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors9.ts (1 errors) ====
     var v = { set foo(a, b) { } }
                   ~~~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
\ No newline at end of file
+!!! A 'set' accessor must have exactly one parameter.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserAssignmentExpression1.errors.txt b/tests/baselines/reference/parserAssignmentExpression1.errors.txt
new file mode 100644
index 00000000000..5e2b65cd977
--- /dev/null
+++ b/tests/baselines/reference/parserAssignmentExpression1.errors.txt
@@ -0,0 +1,8 @@
+==== tests/cases/conformance/parser/ecmascript5/Expressions/parserAssignmentExpression1.ts (3 errors) ====
+    (foo()) = bar;
+    ~~~~~~~
+!!! Invalid left-hand side of assignment expression.
+     ~~~
+!!! Cannot find name 'foo'.
+              ~~~
+!!! Cannot find name 'bar'.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserAssignmentExpression1.js b/tests/baselines/reference/parserAssignmentExpression1.js
new file mode 100644
index 00000000000..f6dfa5d3956
--- /dev/null
+++ b/tests/baselines/reference/parserAssignmentExpression1.js
@@ -0,0 +1,5 @@
+//// [parserAssignmentExpression1.ts]
+(foo()) = bar;
+
+//// [parserAssignmentExpression1.js]
+(foo()) = bar;
diff --git a/tests/baselines/reference/parserConstructorDeclaration11.errors.txt b/tests/baselines/reference/parserConstructorDeclaration11.errors.txt
new file mode 100644
index 00000000000..1a516bcc668
--- /dev/null
+++ b/tests/baselines/reference/parserConstructorDeclaration11.errors.txt
@@ -0,0 +1,8 @@
+==== tests/cases/conformance/parser/ecmascript5/ConstructorDeclarations/parserConstructorDeclaration11.ts (2 errors) ====
+    class C {
+      constructor<>() { }
+                 ~~
+!!! Type parameter list cannot be empty.
+                  
+!!! Type parameters cannot appear on a constructor declaration.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserDoStatement2.js b/tests/baselines/reference/parserDoStatement2.js
new file mode 100644
index 00000000000..9febdc60865
--- /dev/null
+++ b/tests/baselines/reference/parserDoStatement2.js
@@ -0,0 +1,8 @@
+//// [parserDoStatement2.ts]
+do{;}while(false)false
+
+//// [parserDoStatement2.js]
+do {
+    ;
+} while (false);
+false;
diff --git a/tests/baselines/reference/parserDoStatement2.types b/tests/baselines/reference/parserDoStatement2.types
new file mode 100644
index 00000000000..62790b49103
--- /dev/null
+++ b/tests/baselines/reference/parserDoStatement2.types
@@ -0,0 +1,3 @@
+=== tests/cases/conformance/parser/ecmascript5/Statements/parserDoStatement2.ts ===
+do{;}while(false)false
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserES3Accessors1.errors.txt b/tests/baselines/reference/parserES3Accessors1.errors.txt
new file mode 100644
index 00000000000..53bfc5e868e
--- /dev/null
+++ b/tests/baselines/reference/parserES3Accessors1.errors.txt
@@ -0,0 +1,8 @@
+==== tests/cases/conformance/parser/ecmascript3/Accessors/parserES3Accessors1.ts (2 errors) ====
+    class C {
+        get Foo() { }
+            ~~~
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
+            ~~~
+!!! A 'get' accessor must return a value or consist of a single 'throw' statement.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserAccessors2.errors.txt b/tests/baselines/reference/parserES3Accessors2.errors.txt
similarity index 54%
rename from tests/baselines/reference/parserAccessors2.errors.txt
rename to tests/baselines/reference/parserES3Accessors2.errors.txt
index 80878ab0ab8..13fd8c37b0f 100644
--- a/tests/baselines/reference/parserAccessors2.errors.txt
+++ b/tests/baselines/reference/parserES3Accessors2.errors.txt
@@ -1,4 +1,4 @@
-==== tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors2.ts (1 errors) ====
+==== tests/cases/conformance/parser/ecmascript3/Accessors/parserES3Accessors2.ts (1 errors) ====
     class C {
         set Foo(a) { }
             ~~~
diff --git a/tests/baselines/reference/parserES3Accessors3.errors.txt b/tests/baselines/reference/parserES3Accessors3.errors.txt
new file mode 100644
index 00000000000..74a79ccf6d8
--- /dev/null
+++ b/tests/baselines/reference/parserES3Accessors3.errors.txt
@@ -0,0 +1,6 @@
+==== tests/cases/conformance/parser/ecmascript3/Accessors/parserES3Accessors3.ts (2 errors) ====
+    var v = { get Foo() { } };
+                  ~~~
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
+                  ~~~
+!!! A 'get' accessor must return a value or consist of a single 'throw' statement.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserAccessors4.errors.txt b/tests/baselines/reference/parserES3Accessors4.errors.txt
similarity index 52%
rename from tests/baselines/reference/parserAccessors4.errors.txt
rename to tests/baselines/reference/parserES3Accessors4.errors.txt
index 46569ff83a2..04de4d3c7fc 100644
--- a/tests/baselines/reference/parserAccessors4.errors.txt
+++ b/tests/baselines/reference/parserES3Accessors4.errors.txt
@@ -1,4 +1,4 @@
-==== tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors4.ts (1 errors) ====
+==== tests/cases/conformance/parser/ecmascript3/Accessors/parserES3Accessors4.ts (1 errors) ====
     var v = { set Foo(a) { } };
                   ~~~
 !!! Accessors are only available when targeting ECMAScript 5 and higher.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserErrorRecovery_ExtendsOrImplementsClause6.errors.txt b/tests/baselines/reference/parserErrorRecovery_ExtendsOrImplementsClause6.errors.txt
new file mode 100644
index 00000000000..7efe1e42167
--- /dev/null
+++ b/tests/baselines/reference/parserErrorRecovery_ExtendsOrImplementsClause6.errors.txt
@@ -0,0 +1,4 @@
+==== tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ExtendsOrImplementsClauses/parserErrorRecovery_ExtendsOrImplementsClause6.ts (1 errors) ====
+    interface I extends { }
+                ~~~~~~~
+!!! 'extends' list cannot be empty.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserForStatement4.errors.txt b/tests/baselines/reference/parserForStatement4.errors.txt
new file mode 100644
index 00000000000..923b05341b5
--- /dev/null
+++ b/tests/baselines/reference/parserForStatement4.errors.txt
@@ -0,0 +1,9 @@
+==== tests/cases/conformance/parser/ecmascript5/Statements/parserForStatement4.ts (3 errors) ====
+    for (a = 1 in b) {
+         ~
+!!! Cannot find name 'a'.
+         ~~~~~
+!!! The left-hand side of a 'for...in' statement must be of type 'string' or 'any'.
+                  ~
+!!! Cannot find name 'b'.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserForStatement4.js b/tests/baselines/reference/parserForStatement4.js
new file mode 100644
index 00000000000..9da13b387d0
--- /dev/null
+++ b/tests/baselines/reference/parserForStatement4.js
@@ -0,0 +1,7 @@
+//// [parserForStatement4.ts]
+for (a = 1 in b) {
+}
+
+//// [parserForStatement4.js]
+for (a = 1 in b) {
+}
diff --git a/tests/baselines/reference/parserForStatement5.errors.txt b/tests/baselines/reference/parserForStatement5.errors.txt
new file mode 100644
index 00000000000..e1d52c58ab6
--- /dev/null
+++ b/tests/baselines/reference/parserForStatement5.errors.txt
@@ -0,0 +1,7 @@
+==== tests/cases/conformance/parser/ecmascript5/Statements/parserForStatement5.ts (2 errors) ====
+    for ({} in b) {
+         ~~
+!!! The left-hand side of a 'for...in' statement must be of type 'string' or 'any'.
+               ~
+!!! Cannot find name 'b'.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserForStatement5.js b/tests/baselines/reference/parserForStatement5.js
new file mode 100644
index 00000000000..8c6b12b8c18
--- /dev/null
+++ b/tests/baselines/reference/parserForStatement5.js
@@ -0,0 +1,7 @@
+//// [parserForStatement5.ts]
+for ({} in b) {
+}
+
+//// [parserForStatement5.js]
+for ({} in b) {
+}
diff --git a/tests/baselines/reference/parserForStatement6.errors.txt b/tests/baselines/reference/parserForStatement6.errors.txt
new file mode 100644
index 00000000000..cb758f34359
--- /dev/null
+++ b/tests/baselines/reference/parserForStatement6.errors.txt
@@ -0,0 +1,9 @@
+==== tests/cases/conformance/parser/ecmascript5/Statements/parserForStatement6.ts (3 errors) ====
+    for (foo() in b) {
+         ~~~
+!!! Cannot find name 'foo'.
+         ~~~~~
+!!! The left-hand side of a 'for...in' statement must be of type 'string' or 'any'.
+                  ~
+!!! Cannot find name 'b'.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserForStatement6.js b/tests/baselines/reference/parserForStatement6.js
new file mode 100644
index 00000000000..d05ee600b35
--- /dev/null
+++ b/tests/baselines/reference/parserForStatement6.js
@@ -0,0 +1,7 @@
+//// [parserForStatement6.ts]
+for (foo() in b) {
+}
+
+//// [parserForStatement6.js]
+for (foo() in b) {
+}
diff --git a/tests/baselines/reference/parserForStatement7.errors.txt b/tests/baselines/reference/parserForStatement7.errors.txt
new file mode 100644
index 00000000000..0b1eeba1e05
--- /dev/null
+++ b/tests/baselines/reference/parserForStatement7.errors.txt
@@ -0,0 +1,9 @@
+==== tests/cases/conformance/parser/ecmascript5/Statements/parserForStatement7.ts (3 errors) ====
+    for (new foo() in b) {
+         ~~~~~~~~~
+!!! The left-hand side of a 'for...in' statement must be of type 'string' or 'any'.
+             ~~~
+!!! Cannot find name 'foo'.
+                      ~
+!!! Cannot find name 'b'.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserForStatement7.js b/tests/baselines/reference/parserForStatement7.js
new file mode 100644
index 00000000000..a5c149131c8
--- /dev/null
+++ b/tests/baselines/reference/parserForStatement7.js
@@ -0,0 +1,7 @@
+//// [parserForStatement7.ts]
+for (new foo() in b) {
+}
+
+//// [parserForStatement7.js]
+for (new foo() in b) {
+}
diff --git a/tests/baselines/reference/parserForStatement8.errors.txt b/tests/baselines/reference/parserForStatement8.errors.txt
new file mode 100644
index 00000000000..f374f6935aa
--- /dev/null
+++ b/tests/baselines/reference/parserForStatement8.errors.txt
@@ -0,0 +1,7 @@
+==== tests/cases/conformance/parser/ecmascript5/Statements/parserForStatement8.ts (2 errors) ====
+    for (this in b) {
+         ~~~~
+!!! Invalid left-hand side in 'for...in' statement.
+                 ~
+!!! Cannot find name 'b'.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserForStatement8.js b/tests/baselines/reference/parserForStatement8.js
new file mode 100644
index 00000000000..3f2bd697e58
--- /dev/null
+++ b/tests/baselines/reference/parserForStatement8.js
@@ -0,0 +1,7 @@
+//// [parserForStatement8.ts]
+for (this in b) {
+}
+
+//// [parserForStatement8.js]
+for (this in b) {
+}
diff --git a/tests/baselines/reference/parserGetAccessorWithTypeParameters1.errors.txt b/tests/baselines/reference/parserGetAccessorWithTypeParameters1.errors.txt
index 8af4097341b..0f290dbd8ab 100644
--- a/tests/baselines/reference/parserGetAccessorWithTypeParameters1.errors.txt
+++ b/tests/baselines/reference/parserGetAccessorWithTypeParameters1.errors.txt
@@ -2,7 +2,7 @@
     class C {
       get foo<T>() { }
           ~~~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
+!!! An accessor cannot have type parameters.
           ~~~
 !!! A 'get' accessor must return a value or consist of a single 'throw' statement.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserKeywordsAsIdentifierName2.errors.txt b/tests/baselines/reference/parserKeywordsAsIdentifierName2.errors.txt
index ca8bde2f068..41b5ab32f89 100644
--- a/tests/baselines/reference/parserKeywordsAsIdentifierName2.errors.txt
+++ b/tests/baselines/reference/parserKeywordsAsIdentifierName2.errors.txt
@@ -1,5 +1,5 @@
 ==== tests/cases/conformance/parser/ecmascript5/parserKeywordsAsIdentifierName2.ts (2 errors) ====
-    // 'public' shoudl be marked unusable because it has a trailing /*
+    // 'public' should be marked unusable, should complain on trailing /*
     a.public /*
                
 !!! '*/' expected.
diff --git a/tests/baselines/reference/parserMemberAccessor1.errors.txt b/tests/baselines/reference/parserMemberAccessor1.errors.txt
index 59e39b490c8..c768b0ce2fe 100644
--- a/tests/baselines/reference/parserMemberAccessor1.errors.txt
+++ b/tests/baselines/reference/parserMemberAccessor1.errors.txt
@@ -1,11 +1,7 @@
-==== tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessor1.ts (3 errors) ====
+==== tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessor1.ts (1 errors) ====
     class C {
       get foo() { }
           ~~~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
-          ~~~
 !!! A 'get' accessor must return a value or consist of a single 'throw' statement.
       set foo(a) { }
-          ~~~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserMemberAccessor1.js b/tests/baselines/reference/parserMemberAccessor1.js
new file mode 100644
index 00000000000..3d4690d58e9
--- /dev/null
+++ b/tests/baselines/reference/parserMemberAccessor1.js
@@ -0,0 +1,20 @@
+//// [parserMemberAccessor1.ts]
+class C {
+  get foo() { }
+  set foo(a) { }
+}
+
+//// [parserMemberAccessor1.js]
+var C = (function () {
+    function C() {
+    }
+    Object.defineProperty(C.prototype, "foo", {
+        get: function () {
+        },
+        set: function (a) {
+        },
+        enumerable: true,
+        configurable: true
+    });
+    return C;
+})();
diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration1.errors.txt b/tests/baselines/reference/parserMemberAccessorDeclaration1.errors.txt
index 0cb6526b2ad..403a30a67ae 100644
--- a/tests/baselines/reference/parserMemberAccessorDeclaration1.errors.txt
+++ b/tests/baselines/reference/parserMemberAccessorDeclaration1.errors.txt
@@ -1,8 +1,6 @@
-==== tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration1.ts (2 errors) ====
+==== tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration1.ts (1 errors) ====
     class C {
       get a() { }
           ~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
-          ~
 !!! A 'get' accessor must return a value or consist of a single 'throw' statement.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration1.js b/tests/baselines/reference/parserMemberAccessorDeclaration1.js
new file mode 100644
index 00000000000..1f0b5eb3bd9
--- /dev/null
+++ b/tests/baselines/reference/parserMemberAccessorDeclaration1.js
@@ -0,0 +1,17 @@
+//// [parserMemberAccessorDeclaration1.ts]
+class C {
+  get a() { }
+}
+
+//// [parserMemberAccessorDeclaration1.js]
+var C = (function () {
+    function C() {
+    }
+    Object.defineProperty(C.prototype, "a", {
+        get: function () {
+        },
+        enumerable: true,
+        configurable: true
+    });
+    return C;
+})();
diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration10.errors.txt b/tests/baselines/reference/parserMemberAccessorDeclaration10.errors.txt
index b0a0c583d54..a1b29085f5d 100644
--- a/tests/baselines/reference/parserMemberAccessorDeclaration10.errors.txt
+++ b/tests/baselines/reference/parserMemberAccessorDeclaration10.errors.txt
@@ -1,10 +1,8 @@
-==== tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration10.ts (3 errors) ====
+==== tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration10.ts (2 errors) ====
     class C {
         export get Foo() { }
         ~~~~~~
 !!! 'export' modifier cannot appear on a class element.
                    ~~~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
-                   ~~~
 !!! A 'get' accessor must return a value or consist of a single 'throw' statement.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration11.errors.txt b/tests/baselines/reference/parserMemberAccessorDeclaration11.errors.txt
index 1e8324f4e60..6d3e1651273 100644
--- a/tests/baselines/reference/parserMemberAccessorDeclaration11.errors.txt
+++ b/tests/baselines/reference/parserMemberAccessorDeclaration11.errors.txt
@@ -1,8 +1,6 @@
-==== tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration11.ts (2 errors) ====
+==== tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration11.ts (1 errors) ====
     class C {
         declare get Foo() { }
         ~~~~~~~
 !!! 'declare' modifier cannot appear on a class element.
-                    ~~~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration12.errors.txt b/tests/baselines/reference/parserMemberAccessorDeclaration12.errors.txt
index 0c0990b37e5..7cbf2606274 100644
--- a/tests/baselines/reference/parserMemberAccessorDeclaration12.errors.txt
+++ b/tests/baselines/reference/parserMemberAccessorDeclaration12.errors.txt
@@ -2,7 +2,7 @@
     class C {
        get Foo(a: number) { }
            ~~~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
+!!! A 'get' accessor cannot have parameters.
            ~~~
 !!! A 'get' accessor must return a value or consist of a single 'throw' statement.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration13.errors.txt b/tests/baselines/reference/parserMemberAccessorDeclaration13.errors.txt
index dd8eb7b4147..b891866c684 100644
--- a/tests/baselines/reference/parserMemberAccessorDeclaration13.errors.txt
+++ b/tests/baselines/reference/parserMemberAccessorDeclaration13.errors.txt
@@ -2,5 +2,5 @@
     class C {
        set Foo() { }
            ~~~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
+!!! A 'set' accessor must have exactly one parameter.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration14.errors.txt b/tests/baselines/reference/parserMemberAccessorDeclaration14.errors.txt
index 95ede4f9764..6d49231ce08 100644
--- a/tests/baselines/reference/parserMemberAccessorDeclaration14.errors.txt
+++ b/tests/baselines/reference/parserMemberAccessorDeclaration14.errors.txt
@@ -2,5 +2,5 @@
     class C {
        set Foo(a: number, b: number) { }
            ~~~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
+!!! A 'set' accessor must have exactly one parameter.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration15.errors.txt b/tests/baselines/reference/parserMemberAccessorDeclaration15.errors.txt
index 35b762e1e26..ae659f7f464 100644
--- a/tests/baselines/reference/parserMemberAccessorDeclaration15.errors.txt
+++ b/tests/baselines/reference/parserMemberAccessorDeclaration15.errors.txt
@@ -2,7 +2,7 @@
     class C {
        set Foo(public a: number) { }
            ~~~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
+!!! A parameter property is only allowed in a constructor implementation.
                ~~~~~~~~~~~~~~~~
 !!! A parameter property is only allowed in a constructor implementation.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration16.errors.txt b/tests/baselines/reference/parserMemberAccessorDeclaration16.errors.txt
index 1f78f88831f..7505ca7a68b 100644
--- a/tests/baselines/reference/parserMemberAccessorDeclaration16.errors.txt
+++ b/tests/baselines/reference/parserMemberAccessorDeclaration16.errors.txt
@@ -2,5 +2,5 @@
     class C {
        set Foo(a = 1) { }
            ~~~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
+!!! A 'set' accessor parameter cannot have an initializer.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration17.errors.txt b/tests/baselines/reference/parserMemberAccessorDeclaration17.errors.txt
index bd2af9040f7..b2f34a5d348 100644
--- a/tests/baselines/reference/parserMemberAccessorDeclaration17.errors.txt
+++ b/tests/baselines/reference/parserMemberAccessorDeclaration17.errors.txt
@@ -2,5 +2,5 @@
     class C {
        set Foo(a?: number) { }
            ~~~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
+!!! A 'set' accessor cannot have an optional parameter.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration18.errors.txt b/tests/baselines/reference/parserMemberAccessorDeclaration18.errors.txt
index 6c798ed48dc..d7ea5ac0188 100644
--- a/tests/baselines/reference/parserMemberAccessorDeclaration18.errors.txt
+++ b/tests/baselines/reference/parserMemberAccessorDeclaration18.errors.txt
@@ -2,5 +2,5 @@
     class C {
        set Foo(...a) { }
            ~~~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
+!!! A 'set' accessor cannot have rest parameter.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration2.errors.txt b/tests/baselines/reference/parserMemberAccessorDeclaration2.errors.txt
index 3a54a437ec0..1a32d342f1b 100644
--- a/tests/baselines/reference/parserMemberAccessorDeclaration2.errors.txt
+++ b/tests/baselines/reference/parserMemberAccessorDeclaration2.errors.txt
@@ -1,8 +1,6 @@
-==== tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration2.ts (2 errors) ====
+==== tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration2.ts (1 errors) ====
     class C {
       get "b"() { }
           ~~~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
-          ~~~
 !!! A 'get' accessor must return a value or consist of a single 'throw' statement.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration2.js b/tests/baselines/reference/parserMemberAccessorDeclaration2.js
new file mode 100644
index 00000000000..00cc2812014
--- /dev/null
+++ b/tests/baselines/reference/parserMemberAccessorDeclaration2.js
@@ -0,0 +1,17 @@
+//// [parserMemberAccessorDeclaration2.ts]
+class C {
+  get "b"() { }
+}
+
+//// [parserMemberAccessorDeclaration2.js]
+var C = (function () {
+    function C() {
+    }
+    Object.defineProperty(C.prototype, "b", {
+        get: function () {
+        },
+        enumerable: true,
+        configurable: true
+    });
+    return C;
+})();
diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration3.errors.txt b/tests/baselines/reference/parserMemberAccessorDeclaration3.errors.txt
index bd30a29dc52..dbf94b6420f 100644
--- a/tests/baselines/reference/parserMemberAccessorDeclaration3.errors.txt
+++ b/tests/baselines/reference/parserMemberAccessorDeclaration3.errors.txt
@@ -1,8 +1,6 @@
-==== tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration3.ts (2 errors) ====
+==== tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration3.ts (1 errors) ====
     class C {
       get 0() { }
           ~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
-          ~
 !!! A 'get' accessor must return a value or consist of a single 'throw' statement.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration3.js b/tests/baselines/reference/parserMemberAccessorDeclaration3.js
new file mode 100644
index 00000000000..86fc2c3e532
--- /dev/null
+++ b/tests/baselines/reference/parserMemberAccessorDeclaration3.js
@@ -0,0 +1,17 @@
+//// [parserMemberAccessorDeclaration3.ts]
+class C {
+  get 0() { }
+}
+
+//// [parserMemberAccessorDeclaration3.js]
+var C = (function () {
+    function C() {
+    }
+    Object.defineProperty(C.prototype, "0", {
+        get: function () {
+        },
+        enumerable: true,
+        configurable: true
+    });
+    return C;
+})();
diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration4.errors.txt b/tests/baselines/reference/parserMemberAccessorDeclaration4.errors.txt
deleted file mode 100644
index 30d2b4e437b..00000000000
--- a/tests/baselines/reference/parserMemberAccessorDeclaration4.errors.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-==== tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration4.ts (1 errors) ====
-    class C {
-      set a(i) { }
-          ~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration4.js b/tests/baselines/reference/parserMemberAccessorDeclaration4.js
new file mode 100644
index 00000000000..552c2c1d27a
--- /dev/null
+++ b/tests/baselines/reference/parserMemberAccessorDeclaration4.js
@@ -0,0 +1,17 @@
+//// [parserMemberAccessorDeclaration4.ts]
+class C {
+  set a(i) { }
+}
+
+//// [parserMemberAccessorDeclaration4.js]
+var C = (function () {
+    function C() {
+    }
+    Object.defineProperty(C.prototype, "a", {
+        set: function (i) {
+        },
+        enumerable: true,
+        configurable: true
+    });
+    return C;
+})();
diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration4.types b/tests/baselines/reference/parserMemberAccessorDeclaration4.types
new file mode 100644
index 00000000000..de4bc245d2e
--- /dev/null
+++ b/tests/baselines/reference/parserMemberAccessorDeclaration4.types
@@ -0,0 +1,8 @@
+=== tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration4.ts ===
+class C {
+>C : C
+
+  set a(i) { }
+>a : any
+>i : any
+}
diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration5.errors.txt b/tests/baselines/reference/parserMemberAccessorDeclaration5.errors.txt
deleted file mode 100644
index 6fa083c4df8..00000000000
--- a/tests/baselines/reference/parserMemberAccessorDeclaration5.errors.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-==== tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration5.ts (1 errors) ====
-    class C {
-      set "a"(i) { }
-          ~~~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration5.js b/tests/baselines/reference/parserMemberAccessorDeclaration5.js
new file mode 100644
index 00000000000..309df8b68ec
--- /dev/null
+++ b/tests/baselines/reference/parserMemberAccessorDeclaration5.js
@@ -0,0 +1,17 @@
+//// [parserMemberAccessorDeclaration5.ts]
+class C {
+  set "a"(i) { }
+}
+
+//// [parserMemberAccessorDeclaration5.js]
+var C = (function () {
+    function C() {
+    }
+    Object.defineProperty(C.prototype, "a", {
+        set: function (i) {
+        },
+        enumerable: true,
+        configurable: true
+    });
+    return C;
+})();
diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration5.types b/tests/baselines/reference/parserMemberAccessorDeclaration5.types
new file mode 100644
index 00000000000..d22ee2d775a
--- /dev/null
+++ b/tests/baselines/reference/parserMemberAccessorDeclaration5.types
@@ -0,0 +1,7 @@
+=== tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration5.ts ===
+class C {
+>C : C
+
+  set "a"(i) { }
+>i : any
+}
diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration6.errors.txt b/tests/baselines/reference/parserMemberAccessorDeclaration6.errors.txt
deleted file mode 100644
index 18c6675eac1..00000000000
--- a/tests/baselines/reference/parserMemberAccessorDeclaration6.errors.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-==== tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration6.ts (1 errors) ====
-    class C {
-      set 0(i) { }
-          ~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration6.js b/tests/baselines/reference/parserMemberAccessorDeclaration6.js
new file mode 100644
index 00000000000..0b44673f146
--- /dev/null
+++ b/tests/baselines/reference/parserMemberAccessorDeclaration6.js
@@ -0,0 +1,17 @@
+//// [parserMemberAccessorDeclaration6.ts]
+class C {
+  set 0(i) { }
+}
+
+//// [parserMemberAccessorDeclaration6.js]
+var C = (function () {
+    function C() {
+    }
+    Object.defineProperty(C.prototype, "0", {
+        set: function (i) {
+        },
+        enumerable: true,
+        configurable: true
+    });
+    return C;
+})();
diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration6.types b/tests/baselines/reference/parserMemberAccessorDeclaration6.types
new file mode 100644
index 00000000000..a06b6ddfa0c
--- /dev/null
+++ b/tests/baselines/reference/parserMemberAccessorDeclaration6.types
@@ -0,0 +1,7 @@
+=== tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration6.ts ===
+class C {
+>C : C
+
+  set 0(i) { }
+>i : any
+}
diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration7.errors.txt b/tests/baselines/reference/parserMemberAccessorDeclaration7.errors.txt
index 61c9115a17a..20ebd2f3583 100644
--- a/tests/baselines/reference/parserMemberAccessorDeclaration7.errors.txt
+++ b/tests/baselines/reference/parserMemberAccessorDeclaration7.errors.txt
@@ -1,10 +1,8 @@
-==== tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration7.ts (3 errors) ====
+==== tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration7.ts (2 errors) ====
     class C {
         public public get Foo() { }
                ~~~~~~
 !!! Accessibility modifier already seen.
                           ~~~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
-                          ~~~
 !!! A 'get' accessor must return a value or consist of a single 'throw' statement.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration8.errors.txt b/tests/baselines/reference/parserMemberAccessorDeclaration8.errors.txt
index b8e304aed8c..f6d151bfb7f 100644
--- a/tests/baselines/reference/parserMemberAccessorDeclaration8.errors.txt
+++ b/tests/baselines/reference/parserMemberAccessorDeclaration8.errors.txt
@@ -1,10 +1,8 @@
-==== tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration8.ts (3 errors) ====
+==== tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration8.ts (2 errors) ====
     class C {
         static static get Foo() { }
                ~~~~~~
 !!! 'static' modifier already seen.
                           ~~~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
-                          ~~~
 !!! A 'get' accessor must return a value or consist of a single 'throw' statement.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserMemberAccessorDeclaration9.errors.txt b/tests/baselines/reference/parserMemberAccessorDeclaration9.errors.txt
index 18d9653c8e0..e4c88dfd57d 100644
--- a/tests/baselines/reference/parserMemberAccessorDeclaration9.errors.txt
+++ b/tests/baselines/reference/parserMemberAccessorDeclaration9.errors.txt
@@ -1,10 +1,8 @@
-==== tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration9.ts (3 errors) ====
+==== tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration9.ts (2 errors) ====
     class C {
         static public get Foo() { }
                ~~~~~~
 !!! 'public' modifier must precede 'static' modifier.
                           ~~~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
-                          ~~~
 !!! A 'get' accessor must return a value or consist of a single 'throw' statement.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserObjectCreation2.errors.txt b/tests/baselines/reference/parserObjectCreation2.errors.txt
new file mode 100644
index 00000000000..c20922d1784
--- /dev/null
+++ b/tests/baselines/reference/parserObjectCreation2.errors.txt
@@ -0,0 +1,4 @@
+==== tests/cases/conformance/parser/ecmascript5/Expressions/parserObjectCreation2.ts (1 errors) ====
+    new new Foo()()
+            ~~~
+!!! Cannot find name 'Foo'.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserObjectCreation2.js b/tests/baselines/reference/parserObjectCreation2.js
new file mode 100644
index 00000000000..ce05a2af96a
--- /dev/null
+++ b/tests/baselines/reference/parserObjectCreation2.js
@@ -0,0 +1,5 @@
+//// [parserObjectCreation2.ts]
+new new Foo()()
+
+//// [parserObjectCreation2.js]
+new new Foo()();
diff --git a/tests/baselines/reference/parserObjectLiterals1.js b/tests/baselines/reference/parserObjectLiterals1.js
new file mode 100644
index 00000000000..426b8107d3b
--- /dev/null
+++ b/tests/baselines/reference/parserObjectLiterals1.js
@@ -0,0 +1,5 @@
+//// [parserObjectLiterals1.ts]
+var v = { a: 1, b: 2 };
+
+//// [parserObjectLiterals1.js]
+var v = { a: 1, b: 2 };
diff --git a/tests/baselines/reference/parserObjectLiterals1.types b/tests/baselines/reference/parserObjectLiterals1.types
new file mode 100644
index 00000000000..c38adbf55b6
--- /dev/null
+++ b/tests/baselines/reference/parserObjectLiterals1.types
@@ -0,0 +1,7 @@
+=== tests/cases/conformance/parser/ecmascript5/ObjectLiterals/parserObjectLiterals1.ts ===
+var v = { a: 1, b: 2 };
+>v : { a: number; b: number; }
+>{ a: 1, b: 2 } : { a: number; b: number; }
+>a : number
+>b : number
+
diff --git a/tests/baselines/reference/parserObjectType5.errors.txt b/tests/baselines/reference/parserObjectType5.errors.txt
new file mode 100644
index 00000000000..f8ca853af63
--- /dev/null
+++ b/tests/baselines/reference/parserObjectType5.errors.txt
@@ -0,0 +1,9 @@
+==== tests/cases/conformance/parser/ecmascript5/ObjectTypes/parserObjectType5.ts (2 errors) ====
+    var v: {
+       A: B
+          ~
+!!! Cannot find name 'B'.
+       <T>;
+          ~
+!!! '(' expected.
+    };
\ No newline at end of file
diff --git a/tests/baselines/reference/parserObjectType6.errors.txt b/tests/baselines/reference/parserObjectType6.errors.txt
new file mode 100644
index 00000000000..4e3d0f206b9
--- /dev/null
+++ b/tests/baselines/reference/parserObjectType6.errors.txt
@@ -0,0 +1,9 @@
+==== tests/cases/conformance/parser/ecmascript5/ObjectTypes/parserObjectType6.ts (2 errors) ====
+    var v: {
+       a: B
+          ~
+!!! Cannot find name 'B'.
+       [];
+       ~~
+!!! An index signature must have exactly one parameter.
+    };
\ No newline at end of file
diff --git a/tests/baselines/reference/parserPostfixUnaryExpression1.errors.txt b/tests/baselines/reference/parserPostfixUnaryExpression1.errors.txt
new file mode 100644
index 00000000000..29b5e697abd
--- /dev/null
+++ b/tests/baselines/reference/parserPostfixUnaryExpression1.errors.txt
@@ -0,0 +1,10 @@
+==== tests/cases/conformance/parser/ecmascript5/Expressions/parserPostfixUnaryExpression1.ts (4 errors) ====
+    foo ++ ++;
+           ~~
+!!! ';' expected.
+             ~
+!!! Expression expected.
+    ~~~
+!!! Cannot find name 'foo'.
+             
+!!! The operand of an increment or decrement operator must be a variable, property or indexer.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserS7.6.1.1_A1.10.errors.txt b/tests/baselines/reference/parserS7.6.1.1_A1.10.errors.txt
deleted file mode 100644
index c5a53560920..00000000000
--- a/tests/baselines/reference/parserS7.6.1.1_A1.10.errors.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-==== tests/cases/conformance/parser/ecmascript5/parserS7.6.1.1_A1.10.ts (3 errors) ====
-    // Copyright 2009 the Sputnik authors.  All rights reserved.
-    // This code is governed by the BSD license found in the LICENSE file.
-    
-    /**
-     * The "for" token can not be used as identifier
-     *
-     * @path ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.10.js
-     * @description Checking if execution of "for=1" fails
-     * @negative
-     */
-    
-    for = 1;
-        ~
-!!! '(' expected.
-        
-!!! Invalid left-hand side of assignment expression.
-    
-    
-    
-!!! Expression expected.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserS7.6.1.1_A1.10.js b/tests/baselines/reference/parserS7.6.1.1_A1.10.js
new file mode 100644
index 00000000000..04e0076b16a
--- /dev/null
+++ b/tests/baselines/reference/parserS7.6.1.1_A1.10.js
@@ -0,0 +1,19 @@
+//// [parserS7.6.1.1_A1.10.ts]
+// Copyright 2009 the Sputnik authors.  All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * The "for" token can not be used as identifier
+ *
+ * @path ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.10.js
+ * @description Checking if execution of "for=1" fails
+ * @negative
+ */
+
+//for = 1;
+
+
+
+//// [parserS7.6.1.1_A1.10.js]
+// Copyright 2009 the Sputnik authors.  All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
diff --git a/tests/baselines/reference/parserS7.6.1.1_A1.10.types b/tests/baselines/reference/parserS7.6.1.1_A1.10.types
new file mode 100644
index 00000000000..28441e36fe6
--- /dev/null
+++ b/tests/baselines/reference/parserS7.6.1.1_A1.10.types
@@ -0,0 +1,16 @@
+=== tests/cases/conformance/parser/ecmascript5/parserS7.6.1.1_A1.10.ts ===
+// Copyright 2009 the Sputnik authors.  All rights reserved.
+No type information for this code.// This code is governed by the BSD license found in the LICENSE file.
+No type information for this code.
+No type information for this code./**
+No type information for this code. * The "for" token can not be used as identifier
+No type information for this code. *
+No type information for this code. * @path ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.10.js
+No type information for this code. * @description Checking if execution of "for=1" fails
+No type information for this code. * @negative
+No type information for this code. */
+No type information for this code.
+No type information for this code.//for = 1;
+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/parserSetAccessorWithTypeAnnotation1.errors.txt b/tests/baselines/reference/parserSetAccessorWithTypeAnnotation1.errors.txt
index b1f3fd145eb..135f06cf304 100644
--- a/tests/baselines/reference/parserSetAccessorWithTypeAnnotation1.errors.txt
+++ b/tests/baselines/reference/parserSetAccessorWithTypeAnnotation1.errors.txt
@@ -2,6 +2,6 @@
     class C {
        set foo(v): number {
            ~~~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
+!!! A 'set' accessor cannot have a return type annotation.
        }
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserSetAccessorWithTypeParameters1.errors.txt b/tests/baselines/reference/parserSetAccessorWithTypeParameters1.errors.txt
index a9ec344d8c5..6d5ab6f30af 100644
--- a/tests/baselines/reference/parserSetAccessorWithTypeParameters1.errors.txt
+++ b/tests/baselines/reference/parserSetAccessorWithTypeParameters1.errors.txt
@@ -2,5 +2,5 @@
     class C {
        set foo<T>(v) { }
            ~~~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
+!!! An accessor cannot have type parameters.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserSyntaxWalker.generated.errors.txt b/tests/baselines/reference/parserSyntaxWalker.generated.errors.txt
deleted file mode 100644
index b304fe6f388..00000000000
--- a/tests/baselines/reference/parserSyntaxWalker.generated.errors.txt
+++ /dev/null
@@ -1,334 +0,0 @@
-==== tests/cases/conformance/parser/ecmascript5/parserSyntaxWalker.generated.ts (27 errors) ====
-    declare module "fs" {
-        export class File {
-            constructor(filename: string);
-            public ReadAllText(): string;
-        }
-        export interface IFile {
-            [index: number]: string;
-        }
-    }
-    
-    import fs = module("fs");
-                      ~
-!!! ';' expected.
-    ~~~~~~~~~~~~~~~~~~
-!!! Cannot find name 'module'.
-    
-    
-    module TypeScriptAllInOne {
-        export class Program {
-            static Main(...args: string[]) {
-                try {
-                    var bfs = new BasicFeatures();
-                    var retValue: number = 0;
-    
-                    retValue = bfs.VARIABLES();
-                    if (retValue != 0) {
-    
-                        return 1;
-                    }
-    
-                    retValue = bfs.STATEMENTS(4);
-                    if (retValue != 0) {
-    
-                        return 1;
-                    }
-    
-    
-                    retValue = bfs.TYPES();
-                    if (retValue != 0) {
-    
-                        return 1;
-                    }
-    
-                    retValue = bfs.OPERATOR();
-                    if (retValue != 0) {
-    
-                        return 1;
-                    }
-                }
-                catch (e) {
-                    console.log(e);
-                    ~~~~~~~
-!!! Cannot find name 'console'.
-                }
-                finally {
-    
-                }
-    
-                console.log('Done');
-                ~~~~~~~
-!!! Cannot find name 'console'.
-    
-                return 0;
-    
-            }
-        }
-    
-        class BasicFeatures {
-            /// <summary>
-            /// Test various of variables. Including nullable,key world as variable,special format
-            /// </summary>
-            /// <returns></returns>
-            public VARIABLES(): number {
-                var local = Number.MAX_VALUE;
-                var min = Number.MIN_VALUE;
-                var inf = Number.NEGATIVE_INFINITY;
-                var nan = Number.NaN;
-                var undef = undefined;
-    
-                var п = local;
-                var м = local;
-    
-                var local5 = <fs.File>null;
-                var local6 = local5 instanceof fs.File;
-                             ~~~~~~
-!!! The left-hand side of an 'instanceof' expression must be of type 'any', an object type or a type parameter.
-                                               ~~~~~~~
-!!! The right-hand side of an 'instanceof' expression must be of type 'any' or of a type assignable to the 'Function' interface type.
-    
-                var hex = 0xBADC0DE, Hex = 0XDEADBEEF;
-                var float = 6.02e23, float2 = 6.02E-23
-                var char = 'c', \u0066 = '\u0066', hexchar = '\x42';
-                var quoted = '"', quoted2 = "'";
-                var reg = /\w*/;
-                var objLit = { "var": number = 42, equals: function (x) { return x["var"] === 42; }, toString: () => 'objLit{42}' };
-                var weekday = Weekdays.Monday;
-    
-                var con = char + f + hexchar + float.toString() + float2.toString() + reg.toString() + objLit + weekday;
-    
-                //
-                var any = 0;
-                var boolean = 0;
-                var declare = 0;
-                var constructor = 0;
-                var get = 0;
-                var implements = 0;
-                var interface = 0;
-                var let = 0;
-                var module = 0;
-                var number = 0;
-                var package = 0;
-                var private = 0;
-                var protected = 0;
-                var public = 0;
-                var set = 0;
-                var static = 0;
-                var string = 0;
-                var yield = 0;
-    
-                var sum3 = any + boolean + declare + constructor + get + implements + interface + let + module + number + package + private + protected + public + set + static + string + yield;
-    
-                return 0;
-            }
-    
-            /// <summary>
-            /// Test different statements. Including if-else,swith,foreach,(un)checked,lock,using,try-catch-finally
-            /// </summary>
-            /// <param name="i"></param>
-            /// <returns></returns>
-            STATEMENTS(i: number): number {
-                var retVal = 0;
-                if (i == 1)
-                    retVal = 1;
-                else
-                    retVal = 0;
-                switch (i) {
-                    case 2:
-                        retVal = 1;
-                        break;
-                    case 3:
-                        retVal = 1;
-                        break;
-                    default:
-                        break;
-                }
-    
-                for (var x in { x: 0, y: 1 }) {
-                }
-    
-                try {
-                    throw null;
-                }
-                catch (Exception) {
-                }
-                finally {
-                    try { }
-                    catch (Exception) { }
-                }
-    
-                return retVal;
-            }
-    
-            /// <summary>
-            /// Test types in ts language. Including class,struct,interface,delegate,anonymous type
-            /// </summary>
-            /// <returns></returns>
-            public TYPES(): number {
-                var retVal = 0;
-                var c = new CLASS();
-                var xx: IF = c;
-                retVal += c.Property;
-                retVal += c.Member();
-                retVal += xx ^= Foo() ? 0 : 1;
-                          ~~
-!!! The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type.
-                                ~~~
-!!! Cannot find name 'Foo'.
-    
-                //anonymous type
-                var anony = { a: new CLASS() };
-    
-                retVal += anony.a.d();
-                ~~~~~~
-!!! Type 'string' is not assignable to type 'number'.
-    
-                return retVal;
-            }
-    
-    
-            ///// <summary>
-            ///// Test different operators
-            ///// </summary>
-            ///// <returns></returns>
-            public OPERATOR(): number {
-                var a: number[] = [1, 2, 3, 4,  implements , ];/*[] bug*/ // YES []
-                                                ~~~~~~~~~~
-!!! Cannot find name 'implements'.
-                var i = a[1];/*[]*/
-                i = i + i - i * i / i % i & i | i ^ i;/*+ - * / % & | ^*/
-                var b = true && false || true ^ false;/*& | ^*/
-                                         ~~~~
-!!! The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type.
-                                                ~~~~~
-!!! The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type.
-                b = !b;/*!*/
-                i = ~i;/*~i*/
-                b = i < (i -  continue ) && (i + 1) > i;/*< && >*/
-                              ~~~~~~~~
-!!! Expression expected.
-                                       ~
-!!! Identifier expected.
-                                         ~~
-!!! Statement expected.
-                var f = true ? 1 : 0;/*? :*/   // YES :
-                i++;/*++*/
-                i--;/*--*/
-                b = true && false || true;/*&& ||*/
-                i = i << 5;/*<<*/
-                i = i >> 5;/*>>*/
-                var j = i;
-                b = i == j && i != j && i <= j && i >= j;/*= == && != <= >=*/
-                i += <number>5.0;/*+=*/
-                i -= i;/*-=*/
-                i *= i;/**=*/
-                if (i == 0)
-                    i++;
-                i /= i;/*/=*/
-                i %= i;/*%=*/
-                i &= i;/*&=*/
-                i |= i;/*|=*/
-                i ^= i;/*^=*/
-                i <<= i;/*<<=*/
-                i >>= i;/*>>=*/
-    
-                if (i == 0 && !b && f == 1)
-                    return 0;
-                else return 1;
-            }
-    
-        }
-    
-        interface IF {
-            Foo <!-- ): boolean;
-                ~
-!!! Type parameter list cannot be empty.
-                 ~
-!!! '(' expected.
-                 ~
-!!! Type parameter declaration expected.
-                     ~
-!!! Expression expected.
-                      ~
-!!! Declaration or statement expected.
-                     
-!!! The operand of an increment or decrement operator must be a variable, property or indexer.
-                        ~~~~~~~
-!!! Cannot find name 'boolean'.
-        }
-    
-        class CLASS implements IF {
-                               ~~
-!!! Cannot find name 'IF'.
-    
-            public d = () =>  '  return 0; };
-                                             
-!!! Unterminated string literal.
-            public get Property() { return 0; }
-                       ~~~~~~~~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
-            public Member() {
-                return 0;
-            }
-            public Foo(): boolean {
-                var myEvent = () => { return 1; };
-                if (myEvent() == 1)
-                    return true;
-                else
-                    return false;
-            }
-        }
-    
-    
-        // todo: use these
-        class A {
-            public method1(val:number) {
-                return val;
-            }
-            public method2() {
-                return 2 * this.method1(2);
-            }
-        }
-    
-        class B extends A {
-    
-            public method2() {
-                return this.method1(2);
-            }
-        }
-    
-        class Overloading {
-    
-            private otherValue = 42;
-    
-            constructor(private value: number, public name: string) { }
-           
-            public Overloads(value: string);
-            public Overloads(value: string, ...rest: string[]) { }
-    
-            public DefaultValue(value?: string = "Hello") { }
-                                ~~~~~
-!!! Parameter cannot have question mark and initializer.
-        }
-    }
-    ~
-!!! Declaration or statement expected.
-    
-    enum Weekdays {
-        Monday,
-        Tuesday,
-        Weekend,
-    }
-    
-    enum Fruit {
-        Apple,
-        Pear
-    }
-    
-    interface IDisposable {
-        Dispose(): void;
-    }
-    
-    TypeScriptAllInOne.Program.Main();
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/parserSyntaxWalker.generated.js b/tests/baselines/reference/parserSyntaxWalker.generated.js
new file mode 100644
index 00000000000..3b78baa0f74
--- /dev/null
+++ b/tests/baselines/reference/parserSyntaxWalker.generated.js
@@ -0,0 +1,291 @@
+//// [parserSyntaxWalker.generated.ts]
+//declare module "fs" {
+//    export class File {
+//        constructor(filename: string);
+//        public ReadAllText(): string;
+//    }
+//    export interface IFile {
+//        [index: number]: string;
+//    }
+//}
+
+//import fs = module("fs");
+
+
+//module TypeScriptAllInOne {
+//    export class Program {
+//        static Main(...args: string[]) {
+//            try {
+//                var bfs = new BasicFeatures();
+//                var retValue: number = 0;
+
+//                retValue = bfs.VARIABLES();
+//                if (retValue != 0) {
+
+//                    return 1;
+//                }
+
+//                retValue = bfs.STATEMENTS(4);
+//                if (retValue != 0) {
+
+//                    return 1;
+//                }
+
+
+//                retValue = bfs.TYPES();
+//                if (retValue != 0) {
+
+//                    return 1;
+//                }
+
+//                retValue = bfs.OPERATOR();
+//                if (retValue != 0) {
+
+//                    return 1;
+//                }
+//            }
+//            catch (e) {
+//                console.log(e);
+//            }
+//            finally {
+
+//            }
+
+//            console.log('Done');
+
+//            return 0;
+
+//        }
+//    }
+
+//    class BasicFeatures {
+//        /// <summary>
+//        /// Test various of variables. Including nullable,key world as variable,special format
+//        /// </summary>
+//        /// <returns></returns>
+//        public VARIABLES(): number {
+//            var local = Number.MAX_VALUE;
+//            var min = Number.MIN_VALUE;
+//            var inf = Number.NEGATIVE_INFINITY;
+//            var nan = Number.NaN;
+//            var undef = undefined;
+
+//            var п = local;
+//            var м = local;
+
+//            var local5 = <fs.File>null;
+//            var local6 = local5 instanceof fs.File;
+
+//            var hex = 0xBADC0DE, Hex = 0XDEADBEEF;
+//            var float = 6.02e23, float2 = 6.02E-23
+//            var char = 'c', \u0066 = '\u0066', hexchar = '\x42';
+//            var quoted = '"', quoted2 = "'";
+//            var reg = /\w*/;
+//            var objLit = { "var": number = 42, equals: function (x) { return x["var"] === 42; }, toString: () => 'objLit{42}' };
+//            var weekday = Weekdays.Monday;
+
+//            var con = char + f + hexchar + float.toString() + float2.toString() + reg.toString() + objLit + weekday;
+
+//            //
+//            var any = 0;
+//            var boolean = 0;
+//            var declare = 0;
+//            var constructor = 0;
+//            var get = 0;
+//            var implements = 0;
+//            var interface = 0;
+//            var let = 0;
+//            var module = 0;
+//            var number = 0;
+//            var package = 0;
+//            var private = 0;
+//            var protected = 0;
+//            var public = 0;
+//            var set = 0;
+//            var static = 0;
+//            var string = 0;
+//            var yield = 0;
+
+//            var sum3 = any + boolean + declare + constructor + get + implements + interface + let + module + number + package + private + protected + public + set + static + string + yield;
+
+//            return 0;
+//        }
+
+//        /// <summary>
+//        /// Test different statements. Including if-else,swith,foreach,(un)checked,lock,using,try-catch-finally
+//        /// </summary>
+//        /// <param name="i"></param>
+//        /// <returns></returns>
+//        STATEMENTS(i: number): number {
+//            var retVal = 0;
+//            if (i == 1)
+//                retVal = 1;
+//            else
+//                retVal = 0;
+//            switch (i) {
+//                case 2:
+//                    retVal = 1;
+//                    break;
+//                case 3:
+//                    retVal = 1;
+//                    break;
+//                default:
+//                    break;
+//            }
+
+//            for (var x in { x: 0, y: 1 }) {
+//            }
+
+//            try {
+//                throw null;
+//            }
+//            catch (Exception) {
+//            }
+//            finally {
+//                try { }
+//                catch (Exception) { }
+//            }
+
+//            return retVal;
+//        }
+
+//        /// <summary>
+//        /// Test types in ts language. Including class,struct,interface,delegate,anonymous type
+//        /// </summary>
+//        /// <returns></returns>
+//        public TYPES(): number {
+//            var retVal = 0;
+//            var c = new CLASS();
+//            var xx: IF = c;
+//            retVal += c.Property;
+//            retVal += c.Member();
+//            retVal += xx ^= Foo() ? 0 : 1;
+
+//            //anonymous type
+//            var anony = { a: new CLASS() };
+
+//            retVal += anony.a.d();
+
+//            return retVal;
+//        }
+
+
+//        ///// <summary>
+//        ///// Test different operators
+//        ///// </summary>
+//        ///// <returns></returns>
+//        public OPERATOR(): number {
+//            var a: number[] = [1, 2, 3, 4,  implements , ];/*[] bug*/ // YES []
+//            var i = a[1];/*[]*/
+//            i = i + i - i * i / i % i & i | i ^ i;/*+ - * / % & | ^*/
+//            var b = true && false || true ^ false;/*& | ^*/
+//            b = !b;/*!*/
+//            i = ~i;/*~i*/
+//            b = i < (i -  continue ) && (i + 1) > i;/*< && >*/
+//            var f = true ? 1 : 0;/*? :*/   // YES :
+//            i++;/*++*/
+//            i--;/*--*/
+//            b = true && false || true;/*&& ||*/
+//            i = i << 5;/*<<*/
+//            i = i >> 5;/*>>*/
+//            var j = i;
+//            b = i == j && i != j && i <= j && i >= j;/*= == && != <= >=*/
+//            i += <number>5.0;/*+=*/
+//            i -= i;/*-=*/
+//            i *= i;/**=*/
+//            if (i == 0)
+//                i++;
+//            i /= i;/*/=*/
+//            i %= i;/*%=*/
+//            i &= i;/*&=*/
+//            i |= i;/*|=*/
+//            i ^= i;/*^=*/
+//            i <<= i;/*<<=*/
+//            i >>= i;/*>>=*/
+
+//            if (i == 0 && !b && f == 1)
+//                return 0;
+//            else return 1;
+//        }
+
+//    }
+
+//    interface IF {
+//        Foo <!-- ): boolean;
+//    }
+
+//    class CLASS implements IF {
+
+//        public d = () =>  '  return 0; };
+//        public get Property() { return 0; }
+//        public Member() {
+//            return 0;
+//        }
+//        public Foo(): boolean {
+//            var myEvent = () => { return 1; };
+//            if (myEvent() == 1)
+//                return true;
+//            else
+//                return false;
+//        }
+//    }
+
+
+//    // todo: use these
+//    class A {
+//        public method1(val:number) {
+//            return val;
+//        }
+//        public method2() {
+//            return 2 * this.method1(2);
+//        }
+//    }
+
+//    class B extends A {
+
+//        public method2() {
+//            return this.method1(2);
+//        }
+//    }
+
+//    class Overloading {
+
+//        private otherValue = 42;
+
+//        constructor(private value: number, public name: string) { }
+       
+//        public Overloads(value: string);
+//        public Overloads(value: string, ...rest: string[]) { }
+
+//        public DefaultValue(value?: string = "Hello") { }
+//    }
+//}
+
+//enum Weekdays {
+//    Monday,
+//    Tuesday,
+//    Weekend,
+//}
+
+//enum Fruit {
+//    Apple,
+//    Pear
+//}
+
+//interface IDisposable {
+//    Dispose(): void;
+//}
+
+//TypeScriptAllInOne.Program.Main();
+
+
+//// [parserSyntaxWalker.generated.js]
+//declare module "fs" {
+//    export class File {
+//        constructor(filename: string);
+//        public ReadAllText(): string;
+//    }
+//    export interface IFile {
+//        [index: number]: string;
+//    }
+//}
diff --git a/tests/baselines/reference/parserSyntaxWalker.generated.types b/tests/baselines/reference/parserSyntaxWalker.generated.types
new file mode 100644
index 00000000000..dde34e06746
--- /dev/null
+++ b/tests/baselines/reference/parserSyntaxWalker.generated.types
@@ -0,0 +1,281 @@
+=== tests/cases/conformance/parser/ecmascript5/parserSyntaxWalker.generated.ts ===
+//declare module "fs" {
+No type information for this code.//    export class File {
+No type information for this code.//        constructor(filename: string);
+No type information for this code.//        public ReadAllText(): string;
+No type information for this code.//    }
+No type information for this code.//    export interface IFile {
+No type information for this code.//        [index: number]: string;
+No type information for this code.//    }
+No type information for this code.//}
+No type information for this code.
+No type information for this code.//import fs = module("fs");
+No type information for this code.
+No type information for this code.
+No type information for this code.//module TypeScriptAllInOne {
+No type information for this code.//    export class Program {
+No type information for this code.//        static Main(...args: string[]) {
+No type information for this code.//            try {
+No type information for this code.//                var bfs = new BasicFeatures();
+No type information for this code.//                var retValue: number = 0;
+No type information for this code.
+No type information for this code.//                retValue = bfs.VARIABLES();
+No type information for this code.//                if (retValue != 0) {
+No type information for this code.
+No type information for this code.//                    return 1;
+No type information for this code.//                }
+No type information for this code.
+No type information for this code.//                retValue = bfs.STATEMENTS(4);
+No type information for this code.//                if (retValue != 0) {
+No type information for this code.
+No type information for this code.//                    return 1;
+No type information for this code.//                }
+No type information for this code.
+No type information for this code.
+No type information for this code.//                retValue = bfs.TYPES();
+No type information for this code.//                if (retValue != 0) {
+No type information for this code.
+No type information for this code.//                    return 1;
+No type information for this code.//                }
+No type information for this code.
+No type information for this code.//                retValue = bfs.OPERATOR();
+No type information for this code.//                if (retValue != 0) {
+No type information for this code.
+No type information for this code.//                    return 1;
+No type information for this code.//                }
+No type information for this code.//            }
+No type information for this code.//            catch (e) {
+No type information for this code.//                console.log(e);
+No type information for this code.//            }
+No type information for this code.//            finally {
+No type information for this code.
+No type information for this code.//            }
+No type information for this code.
+No type information for this code.//            console.log('Done');
+No type information for this code.
+No type information for this code.//            return 0;
+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.//    class BasicFeatures {
+No type information for this code.//        /// <summary>
+No type information for this code.//        /// Test various of variables. Including nullable,key world as variable,special format
+No type information for this code.//        /// </summary>
+No type information for this code.//        /// <returns></returns>
+No type information for this code.//        public VARIABLES(): number {
+No type information for this code.//            var local = Number.MAX_VALUE;
+No type information for this code.//            var min = Number.MIN_VALUE;
+No type information for this code.//            var inf = Number.NEGATIVE_INFINITY;
+No type information for this code.//            var nan = Number.NaN;
+No type information for this code.//            var undef = undefined;
+No type information for this code.
+No type information for this code.//            var п = local;
+No type information for this code.//            var м = local;
+No type information for this code.
+No type information for this code.//            var local5 = <fs.File>null;
+No type information for this code.//            var local6 = local5 instanceof fs.File;
+No type information for this code.
+No type information for this code.//            var hex = 0xBADC0DE, Hex = 0XDEADBEEF;
+No type information for this code.//            var float = 6.02e23, float2 = 6.02E-23
+No type information for this code.//            var char = 'c', \u0066 = '\u0066', hexchar = '\x42';
+No type information for this code.//            var quoted = '"', quoted2 = "'";
+No type information for this code.//            var reg = /\w*/;
+No type information for this code.//            var objLit = { "var": number = 42, equals: function (x) { return x["var"] === 42; }, toString: () => 'objLit{42}' };
+No type information for this code.//            var weekday = Weekdays.Monday;
+No type information for this code.
+No type information for this code.//            var con = char + f + hexchar + float.toString() + float2.toString() + reg.toString() + objLit + weekday;
+No type information for this code.
+No type information for this code.//            //
+No type information for this code.//            var any = 0;
+No type information for this code.//            var boolean = 0;
+No type information for this code.//            var declare = 0;
+No type information for this code.//            var constructor = 0;
+No type information for this code.//            var get = 0;
+No type information for this code.//            var implements = 0;
+No type information for this code.//            var interface = 0;
+No type information for this code.//            var let = 0;
+No type information for this code.//            var module = 0;
+No type information for this code.//            var number = 0;
+No type information for this code.//            var package = 0;
+No type information for this code.//            var private = 0;
+No type information for this code.//            var protected = 0;
+No type information for this code.//            var public = 0;
+No type information for this code.//            var set = 0;
+No type information for this code.//            var static = 0;
+No type information for this code.//            var string = 0;
+No type information for this code.//            var yield = 0;
+No type information for this code.
+No type information for this code.//            var sum3 = any + boolean + declare + constructor + get + implements + interface + let + module + number + package + private + protected + public + set + static + string + yield;
+No type information for this code.
+No type information for this code.//            return 0;
+No type information for this code.//        }
+No type information for this code.
+No type information for this code.//        /// <summary>
+No type information for this code.//        /// Test different statements. Including if-else,swith,foreach,(un)checked,lock,using,try-catch-finally
+No type information for this code.//        /// </summary>
+No type information for this code.//        /// <param name="i"></param>
+No type information for this code.//        /// <returns></returns>
+No type information for this code.//        STATEMENTS(i: number): number {
+No type information for this code.//            var retVal = 0;
+No type information for this code.//            if (i == 1)
+No type information for this code.//                retVal = 1;
+No type information for this code.//            else
+No type information for this code.//                retVal = 0;
+No type information for this code.//            switch (i) {
+No type information for this code.//                case 2:
+No type information for this code.//                    retVal = 1;
+No type information for this code.//                    break;
+No type information for this code.//                case 3:
+No type information for this code.//                    retVal = 1;
+No type information for this code.//                    break;
+No type information for this code.//                default:
+No type information for this code.//                    break;
+No type information for this code.//            }
+No type information for this code.
+No type information for this code.//            for (var x in { x: 0, y: 1 }) {
+No type information for this code.//            }
+No type information for this code.
+No type information for this code.//            try {
+No type information for this code.//                throw null;
+No type information for this code.//            }
+No type information for this code.//            catch (Exception) {
+No type information for this code.//            }
+No type information for this code.//            finally {
+No type information for this code.//                try { }
+No type information for this code.//                catch (Exception) { }
+No type information for this code.//            }
+No type information for this code.
+No type information for this code.//            return retVal;
+No type information for this code.//        }
+No type information for this code.
+No type information for this code.//        /// <summary>
+No type information for this code.//        /// Test types in ts language. Including class,struct,interface,delegate,anonymous type
+No type information for this code.//        /// </summary>
+No type information for this code.//        /// <returns></returns>
+No type information for this code.//        public TYPES(): number {
+No type information for this code.//            var retVal = 0;
+No type information for this code.//            var c = new CLASS();
+No type information for this code.//            var xx: IF = c;
+No type information for this code.//            retVal += c.Property;
+No type information for this code.//            retVal += c.Member();
+No type information for this code.//            retVal += xx ^= Foo() ? 0 : 1;
+No type information for this code.
+No type information for this code.//            //anonymous type
+No type information for this code.//            var anony = { a: new CLASS() };
+No type information for this code.
+No type information for this code.//            retVal += anony.a.d();
+No type information for this code.
+No type information for this code.//            return retVal;
+No type information for this code.//        }
+No type information for this code.
+No type information for this code.
+No type information for this code.//        ///// <summary>
+No type information for this code.//        ///// Test different operators
+No type information for this code.//        ///// </summary>
+No type information for this code.//        ///// <returns></returns>
+No type information for this code.//        public OPERATOR(): number {
+No type information for this code.//            var a: number[] = [1, 2, 3, 4,  implements , ];/*[] bug*/ // YES []
+No type information for this code.//            var i = a[1];/*[]*/
+No type information for this code.//            i = i + i - i * i / i % i & i | i ^ i;/*+ - * / % & | ^*/
+No type information for this code.//            var b = true && false || true ^ false;/*& | ^*/
+No type information for this code.//            b = !b;/*!*/
+No type information for this code.//            i = ~i;/*~i*/
+No type information for this code.//            b = i < (i -  continue ) && (i + 1) > i;/*< && >*/
+No type information for this code.//            var f = true ? 1 : 0;/*? :*/   // YES :
+No type information for this code.//            i++;/*++*/
+No type information for this code.//            i--;/*--*/
+No type information for this code.//            b = true && false || true;/*&& ||*/
+No type information for this code.//            i = i << 5;/*<<*/
+No type information for this code.//            i = i >> 5;/*>>*/
+No type information for this code.//            var j = i;
+No type information for this code.//            b = i == j && i != j && i <= j && i >= j;/*= == && != <= >=*/
+No type information for this code.//            i += <number>5.0;/*+=*/
+No type information for this code.//            i -= i;/*-=*/
+No type information for this code.//            i *= i;/**=*/
+No type information for this code.//            if (i == 0)
+No type information for this code.//                i++;
+No type information for this code.//            i /= i;/*/=*/
+No type information for this code.//            i %= i;/*%=*/
+No type information for this code.//            i &= i;/*&=*/
+No type information for this code.//            i |= i;/*|=*/
+No type information for this code.//            i ^= i;/*^=*/
+No type information for this code.//            i <<= i;/*<<=*/
+No type information for this code.//            i >>= i;/*>>=*/
+No type information for this code.
+No type information for this code.//            if (i == 0 && !b && f == 1)
+No type information for this code.//                return 0;
+No type information for this code.//            else return 1;
+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.//    interface IF {
+No type information for this code.//        Foo <!-- ): boolean;
+No type information for this code.//    }
+No type information for this code.
+No type information for this code.//    class CLASS implements IF {
+No type information for this code.
+No type information for this code.//        public d = () =>  '  return 0; };
+No type information for this code.//        public get Property() { return 0; }
+No type information for this code.//        public Member() {
+No type information for this code.//            return 0;
+No type information for this code.//        }
+No type information for this code.//        public Foo(): boolean {
+No type information for this code.//            var myEvent = () => { return 1; };
+No type information for this code.//            if (myEvent() == 1)
+No type information for this code.//                return true;
+No type information for this code.//            else
+No type information for this code.//                return false;
+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.//    // todo: use these
+No type information for this code.//    class A {
+No type information for this code.//        public method1(val:number) {
+No type information for this code.//            return val;
+No type information for this code.//        }
+No type information for this code.//        public method2() {
+No type information for this code.//            return 2 * this.method1(2);
+No type information for this code.//        }
+No type information for this code.//    }
+No type information for this code.
+No type information for this code.//    class B extends A {
+No type information for this code.
+No type information for this code.//        public method2() {
+No type information for this code.//            return this.method1(2);
+No type information for this code.//        }
+No type information for this code.//    }
+No type information for this code.
+No type information for this code.//    class Overloading {
+No type information for this code.
+No type information for this code.//        private otherValue = 42;
+No type information for this code.
+No type information for this code.//        constructor(private value: number, public name: string) { }
+No type information for this code.       
+No type information for this code.//        public Overloads(value: string);
+No type information for this code.//        public Overloads(value: string, ...rest: string[]) { }
+No type information for this code.
+No type information for this code.//        public DefaultValue(value?: string = "Hello") { }
+No type information for this code.//    }
+No type information for this code.//}
+No type information for this code.
+No type information for this code.//enum Weekdays {
+No type information for this code.//    Monday,
+No type information for this code.//    Tuesday,
+No type information for this code.//    Weekend,
+No type information for this code.//}
+No type information for this code.
+No type information for this code.//enum Fruit {
+No type information for this code.//    Apple,
+No type information for this code.//    Pear
+No type information for this code.//}
+No type information for this code.
+No type information for this code.//interface IDisposable {
+No type information for this code.//    Dispose(): void;
+No type information for this code.//}
+No type information for this code.
+No type information for this code.//TypeScriptAllInOne.Program.Main();
+No type information for this code.
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserUnaryExpression1.errors.txt b/tests/baselines/reference/parserUnaryExpression1.errors.txt
new file mode 100644
index 00000000000..5ed4550b277
--- /dev/null
+++ b/tests/baselines/reference/parserUnaryExpression1.errors.txt
@@ -0,0 +1,4 @@
+==== tests/cases/conformance/parser/ecmascript5/Expressions/parserUnaryExpression1.ts (1 errors) ====
+    ++this;
+      ~~~~
+!!! The operand of an increment or decrement operator must be a variable, property or indexer.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserUnaryExpression1.js b/tests/baselines/reference/parserUnaryExpression1.js
new file mode 100644
index 00000000000..a0183ea0e00
--- /dev/null
+++ b/tests/baselines/reference/parserUnaryExpression1.js
@@ -0,0 +1,5 @@
+//// [parserUnaryExpression1.ts]
+++this;
+
+//// [parserUnaryExpression1.js]
+++this;
diff --git a/tests/baselines/reference/parserUnaryExpression2.errors.txt b/tests/baselines/reference/parserUnaryExpression2.errors.txt
new file mode 100644
index 00000000000..ea0c0ace51d
--- /dev/null
+++ b/tests/baselines/reference/parserUnaryExpression2.errors.txt
@@ -0,0 +1,4 @@
+==== tests/cases/conformance/parser/ecmascript5/Expressions/parserUnaryExpression2.ts (1 errors) ====
+    ++function(e) { }
+      ~~~~~~~~~~~~~~~
+!!! An arithmetic operand must be of type 'any', 'number' or an enum type.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserUnaryExpression2.js b/tests/baselines/reference/parserUnaryExpression2.js
new file mode 100644
index 00000000000..97b17b2b800
--- /dev/null
+++ b/tests/baselines/reference/parserUnaryExpression2.js
@@ -0,0 +1,6 @@
+//// [parserUnaryExpression2.ts]
+++function(e) { }
+
+//// [parserUnaryExpression2.js]
+++function (e) {
+};
diff --git a/tests/baselines/reference/parserUnaryExpression3.errors.txt b/tests/baselines/reference/parserUnaryExpression3.errors.txt
new file mode 100644
index 00000000000..22cc9fdcdef
--- /dev/null
+++ b/tests/baselines/reference/parserUnaryExpression3.errors.txt
@@ -0,0 +1,4 @@
+==== tests/cases/conformance/parser/ecmascript5/Expressions/parserUnaryExpression3.ts (1 errors) ====
+    ++[0];
+      ~~~
+!!! An arithmetic operand must be of type 'any', 'number' or an enum type.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserUnaryExpression3.js b/tests/baselines/reference/parserUnaryExpression3.js
new file mode 100644
index 00000000000..37a9f72e7b2
--- /dev/null
+++ b/tests/baselines/reference/parserUnaryExpression3.js
@@ -0,0 +1,5 @@
+//// [parserUnaryExpression3.ts]
+++[0];
+
+//// [parserUnaryExpression3.js]
+++[0];
diff --git a/tests/baselines/reference/parserUnaryExpression4.errors.txt b/tests/baselines/reference/parserUnaryExpression4.errors.txt
new file mode 100644
index 00000000000..4f4e8c5eea7
--- /dev/null
+++ b/tests/baselines/reference/parserUnaryExpression4.errors.txt
@@ -0,0 +1,4 @@
+==== tests/cases/conformance/parser/ecmascript5/Expressions/parserUnaryExpression4.ts (1 errors) ====
+    ++{};
+      ~~
+!!! An arithmetic operand must be of type 'any', 'number' or an enum type.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserUnaryExpression4.js b/tests/baselines/reference/parserUnaryExpression4.js
new file mode 100644
index 00000000000..6e17a9cd3b4
--- /dev/null
+++ b/tests/baselines/reference/parserUnaryExpression4.js
@@ -0,0 +1,5 @@
+//// [parserUnaryExpression4.ts]
+++{};
+
+//// [parserUnaryExpression4.js]
+++{};
diff --git a/tests/baselines/reference/parserUnaryExpression5.errors.txt b/tests/baselines/reference/parserUnaryExpression5.errors.txt
new file mode 100644
index 00000000000..09d42f3c3b2
--- /dev/null
+++ b/tests/baselines/reference/parserUnaryExpression5.errors.txt
@@ -0,0 +1,6 @@
+==== tests/cases/conformance/parser/ecmascript5/Expressions/parserUnaryExpression5.ts (2 errors) ====
+    ++ delete foo.bar
+       ~~~~~~~~~~~~~~
+!!! An arithmetic operand must be of type 'any', 'number' or an enum type.
+              ~~~
+!!! Cannot find name 'foo'.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserUnaryExpression5.js b/tests/baselines/reference/parserUnaryExpression5.js
new file mode 100644
index 00000000000..9495ee15b88
--- /dev/null
+++ b/tests/baselines/reference/parserUnaryExpression5.js
@@ -0,0 +1,5 @@
+//// [parserUnaryExpression5.ts]
+++ delete foo.bar
+
+//// [parserUnaryExpression5.js]
+++delete foo.bar;
diff --git a/tests/baselines/reference/parserUnaryExpression6.js b/tests/baselines/reference/parserUnaryExpression6.js
new file mode 100644
index 00000000000..ad50d2f6733
--- /dev/null
+++ b/tests/baselines/reference/parserUnaryExpression6.js
@@ -0,0 +1,4 @@
+//// [parserUnaryExpression6.ts]
+
+
+//// [parserUnaryExpression6.js]
diff --git a/tests/baselines/reference/parserUnaryExpression6.types b/tests/baselines/reference/parserUnaryExpression6.types
new file mode 100644
index 00000000000..25104d2d298
--- /dev/null
+++ b/tests/baselines/reference/parserUnaryExpression6.types
@@ -0,0 +1,3 @@
+=== tests/cases/conformance/parser/ecmascript5/Expressions/parserUnaryExpression6.ts ===
+
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserUnaryExpression7.errors.txt b/tests/baselines/reference/parserUnaryExpression7.errors.txt
new file mode 100644
index 00000000000..05351f9bee8
--- /dev/null
+++ b/tests/baselines/reference/parserUnaryExpression7.errors.txt
@@ -0,0 +1,6 @@
+==== tests/cases/conformance/parser/ecmascript5/Expressions/parserUnaryExpression7.ts (2 errors) ====
+    ++ new Foo();
+       ~~~~~~~~~
+!!! The operand of an increment or decrement operator must be a variable, property or indexer.
+           ~~~
+!!! Cannot find name 'Foo'.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserUnaryExpression7.js b/tests/baselines/reference/parserUnaryExpression7.js
new file mode 100644
index 00000000000..848d4c97ded
--- /dev/null
+++ b/tests/baselines/reference/parserUnaryExpression7.js
@@ -0,0 +1,5 @@
+//// [parserUnaryExpression7.ts]
+++ new Foo();
+
+//// [parserUnaryExpression7.js]
+++new Foo();
diff --git a/tests/baselines/reference/parserX_ArrowFunction1.errors.txt b/tests/baselines/reference/parserX_ArrowFunction1.errors.txt
new file mode 100644
index 00000000000..2443366b415
--- /dev/null
+++ b/tests/baselines/reference/parserX_ArrowFunction1.errors.txt
@@ -0,0 +1,6 @@
+==== tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ArrowFunctions/parserX_ArrowFunction1.ts (1 errors) ====
+    var v = (a: ) => {
+                ~
+!!! Type expected.
+       
+    };
\ No newline at end of file
diff --git a/tests/baselines/reference/parserX_ArrowFunction2.errors.txt b/tests/baselines/reference/parserX_ArrowFunction2.errors.txt
new file mode 100644
index 00000000000..0b9eced39fa
--- /dev/null
+++ b/tests/baselines/reference/parserX_ArrowFunction2.errors.txt
@@ -0,0 +1,8 @@
+==== tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ArrowFunctions/parserX_ArrowFunction2.ts (2 errors) ====
+    var v = (a: b,) => {
+                 ~
+!!! Trailing comma not allowed.
+                ~
+!!! Cannot find name 'b'.
+       
+    };
\ No newline at end of file
diff --git a/tests/baselines/reference/parserX_ArrowFunction3.errors.txt b/tests/baselines/reference/parserX_ArrowFunction3.errors.txt
new file mode 100644
index 00000000000..3088cde2b10
--- /dev/null
+++ b/tests/baselines/reference/parserX_ArrowFunction3.errors.txt
@@ -0,0 +1,10 @@
+==== tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ArrowFunctions/parserX_ArrowFunction3.ts (3 errors) ====
+    var v = (a): => {
+               ~
+!!! ',' expected.
+                 ~~
+!!! ';' expected.
+             ~
+!!! Cannot find name 'a'.
+       
+    };
\ No newline at end of file
diff --git a/tests/baselines/reference/parserX_ArrowFunction4.js b/tests/baselines/reference/parserX_ArrowFunction4.js
new file mode 100644
index 00000000000..b576e62813c
--- /dev/null
+++ b/tests/baselines/reference/parserX_ArrowFunction4.js
@@ -0,0 +1,8 @@
+//// [parserX_ArrowFunction4.ts]
+var v = (a, b) => {
+   
+};
+
+//// [parserX_ArrowFunction4.js]
+var v = function (a, b) {
+};
diff --git a/tests/baselines/reference/parserX_ArrowFunction4.types b/tests/baselines/reference/parserX_ArrowFunction4.types
new file mode 100644
index 00000000000..f52f06aa41e
--- /dev/null
+++ b/tests/baselines/reference/parserX_ArrowFunction4.types
@@ -0,0 +1,8 @@
+=== tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ArrowFunctions/parserX_ArrowFunction4.ts ===
+var v = (a, b) => {
+>v : (a: any, b: any) => void
+>(a, b) => {   } : (a: any, b: any) => void
+>a : any
+>b : any
+   
+};
diff --git a/tests/baselines/reference/parserX_TypeArgumentList1.errors.txt b/tests/baselines/reference/parserX_TypeArgumentList1.errors.txt
new file mode 100644
index 00000000000..44a696d7ce9
--- /dev/null
+++ b/tests/baselines/reference/parserX_TypeArgumentList1.errors.txt
@@ -0,0 +1,12 @@
+==== tests/cases/conformance/parser/ecmascript5/ErrorRecovery/TypeArgumentLists/parserX_TypeArgumentList1.ts (5 errors) ====
+    Foo<A,B,\ C>(4, 5, 6);
+            
+!!! Invalid character.
+    ~~~
+!!! Cannot find name 'Foo'.
+        ~
+!!! Cannot find name 'A'.
+          ~
+!!! Cannot find name 'B'.
+              ~
+!!! Cannot find name 'C'.
\ No newline at end of file
diff --git a/tests/baselines/reference/parsingClassRecoversWhenHittingUnexpectedSemicolon.errors.txt b/tests/baselines/reference/parsingClassRecoversWhenHittingUnexpectedSemicolon.errors.txt
new file mode 100644
index 00000000000..0780b807ead
--- /dev/null
+++ b/tests/baselines/reference/parsingClassRecoversWhenHittingUnexpectedSemicolon.errors.txt
@@ -0,0 +1,8 @@
+==== tests/cases/compiler/parsingClassRecoversWhenHittingUnexpectedSemicolon.ts (1 errors) ====
+    class C {
+        public f() { };
+                      ~
+!!! Unexpected token. A constructor, method, accessor, or property was expected.
+        private m;
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/prefixIncrementAsOperandOfPlusExpression.js b/tests/baselines/reference/prefixIncrementAsOperandOfPlusExpression.js
new file mode 100644
index 00000000000..719dceb3423
--- /dev/null
+++ b/tests/baselines/reference/prefixIncrementAsOperandOfPlusExpression.js
@@ -0,0 +1,11 @@
+//// [prefixIncrementAsOperandOfPlusExpression.ts]
+var x = 1;
+var y = 1;
++ ++x;
++ ++y;
+
+//// [prefixIncrementAsOperandOfPlusExpression.js]
+var x = 1;
+var y = 1;
++ ++x;
++ ++y;
diff --git a/tests/baselines/reference/prefixIncrementAsOperandOfPlusExpression.types b/tests/baselines/reference/prefixIncrementAsOperandOfPlusExpression.types
new file mode 100644
index 00000000000..0d773b89f12
--- /dev/null
+++ b/tests/baselines/reference/prefixIncrementAsOperandOfPlusExpression.types
@@ -0,0 +1,17 @@
+=== tests/cases/compiler/prefixIncrementAsOperandOfPlusExpression.ts ===
+var x = 1;
+>x : number
+
+var y = 1;
+>y : number
+
++ ++x;
+>+ ++x : number
+>++x : number
+>x : number
+
++ ++y;
+>+ ++y : number
+>++y : number
+>y : number
+
diff --git a/tests/baselines/reference/privacyAccessorDeclFile.errors.txt b/tests/baselines/reference/privacyAccessorDeclFile.errors.txt
new file mode 100644
index 00000000000..713f1807251
--- /dev/null
+++ b/tests/baselines/reference/privacyAccessorDeclFile.errors.txt
@@ -0,0 +1,1130 @@
+==== tests/cases/compiler/privacyAccessorDeclFile_externalModule.ts (24 errors) ====
+    
+    class privateClass {
+    }
+    
+    export class publicClass {
+    }
+    
+    export class publicClassWithWithPrivateGetAccessorTypes {
+        static get myPublicStaticMethod(): privateClass { // Error
+                   ~~~~~~~~~~~~~~~~~~~~
+!!! Return type of public static property getter from exported class has or is using private name 'privateClass'.
+            return null;
+        }
+        private static get myPrivateStaticMethod(): privateClass {
+            return null;
+        }
+        get myPublicMethod(): privateClass { // Error
+            ~~~~~~~~~~~~~~
+!!! Return type of public property getter from exported class has or is using private name 'privateClass'.
+            return null;
+        }
+        private get myPrivateMethod(): privateClass {
+            return null;
+        }
+        static get myPublicStaticMethod1() { // Error
+                   ~~~~~~~~~~~~~~~~~~~~~
+!!! Return type of public static property getter from exported class has or is using private name 'privateClass'.
+            return new privateClass();
+        }
+        private static get myPrivateStaticMethod1() {
+            return new privateClass();
+        }
+        get myPublicMethod1() { // Error
+            ~~~~~~~~~~~~~~~
+!!! Return type of public property getter from exported class has or is using private name 'privateClass'.
+            return new privateClass();
+        }
+        private get myPrivateMethod1() {
+            return new privateClass();
+        }
+    }
+    
+    export class publicClassWithWithPublicGetAccessorTypes {
+        static get myPublicStaticMethod(): publicClass {
+            return null;
+        }
+        private static get myPrivateStaticMethod(): publicClass {
+            return null;
+        }
+        get myPublicMethod(): publicClass {
+            return null;
+        }
+        private get myPrivateMethod(): publicClass {
+            return null;
+        }
+        static get myPublicStaticMethod1() {
+            return new publicClass();
+        }
+        private static get myPrivateStaticMethod1() {
+            return new publicClass();
+        }
+        get myPublicMethod1() {
+            return new publicClass();
+        }
+        private get myPrivateMethod1() {
+            return new publicClass();
+        }
+    }
+    
+    class privateClassWithWithPrivateGetAccessorTypes {
+        static get myPublicStaticMethod(): privateClass {
+            return null;
+        }
+        private static get myPrivateStaticMethod(): privateClass {
+            return null;
+        }
+        get myPublicMethod(): privateClass {
+            return null;
+        }
+        private get myPrivateMethod(): privateClass {
+            return null;
+        }
+        static get myPublicStaticMethod1() {
+            return new privateClass();
+        }
+        private static get myPrivateStaticMethod1() {
+            return new privateClass();
+        }
+        get myPublicMethod1() {
+            return new privateClass();
+        }
+        private get myPrivateMethod1() {
+            return new privateClass();
+        }
+    }
+    
+    class privateClassWithWithPublicGetAccessorTypes {
+        static get myPublicStaticMethod(): publicClass {
+            return null;
+        }
+        private static get myPrivateStaticMethod(): publicClass {
+            return null;
+        }
+        get myPublicMethod(): publicClass {
+            return null;
+        }
+        private get myPrivateMethod(): publicClass {
+            return null;
+        }
+        static get myPublicStaticMethod1() {
+            return new publicClass();
+        }
+        private static get myPrivateStaticMethod1() {
+            return new publicClass();
+        }
+        get myPublicMethod1() {
+            return new publicClass();
+        }
+        private get myPrivateMethod1() {
+            return new publicClass();
+        }
+    }
+    
+    export class publicClassWithWithPrivateSetAccessorTypes {
+        static set myPublicStaticMethod(param: privateClass) { // Error
+                                        ~~~~~~~~~~~~~~~~~~~
+!!! Parameter 'myPublicStaticMethod' of public property setter from exported class has or is using private name 'privateClass'.
+        }
+        private static set myPrivateStaticMethod(param: privateClass) {
+        }
+        set myPublicMethod(param: privateClass) { // Error
+                           ~~~~~~~~~~~~~~~~~~~
+!!! Parameter 'myPublicMethod' of public property setter from exported class has or is using private name 'privateClass'.
+        }
+        private set myPrivateMethod(param: privateClass) {
+        }
+    }
+    
+    export class publicClassWithWithPublicSetAccessorTypes {
+        static set myPublicStaticMethod(param: publicClass) {
+        }
+        private static set myPrivateStaticMethod(param: publicClass) {
+        }
+        set myPublicMethod(param: publicClass) {
+        }
+        private set myPrivateMethod(param: publicClass) {
+        }
+    }
+    
+    class privateClassWithWithPrivateSetAccessorTypes {
+        static set myPublicStaticMethod(param: privateClass) {
+        }
+        private static set myPrivateStaticMethod(param: privateClass) {
+        }
+        set myPublicMethod(param: privateClass) { 
+        }
+        private set myPrivateMethod(param: privateClass) {
+        }
+    }
+    
+    class privateClassWithWithPublicSetAccessorTypes {
+        static set myPublicStaticMethod(param: publicClass) {
+        }
+        private static set myPrivateStaticMethod(param: publicClass) {
+        }
+        set myPublicMethod(param: publicClass) {
+        }
+        private set myPrivateMethod(param: publicClass) {
+        }
+    }
+    
+    export class publicClassWithPrivateModuleGetAccessorTypes {
+        static get myPublicStaticMethod(): privateModule.publicClass { // Error
+                   ~~~~~~~~~~~~~~~~~~~~
+!!! Return type of public static property getter from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+            return null;
+        }
+        get myPublicMethod(): privateModule.publicClass { // Error
+            ~~~~~~~~~~~~~~
+!!! Return type of public property getter from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+            return null;
+        }
+        static get myPublicStaticMethod1() { // Error
+                   ~~~~~~~~~~~~~~~~~~~~~
+!!! Return type of public static property getter from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+            return new privateModule.publicClass();
+        }
+        get myPublicMethod1() { // Error
+            ~~~~~~~~~~~~~~~
+!!! Return type of public property getter from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+            return new privateModule.publicClass();
+        }
+    }
+    
+    export class publicClassWithPrivateModuleSetAccessorTypes {
+        static set myPublicStaticMethod(param: privateModule.publicClass) { // Error
+                                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Parameter 'myPublicStaticMethod' of public property setter from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+        }
+        set myPublicMethod(param: privateModule.publicClass) { // Error
+                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Parameter 'myPublicMethod' of public property setter from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+        }
+    }
+    
+    class privateClassWithPrivateModuleGetAccessorTypes {
+        static get myPublicStaticMethod(): privateModule.publicClass {
+            return null;
+        }
+        get myPublicMethod(): privateModule.publicClass {
+            return null;
+        }
+        static get myPublicStaticMethod1() {
+            return new privateModule.publicClass();
+        }
+        get myPublicMethod1() {
+            return new privateModule.publicClass();
+        }
+    }
+    
+    class privateClassWithPrivateModuleSetAccessorTypes {
+        static set myPublicStaticMethod(param: privateModule.publicClass) {
+        }
+        set myPublicMethod(param: privateModule.publicClass) {
+        }
+    }
+    
+    export module publicModule {
+        class privateClass {
+        }
+    
+        export class publicClass {
+        }
+        export class publicClassWithWithPrivateGetAccessorTypes {
+            static get myPublicStaticMethod(): privateClass { // Error
+                       ~~~~~~~~~~~~~~~~~~~~
+!!! Return type of public static property getter from exported class has or is using private name 'privateClass'.
+                return null;
+            }
+            private static get myPrivateStaticMethod(): privateClass {
+                return null;
+            }
+            get myPublicMethod(): privateClass { // Error
+                ~~~~~~~~~~~~~~
+!!! Return type of public property getter from exported class has or is using private name 'privateClass'.
+                return null;
+            }
+            private get myPrivateMethod(): privateClass {
+                return null;
+            }
+            static get myPublicStaticMethod1() { // Error
+                       ~~~~~~~~~~~~~~~~~~~~~
+!!! Return type of public static property getter from exported class has or is using private name 'privateClass'.
+                return new privateClass();
+            }
+            private static get myPrivateStaticMethod1() {
+                return new privateClass();
+            }
+            get myPublicMethod1() { // Error
+                ~~~~~~~~~~~~~~~
+!!! Return type of public property getter from exported class has or is using private name 'privateClass'.
+                return new privateClass();
+            }
+            private get myPrivateMethod1() {
+                return new privateClass();
+            }
+        }
+    
+        export class publicClassWithWithPublicGetAccessorTypes {
+            static get myPublicStaticMethod(): publicClass {
+                return null;
+            }
+            private static get myPrivateStaticMethod(): publicClass {
+                return null;
+            }
+            get myPublicMethod(): publicClass {
+                return null;
+            }
+            private get myPrivateMethod(): publicClass {
+                return null;
+            }
+            static get myPublicStaticMethod1() {
+                return new publicClass();
+            }
+            private static get myPrivateStaticMethod1() {
+                return new publicClass();
+            }
+            get myPublicMethod1() {
+                return new publicClass();
+            }
+            private get myPrivateMethod1() {
+                return new publicClass();
+            }
+        }
+    
+        class privateClassWithWithPrivateGetAccessorTypes {
+            static get myPublicStaticMethod(): privateClass {
+                return null;
+            }
+            private static get myPrivateStaticMethod(): privateClass {
+                return null;
+            }
+            get myPublicMethod(): privateClass {
+                return null;
+            }
+            private get myPrivateMethod(): privateClass {
+                return null;
+            }
+            static get myPublicStaticMethod1() {
+                return new privateClass();
+            }
+            private static get myPrivateStaticMethod1() {
+                return new privateClass();
+            }
+            get myPublicMethod1() {
+                return new privateClass();
+            }
+            private get myPrivateMethod1() {
+                return new privateClass();
+            }
+        }
+    
+        class privateClassWithWithPublicGetAccessorTypes {
+            static get myPublicStaticMethod(): publicClass {
+                return null;
+            }
+            private static get myPrivateStaticMethod(): publicClass {
+                return null;
+            }
+            get myPublicMethod(): publicClass {
+                return null;
+            }
+            private get myPrivateMethod(): publicClass {
+                return null;
+            }
+            static get myPublicStaticMethod1() {
+                return new publicClass();
+            }
+            private static get myPrivateStaticMethod1() {
+                return new publicClass();
+            }
+            get myPublicMethod1() {
+                return new publicClass();
+            }
+            private get myPrivateMethod1() {
+                return new publicClass();
+            }
+        }
+    
+        export class publicClassWithWithPrivateSetAccessorTypes {
+            static set myPublicStaticMethod(param: privateClass) { // Error
+                                            ~~~~~~~~~~~~~~~~~~~
+!!! Parameter 'myPublicStaticMethod' of public property setter from exported class has or is using private name 'privateClass'.
+            }
+            private static set myPrivateStaticMethod(param: privateClass) {
+            }
+            set myPublicMethod(param: privateClass) { // Error
+                               ~~~~~~~~~~~~~~~~~~~
+!!! Parameter 'myPublicMethod' of public property setter from exported class has or is using private name 'privateClass'.
+            }
+            private set myPrivateMethod(param: privateClass) {
+            }
+        }
+    
+        export class publicClassWithWithPublicSetAccessorTypes {
+            static set myPublicStaticMethod(param: publicClass) {
+            }
+            private static set myPrivateStaticMethod(param: publicClass) {
+            }
+            set myPublicMethod(param: publicClass) {
+            }
+            private set myPrivateMethod(param: publicClass) {
+            }
+        }
+    
+        class privateClassWithWithPrivateSetAccessorTypes {
+            static set myPublicStaticMethod(param: privateClass) {
+            }
+            private static set myPrivateStaticMethod(param: privateClass) {
+            }
+            set myPublicMethod(param: privateClass) {
+            }
+            private set myPrivateMethod(param: privateClass) {
+            }
+        }
+    
+        class privateClassWithWithPublicSetAccessorTypes {
+            static set myPublicStaticMethod(param: publicClass) {
+            }
+            private static set myPrivateStaticMethod(param: publicClass) {
+            }
+            set myPublicMethod(param: publicClass) {
+            }
+            private set myPrivateMethod(param: publicClass) {
+            }
+        }
+    
+        export class publicClassWithPrivateModuleGetAccessorTypes {
+            static get myPublicStaticMethod(): privateModule.publicClass { // Error
+                       ~~~~~~~~~~~~~~~~~~~~
+!!! Return type of public static property getter from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+                return null;
+            }
+            get myPublicMethod(): privateModule.publicClass { // Error
+                ~~~~~~~~~~~~~~
+!!! Return type of public property getter from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+                return null;
+            }
+            static get myPublicStaticMethod1() { // Error
+                       ~~~~~~~~~~~~~~~~~~~~~
+!!! Return type of public static property getter from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+                return new privateModule.publicClass();
+            }
+            get myPublicMethod1() { // Error
+                ~~~~~~~~~~~~~~~
+!!! Return type of public property getter from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+                return new privateModule.publicClass();
+            }
+        }
+    
+        export class publicClassWithPrivateModuleSetAccessorTypes {
+            static set myPublicStaticMethod(param: privateModule.publicClass) { // Error
+                                            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Parameter 'myPublicStaticMethod' of public property setter from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+            }
+            set myPublicMethod(param: privateModule.publicClass) { // Error
+                               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Parameter 'myPublicMethod' of public property setter from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+            }
+        }
+    
+        class privateClassWithPrivateModuleGetAccessorTypes {
+            static get myPublicStaticMethod(): privateModule.publicClass {
+                return null;
+            }
+            get myPublicMethod(): privateModule.publicClass {
+                return null;
+            }
+            static get myPublicStaticMethod1() {
+                return new privateModule.publicClass();
+            }
+            get myPublicMethod1() {
+                return new privateModule.publicClass();
+            }
+        }
+    
+        class privateClassWithPrivateModuleSetAccessorTypes {
+            static set myPublicStaticMethod(param: privateModule.publicClass) {
+            }
+            set myPublicMethod(param: privateModule.publicClass) {
+            }
+        }
+    }
+    
+    module privateModule {
+        class privateClass {
+        }
+    
+        export class publicClass {
+        }
+        export class publicClassWithWithPrivateGetAccessorTypes {
+            static get myPublicStaticMethod(): privateClass { 
+                return null;
+            }
+            private static get myPrivateStaticMethod(): privateClass {
+                return null;
+            }
+            get myPublicMethod(): privateClass { 
+                return null;
+            }
+            private get myPrivateMethod(): privateClass {
+                return null;
+            }
+            static get myPublicStaticMethod1() { 
+                return new privateClass();
+            }
+            private static get myPrivateStaticMethod1() {
+                return new privateClass();
+            }
+            get myPublicMethod1() { 
+                return new privateClass();
+            }
+            private get myPrivateMethod1() {
+                return new privateClass();
+            }
+        }
+    
+        export class publicClassWithWithPublicGetAccessorTypes {
+            static get myPublicStaticMethod(): publicClass {
+                return null;
+            }
+            private static get myPrivateStaticMethod(): publicClass {
+                return null;
+            }
+            get myPublicMethod(): publicClass {
+                return null;
+            }
+            private get myPrivateMethod(): publicClass {
+                return null;
+            }
+            static get myPublicStaticMethod1() {
+                return new publicClass();
+            }
+            private static get myPrivateStaticMethod1() {
+                return new publicClass();
+            }
+            get myPublicMethod1() {
+                return new publicClass();
+            }
+            private get myPrivateMethod1() {
+                return new publicClass();
+            }
+        }
+    
+        class privateClassWithWithPrivateGetAccessorTypes {
+            static get myPublicStaticMethod(): privateClass {
+                return null;
+            }
+            private static get myPrivateStaticMethod(): privateClass {
+                return null;
+            }
+            get myPublicMethod(): privateClass {
+                return null;
+            }
+            private get myPrivateMethod(): privateClass {
+                return null;
+            }
+            static get myPublicStaticMethod1() {
+                return new privateClass();
+            }
+            private static get myPrivateStaticMethod1() {
+                return new privateClass();
+            }
+            get myPublicMethod1() {
+                return new privateClass();
+            }
+            private get myPrivateMethod1() {
+                return new privateClass();
+            }
+        }
+    
+        class privateClassWithWithPublicGetAccessorTypes {
+            static get myPublicStaticMethod(): publicClass {
+                return null;
+            }
+            private static get myPrivateStaticMethod(): publicClass {
+                return null;
+            }
+            get myPublicMethod(): publicClass {
+                return null;
+            }
+            private get myPrivateMethod(): publicClass {
+                return null;
+            }
+            static get myPublicStaticMethod1() {
+                return new publicClass();
+            }
+            private static get myPrivateStaticMethod1() {
+                return new publicClass();
+            }
+            get myPublicMethod1() {
+                return new publicClass();
+            }
+            private get myPrivateMethod1() {
+                return new publicClass();
+            }
+        }
+    
+        export class publicClassWithWithPrivateSetAccessorTypes {
+            static set myPublicStaticMethod(param: privateClass) { 
+            }
+            private static set myPrivateStaticMethod(param: privateClass) {
+            }
+            set myPublicMethod(param: privateClass) { 
+            }
+            private set myPrivateMethod(param: privateClass) {
+            }
+        }
+    
+        export class publicClassWithWithPublicSetAccessorTypes {
+            static set myPublicStaticMethod(param: publicClass) {
+            }
+            private static set myPrivateStaticMethod(param: publicClass) {
+            }
+            set myPublicMethod(param: publicClass) {
+            }
+            private set myPrivateMethod(param: publicClass) {
+            }
+        }
+    
+        class privateClassWithWithPrivateSetAccessorTypes {
+            static set myPublicStaticMethod(param: privateClass) {
+            }
+            private static set myPrivateStaticMethod(param: privateClass) {
+            }
+            set myPublicMethod(param: privateClass) {
+            }
+            private set myPrivateMethod(param: privateClass) {
+            }
+        }
+    
+        class privateClassWithWithPublicSetAccessorTypes {
+            static set myPublicStaticMethod(param: publicClass) {
+            }
+            private static set myPrivateStaticMethod(param: publicClass) {
+            }
+            set myPublicMethod(param: publicClass) {
+            }
+            private set myPrivateMethod(param: publicClass) {
+            }
+        }
+    
+        export class publicClassWithPrivateModuleGetAccessorTypes {
+            static get myPublicStaticMethod(): privateModule.publicClass { 
+                return null;
+            }
+            get myPublicMethod(): privateModule.publicClass { 
+                return null;
+            }
+            static get myPublicStaticMethod1() { 
+                return new privateModule.publicClass();
+            }
+            get myPublicMethod1() { 
+                return new privateModule.publicClass();
+            }
+        }
+    
+        export class publicClassWithPrivateModuleSetAccessorTypes {
+            static set myPublicStaticMethod(param: privateModule.publicClass) { 
+            }
+            set myPublicMethod(param: privateModule.publicClass) { 
+            }
+        }
+    
+        class privateClassWithPrivateModuleGetAccessorTypes {
+            static get myPublicStaticMethod(): privateModule.publicClass {
+                return null;
+            }
+            get myPublicMethod(): privateModule.publicClass {
+                return null;
+            }
+            static get myPublicStaticMethod1() {
+                return new privateModule.publicClass();
+            }
+            get myPublicMethod1() {
+                return new privateModule.publicClass();
+            }
+        }
+    
+        class privateClassWithPrivateModuleSetAccessorTypes {
+            static set myPublicStaticMethod(param: privateModule.publicClass) {
+            }
+            set myPublicMethod(param: privateModule.publicClass) {
+            }
+        }
+    }
+    
+==== tests/cases/compiler/privacyAccessorDeclFile_GlobalFile.ts (12 errors) ====
+    class publicClassInGlobal {
+    }
+    
+    class publicClassInGlobalWithPublicGetAccessorTypes {
+        static get myPublicStaticMethod(): publicClassInGlobal {
+            return null;
+        }
+        private static get myPrivateStaticMethod(): publicClassInGlobal {
+            return null;
+        }
+        get myPublicMethod(): publicClassInGlobal {
+            return null;
+        }
+        private get myPrivateMethod(): publicClassInGlobal {
+            return null;
+        }
+        static get myPublicStaticMethod1() {
+            return new publicClassInGlobal();
+        }
+        private static get myPrivateStaticMethod1() {
+            return new publicClassInGlobal();
+        }
+        get myPublicMethod1() {
+            return new publicClassInGlobal();
+        }
+        private get myPrivateMethod1() {
+            return new publicClassInGlobal();
+        }
+    }
+    
+    class publicClassInGlobalWithWithPublicSetAccessorTypes {
+        static set myPublicStaticMethod(param: publicClassInGlobal) {
+        }
+        private static set myPrivateStaticMethod(param: publicClassInGlobal) {
+        }
+        set myPublicMethod(param: publicClassInGlobal) {
+        }
+        private set myPrivateMethod(param: publicClassInGlobal) {
+        }
+    }
+    
+    module publicModuleInGlobal {
+        class privateClass {
+        }
+    
+        export class publicClass {
+        }
+    
+        module privateModule {
+            class privateClass {
+            }
+    
+            export class publicClass {
+            }
+            export class publicClassWithWithPrivateGetAccessorTypes {
+                static get myPublicStaticMethod(): privateClass {
+                    return null;
+                }
+                private static get myPrivateStaticMethod(): privateClass {
+                    return null;
+                }
+                get myPublicMethod(): privateClass {
+                    return null;
+                }
+                private get myPrivateMethod(): privateClass {
+                    return null;
+                }
+                static get myPublicStaticMethod1() {
+                    return new privateClass();
+                }
+                private static get myPrivateStaticMethod1() {
+                    return new privateClass();
+                }
+                get myPublicMethod1() {
+                    return new privateClass();
+                }
+                private get myPrivateMethod1() {
+                    return new privateClass();
+                }
+            }
+    
+            export class publicClassWithWithPublicGetAccessorTypes {
+                static get myPublicStaticMethod(): publicClass {
+                    return null;
+                }
+                private static get myPrivateStaticMethod(): publicClass {
+                    return null;
+                }
+                get myPublicMethod(): publicClass {
+                    return null;
+                }
+                private get myPrivateMethod(): publicClass {
+                    return null;
+                }
+                static get myPublicStaticMethod1() {
+                    return new publicClass();
+                }
+                private static get myPrivateStaticMethod1() {
+                    return new publicClass();
+                }
+                get myPublicMethod1() {
+                    return new publicClass();
+                }
+                private get myPrivateMethod1() {
+                    return new publicClass();
+                }
+            }
+    
+            class privateClassWithWithPrivateGetAccessorTypes {
+                static get myPublicStaticMethod(): privateClass {
+                    return null;
+                }
+                private static get myPrivateStaticMethod(): privateClass {
+                    return null;
+                }
+                get myPublicMethod(): privateClass {
+                    return null;
+                }
+                private get myPrivateMethod(): privateClass {
+                    return null;
+                }
+                static get myPublicStaticMethod1() {
+                    return new privateClass();
+                }
+                private static get myPrivateStaticMethod1() {
+                    return new privateClass();
+                }
+                get myPublicMethod1() {
+                    return new privateClass();
+                }
+                private get myPrivateMethod1() {
+                    return new privateClass();
+                }
+            }
+    
+            class privateClassWithWithPublicGetAccessorTypes {
+                static get myPublicStaticMethod(): publicClass {
+                    return null;
+                }
+                private static get myPrivateStaticMethod(): publicClass {
+                    return null;
+                }
+                get myPublicMethod(): publicClass {
+                    return null;
+                }
+                private get myPrivateMethod(): publicClass {
+                    return null;
+                }
+                static get myPublicStaticMethod1() {
+                    return new publicClass();
+                }
+                private static get myPrivateStaticMethod1() {
+                    return new publicClass();
+                }
+                get myPublicMethod1() {
+                    return new publicClass();
+                }
+                private get myPrivateMethod1() {
+                    return new publicClass();
+                }
+            }
+    
+            export class publicClassWithWithPrivateSetAccessorTypes {
+                static set myPublicStaticMethod(param: privateClass) {
+                }
+                private static set myPrivateStaticMethod(param: privateClass) {
+                }
+                set myPublicMethod(param: privateClass) {
+                }
+                private set myPrivateMethod(param: privateClass) {
+                }
+            }
+    
+            export class publicClassWithWithPublicSetAccessorTypes {
+                static set myPublicStaticMethod(param: publicClass) {
+                }
+                private static set myPrivateStaticMethod(param: publicClass) {
+                }
+                set myPublicMethod(param: publicClass) {
+                }
+                private set myPrivateMethod(param: publicClass) {
+                }
+            }
+    
+            class privateClassWithWithPrivateSetAccessorTypes {
+                static set myPublicStaticMethod(param: privateClass) {
+                }
+                private static set myPrivateStaticMethod(param: privateClass) {
+                }
+                set myPublicMethod(param: privateClass) {
+                }
+                private set myPrivateMethod(param: privateClass) {
+                }
+            }
+    
+            class privateClassWithWithPublicSetAccessorTypes {
+                static set myPublicStaticMethod(param: publicClass) {
+                }
+                private static set myPrivateStaticMethod(param: publicClass) {
+                }
+                set myPublicMethod(param: publicClass) {
+                }
+                private set myPrivateMethod(param: publicClass) {
+                }
+            }
+    
+            export class publicClassWithPrivateModuleGetAccessorTypes {
+                static get myPublicStaticMethod(): privateModule.publicClass {
+                    return null;
+                }
+                get myPublicMethod(): privateModule.publicClass {
+                    return null;
+                }
+                static get myPublicStaticMethod1() {
+                    return new privateModule.publicClass();
+                }
+                get myPublicMethod1() {
+                    return new privateModule.publicClass();
+                }
+            }
+    
+            export class publicClassWithPrivateModuleSetAccessorTypes {
+                static set myPublicStaticMethod(param: privateModule.publicClass) {
+                }
+                set myPublicMethod(param: privateModule.publicClass) {
+                }
+            }
+    
+            class privateClassWithPrivateModuleGetAccessorTypes {
+                static get myPublicStaticMethod(): privateModule.publicClass {
+                    return null;
+                }
+                get myPublicMethod(): privateModule.publicClass {
+                    return null;
+                }
+                static get myPublicStaticMethod1() {
+                    return new privateModule.publicClass();
+                }
+                get myPublicMethod1() {
+                    return new privateModule.publicClass();
+                }
+            }
+    
+            class privateClassWithPrivateModuleSetAccessorTypes {
+                static set myPublicStaticMethod(param: privateModule.publicClass) {
+                }
+                set myPublicMethod(param: privateModule.publicClass) {
+                }
+            }
+        }
+    
+        export class publicClassWithWithPrivateGetAccessorTypes {
+            static get myPublicStaticMethod(): privateClass { // Error
+                       ~~~~~~~~~~~~~~~~~~~~
+!!! Return type of public static property getter from exported class has or is using private name 'privateClass'.
+                return null;
+            }
+            private static get myPrivateStaticMethod(): privateClass {
+                return null;
+            }
+            get myPublicMethod(): privateClass { // Error
+                ~~~~~~~~~~~~~~
+!!! Return type of public property getter from exported class has or is using private name 'privateClass'.
+                return null;
+            }
+            private get myPrivateMethod(): privateClass {
+                return null;
+            }
+            static get myPublicStaticMethod1() { // Error
+                       ~~~~~~~~~~~~~~~~~~~~~
+!!! Return type of public static property getter from exported class has or is using private name 'privateClass'.
+                return new privateClass();
+            }
+            private static get myPrivateStaticMethod1() {
+                return new privateClass();
+            }
+            get myPublicMethod1() { // Error
+                ~~~~~~~~~~~~~~~
+!!! Return type of public property getter from exported class has or is using private name 'privateClass'.
+                return new privateClass();
+            }
+            private get myPrivateMethod1() {
+                return new privateClass();
+            }
+        }
+    
+        export class publicClassWithWithPublicGetAccessorTypes {
+            static get myPublicStaticMethod(): publicClass {
+                return null;
+            }
+            private static get myPrivateStaticMethod(): publicClass {
+                return null;
+            }
+            get myPublicMethod(): publicClass {
+                return null;
+            }
+            private get myPrivateMethod(): publicClass {
+                return null;
+            }
+            static get myPublicStaticMethod1() {
+                return new publicClass();
+            }
+            private static get myPrivateStaticMethod1() {
+                return new publicClass();
+            }
+            get myPublicMethod1() {
+                return new publicClass();
+            }
+            private get myPrivateMethod1() {
+                return new publicClass();
+            }
+        }
+    
+        class privateClassWithWithPrivateGetAccessorTypes {
+            static get myPublicStaticMethod(): privateClass {
+                return null;
+            }
+            private static get myPrivateStaticMethod(): privateClass {
+                return null;
+            }
+            get myPublicMethod(): privateClass {
+                return null;
+            }
+            private get myPrivateMethod(): privateClass {
+                return null;
+            }
+            static get myPublicStaticMethod1() {
+                return new privateClass();
+            }
+            private static get myPrivateStaticMethod1() {
+                return new privateClass();
+            }
+            get myPublicMethod1() {
+                return new privateClass();
+            }
+            private get myPrivateMethod1() {
+                return new privateClass();
+            }
+        }
+    
+        class privateClassWithWithPublicGetAccessorTypes {
+            static get myPublicStaticMethod(): publicClass {
+                return null;
+            }
+            private static get myPrivateStaticMethod(): publicClass {
+                return null;
+            }
+            get myPublicMethod(): publicClass {
+                return null;
+            }
+            private get myPrivateMethod(): publicClass {
+                return null;
+            }
+            static get myPublicStaticMethod1() {
+                return new publicClass();
+            }
+            private static get myPrivateStaticMethod1() {
+                return new publicClass();
+            }
+            get myPublicMethod1() {
+                return new publicClass();
+            }
+            private get myPrivateMethod1() {
+                return new publicClass();
+            }
+        }
+    
+        export class publicClassWithWithPrivateSetAccessorTypes {
+            static set myPublicStaticMethod(param: privateClass) { // Error
+                                            ~~~~~~~~~~~~~~~~~~~
+!!! Parameter 'myPublicStaticMethod' of public property setter from exported class has or is using private name 'privateClass'.
+            }
+            private static set myPrivateStaticMethod(param: privateClass) {
+            }
+            set myPublicMethod(param: privateClass) { // Error
+                               ~~~~~~~~~~~~~~~~~~~
+!!! Parameter 'myPublicMethod' of public property setter from exported class has or is using private name 'privateClass'.
+            }
+            private set myPrivateMethod(param: privateClass) {
+            }
+        }
+    
+        export class publicClassWithWithPublicSetAccessorTypes {
+            static set myPublicStaticMethod(param: publicClass) {
+            }
+            private static set myPrivateStaticMethod(param: publicClass) {
+            }
+            set myPublicMethod(param: publicClass) {
+            }
+            private set myPrivateMethod(param: publicClass) {
+            }
+        }
+    
+        class privateClassWithWithPrivateSetAccessorTypes {
+            static set myPublicStaticMethod(param: privateClass) {
+            }
+            private static set myPrivateStaticMethod(param: privateClass) {
+            }
+            set myPublicMethod(param: privateClass) {
+            }
+            private set myPrivateMethod(param: privateClass) {
+            }
+        }
+    
+        class privateClassWithWithPublicSetAccessorTypes {
+            static set myPublicStaticMethod(param: publicClass) {
+            }
+            private static set myPrivateStaticMethod(param: publicClass) {
+            }
+            set myPublicMethod(param: publicClass) {
+            }
+            private set myPrivateMethod(param: publicClass) {
+            }
+        }
+    
+        export class publicClassWithPrivateModuleGetAccessorTypes {
+            static get myPublicStaticMethod(): privateModule.publicClass { // Error
+                       ~~~~~~~~~~~~~~~~~~~~
+!!! Return type of public static property getter from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+                return null;
+            }
+            get myPublicMethod(): privateModule.publicClass { // Error
+                ~~~~~~~~~~~~~~
+!!! Return type of public property getter from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+                return null;
+            }
+            static get myPublicStaticMethod1() { // Error
+                       ~~~~~~~~~~~~~~~~~~~~~
+!!! Return type of public static property getter from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+                return new privateModule.publicClass();
+            }
+            get myPublicMethod1() { // Error
+                ~~~~~~~~~~~~~~~
+!!! Return type of public property getter from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+                return new privateModule.publicClass();
+            }
+        }
+    
+        export class publicClassWithPrivateModuleSetAccessorTypes {
+            static set myPublicStaticMethod(param: privateModule.publicClass) { // Error
+                                            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Parameter 'myPublicStaticMethod' of public property setter from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+            }
+            set myPublicMethod(param: privateModule.publicClass) { // Error
+                               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Parameter 'myPublicMethod' of public property setter from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+            }
+        }
+    
+        class privateClassWithPrivateModuleGetAccessorTypes {
+            static get myPublicStaticMethod(): privateModule.publicClass {
+                return null;
+            }
+            get myPublicMethod(): privateModule.publicClass {
+                return null;
+            }
+            static get myPublicStaticMethod1() {
+                return new privateModule.publicClass();
+            }
+            get myPublicMethod1() {
+                return new privateModule.publicClass();
+            }
+        }
+    
+        class privateClassWithPrivateModuleSetAccessorTypes {
+            static set myPublicStaticMethod(param: privateModule.publicClass) {
+            }
+            set myPublicMethod(param: privateModule.publicClass) {
+            }
+        }
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/privacyAccessorDeclFile.js b/tests/baselines/reference/privacyAccessorDeclFile.js
new file mode 100644
index 00000000000..9744e4ef220
--- /dev/null
+++ b/tests/baselines/reference/privacyAccessorDeclFile.js
@@ -0,0 +1,3555 @@
+//// [tests/cases/compiler/privacyAccessorDeclFile.ts] ////
+
+//// [privacyAccessorDeclFile_externalModule.ts]
+
+class privateClass {
+}
+
+export class publicClass {
+}
+
+export class publicClassWithWithPrivateGetAccessorTypes {
+    static get myPublicStaticMethod(): privateClass { // Error
+        return null;
+    }
+    private static get myPrivateStaticMethod(): privateClass {
+        return null;
+    }
+    get myPublicMethod(): privateClass { // Error
+        return null;
+    }
+    private get myPrivateMethod(): privateClass {
+        return null;
+    }
+    static get myPublicStaticMethod1() { // Error
+        return new privateClass();
+    }
+    private static get myPrivateStaticMethod1() {
+        return new privateClass();
+    }
+    get myPublicMethod1() { // Error
+        return new privateClass();
+    }
+    private get myPrivateMethod1() {
+        return new privateClass();
+    }
+}
+
+export class publicClassWithWithPublicGetAccessorTypes {
+    static get myPublicStaticMethod(): publicClass {
+        return null;
+    }
+    private static get myPrivateStaticMethod(): publicClass {
+        return null;
+    }
+    get myPublicMethod(): publicClass {
+        return null;
+    }
+    private get myPrivateMethod(): publicClass {
+        return null;
+    }
+    static get myPublicStaticMethod1() {
+        return new publicClass();
+    }
+    private static get myPrivateStaticMethod1() {
+        return new publicClass();
+    }
+    get myPublicMethod1() {
+        return new publicClass();
+    }
+    private get myPrivateMethod1() {
+        return new publicClass();
+    }
+}
+
+class privateClassWithWithPrivateGetAccessorTypes {
+    static get myPublicStaticMethod(): privateClass {
+        return null;
+    }
+    private static get myPrivateStaticMethod(): privateClass {
+        return null;
+    }
+    get myPublicMethod(): privateClass {
+        return null;
+    }
+    private get myPrivateMethod(): privateClass {
+        return null;
+    }
+    static get myPublicStaticMethod1() {
+        return new privateClass();
+    }
+    private static get myPrivateStaticMethod1() {
+        return new privateClass();
+    }
+    get myPublicMethod1() {
+        return new privateClass();
+    }
+    private get myPrivateMethod1() {
+        return new privateClass();
+    }
+}
+
+class privateClassWithWithPublicGetAccessorTypes {
+    static get myPublicStaticMethod(): publicClass {
+        return null;
+    }
+    private static get myPrivateStaticMethod(): publicClass {
+        return null;
+    }
+    get myPublicMethod(): publicClass {
+        return null;
+    }
+    private get myPrivateMethod(): publicClass {
+        return null;
+    }
+    static get myPublicStaticMethod1() {
+        return new publicClass();
+    }
+    private static get myPrivateStaticMethod1() {
+        return new publicClass();
+    }
+    get myPublicMethod1() {
+        return new publicClass();
+    }
+    private get myPrivateMethod1() {
+        return new publicClass();
+    }
+}
+
+export class publicClassWithWithPrivateSetAccessorTypes {
+    static set myPublicStaticMethod(param: privateClass) { // Error
+    }
+    private static set myPrivateStaticMethod(param: privateClass) {
+    }
+    set myPublicMethod(param: privateClass) { // Error
+    }
+    private set myPrivateMethod(param: privateClass) {
+    }
+}
+
+export class publicClassWithWithPublicSetAccessorTypes {
+    static set myPublicStaticMethod(param: publicClass) {
+    }
+    private static set myPrivateStaticMethod(param: publicClass) {
+    }
+    set myPublicMethod(param: publicClass) {
+    }
+    private set myPrivateMethod(param: publicClass) {
+    }
+}
+
+class privateClassWithWithPrivateSetAccessorTypes {
+    static set myPublicStaticMethod(param: privateClass) {
+    }
+    private static set myPrivateStaticMethod(param: privateClass) {
+    }
+    set myPublicMethod(param: privateClass) { 
+    }
+    private set myPrivateMethod(param: privateClass) {
+    }
+}
+
+class privateClassWithWithPublicSetAccessorTypes {
+    static set myPublicStaticMethod(param: publicClass) {
+    }
+    private static set myPrivateStaticMethod(param: publicClass) {
+    }
+    set myPublicMethod(param: publicClass) {
+    }
+    private set myPrivateMethod(param: publicClass) {
+    }
+}
+
+export class publicClassWithPrivateModuleGetAccessorTypes {
+    static get myPublicStaticMethod(): privateModule.publicClass { // Error
+        return null;
+    }
+    get myPublicMethod(): privateModule.publicClass { // Error
+        return null;
+    }
+    static get myPublicStaticMethod1() { // Error
+        return new privateModule.publicClass();
+    }
+    get myPublicMethod1() { // Error
+        return new privateModule.publicClass();
+    }
+}
+
+export class publicClassWithPrivateModuleSetAccessorTypes {
+    static set myPublicStaticMethod(param: privateModule.publicClass) { // Error
+    }
+    set myPublicMethod(param: privateModule.publicClass) { // Error
+    }
+}
+
+class privateClassWithPrivateModuleGetAccessorTypes {
+    static get myPublicStaticMethod(): privateModule.publicClass {
+        return null;
+    }
+    get myPublicMethod(): privateModule.publicClass {
+        return null;
+    }
+    static get myPublicStaticMethod1() {
+        return new privateModule.publicClass();
+    }
+    get myPublicMethod1() {
+        return new privateModule.publicClass();
+    }
+}
+
+class privateClassWithPrivateModuleSetAccessorTypes {
+    static set myPublicStaticMethod(param: privateModule.publicClass) {
+    }
+    set myPublicMethod(param: privateModule.publicClass) {
+    }
+}
+
+export module publicModule {
+    class privateClass {
+    }
+
+    export class publicClass {
+    }
+    export class publicClassWithWithPrivateGetAccessorTypes {
+        static get myPublicStaticMethod(): privateClass { // Error
+            return null;
+        }
+        private static get myPrivateStaticMethod(): privateClass {
+            return null;
+        }
+        get myPublicMethod(): privateClass { // Error
+            return null;
+        }
+        private get myPrivateMethod(): privateClass {
+            return null;
+        }
+        static get myPublicStaticMethod1() { // Error
+            return new privateClass();
+        }
+        private static get myPrivateStaticMethod1() {
+            return new privateClass();
+        }
+        get myPublicMethod1() { // Error
+            return new privateClass();
+        }
+        private get myPrivateMethod1() {
+            return new privateClass();
+        }
+    }
+
+    export class publicClassWithWithPublicGetAccessorTypes {
+        static get myPublicStaticMethod(): publicClass {
+            return null;
+        }
+        private static get myPrivateStaticMethod(): publicClass {
+            return null;
+        }
+        get myPublicMethod(): publicClass {
+            return null;
+        }
+        private get myPrivateMethod(): publicClass {
+            return null;
+        }
+        static get myPublicStaticMethod1() {
+            return new publicClass();
+        }
+        private static get myPrivateStaticMethod1() {
+            return new publicClass();
+        }
+        get myPublicMethod1() {
+            return new publicClass();
+        }
+        private get myPrivateMethod1() {
+            return new publicClass();
+        }
+    }
+
+    class privateClassWithWithPrivateGetAccessorTypes {
+        static get myPublicStaticMethod(): privateClass {
+            return null;
+        }
+        private static get myPrivateStaticMethod(): privateClass {
+            return null;
+        }
+        get myPublicMethod(): privateClass {
+            return null;
+        }
+        private get myPrivateMethod(): privateClass {
+            return null;
+        }
+        static get myPublicStaticMethod1() {
+            return new privateClass();
+        }
+        private static get myPrivateStaticMethod1() {
+            return new privateClass();
+        }
+        get myPublicMethod1() {
+            return new privateClass();
+        }
+        private get myPrivateMethod1() {
+            return new privateClass();
+        }
+    }
+
+    class privateClassWithWithPublicGetAccessorTypes {
+        static get myPublicStaticMethod(): publicClass {
+            return null;
+        }
+        private static get myPrivateStaticMethod(): publicClass {
+            return null;
+        }
+        get myPublicMethod(): publicClass {
+            return null;
+        }
+        private get myPrivateMethod(): publicClass {
+            return null;
+        }
+        static get myPublicStaticMethod1() {
+            return new publicClass();
+        }
+        private static get myPrivateStaticMethod1() {
+            return new publicClass();
+        }
+        get myPublicMethod1() {
+            return new publicClass();
+        }
+        private get myPrivateMethod1() {
+            return new publicClass();
+        }
+    }
+
+    export class publicClassWithWithPrivateSetAccessorTypes {
+        static set myPublicStaticMethod(param: privateClass) { // Error
+        }
+        private static set myPrivateStaticMethod(param: privateClass) {
+        }
+        set myPublicMethod(param: privateClass) { // Error
+        }
+        private set myPrivateMethod(param: privateClass) {
+        }
+    }
+
+    export class publicClassWithWithPublicSetAccessorTypes {
+        static set myPublicStaticMethod(param: publicClass) {
+        }
+        private static set myPrivateStaticMethod(param: publicClass) {
+        }
+        set myPublicMethod(param: publicClass) {
+        }
+        private set myPrivateMethod(param: publicClass) {
+        }
+    }
+
+    class privateClassWithWithPrivateSetAccessorTypes {
+        static set myPublicStaticMethod(param: privateClass) {
+        }
+        private static set myPrivateStaticMethod(param: privateClass) {
+        }
+        set myPublicMethod(param: privateClass) {
+        }
+        private set myPrivateMethod(param: privateClass) {
+        }
+    }
+
+    class privateClassWithWithPublicSetAccessorTypes {
+        static set myPublicStaticMethod(param: publicClass) {
+        }
+        private static set myPrivateStaticMethod(param: publicClass) {
+        }
+        set myPublicMethod(param: publicClass) {
+        }
+        private set myPrivateMethod(param: publicClass) {
+        }
+    }
+
+    export class publicClassWithPrivateModuleGetAccessorTypes {
+        static get myPublicStaticMethod(): privateModule.publicClass { // Error
+            return null;
+        }
+        get myPublicMethod(): privateModule.publicClass { // Error
+            return null;
+        }
+        static get myPublicStaticMethod1() { // Error
+            return new privateModule.publicClass();
+        }
+        get myPublicMethod1() { // Error
+            return new privateModule.publicClass();
+        }
+    }
+
+    export class publicClassWithPrivateModuleSetAccessorTypes {
+        static set myPublicStaticMethod(param: privateModule.publicClass) { // Error
+        }
+        set myPublicMethod(param: privateModule.publicClass) { // Error
+        }
+    }
+
+    class privateClassWithPrivateModuleGetAccessorTypes {
+        static get myPublicStaticMethod(): privateModule.publicClass {
+            return null;
+        }
+        get myPublicMethod(): privateModule.publicClass {
+            return null;
+        }
+        static get myPublicStaticMethod1() {
+            return new privateModule.publicClass();
+        }
+        get myPublicMethod1() {
+            return new privateModule.publicClass();
+        }
+    }
+
+    class privateClassWithPrivateModuleSetAccessorTypes {
+        static set myPublicStaticMethod(param: privateModule.publicClass) {
+        }
+        set myPublicMethod(param: privateModule.publicClass) {
+        }
+    }
+}
+
+module privateModule {
+    class privateClass {
+    }
+
+    export class publicClass {
+    }
+    export class publicClassWithWithPrivateGetAccessorTypes {
+        static get myPublicStaticMethod(): privateClass { 
+            return null;
+        }
+        private static get myPrivateStaticMethod(): privateClass {
+            return null;
+        }
+        get myPublicMethod(): privateClass { 
+            return null;
+        }
+        private get myPrivateMethod(): privateClass {
+            return null;
+        }
+        static get myPublicStaticMethod1() { 
+            return new privateClass();
+        }
+        private static get myPrivateStaticMethod1() {
+            return new privateClass();
+        }
+        get myPublicMethod1() { 
+            return new privateClass();
+        }
+        private get myPrivateMethod1() {
+            return new privateClass();
+        }
+    }
+
+    export class publicClassWithWithPublicGetAccessorTypes {
+        static get myPublicStaticMethod(): publicClass {
+            return null;
+        }
+        private static get myPrivateStaticMethod(): publicClass {
+            return null;
+        }
+        get myPublicMethod(): publicClass {
+            return null;
+        }
+        private get myPrivateMethod(): publicClass {
+            return null;
+        }
+        static get myPublicStaticMethod1() {
+            return new publicClass();
+        }
+        private static get myPrivateStaticMethod1() {
+            return new publicClass();
+        }
+        get myPublicMethod1() {
+            return new publicClass();
+        }
+        private get myPrivateMethod1() {
+            return new publicClass();
+        }
+    }
+
+    class privateClassWithWithPrivateGetAccessorTypes {
+        static get myPublicStaticMethod(): privateClass {
+            return null;
+        }
+        private static get myPrivateStaticMethod(): privateClass {
+            return null;
+        }
+        get myPublicMethod(): privateClass {
+            return null;
+        }
+        private get myPrivateMethod(): privateClass {
+            return null;
+        }
+        static get myPublicStaticMethod1() {
+            return new privateClass();
+        }
+        private static get myPrivateStaticMethod1() {
+            return new privateClass();
+        }
+        get myPublicMethod1() {
+            return new privateClass();
+        }
+        private get myPrivateMethod1() {
+            return new privateClass();
+        }
+    }
+
+    class privateClassWithWithPublicGetAccessorTypes {
+        static get myPublicStaticMethod(): publicClass {
+            return null;
+        }
+        private static get myPrivateStaticMethod(): publicClass {
+            return null;
+        }
+        get myPublicMethod(): publicClass {
+            return null;
+        }
+        private get myPrivateMethod(): publicClass {
+            return null;
+        }
+        static get myPublicStaticMethod1() {
+            return new publicClass();
+        }
+        private static get myPrivateStaticMethod1() {
+            return new publicClass();
+        }
+        get myPublicMethod1() {
+            return new publicClass();
+        }
+        private get myPrivateMethod1() {
+            return new publicClass();
+        }
+    }
+
+    export class publicClassWithWithPrivateSetAccessorTypes {
+        static set myPublicStaticMethod(param: privateClass) { 
+        }
+        private static set myPrivateStaticMethod(param: privateClass) {
+        }
+        set myPublicMethod(param: privateClass) { 
+        }
+        private set myPrivateMethod(param: privateClass) {
+        }
+    }
+
+    export class publicClassWithWithPublicSetAccessorTypes {
+        static set myPublicStaticMethod(param: publicClass) {
+        }
+        private static set myPrivateStaticMethod(param: publicClass) {
+        }
+        set myPublicMethod(param: publicClass) {
+        }
+        private set myPrivateMethod(param: publicClass) {
+        }
+    }
+
+    class privateClassWithWithPrivateSetAccessorTypes {
+        static set myPublicStaticMethod(param: privateClass) {
+        }
+        private static set myPrivateStaticMethod(param: privateClass) {
+        }
+        set myPublicMethod(param: privateClass) {
+        }
+        private set myPrivateMethod(param: privateClass) {
+        }
+    }
+
+    class privateClassWithWithPublicSetAccessorTypes {
+        static set myPublicStaticMethod(param: publicClass) {
+        }
+        private static set myPrivateStaticMethod(param: publicClass) {
+        }
+        set myPublicMethod(param: publicClass) {
+        }
+        private set myPrivateMethod(param: publicClass) {
+        }
+    }
+
+    export class publicClassWithPrivateModuleGetAccessorTypes {
+        static get myPublicStaticMethod(): privateModule.publicClass { 
+            return null;
+        }
+        get myPublicMethod(): privateModule.publicClass { 
+            return null;
+        }
+        static get myPublicStaticMethod1() { 
+            return new privateModule.publicClass();
+        }
+        get myPublicMethod1() { 
+            return new privateModule.publicClass();
+        }
+    }
+
+    export class publicClassWithPrivateModuleSetAccessorTypes {
+        static set myPublicStaticMethod(param: privateModule.publicClass) { 
+        }
+        set myPublicMethod(param: privateModule.publicClass) { 
+        }
+    }
+
+    class privateClassWithPrivateModuleGetAccessorTypes {
+        static get myPublicStaticMethod(): privateModule.publicClass {
+            return null;
+        }
+        get myPublicMethod(): privateModule.publicClass {
+            return null;
+        }
+        static get myPublicStaticMethod1() {
+            return new privateModule.publicClass();
+        }
+        get myPublicMethod1() {
+            return new privateModule.publicClass();
+        }
+    }
+
+    class privateClassWithPrivateModuleSetAccessorTypes {
+        static set myPublicStaticMethod(param: privateModule.publicClass) {
+        }
+        set myPublicMethod(param: privateModule.publicClass) {
+        }
+    }
+}
+
+//// [privacyAccessorDeclFile_GlobalFile.ts]
+class publicClassInGlobal {
+}
+
+class publicClassInGlobalWithPublicGetAccessorTypes {
+    static get myPublicStaticMethod(): publicClassInGlobal {
+        return null;
+    }
+    private static get myPrivateStaticMethod(): publicClassInGlobal {
+        return null;
+    }
+    get myPublicMethod(): publicClassInGlobal {
+        return null;
+    }
+    private get myPrivateMethod(): publicClassInGlobal {
+        return null;
+    }
+    static get myPublicStaticMethod1() {
+        return new publicClassInGlobal();
+    }
+    private static get myPrivateStaticMethod1() {
+        return new publicClassInGlobal();
+    }
+    get myPublicMethod1() {
+        return new publicClassInGlobal();
+    }
+    private get myPrivateMethod1() {
+        return new publicClassInGlobal();
+    }
+}
+
+class publicClassInGlobalWithWithPublicSetAccessorTypes {
+    static set myPublicStaticMethod(param: publicClassInGlobal) {
+    }
+    private static set myPrivateStaticMethod(param: publicClassInGlobal) {
+    }
+    set myPublicMethod(param: publicClassInGlobal) {
+    }
+    private set myPrivateMethod(param: publicClassInGlobal) {
+    }
+}
+
+module publicModuleInGlobal {
+    class privateClass {
+    }
+
+    export class publicClass {
+    }
+
+    module privateModule {
+        class privateClass {
+        }
+
+        export class publicClass {
+        }
+        export class publicClassWithWithPrivateGetAccessorTypes {
+            static get myPublicStaticMethod(): privateClass {
+                return null;
+            }
+            private static get myPrivateStaticMethod(): privateClass {
+                return null;
+            }
+            get myPublicMethod(): privateClass {
+                return null;
+            }
+            private get myPrivateMethod(): privateClass {
+                return null;
+            }
+            static get myPublicStaticMethod1() {
+                return new privateClass();
+            }
+            private static get myPrivateStaticMethod1() {
+                return new privateClass();
+            }
+            get myPublicMethod1() {
+                return new privateClass();
+            }
+            private get myPrivateMethod1() {
+                return new privateClass();
+            }
+        }
+
+        export class publicClassWithWithPublicGetAccessorTypes {
+            static get myPublicStaticMethod(): publicClass {
+                return null;
+            }
+            private static get myPrivateStaticMethod(): publicClass {
+                return null;
+            }
+            get myPublicMethod(): publicClass {
+                return null;
+            }
+            private get myPrivateMethod(): publicClass {
+                return null;
+            }
+            static get myPublicStaticMethod1() {
+                return new publicClass();
+            }
+            private static get myPrivateStaticMethod1() {
+                return new publicClass();
+            }
+            get myPublicMethod1() {
+                return new publicClass();
+            }
+            private get myPrivateMethod1() {
+                return new publicClass();
+            }
+        }
+
+        class privateClassWithWithPrivateGetAccessorTypes {
+            static get myPublicStaticMethod(): privateClass {
+                return null;
+            }
+            private static get myPrivateStaticMethod(): privateClass {
+                return null;
+            }
+            get myPublicMethod(): privateClass {
+                return null;
+            }
+            private get myPrivateMethod(): privateClass {
+                return null;
+            }
+            static get myPublicStaticMethod1() {
+                return new privateClass();
+            }
+            private static get myPrivateStaticMethod1() {
+                return new privateClass();
+            }
+            get myPublicMethod1() {
+                return new privateClass();
+            }
+            private get myPrivateMethod1() {
+                return new privateClass();
+            }
+        }
+
+        class privateClassWithWithPublicGetAccessorTypes {
+            static get myPublicStaticMethod(): publicClass {
+                return null;
+            }
+            private static get myPrivateStaticMethod(): publicClass {
+                return null;
+            }
+            get myPublicMethod(): publicClass {
+                return null;
+            }
+            private get myPrivateMethod(): publicClass {
+                return null;
+            }
+            static get myPublicStaticMethod1() {
+                return new publicClass();
+            }
+            private static get myPrivateStaticMethod1() {
+                return new publicClass();
+            }
+            get myPublicMethod1() {
+                return new publicClass();
+            }
+            private get myPrivateMethod1() {
+                return new publicClass();
+            }
+        }
+
+        export class publicClassWithWithPrivateSetAccessorTypes {
+            static set myPublicStaticMethod(param: privateClass) {
+            }
+            private static set myPrivateStaticMethod(param: privateClass) {
+            }
+            set myPublicMethod(param: privateClass) {
+            }
+            private set myPrivateMethod(param: privateClass) {
+            }
+        }
+
+        export class publicClassWithWithPublicSetAccessorTypes {
+            static set myPublicStaticMethod(param: publicClass) {
+            }
+            private static set myPrivateStaticMethod(param: publicClass) {
+            }
+            set myPublicMethod(param: publicClass) {
+            }
+            private set myPrivateMethod(param: publicClass) {
+            }
+        }
+
+        class privateClassWithWithPrivateSetAccessorTypes {
+            static set myPublicStaticMethod(param: privateClass) {
+            }
+            private static set myPrivateStaticMethod(param: privateClass) {
+            }
+            set myPublicMethod(param: privateClass) {
+            }
+            private set myPrivateMethod(param: privateClass) {
+            }
+        }
+
+        class privateClassWithWithPublicSetAccessorTypes {
+            static set myPublicStaticMethod(param: publicClass) {
+            }
+            private static set myPrivateStaticMethod(param: publicClass) {
+            }
+            set myPublicMethod(param: publicClass) {
+            }
+            private set myPrivateMethod(param: publicClass) {
+            }
+        }
+
+        export class publicClassWithPrivateModuleGetAccessorTypes {
+            static get myPublicStaticMethod(): privateModule.publicClass {
+                return null;
+            }
+            get myPublicMethod(): privateModule.publicClass {
+                return null;
+            }
+            static get myPublicStaticMethod1() {
+                return new privateModule.publicClass();
+            }
+            get myPublicMethod1() {
+                return new privateModule.publicClass();
+            }
+        }
+
+        export class publicClassWithPrivateModuleSetAccessorTypes {
+            static set myPublicStaticMethod(param: privateModule.publicClass) {
+            }
+            set myPublicMethod(param: privateModule.publicClass) {
+            }
+        }
+
+        class privateClassWithPrivateModuleGetAccessorTypes {
+            static get myPublicStaticMethod(): privateModule.publicClass {
+                return null;
+            }
+            get myPublicMethod(): privateModule.publicClass {
+                return null;
+            }
+            static get myPublicStaticMethod1() {
+                return new privateModule.publicClass();
+            }
+            get myPublicMethod1() {
+                return new privateModule.publicClass();
+            }
+        }
+
+        class privateClassWithPrivateModuleSetAccessorTypes {
+            static set myPublicStaticMethod(param: privateModule.publicClass) {
+            }
+            set myPublicMethod(param: privateModule.publicClass) {
+            }
+        }
+    }
+
+    export class publicClassWithWithPrivateGetAccessorTypes {
+        static get myPublicStaticMethod(): privateClass { // Error
+            return null;
+        }
+        private static get myPrivateStaticMethod(): privateClass {
+            return null;
+        }
+        get myPublicMethod(): privateClass { // Error
+            return null;
+        }
+        private get myPrivateMethod(): privateClass {
+            return null;
+        }
+        static get myPublicStaticMethod1() { // Error
+            return new privateClass();
+        }
+        private static get myPrivateStaticMethod1() {
+            return new privateClass();
+        }
+        get myPublicMethod1() { // Error
+            return new privateClass();
+        }
+        private get myPrivateMethod1() {
+            return new privateClass();
+        }
+    }
+
+    export class publicClassWithWithPublicGetAccessorTypes {
+        static get myPublicStaticMethod(): publicClass {
+            return null;
+        }
+        private static get myPrivateStaticMethod(): publicClass {
+            return null;
+        }
+        get myPublicMethod(): publicClass {
+            return null;
+        }
+        private get myPrivateMethod(): publicClass {
+            return null;
+        }
+        static get myPublicStaticMethod1() {
+            return new publicClass();
+        }
+        private static get myPrivateStaticMethod1() {
+            return new publicClass();
+        }
+        get myPublicMethod1() {
+            return new publicClass();
+        }
+        private get myPrivateMethod1() {
+            return new publicClass();
+        }
+    }
+
+    class privateClassWithWithPrivateGetAccessorTypes {
+        static get myPublicStaticMethod(): privateClass {
+            return null;
+        }
+        private static get myPrivateStaticMethod(): privateClass {
+            return null;
+        }
+        get myPublicMethod(): privateClass {
+            return null;
+        }
+        private get myPrivateMethod(): privateClass {
+            return null;
+        }
+        static get myPublicStaticMethod1() {
+            return new privateClass();
+        }
+        private static get myPrivateStaticMethod1() {
+            return new privateClass();
+        }
+        get myPublicMethod1() {
+            return new privateClass();
+        }
+        private get myPrivateMethod1() {
+            return new privateClass();
+        }
+    }
+
+    class privateClassWithWithPublicGetAccessorTypes {
+        static get myPublicStaticMethod(): publicClass {
+            return null;
+        }
+        private static get myPrivateStaticMethod(): publicClass {
+            return null;
+        }
+        get myPublicMethod(): publicClass {
+            return null;
+        }
+        private get myPrivateMethod(): publicClass {
+            return null;
+        }
+        static get myPublicStaticMethod1() {
+            return new publicClass();
+        }
+        private static get myPrivateStaticMethod1() {
+            return new publicClass();
+        }
+        get myPublicMethod1() {
+            return new publicClass();
+        }
+        private get myPrivateMethod1() {
+            return new publicClass();
+        }
+    }
+
+    export class publicClassWithWithPrivateSetAccessorTypes {
+        static set myPublicStaticMethod(param: privateClass) { // Error
+        }
+        private static set myPrivateStaticMethod(param: privateClass) {
+        }
+        set myPublicMethod(param: privateClass) { // Error
+        }
+        private set myPrivateMethod(param: privateClass) {
+        }
+    }
+
+    export class publicClassWithWithPublicSetAccessorTypes {
+        static set myPublicStaticMethod(param: publicClass) {
+        }
+        private static set myPrivateStaticMethod(param: publicClass) {
+        }
+        set myPublicMethod(param: publicClass) {
+        }
+        private set myPrivateMethod(param: publicClass) {
+        }
+    }
+
+    class privateClassWithWithPrivateSetAccessorTypes {
+        static set myPublicStaticMethod(param: privateClass) {
+        }
+        private static set myPrivateStaticMethod(param: privateClass) {
+        }
+        set myPublicMethod(param: privateClass) {
+        }
+        private set myPrivateMethod(param: privateClass) {
+        }
+    }
+
+    class privateClassWithWithPublicSetAccessorTypes {
+        static set myPublicStaticMethod(param: publicClass) {
+        }
+        private static set myPrivateStaticMethod(param: publicClass) {
+        }
+        set myPublicMethod(param: publicClass) {
+        }
+        private set myPrivateMethod(param: publicClass) {
+        }
+    }
+
+    export class publicClassWithPrivateModuleGetAccessorTypes {
+        static get myPublicStaticMethod(): privateModule.publicClass { // Error
+            return null;
+        }
+        get myPublicMethod(): privateModule.publicClass { // Error
+            return null;
+        }
+        static get myPublicStaticMethod1() { // Error
+            return new privateModule.publicClass();
+        }
+        get myPublicMethod1() { // Error
+            return new privateModule.publicClass();
+        }
+    }
+
+    export class publicClassWithPrivateModuleSetAccessorTypes {
+        static set myPublicStaticMethod(param: privateModule.publicClass) { // Error
+        }
+        set myPublicMethod(param: privateModule.publicClass) { // Error
+        }
+    }
+
+    class privateClassWithPrivateModuleGetAccessorTypes {
+        static get myPublicStaticMethod(): privateModule.publicClass {
+            return null;
+        }
+        get myPublicMethod(): privateModule.publicClass {
+            return null;
+        }
+        static get myPublicStaticMethod1() {
+            return new privateModule.publicClass();
+        }
+        get myPublicMethod1() {
+            return new privateModule.publicClass();
+        }
+    }
+
+    class privateClassWithPrivateModuleSetAccessorTypes {
+        static set myPublicStaticMethod(param: privateModule.publicClass) {
+        }
+        set myPublicMethod(param: privateModule.publicClass) {
+        }
+    }
+}
+
+//// [privacyAccessorDeclFile_externalModule.js]
+var privateClass = (function () {
+    function privateClass() {
+    }
+    return privateClass;
+})();
+var publicClass = (function () {
+    function publicClass() {
+    }
+    return publicClass;
+})();
+exports.publicClass = publicClass;
+var publicClassWithWithPrivateGetAccessorTypes = (function () {
+    function publicClassWithWithPrivateGetAccessorTypes() {
+    }
+    Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes, "myPublicStaticMethod", {
+        get: function () {
+            return null;
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes, "myPrivateStaticMethod", {
+        get: function () {
+            return null;
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes.prototype, "myPublicMethod", {
+        get: function () {
+            return null;
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes.prototype, "myPrivateMethod", {
+        get: function () {
+            return null;
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes, "myPublicStaticMethod1", {
+        get: function () {
+            return new privateClass();
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes, "myPrivateStaticMethod1", {
+        get: function () {
+            return new privateClass();
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes.prototype, "myPublicMethod1", {
+        get: function () {
+            return new privateClass();
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes.prototype, "myPrivateMethod1", {
+        get: function () {
+            return new privateClass();
+        },
+        enumerable: true,
+        configurable: true
+    });
+    return publicClassWithWithPrivateGetAccessorTypes;
+})();
+exports.publicClassWithWithPrivateGetAccessorTypes = publicClassWithWithPrivateGetAccessorTypes;
+var publicClassWithWithPublicGetAccessorTypes = (function () {
+    function publicClassWithWithPublicGetAccessorTypes() {
+    }
+    Object.defineProperty(publicClassWithWithPublicGetAccessorTypes, "myPublicStaticMethod", {
+        get: function () {
+            return null;
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(publicClassWithWithPublicGetAccessorTypes, "myPrivateStaticMethod", {
+        get: function () {
+            return null;
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(publicClassWithWithPublicGetAccessorTypes.prototype, "myPublicMethod", {
+        get: function () {
+            return null;
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(publicClassWithWithPublicGetAccessorTypes.prototype, "myPrivateMethod", {
+        get: function () {
+            return null;
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(publicClassWithWithPublicGetAccessorTypes, "myPublicStaticMethod1", {
+        get: function () {
+            return new publicClass();
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(publicClassWithWithPublicGetAccessorTypes, "myPrivateStaticMethod1", {
+        get: function () {
+            return new publicClass();
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(publicClassWithWithPublicGetAccessorTypes.prototype, "myPublicMethod1", {
+        get: function () {
+            return new publicClass();
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(publicClassWithWithPublicGetAccessorTypes.prototype, "myPrivateMethod1", {
+        get: function () {
+            return new publicClass();
+        },
+        enumerable: true,
+        configurable: true
+    });
+    return publicClassWithWithPublicGetAccessorTypes;
+})();
+exports.publicClassWithWithPublicGetAccessorTypes = publicClassWithWithPublicGetAccessorTypes;
+var privateClassWithWithPrivateGetAccessorTypes = (function () {
+    function privateClassWithWithPrivateGetAccessorTypes() {
+    }
+    Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes, "myPublicStaticMethod", {
+        get: function () {
+            return null;
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes, "myPrivateStaticMethod", {
+        get: function () {
+            return null;
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes.prototype, "myPublicMethod", {
+        get: function () {
+            return null;
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes.prototype, "myPrivateMethod", {
+        get: function () {
+            return null;
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes, "myPublicStaticMethod1", {
+        get: function () {
+            return new privateClass();
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes, "myPrivateStaticMethod1", {
+        get: function () {
+            return new privateClass();
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes.prototype, "myPublicMethod1", {
+        get: function () {
+            return new privateClass();
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes.prototype, "myPrivateMethod1", {
+        get: function () {
+            return new privateClass();
+        },
+        enumerable: true,
+        configurable: true
+    });
+    return privateClassWithWithPrivateGetAccessorTypes;
+})();
+var privateClassWithWithPublicGetAccessorTypes = (function () {
+    function privateClassWithWithPublicGetAccessorTypes() {
+    }
+    Object.defineProperty(privateClassWithWithPublicGetAccessorTypes, "myPublicStaticMethod", {
+        get: function () {
+            return null;
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(privateClassWithWithPublicGetAccessorTypes, "myPrivateStaticMethod", {
+        get: function () {
+            return null;
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(privateClassWithWithPublicGetAccessorTypes.prototype, "myPublicMethod", {
+        get: function () {
+            return null;
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(privateClassWithWithPublicGetAccessorTypes.prototype, "myPrivateMethod", {
+        get: function () {
+            return null;
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(privateClassWithWithPublicGetAccessorTypes, "myPublicStaticMethod1", {
+        get: function () {
+            return new publicClass();
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(privateClassWithWithPublicGetAccessorTypes, "myPrivateStaticMethod1", {
+        get: function () {
+            return new publicClass();
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(privateClassWithWithPublicGetAccessorTypes.prototype, "myPublicMethod1", {
+        get: function () {
+            return new publicClass();
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(privateClassWithWithPublicGetAccessorTypes.prototype, "myPrivateMethod1", {
+        get: function () {
+            return new publicClass();
+        },
+        enumerable: true,
+        configurable: true
+    });
+    return privateClassWithWithPublicGetAccessorTypes;
+})();
+var publicClassWithWithPrivateSetAccessorTypes = (function () {
+    function publicClassWithWithPrivateSetAccessorTypes() {
+    }
+    Object.defineProperty(publicClassWithWithPrivateSetAccessorTypes, "myPublicStaticMethod", {
+        set: function (param) {
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(publicClassWithWithPrivateSetAccessorTypes, "myPrivateStaticMethod", {
+        set: function (param) {
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(publicClassWithWithPrivateSetAccessorTypes.prototype, "myPublicMethod", {
+        set: function (param) {
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(publicClassWithWithPrivateSetAccessorTypes.prototype, "myPrivateMethod", {
+        set: function (param) {
+        },
+        enumerable: true,
+        configurable: true
+    });
+    return publicClassWithWithPrivateSetAccessorTypes;
+})();
+exports.publicClassWithWithPrivateSetAccessorTypes = publicClassWithWithPrivateSetAccessorTypes;
+var publicClassWithWithPublicSetAccessorTypes = (function () {
+    function publicClassWithWithPublicSetAccessorTypes() {
+    }
+    Object.defineProperty(publicClassWithWithPublicSetAccessorTypes, "myPublicStaticMethod", {
+        set: function (param) {
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(publicClassWithWithPublicSetAccessorTypes, "myPrivateStaticMethod", {
+        set: function (param) {
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(publicClassWithWithPublicSetAccessorTypes.prototype, "myPublicMethod", {
+        set: function (param) {
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(publicClassWithWithPublicSetAccessorTypes.prototype, "myPrivateMethod", {
+        set: function (param) {
+        },
+        enumerable: true,
+        configurable: true
+    });
+    return publicClassWithWithPublicSetAccessorTypes;
+})();
+exports.publicClassWithWithPublicSetAccessorTypes = publicClassWithWithPublicSetAccessorTypes;
+var privateClassWithWithPrivateSetAccessorTypes = (function () {
+    function privateClassWithWithPrivateSetAccessorTypes() {
+    }
+    Object.defineProperty(privateClassWithWithPrivateSetAccessorTypes, "myPublicStaticMethod", {
+        set: function (param) {
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(privateClassWithWithPrivateSetAccessorTypes, "myPrivateStaticMethod", {
+        set: function (param) {
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(privateClassWithWithPrivateSetAccessorTypes.prototype, "myPublicMethod", {
+        set: function (param) {
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(privateClassWithWithPrivateSetAccessorTypes.prototype, "myPrivateMethod", {
+        set: function (param) {
+        },
+        enumerable: true,
+        configurable: true
+    });
+    return privateClassWithWithPrivateSetAccessorTypes;
+})();
+var privateClassWithWithPublicSetAccessorTypes = (function () {
+    function privateClassWithWithPublicSetAccessorTypes() {
+    }
+    Object.defineProperty(privateClassWithWithPublicSetAccessorTypes, "myPublicStaticMethod", {
+        set: function (param) {
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(privateClassWithWithPublicSetAccessorTypes, "myPrivateStaticMethod", {
+        set: function (param) {
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(privateClassWithWithPublicSetAccessorTypes.prototype, "myPublicMethod", {
+        set: function (param) {
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(privateClassWithWithPublicSetAccessorTypes.prototype, "myPrivateMethod", {
+        set: function (param) {
+        },
+        enumerable: true,
+        configurable: true
+    });
+    return privateClassWithWithPublicSetAccessorTypes;
+})();
+var publicClassWithPrivateModuleGetAccessorTypes = (function () {
+    function publicClassWithPrivateModuleGetAccessorTypes() {
+    }
+    Object.defineProperty(publicClassWithPrivateModuleGetAccessorTypes, "myPublicStaticMethod", {
+        get: function () {
+            return null;
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(publicClassWithPrivateModuleGetAccessorTypes.prototype, "myPublicMethod", {
+        get: function () {
+            return null;
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(publicClassWithPrivateModuleGetAccessorTypes, "myPublicStaticMethod1", {
+        get: function () {
+            return new privateModule.publicClass();
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(publicClassWithPrivateModuleGetAccessorTypes.prototype, "myPublicMethod1", {
+        get: function () {
+            return new privateModule.publicClass();
+        },
+        enumerable: true,
+        configurable: true
+    });
+    return publicClassWithPrivateModuleGetAccessorTypes;
+})();
+exports.publicClassWithPrivateModuleGetAccessorTypes = publicClassWithPrivateModuleGetAccessorTypes;
+var publicClassWithPrivateModuleSetAccessorTypes = (function () {
+    function publicClassWithPrivateModuleSetAccessorTypes() {
+    }
+    Object.defineProperty(publicClassWithPrivateModuleSetAccessorTypes, "myPublicStaticMethod", {
+        set: function (param) {
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(publicClassWithPrivateModuleSetAccessorTypes.prototype, "myPublicMethod", {
+        set: function (param) {
+        },
+        enumerable: true,
+        configurable: true
+    });
+    return publicClassWithPrivateModuleSetAccessorTypes;
+})();
+exports.publicClassWithPrivateModuleSetAccessorTypes = publicClassWithPrivateModuleSetAccessorTypes;
+var privateClassWithPrivateModuleGetAccessorTypes = (function () {
+    function privateClassWithPrivateModuleGetAccessorTypes() {
+    }
+    Object.defineProperty(privateClassWithPrivateModuleGetAccessorTypes, "myPublicStaticMethod", {
+        get: function () {
+            return null;
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(privateClassWithPrivateModuleGetAccessorTypes.prototype, "myPublicMethod", {
+        get: function () {
+            return null;
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(privateClassWithPrivateModuleGetAccessorTypes, "myPublicStaticMethod1", {
+        get: function () {
+            return new privateModule.publicClass();
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(privateClassWithPrivateModuleGetAccessorTypes.prototype, "myPublicMethod1", {
+        get: function () {
+            return new privateModule.publicClass();
+        },
+        enumerable: true,
+        configurable: true
+    });
+    return privateClassWithPrivateModuleGetAccessorTypes;
+})();
+var privateClassWithPrivateModuleSetAccessorTypes = (function () {
+    function privateClassWithPrivateModuleSetAccessorTypes() {
+    }
+    Object.defineProperty(privateClassWithPrivateModuleSetAccessorTypes, "myPublicStaticMethod", {
+        set: function (param) {
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(privateClassWithPrivateModuleSetAccessorTypes.prototype, "myPublicMethod", {
+        set: function (param) {
+        },
+        enumerable: true,
+        configurable: true
+    });
+    return privateClassWithPrivateModuleSetAccessorTypes;
+})();
+(function (publicModule) {
+    var privateClass = (function () {
+        function privateClass() {
+        }
+        return privateClass;
+    })();
+    var publicClass = (function () {
+        function publicClass() {
+        }
+        return publicClass;
+    })();
+    publicModule.publicClass = publicClass;
+    var publicClassWithWithPrivateGetAccessorTypes = (function () {
+        function publicClassWithWithPrivateGetAccessorTypes() {
+        }
+        Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes, "myPublicStaticMethod", {
+            get: function () {
+                return null;
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes, "myPrivateStaticMethod", {
+            get: function () {
+                return null;
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes.prototype, "myPublicMethod", {
+            get: function () {
+                return null;
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes.prototype, "myPrivateMethod", {
+            get: function () {
+                return null;
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes, "myPublicStaticMethod1", {
+            get: function () {
+                return new privateClass();
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes, "myPrivateStaticMethod1", {
+            get: function () {
+                return new privateClass();
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes.prototype, "myPublicMethod1", {
+            get: function () {
+                return new privateClass();
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes.prototype, "myPrivateMethod1", {
+            get: function () {
+                return new privateClass();
+            },
+            enumerable: true,
+            configurable: true
+        });
+        return publicClassWithWithPrivateGetAccessorTypes;
+    })();
+    publicModule.publicClassWithWithPrivateGetAccessorTypes = publicClassWithWithPrivateGetAccessorTypes;
+    var publicClassWithWithPublicGetAccessorTypes = (function () {
+        function publicClassWithWithPublicGetAccessorTypes() {
+        }
+        Object.defineProperty(publicClassWithWithPublicGetAccessorTypes, "myPublicStaticMethod", {
+            get: function () {
+                return null;
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(publicClassWithWithPublicGetAccessorTypes, "myPrivateStaticMethod", {
+            get: function () {
+                return null;
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(publicClassWithWithPublicGetAccessorTypes.prototype, "myPublicMethod", {
+            get: function () {
+                return null;
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(publicClassWithWithPublicGetAccessorTypes.prototype, "myPrivateMethod", {
+            get: function () {
+                return null;
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(publicClassWithWithPublicGetAccessorTypes, "myPublicStaticMethod1", {
+            get: function () {
+                return new publicClass();
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(publicClassWithWithPublicGetAccessorTypes, "myPrivateStaticMethod1", {
+            get: function () {
+                return new publicClass();
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(publicClassWithWithPublicGetAccessorTypes.prototype, "myPublicMethod1", {
+            get: function () {
+                return new publicClass();
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(publicClassWithWithPublicGetAccessorTypes.prototype, "myPrivateMethod1", {
+            get: function () {
+                return new publicClass();
+            },
+            enumerable: true,
+            configurable: true
+        });
+        return publicClassWithWithPublicGetAccessorTypes;
+    })();
+    publicModule.publicClassWithWithPublicGetAccessorTypes = publicClassWithWithPublicGetAccessorTypes;
+    var privateClassWithWithPrivateGetAccessorTypes = (function () {
+        function privateClassWithWithPrivateGetAccessorTypes() {
+        }
+        Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes, "myPublicStaticMethod", {
+            get: function () {
+                return null;
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes, "myPrivateStaticMethod", {
+            get: function () {
+                return null;
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes.prototype, "myPublicMethod", {
+            get: function () {
+                return null;
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes.prototype, "myPrivateMethod", {
+            get: function () {
+                return null;
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes, "myPublicStaticMethod1", {
+            get: function () {
+                return new privateClass();
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes, "myPrivateStaticMethod1", {
+            get: function () {
+                return new privateClass();
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes.prototype, "myPublicMethod1", {
+            get: function () {
+                return new privateClass();
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes.prototype, "myPrivateMethod1", {
+            get: function () {
+                return new privateClass();
+            },
+            enumerable: true,
+            configurable: true
+        });
+        return privateClassWithWithPrivateGetAccessorTypes;
+    })();
+    var privateClassWithWithPublicGetAccessorTypes = (function () {
+        function privateClassWithWithPublicGetAccessorTypes() {
+        }
+        Object.defineProperty(privateClassWithWithPublicGetAccessorTypes, "myPublicStaticMethod", {
+            get: function () {
+                return null;
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(privateClassWithWithPublicGetAccessorTypes, "myPrivateStaticMethod", {
+            get: function () {
+                return null;
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(privateClassWithWithPublicGetAccessorTypes.prototype, "myPublicMethod", {
+            get: function () {
+                return null;
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(privateClassWithWithPublicGetAccessorTypes.prototype, "myPrivateMethod", {
+            get: function () {
+                return null;
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(privateClassWithWithPublicGetAccessorTypes, "myPublicStaticMethod1", {
+            get: function () {
+                return new publicClass();
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(privateClassWithWithPublicGetAccessorTypes, "myPrivateStaticMethod1", {
+            get: function () {
+                return new publicClass();
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(privateClassWithWithPublicGetAccessorTypes.prototype, "myPublicMethod1", {
+            get: function () {
+                return new publicClass();
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(privateClassWithWithPublicGetAccessorTypes.prototype, "myPrivateMethod1", {
+            get: function () {
+                return new publicClass();
+            },
+            enumerable: true,
+            configurable: true
+        });
+        return privateClassWithWithPublicGetAccessorTypes;
+    })();
+    var publicClassWithWithPrivateSetAccessorTypes = (function () {
+        function publicClassWithWithPrivateSetAccessorTypes() {
+        }
+        Object.defineProperty(publicClassWithWithPrivateSetAccessorTypes, "myPublicStaticMethod", {
+            set: function (param) {
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(publicClassWithWithPrivateSetAccessorTypes, "myPrivateStaticMethod", {
+            set: function (param) {
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(publicClassWithWithPrivateSetAccessorTypes.prototype, "myPublicMethod", {
+            set: function (param) {
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(publicClassWithWithPrivateSetAccessorTypes.prototype, "myPrivateMethod", {
+            set: function (param) {
+            },
+            enumerable: true,
+            configurable: true
+        });
+        return publicClassWithWithPrivateSetAccessorTypes;
+    })();
+    publicModule.publicClassWithWithPrivateSetAccessorTypes = publicClassWithWithPrivateSetAccessorTypes;
+    var publicClassWithWithPublicSetAccessorTypes = (function () {
+        function publicClassWithWithPublicSetAccessorTypes() {
+        }
+        Object.defineProperty(publicClassWithWithPublicSetAccessorTypes, "myPublicStaticMethod", {
+            set: function (param) {
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(publicClassWithWithPublicSetAccessorTypes, "myPrivateStaticMethod", {
+            set: function (param) {
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(publicClassWithWithPublicSetAccessorTypes.prototype, "myPublicMethod", {
+            set: function (param) {
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(publicClassWithWithPublicSetAccessorTypes.prototype, "myPrivateMethod", {
+            set: function (param) {
+            },
+            enumerable: true,
+            configurable: true
+        });
+        return publicClassWithWithPublicSetAccessorTypes;
+    })();
+    publicModule.publicClassWithWithPublicSetAccessorTypes = publicClassWithWithPublicSetAccessorTypes;
+    var privateClassWithWithPrivateSetAccessorTypes = (function () {
+        function privateClassWithWithPrivateSetAccessorTypes() {
+        }
+        Object.defineProperty(privateClassWithWithPrivateSetAccessorTypes, "myPublicStaticMethod", {
+            set: function (param) {
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(privateClassWithWithPrivateSetAccessorTypes, "myPrivateStaticMethod", {
+            set: function (param) {
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(privateClassWithWithPrivateSetAccessorTypes.prototype, "myPublicMethod", {
+            set: function (param) {
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(privateClassWithWithPrivateSetAccessorTypes.prototype, "myPrivateMethod", {
+            set: function (param) {
+            },
+            enumerable: true,
+            configurable: true
+        });
+        return privateClassWithWithPrivateSetAccessorTypes;
+    })();
+    var privateClassWithWithPublicSetAccessorTypes = (function () {
+        function privateClassWithWithPublicSetAccessorTypes() {
+        }
+        Object.defineProperty(privateClassWithWithPublicSetAccessorTypes, "myPublicStaticMethod", {
+            set: function (param) {
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(privateClassWithWithPublicSetAccessorTypes, "myPrivateStaticMethod", {
+            set: function (param) {
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(privateClassWithWithPublicSetAccessorTypes.prototype, "myPublicMethod", {
+            set: function (param) {
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(privateClassWithWithPublicSetAccessorTypes.prototype, "myPrivateMethod", {
+            set: function (param) {
+            },
+            enumerable: true,
+            configurable: true
+        });
+        return privateClassWithWithPublicSetAccessorTypes;
+    })();
+    var publicClassWithPrivateModuleGetAccessorTypes = (function () {
+        function publicClassWithPrivateModuleGetAccessorTypes() {
+        }
+        Object.defineProperty(publicClassWithPrivateModuleGetAccessorTypes, "myPublicStaticMethod", {
+            get: function () {
+                return null;
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(publicClassWithPrivateModuleGetAccessorTypes.prototype, "myPublicMethod", {
+            get: function () {
+                return null;
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(publicClassWithPrivateModuleGetAccessorTypes, "myPublicStaticMethod1", {
+            get: function () {
+                return new privateModule.publicClass();
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(publicClassWithPrivateModuleGetAccessorTypes.prototype, "myPublicMethod1", {
+            get: function () {
+                return new privateModule.publicClass();
+            },
+            enumerable: true,
+            configurable: true
+        });
+        return publicClassWithPrivateModuleGetAccessorTypes;
+    })();
+    publicModule.publicClassWithPrivateModuleGetAccessorTypes = publicClassWithPrivateModuleGetAccessorTypes;
+    var publicClassWithPrivateModuleSetAccessorTypes = (function () {
+        function publicClassWithPrivateModuleSetAccessorTypes() {
+        }
+        Object.defineProperty(publicClassWithPrivateModuleSetAccessorTypes, "myPublicStaticMethod", {
+            set: function (param) {
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(publicClassWithPrivateModuleSetAccessorTypes.prototype, "myPublicMethod", {
+            set: function (param) {
+            },
+            enumerable: true,
+            configurable: true
+        });
+        return publicClassWithPrivateModuleSetAccessorTypes;
+    })();
+    publicModule.publicClassWithPrivateModuleSetAccessorTypes = publicClassWithPrivateModuleSetAccessorTypes;
+    var privateClassWithPrivateModuleGetAccessorTypes = (function () {
+        function privateClassWithPrivateModuleGetAccessorTypes() {
+        }
+        Object.defineProperty(privateClassWithPrivateModuleGetAccessorTypes, "myPublicStaticMethod", {
+            get: function () {
+                return null;
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(privateClassWithPrivateModuleGetAccessorTypes.prototype, "myPublicMethod", {
+            get: function () {
+                return null;
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(privateClassWithPrivateModuleGetAccessorTypes, "myPublicStaticMethod1", {
+            get: function () {
+                return new privateModule.publicClass();
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(privateClassWithPrivateModuleGetAccessorTypes.prototype, "myPublicMethod1", {
+            get: function () {
+                return new privateModule.publicClass();
+            },
+            enumerable: true,
+            configurable: true
+        });
+        return privateClassWithPrivateModuleGetAccessorTypes;
+    })();
+    var privateClassWithPrivateModuleSetAccessorTypes = (function () {
+        function privateClassWithPrivateModuleSetAccessorTypes() {
+        }
+        Object.defineProperty(privateClassWithPrivateModuleSetAccessorTypes, "myPublicStaticMethod", {
+            set: function (param) {
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(privateClassWithPrivateModuleSetAccessorTypes.prototype, "myPublicMethod", {
+            set: function (param) {
+            },
+            enumerable: true,
+            configurable: true
+        });
+        return privateClassWithPrivateModuleSetAccessorTypes;
+    })();
+})(exports.publicModule || (exports.publicModule = {}));
+var publicModule = exports.publicModule;
+var privateModule;
+(function (privateModule) {
+    var privateClass = (function () {
+        function privateClass() {
+        }
+        return privateClass;
+    })();
+    var publicClass = (function () {
+        function publicClass() {
+        }
+        return publicClass;
+    })();
+    privateModule.publicClass = publicClass;
+    var publicClassWithWithPrivateGetAccessorTypes = (function () {
+        function publicClassWithWithPrivateGetAccessorTypes() {
+        }
+        Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes, "myPublicStaticMethod", {
+            get: function () {
+                return null;
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes, "myPrivateStaticMethod", {
+            get: function () {
+                return null;
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes.prototype, "myPublicMethod", {
+            get: function () {
+                return null;
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes.prototype, "myPrivateMethod", {
+            get: function () {
+                return null;
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes, "myPublicStaticMethod1", {
+            get: function () {
+                return new privateClass();
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes, "myPrivateStaticMethod1", {
+            get: function () {
+                return new privateClass();
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes.prototype, "myPublicMethod1", {
+            get: function () {
+                return new privateClass();
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes.prototype, "myPrivateMethod1", {
+            get: function () {
+                return new privateClass();
+            },
+            enumerable: true,
+            configurable: true
+        });
+        return publicClassWithWithPrivateGetAccessorTypes;
+    })();
+    privateModule.publicClassWithWithPrivateGetAccessorTypes = publicClassWithWithPrivateGetAccessorTypes;
+    var publicClassWithWithPublicGetAccessorTypes = (function () {
+        function publicClassWithWithPublicGetAccessorTypes() {
+        }
+        Object.defineProperty(publicClassWithWithPublicGetAccessorTypes, "myPublicStaticMethod", {
+            get: function () {
+                return null;
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(publicClassWithWithPublicGetAccessorTypes, "myPrivateStaticMethod", {
+            get: function () {
+                return null;
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(publicClassWithWithPublicGetAccessorTypes.prototype, "myPublicMethod", {
+            get: function () {
+                return null;
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(publicClassWithWithPublicGetAccessorTypes.prototype, "myPrivateMethod", {
+            get: function () {
+                return null;
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(publicClassWithWithPublicGetAccessorTypes, "myPublicStaticMethod1", {
+            get: function () {
+                return new publicClass();
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(publicClassWithWithPublicGetAccessorTypes, "myPrivateStaticMethod1", {
+            get: function () {
+                return new publicClass();
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(publicClassWithWithPublicGetAccessorTypes.prototype, "myPublicMethod1", {
+            get: function () {
+                return new publicClass();
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(publicClassWithWithPublicGetAccessorTypes.prototype, "myPrivateMethod1", {
+            get: function () {
+                return new publicClass();
+            },
+            enumerable: true,
+            configurable: true
+        });
+        return publicClassWithWithPublicGetAccessorTypes;
+    })();
+    privateModule.publicClassWithWithPublicGetAccessorTypes = publicClassWithWithPublicGetAccessorTypes;
+    var privateClassWithWithPrivateGetAccessorTypes = (function () {
+        function privateClassWithWithPrivateGetAccessorTypes() {
+        }
+        Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes, "myPublicStaticMethod", {
+            get: function () {
+                return null;
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes, "myPrivateStaticMethod", {
+            get: function () {
+                return null;
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes.prototype, "myPublicMethod", {
+            get: function () {
+                return null;
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes.prototype, "myPrivateMethod", {
+            get: function () {
+                return null;
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes, "myPublicStaticMethod1", {
+            get: function () {
+                return new privateClass();
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes, "myPrivateStaticMethod1", {
+            get: function () {
+                return new privateClass();
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes.prototype, "myPublicMethod1", {
+            get: function () {
+                return new privateClass();
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes.prototype, "myPrivateMethod1", {
+            get: function () {
+                return new privateClass();
+            },
+            enumerable: true,
+            configurable: true
+        });
+        return privateClassWithWithPrivateGetAccessorTypes;
+    })();
+    var privateClassWithWithPublicGetAccessorTypes = (function () {
+        function privateClassWithWithPublicGetAccessorTypes() {
+        }
+        Object.defineProperty(privateClassWithWithPublicGetAccessorTypes, "myPublicStaticMethod", {
+            get: function () {
+                return null;
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(privateClassWithWithPublicGetAccessorTypes, "myPrivateStaticMethod", {
+            get: function () {
+                return null;
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(privateClassWithWithPublicGetAccessorTypes.prototype, "myPublicMethod", {
+            get: function () {
+                return null;
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(privateClassWithWithPublicGetAccessorTypes.prototype, "myPrivateMethod", {
+            get: function () {
+                return null;
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(privateClassWithWithPublicGetAccessorTypes, "myPublicStaticMethod1", {
+            get: function () {
+                return new publicClass();
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(privateClassWithWithPublicGetAccessorTypes, "myPrivateStaticMethod1", {
+            get: function () {
+                return new publicClass();
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(privateClassWithWithPublicGetAccessorTypes.prototype, "myPublicMethod1", {
+            get: function () {
+                return new publicClass();
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(privateClassWithWithPublicGetAccessorTypes.prototype, "myPrivateMethod1", {
+            get: function () {
+                return new publicClass();
+            },
+            enumerable: true,
+            configurable: true
+        });
+        return privateClassWithWithPublicGetAccessorTypes;
+    })();
+    var publicClassWithWithPrivateSetAccessorTypes = (function () {
+        function publicClassWithWithPrivateSetAccessorTypes() {
+        }
+        Object.defineProperty(publicClassWithWithPrivateSetAccessorTypes, "myPublicStaticMethod", {
+            set: function (param) {
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(publicClassWithWithPrivateSetAccessorTypes, "myPrivateStaticMethod", {
+            set: function (param) {
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(publicClassWithWithPrivateSetAccessorTypes.prototype, "myPublicMethod", {
+            set: function (param) {
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(publicClassWithWithPrivateSetAccessorTypes.prototype, "myPrivateMethod", {
+            set: function (param) {
+            },
+            enumerable: true,
+            configurable: true
+        });
+        return publicClassWithWithPrivateSetAccessorTypes;
+    })();
+    privateModule.publicClassWithWithPrivateSetAccessorTypes = publicClassWithWithPrivateSetAccessorTypes;
+    var publicClassWithWithPublicSetAccessorTypes = (function () {
+        function publicClassWithWithPublicSetAccessorTypes() {
+        }
+        Object.defineProperty(publicClassWithWithPublicSetAccessorTypes, "myPublicStaticMethod", {
+            set: function (param) {
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(publicClassWithWithPublicSetAccessorTypes, "myPrivateStaticMethod", {
+            set: function (param) {
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(publicClassWithWithPublicSetAccessorTypes.prototype, "myPublicMethod", {
+            set: function (param) {
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(publicClassWithWithPublicSetAccessorTypes.prototype, "myPrivateMethod", {
+            set: function (param) {
+            },
+            enumerable: true,
+            configurable: true
+        });
+        return publicClassWithWithPublicSetAccessorTypes;
+    })();
+    privateModule.publicClassWithWithPublicSetAccessorTypes = publicClassWithWithPublicSetAccessorTypes;
+    var privateClassWithWithPrivateSetAccessorTypes = (function () {
+        function privateClassWithWithPrivateSetAccessorTypes() {
+        }
+        Object.defineProperty(privateClassWithWithPrivateSetAccessorTypes, "myPublicStaticMethod", {
+            set: function (param) {
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(privateClassWithWithPrivateSetAccessorTypes, "myPrivateStaticMethod", {
+            set: function (param) {
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(privateClassWithWithPrivateSetAccessorTypes.prototype, "myPublicMethod", {
+            set: function (param) {
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(privateClassWithWithPrivateSetAccessorTypes.prototype, "myPrivateMethod", {
+            set: function (param) {
+            },
+            enumerable: true,
+            configurable: true
+        });
+        return privateClassWithWithPrivateSetAccessorTypes;
+    })();
+    var privateClassWithWithPublicSetAccessorTypes = (function () {
+        function privateClassWithWithPublicSetAccessorTypes() {
+        }
+        Object.defineProperty(privateClassWithWithPublicSetAccessorTypes, "myPublicStaticMethod", {
+            set: function (param) {
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(privateClassWithWithPublicSetAccessorTypes, "myPrivateStaticMethod", {
+            set: function (param) {
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(privateClassWithWithPublicSetAccessorTypes.prototype, "myPublicMethod", {
+            set: function (param) {
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(privateClassWithWithPublicSetAccessorTypes.prototype, "myPrivateMethod", {
+            set: function (param) {
+            },
+            enumerable: true,
+            configurable: true
+        });
+        return privateClassWithWithPublicSetAccessorTypes;
+    })();
+    var publicClassWithPrivateModuleGetAccessorTypes = (function () {
+        function publicClassWithPrivateModuleGetAccessorTypes() {
+        }
+        Object.defineProperty(publicClassWithPrivateModuleGetAccessorTypes, "myPublicStaticMethod", {
+            get: function () {
+                return null;
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(publicClassWithPrivateModuleGetAccessorTypes.prototype, "myPublicMethod", {
+            get: function () {
+                return null;
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(publicClassWithPrivateModuleGetAccessorTypes, "myPublicStaticMethod1", {
+            get: function () {
+                return new privateModule.publicClass();
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(publicClassWithPrivateModuleGetAccessorTypes.prototype, "myPublicMethod1", {
+            get: function () {
+                return new privateModule.publicClass();
+            },
+            enumerable: true,
+            configurable: true
+        });
+        return publicClassWithPrivateModuleGetAccessorTypes;
+    })();
+    privateModule.publicClassWithPrivateModuleGetAccessorTypes = publicClassWithPrivateModuleGetAccessorTypes;
+    var publicClassWithPrivateModuleSetAccessorTypes = (function () {
+        function publicClassWithPrivateModuleSetAccessorTypes() {
+        }
+        Object.defineProperty(publicClassWithPrivateModuleSetAccessorTypes, "myPublicStaticMethod", {
+            set: function (param) {
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(publicClassWithPrivateModuleSetAccessorTypes.prototype, "myPublicMethod", {
+            set: function (param) {
+            },
+            enumerable: true,
+            configurable: true
+        });
+        return publicClassWithPrivateModuleSetAccessorTypes;
+    })();
+    privateModule.publicClassWithPrivateModuleSetAccessorTypes = publicClassWithPrivateModuleSetAccessorTypes;
+    var privateClassWithPrivateModuleGetAccessorTypes = (function () {
+        function privateClassWithPrivateModuleGetAccessorTypes() {
+        }
+        Object.defineProperty(privateClassWithPrivateModuleGetAccessorTypes, "myPublicStaticMethod", {
+            get: function () {
+                return null;
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(privateClassWithPrivateModuleGetAccessorTypes.prototype, "myPublicMethod", {
+            get: function () {
+                return null;
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(privateClassWithPrivateModuleGetAccessorTypes, "myPublicStaticMethod1", {
+            get: function () {
+                return new privateModule.publicClass();
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(privateClassWithPrivateModuleGetAccessorTypes.prototype, "myPublicMethod1", {
+            get: function () {
+                return new privateModule.publicClass();
+            },
+            enumerable: true,
+            configurable: true
+        });
+        return privateClassWithPrivateModuleGetAccessorTypes;
+    })();
+    var privateClassWithPrivateModuleSetAccessorTypes = (function () {
+        function privateClassWithPrivateModuleSetAccessorTypes() {
+        }
+        Object.defineProperty(privateClassWithPrivateModuleSetAccessorTypes, "myPublicStaticMethod", {
+            set: function (param) {
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(privateClassWithPrivateModuleSetAccessorTypes.prototype, "myPublicMethod", {
+            set: function (param) {
+            },
+            enumerable: true,
+            configurable: true
+        });
+        return privateClassWithPrivateModuleSetAccessorTypes;
+    })();
+})(privateModule || (privateModule = {}));
+//// [privacyAccessorDeclFile_GlobalFile.js]
+var publicClassInGlobal = (function () {
+    function publicClassInGlobal() {
+    }
+    return publicClassInGlobal;
+})();
+var publicClassInGlobalWithPublicGetAccessorTypes = (function () {
+    function publicClassInGlobalWithPublicGetAccessorTypes() {
+    }
+    Object.defineProperty(publicClassInGlobalWithPublicGetAccessorTypes, "myPublicStaticMethod", {
+        get: function () {
+            return null;
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(publicClassInGlobalWithPublicGetAccessorTypes, "myPrivateStaticMethod", {
+        get: function () {
+            return null;
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(publicClassInGlobalWithPublicGetAccessorTypes.prototype, "myPublicMethod", {
+        get: function () {
+            return null;
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(publicClassInGlobalWithPublicGetAccessorTypes.prototype, "myPrivateMethod", {
+        get: function () {
+            return null;
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(publicClassInGlobalWithPublicGetAccessorTypes, "myPublicStaticMethod1", {
+        get: function () {
+            return new publicClassInGlobal();
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(publicClassInGlobalWithPublicGetAccessorTypes, "myPrivateStaticMethod1", {
+        get: function () {
+            return new publicClassInGlobal();
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(publicClassInGlobalWithPublicGetAccessorTypes.prototype, "myPublicMethod1", {
+        get: function () {
+            return new publicClassInGlobal();
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(publicClassInGlobalWithPublicGetAccessorTypes.prototype, "myPrivateMethod1", {
+        get: function () {
+            return new publicClassInGlobal();
+        },
+        enumerable: true,
+        configurable: true
+    });
+    return publicClassInGlobalWithPublicGetAccessorTypes;
+})();
+var publicClassInGlobalWithWithPublicSetAccessorTypes = (function () {
+    function publicClassInGlobalWithWithPublicSetAccessorTypes() {
+    }
+    Object.defineProperty(publicClassInGlobalWithWithPublicSetAccessorTypes, "myPublicStaticMethod", {
+        set: function (param) {
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(publicClassInGlobalWithWithPublicSetAccessorTypes, "myPrivateStaticMethod", {
+        set: function (param) {
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(publicClassInGlobalWithWithPublicSetAccessorTypes.prototype, "myPublicMethod", {
+        set: function (param) {
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(publicClassInGlobalWithWithPublicSetAccessorTypes.prototype, "myPrivateMethod", {
+        set: function (param) {
+        },
+        enumerable: true,
+        configurable: true
+    });
+    return publicClassInGlobalWithWithPublicSetAccessorTypes;
+})();
+var publicModuleInGlobal;
+(function (publicModuleInGlobal) {
+    var privateClass = (function () {
+        function privateClass() {
+        }
+        return privateClass;
+    })();
+    var publicClass = (function () {
+        function publicClass() {
+        }
+        return publicClass;
+    })();
+    publicModuleInGlobal.publicClass = publicClass;
+    var privateModule;
+    (function (privateModule) {
+        var privateClass = (function () {
+            function privateClass() {
+            }
+            return privateClass;
+        })();
+        var publicClass = (function () {
+            function publicClass() {
+            }
+            return publicClass;
+        })();
+        privateModule.publicClass = publicClass;
+        var publicClassWithWithPrivateGetAccessorTypes = (function () {
+            function publicClassWithWithPrivateGetAccessorTypes() {
+            }
+            Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes, "myPublicStaticMethod", {
+                get: function () {
+                    return null;
+                },
+                enumerable: true,
+                configurable: true
+            });
+            Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes, "myPrivateStaticMethod", {
+                get: function () {
+                    return null;
+                },
+                enumerable: true,
+                configurable: true
+            });
+            Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes.prototype, "myPublicMethod", {
+                get: function () {
+                    return null;
+                },
+                enumerable: true,
+                configurable: true
+            });
+            Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes.prototype, "myPrivateMethod", {
+                get: function () {
+                    return null;
+                },
+                enumerable: true,
+                configurable: true
+            });
+            Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes, "myPublicStaticMethod1", {
+                get: function () {
+                    return new privateClass();
+                },
+                enumerable: true,
+                configurable: true
+            });
+            Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes, "myPrivateStaticMethod1", {
+                get: function () {
+                    return new privateClass();
+                },
+                enumerable: true,
+                configurable: true
+            });
+            Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes.prototype, "myPublicMethod1", {
+                get: function () {
+                    return new privateClass();
+                },
+                enumerable: true,
+                configurable: true
+            });
+            Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes.prototype, "myPrivateMethod1", {
+                get: function () {
+                    return new privateClass();
+                },
+                enumerable: true,
+                configurable: true
+            });
+            return publicClassWithWithPrivateGetAccessorTypes;
+        })();
+        privateModule.publicClassWithWithPrivateGetAccessorTypes = publicClassWithWithPrivateGetAccessorTypes;
+        var publicClassWithWithPublicGetAccessorTypes = (function () {
+            function publicClassWithWithPublicGetAccessorTypes() {
+            }
+            Object.defineProperty(publicClassWithWithPublicGetAccessorTypes, "myPublicStaticMethod", {
+                get: function () {
+                    return null;
+                },
+                enumerable: true,
+                configurable: true
+            });
+            Object.defineProperty(publicClassWithWithPublicGetAccessorTypes, "myPrivateStaticMethod", {
+                get: function () {
+                    return null;
+                },
+                enumerable: true,
+                configurable: true
+            });
+            Object.defineProperty(publicClassWithWithPublicGetAccessorTypes.prototype, "myPublicMethod", {
+                get: function () {
+                    return null;
+                },
+                enumerable: true,
+                configurable: true
+            });
+            Object.defineProperty(publicClassWithWithPublicGetAccessorTypes.prototype, "myPrivateMethod", {
+                get: function () {
+                    return null;
+                },
+                enumerable: true,
+                configurable: true
+            });
+            Object.defineProperty(publicClassWithWithPublicGetAccessorTypes, "myPublicStaticMethod1", {
+                get: function () {
+                    return new publicClass();
+                },
+                enumerable: true,
+                configurable: true
+            });
+            Object.defineProperty(publicClassWithWithPublicGetAccessorTypes, "myPrivateStaticMethod1", {
+                get: function () {
+                    return new publicClass();
+                },
+                enumerable: true,
+                configurable: true
+            });
+            Object.defineProperty(publicClassWithWithPublicGetAccessorTypes.prototype, "myPublicMethod1", {
+                get: function () {
+                    return new publicClass();
+                },
+                enumerable: true,
+                configurable: true
+            });
+            Object.defineProperty(publicClassWithWithPublicGetAccessorTypes.prototype, "myPrivateMethod1", {
+                get: function () {
+                    return new publicClass();
+                },
+                enumerable: true,
+                configurable: true
+            });
+            return publicClassWithWithPublicGetAccessorTypes;
+        })();
+        privateModule.publicClassWithWithPublicGetAccessorTypes = publicClassWithWithPublicGetAccessorTypes;
+        var privateClassWithWithPrivateGetAccessorTypes = (function () {
+            function privateClassWithWithPrivateGetAccessorTypes() {
+            }
+            Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes, "myPublicStaticMethod", {
+                get: function () {
+                    return null;
+                },
+                enumerable: true,
+                configurable: true
+            });
+            Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes, "myPrivateStaticMethod", {
+                get: function () {
+                    return null;
+                },
+                enumerable: true,
+                configurable: true
+            });
+            Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes.prototype, "myPublicMethod", {
+                get: function () {
+                    return null;
+                },
+                enumerable: true,
+                configurable: true
+            });
+            Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes.prototype, "myPrivateMethod", {
+                get: function () {
+                    return null;
+                },
+                enumerable: true,
+                configurable: true
+            });
+            Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes, "myPublicStaticMethod1", {
+                get: function () {
+                    return new privateClass();
+                },
+                enumerable: true,
+                configurable: true
+            });
+            Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes, "myPrivateStaticMethod1", {
+                get: function () {
+                    return new privateClass();
+                },
+                enumerable: true,
+                configurable: true
+            });
+            Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes.prototype, "myPublicMethod1", {
+                get: function () {
+                    return new privateClass();
+                },
+                enumerable: true,
+                configurable: true
+            });
+            Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes.prototype, "myPrivateMethod1", {
+                get: function () {
+                    return new privateClass();
+                },
+                enumerable: true,
+                configurable: true
+            });
+            return privateClassWithWithPrivateGetAccessorTypes;
+        })();
+        var privateClassWithWithPublicGetAccessorTypes = (function () {
+            function privateClassWithWithPublicGetAccessorTypes() {
+            }
+            Object.defineProperty(privateClassWithWithPublicGetAccessorTypes, "myPublicStaticMethod", {
+                get: function () {
+                    return null;
+                },
+                enumerable: true,
+                configurable: true
+            });
+            Object.defineProperty(privateClassWithWithPublicGetAccessorTypes, "myPrivateStaticMethod", {
+                get: function () {
+                    return null;
+                },
+                enumerable: true,
+                configurable: true
+            });
+            Object.defineProperty(privateClassWithWithPublicGetAccessorTypes.prototype, "myPublicMethod", {
+                get: function () {
+                    return null;
+                },
+                enumerable: true,
+                configurable: true
+            });
+            Object.defineProperty(privateClassWithWithPublicGetAccessorTypes.prototype, "myPrivateMethod", {
+                get: function () {
+                    return null;
+                },
+                enumerable: true,
+                configurable: true
+            });
+            Object.defineProperty(privateClassWithWithPublicGetAccessorTypes, "myPublicStaticMethod1", {
+                get: function () {
+                    return new publicClass();
+                },
+                enumerable: true,
+                configurable: true
+            });
+            Object.defineProperty(privateClassWithWithPublicGetAccessorTypes, "myPrivateStaticMethod1", {
+                get: function () {
+                    return new publicClass();
+                },
+                enumerable: true,
+                configurable: true
+            });
+            Object.defineProperty(privateClassWithWithPublicGetAccessorTypes.prototype, "myPublicMethod1", {
+                get: function () {
+                    return new publicClass();
+                },
+                enumerable: true,
+                configurable: true
+            });
+            Object.defineProperty(privateClassWithWithPublicGetAccessorTypes.prototype, "myPrivateMethod1", {
+                get: function () {
+                    return new publicClass();
+                },
+                enumerable: true,
+                configurable: true
+            });
+            return privateClassWithWithPublicGetAccessorTypes;
+        })();
+        var publicClassWithWithPrivateSetAccessorTypes = (function () {
+            function publicClassWithWithPrivateSetAccessorTypes() {
+            }
+            Object.defineProperty(publicClassWithWithPrivateSetAccessorTypes, "myPublicStaticMethod", {
+                set: function (param) {
+                },
+                enumerable: true,
+                configurable: true
+            });
+            Object.defineProperty(publicClassWithWithPrivateSetAccessorTypes, "myPrivateStaticMethod", {
+                set: function (param) {
+                },
+                enumerable: true,
+                configurable: true
+            });
+            Object.defineProperty(publicClassWithWithPrivateSetAccessorTypes.prototype, "myPublicMethod", {
+                set: function (param) {
+                },
+                enumerable: true,
+                configurable: true
+            });
+            Object.defineProperty(publicClassWithWithPrivateSetAccessorTypes.prototype, "myPrivateMethod", {
+                set: function (param) {
+                },
+                enumerable: true,
+                configurable: true
+            });
+            return publicClassWithWithPrivateSetAccessorTypes;
+        })();
+        privateModule.publicClassWithWithPrivateSetAccessorTypes = publicClassWithWithPrivateSetAccessorTypes;
+        var publicClassWithWithPublicSetAccessorTypes = (function () {
+            function publicClassWithWithPublicSetAccessorTypes() {
+            }
+            Object.defineProperty(publicClassWithWithPublicSetAccessorTypes, "myPublicStaticMethod", {
+                set: function (param) {
+                },
+                enumerable: true,
+                configurable: true
+            });
+            Object.defineProperty(publicClassWithWithPublicSetAccessorTypes, "myPrivateStaticMethod", {
+                set: function (param) {
+                },
+                enumerable: true,
+                configurable: true
+            });
+            Object.defineProperty(publicClassWithWithPublicSetAccessorTypes.prototype, "myPublicMethod", {
+                set: function (param) {
+                },
+                enumerable: true,
+                configurable: true
+            });
+            Object.defineProperty(publicClassWithWithPublicSetAccessorTypes.prototype, "myPrivateMethod", {
+                set: function (param) {
+                },
+                enumerable: true,
+                configurable: true
+            });
+            return publicClassWithWithPublicSetAccessorTypes;
+        })();
+        privateModule.publicClassWithWithPublicSetAccessorTypes = publicClassWithWithPublicSetAccessorTypes;
+        var privateClassWithWithPrivateSetAccessorTypes = (function () {
+            function privateClassWithWithPrivateSetAccessorTypes() {
+            }
+            Object.defineProperty(privateClassWithWithPrivateSetAccessorTypes, "myPublicStaticMethod", {
+                set: function (param) {
+                },
+                enumerable: true,
+                configurable: true
+            });
+            Object.defineProperty(privateClassWithWithPrivateSetAccessorTypes, "myPrivateStaticMethod", {
+                set: function (param) {
+                },
+                enumerable: true,
+                configurable: true
+            });
+            Object.defineProperty(privateClassWithWithPrivateSetAccessorTypes.prototype, "myPublicMethod", {
+                set: function (param) {
+                },
+                enumerable: true,
+                configurable: true
+            });
+            Object.defineProperty(privateClassWithWithPrivateSetAccessorTypes.prototype, "myPrivateMethod", {
+                set: function (param) {
+                },
+                enumerable: true,
+                configurable: true
+            });
+            return privateClassWithWithPrivateSetAccessorTypes;
+        })();
+        var privateClassWithWithPublicSetAccessorTypes = (function () {
+            function privateClassWithWithPublicSetAccessorTypes() {
+            }
+            Object.defineProperty(privateClassWithWithPublicSetAccessorTypes, "myPublicStaticMethod", {
+                set: function (param) {
+                },
+                enumerable: true,
+                configurable: true
+            });
+            Object.defineProperty(privateClassWithWithPublicSetAccessorTypes, "myPrivateStaticMethod", {
+                set: function (param) {
+                },
+                enumerable: true,
+                configurable: true
+            });
+            Object.defineProperty(privateClassWithWithPublicSetAccessorTypes.prototype, "myPublicMethod", {
+                set: function (param) {
+                },
+                enumerable: true,
+                configurable: true
+            });
+            Object.defineProperty(privateClassWithWithPublicSetAccessorTypes.prototype, "myPrivateMethod", {
+                set: function (param) {
+                },
+                enumerable: true,
+                configurable: true
+            });
+            return privateClassWithWithPublicSetAccessorTypes;
+        })();
+        var publicClassWithPrivateModuleGetAccessorTypes = (function () {
+            function publicClassWithPrivateModuleGetAccessorTypes() {
+            }
+            Object.defineProperty(publicClassWithPrivateModuleGetAccessorTypes, "myPublicStaticMethod", {
+                get: function () {
+                    return null;
+                },
+                enumerable: true,
+                configurable: true
+            });
+            Object.defineProperty(publicClassWithPrivateModuleGetAccessorTypes.prototype, "myPublicMethod", {
+                get: function () {
+                    return null;
+                },
+                enumerable: true,
+                configurable: true
+            });
+            Object.defineProperty(publicClassWithPrivateModuleGetAccessorTypes, "myPublicStaticMethod1", {
+                get: function () {
+                    return new privateModule.publicClass();
+                },
+                enumerable: true,
+                configurable: true
+            });
+            Object.defineProperty(publicClassWithPrivateModuleGetAccessorTypes.prototype, "myPublicMethod1", {
+                get: function () {
+                    return new privateModule.publicClass();
+                },
+                enumerable: true,
+                configurable: true
+            });
+            return publicClassWithPrivateModuleGetAccessorTypes;
+        })();
+        privateModule.publicClassWithPrivateModuleGetAccessorTypes = publicClassWithPrivateModuleGetAccessorTypes;
+        var publicClassWithPrivateModuleSetAccessorTypes = (function () {
+            function publicClassWithPrivateModuleSetAccessorTypes() {
+            }
+            Object.defineProperty(publicClassWithPrivateModuleSetAccessorTypes, "myPublicStaticMethod", {
+                set: function (param) {
+                },
+                enumerable: true,
+                configurable: true
+            });
+            Object.defineProperty(publicClassWithPrivateModuleSetAccessorTypes.prototype, "myPublicMethod", {
+                set: function (param) {
+                },
+                enumerable: true,
+                configurable: true
+            });
+            return publicClassWithPrivateModuleSetAccessorTypes;
+        })();
+        privateModule.publicClassWithPrivateModuleSetAccessorTypes = publicClassWithPrivateModuleSetAccessorTypes;
+        var privateClassWithPrivateModuleGetAccessorTypes = (function () {
+            function privateClassWithPrivateModuleGetAccessorTypes() {
+            }
+            Object.defineProperty(privateClassWithPrivateModuleGetAccessorTypes, "myPublicStaticMethod", {
+                get: function () {
+                    return null;
+                },
+                enumerable: true,
+                configurable: true
+            });
+            Object.defineProperty(privateClassWithPrivateModuleGetAccessorTypes.prototype, "myPublicMethod", {
+                get: function () {
+                    return null;
+                },
+                enumerable: true,
+                configurable: true
+            });
+            Object.defineProperty(privateClassWithPrivateModuleGetAccessorTypes, "myPublicStaticMethod1", {
+                get: function () {
+                    return new privateModule.publicClass();
+                },
+                enumerable: true,
+                configurable: true
+            });
+            Object.defineProperty(privateClassWithPrivateModuleGetAccessorTypes.prototype, "myPublicMethod1", {
+                get: function () {
+                    return new privateModule.publicClass();
+                },
+                enumerable: true,
+                configurable: true
+            });
+            return privateClassWithPrivateModuleGetAccessorTypes;
+        })();
+        var privateClassWithPrivateModuleSetAccessorTypes = (function () {
+            function privateClassWithPrivateModuleSetAccessorTypes() {
+            }
+            Object.defineProperty(privateClassWithPrivateModuleSetAccessorTypes, "myPublicStaticMethod", {
+                set: function (param) {
+                },
+                enumerable: true,
+                configurable: true
+            });
+            Object.defineProperty(privateClassWithPrivateModuleSetAccessorTypes.prototype, "myPublicMethod", {
+                set: function (param) {
+                },
+                enumerable: true,
+                configurable: true
+            });
+            return privateClassWithPrivateModuleSetAccessorTypes;
+        })();
+    })(privateModule || (privateModule = {}));
+    var publicClassWithWithPrivateGetAccessorTypes = (function () {
+        function publicClassWithWithPrivateGetAccessorTypes() {
+        }
+        Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes, "myPublicStaticMethod", {
+            get: function () {
+                return null;
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes, "myPrivateStaticMethod", {
+            get: function () {
+                return null;
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes.prototype, "myPublicMethod", {
+            get: function () {
+                return null;
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes.prototype, "myPrivateMethod", {
+            get: function () {
+                return null;
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes, "myPublicStaticMethod1", {
+            get: function () {
+                return new privateClass();
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes, "myPrivateStaticMethod1", {
+            get: function () {
+                return new privateClass();
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes.prototype, "myPublicMethod1", {
+            get: function () {
+                return new privateClass();
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes.prototype, "myPrivateMethod1", {
+            get: function () {
+                return new privateClass();
+            },
+            enumerable: true,
+            configurable: true
+        });
+        return publicClassWithWithPrivateGetAccessorTypes;
+    })();
+    publicModuleInGlobal.publicClassWithWithPrivateGetAccessorTypes = publicClassWithWithPrivateGetAccessorTypes;
+    var publicClassWithWithPublicGetAccessorTypes = (function () {
+        function publicClassWithWithPublicGetAccessorTypes() {
+        }
+        Object.defineProperty(publicClassWithWithPublicGetAccessorTypes, "myPublicStaticMethod", {
+            get: function () {
+                return null;
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(publicClassWithWithPublicGetAccessorTypes, "myPrivateStaticMethod", {
+            get: function () {
+                return null;
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(publicClassWithWithPublicGetAccessorTypes.prototype, "myPublicMethod", {
+            get: function () {
+                return null;
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(publicClassWithWithPublicGetAccessorTypes.prototype, "myPrivateMethod", {
+            get: function () {
+                return null;
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(publicClassWithWithPublicGetAccessorTypes, "myPublicStaticMethod1", {
+            get: function () {
+                return new publicClass();
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(publicClassWithWithPublicGetAccessorTypes, "myPrivateStaticMethod1", {
+            get: function () {
+                return new publicClass();
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(publicClassWithWithPublicGetAccessorTypes.prototype, "myPublicMethod1", {
+            get: function () {
+                return new publicClass();
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(publicClassWithWithPublicGetAccessorTypes.prototype, "myPrivateMethod1", {
+            get: function () {
+                return new publicClass();
+            },
+            enumerable: true,
+            configurable: true
+        });
+        return publicClassWithWithPublicGetAccessorTypes;
+    })();
+    publicModuleInGlobal.publicClassWithWithPublicGetAccessorTypes = publicClassWithWithPublicGetAccessorTypes;
+    var privateClassWithWithPrivateGetAccessorTypes = (function () {
+        function privateClassWithWithPrivateGetAccessorTypes() {
+        }
+        Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes, "myPublicStaticMethod", {
+            get: function () {
+                return null;
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes, "myPrivateStaticMethod", {
+            get: function () {
+                return null;
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes.prototype, "myPublicMethod", {
+            get: function () {
+                return null;
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes.prototype, "myPrivateMethod", {
+            get: function () {
+                return null;
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes, "myPublicStaticMethod1", {
+            get: function () {
+                return new privateClass();
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes, "myPrivateStaticMethod1", {
+            get: function () {
+                return new privateClass();
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes.prototype, "myPublicMethod1", {
+            get: function () {
+                return new privateClass();
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes.prototype, "myPrivateMethod1", {
+            get: function () {
+                return new privateClass();
+            },
+            enumerable: true,
+            configurable: true
+        });
+        return privateClassWithWithPrivateGetAccessorTypes;
+    })();
+    var privateClassWithWithPublicGetAccessorTypes = (function () {
+        function privateClassWithWithPublicGetAccessorTypes() {
+        }
+        Object.defineProperty(privateClassWithWithPublicGetAccessorTypes, "myPublicStaticMethod", {
+            get: function () {
+                return null;
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(privateClassWithWithPublicGetAccessorTypes, "myPrivateStaticMethod", {
+            get: function () {
+                return null;
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(privateClassWithWithPublicGetAccessorTypes.prototype, "myPublicMethod", {
+            get: function () {
+                return null;
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(privateClassWithWithPublicGetAccessorTypes.prototype, "myPrivateMethod", {
+            get: function () {
+                return null;
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(privateClassWithWithPublicGetAccessorTypes, "myPublicStaticMethod1", {
+            get: function () {
+                return new publicClass();
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(privateClassWithWithPublicGetAccessorTypes, "myPrivateStaticMethod1", {
+            get: function () {
+                return new publicClass();
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(privateClassWithWithPublicGetAccessorTypes.prototype, "myPublicMethod1", {
+            get: function () {
+                return new publicClass();
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(privateClassWithWithPublicGetAccessorTypes.prototype, "myPrivateMethod1", {
+            get: function () {
+                return new publicClass();
+            },
+            enumerable: true,
+            configurable: true
+        });
+        return privateClassWithWithPublicGetAccessorTypes;
+    })();
+    var publicClassWithWithPrivateSetAccessorTypes = (function () {
+        function publicClassWithWithPrivateSetAccessorTypes() {
+        }
+        Object.defineProperty(publicClassWithWithPrivateSetAccessorTypes, "myPublicStaticMethod", {
+            set: function (param) {
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(publicClassWithWithPrivateSetAccessorTypes, "myPrivateStaticMethod", {
+            set: function (param) {
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(publicClassWithWithPrivateSetAccessorTypes.prototype, "myPublicMethod", {
+            set: function (param) {
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(publicClassWithWithPrivateSetAccessorTypes.prototype, "myPrivateMethod", {
+            set: function (param) {
+            },
+            enumerable: true,
+            configurable: true
+        });
+        return publicClassWithWithPrivateSetAccessorTypes;
+    })();
+    publicModuleInGlobal.publicClassWithWithPrivateSetAccessorTypes = publicClassWithWithPrivateSetAccessorTypes;
+    var publicClassWithWithPublicSetAccessorTypes = (function () {
+        function publicClassWithWithPublicSetAccessorTypes() {
+        }
+        Object.defineProperty(publicClassWithWithPublicSetAccessorTypes, "myPublicStaticMethod", {
+            set: function (param) {
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(publicClassWithWithPublicSetAccessorTypes, "myPrivateStaticMethod", {
+            set: function (param) {
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(publicClassWithWithPublicSetAccessorTypes.prototype, "myPublicMethod", {
+            set: function (param) {
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(publicClassWithWithPublicSetAccessorTypes.prototype, "myPrivateMethod", {
+            set: function (param) {
+            },
+            enumerable: true,
+            configurable: true
+        });
+        return publicClassWithWithPublicSetAccessorTypes;
+    })();
+    publicModuleInGlobal.publicClassWithWithPublicSetAccessorTypes = publicClassWithWithPublicSetAccessorTypes;
+    var privateClassWithWithPrivateSetAccessorTypes = (function () {
+        function privateClassWithWithPrivateSetAccessorTypes() {
+        }
+        Object.defineProperty(privateClassWithWithPrivateSetAccessorTypes, "myPublicStaticMethod", {
+            set: function (param) {
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(privateClassWithWithPrivateSetAccessorTypes, "myPrivateStaticMethod", {
+            set: function (param) {
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(privateClassWithWithPrivateSetAccessorTypes.prototype, "myPublicMethod", {
+            set: function (param) {
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(privateClassWithWithPrivateSetAccessorTypes.prototype, "myPrivateMethod", {
+            set: function (param) {
+            },
+            enumerable: true,
+            configurable: true
+        });
+        return privateClassWithWithPrivateSetAccessorTypes;
+    })();
+    var privateClassWithWithPublicSetAccessorTypes = (function () {
+        function privateClassWithWithPublicSetAccessorTypes() {
+        }
+        Object.defineProperty(privateClassWithWithPublicSetAccessorTypes, "myPublicStaticMethod", {
+            set: function (param) {
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(privateClassWithWithPublicSetAccessorTypes, "myPrivateStaticMethod", {
+            set: function (param) {
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(privateClassWithWithPublicSetAccessorTypes.prototype, "myPublicMethod", {
+            set: function (param) {
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(privateClassWithWithPublicSetAccessorTypes.prototype, "myPrivateMethod", {
+            set: function (param) {
+            },
+            enumerable: true,
+            configurable: true
+        });
+        return privateClassWithWithPublicSetAccessorTypes;
+    })();
+    var publicClassWithPrivateModuleGetAccessorTypes = (function () {
+        function publicClassWithPrivateModuleGetAccessorTypes() {
+        }
+        Object.defineProperty(publicClassWithPrivateModuleGetAccessorTypes, "myPublicStaticMethod", {
+            get: function () {
+                return null;
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(publicClassWithPrivateModuleGetAccessorTypes.prototype, "myPublicMethod", {
+            get: function () {
+                return null;
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(publicClassWithPrivateModuleGetAccessorTypes, "myPublicStaticMethod1", {
+            get: function () {
+                return new privateModule.publicClass();
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(publicClassWithPrivateModuleGetAccessorTypes.prototype, "myPublicMethod1", {
+            get: function () {
+                return new privateModule.publicClass();
+            },
+            enumerable: true,
+            configurable: true
+        });
+        return publicClassWithPrivateModuleGetAccessorTypes;
+    })();
+    publicModuleInGlobal.publicClassWithPrivateModuleGetAccessorTypes = publicClassWithPrivateModuleGetAccessorTypes;
+    var publicClassWithPrivateModuleSetAccessorTypes = (function () {
+        function publicClassWithPrivateModuleSetAccessorTypes() {
+        }
+        Object.defineProperty(publicClassWithPrivateModuleSetAccessorTypes, "myPublicStaticMethod", {
+            set: function (param) {
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(publicClassWithPrivateModuleSetAccessorTypes.prototype, "myPublicMethod", {
+            set: function (param) {
+            },
+            enumerable: true,
+            configurable: true
+        });
+        return publicClassWithPrivateModuleSetAccessorTypes;
+    })();
+    publicModuleInGlobal.publicClassWithPrivateModuleSetAccessorTypes = publicClassWithPrivateModuleSetAccessorTypes;
+    var privateClassWithPrivateModuleGetAccessorTypes = (function () {
+        function privateClassWithPrivateModuleGetAccessorTypes() {
+        }
+        Object.defineProperty(privateClassWithPrivateModuleGetAccessorTypes, "myPublicStaticMethod", {
+            get: function () {
+                return null;
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(privateClassWithPrivateModuleGetAccessorTypes.prototype, "myPublicMethod", {
+            get: function () {
+                return null;
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(privateClassWithPrivateModuleGetAccessorTypes, "myPublicStaticMethod1", {
+            get: function () {
+                return new privateModule.publicClass();
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(privateClassWithPrivateModuleGetAccessorTypes.prototype, "myPublicMethod1", {
+            get: function () {
+                return new privateModule.publicClass();
+            },
+            enumerable: true,
+            configurable: true
+        });
+        return privateClassWithPrivateModuleGetAccessorTypes;
+    })();
+    var privateClassWithPrivateModuleSetAccessorTypes = (function () {
+        function privateClassWithPrivateModuleSetAccessorTypes() {
+        }
+        Object.defineProperty(privateClassWithPrivateModuleSetAccessorTypes, "myPublicStaticMethod", {
+            set: function (param) {
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(privateClassWithPrivateModuleSetAccessorTypes.prototype, "myPublicMethod", {
+            set: function (param) {
+            },
+            enumerable: true,
+            configurable: true
+        });
+        return privateClassWithPrivateModuleSetAccessorTypes;
+    })();
+})(publicModuleInGlobal || (publicModuleInGlobal = {}));
diff --git a/tests/baselines/reference/privacyCannotNameAccessorDeclFile.errors.txt b/tests/baselines/reference/privacyCannotNameAccessorDeclFile.errors.txt
new file mode 100644
index 00000000000..4f7f684d073
--- /dev/null
+++ b/tests/baselines/reference/privacyCannotNameAccessorDeclFile.errors.txt
@@ -0,0 +1,151 @@
+==== tests/cases/compiler/privacyCannotNameAccessorDeclFile_consumer.ts (8 errors) ====
+    import exporter = require("privacyCannotNameAccessorDeclFile_exporter");
+    export class publicClassWithWithPrivateGetAccessorTypes {
+        static get myPublicStaticMethod() { // Error
+                   ~~~~~~~~~~~~~~~~~~~~
+!!! Return type of public static property getter from exported class has or is using name 'Widget1' from external module "tests/cases/compiler/privacyCannotNameAccessorDeclFile_Widgets" but cannot be named.
+            return exporter.createExportedWidget1();
+        }
+        private static get myPrivateStaticMethod() {
+            return exporter.createExportedWidget1();
+        }
+        get myPublicMethod() { // Error
+            ~~~~~~~~~~~~~~
+!!! Return type of public property getter from exported class has or is using name 'Widget1' from external module "tests/cases/compiler/privacyCannotNameAccessorDeclFile_Widgets" but cannot be named.
+            return exporter.createExportedWidget1();
+        }
+        private get myPrivateMethod() {
+            return exporter.createExportedWidget1();
+        }
+        static get myPublicStaticMethod1() { // Error
+                   ~~~~~~~~~~~~~~~~~~~~~
+!!! Return type of public static property getter from exported class has or is using name 'Widget3' from external module "GlobalWidgets" but cannot be named.
+            return exporter.createExportedWidget3();
+        }
+        private static get myPrivateStaticMethod1() {
+            return exporter.createExportedWidget3();
+        }
+        get myPublicMethod1() { // Error
+            ~~~~~~~~~~~~~~~
+!!! Return type of public property getter from exported class has or is using name 'Widget3' from external module "GlobalWidgets" but cannot be named.
+            return exporter.createExportedWidget3();
+        }
+        private get myPrivateMethod1() {
+            return exporter.createExportedWidget3();
+        }
+    }
+    
+    class privateClassWithWithPrivateGetAccessorTypes {
+        static get myPublicStaticMethod() { 
+            return exporter.createExportedWidget1();
+        }
+        private static get myPrivateStaticMethod() {
+            return exporter.createExportedWidget1();
+        }
+        get myPublicMethod() { 
+            return exporter.createExportedWidget1();
+        }
+        private get myPrivateMethod() {
+            return exporter.createExportedWidget1();
+        }
+        static get myPublicStaticMethod1() { 
+            return exporter.createExportedWidget3();
+        }
+        private static get myPrivateStaticMethod1() {
+            return exporter.createExportedWidget3();
+        }
+        get myPublicMethod1() { 
+            return exporter.createExportedWidget3();
+        }
+        private get myPrivateMethod1() {
+            return exporter.createExportedWidget3();
+        }
+    }
+    
+    export class publicClassWithPrivateModuleGetAccessorTypes {
+        static get myPublicStaticMethod() { // Error
+                   ~~~~~~~~~~~~~~~~~~~~
+!!! Return type of public static property getter from exported class has or is using name 'SpecializedWidget.Widget2' from external module "tests/cases/compiler/privacyCannotNameAccessorDeclFile_Widgets" but cannot be named.
+            return exporter.createExportedWidget2();
+        }
+        get myPublicMethod() { // Error
+            ~~~~~~~~~~~~~~
+!!! Return type of public property getter from exported class has or is using name 'SpecializedWidget.Widget2' from external module "tests/cases/compiler/privacyCannotNameAccessorDeclFile_Widgets" but cannot be named.
+            return exporter.createExportedWidget2();
+        }
+        static get myPublicStaticMethod1() { // Error
+                   ~~~~~~~~~~~~~~~~~~~~~
+!!! Return type of public static property getter from exported class has or is using name 'SpecializedGlobalWidget.Widget4' from external module "GlobalWidgets" but cannot be named.
+            return exporter.createExportedWidget4();
+        }
+        get myPublicMethod1() { // Error
+            ~~~~~~~~~~~~~~~
+!!! Return type of public property getter from exported class has or is using name 'SpecializedGlobalWidget.Widget4' from external module "GlobalWidgets" but cannot be named.
+            return exporter.createExportedWidget4();
+        }
+    }
+    
+    class privateClassWithPrivateModuleGetAccessorTypes {
+        static get myPublicStaticMethod() { 
+            return exporter.createExportedWidget2();
+        }
+        get myPublicMethod() { 
+            return exporter.createExportedWidget2();
+        }
+        static get myPublicStaticMethod1() { 
+            return exporter.createExportedWidget4();
+        }
+        get myPublicMethod1() { 
+            return exporter.createExportedWidget4();
+        }
+    }
+==== tests/cases/compiler/privacyCannotNameAccessorDeclFile_GlobalWidgets.ts (0 errors) ====
+    
+    declare module "GlobalWidgets" {
+        export class Widget3 {
+            name: string;
+        }
+        export function createWidget3(): Widget3;
+    
+        export module SpecializedGlobalWidget {
+            export class Widget4 {
+                name: string;
+            }
+            function createWidget4(): Widget4;
+        }
+    }
+    
+==== tests/cases/compiler/privacyCannotNameAccessorDeclFile_Widgets.ts (0 errors) ====
+    export class Widget1 {
+        name = 'one';
+    }
+    export function createWidget1() {
+        return new Widget1();
+    }
+    
+    export module SpecializedWidget {
+        export class Widget2 {
+            name = 'one';
+        }
+        export function createWidget2() {
+            return new Widget2();
+        }
+    }
+    
+==== tests/cases/compiler/privacyCannotNameAccessorDeclFile_exporter.ts (0 errors) ====
+    ///<reference path='privacyCannotNameAccessorDeclFile_GlobalWidgets.ts'/>
+    import Widgets = require("privacyCannotNameAccessorDeclFile_Widgets");
+    import Widgets1 = require("GlobalWidgets");
+    export function createExportedWidget1() {
+        return Widgets.createWidget1();
+    }
+    export function createExportedWidget2() {
+        return Widgets.SpecializedWidget.createWidget2();
+    }
+    export function createExportedWidget3() {
+        return Widgets1.createWidget3();
+    }
+    export function createExportedWidget4() {
+        return Widgets1.SpecializedGlobalWidget.createWidget4();
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/privacyCannotNameAccessorDeclFile.js b/tests/baselines/reference/privacyCannotNameAccessorDeclFile.js
new file mode 100644
index 00000000000..fb8a9c8e241
--- /dev/null
+++ b/tests/baselines/reference/privacyCannotNameAccessorDeclFile.js
@@ -0,0 +1,411 @@
+//// [tests/cases/compiler/privacyCannotNameAccessorDeclFile.ts] ////
+
+//// [privacyCannotNameAccessorDeclFile_GlobalWidgets.ts]
+
+declare module "GlobalWidgets" {
+    export class Widget3 {
+        name: string;
+    }
+    export function createWidget3(): Widget3;
+
+    export module SpecializedGlobalWidget {
+        export class Widget4 {
+            name: string;
+        }
+        function createWidget4(): Widget4;
+    }
+}
+
+//// [privacyCannotNameAccessorDeclFile_Widgets.ts]
+export class Widget1 {
+    name = 'one';
+}
+export function createWidget1() {
+    return new Widget1();
+}
+
+export module SpecializedWidget {
+    export class Widget2 {
+        name = 'one';
+    }
+    export function createWidget2() {
+        return new Widget2();
+    }
+}
+
+//// [privacyCannotNameAccessorDeclFile_exporter.ts]
+///<reference path='privacyCannotNameAccessorDeclFile_GlobalWidgets.ts'/>
+import Widgets = require("privacyCannotNameAccessorDeclFile_Widgets");
+import Widgets1 = require("GlobalWidgets");
+export function createExportedWidget1() {
+    return Widgets.createWidget1();
+}
+export function createExportedWidget2() {
+    return Widgets.SpecializedWidget.createWidget2();
+}
+export function createExportedWidget3() {
+    return Widgets1.createWidget3();
+}
+export function createExportedWidget4() {
+    return Widgets1.SpecializedGlobalWidget.createWidget4();
+}
+
+//// [privacyCannotNameAccessorDeclFile_consumer.ts]
+import exporter = require("privacyCannotNameAccessorDeclFile_exporter");
+export class publicClassWithWithPrivateGetAccessorTypes {
+    static get myPublicStaticMethod() { // Error
+        return exporter.createExportedWidget1();
+    }
+    private static get myPrivateStaticMethod() {
+        return exporter.createExportedWidget1();
+    }
+    get myPublicMethod() { // Error
+        return exporter.createExportedWidget1();
+    }
+    private get myPrivateMethod() {
+        return exporter.createExportedWidget1();
+    }
+    static get myPublicStaticMethod1() { // Error
+        return exporter.createExportedWidget3();
+    }
+    private static get myPrivateStaticMethod1() {
+        return exporter.createExportedWidget3();
+    }
+    get myPublicMethod1() { // Error
+        return exporter.createExportedWidget3();
+    }
+    private get myPrivateMethod1() {
+        return exporter.createExportedWidget3();
+    }
+}
+
+class privateClassWithWithPrivateGetAccessorTypes {
+    static get myPublicStaticMethod() { 
+        return exporter.createExportedWidget1();
+    }
+    private static get myPrivateStaticMethod() {
+        return exporter.createExportedWidget1();
+    }
+    get myPublicMethod() { 
+        return exporter.createExportedWidget1();
+    }
+    private get myPrivateMethod() {
+        return exporter.createExportedWidget1();
+    }
+    static get myPublicStaticMethod1() { 
+        return exporter.createExportedWidget3();
+    }
+    private static get myPrivateStaticMethod1() {
+        return exporter.createExportedWidget3();
+    }
+    get myPublicMethod1() { 
+        return exporter.createExportedWidget3();
+    }
+    private get myPrivateMethod1() {
+        return exporter.createExportedWidget3();
+    }
+}
+
+export class publicClassWithPrivateModuleGetAccessorTypes {
+    static get myPublicStaticMethod() { // Error
+        return exporter.createExportedWidget2();
+    }
+    get myPublicMethod() { // Error
+        return exporter.createExportedWidget2();
+    }
+    static get myPublicStaticMethod1() { // Error
+        return exporter.createExportedWidget4();
+    }
+    get myPublicMethod1() { // Error
+        return exporter.createExportedWidget4();
+    }
+}
+
+class privateClassWithPrivateModuleGetAccessorTypes {
+    static get myPublicStaticMethod() { 
+        return exporter.createExportedWidget2();
+    }
+    get myPublicMethod() { 
+        return exporter.createExportedWidget2();
+    }
+    static get myPublicStaticMethod1() { 
+        return exporter.createExportedWidget4();
+    }
+    get myPublicMethod1() { 
+        return exporter.createExportedWidget4();
+    }
+}
+
+//// [privacyCannotNameAccessorDeclFile_GlobalWidgets.js]
+//// [privacyCannotNameAccessorDeclFile_Widgets.js]
+var Widget1 = (function () {
+    function Widget1() {
+        this.name = 'one';
+    }
+    return Widget1;
+})();
+exports.Widget1 = Widget1;
+function createWidget1() {
+    return new Widget1();
+}
+exports.createWidget1 = createWidget1;
+(function (SpecializedWidget) {
+    var Widget2 = (function () {
+        function Widget2() {
+            this.name = 'one';
+        }
+        return Widget2;
+    })();
+    SpecializedWidget.Widget2 = Widget2;
+    function createWidget2() {
+        return new Widget2();
+    }
+    SpecializedWidget.createWidget2 = createWidget2;
+})(exports.SpecializedWidget || (exports.SpecializedWidget = {}));
+var SpecializedWidget = exports.SpecializedWidget;
+//// [privacyCannotNameAccessorDeclFile_exporter.js]
+///<reference path='privacyCannotNameAccessorDeclFile_GlobalWidgets.ts'/>
+var Widgets = require("privacyCannotNameAccessorDeclFile_Widgets");
+var Widgets1 = require("GlobalWidgets");
+function createExportedWidget1() {
+    return Widgets.createWidget1();
+}
+exports.createExportedWidget1 = createExportedWidget1;
+function createExportedWidget2() {
+    return Widgets.SpecializedWidget.createWidget2();
+}
+exports.createExportedWidget2 = createExportedWidget2;
+function createExportedWidget3() {
+    return Widgets1.createWidget3();
+}
+exports.createExportedWidget3 = createExportedWidget3;
+function createExportedWidget4() {
+    return Widgets1.SpecializedGlobalWidget.createWidget4();
+}
+exports.createExportedWidget4 = createExportedWidget4;
+//// [privacyCannotNameAccessorDeclFile_consumer.js]
+var exporter = require("privacyCannotNameAccessorDeclFile_exporter");
+var publicClassWithWithPrivateGetAccessorTypes = (function () {
+    function publicClassWithWithPrivateGetAccessorTypes() {
+    }
+    Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes, "myPublicStaticMethod", {
+        get: function () {
+            return exporter.createExportedWidget1();
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes, "myPrivateStaticMethod", {
+        get: function () {
+            return exporter.createExportedWidget1();
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes.prototype, "myPublicMethod", {
+        get: function () {
+            return exporter.createExportedWidget1();
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes.prototype, "myPrivateMethod", {
+        get: function () {
+            return exporter.createExportedWidget1();
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes, "myPublicStaticMethod1", {
+        get: function () {
+            return exporter.createExportedWidget3();
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes, "myPrivateStaticMethod1", {
+        get: function () {
+            return exporter.createExportedWidget3();
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes.prototype, "myPublicMethod1", {
+        get: function () {
+            return exporter.createExportedWidget3();
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(publicClassWithWithPrivateGetAccessorTypes.prototype, "myPrivateMethod1", {
+        get: function () {
+            return exporter.createExportedWidget3();
+        },
+        enumerable: true,
+        configurable: true
+    });
+    return publicClassWithWithPrivateGetAccessorTypes;
+})();
+exports.publicClassWithWithPrivateGetAccessorTypes = publicClassWithWithPrivateGetAccessorTypes;
+var privateClassWithWithPrivateGetAccessorTypes = (function () {
+    function privateClassWithWithPrivateGetAccessorTypes() {
+    }
+    Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes, "myPublicStaticMethod", {
+        get: function () {
+            return exporter.createExportedWidget1();
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes, "myPrivateStaticMethod", {
+        get: function () {
+            return exporter.createExportedWidget1();
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes.prototype, "myPublicMethod", {
+        get: function () {
+            return exporter.createExportedWidget1();
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes.prototype, "myPrivateMethod", {
+        get: function () {
+            return exporter.createExportedWidget1();
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes, "myPublicStaticMethod1", {
+        get: function () {
+            return exporter.createExportedWidget3();
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes, "myPrivateStaticMethod1", {
+        get: function () {
+            return exporter.createExportedWidget3();
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes.prototype, "myPublicMethod1", {
+        get: function () {
+            return exporter.createExportedWidget3();
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(privateClassWithWithPrivateGetAccessorTypes.prototype, "myPrivateMethod1", {
+        get: function () {
+            return exporter.createExportedWidget3();
+        },
+        enumerable: true,
+        configurable: true
+    });
+    return privateClassWithWithPrivateGetAccessorTypes;
+})();
+var publicClassWithPrivateModuleGetAccessorTypes = (function () {
+    function publicClassWithPrivateModuleGetAccessorTypes() {
+    }
+    Object.defineProperty(publicClassWithPrivateModuleGetAccessorTypes, "myPublicStaticMethod", {
+        get: function () {
+            return exporter.createExportedWidget2();
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(publicClassWithPrivateModuleGetAccessorTypes.prototype, "myPublicMethod", {
+        get: function () {
+            return exporter.createExportedWidget2();
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(publicClassWithPrivateModuleGetAccessorTypes, "myPublicStaticMethod1", {
+        get: function () {
+            return exporter.createExportedWidget4();
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(publicClassWithPrivateModuleGetAccessorTypes.prototype, "myPublicMethod1", {
+        get: function () {
+            return exporter.createExportedWidget4();
+        },
+        enumerable: true,
+        configurable: true
+    });
+    return publicClassWithPrivateModuleGetAccessorTypes;
+})();
+exports.publicClassWithPrivateModuleGetAccessorTypes = publicClassWithPrivateModuleGetAccessorTypes;
+var privateClassWithPrivateModuleGetAccessorTypes = (function () {
+    function privateClassWithPrivateModuleGetAccessorTypes() {
+    }
+    Object.defineProperty(privateClassWithPrivateModuleGetAccessorTypes, "myPublicStaticMethod", {
+        get: function () {
+            return exporter.createExportedWidget2();
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(privateClassWithPrivateModuleGetAccessorTypes.prototype, "myPublicMethod", {
+        get: function () {
+            return exporter.createExportedWidget2();
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(privateClassWithPrivateModuleGetAccessorTypes, "myPublicStaticMethod1", {
+        get: function () {
+            return exporter.createExportedWidget4();
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(privateClassWithPrivateModuleGetAccessorTypes.prototype, "myPublicMethod1", {
+        get: function () {
+            return exporter.createExportedWidget4();
+        },
+        enumerable: true,
+        configurable: true
+    });
+    return privateClassWithPrivateModuleGetAccessorTypes;
+})();
+
+
+//// [privacyCannotNameAccessorDeclFile_GlobalWidgets.d.ts]
+declare module "GlobalWidgets" {
+    class Widget3 {
+        name: string;
+    }
+    function createWidget3(): Widget3;
+    module SpecializedGlobalWidget {
+        class Widget4 {
+            name: string;
+        }
+        function createWidget4(): Widget4;
+    }
+}
+//// [privacyCannotNameAccessorDeclFile_Widgets.d.ts]
+export declare class Widget1 {
+    name: string;
+}
+export declare function createWidget1(): Widget1;
+export declare module SpecializedWidget {
+    class Widget2 {
+        name: string;
+    }
+    function createWidget2(): Widget2;
+}
+//// [privacyCannotNameAccessorDeclFile_exporter.d.ts]
+/// <reference path='privacyCannotNameAccessorDeclFile_GlobalWidgets.d.ts' />
+import Widgets = require("privacyCannotNameAccessorDeclFile_Widgets");
+import Widgets1 = require("GlobalWidgets");
+export declare function createExportedWidget1(): Widgets.Widget1;
+export declare function createExportedWidget2(): Widgets.SpecializedWidget.Widget2;
+export declare function createExportedWidget3(): Widgets1.Widget3;
+export declare function createExportedWidget4(): Widgets1.SpecializedGlobalWidget.Widget4;
diff --git a/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.errors.txt b/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.errors.txt
new file mode 100644
index 00000000000..92a2f349908
--- /dev/null
+++ b/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.errors.txt
@@ -0,0 +1,123 @@
+==== tests/cases/compiler/privacyCannotNameVarTypeDeclFile_consumer.ts (12 errors) ====
+    import exporter = require("privacyCannotNameVarTypeDeclFile_exporter");
+    export class publicClassWithWithPrivatePropertyTypes {
+        static myPublicStaticProperty = exporter.createExportedWidget1(); // Error
+        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Public static property 'myPublicStaticProperty' of exported class has or is using name 'Widget1' from external module "tests/cases/compiler/privacyCannotNameVarTypeDeclFile_Widgets" but cannot be named.
+        private static myPrivateStaticProperty = exporter.createExportedWidget1();
+        myPublicProperty = exporter.createExportedWidget1(); // Error
+        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Public property 'myPublicProperty' of exported class has or is using name 'Widget1' from external module "tests/cases/compiler/privacyCannotNameVarTypeDeclFile_Widgets" but cannot be named.
+        private myPrivateProperty = exporter.createExportedWidget1();
+    
+        static myPublicStaticProperty1 = exporter.createExportedWidget3(); // Error
+        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Public static property 'myPublicStaticProperty1' of exported class has or is using name 'Widget3' from external module "GlobalWidgets" but cannot be named.
+        private static myPrivateStaticProperty1 = exporter.createExportedWidget3();
+        myPublicProperty1 = exporter.createExportedWidget3(); // Error
+        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Public property 'myPublicProperty1' of exported class has or is using name 'Widget3' from external module "GlobalWidgets" but cannot be named.
+        private myPrivateProperty1 = exporter.createExportedWidget3();
+    }
+    
+    class privateClassWithWithPrivatePropertyTypes {
+        static myPublicStaticProperty = exporter.createExportedWidget1(); 
+        private static myPrivateStaticProperty = exporter.createExportedWidget1();
+        myPublicProperty = exporter.createExportedWidget1(); 
+        private myPrivateProperty = exporter.createExportedWidget1();
+    
+        static myPublicStaticProperty1 = exporter.createExportedWidget3(); 
+        private static myPrivateStaticProperty1 = exporter.createExportedWidget3();
+        myPublicProperty1 = exporter.createExportedWidget3(); 
+        private myPrivateProperty1 = exporter.createExportedWidget3();
+    }
+    
+    export var publicVarWithPrivatePropertyTypes= exporter.createExportedWidget1(); // Error
+               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Exported variable 'publicVarWithPrivatePropertyTypes' has or is using name 'Widget1' from external module "tests/cases/compiler/privacyCannotNameVarTypeDeclFile_Widgets" but cannot be named.
+    var privateVarWithPrivatePropertyTypes= exporter.createExportedWidget1();
+    export var publicVarWithPrivatePropertyTypes1 = exporter.createExportedWidget3(); // Error
+               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Exported variable 'publicVarWithPrivatePropertyTypes1' has or is using name 'Widget3' from external module "GlobalWidgets" but cannot be named.
+    var privateVarWithPrivatePropertyTypes1 = exporter.createExportedWidget3();
+    
+    export class publicClassWithPrivateModulePropertyTypes {
+        static myPublicStaticProperty= exporter.createExportedWidget2(); // Error
+        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Public static property 'myPublicStaticProperty' of exported class has or is using name 'SpecializedWidget.Widget2' from external module "tests/cases/compiler/privacyCannotNameVarTypeDeclFile_Widgets" but cannot be named.
+        myPublicProperty = exporter.createExportedWidget2(); // Error
+        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Public property 'myPublicProperty' of exported class has or is using name 'SpecializedWidget.Widget2' from external module "tests/cases/compiler/privacyCannotNameVarTypeDeclFile_Widgets" but cannot be named.
+        static myPublicStaticProperty1 = exporter.createExportedWidget4(); // Error
+        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Public static property 'myPublicStaticProperty1' of exported class has or is using name 'SpecializedGlobalWidget.Widget4' from external module "GlobalWidgets" but cannot be named.
+        myPublicProperty1 = exporter.createExportedWidget4(); // Error
+        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Public property 'myPublicProperty1' of exported class has or is using name 'SpecializedGlobalWidget.Widget4' from external module "GlobalWidgets" but cannot be named.
+    }
+    export var publicVarWithPrivateModulePropertyTypes= exporter.createExportedWidget2(); // Error
+               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Exported variable 'publicVarWithPrivateModulePropertyTypes' has or is using name 'SpecializedWidget.Widget2' from external module "tests/cases/compiler/privacyCannotNameVarTypeDeclFile_Widgets" but cannot be named.
+    export var publicVarWithPrivateModulePropertyTypes1 = exporter.createExportedWidget4(); // Error
+               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Exported variable 'publicVarWithPrivateModulePropertyTypes1' has or is using name 'SpecializedGlobalWidget.Widget4' from external module "GlobalWidgets" but cannot be named.
+    
+    class privateClassWithPrivateModulePropertyTypes {
+        static myPublicStaticProperty= exporter.createExportedWidget2();
+        myPublicProperty= exporter.createExportedWidget2();
+        static myPublicStaticProperty1 = exporter.createExportedWidget4();
+        myPublicProperty1 = exporter.createExportedWidget4();
+    }
+    var privateVarWithPrivateModulePropertyTypes= exporter.createExportedWidget2();
+    var privateVarWithPrivateModulePropertyTypes1 = exporter.createExportedWidget4();
+==== tests/cases/compiler/privacyCannotNameVarTypeDeclFile_GlobalWidgets.ts (0 errors) ====
+    
+    
+    declare module "GlobalWidgets" {
+        export class Widget3 {
+            name: string;
+        }
+        export function createWidget3(): Widget3;
+    
+        export module SpecializedGlobalWidget {
+            export class Widget4 {
+                name: string;
+            }
+            function createWidget4(): Widget4;
+        }
+    }
+    
+==== tests/cases/compiler/privacyCannotNameVarTypeDeclFile_Widgets.ts (0 errors) ====
+    export class Widget1 {
+        name = 'one';
+    }
+    export function createWidget1() {
+        return new Widget1();
+    }
+    
+    export module SpecializedWidget {
+        export class Widget2 {
+            name = 'one';
+        }
+        export function createWidget2() {
+            return new Widget2();
+        }
+    }
+    
+==== tests/cases/compiler/privacyCannotNameVarTypeDeclFile_exporter.ts (0 errors) ====
+    ///<reference path='privacyCannotNameVarTypeDeclFile_GlobalWidgets.ts'/>
+    import Widgets = require("privacyCannotNameVarTypeDeclFile_Widgets");
+    import Widgets1 = require("GlobalWidgets");
+    export function createExportedWidget1() {
+        return Widgets.createWidget1();
+    }
+    export function createExportedWidget2() {
+        return Widgets.SpecializedWidget.createWidget2();
+    }
+    export function createExportedWidget3() {
+        return Widgets1.createWidget3();
+    }
+    export function createExportedWidget4() {
+        return Widgets1.SpecializedGlobalWidget.createWidget4();
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.js b/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.js
new file mode 100644
index 00000000000..f4436174dc5
--- /dev/null
+++ b/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.js
@@ -0,0 +1,239 @@
+//// [tests/cases/compiler/privacyCannotNameVarTypeDeclFile.ts] ////
+
+//// [privacyCannotNameVarTypeDeclFile_GlobalWidgets.ts]
+
+
+declare module "GlobalWidgets" {
+    export class Widget3 {
+        name: string;
+    }
+    export function createWidget3(): Widget3;
+
+    export module SpecializedGlobalWidget {
+        export class Widget4 {
+            name: string;
+        }
+        function createWidget4(): Widget4;
+    }
+}
+
+//// [privacyCannotNameVarTypeDeclFile_Widgets.ts]
+export class Widget1 {
+    name = 'one';
+}
+export function createWidget1() {
+    return new Widget1();
+}
+
+export module SpecializedWidget {
+    export class Widget2 {
+        name = 'one';
+    }
+    export function createWidget2() {
+        return new Widget2();
+    }
+}
+
+//// [privacyCannotNameVarTypeDeclFile_exporter.ts]
+///<reference path='privacyCannotNameVarTypeDeclFile_GlobalWidgets.ts'/>
+import Widgets = require("privacyCannotNameVarTypeDeclFile_Widgets");
+import Widgets1 = require("GlobalWidgets");
+export function createExportedWidget1() {
+    return Widgets.createWidget1();
+}
+export function createExportedWidget2() {
+    return Widgets.SpecializedWidget.createWidget2();
+}
+export function createExportedWidget3() {
+    return Widgets1.createWidget3();
+}
+export function createExportedWidget4() {
+    return Widgets1.SpecializedGlobalWidget.createWidget4();
+}
+
+//// [privacyCannotNameVarTypeDeclFile_consumer.ts]
+import exporter = require("privacyCannotNameVarTypeDeclFile_exporter");
+export class publicClassWithWithPrivatePropertyTypes {
+    static myPublicStaticProperty = exporter.createExportedWidget1(); // Error
+    private static myPrivateStaticProperty = exporter.createExportedWidget1();
+    myPublicProperty = exporter.createExportedWidget1(); // Error
+    private myPrivateProperty = exporter.createExportedWidget1();
+
+    static myPublicStaticProperty1 = exporter.createExportedWidget3(); // Error
+    private static myPrivateStaticProperty1 = exporter.createExportedWidget3();
+    myPublicProperty1 = exporter.createExportedWidget3(); // Error
+    private myPrivateProperty1 = exporter.createExportedWidget3();
+}
+
+class privateClassWithWithPrivatePropertyTypes {
+    static myPublicStaticProperty = exporter.createExportedWidget1(); 
+    private static myPrivateStaticProperty = exporter.createExportedWidget1();
+    myPublicProperty = exporter.createExportedWidget1(); 
+    private myPrivateProperty = exporter.createExportedWidget1();
+
+    static myPublicStaticProperty1 = exporter.createExportedWidget3(); 
+    private static myPrivateStaticProperty1 = exporter.createExportedWidget3();
+    myPublicProperty1 = exporter.createExportedWidget3(); 
+    private myPrivateProperty1 = exporter.createExportedWidget3();
+}
+
+export var publicVarWithPrivatePropertyTypes= exporter.createExportedWidget1(); // Error
+var privateVarWithPrivatePropertyTypes= exporter.createExportedWidget1();
+export var publicVarWithPrivatePropertyTypes1 = exporter.createExportedWidget3(); // Error
+var privateVarWithPrivatePropertyTypes1 = exporter.createExportedWidget3();
+
+export class publicClassWithPrivateModulePropertyTypes {
+    static myPublicStaticProperty= exporter.createExportedWidget2(); // Error
+    myPublicProperty = exporter.createExportedWidget2(); // Error
+    static myPublicStaticProperty1 = exporter.createExportedWidget4(); // Error
+    myPublicProperty1 = exporter.createExportedWidget4(); // Error
+}
+export var publicVarWithPrivateModulePropertyTypes= exporter.createExportedWidget2(); // Error
+export var publicVarWithPrivateModulePropertyTypes1 = exporter.createExportedWidget4(); // Error
+
+class privateClassWithPrivateModulePropertyTypes {
+    static myPublicStaticProperty= exporter.createExportedWidget2();
+    myPublicProperty= exporter.createExportedWidget2();
+    static myPublicStaticProperty1 = exporter.createExportedWidget4();
+    myPublicProperty1 = exporter.createExportedWidget4();
+}
+var privateVarWithPrivateModulePropertyTypes= exporter.createExportedWidget2();
+var privateVarWithPrivateModulePropertyTypes1 = exporter.createExportedWidget4();
+
+//// [privacyCannotNameVarTypeDeclFile_GlobalWidgets.js]
+//// [privacyCannotNameVarTypeDeclFile_Widgets.js]
+var Widget1 = (function () {
+    function Widget1() {
+        this.name = 'one';
+    }
+    return Widget1;
+})();
+exports.Widget1 = Widget1;
+function createWidget1() {
+    return new Widget1();
+}
+exports.createWidget1 = createWidget1;
+(function (SpecializedWidget) {
+    var Widget2 = (function () {
+        function Widget2() {
+            this.name = 'one';
+        }
+        return Widget2;
+    })();
+    SpecializedWidget.Widget2 = Widget2;
+    function createWidget2() {
+        return new Widget2();
+    }
+    SpecializedWidget.createWidget2 = createWidget2;
+})(exports.SpecializedWidget || (exports.SpecializedWidget = {}));
+var SpecializedWidget = exports.SpecializedWidget;
+//// [privacyCannotNameVarTypeDeclFile_exporter.js]
+///<reference path='privacyCannotNameVarTypeDeclFile_GlobalWidgets.ts'/>
+var Widgets = require("privacyCannotNameVarTypeDeclFile_Widgets");
+var Widgets1 = require("GlobalWidgets");
+function createExportedWidget1() {
+    return Widgets.createWidget1();
+}
+exports.createExportedWidget1 = createExportedWidget1;
+function createExportedWidget2() {
+    return Widgets.SpecializedWidget.createWidget2();
+}
+exports.createExportedWidget2 = createExportedWidget2;
+function createExportedWidget3() {
+    return Widgets1.createWidget3();
+}
+exports.createExportedWidget3 = createExportedWidget3;
+function createExportedWidget4() {
+    return Widgets1.SpecializedGlobalWidget.createWidget4();
+}
+exports.createExportedWidget4 = createExportedWidget4;
+//// [privacyCannotNameVarTypeDeclFile_consumer.js]
+var exporter = require("privacyCannotNameVarTypeDeclFile_exporter");
+var publicClassWithWithPrivatePropertyTypes = (function () {
+    function publicClassWithWithPrivatePropertyTypes() {
+        this.myPublicProperty = exporter.createExportedWidget1(); // Error
+        this.myPrivateProperty = exporter.createExportedWidget1();
+        this.myPublicProperty1 = exporter.createExportedWidget3(); // Error
+        this.myPrivateProperty1 = exporter.createExportedWidget3();
+    }
+    publicClassWithWithPrivatePropertyTypes.myPublicStaticProperty = exporter.createExportedWidget1(); // Error
+    publicClassWithWithPrivatePropertyTypes.myPrivateStaticProperty = exporter.createExportedWidget1();
+    publicClassWithWithPrivatePropertyTypes.myPublicStaticProperty1 = exporter.createExportedWidget3(); // Error
+    publicClassWithWithPrivatePropertyTypes.myPrivateStaticProperty1 = exporter.createExportedWidget3();
+    return publicClassWithWithPrivatePropertyTypes;
+})();
+exports.publicClassWithWithPrivatePropertyTypes = publicClassWithWithPrivatePropertyTypes;
+var privateClassWithWithPrivatePropertyTypes = (function () {
+    function privateClassWithWithPrivatePropertyTypes() {
+        this.myPublicProperty = exporter.createExportedWidget1();
+        this.myPrivateProperty = exporter.createExportedWidget1();
+        this.myPublicProperty1 = exporter.createExportedWidget3();
+        this.myPrivateProperty1 = exporter.createExportedWidget3();
+    }
+    privateClassWithWithPrivatePropertyTypes.myPublicStaticProperty = exporter.createExportedWidget1();
+    privateClassWithWithPrivatePropertyTypes.myPrivateStaticProperty = exporter.createExportedWidget1();
+    privateClassWithWithPrivatePropertyTypes.myPublicStaticProperty1 = exporter.createExportedWidget3();
+    privateClassWithWithPrivatePropertyTypes.myPrivateStaticProperty1 = exporter.createExportedWidget3();
+    return privateClassWithWithPrivatePropertyTypes;
+})();
+exports.publicVarWithPrivatePropertyTypes = exporter.createExportedWidget1(); // Error
+var privateVarWithPrivatePropertyTypes = exporter.createExportedWidget1();
+exports.publicVarWithPrivatePropertyTypes1 = exporter.createExportedWidget3(); // Error
+var privateVarWithPrivatePropertyTypes1 = exporter.createExportedWidget3();
+var publicClassWithPrivateModulePropertyTypes = (function () {
+    function publicClassWithPrivateModulePropertyTypes() {
+        this.myPublicProperty = exporter.createExportedWidget2(); // Error
+        this.myPublicProperty1 = exporter.createExportedWidget4(); // Error
+    }
+    publicClassWithPrivateModulePropertyTypes.myPublicStaticProperty = exporter.createExportedWidget2(); // Error
+    publicClassWithPrivateModulePropertyTypes.myPublicStaticProperty1 = exporter.createExportedWidget4(); // Error
+    return publicClassWithPrivateModulePropertyTypes;
+})();
+exports.publicClassWithPrivateModulePropertyTypes = publicClassWithPrivateModulePropertyTypes;
+exports.publicVarWithPrivateModulePropertyTypes = exporter.createExportedWidget2(); // Error
+exports.publicVarWithPrivateModulePropertyTypes1 = exporter.createExportedWidget4(); // Error
+var privateClassWithPrivateModulePropertyTypes = (function () {
+    function privateClassWithPrivateModulePropertyTypes() {
+        this.myPublicProperty = exporter.createExportedWidget2();
+        this.myPublicProperty1 = exporter.createExportedWidget4();
+    }
+    privateClassWithPrivateModulePropertyTypes.myPublicStaticProperty = exporter.createExportedWidget2();
+    privateClassWithPrivateModulePropertyTypes.myPublicStaticProperty1 = exporter.createExportedWidget4();
+    return privateClassWithPrivateModulePropertyTypes;
+})();
+var privateVarWithPrivateModulePropertyTypes = exporter.createExportedWidget2();
+var privateVarWithPrivateModulePropertyTypes1 = exporter.createExportedWidget4();
+
+
+//// [privacyCannotNameVarTypeDeclFile_GlobalWidgets.d.ts]
+declare module "GlobalWidgets" {
+    class Widget3 {
+        name: string;
+    }
+    function createWidget3(): Widget3;
+    module SpecializedGlobalWidget {
+        class Widget4 {
+            name: string;
+        }
+        function createWidget4(): Widget4;
+    }
+}
+//// [privacyCannotNameVarTypeDeclFile_Widgets.d.ts]
+export declare class Widget1 {
+    name: string;
+}
+export declare function createWidget1(): Widget1;
+export declare module SpecializedWidget {
+    class Widget2 {
+        name: string;
+    }
+    function createWidget2(): Widget2;
+}
+//// [privacyCannotNameVarTypeDeclFile_exporter.d.ts]
+/// <reference path='privacyCannotNameVarTypeDeclFile_GlobalWidgets.d.ts' />
+import Widgets = require("privacyCannotNameVarTypeDeclFile_Widgets");
+import Widgets1 = require("GlobalWidgets");
+export declare function createExportedWidget1(): Widgets.Widget1;
+export declare function createExportedWidget2(): Widgets.SpecializedWidget.Widget2;
+export declare function createExportedWidget3(): Widgets1.Widget3;
+export declare function createExportedWidget4(): Widgets1.SpecializedGlobalWidget.Widget4;
diff --git a/tests/baselines/reference/privacyCheckAnonymousFunctionParameter.js b/tests/baselines/reference/privacyCheckAnonymousFunctionParameter.js
index ccaf3c7924f..70bc067bb8d 100644
--- a/tests/baselines/reference/privacyCheckAnonymousFunctionParameter.js
+++ b/tests/baselines/reference/privacyCheckAnonymousFunctionParameter.js
@@ -30,3 +30,7 @@ var Query;
         });
     }
 })(Query || (Query = {}));
+
+
+//// [privacyCheckAnonymousFunctionParameter.d.ts]
+export declare var x: number;
diff --git a/tests/baselines/reference/privacyCheckAnonymousFunctionParameter2.js b/tests/baselines/reference/privacyCheckAnonymousFunctionParameter2.js
index 78647537ace..77bb7e9349b 100644
--- a/tests/baselines/reference/privacyCheckAnonymousFunctionParameter2.js
+++ b/tests/baselines/reference/privacyCheckAnonymousFunctionParameter2.js
@@ -31,3 +31,7 @@ define(["require", "exports"], function (require, exports) {
         }
     })(Q || (Q = {}));
 });
+
+
+//// [privacyCheckAnonymousFunctionParameter2.d.ts]
+export declare var x: number;
diff --git a/tests/baselines/reference/privacyCheckCallbackOfInterfaceMethodWithTypeParameter.js b/tests/baselines/reference/privacyCheckCallbackOfInterfaceMethodWithTypeParameter.js
index 02a4b682d94..faaef563ebb 100644
--- a/tests/baselines/reference/privacyCheckCallbackOfInterfaceMethodWithTypeParameter.js
+++ b/tests/baselines/reference/privacyCheckCallbackOfInterfaceMethodWithTypeParameter.js
@@ -10,3 +10,11 @@ export interface B<T> extends A<T> {
 //// [privacyCheckCallbackOfInterfaceMethodWithTypeParameter.js]
 define(["require", "exports"], function (require, exports) {
 });
+
+
+//// [privacyCheckCallbackOfInterfaceMethodWithTypeParameter.d.ts]
+export interface A<T> {
+    f1(callback: (p: T) => any): any;
+}
+export interface B<T> extends A<T> {
+}
diff --git a/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface1.js b/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface1.js
index 1b02a38307b..7b5e63ce009 100644
--- a/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface1.js
+++ b/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface1.js
@@ -11,3 +11,14 @@ export = Foo;
 //// [privacyCheckExportAssignmentOnExportedGenericInterface1.js]
 var Foo;
 module.exports = Foo;
+
+
+//// [privacyCheckExportAssignmentOnExportedGenericInterface1.d.ts]
+declare module Foo {
+    interface A<T> {
+    }
+}
+interface Foo<T> {
+}
+declare var Foo: new () => Foo.A<Foo<string>>;
+export = Foo;
diff --git a/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface2.js b/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface2.js
index 2b4e9ddf833..11a51318230 100644
--- a/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface2.js
+++ b/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface2.js
@@ -24,3 +24,13 @@ define(["require", "exports"], function (require, exports) {
     })(Foo || (Foo = {}));
     return Foo;
 });
+
+
+//// [privacyCheckExportAssignmentOnExportedGenericInterface2.d.ts]
+export = Foo;
+interface Foo<T> {
+}
+declare function Foo<T>(array: T[]): Foo<T>;
+declare module Foo {
+    var x: string;
+}
diff --git a/tests/baselines/reference/privacyCheckExternalModuleExportAssignmentOfGenericClass.js b/tests/baselines/reference/privacyCheckExternalModuleExportAssignmentOfGenericClass.js
index 94aa5c28e92..eeaea58e0ab 100644
--- a/tests/baselines/reference/privacyCheckExternalModuleExportAssignmentOfGenericClass.js
+++ b/tests/baselines/reference/privacyCheckExternalModuleExportAssignmentOfGenericClass.js
@@ -22,3 +22,17 @@ var Foo = (function () {
 })();
 module.exports = Foo;
 //// [privacyCheckExternalModuleExportAssignmentOfGenericClass_1.js]
+
+
+//// [privacyCheckExternalModuleExportAssignmentOfGenericClass_0.d.ts]
+export = Foo;
+declare class Foo<A> {
+    a: A;
+    constructor(a: A);
+}
+//// [privacyCheckExternalModuleExportAssignmentOfGenericClass_1.d.ts]
+import Foo = require("privacyCheckExternalModuleExportAssignmentOfGenericClass_0");
+export = Bar;
+interface Bar {
+    foo: Foo<number>;
+}
diff --git a/tests/baselines/reference/privacyCheckOnTypeParameterReferenceInConstructorParameter.js b/tests/baselines/reference/privacyCheckOnTypeParameterReferenceInConstructorParameter.js
index a1def385809..6e2ef744946 100644
--- a/tests/baselines/reference/privacyCheckOnTypeParameterReferenceInConstructorParameter.js
+++ b/tests/baselines/reference/privacyCheckOnTypeParameterReferenceInConstructorParameter.js
@@ -26,3 +26,12 @@ define(["require", "exports"], function (require, exports) {
     })();
     exports.B = B;
 });
+
+
+//// [privacyCheckOnTypeParameterReferenceInConstructorParameter.d.ts]
+export declare class A<T1> {
+    constructor(callback: (self: A<T1>) => void);
+}
+export declare class B<T2> {
+    constructor(parent: T2);
+}
diff --git a/tests/baselines/reference/privacyCheckTypeOfFunction.errors.txt b/tests/baselines/reference/privacyCheckTypeOfFunction.errors.txt
index 3132a1c56a7..50b9dc0242b 100644
--- a/tests/baselines/reference/privacyCheckTypeOfFunction.errors.txt
+++ b/tests/baselines/reference/privacyCheckTypeOfFunction.errors.txt
@@ -1,8 +1,10 @@
-==== tests/cases/compiler/privacyCheckTypeOfFunction.ts (1 errors) ====
+==== tests/cases/compiler/privacyCheckTypeOfFunction.ts (2 errors) ====
     function foo() {
     }
     export var x: typeof foo;
-    ~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Cannot compile external modules unless the '--module' flag is provided.
+               ~
+!!! Exported variable 'x' has or is using private name 'foo'.
     export var b = foo;
+               ~
+!!! Exported variable 'b' has or is using private name 'foo'.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/privacyCheckTypeOfFunction.js b/tests/baselines/reference/privacyCheckTypeOfFunction.js
new file mode 100644
index 00000000000..757416c691b
--- /dev/null
+++ b/tests/baselines/reference/privacyCheckTypeOfFunction.js
@@ -0,0 +1,12 @@
+//// [privacyCheckTypeOfFunction.ts]
+function foo() {
+}
+export var x: typeof foo;
+export var b = foo;
+
+
+//// [privacyCheckTypeOfFunction.js]
+function foo() {
+}
+exports.x;
+exports.b = foo;
diff --git a/tests/baselines/reference/privacyCheckTypeOfInvisibleModuleError.errors.txt b/tests/baselines/reference/privacyCheckTypeOfInvisibleModuleError.errors.txt
new file mode 100644
index 00000000000..e09c933ce4f
--- /dev/null
+++ b/tests/baselines/reference/privacyCheckTypeOfInvisibleModuleError.errors.txt
@@ -0,0 +1,11 @@
+==== tests/cases/compiler/privacyCheckTypeOfInvisibleModuleError.ts (1 errors) ====
+    module Outer {
+        module Inner {
+            export var m: typeof Inner;
+        }
+    
+        export var f: typeof Inner;
+                   ~
+!!! Exported variable 'f' has or is using private name 'Inner'.
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/privacyCheckTypeOfInvisibleModuleError.types b/tests/baselines/reference/privacyCheckTypeOfInvisibleModuleError.types
deleted file mode 100644
index fa28dc8843c..00000000000
--- a/tests/baselines/reference/privacyCheckTypeOfInvisibleModuleError.types
+++ /dev/null
@@ -1,17 +0,0 @@
-=== tests/cases/compiler/privacyCheckTypeOfInvisibleModuleError.ts ===
-module Outer {
->Outer : Outer
-
-    module Inner {
->Inner : Inner
-
-        export var m: typeof Inner;
->m : typeof Inner
->Inner : typeof Inner
-    }
-
-    export var f: typeof Inner;
->f : typeof Inner
->Inner : typeof Inner
-}
-
diff --git a/tests/baselines/reference/privacyClassExtendsClauseDeclFile.errors.txt b/tests/baselines/reference/privacyClassExtendsClauseDeclFile.errors.txt
new file mode 100644
index 00000000000..598dead5154
--- /dev/null
+++ b/tests/baselines/reference/privacyClassExtendsClauseDeclFile.errors.txt
@@ -0,0 +1,106 @@
+==== tests/cases/compiler/privacyClassExtendsClauseDeclFile_externalModule.ts (4 errors) ====
+    
+    export module publicModule {
+        export class publicClassInPublicModule {
+            private f1() {
+            }
+        }
+    
+        class privateClassInPublicModule {
+        }
+    
+        class privateClassExtendingPublicClassInModule extends publicClassInPublicModule {
+        }
+        class privateClassExtendingPrivateClassInModule extends privateClassInPublicModule {
+        }
+        export class publicClassExtendingPublicClassInModule extends publicClassInPublicModule {
+        }
+        export class publicClassExtendingPrivateClassInModule extends privateClassInPublicModule { // Should error
+                                                                      ~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Extends clause of exported class 'publicClassExtendingPrivateClassInModule' has or is using private name 'privateClassInPublicModule'.
+        }
+    
+        class privateClassExtendingFromPrivateModuleClass extends privateModule.publicClassInPrivateModule {
+        }
+        export class publicClassExtendingFromPrivateModuleClass extends privateModule.publicClassInPrivateModule { // Should error
+                                                                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Extends clause of exported class 'publicClassExtendingFromPrivateModuleClass' has or is using name 'privateModule.publicClassInPrivateModule' from private module 'privateModule'.
+        }
+    }
+    
+    module privateModule {
+        export class publicClassInPrivateModule {
+            private f1() {
+            }
+        }
+    
+        class privateClassInPrivateModule {
+        }
+    
+        class privateClassExtendingPublicClassInModule extends publicClassInPrivateModule {
+        }
+        class privateClassExtendingPrivateClassInModule extends privateClassInPrivateModule {
+        }
+        export class publicClassExtendingPublicClassInModule extends publicClassInPrivateModule {
+        }
+        export class publicClassExtendingPrivateClassInModule extends privateClassInPrivateModule { 
+        }
+    
+        class privateClassExtendingFromPrivateModuleClass extends privateModule.publicClassInPrivateModule {
+        }
+        export class publicClassExtendingFromPrivateModuleClass extends privateModule.publicClassInPrivateModule {
+        }
+    }
+    
+    export class publicClass {
+        private f1() {
+        }
+    }
+    
+    class privateClass {
+    }
+    
+    class privateClassExtendingPublicClass extends publicClass {
+    }
+    class privateClassExtendingPrivateClassInModule extends privateClass {
+    }
+    export class publicClassExtendingPublicClass extends publicClass {
+    }
+    export class publicClassExtendingPrivateClass extends privateClass { // Should error
+                                                          ~~~~~~~~~~~~
+!!! Extends clause of exported class 'publicClassExtendingPrivateClass' has or is using private name 'privateClass'.
+    }
+    
+    class privateClassExtendingFromPrivateModuleClass extends privateModule.publicClassInPrivateModule {
+    }
+    export class publicClassExtendingFromPrivateModuleClass extends privateModule.publicClassInPrivateModule { // Should error
+                                                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Extends clause of exported class 'publicClassExtendingFromPrivateModuleClass' has or is using name 'privateModule.publicClassInPrivateModule' from private module 'privateModule'.
+    }
+    
+==== tests/cases/compiler/privacyClassExtendsClauseDeclFile_GlobalFile.ts (1 errors) ====
+    module publicModuleInGlobal {
+        export class publicClassInPublicModule {
+            private f1() {
+            }
+        }
+    
+        class privateClassInPublicModule {
+        }
+    
+        class privateClassExtendingPublicClassInModule extends publicClassInPublicModule {
+        }
+        class privateClassExtendingPrivateClassInModule extends privateClassInPublicModule {
+        }
+        export class publicClassExtendingPublicClassInModule extends publicClassInPublicModule {
+        }
+        export class publicClassExtendingPrivateClassInModule extends privateClassInPublicModule { // Should error
+                                                                      ~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Extends clause of exported class 'publicClassExtendingPrivateClassInModule' has or is using private name 'privateClassInPublicModule'.
+        }
+    }
+    class publicClassInGlobal {
+    }
+    class publicClassExtendingPublicClassInGlobal extends publicClassInGlobal {
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/privacyClassExtendsClauseDeclFile.js b/tests/baselines/reference/privacyClassExtendsClauseDeclFile.js
new file mode 100644
index 00000000000..77adca24aa6
--- /dev/null
+++ b/tests/baselines/reference/privacyClassExtendsClauseDeclFile.js
@@ -0,0 +1,351 @@
+//// [tests/cases/compiler/privacyClassExtendsClauseDeclFile.ts] ////
+
+//// [privacyClassExtendsClauseDeclFile_externalModule.ts]
+
+export module publicModule {
+    export class publicClassInPublicModule {
+        private f1() {
+        }
+    }
+
+    class privateClassInPublicModule {
+    }
+
+    class privateClassExtendingPublicClassInModule extends publicClassInPublicModule {
+    }
+    class privateClassExtendingPrivateClassInModule extends privateClassInPublicModule {
+    }
+    export class publicClassExtendingPublicClassInModule extends publicClassInPublicModule {
+    }
+    export class publicClassExtendingPrivateClassInModule extends privateClassInPublicModule { // Should error
+    }
+
+    class privateClassExtendingFromPrivateModuleClass extends privateModule.publicClassInPrivateModule {
+    }
+    export class publicClassExtendingFromPrivateModuleClass extends privateModule.publicClassInPrivateModule { // Should error
+    }
+}
+
+module privateModule {
+    export class publicClassInPrivateModule {
+        private f1() {
+        }
+    }
+
+    class privateClassInPrivateModule {
+    }
+
+    class privateClassExtendingPublicClassInModule extends publicClassInPrivateModule {
+    }
+    class privateClassExtendingPrivateClassInModule extends privateClassInPrivateModule {
+    }
+    export class publicClassExtendingPublicClassInModule extends publicClassInPrivateModule {
+    }
+    export class publicClassExtendingPrivateClassInModule extends privateClassInPrivateModule { 
+    }
+
+    class privateClassExtendingFromPrivateModuleClass extends privateModule.publicClassInPrivateModule {
+    }
+    export class publicClassExtendingFromPrivateModuleClass extends privateModule.publicClassInPrivateModule {
+    }
+}
+
+export class publicClass {
+    private f1() {
+    }
+}
+
+class privateClass {
+}
+
+class privateClassExtendingPublicClass extends publicClass {
+}
+class privateClassExtendingPrivateClassInModule extends privateClass {
+}
+export class publicClassExtendingPublicClass extends publicClass {
+}
+export class publicClassExtendingPrivateClass extends privateClass { // Should error
+}
+
+class privateClassExtendingFromPrivateModuleClass extends privateModule.publicClassInPrivateModule {
+}
+export class publicClassExtendingFromPrivateModuleClass extends privateModule.publicClassInPrivateModule { // Should error
+}
+
+//// [privacyClassExtendsClauseDeclFile_GlobalFile.ts]
+module publicModuleInGlobal {
+    export class publicClassInPublicModule {
+        private f1() {
+        }
+    }
+
+    class privateClassInPublicModule {
+    }
+
+    class privateClassExtendingPublicClassInModule extends publicClassInPublicModule {
+    }
+    class privateClassExtendingPrivateClassInModule extends privateClassInPublicModule {
+    }
+    export class publicClassExtendingPublicClassInModule extends publicClassInPublicModule {
+    }
+    export class publicClassExtendingPrivateClassInModule extends privateClassInPublicModule { // Should error
+    }
+}
+class publicClassInGlobal {
+}
+class publicClassExtendingPublicClassInGlobal extends publicClassInGlobal {
+}
+
+
+//// [privacyClassExtendsClauseDeclFile_externalModule.js]
+var __extends = this.__extends || function (d, b) {
+    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
+    function __() { this.constructor = d; }
+    __.prototype = b.prototype;
+    d.prototype = new __();
+};
+(function (publicModule) {
+    var publicClassInPublicModule = (function () {
+        function publicClassInPublicModule() {
+        }
+        publicClassInPublicModule.prototype.f1 = function () {
+        };
+        return publicClassInPublicModule;
+    })();
+    publicModule.publicClassInPublicModule = publicClassInPublicModule;
+    var privateClassInPublicModule = (function () {
+        function privateClassInPublicModule() {
+        }
+        return privateClassInPublicModule;
+    })();
+    var privateClassExtendingPublicClassInModule = (function (_super) {
+        __extends(privateClassExtendingPublicClassInModule, _super);
+        function privateClassExtendingPublicClassInModule() {
+            _super.apply(this, arguments);
+        }
+        return privateClassExtendingPublicClassInModule;
+    })(publicClassInPublicModule);
+    var privateClassExtendingPrivateClassInModule = (function (_super) {
+        __extends(privateClassExtendingPrivateClassInModule, _super);
+        function privateClassExtendingPrivateClassInModule() {
+            _super.apply(this, arguments);
+        }
+        return privateClassExtendingPrivateClassInModule;
+    })(privateClassInPublicModule);
+    var publicClassExtendingPublicClassInModule = (function (_super) {
+        __extends(publicClassExtendingPublicClassInModule, _super);
+        function publicClassExtendingPublicClassInModule() {
+            _super.apply(this, arguments);
+        }
+        return publicClassExtendingPublicClassInModule;
+    })(publicClassInPublicModule);
+    publicModule.publicClassExtendingPublicClassInModule = publicClassExtendingPublicClassInModule;
+    var publicClassExtendingPrivateClassInModule = (function (_super) {
+        __extends(publicClassExtendingPrivateClassInModule, _super);
+        function publicClassExtendingPrivateClassInModule() {
+            _super.apply(this, arguments);
+        }
+        return publicClassExtendingPrivateClassInModule;
+    })(privateClassInPublicModule);
+    publicModule.publicClassExtendingPrivateClassInModule = publicClassExtendingPrivateClassInModule;
+    var privateClassExtendingFromPrivateModuleClass = (function (_super) {
+        __extends(privateClassExtendingFromPrivateModuleClass, _super);
+        function privateClassExtendingFromPrivateModuleClass() {
+            _super.apply(this, arguments);
+        }
+        return privateClassExtendingFromPrivateModuleClass;
+    })(privateModule.publicClassInPrivateModule);
+    var publicClassExtendingFromPrivateModuleClass = (function (_super) {
+        __extends(publicClassExtendingFromPrivateModuleClass, _super);
+        function publicClassExtendingFromPrivateModuleClass() {
+            _super.apply(this, arguments);
+        }
+        return publicClassExtendingFromPrivateModuleClass;
+    })(privateModule.publicClassInPrivateModule);
+    publicModule.publicClassExtendingFromPrivateModuleClass = publicClassExtendingFromPrivateModuleClass;
+})(exports.publicModule || (exports.publicModule = {}));
+var publicModule = exports.publicModule;
+var privateModule;
+(function (privateModule) {
+    var publicClassInPrivateModule = (function () {
+        function publicClassInPrivateModule() {
+        }
+        publicClassInPrivateModule.prototype.f1 = function () {
+        };
+        return publicClassInPrivateModule;
+    })();
+    privateModule.publicClassInPrivateModule = publicClassInPrivateModule;
+    var privateClassInPrivateModule = (function () {
+        function privateClassInPrivateModule() {
+        }
+        return privateClassInPrivateModule;
+    })();
+    var privateClassExtendingPublicClassInModule = (function (_super) {
+        __extends(privateClassExtendingPublicClassInModule, _super);
+        function privateClassExtendingPublicClassInModule() {
+            _super.apply(this, arguments);
+        }
+        return privateClassExtendingPublicClassInModule;
+    })(publicClassInPrivateModule);
+    var privateClassExtendingPrivateClassInModule = (function (_super) {
+        __extends(privateClassExtendingPrivateClassInModule, _super);
+        function privateClassExtendingPrivateClassInModule() {
+            _super.apply(this, arguments);
+        }
+        return privateClassExtendingPrivateClassInModule;
+    })(privateClassInPrivateModule);
+    var publicClassExtendingPublicClassInModule = (function (_super) {
+        __extends(publicClassExtendingPublicClassInModule, _super);
+        function publicClassExtendingPublicClassInModule() {
+            _super.apply(this, arguments);
+        }
+        return publicClassExtendingPublicClassInModule;
+    })(publicClassInPrivateModule);
+    privateModule.publicClassExtendingPublicClassInModule = publicClassExtendingPublicClassInModule;
+    var publicClassExtendingPrivateClassInModule = (function (_super) {
+        __extends(publicClassExtendingPrivateClassInModule, _super);
+        function publicClassExtendingPrivateClassInModule() {
+            _super.apply(this, arguments);
+        }
+        return publicClassExtendingPrivateClassInModule;
+    })(privateClassInPrivateModule);
+    privateModule.publicClassExtendingPrivateClassInModule = publicClassExtendingPrivateClassInModule;
+    var privateClassExtendingFromPrivateModuleClass = (function (_super) {
+        __extends(privateClassExtendingFromPrivateModuleClass, _super);
+        function privateClassExtendingFromPrivateModuleClass() {
+            _super.apply(this, arguments);
+        }
+        return privateClassExtendingFromPrivateModuleClass;
+    })(privateModule.publicClassInPrivateModule);
+    var publicClassExtendingFromPrivateModuleClass = (function (_super) {
+        __extends(publicClassExtendingFromPrivateModuleClass, _super);
+        function publicClassExtendingFromPrivateModuleClass() {
+            _super.apply(this, arguments);
+        }
+        return publicClassExtendingFromPrivateModuleClass;
+    })(privateModule.publicClassInPrivateModule);
+    privateModule.publicClassExtendingFromPrivateModuleClass = publicClassExtendingFromPrivateModuleClass;
+})(privateModule || (privateModule = {}));
+var publicClass = (function () {
+    function publicClass() {
+    }
+    publicClass.prototype.f1 = function () {
+    };
+    return publicClass;
+})();
+exports.publicClass = publicClass;
+var privateClass = (function () {
+    function privateClass() {
+    }
+    return privateClass;
+})();
+var privateClassExtendingPublicClass = (function (_super) {
+    __extends(privateClassExtendingPublicClass, _super);
+    function privateClassExtendingPublicClass() {
+        _super.apply(this, arguments);
+    }
+    return privateClassExtendingPublicClass;
+})(publicClass);
+var privateClassExtendingPrivateClassInModule = (function (_super) {
+    __extends(privateClassExtendingPrivateClassInModule, _super);
+    function privateClassExtendingPrivateClassInModule() {
+        _super.apply(this, arguments);
+    }
+    return privateClassExtendingPrivateClassInModule;
+})(privateClass);
+var publicClassExtendingPublicClass = (function (_super) {
+    __extends(publicClassExtendingPublicClass, _super);
+    function publicClassExtendingPublicClass() {
+        _super.apply(this, arguments);
+    }
+    return publicClassExtendingPublicClass;
+})(publicClass);
+exports.publicClassExtendingPublicClass = publicClassExtendingPublicClass;
+var publicClassExtendingPrivateClass = (function (_super) {
+    __extends(publicClassExtendingPrivateClass, _super);
+    function publicClassExtendingPrivateClass() {
+        _super.apply(this, arguments);
+    }
+    return publicClassExtendingPrivateClass;
+})(privateClass);
+exports.publicClassExtendingPrivateClass = publicClassExtendingPrivateClass;
+var privateClassExtendingFromPrivateModuleClass = (function (_super) {
+    __extends(privateClassExtendingFromPrivateModuleClass, _super);
+    function privateClassExtendingFromPrivateModuleClass() {
+        _super.apply(this, arguments);
+    }
+    return privateClassExtendingFromPrivateModuleClass;
+})(privateModule.publicClassInPrivateModule);
+var publicClassExtendingFromPrivateModuleClass = (function (_super) {
+    __extends(publicClassExtendingFromPrivateModuleClass, _super);
+    function publicClassExtendingFromPrivateModuleClass() {
+        _super.apply(this, arguments);
+    }
+    return publicClassExtendingFromPrivateModuleClass;
+})(privateModule.publicClassInPrivateModule);
+exports.publicClassExtendingFromPrivateModuleClass = publicClassExtendingFromPrivateModuleClass;
+//// [privacyClassExtendsClauseDeclFile_GlobalFile.js]
+var __extends = this.__extends || function (d, b) {
+    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
+    function __() { this.constructor = d; }
+    __.prototype = b.prototype;
+    d.prototype = new __();
+};
+var publicModuleInGlobal;
+(function (publicModuleInGlobal) {
+    var publicClassInPublicModule = (function () {
+        function publicClassInPublicModule() {
+        }
+        publicClassInPublicModule.prototype.f1 = function () {
+        };
+        return publicClassInPublicModule;
+    })();
+    publicModuleInGlobal.publicClassInPublicModule = publicClassInPublicModule;
+    var privateClassInPublicModule = (function () {
+        function privateClassInPublicModule() {
+        }
+        return privateClassInPublicModule;
+    })();
+    var privateClassExtendingPublicClassInModule = (function (_super) {
+        __extends(privateClassExtendingPublicClassInModule, _super);
+        function privateClassExtendingPublicClassInModule() {
+            _super.apply(this, arguments);
+        }
+        return privateClassExtendingPublicClassInModule;
+    })(publicClassInPublicModule);
+    var privateClassExtendingPrivateClassInModule = (function (_super) {
+        __extends(privateClassExtendingPrivateClassInModule, _super);
+        function privateClassExtendingPrivateClassInModule() {
+            _super.apply(this, arguments);
+        }
+        return privateClassExtendingPrivateClassInModule;
+    })(privateClassInPublicModule);
+    var publicClassExtendingPublicClassInModule = (function (_super) {
+        __extends(publicClassExtendingPublicClassInModule, _super);
+        function publicClassExtendingPublicClassInModule() {
+            _super.apply(this, arguments);
+        }
+        return publicClassExtendingPublicClassInModule;
+    })(publicClassInPublicModule);
+    publicModuleInGlobal.publicClassExtendingPublicClassInModule = publicClassExtendingPublicClassInModule;
+    var publicClassExtendingPrivateClassInModule = (function (_super) {
+        __extends(publicClassExtendingPrivateClassInModule, _super);
+        function publicClassExtendingPrivateClassInModule() {
+            _super.apply(this, arguments);
+        }
+        return publicClassExtendingPrivateClassInModule;
+    })(privateClassInPublicModule);
+    publicModuleInGlobal.publicClassExtendingPrivateClassInModule = publicClassExtendingPrivateClassInModule;
+})(publicModuleInGlobal || (publicModuleInGlobal = {}));
+var publicClassInGlobal = (function () {
+    function publicClassInGlobal() {
+    }
+    return publicClassInGlobal;
+})();
+var publicClassExtendingPublicClassInGlobal = (function (_super) {
+    __extends(publicClassExtendingPublicClassInGlobal, _super);
+    function publicClassExtendingPublicClassInGlobal() {
+        _super.apply(this, arguments);
+    }
+    return publicClassExtendingPublicClassInGlobal;
+})(publicClassInGlobal);
diff --git a/tests/baselines/reference/privacyClassImplementsClauseDeclFile.errors.txt b/tests/baselines/reference/privacyClassImplementsClauseDeclFile.errors.txt
new file mode 100644
index 00000000000..61b5e199b07
--- /dev/null
+++ b/tests/baselines/reference/privacyClassImplementsClauseDeclFile.errors.txt
@@ -0,0 +1,105 @@
+==== tests/cases/compiler/privacyClassImplementsClauseDeclFile_externalModule.ts (5 errors) ====
+    
+    export module publicModule {
+        export interface publicInterfaceInPublicModule {
+        }
+    
+        interface privateInterfaceInPublicModule {
+        }
+    
+        class privateClassImplementingPublicInterfaceInModule implements publicInterfaceInPublicModule {
+        }
+        class privateClassImplementingPrivateInterfaceInModule implements privateInterfaceInPublicModule {
+        }
+        export class publicClassImplementingPublicInterfaceInModule implements publicInterfaceInPublicModule {
+        }
+        export class publicClassImplementingPrivateInterfaceInModule implements privateInterfaceInPublicModule { // Should error
+                                                                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Implements clause of exported class 'publicClassImplementingPrivateInterfaceInModule' has or is using private name 'privateInterfaceInPublicModule'.
+        }
+    
+        class privateClassImplementingFromPrivateModuleInterface implements privateModule.publicInterfaceInPrivateModule {
+        }
+        export class publicClassImplementingFromPrivateModuleInterface implements privateModule.publicInterfaceInPrivateModule { // Should error
+                                                                                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Implements clause of exported class 'publicClassImplementingFromPrivateModuleInterface' has or is using name 'privateModule.publicInterfaceInPrivateModule' from private module 'privateModule'.
+        }
+    
+        export class publicClassImplementingPrivateAndPublicInterface implements privateInterfaceInPublicModule, publicInterfaceInPublicModule { // Should error
+                                                                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Implements clause of exported class 'publicClassImplementingPrivateAndPublicInterface' has or is using private name 'privateInterfaceInPublicModule'.
+        }
+    }
+    
+    module privateModule {
+        export interface publicInterfaceInPrivateModule {
+    
+        }
+    
+        interface privateInterfaceInPrivateModule {
+        }
+    
+        class privateClassImplementingPublicInterfaceInModule implements publicInterfaceInPrivateModule {
+        }
+        class privateClassImplementingPrivateInterfaceInModule implements privateInterfaceInPrivateModule {
+        }
+        export class publicClassImplementingPublicInterfaceInModule implements publicInterfaceInPrivateModule {
+        }
+        export class publicClassImplementingPrivateInterfaceInModule implements privateInterfaceInPrivateModule { 
+        }
+    
+        class privateClassImplementingFromPrivateModuleInterface implements privateModule.publicInterfaceInPrivateModule {
+        }
+        export class publicClassImplementingFromPrivateModuleInterface implements privateModule.publicInterfaceInPrivateModule {
+        }
+    }
+    
+    export interface publicInterface {
+    
+    }
+    
+    interface privateInterface {
+    }
+    
+    class privateClassImplementingPublicInterface implements publicInterface {
+    }
+    class privateClassImplementingPrivateInterfaceInModule implements privateInterface {
+    }
+    export class publicClassImplementingPublicInterface implements publicInterface {
+    }
+    export class publicClassImplementingPrivateInterface implements privateInterface { // Should error
+                                                                    ~~~~~~~~~~~~~~~~
+!!! Implements clause of exported class 'publicClassImplementingPrivateInterface' has or is using private name 'privateInterface'.
+    }
+    
+    class privateClassImplementingFromPrivateModuleInterface implements privateModule.publicInterfaceInPrivateModule {
+    }
+    export class publicClassImplementingFromPrivateModuleInterface implements privateModule.publicInterfaceInPrivateModule { // Should error
+                                                                              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Implements clause of exported class 'publicClassImplementingFromPrivateModuleInterface' has or is using name 'privateModule.publicInterfaceInPrivateModule' from private module 'privateModule'.
+    }
+    
+==== tests/cases/compiler/privacyClassImplementsClauseDeclFile_GlobalFile.ts (1 errors) ====
+    module publicModuleInGlobal {
+        export interface publicInterfaceInPublicModule {
+        }
+    
+        interface privateInterfaceInPublicModule {
+        }
+    
+        class privateClassImplementingPublicInterfaceInModule implements publicInterfaceInPublicModule {
+        }
+        class privateClassImplementingPrivateInterfaceInModule implements privateInterfaceInPublicModule {
+        }
+        export class publicClassImplementingPublicInterfaceInModule implements publicInterfaceInPublicModule {
+        }
+        export class publicClassImplementingPrivateInterfaceInModule implements privateInterfaceInPublicModule { // Should error
+                                                                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Implements clause of exported class 'publicClassImplementingPrivateInterfaceInModule' has or is using private name 'privateInterfaceInPublicModule'.
+        }
+    }
+    interface publicInterfaceInGlobal {
+    }
+    class publicClassImplementingPublicInterfaceInGlobal implements publicInterfaceInGlobal {
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/privacyClassImplementsClauseDeclFile.js b/tests/baselines/reference/privacyClassImplementsClauseDeclFile.js
new file mode 100644
index 00000000000..d4a1ffafd53
--- /dev/null
+++ b/tests/baselines/reference/privacyClassImplementsClauseDeclFile.js
@@ -0,0 +1,239 @@
+//// [tests/cases/compiler/privacyClassImplementsClauseDeclFile.ts] ////
+
+//// [privacyClassImplementsClauseDeclFile_externalModule.ts]
+
+export module publicModule {
+    export interface publicInterfaceInPublicModule {
+    }
+
+    interface privateInterfaceInPublicModule {
+    }
+
+    class privateClassImplementingPublicInterfaceInModule implements publicInterfaceInPublicModule {
+    }
+    class privateClassImplementingPrivateInterfaceInModule implements privateInterfaceInPublicModule {
+    }
+    export class publicClassImplementingPublicInterfaceInModule implements publicInterfaceInPublicModule {
+    }
+    export class publicClassImplementingPrivateInterfaceInModule implements privateInterfaceInPublicModule { // Should error
+    }
+
+    class privateClassImplementingFromPrivateModuleInterface implements privateModule.publicInterfaceInPrivateModule {
+    }
+    export class publicClassImplementingFromPrivateModuleInterface implements privateModule.publicInterfaceInPrivateModule { // Should error
+    }
+
+    export class publicClassImplementingPrivateAndPublicInterface implements privateInterfaceInPublicModule, publicInterfaceInPublicModule { // Should error
+    }
+}
+
+module privateModule {
+    export interface publicInterfaceInPrivateModule {
+
+    }
+
+    interface privateInterfaceInPrivateModule {
+    }
+
+    class privateClassImplementingPublicInterfaceInModule implements publicInterfaceInPrivateModule {
+    }
+    class privateClassImplementingPrivateInterfaceInModule implements privateInterfaceInPrivateModule {
+    }
+    export class publicClassImplementingPublicInterfaceInModule implements publicInterfaceInPrivateModule {
+    }
+    export class publicClassImplementingPrivateInterfaceInModule implements privateInterfaceInPrivateModule { 
+    }
+
+    class privateClassImplementingFromPrivateModuleInterface implements privateModule.publicInterfaceInPrivateModule {
+    }
+    export class publicClassImplementingFromPrivateModuleInterface implements privateModule.publicInterfaceInPrivateModule {
+    }
+}
+
+export interface publicInterface {
+
+}
+
+interface privateInterface {
+}
+
+class privateClassImplementingPublicInterface implements publicInterface {
+}
+class privateClassImplementingPrivateInterfaceInModule implements privateInterface {
+}
+export class publicClassImplementingPublicInterface implements publicInterface {
+}
+export class publicClassImplementingPrivateInterface implements privateInterface { // Should error
+}
+
+class privateClassImplementingFromPrivateModuleInterface implements privateModule.publicInterfaceInPrivateModule {
+}
+export class publicClassImplementingFromPrivateModuleInterface implements privateModule.publicInterfaceInPrivateModule { // Should error
+}
+
+//// [privacyClassImplementsClauseDeclFile_GlobalFile.ts]
+module publicModuleInGlobal {
+    export interface publicInterfaceInPublicModule {
+    }
+
+    interface privateInterfaceInPublicModule {
+    }
+
+    class privateClassImplementingPublicInterfaceInModule implements publicInterfaceInPublicModule {
+    }
+    class privateClassImplementingPrivateInterfaceInModule implements privateInterfaceInPublicModule {
+    }
+    export class publicClassImplementingPublicInterfaceInModule implements publicInterfaceInPublicModule {
+    }
+    export class publicClassImplementingPrivateInterfaceInModule implements privateInterfaceInPublicModule { // Should error
+    }
+}
+interface publicInterfaceInGlobal {
+}
+class publicClassImplementingPublicInterfaceInGlobal implements publicInterfaceInGlobal {
+}
+
+
+//// [privacyClassImplementsClauseDeclFile_externalModule.js]
+(function (publicModule) {
+    var privateClassImplementingPublicInterfaceInModule = (function () {
+        function privateClassImplementingPublicInterfaceInModule() {
+        }
+        return privateClassImplementingPublicInterfaceInModule;
+    })();
+    var privateClassImplementingPrivateInterfaceInModule = (function () {
+        function privateClassImplementingPrivateInterfaceInModule() {
+        }
+        return privateClassImplementingPrivateInterfaceInModule;
+    })();
+    var publicClassImplementingPublicInterfaceInModule = (function () {
+        function publicClassImplementingPublicInterfaceInModule() {
+        }
+        return publicClassImplementingPublicInterfaceInModule;
+    })();
+    publicModule.publicClassImplementingPublicInterfaceInModule = publicClassImplementingPublicInterfaceInModule;
+    var publicClassImplementingPrivateInterfaceInModule = (function () {
+        function publicClassImplementingPrivateInterfaceInModule() {
+        }
+        return publicClassImplementingPrivateInterfaceInModule;
+    })();
+    publicModule.publicClassImplementingPrivateInterfaceInModule = publicClassImplementingPrivateInterfaceInModule;
+    var privateClassImplementingFromPrivateModuleInterface = (function () {
+        function privateClassImplementingFromPrivateModuleInterface() {
+        }
+        return privateClassImplementingFromPrivateModuleInterface;
+    })();
+    var publicClassImplementingFromPrivateModuleInterface = (function () {
+        function publicClassImplementingFromPrivateModuleInterface() {
+        }
+        return publicClassImplementingFromPrivateModuleInterface;
+    })();
+    publicModule.publicClassImplementingFromPrivateModuleInterface = publicClassImplementingFromPrivateModuleInterface;
+    var publicClassImplementingPrivateAndPublicInterface = (function () {
+        function publicClassImplementingPrivateAndPublicInterface() {
+        }
+        return publicClassImplementingPrivateAndPublicInterface;
+    })();
+    publicModule.publicClassImplementingPrivateAndPublicInterface = publicClassImplementingPrivateAndPublicInterface;
+})(exports.publicModule || (exports.publicModule = {}));
+var publicModule = exports.publicModule;
+var privateModule;
+(function (privateModule) {
+    var privateClassImplementingPublicInterfaceInModule = (function () {
+        function privateClassImplementingPublicInterfaceInModule() {
+        }
+        return privateClassImplementingPublicInterfaceInModule;
+    })();
+    var privateClassImplementingPrivateInterfaceInModule = (function () {
+        function privateClassImplementingPrivateInterfaceInModule() {
+        }
+        return privateClassImplementingPrivateInterfaceInModule;
+    })();
+    var publicClassImplementingPublicInterfaceInModule = (function () {
+        function publicClassImplementingPublicInterfaceInModule() {
+        }
+        return publicClassImplementingPublicInterfaceInModule;
+    })();
+    privateModule.publicClassImplementingPublicInterfaceInModule = publicClassImplementingPublicInterfaceInModule;
+    var publicClassImplementingPrivateInterfaceInModule = (function () {
+        function publicClassImplementingPrivateInterfaceInModule() {
+        }
+        return publicClassImplementingPrivateInterfaceInModule;
+    })();
+    privateModule.publicClassImplementingPrivateInterfaceInModule = publicClassImplementingPrivateInterfaceInModule;
+    var privateClassImplementingFromPrivateModuleInterface = (function () {
+        function privateClassImplementingFromPrivateModuleInterface() {
+        }
+        return privateClassImplementingFromPrivateModuleInterface;
+    })();
+    var publicClassImplementingFromPrivateModuleInterface = (function () {
+        function publicClassImplementingFromPrivateModuleInterface() {
+        }
+        return publicClassImplementingFromPrivateModuleInterface;
+    })();
+    privateModule.publicClassImplementingFromPrivateModuleInterface = publicClassImplementingFromPrivateModuleInterface;
+})(privateModule || (privateModule = {}));
+var privateClassImplementingPublicInterface = (function () {
+    function privateClassImplementingPublicInterface() {
+    }
+    return privateClassImplementingPublicInterface;
+})();
+var privateClassImplementingPrivateInterfaceInModule = (function () {
+    function privateClassImplementingPrivateInterfaceInModule() {
+    }
+    return privateClassImplementingPrivateInterfaceInModule;
+})();
+var publicClassImplementingPublicInterface = (function () {
+    function publicClassImplementingPublicInterface() {
+    }
+    return publicClassImplementingPublicInterface;
+})();
+exports.publicClassImplementingPublicInterface = publicClassImplementingPublicInterface;
+var publicClassImplementingPrivateInterface = (function () {
+    function publicClassImplementingPrivateInterface() {
+    }
+    return publicClassImplementingPrivateInterface;
+})();
+exports.publicClassImplementingPrivateInterface = publicClassImplementingPrivateInterface;
+var privateClassImplementingFromPrivateModuleInterface = (function () {
+    function privateClassImplementingFromPrivateModuleInterface() {
+    }
+    return privateClassImplementingFromPrivateModuleInterface;
+})();
+var publicClassImplementingFromPrivateModuleInterface = (function () {
+    function publicClassImplementingFromPrivateModuleInterface() {
+    }
+    return publicClassImplementingFromPrivateModuleInterface;
+})();
+exports.publicClassImplementingFromPrivateModuleInterface = publicClassImplementingFromPrivateModuleInterface;
+//// [privacyClassImplementsClauseDeclFile_GlobalFile.js]
+var publicModuleInGlobal;
+(function (publicModuleInGlobal) {
+    var privateClassImplementingPublicInterfaceInModule = (function () {
+        function privateClassImplementingPublicInterfaceInModule() {
+        }
+        return privateClassImplementingPublicInterfaceInModule;
+    })();
+    var privateClassImplementingPrivateInterfaceInModule = (function () {
+        function privateClassImplementingPrivateInterfaceInModule() {
+        }
+        return privateClassImplementingPrivateInterfaceInModule;
+    })();
+    var publicClassImplementingPublicInterfaceInModule = (function () {
+        function publicClassImplementingPublicInterfaceInModule() {
+        }
+        return publicClassImplementingPublicInterfaceInModule;
+    })();
+    publicModuleInGlobal.publicClassImplementingPublicInterfaceInModule = publicClassImplementingPublicInterfaceInModule;
+    var publicClassImplementingPrivateInterfaceInModule = (function () {
+        function publicClassImplementingPrivateInterfaceInModule() {
+        }
+        return publicClassImplementingPrivateInterfaceInModule;
+    })();
+    publicModuleInGlobal.publicClassImplementingPrivateInterfaceInModule = publicClassImplementingPrivateInterfaceInModule;
+})(publicModuleInGlobal || (publicModuleInGlobal = {}));
+var publicClassImplementingPublicInterfaceInGlobal = (function () {
+    function publicClassImplementingPublicInterfaceInGlobal() {
+    }
+    return publicClassImplementingPublicInterfaceInGlobal;
+})();
diff --git a/tests/baselines/reference/privacyFunctionCannotNameParameterTypeDeclFile.errors.txt b/tests/baselines/reference/privacyFunctionCannotNameParameterTypeDeclFile.errors.txt
new file mode 100644
index 00000000000..269be5ed425
--- /dev/null
+++ b/tests/baselines/reference/privacyFunctionCannotNameParameterTypeDeclFile.errors.txt
@@ -0,0 +1,203 @@
+==== tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_consumer.ts (24 errors) ====
+    import exporter = require("privacyFunctionCannotNameParameterTypeDeclFile_exporter");
+    export class publicClassWithWithPrivateParmeterTypes {
+        static myPublicStaticMethod(param = exporter.createExportedWidget1()) { // Error
+                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Parameter 'param' of public static method from exported class has or is using name 'Widget1' from external module "tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_Widgets" but cannot be named.
+        }
+        private static myPrivateStaticMethod(param = exporter.createExportedWidget1()) {
+        }
+        myPublicMethod(param  = exporter.createExportedWidget1()) { // Error
+                       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Parameter 'param' of public method from exported class has or is using name 'Widget1' from external module "tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_Widgets" but cannot be named.
+        }
+        private myPrivateMethod(param = exporter.createExportedWidget1()) {
+        }
+        constructor(param = exporter.createExportedWidget1(), private param1 = exporter.createExportedWidget1(), public param2 = exporter.createExportedWidget1()) { // Error
+                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Parameter 'param' of constructor from exported class has or is using name 'Widget1' from external module "tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_Widgets" but cannot be named.
+                                                              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Parameter 'param1' of constructor from exported class has or is using name 'Widget1' from external module "tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_Widgets" but cannot be named.
+                                                                                                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Parameter 'param2' of constructor from exported class has or is using name 'Widget1' from external module "tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_Widgets" but cannot be named.
+        }
+    }
+    export class publicClassWithWithPrivateParmeterTypes1 {
+        static myPublicStaticMethod(param = exporter.createExportedWidget3()) { // Error
+                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Parameter 'param' of public static method from exported class has or is using name 'Widget3' from external module "GlobalWidgets" but cannot be named.
+        }
+        private static myPrivateStaticMethod(param = exporter.createExportedWidget3()) {
+        }
+        myPublicMethod(param  = exporter.createExportedWidget3()) { // Error
+                       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Parameter 'param' of public method from exported class has or is using name 'Widget3' from external module "GlobalWidgets" but cannot be named.
+        }
+        private myPrivateMethod(param = exporter.createExportedWidget3()) {
+        }
+        constructor(param = exporter.createExportedWidget3(), private param1 = exporter.createExportedWidget3(), public param2 = exporter.createExportedWidget3()) { // Error
+                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Parameter 'param' of constructor from exported class has or is using name 'Widget3' from external module "GlobalWidgets" but cannot be named.
+                                                              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Parameter 'param1' of constructor from exported class has or is using name 'Widget3' from external module "GlobalWidgets" but cannot be named.
+                                                                                                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Parameter 'param2' of constructor from exported class has or is using name 'Widget3' from external module "GlobalWidgets" but cannot be named.
+        }
+    }
+    
+    class privateClassWithWithPrivateParmeterTypes {
+        static myPublicStaticMethod(param = exporter.createExportedWidget1()) {
+        }
+        private static myPrivateStaticMethod(param = exporter.createExportedWidget1()) {
+        }
+        myPublicMethod(param  = exporter.createExportedWidget1()) {
+        }
+        private myPrivateMethod(param = exporter.createExportedWidget1()) {
+        }
+        constructor(param = exporter.createExportedWidget1(), private param1 = exporter.createExportedWidget1(), public param2 = exporter.createExportedWidget1()) {
+        }
+    }
+    class privateClassWithWithPrivateParmeterTypes2 {
+        static myPublicStaticMethod(param = exporter.createExportedWidget3()) {
+        }
+        private static myPrivateStaticMethod(param = exporter.createExportedWidget3()) {
+        }
+        myPublicMethod(param  = exporter.createExportedWidget3()) {
+        }
+        private myPrivateMethod(param = exporter.createExportedWidget3()) {
+        }
+        constructor(param = exporter.createExportedWidget3(), private param1 = exporter.createExportedWidget3(), public param2 = exporter.createExportedWidget3()) {
+        }
+    }
+    
+    export function publicFunctionWithPrivateParmeterTypes(param = exporter.createExportedWidget1()) { // Error
+                                                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Parameter 'param' of exported function has or is using name 'Widget1' from external module "tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_Widgets" but cannot be named.
+    }
+    function privateFunctionWithPrivateParmeterTypes(param = exporter.createExportedWidget1()) {
+    }
+    export function publicFunctionWithPrivateParmeterTypes1(param = exporter.createExportedWidget3()) { // Error
+                                                            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Parameter 'param' of exported function has or is using name 'Widget3' from external module "GlobalWidgets" but cannot be named.
+    }
+    function privateFunctionWithPrivateParmeterTypes1(param = exporter.createExportedWidget3()) {
+    }
+    
+    
+    export class publicClassWithPrivateModuleParameterTypes {
+        static myPublicStaticMethod(param= exporter.createExportedWidget2()) { // Error
+                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Parameter 'param' of public static method from exported class has or is using name 'SpecializedWidget.Widget2' from external module "tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_Widgets" but cannot be named.
+        }
+        myPublicMethod(param= exporter.createExportedWidget2()) { // Error
+                       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Parameter 'param' of public method from exported class has or is using name 'SpecializedWidget.Widget2' from external module "tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_Widgets" but cannot be named.
+        }
+        constructor(param= exporter.createExportedWidget2(), private param1= exporter.createExportedWidget2(), public param2= exporter.createExportedWidget2()) { // Error
+                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Parameter 'param' of constructor from exported class has or is using name 'SpecializedWidget.Widget2' from external module "tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_Widgets" but cannot be named.
+                                                             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Parameter 'param1' of constructor from exported class has or is using name 'SpecializedWidget.Widget2' from external module "tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_Widgets" but cannot be named.
+                                                                                                               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Parameter 'param2' of constructor from exported class has or is using name 'SpecializedWidget.Widget2' from external module "tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_Widgets" but cannot be named.
+        }
+    }
+    export class publicClassWithPrivateModuleParameterTypes2 {
+        static myPublicStaticMethod(param= exporter.createExportedWidget4()) { // Error
+                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Parameter 'param' of public static method from exported class has or is using name 'SpecializedGlobalWidget.Widget4' from external module "GlobalWidgets" but cannot be named.
+        }
+        myPublicMethod(param= exporter.createExportedWidget4()) { // Error
+                       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Parameter 'param' of public method from exported class has or is using name 'SpecializedGlobalWidget.Widget4' from external module "GlobalWidgets" but cannot be named.
+        }
+        constructor(param= exporter.createExportedWidget4(), private param1= exporter.createExportedWidget4(), public param2= exporter.createExportedWidget4()) { // Error
+                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Parameter 'param' of constructor from exported class has or is using name 'SpecializedGlobalWidget.Widget4' from external module "GlobalWidgets" but cannot be named.
+                                                             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Parameter 'param1' of constructor from exported class has or is using name 'SpecializedGlobalWidget.Widget4' from external module "GlobalWidgets" but cannot be named.
+                                                                                                               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Parameter 'param2' of constructor from exported class has or is using name 'SpecializedGlobalWidget.Widget4' from external module "GlobalWidgets" but cannot be named.
+        }
+    }
+    export function publicFunctionWithPrivateModuleParameterTypes(param= exporter.createExportedWidget2()) { // Error
+                                                                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Parameter 'param' of exported function has or is using name 'SpecializedWidget.Widget2' from external module "tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_Widgets" but cannot be named.
+    }
+    export function publicFunctionWithPrivateModuleParameterTypes1(param= exporter.createExportedWidget4()) { // Error
+                                                                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Parameter 'param' of exported function has or is using name 'SpecializedGlobalWidget.Widget4' from external module "GlobalWidgets" but cannot be named.
+    }
+    
+    
+    class privateClassWithPrivateModuleParameterTypes {
+        static myPublicStaticMethod(param= exporter.createExportedWidget2()) {
+        }
+        myPublicMethod(param= exporter.createExportedWidget2()) {
+        }
+        constructor(param= exporter.createExportedWidget2(), private param1= exporter.createExportedWidget2(), public param2= exporter.createExportedWidget2()) {
+        }
+    }
+    class privateClassWithPrivateModuleParameterTypes1 {
+        static myPublicStaticMethod(param= exporter.createExportedWidget4()) {
+        }
+        myPublicMethod(param= exporter.createExportedWidget4()) {
+        }
+        constructor(param= exporter.createExportedWidget4(), private param1= exporter.createExportedWidget4(), public param2= exporter.createExportedWidget4()) {
+        }
+    }
+    function privateFunctionWithPrivateModuleParameterTypes(param= exporter.createExportedWidget2()) {
+    }
+    function privateFunctionWithPrivateModuleParameterTypes1(param= exporter.createExportedWidget4()) {
+    }
+==== tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_GlobalWidgets.ts (0 errors) ====
+    
+    
+    declare module "GlobalWidgets" {
+        export class Widget3 {
+            name: string;
+        }
+        export function createWidget3(): Widget3;
+    
+        export module SpecializedGlobalWidget {
+            export class Widget4 {
+                name: string;
+            }
+            function createWidget4(): Widget4;
+        }
+    }
+    
+==== tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_Widgets.ts (0 errors) ====
+    export class Widget1 {
+        name = 'one';
+    }
+    export function createWidget1() {
+        return new Widget1();
+    }
+    
+    export module SpecializedWidget {
+        export class Widget2 {
+            name = 'one';
+        }
+        export function createWidget2() {
+            return new Widget2();
+        }
+    }
+    
+==== tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_exporter.ts (0 errors) ====
+    ///<reference path='privacyFunctionCannotNameParameterTypeDeclFile_GlobalWidgets.ts'/>
+    import Widgets = require("privacyFunctionCannotNameParameterTypeDeclFile_Widgets");
+    import Widgets1 = require("GlobalWidgets");
+    export function createExportedWidget1() {
+        return Widgets.createWidget1();
+    }
+    export function createExportedWidget2() {
+        return Widgets.SpecializedWidget.createWidget2();
+    }
+    export function createExportedWidget3() {
+        return Widgets1.createWidget3();
+    }
+    export function createExportedWidget4() {
+        return Widgets1.SpecializedGlobalWidget.createWidget4();
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/privacyFunctionCannotNameParameterTypeDeclFile.js b/tests/baselines/reference/privacyFunctionCannotNameParameterTypeDeclFile.js
new file mode 100644
index 00000000000..42250b88e89
--- /dev/null
+++ b/tests/baselines/reference/privacyFunctionCannotNameParameterTypeDeclFile.js
@@ -0,0 +1,425 @@
+//// [tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile.ts] ////
+
+//// [privacyFunctionCannotNameParameterTypeDeclFile_GlobalWidgets.ts]
+
+
+declare module "GlobalWidgets" {
+    export class Widget3 {
+        name: string;
+    }
+    export function createWidget3(): Widget3;
+
+    export module SpecializedGlobalWidget {
+        export class Widget4 {
+            name: string;
+        }
+        function createWidget4(): Widget4;
+    }
+}
+
+//// [privacyFunctionCannotNameParameterTypeDeclFile_Widgets.ts]
+export class Widget1 {
+    name = 'one';
+}
+export function createWidget1() {
+    return new Widget1();
+}
+
+export module SpecializedWidget {
+    export class Widget2 {
+        name = 'one';
+    }
+    export function createWidget2() {
+        return new Widget2();
+    }
+}
+
+//// [privacyFunctionCannotNameParameterTypeDeclFile_exporter.ts]
+///<reference path='privacyFunctionCannotNameParameterTypeDeclFile_GlobalWidgets.ts'/>
+import Widgets = require("privacyFunctionCannotNameParameterTypeDeclFile_Widgets");
+import Widgets1 = require("GlobalWidgets");
+export function createExportedWidget1() {
+    return Widgets.createWidget1();
+}
+export function createExportedWidget2() {
+    return Widgets.SpecializedWidget.createWidget2();
+}
+export function createExportedWidget3() {
+    return Widgets1.createWidget3();
+}
+export function createExportedWidget4() {
+    return Widgets1.SpecializedGlobalWidget.createWidget4();
+}
+
+//// [privacyFunctionCannotNameParameterTypeDeclFile_consumer.ts]
+import exporter = require("privacyFunctionCannotNameParameterTypeDeclFile_exporter");
+export class publicClassWithWithPrivateParmeterTypes {
+    static myPublicStaticMethod(param = exporter.createExportedWidget1()) { // Error
+    }
+    private static myPrivateStaticMethod(param = exporter.createExportedWidget1()) {
+    }
+    myPublicMethod(param  = exporter.createExportedWidget1()) { // Error
+    }
+    private myPrivateMethod(param = exporter.createExportedWidget1()) {
+    }
+    constructor(param = exporter.createExportedWidget1(), private param1 = exporter.createExportedWidget1(), public param2 = exporter.createExportedWidget1()) { // Error
+    }
+}
+export class publicClassWithWithPrivateParmeterTypes1 {
+    static myPublicStaticMethod(param = exporter.createExportedWidget3()) { // Error
+    }
+    private static myPrivateStaticMethod(param = exporter.createExportedWidget3()) {
+    }
+    myPublicMethod(param  = exporter.createExportedWidget3()) { // Error
+    }
+    private myPrivateMethod(param = exporter.createExportedWidget3()) {
+    }
+    constructor(param = exporter.createExportedWidget3(), private param1 = exporter.createExportedWidget3(), public param2 = exporter.createExportedWidget3()) { // Error
+    }
+}
+
+class privateClassWithWithPrivateParmeterTypes {
+    static myPublicStaticMethod(param = exporter.createExportedWidget1()) {
+    }
+    private static myPrivateStaticMethod(param = exporter.createExportedWidget1()) {
+    }
+    myPublicMethod(param  = exporter.createExportedWidget1()) {
+    }
+    private myPrivateMethod(param = exporter.createExportedWidget1()) {
+    }
+    constructor(param = exporter.createExportedWidget1(), private param1 = exporter.createExportedWidget1(), public param2 = exporter.createExportedWidget1()) {
+    }
+}
+class privateClassWithWithPrivateParmeterTypes2 {
+    static myPublicStaticMethod(param = exporter.createExportedWidget3()) {
+    }
+    private static myPrivateStaticMethod(param = exporter.createExportedWidget3()) {
+    }
+    myPublicMethod(param  = exporter.createExportedWidget3()) {
+    }
+    private myPrivateMethod(param = exporter.createExportedWidget3()) {
+    }
+    constructor(param = exporter.createExportedWidget3(), private param1 = exporter.createExportedWidget3(), public param2 = exporter.createExportedWidget3()) {
+    }
+}
+
+export function publicFunctionWithPrivateParmeterTypes(param = exporter.createExportedWidget1()) { // Error
+}
+function privateFunctionWithPrivateParmeterTypes(param = exporter.createExportedWidget1()) {
+}
+export function publicFunctionWithPrivateParmeterTypes1(param = exporter.createExportedWidget3()) { // Error
+}
+function privateFunctionWithPrivateParmeterTypes1(param = exporter.createExportedWidget3()) {
+}
+
+
+export class publicClassWithPrivateModuleParameterTypes {
+    static myPublicStaticMethod(param= exporter.createExportedWidget2()) { // Error
+    }
+    myPublicMethod(param= exporter.createExportedWidget2()) { // Error
+    }
+    constructor(param= exporter.createExportedWidget2(), private param1= exporter.createExportedWidget2(), public param2= exporter.createExportedWidget2()) { // Error
+    }
+}
+export class publicClassWithPrivateModuleParameterTypes2 {
+    static myPublicStaticMethod(param= exporter.createExportedWidget4()) { // Error
+    }
+    myPublicMethod(param= exporter.createExportedWidget4()) { // Error
+    }
+    constructor(param= exporter.createExportedWidget4(), private param1= exporter.createExportedWidget4(), public param2= exporter.createExportedWidget4()) { // Error
+    }
+}
+export function publicFunctionWithPrivateModuleParameterTypes(param= exporter.createExportedWidget2()) { // Error
+}
+export function publicFunctionWithPrivateModuleParameterTypes1(param= exporter.createExportedWidget4()) { // Error
+}
+
+
+class privateClassWithPrivateModuleParameterTypes {
+    static myPublicStaticMethod(param= exporter.createExportedWidget2()) {
+    }
+    myPublicMethod(param= exporter.createExportedWidget2()) {
+    }
+    constructor(param= exporter.createExportedWidget2(), private param1= exporter.createExportedWidget2(), public param2= exporter.createExportedWidget2()) {
+    }
+}
+class privateClassWithPrivateModuleParameterTypes1 {
+    static myPublicStaticMethod(param= exporter.createExportedWidget4()) {
+    }
+    myPublicMethod(param= exporter.createExportedWidget4()) {
+    }
+    constructor(param= exporter.createExportedWidget4(), private param1= exporter.createExportedWidget4(), public param2= exporter.createExportedWidget4()) {
+    }
+}
+function privateFunctionWithPrivateModuleParameterTypes(param= exporter.createExportedWidget2()) {
+}
+function privateFunctionWithPrivateModuleParameterTypes1(param= exporter.createExportedWidget4()) {
+}
+
+//// [privacyFunctionCannotNameParameterTypeDeclFile_GlobalWidgets.js]
+//// [privacyFunctionCannotNameParameterTypeDeclFile_Widgets.js]
+var Widget1 = (function () {
+    function Widget1() {
+        this.name = 'one';
+    }
+    return Widget1;
+})();
+exports.Widget1 = Widget1;
+function createWidget1() {
+    return new Widget1();
+}
+exports.createWidget1 = createWidget1;
+(function (SpecializedWidget) {
+    var Widget2 = (function () {
+        function Widget2() {
+            this.name = 'one';
+        }
+        return Widget2;
+    })();
+    SpecializedWidget.Widget2 = Widget2;
+    function createWidget2() {
+        return new Widget2();
+    }
+    SpecializedWidget.createWidget2 = createWidget2;
+})(exports.SpecializedWidget || (exports.SpecializedWidget = {}));
+var SpecializedWidget = exports.SpecializedWidget;
+//// [privacyFunctionCannotNameParameterTypeDeclFile_exporter.js]
+///<reference path='privacyFunctionCannotNameParameterTypeDeclFile_GlobalWidgets.ts'/>
+var Widgets = require("privacyFunctionCannotNameParameterTypeDeclFile_Widgets");
+var Widgets1 = require("GlobalWidgets");
+function createExportedWidget1() {
+    return Widgets.createWidget1();
+}
+exports.createExportedWidget1 = createExportedWidget1;
+function createExportedWidget2() {
+    return Widgets.SpecializedWidget.createWidget2();
+}
+exports.createExportedWidget2 = createExportedWidget2;
+function createExportedWidget3() {
+    return Widgets1.createWidget3();
+}
+exports.createExportedWidget3 = createExportedWidget3;
+function createExportedWidget4() {
+    return Widgets1.SpecializedGlobalWidget.createWidget4();
+}
+exports.createExportedWidget4 = createExportedWidget4;
+//// [privacyFunctionCannotNameParameterTypeDeclFile_consumer.js]
+var exporter = require("privacyFunctionCannotNameParameterTypeDeclFile_exporter");
+var publicClassWithWithPrivateParmeterTypes = (function () {
+    function publicClassWithWithPrivateParmeterTypes(param, param1, param2) {
+        if (param === void 0) { param = exporter.createExportedWidget1(); }
+        if (param1 === void 0) { param1 = exporter.createExportedWidget1(); }
+        if (param2 === void 0) { param2 = exporter.createExportedWidget1(); }
+        this.param1 = param1;
+        this.param2 = param2;
+    }
+    publicClassWithWithPrivateParmeterTypes.myPublicStaticMethod = function (param) {
+        if (param === void 0) { param = exporter.createExportedWidget1(); }
+    };
+    publicClassWithWithPrivateParmeterTypes.myPrivateStaticMethod = function (param) {
+        if (param === void 0) { param = exporter.createExportedWidget1(); }
+    };
+    publicClassWithWithPrivateParmeterTypes.prototype.myPublicMethod = function (param) {
+        if (param === void 0) { param = exporter.createExportedWidget1(); }
+    };
+    publicClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod = function (param) {
+        if (param === void 0) { param = exporter.createExportedWidget1(); }
+    };
+    return publicClassWithWithPrivateParmeterTypes;
+})();
+exports.publicClassWithWithPrivateParmeterTypes = publicClassWithWithPrivateParmeterTypes;
+var publicClassWithWithPrivateParmeterTypes1 = (function () {
+    function publicClassWithWithPrivateParmeterTypes1(param, param1, param2) {
+        if (param === void 0) { param = exporter.createExportedWidget3(); }
+        if (param1 === void 0) { param1 = exporter.createExportedWidget3(); }
+        if (param2 === void 0) { param2 = exporter.createExportedWidget3(); }
+        this.param1 = param1;
+        this.param2 = param2;
+    }
+    publicClassWithWithPrivateParmeterTypes1.myPublicStaticMethod = function (param) {
+        if (param === void 0) { param = exporter.createExportedWidget3(); }
+    };
+    publicClassWithWithPrivateParmeterTypes1.myPrivateStaticMethod = function (param) {
+        if (param === void 0) { param = exporter.createExportedWidget3(); }
+    };
+    publicClassWithWithPrivateParmeterTypes1.prototype.myPublicMethod = function (param) {
+        if (param === void 0) { param = exporter.createExportedWidget3(); }
+    };
+    publicClassWithWithPrivateParmeterTypes1.prototype.myPrivateMethod = function (param) {
+        if (param === void 0) { param = exporter.createExportedWidget3(); }
+    };
+    return publicClassWithWithPrivateParmeterTypes1;
+})();
+exports.publicClassWithWithPrivateParmeterTypes1 = publicClassWithWithPrivateParmeterTypes1;
+var privateClassWithWithPrivateParmeterTypes = (function () {
+    function privateClassWithWithPrivateParmeterTypes(param, param1, param2) {
+        if (param === void 0) { param = exporter.createExportedWidget1(); }
+        if (param1 === void 0) { param1 = exporter.createExportedWidget1(); }
+        if (param2 === void 0) { param2 = exporter.createExportedWidget1(); }
+        this.param1 = param1;
+        this.param2 = param2;
+    }
+    privateClassWithWithPrivateParmeterTypes.myPublicStaticMethod = function (param) {
+        if (param === void 0) { param = exporter.createExportedWidget1(); }
+    };
+    privateClassWithWithPrivateParmeterTypes.myPrivateStaticMethod = function (param) {
+        if (param === void 0) { param = exporter.createExportedWidget1(); }
+    };
+    privateClassWithWithPrivateParmeterTypes.prototype.myPublicMethod = function (param) {
+        if (param === void 0) { param = exporter.createExportedWidget1(); }
+    };
+    privateClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod = function (param) {
+        if (param === void 0) { param = exporter.createExportedWidget1(); }
+    };
+    return privateClassWithWithPrivateParmeterTypes;
+})();
+var privateClassWithWithPrivateParmeterTypes2 = (function () {
+    function privateClassWithWithPrivateParmeterTypes2(param, param1, param2) {
+        if (param === void 0) { param = exporter.createExportedWidget3(); }
+        if (param1 === void 0) { param1 = exporter.createExportedWidget3(); }
+        if (param2 === void 0) { param2 = exporter.createExportedWidget3(); }
+        this.param1 = param1;
+        this.param2 = param2;
+    }
+    privateClassWithWithPrivateParmeterTypes2.myPublicStaticMethod = function (param) {
+        if (param === void 0) { param = exporter.createExportedWidget3(); }
+    };
+    privateClassWithWithPrivateParmeterTypes2.myPrivateStaticMethod = function (param) {
+        if (param === void 0) { param = exporter.createExportedWidget3(); }
+    };
+    privateClassWithWithPrivateParmeterTypes2.prototype.myPublicMethod = function (param) {
+        if (param === void 0) { param = exporter.createExportedWidget3(); }
+    };
+    privateClassWithWithPrivateParmeterTypes2.prototype.myPrivateMethod = function (param) {
+        if (param === void 0) { param = exporter.createExportedWidget3(); }
+    };
+    return privateClassWithWithPrivateParmeterTypes2;
+})();
+function publicFunctionWithPrivateParmeterTypes(param) {
+    if (param === void 0) { param = exporter.createExportedWidget1(); }
+}
+exports.publicFunctionWithPrivateParmeterTypes = publicFunctionWithPrivateParmeterTypes;
+function privateFunctionWithPrivateParmeterTypes(param) {
+    if (param === void 0) { param = exporter.createExportedWidget1(); }
+}
+function publicFunctionWithPrivateParmeterTypes1(param) {
+    if (param === void 0) { param = exporter.createExportedWidget3(); }
+}
+exports.publicFunctionWithPrivateParmeterTypes1 = publicFunctionWithPrivateParmeterTypes1;
+function privateFunctionWithPrivateParmeterTypes1(param) {
+    if (param === void 0) { param = exporter.createExportedWidget3(); }
+}
+var publicClassWithPrivateModuleParameterTypes = (function () {
+    function publicClassWithPrivateModuleParameterTypes(param, param1, param2) {
+        if (param === void 0) { param = exporter.createExportedWidget2(); }
+        if (param1 === void 0) { param1 = exporter.createExportedWidget2(); }
+        if (param2 === void 0) { param2 = exporter.createExportedWidget2(); }
+        this.param1 = param1;
+        this.param2 = param2;
+    }
+    publicClassWithPrivateModuleParameterTypes.myPublicStaticMethod = function (param) {
+        if (param === void 0) { param = exporter.createExportedWidget2(); }
+    };
+    publicClassWithPrivateModuleParameterTypes.prototype.myPublicMethod = function (param) {
+        if (param === void 0) { param = exporter.createExportedWidget2(); }
+    };
+    return publicClassWithPrivateModuleParameterTypes;
+})();
+exports.publicClassWithPrivateModuleParameterTypes = publicClassWithPrivateModuleParameterTypes;
+var publicClassWithPrivateModuleParameterTypes2 = (function () {
+    function publicClassWithPrivateModuleParameterTypes2(param, param1, param2) {
+        if (param === void 0) { param = exporter.createExportedWidget4(); }
+        if (param1 === void 0) { param1 = exporter.createExportedWidget4(); }
+        if (param2 === void 0) { param2 = exporter.createExportedWidget4(); }
+        this.param1 = param1;
+        this.param2 = param2;
+    }
+    publicClassWithPrivateModuleParameterTypes2.myPublicStaticMethod = function (param) {
+        if (param === void 0) { param = exporter.createExportedWidget4(); }
+    };
+    publicClassWithPrivateModuleParameterTypes2.prototype.myPublicMethod = function (param) {
+        if (param === void 0) { param = exporter.createExportedWidget4(); }
+    };
+    return publicClassWithPrivateModuleParameterTypes2;
+})();
+exports.publicClassWithPrivateModuleParameterTypes2 = publicClassWithPrivateModuleParameterTypes2;
+function publicFunctionWithPrivateModuleParameterTypes(param) {
+    if (param === void 0) { param = exporter.createExportedWidget2(); }
+}
+exports.publicFunctionWithPrivateModuleParameterTypes = publicFunctionWithPrivateModuleParameterTypes;
+function publicFunctionWithPrivateModuleParameterTypes1(param) {
+    if (param === void 0) { param = exporter.createExportedWidget4(); }
+}
+exports.publicFunctionWithPrivateModuleParameterTypes1 = publicFunctionWithPrivateModuleParameterTypes1;
+var privateClassWithPrivateModuleParameterTypes = (function () {
+    function privateClassWithPrivateModuleParameterTypes(param, param1, param2) {
+        if (param === void 0) { param = exporter.createExportedWidget2(); }
+        if (param1 === void 0) { param1 = exporter.createExportedWidget2(); }
+        if (param2 === void 0) { param2 = exporter.createExportedWidget2(); }
+        this.param1 = param1;
+        this.param2 = param2;
+    }
+    privateClassWithPrivateModuleParameterTypes.myPublicStaticMethod = function (param) {
+        if (param === void 0) { param = exporter.createExportedWidget2(); }
+    };
+    privateClassWithPrivateModuleParameterTypes.prototype.myPublicMethod = function (param) {
+        if (param === void 0) { param = exporter.createExportedWidget2(); }
+    };
+    return privateClassWithPrivateModuleParameterTypes;
+})();
+var privateClassWithPrivateModuleParameterTypes1 = (function () {
+    function privateClassWithPrivateModuleParameterTypes1(param, param1, param2) {
+        if (param === void 0) { param = exporter.createExportedWidget4(); }
+        if (param1 === void 0) { param1 = exporter.createExportedWidget4(); }
+        if (param2 === void 0) { param2 = exporter.createExportedWidget4(); }
+        this.param1 = param1;
+        this.param2 = param2;
+    }
+    privateClassWithPrivateModuleParameterTypes1.myPublicStaticMethod = function (param) {
+        if (param === void 0) { param = exporter.createExportedWidget4(); }
+    };
+    privateClassWithPrivateModuleParameterTypes1.prototype.myPublicMethod = function (param) {
+        if (param === void 0) { param = exporter.createExportedWidget4(); }
+    };
+    return privateClassWithPrivateModuleParameterTypes1;
+})();
+function privateFunctionWithPrivateModuleParameterTypes(param) {
+    if (param === void 0) { param = exporter.createExportedWidget2(); }
+}
+function privateFunctionWithPrivateModuleParameterTypes1(param) {
+    if (param === void 0) { param = exporter.createExportedWidget4(); }
+}
+
+
+//// [privacyFunctionCannotNameParameterTypeDeclFile_GlobalWidgets.d.ts]
+declare module "GlobalWidgets" {
+    class Widget3 {
+        name: string;
+    }
+    function createWidget3(): Widget3;
+    module SpecializedGlobalWidget {
+        class Widget4 {
+            name: string;
+        }
+        function createWidget4(): Widget4;
+    }
+}
+//// [privacyFunctionCannotNameParameterTypeDeclFile_Widgets.d.ts]
+export declare class Widget1 {
+    name: string;
+}
+export declare function createWidget1(): Widget1;
+export declare module SpecializedWidget {
+    class Widget2 {
+        name: string;
+    }
+    function createWidget2(): Widget2;
+}
+//// [privacyFunctionCannotNameParameterTypeDeclFile_exporter.d.ts]
+/// <reference path='privacyFunctionCannotNameParameterTypeDeclFile_GlobalWidgets.d.ts' />
+import Widgets = require("privacyFunctionCannotNameParameterTypeDeclFile_Widgets");
+import Widgets1 = require("GlobalWidgets");
+export declare function createExportedWidget1(): Widgets.Widget1;
+export declare function createExportedWidget2(): Widgets.SpecializedWidget.Widget2;
+export declare function createExportedWidget3(): Widgets1.Widget3;
+export declare function createExportedWidget4(): Widgets1.SpecializedGlobalWidget.Widget4;
diff --git a/tests/baselines/reference/privacyFunctionCannotNameReturnTypeDeclFile.errors.txt b/tests/baselines/reference/privacyFunctionCannotNameReturnTypeDeclFile.errors.txt
new file mode 100644
index 00000000000..834e3d783c6
--- /dev/null
+++ b/tests/baselines/reference/privacyFunctionCannotNameReturnTypeDeclFile.errors.txt
@@ -0,0 +1,186 @@
+==== tests/cases/compiler/privacyFunctionReturnTypeDeclFile_consumer.ts (12 errors) ====
+    import exporter = require("privacyFunctionReturnTypeDeclFile_exporter");
+    export class publicClassWithWithPrivateParmeterTypes {
+        static myPublicStaticMethod() { // Error
+               ~~~~~~~~~~~~~~~~~~~~
+!!! Return type of public static method from exported class has or is using name 'Widget1' from external module "tests/cases/compiler/privacyFunctionReturnTypeDeclFile_Widgets" but cannot be named.
+            return exporter.createExportedWidget1();
+        }
+        private static myPrivateStaticMethod() {
+            return exporter.createExportedWidget1();;
+        }
+        myPublicMethod() { // Error
+        ~~~~~~~~~~~~~~
+!!! Return type of public method from exported class has or is using name 'Widget1' from external module "tests/cases/compiler/privacyFunctionReturnTypeDeclFile_Widgets" but cannot be named.
+            return exporter.createExportedWidget1();;
+        }
+        private myPrivateMethod() {
+            return exporter.createExportedWidget1();;
+        }
+        static myPublicStaticMethod1() { // Error
+               ~~~~~~~~~~~~~~~~~~~~~
+!!! Return type of public static method from exported class has or is using name 'Widget3' from external module "GlobalWidgets" but cannot be named.
+            return exporter.createExportedWidget3();
+        }
+        private static myPrivateStaticMethod1() {
+            return exporter.createExportedWidget3();;
+        }
+        myPublicMethod1() { // Error
+        ~~~~~~~~~~~~~~~
+!!! Return type of public method from exported class has or is using name 'Widget3' from external module "GlobalWidgets" but cannot be named.
+            return exporter.createExportedWidget3();;
+        }
+        private myPrivateMethod1() {
+            return exporter.createExportedWidget3();;
+        }
+    }
+    
+    class privateClassWithWithPrivateParmeterTypes {
+        static myPublicStaticMethod() { 
+            return exporter.createExportedWidget1();
+        }
+        private static myPrivateStaticMethod() {
+            return exporter.createExportedWidget1();;
+        }
+        myPublicMethod() { 
+            return exporter.createExportedWidget1();;
+        }
+        private myPrivateMethod() {
+            return exporter.createExportedWidget1();;
+        }
+        static myPublicStaticMethod1() { 
+            return exporter.createExportedWidget3();
+        }
+        private static myPrivateStaticMethod1() {
+            return exporter.createExportedWidget3();;
+        }
+        myPublicMethod1() { 
+            return exporter.createExportedWidget3();;
+        }
+        private myPrivateMethod1() {
+            return exporter.createExportedWidget3();;
+        }
+    }
+    
+    export function publicFunctionWithPrivateParmeterTypes() { // Error
+                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Return type of exported function has or is using name 'Widget1' from external module "tests/cases/compiler/privacyFunctionReturnTypeDeclFile_Widgets" but cannot be named.
+        return exporter.createExportedWidget1();
+    }
+    function privateFunctionWithPrivateParmeterTypes()   {
+        return exporter.createExportedWidget1();
+    }
+    export function publicFunctionWithPrivateParmeterTypes1() { // Error
+                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Return type of exported function has or is using name 'Widget3' from external module "GlobalWidgets" but cannot be named.
+        return exporter.createExportedWidget3();
+    }
+    function privateFunctionWithPrivateParmeterTypes1() {
+        return exporter.createExportedWidget3();
+    }
+    
+    export class publicClassWithPrivateModuleReturnTypes {
+        static myPublicStaticMethod() { // Error
+               ~~~~~~~~~~~~~~~~~~~~
+!!! Return type of public static method from exported class has or is using name 'SpecializedWidget.Widget2' from external module "tests/cases/compiler/privacyFunctionReturnTypeDeclFile_Widgets" but cannot be named.
+            return exporter.createExportedWidget2();
+        }
+        myPublicMethod() { // Error
+        ~~~~~~~~~~~~~~
+!!! Return type of public method from exported class has or is using name 'SpecializedWidget.Widget2' from external module "tests/cases/compiler/privacyFunctionReturnTypeDeclFile_Widgets" but cannot be named.
+            return exporter.createExportedWidget2();
+        }
+        static myPublicStaticMethod1() { // Error
+               ~~~~~~~~~~~~~~~~~~~~~
+!!! Return type of public static method from exported class has or is using name 'SpecializedGlobalWidget.Widget4' from external module "GlobalWidgets" but cannot be named.
+            return exporter.createExportedWidget4();
+        }
+        myPublicMethod1() { // Error
+        ~~~~~~~~~~~~~~~
+!!! Return type of public method from exported class has or is using name 'SpecializedGlobalWidget.Widget4' from external module "GlobalWidgets" but cannot be named.
+            return exporter.createExportedWidget4();
+        }
+    }
+    export function publicFunctionWithPrivateModuleReturnTypes() { // Error
+                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Return type of exported function has or is using name 'SpecializedWidget.Widget2' from external module "tests/cases/compiler/privacyFunctionReturnTypeDeclFile_Widgets" but cannot be named.
+        return exporter.createExportedWidget2();
+    }
+    export function publicFunctionWithPrivateModuleReturnTypes1() { // Error
+                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Return type of exported function has or is using name 'SpecializedGlobalWidget.Widget4' from external module "GlobalWidgets" but cannot be named.
+        return exporter.createExportedWidget4();
+    }
+    
+    class privateClassWithPrivateModuleReturnTypes {
+        static myPublicStaticMethod() { 
+            return exporter.createExportedWidget2();
+        }
+        myPublicMethod() { 
+            return exporter.createExportedWidget2();
+        }
+        static myPublicStaticMethod1() { // Error
+            return exporter.createExportedWidget4();
+        }
+        myPublicMethod1() { // Error
+            return exporter.createExportedWidget4();
+        }
+    }
+    function privateFunctionWithPrivateModuleReturnTypes() { 
+        return exporter.createExportedWidget2();
+    }
+    function privateFunctionWithPrivateModuleReturnTypes1() {
+        return exporter.createExportedWidget4();
+    }
+    
+==== tests/cases/compiler/privacyFunctionReturnTypeDeclFile_GlobalWidgets.ts (0 errors) ====
+    
+    
+    declare module "GlobalWidgets" {
+        export class Widget3 {
+            name: string;
+        }
+        export function createWidget3(): Widget3;
+    
+        export module SpecializedGlobalWidget {
+            export class Widget4 {
+                name: string;
+            }
+            function createWidget4(): Widget4;
+        }
+    }
+    
+==== tests/cases/compiler/privacyFunctionReturnTypeDeclFile_Widgets.ts (0 errors) ====
+    export class Widget1 {
+        name = 'one';
+    }
+    export function createWidget1() {
+        return new Widget1();
+    }
+    
+    export module SpecializedWidget {
+        export class Widget2 {
+            name = 'one';
+        }
+        export function createWidget2() {
+            return new Widget2();
+        }
+    }
+    
+==== tests/cases/compiler/privacyFunctionReturnTypeDeclFile_exporter.ts (0 errors) ====
+    ///<reference path='privacyFunctionReturnTypeDeclFile_GlobalWidgets.ts'/>
+    import Widgets = require("privacyFunctionReturnTypeDeclFile_Widgets");
+    import Widgets1 = require("GlobalWidgets");
+    export function createExportedWidget1() {
+        return Widgets.createWidget1();
+    }
+    export function createExportedWidget2() {
+        return Widgets.SpecializedWidget.createWidget2();
+    }
+    export function createExportedWidget3() {
+        return Widgets1.createWidget3();
+    }
+    export function createExportedWidget4() {
+        return Widgets1.SpecializedGlobalWidget.createWidget4();
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/privacyFunctionCannotNameReturnTypeDeclFile.js b/tests/baselines/reference/privacyFunctionCannotNameReturnTypeDeclFile.js
new file mode 100644
index 00000000000..75a91f38c54
--- /dev/null
+++ b/tests/baselines/reference/privacyFunctionCannotNameReturnTypeDeclFile.js
@@ -0,0 +1,382 @@
+//// [tests/cases/compiler/privacyFunctionCannotNameReturnTypeDeclFile.ts] ////
+
+//// [privacyFunctionReturnTypeDeclFile_GlobalWidgets.ts]
+
+
+declare module "GlobalWidgets" {
+    export class Widget3 {
+        name: string;
+    }
+    export function createWidget3(): Widget3;
+
+    export module SpecializedGlobalWidget {
+        export class Widget4 {
+            name: string;
+        }
+        function createWidget4(): Widget4;
+    }
+}
+
+//// [privacyFunctionReturnTypeDeclFile_Widgets.ts]
+export class Widget1 {
+    name = 'one';
+}
+export function createWidget1() {
+    return new Widget1();
+}
+
+export module SpecializedWidget {
+    export class Widget2 {
+        name = 'one';
+    }
+    export function createWidget2() {
+        return new Widget2();
+    }
+}
+
+//// [privacyFunctionReturnTypeDeclFile_exporter.ts]
+///<reference path='privacyFunctionReturnTypeDeclFile_GlobalWidgets.ts'/>
+import Widgets = require("privacyFunctionReturnTypeDeclFile_Widgets");
+import Widgets1 = require("GlobalWidgets");
+export function createExportedWidget1() {
+    return Widgets.createWidget1();
+}
+export function createExportedWidget2() {
+    return Widgets.SpecializedWidget.createWidget2();
+}
+export function createExportedWidget3() {
+    return Widgets1.createWidget3();
+}
+export function createExportedWidget4() {
+    return Widgets1.SpecializedGlobalWidget.createWidget4();
+}
+
+//// [privacyFunctionReturnTypeDeclFile_consumer.ts]
+import exporter = require("privacyFunctionReturnTypeDeclFile_exporter");
+export class publicClassWithWithPrivateParmeterTypes {
+    static myPublicStaticMethod() { // Error
+        return exporter.createExportedWidget1();
+    }
+    private static myPrivateStaticMethod() {
+        return exporter.createExportedWidget1();;
+    }
+    myPublicMethod() { // Error
+        return exporter.createExportedWidget1();;
+    }
+    private myPrivateMethod() {
+        return exporter.createExportedWidget1();;
+    }
+    static myPublicStaticMethod1() { // Error
+        return exporter.createExportedWidget3();
+    }
+    private static myPrivateStaticMethod1() {
+        return exporter.createExportedWidget3();;
+    }
+    myPublicMethod1() { // Error
+        return exporter.createExportedWidget3();;
+    }
+    private myPrivateMethod1() {
+        return exporter.createExportedWidget3();;
+    }
+}
+
+class privateClassWithWithPrivateParmeterTypes {
+    static myPublicStaticMethod() { 
+        return exporter.createExportedWidget1();
+    }
+    private static myPrivateStaticMethod() {
+        return exporter.createExportedWidget1();;
+    }
+    myPublicMethod() { 
+        return exporter.createExportedWidget1();;
+    }
+    private myPrivateMethod() {
+        return exporter.createExportedWidget1();;
+    }
+    static myPublicStaticMethod1() { 
+        return exporter.createExportedWidget3();
+    }
+    private static myPrivateStaticMethod1() {
+        return exporter.createExportedWidget3();;
+    }
+    myPublicMethod1() { 
+        return exporter.createExportedWidget3();;
+    }
+    private myPrivateMethod1() {
+        return exporter.createExportedWidget3();;
+    }
+}
+
+export function publicFunctionWithPrivateParmeterTypes() { // Error
+    return exporter.createExportedWidget1();
+}
+function privateFunctionWithPrivateParmeterTypes()   {
+    return exporter.createExportedWidget1();
+}
+export function publicFunctionWithPrivateParmeterTypes1() { // Error
+    return exporter.createExportedWidget3();
+}
+function privateFunctionWithPrivateParmeterTypes1() {
+    return exporter.createExportedWidget3();
+}
+
+export class publicClassWithPrivateModuleReturnTypes {
+    static myPublicStaticMethod() { // Error
+        return exporter.createExportedWidget2();
+    }
+    myPublicMethod() { // Error
+        return exporter.createExportedWidget2();
+    }
+    static myPublicStaticMethod1() { // Error
+        return exporter.createExportedWidget4();
+    }
+    myPublicMethod1() { // Error
+        return exporter.createExportedWidget4();
+    }
+}
+export function publicFunctionWithPrivateModuleReturnTypes() { // Error
+    return exporter.createExportedWidget2();
+}
+export function publicFunctionWithPrivateModuleReturnTypes1() { // Error
+    return exporter.createExportedWidget4();
+}
+
+class privateClassWithPrivateModuleReturnTypes {
+    static myPublicStaticMethod() { 
+        return exporter.createExportedWidget2();
+    }
+    myPublicMethod() { 
+        return exporter.createExportedWidget2();
+    }
+    static myPublicStaticMethod1() { // Error
+        return exporter.createExportedWidget4();
+    }
+    myPublicMethod1() { // Error
+        return exporter.createExportedWidget4();
+    }
+}
+function privateFunctionWithPrivateModuleReturnTypes() { 
+    return exporter.createExportedWidget2();
+}
+function privateFunctionWithPrivateModuleReturnTypes1() {
+    return exporter.createExportedWidget4();
+}
+
+
+//// [privacyFunctionReturnTypeDeclFile_GlobalWidgets.js]
+//// [privacyFunctionReturnTypeDeclFile_Widgets.js]
+var Widget1 = (function () {
+    function Widget1() {
+        this.name = 'one';
+    }
+    return Widget1;
+})();
+exports.Widget1 = Widget1;
+function createWidget1() {
+    return new Widget1();
+}
+exports.createWidget1 = createWidget1;
+(function (SpecializedWidget) {
+    var Widget2 = (function () {
+        function Widget2() {
+            this.name = 'one';
+        }
+        return Widget2;
+    })();
+    SpecializedWidget.Widget2 = Widget2;
+    function createWidget2() {
+        return new Widget2();
+    }
+    SpecializedWidget.createWidget2 = createWidget2;
+})(exports.SpecializedWidget || (exports.SpecializedWidget = {}));
+var SpecializedWidget = exports.SpecializedWidget;
+//// [privacyFunctionReturnTypeDeclFile_exporter.js]
+///<reference path='privacyFunctionReturnTypeDeclFile_GlobalWidgets.ts'/>
+var Widgets = require("privacyFunctionReturnTypeDeclFile_Widgets");
+var Widgets1 = require("GlobalWidgets");
+function createExportedWidget1() {
+    return Widgets.createWidget1();
+}
+exports.createExportedWidget1 = createExportedWidget1;
+function createExportedWidget2() {
+    return Widgets.SpecializedWidget.createWidget2();
+}
+exports.createExportedWidget2 = createExportedWidget2;
+function createExportedWidget3() {
+    return Widgets1.createWidget3();
+}
+exports.createExportedWidget3 = createExportedWidget3;
+function createExportedWidget4() {
+    return Widgets1.SpecializedGlobalWidget.createWidget4();
+}
+exports.createExportedWidget4 = createExportedWidget4;
+//// [privacyFunctionReturnTypeDeclFile_consumer.js]
+var exporter = require("privacyFunctionReturnTypeDeclFile_exporter");
+var publicClassWithWithPrivateParmeterTypes = (function () {
+    function publicClassWithWithPrivateParmeterTypes() {
+    }
+    publicClassWithWithPrivateParmeterTypes.myPublicStaticMethod = function () {
+        return exporter.createExportedWidget1();
+    };
+    publicClassWithWithPrivateParmeterTypes.myPrivateStaticMethod = function () {
+        return exporter.createExportedWidget1();
+        ;
+    };
+    publicClassWithWithPrivateParmeterTypes.prototype.myPublicMethod = function () {
+        return exporter.createExportedWidget1();
+        ;
+    };
+    publicClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod = function () {
+        return exporter.createExportedWidget1();
+        ;
+    };
+    publicClassWithWithPrivateParmeterTypes.myPublicStaticMethod1 = function () {
+        return exporter.createExportedWidget3();
+    };
+    publicClassWithWithPrivateParmeterTypes.myPrivateStaticMethod1 = function () {
+        return exporter.createExportedWidget3();
+        ;
+    };
+    publicClassWithWithPrivateParmeterTypes.prototype.myPublicMethod1 = function () {
+        return exporter.createExportedWidget3();
+        ;
+    };
+    publicClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod1 = function () {
+        return exporter.createExportedWidget3();
+        ;
+    };
+    return publicClassWithWithPrivateParmeterTypes;
+})();
+exports.publicClassWithWithPrivateParmeterTypes = publicClassWithWithPrivateParmeterTypes;
+var privateClassWithWithPrivateParmeterTypes = (function () {
+    function privateClassWithWithPrivateParmeterTypes() {
+    }
+    privateClassWithWithPrivateParmeterTypes.myPublicStaticMethod = function () {
+        return exporter.createExportedWidget1();
+    };
+    privateClassWithWithPrivateParmeterTypes.myPrivateStaticMethod = function () {
+        return exporter.createExportedWidget1();
+        ;
+    };
+    privateClassWithWithPrivateParmeterTypes.prototype.myPublicMethod = function () {
+        return exporter.createExportedWidget1();
+        ;
+    };
+    privateClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod = function () {
+        return exporter.createExportedWidget1();
+        ;
+    };
+    privateClassWithWithPrivateParmeterTypes.myPublicStaticMethod1 = function () {
+        return exporter.createExportedWidget3();
+    };
+    privateClassWithWithPrivateParmeterTypes.myPrivateStaticMethod1 = function () {
+        return exporter.createExportedWidget3();
+        ;
+    };
+    privateClassWithWithPrivateParmeterTypes.prototype.myPublicMethod1 = function () {
+        return exporter.createExportedWidget3();
+        ;
+    };
+    privateClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod1 = function () {
+        return exporter.createExportedWidget3();
+        ;
+    };
+    return privateClassWithWithPrivateParmeterTypes;
+})();
+function publicFunctionWithPrivateParmeterTypes() {
+    return exporter.createExportedWidget1();
+}
+exports.publicFunctionWithPrivateParmeterTypes = publicFunctionWithPrivateParmeterTypes;
+function privateFunctionWithPrivateParmeterTypes() {
+    return exporter.createExportedWidget1();
+}
+function publicFunctionWithPrivateParmeterTypes1() {
+    return exporter.createExportedWidget3();
+}
+exports.publicFunctionWithPrivateParmeterTypes1 = publicFunctionWithPrivateParmeterTypes1;
+function privateFunctionWithPrivateParmeterTypes1() {
+    return exporter.createExportedWidget3();
+}
+var publicClassWithPrivateModuleReturnTypes = (function () {
+    function publicClassWithPrivateModuleReturnTypes() {
+    }
+    publicClassWithPrivateModuleReturnTypes.myPublicStaticMethod = function () {
+        return exporter.createExportedWidget2();
+    };
+    publicClassWithPrivateModuleReturnTypes.prototype.myPublicMethod = function () {
+        return exporter.createExportedWidget2();
+    };
+    publicClassWithPrivateModuleReturnTypes.myPublicStaticMethod1 = function () {
+        return exporter.createExportedWidget4();
+    };
+    publicClassWithPrivateModuleReturnTypes.prototype.myPublicMethod1 = function () {
+        return exporter.createExportedWidget4();
+    };
+    return publicClassWithPrivateModuleReturnTypes;
+})();
+exports.publicClassWithPrivateModuleReturnTypes = publicClassWithPrivateModuleReturnTypes;
+function publicFunctionWithPrivateModuleReturnTypes() {
+    return exporter.createExportedWidget2();
+}
+exports.publicFunctionWithPrivateModuleReturnTypes = publicFunctionWithPrivateModuleReturnTypes;
+function publicFunctionWithPrivateModuleReturnTypes1() {
+    return exporter.createExportedWidget4();
+}
+exports.publicFunctionWithPrivateModuleReturnTypes1 = publicFunctionWithPrivateModuleReturnTypes1;
+var privateClassWithPrivateModuleReturnTypes = (function () {
+    function privateClassWithPrivateModuleReturnTypes() {
+    }
+    privateClassWithPrivateModuleReturnTypes.myPublicStaticMethod = function () {
+        return exporter.createExportedWidget2();
+    };
+    privateClassWithPrivateModuleReturnTypes.prototype.myPublicMethod = function () {
+        return exporter.createExportedWidget2();
+    };
+    privateClassWithPrivateModuleReturnTypes.myPublicStaticMethod1 = function () {
+        return exporter.createExportedWidget4();
+    };
+    privateClassWithPrivateModuleReturnTypes.prototype.myPublicMethod1 = function () {
+        return exporter.createExportedWidget4();
+    };
+    return privateClassWithPrivateModuleReturnTypes;
+})();
+function privateFunctionWithPrivateModuleReturnTypes() {
+    return exporter.createExportedWidget2();
+}
+function privateFunctionWithPrivateModuleReturnTypes1() {
+    return exporter.createExportedWidget4();
+}
+
+
+//// [privacyFunctionReturnTypeDeclFile_GlobalWidgets.d.ts]
+declare module "GlobalWidgets" {
+    class Widget3 {
+        name: string;
+    }
+    function createWidget3(): Widget3;
+    module SpecializedGlobalWidget {
+        class Widget4 {
+            name: string;
+        }
+        function createWidget4(): Widget4;
+    }
+}
+//// [privacyFunctionReturnTypeDeclFile_Widgets.d.ts]
+export declare class Widget1 {
+    name: string;
+}
+export declare function createWidget1(): Widget1;
+export declare module SpecializedWidget {
+    class Widget2 {
+        name: string;
+    }
+    function createWidget2(): Widget2;
+}
+//// [privacyFunctionReturnTypeDeclFile_exporter.d.ts]
+/// <reference path='privacyFunctionReturnTypeDeclFile_GlobalWidgets.d.ts' />
+import Widgets = require("privacyFunctionReturnTypeDeclFile_Widgets");
+import Widgets1 = require("GlobalWidgets");
+export declare function createExportedWidget1(): Widgets.Widget1;
+export declare function createExportedWidget2(): Widgets.SpecializedWidget.Widget2;
+export declare function createExportedWidget3(): Widgets1.Widget3;
+export declare function createExportedWidget4(): Widgets1.SpecializedGlobalWidget.Widget4;
diff --git a/tests/baselines/reference/privacyFunctionParameterDeclFile.errors.txt b/tests/baselines/reference/privacyFunctionParameterDeclFile.errors.txt
new file mode 100644
index 00000000000..e4d45caccba
--- /dev/null
+++ b/tests/baselines/reference/privacyFunctionParameterDeclFile.errors.txt
@@ -0,0 +1,805 @@
+==== tests/cases/compiler/privacyFunctionParameterDeclFile_externalModule.ts (40 errors) ====
+    
+    class privateClass {
+    }
+    
+    export class publicClass {
+    }
+    
+    export interface publicInterfaceWithPrivateParmeterTypes {
+        new (param: privateClass): publicClass; // Error
+             ~~~~~~~~~~~~~~~~~~~
+!!! Parameter 'param' of constructor signature from exported interface has or is using private name 'privateClass'.
+        (param: privateClass): publicClass; // Error
+         ~~~~~~~~~~~~~~~~~~~
+!!! Parameter 'param' of call signature from exported interface has or is using private name 'privateClass'.
+        myMethod(param: privateClass): void; // Error
+                 ~~~~~~~~~~~~~~~~~~~
+!!! Parameter 'param' of method from exported interface has or is using private name 'privateClass'.
+    }
+    
+    export interface publicInterfaceWithPublicParmeterTypes {
+        new (param: publicClass): publicClass;
+        (param: publicClass): publicClass;
+        myMethod(param: publicClass): void;
+    }
+    
+    interface privateInterfaceWithPrivateParmeterTypes {
+        new (param: privateClass): privateClass;
+        (param: privateClass): privateClass;
+        myMethod(param: privateClass): void;
+    }
+    
+    interface privateInterfaceWithPublicParmeterTypes {
+        new (param: publicClass): publicClass;
+        (param: publicClass): publicClass;
+        myMethod(param: publicClass): void;
+    }
+    
+    export class publicClassWithWithPrivateParmeterTypes {
+        static myPublicStaticMethod(param: privateClass) { // Error
+                                    ~~~~~~~~~~~~~~~~~~~
+!!! Parameter 'param' of public static method from exported class has or is using private name 'privateClass'.
+        }
+        private static myPrivateStaticMethod(param: privateClass) {
+        }
+        myPublicMethod(param: privateClass) { // Error
+                       ~~~~~~~~~~~~~~~~~~~
+!!! Parameter 'param' of public method from exported class has or is using private name 'privateClass'.
+        }
+        private myPrivateMethod(param: privateClass) {
+        }
+        constructor(param: privateClass, private param1: privateClass, public param2: privateClass) { // Error
+                    ~~~~~~~~~~~~~~~~~~~
+!!! Parameter 'param' of constructor from exported class has or is using private name 'privateClass'.
+                                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Parameter 'param1' of constructor from exported class has or is using private name 'privateClass'.
+                                                                       ~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Parameter 'param2' of constructor from exported class has or is using private name 'privateClass'.
+        }
+    }
+    
+    export class publicClassWithWithPublicParmeterTypes {
+        static myPublicStaticMethod(param: publicClass) {
+        }
+        private static myPrivateStaticMethod(param: publicClass) {
+        }
+        myPublicMethod(param: publicClass) {
+        }
+        private myPrivateMethod(param: publicClass) {
+        }
+        constructor(param: publicClass, private param1: publicClass, public param2: publicClass) {
+        }
+    }
+    
+    class privateClassWithWithPrivateParmeterTypes {
+        static myPublicStaticMethod(param: privateClass) {
+        }
+        private static myPrivateStaticMethod(param: privateClass) {
+        }
+        myPublicMethod(param: privateClass) { 
+        }
+        private myPrivateMethod(param: privateClass) {
+        }
+        constructor(param: privateClass, private param1: privateClass, public param2: privateClass) {
+        }
+    }
+    
+    class privateClassWithWithPublicParmeterTypes {
+        static myPublicStaticMethod(param: publicClass) {
+        }
+        private static myPrivateStaticMethod(param: publicClass) {
+        }
+        myPublicMethod(param: publicClass) {
+        }
+        private myPrivateMethod(param: publicClass) {
+        }
+        constructor(param: publicClass, private param1: publicClass, public param2: publicClass) {
+        }
+    }
+    
+    export function publicFunctionWithPrivateParmeterTypes(param: privateClass) { // Error
+                                                           ~~~~~~~~~~~~~~~~~~~
+!!! Parameter 'param' of exported function has or is using private name 'privateClass'.
+    }
+    export function publicFunctionWithPublicParmeterTypes(param: publicClass) {
+    }
+    function privateFunctionWithPrivateParmeterTypes(param: privateClass) {
+    }
+    function privateFunctionWithPublicParmeterTypes(param: publicClass) {
+    }
+    
+    export declare function publicAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void; // Error
+                                                                          ~~~~~~~~~~~~~~~~~~~
+!!! Parameter 'param' of exported function has or is using private name 'privateClass'.
+    export declare function publicAmbientFunctionWithPublicParmeterTypes(param: publicClass): void;
+    declare function privateAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void;
+    declare function privateAmbientFunctionWithPublicParmeterTypes(param: publicClass): void;
+    
+    export interface publicInterfaceWithPrivateModuleParameterTypes {
+        new (param: privateModule.publicClass): publicClass; // Error
+             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Parameter 'param' of constructor signature from exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+        (param: privateModule.publicClass): publicClass; // Error
+         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Parameter 'param' of call signature from exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+        myMethod(param: privateModule.publicClass): void; // Error
+                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Parameter 'param' of method from exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+    }
+    export class publicClassWithPrivateModuleParameterTypes {
+        static myPublicStaticMethod(param: privateModule.publicClass) { // Error
+                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Parameter 'param' of public static method from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+        }
+        myPublicMethod(param: privateModule.publicClass) { // Error
+                       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Parameter 'param' of public method from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+        }
+        constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) { // Error
+                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Parameter 'param' of constructor from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+                                                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Parameter 'param1' of constructor from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+                                                                                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Parameter 'param2' of constructor from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+        }
+    }
+    export function publicFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) { // Error
+                                                                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Parameter 'param' of exported function has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+    }
+    export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void; // Error
+                                                                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Parameter 'param' of exported function has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+    
+    interface privateInterfaceWithPrivateModuleParameterTypes {
+        new (param: privateModule.publicClass): publicClass;
+        (param: privateModule.publicClass): publicClass;
+        myMethod(param: privateModule.publicClass): void;
+    }
+    class privateClassWithPrivateModuleParameterTypes {
+        static myPublicStaticMethod(param: privateModule.publicClass) {
+        }
+        myPublicMethod(param: privateModule.publicClass) {
+        }
+        constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) {
+        }
+    }
+    function privateFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) {
+    }
+    declare function privateAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void;
+    
+    export module publicModule {
+        class privateClass {
+        }
+    
+        export class publicClass {
+        }
+    
+    
+        export interface publicInterfaceWithPrivateParmeterTypes {
+            new (param: privateClass): publicClass; // Error
+                 ~~~~~~~~~~~~~~~~~~~
+!!! Parameter 'param' of constructor signature from exported interface has or is using private name 'privateClass'.
+            (param: privateClass): publicClass; // Error
+             ~~~~~~~~~~~~~~~~~~~
+!!! Parameter 'param' of call signature from exported interface has or is using private name 'privateClass'.
+            myMethod(param: privateClass): void; // Error
+                     ~~~~~~~~~~~~~~~~~~~
+!!! Parameter 'param' of method from exported interface has or is using private name 'privateClass'.
+        }
+    
+        export interface publicInterfaceWithPublicParmeterTypes {
+            new (param: publicClass): publicClass;
+            (param: publicClass): publicClass;
+            myMethod(param: publicClass): void;
+        }
+    
+        interface privateInterfaceWithPrivateParmeterTypes {
+            new (param: privateClass): privateClass;
+            (param: privateClass): privateClass;
+            myMethod(param: privateClass): void;
+        }
+    
+        interface privateInterfaceWithPublicParmeterTypes {
+            new (param: publicClass): publicClass;
+            (param: publicClass): publicClass;
+            myMethod(param: publicClass): void;
+        }
+    
+        export class publicClassWithWithPrivateParmeterTypes {
+            static myPublicStaticMethod(param: privateClass) { // Error
+                                        ~~~~~~~~~~~~~~~~~~~
+!!! Parameter 'param' of public static method from exported class has or is using private name 'privateClass'.
+            }
+            private static myPrivateStaticMethod(param: privateClass) {
+            }
+            myPublicMethod(param: privateClass) { // Error
+                           ~~~~~~~~~~~~~~~~~~~
+!!! Parameter 'param' of public method from exported class has or is using private name 'privateClass'.
+            }
+            private myPrivateMethod(param: privateClass) {
+            }
+            constructor(param: privateClass, private param1: privateClass, public param2: privateClass) { // Error
+                        ~~~~~~~~~~~~~~~~~~~
+!!! Parameter 'param' of constructor from exported class has or is using private name 'privateClass'.
+                                             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Parameter 'param1' of constructor from exported class has or is using private name 'privateClass'.
+                                                                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Parameter 'param2' of constructor from exported class has or is using private name 'privateClass'.
+            }
+        }
+    
+        export class publicClassWithWithPublicParmeterTypes {
+            static myPublicStaticMethod(param: publicClass) {
+            }
+            private static myPrivateStaticMethod(param: publicClass) {
+            }
+            myPublicMethod(param: publicClass) {
+            }
+            private myPrivateMethod(param: publicClass) {
+            }
+            constructor(param: publicClass, private param1: publicClass, public param2: publicClass) {
+            }
+        }
+    
+        class privateClassWithWithPrivateParmeterTypes {
+            static myPublicStaticMethod(param: privateClass) {
+            }
+            private static myPrivateStaticMethod(param: privateClass) {
+            }
+            myPublicMethod(param: privateClass) {
+            }
+            private myPrivateMethod(param: privateClass) {
+            }
+            constructor(param: privateClass, private param1: privateClass, public param2: privateClass) {
+            }
+        }
+    
+        class privateClassWithWithPublicParmeterTypes {
+            static myPublicStaticMethod(param: publicClass) {
+            }
+            private static myPrivateStaticMethod(param: publicClass) {
+            }
+            myPublicMethod(param: publicClass) {
+            }
+            private myPrivateMethod(param: publicClass) {
+            }
+            constructor(param: publicClass, private param1: publicClass, public param2: publicClass) {
+            }
+        }
+    
+        export function publicFunctionWithPrivateParmeterTypes(param: privateClass) { // Error
+                                                               ~~~~~~~~~~~~~~~~~~~
+!!! Parameter 'param' of exported function has or is using private name 'privateClass'.
+        }
+        export function publicFunctionWithPublicParmeterTypes(param: publicClass) {
+        }
+        function privateFunctionWithPrivateParmeterTypes(param: privateClass) {
+        }
+        function privateFunctionWithPublicParmeterTypes(param: publicClass) {
+        }
+    
+        export declare function publicAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void; // Error
+                                                                              ~~~~~~~~~~~~~~~~~~~
+!!! Parameter 'param' of exported function has or is using private name 'privateClass'.
+        export declare function publicAmbientFunctionWithPublicParmeterTypes(param: publicClass): void;
+        declare function privateAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void;
+        declare function privateAmbientFunctionWithPublicParmeterTypes(param: publicClass): void;
+    
+        export interface publicInterfaceWithPrivateModuleParameterTypes {
+            new (param: privateModule.publicClass): publicClass; // Error
+                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Parameter 'param' of constructor signature from exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+            (param: privateModule.publicClass): publicClass; // Error
+             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Parameter 'param' of call signature from exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+            myMethod(param: privateModule.publicClass): void; // Error
+                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Parameter 'param' of method from exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+        }
+        export class publicClassWithPrivateModuleParameterTypes {
+            static myPublicStaticMethod(param: privateModule.publicClass) { // Error
+                                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Parameter 'param' of public static method from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+            }
+            myPublicMethod(param: privateModule.publicClass) { // Error
+                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Parameter 'param' of public method from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+            }
+            constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) { // Error
+                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Parameter 'param' of constructor from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+                                                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Parameter 'param1' of constructor from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+                                                                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Parameter 'param2' of constructor from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+            }
+        }
+        export function publicFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) { // Error
+                                                                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Parameter 'param' of exported function has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+        }
+        export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void; // Error
+                                                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Parameter 'param' of exported function has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+    
+        interface privateInterfaceWithPrivateModuleParameterTypes {
+            new (param: privateModule.publicClass): publicClass;
+            (param: privateModule.publicClass): publicClass;
+            myMethod(param: privateModule.publicClass): void;
+        }
+        class privateClassWithPrivateModuleParameterTypes {
+            static myPublicStaticMethod(param: privateModule.publicClass) {
+            }
+            myPublicMethod(param: privateModule.publicClass) {
+            }
+            constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) {
+            }
+        }
+        function privateFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) {
+        }
+        declare function privateAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void;
+    
+    }
+    
+    module privateModule {
+        class privateClass {
+        }
+    
+        export class publicClass {
+        }
+    
+        export interface publicInterfaceWithPrivateParmeterTypes {
+            new (param: privateClass): publicClass;
+            (param: privateClass): publicClass;
+            myMethod(param: privateClass): void;
+        }
+    
+        export interface publicInterfaceWithPublicParmeterTypes {
+            new (param: publicClass): publicClass;
+            (param: publicClass): publicClass;
+            myMethod(param: publicClass): void;
+        }
+    
+        interface privateInterfaceWithPrivateParmeterTypes {
+            new (param: privateClass): privateClass;
+            (param: privateClass): privateClass;
+            myMethod(param: privateClass): void;
+        }
+    
+        interface privateInterfaceWithPublicParmeterTypes {
+            new (param: publicClass): publicClass;
+            (param: publicClass): publicClass;
+            myMethod(param: publicClass): void;
+        }
+    
+        export class publicClassWithWithPrivateParmeterTypes {
+            static myPublicStaticMethod(param: privateClass) {
+            }
+            private static myPrivateStaticMethod(param: privateClass) {
+            }
+            myPublicMethod(param: privateClass) {
+            }
+            private myPrivateMethod(param: privateClass) {
+            }
+            constructor(param: privateClass, private param1: privateClass, public param2: privateClass) {
+            }
+        }
+    
+        export class publicClassWithWithPublicParmeterTypes {
+            static myPublicStaticMethod(param: publicClass) {
+            }
+            private static myPrivateStaticMethod(param: publicClass) {
+            }
+            myPublicMethod(param: publicClass) {
+            }
+            private myPrivateMethod(param: publicClass) {
+            }
+            constructor(param: publicClass, private param1: publicClass, public param2: publicClass) {
+            }
+        }
+    
+        class privateClassWithWithPrivateParmeterTypes {
+            static myPublicStaticMethod(param: privateClass) {
+            }
+            private static myPrivateStaticMethod(param: privateClass) {
+            }
+            myPublicMethod(param: privateClass) {
+            }
+            private myPrivateMethod(param: privateClass) {
+            }
+            constructor(param: privateClass, private param1: privateClass, public param2: privateClass) {
+            }
+        }
+    
+        class privateClassWithWithPublicParmeterTypes {
+            static myPublicStaticMethod(param: publicClass) {
+            }
+            private static myPrivateStaticMethod(param: publicClass) {
+            }
+            myPublicMethod(param: publicClass) {
+            }
+            private myPrivateMethod(param: publicClass) {
+            }
+            constructor(param: publicClass, private param1: publicClass, public param2: publicClass) {
+            }
+        }
+    
+        export function publicFunctionWithPrivateParmeterTypes(param: privateClass) {
+        }
+        export function publicFunctionWithPublicParmeterTypes(param: publicClass) {
+        }
+        function privateFunctionWithPrivateParmeterTypes(param: privateClass) {
+        }
+        function privateFunctionWithPublicParmeterTypes(param: publicClass) {
+        }
+    
+        export declare function publicAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void;
+        export declare function publicAmbientFunctionWithPublicParmeterTypes(param: publicClass): void;
+        declare function privateAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void;
+        declare function privateAmbientFunctionWithPublicParmeterTypes(param: publicClass): void;
+    
+        export interface publicInterfaceWithPrivateModuleParameterTypes {
+            new (param: privateModule.publicClass): publicClass;
+            (param: privateModule.publicClass): publicClass;
+            myMethod(param: privateModule.publicClass): void;
+        }
+        export class publicClassWithPrivateModuleParameterTypes {
+            static myPublicStaticMethod(param: privateModule.publicClass) {
+            }
+            myPublicMethod(param: privateModule.publicClass) {
+            }
+            constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) {
+            }
+        }
+        export function publicFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) {
+        }
+        export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void;
+    
+        interface privateInterfaceWithPrivateModuleParameterTypes {
+            new (param: privateModule.publicClass): publicClass;
+            (param: privateModule.publicClass): publicClass;
+            myMethod(param: privateModule.publicClass): void;
+        }
+        class privateClassWithPrivateModuleParameterTypes {
+            static myPublicStaticMethod(param: privateModule.publicClass) {
+            }
+            myPublicMethod(param: privateModule.publicClass) {
+            }
+            constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) {
+            }
+        }
+        function privateFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) {
+        }
+        declare function privateAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void;
+    }
+    
+==== tests/cases/compiler/privacyFunctionParameterDeclFile_GlobalFile.ts (20 errors) ====
+    class publicClassInGlobal {
+    }
+    interface publicInterfaceWithPublicParmeterTypesInGlobal {
+        new (param: publicClassInGlobal): publicClassInGlobal;
+        (param: publicClassInGlobal): publicClassInGlobal;
+        myMethod(param: publicClassInGlobal): void;
+    }
+    class publicClassWithWithPublicParmeterTypesInGlobal {
+        static myPublicStaticMethod(param: publicClassInGlobal) {
+        }
+        private static myPrivateStaticMethod(param: publicClassInGlobal) {
+        }
+        myPublicMethod(param: publicClassInGlobal) {
+        }
+        private myPrivateMethod(param: publicClassInGlobal) {
+        }
+        constructor(param: publicClassInGlobal, private param1: publicClassInGlobal, public param2: publicClassInGlobal) {
+        }
+    }
+    function publicFunctionWithPublicParmeterTypesInGlobal(param: publicClassInGlobal) {
+    }
+    declare function publicAmbientFunctionWithPublicParmeterTypesInGlobal(param: publicClassInGlobal): void;
+    
+    module publicModuleInGlobal {
+        class privateClass {
+        }
+    
+        export class publicClass {
+        }
+    
+        module privateModule {
+            class privateClass {
+            }
+    
+            export class publicClass {
+            }
+    
+            export interface publicInterfaceWithPrivateParmeterTypes {
+                new (param: privateClass): publicClass;
+                (param: privateClass): publicClass;
+                myMethod(param: privateClass): void;
+            }
+    
+            export interface publicInterfaceWithPublicParmeterTypes {
+                new (param: publicClass): publicClass;
+                (param: publicClass): publicClass;
+                myMethod(param: publicClass): void;
+            }
+    
+            interface privateInterfaceWithPrivateParmeterTypes {
+                new (param: privateClass): privateClass;
+                (param: privateClass): privateClass;
+                myMethod(param: privateClass): void;
+            }
+    
+            interface privateInterfaceWithPublicParmeterTypes {
+                new (param: publicClass): publicClass;
+                (param: publicClass): publicClass;
+                myMethod(param: publicClass): void;
+            }
+    
+            export class publicClassWithWithPrivateParmeterTypes {
+                static myPublicStaticMethod(param: privateClass) {
+                }
+                private static myPrivateStaticMethod(param: privateClass) {
+                }
+                myPublicMethod(param: privateClass) {
+                }
+                private myPrivateMethod(param: privateClass) {
+                }
+                constructor(param: privateClass, private param1: privateClass, public param2: privateClass) {
+                }
+            }
+    
+            export class publicClassWithWithPublicParmeterTypes {
+                static myPublicStaticMethod(param: publicClass) {
+                }
+                private static myPrivateStaticMethod(param: publicClass) {
+                }
+                myPublicMethod(param: publicClass) {
+                }
+                private myPrivateMethod(param: publicClass) {
+                }
+                constructor(param: publicClass, private param1: publicClass, public param2: publicClass) {
+                }
+            }
+    
+            class privateClassWithWithPrivateParmeterTypes {
+                static myPublicStaticMethod(param: privateClass) {
+                }
+                private static myPrivateStaticMethod(param: privateClass) {
+                }
+                myPublicMethod(param: privateClass) {
+                }
+                private myPrivateMethod(param: privateClass) {
+                }
+                constructor(param: privateClass, private param1: privateClass, public param2: privateClass) {
+                }
+            }
+    
+            class privateClassWithWithPublicParmeterTypes {
+                static myPublicStaticMethod(param: publicClass) {
+                }
+                private static myPrivateStaticMethod(param: publicClass) {
+                }
+                myPublicMethod(param: publicClass) {
+                }
+                private myPrivateMethod(param: publicClass) {
+                }
+                constructor(param: publicClass, private param1: publicClass, public param2: publicClass) {
+                }
+            }
+    
+            export function publicFunctionWithPrivateParmeterTypes(param: privateClass) {
+            }
+            export function publicFunctionWithPublicParmeterTypes(param: publicClass) {
+            }
+            function privateFunctionWithPrivateParmeterTypes(param: privateClass) {
+            }
+            function privateFunctionWithPublicParmeterTypes(param: publicClass) {
+            }
+    
+            export declare function publicAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void;
+            export declare function publicAmbientFunctionWithPublicParmeterTypes(param: publicClass): void;
+            declare function privateAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void;
+            declare function privateAmbientFunctionWithPublicParmeterTypes(param: publicClass): void;
+    
+            export interface publicInterfaceWithPrivateModuleParameterTypes {
+                new (param: privateModule.publicClass): publicClass;
+                (param: privateModule.publicClass): publicClass;
+                myMethod(param: privateModule.publicClass): void;
+            }
+            export class publicClassWithPrivateModuleParameterTypes {
+                static myPublicStaticMethod(param: privateModule.publicClass) {
+                }
+                myPublicMethod(param: privateModule.publicClass) {
+                }
+                constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) {
+                }
+            }
+            export function publicFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) {
+            }
+            export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void;
+    
+            interface privateInterfaceWithPrivateModuleParameterTypes {
+                new (param: privateModule.publicClass): publicClass;
+                (param: privateModule.publicClass): publicClass;
+                myMethod(param: privateModule.publicClass): void;
+            }
+            class privateClassWithPrivateModuleParameterTypes {
+                static myPublicStaticMethod(param: privateModule.publicClass) {
+                }
+                myPublicMethod(param: privateModule.publicClass) {
+                }
+                constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) {
+                }
+            }
+            function privateFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) {
+            }
+            declare function privateAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void;
+        }
+    
+        export interface publicInterfaceWithPrivateParmeterTypes {
+            new (param: privateClass): publicClass; // Error
+                 ~~~~~~~~~~~~~~~~~~~
+!!! Parameter 'param' of constructor signature from exported interface has or is using private name 'privateClass'.
+            (param: privateClass): publicClass; // Error
+             ~~~~~~~~~~~~~~~~~~~
+!!! Parameter 'param' of call signature from exported interface has or is using private name 'privateClass'.
+            myMethod(param: privateClass): void; // Error
+                     ~~~~~~~~~~~~~~~~~~~
+!!! Parameter 'param' of method from exported interface has or is using private name 'privateClass'.
+        }
+    
+        export interface publicInterfaceWithPublicParmeterTypes {
+            new (param: publicClass): publicClass;
+            (param: publicClass): publicClass;
+            myMethod(param: publicClass): void;
+        }
+    
+        interface privateInterfaceWithPrivateParmeterTypes {
+            new (param: privateClass): privateClass;
+            (param: privateClass): privateClass;
+            myMethod(param: privateClass): void;
+        }
+    
+        interface privateInterfaceWithPublicParmeterTypes {
+            new (param: publicClass): publicClass;
+            (param: publicClass): publicClass;
+            myMethod(param: publicClass): void;
+        }
+    
+        export class publicClassWithWithPrivateParmeterTypes {
+            static myPublicStaticMethod(param: privateClass) { // Error
+                                        ~~~~~~~~~~~~~~~~~~~
+!!! Parameter 'param' of public static method from exported class has or is using private name 'privateClass'.
+            }
+            private static myPrivateStaticMethod(param: privateClass) {
+            }
+            myPublicMethod(param: privateClass) { // Error
+                           ~~~~~~~~~~~~~~~~~~~
+!!! Parameter 'param' of public method from exported class has or is using private name 'privateClass'.
+            }
+            private myPrivateMethod(param: privateClass) {
+            }
+            constructor(param: privateClass, private param1: privateClass, public param2: privateClass) { // Error
+                        ~~~~~~~~~~~~~~~~~~~
+!!! Parameter 'param' of constructor from exported class has or is using private name 'privateClass'.
+                                             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Parameter 'param1' of constructor from exported class has or is using private name 'privateClass'.
+                                                                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Parameter 'param2' of constructor from exported class has or is using private name 'privateClass'.
+            }
+        }
+    
+        export class publicClassWithWithPublicParmeterTypes {
+            static myPublicStaticMethod(param: publicClass) {
+            }
+            private static myPrivateStaticMethod(param: publicClass) {
+            }
+            myPublicMethod(param: publicClass) {
+            }
+            private myPrivateMethod(param: publicClass) {
+            }
+            constructor(param: publicClass, private param1: publicClass, public param2: publicClass) {
+            }
+        }
+    
+        class privateClassWithWithPrivateParmeterTypes {
+            static myPublicStaticMethod(param: privateClass) {
+            }
+            private static myPrivateStaticMethod(param: privateClass) {
+            }
+            myPublicMethod(param: privateClass) {
+            }
+            private myPrivateMethod(param: privateClass) {
+            }
+            constructor(param: privateClass, private param1: privateClass, public param2: privateClass) {
+            }
+        }
+    
+        class privateClassWithWithPublicParmeterTypes {
+            static myPublicStaticMethod(param: publicClass) {
+            }
+            private static myPrivateStaticMethod(param: publicClass) {
+            }
+            myPublicMethod(param: publicClass) {
+            }
+            private myPrivateMethod(param: publicClass) {
+            }
+            constructor(param: publicClass, private param1: publicClass, public param2: publicClass) {
+            }
+        }
+    
+        export function publicFunctionWithPrivateParmeterTypes(param: privateClass) { // Error
+                                                               ~~~~~~~~~~~~~~~~~~~
+!!! Parameter 'param' of exported function has or is using private name 'privateClass'.
+        }
+        export function publicFunctionWithPublicParmeterTypes(param: publicClass) {
+        }
+        function privateFunctionWithPrivateParmeterTypes(param: privateClass) {
+        }
+        function privateFunctionWithPublicParmeterTypes(param: publicClass) {
+        }
+    
+        export declare function publicAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void; // Error
+                                                                              ~~~~~~~~~~~~~~~~~~~
+!!! Parameter 'param' of exported function has or is using private name 'privateClass'.
+        export declare function publicAmbientFunctionWithPublicParmeterTypes(param: publicClass): void;
+        declare function privateAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void;
+        declare function privateAmbientFunctionWithPublicParmeterTypes(param: publicClass): void;
+    
+        export interface publicInterfaceWithPrivateModuleParameterTypes {
+            new (param: privateModule.publicClass): publicClass; // Error
+                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Parameter 'param' of constructor signature from exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+            (param: privateModule.publicClass): publicClass; // Error
+             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Parameter 'param' of call signature from exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+            myMethod(param: privateModule.publicClass): void; // Error
+                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Parameter 'param' of method from exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+        }
+        export class publicClassWithPrivateModuleParameterTypes {
+            static myPublicStaticMethod(param: privateModule.publicClass) { // Error
+                                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Parameter 'param' of public static method from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+            }
+            myPublicMethod(param: privateModule.publicClass) { // Error
+                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Parameter 'param' of public method from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+            }
+            constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) { // Error
+                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Parameter 'param' of constructor from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+                                                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Parameter 'param1' of constructor from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+                                                                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Parameter 'param2' of constructor from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+            }
+        }
+        export function publicFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) { // Error
+                                                                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Parameter 'param' of exported function has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+        }
+        export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void; // Error
+                                                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Parameter 'param' of exported function has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+    
+        interface privateInterfaceWithPrivateModuleParameterTypes {
+            new (param: privateModule.publicClass): publicClass;
+            (param: privateModule.publicClass): publicClass;
+            myMethod(param: privateModule.publicClass): void;
+        }
+        class privateClassWithPrivateModuleParameterTypes {
+            static myPublicStaticMethod(param: privateModule.publicClass) {
+            }
+            myPublicMethod(param: privateModule.publicClass) {
+            }
+            constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) {
+            }
+        }
+        function privateFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) {
+        }
+        declare function privateAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void;
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/privacyFunctionParameterDeclFile.js b/tests/baselines/reference/privacyFunctionParameterDeclFile.js
new file mode 100644
index 00000000000..0e2f72ce3a6
--- /dev/null
+++ b/tests/baselines/reference/privacyFunctionParameterDeclFile.js
@@ -0,0 +1,1279 @@
+//// [tests/cases/compiler/privacyFunctionParameterDeclFile.ts] ////
+
+//// [privacyFunctionParameterDeclFile_externalModule.ts]
+
+class privateClass {
+}
+
+export class publicClass {
+}
+
+export interface publicInterfaceWithPrivateParmeterTypes {
+    new (param: privateClass): publicClass; // Error
+    (param: privateClass): publicClass; // Error
+    myMethod(param: privateClass): void; // Error
+}
+
+export interface publicInterfaceWithPublicParmeterTypes {
+    new (param: publicClass): publicClass;
+    (param: publicClass): publicClass;
+    myMethod(param: publicClass): void;
+}
+
+interface privateInterfaceWithPrivateParmeterTypes {
+    new (param: privateClass): privateClass;
+    (param: privateClass): privateClass;
+    myMethod(param: privateClass): void;
+}
+
+interface privateInterfaceWithPublicParmeterTypes {
+    new (param: publicClass): publicClass;
+    (param: publicClass): publicClass;
+    myMethod(param: publicClass): void;
+}
+
+export class publicClassWithWithPrivateParmeterTypes {
+    static myPublicStaticMethod(param: privateClass) { // Error
+    }
+    private static myPrivateStaticMethod(param: privateClass) {
+    }
+    myPublicMethod(param: privateClass) { // Error
+    }
+    private myPrivateMethod(param: privateClass) {
+    }
+    constructor(param: privateClass, private param1: privateClass, public param2: privateClass) { // Error
+    }
+}
+
+export class publicClassWithWithPublicParmeterTypes {
+    static myPublicStaticMethod(param: publicClass) {
+    }
+    private static myPrivateStaticMethod(param: publicClass) {
+    }
+    myPublicMethod(param: publicClass) {
+    }
+    private myPrivateMethod(param: publicClass) {
+    }
+    constructor(param: publicClass, private param1: publicClass, public param2: publicClass) {
+    }
+}
+
+class privateClassWithWithPrivateParmeterTypes {
+    static myPublicStaticMethod(param: privateClass) {
+    }
+    private static myPrivateStaticMethod(param: privateClass) {
+    }
+    myPublicMethod(param: privateClass) { 
+    }
+    private myPrivateMethod(param: privateClass) {
+    }
+    constructor(param: privateClass, private param1: privateClass, public param2: privateClass) {
+    }
+}
+
+class privateClassWithWithPublicParmeterTypes {
+    static myPublicStaticMethod(param: publicClass) {
+    }
+    private static myPrivateStaticMethod(param: publicClass) {
+    }
+    myPublicMethod(param: publicClass) {
+    }
+    private myPrivateMethod(param: publicClass) {
+    }
+    constructor(param: publicClass, private param1: publicClass, public param2: publicClass) {
+    }
+}
+
+export function publicFunctionWithPrivateParmeterTypes(param: privateClass) { // Error
+}
+export function publicFunctionWithPublicParmeterTypes(param: publicClass) {
+}
+function privateFunctionWithPrivateParmeterTypes(param: privateClass) {
+}
+function privateFunctionWithPublicParmeterTypes(param: publicClass) {
+}
+
+export declare function publicAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void; // Error
+export declare function publicAmbientFunctionWithPublicParmeterTypes(param: publicClass): void;
+declare function privateAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void;
+declare function privateAmbientFunctionWithPublicParmeterTypes(param: publicClass): void;
+
+export interface publicInterfaceWithPrivateModuleParameterTypes {
+    new (param: privateModule.publicClass): publicClass; // Error
+    (param: privateModule.publicClass): publicClass; // Error
+    myMethod(param: privateModule.publicClass): void; // Error
+}
+export class publicClassWithPrivateModuleParameterTypes {
+    static myPublicStaticMethod(param: privateModule.publicClass) { // Error
+    }
+    myPublicMethod(param: privateModule.publicClass) { // Error
+    }
+    constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) { // Error
+    }
+}
+export function publicFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) { // Error
+}
+export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void; // Error
+
+interface privateInterfaceWithPrivateModuleParameterTypes {
+    new (param: privateModule.publicClass): publicClass;
+    (param: privateModule.publicClass): publicClass;
+    myMethod(param: privateModule.publicClass): void;
+}
+class privateClassWithPrivateModuleParameterTypes {
+    static myPublicStaticMethod(param: privateModule.publicClass) {
+    }
+    myPublicMethod(param: privateModule.publicClass) {
+    }
+    constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) {
+    }
+}
+function privateFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) {
+}
+declare function privateAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void;
+
+export module publicModule {
+    class privateClass {
+    }
+
+    export class publicClass {
+    }
+
+
+    export interface publicInterfaceWithPrivateParmeterTypes {
+        new (param: privateClass): publicClass; // Error
+        (param: privateClass): publicClass; // Error
+        myMethod(param: privateClass): void; // Error
+    }
+
+    export interface publicInterfaceWithPublicParmeterTypes {
+        new (param: publicClass): publicClass;
+        (param: publicClass): publicClass;
+        myMethod(param: publicClass): void;
+    }
+
+    interface privateInterfaceWithPrivateParmeterTypes {
+        new (param: privateClass): privateClass;
+        (param: privateClass): privateClass;
+        myMethod(param: privateClass): void;
+    }
+
+    interface privateInterfaceWithPublicParmeterTypes {
+        new (param: publicClass): publicClass;
+        (param: publicClass): publicClass;
+        myMethod(param: publicClass): void;
+    }
+
+    export class publicClassWithWithPrivateParmeterTypes {
+        static myPublicStaticMethod(param: privateClass) { // Error
+        }
+        private static myPrivateStaticMethod(param: privateClass) {
+        }
+        myPublicMethod(param: privateClass) { // Error
+        }
+        private myPrivateMethod(param: privateClass) {
+        }
+        constructor(param: privateClass, private param1: privateClass, public param2: privateClass) { // Error
+        }
+    }
+
+    export class publicClassWithWithPublicParmeterTypes {
+        static myPublicStaticMethod(param: publicClass) {
+        }
+        private static myPrivateStaticMethod(param: publicClass) {
+        }
+        myPublicMethod(param: publicClass) {
+        }
+        private myPrivateMethod(param: publicClass) {
+        }
+        constructor(param: publicClass, private param1: publicClass, public param2: publicClass) {
+        }
+    }
+
+    class privateClassWithWithPrivateParmeterTypes {
+        static myPublicStaticMethod(param: privateClass) {
+        }
+        private static myPrivateStaticMethod(param: privateClass) {
+        }
+        myPublicMethod(param: privateClass) {
+        }
+        private myPrivateMethod(param: privateClass) {
+        }
+        constructor(param: privateClass, private param1: privateClass, public param2: privateClass) {
+        }
+    }
+
+    class privateClassWithWithPublicParmeterTypes {
+        static myPublicStaticMethod(param: publicClass) {
+        }
+        private static myPrivateStaticMethod(param: publicClass) {
+        }
+        myPublicMethod(param: publicClass) {
+        }
+        private myPrivateMethod(param: publicClass) {
+        }
+        constructor(param: publicClass, private param1: publicClass, public param2: publicClass) {
+        }
+    }
+
+    export function publicFunctionWithPrivateParmeterTypes(param: privateClass) { // Error
+    }
+    export function publicFunctionWithPublicParmeterTypes(param: publicClass) {
+    }
+    function privateFunctionWithPrivateParmeterTypes(param: privateClass) {
+    }
+    function privateFunctionWithPublicParmeterTypes(param: publicClass) {
+    }
+
+    export declare function publicAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void; // Error
+    export declare function publicAmbientFunctionWithPublicParmeterTypes(param: publicClass): void;
+    declare function privateAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void;
+    declare function privateAmbientFunctionWithPublicParmeterTypes(param: publicClass): void;
+
+    export interface publicInterfaceWithPrivateModuleParameterTypes {
+        new (param: privateModule.publicClass): publicClass; // Error
+        (param: privateModule.publicClass): publicClass; // Error
+        myMethod(param: privateModule.publicClass): void; // Error
+    }
+    export class publicClassWithPrivateModuleParameterTypes {
+        static myPublicStaticMethod(param: privateModule.publicClass) { // Error
+        }
+        myPublicMethod(param: privateModule.publicClass) { // Error
+        }
+        constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) { // Error
+        }
+    }
+    export function publicFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) { // Error
+    }
+    export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void; // Error
+
+    interface privateInterfaceWithPrivateModuleParameterTypes {
+        new (param: privateModule.publicClass): publicClass;
+        (param: privateModule.publicClass): publicClass;
+        myMethod(param: privateModule.publicClass): void;
+    }
+    class privateClassWithPrivateModuleParameterTypes {
+        static myPublicStaticMethod(param: privateModule.publicClass) {
+        }
+        myPublicMethod(param: privateModule.publicClass) {
+        }
+        constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) {
+        }
+    }
+    function privateFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) {
+    }
+    declare function privateAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void;
+
+}
+
+module privateModule {
+    class privateClass {
+    }
+
+    export class publicClass {
+    }
+
+    export interface publicInterfaceWithPrivateParmeterTypes {
+        new (param: privateClass): publicClass;
+        (param: privateClass): publicClass;
+        myMethod(param: privateClass): void;
+    }
+
+    export interface publicInterfaceWithPublicParmeterTypes {
+        new (param: publicClass): publicClass;
+        (param: publicClass): publicClass;
+        myMethod(param: publicClass): void;
+    }
+
+    interface privateInterfaceWithPrivateParmeterTypes {
+        new (param: privateClass): privateClass;
+        (param: privateClass): privateClass;
+        myMethod(param: privateClass): void;
+    }
+
+    interface privateInterfaceWithPublicParmeterTypes {
+        new (param: publicClass): publicClass;
+        (param: publicClass): publicClass;
+        myMethod(param: publicClass): void;
+    }
+
+    export class publicClassWithWithPrivateParmeterTypes {
+        static myPublicStaticMethod(param: privateClass) {
+        }
+        private static myPrivateStaticMethod(param: privateClass) {
+        }
+        myPublicMethod(param: privateClass) {
+        }
+        private myPrivateMethod(param: privateClass) {
+        }
+        constructor(param: privateClass, private param1: privateClass, public param2: privateClass) {
+        }
+    }
+
+    export class publicClassWithWithPublicParmeterTypes {
+        static myPublicStaticMethod(param: publicClass) {
+        }
+        private static myPrivateStaticMethod(param: publicClass) {
+        }
+        myPublicMethod(param: publicClass) {
+        }
+        private myPrivateMethod(param: publicClass) {
+        }
+        constructor(param: publicClass, private param1: publicClass, public param2: publicClass) {
+        }
+    }
+
+    class privateClassWithWithPrivateParmeterTypes {
+        static myPublicStaticMethod(param: privateClass) {
+        }
+        private static myPrivateStaticMethod(param: privateClass) {
+        }
+        myPublicMethod(param: privateClass) {
+        }
+        private myPrivateMethod(param: privateClass) {
+        }
+        constructor(param: privateClass, private param1: privateClass, public param2: privateClass) {
+        }
+    }
+
+    class privateClassWithWithPublicParmeterTypes {
+        static myPublicStaticMethod(param: publicClass) {
+        }
+        private static myPrivateStaticMethod(param: publicClass) {
+        }
+        myPublicMethod(param: publicClass) {
+        }
+        private myPrivateMethod(param: publicClass) {
+        }
+        constructor(param: publicClass, private param1: publicClass, public param2: publicClass) {
+        }
+    }
+
+    export function publicFunctionWithPrivateParmeterTypes(param: privateClass) {
+    }
+    export function publicFunctionWithPublicParmeterTypes(param: publicClass) {
+    }
+    function privateFunctionWithPrivateParmeterTypes(param: privateClass) {
+    }
+    function privateFunctionWithPublicParmeterTypes(param: publicClass) {
+    }
+
+    export declare function publicAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void;
+    export declare function publicAmbientFunctionWithPublicParmeterTypes(param: publicClass): void;
+    declare function privateAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void;
+    declare function privateAmbientFunctionWithPublicParmeterTypes(param: publicClass): void;
+
+    export interface publicInterfaceWithPrivateModuleParameterTypes {
+        new (param: privateModule.publicClass): publicClass;
+        (param: privateModule.publicClass): publicClass;
+        myMethod(param: privateModule.publicClass): void;
+    }
+    export class publicClassWithPrivateModuleParameterTypes {
+        static myPublicStaticMethod(param: privateModule.publicClass) {
+        }
+        myPublicMethod(param: privateModule.publicClass) {
+        }
+        constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) {
+        }
+    }
+    export function publicFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) {
+    }
+    export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void;
+
+    interface privateInterfaceWithPrivateModuleParameterTypes {
+        new (param: privateModule.publicClass): publicClass;
+        (param: privateModule.publicClass): publicClass;
+        myMethod(param: privateModule.publicClass): void;
+    }
+    class privateClassWithPrivateModuleParameterTypes {
+        static myPublicStaticMethod(param: privateModule.publicClass) {
+        }
+        myPublicMethod(param: privateModule.publicClass) {
+        }
+        constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) {
+        }
+    }
+    function privateFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) {
+    }
+    declare function privateAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void;
+}
+
+//// [privacyFunctionParameterDeclFile_GlobalFile.ts]
+class publicClassInGlobal {
+}
+interface publicInterfaceWithPublicParmeterTypesInGlobal {
+    new (param: publicClassInGlobal): publicClassInGlobal;
+    (param: publicClassInGlobal): publicClassInGlobal;
+    myMethod(param: publicClassInGlobal): void;
+}
+class publicClassWithWithPublicParmeterTypesInGlobal {
+    static myPublicStaticMethod(param: publicClassInGlobal) {
+    }
+    private static myPrivateStaticMethod(param: publicClassInGlobal) {
+    }
+    myPublicMethod(param: publicClassInGlobal) {
+    }
+    private myPrivateMethod(param: publicClassInGlobal) {
+    }
+    constructor(param: publicClassInGlobal, private param1: publicClassInGlobal, public param2: publicClassInGlobal) {
+    }
+}
+function publicFunctionWithPublicParmeterTypesInGlobal(param: publicClassInGlobal) {
+}
+declare function publicAmbientFunctionWithPublicParmeterTypesInGlobal(param: publicClassInGlobal): void;
+
+module publicModuleInGlobal {
+    class privateClass {
+    }
+
+    export class publicClass {
+    }
+
+    module privateModule {
+        class privateClass {
+        }
+
+        export class publicClass {
+        }
+
+        export interface publicInterfaceWithPrivateParmeterTypes {
+            new (param: privateClass): publicClass;
+            (param: privateClass): publicClass;
+            myMethod(param: privateClass): void;
+        }
+
+        export interface publicInterfaceWithPublicParmeterTypes {
+            new (param: publicClass): publicClass;
+            (param: publicClass): publicClass;
+            myMethod(param: publicClass): void;
+        }
+
+        interface privateInterfaceWithPrivateParmeterTypes {
+            new (param: privateClass): privateClass;
+            (param: privateClass): privateClass;
+            myMethod(param: privateClass): void;
+        }
+
+        interface privateInterfaceWithPublicParmeterTypes {
+            new (param: publicClass): publicClass;
+            (param: publicClass): publicClass;
+            myMethod(param: publicClass): void;
+        }
+
+        export class publicClassWithWithPrivateParmeterTypes {
+            static myPublicStaticMethod(param: privateClass) {
+            }
+            private static myPrivateStaticMethod(param: privateClass) {
+            }
+            myPublicMethod(param: privateClass) {
+            }
+            private myPrivateMethod(param: privateClass) {
+            }
+            constructor(param: privateClass, private param1: privateClass, public param2: privateClass) {
+            }
+        }
+
+        export class publicClassWithWithPublicParmeterTypes {
+            static myPublicStaticMethod(param: publicClass) {
+            }
+            private static myPrivateStaticMethod(param: publicClass) {
+            }
+            myPublicMethod(param: publicClass) {
+            }
+            private myPrivateMethod(param: publicClass) {
+            }
+            constructor(param: publicClass, private param1: publicClass, public param2: publicClass) {
+            }
+        }
+
+        class privateClassWithWithPrivateParmeterTypes {
+            static myPublicStaticMethod(param: privateClass) {
+            }
+            private static myPrivateStaticMethod(param: privateClass) {
+            }
+            myPublicMethod(param: privateClass) {
+            }
+            private myPrivateMethod(param: privateClass) {
+            }
+            constructor(param: privateClass, private param1: privateClass, public param2: privateClass) {
+            }
+        }
+
+        class privateClassWithWithPublicParmeterTypes {
+            static myPublicStaticMethod(param: publicClass) {
+            }
+            private static myPrivateStaticMethod(param: publicClass) {
+            }
+            myPublicMethod(param: publicClass) {
+            }
+            private myPrivateMethod(param: publicClass) {
+            }
+            constructor(param: publicClass, private param1: publicClass, public param2: publicClass) {
+            }
+        }
+
+        export function publicFunctionWithPrivateParmeterTypes(param: privateClass) {
+        }
+        export function publicFunctionWithPublicParmeterTypes(param: publicClass) {
+        }
+        function privateFunctionWithPrivateParmeterTypes(param: privateClass) {
+        }
+        function privateFunctionWithPublicParmeterTypes(param: publicClass) {
+        }
+
+        export declare function publicAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void;
+        export declare function publicAmbientFunctionWithPublicParmeterTypes(param: publicClass): void;
+        declare function privateAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void;
+        declare function privateAmbientFunctionWithPublicParmeterTypes(param: publicClass): void;
+
+        export interface publicInterfaceWithPrivateModuleParameterTypes {
+            new (param: privateModule.publicClass): publicClass;
+            (param: privateModule.publicClass): publicClass;
+            myMethod(param: privateModule.publicClass): void;
+        }
+        export class publicClassWithPrivateModuleParameterTypes {
+            static myPublicStaticMethod(param: privateModule.publicClass) {
+            }
+            myPublicMethod(param: privateModule.publicClass) {
+            }
+            constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) {
+            }
+        }
+        export function publicFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) {
+        }
+        export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void;
+
+        interface privateInterfaceWithPrivateModuleParameterTypes {
+            new (param: privateModule.publicClass): publicClass;
+            (param: privateModule.publicClass): publicClass;
+            myMethod(param: privateModule.publicClass): void;
+        }
+        class privateClassWithPrivateModuleParameterTypes {
+            static myPublicStaticMethod(param: privateModule.publicClass) {
+            }
+            myPublicMethod(param: privateModule.publicClass) {
+            }
+            constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) {
+            }
+        }
+        function privateFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) {
+        }
+        declare function privateAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void;
+    }
+
+    export interface publicInterfaceWithPrivateParmeterTypes {
+        new (param: privateClass): publicClass; // Error
+        (param: privateClass): publicClass; // Error
+        myMethod(param: privateClass): void; // Error
+    }
+
+    export interface publicInterfaceWithPublicParmeterTypes {
+        new (param: publicClass): publicClass;
+        (param: publicClass): publicClass;
+        myMethod(param: publicClass): void;
+    }
+
+    interface privateInterfaceWithPrivateParmeterTypes {
+        new (param: privateClass): privateClass;
+        (param: privateClass): privateClass;
+        myMethod(param: privateClass): void;
+    }
+
+    interface privateInterfaceWithPublicParmeterTypes {
+        new (param: publicClass): publicClass;
+        (param: publicClass): publicClass;
+        myMethod(param: publicClass): void;
+    }
+
+    export class publicClassWithWithPrivateParmeterTypes {
+        static myPublicStaticMethod(param: privateClass) { // Error
+        }
+        private static myPrivateStaticMethod(param: privateClass) {
+        }
+        myPublicMethod(param: privateClass) { // Error
+        }
+        private myPrivateMethod(param: privateClass) {
+        }
+        constructor(param: privateClass, private param1: privateClass, public param2: privateClass) { // Error
+        }
+    }
+
+    export class publicClassWithWithPublicParmeterTypes {
+        static myPublicStaticMethod(param: publicClass) {
+        }
+        private static myPrivateStaticMethod(param: publicClass) {
+        }
+        myPublicMethod(param: publicClass) {
+        }
+        private myPrivateMethod(param: publicClass) {
+        }
+        constructor(param: publicClass, private param1: publicClass, public param2: publicClass) {
+        }
+    }
+
+    class privateClassWithWithPrivateParmeterTypes {
+        static myPublicStaticMethod(param: privateClass) {
+        }
+        private static myPrivateStaticMethod(param: privateClass) {
+        }
+        myPublicMethod(param: privateClass) {
+        }
+        private myPrivateMethod(param: privateClass) {
+        }
+        constructor(param: privateClass, private param1: privateClass, public param2: privateClass) {
+        }
+    }
+
+    class privateClassWithWithPublicParmeterTypes {
+        static myPublicStaticMethod(param: publicClass) {
+        }
+        private static myPrivateStaticMethod(param: publicClass) {
+        }
+        myPublicMethod(param: publicClass) {
+        }
+        private myPrivateMethod(param: publicClass) {
+        }
+        constructor(param: publicClass, private param1: publicClass, public param2: publicClass) {
+        }
+    }
+
+    export function publicFunctionWithPrivateParmeterTypes(param: privateClass) { // Error
+    }
+    export function publicFunctionWithPublicParmeterTypes(param: publicClass) {
+    }
+    function privateFunctionWithPrivateParmeterTypes(param: privateClass) {
+    }
+    function privateFunctionWithPublicParmeterTypes(param: publicClass) {
+    }
+
+    export declare function publicAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void; // Error
+    export declare function publicAmbientFunctionWithPublicParmeterTypes(param: publicClass): void;
+    declare function privateAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void;
+    declare function privateAmbientFunctionWithPublicParmeterTypes(param: publicClass): void;
+
+    export interface publicInterfaceWithPrivateModuleParameterTypes {
+        new (param: privateModule.publicClass): publicClass; // Error
+        (param: privateModule.publicClass): publicClass; // Error
+        myMethod(param: privateModule.publicClass): void; // Error
+    }
+    export class publicClassWithPrivateModuleParameterTypes {
+        static myPublicStaticMethod(param: privateModule.publicClass) { // Error
+        }
+        myPublicMethod(param: privateModule.publicClass) { // Error
+        }
+        constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) { // Error
+        }
+    }
+    export function publicFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) { // Error
+    }
+    export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void; // Error
+
+    interface privateInterfaceWithPrivateModuleParameterTypes {
+        new (param: privateModule.publicClass): publicClass;
+        (param: privateModule.publicClass): publicClass;
+        myMethod(param: privateModule.publicClass): void;
+    }
+    class privateClassWithPrivateModuleParameterTypes {
+        static myPublicStaticMethod(param: privateModule.publicClass) {
+        }
+        myPublicMethod(param: privateModule.publicClass) {
+        }
+        constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) {
+        }
+    }
+    function privateFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) {
+    }
+    declare function privateAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void;
+}
+
+//// [privacyFunctionParameterDeclFile_externalModule.js]
+var privateClass = (function () {
+    function privateClass() {
+    }
+    return privateClass;
+})();
+var publicClass = (function () {
+    function publicClass() {
+    }
+    return publicClass;
+})();
+exports.publicClass = publicClass;
+var publicClassWithWithPrivateParmeterTypes = (function () {
+    function publicClassWithWithPrivateParmeterTypes(param, param1, param2) {
+        this.param1 = param1;
+        this.param2 = param2;
+    }
+    publicClassWithWithPrivateParmeterTypes.myPublicStaticMethod = function (param) {
+    };
+    publicClassWithWithPrivateParmeterTypes.myPrivateStaticMethod = function (param) {
+    };
+    publicClassWithWithPrivateParmeterTypes.prototype.myPublicMethod = function (param) {
+    };
+    publicClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod = function (param) {
+    };
+    return publicClassWithWithPrivateParmeterTypes;
+})();
+exports.publicClassWithWithPrivateParmeterTypes = publicClassWithWithPrivateParmeterTypes;
+var publicClassWithWithPublicParmeterTypes = (function () {
+    function publicClassWithWithPublicParmeterTypes(param, param1, param2) {
+        this.param1 = param1;
+        this.param2 = param2;
+    }
+    publicClassWithWithPublicParmeterTypes.myPublicStaticMethod = function (param) {
+    };
+    publicClassWithWithPublicParmeterTypes.myPrivateStaticMethod = function (param) {
+    };
+    publicClassWithWithPublicParmeterTypes.prototype.myPublicMethod = function (param) {
+    };
+    publicClassWithWithPublicParmeterTypes.prototype.myPrivateMethod = function (param) {
+    };
+    return publicClassWithWithPublicParmeterTypes;
+})();
+exports.publicClassWithWithPublicParmeterTypes = publicClassWithWithPublicParmeterTypes;
+var privateClassWithWithPrivateParmeterTypes = (function () {
+    function privateClassWithWithPrivateParmeterTypes(param, param1, param2) {
+        this.param1 = param1;
+        this.param2 = param2;
+    }
+    privateClassWithWithPrivateParmeterTypes.myPublicStaticMethod = function (param) {
+    };
+    privateClassWithWithPrivateParmeterTypes.myPrivateStaticMethod = function (param) {
+    };
+    privateClassWithWithPrivateParmeterTypes.prototype.myPublicMethod = function (param) {
+    };
+    privateClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod = function (param) {
+    };
+    return privateClassWithWithPrivateParmeterTypes;
+})();
+var privateClassWithWithPublicParmeterTypes = (function () {
+    function privateClassWithWithPublicParmeterTypes(param, param1, param2) {
+        this.param1 = param1;
+        this.param2 = param2;
+    }
+    privateClassWithWithPublicParmeterTypes.myPublicStaticMethod = function (param) {
+    };
+    privateClassWithWithPublicParmeterTypes.myPrivateStaticMethod = function (param) {
+    };
+    privateClassWithWithPublicParmeterTypes.prototype.myPublicMethod = function (param) {
+    };
+    privateClassWithWithPublicParmeterTypes.prototype.myPrivateMethod = function (param) {
+    };
+    return privateClassWithWithPublicParmeterTypes;
+})();
+function publicFunctionWithPrivateParmeterTypes(param) {
+}
+exports.publicFunctionWithPrivateParmeterTypes = publicFunctionWithPrivateParmeterTypes;
+function publicFunctionWithPublicParmeterTypes(param) {
+}
+exports.publicFunctionWithPublicParmeterTypes = publicFunctionWithPublicParmeterTypes;
+function privateFunctionWithPrivateParmeterTypes(param) {
+}
+function privateFunctionWithPublicParmeterTypes(param) {
+}
+var publicClassWithPrivateModuleParameterTypes = (function () {
+    function publicClassWithPrivateModuleParameterTypes(param, param1, param2) {
+        this.param1 = param1;
+        this.param2 = param2;
+    }
+    publicClassWithPrivateModuleParameterTypes.myPublicStaticMethod = function (param) {
+    };
+    publicClassWithPrivateModuleParameterTypes.prototype.myPublicMethod = function (param) {
+    };
+    return publicClassWithPrivateModuleParameterTypes;
+})();
+exports.publicClassWithPrivateModuleParameterTypes = publicClassWithPrivateModuleParameterTypes;
+function publicFunctionWithPrivateModuleParameterTypes(param) {
+}
+exports.publicFunctionWithPrivateModuleParameterTypes = publicFunctionWithPrivateModuleParameterTypes;
+var privateClassWithPrivateModuleParameterTypes = (function () {
+    function privateClassWithPrivateModuleParameterTypes(param, param1, param2) {
+        this.param1 = param1;
+        this.param2 = param2;
+    }
+    privateClassWithPrivateModuleParameterTypes.myPublicStaticMethod = function (param) {
+    };
+    privateClassWithPrivateModuleParameterTypes.prototype.myPublicMethod = function (param) {
+    };
+    return privateClassWithPrivateModuleParameterTypes;
+})();
+function privateFunctionWithPrivateModuleParameterTypes(param) {
+}
+(function (publicModule) {
+    var privateClass = (function () {
+        function privateClass() {
+        }
+        return privateClass;
+    })();
+    var publicClass = (function () {
+        function publicClass() {
+        }
+        return publicClass;
+    })();
+    publicModule.publicClass = publicClass;
+    var publicClassWithWithPrivateParmeterTypes = (function () {
+        function publicClassWithWithPrivateParmeterTypes(param, param1, param2) {
+            this.param1 = param1;
+            this.param2 = param2;
+        }
+        publicClassWithWithPrivateParmeterTypes.myPublicStaticMethod = function (param) {
+        };
+        publicClassWithWithPrivateParmeterTypes.myPrivateStaticMethod = function (param) {
+        };
+        publicClassWithWithPrivateParmeterTypes.prototype.myPublicMethod = function (param) {
+        };
+        publicClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod = function (param) {
+        };
+        return publicClassWithWithPrivateParmeterTypes;
+    })();
+    publicModule.publicClassWithWithPrivateParmeterTypes = publicClassWithWithPrivateParmeterTypes;
+    var publicClassWithWithPublicParmeterTypes = (function () {
+        function publicClassWithWithPublicParmeterTypes(param, param1, param2) {
+            this.param1 = param1;
+            this.param2 = param2;
+        }
+        publicClassWithWithPublicParmeterTypes.myPublicStaticMethod = function (param) {
+        };
+        publicClassWithWithPublicParmeterTypes.myPrivateStaticMethod = function (param) {
+        };
+        publicClassWithWithPublicParmeterTypes.prototype.myPublicMethod = function (param) {
+        };
+        publicClassWithWithPublicParmeterTypes.prototype.myPrivateMethod = function (param) {
+        };
+        return publicClassWithWithPublicParmeterTypes;
+    })();
+    publicModule.publicClassWithWithPublicParmeterTypes = publicClassWithWithPublicParmeterTypes;
+    var privateClassWithWithPrivateParmeterTypes = (function () {
+        function privateClassWithWithPrivateParmeterTypes(param, param1, param2) {
+            this.param1 = param1;
+            this.param2 = param2;
+        }
+        privateClassWithWithPrivateParmeterTypes.myPublicStaticMethod = function (param) {
+        };
+        privateClassWithWithPrivateParmeterTypes.myPrivateStaticMethod = function (param) {
+        };
+        privateClassWithWithPrivateParmeterTypes.prototype.myPublicMethod = function (param) {
+        };
+        privateClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod = function (param) {
+        };
+        return privateClassWithWithPrivateParmeterTypes;
+    })();
+    var privateClassWithWithPublicParmeterTypes = (function () {
+        function privateClassWithWithPublicParmeterTypes(param, param1, param2) {
+            this.param1 = param1;
+            this.param2 = param2;
+        }
+        privateClassWithWithPublicParmeterTypes.myPublicStaticMethod = function (param) {
+        };
+        privateClassWithWithPublicParmeterTypes.myPrivateStaticMethod = function (param) {
+        };
+        privateClassWithWithPublicParmeterTypes.prototype.myPublicMethod = function (param) {
+        };
+        privateClassWithWithPublicParmeterTypes.prototype.myPrivateMethod = function (param) {
+        };
+        return privateClassWithWithPublicParmeterTypes;
+    })();
+    function publicFunctionWithPrivateParmeterTypes(param) {
+    }
+    publicModule.publicFunctionWithPrivateParmeterTypes = publicFunctionWithPrivateParmeterTypes;
+    function publicFunctionWithPublicParmeterTypes(param) {
+    }
+    publicModule.publicFunctionWithPublicParmeterTypes = publicFunctionWithPublicParmeterTypes;
+    function privateFunctionWithPrivateParmeterTypes(param) {
+    }
+    function privateFunctionWithPublicParmeterTypes(param) {
+    }
+    var publicClassWithPrivateModuleParameterTypes = (function () {
+        function publicClassWithPrivateModuleParameterTypes(param, param1, param2) {
+            this.param1 = param1;
+            this.param2 = param2;
+        }
+        publicClassWithPrivateModuleParameterTypes.myPublicStaticMethod = function (param) {
+        };
+        publicClassWithPrivateModuleParameterTypes.prototype.myPublicMethod = function (param) {
+        };
+        return publicClassWithPrivateModuleParameterTypes;
+    })();
+    publicModule.publicClassWithPrivateModuleParameterTypes = publicClassWithPrivateModuleParameterTypes;
+    function publicFunctionWithPrivateModuleParameterTypes(param) {
+    }
+    publicModule.publicFunctionWithPrivateModuleParameterTypes = publicFunctionWithPrivateModuleParameterTypes;
+    var privateClassWithPrivateModuleParameterTypes = (function () {
+        function privateClassWithPrivateModuleParameterTypes(param, param1, param2) {
+            this.param1 = param1;
+            this.param2 = param2;
+        }
+        privateClassWithPrivateModuleParameterTypes.myPublicStaticMethod = function (param) {
+        };
+        privateClassWithPrivateModuleParameterTypes.prototype.myPublicMethod = function (param) {
+        };
+        return privateClassWithPrivateModuleParameterTypes;
+    })();
+    function privateFunctionWithPrivateModuleParameterTypes(param) {
+    }
+})(exports.publicModule || (exports.publicModule = {}));
+var publicModule = exports.publicModule;
+var privateModule;
+(function (privateModule) {
+    var privateClass = (function () {
+        function privateClass() {
+        }
+        return privateClass;
+    })();
+    var publicClass = (function () {
+        function publicClass() {
+        }
+        return publicClass;
+    })();
+    privateModule.publicClass = publicClass;
+    var publicClassWithWithPrivateParmeterTypes = (function () {
+        function publicClassWithWithPrivateParmeterTypes(param, param1, param2) {
+            this.param1 = param1;
+            this.param2 = param2;
+        }
+        publicClassWithWithPrivateParmeterTypes.myPublicStaticMethod = function (param) {
+        };
+        publicClassWithWithPrivateParmeterTypes.myPrivateStaticMethod = function (param) {
+        };
+        publicClassWithWithPrivateParmeterTypes.prototype.myPublicMethod = function (param) {
+        };
+        publicClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod = function (param) {
+        };
+        return publicClassWithWithPrivateParmeterTypes;
+    })();
+    privateModule.publicClassWithWithPrivateParmeterTypes = publicClassWithWithPrivateParmeterTypes;
+    var publicClassWithWithPublicParmeterTypes = (function () {
+        function publicClassWithWithPublicParmeterTypes(param, param1, param2) {
+            this.param1 = param1;
+            this.param2 = param2;
+        }
+        publicClassWithWithPublicParmeterTypes.myPublicStaticMethod = function (param) {
+        };
+        publicClassWithWithPublicParmeterTypes.myPrivateStaticMethod = function (param) {
+        };
+        publicClassWithWithPublicParmeterTypes.prototype.myPublicMethod = function (param) {
+        };
+        publicClassWithWithPublicParmeterTypes.prototype.myPrivateMethod = function (param) {
+        };
+        return publicClassWithWithPublicParmeterTypes;
+    })();
+    privateModule.publicClassWithWithPublicParmeterTypes = publicClassWithWithPublicParmeterTypes;
+    var privateClassWithWithPrivateParmeterTypes = (function () {
+        function privateClassWithWithPrivateParmeterTypes(param, param1, param2) {
+            this.param1 = param1;
+            this.param2 = param2;
+        }
+        privateClassWithWithPrivateParmeterTypes.myPublicStaticMethod = function (param) {
+        };
+        privateClassWithWithPrivateParmeterTypes.myPrivateStaticMethod = function (param) {
+        };
+        privateClassWithWithPrivateParmeterTypes.prototype.myPublicMethod = function (param) {
+        };
+        privateClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod = function (param) {
+        };
+        return privateClassWithWithPrivateParmeterTypes;
+    })();
+    var privateClassWithWithPublicParmeterTypes = (function () {
+        function privateClassWithWithPublicParmeterTypes(param, param1, param2) {
+            this.param1 = param1;
+            this.param2 = param2;
+        }
+        privateClassWithWithPublicParmeterTypes.myPublicStaticMethod = function (param) {
+        };
+        privateClassWithWithPublicParmeterTypes.myPrivateStaticMethod = function (param) {
+        };
+        privateClassWithWithPublicParmeterTypes.prototype.myPublicMethod = function (param) {
+        };
+        privateClassWithWithPublicParmeterTypes.prototype.myPrivateMethod = function (param) {
+        };
+        return privateClassWithWithPublicParmeterTypes;
+    })();
+    function publicFunctionWithPrivateParmeterTypes(param) {
+    }
+    privateModule.publicFunctionWithPrivateParmeterTypes = publicFunctionWithPrivateParmeterTypes;
+    function publicFunctionWithPublicParmeterTypes(param) {
+    }
+    privateModule.publicFunctionWithPublicParmeterTypes = publicFunctionWithPublicParmeterTypes;
+    function privateFunctionWithPrivateParmeterTypes(param) {
+    }
+    function privateFunctionWithPublicParmeterTypes(param) {
+    }
+    var publicClassWithPrivateModuleParameterTypes = (function () {
+        function publicClassWithPrivateModuleParameterTypes(param, param1, param2) {
+            this.param1 = param1;
+            this.param2 = param2;
+        }
+        publicClassWithPrivateModuleParameterTypes.myPublicStaticMethod = function (param) {
+        };
+        publicClassWithPrivateModuleParameterTypes.prototype.myPublicMethod = function (param) {
+        };
+        return publicClassWithPrivateModuleParameterTypes;
+    })();
+    privateModule.publicClassWithPrivateModuleParameterTypes = publicClassWithPrivateModuleParameterTypes;
+    function publicFunctionWithPrivateModuleParameterTypes(param) {
+    }
+    privateModule.publicFunctionWithPrivateModuleParameterTypes = publicFunctionWithPrivateModuleParameterTypes;
+    var privateClassWithPrivateModuleParameterTypes = (function () {
+        function privateClassWithPrivateModuleParameterTypes(param, param1, param2) {
+            this.param1 = param1;
+            this.param2 = param2;
+        }
+        privateClassWithPrivateModuleParameterTypes.myPublicStaticMethod = function (param) {
+        };
+        privateClassWithPrivateModuleParameterTypes.prototype.myPublicMethod = function (param) {
+        };
+        return privateClassWithPrivateModuleParameterTypes;
+    })();
+    function privateFunctionWithPrivateModuleParameterTypes(param) {
+    }
+})(privateModule || (privateModule = {}));
+//// [privacyFunctionParameterDeclFile_GlobalFile.js]
+var publicClassInGlobal = (function () {
+    function publicClassInGlobal() {
+    }
+    return publicClassInGlobal;
+})();
+var publicClassWithWithPublicParmeterTypesInGlobal = (function () {
+    function publicClassWithWithPublicParmeterTypesInGlobal(param, param1, param2) {
+        this.param1 = param1;
+        this.param2 = param2;
+    }
+    publicClassWithWithPublicParmeterTypesInGlobal.myPublicStaticMethod = function (param) {
+    };
+    publicClassWithWithPublicParmeterTypesInGlobal.myPrivateStaticMethod = function (param) {
+    };
+    publicClassWithWithPublicParmeterTypesInGlobal.prototype.myPublicMethod = function (param) {
+    };
+    publicClassWithWithPublicParmeterTypesInGlobal.prototype.myPrivateMethod = function (param) {
+    };
+    return publicClassWithWithPublicParmeterTypesInGlobal;
+})();
+function publicFunctionWithPublicParmeterTypesInGlobal(param) {
+}
+var publicModuleInGlobal;
+(function (publicModuleInGlobal) {
+    var privateClass = (function () {
+        function privateClass() {
+        }
+        return privateClass;
+    })();
+    var publicClass = (function () {
+        function publicClass() {
+        }
+        return publicClass;
+    })();
+    publicModuleInGlobal.publicClass = publicClass;
+    var privateModule;
+    (function (privateModule) {
+        var privateClass = (function () {
+            function privateClass() {
+            }
+            return privateClass;
+        })();
+        var publicClass = (function () {
+            function publicClass() {
+            }
+            return publicClass;
+        })();
+        privateModule.publicClass = publicClass;
+        var publicClassWithWithPrivateParmeterTypes = (function () {
+            function publicClassWithWithPrivateParmeterTypes(param, param1, param2) {
+                this.param1 = param1;
+                this.param2 = param2;
+            }
+            publicClassWithWithPrivateParmeterTypes.myPublicStaticMethod = function (param) {
+            };
+            publicClassWithWithPrivateParmeterTypes.myPrivateStaticMethod = function (param) {
+            };
+            publicClassWithWithPrivateParmeterTypes.prototype.myPublicMethod = function (param) {
+            };
+            publicClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod = function (param) {
+            };
+            return publicClassWithWithPrivateParmeterTypes;
+        })();
+        privateModule.publicClassWithWithPrivateParmeterTypes = publicClassWithWithPrivateParmeterTypes;
+        var publicClassWithWithPublicParmeterTypes = (function () {
+            function publicClassWithWithPublicParmeterTypes(param, param1, param2) {
+                this.param1 = param1;
+                this.param2 = param2;
+            }
+            publicClassWithWithPublicParmeterTypes.myPublicStaticMethod = function (param) {
+            };
+            publicClassWithWithPublicParmeterTypes.myPrivateStaticMethod = function (param) {
+            };
+            publicClassWithWithPublicParmeterTypes.prototype.myPublicMethod = function (param) {
+            };
+            publicClassWithWithPublicParmeterTypes.prototype.myPrivateMethod = function (param) {
+            };
+            return publicClassWithWithPublicParmeterTypes;
+        })();
+        privateModule.publicClassWithWithPublicParmeterTypes = publicClassWithWithPublicParmeterTypes;
+        var privateClassWithWithPrivateParmeterTypes = (function () {
+            function privateClassWithWithPrivateParmeterTypes(param, param1, param2) {
+                this.param1 = param1;
+                this.param2 = param2;
+            }
+            privateClassWithWithPrivateParmeterTypes.myPublicStaticMethod = function (param) {
+            };
+            privateClassWithWithPrivateParmeterTypes.myPrivateStaticMethod = function (param) {
+            };
+            privateClassWithWithPrivateParmeterTypes.prototype.myPublicMethod = function (param) {
+            };
+            privateClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod = function (param) {
+            };
+            return privateClassWithWithPrivateParmeterTypes;
+        })();
+        var privateClassWithWithPublicParmeterTypes = (function () {
+            function privateClassWithWithPublicParmeterTypes(param, param1, param2) {
+                this.param1 = param1;
+                this.param2 = param2;
+            }
+            privateClassWithWithPublicParmeterTypes.myPublicStaticMethod = function (param) {
+            };
+            privateClassWithWithPublicParmeterTypes.myPrivateStaticMethod = function (param) {
+            };
+            privateClassWithWithPublicParmeterTypes.prototype.myPublicMethod = function (param) {
+            };
+            privateClassWithWithPublicParmeterTypes.prototype.myPrivateMethod = function (param) {
+            };
+            return privateClassWithWithPublicParmeterTypes;
+        })();
+        function publicFunctionWithPrivateParmeterTypes(param) {
+        }
+        privateModule.publicFunctionWithPrivateParmeterTypes = publicFunctionWithPrivateParmeterTypes;
+        function publicFunctionWithPublicParmeterTypes(param) {
+        }
+        privateModule.publicFunctionWithPublicParmeterTypes = publicFunctionWithPublicParmeterTypes;
+        function privateFunctionWithPrivateParmeterTypes(param) {
+        }
+        function privateFunctionWithPublicParmeterTypes(param) {
+        }
+        var publicClassWithPrivateModuleParameterTypes = (function () {
+            function publicClassWithPrivateModuleParameterTypes(param, param1, param2) {
+                this.param1 = param1;
+                this.param2 = param2;
+            }
+            publicClassWithPrivateModuleParameterTypes.myPublicStaticMethod = function (param) {
+            };
+            publicClassWithPrivateModuleParameterTypes.prototype.myPublicMethod = function (param) {
+            };
+            return publicClassWithPrivateModuleParameterTypes;
+        })();
+        privateModule.publicClassWithPrivateModuleParameterTypes = publicClassWithPrivateModuleParameterTypes;
+        function publicFunctionWithPrivateModuleParameterTypes(param) {
+        }
+        privateModule.publicFunctionWithPrivateModuleParameterTypes = publicFunctionWithPrivateModuleParameterTypes;
+        var privateClassWithPrivateModuleParameterTypes = (function () {
+            function privateClassWithPrivateModuleParameterTypes(param, param1, param2) {
+                this.param1 = param1;
+                this.param2 = param2;
+            }
+            privateClassWithPrivateModuleParameterTypes.myPublicStaticMethod = function (param) {
+            };
+            privateClassWithPrivateModuleParameterTypes.prototype.myPublicMethod = function (param) {
+            };
+            return privateClassWithPrivateModuleParameterTypes;
+        })();
+        function privateFunctionWithPrivateModuleParameterTypes(param) {
+        }
+    })(privateModule || (privateModule = {}));
+    var publicClassWithWithPrivateParmeterTypes = (function () {
+        function publicClassWithWithPrivateParmeterTypes(param, param1, param2) {
+            this.param1 = param1;
+            this.param2 = param2;
+        }
+        publicClassWithWithPrivateParmeterTypes.myPublicStaticMethod = function (param) {
+        };
+        publicClassWithWithPrivateParmeterTypes.myPrivateStaticMethod = function (param) {
+        };
+        publicClassWithWithPrivateParmeterTypes.prototype.myPublicMethod = function (param) {
+        };
+        publicClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod = function (param) {
+        };
+        return publicClassWithWithPrivateParmeterTypes;
+    })();
+    publicModuleInGlobal.publicClassWithWithPrivateParmeterTypes = publicClassWithWithPrivateParmeterTypes;
+    var publicClassWithWithPublicParmeterTypes = (function () {
+        function publicClassWithWithPublicParmeterTypes(param, param1, param2) {
+            this.param1 = param1;
+            this.param2 = param2;
+        }
+        publicClassWithWithPublicParmeterTypes.myPublicStaticMethod = function (param) {
+        };
+        publicClassWithWithPublicParmeterTypes.myPrivateStaticMethod = function (param) {
+        };
+        publicClassWithWithPublicParmeterTypes.prototype.myPublicMethod = function (param) {
+        };
+        publicClassWithWithPublicParmeterTypes.prototype.myPrivateMethod = function (param) {
+        };
+        return publicClassWithWithPublicParmeterTypes;
+    })();
+    publicModuleInGlobal.publicClassWithWithPublicParmeterTypes = publicClassWithWithPublicParmeterTypes;
+    var privateClassWithWithPrivateParmeterTypes = (function () {
+        function privateClassWithWithPrivateParmeterTypes(param, param1, param2) {
+            this.param1 = param1;
+            this.param2 = param2;
+        }
+        privateClassWithWithPrivateParmeterTypes.myPublicStaticMethod = function (param) {
+        };
+        privateClassWithWithPrivateParmeterTypes.myPrivateStaticMethod = function (param) {
+        };
+        privateClassWithWithPrivateParmeterTypes.prototype.myPublicMethod = function (param) {
+        };
+        privateClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod = function (param) {
+        };
+        return privateClassWithWithPrivateParmeterTypes;
+    })();
+    var privateClassWithWithPublicParmeterTypes = (function () {
+        function privateClassWithWithPublicParmeterTypes(param, param1, param2) {
+            this.param1 = param1;
+            this.param2 = param2;
+        }
+        privateClassWithWithPublicParmeterTypes.myPublicStaticMethod = function (param) {
+        };
+        privateClassWithWithPublicParmeterTypes.myPrivateStaticMethod = function (param) {
+        };
+        privateClassWithWithPublicParmeterTypes.prototype.myPublicMethod = function (param) {
+        };
+        privateClassWithWithPublicParmeterTypes.prototype.myPrivateMethod = function (param) {
+        };
+        return privateClassWithWithPublicParmeterTypes;
+    })();
+    function publicFunctionWithPrivateParmeterTypes(param) {
+    }
+    publicModuleInGlobal.publicFunctionWithPrivateParmeterTypes = publicFunctionWithPrivateParmeterTypes;
+    function publicFunctionWithPublicParmeterTypes(param) {
+    }
+    publicModuleInGlobal.publicFunctionWithPublicParmeterTypes = publicFunctionWithPublicParmeterTypes;
+    function privateFunctionWithPrivateParmeterTypes(param) {
+    }
+    function privateFunctionWithPublicParmeterTypes(param) {
+    }
+    var publicClassWithPrivateModuleParameterTypes = (function () {
+        function publicClassWithPrivateModuleParameterTypes(param, param1, param2) {
+            this.param1 = param1;
+            this.param2 = param2;
+        }
+        publicClassWithPrivateModuleParameterTypes.myPublicStaticMethod = function (param) {
+        };
+        publicClassWithPrivateModuleParameterTypes.prototype.myPublicMethod = function (param) {
+        };
+        return publicClassWithPrivateModuleParameterTypes;
+    })();
+    publicModuleInGlobal.publicClassWithPrivateModuleParameterTypes = publicClassWithPrivateModuleParameterTypes;
+    function publicFunctionWithPrivateModuleParameterTypes(param) {
+    }
+    publicModuleInGlobal.publicFunctionWithPrivateModuleParameterTypes = publicFunctionWithPrivateModuleParameterTypes;
+    var privateClassWithPrivateModuleParameterTypes = (function () {
+        function privateClassWithPrivateModuleParameterTypes(param, param1, param2) {
+            this.param1 = param1;
+            this.param2 = param2;
+        }
+        privateClassWithPrivateModuleParameterTypes.myPublicStaticMethod = function (param) {
+        };
+        privateClassWithPrivateModuleParameterTypes.prototype.myPublicMethod = function (param) {
+        };
+        return privateClassWithPrivateModuleParameterTypes;
+    })();
+    function privateFunctionWithPrivateModuleParameterTypes(param) {
+    }
+})(publicModuleInGlobal || (publicModuleInGlobal = {}));
diff --git a/tests/baselines/reference/privacyFunctionReturnTypeDeclFile.errors.txt b/tests/baselines/reference/privacyFunctionReturnTypeDeclFile.errors.txt
new file mode 100644
index 00000000000..0fe9b40ea83
--- /dev/null
+++ b/tests/baselines/reference/privacyFunctionReturnTypeDeclFile.errors.txt
@@ -0,0 +1,1324 @@
+==== tests/cases/compiler/privacyFunctionReturnTypeDeclFile_externalModule.ts (44 errors) ====
+    
+    class privateClass {
+    }
+    
+    export class publicClass {
+    }
+    
+    export interface publicInterfaceWithPrivateParmeterTypes {
+        new (): privateClass; // Error
+        ~~~~~~~~~~~~~~~~~~~~~
+!!! Return type of constructor signature from exported interface has or is using private name 'privateClass'.
+        (): privateClass; // Error
+        ~~~~~~~~~~~~~~~~~
+!!! Return type of call signature from exported interface has or is using private name 'privateClass'.
+        [x: number]: privateClass; // Error
+        ~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Return type of index signature from exported interface has or is using private name 'privateClass'.
+        myMethod(): privateClass; // Error
+        ~~~~~~~~
+!!! Return type of method from exported interface has or is using private name 'privateClass'.
+    }
+    
+    export interface publicInterfaceWithPublicParmeterTypes {
+        new (): publicClass;
+        (): publicClass;
+        [x: number]: publicClass;
+        myMethod(): publicClass;
+    }
+    
+    interface privateInterfaceWithPrivateParmeterTypes {
+        new (): privateClass;
+        (): privateClass;
+        [x: number]: privateClass;
+        myMethod(): privateClass;
+    }
+    
+    interface privateInterfaceWithPublicParmeterTypes {
+        new (): publicClass;
+        (): publicClass;
+        [x: number]: publicClass;
+        myMethod(): publicClass;
+    }
+    
+    export class publicClassWithWithPrivateParmeterTypes {
+        static myPublicStaticMethod(): privateClass { // Error
+               ~~~~~~~~~~~~~~~~~~~~
+!!! Return type of public static method from exported class has or is using private name 'privateClass'.
+            return null;
+        }
+        private static myPrivateStaticMethod(): privateClass {
+            return null;
+        }
+        myPublicMethod(): privateClass { // Error
+        ~~~~~~~~~~~~~~
+!!! Return type of public method from exported class has or is using private name 'privateClass'.
+            return null;
+        }
+        private myPrivateMethod(): privateClass {
+            return null;
+        }
+        static myPublicStaticMethod1() { // Error
+               ~~~~~~~~~~~~~~~~~~~~~
+!!! Return type of public static method from exported class has or is using private name 'privateClass'.
+            return new privateClass();
+        }
+        private static myPrivateStaticMethod1() {
+            return new privateClass();
+        }
+        myPublicMethod1() { // Error
+        ~~~~~~~~~~~~~~~
+!!! Return type of public method from exported class has or is using private name 'privateClass'.
+            return new privateClass();
+        }
+        private myPrivateMethod1() {
+            return new privateClass();
+        }
+    }
+    
+    export class publicClassWithWithPublicParmeterTypes {
+        static myPublicStaticMethod(): publicClass { 
+            return null;
+        }
+        private static myPrivateStaticMethod(): publicClass {
+            return null;
+        }
+        myPublicMethod(): publicClass { 
+            return null;
+        }
+        private myPrivateMethod(): publicClass {
+            return null;
+        }
+        static myPublicStaticMethod1() {
+            return new publicClass();
+        }
+        private static myPrivateStaticMethod1() {
+            return new publicClass();
+        }
+        myPublicMethod1() { 
+            return new publicClass();
+        }
+        private myPrivateMethod1() {
+            return new publicClass();
+        }
+    }
+    
+    class privateClassWithWithPrivateParmeterTypes {
+        static myPublicStaticMethod(): privateClass {
+            return null;
+        }
+        private static myPrivateStaticMethod(): privateClass {
+            return null;
+        }
+        myPublicMethod(): privateClass {
+            return null;
+        }
+        private myPrivateMethod(): privateClass {
+            return null;
+        }
+        static myPublicStaticMethod1() {
+            return new privateClass();
+        }
+        private static myPrivateStaticMethod1() {
+            return new privateClass();
+        }
+        myPublicMethod1() {
+            return new privateClass();
+        }
+        private myPrivateMethod1() {
+            return new privateClass();
+        }
+    }
+    
+    class privateClassWithWithPublicParmeterTypes {
+        static myPublicStaticMethod(): publicClass {
+            return null;
+        }
+        private static myPrivateStaticMethod(): publicClass {
+            return null;
+        }
+        myPublicMethod(): publicClass {
+            return null;
+        }
+        private myPrivateMethod(): publicClass {
+            return null;
+        }
+        static myPublicStaticMethod1() {
+            return new publicClass();
+        }
+        private static myPrivateStaticMethod1() {
+            return new publicClass();
+        }
+        myPublicMethod1() {
+            return new publicClass();
+        }
+        private myPrivateMethod1() {
+            return new publicClass();
+        }
+    }
+    
+    export function publicFunctionWithPrivateParmeterTypes(): privateClass { // Error
+                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Return type of exported function has or is using private name 'privateClass'.
+        return null;
+    }
+    export function publicFunctionWithPublicParmeterTypes(): publicClass {
+        return null;
+    }
+    function privateFunctionWithPrivateParmeterTypes(): privateClass {
+        return null;
+    }
+    function privateFunctionWithPublicParmeterTypes(): publicClass {
+        return null;
+    }
+    export function publicFunctionWithPrivateParmeterTypes1() { // Error
+                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Return type of exported function has or is using private name 'privateClass'.
+        return new privateClass();
+    }
+    export function publicFunctionWithPublicParmeterTypes1() {
+        return new publicClass();
+    }
+    function privateFunctionWithPrivateParmeterTypes1() {
+        return new privateClass();
+    }
+    function privateFunctionWithPublicParmeterTypes1() {
+        return new publicClass();
+    }
+    
+    export declare function publicAmbientFunctionWithPrivateParmeterTypes(): privateClass; // Error
+                            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Return type of exported function has or is using private name 'privateClass'.
+    export declare function publicAmbientFunctionWithPublicParmeterTypes(): publicClass;
+    declare function privateAmbientFunctionWithPrivateParmeterTypes(): privateClass;
+    declare function privateAmbientFunctionWithPublicParmeterTypes(): publicClass;
+    
+    export interface publicInterfaceWithPrivateModuleParameterTypes {
+        new (): privateModule.publicClass; // Error
+        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Return type of constructor signature from exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+        (): privateModule.publicClass; // Error
+        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Return type of call signature from exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+        [x: number]: privateModule.publicClass // Error
+        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Return type of index signature from exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+        myMethod(): privateModule.publicClass; // Error
+        ~~~~~~~~
+!!! Return type of method from exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+    }
+    export class publicClassWithPrivateModuleParameterTypes {
+        static myPublicStaticMethod(): privateModule.publicClass { // Error
+               ~~~~~~~~~~~~~~~~~~~~
+!!! Return type of public static method from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+            return null;
+        }
+        myPublicMethod(): privateModule.publicClass { // Error
+        ~~~~~~~~~~~~~~
+!!! Return type of public method from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+            return null;
+        }
+        static myPublicStaticMethod1() { // Error
+               ~~~~~~~~~~~~~~~~~~~~~
+!!! Return type of public static method from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+            return new privateModule.publicClass();
+        }
+        myPublicMethod1() { // Error
+        ~~~~~~~~~~~~~~~
+!!! Return type of public method from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+            return new privateModule.publicClass();
+        }
+    }
+    export function publicFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass { // Error
+                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Return type of exported function has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+        return null;
+    }
+    export function publicFunctionWithPrivateModuleParameterTypes1() { // Error
+                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Return type of exported function has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+        return new privateModule.publicClass();
+    }
+    export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; // Error
+                            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Return type of exported function has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+    
+    interface privateInterfaceWithPrivateModuleParameterTypes {
+        new (): privateModule.publicClass; 
+        (): privateModule.publicClass;
+        [x: number]: privateModule.publicClass
+        myMethod(): privateModule.publicClass;
+    }
+    class privateClassWithPrivateModuleParameterTypes {
+        static myPublicStaticMethod(): privateModule.publicClass { 
+            return null;
+        }
+        myPublicMethod(): privateModule.publicClass { 
+            return null;
+        }
+        static myPublicStaticMethod1() { 
+            return new privateModule.publicClass();
+        }
+        myPublicMethod1() { 
+            return new privateModule.publicClass();
+        }
+    }
+    function privateFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass { 
+        return null;
+    }
+    function privateFunctionWithPrivateModuleParameterTypes1() { 
+        return new privateModule.publicClass();
+    }
+    declare function privateAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; 
+    
+    export module publicModule {
+        class privateClass {
+        }
+    
+        export class publicClass {
+        }
+    
+        export interface publicInterfaceWithPrivateParmeterTypes {
+            new (): privateClass; // Error
+            ~~~~~~~~~~~~~~~~~~~~~
+!!! Return type of constructor signature from exported interface has or is using private name 'privateClass'.
+            (): privateClass; // Error
+            ~~~~~~~~~~~~~~~~~
+!!! Return type of call signature from exported interface has or is using private name 'privateClass'.
+            [x: number]: privateClass; // Error
+            ~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Return type of index signature from exported interface has or is using private name 'privateClass'.
+            myMethod(): privateClass; // Error
+            ~~~~~~~~
+!!! Return type of method from exported interface has or is using private name 'privateClass'.
+        }
+    
+        export interface publicInterfaceWithPublicParmeterTypes {
+            new (): publicClass;
+            (): publicClass;
+            [x: number]: publicClass;
+            myMethod(): publicClass;
+        }
+    
+        interface privateInterfaceWithPrivateParmeterTypes {
+            new (): privateClass;
+            (): privateClass;
+            [x: number]: privateClass;
+            myMethod(): privateClass;
+        }
+    
+        interface privateInterfaceWithPublicParmeterTypes {
+            new (): publicClass;
+            (): publicClass;
+            [x: number]: publicClass;
+            myMethod(): publicClass;
+        }
+    
+        export class publicClassWithWithPrivateParmeterTypes {
+            static myPublicStaticMethod(): privateClass { // Error
+                   ~~~~~~~~~~~~~~~~~~~~
+!!! Return type of public static method from exported class has or is using private name 'privateClass'.
+                return null;
+            }
+            private static myPrivateStaticMethod(): privateClass {
+                return null;
+            }
+            myPublicMethod(): privateClass { // Error
+            ~~~~~~~~~~~~~~
+!!! Return type of public method from exported class has or is using private name 'privateClass'.
+                return null;
+            }
+            private myPrivateMethod(): privateClass {
+                return null;
+            }
+            static myPublicStaticMethod1() { // Error
+                   ~~~~~~~~~~~~~~~~~~~~~
+!!! Return type of public static method from exported class has or is using private name 'privateClass'.
+                return new privateClass();
+            }
+            private static myPrivateStaticMethod1() {
+                return new privateClass();
+            }
+            myPublicMethod1() { // Error
+            ~~~~~~~~~~~~~~~
+!!! Return type of public method from exported class has or is using private name 'privateClass'.
+                return new privateClass();
+            }
+            private myPrivateMethod1() {
+                return new privateClass();
+            }
+        }
+    
+        export class publicClassWithWithPublicParmeterTypes {
+            static myPublicStaticMethod(): publicClass {
+                return null;
+            }
+            private static myPrivateStaticMethod(): publicClass {
+                return null;
+            }
+            myPublicMethod(): publicClass {
+                return null;
+            }
+            private myPrivateMethod(): publicClass {
+                return null;
+            }
+            static myPublicStaticMethod1() {
+                return new publicClass();
+            }
+            private static myPrivateStaticMethod1() {
+                return new publicClass();
+            }
+            myPublicMethod1() {
+                return new publicClass();
+            }
+            private myPrivateMethod1() {
+                return new publicClass();
+            }
+        }
+    
+        class privateClassWithWithPrivateParmeterTypes {
+            static myPublicStaticMethod(): privateClass {
+                return null;
+            }
+            private static myPrivateStaticMethod(): privateClass {
+                return null;
+            }
+            myPublicMethod(): privateClass {
+                return null;
+            }
+            private myPrivateMethod(): privateClass {
+                return null;
+            }
+            static myPublicStaticMethod1() {
+                return new privateClass();
+            }
+            private static myPrivateStaticMethod1() {
+                return new privateClass();
+            }
+            myPublicMethod1() {
+                return new privateClass();
+            }
+            private myPrivateMethod1() {
+                return new privateClass();
+            }
+        }
+    
+        class privateClassWithWithPublicParmeterTypes {
+            static myPublicStaticMethod(): publicClass {
+                return null;
+            }
+            private static myPrivateStaticMethod(): publicClass {
+                return null;
+            }
+            myPublicMethod(): publicClass {
+                return null;
+            }
+            private myPrivateMethod(): publicClass {
+                return null;
+            }
+            static myPublicStaticMethod1() {
+                return new publicClass();
+            }
+            private static myPrivateStaticMethod1() {
+                return new publicClass();
+            }
+            myPublicMethod1() {
+                return new publicClass();
+            }
+            private myPrivateMethod1() {
+                return new publicClass();
+            }
+        }
+    
+        export function publicFunctionWithPrivateParmeterTypes(): privateClass { // Error
+                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Return type of exported function has or is using private name 'privateClass'.
+            return null;
+        }
+        export function publicFunctionWithPublicParmeterTypes(): publicClass {
+            return null;
+        }
+        function privateFunctionWithPrivateParmeterTypes(): privateClass {
+            return null;
+        }
+        function privateFunctionWithPublicParmeterTypes(): publicClass {
+            return null;
+        }
+        export function publicFunctionWithPrivateParmeterTypes1() { // Error
+                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Return type of exported function has or is using private name 'privateClass'.
+            return new privateClass();
+        }
+        export function publicFunctionWithPublicParmeterTypes1() {
+            return new publicClass();
+        }
+        function privateFunctionWithPrivateParmeterTypes1() {
+            return new privateClass();
+        }
+        function privateFunctionWithPublicParmeterTypes1() {
+            return new publicClass();
+        }
+    
+        export declare function publicAmbientFunctionWithPrivateParmeterTypes(): privateClass; // Error
+                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Return type of exported function has or is using private name 'privateClass'.
+        export declare function publicAmbientFunctionWithPublicParmeterTypes(): publicClass;
+        declare function privateAmbientFunctionWithPrivateParmeterTypes(): privateClass;
+        declare function privateAmbientFunctionWithPublicParmeterTypes(): publicClass;
+    
+        export interface publicInterfaceWithPrivateModuleParameterTypes {
+            new (): privateModule.publicClass; // Error
+            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Return type of constructor signature from exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+            (): privateModule.publicClass; // Error
+            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Return type of call signature from exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+            [x: number]: privateModule.publicClass; // Error
+            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Return type of index signature from exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+            myMethod(): privateModule.publicClass; // Error
+            ~~~~~~~~
+!!! Return type of method from exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+        }
+        export class publicClassWithPrivateModuleParameterTypes {
+            static myPublicStaticMethod(): privateModule.publicClass { // Error
+                   ~~~~~~~~~~~~~~~~~~~~
+!!! Return type of public static method from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+                return null;
+            }
+            myPublicMethod(): privateModule.publicClass { // Error
+            ~~~~~~~~~~~~~~
+!!! Return type of public method from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+                return null;
+            }
+            static myPublicStaticMethod1() { // Error
+                   ~~~~~~~~~~~~~~~~~~~~~
+!!! Return type of public static method from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+                return new privateModule.publicClass();
+            }
+            myPublicMethod1() { // Error
+            ~~~~~~~~~~~~~~~
+!!! Return type of public method from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+                return new privateModule.publicClass();
+            }
+        }
+        export function publicFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass { // Error
+                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Return type of exported function has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+            return null;
+        }
+        export function publicFunctionWithPrivateModuleParameterTypes1() { // Error
+                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Return type of exported function has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+            return new privateModule.publicClass();
+        }
+        export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; // Error
+                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Return type of exported function has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+    
+        interface privateInterfaceWithPrivateModuleParameterTypes {
+            new (): privateModule.publicClass;
+            (): privateModule.publicClass;
+            [x: number]: privateModule.publicClass;
+            myMethod(): privateModule.publicClass;
+        }
+        class privateClassWithPrivateModuleParameterTypes {
+            static myPublicStaticMethod(): privateModule.publicClass {
+                return null;
+            }
+            myPublicMethod(): privateModule.publicClass {
+                return null;
+            }
+            static myPublicStaticMethod1() {
+                return new privateModule.publicClass();
+            }
+            myPublicMethod1() {
+                return new privateModule.publicClass();
+            }
+        }
+        function privateFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass {
+            return null;
+        }
+        function privateFunctionWithPrivateModuleParameterTypes1() {
+            return new privateModule.publicClass();
+        }
+        declare function privateAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; 
+    }
+    
+    module privateModule {
+        class privateClass {
+        }
+    
+        export class publicClass {
+        }
+    
+        export interface publicInterfaceWithPrivateParmeterTypes {
+            new (): privateClass; 
+            (): privateClass; 
+            [x: number]: privateClass; 
+            myMethod(): privateClass; 
+        }
+    
+        export interface publicInterfaceWithPublicParmeterTypes {
+            new (): publicClass;
+            (): publicClass;
+            [x: number]: publicClass;
+            myMethod(): publicClass;
+        }
+    
+        interface privateInterfaceWithPrivateParmeterTypes {
+            new (): privateClass;
+            (): privateClass;
+            [x: number]: privateClass;
+            myMethod(): privateClass;
+        }
+    
+        interface privateInterfaceWithPublicParmeterTypes {
+            new (): publicClass;
+            (): publicClass;
+            [x: number]: publicClass;
+            myMethod(): publicClass;
+        }
+    
+        export class publicClassWithWithPrivateParmeterTypes {
+            static myPublicStaticMethod(): privateClass { 
+                return null;
+            }
+            private static myPrivateStaticMethod(): privateClass {
+                return null;
+            }
+            myPublicMethod(): privateClass { 
+                return null;
+            }
+            private myPrivateMethod(): privateClass {
+                return null;
+            }
+            static myPublicStaticMethod1() { 
+                return new privateClass();
+            }
+            private static myPrivateStaticMethod1() {
+                return new privateClass();
+            }
+            myPublicMethod1() { 
+                return new privateClass();
+            }
+            private myPrivateMethod1() {
+                return new privateClass();
+            }
+        }
+    
+        export class publicClassWithWithPublicParmeterTypes {
+            static myPublicStaticMethod(): publicClass {
+                return null;
+            }
+            private static myPrivateStaticMethod(): publicClass {
+                return null;
+            }
+            myPublicMethod(): publicClass {
+                return null;
+            }
+            private myPrivateMethod(): publicClass {
+                return null;
+            }
+            static myPublicStaticMethod1() {
+                return new publicClass();
+            }
+            private static myPrivateStaticMethod1() {
+                return new publicClass();
+            }
+            myPublicMethod1() {
+                return new publicClass();
+            }
+            private myPrivateMethod1() {
+                return new publicClass();
+            }
+        }
+    
+        class privateClassWithWithPrivateParmeterTypes {
+            static myPublicStaticMethod(): privateClass {
+                return null;
+            }
+            private static myPrivateStaticMethod(): privateClass {
+                return null;
+            }
+            myPublicMethod(): privateClass {
+                return null;
+            }
+            private myPrivateMethod(): privateClass {
+                return null;
+            }
+            static myPublicStaticMethod1() {
+                return new privateClass();
+            }
+            private static myPrivateStaticMethod1() {
+                return new privateClass();
+            }
+            myPublicMethod1() {
+                return new privateClass();
+            }
+            private myPrivateMethod1() {
+                return new privateClass();
+            }
+        }
+    
+        class privateClassWithWithPublicParmeterTypes {
+            static myPublicStaticMethod(): publicClass {
+                return null;
+            }
+            private static myPrivateStaticMethod(): publicClass {
+                return null;
+            }
+            myPublicMethod(): publicClass {
+                return null;
+            }
+            private myPrivateMethod(): publicClass {
+                return null;
+            }
+            static myPublicStaticMethod1() {
+                return new publicClass();
+            }
+            private static myPrivateStaticMethod1() {
+                return new publicClass();
+            }
+            myPublicMethod1() {
+                return new publicClass();
+            }
+            private myPrivateMethod1() {
+                return new publicClass();
+            }
+        }
+    
+        export function publicFunctionWithPrivateParmeterTypes(): privateClass { 
+            return null;
+        }
+        export function publicFunctionWithPublicParmeterTypes(): publicClass {
+            return null;
+        }
+        function privateFunctionWithPrivateParmeterTypes(): privateClass {
+            return null;
+        }
+        function privateFunctionWithPublicParmeterTypes(): publicClass {
+            return null;
+        }
+        export function publicFunctionWithPrivateParmeterTypes1() { 
+            return new privateClass();
+        }
+        export function publicFunctionWithPublicParmeterTypes1() {
+            return new publicClass();
+        }
+        function privateFunctionWithPrivateParmeterTypes1() {
+            return new privateClass();
+        }
+        function privateFunctionWithPublicParmeterTypes1() {
+            return new publicClass();
+        }
+    
+        export declare function publicAmbientFunctionWithPrivateParmeterTypes(): privateClass; 
+        export declare function publicAmbientFunctionWithPublicParmeterTypes(): publicClass;
+        declare function privateAmbientFunctionWithPrivateParmeterTypes(): privateClass;
+        declare function privateAmbientFunctionWithPublicParmeterTypes(): publicClass;
+    
+        export interface publicInterfaceWithPrivateModuleParameterTypes {
+            new (): privateModule.publicClass;
+            (): privateModule.publicClass;
+            [x: number]: privateModule.publicClass;
+            myMethod(): privateModule.publicClass;
+        }
+        export class publicClassWithPrivateModuleParameterTypes {
+            static myPublicStaticMethod(): privateModule.publicClass { 
+                return null;
+            }
+            myPublicMethod(): privateModule.publicClass { 
+                return null;
+            }
+            static myPublicStaticMethod1() { 
+                return new privateModule.publicClass();
+            }
+            myPublicMethod1() { 
+                return new privateModule.publicClass();
+            }
+        }
+        export function publicFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass { 
+            return null;
+        }
+        export function publicFunctionWithPrivateModuleParameterTypes1() { 
+            return new privateModule.publicClass();
+        }
+        export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; 
+    
+        interface privateInterfaceWithPrivateModuleParameterTypes {
+            new (): privateModule.publicClass;
+            (): privateModule.publicClass;
+            [x: number]: privateModule.publicClass;
+            myMethod(): privateModule.publicClass;
+        }
+        class privateClassWithPrivateModuleParameterTypes {
+            static myPublicStaticMethod(): privateModule.publicClass {
+                return null;
+            }
+            myPublicMethod(): privateModule.publicClass {
+                return null;
+            }
+            static myPublicStaticMethod1() {
+                return new privateModule.publicClass();
+            }
+            myPublicMethod1() {
+                return new privateModule.publicClass();
+            }
+        }
+        function privateFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass {
+            return null;
+        }
+        function privateFunctionWithPrivateModuleParameterTypes1() {
+            return new privateModule.publicClass();
+        }
+        declare function privateAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; 
+    }
+    
+==== tests/cases/compiler/privacyFunctionReturnTypeDeclFile_GlobalFile.ts (22 errors) ====
+    class publicClassInGlobal {
+    }
+    interface publicInterfaceWithPublicParmeterTypesInGlobal {
+        new (): publicClassInGlobal;
+        (): publicClassInGlobal;
+        [x: number]: publicClassInGlobal;
+        myMethod(): publicClassInGlobal;
+    }
+    class publicClassWithWithPublicParmeterTypesInGlobal {
+        static myPublicStaticMethod(): publicClassInGlobal {
+            return null;
+        }
+        private static myPrivateStaticMethod(): publicClassInGlobal {
+            return null;
+        }
+        myPublicMethod(): publicClassInGlobal {
+            return null;
+        }
+        private myPrivateMethod(): publicClassInGlobal {
+            return null;
+        }
+        static myPublicStaticMethod1() {
+            return new publicClassInGlobal();
+        }
+        private static myPrivateStaticMethod1() {
+            return new publicClassInGlobal();
+        }
+        myPublicMethod1() {
+            return new publicClassInGlobal();
+        }
+        private myPrivateMethod1() {
+            return new publicClassInGlobal();
+        }
+    }
+    function publicFunctionWithPublicParmeterTypesInGlobal(): publicClassInGlobal {
+        return null;
+    }
+    function publicFunctionWithPublicParmeterTypesInGlobal1() {
+        return new publicClassInGlobal();
+    }
+    declare function publicAmbientFunctionWithPublicParmeterTypesInGlobal(): publicClassInGlobal;
+    
+    module publicModuleInGlobal {
+        class privateClass {
+        }
+    
+        export class publicClass {
+        }
+    
+        module privateModule {
+            class privateClass {
+            }
+    
+            export class publicClass {
+            }
+    
+            export interface publicInterfaceWithPrivateParmeterTypes {
+                new (): privateClass;
+                (): privateClass;
+                [x: number]: privateClass;
+                myMethod(): privateClass;
+            }
+    
+            export interface publicInterfaceWithPublicParmeterTypes {
+                new (): publicClass;
+                (): publicClass;
+                [x: number]: publicClass;
+                myMethod(): publicClass;
+            }
+    
+            interface privateInterfaceWithPrivateParmeterTypes {
+                new (): privateClass;
+                (): privateClass;
+                [x: number]: privateClass;
+                myMethod(): privateClass;
+            }
+    
+            interface privateInterfaceWithPublicParmeterTypes {
+                new (): publicClass;
+                (): publicClass;
+                [x: number]: publicClass;
+                myMethod(): publicClass;
+            }
+    
+            export class publicClassWithWithPrivateParmeterTypes {
+                static myPublicStaticMethod(): privateClass {
+                    return null;
+                }
+                private static myPrivateStaticMethod(): privateClass {
+                    return null;
+                }
+                myPublicMethod(): privateClass {
+                    return null;
+                }
+                private myPrivateMethod(): privateClass {
+                    return null;
+                }
+                static myPublicStaticMethod1() {
+                    return new privateClass();
+                }
+                private static myPrivateStaticMethod1() {
+                    return new privateClass();
+                }
+                myPublicMethod1() {
+                    return new privateClass();
+                }
+                private myPrivateMethod1() {
+                    return new privateClass();
+                }
+            }
+    
+            export class publicClassWithWithPublicParmeterTypes {
+                static myPublicStaticMethod(): publicClass {
+                    return null;
+                }
+                private static myPrivateStaticMethod(): publicClass {
+                    return null;
+                }
+                myPublicMethod(): publicClass {
+                    return null;
+                }
+                private myPrivateMethod(): publicClass {
+                    return null;
+                }
+                static myPublicStaticMethod1() {
+                    return new publicClass();
+                }
+                private static myPrivateStaticMethod1() {
+                    return new publicClass();
+                }
+                myPublicMethod1() {
+                    return new publicClass();
+                }
+                private myPrivateMethod1() {
+                    return new publicClass();
+                }
+            }
+    
+            class privateClassWithWithPrivateParmeterTypes {
+                static myPublicStaticMethod(): privateClass {
+                    return null;
+                }
+                private static myPrivateStaticMethod(): privateClass {
+                    return null;
+                }
+                myPublicMethod(): privateClass {
+                    return null;
+                }
+                private myPrivateMethod(): privateClass {
+                    return null;
+                }
+                static myPublicStaticMethod1() {
+                    return new privateClass();
+                }
+                private static myPrivateStaticMethod1() {
+                    return new privateClass();
+                }
+                myPublicMethod1() {
+                    return new privateClass();
+                }
+                private myPrivateMethod1() {
+                    return new privateClass();
+                }
+            }
+    
+            class privateClassWithWithPublicParmeterTypes {
+                static myPublicStaticMethod(): publicClass {
+                    return null;
+                }
+                private static myPrivateStaticMethod(): publicClass {
+                    return null;
+                }
+                myPublicMethod(): publicClass {
+                    return null;
+                }
+                private myPrivateMethod(): publicClass {
+                    return null;
+                }
+                static myPublicStaticMethod1() {
+                    return new publicClass();
+                }
+                private static myPrivateStaticMethod1() {
+                    return new publicClass();
+                }
+                myPublicMethod1() {
+                    return new publicClass();
+                }
+                private myPrivateMethod1() {
+                    return new publicClass();
+                }
+            }
+    
+            export function publicFunctionWithPrivateParmeterTypes(): privateClass {
+                return null;
+            }
+            export function publicFunctionWithPublicParmeterTypes(): publicClass {
+                return null;
+            }
+            function privateFunctionWithPrivateParmeterTypes(): privateClass {
+                return null;
+            }
+            function privateFunctionWithPublicParmeterTypes(): publicClass {
+                return null;
+            }
+            export function publicFunctionWithPrivateParmeterTypes1() {
+                return new privateClass();
+            }
+            export function publicFunctionWithPublicParmeterTypes1() {
+                return new publicClass();
+            }
+            function privateFunctionWithPrivateParmeterTypes1() {
+                return new privateClass();
+            }
+            function privateFunctionWithPublicParmeterTypes1() {
+                return new publicClass();
+            }
+    
+            export declare function publicAmbientFunctionWithPrivateParmeterTypes(): privateClass;
+            export declare function publicAmbientFunctionWithPublicParmeterTypes(): publicClass;
+            declare function privateAmbientFunctionWithPrivateParmeterTypes(): privateClass;
+            declare function privateAmbientFunctionWithPublicParmeterTypes(): publicClass;
+    
+            export interface publicInterfaceWithPrivateModuleParameterTypes {
+                new (): privateModule.publicClass;
+                (): privateModule.publicClass;
+                [x: number]: privateModule.publicClass;
+                myMethod(): privateModule.publicClass;
+            }
+            export class publicClassWithPrivateModuleParameterTypes {
+                static myPublicStaticMethod(): privateModule.publicClass {
+                    return null;
+                }
+                myPublicMethod(): privateModule.publicClass {
+                    return null;
+                }
+                static myPublicStaticMethod1() {
+                    return new privateModule.publicClass();
+                }
+                myPublicMethod1() {
+                    return new privateModule.publicClass();
+                }
+            }
+            export function publicFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass {
+                return null;
+            }
+            export function publicFunctionWithPrivateModuleParameterTypes1() {
+                return new privateModule.publicClass();
+            }
+            export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass;
+    
+            interface privateInterfaceWithPrivateModuleParameterTypes {
+                new (): privateModule.publicClass;
+                (): privateModule.publicClass;
+                [x: number]: privateModule.publicClass;
+                myMethod(): privateModule.publicClass;
+            }
+            class privateClassWithPrivateModuleParameterTypes {
+                static myPublicStaticMethod(): privateModule.publicClass {
+                    return null;
+                }
+                myPublicMethod(): privateModule.publicClass {
+                    return null;
+                }
+                static myPublicStaticMethod1() {
+                    return new privateModule.publicClass();
+                }
+                myPublicMethod1() {
+                    return new privateModule.publicClass();
+                }
+            }
+            function privateFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass {
+                return null;
+            }
+            function privateFunctionWithPrivateModuleParameterTypes1() {
+                return new privateModule.publicClass();
+            }
+            declare function privateAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass;
+        }
+    
+        export interface publicInterfaceWithPrivateParmeterTypes {
+            new (): privateClass; // Error
+            ~~~~~~~~~~~~~~~~~~~~~
+!!! Return type of constructor signature from exported interface has or is using private name 'privateClass'.
+            (): privateClass; // Error
+            ~~~~~~~~~~~~~~~~~
+!!! Return type of call signature from exported interface has or is using private name 'privateClass'.
+            [x: number]: privateClass; // Error
+            ~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Return type of index signature from exported interface has or is using private name 'privateClass'.
+            myMethod(): privateClass; // Error
+            ~~~~~~~~
+!!! Return type of method from exported interface has or is using private name 'privateClass'.
+        }
+    
+        export interface publicInterfaceWithPublicParmeterTypes {
+            new (): publicClass;
+            (): publicClass;
+            [x: number]: publicClass;
+            myMethod(): publicClass;
+        }
+    
+        interface privateInterfaceWithPrivateParmeterTypes {
+            new (): privateClass;
+            (): privateClass;
+            [x: number]: privateClass;
+            myMethod(): privateClass;
+        }
+    
+        interface privateInterfaceWithPublicParmeterTypes {
+            new (): publicClass;
+            (): publicClass;
+            [x: number]: publicClass;
+            myMethod(): publicClass;
+        }
+    
+        export class publicClassWithWithPrivateParmeterTypes {
+            static myPublicStaticMethod(): privateClass { // Error
+                   ~~~~~~~~~~~~~~~~~~~~
+!!! Return type of public static method from exported class has or is using private name 'privateClass'.
+                return null;
+            }
+            private static myPrivateStaticMethod(): privateClass {
+                return null;
+            }
+            myPublicMethod(): privateClass { // Error
+            ~~~~~~~~~~~~~~
+!!! Return type of public method from exported class has or is using private name 'privateClass'.
+                return null;
+            }
+            private myPrivateMethod(): privateClass {
+                return null;
+            }
+            static myPublicStaticMethod1() { // Error
+                   ~~~~~~~~~~~~~~~~~~~~~
+!!! Return type of public static method from exported class has or is using private name 'privateClass'.
+                return new privateClass();
+            }
+            private static myPrivateStaticMethod1() {
+                return new privateClass();
+            }
+            myPublicMethod1() { // Error
+            ~~~~~~~~~~~~~~~
+!!! Return type of public method from exported class has or is using private name 'privateClass'.
+                return new privateClass();
+            }
+            private myPrivateMethod1() {
+                return new privateClass();
+            }
+        }
+    
+        export class publicClassWithWithPublicParmeterTypes {
+            static myPublicStaticMethod(): publicClass {
+                return null;
+            }
+            private static myPrivateStaticMethod(): publicClass {
+                return null;
+            }
+            myPublicMethod(): publicClass {
+                return null;
+            }
+            private myPrivateMethod(): publicClass {
+                return null;
+            }
+            static myPublicStaticMethod1() {
+                return new publicClass();
+            }
+            private static myPrivateStaticMethod1() {
+                return new publicClass();
+            }
+            myPublicMethod1() {
+                return new publicClass();
+            }
+            private myPrivateMethod1() {
+                return new publicClass();
+            }
+        }
+    
+        class privateClassWithWithPrivateParmeterTypes {
+            static myPublicStaticMethod(): privateClass {
+                return null;
+            }
+            private static myPrivateStaticMethod(): privateClass {
+                return null;
+            }
+            myPublicMethod(): privateClass {
+                return null;
+            }
+            private myPrivateMethod(): privateClass {
+                return null;
+            }
+            static myPublicStaticMethod1() {
+                return new privateClass();
+            }
+            private static myPrivateStaticMethod1() {
+                return new privateClass();
+            }
+            myPublicMethod1() {
+                return new privateClass();
+            }
+            private myPrivateMethod1() {
+                return new privateClass();
+            }
+        }
+    
+        class privateClassWithWithPublicParmeterTypes {
+            static myPublicStaticMethod(): publicClass {
+                return null;
+            }
+            private static myPrivateStaticMethod(): publicClass {
+                return null;
+            }
+            myPublicMethod(): publicClass {
+                return null;
+            }
+            private myPrivateMethod(): publicClass {
+                return null;
+            }
+            static myPublicStaticMethod1() {
+                return new publicClass();
+            }
+            private static myPrivateStaticMethod1() {
+                return new publicClass();
+            }
+            myPublicMethod1() {
+                return new publicClass();
+            }
+            private myPrivateMethod1() {
+                return new publicClass();
+            }
+        }
+    
+        export function publicFunctionWithPrivateParmeterTypes(): privateClass { // Error
+                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Return type of exported function has or is using private name 'privateClass'.
+            return null;
+        }
+        export function publicFunctionWithPublicParmeterTypes(): publicClass {
+            return null;
+        }
+        function privateFunctionWithPrivateParmeterTypes(): privateClass {
+            return null;
+        }
+        function privateFunctionWithPublicParmeterTypes(): publicClass {
+            return null;
+        }
+        export function publicFunctionWithPrivateParmeterTypes1() { // Error
+                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Return type of exported function has or is using private name 'privateClass'.
+            return new privateClass();
+        }
+        export function publicFunctionWithPublicParmeterTypes1() {
+            return new publicClass();
+        }
+        function privateFunctionWithPrivateParmeterTypes1() {
+            return new privateClass();
+        }
+        function privateFunctionWithPublicParmeterTypes1() {
+            return new publicClass();
+        }
+    
+        export declare function publicAmbientFunctionWithPrivateParmeterTypes(): privateClass; // Error
+                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Return type of exported function has or is using private name 'privateClass'.
+        export declare function publicAmbientFunctionWithPublicParmeterTypes(): publicClass;
+        declare function privateAmbientFunctionWithPrivateParmeterTypes(): privateClass;
+        declare function privateAmbientFunctionWithPublicParmeterTypes(): publicClass;
+    
+        export interface publicInterfaceWithPrivateModuleParameterTypes {
+            new (): privateModule.publicClass; // Error
+            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Return type of constructor signature from exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+            (): privateModule.publicClass; // Error
+            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Return type of call signature from exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+            [x: number]: privateModule.publicClass; // Error
+            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Return type of index signature from exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+            myMethod(): privateModule.publicClass; // Error
+            ~~~~~~~~
+!!! Return type of method from exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+        }
+        export class publicClassWithPrivateModuleParameterTypes {
+            static myPublicStaticMethod(): privateModule.publicClass { // Error
+                   ~~~~~~~~~~~~~~~~~~~~
+!!! Return type of public static method from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+                return null;
+            }
+            myPublicMethod(): privateModule.publicClass { // Error
+            ~~~~~~~~~~~~~~
+!!! Return type of public method from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+                return null;
+            }
+            static myPublicStaticMethod1() { // Error
+                   ~~~~~~~~~~~~~~~~~~~~~
+!!! Return type of public static method from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+                return new privateModule.publicClass();
+            }
+            myPublicMethod1() { // Error
+            ~~~~~~~~~~~~~~~
+!!! Return type of public method from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+                return new privateModule.publicClass();
+            }
+        }
+        export function publicFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass { // Error
+                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Return type of exported function has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+            return null;
+        }
+        export function publicFunctionWithPrivateModuleParameterTypes1() { // Error
+                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Return type of exported function has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+            return new privateModule.publicClass();
+        }
+        export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; // Error
+                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Return type of exported function has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+    
+        interface privateInterfaceWithPrivateModuleParameterTypes {
+            new (): privateModule.publicClass;
+            (): privateModule.publicClass;
+            [x: number]: privateModule.publicClass;
+            myMethod(): privateModule.publicClass;
+        }
+        class privateClassWithPrivateModuleParameterTypes {
+            static myPublicStaticMethod(): privateModule.publicClass {
+                return null;
+            }
+            myPublicMethod(): privateModule.publicClass {
+                return null;
+            }
+            static myPublicStaticMethod1() {
+                return new privateModule.publicClass();
+            }
+            myPublicMethod1() {
+                return new privateModule.publicClass();
+            }
+        }
+        function privateFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass {
+            return null;
+        }
+        function privateFunctionWithPrivateModuleParameterTypes1() {
+            return new privateModule.publicClass();
+        }
+        declare function privateAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass;
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/privacyFunctionReturnTypeDeclFile.js b/tests/baselines/reference/privacyFunctionReturnTypeDeclFile.js
new file mode 100644
index 00000000000..06a64104148
--- /dev/null
+++ b/tests/baselines/reference/privacyFunctionReturnTypeDeclFile.js
@@ -0,0 +1,2279 @@
+//// [tests/cases/compiler/privacyFunctionReturnTypeDeclFile.ts] ////
+
+//// [privacyFunctionReturnTypeDeclFile_externalModule.ts]
+
+class privateClass {
+}
+
+export class publicClass {
+}
+
+export interface publicInterfaceWithPrivateParmeterTypes {
+    new (): privateClass; // Error
+    (): privateClass; // Error
+    [x: number]: privateClass; // Error
+    myMethod(): privateClass; // Error
+}
+
+export interface publicInterfaceWithPublicParmeterTypes {
+    new (): publicClass;
+    (): publicClass;
+    [x: number]: publicClass;
+    myMethod(): publicClass;
+}
+
+interface privateInterfaceWithPrivateParmeterTypes {
+    new (): privateClass;
+    (): privateClass;
+    [x: number]: privateClass;
+    myMethod(): privateClass;
+}
+
+interface privateInterfaceWithPublicParmeterTypes {
+    new (): publicClass;
+    (): publicClass;
+    [x: number]: publicClass;
+    myMethod(): publicClass;
+}
+
+export class publicClassWithWithPrivateParmeterTypes {
+    static myPublicStaticMethod(): privateClass { // Error
+        return null;
+    }
+    private static myPrivateStaticMethod(): privateClass {
+        return null;
+    }
+    myPublicMethod(): privateClass { // Error
+        return null;
+    }
+    private myPrivateMethod(): privateClass {
+        return null;
+    }
+    static myPublicStaticMethod1() { // Error
+        return new privateClass();
+    }
+    private static myPrivateStaticMethod1() {
+        return new privateClass();
+    }
+    myPublicMethod1() { // Error
+        return new privateClass();
+    }
+    private myPrivateMethod1() {
+        return new privateClass();
+    }
+}
+
+export class publicClassWithWithPublicParmeterTypes {
+    static myPublicStaticMethod(): publicClass { 
+        return null;
+    }
+    private static myPrivateStaticMethod(): publicClass {
+        return null;
+    }
+    myPublicMethod(): publicClass { 
+        return null;
+    }
+    private myPrivateMethod(): publicClass {
+        return null;
+    }
+    static myPublicStaticMethod1() {
+        return new publicClass();
+    }
+    private static myPrivateStaticMethod1() {
+        return new publicClass();
+    }
+    myPublicMethod1() { 
+        return new publicClass();
+    }
+    private myPrivateMethod1() {
+        return new publicClass();
+    }
+}
+
+class privateClassWithWithPrivateParmeterTypes {
+    static myPublicStaticMethod(): privateClass {
+        return null;
+    }
+    private static myPrivateStaticMethod(): privateClass {
+        return null;
+    }
+    myPublicMethod(): privateClass {
+        return null;
+    }
+    private myPrivateMethod(): privateClass {
+        return null;
+    }
+    static myPublicStaticMethod1() {
+        return new privateClass();
+    }
+    private static myPrivateStaticMethod1() {
+        return new privateClass();
+    }
+    myPublicMethod1() {
+        return new privateClass();
+    }
+    private myPrivateMethod1() {
+        return new privateClass();
+    }
+}
+
+class privateClassWithWithPublicParmeterTypes {
+    static myPublicStaticMethod(): publicClass {
+        return null;
+    }
+    private static myPrivateStaticMethod(): publicClass {
+        return null;
+    }
+    myPublicMethod(): publicClass {
+        return null;
+    }
+    private myPrivateMethod(): publicClass {
+        return null;
+    }
+    static myPublicStaticMethod1() {
+        return new publicClass();
+    }
+    private static myPrivateStaticMethod1() {
+        return new publicClass();
+    }
+    myPublicMethod1() {
+        return new publicClass();
+    }
+    private myPrivateMethod1() {
+        return new publicClass();
+    }
+}
+
+export function publicFunctionWithPrivateParmeterTypes(): privateClass { // Error
+    return null;
+}
+export function publicFunctionWithPublicParmeterTypes(): publicClass {
+    return null;
+}
+function privateFunctionWithPrivateParmeterTypes(): privateClass {
+    return null;
+}
+function privateFunctionWithPublicParmeterTypes(): publicClass {
+    return null;
+}
+export function publicFunctionWithPrivateParmeterTypes1() { // Error
+    return new privateClass();
+}
+export function publicFunctionWithPublicParmeterTypes1() {
+    return new publicClass();
+}
+function privateFunctionWithPrivateParmeterTypes1() {
+    return new privateClass();
+}
+function privateFunctionWithPublicParmeterTypes1() {
+    return new publicClass();
+}
+
+export declare function publicAmbientFunctionWithPrivateParmeterTypes(): privateClass; // Error
+export declare function publicAmbientFunctionWithPublicParmeterTypes(): publicClass;
+declare function privateAmbientFunctionWithPrivateParmeterTypes(): privateClass;
+declare function privateAmbientFunctionWithPublicParmeterTypes(): publicClass;
+
+export interface publicInterfaceWithPrivateModuleParameterTypes {
+    new (): privateModule.publicClass; // Error
+    (): privateModule.publicClass; // Error
+    [x: number]: privateModule.publicClass // Error
+    myMethod(): privateModule.publicClass; // Error
+}
+export class publicClassWithPrivateModuleParameterTypes {
+    static myPublicStaticMethod(): privateModule.publicClass { // Error
+        return null;
+    }
+    myPublicMethod(): privateModule.publicClass { // Error
+        return null;
+    }
+    static myPublicStaticMethod1() { // Error
+        return new privateModule.publicClass();
+    }
+    myPublicMethod1() { // Error
+        return new privateModule.publicClass();
+    }
+}
+export function publicFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass { // Error
+    return null;
+}
+export function publicFunctionWithPrivateModuleParameterTypes1() { // Error
+    return new privateModule.publicClass();
+}
+export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; // Error
+
+interface privateInterfaceWithPrivateModuleParameterTypes {
+    new (): privateModule.publicClass; 
+    (): privateModule.publicClass;
+    [x: number]: privateModule.publicClass
+    myMethod(): privateModule.publicClass;
+}
+class privateClassWithPrivateModuleParameterTypes {
+    static myPublicStaticMethod(): privateModule.publicClass { 
+        return null;
+    }
+    myPublicMethod(): privateModule.publicClass { 
+        return null;
+    }
+    static myPublicStaticMethod1() { 
+        return new privateModule.publicClass();
+    }
+    myPublicMethod1() { 
+        return new privateModule.publicClass();
+    }
+}
+function privateFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass { 
+    return null;
+}
+function privateFunctionWithPrivateModuleParameterTypes1() { 
+    return new privateModule.publicClass();
+}
+declare function privateAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; 
+
+export module publicModule {
+    class privateClass {
+    }
+
+    export class publicClass {
+    }
+
+    export interface publicInterfaceWithPrivateParmeterTypes {
+        new (): privateClass; // Error
+        (): privateClass; // Error
+        [x: number]: privateClass; // Error
+        myMethod(): privateClass; // Error
+    }
+
+    export interface publicInterfaceWithPublicParmeterTypes {
+        new (): publicClass;
+        (): publicClass;
+        [x: number]: publicClass;
+        myMethod(): publicClass;
+    }
+
+    interface privateInterfaceWithPrivateParmeterTypes {
+        new (): privateClass;
+        (): privateClass;
+        [x: number]: privateClass;
+        myMethod(): privateClass;
+    }
+
+    interface privateInterfaceWithPublicParmeterTypes {
+        new (): publicClass;
+        (): publicClass;
+        [x: number]: publicClass;
+        myMethod(): publicClass;
+    }
+
+    export class publicClassWithWithPrivateParmeterTypes {
+        static myPublicStaticMethod(): privateClass { // Error
+            return null;
+        }
+        private static myPrivateStaticMethod(): privateClass {
+            return null;
+        }
+        myPublicMethod(): privateClass { // Error
+            return null;
+        }
+        private myPrivateMethod(): privateClass {
+            return null;
+        }
+        static myPublicStaticMethod1() { // Error
+            return new privateClass();
+        }
+        private static myPrivateStaticMethod1() {
+            return new privateClass();
+        }
+        myPublicMethod1() { // Error
+            return new privateClass();
+        }
+        private myPrivateMethod1() {
+            return new privateClass();
+        }
+    }
+
+    export class publicClassWithWithPublicParmeterTypes {
+        static myPublicStaticMethod(): publicClass {
+            return null;
+        }
+        private static myPrivateStaticMethod(): publicClass {
+            return null;
+        }
+        myPublicMethod(): publicClass {
+            return null;
+        }
+        private myPrivateMethod(): publicClass {
+            return null;
+        }
+        static myPublicStaticMethod1() {
+            return new publicClass();
+        }
+        private static myPrivateStaticMethod1() {
+            return new publicClass();
+        }
+        myPublicMethod1() {
+            return new publicClass();
+        }
+        private myPrivateMethod1() {
+            return new publicClass();
+        }
+    }
+
+    class privateClassWithWithPrivateParmeterTypes {
+        static myPublicStaticMethod(): privateClass {
+            return null;
+        }
+        private static myPrivateStaticMethod(): privateClass {
+            return null;
+        }
+        myPublicMethod(): privateClass {
+            return null;
+        }
+        private myPrivateMethod(): privateClass {
+            return null;
+        }
+        static myPublicStaticMethod1() {
+            return new privateClass();
+        }
+        private static myPrivateStaticMethod1() {
+            return new privateClass();
+        }
+        myPublicMethod1() {
+            return new privateClass();
+        }
+        private myPrivateMethod1() {
+            return new privateClass();
+        }
+    }
+
+    class privateClassWithWithPublicParmeterTypes {
+        static myPublicStaticMethod(): publicClass {
+            return null;
+        }
+        private static myPrivateStaticMethod(): publicClass {
+            return null;
+        }
+        myPublicMethod(): publicClass {
+            return null;
+        }
+        private myPrivateMethod(): publicClass {
+            return null;
+        }
+        static myPublicStaticMethod1() {
+            return new publicClass();
+        }
+        private static myPrivateStaticMethod1() {
+            return new publicClass();
+        }
+        myPublicMethod1() {
+            return new publicClass();
+        }
+        private myPrivateMethod1() {
+            return new publicClass();
+        }
+    }
+
+    export function publicFunctionWithPrivateParmeterTypes(): privateClass { // Error
+        return null;
+    }
+    export function publicFunctionWithPublicParmeterTypes(): publicClass {
+        return null;
+    }
+    function privateFunctionWithPrivateParmeterTypes(): privateClass {
+        return null;
+    }
+    function privateFunctionWithPublicParmeterTypes(): publicClass {
+        return null;
+    }
+    export function publicFunctionWithPrivateParmeterTypes1() { // Error
+        return new privateClass();
+    }
+    export function publicFunctionWithPublicParmeterTypes1() {
+        return new publicClass();
+    }
+    function privateFunctionWithPrivateParmeterTypes1() {
+        return new privateClass();
+    }
+    function privateFunctionWithPublicParmeterTypes1() {
+        return new publicClass();
+    }
+
+    export declare function publicAmbientFunctionWithPrivateParmeterTypes(): privateClass; // Error
+    export declare function publicAmbientFunctionWithPublicParmeterTypes(): publicClass;
+    declare function privateAmbientFunctionWithPrivateParmeterTypes(): privateClass;
+    declare function privateAmbientFunctionWithPublicParmeterTypes(): publicClass;
+
+    export interface publicInterfaceWithPrivateModuleParameterTypes {
+        new (): privateModule.publicClass; // Error
+        (): privateModule.publicClass; // Error
+        [x: number]: privateModule.publicClass; // Error
+        myMethod(): privateModule.publicClass; // Error
+    }
+    export class publicClassWithPrivateModuleParameterTypes {
+        static myPublicStaticMethod(): privateModule.publicClass { // Error
+            return null;
+        }
+        myPublicMethod(): privateModule.publicClass { // Error
+            return null;
+        }
+        static myPublicStaticMethod1() { // Error
+            return new privateModule.publicClass();
+        }
+        myPublicMethod1() { // Error
+            return new privateModule.publicClass();
+        }
+    }
+    export function publicFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass { // Error
+        return null;
+    }
+    export function publicFunctionWithPrivateModuleParameterTypes1() { // Error
+        return new privateModule.publicClass();
+    }
+    export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; // Error
+
+    interface privateInterfaceWithPrivateModuleParameterTypes {
+        new (): privateModule.publicClass;
+        (): privateModule.publicClass;
+        [x: number]: privateModule.publicClass;
+        myMethod(): privateModule.publicClass;
+    }
+    class privateClassWithPrivateModuleParameterTypes {
+        static myPublicStaticMethod(): privateModule.publicClass {
+            return null;
+        }
+        myPublicMethod(): privateModule.publicClass {
+            return null;
+        }
+        static myPublicStaticMethod1() {
+            return new privateModule.publicClass();
+        }
+        myPublicMethod1() {
+            return new privateModule.publicClass();
+        }
+    }
+    function privateFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass {
+        return null;
+    }
+    function privateFunctionWithPrivateModuleParameterTypes1() {
+        return new privateModule.publicClass();
+    }
+    declare function privateAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; 
+}
+
+module privateModule {
+    class privateClass {
+    }
+
+    export class publicClass {
+    }
+
+    export interface publicInterfaceWithPrivateParmeterTypes {
+        new (): privateClass; 
+        (): privateClass; 
+        [x: number]: privateClass; 
+        myMethod(): privateClass; 
+    }
+
+    export interface publicInterfaceWithPublicParmeterTypes {
+        new (): publicClass;
+        (): publicClass;
+        [x: number]: publicClass;
+        myMethod(): publicClass;
+    }
+
+    interface privateInterfaceWithPrivateParmeterTypes {
+        new (): privateClass;
+        (): privateClass;
+        [x: number]: privateClass;
+        myMethod(): privateClass;
+    }
+
+    interface privateInterfaceWithPublicParmeterTypes {
+        new (): publicClass;
+        (): publicClass;
+        [x: number]: publicClass;
+        myMethod(): publicClass;
+    }
+
+    export class publicClassWithWithPrivateParmeterTypes {
+        static myPublicStaticMethod(): privateClass { 
+            return null;
+        }
+        private static myPrivateStaticMethod(): privateClass {
+            return null;
+        }
+        myPublicMethod(): privateClass { 
+            return null;
+        }
+        private myPrivateMethod(): privateClass {
+            return null;
+        }
+        static myPublicStaticMethod1() { 
+            return new privateClass();
+        }
+        private static myPrivateStaticMethod1() {
+            return new privateClass();
+        }
+        myPublicMethod1() { 
+            return new privateClass();
+        }
+        private myPrivateMethod1() {
+            return new privateClass();
+        }
+    }
+
+    export class publicClassWithWithPublicParmeterTypes {
+        static myPublicStaticMethod(): publicClass {
+            return null;
+        }
+        private static myPrivateStaticMethod(): publicClass {
+            return null;
+        }
+        myPublicMethod(): publicClass {
+            return null;
+        }
+        private myPrivateMethod(): publicClass {
+            return null;
+        }
+        static myPublicStaticMethod1() {
+            return new publicClass();
+        }
+        private static myPrivateStaticMethod1() {
+            return new publicClass();
+        }
+        myPublicMethod1() {
+            return new publicClass();
+        }
+        private myPrivateMethod1() {
+            return new publicClass();
+        }
+    }
+
+    class privateClassWithWithPrivateParmeterTypes {
+        static myPublicStaticMethod(): privateClass {
+            return null;
+        }
+        private static myPrivateStaticMethod(): privateClass {
+            return null;
+        }
+        myPublicMethod(): privateClass {
+            return null;
+        }
+        private myPrivateMethod(): privateClass {
+            return null;
+        }
+        static myPublicStaticMethod1() {
+            return new privateClass();
+        }
+        private static myPrivateStaticMethod1() {
+            return new privateClass();
+        }
+        myPublicMethod1() {
+            return new privateClass();
+        }
+        private myPrivateMethod1() {
+            return new privateClass();
+        }
+    }
+
+    class privateClassWithWithPublicParmeterTypes {
+        static myPublicStaticMethod(): publicClass {
+            return null;
+        }
+        private static myPrivateStaticMethod(): publicClass {
+            return null;
+        }
+        myPublicMethod(): publicClass {
+            return null;
+        }
+        private myPrivateMethod(): publicClass {
+            return null;
+        }
+        static myPublicStaticMethod1() {
+            return new publicClass();
+        }
+        private static myPrivateStaticMethod1() {
+            return new publicClass();
+        }
+        myPublicMethod1() {
+            return new publicClass();
+        }
+        private myPrivateMethod1() {
+            return new publicClass();
+        }
+    }
+
+    export function publicFunctionWithPrivateParmeterTypes(): privateClass { 
+        return null;
+    }
+    export function publicFunctionWithPublicParmeterTypes(): publicClass {
+        return null;
+    }
+    function privateFunctionWithPrivateParmeterTypes(): privateClass {
+        return null;
+    }
+    function privateFunctionWithPublicParmeterTypes(): publicClass {
+        return null;
+    }
+    export function publicFunctionWithPrivateParmeterTypes1() { 
+        return new privateClass();
+    }
+    export function publicFunctionWithPublicParmeterTypes1() {
+        return new publicClass();
+    }
+    function privateFunctionWithPrivateParmeterTypes1() {
+        return new privateClass();
+    }
+    function privateFunctionWithPublicParmeterTypes1() {
+        return new publicClass();
+    }
+
+    export declare function publicAmbientFunctionWithPrivateParmeterTypes(): privateClass; 
+    export declare function publicAmbientFunctionWithPublicParmeterTypes(): publicClass;
+    declare function privateAmbientFunctionWithPrivateParmeterTypes(): privateClass;
+    declare function privateAmbientFunctionWithPublicParmeterTypes(): publicClass;
+
+    export interface publicInterfaceWithPrivateModuleParameterTypes {
+        new (): privateModule.publicClass;
+        (): privateModule.publicClass;
+        [x: number]: privateModule.publicClass;
+        myMethod(): privateModule.publicClass;
+    }
+    export class publicClassWithPrivateModuleParameterTypes {
+        static myPublicStaticMethod(): privateModule.publicClass { 
+            return null;
+        }
+        myPublicMethod(): privateModule.publicClass { 
+            return null;
+        }
+        static myPublicStaticMethod1() { 
+            return new privateModule.publicClass();
+        }
+        myPublicMethod1() { 
+            return new privateModule.publicClass();
+        }
+    }
+    export function publicFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass { 
+        return null;
+    }
+    export function publicFunctionWithPrivateModuleParameterTypes1() { 
+        return new privateModule.publicClass();
+    }
+    export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; 
+
+    interface privateInterfaceWithPrivateModuleParameterTypes {
+        new (): privateModule.publicClass;
+        (): privateModule.publicClass;
+        [x: number]: privateModule.publicClass;
+        myMethod(): privateModule.publicClass;
+    }
+    class privateClassWithPrivateModuleParameterTypes {
+        static myPublicStaticMethod(): privateModule.publicClass {
+            return null;
+        }
+        myPublicMethod(): privateModule.publicClass {
+            return null;
+        }
+        static myPublicStaticMethod1() {
+            return new privateModule.publicClass();
+        }
+        myPublicMethod1() {
+            return new privateModule.publicClass();
+        }
+    }
+    function privateFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass {
+        return null;
+    }
+    function privateFunctionWithPrivateModuleParameterTypes1() {
+        return new privateModule.publicClass();
+    }
+    declare function privateAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; 
+}
+
+//// [privacyFunctionReturnTypeDeclFile_GlobalFile.ts]
+class publicClassInGlobal {
+}
+interface publicInterfaceWithPublicParmeterTypesInGlobal {
+    new (): publicClassInGlobal;
+    (): publicClassInGlobal;
+    [x: number]: publicClassInGlobal;
+    myMethod(): publicClassInGlobal;
+}
+class publicClassWithWithPublicParmeterTypesInGlobal {
+    static myPublicStaticMethod(): publicClassInGlobal {
+        return null;
+    }
+    private static myPrivateStaticMethod(): publicClassInGlobal {
+        return null;
+    }
+    myPublicMethod(): publicClassInGlobal {
+        return null;
+    }
+    private myPrivateMethod(): publicClassInGlobal {
+        return null;
+    }
+    static myPublicStaticMethod1() {
+        return new publicClassInGlobal();
+    }
+    private static myPrivateStaticMethod1() {
+        return new publicClassInGlobal();
+    }
+    myPublicMethod1() {
+        return new publicClassInGlobal();
+    }
+    private myPrivateMethod1() {
+        return new publicClassInGlobal();
+    }
+}
+function publicFunctionWithPublicParmeterTypesInGlobal(): publicClassInGlobal {
+    return null;
+}
+function publicFunctionWithPublicParmeterTypesInGlobal1() {
+    return new publicClassInGlobal();
+}
+declare function publicAmbientFunctionWithPublicParmeterTypesInGlobal(): publicClassInGlobal;
+
+module publicModuleInGlobal {
+    class privateClass {
+    }
+
+    export class publicClass {
+    }
+
+    module privateModule {
+        class privateClass {
+        }
+
+        export class publicClass {
+        }
+
+        export interface publicInterfaceWithPrivateParmeterTypes {
+            new (): privateClass;
+            (): privateClass;
+            [x: number]: privateClass;
+            myMethod(): privateClass;
+        }
+
+        export interface publicInterfaceWithPublicParmeterTypes {
+            new (): publicClass;
+            (): publicClass;
+            [x: number]: publicClass;
+            myMethod(): publicClass;
+        }
+
+        interface privateInterfaceWithPrivateParmeterTypes {
+            new (): privateClass;
+            (): privateClass;
+            [x: number]: privateClass;
+            myMethod(): privateClass;
+        }
+
+        interface privateInterfaceWithPublicParmeterTypes {
+            new (): publicClass;
+            (): publicClass;
+            [x: number]: publicClass;
+            myMethod(): publicClass;
+        }
+
+        export class publicClassWithWithPrivateParmeterTypes {
+            static myPublicStaticMethod(): privateClass {
+                return null;
+            }
+            private static myPrivateStaticMethod(): privateClass {
+                return null;
+            }
+            myPublicMethod(): privateClass {
+                return null;
+            }
+            private myPrivateMethod(): privateClass {
+                return null;
+            }
+            static myPublicStaticMethod1() {
+                return new privateClass();
+            }
+            private static myPrivateStaticMethod1() {
+                return new privateClass();
+            }
+            myPublicMethod1() {
+                return new privateClass();
+            }
+            private myPrivateMethod1() {
+                return new privateClass();
+            }
+        }
+
+        export class publicClassWithWithPublicParmeterTypes {
+            static myPublicStaticMethod(): publicClass {
+                return null;
+            }
+            private static myPrivateStaticMethod(): publicClass {
+                return null;
+            }
+            myPublicMethod(): publicClass {
+                return null;
+            }
+            private myPrivateMethod(): publicClass {
+                return null;
+            }
+            static myPublicStaticMethod1() {
+                return new publicClass();
+            }
+            private static myPrivateStaticMethod1() {
+                return new publicClass();
+            }
+            myPublicMethod1() {
+                return new publicClass();
+            }
+            private myPrivateMethod1() {
+                return new publicClass();
+            }
+        }
+
+        class privateClassWithWithPrivateParmeterTypes {
+            static myPublicStaticMethod(): privateClass {
+                return null;
+            }
+            private static myPrivateStaticMethod(): privateClass {
+                return null;
+            }
+            myPublicMethod(): privateClass {
+                return null;
+            }
+            private myPrivateMethod(): privateClass {
+                return null;
+            }
+            static myPublicStaticMethod1() {
+                return new privateClass();
+            }
+            private static myPrivateStaticMethod1() {
+                return new privateClass();
+            }
+            myPublicMethod1() {
+                return new privateClass();
+            }
+            private myPrivateMethod1() {
+                return new privateClass();
+            }
+        }
+
+        class privateClassWithWithPublicParmeterTypes {
+            static myPublicStaticMethod(): publicClass {
+                return null;
+            }
+            private static myPrivateStaticMethod(): publicClass {
+                return null;
+            }
+            myPublicMethod(): publicClass {
+                return null;
+            }
+            private myPrivateMethod(): publicClass {
+                return null;
+            }
+            static myPublicStaticMethod1() {
+                return new publicClass();
+            }
+            private static myPrivateStaticMethod1() {
+                return new publicClass();
+            }
+            myPublicMethod1() {
+                return new publicClass();
+            }
+            private myPrivateMethod1() {
+                return new publicClass();
+            }
+        }
+
+        export function publicFunctionWithPrivateParmeterTypes(): privateClass {
+            return null;
+        }
+        export function publicFunctionWithPublicParmeterTypes(): publicClass {
+            return null;
+        }
+        function privateFunctionWithPrivateParmeterTypes(): privateClass {
+            return null;
+        }
+        function privateFunctionWithPublicParmeterTypes(): publicClass {
+            return null;
+        }
+        export function publicFunctionWithPrivateParmeterTypes1() {
+            return new privateClass();
+        }
+        export function publicFunctionWithPublicParmeterTypes1() {
+            return new publicClass();
+        }
+        function privateFunctionWithPrivateParmeterTypes1() {
+            return new privateClass();
+        }
+        function privateFunctionWithPublicParmeterTypes1() {
+            return new publicClass();
+        }
+
+        export declare function publicAmbientFunctionWithPrivateParmeterTypes(): privateClass;
+        export declare function publicAmbientFunctionWithPublicParmeterTypes(): publicClass;
+        declare function privateAmbientFunctionWithPrivateParmeterTypes(): privateClass;
+        declare function privateAmbientFunctionWithPublicParmeterTypes(): publicClass;
+
+        export interface publicInterfaceWithPrivateModuleParameterTypes {
+            new (): privateModule.publicClass;
+            (): privateModule.publicClass;
+            [x: number]: privateModule.publicClass;
+            myMethod(): privateModule.publicClass;
+        }
+        export class publicClassWithPrivateModuleParameterTypes {
+            static myPublicStaticMethod(): privateModule.publicClass {
+                return null;
+            }
+            myPublicMethod(): privateModule.publicClass {
+                return null;
+            }
+            static myPublicStaticMethod1() {
+                return new privateModule.publicClass();
+            }
+            myPublicMethod1() {
+                return new privateModule.publicClass();
+            }
+        }
+        export function publicFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass {
+            return null;
+        }
+        export function publicFunctionWithPrivateModuleParameterTypes1() {
+            return new privateModule.publicClass();
+        }
+        export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass;
+
+        interface privateInterfaceWithPrivateModuleParameterTypes {
+            new (): privateModule.publicClass;
+            (): privateModule.publicClass;
+            [x: number]: privateModule.publicClass;
+            myMethod(): privateModule.publicClass;
+        }
+        class privateClassWithPrivateModuleParameterTypes {
+            static myPublicStaticMethod(): privateModule.publicClass {
+                return null;
+            }
+            myPublicMethod(): privateModule.publicClass {
+                return null;
+            }
+            static myPublicStaticMethod1() {
+                return new privateModule.publicClass();
+            }
+            myPublicMethod1() {
+                return new privateModule.publicClass();
+            }
+        }
+        function privateFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass {
+            return null;
+        }
+        function privateFunctionWithPrivateModuleParameterTypes1() {
+            return new privateModule.publicClass();
+        }
+        declare function privateAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass;
+    }
+
+    export interface publicInterfaceWithPrivateParmeterTypes {
+        new (): privateClass; // Error
+        (): privateClass; // Error
+        [x: number]: privateClass; // Error
+        myMethod(): privateClass; // Error
+    }
+
+    export interface publicInterfaceWithPublicParmeterTypes {
+        new (): publicClass;
+        (): publicClass;
+        [x: number]: publicClass;
+        myMethod(): publicClass;
+    }
+
+    interface privateInterfaceWithPrivateParmeterTypes {
+        new (): privateClass;
+        (): privateClass;
+        [x: number]: privateClass;
+        myMethod(): privateClass;
+    }
+
+    interface privateInterfaceWithPublicParmeterTypes {
+        new (): publicClass;
+        (): publicClass;
+        [x: number]: publicClass;
+        myMethod(): publicClass;
+    }
+
+    export class publicClassWithWithPrivateParmeterTypes {
+        static myPublicStaticMethod(): privateClass { // Error
+            return null;
+        }
+        private static myPrivateStaticMethod(): privateClass {
+            return null;
+        }
+        myPublicMethod(): privateClass { // Error
+            return null;
+        }
+        private myPrivateMethod(): privateClass {
+            return null;
+        }
+        static myPublicStaticMethod1() { // Error
+            return new privateClass();
+        }
+        private static myPrivateStaticMethod1() {
+            return new privateClass();
+        }
+        myPublicMethod1() { // Error
+            return new privateClass();
+        }
+        private myPrivateMethod1() {
+            return new privateClass();
+        }
+    }
+
+    export class publicClassWithWithPublicParmeterTypes {
+        static myPublicStaticMethod(): publicClass {
+            return null;
+        }
+        private static myPrivateStaticMethod(): publicClass {
+            return null;
+        }
+        myPublicMethod(): publicClass {
+            return null;
+        }
+        private myPrivateMethod(): publicClass {
+            return null;
+        }
+        static myPublicStaticMethod1() {
+            return new publicClass();
+        }
+        private static myPrivateStaticMethod1() {
+            return new publicClass();
+        }
+        myPublicMethod1() {
+            return new publicClass();
+        }
+        private myPrivateMethod1() {
+            return new publicClass();
+        }
+    }
+
+    class privateClassWithWithPrivateParmeterTypes {
+        static myPublicStaticMethod(): privateClass {
+            return null;
+        }
+        private static myPrivateStaticMethod(): privateClass {
+            return null;
+        }
+        myPublicMethod(): privateClass {
+            return null;
+        }
+        private myPrivateMethod(): privateClass {
+            return null;
+        }
+        static myPublicStaticMethod1() {
+            return new privateClass();
+        }
+        private static myPrivateStaticMethod1() {
+            return new privateClass();
+        }
+        myPublicMethod1() {
+            return new privateClass();
+        }
+        private myPrivateMethod1() {
+            return new privateClass();
+        }
+    }
+
+    class privateClassWithWithPublicParmeterTypes {
+        static myPublicStaticMethod(): publicClass {
+            return null;
+        }
+        private static myPrivateStaticMethod(): publicClass {
+            return null;
+        }
+        myPublicMethod(): publicClass {
+            return null;
+        }
+        private myPrivateMethod(): publicClass {
+            return null;
+        }
+        static myPublicStaticMethod1() {
+            return new publicClass();
+        }
+        private static myPrivateStaticMethod1() {
+            return new publicClass();
+        }
+        myPublicMethod1() {
+            return new publicClass();
+        }
+        private myPrivateMethod1() {
+            return new publicClass();
+        }
+    }
+
+    export function publicFunctionWithPrivateParmeterTypes(): privateClass { // Error
+        return null;
+    }
+    export function publicFunctionWithPublicParmeterTypes(): publicClass {
+        return null;
+    }
+    function privateFunctionWithPrivateParmeterTypes(): privateClass {
+        return null;
+    }
+    function privateFunctionWithPublicParmeterTypes(): publicClass {
+        return null;
+    }
+    export function publicFunctionWithPrivateParmeterTypes1() { // Error
+        return new privateClass();
+    }
+    export function publicFunctionWithPublicParmeterTypes1() {
+        return new publicClass();
+    }
+    function privateFunctionWithPrivateParmeterTypes1() {
+        return new privateClass();
+    }
+    function privateFunctionWithPublicParmeterTypes1() {
+        return new publicClass();
+    }
+
+    export declare function publicAmbientFunctionWithPrivateParmeterTypes(): privateClass; // Error
+    export declare function publicAmbientFunctionWithPublicParmeterTypes(): publicClass;
+    declare function privateAmbientFunctionWithPrivateParmeterTypes(): privateClass;
+    declare function privateAmbientFunctionWithPublicParmeterTypes(): publicClass;
+
+    export interface publicInterfaceWithPrivateModuleParameterTypes {
+        new (): privateModule.publicClass; // Error
+        (): privateModule.publicClass; // Error
+        [x: number]: privateModule.publicClass; // Error
+        myMethod(): privateModule.publicClass; // Error
+    }
+    export class publicClassWithPrivateModuleParameterTypes {
+        static myPublicStaticMethod(): privateModule.publicClass { // Error
+            return null;
+        }
+        myPublicMethod(): privateModule.publicClass { // Error
+            return null;
+        }
+        static myPublicStaticMethod1() { // Error
+            return new privateModule.publicClass();
+        }
+        myPublicMethod1() { // Error
+            return new privateModule.publicClass();
+        }
+    }
+    export function publicFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass { // Error
+        return null;
+    }
+    export function publicFunctionWithPrivateModuleParameterTypes1() { // Error
+        return new privateModule.publicClass();
+    }
+    export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; // Error
+
+    interface privateInterfaceWithPrivateModuleParameterTypes {
+        new (): privateModule.publicClass;
+        (): privateModule.publicClass;
+        [x: number]: privateModule.publicClass;
+        myMethod(): privateModule.publicClass;
+    }
+    class privateClassWithPrivateModuleParameterTypes {
+        static myPublicStaticMethod(): privateModule.publicClass {
+            return null;
+        }
+        myPublicMethod(): privateModule.publicClass {
+            return null;
+        }
+        static myPublicStaticMethod1() {
+            return new privateModule.publicClass();
+        }
+        myPublicMethod1() {
+            return new privateModule.publicClass();
+        }
+    }
+    function privateFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass {
+        return null;
+    }
+    function privateFunctionWithPrivateModuleParameterTypes1() {
+        return new privateModule.publicClass();
+    }
+    declare function privateAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass;
+}
+
+//// [privacyFunctionReturnTypeDeclFile_externalModule.js]
+var privateClass = (function () {
+    function privateClass() {
+    }
+    return privateClass;
+})();
+var publicClass = (function () {
+    function publicClass() {
+    }
+    return publicClass;
+})();
+exports.publicClass = publicClass;
+var publicClassWithWithPrivateParmeterTypes = (function () {
+    function publicClassWithWithPrivateParmeterTypes() {
+    }
+    publicClassWithWithPrivateParmeterTypes.myPublicStaticMethod = function () {
+        return null;
+    };
+    publicClassWithWithPrivateParmeterTypes.myPrivateStaticMethod = function () {
+        return null;
+    };
+    publicClassWithWithPrivateParmeterTypes.prototype.myPublicMethod = function () {
+        return null;
+    };
+    publicClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod = function () {
+        return null;
+    };
+    publicClassWithWithPrivateParmeterTypes.myPublicStaticMethod1 = function () {
+        return new privateClass();
+    };
+    publicClassWithWithPrivateParmeterTypes.myPrivateStaticMethod1 = function () {
+        return new privateClass();
+    };
+    publicClassWithWithPrivateParmeterTypes.prototype.myPublicMethod1 = function () {
+        return new privateClass();
+    };
+    publicClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod1 = function () {
+        return new privateClass();
+    };
+    return publicClassWithWithPrivateParmeterTypes;
+})();
+exports.publicClassWithWithPrivateParmeterTypes = publicClassWithWithPrivateParmeterTypes;
+var publicClassWithWithPublicParmeterTypes = (function () {
+    function publicClassWithWithPublicParmeterTypes() {
+    }
+    publicClassWithWithPublicParmeterTypes.myPublicStaticMethod = function () {
+        return null;
+    };
+    publicClassWithWithPublicParmeterTypes.myPrivateStaticMethod = function () {
+        return null;
+    };
+    publicClassWithWithPublicParmeterTypes.prototype.myPublicMethod = function () {
+        return null;
+    };
+    publicClassWithWithPublicParmeterTypes.prototype.myPrivateMethod = function () {
+        return null;
+    };
+    publicClassWithWithPublicParmeterTypes.myPublicStaticMethod1 = function () {
+        return new publicClass();
+    };
+    publicClassWithWithPublicParmeterTypes.myPrivateStaticMethod1 = function () {
+        return new publicClass();
+    };
+    publicClassWithWithPublicParmeterTypes.prototype.myPublicMethod1 = function () {
+        return new publicClass();
+    };
+    publicClassWithWithPublicParmeterTypes.prototype.myPrivateMethod1 = function () {
+        return new publicClass();
+    };
+    return publicClassWithWithPublicParmeterTypes;
+})();
+exports.publicClassWithWithPublicParmeterTypes = publicClassWithWithPublicParmeterTypes;
+var privateClassWithWithPrivateParmeterTypes = (function () {
+    function privateClassWithWithPrivateParmeterTypes() {
+    }
+    privateClassWithWithPrivateParmeterTypes.myPublicStaticMethod = function () {
+        return null;
+    };
+    privateClassWithWithPrivateParmeterTypes.myPrivateStaticMethod = function () {
+        return null;
+    };
+    privateClassWithWithPrivateParmeterTypes.prototype.myPublicMethod = function () {
+        return null;
+    };
+    privateClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod = function () {
+        return null;
+    };
+    privateClassWithWithPrivateParmeterTypes.myPublicStaticMethod1 = function () {
+        return new privateClass();
+    };
+    privateClassWithWithPrivateParmeterTypes.myPrivateStaticMethod1 = function () {
+        return new privateClass();
+    };
+    privateClassWithWithPrivateParmeterTypes.prototype.myPublicMethod1 = function () {
+        return new privateClass();
+    };
+    privateClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod1 = function () {
+        return new privateClass();
+    };
+    return privateClassWithWithPrivateParmeterTypes;
+})();
+var privateClassWithWithPublicParmeterTypes = (function () {
+    function privateClassWithWithPublicParmeterTypes() {
+    }
+    privateClassWithWithPublicParmeterTypes.myPublicStaticMethod = function () {
+        return null;
+    };
+    privateClassWithWithPublicParmeterTypes.myPrivateStaticMethod = function () {
+        return null;
+    };
+    privateClassWithWithPublicParmeterTypes.prototype.myPublicMethod = function () {
+        return null;
+    };
+    privateClassWithWithPublicParmeterTypes.prototype.myPrivateMethod = function () {
+        return null;
+    };
+    privateClassWithWithPublicParmeterTypes.myPublicStaticMethod1 = function () {
+        return new publicClass();
+    };
+    privateClassWithWithPublicParmeterTypes.myPrivateStaticMethod1 = function () {
+        return new publicClass();
+    };
+    privateClassWithWithPublicParmeterTypes.prototype.myPublicMethod1 = function () {
+        return new publicClass();
+    };
+    privateClassWithWithPublicParmeterTypes.prototype.myPrivateMethod1 = function () {
+        return new publicClass();
+    };
+    return privateClassWithWithPublicParmeterTypes;
+})();
+function publicFunctionWithPrivateParmeterTypes() {
+    return null;
+}
+exports.publicFunctionWithPrivateParmeterTypes = publicFunctionWithPrivateParmeterTypes;
+function publicFunctionWithPublicParmeterTypes() {
+    return null;
+}
+exports.publicFunctionWithPublicParmeterTypes = publicFunctionWithPublicParmeterTypes;
+function privateFunctionWithPrivateParmeterTypes() {
+    return null;
+}
+function privateFunctionWithPublicParmeterTypes() {
+    return null;
+}
+function publicFunctionWithPrivateParmeterTypes1() {
+    return new privateClass();
+}
+exports.publicFunctionWithPrivateParmeterTypes1 = publicFunctionWithPrivateParmeterTypes1;
+function publicFunctionWithPublicParmeterTypes1() {
+    return new publicClass();
+}
+exports.publicFunctionWithPublicParmeterTypes1 = publicFunctionWithPublicParmeterTypes1;
+function privateFunctionWithPrivateParmeterTypes1() {
+    return new privateClass();
+}
+function privateFunctionWithPublicParmeterTypes1() {
+    return new publicClass();
+}
+var publicClassWithPrivateModuleParameterTypes = (function () {
+    function publicClassWithPrivateModuleParameterTypes() {
+    }
+    publicClassWithPrivateModuleParameterTypes.myPublicStaticMethod = function () {
+        return null;
+    };
+    publicClassWithPrivateModuleParameterTypes.prototype.myPublicMethod = function () {
+        return null;
+    };
+    publicClassWithPrivateModuleParameterTypes.myPublicStaticMethod1 = function () {
+        return new privateModule.publicClass();
+    };
+    publicClassWithPrivateModuleParameterTypes.prototype.myPublicMethod1 = function () {
+        return new privateModule.publicClass();
+    };
+    return publicClassWithPrivateModuleParameterTypes;
+})();
+exports.publicClassWithPrivateModuleParameterTypes = publicClassWithPrivateModuleParameterTypes;
+function publicFunctionWithPrivateModuleParameterTypes() {
+    return null;
+}
+exports.publicFunctionWithPrivateModuleParameterTypes = publicFunctionWithPrivateModuleParameterTypes;
+function publicFunctionWithPrivateModuleParameterTypes1() {
+    return new privateModule.publicClass();
+}
+exports.publicFunctionWithPrivateModuleParameterTypes1 = publicFunctionWithPrivateModuleParameterTypes1;
+var privateClassWithPrivateModuleParameterTypes = (function () {
+    function privateClassWithPrivateModuleParameterTypes() {
+    }
+    privateClassWithPrivateModuleParameterTypes.myPublicStaticMethod = function () {
+        return null;
+    };
+    privateClassWithPrivateModuleParameterTypes.prototype.myPublicMethod = function () {
+        return null;
+    };
+    privateClassWithPrivateModuleParameterTypes.myPublicStaticMethod1 = function () {
+        return new privateModule.publicClass();
+    };
+    privateClassWithPrivateModuleParameterTypes.prototype.myPublicMethod1 = function () {
+        return new privateModule.publicClass();
+    };
+    return privateClassWithPrivateModuleParameterTypes;
+})();
+function privateFunctionWithPrivateModuleParameterTypes() {
+    return null;
+}
+function privateFunctionWithPrivateModuleParameterTypes1() {
+    return new privateModule.publicClass();
+}
+(function (publicModule) {
+    var privateClass = (function () {
+        function privateClass() {
+        }
+        return privateClass;
+    })();
+    var publicClass = (function () {
+        function publicClass() {
+        }
+        return publicClass;
+    })();
+    publicModule.publicClass = publicClass;
+    var publicClassWithWithPrivateParmeterTypes = (function () {
+        function publicClassWithWithPrivateParmeterTypes() {
+        }
+        publicClassWithWithPrivateParmeterTypes.myPublicStaticMethod = function () {
+            return null;
+        };
+        publicClassWithWithPrivateParmeterTypes.myPrivateStaticMethod = function () {
+            return null;
+        };
+        publicClassWithWithPrivateParmeterTypes.prototype.myPublicMethod = function () {
+            return null;
+        };
+        publicClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod = function () {
+            return null;
+        };
+        publicClassWithWithPrivateParmeterTypes.myPublicStaticMethod1 = function () {
+            return new privateClass();
+        };
+        publicClassWithWithPrivateParmeterTypes.myPrivateStaticMethod1 = function () {
+            return new privateClass();
+        };
+        publicClassWithWithPrivateParmeterTypes.prototype.myPublicMethod1 = function () {
+            return new privateClass();
+        };
+        publicClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod1 = function () {
+            return new privateClass();
+        };
+        return publicClassWithWithPrivateParmeterTypes;
+    })();
+    publicModule.publicClassWithWithPrivateParmeterTypes = publicClassWithWithPrivateParmeterTypes;
+    var publicClassWithWithPublicParmeterTypes = (function () {
+        function publicClassWithWithPublicParmeterTypes() {
+        }
+        publicClassWithWithPublicParmeterTypes.myPublicStaticMethod = function () {
+            return null;
+        };
+        publicClassWithWithPublicParmeterTypes.myPrivateStaticMethod = function () {
+            return null;
+        };
+        publicClassWithWithPublicParmeterTypes.prototype.myPublicMethod = function () {
+            return null;
+        };
+        publicClassWithWithPublicParmeterTypes.prototype.myPrivateMethod = function () {
+            return null;
+        };
+        publicClassWithWithPublicParmeterTypes.myPublicStaticMethod1 = function () {
+            return new publicClass();
+        };
+        publicClassWithWithPublicParmeterTypes.myPrivateStaticMethod1 = function () {
+            return new publicClass();
+        };
+        publicClassWithWithPublicParmeterTypes.prototype.myPublicMethod1 = function () {
+            return new publicClass();
+        };
+        publicClassWithWithPublicParmeterTypes.prototype.myPrivateMethod1 = function () {
+            return new publicClass();
+        };
+        return publicClassWithWithPublicParmeterTypes;
+    })();
+    publicModule.publicClassWithWithPublicParmeterTypes = publicClassWithWithPublicParmeterTypes;
+    var privateClassWithWithPrivateParmeterTypes = (function () {
+        function privateClassWithWithPrivateParmeterTypes() {
+        }
+        privateClassWithWithPrivateParmeterTypes.myPublicStaticMethod = function () {
+            return null;
+        };
+        privateClassWithWithPrivateParmeterTypes.myPrivateStaticMethod = function () {
+            return null;
+        };
+        privateClassWithWithPrivateParmeterTypes.prototype.myPublicMethod = function () {
+            return null;
+        };
+        privateClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod = function () {
+            return null;
+        };
+        privateClassWithWithPrivateParmeterTypes.myPublicStaticMethod1 = function () {
+            return new privateClass();
+        };
+        privateClassWithWithPrivateParmeterTypes.myPrivateStaticMethod1 = function () {
+            return new privateClass();
+        };
+        privateClassWithWithPrivateParmeterTypes.prototype.myPublicMethod1 = function () {
+            return new privateClass();
+        };
+        privateClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod1 = function () {
+            return new privateClass();
+        };
+        return privateClassWithWithPrivateParmeterTypes;
+    })();
+    var privateClassWithWithPublicParmeterTypes = (function () {
+        function privateClassWithWithPublicParmeterTypes() {
+        }
+        privateClassWithWithPublicParmeterTypes.myPublicStaticMethod = function () {
+            return null;
+        };
+        privateClassWithWithPublicParmeterTypes.myPrivateStaticMethod = function () {
+            return null;
+        };
+        privateClassWithWithPublicParmeterTypes.prototype.myPublicMethod = function () {
+            return null;
+        };
+        privateClassWithWithPublicParmeterTypes.prototype.myPrivateMethod = function () {
+            return null;
+        };
+        privateClassWithWithPublicParmeterTypes.myPublicStaticMethod1 = function () {
+            return new publicClass();
+        };
+        privateClassWithWithPublicParmeterTypes.myPrivateStaticMethod1 = function () {
+            return new publicClass();
+        };
+        privateClassWithWithPublicParmeterTypes.prototype.myPublicMethod1 = function () {
+            return new publicClass();
+        };
+        privateClassWithWithPublicParmeterTypes.prototype.myPrivateMethod1 = function () {
+            return new publicClass();
+        };
+        return privateClassWithWithPublicParmeterTypes;
+    })();
+    function publicFunctionWithPrivateParmeterTypes() {
+        return null;
+    }
+    publicModule.publicFunctionWithPrivateParmeterTypes = publicFunctionWithPrivateParmeterTypes;
+    function publicFunctionWithPublicParmeterTypes() {
+        return null;
+    }
+    publicModule.publicFunctionWithPublicParmeterTypes = publicFunctionWithPublicParmeterTypes;
+    function privateFunctionWithPrivateParmeterTypes() {
+        return null;
+    }
+    function privateFunctionWithPublicParmeterTypes() {
+        return null;
+    }
+    function publicFunctionWithPrivateParmeterTypes1() {
+        return new privateClass();
+    }
+    publicModule.publicFunctionWithPrivateParmeterTypes1 = publicFunctionWithPrivateParmeterTypes1;
+    function publicFunctionWithPublicParmeterTypes1() {
+        return new publicClass();
+    }
+    publicModule.publicFunctionWithPublicParmeterTypes1 = publicFunctionWithPublicParmeterTypes1;
+    function privateFunctionWithPrivateParmeterTypes1() {
+        return new privateClass();
+    }
+    function privateFunctionWithPublicParmeterTypes1() {
+        return new publicClass();
+    }
+    var publicClassWithPrivateModuleParameterTypes = (function () {
+        function publicClassWithPrivateModuleParameterTypes() {
+        }
+        publicClassWithPrivateModuleParameterTypes.myPublicStaticMethod = function () {
+            return null;
+        };
+        publicClassWithPrivateModuleParameterTypes.prototype.myPublicMethod = function () {
+            return null;
+        };
+        publicClassWithPrivateModuleParameterTypes.myPublicStaticMethod1 = function () {
+            return new privateModule.publicClass();
+        };
+        publicClassWithPrivateModuleParameterTypes.prototype.myPublicMethod1 = function () {
+            return new privateModule.publicClass();
+        };
+        return publicClassWithPrivateModuleParameterTypes;
+    })();
+    publicModule.publicClassWithPrivateModuleParameterTypes = publicClassWithPrivateModuleParameterTypes;
+    function publicFunctionWithPrivateModuleParameterTypes() {
+        return null;
+    }
+    publicModule.publicFunctionWithPrivateModuleParameterTypes = publicFunctionWithPrivateModuleParameterTypes;
+    function publicFunctionWithPrivateModuleParameterTypes1() {
+        return new privateModule.publicClass();
+    }
+    publicModule.publicFunctionWithPrivateModuleParameterTypes1 = publicFunctionWithPrivateModuleParameterTypes1;
+    var privateClassWithPrivateModuleParameterTypes = (function () {
+        function privateClassWithPrivateModuleParameterTypes() {
+        }
+        privateClassWithPrivateModuleParameterTypes.myPublicStaticMethod = function () {
+            return null;
+        };
+        privateClassWithPrivateModuleParameterTypes.prototype.myPublicMethod = function () {
+            return null;
+        };
+        privateClassWithPrivateModuleParameterTypes.myPublicStaticMethod1 = function () {
+            return new privateModule.publicClass();
+        };
+        privateClassWithPrivateModuleParameterTypes.prototype.myPublicMethod1 = function () {
+            return new privateModule.publicClass();
+        };
+        return privateClassWithPrivateModuleParameterTypes;
+    })();
+    function privateFunctionWithPrivateModuleParameterTypes() {
+        return null;
+    }
+    function privateFunctionWithPrivateModuleParameterTypes1() {
+        return new privateModule.publicClass();
+    }
+})(exports.publicModule || (exports.publicModule = {}));
+var publicModule = exports.publicModule;
+var privateModule;
+(function (privateModule) {
+    var privateClass = (function () {
+        function privateClass() {
+        }
+        return privateClass;
+    })();
+    var publicClass = (function () {
+        function publicClass() {
+        }
+        return publicClass;
+    })();
+    privateModule.publicClass = publicClass;
+    var publicClassWithWithPrivateParmeterTypes = (function () {
+        function publicClassWithWithPrivateParmeterTypes() {
+        }
+        publicClassWithWithPrivateParmeterTypes.myPublicStaticMethod = function () {
+            return null;
+        };
+        publicClassWithWithPrivateParmeterTypes.myPrivateStaticMethod = function () {
+            return null;
+        };
+        publicClassWithWithPrivateParmeterTypes.prototype.myPublicMethod = function () {
+            return null;
+        };
+        publicClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod = function () {
+            return null;
+        };
+        publicClassWithWithPrivateParmeterTypes.myPublicStaticMethod1 = function () {
+            return new privateClass();
+        };
+        publicClassWithWithPrivateParmeterTypes.myPrivateStaticMethod1 = function () {
+            return new privateClass();
+        };
+        publicClassWithWithPrivateParmeterTypes.prototype.myPublicMethod1 = function () {
+            return new privateClass();
+        };
+        publicClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod1 = function () {
+            return new privateClass();
+        };
+        return publicClassWithWithPrivateParmeterTypes;
+    })();
+    privateModule.publicClassWithWithPrivateParmeterTypes = publicClassWithWithPrivateParmeterTypes;
+    var publicClassWithWithPublicParmeterTypes = (function () {
+        function publicClassWithWithPublicParmeterTypes() {
+        }
+        publicClassWithWithPublicParmeterTypes.myPublicStaticMethod = function () {
+            return null;
+        };
+        publicClassWithWithPublicParmeterTypes.myPrivateStaticMethod = function () {
+            return null;
+        };
+        publicClassWithWithPublicParmeterTypes.prototype.myPublicMethod = function () {
+            return null;
+        };
+        publicClassWithWithPublicParmeterTypes.prototype.myPrivateMethod = function () {
+            return null;
+        };
+        publicClassWithWithPublicParmeterTypes.myPublicStaticMethod1 = function () {
+            return new publicClass();
+        };
+        publicClassWithWithPublicParmeterTypes.myPrivateStaticMethod1 = function () {
+            return new publicClass();
+        };
+        publicClassWithWithPublicParmeterTypes.prototype.myPublicMethod1 = function () {
+            return new publicClass();
+        };
+        publicClassWithWithPublicParmeterTypes.prototype.myPrivateMethod1 = function () {
+            return new publicClass();
+        };
+        return publicClassWithWithPublicParmeterTypes;
+    })();
+    privateModule.publicClassWithWithPublicParmeterTypes = publicClassWithWithPublicParmeterTypes;
+    var privateClassWithWithPrivateParmeterTypes = (function () {
+        function privateClassWithWithPrivateParmeterTypes() {
+        }
+        privateClassWithWithPrivateParmeterTypes.myPublicStaticMethod = function () {
+            return null;
+        };
+        privateClassWithWithPrivateParmeterTypes.myPrivateStaticMethod = function () {
+            return null;
+        };
+        privateClassWithWithPrivateParmeterTypes.prototype.myPublicMethod = function () {
+            return null;
+        };
+        privateClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod = function () {
+            return null;
+        };
+        privateClassWithWithPrivateParmeterTypes.myPublicStaticMethod1 = function () {
+            return new privateClass();
+        };
+        privateClassWithWithPrivateParmeterTypes.myPrivateStaticMethod1 = function () {
+            return new privateClass();
+        };
+        privateClassWithWithPrivateParmeterTypes.prototype.myPublicMethod1 = function () {
+            return new privateClass();
+        };
+        privateClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod1 = function () {
+            return new privateClass();
+        };
+        return privateClassWithWithPrivateParmeterTypes;
+    })();
+    var privateClassWithWithPublicParmeterTypes = (function () {
+        function privateClassWithWithPublicParmeterTypes() {
+        }
+        privateClassWithWithPublicParmeterTypes.myPublicStaticMethod = function () {
+            return null;
+        };
+        privateClassWithWithPublicParmeterTypes.myPrivateStaticMethod = function () {
+            return null;
+        };
+        privateClassWithWithPublicParmeterTypes.prototype.myPublicMethod = function () {
+            return null;
+        };
+        privateClassWithWithPublicParmeterTypes.prototype.myPrivateMethod = function () {
+            return null;
+        };
+        privateClassWithWithPublicParmeterTypes.myPublicStaticMethod1 = function () {
+            return new publicClass();
+        };
+        privateClassWithWithPublicParmeterTypes.myPrivateStaticMethod1 = function () {
+            return new publicClass();
+        };
+        privateClassWithWithPublicParmeterTypes.prototype.myPublicMethod1 = function () {
+            return new publicClass();
+        };
+        privateClassWithWithPublicParmeterTypes.prototype.myPrivateMethod1 = function () {
+            return new publicClass();
+        };
+        return privateClassWithWithPublicParmeterTypes;
+    })();
+    function publicFunctionWithPrivateParmeterTypes() {
+        return null;
+    }
+    privateModule.publicFunctionWithPrivateParmeterTypes = publicFunctionWithPrivateParmeterTypes;
+    function publicFunctionWithPublicParmeterTypes() {
+        return null;
+    }
+    privateModule.publicFunctionWithPublicParmeterTypes = publicFunctionWithPublicParmeterTypes;
+    function privateFunctionWithPrivateParmeterTypes() {
+        return null;
+    }
+    function privateFunctionWithPublicParmeterTypes() {
+        return null;
+    }
+    function publicFunctionWithPrivateParmeterTypes1() {
+        return new privateClass();
+    }
+    privateModule.publicFunctionWithPrivateParmeterTypes1 = publicFunctionWithPrivateParmeterTypes1;
+    function publicFunctionWithPublicParmeterTypes1() {
+        return new publicClass();
+    }
+    privateModule.publicFunctionWithPublicParmeterTypes1 = publicFunctionWithPublicParmeterTypes1;
+    function privateFunctionWithPrivateParmeterTypes1() {
+        return new privateClass();
+    }
+    function privateFunctionWithPublicParmeterTypes1() {
+        return new publicClass();
+    }
+    var publicClassWithPrivateModuleParameterTypes = (function () {
+        function publicClassWithPrivateModuleParameterTypes() {
+        }
+        publicClassWithPrivateModuleParameterTypes.myPublicStaticMethod = function () {
+            return null;
+        };
+        publicClassWithPrivateModuleParameterTypes.prototype.myPublicMethod = function () {
+            return null;
+        };
+        publicClassWithPrivateModuleParameterTypes.myPublicStaticMethod1 = function () {
+            return new privateModule.publicClass();
+        };
+        publicClassWithPrivateModuleParameterTypes.prototype.myPublicMethod1 = function () {
+            return new privateModule.publicClass();
+        };
+        return publicClassWithPrivateModuleParameterTypes;
+    })();
+    privateModule.publicClassWithPrivateModuleParameterTypes = publicClassWithPrivateModuleParameterTypes;
+    function publicFunctionWithPrivateModuleParameterTypes() {
+        return null;
+    }
+    privateModule.publicFunctionWithPrivateModuleParameterTypes = publicFunctionWithPrivateModuleParameterTypes;
+    function publicFunctionWithPrivateModuleParameterTypes1() {
+        return new privateModule.publicClass();
+    }
+    privateModule.publicFunctionWithPrivateModuleParameterTypes1 = publicFunctionWithPrivateModuleParameterTypes1;
+    var privateClassWithPrivateModuleParameterTypes = (function () {
+        function privateClassWithPrivateModuleParameterTypes() {
+        }
+        privateClassWithPrivateModuleParameterTypes.myPublicStaticMethod = function () {
+            return null;
+        };
+        privateClassWithPrivateModuleParameterTypes.prototype.myPublicMethod = function () {
+            return null;
+        };
+        privateClassWithPrivateModuleParameterTypes.myPublicStaticMethod1 = function () {
+            return new privateModule.publicClass();
+        };
+        privateClassWithPrivateModuleParameterTypes.prototype.myPublicMethod1 = function () {
+            return new privateModule.publicClass();
+        };
+        return privateClassWithPrivateModuleParameterTypes;
+    })();
+    function privateFunctionWithPrivateModuleParameterTypes() {
+        return null;
+    }
+    function privateFunctionWithPrivateModuleParameterTypes1() {
+        return new privateModule.publicClass();
+    }
+})(privateModule || (privateModule = {}));
+//// [privacyFunctionReturnTypeDeclFile_GlobalFile.js]
+var publicClassInGlobal = (function () {
+    function publicClassInGlobal() {
+    }
+    return publicClassInGlobal;
+})();
+var publicClassWithWithPublicParmeterTypesInGlobal = (function () {
+    function publicClassWithWithPublicParmeterTypesInGlobal() {
+    }
+    publicClassWithWithPublicParmeterTypesInGlobal.myPublicStaticMethod = function () {
+        return null;
+    };
+    publicClassWithWithPublicParmeterTypesInGlobal.myPrivateStaticMethod = function () {
+        return null;
+    };
+    publicClassWithWithPublicParmeterTypesInGlobal.prototype.myPublicMethod = function () {
+        return null;
+    };
+    publicClassWithWithPublicParmeterTypesInGlobal.prototype.myPrivateMethod = function () {
+        return null;
+    };
+    publicClassWithWithPublicParmeterTypesInGlobal.myPublicStaticMethod1 = function () {
+        return new publicClassInGlobal();
+    };
+    publicClassWithWithPublicParmeterTypesInGlobal.myPrivateStaticMethod1 = function () {
+        return new publicClassInGlobal();
+    };
+    publicClassWithWithPublicParmeterTypesInGlobal.prototype.myPublicMethod1 = function () {
+        return new publicClassInGlobal();
+    };
+    publicClassWithWithPublicParmeterTypesInGlobal.prototype.myPrivateMethod1 = function () {
+        return new publicClassInGlobal();
+    };
+    return publicClassWithWithPublicParmeterTypesInGlobal;
+})();
+function publicFunctionWithPublicParmeterTypesInGlobal() {
+    return null;
+}
+function publicFunctionWithPublicParmeterTypesInGlobal1() {
+    return new publicClassInGlobal();
+}
+var publicModuleInGlobal;
+(function (publicModuleInGlobal) {
+    var privateClass = (function () {
+        function privateClass() {
+        }
+        return privateClass;
+    })();
+    var publicClass = (function () {
+        function publicClass() {
+        }
+        return publicClass;
+    })();
+    publicModuleInGlobal.publicClass = publicClass;
+    var privateModule;
+    (function (privateModule) {
+        var privateClass = (function () {
+            function privateClass() {
+            }
+            return privateClass;
+        })();
+        var publicClass = (function () {
+            function publicClass() {
+            }
+            return publicClass;
+        })();
+        privateModule.publicClass = publicClass;
+        var publicClassWithWithPrivateParmeterTypes = (function () {
+            function publicClassWithWithPrivateParmeterTypes() {
+            }
+            publicClassWithWithPrivateParmeterTypes.myPublicStaticMethod = function () {
+                return null;
+            };
+            publicClassWithWithPrivateParmeterTypes.myPrivateStaticMethod = function () {
+                return null;
+            };
+            publicClassWithWithPrivateParmeterTypes.prototype.myPublicMethod = function () {
+                return null;
+            };
+            publicClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod = function () {
+                return null;
+            };
+            publicClassWithWithPrivateParmeterTypes.myPublicStaticMethod1 = function () {
+                return new privateClass();
+            };
+            publicClassWithWithPrivateParmeterTypes.myPrivateStaticMethod1 = function () {
+                return new privateClass();
+            };
+            publicClassWithWithPrivateParmeterTypes.prototype.myPublicMethod1 = function () {
+                return new privateClass();
+            };
+            publicClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod1 = function () {
+                return new privateClass();
+            };
+            return publicClassWithWithPrivateParmeterTypes;
+        })();
+        privateModule.publicClassWithWithPrivateParmeterTypes = publicClassWithWithPrivateParmeterTypes;
+        var publicClassWithWithPublicParmeterTypes = (function () {
+            function publicClassWithWithPublicParmeterTypes() {
+            }
+            publicClassWithWithPublicParmeterTypes.myPublicStaticMethod = function () {
+                return null;
+            };
+            publicClassWithWithPublicParmeterTypes.myPrivateStaticMethod = function () {
+                return null;
+            };
+            publicClassWithWithPublicParmeterTypes.prototype.myPublicMethod = function () {
+                return null;
+            };
+            publicClassWithWithPublicParmeterTypes.prototype.myPrivateMethod = function () {
+                return null;
+            };
+            publicClassWithWithPublicParmeterTypes.myPublicStaticMethod1 = function () {
+                return new publicClass();
+            };
+            publicClassWithWithPublicParmeterTypes.myPrivateStaticMethod1 = function () {
+                return new publicClass();
+            };
+            publicClassWithWithPublicParmeterTypes.prototype.myPublicMethod1 = function () {
+                return new publicClass();
+            };
+            publicClassWithWithPublicParmeterTypes.prototype.myPrivateMethod1 = function () {
+                return new publicClass();
+            };
+            return publicClassWithWithPublicParmeterTypes;
+        })();
+        privateModule.publicClassWithWithPublicParmeterTypes = publicClassWithWithPublicParmeterTypes;
+        var privateClassWithWithPrivateParmeterTypes = (function () {
+            function privateClassWithWithPrivateParmeterTypes() {
+            }
+            privateClassWithWithPrivateParmeterTypes.myPublicStaticMethod = function () {
+                return null;
+            };
+            privateClassWithWithPrivateParmeterTypes.myPrivateStaticMethod = function () {
+                return null;
+            };
+            privateClassWithWithPrivateParmeterTypes.prototype.myPublicMethod = function () {
+                return null;
+            };
+            privateClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod = function () {
+                return null;
+            };
+            privateClassWithWithPrivateParmeterTypes.myPublicStaticMethod1 = function () {
+                return new privateClass();
+            };
+            privateClassWithWithPrivateParmeterTypes.myPrivateStaticMethod1 = function () {
+                return new privateClass();
+            };
+            privateClassWithWithPrivateParmeterTypes.prototype.myPublicMethod1 = function () {
+                return new privateClass();
+            };
+            privateClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod1 = function () {
+                return new privateClass();
+            };
+            return privateClassWithWithPrivateParmeterTypes;
+        })();
+        var privateClassWithWithPublicParmeterTypes = (function () {
+            function privateClassWithWithPublicParmeterTypes() {
+            }
+            privateClassWithWithPublicParmeterTypes.myPublicStaticMethod = function () {
+                return null;
+            };
+            privateClassWithWithPublicParmeterTypes.myPrivateStaticMethod = function () {
+                return null;
+            };
+            privateClassWithWithPublicParmeterTypes.prototype.myPublicMethod = function () {
+                return null;
+            };
+            privateClassWithWithPublicParmeterTypes.prototype.myPrivateMethod = function () {
+                return null;
+            };
+            privateClassWithWithPublicParmeterTypes.myPublicStaticMethod1 = function () {
+                return new publicClass();
+            };
+            privateClassWithWithPublicParmeterTypes.myPrivateStaticMethod1 = function () {
+                return new publicClass();
+            };
+            privateClassWithWithPublicParmeterTypes.prototype.myPublicMethod1 = function () {
+                return new publicClass();
+            };
+            privateClassWithWithPublicParmeterTypes.prototype.myPrivateMethod1 = function () {
+                return new publicClass();
+            };
+            return privateClassWithWithPublicParmeterTypes;
+        })();
+        function publicFunctionWithPrivateParmeterTypes() {
+            return null;
+        }
+        privateModule.publicFunctionWithPrivateParmeterTypes = publicFunctionWithPrivateParmeterTypes;
+        function publicFunctionWithPublicParmeterTypes() {
+            return null;
+        }
+        privateModule.publicFunctionWithPublicParmeterTypes = publicFunctionWithPublicParmeterTypes;
+        function privateFunctionWithPrivateParmeterTypes() {
+            return null;
+        }
+        function privateFunctionWithPublicParmeterTypes() {
+            return null;
+        }
+        function publicFunctionWithPrivateParmeterTypes1() {
+            return new privateClass();
+        }
+        privateModule.publicFunctionWithPrivateParmeterTypes1 = publicFunctionWithPrivateParmeterTypes1;
+        function publicFunctionWithPublicParmeterTypes1() {
+            return new publicClass();
+        }
+        privateModule.publicFunctionWithPublicParmeterTypes1 = publicFunctionWithPublicParmeterTypes1;
+        function privateFunctionWithPrivateParmeterTypes1() {
+            return new privateClass();
+        }
+        function privateFunctionWithPublicParmeterTypes1() {
+            return new publicClass();
+        }
+        var publicClassWithPrivateModuleParameterTypes = (function () {
+            function publicClassWithPrivateModuleParameterTypes() {
+            }
+            publicClassWithPrivateModuleParameterTypes.myPublicStaticMethod = function () {
+                return null;
+            };
+            publicClassWithPrivateModuleParameterTypes.prototype.myPublicMethod = function () {
+                return null;
+            };
+            publicClassWithPrivateModuleParameterTypes.myPublicStaticMethod1 = function () {
+                return new privateModule.publicClass();
+            };
+            publicClassWithPrivateModuleParameterTypes.prototype.myPublicMethod1 = function () {
+                return new privateModule.publicClass();
+            };
+            return publicClassWithPrivateModuleParameterTypes;
+        })();
+        privateModule.publicClassWithPrivateModuleParameterTypes = publicClassWithPrivateModuleParameterTypes;
+        function publicFunctionWithPrivateModuleParameterTypes() {
+            return null;
+        }
+        privateModule.publicFunctionWithPrivateModuleParameterTypes = publicFunctionWithPrivateModuleParameterTypes;
+        function publicFunctionWithPrivateModuleParameterTypes1() {
+            return new privateModule.publicClass();
+        }
+        privateModule.publicFunctionWithPrivateModuleParameterTypes1 = publicFunctionWithPrivateModuleParameterTypes1;
+        var privateClassWithPrivateModuleParameterTypes = (function () {
+            function privateClassWithPrivateModuleParameterTypes() {
+            }
+            privateClassWithPrivateModuleParameterTypes.myPublicStaticMethod = function () {
+                return null;
+            };
+            privateClassWithPrivateModuleParameterTypes.prototype.myPublicMethod = function () {
+                return null;
+            };
+            privateClassWithPrivateModuleParameterTypes.myPublicStaticMethod1 = function () {
+                return new privateModule.publicClass();
+            };
+            privateClassWithPrivateModuleParameterTypes.prototype.myPublicMethod1 = function () {
+                return new privateModule.publicClass();
+            };
+            return privateClassWithPrivateModuleParameterTypes;
+        })();
+        function privateFunctionWithPrivateModuleParameterTypes() {
+            return null;
+        }
+        function privateFunctionWithPrivateModuleParameterTypes1() {
+            return new privateModule.publicClass();
+        }
+    })(privateModule || (privateModule = {}));
+    var publicClassWithWithPrivateParmeterTypes = (function () {
+        function publicClassWithWithPrivateParmeterTypes() {
+        }
+        publicClassWithWithPrivateParmeterTypes.myPublicStaticMethod = function () {
+            return null;
+        };
+        publicClassWithWithPrivateParmeterTypes.myPrivateStaticMethod = function () {
+            return null;
+        };
+        publicClassWithWithPrivateParmeterTypes.prototype.myPublicMethod = function () {
+            return null;
+        };
+        publicClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod = function () {
+            return null;
+        };
+        publicClassWithWithPrivateParmeterTypes.myPublicStaticMethod1 = function () {
+            return new privateClass();
+        };
+        publicClassWithWithPrivateParmeterTypes.myPrivateStaticMethod1 = function () {
+            return new privateClass();
+        };
+        publicClassWithWithPrivateParmeterTypes.prototype.myPublicMethod1 = function () {
+            return new privateClass();
+        };
+        publicClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod1 = function () {
+            return new privateClass();
+        };
+        return publicClassWithWithPrivateParmeterTypes;
+    })();
+    publicModuleInGlobal.publicClassWithWithPrivateParmeterTypes = publicClassWithWithPrivateParmeterTypes;
+    var publicClassWithWithPublicParmeterTypes = (function () {
+        function publicClassWithWithPublicParmeterTypes() {
+        }
+        publicClassWithWithPublicParmeterTypes.myPublicStaticMethod = function () {
+            return null;
+        };
+        publicClassWithWithPublicParmeterTypes.myPrivateStaticMethod = function () {
+            return null;
+        };
+        publicClassWithWithPublicParmeterTypes.prototype.myPublicMethod = function () {
+            return null;
+        };
+        publicClassWithWithPublicParmeterTypes.prototype.myPrivateMethod = function () {
+            return null;
+        };
+        publicClassWithWithPublicParmeterTypes.myPublicStaticMethod1 = function () {
+            return new publicClass();
+        };
+        publicClassWithWithPublicParmeterTypes.myPrivateStaticMethod1 = function () {
+            return new publicClass();
+        };
+        publicClassWithWithPublicParmeterTypes.prototype.myPublicMethod1 = function () {
+            return new publicClass();
+        };
+        publicClassWithWithPublicParmeterTypes.prototype.myPrivateMethod1 = function () {
+            return new publicClass();
+        };
+        return publicClassWithWithPublicParmeterTypes;
+    })();
+    publicModuleInGlobal.publicClassWithWithPublicParmeterTypes = publicClassWithWithPublicParmeterTypes;
+    var privateClassWithWithPrivateParmeterTypes = (function () {
+        function privateClassWithWithPrivateParmeterTypes() {
+        }
+        privateClassWithWithPrivateParmeterTypes.myPublicStaticMethod = function () {
+            return null;
+        };
+        privateClassWithWithPrivateParmeterTypes.myPrivateStaticMethod = function () {
+            return null;
+        };
+        privateClassWithWithPrivateParmeterTypes.prototype.myPublicMethod = function () {
+            return null;
+        };
+        privateClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod = function () {
+            return null;
+        };
+        privateClassWithWithPrivateParmeterTypes.myPublicStaticMethod1 = function () {
+            return new privateClass();
+        };
+        privateClassWithWithPrivateParmeterTypes.myPrivateStaticMethod1 = function () {
+            return new privateClass();
+        };
+        privateClassWithWithPrivateParmeterTypes.prototype.myPublicMethod1 = function () {
+            return new privateClass();
+        };
+        privateClassWithWithPrivateParmeterTypes.prototype.myPrivateMethod1 = function () {
+            return new privateClass();
+        };
+        return privateClassWithWithPrivateParmeterTypes;
+    })();
+    var privateClassWithWithPublicParmeterTypes = (function () {
+        function privateClassWithWithPublicParmeterTypes() {
+        }
+        privateClassWithWithPublicParmeterTypes.myPublicStaticMethod = function () {
+            return null;
+        };
+        privateClassWithWithPublicParmeterTypes.myPrivateStaticMethod = function () {
+            return null;
+        };
+        privateClassWithWithPublicParmeterTypes.prototype.myPublicMethod = function () {
+            return null;
+        };
+        privateClassWithWithPublicParmeterTypes.prototype.myPrivateMethod = function () {
+            return null;
+        };
+        privateClassWithWithPublicParmeterTypes.myPublicStaticMethod1 = function () {
+            return new publicClass();
+        };
+        privateClassWithWithPublicParmeterTypes.myPrivateStaticMethod1 = function () {
+            return new publicClass();
+        };
+        privateClassWithWithPublicParmeterTypes.prototype.myPublicMethod1 = function () {
+            return new publicClass();
+        };
+        privateClassWithWithPublicParmeterTypes.prototype.myPrivateMethod1 = function () {
+            return new publicClass();
+        };
+        return privateClassWithWithPublicParmeterTypes;
+    })();
+    function publicFunctionWithPrivateParmeterTypes() {
+        return null;
+    }
+    publicModuleInGlobal.publicFunctionWithPrivateParmeterTypes = publicFunctionWithPrivateParmeterTypes;
+    function publicFunctionWithPublicParmeterTypes() {
+        return null;
+    }
+    publicModuleInGlobal.publicFunctionWithPublicParmeterTypes = publicFunctionWithPublicParmeterTypes;
+    function privateFunctionWithPrivateParmeterTypes() {
+        return null;
+    }
+    function privateFunctionWithPublicParmeterTypes() {
+        return null;
+    }
+    function publicFunctionWithPrivateParmeterTypes1() {
+        return new privateClass();
+    }
+    publicModuleInGlobal.publicFunctionWithPrivateParmeterTypes1 = publicFunctionWithPrivateParmeterTypes1;
+    function publicFunctionWithPublicParmeterTypes1() {
+        return new publicClass();
+    }
+    publicModuleInGlobal.publicFunctionWithPublicParmeterTypes1 = publicFunctionWithPublicParmeterTypes1;
+    function privateFunctionWithPrivateParmeterTypes1() {
+        return new privateClass();
+    }
+    function privateFunctionWithPublicParmeterTypes1() {
+        return new publicClass();
+    }
+    var publicClassWithPrivateModuleParameterTypes = (function () {
+        function publicClassWithPrivateModuleParameterTypes() {
+        }
+        publicClassWithPrivateModuleParameterTypes.myPublicStaticMethod = function () {
+            return null;
+        };
+        publicClassWithPrivateModuleParameterTypes.prototype.myPublicMethod = function () {
+            return null;
+        };
+        publicClassWithPrivateModuleParameterTypes.myPublicStaticMethod1 = function () {
+            return new privateModule.publicClass();
+        };
+        publicClassWithPrivateModuleParameterTypes.prototype.myPublicMethod1 = function () {
+            return new privateModule.publicClass();
+        };
+        return publicClassWithPrivateModuleParameterTypes;
+    })();
+    publicModuleInGlobal.publicClassWithPrivateModuleParameterTypes = publicClassWithPrivateModuleParameterTypes;
+    function publicFunctionWithPrivateModuleParameterTypes() {
+        return null;
+    }
+    publicModuleInGlobal.publicFunctionWithPrivateModuleParameterTypes = publicFunctionWithPrivateModuleParameterTypes;
+    function publicFunctionWithPrivateModuleParameterTypes1() {
+        return new privateModule.publicClass();
+    }
+    publicModuleInGlobal.publicFunctionWithPrivateModuleParameterTypes1 = publicFunctionWithPrivateModuleParameterTypes1;
+    var privateClassWithPrivateModuleParameterTypes = (function () {
+        function privateClassWithPrivateModuleParameterTypes() {
+        }
+        privateClassWithPrivateModuleParameterTypes.myPublicStaticMethod = function () {
+            return null;
+        };
+        privateClassWithPrivateModuleParameterTypes.prototype.myPublicMethod = function () {
+            return null;
+        };
+        privateClassWithPrivateModuleParameterTypes.myPublicStaticMethod1 = function () {
+            return new privateModule.publicClass();
+        };
+        privateClassWithPrivateModuleParameterTypes.prototype.myPublicMethod1 = function () {
+            return new privateModule.publicClass();
+        };
+        return privateClassWithPrivateModuleParameterTypes;
+    })();
+    function privateFunctionWithPrivateModuleParameterTypes() {
+        return null;
+    }
+    function privateFunctionWithPrivateModuleParameterTypes1() {
+        return new privateModule.publicClass();
+    }
+})(publicModuleInGlobal || (publicModuleInGlobal = {}));
diff --git a/tests/baselines/reference/privacyGetter.errors.txt b/tests/baselines/reference/privacyGetter.errors.txt
deleted file mode 100644
index ea185031726..00000000000
--- a/tests/baselines/reference/privacyGetter.errors.txt
+++ /dev/null
@@ -1,304 +0,0 @@
-==== tests/cases/compiler/privacyGetter.ts (48 errors) ====
-    export module m1 {
-        export class C1_public {
-            private f1() {
-            }
-        }
-    
-        class C2_private {
-        }
-    
-        export class C3_public {
-            private get p1_private() {
-                        ~~~~~~~~~~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
-                return new C1_public();
-            }
-    
-            private set p1_private(m1_c3_p1_arg: C1_public) {
-                        ~~~~~~~~~~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
-            }
-    
-            private get p2_private() {
-                        ~~~~~~~~~~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
-                return new C1_public();
-            }
-    
-            private set p2_private(m1_c3_p2_arg: C1_public) {
-                        ~~~~~~~~~~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
-            }
-    
-            private get p3_private() {
-                        ~~~~~~~~~~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
-                return new C2_private();
-            }
-    
-            private set p3_private(m1_c3_p3_arg: C2_private) {
-                        ~~~~~~~~~~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
-            }
-    
-            public get p4_public(): C2_private { // error
-                       ~~~~~~~~~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
-                return new C2_private(); //error
-            }
-    
-            public set p4_public(m1_c3_p4_arg: C2_private) { // error
-                       ~~~~~~~~~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
-            }
-        }
-    
-        class C4_private {
-            private get p1_private() {
-                        ~~~~~~~~~~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
-                return new C1_public();
-            }
-    
-            private set p1_private(m1_c3_p1_arg: C1_public) {
-                        ~~~~~~~~~~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
-            }
-    
-            private get p2_private() {
-                        ~~~~~~~~~~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
-                return new C1_public();
-            }
-    
-            private set p2_private(m1_c3_p2_arg: C1_public) {
-                        ~~~~~~~~~~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
-            }
-    
-            private get p3_private() {
-                        ~~~~~~~~~~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
-                return new C2_private();
-            }
-    
-            private set p3_private(m1_c3_p3_arg: C2_private) {
-                        ~~~~~~~~~~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
-            }
-    
-            public get p4_public(): C2_private {
-                       ~~~~~~~~~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
-                return new C2_private();
-            }
-    
-            public set p4_public(m1_c3_p4_arg: C2_private) {
-                       ~~~~~~~~~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
-            }
-        }
-    }
-    
-    module m2 {
-        export class m2_C1_public {
-            private f1() {
-            }
-        }
-    
-        class m2_C2_private {
-        }
-    
-        export class m2_C3_public {
-            private get p1_private() {
-                        ~~~~~~~~~~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
-                return new m2_C1_public();
-            }
-    
-            private set p1_private(m2_c3_p1_arg: m2_C1_public) {
-                        ~~~~~~~~~~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
-            }
-    
-            private get p2_private() {
-                        ~~~~~~~~~~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
-                return new m2_C1_public();
-            }
-    
-            private set p2_private(m2_c3_p2_arg: m2_C1_public) {
-                        ~~~~~~~~~~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
-            }
-    
-            private get p3_private() {
-                        ~~~~~~~~~~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
-                return new m2_C2_private();
-            }
-    
-            private set p3_private(m2_c3_p3_arg: m2_C2_private) {
-                        ~~~~~~~~~~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
-            }
-    
-            public get p4_public(): m2_C2_private {
-                       ~~~~~~~~~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
-                return new m2_C2_private();
-            }
-    
-            public set p4_public(m2_c3_p4_arg: m2_C2_private) {
-                       ~~~~~~~~~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
-            }
-        }
-    
-        class m2_C4_private {
-            private get p1_private() {
-                        ~~~~~~~~~~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
-                return new m2_C1_public();
-            }
-    
-            private set p1_private(m2_c3_p1_arg: m2_C1_public) {
-                        ~~~~~~~~~~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
-            }
-    
-            private get p2_private() {
-                        ~~~~~~~~~~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
-                return new m2_C1_public();
-            }
-    
-            private set p2_private(m2_c3_p2_arg: m2_C1_public) {
-                        ~~~~~~~~~~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
-            }
-    
-            private get p3_private() {
-                        ~~~~~~~~~~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
-                return new m2_C2_private();
-            }
-    
-            private set p3_private(m2_c3_p3_arg: m2_C2_private) {
-                        ~~~~~~~~~~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
-            }
-    
-            public get p4_public(): m2_C2_private {
-                       ~~~~~~~~~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
-                return new m2_C2_private();
-            }
-    
-            public set p4_public(m2_c3_p4_arg: m2_C2_private) {
-                       ~~~~~~~~~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
-            }
-        }
-    }
-    
-    class C5_private {
-        private f() {
-        }
-    }
-    
-    export class C6_public {
-    }
-    
-    export class C7_public {
-        private get p1_private() {
-                    ~~~~~~~~~~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
-            return new C6_public();
-        }
-    
-        private set p1_private(m1_c3_p1_arg: C6_public) {
-                    ~~~~~~~~~~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
-        }
-    
-        private get p2_private() {
-                    ~~~~~~~~~~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
-            return new C6_public();
-        }
-    
-        private set p2_private(m1_c3_p2_arg: C6_public) {
-                    ~~~~~~~~~~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
-        }
-    
-        private get p3_private() {
-                    ~~~~~~~~~~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
-            return new C5_private();
-        }
-    
-        private set p3_private(m1_c3_p3_arg: C5_private) {
-                    ~~~~~~~~~~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
-        }
-    
-        public get p4_public(): C5_private { // error
-                   ~~~~~~~~~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
-            return new C5_private(); //error
-        }
-    
-        public set p4_public(m1_c3_p4_arg: C5_private) { // error
-                   ~~~~~~~~~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
-        }
-    }
-    
-    class C8_private {
-        private get p1_private() {
-                    ~~~~~~~~~~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
-            return new C6_public();
-        }
-    
-        private set p1_private(m1_c3_p1_arg: C6_public) {
-                    ~~~~~~~~~~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
-        }
-    
-        private get p2_private() {
-                    ~~~~~~~~~~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
-            return new C6_public();
-        }
-    
-        private set p2_private(m1_c3_p2_arg: C6_public) {
-                    ~~~~~~~~~~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
-        }
-    
-        private get p3_private() {
-                    ~~~~~~~~~~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
-            return new C5_private();
-        }
-    
-        private set p3_private(m1_c3_p3_arg: C5_private) {
-                    ~~~~~~~~~~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
-        }
-    
-        public get p4_public(): C5_private {
-                   ~~~~~~~~~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
-            return new C5_private();
-        }
-    
-        public set p4_public(m1_c3_p4_arg: C5_private) {
-                   ~~~~~~~~~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
-        }
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/privacyGetter.js b/tests/baselines/reference/privacyGetter.js
new file mode 100644
index 00000000000..7a9239b134d
--- /dev/null
+++ b/tests/baselines/reference/privacyGetter.js
@@ -0,0 +1,506 @@
+//// [privacyGetter.ts]
+export module m1 {
+    export class C1_public {
+        private f1() {
+        }
+    }
+
+    class C2_private {
+    }
+
+    export class C3_public {
+        private get p1_private() {
+            return new C1_public();
+        }
+
+        private set p1_private(m1_c3_p1_arg: C1_public) {
+        }
+
+        private get p2_private() {
+            return new C1_public();
+        }
+
+        private set p2_private(m1_c3_p2_arg: C1_public) {
+        }
+
+        private get p3_private() {
+            return new C2_private();
+        }
+
+        private set p3_private(m1_c3_p3_arg: C2_private) {
+        }
+
+        public get p4_public(): C2_private { // error
+            return new C2_private(); //error
+        }
+
+        public set p4_public(m1_c3_p4_arg: C2_private) { // error
+        }
+    }
+
+    class C4_private {
+        private get p1_private() {
+            return new C1_public();
+        }
+
+        private set p1_private(m1_c3_p1_arg: C1_public) {
+        }
+
+        private get p2_private() {
+            return new C1_public();
+        }
+
+        private set p2_private(m1_c3_p2_arg: C1_public) {
+        }
+
+        private get p3_private() {
+            return new C2_private();
+        }
+
+        private set p3_private(m1_c3_p3_arg: C2_private) {
+        }
+
+        public get p4_public(): C2_private {
+            return new C2_private();
+        }
+
+        public set p4_public(m1_c3_p4_arg: C2_private) {
+        }
+    }
+}
+
+module m2 {
+    export class m2_C1_public {
+        private f1() {
+        }
+    }
+
+    class m2_C2_private {
+    }
+
+    export class m2_C3_public {
+        private get p1_private() {
+            return new m2_C1_public();
+        }
+
+        private set p1_private(m2_c3_p1_arg: m2_C1_public) {
+        }
+
+        private get p2_private() {
+            return new m2_C1_public();
+        }
+
+        private set p2_private(m2_c3_p2_arg: m2_C1_public) {
+        }
+
+        private get p3_private() {
+            return new m2_C2_private();
+        }
+
+        private set p3_private(m2_c3_p3_arg: m2_C2_private) {
+        }
+
+        public get p4_public(): m2_C2_private {
+            return new m2_C2_private();
+        }
+
+        public set p4_public(m2_c3_p4_arg: m2_C2_private) {
+        }
+    }
+
+    class m2_C4_private {
+        private get p1_private() {
+            return new m2_C1_public();
+        }
+
+        private set p1_private(m2_c3_p1_arg: m2_C1_public) {
+        }
+
+        private get p2_private() {
+            return new m2_C1_public();
+        }
+
+        private set p2_private(m2_c3_p2_arg: m2_C1_public) {
+        }
+
+        private get p3_private() {
+            return new m2_C2_private();
+        }
+
+        private set p3_private(m2_c3_p3_arg: m2_C2_private) {
+        }
+
+        public get p4_public(): m2_C2_private {
+            return new m2_C2_private();
+        }
+
+        public set p4_public(m2_c3_p4_arg: m2_C2_private) {
+        }
+    }
+}
+
+class C5_private {
+    private f() {
+    }
+}
+
+export class C6_public {
+}
+
+export class C7_public {
+    private get p1_private() {
+        return new C6_public();
+    }
+
+    private set p1_private(m1_c3_p1_arg: C6_public) {
+    }
+
+    private get p2_private() {
+        return new C6_public();
+    }
+
+    private set p2_private(m1_c3_p2_arg: C6_public) {
+    }
+
+    private get p3_private() {
+        return new C5_private();
+    }
+
+    private set p3_private(m1_c3_p3_arg: C5_private) {
+    }
+
+    public get p4_public(): C5_private { // error
+        return new C5_private(); //error
+    }
+
+    public set p4_public(m1_c3_p4_arg: C5_private) { // error
+    }
+}
+
+class C8_private {
+    private get p1_private() {
+        return new C6_public();
+    }
+
+    private set p1_private(m1_c3_p1_arg: C6_public) {
+    }
+
+    private get p2_private() {
+        return new C6_public();
+    }
+
+    private set p2_private(m1_c3_p2_arg: C6_public) {
+    }
+
+    private get p3_private() {
+        return new C5_private();
+    }
+
+    private set p3_private(m1_c3_p3_arg: C5_private) {
+    }
+
+    public get p4_public(): C5_private {
+        return new C5_private();
+    }
+
+    public set p4_public(m1_c3_p4_arg: C5_private) {
+    }
+}
+
+//// [privacyGetter.js]
+define(["require", "exports"], function (require, exports) {
+    (function (m1) {
+        var C1_public = (function () {
+            function C1_public() {
+            }
+            C1_public.prototype.f1 = function () {
+            };
+            return C1_public;
+        })();
+        m1.C1_public = C1_public;
+        var C2_private = (function () {
+            function C2_private() {
+            }
+            return C2_private;
+        })();
+        var C3_public = (function () {
+            function C3_public() {
+            }
+            Object.defineProperty(C3_public.prototype, "p1_private", {
+                get: function () {
+                    return new C1_public();
+                },
+                set: function (m1_c3_p1_arg) {
+                },
+                enumerable: true,
+                configurable: true
+            });
+            Object.defineProperty(C3_public.prototype, "p2_private", {
+                get: function () {
+                    return new C1_public();
+                },
+                set: function (m1_c3_p2_arg) {
+                },
+                enumerable: true,
+                configurable: true
+            });
+            Object.defineProperty(C3_public.prototype, "p3_private", {
+                get: function () {
+                    return new C2_private();
+                },
+                set: function (m1_c3_p3_arg) {
+                },
+                enumerable: true,
+                configurable: true
+            });
+            Object.defineProperty(C3_public.prototype, "p4_public", {
+                get: function () {
+                    return new C2_private(); //error
+                },
+                set: function (m1_c3_p4_arg) {
+                },
+                enumerable: true,
+                configurable: true
+            });
+            return C3_public;
+        })();
+        m1.C3_public = C3_public;
+        var C4_private = (function () {
+            function C4_private() {
+            }
+            Object.defineProperty(C4_private.prototype, "p1_private", {
+                get: function () {
+                    return new C1_public();
+                },
+                set: function (m1_c3_p1_arg) {
+                },
+                enumerable: true,
+                configurable: true
+            });
+            Object.defineProperty(C4_private.prototype, "p2_private", {
+                get: function () {
+                    return new C1_public();
+                },
+                set: function (m1_c3_p2_arg) {
+                },
+                enumerable: true,
+                configurable: true
+            });
+            Object.defineProperty(C4_private.prototype, "p3_private", {
+                get: function () {
+                    return new C2_private();
+                },
+                set: function (m1_c3_p3_arg) {
+                },
+                enumerable: true,
+                configurable: true
+            });
+            Object.defineProperty(C4_private.prototype, "p4_public", {
+                get: function () {
+                    return new C2_private();
+                },
+                set: function (m1_c3_p4_arg) {
+                },
+                enumerable: true,
+                configurable: true
+            });
+            return C4_private;
+        })();
+    })(exports.m1 || (exports.m1 = {}));
+    var m1 = exports.m1;
+    var m2;
+    (function (m2) {
+        var m2_C1_public = (function () {
+            function m2_C1_public() {
+            }
+            m2_C1_public.prototype.f1 = function () {
+            };
+            return m2_C1_public;
+        })();
+        m2.m2_C1_public = m2_C1_public;
+        var m2_C2_private = (function () {
+            function m2_C2_private() {
+            }
+            return m2_C2_private;
+        })();
+        var m2_C3_public = (function () {
+            function m2_C3_public() {
+            }
+            Object.defineProperty(m2_C3_public.prototype, "p1_private", {
+                get: function () {
+                    return new m2_C1_public();
+                },
+                set: function (m2_c3_p1_arg) {
+                },
+                enumerable: true,
+                configurable: true
+            });
+            Object.defineProperty(m2_C3_public.prototype, "p2_private", {
+                get: function () {
+                    return new m2_C1_public();
+                },
+                set: function (m2_c3_p2_arg) {
+                },
+                enumerable: true,
+                configurable: true
+            });
+            Object.defineProperty(m2_C3_public.prototype, "p3_private", {
+                get: function () {
+                    return new m2_C2_private();
+                },
+                set: function (m2_c3_p3_arg) {
+                },
+                enumerable: true,
+                configurable: true
+            });
+            Object.defineProperty(m2_C3_public.prototype, "p4_public", {
+                get: function () {
+                    return new m2_C2_private();
+                },
+                set: function (m2_c3_p4_arg) {
+                },
+                enumerable: true,
+                configurable: true
+            });
+            return m2_C3_public;
+        })();
+        m2.m2_C3_public = m2_C3_public;
+        var m2_C4_private = (function () {
+            function m2_C4_private() {
+            }
+            Object.defineProperty(m2_C4_private.prototype, "p1_private", {
+                get: function () {
+                    return new m2_C1_public();
+                },
+                set: function (m2_c3_p1_arg) {
+                },
+                enumerable: true,
+                configurable: true
+            });
+            Object.defineProperty(m2_C4_private.prototype, "p2_private", {
+                get: function () {
+                    return new m2_C1_public();
+                },
+                set: function (m2_c3_p2_arg) {
+                },
+                enumerable: true,
+                configurable: true
+            });
+            Object.defineProperty(m2_C4_private.prototype, "p3_private", {
+                get: function () {
+                    return new m2_C2_private();
+                },
+                set: function (m2_c3_p3_arg) {
+                },
+                enumerable: true,
+                configurable: true
+            });
+            Object.defineProperty(m2_C4_private.prototype, "p4_public", {
+                get: function () {
+                    return new m2_C2_private();
+                },
+                set: function (m2_c3_p4_arg) {
+                },
+                enumerable: true,
+                configurable: true
+            });
+            return m2_C4_private;
+        })();
+    })(m2 || (m2 = {}));
+    var C5_private = (function () {
+        function C5_private() {
+        }
+        C5_private.prototype.f = function () {
+        };
+        return C5_private;
+    })();
+    var C6_public = (function () {
+        function C6_public() {
+        }
+        return C6_public;
+    })();
+    exports.C6_public = C6_public;
+    var C7_public = (function () {
+        function C7_public() {
+        }
+        Object.defineProperty(C7_public.prototype, "p1_private", {
+            get: function () {
+                return new C6_public();
+            },
+            set: function (m1_c3_p1_arg) {
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(C7_public.prototype, "p2_private", {
+            get: function () {
+                return new C6_public();
+            },
+            set: function (m1_c3_p2_arg) {
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(C7_public.prototype, "p3_private", {
+            get: function () {
+                return new C5_private();
+            },
+            set: function (m1_c3_p3_arg) {
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(C7_public.prototype, "p4_public", {
+            get: function () {
+                return new C5_private(); //error
+            },
+            set: function (m1_c3_p4_arg) {
+            },
+            enumerable: true,
+            configurable: true
+        });
+        return C7_public;
+    })();
+    exports.C7_public = C7_public;
+    var C8_private = (function () {
+        function C8_private() {
+        }
+        Object.defineProperty(C8_private.prototype, "p1_private", {
+            get: function () {
+                return new C6_public();
+            },
+            set: function (m1_c3_p1_arg) {
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(C8_private.prototype, "p2_private", {
+            get: function () {
+                return new C6_public();
+            },
+            set: function (m1_c3_p2_arg) {
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(C8_private.prototype, "p3_private", {
+            get: function () {
+                return new C5_private();
+            },
+            set: function (m1_c3_p3_arg) {
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(C8_private.prototype, "p4_public", {
+            get: function () {
+                return new C5_private();
+            },
+            set: function (m1_c3_p4_arg) {
+            },
+            enumerable: true,
+            configurable: true
+        });
+        return C8_private;
+    })();
+});
diff --git a/tests/baselines/reference/privacyGetter.types b/tests/baselines/reference/privacyGetter.types
new file mode 100644
index 00000000000..1a946eb581b
--- /dev/null
+++ b/tests/baselines/reference/privacyGetter.types
@@ -0,0 +1,410 @@
+=== tests/cases/compiler/privacyGetter.ts ===
+export module m1 {
+>m1 : m1
+
+    export class C1_public {
+>C1_public : C1_public
+
+        private f1() {
+>f1 : () => void
+        }
+    }
+
+    class C2_private {
+>C2_private : C2_private
+    }
+
+    export class C3_public {
+>C3_public : C3_public
+
+        private get p1_private() {
+>p1_private : C1_public
+
+            return new C1_public();
+>new C1_public() : C1_public
+>C1_public : typeof C1_public
+        }
+
+        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() {
+>p2_private : C1_public
+
+            return new C1_public();
+>new C1_public() : C1_public
+>C1_public : typeof C1_public
+        }
+
+        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() {
+>p3_private : C2_private
+
+            return new C2_private();
+>new C2_private() : C2_private
+>C2_private : typeof C2_private
+        }
+
+        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
+>C2_private : typeof C2_private
+        }
+
+        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
+        }
+    }
+
+    class C4_private {
+>C4_private : C4_private
+
+        private get p1_private() {
+>p1_private : C1_public
+
+            return new C1_public();
+>new C1_public() : C1_public
+>C1_public : typeof C1_public
+        }
+
+        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() {
+>p2_private : C1_public
+
+            return new C1_public();
+>new C1_public() : C1_public
+>C1_public : typeof C1_public
+        }
+
+        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() {
+>p3_private : C2_private
+
+            return new C2_private();
+>new C2_private() : C2_private
+>C2_private : typeof C2_private
+        }
+
+        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
+>C2_private : typeof C2_private
+        }
+
+        public set p4_public(m1_c3_p4_arg: C2_private) {
+>p4_public : C2_private
+>m1_c3_p4_arg : C2_private
+>C2_private : C2_private
+        }
+    }
+}
+
+module m2 {
+>m2 : m2
+
+    export class m2_C1_public {
+>m2_C1_public : m2_C1_public
+
+        private f1() {
+>f1 : () => void
+        }
+    }
+
+    class m2_C2_private {
+>m2_C2_private : m2_C2_private
+    }
+
+    export class m2_C3_public {
+>m2_C3_public : m2_C3_public
+
+        private get p1_private() {
+>p1_private : m2_C1_public
+
+            return new m2_C1_public();
+>new m2_C1_public() : m2_C1_public
+>m2_C1_public : typeof m2_C1_public
+        }
+
+        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() {
+>p2_private : m2_C1_public
+
+            return new m2_C1_public();
+>new m2_C1_public() : m2_C1_public
+>m2_C1_public : typeof m2_C1_public
+        }
+
+        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() {
+>p3_private : m2_C2_private
+
+            return new m2_C2_private();
+>new m2_C2_private() : m2_C2_private
+>m2_C2_private : typeof m2_C2_private
+        }
+
+        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
+>m2_C2_private : typeof m2_C2_private
+        }
+
+        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
+        }
+    }
+
+    class m2_C4_private {
+>m2_C4_private : m2_C4_private
+
+        private get p1_private() {
+>p1_private : m2_C1_public
+
+            return new m2_C1_public();
+>new m2_C1_public() : m2_C1_public
+>m2_C1_public : typeof m2_C1_public
+        }
+
+        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() {
+>p2_private : m2_C1_public
+
+            return new m2_C1_public();
+>new m2_C1_public() : m2_C1_public
+>m2_C1_public : typeof m2_C1_public
+        }
+
+        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() {
+>p3_private : m2_C2_private
+
+            return new m2_C2_private();
+>new m2_C2_private() : m2_C2_private
+>m2_C2_private : typeof m2_C2_private
+        }
+
+        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
+>m2_C2_private : typeof m2_C2_private
+        }
+
+        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
+        }
+    }
+}
+
+class C5_private {
+>C5_private : C5_private
+
+    private f() {
+>f : () => void
+    }
+}
+
+export class C6_public {
+>C6_public : C6_public
+}
+
+export class C7_public {
+>C7_public : C7_public
+
+    private get p1_private() {
+>p1_private : C6_public
+
+        return new C6_public();
+>new C6_public() : C6_public
+>C6_public : typeof C6_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() {
+>p2_private : C6_public
+
+        return new C6_public();
+>new C6_public() : C6_public
+>C6_public : typeof C6_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() {
+>p3_private : C5_private
+
+        return new C5_private();
+>new C5_private() : C5_private
+>C5_private : typeof C5_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 { // error
+>p4_public : C5_private
+>C5_private : C5_private
+
+        return new C5_private(); //error
+>new C5_private() : C5_private
+>C5_private : typeof C5_private
+    }
+
+    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
+    }
+}
+
+class C8_private {
+>C8_private : C8_private
+
+    private get p1_private() {
+>p1_private : C6_public
+
+        return new C6_public();
+>new C6_public() : C6_public
+>C6_public : typeof C6_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() {
+>p2_private : C6_public
+
+        return new C6_public();
+>new C6_public() : C6_public
+>C6_public : typeof C6_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() {
+>p3_private : C5_private
+
+        return new C5_private();
+>new C5_private() : C5_private
+>C5_private : typeof C5_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
+>C5_private : typeof C5_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/privacyGloGetter.errors.txt b/tests/baselines/reference/privacyGloGetter.errors.txt
deleted file mode 100644
index d23ed7d1491..00000000000
--- a/tests/baselines/reference/privacyGloGetter.errors.txt
+++ /dev/null
@@ -1,129 +0,0 @@
-==== tests/cases/compiler/privacyGloGetter.ts (20 errors) ====
-    module m1 {
-        export class C1_public {
-            private f1() {
-            }
-        }
-    
-        class C2_private {
-        }
-    
-        export class C3_public {
-            private get p1_private() {
-                        ~~~~~~~~~~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
-                return new C1_public();
-            }
-    
-            private set p1_private(m1_c3_p1_arg: C1_public) {
-                        ~~~~~~~~~~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
-            }
-    
-            private get p2_private() {
-                        ~~~~~~~~~~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
-                return new C1_public();
-            }
-    
-            private set p2_private(m1_c3_p2_arg: C1_public) {
-                        ~~~~~~~~~~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
-            }
-    
-            private get p3_private() {
-                        ~~~~~~~~~~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
-                return new C2_private();
-            }
-    
-            private set p3_private(m1_c3_p3_arg: C2_private) {
-                        ~~~~~~~~~~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
-            }
-    
-            public get p4_public(): C2_private { // error
-                       ~~~~~~~~~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
-                return new C2_private(); //error
-            }
-    
-            public set p4_public(m1_c3_p4_arg: C2_private) { // error
-                       ~~~~~~~~~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
-            }
-        }
-    
-        class C4_private {
-            private get p1_private() {
-                        ~~~~~~~~~~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
-                return new C1_public();
-            }
-    
-            private set p1_private(m1_c3_p1_arg: C1_public) {
-                        ~~~~~~~~~~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
-            }
-    
-            private get p2_private() {
-                        ~~~~~~~~~~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
-                return new C1_public();
-            }
-    
-            private set p2_private(m1_c3_p2_arg: C1_public) {
-                        ~~~~~~~~~~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
-            }
-    
-            private get p3_private() {
-                        ~~~~~~~~~~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
-                return new C2_private();
-            }
-    
-            private set p3_private(m1_c3_p3_arg: C2_private) {
-                        ~~~~~~~~~~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
-            }
-    
-            public get p4_public(): C2_private {
-                       ~~~~~~~~~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
-                return new C2_private();
-            }
-    
-            public set p4_public(m1_c3_p4_arg: C2_private) {
-                       ~~~~~~~~~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
-            }
-        }
-    }
-    
-    class C6_public {
-    }
-    
-    class C7_public {
-        private get p1_private() {
-                    ~~~~~~~~~~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
-            return new C6_public();
-        }
-    
-        private set p1_private(m1_c3_p1_arg: C6_public) {
-                    ~~~~~~~~~~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
-        }
-    
-        private get p2_private() {
-                    ~~~~~~~~~~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
-            return new C6_public();
-        }
-    
-        private set p2_private(m1_c3_p2_arg: C6_public) {
-                    ~~~~~~~~~~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
-        }
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/privacyGloGetter.js b/tests/baselines/reference/privacyGloGetter.js
new file mode 100644
index 00000000000..34e4b69d392
--- /dev/null
+++ b/tests/baselines/reference/privacyGloGetter.js
@@ -0,0 +1,218 @@
+//// [privacyGloGetter.ts]
+module m1 {
+    export class C1_public {
+        private f1() {
+        }
+    }
+
+    class C2_private {
+    }
+
+    export class C3_public {
+        private get p1_private() {
+            return new C1_public();
+        }
+
+        private set p1_private(m1_c3_p1_arg: C1_public) {
+        }
+
+        private get p2_private() {
+            return new C1_public();
+        }
+
+        private set p2_private(m1_c3_p2_arg: C1_public) {
+        }
+
+        private get p3_private() {
+            return new C2_private();
+        }
+
+        private set p3_private(m1_c3_p3_arg: C2_private) {
+        }
+
+        public get p4_public(): C2_private { // error
+            return new C2_private(); //error
+        }
+
+        public set p4_public(m1_c3_p4_arg: C2_private) { // error
+        }
+    }
+
+    class C4_private {
+        private get p1_private() {
+            return new C1_public();
+        }
+
+        private set p1_private(m1_c3_p1_arg: C1_public) {
+        }
+
+        private get p2_private() {
+            return new C1_public();
+        }
+
+        private set p2_private(m1_c3_p2_arg: C1_public) {
+        }
+
+        private get p3_private() {
+            return new C2_private();
+        }
+
+        private set p3_private(m1_c3_p3_arg: C2_private) {
+        }
+
+        public get p4_public(): C2_private {
+            return new C2_private();
+        }
+
+        public set p4_public(m1_c3_p4_arg: C2_private) {
+        }
+    }
+}
+
+class C6_public {
+}
+
+class C7_public {
+    private get p1_private() {
+        return new C6_public();
+    }
+
+    private set p1_private(m1_c3_p1_arg: C6_public) {
+    }
+
+    private get p2_private() {
+        return new C6_public();
+    }
+
+    private set p2_private(m1_c3_p2_arg: C6_public) {
+    }
+}
+
+//// [privacyGloGetter.js]
+var m1;
+(function (m1) {
+    var C1_public = (function () {
+        function C1_public() {
+        }
+        C1_public.prototype.f1 = function () {
+        };
+        return C1_public;
+    })();
+    m1.C1_public = C1_public;
+    var C2_private = (function () {
+        function C2_private() {
+        }
+        return C2_private;
+    })();
+    var C3_public = (function () {
+        function C3_public() {
+        }
+        Object.defineProperty(C3_public.prototype, "p1_private", {
+            get: function () {
+                return new C1_public();
+            },
+            set: function (m1_c3_p1_arg) {
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(C3_public.prototype, "p2_private", {
+            get: function () {
+                return new C1_public();
+            },
+            set: function (m1_c3_p2_arg) {
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(C3_public.prototype, "p3_private", {
+            get: function () {
+                return new C2_private();
+            },
+            set: function (m1_c3_p3_arg) {
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(C3_public.prototype, "p4_public", {
+            get: function () {
+                return new C2_private(); //error
+            },
+            set: function (m1_c3_p4_arg) {
+            },
+            enumerable: true,
+            configurable: true
+        });
+        return C3_public;
+    })();
+    m1.C3_public = C3_public;
+    var C4_private = (function () {
+        function C4_private() {
+        }
+        Object.defineProperty(C4_private.prototype, "p1_private", {
+            get: function () {
+                return new C1_public();
+            },
+            set: function (m1_c3_p1_arg) {
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(C4_private.prototype, "p2_private", {
+            get: function () {
+                return new C1_public();
+            },
+            set: function (m1_c3_p2_arg) {
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(C4_private.prototype, "p3_private", {
+            get: function () {
+                return new C2_private();
+            },
+            set: function (m1_c3_p3_arg) {
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(C4_private.prototype, "p4_public", {
+            get: function () {
+                return new C2_private();
+            },
+            set: function (m1_c3_p4_arg) {
+            },
+            enumerable: true,
+            configurable: true
+        });
+        return C4_private;
+    })();
+})(m1 || (m1 = {}));
+var C6_public = (function () {
+    function C6_public() {
+    }
+    return C6_public;
+})();
+var C7_public = (function () {
+    function C7_public() {
+    }
+    Object.defineProperty(C7_public.prototype, "p1_private", {
+        get: function () {
+            return new C6_public();
+        },
+        set: function (m1_c3_p1_arg) {
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(C7_public.prototype, "p2_private", {
+        get: function () {
+            return new C6_public();
+        },
+        set: function (m1_c3_p2_arg) {
+        },
+        enumerable: true,
+        configurable: true
+    });
+    return C7_public;
+})();
diff --git a/tests/baselines/reference/privacyGloGetter.types b/tests/baselines/reference/privacyGloGetter.types
new file mode 100644
index 00000000000..053495077a2
--- /dev/null
+++ b/tests/baselines/reference/privacyGloGetter.types
@@ -0,0 +1,174 @@
+=== tests/cases/compiler/privacyGloGetter.ts ===
+module m1 {
+>m1 : m1
+
+    export class C1_public {
+>C1_public : C1_public
+
+        private f1() {
+>f1 : () => void
+        }
+    }
+
+    class C2_private {
+>C2_private : C2_private
+    }
+
+    export class C3_public {
+>C3_public : C3_public
+
+        private get p1_private() {
+>p1_private : C1_public
+
+            return new C1_public();
+>new C1_public() : C1_public
+>C1_public : typeof C1_public
+        }
+
+        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() {
+>p2_private : C1_public
+
+            return new C1_public();
+>new C1_public() : C1_public
+>C1_public : typeof C1_public
+        }
+
+        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() {
+>p3_private : C2_private
+
+            return new C2_private();
+>new C2_private() : C2_private
+>C2_private : typeof C2_private
+        }
+
+        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
+>C2_private : typeof C2_private
+        }
+
+        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
+        }
+    }
+
+    class C4_private {
+>C4_private : C4_private
+
+        private get p1_private() {
+>p1_private : C1_public
+
+            return new C1_public();
+>new C1_public() : C1_public
+>C1_public : typeof C1_public
+        }
+
+        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() {
+>p2_private : C1_public
+
+            return new C1_public();
+>new C1_public() : C1_public
+>C1_public : typeof C1_public
+        }
+
+        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() {
+>p3_private : C2_private
+
+            return new C2_private();
+>new C2_private() : C2_private
+>C2_private : typeof C2_private
+        }
+
+        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
+>C2_private : typeof C2_private
+        }
+
+        public set p4_public(m1_c3_p4_arg: C2_private) {
+>p4_public : C2_private
+>m1_c3_p4_arg : C2_private
+>C2_private : C2_private
+        }
+    }
+}
+
+class C6_public {
+>C6_public : C6_public
+}
+
+class C7_public {
+>C7_public : C7_public
+
+    private get p1_private() {
+>p1_private : C6_public
+
+        return new C6_public();
+>new C6_public() : C6_public
+>C6_public : typeof C6_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() {
+>p2_private : C6_public
+
+        return new C6_public();
+>new C6_public() : C6_public
+>C6_public : typeof C6_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.errors.txt b/tests/baselines/reference/privacyGloImport.errors.txt
index 38d31860a5b..cd5c19fa9d7 100644
--- a/tests/baselines/reference/privacyGloImport.errors.txt
+++ b/tests/baselines/reference/privacyGloImport.errors.txt
@@ -1,4 +1,4 @@
-==== tests/cases/compiler/privacyGloImport.ts (21 errors) ====
+==== tests/cases/compiler/privacyGloImport.ts (2 errors) ====
     module m1 {
         export module m1_M1_public {
             export class c1 {
@@ -20,27 +20,21 @@
             export var v2: c1;
         }
     
-        declare export module "m1_M3_public" {
-                ~~~~~~
-!!! 'export' modifier must precede 'declare' modifier.
-                              ~~~~~~~~~~~~~~
-!!! Ambient external modules cannot be nested in other modules.
-            export function f1();
-            export class c1 {
-            }
-            export var v1: { new (): c1; };
-            export var v2: c1;
-        }
+        //export declare module "m1_M3_public" {
+        //    export function f1();
+        //    export class c1 {
+        //    }
+        //    export var v1: { new (): c1; };
+        //    export var v2: c1;
+        //}
     
-        declare module "m1_M4_private" {
-                       ~~~~~~~~~~~~~~~
-!!! Ambient external modules cannot be nested in other modules.
-            export function f1();
-            export class c1 {
-            }
-            export var v1: { new (): c1; };
-            export var v2: c1;
-        }
+        //declare module "m1_M4_private" {
+        //    export function f1();
+        //    export class c1 {
+        //    }
+        //    export var v1: { new (): c1; };
+        //    export var v2: c1;
+        //}
     
         import m1_im1_private = m1_M1_public;
         export var m1_im1_private_v1_public = m1_im1_private.c1;
@@ -54,6 +48,8 @@
     
     
         import m1_im2_private = m1_M2_private;
+        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Import declaration 'm1_im2_private' is using private name 'm1_M2_private'.
         export var m1_im2_private_v1_public = m1_im2_private.c1;
         export var m1_im2_private_v2_public = new m1_im2_private.c1();
         export var m1_im2_private_v3_public = m1_im2_private.f1;
@@ -63,43 +59,32 @@
         var m1_im2_private_v3_private = m1_im2_private.f1;
         var m1_im2_private_v4_private = m1_im2_private.f1();
     
-        import m1_im3_private = require("m1_M3_public");
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Import declarations in an internal module cannot reference an external module.
-                                        ~~~~~~~~~~~~~~
-!!! Cannot find external module 'm1_M3_public'.
-        export var m1_im3_private_v1_public = m1_im3_private.c1;
-        export var m1_im3_private_v2_public = new m1_im3_private.c1();
-        export var m1_im3_private_v3_public = m1_im3_private.f1;
-        export var m1_im3_private_v4_public = m1_im3_private.f1();
-        var m1_im3_private_v1_private = m1_im3_private.c1;
-        var m1_im3_private_v2_private = new m1_im3_private.c1();
-        var m1_im3_private_v3_private = m1_im3_private.f1;
-        var m1_im3_private_v4_private = m1_im3_private.f1();
+        //import m1_im3_private = require("m1_M3_public");
+        //export var m1_im3_private_v1_public = m1_im3_private.c1;
+        //export var m1_im3_private_v2_public = new m1_im3_private.c1();
+        //export var m1_im3_private_v3_public = m1_im3_private.f1;
+        //export var m1_im3_private_v4_public = m1_im3_private.f1();
+        //var m1_im3_private_v1_private = m1_im3_private.c1;
+        //var m1_im3_private_v2_private = new m1_im3_private.c1();
+        //var m1_im3_private_v3_private = m1_im3_private.f1;
+        //var m1_im3_private_v4_private = m1_im3_private.f1();
     
-        import m1_im4_private = require("m1_M4_private");
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Import declarations in an internal module cannot reference an external module.
-                                        ~~~~~~~~~~~~~~~
-!!! Cannot find external module 'm1_M4_private'.
-        export var m1_im4_private_v1_public = m1_im4_private.c1;
-        export var m1_im4_private_v2_public = new m1_im4_private.c1();
-        export var m1_im4_private_v3_public = m1_im4_private.f1;
-        export var m1_im4_private_v4_public = m1_im4_private.f1();
-        var m1_im4_private_v1_private = m1_im4_private.c1;
-        var m1_im4_private_v2_private = new m1_im4_private.c1();
-        var m1_im4_private_v3_private = m1_im4_private.f1;
-        var m1_im4_private_v4_private = m1_im4_private.f1();
+        //import m1_im4_private = require("m1_M4_private");
+        //export var m1_im4_private_v1_public = m1_im4_private.c1;
+        //export var m1_im4_private_v2_public = new m1_im4_private.c1();
+        //export var m1_im4_private_v3_public = m1_im4_private.f1;
+        //export var m1_im4_private_v4_public = m1_im4_private.f1();
+        //var m1_im4_private_v1_private = m1_im4_private.c1;
+        //var m1_im4_private_v2_private = new m1_im4_private.c1();
+        //var m1_im4_private_v3_private = m1_im4_private.f1;
+        //var m1_im4_private_v4_private = m1_im4_private.f1();
     
-        // Parse error to export module
         export import m1_im1_public = m1_M1_public;
         export import m1_im2_public = m1_M2_private;
-        export import m1_im3_public = require("m1_M3_public");
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Import declarations in an internal module cannot reference an external module.
-        export import m1_im4_public = require("m1_M4_private");
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Import declarations in an internal module cannot reference an external module.
+        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Import declaration 'm1_im2_public' is using private name 'm1_M2_private'.
+        //export import m1_im3_public = require("m1_M3_public");
+        //export import m1_im4_public = require("m1_M4_private");
     }
     
     module glo_M1_public {
@@ -123,38 +108,26 @@
     declare module "use_glo_M1_public" {
         import use_glo_M1_public = glo_M1_public;
         export var use_glo_M1_public_v1_public: { new (): use_glo_M1_public.c1; };
-        export var use_glo_M1_public_v2_public: use_glo_M1_public;
-                                                ~~~~~~~~~~~~~~~~~
-!!! Cannot find name 'use_glo_M1_public'.
+        export var use_glo_M1_public_v2_public: typeof use_glo_M1_public;
         export var use_glo_M1_public_v3_public: ()=> use_glo_M1_public.c1;
         var use_glo_M1_public_v1_private: { new (): use_glo_M1_public.c1; };
-        var use_glo_M1_public_v2_private: use_glo_M1_public;
-                                          ~~~~~~~~~~~~~~~~~
-!!! Cannot find name 'use_glo_M1_public'.
+        var use_glo_M1_public_v2_private: typeof use_glo_M1_public;
         var use_glo_M1_public_v3_private: () => use_glo_M1_public.c1;
     
         import use_glo_M2_public = require("glo_M2_public");
         export var use_glo_M2_public_v1_public: { new (): use_glo_M2_public.c1; };
-        export var use_glo_M2_public_v2_public: use_glo_M2_public;
-                                                ~~~~~~~~~~~~~~~~~
-!!! Cannot find name 'use_glo_M2_public'.
+        export var use_glo_M2_public_v2_public: typeof use_glo_M2_public;
         export var use_glo_M2_public_v3_public: () => use_glo_M2_public.c1;
         var use_glo_M2_public_v1_private: { new (): use_glo_M2_public.c1; };
-        var use_glo_M2_public_v2_private: use_glo_M2_public;
-                                          ~~~~~~~~~~~~~~~~~
-!!! Cannot find name 'use_glo_M2_public'.
+        var use_glo_M2_public_v2_private: typeof use_glo_M2_public;
         var use_glo_M2_public_v3_private: () => use_glo_M2_public.c1;
     
         module m2 {
-            import errorImport = require("glo_M2_public");
-            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Import declarations in an internal module cannot reference an external module.
+            //import errorImport = require("glo_M2_public");
             import nonerrorImport = glo_M1_public;
     
             module m5 {
-                import m5_errorImport = require("glo_M2_public");
-                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Import declarations in an internal module cannot reference an external module.
+                //import m5_errorImport = require("glo_M2_public");
                 import m5_nonerrorImport = glo_M1_public;
             }
         }
@@ -162,35 +135,23 @@
     
     declare module "anotherParseError" {
         module m2 {
-            declare module "abc" {
-            ~~~~~~~
-!!! A 'declare' modifier cannot be used in an already ambient context.
-                           ~~~~~
-!!! Ambient external modules cannot be nested in other modules.
-            }
+            //declare module "abc" {
+            //}
         }
     
         module m2 {
-            module "abc2" {
-                   ~~~~~~
-!!! Ambient external modules cannot be nested in other modules.
-            }
-        }
-        module "abc3" {
-               ~~~~~~
-!!! Ambient external modules cannot be nested in other modules.
+            //module "abc2" {
+            //}
         }
+        //module "abc3" {
+        //}
     }
     
     module m2 {
-        import m3 = require("use_glo_M1_public");
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Import declarations in an internal module cannot reference an external module.
+        //import m3 = require("use_glo_M1_public");
         module m4 {
             var a = 10;
-            import m2 = require("use_glo_M1_public");
-            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Import declarations in an internal module cannot reference an external module.
+            //import m2 = require("use_glo_M1_public");
         }
     
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/privacyGloImport.js b/tests/baselines/reference/privacyGloImport.js
new file mode 100644
index 00000000000..db29e2ae2fa
--- /dev/null
+++ b/tests/baselines/reference/privacyGloImport.js
@@ -0,0 +1,263 @@
+//// [privacyGloImport.ts]
+module m1 {
+    export module m1_M1_public {
+        export class c1 {
+        }
+        export function f1() {
+            return new c1;
+        }
+        export var v1 = c1;
+        export var v2: c1;
+    }
+
+    module m1_M2_private {
+        export class c1 {
+        }
+        export function f1() {
+            return new c1;
+        }
+        export var v1 = c1;
+        export var v2: c1;
+    }
+
+    //export declare module "m1_M3_public" {
+    //    export function f1();
+    //    export class c1 {
+    //    }
+    //    export var v1: { new (): c1; };
+    //    export var v2: c1;
+    //}
+
+    //declare module "m1_M4_private" {
+    //    export function f1();
+    //    export class c1 {
+    //    }
+    //    export var v1: { new (): c1; };
+    //    export var v2: c1;
+    //}
+
+    import m1_im1_private = m1_M1_public;
+    export var m1_im1_private_v1_public = m1_im1_private.c1;
+    export var m1_im1_private_v2_public = new m1_im1_private.c1();
+    export var m1_im1_private_v3_public = m1_im1_private.f1;
+    export var m1_im1_private_v4_public = m1_im1_private.f1();
+    var m1_im1_private_v1_private = m1_im1_private.c1;
+    var m1_im1_private_v2_private = new m1_im1_private.c1();
+    var m1_im1_private_v3_private = m1_im1_private.f1;
+    var m1_im1_private_v4_private = m1_im1_private.f1();
+
+
+    import m1_im2_private = m1_M2_private;
+    export var m1_im2_private_v1_public = m1_im2_private.c1;
+    export var m1_im2_private_v2_public = new m1_im2_private.c1();
+    export var m1_im2_private_v3_public = m1_im2_private.f1;
+    export var m1_im2_private_v4_public = m1_im2_private.f1();
+    var m1_im2_private_v1_private = m1_im2_private.c1;
+    var m1_im2_private_v2_private = new m1_im2_private.c1();
+    var m1_im2_private_v3_private = m1_im2_private.f1;
+    var m1_im2_private_v4_private = m1_im2_private.f1();
+
+    //import m1_im3_private = require("m1_M3_public");
+    //export var m1_im3_private_v1_public = m1_im3_private.c1;
+    //export var m1_im3_private_v2_public = new m1_im3_private.c1();
+    //export var m1_im3_private_v3_public = m1_im3_private.f1;
+    //export var m1_im3_private_v4_public = m1_im3_private.f1();
+    //var m1_im3_private_v1_private = m1_im3_private.c1;
+    //var m1_im3_private_v2_private = new m1_im3_private.c1();
+    //var m1_im3_private_v3_private = m1_im3_private.f1;
+    //var m1_im3_private_v4_private = m1_im3_private.f1();
+
+    //import m1_im4_private = require("m1_M4_private");
+    //export var m1_im4_private_v1_public = m1_im4_private.c1;
+    //export var m1_im4_private_v2_public = new m1_im4_private.c1();
+    //export var m1_im4_private_v3_public = m1_im4_private.f1;
+    //export var m1_im4_private_v4_public = m1_im4_private.f1();
+    //var m1_im4_private_v1_private = m1_im4_private.c1;
+    //var m1_im4_private_v2_private = new m1_im4_private.c1();
+    //var m1_im4_private_v3_private = m1_im4_private.f1;
+    //var m1_im4_private_v4_private = m1_im4_private.f1();
+
+    export import m1_im1_public = m1_M1_public;
+    export import m1_im2_public = m1_M2_private;
+    //export import m1_im3_public = require("m1_M3_public");
+    //export import m1_im4_public = require("m1_M4_private");
+}
+
+module glo_M1_public {
+    export class c1 {
+    }
+    export function f1() {
+        return new c1;
+    }
+    export var v1 = c1;
+    export var v2: c1;
+}
+
+declare module "glo_M2_public" {
+    export function f1();
+    export class c1 {
+    }
+    export var v1: { new (): c1; };
+    export var v2: c1;
+}
+
+declare module "use_glo_M1_public" {
+    import use_glo_M1_public = glo_M1_public;
+    export var use_glo_M1_public_v1_public: { new (): use_glo_M1_public.c1; };
+    export var use_glo_M1_public_v2_public: typeof use_glo_M1_public;
+    export var use_glo_M1_public_v3_public: ()=> use_glo_M1_public.c1;
+    var use_glo_M1_public_v1_private: { new (): use_glo_M1_public.c1; };
+    var use_glo_M1_public_v2_private: typeof use_glo_M1_public;
+    var use_glo_M1_public_v3_private: () => use_glo_M1_public.c1;
+
+    import use_glo_M2_public = require("glo_M2_public");
+    export var use_glo_M2_public_v1_public: { new (): use_glo_M2_public.c1; };
+    export var use_glo_M2_public_v2_public: typeof use_glo_M2_public;
+    export var use_glo_M2_public_v3_public: () => use_glo_M2_public.c1;
+    var use_glo_M2_public_v1_private: { new (): use_glo_M2_public.c1; };
+    var use_glo_M2_public_v2_private: typeof use_glo_M2_public;
+    var use_glo_M2_public_v3_private: () => use_glo_M2_public.c1;
+
+    module m2 {
+        //import errorImport = require("glo_M2_public");
+        import nonerrorImport = glo_M1_public;
+
+        module m5 {
+            //import m5_errorImport = require("glo_M2_public");
+            import m5_nonerrorImport = glo_M1_public;
+        }
+    }
+}
+
+declare module "anotherParseError" {
+    module m2 {
+        //declare module "abc" {
+        //}
+    }
+
+    module m2 {
+        //module "abc2" {
+        //}
+    }
+    //module "abc3" {
+    //}
+}
+
+module m2 {
+    //import m3 = require("use_glo_M1_public");
+    module m4 {
+        var a = 10;
+        //import m2 = require("use_glo_M1_public");
+    }
+
+}
+
+//// [privacyGloImport.js]
+var m1;
+(function (m1) {
+    (function (m1_M1_public) {
+        var c1 = (function () {
+            function c1() {
+            }
+            return c1;
+        })();
+        m1_M1_public.c1 = c1;
+        function f1() {
+            return new c1;
+        }
+        m1_M1_public.f1 = f1;
+        m1_M1_public.v1 = c1;
+        m1_M1_public.v2;
+    })(m1.m1_M1_public || (m1.m1_M1_public = {}));
+    var m1_M1_public = m1.m1_M1_public;
+    var m1_M2_private;
+    (function (m1_M2_private) {
+        var c1 = (function () {
+            function c1() {
+            }
+            return c1;
+        })();
+        m1_M2_private.c1 = c1;
+        function f1() {
+            return new c1;
+        }
+        m1_M2_private.f1 = f1;
+        m1_M2_private.v1 = c1;
+        m1_M2_private.v2;
+    })(m1_M2_private || (m1_M2_private = {}));
+    //export declare module "m1_M3_public" {
+    //    export function f1();
+    //    export class c1 {
+    //    }
+    //    export var v1: { new (): c1; };
+    //    export var v2: c1;
+    //}
+    //declare module "m1_M4_private" {
+    //    export function f1();
+    //    export class c1 {
+    //    }
+    //    export var v1: { new (): c1; };
+    //    export var v2: c1;
+    //}
+    var m1_im1_private = m1_M1_public;
+    m1.m1_im1_private_v1_public = m1_im1_private.c1;
+    m1.m1_im1_private_v2_public = new m1_im1_private.c1();
+    m1.m1_im1_private_v3_public = m1_im1_private.f1;
+    m1.m1_im1_private_v4_public = m1_im1_private.f1();
+    var m1_im1_private_v1_private = m1_im1_private.c1;
+    var m1_im1_private_v2_private = new m1_im1_private.c1();
+    var m1_im1_private_v3_private = m1_im1_private.f1;
+    var m1_im1_private_v4_private = m1_im1_private.f1();
+    var m1_im2_private = m1_M2_private;
+    m1.m1_im2_private_v1_public = m1_im2_private.c1;
+    m1.m1_im2_private_v2_public = new m1_im2_private.c1();
+    m1.m1_im2_private_v3_public = m1_im2_private.f1;
+    m1.m1_im2_private_v4_public = m1_im2_private.f1();
+    var m1_im2_private_v1_private = m1_im2_private.c1;
+    var m1_im2_private_v2_private = new m1_im2_private.c1();
+    var m1_im2_private_v3_private = m1_im2_private.f1;
+    var m1_im2_private_v4_private = m1_im2_private.f1();
+    //import m1_im3_private = require("m1_M3_public");
+    //export var m1_im3_private_v1_public = m1_im3_private.c1;
+    //export var m1_im3_private_v2_public = new m1_im3_private.c1();
+    //export var m1_im3_private_v3_public = m1_im3_private.f1;
+    //export var m1_im3_private_v4_public = m1_im3_private.f1();
+    //var m1_im3_private_v1_private = m1_im3_private.c1;
+    //var m1_im3_private_v2_private = new m1_im3_private.c1();
+    //var m1_im3_private_v3_private = m1_im3_private.f1;
+    //var m1_im3_private_v4_private = m1_im3_private.f1();
+    //import m1_im4_private = require("m1_M4_private");
+    //export var m1_im4_private_v1_public = m1_im4_private.c1;
+    //export var m1_im4_private_v2_public = new m1_im4_private.c1();
+    //export var m1_im4_private_v3_public = m1_im4_private.f1;
+    //export var m1_im4_private_v4_public = m1_im4_private.f1();
+    //var m1_im4_private_v1_private = m1_im4_private.c1;
+    //var m1_im4_private_v2_private = new m1_im4_private.c1();
+    //var m1_im4_private_v3_private = m1_im4_private.f1;
+    //var m1_im4_private_v4_private = m1_im4_private.f1();
+    m1.m1_im1_public = m1_M1_public;
+    m1.m1_im2_public = m1_M2_private;
+})(m1 || (m1 = {}));
+var glo_M1_public;
+(function (glo_M1_public) {
+    var c1 = (function () {
+        function c1() {
+        }
+        return c1;
+    })();
+    glo_M1_public.c1 = c1;
+    function f1() {
+        return new c1;
+    }
+    glo_M1_public.f1 = f1;
+    glo_M1_public.v1 = c1;
+    glo_M1_public.v2;
+})(glo_M1_public || (glo_M1_public = {}));
+var m2;
+(function (m2) {
+    //import m3 = require("use_glo_M1_public");
+    var m4;
+    (function (m4) {
+        var a = 10;
+    })(m4 || (m4 = {}));
+})(m2 || (m2 = {}));
diff --git a/tests/baselines/reference/privacyGloImportParseErrors.errors.txt b/tests/baselines/reference/privacyGloImportParseErrors.errors.txt
new file mode 100644
index 00000000000..d681008e3b5
--- /dev/null
+++ b/tests/baselines/reference/privacyGloImportParseErrors.errors.txt
@@ -0,0 +1,185 @@
+==== tests/cases/compiler/privacyGloImportParseErrors.ts (16 errors) ====
+    module m1 {
+        export module m1_M1_public {
+            export class c1 {
+            }
+            export function f1() {
+                return new c1;
+            }
+            export var v1 = c1;
+            export var v2: c1;
+        }
+    
+        module m1_M2_private {
+            export class c1 {
+            }
+            export function f1() {
+                return new c1;
+            }
+            export var v1 = c1;
+            export var v2: c1;
+        }
+    
+        export declare module "m1_M3_public" {
+                              ~~~~~~~~~~~~~~
+!!! Ambient external modules cannot be nested in other modules.
+            export function f1();
+            export class c1 {
+            }
+            export var v1: { new (): c1; };
+            export var v2: c1;
+        }
+    
+        declare module "m1_M4_private" {
+                       ~~~~~~~~~~~~~~~
+!!! Ambient external modules cannot be nested in other modules.
+            export function f1();
+            export class c1 {
+            }
+            export var v1: { new (): c1; };
+            export var v2: c1;
+        }
+    
+        import m1_im1_private = m1_M1_public;
+        export var m1_im1_private_v1_public = m1_im1_private.c1;
+        export var m1_im1_private_v2_public = new m1_im1_private.c1();
+        export var m1_im1_private_v3_public = m1_im1_private.f1;
+        export var m1_im1_private_v4_public = m1_im1_private.f1();
+        var m1_im1_private_v1_private = m1_im1_private.c1;
+        var m1_im1_private_v2_private = new m1_im1_private.c1();
+        var m1_im1_private_v3_private = m1_im1_private.f1;
+        var m1_im1_private_v4_private = m1_im1_private.f1();
+    
+    
+        import m1_im2_private = m1_M2_private;
+        export var m1_im2_private_v1_public = m1_im2_private.c1;
+        export var m1_im2_private_v2_public = new m1_im2_private.c1();
+        export var m1_im2_private_v3_public = m1_im2_private.f1;
+        export var m1_im2_private_v4_public = m1_im2_private.f1();
+        var m1_im2_private_v1_private = m1_im2_private.c1;
+        var m1_im2_private_v2_private = new m1_im2_private.c1();
+        var m1_im2_private_v3_private = m1_im2_private.f1;
+        var m1_im2_private_v4_private = m1_im2_private.f1();
+    
+        import m1_im3_private = require("m1_M3_public");
+        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Import declarations in an internal module cannot reference an external module.
+                                        ~~~~~~~~~~~~~~
+!!! Cannot find external module 'm1_M3_public'.
+        export var m1_im3_private_v1_public = m1_im3_private.c1;
+        export var m1_im3_private_v2_public = new m1_im3_private.c1();
+        export var m1_im3_private_v3_public = m1_im3_private.f1;
+        export var m1_im3_private_v4_public = m1_im3_private.f1();
+        var m1_im3_private_v1_private = m1_im3_private.c1;
+        var m1_im3_private_v2_private = new m1_im3_private.c1();
+        var m1_im3_private_v3_private = m1_im3_private.f1;
+        var m1_im3_private_v4_private = m1_im3_private.f1();
+    
+        import m1_im4_private = require("m1_M4_private");
+        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Import declarations in an internal module cannot reference an external module.
+                                        ~~~~~~~~~~~~~~~
+!!! Cannot find external module 'm1_M4_private'.
+        export var m1_im4_private_v1_public = m1_im4_private.c1;
+        export var m1_im4_private_v2_public = new m1_im4_private.c1();
+        export var m1_im4_private_v3_public = m1_im4_private.f1;
+        export var m1_im4_private_v4_public = m1_im4_private.f1();
+        var m1_im4_private_v1_private = m1_im4_private.c1;
+        var m1_im4_private_v2_private = new m1_im4_private.c1();
+        var m1_im4_private_v3_private = m1_im4_private.f1;
+        var m1_im4_private_v4_private = m1_im4_private.f1();
+    
+        export import m1_im1_public = m1_M1_public;
+        export import m1_im2_public = m1_M2_private;
+        export import m1_im3_public = require("m1_M3_public");
+        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Import declarations in an internal module cannot reference an external module.
+        export import m1_im4_public = require("m1_M4_private");
+        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Import declarations in an internal module cannot reference an external module.
+    }
+    
+    module glo_M1_public {
+        export class c1 {
+        }
+        export function f1() {
+            return new c1;
+        }
+        export var v1 = c1;
+        export var v2: c1;
+    }
+    
+    declare module "glo_M2_public" {
+        export function f1();
+        export class c1 {
+        }
+        export var v1: { new (): c1; };
+        export var v2: c1;
+    }
+    
+    declare module "use_glo_M1_public" {
+        import use_glo_M1_public = glo_M1_public;
+        export var use_glo_M1_public_v1_public: { new (): use_glo_M1_public.c1; };
+        export var use_glo_M1_public_v2_public: typeof use_glo_M1_public;
+        export var use_glo_M1_public_v3_public: ()=> use_glo_M1_public.c1;
+        var use_glo_M1_public_v1_private: { new (): use_glo_M1_public.c1; };
+        var use_glo_M1_public_v2_private: typeof use_glo_M1_public;
+        var use_glo_M1_public_v3_private: () => use_glo_M1_public.c1;
+    
+        import use_glo_M2_public = require("glo_M2_public");
+        export var use_glo_M2_public_v1_public: { new (): use_glo_M2_public.c1; };
+        export var use_glo_M2_public_v2_public: typeof use_glo_M2_public;
+        export var use_glo_M2_public_v3_public: () => use_glo_M2_public.c1;
+        var use_glo_M2_public_v1_private: { new (): use_glo_M2_public.c1; };
+        var use_glo_M2_public_v2_private: typeof use_glo_M2_public;
+        var use_glo_M2_public_v3_private: () => use_glo_M2_public.c1;
+    
+        module m2 {
+            import errorImport = require("glo_M2_public");
+            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Import declarations in an internal module cannot reference an external module.
+            import nonerrorImport = glo_M1_public;
+    
+            module m5 {
+                import m5_errorImport = require("glo_M2_public");
+                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Import declarations in an internal module cannot reference an external module.
+                import m5_nonerrorImport = glo_M1_public;
+            }
+        }
+    }
+    
+    declare module "anotherParseError" {
+        module m2 {
+            declare module "abc" {
+            ~~~~~~~
+!!! A 'declare' modifier cannot be used in an already ambient context.
+                           ~~~~~
+!!! Ambient external modules cannot be nested in other modules.
+            }
+        }
+    
+        module m2 {
+            module "abc2" {
+                   ~~~~~~
+!!! Ambient external modules cannot be nested in other modules.
+            }
+        }
+        module "abc3" {
+               ~~~~~~
+!!! Ambient external modules cannot be nested in other modules.
+        }
+    }
+    
+    module m2 {
+        import m3 = require("use_glo_M1_public");
+        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Import declarations in an internal module cannot reference an external module.
+        module m4 {
+            var a = 10;
+            import m2 = require("use_glo_M1_public");
+            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Import declarations in an internal module cannot reference an external module.
+        }
+    
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/privacyImport.errors.txt b/tests/baselines/reference/privacyImport.errors.txt
index bb22a0c398c..a4ea4776a12 100644
--- a/tests/baselines/reference/privacyImport.errors.txt
+++ b/tests/baselines/reference/privacyImport.errors.txt
@@ -1,4 +1,4 @@
-==== tests/cases/compiler/privacyImport.ts (49 errors) ====
+==== tests/cases/compiler/privacyImport.ts (2 errors) ====
     export module m1 {
         export module m1_M1_public {
             export class c1 {
@@ -20,25 +20,21 @@
             export var v2: c1;
         }
     
-        export declare module "m1_M3_public" {
-                              ~~~~~~~~~~~~~~
-!!! Ambient external modules cannot be nested in other modules.
-            export function f1();
-            export class c1 {
-            }
-            export var v1: { new (): c1; };
-            export var v2: c1;
-        }
+        //export declare module "m1_M3_public" {
+        //    export function f1();
+        //    export class c1 {
+        //    }
+        //    export var v1: { new (): c1; };
+        //    export var v2: c1;
+        //}
     
-        declare module "m1_M4_private" {
-                       ~~~~~~~~~~~~~~~
-!!! Ambient external modules cannot be nested in other modules.
-            export function f1();
-            export class c1 {
-            }
-            export var v1: { new (): c1; };
-            export var v2: c1;
-        }
+        //declare module "m1_M4_private" {
+        //    export function f1();
+        //    export class c1 {
+        //    }
+        //    export var v1: { new (): c1; };
+        //    export var v2: c1;
+        //}
     
         import m1_im1_private = m1_M1_public;
         export var m1_im1_private_v1_public = m1_im1_private.c1;
@@ -52,6 +48,8 @@
     
     
         import m1_im2_private = m1_M2_private;
+        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Import declaration 'm1_im2_private' is using private name 'm1_M2_private'.
         export var m1_im2_private_v1_public = m1_im2_private.c1;
         export var m1_im2_private_v2_public = new m1_im2_private.c1();
         export var m1_im2_private_v3_public = m1_im2_private.f1;
@@ -61,42 +59,32 @@
         var m1_im2_private_v3_private = m1_im2_private.f1;
         var m1_im2_private_v4_private = m1_im2_private.f1();
     
-        import m1_im3_private = require("m1_M3_public");
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Import declarations in an internal module cannot reference an external module.
-                                        ~~~~~~~~~~~~~~
-!!! Cannot find external module 'm1_M3_public'.
-        export var m1_im3_private_v1_public = m1_im3_private.c1;
-        export var m1_im3_private_v2_public = new m1_im3_private.c1();
-        export var m1_im3_private_v3_public = m1_im3_private.f1;
-        export var m1_im3_private_v4_public = m1_im3_private.f1();
-        var m1_im3_private_v1_private = m1_im3_private.c1;
-        var m1_im3_private_v2_private = new m1_im3_private.c1();
-        var m1_im3_private_v3_private = m1_im3_private.f1;
-        var m1_im3_private_v4_private = m1_im3_private.f1();
+        //import m1_im3_private = require("m1_M3_public");
+        //export var m1_im3_private_v1_public = m1_im3_private.c1;
+        //export var m1_im3_private_v2_public = new m1_im3_private.c1();
+        //export var m1_im3_private_v3_public = m1_im3_private.f1;
+        //export var m1_im3_private_v4_public = m1_im3_private.f1();
+        //var m1_im3_private_v1_private = m1_im3_private.c1;
+        //var m1_im3_private_v2_private = new m1_im3_private.c1();
+        //var m1_im3_private_v3_private = m1_im3_private.f1;
+        //var m1_im3_private_v4_private = m1_im3_private.f1();
     
-        import m1_im4_private = require("m1_M4_private");
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Import declarations in an internal module cannot reference an external module.
-                                        ~~~~~~~~~~~~~~~
-!!! Cannot find external module 'm1_M4_private'.
-        export var m1_im4_private_v1_public = m1_im4_private.c1;
-        export var m1_im4_private_v2_public = new m1_im4_private.c1();
-        export var m1_im4_private_v3_public = m1_im4_private.f1;
-        export var m1_im4_private_v4_public = m1_im4_private.f1();
-        var m1_im4_private_v1_private = m1_im4_private.c1;
-        var m1_im4_private_v2_private = new m1_im4_private.c1();
-        var m1_im4_private_v3_private = m1_im4_private.f1;
-        var m1_im4_private_v4_private = m1_im4_private.f1();
+        //import m1_im4_private = require("m1_M4_private");
+        //export var m1_im4_private_v1_public = m1_im4_private.c1;
+        //export var m1_im4_private_v2_public = new m1_im4_private.c1();
+        //export var m1_im4_private_v3_public = m1_im4_private.f1;
+        //export var m1_im4_private_v4_public = m1_im4_private.f1();
+        //var m1_im4_private_v1_private = m1_im4_private.c1;
+        //var m1_im4_private_v2_private = new m1_im4_private.c1();
+        //var m1_im4_private_v3_private = m1_im4_private.f1;
+        //var m1_im4_private_v4_private = m1_im4_private.f1();
     
         export import m1_im1_public = m1_M1_public;
         export import m1_im2_public = m1_M2_private;
-        export import m1_im3_public = require("m1_M3_public");
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Import declarations in an internal module cannot reference an external module.
-        export import m1_im4_public = require("m1_M4_private");
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Import declarations in an internal module cannot reference an external module.
+        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Import declaration 'm1_im2_public' is using private name 'm1_M2_private'.
+        //export import m1_im3_public = require("m1_M3_public");
+        //export import m1_im4_public = require("m1_M4_private");
     }
     
     module m2 {
@@ -120,25 +108,21 @@
             export var v2: c1;
         }
     
-        export declare module "m2_M3_public" {
-                              ~~~~~~~~~~~~~~
-!!! Ambient external modules cannot be nested in other modules.
-            export function f1();
-            export class c1 {
-            }
-            export var v1: { new (): c1; };
-            export var v2: c1;
-        }
+        //export declare module "m2_M3_public" {
+        //    export function f1();
+        //    export class c1 {
+        //    }
+        //    export var v1: { new (): c1; };
+        //    export var v2: c1;
+        //}
     
-        declare module "m2_M4_private" {
-                       ~~~~~~~~~~~~~~~
-!!! Ambient external modules cannot be nested in other modules.
-            export function f1();
-            export class c1 {
-            }
-            export var v1: { new (): c1; };
-            export var v2: c1;
-        }
+        //declare module "m2_M4_private" {
+        //    export function f1();
+        //    export class c1 {
+        //    }
+        //    export var v1: { new (): c1; };
+        //    export var v2: c1;
+        //}
     
         import m1_im1_private = m2_M1_public;
         export var m1_im1_private_v1_public = m1_im1_private.c1;
@@ -161,43 +145,31 @@
         var m1_im2_private_v3_private = m1_im2_private.f1;
         var m1_im2_private_v4_private = m1_im2_private.f1();
     
-        import m1_im3_private = require("m2_M3_public");
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Import declarations in an internal module cannot reference an external module.
-                                        ~~~~~~~~~~~~~~
-!!! Cannot find external module 'm2_M3_public'.
-        export var m1_im3_private_v1_public = m1_im3_private.c1;
-        export var m1_im3_private_v2_public = new m1_im3_private.c1();
-        export var m1_im3_private_v3_public = m1_im3_private.f1;
-        export var m1_im3_private_v4_public = m1_im3_private.f1();
-        var m1_im3_private_v1_private = m1_im3_private.c1;
-        var m1_im3_private_v2_private = new m1_im3_private.c1();
-        var m1_im3_private_v3_private = m1_im3_private.f1;
-        var m1_im3_private_v4_private = m1_im3_private.f1();
+        //import m1_im3_private = require("m2_M3_public");
+        //export var m1_im3_private_v1_public = m1_im3_private.c1;
+        //export var m1_im3_private_v2_public = new m1_im3_private.c1();
+        //export var m1_im3_private_v3_public = m1_im3_private.f1;
+        //export var m1_im3_private_v4_public = m1_im3_private.f1();
+        //var m1_im3_private_v1_private = m1_im3_private.c1;
+        //var m1_im3_private_v2_private = new m1_im3_private.c1();
+        //var m1_im3_private_v3_private = m1_im3_private.f1;
+        //var m1_im3_private_v4_private = m1_im3_private.f1();
     
-        import m1_im4_private = require("m2_M4_private");
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Import declarations in an internal module cannot reference an external module.
-                                        ~~~~~~~~~~~~~~~
-!!! Cannot find external module 'm2_M4_private'.
-        export var m1_im4_private_v1_public = m1_im4_private.c1;
-        export var m1_im4_private_v2_public = new m1_im4_private.c1();
-        export var m1_im4_private_v3_public = m1_im4_private.f1;
-        export var m1_im4_private_v4_public = m1_im4_private.f1();
-        var m1_im4_private_v1_private = m1_im4_private.c1;
-        var m1_im4_private_v2_private = new m1_im4_private.c1();
-        var m1_im4_private_v3_private = m1_im4_private.f1;
-        var m1_im4_private_v4_private = m1_im4_private.f1();
+        //import m1_im4_private = require("m2_M4_private");
+        //export var m1_im4_private_v1_public = m1_im4_private.c1;
+        //export var m1_im4_private_v2_public = new m1_im4_private.c1();
+        //export var m1_im4_private_v3_public = m1_im4_private.f1;
+        //export var m1_im4_private_v4_public = m1_im4_private.f1();
+        //var m1_im4_private_v1_private = m1_im4_private.c1;
+        //var m1_im4_private_v2_private = new m1_im4_private.c1();
+        //var m1_im4_private_v3_private = m1_im4_private.f1;
+        //var m1_im4_private_v4_private = m1_im4_private.f1();
     
         // Parse error to export module
         export import m1_im1_public = m2_M1_public;
         export import m1_im2_public = m2_M2_private;
-        export import m1_im3_public = require("m2_M3_public");
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Import declarations in an internal module cannot reference an external module.
-        export import m1_im4_public = require("m2_M4_private");
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Import declarations in an internal module cannot reference an external module.
+        //export import m1_im3_public = require("m2_M3_public");
+        //export import m1_im4_public = require("m2_M4_private");
     }
     
     export module glo_M1_public {
@@ -210,15 +182,13 @@
         export var v2: c1;
     }
     
-    export declare module "glo_M2_public" {
-                          ~~~~~~~~~~~~~~~
-!!! Ambient external modules cannot be nested in other modules.
-        export function f1();
-        export class c1 {
-        }
-        export var v1: { new (): c1; };
-        export var v2: c1;
-    }
+    //export declare module "glo_M2_public" {
+    //    export function f1();
+    //    export class c1 {
+    //    }
+    //    export var v1: { new (): c1; };
+    //    export var v2: c1;
+    //}
     
     export module glo_M3_private {
         export class c1 {
@@ -230,15 +200,13 @@
         export var v2: c1;
     }
     
-    export declare module "glo_M4_private" {
-                          ~~~~~~~~~~~~~~~~
-!!! Ambient external modules cannot be nested in other modules.
-        export function f1();
-        export class c1 {
-        }
-        export var v1: { new (): c1; };
-        export var v2: c1;
-    }
+    //export declare module "glo_M4_private" {
+    //    export function f1();
+    //    export class c1 {
+    //    }
+    //    export var v1: { new (): c1; };
+    //    export var v2: c1;
+    //}
     
     
     import glo_im1_private = glo_M1_public;
@@ -252,17 +220,15 @@
     var glo_im1_private_v4_private = glo_im1_private.f1();
     
     
-    import glo_im2_private = require("glo_M2_public");
-                                     ~~~~~~~~~~~~~~~
-!!! Cannot find external module 'glo_M2_public'.
-    export var glo_im2_private_v1_public = glo_im2_private.c1;
-    export var glo_im2_private_v2_public = new glo_im2_private.c1();
-    export var glo_im2_private_v3_public = glo_im2_private.f1;
-    export var glo_im2_private_v4_public = glo_im2_private.f1();
-    var glo_im2_private_v1_private = glo_im2_private.c1;
-    var glo_im2_private_v2_private = new glo_im2_private.c1();
-    var glo_im2_private_v3_private = glo_im2_private.f1;
-    var glo_im2_private_v4_private = glo_im2_private.f1();
+    //import glo_im2_private = require("glo_M2_public");
+    //export var glo_im2_private_v1_public = glo_im2_private.c1;
+    //export var glo_im2_private_v2_public = new glo_im2_private.c1();
+    //export var glo_im2_private_v3_public = glo_im2_private.f1;
+    //export var glo_im2_private_v4_public = glo_im2_private.f1();
+    //var glo_im2_private_v1_private = glo_im2_private.c1;
+    //var glo_im2_private_v2_private = new glo_im2_private.c1();
+    //var glo_im2_private_v3_private = glo_im2_private.f1;
+    //var glo_im2_private_v4_private = glo_im2_private.f1();
     
     import glo_im3_private = glo_M3_private;
     export var glo_im3_private_v1_public = glo_im3_private.c1;
@@ -274,182 +240,122 @@
     var glo_im3_private_v3_private = glo_im3_private.f1;
     var glo_im3_private_v4_private = glo_im3_private.f1();
     
-    import glo_im4_private = require("glo_M4_private");
-                                     ~~~~~~~~~~~~~~~~
-!!! Cannot find external module 'glo_M4_private'.
-    export var glo_im4_private_v1_public = glo_im4_private.c1;
-    export var glo_im4_private_v2_public = new glo_im4_private.c1();
-    export var glo_im4_private_v3_public = glo_im4_private.f1;
-    export var glo_im4_private_v4_public = glo_im4_private.f1();
-    var glo_im4_private_v1_private = glo_im4_private.c1;
-    var glo_im4_private_v2_private = new glo_im4_private.c1();
-    var glo_im4_private_v3_private = glo_im4_private.f1;
-    var glo_im4_private_v4_private = glo_im4_private.f1();
+    //import glo_im4_private = require("glo_M4_private");
+    //export var glo_im4_private_v1_public = glo_im4_private.c1;
+    //export var glo_im4_private_v2_public = new glo_im4_private.c1();
+    //export var glo_im4_private_v3_public = glo_im4_private.f1;
+    //export var glo_im4_private_v4_public = glo_im4_private.f1();
+    //var glo_im4_private_v1_private = glo_im4_private.c1;
+    //var glo_im4_private_v2_private = new glo_im4_private.c1();
+    //var glo_im4_private_v3_private = glo_im4_private.f1;
+    //var glo_im4_private_v4_private = glo_im4_private.f1();
     
     // Parse error to export module
     export import glo_im1_public = glo_M1_public;
     export import glo_im2_public = glo_M3_private;
-    export import glo_im3_public = require("glo_M2_public");
-                                           ~~~~~~~~~~~~~~~
-!!! Cannot find external module 'glo_M2_public'.
-    export import glo_im4_public = require("glo_M4_private");
-                                           ~~~~~~~~~~~~~~~~
-!!! Cannot find external module 'glo_M4_private'.
+    //export import glo_im3_public = require("glo_M2_public");
+    //export import glo_im4_public = require("glo_M4_private");
     
     
-    export declare module "use_glo_M1_public" {
-                          ~~~~~~~~~~~~~~~~~~~
-!!! Ambient external modules cannot be nested in other modules.
-        import use_glo_M1_public = glo_M1_public;
-        export var use_glo_M1_public_v1_public: { new (): use_glo_M1_public.c1; };
-        export var use_glo_M1_public_v2_public: use_glo_M1_public;
-                                                ~~~~~~~~~~~~~~~~~
-!!! Cannot find name 'use_glo_M1_public'.
-        export var use_glo_M1_public_v3_public: () => use_glo_M1_public.c1;
-        var use_glo_M1_public_v1_private: { new (): use_glo_M1_public.c1; };
-        var use_glo_M1_public_v2_private: use_glo_M1_public;
-                                          ~~~~~~~~~~~~~~~~~
-!!! Cannot find name 'use_glo_M1_public'.
-        var use_glo_M1_public_v3_private: () => use_glo_M1_public.c1;
+    //export declare module "use_glo_M1_public" {
+    //    import use_glo_M1_public = glo_M1_public;
+    //    export var use_glo_M1_public_v1_public: { new (): use_glo_M1_public.c1; };
+    //    export var use_glo_M1_public_v2_public: use_glo_M1_public;
+    //    export var use_glo_M1_public_v3_public: () => use_glo_M1_public.c1;
+    //    var use_glo_M1_public_v1_private: { new (): use_glo_M1_public.c1; };
+    //    var use_glo_M1_public_v2_private: use_glo_M1_public;
+    //    var use_glo_M1_public_v3_private: () => use_glo_M1_public.c1;
     
-        import use_glo_M2_public = require("glo_M2_public");
-                                           ~~~~~~~~~~~~~~~
-!!! Cannot find external module 'glo_M2_public'.
-        export var use_glo_M2_public_v1_public: { new (): use_glo_M2_public.c1; };
-        export var use_glo_M2_public_v2_public: use_glo_M2_public;
-        export var use_glo_M2_public_v3_public: () => use_glo_M2_public.c1;
-        var use_glo_M2_public_v1_private: { new (): use_glo_M2_public.c1; };
-        var use_glo_M2_public_v2_private: use_glo_M2_public;
-        var use_glo_M2_public_v3_private: () => use_glo_M2_public.c1;
+    //    import use_glo_M2_public = require("glo_M2_public");
+    //    export var use_glo_M2_public_v1_public: { new (): use_glo_M2_public.c1; };
+    //    export var use_glo_M2_public_v2_public: use_glo_M2_public;
+    //    export var use_glo_M2_public_v3_public: () => use_glo_M2_public.c1;
+    //    var use_glo_M2_public_v1_private: { new (): use_glo_M2_public.c1; };
+    //    var use_glo_M2_public_v2_private: use_glo_M2_public;
+    //    var use_glo_M2_public_v3_private: () => use_glo_M2_public.c1;
     
-        module m2 {
-            import errorImport = require("glo_M2_public");
-            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Import declarations in an internal module cannot reference an external module.
-            import nonerrorImport = glo_M1_public;
+    //    module m2 {
+    //        import errorImport = require("glo_M2_public");
+    //        import nonerrorImport = glo_M1_public;
     
-            module m5 {
-                import m5_errorImport = require("glo_M2_public");
-                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Import declarations in an internal module cannot reference an external module.
-                import m5_nonerrorImport = glo_M1_public;
-            }
-        }
-    }
+    //        module m5 {
+    //            import m5_errorImport = require("glo_M2_public");
+    //            import m5_nonerrorImport = glo_M1_public;
+    //        }
+    //    }
+    //}
     
     
-    declare module "use_glo_M3_private" {
-                   ~~~~~~~~~~~~~~~~~~~~
-!!! Ambient external modules cannot be nested in other modules.
-        import use_glo_M3_private = glo_M3_private;
-        export var use_glo_M3_private_v1_public: { new (): use_glo_M3_private.c1; };
-        export var use_glo_M3_private_v2_public: use_glo_M3_private;
-                                                 ~~~~~~~~~~~~~~~~~~
-!!! Cannot find name 'use_glo_M3_private'.
-        export var use_glo_M3_private_v3_public: () => use_glo_M3_private.c1;
-        var use_glo_M3_private_v1_private: { new (): use_glo_M3_private.c1; };
-        var use_glo_M3_private_v2_private: use_glo_M3_private;
-                                           ~~~~~~~~~~~~~~~~~~
-!!! Cannot find name 'use_glo_M3_private'.
-        var use_glo_M3_private_v3_private: () => use_glo_M3_private.c1;
+    //declare module "use_glo_M3_private" {
+    //    import use_glo_M3_private = glo_M3_private;
+    //    export var use_glo_M3_private_v1_public: { new (): use_glo_M3_private.c1; };
+    //    export var use_glo_M3_private_v2_public: use_glo_M3_private;
+    //    export var use_glo_M3_private_v3_public: () => use_glo_M3_private.c1;
+    //    var use_glo_M3_private_v1_private: { new (): use_glo_M3_private.c1; };
+    //    var use_glo_M3_private_v2_private: use_glo_M3_private;
+    //    var use_glo_M3_private_v3_private: () => use_glo_M3_private.c1;
     
-        import use_glo_M4_private = require("glo_M4_private");
-                                            ~~~~~~~~~~~~~~~~
-!!! Cannot find external module 'glo_M4_private'.
-        export var use_glo_M4_private_v1_public: { new (): use_glo_M4_private.c1; };
-        export var use_glo_M4_private_v2_public: use_glo_M4_private;
-        export var use_glo_M4_private_v3_public: () => use_glo_M4_private.c1;
-        var use_glo_M4_private_v1_private: { new (): use_glo_M4_private.c1; };
-        var use_glo_M4_private_v2_private: use_glo_M4_private;
-        var use_glo_M4_private_v3_private: () => use_glo_M4_private.c1;
+    //    import use_glo_M4_private = require("glo_M4_private");
+    //    export var use_glo_M4_private_v1_public: { new (): use_glo_M4_private.c1; };
+    //    export var use_glo_M4_private_v2_public: use_glo_M4_private;
+    //    export var use_glo_M4_private_v3_public: () => use_glo_M4_private.c1;
+    //    var use_glo_M4_private_v1_private: { new (): use_glo_M4_private.c1; };
+    //    var use_glo_M4_private_v2_private: use_glo_M4_private;
+    //    var use_glo_M4_private_v3_private: () => use_glo_M4_private.c1;
     
-        module m2 {
-            import errorImport = require("glo_M4_private");
-            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Import declarations in an internal module cannot reference an external module.
-            import nonerrorImport = glo_M3_private;
+    //    module m2 {
+    //        import errorImport = require("glo_M4_private");
+    //        import nonerrorImport = glo_M3_private;
     
-            module m5 {
-                import m5_errorImport = require("glo_M4_private");
-                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Import declarations in an internal module cannot reference an external module.
-                import m5_nonerrorImport = glo_M3_private;
-            }
-        }
-    }
+    //        module m5 {
+    //            import m5_errorImport = require("glo_M4_private");
+    //            import m5_nonerrorImport = glo_M3_private;
+    //        }
+    //    }
+    //}
     
-    declare module "anotherParseError" {
-                   ~~~~~~~~~~~~~~~~~~~
-!!! Ambient external modules cannot be nested in other modules.
-        module m2 {
-            declare module "abc" {
-            ~~~~~~~
-!!! A 'declare' modifier cannot be used in an already ambient context.
-                           ~~~~~
-!!! Ambient external modules cannot be nested in other modules.
-            }
-        }
+    //declare module "anotherParseError" {
+    //    module m2 {
+    //        declare module "abc" {
+    //        }
+    //    }
     
-        module m2 {
-            module "abc2" {
-                   ~~~~~~
-!!! Ambient external modules cannot be nested in other modules.
-            }
-        }
-        module "abc3" {
-               ~~~~~~
-!!! Ambient external modules cannot be nested in other modules.
-        }
-    }
+    //    module m2 {
+    //        module "abc2" {
+    //        }
+    //    }
+    //    module "abc3" {
+    //    }
+    //}
     
-    declare export module "anotherParseError2" {
-            ~~~~~~
-!!! 'export' modifier must precede 'declare' modifier.
-                          ~~~~~~~~~~~~~~~~~~~~
-!!! Ambient external modules cannot be nested in other modules.
-        module m2 {
-            declare module "abc" {
-            ~~~~~~~
-!!! A 'declare' modifier cannot be used in an already ambient context.
-                           ~~~~~
-!!! Ambient external modules cannot be nested in other modules.
-            }
-        }
+    //declare export module "anotherParseError2" {
+    //    module m2 {
+    //        declare module "abc" {
+    //        }
+    //    }
     
-        module m2 {
-            module "abc2" {
-                   ~~~~~~
-!!! Ambient external modules cannot be nested in other modules.
-            }
-        }
-        module "abc3" {
-               ~~~~~~
-!!! Ambient external modules cannot be nested in other modules.
-        }
-    }
+    //    module m2 {
+    //        module "abc2" {
+    //        }
+    //    }
+    //    module "abc3" {
+    //    }
+    //}
     
     module m2 {
-        import m3 = require("use_glo_M1_public");
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Import declarations in an internal module cannot reference an external module.
+        //import m3 = require("use_glo_M1_public");
         module m4 {
             var a = 10;
-            import m2 = require("use_glo_M1_public");
-            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Import declarations in an internal module cannot reference an external module.
+            //import m2 = require("use_glo_M1_public");
         }
     
     }
     
     export module m3 {
-        import m3 = require("use_glo_M1_public");
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Import declarations in an internal module cannot reference an external module.
+        //import m3 = require("use_glo_M1_public");
         module m4 {
             var a = 10;
-            import m2 = require("use_glo_M1_public");
-            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Import declarations in an internal module cannot reference an external module.
+            //import m2 = require("use_glo_M1_public");
         }
     
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/privacyImport.js b/tests/baselines/reference/privacyImport.js
new file mode 100644
index 00000000000..c093903106e
--- /dev/null
+++ b/tests/baselines/reference/privacyImport.js
@@ -0,0 +1,703 @@
+//// [privacyImport.ts]
+export module m1 {
+    export module m1_M1_public {
+        export class c1 {
+        }
+        export function f1() {
+            return new c1;
+        }
+        export var v1 = c1;
+        export var v2: c1;
+    }
+
+    module m1_M2_private {
+        export class c1 {
+        }
+        export function f1() {
+            return new c1;
+        }
+        export var v1 = c1;
+        export var v2: c1;
+    }
+
+    //export declare module "m1_M3_public" {
+    //    export function f1();
+    //    export class c1 {
+    //    }
+    //    export var v1: { new (): c1; };
+    //    export var v2: c1;
+    //}
+
+    //declare module "m1_M4_private" {
+    //    export function f1();
+    //    export class c1 {
+    //    }
+    //    export var v1: { new (): c1; };
+    //    export var v2: c1;
+    //}
+
+    import m1_im1_private = m1_M1_public;
+    export var m1_im1_private_v1_public = m1_im1_private.c1;
+    export var m1_im1_private_v2_public = new m1_im1_private.c1();
+    export var m1_im1_private_v3_public = m1_im1_private.f1;
+    export var m1_im1_private_v4_public = m1_im1_private.f1();
+    var m1_im1_private_v1_private = m1_im1_private.c1;
+    var m1_im1_private_v2_private = new m1_im1_private.c1();
+    var m1_im1_private_v3_private = m1_im1_private.f1;
+    var m1_im1_private_v4_private = m1_im1_private.f1();
+
+
+    import m1_im2_private = m1_M2_private;
+    export var m1_im2_private_v1_public = m1_im2_private.c1;
+    export var m1_im2_private_v2_public = new m1_im2_private.c1();
+    export var m1_im2_private_v3_public = m1_im2_private.f1;
+    export var m1_im2_private_v4_public = m1_im2_private.f1();
+    var m1_im2_private_v1_private = m1_im2_private.c1;
+    var m1_im2_private_v2_private = new m1_im2_private.c1();
+    var m1_im2_private_v3_private = m1_im2_private.f1;
+    var m1_im2_private_v4_private = m1_im2_private.f1();
+
+    //import m1_im3_private = require("m1_M3_public");
+    //export var m1_im3_private_v1_public = m1_im3_private.c1;
+    //export var m1_im3_private_v2_public = new m1_im3_private.c1();
+    //export var m1_im3_private_v3_public = m1_im3_private.f1;
+    //export var m1_im3_private_v4_public = m1_im3_private.f1();
+    //var m1_im3_private_v1_private = m1_im3_private.c1;
+    //var m1_im3_private_v2_private = new m1_im3_private.c1();
+    //var m1_im3_private_v3_private = m1_im3_private.f1;
+    //var m1_im3_private_v4_private = m1_im3_private.f1();
+
+    //import m1_im4_private = require("m1_M4_private");
+    //export var m1_im4_private_v1_public = m1_im4_private.c1;
+    //export var m1_im4_private_v2_public = new m1_im4_private.c1();
+    //export var m1_im4_private_v3_public = m1_im4_private.f1;
+    //export var m1_im4_private_v4_public = m1_im4_private.f1();
+    //var m1_im4_private_v1_private = m1_im4_private.c1;
+    //var m1_im4_private_v2_private = new m1_im4_private.c1();
+    //var m1_im4_private_v3_private = m1_im4_private.f1;
+    //var m1_im4_private_v4_private = m1_im4_private.f1();
+
+    export import m1_im1_public = m1_M1_public;
+    export import m1_im2_public = m1_M2_private;
+    //export import m1_im3_public = require("m1_M3_public");
+    //export import m1_im4_public = require("m1_M4_private");
+}
+
+module m2 {
+    export module m2_M1_public {
+        export class c1 {
+        }
+        export function f1() {
+            return new c1;
+        }
+        export var v1 = c1;
+        export var v2: c1;
+    }
+
+    module m2_M2_private {
+        export class c1 {
+        }
+        export function f1() {
+            return new c1;
+        }
+        export var v1 = c1;
+        export var v2: c1;
+    }
+
+    //export declare module "m2_M3_public" {
+    //    export function f1();
+    //    export class c1 {
+    //    }
+    //    export var v1: { new (): c1; };
+    //    export var v2: c1;
+    //}
+
+    //declare module "m2_M4_private" {
+    //    export function f1();
+    //    export class c1 {
+    //    }
+    //    export var v1: { new (): c1; };
+    //    export var v2: c1;
+    //}
+
+    import m1_im1_private = m2_M1_public;
+    export var m1_im1_private_v1_public = m1_im1_private.c1;
+    export var m1_im1_private_v2_public = new m1_im1_private.c1();
+    export var m1_im1_private_v3_public = m1_im1_private.f1;
+    export var m1_im1_private_v4_public = m1_im1_private.f1();
+    var m1_im1_private_v1_private = m1_im1_private.c1;
+    var m1_im1_private_v2_private = new m1_im1_private.c1();
+    var m1_im1_private_v3_private = m1_im1_private.f1;
+    var m1_im1_private_v4_private = m1_im1_private.f1();
+
+
+    import m1_im2_private = m2_M2_private;
+    export var m1_im2_private_v1_public = m1_im2_private.c1;
+    export var m1_im2_private_v2_public = new m1_im2_private.c1();
+    export var m1_im2_private_v3_public = m1_im2_private.f1;
+    export var m1_im2_private_v4_public = m1_im2_private.f1();
+    var m1_im2_private_v1_private = m1_im2_private.c1;
+    var m1_im2_private_v2_private = new m1_im2_private.c1();
+    var m1_im2_private_v3_private = m1_im2_private.f1;
+    var m1_im2_private_v4_private = m1_im2_private.f1();
+
+    //import m1_im3_private = require("m2_M3_public");
+    //export var m1_im3_private_v1_public = m1_im3_private.c1;
+    //export var m1_im3_private_v2_public = new m1_im3_private.c1();
+    //export var m1_im3_private_v3_public = m1_im3_private.f1;
+    //export var m1_im3_private_v4_public = m1_im3_private.f1();
+    //var m1_im3_private_v1_private = m1_im3_private.c1;
+    //var m1_im3_private_v2_private = new m1_im3_private.c1();
+    //var m1_im3_private_v3_private = m1_im3_private.f1;
+    //var m1_im3_private_v4_private = m1_im3_private.f1();
+
+    //import m1_im4_private = require("m2_M4_private");
+    //export var m1_im4_private_v1_public = m1_im4_private.c1;
+    //export var m1_im4_private_v2_public = new m1_im4_private.c1();
+    //export var m1_im4_private_v3_public = m1_im4_private.f1;
+    //export var m1_im4_private_v4_public = m1_im4_private.f1();
+    //var m1_im4_private_v1_private = m1_im4_private.c1;
+    //var m1_im4_private_v2_private = new m1_im4_private.c1();
+    //var m1_im4_private_v3_private = m1_im4_private.f1;
+    //var m1_im4_private_v4_private = m1_im4_private.f1();
+
+    // Parse error to export module
+    export import m1_im1_public = m2_M1_public;
+    export import m1_im2_public = m2_M2_private;
+    //export import m1_im3_public = require("m2_M3_public");
+    //export import m1_im4_public = require("m2_M4_private");
+}
+
+export module glo_M1_public {
+    export class c1 {
+    }
+    export function f1() {
+        return new c1;
+    }
+    export var v1 = c1;
+    export var v2: c1;
+}
+
+//export declare module "glo_M2_public" {
+//    export function f1();
+//    export class c1 {
+//    }
+//    export var v1: { new (): c1; };
+//    export var v2: c1;
+//}
+
+export module glo_M3_private {
+    export class c1 {
+    }
+    export function f1() {
+        return new c1;
+    }
+    export var v1 = c1;
+    export var v2: c1;
+}
+
+//export declare module "glo_M4_private" {
+//    export function f1();
+//    export class c1 {
+//    }
+//    export var v1: { new (): c1; };
+//    export var v2: c1;
+//}
+
+
+import glo_im1_private = glo_M1_public;
+export var glo_im1_private_v1_public = glo_im1_private.c1;
+export var glo_im1_private_v2_public = new glo_im1_private.c1();
+export var glo_im1_private_v3_public = glo_im1_private.f1;
+export var glo_im1_private_v4_public = glo_im1_private.f1();
+var glo_im1_private_v1_private = glo_im1_private.c1;
+var glo_im1_private_v2_private = new glo_im1_private.c1();
+var glo_im1_private_v3_private = glo_im1_private.f1;
+var glo_im1_private_v4_private = glo_im1_private.f1();
+
+
+//import glo_im2_private = require("glo_M2_public");
+//export var glo_im2_private_v1_public = glo_im2_private.c1;
+//export var glo_im2_private_v2_public = new glo_im2_private.c1();
+//export var glo_im2_private_v3_public = glo_im2_private.f1;
+//export var glo_im2_private_v4_public = glo_im2_private.f1();
+//var glo_im2_private_v1_private = glo_im2_private.c1;
+//var glo_im2_private_v2_private = new glo_im2_private.c1();
+//var glo_im2_private_v3_private = glo_im2_private.f1;
+//var glo_im2_private_v4_private = glo_im2_private.f1();
+
+import glo_im3_private = glo_M3_private;
+export var glo_im3_private_v1_public = glo_im3_private.c1;
+export var glo_im3_private_v2_public = new glo_im3_private.c1();
+export var glo_im3_private_v3_public = glo_im3_private.f1;
+export var glo_im3_private_v4_public = glo_im3_private.f1();
+var glo_im3_private_v1_private = glo_im3_private.c1;
+var glo_im3_private_v2_private = new glo_im3_private.c1();
+var glo_im3_private_v3_private = glo_im3_private.f1;
+var glo_im3_private_v4_private = glo_im3_private.f1();
+
+//import glo_im4_private = require("glo_M4_private");
+//export var glo_im4_private_v1_public = glo_im4_private.c1;
+//export var glo_im4_private_v2_public = new glo_im4_private.c1();
+//export var glo_im4_private_v3_public = glo_im4_private.f1;
+//export var glo_im4_private_v4_public = glo_im4_private.f1();
+//var glo_im4_private_v1_private = glo_im4_private.c1;
+//var glo_im4_private_v2_private = new glo_im4_private.c1();
+//var glo_im4_private_v3_private = glo_im4_private.f1;
+//var glo_im4_private_v4_private = glo_im4_private.f1();
+
+// Parse error to export module
+export import glo_im1_public = glo_M1_public;
+export import glo_im2_public = glo_M3_private;
+//export import glo_im3_public = require("glo_M2_public");
+//export import glo_im4_public = require("glo_M4_private");
+
+
+//export declare module "use_glo_M1_public" {
+//    import use_glo_M1_public = glo_M1_public;
+//    export var use_glo_M1_public_v1_public: { new (): use_glo_M1_public.c1; };
+//    export var use_glo_M1_public_v2_public: use_glo_M1_public;
+//    export var use_glo_M1_public_v3_public: () => use_glo_M1_public.c1;
+//    var use_glo_M1_public_v1_private: { new (): use_glo_M1_public.c1; };
+//    var use_glo_M1_public_v2_private: use_glo_M1_public;
+//    var use_glo_M1_public_v3_private: () => use_glo_M1_public.c1;
+
+//    import use_glo_M2_public = require("glo_M2_public");
+//    export var use_glo_M2_public_v1_public: { new (): use_glo_M2_public.c1; };
+//    export var use_glo_M2_public_v2_public: use_glo_M2_public;
+//    export var use_glo_M2_public_v3_public: () => use_glo_M2_public.c1;
+//    var use_glo_M2_public_v1_private: { new (): use_glo_M2_public.c1; };
+//    var use_glo_M2_public_v2_private: use_glo_M2_public;
+//    var use_glo_M2_public_v3_private: () => use_glo_M2_public.c1;
+
+//    module m2 {
+//        import errorImport = require("glo_M2_public");
+//        import nonerrorImport = glo_M1_public;
+
+//        module m5 {
+//            import m5_errorImport = require("glo_M2_public");
+//            import m5_nonerrorImport = glo_M1_public;
+//        }
+//    }
+//}
+
+
+//declare module "use_glo_M3_private" {
+//    import use_glo_M3_private = glo_M3_private;
+//    export var use_glo_M3_private_v1_public: { new (): use_glo_M3_private.c1; };
+//    export var use_glo_M3_private_v2_public: use_glo_M3_private;
+//    export var use_glo_M3_private_v3_public: () => use_glo_M3_private.c1;
+//    var use_glo_M3_private_v1_private: { new (): use_glo_M3_private.c1; };
+//    var use_glo_M3_private_v2_private: use_glo_M3_private;
+//    var use_glo_M3_private_v3_private: () => use_glo_M3_private.c1;
+
+//    import use_glo_M4_private = require("glo_M4_private");
+//    export var use_glo_M4_private_v1_public: { new (): use_glo_M4_private.c1; };
+//    export var use_glo_M4_private_v2_public: use_glo_M4_private;
+//    export var use_glo_M4_private_v3_public: () => use_glo_M4_private.c1;
+//    var use_glo_M4_private_v1_private: { new (): use_glo_M4_private.c1; };
+//    var use_glo_M4_private_v2_private: use_glo_M4_private;
+//    var use_glo_M4_private_v3_private: () => use_glo_M4_private.c1;
+
+//    module m2 {
+//        import errorImport = require("glo_M4_private");
+//        import nonerrorImport = glo_M3_private;
+
+//        module m5 {
+//            import m5_errorImport = require("glo_M4_private");
+//            import m5_nonerrorImport = glo_M3_private;
+//        }
+//    }
+//}
+
+//declare module "anotherParseError" {
+//    module m2 {
+//        declare module "abc" {
+//        }
+//    }
+
+//    module m2 {
+//        module "abc2" {
+//        }
+//    }
+//    module "abc3" {
+//    }
+//}
+
+//declare export module "anotherParseError2" {
+//    module m2 {
+//        declare module "abc" {
+//        }
+//    }
+
+//    module m2 {
+//        module "abc2" {
+//        }
+//    }
+//    module "abc3" {
+//    }
+//}
+
+module m2 {
+    //import m3 = require("use_glo_M1_public");
+    module m4 {
+        var a = 10;
+        //import m2 = require("use_glo_M1_public");
+    }
+
+}
+
+export module m3 {
+    //import m3 = require("use_glo_M1_public");
+    module m4 {
+        var a = 10;
+        //import m2 = require("use_glo_M1_public");
+    }
+
+}
+
+//// [privacyImport.js]
+(function (m1) {
+    (function (m1_M1_public) {
+        var c1 = (function () {
+            function c1() {
+            }
+            return c1;
+        })();
+        m1_M1_public.c1 = c1;
+        function f1() {
+            return new c1;
+        }
+        m1_M1_public.f1 = f1;
+        m1_M1_public.v1 = c1;
+        m1_M1_public.v2;
+    })(m1.m1_M1_public || (m1.m1_M1_public = {}));
+    var m1_M1_public = m1.m1_M1_public;
+    var m1_M2_private;
+    (function (m1_M2_private) {
+        var c1 = (function () {
+            function c1() {
+            }
+            return c1;
+        })();
+        m1_M2_private.c1 = c1;
+        function f1() {
+            return new c1;
+        }
+        m1_M2_private.f1 = f1;
+        m1_M2_private.v1 = c1;
+        m1_M2_private.v2;
+    })(m1_M2_private || (m1_M2_private = {}));
+    //export declare module "m1_M3_public" {
+    //    export function f1();
+    //    export class c1 {
+    //    }
+    //    export var v1: { new (): c1; };
+    //    export var v2: c1;
+    //}
+    //declare module "m1_M4_private" {
+    //    export function f1();
+    //    export class c1 {
+    //    }
+    //    export var v1: { new (): c1; };
+    //    export var v2: c1;
+    //}
+    var m1_im1_private = m1_M1_public;
+    m1.m1_im1_private_v1_public = m1_im1_private.c1;
+    m1.m1_im1_private_v2_public = new m1_im1_private.c1();
+    m1.m1_im1_private_v3_public = m1_im1_private.f1;
+    m1.m1_im1_private_v4_public = m1_im1_private.f1();
+    var m1_im1_private_v1_private = m1_im1_private.c1;
+    var m1_im1_private_v2_private = new m1_im1_private.c1();
+    var m1_im1_private_v3_private = m1_im1_private.f1;
+    var m1_im1_private_v4_private = m1_im1_private.f1();
+    var m1_im2_private = m1_M2_private;
+    m1.m1_im2_private_v1_public = m1_im2_private.c1;
+    m1.m1_im2_private_v2_public = new m1_im2_private.c1();
+    m1.m1_im2_private_v3_public = m1_im2_private.f1;
+    m1.m1_im2_private_v4_public = m1_im2_private.f1();
+    var m1_im2_private_v1_private = m1_im2_private.c1;
+    var m1_im2_private_v2_private = new m1_im2_private.c1();
+    var m1_im2_private_v3_private = m1_im2_private.f1;
+    var m1_im2_private_v4_private = m1_im2_private.f1();
+    //import m1_im3_private = require("m1_M3_public");
+    //export var m1_im3_private_v1_public = m1_im3_private.c1;
+    //export var m1_im3_private_v2_public = new m1_im3_private.c1();
+    //export var m1_im3_private_v3_public = m1_im3_private.f1;
+    //export var m1_im3_private_v4_public = m1_im3_private.f1();
+    //var m1_im3_private_v1_private = m1_im3_private.c1;
+    //var m1_im3_private_v2_private = new m1_im3_private.c1();
+    //var m1_im3_private_v3_private = m1_im3_private.f1;
+    //var m1_im3_private_v4_private = m1_im3_private.f1();
+    //import m1_im4_private = require("m1_M4_private");
+    //export var m1_im4_private_v1_public = m1_im4_private.c1;
+    //export var m1_im4_private_v2_public = new m1_im4_private.c1();
+    //export var m1_im4_private_v3_public = m1_im4_private.f1;
+    //export var m1_im4_private_v4_public = m1_im4_private.f1();
+    //var m1_im4_private_v1_private = m1_im4_private.c1;
+    //var m1_im4_private_v2_private = new m1_im4_private.c1();
+    //var m1_im4_private_v3_private = m1_im4_private.f1;
+    //var m1_im4_private_v4_private = m1_im4_private.f1();
+    m1.m1_im1_public = m1_M1_public;
+    m1.m1_im2_public = m1_M2_private;
+})(exports.m1 || (exports.m1 = {}));
+var m1 = exports.m1;
+var m2;
+(function (m2) {
+    (function (m2_M1_public) {
+        var c1 = (function () {
+            function c1() {
+            }
+            return c1;
+        })();
+        m2_M1_public.c1 = c1;
+        function f1() {
+            return new c1;
+        }
+        m2_M1_public.f1 = f1;
+        m2_M1_public.v1 = c1;
+        m2_M1_public.v2;
+    })(m2.m2_M1_public || (m2.m2_M1_public = {}));
+    var m2_M1_public = m2.m2_M1_public;
+    var m2_M2_private;
+    (function (m2_M2_private) {
+        var c1 = (function () {
+            function c1() {
+            }
+            return c1;
+        })();
+        m2_M2_private.c1 = c1;
+        function f1() {
+            return new c1;
+        }
+        m2_M2_private.f1 = f1;
+        m2_M2_private.v1 = c1;
+        m2_M2_private.v2;
+    })(m2_M2_private || (m2_M2_private = {}));
+    //export declare module "m2_M3_public" {
+    //    export function f1();
+    //    export class c1 {
+    //    }
+    //    export var v1: { new (): c1; };
+    //    export var v2: c1;
+    //}
+    //declare module "m2_M4_private" {
+    //    export function f1();
+    //    export class c1 {
+    //    }
+    //    export var v1: { new (): c1; };
+    //    export var v2: c1;
+    //}
+    var m1_im1_private = m2_M1_public;
+    m2.m1_im1_private_v1_public = m1_im1_private.c1;
+    m2.m1_im1_private_v2_public = new m1_im1_private.c1();
+    m2.m1_im1_private_v3_public = m1_im1_private.f1;
+    m2.m1_im1_private_v4_public = m1_im1_private.f1();
+    var m1_im1_private_v1_private = m1_im1_private.c1;
+    var m1_im1_private_v2_private = new m1_im1_private.c1();
+    var m1_im1_private_v3_private = m1_im1_private.f1;
+    var m1_im1_private_v4_private = m1_im1_private.f1();
+    var m1_im2_private = m2_M2_private;
+    m2.m1_im2_private_v1_public = m1_im2_private.c1;
+    m2.m1_im2_private_v2_public = new m1_im2_private.c1();
+    m2.m1_im2_private_v3_public = m1_im2_private.f1;
+    m2.m1_im2_private_v4_public = m1_im2_private.f1();
+    var m1_im2_private_v1_private = m1_im2_private.c1;
+    var m1_im2_private_v2_private = new m1_im2_private.c1();
+    var m1_im2_private_v3_private = m1_im2_private.f1;
+    var m1_im2_private_v4_private = m1_im2_private.f1();
+    //import m1_im3_private = require("m2_M3_public");
+    //export var m1_im3_private_v1_public = m1_im3_private.c1;
+    //export var m1_im3_private_v2_public = new m1_im3_private.c1();
+    //export var m1_im3_private_v3_public = m1_im3_private.f1;
+    //export var m1_im3_private_v4_public = m1_im3_private.f1();
+    //var m1_im3_private_v1_private = m1_im3_private.c1;
+    //var m1_im3_private_v2_private = new m1_im3_private.c1();
+    //var m1_im3_private_v3_private = m1_im3_private.f1;
+    //var m1_im3_private_v4_private = m1_im3_private.f1();
+    //import m1_im4_private = require("m2_M4_private");
+    //export var m1_im4_private_v1_public = m1_im4_private.c1;
+    //export var m1_im4_private_v2_public = new m1_im4_private.c1();
+    //export var m1_im4_private_v3_public = m1_im4_private.f1;
+    //export var m1_im4_private_v4_public = m1_im4_private.f1();
+    //var m1_im4_private_v1_private = m1_im4_private.c1;
+    //var m1_im4_private_v2_private = new m1_im4_private.c1();
+    //var m1_im4_private_v3_private = m1_im4_private.f1;
+    //var m1_im4_private_v4_private = m1_im4_private.f1();
+    // Parse error to export module
+    m2.m1_im1_public = m2_M1_public;
+    m2.m1_im2_public = m2_M2_private;
+})(m2 || (m2 = {}));
+(function (glo_M1_public) {
+    var c1 = (function () {
+        function c1() {
+        }
+        return c1;
+    })();
+    glo_M1_public.c1 = c1;
+    function f1() {
+        return new c1;
+    }
+    glo_M1_public.f1 = f1;
+    glo_M1_public.v1 = c1;
+    glo_M1_public.v2;
+})(exports.glo_M1_public || (exports.glo_M1_public = {}));
+var glo_M1_public = exports.glo_M1_public;
+//export declare module "glo_M2_public" {
+//    export function f1();
+//    export class c1 {
+//    }
+//    export var v1: { new (): c1; };
+//    export var v2: c1;
+//}
+(function (glo_M3_private) {
+    var c1 = (function () {
+        function c1() {
+        }
+        return c1;
+    })();
+    glo_M3_private.c1 = c1;
+    function f1() {
+        return new c1;
+    }
+    glo_M3_private.f1 = f1;
+    glo_M3_private.v1 = c1;
+    glo_M3_private.v2;
+})(exports.glo_M3_private || (exports.glo_M3_private = {}));
+var glo_M3_private = exports.glo_M3_private;
+//export declare module "glo_M4_private" {
+//    export function f1();
+//    export class c1 {
+//    }
+//    export var v1: { new (): c1; };
+//    export var v2: c1;
+//}
+var glo_im1_private = glo_M1_public;
+exports.glo_im1_private_v1_public = glo_im1_private.c1;
+exports.glo_im1_private_v2_public = new glo_im1_private.c1();
+exports.glo_im1_private_v3_public = glo_im1_private.f1;
+exports.glo_im1_private_v4_public = glo_im1_private.f1();
+var glo_im1_private_v1_private = glo_im1_private.c1;
+var glo_im1_private_v2_private = new glo_im1_private.c1();
+var glo_im1_private_v3_private = glo_im1_private.f1;
+var glo_im1_private_v4_private = glo_im1_private.f1();
+//import glo_im2_private = require("glo_M2_public");
+//export var glo_im2_private_v1_public = glo_im2_private.c1;
+//export var glo_im2_private_v2_public = new glo_im2_private.c1();
+//export var glo_im2_private_v3_public = glo_im2_private.f1;
+//export var glo_im2_private_v4_public = glo_im2_private.f1();
+//var glo_im2_private_v1_private = glo_im2_private.c1;
+//var glo_im2_private_v2_private = new glo_im2_private.c1();
+//var glo_im2_private_v3_private = glo_im2_private.f1;
+//var glo_im2_private_v4_private = glo_im2_private.f1();
+var glo_im3_private = glo_M3_private;
+exports.glo_im3_private_v1_public = glo_im3_private.c1;
+exports.glo_im3_private_v2_public = new glo_im3_private.c1();
+exports.glo_im3_private_v3_public = glo_im3_private.f1;
+exports.glo_im3_private_v4_public = glo_im3_private.f1();
+var glo_im3_private_v1_private = glo_im3_private.c1;
+var glo_im3_private_v2_private = new glo_im3_private.c1();
+var glo_im3_private_v3_private = glo_im3_private.f1;
+var glo_im3_private_v4_private = glo_im3_private.f1();
+//import glo_im4_private = require("glo_M4_private");
+//export var glo_im4_private_v1_public = glo_im4_private.c1;
+//export var glo_im4_private_v2_public = new glo_im4_private.c1();
+//export var glo_im4_private_v3_public = glo_im4_private.f1;
+//export var glo_im4_private_v4_public = glo_im4_private.f1();
+//var glo_im4_private_v1_private = glo_im4_private.c1;
+//var glo_im4_private_v2_private = new glo_im4_private.c1();
+//var glo_im4_private_v3_private = glo_im4_private.f1;
+//var glo_im4_private_v4_private = glo_im4_private.f1();
+// Parse error to export module
+exports.glo_im1_public = glo_M1_public;
+exports.glo_im2_public = glo_M3_private;
+//export import glo_im3_public = require("glo_M2_public");
+//export import glo_im4_public = require("glo_M4_private");
+//export declare module "use_glo_M1_public" {
+//    import use_glo_M1_public = glo_M1_public;
+//    export var use_glo_M1_public_v1_public: { new (): use_glo_M1_public.c1; };
+//    export var use_glo_M1_public_v2_public: use_glo_M1_public;
+//    export var use_glo_M1_public_v3_public: () => use_glo_M1_public.c1;
+//    var use_glo_M1_public_v1_private: { new (): use_glo_M1_public.c1; };
+//    var use_glo_M1_public_v2_private: use_glo_M1_public;
+//    var use_glo_M1_public_v3_private: () => use_glo_M1_public.c1;
+//    import use_glo_M2_public = require("glo_M2_public");
+//    export var use_glo_M2_public_v1_public: { new (): use_glo_M2_public.c1; };
+//    export var use_glo_M2_public_v2_public: use_glo_M2_public;
+//    export var use_glo_M2_public_v3_public: () => use_glo_M2_public.c1;
+//    var use_glo_M2_public_v1_private: { new (): use_glo_M2_public.c1; };
+//    var use_glo_M2_public_v2_private: use_glo_M2_public;
+//    var use_glo_M2_public_v3_private: () => use_glo_M2_public.c1;
+//    module m2 {
+//        import errorImport = require("glo_M2_public");
+//        import nonerrorImport = glo_M1_public;
+//        module m5 {
+//            import m5_errorImport = require("glo_M2_public");
+//            import m5_nonerrorImport = glo_M1_public;
+//        }
+//    }
+//}
+//declare module "use_glo_M3_private" {
+//    import use_glo_M3_private = glo_M3_private;
+//    export var use_glo_M3_private_v1_public: { new (): use_glo_M3_private.c1; };
+//    export var use_glo_M3_private_v2_public: use_glo_M3_private;
+//    export var use_glo_M3_private_v3_public: () => use_glo_M3_private.c1;
+//    var use_glo_M3_private_v1_private: { new (): use_glo_M3_private.c1; };
+//    var use_glo_M3_private_v2_private: use_glo_M3_private;
+//    var use_glo_M3_private_v3_private: () => use_glo_M3_private.c1;
+//    import use_glo_M4_private = require("glo_M4_private");
+//    export var use_glo_M4_private_v1_public: { new (): use_glo_M4_private.c1; };
+//    export var use_glo_M4_private_v2_public: use_glo_M4_private;
+//    export var use_glo_M4_private_v3_public: () => use_glo_M4_private.c1;
+//    var use_glo_M4_private_v1_private: { new (): use_glo_M4_private.c1; };
+//    var use_glo_M4_private_v2_private: use_glo_M4_private;
+//    var use_glo_M4_private_v3_private: () => use_glo_M4_private.c1;
+//    module m2 {
+//        import errorImport = require("glo_M4_private");
+//        import nonerrorImport = glo_M3_private;
+//        module m5 {
+//            import m5_errorImport = require("glo_M4_private");
+//            import m5_nonerrorImport = glo_M3_private;
+//        }
+//    }
+//}
+//declare module "anotherParseError" {
+//    module m2 {
+//        declare module "abc" {
+//        }
+//    }
+//    module m2 {
+//        module "abc2" {
+//        }
+//    }
+//    module "abc3" {
+//    }
+//}
+//declare export module "anotherParseError2" {
+//    module m2 {
+//        declare module "abc" {
+//        }
+//    }
+//    module m2 {
+//        module "abc2" {
+//        }
+//    }
+//    module "abc3" {
+//    }
+//}
+var m2;
+(function (m2) {
+    //import m3 = require("use_glo_M1_public");
+    var m4;
+    (function (m4) {
+        var a = 10;
+    })(m4 || (m4 = {}));
+})(m2 || (m2 = {}));
+(function (m3) {
+    //import m3 = require("use_glo_M1_public");
+    var m4;
+    (function (m4) {
+        var a = 10;
+    })(m4 || (m4 = {}));
+})(exports.m3 || (exports.m3 = {}));
+var m3 = exports.m3;
diff --git a/tests/baselines/reference/privacyImportParseErrors.errors.txt b/tests/baselines/reference/privacyImportParseErrors.errors.txt
new file mode 100644
index 00000000000..6889ad85e1b
--- /dev/null
+++ b/tests/baselines/reference/privacyImportParseErrors.errors.txt
@@ -0,0 +1,455 @@
+==== tests/cases/compiler/privacyImportParseErrors.ts (49 errors) ====
+    export module m1 {
+        export module m1_M1_public {
+            export class c1 {
+            }
+            export function f1() {
+                return new c1;
+            }
+            export var v1 = c1;
+            export var v2: c1;
+        }
+    
+        module m1_M2_private {
+            export class c1 {
+            }
+            export function f1() {
+                return new c1;
+            }
+            export var v1 = c1;
+            export var v2: c1;
+        }
+    
+        export declare module "m1_M3_public" {
+                              ~~~~~~~~~~~~~~
+!!! Ambient external modules cannot be nested in other modules.
+            export function f1();
+            export class c1 {
+            }
+            export var v1: { new (): c1; };
+            export var v2: c1;
+        }
+    
+        declare module "m1_M4_private" {
+                       ~~~~~~~~~~~~~~~
+!!! Ambient external modules cannot be nested in other modules.
+            export function f1();
+            export class c1 {
+            }
+            export var v1: { new (): c1; };
+            export var v2: c1;
+        }
+    
+        import m1_im1_private = m1_M1_public;
+        export var m1_im1_private_v1_public = m1_im1_private.c1;
+        export var m1_im1_private_v2_public = new m1_im1_private.c1();
+        export var m1_im1_private_v3_public = m1_im1_private.f1;
+        export var m1_im1_private_v4_public = m1_im1_private.f1();
+        var m1_im1_private_v1_private = m1_im1_private.c1;
+        var m1_im1_private_v2_private = new m1_im1_private.c1();
+        var m1_im1_private_v3_private = m1_im1_private.f1;
+        var m1_im1_private_v4_private = m1_im1_private.f1();
+    
+    
+        import m1_im2_private = m1_M2_private;
+        export var m1_im2_private_v1_public = m1_im2_private.c1;
+        export var m1_im2_private_v2_public = new m1_im2_private.c1();
+        export var m1_im2_private_v3_public = m1_im2_private.f1;
+        export var m1_im2_private_v4_public = m1_im2_private.f1();
+        var m1_im2_private_v1_private = m1_im2_private.c1;
+        var m1_im2_private_v2_private = new m1_im2_private.c1();
+        var m1_im2_private_v3_private = m1_im2_private.f1;
+        var m1_im2_private_v4_private = m1_im2_private.f1();
+    
+        import m1_im3_private = require("m1_M3_public");
+        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Import declarations in an internal module cannot reference an external module.
+                                        ~~~~~~~~~~~~~~
+!!! Cannot find external module 'm1_M3_public'.
+        export var m1_im3_private_v1_public = m1_im3_private.c1;
+        export var m1_im3_private_v2_public = new m1_im3_private.c1();
+        export var m1_im3_private_v3_public = m1_im3_private.f1;
+        export var m1_im3_private_v4_public = m1_im3_private.f1();
+        var m1_im3_private_v1_private = m1_im3_private.c1;
+        var m1_im3_private_v2_private = new m1_im3_private.c1();
+        var m1_im3_private_v3_private = m1_im3_private.f1;
+        var m1_im3_private_v4_private = m1_im3_private.f1();
+    
+        import m1_im4_private = require("m1_M4_private");
+        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Import declarations in an internal module cannot reference an external module.
+                                        ~~~~~~~~~~~~~~~
+!!! Cannot find external module 'm1_M4_private'.
+        export var m1_im4_private_v1_public = m1_im4_private.c1;
+        export var m1_im4_private_v2_public = new m1_im4_private.c1();
+        export var m1_im4_private_v3_public = m1_im4_private.f1;
+        export var m1_im4_private_v4_public = m1_im4_private.f1();
+        var m1_im4_private_v1_private = m1_im4_private.c1;
+        var m1_im4_private_v2_private = new m1_im4_private.c1();
+        var m1_im4_private_v3_private = m1_im4_private.f1;
+        var m1_im4_private_v4_private = m1_im4_private.f1();
+    
+        export import m1_im1_public = m1_M1_public;
+        export import m1_im2_public = m1_M2_private;
+        export import m1_im3_public = require("m1_M3_public");
+        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Import declarations in an internal module cannot reference an external module.
+        export import m1_im4_public = require("m1_M4_private");
+        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Import declarations in an internal module cannot reference an external module.
+    }
+    
+    module m2 {
+        export module m2_M1_public {
+            export class c1 {
+            }
+            export function f1() {
+                return new c1;
+            }
+            export var v1 = c1;
+            export var v2: c1;
+        }
+    
+        module m2_M2_private {
+            export class c1 {
+            }
+            export function f1() {
+                return new c1;
+            }
+            export var v1 = c1;
+            export var v2: c1;
+        }
+    
+        export declare module "m2_M3_public" {
+                              ~~~~~~~~~~~~~~
+!!! Ambient external modules cannot be nested in other modules.
+            export function f1();
+            export class c1 {
+            }
+            export var v1: { new (): c1; };
+            export var v2: c1;
+        }
+    
+        declare module "m2_M4_private" {
+                       ~~~~~~~~~~~~~~~
+!!! Ambient external modules cannot be nested in other modules.
+            export function f1();
+            export class c1 {
+            }
+            export var v1: { new (): c1; };
+            export var v2: c1;
+        }
+    
+        import m1_im1_private = m2_M1_public;
+        export var m1_im1_private_v1_public = m1_im1_private.c1;
+        export var m1_im1_private_v2_public = new m1_im1_private.c1();
+        export var m1_im1_private_v3_public = m1_im1_private.f1;
+        export var m1_im1_private_v4_public = m1_im1_private.f1();
+        var m1_im1_private_v1_private = m1_im1_private.c1;
+        var m1_im1_private_v2_private = new m1_im1_private.c1();
+        var m1_im1_private_v3_private = m1_im1_private.f1;
+        var m1_im1_private_v4_private = m1_im1_private.f1();
+    
+    
+        import m1_im2_private = m2_M2_private;
+        export var m1_im2_private_v1_public = m1_im2_private.c1;
+        export var m1_im2_private_v2_public = new m1_im2_private.c1();
+        export var m1_im2_private_v3_public = m1_im2_private.f1;
+        export var m1_im2_private_v4_public = m1_im2_private.f1();
+        var m1_im2_private_v1_private = m1_im2_private.c1;
+        var m1_im2_private_v2_private = new m1_im2_private.c1();
+        var m1_im2_private_v3_private = m1_im2_private.f1;
+        var m1_im2_private_v4_private = m1_im2_private.f1();
+    
+        import m1_im3_private = require("m2_M3_public");
+        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Import declarations in an internal module cannot reference an external module.
+                                        ~~~~~~~~~~~~~~
+!!! Cannot find external module 'm2_M3_public'.
+        export var m1_im3_private_v1_public = m1_im3_private.c1;
+        export var m1_im3_private_v2_public = new m1_im3_private.c1();
+        export var m1_im3_private_v3_public = m1_im3_private.f1;
+        export var m1_im3_private_v4_public = m1_im3_private.f1();
+        var m1_im3_private_v1_private = m1_im3_private.c1;
+        var m1_im3_private_v2_private = new m1_im3_private.c1();
+        var m1_im3_private_v3_private = m1_im3_private.f1;
+        var m1_im3_private_v4_private = m1_im3_private.f1();
+    
+        import m1_im4_private = require("m2_M4_private");
+        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Import declarations in an internal module cannot reference an external module.
+                                        ~~~~~~~~~~~~~~~
+!!! Cannot find external module 'm2_M4_private'.
+        export var m1_im4_private_v1_public = m1_im4_private.c1;
+        export var m1_im4_private_v2_public = new m1_im4_private.c1();
+        export var m1_im4_private_v3_public = m1_im4_private.f1;
+        export var m1_im4_private_v4_public = m1_im4_private.f1();
+        var m1_im4_private_v1_private = m1_im4_private.c1;
+        var m1_im4_private_v2_private = new m1_im4_private.c1();
+        var m1_im4_private_v3_private = m1_im4_private.f1;
+        var m1_im4_private_v4_private = m1_im4_private.f1();
+    
+        // Parse error to export module
+        export import m1_im1_public = m2_M1_public;
+        export import m1_im2_public = m2_M2_private;
+        export import m1_im3_public = require("m2_M3_public");
+        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Import declarations in an internal module cannot reference an external module.
+        export import m1_im4_public = require("m2_M4_private");
+        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Import declarations in an internal module cannot reference an external module.
+    }
+    
+    export module glo_M1_public {
+        export class c1 {
+        }
+        export function f1() {
+            return new c1;
+        }
+        export var v1 = c1;
+        export var v2: c1;
+    }
+    
+    export declare module "glo_M2_public" {
+                          ~~~~~~~~~~~~~~~
+!!! Ambient external modules cannot be nested in other modules.
+        export function f1();
+        export class c1 {
+        }
+        export var v1: { new (): c1; };
+        export var v2: c1;
+    }
+    
+    export module glo_M3_private {
+        export class c1 {
+        }
+        export function f1() {
+            return new c1;
+        }
+        export var v1 = c1;
+        export var v2: c1;
+    }
+    
+    export declare module "glo_M4_private" {
+                          ~~~~~~~~~~~~~~~~
+!!! Ambient external modules cannot be nested in other modules.
+        export function f1();
+        export class c1 {
+        }
+        export var v1: { new (): c1; };
+        export var v2: c1;
+    }
+    
+    
+    import glo_im1_private = glo_M1_public;
+    export var glo_im1_private_v1_public = glo_im1_private.c1;
+    export var glo_im1_private_v2_public = new glo_im1_private.c1();
+    export var glo_im1_private_v3_public = glo_im1_private.f1;
+    export var glo_im1_private_v4_public = glo_im1_private.f1();
+    var glo_im1_private_v1_private = glo_im1_private.c1;
+    var glo_im1_private_v2_private = new glo_im1_private.c1();
+    var glo_im1_private_v3_private = glo_im1_private.f1;
+    var glo_im1_private_v4_private = glo_im1_private.f1();
+    
+    
+    import glo_im2_private = require("glo_M2_public");
+                                     ~~~~~~~~~~~~~~~
+!!! Cannot find external module 'glo_M2_public'.
+    export var glo_im2_private_v1_public = glo_im2_private.c1;
+    export var glo_im2_private_v2_public = new glo_im2_private.c1();
+    export var glo_im2_private_v3_public = glo_im2_private.f1;
+    export var glo_im2_private_v4_public = glo_im2_private.f1();
+    var glo_im2_private_v1_private = glo_im2_private.c1;
+    var glo_im2_private_v2_private = new glo_im2_private.c1();
+    var glo_im2_private_v3_private = glo_im2_private.f1;
+    var glo_im2_private_v4_private = glo_im2_private.f1();
+    
+    import glo_im3_private = glo_M3_private;
+    export var glo_im3_private_v1_public = glo_im3_private.c1;
+    export var glo_im3_private_v2_public = new glo_im3_private.c1();
+    export var glo_im3_private_v3_public = glo_im3_private.f1;
+    export var glo_im3_private_v4_public = glo_im3_private.f1();
+    var glo_im3_private_v1_private = glo_im3_private.c1;
+    var glo_im3_private_v2_private = new glo_im3_private.c1();
+    var glo_im3_private_v3_private = glo_im3_private.f1;
+    var glo_im3_private_v4_private = glo_im3_private.f1();
+    
+    import glo_im4_private = require("glo_M4_private");
+                                     ~~~~~~~~~~~~~~~~
+!!! Cannot find external module 'glo_M4_private'.
+    export var glo_im4_private_v1_public = glo_im4_private.c1;
+    export var glo_im4_private_v2_public = new glo_im4_private.c1();
+    export var glo_im4_private_v3_public = glo_im4_private.f1;
+    export var glo_im4_private_v4_public = glo_im4_private.f1();
+    var glo_im4_private_v1_private = glo_im4_private.c1;
+    var glo_im4_private_v2_private = new glo_im4_private.c1();
+    var glo_im4_private_v3_private = glo_im4_private.f1;
+    var glo_im4_private_v4_private = glo_im4_private.f1();
+    
+    // Parse error to export module
+    export import glo_im1_public = glo_M1_public;
+    export import glo_im2_public = glo_M3_private;
+    export import glo_im3_public = require("glo_M2_public");
+                                           ~~~~~~~~~~~~~~~
+!!! Cannot find external module 'glo_M2_public'.
+    export import glo_im4_public = require("glo_M4_private");
+                                           ~~~~~~~~~~~~~~~~
+!!! Cannot find external module 'glo_M4_private'.
+    
+    
+    export declare module "use_glo_M1_public" {
+                          ~~~~~~~~~~~~~~~~~~~
+!!! Ambient external modules cannot be nested in other modules.
+        import use_glo_M1_public = glo_M1_public;
+        export var use_glo_M1_public_v1_public: { new (): use_glo_M1_public.c1; };
+        export var use_glo_M1_public_v2_public: use_glo_M1_public;
+                                                ~~~~~~~~~~~~~~~~~
+!!! Cannot find name 'use_glo_M1_public'.
+        export var use_glo_M1_public_v3_public: () => use_glo_M1_public.c1;
+        var use_glo_M1_public_v1_private: { new (): use_glo_M1_public.c1; };
+        var use_glo_M1_public_v2_private: use_glo_M1_public;
+                                          ~~~~~~~~~~~~~~~~~
+!!! Cannot find name 'use_glo_M1_public'.
+        var use_glo_M1_public_v3_private: () => use_glo_M1_public.c1;
+    
+        import use_glo_M2_public = require("glo_M2_public");
+                                           ~~~~~~~~~~~~~~~
+!!! Cannot find external module 'glo_M2_public'.
+        export var use_glo_M2_public_v1_public: { new (): use_glo_M2_public.c1; };
+        export var use_glo_M2_public_v2_public: use_glo_M2_public;
+        export var use_glo_M2_public_v3_public: () => use_glo_M2_public.c1;
+        var use_glo_M2_public_v1_private: { new (): use_glo_M2_public.c1; };
+        var use_glo_M2_public_v2_private: use_glo_M2_public;
+        var use_glo_M2_public_v3_private: () => use_glo_M2_public.c1;
+    
+        module m2 {
+            import errorImport = require("glo_M2_public");
+            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Import declarations in an internal module cannot reference an external module.
+            import nonerrorImport = glo_M1_public;
+    
+            module m5 {
+                import m5_errorImport = require("glo_M2_public");
+                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Import declarations in an internal module cannot reference an external module.
+                import m5_nonerrorImport = glo_M1_public;
+            }
+        }
+    }
+    
+    
+    declare module "use_glo_M3_private" {
+                   ~~~~~~~~~~~~~~~~~~~~
+!!! Ambient external modules cannot be nested in other modules.
+        import use_glo_M3_private = glo_M3_private;
+        export var use_glo_M3_private_v1_public: { new (): use_glo_M3_private.c1; };
+        export var use_glo_M3_private_v2_public: use_glo_M3_private;
+                                                 ~~~~~~~~~~~~~~~~~~
+!!! Cannot find name 'use_glo_M3_private'.
+        export var use_glo_M3_private_v3_public: () => use_glo_M3_private.c1;
+        var use_glo_M3_private_v1_private: { new (): use_glo_M3_private.c1; };
+        var use_glo_M3_private_v2_private: use_glo_M3_private;
+                                           ~~~~~~~~~~~~~~~~~~
+!!! Cannot find name 'use_glo_M3_private'.
+        var use_glo_M3_private_v3_private: () => use_glo_M3_private.c1;
+    
+        import use_glo_M4_private = require("glo_M4_private");
+                                            ~~~~~~~~~~~~~~~~
+!!! Cannot find external module 'glo_M4_private'.
+        export var use_glo_M4_private_v1_public: { new (): use_glo_M4_private.c1; };
+        export var use_glo_M4_private_v2_public: use_glo_M4_private;
+        export var use_glo_M4_private_v3_public: () => use_glo_M4_private.c1;
+        var use_glo_M4_private_v1_private: { new (): use_glo_M4_private.c1; };
+        var use_glo_M4_private_v2_private: use_glo_M4_private;
+        var use_glo_M4_private_v3_private: () => use_glo_M4_private.c1;
+    
+        module m2 {
+            import errorImport = require("glo_M4_private");
+            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Import declarations in an internal module cannot reference an external module.
+            import nonerrorImport = glo_M3_private;
+    
+            module m5 {
+                import m5_errorImport = require("glo_M4_private");
+                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Import declarations in an internal module cannot reference an external module.
+                import m5_nonerrorImport = glo_M3_private;
+            }
+        }
+    }
+    
+    declare module "anotherParseError" {
+                   ~~~~~~~~~~~~~~~~~~~
+!!! Ambient external modules cannot be nested in other modules.
+        module m2 {
+            declare module "abc" {
+            ~~~~~~~
+!!! A 'declare' modifier cannot be used in an already ambient context.
+                           ~~~~~
+!!! Ambient external modules cannot be nested in other modules.
+            }
+        }
+    
+        module m2 {
+            module "abc2" {
+                   ~~~~~~
+!!! Ambient external modules cannot be nested in other modules.
+            }
+        }
+        module "abc3" {
+               ~~~~~~
+!!! Ambient external modules cannot be nested in other modules.
+        }
+    }
+    
+    declare export module "anotherParseError2" {
+            ~~~~~~
+!!! 'export' modifier must precede 'declare' modifier.
+                          ~~~~~~~~~~~~~~~~~~~~
+!!! Ambient external modules cannot be nested in other modules.
+        module m2 {
+            declare module "abc" {
+            ~~~~~~~
+!!! A 'declare' modifier cannot be used in an already ambient context.
+                           ~~~~~
+!!! Ambient external modules cannot be nested in other modules.
+            }
+        }
+    
+        module m2 {
+            module "abc2" {
+                   ~~~~~~
+!!! Ambient external modules cannot be nested in other modules.
+            }
+        }
+        module "abc3" {
+               ~~~~~~
+!!! Ambient external modules cannot be nested in other modules.
+        }
+    }
+    
+    module m2 {
+        import m3 = require("use_glo_M1_public");
+        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Import declarations in an internal module cannot reference an external module.
+        module m4 {
+            var a = 10;
+            import m2 = require("use_glo_M1_public");
+            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Import declarations in an internal module cannot reference an external module.
+        }
+    
+    }
+    
+    export module m3 {
+        import m3 = require("use_glo_M1_public");
+        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Import declarations in an internal module cannot reference an external module.
+        module m4 {
+            var a = 10;
+            import m2 = require("use_glo_M1_public");
+            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Import declarations in an internal module cannot reference an external module.
+        }
+    
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/privacyInterfaceExtendsClauseDeclFile.errors.txt b/tests/baselines/reference/privacyInterfaceExtendsClauseDeclFile.errors.txt
new file mode 100644
index 00000000000..24fccd203bc
--- /dev/null
+++ b/tests/baselines/reference/privacyInterfaceExtendsClauseDeclFile.errors.txt
@@ -0,0 +1,105 @@
+==== tests/cases/compiler/privacyInterfaceExtendsClauseDeclFile_externalModule.ts (5 errors) ====
+    
+    export module publicModule {
+        export interface publicInterfaceInPublicModule {
+        }
+    
+        interface privateInterfaceInPublicModule {
+        }
+    
+        interface privateInterfaceImplementingPublicInterfaceInModule extends publicInterfaceInPublicModule {
+        }
+        interface privateInterfaceImplementingPrivateInterfaceInModule extends privateInterfaceInPublicModule {
+        }
+        export interface publicInterfaceImplementingPublicInterfaceInModule extends publicInterfaceInPublicModule {
+        }
+        export interface publicInterfaceImplementingPrivateInterfaceInModule extends privateInterfaceInPublicModule { // Should error
+                                                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Extends clause of exported interface 'publicInterfaceImplementingPrivateInterfaceInModule' has or is using private name 'privateInterfaceInPublicModule'.
+        }
+    
+        interface privateInterfaceImplementingFromPrivateModuleInterface extends privateModule.publicInterfaceInPrivateModule {
+        }
+        export interface publicInterfaceImplementingFromPrivateModuleInterface extends privateModule.publicInterfaceInPrivateModule { // Should error
+                                                                                       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Extends clause of exported interface 'publicInterfaceImplementingFromPrivateModuleInterface' has or is using name 'privateModule.publicInterfaceInPrivateModule' from private module 'privateModule'.
+        }
+    
+        export interface publicInterfaceImplementingPrivateAndPublicInterface extends privateInterfaceInPublicModule, publicInterfaceInPublicModule { // Should error
+                                                                                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Extends clause of exported interface 'publicInterfaceImplementingPrivateAndPublicInterface' has or is using private name 'privateInterfaceInPublicModule'.
+        }
+    }
+    
+    module privateModule {
+        export interface publicInterfaceInPrivateModule {
+    
+        }
+    
+        interface privateInterfaceInPrivateModule {
+        }
+    
+        interface privateInterfaceImplementingPublicInterfaceInModule extends publicInterfaceInPrivateModule {
+        }
+        interface privateInterfaceImplementingPrivateInterfaceInModule extends privateInterfaceInPrivateModule {
+        }
+        export interface publicInterfaceImplementingPublicInterfaceInModule extends publicInterfaceInPrivateModule {
+        }
+        export interface publicInterfaceImplementingPrivateInterfaceInModule extends privateInterfaceInPrivateModule {
+        }
+    
+        interface privateInterfaceImplementingFromPrivateModuleInterface extends privateModule.publicInterfaceInPrivateModule {
+        }
+        export interface publicInterfaceImplementingFromPrivateModuleInterface extends privateModule.publicInterfaceInPrivateModule {
+        }
+    }
+    
+    export interface publicInterface {
+    
+    }
+    
+    interface privateInterface {
+    }
+    
+    interface privateInterfaceImplementingPublicInterface extends publicInterface {
+    }
+    interface privateInterfaceImplementingPrivateInterfaceInModule extends privateInterface {
+    }
+    export interface publicInterfaceImplementingPublicInterface extends publicInterface {
+    }
+    export interface publicInterfaceImplementingPrivateInterface extends privateInterface { // Should error
+                                                                         ~~~~~~~~~~~~~~~~
+!!! Extends clause of exported interface 'publicInterfaceImplementingPrivateInterface' has or is using private name 'privateInterface'.
+    }
+    
+    interface privateInterfaceImplementingFromPrivateModuleInterface extends privateModule.publicInterfaceInPrivateModule {
+    }
+    export interface publicInterfaceImplementingFromPrivateModuleInterface extends privateModule.publicInterfaceInPrivateModule { // Should error
+                                                                                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Extends clause of exported interface 'publicInterfaceImplementingFromPrivateModuleInterface' has or is using name 'privateModule.publicInterfaceInPrivateModule' from private module 'privateModule'.
+    }
+    
+==== tests/cases/compiler/privacyInterfaceExtendsClauseDeclFile_GlobalFile.ts (1 errors) ====
+    module publicModuleInGlobal {
+        export interface publicInterfaceInPublicModule {
+        }
+    
+        interface privateInterfaceInPublicModule {
+        }
+    
+        interface privateInterfaceImplementingPublicInterfaceInModule extends publicInterfaceInPublicModule {
+        }
+        interface privateInterfaceImplementingPrivateInterfaceInModule extends privateInterfaceInPublicModule {
+        }
+        export interface publicInterfaceImplementingPublicInterfaceInModule extends publicInterfaceInPublicModule {
+        }
+        export interface publicInterfaceImplementingPrivateInterfaceInModule extends privateInterfaceInPublicModule { // Should error
+                                                                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Extends clause of exported interface 'publicInterfaceImplementingPrivateInterfaceInModule' has or is using private name 'privateInterfaceInPublicModule'.
+        }
+    }
+    interface publicInterfaceInGlobal {
+    }
+    interface publicInterfaceImplementingPublicInterfaceInGlobal extends publicInterfaceInGlobal {
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/privacyInterfaceExtendsClauseDeclFile.js b/tests/baselines/reference/privacyInterfaceExtendsClauseDeclFile.js
new file mode 100644
index 00000000000..65f0a2af420
--- /dev/null
+++ b/tests/baselines/reference/privacyInterfaceExtendsClauseDeclFile.js
@@ -0,0 +1,98 @@
+//// [tests/cases/compiler/privacyInterfaceExtendsClauseDeclFile.ts] ////
+
+//// [privacyInterfaceExtendsClauseDeclFile_externalModule.ts]
+
+export module publicModule {
+    export interface publicInterfaceInPublicModule {
+    }
+
+    interface privateInterfaceInPublicModule {
+    }
+
+    interface privateInterfaceImplementingPublicInterfaceInModule extends publicInterfaceInPublicModule {
+    }
+    interface privateInterfaceImplementingPrivateInterfaceInModule extends privateInterfaceInPublicModule {
+    }
+    export interface publicInterfaceImplementingPublicInterfaceInModule extends publicInterfaceInPublicModule {
+    }
+    export interface publicInterfaceImplementingPrivateInterfaceInModule extends privateInterfaceInPublicModule { // Should error
+    }
+
+    interface privateInterfaceImplementingFromPrivateModuleInterface extends privateModule.publicInterfaceInPrivateModule {
+    }
+    export interface publicInterfaceImplementingFromPrivateModuleInterface extends privateModule.publicInterfaceInPrivateModule { // Should error
+    }
+
+    export interface publicInterfaceImplementingPrivateAndPublicInterface extends privateInterfaceInPublicModule, publicInterfaceInPublicModule { // Should error
+    }
+}
+
+module privateModule {
+    export interface publicInterfaceInPrivateModule {
+
+    }
+
+    interface privateInterfaceInPrivateModule {
+    }
+
+    interface privateInterfaceImplementingPublicInterfaceInModule extends publicInterfaceInPrivateModule {
+    }
+    interface privateInterfaceImplementingPrivateInterfaceInModule extends privateInterfaceInPrivateModule {
+    }
+    export interface publicInterfaceImplementingPublicInterfaceInModule extends publicInterfaceInPrivateModule {
+    }
+    export interface publicInterfaceImplementingPrivateInterfaceInModule extends privateInterfaceInPrivateModule {
+    }
+
+    interface privateInterfaceImplementingFromPrivateModuleInterface extends privateModule.publicInterfaceInPrivateModule {
+    }
+    export interface publicInterfaceImplementingFromPrivateModuleInterface extends privateModule.publicInterfaceInPrivateModule {
+    }
+}
+
+export interface publicInterface {
+
+}
+
+interface privateInterface {
+}
+
+interface privateInterfaceImplementingPublicInterface extends publicInterface {
+}
+interface privateInterfaceImplementingPrivateInterfaceInModule extends privateInterface {
+}
+export interface publicInterfaceImplementingPublicInterface extends publicInterface {
+}
+export interface publicInterfaceImplementingPrivateInterface extends privateInterface { // Should error
+}
+
+interface privateInterfaceImplementingFromPrivateModuleInterface extends privateModule.publicInterfaceInPrivateModule {
+}
+export interface publicInterfaceImplementingFromPrivateModuleInterface extends privateModule.publicInterfaceInPrivateModule { // Should error
+}
+
+//// [privacyInterfaceExtendsClauseDeclFile_GlobalFile.ts]
+module publicModuleInGlobal {
+    export interface publicInterfaceInPublicModule {
+    }
+
+    interface privateInterfaceInPublicModule {
+    }
+
+    interface privateInterfaceImplementingPublicInterfaceInModule extends publicInterfaceInPublicModule {
+    }
+    interface privateInterfaceImplementingPrivateInterfaceInModule extends privateInterfaceInPublicModule {
+    }
+    export interface publicInterfaceImplementingPublicInterfaceInModule extends publicInterfaceInPublicModule {
+    }
+    export interface publicInterfaceImplementingPrivateInterfaceInModule extends privateInterfaceInPublicModule { // Should error
+    }
+}
+interface publicInterfaceInGlobal {
+}
+interface publicInterfaceImplementingPublicInterfaceInGlobal extends publicInterfaceInGlobal {
+}
+
+
+//// [privacyInterfaceExtendsClauseDeclFile_externalModule.js]
+//// [privacyInterfaceExtendsClauseDeclFile_GlobalFile.js]
diff --git a/tests/baselines/reference/privacyLocalInternalReferenceImportWithExport.errors.txt b/tests/baselines/reference/privacyLocalInternalReferenceImportWithExport.errors.txt
new file mode 100644
index 00000000000..acbe63a21d7
--- /dev/null
+++ b/tests/baselines/reference/privacyLocalInternalReferenceImportWithExport.errors.txt
@@ -0,0 +1,167 @@
+==== tests/cases/compiler/privacyLocalInternalReferenceImportWithExport.ts (7 errors) ====
+    // private elements
+    module m_private {
+        export class c_private {
+        }
+        export enum e_private {
+            Happy,
+            Grumpy
+        }
+        export function f_private() {
+            return new c_private();
+        }
+        export var v_private = new c_private();
+        export interface i_private {
+        }
+        export module mi_private {
+            export class c {
+            }
+        }
+        export module mu_private {
+            export interface i {
+            }
+        }
+    }
+    
+    // Public elements
+    export module m_public {
+        export class c_public {
+        }
+        export enum e_public {
+            Happy,
+            Grumpy
+        }
+        export function f_public() {
+            return new c_public();
+        }
+        export var v_public = 10;
+        export interface i_public {
+        }
+        export module mi_public {
+            export class c {
+            }
+        }
+        export module mu_public {
+            export interface i {
+            }
+        }
+    }
+    
+    export module import_public {
+        // Privacy errors - importing private elements
+        export import im_public_c_private = m_private.c_private;
+        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Import declaration 'im_public_c_private' is using private name 'm_private'.
+        export import im_public_e_private = m_private.e_private;
+        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Import declaration 'im_public_e_private' is using private name 'm_private'.
+        export import im_public_f_private = m_private.f_private;
+        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Import declaration 'im_public_f_private' is using private name 'm_private'.
+        export import im_public_v_private = m_private.v_private;
+        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Import declaration 'im_public_v_private' is using private name 'm_private'.
+        export import im_public_i_private = m_private.i_private;
+        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Import declaration 'im_public_i_private' is using private name 'm_private'.
+        export import im_public_mi_private = m_private.mi_private;
+        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Import declaration 'im_public_mi_private' is using private name 'm_private'.
+        export import im_public_mu_private = m_private.mu_private;
+        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Import declaration 'im_public_mu_private' is using private name 'm_private'.
+    
+        // Usage of privacy error imports
+        var privateUse_im_public_c_private = new im_public_c_private();
+        export var publicUse_im_public_c_private = new im_public_c_private();
+        var privateUse_im_public_e_private = im_public_e_private.Happy;
+        export var publicUse_im_public_e_private = im_public_e_private.Grumpy;
+        var privateUse_im_public_f_private = im_public_f_private();
+        export var publicUse_im_public_f_private = im_public_f_private();
+        var privateUse_im_public_v_private = im_public_v_private;
+        export var publicUse_im_public_v_private = im_public_v_private;
+        var privateUse_im_public_i_private: im_public_i_private;
+        export var publicUse_im_public_i_private: im_public_i_private;
+        var privateUse_im_public_mi_private = new im_public_mi_private.c();
+        export var publicUse_im_public_mi_private = new im_public_mi_private.c();
+        var privateUse_im_public_mu_private: im_public_mu_private.i;
+        export var publicUse_im_public_mu_private: im_public_mu_private.i;
+    
+    
+        // No Privacy errors - importing public elements
+        export import im_public_c_public = m_public.c_public;
+        export import im_public_e_public = m_public.e_public;
+        export import im_public_f_public = m_public.f_public;
+        export import im_public_v_public = m_public.v_public;
+        export import im_public_i_public = m_public.i_public;
+        export import im_public_mi_public = m_public.mi_public;
+        export import im_public_mu_public = m_public.mu_public;
+    
+        // Usage of above
+        var privateUse_im_public_c_public = new im_public_c_public();
+        export var publicUse_im_public_c_public = new im_public_c_public();
+        var privateUse_im_public_e_public = im_public_e_public.Happy;
+        export var publicUse_im_public_e_public = im_public_e_public.Grumpy;
+        var privateUse_im_public_f_public = im_public_f_public();
+        export var publicUse_im_public_f_public = im_public_f_public();
+        var privateUse_im_public_v_public = im_public_v_public;
+        export var publicUse_im_public_v_public = im_public_v_public;
+        var privateUse_im_public_i_public: im_public_i_public;
+        export var publicUse_im_public_i_public: im_public_i_public;
+        var privateUse_im_public_mi_public = new im_public_mi_public.c();
+        export var publicUse_im_public_mi_public = new im_public_mi_public.c();
+        var privateUse_im_public_mu_public: im_public_mu_public.i;
+        export var publicUse_im_public_mu_public: im_public_mu_public.i;
+    }
+    
+    module import_private {
+        // No Privacy errors - importing private elements
+        export import im_private_c_private = m_private.c_private;
+        export import im_private_e_private = m_private.e_private;
+        export import im_private_f_private = m_private.f_private;
+        export import im_private_v_private = m_private.v_private;
+        export import im_private_i_private = m_private.i_private;
+        export import im_private_mi_private = m_private.mi_private;
+        export import im_private_mu_private = m_private.mu_private;
+    
+        // Usage of above decls
+        var privateUse_im_private_c_private = new im_private_c_private();
+        export var publicUse_im_private_c_private = new im_private_c_private();
+        var privateUse_im_private_e_private = im_private_e_private.Happy;
+        export var publicUse_im_private_e_private = im_private_e_private.Grumpy;
+        var privateUse_im_private_f_private = im_private_f_private();
+        export var publicUse_im_private_f_private = im_private_f_private();
+        var privateUse_im_private_v_private = im_private_v_private;
+        export var publicUse_im_private_v_private = im_private_v_private;
+        var privateUse_im_private_i_private: im_private_i_private;
+        export var publicUse_im_private_i_private: im_private_i_private;
+        var privateUse_im_private_mi_private = new im_private_mi_private.c();
+        export var publicUse_im_private_mi_private = new im_private_mi_private.c();
+        var privateUse_im_private_mu_private: im_private_mu_private.i;
+        export var publicUse_im_private_mu_private: im_private_mu_private.i;
+    
+        // No privacy Error - importing public elements
+        export import im_private_c_public = m_public.c_public;
+        export import im_private_e_public = m_public.e_public;
+        export import im_private_f_public = m_public.f_public;
+        export import im_private_v_public = m_public.v_public;
+        export import im_private_i_public = m_public.i_public;
+        export import im_private_mi_public = m_public.mi_public;
+        export import im_private_mu_public = m_public.mu_public;
+    
+        // Usage of no privacy error imports
+        var privateUse_im_private_c_public = new im_private_c_public();
+        export var publicUse_im_private_c_public = new im_private_c_public();
+        var privateUse_im_private_e_public = im_private_e_public.Happy;
+        export var publicUse_im_private_e_public = im_private_e_public.Grumpy;
+        var privateUse_im_private_f_public = im_private_f_public();
+        export var publicUse_im_private_f_public = im_private_f_public();
+        var privateUse_im_private_v_public = im_private_v_public;
+        export var publicUse_im_private_v_public = im_private_v_public;
+        var privateUse_im_private_i_public: im_private_i_public;
+        export var publicUse_im_private_i_public: im_private_i_public;
+        var privateUse_im_private_mi_public = new im_private_mi_public.c();
+        export var publicUse_im_private_mi_public = new im_private_mi_public.c();
+        var privateUse_im_private_mu_public: im_private_mu_public.i;
+        export var publicUse_im_private_mu_public: im_private_mu_public.i;
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/privacyLocalInternalReferenceImportWithExport.types b/tests/baselines/reference/privacyLocalInternalReferenceImportWithExport.types
deleted file mode 100644
index 197393e242e..00000000000
--- a/tests/baselines/reference/privacyLocalInternalReferenceImportWithExport.types
+++ /dev/null
@@ -1,537 +0,0 @@
-=== tests/cases/compiler/privacyLocalInternalReferenceImportWithExport.ts ===
-// private elements
-module m_private {
->m_private : m_private
-
-    export class c_private {
->c_private : c_private
-    }
-    export enum e_private {
->e_private : e_private
-
-        Happy,
->Happy : e_private
-
-        Grumpy
->Grumpy : e_private
-    }
-    export function f_private() {
->f_private : typeof f_private
-
-        return new c_private();
->new c_private() : c_private
->c_private : typeof c_private
-    }
-    export var v_private = new c_private();
->v_private : c_private
->new c_private() : c_private
->c_private : typeof c_private
-
-    export interface i_private {
->i_private : i_private
-    }
-    export module mi_private {
->mi_private : mi_private
-
-        export class c {
->c : c
-        }
-    }
-    export module mu_private {
->mu_private : mu_private
-
-        export interface i {
->i : i
-        }
-    }
-}
-
-// Public elements
-export module m_public {
->m_public : m_public
-
-    export class c_public {
->c_public : c_public
-    }
-    export enum e_public {
->e_public : e_public
-
-        Happy,
->Happy : e_public
-
-        Grumpy
->Grumpy : e_public
-    }
-    export function f_public() {
->f_public : typeof f_public
-
-        return new c_public();
->new c_public() : c_public
->c_public : typeof c_public
-    }
-    export var v_public = 10;
->v_public : number
-
-    export interface i_public {
->i_public : i_public
-    }
-    export module mi_public {
->mi_public : mi_public
-
-        export class c {
->c : c
-        }
-    }
-    export module mu_public {
->mu_public : mu_public
-
-        export interface i {
->i : i
-        }
-    }
-}
-
-export module import_public {
->import_public : import_public
-
-    // Privacy errors - importing private elements
-    export import im_public_c_private = m_private.c_private;
->im_public_c_private : im_public_c_private
->m_private : typeof m_private
->c_private : im_public_c_private
-
-    export import im_public_e_private = m_private.e_private;
->im_public_e_private : im_public_e_private
->m_private : typeof m_private
->e_private : im_public_e_private
-
-    export import im_public_f_private = m_private.f_private;
->im_public_f_private : im_public_f_private
->m_private : typeof m_private
->f_private : typeof im_public_f_private
-
-    export import im_public_v_private = m_private.v_private;
->im_public_v_private : im_public_v_private
->m_private : typeof m_private
->v_private : im_public_c_private
-
-    export import im_public_i_private = m_private.i_private;
->im_public_i_private : im_public_i_private
->m_private : typeof m_private
->i_private : im_public_i_private
-
-    export import im_public_mi_private = m_private.mi_private;
->im_public_mi_private : im_public_mi_private
->m_private : typeof m_private
->mi_private : typeof im_public_mi_private
-
-    export import im_public_mu_private = m_private.mu_private;
->im_public_mu_private : im_public_mu_private
->m_private : typeof m_private
->mu_private : im_public_mu_private
-
-    // Usage of privacy error imports
-    var privateUse_im_public_c_private = new im_public_c_private();
->privateUse_im_public_c_private : im_public_c_private
->new im_public_c_private() : im_public_c_private
->im_public_c_private : typeof im_public_c_private
-
-    export var publicUse_im_public_c_private = new im_public_c_private();
->publicUse_im_public_c_private : im_public_c_private
->new im_public_c_private() : im_public_c_private
->im_public_c_private : typeof im_public_c_private
-
-    var privateUse_im_public_e_private = im_public_e_private.Happy;
->privateUse_im_public_e_private : im_public_e_private
->im_public_e_private.Happy : im_public_e_private
->im_public_e_private : typeof im_public_e_private
->Happy : im_public_e_private
-
-    export var publicUse_im_public_e_private = im_public_e_private.Grumpy;
->publicUse_im_public_e_private : im_public_e_private
->im_public_e_private.Grumpy : im_public_e_private
->im_public_e_private : typeof im_public_e_private
->Grumpy : im_public_e_private
-
-    var privateUse_im_public_f_private = im_public_f_private();
->privateUse_im_public_f_private : im_public_c_private
->im_public_f_private() : im_public_c_private
->im_public_f_private : typeof im_public_f_private
-
-    export var publicUse_im_public_f_private = im_public_f_private();
->publicUse_im_public_f_private : im_public_c_private
->im_public_f_private() : im_public_c_private
->im_public_f_private : typeof im_public_f_private
-
-    var privateUse_im_public_v_private = im_public_v_private;
->privateUse_im_public_v_private : im_public_c_private
->im_public_v_private : im_public_c_private
-
-    export var publicUse_im_public_v_private = im_public_v_private;
->publicUse_im_public_v_private : im_public_c_private
->im_public_v_private : im_public_c_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
->new im_public_mi_private.c() : im_public_mi_private.c
->im_public_mi_private.c : typeof im_public_mi_private.c
->im_public_mi_private : typeof im_public_mi_private
->c : typeof im_public_mi_private.c
-
-    export var publicUse_im_public_mi_private = new im_public_mi_private.c();
->publicUse_im_public_mi_private : im_public_mi_private.c
->new im_public_mi_private.c() : im_public_mi_private.c
->im_public_mi_private.c : typeof im_public_mi_private.c
->im_public_mi_private : typeof im_public_mi_private
->c : typeof 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 : im_public_mu_private
->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 : im_public_mu_private
->i : im_public_mu_private.i
-
-
-    // No Privacy errors - importing public elements
-    export import im_public_c_public = m_public.c_public;
->im_public_c_public : im_public_c_public
->m_public : typeof m_public
->c_public : im_public_c_public
-
-    export import im_public_e_public = m_public.e_public;
->im_public_e_public : im_public_e_public
->m_public : typeof m_public
->e_public : im_public_e_public
-
-    export import im_public_f_public = m_public.f_public;
->im_public_f_public : im_public_f_public
->m_public : typeof m_public
->f_public : typeof im_public_f_public
-
-    export import im_public_v_public = m_public.v_public;
->im_public_v_public : im_public_v_public
->m_public : typeof m_public
->v_public : number
-
-    export import im_public_i_public = m_public.i_public;
->im_public_i_public : im_public_i_public
->m_public : typeof m_public
->i_public : im_public_i_public
-
-    export import im_public_mi_public = m_public.mi_public;
->im_public_mi_public : im_public_mi_public
->m_public : typeof m_public
->mi_public : typeof im_public_mi_public
-
-    export import im_public_mu_public = m_public.mu_public;
->im_public_mu_public : im_public_mu_public
->m_public : typeof m_public
->mu_public : im_public_mu_public
-
-    // Usage of above
-    var privateUse_im_public_c_public = new im_public_c_public();
->privateUse_im_public_c_public : im_public_c_public
->new im_public_c_public() : im_public_c_public
->im_public_c_public : typeof im_public_c_public
-
-    export var publicUse_im_public_c_public = new im_public_c_public();
->publicUse_im_public_c_public : im_public_c_public
->new im_public_c_public() : im_public_c_public
->im_public_c_public : typeof im_public_c_public
-
-    var privateUse_im_public_e_public = im_public_e_public.Happy;
->privateUse_im_public_e_public : im_public_e_public
->im_public_e_public.Happy : im_public_e_public
->im_public_e_public : typeof im_public_e_public
->Happy : im_public_e_public
-
-    export var publicUse_im_public_e_public = im_public_e_public.Grumpy;
->publicUse_im_public_e_public : im_public_e_public
->im_public_e_public.Grumpy : im_public_e_public
->im_public_e_public : typeof im_public_e_public
->Grumpy : im_public_e_public
-
-    var privateUse_im_public_f_public = im_public_f_public();
->privateUse_im_public_f_public : im_public_c_public
->im_public_f_public() : im_public_c_public
->im_public_f_public : typeof im_public_f_public
-
-    export var publicUse_im_public_f_public = im_public_f_public();
->publicUse_im_public_f_public : im_public_c_public
->im_public_f_public() : im_public_c_public
->im_public_f_public : typeof im_public_f_public
-
-    var privateUse_im_public_v_public = im_public_v_public;
->privateUse_im_public_v_public : number
->im_public_v_public : number
-
-    export var publicUse_im_public_v_public = im_public_v_public;
->publicUse_im_public_v_public : number
->im_public_v_public : number
-
-    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
->new im_public_mi_public.c() : im_public_mi_public.c
->im_public_mi_public.c : typeof im_public_mi_public.c
->im_public_mi_public : typeof im_public_mi_public
->c : typeof im_public_mi_public.c
-
-    export var publicUse_im_public_mi_public = new im_public_mi_public.c();
->publicUse_im_public_mi_public : im_public_mi_public.c
->new im_public_mi_public.c() : im_public_mi_public.c
->im_public_mi_public.c : typeof im_public_mi_public.c
->im_public_mi_public : typeof im_public_mi_public
->c : typeof 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 : im_public_mu_public
->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 : im_public_mu_public
->i : im_public_mu_public.i
-}
-
-module import_private {
->import_private : import_private
-
-    // No Privacy errors - importing private elements
-    export import im_private_c_private = m_private.c_private;
->im_private_c_private : im_private_c_private
->m_private : typeof m_private
->c_private : im_private_c_private
-
-    export import im_private_e_private = m_private.e_private;
->im_private_e_private : im_private_e_private
->m_private : typeof m_private
->e_private : im_private_e_private
-
-    export import im_private_f_private = m_private.f_private;
->im_private_f_private : im_private_f_private
->m_private : typeof m_private
->f_private : typeof im_private_f_private
-
-    export import im_private_v_private = m_private.v_private;
->im_private_v_private : im_private_v_private
->m_private : typeof m_private
->v_private : im_private_c_private
-
-    export import im_private_i_private = m_private.i_private;
->im_private_i_private : im_private_i_private
->m_private : typeof m_private
->i_private : im_private_i_private
-
-    export import im_private_mi_private = m_private.mi_private;
->im_private_mi_private : im_private_mi_private
->m_private : typeof m_private
->mi_private : typeof im_private_mi_private
-
-    export import im_private_mu_private = m_private.mu_private;
->im_private_mu_private : im_private_mu_private
->m_private : typeof m_private
->mu_private : im_private_mu_private
-
-    // Usage of above decls
-    var privateUse_im_private_c_private = new im_private_c_private();
->privateUse_im_private_c_private : im_private_c_private
->new im_private_c_private() : im_private_c_private
->im_private_c_private : typeof im_private_c_private
-
-    export var publicUse_im_private_c_private = new im_private_c_private();
->publicUse_im_private_c_private : im_private_c_private
->new im_private_c_private() : im_private_c_private
->im_private_c_private : typeof im_private_c_private
-
-    var privateUse_im_private_e_private = im_private_e_private.Happy;
->privateUse_im_private_e_private : im_private_e_private
->im_private_e_private.Happy : im_private_e_private
->im_private_e_private : typeof im_private_e_private
->Happy : im_private_e_private
-
-    export var publicUse_im_private_e_private = im_private_e_private.Grumpy;
->publicUse_im_private_e_private : im_private_e_private
->im_private_e_private.Grumpy : im_private_e_private
->im_private_e_private : typeof im_private_e_private
->Grumpy : im_private_e_private
-
-    var privateUse_im_private_f_private = im_private_f_private();
->privateUse_im_private_f_private : im_private_c_private
->im_private_f_private() : im_private_c_private
->im_private_f_private : typeof im_private_f_private
-
-    export var publicUse_im_private_f_private = im_private_f_private();
->publicUse_im_private_f_private : im_private_c_private
->im_private_f_private() : im_private_c_private
->im_private_f_private : typeof im_private_f_private
-
-    var privateUse_im_private_v_private = im_private_v_private;
->privateUse_im_private_v_private : im_private_c_private
->im_private_v_private : im_private_c_private
-
-    export var publicUse_im_private_v_private = im_private_v_private;
->publicUse_im_private_v_private : im_private_c_private
->im_private_v_private : im_private_c_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
->new im_private_mi_private.c() : im_private_mi_private.c
->im_private_mi_private.c : typeof im_private_mi_private.c
->im_private_mi_private : typeof im_private_mi_private
->c : typeof im_private_mi_private.c
-
-    export var publicUse_im_private_mi_private = new im_private_mi_private.c();
->publicUse_im_private_mi_private : im_private_mi_private.c
->new im_private_mi_private.c() : im_private_mi_private.c
->im_private_mi_private.c : typeof im_private_mi_private.c
->im_private_mi_private : typeof im_private_mi_private
->c : typeof 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 : im_private_mu_private
->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 : im_private_mu_private
->i : im_private_mu_private.i
-
-    // No privacy Error - importing public elements
-    export import im_private_c_public = m_public.c_public;
->im_private_c_public : im_private_c_public
->m_public : typeof m_public
->c_public : im_private_c_public
-
-    export import im_private_e_public = m_public.e_public;
->im_private_e_public : im_private_e_public
->m_public : typeof m_public
->e_public : im_private_e_public
-
-    export import im_private_f_public = m_public.f_public;
->im_private_f_public : im_private_f_public
->m_public : typeof m_public
->f_public : typeof im_private_f_public
-
-    export import im_private_v_public = m_public.v_public;
->im_private_v_public : im_private_v_public
->m_public : typeof m_public
->v_public : number
-
-    export import im_private_i_public = m_public.i_public;
->im_private_i_public : im_private_i_public
->m_public : typeof m_public
->i_public : im_private_i_public
-
-    export import im_private_mi_public = m_public.mi_public;
->im_private_mi_public : im_private_mi_public
->m_public : typeof m_public
->mi_public : typeof im_private_mi_public
-
-    export import im_private_mu_public = m_public.mu_public;
->im_private_mu_public : im_private_mu_public
->m_public : typeof m_public
->mu_public : im_private_mu_public
-
-    // Usage of no privacy error imports
-    var privateUse_im_private_c_public = new im_private_c_public();
->privateUse_im_private_c_public : im_private_c_public
->new im_private_c_public() : im_private_c_public
->im_private_c_public : typeof im_private_c_public
-
-    export var publicUse_im_private_c_public = new im_private_c_public();
->publicUse_im_private_c_public : im_private_c_public
->new im_private_c_public() : im_private_c_public
->im_private_c_public : typeof im_private_c_public
-
-    var privateUse_im_private_e_public = im_private_e_public.Happy;
->privateUse_im_private_e_public : im_private_e_public
->im_private_e_public.Happy : im_private_e_public
->im_private_e_public : typeof im_private_e_public
->Happy : im_private_e_public
-
-    export var publicUse_im_private_e_public = im_private_e_public.Grumpy;
->publicUse_im_private_e_public : im_private_e_public
->im_private_e_public.Grumpy : im_private_e_public
->im_private_e_public : typeof im_private_e_public
->Grumpy : im_private_e_public
-
-    var privateUse_im_private_f_public = im_private_f_public();
->privateUse_im_private_f_public : im_private_c_public
->im_private_f_public() : im_private_c_public
->im_private_f_public : typeof im_private_f_public
-
-    export var publicUse_im_private_f_public = im_private_f_public();
->publicUse_im_private_f_public : im_private_c_public
->im_private_f_public() : im_private_c_public
->im_private_f_public : typeof im_private_f_public
-
-    var privateUse_im_private_v_public = im_private_v_public;
->privateUse_im_private_v_public : number
->im_private_v_public : number
-
-    export var publicUse_im_private_v_public = im_private_v_public;
->publicUse_im_private_v_public : number
->im_private_v_public : number
-
-    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
->new im_private_mi_public.c() : im_private_mi_public.c
->im_private_mi_public.c : typeof im_private_mi_public.c
->im_private_mi_public : typeof im_private_mi_public
->c : typeof im_private_mi_public.c
-
-    export var publicUse_im_private_mi_public = new im_private_mi_public.c();
->publicUse_im_private_mi_public : im_private_mi_public.c
->new im_private_mi_public.c() : im_private_mi_public.c
->im_private_mi_public.c : typeof im_private_mi_public.c
->im_private_mi_public : typeof im_private_mi_public
->c : typeof 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 : im_private_mu_public
->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 : im_private_mu_public
->i : im_private_mu_public.i
-}
diff --git a/tests/baselines/reference/privacyLocalInternalReferenceImportWithoutExport.errors.txt b/tests/baselines/reference/privacyLocalInternalReferenceImportWithoutExport.errors.txt
new file mode 100644
index 00000000000..7872b2b0715
--- /dev/null
+++ b/tests/baselines/reference/privacyLocalInternalReferenceImportWithoutExport.errors.txt
@@ -0,0 +1,163 @@
+==== tests/cases/compiler/privacyLocalInternalReferenceImportWithoutExport.ts (5 errors) ====
+    // private elements
+    module m_private {
+        export class c_private {
+        }
+        export enum e_private {
+            Happy,
+            Grumpy
+        }
+        export function f_private() {
+            return new c_private();
+        }
+        export var v_private = new c_private();
+        export interface i_private {
+        }
+        export module mi_private {
+            export class c {
+            }
+        }
+        export module mu_private {
+            export interface i {
+            }
+        }
+    }
+    
+    // Public elements
+    export module m_public {
+        export class c_public {
+        }
+        export enum e_public {
+            Happy,
+            Grumpy
+        }
+        export function f_public() {
+            return new c_public();
+        }
+        export var v_public = 10;
+        export interface i_public {
+        }
+        export module mi_public {
+            export class c {
+            }
+        }
+        export module mu_public {
+            export interface i {
+            }
+        }
+    }
+    
+    export module import_public {
+        // No Privacy errors - importing private elements
+        import im_private_c_private = m_private.c_private;
+        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Import declaration 'im_private_c_private' is using private name 'm_private'.
+        import im_private_e_private = m_private.e_private;
+        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Import declaration 'im_private_e_private' is using private name 'm_private'.
+        import im_private_f_private = m_private.f_private;
+        import im_private_v_private = m_private.v_private;
+        import im_private_i_private = m_private.i_private;
+        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Import declaration 'im_private_i_private' is using private name 'm_private'.
+        import im_private_mi_private = m_private.mi_private;
+        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Import declaration 'im_private_mi_private' is using private name 'm_private'.
+        import im_private_mu_private = m_private.mu_private;
+        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Import declaration 'im_private_mu_private' is using private name 'm_private'.
+    
+        // Usage of above decls
+        var privateUse_im_private_c_private = new im_private_c_private();
+        export var publicUse_im_private_c_private = new im_private_c_private();
+        var privateUse_im_private_e_private = im_private_e_private.Happy;
+        export var publicUse_im_private_e_private = im_private_e_private.Grumpy;
+        var privateUse_im_private_f_private = im_private_f_private();
+        export var publicUse_im_private_f_private = im_private_f_private();
+        var privateUse_im_private_v_private = im_private_v_private;
+        export var publicUse_im_private_v_private = im_private_v_private;
+        var privateUse_im_private_i_private: im_private_i_private;
+        export var publicUse_im_private_i_private: im_private_i_private;
+        var privateUse_im_private_mi_private = new im_private_mi_private.c();
+        export var publicUse_im_private_mi_private = new im_private_mi_private.c();
+        var privateUse_im_private_mu_private: im_private_mu_private.i;
+        export var publicUse_im_private_mu_private: im_private_mu_private.i;
+    
+    
+        // No Privacy errors - importing public elements
+        import im_private_c_public = m_public.c_public;
+        import im_private_e_public = m_public.e_public;
+        import im_private_f_public = m_public.f_public;
+        import im_private_v_public = m_public.v_public;
+        import im_private_i_public = m_public.i_public;
+        import im_private_mi_public = m_public.mi_public;
+        import im_private_mu_public = m_public.mu_public;
+    
+        // Usage of above decls
+        var privateUse_im_private_c_public = new im_private_c_public();
+        export var publicUse_im_private_c_public = new im_private_c_public();
+        var privateUse_im_private_e_public = im_private_e_public.Happy;
+        export var publicUse_im_private_e_public = im_private_e_public.Grumpy;
+        var privateUse_im_private_f_public = im_private_f_public();
+        export var publicUse_im_private_f_public = im_private_f_public();
+        var privateUse_im_private_v_public = im_private_v_public;
+        export var publicUse_im_private_v_public = im_private_v_public;
+        var privateUse_im_private_i_public: im_private_i_public;
+        export var publicUse_im_private_i_public: im_private_i_public;
+        var privateUse_im_private_mi_public = new im_private_mi_public.c();
+        export var publicUse_im_private_mi_public = new im_private_mi_public.c();
+        var privateUse_im_private_mu_public: im_private_mu_public.i;
+        export var publicUse_im_private_mu_public: im_private_mu_public.i;
+    }
+    
+    module import_private {
+        // No Privacy errors - importing private elements
+        import im_private_c_private = m_private.c_private;
+        import im_private_e_private = m_private.e_private;
+        import im_private_f_private = m_private.f_private;
+        import im_private_v_private = m_private.v_private;
+        import im_private_i_private = m_private.i_private;
+        import im_private_mi_private = m_private.mi_private;
+        import im_private_mu_private = m_private.mu_private;
+    
+        // Usage of above decls
+        var privateUse_im_private_c_private = new im_private_c_private();
+        export var publicUse_im_private_c_private = new im_private_c_private();
+        var privateUse_im_private_e_private = im_private_e_private.Happy;
+        export var publicUse_im_private_e_private = im_private_e_private.Grumpy;
+        var privateUse_im_private_f_private = im_private_f_private();
+        export var publicUse_im_private_f_private = im_private_f_private();
+        var privateUse_im_private_v_private = im_private_v_private;
+        export var publicUse_im_private_v_private = im_private_v_private;
+        var privateUse_im_private_i_private: im_private_i_private;
+        export var publicUse_im_private_i_private: im_private_i_private;
+        var privateUse_im_private_mi_private = new im_private_mi_private.c();
+        export var publicUse_im_private_mi_private = new im_private_mi_private.c();
+        var privateUse_im_private_mu_private: im_private_mu_private.i;
+        export var publicUse_im_private_mu_private: im_private_mu_private.i;
+    
+        // No privacy Error - importing public elements
+        import im_private_c_public = m_public.c_public;
+        import im_private_e_public = m_public.e_public;
+        import im_private_f_public = m_public.f_public;
+        import im_private_v_public = m_public.v_public;
+        import im_private_i_public = m_public.i_public;
+        import im_private_mi_public = m_public.mi_public;
+        import im_private_mu_public = m_public.mu_public;
+    
+        // Usage of above decls
+        var privateUse_im_private_c_public = new im_private_c_public();
+        export var publicUse_im_private_c_public = new im_private_c_public();
+        var privateUse_im_private_e_public = im_private_e_public.Happy;
+        export var publicUse_im_private_e_public = im_private_e_public.Grumpy;
+        var privateUse_im_private_f_public = im_private_f_public();
+        export var publicUse_im_private_f_public = im_private_f_public();
+        var privateUse_im_private_v_public = im_private_v_public;
+        export var publicUse_im_private_v_public = im_private_v_public;
+        var privateUse_im_private_i_public: im_private_i_public;
+        export var publicUse_im_private_i_public: im_private_i_public;
+        var privateUse_im_private_mi_public = new im_private_mi_public.c();
+        export var publicUse_im_private_mi_public = new im_private_mi_public.c();
+        var privateUse_im_private_mu_public: im_private_mu_public.i;
+        export var publicUse_im_private_mu_public: im_private_mu_public.i;
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/privacyLocalInternalReferenceImportWithoutExport.types b/tests/baselines/reference/privacyLocalInternalReferenceImportWithoutExport.types
deleted file mode 100644
index 521953312e2..00000000000
--- a/tests/baselines/reference/privacyLocalInternalReferenceImportWithoutExport.types
+++ /dev/null
@@ -1,537 +0,0 @@
-=== tests/cases/compiler/privacyLocalInternalReferenceImportWithoutExport.ts ===
-// private elements
-module m_private {
->m_private : m_private
-
-    export class c_private {
->c_private : c_private
-    }
-    export enum e_private {
->e_private : e_private
-
-        Happy,
->Happy : e_private
-
-        Grumpy
->Grumpy : e_private
-    }
-    export function f_private() {
->f_private : typeof f_private
-
-        return new c_private();
->new c_private() : c_private
->c_private : typeof c_private
-    }
-    export var v_private = new c_private();
->v_private : c_private
->new c_private() : c_private
->c_private : typeof c_private
-
-    export interface i_private {
->i_private : i_private
-    }
-    export module mi_private {
->mi_private : mi_private
-
-        export class c {
->c : c
-        }
-    }
-    export module mu_private {
->mu_private : mu_private
-
-        export interface i {
->i : i
-        }
-    }
-}
-
-// Public elements
-export module m_public {
->m_public : m_public
-
-    export class c_public {
->c_public : c_public
-    }
-    export enum e_public {
->e_public : e_public
-
-        Happy,
->Happy : e_public
-
-        Grumpy
->Grumpy : e_public
-    }
-    export function f_public() {
->f_public : typeof f_public
-
-        return new c_public();
->new c_public() : c_public
->c_public : typeof c_public
-    }
-    export var v_public = 10;
->v_public : number
-
-    export interface i_public {
->i_public : i_public
-    }
-    export module mi_public {
->mi_public : mi_public
-
-        export class c {
->c : c
-        }
-    }
-    export module mu_public {
->mu_public : mu_public
-
-        export interface i {
->i : i
-        }
-    }
-}
-
-export module import_public {
->import_public : import_public
-
-    // No Privacy errors - importing private elements
-    import im_private_c_private = m_private.c_private;
->im_private_c_private : im_private_c_private
->m_private : typeof m_private
->c_private : im_private_c_private
-
-    import im_private_e_private = m_private.e_private;
->im_private_e_private : im_private_e_private
->m_private : typeof m_private
->e_private : im_private_e_private
-
-    import im_private_f_private = m_private.f_private;
->im_private_f_private : im_private_f_private
->m_private : typeof m_private
->f_private : typeof im_private_f_private
-
-    import im_private_v_private = m_private.v_private;
->im_private_v_private : im_private_v_private
->m_private : typeof m_private
->v_private : im_private_c_private
-
-    import im_private_i_private = m_private.i_private;
->im_private_i_private : im_private_i_private
->m_private : typeof m_private
->i_private : im_private_i_private
-
-    import im_private_mi_private = m_private.mi_private;
->im_private_mi_private : im_private_mi_private
->m_private : typeof m_private
->mi_private : typeof im_private_mi_private
-
-    import im_private_mu_private = m_private.mu_private;
->im_private_mu_private : im_private_mu_private
->m_private : typeof m_private
->mu_private : im_private_mu_private
-
-    // Usage of above decls
-    var privateUse_im_private_c_private = new im_private_c_private();
->privateUse_im_private_c_private : im_private_c_private
->new im_private_c_private() : im_private_c_private
->im_private_c_private : typeof im_private_c_private
-
-    export var publicUse_im_private_c_private = new im_private_c_private();
->publicUse_im_private_c_private : im_private_c_private
->new im_private_c_private() : im_private_c_private
->im_private_c_private : typeof im_private_c_private
-
-    var privateUse_im_private_e_private = im_private_e_private.Happy;
->privateUse_im_private_e_private : im_private_e_private
->im_private_e_private.Happy : im_private_e_private
->im_private_e_private : typeof im_private_e_private
->Happy : im_private_e_private
-
-    export var publicUse_im_private_e_private = im_private_e_private.Grumpy;
->publicUse_im_private_e_private : im_private_e_private
->im_private_e_private.Grumpy : im_private_e_private
->im_private_e_private : typeof im_private_e_private
->Grumpy : im_private_e_private
-
-    var privateUse_im_private_f_private = im_private_f_private();
->privateUse_im_private_f_private : im_private_c_private
->im_private_f_private() : im_private_c_private
->im_private_f_private : typeof im_private_f_private
-
-    export var publicUse_im_private_f_private = im_private_f_private();
->publicUse_im_private_f_private : im_private_c_private
->im_private_f_private() : im_private_c_private
->im_private_f_private : typeof im_private_f_private
-
-    var privateUse_im_private_v_private = im_private_v_private;
->privateUse_im_private_v_private : im_private_c_private
->im_private_v_private : im_private_c_private
-
-    export var publicUse_im_private_v_private = im_private_v_private;
->publicUse_im_private_v_private : im_private_c_private
->im_private_v_private : im_private_c_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
->new im_private_mi_private.c() : im_private_mi_private.c
->im_private_mi_private.c : typeof im_private_mi_private.c
->im_private_mi_private : typeof im_private_mi_private
->c : typeof im_private_mi_private.c
-
-    export var publicUse_im_private_mi_private = new im_private_mi_private.c();
->publicUse_im_private_mi_private : im_private_mi_private.c
->new im_private_mi_private.c() : im_private_mi_private.c
->im_private_mi_private.c : typeof im_private_mi_private.c
->im_private_mi_private : typeof im_private_mi_private
->c : typeof 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 : im_private_mu_private
->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 : im_private_mu_private
->i : im_private_mu_private.i
-
-
-    // No Privacy errors - importing public elements
-    import im_private_c_public = m_public.c_public;
->im_private_c_public : im_private_c_public
->m_public : typeof m_public
->c_public : im_private_c_public
-
-    import im_private_e_public = m_public.e_public;
->im_private_e_public : im_private_e_public
->m_public : typeof m_public
->e_public : im_private_e_public
-
-    import im_private_f_public = m_public.f_public;
->im_private_f_public : im_private_f_public
->m_public : typeof m_public
->f_public : typeof im_private_f_public
-
-    import im_private_v_public = m_public.v_public;
->im_private_v_public : im_private_v_public
->m_public : typeof m_public
->v_public : number
-
-    import im_private_i_public = m_public.i_public;
->im_private_i_public : im_private_i_public
->m_public : typeof m_public
->i_public : im_private_i_public
-
-    import im_private_mi_public = m_public.mi_public;
->im_private_mi_public : im_private_mi_public
->m_public : typeof m_public
->mi_public : typeof im_private_mi_public
-
-    import im_private_mu_public = m_public.mu_public;
->im_private_mu_public : im_private_mu_public
->m_public : typeof m_public
->mu_public : im_private_mu_public
-
-    // Usage of above decls
-    var privateUse_im_private_c_public = new im_private_c_public();
->privateUse_im_private_c_public : im_private_c_public
->new im_private_c_public() : im_private_c_public
->im_private_c_public : typeof im_private_c_public
-
-    export var publicUse_im_private_c_public = new im_private_c_public();
->publicUse_im_private_c_public : im_private_c_public
->new im_private_c_public() : im_private_c_public
->im_private_c_public : typeof im_private_c_public
-
-    var privateUse_im_private_e_public = im_private_e_public.Happy;
->privateUse_im_private_e_public : im_private_e_public
->im_private_e_public.Happy : im_private_e_public
->im_private_e_public : typeof im_private_e_public
->Happy : im_private_e_public
-
-    export var publicUse_im_private_e_public = im_private_e_public.Grumpy;
->publicUse_im_private_e_public : im_private_e_public
->im_private_e_public.Grumpy : im_private_e_public
->im_private_e_public : typeof im_private_e_public
->Grumpy : im_private_e_public
-
-    var privateUse_im_private_f_public = im_private_f_public();
->privateUse_im_private_f_public : im_private_c_public
->im_private_f_public() : im_private_c_public
->im_private_f_public : typeof im_private_f_public
-
-    export var publicUse_im_private_f_public = im_private_f_public();
->publicUse_im_private_f_public : im_private_c_public
->im_private_f_public() : im_private_c_public
->im_private_f_public : typeof im_private_f_public
-
-    var privateUse_im_private_v_public = im_private_v_public;
->privateUse_im_private_v_public : number
->im_private_v_public : number
-
-    export var publicUse_im_private_v_public = im_private_v_public;
->publicUse_im_private_v_public : number
->im_private_v_public : number
-
-    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
->new im_private_mi_public.c() : im_private_mi_public.c
->im_private_mi_public.c : typeof im_private_mi_public.c
->im_private_mi_public : typeof im_private_mi_public
->c : typeof im_private_mi_public.c
-
-    export var publicUse_im_private_mi_public = new im_private_mi_public.c();
->publicUse_im_private_mi_public : im_private_mi_public.c
->new im_private_mi_public.c() : im_private_mi_public.c
->im_private_mi_public.c : typeof im_private_mi_public.c
->im_private_mi_public : typeof im_private_mi_public
->c : typeof 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 : im_private_mu_public
->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 : im_private_mu_public
->i : im_private_mu_public.i
-}
-
-module import_private {
->import_private : import_private
-
-    // No Privacy errors - importing private elements
-    import im_private_c_private = m_private.c_private;
->im_private_c_private : im_private_c_private
->m_private : typeof m_private
->c_private : im_private_c_private
-
-    import im_private_e_private = m_private.e_private;
->im_private_e_private : im_private_e_private
->m_private : typeof m_private
->e_private : im_private_e_private
-
-    import im_private_f_private = m_private.f_private;
->im_private_f_private : im_private_f_private
->m_private : typeof m_private
->f_private : typeof im_private_f_private
-
-    import im_private_v_private = m_private.v_private;
->im_private_v_private : im_private_v_private
->m_private : typeof m_private
->v_private : im_private_c_private
-
-    import im_private_i_private = m_private.i_private;
->im_private_i_private : im_private_i_private
->m_private : typeof m_private
->i_private : im_private_i_private
-
-    import im_private_mi_private = m_private.mi_private;
->im_private_mi_private : im_private_mi_private
->m_private : typeof m_private
->mi_private : typeof im_private_mi_private
-
-    import im_private_mu_private = m_private.mu_private;
->im_private_mu_private : im_private_mu_private
->m_private : typeof m_private
->mu_private : im_private_mu_private
-
-    // Usage of above decls
-    var privateUse_im_private_c_private = new im_private_c_private();
->privateUse_im_private_c_private : im_private_c_private
->new im_private_c_private() : im_private_c_private
->im_private_c_private : typeof im_private_c_private
-
-    export var publicUse_im_private_c_private = new im_private_c_private();
->publicUse_im_private_c_private : im_private_c_private
->new im_private_c_private() : im_private_c_private
->im_private_c_private : typeof im_private_c_private
-
-    var privateUse_im_private_e_private = im_private_e_private.Happy;
->privateUse_im_private_e_private : im_private_e_private
->im_private_e_private.Happy : im_private_e_private
->im_private_e_private : typeof im_private_e_private
->Happy : im_private_e_private
-
-    export var publicUse_im_private_e_private = im_private_e_private.Grumpy;
->publicUse_im_private_e_private : im_private_e_private
->im_private_e_private.Grumpy : im_private_e_private
->im_private_e_private : typeof im_private_e_private
->Grumpy : im_private_e_private
-
-    var privateUse_im_private_f_private = im_private_f_private();
->privateUse_im_private_f_private : im_private_c_private
->im_private_f_private() : im_private_c_private
->im_private_f_private : typeof im_private_f_private
-
-    export var publicUse_im_private_f_private = im_private_f_private();
->publicUse_im_private_f_private : im_private_c_private
->im_private_f_private() : im_private_c_private
->im_private_f_private : typeof im_private_f_private
-
-    var privateUse_im_private_v_private = im_private_v_private;
->privateUse_im_private_v_private : im_private_c_private
->im_private_v_private : im_private_c_private
-
-    export var publicUse_im_private_v_private = im_private_v_private;
->publicUse_im_private_v_private : im_private_c_private
->im_private_v_private : im_private_c_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
->new im_private_mi_private.c() : im_private_mi_private.c
->im_private_mi_private.c : typeof im_private_mi_private.c
->im_private_mi_private : typeof im_private_mi_private
->c : typeof im_private_mi_private.c
-
-    export var publicUse_im_private_mi_private = new im_private_mi_private.c();
->publicUse_im_private_mi_private : im_private_mi_private.c
->new im_private_mi_private.c() : im_private_mi_private.c
->im_private_mi_private.c : typeof im_private_mi_private.c
->im_private_mi_private : typeof im_private_mi_private
->c : typeof 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 : im_private_mu_private
->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 : im_private_mu_private
->i : im_private_mu_private.i
-
-    // No privacy Error - importing public elements
-    import im_private_c_public = m_public.c_public;
->im_private_c_public : im_private_c_public
->m_public : typeof m_public
->c_public : im_private_c_public
-
-    import im_private_e_public = m_public.e_public;
->im_private_e_public : im_private_e_public
->m_public : typeof m_public
->e_public : im_private_e_public
-
-    import im_private_f_public = m_public.f_public;
->im_private_f_public : im_private_f_public
->m_public : typeof m_public
->f_public : typeof im_private_f_public
-
-    import im_private_v_public = m_public.v_public;
->im_private_v_public : im_private_v_public
->m_public : typeof m_public
->v_public : number
-
-    import im_private_i_public = m_public.i_public;
->im_private_i_public : im_private_i_public
->m_public : typeof m_public
->i_public : im_private_i_public
-
-    import im_private_mi_public = m_public.mi_public;
->im_private_mi_public : im_private_mi_public
->m_public : typeof m_public
->mi_public : typeof im_private_mi_public
-
-    import im_private_mu_public = m_public.mu_public;
->im_private_mu_public : im_private_mu_public
->m_public : typeof m_public
->mu_public : im_private_mu_public
-
-    // Usage of above decls
-    var privateUse_im_private_c_public = new im_private_c_public();
->privateUse_im_private_c_public : im_private_c_public
->new im_private_c_public() : im_private_c_public
->im_private_c_public : typeof im_private_c_public
-
-    export var publicUse_im_private_c_public = new im_private_c_public();
->publicUse_im_private_c_public : im_private_c_public
->new im_private_c_public() : im_private_c_public
->im_private_c_public : typeof im_private_c_public
-
-    var privateUse_im_private_e_public = im_private_e_public.Happy;
->privateUse_im_private_e_public : im_private_e_public
->im_private_e_public.Happy : im_private_e_public
->im_private_e_public : typeof im_private_e_public
->Happy : im_private_e_public
-
-    export var publicUse_im_private_e_public = im_private_e_public.Grumpy;
->publicUse_im_private_e_public : im_private_e_public
->im_private_e_public.Grumpy : im_private_e_public
->im_private_e_public : typeof im_private_e_public
->Grumpy : im_private_e_public
-
-    var privateUse_im_private_f_public = im_private_f_public();
->privateUse_im_private_f_public : im_private_c_public
->im_private_f_public() : im_private_c_public
->im_private_f_public : typeof im_private_f_public
-
-    export var publicUse_im_private_f_public = im_private_f_public();
->publicUse_im_private_f_public : im_private_c_public
->im_private_f_public() : im_private_c_public
->im_private_f_public : typeof im_private_f_public
-
-    var privateUse_im_private_v_public = im_private_v_public;
->privateUse_im_private_v_public : number
->im_private_v_public : number
-
-    export var publicUse_im_private_v_public = im_private_v_public;
->publicUse_im_private_v_public : number
->im_private_v_public : number
-
-    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
->new im_private_mi_public.c() : im_private_mi_public.c
->im_private_mi_public.c : typeof im_private_mi_public.c
->im_private_mi_public : typeof im_private_mi_public
->c : typeof im_private_mi_public.c
-
-    export var publicUse_im_private_mi_public = new im_private_mi_public.c();
->publicUse_im_private_mi_public : im_private_mi_public.c
->new im_private_mi_public.c() : im_private_mi_public.c
->im_private_mi_public.c : typeof im_private_mi_public.c
->im_private_mi_public : typeof im_private_mi_public
->c : typeof 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 : im_private_mu_public
->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 : im_private_mu_public
->i : im_private_mu_public.i
-}
diff --git a/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithExport.errors.txt b/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithExport.errors.txt
deleted file mode 100644
index 7a102fce1f2..00000000000
--- a/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithExport.errors.txt
+++ /dev/null
@@ -1,57 +0,0 @@
-==== tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithExport_core.ts (6 errors) ====
-    // Privacy errors - importing private elements
-    export import im_public_mi_private = require("privacyTopLevelAmbientExternalModuleImportWithExport_require");
-    export import im_public_mu_private = require("privacyTopLevelAmbientExternalModuleImportWithExport_require1");
-    export import im_public_mi_public = require("m");
-                                                ~~~
-!!! Cannot find external module 'm'.
-    export import im_public_mu_public = require("m2");
-                                                ~~~~
-!!! Cannot find external module 'm2'.
-    
-    // Usage of privacy error imports
-    var privateUse_im_public_mi_private = new im_public_mi_private.c_private();
-                                                                   ~~~~~~~~~
-!!! Property 'c_private' does not exist on type 'typeof "tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithExport_require"'.
-    export var publicUse_im_public_mi_private = new im_public_mi_private.c_private();
-                                                                         ~~~~~~~~~
-!!! Property 'c_private' does not exist on type 'typeof "tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithExport_require"'.
-    var privateUse_im_public_mu_private = new im_public_mu_private.c_private();
-                                                                   ~~~~~~~~~
-!!! Property 'c_private' does not exist on type 'typeof "tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithExport_require1"'.
-    export var publicUse_im_public_mu_private = new im_public_mu_private.c_private();
-                                                                         ~~~~~~~~~
-!!! Property 'c_private' does not exist on type 'typeof "tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithExport_require1"'.
-    var privateUse_im_public_mi_public = new im_public_mi_public.c_public();
-    export var publicUse_im_public_mi_public = new im_public_mi_public.c_public();
-    var privateUse_im_public_mi_public = new im_public_mi_public.c_public();
-    export var publicUse_im_public_mi_public = new im_public_mi_public.c_public();
-    
-==== tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithExport_require.ts (0 errors) ====
-    // Public elements
-    export class c_public {
-        foo: string;
-    }
-    
-==== tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithExport_require1.ts (0 errors) ====
-    export class c_public {
-        bar: string;
-    }
-    
-==== tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithExport_require2.ts (0 errors) ====
-    // private elements
-    // Export - Error ambient modules allowed only in global
-    declare module 'm' {
-        export class c_private {
-            baz: string;
-        }
-    }
-    
-    
-==== tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithExport_require3.ts (0 errors) ====
-    declare module 'm2' {
-        export class c_private {
-            bing: string;
-        }
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithExport.js b/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithExport.js
index 238ec4d52f7..4ae42e1118e 100644
--- a/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithExport.js
+++ b/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithExport.js
@@ -29,6 +29,8 @@ declare module 'm2' {
 }
 
 //// [privacyTopLevelAmbientExternalModuleImportWithExport_core.ts]
+///<reference path='privacyTopLevelAmbientExternalModuleImportWithExport_require2.ts'/>
+///<reference path='privacyTopLevelAmbientExternalModuleImportWithExport_require3.ts'/>
 // Privacy errors - importing private elements
 export import im_public_mi_private = require("privacyTopLevelAmbientExternalModuleImportWithExport_require");
 export import im_public_mu_private = require("privacyTopLevelAmbientExternalModuleImportWithExport_require1");
@@ -36,16 +38,18 @@ export import im_public_mi_public = require("m");
 export import im_public_mu_public = require("m2");
 
 // Usage of privacy error imports
-var privateUse_im_public_mi_private = new im_public_mi_private.c_private();
-export var publicUse_im_public_mi_private = new im_public_mi_private.c_private();
-var privateUse_im_public_mu_private = new im_public_mu_private.c_private();
-export var publicUse_im_public_mu_private = new im_public_mu_private.c_private();
-var privateUse_im_public_mi_public = new im_public_mi_public.c_public();
-export var publicUse_im_public_mi_public = new im_public_mi_public.c_public();
-var privateUse_im_public_mi_public = new im_public_mi_public.c_public();
-export var publicUse_im_public_mi_public = new im_public_mi_public.c_public();
+var privateUse_im_public_mi_private = new im_public_mi_private.c_public();
+export var publicUse_im_public_mi_private = new im_public_mi_private.c_public();
+var privateUse_im_public_mu_private = new im_public_mu_private.c_public();
+export var publicUse_im_public_mu_private = new im_public_mu_private.c_public();
+var privateUse_im_public_mi_public = new im_public_mi_public.c_private();
+export var publicUse_im_public_mi_public = new im_public_mi_public.c_private();
+var privateUse_im_public_mi_public = new im_public_mi_public.c_private();
+export var publicUse_im_public_mi_public = new im_public_mi_public.c_private();
 
 
+//// [privacyTopLevelAmbientExternalModuleImportWithExport_require2.js]
+//// [privacyTopLevelAmbientExternalModuleImportWithExport_require3.js]
 //// [privacyTopLevelAmbientExternalModuleImportWithExport_require.js]
 // Public elements
 var c_public = (function () {
@@ -62,16 +66,52 @@ var c_public = (function () {
 })();
 exports.c_public = c_public;
 //// [privacyTopLevelAmbientExternalModuleImportWithExport_core.js]
+///<reference path='privacyTopLevelAmbientExternalModuleImportWithExport_require2.ts'/>
+///<reference path='privacyTopLevelAmbientExternalModuleImportWithExport_require3.ts'/>
 // Privacy errors - importing private elements
 exports.im_public_mi_private = require("privacyTopLevelAmbientExternalModuleImportWithExport_require");
 exports.im_public_mu_private = require("privacyTopLevelAmbientExternalModuleImportWithExport_require1");
 exports.im_public_mi_public = require("m");
+exports.im_public_mu_public = require("m2");
 // Usage of privacy error imports
-var privateUse_im_public_mi_private = new exports.im_public_mi_private.c_private();
-exports.publicUse_im_public_mi_private = new exports.im_public_mi_private.c_private();
-var privateUse_im_public_mu_private = new exports.im_public_mu_private.c_private();
-exports.publicUse_im_public_mu_private = new exports.im_public_mu_private.c_private();
-var privateUse_im_public_mi_public = new exports.im_public_mi_public.c_public();
-exports.publicUse_im_public_mi_public = new exports.im_public_mi_public.c_public();
-var privateUse_im_public_mi_public = new exports.im_public_mi_public.c_public();
-exports.publicUse_im_public_mi_public = new exports.im_public_mi_public.c_public();
+var privateUse_im_public_mi_private = new exports.im_public_mi_private.c_public();
+exports.publicUse_im_public_mi_private = new exports.im_public_mi_private.c_public();
+var privateUse_im_public_mu_private = new exports.im_public_mu_private.c_public();
+exports.publicUse_im_public_mu_private = new exports.im_public_mu_private.c_public();
+var privateUse_im_public_mi_public = new exports.im_public_mi_public.c_private();
+exports.publicUse_im_public_mi_public = new exports.im_public_mi_public.c_private();
+var privateUse_im_public_mi_public = new exports.im_public_mi_public.c_private();
+exports.publicUse_im_public_mi_public = new exports.im_public_mi_public.c_private();
+
+
+//// [privacyTopLevelAmbientExternalModuleImportWithExport_require2.d.ts]
+declare module 'm' {
+    class c_private {
+        baz: string;
+    }
+}
+//// [privacyTopLevelAmbientExternalModuleImportWithExport_require3.d.ts]
+declare module 'm2' {
+    class c_private {
+        bing: string;
+    }
+}
+//// [privacyTopLevelAmbientExternalModuleImportWithExport_require.d.ts]
+export declare class c_public {
+    foo: string;
+}
+//// [privacyTopLevelAmbientExternalModuleImportWithExport_require1.d.ts]
+export declare class c_public {
+    bar: string;
+}
+//// [privacyTopLevelAmbientExternalModuleImportWithExport_core.d.ts]
+/// <reference path='privacyTopLevelAmbientExternalModuleImportWithExport_require2.d.ts' />
+/// <reference path='privacyTopLevelAmbientExternalModuleImportWithExport_require3.d.ts' />
+export import im_public_mi_private = require("privacyTopLevelAmbientExternalModuleImportWithExport_require");
+export import im_public_mu_private = require("privacyTopLevelAmbientExternalModuleImportWithExport_require1");
+export import im_public_mi_public = require("m");
+export import im_public_mu_public = require("m2");
+export declare var publicUse_im_public_mi_private: im_public_mi_private.c_public;
+export declare var publicUse_im_public_mu_private: im_public_mu_private.c_public;
+export declare var publicUse_im_public_mi_public: im_public_mi_public.c_private;
+export declare var publicUse_im_public_mi_public: im_public_mi_public.c_private;
diff --git a/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithExport.types b/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithExport.types
new file mode 100644
index 00000000000..50ac3b74788
--- /dev/null
+++ b/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithExport.types
@@ -0,0 +1,113 @@
+=== tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithExport_core.ts ===
+///<reference path='privacyTopLevelAmbientExternalModuleImportWithExport_require2.ts'/>
+///<reference path='privacyTopLevelAmbientExternalModuleImportWithExport_require3.ts'/>
+// Privacy errors - importing private elements
+export import im_public_mi_private = require("privacyTopLevelAmbientExternalModuleImportWithExport_require");
+>im_public_mi_private : im_public_mi_private
+
+export import im_public_mu_private = require("privacyTopLevelAmbientExternalModuleImportWithExport_require1");
+>im_public_mu_private : im_public_mu_private
+
+export import im_public_mi_public = require("m");
+>im_public_mi_public : im_public_mi_public
+
+export import im_public_mu_public = require("m2");
+>im_public_mu_public : im_public_mu_public
+
+// Usage of privacy error imports
+var privateUse_im_public_mi_private = new im_public_mi_private.c_public();
+>privateUse_im_public_mi_private : im_public_mi_private.c_public
+>new im_public_mi_private.c_public() : im_public_mi_private.c_public
+>im_public_mi_private.c_public : typeof im_public_mi_private.c_public
+>im_public_mi_private : typeof im_public_mi_private
+>c_public : typeof im_public_mi_private.c_public
+
+export var publicUse_im_public_mi_private = new im_public_mi_private.c_public();
+>publicUse_im_public_mi_private : im_public_mi_private.c_public
+>new im_public_mi_private.c_public() : im_public_mi_private.c_public
+>im_public_mi_private.c_public : typeof im_public_mi_private.c_public
+>im_public_mi_private : typeof im_public_mi_private
+>c_public : typeof im_public_mi_private.c_public
+
+var privateUse_im_public_mu_private = new im_public_mu_private.c_public();
+>privateUse_im_public_mu_private : im_public_mu_private.c_public
+>new im_public_mu_private.c_public() : im_public_mu_private.c_public
+>im_public_mu_private.c_public : typeof im_public_mu_private.c_public
+>im_public_mu_private : typeof im_public_mu_private
+>c_public : typeof im_public_mu_private.c_public
+
+export var publicUse_im_public_mu_private = new im_public_mu_private.c_public();
+>publicUse_im_public_mu_private : im_public_mu_private.c_public
+>new im_public_mu_private.c_public() : im_public_mu_private.c_public
+>im_public_mu_private.c_public : typeof im_public_mu_private.c_public
+>im_public_mu_private : typeof im_public_mu_private
+>c_public : typeof im_public_mu_private.c_public
+
+var privateUse_im_public_mi_public = new im_public_mi_public.c_private();
+>privateUse_im_public_mi_public : im_public_mi_public.c_private
+>new im_public_mi_public.c_private() : im_public_mi_public.c_private
+>im_public_mi_public.c_private : typeof im_public_mi_public.c_private
+>im_public_mi_public : typeof im_public_mi_public
+>c_private : typeof im_public_mi_public.c_private
+
+export var publicUse_im_public_mi_public = new im_public_mi_public.c_private();
+>publicUse_im_public_mi_public : im_public_mi_public.c_private
+>new im_public_mi_public.c_private() : im_public_mi_public.c_private
+>im_public_mi_public.c_private : typeof im_public_mi_public.c_private
+>im_public_mi_public : typeof im_public_mi_public
+>c_private : typeof im_public_mi_public.c_private
+
+var privateUse_im_public_mi_public = new im_public_mi_public.c_private();
+>privateUse_im_public_mi_public : im_public_mi_public.c_private
+>new im_public_mi_public.c_private() : im_public_mi_public.c_private
+>im_public_mi_public.c_private : typeof im_public_mi_public.c_private
+>im_public_mi_public : typeof im_public_mi_public
+>c_private : typeof im_public_mi_public.c_private
+
+export var publicUse_im_public_mi_public = new im_public_mi_public.c_private();
+>publicUse_im_public_mi_public : im_public_mi_public.c_private
+>new im_public_mi_public.c_private() : im_public_mi_public.c_private
+>im_public_mi_public.c_private : typeof im_public_mi_public.c_private
+>im_public_mi_public : typeof im_public_mi_public
+>c_private : typeof im_public_mi_public.c_private
+
+=== tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithExport_require.ts ===
+// Public elements
+export class c_public {
+>c_public : c_public
+
+    foo: string;
+>foo : string
+}
+
+=== tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithExport_require1.ts ===
+export class c_public {
+>c_public : c_public
+
+    bar: string;
+>bar : string
+}
+
+=== tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithExport_require2.ts ===
+// private elements
+// Export - Error ambient modules allowed only in global
+declare module 'm' {
+    export class c_private {
+>c_private : c_private
+
+        baz: string;
+>baz : string
+    }
+}
+
+
+=== tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithExport_require3.ts ===
+declare module 'm2' {
+    export class c_private {
+>c_private : c_private
+
+        bing: string;
+>bing : string
+    }
+}
+
diff --git a/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithoutExport.errors.txt b/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithoutExport.errors.txt
deleted file mode 100644
index 359ee29c2d7..00000000000
--- a/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithoutExport.errors.txt
+++ /dev/null
@@ -1,49 +0,0 @@
-==== tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithoutExport_core.ts (2 errors) ====
-    // Privacy errors - importing private elements
-    import im_private_mi_private = require("m");
-                                           ~~~
-!!! Cannot find external module 'm'.
-    import im_private_mu_private = require("m2");
-                                           ~~~~
-!!! Cannot find external module 'm2'.
-    import im_private_mi_public = require("privacyTopLevelAmbientExternalModuleImportWithoutExport_require");
-    import im_private_mu_public = require("privacyTopLevelAmbientExternalModuleImportWithoutExport_require1");
-    
-    // Usage of privacy error imports
-    var privateUse_im_private_mi_private = new im_private_mi_private.c_private();
-    export var publicUse_im_private_mi_private = new im_private_mi_private.c_private();
-    var privateUse_im_private_mu_private = new im_private_mu_private.c_private();
-    export var publicUse_im_private_mu_private = new im_private_mu_private.c_private();
-    var privateUse_im_private_mi_public = new im_private_mi_public.c_public();
-    export var publicUse_im_private_mi_public = new im_private_mi_public.c_public();
-    var privateUse_im_private_mi_public = new im_private_mi_public.c_public();
-    export var publicUse_im_private_mi_public = new im_private_mi_public.c_public();
-    
-==== tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithoutExport_require.ts (0 errors) ====
-    
-    // Public elements
-    export class c_public {
-        foo: string;
-    }
-    
-==== tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithoutExport_require1.ts (0 errors) ====
-    export class c_public {
-        bar: string;
-    }
-    
-==== tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithoutExport_require2.ts (0 errors) ====
-    // private elements
-    // Export - Error ambient modules allowed only in global
-    declare module 'm' {
-        export class c_private {
-            baz: string
-        }   
-    }
-    
-==== tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithoutExport_require3.ts (0 errors) ====
-    declare module 'm2' {
-        export class c_private {
-            bing: string;
-        }
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithoutExport.js b/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithoutExport.js
index 948a64fc136..de0835bb6e3 100644
--- a/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithoutExport.js
+++ b/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithoutExport.js
@@ -29,6 +29,8 @@ declare module 'm2' {
 }
 
 //// [privacyTopLevelAmbientExternalModuleImportWithoutExport_core.ts]
+///<reference path='privacyTopLevelAmbientExternalModuleImportWithoutExport_require2.ts'/>
+///<reference path='privacyTopLevelAmbientExternalModuleImportWithoutExport_require3.ts'/>
 // Privacy errors - importing private elements
 import im_private_mi_private = require("m");
 import im_private_mu_private = require("m2");
@@ -46,6 +48,8 @@ var privateUse_im_private_mi_public = new im_private_mi_public.c_public();
 export var publicUse_im_private_mi_public = new im_private_mi_public.c_public();
 
 
+//// [privacyTopLevelAmbientExternalModuleImportWithoutExport_require2.js]
+//// [privacyTopLevelAmbientExternalModuleImportWithoutExport_require3.js]
 //// [privacyTopLevelAmbientExternalModuleImportWithoutExport_require.js]
 define(["require", "exports"], function (require, exports) {
     // Public elements
@@ -77,3 +81,35 @@ define(["require", "exports", "m", "m2", "privacyTopLevelAmbientExternalModuleIm
     var privateUse_im_private_mi_public = new im_private_mi_public.c_public();
     exports.publicUse_im_private_mi_public = new im_private_mi_public.c_public();
 });
+
+
+//// [privacyTopLevelAmbientExternalModuleImportWithoutExport_require2.d.ts]
+declare module 'm' {
+    class c_private {
+        baz: string;
+    }
+}
+//// [privacyTopLevelAmbientExternalModuleImportWithoutExport_require3.d.ts]
+declare module 'm2' {
+    class c_private {
+        bing: string;
+    }
+}
+//// [privacyTopLevelAmbientExternalModuleImportWithoutExport_require.d.ts]
+export declare class c_public {
+    foo: string;
+}
+//// [privacyTopLevelAmbientExternalModuleImportWithoutExport_require1.d.ts]
+export declare class c_public {
+    bar: string;
+}
+//// [privacyTopLevelAmbientExternalModuleImportWithoutExport_core.d.ts]
+/// <reference path='privacyTopLevelAmbientExternalModuleImportWithoutExport_require2.d.ts' />
+/// <reference path='privacyTopLevelAmbientExternalModuleImportWithoutExport_require3.d.ts' />
+import im_private_mi_private = require("m");
+import im_private_mu_private = require("m2");
+import im_private_mi_public = require("privacyTopLevelAmbientExternalModuleImportWithoutExport_require");
+export declare var publicUse_im_private_mi_private: im_private_mi_private.c_private;
+export declare var publicUse_im_private_mu_private: im_private_mu_private.c_private;
+export declare var publicUse_im_private_mi_public: im_private_mi_public.c_public;
+export declare var publicUse_im_private_mi_public: im_private_mi_public.c_public;
diff --git a/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithoutExport.types b/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithoutExport.types
new file mode 100644
index 00000000000..3d9eb2028fb
--- /dev/null
+++ b/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithoutExport.types
@@ -0,0 +1,113 @@
+=== tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithoutExport_core.ts ===
+///<reference path='privacyTopLevelAmbientExternalModuleImportWithoutExport_require2.ts'/>
+///<reference path='privacyTopLevelAmbientExternalModuleImportWithoutExport_require3.ts'/>
+// Privacy errors - importing private elements
+import im_private_mi_private = require("m");
+>im_private_mi_private : im_private_mi_private
+
+import im_private_mu_private = require("m2");
+>im_private_mu_private : im_private_mu_private
+
+import im_private_mi_public = require("privacyTopLevelAmbientExternalModuleImportWithoutExport_require");
+>im_private_mi_public : im_private_mi_public
+
+import im_private_mu_public = require("privacyTopLevelAmbientExternalModuleImportWithoutExport_require1");
+>im_private_mu_public : im_private_mu_public
+
+// Usage of privacy error imports
+var privateUse_im_private_mi_private = new im_private_mi_private.c_private();
+>privateUse_im_private_mi_private : im_private_mi_private.c_private
+>new im_private_mi_private.c_private() : im_private_mi_private.c_private
+>im_private_mi_private.c_private : typeof im_private_mi_private.c_private
+>im_private_mi_private : typeof im_private_mi_private
+>c_private : typeof im_private_mi_private.c_private
+
+export var publicUse_im_private_mi_private = new im_private_mi_private.c_private();
+>publicUse_im_private_mi_private : im_private_mi_private.c_private
+>new im_private_mi_private.c_private() : im_private_mi_private.c_private
+>im_private_mi_private.c_private : typeof im_private_mi_private.c_private
+>im_private_mi_private : typeof im_private_mi_private
+>c_private : typeof im_private_mi_private.c_private
+
+var privateUse_im_private_mu_private = new im_private_mu_private.c_private();
+>privateUse_im_private_mu_private : im_private_mu_private.c_private
+>new im_private_mu_private.c_private() : im_private_mu_private.c_private
+>im_private_mu_private.c_private : typeof im_private_mu_private.c_private
+>im_private_mu_private : typeof im_private_mu_private
+>c_private : typeof im_private_mu_private.c_private
+
+export var publicUse_im_private_mu_private = new im_private_mu_private.c_private();
+>publicUse_im_private_mu_private : im_private_mu_private.c_private
+>new im_private_mu_private.c_private() : im_private_mu_private.c_private
+>im_private_mu_private.c_private : typeof im_private_mu_private.c_private
+>im_private_mu_private : typeof im_private_mu_private
+>c_private : typeof im_private_mu_private.c_private
+
+var privateUse_im_private_mi_public = new im_private_mi_public.c_public();
+>privateUse_im_private_mi_public : im_private_mi_public.c_public
+>new im_private_mi_public.c_public() : im_private_mi_public.c_public
+>im_private_mi_public.c_public : typeof im_private_mi_public.c_public
+>im_private_mi_public : typeof im_private_mi_public
+>c_public : typeof im_private_mi_public.c_public
+
+export var publicUse_im_private_mi_public = new im_private_mi_public.c_public();
+>publicUse_im_private_mi_public : im_private_mi_public.c_public
+>new im_private_mi_public.c_public() : im_private_mi_public.c_public
+>im_private_mi_public.c_public : typeof im_private_mi_public.c_public
+>im_private_mi_public : typeof im_private_mi_public
+>c_public : typeof im_private_mi_public.c_public
+
+var privateUse_im_private_mi_public = new im_private_mi_public.c_public();
+>privateUse_im_private_mi_public : im_private_mi_public.c_public
+>new im_private_mi_public.c_public() : im_private_mi_public.c_public
+>im_private_mi_public.c_public : typeof im_private_mi_public.c_public
+>im_private_mi_public : typeof im_private_mi_public
+>c_public : typeof im_private_mi_public.c_public
+
+export var publicUse_im_private_mi_public = new im_private_mi_public.c_public();
+>publicUse_im_private_mi_public : im_private_mi_public.c_public
+>new im_private_mi_public.c_public() : im_private_mi_public.c_public
+>im_private_mi_public.c_public : typeof im_private_mi_public.c_public
+>im_private_mi_public : typeof im_private_mi_public
+>c_public : typeof im_private_mi_public.c_public
+
+=== tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithoutExport_require.ts ===
+
+// Public elements
+export class c_public {
+>c_public : c_public
+
+    foo: string;
+>foo : string
+}
+
+=== tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithoutExport_require1.ts ===
+export class c_public {
+>c_public : c_public
+
+    bar: string;
+>bar : string
+}
+
+=== tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithoutExport_require2.ts ===
+// private elements
+// Export - Error ambient modules allowed only in global
+declare module 'm' {
+    export class c_private {
+>c_private : c_private
+
+        baz: string
+>baz : string
+    }   
+}
+
+=== tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithoutExport_require3.ts ===
+declare module 'm2' {
+    export class c_private {
+>c_private : c_private
+
+        bing: string;
+>bing : string
+    }
+}
+
diff --git a/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithExport.errors.txt b/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithExport.errors.txt
new file mode 100644
index 00000000000..899832db215
--- /dev/null
+++ b/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithExport.errors.txt
@@ -0,0 +1,114 @@
+==== tests/cases/compiler/privacyTopLevelInternalReferenceImportWithExport.ts (7 errors) ====
+    // private elements
+    module m_private {
+        export class c_private {
+        }
+        export enum e_private {
+            Happy,
+            Grumpy
+        }
+        export function f_private() {
+            return new c_private();
+        }
+        export var v_private = new c_private();
+        export interface i_private {
+        }
+        export module mi_private {
+            export class c {
+            }
+        }
+        export module mu_private {
+            export interface i {
+            }
+        }
+    }
+    
+    // Public elements
+    export module m_public {
+        export class c_public {
+        }
+        export enum e_public {
+            Happy,
+            Grumpy
+        }
+        export function f_public() {
+            return new c_public();
+        }
+        export var v_public = 10;
+        export interface i_public {
+        }
+        export module mi_public {
+            export class c {
+            }
+        }
+        export module mu_public {
+            export interface i {
+            }
+        }
+    }
+    
+    // Privacy errors - importing private elements
+    export import im_public_c_private = m_private.c_private;
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Import declaration 'im_public_c_private' is using private name 'm_private'.
+    export import im_public_e_private = m_private.e_private;
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Import declaration 'im_public_e_private' is using private name 'm_private'.
+    export import im_public_f_private = m_private.f_private;
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Import declaration 'im_public_f_private' is using private name 'm_private'.
+    export import im_public_v_private = m_private.v_private;
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Import declaration 'im_public_v_private' is using private name 'm_private'.
+    export import im_public_i_private = m_private.i_private;
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Import declaration 'im_public_i_private' is using private name 'm_private'.
+    export import im_public_mi_private = m_private.mi_private;
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Import declaration 'im_public_mi_private' is using private name 'm_private'.
+    export import im_public_mu_private = m_private.mu_private;
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Import declaration 'im_public_mu_private' is using private name 'm_private'.
+    
+    // Usage of privacy error imports
+    var privateUse_im_public_c_private = new im_public_c_private();
+    export var publicUse_im_public_c_private = new im_public_c_private();
+    var privateUse_im_public_e_private = im_public_e_private.Happy;
+    export var publicUse_im_public_e_private = im_public_e_private.Grumpy;
+    var privateUse_im_public_f_private = im_public_f_private();
+    export var publicUse_im_public_f_private = im_public_f_private();
+    var privateUse_im_public_v_private = im_public_v_private;
+    export var publicUse_im_public_v_private = im_public_v_private;
+    var privateUse_im_public_i_private: im_public_i_private;
+    export var publicUse_im_public_i_private: im_public_i_private;
+    var privateUse_im_public_mi_private = new im_public_mi_private.c();
+    export var publicUse_im_public_mi_private = new im_public_mi_private.c();
+    var privateUse_im_public_mu_private: im_public_mu_private.i;
+    export var publicUse_im_public_mu_private: im_public_mu_private.i;
+    
+    
+    // No Privacy errors - importing public elements
+    export import im_public_c_public = m_public.c_public;
+    export import im_public_e_public = m_public.e_public;
+    export import im_public_f_public = m_public.f_public;
+    export import im_public_v_public = m_public.v_public;
+    export import im_public_i_public = m_public.i_public;
+    export import im_public_mi_public = m_public.mi_public;
+    export import im_public_mu_public = m_public.mu_public;
+    
+    // Usage of above decls
+    var privateUse_im_public_c_public = new im_public_c_public();
+    export var publicUse_im_public_c_public = new im_public_c_public();
+    var privateUse_im_public_e_public = im_public_e_public.Happy;
+    export var publicUse_im_public_e_public = im_public_e_public.Grumpy;
+    var privateUse_im_public_f_public = im_public_f_public();
+    export var publicUse_im_public_f_public = im_public_f_public();
+    var privateUse_im_public_v_public = im_public_v_public;
+    export var publicUse_im_public_v_public = im_public_v_public;
+    var privateUse_im_public_i_public: im_public_i_public;
+    export var publicUse_im_public_i_public: im_public_i_public;
+    var privateUse_im_public_mi_public = new im_public_mi_public.c();
+    export var publicUse_im_public_mi_public = new im_public_mi_public.c();
+    var privateUse_im_public_mu_public: im_public_mu_public.i;
+    export var publicUse_im_public_mu_public: im_public_mu_public.i;
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithExport.types b/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithExport.types
deleted file mode 100644
index 69215e43e60..00000000000
--- a/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithExport.types
+++ /dev/null
@@ -1,312 +0,0 @@
-=== tests/cases/compiler/privacyTopLevelInternalReferenceImportWithExport.ts ===
-// private elements
-module m_private {
->m_private : m_private
-
-    export class c_private {
->c_private : c_private
-    }
-    export enum e_private {
->e_private : e_private
-
-        Happy,
->Happy : e_private
-
-        Grumpy
->Grumpy : e_private
-    }
-    export function f_private() {
->f_private : typeof f_private
-
-        return new c_private();
->new c_private() : c_private
->c_private : typeof c_private
-    }
-    export var v_private = new c_private();
->v_private : c_private
->new c_private() : c_private
->c_private : typeof c_private
-
-    export interface i_private {
->i_private : i_private
-    }
-    export module mi_private {
->mi_private : mi_private
-
-        export class c {
->c : c
-        }
-    }
-    export module mu_private {
->mu_private : mu_private
-
-        export interface i {
->i : i
-        }
-    }
-}
-
-// Public elements
-export module m_public {
->m_public : m_public
-
-    export class c_public {
->c_public : c_public
-    }
-    export enum e_public {
->e_public : e_public
-
-        Happy,
->Happy : e_public
-
-        Grumpy
->Grumpy : e_public
-    }
-    export function f_public() {
->f_public : typeof f_public
-
-        return new c_public();
->new c_public() : c_public
->c_public : typeof c_public
-    }
-    export var v_public = 10;
->v_public : number
-
-    export interface i_public {
->i_public : i_public
-    }
-    export module mi_public {
->mi_public : mi_public
-
-        export class c {
->c : c
-        }
-    }
-    export module mu_public {
->mu_public : mu_public
-
-        export interface i {
->i : i
-        }
-    }
-}
-
-// Privacy errors - importing private elements
-export import im_public_c_private = m_private.c_private;
->im_public_c_private : im_public_c_private
->m_private : typeof m_private
->c_private : im_public_c_private
-
-export import im_public_e_private = m_private.e_private;
->im_public_e_private : im_public_e_private
->m_private : typeof m_private
->e_private : im_public_e_private
-
-export import im_public_f_private = m_private.f_private;
->im_public_f_private : im_public_f_private
->m_private : typeof m_private
->f_private : typeof im_public_f_private
-
-export import im_public_v_private = m_private.v_private;
->im_public_v_private : im_public_v_private
->m_private : typeof m_private
->v_private : im_public_c_private
-
-export import im_public_i_private = m_private.i_private;
->im_public_i_private : im_public_i_private
->m_private : typeof m_private
->i_private : im_public_i_private
-
-export import im_public_mi_private = m_private.mi_private;
->im_public_mi_private : im_public_mi_private
->m_private : typeof m_private
->mi_private : typeof im_public_mi_private
-
-export import im_public_mu_private = m_private.mu_private;
->im_public_mu_private : im_public_mu_private
->m_private : typeof m_private
->mu_private : im_public_mu_private
-
-// Usage of privacy error imports
-var privateUse_im_public_c_private = new im_public_c_private();
->privateUse_im_public_c_private : im_public_c_private
->new im_public_c_private() : im_public_c_private
->im_public_c_private : typeof im_public_c_private
-
-export var publicUse_im_public_c_private = new im_public_c_private();
->publicUse_im_public_c_private : im_public_c_private
->new im_public_c_private() : im_public_c_private
->im_public_c_private : typeof im_public_c_private
-
-var privateUse_im_public_e_private = im_public_e_private.Happy;
->privateUse_im_public_e_private : im_public_e_private
->im_public_e_private.Happy : im_public_e_private
->im_public_e_private : typeof im_public_e_private
->Happy : im_public_e_private
-
-export var publicUse_im_public_e_private = im_public_e_private.Grumpy;
->publicUse_im_public_e_private : im_public_e_private
->im_public_e_private.Grumpy : im_public_e_private
->im_public_e_private : typeof im_public_e_private
->Grumpy : im_public_e_private
-
-var privateUse_im_public_f_private = im_public_f_private();
->privateUse_im_public_f_private : im_public_c_private
->im_public_f_private() : im_public_c_private
->im_public_f_private : typeof im_public_f_private
-
-export var publicUse_im_public_f_private = im_public_f_private();
->publicUse_im_public_f_private : im_public_c_private
->im_public_f_private() : im_public_c_private
->im_public_f_private : typeof im_public_f_private
-
-var privateUse_im_public_v_private = im_public_v_private;
->privateUse_im_public_v_private : im_public_c_private
->im_public_v_private : im_public_c_private
-
-export var publicUse_im_public_v_private = im_public_v_private;
->publicUse_im_public_v_private : im_public_c_private
->im_public_v_private : im_public_c_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
->new im_public_mi_private.c() : im_public_mi_private.c
->im_public_mi_private.c : typeof im_public_mi_private.c
->im_public_mi_private : typeof im_public_mi_private
->c : typeof im_public_mi_private.c
-
-export var publicUse_im_public_mi_private = new im_public_mi_private.c();
->publicUse_im_public_mi_private : im_public_mi_private.c
->new im_public_mi_private.c() : im_public_mi_private.c
->im_public_mi_private.c : typeof im_public_mi_private.c
->im_public_mi_private : typeof im_public_mi_private
->c : typeof 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 : im_public_mu_private
->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 : im_public_mu_private
->i : im_public_mu_private.i
-
-
-// No Privacy errors - importing public elements
-export import im_public_c_public = m_public.c_public;
->im_public_c_public : im_public_c_public
->m_public : typeof m_public
->c_public : im_public_c_public
-
-export import im_public_e_public = m_public.e_public;
->im_public_e_public : im_public_e_public
->m_public : typeof m_public
->e_public : im_public_e_public
-
-export import im_public_f_public = m_public.f_public;
->im_public_f_public : im_public_f_public
->m_public : typeof m_public
->f_public : typeof im_public_f_public
-
-export import im_public_v_public = m_public.v_public;
->im_public_v_public : im_public_v_public
->m_public : typeof m_public
->v_public : number
-
-export import im_public_i_public = m_public.i_public;
->im_public_i_public : im_public_i_public
->m_public : typeof m_public
->i_public : im_public_i_public
-
-export import im_public_mi_public = m_public.mi_public;
->im_public_mi_public : im_public_mi_public
->m_public : typeof m_public
->mi_public : typeof im_public_mi_public
-
-export import im_public_mu_public = m_public.mu_public;
->im_public_mu_public : im_public_mu_public
->m_public : typeof m_public
->mu_public : im_public_mu_public
-
-// Usage of above decls
-var privateUse_im_public_c_public = new im_public_c_public();
->privateUse_im_public_c_public : im_public_c_public
->new im_public_c_public() : im_public_c_public
->im_public_c_public : typeof im_public_c_public
-
-export var publicUse_im_public_c_public = new im_public_c_public();
->publicUse_im_public_c_public : im_public_c_public
->new im_public_c_public() : im_public_c_public
->im_public_c_public : typeof im_public_c_public
-
-var privateUse_im_public_e_public = im_public_e_public.Happy;
->privateUse_im_public_e_public : im_public_e_public
->im_public_e_public.Happy : im_public_e_public
->im_public_e_public : typeof im_public_e_public
->Happy : im_public_e_public
-
-export var publicUse_im_public_e_public = im_public_e_public.Grumpy;
->publicUse_im_public_e_public : im_public_e_public
->im_public_e_public.Grumpy : im_public_e_public
->im_public_e_public : typeof im_public_e_public
->Grumpy : im_public_e_public
-
-var privateUse_im_public_f_public = im_public_f_public();
->privateUse_im_public_f_public : im_public_c_public
->im_public_f_public() : im_public_c_public
->im_public_f_public : typeof im_public_f_public
-
-export var publicUse_im_public_f_public = im_public_f_public();
->publicUse_im_public_f_public : im_public_c_public
->im_public_f_public() : im_public_c_public
->im_public_f_public : typeof im_public_f_public
-
-var privateUse_im_public_v_public = im_public_v_public;
->privateUse_im_public_v_public : number
->im_public_v_public : number
-
-export var publicUse_im_public_v_public = im_public_v_public;
->publicUse_im_public_v_public : number
->im_public_v_public : number
-
-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
->new im_public_mi_public.c() : im_public_mi_public.c
->im_public_mi_public.c : typeof im_public_mi_public.c
->im_public_mi_public : typeof im_public_mi_public
->c : typeof im_public_mi_public.c
-
-export var publicUse_im_public_mi_public = new im_public_mi_public.c();
->publicUse_im_public_mi_public : im_public_mi_public.c
->new im_public_mi_public.c() : im_public_mi_public.c
->im_public_mi_public.c : typeof im_public_mi_public.c
->im_public_mi_public : typeof im_public_mi_public
->c : typeof 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 : im_public_mu_public
->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 : im_public_mu_public
->i : im_public_mu_public.i
-
diff --git a/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.errors.txt b/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.errors.txt
new file mode 100644
index 00000000000..b9791738e24
--- /dev/null
+++ b/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.errors.txt
@@ -0,0 +1,111 @@
+==== tests/cases/compiler/privacyTopLevelInternalReferenceImportWithoutExport.ts (5 errors) ====
+    
+    // private elements
+    module m_private {
+        export class c_private {
+        }
+        export enum e_private {
+            Happy,
+            Grumpy
+        }
+        export function f_private() {
+            return new c_private();
+        }
+        export var v_private = new c_private();
+        export interface i_private {
+        }
+        export module mi_private {
+            export class c {
+            }
+        }
+        export module mu_private {
+            export interface i {
+            }
+        }
+    }
+    
+    // Public elements
+    export module m_public {
+        export class c_public {
+        }
+        export enum e_public {
+            Happy,
+            Grumpy
+        }
+        export function f_public() {
+            return new c_public();
+        }
+        export var v_public = 10;
+        export interface i_public {
+        }
+        export module mi_public {
+            export class c {
+            }
+        }
+        export module mu_public {
+            export interface i {
+            }
+        }
+    }
+    
+    // No Privacy errors - importing private elements
+    import im_private_c_private = m_private.c_private;
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Import declaration 'im_private_c_private' is using private name 'm_private'.
+    import im_private_e_private = m_private.e_private;
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Import declaration 'im_private_e_private' is using private name 'm_private'.
+    import im_private_f_private = m_private.f_private;
+    import im_private_v_private = m_private.v_private;
+    import im_private_i_private = m_private.i_private;
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Import declaration 'im_private_i_private' is using private name 'm_private'.
+    import im_private_mi_private = m_private.mi_private;
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Import declaration 'im_private_mi_private' is using private name 'm_private'.
+    import im_private_mu_private = m_private.mu_private;
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Import declaration 'im_private_mu_private' is using private name 'm_private'.
+    
+    // Usage of above decls
+    var privateUse_im_private_c_private = new im_private_c_private();
+    export var publicUse_im_private_c_private = new im_private_c_private();
+    var privateUse_im_private_e_private = im_private_e_private.Happy;
+    export var publicUse_im_private_e_private = im_private_e_private.Grumpy;
+    var privateUse_im_private_f_private = im_private_f_private();
+    export var publicUse_im_private_f_private = im_private_f_private();
+    var privateUse_im_private_v_private = im_private_v_private;
+    export var publicUse_im_private_v_private = im_private_v_private;
+    var privateUse_im_private_i_private: im_private_i_private;
+    export var publicUse_im_private_i_private: im_private_i_private;
+    var privateUse_im_private_mi_private = new im_private_mi_private.c();
+    export var publicUse_im_private_mi_private = new im_private_mi_private.c();
+    var privateUse_im_private_mu_private: im_private_mu_private.i;
+    export var publicUse_im_private_mu_private: im_private_mu_private.i;
+    
+    
+    // No Privacy errors - importing public elements
+    import im_private_c_public = m_public.c_public;
+    import im_private_e_public = m_public.e_public;
+    import im_private_f_public = m_public.f_public;
+    import im_private_v_public = m_public.v_public;
+    import im_private_i_public = m_public.i_public;
+    import im_private_mi_public = m_public.mi_public;
+    import im_private_mu_public = m_public.mu_public;
+    
+    // Usage of above decls
+    var privateUse_im_private_c_public = new im_private_c_public();
+    export var publicUse_im_private_c_public = new im_private_c_public();
+    var privateUse_im_private_e_public = im_private_e_public.Happy;
+    export var publicUse_im_private_e_public = im_private_e_public.Grumpy;
+    var privateUse_im_private_f_public = im_private_f_public();
+    export var publicUse_im_private_f_public = im_private_f_public();
+    var privateUse_im_private_v_public = im_private_v_public;
+    export var publicUse_im_private_v_public = im_private_v_public;
+    var privateUse_im_private_i_public: im_private_i_public;
+    export var publicUse_im_private_i_public: im_private_i_public;
+    var privateUse_im_private_mi_public = new im_private_mi_public.c();
+    export var publicUse_im_private_mi_public = new im_private_mi_public.c();
+    var privateUse_im_private_mu_public: im_private_mu_public.i;
+    export var publicUse_im_private_mu_public: im_private_mu_public.i;
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.js b/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.js
index c5547ac58cb..acc9f6e438e 100644
--- a/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.js
+++ b/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.js
@@ -1,4 +1,5 @@
 //// [privacyTopLevelInternalReferenceImportWithoutExport.ts]
+
 // private elements
 module m_private {
     export class c_private {
diff --git a/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.types b/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.types
deleted file mode 100644
index c47f2e54c30..00000000000
--- a/tests/baselines/reference/privacyTopLevelInternalReferenceImportWithoutExport.types
+++ /dev/null
@@ -1,312 +0,0 @@
-=== tests/cases/compiler/privacyTopLevelInternalReferenceImportWithoutExport.ts ===
-// private elements
-module m_private {
->m_private : m_private
-
-    export class c_private {
->c_private : c_private
-    }
-    export enum e_private {
->e_private : e_private
-
-        Happy,
->Happy : e_private
-
-        Grumpy
->Grumpy : e_private
-    }
-    export function f_private() {
->f_private : typeof f_private
-
-        return new c_private();
->new c_private() : c_private
->c_private : typeof c_private
-    }
-    export var v_private = new c_private();
->v_private : c_private
->new c_private() : c_private
->c_private : typeof c_private
-
-    export interface i_private {
->i_private : i_private
-    }
-    export module mi_private {
->mi_private : mi_private
-
-        export class c {
->c : c
-        }
-    }
-    export module mu_private {
->mu_private : mu_private
-
-        export interface i {
->i : i
-        }
-    }
-}
-
-// Public elements
-export module m_public {
->m_public : m_public
-
-    export class c_public {
->c_public : c_public
-    }
-    export enum e_public {
->e_public : e_public
-
-        Happy,
->Happy : e_public
-
-        Grumpy
->Grumpy : e_public
-    }
-    export function f_public() {
->f_public : typeof f_public
-
-        return new c_public();
->new c_public() : c_public
->c_public : typeof c_public
-    }
-    export var v_public = 10;
->v_public : number
-
-    export interface i_public {
->i_public : i_public
-    }
-    export module mi_public {
->mi_public : mi_public
-
-        export class c {
->c : c
-        }
-    }
-    export module mu_public {
->mu_public : mu_public
-
-        export interface i {
->i : i
-        }
-    }
-}
-
-// No Privacy errors - importing private elements
-import im_private_c_private = m_private.c_private;
->im_private_c_private : im_private_c_private
->m_private : typeof m_private
->c_private : im_private_c_private
-
-import im_private_e_private = m_private.e_private;
->im_private_e_private : im_private_e_private
->m_private : typeof m_private
->e_private : im_private_e_private
-
-import im_private_f_private = m_private.f_private;
->im_private_f_private : im_private_f_private
->m_private : typeof m_private
->f_private : typeof im_private_f_private
-
-import im_private_v_private = m_private.v_private;
->im_private_v_private : im_private_v_private
->m_private : typeof m_private
->v_private : im_private_c_private
-
-import im_private_i_private = m_private.i_private;
->im_private_i_private : im_private_i_private
->m_private : typeof m_private
->i_private : im_private_i_private
-
-import im_private_mi_private = m_private.mi_private;
->im_private_mi_private : im_private_mi_private
->m_private : typeof m_private
->mi_private : typeof im_private_mi_private
-
-import im_private_mu_private = m_private.mu_private;
->im_private_mu_private : im_private_mu_private
->m_private : typeof m_private
->mu_private : im_private_mu_private
-
-// Usage of above decls
-var privateUse_im_private_c_private = new im_private_c_private();
->privateUse_im_private_c_private : im_private_c_private
->new im_private_c_private() : im_private_c_private
->im_private_c_private : typeof im_private_c_private
-
-export var publicUse_im_private_c_private = new im_private_c_private();
->publicUse_im_private_c_private : im_private_c_private
->new im_private_c_private() : im_private_c_private
->im_private_c_private : typeof im_private_c_private
-
-var privateUse_im_private_e_private = im_private_e_private.Happy;
->privateUse_im_private_e_private : im_private_e_private
->im_private_e_private.Happy : im_private_e_private
->im_private_e_private : typeof im_private_e_private
->Happy : im_private_e_private
-
-export var publicUse_im_private_e_private = im_private_e_private.Grumpy;
->publicUse_im_private_e_private : im_private_e_private
->im_private_e_private.Grumpy : im_private_e_private
->im_private_e_private : typeof im_private_e_private
->Grumpy : im_private_e_private
-
-var privateUse_im_private_f_private = im_private_f_private();
->privateUse_im_private_f_private : im_private_c_private
->im_private_f_private() : im_private_c_private
->im_private_f_private : typeof im_private_f_private
-
-export var publicUse_im_private_f_private = im_private_f_private();
->publicUse_im_private_f_private : im_private_c_private
->im_private_f_private() : im_private_c_private
->im_private_f_private : typeof im_private_f_private
-
-var privateUse_im_private_v_private = im_private_v_private;
->privateUse_im_private_v_private : im_private_c_private
->im_private_v_private : im_private_c_private
-
-export var publicUse_im_private_v_private = im_private_v_private;
->publicUse_im_private_v_private : im_private_c_private
->im_private_v_private : im_private_c_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
->new im_private_mi_private.c() : im_private_mi_private.c
->im_private_mi_private.c : typeof im_private_mi_private.c
->im_private_mi_private : typeof im_private_mi_private
->c : typeof im_private_mi_private.c
-
-export var publicUse_im_private_mi_private = new im_private_mi_private.c();
->publicUse_im_private_mi_private : im_private_mi_private.c
->new im_private_mi_private.c() : im_private_mi_private.c
->im_private_mi_private.c : typeof im_private_mi_private.c
->im_private_mi_private : typeof im_private_mi_private
->c : typeof 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 : im_private_mu_private
->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 : im_private_mu_private
->i : im_private_mu_private.i
-
-
-// No Privacy errors - importing public elements
-import im_private_c_public = m_public.c_public;
->im_private_c_public : im_private_c_public
->m_public : typeof m_public
->c_public : im_private_c_public
-
-import im_private_e_public = m_public.e_public;
->im_private_e_public : im_private_e_public
->m_public : typeof m_public
->e_public : im_private_e_public
-
-import im_private_f_public = m_public.f_public;
->im_private_f_public : im_private_f_public
->m_public : typeof m_public
->f_public : typeof im_private_f_public
-
-import im_private_v_public = m_public.v_public;
->im_private_v_public : im_private_v_public
->m_public : typeof m_public
->v_public : number
-
-import im_private_i_public = m_public.i_public;
->im_private_i_public : im_private_i_public
->m_public : typeof m_public
->i_public : im_private_i_public
-
-import im_private_mi_public = m_public.mi_public;
->im_private_mi_public : im_private_mi_public
->m_public : typeof m_public
->mi_public : typeof im_private_mi_public
-
-import im_private_mu_public = m_public.mu_public;
->im_private_mu_public : im_private_mu_public
->m_public : typeof m_public
->mu_public : im_private_mu_public
-
-// Usage of above decls
-var privateUse_im_private_c_public = new im_private_c_public();
->privateUse_im_private_c_public : im_private_c_public
->new im_private_c_public() : im_private_c_public
->im_private_c_public : typeof im_private_c_public
-
-export var publicUse_im_private_c_public = new im_private_c_public();
->publicUse_im_private_c_public : im_private_c_public
->new im_private_c_public() : im_private_c_public
->im_private_c_public : typeof im_private_c_public
-
-var privateUse_im_private_e_public = im_private_e_public.Happy;
->privateUse_im_private_e_public : im_private_e_public
->im_private_e_public.Happy : im_private_e_public
->im_private_e_public : typeof im_private_e_public
->Happy : im_private_e_public
-
-export var publicUse_im_private_e_public = im_private_e_public.Grumpy;
->publicUse_im_private_e_public : im_private_e_public
->im_private_e_public.Grumpy : im_private_e_public
->im_private_e_public : typeof im_private_e_public
->Grumpy : im_private_e_public
-
-var privateUse_im_private_f_public = im_private_f_public();
->privateUse_im_private_f_public : im_private_c_public
->im_private_f_public() : im_private_c_public
->im_private_f_public : typeof im_private_f_public
-
-export var publicUse_im_private_f_public = im_private_f_public();
->publicUse_im_private_f_public : im_private_c_public
->im_private_f_public() : im_private_c_public
->im_private_f_public : typeof im_private_f_public
-
-var privateUse_im_private_v_public = im_private_v_public;
->privateUse_im_private_v_public : number
->im_private_v_public : number
-
-export var publicUse_im_private_v_public = im_private_v_public;
->publicUse_im_private_v_public : number
->im_private_v_public : number
-
-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
->new im_private_mi_public.c() : im_private_mi_public.c
->im_private_mi_public.c : typeof im_private_mi_public.c
->im_private_mi_public : typeof im_private_mi_public
->c : typeof im_private_mi_public.c
-
-export var publicUse_im_private_mi_public = new im_private_mi_public.c();
->publicUse_im_private_mi_public : im_private_mi_public.c
->new im_private_mi_public.c() : im_private_mi_public.c
->im_private_mi_public.c : typeof im_private_mi_public.c
->im_private_mi_public : typeof im_private_mi_public
->c : typeof 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 : im_private_mu_public
->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 : im_private_mu_public
->i : im_private_mu_public.i
-
diff --git a/tests/baselines/reference/privacyTypeParameterOfFunction.errors.txt b/tests/baselines/reference/privacyTypeParameterOfFunction.errors.txt
deleted file mode 100644
index c58147621b5..00000000000
--- a/tests/baselines/reference/privacyTypeParameterOfFunction.errors.txt
+++ /dev/null
@@ -1,135 +0,0 @@
-==== tests/cases/compiler/privacyTypeParameterOfFunction.ts (1 errors) ====
-    class privateClass {
-    }
-    
-    export class publicClass {
-                 ~~~~~~~~~~~
-!!! Cannot compile external modules unless the '--module' flag is provided.
-    }
-    
-    export interface publicInterfaceWithPrivateTypeParameters {
-        // TypeParameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_type_1
-        new <T extends privateClass>(): privateClass; 
-    
-        // TypeParameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_type_1
-        <T extends privateClass>(): privateClass;
-    
-        // TypeParameter_0_of_method_from_exported_interface_has_or_is_using_private_type_1
-        myMethod<T extends privateClass>(): privateClass;
-    }
-    
-    export interface publicInterfaceWithPublicTypeParameters {
-        new <T extends publicClass>(): publicClass;
-        <T extends publicClass>(): publicClass;
-        myMethod<T extends publicClass>(): publicClass;
-    }
-    
-    interface privateInterfaceWithPrivateTypeParameters {
-        new <T extends privateClass>(): privateClass;
-        <T extends privateClass>(): privateClass;
-        myMethod<T extends privateClass>(): privateClass;
-    }
-    
-    interface privateInterfaceWithPublicTypeParameters {
-        new <T extends publicClass>(): publicClass;
-        <T extends publicClass>(): publicClass;
-        myMethod<T extends publicClass>(): publicClass;
-    }
-    
-    export class publicClassWithWithPrivateTypeParameters {
-        // TypeParameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_type_1
-        static myPublicStaticMethod<T extends privateClass>() {
-        }
-        private static myPrivateStaticMethod<T extends privateClass>() { // No error
-        }
-        // TypeParameter_0_of_public_method_from_exported_class_has_or_is_using_private_type_1
-        myPublicMethod<T extends privateClass>() {
-        }
-        private myPrivateMethod<T extends privateClass>() { // No error
-        }
-    }
-    
-    export class publicClassWithWithPublicTypeParameters {
-        static myPublicStaticMethod<T extends publicClass>() {
-        }
-        private static myPrivateStaticMethod<T extends publicClass>() { 
-        }
-        myPublicMethod<T extends publicClass>() {
-        }
-        private myPrivateMethod<T extends publicClass>() {
-        }
-    }
-    
-    class privateClassWithWithPrivateTypeParameters {
-        static myPublicStaticMethod<T extends privateClass>() {
-        }
-        private static myPrivateStaticMethod<T extends privateClass>() { // No error
-        }
-        myPublicMethod<T extends privateClass>() {
-        }
-        private myPrivateMethod<T extends privateClass>() { // No error
-        }
-    }
-    
-    class privateClassWithWithPublicTypeParameters {
-        static myPublicStaticMethod<T extends publicClass>() {
-        }
-        private static myPrivateStaticMethod<T extends publicClass>() {
-        }
-        myPublicMethod<T extends publicClass>() {
-        }
-        private myPrivateMethod<T extends publicClass>() {
-        }
-    }
-    
-    // TypeParameter_0_of_exported_function_has_or_is_using_private_type_1
-    export function publicFunctionWithPrivateTypeParameters<T extends privateClass>() {
-    }
-    
-    export function publicFunctionWithPublicTypeParameters<T extends publicClass>() {
-    }
-    
-    function privateFunctionWithPrivateTypeParameters<T extends privateClass>() {
-    }
-    
-    function privateFunctionWithPublicTypeParameters<T extends publicClass>() {
-    }
-    
-    export interface publicInterfaceWithPublicTypeParametersWithoutExtends {
-        new <T>(): publicClass;
-        <T>(): publicClass;
-        myMethod<T>(): publicClass;
-    }
-    
-    interface privateInterfaceWithPublicTypeParametersWithoutExtends {
-        new <T>(): publicClass;
-        <T>(): publicClass;
-        myMethod<T>(): publicClass;
-    }
-    
-    export class publicClassWithWithPublicTypeParametersWithoutExtends {
-        static myPublicStaticMethod<T>() {
-        }
-        private static myPrivateStaticMethod<T>() {
-        }
-        myPublicMethod<T>() {
-        }
-        private myPrivateMethod<T>() {
-        }
-    }
-    class privateClassWithWithPublicTypeParametersWithoutExtends {
-        static myPublicStaticMethod<T>() {
-        }
-        private static myPrivateStaticMethod<T>() {
-        }
-        myPublicMethod<T>() {
-        }
-        private myPrivateMethod<T>() {
-        }
-    }
-    
-    export function publicFunctionWithPublicTypeParametersWithoutExtends<T>() {
-    }
-    
-    function privateFunctionWithPublicTypeParametersWithoutExtends<T>() {
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/privacyTypeParameterOfFunction.js b/tests/baselines/reference/privacyTypeParameterOfFunction.js
new file mode 100644
index 00000000000..5505e1a5b3b
--- /dev/null
+++ b/tests/baselines/reference/privacyTypeParameterOfFunction.js
@@ -0,0 +1,245 @@
+//// [privacyTypeParameterOfFunction.ts]
+class privateClass {
+}
+
+export class publicClass {
+}
+
+export interface publicInterfaceWithPrivateTypeParameters {
+    // TypeParameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_type_1
+    new <T extends privateClass>(): privateClass; 
+
+    // TypeParameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_type_1
+    <T extends privateClass>(): privateClass;
+
+    // TypeParameter_0_of_method_from_exported_interface_has_or_is_using_private_type_1
+    myMethod<T extends privateClass>(): privateClass;
+}
+
+export interface publicInterfaceWithPublicTypeParameters {
+    new <T extends publicClass>(): publicClass;
+    <T extends publicClass>(): publicClass;
+    myMethod<T extends publicClass>(): publicClass;
+}
+
+interface privateInterfaceWithPrivateTypeParameters {
+    new <T extends privateClass>(): privateClass;
+    <T extends privateClass>(): privateClass;
+    myMethod<T extends privateClass>(): privateClass;
+}
+
+interface privateInterfaceWithPublicTypeParameters {
+    new <T extends publicClass>(): publicClass;
+    <T extends publicClass>(): publicClass;
+    myMethod<T extends publicClass>(): publicClass;
+}
+
+export class publicClassWithWithPrivateTypeParameters {
+    // TypeParameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_type_1
+    static myPublicStaticMethod<T extends privateClass>() {
+    }
+    private static myPrivateStaticMethod<T extends privateClass>() { // No error
+    }
+    // TypeParameter_0_of_public_method_from_exported_class_has_or_is_using_private_type_1
+    myPublicMethod<T extends privateClass>() {
+    }
+    private myPrivateMethod<T extends privateClass>() { // No error
+    }
+}
+
+export class publicClassWithWithPublicTypeParameters {
+    static myPublicStaticMethod<T extends publicClass>() {
+    }
+    private static myPrivateStaticMethod<T extends publicClass>() { 
+    }
+    myPublicMethod<T extends publicClass>() {
+    }
+    private myPrivateMethod<T extends publicClass>() {
+    }
+}
+
+class privateClassWithWithPrivateTypeParameters {
+    static myPublicStaticMethod<T extends privateClass>() {
+    }
+    private static myPrivateStaticMethod<T extends privateClass>() { // No error
+    }
+    myPublicMethod<T extends privateClass>() {
+    }
+    private myPrivateMethod<T extends privateClass>() { // No error
+    }
+}
+
+class privateClassWithWithPublicTypeParameters {
+    static myPublicStaticMethod<T extends publicClass>() {
+    }
+    private static myPrivateStaticMethod<T extends publicClass>() {
+    }
+    myPublicMethod<T extends publicClass>() {
+    }
+    private myPrivateMethod<T extends publicClass>() {
+    }
+}
+
+// TypeParameter_0_of_exported_function_has_or_is_using_private_type_1
+export function publicFunctionWithPrivateTypeParameters<T extends privateClass>() {
+}
+
+export function publicFunctionWithPublicTypeParameters<T extends publicClass>() {
+}
+
+function privateFunctionWithPrivateTypeParameters<T extends privateClass>() {
+}
+
+function privateFunctionWithPublicTypeParameters<T extends publicClass>() {
+}
+
+export interface publicInterfaceWithPublicTypeParametersWithoutExtends {
+    new <T>(): publicClass;
+    <T>(): publicClass;
+    myMethod<T>(): publicClass;
+}
+
+interface privateInterfaceWithPublicTypeParametersWithoutExtends {
+    new <T>(): publicClass;
+    <T>(): publicClass;
+    myMethod<T>(): publicClass;
+}
+
+export class publicClassWithWithPublicTypeParametersWithoutExtends {
+    static myPublicStaticMethod<T>() {
+    }
+    private static myPrivateStaticMethod<T>() {
+    }
+    myPublicMethod<T>() {
+    }
+    private myPrivateMethod<T>() {
+    }
+}
+class privateClassWithWithPublicTypeParametersWithoutExtends {
+    static myPublicStaticMethod<T>() {
+    }
+    private static myPrivateStaticMethod<T>() {
+    }
+    myPublicMethod<T>() {
+    }
+    private myPrivateMethod<T>() {
+    }
+}
+
+export function publicFunctionWithPublicTypeParametersWithoutExtends<T>() {
+}
+
+function privateFunctionWithPublicTypeParametersWithoutExtends<T>() {
+}
+
+//// [privacyTypeParameterOfFunction.js]
+var privateClass = (function () {
+    function privateClass() {
+    }
+    return privateClass;
+})();
+var publicClass = (function () {
+    function publicClass() {
+    }
+    return publicClass;
+})();
+exports.publicClass = publicClass;
+var publicClassWithWithPrivateTypeParameters = (function () {
+    function publicClassWithWithPrivateTypeParameters() {
+    }
+    // TypeParameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_type_1
+    publicClassWithWithPrivateTypeParameters.myPublicStaticMethod = function () {
+    };
+    publicClassWithWithPrivateTypeParameters.myPrivateStaticMethod = function () {
+    };
+    // TypeParameter_0_of_public_method_from_exported_class_has_or_is_using_private_type_1
+    publicClassWithWithPrivateTypeParameters.prototype.myPublicMethod = function () {
+    };
+    publicClassWithWithPrivateTypeParameters.prototype.myPrivateMethod = function () {
+    };
+    return publicClassWithWithPrivateTypeParameters;
+})();
+exports.publicClassWithWithPrivateTypeParameters = publicClassWithWithPrivateTypeParameters;
+var publicClassWithWithPublicTypeParameters = (function () {
+    function publicClassWithWithPublicTypeParameters() {
+    }
+    publicClassWithWithPublicTypeParameters.myPublicStaticMethod = function () {
+    };
+    publicClassWithWithPublicTypeParameters.myPrivateStaticMethod = function () {
+    };
+    publicClassWithWithPublicTypeParameters.prototype.myPublicMethod = function () {
+    };
+    publicClassWithWithPublicTypeParameters.prototype.myPrivateMethod = function () {
+    };
+    return publicClassWithWithPublicTypeParameters;
+})();
+exports.publicClassWithWithPublicTypeParameters = publicClassWithWithPublicTypeParameters;
+var privateClassWithWithPrivateTypeParameters = (function () {
+    function privateClassWithWithPrivateTypeParameters() {
+    }
+    privateClassWithWithPrivateTypeParameters.myPublicStaticMethod = function () {
+    };
+    privateClassWithWithPrivateTypeParameters.myPrivateStaticMethod = function () {
+    };
+    privateClassWithWithPrivateTypeParameters.prototype.myPublicMethod = function () {
+    };
+    privateClassWithWithPrivateTypeParameters.prototype.myPrivateMethod = function () {
+    };
+    return privateClassWithWithPrivateTypeParameters;
+})();
+var privateClassWithWithPublicTypeParameters = (function () {
+    function privateClassWithWithPublicTypeParameters() {
+    }
+    privateClassWithWithPublicTypeParameters.myPublicStaticMethod = function () {
+    };
+    privateClassWithWithPublicTypeParameters.myPrivateStaticMethod = function () {
+    };
+    privateClassWithWithPublicTypeParameters.prototype.myPublicMethod = function () {
+    };
+    privateClassWithWithPublicTypeParameters.prototype.myPrivateMethod = function () {
+    };
+    return privateClassWithWithPublicTypeParameters;
+})();
+// TypeParameter_0_of_exported_function_has_or_is_using_private_type_1
+function publicFunctionWithPrivateTypeParameters() {
+}
+exports.publicFunctionWithPrivateTypeParameters = publicFunctionWithPrivateTypeParameters;
+function publicFunctionWithPublicTypeParameters() {
+}
+exports.publicFunctionWithPublicTypeParameters = publicFunctionWithPublicTypeParameters;
+function privateFunctionWithPrivateTypeParameters() {
+}
+function privateFunctionWithPublicTypeParameters() {
+}
+var publicClassWithWithPublicTypeParametersWithoutExtends = (function () {
+    function publicClassWithWithPublicTypeParametersWithoutExtends() {
+    }
+    publicClassWithWithPublicTypeParametersWithoutExtends.myPublicStaticMethod = function () {
+    };
+    publicClassWithWithPublicTypeParametersWithoutExtends.myPrivateStaticMethod = function () {
+    };
+    publicClassWithWithPublicTypeParametersWithoutExtends.prototype.myPublicMethod = function () {
+    };
+    publicClassWithWithPublicTypeParametersWithoutExtends.prototype.myPrivateMethod = function () {
+    };
+    return publicClassWithWithPublicTypeParametersWithoutExtends;
+})();
+exports.publicClassWithWithPublicTypeParametersWithoutExtends = publicClassWithWithPublicTypeParametersWithoutExtends;
+var privateClassWithWithPublicTypeParametersWithoutExtends = (function () {
+    function privateClassWithWithPublicTypeParametersWithoutExtends() {
+    }
+    privateClassWithWithPublicTypeParametersWithoutExtends.myPublicStaticMethod = function () {
+    };
+    privateClassWithWithPublicTypeParametersWithoutExtends.myPrivateStaticMethod = function () {
+    };
+    privateClassWithWithPublicTypeParametersWithoutExtends.prototype.myPublicMethod = function () {
+    };
+    privateClassWithWithPublicTypeParametersWithoutExtends.prototype.myPrivateMethod = function () {
+    };
+    return privateClassWithWithPublicTypeParametersWithoutExtends;
+})();
+function publicFunctionWithPublicTypeParametersWithoutExtends() {
+}
+exports.publicFunctionWithPublicTypeParametersWithoutExtends = publicFunctionWithPublicTypeParametersWithoutExtends;
+function privateFunctionWithPublicTypeParametersWithoutExtends() {
+}
diff --git a/tests/baselines/reference/privacyTypeParameterOfFunction.types b/tests/baselines/reference/privacyTypeParameterOfFunction.types
new file mode 100644
index 00000000000..3a58521b0a1
--- /dev/null
+++ b/tests/baselines/reference/privacyTypeParameterOfFunction.types
@@ -0,0 +1,303 @@
+=== tests/cases/compiler/privacyTypeParameterOfFunction.ts ===
+class privateClass {
+>privateClass : privateClass
+}
+
+export class publicClass {
+>publicClass : 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 {
+>publicClassWithWithPrivateTypeParameters : 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
+    }
+}
+
+export class publicClassWithWithPublicTypeParameters {
+>publicClassWithWithPublicTypeParameters : 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
+    }
+}
+
+class privateClassWithWithPrivateTypeParameters {
+>privateClassWithWithPrivateTypeParameters : 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
+    }
+}
+
+class privateClassWithWithPublicTypeParameters {
+>privateClassWithWithPublicTypeParameters : 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 : typeof publicFunctionWithPrivateTypeParameters
+>T : T
+>privateClass : privateClass
+}
+
+export function publicFunctionWithPublicTypeParameters<T extends publicClass>() {
+>publicFunctionWithPublicTypeParameters : typeof publicFunctionWithPublicTypeParameters
+>T : T
+>publicClass : publicClass
+}
+
+function privateFunctionWithPrivateTypeParameters<T extends privateClass>() {
+>privateFunctionWithPrivateTypeParameters : typeof privateFunctionWithPrivateTypeParameters
+>T : T
+>privateClass : privateClass
+}
+
+function privateFunctionWithPublicTypeParameters<T extends publicClass>() {
+>privateFunctionWithPublicTypeParameters : typeof privateFunctionWithPublicTypeParameters
+>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 {
+>publicClassWithWithPublicTypeParametersWithoutExtends : 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 {
+>privateClassWithWithPublicTypeParametersWithoutExtends : 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 : typeof publicFunctionWithPublicTypeParametersWithoutExtends
+>T : T
+}
+
+function privateFunctionWithPublicTypeParametersWithoutExtends<T>() {
+>privateFunctionWithPublicTypeParametersWithoutExtends : typeof privateFunctionWithPublicTypeParametersWithoutExtends
+>T : T
+}
diff --git a/tests/baselines/reference/privacyTypeParameterOfFunctionDeclFile.errors.txt b/tests/baselines/reference/privacyTypeParameterOfFunctionDeclFile.errors.txt
new file mode 100644
index 00000000000..3297ac7228d
--- /dev/null
+++ b/tests/baselines/reference/privacyTypeParameterOfFunctionDeclFile.errors.txt
@@ -0,0 +1,511 @@
+==== tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts (36 errors) ====
+    class privateClass {
+    }
+    
+    export class publicClass {
+    }
+    
+    export interface publicInterfaceWithPrivateTypeParameters {
+        new <T extends privateClass>(): privateClass;  // Error
+        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Return type of constructor signature from exported interface has or is using private name 'privateClass'.
+             ~~~~~~~~~~~~~~~~~~~~~~
+!!! Type parameter 'T' of constructor signature from exported interface has or is using private name 'privateClass'.
+        <T extends privateClass>(): privateClass;  // Error
+        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Return type of call signature from exported interface has or is using private name 'privateClass'.
+         ~~~~~~~~~~~~~~~~~~~~~~
+!!! Type parameter 'T' of call signature from exported interface has or is using private name 'privateClass'.
+        myMethod<T extends privateClass>(): privateClass;  // Error
+        ~~~~~~~~
+!!! Return type of method from exported interface has or is using private name 'privateClass'.
+                 ~~~~~~~~~~~~~~~~~~~~~~
+!!! Type parameter 'T' of method from exported interface has or is using private name 'privateClass'.
+    }
+    
+    export interface publicInterfaceWithPublicTypeParameters {
+        new <T extends publicClass>(): publicClass;
+        <T extends publicClass>(): publicClass;
+        myMethod<T extends publicClass>(): publicClass;
+    }
+    
+    interface privateInterfaceWithPrivateTypeParameters {
+        new <T extends privateClass>(): privateClass;
+        <T extends privateClass>(): privateClass;
+        myMethod<T extends privateClass>(): privateClass;
+    }
+    
+    interface privateInterfaceWithPublicTypeParameters {
+        new <T extends publicClass>(): publicClass;
+        <T extends publicClass>(): publicClass;
+        myMethod<T extends publicClass>(): publicClass;
+    }
+    
+    export class publicClassWithWithPrivateTypeParameters {
+        static myPublicStaticMethod<T extends privateClass>() {  // Error
+                                    ~~~~~~~~~~~~~~~~~~~~~~
+!!! Type parameter 'T' of public static method from exported class has or is using private name 'privateClass'.
+        }
+        private static myPrivateStaticMethod<T extends privateClass>() {
+        }
+        myPublicMethod<T extends privateClass>() {  // Error
+                       ~~~~~~~~~~~~~~~~~~~~~~
+!!! Type parameter 'T' of public method from exported class has or is using private name 'privateClass'.
+        }
+        private myPrivateMethod<T extends privateClass>() {
+        }
+    }
+    
+    export class publicClassWithWithPublicTypeParameters {
+        static myPublicStaticMethod<T extends publicClass>() {
+        }
+        private static myPrivateStaticMethod<T extends publicClass>() { 
+        }
+        myPublicMethod<T extends publicClass>() {
+        }
+        private myPrivateMethod<T extends publicClass>() {
+        }
+    }
+    
+    class privateClassWithWithPrivateTypeParameters {
+        static myPublicStaticMethod<T extends privateClass>() {
+        }
+        private static myPrivateStaticMethod<T extends privateClass>() {
+        }
+        myPublicMethod<T extends privateClass>() {
+        }
+        private myPrivateMethod<T extends privateClass>() {
+        }
+    }
+    
+    class privateClassWithWithPublicTypeParameters {
+        static myPublicStaticMethod<T extends publicClass>() {
+        }
+        private static myPrivateStaticMethod<T extends publicClass>() {
+        }
+        myPublicMethod<T extends publicClass>() {
+        }
+        private myPrivateMethod<T extends publicClass>() {
+        }
+    }
+    
+    export function publicFunctionWithPrivateTypeParameters<T extends privateClass>() {  // Error
+                                                            ~~~~~~~~~~~~~~~~~~~~~~
+!!! Type parameter 'T' of exported function has or is using private name 'privateClass'.
+    }
+    
+    export function publicFunctionWithPublicTypeParameters<T extends publicClass>() {
+    }
+    
+    function privateFunctionWithPrivateTypeParameters<T extends privateClass>() {
+    }
+    
+    function privateFunctionWithPublicTypeParameters<T extends publicClass>() {
+    }
+    
+    export interface publicInterfaceWithPublicTypeParametersWithoutExtends {
+        new <T>(): publicClass;
+        <T>(): publicClass;
+        myMethod<T>(): publicClass;
+    }
+    
+    interface privateInterfaceWithPublicTypeParametersWithoutExtends {
+        new <T>(): publicClass;
+        <T>(): publicClass;
+        myMethod<T>(): publicClass;
+    }
+    
+    export class publicClassWithWithPublicTypeParametersWithoutExtends {
+        static myPublicStaticMethod<T>() {
+        }
+        private static myPrivateStaticMethod<T>() {
+        }
+        myPublicMethod<T>() {
+        }
+        private myPrivateMethod<T>() {
+        }
+    }
+    class privateClassWithWithPublicTypeParametersWithoutExtends {
+        static myPublicStaticMethod<T>() {
+        }
+        private static myPrivateStaticMethod<T>() {
+        }
+        myPublicMethod<T>() {
+        }
+        private myPrivateMethod<T>() {
+        }
+    }
+    
+    export function publicFunctionWithPublicTypeParametersWithoutExtends<T>() {
+    }
+    
+    function privateFunctionWithPublicTypeParametersWithoutExtends<T>() {
+    }
+    
+    export interface publicInterfaceWithPrivatModuleTypeParameters {
+        new <T extends privateModule.publicClass>(): privateModule.publicClass;  // Error
+        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Return type of constructor signature from exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Type parameter 'T' of constructor signature from exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+        <T extends privateModule.publicClass>(): privateModule.publicClass;  // Error
+        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Return type of call signature from exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Type parameter 'T' of call signature from exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+        myMethod<T extends privateModule.publicClass>(): privateModule.publicClass;  // Error
+        ~~~~~~~~
+!!! Return type of method from exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Type parameter 'T' of method from exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+    }
+    export class publicClassWithWithPrivateModuleTypeParameters {
+        static myPublicStaticMethod<T extends privateModule.publicClass>() {  // Error
+                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Type parameter 'T' of public static method from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+        }
+        myPublicMethod<T extends privateModule.publicClass>() {  // Error
+                       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Type parameter 'T' of public method from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+        }
+    }
+    export function publicFunctionWithPrivateMopduleTypeParameters<T extends privateModule.publicClass>() {  // Error
+                                                                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Type parameter 'T' of exported function has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+    }
+    
+    
+    interface privateInterfaceWithPrivatModuleTypeParameters {
+        new <T extends privateModule.publicClass>(): privateModule.publicClass;
+        <T extends privateModule.publicClass>(): privateModule.publicClass;
+        myMethod<T extends privateModule.publicClass>(): privateModule.publicClass;
+    }
+    class privateClassWithWithPrivateModuleTypeParameters {
+        static myPublicStaticMethod<T extends privateModule.publicClass>() {
+        }
+        myPublicMethod<T extends privateModule.publicClass>() {
+        }
+    }
+    function privateFunctionWithPrivateMopduleTypeParameters<T extends privateModule.publicClass>() {
+    }
+    
+    
+    export module publicModule {
+        class privateClass {
+        }
+    
+        export class publicClass {
+        }
+    
+        export interface publicInterfaceWithPrivateTypeParameters {
+            new <T extends privateClass>(): privateClass;  // Error
+            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Return type of constructor signature from exported interface has or is using private name 'privateClass'.
+                 ~~~~~~~~~~~~~~~~~~~~~~
+!!! Type parameter 'T' of constructor signature from exported interface has or is using private name 'privateClass'.
+            <T extends privateClass>(): privateClass;  // Error
+            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Return type of call signature from exported interface has or is using private name 'privateClass'.
+             ~~~~~~~~~~~~~~~~~~~~~~
+!!! Type parameter 'T' of call signature from exported interface has or is using private name 'privateClass'.
+            myMethod<T extends privateClass>(): privateClass;  // Error
+            ~~~~~~~~
+!!! Return type of method from exported interface has or is using private name 'privateClass'.
+                     ~~~~~~~~~~~~~~~~~~~~~~
+!!! Type parameter 'T' of method from exported interface has or is using private name 'privateClass'.
+        }
+    
+        export interface publicInterfaceWithPublicTypeParameters {
+            new <T extends publicClass>(): publicClass;
+            <T extends publicClass>(): publicClass;
+            myMethod<T extends publicClass>(): publicClass;
+        }
+    
+        interface privateInterfaceWithPrivateTypeParameters {
+            new <T extends privateClass>(): privateClass;
+            <T extends privateClass>(): privateClass;
+            myMethod<T extends privateClass>(): privateClass;
+        }
+    
+        interface privateInterfaceWithPublicTypeParameters {
+            new <T extends publicClass>(): publicClass;
+            <T extends publicClass>(): publicClass;
+            myMethod<T extends publicClass>(): publicClass;
+        }
+    
+        export class publicClassWithWithPrivateTypeParameters {
+            static myPublicStaticMethod<T extends privateClass>() {  // Error
+                                        ~~~~~~~~~~~~~~~~~~~~~~
+!!! Type parameter 'T' of public static method from exported class has or is using private name 'privateClass'.
+            }
+            private static myPrivateStaticMethod<T extends privateClass>() {
+            }
+            myPublicMethod<T extends privateClass>() {  // Error
+                           ~~~~~~~~~~~~~~~~~~~~~~
+!!! Type parameter 'T' of public method from exported class has or is using private name 'privateClass'.
+            }
+            private myPrivateMethod<T extends privateClass>() {
+            }
+        }
+    
+        export class publicClassWithWithPublicTypeParameters {
+            static myPublicStaticMethod<T extends publicClass>() {
+            }
+            private static myPrivateStaticMethod<T extends publicClass>() {
+            }
+            myPublicMethod<T extends publicClass>() {
+            }
+            private myPrivateMethod<T extends publicClass>() {
+            }
+        }
+    
+        class privateClassWithWithPrivateTypeParameters {
+            static myPublicStaticMethod<T extends privateClass>() {
+            }
+            private static myPrivateStaticMethod<T extends privateClass>() {
+            }
+            myPublicMethod<T extends privateClass>() {
+            }
+            private myPrivateMethod<T extends privateClass>() {
+            }
+        }
+    
+        class privateClassWithWithPublicTypeParameters {
+            static myPublicStaticMethod<T extends publicClass>() {
+            }
+            private static myPrivateStaticMethod<T extends publicClass>() {
+            }
+            myPublicMethod<T extends publicClass>() {
+            }
+            private myPrivateMethod<T extends publicClass>() {
+            }
+        }
+    
+        export function publicFunctionWithPrivateTypeParameters<T extends privateClass>() {  // Error
+                                                                ~~~~~~~~~~~~~~~~~~~~~~
+!!! Type parameter 'T' of exported function has or is using private name 'privateClass'.
+        }
+    
+        export function publicFunctionWithPublicTypeParameters<T extends publicClass>() {
+        }
+    
+        function privateFunctionWithPrivateTypeParameters<T extends privateClass>() {
+        }
+    
+        function privateFunctionWithPublicTypeParameters<T extends publicClass>() {
+        }
+    
+        export interface publicInterfaceWithPublicTypeParametersWithoutExtends {
+            new <T>(): publicClass;
+            <T>(): publicClass;
+            myMethod<T>(): publicClass;
+        }
+    
+        interface privateInterfaceWithPublicTypeParametersWithoutExtends {
+            new <T>(): publicClass;
+            <T>(): publicClass;
+            myMethod<T>(): publicClass;
+        }
+    
+        export class publicClassWithWithPublicTypeParametersWithoutExtends {
+            static myPublicStaticMethod<T>() {
+            }
+            private static myPrivateStaticMethod<T>() {
+            }
+            myPublicMethod<T>() {
+            }
+            private myPrivateMethod<T>() {
+            }
+        }
+        class privateClassWithWithPublicTypeParametersWithoutExtends {
+            static myPublicStaticMethod<T>() {
+            }
+            private static myPrivateStaticMethod<T>() {
+            }
+            myPublicMethod<T>() {
+            }
+            private myPrivateMethod<T>() {
+            }
+        }
+    
+        export function publicFunctionWithPublicTypeParametersWithoutExtends<T>() {
+        }
+    
+        function privateFunctionWithPublicTypeParametersWithoutExtends<T>() {
+        }
+    
+        export interface publicInterfaceWithPrivatModuleTypeParameters {
+            new <T extends privateModule.publicClass>(): privateModule.publicClass;  // Error
+            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Return type of constructor signature from exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Type parameter 'T' of constructor signature from exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+            <T extends privateModule.publicClass>(): privateModule.publicClass;  // Error
+            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Return type of call signature from exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Type parameter 'T' of call signature from exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+            myMethod<T extends privateModule.publicClass>(): privateModule.publicClass;  // Error
+            ~~~~~~~~
+!!! Return type of method from exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Type parameter 'T' of method from exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+        }
+        export class publicClassWithWithPrivateModuleTypeParameters {
+            static myPublicStaticMethod<T extends privateModule.publicClass>() {  // Error
+                                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Type parameter 'T' of public static method from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+            }
+            myPublicMethod<T extends privateModule.publicClass>() {  // Error
+                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Type parameter 'T' of public method from exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+            }
+        }
+        export function publicFunctionWithPrivateMopduleTypeParameters<T extends privateModule.publicClass>() {  // Error
+                                                                       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Type parameter 'T' of exported function has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+        }
+    
+    
+        interface privateInterfaceWithPrivatModuleTypeParameters {
+            new <T extends privateModule.publicClass>(): privateModule.publicClass;  
+            <T extends privateModule.publicClass>(): privateModule.publicClass;  
+            myMethod<T extends privateModule.publicClass>(): privateModule.publicClass;  
+        }
+        class privateClassWithWithPrivateModuleTypeParameters {
+            static myPublicStaticMethod<T extends privateModule.publicClass>() {  
+            }
+            myPublicMethod<T extends privateModule.publicClass>() { 
+            }
+        }
+        function privateFunctionWithPrivateMopduleTypeParameters<T extends privateModule.publicClass>() { 
+        }
+    
+    }
+    
+    module privateModule {
+        class privateClass {
+        }
+    
+        export class publicClass {
+        }
+    
+        export interface publicInterfaceWithPrivateTypeParameters {
+            new <T extends privateClass>(): privateClass; 
+            <T extends privateClass>(): privateClass;
+            myMethod<T extends privateClass>(): privateClass; 
+        }
+    
+        export interface publicInterfaceWithPublicTypeParameters {
+            new <T extends publicClass>(): publicClass;
+            <T extends publicClass>(): publicClass;
+            myMethod<T extends publicClass>(): publicClass;
+        }
+    
+        interface privateInterfaceWithPrivateTypeParameters {
+            new <T extends privateClass>(): privateClass;
+            <T extends privateClass>(): privateClass;
+            myMethod<T extends privateClass>(): privateClass;
+        }
+    
+        interface privateInterfaceWithPublicTypeParameters {
+            new <T extends publicClass>(): publicClass;
+            <T extends publicClass>(): publicClass;
+            myMethod<T extends publicClass>(): publicClass;
+        }
+    
+        export class publicClassWithWithPrivateTypeParameters {
+            static myPublicStaticMethod<T extends privateClass>() { 
+            }
+            private static myPrivateStaticMethod<T extends privateClass>() {
+            }
+            myPublicMethod<T extends privateClass>() {  
+            }
+            private myPrivateMethod<T extends privateClass>() {
+            }
+        }
+    
+        export class publicClassWithWithPublicTypeParameters {
+            static myPublicStaticMethod<T extends publicClass>() {
+            }
+            private static myPrivateStaticMethod<T extends publicClass>() {
+            }
+            myPublicMethod<T extends publicClass>() {
+            }
+            private myPrivateMethod<T extends publicClass>() {
+            }
+        }
+    
+        class privateClassWithWithPrivateTypeParameters {
+            static myPublicStaticMethod<T extends privateClass>() {
+            }
+            private static myPrivateStaticMethod<T extends privateClass>() {
+            }
+            myPublicMethod<T extends privateClass>() {
+            }
+            private myPrivateMethod<T extends privateClass>() {
+            }
+        }
+    
+        class privateClassWithWithPublicTypeParameters {
+            static myPublicStaticMethod<T extends publicClass>() {
+            }
+            private static myPrivateStaticMethod<T extends publicClass>() {
+            }
+            myPublicMethod<T extends publicClass>() {
+            }
+            private myPrivateMethod<T extends publicClass>() {
+            }
+        }
+    
+        export function publicFunctionWithPrivateTypeParameters<T extends privateClass>() { 
+        }
+    
+        export function publicFunctionWithPublicTypeParameters<T extends publicClass>() {
+        }
+    
+        function privateFunctionWithPrivateTypeParameters<T extends privateClass>() {
+        }
+    
+        function privateFunctionWithPublicTypeParameters<T extends publicClass>() {
+        }
+    
+        export interface publicInterfaceWithPublicTypeParametersWithoutExtends {
+            new <T>(): publicClass;
+            <T>(): publicClass;
+            myMethod<T>(): publicClass;
+        }
+    
+        interface privateInterfaceWithPublicTypeParametersWithoutExtends {
+            new <T>(): publicClass;
+            <T>(): publicClass;
+            myMethod<T>(): publicClass;
+        }
+    
+        export class publicClassWithWithPublicTypeParametersWithoutExtends {
+            static myPublicStaticMethod<T>() {
+            }
+            private static myPrivateStaticMethod<T>() {
+            }
+            myPublicMethod<T>() {
+            }
+            private myPrivateMethod<T>() {
+            }
+        }
+        class privateClassWithWithPublicTypeParametersWithoutExtends {
+            static myPublicStaticMethod<T>() {
+            }
+            private static myPrivateStaticMethod<T>() {
+            }
+            myPublicMethod<T>() {
+            }
+            private myPrivateMethod<T>() {
+            }
+        }
+    
+        export function publicFunctionWithPublicTypeParametersWithoutExtends<T>() {
+        }
+    
+        function privateFunctionWithPublicTypeParametersWithoutExtends<T>() {
+        }
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/privacyTypeParameterOfFunctionDeclFile.js b/tests/baselines/reference/privacyTypeParameterOfFunctionDeclFile.js
new file mode 100644
index 00000000000..173b48b8049
--- /dev/null
+++ b/tests/baselines/reference/privacyTypeParameterOfFunctionDeclFile.js
@@ -0,0 +1,816 @@
+//// [privacyTypeParameterOfFunctionDeclFile.ts]
+class privateClass {
+}
+
+export class publicClass {
+}
+
+export interface publicInterfaceWithPrivateTypeParameters {
+    new <T extends privateClass>(): privateClass;  // Error
+    <T extends privateClass>(): privateClass;  // Error
+    myMethod<T extends privateClass>(): privateClass;  // Error
+}
+
+export interface publicInterfaceWithPublicTypeParameters {
+    new <T extends publicClass>(): publicClass;
+    <T extends publicClass>(): publicClass;
+    myMethod<T extends publicClass>(): publicClass;
+}
+
+interface privateInterfaceWithPrivateTypeParameters {
+    new <T extends privateClass>(): privateClass;
+    <T extends privateClass>(): privateClass;
+    myMethod<T extends privateClass>(): privateClass;
+}
+
+interface privateInterfaceWithPublicTypeParameters {
+    new <T extends publicClass>(): publicClass;
+    <T extends publicClass>(): publicClass;
+    myMethod<T extends publicClass>(): publicClass;
+}
+
+export class publicClassWithWithPrivateTypeParameters {
+    static myPublicStaticMethod<T extends privateClass>() {  // Error
+    }
+    private static myPrivateStaticMethod<T extends privateClass>() {
+    }
+    myPublicMethod<T extends privateClass>() {  // Error
+    }
+    private myPrivateMethod<T extends privateClass>() {
+    }
+}
+
+export class publicClassWithWithPublicTypeParameters {
+    static myPublicStaticMethod<T extends publicClass>() {
+    }
+    private static myPrivateStaticMethod<T extends publicClass>() { 
+    }
+    myPublicMethod<T extends publicClass>() {
+    }
+    private myPrivateMethod<T extends publicClass>() {
+    }
+}
+
+class privateClassWithWithPrivateTypeParameters {
+    static myPublicStaticMethod<T extends privateClass>() {
+    }
+    private static myPrivateStaticMethod<T extends privateClass>() {
+    }
+    myPublicMethod<T extends privateClass>() {
+    }
+    private myPrivateMethod<T extends privateClass>() {
+    }
+}
+
+class privateClassWithWithPublicTypeParameters {
+    static myPublicStaticMethod<T extends publicClass>() {
+    }
+    private static myPrivateStaticMethod<T extends publicClass>() {
+    }
+    myPublicMethod<T extends publicClass>() {
+    }
+    private myPrivateMethod<T extends publicClass>() {
+    }
+}
+
+export function publicFunctionWithPrivateTypeParameters<T extends privateClass>() {  // Error
+}
+
+export function publicFunctionWithPublicTypeParameters<T extends publicClass>() {
+}
+
+function privateFunctionWithPrivateTypeParameters<T extends privateClass>() {
+}
+
+function privateFunctionWithPublicTypeParameters<T extends publicClass>() {
+}
+
+export interface publicInterfaceWithPublicTypeParametersWithoutExtends {
+    new <T>(): publicClass;
+    <T>(): publicClass;
+    myMethod<T>(): publicClass;
+}
+
+interface privateInterfaceWithPublicTypeParametersWithoutExtends {
+    new <T>(): publicClass;
+    <T>(): publicClass;
+    myMethod<T>(): publicClass;
+}
+
+export class publicClassWithWithPublicTypeParametersWithoutExtends {
+    static myPublicStaticMethod<T>() {
+    }
+    private static myPrivateStaticMethod<T>() {
+    }
+    myPublicMethod<T>() {
+    }
+    private myPrivateMethod<T>() {
+    }
+}
+class privateClassWithWithPublicTypeParametersWithoutExtends {
+    static myPublicStaticMethod<T>() {
+    }
+    private static myPrivateStaticMethod<T>() {
+    }
+    myPublicMethod<T>() {
+    }
+    private myPrivateMethod<T>() {
+    }
+}
+
+export function publicFunctionWithPublicTypeParametersWithoutExtends<T>() {
+}
+
+function privateFunctionWithPublicTypeParametersWithoutExtends<T>() {
+}
+
+export interface publicInterfaceWithPrivatModuleTypeParameters {
+    new <T extends privateModule.publicClass>(): privateModule.publicClass;  // Error
+    <T extends privateModule.publicClass>(): privateModule.publicClass;  // Error
+    myMethod<T extends privateModule.publicClass>(): privateModule.publicClass;  // Error
+}
+export class publicClassWithWithPrivateModuleTypeParameters {
+    static myPublicStaticMethod<T extends privateModule.publicClass>() {  // Error
+    }
+    myPublicMethod<T extends privateModule.publicClass>() {  // Error
+    }
+}
+export function publicFunctionWithPrivateMopduleTypeParameters<T extends privateModule.publicClass>() {  // Error
+}
+
+
+interface privateInterfaceWithPrivatModuleTypeParameters {
+    new <T extends privateModule.publicClass>(): privateModule.publicClass;
+    <T extends privateModule.publicClass>(): privateModule.publicClass;
+    myMethod<T extends privateModule.publicClass>(): privateModule.publicClass;
+}
+class privateClassWithWithPrivateModuleTypeParameters {
+    static myPublicStaticMethod<T extends privateModule.publicClass>() {
+    }
+    myPublicMethod<T extends privateModule.publicClass>() {
+    }
+}
+function privateFunctionWithPrivateMopduleTypeParameters<T extends privateModule.publicClass>() {
+}
+
+
+export module publicModule {
+    class privateClass {
+    }
+
+    export class publicClass {
+    }
+
+    export interface publicInterfaceWithPrivateTypeParameters {
+        new <T extends privateClass>(): privateClass;  // Error
+        <T extends privateClass>(): privateClass;  // Error
+        myMethod<T extends privateClass>(): privateClass;  // Error
+    }
+
+    export interface publicInterfaceWithPublicTypeParameters {
+        new <T extends publicClass>(): publicClass;
+        <T extends publicClass>(): publicClass;
+        myMethod<T extends publicClass>(): publicClass;
+    }
+
+    interface privateInterfaceWithPrivateTypeParameters {
+        new <T extends privateClass>(): privateClass;
+        <T extends privateClass>(): privateClass;
+        myMethod<T extends privateClass>(): privateClass;
+    }
+
+    interface privateInterfaceWithPublicTypeParameters {
+        new <T extends publicClass>(): publicClass;
+        <T extends publicClass>(): publicClass;
+        myMethod<T extends publicClass>(): publicClass;
+    }
+
+    export class publicClassWithWithPrivateTypeParameters {
+        static myPublicStaticMethod<T extends privateClass>() {  // Error
+        }
+        private static myPrivateStaticMethod<T extends privateClass>() {
+        }
+        myPublicMethod<T extends privateClass>() {  // Error
+        }
+        private myPrivateMethod<T extends privateClass>() {
+        }
+    }
+
+    export class publicClassWithWithPublicTypeParameters {
+        static myPublicStaticMethod<T extends publicClass>() {
+        }
+        private static myPrivateStaticMethod<T extends publicClass>() {
+        }
+        myPublicMethod<T extends publicClass>() {
+        }
+        private myPrivateMethod<T extends publicClass>() {
+        }
+    }
+
+    class privateClassWithWithPrivateTypeParameters {
+        static myPublicStaticMethod<T extends privateClass>() {
+        }
+        private static myPrivateStaticMethod<T extends privateClass>() {
+        }
+        myPublicMethod<T extends privateClass>() {
+        }
+        private myPrivateMethod<T extends privateClass>() {
+        }
+    }
+
+    class privateClassWithWithPublicTypeParameters {
+        static myPublicStaticMethod<T extends publicClass>() {
+        }
+        private static myPrivateStaticMethod<T extends publicClass>() {
+        }
+        myPublicMethod<T extends publicClass>() {
+        }
+        private myPrivateMethod<T extends publicClass>() {
+        }
+    }
+
+    export function publicFunctionWithPrivateTypeParameters<T extends privateClass>() {  // Error
+    }
+
+    export function publicFunctionWithPublicTypeParameters<T extends publicClass>() {
+    }
+
+    function privateFunctionWithPrivateTypeParameters<T extends privateClass>() {
+    }
+
+    function privateFunctionWithPublicTypeParameters<T extends publicClass>() {
+    }
+
+    export interface publicInterfaceWithPublicTypeParametersWithoutExtends {
+        new <T>(): publicClass;
+        <T>(): publicClass;
+        myMethod<T>(): publicClass;
+    }
+
+    interface privateInterfaceWithPublicTypeParametersWithoutExtends {
+        new <T>(): publicClass;
+        <T>(): publicClass;
+        myMethod<T>(): publicClass;
+    }
+
+    export class publicClassWithWithPublicTypeParametersWithoutExtends {
+        static myPublicStaticMethod<T>() {
+        }
+        private static myPrivateStaticMethod<T>() {
+        }
+        myPublicMethod<T>() {
+        }
+        private myPrivateMethod<T>() {
+        }
+    }
+    class privateClassWithWithPublicTypeParametersWithoutExtends {
+        static myPublicStaticMethod<T>() {
+        }
+        private static myPrivateStaticMethod<T>() {
+        }
+        myPublicMethod<T>() {
+        }
+        private myPrivateMethod<T>() {
+        }
+    }
+
+    export function publicFunctionWithPublicTypeParametersWithoutExtends<T>() {
+    }
+
+    function privateFunctionWithPublicTypeParametersWithoutExtends<T>() {
+    }
+
+    export interface publicInterfaceWithPrivatModuleTypeParameters {
+        new <T extends privateModule.publicClass>(): privateModule.publicClass;  // Error
+        <T extends privateModule.publicClass>(): privateModule.publicClass;  // Error
+        myMethod<T extends privateModule.publicClass>(): privateModule.publicClass;  // Error
+    }
+    export class publicClassWithWithPrivateModuleTypeParameters {
+        static myPublicStaticMethod<T extends privateModule.publicClass>() {  // Error
+        }
+        myPublicMethod<T extends privateModule.publicClass>() {  // Error
+        }
+    }
+    export function publicFunctionWithPrivateMopduleTypeParameters<T extends privateModule.publicClass>() {  // Error
+    }
+
+
+    interface privateInterfaceWithPrivatModuleTypeParameters {
+        new <T extends privateModule.publicClass>(): privateModule.publicClass;  
+        <T extends privateModule.publicClass>(): privateModule.publicClass;  
+        myMethod<T extends privateModule.publicClass>(): privateModule.publicClass;  
+    }
+    class privateClassWithWithPrivateModuleTypeParameters {
+        static myPublicStaticMethod<T extends privateModule.publicClass>() {  
+        }
+        myPublicMethod<T extends privateModule.publicClass>() { 
+        }
+    }
+    function privateFunctionWithPrivateMopduleTypeParameters<T extends privateModule.publicClass>() { 
+    }
+
+}
+
+module privateModule {
+    class privateClass {
+    }
+
+    export class publicClass {
+    }
+
+    export interface publicInterfaceWithPrivateTypeParameters {
+        new <T extends privateClass>(): privateClass; 
+        <T extends privateClass>(): privateClass;
+        myMethod<T extends privateClass>(): privateClass; 
+    }
+
+    export interface publicInterfaceWithPublicTypeParameters {
+        new <T extends publicClass>(): publicClass;
+        <T extends publicClass>(): publicClass;
+        myMethod<T extends publicClass>(): publicClass;
+    }
+
+    interface privateInterfaceWithPrivateTypeParameters {
+        new <T extends privateClass>(): privateClass;
+        <T extends privateClass>(): privateClass;
+        myMethod<T extends privateClass>(): privateClass;
+    }
+
+    interface privateInterfaceWithPublicTypeParameters {
+        new <T extends publicClass>(): publicClass;
+        <T extends publicClass>(): publicClass;
+        myMethod<T extends publicClass>(): publicClass;
+    }
+
+    export class publicClassWithWithPrivateTypeParameters {
+        static myPublicStaticMethod<T extends privateClass>() { 
+        }
+        private static myPrivateStaticMethod<T extends privateClass>() {
+        }
+        myPublicMethod<T extends privateClass>() {  
+        }
+        private myPrivateMethod<T extends privateClass>() {
+        }
+    }
+
+    export class publicClassWithWithPublicTypeParameters {
+        static myPublicStaticMethod<T extends publicClass>() {
+        }
+        private static myPrivateStaticMethod<T extends publicClass>() {
+        }
+        myPublicMethod<T extends publicClass>() {
+        }
+        private myPrivateMethod<T extends publicClass>() {
+        }
+    }
+
+    class privateClassWithWithPrivateTypeParameters {
+        static myPublicStaticMethod<T extends privateClass>() {
+        }
+        private static myPrivateStaticMethod<T extends privateClass>() {
+        }
+        myPublicMethod<T extends privateClass>() {
+        }
+        private myPrivateMethod<T extends privateClass>() {
+        }
+    }
+
+    class privateClassWithWithPublicTypeParameters {
+        static myPublicStaticMethod<T extends publicClass>() {
+        }
+        private static myPrivateStaticMethod<T extends publicClass>() {
+        }
+        myPublicMethod<T extends publicClass>() {
+        }
+        private myPrivateMethod<T extends publicClass>() {
+        }
+    }
+
+    export function publicFunctionWithPrivateTypeParameters<T extends privateClass>() { 
+    }
+
+    export function publicFunctionWithPublicTypeParameters<T extends publicClass>() {
+    }
+
+    function privateFunctionWithPrivateTypeParameters<T extends privateClass>() {
+    }
+
+    function privateFunctionWithPublicTypeParameters<T extends publicClass>() {
+    }
+
+    export interface publicInterfaceWithPublicTypeParametersWithoutExtends {
+        new <T>(): publicClass;
+        <T>(): publicClass;
+        myMethod<T>(): publicClass;
+    }
+
+    interface privateInterfaceWithPublicTypeParametersWithoutExtends {
+        new <T>(): publicClass;
+        <T>(): publicClass;
+        myMethod<T>(): publicClass;
+    }
+
+    export class publicClassWithWithPublicTypeParametersWithoutExtends {
+        static myPublicStaticMethod<T>() {
+        }
+        private static myPrivateStaticMethod<T>() {
+        }
+        myPublicMethod<T>() {
+        }
+        private myPrivateMethod<T>() {
+        }
+    }
+    class privateClassWithWithPublicTypeParametersWithoutExtends {
+        static myPublicStaticMethod<T>() {
+        }
+        private static myPrivateStaticMethod<T>() {
+        }
+        myPublicMethod<T>() {
+        }
+        private myPrivateMethod<T>() {
+        }
+    }
+
+    export function publicFunctionWithPublicTypeParametersWithoutExtends<T>() {
+    }
+
+    function privateFunctionWithPublicTypeParametersWithoutExtends<T>() {
+    }
+}
+
+//// [privacyTypeParameterOfFunctionDeclFile.js]
+var privateClass = (function () {
+    function privateClass() {
+    }
+    return privateClass;
+})();
+var publicClass = (function () {
+    function publicClass() {
+    }
+    return publicClass;
+})();
+exports.publicClass = publicClass;
+var publicClassWithWithPrivateTypeParameters = (function () {
+    function publicClassWithWithPrivateTypeParameters() {
+    }
+    publicClassWithWithPrivateTypeParameters.myPublicStaticMethod = function () {
+    };
+    publicClassWithWithPrivateTypeParameters.myPrivateStaticMethod = function () {
+    };
+    publicClassWithWithPrivateTypeParameters.prototype.myPublicMethod = function () {
+    };
+    publicClassWithWithPrivateTypeParameters.prototype.myPrivateMethod = function () {
+    };
+    return publicClassWithWithPrivateTypeParameters;
+})();
+exports.publicClassWithWithPrivateTypeParameters = publicClassWithWithPrivateTypeParameters;
+var publicClassWithWithPublicTypeParameters = (function () {
+    function publicClassWithWithPublicTypeParameters() {
+    }
+    publicClassWithWithPublicTypeParameters.myPublicStaticMethod = function () {
+    };
+    publicClassWithWithPublicTypeParameters.myPrivateStaticMethod = function () {
+    };
+    publicClassWithWithPublicTypeParameters.prototype.myPublicMethod = function () {
+    };
+    publicClassWithWithPublicTypeParameters.prototype.myPrivateMethod = function () {
+    };
+    return publicClassWithWithPublicTypeParameters;
+})();
+exports.publicClassWithWithPublicTypeParameters = publicClassWithWithPublicTypeParameters;
+var privateClassWithWithPrivateTypeParameters = (function () {
+    function privateClassWithWithPrivateTypeParameters() {
+    }
+    privateClassWithWithPrivateTypeParameters.myPublicStaticMethod = function () {
+    };
+    privateClassWithWithPrivateTypeParameters.myPrivateStaticMethod = function () {
+    };
+    privateClassWithWithPrivateTypeParameters.prototype.myPublicMethod = function () {
+    };
+    privateClassWithWithPrivateTypeParameters.prototype.myPrivateMethod = function () {
+    };
+    return privateClassWithWithPrivateTypeParameters;
+})();
+var privateClassWithWithPublicTypeParameters = (function () {
+    function privateClassWithWithPublicTypeParameters() {
+    }
+    privateClassWithWithPublicTypeParameters.myPublicStaticMethod = function () {
+    };
+    privateClassWithWithPublicTypeParameters.myPrivateStaticMethod = function () {
+    };
+    privateClassWithWithPublicTypeParameters.prototype.myPublicMethod = function () {
+    };
+    privateClassWithWithPublicTypeParameters.prototype.myPrivateMethod = function () {
+    };
+    return privateClassWithWithPublicTypeParameters;
+})();
+function publicFunctionWithPrivateTypeParameters() {
+}
+exports.publicFunctionWithPrivateTypeParameters = publicFunctionWithPrivateTypeParameters;
+function publicFunctionWithPublicTypeParameters() {
+}
+exports.publicFunctionWithPublicTypeParameters = publicFunctionWithPublicTypeParameters;
+function privateFunctionWithPrivateTypeParameters() {
+}
+function privateFunctionWithPublicTypeParameters() {
+}
+var publicClassWithWithPublicTypeParametersWithoutExtends = (function () {
+    function publicClassWithWithPublicTypeParametersWithoutExtends() {
+    }
+    publicClassWithWithPublicTypeParametersWithoutExtends.myPublicStaticMethod = function () {
+    };
+    publicClassWithWithPublicTypeParametersWithoutExtends.myPrivateStaticMethod = function () {
+    };
+    publicClassWithWithPublicTypeParametersWithoutExtends.prototype.myPublicMethod = function () {
+    };
+    publicClassWithWithPublicTypeParametersWithoutExtends.prototype.myPrivateMethod = function () {
+    };
+    return publicClassWithWithPublicTypeParametersWithoutExtends;
+})();
+exports.publicClassWithWithPublicTypeParametersWithoutExtends = publicClassWithWithPublicTypeParametersWithoutExtends;
+var privateClassWithWithPublicTypeParametersWithoutExtends = (function () {
+    function privateClassWithWithPublicTypeParametersWithoutExtends() {
+    }
+    privateClassWithWithPublicTypeParametersWithoutExtends.myPublicStaticMethod = function () {
+    };
+    privateClassWithWithPublicTypeParametersWithoutExtends.myPrivateStaticMethod = function () {
+    };
+    privateClassWithWithPublicTypeParametersWithoutExtends.prototype.myPublicMethod = function () {
+    };
+    privateClassWithWithPublicTypeParametersWithoutExtends.prototype.myPrivateMethod = function () {
+    };
+    return privateClassWithWithPublicTypeParametersWithoutExtends;
+})();
+function publicFunctionWithPublicTypeParametersWithoutExtends() {
+}
+exports.publicFunctionWithPublicTypeParametersWithoutExtends = publicFunctionWithPublicTypeParametersWithoutExtends;
+function privateFunctionWithPublicTypeParametersWithoutExtends() {
+}
+var publicClassWithWithPrivateModuleTypeParameters = (function () {
+    function publicClassWithWithPrivateModuleTypeParameters() {
+    }
+    publicClassWithWithPrivateModuleTypeParameters.myPublicStaticMethod = function () {
+    };
+    publicClassWithWithPrivateModuleTypeParameters.prototype.myPublicMethod = function () {
+    };
+    return publicClassWithWithPrivateModuleTypeParameters;
+})();
+exports.publicClassWithWithPrivateModuleTypeParameters = publicClassWithWithPrivateModuleTypeParameters;
+function publicFunctionWithPrivateMopduleTypeParameters() {
+}
+exports.publicFunctionWithPrivateMopduleTypeParameters = publicFunctionWithPrivateMopduleTypeParameters;
+var privateClassWithWithPrivateModuleTypeParameters = (function () {
+    function privateClassWithWithPrivateModuleTypeParameters() {
+    }
+    privateClassWithWithPrivateModuleTypeParameters.myPublicStaticMethod = function () {
+    };
+    privateClassWithWithPrivateModuleTypeParameters.prototype.myPublicMethod = function () {
+    };
+    return privateClassWithWithPrivateModuleTypeParameters;
+})();
+function privateFunctionWithPrivateMopduleTypeParameters() {
+}
+(function (publicModule) {
+    var privateClass = (function () {
+        function privateClass() {
+        }
+        return privateClass;
+    })();
+    var publicClass = (function () {
+        function publicClass() {
+        }
+        return publicClass;
+    })();
+    publicModule.publicClass = publicClass;
+    var publicClassWithWithPrivateTypeParameters = (function () {
+        function publicClassWithWithPrivateTypeParameters() {
+        }
+        publicClassWithWithPrivateTypeParameters.myPublicStaticMethod = function () {
+        };
+        publicClassWithWithPrivateTypeParameters.myPrivateStaticMethod = function () {
+        };
+        publicClassWithWithPrivateTypeParameters.prototype.myPublicMethod = function () {
+        };
+        publicClassWithWithPrivateTypeParameters.prototype.myPrivateMethod = function () {
+        };
+        return publicClassWithWithPrivateTypeParameters;
+    })();
+    publicModule.publicClassWithWithPrivateTypeParameters = publicClassWithWithPrivateTypeParameters;
+    var publicClassWithWithPublicTypeParameters = (function () {
+        function publicClassWithWithPublicTypeParameters() {
+        }
+        publicClassWithWithPublicTypeParameters.myPublicStaticMethod = function () {
+        };
+        publicClassWithWithPublicTypeParameters.myPrivateStaticMethod = function () {
+        };
+        publicClassWithWithPublicTypeParameters.prototype.myPublicMethod = function () {
+        };
+        publicClassWithWithPublicTypeParameters.prototype.myPrivateMethod = function () {
+        };
+        return publicClassWithWithPublicTypeParameters;
+    })();
+    publicModule.publicClassWithWithPublicTypeParameters = publicClassWithWithPublicTypeParameters;
+    var privateClassWithWithPrivateTypeParameters = (function () {
+        function privateClassWithWithPrivateTypeParameters() {
+        }
+        privateClassWithWithPrivateTypeParameters.myPublicStaticMethod = function () {
+        };
+        privateClassWithWithPrivateTypeParameters.myPrivateStaticMethod = function () {
+        };
+        privateClassWithWithPrivateTypeParameters.prototype.myPublicMethod = function () {
+        };
+        privateClassWithWithPrivateTypeParameters.prototype.myPrivateMethod = function () {
+        };
+        return privateClassWithWithPrivateTypeParameters;
+    })();
+    var privateClassWithWithPublicTypeParameters = (function () {
+        function privateClassWithWithPublicTypeParameters() {
+        }
+        privateClassWithWithPublicTypeParameters.myPublicStaticMethod = function () {
+        };
+        privateClassWithWithPublicTypeParameters.myPrivateStaticMethod = function () {
+        };
+        privateClassWithWithPublicTypeParameters.prototype.myPublicMethod = function () {
+        };
+        privateClassWithWithPublicTypeParameters.prototype.myPrivateMethod = function () {
+        };
+        return privateClassWithWithPublicTypeParameters;
+    })();
+    function publicFunctionWithPrivateTypeParameters() {
+    }
+    publicModule.publicFunctionWithPrivateTypeParameters = publicFunctionWithPrivateTypeParameters;
+    function publicFunctionWithPublicTypeParameters() {
+    }
+    publicModule.publicFunctionWithPublicTypeParameters = publicFunctionWithPublicTypeParameters;
+    function privateFunctionWithPrivateTypeParameters() {
+    }
+    function privateFunctionWithPublicTypeParameters() {
+    }
+    var publicClassWithWithPublicTypeParametersWithoutExtends = (function () {
+        function publicClassWithWithPublicTypeParametersWithoutExtends() {
+        }
+        publicClassWithWithPublicTypeParametersWithoutExtends.myPublicStaticMethod = function () {
+        };
+        publicClassWithWithPublicTypeParametersWithoutExtends.myPrivateStaticMethod = function () {
+        };
+        publicClassWithWithPublicTypeParametersWithoutExtends.prototype.myPublicMethod = function () {
+        };
+        publicClassWithWithPublicTypeParametersWithoutExtends.prototype.myPrivateMethod = function () {
+        };
+        return publicClassWithWithPublicTypeParametersWithoutExtends;
+    })();
+    publicModule.publicClassWithWithPublicTypeParametersWithoutExtends = publicClassWithWithPublicTypeParametersWithoutExtends;
+    var privateClassWithWithPublicTypeParametersWithoutExtends = (function () {
+        function privateClassWithWithPublicTypeParametersWithoutExtends() {
+        }
+        privateClassWithWithPublicTypeParametersWithoutExtends.myPublicStaticMethod = function () {
+        };
+        privateClassWithWithPublicTypeParametersWithoutExtends.myPrivateStaticMethod = function () {
+        };
+        privateClassWithWithPublicTypeParametersWithoutExtends.prototype.myPublicMethod = function () {
+        };
+        privateClassWithWithPublicTypeParametersWithoutExtends.prototype.myPrivateMethod = function () {
+        };
+        return privateClassWithWithPublicTypeParametersWithoutExtends;
+    })();
+    function publicFunctionWithPublicTypeParametersWithoutExtends() {
+    }
+    publicModule.publicFunctionWithPublicTypeParametersWithoutExtends = publicFunctionWithPublicTypeParametersWithoutExtends;
+    function privateFunctionWithPublicTypeParametersWithoutExtends() {
+    }
+    var publicClassWithWithPrivateModuleTypeParameters = (function () {
+        function publicClassWithWithPrivateModuleTypeParameters() {
+        }
+        publicClassWithWithPrivateModuleTypeParameters.myPublicStaticMethod = function () {
+        };
+        publicClassWithWithPrivateModuleTypeParameters.prototype.myPublicMethod = function () {
+        };
+        return publicClassWithWithPrivateModuleTypeParameters;
+    })();
+    publicModule.publicClassWithWithPrivateModuleTypeParameters = publicClassWithWithPrivateModuleTypeParameters;
+    function publicFunctionWithPrivateMopduleTypeParameters() {
+    }
+    publicModule.publicFunctionWithPrivateMopduleTypeParameters = publicFunctionWithPrivateMopduleTypeParameters;
+    var privateClassWithWithPrivateModuleTypeParameters = (function () {
+        function privateClassWithWithPrivateModuleTypeParameters() {
+        }
+        privateClassWithWithPrivateModuleTypeParameters.myPublicStaticMethod = function () {
+        };
+        privateClassWithWithPrivateModuleTypeParameters.prototype.myPublicMethod = function () {
+        };
+        return privateClassWithWithPrivateModuleTypeParameters;
+    })();
+    function privateFunctionWithPrivateMopduleTypeParameters() {
+    }
+})(exports.publicModule || (exports.publicModule = {}));
+var publicModule = exports.publicModule;
+var privateModule;
+(function (privateModule) {
+    var privateClass = (function () {
+        function privateClass() {
+        }
+        return privateClass;
+    })();
+    var publicClass = (function () {
+        function publicClass() {
+        }
+        return publicClass;
+    })();
+    privateModule.publicClass = publicClass;
+    var publicClassWithWithPrivateTypeParameters = (function () {
+        function publicClassWithWithPrivateTypeParameters() {
+        }
+        publicClassWithWithPrivateTypeParameters.myPublicStaticMethod = function () {
+        };
+        publicClassWithWithPrivateTypeParameters.myPrivateStaticMethod = function () {
+        };
+        publicClassWithWithPrivateTypeParameters.prototype.myPublicMethod = function () {
+        };
+        publicClassWithWithPrivateTypeParameters.prototype.myPrivateMethod = function () {
+        };
+        return publicClassWithWithPrivateTypeParameters;
+    })();
+    privateModule.publicClassWithWithPrivateTypeParameters = publicClassWithWithPrivateTypeParameters;
+    var publicClassWithWithPublicTypeParameters = (function () {
+        function publicClassWithWithPublicTypeParameters() {
+        }
+        publicClassWithWithPublicTypeParameters.myPublicStaticMethod = function () {
+        };
+        publicClassWithWithPublicTypeParameters.myPrivateStaticMethod = function () {
+        };
+        publicClassWithWithPublicTypeParameters.prototype.myPublicMethod = function () {
+        };
+        publicClassWithWithPublicTypeParameters.prototype.myPrivateMethod = function () {
+        };
+        return publicClassWithWithPublicTypeParameters;
+    })();
+    privateModule.publicClassWithWithPublicTypeParameters = publicClassWithWithPublicTypeParameters;
+    var privateClassWithWithPrivateTypeParameters = (function () {
+        function privateClassWithWithPrivateTypeParameters() {
+        }
+        privateClassWithWithPrivateTypeParameters.myPublicStaticMethod = function () {
+        };
+        privateClassWithWithPrivateTypeParameters.myPrivateStaticMethod = function () {
+        };
+        privateClassWithWithPrivateTypeParameters.prototype.myPublicMethod = function () {
+        };
+        privateClassWithWithPrivateTypeParameters.prototype.myPrivateMethod = function () {
+        };
+        return privateClassWithWithPrivateTypeParameters;
+    })();
+    var privateClassWithWithPublicTypeParameters = (function () {
+        function privateClassWithWithPublicTypeParameters() {
+        }
+        privateClassWithWithPublicTypeParameters.myPublicStaticMethod = function () {
+        };
+        privateClassWithWithPublicTypeParameters.myPrivateStaticMethod = function () {
+        };
+        privateClassWithWithPublicTypeParameters.prototype.myPublicMethod = function () {
+        };
+        privateClassWithWithPublicTypeParameters.prototype.myPrivateMethod = function () {
+        };
+        return privateClassWithWithPublicTypeParameters;
+    })();
+    function publicFunctionWithPrivateTypeParameters() {
+    }
+    privateModule.publicFunctionWithPrivateTypeParameters = publicFunctionWithPrivateTypeParameters;
+    function publicFunctionWithPublicTypeParameters() {
+    }
+    privateModule.publicFunctionWithPublicTypeParameters = publicFunctionWithPublicTypeParameters;
+    function privateFunctionWithPrivateTypeParameters() {
+    }
+    function privateFunctionWithPublicTypeParameters() {
+    }
+    var publicClassWithWithPublicTypeParametersWithoutExtends = (function () {
+        function publicClassWithWithPublicTypeParametersWithoutExtends() {
+        }
+        publicClassWithWithPublicTypeParametersWithoutExtends.myPublicStaticMethod = function () {
+        };
+        publicClassWithWithPublicTypeParametersWithoutExtends.myPrivateStaticMethod = function () {
+        };
+        publicClassWithWithPublicTypeParametersWithoutExtends.prototype.myPublicMethod = function () {
+        };
+        publicClassWithWithPublicTypeParametersWithoutExtends.prototype.myPrivateMethod = function () {
+        };
+        return publicClassWithWithPublicTypeParametersWithoutExtends;
+    })();
+    privateModule.publicClassWithWithPublicTypeParametersWithoutExtends = publicClassWithWithPublicTypeParametersWithoutExtends;
+    var privateClassWithWithPublicTypeParametersWithoutExtends = (function () {
+        function privateClassWithWithPublicTypeParametersWithoutExtends() {
+        }
+        privateClassWithWithPublicTypeParametersWithoutExtends.myPublicStaticMethod = function () {
+        };
+        privateClassWithWithPublicTypeParametersWithoutExtends.myPrivateStaticMethod = function () {
+        };
+        privateClassWithWithPublicTypeParametersWithoutExtends.prototype.myPublicMethod = function () {
+        };
+        privateClassWithWithPublicTypeParametersWithoutExtends.prototype.myPrivateMethod = function () {
+        };
+        return privateClassWithWithPublicTypeParametersWithoutExtends;
+    })();
+    function publicFunctionWithPublicTypeParametersWithoutExtends() {
+    }
+    privateModule.publicFunctionWithPublicTypeParametersWithoutExtends = publicFunctionWithPublicTypeParametersWithoutExtends;
+    function privateFunctionWithPublicTypeParametersWithoutExtends() {
+    }
+})(privateModule || (privateModule = {}));
diff --git a/tests/baselines/reference/privacyTypeParametersOfClass.errors.txt b/tests/baselines/reference/privacyTypeParametersOfClass.errors.txt
deleted file mode 100644
index 409588c58b0..00000000000
--- a/tests/baselines/reference/privacyTypeParametersOfClass.errors.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-==== tests/cases/compiler/privacyTypeParametersOfClass.ts (1 errors) ====
-    class privateClass {
-    }
-    
-    export class publicClass {
-                 ~~~~~~~~~~~
-!!! Cannot compile external modules unless the '--module' flag is provided.
-    }
-    
-    // TypeParameter_0_of_exported_class_1_has_or_is_using_private_type_2
-    export class publicClassWithPrivateTypeParameters<T extends privateClass> {
-        myMethod(val: T): T { // Error
-            return val;
-        }
-    }
-    
-    export class publicClassWithPublicTypeParameters<T extends publicClass> {
-        myMethod(val: T): T { // No Error
-            return val;
-        }
-    }
-    
-    class privateClassWithPrivateTypeParameters<T extends privateClass> {
-        myMethod(val: T): T { // No Error
-            return val;
-        }
-    }
-    
-    class privateClassWithPublicTypeParameters<T extends publicClass> {
-        myMethod(val: T): T { // No Error
-            return val;
-        }
-    }
-    
-    export class publicClassWithPublicTypeParametersWithoutExtends<T> {
-        myMethod(val: T): T { // No Error
-            return val;
-        }
-    }
-    
-    class privateClassWithPublicTypeParametersWithoutExtends<T> {
-        myMethod(val: T): T { // No Error
-            return val;
-        }
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/privacyTypeParametersOfClass.js b/tests/baselines/reference/privacyTypeParametersOfClass.js
new file mode 100644
index 00000000000..c76eaa67851
--- /dev/null
+++ b/tests/baselines/reference/privacyTypeParametersOfClass.js
@@ -0,0 +1,109 @@
+//// [privacyTypeParametersOfClass.ts]
+class privateClass {
+}
+
+export class publicClass {
+}
+
+// TypeParameter_0_of_exported_class_1_has_or_is_using_private_type_2
+export class publicClassWithPrivateTypeParameters<T extends privateClass> {
+    myMethod(val: T): T { // Error
+        return val;
+    }
+}
+
+export class publicClassWithPublicTypeParameters<T extends publicClass> {
+    myMethod(val: T): T { // No Error
+        return val;
+    }
+}
+
+class privateClassWithPrivateTypeParameters<T extends privateClass> {
+    myMethod(val: T): T { // No Error
+        return val;
+    }
+}
+
+class privateClassWithPublicTypeParameters<T extends publicClass> {
+    myMethod(val: T): T { // No Error
+        return val;
+    }
+}
+
+export class publicClassWithPublicTypeParametersWithoutExtends<T> {
+    myMethod(val: T): T { // No Error
+        return val;
+    }
+}
+
+class privateClassWithPublicTypeParametersWithoutExtends<T> {
+    myMethod(val: T): T { // No Error
+        return val;
+    }
+}
+
+
+//// [privacyTypeParametersOfClass.js]
+var privateClass = (function () {
+    function privateClass() {
+    }
+    return privateClass;
+})();
+var publicClass = (function () {
+    function publicClass() {
+    }
+    return publicClass;
+})();
+exports.publicClass = publicClass;
+// TypeParameter_0_of_exported_class_1_has_or_is_using_private_type_2
+var publicClassWithPrivateTypeParameters = (function () {
+    function publicClassWithPrivateTypeParameters() {
+    }
+    publicClassWithPrivateTypeParameters.prototype.myMethod = function (val) {
+        return val;
+    };
+    return publicClassWithPrivateTypeParameters;
+})();
+exports.publicClassWithPrivateTypeParameters = publicClassWithPrivateTypeParameters;
+var publicClassWithPublicTypeParameters = (function () {
+    function publicClassWithPublicTypeParameters() {
+    }
+    publicClassWithPublicTypeParameters.prototype.myMethod = function (val) {
+        return val;
+    };
+    return publicClassWithPublicTypeParameters;
+})();
+exports.publicClassWithPublicTypeParameters = publicClassWithPublicTypeParameters;
+var privateClassWithPrivateTypeParameters = (function () {
+    function privateClassWithPrivateTypeParameters() {
+    }
+    privateClassWithPrivateTypeParameters.prototype.myMethod = function (val) {
+        return val;
+    };
+    return privateClassWithPrivateTypeParameters;
+})();
+var privateClassWithPublicTypeParameters = (function () {
+    function privateClassWithPublicTypeParameters() {
+    }
+    privateClassWithPublicTypeParameters.prototype.myMethod = function (val) {
+        return val;
+    };
+    return privateClassWithPublicTypeParameters;
+})();
+var publicClassWithPublicTypeParametersWithoutExtends = (function () {
+    function publicClassWithPublicTypeParametersWithoutExtends() {
+    }
+    publicClassWithPublicTypeParametersWithoutExtends.prototype.myMethod = function (val) {
+        return val;
+    };
+    return publicClassWithPublicTypeParametersWithoutExtends;
+})();
+exports.publicClassWithPublicTypeParametersWithoutExtends = publicClassWithPublicTypeParametersWithoutExtends;
+var privateClassWithPublicTypeParametersWithoutExtends = (function () {
+    function privateClassWithPublicTypeParametersWithoutExtends() {
+    }
+    privateClassWithPublicTypeParametersWithoutExtends.prototype.myMethod = function (val) {
+        return val;
+    };
+    return privateClassWithPublicTypeParametersWithoutExtends;
+})();
diff --git a/tests/baselines/reference/privacyTypeParametersOfClass.types b/tests/baselines/reference/privacyTypeParametersOfClass.types
new file mode 100644
index 00000000000..c99b8b08afd
--- /dev/null
+++ b/tests/baselines/reference/privacyTypeParametersOfClass.types
@@ -0,0 +1,104 @@
+=== tests/cases/compiler/privacyTypeParametersOfClass.ts ===
+class privateClass {
+>privateClass : privateClass
+}
+
+export class publicClass {
+>publicClass : 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
+    }
+}
+
+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
+    }
+}
+
+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
+    }
+}
+
+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
+    }
+}
+
+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
+    }
+}
+
+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.errors.txt b/tests/baselines/reference/privacyTypeParametersOfClassDeclFile.errors.txt
new file mode 100644
index 00000000000..b413b671f40
--- /dev/null
+++ b/tests/baselines/reference/privacyTypeParametersOfClassDeclFile.errors.txt
@@ -0,0 +1,163 @@
+==== tests/cases/compiler/privacyTypeParametersOfClassDeclFile.ts (4 errors) ====
+    class privateClass {
+    }
+    
+    export class publicClass {
+    }
+    
+    export class publicClassWithPrivateTypeParameters<T extends privateClass> { // Error
+                                                      ~~~~~~~~~~~~~~~~~~~~~~
+!!! Type parameter 'T' of exported class has or is using private name 'privateClass'.
+        myMethod(val: T): T {
+            return val;
+        }
+    }
+    
+    export class publicClassWithPublicTypeParameters<T extends publicClass> {
+        myMethod(val: T): T {
+            return val;
+        }
+    }
+    
+    class privateClassWithPrivateTypeParameters<T extends privateClass> {
+        myMethod(val: T): T {
+            return val;
+        }
+    }
+    
+    class privateClassWithPublicTypeParameters<T extends publicClass> {
+        myMethod(val: T): T { 
+            return val;
+        }
+    }
+    
+    export class publicClassWithPublicTypeParametersWithoutExtends<T> {
+        myMethod(val: T): T { 
+            return val;
+        }
+    }
+    
+    class privateClassWithPublicTypeParametersWithoutExtends<T> {
+        myMethod(val: T): T { 
+            return val;
+        }
+    }
+    
+    export class publicClassWithTypeParametersFromPrivateModule<T extends privateModule.publicClassInPrivateModule> { // Error
+                                                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Type parameter 'T' of exported class has or is using name 'privateModule.publicClassInPrivateModule' from private module 'privateModule'.
+        myMethod(val: T): T {
+            return val;
+        }
+    }
+    
+    class privateClassWithTypeParametersFromPrivateModule<T extends privateModule.publicClassInPrivateModule> {
+        myMethod(val: T): T {
+            return val;
+        }
+    }
+    
+    export module publicModule {
+        class privateClassInPublicModule {
+        }
+    
+        export class publicClassInPublicModule {
+        }
+    
+        export class publicClassWithPrivateTypeParameters<T extends privateClassInPublicModule> { // Error
+                                                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Type parameter 'T' of exported class has or is using private name 'privateClassInPublicModule'.
+            myMethod(val: T): T {
+                return val;
+            }
+        }
+    
+        export class publicClassWithPublicTypeParameters<T extends publicClassInPublicModule> {
+            myMethod(val: T): T {
+                return val;
+            }
+        }
+    
+        class privateClassWithPrivateTypeParameters<T extends privateClassInPublicModule> {
+            myMethod(val: T): T {
+                return val;
+            }
+        }
+    
+        class privateClassWithPublicTypeParameters<T extends publicClassInPublicModule> {
+            myMethod(val: T): T {
+                return val;
+            }
+        }
+    
+        export class publicClassWithPublicTypeParametersWithoutExtends<T> {
+            myMethod(val: T): T {
+                return val;
+            }
+        }
+    
+        class privateClassWithPublicTypeParametersWithoutExtends<T> {
+            myMethod(val: T): T {
+                return val;
+            }
+        }
+    
+        export class publicClassWithTypeParametersFromPrivateModule<T extends privateModule.publicClassInPrivateModule> { // Error
+                                                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Type parameter 'T' of exported class has or is using name 'privateModule.publicClassInPrivateModule' from private module 'privateModule'.
+            myMethod(val: T): T {
+                return val;
+            }
+        }
+    
+        class privateClassWithTypeParametersFromPrivateModule<T extends privateModule.publicClassInPrivateModule> {
+            myMethod(val: T): T {
+                return val;
+            }
+        }
+    }
+    
+    module privateModule {
+        class privateClassInPrivateModule {
+        }
+    
+        export class publicClassInPrivateModule {
+        }
+    
+        export class publicClassWithPrivateTypeParameters<T extends privateClassInPrivateModule> {
+            myMethod(val: T): T {
+                return val;
+            }
+        }
+    
+        export class publicClassWithPublicTypeParameters<T extends publicClassInPrivateModule> {
+            myMethod(val: T): T {
+                return val;
+            }
+        }
+    
+        class privateClassWithPrivateTypeParameters<T extends privateClassInPrivateModule> {
+            myMethod(val: T): T {
+                return val;
+            }
+        }
+    
+        class privateClassWithPublicTypeParameters<T extends publicClassInPrivateModule> {
+            myMethod(val: T): T {
+                return val;
+            }
+        }
+    
+        export class publicClassWithPublicTypeParametersWithoutExtends<T> {
+            myMethod(val: T): T {
+                return val;
+            }
+        }
+    
+        class privateClassWithPublicTypeParametersWithoutExtends<T> {
+            myMethod(val: T): T {
+                return val;
+            }
+        }
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/privacyTypeParametersOfClassDeclFile.js b/tests/baselines/reference/privacyTypeParametersOfClassDeclFile.js
new file mode 100644
index 00000000000..ae829f5ab8a
--- /dev/null
+++ b/tests/baselines/reference/privacyTypeParametersOfClassDeclFile.js
@@ -0,0 +1,383 @@
+//// [privacyTypeParametersOfClassDeclFile.ts]
+class privateClass {
+}
+
+export class publicClass {
+}
+
+export class publicClassWithPrivateTypeParameters<T extends privateClass> { // Error
+    myMethod(val: T): T {
+        return val;
+    }
+}
+
+export class publicClassWithPublicTypeParameters<T extends publicClass> {
+    myMethod(val: T): T {
+        return val;
+    }
+}
+
+class privateClassWithPrivateTypeParameters<T extends privateClass> {
+    myMethod(val: T): T {
+        return val;
+    }
+}
+
+class privateClassWithPublicTypeParameters<T extends publicClass> {
+    myMethod(val: T): T { 
+        return val;
+    }
+}
+
+export class publicClassWithPublicTypeParametersWithoutExtends<T> {
+    myMethod(val: T): T { 
+        return val;
+    }
+}
+
+class privateClassWithPublicTypeParametersWithoutExtends<T> {
+    myMethod(val: T): T { 
+        return val;
+    }
+}
+
+export class publicClassWithTypeParametersFromPrivateModule<T extends privateModule.publicClassInPrivateModule> { // Error
+    myMethod(val: T): T {
+        return val;
+    }
+}
+
+class privateClassWithTypeParametersFromPrivateModule<T extends privateModule.publicClassInPrivateModule> {
+    myMethod(val: T): T {
+        return val;
+    }
+}
+
+export module publicModule {
+    class privateClassInPublicModule {
+    }
+
+    export class publicClassInPublicModule {
+    }
+
+    export class publicClassWithPrivateTypeParameters<T extends privateClassInPublicModule> { // Error
+        myMethod(val: T): T {
+            return val;
+        }
+    }
+
+    export class publicClassWithPublicTypeParameters<T extends publicClassInPublicModule> {
+        myMethod(val: T): T {
+            return val;
+        }
+    }
+
+    class privateClassWithPrivateTypeParameters<T extends privateClassInPublicModule> {
+        myMethod(val: T): T {
+            return val;
+        }
+    }
+
+    class privateClassWithPublicTypeParameters<T extends publicClassInPublicModule> {
+        myMethod(val: T): T {
+            return val;
+        }
+    }
+
+    export class publicClassWithPublicTypeParametersWithoutExtends<T> {
+        myMethod(val: T): T {
+            return val;
+        }
+    }
+
+    class privateClassWithPublicTypeParametersWithoutExtends<T> {
+        myMethod(val: T): T {
+            return val;
+        }
+    }
+
+    export class publicClassWithTypeParametersFromPrivateModule<T extends privateModule.publicClassInPrivateModule> { // Error
+        myMethod(val: T): T {
+            return val;
+        }
+    }
+
+    class privateClassWithTypeParametersFromPrivateModule<T extends privateModule.publicClassInPrivateModule> {
+        myMethod(val: T): T {
+            return val;
+        }
+    }
+}
+
+module privateModule {
+    class privateClassInPrivateModule {
+    }
+
+    export class publicClassInPrivateModule {
+    }
+
+    export class publicClassWithPrivateTypeParameters<T extends privateClassInPrivateModule> {
+        myMethod(val: T): T {
+            return val;
+        }
+    }
+
+    export class publicClassWithPublicTypeParameters<T extends publicClassInPrivateModule> {
+        myMethod(val: T): T {
+            return val;
+        }
+    }
+
+    class privateClassWithPrivateTypeParameters<T extends privateClassInPrivateModule> {
+        myMethod(val: T): T {
+            return val;
+        }
+    }
+
+    class privateClassWithPublicTypeParameters<T extends publicClassInPrivateModule> {
+        myMethod(val: T): T {
+            return val;
+        }
+    }
+
+    export class publicClassWithPublicTypeParametersWithoutExtends<T> {
+        myMethod(val: T): T {
+            return val;
+        }
+    }
+
+    class privateClassWithPublicTypeParametersWithoutExtends<T> {
+        myMethod(val: T): T {
+            return val;
+        }
+    }
+}
+
+
+//// [privacyTypeParametersOfClassDeclFile.js]
+var privateClass = (function () {
+    function privateClass() {
+    }
+    return privateClass;
+})();
+var publicClass = (function () {
+    function publicClass() {
+    }
+    return publicClass;
+})();
+exports.publicClass = publicClass;
+var publicClassWithPrivateTypeParameters = (function () {
+    function publicClassWithPrivateTypeParameters() {
+    }
+    publicClassWithPrivateTypeParameters.prototype.myMethod = function (val) {
+        return val;
+    };
+    return publicClassWithPrivateTypeParameters;
+})();
+exports.publicClassWithPrivateTypeParameters = publicClassWithPrivateTypeParameters;
+var publicClassWithPublicTypeParameters = (function () {
+    function publicClassWithPublicTypeParameters() {
+    }
+    publicClassWithPublicTypeParameters.prototype.myMethod = function (val) {
+        return val;
+    };
+    return publicClassWithPublicTypeParameters;
+})();
+exports.publicClassWithPublicTypeParameters = publicClassWithPublicTypeParameters;
+var privateClassWithPrivateTypeParameters = (function () {
+    function privateClassWithPrivateTypeParameters() {
+    }
+    privateClassWithPrivateTypeParameters.prototype.myMethod = function (val) {
+        return val;
+    };
+    return privateClassWithPrivateTypeParameters;
+})();
+var privateClassWithPublicTypeParameters = (function () {
+    function privateClassWithPublicTypeParameters() {
+    }
+    privateClassWithPublicTypeParameters.prototype.myMethod = function (val) {
+        return val;
+    };
+    return privateClassWithPublicTypeParameters;
+})();
+var publicClassWithPublicTypeParametersWithoutExtends = (function () {
+    function publicClassWithPublicTypeParametersWithoutExtends() {
+    }
+    publicClassWithPublicTypeParametersWithoutExtends.prototype.myMethod = function (val) {
+        return val;
+    };
+    return publicClassWithPublicTypeParametersWithoutExtends;
+})();
+exports.publicClassWithPublicTypeParametersWithoutExtends = publicClassWithPublicTypeParametersWithoutExtends;
+var privateClassWithPublicTypeParametersWithoutExtends = (function () {
+    function privateClassWithPublicTypeParametersWithoutExtends() {
+    }
+    privateClassWithPublicTypeParametersWithoutExtends.prototype.myMethod = function (val) {
+        return val;
+    };
+    return privateClassWithPublicTypeParametersWithoutExtends;
+})();
+var publicClassWithTypeParametersFromPrivateModule = (function () {
+    function publicClassWithTypeParametersFromPrivateModule() {
+    }
+    publicClassWithTypeParametersFromPrivateModule.prototype.myMethod = function (val) {
+        return val;
+    };
+    return publicClassWithTypeParametersFromPrivateModule;
+})();
+exports.publicClassWithTypeParametersFromPrivateModule = publicClassWithTypeParametersFromPrivateModule;
+var privateClassWithTypeParametersFromPrivateModule = (function () {
+    function privateClassWithTypeParametersFromPrivateModule() {
+    }
+    privateClassWithTypeParametersFromPrivateModule.prototype.myMethod = function (val) {
+        return val;
+    };
+    return privateClassWithTypeParametersFromPrivateModule;
+})();
+(function (publicModule) {
+    var privateClassInPublicModule = (function () {
+        function privateClassInPublicModule() {
+        }
+        return privateClassInPublicModule;
+    })();
+    var publicClassInPublicModule = (function () {
+        function publicClassInPublicModule() {
+        }
+        return publicClassInPublicModule;
+    })();
+    publicModule.publicClassInPublicModule = publicClassInPublicModule;
+    var publicClassWithPrivateTypeParameters = (function () {
+        function publicClassWithPrivateTypeParameters() {
+        }
+        publicClassWithPrivateTypeParameters.prototype.myMethod = function (val) {
+            return val;
+        };
+        return publicClassWithPrivateTypeParameters;
+    })();
+    publicModule.publicClassWithPrivateTypeParameters = publicClassWithPrivateTypeParameters;
+    var publicClassWithPublicTypeParameters = (function () {
+        function publicClassWithPublicTypeParameters() {
+        }
+        publicClassWithPublicTypeParameters.prototype.myMethod = function (val) {
+            return val;
+        };
+        return publicClassWithPublicTypeParameters;
+    })();
+    publicModule.publicClassWithPublicTypeParameters = publicClassWithPublicTypeParameters;
+    var privateClassWithPrivateTypeParameters = (function () {
+        function privateClassWithPrivateTypeParameters() {
+        }
+        privateClassWithPrivateTypeParameters.prototype.myMethod = function (val) {
+            return val;
+        };
+        return privateClassWithPrivateTypeParameters;
+    })();
+    var privateClassWithPublicTypeParameters = (function () {
+        function privateClassWithPublicTypeParameters() {
+        }
+        privateClassWithPublicTypeParameters.prototype.myMethod = function (val) {
+            return val;
+        };
+        return privateClassWithPublicTypeParameters;
+    })();
+    var publicClassWithPublicTypeParametersWithoutExtends = (function () {
+        function publicClassWithPublicTypeParametersWithoutExtends() {
+        }
+        publicClassWithPublicTypeParametersWithoutExtends.prototype.myMethod = function (val) {
+            return val;
+        };
+        return publicClassWithPublicTypeParametersWithoutExtends;
+    })();
+    publicModule.publicClassWithPublicTypeParametersWithoutExtends = publicClassWithPublicTypeParametersWithoutExtends;
+    var privateClassWithPublicTypeParametersWithoutExtends = (function () {
+        function privateClassWithPublicTypeParametersWithoutExtends() {
+        }
+        privateClassWithPublicTypeParametersWithoutExtends.prototype.myMethod = function (val) {
+            return val;
+        };
+        return privateClassWithPublicTypeParametersWithoutExtends;
+    })();
+    var publicClassWithTypeParametersFromPrivateModule = (function () {
+        function publicClassWithTypeParametersFromPrivateModule() {
+        }
+        publicClassWithTypeParametersFromPrivateModule.prototype.myMethod = function (val) {
+            return val;
+        };
+        return publicClassWithTypeParametersFromPrivateModule;
+    })();
+    publicModule.publicClassWithTypeParametersFromPrivateModule = publicClassWithTypeParametersFromPrivateModule;
+    var privateClassWithTypeParametersFromPrivateModule = (function () {
+        function privateClassWithTypeParametersFromPrivateModule() {
+        }
+        privateClassWithTypeParametersFromPrivateModule.prototype.myMethod = function (val) {
+            return val;
+        };
+        return privateClassWithTypeParametersFromPrivateModule;
+    })();
+})(exports.publicModule || (exports.publicModule = {}));
+var publicModule = exports.publicModule;
+var privateModule;
+(function (privateModule) {
+    var privateClassInPrivateModule = (function () {
+        function privateClassInPrivateModule() {
+        }
+        return privateClassInPrivateModule;
+    })();
+    var publicClassInPrivateModule = (function () {
+        function publicClassInPrivateModule() {
+        }
+        return publicClassInPrivateModule;
+    })();
+    privateModule.publicClassInPrivateModule = publicClassInPrivateModule;
+    var publicClassWithPrivateTypeParameters = (function () {
+        function publicClassWithPrivateTypeParameters() {
+        }
+        publicClassWithPrivateTypeParameters.prototype.myMethod = function (val) {
+            return val;
+        };
+        return publicClassWithPrivateTypeParameters;
+    })();
+    privateModule.publicClassWithPrivateTypeParameters = publicClassWithPrivateTypeParameters;
+    var publicClassWithPublicTypeParameters = (function () {
+        function publicClassWithPublicTypeParameters() {
+        }
+        publicClassWithPublicTypeParameters.prototype.myMethod = function (val) {
+            return val;
+        };
+        return publicClassWithPublicTypeParameters;
+    })();
+    privateModule.publicClassWithPublicTypeParameters = publicClassWithPublicTypeParameters;
+    var privateClassWithPrivateTypeParameters = (function () {
+        function privateClassWithPrivateTypeParameters() {
+        }
+        privateClassWithPrivateTypeParameters.prototype.myMethod = function (val) {
+            return val;
+        };
+        return privateClassWithPrivateTypeParameters;
+    })();
+    var privateClassWithPublicTypeParameters = (function () {
+        function privateClassWithPublicTypeParameters() {
+        }
+        privateClassWithPublicTypeParameters.prototype.myMethod = function (val) {
+            return val;
+        };
+        return privateClassWithPublicTypeParameters;
+    })();
+    var publicClassWithPublicTypeParametersWithoutExtends = (function () {
+        function publicClassWithPublicTypeParametersWithoutExtends() {
+        }
+        publicClassWithPublicTypeParametersWithoutExtends.prototype.myMethod = function (val) {
+            return val;
+        };
+        return publicClassWithPublicTypeParametersWithoutExtends;
+    })();
+    privateModule.publicClassWithPublicTypeParametersWithoutExtends = publicClassWithPublicTypeParametersWithoutExtends;
+    var privateClassWithPublicTypeParametersWithoutExtends = (function () {
+        function privateClassWithPublicTypeParametersWithoutExtends() {
+        }
+        privateClassWithPublicTypeParametersWithoutExtends.prototype.myMethod = function (val) {
+            return val;
+        };
+        return privateClassWithPublicTypeParametersWithoutExtends;
+    })();
+})(privateModule || (privateModule = {}));
diff --git a/tests/baselines/reference/privacyTypeParametersOfInterface.errors.txt b/tests/baselines/reference/privacyTypeParametersOfInterface.errors.txt
deleted file mode 100644
index 72f22a2f56c..00000000000
--- a/tests/baselines/reference/privacyTypeParametersOfInterface.errors.txt
+++ /dev/null
@@ -1,61 +0,0 @@
-==== tests/cases/compiler/privacyTypeParametersOfInterface.ts (1 errors) ====
-    class privateClass {
-    }
-    
-    export class publicClass {
-                 ~~~~~~~~~~~
-!!! Cannot compile external modules unless the '--module' flag is provided.
-    }
-    
-    class privateClassT<T> {
-    }
-    
-    export class publicClassT<T> {
-    }
-    
-    // TypeParameter_0_of_exported_interface_1_has_or_is_using_private_type_2
-    export interface publicInterfaceWithPrivateTypeParameters<T extends privateClass> {
-        myMethod(val: T): T; // Error
-        myMethod0(): publicClassT<T>; // error
-        myMethod1(): privateClassT<privateClass>; // error
-        myMethod2(): privateClassT<publicClass>; // error
-        myMethod3(): publicClassT<privateClass>; //error
-        myMethod4(): publicClassT<publicClass>; // no error
-    }
-    
-    export interface publicInterfaceWithPublicTypeParameters<T extends publicClass> {
-        myMethod(val: T): T; // No Error
-        myMethod0(): publicClassT<T>; // No error
-        myMethod1(): privateClassT<privateClass>; // error
-        myMethod2(): privateClassT<publicClass>; // error
-        myMethod3(): publicClassT<privateClass>; //error
-        myMethod4(): publicClassT<publicClass>; // no error
-    }
-    
-    interface privateInterfaceWithPrivateTypeParameters<T extends privateClass> {
-        myMethod(val: T): T; // No Error
-        myMethod0(): publicClassT<T>; // No error
-        myMethod1(): privateClassT<privateClass>; // No error
-        myMethod2(): privateClassT<publicClass>; // No error
-        myMethod3(): publicClassT<privateClass>; //No error
-        myMethod4(): publicClassT<publicClass>; // no error
-    }
-    
-    interface privateInterfaceWithPublicTypeParameters<T extends publicClass> {
-        myMethod(val: T): T; // No Error
-        myMethod0(): publicClassT<T>; // No error
-        myMethod1(): privateClassT<privateClass>; // No error
-        myMethod2(): privateClassT<publicClass>; // No error
-        myMethod3(): publicClassT<privateClass>; //No error
-        myMethod4(): publicClassT<publicClass>; // no error
-    }
-    
-    export interface publicInterfaceWithPublicTypeParametersWithoutExtends<T> {
-        myMethod(val: T): T; // No Error
-        myMethod0(): publicClassT<T>; // No error
-    }
-    
-    interface privateInterfaceWithPublicTypeParametersWithoutExtends<T> {
-        myMethod(val: T): T; // No Error
-        myMethod0(): publicClassT<T>; // No error
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/privacyTypeParametersOfInterface.js b/tests/baselines/reference/privacyTypeParametersOfInterface.js
new file mode 100644
index 00000000000..02e63ce7098
--- /dev/null
+++ b/tests/baselines/reference/privacyTypeParametersOfInterface.js
@@ -0,0 +1,83 @@
+//// [privacyTypeParametersOfInterface.ts]
+class privateClass {
+}
+
+export class publicClass {
+}
+
+class privateClassT<T> {
+}
+
+export class publicClassT<T> {
+}
+
+// TypeParameter_0_of_exported_interface_1_has_or_is_using_private_type_2
+export interface publicInterfaceWithPrivateTypeParameters<T extends privateClass> {
+    myMethod(val: T): T; // Error
+    myMethod0(): publicClassT<T>; // error
+    myMethod1(): privateClassT<privateClass>; // error
+    myMethod2(): privateClassT<publicClass>; // error
+    myMethod3(): publicClassT<privateClass>; //error
+    myMethod4(): publicClassT<publicClass>; // no error
+}
+
+export interface publicInterfaceWithPublicTypeParameters<T extends publicClass> {
+    myMethod(val: T): T; // No Error
+    myMethod0(): publicClassT<T>; // No error
+    myMethod1(): privateClassT<privateClass>; // error
+    myMethod2(): privateClassT<publicClass>; // error
+    myMethod3(): publicClassT<privateClass>; //error
+    myMethod4(): publicClassT<publicClass>; // no error
+}
+
+interface privateInterfaceWithPrivateTypeParameters<T extends privateClass> {
+    myMethod(val: T): T; // No Error
+    myMethod0(): publicClassT<T>; // No error
+    myMethod1(): privateClassT<privateClass>; // No error
+    myMethod2(): privateClassT<publicClass>; // No error
+    myMethod3(): publicClassT<privateClass>; //No error
+    myMethod4(): publicClassT<publicClass>; // no error
+}
+
+interface privateInterfaceWithPublicTypeParameters<T extends publicClass> {
+    myMethod(val: T): T; // No Error
+    myMethod0(): publicClassT<T>; // No error
+    myMethod1(): privateClassT<privateClass>; // No error
+    myMethod2(): privateClassT<publicClass>; // No error
+    myMethod3(): publicClassT<privateClass>; //No error
+    myMethod4(): publicClassT<publicClass>; // no error
+}
+
+export interface publicInterfaceWithPublicTypeParametersWithoutExtends<T> {
+    myMethod(val: T): T; // No Error
+    myMethod0(): publicClassT<T>; // No error
+}
+
+interface privateInterfaceWithPublicTypeParametersWithoutExtends<T> {
+    myMethod(val: T): T; // No Error
+    myMethod0(): publicClassT<T>; // No error
+}
+
+//// [privacyTypeParametersOfInterface.js]
+var privateClass = (function () {
+    function privateClass() {
+    }
+    return privateClass;
+})();
+var publicClass = (function () {
+    function publicClass() {
+    }
+    return publicClass;
+})();
+exports.publicClass = publicClass;
+var privateClassT = (function () {
+    function privateClassT() {
+    }
+    return privateClassT;
+})();
+var publicClassT = (function () {
+    function publicClassT() {
+    }
+    return publicClassT;
+})();
+exports.publicClassT = publicClassT;
diff --git a/tests/baselines/reference/privacyTypeParametersOfInterface.types b/tests/baselines/reference/privacyTypeParametersOfInterface.types
new file mode 100644
index 00000000000..0a72d093e04
--- /dev/null
+++ b/tests/baselines/reference/privacyTypeParametersOfInterface.types
@@ -0,0 +1,199 @@
+=== tests/cases/compiler/privacyTypeParametersOfInterface.ts ===
+class privateClass {
+>privateClass : privateClass
+}
+
+export class publicClass {
+>publicClass : 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.errors.txt b/tests/baselines/reference/privacyTypeParametersOfInterfaceDeclFile.errors.txt
new file mode 100644
index 00000000000..c4e9934ce8c
--- /dev/null
+++ b/tests/baselines/reference/privacyTypeParametersOfInterfaceDeclFile.errors.txt
@@ -0,0 +1,231 @@
+==== tests/cases/compiler/privacyTypeParametersOfInterfaceDeclFile.ts (20 errors) ====
+    class privateClass {
+    }
+    
+    export class publicClass {
+    }
+    
+    class privateClassT<T> {
+    }
+    
+    export class publicClassT<T> {
+    }
+    
+    export interface publicInterfaceWithPrivateTypeParameters<T extends privateClass> { // Error
+                                                              ~~~~~~~~~~~~~~~~~~~~~~
+!!! Type parameter 'T' of exported interface has or is using private name 'privateClass'.
+        myMethod(val: T): T;
+        myMethod0(): publicClassT<T>;
+        myMethod1(): privateClassT<privateClass>; 
+        ~~~~~~~~~
+!!! Return type of method from exported interface has or is using private name 'privateClass'.
+        ~~~~~~~~~
+!!! Return type of method from exported interface has or is using private name 'privateClassT'.
+        myMethod2(): privateClassT<publicClass>;
+        ~~~~~~~~~
+!!! Return type of method from exported interface has or is using private name 'privateClassT'.
+        myMethod3(): publicClassT<privateClass>;
+        ~~~~~~~~~
+!!! Return type of method from exported interface has or is using private name 'privateClass'.
+        myMethod4(): publicClassT<publicClass>; 
+    }
+    
+    export interface publicInterfaceWithPublicTypeParameters<T extends publicClass> {
+        myMethod(val: T): T;
+        myMethod0(): publicClassT<T>
+        myMethod1(): privateClassT<privateClass>;
+        ~~~~~~~~~
+!!! Return type of method from exported interface has or is using private name 'privateClass'.
+        ~~~~~~~~~
+!!! Return type of method from exported interface has or is using private name 'privateClassT'.
+        myMethod2(): privateClassT<publicClass>;
+        ~~~~~~~~~
+!!! Return type of method from exported interface has or is using private name 'privateClassT'.
+        myMethod3(): publicClassT<privateClass>;
+        ~~~~~~~~~
+!!! Return type of method from exported interface has or is using private name 'privateClass'.
+        myMethod4(): publicClassT<publicClass>;
+    }
+    
+    interface privateInterfaceWithPrivateTypeParameters<T extends privateClass> {
+        myMethod(val: T): T;
+        myMethod0(): publicClassT<T>;
+        myMethod1(): privateClassT<privateClass>;
+        myMethod2(): privateClassT<publicClass>;
+        myMethod3(): publicClassT<privateClass>;
+        myMethod4(): publicClassT<publicClass>;
+    }
+    
+    interface privateInterfaceWithPublicTypeParameters<T extends publicClass> {
+        myMethod(val: T): T;
+        myMethod0(): publicClassT<T>;
+        myMethod1(): privateClassT<privateClass>;
+        myMethod2(): privateClassT<publicClass>;
+        myMethod3(): publicClassT<privateClass>;
+        myMethod4(): publicClassT<publicClass>;
+    }
+    
+    export interface publicInterfaceWithPublicTypeParametersWithoutExtends<T> {
+        myMethod(val: T): T;
+        myMethod0(): publicClassT<T>;
+    }
+    
+    interface privateInterfaceWithPublicTypeParametersWithoutExtends<T> {
+        myMethod(val: T): T;
+        myMethod0(): publicClassT<T>;
+    }
+    
+    
+    export interface publicInterfaceWithPrivateModuleTypeParameterConstraints<T extends privateModule.publicClassInPrivateModule> { // Error
+                                                                              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Type parameter 'T' of exported interface has or is using name 'privateModule.publicClassInPrivateModule' from private module 'privateModule'.
+    }
+    
+    interface privateInterfaceWithPrivateModuleTypeParameterConstraints<T extends privateModule.publicClassInPrivateModule> { // Error
+    }
+    
+    export module publicModule {
+        class privateClassInPublicModule {
+        }
+    
+        export class publicClassInPublicModule {
+        }
+    
+        class privateClassInPublicModuleT<T> {
+        }
+    
+        export class publicClassInPublicModuleT<T> {
+        }
+    
+        export interface publicInterfaceWithPrivateTypeParameters<T extends privateClassInPublicModule> { // Error
+                                                                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Type parameter 'T' of exported interface has or is using private name 'privateClassInPublicModule'.
+            myMethod(val: T): T;
+            myMethod0(): publicClassInPublicModuleT<T>;
+            myMethod1(): privateClassInPublicModuleT<privateClassInPublicModule>;
+            ~~~~~~~~~
+!!! Return type of method from exported interface has or is using private name 'privateClassInPublicModule'.
+            ~~~~~~~~~
+!!! Return type of method from exported interface has or is using private name 'privateClassInPublicModuleT'.
+            myMethod2(): privateClassInPublicModuleT<publicClassInPublicModule>;
+            ~~~~~~~~~
+!!! Return type of method from exported interface has or is using private name 'privateClassInPublicModuleT'.
+            myMethod3(): publicClassInPublicModuleT<privateClassInPublicModule>;
+            ~~~~~~~~~
+!!! Return type of method from exported interface has or is using private name 'privateClassInPublicModule'.
+            myMethod4(): publicClassInPublicModuleT<publicClassInPublicModule>;
+        }
+    
+        export interface publicInterfaceWithPublicTypeParameters<T extends publicClassInPublicModule> {
+            myMethod(val: T): T;
+            myMethod0(): publicClassInPublicModuleT<T>
+            myMethod1(): privateClassInPublicModuleT<privateClassInPublicModule>;
+            ~~~~~~~~~
+!!! Return type of method from exported interface has or is using private name 'privateClassInPublicModule'.
+            ~~~~~~~~~
+!!! Return type of method from exported interface has or is using private name 'privateClassInPublicModuleT'.
+            myMethod2(): privateClassInPublicModuleT<publicClassInPublicModule>;
+            ~~~~~~~~~
+!!! Return type of method from exported interface has or is using private name 'privateClassInPublicModuleT'.
+            myMethod3(): publicClassInPublicModuleT<privateClassInPublicModule>;
+            ~~~~~~~~~
+!!! Return type of method from exported interface has or is using private name 'privateClassInPublicModule'.
+            myMethod4(): publicClassInPublicModuleT<publicClassInPublicModule>;
+        }
+    
+        interface privateInterfaceWithPrivateTypeParameters<T extends privateClassInPublicModule> {
+            myMethod(val: T): T;
+            myMethod0(): publicClassInPublicModuleT<T>;
+            myMethod1(): privateClassInPublicModuleT<privateClassInPublicModule>;
+            myMethod2(): privateClassInPublicModuleT<publicClassInPublicModule>;
+            myMethod3(): publicClassInPublicModuleT<privateClassInPublicModule>;
+            myMethod4(): publicClassInPublicModuleT<publicClassInPublicModule>;
+        }
+    
+        interface privateInterfaceWithPublicTypeParameters<T extends publicClassInPublicModule> {
+            myMethod(val: T): T;
+            myMethod0(): publicClassInPublicModuleT<T>;
+            myMethod1(): privateClassInPublicModuleT<privateClassInPublicModule>;
+            myMethod2(): privateClassInPublicModuleT<publicClassInPublicModule>;
+            myMethod3(): publicClassInPublicModuleT<privateClassInPublicModule>;
+            myMethod4(): publicClassInPublicModuleT<publicClassInPublicModule>;
+        }
+    
+        export interface publicInterfaceWithPublicTypeParametersWithoutExtends<T> {
+            myMethod(val: T): T;
+            myMethod0(): publicClassInPublicModuleT<T>;
+        }
+    
+        interface privateInterfaceWithPublicTypeParametersWithoutExtends<T> {
+            myMethod(val: T): T;
+            myMethod0(): publicClassInPublicModuleT<T>;
+        }
+    
+        export interface publicInterfaceWithPrivateModuleTypeParameterConstraints<T extends privateModule.publicClassInPrivateModule> { // Error
+                                                                                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Type parameter 'T' of exported interface has or is using name 'privateModule.publicClassInPrivateModule' from private module 'privateModule'.
+        }
+    
+        interface privateInterfaceWithPrivateModuleTypeParameterConstraints<T extends privateModule.publicClassInPrivateModule> { // Error
+        }
+    }
+    
+    module privateModule {
+        class privateClassInPrivateModule {
+        }
+    
+        export class publicClassInPrivateModule {
+        }
+    
+        class privateClassInPrivateModuleT<T> {
+        }
+    
+        export class publicClassInPrivateModuleT<T> {
+        }
+    
+        export interface publicInterfaceWithPrivateTypeParameters<T extends privateClassInPrivateModule> {
+            myMethod(val: T): T;
+            myMethod0(): publicClassInPrivateModuleT<T>;
+            myMethod1(): privateClassInPrivateModuleT<privateClassInPrivateModule>;
+            myMethod2(): privateClassInPrivateModuleT<publicClassInPrivateModule>;
+            myMethod3(): publicClassInPrivateModuleT<privateClassInPrivateModule>;
+            myMethod4(): publicClassInPrivateModuleT<publicClassInPrivateModule>;
+        }
+    
+        export interface publicInterfaceWithPublicTypeParameters<T extends publicClassInPrivateModule> {
+            myMethod(val: T): T;
+            myMethod0(): publicClassInPrivateModuleT<T>
+            myMethod1(): privateClassInPrivateModuleT<privateClassInPrivateModule>;
+            myMethod2(): privateClassInPrivateModuleT<publicClassInPrivateModule>;
+            myMethod3(): publicClassInPrivateModuleT<privateClassInPrivateModule>;
+            myMethod4(): publicClassInPrivateModuleT<publicClassInPrivateModule>;
+        }
+    
+        interface privateInterfaceWithPrivateTypeParameters<T extends privateClassInPrivateModule> {
+            myMethod(val: T): T;
+            myMethod0(): publicClassInPrivateModuleT<T>;
+            myMethod1(): privateClassInPrivateModuleT<privateClassInPrivateModule>;
+            myMethod2(): privateClassInPrivateModuleT<publicClassInPrivateModule>;
+            myMethod3(): publicClassInPrivateModuleT<privateClassInPrivateModule>;
+            myMethod4(): publicClassInPrivateModuleT<publicClassInPrivateModule>;
+        }
+    
+        interface privateInterfaceWithPublicTypeParameters<T extends publicClassInPrivateModule> {
+            myMethod(val: T): T;
+            myMethod0(): publicClassInPrivateModuleT<T>;
+            myMethod1(): privateClassInPrivateModuleT<privateClassInPrivateModule>;
+            myMethod2(): privateClassInPrivateModuleT<publicClassInPrivateModule>;
+            myMethod3(): publicClassInPrivateModuleT<privateClassInPrivateModule>;
+            myMethod4(): publicClassInPrivateModuleT<publicClassInPrivateModule>;
+        }
+    
+        export interface publicInterfaceWithPublicTypeParametersWithoutExtends<T> {
+            myMethod(val: T): T;
+            myMethod0(): publicClassInPrivateModuleT<T>;
+        }
+    
+        interface privateInterfaceWithPublicTypeParametersWithoutExtends<T> {
+            myMethod(val: T): T;
+            myMethod0(): publicClassInPrivateModuleT<T>;
+        }
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/privacyTypeParametersOfInterfaceDeclFile.js b/tests/baselines/reference/privacyTypeParametersOfInterfaceDeclFile.js
new file mode 100644
index 00000000000..2ae5488dd3c
--- /dev/null
+++ b/tests/baselines/reference/privacyTypeParametersOfInterfaceDeclFile.js
@@ -0,0 +1,265 @@
+//// [privacyTypeParametersOfInterfaceDeclFile.ts]
+class privateClass {
+}
+
+export class publicClass {
+}
+
+class privateClassT<T> {
+}
+
+export class publicClassT<T> {
+}
+
+export interface publicInterfaceWithPrivateTypeParameters<T extends privateClass> { // Error
+    myMethod(val: T): T;
+    myMethod0(): publicClassT<T>;
+    myMethod1(): privateClassT<privateClass>; 
+    myMethod2(): privateClassT<publicClass>;
+    myMethod3(): publicClassT<privateClass>;
+    myMethod4(): publicClassT<publicClass>; 
+}
+
+export interface publicInterfaceWithPublicTypeParameters<T extends publicClass> {
+    myMethod(val: T): T;
+    myMethod0(): publicClassT<T>
+    myMethod1(): privateClassT<privateClass>;
+    myMethod2(): privateClassT<publicClass>;
+    myMethod3(): publicClassT<privateClass>;
+    myMethod4(): publicClassT<publicClass>;
+}
+
+interface privateInterfaceWithPrivateTypeParameters<T extends privateClass> {
+    myMethod(val: T): T;
+    myMethod0(): publicClassT<T>;
+    myMethod1(): privateClassT<privateClass>;
+    myMethod2(): privateClassT<publicClass>;
+    myMethod3(): publicClassT<privateClass>;
+    myMethod4(): publicClassT<publicClass>;
+}
+
+interface privateInterfaceWithPublicTypeParameters<T extends publicClass> {
+    myMethod(val: T): T;
+    myMethod0(): publicClassT<T>;
+    myMethod1(): privateClassT<privateClass>;
+    myMethod2(): privateClassT<publicClass>;
+    myMethod3(): publicClassT<privateClass>;
+    myMethod4(): publicClassT<publicClass>;
+}
+
+export interface publicInterfaceWithPublicTypeParametersWithoutExtends<T> {
+    myMethod(val: T): T;
+    myMethod0(): publicClassT<T>;
+}
+
+interface privateInterfaceWithPublicTypeParametersWithoutExtends<T> {
+    myMethod(val: T): T;
+    myMethod0(): publicClassT<T>;
+}
+
+
+export interface publicInterfaceWithPrivateModuleTypeParameterConstraints<T extends privateModule.publicClassInPrivateModule> { // Error
+}
+
+interface privateInterfaceWithPrivateModuleTypeParameterConstraints<T extends privateModule.publicClassInPrivateModule> { // Error
+}
+
+export module publicModule {
+    class privateClassInPublicModule {
+    }
+
+    export class publicClassInPublicModule {
+    }
+
+    class privateClassInPublicModuleT<T> {
+    }
+
+    export class publicClassInPublicModuleT<T> {
+    }
+
+    export interface publicInterfaceWithPrivateTypeParameters<T extends privateClassInPublicModule> { // Error
+        myMethod(val: T): T;
+        myMethod0(): publicClassInPublicModuleT<T>;
+        myMethod1(): privateClassInPublicModuleT<privateClassInPublicModule>;
+        myMethod2(): privateClassInPublicModuleT<publicClassInPublicModule>;
+        myMethod3(): publicClassInPublicModuleT<privateClassInPublicModule>;
+        myMethod4(): publicClassInPublicModuleT<publicClassInPublicModule>;
+    }
+
+    export interface publicInterfaceWithPublicTypeParameters<T extends publicClassInPublicModule> {
+        myMethod(val: T): T;
+        myMethod0(): publicClassInPublicModuleT<T>
+        myMethod1(): privateClassInPublicModuleT<privateClassInPublicModule>;
+        myMethod2(): privateClassInPublicModuleT<publicClassInPublicModule>;
+        myMethod3(): publicClassInPublicModuleT<privateClassInPublicModule>;
+        myMethod4(): publicClassInPublicModuleT<publicClassInPublicModule>;
+    }
+
+    interface privateInterfaceWithPrivateTypeParameters<T extends privateClassInPublicModule> {
+        myMethod(val: T): T;
+        myMethod0(): publicClassInPublicModuleT<T>;
+        myMethod1(): privateClassInPublicModuleT<privateClassInPublicModule>;
+        myMethod2(): privateClassInPublicModuleT<publicClassInPublicModule>;
+        myMethod3(): publicClassInPublicModuleT<privateClassInPublicModule>;
+        myMethod4(): publicClassInPublicModuleT<publicClassInPublicModule>;
+    }
+
+    interface privateInterfaceWithPublicTypeParameters<T extends publicClassInPublicModule> {
+        myMethod(val: T): T;
+        myMethod0(): publicClassInPublicModuleT<T>;
+        myMethod1(): privateClassInPublicModuleT<privateClassInPublicModule>;
+        myMethod2(): privateClassInPublicModuleT<publicClassInPublicModule>;
+        myMethod3(): publicClassInPublicModuleT<privateClassInPublicModule>;
+        myMethod4(): publicClassInPublicModuleT<publicClassInPublicModule>;
+    }
+
+    export interface publicInterfaceWithPublicTypeParametersWithoutExtends<T> {
+        myMethod(val: T): T;
+        myMethod0(): publicClassInPublicModuleT<T>;
+    }
+
+    interface privateInterfaceWithPublicTypeParametersWithoutExtends<T> {
+        myMethod(val: T): T;
+        myMethod0(): publicClassInPublicModuleT<T>;
+    }
+
+    export interface publicInterfaceWithPrivateModuleTypeParameterConstraints<T extends privateModule.publicClassInPrivateModule> { // Error
+    }
+
+    interface privateInterfaceWithPrivateModuleTypeParameterConstraints<T extends privateModule.publicClassInPrivateModule> { // Error
+    }
+}
+
+module privateModule {
+    class privateClassInPrivateModule {
+    }
+
+    export class publicClassInPrivateModule {
+    }
+
+    class privateClassInPrivateModuleT<T> {
+    }
+
+    export class publicClassInPrivateModuleT<T> {
+    }
+
+    export interface publicInterfaceWithPrivateTypeParameters<T extends privateClassInPrivateModule> {
+        myMethod(val: T): T;
+        myMethod0(): publicClassInPrivateModuleT<T>;
+        myMethod1(): privateClassInPrivateModuleT<privateClassInPrivateModule>;
+        myMethod2(): privateClassInPrivateModuleT<publicClassInPrivateModule>;
+        myMethod3(): publicClassInPrivateModuleT<privateClassInPrivateModule>;
+        myMethod4(): publicClassInPrivateModuleT<publicClassInPrivateModule>;
+    }
+
+    export interface publicInterfaceWithPublicTypeParameters<T extends publicClassInPrivateModule> {
+        myMethod(val: T): T;
+        myMethod0(): publicClassInPrivateModuleT<T>
+        myMethod1(): privateClassInPrivateModuleT<privateClassInPrivateModule>;
+        myMethod2(): privateClassInPrivateModuleT<publicClassInPrivateModule>;
+        myMethod3(): publicClassInPrivateModuleT<privateClassInPrivateModule>;
+        myMethod4(): publicClassInPrivateModuleT<publicClassInPrivateModule>;
+    }
+
+    interface privateInterfaceWithPrivateTypeParameters<T extends privateClassInPrivateModule> {
+        myMethod(val: T): T;
+        myMethod0(): publicClassInPrivateModuleT<T>;
+        myMethod1(): privateClassInPrivateModuleT<privateClassInPrivateModule>;
+        myMethod2(): privateClassInPrivateModuleT<publicClassInPrivateModule>;
+        myMethod3(): publicClassInPrivateModuleT<privateClassInPrivateModule>;
+        myMethod4(): publicClassInPrivateModuleT<publicClassInPrivateModule>;
+    }
+
+    interface privateInterfaceWithPublicTypeParameters<T extends publicClassInPrivateModule> {
+        myMethod(val: T): T;
+        myMethod0(): publicClassInPrivateModuleT<T>;
+        myMethod1(): privateClassInPrivateModuleT<privateClassInPrivateModule>;
+        myMethod2(): privateClassInPrivateModuleT<publicClassInPrivateModule>;
+        myMethod3(): publicClassInPrivateModuleT<privateClassInPrivateModule>;
+        myMethod4(): publicClassInPrivateModuleT<publicClassInPrivateModule>;
+    }
+
+    export interface publicInterfaceWithPublicTypeParametersWithoutExtends<T> {
+        myMethod(val: T): T;
+        myMethod0(): publicClassInPrivateModuleT<T>;
+    }
+
+    interface privateInterfaceWithPublicTypeParametersWithoutExtends<T> {
+        myMethod(val: T): T;
+        myMethod0(): publicClassInPrivateModuleT<T>;
+    }
+}
+
+//// [privacyTypeParametersOfInterfaceDeclFile.js]
+var privateClass = (function () {
+    function privateClass() {
+    }
+    return privateClass;
+})();
+var publicClass = (function () {
+    function publicClass() {
+    }
+    return publicClass;
+})();
+exports.publicClass = publicClass;
+var privateClassT = (function () {
+    function privateClassT() {
+    }
+    return privateClassT;
+})();
+var publicClassT = (function () {
+    function publicClassT() {
+    }
+    return publicClassT;
+})();
+exports.publicClassT = publicClassT;
+(function (publicModule) {
+    var privateClassInPublicModule = (function () {
+        function privateClassInPublicModule() {
+        }
+        return privateClassInPublicModule;
+    })();
+    var publicClassInPublicModule = (function () {
+        function publicClassInPublicModule() {
+        }
+        return publicClassInPublicModule;
+    })();
+    publicModule.publicClassInPublicModule = publicClassInPublicModule;
+    var privateClassInPublicModuleT = (function () {
+        function privateClassInPublicModuleT() {
+        }
+        return privateClassInPublicModuleT;
+    })();
+    var publicClassInPublicModuleT = (function () {
+        function publicClassInPublicModuleT() {
+        }
+        return publicClassInPublicModuleT;
+    })();
+    publicModule.publicClassInPublicModuleT = publicClassInPublicModuleT;
+})(exports.publicModule || (exports.publicModule = {}));
+var publicModule = exports.publicModule;
+var privateModule;
+(function (privateModule) {
+    var privateClassInPrivateModule = (function () {
+        function privateClassInPrivateModule() {
+        }
+        return privateClassInPrivateModule;
+    })();
+    var publicClassInPrivateModule = (function () {
+        function publicClassInPrivateModule() {
+        }
+        return publicClassInPrivateModule;
+    })();
+    privateModule.publicClassInPrivateModule = publicClassInPrivateModule;
+    var privateClassInPrivateModuleT = (function () {
+        function privateClassInPrivateModuleT() {
+        }
+        return privateClassInPrivateModuleT;
+    })();
+    var publicClassInPrivateModuleT = (function () {
+        function publicClassInPrivateModuleT() {
+        }
+        return publicClassInPrivateModuleT;
+    })();
+    privateModule.publicClassInPrivateModuleT = publicClassInPrivateModuleT;
+})(privateModule || (privateModule = {}));
diff --git a/tests/baselines/reference/privacyVarDeclFile.errors.txt b/tests/baselines/reference/privacyVarDeclFile.errors.txt
new file mode 100644
index 00000000000..7a0288f42df
--- /dev/null
+++ b/tests/baselines/reference/privacyVarDeclFile.errors.txt
@@ -0,0 +1,484 @@
+==== tests/cases/compiler/privacyVarDeclFile_externalModule.ts (20 errors) ====
+    
+    class privateClass {
+    }
+    
+    export class publicClass {
+    }
+    
+    export interface publicInterfaceWithPrivatePropertyTypes {
+        myProperty: privateClass;  // Error
+        ~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Property 'myProperty' of exported interface has or is using private name 'privateClass'.
+    }
+    
+    export interface publicInterfaceWithPublicPropertyTypes {
+        myProperty: publicClass;
+    }
+    
+    interface privateInterfaceWithPrivatePropertyTypes {
+        myProperty: privateClass;
+    }
+    
+    interface privateInterfaceWithPublicPropertyTypes {
+        myProperty: publicClass;
+    }
+    
+    export class publicClassWithWithPrivatePropertyTypes {
+        static myPublicStaticProperty: privateClass; // Error
+        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Public static property 'myPublicStaticProperty' of exported class has or is using private name 'privateClass'.
+        private static myPrivateStaticProperty: privateClass;
+        myPublicProperty: privateClass; // Error
+        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Public property 'myPublicProperty' of exported class has or is using private name 'privateClass'.
+        private myPrivateProperty: privateClass;
+    }
+    
+    export class publicClassWithWithPublicPropertyTypes {
+        static myPublicStaticProperty: publicClass;
+        private static myPrivateStaticProperty: publicClass;
+        myPublicProperty: publicClass;
+        private myPrivateProperty: publicClass;
+    }
+    
+    class privateClassWithWithPrivatePropertyTypes {
+        static myPublicStaticProperty: privateClass;
+        private static myPrivateStaticProperty: privateClass;
+        myPublicProperty: privateClass;
+        private myPrivateProperty: privateClass;
+    }
+    
+    class privateClassWithWithPublicPropertyTypes {
+        static myPublicStaticProperty: publicClass;
+        private static myPrivateStaticProperty: publicClass;
+        myPublicProperty: publicClass;
+        private myPrivateProperty: publicClass;
+    }
+    
+    export var publicVarWithPrivatePropertyTypes: privateClass; // Error
+               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Exported variable 'publicVarWithPrivatePropertyTypes' has or is using private name 'privateClass'.
+    export var publicVarWithPublicPropertyTypes: publicClass;
+    var privateVarWithPrivatePropertyTypes: privateClass;
+    var privateVarWithPublicPropertyTypes: publicClass;
+    
+    export declare var publicAmbientVarWithPrivatePropertyTypes: privateClass; // Error
+                       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Exported variable 'publicAmbientVarWithPrivatePropertyTypes' has or is using private name 'privateClass'.
+    export declare var publicAmbientVarWithPublicPropertyTypes: publicClass;
+    declare var privateAmbientVarWithPrivatePropertyTypes: privateClass;
+    declare var privateAmbientVarWithPublicPropertyTypes: publicClass;
+    
+    export interface publicInterfaceWithPrivateModulePropertyTypes {
+        myProperty: privateModule.publicClass; // Error
+        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Property 'myProperty' of exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+    }
+    export class publicClassWithPrivateModulePropertyTypes {
+        static myPublicStaticProperty: privateModule.publicClass; // Error
+        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Public static property 'myPublicStaticProperty' of exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+        myPublicProperty: privateModule.publicClass; // Error
+        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Public property 'myPublicProperty' of exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+    }
+    export var publicVarWithPrivateModulePropertyTypes: privateModule.publicClass; // Error
+               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Exported variable 'publicVarWithPrivateModulePropertyTypes' has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+    export declare var publicAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass; // Error
+                       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Exported variable 'publicAmbientVarWithPrivateModulePropertyTypes' has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+    
+    interface privateInterfaceWithPrivateModulePropertyTypes {
+        myProperty: privateModule.publicClass;
+    }
+    class privateClassWithPrivateModulePropertyTypes {
+        static myPublicStaticProperty: privateModule.publicClass;
+        myPublicProperty: privateModule.publicClass;
+    }
+    var privateVarWithPrivateModulePropertyTypes: privateModule.publicClass;
+    declare var privateAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass;
+    
+    export module publicModule {
+        class privateClass {
+        }
+    
+        export class publicClass {
+        }
+    
+        export interface publicInterfaceWithPrivatePropertyTypes {
+            myProperty: privateClass;  // Error
+            ~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Property 'myProperty' of exported interface has or is using private name 'privateClass'.
+        }
+    
+        export interface publicInterfaceWithPublicPropertyTypes {
+            myProperty: publicClass;
+        }
+    
+        interface privateInterfaceWithPrivatePropertyTypes {
+            myProperty: privateClass;
+        }
+    
+        interface privateInterfaceWithPublicPropertyTypes {
+            myProperty: publicClass;
+        }
+    
+        export class publicClassWithWithPrivatePropertyTypes {
+            static myPublicStaticProperty: privateClass; // Error
+            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Public static property 'myPublicStaticProperty' of exported class has or is using private name 'privateClass'.
+            private static myPrivateStaticProperty: privateClass;
+            myPublicProperty: privateClass; // Error
+            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Public property 'myPublicProperty' of exported class has or is using private name 'privateClass'.
+            private myPrivateProperty: privateClass;
+        }
+    
+        export class publicClassWithWithPublicPropertyTypes {
+            static myPublicStaticProperty: publicClass;
+            private static myPrivateStaticProperty: publicClass;
+            myPublicProperty: publicClass;
+            private myPrivateProperty: publicClass;
+        }
+    
+        class privateClassWithWithPrivatePropertyTypes {
+            static myPublicStaticProperty: privateClass;
+            private static myPrivateStaticProperty: privateClass;
+            myPublicProperty: privateClass;
+            private myPrivateProperty: privateClass;
+        }
+    
+        class privateClassWithWithPublicPropertyTypes {
+            static myPublicStaticProperty: publicClass;
+            private static myPrivateStaticProperty: publicClass;
+            myPublicProperty: publicClass;
+            private myPrivateProperty: publicClass;
+        }
+    
+        export var publicVarWithPrivatePropertyTypes: privateClass; // Error
+                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Exported variable 'publicVarWithPrivatePropertyTypes' has or is using private name 'privateClass'.
+        export var publicVarWithPublicPropertyTypes: publicClass;
+        var privateVarWithPrivatePropertyTypes: privateClass;
+        var privateVarWithPublicPropertyTypes: publicClass;
+    
+        export declare var publicAmbientVarWithPrivatePropertyTypes: privateClass; // Error
+                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Exported variable 'publicAmbientVarWithPrivatePropertyTypes' has or is using private name 'privateClass'.
+        export declare var publicAmbientVarWithPublicPropertyTypes: publicClass;
+        declare var privateAmbientVarWithPrivatePropertyTypes: privateClass;
+        declare var privateAmbientVarWithPublicPropertyTypes: publicClass;
+    
+        export interface publicInterfaceWithPrivateModulePropertyTypes {
+            myProperty: privateModule.publicClass; // Error
+            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Property 'myProperty' of exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+        }
+        export class publicClassWithPrivateModulePropertyTypes {
+            static myPublicStaticProperty: privateModule.publicClass; // Error
+            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Public static property 'myPublicStaticProperty' of exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+            myPublicProperty: privateModule.publicClass; // Error
+            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Public property 'myPublicProperty' of exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+        }
+        export var publicVarWithPrivateModulePropertyTypes: privateModule.publicClass; // Error
+                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Exported variable 'publicVarWithPrivateModulePropertyTypes' has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+        export declare var publicAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass; // Error
+                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Exported variable 'publicAmbientVarWithPrivateModulePropertyTypes' has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+    
+        interface privateInterfaceWithPrivateModulePropertyTypes {
+            myProperty: privateModule.publicClass;
+        }
+        class privateClassWithPrivateModulePropertyTypes {
+            static myPublicStaticProperty: privateModule.publicClass;
+            myPublicProperty: privateModule.publicClass;
+        }
+        var privateVarWithPrivateModulePropertyTypes: privateModule.publicClass;
+        declare var privateAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass;
+    }
+    
+    module privateModule {
+        class privateClass {
+        }
+    
+        export class publicClass {
+        }
+    
+        export interface publicInterfaceWithPrivatePropertyTypes {
+            myProperty: privateClass;  
+        }
+    
+        export interface publicInterfaceWithPublicPropertyTypes {
+            myProperty: publicClass;
+        }
+    
+        interface privateInterfaceWithPrivatePropertyTypes {
+            myProperty: privateClass;
+        }
+    
+        interface privateInterfaceWithPublicPropertyTypes {
+            myProperty: publicClass;
+        }
+    
+        export class publicClassWithWithPrivatePropertyTypes {
+            static myPublicStaticProperty: privateClass; 
+            private static myPrivateStaticProperty: privateClass;
+            myPublicProperty: privateClass; 
+            private myPrivateProperty: privateClass;
+        }
+    
+        export class publicClassWithWithPublicPropertyTypes {
+            static myPublicStaticProperty: publicClass;
+            private static myPrivateStaticProperty: publicClass;
+            myPublicProperty: publicClass;
+            private myPrivateProperty: publicClass;
+        }
+    
+        class privateClassWithWithPrivatePropertyTypes {
+            static myPublicStaticProperty: privateClass;
+            private static myPrivateStaticProperty: privateClass;
+            myPublicProperty: privateClass;
+            private myPrivateProperty: privateClass;
+        }
+    
+        class privateClassWithWithPublicPropertyTypes {
+            static myPublicStaticProperty: publicClass;
+            private static myPrivateStaticProperty: publicClass;
+            myPublicProperty: publicClass;
+            private myPrivateProperty: publicClass;
+        }
+    
+        export var publicVarWithPrivatePropertyTypes: privateClass; 
+        export var publicVarWithPublicPropertyTypes: publicClass;
+        var privateVarWithPrivatePropertyTypes: privateClass;
+        var privateVarWithPublicPropertyTypes: publicClass;
+    
+        export declare var publicAmbientVarWithPrivatePropertyTypes: privateClass; 
+        export declare var publicAmbientVarWithPublicPropertyTypes: publicClass;
+        declare var privateAmbientVarWithPrivatePropertyTypes: privateClass;
+        declare var privateAmbientVarWithPublicPropertyTypes: publicClass;
+    
+        export interface publicInterfaceWithPrivateModulePropertyTypes {
+            myProperty: privateModule.publicClass; 
+        }
+        export class publicClassWithPrivateModulePropertyTypes {
+            static myPublicStaticProperty: privateModule.publicClass; 
+            myPublicProperty: privateModule.publicClass; 
+        }
+        export var publicVarWithPrivateModulePropertyTypes: privateModule.publicClass; 
+        export declare var publicAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass;
+    
+        interface privateInterfaceWithPrivateModulePropertyTypes {
+            myProperty: privateModule.publicClass;
+        }
+        class privateClassWithPrivateModulePropertyTypes {
+            static myPublicStaticProperty: privateModule.publicClass;
+            myPublicProperty: privateModule.publicClass;
+        }
+        var privateVarWithPrivateModulePropertyTypes: privateModule.publicClass;
+        declare var privateAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass;
+    }
+    
+==== tests/cases/compiler/privacyVarDeclFile_GlobalFile.ts (10 errors) ====
+    class publicClassInGlobal {
+    }
+    interface publicInterfaceWithPublicPropertyTypesInGlobal {
+        myProperty: publicClassInGlobal;
+    }
+    class publicClassWithWithPublicPropertyTypesInGlobal {
+        static myPublicStaticProperty: publicClassInGlobal;
+        private static myPrivateStaticProperty: publicClassInGlobal;
+        myPublicProperty: publicClassInGlobal;
+        private myPrivateProperty: publicClassInGlobal;
+    }
+    var publicVarWithPublicPropertyTypesInGlobal: publicClassInGlobal;
+    declare var publicAmbientVarWithPublicPropertyTypesInGlobal: publicClassInGlobal;
+    
+    module publicModuleInGlobal {
+        class privateClass {
+        }
+    
+        export class publicClass {
+        }
+    
+        module privateModule {
+            class privateClass {
+            }
+    
+            export class publicClass {
+            }
+    
+            export interface publicInterfaceWithPrivatePropertyTypes {
+                myProperty: privateClass;
+            }
+    
+            export interface publicInterfaceWithPublicPropertyTypes {
+                myProperty: publicClass;
+            }
+    
+            interface privateInterfaceWithPrivatePropertyTypes {
+                myProperty: privateClass;
+            }
+    
+            interface privateInterfaceWithPublicPropertyTypes {
+                myProperty: publicClass;
+            }
+    
+            export class publicClassWithWithPrivatePropertyTypes {
+                static myPublicStaticProperty: privateClass;
+                private static myPrivateStaticProperty: privateClass;
+                myPublicProperty: privateClass;
+                private myPrivateProperty: privateClass;
+            }
+    
+            export class publicClassWithWithPublicPropertyTypes {
+                static myPublicStaticProperty: publicClass;
+                private static myPrivateStaticProperty: publicClass;
+                myPublicProperty: publicClass;
+                private myPrivateProperty: publicClass;
+            }
+    
+            class privateClassWithWithPrivatePropertyTypes {
+                static myPublicStaticProperty: privateClass;
+                private static myPrivateStaticProperty: privateClass;
+                myPublicProperty: privateClass;
+                private myPrivateProperty: privateClass;
+            }
+    
+            class privateClassWithWithPublicPropertyTypes {
+                static myPublicStaticProperty: publicClass;
+                private static myPrivateStaticProperty: publicClass;
+                myPublicProperty: publicClass;
+                private myPrivateProperty: publicClass;
+            }
+    
+            export var publicVarWithPrivatePropertyTypes: privateClass;
+            export var publicVarWithPublicPropertyTypes: publicClass;
+            var privateVarWithPrivatePropertyTypes: privateClass;
+            var privateVarWithPublicPropertyTypes: publicClass;
+    
+            export declare var publicAmbientVarWithPrivatePropertyTypes: privateClass;
+            export declare var publicAmbientVarWithPublicPropertyTypes: publicClass;
+            declare var privateAmbientVarWithPrivatePropertyTypes: privateClass;
+            declare var privateAmbientVarWithPublicPropertyTypes: publicClass;
+    
+            export interface publicInterfaceWithPrivateModulePropertyTypes {
+                myProperty: privateModule.publicClass;
+            }
+            export class publicClassWithPrivateModulePropertyTypes {
+                static myPublicStaticProperty: privateModule.publicClass;
+                myPublicProperty: privateModule.publicClass;
+            }
+            export var publicVarWithPrivateModulePropertyTypes: privateModule.publicClass;
+            export declare var publicAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass;
+    
+            interface privateInterfaceWithPrivateModulePropertyTypes {
+                myProperty: privateModule.publicClass;
+            }
+            class privateClassWithPrivateModulePropertyTypes {
+                static myPublicStaticProperty: privateModule.publicClass;
+                myPublicProperty: privateModule.publicClass;
+            }
+            var privateVarWithPrivateModulePropertyTypes: privateModule.publicClass;
+            declare var privateAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass;
+        }
+    
+        export interface publicInterfaceWithPrivatePropertyTypes {
+            myProperty: privateClass;  // Error
+            ~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Property 'myProperty' of exported interface has or is using private name 'privateClass'.
+        }
+    
+        export interface publicInterfaceWithPublicPropertyTypes {
+            myProperty: publicClass;
+        }
+    
+        interface privateInterfaceWithPrivatePropertyTypes {
+            myProperty: privateClass;
+        }
+    
+        interface privateInterfaceWithPublicPropertyTypes {
+            myProperty: publicClass;
+        }
+    
+        export class publicClassWithWithPrivatePropertyTypes {
+            static myPublicStaticProperty: privateClass; // Error
+            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Public static property 'myPublicStaticProperty' of exported class has or is using private name 'privateClass'.
+            private static myPrivateStaticProperty: privateClass;
+            myPublicProperty: privateClass; // Error
+            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Public property 'myPublicProperty' of exported class has or is using private name 'privateClass'.
+            private myPrivateProperty: privateClass;
+        }
+    
+        export class publicClassWithWithPublicPropertyTypes {
+            static myPublicStaticProperty: publicClass;
+            private static myPrivateStaticProperty: publicClass;
+            myPublicProperty: publicClass;
+            private myPrivateProperty: publicClass;
+        }
+    
+        class privateClassWithWithPrivatePropertyTypes {
+            static myPublicStaticProperty: privateClass;
+            private static myPrivateStaticProperty: privateClass;
+            myPublicProperty: privateClass;
+            private myPrivateProperty: privateClass;
+        }
+    
+        class privateClassWithWithPublicPropertyTypes {
+            static myPublicStaticProperty: publicClass;
+            private static myPrivateStaticProperty: publicClass;
+            myPublicProperty: publicClass;
+            private myPrivateProperty: publicClass;
+        }
+    
+        export var publicVarWithPrivatePropertyTypes: privateClass; // Error
+                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Exported variable 'publicVarWithPrivatePropertyTypes' has or is using private name 'privateClass'.
+        export var publicVarWithPublicPropertyTypes: publicClass;
+        var privateVarWithPrivatePropertyTypes: privateClass;
+        var privateVarWithPublicPropertyTypes: publicClass;
+    
+        export declare var publicAmbientVarWithPrivatePropertyTypes: privateClass; // Error
+                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Exported variable 'publicAmbientVarWithPrivatePropertyTypes' has or is using private name 'privateClass'.
+        export declare var publicAmbientVarWithPublicPropertyTypes: publicClass;
+        declare var privateAmbientVarWithPrivatePropertyTypes: privateClass;
+        declare var privateAmbientVarWithPublicPropertyTypes: publicClass;
+    
+        export interface publicInterfaceWithPrivateModulePropertyTypes {
+            myProperty: privateModule.publicClass; // Error
+            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Property 'myProperty' of exported interface has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+        }
+        export class publicClassWithPrivateModulePropertyTypes {
+            static myPublicStaticProperty: privateModule.publicClass; // Error
+            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Public static property 'myPublicStaticProperty' of exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+            myPublicProperty: privateModule.publicClass; // Error
+            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Public property 'myPublicProperty' of exported class has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+        }
+        export var publicVarWithPrivateModulePropertyTypes: privateModule.publicClass; // Error
+                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Exported variable 'publicVarWithPrivateModulePropertyTypes' has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+        export declare var publicAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass; // Error
+                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! Exported variable 'publicAmbientVarWithPrivateModulePropertyTypes' has or is using name 'privateModule.publicClass' from private module 'privateModule'.
+    
+        interface privateInterfaceWithPrivateModulePropertyTypes {
+            myProperty: privateModule.publicClass;
+        }
+        class privateClassWithPrivateModulePropertyTypes {
+            static myPublicStaticProperty: privateModule.publicClass;
+            myPublicProperty: privateModule.publicClass;
+        }
+        var privateVarWithPrivateModulePropertyTypes: privateModule.publicClass;
+        declare var privateAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass;
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/privacyVarDeclFile.js b/tests/baselines/reference/privacyVarDeclFile.js
new file mode 100644
index 00000000000..3be0d92e397
--- /dev/null
+++ b/tests/baselines/reference/privacyVarDeclFile.js
@@ -0,0 +1,702 @@
+//// [tests/cases/compiler/privacyVarDeclFile.ts] ////
+
+//// [privacyVarDeclFile_externalModule.ts]
+
+class privateClass {
+}
+
+export class publicClass {
+}
+
+export interface publicInterfaceWithPrivatePropertyTypes {
+    myProperty: privateClass;  // Error
+}
+
+export interface publicInterfaceWithPublicPropertyTypes {
+    myProperty: publicClass;
+}
+
+interface privateInterfaceWithPrivatePropertyTypes {
+    myProperty: privateClass;
+}
+
+interface privateInterfaceWithPublicPropertyTypes {
+    myProperty: publicClass;
+}
+
+export class publicClassWithWithPrivatePropertyTypes {
+    static myPublicStaticProperty: privateClass; // Error
+    private static myPrivateStaticProperty: privateClass;
+    myPublicProperty: privateClass; // Error
+    private myPrivateProperty: privateClass;
+}
+
+export class publicClassWithWithPublicPropertyTypes {
+    static myPublicStaticProperty: publicClass;
+    private static myPrivateStaticProperty: publicClass;
+    myPublicProperty: publicClass;
+    private myPrivateProperty: publicClass;
+}
+
+class privateClassWithWithPrivatePropertyTypes {
+    static myPublicStaticProperty: privateClass;
+    private static myPrivateStaticProperty: privateClass;
+    myPublicProperty: privateClass;
+    private myPrivateProperty: privateClass;
+}
+
+class privateClassWithWithPublicPropertyTypes {
+    static myPublicStaticProperty: publicClass;
+    private static myPrivateStaticProperty: publicClass;
+    myPublicProperty: publicClass;
+    private myPrivateProperty: publicClass;
+}
+
+export var publicVarWithPrivatePropertyTypes: privateClass; // Error
+export var publicVarWithPublicPropertyTypes: publicClass;
+var privateVarWithPrivatePropertyTypes: privateClass;
+var privateVarWithPublicPropertyTypes: publicClass;
+
+export declare var publicAmbientVarWithPrivatePropertyTypes: privateClass; // Error
+export declare var publicAmbientVarWithPublicPropertyTypes: publicClass;
+declare var privateAmbientVarWithPrivatePropertyTypes: privateClass;
+declare var privateAmbientVarWithPublicPropertyTypes: publicClass;
+
+export interface publicInterfaceWithPrivateModulePropertyTypes {
+    myProperty: privateModule.publicClass; // Error
+}
+export class publicClassWithPrivateModulePropertyTypes {
+    static myPublicStaticProperty: privateModule.publicClass; // Error
+    myPublicProperty: privateModule.publicClass; // Error
+}
+export var publicVarWithPrivateModulePropertyTypes: privateModule.publicClass; // Error
+export declare var publicAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass; // Error
+
+interface privateInterfaceWithPrivateModulePropertyTypes {
+    myProperty: privateModule.publicClass;
+}
+class privateClassWithPrivateModulePropertyTypes {
+    static myPublicStaticProperty: privateModule.publicClass;
+    myPublicProperty: privateModule.publicClass;
+}
+var privateVarWithPrivateModulePropertyTypes: privateModule.publicClass;
+declare var privateAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass;
+
+export module publicModule {
+    class privateClass {
+    }
+
+    export class publicClass {
+    }
+
+    export interface publicInterfaceWithPrivatePropertyTypes {
+        myProperty: privateClass;  // Error
+    }
+
+    export interface publicInterfaceWithPublicPropertyTypes {
+        myProperty: publicClass;
+    }
+
+    interface privateInterfaceWithPrivatePropertyTypes {
+        myProperty: privateClass;
+    }
+
+    interface privateInterfaceWithPublicPropertyTypes {
+        myProperty: publicClass;
+    }
+
+    export class publicClassWithWithPrivatePropertyTypes {
+        static myPublicStaticProperty: privateClass; // Error
+        private static myPrivateStaticProperty: privateClass;
+        myPublicProperty: privateClass; // Error
+        private myPrivateProperty: privateClass;
+    }
+
+    export class publicClassWithWithPublicPropertyTypes {
+        static myPublicStaticProperty: publicClass;
+        private static myPrivateStaticProperty: publicClass;
+        myPublicProperty: publicClass;
+        private myPrivateProperty: publicClass;
+    }
+
+    class privateClassWithWithPrivatePropertyTypes {
+        static myPublicStaticProperty: privateClass;
+        private static myPrivateStaticProperty: privateClass;
+        myPublicProperty: privateClass;
+        private myPrivateProperty: privateClass;
+    }
+
+    class privateClassWithWithPublicPropertyTypes {
+        static myPublicStaticProperty: publicClass;
+        private static myPrivateStaticProperty: publicClass;
+        myPublicProperty: publicClass;
+        private myPrivateProperty: publicClass;
+    }
+
+    export var publicVarWithPrivatePropertyTypes: privateClass; // Error
+    export var publicVarWithPublicPropertyTypes: publicClass;
+    var privateVarWithPrivatePropertyTypes: privateClass;
+    var privateVarWithPublicPropertyTypes: publicClass;
+
+    export declare var publicAmbientVarWithPrivatePropertyTypes: privateClass; // Error
+    export declare var publicAmbientVarWithPublicPropertyTypes: publicClass;
+    declare var privateAmbientVarWithPrivatePropertyTypes: privateClass;
+    declare var privateAmbientVarWithPublicPropertyTypes: publicClass;
+
+    export interface publicInterfaceWithPrivateModulePropertyTypes {
+        myProperty: privateModule.publicClass; // Error
+    }
+    export class publicClassWithPrivateModulePropertyTypes {
+        static myPublicStaticProperty: privateModule.publicClass; // Error
+        myPublicProperty: privateModule.publicClass; // Error
+    }
+    export var publicVarWithPrivateModulePropertyTypes: privateModule.publicClass; // Error
+    export declare var publicAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass; // Error
+
+    interface privateInterfaceWithPrivateModulePropertyTypes {
+        myProperty: privateModule.publicClass;
+    }
+    class privateClassWithPrivateModulePropertyTypes {
+        static myPublicStaticProperty: privateModule.publicClass;
+        myPublicProperty: privateModule.publicClass;
+    }
+    var privateVarWithPrivateModulePropertyTypes: privateModule.publicClass;
+    declare var privateAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass;
+}
+
+module privateModule {
+    class privateClass {
+    }
+
+    export class publicClass {
+    }
+
+    export interface publicInterfaceWithPrivatePropertyTypes {
+        myProperty: privateClass;  
+    }
+
+    export interface publicInterfaceWithPublicPropertyTypes {
+        myProperty: publicClass;
+    }
+
+    interface privateInterfaceWithPrivatePropertyTypes {
+        myProperty: privateClass;
+    }
+
+    interface privateInterfaceWithPublicPropertyTypes {
+        myProperty: publicClass;
+    }
+
+    export class publicClassWithWithPrivatePropertyTypes {
+        static myPublicStaticProperty: privateClass; 
+        private static myPrivateStaticProperty: privateClass;
+        myPublicProperty: privateClass; 
+        private myPrivateProperty: privateClass;
+    }
+
+    export class publicClassWithWithPublicPropertyTypes {
+        static myPublicStaticProperty: publicClass;
+        private static myPrivateStaticProperty: publicClass;
+        myPublicProperty: publicClass;
+        private myPrivateProperty: publicClass;
+    }
+
+    class privateClassWithWithPrivatePropertyTypes {
+        static myPublicStaticProperty: privateClass;
+        private static myPrivateStaticProperty: privateClass;
+        myPublicProperty: privateClass;
+        private myPrivateProperty: privateClass;
+    }
+
+    class privateClassWithWithPublicPropertyTypes {
+        static myPublicStaticProperty: publicClass;
+        private static myPrivateStaticProperty: publicClass;
+        myPublicProperty: publicClass;
+        private myPrivateProperty: publicClass;
+    }
+
+    export var publicVarWithPrivatePropertyTypes: privateClass; 
+    export var publicVarWithPublicPropertyTypes: publicClass;
+    var privateVarWithPrivatePropertyTypes: privateClass;
+    var privateVarWithPublicPropertyTypes: publicClass;
+
+    export declare var publicAmbientVarWithPrivatePropertyTypes: privateClass; 
+    export declare var publicAmbientVarWithPublicPropertyTypes: publicClass;
+    declare var privateAmbientVarWithPrivatePropertyTypes: privateClass;
+    declare var privateAmbientVarWithPublicPropertyTypes: publicClass;
+
+    export interface publicInterfaceWithPrivateModulePropertyTypes {
+        myProperty: privateModule.publicClass; 
+    }
+    export class publicClassWithPrivateModulePropertyTypes {
+        static myPublicStaticProperty: privateModule.publicClass; 
+        myPublicProperty: privateModule.publicClass; 
+    }
+    export var publicVarWithPrivateModulePropertyTypes: privateModule.publicClass; 
+    export declare var publicAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass;
+
+    interface privateInterfaceWithPrivateModulePropertyTypes {
+        myProperty: privateModule.publicClass;
+    }
+    class privateClassWithPrivateModulePropertyTypes {
+        static myPublicStaticProperty: privateModule.publicClass;
+        myPublicProperty: privateModule.publicClass;
+    }
+    var privateVarWithPrivateModulePropertyTypes: privateModule.publicClass;
+    declare var privateAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass;
+}
+
+//// [privacyVarDeclFile_GlobalFile.ts]
+class publicClassInGlobal {
+}
+interface publicInterfaceWithPublicPropertyTypesInGlobal {
+    myProperty: publicClassInGlobal;
+}
+class publicClassWithWithPublicPropertyTypesInGlobal {
+    static myPublicStaticProperty: publicClassInGlobal;
+    private static myPrivateStaticProperty: publicClassInGlobal;
+    myPublicProperty: publicClassInGlobal;
+    private myPrivateProperty: publicClassInGlobal;
+}
+var publicVarWithPublicPropertyTypesInGlobal: publicClassInGlobal;
+declare var publicAmbientVarWithPublicPropertyTypesInGlobal: publicClassInGlobal;
+
+module publicModuleInGlobal {
+    class privateClass {
+    }
+
+    export class publicClass {
+    }
+
+    module privateModule {
+        class privateClass {
+        }
+
+        export class publicClass {
+        }
+
+        export interface publicInterfaceWithPrivatePropertyTypes {
+            myProperty: privateClass;
+        }
+
+        export interface publicInterfaceWithPublicPropertyTypes {
+            myProperty: publicClass;
+        }
+
+        interface privateInterfaceWithPrivatePropertyTypes {
+            myProperty: privateClass;
+        }
+
+        interface privateInterfaceWithPublicPropertyTypes {
+            myProperty: publicClass;
+        }
+
+        export class publicClassWithWithPrivatePropertyTypes {
+            static myPublicStaticProperty: privateClass;
+            private static myPrivateStaticProperty: privateClass;
+            myPublicProperty: privateClass;
+            private myPrivateProperty: privateClass;
+        }
+
+        export class publicClassWithWithPublicPropertyTypes {
+            static myPublicStaticProperty: publicClass;
+            private static myPrivateStaticProperty: publicClass;
+            myPublicProperty: publicClass;
+            private myPrivateProperty: publicClass;
+        }
+
+        class privateClassWithWithPrivatePropertyTypes {
+            static myPublicStaticProperty: privateClass;
+            private static myPrivateStaticProperty: privateClass;
+            myPublicProperty: privateClass;
+            private myPrivateProperty: privateClass;
+        }
+
+        class privateClassWithWithPublicPropertyTypes {
+            static myPublicStaticProperty: publicClass;
+            private static myPrivateStaticProperty: publicClass;
+            myPublicProperty: publicClass;
+            private myPrivateProperty: publicClass;
+        }
+
+        export var publicVarWithPrivatePropertyTypes: privateClass;
+        export var publicVarWithPublicPropertyTypes: publicClass;
+        var privateVarWithPrivatePropertyTypes: privateClass;
+        var privateVarWithPublicPropertyTypes: publicClass;
+
+        export declare var publicAmbientVarWithPrivatePropertyTypes: privateClass;
+        export declare var publicAmbientVarWithPublicPropertyTypes: publicClass;
+        declare var privateAmbientVarWithPrivatePropertyTypes: privateClass;
+        declare var privateAmbientVarWithPublicPropertyTypes: publicClass;
+
+        export interface publicInterfaceWithPrivateModulePropertyTypes {
+            myProperty: privateModule.publicClass;
+        }
+        export class publicClassWithPrivateModulePropertyTypes {
+            static myPublicStaticProperty: privateModule.publicClass;
+            myPublicProperty: privateModule.publicClass;
+        }
+        export var publicVarWithPrivateModulePropertyTypes: privateModule.publicClass;
+        export declare var publicAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass;
+
+        interface privateInterfaceWithPrivateModulePropertyTypes {
+            myProperty: privateModule.publicClass;
+        }
+        class privateClassWithPrivateModulePropertyTypes {
+            static myPublicStaticProperty: privateModule.publicClass;
+            myPublicProperty: privateModule.publicClass;
+        }
+        var privateVarWithPrivateModulePropertyTypes: privateModule.publicClass;
+        declare var privateAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass;
+    }
+
+    export interface publicInterfaceWithPrivatePropertyTypes {
+        myProperty: privateClass;  // Error
+    }
+
+    export interface publicInterfaceWithPublicPropertyTypes {
+        myProperty: publicClass;
+    }
+
+    interface privateInterfaceWithPrivatePropertyTypes {
+        myProperty: privateClass;
+    }
+
+    interface privateInterfaceWithPublicPropertyTypes {
+        myProperty: publicClass;
+    }
+
+    export class publicClassWithWithPrivatePropertyTypes {
+        static myPublicStaticProperty: privateClass; // Error
+        private static myPrivateStaticProperty: privateClass;
+        myPublicProperty: privateClass; // Error
+        private myPrivateProperty: privateClass;
+    }
+
+    export class publicClassWithWithPublicPropertyTypes {
+        static myPublicStaticProperty: publicClass;
+        private static myPrivateStaticProperty: publicClass;
+        myPublicProperty: publicClass;
+        private myPrivateProperty: publicClass;
+    }
+
+    class privateClassWithWithPrivatePropertyTypes {
+        static myPublicStaticProperty: privateClass;
+        private static myPrivateStaticProperty: privateClass;
+        myPublicProperty: privateClass;
+        private myPrivateProperty: privateClass;
+    }
+
+    class privateClassWithWithPublicPropertyTypes {
+        static myPublicStaticProperty: publicClass;
+        private static myPrivateStaticProperty: publicClass;
+        myPublicProperty: publicClass;
+        private myPrivateProperty: publicClass;
+    }
+
+    export var publicVarWithPrivatePropertyTypes: privateClass; // Error
+    export var publicVarWithPublicPropertyTypes: publicClass;
+    var privateVarWithPrivatePropertyTypes: privateClass;
+    var privateVarWithPublicPropertyTypes: publicClass;
+
+    export declare var publicAmbientVarWithPrivatePropertyTypes: privateClass; // Error
+    export declare var publicAmbientVarWithPublicPropertyTypes: publicClass;
+    declare var privateAmbientVarWithPrivatePropertyTypes: privateClass;
+    declare var privateAmbientVarWithPublicPropertyTypes: publicClass;
+
+    export interface publicInterfaceWithPrivateModulePropertyTypes {
+        myProperty: privateModule.publicClass; // Error
+    }
+    export class publicClassWithPrivateModulePropertyTypes {
+        static myPublicStaticProperty: privateModule.publicClass; // Error
+        myPublicProperty: privateModule.publicClass; // Error
+    }
+    export var publicVarWithPrivateModulePropertyTypes: privateModule.publicClass; // Error
+    export declare var publicAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass; // Error
+
+    interface privateInterfaceWithPrivateModulePropertyTypes {
+        myProperty: privateModule.publicClass;
+    }
+    class privateClassWithPrivateModulePropertyTypes {
+        static myPublicStaticProperty: privateModule.publicClass;
+        myPublicProperty: privateModule.publicClass;
+    }
+    var privateVarWithPrivateModulePropertyTypes: privateModule.publicClass;
+    declare var privateAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass;
+}
+
+//// [privacyVarDeclFile_externalModule.js]
+var privateClass = (function () {
+    function privateClass() {
+    }
+    return privateClass;
+})();
+var publicClass = (function () {
+    function publicClass() {
+    }
+    return publicClass;
+})();
+exports.publicClass = publicClass;
+var publicClassWithWithPrivatePropertyTypes = (function () {
+    function publicClassWithWithPrivatePropertyTypes() {
+    }
+    return publicClassWithWithPrivatePropertyTypes;
+})();
+exports.publicClassWithWithPrivatePropertyTypes = publicClassWithWithPrivatePropertyTypes;
+var publicClassWithWithPublicPropertyTypes = (function () {
+    function publicClassWithWithPublicPropertyTypes() {
+    }
+    return publicClassWithWithPublicPropertyTypes;
+})();
+exports.publicClassWithWithPublicPropertyTypes = publicClassWithWithPublicPropertyTypes;
+var privateClassWithWithPrivatePropertyTypes = (function () {
+    function privateClassWithWithPrivatePropertyTypes() {
+    }
+    return privateClassWithWithPrivatePropertyTypes;
+})();
+var privateClassWithWithPublicPropertyTypes = (function () {
+    function privateClassWithWithPublicPropertyTypes() {
+    }
+    return privateClassWithWithPublicPropertyTypes;
+})();
+exports.publicVarWithPrivatePropertyTypes; // Error
+exports.publicVarWithPublicPropertyTypes;
+var privateVarWithPrivatePropertyTypes;
+var privateVarWithPublicPropertyTypes;
+var publicClassWithPrivateModulePropertyTypes = (function () {
+    function publicClassWithPrivateModulePropertyTypes() {
+    }
+    return publicClassWithPrivateModulePropertyTypes;
+})();
+exports.publicClassWithPrivateModulePropertyTypes = publicClassWithPrivateModulePropertyTypes;
+exports.publicVarWithPrivateModulePropertyTypes; // Error
+var privateClassWithPrivateModulePropertyTypes = (function () {
+    function privateClassWithPrivateModulePropertyTypes() {
+    }
+    return privateClassWithPrivateModulePropertyTypes;
+})();
+var privateVarWithPrivateModulePropertyTypes;
+(function (publicModule) {
+    var privateClass = (function () {
+        function privateClass() {
+        }
+        return privateClass;
+    })();
+    var publicClass = (function () {
+        function publicClass() {
+        }
+        return publicClass;
+    })();
+    publicModule.publicClass = publicClass;
+    var publicClassWithWithPrivatePropertyTypes = (function () {
+        function publicClassWithWithPrivatePropertyTypes() {
+        }
+        return publicClassWithWithPrivatePropertyTypes;
+    })();
+    publicModule.publicClassWithWithPrivatePropertyTypes = publicClassWithWithPrivatePropertyTypes;
+    var publicClassWithWithPublicPropertyTypes = (function () {
+        function publicClassWithWithPublicPropertyTypes() {
+        }
+        return publicClassWithWithPublicPropertyTypes;
+    })();
+    publicModule.publicClassWithWithPublicPropertyTypes = publicClassWithWithPublicPropertyTypes;
+    var privateClassWithWithPrivatePropertyTypes = (function () {
+        function privateClassWithWithPrivatePropertyTypes() {
+        }
+        return privateClassWithWithPrivatePropertyTypes;
+    })();
+    var privateClassWithWithPublicPropertyTypes = (function () {
+        function privateClassWithWithPublicPropertyTypes() {
+        }
+        return privateClassWithWithPublicPropertyTypes;
+    })();
+    publicModule.publicVarWithPrivatePropertyTypes; // Error
+    publicModule.publicVarWithPublicPropertyTypes;
+    var privateVarWithPrivatePropertyTypes;
+    var privateVarWithPublicPropertyTypes;
+    var publicClassWithPrivateModulePropertyTypes = (function () {
+        function publicClassWithPrivateModulePropertyTypes() {
+        }
+        return publicClassWithPrivateModulePropertyTypes;
+    })();
+    publicModule.publicClassWithPrivateModulePropertyTypes = publicClassWithPrivateModulePropertyTypes;
+    publicModule.publicVarWithPrivateModulePropertyTypes; // Error
+    var privateClassWithPrivateModulePropertyTypes = (function () {
+        function privateClassWithPrivateModulePropertyTypes() {
+        }
+        return privateClassWithPrivateModulePropertyTypes;
+    })();
+    var privateVarWithPrivateModulePropertyTypes;
+})(exports.publicModule || (exports.publicModule = {}));
+var publicModule = exports.publicModule;
+var privateModule;
+(function (privateModule) {
+    var privateClass = (function () {
+        function privateClass() {
+        }
+        return privateClass;
+    })();
+    var publicClass = (function () {
+        function publicClass() {
+        }
+        return publicClass;
+    })();
+    privateModule.publicClass = publicClass;
+    var publicClassWithWithPrivatePropertyTypes = (function () {
+        function publicClassWithWithPrivatePropertyTypes() {
+        }
+        return publicClassWithWithPrivatePropertyTypes;
+    })();
+    privateModule.publicClassWithWithPrivatePropertyTypes = publicClassWithWithPrivatePropertyTypes;
+    var publicClassWithWithPublicPropertyTypes = (function () {
+        function publicClassWithWithPublicPropertyTypes() {
+        }
+        return publicClassWithWithPublicPropertyTypes;
+    })();
+    privateModule.publicClassWithWithPublicPropertyTypes = publicClassWithWithPublicPropertyTypes;
+    var privateClassWithWithPrivatePropertyTypes = (function () {
+        function privateClassWithWithPrivatePropertyTypes() {
+        }
+        return privateClassWithWithPrivatePropertyTypes;
+    })();
+    var privateClassWithWithPublicPropertyTypes = (function () {
+        function privateClassWithWithPublicPropertyTypes() {
+        }
+        return privateClassWithWithPublicPropertyTypes;
+    })();
+    privateModule.publicVarWithPrivatePropertyTypes;
+    privateModule.publicVarWithPublicPropertyTypes;
+    var privateVarWithPrivatePropertyTypes;
+    var privateVarWithPublicPropertyTypes;
+    var publicClassWithPrivateModulePropertyTypes = (function () {
+        function publicClassWithPrivateModulePropertyTypes() {
+        }
+        return publicClassWithPrivateModulePropertyTypes;
+    })();
+    privateModule.publicClassWithPrivateModulePropertyTypes = publicClassWithPrivateModulePropertyTypes;
+    privateModule.publicVarWithPrivateModulePropertyTypes;
+    var privateClassWithPrivateModulePropertyTypes = (function () {
+        function privateClassWithPrivateModulePropertyTypes() {
+        }
+        return privateClassWithPrivateModulePropertyTypes;
+    })();
+    var privateVarWithPrivateModulePropertyTypes;
+})(privateModule || (privateModule = {}));
+//// [privacyVarDeclFile_GlobalFile.js]
+var publicClassInGlobal = (function () {
+    function publicClassInGlobal() {
+    }
+    return publicClassInGlobal;
+})();
+var publicClassWithWithPublicPropertyTypesInGlobal = (function () {
+    function publicClassWithWithPublicPropertyTypesInGlobal() {
+    }
+    return publicClassWithWithPublicPropertyTypesInGlobal;
+})();
+var publicVarWithPublicPropertyTypesInGlobal;
+var publicModuleInGlobal;
+(function (publicModuleInGlobal) {
+    var privateClass = (function () {
+        function privateClass() {
+        }
+        return privateClass;
+    })();
+    var publicClass = (function () {
+        function publicClass() {
+        }
+        return publicClass;
+    })();
+    publicModuleInGlobal.publicClass = publicClass;
+    var privateModule;
+    (function (privateModule) {
+        var privateClass = (function () {
+            function privateClass() {
+            }
+            return privateClass;
+        })();
+        var publicClass = (function () {
+            function publicClass() {
+            }
+            return publicClass;
+        })();
+        privateModule.publicClass = publicClass;
+        var publicClassWithWithPrivatePropertyTypes = (function () {
+            function publicClassWithWithPrivatePropertyTypes() {
+            }
+            return publicClassWithWithPrivatePropertyTypes;
+        })();
+        privateModule.publicClassWithWithPrivatePropertyTypes = publicClassWithWithPrivatePropertyTypes;
+        var publicClassWithWithPublicPropertyTypes = (function () {
+            function publicClassWithWithPublicPropertyTypes() {
+            }
+            return publicClassWithWithPublicPropertyTypes;
+        })();
+        privateModule.publicClassWithWithPublicPropertyTypes = publicClassWithWithPublicPropertyTypes;
+        var privateClassWithWithPrivatePropertyTypes = (function () {
+            function privateClassWithWithPrivatePropertyTypes() {
+            }
+            return privateClassWithWithPrivatePropertyTypes;
+        })();
+        var privateClassWithWithPublicPropertyTypes = (function () {
+            function privateClassWithWithPublicPropertyTypes() {
+            }
+            return privateClassWithWithPublicPropertyTypes;
+        })();
+        privateModule.publicVarWithPrivatePropertyTypes;
+        privateModule.publicVarWithPublicPropertyTypes;
+        var privateVarWithPrivatePropertyTypes;
+        var privateVarWithPublicPropertyTypes;
+        var publicClassWithPrivateModulePropertyTypes = (function () {
+            function publicClassWithPrivateModulePropertyTypes() {
+            }
+            return publicClassWithPrivateModulePropertyTypes;
+        })();
+        privateModule.publicClassWithPrivateModulePropertyTypes = publicClassWithPrivateModulePropertyTypes;
+        privateModule.publicVarWithPrivateModulePropertyTypes;
+        var privateClassWithPrivateModulePropertyTypes = (function () {
+            function privateClassWithPrivateModulePropertyTypes() {
+            }
+            return privateClassWithPrivateModulePropertyTypes;
+        })();
+        var privateVarWithPrivateModulePropertyTypes;
+    })(privateModule || (privateModule = {}));
+    var publicClassWithWithPrivatePropertyTypes = (function () {
+        function publicClassWithWithPrivatePropertyTypes() {
+        }
+        return publicClassWithWithPrivatePropertyTypes;
+    })();
+    publicModuleInGlobal.publicClassWithWithPrivatePropertyTypes = publicClassWithWithPrivatePropertyTypes;
+    var publicClassWithWithPublicPropertyTypes = (function () {
+        function publicClassWithWithPublicPropertyTypes() {
+        }
+        return publicClassWithWithPublicPropertyTypes;
+    })();
+    publicModuleInGlobal.publicClassWithWithPublicPropertyTypes = publicClassWithWithPublicPropertyTypes;
+    var privateClassWithWithPrivatePropertyTypes = (function () {
+        function privateClassWithWithPrivatePropertyTypes() {
+        }
+        return privateClassWithWithPrivatePropertyTypes;
+    })();
+    var privateClassWithWithPublicPropertyTypes = (function () {
+        function privateClassWithWithPublicPropertyTypes() {
+        }
+        return privateClassWithWithPublicPropertyTypes;
+    })();
+    publicModuleInGlobal.publicVarWithPrivatePropertyTypes; // Error
+    publicModuleInGlobal.publicVarWithPublicPropertyTypes;
+    var privateVarWithPrivatePropertyTypes;
+    var privateVarWithPublicPropertyTypes;
+    var publicClassWithPrivateModulePropertyTypes = (function () {
+        function publicClassWithPrivateModulePropertyTypes() {
+        }
+        return publicClassWithPrivateModulePropertyTypes;
+    })();
+    publicModuleInGlobal.publicClassWithPrivateModulePropertyTypes = publicClassWithPrivateModulePropertyTypes;
+    publicModuleInGlobal.publicVarWithPrivateModulePropertyTypes; // Error
+    var privateClassWithPrivateModulePropertyTypes = (function () {
+        function privateClassWithPrivateModulePropertyTypes() {
+        }
+        return privateClassWithPrivateModulePropertyTypes;
+    })();
+    var privateVarWithPrivateModulePropertyTypes;
+})(publicModuleInGlobal || (publicModuleInGlobal = {}));
diff --git a/tests/baselines/reference/promiseChaining.errors.txt b/tests/baselines/reference/promiseChaining.errors.txt
deleted file mode 100644
index c128f434d80..00000000000
--- a/tests/baselines/reference/promiseChaining.errors.txt
+++ /dev/null
@@ -1,136 +0,0 @@
-==== tests/cases/compiler/promiseChaining.ts (50 errors) ====
-    <<<<<<< HEAD
-    ~~
-!!! Declaration or statement expected.
-      ~~
-!!! Declaration or statement expected.
-        ~~
-!!! Declaration or statement expected.
-            ~~~~
-!!! Cannot find name 'HEAD'.
-    =======
-    ~~~
-!!! '>' expected.
-       ~~~
-!!! Expression expected.
-          ~
-!!! Expression expected.
-    // This exhibits the bug that you see with Promise typings having generic signatures in a generic type
-    
-    // BUG 858876: should get a fresh type parameter which each then call
-    
-    >>>>>>> d99cb83... Clean up 'blocked' tests
-    ~
-!!! Declaration or statement expected.
-     ~
-!!! Declaration or statement expected.
-      ~
-!!! Declaration or statement expected.
-       ~
-!!! Declaration or statement expected.
-        ~
-!!! Declaration or statement expected.
-         ~
-!!! Declaration or statement expected.
-          ~
-!!! Declaration or statement expected.
-                   ~~~
-!!! ';' expected.
-                             ~~
-!!! ';' expected.
-                                ~~~~~~~~~
-!!! ';' expected.
-                                          ~~~~~
-!!! ';' expected.
-            ~~~~~~~
-!!! Cannot find name 'd99cb83'.
-                       ~~~~~
-!!! Cannot find name 'Clean'.
-                             ~~
-!!! Cannot find name 'up'.
-                                          ~~~~~
-!!! Cannot find name 'tests'.
-    class Chain<T> {
-        constructor(public value: T) { }
-        then<S>(cb: (x: T) => S): Chain<S> {
-            var result = cb(this.value);
-    <<<<<<< HEAD
-    ~~
-!!! Statement expected.
-      ~~
-!!! Statement expected.
-        ~~
-!!! Statement expected.
-            ~~~~
-!!! Cannot find name 'HEAD'.
-            // should get a fresh type parameter which each then call
-            var z = this.then(x => result)/*S*/.then(x => "abc")/*string*/.then(x => x.length)/*number*/; // No error
-            ~~~
-!!! '>' expected.
-            return new Chain(result);
-        }
-    }
-    =======
-    ~~~
-!!! Declaration or statement expected.
-       ~~~
-!!! Declaration or statement expected.
-          ~
-!!! Declaration or statement expected.
-            var z = this.then(x => result).then(x => "abc").then(x => x.length); 
-                                   ~~~~~~
-!!! Cannot find name 'result'.
-            return new Chain(result);
-            ~~~~~~
-!!! A 'return' statement can only be used within a function body.
-        }
-        ~
-!!! Declaration or statement expected.
-    }
-    ~
-!!! Declaration or statement expected.
-    
-    // same example but with constraints on each type parameter
-    class Chain2<T extends { length: number }> {
-        constructor(public value: T) { }
-        then<S extends Function>(cb: (x: T) => S): Chain2<S> {
-            var result = cb(this.value);
-            // should get a fresh type parameter which each then call
-            var z = this.then(x => result).then(x => "abc").then(x => x.length);
-                                                ~~~~~~~~~~
-!!! Argument of type '(x: S) => string' is not assignable to parameter of type '(x: S) => Function'.
-            return new Chain2(result);
-        }
-    }
-    >>>>>>> d99cb83... Clean up 'blocked' tests
-    ~
-!!! Declaration or statement expected.
-     ~
-!!! Declaration or statement expected.
-      ~
-!!! Declaration or statement expected.
-       ~
-!!! Declaration or statement expected.
-        ~
-!!! Declaration or statement expected.
-         ~
-!!! Declaration or statement expected.
-          ~
-!!! Declaration or statement expected.
-                   ~~~
-!!! ';' expected.
-                             ~~
-!!! ';' expected.
-                                ~~~~~~~~~
-!!! ';' expected.
-                                          ~~~~~
-!!! ';' expected.
-            ~~~~~~~
-!!! Cannot find name 'd99cb83'.
-                       ~~~~~
-!!! Cannot find name 'Clean'.
-                             ~~
-!!! Cannot find name 'up'.
-                                          ~~~~~
-!!! Cannot find name 'tests'.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/promiseChaining.js b/tests/baselines/reference/promiseChaining.js
new file mode 100644
index 00000000000..1d0962d30db
--- /dev/null
+++ b/tests/baselines/reference/promiseChaining.js
@@ -0,0 +1,26 @@
+//// [promiseChaining.ts]
+class Chain<T> {
+    constructor(public value: T) { }
+    then<S>(cb: (x: T) => S): Chain<S> {
+        var result = cb(this.value);
+        // should get a fresh type parameter which each then call
+        var z = this.then(x => result)/*S*/.then(x => "abc")/*string*/.then(x => x.length)/*number*/; // No error
+        return new Chain(result);
+    }
+}
+
+
+
+//// [promiseChaining.js]
+var Chain = (function () {
+    function Chain(value) {
+        this.value = value;
+    }
+    Chain.prototype.then = function (cb) {
+        var result = cb(this.value);
+        // should get a fresh type parameter which each then call
+        var z = this.then(function (x) { return result; }).then(function (x) { return "abc"; }).then(function (x) { return x.length; }) /*number*/; // No error
+        return new Chain(result);
+    };
+    return Chain;
+})();
diff --git a/tests/baselines/reference/promiseChaining.types b/tests/baselines/reference/promiseChaining.types
new file mode 100644
index 00000000000..6edb6c6d09f
--- /dev/null
+++ b/tests/baselines/reference/promiseChaining.types
@@ -0,0 +1,59 @@
+=== 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
+>cb(this.value) : S
+>cb : (x: T) => S
+>this.value : T
+>this : Chain<T>
+>value : T
+
+        // should get a fresh type parameter which each then call
+        var z = this.then(x => result)/*S*/.then(x => "abc")/*string*/.then(x => x.length)/*number*/; // No error
+>z : Chain<number>
+>this.then(x => result)/*S*/.then(x => "abc")/*string*/.then(x => x.length) : Chain<number>
+>this.then(x => result)/*S*/.then(x => "abc")/*string*/.then : <S>(cb: (x: string) => S) => Chain<S>
+>this.then(x => result)/*S*/.then(x => "abc") : Chain<string>
+>this.then(x => result)/*S*/.then : <S>(cb: (x: S) => S) => Chain<S>
+>this.then(x => result) : Chain<S>
+>this.then : <S>(cb: (x: T) => S) => Chain<S>
+>this : Chain<T>
+>then : <S>(cb: (x: T) => S) => Chain<S>
+>x => result : (x: T) => S
+>x : T
+>result : S
+>then : <S>(cb: (x: S) => S) => Chain<S>
+>x => "abc" : (x: S) => string
+>x : S
+>then : <S>(cb: (x: string) => S) => Chain<S>
+>x => x.length : (x: string) => number
+>x : string
+>x.length : number
+>x : string
+>length : number
+
+        return new Chain(result);
+>new Chain(result) : Chain<S>
+>Chain : typeof Chain
+>result : S
+    }
+}
+
+
diff --git a/tests/baselines/reference/promiseChaining2.errors.txt b/tests/baselines/reference/promiseChaining2.errors.txt
new file mode 100644
index 00000000000..62a12242558
--- /dev/null
+++ b/tests/baselines/reference/promiseChaining2.errors.txt
@@ -0,0 +1,13 @@
+==== tests/cases/compiler/promiseChaining2.ts (1 errors) ====
+    // same example but with constraints on each type parameter
+    class Chain2<T extends { length: number }> {
+        constructor(public value: T) { }
+        then<S extends Function>(cb: (x: T) => S): Chain2<S> {
+            var result = cb(this.value);
+            // should get a fresh type parameter which each then call
+            var z = this.then(x => result).then(x => "abc").then(x => x.length);
+                                                ~~~~~~~~~~
+!!! Argument of type '(x: S) => string' is not assignable to parameter of type '(x: S) => Function'.
+            return new Chain2(result);
+        }
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/promiseChaining2.js b/tests/baselines/reference/promiseChaining2.js
index e9fed96839b..ed03ab2c97a 100644
--- a/tests/baselines/reference/promiseChaining2.js
+++ b/tests/baselines/reference/promiseChaining2.js
@@ -1,4 +1,26 @@
 //// [promiseChaining2.ts]
-
+// same example but with constraints on each type parameter
+class Chain2<T extends { length: number }> {
+    constructor(public value: T) { }
+    then<S extends Function>(cb: (x: T) => S): Chain2<S> {
+        var result = cb(this.value);
+        // should get a fresh type parameter which each then call
+        var z = this.then(x => result).then(x => "abc").then(x => x.length);
+        return new Chain2(result);
+    }
+}
 
 //// [promiseChaining2.js]
+// same example but with constraints on each type parameter
+var Chain2 = (function () {
+    function Chain2(value) {
+        this.value = value;
+    }
+    Chain2.prototype.then = function (cb) {
+        var result = cb(this.value);
+        // should get a fresh type parameter which each then call
+        var z = this.then(function (x) { return result; }).then(function (x) { return "abc"; }).then(function (x) { return x.length; });
+        return new Chain2(result);
+    };
+    return Chain2;
+})();
diff --git a/tests/baselines/reference/promiseChaining2.types b/tests/baselines/reference/promiseChaining2.types
deleted file mode 100644
index 14ab4cc823f..00000000000
--- a/tests/baselines/reference/promiseChaining2.types
+++ /dev/null
@@ -1,3 +0,0 @@
-=== tests/cases/compiler/promiseChaining2.ts ===
-
-No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/propertyParameterWithQuestionMark.errors.txt b/tests/baselines/reference/propertyParameterWithQuestionMark.errors.txt
new file mode 100644
index 00000000000..c58b2345205
--- /dev/null
+++ b/tests/baselines/reference/propertyParameterWithQuestionMark.errors.txt
@@ -0,0 +1,16 @@
+==== tests/cases/compiler/propertyParameterWithQuestionMark.ts (2 errors) ====
+    class C {
+        constructor(public x?) { }
+    }
+    
+    // x should not be an optional property
+    var v: C = {}; // Should fail
+        ~
+!!! Type '{}' is not assignable to type 'C':
+!!!   Property 'x' is missing in type '{}'.
+    var v2: { x? }
+    v = v2; // Should fail
+    ~
+!!! Type '{ x?: any; }' is not assignable to type 'C':
+!!!   Required property 'x' cannot be reimplemented with optional property in '{ x?: any; }'.
+    var v3: { x } = new C; // Should succeed
\ No newline at end of file
diff --git a/tests/baselines/reference/propertyParameterWithQuestionMark.js b/tests/baselines/reference/propertyParameterWithQuestionMark.js
new file mode 100644
index 00000000000..e3b6bd153c2
--- /dev/null
+++ b/tests/baselines/reference/propertyParameterWithQuestionMark.js
@@ -0,0 +1,23 @@
+//// [propertyParameterWithQuestionMark.ts]
+class C {
+    constructor(public x?) { }
+}
+
+// x should not be an optional property
+var v: C = {}; // Should fail
+var v2: { x? }
+v = v2; // Should fail
+var v3: { x } = new C; // Should succeed
+
+//// [propertyParameterWithQuestionMark.js]
+var C = (function () {
+    function C(x) {
+        this.x = x;
+    }
+    return C;
+})();
+// x should not be an optional property
+var v = {}; // Should fail
+var v2;
+v = v2; // Should fail
+var v3 = new C; // Should succeed
diff --git a/tests/baselines/reference/regExpWithSlashInCharClass.js b/tests/baselines/reference/regExpWithSlashInCharClass.js
new file mode 100644
index 00000000000..e96b6165a97
--- /dev/null
+++ b/tests/baselines/reference/regExpWithSlashInCharClass.js
@@ -0,0 +1,10 @@
+//// [regExpWithSlashInCharClass.ts]
+var foo1 = "a/".replace(/.[/]/, "");
+var foo2 = "a//".replace(/.[//]/g, "");
+var foo3 = "a/".replace(/.[/no sleep /till/]/, "bugfix");
+
+
+//// [regExpWithSlashInCharClass.js]
+var foo1 = "a/".replace(/.[/]/, "");
+var foo2 = "a//".replace(/.[//]/g, "");
+var foo3 = "a/".replace(/.[/no sleep /till/]/, "bugfix");
diff --git a/tests/baselines/reference/regExpWithSlashInCharClass.types b/tests/baselines/reference/regExpWithSlashInCharClass.types
new file mode 100644
index 00000000000..c868594e457
--- /dev/null
+++ b/tests/baselines/reference/regExpWithSlashInCharClass.types
@@ -0,0 +1,19 @@
+=== tests/cases/compiler/regExpWithSlashInCharClass.ts ===
+var foo1 = "a/".replace(/.[/]/, "");
+>foo1 : string
+>"a/".replace(/.[/]/, "") : string
+>"a/".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; }
+>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; }
+
+var foo2 = "a//".replace(/.[//]/g, "");
+>foo2 : string
+>"a//".replace(/.[//]/g, "") : string
+>"a//".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; }
+>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; }
+
+var foo3 = "a/".replace(/.[/no sleep /till/]/, "bugfix");
+>foo3 : string
+>"a/".replace(/.[/no sleep /till/]/, "bugfix") : string
+>"a/".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; }
+>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; }
+
diff --git a/tests/baselines/reference/reservedNameOnInterfaceImport.errors.txt b/tests/baselines/reference/reservedNameOnInterfaceImport.errors.txt
new file mode 100644
index 00000000000..1d2b5665a2f
--- /dev/null
+++ b/tests/baselines/reference/reservedNameOnInterfaceImport.errors.txt
@@ -0,0 +1,10 @@
+==== tests/cases/compiler/reservedNameOnInterfaceImport.ts (1 errors) ====
+    declare module test {
+        interface istring { }
+    
+        // Should error; 'test.istring' is a type, so this import conflicts with the 'string' type.
+        import string = test.istring;
+               ~~~~~~
+!!! Import name cannot be 'string'
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/reservedNameOnInterfaceImport.js b/tests/baselines/reference/reservedNameOnInterfaceImport.js
new file mode 100644
index 00000000000..028fe49abca
--- /dev/null
+++ b/tests/baselines/reference/reservedNameOnInterfaceImport.js
@@ -0,0 +1,10 @@
+//// [reservedNameOnInterfaceImport.ts]
+declare module test {
+    interface istring { }
+
+    // Should error; 'test.istring' is a type, so this import conflicts with the 'string' type.
+    import string = test.istring;
+}
+
+
+//// [reservedNameOnInterfaceImport.js]
diff --git a/tests/baselines/reference/reservedNameOnModuleImport.js b/tests/baselines/reference/reservedNameOnModuleImport.js
new file mode 100644
index 00000000000..4024afc4ba1
--- /dev/null
+++ b/tests/baselines/reference/reservedNameOnModuleImport.js
@@ -0,0 +1,10 @@
+//// [reservedNameOnModuleImport.ts]
+declare module test {
+    module mstring { }
+
+    // Should be fine; this does not clobber any declared values.
+    export import string = mstring;
+}
+
+
+//// [reservedNameOnModuleImport.js]
diff --git a/tests/baselines/reference/reservedNameOnModuleImport.types b/tests/baselines/reference/reservedNameOnModuleImport.types
new file mode 100644
index 00000000000..1450c52840f
--- /dev/null
+++ b/tests/baselines/reference/reservedNameOnModuleImport.types
@@ -0,0 +1,13 @@
+=== tests/cases/compiler/reservedNameOnModuleImport.ts ===
+declare module test {
+>test : test
+
+    module mstring { }
+>mstring : mstring
+
+    // Should be fine; this does not clobber any declared values.
+    export import string = mstring;
+>string : string
+>mstring : mstring
+}
+
diff --git a/tests/baselines/reference/reservedNameOnModuleImportWithInterface.errors.txt b/tests/baselines/reference/reservedNameOnModuleImportWithInterface.errors.txt
new file mode 100644
index 00000000000..57ec0f94b91
--- /dev/null
+++ b/tests/baselines/reference/reservedNameOnModuleImportWithInterface.errors.txt
@@ -0,0 +1,11 @@
+==== tests/cases/compiler/reservedNameOnModuleImportWithInterface.ts (1 errors) ====
+    declare module test {
+        interface mi_string { }
+        module mi_string { }
+    
+        // Should error; imports both a type and a module, which means it conflicts with the 'string' type.
+        import string = mi_string;
+               ~~~~~~
+!!! Import name cannot be 'string'
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/reservedNameOnModuleImportWithInterface.js b/tests/baselines/reference/reservedNameOnModuleImportWithInterface.js
new file mode 100644
index 00000000000..c5dc15747e2
--- /dev/null
+++ b/tests/baselines/reference/reservedNameOnModuleImportWithInterface.js
@@ -0,0 +1,11 @@
+//// [reservedNameOnModuleImportWithInterface.ts]
+declare module test {
+    interface mi_string { }
+    module mi_string { }
+
+    // Should error; imports both a type and a module, which means it conflicts with the 'string' type.
+    import string = mi_string;
+}
+
+
+//// [reservedNameOnModuleImportWithInterface.js]
diff --git a/tests/baselines/reference/scannerES3NumericLiteral1.js b/tests/baselines/reference/scannerES3NumericLiteral1.js
new file mode 100644
index 00000000000..62ba5663fc4
--- /dev/null
+++ b/tests/baselines/reference/scannerES3NumericLiteral1.js
@@ -0,0 +1,5 @@
+//// [scannerES3NumericLiteral1.ts]
+0
+
+//// [scannerES3NumericLiteral1.js]
+0;
diff --git a/tests/baselines/reference/scannerES3NumericLiteral1.types b/tests/baselines/reference/scannerES3NumericLiteral1.types
new file mode 100644
index 00000000000..96f7ad835c2
--- /dev/null
+++ b/tests/baselines/reference/scannerES3NumericLiteral1.types
@@ -0,0 +1,3 @@
+=== tests/cases/conformance/scanner/ecmascript3/scannerES3NumericLiteral1.ts ===
+0
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/scannerES3NumericLiteral2.js b/tests/baselines/reference/scannerES3NumericLiteral2.js
new file mode 100644
index 00000000000..ddb237e3006
--- /dev/null
+++ b/tests/baselines/reference/scannerES3NumericLiteral2.js
@@ -0,0 +1,5 @@
+//// [scannerES3NumericLiteral2.ts]
+01
+
+//// [scannerES3NumericLiteral2.js]
+01;
diff --git a/tests/baselines/reference/scannerES3NumericLiteral2.types b/tests/baselines/reference/scannerES3NumericLiteral2.types
new file mode 100644
index 00000000000..d51f3292e5f
--- /dev/null
+++ b/tests/baselines/reference/scannerES3NumericLiteral2.types
@@ -0,0 +1,3 @@
+=== tests/cases/conformance/scanner/ecmascript3/scannerES3NumericLiteral2.ts ===
+01
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/scannerES3NumericLiteral3.errors.txt b/tests/baselines/reference/scannerES3NumericLiteral3.errors.txt
new file mode 100644
index 00000000000..42f7a908a76
--- /dev/null
+++ b/tests/baselines/reference/scannerES3NumericLiteral3.errors.txt
@@ -0,0 +1,4 @@
+==== tests/cases/conformance/scanner/ecmascript3/scannerES3NumericLiteral3.ts (1 errors) ====
+    01.0
+      ~~
+!!! ';' expected.
\ No newline at end of file
diff --git a/tests/baselines/reference/scannerES3NumericLiteral4.errors.txt b/tests/baselines/reference/scannerES3NumericLiteral4.errors.txt
new file mode 100644
index 00000000000..c053fda21b5
--- /dev/null
+++ b/tests/baselines/reference/scannerES3NumericLiteral4.errors.txt
@@ -0,0 +1,4 @@
+==== tests/cases/conformance/scanner/ecmascript3/scannerES3NumericLiteral4.ts (1 errors) ====
+    1e
+      
+!!! Digit expected.
\ No newline at end of file
diff --git a/tests/baselines/reference/scannerES3NumericLiteral5.js b/tests/baselines/reference/scannerES3NumericLiteral5.js
new file mode 100644
index 00000000000..3ef35476d83
--- /dev/null
+++ b/tests/baselines/reference/scannerES3NumericLiteral5.js
@@ -0,0 +1,5 @@
+//// [scannerES3NumericLiteral5.ts]
+1e0
+
+//// [scannerES3NumericLiteral5.js]
+1e0;
diff --git a/tests/baselines/reference/scannerES3NumericLiteral5.types b/tests/baselines/reference/scannerES3NumericLiteral5.types
new file mode 100644
index 00000000000..d147c48a336
--- /dev/null
+++ b/tests/baselines/reference/scannerES3NumericLiteral5.types
@@ -0,0 +1,3 @@
+=== tests/cases/conformance/scanner/ecmascript3/scannerES3NumericLiteral5.ts ===
+1e0
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/scannerES3NumericLiteral6.errors.txt b/tests/baselines/reference/scannerES3NumericLiteral6.errors.txt
new file mode 100644
index 00000000000..0229679f245
--- /dev/null
+++ b/tests/baselines/reference/scannerES3NumericLiteral6.errors.txt
@@ -0,0 +1,4 @@
+==== tests/cases/conformance/scanner/ecmascript3/scannerES3NumericLiteral6.ts (1 errors) ====
+    1e+
+       
+!!! Digit expected.
\ No newline at end of file
diff --git a/tests/baselines/reference/scannerES3NumericLiteral7.js b/tests/baselines/reference/scannerES3NumericLiteral7.js
new file mode 100644
index 00000000000..32987d85a84
--- /dev/null
+++ b/tests/baselines/reference/scannerES3NumericLiteral7.js
@@ -0,0 +1,5 @@
+//// [scannerES3NumericLiteral7.ts]
+1e+0
+
+//// [scannerES3NumericLiteral7.js]
+1e+0;
diff --git a/tests/baselines/reference/scannerES3NumericLiteral7.types b/tests/baselines/reference/scannerES3NumericLiteral7.types
new file mode 100644
index 00000000000..c615dd1ebfa
--- /dev/null
+++ b/tests/baselines/reference/scannerES3NumericLiteral7.types
@@ -0,0 +1,3 @@
+=== tests/cases/conformance/scanner/ecmascript3/scannerES3NumericLiteral7.ts ===
+1e+0
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/scannerNumericLiteral2.errors.txt b/tests/baselines/reference/scannerNumericLiteral2.errors.txt
new file mode 100644
index 00000000000..c9160bffdf2
--- /dev/null
+++ b/tests/baselines/reference/scannerNumericLiteral2.errors.txt
@@ -0,0 +1,4 @@
+==== tests/cases/conformance/scanner/ecmascript5/scannerNumericLiteral2.ts (1 errors) ====
+    01
+    ~~
+!!! Octal literals are not available when targeting ECMAScript 5 and higher.
\ No newline at end of file
diff --git a/tests/baselines/reference/scannerNumericLiteral2.js b/tests/baselines/reference/scannerNumericLiteral2.js
deleted file mode 100644
index 382f1e6e4df..00000000000
--- a/tests/baselines/reference/scannerNumericLiteral2.js
+++ /dev/null
@@ -1,5 +0,0 @@
-//// [scannerNumericLiteral2.ts]
-01
-
-//// [scannerNumericLiteral2.js]
-01;
diff --git a/tests/baselines/reference/scannerNumericLiteral2.types b/tests/baselines/reference/scannerNumericLiteral2.types
deleted file mode 100644
index 57a8b533367..00000000000
--- a/tests/baselines/reference/scannerNumericLiteral2.types
+++ /dev/null
@@ -1,3 +0,0 @@
-=== tests/cases/conformance/scanner/ecmascript5/scannerNumericLiteral2.ts ===
-01
-No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/scannerNumericLiteral3.errors.txt b/tests/baselines/reference/scannerNumericLiteral3.errors.txt
index 6f82581759b..ac751dd9089 100644
--- a/tests/baselines/reference/scannerNumericLiteral3.errors.txt
+++ b/tests/baselines/reference/scannerNumericLiteral3.errors.txt
@@ -1,4 +1,6 @@
-==== tests/cases/conformance/scanner/ecmascript5/scannerNumericLiteral3.ts (1 errors) ====
+==== tests/cases/conformance/scanner/ecmascript5/scannerNumericLiteral3.ts (2 errors) ====
     01.0
+    ~~
+!!! Octal literals are not available when targeting ECMAScript 5 and higher.
       ~~
 !!! ';' expected.
\ No newline at end of file
diff --git a/tests/baselines/reference/scannerNumericLiteral8.errors.txt b/tests/baselines/reference/scannerNumericLiteral8.errors.txt
new file mode 100644
index 00000000000..a55568d91e0
--- /dev/null
+++ b/tests/baselines/reference/scannerNumericLiteral8.errors.txt
@@ -0,0 +1,4 @@
+==== tests/cases/conformance/scanner/ecmascript5/scannerNumericLiteral8.ts (1 errors) ====
+    -03
+     ~~
+!!! Octal literals are not available when targeting ECMAScript 5 and higher.
\ No newline at end of file
diff --git a/tests/baselines/reference/scannerNumericLiteral9.errors.txt b/tests/baselines/reference/scannerNumericLiteral9.errors.txt
new file mode 100644
index 00000000000..610c1c0a5fc
--- /dev/null
+++ b/tests/baselines/reference/scannerNumericLiteral9.errors.txt
@@ -0,0 +1,6 @@
+==== tests/cases/conformance/scanner/ecmascript5/scannerNumericLiteral9.ts (2 errors) ====
+    009
+    ~~
+!!! Octal literals are not available when targeting ECMAScript 5 and higher.
+      ~
+!!! ';' expected.
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMap-SkippedNode.js b/tests/baselines/reference/sourceMap-SkippedNode.js
new file mode 100644
index 00000000000..656b5a244e9
--- /dev/null
+++ b/tests/baselines/reference/sourceMap-SkippedNode.js
@@ -0,0 +1,13 @@
+//// [sourceMap-SkippedNode.ts]
+try {
+// ...
+} finally {
+// N.B. No 'catch' block
+}
+
+//// [sourceMap-SkippedNode.js]
+try {
+}
+finally {
+}
+//# sourceMappingURL=sourceMap-SkippedNode.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMap-SkippedNode.js.map b/tests/baselines/reference/sourceMap-SkippedNode.js.map
new file mode 100644
index 00000000000..cdcdc804634
--- /dev/null
+++ b/tests/baselines/reference/sourceMap-SkippedNode.js.map
@@ -0,0 +1,2 @@
+//// [sourceMap-SkippedNode.js.map]
+{"version":3,"file":"sourceMap-SkippedNode.js","sourceRoot":"","sources":["sourceMap-SkippedNode.ts"],"names":[],"mappings":"AAAA,IAAA,CAAC;AAED,CAAC;QAAC,CAAC;AAEH,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMap-SkippedNode.sourcemap.txt b/tests/baselines/reference/sourceMap-SkippedNode.sourcemap.txt
new file mode 100644
index 00000000000..531a666ade0
--- /dev/null
+++ b/tests/baselines/reference/sourceMap-SkippedNode.sourcemap.txt
@@ -0,0 +1,52 @@
+===================================================================
+JsFile: sourceMap-SkippedNode.js
+mapUrl: sourceMap-SkippedNode.js.map
+sourceRoot: 
+sources: sourceMap-SkippedNode.ts
+===================================================================
+-------------------------------------------------------------------
+emittedFile:tests/cases/compiler/sourceMap-SkippedNode.js
+sourceFile:sourceMap-SkippedNode.ts
+-------------------------------------------------------------------
+>>>try {
+1 >
+2 >^^^^
+3 >    ^
+1 >
+2 >
+3 >    t
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 5) Source(1, 1) + SourceIndex(0)
+3 >Emitted(1, 6) Source(1, 2) + SourceIndex(0)
+---
+>>>}
+1 >
+2 >^
+3 > ^^^^^^^^^->
+1 >ry {
+  >// ...
+  >
+2 >}
+1 >Emitted(2, 1) Source(3, 1) + SourceIndex(0)
+2 >Emitted(2, 2) Source(3, 2) + SourceIndex(0)
+---
+>>>finally {
+1->^^^^^^^^
+2 >        ^
+1-> 
+2 >        f
+1->Emitted(3, 9) Source(3, 3) + SourceIndex(0)
+2 >Emitted(3, 10) Source(3, 4) + SourceIndex(0)
+---
+>>>}
+1 >
+2 >^
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >inally {
+  >// N.B. No 'catch' block
+  >
+2 >}
+1 >Emitted(4, 1) Source(5, 1) + SourceIndex(0)
+2 >Emitted(4, 2) Source(5, 2) + SourceIndex(0)
+---
+>>>//# sourceMappingURL=sourceMap-SkippedNode.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMap-SkippedNode.types b/tests/baselines/reference/sourceMap-SkippedNode.types
new file mode 100644
index 00000000000..4ee6fd4c1d3
--- /dev/null
+++ b/tests/baselines/reference/sourceMap-SkippedNode.types
@@ -0,0 +1,7 @@
+=== tests/cases/compiler/sourceMap-SkippedNode.ts ===
+try {
+No type information for this code.// ...
+No type information for this code.} finally {
+No type information for this code.// N.B. No 'catch' block
+No type information for this code.}
+No type information for this code.
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapValidationClass.errors.txt b/tests/baselines/reference/sourceMapValidationClass.errors.txt
deleted file mode 100644
index df30f19f993..00000000000
--- a/tests/baselines/reference/sourceMapValidationClass.errors.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-==== tests/cases/compiler/sourceMapValidationClass.ts (2 errors) ====
-    class Greeter {
-        constructor(public greeting: string, ...b: string[]) {
-        }
-        greet() {
-            return "<h1>" + this.greeting + "</h1>";
-        }
-        private x: string;
-        private x1: number = 10;
-        private fn() {
-            return this.greeting;
-        }
-        get greetings() {
-            ~~~~~~~~~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
-            return this.greeting;
-        }
-        set greetings(greetings: string) {
-            ~~~~~~~~~
-!!! Accessors are only available when targeting ECMAScript 5 and higher.
-            this.greeting = greetings;
-        }
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapValidationClass.js b/tests/baselines/reference/sourceMapValidationClass.js
new file mode 100644
index 00000000000..eef5a723ebf
--- /dev/null
+++ b/tests/baselines/reference/sourceMapValidationClass.js
@@ -0,0 +1,49 @@
+//// [sourceMapValidationClass.ts]
+class Greeter {
+    constructor(public greeting: string, ...b: string[]) {
+    }
+    greet() {
+        return "<h1>" + this.greeting + "</h1>";
+    }
+    private x: string;
+    private x1: number = 10;
+    private fn() {
+        return this.greeting;
+    }
+    get greetings() {
+        return this.greeting;
+    }
+    set greetings(greetings: string) {
+        this.greeting = greetings;
+    }
+}
+
+//// [sourceMapValidationClass.js]
+var Greeter = (function () {
+    function Greeter(greeting) {
+        var b = [];
+        for (var _i = 1; _i < arguments.length; _i++) {
+            b[_i - 1] = arguments[_i];
+        }
+        this.greeting = greeting;
+        this.x1 = 10;
+    }
+    Greeter.prototype.greet = function () {
+        return "<h1>" + this.greeting + "</h1>";
+    };
+    Greeter.prototype.fn = function () {
+        return this.greeting;
+    };
+    Object.defineProperty(Greeter.prototype, "greetings", {
+        get: function () {
+            return this.greeting;
+        },
+        set: function (greetings) {
+            this.greeting = greetings;
+        },
+        enumerable: true,
+        configurable: true
+    });
+    return Greeter;
+})();
+//# sourceMappingURL=sourceMapValidationClass.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapValidationClass.js.map b/tests/baselines/reference/sourceMapValidationClass.js.map
index e69de29bb2d..661459022b1 100644
--- a/tests/baselines/reference/sourceMapValidationClass.js.map
+++ b/tests/baselines/reference/sourceMapValidationClass.js.map
@@ -0,0 +1,2 @@
+//// [sourceMapValidationClass.js.map]
+{"version":3,"file":"sourceMapValidationClass.js","sourceRoot":"","sources":["sourceMapValidationClass.ts"],"names":["Greeter","Greeter.constructor","Greeter.greet","Greeter.fn","Greeter.greetings"],"mappings":"AAAA,IAAM,OAAO;IACTA,SADEA,OAAOA,CACUA,QAAgBA;QAAEC,WAAcA;aAAdA,WAAcA,CAAdA,sBAAcA,CAAdA,IAAcA;YAAdA,0BAAcA;;QAAhCA,aAAQA,GAARA,QAAQA,CAAQA;QAM3BA,OAAEA,GAAWA,EAAEA,CAACA;IALxBA,CAACA;IACDD,uBAAKA,GAALA;QACIE,MAAMA,CAACA,MAAMA,GAAGA,IAAIA,CAACA,QAAQA,GAAGA,OAAOA,CAACA;IAC5CA,CAACA;IAGOF,oBAAEA,GAAVA;QACIG,MAAMA,CAACA,IAAIA,CAACA,QAAQA,CAACA;IACzBA,CAACA;IACDH,sBAAIA,8BAASA;aAAbA;YACII,MAAMA,CAACA,IAAIA,CAACA,QAAQA,CAACA;QACzBA,CAACA;aACDJ,UAAcA,SAAiBA;YAC3BI,IAAIA,CAACA,QAAQA,GAAGA,SAASA,CAACA;QAC9BA,CAACA;;;OAHAJ;IAILA,cAACA;AAADA,CAACA,AAjBD,IAiBC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapValidationClass.sourcemap.txt b/tests/baselines/reference/sourceMapValidationClass.sourcemap.txt
new file mode 100644
index 00000000000..1c80abde32e
--- /dev/null
+++ b/tests/baselines/reference/sourceMapValidationClass.sourcemap.txt
@@ -0,0 +1,388 @@
+===================================================================
+JsFile: sourceMapValidationClass.js
+mapUrl: sourceMapValidationClass.js.map
+sourceRoot: 
+sources: sourceMapValidationClass.ts
+===================================================================
+-------------------------------------------------------------------
+emittedFile:tests/cases/compiler/sourceMapValidationClass.js
+sourceFile:sourceMapValidationClass.ts
+-------------------------------------------------------------------
+>>>var Greeter = (function () {
+1 >
+2 >^^^^
+3 >    ^^^^^^^
+4 >           ^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+2 >class 
+3 >    Greeter
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 5) Source(1, 7) + SourceIndex(0)
+3 >Emitted(1, 12) Source(1, 14) + SourceIndex(0)
+---
+>>>    function Greeter(greeting) {
+1->^^^^
+2 >    ^^^^^^^^^
+3 >             ^^^^^^^
+4 >                    ^
+5 >                     ^^^^^^^^
+1-> {
+  >    
+2 >    
+3 >             Greeter
+4 >                     {
+  >                        constructor(public 
+5 >                     greeting: string
+1->Emitted(2, 5) Source(2, 5) + SourceIndex(0) name (Greeter)
+2 >Emitted(2, 14) Source(1, 7) + SourceIndex(0) name (Greeter)
+3 >Emitted(2, 21) Source(1, 14) + SourceIndex(0) name (Greeter)
+4 >Emitted(2, 22) Source(2, 24) + SourceIndex(0) name (Greeter)
+5 >Emitted(2, 30) Source(2, 40) + SourceIndex(0) name (Greeter)
+---
+>>>        var b = [];
+1 >^^^^^^^^
+2 >        ^^^^^^^^^^^
+3 >                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >, 
+2 >        ...b: string[]
+1 >Emitted(3, 9) Source(2, 42) + SourceIndex(0) name (Greeter.constructor)
+2 >Emitted(3, 20) Source(2, 56) + SourceIndex(0) name (Greeter.constructor)
+---
+>>>        for (var _i = 1; _i < arguments.length; _i++) {
+1->^^^^^^^^^^^^^
+2 >             ^^^^^^^^^^^
+3 >                        ^
+4 >                         ^^^^^^^^^^^^^^^^^^^^^^
+5 >                                               ^
+6 >                                                ^^^^
+1->
+2 >             ...b: string[]
+3 >                        
+4 >                         ...b: string[]
+5 >                                               
+6 >                                                ...b: string[]
+1->Emitted(4, 14) Source(2, 42) + SourceIndex(0) name (Greeter.constructor)
+2 >Emitted(4, 25) Source(2, 56) + SourceIndex(0) name (Greeter.constructor)
+3 >Emitted(4, 26) Source(2, 42) + SourceIndex(0) name (Greeter.constructor)
+4 >Emitted(4, 48) Source(2, 56) + SourceIndex(0) name (Greeter.constructor)
+5 >Emitted(4, 49) Source(2, 42) + SourceIndex(0) name (Greeter.constructor)
+6 >Emitted(4, 53) Source(2, 56) + SourceIndex(0) name (Greeter.constructor)
+---
+>>>            b[_i - 1] = arguments[_i];
+1 >^^^^^^^^^^^^
+2 >            ^^^^^^^^^^^^^^^^^^^^^^^^^^
+1 >
+2 >            ...b: string[]
+1 >Emitted(5, 13) Source(2, 42) + SourceIndex(0) name (Greeter.constructor)
+2 >Emitted(5, 39) Source(2, 56) + SourceIndex(0) name (Greeter.constructor)
+---
+>>>        }
+>>>        this.greeting = greeting;
+1 >^^^^^^^^
+2 >        ^^^^^^^^^^^^^
+3 >                     ^^^
+4 >                        ^^^^^^^^
+5 >                                ^
+1 >
+2 >        greeting
+3 >                     
+4 >                        greeting
+5 >                                : string
+1 >Emitted(7, 9) Source(2, 24) + SourceIndex(0) name (Greeter.constructor)
+2 >Emitted(7, 22) Source(2, 32) + SourceIndex(0) name (Greeter.constructor)
+3 >Emitted(7, 25) Source(2, 24) + SourceIndex(0) name (Greeter.constructor)
+4 >Emitted(7, 33) Source(2, 32) + SourceIndex(0) name (Greeter.constructor)
+5 >Emitted(7, 34) Source(2, 40) + SourceIndex(0) name (Greeter.constructor)
+---
+>>>        this.x1 = 10;
+1 >^^^^^^^^
+2 >        ^^^^^^^
+3 >               ^^^
+4 >                  ^^
+5 >                    ^
+1 >, ...b: string[]) {
+  >    }
+  >    greet() {
+  >        return "<h1>" + this.greeting + "</h1>";
+  >    }
+  >    private x: string;
+  >    private 
+2 >        x1
+3 >               : number = 
+4 >                  10
+5 >                    ;
+1 >Emitted(8, 9) Source(8, 13) + SourceIndex(0) name (Greeter.constructor)
+2 >Emitted(8, 16) Source(8, 15) + SourceIndex(0) name (Greeter.constructor)
+3 >Emitted(8, 19) Source(8, 26) + SourceIndex(0) name (Greeter.constructor)
+4 >Emitted(8, 21) Source(8, 28) + SourceIndex(0) name (Greeter.constructor)
+5 >Emitted(8, 22) Source(8, 29) + SourceIndex(0) name (Greeter.constructor)
+---
+>>>    }
+1 >^^^^
+2 >    ^
+3 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+2 >    }
+1 >Emitted(9, 5) Source(3, 5) + SourceIndex(0) name (Greeter.constructor)
+2 >Emitted(9, 6) Source(3, 6) + SourceIndex(0) name (Greeter.constructor)
+---
+>>>    Greeter.prototype.greet = function () {
+1->^^^^
+2 >    ^^^^^^^^^^^^^^^^^^^^^^^
+3 >                           ^^^
+4 >                              ^^^^^^^^^^^^^^^^^^^->
+1->
+  >    
+2 >    greet
+3 >                           
+1->Emitted(10, 5) Source(4, 5) + SourceIndex(0) name (Greeter)
+2 >Emitted(10, 28) Source(4, 10) + SourceIndex(0) name (Greeter)
+3 >Emitted(10, 31) Source(4, 5) + SourceIndex(0) name (Greeter)
+---
+>>>        return "<h1>" + this.greeting + "</h1>";
+1->^^^^^^^^
+2 >        ^^^^^^
+3 >              ^
+4 >               ^^^^^^
+5 >                     ^^^
+6 >                        ^^^^
+7 >                            ^
+8 >                             ^^^^^^^^
+9 >                                     ^^^
+10>                                        ^^^^^^^
+11>                                               ^
+1->greet() {
+  >        
+2 >        return
+3 >               
+4 >               "<h1>"
+5 >                      + 
+6 >                        this
+7 >                            .
+8 >                             greeting
+9 >                                      + 
+10>                                        "</h1>"
+11>                                               ;
+1->Emitted(11, 9) Source(5, 9) + SourceIndex(0) name (Greeter.greet)
+2 >Emitted(11, 15) Source(5, 15) + SourceIndex(0) name (Greeter.greet)
+3 >Emitted(11, 16) Source(5, 16) + SourceIndex(0) name (Greeter.greet)
+4 >Emitted(11, 22) Source(5, 22) + SourceIndex(0) name (Greeter.greet)
+5 >Emitted(11, 25) Source(5, 25) + SourceIndex(0) name (Greeter.greet)
+6 >Emitted(11, 29) Source(5, 29) + SourceIndex(0) name (Greeter.greet)
+7 >Emitted(11, 30) Source(5, 30) + SourceIndex(0) name (Greeter.greet)
+8 >Emitted(11, 38) Source(5, 38) + SourceIndex(0) name (Greeter.greet)
+9 >Emitted(11, 41) Source(5, 41) + SourceIndex(0) name (Greeter.greet)
+10>Emitted(11, 48) Source(5, 48) + SourceIndex(0) name (Greeter.greet)
+11>Emitted(11, 49) Source(5, 49) + SourceIndex(0) name (Greeter.greet)
+---
+>>>    };
+1 >^^^^
+2 >    ^
+3 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+  >    
+2 >    }
+1 >Emitted(12, 5) Source(6, 5) + SourceIndex(0) name (Greeter.greet)
+2 >Emitted(12, 6) Source(6, 6) + SourceIndex(0) name (Greeter.greet)
+---
+>>>    Greeter.prototype.fn = function () {
+1->^^^^
+2 >    ^^^^^^^^^^^^^^^^^^^^
+3 >                        ^^^
+4 >                           ^^^->
+1->
+  >    private x: string;
+  >    private x1: number = 10;
+  >    private 
+2 >    fn
+3 >                        
+1->Emitted(13, 5) Source(9, 13) + SourceIndex(0) name (Greeter)
+2 >Emitted(13, 25) Source(9, 15) + SourceIndex(0) name (Greeter)
+3 >Emitted(13, 28) Source(9, 5) + SourceIndex(0) name (Greeter)
+---
+>>>        return this.greeting;
+1->^^^^^^^^
+2 >        ^^^^^^
+3 >              ^
+4 >               ^^^^
+5 >                   ^
+6 >                    ^^^^^^^^
+7 >                            ^
+1->private fn() {
+  >        
+2 >        return
+3 >               
+4 >               this
+5 >                   .
+6 >                    greeting
+7 >                            ;
+1->Emitted(14, 9) Source(10, 9) + SourceIndex(0) name (Greeter.fn)
+2 >Emitted(14, 15) Source(10, 15) + SourceIndex(0) name (Greeter.fn)
+3 >Emitted(14, 16) Source(10, 16) + SourceIndex(0) name (Greeter.fn)
+4 >Emitted(14, 20) Source(10, 20) + SourceIndex(0) name (Greeter.fn)
+5 >Emitted(14, 21) Source(10, 21) + SourceIndex(0) name (Greeter.fn)
+6 >Emitted(14, 29) Source(10, 29) + SourceIndex(0) name (Greeter.fn)
+7 >Emitted(14, 30) Source(10, 30) + SourceIndex(0) name (Greeter.fn)
+---
+>>>    };
+1 >^^^^
+2 >    ^
+3 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+  >    
+2 >    }
+1 >Emitted(15, 5) Source(11, 5) + SourceIndex(0) name (Greeter.fn)
+2 >Emitted(15, 6) Source(11, 6) + SourceIndex(0) name (Greeter.fn)
+---
+>>>    Object.defineProperty(Greeter.prototype, "greetings", {
+1->^^^^
+2 >    ^^^^^^^^^^^^^^^^^^^^^^
+3 >                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1->
+  >    
+2 >    get 
+3 >                          greetings
+1->Emitted(16, 5) Source(12, 5) + SourceIndex(0) name (Greeter)
+2 >Emitted(16, 27) Source(12, 9) + SourceIndex(0) name (Greeter)
+3 >Emitted(16, 57) Source(12, 18) + SourceIndex(0) name (Greeter)
+---
+>>>        get: function () {
+1 >^^^^^^^^^^^^^
+2 >             ^^^^^^^^^^^^^^^^^^^^^->
+1 >
+1 >Emitted(17, 14) Source(12, 5) + SourceIndex(0) name (Greeter)
+---
+>>>            return this.greeting;
+1->^^^^^^^^^^^^
+2 >            ^^^^^^
+3 >                  ^
+4 >                   ^^^^
+5 >                       ^
+6 >                        ^^^^^^^^
+7 >                                ^
+1->get greetings() {
+  >        
+2 >            return
+3 >                   
+4 >                   this
+5 >                       .
+6 >                        greeting
+7 >                                ;
+1->Emitted(18, 13) Source(13, 9) + SourceIndex(0) name (Greeter.greetings)
+2 >Emitted(18, 19) Source(13, 15) + SourceIndex(0) name (Greeter.greetings)
+3 >Emitted(18, 20) Source(13, 16) + SourceIndex(0) name (Greeter.greetings)
+4 >Emitted(18, 24) Source(13, 20) + SourceIndex(0) name (Greeter.greetings)
+5 >Emitted(18, 25) Source(13, 21) + SourceIndex(0) name (Greeter.greetings)
+6 >Emitted(18, 33) Source(13, 29) + SourceIndex(0) name (Greeter.greetings)
+7 >Emitted(18, 34) Source(13, 30) + SourceIndex(0) name (Greeter.greetings)
+---
+>>>        },
+1 >^^^^^^^^
+2 >        ^
+3 >         ^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+  >    
+2 >        }
+1 >Emitted(19, 9) Source(14, 5) + SourceIndex(0) name (Greeter.greetings)
+2 >Emitted(19, 10) Source(14, 6) + SourceIndex(0) name (Greeter.greetings)
+---
+>>>        set: function (greetings) {
+1->^^^^^^^^^^^^^
+2 >             ^^^^^^^^^^
+3 >                       ^^^^^^^^^
+4 >                                ^^^^^^^->
+1->
+  >    
+2 >             set greetings(
+3 >                       greetings: string
+1->Emitted(20, 14) Source(15, 5) + SourceIndex(0) name (Greeter)
+2 >Emitted(20, 24) Source(15, 19) + SourceIndex(0) name (Greeter)
+3 >Emitted(20, 33) Source(15, 36) + SourceIndex(0) name (Greeter)
+---
+>>>            this.greeting = greetings;
+1->^^^^^^^^^^^^
+2 >            ^^^^
+3 >                ^
+4 >                 ^^^^^^^^
+5 >                         ^^^
+6 >                            ^^^^^^^^^
+7 >                                     ^
+1->) {
+  >        
+2 >            this
+3 >                .
+4 >                 greeting
+5 >                          = 
+6 >                            greetings
+7 >                                     ;
+1->Emitted(21, 13) Source(16, 9) + SourceIndex(0) name (Greeter.greetings)
+2 >Emitted(21, 17) Source(16, 13) + SourceIndex(0) name (Greeter.greetings)
+3 >Emitted(21, 18) Source(16, 14) + SourceIndex(0) name (Greeter.greetings)
+4 >Emitted(21, 26) Source(16, 22) + SourceIndex(0) name (Greeter.greetings)
+5 >Emitted(21, 29) Source(16, 25) + SourceIndex(0) name (Greeter.greetings)
+6 >Emitted(21, 38) Source(16, 34) + SourceIndex(0) name (Greeter.greetings)
+7 >Emitted(21, 39) Source(16, 35) + SourceIndex(0) name (Greeter.greetings)
+---
+>>>        },
+1 >^^^^^^^^
+2 >        ^
+3 >         ^^^^^^^^^^^^^^^^^->
+1 >
+  >    
+2 >        }
+1 >Emitted(22, 9) Source(17, 5) + SourceIndex(0) name (Greeter.greetings)
+2 >Emitted(22, 10) Source(17, 6) + SourceIndex(0) name (Greeter.greetings)
+---
+>>>        enumerable: true,
+>>>        configurable: true
+>>>    });
+1->^^^^^^^
+2 >       ^^^^^^^^^^^^^->
+1->
+1->Emitted(25, 8) Source(14, 6) + SourceIndex(0) name (Greeter)
+---
+>>>    return Greeter;
+1->^^^^
+2 >    ^^^^^^^^^^^^^^
+1->
+  >    set greetings(greetings: string) {
+  >        this.greeting = greetings;
+  >    }
+  >
+2 >    }
+1->Emitted(26, 5) Source(18, 1) + SourceIndex(0) name (Greeter)
+2 >Emitted(26, 19) Source(18, 2) + SourceIndex(0) name (Greeter)
+---
+>>>})();
+1 >
+2 >^
+3 > 
+4 > ^^^^
+5 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+2 >}
+3 > 
+4 > class Greeter {
+  >     constructor(public greeting: string, ...b: string[]) {
+  >     }
+  >     greet() {
+  >         return "<h1>" + this.greeting + "</h1>";
+  >     }
+  >     private x: string;
+  >     private x1: number = 10;
+  >     private fn() {
+  >         return this.greeting;
+  >     }
+  >     get greetings() {
+  >         return this.greeting;
+  >     }
+  >     set greetings(greetings: string) {
+  >         this.greeting = greetings;
+  >     }
+  > }
+1 >Emitted(27, 1) Source(18, 1) + SourceIndex(0) name (Greeter)
+2 >Emitted(27, 2) Source(18, 2) + SourceIndex(0) name (Greeter)
+3 >Emitted(27, 2) Source(1, 1) + SourceIndex(0)
+4 >Emitted(27, 6) Source(18, 2) + SourceIndex(0)
+---
+>>>//# sourceMappingURL=sourceMapValidationClass.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapValidationClass.types b/tests/baselines/reference/sourceMapValidationClass.types
new file mode 100644
index 00000000000..1e10c244da3
--- /dev/null
+++ b/tests/baselines/reference/sourceMapValidationClass.types
@@ -0,0 +1,52 @@
+=== tests/cases/compiler/sourceMapValidationClass.ts ===
+class Greeter {
+>Greeter : Greeter
+
+    constructor(public greeting: string, ...b: string[]) {
+>greeting : string
+>b : string[]
+    }
+    greet() {
+>greet : () => string
+
+        return "<h1>" + this.greeting + "</h1>";
+>"<h1>" + this.greeting + "</h1>" : string
+>"<h1>" + this.greeting : string
+>this.greeting : string
+>this : Greeter
+>greeting : string
+    }
+    private x: string;
+>x : string
+
+    private x1: number = 10;
+>x1 : number
+
+    private fn() {
+>fn : () => string
+
+        return this.greeting;
+>this.greeting : string
+>this : Greeter
+>greeting : string
+    }
+    get greetings() {
+>greetings : string
+
+        return this.greeting;
+>this.greeting : string
+>this : Greeter
+>greeting : string
+    }
+    set greetings(greetings: string) {
+>greetings : string
+>greetings : string
+
+        this.greeting = greetings;
+>this.greeting = greetings : string
+>this.greeting : string
+>this : Greeter
+>greeting : string
+>greetings : string
+    }
+}
diff --git a/tests/baselines/reference/sourceMapValidationExportAssignmentCommonjs.js b/tests/baselines/reference/sourceMapValidationExportAssignmentCommonjs.js
new file mode 100644
index 00000000000..0a0b3feda5f
--- /dev/null
+++ b/tests/baselines/reference/sourceMapValidationExportAssignmentCommonjs.js
@@ -0,0 +1,14 @@
+//// [sourceMapValidationExportAssignmentCommonjs.ts]
+class a {
+    public c;
+}
+export = a;
+
+//// [sourceMapValidationExportAssignmentCommonjs.js]
+var a = (function () {
+    function a() {
+    }
+    return a;
+})();
+module.exports = a;
+//# sourceMappingURL=sourceMapValidationExportAssignmentCommonjs.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapValidationExportAssignmentCommonjs.js.map b/tests/baselines/reference/sourceMapValidationExportAssignmentCommonjs.js.map
new file mode 100644
index 00000000000..18e89d37465
--- /dev/null
+++ b/tests/baselines/reference/sourceMapValidationExportAssignmentCommonjs.js.map
@@ -0,0 +1,2 @@
+//// [sourceMapValidationExportAssignmentCommonjs.js.map]
+{"version":3,"file":"sourceMapValidationExportAssignmentCommonjs.js","sourceRoot":"","sources":["sourceMapValidationExportAssignmentCommonjs.ts"],"names":["a","a.constructor"],"mappings":"AAAA,IAAM,CAAC;IAAPA,SAAMA,CAACA;IAEPC,CAACA;IAADD,QAACA;AAADA,CAACA,AAFD,IAEC;AACU,AAAX,iBAAS,CAAC,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapValidationExportAssignmentCommonjs.sourcemap.txt b/tests/baselines/reference/sourceMapValidationExportAssignmentCommonjs.sourcemap.txt
new file mode 100644
index 00000000000..308e29c37a5
--- /dev/null
+++ b/tests/baselines/reference/sourceMapValidationExportAssignmentCommonjs.sourcemap.txt
@@ -0,0 +1,89 @@
+===================================================================
+JsFile: sourceMapValidationExportAssignmentCommonjs.js
+mapUrl: sourceMapValidationExportAssignmentCommonjs.js.map
+sourceRoot: 
+sources: sourceMapValidationExportAssignmentCommonjs.ts
+===================================================================
+-------------------------------------------------------------------
+emittedFile:tests/cases/compiler/sourceMapValidationExportAssignmentCommonjs.js
+sourceFile:sourceMapValidationExportAssignmentCommonjs.ts
+-------------------------------------------------------------------
+>>>var a = (function () {
+1 >
+2 >^^^^
+3 >    ^
+4 >     ^^^^^^^^^^^^^^->
+1 >
+2 >class 
+3 >    a
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 5) Source(1, 7) + SourceIndex(0)
+3 >Emitted(1, 6) Source(1, 8) + SourceIndex(0)
+---
+>>>    function a() {
+1->^^^^
+2 >    ^^^^^^^^^
+3 >             ^
+1->
+2 >    class 
+3 >             a
+1->Emitted(2, 5) Source(1, 1) + SourceIndex(0) name (a)
+2 >Emitted(2, 14) Source(1, 7) + SourceIndex(0) name (a)
+3 >Emitted(2, 15) Source(1, 8) + SourceIndex(0) name (a)
+---
+>>>    }
+1 >^^^^
+2 >    ^
+3 >     ^^^^^^^^^->
+1 > {
+  >    public c;
+  >
+2 >    }
+1 >Emitted(3, 5) Source(3, 1) + SourceIndex(0) name (a.constructor)
+2 >Emitted(3, 6) Source(3, 2) + SourceIndex(0) name (a.constructor)
+---
+>>>    return a;
+1->^^^^
+2 >    ^^^^^^^^
+1->
+2 >    }
+1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (a)
+2 >Emitted(4, 13) Source(3, 2) + SourceIndex(0) name (a)
+---
+>>>})();
+1 >
+2 >^
+3 > 
+4 > ^^^^
+5 >     ^^^^^^^^^^^^^^^->
+1 >
+2 >}
+3 > 
+4 > class a {
+  >     public c;
+  > }
+1 >Emitted(5, 1) Source(3, 1) + SourceIndex(0) name (a)
+2 >Emitted(5, 2) Source(3, 2) + SourceIndex(0) name (a)
+3 >Emitted(5, 2) Source(1, 1) + SourceIndex(0)
+4 >Emitted(5, 6) Source(3, 2) + SourceIndex(0)
+---
+>>>module.exports = a;
+1->
+2 >
+3 >^^^^^^^^^^^^^^^^^
+4 >                 ^
+5 >                  ^
+6 >                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1->
+  >export = a;
+2 >
+3 >export = 
+4 >                 a
+5 >                  ;
+1->Emitted(6, 1) Source(4, 12) + SourceIndex(0)
+2 >Emitted(6, 1) Source(4, 1) + SourceIndex(0)
+3 >Emitted(6, 18) Source(4, 10) + SourceIndex(0)
+4 >Emitted(6, 19) Source(4, 11) + SourceIndex(0)
+5 >Emitted(6, 20) Source(4, 12) + SourceIndex(0)
+---
+>>>//# sourceMappingURL=sourceMapValidationExportAssignmentCommonjs.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapValidationExportAssignmentCommonjs.types b/tests/baselines/reference/sourceMapValidationExportAssignmentCommonjs.types
new file mode 100644
index 00000000000..6a4e97bdbf3
--- /dev/null
+++ b/tests/baselines/reference/sourceMapValidationExportAssignmentCommonjs.types
@@ -0,0 +1,10 @@
+=== tests/cases/compiler/sourceMapValidationExportAssignmentCommonjs.ts ===
+class a {
+>a : a
+
+    public c;
+>c : any
+}
+export = a;
+>a : a
+
diff --git a/tests/baselines/reference/sourceMapWithMultipleFilesWithCopyright.js b/tests/baselines/reference/sourceMapWithMultipleFilesWithCopyright.js
new file mode 100644
index 00000000000..189dd306ce5
--- /dev/null
+++ b/tests/baselines/reference/sourceMapWithMultipleFilesWithCopyright.js
@@ -0,0 +1,44 @@
+//// [tests/cases/compiler/sourceMapWithMultipleFilesWithCopyright.ts] ////
+
+//// [a.ts]
+/*--------------------------------------------------------------------------
+Copyright 
+---------------------------------------------------------------------------*/
+
+var x = {
+    a: 10,
+    b: 20
+};
+
+//// [b.ts]
+/*--------------------------------------------------------------------------
+Copyright 
+---------------------------------------------------------------------------*/
+
+///<reference path="a.ts"/>
+var y = x;
+
+//// [a.js]
+/*--------------------------------------------------------------------------
+Copyright
+---------------------------------------------------------------------------*/
+var x = {
+    a: 10,
+    b: 20
+};
+/*--------------------------------------------------------------------------
+Copyright
+---------------------------------------------------------------------------*/
+///<reference path="a.ts"/>
+var y = x;
+//# sourceMappingURL=a.js.map
+
+//// [a.d.ts]
+declare var x: {
+    a: number;
+    b: number;
+};
+declare var y: {
+    a: number;
+    b: number;
+};
diff --git a/tests/baselines/reference/sourceMapWithMultipleFilesWithCopyright.js.map b/tests/baselines/reference/sourceMapWithMultipleFilesWithCopyright.js.map
new file mode 100644
index 00000000000..59e28d92f90
--- /dev/null
+++ b/tests/baselines/reference/sourceMapWithMultipleFilesWithCopyright.js.map
@@ -0,0 +1,2 @@
+//// [a.js.map]
+{"version":3,"file":"a.js","sourceRoot":"","sources":["tests/cases/compiler/a.ts","tests/cases/compiler/b.ts"],"names":[],"mappings":"AAAA;;6EAE6E;AAE7E,IAAI,CAAC,GAAG;IACJ,CAAC,EAAE,EAAE;IACL,CAAC,EAAE,EAAE;CACR,CAAC;ACPF;;6EAE6E;AAG7E,AADA,2BAA2B;IACvB,CAAC,GAAG,CAAC,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapWithMultipleFilesWithCopyright.sourcemap.txt b/tests/baselines/reference/sourceMapWithMultipleFilesWithCopyright.sourcemap.txt
new file mode 100644
index 00000000000..5a87f6c04e8
--- /dev/null
+++ b/tests/baselines/reference/sourceMapWithMultipleFilesWithCopyright.sourcemap.txt
@@ -0,0 +1,134 @@
+===================================================================
+JsFile: a.js
+mapUrl: a.js.map
+sourceRoot: 
+sources: tests/cases/compiler/a.ts,tests/cases/compiler/b.ts
+===================================================================
+-------------------------------------------------------------------
+emittedFile:a.js
+sourceFile:tests/cases/compiler/a.ts
+-------------------------------------------------------------------
+>>>/*--------------------------------------------------------------------------
+1 >
+2 >^^^^^^^^^^->
+1 >
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+---
+>>>Copyright
+>>>---------------------------------------------------------------------------*/
+1->^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1->/*--------------------------------------------------------------------------
+  >Copyright 
+  >---------------------------------------------------------------------------*/
+1->Emitted(3, 78) Source(3, 78) + SourceIndex(0)
+---
+>>>var x = {
+1 >
+2 >^^^^
+3 >    ^
+4 >     ^^^
+5 >        ^^^->
+1 >
+  >
+  >
+2 >var 
+3 >    x
+4 >      = 
+1 >Emitted(4, 1) Source(5, 1) + SourceIndex(0)
+2 >Emitted(4, 5) Source(5, 5) + SourceIndex(0)
+3 >Emitted(4, 6) Source(5, 6) + SourceIndex(0)
+4 >Emitted(4, 9) Source(5, 9) + SourceIndex(0)
+---
+>>>    a: 10,
+1->^^^^
+2 >    ^
+3 >     ^^
+4 >       ^^
+5 >         ^->
+1->{
+  >    
+2 >    a
+3 >     : 
+4 >       10
+1->Emitted(5, 5) Source(6, 5) + SourceIndex(0)
+2 >Emitted(5, 6) Source(6, 6) + SourceIndex(0)
+3 >Emitted(5, 8) Source(6, 8) + SourceIndex(0)
+4 >Emitted(5, 10) Source(6, 10) + SourceIndex(0)
+---
+>>>    b: 20
+1->^^^^
+2 >    ^
+3 >     ^^
+4 >       ^^
+1->,
+  >    
+2 >    b
+3 >     : 
+4 >       20
+1->Emitted(6, 5) Source(7, 5) + SourceIndex(0)
+2 >Emitted(6, 6) Source(7, 6) + SourceIndex(0)
+3 >Emitted(6, 8) Source(7, 8) + SourceIndex(0)
+4 >Emitted(6, 10) Source(7, 10) + SourceIndex(0)
+---
+>>>};
+1 >^
+2 > ^
+3 >  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+1 >
+  >}
+2 > ;
+1 >Emitted(7, 2) Source(8, 2) + SourceIndex(0)
+2 >Emitted(7, 3) Source(8, 3) + SourceIndex(0)
+---
+-------------------------------------------------------------------
+emittedFile:a.js
+sourceFile:tests/cases/compiler/b.ts
+-------------------------------------------------------------------
+>>>/*--------------------------------------------------------------------------
+1->
+2 >^^^^^^^^^^->
+1->
+1->Emitted(8, 1) Source(1, 1) + SourceIndex(1)
+---
+>>>Copyright
+>>>---------------------------------------------------------------------------*/
+1->^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1->/*--------------------------------------------------------------------------
+  >Copyright 
+  >---------------------------------------------------------------------------*/
+1->Emitted(10, 78) Source(3, 78) + SourceIndex(1)
+---
+>>>///<reference path="a.ts"/>
+1 >
+2 >
+3 >^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1 >
+  >
+  >///<reference path="a.ts"/>
+  >
+2 >
+3 >///<reference path="a.ts"/>
+1 >Emitted(11, 1) Source(6, 1) + SourceIndex(1)
+2 >Emitted(11, 1) Source(5, 1) + SourceIndex(1)
+3 >Emitted(11, 28) Source(5, 28) + SourceIndex(1)
+---
+>>>var y = x;
+1 >^^^^
+2 >    ^
+3 >     ^^^
+4 >        ^
+5 >         ^
+6 >          ^^^^^^^^^^^^^^^^^^->
+1 >
+  >var 
+2 >    y
+3 >      = 
+4 >        x
+5 >         ;
+1 >Emitted(12, 5) Source(6, 5) + SourceIndex(1)
+2 >Emitted(12, 6) Source(6, 6) + SourceIndex(1)
+3 >Emitted(12, 9) Source(6, 9) + SourceIndex(1)
+4 >Emitted(12, 10) Source(6, 10) + SourceIndex(1)
+5 >Emitted(12, 11) Source(6, 11) + SourceIndex(1)
+---
+>>>//# sourceMappingURL=a.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapWithMultipleFilesWithCopyright.types b/tests/baselines/reference/sourceMapWithMultipleFilesWithCopyright.types
new file mode 100644
index 00000000000..d72fd90b0c6
--- /dev/null
+++ b/tests/baselines/reference/sourceMapWithMultipleFilesWithCopyright.types
@@ -0,0 +1,27 @@
+=== tests/cases/compiler/b.ts ===
+/*--------------------------------------------------------------------------
+Copyright 
+---------------------------------------------------------------------------*/
+
+///<reference path="a.ts"/>
+var y = x;
+>y : { a: number; b: number; }
+>x : { a: number; b: number; }
+
+=== tests/cases/compiler/a.ts ===
+/*--------------------------------------------------------------------------
+Copyright 
+---------------------------------------------------------------------------*/
+
+var x = {
+>x : { a: number; b: number; }
+>{    a: 10,    b: 20} : { a: number; b: number; }
+
+    a: 10,
+>a : number
+
+    b: 20
+>b : number
+
+};
+
diff --git a/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.js b/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.js
new file mode 100644
index 00000000000..81f627ebedc
--- /dev/null
+++ b/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.js
@@ -0,0 +1,34 @@
+//// [tests/cases/compiler/sourceMapWithMultipleFilesWithFileEndingWithInterface.ts] ////
+
+//// [a.ts]
+module M {
+    export var X = 1;
+}
+interface Navigator {
+    getGamepads(func?: any): any;
+    webkitGetGamepads(func?: any): any
+    msGetGamepads(func?: any): any;
+    webkitGamepads(func?: any): any;
+}
+
+//// [b.ts]
+module m1 {
+    export class c1 {
+    }
+}
+
+//// [fooResult.js]
+var M;
+(function (M) {
+    M.X = 1;
+})(M || (M = {}));
+var m1;
+(function (m1) {
+    var c1 = (function () {
+        function c1() {
+        }
+        return c1;
+    })();
+    m1.c1 = c1;
+})(m1 || (m1 = {}));
+//# sourceMappingURL=fooResult.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.js.map b/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.js.map
new file mode 100644
index 00000000000..1142b4313a7
--- /dev/null
+++ b/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.js.map
@@ -0,0 +1,2 @@
+//// [fooResult.js.map]
+{"version":3,"file":"fooResult.js","sourceRoot":"","sources":["tests/cases/compiler/a.ts","tests/cases/compiler/b.ts"],"names":["M","m1","m1.c1","m1.c1.constructor"],"mappings":"AAAA,IAAO,CAAC,CAEP;AAFD,WAAO,CAAC,EAAC,CAAC;IACKA,GAACA,GAAGA,CAACA,CAACA;AACrBA,CAACA,EAFM,CAAC,KAAD,CAAC,QAEP;ACFD,IAAO,EAAE,CAGR;AAHD,WAAO,EAAE,EAAC,CAAC;IACPC,IAAaA,EAAEA;QAAfC,SAAaA,EAAEA;QACfC,CAACA;QAADD,SAACA;IAADA,CAACA,AADDD,IACCA;IADYA,KAAEA,GAAFA,EACZA,CAAAA;AACLA,CAACA,EAHM,EAAE,KAAF,EAAE,QAGR"}
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.sourcemap.txt b/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.sourcemap.txt
new file mode 100644
index 00000000000..e58ed879c6f
--- /dev/null
+++ b/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.sourcemap.txt
@@ -0,0 +1,235 @@
+===================================================================
+JsFile: fooResult.js
+mapUrl: fooResult.js.map
+sourceRoot: 
+sources: tests/cases/compiler/a.ts,tests/cases/compiler/b.ts
+===================================================================
+-------------------------------------------------------------------
+emittedFile:fooResult.js
+sourceFile:tests/cases/compiler/a.ts
+-------------------------------------------------------------------
+>>>var M;
+1 >
+2 >^^^^
+3 >    ^
+4 >     ^
+5 >      ^^^^^^^^^^->
+1 >
+2 >module 
+3 >    M
+4 >      {
+  >         export var X = 1;
+  >     }
+1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(1, 5) Source(1, 8) + SourceIndex(0)
+3 >Emitted(1, 6) Source(1, 9) + SourceIndex(0)
+4 >Emitted(1, 7) Source(3, 2) + SourceIndex(0)
+---
+>>>(function (M) {
+1->
+2 >^^^^^^^^^^^
+3 >           ^
+4 >            ^^
+5 >              ^
+1->
+2 >module 
+3 >           M
+4 >             
+5 >              {
+1->Emitted(2, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(2, 12) Source(1, 8) + SourceIndex(0)
+3 >Emitted(2, 13) Source(1, 9) + SourceIndex(0)
+4 >Emitted(2, 15) Source(1, 10) + SourceIndex(0)
+5 >Emitted(2, 16) Source(1, 11) + SourceIndex(0)
+---
+>>>    M.X = 1;
+1 >^^^^
+2 >    ^^^
+3 >       ^^^
+4 >          ^
+5 >           ^
+6 >            ^^^^^^^->
+1 >
+  >    export var 
+2 >    X
+3 >        = 
+4 >          1
+5 >           ;
+1 >Emitted(3, 5) Source(2, 16) + SourceIndex(0) name (M)
+2 >Emitted(3, 8) Source(2, 17) + SourceIndex(0) name (M)
+3 >Emitted(3, 11) Source(2, 20) + SourceIndex(0) name (M)
+4 >Emitted(3, 12) Source(2, 21) + SourceIndex(0) name (M)
+5 >Emitted(3, 13) Source(2, 22) + SourceIndex(0) name (M)
+---
+>>>})(M || (M = {}));
+1->
+2 >^
+3 > ^^
+4 >   ^
+5 >    ^^^^^
+6 >         ^
+7 >          ^^^^^^^^
+1->
+  >
+2 >}
+3 > 
+4 >   M
+5 >    
+6 >         M
+7 >           {
+  >              export var X = 1;
+  >          }
+1->Emitted(4, 1) Source(3, 1) + SourceIndex(0) name (M)
+2 >Emitted(4, 2) Source(3, 2) + SourceIndex(0) name (M)
+3 >Emitted(4, 4) Source(1, 8) + SourceIndex(0)
+4 >Emitted(4, 5) Source(1, 9) + SourceIndex(0)
+5 >Emitted(4, 10) Source(1, 8) + SourceIndex(0)
+6 >Emitted(4, 11) Source(1, 9) + SourceIndex(0)
+7 >Emitted(4, 19) Source(3, 2) + SourceIndex(0)
+---
+-------------------------------------------------------------------
+emittedFile:fooResult.js
+sourceFile:tests/cases/compiler/b.ts
+-------------------------------------------------------------------
+>>>var m1;
+1 >
+2 >^^^^
+3 >    ^^
+4 >      ^
+5 >       ^^^^^^^^^^->
+1 >
+2 >module 
+3 >    m1
+4 >       {
+  >          export class c1 {
+  >          }
+  >      }
+1 >Emitted(5, 1) Source(1, 1) + SourceIndex(1)
+2 >Emitted(5, 5) Source(1, 8) + SourceIndex(1)
+3 >Emitted(5, 7) Source(1, 10) + SourceIndex(1)
+4 >Emitted(5, 8) Source(4, 2) + SourceIndex(1)
+---
+>>>(function (m1) {
+1->
+2 >^^^^^^^^^^^
+3 >           ^^
+4 >             ^^
+5 >               ^
+6 >                ^^^^^^^^^^^^->
+1->
+2 >module 
+3 >           m1
+4 >              
+5 >               {
+1->Emitted(6, 1) Source(1, 1) + SourceIndex(1)
+2 >Emitted(6, 12) Source(1, 8) + SourceIndex(1)
+3 >Emitted(6, 14) Source(1, 10) + SourceIndex(1)
+4 >Emitted(6, 16) Source(1, 11) + SourceIndex(1)
+5 >Emitted(6, 17) Source(1, 12) + SourceIndex(1)
+---
+>>>    var c1 = (function () {
+1->^^^^
+2 >    ^^^^
+3 >        ^^
+4 >          ^^^^^^^^^^^^^^->
+1->
+  >    
+2 >    export class 
+3 >        c1
+1->Emitted(7, 5) Source(2, 5) + SourceIndex(1) name (m1)
+2 >Emitted(7, 9) Source(2, 18) + SourceIndex(1) name (m1)
+3 >Emitted(7, 11) Source(2, 20) + SourceIndex(1) name (m1)
+---
+>>>        function c1() {
+1->^^^^^^^^
+2 >        ^^^^^^^^^
+3 >                 ^^
+1->
+2 >        export class 
+3 >                 c1
+1->Emitted(8, 9) Source(2, 5) + SourceIndex(1) name (m1.c1)
+2 >Emitted(8, 18) Source(2, 18) + SourceIndex(1) name (m1.c1)
+3 >Emitted(8, 20) Source(2, 20) + SourceIndex(1) name (m1.c1)
+---
+>>>        }
+1 >^^^^^^^^
+2 >        ^
+3 >         ^^^^^^^^^^->
+1 > {
+  >    
+2 >        }
+1 >Emitted(9, 9) Source(3, 5) + SourceIndex(1) name (m1.c1.constructor)
+2 >Emitted(9, 10) Source(3, 6) + SourceIndex(1) name (m1.c1.constructor)
+---
+>>>        return c1;
+1->^^^^^^^^
+2 >        ^^^^^^^^^
+1->
+2 >        }
+1->Emitted(10, 9) Source(3, 5) + SourceIndex(1) name (m1.c1)
+2 >Emitted(10, 18) Source(3, 6) + SourceIndex(1) name (m1.c1)
+---
+>>>    })();
+1 >^^^^
+2 >    ^
+3 >     
+4 >     ^^^^
+5 >         ^^^^^^^->
+1 >
+2 >    }
+3 >     
+4 >     export class c1 {
+  >         }
+1 >Emitted(11, 5) Source(3, 5) + SourceIndex(1) name (m1.c1)
+2 >Emitted(11, 6) Source(3, 6) + SourceIndex(1) name (m1.c1)
+3 >Emitted(11, 6) Source(2, 5) + SourceIndex(1) name (m1)
+4 >Emitted(11, 10) Source(3, 6) + SourceIndex(1) name (m1)
+---
+>>>    m1.c1 = c1;
+1->^^^^
+2 >    ^^^^^
+3 >         ^^^
+4 >            ^^
+5 >              ^
+6 >               ^^^^^^->
+1->
+2 >    c1
+3 >         
+4 >            c1 {
+  >                }
+5 >              
+1->Emitted(12, 5) Source(2, 18) + SourceIndex(1) name (m1)
+2 >Emitted(12, 10) Source(2, 20) + SourceIndex(1) name (m1)
+3 >Emitted(12, 13) Source(2, 18) + SourceIndex(1) name (m1)
+4 >Emitted(12, 15) Source(3, 6) + SourceIndex(1) name (m1)
+5 >Emitted(12, 16) Source(3, 6) + SourceIndex(1) name (m1)
+---
+>>>})(m1 || (m1 = {}));
+1->
+2 >^
+3 > ^^
+4 >   ^^
+5 >     ^^^^^
+6 >          ^^
+7 >            ^^^^^^^^
+8 >                    ^^^^^^^^^^^^^^^^->
+1->
+  >
+2 >}
+3 > 
+4 >   m1
+5 >     
+6 >          m1
+7 >             {
+  >                export class c1 {
+  >                }
+  >            }
+1->Emitted(13, 1) Source(4, 1) + SourceIndex(1) name (m1)
+2 >Emitted(13, 2) Source(4, 2) + SourceIndex(1) name (m1)
+3 >Emitted(13, 4) Source(1, 8) + SourceIndex(1)
+4 >Emitted(13, 6) Source(1, 10) + SourceIndex(1)
+5 >Emitted(13, 11) Source(1, 8) + SourceIndex(1)
+6 >Emitted(13, 13) Source(1, 10) + SourceIndex(1)
+7 >Emitted(13, 21) Source(4, 2) + SourceIndex(1)
+---
+>>>//# sourceMappingURL=fooResult.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.types b/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.types
new file mode 100644
index 00000000000..33a67423eaf
--- /dev/null
+++ b/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.types
@@ -0,0 +1,35 @@
+=== tests/cases/compiler/a.ts ===
+module M {
+>M : M
+
+    export var X = 1;
+>X : number
+}
+interface Navigator {
+>Navigator : Navigator
+
+    getGamepads(func?: any): any;
+>getGamepads : (func?: any) => any
+>func : any
+
+    webkitGetGamepads(func?: any): any
+>webkitGetGamepads : (func?: any) => any
+>func : any
+
+    msGetGamepads(func?: any): any;
+>msGetGamepads : (func?: any) => any
+>func : any
+
+    webkitGamepads(func?: any): any;
+>webkitGamepads : (func?: any) => any
+>func : any
+}
+
+=== tests/cases/compiler/b.ts ===
+module m1 {
+>m1 : m1
+
+    export class c1 {
+>c1 : c1
+    }
+}
diff --git a/tests/baselines/reference/specializedLambdaTypeArguments.errors.txt b/tests/baselines/reference/specializedLambdaTypeArguments.errors.txt
deleted file mode 100644
index 72fe62d877e..00000000000
--- a/tests/baselines/reference/specializedLambdaTypeArguments.errors.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-==== tests/cases/compiler/specializedLambdaTypeArguments.ts (1 errors) ====
-    class X<A> {
-    	prop: X< <any>() => any >;
-    	          ~~~
-!!! Type parameter name cannot be 'any'
-    }
-    var a: X<boolean>;
-     
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/specializedLambdaTypeArguments.js b/tests/baselines/reference/specializedLambdaTypeArguments.js
index b114f58f751..393b4f9e8c3 100644
--- a/tests/baselines/reference/specializedLambdaTypeArguments.js
+++ b/tests/baselines/reference/specializedLambdaTypeArguments.js
@@ -1,6 +1,6 @@
 //// [specializedLambdaTypeArguments.ts]
 class X<A> {
-	prop: X< <any>() => any >;
+	prop: X< <Tany>() => Tany >;
 }
 var a: X<boolean>;
  
diff --git a/tests/baselines/reference/specializedLambdaTypeArguments.types b/tests/baselines/reference/specializedLambdaTypeArguments.types
new file mode 100644
index 00000000000..3eb2fbc959e
--- /dev/null
+++ b/tests/baselines/reference/specializedLambdaTypeArguments.types
@@ -0,0 +1,16 @@
+=== 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/specializedSignatureInInterface.js b/tests/baselines/reference/specializedSignatureInInterface.js
new file mode 100644
index 00000000000..cf4a549fae9
--- /dev/null
+++ b/tests/baselines/reference/specializedSignatureInInterface.js
@@ -0,0 +1,11 @@
+//// [specializedSignatureInInterface.ts]
+interface A {
+  (key:string):void;
+}
+
+interface B extends A {
+  (key:'foo'):string;
+  (key:'bar'):string;
+}
+
+//// [specializedSignatureInInterface.js]
diff --git a/tests/baselines/reference/specializedSignatureInInterface.types b/tests/baselines/reference/specializedSignatureInInterface.types
new file mode 100644
index 00000000000..c8f76f4cb9b
--- /dev/null
+++ b/tests/baselines/reference/specializedSignatureInInterface.types
@@ -0,0 +1,18 @@
+=== 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'
+
+  (key:'bar'):string;
+>key : 'bar'
+}
diff --git a/tests/baselines/reference/staticMethodWithTypeParameterExtendsClauseDeclFile.js b/tests/baselines/reference/staticMethodWithTypeParameterExtendsClauseDeclFile.js
new file mode 100644
index 00000000000..ba2ca1ae758
--- /dev/null
+++ b/tests/baselines/reference/staticMethodWithTypeParameterExtendsClauseDeclFile.js
@@ -0,0 +1,66 @@
+//// [staticMethodWithTypeParameterExtendsClauseDeclFile.ts]
+class privateClass {
+}
+
+export class publicClass {
+}
+
+export class publicClassWithWithPrivateTypeParameters {
+    private static myPrivateStaticMethod1<T extends privateClass>() { // do not emit extends clause
+    }
+    private myPrivateMethod1<T extends privateClass>() { // do not emit extends clause
+    }
+    private static myPrivateStaticMethod2<T extends publicClass>() { // do not emit extends clause
+    }
+    private myPrivateMethod2<T extends publicClass>() { // do not emit extends clause
+    }
+    public static myPublicStaticMethod<T extends publicClass>() {
+    }
+    public myPublicMethod<T extends publicClass>() {
+    }
+}
+
+
+//// [staticMethodWithTypeParameterExtendsClauseDeclFile.js]
+var privateClass = (function () {
+    function privateClass() {
+    }
+    return privateClass;
+})();
+var publicClass = (function () {
+    function publicClass() {
+    }
+    return publicClass;
+})();
+exports.publicClass = publicClass;
+var publicClassWithWithPrivateTypeParameters = (function () {
+    function publicClassWithWithPrivateTypeParameters() {
+    }
+    publicClassWithWithPrivateTypeParameters.myPrivateStaticMethod1 = function () {
+    };
+    publicClassWithWithPrivateTypeParameters.prototype.myPrivateMethod1 = function () {
+    };
+    publicClassWithWithPrivateTypeParameters.myPrivateStaticMethod2 = function () {
+    };
+    publicClassWithWithPrivateTypeParameters.prototype.myPrivateMethod2 = function () {
+    };
+    publicClassWithWithPrivateTypeParameters.myPublicStaticMethod = function () {
+    };
+    publicClassWithWithPrivateTypeParameters.prototype.myPublicMethod = function () {
+    };
+    return publicClassWithWithPrivateTypeParameters;
+})();
+exports.publicClassWithWithPrivateTypeParameters = publicClassWithWithPrivateTypeParameters;
+
+
+//// [staticMethodWithTypeParameterExtendsClauseDeclFile.d.ts]
+export declare class publicClass {
+}
+export declare class publicClassWithWithPrivateTypeParameters {
+    private static myPrivateStaticMethod1<T>();
+    private myPrivateMethod1<T>();
+    private static myPrivateStaticMethod2<T>();
+    private myPrivateMethod2<T>();
+    static myPublicStaticMethod<T extends publicClass>(): void;
+    myPublicMethod<T extends publicClass>(): void;
+}
diff --git a/tests/baselines/reference/staticMethodWithTypeParameterExtendsClauseDeclFile.types b/tests/baselines/reference/staticMethodWithTypeParameterExtendsClauseDeclFile.types
new file mode 100644
index 00000000000..eb43b58aecc
--- /dev/null
+++ b/tests/baselines/reference/staticMethodWithTypeParameterExtendsClauseDeclFile.types
@@ -0,0 +1,44 @@
+=== tests/cases/compiler/staticMethodWithTypeParameterExtendsClauseDeclFile.ts ===
+class privateClass {
+>privateClass : privateClass
+}
+
+export class publicClass {
+>publicClass : publicClass
+}
+
+export class publicClassWithWithPrivateTypeParameters {
+>publicClassWithWithPrivateTypeParameters : 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/strictMode5.js b/tests/baselines/reference/strictMode5.js
new file mode 100644
index 00000000000..c46de926dbb
--- /dev/null
+++ b/tests/baselines/reference/strictMode5.js
@@ -0,0 +1,46 @@
+//// [strictMode5.ts]
+function foo(...args) {
+    "use strict"
+}
+
+class A {
+    m() {
+        "use strict"
+
+        var v = () => {
+            return this.n();
+        };
+    }
+    n() {}
+}
+
+function bar(x: number = 10) {
+    "use strict"
+}
+
+//// [strictMode5.js]
+function foo() {
+    "use strict";
+    var args = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        args[_i - 0] = arguments[_i];
+    }
+}
+var A = (function () {
+    function A() {
+    }
+    A.prototype.m = function () {
+        "use strict";
+        var _this = this;
+        var v = function () {
+            return _this.n();
+        };
+    };
+    A.prototype.n = function () {
+    };
+    return A;
+})();
+function bar(x) {
+    "use strict";
+    if (x === void 0) { x = 10; }
+}
diff --git a/tests/baselines/reference/strictMode5.types b/tests/baselines/reference/strictMode5.types
new file mode 100644
index 00000000000..8901401c616
--- /dev/null
+++ b/tests/baselines/reference/strictMode5.types
@@ -0,0 +1,38 @@
+=== tests/cases/compiler/strictMode5.ts ===
+function foo(...args) {
+>foo : typeof foo
+>args : any[]
+
+    "use strict"
+}
+
+class A {
+>A : A
+
+    m() {
+>m : () => void
+
+        "use strict"
+
+        var v = () => {
+>v : () => void
+>() => {            return this.n();        } : () => void
+
+            return this.n();
+>this.n() : void
+>this.n : () => void
+>this : A
+>n : () => void
+
+        };
+    }
+    n() {}
+>n : () => void
+}
+
+function bar(x: number = 10) {
+>bar : typeof bar
+>x : number
+
+    "use strict"
+}
diff --git a/tests/baselines/reference/switchStatementsWithMultipleDefaults.errors.txt b/tests/baselines/reference/switchStatementsWithMultipleDefaults.errors.txt
new file mode 100644
index 00000000000..e84c4cdcc0e
--- /dev/null
+++ b/tests/baselines/reference/switchStatementsWithMultipleDefaults.errors.txt
@@ -0,0 +1,50 @@
+==== tests/cases/compiler/switchStatementsWithMultipleDefaults.ts (9 errors) ====
+    
+    var x = 10;
+    
+    switch (x) {
+        case 1:
+        case 2:
+        default:    // No issues.
+            break;
+        default:    // Error; second 'default' clause.
+        ~~~~~~~~
+!!! A 'default' clause cannot appear more than once in a 'switch' statement.
+        default:    // Error; third 'default' clause.
+        ~~~~~~~~
+!!! A 'default' clause cannot appear more than once in a 'switch' statement.
+        case 3:
+            x *= x;
+    }
+    
+    switch (x) {
+        default:    // No issues.
+            break;
+        case 100:
+            switch (x * x) {
+                default:    // No issues.
+                default:    // Error; second 'default' clause.
+                ~~~~~~~~
+!!! A 'default' clause cannot appear more than once in a 'switch' statement.
+                    break;
+                case 10000:
+                    x /= x;
+                default:    // Error, third 'default' clause
+                ~~~~~~~~
+!!! A 'default' clause cannot appear more than once in a 'switch' statement.
+                def\u0061ult: // Error, fourth 'default' clause.
+                ~~~~~~~~~~~~~
+!!! A 'default' clause cannot appear more than once in a 'switch' statement.
+                // Errors on fifth-seventh
+                default: return;
+                ~~~~~~~~
+!!! A 'default' clause cannot appear more than once in a 'switch' statement.
+                         ~~~~~~
+!!! A 'return' statement can only be used within a function body.
+                default: default:
+                ~~~~~~~~
+!!! A 'default' clause cannot appear more than once in a 'switch' statement.
+                         ~~~~~~~~
+!!! A 'default' clause cannot appear more than once in a 'switch' statement.
+            }
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/testContainerList.js b/tests/baselines/reference/testContainerList.js
new file mode 100644
index 00000000000..dca80c7fa51
--- /dev/null
+++ b/tests/baselines/reference/testContainerList.js
@@ -0,0 +1,20 @@
+//// [testContainerList.ts]
+// Regression test for #325
+module A {
+    class C {
+        constructor(public d: {}) { }
+    }
+}
+
+
+//// [testContainerList.js]
+// Regression test for #325
+var A;
+(function (A) {
+    var C = (function () {
+        function C(d) {
+            this.d = d;
+        }
+        return C;
+    })();
+})(A || (A = {}));
diff --git a/tests/baselines/reference/testContainerList.types b/tests/baselines/reference/testContainerList.types
new file mode 100644
index 00000000000..4078069f1e2
--- /dev/null
+++ b/tests/baselines/reference/testContainerList.types
@@ -0,0 +1,13 @@
+=== tests/cases/compiler/testContainerList.ts ===
+// Regression test for #325
+module A {
+>A : A
+
+    class C {
+>C : C
+
+        constructor(public d: {}) { }
+>d : {}
+    }
+}
+
diff --git a/tests/baselines/reference/trailingCommasES3.js b/tests/baselines/reference/trailingCommasES3.js
new file mode 100644
index 00000000000..56e30fe5c17
--- /dev/null
+++ b/tests/baselines/reference/trailingCommasES3.js
@@ -0,0 +1,25 @@
+//// [trailingCommasES3.ts]
+
+var o1 = { a: 1, b: 2 };
+var o2 = { a: 1, b: 2, };
+var o3 = { a: 1, };
+var o4 = {};
+
+var a1 = [1, 2];
+var a2 = [1, 2, ];
+var a3 = [1, ];
+var a4 = [];
+var a5 = [1, , ];
+var a6 = [, , ];
+
+//// [trailingCommasES3.js]
+var o1 = { a: 1, b: 2 };
+var o2 = { a: 1, b: 2 };
+var o3 = { a: 1 };
+var o4 = {};
+var a1 = [1, 2];
+var a2 = [1, 2, ];
+var a3 = [1, ];
+var a4 = [];
+var a5 = [1, , ];
+var a6 = [, , ];
diff --git a/tests/baselines/reference/trailingCommasES3.types b/tests/baselines/reference/trailingCommasES3.types
new file mode 100644
index 00000000000..51fa689623b
--- /dev/null
+++ b/tests/baselines/reference/trailingCommasES3.types
@@ -0,0 +1,47 @@
+=== tests/cases/compiler/trailingCommasES3.ts ===
+
+var o1 = { a: 1, b: 2 };
+>o1 : { a: number; b: number; }
+>{ a: 1, b: 2 } : { a: number; b: number; }
+>a : number
+>b : number
+
+var o2 = { a: 1, b: 2, };
+>o2 : { a: number; b: number; }
+>{ a: 1, b: 2, } : { a: number; b: number; }
+>a : number
+>b : number
+
+var o3 = { a: 1, };
+>o3 : { a: number; }
+>{ a: 1, } : { a: number; }
+>a : number
+
+var o4 = {};
+>o4 : {}
+>{} : {}
+
+var a1 = [1, 2];
+>a1 : number[]
+>[1, 2] : number[]
+
+var a2 = [1, 2, ];
+>a2 : number[]
+>[1, 2, ] : number[]
+
+var a3 = [1, ];
+>a3 : number[]
+>[1, ] : number[]
+
+var a4 = [];
+>a4 : any[]
+>[] : undefined[]
+
+var a5 = [1, , ];
+>a5 : number[]
+>[1, , ] : number[]
+
+var a6 = [, , ];
+>a6 : any[]
+>[, , ] : undefined[]
+
diff --git a/tests/baselines/reference/trailingCommasES5.js b/tests/baselines/reference/trailingCommasES5.js
new file mode 100644
index 00000000000..f342d9ac2d7
--- /dev/null
+++ b/tests/baselines/reference/trailingCommasES5.js
@@ -0,0 +1,25 @@
+//// [trailingCommasES5.ts]
+
+var o1 = { a: 1, b: 2 };
+var o2 = { a: 1, b: 2, };
+var o3 = { a: 1, };
+var o4 = {};
+
+var a1 = [1, 2];
+var a2 = [1, 2, ];
+var a3 = [1, ];
+var a4 = [];
+var a5 = [1, , ];
+var a6 = [, , ];
+
+//// [trailingCommasES5.js]
+var o1 = { a: 1, b: 2 };
+var o2 = { a: 1, b: 2,  };
+var o3 = { a: 1,  };
+var o4 = {};
+var a1 = [1, 2];
+var a2 = [1, 2, ];
+var a3 = [1, ];
+var a4 = [];
+var a5 = [1, , ];
+var a6 = [, , ];
diff --git a/tests/baselines/reference/trailingCommasES5.types b/tests/baselines/reference/trailingCommasES5.types
new file mode 100644
index 00000000000..2cfb2060435
--- /dev/null
+++ b/tests/baselines/reference/trailingCommasES5.types
@@ -0,0 +1,47 @@
+=== tests/cases/compiler/trailingCommasES5.ts ===
+
+var o1 = { a: 1, b: 2 };
+>o1 : { a: number; b: number; }
+>{ a: 1, b: 2 } : { a: number; b: number; }
+>a : number
+>b : number
+
+var o2 = { a: 1, b: 2, };
+>o2 : { a: number; b: number; }
+>{ a: 1, b: 2, } : { a: number; b: number; }
+>a : number
+>b : number
+
+var o3 = { a: 1, };
+>o3 : { a: number; }
+>{ a: 1, } : { a: number; }
+>a : number
+
+var o4 = {};
+>o4 : {}
+>{} : {}
+
+var a1 = [1, 2];
+>a1 : number[]
+>[1, 2] : number[]
+
+var a2 = [1, 2, ];
+>a2 : number[]
+>[1, 2, ] : number[]
+
+var a3 = [1, ];
+>a3 : number[]
+>[1, ] : number[]
+
+var a4 = [];
+>a4 : any[]
+>[] : undefined[]
+
+var a5 = [1, , ];
+>a5 : number[]
+>[1, , ] : number[]
+
+var a6 = [, , ];
+>a6 : any[]
+>[, , ] : undefined[]
+
diff --git a/tests/baselines/reference/typeParameterWithInvalidConstraintType.errors.txt b/tests/baselines/reference/typeParameterWithInvalidConstraintType.errors.txt
new file mode 100644
index 00000000000..134d3009469
--- /dev/null
+++ b/tests/baselines/reference/typeParameterWithInvalidConstraintType.errors.txt
@@ -0,0 +1,13 @@
+==== tests/cases/compiler/typeParameterWithInvalidConstraintType.ts (1 errors) ====
+    class A<T extends T> {
+            ~~~~~~~~~~~
+!!! Constraint of a type parameter cannot reference any type parameter from the same type parameter list.
+        foo() {
+            var x: T;
+            // no error expected below this line
+            var a = x.foo();
+            var b = new x(123);
+            var c = x[1];
+            var d = x();
+        }
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/typeParameterWithInvalidConstraintType.js b/tests/baselines/reference/typeParameterWithInvalidConstraintType.js
new file mode 100644
index 00000000000..4985519911a
--- /dev/null
+++ b/tests/baselines/reference/typeParameterWithInvalidConstraintType.js
@@ -0,0 +1,26 @@
+//// [typeParameterWithInvalidConstraintType.ts]
+class A<T extends T> {
+    foo() {
+        var x: T;
+        // no error expected below this line
+        var a = x.foo();
+        var b = new x(123);
+        var c = x[1];
+        var d = x();
+    }
+}
+
+//// [typeParameterWithInvalidConstraintType.js]
+var A = (function () {
+    function A() {
+    }
+    A.prototype.foo = function () {
+        var x;
+        // no error expected below this line
+        var a = x.foo();
+        var b = new x(123);
+        var c = x[1];
+        var d = x();
+    };
+    return A;
+})();
diff --git a/tests/baselines/reference/typeQueryWithReservedWords.js b/tests/baselines/reference/typeQueryWithReservedWords.js
new file mode 100644
index 00000000000..e6e7f86541b
--- /dev/null
+++ b/tests/baselines/reference/typeQueryWithReservedWords.js
@@ -0,0 +1,29 @@
+//// [typeQueryWithReservedWords.ts]
+class Controller {
+    create() {
+    }
+    delete() {
+    }
+    var() {
+    }
+}
+
+interface IScope {
+    create: typeof Controller.prototype.create;  
+    delete: typeof Controller.prototype.delete;  // Should not error
+    var: typeof Controller.prototype.var;        // Should not error
+}
+
+
+//// [typeQueryWithReservedWords.js]
+var Controller = (function () {
+    function Controller() {
+    }
+    Controller.prototype.create = function () {
+    };
+    Controller.prototype.delete = function () {
+    };
+    Controller.prototype.var = function () {
+    };
+    return Controller;
+})();
diff --git a/tests/baselines/reference/typeQueryWithReservedWords.types b/tests/baselines/reference/typeQueryWithReservedWords.types
new file mode 100644
index 00000000000..d90b84fa015
--- /dev/null
+++ b/tests/baselines/reference/typeQueryWithReservedWords.types
@@ -0,0 +1,37 @@
+=== tests/cases/conformance/types/specifyingTypes/typeQueries/typeQueryWithReservedWords.ts ===
+class Controller {
+>Controller : Controller
+
+    create() {
+>create : () => void
+    }
+    delete() {
+>delete : () => void
+    }
+    var() {
+>var : () => void
+    }
+}
+
+interface IScope {
+>IScope : IScope
+
+    create: typeof Controller.prototype.create;  
+>create : () => void
+>Controller : typeof Controller
+>prototype : Controller
+>create : () => void
+
+    delete: typeof Controller.prototype.delete;  // Should not error
+>delete : () => void
+>Controller : typeof Controller
+>prototype : Controller
+>delete : () => void
+
+    var: typeof Controller.prototype.var;        // Should not error
+>var : () => void
+>Controller : typeof Controller
+>prototype : Controller
+>var : () => void
+}
+
diff --git a/tests/baselines/reference/unusedImportDeclaration.js b/tests/baselines/reference/unusedImportDeclaration.js
index 1faff01d197..54885f09e36 100644
--- a/tests/baselines/reference/unusedImportDeclaration.js
+++ b/tests/baselines/reference/unusedImportDeclaration.js
@@ -27,3 +27,11 @@ var thingy = {
     me: "A"
 };
 foo("IN " + thingy.me + "!");
+
+
+//// [unusedImportDeclaration_testerB.d.ts]
+declare class TesterB {
+    me: string;
+}
+export = TesterB;
+//// [unusedImportDeclaration_testerA.d.ts]
diff --git a/tests/cases/compiler/accessorParameterAccessibilityModifier.ts b/tests/cases/compiler/accessorParameterAccessibilityModifier.ts
index 3f258ac2a8f..9d6ec6870f1 100644
--- a/tests/cases/compiler/accessorParameterAccessibilityModifier.ts
+++ b/tests/cases/compiler/accessorParameterAccessibilityModifier.ts
@@ -1,4 +1,4 @@
-// target: es5
+// @target: es5
 
 class C {
     set X(public v) { }
diff --git a/tests/cases/compiler/accessorWithInitializer.ts b/tests/cases/compiler/accessorWithInitializer.ts
index 345b1a8da55..cdb63475adf 100644
--- a/tests/cases/compiler/accessorWithInitializer.ts
+++ b/tests/cases/compiler/accessorWithInitializer.ts
@@ -1,4 +1,4 @@
-// target: es5
+// @target: es5
 
 class C {
     set X(v = 0) { }
diff --git a/tests/cases/compiler/accessorWithRestParam.ts b/tests/cases/compiler/accessorWithRestParam.ts
index 22ab316e354..015846a4aaa 100644
--- a/tests/cases/compiler/accessorWithRestParam.ts
+++ b/tests/cases/compiler/accessorWithRestParam.ts
@@ -1,3 +1,5 @@
+// @target: es5
+
 class C {
     set X(...v) { }
     static set X(...v2) { }
diff --git a/tests/cases/compiler/aliasInaccessibleModule.ts b/tests/cases/compiler/aliasInaccessibleModule.ts
index f1037fb7652..91f36d9d118 100644
--- a/tests/cases/compiler/aliasInaccessibleModule.ts
+++ b/tests/cases/compiler/aliasInaccessibleModule.ts
@@ -1,3 +1,4 @@
+// @declaration: true
 module M {
     module N {
     }
diff --git a/tests/cases/compiler/aliasInaccessibleModule2.ts b/tests/cases/compiler/aliasInaccessibleModule2.ts
index 7932d775d27..d970db79538 100644
--- a/tests/cases/compiler/aliasInaccessibleModule2.ts
+++ b/tests/cases/compiler/aliasInaccessibleModule2.ts
@@ -1,3 +1,4 @@
+// @declaration: true
 module M {
     module N {
         class C {
diff --git a/tests/cases/compiler/aliasUsageInAccessorsOfClass.ts b/tests/cases/compiler/aliasUsageInAccessorsOfClass.ts
index fc86451358a..2aeddbad947 100644
--- a/tests/cases/compiler/aliasUsageInAccessorsOfClass.ts
+++ b/tests/cases/compiler/aliasUsageInAccessorsOfClass.ts
@@ -1,4 +1,5 @@
 //@module: commonjs
+// @target: ES5
 // @Filename: aliasUsage1_backbone.ts
 export class Model {
     public someData: string;
diff --git a/tests/cases/compiler/ambientExternalModuleWithRelativeModuleName.ts b/tests/cases/compiler/ambientExternalModuleWithRelativeModuleName.ts
index 25b0a04161d..69f585db5f5 100644
--- a/tests/cases/compiler/ambientExternalModuleWithRelativeModuleName.ts
+++ b/tests/cases/compiler/ambientExternalModuleWithRelativeModuleName.ts
@@ -1,3 +1,7 @@
 declare module "./relativeModule" {
     var x: string;
+}
+
+declare module ".\\relativeModule" {
+    var x: string;
 }
\ No newline at end of file
diff --git a/tests/cases/compiler/ambientGetters.ts b/tests/cases/compiler/ambientGetters.ts
index 2c06a9d5b79..401eacf9066 100644
--- a/tests/cases/compiler/ambientGetters.ts
+++ b/tests/cases/compiler/ambientGetters.ts
@@ -1,3 +1,5 @@
+// @target: es5
+
 declare class A {
     get length() : number;
 }
diff --git a/tests/cases/compiler/amdDependencyComment2.ts b/tests/cases/compiler/amdDependencyComment2.ts
new file mode 100644
index 00000000000..2b60327856f
--- /dev/null
+++ b/tests/cases/compiler/amdDependencyComment2.ts
@@ -0,0 +1,5 @@
+//@module: amd
+///<amd-dependency path='bar'/>
+
+import m1 = require("m2")
+m1.f();
\ No newline at end of file
diff --git a/tests/cases/compiler/arrowFunctionMissingCurlyWithSemicolon.ts b/tests/cases/compiler/arrowFunctionMissingCurlyWithSemicolon.ts
new file mode 100644
index 00000000000..67e2e6110f9
--- /dev/null
+++ b/tests/cases/compiler/arrowFunctionMissingCurlyWithSemicolon.ts
@@ -0,0 +1,4 @@
+// Should error at semicolon.
+var f = () => ;
+var b = 1 * 2 * 3 * 4;
+var square = (x: number) => x * x;
\ No newline at end of file
diff --git a/tests/cases/compiler/arrowFunctionsMissingTokens.ts b/tests/cases/compiler/arrowFunctionsMissingTokens.ts
new file mode 100644
index 00000000000..bd3e25d56b4
--- /dev/null
+++ b/tests/cases/compiler/arrowFunctionsMissingTokens.ts
@@ -0,0 +1,66 @@
+
+module missingArrowsWithCurly {
+    var a = () { };
+
+    var b = (): void { }
+
+    var c = (x) { };
+
+    var d = (x: number, y: string) { };
+
+    var e = (x: number, y: string): void { };
+}
+
+module missingCurliesWithArrow {
+    module withStatement {
+        var a = () => var k = 10;};
+
+        var b = (): void => var k = 10;}
+
+        var c = (x) => var k = 10;};
+
+        var d = (x: number, y: string) => var k = 10;};
+
+        var e = (x: number, y: string): void => var k = 10;};
+
+        var f = () => var k = 10;}
+    }
+
+    module withoutStatement {
+        var a = () => };
+
+        var b = (): void => }
+
+        var c = (x) => };
+
+        var d = (x: number, y: string) => };
+
+        var e = (x: number, y: string): void => };
+
+        var f = () => }
+    }
+}
+
+module ce_nEst_pas_une_arrow_function {
+    var a = ();
+
+    var b = (): void;
+
+    var c = (x);
+
+    var d = (x: number, y: string);
+
+    var e = (x: number, y: string): void;
+}
+
+module okay {
+    var a = () => { };
+
+    var b = (): void => { }
+
+    var c = (x) => { };
+
+    var d = (x: number, y: string) => { };
+
+    var e = (x: number, y: string): void => { };
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/asiAmbientFunctionDeclaration.ts b/tests/cases/compiler/asiAmbientFunctionDeclaration.ts
new file mode 100644
index 00000000000..c29d38a8990
--- /dev/null
+++ b/tests/cases/compiler/asiAmbientFunctionDeclaration.ts
@@ -0,0 +1 @@
+declare function foo()
\ No newline at end of file
diff --git a/tests/cases/compiler/asiBreak.ts b/tests/cases/compiler/asiBreak.ts
new file mode 100644
index 00000000000..ee846ec1018
--- /dev/null
+++ b/tests/cases/compiler/asiBreak.ts
@@ -0,0 +1 @@
+while (true) break
\ No newline at end of file
diff --git a/tests/cases/compiler/asiContinue.ts b/tests/cases/compiler/asiContinue.ts
new file mode 100644
index 00000000000..6c0ddd398ba
--- /dev/null
+++ b/tests/cases/compiler/asiContinue.ts
@@ -0,0 +1 @@
+while (true) continue
\ No newline at end of file
diff --git a/tests/cases/compiler/asiReturn.ts b/tests/cases/compiler/asiReturn.ts
new file mode 100644
index 00000000000..4e3f11d8375
--- /dev/null
+++ b/tests/cases/compiler/asiReturn.ts
@@ -0,0 +1,2 @@
+// This should be an error for using a return outside a function, but ASI should work properly
+return
\ No newline at end of file
diff --git a/tests/cases/compiler/assignmentCompatability24.ts b/tests/cases/compiler/assignmentCompatability24.ts
index 2ed697f0e94..75d977b4081 100644
--- a/tests/cases/compiler/assignmentCompatability24.ts
+++ b/tests/cases/compiler/assignmentCompatability24.ts
@@ -3,7 +3,7 @@ module __test1__ {
     export var __val__obj4 = obj4;
 }
 module __test2__ {
-    export var obj = function f<string>(a: string) { return a; };;
+    export var obj = function f<Tstring>(a: Tstring) { return a; };;
     export var __val__obj = obj;
 }
 __test2__.__val__obj = __test1__.__val__obj4
\ No newline at end of file
diff --git a/tests/cases/compiler/assignmentCompatability33.ts b/tests/cases/compiler/assignmentCompatability33.ts
index fb500f9b767..12f28fbed60 100644
--- a/tests/cases/compiler/assignmentCompatability33.ts
+++ b/tests/cases/compiler/assignmentCompatability33.ts
@@ -3,7 +3,7 @@ module __test1__ {
     export var __val__obj4 = obj4;
 }
 module __test2__ {
-    export var obj: { <string>(a: string): string; };
+    export var obj: { <Tstring>(a: Tstring): Tstring; };
     export var __val__obj = obj;
 }
 __test2__.__val__obj = __test1__.__val__obj4
\ No newline at end of file
diff --git a/tests/cases/compiler/assignmentCompatability34.ts b/tests/cases/compiler/assignmentCompatability34.ts
index 9d0af77a3f5..32aa07e9949 100644
--- a/tests/cases/compiler/assignmentCompatability34.ts
+++ b/tests/cases/compiler/assignmentCompatability34.ts
@@ -3,7 +3,7 @@ module __test1__ {
     export var __val__obj4 = obj4;
 }
 module __test2__ {
-    export var obj: { <number>(a:number):number;};
+    export var obj: { <Tnumber>(a:Tnumber):Tnumber;};
     export var __val__obj = obj;
 }
 __test2__.__val__obj = __test1__.__val__obj4
\ No newline at end of file
diff --git a/tests/cases/compiler/assignmentCompatability37.ts b/tests/cases/compiler/assignmentCompatability37.ts
index b7cb25d4219..23cfabb1d03 100644
--- a/tests/cases/compiler/assignmentCompatability37.ts
+++ b/tests/cases/compiler/assignmentCompatability37.ts
@@ -3,7 +3,7 @@ module __test1__ {
     export var __val__obj4 = obj4;
 }
 module __test2__ {
-    export var aa:{ new <number>(param: number); };;
+    export var aa:{ new <Tnumber>(param: Tnumber); };;
     export var __val__aa = aa;
 }
 __test2__.__val__aa = __test1__.__val__obj4
\ No newline at end of file
diff --git a/tests/cases/compiler/assignmentCompatability38.ts b/tests/cases/compiler/assignmentCompatability38.ts
index 0845b811c2a..c7fc9970e0d 100644
--- a/tests/cases/compiler/assignmentCompatability38.ts
+++ b/tests/cases/compiler/assignmentCompatability38.ts
@@ -3,7 +3,7 @@ module __test1__ {
     export var __val__obj4 = obj4;
 }
 module __test2__ {
-    export var aa:{ new <string>(param: string); };;
+    export var aa:{ new <Tstring>(param: Tstring); };;
     export var __val__aa = aa;
 }
 __test2__.__val__aa = __test1__.__val__obj4
\ No newline at end of file
diff --git a/tests/cases/compiler/augmentArray.ts b/tests/cases/compiler/augmentArray.ts
new file mode 100644
index 00000000000..e2ab81db941
--- /dev/null
+++ b/tests/cases/compiler/augmentArray.ts
@@ -0,0 +1,3 @@
+interface Array<T> {
+    (): any[];
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/autoAsiForStaticsInClassDeclaration.ts b/tests/cases/compiler/autoAsiForStaticsInClassDeclaration.ts
new file mode 100644
index 00000000000..99599bbb165
--- /dev/null
+++ b/tests/cases/compiler/autoAsiForStaticsInClassDeclaration.ts
@@ -0,0 +1,4 @@
+class C {
+    static x
+    static y
+} 
\ No newline at end of file
diff --git a/tests/cases/compiler/badArraySyntax.ts b/tests/cases/compiler/badArraySyntax.ts
index 77cb9ab4541..6a19a1504ac 100644
--- a/tests/cases/compiler/badArraySyntax.ts
+++ b/tests/cases/compiler/badArraySyntax.ts
@@ -7,4 +7,4 @@ var a2 = new Z[];
 var a3 = new Z[]();
 var a4: Z[] = new Z[];
 var a5: Z[] = new Z[]();
-
+var a6: Z[][] = new   Z     [      ]   [  ];
diff --git a/tests/cases/compiler/captureThisInSuperCall.ts b/tests/cases/compiler/captureThisInSuperCall.ts
new file mode 100644
index 00000000000..8037aa50b44
--- /dev/null
+++ b/tests/cases/compiler/captureThisInSuperCall.ts
@@ -0,0 +1,8 @@
+class A {
+    constructor(p:any) {}
+}
+
+class B extends A {
+    constructor() { super({ test: () => this.someMethod()}); } 
+    someMethod() {}
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/castExpressionParentheses.ts b/tests/cases/compiler/castExpressionParentheses.ts
index 6636fd2e5bc..93b26ebaf4e 100644
--- a/tests/cases/compiler/castExpressionParentheses.ts
+++ b/tests/cases/compiler/castExpressionParentheses.ts
@@ -26,7 +26,7 @@ declare var A;
 (<any>typeof A).x; 
 (<any>-A).x; 
 new (<any>A());
-(<any>()=> {})();
+(<Tany>()=> {})();
 (<any>function foo() { })();
 (<any><number><any>-A).x; 
 
diff --git a/tests/cases/compiler/chainedImportAlias.ts b/tests/cases/compiler/chainedImportAlias.ts
index a8b79016d1b..97bf28bf4a5 100644
--- a/tests/cases/compiler/chainedImportAlias.ts
+++ b/tests/cases/compiler/chainedImportAlias.ts
@@ -5,9 +5,6 @@ export module m {
 }
 
 // @Filename: chainedImportAlias_file1.ts 
-import x = require('chainedImportAlias_file1');
+import x = require('chainedImportAlias_file0');
 import y = x;
-declare var console: {
-    log(message?: any);
-};
-console.log(y);
+y.m.foo();
diff --git a/tests/cases/compiler/classImplementsImportedInterface.ts b/tests/cases/compiler/classImplementsImportedInterface.ts
new file mode 100644
index 00000000000..ae4cbffede5
--- /dev/null
+++ b/tests/cases/compiler/classImplementsImportedInterface.ts
@@ -0,0 +1,12 @@
+module M1 {
+    export interface I {
+        foo();
+    }
+}
+
+module M2 {
+    import T = M1.I;
+    class C implements T {
+        foo() {}
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/commentsClass.ts b/tests/cases/compiler/commentsClass.ts
index a1d792f83ef..e9a8f3cee1d 100644
--- a/tests/cases/compiler/commentsClass.ts
+++ b/tests/cases/compiler/commentsClass.ts
@@ -4,21 +4,21 @@
 
 /** This is class c2 without constuctor*/
 class c2 {
-}
+} // trailing comment1
 var i2 = new c2();
 var i2_c = c2;
 class c3 {
     /** Constructor comment*/
     constructor() {
-    }
-}
+    } // trailing comment of constructor
+} /* trailing comment 2 */
 var i3 = new c3();
 var i3_c = c3;
 /** Class comment*/
 class c4 {
     /** Constructor comment*/
     constructor() {
-    }
+    } /* trailing comment of constructor 2*/
 }
 var i4 = new c4();
 var i4_c = c4;
@@ -65,3 +65,11 @@ class c8 {
 }
 var i8 = new c8();
 var i8_c = c8;
+
+class c9 {
+    constructor() {
+        /// This is some detached comment
+
+        // should emit this leading comment of } too
+    }
+}
diff --git a/tests/cases/compiler/commentsClassMembers.ts b/tests/cases/compiler/commentsClassMembers.ts
index 8b418e58661..92a3a1356f2 100644
--- a/tests/cases/compiler/commentsClassMembers.ts
+++ b/tests/cases/compiler/commentsClassMembers.ts
@@ -9,21 +9,21 @@ class c1 {
     /** sum with property*/
     public p2(/** number to add*/b: number) {
         return this.p1 + b;
-    }
+    } /* trailing comment of method*/
     /** getter property*/
     public get p3() {
         return this.p2(this.p1);
-    }
+    }// trailing comment Getter
     /** setter property*/
     public set p3(/** this is value*/value: number) {
         this.p1 = this.p2(value);
-    }
+    }// trailing comment Setter
     /** pp1 is property of c1*/
     private pp1: number;
     /** sum with property*/
     private pp2(/** number to add*/b: number) {
         return this.p1 + b;
-    }
+    } // trailing comment of method
     /** getter property*/
     private get pp3() {
         return this.pp2(this.pp1);
@@ -44,11 +44,11 @@ class c1 {
     /** static getter property*/
     static get s3() {
         return c1.s2(c1.s1);
-    }
+    } /*trailing comment 1 getter*/
     /** setter property*/
     static set s3( /** this is value*/value: number) {
         c1.s1 = c1.s2(value);
-    }
+    }/*trailing comment 2 */ /*setter*/
     public nc_p1: number;
     public nc_p2(b: number) {
         return this.nc_p1 + b;
@@ -200,7 +200,7 @@ class cProperties {
     /** getter only property*/
     public get p1() {
         return this.val;
-    }
+    } // trailing comment of only getter
     public get nc_p1() {
         return this.val;
     }
@@ -210,7 +210,10 @@ class cProperties {
     }
     public set nc_p2(value: number) {
         this.val = value;
-    }
+    } /* trailing comment of setter only*/
+
+    public x = 10; /*trailing comment for property*/
+    private y = 10; // trailing comment of // style
 }
 var cProperties_i = new cProperties();
 cProperties_i.p2 = cProperties_i.p1;
diff --git a/tests/cases/compiler/commentsDottedModuleName.ts b/tests/cases/compiler/commentsDottedModuleName.ts
new file mode 100644
index 00000000000..136d189d1ac
--- /dev/null
+++ b/tests/cases/compiler/commentsDottedModuleName.ts
@@ -0,0 +1,11 @@
+//@module: amd
+// @target: ES5
+// @declaration: true
+// @comments: true
+
+/** this is multi declare module*/
+export module outerModule.InnerModule {
+    /// class b comment
+    export class b {
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/commentsEnums.ts b/tests/cases/compiler/commentsEnums.ts
index b6a1b99fd17..2d69c863f2d 100644
--- a/tests/cases/compiler/commentsEnums.ts
+++ b/tests/cases/compiler/commentsEnums.ts
@@ -8,7 +8,7 @@ enum Colors {
     Cornflower /* blue */,
     /** Fancy name for 'pink'*/
     FancyPink
-}
+} // trailing comment
 var x = Colors.Cornflower;
 x = Colors.FancyPink;
 
diff --git a/tests/cases/compiler/commentsExternalModules.ts b/tests/cases/compiler/commentsExternalModules.ts
index eff0d1d6740..86c6b2be8d3 100644
--- a/tests/cases/compiler/commentsExternalModules.ts
+++ b/tests/cases/compiler/commentsExternalModules.ts
@@ -56,7 +56,7 @@ var myvar2 = new m4.m2.c();
 
 // @Filename: commentsExternalModules_1.ts
 /**This is on import declaration*/
-import extMod = require("commentsExternalModules_0");
+import extMod = require("commentsExternalModules_0"); // trailing comment1
 extMod.m1.fooExport();
 var newVar = new extMod.m1.m2.c();
 extMod.m4.fooExport();
diff --git a/tests/cases/compiler/commentsExternalModules2.ts b/tests/cases/compiler/commentsExternalModules2.ts
new file mode 100644
index 00000000000..354e74738be
--- /dev/null
+++ b/tests/cases/compiler/commentsExternalModules2.ts
@@ -0,0 +1,63 @@
+//@module: amd
+// @target: ES5
+// @declaration: true
+// @comments: true
+
+// @Filename: commentsExternalModules2_0.ts
+/** Module comment*/
+export module m1 {
+    /** b's comment*/
+    export var b: number;
+    /** foo's comment*/
+    function foo() {
+        return b;
+    }
+    /** m2 comments*/
+    export module m2 {
+        /** class comment;*/
+        export class c {
+        };
+        /** i*/
+        export var i = new c();
+    }
+    /** exported function*/
+    export function fooExport() {
+        return foo();
+    }
+}
+m1.fooExport();
+var myvar = new m1.m2.c();
+
+/** Module comment */
+export module m4 {
+    /** b's comment */
+    export var b: number;
+    /** foo's comment
+    */
+    function foo() {
+        return b;
+    }
+    /** m2 comments
+    */
+    export module m2 {
+        /** class comment; */
+        export class c {
+        };
+        /** i */
+        export var i = new c();
+    }
+    /** exported function */
+    export function fooExport() {
+        return foo();
+    }
+}
+m4.fooExport();
+var myvar2 = new m4.m2.c();
+
+// @Filename: commentsExternalModules_1.ts
+/**This is on import declaration*/
+import extMod = require("commentsExternalModules2_0"); // trailing comment 1
+extMod.m1.fooExport();
+export var newVar = new extMod.m1.m2.c();
+extMod.m4.fooExport();
+export var newVar2 = new extMod.m4.m2.c();
diff --git a/tests/cases/compiler/commentsExternalModules3.ts b/tests/cases/compiler/commentsExternalModules3.ts
new file mode 100644
index 00000000000..2f214c5d28c
--- /dev/null
+++ b/tests/cases/compiler/commentsExternalModules3.ts
@@ -0,0 +1,63 @@
+//@module: commonjs
+// @target: ES5
+// @declaration: true
+// @comments: true
+
+// @Filename: commentsExternalModules2_0.ts
+/** Module comment*/
+export module m1 {
+    /** b's comment*/
+    export var b: number;
+    /** foo's comment*/
+    function foo() {
+        return b;
+    }
+    /** m2 comments*/
+    export module m2 {
+        /** class comment;*/
+        export class c {
+        };
+        /** i*/
+        export var i = new c();
+    }
+    /** exported function*/
+    export function fooExport() {
+        return foo();
+    }
+}
+m1.fooExport();
+var myvar = new m1.m2.c();
+
+/** Module comment */
+export module m4 {
+    /** b's comment */
+    export var b: number;
+    /** foo's comment
+    */
+    function foo() {
+        return b;
+    }
+    /** m2 comments
+    */
+    export module m2 {
+        /** class comment; */
+        export class c {
+        };
+        /** i */
+        export var i = new c();
+    }
+    /** exported function */
+    export function fooExport() {
+        return foo();
+    }
+}
+m4.fooExport();
+var myvar2 = new m4.m2.c();
+
+// @Filename: commentsExternalModules_1.ts
+/**This is on import declaration*/
+import extMod = require("commentsExternalModules2_0"); // trailing comment 1
+extMod.m1.fooExport();
+export var newVar = new extMod.m1.m2.c();
+extMod.m4.fooExport();
+export var newVar2 = new extMod.m4.m2.c();
diff --git a/tests/cases/compiler/commentsFormatting.ts b/tests/cases/compiler/commentsFormatting.ts
new file mode 100644
index 00000000000..d7e388a9340
--- /dev/null
+++ b/tests/cases/compiler/commentsFormatting.ts
@@ -0,0 +1,72 @@
+// @target: ES5
+// @declaration: true
+// @comments: true
+
+module m {
+    /** this is first line - aligned to class declaration
+* this is 4 spaces left aligned
+ * this is 3 spaces left aligned
+  * this is 2 spaces left aligned
+   * this is 1 spaces left aligned
+    * this is at same level as first line
+     * this is 1 spaces right aligned
+      * this is 2 spaces right aligned
+       * this is 3 spaces right aligned
+        * this is 4 spaces right aligned
+         * this is 5 spaces right aligned
+          * this is 6 spaces right aligned
+           * this is 7 spaces right aligned
+            * this is 8 spaces right aligned */
+    export class c {
+    }
+
+        /** this is first line - 4 spaces right aligned to class but in js file should be aligned to class declaration
+* this is 8 spaces left aligned
+ * this is 7 spaces left aligned
+  * this is 6 spaces left aligned
+   * this is 5 spaces left aligned
+    * this is 4 spaces left aligned
+     * this is 3 spaces left aligned
+      * this is 2 spaces left aligned
+       * this is 1 spaces left aligned
+        * this is at same level as first line
+         * this is 1 spaces right aligned
+          * this is 2 spaces right aligned
+           * this is 3 spaces right aligned
+            * this is 4 spaces right aligned
+             * this is 5 spaces right aligned
+              * this is 6 spaces right aligned
+               * this is 7 spaces right aligned
+                * this is 8 spaces right aligned */
+    export class c2 {
+    }
+
+    /** this is comment with new lines in between
+
+this is 4 spaces left aligned but above line is empty
+
+ this is 3 spaces left aligned but above line is empty
+
+  this is 2 spaces left aligned but above line is empty
+
+    this is 1 spaces left aligned but above line is empty
+
+    this is at same level as first line but above line is empty 
+
+     this is 1 spaces right aligned but above line is empty
+
+      this is 2 spaces right aligned but above line is empty
+
+       this is 3 spaces right aligned but above line is empty
+
+        this is 4 spaces right aligned but above line is empty
+    
+    
+    Above 2 lines are empty
+    
+    
+    
+    above 3 lines are empty*/
+    export class c3 {
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/commentsFunction.ts b/tests/cases/compiler/commentsFunction.ts
index cc6cf8ca63b..b71da4ae085 100644
--- a/tests/cases/compiler/commentsFunction.ts
+++ b/tests/cases/compiler/commentsFunction.ts
@@ -4,14 +4,14 @@
 
 /** This comment should appear for foo*/
 function foo() {
-}
+} /* trailing comment of function */
 foo();
 /** This is comment for function signature*/
 function fooWithParameters(/** this is comment about a*/a: string,
     /** this is comment for b*/
     b: number) {
     var d = a;
-}
+} // trailing comment of function
 fooWithParameters("a", 10);
 /** fooFunc
  * comment
@@ -24,4 +24,34 @@ var fooFunc = function FooFunctionValue(/** fooFunctionValue param */ b: string)
 var lambdaFoo = /** this is lambda comment*/ (/**param a*/a: number, /**param b*/b: number) => a + b;
 var lambddaNoVarComment = /** this is lambda multiplication*/ (/**param a*/a: number, /**param b*/b: number) => a * b;
 lambdaFoo(10, 20);
-lambddaNoVarComment(10, 20);
\ No newline at end of file
+lambddaNoVarComment(10, 20);
+
+function blah(a: string /* multiline trailing comment 
+multiline */) {
+}
+
+function blah2(a: string /* single line multiple trailing comments */ /* second */) {
+}
+
+function blah3(a: string // trailing commen single line
+    ) {
+}
+
+lambdaFoo = (a, b) => a * b; // This is trailing comment
+
+/*leading comment*/() => 0; // Needs to be wrapped in parens to be a valid expression (not declaration)
+/*leading comment*/(() => 0); //trailing comment
+
+function blah4(/*1*/a: string/*2*/,/*3*/b: string/*4*/) {
+}
+
+function foo1() {
+
+    // should emit this
+}
+
+function foo2() {
+    /// This is some detached comment
+
+    // should emit this leading comment of } too
+}
diff --git a/tests/cases/compiler/commentsModules.ts b/tests/cases/compiler/commentsModules.ts
index 4e4b6a243ff..29ac0c22373 100644
--- a/tests/cases/compiler/commentsModules.ts
+++ b/tests/cases/compiler/commentsModules.ts
@@ -37,7 +37,7 @@ module m1 {
      */
     function foo4Export() {
     }
-}
+} // trailing comment module
 m1.fooExport();
 var myvar = new m1.m2.c();
 /** module comment of m2.m3*/
@@ -45,14 +45,14 @@ module m2.m3 {
     /** Exported class comment*/
     export class c {
     }
-}
+} /* trailing dotted module comment*/
 new m2.m3.c();
 /** module comment of m3.m4.m5*/
 module m3.m4.m5 {
     /** Exported class comment*/
     export class c {
     }
-}
+} // trailing dotted module 2
 new m3.m4.m5.c();
 /** module comment of m4.m5.m6*/
 module m4.m5.m6 {
@@ -60,7 +60,7 @@ module m4.m5.m6 {
         /** Exported class comment*/
         export class c {
         }
-    }
+    } /* trailing inner module */ /* multiple comments*/
 }
 new m4.m5.m6.m7.c();
 /** module comment of m5.m6.m7*/
diff --git a/tests/cases/compiler/commentsMultiModuleMultiFile.ts b/tests/cases/compiler/commentsMultiModuleMultiFile.ts
index 0fd410a4b5d..2d19f775bda 100644
--- a/tests/cases/compiler/commentsMultiModuleMultiFile.ts
+++ b/tests/cases/compiler/commentsMultiModuleMultiFile.ts
@@ -11,7 +11,7 @@ export module multiM {
     }
 }
 /** thi is multi module 2*/
-module multiM {
+export module multiM {
     /** class c comment*/
     export class c {
     }
@@ -27,7 +27,7 @@ new multiM.c();
 // @Filename: commentsMultiModuleMultiFile_1.ts
 import m = require('commentsMultiModuleMultiFile_0');
 /** this is multi module 3 comment*/
-module multiM {
+export module multiM {
     /** class d comment*/
     export class d {
     }
diff --git a/tests/cases/compiler/commentsOnObjectLiteral2.ts b/tests/cases/compiler/commentsOnObjectLiteral2.ts
index b9d2c2ac9ee..da2ee14b730 100644
--- a/tests/cases/compiler/commentsOnObjectLiteral2.ts
+++ b/tests/cases/compiler/commentsOnObjectLiteral2.ts
@@ -8,6 +8,6 @@ var Person = makeClass(
         */ 
        initialize: function(name) { 
            this.name = name; 
-       }, 
+       } /* trailing comment 1*/, 
    } 
 );
\ No newline at end of file
diff --git a/tests/cases/compiler/commentsOnObjectLiteral3.ts b/tests/cases/compiler/commentsOnObjectLiteral3.ts
index 23993b84bb2..6650b21e167 100644
--- a/tests/cases/compiler/commentsOnObjectLiteral3.ts
+++ b/tests/cases/compiler/commentsOnObjectLiteral3.ts
@@ -1,8 +1,9 @@
 // @comments: true
+// @target: ES5
 
 var v = {
  //property
- prop: 1,
+ prop: 1 /* multiple trailing comments */ /*trailing comments*/,
  //property
  func: function () {
  },
@@ -11,9 +12,9 @@ var v = {
  //getter
  get a() {
   return this.prop;
- },
+ } /*trailing 1*/,
  //setter
  set a(value) {
   this.prop = value;
- }
+ } // trailing 2
 };
diff --git a/tests/cases/compiler/commentsOnObjectLiteral4.ts b/tests/cases/compiler/commentsOnObjectLiteral4.ts
index 360ce0bb6d7..e13668530c7 100644
--- a/tests/cases/compiler/commentsOnObjectLiteral4.ts
+++ b/tests/cases/compiler/commentsOnObjectLiteral4.ts
@@ -1,4 +1,5 @@
 // @comments: true
+// @target: ES5
 
 var v = {
  /**
diff --git a/tests/cases/compiler/commentsTypeParameters.ts b/tests/cases/compiler/commentsTypeParameters.ts
new file mode 100644
index 00000000000..4fc3a30a192
--- /dev/null
+++ b/tests/cases/compiler/commentsTypeParameters.ts
@@ -0,0 +1,17 @@
+// @declaration: true
+// @comments: true
+class C</**docComment for type parameter*/ T> {
+    method</**docComment of method type parameter */ U extends T>(a: U) {
+    }
+    static staticmethod</**docComment of method type parameter */ U>(a: U) {
+    }
+
+    private privatemethod</**docComment of method type parameter */ U extends T>(a: U) {
+    }
+    private static privatestaticmethod</**docComment of method type parameter */ U>(a: U) {
+    }
+}
+
+function compare</**type*/T>(a: T, b: T) {
+    return a === b;
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/commentsVarDecl.ts b/tests/cases/compiler/commentsVarDecl.ts
index fc33a1688ac..3b7d56e4078 100644
--- a/tests/cases/compiler/commentsVarDecl.ts
+++ b/tests/cases/compiler/commentsVarDecl.ts
@@ -3,7 +3,7 @@
 // @comments: true
 
 /** Variable comments*/
-var myVariable = 10;
+var myVariable = 10; // This trailing Comment1
 
 /** This is another variable comment*/
 var anotherVariable = 30;
@@ -13,13 +13,13 @@ var aVar = "";
 
 /** this is multiline comment
   * All these variables are of number type */
-var anotherAnotherVariable = 70;
+var anotherAnotherVariable = 70; /* these are multiple trailing comments */ /* multiple trailing comments */
 
 /** Triple slash multiline comment*/
 /** another line in the comment*/
 /** comment line 2*/
-var x = 70;
-
+var x = 70; /* multiline trailing comment 
+this is multiline trailing comment */
 /** Triple slash comment on the assignement shouldnt be in .d.ts file*/
 x = myVariable;
 
diff --git a/tests/cases/compiler/complicatedPrivacy.ts b/tests/cases/compiler/complicatedPrivacy.ts
index 917f505241d..6c1e3fa8527 100644
--- a/tests/cases/compiler/complicatedPrivacy.ts
+++ b/tests/cases/compiler/complicatedPrivacy.ts
@@ -1,3 +1,4 @@
+// @target: es5
 module m1 {
     export module m2 {
 
diff --git a/tests/cases/compiler/constructorArgsErrors3.ts b/tests/cases/compiler/constructorArgsErrors3.ts
new file mode 100644
index 00000000000..9d1979c0509
--- /dev/null
+++ b/tests/cases/compiler/constructorArgsErrors3.ts
@@ -0,0 +1,4 @@
+class foo {
+    constructor (public public a: number) {
+    }
+}
diff --git a/tests/cases/compiler/constructorArgsErrors4.ts b/tests/cases/compiler/constructorArgsErrors4.ts
new file mode 100644
index 00000000000..f058eaccef5
--- /dev/null
+++ b/tests/cases/compiler/constructorArgsErrors4.ts
@@ -0,0 +1,4 @@
+class foo {
+    constructor (private public a: number) {
+    }
+}
diff --git a/tests/cases/compiler/constructorArgsErrors5.ts b/tests/cases/compiler/constructorArgsErrors5.ts
new file mode 100644
index 00000000000..55f97d691f9
--- /dev/null
+++ b/tests/cases/compiler/constructorArgsErrors5.ts
@@ -0,0 +1,4 @@
+class foo {
+    constructor (export a: number) {
+    }
+}
diff --git a/tests/cases/compiler/constructorsWithSpecializedSignatures.ts b/tests/cases/compiler/constructorsWithSpecializedSignatures.ts
new file mode 100644
index 00000000000..49af660fee1
--- /dev/null
+++ b/tests/cases/compiler/constructorsWithSpecializedSignatures.ts
@@ -0,0 +1,43 @@
+// errors
+declare class C {
+    constructor(x: "hi");
+    constructor(x: "foo");
+    constructor(x: number);
+}
+
+// ok
+declare class C2 {
+    constructor(x: "hi");
+    constructor(x: "foo");
+    constructor(x: string);
+}
+
+// errors
+class D {
+    constructor(x: "hi");
+    constructor(x: "foo");
+    constructor(x: number);
+    constructor(x: "hi") { }
+}
+
+// overloads are ok
+class D2 {
+    constructor(x: "hi");
+    constructor(x: "foo");
+    constructor(x: string);
+    constructor(x: "hi") { } // error
+}
+
+// errors
+interface I {
+    new (x: "hi");
+    new (x: "foo");
+    new (x: number);
+}
+
+// ok
+interface I2 {
+    new (x: "hi");
+    new (x: "foo");
+    new (x: string);
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/contextualSignatureInstantiation3.ts b/tests/cases/compiler/contextualSignatureInstantiation3.ts
new file mode 100644
index 00000000000..a71f08d209d
--- /dev/null
+++ b/tests/cases/compiler/contextualSignatureInstantiation3.ts
@@ -0,0 +1,22 @@
+function map<T, U>(items: T[], f: (x: T) => U): U[]{
+    return items.map(f);
+}
+
+function identity<T>(x: T) {
+    return x;
+}
+
+function singleton<T>(x: T) {
+    return [x];
+}
+
+var xs = [1, 2, 3];
+
+// Have compiler check that we get the correct types
+var v1: number[];
+var v1 = xs.map(identity);      // Error if not number[]
+var v1 = map(xs, identity);     // Error if not number[]
+
+var v2: number[][];         
+var v2 = xs.map(singleton);     // Error if not number[][]
+var v2 = map(xs, singleton);    // Error if not number[][]
diff --git a/tests/cases/compiler/contextualTyping.ts b/tests/cases/compiler/contextualTyping.ts
index 408e878f8a4..e378fd82065 100644
--- a/tests/cases/compiler/contextualTyping.ts
+++ b/tests/cases/compiler/contextualTyping.ts
@@ -1,3 +1,4 @@
+// @newline: \n
 // @sourcemap: true
 // DEFAULT INTERFACES
 interface IFoo {
@@ -228,4 +229,4 @@ Point.prototype = {
 
 interface A { x: string; }
 interface B extends A { }
-var x: B = { };
\ No newline at end of file
+var x: B = { };
diff --git a/tests/cases/compiler/convertKeywordsYes.ts b/tests/cases/compiler/convertKeywordsYes.ts
index ac5d52aa494..ad50ce50e8e 100644
--- a/tests/cases/compiler/convertKeywordsYes.ts
+++ b/tests/cases/compiler/convertKeywordsYes.ts
@@ -21,20 +21,16 @@ var declare = 0;
 
 function bigGeneric<
     constructor,
-    any,
-    boolean,
     implements ,
     interface ,
     let,
     module ,
-    number,
     package,
     private ,
     protected,
     public ,
     set ,
     static ,
-    string,
     get ,
     yield,
     declare
@@ -293,20 +289,16 @@ enum bigEnum {
 
 module bigModule {
     class constructor { }
-    class any { }
-    class boolean { }
     class implements { }
     class interface { }
     class let { }
     class module { }
-    class number { }
     class package { }
     class private { }
     class protected { }
     class public { }
     class set { }
     class static { }
-    class string { }
     class get { }
     class yield { }
     class declare { }
diff --git a/tests/cases/compiler/cyclicModuleImport.ts b/tests/cases/compiler/cyclicModuleImport.ts
index 88cb378c9c9..1a17860805e 100644
--- a/tests/cases/compiler/cyclicModuleImport.ts
+++ b/tests/cases/compiler/cyclicModuleImport.ts
@@ -1,3 +1,4 @@
+// @declaration: true
 declare module "SubModule" {
     import MainModule = require('MainModule');
     class SubModule {
diff --git a/tests/cases/compiler/declFileAccessors.ts b/tests/cases/compiler/declFileAccessors.ts
new file mode 100644
index 00000000000..ea9b05f2fef
--- /dev/null
+++ b/tests/cases/compiler/declFileAccessors.ts
@@ -0,0 +1,104 @@
+// @target: ES5
+// @declaration: true
+// @comments: true
+// @module: commonjs
+
+// @Filename: declFileAccessors_0.ts
+/** This is comment for c1*/
+export class c1 {
+    /** getter property*/
+    public get p3() {
+        return 10;
+    }
+    /** setter property*/
+    public set p3(/** this is value*/value: number) {
+    }
+    /** private getter property*/
+    private get pp3() {
+        return 10;
+    }
+    /** private setter property*/
+    private set pp3(/** this is value*/value: number) {
+    }
+    /** static getter property*/
+    static get s3() {
+        return 10;
+    }
+    /** setter property*/
+    static set s3( /** this is value*/value: number) {
+    }
+    public get nc_p3() {
+        return 10;
+    }
+    public set nc_p3(value: number) {
+    }
+    private get nc_pp3() {
+        return 10;
+    }
+    private set nc_pp3(value: number) {
+    }
+    static get nc_s3() {
+        return "";
+    }
+    static set nc_s3(value: string) {
+    }
+
+    // Only getter property
+    public get onlyGetter() {
+        return 10;
+    }
+
+    // Only setter property
+    public set onlySetter(value: number) {
+    }
+}
+
+// @Filename: declFileAccessors_1.ts
+/** This is comment for c2 - the global class*/
+class c2 {
+    /** getter property*/
+    public get p3() {
+        return 10;
+    }
+    /** setter property*/
+    public set p3(/** this is value*/value: number) {
+    }
+    /** private getter property*/
+    private get pp3() {
+        return 10;
+    }
+    /** private setter property*/
+    private set pp3(/** this is value*/value: number) {
+    }
+    /** static getter property*/
+    static get s3() {
+        return 10;
+    }
+    /** setter property*/
+    static set s3( /** this is value*/value: number) {
+    }
+    public get nc_p3() {
+        return 10;
+    }
+    public set nc_p3(value: number) {
+    }
+    private get nc_pp3() {
+        return 10;
+    }
+    private set nc_pp3(value: number) {
+    }
+    static get nc_s3() {
+        return "";
+    }
+    static set nc_s3(value: string) {
+    }
+
+    // Only getter property
+    public get onlyGetter() {
+        return 10;
+    }
+
+    // Only setter property
+    public set onlySetter(value: number) {
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/declFileCallSignatures.ts b/tests/cases/compiler/declFileCallSignatures.ts
new file mode 100644
index 00000000000..9ff74730fbf
--- /dev/null
+++ b/tests/cases/compiler/declFileCallSignatures.ts
@@ -0,0 +1,68 @@
+// @target: ES5
+// @declaration: true
+// @comments: true
+// @module: commonjs
+
+// @Filename: declFileCallSignatures_0.ts
+export interface ICallSignature {
+    /** This comment should appear for foo*/
+    (): string;
+}
+
+export interface ICallSignatureWithParameters {
+    /** This is comment for function signature*/
+    (/** this is comment about a*/a: string,
+        /** this is comment for b*/
+        b: number): void;
+}
+
+export interface ICallSignatureWithRestParameters {
+    (a: string, ...rests: string[]): string;
+}
+
+export interface ICallSignatureWithOverloads {
+    (a: string): string;
+    (a: number): number;
+}
+
+export interface ICallSignatureWithTypeParameters<T> {
+    /** This comment should appear for foo*/
+    (a: T): string;
+}
+
+export interface ICallSignatureWithOwnTypeParametes {
+    <T extends ICallSignature>(a: T): string;
+}
+
+// @Filename: declFileCallSignatures_1.ts
+interface IGlobalCallSignature {
+    /** This comment should appear for foo*/
+    (): string;
+}
+
+interface IGlobalCallSignatureWithParameters {
+    /** This is comment for function signature*/
+    (/** this is comment about a*/a: string,
+        /** this is comment for b*/
+        b: number): void;
+}
+
+interface IGlobalCallSignatureWithRestParameters {
+
+    (a: string, ...rests: string[]): string;
+
+}
+
+interface IGlobalCallSignatureWithOverloads {
+    (a: string): string;
+    (a: number): number;
+}
+
+interface IGlobalCallSignatureWithTypeParameters<T> {
+    /** This comment should appear for foo*/
+    (a: T): string;
+}
+
+interface IGlobalCallSignatureWithOwnTypeParametes {
+    <T extends IGlobalCallSignature>(a: T): string;
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/declFileConstructSignatures.ts b/tests/cases/compiler/declFileConstructSignatures.ts
new file mode 100644
index 00000000000..b81e4f831ea
--- /dev/null
+++ b/tests/cases/compiler/declFileConstructSignatures.ts
@@ -0,0 +1,68 @@
+// @target: ES5
+// @declaration: true
+// @comments: true
+// @module: commonjs
+
+// @Filename: declFileConstructSignatures_0.ts
+export interface IConstructSignature {
+    /** This comment should appear for foo*/
+    new (): string;
+}
+
+export interface IConstructSignatureWithParameters {
+    /** This is comment for function signature*/
+    new (/** this is comment about a*/a: string,
+        /** this is comment for b*/
+        b: number);
+}
+
+export interface IConstructSignatureWithRestParameters {
+    new (a: string, ...rests: string[]): string;
+}
+
+export interface IConstructSignatureWithOverloads {
+    new (a: string): string;
+    new (a: number): number;
+}
+
+export interface IConstructSignatureWithTypeParameters<T> {
+    /** This comment should appear for foo*/
+    new (a: T): T;
+}
+
+export interface IConstructSignatureWithOwnTypeParametes {
+    new <T extends IConstructSignature>(a: T): T;
+}
+
+// @Filename: declFileConstructSignatures_1.ts
+interface IGlobalConstructSignature {
+    /** This comment should appear for foo*/
+    new (): string;
+}
+
+interface IGlobalConstructSignatureWithParameters {
+    /** This is comment for function signature*/
+    new (/** this is comment about a*/a: string,
+        /** this is comment for b*/
+        b: number);
+}
+
+interface IGlobalConstructSignatureWithRestParameters {
+
+    new (a: string, ...rests: string[]): string;
+
+}
+
+interface IGlobalConstructSignatureWithOverloads {
+    new (a: string): string;
+    new (a: number): number;
+}
+
+interface IGlobalConstructSignatureWithTypeParameters<T> {
+    /** This comment should appear for foo*/
+    new (a: T): T;
+}
+
+interface IGlobalConstructSignatureWithOwnTypeParametes {
+    new <T extends IGlobalConstructSignature>(a: T): T;
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/declFileConstructors.ts b/tests/cases/compiler/declFileConstructors.ts
new file mode 100644
index 00000000000..c1f4862e44c
--- /dev/null
+++ b/tests/cases/compiler/declFileConstructors.ts
@@ -0,0 +1,100 @@
+// @target: ES5
+// @declaration: true
+// @comments: true
+// @module: commonjs
+
+// @Filename: declFileConstructors_0.ts
+export class SimpleConstructor {
+    /** This comment should appear for foo*/
+    constructor() {
+    }
+}
+export class ConstructorWithParameters {
+    /** This is comment for function signature*/
+    constructor(/** this is comment about a*/a: string,
+        /** this is comment for b*/
+        b: number) {
+        var d = a;
+    }
+}
+
+export class ConstructorWithRestParamters {
+    constructor(a: string, ...rests: string[]) {
+        return a + rests.join("");
+    }
+}
+
+export class ConstructorWithOverloads {
+    constructor(a: string);
+    constructor(a: number);
+    constructor(a: any) {
+    }
+}
+
+export class ConstructorWithPublicParameterProperty {
+    constructor(public x: string) {
+    }
+}
+
+export class ConstructorWithPrivateParameterProperty {
+    constructor(private x: string) {
+    }
+}
+
+export class ConstructorWithOptionalParameterProperty {
+    constructor(public x?: string) {
+    }
+}
+
+export class ConstructorWithParameterInitializer {
+    constructor(public x = "hello") {
+    }
+}
+
+// @Filename: declFileConstructors_1.ts
+class GlobalSimpleConstructor {
+    /** This comment should appear for foo*/
+    constructor() {
+    }
+}
+class GlobalConstructorWithParameters {
+    /** This is comment for function signature*/
+    constructor(/** this is comment about a*/a: string,
+        /** this is comment for b*/
+        b: number) {
+        var d = a;
+    }
+}
+
+class GlobalConstructorWithRestParamters {
+    constructor(a: string, ...rests: string[]) {
+        return a + rests.join("");
+    }
+}
+
+class GlobalConstructorWithOverloads {
+    constructor(a: string);
+    constructor(a: number);
+    constructor(a: any) {
+    }
+}
+
+class GlobalConstructorWithPublicParameterProperty {
+    constructor(public x: string) {
+    }
+}
+
+class GlobalConstructorWithPrivateParameterProperty {
+    constructor(private x: string) {
+    }
+}
+
+class GlobalConstructorWithOptionalParameterProperty {
+    constructor(public x?: string) {
+    }
+}
+
+class GlobalConstructorWithParameterInitializer {
+    constructor(public x = "hello") {
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/declFileFunctions.ts b/tests/cases/compiler/declFileFunctions.ts
new file mode 100644
index 00000000000..ead3fdd1f25
--- /dev/null
+++ b/tests/cases/compiler/declFileFunctions.ts
@@ -0,0 +1,62 @@
+// @target: ES5
+// @declaration: true
+// @comments: true
+// @module: commonjs
+
+// @Filename: declFileFunctions_0.ts
+/** This comment should appear for foo*/
+export function foo() {
+}
+/** This is comment for function signature*/
+export function fooWithParameters(/** this is comment about a*/a: string,
+    /** this is comment for b*/
+    b: number) {
+    var d = a;
+}
+export function fooWithRestParameters(a: string, ...rests: string[]) {
+    return a + rests.join("");
+}
+
+export function fooWithOverloads(a: string): string;
+export function fooWithOverloads(a: number): number;
+export function fooWithOverloads(a: any): any {
+    return a;
+}
+
+/** This comment should appear for nonExportedFoo*/
+function nonExportedFoo() {
+}
+/** This is comment for function signature*/
+function nonExportedFooWithParameters(/** this is comment about a*/a: string,
+    /** this is comment for b*/
+    b: number) {
+    var d = a;
+}
+function nonExportedFooWithRestParameters(a: string, ...rests: string[]) {
+    return a + rests.join("");
+}
+
+function nonExportedFooWithOverloads(a: string): string;
+function nonExportedFooWithOverloads(a: number): number;
+function nonExportedFooWithOverloads(a: any): any {
+    return a;
+}
+
+// @Filename: declFileFunctions_1.ts
+/** This comment should appear for foo*/
+function globalfoo() {
+}
+/** This is comment for function signature*/
+function globalfooWithParameters(/** this is comment about a*/a: string,
+    /** this is comment for b*/
+    b: number) {
+    var d = a;
+}
+function globalfooWithRestParameters(a: string, ...rests: string[]) {
+    return a + rests.join("");
+}
+function globalfooWithOverloads(a: string): string;
+function globalfooWithOverloads(a: number): number;
+function globalfooWithOverloads(a: any): any {
+    return a;
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/declFileImportChainInExportAssignment.ts b/tests/cases/compiler/declFileImportChainInExportAssignment.ts
new file mode 100644
index 00000000000..da18e81a6c6
--- /dev/null
+++ b/tests/cases/compiler/declFileImportChainInExportAssignment.ts
@@ -0,0 +1,11 @@
+// @declaration: true
+// @module: commonjs
+module m {
+    export module c {
+        export class c {
+        }
+    }
+}
+import a = m.c;
+import b = a;
+export = b;
\ No newline at end of file
diff --git a/tests/cases/compiler/declFileIndexSignatures.ts b/tests/cases/compiler/declFileIndexSignatures.ts
new file mode 100644
index 00000000000..3c9aaf34bfc
--- /dev/null
+++ b/tests/cases/compiler/declFileIndexSignatures.ts
@@ -0,0 +1,38 @@
+// @target: ES5
+// @declaration: true
+// @comments: true
+// @module: commonjs
+
+// @Filename: declFileIndexSignatures_0.ts
+export interface IStringIndexSignature {
+    [s: string]: string;
+}
+export interface INumberIndexSignature {
+    [n: number]: number;
+}
+
+export interface IBothIndexSignature {
+    [s: string]: any;
+    [n: number]: number;
+}
+
+export interface IIndexSignatureWithTypeParameter<T> {
+    [a: string]: T;
+}
+
+// @Filename: declFileIndexSignatures_1.ts
+interface IGlobalStringIndexSignature {
+    [s: string]: string;
+}
+interface IGlobalNumberIndexSignature {
+    [n: number]: number;
+}
+
+interface IGlobalBothIndexSignature {
+    [s: string]: any;
+    [n: number]: number;
+}
+
+interface IGlobalIndexSignatureWithTypeParameter<T> {
+    [a: string]: T;
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/declFileMethods.ts b/tests/cases/compiler/declFileMethods.ts
new file mode 100644
index 00000000000..a5c31728ccd
--- /dev/null
+++ b/tests/cases/compiler/declFileMethods.ts
@@ -0,0 +1,192 @@
+// @target: ES5
+// @declaration: true
+// @comments: true
+// @module: commonjs
+
+// @Filename: declFileMethods_0.ts
+export class c1 {
+    /** This comment should appear for foo*/
+    public foo() {
+    }
+    /** This is comment for function signature*/
+    public fooWithParameters(/** this is comment about a*/a: string,
+        /** this is comment for b*/
+        b: number) {
+        var d = a;
+    }
+    public fooWithRestParameters(a: string, ...rests: string[]) {
+        return a + rests.join("");
+    }
+
+    public fooWithOverloads(a: string): string;
+    public fooWithOverloads(a: number): number;
+    public fooWithOverloads(a: any): any {
+        return a;
+    }
+
+
+    /** This comment should appear for privateFoo*/
+    private privateFoo() {
+    }
+    /** This is comment for function signature*/
+    private privateFooWithParameters(/** this is comment about a*/a: string,
+        /** this is comment for b*/
+        b: number) {
+        var d = a;
+    }
+    private privateFooWithRestParameters(a: string, ...rests: string[]) {
+        return a + rests.join("");
+    }
+    private privateFooWithOverloads(a: string): string;
+    private privateFooWithOverloads(a: number): number;
+    private privateFooWithOverloads(a: any): any {
+        return a;
+    }
+
+
+    /** This comment should appear for static foo*/
+    static staticFoo() {
+    }
+    /** This is comment for function signature*/
+    static staticFooWithParameters(/** this is comment about a*/a: string,
+        /** this is comment for b*/
+        b: number) {
+        var d = a;
+    }
+    static staticFooWithRestParameters(a: string, ...rests: string[]) {
+        return a + rests.join("");
+    }
+    static staticFooWithOverloads(a: string): string;
+    static staticFooWithOverloads(a: number): number;
+    static staticFooWithOverloads(a: any): any {
+        return a;
+    }
+
+
+    /** This comment should appear for privateStaticFoo*/
+    private static privateStaticFoo() {
+    }
+    /** This is comment for function signature*/
+    private static privateStaticFooWithParameters(/** this is comment about a*/a: string,
+        /** this is comment for b*/
+        b: number) {
+        var d = a;
+    }
+    private static privateStaticFooWithRestParameters(a: string, ...rests: string[]) {
+        return a + rests.join("");
+    }
+    private static privateStaticFooWithOverloads(a: string): string;
+    private static privateStaticFooWithOverloads(a: number): number;
+    private static privateStaticFooWithOverloads(a: any): any {
+        return a;
+    }
+}
+
+export interface I1 {
+    /** This comment should appear for foo*/
+    foo(): string;
+
+    /** This is comment for function signature*/
+    fooWithParameters(/** this is comment about a*/a: string,
+        /** this is comment for b*/
+        b: number): void;
+
+    fooWithRestParameters(a: string, ...rests: string[]): string;
+
+    fooWithOverloads(a: string): string;
+    fooWithOverloads(a: number): number;
+}
+
+// @Filename: declFileMethods_1.ts
+class c2 {
+    /** This comment should appear for foo*/
+    public foo() {
+    }
+    /** This is comment for function signature*/
+    public fooWithParameters(/** this is comment about a*/a: string,
+        /** this is comment for b*/
+        b: number) {
+        var d = a;
+    }
+    public fooWithRestParameters(a: string, ...rests: string[]) {
+        return a + rests.join("");
+    }
+
+    public fooWithOverloads(a: string): string;
+    public fooWithOverloads(a: number): number;
+    public fooWithOverloads(a: any): any {
+        return a;
+    }
+
+
+    /** This comment should appear for privateFoo*/
+    private privateFoo() {
+    }
+    /** This is comment for function signature*/
+    private privateFooWithParameters(/** this is comment about a*/a: string,
+        /** this is comment for b*/
+        b: number) {
+        var d = a;
+    }
+    private privateFooWithRestParameters(a: string, ...rests: string[]) {
+        return a + rests.join("");
+    }
+    private privateFooWithOverloads(a: string): string;
+    private privateFooWithOverloads(a: number): number;
+    private privateFooWithOverloads(a: any): any {
+        return a;
+    }
+
+
+    /** This comment should appear for static foo*/
+    static staticFoo() {
+    }
+    /** This is comment for function signature*/
+    static staticFooWithParameters(/** this is comment about a*/a: string,
+        /** this is comment for b*/
+        b: number) {
+        var d = a;
+    }
+    static staticFooWithRestParameters(a: string, ...rests: string[]) {
+        return a + rests.join("");
+    }
+    static staticFooWithOverloads(a: string): string;
+    static staticFooWithOverloads(a: number): number;
+    static staticFooWithOverloads(a: any): any {
+        return a;
+    }
+
+
+    /** This comment should appear for privateStaticFoo*/
+    private static privateStaticFoo() {
+    }
+    /** This is comment for function signature*/
+    private static privateStaticFooWithParameters(/** this is comment about a*/a: string,
+        /** this is comment for b*/
+        b: number) {
+        var d = a;
+    }
+    private static privateStaticFooWithRestParameters(a: string, ...rests: string[]) {
+        return a + rests.join("");
+    }
+    private static privateStaticFooWithOverloads(a: string): string;
+    private static privateStaticFooWithOverloads(a: number): number;
+    private static privateStaticFooWithOverloads(a: any): any {
+        return a;
+    }
+}
+
+interface I2 {
+    /** This comment should appear for foo*/
+    foo(): string;
+
+    /** This is comment for function signature*/
+    fooWithParameters(/** this is comment about a*/a: string,
+        /** this is comment for b*/
+        b: number): void;
+
+    fooWithRestParameters(a: string, ...rests: string[]): string;
+
+    fooWithOverloads(a: string): string;
+    fooWithOverloads(a: number): number;
+}
diff --git a/tests/cases/compiler/declarationEmit_nameConflicts.ts b/tests/cases/compiler/declarationEmit_nameConflicts.ts
index 40ae28d8c14..66eb732ddae 100644
--- a/tests/cases/compiler/declarationEmit_nameConflicts.ts
+++ b/tests/cases/compiler/declarationEmit_nameConflicts.ts
@@ -1,6 +1,7 @@
 // @declaration: true
+// @module: commonjs
 // @Filename: declarationEmit_nameConflicts_1.ts
-function f() { }
+module f { export class c { } }
 export = f;
 
 // @Filename: declarationEmit_nameConflicts_0.ts
@@ -27,7 +28,6 @@ export module M.P {
         export interface I { }
     }
     export import im = M.P.f;
-    // Bug 887180: Invalid .d.ts when an aliased entity is referenced, and a different entity is closer in scope
     export var a = M.a; // emitted incorrectly as typeof f
     export var b = M.b; // ok
     export var c = M.c; // ok
diff --git a/tests/cases/compiler/declarationEmit_nameConflicts2.ts b/tests/cases/compiler/declarationEmit_nameConflicts2.ts
index d7dd5134e96..f0112fa9501 100644
--- a/tests/cases/compiler/declarationEmit_nameConflicts2.ts
+++ b/tests/cases/compiler/declarationEmit_nameConflicts2.ts
@@ -9,7 +9,6 @@ module X.Y.base {
 }
 
 module X.Y.base.Z {
-    // Bug 887180
     export var f = X.Y.base.f; // Should be base.f
     export var C = X.Y.base.C; // Should be base.C
     export var M = X.Y.base.M; // Should be base.M
diff --git a/tests/cases/compiler/declarationEmit_nameConflicts3.ts b/tests/cases/compiler/declarationEmit_nameConflicts3.ts
index 98f7ce91d5e..6edc1056fa2 100644
--- a/tests/cases/compiler/declarationEmit_nameConflicts3.ts
+++ b/tests/cases/compiler/declarationEmit_nameConflicts3.ts
@@ -1,4 +1,5 @@
 // @declaration: true
+// @module: commonjs
 module M {
     export interface D { }
     export module D {
@@ -20,7 +21,6 @@ module M.P {
     export enum D {
         f
     }
-    // Bug 887180
     export var v: M.D; // ok
     export var w = M.D.f; // error, should be typeof M.D.f
     export var x = M.C.f; // error, should be typeof M.C.f
diff --git a/tests/cases/compiler/declarationEmit_nameConflictsWithAlias.ts b/tests/cases/compiler/declarationEmit_nameConflictsWithAlias.ts
index e6771f2d848..50fc2484a4a 100644
--- a/tests/cases/compiler/declarationEmit_nameConflictsWithAlias.ts
+++ b/tests/cases/compiler/declarationEmit_nameConflictsWithAlias.ts
@@ -1,5 +1,5 @@
 // @declaration: true
-// Bug 887180
+// @module: commonjs
 export module C { export interface I { } }
 export import v = C;
 export module M {
diff --git a/tests/cases/compiler/declareFileExportAssignmentWithVarFromVariableStatement.ts b/tests/cases/compiler/declareFileExportAssignmentWithVarFromVariableStatement.ts
new file mode 100644
index 00000000000..4333b9c1050
--- /dev/null
+++ b/tests/cases/compiler/declareFileExportAssignmentWithVarFromVariableStatement.ts
@@ -0,0 +1,20 @@
+//@module: commonjs
+// @declaration: true
+module m2 {
+    export interface connectModule {
+        (res, req, next): void;
+    }
+    export interface connectExport {
+        use: (mod: connectModule) => connectExport;
+        listen: (port: number) => void;
+    }
+
+}
+
+var x = 10, m2: {
+    (): m2.connectExport;
+    test1: m2.connectModule;
+    test2(): m2.connectModule;
+};
+
+export = m2;
\ No newline at end of file
diff --git a/tests/cases/compiler/detachedCommentAtStartOfConstructor1.ts b/tests/cases/compiler/detachedCommentAtStartOfConstructor1.ts
new file mode 100644
index 00000000000..84a72d3595b
--- /dev/null
+++ b/tests/cases/compiler/detachedCommentAtStartOfConstructor1.ts
@@ -0,0 +1,10 @@
+class TestFile {
+    public message: string;
+    public name;
+    constructor(message: string) {
+        /// <summary>Test summary</summary>
+        /// <param name="message" type="String" />
+        var getMessage = () => message + this.name;
+        this.message = getMessage();
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/detachedCommentAtStartOfConstructor2.ts b/tests/cases/compiler/detachedCommentAtStartOfConstructor2.ts
new file mode 100644
index 00000000000..e115afec607
--- /dev/null
+++ b/tests/cases/compiler/detachedCommentAtStartOfConstructor2.ts
@@ -0,0 +1,11 @@
+class TestFile {
+    public message: string;
+    public name: string;
+    constructor(message: string) {
+        /// <summary>Test summary</summary>
+        /// <param name="message" type="String" />
+
+        var getMessage = () => message + this.name;
+        this.message = getMessage();
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/detachedCommentAtStartOfLambdaFunction1.ts b/tests/cases/compiler/detachedCommentAtStartOfLambdaFunction1.ts
new file mode 100644
index 00000000000..cd18872780e
--- /dev/null
+++ b/tests/cases/compiler/detachedCommentAtStartOfLambdaFunction1.ts
@@ -0,0 +1,10 @@
+class TestFile {
+    name: string;
+    foo(message: string): () => string {
+        return (...x: string[]) =>
+            /// <summary>Test summary</summary>
+            /// <param name="message" type="String" />
+            /// <returns type="Function" />
+            message + this.name;
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/detachedCommentAtStartOfLambdaFunction2.ts b/tests/cases/compiler/detachedCommentAtStartOfLambdaFunction2.ts
new file mode 100644
index 00000000000..a7d591440e3
--- /dev/null
+++ b/tests/cases/compiler/detachedCommentAtStartOfLambdaFunction2.ts
@@ -0,0 +1,11 @@
+class TestFile {
+    name: string;
+    foo(message: string): () => string {
+        return (...x: string[]) =>
+            /// <summary>Test summary</summary>
+            /// <param name="message" type="String" />
+            /// <returns type="Function" />
+
+            message + this.name;
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/duplicatePropertiesInStrictMode.ts b/tests/cases/compiler/duplicatePropertiesInStrictMode.ts
new file mode 100644
index 00000000000..bea869f93a4
--- /dev/null
+++ b/tests/cases/compiler/duplicatePropertiesInStrictMode.ts
@@ -0,0 +1,5 @@
+"use strict";
+var x = {
+  x: 1,
+  x: 2
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/duplicateVarAndImport.ts b/tests/cases/compiler/duplicateVarAndImport.ts
new file mode 100644
index 00000000000..f8daf5ea9c9
--- /dev/null
+++ b/tests/cases/compiler/duplicateVarAndImport.ts
@@ -0,0 +1,5 @@
+// no error since module is not instantiated
+
+var a;
+module M { }
+import a = M;
\ No newline at end of file
diff --git a/tests/cases/compiler/duplicateVarAndImport2.ts b/tests/cases/compiler/duplicateVarAndImport2.ts
new file mode 100644
index 00000000000..f42b2bcf50b
--- /dev/null
+++ b/tests/cases/compiler/duplicateVarAndImport2.ts
@@ -0,0 +1,4 @@
+// error since module is instantiated
+var a;
+module M { export var x = 1; }
+import a = M;
\ No newline at end of file
diff --git a/tests/cases/compiler/emitBOM.ts b/tests/cases/compiler/emitBOM.ts
new file mode 100644
index 00000000000..f503cd4de7b
--- /dev/null
+++ b/tests/cases/compiler/emitBOM.ts
@@ -0,0 +1,6 @@
+//@emitBOM: true
+//@declaration: true
+//@sourcemap: true
+
+// JS and d.ts output should have a BOM but not the sourcemap
+var x;
\ No newline at end of file
diff --git a/tests/cases/compiler/emptyTypeArgumentList.ts b/tests/cases/compiler/emptyTypeArgumentList.ts
new file mode 100644
index 00000000000..f06bbc3afd2
--- /dev/null
+++ b/tests/cases/compiler/emptyTypeArgumentList.ts
@@ -0,0 +1,2 @@
+function foo<T>() { }
+foo<>();
\ No newline at end of file
diff --git a/tests/cases/compiler/emptyTypeArgumentListWithNew.ts b/tests/cases/compiler/emptyTypeArgumentListWithNew.ts
new file mode 100644
index 00000000000..3a4926f5a8a
--- /dev/null
+++ b/tests/cases/compiler/emptyTypeArgumentListWithNew.ts
@@ -0,0 +1,2 @@
+class foo<T> { }
+new foo<>();
\ No newline at end of file
diff --git a/tests/cases/compiler/enumBasics1.ts b/tests/cases/compiler/enumBasics1.ts
index 5401cc77779..b3614d5bcc2 100644
--- a/tests/cases/compiler/enumBasics1.ts
+++ b/tests/cases/compiler/enumBasics1.ts
@@ -31,7 +31,7 @@ enum E2 {
 	B,
 }
 
-enum E2 { // shouldn't error
+enum E2 { // should error for continued autonumbering
 	C,
 	D,
 }
\ No newline at end of file
diff --git a/tests/cases/compiler/enumInitializersWithExponents.ts b/tests/cases/compiler/enumInitializersWithExponents.ts
new file mode 100644
index 00000000000..6cc88a6c7cd
--- /dev/null
+++ b/tests/cases/compiler/enumInitializersWithExponents.ts
@@ -0,0 +1,9 @@
+// Must be integer literals.
+declare enum E {
+    a = 1e3, // ok
+    b = 1e25, // ok
+    c = 1e-3, // error
+    d = 1e-9, // error
+    e = 1e0, // ok
+    f = 1e+25 // ok
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/exportAssignmentWithDeclareAndExportModifiers.ts b/tests/cases/compiler/exportAssignmentWithDeclareAndExportModifiers.ts
new file mode 100644
index 00000000000..02e40fd3645
--- /dev/null
+++ b/tests/cases/compiler/exportAssignmentWithDeclareAndExportModifiers.ts
@@ -0,0 +1,2 @@
+var x;
+export declare export = x;
\ No newline at end of file
diff --git a/tests/cases/compiler/exportAssignmentWithDeclareModifier.ts b/tests/cases/compiler/exportAssignmentWithDeclareModifier.ts
new file mode 100644
index 00000000000..e38f7fa8d38
--- /dev/null
+++ b/tests/cases/compiler/exportAssignmentWithDeclareModifier.ts
@@ -0,0 +1,2 @@
+var x;
+declare export = x;
\ No newline at end of file
diff --git a/tests/cases/compiler/exportAssignmentWithExportModifier.ts b/tests/cases/compiler/exportAssignmentWithExportModifier.ts
new file mode 100644
index 00000000000..c6b543caeec
--- /dev/null
+++ b/tests/cases/compiler/exportAssignmentWithExportModifier.ts
@@ -0,0 +1,2 @@
+var x;
+export export = x;
\ No newline at end of file
diff --git a/tests/cases/compiler/externalModuleResolution.ts b/tests/cases/compiler/externalModuleResolution.ts
index b439a353b97..8c0d3bf7e3f 100644
--- a/tests/cases/compiler/externalModuleResolution.ts
+++ b/tests/cases/compiler/externalModuleResolution.ts
@@ -1,4 +1,10 @@
 //@module: commonjs
+// @Filename: foo.d.ts
+declare module M1 {
+    export var X:number;
+}
+export = M1
+
 // @Filename: foo.ts
 module M2 {
     export var Y = 1;
diff --git a/tests/cases/compiler/externalModuleResolution2.ts b/tests/cases/compiler/externalModuleResolution2.ts
index 12d8bfbaf2b..28d9c44f061 100644
--- a/tests/cases/compiler/externalModuleResolution2.ts
+++ b/tests/cases/compiler/externalModuleResolution2.ts
@@ -5,6 +5,12 @@ module M2 {
 }
 export = M2
 
+// @Filename: foo.d.ts
+declare module M1 {
+    export var Y:number;
+}
+export = M1
+
 
 // @Filename: consumer.ts
 import x = require('./foo');
diff --git a/tests/cases/compiler/fileReferencesWithNoExtensions.ts b/tests/cases/compiler/fileReferencesWithNoExtensions.ts
new file mode 100644
index 00000000000..40fa3fccbdd
--- /dev/null
+++ b/tests/cases/compiler/fileReferencesWithNoExtensions.ts
@@ -0,0 +1,19 @@
+// @Filename: t.ts
+/// <reference path="a"/>
+/// <reference path="b"/>
+/// <reference path="c"/>
+var a = aa;  // Check that a.ts is referenced
+var b = bb;  // Check that b.d.ts is referenced
+var c = cc;  // Check that c.ts has precedence over c.d.ts
+
+// @Filename: a.ts
+var aa = 1;
+
+// @Filename: b.d.ts
+declare var bb: number;
+
+// @Filename: c.ts
+var cc = 1;
+
+// @Filename: c.d.ts
+declare var xx: number;
diff --git a/tests/cases/compiler/functionAndInterfaceWithSeparateErrors.ts b/tests/cases/compiler/functionAndInterfaceWithSeparateErrors.ts
new file mode 100644
index 00000000000..771e0488450
--- /dev/null
+++ b/tests/cases/compiler/functionAndInterfaceWithSeparateErrors.ts
@@ -0,0 +1,7 @@
+function Foo(s: string);
+function Foo(n: number) { }
+
+interface Foo {
+    [s: string]: string;
+    prop: number;
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/functionsMissingReturnStatementsAndExpressions.ts b/tests/cases/compiler/functionsMissingReturnStatementsAndExpressions.ts
new file mode 100644
index 00000000000..81259fd7c0c
--- /dev/null
+++ b/tests/cases/compiler/functionsMissingReturnStatementsAndExpressions.ts
@@ -0,0 +1,119 @@
+// @target: es5
+
+function f1(): string {
+    // errors because there are no return statements
+}
+
+function f2(): string {
+    // Permissible; returns undefined.
+    return;
+}
+
+function f3(): string {
+    return "Okay, because this is a return expression.";
+}
+
+function f4(): void {
+    // Fine since we are typed void.
+}
+
+function f5(): void {
+    // Fine since we are typed void.
+    return;
+}
+
+function f6(): void {
+    // Fine since we are typed void and return undefined
+    return undefined;
+}
+
+function f7(): void {
+    // Fine since we are typed void and return null
+    return null;
+}
+
+function f8(): void {
+    // Fine since are typed any.
+    return;
+}
+
+function f9(): void {
+    // Fine since we are typed any and return undefined
+    return undefined;
+}
+
+function f10(): void {
+    // Fine since we are typed any and return null
+    return null;
+}
+
+function f11(): string {
+    // Fine since we consist of a single throw statement.
+    throw undefined;
+}
+
+function f12(): void {
+    // Fine since we consist of a single throw statement.
+    throw undefined;
+}
+
+function f13(): any {
+    // Fine since we consist of a single throw statement.
+    throw undefined;
+}
+
+function f14(): number {
+    // Not fine, since we can *only* consist of a single throw statement
+    // if no return statements are present but we are annotated.
+    throw undefined;
+    throw null;
+}
+
+function f15(): number {
+    // Fine, since we have a return statement somewhere.
+    throw undefined;
+    throw null;
+    return;
+}
+
+
+function f16() {
+    // Okay; not type annotated.
+}
+
+function f17() {
+    // Okay; not type annotated.
+    return;
+}
+
+function f18() {
+    return "Okay, not type annotated.";
+}
+
+
+class C {
+    public get m1() {
+        // Errors; get accessors must return a value.
+    }
+
+    public get m2() {
+        // Permissible; returns undefined.
+        return;
+    }
+
+    public get m3() {
+        return "Okay, because this is a return expression.";
+    }
+
+    public get m4() {
+        // Fine since this consists of a single throw statement.
+        throw null;
+    }
+
+    public get m5() {
+        // Not fine, since we can *only* consist of a single throw statement
+        // if no return statements are present but we are a get accessor.
+        throw null;
+        throw undefined.
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/genericTypeWithCallableMembers.ts b/tests/cases/compiler/genericTypeWithCallableMembers.ts
index 01a2e6fdd05..d3e06d405a2 100644
--- a/tests/cases/compiler/genericTypeWithCallableMembers.ts
+++ b/tests/cases/compiler/genericTypeWithCallableMembers.ts
@@ -5,7 +5,7 @@ interface Constructable {
 class C<T extends Constructable> {
     constructor(public data: T, public data2: Constructable) { }
     create() {
-        var x = new this.data(); // error
+        var x = new this.data(); // no error
         var x2 = new this.data2(); // was error, shouldn't be
     }
 }
diff --git a/tests/cases/compiler/implementGenericWithMismatchedTypes.ts b/tests/cases/compiler/implementGenericWithMismatchedTypes.ts
index 9383ad2a649..6e3c2d749af 100644
--- a/tests/cases/compiler/implementGenericWithMismatchedTypes.ts
+++ b/tests/cases/compiler/implementGenericWithMismatchedTypes.ts
@@ -14,7 +14,7 @@ interface IFoo2<T> {
     foo(x: T): T;
 }
 class C2<T> implements IFoo2<T> { // error
-    foo<string>(x: string): number {
+    foo<Tstring>(x: Tstring): number {
         return null;
     }
 }
\ No newline at end of file
diff --git a/tests/cases/compiler/importDecl.ts b/tests/cases/compiler/importDecl.ts
index 9efbc50f0b2..c28b332eb43 100644
--- a/tests/cases/compiler/importDecl.ts
+++ b/tests/cases/compiler/importDecl.ts
@@ -55,7 +55,6 @@ export module m1 {
 
 //Emit global only usage
 import glo_m4 = require("importDecl_require1");
-export var useGlo_m4_x4 = glo_m4.x;
 export var useGlo_m4_d4 = glo_m4.d;
 export var useGlo_m4_f4 = glo_m4.foo();
 
diff --git a/tests/cases/compiler/indexSignatureTypeInference.ts b/tests/cases/compiler/indexSignatureTypeInference.ts
new file mode 100644
index 00000000000..66fcb53d76c
--- /dev/null
+++ b/tests/cases/compiler/indexSignatureTypeInference.ts
@@ -0,0 +1,19 @@
+interface NumberMap<T> {
+    [index: number]: T;
+}
+
+interface StringMap<T> {
+    [index: string]: T;
+}
+
+declare function numberMapToArray<T>(object: NumberMap<T>): T[];
+declare function stringMapToArray<T>(object: StringMap<T>): T[];
+
+var numberMap: NumberMap<Function>;
+var stringMap: StringMap<Function>;
+
+var v1: Function[];
+var v1 = numberMapToArray(numberMap);  // Ok
+var v1 = numberMapToArray(stringMap);  // Ok
+var v1 = stringMapToArray(numberMap);  // Error expected here
+var v1 = stringMapToArray(stringMap);  // Ok
diff --git a/tests/cases/compiler/inheritedOverloadedSpecializedSignatures.ts b/tests/cases/compiler/inheritedOverloadedSpecializedSignatures.ts
new file mode 100644
index 00000000000..c513cecb2cb
--- /dev/null
+++ b/tests/cases/compiler/inheritedOverloadedSpecializedSignatures.ts
@@ -0,0 +1,36 @@
+interface A {
+  (key:string):void;
+}
+
+interface B extends A {
+  (key:'foo'):string;
+}
+
+var b:B;
+// Should not error
+b('foo').charAt(0);
+
+interface A {
+    (x: 'A1'): string;
+    (x: string): void;
+}
+
+interface B extends A {
+    (x: 'B1'): number;
+}
+
+interface A {
+    (x: 'A2'): boolean;
+}
+
+interface B  {
+    (x: 'B2'): string[];
+}
+
+var b: B;
+// non of these lines should error
+var x1: string[] = b('B2'); 
+var x2: number = b('B1');
+var x3: boolean = b('A2');
+var x4: string = b('A1');
+var x5: void = b('A0');
\ No newline at end of file
diff --git a/tests/cases/compiler/internalAliasWithDottedNameEmit.ts b/tests/cases/compiler/internalAliasWithDottedNameEmit.ts
index a906259715c..23192257125 100644
--- a/tests/cases/compiler/internalAliasWithDottedNameEmit.ts
+++ b/tests/cases/compiler/internalAliasWithDottedNameEmit.ts
@@ -1,3 +1,4 @@
+// @declaration: true
 module a.b.c {
       export var d;
 }
diff --git a/tests/cases/compiler/mixedExports.ts b/tests/cases/compiler/mixedExports.ts
new file mode 100644
index 00000000000..c3ad54846a9
--- /dev/null
+++ b/tests/cases/compiler/mixedExports.ts
@@ -0,0 +1,16 @@
+declare module M {
+     function foo();
+     export function foo();
+     function foo();
+}
+
+declare module M1 {
+     export interface Foo {}
+     interface Foo {}
+}
+
+module A {
+     interface X {x}
+     export module X {}
+     interface X {y}
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/moduleSymbolMerging.ts b/tests/cases/compiler/moduleSymbolMerging.ts
new file mode 100644
index 00000000000..03df2c5e596
--- /dev/null
+++ b/tests/cases/compiler/moduleSymbolMerging.ts
@@ -0,0 +1,12 @@
+// @declaration: true
+
+// @Filename: A.ts
+module A { export interface I {} }
+
+// @Filename: B.ts
+///<reference path="A.ts" />
+module A { ; }
+module B {
+	export function f(): A.I { return null; }
+}
+
diff --git a/tests/cases/compiler/multiImportExport.ts b/tests/cases/compiler/multiImportExport.ts
index 33f0f5eb17f..939a6e1061e 100644
--- a/tests/cases/compiler/multiImportExport.ts
+++ b/tests/cases/compiler/multiImportExport.ts
@@ -1,3 +1,5 @@
+// @module: commonjs
+// @declaration: true
 // @Filename: consumer.ts
 import Drawing = require('./Drawing');
 var addr = new Drawing.Math.Adder();
diff --git a/tests/cases/compiler/nameCollisionsInPropertyAssignments.ts b/tests/cases/compiler/nameCollisionsInPropertyAssignments.ts
new file mode 100644
index 00000000000..3847cca3a45
--- /dev/null
+++ b/tests/cases/compiler/nameCollisionsInPropertyAssignments.ts
@@ -0,0 +1,2 @@
+var x = 1
+var y = { x() { x++; } }; 
\ No newline at end of file
diff --git a/tests/cases/compiler/noCatchBlock.ts b/tests/cases/compiler/noCatchBlock.ts
new file mode 100644
index 00000000000..2ebf4737ffc
--- /dev/null
+++ b/tests/cases/compiler/noCatchBlock.ts
@@ -0,0 +1,7 @@
+//@sourceMap: true
+
+try {
+ // ...
+} finally {
+ // N.B. No 'catch' block
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/noImplicitAnyForIn.ts b/tests/cases/compiler/noImplicitAnyForIn.ts
new file mode 100644
index 00000000000..64f9d24083d
--- /dev/null
+++ b/tests/cases/compiler/noImplicitAnyForIn.ts
@@ -0,0 +1,32 @@
+//@noImplicitAny: true
+
+var x: {}[] = [[1, 2, 3], ["hello"]];
+
+for (var i in x) {
+    for (var j in x[i]) {
+
+        //Should yield an implicit 'any' error
+        var _j = x[i][j];
+    }
+
+    for (var k in x[0]) {
+        var k1 = x[0];
+
+        //Should yield an implicit 'any' error
+        var k2 = k1[k];
+    }
+}
+
+for (var a in x) {
+    // Should yield an implicit 'any' error.
+    var b;
+
+    var c = a || b;
+}
+
+var idx = 0;
+var m = [1, 2, 3, 4, 5];
+// Should yield an implicit 'any' error.
+var n = [[]] || [];
+
+for (n[idx++] in m);
\ No newline at end of file
diff --git a/tests/cases/compiler/noImplicitAnyIndexing.ts b/tests/cases/compiler/noImplicitAnyIndexing.ts
new file mode 100644
index 00000000000..7f76697f8c1
--- /dev/null
+++ b/tests/cases/compiler/noImplicitAnyIndexing.ts
@@ -0,0 +1,49 @@
+//@noImplicitAny: true
+
+enum MyEmusEnum {
+    emu
+}
+
+// Should be okay; should be a string.
+var strRepresentation1 = MyEmusEnum[0]
+
+// Should be okay; should be a string.
+var strRepresentation2 = MyEmusEnum[MyEmusEnum.emu]
+
+// Should be implicit 'any' ; property access fails, no string indexer.
+var strRepresentation3 = MyEmusEnum["monehh"];
+
+// Should be okay; should be a MyEmusEnum
+var strRepresentation4 = MyEmusEnum["emu"];
+
+
+// Should report an implicit 'any'.
+var x = {}["hi"];
+
+// Should report an implicit 'any'.
+var y = {}[10];
+
+
+var hi: any = "hi";
+
+var emptyObj = {};
+
+// Should report an implicit 'any'.
+var z1 = emptyObj[hi];
+var z2 = (<any>emptyObj)[hi];
+
+interface MyMap<T> {
+    [key: string]: T;
+}
+
+var m: MyMap<number> = {
+    "0": 0,
+    "1": 1,
+    "2": 2,
+    "Okay that's enough for today.": NaN
+};
+
+var mResult1 = m[MyEmusEnum.emu];
+var mResult2 = m[MyEmusEnum[MyEmusEnum.emu]];
+var mResult3 = m[hi];
+
diff --git a/tests/cases/compiler/noImplicitAnyParametersInAmbientClass.ts b/tests/cases/compiler/noImplicitAnyParametersInAmbientClass.ts
new file mode 100644
index 00000000000..7f2a66109d1
--- /dev/null
+++ b/tests/cases/compiler/noImplicitAnyParametersInAmbientClass.ts
@@ -0,0 +1,93 @@
+//@noImplicitAny: true
+
+declare class D_C {
+    // No implicit-'any' errors.
+    public pub_f1(): void;
+
+    // Implicit-'any' errors for x.
+    public pub_f2(x): void;
+
+    // No implicit-'any' errors.
+    public pub_f3(x: any): void;
+
+    // Implicit-'any' errors for x, y, and z.
+    public pub_f4(x, y, z): void;
+
+    // Implicit-'any' errors for x, and z.
+    public pub_f5(x, y: any, z): void;
+
+    // Implicit-'any[]' errors for r.
+    public pub_f6(...r): void;
+
+    // Implicit-'any'/'any[]' errors for x, r.
+    public pub_f7(x, ...r): void;
+
+    // Implicit-'any' errors for x1, y2, x3, and y3.
+    public pub_f8(x1, y1: number): any;
+    public pub_f8(x2: string, y2): any;
+    public pub_f8(x3, y3): any;
+
+    // No implicit-'any' errors.
+    public pub_f9: () => string;
+
+    // Implicit-'any' error for x.
+    public pub_f10: (x) => string;
+
+    // Implicit-'any' errors for x, y, and z.
+    public pub_f11: (x, y, z) => string;
+
+    // Implicit-'any' errors for x and z.
+    public pub_f12: (x, y: any, z) => string;
+
+    // Implicit-'any[]' error for r.
+    public pub_f13: (...r) => string;
+
+    // Implicit-'any'/'any[]' errors for x, r.
+    public pub_f14: (x, ...r) => string;
+
+    ///////////////////////////////////////////
+
+    // No implicit-'any' errors.
+    private priv_f1(): void;
+
+    // No implicit-'any' errors.
+    private priv_f2(x): void;
+
+    // No implicit-'any' errors.
+    private priv_f3(x: any): void;
+
+    // No implicit-'any' errors.
+    private priv_f4(x, y, z): void;
+
+    // No implicit-'any' errors.
+    private priv_f5(x, y: any, z): void;
+
+    // No implicit-'any' errors.
+    private priv_f6(...r): void;
+
+    // No implicit-'any' errors.
+    private priv_f7(x, ...r): void;
+
+    // No implicit-'any' errors.
+    private priv_f8(x1, y1: number): any;
+    private priv_f8(x2: string, y2): any;
+    private priv_f8(x3, y3): any;
+
+    // No implicit-'any' errors.
+    private priv_f9: () => string;
+
+    // Implicit-'any' error for x.
+    private priv_f10: (x) => string;
+
+    // Implicit-'any' errors for x, y, and z.
+    private priv_f11: (x, y, z) => string;
+
+    // Implicit-'any' errors for x and z.
+    private priv_f12: (x, y: any, z) => string;
+
+    // Implicit-'any[]' error for r.
+    private priv_f13: (...r) => string;
+
+    // Implicit-'any'/'any[]' errors for x, r.
+    private priv_f14: (x, ...r) => string;
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/noImplicitAnyParametersInAmbientFunctions.ts b/tests/cases/compiler/noImplicitAnyParametersInAmbientFunctions.ts
new file mode 100644
index 00000000000..4e34a58768c
--- /dev/null
+++ b/tests/cases/compiler/noImplicitAnyParametersInAmbientFunctions.ts
@@ -0,0 +1,45 @@
+//@noImplicitAny: true
+
+// No implicit-'any' errors.
+declare function d_f1(): void;
+
+// Implicit-'any' errors for x.
+declare function d_f2(x): void;
+
+// No implicit-'any' errors.
+declare function d_f3(x: any): void;
+
+// Implicit-'any' errors for x, y, and z.
+declare function d_f4(x, y, z): void;
+
+// Implicit-'any' errors for x, and z.
+declare function d_f5(x, y: any, z): void;
+
+// Implicit-'any[]' errors for r.
+declare function d_f6(...r): void;
+
+// Implicit-'any'/'any[]' errors for x, r.
+declare function d_f7(x, ...r): void;
+
+// Implicit-'any' errors for x1, y2, x3, and y3.
+declare function d_f8(x1, y1: number): any;
+declare function d_f8(x2: string, y2): any;
+declare function d_f8(x3, y3): any;
+
+// No implicit-'any' errors.
+declare var d_f9: () => string;
+
+// Implicit-'any' error for x.
+declare var d_f10: (x) => string;
+
+// Implicit-'any' errors for x, y, and z.
+declare var d_f11: (x, y, z) => string;
+
+// Implicit-'any' errors for x and z.
+declare var d_f12: (x, y: any, z) => string;
+
+// Implicit-'any[]' error for r.
+declare var d_f13: (...r) => string;
+
+// Implicit-'any'/'any[]' errors for x, r.
+declare var d_f14: (x, ...r) => string;
\ No newline at end of file
diff --git a/tests/cases/compiler/noImplicitAnyParametersInAmbientModule.ts b/tests/cases/compiler/noImplicitAnyParametersInAmbientModule.ts
new file mode 100644
index 00000000000..5ccc82bf690
--- /dev/null
+++ b/tests/cases/compiler/noImplicitAnyParametersInAmbientModule.ts
@@ -0,0 +1,47 @@
+//@noImplicitAny: true
+
+declare module D_M {
+    // No implicit-'any' errors.
+    function dm_f1(): void;
+
+    // No implicit-'any' errors.
+    function dm_f2(x): void;
+
+    // No implicit-'any' errors.
+    function dm_f3(x: any): void;
+
+    // No implicit-'any' errors.
+    function dm_f4(x, y, z): void;
+
+    // No implicit-'any' errors.
+    function dm_f5(x, y: any, z): void;
+
+    // No implicit-'any' errors.
+    function dm_f6(...r): void;
+
+    // No implicit-'any' errors.
+    function dm_f7(x, ...r): void;
+
+    // No implicit-'any' errors.
+    function dm_f8(x1, y1: number): any;
+    function dm_f8(x2: string, y2): any;
+    function dm_f8(x3, y3): any;
+
+    // No implicit-'any' errors.
+    var dm_f9: () => string;
+
+    // No implicit-'any' errors.
+    var dm_f10: (x) => string;
+
+    // No implicit-'any' errors.
+    var dm_f11: (x, y, z) => string;
+
+    // No implicit-'any' errors.
+    var dm_f12: (x, y: any, z) => string;
+
+    // No implicit-'any' errors.
+    var dm_f13: (...r) => string;
+
+    // No implicit-'any' errors.
+    var dm_f14: (x, ...r) => string;
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/noImplicitAnyParametersInBareFunctions.ts b/tests/cases/compiler/noImplicitAnyParametersInBareFunctions.ts
new file mode 100644
index 00000000000..a0371a9d0d1
--- /dev/null
+++ b/tests/cases/compiler/noImplicitAnyParametersInBareFunctions.ts
@@ -0,0 +1,45 @@
+//@noImplicitAny: true
+
+// No implicit-'any' errors.
+function f1(): void { }
+
+// Implicit-'any' error for x.
+function f2(x): void { }
+
+// No implicit-'any' errors.
+function f3(x: any): void { }
+
+// Implicit-'any' errors for x, y, and z.
+function f4(x, y, z): void { }
+
+// Implicit-'any' errors for x, and z.
+function f5(x, y: any, z): void { }
+
+// Implicit-'any[]' error for r.
+function f6(...r): void { }
+
+// Implicit-'any'/'any[]' errors for x, r.
+function f7(x, ...r): void { }
+
+// Implicit-'any' errors for x1, y2, x3, and y3.
+function f8(x1, y1: number): any;
+function f8(x2: string, y2): any;
+function f8(x3, y3): any { } 
+
+// No implicit-'any' errors.
+var f9 = () => "";
+
+// Implicit-'any' errors for x.
+var f10 = (x) => "";
+
+// Implicit-'any' errors for x, y, and z.
+var f11 = (x, y, z) => "";
+
+// Implicit-'any' errors for x and z.
+var f12 = (x, y: any, z) => "";
+
+// Implicit-'any[]' error for r.
+var f13 = (...r) => "";
+
+// Implicit-'any'/'any[]' errors for x, r.
+var f14 = (x, ...r) => "";
\ No newline at end of file
diff --git a/tests/cases/compiler/noImplicitAnyParametersInClass.ts b/tests/cases/compiler/noImplicitAnyParametersInClass.ts
new file mode 100644
index 00000000000..912725912f6
--- /dev/null
+++ b/tests/cases/compiler/noImplicitAnyParametersInClass.ts
@@ -0,0 +1,93 @@
+//@noImplicitAny: true
+
+class C {
+    // No implicit-'any' errors.
+    public pub_f1(): void { }
+
+    // Implicit-'any' errors for x.
+    public pub_f2(x): void { }
+
+    // No implicit-'any' errors.
+    public pub_f3(x: any): void { }
+
+    // Implicit-'any' errors for x, y, and z.
+    public pub_f4(x, y, z): void { }
+
+    // Implicit-'any' errors for x, and z.
+    public pub_f5(x, y: any, z): void { }
+
+    // Implicit-'any[]' errors for r.
+    public pub_f6(...r): void { }
+
+    // Implicit-'any'/'any[]' errors for x, r.
+    public pub_f7(x, ...r): void { }
+
+    // Implicit-'any' errors for x1, y2, x3, and y3.
+    public pub_f8(x1, y1: number): any;
+    public pub_f8(x2: string, y2): any;
+    public pub_f8(x3, y3): any { }
+
+    // No implicit-'any' errors.
+    public pub_f9 = () => "";
+
+    // Implicit-'any' errors for x.
+    public pub_f10 = (x) => "";
+
+    // Implicit-'any' errors for x, y, and z.
+    public pub_f11 = (x, y, z) => "";
+
+    // Implicit-'any' errors for x and z.
+    public pub_f12 = (x, y: any, z) => "";
+
+    // Implicit-'any[]' error for r.
+    public pub_f13 = (...r) => "";
+
+    // Implicit-'any'/'any[]' errors for x, r.
+    public pub_f14 = (x, ...r) => "";
+
+    ///////////////////////////////////////////
+
+    // No implicit-'any' errors.
+    private priv_f1(): void { }
+
+    // Implicit-'any' errors for x.
+    private priv_f2(x): void { }
+
+    // No implicit-'any' errors.
+    private priv_f3(x: any): void { }
+
+    // Implicit-'any' errors for x, y, and z.
+    private priv_f4(x, y, z): void { }
+
+    // Implicit-'any' errors for x, and z.
+    private priv_f5(x, y: any, z): void { }
+
+    // Implicit-'any[]' errors for r.
+    private priv_f6(...r): void { }
+
+    // Implicit-'any'/'any[]' errors for x, r.
+    private priv_f7(x, ...r): void { }
+
+    // Implicit-'any' errors for x1, y2, x3, and y3.
+    private priv_f8(x1, y1: number): any;
+    private priv_f8(x2: string, y2): any;
+    private priv_f8(x3, y3): any { }
+
+    // No implicit-'any' errors.
+    private priv_f9 = () => "";
+
+    // Implicit-'any' errors for x.
+    private priv_f10 = (x) => "";
+
+    // Implicit-'any' errors for x, y, and z.
+    private priv_f11 = (x, y, z) => "";
+
+    // Implicit-'any' errors for x and z.
+    private priv_f12 = (x, y: any, z) => "";
+
+    // Implicit-'any[]' error for r.
+    private priv_f13 = (...r) => "";
+
+    // Implicit-'any'/'any[]' errors for x, r.
+    private priv_f14 = (x, ...r) => "";
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/noImplicitAnyParametersInInterface.ts b/tests/cases/compiler/noImplicitAnyParametersInInterface.ts
new file mode 100644
index 00000000000..eab18458718
--- /dev/null
+++ b/tests/cases/compiler/noImplicitAnyParametersInInterface.ts
@@ -0,0 +1,52 @@
+//@noImplicitAny: true
+
+interface I {
+    // Implicit-'any' errors for first two call signatures, x1, x2, z2.
+    ();
+    (x1);
+    (x2, y2: string, z2): any;
+
+    // No implicit-'any' errors.
+    f1(): void;
+
+    // Implicit-'any' errors for x.
+    f2(x): void;
+
+    // No implicit-'any' errors.
+    f3(x: any): void;
+
+    // Implicit-'any' errors for x, y, and z.
+    f4(x, y, z): void;
+
+    // Implicit-'any' errors for x, and z.
+    f5(x, y: any, z): void;
+
+    // Implicit-'any[]' errors for r.
+    f6(...r): void;
+
+    // Implicit-'any'/'any[]' errors for x, r.
+    f7(x, ...r): void;
+
+    // Implicit-'any' errors for x1, y2, x3, and y3.
+    f8(x1, y1: number): any;
+    f8(x2: string, y2): any;
+    f8(x3, y3): any;
+
+    // No implicit-'any' errors.
+    f9: () => string;
+
+    // Implicit-'any' errors for x.
+    f10: (x) => string;
+
+    // Implicit-'any' errors for x, y, and z.
+    f11: (x, y, z) => string;
+
+    // Implicit-'any' errors for x and z.
+    f12: (x, y: any, z) => string;
+
+    // Implicit-'any[]' error for r.
+    f13: (...r) => string;
+
+    // Implicit-'any'/'any[]' errors for x, r.
+    f14: (x, ...r) => string;
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/noImplicitAnyParametersInModule.ts b/tests/cases/compiler/noImplicitAnyParametersInModule.ts
new file mode 100644
index 00000000000..69dd3c8c647
--- /dev/null
+++ b/tests/cases/compiler/noImplicitAnyParametersInModule.ts
@@ -0,0 +1,47 @@
+//@noImplicitAny: true
+
+module M {
+    // No implicit-'any' errors.
+    function m_f1(): void { }
+
+    // Implicit-'any' error for x.
+    function m_f2(x): void { }
+
+    // No implicit-'any' errors.
+    function m_f3(x: any): void { }
+
+    // Implicit-'any' errors for x, y, and z.
+    function m_f4(x, y, z): void { }
+
+    // Implicit-'any' errors for x and z.
+    function m_f5(x, y: any, z): void { }
+
+    // Implicit-'any[]' error for r.
+    function m_f6(...r): void { }
+
+    // Implicit-'any'/'any[]' errors for x and r.
+    function m_f7(x, ...r): void { }
+
+    // Implicit-'any' errors for x1, y2, x3, and y3.
+    function m_f8(x1, y1: number): any;
+    function m_f8(x2: string, y2): any;
+    function m_f8(x3, y3): any { }
+
+    // No implicit-'any' errors.
+    var m_f9 = () => "";
+
+    // Implicit-'any' error for x.
+    var m_f10 = (x) => "";
+
+    // Implicit-'any' errors for x, y, and z.
+    var m_f11 = (x, y, z) => "";
+
+    // Implicit-'any' errors for x and z.
+    var m_f12 = (x, y: any, z) => "";
+
+    // Implicit-'any[]' errors for r.
+    var m_f13 = (...r) => "";
+
+    // Implicit-'any'/'any[]' errors for x and r.
+    var m_f14 = (x, ...r) => "";
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/overloadsInDifferentContainersDisagreeOnAmbient.ts b/tests/cases/compiler/overloadsInDifferentContainersDisagreeOnAmbient.ts
new file mode 100644
index 00000000000..eb22f0a2447
--- /dev/null
+++ b/tests/cases/compiler/overloadsInDifferentContainersDisagreeOnAmbient.ts
@@ -0,0 +1,8 @@
+declare module M {
+    // Error because body is not ambient and this overload is
+    export function f();
+}
+
+module M {
+    export function f() { }
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/parsingClassRecoversWhenHittingUnexpectedSemicolon.ts b/tests/cases/compiler/parsingClassRecoversWhenHittingUnexpectedSemicolon.ts
new file mode 100644
index 00000000000..4ec21368fb8
--- /dev/null
+++ b/tests/cases/compiler/parsingClassRecoversWhenHittingUnexpectedSemicolon.ts
@@ -0,0 +1,4 @@
+class C {
+    public f() { };
+    private m;
+}
diff --git a/tests/cases/compiler/prefixIncrementAsOperandOfPlusExpression.ts b/tests/cases/compiler/prefixIncrementAsOperandOfPlusExpression.ts
new file mode 100644
index 00000000000..ae9af83d8e4
--- /dev/null
+++ b/tests/cases/compiler/prefixIncrementAsOperandOfPlusExpression.ts
@@ -0,0 +1,4 @@
+var x = 1;
+var y = 1;
++ ++x;
++ ++y;
\ No newline at end of file
diff --git a/tests/cases/compiler/privacyAccessorDeclFile.ts b/tests/cases/compiler/privacyAccessorDeclFile.ts
new file mode 100644
index 00000000000..25d590c0d37
--- /dev/null
+++ b/tests/cases/compiler/privacyAccessorDeclFile.ts
@@ -0,0 +1,1061 @@
+// @target: ES5
+// @module: commonjs
+// @declaration: true
+
+// @Filename:privacyAccessorDeclFile_externalModule.ts
+class privateClass {
+}
+
+export class publicClass {
+}
+
+export class publicClassWithWithPrivateGetAccessorTypes {
+    static get myPublicStaticMethod(): privateClass { // Error
+        return null;
+    }
+    private static get myPrivateStaticMethod(): privateClass {
+        return null;
+    }
+    get myPublicMethod(): privateClass { // Error
+        return null;
+    }
+    private get myPrivateMethod(): privateClass {
+        return null;
+    }
+    static get myPublicStaticMethod1() { // Error
+        return new privateClass();
+    }
+    private static get myPrivateStaticMethod1() {
+        return new privateClass();
+    }
+    get myPublicMethod1() { // Error
+        return new privateClass();
+    }
+    private get myPrivateMethod1() {
+        return new privateClass();
+    }
+}
+
+export class publicClassWithWithPublicGetAccessorTypes {
+    static get myPublicStaticMethod(): publicClass {
+        return null;
+    }
+    private static get myPrivateStaticMethod(): publicClass {
+        return null;
+    }
+    get myPublicMethod(): publicClass {
+        return null;
+    }
+    private get myPrivateMethod(): publicClass {
+        return null;
+    }
+    static get myPublicStaticMethod1() {
+        return new publicClass();
+    }
+    private static get myPrivateStaticMethod1() {
+        return new publicClass();
+    }
+    get myPublicMethod1() {
+        return new publicClass();
+    }
+    private get myPrivateMethod1() {
+        return new publicClass();
+    }
+}
+
+class privateClassWithWithPrivateGetAccessorTypes {
+    static get myPublicStaticMethod(): privateClass {
+        return null;
+    }
+    private static get myPrivateStaticMethod(): privateClass {
+        return null;
+    }
+    get myPublicMethod(): privateClass {
+        return null;
+    }
+    private get myPrivateMethod(): privateClass {
+        return null;
+    }
+    static get myPublicStaticMethod1() {
+        return new privateClass();
+    }
+    private static get myPrivateStaticMethod1() {
+        return new privateClass();
+    }
+    get myPublicMethod1() {
+        return new privateClass();
+    }
+    private get myPrivateMethod1() {
+        return new privateClass();
+    }
+}
+
+class privateClassWithWithPublicGetAccessorTypes {
+    static get myPublicStaticMethod(): publicClass {
+        return null;
+    }
+    private static get myPrivateStaticMethod(): publicClass {
+        return null;
+    }
+    get myPublicMethod(): publicClass {
+        return null;
+    }
+    private get myPrivateMethod(): publicClass {
+        return null;
+    }
+    static get myPublicStaticMethod1() {
+        return new publicClass();
+    }
+    private static get myPrivateStaticMethod1() {
+        return new publicClass();
+    }
+    get myPublicMethod1() {
+        return new publicClass();
+    }
+    private get myPrivateMethod1() {
+        return new publicClass();
+    }
+}
+
+export class publicClassWithWithPrivateSetAccessorTypes {
+    static set myPublicStaticMethod(param: privateClass) { // Error
+    }
+    private static set myPrivateStaticMethod(param: privateClass) {
+    }
+    set myPublicMethod(param: privateClass) { // Error
+    }
+    private set myPrivateMethod(param: privateClass) {
+    }
+}
+
+export class publicClassWithWithPublicSetAccessorTypes {
+    static set myPublicStaticMethod(param: publicClass) {
+    }
+    private static set myPrivateStaticMethod(param: publicClass) {
+    }
+    set myPublicMethod(param: publicClass) {
+    }
+    private set myPrivateMethod(param: publicClass) {
+    }
+}
+
+class privateClassWithWithPrivateSetAccessorTypes {
+    static set myPublicStaticMethod(param: privateClass) {
+    }
+    private static set myPrivateStaticMethod(param: privateClass) {
+    }
+    set myPublicMethod(param: privateClass) { 
+    }
+    private set myPrivateMethod(param: privateClass) {
+    }
+}
+
+class privateClassWithWithPublicSetAccessorTypes {
+    static set myPublicStaticMethod(param: publicClass) {
+    }
+    private static set myPrivateStaticMethod(param: publicClass) {
+    }
+    set myPublicMethod(param: publicClass) {
+    }
+    private set myPrivateMethod(param: publicClass) {
+    }
+}
+
+export class publicClassWithPrivateModuleGetAccessorTypes {
+    static get myPublicStaticMethod(): privateModule.publicClass { // Error
+        return null;
+    }
+    get myPublicMethod(): privateModule.publicClass { // Error
+        return null;
+    }
+    static get myPublicStaticMethod1() { // Error
+        return new privateModule.publicClass();
+    }
+    get myPublicMethod1() { // Error
+        return new privateModule.publicClass();
+    }
+}
+
+export class publicClassWithPrivateModuleSetAccessorTypes {
+    static set myPublicStaticMethod(param: privateModule.publicClass) { // Error
+    }
+    set myPublicMethod(param: privateModule.publicClass) { // Error
+    }
+}
+
+class privateClassWithPrivateModuleGetAccessorTypes {
+    static get myPublicStaticMethod(): privateModule.publicClass {
+        return null;
+    }
+    get myPublicMethod(): privateModule.publicClass {
+        return null;
+    }
+    static get myPublicStaticMethod1() {
+        return new privateModule.publicClass();
+    }
+    get myPublicMethod1() {
+        return new privateModule.publicClass();
+    }
+}
+
+class privateClassWithPrivateModuleSetAccessorTypes {
+    static set myPublicStaticMethod(param: privateModule.publicClass) {
+    }
+    set myPublicMethod(param: privateModule.publicClass) {
+    }
+}
+
+export module publicModule {
+    class privateClass {
+    }
+
+    export class publicClass {
+    }
+    export class publicClassWithWithPrivateGetAccessorTypes {
+        static get myPublicStaticMethod(): privateClass { // Error
+            return null;
+        }
+        private static get myPrivateStaticMethod(): privateClass {
+            return null;
+        }
+        get myPublicMethod(): privateClass { // Error
+            return null;
+        }
+        private get myPrivateMethod(): privateClass {
+            return null;
+        }
+        static get myPublicStaticMethod1() { // Error
+            return new privateClass();
+        }
+        private static get myPrivateStaticMethod1() {
+            return new privateClass();
+        }
+        get myPublicMethod1() { // Error
+            return new privateClass();
+        }
+        private get myPrivateMethod1() {
+            return new privateClass();
+        }
+    }
+
+    export class publicClassWithWithPublicGetAccessorTypes {
+        static get myPublicStaticMethod(): publicClass {
+            return null;
+        }
+        private static get myPrivateStaticMethod(): publicClass {
+            return null;
+        }
+        get myPublicMethod(): publicClass {
+            return null;
+        }
+        private get myPrivateMethod(): publicClass {
+            return null;
+        }
+        static get myPublicStaticMethod1() {
+            return new publicClass();
+        }
+        private static get myPrivateStaticMethod1() {
+            return new publicClass();
+        }
+        get myPublicMethod1() {
+            return new publicClass();
+        }
+        private get myPrivateMethod1() {
+            return new publicClass();
+        }
+    }
+
+    class privateClassWithWithPrivateGetAccessorTypes {
+        static get myPublicStaticMethod(): privateClass {
+            return null;
+        }
+        private static get myPrivateStaticMethod(): privateClass {
+            return null;
+        }
+        get myPublicMethod(): privateClass {
+            return null;
+        }
+        private get myPrivateMethod(): privateClass {
+            return null;
+        }
+        static get myPublicStaticMethod1() {
+            return new privateClass();
+        }
+        private static get myPrivateStaticMethod1() {
+            return new privateClass();
+        }
+        get myPublicMethod1() {
+            return new privateClass();
+        }
+        private get myPrivateMethod1() {
+            return new privateClass();
+        }
+    }
+
+    class privateClassWithWithPublicGetAccessorTypes {
+        static get myPublicStaticMethod(): publicClass {
+            return null;
+        }
+        private static get myPrivateStaticMethod(): publicClass {
+            return null;
+        }
+        get myPublicMethod(): publicClass {
+            return null;
+        }
+        private get myPrivateMethod(): publicClass {
+            return null;
+        }
+        static get myPublicStaticMethod1() {
+            return new publicClass();
+        }
+        private static get myPrivateStaticMethod1() {
+            return new publicClass();
+        }
+        get myPublicMethod1() {
+            return new publicClass();
+        }
+        private get myPrivateMethod1() {
+            return new publicClass();
+        }
+    }
+
+    export class publicClassWithWithPrivateSetAccessorTypes {
+        static set myPublicStaticMethod(param: privateClass) { // Error
+        }
+        private static set myPrivateStaticMethod(param: privateClass) {
+        }
+        set myPublicMethod(param: privateClass) { // Error
+        }
+        private set myPrivateMethod(param: privateClass) {
+        }
+    }
+
+    export class publicClassWithWithPublicSetAccessorTypes {
+        static set myPublicStaticMethod(param: publicClass) {
+        }
+        private static set myPrivateStaticMethod(param: publicClass) {
+        }
+        set myPublicMethod(param: publicClass) {
+        }
+        private set myPrivateMethod(param: publicClass) {
+        }
+    }
+
+    class privateClassWithWithPrivateSetAccessorTypes {
+        static set myPublicStaticMethod(param: privateClass) {
+        }
+        private static set myPrivateStaticMethod(param: privateClass) {
+        }
+        set myPublicMethod(param: privateClass) {
+        }
+        private set myPrivateMethod(param: privateClass) {
+        }
+    }
+
+    class privateClassWithWithPublicSetAccessorTypes {
+        static set myPublicStaticMethod(param: publicClass) {
+        }
+        private static set myPrivateStaticMethod(param: publicClass) {
+        }
+        set myPublicMethod(param: publicClass) {
+        }
+        private set myPrivateMethod(param: publicClass) {
+        }
+    }
+
+    export class publicClassWithPrivateModuleGetAccessorTypes {
+        static get myPublicStaticMethod(): privateModule.publicClass { // Error
+            return null;
+        }
+        get myPublicMethod(): privateModule.publicClass { // Error
+            return null;
+        }
+        static get myPublicStaticMethod1() { // Error
+            return new privateModule.publicClass();
+        }
+        get myPublicMethod1() { // Error
+            return new privateModule.publicClass();
+        }
+    }
+
+    export class publicClassWithPrivateModuleSetAccessorTypes {
+        static set myPublicStaticMethod(param: privateModule.publicClass) { // Error
+        }
+        set myPublicMethod(param: privateModule.publicClass) { // Error
+        }
+    }
+
+    class privateClassWithPrivateModuleGetAccessorTypes {
+        static get myPublicStaticMethod(): privateModule.publicClass {
+            return null;
+        }
+        get myPublicMethod(): privateModule.publicClass {
+            return null;
+        }
+        static get myPublicStaticMethod1() {
+            return new privateModule.publicClass();
+        }
+        get myPublicMethod1() {
+            return new privateModule.publicClass();
+        }
+    }
+
+    class privateClassWithPrivateModuleSetAccessorTypes {
+        static set myPublicStaticMethod(param: privateModule.publicClass) {
+        }
+        set myPublicMethod(param: privateModule.publicClass) {
+        }
+    }
+}
+
+module privateModule {
+    class privateClass {
+    }
+
+    export class publicClass {
+    }
+    export class publicClassWithWithPrivateGetAccessorTypes {
+        static get myPublicStaticMethod(): privateClass { 
+            return null;
+        }
+        private static get myPrivateStaticMethod(): privateClass {
+            return null;
+        }
+        get myPublicMethod(): privateClass { 
+            return null;
+        }
+        private get myPrivateMethod(): privateClass {
+            return null;
+        }
+        static get myPublicStaticMethod1() { 
+            return new privateClass();
+        }
+        private static get myPrivateStaticMethod1() {
+            return new privateClass();
+        }
+        get myPublicMethod1() { 
+            return new privateClass();
+        }
+        private get myPrivateMethod1() {
+            return new privateClass();
+        }
+    }
+
+    export class publicClassWithWithPublicGetAccessorTypes {
+        static get myPublicStaticMethod(): publicClass {
+            return null;
+        }
+        private static get myPrivateStaticMethod(): publicClass {
+            return null;
+        }
+        get myPublicMethod(): publicClass {
+            return null;
+        }
+        private get myPrivateMethod(): publicClass {
+            return null;
+        }
+        static get myPublicStaticMethod1() {
+            return new publicClass();
+        }
+        private static get myPrivateStaticMethod1() {
+            return new publicClass();
+        }
+        get myPublicMethod1() {
+            return new publicClass();
+        }
+        private get myPrivateMethod1() {
+            return new publicClass();
+        }
+    }
+
+    class privateClassWithWithPrivateGetAccessorTypes {
+        static get myPublicStaticMethod(): privateClass {
+            return null;
+        }
+        private static get myPrivateStaticMethod(): privateClass {
+            return null;
+        }
+        get myPublicMethod(): privateClass {
+            return null;
+        }
+        private get myPrivateMethod(): privateClass {
+            return null;
+        }
+        static get myPublicStaticMethod1() {
+            return new privateClass();
+        }
+        private static get myPrivateStaticMethod1() {
+            return new privateClass();
+        }
+        get myPublicMethod1() {
+            return new privateClass();
+        }
+        private get myPrivateMethod1() {
+            return new privateClass();
+        }
+    }
+
+    class privateClassWithWithPublicGetAccessorTypes {
+        static get myPublicStaticMethod(): publicClass {
+            return null;
+        }
+        private static get myPrivateStaticMethod(): publicClass {
+            return null;
+        }
+        get myPublicMethod(): publicClass {
+            return null;
+        }
+        private get myPrivateMethod(): publicClass {
+            return null;
+        }
+        static get myPublicStaticMethod1() {
+            return new publicClass();
+        }
+        private static get myPrivateStaticMethod1() {
+            return new publicClass();
+        }
+        get myPublicMethod1() {
+            return new publicClass();
+        }
+        private get myPrivateMethod1() {
+            return new publicClass();
+        }
+    }
+
+    export class publicClassWithWithPrivateSetAccessorTypes {
+        static set myPublicStaticMethod(param: privateClass) { 
+        }
+        private static set myPrivateStaticMethod(param: privateClass) {
+        }
+        set myPublicMethod(param: privateClass) { 
+        }
+        private set myPrivateMethod(param: privateClass) {
+        }
+    }
+
+    export class publicClassWithWithPublicSetAccessorTypes {
+        static set myPublicStaticMethod(param: publicClass) {
+        }
+        private static set myPrivateStaticMethod(param: publicClass) {
+        }
+        set myPublicMethod(param: publicClass) {
+        }
+        private set myPrivateMethod(param: publicClass) {
+        }
+    }
+
+    class privateClassWithWithPrivateSetAccessorTypes {
+        static set myPublicStaticMethod(param: privateClass) {
+        }
+        private static set myPrivateStaticMethod(param: privateClass) {
+        }
+        set myPublicMethod(param: privateClass) {
+        }
+        private set myPrivateMethod(param: privateClass) {
+        }
+    }
+
+    class privateClassWithWithPublicSetAccessorTypes {
+        static set myPublicStaticMethod(param: publicClass) {
+        }
+        private static set myPrivateStaticMethod(param: publicClass) {
+        }
+        set myPublicMethod(param: publicClass) {
+        }
+        private set myPrivateMethod(param: publicClass) {
+        }
+    }
+
+    export class publicClassWithPrivateModuleGetAccessorTypes {
+        static get myPublicStaticMethod(): privateModule.publicClass { 
+            return null;
+        }
+        get myPublicMethod(): privateModule.publicClass { 
+            return null;
+        }
+        static get myPublicStaticMethod1() { 
+            return new privateModule.publicClass();
+        }
+        get myPublicMethod1() { 
+            return new privateModule.publicClass();
+        }
+    }
+
+    export class publicClassWithPrivateModuleSetAccessorTypes {
+        static set myPublicStaticMethod(param: privateModule.publicClass) { 
+        }
+        set myPublicMethod(param: privateModule.publicClass) { 
+        }
+    }
+
+    class privateClassWithPrivateModuleGetAccessorTypes {
+        static get myPublicStaticMethod(): privateModule.publicClass {
+            return null;
+        }
+        get myPublicMethod(): privateModule.publicClass {
+            return null;
+        }
+        static get myPublicStaticMethod1() {
+            return new privateModule.publicClass();
+        }
+        get myPublicMethod1() {
+            return new privateModule.publicClass();
+        }
+    }
+
+    class privateClassWithPrivateModuleSetAccessorTypes {
+        static set myPublicStaticMethod(param: privateModule.publicClass) {
+        }
+        set myPublicMethod(param: privateModule.publicClass) {
+        }
+    }
+}
+
+// @Filename: privacyAccessorDeclFile_GlobalFile.ts
+class publicClassInGlobal {
+}
+
+class publicClassInGlobalWithPublicGetAccessorTypes {
+    static get myPublicStaticMethod(): publicClassInGlobal {
+        return null;
+    }
+    private static get myPrivateStaticMethod(): publicClassInGlobal {
+        return null;
+    }
+    get myPublicMethod(): publicClassInGlobal {
+        return null;
+    }
+    private get myPrivateMethod(): publicClassInGlobal {
+        return null;
+    }
+    static get myPublicStaticMethod1() {
+        return new publicClassInGlobal();
+    }
+    private static get myPrivateStaticMethod1() {
+        return new publicClassInGlobal();
+    }
+    get myPublicMethod1() {
+        return new publicClassInGlobal();
+    }
+    private get myPrivateMethod1() {
+        return new publicClassInGlobal();
+    }
+}
+
+class publicClassInGlobalWithWithPublicSetAccessorTypes {
+    static set myPublicStaticMethod(param: publicClassInGlobal) {
+    }
+    private static set myPrivateStaticMethod(param: publicClassInGlobal) {
+    }
+    set myPublicMethod(param: publicClassInGlobal) {
+    }
+    private set myPrivateMethod(param: publicClassInGlobal) {
+    }
+}
+
+module publicModuleInGlobal {
+    class privateClass {
+    }
+
+    export class publicClass {
+    }
+
+    module privateModule {
+        class privateClass {
+        }
+
+        export class publicClass {
+        }
+        export class publicClassWithWithPrivateGetAccessorTypes {
+            static get myPublicStaticMethod(): privateClass {
+                return null;
+            }
+            private static get myPrivateStaticMethod(): privateClass {
+                return null;
+            }
+            get myPublicMethod(): privateClass {
+                return null;
+            }
+            private get myPrivateMethod(): privateClass {
+                return null;
+            }
+            static get myPublicStaticMethod1() {
+                return new privateClass();
+            }
+            private static get myPrivateStaticMethod1() {
+                return new privateClass();
+            }
+            get myPublicMethod1() {
+                return new privateClass();
+            }
+            private get myPrivateMethod1() {
+                return new privateClass();
+            }
+        }
+
+        export class publicClassWithWithPublicGetAccessorTypes {
+            static get myPublicStaticMethod(): publicClass {
+                return null;
+            }
+            private static get myPrivateStaticMethod(): publicClass {
+                return null;
+            }
+            get myPublicMethod(): publicClass {
+                return null;
+            }
+            private get myPrivateMethod(): publicClass {
+                return null;
+            }
+            static get myPublicStaticMethod1() {
+                return new publicClass();
+            }
+            private static get myPrivateStaticMethod1() {
+                return new publicClass();
+            }
+            get myPublicMethod1() {
+                return new publicClass();
+            }
+            private get myPrivateMethod1() {
+                return new publicClass();
+            }
+        }
+
+        class privateClassWithWithPrivateGetAccessorTypes {
+            static get myPublicStaticMethod(): privateClass {
+                return null;
+            }
+            private static get myPrivateStaticMethod(): privateClass {
+                return null;
+            }
+            get myPublicMethod(): privateClass {
+                return null;
+            }
+            private get myPrivateMethod(): privateClass {
+                return null;
+            }
+            static get myPublicStaticMethod1() {
+                return new privateClass();
+            }
+            private static get myPrivateStaticMethod1() {
+                return new privateClass();
+            }
+            get myPublicMethod1() {
+                return new privateClass();
+            }
+            private get myPrivateMethod1() {
+                return new privateClass();
+            }
+        }
+
+        class privateClassWithWithPublicGetAccessorTypes {
+            static get myPublicStaticMethod(): publicClass {
+                return null;
+            }
+            private static get myPrivateStaticMethod(): publicClass {
+                return null;
+            }
+            get myPublicMethod(): publicClass {
+                return null;
+            }
+            private get myPrivateMethod(): publicClass {
+                return null;
+            }
+            static get myPublicStaticMethod1() {
+                return new publicClass();
+            }
+            private static get myPrivateStaticMethod1() {
+                return new publicClass();
+            }
+            get myPublicMethod1() {
+                return new publicClass();
+            }
+            private get myPrivateMethod1() {
+                return new publicClass();
+            }
+        }
+
+        export class publicClassWithWithPrivateSetAccessorTypes {
+            static set myPublicStaticMethod(param: privateClass) {
+            }
+            private static set myPrivateStaticMethod(param: privateClass) {
+            }
+            set myPublicMethod(param: privateClass) {
+            }
+            private set myPrivateMethod(param: privateClass) {
+            }
+        }
+
+        export class publicClassWithWithPublicSetAccessorTypes {
+            static set myPublicStaticMethod(param: publicClass) {
+            }
+            private static set myPrivateStaticMethod(param: publicClass) {
+            }
+            set myPublicMethod(param: publicClass) {
+            }
+            private set myPrivateMethod(param: publicClass) {
+            }
+        }
+
+        class privateClassWithWithPrivateSetAccessorTypes {
+            static set myPublicStaticMethod(param: privateClass) {
+            }
+            private static set myPrivateStaticMethod(param: privateClass) {
+            }
+            set myPublicMethod(param: privateClass) {
+            }
+            private set myPrivateMethod(param: privateClass) {
+            }
+        }
+
+        class privateClassWithWithPublicSetAccessorTypes {
+            static set myPublicStaticMethod(param: publicClass) {
+            }
+            private static set myPrivateStaticMethod(param: publicClass) {
+            }
+            set myPublicMethod(param: publicClass) {
+            }
+            private set myPrivateMethod(param: publicClass) {
+            }
+        }
+
+        export class publicClassWithPrivateModuleGetAccessorTypes {
+            static get myPublicStaticMethod(): privateModule.publicClass {
+                return null;
+            }
+            get myPublicMethod(): privateModule.publicClass {
+                return null;
+            }
+            static get myPublicStaticMethod1() {
+                return new privateModule.publicClass();
+            }
+            get myPublicMethod1() {
+                return new privateModule.publicClass();
+            }
+        }
+
+        export class publicClassWithPrivateModuleSetAccessorTypes {
+            static set myPublicStaticMethod(param: privateModule.publicClass) {
+            }
+            set myPublicMethod(param: privateModule.publicClass) {
+            }
+        }
+
+        class privateClassWithPrivateModuleGetAccessorTypes {
+            static get myPublicStaticMethod(): privateModule.publicClass {
+                return null;
+            }
+            get myPublicMethod(): privateModule.publicClass {
+                return null;
+            }
+            static get myPublicStaticMethod1() {
+                return new privateModule.publicClass();
+            }
+            get myPublicMethod1() {
+                return new privateModule.publicClass();
+            }
+        }
+
+        class privateClassWithPrivateModuleSetAccessorTypes {
+            static set myPublicStaticMethod(param: privateModule.publicClass) {
+            }
+            set myPublicMethod(param: privateModule.publicClass) {
+            }
+        }
+    }
+
+    export class publicClassWithWithPrivateGetAccessorTypes {
+        static get myPublicStaticMethod(): privateClass { // Error
+            return null;
+        }
+        private static get myPrivateStaticMethod(): privateClass {
+            return null;
+        }
+        get myPublicMethod(): privateClass { // Error
+            return null;
+        }
+        private get myPrivateMethod(): privateClass {
+            return null;
+        }
+        static get myPublicStaticMethod1() { // Error
+            return new privateClass();
+        }
+        private static get myPrivateStaticMethod1() {
+            return new privateClass();
+        }
+        get myPublicMethod1() { // Error
+            return new privateClass();
+        }
+        private get myPrivateMethod1() {
+            return new privateClass();
+        }
+    }
+
+    export class publicClassWithWithPublicGetAccessorTypes {
+        static get myPublicStaticMethod(): publicClass {
+            return null;
+        }
+        private static get myPrivateStaticMethod(): publicClass {
+            return null;
+        }
+        get myPublicMethod(): publicClass {
+            return null;
+        }
+        private get myPrivateMethod(): publicClass {
+            return null;
+        }
+        static get myPublicStaticMethod1() {
+            return new publicClass();
+        }
+        private static get myPrivateStaticMethod1() {
+            return new publicClass();
+        }
+        get myPublicMethod1() {
+            return new publicClass();
+        }
+        private get myPrivateMethod1() {
+            return new publicClass();
+        }
+    }
+
+    class privateClassWithWithPrivateGetAccessorTypes {
+        static get myPublicStaticMethod(): privateClass {
+            return null;
+        }
+        private static get myPrivateStaticMethod(): privateClass {
+            return null;
+        }
+        get myPublicMethod(): privateClass {
+            return null;
+        }
+        private get myPrivateMethod(): privateClass {
+            return null;
+        }
+        static get myPublicStaticMethod1() {
+            return new privateClass();
+        }
+        private static get myPrivateStaticMethod1() {
+            return new privateClass();
+        }
+        get myPublicMethod1() {
+            return new privateClass();
+        }
+        private get myPrivateMethod1() {
+            return new privateClass();
+        }
+    }
+
+    class privateClassWithWithPublicGetAccessorTypes {
+        static get myPublicStaticMethod(): publicClass {
+            return null;
+        }
+        private static get myPrivateStaticMethod(): publicClass {
+            return null;
+        }
+        get myPublicMethod(): publicClass {
+            return null;
+        }
+        private get myPrivateMethod(): publicClass {
+            return null;
+        }
+        static get myPublicStaticMethod1() {
+            return new publicClass();
+        }
+        private static get myPrivateStaticMethod1() {
+            return new publicClass();
+        }
+        get myPublicMethod1() {
+            return new publicClass();
+        }
+        private get myPrivateMethod1() {
+            return new publicClass();
+        }
+    }
+
+    export class publicClassWithWithPrivateSetAccessorTypes {
+        static set myPublicStaticMethod(param: privateClass) { // Error
+        }
+        private static set myPrivateStaticMethod(param: privateClass) {
+        }
+        set myPublicMethod(param: privateClass) { // Error
+        }
+        private set myPrivateMethod(param: privateClass) {
+        }
+    }
+
+    export class publicClassWithWithPublicSetAccessorTypes {
+        static set myPublicStaticMethod(param: publicClass) {
+        }
+        private static set myPrivateStaticMethod(param: publicClass) {
+        }
+        set myPublicMethod(param: publicClass) {
+        }
+        private set myPrivateMethod(param: publicClass) {
+        }
+    }
+
+    class privateClassWithWithPrivateSetAccessorTypes {
+        static set myPublicStaticMethod(param: privateClass) {
+        }
+        private static set myPrivateStaticMethod(param: privateClass) {
+        }
+        set myPublicMethod(param: privateClass) {
+        }
+        private set myPrivateMethod(param: privateClass) {
+        }
+    }
+
+    class privateClassWithWithPublicSetAccessorTypes {
+        static set myPublicStaticMethod(param: publicClass) {
+        }
+        private static set myPrivateStaticMethod(param: publicClass) {
+        }
+        set myPublicMethod(param: publicClass) {
+        }
+        private set myPrivateMethod(param: publicClass) {
+        }
+    }
+
+    export class publicClassWithPrivateModuleGetAccessorTypes {
+        static get myPublicStaticMethod(): privateModule.publicClass { // Error
+            return null;
+        }
+        get myPublicMethod(): privateModule.publicClass { // Error
+            return null;
+        }
+        static get myPublicStaticMethod1() { // Error
+            return new privateModule.publicClass();
+        }
+        get myPublicMethod1() { // Error
+            return new privateModule.publicClass();
+        }
+    }
+
+    export class publicClassWithPrivateModuleSetAccessorTypes {
+        static set myPublicStaticMethod(param: privateModule.publicClass) { // Error
+        }
+        set myPublicMethod(param: privateModule.publicClass) { // Error
+        }
+    }
+
+    class privateClassWithPrivateModuleGetAccessorTypes {
+        static get myPublicStaticMethod(): privateModule.publicClass {
+            return null;
+        }
+        get myPublicMethod(): privateModule.publicClass {
+            return null;
+        }
+        static get myPublicStaticMethod1() {
+            return new privateModule.publicClass();
+        }
+        get myPublicMethod1() {
+            return new privateModule.publicClass();
+        }
+    }
+
+    class privateClassWithPrivateModuleSetAccessorTypes {
+        static set myPublicStaticMethod(param: privateModule.publicClass) {
+        }
+        set myPublicMethod(param: privateModule.publicClass) {
+        }
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/privacyCannotNameAccessorDeclFile.ts b/tests/cases/compiler/privacyCannotNameAccessorDeclFile.ts
new file mode 100644
index 00000000000..1150cf963bf
--- /dev/null
+++ b/tests/cases/compiler/privacyCannotNameAccessorDeclFile.ts
@@ -0,0 +1,138 @@
+// @target: ES5
+// @module: commonjs
+// @declaration: true
+
+// @Filename: privacyCannotNameAccessorDeclFile_GlobalWidgets.ts
+declare module "GlobalWidgets" {
+    export class Widget3 {
+        name: string;
+    }
+    export function createWidget3(): Widget3;
+
+    export module SpecializedGlobalWidget {
+        export class Widget4 {
+            name: string;
+        }
+        function createWidget4(): Widget4;
+    }
+}
+
+// @Filename: privacyCannotNameAccessorDeclFile_Widgets.ts
+export class Widget1 {
+    name = 'one';
+}
+export function createWidget1() {
+    return new Widget1();
+}
+
+export module SpecializedWidget {
+    export class Widget2 {
+        name = 'one';
+    }
+    export function createWidget2() {
+        return new Widget2();
+    }
+}
+
+// @Filename:privacyCannotNameAccessorDeclFile_exporter.ts
+///<reference path='privacyCannotNameAccessorDeclFile_GlobalWidgets.ts'/>
+import Widgets = require("privacyCannotNameAccessorDeclFile_Widgets");
+import Widgets1 = require("GlobalWidgets");
+export function createExportedWidget1() {
+    return Widgets.createWidget1();
+}
+export function createExportedWidget2() {
+    return Widgets.SpecializedWidget.createWidget2();
+}
+export function createExportedWidget3() {
+    return Widgets1.createWidget3();
+}
+export function createExportedWidget4() {
+    return Widgets1.SpecializedGlobalWidget.createWidget4();
+}
+
+// @Filename:privacyCannotNameAccessorDeclFile_consumer.ts
+import exporter = require("privacyCannotNameAccessorDeclFile_exporter");
+export class publicClassWithWithPrivateGetAccessorTypes {
+    static get myPublicStaticMethod() { // Error
+        return exporter.createExportedWidget1();
+    }
+    private static get myPrivateStaticMethod() {
+        return exporter.createExportedWidget1();
+    }
+    get myPublicMethod() { // Error
+        return exporter.createExportedWidget1();
+    }
+    private get myPrivateMethod() {
+        return exporter.createExportedWidget1();
+    }
+    static get myPublicStaticMethod1() { // Error
+        return exporter.createExportedWidget3();
+    }
+    private static get myPrivateStaticMethod1() {
+        return exporter.createExportedWidget3();
+    }
+    get myPublicMethod1() { // Error
+        return exporter.createExportedWidget3();
+    }
+    private get myPrivateMethod1() {
+        return exporter.createExportedWidget3();
+    }
+}
+
+class privateClassWithWithPrivateGetAccessorTypes {
+    static get myPublicStaticMethod() { 
+        return exporter.createExportedWidget1();
+    }
+    private static get myPrivateStaticMethod() {
+        return exporter.createExportedWidget1();
+    }
+    get myPublicMethod() { 
+        return exporter.createExportedWidget1();
+    }
+    private get myPrivateMethod() {
+        return exporter.createExportedWidget1();
+    }
+    static get myPublicStaticMethod1() { 
+        return exporter.createExportedWidget3();
+    }
+    private static get myPrivateStaticMethod1() {
+        return exporter.createExportedWidget3();
+    }
+    get myPublicMethod1() { 
+        return exporter.createExportedWidget3();
+    }
+    private get myPrivateMethod1() {
+        return exporter.createExportedWidget3();
+    }
+}
+
+export class publicClassWithPrivateModuleGetAccessorTypes {
+    static get myPublicStaticMethod() { // Error
+        return exporter.createExportedWidget2();
+    }
+    get myPublicMethod() { // Error
+        return exporter.createExportedWidget2();
+    }
+    static get myPublicStaticMethod1() { // Error
+        return exporter.createExportedWidget4();
+    }
+    get myPublicMethod1() { // Error
+        return exporter.createExportedWidget4();
+    }
+}
+
+class privateClassWithPrivateModuleGetAccessorTypes {
+    static get myPublicStaticMethod() { 
+        return exporter.createExportedWidget2();
+    }
+    get myPublicMethod() { 
+        return exporter.createExportedWidget2();
+    }
+    static get myPublicStaticMethod1() { 
+        return exporter.createExportedWidget4();
+    }
+    get myPublicMethod1() { 
+        return exporter.createExportedWidget4();
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/privacyCannotNameVarTypeDeclFile.ts b/tests/cases/compiler/privacyCannotNameVarTypeDeclFile.ts
new file mode 100644
index 00000000000..e49d31946c6
--- /dev/null
+++ b/tests/cases/compiler/privacyCannotNameVarTypeDeclFile.ts
@@ -0,0 +1,101 @@
+// @module: commonjs
+// @declaration: true
+
+
+// @Filename: privacyCannotNameVarTypeDeclFile_GlobalWidgets.ts
+declare module "GlobalWidgets" {
+    export class Widget3 {
+        name: string;
+    }
+    export function createWidget3(): Widget3;
+
+    export module SpecializedGlobalWidget {
+        export class Widget4 {
+            name: string;
+        }
+        function createWidget4(): Widget4;
+    }
+}
+
+// @Filename: privacyCannotNameVarTypeDeclFile_Widgets.ts
+export class Widget1 {
+    name = 'one';
+}
+export function createWidget1() {
+    return new Widget1();
+}
+
+export module SpecializedWidget {
+    export class Widget2 {
+        name = 'one';
+    }
+    export function createWidget2() {
+        return new Widget2();
+    }
+}
+
+// @Filename:privacyCannotNameVarTypeDeclFile_exporter.ts
+///<reference path='privacyCannotNameVarTypeDeclFile_GlobalWidgets.ts'/>
+import Widgets = require("privacyCannotNameVarTypeDeclFile_Widgets");
+import Widgets1 = require("GlobalWidgets");
+export function createExportedWidget1() {
+    return Widgets.createWidget1();
+}
+export function createExportedWidget2() {
+    return Widgets.SpecializedWidget.createWidget2();
+}
+export function createExportedWidget3() {
+    return Widgets1.createWidget3();
+}
+export function createExportedWidget4() {
+    return Widgets1.SpecializedGlobalWidget.createWidget4();
+}
+
+// @Filename:privacyCannotNameVarTypeDeclFile_consumer.ts
+import exporter = require("privacyCannotNameVarTypeDeclFile_exporter");
+export class publicClassWithWithPrivatePropertyTypes {
+    static myPublicStaticProperty = exporter.createExportedWidget1(); // Error
+    private static myPrivateStaticProperty = exporter.createExportedWidget1();
+    myPublicProperty = exporter.createExportedWidget1(); // Error
+    private myPrivateProperty = exporter.createExportedWidget1();
+
+    static myPublicStaticProperty1 = exporter.createExportedWidget3(); // Error
+    private static myPrivateStaticProperty1 = exporter.createExportedWidget3();
+    myPublicProperty1 = exporter.createExportedWidget3(); // Error
+    private myPrivateProperty1 = exporter.createExportedWidget3();
+}
+
+class privateClassWithWithPrivatePropertyTypes {
+    static myPublicStaticProperty = exporter.createExportedWidget1(); 
+    private static myPrivateStaticProperty = exporter.createExportedWidget1();
+    myPublicProperty = exporter.createExportedWidget1(); 
+    private myPrivateProperty = exporter.createExportedWidget1();
+
+    static myPublicStaticProperty1 = exporter.createExportedWidget3(); 
+    private static myPrivateStaticProperty1 = exporter.createExportedWidget3();
+    myPublicProperty1 = exporter.createExportedWidget3(); 
+    private myPrivateProperty1 = exporter.createExportedWidget3();
+}
+
+export var publicVarWithPrivatePropertyTypes= exporter.createExportedWidget1(); // Error
+var privateVarWithPrivatePropertyTypes= exporter.createExportedWidget1();
+export var publicVarWithPrivatePropertyTypes1 = exporter.createExportedWidget3(); // Error
+var privateVarWithPrivatePropertyTypes1 = exporter.createExportedWidget3();
+
+export class publicClassWithPrivateModulePropertyTypes {
+    static myPublicStaticProperty= exporter.createExportedWidget2(); // Error
+    myPublicProperty = exporter.createExportedWidget2(); // Error
+    static myPublicStaticProperty1 = exporter.createExportedWidget4(); // Error
+    myPublicProperty1 = exporter.createExportedWidget4(); // Error
+}
+export var publicVarWithPrivateModulePropertyTypes= exporter.createExportedWidget2(); // Error
+export var publicVarWithPrivateModulePropertyTypes1 = exporter.createExportedWidget4(); // Error
+
+class privateClassWithPrivateModulePropertyTypes {
+    static myPublicStaticProperty= exporter.createExportedWidget2();
+    myPublicProperty= exporter.createExportedWidget2();
+    static myPublicStaticProperty1 = exporter.createExportedWidget4();
+    myPublicProperty1 = exporter.createExportedWidget4();
+}
+var privateVarWithPrivateModulePropertyTypes= exporter.createExportedWidget2();
+var privateVarWithPrivateModulePropertyTypes1 = exporter.createExportedWidget4();
\ No newline at end of file
diff --git a/tests/cases/compiler/privacyCheckAnonymousFunctionParameter.ts b/tests/cases/compiler/privacyCheckAnonymousFunctionParameter.ts
index d4ce6c675f5..c867a664520 100644
--- a/tests/cases/compiler/privacyCheckAnonymousFunctionParameter.ts
+++ b/tests/cases/compiler/privacyCheckAnonymousFunctionParameter.ts
@@ -1,4 +1,5 @@
 //@module: commonjs
+//@declaration: true
 export var x = 1;  // Makes this an external module
 interface Iterator<T> {
 }
diff --git a/tests/cases/compiler/privacyCheckAnonymousFunctionParameter2.ts b/tests/cases/compiler/privacyCheckAnonymousFunctionParameter2.ts
index 6aa0761d8d7..1aea1a17e98 100644
--- a/tests/cases/compiler/privacyCheckAnonymousFunctionParameter2.ts
+++ b/tests/cases/compiler/privacyCheckAnonymousFunctionParameter2.ts
@@ -1,4 +1,5 @@
 //@module: amd
+//@declaration: true
 export var x = 1;  // Makes this an external module 
 interface Iterator<T> { x: T }
 
diff --git a/tests/cases/compiler/privacyCheckCallbackOfInterfaceMethodWithTypeParameter.ts b/tests/cases/compiler/privacyCheckCallbackOfInterfaceMethodWithTypeParameter.ts
index 98e11a37e66..e9fda583a14 100644
--- a/tests/cases/compiler/privacyCheckCallbackOfInterfaceMethodWithTypeParameter.ts
+++ b/tests/cases/compiler/privacyCheckCallbackOfInterfaceMethodWithTypeParameter.ts
@@ -1,4 +1,5 @@
 //@module: amd
+//@declaration: true
 export interface A<T> {
     f1(callback: (p: T) => any); 
 }
diff --git a/tests/cases/compiler/privacyCheckExportAssignmentOnExportedGenericInterface1.ts b/tests/cases/compiler/privacyCheckExportAssignmentOnExportedGenericInterface1.ts
index 6014c8bb041..b2a5e374f48 100644
--- a/tests/cases/compiler/privacyCheckExportAssignmentOnExportedGenericInterface1.ts
+++ b/tests/cases/compiler/privacyCheckExportAssignmentOnExportedGenericInterface1.ts
@@ -1,4 +1,5 @@
 //@module: commonjs
+//@declaration: true
 module Foo {
     export interface A<T> {
     }
diff --git a/tests/cases/compiler/privacyCheckExportAssignmentOnExportedGenericInterface2.ts b/tests/cases/compiler/privacyCheckExportAssignmentOnExportedGenericInterface2.ts
index 5d150e2f5e7..42c121ac80e 100644
--- a/tests/cases/compiler/privacyCheckExportAssignmentOnExportedGenericInterface2.ts
+++ b/tests/cases/compiler/privacyCheckExportAssignmentOnExportedGenericInterface2.ts
@@ -1,4 +1,5 @@
 //@module: amd
+//@declaration: true
 export = Foo;
 
 interface Foo<T> {
diff --git a/tests/cases/compiler/privacyCheckExternalModuleExportAssignmentOfGenericClass.ts b/tests/cases/compiler/privacyCheckExternalModuleExportAssignmentOfGenericClass.ts
index e43e4dc6d93..b412622ad40 100644
--- a/tests/cases/compiler/privacyCheckExternalModuleExportAssignmentOfGenericClass.ts
+++ b/tests/cases/compiler/privacyCheckExternalModuleExportAssignmentOfGenericClass.ts
@@ -1,4 +1,5 @@
 //@module: commonjs
+//@declaration: true
 // @Filename: privacyCheckExternalModuleExportAssignmentOfGenericClass_0.ts
 export = Foo;
 class Foo<A> {
diff --git a/tests/cases/compiler/privacyCheckOnTypeParameterReferenceInConstructorParameter.ts b/tests/cases/compiler/privacyCheckOnTypeParameterReferenceInConstructorParameter.ts
index cf73b3626ee..01ecd8c1ebd 100644
--- a/tests/cases/compiler/privacyCheckOnTypeParameterReferenceInConstructorParameter.ts
+++ b/tests/cases/compiler/privacyCheckOnTypeParameterReferenceInConstructorParameter.ts
@@ -1,4 +1,5 @@
 //@module: amd
+//@declaration: true
 export class A<T1>{
     constructor(callback: (self: A<T1>) => void) {
         var child = new B(this);
diff --git a/tests/cases/compiler/privacyCheckTypeOfFunction.ts b/tests/cases/compiler/privacyCheckTypeOfFunction.ts
index a4980fe6229..80bab76dc26 100644
--- a/tests/cases/compiler/privacyCheckTypeOfFunction.ts
+++ b/tests/cases/compiler/privacyCheckTypeOfFunction.ts
@@ -1,3 +1,5 @@
+//@module: commonjs
+//@declaration: true
 function foo() {
 }
 export var x: typeof foo;
diff --git a/tests/cases/compiler/privacyCheckTypeOfInvisibleModuleError.ts b/tests/cases/compiler/privacyCheckTypeOfInvisibleModuleError.ts
index e439cae861e..b37fb72677b 100644
--- a/tests/cases/compiler/privacyCheckTypeOfInvisibleModuleError.ts
+++ b/tests/cases/compiler/privacyCheckTypeOfInvisibleModuleError.ts
@@ -1,3 +1,4 @@
+//@declaration: true
 module Outer {
     module Inner {
         export var m: typeof Inner;
diff --git a/tests/cases/compiler/privacyClassExtendsClauseDeclFile.ts b/tests/cases/compiler/privacyClassExtendsClauseDeclFile.ts
new file mode 100644
index 00000000000..4feb4a691b7
--- /dev/null
+++ b/tests/cases/compiler/privacyClassExtendsClauseDeclFile.ts
@@ -0,0 +1,97 @@
+// @module: commonjs
+// @declaration: true
+
+// @Filename: privacyClassExtendsClauseDeclFile_externalModule.ts
+export module publicModule {
+    export class publicClassInPublicModule {
+        private f1() {
+        }
+    }
+
+    class privateClassInPublicModule {
+    }
+
+    class privateClassExtendingPublicClassInModule extends publicClassInPublicModule {
+    }
+    class privateClassExtendingPrivateClassInModule extends privateClassInPublicModule {
+    }
+    export class publicClassExtendingPublicClassInModule extends publicClassInPublicModule {
+    }
+    export class publicClassExtendingPrivateClassInModule extends privateClassInPublicModule { // Should error
+    }
+
+    class privateClassExtendingFromPrivateModuleClass extends privateModule.publicClassInPrivateModule {
+    }
+    export class publicClassExtendingFromPrivateModuleClass extends privateModule.publicClassInPrivateModule { // Should error
+    }
+}
+
+module privateModule {
+    export class publicClassInPrivateModule {
+        private f1() {
+        }
+    }
+
+    class privateClassInPrivateModule {
+    }
+
+    class privateClassExtendingPublicClassInModule extends publicClassInPrivateModule {
+    }
+    class privateClassExtendingPrivateClassInModule extends privateClassInPrivateModule {
+    }
+    export class publicClassExtendingPublicClassInModule extends publicClassInPrivateModule {
+    }
+    export class publicClassExtendingPrivateClassInModule extends privateClassInPrivateModule { 
+    }
+
+    class privateClassExtendingFromPrivateModuleClass extends privateModule.publicClassInPrivateModule {
+    }
+    export class publicClassExtendingFromPrivateModuleClass extends privateModule.publicClassInPrivateModule {
+    }
+}
+
+export class publicClass {
+    private f1() {
+    }
+}
+
+class privateClass {
+}
+
+class privateClassExtendingPublicClass extends publicClass {
+}
+class privateClassExtendingPrivateClassInModule extends privateClass {
+}
+export class publicClassExtendingPublicClass extends publicClass {
+}
+export class publicClassExtendingPrivateClass extends privateClass { // Should error
+}
+
+class privateClassExtendingFromPrivateModuleClass extends privateModule.publicClassInPrivateModule {
+}
+export class publicClassExtendingFromPrivateModuleClass extends privateModule.publicClassInPrivateModule { // Should error
+}
+
+// @Filename: privacyClassExtendsClauseDeclFile_GlobalFile.ts
+module publicModuleInGlobal {
+    export class publicClassInPublicModule {
+        private f1() {
+        }
+    }
+
+    class privateClassInPublicModule {
+    }
+
+    class privateClassExtendingPublicClassInModule extends publicClassInPublicModule {
+    }
+    class privateClassExtendingPrivateClassInModule extends privateClassInPublicModule {
+    }
+    export class publicClassExtendingPublicClassInModule extends publicClassInPublicModule {
+    }
+    export class publicClassExtendingPrivateClassInModule extends privateClassInPublicModule { // Should error
+    }
+}
+class publicClassInGlobal {
+}
+class publicClassExtendingPublicClassInGlobal extends publicClassInGlobal {
+}
diff --git a/tests/cases/compiler/privacyClassImplementsClauseDeclFile.ts b/tests/cases/compiler/privacyClassImplementsClauseDeclFile.ts
new file mode 100644
index 00000000000..17791e49f86
--- /dev/null
+++ b/tests/cases/compiler/privacyClassImplementsClauseDeclFile.ts
@@ -0,0 +1,94 @@
+// @module: commonjs
+// @declaration: true
+
+// @Filename: privacyClassImplementsClauseDeclFile_externalModule.ts
+export module publicModule {
+    export interface publicInterfaceInPublicModule {
+    }
+
+    interface privateInterfaceInPublicModule {
+    }
+
+    class privateClassImplementingPublicInterfaceInModule implements publicInterfaceInPublicModule {
+    }
+    class privateClassImplementingPrivateInterfaceInModule implements privateInterfaceInPublicModule {
+    }
+    export class publicClassImplementingPublicInterfaceInModule implements publicInterfaceInPublicModule {
+    }
+    export class publicClassImplementingPrivateInterfaceInModule implements privateInterfaceInPublicModule { // Should error
+    }
+
+    class privateClassImplementingFromPrivateModuleInterface implements privateModule.publicInterfaceInPrivateModule {
+    }
+    export class publicClassImplementingFromPrivateModuleInterface implements privateModule.publicInterfaceInPrivateModule { // Should error
+    }
+
+    export class publicClassImplementingPrivateAndPublicInterface implements privateInterfaceInPublicModule, publicInterfaceInPublicModule { // Should error
+    }
+}
+
+module privateModule {
+    export interface publicInterfaceInPrivateModule {
+
+    }
+
+    interface privateInterfaceInPrivateModule {
+    }
+
+    class privateClassImplementingPublicInterfaceInModule implements publicInterfaceInPrivateModule {
+    }
+    class privateClassImplementingPrivateInterfaceInModule implements privateInterfaceInPrivateModule {
+    }
+    export class publicClassImplementingPublicInterfaceInModule implements publicInterfaceInPrivateModule {
+    }
+    export class publicClassImplementingPrivateInterfaceInModule implements privateInterfaceInPrivateModule { 
+    }
+
+    class privateClassImplementingFromPrivateModuleInterface implements privateModule.publicInterfaceInPrivateModule {
+    }
+    export class publicClassImplementingFromPrivateModuleInterface implements privateModule.publicInterfaceInPrivateModule {
+    }
+}
+
+export interface publicInterface {
+
+}
+
+interface privateInterface {
+}
+
+class privateClassImplementingPublicInterface implements publicInterface {
+}
+class privateClassImplementingPrivateInterfaceInModule implements privateInterface {
+}
+export class publicClassImplementingPublicInterface implements publicInterface {
+}
+export class publicClassImplementingPrivateInterface implements privateInterface { // Should error
+}
+
+class privateClassImplementingFromPrivateModuleInterface implements privateModule.publicInterfaceInPrivateModule {
+}
+export class publicClassImplementingFromPrivateModuleInterface implements privateModule.publicInterfaceInPrivateModule { // Should error
+}
+
+// @Filename: privacyClassImplementsClauseDeclFile_GlobalFile.ts
+module publicModuleInGlobal {
+    export interface publicInterfaceInPublicModule {
+    }
+
+    interface privateInterfaceInPublicModule {
+    }
+
+    class privateClassImplementingPublicInterfaceInModule implements publicInterfaceInPublicModule {
+    }
+    class privateClassImplementingPrivateInterfaceInModule implements privateInterfaceInPublicModule {
+    }
+    export class publicClassImplementingPublicInterfaceInModule implements publicInterfaceInPublicModule {
+    }
+    export class publicClassImplementingPrivateInterfaceInModule implements privateInterfaceInPublicModule { // Should error
+    }
+}
+interface publicInterfaceInGlobal {
+}
+class publicClassImplementingPublicInterfaceInGlobal implements publicInterfaceInGlobal {
+}
diff --git a/tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile.ts b/tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile.ts
new file mode 100644
index 00000000000..f24ed8ea32b
--- /dev/null
+++ b/tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile.ts
@@ -0,0 +1,157 @@
+// @module: commonjs
+// @declaration: true
+
+
+// @Filename: privacyFunctionCannotNameParameterTypeDeclFile_GlobalWidgets.ts
+declare module "GlobalWidgets" {
+    export class Widget3 {
+        name: string;
+    }
+    export function createWidget3(): Widget3;
+
+    export module SpecializedGlobalWidget {
+        export class Widget4 {
+            name: string;
+        }
+        function createWidget4(): Widget4;
+    }
+}
+
+// @Filename: privacyFunctionCannotNameParameterTypeDeclFile_Widgets.ts
+export class Widget1 {
+    name = 'one';
+}
+export function createWidget1() {
+    return new Widget1();
+}
+
+export module SpecializedWidget {
+    export class Widget2 {
+        name = 'one';
+    }
+    export function createWidget2() {
+        return new Widget2();
+    }
+}
+
+// @Filename:privacyFunctionCannotNameParameterTypeDeclFile_exporter.ts
+///<reference path='privacyFunctionCannotNameParameterTypeDeclFile_GlobalWidgets.ts'/>
+import Widgets = require("privacyFunctionCannotNameParameterTypeDeclFile_Widgets");
+import Widgets1 = require("GlobalWidgets");
+export function createExportedWidget1() {
+    return Widgets.createWidget1();
+}
+export function createExportedWidget2() {
+    return Widgets.SpecializedWidget.createWidget2();
+}
+export function createExportedWidget3() {
+    return Widgets1.createWidget3();
+}
+export function createExportedWidget4() {
+    return Widgets1.SpecializedGlobalWidget.createWidget4();
+}
+
+// @Filename:privacyFunctionCannotNameParameterTypeDeclFile_consumer.ts
+import exporter = require("privacyFunctionCannotNameParameterTypeDeclFile_exporter");
+export class publicClassWithWithPrivateParmeterTypes {
+    static myPublicStaticMethod(param = exporter.createExportedWidget1()) { // Error
+    }
+    private static myPrivateStaticMethod(param = exporter.createExportedWidget1()) {
+    }
+    myPublicMethod(param  = exporter.createExportedWidget1()) { // Error
+    }
+    private myPrivateMethod(param = exporter.createExportedWidget1()) {
+    }
+    constructor(param = exporter.createExportedWidget1(), private param1 = exporter.createExportedWidget1(), public param2 = exporter.createExportedWidget1()) { // Error
+    }
+}
+export class publicClassWithWithPrivateParmeterTypes1 {
+    static myPublicStaticMethod(param = exporter.createExportedWidget3()) { // Error
+    }
+    private static myPrivateStaticMethod(param = exporter.createExportedWidget3()) {
+    }
+    myPublicMethod(param  = exporter.createExportedWidget3()) { // Error
+    }
+    private myPrivateMethod(param = exporter.createExportedWidget3()) {
+    }
+    constructor(param = exporter.createExportedWidget3(), private param1 = exporter.createExportedWidget3(), public param2 = exporter.createExportedWidget3()) { // Error
+    }
+}
+
+class privateClassWithWithPrivateParmeterTypes {
+    static myPublicStaticMethod(param = exporter.createExportedWidget1()) {
+    }
+    private static myPrivateStaticMethod(param = exporter.createExportedWidget1()) {
+    }
+    myPublicMethod(param  = exporter.createExportedWidget1()) {
+    }
+    private myPrivateMethod(param = exporter.createExportedWidget1()) {
+    }
+    constructor(param = exporter.createExportedWidget1(), private param1 = exporter.createExportedWidget1(), public param2 = exporter.createExportedWidget1()) {
+    }
+}
+class privateClassWithWithPrivateParmeterTypes2 {
+    static myPublicStaticMethod(param = exporter.createExportedWidget3()) {
+    }
+    private static myPrivateStaticMethod(param = exporter.createExportedWidget3()) {
+    }
+    myPublicMethod(param  = exporter.createExportedWidget3()) {
+    }
+    private myPrivateMethod(param = exporter.createExportedWidget3()) {
+    }
+    constructor(param = exporter.createExportedWidget3(), private param1 = exporter.createExportedWidget3(), public param2 = exporter.createExportedWidget3()) {
+    }
+}
+
+export function publicFunctionWithPrivateParmeterTypes(param = exporter.createExportedWidget1()) { // Error
+}
+function privateFunctionWithPrivateParmeterTypes(param = exporter.createExportedWidget1()) {
+}
+export function publicFunctionWithPrivateParmeterTypes1(param = exporter.createExportedWidget3()) { // Error
+}
+function privateFunctionWithPrivateParmeterTypes1(param = exporter.createExportedWidget3()) {
+}
+
+
+export class publicClassWithPrivateModuleParameterTypes {
+    static myPublicStaticMethod(param= exporter.createExportedWidget2()) { // Error
+    }
+    myPublicMethod(param= exporter.createExportedWidget2()) { // Error
+    }
+    constructor(param= exporter.createExportedWidget2(), private param1= exporter.createExportedWidget2(), public param2= exporter.createExportedWidget2()) { // Error
+    }
+}
+export class publicClassWithPrivateModuleParameterTypes2 {
+    static myPublicStaticMethod(param= exporter.createExportedWidget4()) { // Error
+    }
+    myPublicMethod(param= exporter.createExportedWidget4()) { // Error
+    }
+    constructor(param= exporter.createExportedWidget4(), private param1= exporter.createExportedWidget4(), public param2= exporter.createExportedWidget4()) { // Error
+    }
+}
+export function publicFunctionWithPrivateModuleParameterTypes(param= exporter.createExportedWidget2()) { // Error
+}
+export function publicFunctionWithPrivateModuleParameterTypes1(param= exporter.createExportedWidget4()) { // Error
+}
+
+
+class privateClassWithPrivateModuleParameterTypes {
+    static myPublicStaticMethod(param= exporter.createExportedWidget2()) {
+    }
+    myPublicMethod(param= exporter.createExportedWidget2()) {
+    }
+    constructor(param= exporter.createExportedWidget2(), private param1= exporter.createExportedWidget2(), public param2= exporter.createExportedWidget2()) {
+    }
+}
+class privateClassWithPrivateModuleParameterTypes1 {
+    static myPublicStaticMethod(param= exporter.createExportedWidget4()) {
+    }
+    myPublicMethod(param= exporter.createExportedWidget4()) {
+    }
+    constructor(param= exporter.createExportedWidget4(), private param1= exporter.createExportedWidget4(), public param2= exporter.createExportedWidget4()) {
+    }
+}
+function privateFunctionWithPrivateModuleParameterTypes(param= exporter.createExportedWidget2()) {
+}
+function privateFunctionWithPrivateModuleParameterTypes1(param= exporter.createExportedWidget4()) {
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/privacyFunctionCannotNameReturnTypeDeclFile.ts b/tests/cases/compiler/privacyFunctionCannotNameReturnTypeDeclFile.ts
new file mode 100644
index 00000000000..2eff22327b5
--- /dev/null
+++ b/tests/cases/compiler/privacyFunctionCannotNameReturnTypeDeclFile.ts
@@ -0,0 +1,163 @@
+// @module: commonjs
+// @declaration: true
+
+
+// @Filename: privacyFunctionReturnTypeDeclFile_GlobalWidgets.ts
+declare module "GlobalWidgets" {
+    export class Widget3 {
+        name: string;
+    }
+    export function createWidget3(): Widget3;
+
+    export module SpecializedGlobalWidget {
+        export class Widget4 {
+            name: string;
+        }
+        function createWidget4(): Widget4;
+    }
+}
+
+// @Filename: privacyFunctionReturnTypeDeclFile_Widgets.ts
+export class Widget1 {
+    name = 'one';
+}
+export function createWidget1() {
+    return new Widget1();
+}
+
+export module SpecializedWidget {
+    export class Widget2 {
+        name = 'one';
+    }
+    export function createWidget2() {
+        return new Widget2();
+    }
+}
+
+// @Filename:privacyFunctionReturnTypeDeclFile_exporter.ts
+///<reference path='privacyFunctionReturnTypeDeclFile_GlobalWidgets.ts'/>
+import Widgets = require("privacyFunctionReturnTypeDeclFile_Widgets");
+import Widgets1 = require("GlobalWidgets");
+export function createExportedWidget1() {
+    return Widgets.createWidget1();
+}
+export function createExportedWidget2() {
+    return Widgets.SpecializedWidget.createWidget2();
+}
+export function createExportedWidget3() {
+    return Widgets1.createWidget3();
+}
+export function createExportedWidget4() {
+    return Widgets1.SpecializedGlobalWidget.createWidget4();
+}
+
+// @Filename:privacyFunctionReturnTypeDeclFile_consumer.ts
+import exporter = require("privacyFunctionReturnTypeDeclFile_exporter");
+export class publicClassWithWithPrivateParmeterTypes {
+    static myPublicStaticMethod() { // Error
+        return exporter.createExportedWidget1();
+    }
+    private static myPrivateStaticMethod() {
+        return exporter.createExportedWidget1();;
+    }
+    myPublicMethod() { // Error
+        return exporter.createExportedWidget1();;
+    }
+    private myPrivateMethod() {
+        return exporter.createExportedWidget1();;
+    }
+    static myPublicStaticMethod1() { // Error
+        return exporter.createExportedWidget3();
+    }
+    private static myPrivateStaticMethod1() {
+        return exporter.createExportedWidget3();;
+    }
+    myPublicMethod1() { // Error
+        return exporter.createExportedWidget3();;
+    }
+    private myPrivateMethod1() {
+        return exporter.createExportedWidget3();;
+    }
+}
+
+class privateClassWithWithPrivateParmeterTypes {
+    static myPublicStaticMethod() { 
+        return exporter.createExportedWidget1();
+    }
+    private static myPrivateStaticMethod() {
+        return exporter.createExportedWidget1();;
+    }
+    myPublicMethod() { 
+        return exporter.createExportedWidget1();;
+    }
+    private myPrivateMethod() {
+        return exporter.createExportedWidget1();;
+    }
+    static myPublicStaticMethod1() { 
+        return exporter.createExportedWidget3();
+    }
+    private static myPrivateStaticMethod1() {
+        return exporter.createExportedWidget3();;
+    }
+    myPublicMethod1() { 
+        return exporter.createExportedWidget3();;
+    }
+    private myPrivateMethod1() {
+        return exporter.createExportedWidget3();;
+    }
+}
+
+export function publicFunctionWithPrivateParmeterTypes() { // Error
+    return exporter.createExportedWidget1();
+}
+function privateFunctionWithPrivateParmeterTypes()   {
+    return exporter.createExportedWidget1();
+}
+export function publicFunctionWithPrivateParmeterTypes1() { // Error
+    return exporter.createExportedWidget3();
+}
+function privateFunctionWithPrivateParmeterTypes1() {
+    return exporter.createExportedWidget3();
+}
+
+export class publicClassWithPrivateModuleReturnTypes {
+    static myPublicStaticMethod() { // Error
+        return exporter.createExportedWidget2();
+    }
+    myPublicMethod() { // Error
+        return exporter.createExportedWidget2();
+    }
+    static myPublicStaticMethod1() { // Error
+        return exporter.createExportedWidget4();
+    }
+    myPublicMethod1() { // Error
+        return exporter.createExportedWidget4();
+    }
+}
+export function publicFunctionWithPrivateModuleReturnTypes() { // Error
+    return exporter.createExportedWidget2();
+}
+export function publicFunctionWithPrivateModuleReturnTypes1() { // Error
+    return exporter.createExportedWidget4();
+}
+
+class privateClassWithPrivateModuleReturnTypes {
+    static myPublicStaticMethod() { 
+        return exporter.createExportedWidget2();
+    }
+    myPublicMethod() { 
+        return exporter.createExportedWidget2();
+    }
+    static myPublicStaticMethod1() { // Error
+        return exporter.createExportedWidget4();
+    }
+    myPublicMethod1() { // Error
+        return exporter.createExportedWidget4();
+    }
+}
+function privateFunctionWithPrivateModuleReturnTypes() { 
+    return exporter.createExportedWidget2();
+}
+function privateFunctionWithPrivateModuleReturnTypes1() {
+    return exporter.createExportedWidget4();
+}
diff --git a/tests/cases/compiler/privacyFunctionParameterDeclFile.ts b/tests/cases/compiler/privacyFunctionParameterDeclFile.ts
new file mode 100644
index 00000000000..baa2ed4bee6
--- /dev/null
+++ b/tests/cases/compiler/privacyFunctionParameterDeclFile.ts
@@ -0,0 +1,687 @@
+// @module: commonjs
+// @declaration: true
+
+// @Filename:privacyFunctionParameterDeclFile_externalModule.ts
+class privateClass {
+}
+
+export class publicClass {
+}
+
+export interface publicInterfaceWithPrivateParmeterTypes {
+    new (param: privateClass): publicClass; // Error
+    (param: privateClass): publicClass; // Error
+    myMethod(param: privateClass): void; // Error
+}
+
+export interface publicInterfaceWithPublicParmeterTypes {
+    new (param: publicClass): publicClass;
+    (param: publicClass): publicClass;
+    myMethod(param: publicClass): void;
+}
+
+interface privateInterfaceWithPrivateParmeterTypes {
+    new (param: privateClass): privateClass;
+    (param: privateClass): privateClass;
+    myMethod(param: privateClass): void;
+}
+
+interface privateInterfaceWithPublicParmeterTypes {
+    new (param: publicClass): publicClass;
+    (param: publicClass): publicClass;
+    myMethod(param: publicClass): void;
+}
+
+export class publicClassWithWithPrivateParmeterTypes {
+    static myPublicStaticMethod(param: privateClass) { // Error
+    }
+    private static myPrivateStaticMethod(param: privateClass) {
+    }
+    myPublicMethod(param: privateClass) { // Error
+    }
+    private myPrivateMethod(param: privateClass) {
+    }
+    constructor(param: privateClass, private param1: privateClass, public param2: privateClass) { // Error
+    }
+}
+
+export class publicClassWithWithPublicParmeterTypes {
+    static myPublicStaticMethod(param: publicClass) {
+    }
+    private static myPrivateStaticMethod(param: publicClass) {
+    }
+    myPublicMethod(param: publicClass) {
+    }
+    private myPrivateMethod(param: publicClass) {
+    }
+    constructor(param: publicClass, private param1: publicClass, public param2: publicClass) {
+    }
+}
+
+class privateClassWithWithPrivateParmeterTypes {
+    static myPublicStaticMethod(param: privateClass) {
+    }
+    private static myPrivateStaticMethod(param: privateClass) {
+    }
+    myPublicMethod(param: privateClass) { 
+    }
+    private myPrivateMethod(param: privateClass) {
+    }
+    constructor(param: privateClass, private param1: privateClass, public param2: privateClass) {
+    }
+}
+
+class privateClassWithWithPublicParmeterTypes {
+    static myPublicStaticMethod(param: publicClass) {
+    }
+    private static myPrivateStaticMethod(param: publicClass) {
+    }
+    myPublicMethod(param: publicClass) {
+    }
+    private myPrivateMethod(param: publicClass) {
+    }
+    constructor(param: publicClass, private param1: publicClass, public param2: publicClass) {
+    }
+}
+
+export function publicFunctionWithPrivateParmeterTypes(param: privateClass) { // Error
+}
+export function publicFunctionWithPublicParmeterTypes(param: publicClass) {
+}
+function privateFunctionWithPrivateParmeterTypes(param: privateClass) {
+}
+function privateFunctionWithPublicParmeterTypes(param: publicClass) {
+}
+
+export declare function publicAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void; // Error
+export declare function publicAmbientFunctionWithPublicParmeterTypes(param: publicClass): void;
+declare function privateAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void;
+declare function privateAmbientFunctionWithPublicParmeterTypes(param: publicClass): void;
+
+export interface publicInterfaceWithPrivateModuleParameterTypes {
+    new (param: privateModule.publicClass): publicClass; // Error
+    (param: privateModule.publicClass): publicClass; // Error
+    myMethod(param: privateModule.publicClass): void; // Error
+}
+export class publicClassWithPrivateModuleParameterTypes {
+    static myPublicStaticMethod(param: privateModule.publicClass) { // Error
+    }
+    myPublicMethod(param: privateModule.publicClass) { // Error
+    }
+    constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) { // Error
+    }
+}
+export function publicFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) { // Error
+}
+export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void; // Error
+
+interface privateInterfaceWithPrivateModuleParameterTypes {
+    new (param: privateModule.publicClass): publicClass;
+    (param: privateModule.publicClass): publicClass;
+    myMethod(param: privateModule.publicClass): void;
+}
+class privateClassWithPrivateModuleParameterTypes {
+    static myPublicStaticMethod(param: privateModule.publicClass) {
+    }
+    myPublicMethod(param: privateModule.publicClass) {
+    }
+    constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) {
+    }
+}
+function privateFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) {
+}
+declare function privateAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void;
+
+export module publicModule {
+    class privateClass {
+    }
+
+    export class publicClass {
+    }
+
+
+    export interface publicInterfaceWithPrivateParmeterTypes {
+        new (param: privateClass): publicClass; // Error
+        (param: privateClass): publicClass; // Error
+        myMethod(param: privateClass): void; // Error
+    }
+
+    export interface publicInterfaceWithPublicParmeterTypes {
+        new (param: publicClass): publicClass;
+        (param: publicClass): publicClass;
+        myMethod(param: publicClass): void;
+    }
+
+    interface privateInterfaceWithPrivateParmeterTypes {
+        new (param: privateClass): privateClass;
+        (param: privateClass): privateClass;
+        myMethod(param: privateClass): void;
+    }
+
+    interface privateInterfaceWithPublicParmeterTypes {
+        new (param: publicClass): publicClass;
+        (param: publicClass): publicClass;
+        myMethod(param: publicClass): void;
+    }
+
+    export class publicClassWithWithPrivateParmeterTypes {
+        static myPublicStaticMethod(param: privateClass) { // Error
+        }
+        private static myPrivateStaticMethod(param: privateClass) {
+        }
+        myPublicMethod(param: privateClass) { // Error
+        }
+        private myPrivateMethod(param: privateClass) {
+        }
+        constructor(param: privateClass, private param1: privateClass, public param2: privateClass) { // Error
+        }
+    }
+
+    export class publicClassWithWithPublicParmeterTypes {
+        static myPublicStaticMethod(param: publicClass) {
+        }
+        private static myPrivateStaticMethod(param: publicClass) {
+        }
+        myPublicMethod(param: publicClass) {
+        }
+        private myPrivateMethod(param: publicClass) {
+        }
+        constructor(param: publicClass, private param1: publicClass, public param2: publicClass) {
+        }
+    }
+
+    class privateClassWithWithPrivateParmeterTypes {
+        static myPublicStaticMethod(param: privateClass) {
+        }
+        private static myPrivateStaticMethod(param: privateClass) {
+        }
+        myPublicMethod(param: privateClass) {
+        }
+        private myPrivateMethod(param: privateClass) {
+        }
+        constructor(param: privateClass, private param1: privateClass, public param2: privateClass) {
+        }
+    }
+
+    class privateClassWithWithPublicParmeterTypes {
+        static myPublicStaticMethod(param: publicClass) {
+        }
+        private static myPrivateStaticMethod(param: publicClass) {
+        }
+        myPublicMethod(param: publicClass) {
+        }
+        private myPrivateMethod(param: publicClass) {
+        }
+        constructor(param: publicClass, private param1: publicClass, public param2: publicClass) {
+        }
+    }
+
+    export function publicFunctionWithPrivateParmeterTypes(param: privateClass) { // Error
+    }
+    export function publicFunctionWithPublicParmeterTypes(param: publicClass) {
+    }
+    function privateFunctionWithPrivateParmeterTypes(param: privateClass) {
+    }
+    function privateFunctionWithPublicParmeterTypes(param: publicClass) {
+    }
+
+    export declare function publicAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void; // Error
+    export declare function publicAmbientFunctionWithPublicParmeterTypes(param: publicClass): void;
+    declare function privateAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void;
+    declare function privateAmbientFunctionWithPublicParmeterTypes(param: publicClass): void;
+
+    export interface publicInterfaceWithPrivateModuleParameterTypes {
+        new (param: privateModule.publicClass): publicClass; // Error
+        (param: privateModule.publicClass): publicClass; // Error
+        myMethod(param: privateModule.publicClass): void; // Error
+    }
+    export class publicClassWithPrivateModuleParameterTypes {
+        static myPublicStaticMethod(param: privateModule.publicClass) { // Error
+        }
+        myPublicMethod(param: privateModule.publicClass) { // Error
+        }
+        constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) { // Error
+        }
+    }
+    export function publicFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) { // Error
+    }
+    export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void; // Error
+
+    interface privateInterfaceWithPrivateModuleParameterTypes {
+        new (param: privateModule.publicClass): publicClass;
+        (param: privateModule.publicClass): publicClass;
+        myMethod(param: privateModule.publicClass): void;
+    }
+    class privateClassWithPrivateModuleParameterTypes {
+        static myPublicStaticMethod(param: privateModule.publicClass) {
+        }
+        myPublicMethod(param: privateModule.publicClass) {
+        }
+        constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) {
+        }
+    }
+    function privateFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) {
+    }
+    declare function privateAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void;
+
+}
+
+module privateModule {
+    class privateClass {
+    }
+
+    export class publicClass {
+    }
+
+    export interface publicInterfaceWithPrivateParmeterTypes {
+        new (param: privateClass): publicClass;
+        (param: privateClass): publicClass;
+        myMethod(param: privateClass): void;
+    }
+
+    export interface publicInterfaceWithPublicParmeterTypes {
+        new (param: publicClass): publicClass;
+        (param: publicClass): publicClass;
+        myMethod(param: publicClass): void;
+    }
+
+    interface privateInterfaceWithPrivateParmeterTypes {
+        new (param: privateClass): privateClass;
+        (param: privateClass): privateClass;
+        myMethod(param: privateClass): void;
+    }
+
+    interface privateInterfaceWithPublicParmeterTypes {
+        new (param: publicClass): publicClass;
+        (param: publicClass): publicClass;
+        myMethod(param: publicClass): void;
+    }
+
+    export class publicClassWithWithPrivateParmeterTypes {
+        static myPublicStaticMethod(param: privateClass) {
+        }
+        private static myPrivateStaticMethod(param: privateClass) {
+        }
+        myPublicMethod(param: privateClass) {
+        }
+        private myPrivateMethod(param: privateClass) {
+        }
+        constructor(param: privateClass, private param1: privateClass, public param2: privateClass) {
+        }
+    }
+
+    export class publicClassWithWithPublicParmeterTypes {
+        static myPublicStaticMethod(param: publicClass) {
+        }
+        private static myPrivateStaticMethod(param: publicClass) {
+        }
+        myPublicMethod(param: publicClass) {
+        }
+        private myPrivateMethod(param: publicClass) {
+        }
+        constructor(param: publicClass, private param1: publicClass, public param2: publicClass) {
+        }
+    }
+
+    class privateClassWithWithPrivateParmeterTypes {
+        static myPublicStaticMethod(param: privateClass) {
+        }
+        private static myPrivateStaticMethod(param: privateClass) {
+        }
+        myPublicMethod(param: privateClass) {
+        }
+        private myPrivateMethod(param: privateClass) {
+        }
+        constructor(param: privateClass, private param1: privateClass, public param2: privateClass) {
+        }
+    }
+
+    class privateClassWithWithPublicParmeterTypes {
+        static myPublicStaticMethod(param: publicClass) {
+        }
+        private static myPrivateStaticMethod(param: publicClass) {
+        }
+        myPublicMethod(param: publicClass) {
+        }
+        private myPrivateMethod(param: publicClass) {
+        }
+        constructor(param: publicClass, private param1: publicClass, public param2: publicClass) {
+        }
+    }
+
+    export function publicFunctionWithPrivateParmeterTypes(param: privateClass) {
+    }
+    export function publicFunctionWithPublicParmeterTypes(param: publicClass) {
+    }
+    function privateFunctionWithPrivateParmeterTypes(param: privateClass) {
+    }
+    function privateFunctionWithPublicParmeterTypes(param: publicClass) {
+    }
+
+    export declare function publicAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void;
+    export declare function publicAmbientFunctionWithPublicParmeterTypes(param: publicClass): void;
+    declare function privateAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void;
+    declare function privateAmbientFunctionWithPublicParmeterTypes(param: publicClass): void;
+
+    export interface publicInterfaceWithPrivateModuleParameterTypes {
+        new (param: privateModule.publicClass): publicClass;
+        (param: privateModule.publicClass): publicClass;
+        myMethod(param: privateModule.publicClass): void;
+    }
+    export class publicClassWithPrivateModuleParameterTypes {
+        static myPublicStaticMethod(param: privateModule.publicClass) {
+        }
+        myPublicMethod(param: privateModule.publicClass) {
+        }
+        constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) {
+        }
+    }
+    export function publicFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) {
+    }
+    export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void;
+
+    interface privateInterfaceWithPrivateModuleParameterTypes {
+        new (param: privateModule.publicClass): publicClass;
+        (param: privateModule.publicClass): publicClass;
+        myMethod(param: privateModule.publicClass): void;
+    }
+    class privateClassWithPrivateModuleParameterTypes {
+        static myPublicStaticMethod(param: privateModule.publicClass) {
+        }
+        myPublicMethod(param: privateModule.publicClass) {
+        }
+        constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) {
+        }
+    }
+    function privateFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) {
+    }
+    declare function privateAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void;
+}
+
+// @Filename: privacyFunctionParameterDeclFile_GlobalFile.ts
+class publicClassInGlobal {
+}
+interface publicInterfaceWithPublicParmeterTypesInGlobal {
+    new (param: publicClassInGlobal): publicClassInGlobal;
+    (param: publicClassInGlobal): publicClassInGlobal;
+    myMethod(param: publicClassInGlobal): void;
+}
+class publicClassWithWithPublicParmeterTypesInGlobal {
+    static myPublicStaticMethod(param: publicClassInGlobal) {
+    }
+    private static myPrivateStaticMethod(param: publicClassInGlobal) {
+    }
+    myPublicMethod(param: publicClassInGlobal) {
+    }
+    private myPrivateMethod(param: publicClassInGlobal) {
+    }
+    constructor(param: publicClassInGlobal, private param1: publicClassInGlobal, public param2: publicClassInGlobal) {
+    }
+}
+function publicFunctionWithPublicParmeterTypesInGlobal(param: publicClassInGlobal) {
+}
+declare function publicAmbientFunctionWithPublicParmeterTypesInGlobal(param: publicClassInGlobal): void;
+
+module publicModuleInGlobal {
+    class privateClass {
+    }
+
+    export class publicClass {
+    }
+
+    module privateModule {
+        class privateClass {
+        }
+
+        export class publicClass {
+        }
+
+        export interface publicInterfaceWithPrivateParmeterTypes {
+            new (param: privateClass): publicClass;
+            (param: privateClass): publicClass;
+            myMethod(param: privateClass): void;
+        }
+
+        export interface publicInterfaceWithPublicParmeterTypes {
+            new (param: publicClass): publicClass;
+            (param: publicClass): publicClass;
+            myMethod(param: publicClass): void;
+        }
+
+        interface privateInterfaceWithPrivateParmeterTypes {
+            new (param: privateClass): privateClass;
+            (param: privateClass): privateClass;
+            myMethod(param: privateClass): void;
+        }
+
+        interface privateInterfaceWithPublicParmeterTypes {
+            new (param: publicClass): publicClass;
+            (param: publicClass): publicClass;
+            myMethod(param: publicClass): void;
+        }
+
+        export class publicClassWithWithPrivateParmeterTypes {
+            static myPublicStaticMethod(param: privateClass) {
+            }
+            private static myPrivateStaticMethod(param: privateClass) {
+            }
+            myPublicMethod(param: privateClass) {
+            }
+            private myPrivateMethod(param: privateClass) {
+            }
+            constructor(param: privateClass, private param1: privateClass, public param2: privateClass) {
+            }
+        }
+
+        export class publicClassWithWithPublicParmeterTypes {
+            static myPublicStaticMethod(param: publicClass) {
+            }
+            private static myPrivateStaticMethod(param: publicClass) {
+            }
+            myPublicMethod(param: publicClass) {
+            }
+            private myPrivateMethod(param: publicClass) {
+            }
+            constructor(param: publicClass, private param1: publicClass, public param2: publicClass) {
+            }
+        }
+
+        class privateClassWithWithPrivateParmeterTypes {
+            static myPublicStaticMethod(param: privateClass) {
+            }
+            private static myPrivateStaticMethod(param: privateClass) {
+            }
+            myPublicMethod(param: privateClass) {
+            }
+            private myPrivateMethod(param: privateClass) {
+            }
+            constructor(param: privateClass, private param1: privateClass, public param2: privateClass) {
+            }
+        }
+
+        class privateClassWithWithPublicParmeterTypes {
+            static myPublicStaticMethod(param: publicClass) {
+            }
+            private static myPrivateStaticMethod(param: publicClass) {
+            }
+            myPublicMethod(param: publicClass) {
+            }
+            private myPrivateMethod(param: publicClass) {
+            }
+            constructor(param: publicClass, private param1: publicClass, public param2: publicClass) {
+            }
+        }
+
+        export function publicFunctionWithPrivateParmeterTypes(param: privateClass) {
+        }
+        export function publicFunctionWithPublicParmeterTypes(param: publicClass) {
+        }
+        function privateFunctionWithPrivateParmeterTypes(param: privateClass) {
+        }
+        function privateFunctionWithPublicParmeterTypes(param: publicClass) {
+        }
+
+        export declare function publicAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void;
+        export declare function publicAmbientFunctionWithPublicParmeterTypes(param: publicClass): void;
+        declare function privateAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void;
+        declare function privateAmbientFunctionWithPublicParmeterTypes(param: publicClass): void;
+
+        export interface publicInterfaceWithPrivateModuleParameterTypes {
+            new (param: privateModule.publicClass): publicClass;
+            (param: privateModule.publicClass): publicClass;
+            myMethod(param: privateModule.publicClass): void;
+        }
+        export class publicClassWithPrivateModuleParameterTypes {
+            static myPublicStaticMethod(param: privateModule.publicClass) {
+            }
+            myPublicMethod(param: privateModule.publicClass) {
+            }
+            constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) {
+            }
+        }
+        export function publicFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) {
+        }
+        export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void;
+
+        interface privateInterfaceWithPrivateModuleParameterTypes {
+            new (param: privateModule.publicClass): publicClass;
+            (param: privateModule.publicClass): publicClass;
+            myMethod(param: privateModule.publicClass): void;
+        }
+        class privateClassWithPrivateModuleParameterTypes {
+            static myPublicStaticMethod(param: privateModule.publicClass) {
+            }
+            myPublicMethod(param: privateModule.publicClass) {
+            }
+            constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) {
+            }
+        }
+        function privateFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) {
+        }
+        declare function privateAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void;
+    }
+
+    export interface publicInterfaceWithPrivateParmeterTypes {
+        new (param: privateClass): publicClass; // Error
+        (param: privateClass): publicClass; // Error
+        myMethod(param: privateClass): void; // Error
+    }
+
+    export interface publicInterfaceWithPublicParmeterTypes {
+        new (param: publicClass): publicClass;
+        (param: publicClass): publicClass;
+        myMethod(param: publicClass): void;
+    }
+
+    interface privateInterfaceWithPrivateParmeterTypes {
+        new (param: privateClass): privateClass;
+        (param: privateClass): privateClass;
+        myMethod(param: privateClass): void;
+    }
+
+    interface privateInterfaceWithPublicParmeterTypes {
+        new (param: publicClass): publicClass;
+        (param: publicClass): publicClass;
+        myMethod(param: publicClass): void;
+    }
+
+    export class publicClassWithWithPrivateParmeterTypes {
+        static myPublicStaticMethod(param: privateClass) { // Error
+        }
+        private static myPrivateStaticMethod(param: privateClass) {
+        }
+        myPublicMethod(param: privateClass) { // Error
+        }
+        private myPrivateMethod(param: privateClass) {
+        }
+        constructor(param: privateClass, private param1: privateClass, public param2: privateClass) { // Error
+        }
+    }
+
+    export class publicClassWithWithPublicParmeterTypes {
+        static myPublicStaticMethod(param: publicClass) {
+        }
+        private static myPrivateStaticMethod(param: publicClass) {
+        }
+        myPublicMethod(param: publicClass) {
+        }
+        private myPrivateMethod(param: publicClass) {
+        }
+        constructor(param: publicClass, private param1: publicClass, public param2: publicClass) {
+        }
+    }
+
+    class privateClassWithWithPrivateParmeterTypes {
+        static myPublicStaticMethod(param: privateClass) {
+        }
+        private static myPrivateStaticMethod(param: privateClass) {
+        }
+        myPublicMethod(param: privateClass) {
+        }
+        private myPrivateMethod(param: privateClass) {
+        }
+        constructor(param: privateClass, private param1: privateClass, public param2: privateClass) {
+        }
+    }
+
+    class privateClassWithWithPublicParmeterTypes {
+        static myPublicStaticMethod(param: publicClass) {
+        }
+        private static myPrivateStaticMethod(param: publicClass) {
+        }
+        myPublicMethod(param: publicClass) {
+        }
+        private myPrivateMethod(param: publicClass) {
+        }
+        constructor(param: publicClass, private param1: publicClass, public param2: publicClass) {
+        }
+    }
+
+    export function publicFunctionWithPrivateParmeterTypes(param: privateClass) { // Error
+    }
+    export function publicFunctionWithPublicParmeterTypes(param: publicClass) {
+    }
+    function privateFunctionWithPrivateParmeterTypes(param: privateClass) {
+    }
+    function privateFunctionWithPublicParmeterTypes(param: publicClass) {
+    }
+
+    export declare function publicAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void; // Error
+    export declare function publicAmbientFunctionWithPublicParmeterTypes(param: publicClass): void;
+    declare function privateAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void;
+    declare function privateAmbientFunctionWithPublicParmeterTypes(param: publicClass): void;
+
+    export interface publicInterfaceWithPrivateModuleParameterTypes {
+        new (param: privateModule.publicClass): publicClass; // Error
+        (param: privateModule.publicClass): publicClass; // Error
+        myMethod(param: privateModule.publicClass): void; // Error
+    }
+    export class publicClassWithPrivateModuleParameterTypes {
+        static myPublicStaticMethod(param: privateModule.publicClass) { // Error
+        }
+        myPublicMethod(param: privateModule.publicClass) { // Error
+        }
+        constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) { // Error
+        }
+    }
+    export function publicFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) { // Error
+    }
+    export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void; // Error
+
+    interface privateInterfaceWithPrivateModuleParameterTypes {
+        new (param: privateModule.publicClass): publicClass;
+        (param: privateModule.publicClass): publicClass;
+        myMethod(param: privateModule.publicClass): void;
+    }
+    class privateClassWithPrivateModuleParameterTypes {
+        static myPublicStaticMethod(param: privateModule.publicClass) {
+        }
+        myPublicMethod(param: privateModule.publicClass) {
+        }
+        constructor(param: privateModule.publicClass, private param1: privateModule.publicClass, public param2: privateModule.publicClass) {
+        }
+    }
+    function privateFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass) {
+    }
+    declare function privateAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void;
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/privacyFunctionReturnTypeDeclFile.ts b/tests/cases/compiler/privacyFunctionReturnTypeDeclFile.ts
new file mode 100644
index 00000000000..c09c4b123f2
--- /dev/null
+++ b/tests/cases/compiler/privacyFunctionReturnTypeDeclFile.ts
@@ -0,0 +1,1194 @@
+// @module: commonjs
+// @declaration: true
+
+// @Filename:privacyFunctionReturnTypeDeclFile_externalModule.ts
+class privateClass {
+}
+
+export class publicClass {
+}
+
+export interface publicInterfaceWithPrivateParmeterTypes {
+    new (): privateClass; // Error
+    (): privateClass; // Error
+    [x: number]: privateClass; // Error
+    myMethod(): privateClass; // Error
+}
+
+export interface publicInterfaceWithPublicParmeterTypes {
+    new (): publicClass;
+    (): publicClass;
+    [x: number]: publicClass;
+    myMethod(): publicClass;
+}
+
+interface privateInterfaceWithPrivateParmeterTypes {
+    new (): privateClass;
+    (): privateClass;
+    [x: number]: privateClass;
+    myMethod(): privateClass;
+}
+
+interface privateInterfaceWithPublicParmeterTypes {
+    new (): publicClass;
+    (): publicClass;
+    [x: number]: publicClass;
+    myMethod(): publicClass;
+}
+
+export class publicClassWithWithPrivateParmeterTypes {
+    static myPublicStaticMethod(): privateClass { // Error
+        return null;
+    }
+    private static myPrivateStaticMethod(): privateClass {
+        return null;
+    }
+    myPublicMethod(): privateClass { // Error
+        return null;
+    }
+    private myPrivateMethod(): privateClass {
+        return null;
+    }
+    static myPublicStaticMethod1() { // Error
+        return new privateClass();
+    }
+    private static myPrivateStaticMethod1() {
+        return new privateClass();
+    }
+    myPublicMethod1() { // Error
+        return new privateClass();
+    }
+    private myPrivateMethod1() {
+        return new privateClass();
+    }
+}
+
+export class publicClassWithWithPublicParmeterTypes {
+    static myPublicStaticMethod(): publicClass { 
+        return null;
+    }
+    private static myPrivateStaticMethod(): publicClass {
+        return null;
+    }
+    myPublicMethod(): publicClass { 
+        return null;
+    }
+    private myPrivateMethod(): publicClass {
+        return null;
+    }
+    static myPublicStaticMethod1() {
+        return new publicClass();
+    }
+    private static myPrivateStaticMethod1() {
+        return new publicClass();
+    }
+    myPublicMethod1() { 
+        return new publicClass();
+    }
+    private myPrivateMethod1() {
+        return new publicClass();
+    }
+}
+
+class privateClassWithWithPrivateParmeterTypes {
+    static myPublicStaticMethod(): privateClass {
+        return null;
+    }
+    private static myPrivateStaticMethod(): privateClass {
+        return null;
+    }
+    myPublicMethod(): privateClass {
+        return null;
+    }
+    private myPrivateMethod(): privateClass {
+        return null;
+    }
+    static myPublicStaticMethod1() {
+        return new privateClass();
+    }
+    private static myPrivateStaticMethod1() {
+        return new privateClass();
+    }
+    myPublicMethod1() {
+        return new privateClass();
+    }
+    private myPrivateMethod1() {
+        return new privateClass();
+    }
+}
+
+class privateClassWithWithPublicParmeterTypes {
+    static myPublicStaticMethod(): publicClass {
+        return null;
+    }
+    private static myPrivateStaticMethod(): publicClass {
+        return null;
+    }
+    myPublicMethod(): publicClass {
+        return null;
+    }
+    private myPrivateMethod(): publicClass {
+        return null;
+    }
+    static myPublicStaticMethod1() {
+        return new publicClass();
+    }
+    private static myPrivateStaticMethod1() {
+        return new publicClass();
+    }
+    myPublicMethod1() {
+        return new publicClass();
+    }
+    private myPrivateMethod1() {
+        return new publicClass();
+    }
+}
+
+export function publicFunctionWithPrivateParmeterTypes(): privateClass { // Error
+    return null;
+}
+export function publicFunctionWithPublicParmeterTypes(): publicClass {
+    return null;
+}
+function privateFunctionWithPrivateParmeterTypes(): privateClass {
+    return null;
+}
+function privateFunctionWithPublicParmeterTypes(): publicClass {
+    return null;
+}
+export function publicFunctionWithPrivateParmeterTypes1() { // Error
+    return new privateClass();
+}
+export function publicFunctionWithPublicParmeterTypes1() {
+    return new publicClass();
+}
+function privateFunctionWithPrivateParmeterTypes1() {
+    return new privateClass();
+}
+function privateFunctionWithPublicParmeterTypes1() {
+    return new publicClass();
+}
+
+export declare function publicAmbientFunctionWithPrivateParmeterTypes(): privateClass; // Error
+export declare function publicAmbientFunctionWithPublicParmeterTypes(): publicClass;
+declare function privateAmbientFunctionWithPrivateParmeterTypes(): privateClass;
+declare function privateAmbientFunctionWithPublicParmeterTypes(): publicClass;
+
+export interface publicInterfaceWithPrivateModuleParameterTypes {
+    new (): privateModule.publicClass; // Error
+    (): privateModule.publicClass; // Error
+    [x: number]: privateModule.publicClass // Error
+    myMethod(): privateModule.publicClass; // Error
+}
+export class publicClassWithPrivateModuleParameterTypes {
+    static myPublicStaticMethod(): privateModule.publicClass { // Error
+        return null;
+    }
+    myPublicMethod(): privateModule.publicClass { // Error
+        return null;
+    }
+    static myPublicStaticMethod1() { // Error
+        return new privateModule.publicClass();
+    }
+    myPublicMethod1() { // Error
+        return new privateModule.publicClass();
+    }
+}
+export function publicFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass { // Error
+    return null;
+}
+export function publicFunctionWithPrivateModuleParameterTypes1() { // Error
+    return new privateModule.publicClass();
+}
+export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; // Error
+
+interface privateInterfaceWithPrivateModuleParameterTypes {
+    new (): privateModule.publicClass; 
+    (): privateModule.publicClass;
+    [x: number]: privateModule.publicClass
+    myMethod(): privateModule.publicClass;
+}
+class privateClassWithPrivateModuleParameterTypes {
+    static myPublicStaticMethod(): privateModule.publicClass { 
+        return null;
+    }
+    myPublicMethod(): privateModule.publicClass { 
+        return null;
+    }
+    static myPublicStaticMethod1() { 
+        return new privateModule.publicClass();
+    }
+    myPublicMethod1() { 
+        return new privateModule.publicClass();
+    }
+}
+function privateFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass { 
+    return null;
+}
+function privateFunctionWithPrivateModuleParameterTypes1() { 
+    return new privateModule.publicClass();
+}
+declare function privateAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; 
+
+export module publicModule {
+    class privateClass {
+    }
+
+    export class publicClass {
+    }
+
+    export interface publicInterfaceWithPrivateParmeterTypes {
+        new (): privateClass; // Error
+        (): privateClass; // Error
+        [x: number]: privateClass; // Error
+        myMethod(): privateClass; // Error
+    }
+
+    export interface publicInterfaceWithPublicParmeterTypes {
+        new (): publicClass;
+        (): publicClass;
+        [x: number]: publicClass;
+        myMethod(): publicClass;
+    }
+
+    interface privateInterfaceWithPrivateParmeterTypes {
+        new (): privateClass;
+        (): privateClass;
+        [x: number]: privateClass;
+        myMethod(): privateClass;
+    }
+
+    interface privateInterfaceWithPublicParmeterTypes {
+        new (): publicClass;
+        (): publicClass;
+        [x: number]: publicClass;
+        myMethod(): publicClass;
+    }
+
+    export class publicClassWithWithPrivateParmeterTypes {
+        static myPublicStaticMethod(): privateClass { // Error
+            return null;
+        }
+        private static myPrivateStaticMethod(): privateClass {
+            return null;
+        }
+        myPublicMethod(): privateClass { // Error
+            return null;
+        }
+        private myPrivateMethod(): privateClass {
+            return null;
+        }
+        static myPublicStaticMethod1() { // Error
+            return new privateClass();
+        }
+        private static myPrivateStaticMethod1() {
+            return new privateClass();
+        }
+        myPublicMethod1() { // Error
+            return new privateClass();
+        }
+        private myPrivateMethod1() {
+            return new privateClass();
+        }
+    }
+
+    export class publicClassWithWithPublicParmeterTypes {
+        static myPublicStaticMethod(): publicClass {
+            return null;
+        }
+        private static myPrivateStaticMethod(): publicClass {
+            return null;
+        }
+        myPublicMethod(): publicClass {
+            return null;
+        }
+        private myPrivateMethod(): publicClass {
+            return null;
+        }
+        static myPublicStaticMethod1() {
+            return new publicClass();
+        }
+        private static myPrivateStaticMethod1() {
+            return new publicClass();
+        }
+        myPublicMethod1() {
+            return new publicClass();
+        }
+        private myPrivateMethod1() {
+            return new publicClass();
+        }
+    }
+
+    class privateClassWithWithPrivateParmeterTypes {
+        static myPublicStaticMethod(): privateClass {
+            return null;
+        }
+        private static myPrivateStaticMethod(): privateClass {
+            return null;
+        }
+        myPublicMethod(): privateClass {
+            return null;
+        }
+        private myPrivateMethod(): privateClass {
+            return null;
+        }
+        static myPublicStaticMethod1() {
+            return new privateClass();
+        }
+        private static myPrivateStaticMethod1() {
+            return new privateClass();
+        }
+        myPublicMethod1() {
+            return new privateClass();
+        }
+        private myPrivateMethod1() {
+            return new privateClass();
+        }
+    }
+
+    class privateClassWithWithPublicParmeterTypes {
+        static myPublicStaticMethod(): publicClass {
+            return null;
+        }
+        private static myPrivateStaticMethod(): publicClass {
+            return null;
+        }
+        myPublicMethod(): publicClass {
+            return null;
+        }
+        private myPrivateMethod(): publicClass {
+            return null;
+        }
+        static myPublicStaticMethod1() {
+            return new publicClass();
+        }
+        private static myPrivateStaticMethod1() {
+            return new publicClass();
+        }
+        myPublicMethod1() {
+            return new publicClass();
+        }
+        private myPrivateMethod1() {
+            return new publicClass();
+        }
+    }
+
+    export function publicFunctionWithPrivateParmeterTypes(): privateClass { // Error
+        return null;
+    }
+    export function publicFunctionWithPublicParmeterTypes(): publicClass {
+        return null;
+    }
+    function privateFunctionWithPrivateParmeterTypes(): privateClass {
+        return null;
+    }
+    function privateFunctionWithPublicParmeterTypes(): publicClass {
+        return null;
+    }
+    export function publicFunctionWithPrivateParmeterTypes1() { // Error
+        return new privateClass();
+    }
+    export function publicFunctionWithPublicParmeterTypes1() {
+        return new publicClass();
+    }
+    function privateFunctionWithPrivateParmeterTypes1() {
+        return new privateClass();
+    }
+    function privateFunctionWithPublicParmeterTypes1() {
+        return new publicClass();
+    }
+
+    export declare function publicAmbientFunctionWithPrivateParmeterTypes(): privateClass; // Error
+    export declare function publicAmbientFunctionWithPublicParmeterTypes(): publicClass;
+    declare function privateAmbientFunctionWithPrivateParmeterTypes(): privateClass;
+    declare function privateAmbientFunctionWithPublicParmeterTypes(): publicClass;
+
+    export interface publicInterfaceWithPrivateModuleParameterTypes {
+        new (): privateModule.publicClass; // Error
+        (): privateModule.publicClass; // Error
+        [x: number]: privateModule.publicClass; // Error
+        myMethod(): privateModule.publicClass; // Error
+    }
+    export class publicClassWithPrivateModuleParameterTypes {
+        static myPublicStaticMethod(): privateModule.publicClass { // Error
+            return null;
+        }
+        myPublicMethod(): privateModule.publicClass { // Error
+            return null;
+        }
+        static myPublicStaticMethod1() { // Error
+            return new privateModule.publicClass();
+        }
+        myPublicMethod1() { // Error
+            return new privateModule.publicClass();
+        }
+    }
+    export function publicFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass { // Error
+        return null;
+    }
+    export function publicFunctionWithPrivateModuleParameterTypes1() { // Error
+        return new privateModule.publicClass();
+    }
+    export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; // Error
+
+    interface privateInterfaceWithPrivateModuleParameterTypes {
+        new (): privateModule.publicClass;
+        (): privateModule.publicClass;
+        [x: number]: privateModule.publicClass;
+        myMethod(): privateModule.publicClass;
+    }
+    class privateClassWithPrivateModuleParameterTypes {
+        static myPublicStaticMethod(): privateModule.publicClass {
+            return null;
+        }
+        myPublicMethod(): privateModule.publicClass {
+            return null;
+        }
+        static myPublicStaticMethod1() {
+            return new privateModule.publicClass();
+        }
+        myPublicMethod1() {
+            return new privateModule.publicClass();
+        }
+    }
+    function privateFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass {
+        return null;
+    }
+    function privateFunctionWithPrivateModuleParameterTypes1() {
+        return new privateModule.publicClass();
+    }
+    declare function privateAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; 
+}
+
+module privateModule {
+    class privateClass {
+    }
+
+    export class publicClass {
+    }
+
+    export interface publicInterfaceWithPrivateParmeterTypes {
+        new (): privateClass; 
+        (): privateClass; 
+        [x: number]: privateClass; 
+        myMethod(): privateClass; 
+    }
+
+    export interface publicInterfaceWithPublicParmeterTypes {
+        new (): publicClass;
+        (): publicClass;
+        [x: number]: publicClass;
+        myMethod(): publicClass;
+    }
+
+    interface privateInterfaceWithPrivateParmeterTypes {
+        new (): privateClass;
+        (): privateClass;
+        [x: number]: privateClass;
+        myMethod(): privateClass;
+    }
+
+    interface privateInterfaceWithPublicParmeterTypes {
+        new (): publicClass;
+        (): publicClass;
+        [x: number]: publicClass;
+        myMethod(): publicClass;
+    }
+
+    export class publicClassWithWithPrivateParmeterTypes {
+        static myPublicStaticMethod(): privateClass { 
+            return null;
+        }
+        private static myPrivateStaticMethod(): privateClass {
+            return null;
+        }
+        myPublicMethod(): privateClass { 
+            return null;
+        }
+        private myPrivateMethod(): privateClass {
+            return null;
+        }
+        static myPublicStaticMethod1() { 
+            return new privateClass();
+        }
+        private static myPrivateStaticMethod1() {
+            return new privateClass();
+        }
+        myPublicMethod1() { 
+            return new privateClass();
+        }
+        private myPrivateMethod1() {
+            return new privateClass();
+        }
+    }
+
+    export class publicClassWithWithPublicParmeterTypes {
+        static myPublicStaticMethod(): publicClass {
+            return null;
+        }
+        private static myPrivateStaticMethod(): publicClass {
+            return null;
+        }
+        myPublicMethod(): publicClass {
+            return null;
+        }
+        private myPrivateMethod(): publicClass {
+            return null;
+        }
+        static myPublicStaticMethod1() {
+            return new publicClass();
+        }
+        private static myPrivateStaticMethod1() {
+            return new publicClass();
+        }
+        myPublicMethod1() {
+            return new publicClass();
+        }
+        private myPrivateMethod1() {
+            return new publicClass();
+        }
+    }
+
+    class privateClassWithWithPrivateParmeterTypes {
+        static myPublicStaticMethod(): privateClass {
+            return null;
+        }
+        private static myPrivateStaticMethod(): privateClass {
+            return null;
+        }
+        myPublicMethod(): privateClass {
+            return null;
+        }
+        private myPrivateMethod(): privateClass {
+            return null;
+        }
+        static myPublicStaticMethod1() {
+            return new privateClass();
+        }
+        private static myPrivateStaticMethod1() {
+            return new privateClass();
+        }
+        myPublicMethod1() {
+            return new privateClass();
+        }
+        private myPrivateMethod1() {
+            return new privateClass();
+        }
+    }
+
+    class privateClassWithWithPublicParmeterTypes {
+        static myPublicStaticMethod(): publicClass {
+            return null;
+        }
+        private static myPrivateStaticMethod(): publicClass {
+            return null;
+        }
+        myPublicMethod(): publicClass {
+            return null;
+        }
+        private myPrivateMethod(): publicClass {
+            return null;
+        }
+        static myPublicStaticMethod1() {
+            return new publicClass();
+        }
+        private static myPrivateStaticMethod1() {
+            return new publicClass();
+        }
+        myPublicMethod1() {
+            return new publicClass();
+        }
+        private myPrivateMethod1() {
+            return new publicClass();
+        }
+    }
+
+    export function publicFunctionWithPrivateParmeterTypes(): privateClass { 
+        return null;
+    }
+    export function publicFunctionWithPublicParmeterTypes(): publicClass {
+        return null;
+    }
+    function privateFunctionWithPrivateParmeterTypes(): privateClass {
+        return null;
+    }
+    function privateFunctionWithPublicParmeterTypes(): publicClass {
+        return null;
+    }
+    export function publicFunctionWithPrivateParmeterTypes1() { 
+        return new privateClass();
+    }
+    export function publicFunctionWithPublicParmeterTypes1() {
+        return new publicClass();
+    }
+    function privateFunctionWithPrivateParmeterTypes1() {
+        return new privateClass();
+    }
+    function privateFunctionWithPublicParmeterTypes1() {
+        return new publicClass();
+    }
+
+    export declare function publicAmbientFunctionWithPrivateParmeterTypes(): privateClass; 
+    export declare function publicAmbientFunctionWithPublicParmeterTypes(): publicClass;
+    declare function privateAmbientFunctionWithPrivateParmeterTypes(): privateClass;
+    declare function privateAmbientFunctionWithPublicParmeterTypes(): publicClass;
+
+    export interface publicInterfaceWithPrivateModuleParameterTypes {
+        new (): privateModule.publicClass;
+        (): privateModule.publicClass;
+        [x: number]: privateModule.publicClass;
+        myMethod(): privateModule.publicClass;
+    }
+    export class publicClassWithPrivateModuleParameterTypes {
+        static myPublicStaticMethod(): privateModule.publicClass { 
+            return null;
+        }
+        myPublicMethod(): privateModule.publicClass { 
+            return null;
+        }
+        static myPublicStaticMethod1() { 
+            return new privateModule.publicClass();
+        }
+        myPublicMethod1() { 
+            return new privateModule.publicClass();
+        }
+    }
+    export function publicFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass { 
+        return null;
+    }
+    export function publicFunctionWithPrivateModuleParameterTypes1() { 
+        return new privateModule.publicClass();
+    }
+    export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; 
+
+    interface privateInterfaceWithPrivateModuleParameterTypes {
+        new (): privateModule.publicClass;
+        (): privateModule.publicClass;
+        [x: number]: privateModule.publicClass;
+        myMethod(): privateModule.publicClass;
+    }
+    class privateClassWithPrivateModuleParameterTypes {
+        static myPublicStaticMethod(): privateModule.publicClass {
+            return null;
+        }
+        myPublicMethod(): privateModule.publicClass {
+            return null;
+        }
+        static myPublicStaticMethod1() {
+            return new privateModule.publicClass();
+        }
+        myPublicMethod1() {
+            return new privateModule.publicClass();
+        }
+    }
+    function privateFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass {
+        return null;
+    }
+    function privateFunctionWithPrivateModuleParameterTypes1() {
+        return new privateModule.publicClass();
+    }
+    declare function privateAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; 
+}
+
+// @Filename: privacyFunctionReturnTypeDeclFile_GlobalFile.ts
+class publicClassInGlobal {
+}
+interface publicInterfaceWithPublicParmeterTypesInGlobal {
+    new (): publicClassInGlobal;
+    (): publicClassInGlobal;
+    [x: number]: publicClassInGlobal;
+    myMethod(): publicClassInGlobal;
+}
+class publicClassWithWithPublicParmeterTypesInGlobal {
+    static myPublicStaticMethod(): publicClassInGlobal {
+        return null;
+    }
+    private static myPrivateStaticMethod(): publicClassInGlobal {
+        return null;
+    }
+    myPublicMethod(): publicClassInGlobal {
+        return null;
+    }
+    private myPrivateMethod(): publicClassInGlobal {
+        return null;
+    }
+    static myPublicStaticMethod1() {
+        return new publicClassInGlobal();
+    }
+    private static myPrivateStaticMethod1() {
+        return new publicClassInGlobal();
+    }
+    myPublicMethod1() {
+        return new publicClassInGlobal();
+    }
+    private myPrivateMethod1() {
+        return new publicClassInGlobal();
+    }
+}
+function publicFunctionWithPublicParmeterTypesInGlobal(): publicClassInGlobal {
+    return null;
+}
+function publicFunctionWithPublicParmeterTypesInGlobal1() {
+    return new publicClassInGlobal();
+}
+declare function publicAmbientFunctionWithPublicParmeterTypesInGlobal(): publicClassInGlobal;
+
+module publicModuleInGlobal {
+    class privateClass {
+    }
+
+    export class publicClass {
+    }
+
+    module privateModule {
+        class privateClass {
+        }
+
+        export class publicClass {
+        }
+
+        export interface publicInterfaceWithPrivateParmeterTypes {
+            new (): privateClass;
+            (): privateClass;
+            [x: number]: privateClass;
+            myMethod(): privateClass;
+        }
+
+        export interface publicInterfaceWithPublicParmeterTypes {
+            new (): publicClass;
+            (): publicClass;
+            [x: number]: publicClass;
+            myMethod(): publicClass;
+        }
+
+        interface privateInterfaceWithPrivateParmeterTypes {
+            new (): privateClass;
+            (): privateClass;
+            [x: number]: privateClass;
+            myMethod(): privateClass;
+        }
+
+        interface privateInterfaceWithPublicParmeterTypes {
+            new (): publicClass;
+            (): publicClass;
+            [x: number]: publicClass;
+            myMethod(): publicClass;
+        }
+
+        export class publicClassWithWithPrivateParmeterTypes {
+            static myPublicStaticMethod(): privateClass {
+                return null;
+            }
+            private static myPrivateStaticMethod(): privateClass {
+                return null;
+            }
+            myPublicMethod(): privateClass {
+                return null;
+            }
+            private myPrivateMethod(): privateClass {
+                return null;
+            }
+            static myPublicStaticMethod1() {
+                return new privateClass();
+            }
+            private static myPrivateStaticMethod1() {
+                return new privateClass();
+            }
+            myPublicMethod1() {
+                return new privateClass();
+            }
+            private myPrivateMethod1() {
+                return new privateClass();
+            }
+        }
+
+        export class publicClassWithWithPublicParmeterTypes {
+            static myPublicStaticMethod(): publicClass {
+                return null;
+            }
+            private static myPrivateStaticMethod(): publicClass {
+                return null;
+            }
+            myPublicMethod(): publicClass {
+                return null;
+            }
+            private myPrivateMethod(): publicClass {
+                return null;
+            }
+            static myPublicStaticMethod1() {
+                return new publicClass();
+            }
+            private static myPrivateStaticMethod1() {
+                return new publicClass();
+            }
+            myPublicMethod1() {
+                return new publicClass();
+            }
+            private myPrivateMethod1() {
+                return new publicClass();
+            }
+        }
+
+        class privateClassWithWithPrivateParmeterTypes {
+            static myPublicStaticMethod(): privateClass {
+                return null;
+            }
+            private static myPrivateStaticMethod(): privateClass {
+                return null;
+            }
+            myPublicMethod(): privateClass {
+                return null;
+            }
+            private myPrivateMethod(): privateClass {
+                return null;
+            }
+            static myPublicStaticMethod1() {
+                return new privateClass();
+            }
+            private static myPrivateStaticMethod1() {
+                return new privateClass();
+            }
+            myPublicMethod1() {
+                return new privateClass();
+            }
+            private myPrivateMethod1() {
+                return new privateClass();
+            }
+        }
+
+        class privateClassWithWithPublicParmeterTypes {
+            static myPublicStaticMethod(): publicClass {
+                return null;
+            }
+            private static myPrivateStaticMethod(): publicClass {
+                return null;
+            }
+            myPublicMethod(): publicClass {
+                return null;
+            }
+            private myPrivateMethod(): publicClass {
+                return null;
+            }
+            static myPublicStaticMethod1() {
+                return new publicClass();
+            }
+            private static myPrivateStaticMethod1() {
+                return new publicClass();
+            }
+            myPublicMethod1() {
+                return new publicClass();
+            }
+            private myPrivateMethod1() {
+                return new publicClass();
+            }
+        }
+
+        export function publicFunctionWithPrivateParmeterTypes(): privateClass {
+            return null;
+        }
+        export function publicFunctionWithPublicParmeterTypes(): publicClass {
+            return null;
+        }
+        function privateFunctionWithPrivateParmeterTypes(): privateClass {
+            return null;
+        }
+        function privateFunctionWithPublicParmeterTypes(): publicClass {
+            return null;
+        }
+        export function publicFunctionWithPrivateParmeterTypes1() {
+            return new privateClass();
+        }
+        export function publicFunctionWithPublicParmeterTypes1() {
+            return new publicClass();
+        }
+        function privateFunctionWithPrivateParmeterTypes1() {
+            return new privateClass();
+        }
+        function privateFunctionWithPublicParmeterTypes1() {
+            return new publicClass();
+        }
+
+        export declare function publicAmbientFunctionWithPrivateParmeterTypes(): privateClass;
+        export declare function publicAmbientFunctionWithPublicParmeterTypes(): publicClass;
+        declare function privateAmbientFunctionWithPrivateParmeterTypes(): privateClass;
+        declare function privateAmbientFunctionWithPublicParmeterTypes(): publicClass;
+
+        export interface publicInterfaceWithPrivateModuleParameterTypes {
+            new (): privateModule.publicClass;
+            (): privateModule.publicClass;
+            [x: number]: privateModule.publicClass;
+            myMethod(): privateModule.publicClass;
+        }
+        export class publicClassWithPrivateModuleParameterTypes {
+            static myPublicStaticMethod(): privateModule.publicClass {
+                return null;
+            }
+            myPublicMethod(): privateModule.publicClass {
+                return null;
+            }
+            static myPublicStaticMethod1() {
+                return new privateModule.publicClass();
+            }
+            myPublicMethod1() {
+                return new privateModule.publicClass();
+            }
+        }
+        export function publicFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass {
+            return null;
+        }
+        export function publicFunctionWithPrivateModuleParameterTypes1() {
+            return new privateModule.publicClass();
+        }
+        export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass;
+
+        interface privateInterfaceWithPrivateModuleParameterTypes {
+            new (): privateModule.publicClass;
+            (): privateModule.publicClass;
+            [x: number]: privateModule.publicClass;
+            myMethod(): privateModule.publicClass;
+        }
+        class privateClassWithPrivateModuleParameterTypes {
+            static myPublicStaticMethod(): privateModule.publicClass {
+                return null;
+            }
+            myPublicMethod(): privateModule.publicClass {
+                return null;
+            }
+            static myPublicStaticMethod1() {
+                return new privateModule.publicClass();
+            }
+            myPublicMethod1() {
+                return new privateModule.publicClass();
+            }
+        }
+        function privateFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass {
+            return null;
+        }
+        function privateFunctionWithPrivateModuleParameterTypes1() {
+            return new privateModule.publicClass();
+        }
+        declare function privateAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass;
+    }
+
+    export interface publicInterfaceWithPrivateParmeterTypes {
+        new (): privateClass; // Error
+        (): privateClass; // Error
+        [x: number]: privateClass; // Error
+        myMethod(): privateClass; // Error
+    }
+
+    export interface publicInterfaceWithPublicParmeterTypes {
+        new (): publicClass;
+        (): publicClass;
+        [x: number]: publicClass;
+        myMethod(): publicClass;
+    }
+
+    interface privateInterfaceWithPrivateParmeterTypes {
+        new (): privateClass;
+        (): privateClass;
+        [x: number]: privateClass;
+        myMethod(): privateClass;
+    }
+
+    interface privateInterfaceWithPublicParmeterTypes {
+        new (): publicClass;
+        (): publicClass;
+        [x: number]: publicClass;
+        myMethod(): publicClass;
+    }
+
+    export class publicClassWithWithPrivateParmeterTypes {
+        static myPublicStaticMethod(): privateClass { // Error
+            return null;
+        }
+        private static myPrivateStaticMethod(): privateClass {
+            return null;
+        }
+        myPublicMethod(): privateClass { // Error
+            return null;
+        }
+        private myPrivateMethod(): privateClass {
+            return null;
+        }
+        static myPublicStaticMethod1() { // Error
+            return new privateClass();
+        }
+        private static myPrivateStaticMethod1() {
+            return new privateClass();
+        }
+        myPublicMethod1() { // Error
+            return new privateClass();
+        }
+        private myPrivateMethod1() {
+            return new privateClass();
+        }
+    }
+
+    export class publicClassWithWithPublicParmeterTypes {
+        static myPublicStaticMethod(): publicClass {
+            return null;
+        }
+        private static myPrivateStaticMethod(): publicClass {
+            return null;
+        }
+        myPublicMethod(): publicClass {
+            return null;
+        }
+        private myPrivateMethod(): publicClass {
+            return null;
+        }
+        static myPublicStaticMethod1() {
+            return new publicClass();
+        }
+        private static myPrivateStaticMethod1() {
+            return new publicClass();
+        }
+        myPublicMethod1() {
+            return new publicClass();
+        }
+        private myPrivateMethod1() {
+            return new publicClass();
+        }
+    }
+
+    class privateClassWithWithPrivateParmeterTypes {
+        static myPublicStaticMethod(): privateClass {
+            return null;
+        }
+        private static myPrivateStaticMethod(): privateClass {
+            return null;
+        }
+        myPublicMethod(): privateClass {
+            return null;
+        }
+        private myPrivateMethod(): privateClass {
+            return null;
+        }
+        static myPublicStaticMethod1() {
+            return new privateClass();
+        }
+        private static myPrivateStaticMethod1() {
+            return new privateClass();
+        }
+        myPublicMethod1() {
+            return new privateClass();
+        }
+        private myPrivateMethod1() {
+            return new privateClass();
+        }
+    }
+
+    class privateClassWithWithPublicParmeterTypes {
+        static myPublicStaticMethod(): publicClass {
+            return null;
+        }
+        private static myPrivateStaticMethod(): publicClass {
+            return null;
+        }
+        myPublicMethod(): publicClass {
+            return null;
+        }
+        private myPrivateMethod(): publicClass {
+            return null;
+        }
+        static myPublicStaticMethod1() {
+            return new publicClass();
+        }
+        private static myPrivateStaticMethod1() {
+            return new publicClass();
+        }
+        myPublicMethod1() {
+            return new publicClass();
+        }
+        private myPrivateMethod1() {
+            return new publicClass();
+        }
+    }
+
+    export function publicFunctionWithPrivateParmeterTypes(): privateClass { // Error
+        return null;
+    }
+    export function publicFunctionWithPublicParmeterTypes(): publicClass {
+        return null;
+    }
+    function privateFunctionWithPrivateParmeterTypes(): privateClass {
+        return null;
+    }
+    function privateFunctionWithPublicParmeterTypes(): publicClass {
+        return null;
+    }
+    export function publicFunctionWithPrivateParmeterTypes1() { // Error
+        return new privateClass();
+    }
+    export function publicFunctionWithPublicParmeterTypes1() {
+        return new publicClass();
+    }
+    function privateFunctionWithPrivateParmeterTypes1() {
+        return new privateClass();
+    }
+    function privateFunctionWithPublicParmeterTypes1() {
+        return new publicClass();
+    }
+
+    export declare function publicAmbientFunctionWithPrivateParmeterTypes(): privateClass; // Error
+    export declare function publicAmbientFunctionWithPublicParmeterTypes(): publicClass;
+    declare function privateAmbientFunctionWithPrivateParmeterTypes(): privateClass;
+    declare function privateAmbientFunctionWithPublicParmeterTypes(): publicClass;
+
+    export interface publicInterfaceWithPrivateModuleParameterTypes {
+        new (): privateModule.publicClass; // Error
+        (): privateModule.publicClass; // Error
+        [x: number]: privateModule.publicClass; // Error
+        myMethod(): privateModule.publicClass; // Error
+    }
+    export class publicClassWithPrivateModuleParameterTypes {
+        static myPublicStaticMethod(): privateModule.publicClass { // Error
+            return null;
+        }
+        myPublicMethod(): privateModule.publicClass { // Error
+            return null;
+        }
+        static myPublicStaticMethod1() { // Error
+            return new privateModule.publicClass();
+        }
+        myPublicMethod1() { // Error
+            return new privateModule.publicClass();
+        }
+    }
+    export function publicFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass { // Error
+        return null;
+    }
+    export function publicFunctionWithPrivateModuleParameterTypes1() { // Error
+        return new privateModule.publicClass();
+    }
+    export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; // Error
+
+    interface privateInterfaceWithPrivateModuleParameterTypes {
+        new (): privateModule.publicClass;
+        (): privateModule.publicClass;
+        [x: number]: privateModule.publicClass;
+        myMethod(): privateModule.publicClass;
+    }
+    class privateClassWithPrivateModuleParameterTypes {
+        static myPublicStaticMethod(): privateModule.publicClass {
+            return null;
+        }
+        myPublicMethod(): privateModule.publicClass {
+            return null;
+        }
+        static myPublicStaticMethod1() {
+            return new privateModule.publicClass();
+        }
+        myPublicMethod1() {
+            return new privateModule.publicClass();
+        }
+    }
+    function privateFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass {
+        return null;
+    }
+    function privateFunctionWithPrivateModuleParameterTypes1() {
+        return new privateModule.publicClass();
+    }
+    declare function privateAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass;
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/privacyGetter.ts b/tests/cases/compiler/privacyGetter.ts
index 65b6303833c..aab0cb22a0e 100644
--- a/tests/cases/compiler/privacyGetter.ts
+++ b/tests/cases/compiler/privacyGetter.ts
@@ -1,3 +1,4 @@
+// @target: ES5
 //@module: amd
 export module m1 {
     export class C1_public {
diff --git a/tests/cases/compiler/privacyGloGetter.ts b/tests/cases/compiler/privacyGloGetter.ts
index 5ebca909ad9..c892c2e75da 100644
--- a/tests/cases/compiler/privacyGloGetter.ts
+++ b/tests/cases/compiler/privacyGloGetter.ts
@@ -1,3 +1,4 @@
+// @target: ES5
 module m1 {
     export class C1_public {
         private f1() {
diff --git a/tests/cases/compiler/privacyGloImport.ts b/tests/cases/compiler/privacyGloImport.ts
index 68b67f42d89..19bf1009867 100644
--- a/tests/cases/compiler/privacyGloImport.ts
+++ b/tests/cases/compiler/privacyGloImport.ts
@@ -1,3 +1,4 @@
+//@declaration: true
 module m1 {
     export module m1_M1_public {
         export class c1 {
@@ -19,21 +20,21 @@ module m1 {
         export var v2: c1;
     }
 
-    declare export module "m1_M3_public" {
-        export function f1();
-        export class c1 {
-        }
-        export var v1: { new (): c1; };
-        export var v2: c1;
-    }
+    //export declare module "m1_M3_public" {
+    //    export function f1();
+    //    export class c1 {
+    //    }
+    //    export var v1: { new (): c1; };
+    //    export var v2: c1;
+    //}
 
-    declare module "m1_M4_private" {
-        export function f1();
-        export class c1 {
-        }
-        export var v1: { new (): c1; };
-        export var v2: c1;
-    }
+    //declare module "m1_M4_private" {
+    //    export function f1();
+    //    export class c1 {
+    //    }
+    //    export var v1: { new (): c1; };
+    //    export var v2: c1;
+    //}
 
     import m1_im1_private = m1_M1_public;
     export var m1_im1_private_v1_public = m1_im1_private.c1;
@@ -56,31 +57,30 @@ module m1 {
     var m1_im2_private_v3_private = m1_im2_private.f1;
     var m1_im2_private_v4_private = m1_im2_private.f1();
 
-    import m1_im3_private = require("m1_M3_public");
-    export var m1_im3_private_v1_public = m1_im3_private.c1;
-    export var m1_im3_private_v2_public = new m1_im3_private.c1();
-    export var m1_im3_private_v3_public = m1_im3_private.f1;
-    export var m1_im3_private_v4_public = m1_im3_private.f1();
-    var m1_im3_private_v1_private = m1_im3_private.c1;
-    var m1_im3_private_v2_private = new m1_im3_private.c1();
-    var m1_im3_private_v3_private = m1_im3_private.f1;
-    var m1_im3_private_v4_private = m1_im3_private.f1();
+    //import m1_im3_private = require("m1_M3_public");
+    //export var m1_im3_private_v1_public = m1_im3_private.c1;
+    //export var m1_im3_private_v2_public = new m1_im3_private.c1();
+    //export var m1_im3_private_v3_public = m1_im3_private.f1;
+    //export var m1_im3_private_v4_public = m1_im3_private.f1();
+    //var m1_im3_private_v1_private = m1_im3_private.c1;
+    //var m1_im3_private_v2_private = new m1_im3_private.c1();
+    //var m1_im3_private_v3_private = m1_im3_private.f1;
+    //var m1_im3_private_v4_private = m1_im3_private.f1();
 
-    import m1_im4_private = require("m1_M4_private");
-    export var m1_im4_private_v1_public = m1_im4_private.c1;
-    export var m1_im4_private_v2_public = new m1_im4_private.c1();
-    export var m1_im4_private_v3_public = m1_im4_private.f1;
-    export var m1_im4_private_v4_public = m1_im4_private.f1();
-    var m1_im4_private_v1_private = m1_im4_private.c1;
-    var m1_im4_private_v2_private = new m1_im4_private.c1();
-    var m1_im4_private_v3_private = m1_im4_private.f1;
-    var m1_im4_private_v4_private = m1_im4_private.f1();
+    //import m1_im4_private = require("m1_M4_private");
+    //export var m1_im4_private_v1_public = m1_im4_private.c1;
+    //export var m1_im4_private_v2_public = new m1_im4_private.c1();
+    //export var m1_im4_private_v3_public = m1_im4_private.f1;
+    //export var m1_im4_private_v4_public = m1_im4_private.f1();
+    //var m1_im4_private_v1_private = m1_im4_private.c1;
+    //var m1_im4_private_v2_private = new m1_im4_private.c1();
+    //var m1_im4_private_v3_private = m1_im4_private.f1;
+    //var m1_im4_private_v4_private = m1_im4_private.f1();
 
-    // Parse error to export module
     export import m1_im1_public = m1_M1_public;
     export import m1_im2_public = m1_M2_private;
-    export import m1_im3_public = require("m1_M3_public");
-    export import m1_im4_public = require("m1_M4_private");
+    //export import m1_im3_public = require("m1_M3_public");
+    //export import m1_im4_public = require("m1_M4_private");
 }
 
 module glo_M1_public {
@@ -104,26 +104,26 @@ declare module "glo_M2_public" {
 declare module "use_glo_M1_public" {
     import use_glo_M1_public = glo_M1_public;
     export var use_glo_M1_public_v1_public: { new (): use_glo_M1_public.c1; };
-    export var use_glo_M1_public_v2_public: use_glo_M1_public;
+    export var use_glo_M1_public_v2_public: typeof use_glo_M1_public;
     export var use_glo_M1_public_v3_public: ()=> use_glo_M1_public.c1;
     var use_glo_M1_public_v1_private: { new (): use_glo_M1_public.c1; };
-    var use_glo_M1_public_v2_private: use_glo_M1_public;
+    var use_glo_M1_public_v2_private: typeof use_glo_M1_public;
     var use_glo_M1_public_v3_private: () => use_glo_M1_public.c1;
 
     import use_glo_M2_public = require("glo_M2_public");
     export var use_glo_M2_public_v1_public: { new (): use_glo_M2_public.c1; };
-    export var use_glo_M2_public_v2_public: use_glo_M2_public;
+    export var use_glo_M2_public_v2_public: typeof use_glo_M2_public;
     export var use_glo_M2_public_v3_public: () => use_glo_M2_public.c1;
     var use_glo_M2_public_v1_private: { new (): use_glo_M2_public.c1; };
-    var use_glo_M2_public_v2_private: use_glo_M2_public;
+    var use_glo_M2_public_v2_private: typeof use_glo_M2_public;
     var use_glo_M2_public_v3_private: () => use_glo_M2_public.c1;
 
     module m2 {
-        import errorImport = require("glo_M2_public");
+        //import errorImport = require("glo_M2_public");
         import nonerrorImport = glo_M1_public;
 
         module m5 {
-            import m5_errorImport = require("glo_M2_public");
+            //import m5_errorImport = require("glo_M2_public");
             import m5_nonerrorImport = glo_M1_public;
         }
     }
@@ -131,23 +131,23 @@ declare module "use_glo_M1_public" {
 
 declare module "anotherParseError" {
     module m2 {
-        declare module "abc" {
-        }
+        //declare module "abc" {
+        //}
     }
 
     module m2 {
-        module "abc2" {
-        }
-    }
-    module "abc3" {
+        //module "abc2" {
+        //}
     }
+    //module "abc3" {
+    //}
 }
 
 module m2 {
-    import m3 = require("use_glo_M1_public");
+    //import m3 = require("use_glo_M1_public");
     module m4 {
         var a = 10;
-        import m2 = require("use_glo_M1_public");
+        //import m2 = require("use_glo_M1_public");
     }
 
 }
\ No newline at end of file
diff --git a/tests/cases/compiler/privacyGloImportParseErrors.ts b/tests/cases/compiler/privacyGloImportParseErrors.ts
new file mode 100644
index 00000000000..8419f6737ea
--- /dev/null
+++ b/tests/cases/compiler/privacyGloImportParseErrors.ts
@@ -0,0 +1,153 @@
+//@declaration: true
+module m1 {
+    export module m1_M1_public {
+        export class c1 {
+        }
+        export function f1() {
+            return new c1;
+        }
+        export var v1 = c1;
+        export var v2: c1;
+    }
+
+    module m1_M2_private {
+        export class c1 {
+        }
+        export function f1() {
+            return new c1;
+        }
+        export var v1 = c1;
+        export var v2: c1;
+    }
+
+    export declare module "m1_M3_public" {
+        export function f1();
+        export class c1 {
+        }
+        export var v1: { new (): c1; };
+        export var v2: c1;
+    }
+
+    declare module "m1_M4_private" {
+        export function f1();
+        export class c1 {
+        }
+        export var v1: { new (): c1; };
+        export var v2: c1;
+    }
+
+    import m1_im1_private = m1_M1_public;
+    export var m1_im1_private_v1_public = m1_im1_private.c1;
+    export var m1_im1_private_v2_public = new m1_im1_private.c1();
+    export var m1_im1_private_v3_public = m1_im1_private.f1;
+    export var m1_im1_private_v4_public = m1_im1_private.f1();
+    var m1_im1_private_v1_private = m1_im1_private.c1;
+    var m1_im1_private_v2_private = new m1_im1_private.c1();
+    var m1_im1_private_v3_private = m1_im1_private.f1;
+    var m1_im1_private_v4_private = m1_im1_private.f1();
+
+
+    import m1_im2_private = m1_M2_private;
+    export var m1_im2_private_v1_public = m1_im2_private.c1;
+    export var m1_im2_private_v2_public = new m1_im2_private.c1();
+    export var m1_im2_private_v3_public = m1_im2_private.f1;
+    export var m1_im2_private_v4_public = m1_im2_private.f1();
+    var m1_im2_private_v1_private = m1_im2_private.c1;
+    var m1_im2_private_v2_private = new m1_im2_private.c1();
+    var m1_im2_private_v3_private = m1_im2_private.f1;
+    var m1_im2_private_v4_private = m1_im2_private.f1();
+
+    import m1_im3_private = require("m1_M3_public");
+    export var m1_im3_private_v1_public = m1_im3_private.c1;
+    export var m1_im3_private_v2_public = new m1_im3_private.c1();
+    export var m1_im3_private_v3_public = m1_im3_private.f1;
+    export var m1_im3_private_v4_public = m1_im3_private.f1();
+    var m1_im3_private_v1_private = m1_im3_private.c1;
+    var m1_im3_private_v2_private = new m1_im3_private.c1();
+    var m1_im3_private_v3_private = m1_im3_private.f1;
+    var m1_im3_private_v4_private = m1_im3_private.f1();
+
+    import m1_im4_private = require("m1_M4_private");
+    export var m1_im4_private_v1_public = m1_im4_private.c1;
+    export var m1_im4_private_v2_public = new m1_im4_private.c1();
+    export var m1_im4_private_v3_public = m1_im4_private.f1;
+    export var m1_im4_private_v4_public = m1_im4_private.f1();
+    var m1_im4_private_v1_private = m1_im4_private.c1;
+    var m1_im4_private_v2_private = new m1_im4_private.c1();
+    var m1_im4_private_v3_private = m1_im4_private.f1;
+    var m1_im4_private_v4_private = m1_im4_private.f1();
+
+    export import m1_im1_public = m1_M1_public;
+    export import m1_im2_public = m1_M2_private;
+    export import m1_im3_public = require("m1_M3_public");
+    export import m1_im4_public = require("m1_M4_private");
+}
+
+module glo_M1_public {
+    export class c1 {
+    }
+    export function f1() {
+        return new c1;
+    }
+    export var v1 = c1;
+    export var v2: c1;
+}
+
+declare module "glo_M2_public" {
+    export function f1();
+    export class c1 {
+    }
+    export var v1: { new (): c1; };
+    export var v2: c1;
+}
+
+declare module "use_glo_M1_public" {
+    import use_glo_M1_public = glo_M1_public;
+    export var use_glo_M1_public_v1_public: { new (): use_glo_M1_public.c1; };
+    export var use_glo_M1_public_v2_public: typeof use_glo_M1_public;
+    export var use_glo_M1_public_v3_public: ()=> use_glo_M1_public.c1;
+    var use_glo_M1_public_v1_private: { new (): use_glo_M1_public.c1; };
+    var use_glo_M1_public_v2_private: typeof use_glo_M1_public;
+    var use_glo_M1_public_v3_private: () => use_glo_M1_public.c1;
+
+    import use_glo_M2_public = require("glo_M2_public");
+    export var use_glo_M2_public_v1_public: { new (): use_glo_M2_public.c1; };
+    export var use_glo_M2_public_v2_public: typeof use_glo_M2_public;
+    export var use_glo_M2_public_v3_public: () => use_glo_M2_public.c1;
+    var use_glo_M2_public_v1_private: { new (): use_glo_M2_public.c1; };
+    var use_glo_M2_public_v2_private: typeof use_glo_M2_public;
+    var use_glo_M2_public_v3_private: () => use_glo_M2_public.c1;
+
+    module m2 {
+        import errorImport = require("glo_M2_public");
+        import nonerrorImport = glo_M1_public;
+
+        module m5 {
+            import m5_errorImport = require("glo_M2_public");
+            import m5_nonerrorImport = glo_M1_public;
+        }
+    }
+}
+
+declare module "anotherParseError" {
+    module m2 {
+        declare module "abc" {
+        }
+    }
+
+    module m2 {
+        module "abc2" {
+        }
+    }
+    module "abc3" {
+    }
+}
+
+module m2 {
+    import m3 = require("use_glo_M1_public");
+    module m4 {
+        var a = 10;
+        import m2 = require("use_glo_M1_public");
+    }
+
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/privacyImport.ts b/tests/cases/compiler/privacyImport.ts
index 04d789a3749..dff16781d56 100644
--- a/tests/cases/compiler/privacyImport.ts
+++ b/tests/cases/compiler/privacyImport.ts
@@ -1,4 +1,5 @@
 //@module: commonjs
+//@declaration: true
 export module m1 {
     export module m1_M1_public {
         export class c1 {
@@ -20,21 +21,21 @@ export module m1 {
         export var v2: c1;
     }
 
-    export declare module "m1_M3_public" {
-        export function f1();
-        export class c1 {
-        }
-        export var v1: { new (): c1; };
-        export var v2: c1;
-    }
+    //export declare module "m1_M3_public" {
+    //    export function f1();
+    //    export class c1 {
+    //    }
+    //    export var v1: { new (): c1; };
+    //    export var v2: c1;
+    //}
 
-    declare module "m1_M4_private" {
-        export function f1();
-        export class c1 {
-        }
-        export var v1: { new (): c1; };
-        export var v2: c1;
-    }
+    //declare module "m1_M4_private" {
+    //    export function f1();
+    //    export class c1 {
+    //    }
+    //    export var v1: { new (): c1; };
+    //    export var v2: c1;
+    //}
 
     import m1_im1_private = m1_M1_public;
     export var m1_im1_private_v1_public = m1_im1_private.c1;
@@ -57,30 +58,30 @@ export module m1 {
     var m1_im2_private_v3_private = m1_im2_private.f1;
     var m1_im2_private_v4_private = m1_im2_private.f1();
 
-    import m1_im3_private = require("m1_M3_public");
-    export var m1_im3_private_v1_public = m1_im3_private.c1;
-    export var m1_im3_private_v2_public = new m1_im3_private.c1();
-    export var m1_im3_private_v3_public = m1_im3_private.f1;
-    export var m1_im3_private_v4_public = m1_im3_private.f1();
-    var m1_im3_private_v1_private = m1_im3_private.c1;
-    var m1_im3_private_v2_private = new m1_im3_private.c1();
-    var m1_im3_private_v3_private = m1_im3_private.f1;
-    var m1_im3_private_v4_private = m1_im3_private.f1();
+    //import m1_im3_private = require("m1_M3_public");
+    //export var m1_im3_private_v1_public = m1_im3_private.c1;
+    //export var m1_im3_private_v2_public = new m1_im3_private.c1();
+    //export var m1_im3_private_v3_public = m1_im3_private.f1;
+    //export var m1_im3_private_v4_public = m1_im3_private.f1();
+    //var m1_im3_private_v1_private = m1_im3_private.c1;
+    //var m1_im3_private_v2_private = new m1_im3_private.c1();
+    //var m1_im3_private_v3_private = m1_im3_private.f1;
+    //var m1_im3_private_v4_private = m1_im3_private.f1();
 
-    import m1_im4_private = require("m1_M4_private");
-    export var m1_im4_private_v1_public = m1_im4_private.c1;
-    export var m1_im4_private_v2_public = new m1_im4_private.c1();
-    export var m1_im4_private_v3_public = m1_im4_private.f1;
-    export var m1_im4_private_v4_public = m1_im4_private.f1();
-    var m1_im4_private_v1_private = m1_im4_private.c1;
-    var m1_im4_private_v2_private = new m1_im4_private.c1();
-    var m1_im4_private_v3_private = m1_im4_private.f1;
-    var m1_im4_private_v4_private = m1_im4_private.f1();
+    //import m1_im4_private = require("m1_M4_private");
+    //export var m1_im4_private_v1_public = m1_im4_private.c1;
+    //export var m1_im4_private_v2_public = new m1_im4_private.c1();
+    //export var m1_im4_private_v3_public = m1_im4_private.f1;
+    //export var m1_im4_private_v4_public = m1_im4_private.f1();
+    //var m1_im4_private_v1_private = m1_im4_private.c1;
+    //var m1_im4_private_v2_private = new m1_im4_private.c1();
+    //var m1_im4_private_v3_private = m1_im4_private.f1;
+    //var m1_im4_private_v4_private = m1_im4_private.f1();
 
     export import m1_im1_public = m1_M1_public;
     export import m1_im2_public = m1_M2_private;
-    export import m1_im3_public = require("m1_M3_public");
-    export import m1_im4_public = require("m1_M4_private");
+    //export import m1_im3_public = require("m1_M3_public");
+    //export import m1_im4_public = require("m1_M4_private");
 }
 
 module m2 {
@@ -104,21 +105,21 @@ module m2 {
         export var v2: c1;
     }
 
-    export declare module "m2_M3_public" {
-        export function f1();
-        export class c1 {
-        }
-        export var v1: { new (): c1; };
-        export var v2: c1;
-    }
+    //export declare module "m2_M3_public" {
+    //    export function f1();
+    //    export class c1 {
+    //    }
+    //    export var v1: { new (): c1; };
+    //    export var v2: c1;
+    //}
 
-    declare module "m2_M4_private" {
-        export function f1();
-        export class c1 {
-        }
-        export var v1: { new (): c1; };
-        export var v2: c1;
-    }
+    //declare module "m2_M4_private" {
+    //    export function f1();
+    //    export class c1 {
+    //    }
+    //    export var v1: { new (): c1; };
+    //    export var v2: c1;
+    //}
 
     import m1_im1_private = m2_M1_public;
     export var m1_im1_private_v1_public = m1_im1_private.c1;
@@ -141,31 +142,31 @@ module m2 {
     var m1_im2_private_v3_private = m1_im2_private.f1;
     var m1_im2_private_v4_private = m1_im2_private.f1();
 
-    import m1_im3_private = require("m2_M3_public");
-    export var m1_im3_private_v1_public = m1_im3_private.c1;
-    export var m1_im3_private_v2_public = new m1_im3_private.c1();
-    export var m1_im3_private_v3_public = m1_im3_private.f1;
-    export var m1_im3_private_v4_public = m1_im3_private.f1();
-    var m1_im3_private_v1_private = m1_im3_private.c1;
-    var m1_im3_private_v2_private = new m1_im3_private.c1();
-    var m1_im3_private_v3_private = m1_im3_private.f1;
-    var m1_im3_private_v4_private = m1_im3_private.f1();
+    //import m1_im3_private = require("m2_M3_public");
+    //export var m1_im3_private_v1_public = m1_im3_private.c1;
+    //export var m1_im3_private_v2_public = new m1_im3_private.c1();
+    //export var m1_im3_private_v3_public = m1_im3_private.f1;
+    //export var m1_im3_private_v4_public = m1_im3_private.f1();
+    //var m1_im3_private_v1_private = m1_im3_private.c1;
+    //var m1_im3_private_v2_private = new m1_im3_private.c1();
+    //var m1_im3_private_v3_private = m1_im3_private.f1;
+    //var m1_im3_private_v4_private = m1_im3_private.f1();
 
-    import m1_im4_private = require("m2_M4_private");
-    export var m1_im4_private_v1_public = m1_im4_private.c1;
-    export var m1_im4_private_v2_public = new m1_im4_private.c1();
-    export var m1_im4_private_v3_public = m1_im4_private.f1;
-    export var m1_im4_private_v4_public = m1_im4_private.f1();
-    var m1_im4_private_v1_private = m1_im4_private.c1;
-    var m1_im4_private_v2_private = new m1_im4_private.c1();
-    var m1_im4_private_v3_private = m1_im4_private.f1;
-    var m1_im4_private_v4_private = m1_im4_private.f1();
+    //import m1_im4_private = require("m2_M4_private");
+    //export var m1_im4_private_v1_public = m1_im4_private.c1;
+    //export var m1_im4_private_v2_public = new m1_im4_private.c1();
+    //export var m1_im4_private_v3_public = m1_im4_private.f1;
+    //export var m1_im4_private_v4_public = m1_im4_private.f1();
+    //var m1_im4_private_v1_private = m1_im4_private.c1;
+    //var m1_im4_private_v2_private = new m1_im4_private.c1();
+    //var m1_im4_private_v3_private = m1_im4_private.f1;
+    //var m1_im4_private_v4_private = m1_im4_private.f1();
 
     // Parse error to export module
     export import m1_im1_public = m2_M1_public;
     export import m1_im2_public = m2_M2_private;
-    export import m1_im3_public = require("m2_M3_public");
-    export import m1_im4_public = require("m2_M4_private");
+    //export import m1_im3_public = require("m2_M3_public");
+    //export import m1_im4_public = require("m2_M4_private");
 }
 
 export module glo_M1_public {
@@ -178,13 +179,13 @@ export module glo_M1_public {
     export var v2: c1;
 }
 
-export declare module "glo_M2_public" {
-    export function f1();
-    export class c1 {
-    }
-    export var v1: { new (): c1; };
-    export var v2: c1;
-}
+//export declare module "glo_M2_public" {
+//    export function f1();
+//    export class c1 {
+//    }
+//    export var v1: { new (): c1; };
+//    export var v2: c1;
+//}
 
 export module glo_M3_private {
     export class c1 {
@@ -196,13 +197,13 @@ export module glo_M3_private {
     export var v2: c1;
 }
 
-export declare module "glo_M4_private" {
-    export function f1();
-    export class c1 {
-    }
-    export var v1: { new (): c1; };
-    export var v2: c1;
-}
+//export declare module "glo_M4_private" {
+//    export function f1();
+//    export class c1 {
+//    }
+//    export var v1: { new (): c1; };
+//    export var v2: c1;
+//}
 
 
 import glo_im1_private = glo_M1_public;
@@ -216,15 +217,15 @@ var glo_im1_private_v3_private = glo_im1_private.f1;
 var glo_im1_private_v4_private = glo_im1_private.f1();
 
 
-import glo_im2_private = require("glo_M2_public");
-export var glo_im2_private_v1_public = glo_im2_private.c1;
-export var glo_im2_private_v2_public = new glo_im2_private.c1();
-export var glo_im2_private_v3_public = glo_im2_private.f1;
-export var glo_im2_private_v4_public = glo_im2_private.f1();
-var glo_im2_private_v1_private = glo_im2_private.c1;
-var glo_im2_private_v2_private = new glo_im2_private.c1();
-var glo_im2_private_v3_private = glo_im2_private.f1;
-var glo_im2_private_v4_private = glo_im2_private.f1();
+//import glo_im2_private = require("glo_M2_public");
+//export var glo_im2_private_v1_public = glo_im2_private.c1;
+//export var glo_im2_private_v2_public = new glo_im2_private.c1();
+//export var glo_im2_private_v3_public = glo_im2_private.f1;
+//export var glo_im2_private_v4_public = glo_im2_private.f1();
+//var glo_im2_private_v1_private = glo_im2_private.c1;
+//var glo_im2_private_v2_private = new glo_im2_private.c1();
+//var glo_im2_private_v3_private = glo_im2_private.f1;
+//var glo_im2_private_v4_private = glo_im2_private.f1();
 
 import glo_im3_private = glo_M3_private;
 export var glo_im3_private_v1_public = glo_im3_private.c1;
@@ -236,122 +237,122 @@ var glo_im3_private_v2_private = new glo_im3_private.c1();
 var glo_im3_private_v3_private = glo_im3_private.f1;
 var glo_im3_private_v4_private = glo_im3_private.f1();
 
-import glo_im4_private = require("glo_M4_private");
-export var glo_im4_private_v1_public = glo_im4_private.c1;
-export var glo_im4_private_v2_public = new glo_im4_private.c1();
-export var glo_im4_private_v3_public = glo_im4_private.f1;
-export var glo_im4_private_v4_public = glo_im4_private.f1();
-var glo_im4_private_v1_private = glo_im4_private.c1;
-var glo_im4_private_v2_private = new glo_im4_private.c1();
-var glo_im4_private_v3_private = glo_im4_private.f1;
-var glo_im4_private_v4_private = glo_im4_private.f1();
+//import glo_im4_private = require("glo_M4_private");
+//export var glo_im4_private_v1_public = glo_im4_private.c1;
+//export var glo_im4_private_v2_public = new glo_im4_private.c1();
+//export var glo_im4_private_v3_public = glo_im4_private.f1;
+//export var glo_im4_private_v4_public = glo_im4_private.f1();
+//var glo_im4_private_v1_private = glo_im4_private.c1;
+//var glo_im4_private_v2_private = new glo_im4_private.c1();
+//var glo_im4_private_v3_private = glo_im4_private.f1;
+//var glo_im4_private_v4_private = glo_im4_private.f1();
 
 // Parse error to export module
 export import glo_im1_public = glo_M1_public;
 export import glo_im2_public = glo_M3_private;
-export import glo_im3_public = require("glo_M2_public");
-export import glo_im4_public = require("glo_M4_private");
+//export import glo_im3_public = require("glo_M2_public");
+//export import glo_im4_public = require("glo_M4_private");
 
 
-export declare module "use_glo_M1_public" {
-    import use_glo_M1_public = glo_M1_public;
-    export var use_glo_M1_public_v1_public: { new (): use_glo_M1_public.c1; };
-    export var use_glo_M1_public_v2_public: use_glo_M1_public;
-    export var use_glo_M1_public_v3_public: () => use_glo_M1_public.c1;
-    var use_glo_M1_public_v1_private: { new (): use_glo_M1_public.c1; };
-    var use_glo_M1_public_v2_private: use_glo_M1_public;
-    var use_glo_M1_public_v3_private: () => use_glo_M1_public.c1;
+//export declare module "use_glo_M1_public" {
+//    import use_glo_M1_public = glo_M1_public;
+//    export var use_glo_M1_public_v1_public: { new (): use_glo_M1_public.c1; };
+//    export var use_glo_M1_public_v2_public: use_glo_M1_public;
+//    export var use_glo_M1_public_v3_public: () => use_glo_M1_public.c1;
+//    var use_glo_M1_public_v1_private: { new (): use_glo_M1_public.c1; };
+//    var use_glo_M1_public_v2_private: use_glo_M1_public;
+//    var use_glo_M1_public_v3_private: () => use_glo_M1_public.c1;
 
-    import use_glo_M2_public = require("glo_M2_public");
-    export var use_glo_M2_public_v1_public: { new (): use_glo_M2_public.c1; };
-    export var use_glo_M2_public_v2_public: use_glo_M2_public;
-    export var use_glo_M2_public_v3_public: () => use_glo_M2_public.c1;
-    var use_glo_M2_public_v1_private: { new (): use_glo_M2_public.c1; };
-    var use_glo_M2_public_v2_private: use_glo_M2_public;
-    var use_glo_M2_public_v3_private: () => use_glo_M2_public.c1;
+//    import use_glo_M2_public = require("glo_M2_public");
+//    export var use_glo_M2_public_v1_public: { new (): use_glo_M2_public.c1; };
+//    export var use_glo_M2_public_v2_public: use_glo_M2_public;
+//    export var use_glo_M2_public_v3_public: () => use_glo_M2_public.c1;
+//    var use_glo_M2_public_v1_private: { new (): use_glo_M2_public.c1; };
+//    var use_glo_M2_public_v2_private: use_glo_M2_public;
+//    var use_glo_M2_public_v3_private: () => use_glo_M2_public.c1;
 
-    module m2 {
-        import errorImport = require("glo_M2_public");
-        import nonerrorImport = glo_M1_public;
+//    module m2 {
+//        import errorImport = require("glo_M2_public");
+//        import nonerrorImport = glo_M1_public;
 
-        module m5 {
-            import m5_errorImport = require("glo_M2_public");
-            import m5_nonerrorImport = glo_M1_public;
-        }
-    }
-}
+//        module m5 {
+//            import m5_errorImport = require("glo_M2_public");
+//            import m5_nonerrorImport = glo_M1_public;
+//        }
+//    }
+//}
 
 
-declare module "use_glo_M3_private" {
-    import use_glo_M3_private = glo_M3_private;
-    export var use_glo_M3_private_v1_public: { new (): use_glo_M3_private.c1; };
-    export var use_glo_M3_private_v2_public: use_glo_M3_private;
-    export var use_glo_M3_private_v3_public: () => use_glo_M3_private.c1;
-    var use_glo_M3_private_v1_private: { new (): use_glo_M3_private.c1; };
-    var use_glo_M3_private_v2_private: use_glo_M3_private;
-    var use_glo_M3_private_v3_private: () => use_glo_M3_private.c1;
+//declare module "use_glo_M3_private" {
+//    import use_glo_M3_private = glo_M3_private;
+//    export var use_glo_M3_private_v1_public: { new (): use_glo_M3_private.c1; };
+//    export var use_glo_M3_private_v2_public: use_glo_M3_private;
+//    export var use_glo_M3_private_v3_public: () => use_glo_M3_private.c1;
+//    var use_glo_M3_private_v1_private: { new (): use_glo_M3_private.c1; };
+//    var use_glo_M3_private_v2_private: use_glo_M3_private;
+//    var use_glo_M3_private_v3_private: () => use_glo_M3_private.c1;
 
-    import use_glo_M4_private = require("glo_M4_private");
-    export var use_glo_M4_private_v1_public: { new (): use_glo_M4_private.c1; };
-    export var use_glo_M4_private_v2_public: use_glo_M4_private;
-    export var use_glo_M4_private_v3_public: () => use_glo_M4_private.c1;
-    var use_glo_M4_private_v1_private: { new (): use_glo_M4_private.c1; };
-    var use_glo_M4_private_v2_private: use_glo_M4_private;
-    var use_glo_M4_private_v3_private: () => use_glo_M4_private.c1;
+//    import use_glo_M4_private = require("glo_M4_private");
+//    export var use_glo_M4_private_v1_public: { new (): use_glo_M4_private.c1; };
+//    export var use_glo_M4_private_v2_public: use_glo_M4_private;
+//    export var use_glo_M4_private_v3_public: () => use_glo_M4_private.c1;
+//    var use_glo_M4_private_v1_private: { new (): use_glo_M4_private.c1; };
+//    var use_glo_M4_private_v2_private: use_glo_M4_private;
+//    var use_glo_M4_private_v3_private: () => use_glo_M4_private.c1;
 
-    module m2 {
-        import errorImport = require("glo_M4_private");
-        import nonerrorImport = glo_M3_private;
+//    module m2 {
+//        import errorImport = require("glo_M4_private");
+//        import nonerrorImport = glo_M3_private;
 
-        module m5 {
-            import m5_errorImport = require("glo_M4_private");
-            import m5_nonerrorImport = glo_M3_private;
-        }
-    }
-}
+//        module m5 {
+//            import m5_errorImport = require("glo_M4_private");
+//            import m5_nonerrorImport = glo_M3_private;
+//        }
+//    }
+//}
 
-declare module "anotherParseError" {
-    module m2 {
-        declare module "abc" {
-        }
-    }
+//declare module "anotherParseError" {
+//    module m2 {
+//        declare module "abc" {
+//        }
+//    }
 
-    module m2 {
-        module "abc2" {
-        }
-    }
-    module "abc3" {
-    }
-}
+//    module m2 {
+//        module "abc2" {
+//        }
+//    }
+//    module "abc3" {
+//    }
+//}
 
-declare export module "anotherParseError2" {
-    module m2 {
-        declare module "abc" {
-        }
-    }
+//declare export module "anotherParseError2" {
+//    module m2 {
+//        declare module "abc" {
+//        }
+//    }
 
-    module m2 {
-        module "abc2" {
-        }
-    }
-    module "abc3" {
-    }
-}
+//    module m2 {
+//        module "abc2" {
+//        }
+//    }
+//    module "abc3" {
+//    }
+//}
 
 module m2 {
-    import m3 = require("use_glo_M1_public");
+    //import m3 = require("use_glo_M1_public");
     module m4 {
         var a = 10;
-        import m2 = require("use_glo_M1_public");
+        //import m2 = require("use_glo_M1_public");
     }
 
 }
 
 export module m3 {
-    import m3 = require("use_glo_M1_public");
+    //import m3 = require("use_glo_M1_public");
     module m4 {
         var a = 10;
-        import m2 = require("use_glo_M1_public");
+        //import m2 = require("use_glo_M1_public");
     }
 
 }
\ No newline at end of file
diff --git a/tests/cases/compiler/privacyImportParseErrors.ts b/tests/cases/compiler/privacyImportParseErrors.ts
new file mode 100644
index 00000000000..04d789a3749
--- /dev/null
+++ b/tests/cases/compiler/privacyImportParseErrors.ts
@@ -0,0 +1,357 @@
+//@module: commonjs
+export module m1 {
+    export module m1_M1_public {
+        export class c1 {
+        }
+        export function f1() {
+            return new c1;
+        }
+        export var v1 = c1;
+        export var v2: c1;
+    }
+
+    module m1_M2_private {
+        export class c1 {
+        }
+        export function f1() {
+            return new c1;
+        }
+        export var v1 = c1;
+        export var v2: c1;
+    }
+
+    export declare module "m1_M3_public" {
+        export function f1();
+        export class c1 {
+        }
+        export var v1: { new (): c1; };
+        export var v2: c1;
+    }
+
+    declare module "m1_M4_private" {
+        export function f1();
+        export class c1 {
+        }
+        export var v1: { new (): c1; };
+        export var v2: c1;
+    }
+
+    import m1_im1_private = m1_M1_public;
+    export var m1_im1_private_v1_public = m1_im1_private.c1;
+    export var m1_im1_private_v2_public = new m1_im1_private.c1();
+    export var m1_im1_private_v3_public = m1_im1_private.f1;
+    export var m1_im1_private_v4_public = m1_im1_private.f1();
+    var m1_im1_private_v1_private = m1_im1_private.c1;
+    var m1_im1_private_v2_private = new m1_im1_private.c1();
+    var m1_im1_private_v3_private = m1_im1_private.f1;
+    var m1_im1_private_v4_private = m1_im1_private.f1();
+
+
+    import m1_im2_private = m1_M2_private;
+    export var m1_im2_private_v1_public = m1_im2_private.c1;
+    export var m1_im2_private_v2_public = new m1_im2_private.c1();
+    export var m1_im2_private_v3_public = m1_im2_private.f1;
+    export var m1_im2_private_v4_public = m1_im2_private.f1();
+    var m1_im2_private_v1_private = m1_im2_private.c1;
+    var m1_im2_private_v2_private = new m1_im2_private.c1();
+    var m1_im2_private_v3_private = m1_im2_private.f1;
+    var m1_im2_private_v4_private = m1_im2_private.f1();
+
+    import m1_im3_private = require("m1_M3_public");
+    export var m1_im3_private_v1_public = m1_im3_private.c1;
+    export var m1_im3_private_v2_public = new m1_im3_private.c1();
+    export var m1_im3_private_v3_public = m1_im3_private.f1;
+    export var m1_im3_private_v4_public = m1_im3_private.f1();
+    var m1_im3_private_v1_private = m1_im3_private.c1;
+    var m1_im3_private_v2_private = new m1_im3_private.c1();
+    var m1_im3_private_v3_private = m1_im3_private.f1;
+    var m1_im3_private_v4_private = m1_im3_private.f1();
+
+    import m1_im4_private = require("m1_M4_private");
+    export var m1_im4_private_v1_public = m1_im4_private.c1;
+    export var m1_im4_private_v2_public = new m1_im4_private.c1();
+    export var m1_im4_private_v3_public = m1_im4_private.f1;
+    export var m1_im4_private_v4_public = m1_im4_private.f1();
+    var m1_im4_private_v1_private = m1_im4_private.c1;
+    var m1_im4_private_v2_private = new m1_im4_private.c1();
+    var m1_im4_private_v3_private = m1_im4_private.f1;
+    var m1_im4_private_v4_private = m1_im4_private.f1();
+
+    export import m1_im1_public = m1_M1_public;
+    export import m1_im2_public = m1_M2_private;
+    export import m1_im3_public = require("m1_M3_public");
+    export import m1_im4_public = require("m1_M4_private");
+}
+
+module m2 {
+    export module m2_M1_public {
+        export class c1 {
+        }
+        export function f1() {
+            return new c1;
+        }
+        export var v1 = c1;
+        export var v2: c1;
+    }
+
+    module m2_M2_private {
+        export class c1 {
+        }
+        export function f1() {
+            return new c1;
+        }
+        export var v1 = c1;
+        export var v2: c1;
+    }
+
+    export declare module "m2_M3_public" {
+        export function f1();
+        export class c1 {
+        }
+        export var v1: { new (): c1; };
+        export var v2: c1;
+    }
+
+    declare module "m2_M4_private" {
+        export function f1();
+        export class c1 {
+        }
+        export var v1: { new (): c1; };
+        export var v2: c1;
+    }
+
+    import m1_im1_private = m2_M1_public;
+    export var m1_im1_private_v1_public = m1_im1_private.c1;
+    export var m1_im1_private_v2_public = new m1_im1_private.c1();
+    export var m1_im1_private_v3_public = m1_im1_private.f1;
+    export var m1_im1_private_v4_public = m1_im1_private.f1();
+    var m1_im1_private_v1_private = m1_im1_private.c1;
+    var m1_im1_private_v2_private = new m1_im1_private.c1();
+    var m1_im1_private_v3_private = m1_im1_private.f1;
+    var m1_im1_private_v4_private = m1_im1_private.f1();
+
+
+    import m1_im2_private = m2_M2_private;
+    export var m1_im2_private_v1_public = m1_im2_private.c1;
+    export var m1_im2_private_v2_public = new m1_im2_private.c1();
+    export var m1_im2_private_v3_public = m1_im2_private.f1;
+    export var m1_im2_private_v4_public = m1_im2_private.f1();
+    var m1_im2_private_v1_private = m1_im2_private.c1;
+    var m1_im2_private_v2_private = new m1_im2_private.c1();
+    var m1_im2_private_v3_private = m1_im2_private.f1;
+    var m1_im2_private_v4_private = m1_im2_private.f1();
+
+    import m1_im3_private = require("m2_M3_public");
+    export var m1_im3_private_v1_public = m1_im3_private.c1;
+    export var m1_im3_private_v2_public = new m1_im3_private.c1();
+    export var m1_im3_private_v3_public = m1_im3_private.f1;
+    export var m1_im3_private_v4_public = m1_im3_private.f1();
+    var m1_im3_private_v1_private = m1_im3_private.c1;
+    var m1_im3_private_v2_private = new m1_im3_private.c1();
+    var m1_im3_private_v3_private = m1_im3_private.f1;
+    var m1_im3_private_v4_private = m1_im3_private.f1();
+
+    import m1_im4_private = require("m2_M4_private");
+    export var m1_im4_private_v1_public = m1_im4_private.c1;
+    export var m1_im4_private_v2_public = new m1_im4_private.c1();
+    export var m1_im4_private_v3_public = m1_im4_private.f1;
+    export var m1_im4_private_v4_public = m1_im4_private.f1();
+    var m1_im4_private_v1_private = m1_im4_private.c1;
+    var m1_im4_private_v2_private = new m1_im4_private.c1();
+    var m1_im4_private_v3_private = m1_im4_private.f1;
+    var m1_im4_private_v4_private = m1_im4_private.f1();
+
+    // Parse error to export module
+    export import m1_im1_public = m2_M1_public;
+    export import m1_im2_public = m2_M2_private;
+    export import m1_im3_public = require("m2_M3_public");
+    export import m1_im4_public = require("m2_M4_private");
+}
+
+export module glo_M1_public {
+    export class c1 {
+    }
+    export function f1() {
+        return new c1;
+    }
+    export var v1 = c1;
+    export var v2: c1;
+}
+
+export declare module "glo_M2_public" {
+    export function f1();
+    export class c1 {
+    }
+    export var v1: { new (): c1; };
+    export var v2: c1;
+}
+
+export module glo_M3_private {
+    export class c1 {
+    }
+    export function f1() {
+        return new c1;
+    }
+    export var v1 = c1;
+    export var v2: c1;
+}
+
+export declare module "glo_M4_private" {
+    export function f1();
+    export class c1 {
+    }
+    export var v1: { new (): c1; };
+    export var v2: c1;
+}
+
+
+import glo_im1_private = glo_M1_public;
+export var glo_im1_private_v1_public = glo_im1_private.c1;
+export var glo_im1_private_v2_public = new glo_im1_private.c1();
+export var glo_im1_private_v3_public = glo_im1_private.f1;
+export var glo_im1_private_v4_public = glo_im1_private.f1();
+var glo_im1_private_v1_private = glo_im1_private.c1;
+var glo_im1_private_v2_private = new glo_im1_private.c1();
+var glo_im1_private_v3_private = glo_im1_private.f1;
+var glo_im1_private_v4_private = glo_im1_private.f1();
+
+
+import glo_im2_private = require("glo_M2_public");
+export var glo_im2_private_v1_public = glo_im2_private.c1;
+export var glo_im2_private_v2_public = new glo_im2_private.c1();
+export var glo_im2_private_v3_public = glo_im2_private.f1;
+export var glo_im2_private_v4_public = glo_im2_private.f1();
+var glo_im2_private_v1_private = glo_im2_private.c1;
+var glo_im2_private_v2_private = new glo_im2_private.c1();
+var glo_im2_private_v3_private = glo_im2_private.f1;
+var glo_im2_private_v4_private = glo_im2_private.f1();
+
+import glo_im3_private = glo_M3_private;
+export var glo_im3_private_v1_public = glo_im3_private.c1;
+export var glo_im3_private_v2_public = new glo_im3_private.c1();
+export var glo_im3_private_v3_public = glo_im3_private.f1;
+export var glo_im3_private_v4_public = glo_im3_private.f1();
+var glo_im3_private_v1_private = glo_im3_private.c1;
+var glo_im3_private_v2_private = new glo_im3_private.c1();
+var glo_im3_private_v3_private = glo_im3_private.f1;
+var glo_im3_private_v4_private = glo_im3_private.f1();
+
+import glo_im4_private = require("glo_M4_private");
+export var glo_im4_private_v1_public = glo_im4_private.c1;
+export var glo_im4_private_v2_public = new glo_im4_private.c1();
+export var glo_im4_private_v3_public = glo_im4_private.f1;
+export var glo_im4_private_v4_public = glo_im4_private.f1();
+var glo_im4_private_v1_private = glo_im4_private.c1;
+var glo_im4_private_v2_private = new glo_im4_private.c1();
+var glo_im4_private_v3_private = glo_im4_private.f1;
+var glo_im4_private_v4_private = glo_im4_private.f1();
+
+// Parse error to export module
+export import glo_im1_public = glo_M1_public;
+export import glo_im2_public = glo_M3_private;
+export import glo_im3_public = require("glo_M2_public");
+export import glo_im4_public = require("glo_M4_private");
+
+
+export declare module "use_glo_M1_public" {
+    import use_glo_M1_public = glo_M1_public;
+    export var use_glo_M1_public_v1_public: { new (): use_glo_M1_public.c1; };
+    export var use_glo_M1_public_v2_public: use_glo_M1_public;
+    export var use_glo_M1_public_v3_public: () => use_glo_M1_public.c1;
+    var use_glo_M1_public_v1_private: { new (): use_glo_M1_public.c1; };
+    var use_glo_M1_public_v2_private: use_glo_M1_public;
+    var use_glo_M1_public_v3_private: () => use_glo_M1_public.c1;
+
+    import use_glo_M2_public = require("glo_M2_public");
+    export var use_glo_M2_public_v1_public: { new (): use_glo_M2_public.c1; };
+    export var use_glo_M2_public_v2_public: use_glo_M2_public;
+    export var use_glo_M2_public_v3_public: () => use_glo_M2_public.c1;
+    var use_glo_M2_public_v1_private: { new (): use_glo_M2_public.c1; };
+    var use_glo_M2_public_v2_private: use_glo_M2_public;
+    var use_glo_M2_public_v3_private: () => use_glo_M2_public.c1;
+
+    module m2 {
+        import errorImport = require("glo_M2_public");
+        import nonerrorImport = glo_M1_public;
+
+        module m5 {
+            import m5_errorImport = require("glo_M2_public");
+            import m5_nonerrorImport = glo_M1_public;
+        }
+    }
+}
+
+
+declare module "use_glo_M3_private" {
+    import use_glo_M3_private = glo_M3_private;
+    export var use_glo_M3_private_v1_public: { new (): use_glo_M3_private.c1; };
+    export var use_glo_M3_private_v2_public: use_glo_M3_private;
+    export var use_glo_M3_private_v3_public: () => use_glo_M3_private.c1;
+    var use_glo_M3_private_v1_private: { new (): use_glo_M3_private.c1; };
+    var use_glo_M3_private_v2_private: use_glo_M3_private;
+    var use_glo_M3_private_v3_private: () => use_glo_M3_private.c1;
+
+    import use_glo_M4_private = require("glo_M4_private");
+    export var use_glo_M4_private_v1_public: { new (): use_glo_M4_private.c1; };
+    export var use_glo_M4_private_v2_public: use_glo_M4_private;
+    export var use_glo_M4_private_v3_public: () => use_glo_M4_private.c1;
+    var use_glo_M4_private_v1_private: { new (): use_glo_M4_private.c1; };
+    var use_glo_M4_private_v2_private: use_glo_M4_private;
+    var use_glo_M4_private_v3_private: () => use_glo_M4_private.c1;
+
+    module m2 {
+        import errorImport = require("glo_M4_private");
+        import nonerrorImport = glo_M3_private;
+
+        module m5 {
+            import m5_errorImport = require("glo_M4_private");
+            import m5_nonerrorImport = glo_M3_private;
+        }
+    }
+}
+
+declare module "anotherParseError" {
+    module m2 {
+        declare module "abc" {
+        }
+    }
+
+    module m2 {
+        module "abc2" {
+        }
+    }
+    module "abc3" {
+    }
+}
+
+declare export module "anotherParseError2" {
+    module m2 {
+        declare module "abc" {
+        }
+    }
+
+    module m2 {
+        module "abc2" {
+        }
+    }
+    module "abc3" {
+    }
+}
+
+module m2 {
+    import m3 = require("use_glo_M1_public");
+    module m4 {
+        var a = 10;
+        import m2 = require("use_glo_M1_public");
+    }
+
+}
+
+export module m3 {
+    import m3 = require("use_glo_M1_public");
+    module m4 {
+        var a = 10;
+        import m2 = require("use_glo_M1_public");
+    }
+
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/privacyInterfaceExtendsClauseDeclFile.ts b/tests/cases/compiler/privacyInterfaceExtendsClauseDeclFile.ts
new file mode 100644
index 00000000000..d1c73724bb9
--- /dev/null
+++ b/tests/cases/compiler/privacyInterfaceExtendsClauseDeclFile.ts
@@ -0,0 +1,94 @@
+// @module: commonjs
+// @declaration: true
+
+// @Filename: privacyInterfaceExtendsClauseDeclFile_externalModule.ts
+export module publicModule {
+    export interface publicInterfaceInPublicModule {
+    }
+
+    interface privateInterfaceInPublicModule {
+    }
+
+    interface privateInterfaceImplementingPublicInterfaceInModule extends publicInterfaceInPublicModule {
+    }
+    interface privateInterfaceImplementingPrivateInterfaceInModule extends privateInterfaceInPublicModule {
+    }
+    export interface publicInterfaceImplementingPublicInterfaceInModule extends publicInterfaceInPublicModule {
+    }
+    export interface publicInterfaceImplementingPrivateInterfaceInModule extends privateInterfaceInPublicModule { // Should error
+    }
+
+    interface privateInterfaceImplementingFromPrivateModuleInterface extends privateModule.publicInterfaceInPrivateModule {
+    }
+    export interface publicInterfaceImplementingFromPrivateModuleInterface extends privateModule.publicInterfaceInPrivateModule { // Should error
+    }
+
+    export interface publicInterfaceImplementingPrivateAndPublicInterface extends privateInterfaceInPublicModule, publicInterfaceInPublicModule { // Should error
+    }
+}
+
+module privateModule {
+    export interface publicInterfaceInPrivateModule {
+
+    }
+
+    interface privateInterfaceInPrivateModule {
+    }
+
+    interface privateInterfaceImplementingPublicInterfaceInModule extends publicInterfaceInPrivateModule {
+    }
+    interface privateInterfaceImplementingPrivateInterfaceInModule extends privateInterfaceInPrivateModule {
+    }
+    export interface publicInterfaceImplementingPublicInterfaceInModule extends publicInterfaceInPrivateModule {
+    }
+    export interface publicInterfaceImplementingPrivateInterfaceInModule extends privateInterfaceInPrivateModule {
+    }
+
+    interface privateInterfaceImplementingFromPrivateModuleInterface extends privateModule.publicInterfaceInPrivateModule {
+    }
+    export interface publicInterfaceImplementingFromPrivateModuleInterface extends privateModule.publicInterfaceInPrivateModule {
+    }
+}
+
+export interface publicInterface {
+
+}
+
+interface privateInterface {
+}
+
+interface privateInterfaceImplementingPublicInterface extends publicInterface {
+}
+interface privateInterfaceImplementingPrivateInterfaceInModule extends privateInterface {
+}
+export interface publicInterfaceImplementingPublicInterface extends publicInterface {
+}
+export interface publicInterfaceImplementingPrivateInterface extends privateInterface { // Should error
+}
+
+interface privateInterfaceImplementingFromPrivateModuleInterface extends privateModule.publicInterfaceInPrivateModule {
+}
+export interface publicInterfaceImplementingFromPrivateModuleInterface extends privateModule.publicInterfaceInPrivateModule { // Should error
+}
+
+// @Filename: privacyInterfaceExtendsClauseDeclFile_GlobalFile.ts
+module publicModuleInGlobal {
+    export interface publicInterfaceInPublicModule {
+    }
+
+    interface privateInterfaceInPublicModule {
+    }
+
+    interface privateInterfaceImplementingPublicInterfaceInModule extends publicInterfaceInPublicModule {
+    }
+    interface privateInterfaceImplementingPrivateInterfaceInModule extends privateInterfaceInPublicModule {
+    }
+    export interface publicInterfaceImplementingPublicInterfaceInModule extends publicInterfaceInPublicModule {
+    }
+    export interface publicInterfaceImplementingPrivateInterfaceInModule extends privateInterfaceInPublicModule { // Should error
+    }
+}
+interface publicInterfaceInGlobal {
+}
+interface publicInterfaceImplementingPublicInterfaceInGlobal extends publicInterfaceInGlobal {
+}
diff --git a/tests/cases/compiler/privacyLocalInternalReferenceImportWithExport.ts b/tests/cases/compiler/privacyLocalInternalReferenceImportWithExport.ts
index 9219f1ae6a9..89bd95e6a64 100644
--- a/tests/cases/compiler/privacyLocalInternalReferenceImportWithExport.ts
+++ b/tests/cases/compiler/privacyLocalInternalReferenceImportWithExport.ts
@@ -1,4 +1,5 @@
 //@module: commonjs
+//@declaration: true
 // private elements
 module m_private {
     export class c_private {
diff --git a/tests/cases/compiler/privacyLocalInternalReferenceImportWithoutExport.ts b/tests/cases/compiler/privacyLocalInternalReferenceImportWithoutExport.ts
index fd7cecc01bf..454212f2e31 100644
--- a/tests/cases/compiler/privacyLocalInternalReferenceImportWithoutExport.ts
+++ b/tests/cases/compiler/privacyLocalInternalReferenceImportWithoutExport.ts
@@ -1,4 +1,5 @@
 //@module: amd
+//@declaration: true
 // private elements
 module m_private {
     export class c_private {
diff --git a/tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithExport.ts b/tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithExport.ts
index aa98a1a969b..16c6e19fb59 100644
--- a/tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithExport.ts
+++ b/tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithExport.ts
@@ -1,4 +1,5 @@
 //@module: commonjs
+//@declaration: true
 // @Filename: privacyTopLevelAmbientExternalModuleImportWithExport_require.ts
 // Public elements
 export class c_public {
@@ -28,6 +29,8 @@ declare module 'm2' {
 }
 
 // @Filename: privacyTopLevelAmbientExternalModuleImportWithExport_core.ts
+///<reference path='privacyTopLevelAmbientExternalModuleImportWithExport_require2.ts'/>
+///<reference path='privacyTopLevelAmbientExternalModuleImportWithExport_require3.ts'/>
 // Privacy errors - importing private elements
 export import im_public_mi_private = require("privacyTopLevelAmbientExternalModuleImportWithExport_require");
 export import im_public_mu_private = require("privacyTopLevelAmbientExternalModuleImportWithExport_require1");
@@ -35,11 +38,11 @@ export import im_public_mi_public = require("m");
 export import im_public_mu_public = require("m2");
 
 // Usage of privacy error imports
-var privateUse_im_public_mi_private = new im_public_mi_private.c_private();
-export var publicUse_im_public_mi_private = new im_public_mi_private.c_private();
-var privateUse_im_public_mu_private = new im_public_mu_private.c_private();
-export var publicUse_im_public_mu_private = new im_public_mu_private.c_private();
-var privateUse_im_public_mi_public = new im_public_mi_public.c_public();
-export var publicUse_im_public_mi_public = new im_public_mi_public.c_public();
-var privateUse_im_public_mi_public = new im_public_mi_public.c_public();
-export var publicUse_im_public_mi_public = new im_public_mi_public.c_public();
+var privateUse_im_public_mi_private = new im_public_mi_private.c_public();
+export var publicUse_im_public_mi_private = new im_public_mi_private.c_public();
+var privateUse_im_public_mu_private = new im_public_mu_private.c_public();
+export var publicUse_im_public_mu_private = new im_public_mu_private.c_public();
+var privateUse_im_public_mi_public = new im_public_mi_public.c_private();
+export var publicUse_im_public_mi_public = new im_public_mi_public.c_private();
+var privateUse_im_public_mi_public = new im_public_mi_public.c_private();
+export var publicUse_im_public_mi_public = new im_public_mi_public.c_private();
diff --git a/tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithoutExport.ts b/tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithoutExport.ts
index b2d3910a959..f663871cbdb 100644
--- a/tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithoutExport.ts
+++ b/tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithoutExport.ts
@@ -1,4 +1,5 @@
 //@module: amd
+//@declaration: true
 
 // @Filename: privacyTopLevelAmbientExternalModuleImportWithoutExport_require.ts
 // Public elements
@@ -28,6 +29,8 @@ declare module 'm2' {
 }
 
 // @Filename: privacyTopLevelAmbientExternalModuleImportWithoutExport_core.ts
+///<reference path='privacyTopLevelAmbientExternalModuleImportWithoutExport_require2.ts'/>
+///<reference path='privacyTopLevelAmbientExternalModuleImportWithoutExport_require3.ts'/>
 // Privacy errors - importing private elements
 import im_private_mi_private = require("m");
 import im_private_mu_private = require("m2");
diff --git a/tests/cases/compiler/privacyTopLevelInternalReferenceImportWithExport.ts b/tests/cases/compiler/privacyTopLevelInternalReferenceImportWithExport.ts
index ada020f4da6..987c35c7325 100644
--- a/tests/cases/compiler/privacyTopLevelInternalReferenceImportWithExport.ts
+++ b/tests/cases/compiler/privacyTopLevelInternalReferenceImportWithExport.ts
@@ -1,4 +1,5 @@
 //@module: amd
+//@declaration: true
 // private elements
 module m_private {
     export class c_private {
diff --git a/tests/cases/compiler/privacyTopLevelInternalReferenceImportWithoutExport.ts b/tests/cases/compiler/privacyTopLevelInternalReferenceImportWithoutExport.ts
index d703e1ea0d6..8f241c5ab01 100644
--- a/tests/cases/compiler/privacyTopLevelInternalReferenceImportWithoutExport.ts
+++ b/tests/cases/compiler/privacyTopLevelInternalReferenceImportWithoutExport.ts
@@ -1,4 +1,6 @@
 //@module: amd
+//@declaration: true
+
 // private elements
 module m_private {
     export class c_private {
diff --git a/tests/cases/compiler/privacyTypeParameterOfFunction.ts b/tests/cases/compiler/privacyTypeParameterOfFunction.ts
index 2b22b5321bb..dfbecc24bf3 100644
--- a/tests/cases/compiler/privacyTypeParameterOfFunction.ts
+++ b/tests/cases/compiler/privacyTypeParameterOfFunction.ts
@@ -1,3 +1,4 @@
+// @module: commonjs
 class privateClass {
 }
 
diff --git a/tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts b/tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts
new file mode 100644
index 00000000000..7ea908e9cfb
--- /dev/null
+++ b/tests/cases/compiler/privacyTypeParameterOfFunctionDeclFile.ts
@@ -0,0 +1,440 @@
+// @module: commonjs
+// @declaration: true
+class privateClass {
+}
+
+export class publicClass {
+}
+
+export interface publicInterfaceWithPrivateTypeParameters {
+    new <T extends privateClass>(): privateClass;  // Error
+    <T extends privateClass>(): privateClass;  // Error
+    myMethod<T extends privateClass>(): privateClass;  // Error
+}
+
+export interface publicInterfaceWithPublicTypeParameters {
+    new <T extends publicClass>(): publicClass;
+    <T extends publicClass>(): publicClass;
+    myMethod<T extends publicClass>(): publicClass;
+}
+
+interface privateInterfaceWithPrivateTypeParameters {
+    new <T extends privateClass>(): privateClass;
+    <T extends privateClass>(): privateClass;
+    myMethod<T extends privateClass>(): privateClass;
+}
+
+interface privateInterfaceWithPublicTypeParameters {
+    new <T extends publicClass>(): publicClass;
+    <T extends publicClass>(): publicClass;
+    myMethod<T extends publicClass>(): publicClass;
+}
+
+export class publicClassWithWithPrivateTypeParameters {
+    static myPublicStaticMethod<T extends privateClass>() {  // Error
+    }
+    private static myPrivateStaticMethod<T extends privateClass>() {
+    }
+    myPublicMethod<T extends privateClass>() {  // Error
+    }
+    private myPrivateMethod<T extends privateClass>() {
+    }
+}
+
+export class publicClassWithWithPublicTypeParameters {
+    static myPublicStaticMethod<T extends publicClass>() {
+    }
+    private static myPrivateStaticMethod<T extends publicClass>() { 
+    }
+    myPublicMethod<T extends publicClass>() {
+    }
+    private myPrivateMethod<T extends publicClass>() {
+    }
+}
+
+class privateClassWithWithPrivateTypeParameters {
+    static myPublicStaticMethod<T extends privateClass>() {
+    }
+    private static myPrivateStaticMethod<T extends privateClass>() {
+    }
+    myPublicMethod<T extends privateClass>() {
+    }
+    private myPrivateMethod<T extends privateClass>() {
+    }
+}
+
+class privateClassWithWithPublicTypeParameters {
+    static myPublicStaticMethod<T extends publicClass>() {
+    }
+    private static myPrivateStaticMethod<T extends publicClass>() {
+    }
+    myPublicMethod<T extends publicClass>() {
+    }
+    private myPrivateMethod<T extends publicClass>() {
+    }
+}
+
+export function publicFunctionWithPrivateTypeParameters<T extends privateClass>() {  // Error
+}
+
+export function publicFunctionWithPublicTypeParameters<T extends publicClass>() {
+}
+
+function privateFunctionWithPrivateTypeParameters<T extends privateClass>() {
+}
+
+function privateFunctionWithPublicTypeParameters<T extends publicClass>() {
+}
+
+export interface publicInterfaceWithPublicTypeParametersWithoutExtends {
+    new <T>(): publicClass;
+    <T>(): publicClass;
+    myMethod<T>(): publicClass;
+}
+
+interface privateInterfaceWithPublicTypeParametersWithoutExtends {
+    new <T>(): publicClass;
+    <T>(): publicClass;
+    myMethod<T>(): publicClass;
+}
+
+export class publicClassWithWithPublicTypeParametersWithoutExtends {
+    static myPublicStaticMethod<T>() {
+    }
+    private static myPrivateStaticMethod<T>() {
+    }
+    myPublicMethod<T>() {
+    }
+    private myPrivateMethod<T>() {
+    }
+}
+class privateClassWithWithPublicTypeParametersWithoutExtends {
+    static myPublicStaticMethod<T>() {
+    }
+    private static myPrivateStaticMethod<T>() {
+    }
+    myPublicMethod<T>() {
+    }
+    private myPrivateMethod<T>() {
+    }
+}
+
+export function publicFunctionWithPublicTypeParametersWithoutExtends<T>() {
+}
+
+function privateFunctionWithPublicTypeParametersWithoutExtends<T>() {
+}
+
+export interface publicInterfaceWithPrivatModuleTypeParameters {
+    new <T extends privateModule.publicClass>(): privateModule.publicClass;  // Error
+    <T extends privateModule.publicClass>(): privateModule.publicClass;  // Error
+    myMethod<T extends privateModule.publicClass>(): privateModule.publicClass;  // Error
+}
+export class publicClassWithWithPrivateModuleTypeParameters {
+    static myPublicStaticMethod<T extends privateModule.publicClass>() {  // Error
+    }
+    myPublicMethod<T extends privateModule.publicClass>() {  // Error
+    }
+}
+export function publicFunctionWithPrivateMopduleTypeParameters<T extends privateModule.publicClass>() {  // Error
+}
+
+
+interface privateInterfaceWithPrivatModuleTypeParameters {
+    new <T extends privateModule.publicClass>(): privateModule.publicClass;
+    <T extends privateModule.publicClass>(): privateModule.publicClass;
+    myMethod<T extends privateModule.publicClass>(): privateModule.publicClass;
+}
+class privateClassWithWithPrivateModuleTypeParameters {
+    static myPublicStaticMethod<T extends privateModule.publicClass>() {
+    }
+    myPublicMethod<T extends privateModule.publicClass>() {
+    }
+}
+function privateFunctionWithPrivateMopduleTypeParameters<T extends privateModule.publicClass>() {
+}
+
+
+export module publicModule {
+    class privateClass {
+    }
+
+    export class publicClass {
+    }
+
+    export interface publicInterfaceWithPrivateTypeParameters {
+        new <T extends privateClass>(): privateClass;  // Error
+        <T extends privateClass>(): privateClass;  // Error
+        myMethod<T extends privateClass>(): privateClass;  // Error
+    }
+
+    export interface publicInterfaceWithPublicTypeParameters {
+        new <T extends publicClass>(): publicClass;
+        <T extends publicClass>(): publicClass;
+        myMethod<T extends publicClass>(): publicClass;
+    }
+
+    interface privateInterfaceWithPrivateTypeParameters {
+        new <T extends privateClass>(): privateClass;
+        <T extends privateClass>(): privateClass;
+        myMethod<T extends privateClass>(): privateClass;
+    }
+
+    interface privateInterfaceWithPublicTypeParameters {
+        new <T extends publicClass>(): publicClass;
+        <T extends publicClass>(): publicClass;
+        myMethod<T extends publicClass>(): publicClass;
+    }
+
+    export class publicClassWithWithPrivateTypeParameters {
+        static myPublicStaticMethod<T extends privateClass>() {  // Error
+        }
+        private static myPrivateStaticMethod<T extends privateClass>() {
+        }
+        myPublicMethod<T extends privateClass>() {  // Error
+        }
+        private myPrivateMethod<T extends privateClass>() {
+        }
+    }
+
+    export class publicClassWithWithPublicTypeParameters {
+        static myPublicStaticMethod<T extends publicClass>() {
+        }
+        private static myPrivateStaticMethod<T extends publicClass>() {
+        }
+        myPublicMethod<T extends publicClass>() {
+        }
+        private myPrivateMethod<T extends publicClass>() {
+        }
+    }
+
+    class privateClassWithWithPrivateTypeParameters {
+        static myPublicStaticMethod<T extends privateClass>() {
+        }
+        private static myPrivateStaticMethod<T extends privateClass>() {
+        }
+        myPublicMethod<T extends privateClass>() {
+        }
+        private myPrivateMethod<T extends privateClass>() {
+        }
+    }
+
+    class privateClassWithWithPublicTypeParameters {
+        static myPublicStaticMethod<T extends publicClass>() {
+        }
+        private static myPrivateStaticMethod<T extends publicClass>() {
+        }
+        myPublicMethod<T extends publicClass>() {
+        }
+        private myPrivateMethod<T extends publicClass>() {
+        }
+    }
+
+    export function publicFunctionWithPrivateTypeParameters<T extends privateClass>() {  // Error
+    }
+
+    export function publicFunctionWithPublicTypeParameters<T extends publicClass>() {
+    }
+
+    function privateFunctionWithPrivateTypeParameters<T extends privateClass>() {
+    }
+
+    function privateFunctionWithPublicTypeParameters<T extends publicClass>() {
+    }
+
+    export interface publicInterfaceWithPublicTypeParametersWithoutExtends {
+        new <T>(): publicClass;
+        <T>(): publicClass;
+        myMethod<T>(): publicClass;
+    }
+
+    interface privateInterfaceWithPublicTypeParametersWithoutExtends {
+        new <T>(): publicClass;
+        <T>(): publicClass;
+        myMethod<T>(): publicClass;
+    }
+
+    export class publicClassWithWithPublicTypeParametersWithoutExtends {
+        static myPublicStaticMethod<T>() {
+        }
+        private static myPrivateStaticMethod<T>() {
+        }
+        myPublicMethod<T>() {
+        }
+        private myPrivateMethod<T>() {
+        }
+    }
+    class privateClassWithWithPublicTypeParametersWithoutExtends {
+        static myPublicStaticMethod<T>() {
+        }
+        private static myPrivateStaticMethod<T>() {
+        }
+        myPublicMethod<T>() {
+        }
+        private myPrivateMethod<T>() {
+        }
+    }
+
+    export function publicFunctionWithPublicTypeParametersWithoutExtends<T>() {
+    }
+
+    function privateFunctionWithPublicTypeParametersWithoutExtends<T>() {
+    }
+
+    export interface publicInterfaceWithPrivatModuleTypeParameters {
+        new <T extends privateModule.publicClass>(): privateModule.publicClass;  // Error
+        <T extends privateModule.publicClass>(): privateModule.publicClass;  // Error
+        myMethod<T extends privateModule.publicClass>(): privateModule.publicClass;  // Error
+    }
+    export class publicClassWithWithPrivateModuleTypeParameters {
+        static myPublicStaticMethod<T extends privateModule.publicClass>() {  // Error
+        }
+        myPublicMethod<T extends privateModule.publicClass>() {  // Error
+        }
+    }
+    export function publicFunctionWithPrivateMopduleTypeParameters<T extends privateModule.publicClass>() {  // Error
+    }
+
+
+    interface privateInterfaceWithPrivatModuleTypeParameters {
+        new <T extends privateModule.publicClass>(): privateModule.publicClass;  
+        <T extends privateModule.publicClass>(): privateModule.publicClass;  
+        myMethod<T extends privateModule.publicClass>(): privateModule.publicClass;  
+    }
+    class privateClassWithWithPrivateModuleTypeParameters {
+        static myPublicStaticMethod<T extends privateModule.publicClass>() {  
+        }
+        myPublicMethod<T extends privateModule.publicClass>() { 
+        }
+    }
+    function privateFunctionWithPrivateMopduleTypeParameters<T extends privateModule.publicClass>() { 
+    }
+
+}
+
+module privateModule {
+    class privateClass {
+    }
+
+    export class publicClass {
+    }
+
+    export interface publicInterfaceWithPrivateTypeParameters {
+        new <T extends privateClass>(): privateClass; 
+        <T extends privateClass>(): privateClass;
+        myMethod<T extends privateClass>(): privateClass; 
+    }
+
+    export interface publicInterfaceWithPublicTypeParameters {
+        new <T extends publicClass>(): publicClass;
+        <T extends publicClass>(): publicClass;
+        myMethod<T extends publicClass>(): publicClass;
+    }
+
+    interface privateInterfaceWithPrivateTypeParameters {
+        new <T extends privateClass>(): privateClass;
+        <T extends privateClass>(): privateClass;
+        myMethod<T extends privateClass>(): privateClass;
+    }
+
+    interface privateInterfaceWithPublicTypeParameters {
+        new <T extends publicClass>(): publicClass;
+        <T extends publicClass>(): publicClass;
+        myMethod<T extends publicClass>(): publicClass;
+    }
+
+    export class publicClassWithWithPrivateTypeParameters {
+        static myPublicStaticMethod<T extends privateClass>() { 
+        }
+        private static myPrivateStaticMethod<T extends privateClass>() {
+        }
+        myPublicMethod<T extends privateClass>() {  
+        }
+        private myPrivateMethod<T extends privateClass>() {
+        }
+    }
+
+    export class publicClassWithWithPublicTypeParameters {
+        static myPublicStaticMethod<T extends publicClass>() {
+        }
+        private static myPrivateStaticMethod<T extends publicClass>() {
+        }
+        myPublicMethod<T extends publicClass>() {
+        }
+        private myPrivateMethod<T extends publicClass>() {
+        }
+    }
+
+    class privateClassWithWithPrivateTypeParameters {
+        static myPublicStaticMethod<T extends privateClass>() {
+        }
+        private static myPrivateStaticMethod<T extends privateClass>() {
+        }
+        myPublicMethod<T extends privateClass>() {
+        }
+        private myPrivateMethod<T extends privateClass>() {
+        }
+    }
+
+    class privateClassWithWithPublicTypeParameters {
+        static myPublicStaticMethod<T extends publicClass>() {
+        }
+        private static myPrivateStaticMethod<T extends publicClass>() {
+        }
+        myPublicMethod<T extends publicClass>() {
+        }
+        private myPrivateMethod<T extends publicClass>() {
+        }
+    }
+
+    export function publicFunctionWithPrivateTypeParameters<T extends privateClass>() { 
+    }
+
+    export function publicFunctionWithPublicTypeParameters<T extends publicClass>() {
+    }
+
+    function privateFunctionWithPrivateTypeParameters<T extends privateClass>() {
+    }
+
+    function privateFunctionWithPublicTypeParameters<T extends publicClass>() {
+    }
+
+    export interface publicInterfaceWithPublicTypeParametersWithoutExtends {
+        new <T>(): publicClass;
+        <T>(): publicClass;
+        myMethod<T>(): publicClass;
+    }
+
+    interface privateInterfaceWithPublicTypeParametersWithoutExtends {
+        new <T>(): publicClass;
+        <T>(): publicClass;
+        myMethod<T>(): publicClass;
+    }
+
+    export class publicClassWithWithPublicTypeParametersWithoutExtends {
+        static myPublicStaticMethod<T>() {
+        }
+        private static myPrivateStaticMethod<T>() {
+        }
+        myPublicMethod<T>() {
+        }
+        private myPrivateMethod<T>() {
+        }
+    }
+    class privateClassWithWithPublicTypeParametersWithoutExtends {
+        static myPublicStaticMethod<T>() {
+        }
+        private static myPrivateStaticMethod<T>() {
+        }
+        myPublicMethod<T>() {
+        }
+        private myPrivateMethod<T>() {
+        }
+    }
+
+    export function publicFunctionWithPublicTypeParametersWithoutExtends<T>() {
+    }
+
+    function privateFunctionWithPublicTypeParametersWithoutExtends<T>() {
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/privacyTypeParametersOfClass.ts b/tests/cases/compiler/privacyTypeParametersOfClass.ts
index 59f771ef718..e7b520e58ca 100644
--- a/tests/cases/compiler/privacyTypeParametersOfClass.ts
+++ b/tests/cases/compiler/privacyTypeParametersOfClass.ts
@@ -1,3 +1,4 @@
+// @module: commonjs
 class privateClass {
 }
 
diff --git a/tests/cases/compiler/privacyTypeParametersOfClassDeclFile.ts b/tests/cases/compiler/privacyTypeParametersOfClassDeclFile.ts
new file mode 100644
index 00000000000..dcc21ca362a
--- /dev/null
+++ b/tests/cases/compiler/privacyTypeParametersOfClassDeclFile.ts
@@ -0,0 +1,155 @@
+// @module: commonjs
+// @declaration: true
+class privateClass {
+}
+
+export class publicClass {
+}
+
+export class publicClassWithPrivateTypeParameters<T extends privateClass> { // Error
+    myMethod(val: T): T {
+        return val;
+    }
+}
+
+export class publicClassWithPublicTypeParameters<T extends publicClass> {
+    myMethod(val: T): T {
+        return val;
+    }
+}
+
+class privateClassWithPrivateTypeParameters<T extends privateClass> {
+    myMethod(val: T): T {
+        return val;
+    }
+}
+
+class privateClassWithPublicTypeParameters<T extends publicClass> {
+    myMethod(val: T): T { 
+        return val;
+    }
+}
+
+export class publicClassWithPublicTypeParametersWithoutExtends<T> {
+    myMethod(val: T): T { 
+        return val;
+    }
+}
+
+class privateClassWithPublicTypeParametersWithoutExtends<T> {
+    myMethod(val: T): T { 
+        return val;
+    }
+}
+
+export class publicClassWithTypeParametersFromPrivateModule<T extends privateModule.publicClassInPrivateModule> { // Error
+    myMethod(val: T): T {
+        return val;
+    }
+}
+
+class privateClassWithTypeParametersFromPrivateModule<T extends privateModule.publicClassInPrivateModule> {
+    myMethod(val: T): T {
+        return val;
+    }
+}
+
+export module publicModule {
+    class privateClassInPublicModule {
+    }
+
+    export class publicClassInPublicModule {
+    }
+
+    export class publicClassWithPrivateTypeParameters<T extends privateClassInPublicModule> { // Error
+        myMethod(val: T): T {
+            return val;
+        }
+    }
+
+    export class publicClassWithPublicTypeParameters<T extends publicClassInPublicModule> {
+        myMethod(val: T): T {
+            return val;
+        }
+    }
+
+    class privateClassWithPrivateTypeParameters<T extends privateClassInPublicModule> {
+        myMethod(val: T): T {
+            return val;
+        }
+    }
+
+    class privateClassWithPublicTypeParameters<T extends publicClassInPublicModule> {
+        myMethod(val: T): T {
+            return val;
+        }
+    }
+
+    export class publicClassWithPublicTypeParametersWithoutExtends<T> {
+        myMethod(val: T): T {
+            return val;
+        }
+    }
+
+    class privateClassWithPublicTypeParametersWithoutExtends<T> {
+        myMethod(val: T): T {
+            return val;
+        }
+    }
+
+    export class publicClassWithTypeParametersFromPrivateModule<T extends privateModule.publicClassInPrivateModule> { // Error
+        myMethod(val: T): T {
+            return val;
+        }
+    }
+
+    class privateClassWithTypeParametersFromPrivateModule<T extends privateModule.publicClassInPrivateModule> {
+        myMethod(val: T): T {
+            return val;
+        }
+    }
+}
+
+module privateModule {
+    class privateClassInPrivateModule {
+    }
+
+    export class publicClassInPrivateModule {
+    }
+
+    export class publicClassWithPrivateTypeParameters<T extends privateClassInPrivateModule> {
+        myMethod(val: T): T {
+            return val;
+        }
+    }
+
+    export class publicClassWithPublicTypeParameters<T extends publicClassInPrivateModule> {
+        myMethod(val: T): T {
+            return val;
+        }
+    }
+
+    class privateClassWithPrivateTypeParameters<T extends privateClassInPrivateModule> {
+        myMethod(val: T): T {
+            return val;
+        }
+    }
+
+    class privateClassWithPublicTypeParameters<T extends publicClassInPrivateModule> {
+        myMethod(val: T): T {
+            return val;
+        }
+    }
+
+    export class publicClassWithPublicTypeParametersWithoutExtends<T> {
+        myMethod(val: T): T {
+            return val;
+        }
+    }
+
+    class privateClassWithPublicTypeParametersWithoutExtends<T> {
+        myMethod(val: T): T {
+            return val;
+        }
+    }
+}
diff --git a/tests/cases/compiler/privacyTypeParametersOfInterface.ts b/tests/cases/compiler/privacyTypeParametersOfInterface.ts
index fedb16be766..c61174a37c0 100644
--- a/tests/cases/compiler/privacyTypeParametersOfInterface.ts
+++ b/tests/cases/compiler/privacyTypeParametersOfInterface.ts
@@ -1,3 +1,4 @@
+// @module: commonjs
 class privateClass {
 }
 
diff --git a/tests/cases/compiler/privacyTypeParametersOfInterfaceDeclFile.ts b/tests/cases/compiler/privacyTypeParametersOfInterfaceDeclFile.ts
new file mode 100644
index 00000000000..55984b46ccb
--- /dev/null
+++ b/tests/cases/compiler/privacyTypeParametersOfInterfaceDeclFile.ts
@@ -0,0 +1,192 @@
+// @module: commonjs
+// @declaration: true
+class privateClass {
+}
+
+export class publicClass {
+}
+
+class privateClassT<T> {
+}
+
+export class publicClassT<T> {
+}
+
+export interface publicInterfaceWithPrivateTypeParameters<T extends privateClass> { // Error
+    myMethod(val: T): T;
+    myMethod0(): publicClassT<T>;
+    myMethod1(): privateClassT<privateClass>; 
+    myMethod2(): privateClassT<publicClass>;
+    myMethod3(): publicClassT<privateClass>;
+    myMethod4(): publicClassT<publicClass>; 
+}
+
+export interface publicInterfaceWithPublicTypeParameters<T extends publicClass> {
+    myMethod(val: T): T;
+    myMethod0(): publicClassT<T>
+    myMethod1(): privateClassT<privateClass>;
+    myMethod2(): privateClassT<publicClass>;
+    myMethod3(): publicClassT<privateClass>;
+    myMethod4(): publicClassT<publicClass>;
+}
+
+interface privateInterfaceWithPrivateTypeParameters<T extends privateClass> {
+    myMethod(val: T): T;
+    myMethod0(): publicClassT<T>;
+    myMethod1(): privateClassT<privateClass>;
+    myMethod2(): privateClassT<publicClass>;
+    myMethod3(): publicClassT<privateClass>;
+    myMethod4(): publicClassT<publicClass>;
+}
+
+interface privateInterfaceWithPublicTypeParameters<T extends publicClass> {
+    myMethod(val: T): T;
+    myMethod0(): publicClassT<T>;
+    myMethod1(): privateClassT<privateClass>;
+    myMethod2(): privateClassT<publicClass>;
+    myMethod3(): publicClassT<privateClass>;
+    myMethod4(): publicClassT<publicClass>;
+}
+
+export interface publicInterfaceWithPublicTypeParametersWithoutExtends<T> {
+    myMethod(val: T): T;
+    myMethod0(): publicClassT<T>;
+}
+
+interface privateInterfaceWithPublicTypeParametersWithoutExtends<T> {
+    myMethod(val: T): T;
+    myMethod0(): publicClassT<T>;
+}
+
+
+export interface publicInterfaceWithPrivateModuleTypeParameterConstraints<T extends privateModule.publicClassInPrivateModule> { // Error
+}
+
+interface privateInterfaceWithPrivateModuleTypeParameterConstraints<T extends privateModule.publicClassInPrivateModule> { // Error
+}
+
+export module publicModule {
+    class privateClassInPublicModule {
+    }
+
+    export class publicClassInPublicModule {
+    }
+
+    class privateClassInPublicModuleT<T> {
+    }
+
+    export class publicClassInPublicModuleT<T> {
+    }
+
+    export interface publicInterfaceWithPrivateTypeParameters<T extends privateClassInPublicModule> { // Error
+        myMethod(val: T): T;
+        myMethod0(): publicClassInPublicModuleT<T>;
+        myMethod1(): privateClassInPublicModuleT<privateClassInPublicModule>;
+        myMethod2(): privateClassInPublicModuleT<publicClassInPublicModule>;
+        myMethod3(): publicClassInPublicModuleT<privateClassInPublicModule>;
+        myMethod4(): publicClassInPublicModuleT<publicClassInPublicModule>;
+    }
+
+    export interface publicInterfaceWithPublicTypeParameters<T extends publicClassInPublicModule> {
+        myMethod(val: T): T;
+        myMethod0(): publicClassInPublicModuleT<T>
+        myMethod1(): privateClassInPublicModuleT<privateClassInPublicModule>;
+        myMethod2(): privateClassInPublicModuleT<publicClassInPublicModule>;
+        myMethod3(): publicClassInPublicModuleT<privateClassInPublicModule>;
+        myMethod4(): publicClassInPublicModuleT<publicClassInPublicModule>;
+    }
+
+    interface privateInterfaceWithPrivateTypeParameters<T extends privateClassInPublicModule> {
+        myMethod(val: T): T;
+        myMethod0(): publicClassInPublicModuleT<T>;
+        myMethod1(): privateClassInPublicModuleT<privateClassInPublicModule>;
+        myMethod2(): privateClassInPublicModuleT<publicClassInPublicModule>;
+        myMethod3(): publicClassInPublicModuleT<privateClassInPublicModule>;
+        myMethod4(): publicClassInPublicModuleT<publicClassInPublicModule>;
+    }
+
+    interface privateInterfaceWithPublicTypeParameters<T extends publicClassInPublicModule> {
+        myMethod(val: T): T;
+        myMethod0(): publicClassInPublicModuleT<T>;
+        myMethod1(): privateClassInPublicModuleT<privateClassInPublicModule>;
+        myMethod2(): privateClassInPublicModuleT<publicClassInPublicModule>;
+        myMethod3(): publicClassInPublicModuleT<privateClassInPublicModule>;
+        myMethod4(): publicClassInPublicModuleT<publicClassInPublicModule>;
+    }
+
+    export interface publicInterfaceWithPublicTypeParametersWithoutExtends<T> {
+        myMethod(val: T): T;
+        myMethod0(): publicClassInPublicModuleT<T>;
+    }
+
+    interface privateInterfaceWithPublicTypeParametersWithoutExtends<T> {
+        myMethod(val: T): T;
+        myMethod0(): publicClassInPublicModuleT<T>;
+    }
+
+    export interface publicInterfaceWithPrivateModuleTypeParameterConstraints<T extends privateModule.publicClassInPrivateModule> { // Error
+    }
+
+    interface privateInterfaceWithPrivateModuleTypeParameterConstraints<T extends privateModule.publicClassInPrivateModule> { // Error
+    }
+}
+
+module privateModule {
+    class privateClassInPrivateModule {
+    }
+
+    export class publicClassInPrivateModule {
+    }
+
+    class privateClassInPrivateModuleT<T> {
+    }
+
+    export class publicClassInPrivateModuleT<T> {
+    }
+
+    export interface publicInterfaceWithPrivateTypeParameters<T extends privateClassInPrivateModule> {
+        myMethod(val: T): T;
+        myMethod0(): publicClassInPrivateModuleT<T>;
+        myMethod1(): privateClassInPrivateModuleT<privateClassInPrivateModule>;
+        myMethod2(): privateClassInPrivateModuleT<publicClassInPrivateModule>;
+        myMethod3(): publicClassInPrivateModuleT<privateClassInPrivateModule>;
+        myMethod4(): publicClassInPrivateModuleT<publicClassInPrivateModule>;
+    }
+
+    export interface publicInterfaceWithPublicTypeParameters<T extends publicClassInPrivateModule> {
+        myMethod(val: T): T;
+        myMethod0(): publicClassInPrivateModuleT<T>
+        myMethod1(): privateClassInPrivateModuleT<privateClassInPrivateModule>;
+        myMethod2(): privateClassInPrivateModuleT<publicClassInPrivateModule>;
+        myMethod3(): publicClassInPrivateModuleT<privateClassInPrivateModule>;
+        myMethod4(): publicClassInPrivateModuleT<publicClassInPrivateModule>;
+    }
+
+    interface privateInterfaceWithPrivateTypeParameters<T extends privateClassInPrivateModule> {
+        myMethod(val: T): T;
+        myMethod0(): publicClassInPrivateModuleT<T>;
+        myMethod1(): privateClassInPrivateModuleT<privateClassInPrivateModule>;
+        myMethod2(): privateClassInPrivateModuleT<publicClassInPrivateModule>;
+        myMethod3(): publicClassInPrivateModuleT<privateClassInPrivateModule>;
+        myMethod4(): publicClassInPrivateModuleT<publicClassInPrivateModule>;
+    }
+
+    interface privateInterfaceWithPublicTypeParameters<T extends publicClassInPrivateModule> {
+        myMethod(val: T): T;
+        myMethod0(): publicClassInPrivateModuleT<T>;
+        myMethod1(): privateClassInPrivateModuleT<privateClassInPrivateModule>;
+        myMethod2(): privateClassInPrivateModuleT<publicClassInPrivateModule>;
+        myMethod3(): publicClassInPrivateModuleT<privateClassInPrivateModule>;
+        myMethod4(): publicClassInPrivateModuleT<publicClassInPrivateModule>;
+    }
+
+    export interface publicInterfaceWithPublicTypeParametersWithoutExtends<T> {
+        myMethod(val: T): T;
+        myMethod0(): publicClassInPrivateModuleT<T>;
+    }
+
+    interface privateInterfaceWithPublicTypeParametersWithoutExtends<T> {
+        myMethod(val: T): T;
+        myMethod0(): publicClassInPrivateModuleT<T>;
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/privacyVarDeclFile.ts b/tests/cases/compiler/privacyVarDeclFile.ts
new file mode 100644
index 00000000000..46012bc9d9f
--- /dev/null
+++ b/tests/cases/compiler/privacyVarDeclFile.ts
@@ -0,0 +1,426 @@
+// @module: commonjs
+// @declaration: true
+
+// @Filename:privacyVarDeclFile_externalModule.ts
+class privateClass {
+}
+
+export class publicClass {
+}
+
+export interface publicInterfaceWithPrivatePropertyTypes {
+    myProperty: privateClass;  // Error
+}
+
+export interface publicInterfaceWithPublicPropertyTypes {
+    myProperty: publicClass;
+}
+
+interface privateInterfaceWithPrivatePropertyTypes {
+    myProperty: privateClass;
+}
+
+interface privateInterfaceWithPublicPropertyTypes {
+    myProperty: publicClass;
+}
+
+export class publicClassWithWithPrivatePropertyTypes {
+    static myPublicStaticProperty: privateClass; // Error
+    private static myPrivateStaticProperty: privateClass;
+    myPublicProperty: privateClass; // Error
+    private myPrivateProperty: privateClass;
+}
+
+export class publicClassWithWithPublicPropertyTypes {
+    static myPublicStaticProperty: publicClass;
+    private static myPrivateStaticProperty: publicClass;
+    myPublicProperty: publicClass;
+    private myPrivateProperty: publicClass;
+}
+
+class privateClassWithWithPrivatePropertyTypes {
+    static myPublicStaticProperty: privateClass;
+    private static myPrivateStaticProperty: privateClass;
+    myPublicProperty: privateClass;
+    private myPrivateProperty: privateClass;
+}
+
+class privateClassWithWithPublicPropertyTypes {
+    static myPublicStaticProperty: publicClass;
+    private static myPrivateStaticProperty: publicClass;
+    myPublicProperty: publicClass;
+    private myPrivateProperty: publicClass;
+}
+
+export var publicVarWithPrivatePropertyTypes: privateClass; // Error
+export var publicVarWithPublicPropertyTypes: publicClass;
+var privateVarWithPrivatePropertyTypes: privateClass;
+var privateVarWithPublicPropertyTypes: publicClass;
+
+export declare var publicAmbientVarWithPrivatePropertyTypes: privateClass; // Error
+export declare var publicAmbientVarWithPublicPropertyTypes: publicClass;
+declare var privateAmbientVarWithPrivatePropertyTypes: privateClass;
+declare var privateAmbientVarWithPublicPropertyTypes: publicClass;
+
+export interface publicInterfaceWithPrivateModulePropertyTypes {
+    myProperty: privateModule.publicClass; // Error
+}
+export class publicClassWithPrivateModulePropertyTypes {
+    static myPublicStaticProperty: privateModule.publicClass; // Error
+    myPublicProperty: privateModule.publicClass; // Error
+}
+export var publicVarWithPrivateModulePropertyTypes: privateModule.publicClass; // Error
+export declare var publicAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass; // Error
+
+interface privateInterfaceWithPrivateModulePropertyTypes {
+    myProperty: privateModule.publicClass;
+}
+class privateClassWithPrivateModulePropertyTypes {
+    static myPublicStaticProperty: privateModule.publicClass;
+    myPublicProperty: privateModule.publicClass;
+}
+var privateVarWithPrivateModulePropertyTypes: privateModule.publicClass;
+declare var privateAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass;
+
+export module publicModule {
+    class privateClass {
+    }
+
+    export class publicClass {
+    }
+
+    export interface publicInterfaceWithPrivatePropertyTypes {
+        myProperty: privateClass;  // Error
+    }
+
+    export interface publicInterfaceWithPublicPropertyTypes {
+        myProperty: publicClass;
+    }
+
+    interface privateInterfaceWithPrivatePropertyTypes {
+        myProperty: privateClass;
+    }
+
+    interface privateInterfaceWithPublicPropertyTypes {
+        myProperty: publicClass;
+    }
+
+    export class publicClassWithWithPrivatePropertyTypes {
+        static myPublicStaticProperty: privateClass; // Error
+        private static myPrivateStaticProperty: privateClass;
+        myPublicProperty: privateClass; // Error
+        private myPrivateProperty: privateClass;
+    }
+
+    export class publicClassWithWithPublicPropertyTypes {
+        static myPublicStaticProperty: publicClass;
+        private static myPrivateStaticProperty: publicClass;
+        myPublicProperty: publicClass;
+        private myPrivateProperty: publicClass;
+    }
+
+    class privateClassWithWithPrivatePropertyTypes {
+        static myPublicStaticProperty: privateClass;
+        private static myPrivateStaticProperty: privateClass;
+        myPublicProperty: privateClass;
+        private myPrivateProperty: privateClass;
+    }
+
+    class privateClassWithWithPublicPropertyTypes {
+        static myPublicStaticProperty: publicClass;
+        private static myPrivateStaticProperty: publicClass;
+        myPublicProperty: publicClass;
+        private myPrivateProperty: publicClass;
+    }
+
+    export var publicVarWithPrivatePropertyTypes: privateClass; // Error
+    export var publicVarWithPublicPropertyTypes: publicClass;
+    var privateVarWithPrivatePropertyTypes: privateClass;
+    var privateVarWithPublicPropertyTypes: publicClass;
+
+    export declare var publicAmbientVarWithPrivatePropertyTypes: privateClass; // Error
+    export declare var publicAmbientVarWithPublicPropertyTypes: publicClass;
+    declare var privateAmbientVarWithPrivatePropertyTypes: privateClass;
+    declare var privateAmbientVarWithPublicPropertyTypes: publicClass;
+
+    export interface publicInterfaceWithPrivateModulePropertyTypes {
+        myProperty: privateModule.publicClass; // Error
+    }
+    export class publicClassWithPrivateModulePropertyTypes {
+        static myPublicStaticProperty: privateModule.publicClass; // Error
+        myPublicProperty: privateModule.publicClass; // Error
+    }
+    export var publicVarWithPrivateModulePropertyTypes: privateModule.publicClass; // Error
+    export declare var publicAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass; // Error
+
+    interface privateInterfaceWithPrivateModulePropertyTypes {
+        myProperty: privateModule.publicClass;
+    }
+    class privateClassWithPrivateModulePropertyTypes {
+        static myPublicStaticProperty: privateModule.publicClass;
+        myPublicProperty: privateModule.publicClass;
+    }
+    var privateVarWithPrivateModulePropertyTypes: privateModule.publicClass;
+    declare var privateAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass;
+}
+
+module privateModule {
+    class privateClass {
+    }
+
+    export class publicClass {
+    }
+
+    export interface publicInterfaceWithPrivatePropertyTypes {
+        myProperty: privateClass;  
+    }
+
+    export interface publicInterfaceWithPublicPropertyTypes {
+        myProperty: publicClass;
+    }
+
+    interface privateInterfaceWithPrivatePropertyTypes {
+        myProperty: privateClass;
+    }
+
+    interface privateInterfaceWithPublicPropertyTypes {
+        myProperty: publicClass;
+    }
+
+    export class publicClassWithWithPrivatePropertyTypes {
+        static myPublicStaticProperty: privateClass; 
+        private static myPrivateStaticProperty: privateClass;
+        myPublicProperty: privateClass; 
+        private myPrivateProperty: privateClass;
+    }
+
+    export class publicClassWithWithPublicPropertyTypes {
+        static myPublicStaticProperty: publicClass;
+        private static myPrivateStaticProperty: publicClass;
+        myPublicProperty: publicClass;
+        private myPrivateProperty: publicClass;
+    }
+
+    class privateClassWithWithPrivatePropertyTypes {
+        static myPublicStaticProperty: privateClass;
+        private static myPrivateStaticProperty: privateClass;
+        myPublicProperty: privateClass;
+        private myPrivateProperty: privateClass;
+    }
+
+    class privateClassWithWithPublicPropertyTypes {
+        static myPublicStaticProperty: publicClass;
+        private static myPrivateStaticProperty: publicClass;
+        myPublicProperty: publicClass;
+        private myPrivateProperty: publicClass;
+    }
+
+    export var publicVarWithPrivatePropertyTypes: privateClass; 
+    export var publicVarWithPublicPropertyTypes: publicClass;
+    var privateVarWithPrivatePropertyTypes: privateClass;
+    var privateVarWithPublicPropertyTypes: publicClass;
+
+    export declare var publicAmbientVarWithPrivatePropertyTypes: privateClass; 
+    export declare var publicAmbientVarWithPublicPropertyTypes: publicClass;
+    declare var privateAmbientVarWithPrivatePropertyTypes: privateClass;
+    declare var privateAmbientVarWithPublicPropertyTypes: publicClass;
+
+    export interface publicInterfaceWithPrivateModulePropertyTypes {
+        myProperty: privateModule.publicClass; 
+    }
+    export class publicClassWithPrivateModulePropertyTypes {
+        static myPublicStaticProperty: privateModule.publicClass; 
+        myPublicProperty: privateModule.publicClass; 
+    }
+    export var publicVarWithPrivateModulePropertyTypes: privateModule.publicClass; 
+    export declare var publicAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass;
+
+    interface privateInterfaceWithPrivateModulePropertyTypes {
+        myProperty: privateModule.publicClass;
+    }
+    class privateClassWithPrivateModulePropertyTypes {
+        static myPublicStaticProperty: privateModule.publicClass;
+        myPublicProperty: privateModule.publicClass;
+    }
+    var privateVarWithPrivateModulePropertyTypes: privateModule.publicClass;
+    declare var privateAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass;
+}
+
+// @Filename: privacyVarDeclFile_GlobalFile.ts
+class publicClassInGlobal {
+}
+interface publicInterfaceWithPublicPropertyTypesInGlobal {
+    myProperty: publicClassInGlobal;
+}
+class publicClassWithWithPublicPropertyTypesInGlobal {
+    static myPublicStaticProperty: publicClassInGlobal;
+    private static myPrivateStaticProperty: publicClassInGlobal;
+    myPublicProperty: publicClassInGlobal;
+    private myPrivateProperty: publicClassInGlobal;
+}
+var publicVarWithPublicPropertyTypesInGlobal: publicClassInGlobal;
+declare var publicAmbientVarWithPublicPropertyTypesInGlobal: publicClassInGlobal;
+
+module publicModuleInGlobal {
+    class privateClass {
+    }
+
+    export class publicClass {
+    }
+
+    module privateModule {
+        class privateClass {
+        }
+
+        export class publicClass {
+        }
+
+        export interface publicInterfaceWithPrivatePropertyTypes {
+            myProperty: privateClass;
+        }
+
+        export interface publicInterfaceWithPublicPropertyTypes {
+            myProperty: publicClass;
+        }
+
+        interface privateInterfaceWithPrivatePropertyTypes {
+            myProperty: privateClass;
+        }
+
+        interface privateInterfaceWithPublicPropertyTypes {
+            myProperty: publicClass;
+        }
+
+        export class publicClassWithWithPrivatePropertyTypes {
+            static myPublicStaticProperty: privateClass;
+            private static myPrivateStaticProperty: privateClass;
+            myPublicProperty: privateClass;
+            private myPrivateProperty: privateClass;
+        }
+
+        export class publicClassWithWithPublicPropertyTypes {
+            static myPublicStaticProperty: publicClass;
+            private static myPrivateStaticProperty: publicClass;
+            myPublicProperty: publicClass;
+            private myPrivateProperty: publicClass;
+        }
+
+        class privateClassWithWithPrivatePropertyTypes {
+            static myPublicStaticProperty: privateClass;
+            private static myPrivateStaticProperty: privateClass;
+            myPublicProperty: privateClass;
+            private myPrivateProperty: privateClass;
+        }
+
+        class privateClassWithWithPublicPropertyTypes {
+            static myPublicStaticProperty: publicClass;
+            private static myPrivateStaticProperty: publicClass;
+            myPublicProperty: publicClass;
+            private myPrivateProperty: publicClass;
+        }
+
+        export var publicVarWithPrivatePropertyTypes: privateClass;
+        export var publicVarWithPublicPropertyTypes: publicClass;
+        var privateVarWithPrivatePropertyTypes: privateClass;
+        var privateVarWithPublicPropertyTypes: publicClass;
+
+        export declare var publicAmbientVarWithPrivatePropertyTypes: privateClass;
+        export declare var publicAmbientVarWithPublicPropertyTypes: publicClass;
+        declare var privateAmbientVarWithPrivatePropertyTypes: privateClass;
+        declare var privateAmbientVarWithPublicPropertyTypes: publicClass;
+
+        export interface publicInterfaceWithPrivateModulePropertyTypes {
+            myProperty: privateModule.publicClass;
+        }
+        export class publicClassWithPrivateModulePropertyTypes {
+            static myPublicStaticProperty: privateModule.publicClass;
+            myPublicProperty: privateModule.publicClass;
+        }
+        export var publicVarWithPrivateModulePropertyTypes: privateModule.publicClass;
+        export declare var publicAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass;
+
+        interface privateInterfaceWithPrivateModulePropertyTypes {
+            myProperty: privateModule.publicClass;
+        }
+        class privateClassWithPrivateModulePropertyTypes {
+            static myPublicStaticProperty: privateModule.publicClass;
+            myPublicProperty: privateModule.publicClass;
+        }
+        var privateVarWithPrivateModulePropertyTypes: privateModule.publicClass;
+        declare var privateAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass;
+    }
+
+    export interface publicInterfaceWithPrivatePropertyTypes {
+        myProperty: privateClass;  // Error
+    }
+
+    export interface publicInterfaceWithPublicPropertyTypes {
+        myProperty: publicClass;
+    }
+
+    interface privateInterfaceWithPrivatePropertyTypes {
+        myProperty: privateClass;
+    }
+
+    interface privateInterfaceWithPublicPropertyTypes {
+        myProperty: publicClass;
+    }
+
+    export class publicClassWithWithPrivatePropertyTypes {
+        static myPublicStaticProperty: privateClass; // Error
+        private static myPrivateStaticProperty: privateClass;
+        myPublicProperty: privateClass; // Error
+        private myPrivateProperty: privateClass;
+    }
+
+    export class publicClassWithWithPublicPropertyTypes {
+        static myPublicStaticProperty: publicClass;
+        private static myPrivateStaticProperty: publicClass;
+        myPublicProperty: publicClass;
+        private myPrivateProperty: publicClass;
+    }
+
+    class privateClassWithWithPrivatePropertyTypes {
+        static myPublicStaticProperty: privateClass;
+        private static myPrivateStaticProperty: privateClass;
+        myPublicProperty: privateClass;
+        private myPrivateProperty: privateClass;
+    }
+
+    class privateClassWithWithPublicPropertyTypes {
+        static myPublicStaticProperty: publicClass;
+        private static myPrivateStaticProperty: publicClass;
+        myPublicProperty: publicClass;
+        private myPrivateProperty: publicClass;
+    }
+
+    export var publicVarWithPrivatePropertyTypes: privateClass; // Error
+    export var publicVarWithPublicPropertyTypes: publicClass;
+    var privateVarWithPrivatePropertyTypes: privateClass;
+    var privateVarWithPublicPropertyTypes: publicClass;
+
+    export declare var publicAmbientVarWithPrivatePropertyTypes: privateClass; // Error
+    export declare var publicAmbientVarWithPublicPropertyTypes: publicClass;
+    declare var privateAmbientVarWithPrivatePropertyTypes: privateClass;
+    declare var privateAmbientVarWithPublicPropertyTypes: publicClass;
+
+    export interface publicInterfaceWithPrivateModulePropertyTypes {
+        myProperty: privateModule.publicClass; // Error
+    }
+    export class publicClassWithPrivateModulePropertyTypes {
+        static myPublicStaticProperty: privateModule.publicClass; // Error
+        myPublicProperty: privateModule.publicClass; // Error
+    }
+    export var publicVarWithPrivateModulePropertyTypes: privateModule.publicClass; // Error
+    export declare var publicAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass; // Error
+
+    interface privateInterfaceWithPrivateModulePropertyTypes {
+        myProperty: privateModule.publicClass;
+    }
+    class privateClassWithPrivateModulePropertyTypes {
+        static myPublicStaticProperty: privateModule.publicClass;
+        myPublicProperty: privateModule.publicClass;
+    }
+    var privateVarWithPrivateModulePropertyTypes: privateModule.publicClass;
+    declare var privateAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass;
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/promiseChaining.ts b/tests/cases/compiler/promiseChaining.ts
index 824fc1718ac..8da2853830b 100644
--- a/tests/cases/compiler/promiseChaining.ts
+++ b/tests/cases/compiler/promiseChaining.ts
@@ -1,34 +1,10 @@
-<<<<<<< HEAD
-=======
-// This exhibits the bug that you see with Promise typings having generic signatures in a generic type
-
-// BUG 858876: should get a fresh type parameter which each then call
-
->>>>>>> d99cb83... Clean up 'blocked' tests
 class Chain<T> {
     constructor(public value: T) { }
     then<S>(cb: (x: T) => S): Chain<S> {
         var result = cb(this.value);
-<<<<<<< HEAD
         // should get a fresh type parameter which each then call
         var z = this.then(x => result)/*S*/.then(x => "abc")/*string*/.then(x => x.length)/*number*/; // No error
         return new Chain(result);
     }
 }
-=======
-        var z = this.then(x => result).then(x => "abc").then(x => x.length); 
-        return new Chain(result);
-    }
-}
 
-// same example but with constraints on each type parameter
-class Chain2<T extends { length: number }> {
-    constructor(public value: T) { }
-    then<S extends Function>(cb: (x: T) => S): Chain2<S> {
-        var result = cb(this.value);
-        // should get a fresh type parameter which each then call
-        var z = this.then(x => result).then(x => "abc").then(x => x.length);
-        return new Chain2(result);
-    }
-}
->>>>>>> d99cb83... Clean up 'blocked' tests
diff --git a/tests/cases/compiler/promiseChaining2.ts b/tests/cases/compiler/promiseChaining2.ts
index e69de29bb2d..5f990f0330b 100644
--- a/tests/cases/compiler/promiseChaining2.ts
+++ b/tests/cases/compiler/promiseChaining2.ts
@@ -0,0 +1,10 @@
+// same example but with constraints on each type parameter
+class Chain2<T extends { length: number }> {
+    constructor(public value: T) { }
+    then<S extends Function>(cb: (x: T) => S): Chain2<S> {
+        var result = cb(this.value);
+        // should get a fresh type parameter which each then call
+        var z = this.then(x => result).then(x => "abc").then(x => x.length);
+        return new Chain2(result);
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/propertyParameterWithQuestionMark.ts b/tests/cases/compiler/propertyParameterWithQuestionMark.ts
new file mode 100644
index 00000000000..1a0eedb799e
--- /dev/null
+++ b/tests/cases/compiler/propertyParameterWithQuestionMark.ts
@@ -0,0 +1,9 @@
+class C {
+    constructor(public x?) { }
+}
+
+// x should not be an optional property
+var v: C = {}; // Should fail
+var v2: { x? }
+v = v2; // Should fail
+var v3: { x } = new C; // Should succeed
\ No newline at end of file
diff --git a/tests/cases/compiler/regExpWithSlashInCharClass.ts b/tests/cases/compiler/regExpWithSlashInCharClass.ts
new file mode 100644
index 00000000000..6d54f8779e0
--- /dev/null
+++ b/tests/cases/compiler/regExpWithSlashInCharClass.ts
@@ -0,0 +1,3 @@
+var foo1 = "a/".replace(/.[/]/, "");
+var foo2 = "a//".replace(/.[//]/g, "");
+var foo3 = "a/".replace(/.[/no sleep /till/]/, "bugfix");
diff --git a/tests/cases/compiler/reservedNameOnInterfaceImport.ts b/tests/cases/compiler/reservedNameOnInterfaceImport.ts
new file mode 100644
index 00000000000..0a706a9acba
--- /dev/null
+++ b/tests/cases/compiler/reservedNameOnInterfaceImport.ts
@@ -0,0 +1,6 @@
+declare module test {
+    interface istring { }
+
+    // Should error; 'test.istring' is a type, so this import conflicts with the 'string' type.
+    import string = test.istring;
+}
diff --git a/tests/cases/compiler/reservedNameOnModuleImport.ts b/tests/cases/compiler/reservedNameOnModuleImport.ts
new file mode 100644
index 00000000000..de0344f56f3
--- /dev/null
+++ b/tests/cases/compiler/reservedNameOnModuleImport.ts
@@ -0,0 +1,6 @@
+declare module test {
+    module mstring { }
+
+    // Should be fine; this does not clobber any declared values.
+    export import string = mstring;
+}
diff --git a/tests/cases/compiler/reservedNameOnModuleImportWithInterface.ts b/tests/cases/compiler/reservedNameOnModuleImportWithInterface.ts
new file mode 100644
index 00000000000..bde58f92795
--- /dev/null
+++ b/tests/cases/compiler/reservedNameOnModuleImportWithInterface.ts
@@ -0,0 +1,7 @@
+declare module test {
+    interface mi_string { }
+    module mi_string { }
+
+    // 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/cases/compiler/sourceMap-SkippedNode.ts b/tests/cases/compiler/sourceMap-SkippedNode.ts
new file mode 100644
index 00000000000..ae5674d6da0
--- /dev/null
+++ b/tests/cases/compiler/sourceMap-SkippedNode.ts
@@ -0,0 +1,6 @@
+//@sourceMap: true
+try {
+// ...
+} finally {
+// N.B. No 'catch' block
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/sourceMapValidationClass.ts b/tests/cases/compiler/sourceMapValidationClass.ts
index 1b1b8da9877..0be760d06ed 100644
--- a/tests/cases/compiler/sourceMapValidationClass.ts
+++ b/tests/cases/compiler/sourceMapValidationClass.ts
@@ -1,4 +1,5 @@
 // @sourcemap: true
+// @target: es5
 class Greeter {
     constructor(public greeting: string, ...b: string[]) {
     }
diff --git a/tests/cases/compiler/sourceMapValidationExportAssignmentCommonjs.ts b/tests/cases/compiler/sourceMapValidationExportAssignmentCommonjs.ts
new file mode 100644
index 00000000000..ccf25ae59b7
--- /dev/null
+++ b/tests/cases/compiler/sourceMapValidationExportAssignmentCommonjs.ts
@@ -0,0 +1,6 @@
+//@module: commonjs
+// @sourcemap: true
+class a {
+    public c;
+}
+export = a;
\ No newline at end of file
diff --git a/tests/cases/compiler/sourceMapWithMultipleFilesWithCopyright.ts b/tests/cases/compiler/sourceMapWithMultipleFilesWithCopyright.ts
new file mode 100644
index 00000000000..ac179835a0c
--- /dev/null
+++ b/tests/cases/compiler/sourceMapWithMultipleFilesWithCopyright.ts
@@ -0,0 +1,20 @@
+// @out: a.js
+// @sourcemap: true
+// @declaration: true
+// @Filename: a.ts
+/*--------------------------------------------------------------------------
+Copyright 
+---------------------------------------------------------------------------*/
+
+var x = {
+    a: 10,
+    b: 20
+};
+
+// @Filename: b.ts
+/*--------------------------------------------------------------------------
+Copyright 
+---------------------------------------------------------------------------*/
+
+///<reference path="a.ts"/>
+var y = x;
\ No newline at end of file
diff --git a/tests/cases/compiler/sourceMapWithMultipleFilesWithFileEndingWithInterface.ts b/tests/cases/compiler/sourceMapWithMultipleFilesWithFileEndingWithInterface.ts
new file mode 100644
index 00000000000..e7634a22b6a
--- /dev/null
+++ b/tests/cases/compiler/sourceMapWithMultipleFilesWithFileEndingWithInterface.ts
@@ -0,0 +1,18 @@
+// @out: fooResult.js
+// @sourcemap: true
+// @Filename: a.ts
+module M {
+    export var X = 1;
+}
+interface Navigator {
+    getGamepads(func?: any): any;
+    webkitGetGamepads(func?: any): any
+    msGetGamepads(func?: any): any;
+    webkitGamepads(func?: any): any;
+}
+
+// @Filename: b.ts
+module m1 {
+    export class c1 {
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/specializedLambdaTypeArguments.ts b/tests/cases/compiler/specializedLambdaTypeArguments.ts
index 95efdbfa3e7..7ef5d8bff36 100644
--- a/tests/cases/compiler/specializedLambdaTypeArguments.ts
+++ b/tests/cases/compiler/specializedLambdaTypeArguments.ts
@@ -1,5 +1,5 @@
 class X<A> {
-	prop: X< <any>() => any >;
+	prop: X< <Tany>() => Tany >;
 }
 var a: X<boolean>;
  
diff --git a/tests/cases/compiler/specializedSignatureInInterface.ts b/tests/cases/compiler/specializedSignatureInInterface.ts
new file mode 100644
index 00000000000..f9a69ccde85
--- /dev/null
+++ b/tests/cases/compiler/specializedSignatureInInterface.ts
@@ -0,0 +1,8 @@
+interface A {
+  (key:string):void;
+}
+
+interface B extends A {
+  (key:'foo'):string;
+  (key:'bar'):string;
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/staticMethodWithTypeParameterExtendsClauseDeclFile.ts b/tests/cases/compiler/staticMethodWithTypeParameterExtendsClauseDeclFile.ts
new file mode 100644
index 00000000000..48d31d92870
--- /dev/null
+++ b/tests/cases/compiler/staticMethodWithTypeParameterExtendsClauseDeclFile.ts
@@ -0,0 +1,22 @@
+// @module: commonjs
+// @declaration: true
+class privateClass {
+}
+
+export class publicClass {
+}
+
+export class publicClassWithWithPrivateTypeParameters {
+    private static myPrivateStaticMethod1<T extends privateClass>() { // do not emit extends clause
+    }
+    private myPrivateMethod1<T extends privateClass>() { // do not emit extends clause
+    }
+    private static myPrivateStaticMethod2<T extends publicClass>() { // do not emit extends clause
+    }
+    private myPrivateMethod2<T extends publicClass>() { // do not emit extends clause
+    }
+    public static myPublicStaticMethod<T extends publicClass>() {
+    }
+    public myPublicMethod<T extends publicClass>() {
+    }
+}
diff --git a/tests/cases/compiler/strictMode5.ts b/tests/cases/compiler/strictMode5.ts
new file mode 100644
index 00000000000..c980cf7c86d
--- /dev/null
+++ b/tests/cases/compiler/strictMode5.ts
@@ -0,0 +1,18 @@
+function foo(...args) {
+    "use strict"
+}
+
+class A {
+    m() {
+        "use strict"
+
+        var v = () => {
+            return this.n();
+        };
+    }
+    n() {}
+}
+
+function bar(x: number = 10) {
+    "use strict"
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/switchStatementsWithMultipleDefaults.ts b/tests/cases/compiler/switchStatementsWithMultipleDefaults.ts
new file mode 100644
index 00000000000..33a73cd4929
--- /dev/null
+++ b/tests/cases/compiler/switchStatementsWithMultipleDefaults.ts
@@ -0,0 +1,31 @@
+
+var x = 10;
+
+switch (x) {
+    case 1:
+    case 2:
+    default:    // No issues.
+        break;
+    default:    // Error; second 'default' clause.
+    default:    // Error; third 'default' clause.
+    case 3:
+        x *= x;
+}
+
+switch (x) {
+    default:    // No issues.
+        break;
+    case 100:
+        switch (x * x) {
+            default:    // No issues.
+            default:    // Error; second 'default' clause.
+                break;
+            case 10000:
+                x /= x;
+            default:    // Error, third 'default' clause
+            def\u0061ult: // Error, fourth 'default' clause.
+            // Errors on fifth-seventh
+            default: return;
+            default: default:
+        }
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/testContainerList.ts b/tests/cases/compiler/testContainerList.ts
new file mode 100644
index 00000000000..29a4fbd206c
--- /dev/null
+++ b/tests/cases/compiler/testContainerList.ts
@@ -0,0 +1,6 @@
+// Regression test for #325
+module A {
+    class C {
+        constructor(public d: {}) { }
+    }
+}
diff --git a/tests/cases/compiler/trailingCommasES3.ts b/tests/cases/compiler/trailingCommasES3.ts
new file mode 100644
index 00000000000..cc35f8e4823
--- /dev/null
+++ b/tests/cases/compiler/trailingCommasES3.ts
@@ -0,0 +1,13 @@
+// @target: es3
+
+var o1 = { a: 1, b: 2 };
+var o2 = { a: 1, b: 2, };
+var o3 = { a: 1, };
+var o4 = {};
+
+var a1 = [1, 2];
+var a2 = [1, 2, ];
+var a3 = [1, ];
+var a4 = [];
+var a5 = [1, , ];
+var a6 = [, , ];
\ No newline at end of file
diff --git a/tests/cases/compiler/trailingCommasES5.ts b/tests/cases/compiler/trailingCommasES5.ts
new file mode 100644
index 00000000000..b5518e69d90
--- /dev/null
+++ b/tests/cases/compiler/trailingCommasES5.ts
@@ -0,0 +1,13 @@
+// @target: es5
+
+var o1 = { a: 1, b: 2 };
+var o2 = { a: 1, b: 2, };
+var o3 = { a: 1, };
+var o4 = {};
+
+var a1 = [1, 2];
+var a2 = [1, 2, ];
+var a3 = [1, ];
+var a4 = [];
+var a5 = [1, , ];
+var a6 = [, , ];
\ No newline at end of file
diff --git a/tests/cases/compiler/typeParameterWithInvalidConstraintType.ts b/tests/cases/compiler/typeParameterWithInvalidConstraintType.ts
new file mode 100644
index 00000000000..7c92ad4575a
--- /dev/null
+++ b/tests/cases/compiler/typeParameterWithInvalidConstraintType.ts
@@ -0,0 +1,10 @@
+class A<T extends T> {
+    foo() {
+        var x: T;
+        // no error expected below this line
+        var a = x.foo();
+        var b = new x(123);
+        var c = x[1];
+        var d = x();
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/compiler/unusedImportDeclaration.ts b/tests/cases/compiler/unusedImportDeclaration.ts
index 83cb089acfe..263b355f69c 100644
--- a/tests/cases/compiler/unusedImportDeclaration.ts
+++ b/tests/cases/compiler/unusedImportDeclaration.ts
@@ -1,4 +1,5 @@
 //@module: commonjs
+//@declaration: true
 // @Filename: unusedImportDeclaration_testerB.ts
 class TesterB {
     me: string;
diff --git a/tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendingPrimitive2.ts b/tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendingPrimitive2.ts
new file mode 100644
index 00000000000..58b397cbd84
--- /dev/null
+++ b/tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendingPrimitive2.ts
@@ -0,0 +1,4 @@
+// classes cannot extend primitives
+
+class C4a extends void {}
+class C5a extends null { }
\ No newline at end of file
diff --git a/tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendsEveryObjectType2.ts b/tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendsEveryObjectType2.ts
new file mode 100644
index 00000000000..095c0a11544
--- /dev/null
+++ b/tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendsEveryObjectType2.ts
@@ -0,0 +1,3 @@
+class C2 extends { foo: string; } { } // error
+
+class C6 extends []{ } // error
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript3/Accessors/parserES3Accessors1.ts b/tests/cases/conformance/parser/ecmascript3/Accessors/parserES3Accessors1.ts
new file mode 100644
index 00000000000..8dadcb2f744
--- /dev/null
+++ b/tests/cases/conformance/parser/ecmascript3/Accessors/parserES3Accessors1.ts
@@ -0,0 +1,3 @@
+class C {
+    get Foo() { }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript3/Accessors/parserES3Accessors2.ts b/tests/cases/conformance/parser/ecmascript3/Accessors/parserES3Accessors2.ts
new file mode 100644
index 00000000000..99fab6497f3
--- /dev/null
+++ b/tests/cases/conformance/parser/ecmascript3/Accessors/parserES3Accessors2.ts
@@ -0,0 +1,3 @@
+class C {
+    set Foo(a) { }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript3/Accessors/parserES3Accessors3.ts b/tests/cases/conformance/parser/ecmascript3/Accessors/parserES3Accessors3.ts
new file mode 100644
index 00000000000..9941815d807
--- /dev/null
+++ b/tests/cases/conformance/parser/ecmascript3/Accessors/parserES3Accessors3.ts
@@ -0,0 +1 @@
+var v = { get Foo() { } };
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript3/Accessors/parserES3Accessors4.ts b/tests/cases/conformance/parser/ecmascript3/Accessors/parserES3Accessors4.ts
new file mode 100644
index 00000000000..c39d3375119
--- /dev/null
+++ b/tests/cases/conformance/parser/ecmascript3/Accessors/parserES3Accessors4.ts
@@ -0,0 +1 @@
+var v = { set Foo(a) { } };
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors1.ts b/tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors1.ts
index 8dadcb2f744..f44ef535b13 100644
--- a/tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors1.ts
+++ b/tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors1.ts
@@ -1,3 +1,4 @@
+// @target: es5
 class C {
     get Foo() { }
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors10.ts b/tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors10.ts
index 050e83ceec0..828bbc94914 100644
--- a/tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors10.ts
+++ b/tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors10.ts
@@ -1,3 +1,4 @@
+// @target: es5
 var v = {
   public get foo() { }
 };
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors2.ts b/tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors2.ts
index 99fab6497f3..a2ba74bdb14 100644
--- a/tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors2.ts
+++ b/tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors2.ts
@@ -1,3 +1,4 @@
+// @target: es5
 class C {
     set Foo(a) { }
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors3.ts b/tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors3.ts
index 9941815d807..ce4e80f9b74 100644
--- a/tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors3.ts
+++ b/tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors3.ts
@@ -1 +1,2 @@
+// @target: es5
 var v = { get Foo() { } };
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors4.ts b/tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors4.ts
index c39d3375119..5fc896002d7 100644
--- a/tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors4.ts
+++ b/tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors4.ts
@@ -1 +1,2 @@
+// @target: es5
 var v = { set Foo(a) { } };
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors5.ts b/tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors5.ts
index 9ccf2efa60f..3da8d3376f1 100644
--- a/tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors5.ts
+++ b/tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors5.ts
@@ -1,3 +1,4 @@
+// @target: es5
 declare class C {
   get foo() { return 0; }
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors6.ts b/tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors6.ts
index 16ba813df62..4d2aa80828b 100644
--- a/tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors6.ts
+++ b/tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors6.ts
@@ -1,3 +1,4 @@
+// @target: es5
 declare class C {
   set foo(v) { }
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors7.ts b/tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors7.ts
index b8fc3e06655..02eb7800c95 100644
--- a/tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors7.ts
+++ b/tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors7.ts
@@ -1 +1,2 @@
+// @target: es5
 var v = { get foo(v: number) { } };
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors8.ts b/tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors8.ts
index f881fd22f20..2d8af279224 100644
--- a/tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors8.ts
+++ b/tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors8.ts
@@ -1 +1,2 @@
+// @target: es5
 var v = { set foo() { } }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors9.ts b/tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors9.ts
index 4f752146c23..7f61bd2d4d6 100644
--- a/tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors9.ts
+++ b/tests/cases/conformance/parser/ecmascript5/Accessors/parserAccessors9.ts
@@ -1 +1,2 @@
+// @target: es5
 var v = { set foo(a, b) { } }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/Accessors/parserGetAccessorWithTypeParameters1.ts b/tests/cases/conformance/parser/ecmascript5/Accessors/parserGetAccessorWithTypeParameters1.ts
index 85379b5bbf1..8318b20399b 100644
--- a/tests/cases/conformance/parser/ecmascript5/Accessors/parserGetAccessorWithTypeParameters1.ts
+++ b/tests/cases/conformance/parser/ecmascript5/Accessors/parserGetAccessorWithTypeParameters1.ts
@@ -1,3 +1,4 @@
+// @target: es5
 class C {
   get foo<T>() { }
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/Accessors/parserSetAccessorWithTypeAnnotation1.ts b/tests/cases/conformance/parser/ecmascript5/Accessors/parserSetAccessorWithTypeAnnotation1.ts
index 79bf4b51b87..8b3d1129278 100644
--- a/tests/cases/conformance/parser/ecmascript5/Accessors/parserSetAccessorWithTypeAnnotation1.ts
+++ b/tests/cases/conformance/parser/ecmascript5/Accessors/parserSetAccessorWithTypeAnnotation1.ts
@@ -1,3 +1,4 @@
+// @target: es5
 class C {
    set foo(v): number {
    }
diff --git a/tests/cases/conformance/parser/ecmascript5/Accessors/parserSetAccessorWithTypeParameters1.ts b/tests/cases/conformance/parser/ecmascript5/Accessors/parserSetAccessorWithTypeParameters1.ts
index 2b4975a07b1..16a09906d76 100644
--- a/tests/cases/conformance/parser/ecmascript5/Accessors/parserSetAccessorWithTypeParameters1.ts
+++ b/tests/cases/conformance/parser/ecmascript5/Accessors/parserSetAccessorWithTypeParameters1.ts
@@ -1,3 +1,4 @@
+// @target: es5
 class C {
    set foo<T>(v) { }
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/ConstructorDeclarations/parserConstructorDeclaration11.ts b/tests/cases/conformance/parser/ecmascript5/ConstructorDeclarations/parserConstructorDeclaration11.ts
new file mode 100644
index 00000000000..7a4d68ce12d
--- /dev/null
+++ b/tests/cases/conformance/parser/ecmascript5/ConstructorDeclarations/parserConstructorDeclaration11.ts
@@ -0,0 +1,3 @@
+class C {
+  constructor<>() { }
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ArrowFunctions/parserX_ArrowFunction1.ts b/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ArrowFunctions/parserX_ArrowFunction1.ts
new file mode 100644
index 00000000000..444dfd20104
--- /dev/null
+++ b/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ArrowFunctions/parserX_ArrowFunction1.ts
@@ -0,0 +1,3 @@
+var v = (a: ) => {
+   
+};
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ArrowFunctions/parserX_ArrowFunction2.ts b/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ArrowFunctions/parserX_ArrowFunction2.ts
new file mode 100644
index 00000000000..8b4d99e2ef5
--- /dev/null
+++ b/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ArrowFunctions/parserX_ArrowFunction2.ts
@@ -0,0 +1,3 @@
+var v = (a: b,) => {
+   
+};
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ArrowFunctions/parserX_ArrowFunction3.ts b/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ArrowFunctions/parserX_ArrowFunction3.ts
new file mode 100644
index 00000000000..db0a915af79
--- /dev/null
+++ b/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ArrowFunctions/parserX_ArrowFunction3.ts
@@ -0,0 +1,3 @@
+var v = (a): => {
+   
+};
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ArrowFunctions/parserX_ArrowFunction4.ts b/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ArrowFunctions/parserX_ArrowFunction4.ts
new file mode 100644
index 00000000000..a63e70a4ac1
--- /dev/null
+++ b/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ArrowFunctions/parserX_ArrowFunction4.ts
@@ -0,0 +1,3 @@
+var v = (a, b) => {
+   
+};
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ExtendsOrImplementsClauses/parserErrorRecovery_ExtendsOrImplementsClause6.ts b/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ExtendsOrImplementsClauses/parserErrorRecovery_ExtendsOrImplementsClause6.ts
new file mode 100644
index 00000000000..89c65ca1c8f
--- /dev/null
+++ b/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/ExtendsOrImplementsClauses/parserErrorRecovery_ExtendsOrImplementsClause6.ts
@@ -0,0 +1 @@
+interface I extends { }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/TypeArgumentLists/parserX_TypeArgumentList1.ts b/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/TypeArgumentLists/parserX_TypeArgumentList1.ts
new file mode 100644
index 00000000000..48c7306da2e
--- /dev/null
+++ b/tests/cases/conformance/parser/ecmascript5/ErrorRecovery/TypeArgumentLists/parserX_TypeArgumentList1.ts
@@ -0,0 +1 @@
+Foo<A,B,\ C>(4, 5, 6);
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/Expressions/parserAssignmentExpression1.ts b/tests/cases/conformance/parser/ecmascript5/Expressions/parserAssignmentExpression1.ts
new file mode 100644
index 00000000000..ca85f41bceb
--- /dev/null
+++ b/tests/cases/conformance/parser/ecmascript5/Expressions/parserAssignmentExpression1.ts
@@ -0,0 +1 @@
+(foo()) = bar;
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/Expressions/parserObjectCreation2.ts b/tests/cases/conformance/parser/ecmascript5/Expressions/parserObjectCreation2.ts
new file mode 100644
index 00000000000..0b7a19893bd
--- /dev/null
+++ b/tests/cases/conformance/parser/ecmascript5/Expressions/parserObjectCreation2.ts
@@ -0,0 +1 @@
+new new Foo()()
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/Expressions/parserPostfixUnaryExpression1.ts b/tests/cases/conformance/parser/ecmascript5/Expressions/parserPostfixUnaryExpression1.ts
new file mode 100644
index 00000000000..6ddc487528e
--- /dev/null
+++ b/tests/cases/conformance/parser/ecmascript5/Expressions/parserPostfixUnaryExpression1.ts
@@ -0,0 +1 @@
+foo ++ ++;
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/Expressions/parserUnaryExpression1.ts b/tests/cases/conformance/parser/ecmascript5/Expressions/parserUnaryExpression1.ts
new file mode 100644
index 00000000000..911a219c844
--- /dev/null
+++ b/tests/cases/conformance/parser/ecmascript5/Expressions/parserUnaryExpression1.ts
@@ -0,0 +1 @@
+++this;
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/Expressions/parserUnaryExpression2.ts b/tests/cases/conformance/parser/ecmascript5/Expressions/parserUnaryExpression2.ts
new file mode 100644
index 00000000000..efc6883818d
--- /dev/null
+++ b/tests/cases/conformance/parser/ecmascript5/Expressions/parserUnaryExpression2.ts
@@ -0,0 +1 @@
+++function(e) { }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/Expressions/parserUnaryExpression3.ts b/tests/cases/conformance/parser/ecmascript5/Expressions/parserUnaryExpression3.ts
new file mode 100644
index 00000000000..2c3d2a675e4
--- /dev/null
+++ b/tests/cases/conformance/parser/ecmascript5/Expressions/parserUnaryExpression3.ts
@@ -0,0 +1 @@
+++[0];
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/Expressions/parserUnaryExpression4.ts b/tests/cases/conformance/parser/ecmascript5/Expressions/parserUnaryExpression4.ts
new file mode 100644
index 00000000000..9c6da06171c
--- /dev/null
+++ b/tests/cases/conformance/parser/ecmascript5/Expressions/parserUnaryExpression4.ts
@@ -0,0 +1 @@
+++{};
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/Expressions/parserUnaryExpression5.ts b/tests/cases/conformance/parser/ecmascript5/Expressions/parserUnaryExpression5.ts
new file mode 100644
index 00000000000..be4cdbb33a1
--- /dev/null
+++ b/tests/cases/conformance/parser/ecmascript5/Expressions/parserUnaryExpression5.ts
@@ -0,0 +1 @@
+++ delete foo.bar
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/Expressions/parserUnaryExpression6.ts b/tests/cases/conformance/parser/ecmascript5/Expressions/parserUnaryExpression6.ts
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/cases/conformance/parser/ecmascript5/Expressions/parserUnaryExpression7.ts b/tests/cases/conformance/parser/ecmascript5/Expressions/parserUnaryExpression7.ts
new file mode 100644
index 00000000000..5569afbbc9b
--- /dev/null
+++ b/tests/cases/conformance/parser/ecmascript5/Expressions/parserUnaryExpression7.ts
@@ -0,0 +1 @@
+++ new Foo();
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessor1.ts b/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessor1.ts
index 31db48d70b6..61bc60a46db 100644
--- a/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessor1.ts
+++ b/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessor1.ts
@@ -1,3 +1,4 @@
+// @target: es5
 class C {
   get foo() { }
   set foo(a) { }
diff --git a/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration1.ts b/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration1.ts
index 6d6476d8d8d..e4f157dc497 100644
--- a/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration1.ts
+++ b/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration1.ts
@@ -1,3 +1,4 @@
+// @target: es5
 class C {
   get a() { }
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration10.ts b/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration10.ts
index d7a16a2dab5..fa586f53c53 100644
--- a/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration10.ts
+++ b/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration10.ts
@@ -1,3 +1,4 @@
+// @target: es5
 class C {
     export get Foo() { }
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration11.ts b/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration11.ts
index 7076131b99e..8e2cfaa7bd6 100644
--- a/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration11.ts
+++ b/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration11.ts
@@ -1,3 +1,4 @@
+// @target: es5
 class C {
     declare get Foo() { }
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration12.ts b/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration12.ts
index 5cd370d9297..c05d6c15c0c 100644
--- a/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration12.ts
+++ b/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration12.ts
@@ -1,3 +1,4 @@
+// @target: es5
 class C {
    get Foo(a: number) { }
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration13.ts b/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration13.ts
index 54ca5d608b3..935f70c1c90 100644
--- a/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration13.ts
+++ b/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration13.ts
@@ -1,3 +1,4 @@
+// @target: es5
 class C {
    set Foo() { }
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration14.ts b/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration14.ts
index 2fb70a780b1..79bc5e73630 100644
--- a/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration14.ts
+++ b/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration14.ts
@@ -1,3 +1,4 @@
+// @target: es5
 class C {
    set Foo(a: number, b: number) { }
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration15.ts b/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration15.ts
index 928e1f7e972..fa5379c9a2c 100644
--- a/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration15.ts
+++ b/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration15.ts
@@ -1,3 +1,4 @@
+// @target: es5
 class C {
    set Foo(public a: number) { }
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration16.ts b/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration16.ts
index 9ee2dd29c32..1bb0a7c7ebc 100644
--- a/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration16.ts
+++ b/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration16.ts
@@ -1,3 +1,4 @@
+// @target: es5
 class C {
    set Foo(a = 1) { }
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration17.ts b/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration17.ts
index f64dc51f72a..000aedd75a0 100644
--- a/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration17.ts
+++ b/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration17.ts
@@ -1,3 +1,4 @@
+// @target: es5
 class C {
    set Foo(a?: number) { }
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration18.ts b/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration18.ts
index 0617316119f..94a7a62295e 100644
--- a/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration18.ts
+++ b/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration18.ts
@@ -1,3 +1,4 @@
+// @target: es5
 class C {
    set Foo(...a) { }
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration2.ts b/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration2.ts
index f38ae14b7bb..bfa10430978 100644
--- a/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration2.ts
+++ b/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration2.ts
@@ -1,3 +1,4 @@
+// @target: es5
 class C {
   get "b"() { }
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration3.ts b/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration3.ts
index 64676552aea..98c90c4f6c9 100644
--- a/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration3.ts
+++ b/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration3.ts
@@ -1,3 +1,4 @@
+// @target: es5
 class C {
   get 0() { }
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration4.ts b/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration4.ts
index acfd17a3f59..e27e000ef20 100644
--- a/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration4.ts
+++ b/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration4.ts
@@ -1,3 +1,4 @@
+// @target: es5
 class C {
   set a(i) { }
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration5.ts b/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration5.ts
index e54a1865fbe..4e71fad535b 100644
--- a/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration5.ts
+++ b/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration5.ts
@@ -1,3 +1,4 @@
+// @target: es5
 class C {
   set "a"(i) { }
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration6.ts b/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration6.ts
index 096ed5691fb..1ef5cb83fbd 100644
--- a/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration6.ts
+++ b/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration6.ts
@@ -1,3 +1,4 @@
+// @target: es5
 class C {
   set 0(i) { }
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration7.ts b/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration7.ts
index e7ca2f6b9b4..c7fff54d528 100644
--- a/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration7.ts
+++ b/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration7.ts
@@ -1,3 +1,4 @@
+// @target: es5
 class C {
     public public get Foo() { }
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration8.ts b/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration8.ts
index a60d8b90b0c..f95d5f10930 100644
--- a/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration8.ts
+++ b/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration8.ts
@@ -1,3 +1,4 @@
+// @target: es5
 class C {
     static static get Foo() { }
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration9.ts b/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration9.ts
index b77bcb0b2e7..2e60420c434 100644
--- a/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration9.ts
+++ b/tests/cases/conformance/parser/ecmascript5/MemberAccessorDeclarations/parserMemberAccessorDeclaration9.ts
@@ -1,3 +1,4 @@
+// @target: es5
 class C {
     static public get Foo() { }
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/ObjectLiterals/parserObjectLiterals1.ts b/tests/cases/conformance/parser/ecmascript5/ObjectLiterals/parserObjectLiterals1.ts
new file mode 100644
index 00000000000..acaf67deb2a
--- /dev/null
+++ b/tests/cases/conformance/parser/ecmascript5/ObjectLiterals/parserObjectLiterals1.ts
@@ -0,0 +1 @@
+var v = { a: 1, b: 2 };
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/ObjectTypes/parserObjectType5.ts b/tests/cases/conformance/parser/ecmascript5/ObjectTypes/parserObjectType5.ts
new file mode 100644
index 00000000000..0687805280b
--- /dev/null
+++ b/tests/cases/conformance/parser/ecmascript5/ObjectTypes/parserObjectType5.ts
@@ -0,0 +1,4 @@
+var v: {
+   A: B
+   <T>;
+};
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/ObjectTypes/parserObjectType6.ts b/tests/cases/conformance/parser/ecmascript5/ObjectTypes/parserObjectType6.ts
new file mode 100644
index 00000000000..9edad292d7b
--- /dev/null
+++ b/tests/cases/conformance/parser/ecmascript5/ObjectTypes/parserObjectType6.ts
@@ -0,0 +1,4 @@
+var v: {
+   a: B
+   [];
+};
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/Statements/ReturnStatements/parserReturnStatement4.js b/tests/cases/conformance/parser/ecmascript5/Statements/ReturnStatements/parserReturnStatement4.js
new file mode 100644
index 00000000000..bc2fc7648da
--- /dev/null
+++ b/tests/cases/conformance/parser/ecmascript5/Statements/ReturnStatements/parserReturnStatement4.js
@@ -0,0 +1,3 @@
+var v = { get foo() {
+    return;
+} };
diff --git a/tests/cases/conformance/parser/ecmascript5/Statements/parserDoStatement2.ts b/tests/cases/conformance/parser/ecmascript5/Statements/parserDoStatement2.ts
new file mode 100644
index 00000000000..dc7234027c8
--- /dev/null
+++ b/tests/cases/conformance/parser/ecmascript5/Statements/parserDoStatement2.ts
@@ -0,0 +1 @@
+do{;}while(false)false
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/Statements/parserForStatement4.ts b/tests/cases/conformance/parser/ecmascript5/Statements/parserForStatement4.ts
new file mode 100644
index 00000000000..55bc5925920
--- /dev/null
+++ b/tests/cases/conformance/parser/ecmascript5/Statements/parserForStatement4.ts
@@ -0,0 +1,2 @@
+for (a = 1 in b) {
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/Statements/parserForStatement5.ts b/tests/cases/conformance/parser/ecmascript5/Statements/parserForStatement5.ts
new file mode 100644
index 00000000000..da30cf1593f
--- /dev/null
+++ b/tests/cases/conformance/parser/ecmascript5/Statements/parserForStatement5.ts
@@ -0,0 +1,2 @@
+for ({} in b) {
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/Statements/parserForStatement6.ts b/tests/cases/conformance/parser/ecmascript5/Statements/parserForStatement6.ts
new file mode 100644
index 00000000000..82e058d6322
--- /dev/null
+++ b/tests/cases/conformance/parser/ecmascript5/Statements/parserForStatement6.ts
@@ -0,0 +1,2 @@
+for (foo() in b) {
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/Statements/parserForStatement7.ts b/tests/cases/conformance/parser/ecmascript5/Statements/parserForStatement7.ts
new file mode 100644
index 00000000000..52bf2dee241
--- /dev/null
+++ b/tests/cases/conformance/parser/ecmascript5/Statements/parserForStatement7.ts
@@ -0,0 +1,2 @@
+for (new foo() in b) {
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/Statements/parserForStatement8.ts b/tests/cases/conformance/parser/ecmascript5/Statements/parserForStatement8.ts
new file mode 100644
index 00000000000..027bf524704
--- /dev/null
+++ b/tests/cases/conformance/parser/ecmascript5/Statements/parserForStatement8.ts
@@ -0,0 +1,2 @@
+for (this in b) {
+}
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/StrictMode/octalLiteralInStrictModeES3.ts b/tests/cases/conformance/parser/ecmascript5/StrictMode/octalLiteralInStrictModeES3.ts
new file mode 100644
index 00000000000..9df305d1a26
--- /dev/null
+++ b/tests/cases/conformance/parser/ecmascript5/StrictMode/octalLiteralInStrictModeES3.ts
@@ -0,0 +1,2 @@
+"use strict";
+03;
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/parserKeywordsAsIdentifierName2.ts b/tests/cases/conformance/parser/ecmascript5/parserKeywordsAsIdentifierName2.ts
index 195c846aa3a..d197f85905c 100644
--- a/tests/cases/conformance/parser/ecmascript5/parserKeywordsAsIdentifierName2.ts
+++ b/tests/cases/conformance/parser/ecmascript5/parserKeywordsAsIdentifierName2.ts
@@ -1,2 +1,2 @@
-// 'public' shoudl be marked unusable because it has a trailing /*
+// 'public' should be marked unusable, should complain on trailing /*
 a.public /*
\ No newline at end of file
diff --git a/tests/cases/conformance/parser/ecmascript5/parserS7.6.1.1_A1.10.ts b/tests/cases/conformance/parser/ecmascript5/parserS7.6.1.1_A1.10.ts
index 0511807b6c1..3af5eeb9701 100644
--- a/tests/cases/conformance/parser/ecmascript5/parserS7.6.1.1_A1.10.ts
+++ b/tests/cases/conformance/parser/ecmascript5/parserS7.6.1.1_A1.10.ts
@@ -9,5 +9,5 @@
  * @negative
  */
 
-for = 1;
+//for = 1;
 
diff --git a/tests/cases/conformance/parser/ecmascript5/parserSyntaxWalker.generated.ts b/tests/cases/conformance/parser/ecmascript5/parserSyntaxWalker.generated.ts
index 5e1bc51fc93..42d55a2592d 100644
--- a/tests/cases/conformance/parser/ecmascript5/parserSyntaxWalker.generated.ts
+++ b/tests/cases/conformance/parser/ecmascript5/parserSyntaxWalker.generated.ts
@@ -1,278 +1,278 @@
-declare module "fs" {
-    export class File {
-        constructor(filename: string);
-        public ReadAllText(): string;
-    }
-    export interface IFile {
-        [index: number]: string;
-    }
-}
+//declare module "fs" {
+//    export class File {
+//        constructor(filename: string);
+//        public ReadAllText(): string;
+//    }
+//    export interface IFile {
+//        [index: number]: string;
+//    }
+//}
 
-import fs = module("fs");
+//import fs = module("fs");
 
 
-module TypeScriptAllInOne {
-    export class Program {
-        static Main(...args: string[]) {
-            try {
-                var bfs = new BasicFeatures();
-                var retValue: number = 0;
+//module TypeScriptAllInOne {
+//    export class Program {
+//        static Main(...args: string[]) {
+//            try {
+//                var bfs = new BasicFeatures();
+//                var retValue: number = 0;
 
-                retValue = bfs.VARIABLES();
-                if (retValue != 0) {
+//                retValue = bfs.VARIABLES();
+//                if (retValue != 0) {
 
-                    return 1;
-                }
+//                    return 1;
+//                }
 
-                retValue = bfs.STATEMENTS(4);
-                if (retValue != 0) {
+//                retValue = bfs.STATEMENTS(4);
+//                if (retValue != 0) {
 
-                    return 1;
-                }
+//                    return 1;
+//                }
 
 
-                retValue = bfs.TYPES();
-                if (retValue != 0) {
+//                retValue = bfs.TYPES();
+//                if (retValue != 0) {
 
-                    return 1;
-                }
+//                    return 1;
+//                }
 
-                retValue = bfs.OPERATOR();
-                if (retValue != 0) {
+//                retValue = bfs.OPERATOR();
+//                if (retValue != 0) {
 
-                    return 1;
-                }
-            }
-            catch (e) {
-                console.log(e);
-            }
-            finally {
+//                    return 1;
+//                }
+//            }
+//            catch (e) {
+//                console.log(e);
+//            }
+//            finally {
 
-            }
+//            }
 
-            console.log('Done');
+//            console.log('Done');
 
-            return 0;
+//            return 0;
 
-        }
-    }
+//        }
+//    }
 
-    class BasicFeatures {
-        /// <summary>
-        /// Test various of variables. Including nullable,key world as variable,special format
-        /// </summary>
-        /// <returns></returns>
-        public VARIABLES(): number {
-            var local = Number.MAX_VALUE;
-            var min = Number.MIN_VALUE;
-            var inf = Number.NEGATIVE_INFINITY;
-            var nan = Number.NaN;
-            var undef = undefined;
+//    class BasicFeatures {
+//        /// <summary>
+//        /// Test various of variables. Including nullable,key world as variable,special format
+//        /// </summary>
+//        /// <returns></returns>
+//        public VARIABLES(): number {
+//            var local = Number.MAX_VALUE;
+//            var min = Number.MIN_VALUE;
+//            var inf = Number.NEGATIVE_INFINITY;
+//            var nan = Number.NaN;
+//            var undef = undefined;
 
-            var п = local;
-            var м = local;
+//            var п = local;
+//            var м = local;
 
-            var local5 = <fs.File>null;
-            var local6 = local5 instanceof fs.File;
+//            var local5 = <fs.File>null;
+//            var local6 = local5 instanceof fs.File;
 
-            var hex = 0xBADC0DE, Hex = 0XDEADBEEF;
-            var float = 6.02e23, float2 = 6.02E-23
-            var char = 'c', \u0066 = '\u0066', hexchar = '\x42';
-            var quoted = '"', quoted2 = "'";
-            var reg = /\w*/;
-            var objLit = { "var": number = 42, equals: function (x) { return x["var"] === 42; }, toString: () => 'objLit{42}' };
-            var weekday = Weekdays.Monday;
+//            var hex = 0xBADC0DE, Hex = 0XDEADBEEF;
+//            var float = 6.02e23, float2 = 6.02E-23
+//            var char = 'c', \u0066 = '\u0066', hexchar = '\x42';
+//            var quoted = '"', quoted2 = "'";
+//            var reg = /\w*/;
+//            var objLit = { "var": number = 42, equals: function (x) { return x["var"] === 42; }, toString: () => 'objLit{42}' };
+//            var weekday = Weekdays.Monday;
 
-            var con = char + f + hexchar + float.toString() + float2.toString() + reg.toString() + objLit + weekday;
+//            var con = char + f + hexchar + float.toString() + float2.toString() + reg.toString() + objLit + weekday;
 
-            //
-            var any = 0;
-            var boolean = 0;
-            var declare = 0;
-            var constructor = 0;
-            var get = 0;
-            var implements = 0;
-            var interface = 0;
-            var let = 0;
-            var module = 0;
-            var number = 0;
-            var package = 0;
-            var private = 0;
-            var protected = 0;
-            var public = 0;
-            var set = 0;
-            var static = 0;
-            var string = 0;
-            var yield = 0;
+//            //
+//            var any = 0;
+//            var boolean = 0;
+//            var declare = 0;
+//            var constructor = 0;
+//            var get = 0;
+//            var implements = 0;
+//            var interface = 0;
+//            var let = 0;
+//            var module = 0;
+//            var number = 0;
+//            var package = 0;
+//            var private = 0;
+//            var protected = 0;
+//            var public = 0;
+//            var set = 0;
+//            var static = 0;
+//            var string = 0;
+//            var yield = 0;
 
-            var sum3 = any + boolean + declare + constructor + get + implements + interface + let + module + number + package + private + protected + public + set + static + string + yield;
+//            var sum3 = any + boolean + declare + constructor + get + implements + interface + let + module + number + package + private + protected + public + set + static + string + yield;
 
-            return 0;
-        }
+//            return 0;
+//        }
 
-        /// <summary>
-        /// Test different statements. Including if-else,swith,foreach,(un)checked,lock,using,try-catch-finally
-        /// </summary>
-        /// <param name="i"></param>
-        /// <returns></returns>
-        STATEMENTS(i: number): number {
-            var retVal = 0;
-            if (i == 1)
-                retVal = 1;
-            else
-                retVal = 0;
-            switch (i) {
-                case 2:
-                    retVal = 1;
-                    break;
-                case 3:
-                    retVal = 1;
-                    break;
-                default:
-                    break;
-            }
+//        /// <summary>
+//        /// Test different statements. Including if-else,swith,foreach,(un)checked,lock,using,try-catch-finally
+//        /// </summary>
+//        /// <param name="i"></param>
+//        /// <returns></returns>
+//        STATEMENTS(i: number): number {
+//            var retVal = 0;
+//            if (i == 1)
+//                retVal = 1;
+//            else
+//                retVal = 0;
+//            switch (i) {
+//                case 2:
+//                    retVal = 1;
+//                    break;
+//                case 3:
+//                    retVal = 1;
+//                    break;
+//                default:
+//                    break;
+//            }
 
-            for (var x in { x: 0, y: 1 }) {
-            }
+//            for (var x in { x: 0, y: 1 }) {
+//            }
 
-            try {
-                throw null;
-            }
-            catch (Exception) {
-            }
-            finally {
-                try { }
-                catch (Exception) { }
-            }
+//            try {
+//                throw null;
+//            }
+//            catch (Exception) {
+//            }
+//            finally {
+//                try { }
+//                catch (Exception) { }
+//            }
 
-            return retVal;
-        }
+//            return retVal;
+//        }
 
-        /// <summary>
-        /// Test types in ts language. Including class,struct,interface,delegate,anonymous type
-        /// </summary>
-        /// <returns></returns>
-        public TYPES(): number {
-            var retVal = 0;
-            var c = new CLASS();
-            var xx: IF = c;
-            retVal += c.Property;
-            retVal += c.Member();
-            retVal += xx ^= Foo() ? 0 : 1;
+//        /// <summary>
+//        /// Test types in ts language. Including class,struct,interface,delegate,anonymous type
+//        /// </summary>
+//        /// <returns></returns>
+//        public TYPES(): number {
+//            var retVal = 0;
+//            var c = new CLASS();
+//            var xx: IF = c;
+//            retVal += c.Property;
+//            retVal += c.Member();
+//            retVal += xx ^= Foo() ? 0 : 1;
 
-            //anonymous type
-            var anony = { a: new CLASS() };
+//            //anonymous type
+//            var anony = { a: new CLASS() };
 
-            retVal += anony.a.d();
+//            retVal += anony.a.d();
 
-            return retVal;
-        }
+//            return retVal;
+//        }
 
 
-        ///// <summary>
-        ///// Test different operators
-        ///// </summary>
-        ///// <returns></returns>
-        public OPERATOR(): number {
-            var a: number[] = [1, 2, 3, 4,  implements , ];/*[] bug*/ // YES []
-            var i = a[1];/*[]*/
-            i = i + i - i * i / i % i & i | i ^ i;/*+ - * / % & | ^*/
-            var b = true && false || true ^ false;/*& | ^*/
-            b = !b;/*!*/
-            i = ~i;/*~i*/
-            b = i < (i -  continue ) && (i + 1) > i;/*< && >*/
-            var f = true ? 1 : 0;/*? :*/   // YES :
-            i++;/*++*/
-            i--;/*--*/
-            b = true && false || true;/*&& ||*/
-            i = i << 5;/*<<*/
-            i = i >> 5;/*>>*/
-            var j = i;
-            b = i == j && i != j && i <= j && i >= j;/*= == && != <= >=*/
-            i += <number>5.0;/*+=*/
-            i -= i;/*-=*/
-            i *= i;/**=*/
-            if (i == 0)
-                i++;
-            i /= i;/*/=*/
-            i %= i;/*%=*/
-            i &= i;/*&=*/
-            i |= i;/*|=*/
-            i ^= i;/*^=*/
-            i <<= i;/*<<=*/
-            i >>= i;/*>>=*/
+//        ///// <summary>
+//        ///// Test different operators
+//        ///// </summary>
+//        ///// <returns></returns>
+//        public OPERATOR(): number {
+//            var a: number[] = [1, 2, 3, 4,  implements , ];/*[] bug*/ // YES []
+//            var i = a[1];/*[]*/
+//            i = i + i - i * i / i % i & i | i ^ i;/*+ - * / % & | ^*/
+//            var b = true && false || true ^ false;/*& | ^*/
+//            b = !b;/*!*/
+//            i = ~i;/*~i*/
+//            b = i < (i -  continue ) && (i + 1) > i;/*< && >*/
+//            var f = true ? 1 : 0;/*? :*/   // YES :
+//            i++;/*++*/
+//            i--;/*--*/
+//            b = true && false || true;/*&& ||*/
+//            i = i << 5;/*<<*/
+//            i = i >> 5;/*>>*/
+//            var j = i;
+//            b = i == j && i != j && i <= j && i >= j;/*= == && != <= >=*/
+//            i += <number>5.0;/*+=*/
+//            i -= i;/*-=*/
+//            i *= i;/**=*/
+//            if (i == 0)
+//                i++;
+//            i /= i;/*/=*/
+//            i %= i;/*%=*/
+//            i &= i;/*&=*/
+//            i |= i;/*|=*/
+//            i ^= i;/*^=*/
+//            i <<= i;/*<<=*/
+//            i >>= i;/*>>=*/
 
-            if (i == 0 && !b && f == 1)
-                return 0;
-            else return 1;
-        }
+//            if (i == 0 && !b && f == 1)
+//                return 0;
+//            else return 1;
+//        }
 
-    }
+//    }
 
-    interface IF {
-        Foo <!-- ): boolean;
-    }
+//    interface IF {
+//        Foo <!-- ): boolean;
+//    }
 
-    class CLASS implements IF {
+//    class CLASS implements IF {
 
-        public d = () =>  '  return 0; };
-        public get Property() { return 0; }
-        public Member() {
-            return 0;
-        }
-        public Foo(): boolean {
-            var myEvent = () => { return 1; };
-            if (myEvent() == 1)
-                return true;
-            else
-                return false;
-        }
-    }
+//        public d = () =>  '  return 0; };
+//        public get Property() { return 0; }
+//        public Member() {
+//            return 0;
+//        }
+//        public Foo(): boolean {
+//            var myEvent = () => { return 1; };
+//            if (myEvent() == 1)
+//                return true;
+//            else
+//                return false;
+//        }
+//    }
 
 
-    // todo: use these
-    class A {
-        public method1(val:number) {
-            return val;
-        }
-        public method2() {
-            return 2 * this.method1(2);
-        }
-    }
+//    // todo: use these
+//    class A {
+//        public method1(val:number) {
+//            return val;
+//        }
+//        public method2() {
+//            return 2 * this.method1(2);
+//        }
+//    }
 
-    class B extends A {
+//    class B extends A {
 
-        public method2() {
-            return this.method1(2);
-        }
-    }
+//        public method2() {
+//            return this.method1(2);
+//        }
+//    }
 
-    class Overloading {
+//    class Overloading {
 
-        private otherValue = 42;
+//        private otherValue = 42;
 
-        constructor(private value: number, public name: string) { }
+//        constructor(private value: number, public name: string) { }
        
-        public Overloads(value: string);
-        public Overloads(value: string, ...rest: string[]) { }
+//        public Overloads(value: string);
+//        public Overloads(value: string, ...rest: string[]) { }
 
-        public DefaultValue(value?: string = "Hello") { }
-    }
-}
+//        public DefaultValue(value?: string = "Hello") { }
+//    }
+//}
 
-enum Weekdays {
-    Monday,
-    Tuesday,
-    Weekend,
-}
+//enum Weekdays {
+//    Monday,
+//    Tuesday,
+//    Weekend,
+//}
 
-enum Fruit {
-    Apple,
-    Pear
-}
+//enum Fruit {
+//    Apple,
+//    Pear
+//}
 
-interface IDisposable {
-    Dispose(): void;
-}
+//interface IDisposable {
+//    Dispose(): void;
+//}
 
-TypeScriptAllInOne.Program.Main();
+//TypeScriptAllInOne.Program.Main();
diff --git a/tests/cases/conformance/scanner/ecmascript3/scannerES3NumericLiteral1.ts b/tests/cases/conformance/scanner/ecmascript3/scannerES3NumericLiteral1.ts
new file mode 100644
index 00000000000..c227083464f
--- /dev/null
+++ b/tests/cases/conformance/scanner/ecmascript3/scannerES3NumericLiteral1.ts
@@ -0,0 +1 @@
+0
\ No newline at end of file
diff --git a/tests/cases/conformance/scanner/ecmascript3/scannerES3NumericLiteral2.ts b/tests/cases/conformance/scanner/ecmascript3/scannerES3NumericLiteral2.ts
new file mode 100644
index 00000000000..a616ad491b1
--- /dev/null
+++ b/tests/cases/conformance/scanner/ecmascript3/scannerES3NumericLiteral2.ts
@@ -0,0 +1 @@
+01
\ No newline at end of file
diff --git a/tests/cases/conformance/scanner/ecmascript3/scannerES3NumericLiteral3.ts b/tests/cases/conformance/scanner/ecmascript3/scannerES3NumericLiteral3.ts
new file mode 100644
index 00000000000..4df9ec3e7f8
--- /dev/null
+++ b/tests/cases/conformance/scanner/ecmascript3/scannerES3NumericLiteral3.ts
@@ -0,0 +1 @@
+01.0
\ No newline at end of file
diff --git a/tests/cases/conformance/scanner/ecmascript3/scannerES3NumericLiteral4.ts b/tests/cases/conformance/scanner/ecmascript3/scannerES3NumericLiteral4.ts
new file mode 100644
index 00000000000..1405ebef530
--- /dev/null
+++ b/tests/cases/conformance/scanner/ecmascript3/scannerES3NumericLiteral4.ts
@@ -0,0 +1 @@
+1e
\ No newline at end of file
diff --git a/tests/cases/conformance/scanner/ecmascript3/scannerES3NumericLiteral5.ts b/tests/cases/conformance/scanner/ecmascript3/scannerES3NumericLiteral5.ts
new file mode 100644
index 00000000000..8757d5bc883
--- /dev/null
+++ b/tests/cases/conformance/scanner/ecmascript3/scannerES3NumericLiteral5.ts
@@ -0,0 +1 @@
+1e0
\ No newline at end of file
diff --git a/tests/cases/conformance/scanner/ecmascript3/scannerES3NumericLiteral6.ts b/tests/cases/conformance/scanner/ecmascript3/scannerES3NumericLiteral6.ts
new file mode 100644
index 00000000000..2ef6dce1b05
--- /dev/null
+++ b/tests/cases/conformance/scanner/ecmascript3/scannerES3NumericLiteral6.ts
@@ -0,0 +1 @@
+1e+
\ No newline at end of file
diff --git a/tests/cases/conformance/scanner/ecmascript3/scannerES3NumericLiteral7.ts b/tests/cases/conformance/scanner/ecmascript3/scannerES3NumericLiteral7.ts
new file mode 100644
index 00000000000..e5f1cb60007
--- /dev/null
+++ b/tests/cases/conformance/scanner/ecmascript3/scannerES3NumericLiteral7.ts
@@ -0,0 +1 @@
+1e+0
\ No newline at end of file
diff --git a/tests/cases/conformance/scanner/ecmascript5/scannerNumericLiteral1.ts b/tests/cases/conformance/scanner/ecmascript5/scannerNumericLiteral1.ts
index c227083464f..23206bbe1f5 100644
--- a/tests/cases/conformance/scanner/ecmascript5/scannerNumericLiteral1.ts
+++ b/tests/cases/conformance/scanner/ecmascript5/scannerNumericLiteral1.ts
@@ -1 +1,2 @@
+// @target: ES5
 0
\ No newline at end of file
diff --git a/tests/cases/conformance/scanner/ecmascript5/scannerNumericLiteral2.ts b/tests/cases/conformance/scanner/ecmascript5/scannerNumericLiteral2.ts
index a616ad491b1..60d12a43442 100644
--- a/tests/cases/conformance/scanner/ecmascript5/scannerNumericLiteral2.ts
+++ b/tests/cases/conformance/scanner/ecmascript5/scannerNumericLiteral2.ts
@@ -1 +1,2 @@
+// @target: ES5
 01
\ No newline at end of file
diff --git a/tests/cases/conformance/scanner/ecmascript5/scannerNumericLiteral3.ts b/tests/cases/conformance/scanner/ecmascript5/scannerNumericLiteral3.ts
index 4df9ec3e7f8..fda0822c2f3 100644
--- a/tests/cases/conformance/scanner/ecmascript5/scannerNumericLiteral3.ts
+++ b/tests/cases/conformance/scanner/ecmascript5/scannerNumericLiteral3.ts
@@ -1 +1,2 @@
+// @target: ES5
 01.0
\ No newline at end of file
diff --git a/tests/cases/conformance/scanner/ecmascript5/scannerNumericLiteral4.ts b/tests/cases/conformance/scanner/ecmascript5/scannerNumericLiteral4.ts
index 1405ebef530..092e6af6719 100644
--- a/tests/cases/conformance/scanner/ecmascript5/scannerNumericLiteral4.ts
+++ b/tests/cases/conformance/scanner/ecmascript5/scannerNumericLiteral4.ts
@@ -1 +1,2 @@
+// @target: ES5
 1e
\ No newline at end of file
diff --git a/tests/cases/conformance/scanner/ecmascript5/scannerNumericLiteral5.ts b/tests/cases/conformance/scanner/ecmascript5/scannerNumericLiteral5.ts
index 8757d5bc883..9a9804b4f0e 100644
--- a/tests/cases/conformance/scanner/ecmascript5/scannerNumericLiteral5.ts
+++ b/tests/cases/conformance/scanner/ecmascript5/scannerNumericLiteral5.ts
@@ -1 +1,2 @@
+// @target: ES5
 1e0
\ No newline at end of file
diff --git a/tests/cases/conformance/scanner/ecmascript5/scannerNumericLiteral6.ts b/tests/cases/conformance/scanner/ecmascript5/scannerNumericLiteral6.ts
index 2ef6dce1b05..7ff2871b001 100644
--- a/tests/cases/conformance/scanner/ecmascript5/scannerNumericLiteral6.ts
+++ b/tests/cases/conformance/scanner/ecmascript5/scannerNumericLiteral6.ts
@@ -1 +1,2 @@
+// @target: ES5
 1e+
\ No newline at end of file
diff --git a/tests/cases/conformance/scanner/ecmascript5/scannerNumericLiteral7.ts b/tests/cases/conformance/scanner/ecmascript5/scannerNumericLiteral7.ts
index e5f1cb60007..2e62350d48c 100644
--- a/tests/cases/conformance/scanner/ecmascript5/scannerNumericLiteral7.ts
+++ b/tests/cases/conformance/scanner/ecmascript5/scannerNumericLiteral7.ts
@@ -1 +1,2 @@
+// @target: ES5
 1e+0
\ No newline at end of file
diff --git a/tests/cases/conformance/scanner/ecmascript5/scannerNumericLiteral8.ts b/tests/cases/conformance/scanner/ecmascript5/scannerNumericLiteral8.ts
new file mode 100644
index 00000000000..858e3eada0f
--- /dev/null
+++ b/tests/cases/conformance/scanner/ecmascript5/scannerNumericLiteral8.ts
@@ -0,0 +1,2 @@
+// @target: ES5
+-03
\ No newline at end of file
diff --git a/tests/cases/conformance/scanner/ecmascript5/scannerNumericLiteral9.ts b/tests/cases/conformance/scanner/ecmascript5/scannerNumericLiteral9.ts
new file mode 100644
index 00000000000..cf187b83edf
--- /dev/null
+++ b/tests/cases/conformance/scanner/ecmascript5/scannerNumericLiteral9.ts
@@ -0,0 +1,2 @@
+// @target: ES5
+009
\ No newline at end of file
diff --git a/tests/cases/conformance/statements/tryStatements/invalidTryStatements2.ts b/tests/cases/conformance/statements/tryStatements/invalidTryStatements2.ts
index de37313e92a..6937e509845 100644
--- a/tests/cases/conformance/statements/tryStatements/invalidTryStatements2.ts
+++ b/tests/cases/conformance/statements/tryStatements/invalidTryStatements2.ts
@@ -5,5 +5,24 @@ function fn() {
 
     catch(x) { } // error missing try
 
-    finally{ } // error missing try
+    finally{ } // potential error; can be absorbed by the 'catch'
+}
+
+function fn2() {
+    finally { } // error missing try
+    catch (x) { } // error missing try
+
+    // no error
+    try {
+    }
+    finally {
+    }
+
+    // error missing try
+    finally {
+    }
+
+    // error missing try
+    catch (x) {
+    }
 }
\ No newline at end of file
diff --git a/tests/cases/conformance/types/members/duplicateStringIndexers.ts b/tests/cases/conformance/types/members/duplicateStringIndexers.ts
index e2d8def6a0c..67e12d88017 100644
--- a/tests/cases/conformance/types/members/duplicateStringIndexers.ts
+++ b/tests/cases/conformance/types/members/duplicateStringIndexers.ts
@@ -1,32 +1,33 @@
 // it is an error to have duplicate index signatures of the same kind in a type
 
-interface Number {
-    [x: string]: string;
-    [x: string]: string;
-}
+module test {
+    interface Number {
+        [x: string]: string;
+        [x: string]: string;
+    }
 
-interface String {
-    [x: string]: string;
-    [x: string]: string;
-}
+    interface String {
+        [x: string]: string;
+        [x: string]: string;
+    }
 
-interface Array<T> {
-    [x: string]: T;
-    [x: string]: T;
-}
+    interface Array<T> {
+        [x: string]: T;
+        [x: string]: T;
+    }
 
-class C {
-    [x: string]: string;
-    [x: string]: string;
-}
+    class C {
+        [x: string]: string;
+        [x: string]: string;
+    }
 
-interface I {
-    [x: string]: string;
-    [x: string]: string;
-}
+    interface I {
+        [x: string]: string;
+        [x: string]: string;
+    }
 
-var a: {
-    [x: string]: string;
-    [x: string]: string;
+    var a: {
+        [x: string]: string;
+        [x: string]: string;
+    }
 }
-
diff --git a/tests/cases/conformance/types/namedTypes/classWithOnlyPublicMembersEquivalentToInterface.ts b/tests/cases/conformance/types/namedTypes/classWithOnlyPublicMembersEquivalentToInterface.ts
index ca3d1f39d1c..99c2c2e7584 100644
--- a/tests/cases/conformance/types/namedTypes/classWithOnlyPublicMembersEquivalentToInterface.ts
+++ b/tests/cases/conformance/types/namedTypes/classWithOnlyPublicMembersEquivalentToInterface.ts
@@ -1,3 +1,4 @@
+// @target: es5
 // no errors expected
 
 class C {
diff --git a/tests/cases/conformance/types/namedTypes/classWithOnlyPublicMembersEquivalentToInterface2.ts b/tests/cases/conformance/types/namedTypes/classWithOnlyPublicMembersEquivalentToInterface2.ts
index 60bbdc980a4..369451a54a2 100644
--- a/tests/cases/conformance/types/namedTypes/classWithOnlyPublicMembersEquivalentToInterface2.ts
+++ b/tests/cases/conformance/types/namedTypes/classWithOnlyPublicMembersEquivalentToInterface2.ts
@@ -1,3 +1,4 @@
+// @target: es5
 // no errors expected
 
 class C {
diff --git a/tests/cases/conformance/types/specifyingTypes/typeQueries/typeQueryWithReservedWords.ts b/tests/cases/conformance/types/specifyingTypes/typeQueries/typeQueryWithReservedWords.ts
new file mode 100644
index 00000000000..5fb9d2233f1
--- /dev/null
+++ b/tests/cases/conformance/types/specifyingTypes/typeQueries/typeQueryWithReservedWords.ts
@@ -0,0 +1,14 @@
+class Controller {
+    create() {
+    }
+    delete() {
+    }
+    var() {
+    }
+}
+
+interface IScope {
+    create: typeof Controller.prototype.create;  
+    delete: typeof Controller.prototype.delete;  // Should not error
+    var: typeof Controller.prototype.var;        // Should not error
+}
diff --git a/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithOverloadedConstructorTypedArguments.ts b/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithOverloadedConstructorTypedArguments.ts
index d8055853cbe..8bb5d234bb5 100644
--- a/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithOverloadedConstructorTypedArguments.ts
+++ b/tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithOverloadedConstructorTypedArguments.ts
@@ -25,7 +25,7 @@ module GenericParameter {
         new (x: boolean): string;
         new (x: number): boolean;
     }
-    var r5 = foo5(a); // new boolean => string; new(x:number) => boolean
+    var r5 = foo5(a); // new{} => string; new(x:number) => {}
     var b: { new<T>(x: T): string; new<T>(x: number): T; }
     var r7 = foo5(b); // new any => string; new(x:number) => any
 

From 4e1bb26ad108c48273b2c0714d0b443ad1d686b6 Mon Sep 17 00:00:00 2001
From: Jason Freeman <jfreeman@microsoft.com>
Date: Thu, 28 Aug 2014 12:31:37 -0700
Subject: [PATCH 06/11] Print type of super

---
 src/compiler/checker.ts                        | 11 +++++------
 src/harness/compilerRunner.ts                  | 18 +++++++++---------
 src/harness/typeWriter.ts                      |  5 +++--
 .../accessOverriddenBaseClassMember1.types     |  2 ++
 .../reference/captureThisInSuperCall.types     |  1 +
 .../reference/classSideInheritance2.types      |  1 +
 .../reference/commentsInheritance.types        |  1 +
 .../baselines/reference/constructorArgs.types  |  1 +
 ...orFunctionTypeIsAssignableToBaseType2.types |  2 ++
 .../reference/constructorOverloads2.types      |  1 +
 .../reference/declFileGenericType2.types       |  2 ++
 ...sHiddenBaseCallViaSuperPropertyAccess.types |  2 ++
 .../reference/es6ClassSuperCodegenBug.types    |  2 ++
 .../reference/functionSubtypingOfVarArgs.types |  1 +
 .../functionSubtypingOfVarArgs2.types          |  1 +
 ...lassPropertyInheritanceSpecialization.types |  1 +
 ...nericConstraintOnExtendedBuiltinTypes.types |  1 +
 ...ericConstraintOnExtendedBuiltinTypes2.types |  1 +
 tests/baselines/reference/super2.types         |  3 +++
 .../reference/superAccessInFatArrow1.types     |  1 +
 .../reference/superCallArgsMustMatch.types     |  1 +
 ...lFromClassThatDerivesFromGenericType1.types |  1 +
 ...lFromClassThatDerivesFromGenericType2.types |  1 +
 tests/baselines/reference/superCalls.types     |  3 +++
 .../reference/superInCatchBlock1.types         |  1 +
 .../superWithGenericSpecialization.types       |  1 +
 .../reference/superWithGenerics.types          |  1 +
 .../baselines/reference/typeOfSuperCall.types  |  1 +
 .../reference/validUseOfThisInSuper.types      |  1 +
 .../reference/varArgsOnConstructorTypes.types  |  1 +
 30 files changed, 53 insertions(+), 17 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 1dbe0bafd91..578fbd0e054 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -2238,7 +2238,6 @@ module ts {
                 return emptyObjectType;
             }
             var type = getDeclaredTypeOfSymbol(symbol);
-            var name = symbol.name;
             if (!(type.flags & TypeFlags.ObjectType)) {
                 error(getTypeDeclaration(symbol), Diagnostics.Global_type_0_must_be_a_class_or_interface_type, symbol.name);
                 return emptyObjectType;
@@ -3547,7 +3546,8 @@ module ts {
             return false;
         }
 
-        function checkSuperExpression(node: Node, isCallExpression: boolean): Type {
+        function checkSuperExpression(node: Node): Type {
+            var isCallExpression = node.parent.kind === SyntaxKind.CallExpression && (<CallExpression>node.parent).func === node;
             var enclosingClass = <ClassDeclaration>getAncestor(node, SyntaxKind.ClassDeclaration);
             var baseClass: Type;
             if (enclosingClass && enclosingClass.baseType) {
@@ -4181,7 +4181,7 @@ module ts {
 
         function resolveCallExpression(node: CallExpression): Signature {
             if (node.func.kind === SyntaxKind.SuperKeyword) {
-                var superType = checkSuperExpression(node.func, true);
+                var superType = checkSuperExpression(node.func);
                 if (superType !== unknownType) {
                     return resolveCall(node, getSignaturesOfType(superType, SignatureKind.Construct));
                 }
@@ -4829,7 +4829,7 @@ module ts {
                 case SyntaxKind.ThisKeyword:
                     return checkThisExpression(node);
                 case SyntaxKind.SuperKeyword:
-                    return checkSuperExpression(node, false);
+                    return checkSuperExpression(node);
                 case SyntaxKind.NullKeyword:
                     return nullType;
                 case SyntaxKind.TrueKeyword:
@@ -6940,8 +6940,7 @@ module ts {
             }
 
             if (isInRightSideOfImportOrExportAssignment(node)) {
-                var symbol: Symbol;
-                symbol = getSymbolInfo(node);
+                var symbol = getSymbolInfo(node);
                 var declaredType = getDeclaredTypeOfSymbol(symbol);
                 return declaredType !== unknownType ? declaredType : getTypeOfSymbol(symbol);
             }
diff --git a/src/harness/compilerRunner.ts b/src/harness/compilerRunner.ts
index b81a6f12ecf..60da87b1dfc 100644
--- a/src/harness/compilerRunner.ts
+++ b/src/harness/compilerRunner.ts
@@ -41,16 +41,16 @@ class CompilerBaselineRunner extends RunnerBase {
         describe('compiler tests for ' + fileName, () => {
             // Mocha holds onto the closure environment of the describe callback even after the test is done.
             // Everything declared here should be cleared out in the "after" callback.
-            var justName = fileName.replace(/^.*[\\\/]/, ''); // strips the fileName from the path.
-            var content = Harness.IO.readFile(fileName);
-            var testCaseContent = Harness.TestCaseParser.makeUnitsFromTest(content, fileName);
+            var justName: string;
+            var content: string;
+            var testCaseContent: { settings: Harness.TestCaseParser.CompilerSetting[]; testUnitData: Harness.TestCaseParser.TestUnitData[]; }
 
-            var units = testCaseContent.testUnitData;
-            var tcSettings = testCaseContent.settings;
-            var createNewInstance = false;
+            var units: Harness.TestCaseParser.TestUnitData[];
+            var tcSettings: Harness.TestCaseParser.CompilerSetting[];
+            var createNewInstance: boolean;
 
-            var lastUnit = units[units.length - 1];
-            var rootDir = lastUnit.originalFilePath.indexOf('conformance') === -1 ? 'tests/cases/compiler/' : lastUnit.originalFilePath.substring(0, lastUnit.originalFilePath.lastIndexOf('/')) + '/';
+            var lastUnit: Harness.TestCaseParser.TestUnitData;
+            var rootDir: string;
 
             var result: Harness.Compiler.CompilerResult;
             var checker: ts.TypeChecker;
@@ -315,7 +315,7 @@ class CompilerBaselineRunner extends RunnerBase {
                         allFiles.forEach(file => {
                             var codeLines = file.content.split('\n');
                             walker.getTypes(file.unitName).forEach(result => {
-                                var formattedLine = result.identifierName.replace(/\r?\n/g, "") + " : " + result.type;
+                                var formattedLine = result.sourceText.replace(/\r?\n/g, "") + " : " + result.type;
                                 if (!typeMap[file.unitName]) {
                                     typeMap[file.unitName] = {};
                                 }
diff --git a/src/harness/typeWriter.ts b/src/harness/typeWriter.ts
index 58b4f9e3a13..85a5b13c54c 100644
--- a/src/harness/typeWriter.ts
+++ b/src/harness/typeWriter.ts
@@ -2,7 +2,7 @@ interface TypeWriterResult {
     line: number;
     column: number;
     syntaxKind: string;
-    identifierName: string;
+    sourceText: string;
     type: string;
 }
 
@@ -28,6 +28,7 @@ class TypeWriterWalker {
             // TODO: Ideally we should log all expressions, but to compare to the
             // old typeWriter baselines, suppress tokens
             case ts.SyntaxKind.ThisKeyword:
+            case ts.SyntaxKind.SuperKeyword:
          //   case ts.SyntaxKind.RegularExpressionLiteral:
             case ts.SyntaxKind.ArrayLiteral:
             case ts.SyntaxKind.ObjectLiteral:
@@ -92,7 +93,7 @@ class TypeWriterWalker {
             line: lineAndCharacter.line - 1,
             column: lineAndCharacter.character,
             syntaxKind: ts.SyntaxKind[node.kind],
-            identifierName: sourceText,
+            sourceText: sourceText,
             type: isUnknownType
                 ? this.checker.symbolToString(symbol, node.parent, ts.SymbolFlags.Value | ts.SymbolFlags.Type | ts.SymbolFlags.Namespace | ts.SymbolFlags.Import)
                 : this.checker.typeToString(type, node.parent, ts.TypeFormatFlags.UseTypeOfFunction | writeArrayAsGenericType)
diff --git a/tests/baselines/reference/accessOverriddenBaseClassMember1.types b/tests/baselines/reference/accessOverriddenBaseClassMember1.types
index 89701992cae..15007cebf4c 100644
--- a/tests/baselines/reference/accessOverriddenBaseClassMember1.types
+++ b/tests/baselines/reference/accessOverriddenBaseClassMember1.types
@@ -32,6 +32,7 @@ class ColoredPoint extends Point {
 
         super(x, y);
 >super(x, y) : void
+>super : typeof Point
 >x : number
 >y : number
     }
@@ -43,6 +44,7 @@ class ColoredPoint extends Point {
 >super.toString() + " color=" : string
 >super.toString() : string
 >super.toString : () => string
+>super : Point
 >toString : () => string
 >this.color : string
 >this : ColoredPoint
diff --git a/tests/baselines/reference/captureThisInSuperCall.types b/tests/baselines/reference/captureThisInSuperCall.types
index dc11b56ada2..faa7d2ad97e 100644
--- a/tests/baselines/reference/captureThisInSuperCall.types
+++ b/tests/baselines/reference/captureThisInSuperCall.types
@@ -12,6 +12,7 @@ class B extends A {
 
     constructor() { super({ test: () => this.someMethod()}); } 
 >super({ test: () => this.someMethod()}) : void
+>super : typeof A
 >{ test: () => this.someMethod()} : { test: () => void; }
 >test : () => void
 >() => this.someMethod() : () => void
diff --git a/tests/baselines/reference/classSideInheritance2.types b/tests/baselines/reference/classSideInheritance2.types
index 8f89cca44bd..9c2d632ebbb 100644
--- a/tests/baselines/reference/classSideInheritance2.types
+++ b/tests/baselines/reference/classSideInheritance2.types
@@ -21,6 +21,7 @@ class SubText extends TextBase {
 
             super();
 >super() : void
+>super : typeof TextBase
         }
 }
 
diff --git a/tests/baselines/reference/commentsInheritance.types b/tests/baselines/reference/commentsInheritance.types
index 5fc9a564cf1..b4db5767107 100644
--- a/tests/baselines/reference/commentsInheritance.types
+++ b/tests/baselines/reference/commentsInheritance.types
@@ -178,6 +178,7 @@ class c3 extends c2 {
     constructor() {
         super(10);
 >super(10) : void
+>super : typeof c2
     }
     /** c3 p1*/
     public p1: number;
diff --git a/tests/baselines/reference/constructorArgs.types b/tests/baselines/reference/constructorArgs.types
index 14971ac935f..ccd23c22f5d 100644
--- a/tests/baselines/reference/constructorArgs.types
+++ b/tests/baselines/reference/constructorArgs.types
@@ -24,6 +24,7 @@ class Sub extends Super {
 
   super(options.value);
 >super(options.value) : void
+>super : typeof Super
 >options.value : number
 >options : Options
 >value : number
diff --git a/tests/baselines/reference/constructorFunctionTypeIsAssignableToBaseType2.types b/tests/baselines/reference/constructorFunctionTypeIsAssignableToBaseType2.types
index b9fccd0efea..53853163827 100644
--- a/tests/baselines/reference/constructorFunctionTypeIsAssignableToBaseType2.types
+++ b/tests/baselines/reference/constructorFunctionTypeIsAssignableToBaseType2.types
@@ -34,6 +34,7 @@ class Derived extends Base {
 
         super(x);
 >super(x) : void
+>super : typeof Base
 >x : number
     }
 }
@@ -55,6 +56,7 @@ class Derived2 extends Base {
 
         super(x);
 >super(x) : void
+>super : typeof Base
 >x : any
 
         return 1;
diff --git a/tests/baselines/reference/constructorOverloads2.types b/tests/baselines/reference/constructorOverloads2.types
index fc5b97723b4..65da67f04fe 100644
--- a/tests/baselines/reference/constructorOverloads2.types
+++ b/tests/baselines/reference/constructorOverloads2.types
@@ -34,6 +34,7 @@ class Foo extends FooBase {
 
         super(x);
 >super(x) : void
+>super : typeof FooBase
 >x : any
     }
     bar1() {  /*WScript.Echo("bar1");*/ }
diff --git a/tests/baselines/reference/declFileGenericType2.types b/tests/baselines/reference/declFileGenericType2.types
index 14125855b36..b8b43503dc0 100644
--- a/tests/baselines/reference/declFileGenericType2.types
+++ b/tests/baselines/reference/declFileGenericType2.types
@@ -92,6 +92,7 @@ module templa.dom.mvc {
         constructor() {
             super();
 >super() : void
+>super : typeof templa.mvc.AbstractController
         }
     }
 }
@@ -127,6 +128,7 @@ module templa.dom.mvc.composite {
         constructor() {
             super();
 >super() : void
+>super : typeof AbstractElementController
 
             this._controllers = [];
 >this._controllers = [] : templa.mvc.IController<templa.mvc.IModel>[]
diff --git a/tests/baselines/reference/derivedTypeAccessesHiddenBaseCallViaSuperPropertyAccess.types b/tests/baselines/reference/derivedTypeAccessesHiddenBaseCallViaSuperPropertyAccess.types
index e9a24afdba2..4f1ff1780dc 100644
--- a/tests/baselines/reference/derivedTypeAccessesHiddenBaseCallViaSuperPropertyAccess.types
+++ b/tests/baselines/reference/derivedTypeAccessesHiddenBaseCallViaSuperPropertyAccess.types
@@ -34,6 +34,7 @@ class Derived extends Base {
 >r : { a: number; }
 >super.foo({ a: 1 }) : { a: number; }
 >super.foo : (x: { a: number; }) => { a: number; }
+>super : Base
 >foo : (x: { a: number; }) => { a: number; }
 >{ a: 1 } : { a: number; }
 >a : number
@@ -42,6 +43,7 @@ class Derived extends Base {
 >r2 : { a: number; }
 >super.foo({ a: 1, b: 2 }) : { a: number; }
 >super.foo : (x: { a: number; }) => { a: number; }
+>super : Base
 >foo : (x: { a: number; }) => { a: number; }
 >{ a: 1, b: 2 } : { a: number; b: number; }
 >a : number
diff --git a/tests/baselines/reference/es6ClassSuperCodegenBug.types b/tests/baselines/reference/es6ClassSuperCodegenBug.types
index 2c74789b587..7b8a4abadfe 100644
--- a/tests/baselines/reference/es6ClassSuperCodegenBug.types
+++ b/tests/baselines/reference/es6ClassSuperCodegenBug.types
@@ -14,10 +14,12 @@ class B extends A {
 	    if (true) {
 	        super('a1', 'b1');
 >super('a1', 'b1') : void
+>super : typeof A
 
 	    } else {
 	        super('a2', 'b2');
 >super('a2', 'b2') : void
+>super : typeof A
 	    }
     }
 }
diff --git a/tests/baselines/reference/functionSubtypingOfVarArgs.types b/tests/baselines/reference/functionSubtypingOfVarArgs.types
index ab048380ae5..ebd706e94cf 100644
--- a/tests/baselines/reference/functionSubtypingOfVarArgs.types
+++ b/tests/baselines/reference/functionSubtypingOfVarArgs.types
@@ -34,6 +34,7 @@ class StringEvent extends EventBase { // should work
         super.add(listener);
 >super.add(listener) : void
 >super.add : (listener: (...args: any[]) => void) => void
+>super : EventBase
 >add : (listener: (...args: any[]) => void) => void
 >listener : (items: string) => void
     }
diff --git a/tests/baselines/reference/functionSubtypingOfVarArgs2.types b/tests/baselines/reference/functionSubtypingOfVarArgs2.types
index 3aeec10f271..2fef933594d 100644
--- a/tests/baselines/reference/functionSubtypingOfVarArgs2.types
+++ b/tests/baselines/reference/functionSubtypingOfVarArgs2.types
@@ -36,6 +36,7 @@ class StringEvent extends EventBase {
         super.add(listener);
 >super.add(listener) : void
 >super.add : (listener: (...args: any[]) => void) => void
+>super : EventBase
 >add : (listener: (...args: any[]) => void) => void
 >listener : (items: string, moreitems: number) => void
     }
diff --git a/tests/baselines/reference/genericClassPropertyInheritanceSpecialization.types b/tests/baselines/reference/genericClassPropertyInheritanceSpecialization.types
index 46cec5f6b83..5337c6cf6b3 100644
--- a/tests/baselines/reference/genericClassPropertyInheritanceSpecialization.types
+++ b/tests/baselines/reference/genericClassPropertyInheritanceSpecialization.types
@@ -202,6 +202,7 @@ module PortalFx.ViewModels.Controls.Validators {
 
             super(message);
 >super(message) : void
+>super : typeof Portal.Controls.Validators.Validator
 >message : string
         }
     }
diff --git a/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes.types b/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes.types
index 61fbea7b1ee..e7e6be5f7bb 100644
--- a/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes.types
+++ b/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes.types
@@ -59,6 +59,7 @@ module EndGate.Tweening {
 
             super(from);
 >super(from) : void
+>super : typeof Tween
 >from : number
         }
     }
diff --git a/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes2.types b/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes2.types
index 3a5c24a772f..8f872e71b0d 100644
--- a/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes2.types
+++ b/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes2.types
@@ -59,6 +59,7 @@ module EndGate.Tweening {
 
             super(from);
 >super(from) : void
+>super : typeof Tween
 >from : number
         }
     }
diff --git a/tests/baselines/reference/super2.types b/tests/baselines/reference/super2.types
index 92b5be42044..86fb33227de 100644
--- a/tests/baselines/reference/super2.types
+++ b/tests/baselines/reference/super2.types
@@ -37,6 +37,7 @@ class SubSub5 extends Sub5 {
         return super.x();
 >super.x() : string
 >super.x : () => string
+>super : Sub5
 >x : () => string
     }
     public y() {
@@ -45,6 +46,7 @@ class SubSub5 extends Sub5 {
         return super.y();
 >super.y() : string
 >super.y : () => string
+>super : Sub5
 >y : () => string
     }
 }
@@ -81,6 +83,7 @@ class SubSub6 extends Sub6 {
         return super.y();
 >super.y() : string
 >super.y : () => string
+>super : Sub6
 >y : () => string
     }
 }
diff --git a/tests/baselines/reference/superAccessInFatArrow1.types b/tests/baselines/reference/superAccessInFatArrow1.types
index 882967d920d..d6c613e63f5 100644
--- a/tests/baselines/reference/superAccessInFatArrow1.types
+++ b/tests/baselines/reference/superAccessInFatArrow1.types
@@ -30,6 +30,7 @@ module test {
                 super.foo();
 >super.foo() : void
 >super.foo : () => void
+>super : A
 >foo : () => void
 
             });
diff --git a/tests/baselines/reference/superCallArgsMustMatch.types b/tests/baselines/reference/superCallArgsMustMatch.types
index 6f5637edd1a..c2019881d94 100644
--- a/tests/baselines/reference/superCallArgsMustMatch.types
+++ b/tests/baselines/reference/superCallArgsMustMatch.types
@@ -23,6 +23,7 @@ class T6 extends T5<number>{
 
         super("hi"); // Should error, base constructor has type T for first arg, which is fixed as number in the extends clause
 >super("hi") : void
+>super : typeof T5
 
         var x: number = this.foo;
 >x : number
diff --git a/tests/baselines/reference/superCallFromClassThatDerivesFromGenericType1.types b/tests/baselines/reference/superCallFromClassThatDerivesFromGenericType1.types
index e125522bbb7..7630d67606a 100644
--- a/tests/baselines/reference/superCallFromClassThatDerivesFromGenericType1.types
+++ b/tests/baselines/reference/superCallFromClassThatDerivesFromGenericType1.types
@@ -21,6 +21,7 @@ class D extends B<any> {
     constructor() {
         super();
 >super() : void
+>super : typeof B
     }
 }
 
diff --git a/tests/baselines/reference/superCallFromClassThatDerivesFromGenericType2.types b/tests/baselines/reference/superCallFromClassThatDerivesFromGenericType2.types
index 0aa1487543f..cd26719d22e 100644
--- a/tests/baselines/reference/superCallFromClassThatDerivesFromGenericType2.types
+++ b/tests/baselines/reference/superCallFromClassThatDerivesFromGenericType2.types
@@ -17,6 +17,7 @@ class D extends B<any> {
     constructor() {
         super();
 >super() : void
+>super : typeof B
     }
 }
 
diff --git a/tests/baselines/reference/superCalls.types b/tests/baselines/reference/superCalls.types
index bc22cc734d2..fcb0ef045bc 100644
--- a/tests/baselines/reference/superCalls.types
+++ b/tests/baselines/reference/superCalls.types
@@ -24,11 +24,13 @@ class Derived extends Base {
 
         super('');
 >super('') : void
+>super : typeof Base
 
         //type of super call expression is void
         var p = super('');
 >p : void
 >super('') : void
+>super : typeof Base
 
         var p = v();
 >p : void
@@ -52,6 +54,7 @@ class OtherDerived extends OtherBase {
 
         super();
 >super() : void
+>super : typeof OtherBase
     }
 }
 
diff --git a/tests/baselines/reference/superInCatchBlock1.types b/tests/baselines/reference/superInCatchBlock1.types
index f7592c18486..616c11cee7f 100644
--- a/tests/baselines/reference/superInCatchBlock1.types
+++ b/tests/baselines/reference/superInCatchBlock1.types
@@ -20,6 +20,7 @@ class B extends A {
    super.m();
 >super.m() : void
 >super.m : () => void
+>super : A
 >m : () => void
   }
  }
diff --git a/tests/baselines/reference/superWithGenericSpecialization.types b/tests/baselines/reference/superWithGenericSpecialization.types
index 1b9190176e8..258615b309f 100644
--- a/tests/baselines/reference/superWithGenericSpecialization.types
+++ b/tests/baselines/reference/superWithGenericSpecialization.types
@@ -20,6 +20,7 @@ class D<T> extends C<string> {
     constructor() {
         super(); // uses the type parameter type of the base class, ie string
 >super() : void
+>super : typeof C
     }
 }
 
diff --git a/tests/baselines/reference/superWithGenerics.types b/tests/baselines/reference/superWithGenerics.types
index 89086033284..3a034b67f04 100644
--- a/tests/baselines/reference/superWithGenerics.types
+++ b/tests/baselines/reference/superWithGenerics.types
@@ -21,6 +21,7 @@ class D extends B<any> {
     constructor() {
         super(); 
 >super() : void
+>super : typeof B
     }
 }
 
diff --git a/tests/baselines/reference/typeOfSuperCall.types b/tests/baselines/reference/typeOfSuperCall.types
index fdd8120f7d3..92108bedc15 100644
--- a/tests/baselines/reference/typeOfSuperCall.types
+++ b/tests/baselines/reference/typeOfSuperCall.types
@@ -11,5 +11,6 @@ class D extends C {
         var x: void = super();
 >x : void
 >super() : void
+>super : typeof C
     }
 }
diff --git a/tests/baselines/reference/validUseOfThisInSuper.types b/tests/baselines/reference/validUseOfThisInSuper.types
index 5c484ca33f0..d7c882496e2 100644
--- a/tests/baselines/reference/validUseOfThisInSuper.types
+++ b/tests/baselines/reference/validUseOfThisInSuper.types
@@ -14,6 +14,7 @@ class Super extends Base {
     constructor() {
         super((() => this)()); // ok since this is not the case: The constructor declares parameter properties or the containing class declares instance member variables with initializers.
 >super((() => this)()) : void
+>super : typeof Base
 >(() => this)() : Super
 >(() => this) : () => Super
 >() => this : () => Super
diff --git a/tests/baselines/reference/varArgsOnConstructorTypes.types b/tests/baselines/reference/varArgsOnConstructorTypes.types
index 7cfc1df66f3..17993a32fda 100644
--- a/tests/baselines/reference/varArgsOnConstructorTypes.types
+++ b/tests/baselines/reference/varArgsOnConstructorTypes.types
@@ -22,6 +22,7 @@ export class B extends A {
 
        super(element);
 >super(element) : void
+>super : typeof A
 >element : any
 
         this.p1 = element;

From 6a7d912fe4332af797b758a32dd6c0d2ff4d1f13 Mon Sep 17 00:00:00 2001
From: Jason Freeman <jfreeman@microsoft.com>
Date: Thu, 28 Aug 2014 12:40:58 -0700
Subject: [PATCH 07/11] Print pure namespaces as unknown

---
 src/compiler/checker.ts                       |   12 -
 src/harness/typeWriter.ts                     |   10 +-
 ...FunctionWithTheSameNameAndCommonRoot.types |    2 +-
 ...eAndAmbientWithSameNameAndCommonRoot.types |    6 +-
 ...mbientClassWithSameNameAndCommonRoot.types |    6 +-
 ...FunctionWithTheSameNameAndCommonRoot.types |    2 +-
 ...AndNonExportedFunctionThatShareAName.types |    6 +-
 ...iableAndNonExportedVarThatShareAName.types |    6 +-
 ...umAndModuleWithSameNameAndCommonRoot.types |    2 +-
 ...ExtendsInterfaceWithInaccessibleType.types |    2 +-
 ...assHeritageListMemberTypeAnnotations.types |    2 +-
 ...cessibleTypeInIndexerTypeAnnotations.types |    2 +-
 ...essibleTypeInTypeParameterConstraint.types |    2 +-
 ...esInParameterAndReturnTypeAnnotation.types |    2 +-
 ...ssibleTypesInParameterTypeAnnotation.types |    2 +-
 ...ccessibleTypesInReturnTypeAnnotation.types |    2 +-
 ...assHeritageListMemberTypeAnnotations.types |    2 +-
 ...cessibleTypeInIndexerTypeAnnotations.types |    2 +-
 ...essibleTypeInTypeParameterConstraint.types |    2 +-
 ...hAccessibleTypesOnItsExportedMembers.types |    4 +-
 ...cessibleTypesInMemberTypeAnnotations.types |    2 +-
 ...peWithInaccessibleTypeAsTypeArgument.types |    2 +-
 ...leWithAccessibleTypeInTypeAnnotation.types |    2 +-
 ...WithInaccessibleTypeInTypeAnnotation.types |    2 +-
 ...leWithSameNameAndDifferentCommonRoot.types |    6 +-
 ...duleAndEnumWithSameNameAndCommonRoot.types |    2 +-
 ...edAndNonExportedClassesOfTheSameName.types |   26 +-
 ...ndNonExportedInterfacesOfTheSameName.types |   38 +-
 ...AndNonExportedLocalVarsOfTheSameName.types |   18 +-
 ...hWithExportedInterfacesOfTheSameName.types |   44 +-
 ...EachWithExportedModulesOfTheSameName.types |   26 +-
 ...ithTheSameNameAndDifferentCommonRoot.types |   24 +-
 ...ulesWithTheSameNameAndSameCommonRoot.types |   18 +-
 .../reference/acceptableAlias1.types          |   12 +-
 .../additionOperatorWithAnyAndEveryType.types |    2 +-
 .../aliasUsageInAccessorsOfClass.types        |    8 +-
 .../reference/aliasUsageInArray.types         |    8 +-
 .../aliasUsageInFunctionExpression.types      |    8 +-
 .../aliasUsageInGenericFunction.types         |    8 +-
 .../aliasUsageInIndexerOfClass.types          |    8 +-
 .../reference/aliasUsageInObjectLiteral.types |    8 +-
 .../reference/aliasUsageInOrExpression.types  |    8 +-
 ...asUsageInTypeArgumentOfExtendsClause.types |    8 +-
 .../reference/aliasUsageInVarAssignment.types |    8 +-
 .../reference/aliasUsedAsNameValue.types      |    4 +-
 .../reference/ambientDeclarations.types       |    4 +-
 .../ambientEnumElementInitializer6.types      |    2 +-
 ...lModuleWithInternalImportDeclaration.types |    6 +-
 ...duleWithoutInternalImportDeclaration.types |    4 +-
 .../baselines/reference/ambientFundule.types  |    2 +-
 .../reference/ambientModuleExports.types      |    4 +-
 ...oduleWithClassDeclarationWithExtends.types |    2 +-
 .../baselines/reference/ambientModules.types  |    4 +-
 .../amdImportAsPrimaryExpression.types        |    2 +-
 .../amdImportNotAsPrimaryExpression.types     |   18 +-
 tests/baselines/reference/anonterface.types   |    2 +-
 .../anyAssignabilityInInheritance.types       |    4 +-
 .../reference/arrayAssignmentTest6.types      |    2 +-
 .../reference/arrayOfExportedClass.types      |    2 +-
 ...ayTypeInSignatureOfInterfaceAndClass.types |    8 +-
 .../arrowFunctionInExpressionStatement2.types |    2 +-
 tests/baselines/reference/assign1.types       |    2 +-
 .../assignmentCompatWithObjectMembers.types   |    4 +-
 .../reference/assignmentCompatability1.types  |    4 +-
 .../reference/assignmentCompatability2.types  |    4 +-
 .../reference/assignmentCompatability3.types  |    4 +-
 .../reference/assignmentCompatability4.types  |    4 +-
 .../reference/assignmentCompatability5.types  |    4 +-
 .../reference/assignmentCompatability6.types  |    4 +-
 .../reference/assignmentCompatability7.types  |    4 +-
 .../reference/assignmentCompatability8.types  |    4 +-
 .../reference/assignmentCompatability9.types  |    4 +-
 .../reference/augmentedTypesClass3.types      |    6 +-
 .../augmentedTypesExternalModule1.types       |    2 +-
 .../reference/augmentedTypesModules3b.types   |   12 +-
 .../reference/augmentedTypesModules4.types    |   14 +-
 .../binopAssignmentShouldHaveType.types       |    2 +-
 .../bitwiseNotOperatorWithBooleanType.types   |    2 +-
 .../bitwiseNotOperatorWithNumberType.types    |    2 +-
 .../bitwiseNotOperatorWithStringType.types    |    2 +-
 ...WithoutReturnTypeAnnotationInference.types |    8 +-
 .../reference/chainedImportAlias.types        |    6 +-
 .../reference/circularImportAlias.types       |   10 +-
 ...rationMergedInModuleWithContinuation.types |    8 +-
 .../classExtendingQualifiedName2.types        |    4 +-
 .../classImplementsImportedInterface.types    |    8 +-
 .../cloduleAcrossModuleDefinitions.types      |    8 +-
 .../reference/cloduleAndTypeParameters.types  |    2 +-
 tests/baselines/reference/cloduleTest1.types  |    2 +-
 .../cloduleWithRecursiveReference.types       |    4 +-
 ...CodeGenModuleWithConstructorChildren.types |    6 +-
 ...nCodeGenModuleWithEnumMemberConflict.types |    2 +-
 ...ionCodeGenModuleWithFunctionChildren.types |    6 +-
 ...CodeGenModuleWithMemberClassConflict.types |    4 +-
 ...GenModuleWithMemberInterfaceConflict.types |    2 +-
 ...isionCodeGenModuleWithMemberVariable.types |    2 +-
 ...isionCodeGenModuleWithMethodChildren.types |    8 +-
 ...isionCodeGenModuleWithModuleChildren.types |   22 +-
 ...sionCodeGenModuleWithModuleReopening.types |    8 +-
 ...lisionCodeGenModuleWithPrivateMember.types |    2 +-
 ...llisionCodeGenModuleWithUnicodeNames.types |    2 +-
 .../collisionExportsRequireAndModule.types    |    8 +-
 ...xportsRequireAndUninstantiatedModule.types |    8 +-
 .../reference/commentOnElidedModule1.types    |    4 +-
 .../reference/commentsDottedModuleName.types  |    4 +-
 .../reference/commentsExternalModules.types   |   10 +-
 .../reference/commentsExternalModules2.types  |   10 +-
 .../reference/commentsExternalModules3.types  |   10 +-
 .../reference/commentsFormatting.types        |    2 +-
 .../baselines/reference/commentsModules.types |   42 +-
 .../commentsMultiModuleMultiFile.types        |    8 +-
 .../commentsMultiModuleSingleFile.types       |    4 +-
 .../reference/commentsdoNotEmitComments.types |    4 +-
 .../reference/commentsemitComments.types      |    4 +-
 .../commonJSImportAsPrimaryExpression.types   |    2 +-
 ...commonJSImportNotAsPrimaryExpression.types |   18 +-
 .../reference/compoundVarDecl1.types          |    2 +-
 ...nstructorArgWithGenericCallSignature.types |    4 +-
 .../constructorHasPrototypeProperty.types     |    4 +-
 .../reference/convertKeywordsYes.types        |    2 +-
 tests/baselines/reference/covariance1.types   |    2 +-
 .../reference/cyclicModuleImport.types        |    4 +-
 ...ternalModuleWithSingleExportedModule.types |   12 +-
 ...ExportAssignmentImportInternalModule.types |   12 +-
 ...leExportAssignmentOfGenericInterface.types |    2 +-
 .../reference/declFileExportImportChain.types |   20 +-
 .../declFileExportImportChain2.types          |   16 +-
 .../reference/declFileForExportedImport.types |    4 +-
 .../reference/declFileGenericType.types       |   40 +-
 .../reference/declFileGenericType2.types      |   90 +-
 ...eclFileImportChainInExportAssignment.types |    8 +-
 ...FileImportModuleWithExportAssignment.types |   10 +-
 ...FileImportedTypeUseInTypeArgPosition.types |    4 +-
 .../reference/declFileInternalAliases.types   |   10 +-
 ...uleAssignmentInObjectLiteralProperty.types |    2 +-
 .../declFileModuleContinuation.types          |   14 +-
 ...clFileModuleWithPropertyOfTypeModule.types |    2 +-
 .../declFileTypeofInAnonymousType.types       |    4 +-
 .../reference/declFileTypeofModule.types      |    4 +-
 ...tingWithClassReferredByExtendsClause.types |   32 +-
 ...lauseThatHasItsContainerNameConflict.types |   16 +-
 ...lModuleNameConflictsInExtendsClause1.types |   22 +-
 ...lModuleNameConflictsInExtendsClause2.types |   28 +-
 ...lModuleNameConflictsInExtendsClause3.types |   30 +-
 tests/baselines/reference/declInput4.types    |    2 +-
 .../declarationEmit_nameConflicts.types       |   42 +-
 .../declarationEmit_nameConflicts2.types      |   16 +-
 .../declarationEmit_nameConflicts3.types      |   14 +-
 ...clarationEmit_nameConflictsWithAlias.types |   12 +-
 .../reference/declareDottedExtend.types       |   12 +-
 .../reference/declareDottedModuleName.types   |   16 +-
 ...ernalModuleWithExportAssignedFundule.types |    4 +-
 .../declareFileExportAssignment.types         |    8 +-
 ...signmentWithVarFromVariableStatement.types |    8 +-
 .../decrementOperatorWithAnyOtherType.types   |    2 +-
 .../decrementOperatorWithNumberType.types     |    2 +-
 .../deleteOperatorWithBooleanType.types       |    2 +-
 .../deleteOperatorWithNumberType.types        |    2 +-
 .../deleteOperatorWithStringType.types        |    2 +-
 .../reference/dependencyViaImportAlias.types  |    4 +-
 .../reference/dottedModuleName2.types         |   22 +-
 .../reference/duplicateAnonymousInners1.types |    4 +-
 .../duplicateAnonymousModuleClasses.types     |   14 +-
 .../reference/duplicateVarAndImport.types     |    6 +-
 .../reference/duplicateVariablesByScope.types |    2 +-
 .../emitMemberAccessExpression.types          |   12 +-
 tests/baselines/reference/enumDecl1.types     |    2 +-
 .../reference/enumFromExternalModule.types    |    2 +-
 tests/baselines/reference/enumMerging.types   |   18 +-
 .../enumsWithMultipleDeclarations3.types      |    2 +-
 tests/baselines/reference/es6ClassTest5.types |    2 +-
 tests/baselines/reference/es6ClassTest7.types |    4 +-
 .../reference/escapedIdentifiers.types        |    4 +-
 ...veryTypeWithAnnotationAndInitializer.types |    4 +-
 .../reference/everyTypeWithInitializer.types  |    2 +-
 .../exportAssignClassAndModule.types          |    4 +-
 .../reference/exportAssignValueAndType.types  |    4 +-
 .../exportAssignedTypeAsTypeAnnotation.types  |    2 +-
 .../exportAssignmentCircularModules.types     |   12 +-
 .../reference/exportAssignmentClass.types     |    2 +-
 .../reference/exportAssignmentEnum.types      |    2 +-
 .../reference/exportAssignmentError.types     |    4 +-
 .../reference/exportAssignmentFunction.types  |    2 +-
 .../exportAssignmentGenericType.types         |    2 +-
 .../reference/exportAssignmentInterface.types |    2 +-
 .../exportAssignmentInternalModule.types      |    4 +-
 .../exportAssignmentMergedInterface.types     |    2 +-
 .../exportAssignmentMergedModule.types        |    8 +-
 .../exportAssignmentOfGenericType1.types      |    2 +-
 .../exportAssignmentTopLevelClodule.types     |    4 +-
 .../exportAssignmentTopLevelEnumdule.types    |    4 +-
 .../exportAssignmentTopLevelFundule.types     |    4 +-
 .../exportAssignmentTopLevelIdentifier.types  |    4 +-
 .../reference/exportAssignmentVariable.types  |    2 +-
 ...nmentWithImportStatementPrivacyError.types |   12 +-
 tests/baselines/reference/exportCodeGen.types |   16 +-
 .../reference/exportEqualCallable.types       |    2 +-
 .../reference/exportEqualNamespaces.types     |    2 +-
 tests/baselines/reference/exportImport.types  |    6 +-
 .../reference/exportImportAlias.types         |   34 +-
 .../reference/exportImportAndClodule.types    |   12 +-
 .../reference/exportImportMultipleFiles.types |    4 +-
 .../exportImportNonInstantiatedModule.types   |   12 +-
 .../exportImportNonInstantiatedModule2.types  |    6 +-
 .../reference/exportPrivateType.types         |    2 +-
 tests/baselines/reference/extBaseClass1.types |    8 +-
 ...ndingClassFromAliasAndUsageInIndexer.types |   14 +-
 .../reference/externModuleClobber.types       |    8 +-
 .../reference/externalModuleAssignToVar.types |    8 +-
 ...fImportDeclarationWithExportModifier.types |    2 +-
 .../reference/externalModuleResolution.types  |    4 +-
 .../reference/externalModuleResolution2.types |    4 +-
 tests/baselines/reference/fatArrowSelf.types  |    6 +-
 tests/baselines/reference/forInModule.types   |    2 +-
 tests/baselines/reference/forStatements.types |    4 +-
 tests/baselines/reference/funcdecl.types      |    2 +-
 tests/baselines/reference/functionCall5.types |    4 +-
 .../functionInIfStatementInModule.types       |    2 +-
 .../reference/functionMergedWithModule.types  |    8 +-
 ...ExportedClassIsUsedBeforeDeclaration.types |    6 +-
 ...fFunctionWithoutReturnTypeAnnotation.types |    2 +-
 .../funduleUsedAcrossFileBoundary.types       |    4 +-
 .../reference/generatedContextualTyping.types |   48 +-
 .../generativeRecursionWithTypeOf.types       |    2 +-
 ...dNonGenericInterfaceWithTheSameName2.types |   10 +-
 ...nericArgumentCallSigAssignmentCompat.types |    4 +-
 ...hOverloadedConstructorTypedArguments.types |    4 +-
 ...WithOverloadedFunctionTypedArguments.types |    4 +-
 .../genericCallbacksAndClassHierarchy.types   |    2 +-
 ...ingGenericInterfaceFromAnotherModule.types |    6 +-
 ...assPropertyInheritanceSpecialization.types |   46 +-
 ...lassWithFunctionTypedMemberArguments.types |    4 +-
 ...lassWithObjectTypeArgsAndConstraints.types |    4 +-
 .../genericClassWithStaticFactory.types       |    2 +-
 .../reference/genericClassesInModule.types    |    4 +-
 .../reference/genericCloduleInModule.types    |    6 +-
 ...ericConstraintOnExtendedBuiltinTypes.types |   12 +-
 ...ricConstraintOnExtendedBuiltinTypes2.types |   12 +-
 .../reference/genericInference2.types         |    2 +-
 .../reference/genericOfACloduleType1.types    |    6 +-
 .../reference/genericOfACloduleType2.types    |    8 +-
 ...cRecursiveImplicitConstructorErrors2.types |    2 +-
 .../genericTypeArgumentInference1.types       |    4 +-
 tests/baselines/reference/global.types        |    2 +-
 .../heterogeneousArrayLiterals.types          |    4 +-
 .../reference/ifDoWhileStatements.types       |    4 +-
 .../reference/importAliasIdentifiers.types    |   20 +-
 .../reference/importAliasWithDottedName.types |    8 +-
 ...mportAndVariableDeclarationConflict2.types |    4 +-
 tests/baselines/reference/importDecl.types    |   20 +-
 ...clWithExportModifierInAmbientContext.types |    6 +-
 .../importDeclarationUsedAsTypeQuery.types    |    2 +-
 .../reference/importImportOnlyModule.types    |    4 +-
 .../reference/importInTypePosition.types      |   12 +-
 .../importOnAliasedIdentifiers.types          |    8 +-
 .../reference/importShadowsGlobalName.types   |    2 +-
 .../reference/importStatements.types          |   22 +-
 .../reference/importUsedInExtendsList1.types  |    4 +-
 .../import_reference-exported-alias.types     |   12 +-
 .../import_reference-to-type-alias.types      |    8 +-
 ...ferenecing-aliased-type-throug-array.types |    2 +-
 ...referencing-an-imported-module-alias.types |    2 +-
 .../importedModuleClassNameClash.types        |    6 +-
 .../incrementOperatorWithAnyOtherType.types   |    2 +-
 .../incrementOperatorWithNumberType.types     |    2 +-
 tests/baselines/reference/indexIntoEnum.types |    2 +-
 ...heritanceOfGenericConstructorMethod2.types |    8 +-
 tests/baselines/reference/innerAliases2.types |   12 +-
 .../reference/innerBoundLambdaEmit.types      |    4 +-
 tests/baselines/reference/innerExtern.types   |    6 +-
 tests/baselines/reference/innerFunc.types     |    2 +-
 .../instanceOfInExternalModules.types         |    2 +-
 .../reference/instantiatedModule.types        |   16 +-
 .../interMixingModulesInterfaces0.types       |    6 +-
 .../interMixingModulesInterfaces1.types       |    6 +-
 .../interMixingModulesInterfaces2.types       |    6 +-
 .../interMixingModulesInterfaces3.types       |    6 +-
 .../interMixingModulesInterfaces4.types       |    4 +-
 .../interMixingModulesInterfaces5.types       |    4 +-
 .../reference/interfaceInReopenedModule.types |    4 +-
 .../interfaceWithPropertyOfEveryType.types    |    2 +-
 .../reference/internalAliasClass.types        |    6 +-
 ...liasClassInsideLocalModuleWithExport.types |    8 +-
 ...sClassInsideLocalModuleWithoutExport.types |    8 +-
 ...sClassInsideTopLevelModuleWithExport.types |    4 +-
 ...assInsideTopLevelModuleWithoutExport.types |    4 +-
 .../reference/internalAliasEnum.types         |    6 +-
 ...AliasEnumInsideLocalModuleWithExport.types |    6 +-
 ...asEnumInsideLocalModuleWithoutExport.types |    6 +-
 ...asEnumInsideTopLevelModuleWithExport.types |    4 +-
 ...numInsideTopLevelModuleWithoutExport.types |    4 +-
 .../reference/internalAliasFunction.types     |    6 +-
 ...sFunctionInsideLocalModuleWithExport.types |    6 +-
 ...nctionInsideLocalModuleWithoutExport.types |    6 +-
 ...nctionInsideTopLevelModuleWithExport.types |    4 +-
 ...ionInsideTopLevelModuleWithoutExport.types |    4 +-
 .../internalAliasInitializedModule.types      |   10 +-
 ...zedModuleInsideLocalModuleWithExport.types |   10 +-
 ...ModuleInsideLocalModuleWithoutExport.types |   10 +-
 ...ModuleInsideTopLevelModuleWithExport.types |    8 +-
 ...uleInsideTopLevelModuleWithoutExport.types |    8 +-
 .../reference/internalAliasInterface.types    |    8 +-
 ...InterfaceInsideLocalModuleWithExport.types |    8 +-
 ...erfaceInsideLocalModuleWithoutExport.types |    8 +-
 ...erfaceInsideTopLevelModuleWithExport.types |    6 +-
 ...aceInsideTopLevelModuleWithoutExport.types |    6 +-
 .../internalAliasUninitializedModule.types    |   14 +-
 ...zedModuleInsideLocalModuleWithExport.types |   14 +-
 ...ModuleInsideLocalModuleWithoutExport.types |   14 +-
 ...ModuleInsideTopLevelModuleWithExport.types |   12 +-
 ...uleInsideTopLevelModuleWithoutExport.types |   12 +-
 .../reference/internalAliasVar.types          |    6 +-
 ...lAliasVarInsideLocalModuleWithExport.types |    6 +-
 ...iasVarInsideLocalModuleWithoutExport.types |    6 +-
 ...iasVarInsideTopLevelModuleWithExport.types |    4 +-
 ...VarInsideTopLevelModuleWithoutExport.types |    4 +-
 .../internalAliasWithDottedNameEmit.types     |   14 +-
 ...lassNotReferencingInstanceNoConflict.types |    6 +-
 ...lassNotReferencingInstanceNoConflict.types |    6 +-
 ...duleNotReferencingInstanceNoConflict.types |    8 +-
 .../reference/invalidUndefinedValues.types    |    2 +-
 tests/baselines/reference/ipromise2.types     |   24 +-
 tests/baselines/reference/ipromise4.types     |   24 +-
 tests/baselines/reference/listFailure.types   |    2 +-
 .../localAliasExportAssignment.types          |    2 +-
 .../localImportNameVsGlobalName.types         |    6 +-
 .../logicalNotOperatorWithBooleanType.types   |    2 +-
 .../logicalNotOperatorWithNumberType.types    |    2 +-
 .../logicalNotOperatorWithStringType.types    |    2 +-
 .../memberAccessMustUseModuleInstances.types  |    2 +-
 .../reference/mergeThreeInterfaces.types      |    2 +-
 .../reference/mergeThreeInterfaces2.types     |   16 +-
 .../reference/mergeTwoInterfaces.types        |    2 +-
 .../reference/mergeTwoInterfaces2.types       |   12 +-
 .../reference/mergedDeclarations1.types       |    2 +-
 .../reference/mergedDeclarations4.types       |    6 +-
 .../mergedInterfacesWithMultipleBases.types   |    2 +-
 .../mergedInterfacesWithMultipleBases2.types  |    2 +-
 .../mergedModuleDeclarationCodeGen2.types     |   10 +-
 .../mergedModuleDeclarationCodeGen3.types     |   10 +-
 .../mergedModuleDeclarationCodeGen4.types     |   16 +-
 .../mergedModuleDeclarationCodeGen5.types     |   12 +-
 ...duleDeclarationWithSharedExportedVar.types |    4 +-
 .../methodContainingLocalFunction.types       |    2 +-
 .../missingImportAfterModuleImport.types      |    2 +-
 .../reference/missingTypeArguments3.types     |    2 +-
 tests/baselines/reference/mixedExports.types  |    8 +-
 .../mixingFunctionAndAmbientModule1.types     |   22 +-
 .../reference/modFunctionCrash.types          |    2 +-
 .../moduleAliasAsFunctionArgument.types       |    2 +-
 .../reference/moduleAliasInterface.types      |   40 +-
 .../moduleAndInterfaceSharingName.types       |   10 +-
 .../moduleAndInterfaceSharingName3.types      |   10 +-
 .../moduleAndInterfaceSharingName4.types      |    8 +-
 .../reference/moduleCodeGenTest3.types        |    2 +-
 .../reference/moduleCodegenTest4.types        |    2 +-
 .../reference/moduleIdentifiers.types         |    2 +-
 ...oduleImportedForTypeArgumentPosition.types |    4 +-
 .../moduleMemberWithoutTypeAnnotation1.types  |   12 +-
 .../moduleMemberWithoutTypeAnnotation2.types  |    4 +-
 tests/baselines/reference/moduleMerge.types   |    4 +-
 tests/baselines/reference/moduleNoEmit.types  |    2 +-
 .../reference/moduleOuterQualification.types  |    6 +-
 .../reference/moduleRedifinitionErrors.types  |    2 +-
 .../moduleReopenedTypeOtherBlock.types        |    4 +-
 .../moduleReopenedTypeSameBlock.types         |    4 +-
 .../reference/moduleScopingBug.types          |    4 +-
 .../reference/moduleSymbolMerging.types       |    8 +-
 .../reference/moduleUnassignedVariable.types  |    2 +-
 .../moduleVariableArrayIndexer.types          |    2 +-
 .../baselines/reference/moduleVariables.types |    6 +-
 .../reference/moduleVisibilityTest1.types     |   16 +-
 .../moduleWithStatementsOfEveryKind.types     |    8 +-
 .../reference/moduleWithTryStatement1.types   |    2 +-
 .../reference/multiImportExport.types         |    6 +-
 .../reference/multiModuleClodule1.types       |    4 +-
 .../reference/multiModuleFundule1.types       |    4 +-
 tests/baselines/reference/nameCollision.types |   18 +-
 .../reference/nameDelimitedBySlashes.types    |    2 +-
 .../reference/nameWithRelativePaths.types     |    8 +-
 .../namedFunctionExpressionInModule.types     |    2 +-
 tests/baselines/reference/namespaces1.types   |   10 +-
 tests/baselines/reference/namespaces2.types   |    8 +-
 .../negateOperatorWithAnyOtherType.types      |    2 +-
 .../negateOperatorWithBooleanType.types       |    2 +-
 .../negateOperatorWithNumberType.types        |    2 +-
 .../negateOperatorWithStringType.types        |    2 +-
 .../reference/nestedModulePrivateAccess.types |    4 +-
 tests/baselines/reference/nestedModules.types |   24 +-
 tests/baselines/reference/nestedSelf.types    |    2 +-
 tests/baselines/reference/newArrays.types     |    2 +-
 .../reference/nonInstantiatedModule.types     |   12 +-
 ...ullIsSubtypeOfEverythingButUndefined.types |    4 +-
 .../overloadResolutionOverNonCTLambdas.types  |    2 +-
 ...overloadResolutionOverNonCTObjectLit.types |    2 +-
 .../parserFunctionDeclaration8.types          |    2 +-
 .../reference/parserModuleDeclaration11.types |    4 +-
 .../reference/parserModuleDeclaration12.types |    4 +-
 .../parserModuleDeclaration3.d.types          |    2 +-
 .../reference/parserModuleDeclaration4.types  |    6 +-
 .../reference/parserModuleDeclaration6.types  |    2 +-
 .../reference/parserModuleDeclaration7.types  |    4 +-
 .../reference/parserModuleDeclaration8.types  |    4 +-
 .../reference/parserModuleDeclaration9.types  |    6 +-
 .../reference/partiallyAmbientClodule.types   |    2 +-
 .../reference/partiallyAmbientFundule.types   |    2 +-
 .../plusOperatorWithBooleanType.types         |    2 +-
 .../plusOperatorWithNumberType.types          |    2 +-
 .../plusOperatorWithStringType.types          |    2 +-
 .../reference/primitiveTypeAsmoduleName.types |    2 +-
 ...ivacyCheckAnonymousFunctionParameter.types |    2 +-
 ...vacyCheckAnonymousFunctionParameter2.types |    4 +-
 ...ssignmentOnExportedGenericInterface1.types |    2 +-
 ...ssignmentOnExportedGenericInterface2.types |    2 +-
 ...ModuleExportAssignmentOfGenericClass.types |    2 +-
 tests/baselines/reference/privacyClass.types  |    4 +-
 tests/baselines/reference/privacyFunc.types   |    2 +-
 tests/baselines/reference/privacyGetter.types |    4 +-
 .../baselines/reference/privacyGloClass.types |    2 +-
 .../baselines/reference/privacyGloFunc.types  |    4 +-
 .../reference/privacyGloGetter.types          |    2 +-
 .../reference/privacyGloInterface.types       |    4 +-
 tests/baselines/reference/privacyGloVar.types |    2 +-
 .../reference/privacyInterface.types          |    8 +-
 ...mbientExternalModuleImportWithExport.types |    8 +-
 ...entExternalModuleImportWithoutExport.types |    8 +-
 tests/baselines/reference/privacyVar.types    |    4 +-
 .../reference/privateInstanceVisibility.types |    2 +-
 .../propertyNamesWithStringLiteral.types      |    2 +-
 ...tions-entity-names-referencing-a-var.types |    6 +-
 .../reference/reboundBaseClassSymbol.types    |    2 +-
 tests/baselines/reference/rectype.types       |    2 +-
 ...nstantiationsWithDefaultConstructors.types |    2 +-
 .../reference/recursiveCloduleReference.types |    4 +-
 ...eExportAssignmentAndFindAliasedType7.types |   10 +-
 ...recursiveIdenticalOverloadResolution.types |    2 +-
 tests/baselines/reference/recursiveMods.types |    4 +-
 ...elySpecializedConstructorDeclaration.types |    8 +-
 .../reference/requireEmitSemicolon.types      |   10 +-
 .../reservedNameOnModuleImport.types          |    8 +-
 ...sDeclarationWhenInBaseTypeResolution.types | 7598 ++++++++---------
 .../returnTypeParameterWithModules.types      |    6 +-
 .../reference/reuseInnerModuleMember.types    |    8 +-
 .../scopeResolutionIdentifiers.types          |    8 +-
 tests/baselines/reference/separate1-2.types   |    2 +-
 .../sourceMap-FileWithComments.types          |    2 +-
 .../sourceMap-StringLiteralWithNewLine.types  |    2 +-
 .../sourceMapValidationClasses.types          |    4 +-
 .../reference/sourceMapValidationImport.types |    6 +-
 .../reference/sourceMapValidationModule.types |    6 +-
 ...ipleFilesWithFileEndingWithInterface.types |    4 +-
 .../sourcemapValidationDuplicateNames.types   |    4 +-
 .../specializationOfExportedClass.types       |    2 +-
 .../reference/staticInstanceResolution3.types |    2 +-
 ...ringLiteralObjectLiteralDeclaration1.types |    2 +-
 tests/baselines/reference/structural1.types   |    2 +-
 ...structuralTypeInDeclareFileForModule.types |    2 +-
 tests/baselines/reference/subtypesOfAny.types |    4 +-
 .../subtypingWithCallSignatures.types         |    2 +-
 .../subtypingWithCallSignatures3.types        |    4 +-
 .../subtypingWithConstructSignatures.types    |    2 +-
 .../subtypingWithConstructSignatures3.types   |    4 +-
 ...ubtypingWithObjectMembersOptionality.types |    2 +-
 .../reference/superAccessInFatArrow1.types    |    2 +-
 .../reference/switchStatements.types          |    2 +-
 .../reference/testContainerList.types         |    2 +-
 .../reference/thisInModuleFunction1.types     |    2 +-
 .../baselines/reference/throwStatements.types |    2 +-
 tests/baselines/reference/topLevel.types      |    2 +-
 .../reference/topLevelAmbientModule.types     |    2 +-
 .../reference/topLevelFileModule.types        |    4 +-
 ...gedInterfacesWithDifferingOverloads2.types |    2 +-
 ...ssionWithUndefinedCallResolutionData.types |    2 +-
 .../typeOfThisInFunctionExpression.types      |    2 +-
 .../baselines/reference/typeResolution.types  |  102 +-
 .../typeofModuleWithoutExports.types          |    2 +-
 .../typeofOperatorWithBooleanType.types       |    2 +-
 .../typeofOperatorWithNumberType.types        |    2 +-
 .../typeofOperatorWithStringType.types        |    2 +-
 .../undefinedIsSubtypeOfEverything.types      |    4 +-
 .../reference/underscoreMapFirst.types        |    2 +-
 .../baselines/reference/underscoreTest1.types |    4 +-
 .../unexportedInstanceClassVariables.types    |    4 +-
 .../reference/unusedImportDeclaration.types   |    2 +-
 ...oduleWithExportImportInValuePosition.types |   14 +-
 tests/baselines/reference/vardecl.types       |    2 +-
 tests/baselines/reference/visSyntax.types     |    2 +-
 .../visibilityOfCrossModuleTypeUsage.types    |   12 +-
 .../voidOperatorWithBooleanType.types         |    2 +-
 .../voidOperatorWithNumberType.types          |    2 +-
 .../voidOperatorWithStringType.types          |    2 +-
 .../baselines/reference/withImportDecl.types  |    4 +-
 492 files changed, 5472 insertions(+), 5490 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 578fbd0e054..825f53c7c55 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -6916,18 +6916,6 @@ module ts {
                 return getDeclaredTypeOfSymbol(symbol);
             }
 
-            if (node.kind === SyntaxKind.ModuleDeclaration ||
-                node.kind === SyntaxKind.ImportDeclaration) {
-                return unknownType;
-            }
-
-            if (node.parent.kind === SyntaxKind.ModuleDeclaration ||
-                node.parent.kind === SyntaxKind.ImportDeclaration) {
-                if ((<Declaration>node.parent).name === node) {
-                    return unknownType;
-                }
-            }
-
             if (isDeclaration(node)) {
                 // In this case, we call getSymbolOfNode instead of getSymbolInfo because it is a declaration
                 var symbol = getSymbolOfNode(node);
diff --git a/src/harness/typeWriter.ts b/src/harness/typeWriter.ts
index 85a5b13c54c..c134bf3df18 100644
--- a/src/harness/typeWriter.ts
+++ b/src/harness/typeWriter.ts
@@ -29,7 +29,6 @@ class TypeWriterWalker {
             // old typeWriter baselines, suppress tokens
             case ts.SyntaxKind.ThisKeyword:
             case ts.SyntaxKind.SuperKeyword:
-         //   case ts.SyntaxKind.RegularExpressionLiteral:
             case ts.SyntaxKind.ArrayLiteral:
             case ts.SyntaxKind.ObjectLiteral:
             case ts.SyntaxKind.PropertyAccess:
@@ -79,10 +78,7 @@ class TypeWriterWalker {
         var lineAndCharacter = this.currentSourceFile.getLineAndCharacterFromPosition(actualPos);
         var sourceText = ts.getSourceTextOfNodeFromSourceText(this.currentSourceFile.text, node);
         var isUnknownType = (<ts.IntrinsicType>type).intrinsicName === "unknown";
-        if (isUnknownType) {
-            var symbol = this.checker.getSymbolInfo(node);
-        }
-        else {
+        if (!isUnknownType) {
             var writeArrayAsGenericType = node.kind === ts.SyntaxKind.Identifier && (<ts.Identifier>node).text === "Array" ? ts.TypeFormatFlags.WriteArrayAsGenericType : 0;
         }
         
@@ -94,9 +90,7 @@ class TypeWriterWalker {
             column: lineAndCharacter.character,
             syntaxKind: ts.SyntaxKind[node.kind],
             sourceText: sourceText,
-            type: isUnknownType
-                ? this.checker.symbolToString(symbol, node.parent, ts.SymbolFlags.Value | ts.SymbolFlags.Type | ts.SymbolFlags.Namespace | ts.SymbolFlags.Import)
-                : this.checker.typeToString(type, node.parent, ts.TypeFormatFlags.UseTypeOfFunction | writeArrayAsGenericType)
+            type: this.checker.typeToString(type, node.parent, ts.TypeFormatFlags.UseTypeOfFunction | writeArrayAsGenericType)
         });
     }
 
diff --git a/tests/baselines/reference/AmbientModuleAndAmbientFunctionWithTheSameNameAndCommonRoot.types b/tests/baselines/reference/AmbientModuleAndAmbientFunctionWithTheSameNameAndCommonRoot.types
index c03b7f31f37..da82a2ff662 100644
--- a/tests/baselines/reference/AmbientModuleAndAmbientFunctionWithTheSameNameAndCommonRoot.types
+++ b/tests/baselines/reference/AmbientModuleAndAmbientFunctionWithTheSameNameAndCommonRoot.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/internalModules/DeclarationMerging/module.d.ts ===
 declare module Point {
->Point : Point
+>Point : typeof Point
 
     export var Origin: { x: number; y: number; }
 >Origin : { x: number; y: number; }
diff --git a/tests/baselines/reference/AmbientModuleAndAmbientWithSameNameAndCommonRoot.types b/tests/baselines/reference/AmbientModuleAndAmbientWithSameNameAndCommonRoot.types
index 146e1c3b083..8846d2c3a37 100644
--- a/tests/baselines/reference/AmbientModuleAndAmbientWithSameNameAndCommonRoot.types
+++ b/tests/baselines/reference/AmbientModuleAndAmbientWithSameNameAndCommonRoot.types
@@ -1,9 +1,9 @@
 === tests/cases/conformance/internalModules/DeclarationMerging/module.d.ts ===
 declare module A {
->A : A
+>A : typeof A
 
     export module Point {
->Point : Point
+>Point : typeof Point
 
         export var Origin: {
 >Origin : { x: number; y: number; }
@@ -19,7 +19,7 @@ declare module A {
 
 === tests/cases/conformance/internalModules/DeclarationMerging/class.d.ts ===
 declare module A {
->A : A
+>A : typeof A
 
     export class Point {
 >Point : Point
diff --git a/tests/baselines/reference/AmbientModuleAndNonAmbientClassWithSameNameAndCommonRoot.types b/tests/baselines/reference/AmbientModuleAndNonAmbientClassWithSameNameAndCommonRoot.types
index 79e2627cca2..975f0f65a68 100644
--- a/tests/baselines/reference/AmbientModuleAndNonAmbientClassWithSameNameAndCommonRoot.types
+++ b/tests/baselines/reference/AmbientModuleAndNonAmbientClassWithSameNameAndCommonRoot.types
@@ -1,9 +1,9 @@
 === tests/cases/conformance/internalModules/DeclarationMerging/module.d.ts ===
 declare module A {
->A : A
+>A : typeof A
 
     export module Point {
->Point : Point
+>Point : typeof Point
 
         export var Origin: {
 >Origin : { x: number; y: number; }
@@ -19,7 +19,7 @@ declare module A {
 
 === tests/cases/conformance/internalModules/DeclarationMerging/classPoint.ts ===
 module A {
->A : A
+>A : typeof A
 
     export class Point {
 >Point : Point
diff --git a/tests/baselines/reference/AmbientModuleAndNonAmbientFunctionWithTheSameNameAndCommonRoot.types b/tests/baselines/reference/AmbientModuleAndNonAmbientFunctionWithTheSameNameAndCommonRoot.types
index b0972ad1b41..cf4aeb6bcc0 100644
--- a/tests/baselines/reference/AmbientModuleAndNonAmbientFunctionWithTheSameNameAndCommonRoot.types
+++ b/tests/baselines/reference/AmbientModuleAndNonAmbientFunctionWithTheSameNameAndCommonRoot.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/internalModules/DeclarationMerging/module.d.ts ===
 declare module Point {
->Point : Point
+>Point : typeof Point
 
     export var Origin: { x: number; y: number; }
 >Origin : { x: number; y: number; }
diff --git a/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.types b/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.types
index 6e23d9a4489..51bd20fea92 100644
--- a/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.types
+++ b/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.types
@@ -15,7 +15,7 @@ class Point {
 }
 
 module Point {
->Point : Point
+>Point : typeof Point
 
     function Origin() { return ""; }// not an error, since not exported
 >Origin : typeof Origin
@@ -23,7 +23,7 @@ module Point {
 
 
 module A {
->A : A
+>A : typeof A
 
     export class Point {
 >Point : Point
@@ -41,7 +41,7 @@ module A {
     }
 
     export module Point {
->Point : Point
+>Point : typeof Point
 
         function Origin() { return ""; }// not an error since not exported
 >Origin : typeof Origin
diff --git a/tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.types b/tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.types
index bd9c858eb6c..827089847e2 100644
--- a/tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.types
+++ b/tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.types
@@ -15,7 +15,7 @@ class Point {
 }
 
 module Point {
->Point : Point
+>Point : typeof Point
 
     var Origin = ""; // not an error, since not exported
 >Origin : string
@@ -23,7 +23,7 @@ module Point {
 
 
 module A {
->A : A
+>A : typeof A
 
     export class Point {
 >Point : Point
@@ -41,7 +41,7 @@ module A {
     }
 
     export module Point {
->Point : Point
+>Point : typeof Point
 
         var Origin = ""; // not an error since not exported
 >Origin : string
diff --git a/tests/baselines/reference/EnumAndModuleWithSameNameAndCommonRoot.types b/tests/baselines/reference/EnumAndModuleWithSameNameAndCommonRoot.types
index 7e8e792c98d..3cbd14c78bb 100644
--- a/tests/baselines/reference/EnumAndModuleWithSameNameAndCommonRoot.types
+++ b/tests/baselines/reference/EnumAndModuleWithSameNameAndCommonRoot.types
@@ -8,7 +8,7 @@ enum enumdule {
 }
 
 module enumdule {
->enumdule : enumdule
+>enumdule : typeof enumdule
 
     export class Point {
 >Point : Point
diff --git a/tests/baselines/reference/ExportClassWhichExtendsInterfaceWithInaccessibleType.types b/tests/baselines/reference/ExportClassWhichExtendsInterfaceWithInaccessibleType.types
index 7bc28ab6b88..6d69109e542 100644
--- a/tests/baselines/reference/ExportClassWhichExtendsInterfaceWithInaccessibleType.types
+++ b/tests/baselines/reference/ExportClassWhichExtendsInterfaceWithInaccessibleType.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/internalModules/exportDeclarations/ExportClassWhichExtendsInterfaceWithInaccessibleType.ts ===
 module A {
->A : A
+>A : typeof A
 
     interface Point {
 >Point : Point
diff --git a/tests/baselines/reference/ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.types b/tests/baselines/reference/ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.types
index ef7ecb235d2..17b4a25cde3 100644
--- a/tests/baselines/reference/ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.types
+++ b/tests/baselines/reference/ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/internalModules/exportDeclarations/ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts ===
 module A {
->A : A
+>A : typeof A
 
     export class Point {
 >Point : Point
diff --git a/tests/baselines/reference/ExportClassWithInaccessibleTypeInIndexerTypeAnnotations.types b/tests/baselines/reference/ExportClassWithInaccessibleTypeInIndexerTypeAnnotations.types
index d076dad17d4..451db7f92a8 100644
--- a/tests/baselines/reference/ExportClassWithInaccessibleTypeInIndexerTypeAnnotations.types
+++ b/tests/baselines/reference/ExportClassWithInaccessibleTypeInIndexerTypeAnnotations.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/internalModules/exportDeclarations/ExportClassWithInaccessibleTypeInIndexerTypeAnnotations.ts ===
 module A {
->A : A
+>A : typeof A
 
     class Point {
 >Point : Point
diff --git a/tests/baselines/reference/ExportClassWithInaccessibleTypeInTypeParameterConstraint.types b/tests/baselines/reference/ExportClassWithInaccessibleTypeInTypeParameterConstraint.types
index e2d49c8e674..6f4452fce4c 100644
--- a/tests/baselines/reference/ExportClassWithInaccessibleTypeInTypeParameterConstraint.types
+++ b/tests/baselines/reference/ExportClassWithInaccessibleTypeInTypeParameterConstraint.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/internalModules/exportDeclarations/ExportClassWithInaccessibleTypeInTypeParameterConstraint.ts ===
 module A {
->A : A
+>A : typeof A
 
     class Point {
 >Point : Point
diff --git a/tests/baselines/reference/ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.types b/tests/baselines/reference/ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.types
index 4c0fed9fe11..fe2fea1b7a6 100644
--- a/tests/baselines/reference/ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.types
+++ b/tests/baselines/reference/ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/internalModules/exportDeclarations/ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.ts ===
 module A {
->A : A
+>A : typeof A
 
     export class Point {
 >Point : Point
diff --git a/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.types b/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.types
index 3a922cf5d0a..36c78cd700a 100644
--- a/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.types
+++ b/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/internalModules/exportDeclarations/ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.ts ===
 module A {
->A : A
+>A : typeof A
 
     class Point {
 >Point : Point
diff --git a/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.types b/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.types
index 47095c12c14..5d59aa10039 100644
--- a/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.types
+++ b/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/internalModules/exportDeclarations/ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.ts ===
 module A {
->A : A
+>A : typeof A
 
     export class Point {
 >Point : Point
diff --git a/tests/baselines/reference/ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.types b/tests/baselines/reference/ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.types
index 8c76ddacedb..f6f4e6a441a 100644
--- a/tests/baselines/reference/ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.types
+++ b/tests/baselines/reference/ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/internalModules/exportDeclarations/ExportInterfaceWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.ts ===
 module A {
->A : A
+>A : typeof A
 
     export interface Point {
 >Point : Point
diff --git a/tests/baselines/reference/ExportInterfaceWithInaccessibleTypeInIndexerTypeAnnotations.types b/tests/baselines/reference/ExportInterfaceWithInaccessibleTypeInIndexerTypeAnnotations.types
index 8d6c43a9a78..6caed8a138a 100644
--- a/tests/baselines/reference/ExportInterfaceWithInaccessibleTypeInIndexerTypeAnnotations.types
+++ b/tests/baselines/reference/ExportInterfaceWithInaccessibleTypeInIndexerTypeAnnotations.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/internalModules/exportDeclarations/ExportInterfaceWithInaccessibleTypeInIndexerTypeAnnotations.ts ===
 module A {
->A : A
+>A : unknown
 
     interface Point {
 >Point : Point
diff --git a/tests/baselines/reference/ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.types b/tests/baselines/reference/ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.types
index ab7408b4c94..53484780474 100644
--- a/tests/baselines/reference/ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.types
+++ b/tests/baselines/reference/ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/internalModules/exportDeclarations/ExportInterfaceWithInaccessibleTypeInTypeParameterConstraint.ts ===
 module A {
->A : A
+>A : typeof A
 
     interface Point {
 >Point : Point
diff --git a/tests/baselines/reference/ExportModuleWithAccessibleTypesOnItsExportedMembers.types b/tests/baselines/reference/ExportModuleWithAccessibleTypesOnItsExportedMembers.types
index 7fa1767d849..a3a80cb06ad 100644
--- a/tests/baselines/reference/ExportModuleWithAccessibleTypesOnItsExportedMembers.types
+++ b/tests/baselines/reference/ExportModuleWithAccessibleTypesOnItsExportedMembers.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/internalModules/exportDeclarations/ExportModuleWithAccessibleTypesOnItsExportedMembers.ts ===
 module A {
->A : A
+>A : typeof A
 
     export class Point {
 >Point : Point
@@ -11,7 +11,7 @@ module A {
     }
 
     export module B {
->B : B
+>B : typeof B
 
         export var Origin: Point = new Point(0, 0);
 >Origin : Point
diff --git a/tests/baselines/reference/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.types b/tests/baselines/reference/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.types
index fa5d998b4fa..82bdf732173 100644
--- a/tests/baselines/reference/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.types
+++ b/tests/baselines/reference/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/internalModules/exportDeclarations/ExportObjectLiteralAndObjectTypeLiteralWithAccessibleTypesInMemberTypeAnnotations.ts ===
 module A {
->A : A
+>A : typeof A
 
     class Point {
 >Point : Point
diff --git a/tests/baselines/reference/ExportVariableOfGenericTypeWithInaccessibleTypeAsTypeArgument.types b/tests/baselines/reference/ExportVariableOfGenericTypeWithInaccessibleTypeAsTypeArgument.types
index ab999ec2e6c..14e05a1913b 100644
--- a/tests/baselines/reference/ExportVariableOfGenericTypeWithInaccessibleTypeAsTypeArgument.types
+++ b/tests/baselines/reference/ExportVariableOfGenericTypeWithInaccessibleTypeAsTypeArgument.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/internalModules/exportDeclarations/ExportVariableOfGenericTypeWithInaccessibleTypeAsTypeArgument.ts ===
 module A {
->A : A
+>A : typeof A
 
     class B {
 >B : B
diff --git a/tests/baselines/reference/ExportVariableWithAccessibleTypeInTypeAnnotation.types b/tests/baselines/reference/ExportVariableWithAccessibleTypeInTypeAnnotation.types
index 23c6d4746c9..945a4be6fe5 100644
--- a/tests/baselines/reference/ExportVariableWithAccessibleTypeInTypeAnnotation.types
+++ b/tests/baselines/reference/ExportVariableWithAccessibleTypeInTypeAnnotation.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/internalModules/exportDeclarations/ExportVariableWithAccessibleTypeInTypeAnnotation.ts ===
 module A {
->A : A
+>A : typeof A
 
     export interface Point {
 >Point : Point
diff --git a/tests/baselines/reference/ExportVariableWithInaccessibleTypeInTypeAnnotation.types b/tests/baselines/reference/ExportVariableWithInaccessibleTypeInTypeAnnotation.types
index 2c56fb0f021..9ae05f87416 100644
--- a/tests/baselines/reference/ExportVariableWithInaccessibleTypeInTypeAnnotation.types
+++ b/tests/baselines/reference/ExportVariableWithInaccessibleTypeInTypeAnnotation.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/internalModules/exportDeclarations/ExportVariableWithInaccessibleTypeInTypeAnnotation.ts ===
 module A {
->A : A
+>A : typeof A
 
     export interface Point {
 >Point : Point
diff --git a/tests/baselines/reference/FunctionAndModuleWithSameNameAndDifferentCommonRoot.types b/tests/baselines/reference/FunctionAndModuleWithSameNameAndDifferentCommonRoot.types
index 809c3c21081..24174ebad50 100644
--- a/tests/baselines/reference/FunctionAndModuleWithSameNameAndDifferentCommonRoot.types
+++ b/tests/baselines/reference/FunctionAndModuleWithSameNameAndDifferentCommonRoot.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/internalModules/DeclarationMerging/function.ts ===
 module A {
->A : A
+>A : typeof A
 
     export function Point() {
 >Point : typeof Point
@@ -14,10 +14,10 @@ module A {
 
 === tests/cases/conformance/internalModules/DeclarationMerging/module.ts ===
 module B {
->B : B
+>B : typeof B
 
     export module Point {
->Point : Point
+>Point : typeof Point
 
         export var Origin = { x: 0, y: 0 };
 >Origin : { x: number; y: number; }
diff --git a/tests/baselines/reference/ModuleAndEnumWithSameNameAndCommonRoot.types b/tests/baselines/reference/ModuleAndEnumWithSameNameAndCommonRoot.types
index 3525fbf8fff..023511c8c4d 100644
--- a/tests/baselines/reference/ModuleAndEnumWithSameNameAndCommonRoot.types
+++ b/tests/baselines/reference/ModuleAndEnumWithSameNameAndCommonRoot.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/internalModules/DeclarationMerging/ModuleAndEnumWithSameNameAndCommonRoot.ts ===
 module enumdule {
->enumdule : enumdule
+>enumdule : typeof enumdule
 
     export class Point {
 >Point : Point
diff --git a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.types b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.types
index cd240fa75a1..a856b699dd5 100644
--- a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.types
+++ b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedAndNonExportedClassesOfTheSameName.ts ===
 module A {
->A : A
+>A : typeof A
 
     export class Point {
 >Point : Point
@@ -14,7 +14,7 @@ module A {
 }
 
 module A {
->A : A
+>A : typeof A
 
     class Point {
 >Point : Point
@@ -22,7 +22,7 @@ module A {
         fromCarthesian(p: A.Point) {
 >fromCarthesian : (p: A.Point) => { x: number; y: number; }
 >p : A.Point
->A : A
+>A : unknown
 >Point : A.Point
 
             return { x: p.x, y: p.y };
@@ -47,13 +47,13 @@ var p: { x: number; y: number; };
 
 var p: A.Point;
 >p : { x: number; y: number; }
->A : A
+>A : unknown
 >Point : A.Point
 
 module X.Y.Z {
->X : X
->Y : Y
->Z : Z
+>X : typeof X
+>Y : typeof Y
+>Z : typeof Z
 
     export class Line {
 >Line : Line
@@ -64,13 +64,13 @@ module X.Y.Z {
 }
 
 module X {
->X : X
+>X : typeof X
 
     export module Y {
->Y : Y
+>Y : typeof Y
 
         export module Z {
->Z : Z
+>Z : typeof Z
 
             class Line {
 >Line : Line
@@ -89,9 +89,9 @@ var l: { length: number; }
 
 var l: X.Y.Z.Line;
 >l : { length: number; }
->X : X
->Y : X.Y
->Z : X.Y.Z
+>X : unknown
+>Y : unknown
+>Z : unknown
 >Line : X.Y.Z.Line
 
 
diff --git a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.types b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.types
index e8ee371d06a..a8fc56495dd 100644
--- a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.types
+++ b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedAndNonExportedInterfacesOfTheSameName.ts ===
 module A {
->A : A
+>A : unknown
 
     export interface Point {
 >Point : Point
@@ -18,7 +18,7 @@ module A {
 }
 
 module A {
->A : A
+>A : unknown
 
     interface Point {
 >Point : Point
@@ -35,50 +35,50 @@ var p: { x: number; y: number; toCarth(): A.Point; };
 >x : number
 >y : number
 >toCarth : () => A.Point
->A : A
+>A : unknown
 >Point : A.Point
 
 var p: A.Point;
 >p : { x: number; y: number; toCarth(): A.Point; }
->A : A
+>A : unknown
 >Point : A.Point
 
 module X.Y.Z {
->X : X
->Y : Y
->Z : Z
+>X : unknown
+>Y : unknown
+>Z : unknown
 
     export interface Line {
 >Line : Line
 
         new (start: A.Point, end: A.Point);
 >start : A.Point
->A : A
+>A : unknown
 >Point : A.Point
 >end : A.Point
->A : A
+>A : unknown
 >Point : A.Point
     }
 }
 
 module X {
->X : X
+>X : unknown
 
     export module Y.Z {
->Y : Y
->Z : Z
+>Y : unknown
+>Z : unknown
 
         interface Line {
 >Line : Line
 
             start: A.Point;
 >start : A.Point
->A : A
+>A : unknown
 >Point : A.Point
 
             end: A.Point;
 >end : A.Point
->A : A
+>A : unknown
 >Point : A.Point
         }
     }
@@ -88,16 +88,16 @@ module X {
 var l: { new (s: A.Point, e: A.Point); }
 >l : new (s: A.Point, e: A.Point) => any
 >s : A.Point
->A : A
+>A : unknown
 >Point : A.Point
 >e : A.Point
->A : A
+>A : unknown
 >Point : A.Point
 
 var l: X.Y.Z.Line;
 >l : new (s: A.Point, e: A.Point) => any
->X : X
->Y : X.Y
->Z : X.Y.Z
+>X : unknown
+>Y : unknown
+>Z : unknown
 >Line : X.Y.Z.Line
 
diff --git a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedLocalVarsOfTheSameName.types b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedLocalVarsOfTheSameName.types
index 341e7615173..135eeae57b7 100644
--- a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedLocalVarsOfTheSameName.types
+++ b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedLocalVarsOfTheSameName.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/internalModules/DeclarationMerging/part1.ts ===
 module A {
->A : A
+>A : typeof A
 
     export interface Point {
 >Point : Point
@@ -13,7 +13,7 @@ module A {
     }
 
     export module Utils {
->Utils : Utils
+>Utils : typeof Utils
 
         export function mirror<T extends Point>(p: T) {
 >mirror : typeof mirror
@@ -44,14 +44,14 @@ module A {
 
 === tests/cases/conformance/internalModules/DeclarationMerging/part2.ts ===
 module A {
->A : A
+>A : typeof A
 
     // not a collision, since we don't export
     var Origin: string = "0,0";
 >Origin : string
 
     export module Utils {
->Utils : Utils
+>Utils : typeof Utils
 
         export class Plane {
 >Plane : Plane
@@ -75,7 +75,7 @@ var o: { x: number; y: number };
 
 var o: A.Point;
 >o : { x: number; y: number; }
->A : A
+>A : unknown
 >Point : A.Point
 
 var o = A.Origin;
@@ -97,16 +97,16 @@ var o = A.Utils.mirror(o);
 var p: { tl: A.Point; br: A.Point };
 >p : { tl: A.Point; br: A.Point; }
 >tl : A.Point
->A : A
+>A : unknown
 >Point : A.Point
 >br : A.Point
->A : A
+>A : unknown
 >Point : A.Point
 
 var p: A.Utils.Plane;
 >p : { tl: A.Point; br: A.Point; }
->A : A
->Utils : A.Utils
+>A : unknown
+>Utils : unknown
 >Plane : A.Utils.Plane
 
 var p = new A.Utils.Plane(o, { x: 1, y: 1 });
diff --git a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.types b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.types
index 38511e959c3..c54ad5f3ad9 100644
--- a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.types
+++ b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedInterfacesOfTheSameName.ts ===
 module A {
->A : A
+>A : unknown
 
     export interface Point {
 >Point : Point
@@ -18,7 +18,7 @@ module A {
 }
 
 module A {
->A : A
+>A : unknown
 
     export interface Point {
 >Point : Point
@@ -35,53 +35,53 @@ var p: { x: number; y: number; toCarth(): A.Point; fromCarth(): A.Point; };
 >x : number
 >y : number
 >toCarth : () => A.Point
->A : A
+>A : unknown
 >Point : A.Point
 >fromCarth : () => A.Point
->A : A
+>A : unknown
 >Point : A.Point
 
 var p: A.Point;
 >p : { x: number; y: number; toCarth(): A.Point; fromCarth(): A.Point; }
->A : A
+>A : unknown
 >Point : A.Point
 
 module X.Y.Z {
->X : X
->Y : Y
->Z : Z
+>X : unknown
+>Y : unknown
+>Z : unknown
 
     export interface Line {
 >Line : Line
 
         new (start: A.Point, end: A.Point);
 >start : A.Point
->A : A
+>A : unknown
 >Point : A.Point
 >end : A.Point
->A : A
+>A : unknown
 >Point : A.Point
     }
 }
 
 module X {
->X : X
+>X : unknown
 
     export module Y.Z {
->Y : Y
->Z : Z
+>Y : unknown
+>Z : unknown
 
         export interface Line {
 >Line : Line
 
             start: A.Point;
 >start : A.Point
->A : A
+>A : unknown
 >Point : A.Point
 
             end: A.Point;
 >end : A.Point
->A : A
+>A : unknown
 >Point : A.Point
         }
     }
@@ -91,22 +91,22 @@ module X {
 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 : A
+>A : unknown
 >Point : A.Point
 >end : A.Point
->A : A
+>A : unknown
 >Point : A.Point
 >s : A.Point
->A : A
+>A : unknown
 >Point : A.Point
 >e : A.Point
->A : A
+>A : unknown
 >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 : X
->Y : X.Y
->Z : X.Y.Z
+>X : unknown
+>Y : unknown
+>Z : unknown
 >Line : X.Y.Z.Line
 
diff --git a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.types b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.types
index 05fe0d922d1..9232af469ac 100644
--- a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.types
+++ b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.types
@@ -1,17 +1,17 @@
 === tests/cases/conformance/internalModules/DeclarationMerging/TwoInternalModulesThatMergeEachWithExportedModulesOfTheSameName.ts ===
 module A.B {
->A : A
->B : B
+>A : typeof A
+>B : typeof B
 
     export var x: number;
 >x : number
 }
 
 module A{ 
->A : A
+>A : typeof A
 
     module B {
->B : B
+>B : typeof B
 
         export var x: string;
 >x : string
@@ -31,9 +31,9 @@ var x = A.B.x;
 >x : number
 
 module X.Y.Z {
->X : X
->Y : Y
->Z : Z
+>X : typeof X
+>Y : typeof Y
+>Z : typeof Z
 
     export class Line {
 >Line : Line
@@ -44,13 +44,13 @@ module X.Y.Z {
 }
 
 module X {
->X : X
+>X : typeof X
 
     export module Y {
->Y : Y
+>Y : typeof Y
 
         module Z {
->Z : Z
+>Z : typeof Z
 
             export class Line {
 >Line : Line
@@ -69,8 +69,8 @@ var l: { length: number };
 
 var l: X.Y.Z.Line;
 >l : { length: number; }
->X : X
->Y : X.Y
->Z : X.Y.Z
+>X : unknown
+>Y : unknown
+>Z : unknown
 >Line : X.Y.Z.Line
 
diff --git a/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndDifferentCommonRoot.types b/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndDifferentCommonRoot.types
index ed7f8c748d3..59cdbf6f50e 100644
--- a/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndDifferentCommonRoot.types
+++ b/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndDifferentCommonRoot.types
@@ -1,9 +1,9 @@
 === tests/cases/conformance/internalModules/DeclarationMerging/part1.ts ===
 module Root {
->Root : Root
+>Root : typeof Root
 
     export module A {
->A : A
+>A : typeof A
 
         export interface Point {
 >Point : Point
@@ -16,7 +16,7 @@ module Root {
         }
 
         export module Utils {
->Utils : Utils
+>Utils : typeof Utils
 
             export function mirror<T extends Point>(p: T) {
 >mirror : typeof mirror
@@ -42,35 +42,35 @@ module Root {
 
 === tests/cases/conformance/internalModules/DeclarationMerging/part2.ts ===
 module otherRoot {
->otherRoot : otherRoot
+>otherRoot : typeof otherRoot
 
     export module A {
->A : A
+>A : typeof A
 
         // have to be fully qualified since in different root
         export var Origin: Root.A.Point = { x: 0, y: 0 };
 >Origin : Root.A.Point
->Root : Root
->A : Root.A
+>Root : unknown
+>A : unknown
 >Point : Root.A.Point
 >{ x: 0, y: 0 } : { x: number; y: number; }
 >x : number
 >y : number
 
         export module Utils {
->Utils : Utils
+>Utils : typeof Utils
 
             export class Plane {
 >Plane : Plane
 
                 constructor(public tl: Root.A.Point, public br: Root.A.Point) { }
 >tl : Root.A.Point
->Root : Root
->A : Root.A
+>Root : unknown
+>A : unknown
 >Point : Root.A.Point
 >br : Root.A.Point
->Root : Root
->A : Root.A
+>Root : unknown
+>A : unknown
 >Point : Root.A.Point
             }
         }
diff --git a/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndSameCommonRoot.types b/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndSameCommonRoot.types
index 40c14297d3e..4f58b36c5e6 100644
--- a/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndSameCommonRoot.types
+++ b/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndSameCommonRoot.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/internalModules/DeclarationMerging/part1.ts ===
 module A {
->A : A
+>A : typeof A
 
     export interface Point {
 >Point : Point
@@ -13,7 +13,7 @@ module A {
     }
 
     export module Utils {
->Utils : Utils
+>Utils : typeof Utils
 
         export function mirror<T extends Point>(p: T) {
 >mirror : typeof mirror
@@ -38,7 +38,7 @@ module A {
 
 === tests/cases/conformance/internalModules/DeclarationMerging/part2.ts ===
 module A {
->A : A
+>A : typeof A
 
     export var Origin: Point = { x: 0, y: 0 };
 >Origin : Point
@@ -48,7 +48,7 @@ module A {
 >y : number
 
     export module Utils {
->Utils : Utils
+>Utils : typeof Utils
 
         export class Plane {
 >Plane : Plane
@@ -72,7 +72,7 @@ var o: { x: number; y: number };
 
 var o: A.Point;
 >o : { x: number; y: number; }
->A : A
+>A : unknown
 >Point : A.Point
 
 var o = A.Origin;
@@ -94,16 +94,16 @@ var o = A.Utils.mirror(o);
 var p: { tl: A.Point; br: A.Point };
 >p : { tl: A.Point; br: A.Point; }
 >tl : A.Point
->A : A
+>A : unknown
 >Point : A.Point
 >br : A.Point
->A : A
+>A : unknown
 >Point : A.Point
 
 var p: A.Utils.Plane;
 >p : { tl: A.Point; br: A.Point; }
->A : A
->Utils : A.Utils
+>A : unknown
+>Utils : unknown
 >Plane : A.Utils.Plane
 
 var p = new A.Utils.Plane(o, { x: 1, y: 1 });
diff --git a/tests/baselines/reference/acceptableAlias1.types b/tests/baselines/reference/acceptableAlias1.types
index 4acad529a58..213e5ad5bc3 100644
--- a/tests/baselines/reference/acceptableAlias1.types
+++ b/tests/baselines/reference/acceptableAlias1.types
@@ -1,17 +1,17 @@
 === tests/cases/compiler/acceptableAlias1.ts ===
 module M {
->M : M
+>M : typeof M
 
     export module N {
->N : N
+>N : unknown
     }
     export import X = N;
->X : X
->N : N
+>X : unknown
+>N : unknown
 }
 
 import r = M.X;
->r : r
+>r : unknown
 >M : typeof M
->X : r
+>X : unknown
 
diff --git a/tests/baselines/reference/additionOperatorWithAnyAndEveryType.types b/tests/baselines/reference/additionOperatorWithAnyAndEveryType.types
index 140b27efa17..f3fa9fad181 100644
--- a/tests/baselines/reference/additionOperatorWithAnyAndEveryType.types
+++ b/tests/baselines/reference/additionOperatorWithAnyAndEveryType.types
@@ -18,7 +18,7 @@ enum E { a, b, c }
 >c : E
 
 module M { export var a }
->M : M
+>M : typeof M
 >a : any
 
 var a: any;
diff --git a/tests/baselines/reference/aliasUsageInAccessorsOfClass.types b/tests/baselines/reference/aliasUsageInAccessorsOfClass.types
index 3ae78526600..c300ae861ac 100644
--- a/tests/baselines/reference/aliasUsageInAccessorsOfClass.types
+++ b/tests/baselines/reference/aliasUsageInAccessorsOfClass.types
@@ -1,9 +1,9 @@
 === tests/cases/compiler/aliasUsage1_main.ts ===
 import Backbone = require("aliasUsage1_backbone");
->Backbone : Backbone
+>Backbone : typeof Backbone
 
 import moduleA = require("aliasUsage1_moduleA");
->moduleA : moduleA
+>moduleA : typeof moduleA
 
 interface IHasVisualizationModel {
 >IHasVisualizationModel : IHasVisualizationModel
@@ -48,11 +48,11 @@ export class Model {
 
 === tests/cases/compiler/aliasUsage1_moduleA.ts ===
 import Backbone = require("aliasUsage1_backbone");
->Backbone : Backbone
+>Backbone : typeof Backbone
 
 export class VisualizationModel extends Backbone.Model {
 >VisualizationModel : VisualizationModel
->Backbone : Backbone
+>Backbone : unknown
 >Model : Backbone.Model
 
     // interesting stuff here
diff --git a/tests/baselines/reference/aliasUsageInArray.types b/tests/baselines/reference/aliasUsageInArray.types
index a012cc9028c..df657233f90 100644
--- a/tests/baselines/reference/aliasUsageInArray.types
+++ b/tests/baselines/reference/aliasUsageInArray.types
@@ -1,9 +1,9 @@
 === tests/cases/compiler/aliasUsageInArray_main.ts ===
 import Backbone = require("aliasUsageInArray_backbone");
->Backbone : Backbone
+>Backbone : typeof Backbone
 
 import moduleA = require("aliasUsageInArray_moduleA");
->moduleA : moduleA
+>moduleA : typeof moduleA
 
 interface IHasVisualizationModel {
 >IHasVisualizationModel : IHasVisualizationModel
@@ -36,11 +36,11 @@ export class Model {
 
 === tests/cases/compiler/aliasUsageInArray_moduleA.ts ===
 import Backbone = require("aliasUsageInArray_backbone");
->Backbone : Backbone
+>Backbone : typeof Backbone
 
 export class VisualizationModel extends Backbone.Model {
 >VisualizationModel : VisualizationModel
->Backbone : Backbone
+>Backbone : unknown
 >Model : Backbone.Model
 
     // interesting stuff here
diff --git a/tests/baselines/reference/aliasUsageInFunctionExpression.types b/tests/baselines/reference/aliasUsageInFunctionExpression.types
index cf729fdb9d9..ba66a0f1c7c 100644
--- a/tests/baselines/reference/aliasUsageInFunctionExpression.types
+++ b/tests/baselines/reference/aliasUsageInFunctionExpression.types
@@ -1,9 +1,9 @@
 === tests/cases/compiler/aliasUsageInFunctionExpression_main.ts ===
 import Backbone = require("aliasUsageInFunctionExpression_backbone");
->Backbone : Backbone
+>Backbone : typeof Backbone
 
 import moduleA = require("aliasUsageInFunctionExpression_moduleA");
->moduleA : moduleA
+>moduleA : typeof moduleA
 
 interface IHasVisualizationModel {
 >IHasVisualizationModel : IHasVisualizationModel
@@ -37,11 +37,11 @@ export class Model {
 
 === tests/cases/compiler/aliasUsageInFunctionExpression_moduleA.ts ===
 import Backbone = require("aliasUsageInFunctionExpression_backbone");
->Backbone : Backbone
+>Backbone : typeof Backbone
 
 export class VisualizationModel extends Backbone.Model {
 >VisualizationModel : VisualizationModel
->Backbone : Backbone
+>Backbone : unknown
 >Model : Backbone.Model
 
     // interesting stuff here
diff --git a/tests/baselines/reference/aliasUsageInGenericFunction.types b/tests/baselines/reference/aliasUsageInGenericFunction.types
index d9d4f3f1e1e..d3d0814ed66 100644
--- a/tests/baselines/reference/aliasUsageInGenericFunction.types
+++ b/tests/baselines/reference/aliasUsageInGenericFunction.types
@@ -1,9 +1,9 @@
 === tests/cases/compiler/aliasUsageInGenericFunction_main.ts ===
 import Backbone = require("aliasUsageInGenericFunction_backbone");
->Backbone : Backbone
+>Backbone : typeof Backbone
 
 import moduleA = require("aliasUsageInGenericFunction_moduleA");
->moduleA : moduleA
+>moduleA : typeof moduleA
 
 interface IHasVisualizationModel {
 >IHasVisualizationModel : IHasVisualizationModel
@@ -51,11 +51,11 @@ export class Model {
 
 === tests/cases/compiler/aliasUsageInGenericFunction_moduleA.ts ===
 import Backbone = require("aliasUsageInGenericFunction_backbone");
->Backbone : Backbone
+>Backbone : typeof Backbone
 
 export class VisualizationModel extends Backbone.Model {
 >VisualizationModel : VisualizationModel
->Backbone : Backbone
+>Backbone : unknown
 >Model : Backbone.Model
 
     // interesting stuff here
diff --git a/tests/baselines/reference/aliasUsageInIndexerOfClass.types b/tests/baselines/reference/aliasUsageInIndexerOfClass.types
index 636c0fd1bb5..cc4b2377099 100644
--- a/tests/baselines/reference/aliasUsageInIndexerOfClass.types
+++ b/tests/baselines/reference/aliasUsageInIndexerOfClass.types
@@ -1,9 +1,9 @@
 === tests/cases/compiler/aliasUsageInIndexerOfClass_main.ts ===
 import Backbone = require("aliasUsageInIndexerOfClass_backbone");
->Backbone : Backbone
+>Backbone : typeof Backbone
 
 import moduleA = require("aliasUsageInIndexerOfClass_moduleA");
->moduleA : moduleA
+>moduleA : typeof moduleA
 
 interface IHasVisualizationModel {
 >IHasVisualizationModel : IHasVisualizationModel
@@ -45,11 +45,11 @@ export class Model {
 
 === tests/cases/compiler/aliasUsageInIndexerOfClass_moduleA.ts ===
 import Backbone = require("aliasUsageInIndexerOfClass_backbone");
->Backbone : Backbone
+>Backbone : typeof Backbone
 
 export class VisualizationModel extends Backbone.Model {
 >VisualizationModel : VisualizationModel
->Backbone : Backbone
+>Backbone : unknown
 >Model : Backbone.Model
 
     // interesting stuff here
diff --git a/tests/baselines/reference/aliasUsageInObjectLiteral.types b/tests/baselines/reference/aliasUsageInObjectLiteral.types
index e2fafc04931..b34a4300c52 100644
--- a/tests/baselines/reference/aliasUsageInObjectLiteral.types
+++ b/tests/baselines/reference/aliasUsageInObjectLiteral.types
@@ -1,9 +1,9 @@
 === tests/cases/compiler/aliasUsageInObjectLiteral_main.ts ===
 import Backbone = require("aliasUsageInObjectLiteral_backbone");
->Backbone : Backbone
+>Backbone : typeof Backbone
 
 import moduleA = require("aliasUsageInObjectLiteral_moduleA");
->moduleA : moduleA
+>moduleA : typeof moduleA
 
 interface IHasVisualizationModel {
 >IHasVisualizationModel : IHasVisualizationModel
@@ -50,11 +50,11 @@ export class Model {
 
 === tests/cases/compiler/aliasUsageInObjectLiteral_moduleA.ts ===
 import Backbone = require("aliasUsageInObjectLiteral_backbone");
->Backbone : Backbone
+>Backbone : typeof Backbone
 
 export class VisualizationModel extends Backbone.Model {
 >VisualizationModel : VisualizationModel
->Backbone : Backbone
+>Backbone : unknown
 >Model : Backbone.Model
 
     // interesting stuff here
diff --git a/tests/baselines/reference/aliasUsageInOrExpression.types b/tests/baselines/reference/aliasUsageInOrExpression.types
index b2a2a27178a..fdcf0be4479 100644
--- a/tests/baselines/reference/aliasUsageInOrExpression.types
+++ b/tests/baselines/reference/aliasUsageInOrExpression.types
@@ -1,9 +1,9 @@
 === tests/cases/compiler/aliasUsageInOrExpression_main.ts ===
 import Backbone = require("aliasUsageInOrExpression_backbone");
->Backbone : Backbone
+>Backbone : typeof Backbone
 
 import moduleA = require("aliasUsageInOrExpression_moduleA");
->moduleA : moduleA
+>moduleA : typeof moduleA
 
 interface IHasVisualizationModel {
 >IHasVisualizationModel : IHasVisualizationModel
@@ -71,11 +71,11 @@ export class Model {
 
 === tests/cases/compiler/aliasUsageInOrExpression_moduleA.ts ===
 import Backbone = require("aliasUsageInOrExpression_backbone");
->Backbone : Backbone
+>Backbone : typeof Backbone
 
 export class VisualizationModel extends Backbone.Model {
 >VisualizationModel : VisualizationModel
->Backbone : Backbone
+>Backbone : unknown
 >Model : Backbone.Model
 
     // interesting stuff here
diff --git a/tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.types b/tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.types
index 8418ebb0b02..e2e8b57b94f 100644
--- a/tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.types
+++ b/tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.types
@@ -1,9 +1,9 @@
 === tests/cases/compiler/aliasUsageInTypeArgumentOfExtendsClause_main.ts ===
 import Backbone = require("aliasUsageInTypeArgumentOfExtendsClause_backbone");
->Backbone : Backbone
+>Backbone : typeof Backbone
 
 import moduleA = require("aliasUsageInTypeArgumentOfExtendsClause_moduleA");
->moduleA : moduleA
+>moduleA : typeof moduleA
 
 interface IHasVisualizationModel {
 >IHasVisualizationModel : IHasVisualizationModel
@@ -41,11 +41,11 @@ export class Model {
 
 === tests/cases/compiler/aliasUsageInTypeArgumentOfExtendsClause_moduleA.ts ===
 import Backbone = require("aliasUsageInTypeArgumentOfExtendsClause_backbone");
->Backbone : Backbone
+>Backbone : typeof Backbone
 
 export class VisualizationModel extends Backbone.Model {
 >VisualizationModel : VisualizationModel
->Backbone : Backbone
+>Backbone : unknown
 >Model : Backbone.Model
 
     // interesting stuff here
diff --git a/tests/baselines/reference/aliasUsageInVarAssignment.types b/tests/baselines/reference/aliasUsageInVarAssignment.types
index 4d1fece3c41..7ca745b3d23 100644
--- a/tests/baselines/reference/aliasUsageInVarAssignment.types
+++ b/tests/baselines/reference/aliasUsageInVarAssignment.types
@@ -1,9 +1,9 @@
 === tests/cases/compiler/aliasUsageInVarAssignment_main.ts ===
 import Backbone = require("aliasUsageInVarAssignment_backbone");
->Backbone : Backbone
+>Backbone : typeof Backbone
 
 import moduleA = require("aliasUsageInVarAssignment_moduleA");
->moduleA : moduleA
+>moduleA : typeof moduleA
 
 interface IHasVisualizationModel {
 >IHasVisualizationModel : IHasVisualizationModel
@@ -32,11 +32,11 @@ export class Model {
 
 === tests/cases/compiler/aliasUsageInVarAssignment_moduleA.ts ===
 import Backbone = require("aliasUsageInVarAssignment_backbone");
->Backbone : Backbone
+>Backbone : typeof Backbone
 
 export class VisualizationModel extends Backbone.Model {
 >VisualizationModel : VisualizationModel
->Backbone : Backbone
+>Backbone : unknown
 >Model : Backbone.Model
 
     // interesting stuff here
diff --git a/tests/baselines/reference/aliasUsedAsNameValue.types b/tests/baselines/reference/aliasUsedAsNameValue.types
index 222e075393c..5b687138341 100644
--- a/tests/baselines/reference/aliasUsedAsNameValue.types
+++ b/tests/baselines/reference/aliasUsedAsNameValue.types
@@ -2,10 +2,10 @@
 ///<reference path='aliasUsedAsNameValue_0.ts' />
 ///<reference path='aliasUsedAsNameValue_1.ts' />
 import mod = require("aliasUsedAsNameValue_0");
->mod : mod
+>mod : typeof mod
 
 import b = require("aliasUsedAsNameValue_1");
->b : b
+>b : typeof b
  
 export var a = function () {
 >a : () => void
diff --git a/tests/baselines/reference/ambientDeclarations.types b/tests/baselines/reference/ambientDeclarations.types
index 4bc2500312a..261952c284e 100644
--- a/tests/baselines/reference/ambientDeclarations.types
+++ b/tests/baselines/reference/ambientDeclarations.types
@@ -122,7 +122,7 @@ declare enum E3 {
 >A : E3
 }
 declare module E3 {
->E3 : E3
+>E3 : typeof E3
 
     var B;
 >B : any
@@ -135,7 +135,7 @@ var x = E3.B;
 
 // Ambient module
 declare module M1 {
->M1 : M1
+>M1 : typeof M1
 
     var x;
 >x : any
diff --git a/tests/baselines/reference/ambientEnumElementInitializer6.types b/tests/baselines/reference/ambientEnumElementInitializer6.types
index 39964d92da4..3a38fd6912d 100644
--- a/tests/baselines/reference/ambientEnumElementInitializer6.types
+++ b/tests/baselines/reference/ambientEnumElementInitializer6.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/ambientEnumElementInitializer6.ts ===
 declare module M {
->M : M
+>M : typeof M
 
     enum E {
 >E : E
diff --git a/tests/baselines/reference/ambientExternalModuleWithInternalImportDeclaration.types b/tests/baselines/reference/ambientExternalModuleWithInternalImportDeclaration.types
index 7b17c613261..22e4b19fb25 100644
--- a/tests/baselines/reference/ambientExternalModuleWithInternalImportDeclaration.types
+++ b/tests/baselines/reference/ambientExternalModuleWithInternalImportDeclaration.types
@@ -1,7 +1,7 @@
 === tests/cases/compiler/ambientExternalModuleWithInternalImportDeclaration_1.ts ===
 ///<reference path='ambientExternalModuleWithInternalImportDeclaration_0.ts'/>
 import A = require('M');
->A : A
+>A : typeof A
 
 var c = new A();
 >c : A
@@ -11,7 +11,7 @@ var c = new A();
 === tests/cases/compiler/ambientExternalModuleWithInternalImportDeclaration_0.ts ===
 declare module 'M' {
     module C {
->C : X
+>C : typeof X
 
         export var f: number;
 >f : number
@@ -23,7 +23,7 @@ declare module 'M' {
 >foo : () => void
     }
     import X = C;
->X : X
+>X : typeof X
 >C : X
 
     export = X;
diff --git a/tests/baselines/reference/ambientExternalModuleWithoutInternalImportDeclaration.types b/tests/baselines/reference/ambientExternalModuleWithoutInternalImportDeclaration.types
index 3144658ad7d..0029817400b 100644
--- a/tests/baselines/reference/ambientExternalModuleWithoutInternalImportDeclaration.types
+++ b/tests/baselines/reference/ambientExternalModuleWithoutInternalImportDeclaration.types
@@ -1,7 +1,7 @@
 === tests/cases/compiler/ambientExternalModuleWithoutInternalImportDeclaration_1.ts ===
 ///<reference path='ambientExternalModuleWithoutInternalImportDeclaration_0.ts'/>
 import A = require('M');
->A : A
+>A : typeof A
 
 var c = new A();
 >c : A
@@ -11,7 +11,7 @@ var c = new A();
 === tests/cases/compiler/ambientExternalModuleWithoutInternalImportDeclaration_0.ts ===
 declare module 'M' {
     module C {
->C : C
+>C : typeof C
 
         export var f: number;
 >f : number
diff --git a/tests/baselines/reference/ambientFundule.types b/tests/baselines/reference/ambientFundule.types
index 02b980f98fe..edd2290859c 100644
--- a/tests/baselines/reference/ambientFundule.types
+++ b/tests/baselines/reference/ambientFundule.types
@@ -3,7 +3,7 @@ declare function f();
 >f : typeof f
 
 declare module f { var x }
->f : f
+>f : typeof f
 >x : any
 
 declare function f(x);
diff --git a/tests/baselines/reference/ambientModuleExports.types b/tests/baselines/reference/ambientModuleExports.types
index 5137a5a1647..9bc8fb57ebe 100644
--- a/tests/baselines/reference/ambientModuleExports.types
+++ b/tests/baselines/reference/ambientModuleExports.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/ambientModuleExports.ts ===
 declare module Foo {
->Foo : Foo
+>Foo : typeof Foo
 
 	function a():void;
 >a : typeof a
@@ -31,7 +31,7 @@ var c = new Foo.C();
 >C : typeof Foo.C
 
 declare module Foo2 {
->Foo2 : Foo2
+>Foo2 : typeof Foo2
 
     export function a(): void;
 >a : typeof a
diff --git a/tests/baselines/reference/ambientModuleWithClassDeclarationWithExtends.types b/tests/baselines/reference/ambientModuleWithClassDeclarationWithExtends.types
index 1c87917c114..2708946518f 100644
--- a/tests/baselines/reference/ambientModuleWithClassDeclarationWithExtends.types
+++ b/tests/baselines/reference/ambientModuleWithClassDeclarationWithExtends.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/ambientModuleWithClassDeclarationWithExtends.ts ===
 declare module foo {
->foo : foo
+>foo : typeof foo
 
     class A { }
 >A : A
diff --git a/tests/baselines/reference/ambientModules.types b/tests/baselines/reference/ambientModules.types
index d66cf7db215..fe0aceef810 100644
--- a/tests/baselines/reference/ambientModules.types
+++ b/tests/baselines/reference/ambientModules.types
@@ -1,7 +1,7 @@
 === tests/cases/compiler/ambientModules.ts ===
 declare module Foo.Bar { export var foo; };
->Foo : Foo
->Bar : Bar
+>Foo : typeof Foo
+>Bar : typeof Bar
 >foo : any
 
 Foo.Bar.foo = 5; 
diff --git a/tests/baselines/reference/amdImportAsPrimaryExpression.types b/tests/baselines/reference/amdImportAsPrimaryExpression.types
index d0d86bbead3..f88bc9a1ffe 100644
--- a/tests/baselines/reference/amdImportAsPrimaryExpression.types
+++ b/tests/baselines/reference/amdImportAsPrimaryExpression.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/externalModules/foo_1.ts ===
 import foo = require("./foo_0");
->foo : foo
+>foo : typeof foo
 
 if(foo.E1.A === 0){
 >foo.E1.A === 0 : boolean
diff --git a/tests/baselines/reference/amdImportNotAsPrimaryExpression.types b/tests/baselines/reference/amdImportNotAsPrimaryExpression.types
index 3242c58465d..bde0cb02b1e 100644
--- a/tests/baselines/reference/amdImportNotAsPrimaryExpression.types
+++ b/tests/baselines/reference/amdImportNotAsPrimaryExpression.types
@@ -1,21 +1,21 @@
 === tests/cases/conformance/externalModules/foo_1.ts ===
 import foo = require("./foo_0");
->foo : foo
+>foo : typeof foo
 
 // None of the below should cause a runtime dependency on foo_0
 import f = foo.M1;
->f : f
+>f : unknown
 >foo : typeof foo
->M1 : foo.M1
+>M1 : unknown
 
 var i: f.I2;
 >i : f.I2
->f : f
+>f : unknown
 >I2 : f.I2
 
 var x: foo.C1 = <{m1: number}>{};
 >x : foo.C1
->foo : foo
+>foo : unknown
 >C1 : foo.C1
 ><{m1: number}>{} : { m1: number; }
 >m1 : number
@@ -29,14 +29,14 @@ var y: typeof foo.C1.s1 = false;
 
 var z: foo.M1.I2;
 >z : f.I2
->foo : foo
->M1 : foo.M1
+>foo : unknown
+>M1 : unknown
 >I2 : f.I2
 
 var e: number = <foo.E1>0;
 >e : number
 ><foo.E1>0 : foo.E1
->foo : foo
+>foo : unknown
 >E1 : foo.E1
 
 === tests/cases/conformance/externalModules/foo_0.ts ===
@@ -61,7 +61,7 @@ export interface I1 {
 }
 
 export module M1 {
->M1 : M1
+>M1 : unknown
 
 	export interface I2 {
 >I2 : I2
diff --git a/tests/baselines/reference/anonterface.types b/tests/baselines/reference/anonterface.types
index 9249a23020b..7b5b1401cac 100644
--- a/tests/baselines/reference/anonterface.types
+++ b/tests/baselines/reference/anonterface.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/anonterface.ts ===
 module M {
->M : M
+>M : typeof M
 
     export class C {
 >C : C
diff --git a/tests/baselines/reference/anyAssignabilityInInheritance.types b/tests/baselines/reference/anyAssignabilityInInheritance.types
index 6e44bb5600f..795e4a1f332 100644
--- a/tests/baselines/reference/anyAssignabilityInInheritance.types
+++ b/tests/baselines/reference/anyAssignabilityInInheritance.types
@@ -242,7 +242,7 @@ function f() { }
 >f : typeof f
 
 module f {
->f : f
+>f : typeof f
 
     export var bar = 1;
 >bar : number
@@ -268,7 +268,7 @@ class CC { baz: string }
 >baz : string
 
 module CC {
->CC : CC
+>CC : typeof CC
 
     export var bar = 1;
 >bar : number
diff --git a/tests/baselines/reference/arrayAssignmentTest6.types b/tests/baselines/reference/arrayAssignmentTest6.types
index 6417afca419..0c932cb7556 100644
--- a/tests/baselines/reference/arrayAssignmentTest6.types
+++ b/tests/baselines/reference/arrayAssignmentTest6.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/arrayAssignmentTest6.ts ===
 module Test {
->Test : Test
+>Test : typeof Test
 
     interface IState {
 >IState : IState
diff --git a/tests/baselines/reference/arrayOfExportedClass.types b/tests/baselines/reference/arrayOfExportedClass.types
index 333fb38f347..3d542b88d80 100644
--- a/tests/baselines/reference/arrayOfExportedClass.types
+++ b/tests/baselines/reference/arrayOfExportedClass.types
@@ -1,7 +1,7 @@
 === tests/cases/compiler/arrayOfExportedClass_1.ts ===
 ///<reference path='arrayOfExportedClass_0.ts'/>
 import Car = require('arrayOfExportedClass_0');
->Car : Car
+>Car : typeof Car
 
 class Road {
 >Road : Road
diff --git a/tests/baselines/reference/arrayTypeInSignatureOfInterfaceAndClass.types b/tests/baselines/reference/arrayTypeInSignatureOfInterfaceAndClass.types
index 034450e6280..419db571c05 100644
--- a/tests/baselines/reference/arrayTypeInSignatureOfInterfaceAndClass.types
+++ b/tests/baselines/reference/arrayTypeInSignatureOfInterfaceAndClass.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/arrayTypeInSignatureOfInterfaceAndClass.ts ===
 declare module WinJS {
->WinJS : WinJS
+>WinJS : typeof WinJS
 
     class Promise<T> {
 >Promise : Promise<T>
@@ -25,7 +25,7 @@ declare module WinJS {
     }
 }
 declare module Data {
->Data : Data
+>Data : typeof Data
 
     export interface IListItem<T> {
 >IListItem : IListItem<T>
@@ -65,7 +65,7 @@ declare module Data {
 >removeIndices : (indices: number[], options?: any) => WinJS.Promise<IListItem<T>[]>
 >indices : number[]
 >options : any
->WinJS : WinJS
+>WinJS : unknown
 >Promise : WinJS.Promise<T>
 >IListItem : IListItem<T>
 >T : T
@@ -81,7 +81,7 @@ declare module Data {
 >removeIndices : (indices: number[], options?: any) => WinJS.Promise<IListItem<T>[]>
 >indices : number[]
 >options : any
->WinJS : WinJS
+>WinJS : unknown
 >Promise : WinJS.Promise<T>
 >IListItem : IListItem<T>
 >T : T
diff --git a/tests/baselines/reference/arrowFunctionInExpressionStatement2.types b/tests/baselines/reference/arrowFunctionInExpressionStatement2.types
index 60613e55a87..d4bb431fa8d 100644
--- a/tests/baselines/reference/arrowFunctionInExpressionStatement2.types
+++ b/tests/baselines/reference/arrowFunctionInExpressionStatement2.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/arrowFunctionInExpressionStatement2.ts ===
 module M {
->M : M
+>M : typeof M
 
     () => 0;
 >() => 0 : () => number
diff --git a/tests/baselines/reference/assign1.types b/tests/baselines/reference/assign1.types
index 18cf4a3d96d..32b93af647d 100644
--- a/tests/baselines/reference/assign1.types
+++ b/tests/baselines/reference/assign1.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/assign1.ts ===
 module M {
->M : M
+>M : typeof M
 
     interface I {
 >I : I
diff --git a/tests/baselines/reference/assignmentCompatWithObjectMembers.types b/tests/baselines/reference/assignmentCompatWithObjectMembers.types
index 0799c4e3b81..940b1d7071d 100644
--- a/tests/baselines/reference/assignmentCompatWithObjectMembers.types
+++ b/tests/baselines/reference/assignmentCompatWithObjectMembers.types
@@ -3,7 +3,7 @@
 // no errors expected
 
 module SimpleTypes {
->SimpleTypes : SimpleTypes
+>SimpleTypes : typeof SimpleTypes
 
     class S { foo: string; }
 >S : S
@@ -152,7 +152,7 @@ module SimpleTypes {
 }
 
 module ObjectTypes {
->ObjectTypes : ObjectTypes
+>ObjectTypes : typeof ObjectTypes
 
     class S { foo: S; }
 >S : S
diff --git a/tests/baselines/reference/assignmentCompatability1.types b/tests/baselines/reference/assignmentCompatability1.types
index 6d71fc3b83e..9949fc14bf5 100644
--- a/tests/baselines/reference/assignmentCompatability1.types
+++ b/tests/baselines/reference/assignmentCompatability1.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/assignmentCompatability1.ts ===
 module __test1__ {
->__test1__ : __test1__
+>__test1__ : typeof __test1__
 
     export interface interfaceWithPublicAndOptional<T,U> { one: T; two?: U; };  var obj4: interfaceWithPublicAndOptional<number,string> = { one: 1 };;
 >interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
@@ -20,7 +20,7 @@ module __test1__ {
 >obj4 : interfaceWithPublicAndOptional<number, string>
 }
 module __test2__ {
->__test2__ : __test2__
+>__test2__ : typeof __test2__
 
     export var aa = {};;
 >aa : {}
diff --git a/tests/baselines/reference/assignmentCompatability2.types b/tests/baselines/reference/assignmentCompatability2.types
index 4e2c997cfe3..16da45c7e35 100644
--- a/tests/baselines/reference/assignmentCompatability2.types
+++ b/tests/baselines/reference/assignmentCompatability2.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/assignmentCompatability2.ts ===
 module __test1__ {
->__test1__ : __test1__
+>__test1__ : typeof __test1__
 
     export interface interfaceWithPublicAndOptional<T,U> { one: T; two?: U; };  var obj4: interfaceWithPublicAndOptional<number,string> = { one: 1 };;
 >interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
@@ -20,7 +20,7 @@ module __test1__ {
 >obj4 : interfaceWithPublicAndOptional<number, string>
 }
 module __test2__ {
->__test2__ : __test2__
+>__test2__ : typeof __test2__
 
     export var aa:{};;
 >aa : {}
diff --git a/tests/baselines/reference/assignmentCompatability3.types b/tests/baselines/reference/assignmentCompatability3.types
index f45671a6325..61279b9c7fa 100644
--- a/tests/baselines/reference/assignmentCompatability3.types
+++ b/tests/baselines/reference/assignmentCompatability3.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/assignmentCompatability3.ts ===
 module __test1__ {
->__test1__ : __test1__
+>__test1__ : typeof __test1__
 
     export interface interfaceWithPublicAndOptional<T,U> { one: T; two?: U; };  var obj4: interfaceWithPublicAndOptional<number,string> = { one: 1 };;
 >interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
@@ -20,7 +20,7 @@ module __test1__ {
 >obj4 : interfaceWithPublicAndOptional<number, string>
 }
 module __test2__ {
->__test2__ : __test2__
+>__test2__ : typeof __test2__
 
     export var obj = {one: 1};
 >obj : { one: number; }
diff --git a/tests/baselines/reference/assignmentCompatability4.types b/tests/baselines/reference/assignmentCompatability4.types
index dd29e8a08dd..f7e5801e9b3 100644
--- a/tests/baselines/reference/assignmentCompatability4.types
+++ b/tests/baselines/reference/assignmentCompatability4.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/assignmentCompatability4.ts ===
 module __test1__ {
->__test1__ : __test1__
+>__test1__ : typeof __test1__
 
     export interface interfaceWithPublicAndOptional<T,U> { one: T; two?: U; };  var obj4: interfaceWithPublicAndOptional<number,string> = { one: 1 };;
 >interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
@@ -20,7 +20,7 @@ module __test1__ {
 >obj4 : interfaceWithPublicAndOptional<number, string>
 }
 module __test2__ {
->__test2__ : __test2__
+>__test2__ : typeof __test2__
 
     export var aa:{one:number;};;
 >aa : { one: number; }
diff --git a/tests/baselines/reference/assignmentCompatability5.types b/tests/baselines/reference/assignmentCompatability5.types
index 44e8dbe2dc7..80eda3e510b 100644
--- a/tests/baselines/reference/assignmentCompatability5.types
+++ b/tests/baselines/reference/assignmentCompatability5.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/assignmentCompatability5.ts ===
 module __test1__ {
->__test1__ : __test1__
+>__test1__ : typeof __test1__
 
     export interface interfaceWithPublicAndOptional<T,U> { one: T; two?: U; };  var obj4: interfaceWithPublicAndOptional<number,string> = { one: 1 };;
 >interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
@@ -20,7 +20,7 @@ module __test1__ {
 >obj4 : interfaceWithPublicAndOptional<number, string>
 }
 module __test2__ {
->__test2__ : __test2__
+>__test2__ : typeof __test2__
 
     export                   interface interfaceOne<T> { one: T; };                var obj1: interfaceOne<number> = { one: 1 };;
 >interfaceOne : interfaceOne<T>
diff --git a/tests/baselines/reference/assignmentCompatability6.types b/tests/baselines/reference/assignmentCompatability6.types
index dd1dc8c19ca..5e9ae8c6a2f 100644
--- a/tests/baselines/reference/assignmentCompatability6.types
+++ b/tests/baselines/reference/assignmentCompatability6.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/assignmentCompatability6.ts ===
 module __test1__ {
->__test1__ : __test1__
+>__test1__ : typeof __test1__
 
     export interface interfaceWithPublicAndOptional<T,U> { one: T; two?: U; };  var obj4: interfaceWithPublicAndOptional<number,string> = { one: 1 };;
 >interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
@@ -20,7 +20,7 @@ module __test1__ {
 >obj4 : interfaceWithPublicAndOptional<number, string>
 }
 module __test2__ {
->__test2__ : __test2__
+>__test2__ : typeof __test2__
 
     export          interface interfaceWithOptional<T> { one?: T; };               var obj3: interfaceWithOptional<number> = { };;
 >interfaceWithOptional : interfaceWithOptional<T>
diff --git a/tests/baselines/reference/assignmentCompatability7.types b/tests/baselines/reference/assignmentCompatability7.types
index 17036c4ec6e..b7b2ab70566 100644
--- a/tests/baselines/reference/assignmentCompatability7.types
+++ b/tests/baselines/reference/assignmentCompatability7.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/assignmentCompatability7.ts ===
 module __test1__ {
->__test1__ : __test1__
+>__test1__ : typeof __test1__
 
     export interface interfaceWithPublicAndOptional<T,U> { one: T; two?: U; };  var obj4: interfaceWithPublicAndOptional<number,string> = { one: 1 };;
 >interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
@@ -20,7 +20,7 @@ module __test1__ {
 >obj4 : interfaceWithPublicAndOptional<number, string>
 }
 module __test2__ {
->__test2__ : __test2__
+>__test2__ : typeof __test2__
 
     export interface interfaceWithPublicAndOptional<T,U> { one: T; two?: U; };  var obj4: interfaceWithPublicAndOptional<number,string> = { one: 1 };;
 >interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
diff --git a/tests/baselines/reference/assignmentCompatability8.types b/tests/baselines/reference/assignmentCompatability8.types
index 09ca5c13b71..1c009eea482 100644
--- a/tests/baselines/reference/assignmentCompatability8.types
+++ b/tests/baselines/reference/assignmentCompatability8.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/assignmentCompatability8.ts ===
 module __test1__ {
->__test1__ : __test1__
+>__test1__ : typeof __test1__
 
     export interface interfaceWithPublicAndOptional<T,U> { one: T; two?: U; };  var obj4: interfaceWithPublicAndOptional<number,string> = { one: 1 };;
 >interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
@@ -20,7 +20,7 @@ module __test1__ {
 >obj4 : interfaceWithPublicAndOptional<number, string>
 }
 module __test2__ {
->__test2__ : __test2__
+>__test2__ : typeof __test2__
 
     export            class classWithPublic<T> { constructor(public one: T) {} }                        var x1 = new classWithPublic(1);;
 >classWithPublic : classWithPublic<T>
diff --git a/tests/baselines/reference/assignmentCompatability9.types b/tests/baselines/reference/assignmentCompatability9.types
index 88b5f17f31b..a8235220bec 100644
--- a/tests/baselines/reference/assignmentCompatability9.types
+++ b/tests/baselines/reference/assignmentCompatability9.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/assignmentCompatability9.ts ===
 module __test1__ {
->__test1__ : __test1__
+>__test1__ : typeof __test1__
 
     export interface interfaceWithPublicAndOptional<T,U> { one: T; two?: U; };  var obj4: interfaceWithPublicAndOptional<number,string> = { one: 1 };;
 >interfaceWithPublicAndOptional : interfaceWithPublicAndOptional<T, U>
@@ -20,7 +20,7 @@ module __test1__ {
 >obj4 : interfaceWithPublicAndOptional<number, string>
 }
 module __test2__ {
->__test2__ : __test2__
+>__test2__ : typeof __test2__
 
     export          class classWithOptional<T> { constructor(public one?: T) {} }                       var x3 = new classWithOptional<number>();;
 >classWithOptional : classWithOptional<T>
diff --git a/tests/baselines/reference/augmentedTypesClass3.types b/tests/baselines/reference/augmentedTypesClass3.types
index a3c9c0ce3c7..b22899b03cf 100644
--- a/tests/baselines/reference/augmentedTypesClass3.types
+++ b/tests/baselines/reference/augmentedTypesClass3.types
@@ -5,14 +5,14 @@ class c5 { public foo() { } }
 >foo : () => void
 
 module c5 { } // should be ok
->c5 : c5
+>c5 : typeof c5
 
 class c5a { public foo() { } }
 >c5a : c5a
 >foo : () => void
 
 module c5a { var y = 2; } // should be ok
->c5a : c5a
+>c5a : typeof c5a
 >y : number
 
 class c5b { public foo() { } }
@@ -20,7 +20,7 @@ class c5b { public foo() { } }
 >foo : () => void
 
 module c5b { export var y = 2; } // should be ok
->c5b : c5b
+>c5b : typeof c5b
 >y : number
 
 //// class then import
diff --git a/tests/baselines/reference/augmentedTypesExternalModule1.types b/tests/baselines/reference/augmentedTypesExternalModule1.types
index e971a77daea..ec7e9194df6 100644
--- a/tests/baselines/reference/augmentedTypesExternalModule1.types
+++ b/tests/baselines/reference/augmentedTypesExternalModule1.types
@@ -7,5 +7,5 @@ class c5 { public foo() { } }
 >foo : () => void
 
 module c5 { } // should be ok everywhere
->c5 : c5
+>c5 : typeof c5
 
diff --git a/tests/baselines/reference/augmentedTypesModules3b.types b/tests/baselines/reference/augmentedTypesModules3b.types
index 7497b9ff8a7..af2c33c65da 100644
--- a/tests/baselines/reference/augmentedTypesModules3b.types
+++ b/tests/baselines/reference/augmentedTypesModules3b.types
@@ -4,7 +4,7 @@ class m3b { foo() { } }
 >foo : () => void
 
 module m3b { var y = 2; }
->m3b : m3b
+>m3b : typeof m3b
 >y : number
 
 class m3c { foo() { } }
@@ -12,7 +12,7 @@ class m3c { foo() { } }
 >foo : () => void
 
 module m3c { export var y = 2; } 
->m3c : m3c
+>m3c : typeof m3c
 >y : number
 
 declare class m3d { foo(): void }
@@ -20,11 +20,11 @@ declare class m3d { foo(): void }
 >foo : () => void
 
 module m3d { export var y = 2; } 
->m3d : m3d
+>m3d : typeof m3d
 >y : number
 
 module m3e { export var y = 2; } 
->m3e : m3e
+>m3e : typeof m3e
 >y : number
 
 declare class m3e { foo(): void } 
@@ -36,7 +36,7 @@ declare class m3f { foo(): void }
 >foo : () => void
 
 module m3f { export interface I { foo(): void } }
->m3f : m3f
+>m3f : typeof m3f
 >I : I
 >foo : () => void
 
@@ -45,7 +45,7 @@ declare class m3g { foo(): void }
 >foo : () => void
 
 module m3g { export class C { foo() { } } }
->m3g : m3g
+>m3g : typeof m3g
 >C : C
 >foo : () => void
 
diff --git a/tests/baselines/reference/augmentedTypesModules4.types b/tests/baselines/reference/augmentedTypesModules4.types
index 2a426c603fa..bf8922a5761 100644
--- a/tests/baselines/reference/augmentedTypesModules4.types
+++ b/tests/baselines/reference/augmentedTypesModules4.types
@@ -2,13 +2,13 @@
 // module then enum
 // should be errors
 module m4 { }
->m4 : m4
+>m4 : typeof m4
 
 enum m4 { }
 >m4 : m4
 
 module m4a { var y = 2; }
->m4a : m4a
+>m4a : typeof m4a
 >y : number
 
 enum m4a { One }
@@ -16,7 +16,7 @@ enum m4a { One }
 >One : m4a
 
 module m4b { export var y = 2; }
->m4b : m4b
+>m4b : typeof m4b
 >y : number
 
 enum m4b { One }
@@ -24,7 +24,7 @@ enum m4b { One }
 >One : m4b
 
 module m4c { interface I { foo(): void } }
->m4c : m4c
+>m4c : typeof m4c
 >I : I
 >foo : () => void
 
@@ -33,7 +33,7 @@ enum m4c { One }
 >One : m4c
 
 module m4d { class C { foo() { } } }
->m4d : m4d
+>m4d : typeof m4d
 >C : C
 >foo : () => void
 
@@ -44,11 +44,11 @@ enum m4d { One }
 //// module then module
 
 module m5 { export var y = 2; }
->m5 : m5
+>m5 : typeof m5
 >y : number
 
 module m5 { export interface I { foo(): void } } // should already be reasonably well covered
->m5 : m5
+>m5 : typeof m5
 >I : I
 >foo : () => void
 
diff --git a/tests/baselines/reference/binopAssignmentShouldHaveType.types b/tests/baselines/reference/binopAssignmentShouldHaveType.types
index d1cdb188311..cf6966147bc 100644
--- a/tests/baselines/reference/binopAssignmentShouldHaveType.types
+++ b/tests/baselines/reference/binopAssignmentShouldHaveType.types
@@ -4,7 +4,7 @@ declare var console;
 
 "use strict";
 module Test {
->Test : Test
+>Test : typeof Test
 
  export class Bug {
 >Bug : Bug
diff --git a/tests/baselines/reference/bitwiseNotOperatorWithBooleanType.types b/tests/baselines/reference/bitwiseNotOperatorWithBooleanType.types
index 2eb6ab9b8c3..13cee004559 100644
--- a/tests/baselines/reference/bitwiseNotOperatorWithBooleanType.types
+++ b/tests/baselines/reference/bitwiseNotOperatorWithBooleanType.types
@@ -16,7 +16,7 @@ class A {
 >foo : () => boolean
 }
 module M {
->M : M
+>M : typeof M
 
     export var n: boolean;
 >n : boolean
diff --git a/tests/baselines/reference/bitwiseNotOperatorWithNumberType.types b/tests/baselines/reference/bitwiseNotOperatorWithNumberType.types
index dddae11545e..508edaf17e2 100644
--- a/tests/baselines/reference/bitwiseNotOperatorWithNumberType.types
+++ b/tests/baselines/reference/bitwiseNotOperatorWithNumberType.types
@@ -20,7 +20,7 @@ class A {
 >foo : () => number
 }
 module M {
->M : M
+>M : typeof M
 
     export var n: number;
 >n : number
diff --git a/tests/baselines/reference/bitwiseNotOperatorWithStringType.types b/tests/baselines/reference/bitwiseNotOperatorWithStringType.types
index a6f4b4c5ec2..d1041f805de 100644
--- a/tests/baselines/reference/bitwiseNotOperatorWithStringType.types
+++ b/tests/baselines/reference/bitwiseNotOperatorWithStringType.types
@@ -20,7 +20,7 @@ class A {
 >foo : () => string
 }
 module M {
->M : M
+>M : typeof M
 
     export var n: string;
 >n : string
diff --git a/tests/baselines/reference/callSignatureWithoutReturnTypeAnnotationInference.types b/tests/baselines/reference/callSignatureWithoutReturnTypeAnnotationInference.types
index ad96d6849a7..6a4f5560c0d 100644
--- a/tests/baselines/reference/callSignatureWithoutReturnTypeAnnotationInference.types
+++ b/tests/baselines/reference/callSignatureWithoutReturnTypeAnnotationInference.types
@@ -163,7 +163,7 @@ var r10 = foo10(1);
 >foo10 : typeof foo10
 
 module M {
->M : M
+>M : typeof M
 
     export var x = 1;
 >x : number
@@ -215,7 +215,7 @@ function m1() { return 1; }
 >m1 : typeof m1
 
 module m1 { export var y = 2; }
->m1 : m1
+>m1 : typeof m1
 >y : number
 
 function foo13() {
@@ -239,7 +239,7 @@ class c1 {
 >x : any
 }
 module c1 {
->c1 : c1
+>c1 : typeof c1
 
     export var x = 1;
 >x : number
@@ -260,7 +260,7 @@ enum e1 { A }
 >A : e1
 
 module e1 { export var y = 1; }
->e1 : e1
+>e1 : typeof e1
 >y : number
 
 function foo15() {
diff --git a/tests/baselines/reference/chainedImportAlias.types b/tests/baselines/reference/chainedImportAlias.types
index 4aa066de823..6140d98272f 100644
--- a/tests/baselines/reference/chainedImportAlias.types
+++ b/tests/baselines/reference/chainedImportAlias.types
@@ -1,9 +1,9 @@
 === tests/cases/compiler/chainedImportAlias_file1.ts ===
 import x = require('chainedImportAlias_file0');
->x : x
+>x : typeof x
 
 import y = x;
->y : y
+>y : typeof x
 >x : typeof x
 
 y.m.foo();
@@ -16,7 +16,7 @@ y.m.foo();
 
 === tests/cases/compiler/chainedImportAlias_file0.ts ===
 export module m {
->m : m
+>m : typeof m
 
     export function foo() { }
 >foo : typeof foo
diff --git a/tests/baselines/reference/circularImportAlias.types b/tests/baselines/reference/circularImportAlias.types
index 4ecd15faf90..ab8de414e30 100644
--- a/tests/baselines/reference/circularImportAlias.types
+++ b/tests/baselines/reference/circularImportAlias.types
@@ -2,15 +2,15 @@
 // expected no error
 
 module B {
->B : a.b
+>B : typeof a.b
 
     export import a = A;
->a : a
+>a : typeof a
 >A : typeof a
 
     export class D extends a.C {
 >D : D
->a : a
+>a : unknown
 >C : a.C
 
         id: number;
@@ -19,14 +19,14 @@ module B {
 }
 
 module A {
->A : b.a
+>A : typeof b.a
 
     export class C { name: string }
 >C : C
 >name : string
 
     export import b = B;
->b : b
+>b : typeof b
 >B : typeof b
 }
 
diff --git a/tests/baselines/reference/classDeclarationMergedInModuleWithContinuation.types b/tests/baselines/reference/classDeclarationMergedInModuleWithContinuation.types
index 7ad32ac50d9..b39d65c3d65 100644
--- a/tests/baselines/reference/classDeclarationMergedInModuleWithContinuation.types
+++ b/tests/baselines/reference/classDeclarationMergedInModuleWithContinuation.types
@@ -1,12 +1,12 @@
 === tests/cases/compiler/classDeclarationMergedInModuleWithContinuation.ts ===
 module M {
->M : M
+>M : typeof M
 
     export class N { }
 >N : N
 
     export module N {
->N : N
+>N : typeof N
 
         export var v = 0;
 >v : number
@@ -14,11 +14,11 @@ module M {
 }
 
 module M {
->M : M
+>M : typeof M
 
     export class O extends M.N {
 >O : O
->M : M
+>M : unknown
 >N : N
     }
 }
diff --git a/tests/baselines/reference/classExtendingQualifiedName2.types b/tests/baselines/reference/classExtendingQualifiedName2.types
index 715386fa8d1..7706f6bada9 100644
--- a/tests/baselines/reference/classExtendingQualifiedName2.types
+++ b/tests/baselines/reference/classExtendingQualifiedName2.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/classExtendingQualifiedName2.ts ===
 module M {
->M : M
+>M : typeof M
 
     export class C {
 >C : C
@@ -8,7 +8,7 @@ module M {
 
     class D extends M.C {
 >D : D
->M : M
+>M : unknown
 >C : C
     }
 }
diff --git a/tests/baselines/reference/classImplementsImportedInterface.types b/tests/baselines/reference/classImplementsImportedInterface.types
index afaf6c33374..74b0e81eb60 100644
--- a/tests/baselines/reference/classImplementsImportedInterface.types
+++ b/tests/baselines/reference/classImplementsImportedInterface.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/classImplementsImportedInterface.ts ===
 module M1 {
->M1 : M1
+>M1 : unknown
 
     export interface I {
 >I : I
@@ -11,11 +11,11 @@ module M1 {
 }
 
 module M2 {
->M2 : M2
+>M2 : typeof M2
 
     import T = M1.I;
->T : T
->M1 : M1
+>T : unknown
+>M1 : unknown
 >I : T
 
     class C implements T {
diff --git a/tests/baselines/reference/cloduleAcrossModuleDefinitions.types b/tests/baselines/reference/cloduleAcrossModuleDefinitions.types
index 118ed6ba7ff..cda79f73734 100644
--- a/tests/baselines/reference/cloduleAcrossModuleDefinitions.types
+++ b/tests/baselines/reference/cloduleAcrossModuleDefinitions.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/cloduleAcrossModuleDefinitions.ts ===
 module A {
->A : A
+>A : typeof A
 
     export class B {
 >B : B
@@ -14,10 +14,10 @@ module A {
 }
 
 module A {
->A : A
+>A : typeof A
 
     export module B {
->B : B
+>B : typeof B
 
         export var x = 1;
 >x : number
@@ -26,6 +26,6 @@ module A {
 
 var b: A.B; // ok
 >b : A.B
->A : A
+>A : unknown
 >B : A.B
 
diff --git a/tests/baselines/reference/cloduleAndTypeParameters.types b/tests/baselines/reference/cloduleAndTypeParameters.types
index b75d3fbee89..493aaa2d395 100644
--- a/tests/baselines/reference/cloduleAndTypeParameters.types
+++ b/tests/baselines/reference/cloduleAndTypeParameters.types
@@ -10,7 +10,7 @@ class Foo<T extends Foo.Bar> {
 }
 
 module Foo {
->Foo : Foo
+>Foo : typeof Foo
 
   export interface Bar {
 >Bar : Bar
diff --git a/tests/baselines/reference/cloduleTest1.types b/tests/baselines/reference/cloduleTest1.types
index 3f3af280246..214b46c2676 100644
--- a/tests/baselines/reference/cloduleTest1.types
+++ b/tests/baselines/reference/cloduleTest1.types
@@ -13,7 +13,7 @@
 >$ : $
   }
   module $ {
->$ : $
+>$ : typeof $
 
     export interface AjaxSettings {
 >AjaxSettings : AjaxSettings
diff --git a/tests/baselines/reference/cloduleWithRecursiveReference.types b/tests/baselines/reference/cloduleWithRecursiveReference.types
index 2f811a473ee..8a5df1c5a9f 100644
--- a/tests/baselines/reference/cloduleWithRecursiveReference.types
+++ b/tests/baselines/reference/cloduleWithRecursiveReference.types
@@ -1,12 +1,12 @@
 === tests/cases/compiler/cloduleWithRecursiveReference.ts ===
 module M
->M : M
+>M : typeof M
 {
   export class C {  }
 >C : C
 
   export module C {
->C : M.C
+>C : typeof M.C
 
     export var C = M.C
 >C : typeof M.C
diff --git a/tests/baselines/reference/collisionCodeGenModuleWithConstructorChildren.types b/tests/baselines/reference/collisionCodeGenModuleWithConstructorChildren.types
index fe693211baa..f63f7eeb4f2 100644
--- a/tests/baselines/reference/collisionCodeGenModuleWithConstructorChildren.types
+++ b/tests/baselines/reference/collisionCodeGenModuleWithConstructorChildren.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/collisionCodeGenModuleWithConstructorChildren.ts ===
 module M {
->M : M
+>M : typeof M
 
     export var x = 3;
 >x : number
@@ -17,7 +17,7 @@ module M {
 }
 
 module M {
->M : M
+>M : typeof M
 
     class d {
 >d : d
@@ -31,7 +31,7 @@ module M {
 }
 
 module M {
->M : M
+>M : typeof M
 
     class d2 {
 >d2 : d2
diff --git a/tests/baselines/reference/collisionCodeGenModuleWithEnumMemberConflict.types b/tests/baselines/reference/collisionCodeGenModuleWithEnumMemberConflict.types
index eb7047ba3c1..527c8930fcb 100644
--- a/tests/baselines/reference/collisionCodeGenModuleWithEnumMemberConflict.types
+++ b/tests/baselines/reference/collisionCodeGenModuleWithEnumMemberConflict.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/collisionCodeGenModuleWithEnumMemberConflict.ts ===
 module m1 {
->m1 : m1
+>m1 : typeof m1
 
     enum e {
 >e : e
diff --git a/tests/baselines/reference/collisionCodeGenModuleWithFunctionChildren.types b/tests/baselines/reference/collisionCodeGenModuleWithFunctionChildren.types
index 84be96f9c43..7c22d6ddc8f 100644
--- a/tests/baselines/reference/collisionCodeGenModuleWithFunctionChildren.types
+++ b/tests/baselines/reference/collisionCodeGenModuleWithFunctionChildren.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/collisionCodeGenModuleWithFunctionChildren.ts ===
 module M {
->M : M
+>M : typeof M
 
     export var x = 3;
 >x : number
@@ -13,7 +13,7 @@ module M {
 }
 
 module M {
->M : M
+>M : typeof M
 
     function fn2() {
 >fn2 : typeof fn2
@@ -28,7 +28,7 @@ module M {
 }
 
 module M {
->M : M
+>M : typeof M
 
     function fn3() {
 >fn3 : typeof fn3
diff --git a/tests/baselines/reference/collisionCodeGenModuleWithMemberClassConflict.types b/tests/baselines/reference/collisionCodeGenModuleWithMemberClassConflict.types
index fd86bc8ed45..edbe25b7a7d 100644
--- a/tests/baselines/reference/collisionCodeGenModuleWithMemberClassConflict.types
+++ b/tests/baselines/reference/collisionCodeGenModuleWithMemberClassConflict.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/collisionCodeGenModuleWithMemberClassConflict.ts ===
 module m1 {
->m1 : m1
+>m1 : typeof m1
 
     export class m1 {
 >m1 : m1
@@ -14,7 +14,7 @@ var foo = new m1.m1();
 >m1 : typeof m1.m1
 
 module m2 {
->m2 : m2
+>m2 : typeof m2
 
     export class m2 {
 >m2 : m2
diff --git a/tests/baselines/reference/collisionCodeGenModuleWithMemberInterfaceConflict.types b/tests/baselines/reference/collisionCodeGenModuleWithMemberInterfaceConflict.types
index 0598ba9f2ea..e2f36aeaa8f 100644
--- a/tests/baselines/reference/collisionCodeGenModuleWithMemberInterfaceConflict.types
+++ b/tests/baselines/reference/collisionCodeGenModuleWithMemberInterfaceConflict.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/collisionCodeGenModuleWithMemberInterfaceConflict.ts ===
 module m1 {
->m1 : m1
+>m1 : typeof m1
 
     export interface m1 {
 >m1 : m1
diff --git a/tests/baselines/reference/collisionCodeGenModuleWithMemberVariable.types b/tests/baselines/reference/collisionCodeGenModuleWithMemberVariable.types
index a16e4df6129..86f0767959d 100644
--- a/tests/baselines/reference/collisionCodeGenModuleWithMemberVariable.types
+++ b/tests/baselines/reference/collisionCodeGenModuleWithMemberVariable.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/collisionCodeGenModuleWithMemberVariable.ts ===
 module m1 {
->m1 : m1
+>m1 : typeof m1
 
     export var m1 = 10;
 >m1 : number
diff --git a/tests/baselines/reference/collisionCodeGenModuleWithMethodChildren.types b/tests/baselines/reference/collisionCodeGenModuleWithMethodChildren.types
index 97e8f668fb6..3632806e9b3 100644
--- a/tests/baselines/reference/collisionCodeGenModuleWithMethodChildren.types
+++ b/tests/baselines/reference/collisionCodeGenModuleWithMethodChildren.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/collisionCodeGenModuleWithMethodChildren.ts ===
 module M {
->M : M
+>M : typeof M
 
     export var x = 3;
 >x : number
@@ -17,7 +17,7 @@ module M {
 }
 
 module M {
->M : M
+>M : typeof M
 
     class d {
 >d : d
@@ -36,7 +36,7 @@ module M {
 }
 
 module M {
->M : M
+>M : typeof M
 
     class e {
 >e : e
@@ -56,7 +56,7 @@ module M {
 }
 
 module M { // Shouldnt bn _M
->M : M
+>M : typeof M
 
     class f {
 >f : f
diff --git a/tests/baselines/reference/collisionCodeGenModuleWithModuleChildren.types b/tests/baselines/reference/collisionCodeGenModuleWithModuleChildren.types
index 217f360c9e3..3ed65442a0e 100644
--- a/tests/baselines/reference/collisionCodeGenModuleWithModuleChildren.types
+++ b/tests/baselines/reference/collisionCodeGenModuleWithModuleChildren.types
@@ -1,12 +1,12 @@
 === tests/cases/compiler/collisionCodeGenModuleWithModuleChildren.ts ===
 module M {
->M : M
+>M : typeof M
 
     export var x = 3;
 >x : number
 
     module m1 {
->m1 : m1
+>m1 : typeof m1
 
         var M = 10;
 >M : number
@@ -18,10 +18,10 @@ module M {
 }
 
 module M {
->M : M
+>M : typeof M
 
     module m2 {
->m2 : m2
+>m2 : typeof m2
 
         class M {
 >M : M
@@ -38,10 +38,10 @@ module M {
 }
 
 module M {
->M : M
+>M : typeof M
 
     module m3 {
->m3 : m3
+>m3 : typeof m3
 
         function M() {
 >M : typeof M
@@ -58,10 +58,10 @@ module M {
 }
 
 module M { // shouldnt be _M
->M : M
+>M : typeof M
 
     module m3 {
->m3 : m3
+>m3 : typeof m3
 
         interface M {
 >M : M
@@ -77,13 +77,13 @@ module M { // shouldnt be _M
 }
 
 module M {
->M : M
+>M : typeof M
 
     module m4 {
->m4 : m4
+>m4 : typeof m4
 
         module M {
->M : M
+>M : typeof M
 
             var p = x;
 >p : number
diff --git a/tests/baselines/reference/collisionCodeGenModuleWithModuleReopening.types b/tests/baselines/reference/collisionCodeGenModuleWithModuleReopening.types
index 1bd1d54d324..27520618366 100644
--- a/tests/baselines/reference/collisionCodeGenModuleWithModuleReopening.types
+++ b/tests/baselines/reference/collisionCodeGenModuleWithModuleReopening.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/collisionCodeGenModuleWithModuleReopening.ts ===
 module m1 {
->m1 : m1
+>m1 : typeof m1
 
     export class m1 {
 >m1 : m1
@@ -14,7 +14,7 @@ var foo = new m1.m1();
 >m1 : typeof m1.m1
 
 module m1 {
->m1 : m1
+>m1 : typeof m1
 
     export class c1 {
 >c1 : c1
@@ -37,7 +37,7 @@ var foo2 = new m1.c1();
 >c1 : typeof m1.c1
 
 module m2 {
->m2 : m2
+>m2 : typeof m2
 
     export class c1 {
 >c1 : c1
@@ -58,7 +58,7 @@ var foo3 = new m2.c1();
 >c1 : typeof m2.c1
 
 module m2 {
->m2 : m2
+>m2 : typeof m2
 
     export class m2 {
 >m2 : m2
diff --git a/tests/baselines/reference/collisionCodeGenModuleWithPrivateMember.types b/tests/baselines/reference/collisionCodeGenModuleWithPrivateMember.types
index fc5033726ec..a4af255dcf3 100644
--- a/tests/baselines/reference/collisionCodeGenModuleWithPrivateMember.types
+++ b/tests/baselines/reference/collisionCodeGenModuleWithPrivateMember.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/collisionCodeGenModuleWithPrivateMember.ts ===
 module m1 {
->m1 : m1
+>m1 : typeof m1
 
     class m1 {
 >m1 : m1
diff --git a/tests/baselines/reference/collisionCodeGenModuleWithUnicodeNames.types b/tests/baselines/reference/collisionCodeGenModuleWithUnicodeNames.types
index ae3c75eaeeb..5d7ca71b1be 100644
--- a/tests/baselines/reference/collisionCodeGenModuleWithUnicodeNames.types
+++ b/tests/baselines/reference/collisionCodeGenModuleWithUnicodeNames.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/collisionCodeGenModuleWithUnicodeNames.ts ===
 module 才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123 {
->才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123 : 才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123
+>才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123 : typeof 才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123
 
     export class 才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123 {
 >才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123 : 才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123
diff --git a/tests/baselines/reference/collisionExportsRequireAndModule.types b/tests/baselines/reference/collisionExportsRequireAndModule.types
index b702bb58a44..9aa418cad80 100644
--- a/tests/baselines/reference/collisionExportsRequireAndModule.types
+++ b/tests/baselines/reference/collisionExportsRequireAndModule.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/collisionExportsRequireAndModule.ts ===
 export module require {
->require : require
+>require : typeof require
 
     export interface I {
 >I : I
@@ -11,13 +11,13 @@ export module require {
 }
 export function foo(): require.I {
 >foo : typeof foo
->require : require
+>require : unknown
 >I : require.I
 
     return null;
 }
 export module exports {
->exports : exports
+>exports : typeof exports
 
     export interface I {
 >I : I
@@ -28,7 +28,7 @@ export module exports {
 }
 export function foo2(): exports.I {
 >foo2 : typeof foo2
->exports : exports
+>exports : unknown
 >I : exports.I
 
     return null;
diff --git a/tests/baselines/reference/collisionExportsRequireAndUninstantiatedModule.types b/tests/baselines/reference/collisionExportsRequireAndUninstantiatedModule.types
index 05aef0a25fa..b9d5b8a2606 100644
--- a/tests/baselines/reference/collisionExportsRequireAndUninstantiatedModule.types
+++ b/tests/baselines/reference/collisionExportsRequireAndUninstantiatedModule.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/collisionExportsRequireAndUninstantiatedModule.ts ===
 export module require { // no error 
->require : require
+>require : unknown
 
     export interface I {
 >I : I
@@ -8,13 +8,13 @@ export module require { // no error
 }
 export function foo(): require.I {
 >foo : typeof foo
->require : require
+>require : unknown
 >I : require.I
 
     return null;
 }
 export module exports { // no error
->exports : exports
+>exports : unknown
 
     export interface I {
 >I : I
@@ -22,7 +22,7 @@ export module exports { // no error
 }
 export function foo2(): exports.I {
 >foo2 : typeof foo2
->exports : exports
+>exports : unknown
 >I : exports.I
 
     return null;
diff --git a/tests/baselines/reference/commentOnElidedModule1.types b/tests/baselines/reference/commentOnElidedModule1.types
index 1a13ba668cf..42aafaca693 100644
--- a/tests/baselines/reference/commentOnElidedModule1.types
+++ b/tests/baselines/reference/commentOnElidedModule1.types
@@ -1,10 +1,10 @@
 === tests/cases/compiler/commentOnElidedModule1.ts ===
 /*! Keep this pinned comment */
 module ElidedModule {
->ElidedModule : ElidedModule
+>ElidedModule : unknown
 }
 
 // Don't keep this comment.
 module ElidedModule2 {
->ElidedModule2 : ElidedModule2
+>ElidedModule2 : unknown
 }
diff --git a/tests/baselines/reference/commentsDottedModuleName.types b/tests/baselines/reference/commentsDottedModuleName.types
index 81e4d64665e..53195bfccfa 100644
--- a/tests/baselines/reference/commentsDottedModuleName.types
+++ b/tests/baselines/reference/commentsDottedModuleName.types
@@ -2,8 +2,8 @@
 
 /** this is multi declare module*/
 export module outerModule.InnerModule {
->outerModule : outerModule
->InnerModule : InnerModule
+>outerModule : typeof outerModule
+>InnerModule : typeof InnerModule
 
     /// class b comment
     export class b {
diff --git a/tests/baselines/reference/commentsExternalModules.types b/tests/baselines/reference/commentsExternalModules.types
index 111114cd734..b018a5de6b3 100644
--- a/tests/baselines/reference/commentsExternalModules.types
+++ b/tests/baselines/reference/commentsExternalModules.types
@@ -1,7 +1,7 @@
 === tests/cases/compiler/commentsExternalModules_1.ts ===
 /**This is on import declaration*/
 import extMod = require("commentsExternalModules_0"); // trailing comment1
->extMod : extMod
+>extMod : typeof extMod
 
 extMod.m1.fooExport();
 >extMod.m1.fooExport() : number
@@ -45,7 +45,7 @@ var newVar2 = new extMod.m4.m2.c();
 
 /** Module comment*/
 export module m1 {
->m1 : m1
+>m1 : typeof m1
 
     /** b's comment*/
     export var b: number;
@@ -60,7 +60,7 @@ export module m1 {
     }
     /** m2 comments*/
     export module m2 {
->m2 : m2
+>m2 : typeof m2
 
         /** class comment;*/
         export class c {
@@ -99,7 +99,7 @@ var myvar = new m1.m2.c();
 
 /** Module comment */
 export module m4 {
->m4 : m4
+>m4 : typeof m4
 
     /** b's comment */
     export var b: number;
@@ -116,7 +116,7 @@ export module m4 {
     /** m2 comments
     */
     export module m2 {
->m2 : m2
+>m2 : typeof m2
 
         /** class comment; */
         export class c {
diff --git a/tests/baselines/reference/commentsExternalModules2.types b/tests/baselines/reference/commentsExternalModules2.types
index 3f9c14227ac..f6f004654d2 100644
--- a/tests/baselines/reference/commentsExternalModules2.types
+++ b/tests/baselines/reference/commentsExternalModules2.types
@@ -1,7 +1,7 @@
 === tests/cases/compiler/commentsExternalModules_1.ts ===
 /**This is on import declaration*/
 import extMod = require("commentsExternalModules2_0"); // trailing comment 1
->extMod : extMod
+>extMod : typeof extMod
 
 extMod.m1.fooExport();
 >extMod.m1.fooExport() : number
@@ -45,7 +45,7 @@ export var newVar2 = new extMod.m4.m2.c();
 
 /** Module comment*/
 export module m1 {
->m1 : m1
+>m1 : typeof m1
 
     /** b's comment*/
     export var b: number;
@@ -60,7 +60,7 @@ export module m1 {
     }
     /** m2 comments*/
     export module m2 {
->m2 : m2
+>m2 : typeof m2
 
         /** class comment;*/
         export class c {
@@ -99,7 +99,7 @@ var myvar = new m1.m2.c();
 
 /** Module comment */
 export module m4 {
->m4 : m4
+>m4 : typeof m4
 
     /** b's comment */
     export var b: number;
@@ -116,7 +116,7 @@ export module m4 {
     /** m2 comments
     */
     export module m2 {
->m2 : m2
+>m2 : typeof m2
 
         /** class comment; */
         export class c {
diff --git a/tests/baselines/reference/commentsExternalModules3.types b/tests/baselines/reference/commentsExternalModules3.types
index 3f9c14227ac..f6f004654d2 100644
--- a/tests/baselines/reference/commentsExternalModules3.types
+++ b/tests/baselines/reference/commentsExternalModules3.types
@@ -1,7 +1,7 @@
 === tests/cases/compiler/commentsExternalModules_1.ts ===
 /**This is on import declaration*/
 import extMod = require("commentsExternalModules2_0"); // trailing comment 1
->extMod : extMod
+>extMod : typeof extMod
 
 extMod.m1.fooExport();
 >extMod.m1.fooExport() : number
@@ -45,7 +45,7 @@ export var newVar2 = new extMod.m4.m2.c();
 
 /** Module comment*/
 export module m1 {
->m1 : m1
+>m1 : typeof m1
 
     /** b's comment*/
     export var b: number;
@@ -60,7 +60,7 @@ export module m1 {
     }
     /** m2 comments*/
     export module m2 {
->m2 : m2
+>m2 : typeof m2
 
         /** class comment;*/
         export class c {
@@ -99,7 +99,7 @@ var myvar = new m1.m2.c();
 
 /** Module comment */
 export module m4 {
->m4 : m4
+>m4 : typeof m4
 
     /** b's comment */
     export var b: number;
@@ -116,7 +116,7 @@ export module m4 {
     /** m2 comments
     */
     export module m2 {
->m2 : m2
+>m2 : typeof m2
 
         /** class comment; */
         export class c {
diff --git a/tests/baselines/reference/commentsFormatting.types b/tests/baselines/reference/commentsFormatting.types
index 0c5e1343959..62e8941b180 100644
--- a/tests/baselines/reference/commentsFormatting.types
+++ b/tests/baselines/reference/commentsFormatting.types
@@ -1,7 +1,7 @@
 === tests/cases/compiler/commentsFormatting.ts ===
 
 module m {
->m : m
+>m : typeof m
 
     /** this is first line - aligned to class declaration
 * this is 4 spaces left aligned
diff --git a/tests/baselines/reference/commentsModules.types b/tests/baselines/reference/commentsModules.types
index a0b2da715ce..88fbda685e1 100644
--- a/tests/baselines/reference/commentsModules.types
+++ b/tests/baselines/reference/commentsModules.types
@@ -1,7 +1,7 @@
 === tests/cases/compiler/commentsModules.ts ===
 /** Module comment*/
 module m1 {
->m1 : m1
+>m1 : typeof m1
 
     /** b's comment*/
     export var b: number;
@@ -16,7 +16,7 @@ module m1 {
     }
     /** m2 comments*/
     export module m2 {
->m2 : m2
+>m2 : typeof m2
 
         /** class comment;*/
         export class c {
@@ -75,8 +75,8 @@ var myvar = new m1.m2.c();
 
 /** module comment of m2.m3*/
 module m2.m3 {
->m2 : m2
->m3 : m3
+>m2 : typeof m2
+>m3 : typeof m3
 
     /** Exported class comment*/
     export class c {
@@ -93,9 +93,9 @@ new m2.m3.c();
 
 /** module comment of m3.m4.m5*/
 module m3.m4.m5 {
->m3 : m3
->m4 : m4
->m5 : m5
+>m3 : typeof m3
+>m4 : typeof m4
+>m5 : typeof m5
 
     /** Exported class comment*/
     export class c {
@@ -114,12 +114,12 @@ new m3.m4.m5.c();
 
 /** module comment of m4.m5.m6*/
 module m4.m5.m6 {
->m4 : m4
->m5 : m5
->m6 : m6
+>m4 : typeof m4
+>m5 : typeof m5
+>m6 : typeof m6
 
     export module m7 {
->m7 : m7
+>m7 : typeof m7
 
         /** Exported class comment*/
         export class c {
@@ -141,13 +141,13 @@ new m4.m5.m6.m7.c();
 
 /** module comment of m5.m6.m7*/
 module m5.m6.m7 {
->m5 : m5
->m6 : m6
->m7 : m7
+>m5 : typeof m5
+>m6 : typeof m6
+>m7 : typeof m7
 
     /** module m8 comment*/
     export module m8 {
->m8 : m8
+>m8 : typeof m8
 
         /** Exported class comment*/
         export class c {
@@ -168,11 +168,11 @@ new m5.m6.m7.m8.c();
 >c : typeof m5.m6.m7.m8.c
 
 module m6.m7 {
->m6 : m6
->m7 : m7
+>m6 : typeof m6
+>m7 : typeof m7
 
     export module m8 {
->m8 : m8
+>m8 : typeof m8
 
         /** Exported class comment*/
         export class c {
@@ -191,12 +191,12 @@ new m6.m7.m8.c();
 >c : typeof m6.m7.m8.c
 
 module m7.m8 {
->m7 : m7
->m8 : m8
+>m7 : typeof m7
+>m8 : typeof m8
 
     /** module m9 comment*/
     export module m9 {
->m9 : m9
+>m9 : typeof m9
 
         /** Exported class comment*/
         export class c {
diff --git a/tests/baselines/reference/commentsMultiModuleMultiFile.types b/tests/baselines/reference/commentsMultiModuleMultiFile.types
index 6f8ffb46c8d..c0f3fb1b875 100644
--- a/tests/baselines/reference/commentsMultiModuleMultiFile.types
+++ b/tests/baselines/reference/commentsMultiModuleMultiFile.types
@@ -1,10 +1,10 @@
 === tests/cases/compiler/commentsMultiModuleMultiFile_1.ts ===
 import m = require('commentsMultiModuleMultiFile_0');
->m : m
+>m : typeof m
 
 /** this is multi module 3 comment*/
 export module multiM {
->multiM : multiM
+>multiM : typeof multiM
 
     /** class d comment*/
     export class d {
@@ -26,7 +26,7 @@ new multiM.d();
 
 /** this is multi declare module*/
 export module multiM {
->multiM : multiM
+>multiM : typeof multiM
 
     /// class b comment
     export class b {
@@ -35,7 +35,7 @@ export module multiM {
 }
 /** thi is multi module 2*/
 export module multiM {
->multiM : multiM
+>multiM : typeof multiM
 
     /** class c comment*/
     export class c {
diff --git a/tests/baselines/reference/commentsMultiModuleSingleFile.types b/tests/baselines/reference/commentsMultiModuleSingleFile.types
index a2dfd6c2252..29c18639c21 100644
--- a/tests/baselines/reference/commentsMultiModuleSingleFile.types
+++ b/tests/baselines/reference/commentsMultiModuleSingleFile.types
@@ -2,7 +2,7 @@
 
 /** this is multi declare module*/
 module multiM {
->multiM : multiM
+>multiM : typeof multiM
 
     /** class b*/
     export class b {
@@ -17,7 +17,7 @@ module multiM {
 
 /// this is multi module 2
 module multiM {
->multiM : multiM
+>multiM : typeof multiM
 
     /** class c comment*/
     export class c {
diff --git a/tests/baselines/reference/commentsdoNotEmitComments.types b/tests/baselines/reference/commentsdoNotEmitComments.types
index 3ebd8b17198..48a5904f44e 100644
--- a/tests/baselines/reference/commentsdoNotEmitComments.types
+++ b/tests/baselines/reference/commentsdoNotEmitComments.types
@@ -129,7 +129,7 @@ var i1_i: i1;
 
 /** this is module comment*/
 module m1 {
->m1 : m1
+>m1 : typeof m1
 
     /** class b */
     export class b {
@@ -143,7 +143,7 @@ module m1 {
 
     /// module m2
     export module m2 {
->m2 : m2
+>m2 : unknown
     }
 }
 
diff --git a/tests/baselines/reference/commentsemitComments.types b/tests/baselines/reference/commentsemitComments.types
index 69f25dfa873..74747a4161d 100644
--- a/tests/baselines/reference/commentsemitComments.types
+++ b/tests/baselines/reference/commentsemitComments.types
@@ -129,7 +129,7 @@ var i1_i: i1;
 
 /** this is module comment*/
 module m1 {
->m1 : m1
+>m1 : typeof m1
 
     /** class b */
     export class b {
@@ -143,7 +143,7 @@ module m1 {
 
     /// module m2
     export module m2 {
->m2 : m2
+>m2 : unknown
     }
 }
 
diff --git a/tests/baselines/reference/commonJSImportAsPrimaryExpression.types b/tests/baselines/reference/commonJSImportAsPrimaryExpression.types
index 28c539cd935..0d2e96afaa2 100644
--- a/tests/baselines/reference/commonJSImportAsPrimaryExpression.types
+++ b/tests/baselines/reference/commonJSImportAsPrimaryExpression.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/externalModules/foo_1.ts ===
 import foo = require("./foo_0");
->foo : foo
+>foo : typeof foo
 
 if(foo.C1.s1){
 >foo.C1.s1 : boolean
diff --git a/tests/baselines/reference/commonJSImportNotAsPrimaryExpression.types b/tests/baselines/reference/commonJSImportNotAsPrimaryExpression.types
index 3242c58465d..bde0cb02b1e 100644
--- a/tests/baselines/reference/commonJSImportNotAsPrimaryExpression.types
+++ b/tests/baselines/reference/commonJSImportNotAsPrimaryExpression.types
@@ -1,21 +1,21 @@
 === tests/cases/conformance/externalModules/foo_1.ts ===
 import foo = require("./foo_0");
->foo : foo
+>foo : typeof foo
 
 // None of the below should cause a runtime dependency on foo_0
 import f = foo.M1;
->f : f
+>f : unknown
 >foo : typeof foo
->M1 : foo.M1
+>M1 : unknown
 
 var i: f.I2;
 >i : f.I2
->f : f
+>f : unknown
 >I2 : f.I2
 
 var x: foo.C1 = <{m1: number}>{};
 >x : foo.C1
->foo : foo
+>foo : unknown
 >C1 : foo.C1
 ><{m1: number}>{} : { m1: number; }
 >m1 : number
@@ -29,14 +29,14 @@ var y: typeof foo.C1.s1 = false;
 
 var z: foo.M1.I2;
 >z : f.I2
->foo : foo
->M1 : foo.M1
+>foo : unknown
+>M1 : unknown
 >I2 : f.I2
 
 var e: number = <foo.E1>0;
 >e : number
 ><foo.E1>0 : foo.E1
->foo : foo
+>foo : unknown
 >E1 : foo.E1
 
 === tests/cases/conformance/externalModules/foo_0.ts ===
@@ -61,7 +61,7 @@ export interface I1 {
 }
 
 export module M1 {
->M1 : M1
+>M1 : unknown
 
 	export interface I2 {
 >I2 : I2
diff --git a/tests/baselines/reference/compoundVarDecl1.types b/tests/baselines/reference/compoundVarDecl1.types
index f0db41ef14d..e9a04bff9b2 100644
--- a/tests/baselines/reference/compoundVarDecl1.types
+++ b/tests/baselines/reference/compoundVarDecl1.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/compoundVarDecl1.ts ===
 module Foo { var a = 1, b = 1; a = b + 2; }
->Foo : Foo
+>Foo : typeof Foo
 >a : number
 >b : number
 >a = b + 2 : number
diff --git a/tests/baselines/reference/constructorArgWithGenericCallSignature.types b/tests/baselines/reference/constructorArgWithGenericCallSignature.types
index c4e31db89de..339ca301f63 100644
--- a/tests/baselines/reference/constructorArgWithGenericCallSignature.types
+++ b/tests/baselines/reference/constructorArgWithGenericCallSignature.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/constructorArgWithGenericCallSignature.ts ===
 module Test {
->Test : Test
+>Test : typeof Test
 
     export interface MyFunc {
 >MyFunc : MyFunc
@@ -26,7 +26,7 @@ module Test {
 }
 var func: Test.MyFunc;
 >func : Test.MyFunc
->Test : Test
+>Test : unknown
 >MyFunc : Test.MyFunc
 
 Test.F(func); // OK
diff --git a/tests/baselines/reference/constructorHasPrototypeProperty.types b/tests/baselines/reference/constructorHasPrototypeProperty.types
index c829ebe8835..24dedb254eb 100644
--- a/tests/baselines/reference/constructorHasPrototypeProperty.types
+++ b/tests/baselines/reference/constructorHasPrototypeProperty.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/classes/members/constructorFunctionTypes/constructorHasPrototypeProperty.ts ===
 module NonGeneric {
->NonGeneric : NonGeneric
+>NonGeneric : typeof NonGeneric
 
     class C {
 >C : C
@@ -41,7 +41,7 @@ module NonGeneric {
 }
 
 module Generic {
->Generic : Generic
+>Generic : typeof Generic
 
     class C<T,U> {
 >C : C<T, U>
diff --git a/tests/baselines/reference/convertKeywordsYes.types b/tests/baselines/reference/convertKeywordsYes.types
index 33d5c6f2494..75779136160 100644
--- a/tests/baselines/reference/convertKeywordsYes.types
+++ b/tests/baselines/reference/convertKeywordsYes.types
@@ -833,7 +833,7 @@ enum bigEnum {
 }
 
 module bigModule {
->bigModule : bigModule
+>bigModule : typeof bigModule
 
     class constructor { }
 >constructor : constructor
diff --git a/tests/baselines/reference/covariance1.types b/tests/baselines/reference/covariance1.types
index 0e8bf3d9125..d9f39089b1d 100644
--- a/tests/baselines/reference/covariance1.types
+++ b/tests/baselines/reference/covariance1.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/covariance1.ts ===
 module M {
->M : M
+>M : typeof M
 
     interface X { m1:number; }
 >X : X
diff --git a/tests/baselines/reference/cyclicModuleImport.types b/tests/baselines/reference/cyclicModuleImport.types
index 11c4fc54a0e..c581dd63c6d 100644
--- a/tests/baselines/reference/cyclicModuleImport.types
+++ b/tests/baselines/reference/cyclicModuleImport.types
@@ -1,7 +1,7 @@
 === tests/cases/compiler/cyclicModuleImport.ts ===
 declare module "SubModule" {
     import MainModule = require('MainModule');
->MainModule : MainModule
+>MainModule : typeof MainModule
 
     class SubModule {
 >SubModule : SubModule
@@ -23,7 +23,7 @@ declare module "SubModule" {
 }
 declare module "MainModule" {
     import SubModule = require('SubModule');
->SubModule : SubModule
+>SubModule : typeof SubModule
 
     class MainModule {
 >MainModule : MainModule
diff --git a/tests/baselines/reference/declFileAmbientExternalModuleWithSingleExportedModule.types b/tests/baselines/reference/declFileAmbientExternalModuleWithSingleExportedModule.types
index 8cc4336664a..420f1550d7a 100644
--- a/tests/baselines/reference/declFileAmbientExternalModuleWithSingleExportedModule.types
+++ b/tests/baselines/reference/declFileAmbientExternalModuleWithSingleExportedModule.types
@@ -1,13 +1,13 @@
 === tests/cases/compiler/declFileAmbientExternalModuleWithSingleExportedModule_1.ts ===
 ///<reference path='declFileAmbientExternalModuleWithSingleExportedModule_0.ts'/>
 import SubModule = require('SubModule');
->SubModule : SubModule
+>SubModule : typeof SubModule
 
 export var x: SubModule.m.m3.c;
 >x : SubModule.m.m3.c
->SubModule : SubModule
->m : SubModule.m
->m3 : SubModule.m.m3
+>SubModule : unknown
+>m : unknown
+>m3 : unknown
 >c : SubModule.m.m3.c
 
 
@@ -15,10 +15,10 @@ export var x: SubModule.m.m3.c;
 
 declare module "SubModule" {
     export module m {
->m : m
+>m : unknown
 
         export module m3 {
->m3 : m3
+>m3 : unknown
 
             interface c {
 >c : c
diff --git a/tests/baselines/reference/declFileExportAssignmentImportInternalModule.types b/tests/baselines/reference/declFileExportAssignmentImportInternalModule.types
index bf77e1efb08..e0bf172e584 100644
--- a/tests/baselines/reference/declFileExportAssignmentImportInternalModule.types
+++ b/tests/baselines/reference/declFileExportAssignmentImportInternalModule.types
@@ -1,9 +1,9 @@
 === tests/cases/compiler/declFileExportAssignmentImportInternalModule.ts ===
 module m3 {
->m3 : m3
+>m3 : typeof m3
 
     export module m2 {
->m2 : m2
+>m2 : unknown
 
         export interface connectModule {
 >connectModule : connectModule
@@ -33,24 +33,24 @@ module m3 {
 >server : { (): m2.connectExport; test1: m2.connectModule; test2(): m2.connectModule; }
 
         (): m2.connectExport;
->m2 : m2
+>m2 : unknown
 >connectExport : m2.connectExport
 
         test1: m2.connectModule;
 >test1 : m2.connectModule
->m2 : m2
+>m2 : unknown
 >connectModule : m2.connectModule
 
         test2(): m2.connectModule;
 >test2 : () => m2.connectModule
->m2 : m2
+>m2 : unknown
 >connectModule : m2.connectModule
 
     };
 }
 
 import m = m3
->m : m
+>m : typeof m3
 >m3 : typeof m3
 
 export = m;
diff --git a/tests/baselines/reference/declFileExportAssignmentOfGenericInterface.types b/tests/baselines/reference/declFileExportAssignmentOfGenericInterface.types
index 1494d04c31c..1d77f8ee7a3 100644
--- a/tests/baselines/reference/declFileExportAssignmentOfGenericInterface.types
+++ b/tests/baselines/reference/declFileExportAssignmentOfGenericInterface.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/declFileExportAssignmentOfGenericInterface_1.ts ===
 import a = require('declFileExportAssignmentOfGenericInterface_0');
->a : a
+>a : unknown
 
 export var x: a<a<string>>;
 >x : a<a<string>>
diff --git a/tests/baselines/reference/declFileExportImportChain.types b/tests/baselines/reference/declFileExportImportChain.types
index 1a047003ce5..df71d32d4d9 100644
--- a/tests/baselines/reference/declFileExportImportChain.types
+++ b/tests/baselines/reference/declFileExportImportChain.types
@@ -1,22 +1,22 @@
 === tests/cases/compiler/declFileExportImportChain_d.ts ===
 import c = require("declFileExportImportChain_c");
->c : c
+>c : typeof c
 
 export var x: c.b1.a.m2.c1;
 >x : c.b1.a.m2.c1
->c : c
->b1 : c.b1
->a : c.b1.a
->m2 : c.b1.a.m2
+>c : unknown
+>b1 : unknown
+>a : unknown
+>m2 : unknown
 >c1 : c.b1.a.m2.c1
 
 === tests/cases/compiler/declFileExportImportChain_a.ts ===
 
 module m1 {
->m1 : m1
+>m1 : typeof m1
 
     export module m2 {
->m2 : m2
+>m2 : typeof m2
 
         export class c1 {
 >c1 : c1
@@ -28,16 +28,16 @@ export = m1;
 
 === tests/cases/compiler/declFileExportImportChain_b.ts ===
 export import a = require("declFileExportImportChain_a");
->a : a
+>a : typeof a
 
 === tests/cases/compiler/declFileExportImportChain_b1.ts ===
 import b = require("declFileExportImportChain_b");
->b : b
+>b : typeof b
 
 export = b;
 >b : typeof b
 
 === tests/cases/compiler/declFileExportImportChain_c.ts ===
 export import b1 = require("declFileExportImportChain_b1");
->b1 : b1
+>b1 : typeof b1
 
diff --git a/tests/baselines/reference/declFileExportImportChain2.types b/tests/baselines/reference/declFileExportImportChain2.types
index 7254e0d9498..a0e3f1c31a1 100644
--- a/tests/baselines/reference/declFileExportImportChain2.types
+++ b/tests/baselines/reference/declFileExportImportChain2.types
@@ -1,21 +1,21 @@
 === tests/cases/compiler/declFileExportImportChain2_d.ts ===
 import c = require("declFileExportImportChain2_c");
->c : c
+>c : typeof c
 
 export var x: c.b.m2.c1;
 >x : c.b.m2.c1
->c : c
->b : c.b
->m2 : c.b.m2
+>c : unknown
+>b : unknown
+>m2 : unknown
 >c1 : c.b.m2.c1
 
 === tests/cases/compiler/declFileExportImportChain2_a.ts ===
 
 module m1 {
->m1 : m1
+>m1 : typeof m1
 
     export module m2 {
->m2 : m2
+>m2 : typeof m2
 
         export class c1 {
 >c1 : c1
@@ -27,12 +27,12 @@ export = m1;
 
 === tests/cases/compiler/declFileExportImportChain2_b.ts ===
 import a = require("declFileExportImportChain2_a");
->a : a
+>a : typeof a
 
 export = a;
 >a : typeof a
 
 === tests/cases/compiler/declFileExportImportChain2_c.ts ===
 export import b = require("declFileExportImportChain2_b");
->b : b
+>b : typeof b
 
diff --git a/tests/baselines/reference/declFileForExportedImport.types b/tests/baselines/reference/declFileForExportedImport.types
index 6f56ad27f04..987f82bf5a0 100644
--- a/tests/baselines/reference/declFileForExportedImport.types
+++ b/tests/baselines/reference/declFileForExportedImport.types
@@ -1,7 +1,7 @@
 === tests/cases/compiler/declFileForExportedImport_1.ts ===
 ///<reference path='declFileForExportedImport_0.ts'/>
 export import a = require('declFileForExportedImport_0');
->a : a
+>a : typeof a
 
 var y = a.x;
 >y : number
@@ -10,7 +10,7 @@ var y = a.x;
 >x : number
 
 export import b = a;
->b : b
+>b : typeof a
 >a : typeof a
 
 var z = b.x;
diff --git a/tests/baselines/reference/declFileGenericType.types b/tests/baselines/reference/declFileGenericType.types
index 28d52e0040c..c30f54a6ebe 100644
--- a/tests/baselines/reference/declFileGenericType.types
+++ b/tests/baselines/reference/declFileGenericType.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/declFileGenericType.ts ===
 export module C {
->C : C
+>C : typeof C
 
     export class A<T>{ }
 >A : A<T>
@@ -22,9 +22,9 @@ export module C {
 >T : T
 >x : T
 >T : T
->C : C
+>C : unknown
 >A : A<T>
->C : C
+>C : unknown
 >B : B
 
     export function F3<T>(x: T): C.A<C.B>[] { return null; }
@@ -32,9 +32,9 @@ export module C {
 >T : T
 >x : T
 >T : T
->C : C
+>C : unknown
 >A : A<T>
->C : C
+>C : unknown
 >B : B
 
     export function F4<T extends A<B>>(x: T): Array<C.A<C.B>> { return null; }
@@ -45,9 +45,9 @@ export module C {
 >x : T
 >T : T
 >Array : Array<T>
->C : C
+>C : unknown
 >A : A<T>
->C : C
+>C : unknown
 >B : B
 
     export function F5<T>(): T { return null; }
@@ -77,9 +77,9 @@ export module C {
 
 export var a: C.A<C.B>;
 >a : C.A<C.B>
->C : C
+>C : unknown
 >A : C.A<T>
->C : C
+>C : unknown
 >B : C.B
 
 export var b = C.F;
@@ -114,24 +114,24 @@ export var x = (new C.D<C.A<C.B>>(new C.A<C.B>())).val;
 >C.D : typeof C.D
 >C : typeof C
 >D : typeof C.D
->C : C
+>C : unknown
 >A : C.A<T>
->C : C
+>C : unknown
 >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 : C
+>C : unknown
 >B : C.B
 >val : C.A<C.B>
 
 export function f<T extends C.A<C.B>>() { }
 >f : typeof f
 >T : T
->C : C
+>C : unknown
 >A : C.A<T>
->C : C
+>C : unknown
 >B : C.B
 
 export var g = C.F5<C.A<C.B>>();
@@ -140,23 +140,23 @@ export var g = C.F5<C.A<C.B>>();
 >C.F5 : typeof C.F5
 >C : typeof C
 >F5 : typeof C.F5
->C : C
+>C : unknown
 >A : C.A<T>
->C : C
+>C : unknown
 >B : C.B
 
 export class h extends C.A<C.B>{ }
 >h : h
->C : C
+>C : unknown
 >A : C.A<T>
->C : C
+>C : unknown
 >B : C.B
 
 export interface i extends C.A<C.B> { }
 >i : i
->C : C
+>C : unknown
 >A : C.A<T>
->C : C
+>C : unknown
 >B : C.B
 
 export var j = C.F6;
diff --git a/tests/baselines/reference/declFileGenericType2.types b/tests/baselines/reference/declFileGenericType2.types
index b8b43503dc0..a6b6546326c 100644
--- a/tests/baselines/reference/declFileGenericType2.types
+++ b/tests/baselines/reference/declFileGenericType2.types
@@ -1,89 +1,89 @@
 === tests/cases/compiler/declFileGenericType2.ts ===
 
 declare module templa.mvc {
->templa : templa
->mvc : mvc
+>templa : typeof templa
+>mvc : typeof mvc
 
     interface IModel {
 >IModel : IModel
     }
 }
 declare module templa.mvc {
->templa : templa
->mvc : mvc
+>templa : typeof templa
+>mvc : typeof mvc
 
     interface IController<ModelType extends templa.mvc.IModel> {
 >IController : IController<ModelType>
 >ModelType : ModelType
->templa : templa
->mvc : mvc
+>templa : unknown
+>mvc : unknown
 >IModel : IModel
     }
 }
 declare module templa.mvc {
->templa : templa
->mvc : mvc
+>templa : typeof templa
+>mvc : typeof mvc
 
     class AbstractController<ModelType extends templa.mvc.IModel> implements mvc.IController<ModelType> {
 >AbstractController : AbstractController<ModelType>
 >ModelType : ModelType
->templa : templa
->mvc : mvc
+>templa : unknown
+>mvc : unknown
 >IModel : IModel
->mvc : mvc
+>mvc : unknown
 >IController : IController<ModelType>
 >ModelType : ModelType
     }
 }
 declare module templa.mvc.composite {
->templa : templa
->mvc : mvc
->composite : composite
+>templa : typeof templa
+>mvc : typeof mvc
+>composite : unknown
 
     interface ICompositeControllerModel extends mvc.IModel {
 >ICompositeControllerModel : ICompositeControllerModel
->mvc : mvc
+>mvc : unknown
 >IModel : IModel
 
         getControllers(): mvc.IController<mvc.IModel>[];
 >getControllers : () => IController<IModel>[]
->mvc : mvc
+>mvc : unknown
 >IController : IController<ModelType>
->mvc : mvc
+>mvc : unknown
 >IModel : IModel
     }
 }
 module templa.dom.mvc {
->templa : templa
->dom : dom
->mvc : 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 : templa
->mvc : templa.mvc
+>templa : unknown
+>mvc : unknown
 >IModel : templa.mvc.IModel
->templa : templa
->mvc : templa.mvc
+>templa : unknown
+>mvc : unknown
 >IController : templa.mvc.IController<ModelType>
 >ModelType : ModelType
     }
 }
 // Module
 module templa.dom.mvc {
->templa : templa
->dom : dom
->mvc : mvc
+>templa : typeof templa
+>dom : typeof dom
+>mvc : typeof mvc
 
     export class AbstractElementController<ModelType extends templa.mvc.IModel> extends templa.mvc.AbstractController<ModelType> implements IElementController<ModelType> {
 >AbstractElementController : AbstractElementController<ModelType>
 >ModelType : ModelType
->templa : templa
->mvc : templa.mvc
+>templa : unknown
+>mvc : unknown
 >IModel : templa.mvc.IModel
->templa : templa
->mvc : templa.mvc
+>templa : unknown
+>mvc : unknown
 >AbstractController : templa.mvc.AbstractController<ModelType>
 >ModelType : ModelType
 >IElementController : IElementController<ModelType>
@@ -98,31 +98,31 @@ module templa.dom.mvc {
 }
 // Module
 module templa.dom.mvc.composite {
->templa : templa
->dom : dom
->mvc : mvc
->composite : composite
+>templa : typeof templa
+>dom : typeof dom
+>mvc : typeof mvc
+>composite : typeof composite
 
     export class AbstractCompositeElementController<ModelType extends templa.mvc.composite.ICompositeControllerModel> extends templa.dom.mvc.AbstractElementController<ModelType> {
 >AbstractCompositeElementController : AbstractCompositeElementController<ModelType>
 >ModelType : ModelType
->templa : templa
->mvc : templa.mvc
->composite : templa.mvc.composite
+>templa : unknown
+>mvc : unknown
+>composite : unknown
 >ICompositeControllerModel : templa.mvc.composite.ICompositeControllerModel
->templa : templa
->dom : dom
->mvc : mvc
+>templa : unknown
+>dom : unknown
+>mvc : unknown
 >AbstractElementController : AbstractElementController<ModelType>
 >ModelType : ModelType
 
         public _controllers: templa.mvc.IController<templa.mvc.IModel>[];
 >_controllers : templa.mvc.IController<templa.mvc.IModel>[]
->templa : templa
->mvc : templa.mvc
+>templa : unknown
+>mvc : unknown
 >IController : templa.mvc.IController<ModelType>
->templa : templa
->mvc : templa.mvc
+>templa : unknown
+>mvc : unknown
 >IModel : templa.mvc.IModel
 
         constructor() {
diff --git a/tests/baselines/reference/declFileImportChainInExportAssignment.types b/tests/baselines/reference/declFileImportChainInExportAssignment.types
index ab46446bd73..8cb130c638c 100644
--- a/tests/baselines/reference/declFileImportChainInExportAssignment.types
+++ b/tests/baselines/reference/declFileImportChainInExportAssignment.types
@@ -1,9 +1,9 @@
 === tests/cases/compiler/declFileImportChainInExportAssignment.ts ===
 module m {
->m : m
+>m : typeof m
 
     export module c {
->c : m.c
+>c : typeof m.c
 
         export class c {
 >c : c
@@ -11,12 +11,12 @@ module m {
     }
 }
 import a = m.c;
->a : a
+>a : typeof a
 >m : typeof m
 >c : typeof a
 
 import b = a;
->b : b
+>b : typeof a
 >a : typeof a
 
 export = b;
diff --git a/tests/baselines/reference/declFileImportModuleWithExportAssignment.types b/tests/baselines/reference/declFileImportModuleWithExportAssignment.types
index 1d449325126..15201baa487 100644
--- a/tests/baselines/reference/declFileImportModuleWithExportAssignment.types
+++ b/tests/baselines/reference/declFileImportModuleWithExportAssignment.types
@@ -1,7 +1,7 @@
 === tests/cases/compiler/declFileImportModuleWithExportAssignment_1.ts ===
 /**This is on import declaration*/
 import a1 = require("declFileImportModuleWithExportAssignment_0");
->a1 : a1
+>a1 : { (): a1.connectExport; test1: a1.connectModule; test2(): a1.connectModule; }
 
 export var a = a1;
 >a : { (): a1.connectExport; test1: a1.connectModule; test2(): a1.connectModule; }
@@ -16,7 +16,7 @@ a.test1(null, null, null);
 === tests/cases/compiler/declFileImportModuleWithExportAssignment_0.ts ===
 
 module m2 {
->m2 : m2
+>m2 : { (): connectExport; test1: connectModule; test2(): connectModule; }
 
     export interface connectModule {
 >connectModule : connectModule
@@ -45,17 +45,17 @@ var m2: {
 >m2 : { (): m2.connectExport; test1: m2.connectModule; test2(): m2.connectModule; }
 
     (): m2.connectExport;
->m2 : m2
+>m2 : unknown
 >connectExport : m2.connectExport
 
     test1: m2.connectModule;
 >test1 : m2.connectModule
->m2 : m2
+>m2 : unknown
 >connectModule : m2.connectModule
 
     test2(): m2.connectModule;
 >test2 : () => m2.connectModule
->m2 : m2
+>m2 : unknown
 >connectModule : m2.connectModule
 
 };
diff --git a/tests/baselines/reference/declFileImportedTypeUseInTypeArgPosition.types b/tests/baselines/reference/declFileImportedTypeUseInTypeArgPosition.types
index 2cb6d918ec3..f5d443d0c57 100644
--- a/tests/baselines/reference/declFileImportedTypeUseInTypeArgPosition.types
+++ b/tests/baselines/reference/declFileImportedTypeUseInTypeArgPosition.types
@@ -11,12 +11,12 @@ declare module 'mod1' {
 
 declare module 'moo' {
     import x = require('mod1');
->x : x
+>x : typeof x
 
     export var p: List<x.Foo>;
 >p : List<x.Foo>
 >List : List<T>
->x : x
+>x : unknown
 >Foo : x.Foo
 }
 
diff --git a/tests/baselines/reference/declFileInternalAliases.types b/tests/baselines/reference/declFileInternalAliases.types
index 79c39444079..6dbc8db5c38 100644
--- a/tests/baselines/reference/declFileInternalAliases.types
+++ b/tests/baselines/reference/declFileInternalAliases.types
@@ -1,16 +1,16 @@
 === tests/cases/compiler/declFileInternalAliases.ts ===
 module m {
->m : m
+>m : typeof m
 
     export class c {
 >c : c
     }
 }
 module m1 {
->m1 : m1
+>m1 : typeof m1
 
     import x = m.c;
->x : x
+>x : typeof x
 >m : typeof m
 >c : x
 
@@ -20,10 +20,10 @@ module m1 {
 >x : typeof x
 }
 module m2 {
->m2 : m2
+>m2 : typeof m2
 
     export import x = m.c;
->x : x
+>x : typeof x
 >m : typeof m
 >c : x
 
diff --git a/tests/baselines/reference/declFileModuleAssignmentInObjectLiteralProperty.types b/tests/baselines/reference/declFileModuleAssignmentInObjectLiteralProperty.types
index bfd75dd1d5e..6fd697b7ea2 100644
--- a/tests/baselines/reference/declFileModuleAssignmentInObjectLiteralProperty.types
+++ b/tests/baselines/reference/declFileModuleAssignmentInObjectLiteralProperty.types
@@ -1,7 +1,7 @@
 === tests/cases/compiler/declFileModuleAssignmentInObjectLiteralProperty.ts ===
 
 module m1 {
->m1 : m1
+>m1 : typeof m1
 
     export class c {
 >c : c
diff --git a/tests/baselines/reference/declFileModuleContinuation.types b/tests/baselines/reference/declFileModuleContinuation.types
index e05bd8a5235..671d9e6923c 100644
--- a/tests/baselines/reference/declFileModuleContinuation.types
+++ b/tests/baselines/reference/declFileModuleContinuation.types
@@ -1,7 +1,7 @@
 === tests/cases/compiler/declFileModuleContinuation.ts ===
 module A.C {
->A : A
->C : C
+>A : typeof A
+>C : unknown
 
     export interface Z {
 >Z : Z
@@ -9,14 +9,14 @@ module A.C {
 }
 
 module A.B.C {
->A : A
->B : B
->C : C
+>A : typeof A
+>B : typeof B
+>C : typeof C
 
     export class W implements A.C.Z {
 >W : W
->A : A
->C : A.C
+>A : unknown
+>C : unknown
 >Z : A.C.Z
     }
 }
diff --git a/tests/baselines/reference/declFileModuleWithPropertyOfTypeModule.types b/tests/baselines/reference/declFileModuleWithPropertyOfTypeModule.types
index 391fecf9af3..ecdc4396df4 100644
--- a/tests/baselines/reference/declFileModuleWithPropertyOfTypeModule.types
+++ b/tests/baselines/reference/declFileModuleWithPropertyOfTypeModule.types
@@ -1,7 +1,7 @@
 === tests/cases/compiler/declFileModuleWithPropertyOfTypeModule.ts ===
 
 module m {
->m : m
+>m : typeof m
 
     export class c {
 >c : c
diff --git a/tests/baselines/reference/declFileTypeofInAnonymousType.types b/tests/baselines/reference/declFileTypeofInAnonymousType.types
index 40394e20af6..39ea7383ca4 100644
--- a/tests/baselines/reference/declFileTypeofInAnonymousType.types
+++ b/tests/baselines/reference/declFileTypeofInAnonymousType.types
@@ -1,7 +1,7 @@
 === tests/cases/compiler/declFileTypeofInAnonymousType.ts ===
 
 module m1 {
->m1 : m1
+>m1 : typeof m1
 
     export class c {
 >c : c
@@ -22,7 +22,7 @@ module m1 {
 var a: { c: m1.c; };
 >a : { c: m1.c; }
 >c : m1.c
->m1 : m1
+>m1 : unknown
 >c : m1.c
 
 var b = {
diff --git a/tests/baselines/reference/declFileTypeofModule.types b/tests/baselines/reference/declFileTypeofModule.types
index 4e97ef8662e..ef4238bf2c5 100644
--- a/tests/baselines/reference/declFileTypeofModule.types
+++ b/tests/baselines/reference/declFileTypeofModule.types
@@ -1,7 +1,7 @@
 === tests/cases/compiler/declFileTypeofModule.ts ===
 
 module m1 {
->m1 : m1
+>m1 : typeof m1
 
     export var c: string;
 >c : string
@@ -15,7 +15,7 @@ var m1_2: typeof m1;
 >m1 : typeof m1
 
 module m2 {
->m2 : m2
+>m2 : typeof m2
 
     export var d: typeof m2;
 >d : typeof m2
diff --git a/tests/baselines/reference/declFileWithClassNameConflictingWithClassReferredByExtendsClause.types b/tests/baselines/reference/declFileWithClassNameConflictingWithClassReferredByExtendsClause.types
index 675a3ad4483..34d263ef6bb 100644
--- a/tests/baselines/reference/declFileWithClassNameConflictingWithClassReferredByExtendsClause.types
+++ b/tests/baselines/reference/declFileWithClassNameConflictingWithClassReferredByExtendsClause.types
@@ -1,9 +1,9 @@
 === tests/cases/compiler/declFileWithClassNameConflictingWithClassReferredByExtendsClause.ts ===
 
 declare module A.B.Base {
->A : A
->B : B
->Base : Base
+>A : typeof A
+>B : typeof B
+>Base : typeof Base
 
     export class W {
 >W : W
@@ -13,15 +13,15 @@ declare module A.B.Base {
     }
 }
 module X.Y.base {
->X : X
->Y : Y
->base : base
+>X : typeof X
+>Y : typeof Y
+>base : typeof base
 
     export class W extends A.B.Base.W {
 >W : W
->A : A
->B : A.B
->Base : A.B.Base
+>A : unknown
+>B : unknown
+>Base : unknown
 >W : A.B.Base.W
 
         name: string;
@@ -30,17 +30,17 @@ module X.Y.base {
 }
 
 module X.Y.base.Z {
->X : X
->Y : Y
->base : base
->Z : Z
+>X : typeof X
+>Y : typeof Y
+>base : typeof base
+>Z : typeof Z
 
     export class W<TValue> extends X.Y.base.W {
 >W : W<TValue>
 >TValue : TValue
->X : X
->Y : Y
->base : base
+>X : unknown
+>Y : unknown
+>base : unknown
 >W : base.W
 
         value: boolean;
diff --git a/tests/baselines/reference/declFileWithExtendsClauseThatHasItsContainerNameConflict.types b/tests/baselines/reference/declFileWithExtendsClauseThatHasItsContainerNameConflict.types
index b42343c3513..4dae0d42c53 100644
--- a/tests/baselines/reference/declFileWithExtendsClauseThatHasItsContainerNameConflict.types
+++ b/tests/baselines/reference/declFileWithExtendsClauseThatHasItsContainerNameConflict.types
@@ -1,9 +1,9 @@
 === tests/cases/compiler/declFileWithExtendsClauseThatHasItsContainerNameConflict.ts ===
 
 declare module A.B.C {
->A : A
->B : B
->C : C
+>A : typeof A
+>B : typeof B
+>C : typeof C
 
     class B {
 >B : B
@@ -11,8 +11,8 @@ declare module A.B.C {
 }
 
 module A.B {
->A : A
->B : B
+>A : typeof A
+>B : typeof B
 
     export class EventManager {
 >EventManager : EventManager
@@ -24,9 +24,9 @@ module A.B {
 }
 
 module A.B.C {
->A : A
->B : B
->C : C
+>A : typeof A
+>B : typeof B
+>C : typeof C
 
     export class ContextMenu extends EventManager {
 >ContextMenu : ContextMenu
diff --git a/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause1.types b/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause1.types
index eb106a2d711..8c5c4169cb4 100644
--- a/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause1.types
+++ b/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause1.types
@@ -1,28 +1,28 @@
 === tests/cases/compiler/declFileWithInternalModuleNameConflictsInExtendsClause1.ts ===
 
 module X.A.C {
->X : X
->A : A
->C : C
+>X : typeof X
+>A : typeof A
+>C : unknown
 
     export interface Z {
 >Z : Z
     }
 }
 module X.A.B.C {
->X : X
->A : A
->B : B
->C : C
+>X : typeof X
+>A : typeof A
+>B : typeof B
+>C : typeof C
 
     module A {
->A : A
+>A : unknown
     }
     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 : X
->A : X.A
->C : X.A.C
+>X : unknown
+>A : unknown
+>C : unknown
 >Z : X.A.C.Z
     }
 }
diff --git a/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause2.types b/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause2.types
index da3c3791047..11afd69d94c 100644
--- a/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause2.types
+++ b/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause2.types
@@ -1,35 +1,35 @@
 === tests/cases/compiler/declFileWithInternalModuleNameConflictsInExtendsClause2.ts ===
 
 module X.A.C {
->X : X
->A : A
->C : C
+>X : typeof X
+>A : typeof A
+>C : unknown
 
     export interface Z {
 >Z : Z
     }
 }
 module X.A.B.C {
->X : X
->A : A
->B : B
->C : C
+>X : typeof X
+>A : typeof A
+>B : typeof B
+>C : typeof C
 
     export class W implements A.C.Z { // This can refer to it as A.C.Z
 >W : W
->A : A
->C : A.C
+>A : unknown
+>C : unknown
 >Z : A.C.Z
     }
 }
 
 module X.A.B.C {
->X : X
->A : A
->B : B
->C : C
+>X : typeof X
+>A : typeof A
+>B : typeof B
+>C : typeof C
 
     module A {
->A : A
+>A : unknown
     }
 }
diff --git a/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause3.types b/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause3.types
index e74930a08a8..0b17b2ce78a 100644
--- a/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause3.types
+++ b/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause3.types
@@ -1,36 +1,36 @@
 === tests/cases/compiler/declFileWithInternalModuleNameConflictsInExtendsClause3.ts ===
 
 module X.A.C {
->X : X
->A : A
->C : C
+>X : typeof X
+>A : typeof A
+>C : unknown
 
     export interface Z {
 >Z : Z
     }
 }
 module X.A.B.C {
->X : X
->A : A
->B : B
->C : C
+>X : typeof X
+>A : typeof A
+>B : typeof B
+>C : typeof 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 : X
->A : X.A
->C : X.A.C
+>X : unknown
+>A : unknown
+>C : unknown
 >Z : X.A.C.Z
     }
 }
 
 module X.A.B.C {
->X : X
->A : A
->B : B
->C : C
+>X : typeof X
+>A : typeof A
+>B : typeof B
+>C : typeof C
 
     export module A {
->A : A
+>A : unknown
     }
 }
diff --git a/tests/baselines/reference/declInput4.types b/tests/baselines/reference/declInput4.types
index 91400cca694..7f5c5a81197 100644
--- a/tests/baselines/reference/declInput4.types
+++ b/tests/baselines/reference/declInput4.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/declInput4.ts ===
 module M {
->M : M
+>M : typeof M
 
     class C { }
 >C : C
diff --git a/tests/baselines/reference/declarationEmit_nameConflicts.types b/tests/baselines/reference/declarationEmit_nameConflicts.types
index 3c9238cd8d0..fe6a5c29565 100644
--- a/tests/baselines/reference/declarationEmit_nameConflicts.types
+++ b/tests/baselines/reference/declarationEmit_nameConflicts.types
@@ -1,9 +1,9 @@
 === tests/cases/compiler/declarationEmit_nameConflicts_0.ts ===
 import im = require('declarationEmit_nameConflicts_1');
->im : im
+>im : typeof im
 
 export module M {
->M : M
+>M : typeof M
 
     export function f() { }
 >f : typeof f
@@ -12,7 +12,7 @@ export module M {
 >C : C
 
     export module N {
->N : N
+>N : typeof N
 
         export function g() { };
 >g : typeof g
@@ -22,27 +22,27 @@ export module M {
     }
 
     export import a = M.f;
->a : a
+>a : typeof f
 >M : typeof M
 >f : typeof f
 
     export import b = M.C;
->b : b
+>b : typeof C
 >M : typeof M
 >C : C
 
     export import c = N;
->c : c
+>c : typeof N
 >N : typeof N
 
     export import d = im;
->d : d
+>d : typeof d
 >im : typeof d
 }
 
 export module M.P {
->M : M
->P : P
+>M : typeof M
+>P : typeof P
 
     export function f() { }
 >f : typeof f
@@ -51,7 +51,7 @@ export module M.P {
 >C : C
 
     export module N {
->N : N
+>N : typeof N
 
         export function g() { };
 >g : typeof g
@@ -60,7 +60,7 @@ export module M.P {
 >I : I
     }
     export import im = M.P.f;
->im : im
+>im : typeof f
 >M : typeof M
 >P : typeof P
 >f : typeof f
@@ -99,8 +99,8 @@ export module M.P {
 }
 
 export module M.Q {
->M : M
->Q : Q
+>M : typeof M
+>Q : typeof Q
 
     export function f() { }
 >f : typeof f
@@ -109,7 +109,7 @@ export module M.Q {
 >C : C
 
     export module N {
->N : N
+>N : typeof N
 
         export function g() { };
 >g : typeof g
@@ -119,28 +119,28 @@ export module M.Q {
     }
     export interface b extends M.b { } // ok
 >b : b
->M : M
+>M : unknown
 >b : M.C
 
     export interface I extends M.c.I { } // ok
 >I : I
->M : M
->c : M.c
+>M : unknown
+>c : unknown
 >I : M.c.I
 
     export module c {
->c : c
+>c : unknown
 
         export interface I extends M.c.I { } // ok
 >I : I
->M : M
->c : M.c
+>M : unknown
+>c : unknown
 >I : M.c.I
     }
 }
 === tests/cases/compiler/declarationEmit_nameConflicts_1.ts ===
 module f { export class c { } }
->f : f
+>f : typeof f
 >c : c
 
 export = f;
diff --git a/tests/baselines/reference/declarationEmit_nameConflicts2.types b/tests/baselines/reference/declarationEmit_nameConflicts2.types
index d0ab642c670..258ea9596e8 100644
--- a/tests/baselines/reference/declarationEmit_nameConflicts2.types
+++ b/tests/baselines/reference/declarationEmit_nameConflicts2.types
@@ -1,8 +1,8 @@
 === tests/cases/compiler/declarationEmit_nameConflicts2.ts ===
 module X.Y.base {
->X : X
->Y : Y
->base : base
+>X : typeof X
+>Y : typeof Y
+>base : typeof base
 
     export function f() { }
 >f : typeof f
@@ -11,7 +11,7 @@ module X.Y.base {
 >C : C
 
     export module M {
->M : M
+>M : typeof M
 
         export var v;
 >v : any
@@ -21,10 +21,10 @@ module X.Y.base {
 }
 
 module X.Y.base.Z {
->X : X
->Y : Y
->base : base
->Z : Z
+>X : typeof X
+>Y : typeof Y
+>base : typeof base
+>Z : typeof Z
 
     export var f = X.Y.base.f; // Should be base.f
 >f : typeof base.f
diff --git a/tests/baselines/reference/declarationEmit_nameConflicts3.types b/tests/baselines/reference/declarationEmit_nameConflicts3.types
index b225f826755..d4b4934b2d1 100644
--- a/tests/baselines/reference/declarationEmit_nameConflicts3.types
+++ b/tests/baselines/reference/declarationEmit_nameConflicts3.types
@@ -1,24 +1,24 @@
 === tests/cases/compiler/declarationEmit_nameConflicts3.ts ===
 module M {
->M : M
+>M : typeof M
 
     export interface D { }
 >D : D
 
     export module D {
->D : D
+>D : typeof D
 
         export function f() { }
 >f : typeof f
     }
     export module C {
->C : C
+>C : typeof C
 
         export function f() { }
 >f : typeof f
     }
     export module E {
->E : E
+>E : typeof E
 
         export function f() { }
 >f : typeof f
@@ -26,8 +26,8 @@ module M {
 }
 
 module M.P {
->M : M
->P : P
+>M : typeof M
+>P : typeof P
 
     export class C {
 >C : C
@@ -47,7 +47,7 @@ module M.P {
     }
     export var v: M.D; // ok
 >v : M.D
->M : M
+>M : unknown
 >D : M.D
 
     export var w = M.D.f; // error, should be typeof M.D.f
diff --git a/tests/baselines/reference/declarationEmit_nameConflictsWithAlias.types b/tests/baselines/reference/declarationEmit_nameConflictsWithAlias.types
index 7075f04bdc5..50c45a44a19 100644
--- a/tests/baselines/reference/declarationEmit_nameConflictsWithAlias.types
+++ b/tests/baselines/reference/declarationEmit_nameConflictsWithAlias.types
@@ -1,21 +1,21 @@
 === tests/cases/compiler/declarationEmit_nameConflictsWithAlias.ts ===
 export module C { export interface I { } }
->C : C
+>C : unknown
 >I : I
 
 export import v = C;
->v : v
->C : C
+>v : unknown
+>C : unknown
 
 export module M {
->M : M
+>M : typeof M
 
     export module C { export interface I { } }
->C : C
+>C : unknown
 >I : I
 
     export var w: v.I; // Gets emitted as C.I, which is the wrong interface
 >w : v.I
->v : v
+>v : unknown
 >I : v.I
 }
diff --git a/tests/baselines/reference/declareDottedExtend.types b/tests/baselines/reference/declareDottedExtend.types
index 82fbabe9666..5efcea51b26 100644
--- a/tests/baselines/reference/declareDottedExtend.types
+++ b/tests/baselines/reference/declareDottedExtend.types
@@ -1,25 +1,25 @@
 === tests/cases/compiler/declareDottedExtend.ts ===
 declare module A.B
->A : A
->B : B
+>A : typeof A
+>B : typeof B
 {
     export class C{ }
 >C : C
 }
 
 import ab = A.B;
->ab : ab
+>ab : typeof ab
 >A : typeof A
 >B : typeof ab
 
 class D extends ab.C{ }
 >D : D
->ab : ab
+>ab : unknown
 >C : ab.C
 
 class E extends A.B.C{ }
 >E : E
->A : A
->B : ab
+>A : unknown
+>B : unknown
 >C : ab.C
 
diff --git a/tests/baselines/reference/declareDottedModuleName.types b/tests/baselines/reference/declareDottedModuleName.types
index 2a579cfb1f8..8ccd2298847 100644
--- a/tests/baselines/reference/declareDottedModuleName.types
+++ b/tests/baselines/reference/declareDottedModuleName.types
@@ -1,21 +1,21 @@
 === tests/cases/compiler/declareDottedModuleName.ts ===
 module M {
->M : M
+>M : unknown
 
     module P.Q { } // This shouldnt be emitted
->P : P
->Q : Q
+>P : unknown
+>Q : unknown
 }
 
 module M {
->M : M
+>M : unknown
 
     export module R.S { }  //This should be emitted
->R : R
->S : S
+>R : unknown
+>S : unknown
 }
 
 module T.U { // This needs to be emitted
->T : T
->U : U
+>T : unknown
+>U : unknown
 }
diff --git a/tests/baselines/reference/declareExternalModuleWithExportAssignedFundule.types b/tests/baselines/reference/declareExternalModuleWithExportAssignedFundule.types
index ea37ecb77b7..70718471d50 100644
--- a/tests/baselines/reference/declareExternalModuleWithExportAssignedFundule.types
+++ b/tests/baselines/reference/declareExternalModuleWithExportAssignedFundule.types
@@ -6,11 +6,11 @@ declare module "express" {
 
     function express(): express.ExpressServer;
 >express : typeof express
->express : express
+>express : unknown
 >ExpressServer : express.ExpressServer
 
     module express {
->express : express
+>express : typeof express
 
         export interface ExpressServer {
 >ExpressServer : ExpressServer
diff --git a/tests/baselines/reference/declareFileExportAssignment.types b/tests/baselines/reference/declareFileExportAssignment.types
index d7c43d04b1a..f30586b07e3 100644
--- a/tests/baselines/reference/declareFileExportAssignment.types
+++ b/tests/baselines/reference/declareFileExportAssignment.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/declareFileExportAssignment.ts ===
 module m2 {
->m2 : m2
+>m2 : { (): connectExport; test1: connectModule; test2(): connectModule; }
 
     export interface connectModule {
 >connectModule : connectModule
@@ -30,17 +30,17 @@ var m2: {
 >m2 : { (): m2.connectExport; test1: m2.connectModule; test2(): m2.connectModule; }
 
     (): m2.connectExport;
->m2 : m2
+>m2 : unknown
 >connectExport : m2.connectExport
 
     test1: m2.connectModule;
 >test1 : m2.connectModule
->m2 : m2
+>m2 : unknown
 >connectModule : m2.connectModule
 
     test2(): m2.connectModule;
 >test2 : () => m2.connectModule
->m2 : m2
+>m2 : unknown
 >connectModule : m2.connectModule
 
 };
diff --git a/tests/baselines/reference/declareFileExportAssignmentWithVarFromVariableStatement.types b/tests/baselines/reference/declareFileExportAssignmentWithVarFromVariableStatement.types
index c9ae9f6dfbf..675dc38c869 100644
--- a/tests/baselines/reference/declareFileExportAssignmentWithVarFromVariableStatement.types
+++ b/tests/baselines/reference/declareFileExportAssignmentWithVarFromVariableStatement.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/declareFileExportAssignmentWithVarFromVariableStatement.ts ===
 module m2 {
->m2 : m2
+>m2 : { (): connectExport; test1: connectModule; test2(): connectModule; }
 
     export interface connectModule {
 >connectModule : connectModule
@@ -31,17 +31,17 @@ var x = 10, m2: {
 >m2 : { (): m2.connectExport; test1: m2.connectModule; test2(): m2.connectModule; }
 
     (): m2.connectExport;
->m2 : m2
+>m2 : unknown
 >connectExport : m2.connectExport
 
     test1: m2.connectModule;
 >test1 : m2.connectModule
->m2 : m2
+>m2 : unknown
 >connectModule : m2.connectModule
 
     test2(): m2.connectModule;
 >test2 : () => m2.connectModule
->m2 : m2
+>m2 : unknown
 >connectModule : m2.connectModule
 
 };
diff --git a/tests/baselines/reference/decrementOperatorWithAnyOtherType.types b/tests/baselines/reference/decrementOperatorWithAnyOtherType.types
index 3661081addc..1a4aea0d507 100644
--- a/tests/baselines/reference/decrementOperatorWithAnyOtherType.types
+++ b/tests/baselines/reference/decrementOperatorWithAnyOtherType.types
@@ -24,7 +24,7 @@ class A {
 >a : any
 }
 module M {
->M : M
+>M : typeof M
 
     export var n: any;
 >n : any
diff --git a/tests/baselines/reference/decrementOperatorWithNumberType.types b/tests/baselines/reference/decrementOperatorWithNumberType.types
index 6b4c1a7353a..d619db84e46 100644
--- a/tests/baselines/reference/decrementOperatorWithNumberType.types
+++ b/tests/baselines/reference/decrementOperatorWithNumberType.types
@@ -14,7 +14,7 @@ class A {
 >a : number
 }
 module M {
->M : M
+>M : typeof M
 
     export var n: number;
 >n : number
diff --git a/tests/baselines/reference/deleteOperatorWithBooleanType.types b/tests/baselines/reference/deleteOperatorWithBooleanType.types
index 0dae2b5fe03..93cc9971d11 100644
--- a/tests/baselines/reference/deleteOperatorWithBooleanType.types
+++ b/tests/baselines/reference/deleteOperatorWithBooleanType.types
@@ -16,7 +16,7 @@ class A {
 >foo : () => boolean
 }
 module M {
->M : M
+>M : typeof M
 
     export var n: boolean;
 >n : boolean
diff --git a/tests/baselines/reference/deleteOperatorWithNumberType.types b/tests/baselines/reference/deleteOperatorWithNumberType.types
index afcf35fa6cf..f2301e698e0 100644
--- a/tests/baselines/reference/deleteOperatorWithNumberType.types
+++ b/tests/baselines/reference/deleteOperatorWithNumberType.types
@@ -20,7 +20,7 @@ class A {
 >foo : () => number
 }
 module M {
->M : M
+>M : typeof M
 
     export var n: number;
 >n : number
diff --git a/tests/baselines/reference/deleteOperatorWithStringType.types b/tests/baselines/reference/deleteOperatorWithStringType.types
index e66ca51a063..869d5b24be5 100644
--- a/tests/baselines/reference/deleteOperatorWithStringType.types
+++ b/tests/baselines/reference/deleteOperatorWithStringType.types
@@ -20,7 +20,7 @@ class A {
 >foo : () => string
 }
 module M {
->M : M
+>M : typeof M
 
     export var n: string;
 >n : string
diff --git a/tests/baselines/reference/dependencyViaImportAlias.types b/tests/baselines/reference/dependencyViaImportAlias.types
index fee925cf66f..aa4655e44f0 100644
--- a/tests/baselines/reference/dependencyViaImportAlias.types
+++ b/tests/baselines/reference/dependencyViaImportAlias.types
@@ -1,9 +1,9 @@
 === tests/cases/compiler/B.ts ===
 import a = require('A');
->a : a
+>a : typeof a
 
 import A = a.A;
->A : A
+>A : typeof a.A
 >a : typeof a
 >A : a.A
 
diff --git a/tests/baselines/reference/dottedModuleName2.types b/tests/baselines/reference/dottedModuleName2.types
index db0b7fd0143..e5a9806dd11 100644
--- a/tests/baselines/reference/dottedModuleName2.types
+++ b/tests/baselines/reference/dottedModuleName2.types
@@ -1,7 +1,7 @@
 === tests/cases/compiler/dottedModuleName2.ts ===
 module A.B {
->A : A
->B : B
+>A : typeof A
+>B : typeof B
  
   export var x = 1;
 >x : number
@@ -11,8 +11,8 @@ module A.B {
  
  
 module AA { export module B {
->AA : AA
->B : B
+>AA : typeof AA
+>B : typeof B
  
   export var x = 1;
 >x : number
@@ -39,9 +39,9 @@ var tmpError = A.B.x;
 
 
 module A.B.C
->A : A
->B : B
->C : C
+>A : typeof A
+>B : typeof B
+>C : typeof C
  
 {
  
@@ -53,21 +53,21 @@ module A.B.C
  
  
 module M
->M : M
+>M : unknown
  
 {
  
     import X1 = A;
->X1 : X1
+>X1 : typeof X1
 >A : typeof X1
  
     import X2 = A.B;
->X2 : X2
+>X2 : typeof X1.B
 >A : typeof X1
 >B : typeof X1.B
  
     import X3 = A.B.C;
->X3 : X3
+>X3 : typeof X2.C
 >A : typeof X1
 >B : typeof X1.B
 >C : typeof X2.C
diff --git a/tests/baselines/reference/duplicateAnonymousInners1.types b/tests/baselines/reference/duplicateAnonymousInners1.types
index f175c1ea3f8..7c63fb4163b 100644
--- a/tests/baselines/reference/duplicateAnonymousInners1.types
+++ b/tests/baselines/reference/duplicateAnonymousInners1.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/duplicateAnonymousInners1.ts ===
 module Foo {
->Foo : Foo
+>Foo : typeof Foo
 
     class Helper {
 >Helper : Helper
@@ -18,7 +18,7 @@ module Foo {
 
 
 module Foo {
->Foo : Foo
+>Foo : typeof Foo
     
     // Should not be an error
     class Helper {
diff --git a/tests/baselines/reference/duplicateAnonymousModuleClasses.types b/tests/baselines/reference/duplicateAnonymousModuleClasses.types
index 1c3e886dd82..eebe5f721d9 100644
--- a/tests/baselines/reference/duplicateAnonymousModuleClasses.types
+++ b/tests/baselines/reference/duplicateAnonymousModuleClasses.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/duplicateAnonymousModuleClasses.ts ===
 module F {
->F : F
+>F : typeof F
 
     class Helper {
 >Helper : Helper
@@ -11,7 +11,7 @@ module F {
 
 
 module F {
->F : F
+>F : typeof F
     
     // Should not be an error
     class Helper {
@@ -22,7 +22,7 @@ module F {
 }
 
 module Foo {
->Foo : Foo
+>Foo : typeof Foo
 
     class Helper {
 >Helper : Helper
@@ -33,7 +33,7 @@ module Foo {
 
 
 module Foo {
->Foo : Foo
+>Foo : typeof Foo
     
     // Should not be an error
     class Helper {
@@ -44,10 +44,10 @@ module Foo {
 }
 
 module Gar {
->Gar : Gar
+>Gar : typeof Gar
 
     module Foo {
->Foo : Foo
+>Foo : typeof Foo
 
         class Helper {
 >Helper : Helper
@@ -58,7 +58,7 @@ module Gar {
 
 
     module Foo {
->Foo : Foo
+>Foo : typeof Foo
     
         // Should not be an error
         class Helper {
diff --git a/tests/baselines/reference/duplicateVarAndImport.types b/tests/baselines/reference/duplicateVarAndImport.types
index 92e3917e56f..10db2738dde 100644
--- a/tests/baselines/reference/duplicateVarAndImport.types
+++ b/tests/baselines/reference/duplicateVarAndImport.types
@@ -5,9 +5,9 @@ var a;
 >a : any
 
 module M { }
->M : M
+>M : unknown
 
 import a = M;
->a : a
->M : M
+>a : any
+>M : unknown
 
diff --git a/tests/baselines/reference/duplicateVariablesByScope.types b/tests/baselines/reference/duplicateVariablesByScope.types
index fe48dfc114d..add12599a83 100644
--- a/tests/baselines/reference/duplicateVariablesByScope.types
+++ b/tests/baselines/reference/duplicateVariablesByScope.types
@@ -2,7 +2,7 @@
 // duplicate local variables are only reported at global scope
 
 module M {
->M : M
+>M : typeof M
 
     for (var j = 0; j < 10; j++) {
 >j : number
diff --git a/tests/baselines/reference/emitMemberAccessExpression.types b/tests/baselines/reference/emitMemberAccessExpression.types
index 7a24930fddb..9f7c98332e9 100644
--- a/tests/baselines/reference/emitMemberAccessExpression.types
+++ b/tests/baselines/reference/emitMemberAccessExpression.types
@@ -5,9 +5,9 @@ declare var OData: any;
 >OData : any
 
 module Microsoft.PeopleAtWork.Model {
->Microsoft : Microsoft
->PeopleAtWork : PeopleAtWork
->Model : Model
+>Microsoft : typeof Microsoft
+>PeopleAtWork : typeof PeopleAtWork
+>Model : typeof Model
 
     export class KnockoutExtentions {
 >KnockoutExtentions : KnockoutExtentions
@@ -21,9 +21,9 @@ No type information for this code.=== tests/cases/compiler/emitMemberAccessExpre
 /// <reference path="emitMemberAccessExpression_file3.ts" />
 "use strict";
 module Microsoft.PeopleAtWork.Model {
->Microsoft : Microsoft
->PeopleAtWork : PeopleAtWork
->Model : Model
+>Microsoft : typeof Microsoft
+>PeopleAtWork : typeof PeopleAtWork
+>Model : typeof Model
 
     export class _Person {
 >_Person : _Person
diff --git a/tests/baselines/reference/enumDecl1.types b/tests/baselines/reference/enumDecl1.types
index ef291a89321..22d2b6b4d69 100644
--- a/tests/baselines/reference/enumDecl1.types
+++ b/tests/baselines/reference/enumDecl1.types
@@ -1,7 +1,7 @@
 === tests/cases/compiler/enumDecl1.ts ===
 
 declare module mAmbient {
->mAmbient : mAmbient
+>mAmbient : typeof mAmbient
 
     enum e {
 >e : e
diff --git a/tests/baselines/reference/enumFromExternalModule.types b/tests/baselines/reference/enumFromExternalModule.types
index ec9d3c23d64..554ac17ec67 100644
--- a/tests/baselines/reference/enumFromExternalModule.types
+++ b/tests/baselines/reference/enumFromExternalModule.types
@@ -1,7 +1,7 @@
 === tests/cases/compiler/enumFromExternalModule_1.ts ===
 ///<reference path='enumFromExternalModule_0.ts'/>
 import f = require('enumFromExternalModule_0');
->f : f
+>f : typeof f
 
 var x = f.Mode.Open;
 >x : f.Mode
diff --git a/tests/baselines/reference/enumMerging.types b/tests/baselines/reference/enumMerging.types
index 8018a3fbbd8..c61f9e17739 100644
--- a/tests/baselines/reference/enumMerging.types
+++ b/tests/baselines/reference/enumMerging.types
@@ -2,7 +2,7 @@
 // Enum with only constant members across 2 declarations with the same root module
 // Enum with initializer in all declarations with constant members with the same root module
 module M1 {
->M1 : M1
+>M1 : typeof M1
 
     enum EImpl1 {
 >EImpl1 : EImpl1
@@ -65,7 +65,7 @@ module M1 {
 
 // Enum with only computed members across 2 declarations with the same root module 
 module M2 {
->M2 : M2
+>M2 : typeof M2
 
     export enum EComp2 {
 >EComp2 : EComp2
@@ -122,7 +122,7 @@ module M2 {
 
 // Enum with initializer in only one of two declarations with constant members with the same root module
 module M3 {
->M3 : M3
+>M3 : typeof M3
 
     enum EInit {
 >EInit : EInit
@@ -146,7 +146,7 @@ module M3 {
 
 // Enums with same name but different root module
 module M4 {
->M4 : M4
+>M4 : typeof M4
 
     export enum Color { Red, Green, Blue }
 >Color : Color
@@ -155,7 +155,7 @@ module M4 {
 >Blue : Color
 }
 module M5 {
->M5 : M5
+>M5 : typeof M5
 
     export enum Color { Red, Green, Blue }
 >Color : Color
@@ -165,8 +165,8 @@ module M5 {
 }
 
 module M6.A {
->M6 : M6
->A : A
+>M6 : typeof M6
+>A : typeof A
 
     export enum Color { Red, Green, Blue }
 >Color : Color
@@ -175,10 +175,10 @@ module M6.A {
 >Blue : Color
 }
 module M6 {
->M6 : M6
+>M6 : typeof M6
 
     export module A {
->A : A
+>A : typeof A
 
         export enum Color { Yellow = 1 }
 >Color : Color
diff --git a/tests/baselines/reference/enumsWithMultipleDeclarations3.types b/tests/baselines/reference/enumsWithMultipleDeclarations3.types
index a86bd5e481c..2b761c780e9 100644
--- a/tests/baselines/reference/enumsWithMultipleDeclarations3.types
+++ b/tests/baselines/reference/enumsWithMultipleDeclarations3.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/enumsWithMultipleDeclarations3.ts ===
 module E {
->E : E
+>E : typeof E
 }
 
 enum E {
diff --git a/tests/baselines/reference/es6ClassTest5.types b/tests/baselines/reference/es6ClassTest5.types
index 887e103c0f4..e04be3e8c43 100644
--- a/tests/baselines/reference/es6ClassTest5.types
+++ b/tests/baselines/reference/es6ClassTest5.types
@@ -16,7 +16,7 @@ class C1T5 {
 	    }
 }
 module C2T5 {}
->C2T5 : C2T5
+>C2T5 : unknown
 
 class  bigClass {
 >bigClass : bigClass
diff --git a/tests/baselines/reference/es6ClassTest7.types b/tests/baselines/reference/es6ClassTest7.types
index a36245966e6..9ac4a65b305 100644
--- a/tests/baselines/reference/es6ClassTest7.types
+++ b/tests/baselines/reference/es6ClassTest7.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/es6ClassTest7.ts ===
 declare module M {
->M : M
+>M : typeof M
 
     export class Foo {
 >Foo : Foo
@@ -9,7 +9,7 @@ declare module M {
 
 class Bar extends M.Foo {
 >Bar : Bar
->M : M
+>M : unknown
 >Foo : M.Foo
 }
 
diff --git a/tests/baselines/reference/escapedIdentifiers.types b/tests/baselines/reference/escapedIdentifiers.types
index ce5d259dbc0..d0b6b1f5c42 100644
--- a/tests/baselines/reference/escapedIdentifiers.types
+++ b/tests/baselines/reference/escapedIdentifiers.types
@@ -35,13 +35,13 @@ b ++;
 
 // modules
 module moduleType1 { 
->moduleType1 : moduleType1
+>moduleType1 : typeof moduleType1
 
     export var baz1: number;
 >baz1 : number
 }
 module moduleType\u0032 { 
->moduleType\u0032 : moduleType\u0032
+>moduleType\u0032 : typeof moduleType\u0032
 
     export var baz2: number;
 >baz2 : number
diff --git a/tests/baselines/reference/everyTypeWithAnnotationAndInitializer.types b/tests/baselines/reference/everyTypeWithAnnotationAndInitializer.types
index 53341d35bd8..7cca0148fce 100644
--- a/tests/baselines/reference/everyTypeWithAnnotationAndInitializer.types
+++ b/tests/baselines/reference/everyTypeWithAnnotationAndInitializer.types
@@ -39,7 +39,7 @@ function F(x: string): number { return 42; }
 >x : string
 
 module M {
->M : M
+>M : typeof M
 
     export class A {
 >A : A
@@ -139,7 +139,7 @@ var aModule: typeof M = M;
 
 var aClassInModule: M.A = new M.A();
 >aClassInModule : M.A
->M : M
+>M : unknown
 >A : M.A
 >new M.A() : M.A
 >M.A : typeof M.A
diff --git a/tests/baselines/reference/everyTypeWithInitializer.types b/tests/baselines/reference/everyTypeWithInitializer.types
index a8aa4eacc3e..825656fbfea 100644
--- a/tests/baselines/reference/everyTypeWithInitializer.types
+++ b/tests/baselines/reference/everyTypeWithInitializer.types
@@ -39,7 +39,7 @@ function F(x: string): number { return 42; }
 >x : string
 
 module M {
->M : M
+>M : typeof M
 
     export class A {
 >A : A
diff --git a/tests/baselines/reference/exportAssignClassAndModule.types b/tests/baselines/reference/exportAssignClassAndModule.types
index 434c20c7c3d..0118e6fa812 100644
--- a/tests/baselines/reference/exportAssignClassAndModule.types
+++ b/tests/baselines/reference/exportAssignClassAndModule.types
@@ -1,7 +1,7 @@
 === tests/cases/compiler/exportAssignClassAndModule_1.ts ===
 ///<reference path='exportAssignClassAndModule_0.ts'/>
 import Foo = require('exportAssignClassAndModule_0');
->Foo : Foo
+>Foo : typeof Foo
 
 var z: Foo.Bar;
 >z : Foo.Bar
@@ -27,7 +27,7 @@ class Foo {
 >Bar : Foo.Bar
 }
 module Foo {
->Foo : Foo
+>Foo : typeof Foo
 
     export interface Bar {
 >Bar : Bar
diff --git a/tests/baselines/reference/exportAssignValueAndType.types b/tests/baselines/reference/exportAssignValueAndType.types
index 14545a4da0b..7d18e3c1655 100644
--- a/tests/baselines/reference/exportAssignValueAndType.types
+++ b/tests/baselines/reference/exportAssignValueAndType.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/exportAssignValueAndType.ts ===
 declare module http {
->http : http
+>http : unknown
 
 	export interface Server { openPort: number; }
 >Server : Server
@@ -11,7 +11,7 @@ interface server {
 >server : server
 
     (): http.Server;
->http : http
+>http : unknown
 >Server : http.Server
 
     startTime: Date;
diff --git a/tests/baselines/reference/exportAssignedTypeAsTypeAnnotation.types b/tests/baselines/reference/exportAssignedTypeAsTypeAnnotation.types
index 7a70b10db94..8ac473f970a 100644
--- a/tests/baselines/reference/exportAssignedTypeAsTypeAnnotation.types
+++ b/tests/baselines/reference/exportAssignedTypeAsTypeAnnotation.types
@@ -1,7 +1,7 @@
 === tests/cases/compiler/exportAssignedTypeAsTypeAnnotation_1.ts ===
 ///<reference path='exportAssignedTypeAsTypeAnnotation_0.ts'/>
 import test = require('exportAssignedTypeAsTypeAnnotation_0');
->test : test
+>test : unknown
 
 var t2: test; // should not raise a 'container type' error
 >t2 : test
diff --git a/tests/baselines/reference/exportAssignmentCircularModules.types b/tests/baselines/reference/exportAssignmentCircularModules.types
index 2a060f72ce1..57d5a8cccce 100644
--- a/tests/baselines/reference/exportAssignmentCircularModules.types
+++ b/tests/baselines/reference/exportAssignmentCircularModules.types
@@ -1,9 +1,9 @@
 === tests/cases/conformance/externalModules/foo_2.ts ===
 import foo0 = require("./foo_0");
->foo0 : foo0
+>foo0 : typeof foo0
 
 module Foo {
->Foo : Foo
+>Foo : typeof Foo
 
 	export var x = foo0.x;
 >x : any
@@ -16,10 +16,10 @@ export = Foo;
 
 === tests/cases/conformance/externalModules/foo_0.ts ===
 import foo1 = require('./foo_1');
->foo1 : foo1
+>foo1 : typeof foo1
 
 module Foo {
->Foo : Foo
+>Foo : typeof Foo
 
 	export var x = foo1.x;
 >x : any
@@ -32,10 +32,10 @@ export = Foo;
 
 === tests/cases/conformance/externalModules/foo_1.ts ===
 import foo2 = require("./foo_2");
->foo2 : foo2
+>foo2 : typeof foo2
 
 module Foo {
->Foo : Foo
+>Foo : typeof Foo
 
 	export var x = foo2.x;
 >x : any
diff --git a/tests/baselines/reference/exportAssignmentClass.types b/tests/baselines/reference/exportAssignmentClass.types
index bf439af7744..c7c3f38d7ea 100644
--- a/tests/baselines/reference/exportAssignmentClass.types
+++ b/tests/baselines/reference/exportAssignmentClass.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/exportAssignmentClass_B.ts ===
 import D = require("exportAssignmentClass_A");
->D : D
+>D : typeof D
 
 var d = new D();
 >d : D
diff --git a/tests/baselines/reference/exportAssignmentEnum.types b/tests/baselines/reference/exportAssignmentEnum.types
index 6a501216099..9dfa34d3777 100644
--- a/tests/baselines/reference/exportAssignmentEnum.types
+++ b/tests/baselines/reference/exportAssignmentEnum.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/exportAssignmentEnum_B.ts ===
 import EnumE = require("exportAssignmentEnum_A");
->EnumE : EnumE
+>EnumE : typeof EnumE
 
 var a = EnumE.A;
 >a : EnumE
diff --git a/tests/baselines/reference/exportAssignmentError.types b/tests/baselines/reference/exportAssignmentError.types
index 22367298a7b..89e7d461fb2 100644
--- a/tests/baselines/reference/exportAssignmentError.types
+++ b/tests/baselines/reference/exportAssignmentError.types
@@ -1,13 +1,13 @@
 === tests/cases/compiler/exportAssignmentError.ts ===
 module M {
->M : M
+>M : typeof M
 
 	export var x;
 >x : any
 }
 
 import M2 = M;
->M2 : M2
+>M2 : typeof M
 >M : typeof M
 
 export = M2; // should not error
diff --git a/tests/baselines/reference/exportAssignmentFunction.types b/tests/baselines/reference/exportAssignmentFunction.types
index fad00bf7df7..e1748f8b891 100644
--- a/tests/baselines/reference/exportAssignmentFunction.types
+++ b/tests/baselines/reference/exportAssignmentFunction.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/exportAssignmentFunction_B.ts ===
 import fooFunc = require("exportAssignmentFunction_A");
->fooFunc : fooFunc
+>fooFunc : typeof fooFunc
 
 var n: number = fooFunc();
 >n : number
diff --git a/tests/baselines/reference/exportAssignmentGenericType.types b/tests/baselines/reference/exportAssignmentGenericType.types
index 4208f11a84a..241a8dac954 100644
--- a/tests/baselines/reference/exportAssignmentGenericType.types
+++ b/tests/baselines/reference/exportAssignmentGenericType.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/externalModules/foo_1.ts ===
 import foo = require("./foo_0");
->foo : foo
+>foo : typeof foo
 
 var x = new foo<number>();
 >x : foo<number>
diff --git a/tests/baselines/reference/exportAssignmentInterface.types b/tests/baselines/reference/exportAssignmentInterface.types
index 759aa639661..f4ed92d9471 100644
--- a/tests/baselines/reference/exportAssignmentInterface.types
+++ b/tests/baselines/reference/exportAssignmentInterface.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/exportAssignmentInterface_B.ts ===
 import I1 = require("exportAssignmentInterface_A");
->I1 : I1
+>I1 : unknown
 
 var i: I1;
 >i : I1
diff --git a/tests/baselines/reference/exportAssignmentInternalModule.types b/tests/baselines/reference/exportAssignmentInternalModule.types
index edf247b8976..028507b7a04 100644
--- a/tests/baselines/reference/exportAssignmentInternalModule.types
+++ b/tests/baselines/reference/exportAssignmentInternalModule.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/exportAssignmentInternalModule_B.ts ===
 import modM = require("exportAssignmentInternalModule_A");
->modM : modM
+>modM : typeof modM
 
 var n: number = modM.x;
 >n : number
@@ -10,7 +10,7 @@ var n: number = modM.x;
 
 === tests/cases/compiler/exportAssignmentInternalModule_A.ts ===
 module M {
->M : M
+>M : typeof M
 
 	export var x;
 >x : any
diff --git a/tests/baselines/reference/exportAssignmentMergedInterface.types b/tests/baselines/reference/exportAssignmentMergedInterface.types
index 4d6ddf58c13..d0fb5383b29 100644
--- a/tests/baselines/reference/exportAssignmentMergedInterface.types
+++ b/tests/baselines/reference/exportAssignmentMergedInterface.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/externalModules/foo_1.ts ===
 import foo = require("./foo_0");
->foo : foo
+>foo : unknown
 
 var x: foo;
 >x : foo
diff --git a/tests/baselines/reference/exportAssignmentMergedModule.types b/tests/baselines/reference/exportAssignmentMergedModule.types
index aff6f50877e..333cfdd9a93 100644
--- a/tests/baselines/reference/exportAssignmentMergedModule.types
+++ b/tests/baselines/reference/exportAssignmentMergedModule.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/externalModules/foo_1.ts ===
 import foo = require("./foo_0");
->foo : foo
+>foo : typeof foo
 
 var a: number = foo.a();
 >a : number
@@ -30,7 +30,7 @@ if(!!foo.b){
 }
 === tests/cases/conformance/externalModules/foo_0.ts ===
 module Foo {
->Foo : Foo
+>Foo : typeof Foo
 
 	export function a(){
 >a : typeof a
@@ -41,7 +41,7 @@ module Foo {
 >b : boolean
 }
 module Foo {
->Foo : Foo
+>Foo : typeof Foo
 
 	export function c(a: number){
 >c : typeof c
@@ -51,7 +51,7 @@ module Foo {
 >a : number
 	}
 	export module Test {
->Test : Test
+>Test : typeof Test
 
 		export var answer = 42;
 >answer : number
diff --git a/tests/baselines/reference/exportAssignmentOfGenericType1.types b/tests/baselines/reference/exportAssignmentOfGenericType1.types
index 652ab7baf0a..1bf3e7454a7 100644
--- a/tests/baselines/reference/exportAssignmentOfGenericType1.types
+++ b/tests/baselines/reference/exportAssignmentOfGenericType1.types
@@ -1,7 +1,7 @@
 === tests/cases/compiler/exportAssignmentOfGenericType1_1.ts ===
 ///<reference path='exportAssignmentOfGenericType1_0.ts'/>
 import q = require("exportAssignmentOfGenericType1_0");
->q : q
+>q : typeof q
 
 class M extends q<string> { }
 >M : M
diff --git a/tests/baselines/reference/exportAssignmentTopLevelClodule.types b/tests/baselines/reference/exportAssignmentTopLevelClodule.types
index 4a7be40bd31..80a56cd7b5f 100644
--- a/tests/baselines/reference/exportAssignmentTopLevelClodule.types
+++ b/tests/baselines/reference/exportAssignmentTopLevelClodule.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/externalModules/foo_1.ts ===
 import foo = require("./foo_0");
->foo : foo
+>foo : typeof foo
 
 if(foo.answer === 42){
 >foo.answer === 42 : boolean
@@ -22,7 +22,7 @@ class Foo {
 >test : string
 }
 module Foo {
->Foo : Foo
+>Foo : typeof Foo
 
 	export var answer = 42;
 >answer : number
diff --git a/tests/baselines/reference/exportAssignmentTopLevelEnumdule.types b/tests/baselines/reference/exportAssignmentTopLevelEnumdule.types
index 84f2c634b88..4ee49f6d20f 100644
--- a/tests/baselines/reference/exportAssignmentTopLevelEnumdule.types
+++ b/tests/baselines/reference/exportAssignmentTopLevelEnumdule.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/externalModules/foo_1.ts ===
 import foo = require("./foo_0");
->foo : foo
+>foo : typeof foo
 
 var color: foo;
 >color : foo
@@ -31,7 +31,7 @@ enum foo {
 >blue : foo
 }
 module foo {
->foo : foo
+>foo : typeof foo
 
 	export var answer = 42;
 >answer : number
diff --git a/tests/baselines/reference/exportAssignmentTopLevelFundule.types b/tests/baselines/reference/exportAssignmentTopLevelFundule.types
index 013ef72db3f..982e87e59f3 100644
--- a/tests/baselines/reference/exportAssignmentTopLevelFundule.types
+++ b/tests/baselines/reference/exportAssignmentTopLevelFundule.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/externalModules/foo_1.ts ===
 import foo = require("./foo_0");
->foo : foo
+>foo : typeof foo
 
 if(foo.answer === 42){
 >foo.answer === 42 : boolean
@@ -21,7 +21,7 @@ function foo() {
 	return "test";
 }
 module foo {
->foo : foo
+>foo : typeof foo
 
 	export var answer = 42;
 >answer : number
diff --git a/tests/baselines/reference/exportAssignmentTopLevelIdentifier.types b/tests/baselines/reference/exportAssignmentTopLevelIdentifier.types
index 2f5b4ca8b0e..09d881715dd 100644
--- a/tests/baselines/reference/exportAssignmentTopLevelIdentifier.types
+++ b/tests/baselines/reference/exportAssignmentTopLevelIdentifier.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/externalModules/foo_1.ts ===
 import foo = require("./foo_0");
->foo : foo
+>foo : typeof foo
 
 if(foo.answer === 42){
 >foo.answer === 42 : boolean
@@ -12,7 +12,7 @@ if(foo.answer === 42){
 
 === tests/cases/conformance/externalModules/foo_0.ts ===
 module Foo {
->Foo : Foo
+>Foo : typeof Foo
 
 	export var answer = 42;
 >answer : number
diff --git a/tests/baselines/reference/exportAssignmentVariable.types b/tests/baselines/reference/exportAssignmentVariable.types
index 6f21daeb9a7..36f02f60a95 100644
--- a/tests/baselines/reference/exportAssignmentVariable.types
+++ b/tests/baselines/reference/exportAssignmentVariable.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/exportAssignmentVariable_B.ts ===
 import y = require("exportAssignmentVariable_A");
->y : y
+>y : number
 
 var n: number = y;
 >n : number
diff --git a/tests/baselines/reference/exportAssignmentWithImportStatementPrivacyError.types b/tests/baselines/reference/exportAssignmentWithImportStatementPrivacyError.types
index 2da8389dcba..7d6c7166655 100644
--- a/tests/baselines/reference/exportAssignmentWithImportStatementPrivacyError.types
+++ b/tests/baselines/reference/exportAssignmentWithImportStatementPrivacyError.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/exportAssignmentWithImportStatementPrivacyError.ts ===
 module m2 {
->m2 : m2
+>m2 : unknown
 
     export interface connectModule {
 >connectModule : connectModule
@@ -27,29 +27,29 @@ module m2 {
 }
 
 module M {
->M : M
+>M : typeof M
 
     export var server: {
 >server : { (): m2.connectExport; test1: m2.connectModule; test2(): m2.connectModule; }
 
         (): m2.connectExport;
->m2 : m2
+>m2 : unknown
 >connectExport : m2.connectExport
 
         test1: m2.connectModule;
 >test1 : m2.connectModule
->m2 : m2
+>m2 : unknown
 >connectModule : m2.connectModule
 
         test2(): m2.connectModule;
 >test2 : () => m2.connectModule
->m2 : m2
+>m2 : unknown
 >connectModule : m2.connectModule
 
     };
 }
 import M22 = M;
->M22 : M22
+>M22 : typeof M
 >M : typeof M
 
 export = M;
diff --git a/tests/baselines/reference/exportCodeGen.types b/tests/baselines/reference/exportCodeGen.types
index 61cf48de146..348d8f9c46f 100644
--- a/tests/baselines/reference/exportCodeGen.types
+++ b/tests/baselines/reference/exportCodeGen.types
@@ -3,7 +3,7 @@
 // should replace all refs to 'x' in the body,
 // with fully qualified
 module A {
->A : A
+>A : typeof A
 
     export var x = 12;
 >x : number
@@ -19,7 +19,7 @@ module A {
 
 // should not fully qualify 'x'
 module B {
->B : B
+>B : typeof B
 
     var x = 12;
 >x : number
@@ -35,7 +35,7 @@ module B {
 
 // not copied, since not exported
 module C {
->C : C
+>C : typeof C
 
     function no() {
 >no : typeof no
@@ -46,7 +46,7 @@ module C {
 
 // copies, since exported
 module D {
->D : D
+>D : typeof D
 
     export function yes() {
 >yes : typeof yes
@@ -57,7 +57,7 @@ module D {
 
 // validate all exportable statements
 module E {
->E : E
+>E : typeof E
 
     export enum Color { Red }
 >Color : Color
@@ -75,7 +75,7 @@ module E {
 >name : string
 
     export module M {
->M : M
+>M : typeof M
 
         export var x = 42;
 >x : number
@@ -85,7 +85,7 @@ module E {
 // validate all exportable statements,
 // which are not exported
 module F {
->F : F
+>F : typeof F
 
     enum Color { Red }
 >Color : Color
@@ -103,7 +103,7 @@ module F {
 >name : string
 
     module M {
->M : M
+>M : typeof M
 
         var x = 42;
 >x : number
diff --git a/tests/baselines/reference/exportEqualCallable.types b/tests/baselines/reference/exportEqualCallable.types
index ddfa493e904..0a084523137 100644
--- a/tests/baselines/reference/exportEqualCallable.types
+++ b/tests/baselines/reference/exportEqualCallable.types
@@ -1,7 +1,7 @@
 === tests/cases/compiler/exportEqualCallable_1.ts ===
 ///<reference path='exportEqualCallable_0.ts'/>
 import connect = require('exportEqualCallable_0');
->connect : connect
+>connect : () => any
 
 connect();
 >connect() : any
diff --git a/tests/baselines/reference/exportEqualNamespaces.types b/tests/baselines/reference/exportEqualNamespaces.types
index 58fdf4c25e9..57ed5742b2a 100644
--- a/tests/baselines/reference/exportEqualNamespaces.types
+++ b/tests/baselines/reference/exportEqualNamespaces.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/exportEqualNamespaces.ts ===
 declare module server {
->server : server
+>server : Date
 
     interface Server extends Object { }
 >Server : Server
diff --git a/tests/baselines/reference/exportImport.types b/tests/baselines/reference/exportImport.types
index f312ba1ba05..88a9aded86f 100644
--- a/tests/baselines/reference/exportImport.types
+++ b/tests/baselines/reference/exportImport.types
@@ -1,10 +1,10 @@
 === tests/cases/compiler/consumer.ts ===
 import e = require('./exporter');
->e : e
+>e : typeof e
 
 export function w(): e.w { // Should be OK
 >w : typeof w
->e : e
+>e : unknown
 >w : e.w
 
     return new e.w();
@@ -24,5 +24,5 @@ class Widget1 { name = 'one'; }
 
 === tests/cases/compiler/exporter.ts ===
 export import w = require('./w1');
->w : w
+>w : typeof w
 
diff --git a/tests/baselines/reference/exportImportAlias.types b/tests/baselines/reference/exportImportAlias.types
index e716891352e..0834d664861 100644
--- a/tests/baselines/reference/exportImportAlias.types
+++ b/tests/baselines/reference/exportImportAlias.types
@@ -2,7 +2,7 @@
 // expect no errors here
 
 module A {
->A : A
+>A : typeof A
 
     export var x = 'hello world'
 >x : string
@@ -15,7 +15,7 @@ module A {
 >y : number
     }
     export module B {
->B : B
+>B : unknown
 
         export interface Id {
 >Id : Id
@@ -27,10 +27,10 @@ module A {
 }
 
 module C {
->C : C
+>C : typeof C
 
     export import a = A;
->a : a
+>a : typeof a
 >A : typeof a
 }
 
@@ -59,13 +59,13 @@ var c: { name: string };
 
 var c: C.a.B.Id;
 >c : { name: string; }
->C : C
->a : C.a
->B : A.B
+>C : unknown
+>a : unknown
+>B : unknown
 >Id : A.B.Id
 
 module X {
->X : X
+>X : typeof X
 
     export function Y() {
 >Y : typeof Y
@@ -74,7 +74,7 @@ module X {
     }
 
     export module Y {
->Y : Y
+>Y : typeof Y
 
         export class Point {
 >Point : Point
@@ -87,11 +87,11 @@ module X {
 }
 
 module Z {
->Z : Z
+>Z : typeof Z
 
     // 'y' should be a fundule here
     export import y = X.Y;
->y : y
+>y : typeof y
 >X : typeof X
 >Y : typeof y
 }
@@ -115,7 +115,7 @@ var n: { x: number; y: number; } = new Z.y.Point(0, 0);
 >Point : typeof X.Y.Point
 
 module K {
->K : K
+>K : typeof K
 
     export class L {
 >L : L
@@ -125,7 +125,7 @@ module K {
     }
 
     export module L {
->L : L
+>L : typeof L
 
         export var y = 12;
 >y : number
@@ -143,10 +143,10 @@ module K {
 }
 
 module M {
->M : M
+>M : typeof M
 
     export import D = K.L;
->D : D
+>D : typeof D
 >K : typeof K
 >L : D
 }
@@ -169,7 +169,7 @@ var p: { x: number; y: number; }
 
 var p: M.D.Point;
 >p : { x: number; y: number; }
->M : M
->D : M.D
+>M : unknown
+>D : unknown
 >Point : K.L.Point
 
diff --git a/tests/baselines/reference/exportImportAndClodule.types b/tests/baselines/reference/exportImportAndClodule.types
index 219b2c34d79..7d233e72e77 100644
--- a/tests/baselines/reference/exportImportAndClodule.types
+++ b/tests/baselines/reference/exportImportAndClodule.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/exportImportAndClodule.ts ===
 module K {
->K : K
+>K : typeof K
 
     export class L {
 >L : L
@@ -9,7 +9,7 @@ module K {
 >name : string
     }
     export module L {
->L : L
+>L : typeof L
 
         export var y = 12;
 >y : number
@@ -26,10 +26,10 @@ module K {
     }
 }
 module M {
->M : M
+>M : typeof M
 
     export import D = K.L;
->D : D
+>D : typeof D
 >K : typeof K
 >L : D
 }
@@ -51,7 +51,7 @@ var p: { x: number; y: number; }
 
 var p: M.D.Point;
 >p : { x: number; y: number; }
->M : M
->D : M.D
+>M : unknown
+>D : unknown
 >Point : K.L.Point
 
diff --git a/tests/baselines/reference/exportImportMultipleFiles.types b/tests/baselines/reference/exportImportMultipleFiles.types
index 76b75e63c6c..368f857950b 100644
--- a/tests/baselines/reference/exportImportMultipleFiles.types
+++ b/tests/baselines/reference/exportImportMultipleFiles.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/exportImportMultipleFiles_userCode.ts ===
 import lib = require('./exportImportMultipleFiles_library');
->lib : lib
+>lib : typeof lib
 
 lib.math.add(3, 4); // Shouldnt be error
 >lib.math.add(3, 4) : any
@@ -21,7 +21,7 @@ export function add(a, b) { return a + b; }
 
 === tests/cases/compiler/exportImportMultipleFiles_library.ts ===
 export import math = require("exportImportMultipleFiles_math");
->math : math
+>math : typeof math
 
 math.add(3, 4); // OK
 >math.add(3, 4) : any
diff --git a/tests/baselines/reference/exportImportNonInstantiatedModule.types b/tests/baselines/reference/exportImportNonInstantiatedModule.types
index 8801f344142..d1210cba6fe 100644
--- a/tests/baselines/reference/exportImportNonInstantiatedModule.types
+++ b/tests/baselines/reference/exportImportNonInstantiatedModule.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/exportImportNonInstantiatedModule.ts ===
 module A {
->A : A
+>A : unknown
 
     export interface I { x: number }
 >I : I
@@ -8,18 +8,18 @@ module A {
 }
 
 module B {
->B : B
+>B : typeof B
 
     export import A1 = A
->A1 : A1
->A : A1
+>A1 : unknown
+>A : unknown
     
 }
 
 var x: B.A1.I = { x: 1 };
 >x : A.I
->B : B
->A1 : B.A1
+>B : unknown
+>A1 : unknown
 >I : A.I
 >{ x: 1 } : { x: number; }
 >x : number
diff --git a/tests/baselines/reference/exportImportNonInstantiatedModule2.types b/tests/baselines/reference/exportImportNonInstantiatedModule2.types
index d73ec2eb447..958f48bec9d 100644
--- a/tests/baselines/reference/exportImportNonInstantiatedModule2.types
+++ b/tests/baselines/reference/exportImportNonInstantiatedModule2.types
@@ -1,10 +1,10 @@
 === tests/cases/compiler/consumer.ts ===
 import e = require('./exporter');
->e : e
+>e : typeof e
 
 export function w(): e.w { // Should be OK
 >w : typeof w
->e : e
+>e : unknown
 >w : e.w
 
     return {name: 'value' };
@@ -22,5 +22,5 @@ interface Widget1 { name: string; }
 
 === tests/cases/compiler/exporter.ts ===
 export import w = require('./w1');
->w : w
+>w : unknown
 
diff --git a/tests/baselines/reference/exportPrivateType.types b/tests/baselines/reference/exportPrivateType.types
index afb555606b2..87751b273a7 100644
--- a/tests/baselines/reference/exportPrivateType.types
+++ b/tests/baselines/reference/exportPrivateType.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/exportPrivateType.ts ===
 module foo {
->foo : foo
+>foo : typeof foo
 
     class C1 {
 >C1 : C1
diff --git a/tests/baselines/reference/extBaseClass1.types b/tests/baselines/reference/extBaseClass1.types
index 8e20bb14351..16f89ab5a20 100644
--- a/tests/baselines/reference/extBaseClass1.types
+++ b/tests/baselines/reference/extBaseClass1.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/extBaseClass1.ts ===
 module M {
->M : M
+>M : typeof M
 
     export class B {
 >B : B
@@ -16,7 +16,7 @@ module M {
 }
 
 module M {
->M : M
+>M : typeof M
 
     export class C2 extends B {
 >C2 : C2
@@ -25,11 +25,11 @@ module M {
 }
 
 module N {
->N : N
+>N : typeof N
 
     export class C3 extends M.B {
 >C3 : C3
->M : M
+>M : unknown
 >B : M.B
     }
 }
diff --git a/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.types b/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.types
index 4adfc84eb45..fefa692b509 100644
--- a/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.types
+++ b/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.types
@@ -1,12 +1,12 @@
 === tests/cases/compiler/extendingClassFromAliasAndUsageInIndexer_main.ts ===
 import Backbone = require("extendingClassFromAliasAndUsageInIndexer_backbone");
->Backbone : Backbone
+>Backbone : typeof Backbone
 
 import moduleA = require("extendingClassFromAliasAndUsageInIndexer_moduleA");
->moduleA : moduleA
+>moduleA : typeof moduleA
 
 import moduleB = require("extendingClassFromAliasAndUsageInIndexer_moduleB");
->moduleB : moduleB
+>moduleB : typeof moduleB
 
 interface IHasVisualizationModel {
 >IHasVisualizationModel : IHasVisualizationModel
@@ -56,11 +56,11 @@ export class Model {
 
 === tests/cases/compiler/extendingClassFromAliasAndUsageInIndexer_moduleA.ts ===
 import Backbone = require("extendingClassFromAliasAndUsageInIndexer_backbone");
->Backbone : Backbone
+>Backbone : typeof Backbone
 
 export class VisualizationModel extends Backbone.Model {
 >VisualizationModel : VisualizationModel
->Backbone : Backbone
+>Backbone : unknown
 >Model : Backbone.Model
 
     // interesting stuff here
@@ -68,11 +68,11 @@ export class VisualizationModel extends Backbone.Model {
 
 === tests/cases/compiler/extendingClassFromAliasAndUsageInIndexer_moduleB.ts ===
 import Backbone = require("extendingClassFromAliasAndUsageInIndexer_backbone");
->Backbone : Backbone
+>Backbone : typeof Backbone
 
 export class VisualizationModel extends Backbone.Model {
 >VisualizationModel : VisualizationModel
->Backbone : Backbone
+>Backbone : unknown
 >Model : Backbone.Model
 
     // different interesting stuff here
diff --git a/tests/baselines/reference/externModuleClobber.types b/tests/baselines/reference/externModuleClobber.types
index 88fc85fc305..d1a7ba32651 100644
--- a/tests/baselines/reference/externModuleClobber.types
+++ b/tests/baselines/reference/externModuleClobber.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/externModuleClobber.ts ===
 declare module EM {
->EM : EM
+>EM : typeof EM
 
 	export class Position { }
 >Position : Position
@@ -10,19 +10,19 @@ declare module EM {
 
 		public getPosition() : EM.Position;
 >getPosition : () => Position
->EM : EM
+>EM : unknown
 >Position : Position
 	}
 }
 
 var x:EM.Position;
 >x : EM.Position
->EM : EM
+>EM : unknown
 >Position : EM.Position
 
 var ec:EM.EC = new EM.EC();
 >ec : EM.EC
->EM : EM
+>EM : unknown
 >EC : EM.EC
 >new EM.EC() : EM.EC
 >EM.EC : typeof EM.EC
diff --git a/tests/baselines/reference/externalModuleAssignToVar.types b/tests/baselines/reference/externalModuleAssignToVar.types
index 2983d9d4e1b..8bcc6cdf3e6 100644
--- a/tests/baselines/reference/externalModuleAssignToVar.types
+++ b/tests/baselines/reference/externalModuleAssignToVar.types
@@ -1,12 +1,12 @@
 === tests/cases/compiler/externalModuleAssignToVar_core.ts ===
 ///<reference path='externalModuleAssignToVar_core_require.ts'/>
 import ext = require('externalModuleAssignToVar_core_require');
->ext : ext
+>ext : typeof ext
 
 var y1: { C: new() => ext.C; } = ext;
 >y1 : { C: new () => ext.C; }
 >C : new () => ext.C
->ext : ext
+>ext : unknown
 >C : ext.C
 >ext : typeof ext
 
@@ -16,7 +16,7 @@ y1 = ext; // ok
 >ext : typeof ext
 
 import ext2 = require('externalModuleAssignToVar_core_require2');
->ext2 : ext2
+>ext2 : typeof ext2
 
 var y2: new() => ext2 = ext2;
 >y2 : new () => ext2
@@ -29,7 +29,7 @@ y2 = ext2; // ok
 >ext2 : typeof ext2
 
 import ext3 = require('externalModuleAssignToVar_ext');
->ext3 : ext3
+>ext3 : typeof ext3
 
 var y3: new () => ext3 = ext3;
 >y3 : new () => ext3
diff --git a/tests/baselines/reference/externalModuleReferenceOfImportDeclarationWithExportModifier.types b/tests/baselines/reference/externalModuleReferenceOfImportDeclarationWithExportModifier.types
index 8871b3b8f36..4a20abec68b 100644
--- a/tests/baselines/reference/externalModuleReferenceOfImportDeclarationWithExportModifier.types
+++ b/tests/baselines/reference/externalModuleReferenceOfImportDeclarationWithExportModifier.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/externalModuleReferenceOfImportDeclarationWithExportModifier_1.ts ===
 export import file1 = require('externalModuleReferenceOfImportDeclarationWithExportModifier_0');
->file1 : file1
+>file1 : typeof file1
 
 file1.foo();
 >file1.foo() : void
diff --git a/tests/baselines/reference/externalModuleResolution.types b/tests/baselines/reference/externalModuleResolution.types
index 19f43c2ca6b..929695b2203 100644
--- a/tests/baselines/reference/externalModuleResolution.types
+++ b/tests/baselines/reference/externalModuleResolution.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/consumer.ts ===
 import x = require('./foo');
->x : x
+>x : typeof x
 
 x.Y // .ts should be picked
 >x.Y : number
@@ -9,7 +9,7 @@ x.Y // .ts should be picked
 
 === tests/cases/compiler/foo.ts ===
 module M2 {
->M2 : M2
+>M2 : typeof M2
 
     export var Y = 1;
 >Y : number
diff --git a/tests/baselines/reference/externalModuleResolution2.types b/tests/baselines/reference/externalModuleResolution2.types
index df7c789a3fd..09b33fb2bee 100644
--- a/tests/baselines/reference/externalModuleResolution2.types
+++ b/tests/baselines/reference/externalModuleResolution2.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/consumer.ts ===
 import x = require('./foo');
->x : x
+>x : typeof x
 
 x.X // .ts should be picked
 >x.X : number
@@ -9,7 +9,7 @@ x.X // .ts should be picked
 
 === tests/cases/compiler/foo.ts ===
 module M2 {
->M2 : M2
+>M2 : typeof M2
 
     export var X = 1;
 >X : number
diff --git a/tests/baselines/reference/fatArrowSelf.types b/tests/baselines/reference/fatArrowSelf.types
index 8b16eaae533..912e0cd78a7 100644
--- a/tests/baselines/reference/fatArrowSelf.types
+++ b/tests/baselines/reference/fatArrowSelf.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/fatArrowSelf.ts ===
 module Events {
->Events : Events
+>Events : typeof Events
 
     export interface ListenerCallback {
 >ListenerCallback : ListenerCallback
@@ -21,14 +21,14 @@ module Events {
 }
 
 module Consumer {
->Consumer : Consumer
+>Consumer : typeof Consumer
 
     class EventEmitterConsummer {
 >EventEmitterConsummer : EventEmitterConsummer
 
         constructor (private emitter: Events.EventEmitter) { }
 >emitter : Events.EventEmitter
->Events : Events
+>Events : unknown
 >EventEmitter : Events.EventEmitter
 
         private register() {
diff --git a/tests/baselines/reference/forInModule.types b/tests/baselines/reference/forInModule.types
index cbfd43d804e..7de39df3b33 100644
--- a/tests/baselines/reference/forInModule.types
+++ b/tests/baselines/reference/forInModule.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/forInModule.ts ===
 module Foo {
->Foo : Foo
+>Foo : typeof Foo
 
 	for (var i = 0; i < 1; i++) {
 >i : number
diff --git a/tests/baselines/reference/forStatements.types b/tests/baselines/reference/forStatements.types
index 906a1d5fe9d..a13add7c4a5 100644
--- a/tests/baselines/reference/forStatements.types
+++ b/tests/baselines/reference/forStatements.types
@@ -39,7 +39,7 @@ function F(x: string): number { return 42; }
 >x : string
 
 module M {
->M : M
+>M : typeof M
 
     export class A {
 >A : A
@@ -139,7 +139,7 @@ for(var aModule: typeof M = M;;){}
 
 for(var aClassInModule: M.A = new M.A();;){}
 >aClassInModule : M.A
->M : M
+>M : unknown
 >A : M.A
 >new M.A() : M.A
 >M.A : typeof M.A
diff --git a/tests/baselines/reference/funcdecl.types b/tests/baselines/reference/funcdecl.types
index ea3a6931dd4..c208e51c450 100644
--- a/tests/baselines/reference/funcdecl.types
+++ b/tests/baselines/reference/funcdecl.types
@@ -116,7 +116,7 @@ function f(n: () => void) { }
 >n : () => void
 
 module m2 {
->m2 : m2
+>m2 : typeof m2
 
     export function foo(n: () => void ) {
 >foo : typeof foo
diff --git a/tests/baselines/reference/functionCall5.types b/tests/baselines/reference/functionCall5.types
index 6c1cd953156..9ac37cf0fad 100644
--- a/tests/baselines/reference/functionCall5.types
+++ b/tests/baselines/reference/functionCall5.types
@@ -1,12 +1,12 @@
 === tests/cases/compiler/functionCall5.ts ===
 module m1 { export class c1 { public a; }} 
->m1 : m1
+>m1 : typeof m1
 >c1 : c1
 >a : any
 
 function foo():m1.c1{return new m1.c1();}; 
 >foo : typeof foo
->m1 : m1
+>m1 : unknown
 >c1 : m1.c1
 >new m1.c1() : m1.c1
 >m1.c1 : typeof m1.c1
diff --git a/tests/baselines/reference/functionInIfStatementInModule.types b/tests/baselines/reference/functionInIfStatementInModule.types
index e379ce427ac..773fd9c4186 100644
--- a/tests/baselines/reference/functionInIfStatementInModule.types
+++ b/tests/baselines/reference/functionInIfStatementInModule.types
@@ -1,7 +1,7 @@
 === tests/cases/compiler/functionInIfStatementInModule.ts ===
  
 module Midori
->Midori : Midori
+>Midori : typeof Midori
 {
     if (false) {
         function Foo(src)
diff --git a/tests/baselines/reference/functionMergedWithModule.types b/tests/baselines/reference/functionMergedWithModule.types
index 02805e21599..e472584c5a4 100644
--- a/tests/baselines/reference/functionMergedWithModule.types
+++ b/tests/baselines/reference/functionMergedWithModule.types
@@ -8,8 +8,8 @@ function foo(title: string) {
 }
 
 module foo.Bar {
->foo : foo
->Bar : Bar
+>foo : typeof foo
+>Bar : typeof Bar
 
     export function f() {
 >f : typeof f
@@ -17,8 +17,8 @@ module foo.Bar {
 }
 
 module foo.Baz {
->foo : foo
->Baz : Baz
+>foo : typeof foo
+>Baz : typeof Baz
 
     export function g() {
 >g : typeof g
diff --git a/tests/baselines/reference/funduleExportedClassIsUsedBeforeDeclaration.types b/tests/baselines/reference/funduleExportedClassIsUsedBeforeDeclaration.types
index 05de0be00c5..fa457680f07 100644
--- a/tests/baselines/reference/funduleExportedClassIsUsedBeforeDeclaration.types
+++ b/tests/baselines/reference/funduleExportedClassIsUsedBeforeDeclaration.types
@@ -3,16 +3,16 @@ interface A {   // interface before module declaration
 >A : A
 
     (): B.C;    // uses defined below class in module
->B : B
+>B : unknown
 >C : B.C
 }
 declare function B(): B.C;  // function merged with module
 >B : typeof B
->B : B
+>B : unknown
 >C : B.C
 
 declare module B {
->B : B
+>B : typeof B
 
     export class C {    // class defined in module 
 >C : C
diff --git a/tests/baselines/reference/funduleOfFunctionWithoutReturnTypeAnnotation.types b/tests/baselines/reference/funduleOfFunctionWithoutReturnTypeAnnotation.types
index 2b1c79b6d6e..9284ce3e19d 100644
--- a/tests/baselines/reference/funduleOfFunctionWithoutReturnTypeAnnotation.types
+++ b/tests/baselines/reference/funduleOfFunctionWithoutReturnTypeAnnotation.types
@@ -8,7 +8,7 @@ function fn() {
 >n : number
 }
 module fn {
->fn : fn
+>fn : typeof fn
 
     export var n = 1;
 >n : number
diff --git a/tests/baselines/reference/funduleUsedAcrossFileBoundary.types b/tests/baselines/reference/funduleUsedAcrossFileBoundary.types
index 778585b7121..105246be7b0 100644
--- a/tests/baselines/reference/funduleUsedAcrossFileBoundary.types
+++ b/tests/baselines/reference/funduleUsedAcrossFileBoundary.types
@@ -6,7 +6,7 @@ declare function Q<T>(value: T): string;
 >T : T
 
 declare module Q {
->Q : Q
+>Q : typeof Q
 
     interface Promise<T> {
 >Promise : Promise<T>
@@ -25,7 +25,7 @@ function promiseWithCancellation<T>(promise: Q.Promise<T>) {
 >promiseWithCancellation : typeof promiseWithCancellation
 >T : T
 >promise : Q.Promise<T>
->Q : Q
+>Q : unknown
 >Promise : Q.Promise<T>
 >T : T
 
diff --git a/tests/baselines/reference/generatedContextualTyping.types b/tests/baselines/reference/generatedContextualTyping.types
index 023ca28eda4..9f70ffe2af5 100644
--- a/tests/baselines/reference/generatedContextualTyping.types
+++ b/tests/baselines/reference/generatedContextualTyping.types
@@ -1787,7 +1787,7 @@ var x180: () => Genric<Base> = function() { return { func: n => { return [d1, d2
 >d2 : Derived2
 
 module x181 { var t: () => Base[] = () => [d1, d2]; }
->x181 : x181
+>x181 : typeof x181
 >t : () => Base[]
 >Base : Base
 >() => [d1, d2] : () => Base[]
@@ -1796,7 +1796,7 @@ module x181 { var t: () => Base[] = () => [d1, d2]; }
 >d2 : Derived2
 
 module x182 { var t: () => Base[] = function() { return [d1, d2] }; }
->x182 : x182
+>x182 : typeof x182
 >t : () => Base[]
 >Base : Base
 >function() { return [d1, d2] } : () => Base[]
@@ -1805,7 +1805,7 @@ module x182 { var t: () => Base[] = function() { return [d1, d2] }; }
 >d2 : Derived2
 
 module x183 { var t: () => Base[] = function named() { return [d1, d2] }; }
->x183 : x183
+>x183 : typeof x183
 >t : () => Base[]
 >Base : Base
 >function named() { return [d1, d2] } : () => Base[]
@@ -1815,7 +1815,7 @@ module x183 { var t: () => Base[] = function named() { return [d1, d2] }; }
 >d2 : Derived2
 
 module x184 { var t: { (): Base[]; } = () => [d1, d2]; }
->x184 : x184
+>x184 : typeof x184
 >t : () => Base[]
 >Base : Base
 >() => [d1, d2] : () => Base[]
@@ -1824,7 +1824,7 @@ module x184 { var t: { (): Base[]; } = () => [d1, d2]; }
 >d2 : Derived2
 
 module x185 { var t: { (): Base[]; } = function() { return [d1, d2] }; }
->x185 : x185
+>x185 : typeof x185
 >t : () => Base[]
 >Base : Base
 >function() { return [d1, d2] } : () => Base[]
@@ -1833,7 +1833,7 @@ module x185 { var t: { (): Base[]; } = function() { return [d1, d2] }; }
 >d2 : Derived2
 
 module x186 { var t: { (): Base[]; } = function named() { return [d1, d2] }; }
->x186 : x186
+>x186 : typeof x186
 >t : () => Base[]
 >Base : Base
 >function named() { return [d1, d2] } : () => Base[]
@@ -1843,7 +1843,7 @@ module x186 { var t: { (): Base[]; } = function named() { return [d1, d2] }; }
 >d2 : Derived2
 
 module x187 { var t: Base[] = [d1, d2]; }
->x187 : x187
+>x187 : typeof x187
 >t : Base[]
 >Base : Base
 >[d1, d2] : Base[]
@@ -1851,7 +1851,7 @@ module x187 { var t: Base[] = [d1, d2]; }
 >d2 : Derived2
 
 module x188 { var t: Array<Base> = [d1, d2]; }
->x188 : x188
+>x188 : typeof x188
 >t : Base[]
 >Array : Array<T>
 >Base : Base
@@ -1860,7 +1860,7 @@ module x188 { var t: Array<Base> = [d1, d2]; }
 >d2 : Derived2
 
 module x189 { var t: { [n: number]: Base; } = [d1, d2]; }
->x189 : x189
+>x189 : typeof x189
 >t : { [x: number]: Base; }
 >n : number
 >Base : Base
@@ -1869,7 +1869,7 @@ module x189 { var t: { [n: number]: Base; } = [d1, d2]; }
 >d2 : Derived2
 
 module x190 { var t: {n: Base[]; }  = { n: [d1, d2] }; }
->x190 : x190
+>x190 : typeof x190
 >t : { n: Base[]; }
 >n : Base[]
 >Base : Base
@@ -1880,7 +1880,7 @@ module x190 { var t: {n: Base[]; }  = { n: [d1, d2] }; }
 >d2 : Derived2
 
 module x191 { var t: (s: Base[]) => any = n => { var n: Base[]; return null; }; }
->x191 : x191
+>x191 : typeof x191
 >t : (s: Base[]) => any
 >s : Base[]
 >Base : Base
@@ -1890,7 +1890,7 @@ module x191 { var t: (s: Base[]) => any = n => { var n: Base[]; return null; };
 >Base : Base
 
 module x192 { var t: Genric<Base> = { func: n => { return [d1, d2]; } }; }
->x192 : x192
+>x192 : typeof x192
 >t : Genric<Base>
 >Genric : Genric<T>
 >Base : Base
@@ -1903,7 +1903,7 @@ module x192 { var t: Genric<Base> = { func: n => { return [d1, d2]; } }; }
 >d2 : Derived2
 
 module x193 { export var t: () => Base[] = () => [d1, d2]; }
->x193 : x193
+>x193 : typeof x193
 >t : () => Base[]
 >Base : Base
 >() => [d1, d2] : () => Base[]
@@ -1912,7 +1912,7 @@ module x193 { export var t: () => Base[] = () => [d1, d2]; }
 >d2 : Derived2
 
 module x194 { export var t: () => Base[] = function() { return [d1, d2] }; }
->x194 : x194
+>x194 : typeof x194
 >t : () => Base[]
 >Base : Base
 >function() { return [d1, d2] } : () => Base[]
@@ -1921,7 +1921,7 @@ module x194 { export var t: () => Base[] = function() { return [d1, d2] }; }
 >d2 : Derived2
 
 module x195 { export var t: () => Base[] = function named() { return [d1, d2] }; }
->x195 : x195
+>x195 : typeof x195
 >t : () => Base[]
 >Base : Base
 >function named() { return [d1, d2] } : () => Base[]
@@ -1931,7 +1931,7 @@ module x195 { export var t: () => Base[] = function named() { return [d1, d2] };
 >d2 : Derived2
 
 module x196 { export var t: { (): Base[]; } = () => [d1, d2]; }
->x196 : x196
+>x196 : typeof x196
 >t : () => Base[]
 >Base : Base
 >() => [d1, d2] : () => Base[]
@@ -1940,7 +1940,7 @@ module x196 { export var t: { (): Base[]; } = () => [d1, d2]; }
 >d2 : Derived2
 
 module x197 { export var t: { (): Base[]; } = function() { return [d1, d2] }; }
->x197 : x197
+>x197 : typeof x197
 >t : () => Base[]
 >Base : Base
 >function() { return [d1, d2] } : () => Base[]
@@ -1949,7 +1949,7 @@ module x197 { export var t: { (): Base[]; } = function() { return [d1, d2] }; }
 >d2 : Derived2
 
 module x198 { export var t: { (): Base[]; } = function named() { return [d1, d2] }; }
->x198 : x198
+>x198 : typeof x198
 >t : () => Base[]
 >Base : Base
 >function named() { return [d1, d2] } : () => Base[]
@@ -1959,7 +1959,7 @@ module x198 { export var t: { (): Base[]; } = function named() { return [d1, d2]
 >d2 : Derived2
 
 module x199 { export var t: Base[] = [d1, d2]; }
->x199 : x199
+>x199 : typeof x199
 >t : Base[]
 >Base : Base
 >[d1, d2] : Base[]
@@ -1967,7 +1967,7 @@ module x199 { export var t: Base[] = [d1, d2]; }
 >d2 : Derived2
 
 module x200 { export var t: Array<Base> = [d1, d2]; }
->x200 : x200
+>x200 : typeof x200
 >t : Base[]
 >Array : Array<T>
 >Base : Base
@@ -1976,7 +1976,7 @@ module x200 { export var t: Array<Base> = [d1, d2]; }
 >d2 : Derived2
 
 module x201 { export var t: { [n: number]: Base; } = [d1, d2]; }
->x201 : x201
+>x201 : typeof x201
 >t : { [x: number]: Base; }
 >n : number
 >Base : Base
@@ -1985,7 +1985,7 @@ module x201 { export var t: { [n: number]: Base; } = [d1, d2]; }
 >d2 : Derived2
 
 module x202 { export var t: {n: Base[]; }  = { n: [d1, d2] }; }
->x202 : x202
+>x202 : typeof x202
 >t : { n: Base[]; }
 >n : Base[]
 >Base : Base
@@ -1996,7 +1996,7 @@ module x202 { export var t: {n: Base[]; }  = { n: [d1, d2] }; }
 >d2 : Derived2
 
 module x203 { export var t: (s: Base[]) => any = n => { var n: Base[]; return null; }; }
->x203 : x203
+>x203 : typeof x203
 >t : (s: Base[]) => any
 >s : Base[]
 >Base : Base
@@ -2006,7 +2006,7 @@ module x203 { export var t: (s: Base[]) => any = n => { var n: Base[]; return nu
 >Base : Base
 
 module x204 { export var t: Genric<Base> = { func: n => { return [d1, d2]; } }; }
->x204 : x204
+>x204 : typeof x204
 >t : Genric<Base>
 >Genric : Genric<T>
 >Base : Base
diff --git a/tests/baselines/reference/generativeRecursionWithTypeOf.types b/tests/baselines/reference/generativeRecursionWithTypeOf.types
index 1c06de8bed1..b26941d8793 100644
--- a/tests/baselines/reference/generativeRecursionWithTypeOf.types
+++ b/tests/baselines/reference/generativeRecursionWithTypeOf.types
@@ -13,7 +13,7 @@ class C<T> {
 }
 
 module M {
->M : M
+>M : typeof M
 
     export function f(x: typeof C) {   
 >f : typeof f
diff --git a/tests/baselines/reference/genericAndNonGenericInterfaceWithTheSameName2.types b/tests/baselines/reference/genericAndNonGenericInterfaceWithTheSameName2.types
index 27d9f801dcd..b15da5e995c 100644
--- a/tests/baselines/reference/genericAndNonGenericInterfaceWithTheSameName2.types
+++ b/tests/baselines/reference/genericAndNonGenericInterfaceWithTheSameName2.types
@@ -2,7 +2,7 @@
 // generic and non-generic interfaces with the same name do not merge
 
 module M {
->M : M
+>M : unknown
 
     interface A<T> {
 >A : A<T>
@@ -15,7 +15,7 @@ module M {
 }
 
 module M2 {
->M2 : M2
+>M2 : unknown
 
     interface A { // ok
 >A : A
@@ -26,10 +26,10 @@ module M2 {
 }
 
 module N {
->N : N
+>N : unknown
 
     module M {
->M : M
+>M : unknown
 
         interface A<T> {
 >A : A<T>
@@ -42,7 +42,7 @@ module N {
     }
 
     module M2 {
->M2 : M2
+>M2 : unknown
 
         interface A { // ok
 >A : A
diff --git a/tests/baselines/reference/genericArgumentCallSigAssignmentCompat.types b/tests/baselines/reference/genericArgumentCallSigAssignmentCompat.types
index a36b2219360..2ac2483c405 100644
--- a/tests/baselines/reference/genericArgumentCallSigAssignmentCompat.types
+++ b/tests/baselines/reference/genericArgumentCallSigAssignmentCompat.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/genericArgumentCallSigAssignmentCompat.ts ===
 module Underscore {
->Underscore : Underscore
+>Underscore : unknown
 
     export interface Iterator<T, U> {
 >Iterator : Iterator<T, U>
@@ -39,7 +39,7 @@ module Underscore {
  
 declare var _: Underscore.Static;
 >_ : Underscore.Static
->Underscore : Underscore
+>Underscore : unknown
 >Static : Underscore.Static
  
 // No error, Call signatures of types '<T>(value: T) => T' and 'Underscore.Iterator<{}, boolean>' are compatible when instantiated with any.
diff --git a/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments.types b/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments.types
index c88c4124353..2a9b0c2e861 100644
--- a/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments.types
+++ b/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments.types
@@ -3,7 +3,7 @@
 // Inferences are made quadratic-pairwise to and from these overload sets
 
 module NonGenericParameter {
->NonGenericParameter : NonGenericParameter
+>NonGenericParameter : typeof NonGenericParameter
 
     var a: {
 >a : { new (x: boolean): boolean; new (x: string): string; }
@@ -46,7 +46,7 @@ module NonGenericParameter {
 }
 
 module GenericParameter {
->GenericParameter : GenericParameter
+>GenericParameter : typeof GenericParameter
 
     function foo5<T>(cb: { new(x: T): string; new(x: number): T }) {
 >foo5 : typeof foo5
diff --git a/tests/baselines/reference/genericCallWithOverloadedFunctionTypedArguments.types b/tests/baselines/reference/genericCallWithOverloadedFunctionTypedArguments.types
index 3002ff4de11..ecf23d2ead9 100644
--- a/tests/baselines/reference/genericCallWithOverloadedFunctionTypedArguments.types
+++ b/tests/baselines/reference/genericCallWithOverloadedFunctionTypedArguments.types
@@ -3,7 +3,7 @@
 // Inferences are made quadratic-pairwise to and from these overload sets
 
 module NonGenericParameter {
->NonGenericParameter : NonGenericParameter
+>NonGenericParameter : typeof NonGenericParameter
 
     var a: {
 >a : { (x: boolean): boolean; (x: string): string; }
@@ -50,7 +50,7 @@ module NonGenericParameter {
 }
 
 module GenericParameter {
->GenericParameter : GenericParameter
+>GenericParameter : typeof GenericParameter
 
     function foo5<T>(cb: { (x: T): string; (x: number): T }) {
 >foo5 : typeof foo5
diff --git a/tests/baselines/reference/genericCallbacksAndClassHierarchy.types b/tests/baselines/reference/genericCallbacksAndClassHierarchy.types
index 646c93d1ffd..97e584dca3f 100644
--- a/tests/baselines/reference/genericCallbacksAndClassHierarchy.types
+++ b/tests/baselines/reference/genericCallbacksAndClassHierarchy.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/genericCallbacksAndClassHierarchy.ts ===
 module M {
->M : M
+>M : typeof M
 
     export interface I<T> {
 >I : I<T>
diff --git a/tests/baselines/reference/genericClassImplementingGenericInterfaceFromAnotherModule.types b/tests/baselines/reference/genericClassImplementingGenericInterfaceFromAnotherModule.types
index a0e926c9ccf..337485dee2c 100644
--- a/tests/baselines/reference/genericClassImplementingGenericInterfaceFromAnotherModule.types
+++ b/tests/baselines/reference/genericClassImplementingGenericInterfaceFromAnotherModule.types
@@ -1,18 +1,18 @@
 === tests/cases/compiler/genericClassImplementingGenericInterfaceFromAnotherModule.ts ===
 module foo {
->foo : foo
+>foo : unknown
 
     export interface IFoo<T> { }
 >IFoo : IFoo<T>
 >T : T
 }
 module bar {
->bar : bar
+>bar : typeof bar
 
     export class Foo<T> implements foo.IFoo<T> { }
 >Foo : Foo<T>
 >T : T
->foo : foo
+>foo : unknown
 >IFoo : foo.IFoo<T>
 >T : T
 }
diff --git a/tests/baselines/reference/genericClassPropertyInheritanceSpecialization.types b/tests/baselines/reference/genericClassPropertyInheritanceSpecialization.types
index 5337c6cf6b3..2d39c0a465b 100644
--- a/tests/baselines/reference/genericClassPropertyInheritanceSpecialization.types
+++ b/tests/baselines/reference/genericClassPropertyInheritanceSpecialization.types
@@ -137,7 +137,7 @@ interface KnockoutObservableArrayStatic {
 }
 
 declare module ko {
->ko : ko
+>ko : typeof ko
 
     export var observableArray: KnockoutObservableArrayStatic;
 >observableArray : KnockoutObservableArrayStatic
@@ -145,9 +145,9 @@ declare module ko {
 }
 
 module Portal.Controls.Validators {
->Portal : Portal
->Controls : Controls
->Validators : Validators
+>Portal : typeof Portal
+>Controls : typeof Controls
+>Validators : typeof Validators
 
     export class Validator<TValue> {
 >Validator : Validator<TValue>
@@ -183,17 +183,17 @@ module Portal.Controls.Validators {
 }
 
 module PortalFx.ViewModels.Controls.Validators {
->PortalFx : PortalFx
->ViewModels : ViewModels
->Controls : Controls
->Validators : Validators
+>PortalFx : typeof PortalFx
+>ViewModels : typeof ViewModels
+>Controls : typeof Controls
+>Validators : typeof Validators
 
     export class Validator<TValue> extends Portal.Controls.Validators.Validator<TValue> {
 >Validator : Validator<TValue>
 >TValue : TValue
->Portal : Portal
->Controls : Portal.Controls
->Validators : Portal.Controls.Validators
+>Portal : unknown
+>Controls : unknown
+>Validators : unknown
 >Validator : Portal.Controls.Validators.Validator<TValue>
 >TValue : TValue
 
@@ -216,10 +216,10 @@ interface Contract<TValue> {
     validators: KnockoutObservableArray<PortalFx.ViewModels.Controls.Validators.Validator<TValue>>;
 >validators : KnockoutObservableArray<PortalFx.ViewModels.Controls.Validators.Validator<TValue>>
 >KnockoutObservableArray : KnockoutObservableArray<T>
->PortalFx : PortalFx
->ViewModels : PortalFx.ViewModels
->Controls : PortalFx.ViewModels.Controls
->Validators : PortalFx.ViewModels.Controls.Validators
+>PortalFx : unknown
+>ViewModels : unknown
+>Controls : unknown
+>Validators : unknown
 >Validator : PortalFx.ViewModels.Controls.Validators.Validator<TValue>
 >TValue : TValue
 }
@@ -234,20 +234,20 @@ class ViewModel<TValue> implements Contract<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 : PortalFx
->ViewModels : PortalFx.ViewModels
->Controls : PortalFx.ViewModels.Controls
->Validators : PortalFx.ViewModels.Controls.Validators
+>PortalFx : unknown
+>ViewModels : unknown
+>Controls : unknown
+>Validators : unknown
 >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
 >observableArray : KnockoutObservableArrayStatic
->PortalFx : PortalFx
->ViewModels : PortalFx.ViewModels
->Controls : PortalFx.ViewModels.Controls
->Validators : PortalFx.ViewModels.Controls.Validators
+>PortalFx : unknown
+>ViewModels : unknown
+>Controls : unknown
+>Validators : unknown
 >Validator : PortalFx.ViewModels.Controls.Validators.Validator<TValue>
 >TValue : TValue
 }
diff --git a/tests/baselines/reference/genericClassWithFunctionTypedMemberArguments.types b/tests/baselines/reference/genericClassWithFunctionTypedMemberArguments.types
index 9414857d0f0..87037736eff 100644
--- a/tests/baselines/reference/genericClassWithFunctionTypedMemberArguments.types
+++ b/tests/baselines/reference/genericClassWithFunctionTypedMemberArguments.types
@@ -3,7 +3,7 @@
 // Using function arguments, no errors expected
 
 module ImmediatelyFix {
->ImmediatelyFix : ImmediatelyFix
+>ImmediatelyFix : typeof ImmediatelyFix
 
     class C<T> {
 >C : C<T>
@@ -103,7 +103,7 @@ module ImmediatelyFix {
 }
 
 module WithCandidates {
->WithCandidates : WithCandidates
+>WithCandidates : typeof WithCandidates
 
     class C<T> {
 >C : C<T>
diff --git a/tests/baselines/reference/genericClassWithObjectTypeArgsAndConstraints.types b/tests/baselines/reference/genericClassWithObjectTypeArgsAndConstraints.types
index 1692a8fc832..25fe052d498 100644
--- a/tests/baselines/reference/genericClassWithObjectTypeArgsAndConstraints.types
+++ b/tests/baselines/reference/genericClassWithObjectTypeArgsAndConstraints.types
@@ -29,7 +29,7 @@ class X<T> {
 }
 
 module Class {
->Class : Class
+>Class : typeof Class
 
     class G<T extends { x: string }> {
 >G : G<T>
@@ -141,7 +141,7 @@ module Class {
 }
 
 module Interface {
->Interface : Interface
+>Interface : typeof Interface
 
     interface G<T extends { x: string }> {
 >G : G<T>
diff --git a/tests/baselines/reference/genericClassWithStaticFactory.types b/tests/baselines/reference/genericClassWithStaticFactory.types
index e8847a60e27..b0df737ee68 100644
--- a/tests/baselines/reference/genericClassWithStaticFactory.types
+++ b/tests/baselines/reference/genericClassWithStaticFactory.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/genericClassWithStaticFactory.ts ===
 module Editor {
->Editor : Editor
+>Editor : typeof Editor
 
     export class List<T> {
 >List : List<T>
diff --git a/tests/baselines/reference/genericClassesInModule.types b/tests/baselines/reference/genericClassesInModule.types
index 15b24e3881b..8c25523803c 100644
--- a/tests/baselines/reference/genericClassesInModule.types
+++ b/tests/baselines/reference/genericClassesInModule.types
@@ -1,7 +1,7 @@
 === tests/cases/compiler/genericClassesInModule.ts ===
 
 module Foo {
->Foo : Foo
+>Foo : typeof Foo
 
     export class B<T>{ }
 >B : B<T>
@@ -17,6 +17,6 @@ var a = new Foo.B<Foo.A>();
 >Foo.B : typeof Foo.B
 >Foo : typeof Foo
 >B : typeof Foo.B
->Foo : Foo
+>Foo : unknown
 >A : Foo.A
 
diff --git a/tests/baselines/reference/genericCloduleInModule.types b/tests/baselines/reference/genericCloduleInModule.types
index d9351d3ffd3..108dc34c2f7 100644
--- a/tests/baselines/reference/genericCloduleInModule.types
+++ b/tests/baselines/reference/genericCloduleInModule.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/genericCloduleInModule.ts ===
 module A {
->A : A
+>A : typeof A
 
     export class B<T> {
 >B : B<T>
@@ -13,7 +13,7 @@ module A {
 >bar : () => void
     }
     export module B {
->B : B
+>B : typeof B
 
         export var x = 1;
 >x : number
@@ -22,7 +22,7 @@ module A {
 
 var b: A.B<number>;
 >b : A.B<number>
->A : A
+>A : unknown
 >B : A.B<T>
 
 b.foo();
diff --git a/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes.types b/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes.types
index e7e6be5f7bb..1e744ce25c2 100644
--- a/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes.types
+++ b/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/genericConstraintOnExtendedBuiltinTypes.ts ===
 declare module EndGate {
->EndGate : EndGate
+>EndGate : typeof EndGate
 
     export interface ICloneable {
 >ICloneable : ICloneable
@@ -12,12 +12,12 @@ declare module EndGate {
 
 interface Number extends EndGate.ICloneable { }
 >Number : Number
->EndGate : EndGate
+>EndGate : unknown
 >ICloneable : EndGate.ICloneable
 
 module EndGate.Tweening {
->EndGate : EndGate
->Tweening : Tweening
+>EndGate : typeof EndGate
+>Tweening : typeof Tweening
 
     export class Tween<T extends ICloneable>{
 >Tween : Tween<T>
@@ -47,8 +47,8 @@ module EndGate.Tweening {
 }
 
 module EndGate.Tweening {
->EndGate : EndGate
->Tweening : Tweening
+>EndGate : typeof EndGate
+>Tweening : typeof Tweening
 
     export class NumberTween extends Tween<number>{
 >NumberTween : NumberTween
diff --git a/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes2.types b/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes2.types
index 8f872e71b0d..ad3182f62e5 100644
--- a/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes2.types
+++ b/tests/baselines/reference/genericConstraintOnExtendedBuiltinTypes2.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/genericConstraintOnExtendedBuiltinTypes2.ts ===
 module EndGate {
->EndGate : EndGate
+>EndGate : typeof EndGate
 
     export interface ICloneable {
 >ICloneable : ICloneable
@@ -12,12 +12,12 @@ module EndGate {
 
 interface Number extends EndGate.ICloneable { }
 >Number : Number
->EndGate : EndGate
+>EndGate : unknown
 >ICloneable : EndGate.ICloneable
 
 module EndGate.Tweening {
->EndGate : EndGate
->Tweening : Tweening
+>EndGate : typeof EndGate
+>Tweening : typeof Tweening
 
     export class Tween<T extends ICloneable>{
 >Tween : Tween<T>
@@ -46,8 +46,8 @@ module EndGate.Tweening {
 }
 
 module EndGate.Tweening {
->EndGate : EndGate
->Tweening : Tweening
+>EndGate : typeof EndGate
+>Tweening : typeof Tweening
 
     export class NumberTween extends Tween<Number>{
 >NumberTween : NumberTween
diff --git a/tests/baselines/reference/genericInference2.types b/tests/baselines/reference/genericInference2.types
index 1f620391163..d9e0bb14ceb 100644
--- a/tests/baselines/reference/genericInference2.types
+++ b/tests/baselines/reference/genericInference2.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/genericInference2.ts ===
     declare module ko { 
->ko : ko
+>ko : typeof ko
 
        export interface Observable<T> { 
 >Observable : Observable<T>
diff --git a/tests/baselines/reference/genericOfACloduleType1.types b/tests/baselines/reference/genericOfACloduleType1.types
index 24ea7c8ece3..afbef2f4180 100644
--- a/tests/baselines/reference/genericOfACloduleType1.types
+++ b/tests/baselines/reference/genericOfACloduleType1.types
@@ -8,14 +8,14 @@ class G<T>{ bar(x: T) { return x; } }
 >x : T
 
 module M {
->M : M
+>M : typeof M
 
     export class C { foo() { } }
 >C : C
 >foo : () => void
 
     export module C {
->C : C
+>C : typeof C
 
         export class X {
 >X : X
@@ -41,6 +41,6 @@ var g2 = new G<M.C>() // was: error Type reference cannot refer to container 'M.
 >g2 : G<M.C>
 >new G<M.C>() : G<M.C>
 >G : typeof G
->M : M
+>M : unknown
 >C : M.C
 
diff --git a/tests/baselines/reference/genericOfACloduleType2.types b/tests/baselines/reference/genericOfACloduleType2.types
index 4cee4cde19c..275af8c913b 100644
--- a/tests/baselines/reference/genericOfACloduleType2.types
+++ b/tests/baselines/reference/genericOfACloduleType2.types
@@ -8,14 +8,14 @@ class G<T>{ bar(x: T) { return x; } }
 >x : T
 
 module M {
->M : M
+>M : typeof M
 
     export class C { foo() { } }
 >C : C
 >foo : () => void
 
     export module C {
->C : C
+>C : typeof C
 
         export class X {
 >X : X
@@ -39,12 +39,12 @@ module M {
 }
 
 module N {
->N : N
+>N : typeof N
 
     var g2 = new G<M.C>()
 >g2 : G<M.C>
 >new G<M.C>() : G<M.C>
 >G : typeof G
->M : M
+>M : unknown
 >C : M.C
 }
diff --git a/tests/baselines/reference/genericRecursiveImplicitConstructorErrors2.types b/tests/baselines/reference/genericRecursiveImplicitConstructorErrors2.types
index 8ff4190ae7c..2f62a20c415 100644
--- a/tests/baselines/reference/genericRecursiveImplicitConstructorErrors2.types
+++ b/tests/baselines/reference/genericRecursiveImplicitConstructorErrors2.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/genericRecursiveImplicitConstructorErrors2.ts ===
 module TypeScript2 {
->TypeScript2 : TypeScript2
+>TypeScript2 : typeof TypeScript2
 
   export interface DeclKind { };
 >DeclKind : DeclKind
diff --git a/tests/baselines/reference/genericTypeArgumentInference1.types b/tests/baselines/reference/genericTypeArgumentInference1.types
index c4416c2c3f1..20a9a0ca8f9 100644
--- a/tests/baselines/reference/genericTypeArgumentInference1.types
+++ b/tests/baselines/reference/genericTypeArgumentInference1.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/genericTypeArgumentInference1.ts ===
 module Underscore {
->Underscore : Underscore
+>Underscore : unknown
 
     export interface Iterator<T, U> {
 >Iterator : Iterator<T, U>
@@ -38,7 +38,7 @@ module Underscore {
 }
 declare var _: Underscore.Static;
 >_ : Underscore.Static
->Underscore : Underscore
+>Underscore : unknown
 >Static : Underscore.Static
 
 var r = _.all([true, 1, null, 'yes'], _.identity);
diff --git a/tests/baselines/reference/global.types b/tests/baselines/reference/global.types
index 103bfd38dff..568c88297b0 100644
--- a/tests/baselines/reference/global.types
+++ b/tests/baselines/reference/global.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/global.ts ===
 module M {
->M : M
+>M : typeof M
 
     export function f(y:number) {
 >f : typeof f
diff --git a/tests/baselines/reference/heterogeneousArrayLiterals.types b/tests/baselines/reference/heterogeneousArrayLiterals.types
index 2466fb7164e..cd6cf3a06f7 100644
--- a/tests/baselines/reference/heterogeneousArrayLiterals.types
+++ b/tests/baselines/reference/heterogeneousArrayLiterals.types
@@ -114,7 +114,7 @@ var derived2: Derived2;
 >Derived2 : Derived2
 
 module Derived {
->Derived : Derived
+>Derived : typeof Derived
 
     var h = [{ foo: base, basear: derived }, { foo: base }]; // {foo: Base}[]
 >h : { foo: Base; }[]
@@ -206,7 +206,7 @@ module Derived {
 }
 
 module WithContextualType {
->WithContextualType : WithContextualType
+>WithContextualType : typeof WithContextualType
 
     // no errors
     var a: Base[] = [derived, derived2];
diff --git a/tests/baselines/reference/ifDoWhileStatements.types b/tests/baselines/reference/ifDoWhileStatements.types
index d5535cf55b7..b488b6c6fc0 100644
--- a/tests/baselines/reference/ifDoWhileStatements.types
+++ b/tests/baselines/reference/ifDoWhileStatements.types
@@ -56,7 +56,7 @@ function F2(x: number): boolean { return x < 42; }
 >x : number
 
 module M {
->M : M
+>M : typeof M
 
     export class A {
 >A : A
@@ -75,7 +75,7 @@ module M {
 }
 
 module N {
->N : N
+>N : typeof N
 
     export class A {
 >A : A
diff --git a/tests/baselines/reference/importAliasIdentifiers.types b/tests/baselines/reference/importAliasIdentifiers.types
index 93a6cfb4036..5cff22d7e98 100644
--- a/tests/baselines/reference/importAliasIdentifiers.types
+++ b/tests/baselines/reference/importAliasIdentifiers.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/internalModules/importDeclarations/importAliasIdentifiers.ts ===
 module moduleA {
->moduleA : moduleA
+>moduleA : typeof moduleA
 
     export class Point {
 >Point : Point
@@ -12,17 +12,17 @@ module moduleA {
 }
 
 import alias = moduleA;
->alias : alias
+>alias : typeof moduleA
 >moduleA : typeof moduleA
 
 var p: alias.Point;
 >p : alias.Point
->alias : alias
+>alias : unknown
 >Point : alias.Point
 
 var p: moduleA.Point;
 >p : alias.Point
->moduleA : moduleA
+>moduleA : unknown
 >Point : alias.Point
 
 var p: { x: number; y: number; };
@@ -38,7 +38,7 @@ class clodule {
 }
 
 module clodule {
->clodule : clodule
+>clodule : typeof clodule
 
     export interface Point {
 >Point : Point
@@ -56,7 +56,7 @@ module clodule {
 }
 
 import clolias = clodule;
->clolias : clolias
+>clolias : typeof clodule
 >clodule : clodule
 
 var p: clolias.Point;
@@ -85,7 +85,7 @@ function fundule() {
 }
 
 module fundule {
->fundule : fundule
+>fundule : typeof fundule
 
     export interface Point {
 >Point : Point
@@ -103,17 +103,17 @@ module fundule {
 }
 
 import funlias = fundule;
->funlias : funlias
+>funlias : typeof fundule
 >fundule : typeof fundule
 
 var p: funlias.Point;
 >p : alias.Point
->funlias : funlias
+>funlias : unknown
 >Point : funlias.Point
 
 var p: fundule.Point;
 >p : alias.Point
->fundule : fundule
+>fundule : unknown
 >Point : funlias.Point
 
 var p: { x: number; y: number; };
diff --git a/tests/baselines/reference/importAliasWithDottedName.types b/tests/baselines/reference/importAliasWithDottedName.types
index c160c44619d..ab316fade5c 100644
--- a/tests/baselines/reference/importAliasWithDottedName.types
+++ b/tests/baselines/reference/importAliasWithDottedName.types
@@ -1,12 +1,12 @@
 === tests/cases/compiler/importAliasWithDottedName.ts ===
 module M {
->M : M
+>M : typeof M
 
     export var x = 1;
 >x : number
 
     export module N {
->N : N
+>N : typeof N
 
         export var y = 2;
 >y : number
@@ -14,10 +14,10 @@ module M {
 }
 
 module A {
->A : A
+>A : typeof A
 
     import N = M.N;
->N : N
+>N : typeof N
 >M : typeof M
 >N : typeof N
 
diff --git a/tests/baselines/reference/importAndVariableDeclarationConflict2.types b/tests/baselines/reference/importAndVariableDeclarationConflict2.types
index ff2a54231a5..eb4f354a4dc 100644
--- a/tests/baselines/reference/importAndVariableDeclarationConflict2.types
+++ b/tests/baselines/reference/importAndVariableDeclarationConflict2.types
@@ -1,13 +1,13 @@
 === tests/cases/compiler/importAndVariableDeclarationConflict2.ts ===
 module m {
->m : m
+>m : typeof m
 
   export var m = '';
 >m : string
 }
 
 import x = m.m;
->x : x
+>x : string
 >m : typeof m
 >m : string
 
diff --git a/tests/baselines/reference/importDecl.types b/tests/baselines/reference/importDecl.types
index 01333eab49a..c961a58e7de 100644
--- a/tests/baselines/reference/importDecl.types
+++ b/tests/baselines/reference/importDecl.types
@@ -5,7 +5,7 @@
 ///<reference path='importDecl_require3.ts'/>
 ///<reference path='importDecl_require4.ts'/>
 import m4 = require("importDecl_require"); // Emit used
->m4 : m4
+>m4 : typeof m4
 
 export var x4 = m4.x;
 >x4 : m4.d
@@ -27,7 +27,7 @@ export var f4 = m4.foo();
 >foo : typeof m4.foo
 
 export module m1 {
->m1 : m1
+>m1 : typeof m1
 
     export var x2 = m4.x;
 >x2 : m4.d
@@ -70,7 +70,7 @@ export module m1 {
 
 //Emit global only usage
 import glo_m4 = require("importDecl_require1");
->glo_m4 : glo_m4
+>glo_m4 : typeof glo_m4
 
 export var useGlo_m4_d4 = glo_m4.d;
 >useGlo_m4_d4 : typeof glo_m4.d
@@ -87,7 +87,7 @@ export var useGlo_m4_f4 = glo_m4.foo();
 
 //Emit even when used just in function type
 import fncOnly_m4 = require("importDecl_require2");
->fncOnly_m4 : fncOnly_m4
+>fncOnly_m4 : typeof fncOnly_m4
 
 export var useFncOnly_m4_f4 = fncOnly_m4.foo();
 >useFncOnly_m4_f4 : fncOnly_m4.d
@@ -98,10 +98,10 @@ export var useFncOnly_m4_f4 = fncOnly_m4.foo();
 
 // only used privately no need to emit
 import private_m4 = require("importDecl_require3");
->private_m4 : private_m4
+>private_m4 : typeof private_m4
 
 export module usePrivate_m4_m1 {
->usePrivate_m4_m1 : usePrivate_m4_m1
+>usePrivate_m4_m1 : typeof usePrivate_m4_m1
 
     var x3 = private_m4.x;
 >x3 : private_m4.d
@@ -125,7 +125,7 @@ export module usePrivate_m4_m1 {
 
 // Do not emit unused import
 import m5 = require("importDecl_require4");
->m5 : m5
+>m5 : typeof m5
 
 export var d = m5.foo2();
 >d : m4.d
@@ -136,7 +136,7 @@ export var d = m5.foo2();
 
 // Do not emit multiple used import statements
 import multiImport_m4 = require("importDecl_require"); // Emit used
->multiImport_m4 : multiImport_m4
+>multiImport_m4 : typeof m4
 
 export var useMultiImport_m4_x4 = multiImport_m4.x;
 >useMultiImport_m4_x4 : m4.d
@@ -219,10 +219,10 @@ export function foo(): d { return null; }
 
 === tests/cases/compiler/importDecl_require4.ts ===
 import m4 = require("importDecl_require");
->m4 : m4
+>m4 : typeof m4
 
 export function foo2(): m4.d { return null; }
 >foo2 : typeof foo2
->m4 : m4
+>m4 : unknown
 >d : m4.d
 
diff --git a/tests/baselines/reference/importDeclWithExportModifierInAmbientContext.types b/tests/baselines/reference/importDeclWithExportModifierInAmbientContext.types
index 36eb1cb93c9..6649b33bfe0 100644
--- a/tests/baselines/reference/importDeclWithExportModifierInAmbientContext.types
+++ b/tests/baselines/reference/importDeclWithExportModifierInAmbientContext.types
@@ -1,15 +1,15 @@
 === tests/cases/compiler/importDeclWithExportModifierInAmbientContext.ts ===
 declare module "m" {
     module x {
->x : x
+>x : unknown
 
         interface c {
 >c : c
         }
     }
     export import a = x.c;
->a : a
->x : x
+>a : unknown
+>x : unknown
 >c : a
 
     var b: a;
diff --git a/tests/baselines/reference/importDeclarationUsedAsTypeQuery.types b/tests/baselines/reference/importDeclarationUsedAsTypeQuery.types
index da218ef066b..2f449c2aa87 100644
--- a/tests/baselines/reference/importDeclarationUsedAsTypeQuery.types
+++ b/tests/baselines/reference/importDeclarationUsedAsTypeQuery.types
@@ -1,7 +1,7 @@
 === tests/cases/compiler/importDeclarationUsedAsTypeQuery_1.ts ===
 ///<reference path='importDeclarationUsedAsTypeQuery_require.ts'/>
 import a = require('importDeclarationUsedAsTypeQuery_require');
->a : a
+>a : typeof a
 
 export var x: typeof a;
 >x : typeof a
diff --git a/tests/baselines/reference/importImportOnlyModule.types b/tests/baselines/reference/importImportOnlyModule.types
index 41e38e44fac..741d1b24859 100644
--- a/tests/baselines/reference/importImportOnlyModule.types
+++ b/tests/baselines/reference/importImportOnlyModule.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/externalModules/foo_2.ts ===
 import foo = require("./foo_1");
->foo : foo
+>foo : typeof foo
 
 var x = foo; // Cause a runtime dependency
 >x : typeof foo
@@ -19,7 +19,7 @@ export class C1 {
 
 === tests/cases/conformance/externalModules/foo_1.ts ===
 import c1 = require('./foo_0'); // Makes this an external module
->c1 : c1
+>c1 : typeof c1
 
 var answer = 42; // No exports
 >answer : number
diff --git a/tests/baselines/reference/importInTypePosition.types b/tests/baselines/reference/importInTypePosition.types
index 1e8dc308813..163ae1d3a62 100644
--- a/tests/baselines/reference/importInTypePosition.types
+++ b/tests/baselines/reference/importInTypePosition.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/importInTypePosition.ts ===
 module A {
->A : A
+>A : typeof A
 
     export class Point {
 >Point : Point
@@ -17,18 +17,18 @@ module A {
 
 // no code gen expected
 module B {
->B : B
+>B : unknown
 
     import a = A; //Error generates 'var <Alias> = <EntityName>;'
->a : a
+>a : typeof a
 >A : typeof a
 }
 // no code gen expected
 module C {
->C : C
+>C : typeof C
 
     import a = A; //Error generates 'var <Alias> = <EntityName>;'
->a : a
+>a : typeof a
 >A : typeof a
 
     var m: typeof a;
@@ -37,7 +37,7 @@ module C {
 
     var p: a.Point;
 >p : a.Point
->a : a
+>a : unknown
 >Point : a.Point
 
     var p = { x: 0, y: 0 };
diff --git a/tests/baselines/reference/importOnAliasedIdentifiers.types b/tests/baselines/reference/importOnAliasedIdentifiers.types
index fefc373f912..7772e909c99 100644
--- a/tests/baselines/reference/importOnAliasedIdentifiers.types
+++ b/tests/baselines/reference/importOnAliasedIdentifiers.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/importOnAliasedIdentifiers.ts ===
 module A {
->A : A
+>A : typeof A
 
     export interface X { s: string }
 >X : X
@@ -11,18 +11,18 @@ module A {
 >X : X
 }
 module B {
->B : B
+>B : typeof B
 
     interface A { n: number }
 >A : A
 >n : number
 
     import Y = A; // Alias only for module A
->Y : Y
+>Y : typeof Y
 >A : typeof Y
 
     import Z = A.X; // Alias for both type and member A.X
->Z : Z
+>Z : Y.X
 >A : typeof Y
 >X : Y.X
 
diff --git a/tests/baselines/reference/importShadowsGlobalName.types b/tests/baselines/reference/importShadowsGlobalName.types
index 729d91a24d2..a1f1106f1b8 100644
--- a/tests/baselines/reference/importShadowsGlobalName.types
+++ b/tests/baselines/reference/importShadowsGlobalName.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/Bar.ts ===
 import Error = require('Foo');
->Error : Error
+>Error : typeof Error
 
 class Bar extends Error {}
 >Bar : Bar
diff --git a/tests/baselines/reference/importStatements.types b/tests/baselines/reference/importStatements.types
index 1037646857e..68038e93a5b 100644
--- a/tests/baselines/reference/importStatements.types
+++ b/tests/baselines/reference/importStatements.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/internalModules/codeGeneration/importStatements.ts ===
 module A {
->A : A
+>A : typeof A
 
     export class Point {
 >Point : Point
@@ -18,19 +18,19 @@ module A {
 
 // no code gen expected
 module B {
->B : B
+>B : unknown
 
     import a = A; //Error generates 'var <Alias> = <EntityName>;'
->a : a
+>a : typeof a
 >A : typeof a
 }
 
 // no code gen expected
 module C {
->C : C
+>C : typeof C
 
     import a = A; //Error generates 'var <Alias> = <EntityName>;'
->a : a
+>a : typeof a
 >A : typeof a
 
     var m: typeof a;
@@ -39,7 +39,7 @@ module C {
 
     var p: a.Point;
 >p : a.Point
->a : a
+>a : unknown
 >Point : a.Point
 
     var p = {x:0, y:0 };
@@ -51,10 +51,10 @@ module C {
 
 // code gen expected
 module D {
->D : D
+>D : typeof D
 
     import a = A;
->a : a
+>a : typeof a
 >A : typeof a
 
     var p = new a.Point(1, 1);
@@ -66,16 +66,16 @@ module D {
 }
 
 module E {
->E : E
+>E : typeof E
 
     import a = A;
->a : a
+>a : typeof a
 >A : typeof a
 
     export function xDist(x: a.Point) {
 >xDist : typeof xDist
 >x : a.Point
->a : a
+>a : unknown
 >Point : a.Point
 
         return (a.Origin.x - x.x);
diff --git a/tests/baselines/reference/importUsedInExtendsList1.types b/tests/baselines/reference/importUsedInExtendsList1.types
index 59d47b2ee29..7261c34e75e 100644
--- a/tests/baselines/reference/importUsedInExtendsList1.types
+++ b/tests/baselines/reference/importUsedInExtendsList1.types
@@ -1,11 +1,11 @@
 === tests/cases/compiler/importUsedInExtendsList1_1.ts ===
 ///<reference path='importUsedInExtendsList1_require.ts'/>
 import foo = require('importUsedInExtendsList1_require');
->foo : foo
+>foo : typeof foo
 
 class Sub extends foo.Super { }
 >Sub : Sub
->foo : foo
+>foo : unknown
 >Super : foo.Super
 
 var s: Sub;
diff --git a/tests/baselines/reference/import_reference-exported-alias.types b/tests/baselines/reference/import_reference-exported-alias.types
index bb7a04a6e2e..b935fb16cf2 100644
--- a/tests/baselines/reference/import_reference-exported-alias.types
+++ b/tests/baselines/reference/import_reference-exported-alias.types
@@ -1,14 +1,14 @@
 === tests/cases/compiler/file2.ts ===
 import appJs = require("file1");
->appJs : appJs
+>appJs : typeof appJs
 
 import Services = appJs.Services;
->Services : Services
+>Services : typeof appJs.Services
 >appJs : typeof appJs
 >Services : typeof appJs.Services
 
 import UserServices = Services.UserServices;
->UserServices : UserServices
+>UserServices : typeof Services.UserServices
 >Services : typeof appJs.Services
 >UserServices : Services.UserServices
 
@@ -22,10 +22,10 @@ var x = new UserServices().getUserName();
 
 === tests/cases/compiler/file1.ts ===
 module App {
->App : App
+>App : typeof App
 
     export module Services {
->Services : Services
+>Services : typeof Services
 
         export class UserServices {
 >UserServices : UserServices
@@ -40,7 +40,7 @@ module App {
 }
 
 import Mod = App;
->Mod : Mod
+>Mod : typeof App
 >App : typeof App
 
 export = Mod;
diff --git a/tests/baselines/reference/import_reference-to-type-alias.types b/tests/baselines/reference/import_reference-to-type-alias.types
index 652a3d6df52..e1da40b5bb4 100644
--- a/tests/baselines/reference/import_reference-to-type-alias.types
+++ b/tests/baselines/reference/import_reference-to-type-alias.types
@@ -1,9 +1,9 @@
 === tests/cases/compiler/file2.ts ===
 import appJs = require("file1");
->appJs : appJs
+>appJs : typeof appJs
 
 import Services = appJs.App.Services;
->Services : Services
+>Services : typeof Services
 >appJs : typeof appJs
 >App : typeof appJs.App
 >Services : typeof Services
@@ -20,10 +20,10 @@ var x = new Services.UserServices().getUserName();
 
 === tests/cases/compiler/file1.ts ===
 export module App {
->App : App
+>App : typeof App
 
     export module Services {
->Services : Services
+>Services : typeof Services
 
         export class UserServices {
 >UserServices : UserServices
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 56245e04b67..0dfe8ca336b 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
@@ -1,7 +1,7 @@
 === tests/cases/compiler/a.ts ===
 /// <reference path="b.ts" />
 import ITest = require('ITest');
->ITest : ITest
+>ITest : unknown
 
 var testData: ITest[];
 >testData : ITest[]
diff --git a/tests/baselines/reference/import_var-referencing-an-imported-module-alias.types b/tests/baselines/reference/import_var-referencing-an-imported-module-alias.types
index 3748937c818..137b339347a 100644
--- a/tests/baselines/reference/import_var-referencing-an-imported-module-alias.types
+++ b/tests/baselines/reference/import_var-referencing-an-imported-module-alias.types
@@ -1,7 +1,7 @@
 === tests/cases/compiler/consumer.ts ===
 
 import host = require("host");
->host : host
+>host : typeof host
 
 var hostVar = host;
 >hostVar : typeof host
diff --git a/tests/baselines/reference/importedModuleClassNameClash.types b/tests/baselines/reference/importedModuleClassNameClash.types
index b241828af8f..28cdee34167 100644
--- a/tests/baselines/reference/importedModuleClassNameClash.types
+++ b/tests/baselines/reference/importedModuleClassNameClash.types
@@ -1,10 +1,10 @@
 === tests/cases/compiler/importedModuleClassNameClash.ts ===
 import foo = m1;
->foo : foo
->m1 : foo
+>foo : typeof foo
+>m1 : unknown
  
 export module m1 { }
->m1 : foo
+>m1 : unknown
  
 class foo { }
 >foo : foo
diff --git a/tests/baselines/reference/incrementOperatorWithAnyOtherType.types b/tests/baselines/reference/incrementOperatorWithAnyOtherType.types
index c62414c40bf..3d43764943a 100644
--- a/tests/baselines/reference/incrementOperatorWithAnyOtherType.types
+++ b/tests/baselines/reference/incrementOperatorWithAnyOtherType.types
@@ -24,7 +24,7 @@ class A {
 >a : any
 }
 module M {
->M : M
+>M : typeof M
 
     export var n: any;
 >n : any
diff --git a/tests/baselines/reference/incrementOperatorWithNumberType.types b/tests/baselines/reference/incrementOperatorWithNumberType.types
index 4e6c6310902..ad6ea172ae3 100644
--- a/tests/baselines/reference/incrementOperatorWithNumberType.types
+++ b/tests/baselines/reference/incrementOperatorWithNumberType.types
@@ -14,7 +14,7 @@ class A {
 >a : number
 }
 module M {
->M : M
+>M : typeof M
 
     export var n: number;
 >n : number
diff --git a/tests/baselines/reference/indexIntoEnum.types b/tests/baselines/reference/indexIntoEnum.types
index 658482cd07c..39849566409 100644
--- a/tests/baselines/reference/indexIntoEnum.types
+++ b/tests/baselines/reference/indexIntoEnum.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/indexIntoEnum.ts ===
 module M {
->M : M
+>M : typeof M
 
     enum E { }
 >E : E
diff --git a/tests/baselines/reference/inheritanceOfGenericConstructorMethod2.types b/tests/baselines/reference/inheritanceOfGenericConstructorMethod2.types
index 5e8958f7393..2a71136613f 100644
--- a/tests/baselines/reference/inheritanceOfGenericConstructorMethod2.types
+++ b/tests/baselines/reference/inheritanceOfGenericConstructorMethod2.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/inheritanceOfGenericConstructorMethod2.ts ===
 module M {
->M : M
+>M : typeof M
 
    export class C1 { }
 >C1 : C1
@@ -10,17 +10,17 @@ module M {
 >T : T
 }
 module N {
->N : N
+>N : typeof N
 
    export class D1 extends M.C1 { }
 >D1 : D1
->M : M
+>M : unknown
 >C1 : M.C1
 
    export class D2<T> extends M.C2<T> { }
 >D2 : D2<T>
 >T : T
->M : M
+>M : unknown
 >C2 : M.C2<T>
 >T : T
 }
diff --git a/tests/baselines/reference/innerAliases2.types b/tests/baselines/reference/innerAliases2.types
index 86cf4296b3e..e7508d46ba9 100644
--- a/tests/baselines/reference/innerAliases2.types
+++ b/tests/baselines/reference/innerAliases2.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/innerAliases2.ts ===
 module _provider {
->_provider : _provider
+>_provider : typeof _provider
 
                 export class UsefulClass {
 >UsefulClass : UsefulClass
@@ -12,25 +12,25 @@ module _provider {
 }
 
 module consumer {
->consumer : consumer
+>consumer : typeof consumer
 
                 import provider = _provider;
->provider : provider
+>provider : typeof provider
 >_provider : typeof provider
                 
                 var g:provider.UsefulClass= null;
 >g : provider.UsefulClass
->provider : provider
+>provider : unknown
 >UsefulClass : provider.UsefulClass
                 
                 function use():provider.UsefulClass { 
 >use : typeof use
->provider : provider
+>provider : unknown
 >UsefulClass : provider.UsefulClass
 
                                 var p2:provider.UsefulClass= new provider.UsefulClass();
 >p2 : provider.UsefulClass
->provider : provider
+>provider : unknown
 >UsefulClass : provider.UsefulClass
 >new provider.UsefulClass() : provider.UsefulClass
 >provider.UsefulClass : typeof provider.UsefulClass
diff --git a/tests/baselines/reference/innerBoundLambdaEmit.types b/tests/baselines/reference/innerBoundLambdaEmit.types
index 1497e33c455..94ad46b500e 100644
--- a/tests/baselines/reference/innerBoundLambdaEmit.types
+++ b/tests/baselines/reference/innerBoundLambdaEmit.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/innerBoundLambdaEmit.ts ===
 module M {
->M : M
+>M : typeof M
 
     export class Foo {
 >Foo : Foo
@@ -15,7 +15,7 @@ interface Array<T> {
 
     toFoo(): M.Foo
 >toFoo : () => M.Foo
->M : M
+>M : unknown
 >Foo : M.Foo
 }
 
diff --git a/tests/baselines/reference/innerExtern.types b/tests/baselines/reference/innerExtern.types
index abea317578a..17ef88427b3 100644
--- a/tests/baselines/reference/innerExtern.types
+++ b/tests/baselines/reference/innerExtern.types
@@ -1,15 +1,15 @@
 === tests/cases/compiler/innerExtern.ts ===
 module A {
->A : A
+>A : typeof A
 
     export declare module BB {
->BB : BB
+>BB : typeof BB
 
         export var Elephant;
 >Elephant : any
     }
     export module B {
->B : B
+>B : typeof B
 
         export class C {
 >C : C
diff --git a/tests/baselines/reference/innerFunc.types b/tests/baselines/reference/innerFunc.types
index 5bbbadfb50a..7725f0c2928 100644
--- a/tests/baselines/reference/innerFunc.types
+++ b/tests/baselines/reference/innerFunc.types
@@ -11,7 +11,7 @@ function salt() {
 }
 
 module M {
->M : M
+>M : typeof M
 
     export function tungsten() {
 >tungsten : typeof tungsten
diff --git a/tests/baselines/reference/instanceOfInExternalModules.types b/tests/baselines/reference/instanceOfInExternalModules.types
index dff7b61f71e..f0c85b2a4db 100644
--- a/tests/baselines/reference/instanceOfInExternalModules.types
+++ b/tests/baselines/reference/instanceOfInExternalModules.types
@@ -1,7 +1,7 @@
 === tests/cases/compiler/instanceOfInExternalModules_1.ts ===
 ///<reference path='instanceOfInExternalModules_require.ts'/>
 import Bar = require("instanceOfInExternalModules_require");
->Bar : Bar
+>Bar : typeof Bar
 
 function IsFoo(value: any): boolean {
 >IsFoo : typeof IsFoo
diff --git a/tests/baselines/reference/instantiatedModule.types b/tests/baselines/reference/instantiatedModule.types
index 9e16f145c46..b3f4dc0d5a1 100644
--- a/tests/baselines/reference/instantiatedModule.types
+++ b/tests/baselines/reference/instantiatedModule.types
@@ -2,7 +2,7 @@
 // adding the var makes this an instantiated module
 
 module M {
->M : M
+>M : typeof M
 
     export interface Point { x: number; y: number }
 >Point : Point
@@ -44,13 +44,13 @@ var p1: { x: number; y: number; }
 
 var p1: M.Point;
 >p1 : { x: number; y: number; }
->M : M
+>M : unknown
 >Point : M.Point
 
 // making the point a class instead of an interface 
 // makes this an instantiated mmodule
 module M2 {
->M2 : M2
+>M2 : typeof M2
 
     export class Point {
 >Point : Point
@@ -101,7 +101,7 @@ var a2 = M2.Point;
 
 var o: M2.Point = a2.Origin();
 >o : M2.Point
->M2 : M2
+>M2 : unknown
 >Point : M2.Point
 >a2.Origin() : M2.Point
 >a2.Origin : () => M2.Point
@@ -115,7 +115,7 @@ var p2: { x: number; y: number }
 
 var p2: M2.Point;
 >p2 : { x: number; y: number; }
->M2 : M2
+>M2 : unknown
 >Point : M2.Point
 
 var p2 = new m2.Point();
@@ -133,7 +133,7 @@ var p2 = new M2.Point();
 >Point : typeof M2.Point
 
 module M3 {
->M3 : M3
+>M3 : typeof M3
 
     export enum Color { Blue, Red }
 >Color : Color
@@ -168,7 +168,7 @@ var a3 = M3.Color;
 
 var blue: M3.Color = a3.Blue;
 >blue : M3.Color
->M3 : M3
+>M3 : unknown
 >Color : M3.Color
 >a3.Blue : M3.Color
 >a3 : typeof M3.Color
@@ -176,7 +176,7 @@ var blue: M3.Color = a3.Blue;
 
 var p3: M3.Color;
 >p3 : M3.Color
->M3 : M3
+>M3 : unknown
 >Color : M3.Color
 
 var p3 = M3.Color.Red;
diff --git a/tests/baselines/reference/interMixingModulesInterfaces0.types b/tests/baselines/reference/interMixingModulesInterfaces0.types
index 730496b9558..8b6ace37a2b 100644
--- a/tests/baselines/reference/interMixingModulesInterfaces0.types
+++ b/tests/baselines/reference/interMixingModulesInterfaces0.types
@@ -1,9 +1,9 @@
 === tests/cases/compiler/interMixingModulesInterfaces0.ts ===
 module A {
->A : A
+>A : typeof A
 
     export module B {
->B : B
+>B : typeof B
 
         export function createB(): B {
 >createB : typeof createB
@@ -26,7 +26,7 @@ module A {
 
 var x: A.B = A.B.createB();
 >x : A.B
->A : A
+>A : unknown
 >B : A.B
 >A.B.createB() : A.B
 >A.B.createB : typeof A.B.createB
diff --git a/tests/baselines/reference/interMixingModulesInterfaces1.types b/tests/baselines/reference/interMixingModulesInterfaces1.types
index 2c059905757..9df1c8fe069 100644
--- a/tests/baselines/reference/interMixingModulesInterfaces1.types
+++ b/tests/baselines/reference/interMixingModulesInterfaces1.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/interMixingModulesInterfaces1.ts ===
 module A {
->A : A
+>A : typeof A
 
     export interface B {
 >B : B
@@ -13,7 +13,7 @@ module A {
     }
 
     export module B {
->B : B
+>B : typeof B
 
         export function createB(): B {
 >createB : typeof createB
@@ -26,7 +26,7 @@ module A {
 
 var x: A.B = A.B.createB();
 >x : A.B
->A : A
+>A : unknown
 >B : A.B
 >A.B.createB() : A.B
 >A.B.createB : typeof A.B.createB
diff --git a/tests/baselines/reference/interMixingModulesInterfaces2.types b/tests/baselines/reference/interMixingModulesInterfaces2.types
index 56c0fd67bfa..1d8af83003f 100644
--- a/tests/baselines/reference/interMixingModulesInterfaces2.types
+++ b/tests/baselines/reference/interMixingModulesInterfaces2.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/interMixingModulesInterfaces2.ts ===
 module A {
->A : A
+>A : typeof A
 
     export interface B {
 >B : B
@@ -13,7 +13,7 @@ module A {
     }
 
     module B {
->B : B
+>B : typeof B
 
         export function createB(): B {
 >createB : typeof createB
@@ -26,6 +26,6 @@ module A {
 
 var x: A.B = null;
 >x : A.B
->A : A
+>A : unknown
 >B : A.B
 
diff --git a/tests/baselines/reference/interMixingModulesInterfaces3.types b/tests/baselines/reference/interMixingModulesInterfaces3.types
index 3303dd426a0..acb09eb1a7a 100644
--- a/tests/baselines/reference/interMixingModulesInterfaces3.types
+++ b/tests/baselines/reference/interMixingModulesInterfaces3.types
@@ -1,9 +1,9 @@
 === tests/cases/compiler/interMixingModulesInterfaces3.ts ===
 module A {
->A : A
+>A : typeof A
 
     module B {
->B : B
+>B : typeof B
 
         export function createB(): B {
 >createB : typeof createB
@@ -26,6 +26,6 @@ module A {
 
 var x: A.B = null;
 >x : A.B
->A : A
+>A : unknown
 >B : A.B
 
diff --git a/tests/baselines/reference/interMixingModulesInterfaces4.types b/tests/baselines/reference/interMixingModulesInterfaces4.types
index 5936efce591..9eb9905a1d2 100644
--- a/tests/baselines/reference/interMixingModulesInterfaces4.types
+++ b/tests/baselines/reference/interMixingModulesInterfaces4.types
@@ -1,9 +1,9 @@
 === tests/cases/compiler/interMixingModulesInterfaces4.ts ===
 module A {
->A : A
+>A : typeof A
 
     export module B {
->B : A.B
+>B : typeof B
 
         export function createB(): number {
 >createB : typeof createB
diff --git a/tests/baselines/reference/interMixingModulesInterfaces5.types b/tests/baselines/reference/interMixingModulesInterfaces5.types
index 3045475e871..c90a4236dbb 100644
--- a/tests/baselines/reference/interMixingModulesInterfaces5.types
+++ b/tests/baselines/reference/interMixingModulesInterfaces5.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/interMixingModulesInterfaces5.ts ===
 module A {
->A : A
+>A : typeof A
 
     interface B {
 >B : B
@@ -13,7 +13,7 @@ module A {
     }
 
     export module B {
->B : A.B
+>B : typeof B
 
         export function createB(): number {
 >createB : typeof createB
diff --git a/tests/baselines/reference/interfaceInReopenedModule.types b/tests/baselines/reference/interfaceInReopenedModule.types
index f2bd7a43d7f..e0ed40b186e 100644
--- a/tests/baselines/reference/interfaceInReopenedModule.types
+++ b/tests/baselines/reference/interfaceInReopenedModule.types
@@ -1,11 +1,11 @@
 === tests/cases/compiler/interfaceInReopenedModule.ts ===
 module m {
->m : m
+>m : typeof m
 }
 
 // In second instance of same module, exported interface is not visible
 module m {
->m : m
+>m : typeof m
 
     interface f {}
 >f : f
diff --git a/tests/baselines/reference/interfaceWithPropertyOfEveryType.types b/tests/baselines/reference/interfaceWithPropertyOfEveryType.types
index e78a3c951e0..94401aabc84 100644
--- a/tests/baselines/reference/interfaceWithPropertyOfEveryType.types
+++ b/tests/baselines/reference/interfaceWithPropertyOfEveryType.types
@@ -7,7 +7,7 @@ function f1() { }
 >f1 : typeof f1
 
 module M {
->M : M
+>M : typeof M
 
     export var y = 1;
 >y : number
diff --git a/tests/baselines/reference/internalAliasClass.types b/tests/baselines/reference/internalAliasClass.types
index 14691f11a13..8531714b5e8 100644
--- a/tests/baselines/reference/internalAliasClass.types
+++ b/tests/baselines/reference/internalAliasClass.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/internalAliasClass.ts ===
 module a {
->a : a
+>a : typeof a
 
     export class c {
 >c : c
@@ -8,10 +8,10 @@ module a {
 }
 
 module c {
->c : c
+>c : typeof c
 
     import b = a.c;
->b : b
+>b : typeof b
 >a : typeof a
 >c : b
 
diff --git a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.types b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.types
index 279c33e9246..3f6f5845fda 100644
--- a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.types
+++ b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/internalAliasClassInsideLocalModuleWithExport.ts ===
 export module x {
->x : x
+>x : typeof x
 
     export class c {
 >c : c
@@ -16,13 +16,13 @@ export module x {
 }
 
 export module m2 {
->m2 : m2
+>m2 : typeof m2
 
     export module m3 {
->m3 : m3
+>m3 : typeof m3
 
         export import c = x.c;
->c : c
+>c : typeof c
 >x : typeof x
 >c : c
 
diff --git a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExport.types b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExport.types
index 8e365742243..4f916d5689c 100644
--- a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExport.types
+++ b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExport.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/internalAliasClassInsideLocalModuleWithoutExport.ts ===
 export module x {
->x : x
+>x : typeof x
 
     export class c {
 >c : c
@@ -16,13 +16,13 @@ export module x {
 }
 
 export module m2 {
->m2 : m2
+>m2 : typeof m2
 
     export module m3 {
->m3 : m3
+>m3 : typeof m3
 
         import c = x.c;
->c : c
+>c : typeof c
 >x : typeof x
 >c : c
 
diff --git a/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithExport.types b/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithExport.types
index b9b877c7c69..6a25f03c2e9 100644
--- a/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithExport.types
+++ b/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithExport.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/internalAliasClassInsideTopLevelModuleWithExport.ts ===
 export module x {
->x : x
+>x : typeof x
 
     export class c {
 >c : c
@@ -16,7 +16,7 @@ export module x {
 }
 
 export import xc = x.c;
->xc : xc
+>xc : typeof xc
 >x : typeof x
 >c : xc
 
diff --git a/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.types b/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.types
index ed69c672435..4e086f86054 100644
--- a/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.types
+++ b/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/internalAliasClassInsideTopLevelModuleWithoutExport.ts ===
 export module x {
->x : x
+>x : typeof x
 
     export class c {
 >c : c
@@ -16,7 +16,7 @@ export module x {
 }
 
 import xc = x.c;
->xc : xc
+>xc : typeof xc
 >x : typeof x
 >c : xc
 
diff --git a/tests/baselines/reference/internalAliasEnum.types b/tests/baselines/reference/internalAliasEnum.types
index 188209d192e..87cab6cc56d 100644
--- a/tests/baselines/reference/internalAliasEnum.types
+++ b/tests/baselines/reference/internalAliasEnum.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/internalAliasEnum.ts ===
 module a {
->a : a
+>a : typeof a
 
     export enum weekend {
 >weekend : weekend
@@ -17,10 +17,10 @@ module a {
 }
 
 module c {
->c : c
+>c : typeof c
 
     import b = a.weekend;
->b : b
+>b : typeof b
 >a : typeof a
 >weekend : b
 
diff --git a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithExport.types b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithExport.types
index 1734d0d5500..0d09b930f95 100644
--- a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithExport.types
+++ b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithExport.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/internalAliasEnumInsideLocalModuleWithExport.ts ===
 export module a {
->a : a
+>a : typeof a
 
     export enum weekend {
 >weekend : weekend
@@ -17,10 +17,10 @@ export module a {
 }
 
 export module c {
->c : c
+>c : typeof c
 
     export import b = a.weekend;
->b : b
+>b : typeof b
 >a : typeof a
 >weekend : b
 
diff --git a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExport.types b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExport.types
index 1f035a49f61..881e51324af 100644
--- a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExport.types
+++ b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExport.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/internalAliasEnumInsideLocalModuleWithoutExport.ts ===
 export module a {
->a : a
+>a : typeof a
 
     export enum weekend {
 >weekend : weekend
@@ -17,10 +17,10 @@ export module a {
 }
 
 export module c {
->c : c
+>c : typeof c
 
     import b = a.weekend;
->b : b
+>b : typeof b
 >a : typeof a
 >weekend : b
 
diff --git a/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithExport.types b/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithExport.types
index 4fd83752517..8458d885738 100644
--- a/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithExport.types
+++ b/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithExport.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/internalAliasEnumInsideTopLevelModuleWithExport.ts ===
 export module a {
->a : a
+>a : typeof a
 
     export enum weekend {
 >weekend : weekend
@@ -17,7 +17,7 @@ export module a {
 }
 
 export import b = a.weekend;
->b : b
+>b : typeof b
 >a : typeof a
 >weekend : b
 
diff --git a/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithoutExport.types b/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithoutExport.types
index d6367961c9f..6e75bd81bdf 100644
--- a/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithoutExport.types
+++ b/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithoutExport.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/internalAliasEnumInsideTopLevelModuleWithoutExport.ts ===
 export module a {
->a : a
+>a : typeof a
 
     export enum weekend {
 >weekend : weekend
@@ -17,7 +17,7 @@ export module a {
 }
 
 import b = a.weekend;
->b : b
+>b : typeof b
 >a : typeof a
 >weekend : b
 
diff --git a/tests/baselines/reference/internalAliasFunction.types b/tests/baselines/reference/internalAliasFunction.types
index 69ce516d282..f0dc1619b24 100644
--- a/tests/baselines/reference/internalAliasFunction.types
+++ b/tests/baselines/reference/internalAliasFunction.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/internalAliasFunction.ts ===
 module a {
->a : a
+>a : typeof a
 
     export function foo(x: number) {
 >foo : typeof foo
@@ -12,10 +12,10 @@ module a {
 }
 
 module c {
->c : c
+>c : typeof c
 
     import b = a.foo;
->b : b
+>b : typeof b
 >a : typeof a
 >foo : typeof b
 
diff --git a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithExport.types b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithExport.types
index 887cd98009c..dd9637c8fdf 100644
--- a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithExport.types
+++ b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithExport.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/internalAliasFunctionInsideLocalModuleWithExport.ts ===
 export module a {
->a : a
+>a : typeof a
 
     export function foo(x: number) {
 >foo : typeof foo
@@ -12,10 +12,10 @@ export module a {
 }
 
 export module c {
->c : c
+>c : typeof c
 
     export import b = a.foo;
->b : b
+>b : typeof b
 >a : typeof a
 >foo : typeof b
 
diff --git a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExport.types b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExport.types
index 7ffbdccadd9..179025bffb3 100644
--- a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExport.types
+++ b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExport.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/internalAliasFunctionInsideLocalModuleWithoutExport.ts ===
 export module a {
->a : a
+>a : typeof a
 
     export function foo(x: number) {
 >foo : typeof foo
@@ -12,10 +12,10 @@ export module a {
 }
 
 export module c {
->c : c
+>c : typeof c
 
     import b = a.foo;
->b : b
+>b : typeof b
 >a : typeof a
 >foo : typeof b
 
diff --git a/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithExport.types b/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithExport.types
index a96c3d62e83..0db9210378d 100644
--- a/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithExport.types
+++ b/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithExport.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/internalAliasFunctionInsideTopLevelModuleWithExport.ts ===
 export module a {
->a : a
+>a : typeof a
 
     export function foo(x: number) {
 >foo : typeof foo
@@ -12,7 +12,7 @@ export module a {
 }
 
 export import b = a.foo;
->b : b
+>b : typeof b
 >a : typeof a
 >foo : typeof b
 
diff --git a/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithoutExport.types b/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithoutExport.types
index 3aed422ec50..316ff673449 100644
--- a/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithoutExport.types
+++ b/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithoutExport.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/internalAliasFunctionInsideTopLevelModuleWithoutExport.ts ===
 export module a {
->a : a
+>a : typeof a
 
     export function foo(x: number) {
 >foo : typeof foo
@@ -12,7 +12,7 @@ export module a {
 }
 
 import b = a.foo;
->b : b
+>b : typeof b
 >a : typeof a
 >foo : typeof b
 
diff --git a/tests/baselines/reference/internalAliasInitializedModule.types b/tests/baselines/reference/internalAliasInitializedModule.types
index 3f369631c29..dacc2f148bd 100644
--- a/tests/baselines/reference/internalAliasInitializedModule.types
+++ b/tests/baselines/reference/internalAliasInitializedModule.types
@@ -1,9 +1,9 @@
 === tests/cases/compiler/internalAliasInitializedModule.ts ===
 module a {
->a : a
+>a : typeof a
 
     export module b {
->b : b
+>b : typeof b
 
         export class c {
 >c : c
@@ -12,16 +12,16 @@ module a {
 }
 
 module c {
->c : c
+>c : typeof c
 
     import b = a.b;
->b : b
+>b : typeof b
 >a : typeof a
 >b : typeof b
 
     export var x: b.c = new b.c();
 >x : b.c
->b : b
+>b : unknown
 >c : b.c
 >new b.c() : b.c
 >b.c : typeof b.c
diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithExport.types b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithExport.types
index f1d72a8e28d..973003d2c49 100644
--- a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithExport.types
+++ b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithExport.types
@@ -1,9 +1,9 @@
 === tests/cases/compiler/internalAliasInitializedModuleInsideLocalModuleWithExport.ts ===
 export module a {
->a : a
+>a : typeof a
 
     export module b {
->b : b
+>b : typeof b
 
         export class c {
 >c : c
@@ -12,16 +12,16 @@ export module a {
 }
 
 export module c {
->c : c
+>c : typeof c
 
     export import b = a.b;
->b : b
+>b : typeof b
 >a : typeof a
 >b : typeof b
 
     export var x: b.c = new b.c();
 >x : b.c
->b : b
+>b : unknown
 >c : b.c
 >new b.c() : b.c
 >b.c : typeof b.c
diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExport.types b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExport.types
index 46096193461..540883209de 100644
--- a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExport.types
+++ b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExport.types
@@ -1,9 +1,9 @@
 === tests/cases/compiler/internalAliasInitializedModuleInsideLocalModuleWithoutExport.ts ===
 export module a {
->a : a
+>a : typeof a
 
     export module b {
->b : b
+>b : typeof b
 
         export class c {
 >c : c
@@ -12,16 +12,16 @@ export module a {
 }
 
 export module c {
->c : c
+>c : typeof c
 
     import b = a.b;
->b : b
+>b : typeof b
 >a : typeof a
 >b : typeof b
 
     export var x: b.c = new b.c();
 >x : b.c
->b : b
+>b : unknown
 >c : b.c
 >new b.c() : b.c
 >b.c : typeof b.c
diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithExport.types b/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithExport.types
index e4d41f6f25f..aa9944787d6 100644
--- a/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithExport.types
+++ b/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithExport.types
@@ -1,9 +1,9 @@
 === tests/cases/compiler/internalAliasInitializedModuleInsideTopLevelModuleWithExport.ts ===
 export module a {
->a : a
+>a : typeof a
 
     export module b {
->b : b
+>b : typeof b
 
         export class c {
 >c : c
@@ -12,13 +12,13 @@ export module a {
 }
 
 export import b = a.b;
->b : b
+>b : typeof b
 >a : typeof a
 >b : typeof b
 
 export var x: b.c = new b.c();
 >x : b.c
->b : b
+>b : unknown
 >c : b.c
 >new b.c() : b.c
 >b.c : typeof b.c
diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.types b/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.types
index 58ba5d2075a..e17fcdba2a7 100644
--- a/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.types
+++ b/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.types
@@ -1,9 +1,9 @@
 === tests/cases/compiler/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.ts ===
 export module a {
->a : a
+>a : typeof a
 
     export module b {
->b : b
+>b : typeof b
 
         export class c {
 >c : c
@@ -12,13 +12,13 @@ export module a {
 }
 
 import b = a.b;
->b : b
+>b : typeof b
 >a : typeof a
 >b : typeof b
 
 export var x: b.c = new b.c();
 >x : b.c
->b : b
+>b : unknown
 >c : b.c
 >new b.c() : b.c
 >b.c : typeof b.c
diff --git a/tests/baselines/reference/internalAliasInterface.types b/tests/baselines/reference/internalAliasInterface.types
index 36bce1328e4..310c568104d 100644
--- a/tests/baselines/reference/internalAliasInterface.types
+++ b/tests/baselines/reference/internalAliasInterface.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/internalAliasInterface.ts ===
 module a {
->a : a
+>a : unknown
 
     export interface I {
 >I : I
@@ -8,11 +8,11 @@ module a {
 }
 
 module c {
->c : c
+>c : typeof c
 
     import b = a.I;
->b : b
->a : a
+>b : unknown
+>a : unknown
 >I : b
 
     export var x: b;
diff --git a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithExport.types b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithExport.types
index c48b2209e2d..9667fd125d5 100644
--- a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithExport.types
+++ b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithExport.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/internalAliasInterfaceInsideLocalModuleWithExport.ts ===
 export module a {
->a : a
+>a : unknown
 
     export interface I {
 >I : I
@@ -8,11 +8,11 @@ export module a {
 }
 
 export module c {
->c : c
+>c : typeof c
 
     export import b = a.I;
->b : b
->a : a
+>b : unknown
+>a : unknown
 >I : b
 
     export var x: b;
diff --git a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExport.types b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExport.types
index a28fb025080..2f9368bc6a9 100644
--- a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExport.types
+++ b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExport.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/internalAliasInterfaceInsideLocalModuleWithoutExport.ts ===
 export module a {
->a : a
+>a : unknown
 
     export interface I {
 >I : I
@@ -8,11 +8,11 @@ export module a {
 }
 
 export module c {
->c : c
+>c : typeof c
 
     import b = a.I;
->b : b
->a : a
+>b : unknown
+>a : unknown
 >I : b
 
     export var x: b;
diff --git a/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithExport.types b/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithExport.types
index b812a1953af..9197d1e0215 100644
--- a/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithExport.types
+++ b/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithExport.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/internalAliasInterfaceInsideTopLevelModuleWithExport.ts ===
 export module a {
->a : a
+>a : unknown
 
     export interface I {
 >I : I
@@ -8,8 +8,8 @@ export module a {
 }
 
 export import b = a.I;
->b : b
->a : a
+>b : unknown
+>a : unknown
 >I : b
 
 export var x: b;
diff --git a/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithoutExport.types b/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithoutExport.types
index b77b84865cf..58be03b6a3c 100644
--- a/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithoutExport.types
+++ b/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithoutExport.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/internalAliasInterfaceInsideTopLevelModuleWithoutExport.ts ===
 export module a {
->a : a
+>a : unknown
 
     export interface I {
 >I : I
@@ -8,8 +8,8 @@ export module a {
 }
 
 import b = a.I;
->b : b
->a : a
+>b : unknown
+>a : unknown
 >I : b
 
 export var x: b;
diff --git a/tests/baselines/reference/internalAliasUninitializedModule.types b/tests/baselines/reference/internalAliasUninitializedModule.types
index c9bc66ed0d1..408a2467e03 100644
--- a/tests/baselines/reference/internalAliasUninitializedModule.types
+++ b/tests/baselines/reference/internalAliasUninitializedModule.types
@@ -1,9 +1,9 @@
 === tests/cases/compiler/internalAliasUninitializedModule.ts ===
 module a {
->a : a
+>a : unknown
 
     export module b {
->b : b
+>b : unknown
 
         export interface I {
 >I : I
@@ -15,16 +15,16 @@ module a {
 }
 
 module c {
->c : c
+>c : typeof c
 
     import b = a.b;
->b : b
->a : a
->b : b
+>b : unknown
+>a : unknown
+>b : unknown
 
     export var x: b.I;
 >x : b.I
->b : b
+>b : unknown
 >I : b.I
 
     x.foo();
diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithExport.types b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithExport.types
index bdfd7990120..f7bbc68dac0 100644
--- a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithExport.types
+++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithExport.types
@@ -1,9 +1,9 @@
 === tests/cases/compiler/internalAliasUninitializedModuleInsideLocalModuleWithExport.ts ===
 export module a {
->a : a
+>a : unknown
 
     export module b {
->b : b
+>b : unknown
 
         export interface I {
 >I : I
@@ -15,16 +15,16 @@ export module a {
 }
 
 export module c {
->c : c
+>c : typeof c
 
     export import b = a.b;
->b : b
->a : a
->b : b
+>b : unknown
+>a : unknown
+>b : unknown
 
     export var x: b.I;
 >x : b.I
->b : b
+>b : unknown
 >I : b.I
 
     x.foo();
diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.types b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.types
index f2def5d9b6c..cf9a85a712f 100644
--- a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.types
+++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.types
@@ -1,9 +1,9 @@
 === tests/cases/compiler/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.ts ===
 export module a {
->a : a
+>a : unknown
 
     export module b {
->b : b
+>b : unknown
 
         export interface I {
 >I : I
@@ -15,16 +15,16 @@ export module a {
 }
 
 export module c {
->c : c
+>c : typeof c
 
     import b = a.b;
->b : b
->a : a
->b : b
+>b : unknown
+>a : unknown
+>b : unknown
 
     export var x: b.I;
 >x : b.I
->b : b
+>b : unknown
 >I : b.I
 
     x.foo();
diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.types b/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.types
index 56976f32128..015ec48fe6a 100644
--- a/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.types
+++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.types
@@ -1,9 +1,9 @@
 === tests/cases/compiler/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.ts ===
 export module a {
->a : a
+>a : unknown
 
     export module b {
->b : b
+>b : unknown
 
         export interface I {
 >I : I
@@ -15,13 +15,13 @@ export module a {
 }
 
 export import b = a.b;
->b : b
->a : a
->b : b
+>b : unknown
+>a : unknown
+>b : unknown
 
 export var x: b.I;
 >x : b.I
->b : b
+>b : unknown
 >I : b.I
 
 x.foo();
diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.types b/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.types
index 6bd3119ec08..71a2f535816 100644
--- a/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.types
+++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.types
@@ -1,9 +1,9 @@
 === tests/cases/compiler/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.ts ===
 export module a {
->a : a
+>a : unknown
 
     export module b {
->b : b
+>b : unknown
 
         export interface I {
 >I : I
@@ -15,13 +15,13 @@ export module a {
 }
 
 import b = a.b;
->b : b
->a : a
->b : b
+>b : unknown
+>a : unknown
+>b : unknown
 
 export var x: b.I;
 >x : b.I
->b : b
+>b : unknown
 >I : b.I
 
 x.foo();
diff --git a/tests/baselines/reference/internalAliasVar.types b/tests/baselines/reference/internalAliasVar.types
index 593ae4f031d..d284b064d83 100644
--- a/tests/baselines/reference/internalAliasVar.types
+++ b/tests/baselines/reference/internalAliasVar.types
@@ -1,16 +1,16 @@
 === tests/cases/compiler/internalAliasVar.ts ===
 module a {
->a : a
+>a : typeof a
 
     export var x = 10;
 >x : number
 }
 
 module c {
->c : c
+>c : typeof c
 
     import b = a.x;
->b : b
+>b : number
 >a : typeof a
 >x : number
 
diff --git a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithExport.types b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithExport.types
index 6a299d1a1e9..b8d94c9ebbd 100644
--- a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithExport.types
+++ b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithExport.types
@@ -1,16 +1,16 @@
 === tests/cases/compiler/internalAliasVarInsideLocalModuleWithExport.ts ===
 export module a {
->a : a
+>a : typeof a
 
     export var x = 10;
 >x : number
 }
 
 export module c {
->c : c
+>c : typeof c
 
     export import b = a.x;
->b : b
+>b : number
 >a : typeof a
 >x : number
 
diff --git a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExport.types b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExport.types
index 9c203cc70c9..c9e2897befb 100644
--- a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExport.types
+++ b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExport.types
@@ -1,16 +1,16 @@
 === tests/cases/compiler/internalAliasVarInsideLocalModuleWithoutExport.ts ===
 export module a {
->a : a
+>a : typeof a
 
     export var x = 10;
 >x : number
 }
 
 export module c {
->c : c
+>c : typeof c
 
     import b = a.x;
->b : b
+>b : number
 >a : typeof a
 >x : number
 
diff --git a/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithExport.types b/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithExport.types
index be70702c46a..22335c7d8c0 100644
--- a/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithExport.types
+++ b/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithExport.types
@@ -1,13 +1,13 @@
 === tests/cases/compiler/internalAliasVarInsideTopLevelModuleWithExport.ts ===
 export module a {
->a : a
+>a : typeof a
 
     export var x = 10;
 >x : number
 }
 
 export import b = a.x;
->b : b
+>b : number
 >a : typeof a
 >x : number
 
diff --git a/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithoutExport.types b/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithoutExport.types
index 7135786ced5..1474735c62d 100644
--- a/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithoutExport.types
+++ b/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithoutExport.types
@@ -1,13 +1,13 @@
 === tests/cases/compiler/internalAliasVarInsideTopLevelModuleWithoutExport.ts ===
 export module a {
->a : a
+>a : typeof a
 
     export var x = 10;
 >x : number
 }
 
 import b = a.x;
->b : b
+>b : number
 >a : typeof a
 >x : number
 
diff --git a/tests/baselines/reference/internalAliasWithDottedNameEmit.types b/tests/baselines/reference/internalAliasWithDottedNameEmit.types
index a2807a27f66..2b66ec9541b 100644
--- a/tests/baselines/reference/internalAliasWithDottedNameEmit.types
+++ b/tests/baselines/reference/internalAliasWithDottedNameEmit.types
@@ -1,19 +1,19 @@
 === tests/cases/compiler/internalAliasWithDottedNameEmit.ts ===
 module a.b.c {
->a : a
->b : b
->c : c
+>a : typeof a
+>b : typeof b
+>c : typeof c
 
       export var d;
 >d : any
 }
 module a.e.f {
->a : a
->e : e
->f : f
+>a : typeof a
+>e : unknown
+>f : unknown
 
       import g = b.c;
->g : g
+>g : typeof g
 >b : typeof b
 >c : typeof g
 }
diff --git a/tests/baselines/reference/internalImportInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.types b/tests/baselines/reference/internalImportInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.types
index b01c11b0d6f..3ec8770f17c 100644
--- a/tests/baselines/reference/internalImportInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.types
+++ b/tests/baselines/reference/internalImportInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.types
@@ -6,7 +6,7 @@ class A {
 >aProp : string
 }
 module A {
->A : A
+>A : typeof A
 
     export interface X { s: string }
 >X : X
@@ -17,10 +17,10 @@ module A {
 }
 
 module B {
->B : B
+>B : unknown
 
     import Y = A;
->Y : Y
+>Y : typeof Y
 >A : Y
 }
 
diff --git a/tests/baselines/reference/internalImportUnInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.types b/tests/baselines/reference/internalImportUnInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.types
index 74d672de4e4..c07fc1c4955 100644
--- a/tests/baselines/reference/internalImportUnInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.types
+++ b/tests/baselines/reference/internalImportUnInstantiatedModuleMergedWithClassNotReferencingInstanceNoConflict.types
@@ -6,7 +6,7 @@ class A {
 >aProp : string
 }
 module A {
->A : A
+>A : typeof A
 
     export interface X { s: string }
 >X : X
@@ -14,10 +14,10 @@ module A {
 }
 
 module B {
->B : B
+>B : unknown
 
     import Y = A;
->Y : Y
+>Y : typeof Y
 >A : Y
 }
 
diff --git a/tests/baselines/reference/internalImportUnInstantiatedModuleNotReferencingInstanceNoConflict.types b/tests/baselines/reference/internalImportUnInstantiatedModuleNotReferencingInstanceNoConflict.types
index 3774e64b727..0bff332846a 100644
--- a/tests/baselines/reference/internalImportUnInstantiatedModuleNotReferencingInstanceNoConflict.types
+++ b/tests/baselines/reference/internalImportUnInstantiatedModuleNotReferencingInstanceNoConflict.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/internalImportUnInstantiatedModuleNotReferencingInstanceNoConflict.ts ===
 module A {
->A : A
+>A : unknown
 
     export interface X { s: string }
 >X : X
@@ -8,13 +8,13 @@ module A {
 }
 
 module B {
->B : B
+>B : typeof B
 
     var A = 1;
 >A : number
 
     import Y = A;
->Y : Y
->A : Y
+>Y : unknown
+>A : unknown
 }
 
diff --git a/tests/baselines/reference/invalidUndefinedValues.types b/tests/baselines/reference/invalidUndefinedValues.types
index 62b381676b9..3824498d216 100644
--- a/tests/baselines/reference/invalidUndefinedValues.types
+++ b/tests/baselines/reference/invalidUndefinedValues.types
@@ -59,7 +59,7 @@ x = c;
 >c : I
 
 module M { export var x = 1; }
->M : M
+>M : typeof M
 >x : number
 
 x = M;
diff --git a/tests/baselines/reference/ipromise2.types b/tests/baselines/reference/ipromise2.types
index 5d499aa9c3d..72c7b44f146 100644
--- a/tests/baselines/reference/ipromise2.types
+++ b/tests/baselines/reference/ipromise2.types
@@ -1,7 +1,7 @@
 === tests/cases/compiler/ipromise2.ts ===
 declare module Windows.Foundation {
->Windows : Windows
->Foundation : Foundation
+>Windows : unknown
+>Foundation : unknown
 
     export interface IPromise<T> {
 >IPromise : IPromise<T>
@@ -21,8 +21,8 @@ declare module Windows.Foundation {
 >U : U
 >progress : (progress: any) => void
 >progress : any
->Windows : Windows
->Foundation : Foundation
+>Windows : unknown
+>Foundation : unknown
 >IPromise : IPromise<T>
 >U : U
 
@@ -39,8 +39,8 @@ declare module Windows.Foundation {
 >U : U
 >progress : (progress: any) => void
 >progress : any
->Windows : Windows
->Foundation : Foundation
+>Windows : unknown
+>Foundation : unknown
 >IPromise : IPromise<T>
 >U : U
 
@@ -57,8 +57,8 @@ declare module Windows.Foundation {
 >U : U
 >progress : (progress: any) => void
 >progress : any
->Windows : Windows
->Foundation : Foundation
+>Windows : unknown
+>Foundation : unknown
 >IPromise : IPromise<T>
 >U : U
 
@@ -74,8 +74,8 @@ declare module Windows.Foundation {
 >U : U
 >progress : (progress: any) => void
 >progress : any
->Windows : Windows
->Foundation : Foundation
+>Windows : unknown
+>Foundation : unknown
 >IPromise : IPromise<T>
 >U : U
 
@@ -98,8 +98,8 @@ declare module Windows.Foundation {
 
 var p: Windows.Foundation.IPromise<string>;
 >p : Windows.Foundation.IPromise<string>
->Windows : Windows
->Foundation : Windows.Foundation
+>Windows : unknown
+>Foundation : unknown
 >IPromise : Windows.Foundation.IPromise<T>
 
 var p2 = p.then(function (s) {
diff --git a/tests/baselines/reference/ipromise4.types b/tests/baselines/reference/ipromise4.types
index 503a457f969..0ae6c35f1fd 100644
--- a/tests/baselines/reference/ipromise4.types
+++ b/tests/baselines/reference/ipromise4.types
@@ -1,7 +1,7 @@
 === tests/cases/compiler/ipromise4.ts ===
 declare module Windows.Foundation {
->Windows : Windows
->Foundation : Foundation
+>Windows : unknown
+>Foundation : unknown
 
     export interface IPromise<T> {
 >IPromise : IPromise<T>
@@ -21,8 +21,8 @@ declare module Windows.Foundation {
 >U : U
 >progress : (progress: any) => void
 >progress : any
->Windows : Windows
->Foundation : Foundation
+>Windows : unknown
+>Foundation : unknown
 >IPromise : IPromise<T>
 >U : U
 
@@ -39,8 +39,8 @@ declare module Windows.Foundation {
 >U : U
 >progress : (progress: any) => void
 >progress : any
->Windows : Windows
->Foundation : Foundation
+>Windows : unknown
+>Foundation : unknown
 >IPromise : IPromise<T>
 >U : U
 
@@ -57,8 +57,8 @@ declare module Windows.Foundation {
 >U : U
 >progress : (progress: any) => void
 >progress : any
->Windows : Windows
->Foundation : Foundation
+>Windows : unknown
+>Foundation : unknown
 >IPromise : IPromise<T>
 >U : U
 
@@ -74,8 +74,8 @@ declare module Windows.Foundation {
 >U : U
 >progress : (progress: any) => void
 >progress : any
->Windows : Windows
->Foundation : Foundation
+>Windows : unknown
+>Foundation : unknown
 >IPromise : IPromise<T>
 >U : U
 
@@ -94,8 +94,8 @@ declare module Windows.Foundation {
  
 var p: Windows.Foundation.IPromise<number> = null;
 >p : Windows.Foundation.IPromise<number>
->Windows : Windows
->Foundation : Windows.Foundation
+>Windows : unknown
+>Foundation : unknown
 >IPromise : Windows.Foundation.IPromise<T>
  
 p.then(function (x) { } ); // should not error
diff --git a/tests/baselines/reference/listFailure.types b/tests/baselines/reference/listFailure.types
index cdd736dd3bb..cd235e53986 100644
--- a/tests/baselines/reference/listFailure.types
+++ b/tests/baselines/reference/listFailure.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/listFailure.ts ===
 module Editor {
->Editor : Editor
+>Editor : typeof Editor
 
     export class Buffer {
 >Buffer : Buffer
diff --git a/tests/baselines/reference/localAliasExportAssignment.types b/tests/baselines/reference/localAliasExportAssignment.types
index 3785e62743d..5ea0d3085c1 100644
--- a/tests/baselines/reference/localAliasExportAssignment.types
+++ b/tests/baselines/reference/localAliasExportAssignment.types
@@ -1,7 +1,7 @@
 === tests/cases/compiler/localAliasExportAssignment_1.ts ===
 ///<reference path='localAliasExportAssignment_0.ts'/>
 import connect = require('localAliasExportAssignment_0');
->connect : connect
+>connect : () => any
 
 connect();
 >connect() : any
diff --git a/tests/baselines/reference/localImportNameVsGlobalName.types b/tests/baselines/reference/localImportNameVsGlobalName.types
index 75c1bee83ff..6b920a25fe7 100644
--- a/tests/baselines/reference/localImportNameVsGlobalName.types
+++ b/tests/baselines/reference/localImportNameVsGlobalName.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/localImportNameVsGlobalName.ts ===
 module Keyboard {
->Keyboard : Keyboard
+>Keyboard : typeof Keyboard
 
   export enum Key { UP, DOWN, LEFT, RIGHT }
 >Key : Key
@@ -11,10 +11,10 @@ module Keyboard {
 }
 
 module App {
->App : App
+>App : typeof App
 
   import Key = Keyboard.Key;
->Key : Key
+>Key : typeof Key
 >Keyboard : typeof Keyboard
 >Key : Key
 
diff --git a/tests/baselines/reference/logicalNotOperatorWithBooleanType.types b/tests/baselines/reference/logicalNotOperatorWithBooleanType.types
index c83a1d0f88d..031c986a9b2 100644
--- a/tests/baselines/reference/logicalNotOperatorWithBooleanType.types
+++ b/tests/baselines/reference/logicalNotOperatorWithBooleanType.types
@@ -16,7 +16,7 @@ class A {
 >foo : () => boolean
 }
 module M {
->M : M
+>M : typeof M
 
     export var n: boolean;
 >n : boolean
diff --git a/tests/baselines/reference/logicalNotOperatorWithNumberType.types b/tests/baselines/reference/logicalNotOperatorWithNumberType.types
index f833ead12f4..bfd710ef2ee 100644
--- a/tests/baselines/reference/logicalNotOperatorWithNumberType.types
+++ b/tests/baselines/reference/logicalNotOperatorWithNumberType.types
@@ -20,7 +20,7 @@ class A {
 >foo : () => number
 }
 module M {
->M : M
+>M : typeof M
 
     export var n: number;
 >n : number
diff --git a/tests/baselines/reference/logicalNotOperatorWithStringType.types b/tests/baselines/reference/logicalNotOperatorWithStringType.types
index b2e9e7d8159..6c154a1d62f 100644
--- a/tests/baselines/reference/logicalNotOperatorWithStringType.types
+++ b/tests/baselines/reference/logicalNotOperatorWithStringType.types
@@ -20,7 +20,7 @@ class A {
 >foo : () => string
 }
 module M {
->M : M
+>M : typeof M
 
     export var n: string;
 >n : string
diff --git a/tests/baselines/reference/memberAccessMustUseModuleInstances.types b/tests/baselines/reference/memberAccessMustUseModuleInstances.types
index c7a35557a38..4e95362f782 100644
--- a/tests/baselines/reference/memberAccessMustUseModuleInstances.types
+++ b/tests/baselines/reference/memberAccessMustUseModuleInstances.types
@@ -1,7 +1,7 @@
 === tests/cases/compiler/memberAccessMustUseModuleInstances_1.ts ===
 ///<reference path='memberAccessMustUseModuleInstances_0.ts'/>
 import WinJS = require('memberAccessMustUseModuleInstances_0');
->WinJS : WinJS
+>WinJS : typeof WinJS
 
 WinJS.Promise.timeout(10);
 >WinJS.Promise.timeout(10) : WinJS.Promise
diff --git a/tests/baselines/reference/mergeThreeInterfaces.types b/tests/baselines/reference/mergeThreeInterfaces.types
index d2f080a1b0b..4f4fba64358 100644
--- a/tests/baselines/reference/mergeThreeInterfaces.types
+++ b/tests/baselines/reference/mergeThreeInterfaces.types
@@ -97,7 +97,7 @@ var r6 = b.baz;
 
 // basic non-generic and generic case inside a module
 module M {
->M : M
+>M : typeof M
 
     interface A {
 >A : A
diff --git a/tests/baselines/reference/mergeThreeInterfaces2.types b/tests/baselines/reference/mergeThreeInterfaces2.types
index 89414c05dfb..31339187e3d 100644
--- a/tests/baselines/reference/mergeThreeInterfaces2.types
+++ b/tests/baselines/reference/mergeThreeInterfaces2.types
@@ -3,7 +3,7 @@
 
 // root module now multiple module declarations
 module M2 {
->M2 : M2
+>M2 : typeof M2
 
     export interface A {
 >A : A
@@ -30,7 +30,7 @@ module M2 {
 }
 
 module M2 {
->M2 : M2
+>M2 : typeof M2
 
     export interface A {
 >A : A
@@ -71,10 +71,10 @@ module M2 {
 
 // same as above but with an additional level of nesting and third module declaration
 module M2 {
->M2 : M2
+>M2 : typeof M2
 
     export module M3 {
->M3 : M3
+>M3 : typeof M3
 
         export interface A {
 >A : A
@@ -102,10 +102,10 @@ module M2 {
 }
 
 module M2 {
->M2 : M2
+>M2 : typeof M2
 
     export module M3 {
->M3 : M3
+>M3 : typeof M3
 
         export interface A {
 >A : A
@@ -139,10 +139,10 @@ module M2 {
 }
 
 module M2 {
->M2 : M2
+>M2 : typeof M2
 
     export module M3 {
->M3 : M3
+>M3 : typeof M3
 
         export interface A {
 >A : A
diff --git a/tests/baselines/reference/mergeTwoInterfaces.types b/tests/baselines/reference/mergeTwoInterfaces.types
index 49f70ffdd98..539f01d4240 100644
--- a/tests/baselines/reference/mergeTwoInterfaces.types
+++ b/tests/baselines/reference/mergeTwoInterfaces.types
@@ -72,7 +72,7 @@ var r4 = b.bar;
 
 // basic non-generic and generic case inside a module
 module M {
->M : M
+>M : typeof M
 
     interface A {
 >A : A
diff --git a/tests/baselines/reference/mergeTwoInterfaces2.types b/tests/baselines/reference/mergeTwoInterfaces2.types
index 06534f6c20c..f3908a6fe67 100644
--- a/tests/baselines/reference/mergeTwoInterfaces2.types
+++ b/tests/baselines/reference/mergeTwoInterfaces2.types
@@ -3,7 +3,7 @@
 
 // root module now multiple module declarations
 module M2 {
->M2 : M2
+>M2 : typeof M2
 
     export interface A {
 >A : A
@@ -30,7 +30,7 @@ module M2 {
 }
 
 module M2 {
->M2 : M2
+>M2 : typeof M2
 
     export interface A {
 >A : A
@@ -58,10 +58,10 @@ module M2 {
 
 // same as above but with an additional level of nesting
 module M2 {
->M2 : M2
+>M2 : typeof M2
 
     export module M3 {
->M3 : M3
+>M3 : typeof M3
 
         export interface A {
 >A : A
@@ -89,10 +89,10 @@ module M2 {
 }
 
 module M2 {
->M2 : M2
+>M2 : typeof M2
 
     export module M3 {
->M3 : M3
+>M3 : typeof M3
 
         export interface A {
 >A : A
diff --git a/tests/baselines/reference/mergedDeclarations1.types b/tests/baselines/reference/mergedDeclarations1.types
index 837d418e4c7..7e8eac5b875 100644
--- a/tests/baselines/reference/mergedDeclarations1.types
+++ b/tests/baselines/reference/mergedDeclarations1.types
@@ -22,7 +22,7 @@ function point(x: number, y: number): Point {
 >y : number
 }
 module point {
->point : point
+>point : typeof point
 
     export var origin = point(0, 0);
 >origin : Point
diff --git a/tests/baselines/reference/mergedDeclarations4.types b/tests/baselines/reference/mergedDeclarations4.types
index b07eb2cbc3f..068a08d35f5 100644
--- a/tests/baselines/reference/mergedDeclarations4.types
+++ b/tests/baselines/reference/mergedDeclarations4.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/mergedDeclarations4.ts ===
 module M {
->M : M
+>M : typeof M
 
     export function f() { }
 >f : typeof f
@@ -23,10 +23,10 @@ module M {
 }
  
 module M {
->M : M
+>M : typeof M
 
     export module f {
->f : f
+>f : typeof f
 
         export var hello = 1;
 >hello : number
diff --git a/tests/baselines/reference/mergedInterfacesWithMultipleBases.types b/tests/baselines/reference/mergedInterfacesWithMultipleBases.types
index a6b2fd56702..4fb955dab2e 100644
--- a/tests/baselines/reference/mergedInterfacesWithMultipleBases.types
+++ b/tests/baselines/reference/mergedInterfacesWithMultipleBases.types
@@ -61,7 +61,7 @@ var r = a.a;
 
 // generic interfaces in a module
 module M {
->M : M
+>M : typeof M
 
     class C<T> {
 >C : C<T>
diff --git a/tests/baselines/reference/mergedInterfacesWithMultipleBases2.types b/tests/baselines/reference/mergedInterfacesWithMultipleBases2.types
index 281e31608a7..b8dfec64bae 100644
--- a/tests/baselines/reference/mergedInterfacesWithMultipleBases2.types
+++ b/tests/baselines/reference/mergedInterfacesWithMultipleBases2.types
@@ -84,7 +84,7 @@ var r = a.a;
 
 // generic interfaces in a module
 module M {
->M : M
+>M : typeof M
 
     class C<T> {
 >C : C<T>
diff --git a/tests/baselines/reference/mergedModuleDeclarationCodeGen2.types b/tests/baselines/reference/mergedModuleDeclarationCodeGen2.types
index 5e29d6810b8..c7fd6eb2196 100644
--- a/tests/baselines/reference/mergedModuleDeclarationCodeGen2.types
+++ b/tests/baselines/reference/mergedModuleDeclarationCodeGen2.types
@@ -1,15 +1,15 @@
 === tests/cases/compiler/mergedModuleDeclarationCodeGen2.ts ===
 module my.data.foo {
->my : my
->data : data
->foo : foo
+>my : typeof my
+>data : typeof data
+>foo : typeof foo
 
     export function buz() { }
 >buz : typeof buz
 }
 module my.data {
->my : my
->data : my.data
+>my : typeof my
+>data : typeof my.data
 
     function data(my) {
 >data : typeof data
diff --git a/tests/baselines/reference/mergedModuleDeclarationCodeGen3.types b/tests/baselines/reference/mergedModuleDeclarationCodeGen3.types
index 03dad24bd3c..2013d068571 100644
--- a/tests/baselines/reference/mergedModuleDeclarationCodeGen3.types
+++ b/tests/baselines/reference/mergedModuleDeclarationCodeGen3.types
@@ -1,15 +1,15 @@
 === tests/cases/compiler/mergedModuleDeclarationCodeGen3.ts ===
 module my.data {
->my : my
->data : data
+>my : typeof my
+>data : typeof data
 
     export function buz() { }
 >buz : typeof buz
 }
 module my.data.foo {
->my : my
->data : data
->foo : foo
+>my : typeof my
+>data : typeof data
+>foo : typeof foo
 
     function data(my, foo) {
 >data : typeof data
diff --git a/tests/baselines/reference/mergedModuleDeclarationCodeGen4.types b/tests/baselines/reference/mergedModuleDeclarationCodeGen4.types
index 58938f9cfbc..aa0dfdb4762 100644
--- a/tests/baselines/reference/mergedModuleDeclarationCodeGen4.types
+++ b/tests/baselines/reference/mergedModuleDeclarationCodeGen4.types
@@ -1,27 +1,27 @@
 === tests/cases/compiler/mergedModuleDeclarationCodeGen4.ts ===
 module superContain {
->superContain : superContain
+>superContain : typeof superContain
 
     export module contain {
->contain : contain
+>contain : typeof contain
 
         export module my.buz {
->my : my
->buz : buz
+>my : typeof my
+>buz : typeof buz
 
             export module data {
->data : data
+>data : typeof data
 
                 export function foo() { }
 >foo : typeof foo
             }
         }
         export module my.buz {
->my : my
->buz : buz
+>my : typeof my
+>buz : typeof buz
 
             export module data {
->data : data
+>data : typeof data
 
                 export function bar(contain, my, buz, data) {
 >bar : typeof bar
diff --git a/tests/baselines/reference/mergedModuleDeclarationCodeGen5.types b/tests/baselines/reference/mergedModuleDeclarationCodeGen5.types
index 2201fa5811e..e5b6520721f 100644
--- a/tests/baselines/reference/mergedModuleDeclarationCodeGen5.types
+++ b/tests/baselines/reference/mergedModuleDeclarationCodeGen5.types
@@ -1,8 +1,8 @@
 === tests/cases/compiler/mergedModuleDeclarationCodeGen5.ts ===
 module M.buz.plop {
->M : M
->buz : buz
->plop : buz.plop
+>M : typeof M
+>buz : typeof buz
+>plop : typeof buz.plop
 
     export function doom() { }
 >doom : typeof doom
@@ -11,9 +11,9 @@ module M.buz.plop {
 >M : typeof M
 }
 module M.buz.plop {
->M : M
->buz : buz
->plop : buz.plop
+>M : typeof M
+>buz : typeof buz
+>plop : typeof M.buz.plop
 
     function gunk() { }
 >gunk : typeof gunk
diff --git a/tests/baselines/reference/mergedModuleDeclarationWithSharedExportedVar.types b/tests/baselines/reference/mergedModuleDeclarationWithSharedExportedVar.types
index 42d4a032f8a..89d155861a5 100644
--- a/tests/baselines/reference/mergedModuleDeclarationWithSharedExportedVar.types
+++ b/tests/baselines/reference/mergedModuleDeclarationWithSharedExportedVar.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/mergedModuleDeclarationWithSharedExportedVar.ts ===
 module M {
->M : M
+>M : typeof M
 
     export var v = 10;
 >v : number
@@ -9,7 +9,7 @@ module M {
 >v : number
 }
 module M {
->M : M
+>M : typeof M
 
     v;
 >v : number
diff --git a/tests/baselines/reference/methodContainingLocalFunction.types b/tests/baselines/reference/methodContainingLocalFunction.types
index 2c34913c1c8..fb52c3831ba 100644
--- a/tests/baselines/reference/methodContainingLocalFunction.types
+++ b/tests/baselines/reference/methodContainingLocalFunction.types
@@ -89,7 +89,7 @@ class C {
 }
 
 module M {
->M : M
+>M : typeof M
 
     export function exhibitBug() {
 >exhibitBug : typeof exhibitBug
diff --git a/tests/baselines/reference/missingImportAfterModuleImport.types b/tests/baselines/reference/missingImportAfterModuleImport.types
index 3f027a2a280..b8602ca06d0 100644
--- a/tests/baselines/reference/missingImportAfterModuleImport.types
+++ b/tests/baselines/reference/missingImportAfterModuleImport.types
@@ -1,7 +1,7 @@
 === tests/cases/compiler/missingImportAfterModuleImport_1.ts ===
 ///<reference path='missingImportAfterModuleImport_0.ts'/>
 import SubModule = require('SubModule');
->SubModule : SubModule
+>SubModule : typeof SubModule
 
 class MainModule {
 >MainModule : MainModule
diff --git a/tests/baselines/reference/missingTypeArguments3.types b/tests/baselines/reference/missingTypeArguments3.types
index b62125f179d..ec6d9944924 100644
--- a/tests/baselines/reference/missingTypeArguments3.types
+++ b/tests/baselines/reference/missingTypeArguments3.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/missingTypeArguments3.ts ===
 declare module linq {
->linq : linq
+>linq : unknown
 
     interface Enumerable<T> {
 >Enumerable : Enumerable<T>
diff --git a/tests/baselines/reference/mixedExports.types b/tests/baselines/reference/mixedExports.types
index c29043b8176..36bf875fd64 100644
--- a/tests/baselines/reference/mixedExports.types
+++ b/tests/baselines/reference/mixedExports.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/mixedExports.ts ===
 declare module M {
->M : M
+>M : typeof M
 
      function foo();
 >foo : typeof foo
@@ -13,7 +13,7 @@ declare module M {
 }
 
 declare module M1 {
->M1 : M1
+>M1 : unknown
 
      export interface Foo {}
 >Foo : Foo
@@ -23,14 +23,14 @@ declare module M1 {
 }
 
 module A {
->A : A
+>A : unknown
 
      interface X {x}
 >X : X
 >x : any
 
      export module X {}
->X : A.X
+>X : unknown
 
      interface X {y}
 >X : X
diff --git a/tests/baselines/reference/mixingFunctionAndAmbientModule1.types b/tests/baselines/reference/mixingFunctionAndAmbientModule1.types
index 4a649eaeb3f..c9e2e1167a9 100644
--- a/tests/baselines/reference/mixingFunctionAndAmbientModule1.types
+++ b/tests/baselines/reference/mixingFunctionAndAmbientModule1.types
@@ -1,9 +1,9 @@
 === tests/cases/compiler/mixingFunctionAndAmbientModule1.ts ===
 module A {
->A : A
+>A : typeof A
 
     declare module My {
->My : My
+>My : typeof My
 
         export var x: number;
 >x : number
@@ -14,10 +14,10 @@ module A {
 }
 
 module B {
->B : B
+>B : typeof B
 
     declare module My {
->My : My
+>My : typeof My
 
         export var x: number;
 >x : number
@@ -32,10 +32,10 @@ module B {
 }
 
 module C {
->C : C
+>C : typeof C
 
     declare module My {
->My : My
+>My : typeof My
 
         export var x: number;
 >x : number
@@ -46,10 +46,10 @@ module C {
 }
 
 module D {
->D : D
+>D : typeof D
 
     declare module My {
->My : My
+>My : typeof My
 
         export var x: number;
 >x : number
@@ -65,10 +65,10 @@ module D {
 
 
 module E {
->E : E
+>E : typeof E
 
     declare module My {
->My : My
+>My : typeof My
 
         export var x: number;
 >x : number
@@ -78,7 +78,7 @@ module E {
 >s : boolean
 
     declare module My {
->My : My
+>My : typeof My
 
         export var y: number;
 >y : number
diff --git a/tests/baselines/reference/modFunctionCrash.types b/tests/baselines/reference/modFunctionCrash.types
index fb7c46e7847..d210d3853c1 100644
--- a/tests/baselines/reference/modFunctionCrash.types
+++ b/tests/baselines/reference/modFunctionCrash.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/modFunctionCrash.ts ===
 declare module Q {
->Q : Q
+>Q : typeof Q
 
     function f(fn:()=>void); // typechecking the function type shouldnot crash the compiler
 >f : typeof f
diff --git a/tests/baselines/reference/moduleAliasAsFunctionArgument.types b/tests/baselines/reference/moduleAliasAsFunctionArgument.types
index d616415b5cb..c70939eb9da 100644
--- a/tests/baselines/reference/moduleAliasAsFunctionArgument.types
+++ b/tests/baselines/reference/moduleAliasAsFunctionArgument.types
@@ -1,7 +1,7 @@
 === tests/cases/compiler/moduleAliasAsFunctionArgument_1.ts ===
 ///<reference path='moduleAliasAsFunctionArgument_0.ts'/>
 import a = require('moduleAliasAsFunctionArgument_0');
->a : a
+>a : typeof a
 
 function fn(arg: { x: number }) {
 >fn : typeof fn
diff --git a/tests/baselines/reference/moduleAliasInterface.types b/tests/baselines/reference/moduleAliasInterface.types
index afde68cd166..6d3b11197cb 100644
--- a/tests/baselines/reference/moduleAliasInterface.types
+++ b/tests/baselines/reference/moduleAliasInterface.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/moduleAliasInterface.ts ===
 module _modes {
->_modes : _modes
+>_modes : typeof _modes
 
  export interface IMode {
 >IMode : IMode
@@ -16,15 +16,15 @@ module _modes {
 // _modes. // produces an internal error - please implement in derived class
 
 module editor {
->editor : editor
+>editor : typeof editor
 
  import modes = _modes;
->modes : modes
+>modes : typeof modes
 >_modes : typeof modes
  
  var i : modes.IMode;
 >i : modes.IMode
->modes : modes
+>modes : unknown
 >IMode : modes.IMode
   
  // If you just use p1:modes, the compiler accepts it - should be an error
@@ -33,16 +33,16 @@ module editor {
 
   constructor(p1: modes.IMode, p2: modes.Mode) { }// should be an error on p2 - it's not exported
 >p1 : modes.IMode
->modes : modes
+>modes : unknown
 >IMode : modes.IMode
 >p2 : modes.Mode
->modes : modes
+>modes : unknown
 >Mode : modes.Mode
 
   public foo(p1:modes.IMode) {
 >foo : (p1: modes.IMode) => void
 >p1 : modes.IMode
->modes : modes
+>modes : unknown
 >IMode : modes.IMode
    
   } 
@@ -50,15 +50,15 @@ module editor {
 }
 
 import modesOuter = _modes;
->modesOuter : modesOuter
+>modesOuter : typeof _modes
 >_modes : typeof _modes
 
 module editor2 {
->editor2 : editor2
+>editor2 : typeof editor2
  
  var i : modesOuter.IMode;
 >i : modesOuter.IMode
->modesOuter : modesOuter
+>modesOuter : unknown
 >IMode : modesOuter.IMode
  
  class Bug {
@@ -66,16 +66,16 @@ module editor2 {
 
      constructor(p1: modesOuter.IMode, p2: modesOuter.Mode) { }// no error here, since modesOuter is declared externally
 >p1 : modesOuter.IMode
->modesOuter : modesOuter
+>modesOuter : unknown
 >IMode : modesOuter.IMode
 >p2 : modesOuter.Mode
->modesOuter : modesOuter
+>modesOuter : unknown
 >Mode : modesOuter.Mode
   
  }
  
   module Foo { export class Bar{} }
->Foo : Foo
+>Foo : typeof Foo
 >Bar : Bar
  
   class Bug2 {
@@ -83,16 +83,16 @@ module editor2 {
 
       constructor(p1: Foo.Bar, p2: modesOuter.Mode) { }
 >p1 : Foo.Bar
->Foo : Foo
+>Foo : unknown
 >Bar : Foo.Bar
 >p2 : modesOuter.Mode
->modesOuter : modesOuter
+>modesOuter : unknown
 >Mode : modesOuter.Mode
   }
 }
 
 module A1 {
->A1 : A1
+>A1 : typeof A1
 
     export interface A1I1 {}
 >A1I1 : A1I1
@@ -102,20 +102,20 @@ module A1 {
 }
 
 module B1 {
->B1 : B1
+>B1 : typeof B1
 
     import A1Alias1 = A1;
->A1Alias1 : A1Alias1
+>A1Alias1 : typeof A1Alias1
 >A1 : typeof A1Alias1
     
     var i : A1Alias1.A1I1;   
 >i : A1Alias1.A1I1
->A1Alias1 : A1Alias1
+>A1Alias1 : unknown
 >A1I1 : A1Alias1.A1I1
 
     var c : A1Alias1.A1C1;
 >c : A1Alias1.A1C1
->A1Alias1 : A1Alias1
+>A1Alias1 : unknown
 >A1C1 : A1Alias1.A1C1
 }
 
diff --git a/tests/baselines/reference/moduleAndInterfaceSharingName.types b/tests/baselines/reference/moduleAndInterfaceSharingName.types
index e343a49b9b7..6a4f8998fe6 100644
--- a/tests/baselines/reference/moduleAndInterfaceSharingName.types
+++ b/tests/baselines/reference/moduleAndInterfaceSharingName.types
@@ -1,9 +1,9 @@
 === tests/cases/compiler/moduleAndInterfaceSharingName.ts ===
 module X {
->X : X
+>X : unknown
 
     export module Y {
->Y : Y
+>Y : unknown
 
         export interface Z { }
 >Z : Z
@@ -13,12 +13,12 @@ module X {
 }
 var z: X.Y.Z = null;
 >z : X.Y.Z
->X : X
->Y : X.Y
+>X : unknown
+>Y : unknown
 >Z : X.Y.Z
 
 var z2: X.Y;
 >z2 : X.Y
->X : X
+>X : unknown
 >Y : X.Y
 
diff --git a/tests/baselines/reference/moduleAndInterfaceSharingName3.types b/tests/baselines/reference/moduleAndInterfaceSharingName3.types
index eb37a739426..1b9aabea630 100644
--- a/tests/baselines/reference/moduleAndInterfaceSharingName3.types
+++ b/tests/baselines/reference/moduleAndInterfaceSharingName3.types
@@ -1,9 +1,9 @@
 === tests/cases/compiler/moduleAndInterfaceSharingName3.ts ===
 module X {
->X : X
+>X : unknown
 
     export module Y {
->Y : Y
+>Y : unknown
 
         export interface Z { }
 >Z : Z
@@ -14,12 +14,12 @@ module X {
 }
 var z: X.Y.Z = null;
 >z : X.Y.Z
->X : X
->Y : X.Y
+>X : unknown
+>Y : unknown
 >Z : X.Y.Z
 
 var z2: X.Y<string>;
 >z2 : X.Y<string>
->X : X
+>X : unknown
 >Y : X.Y<T>
 
diff --git a/tests/baselines/reference/moduleAndInterfaceSharingName4.types b/tests/baselines/reference/moduleAndInterfaceSharingName4.types
index e2d050d82f5..8ad5a15a4ff 100644
--- a/tests/baselines/reference/moduleAndInterfaceSharingName4.types
+++ b/tests/baselines/reference/moduleAndInterfaceSharingName4.types
@@ -1,15 +1,15 @@
 === tests/cases/compiler/moduleAndInterfaceSharingName4.ts ===
 declare module D3 {
->D3 : D3
+>D3 : typeof D3
 
     var x: D3.Color.Color;
 >x : Color.Color
->D3 : D3
->Color : Color
+>D3 : unknown
+>Color : unknown
 >Color : Color.Color
 
     module Color {
->Color : D3.Color
+>Color : unknown
 
         export interface Color {
 >Color : Color
diff --git a/tests/baselines/reference/moduleCodeGenTest3.types b/tests/baselines/reference/moduleCodeGenTest3.types
index 74c7ecf3d01..d5e10130c0d 100644
--- a/tests/baselines/reference/moduleCodeGenTest3.types
+++ b/tests/baselines/reference/moduleCodeGenTest3.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/moduleCodeGenTest3.ts ===
 module Baz { export var x = "hello"; }
->Baz : Baz
+>Baz : typeof Baz
 >x : string
 
 Baz.x = "goodbye";
diff --git a/tests/baselines/reference/moduleCodegenTest4.types b/tests/baselines/reference/moduleCodegenTest4.types
index ed7791e77f6..7b9229a46c1 100644
--- a/tests/baselines/reference/moduleCodegenTest4.types
+++ b/tests/baselines/reference/moduleCodegenTest4.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/moduleCodegenTest4.ts ===
 export module Baz { export var x = "hello"; }
->Baz : Baz
+>Baz : typeof Baz
 >x : string
 
 Baz.x = "goodbye";
diff --git a/tests/baselines/reference/moduleIdentifiers.types b/tests/baselines/reference/moduleIdentifiers.types
index 451f166075f..db8b1c3f720 100644
--- a/tests/baselines/reference/moduleIdentifiers.types
+++ b/tests/baselines/reference/moduleIdentifiers.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/moduleIdentifiers.ts ===
 module M {
->M : M
+>M : typeof M
 
     interface P { x: number; y: number; }
 >P : P
diff --git a/tests/baselines/reference/moduleImportedForTypeArgumentPosition.types b/tests/baselines/reference/moduleImportedForTypeArgumentPosition.types
index 86513159531..c5c3f427377 100644
--- a/tests/baselines/reference/moduleImportedForTypeArgumentPosition.types
+++ b/tests/baselines/reference/moduleImportedForTypeArgumentPosition.types
@@ -1,7 +1,7 @@
 === tests/cases/compiler/moduleImportedForTypeArgumentPosition_1.ts ===
 /**This is on import declaration*/
 import M2 = require("moduleImportedForTypeArgumentPosition_0");
->M2 : M2
+>M2 : typeof M2
 
 class C1<T>{ }
 >C1 : C1<T>
@@ -10,7 +10,7 @@ class C1<T>{ }
 class Test1 extends C1<M2.M2C> {
 >Test1 : Test1
 >C1 : C1<T>
->M2 : M2
+>M2 : unknown
 >M2C : M2.M2C
 }
 
diff --git a/tests/baselines/reference/moduleMemberWithoutTypeAnnotation1.types b/tests/baselines/reference/moduleMemberWithoutTypeAnnotation1.types
index 10688c42043..5d2da7fc60d 100644
--- a/tests/baselines/reference/moduleMemberWithoutTypeAnnotation1.types
+++ b/tests/baselines/reference/moduleMemberWithoutTypeAnnotation1.types
@@ -1,7 +1,7 @@
 === tests/cases/compiler/moduleMemberWithoutTypeAnnotation1.ts ===
 module TypeScript.Parser {
->TypeScript : TypeScript
->Parser : Parser
+>TypeScript : typeof TypeScript
+>Parser : typeof Parser
 
     class SyntaxCursor {
 >SyntaxCursor : SyntaxCursor
@@ -16,7 +16,7 @@ module TypeScript.Parser {
 }
 
 module TypeScript {
->TypeScript : TypeScript
+>TypeScript : typeof TypeScript
 
     export interface ISyntaxElement { };
 >ISyntaxElement : ISyntaxElement
@@ -54,7 +54,7 @@ module TypeScript {
 }
 
 module TypeScript {
->TypeScript : TypeScript
+>TypeScript : typeof TypeScript
 
     export class SyntaxNode {
 >SyntaxNode : SyntaxNode
@@ -87,8 +87,8 @@ module TypeScript {
 }
 
 module TypeScript.Syntax {
->TypeScript : TypeScript
->Syntax : Syntax
+>TypeScript : typeof TypeScript
+>Syntax : typeof Syntax
 
     export function childIndex() { }
 >childIndex : typeof childIndex
diff --git a/tests/baselines/reference/moduleMemberWithoutTypeAnnotation2.types b/tests/baselines/reference/moduleMemberWithoutTypeAnnotation2.types
index a22095f3118..3a1c0b07d92 100644
--- a/tests/baselines/reference/moduleMemberWithoutTypeAnnotation2.types
+++ b/tests/baselines/reference/moduleMemberWithoutTypeAnnotation2.types
@@ -1,9 +1,9 @@
 === tests/cases/compiler/moduleMemberWithoutTypeAnnotation2.ts ===
 module TypeScript {
->TypeScript : TypeScript
+>TypeScript : typeof TypeScript
 
     export module CompilerDiagnostics {
->CompilerDiagnostics : CompilerDiagnostics
+>CompilerDiagnostics : typeof CompilerDiagnostics
 
         export interface IDiagnosticWriter {
 >IDiagnosticWriter : IDiagnosticWriter
diff --git a/tests/baselines/reference/moduleMerge.types b/tests/baselines/reference/moduleMerge.types
index 1708632fadc..b70f786b7a2 100644
--- a/tests/baselines/reference/moduleMerge.types
+++ b/tests/baselines/reference/moduleMerge.types
@@ -2,7 +2,7 @@
 // This should not compile both B classes are in the same module this should be a collission
 
 module A
->A : A
+>A : typeof A
 {
     class B
 >B : B
@@ -16,7 +16,7 @@ module A
 }
 
 module A
->A : A
+>A : typeof A
 {
     export class B
 >B : B
diff --git a/tests/baselines/reference/moduleNoEmit.types b/tests/baselines/reference/moduleNoEmit.types
index 0dc64c340d0..7fb6b6164d6 100644
--- a/tests/baselines/reference/moduleNoEmit.types
+++ b/tests/baselines/reference/moduleNoEmit.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/moduleNoEmit.ts ===
 module Foo {
->Foo : Foo
+>Foo : typeof Foo
 
 	1+1;
 >1+1 : number
diff --git a/tests/baselines/reference/moduleOuterQualification.types b/tests/baselines/reference/moduleOuterQualification.types
index 1e4a13453bf..95a18f58bcd 100644
--- a/tests/baselines/reference/moduleOuterQualification.types
+++ b/tests/baselines/reference/moduleOuterQualification.types
@@ -1,18 +1,18 @@
 === tests/cases/compiler/moduleOuterQualification.ts ===
 
 declare module outer {
->outer : outer
+>outer : unknown
 
   interface Beta { }
 >Beta : Beta
 
   module inner {
->inner : inner
+>inner : unknown
 
     // .d.ts emit: should be 'extends outer.Beta'
     export interface Beta extends outer.Beta { }
 >Beta : Beta
->outer : outer
+>outer : unknown
 >Beta : outer.Beta
   }
 }
diff --git a/tests/baselines/reference/moduleRedifinitionErrors.types b/tests/baselines/reference/moduleRedifinitionErrors.types
index 89a8cfbfa3c..34a5f428596 100644
--- a/tests/baselines/reference/moduleRedifinitionErrors.types
+++ b/tests/baselines/reference/moduleRedifinitionErrors.types
@@ -3,6 +3,6 @@ class A {
 >A : A
 }
 module A {
->A : A
+>A : typeof A
 }
 
diff --git a/tests/baselines/reference/moduleReopenedTypeOtherBlock.types b/tests/baselines/reference/moduleReopenedTypeOtherBlock.types
index c16e80ca578..f98c069c338 100644
--- a/tests/baselines/reference/moduleReopenedTypeOtherBlock.types
+++ b/tests/baselines/reference/moduleReopenedTypeOtherBlock.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/moduleReopenedTypeOtherBlock.ts ===
 module M {
->M : M
+>M : typeof M
 
     export class C1 { }
 >C1 : C1
@@ -10,7 +10,7 @@ module M {
 >n : number
 }
 module M {
->M : M
+>M : typeof M
 
     export class C2 { f(): I { return null; } }
 >C2 : C2
diff --git a/tests/baselines/reference/moduleReopenedTypeSameBlock.types b/tests/baselines/reference/moduleReopenedTypeSameBlock.types
index 785cea3e093..8f119fff60c 100644
--- a/tests/baselines/reference/moduleReopenedTypeSameBlock.types
+++ b/tests/baselines/reference/moduleReopenedTypeSameBlock.types
@@ -1,10 +1,10 @@
 === tests/cases/compiler/moduleReopenedTypeSameBlock.ts ===
 module M { export class C1 { } }
->M : M
+>M : typeof M
 >C1 : C1
 
 module M {
->M : M
+>M : typeof M
 
     export interface I { n: number; }
 >I : I
diff --git a/tests/baselines/reference/moduleScopingBug.types b/tests/baselines/reference/moduleScopingBug.types
index d38c9413b62..00cd06d076c 100644
--- a/tests/baselines/reference/moduleScopingBug.types
+++ b/tests/baselines/reference/moduleScopingBug.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/moduleScopingBug.ts ===
 module M
->M : M
+>M : typeof M
 
 {
 
@@ -28,7 +28,7 @@ module M
     }
 
     module X {
->X : X
+>X : typeof X
 
         var inner = outer;   // Error: outer not visible
 >inner : number
diff --git a/tests/baselines/reference/moduleSymbolMerging.types b/tests/baselines/reference/moduleSymbolMerging.types
index 62d2378cd2f..a4ddda20af7 100644
--- a/tests/baselines/reference/moduleSymbolMerging.types
+++ b/tests/baselines/reference/moduleSymbolMerging.types
@@ -1,14 +1,14 @@
 === tests/cases/compiler/B.ts ===
 ///<reference path="A.ts" />
 module A { ; }
->A : A
+>A : typeof A
 
 module B {
->B : B
+>B : typeof B
 
 	export function f(): A.I { return null; }
 >f : typeof f
->A : A
+>A : unknown
 >I : A.I
 }
 
@@ -16,6 +16,6 @@ module B {
 === tests/cases/compiler/A.ts ===
 
 module A { export interface I {} }
->A : A
+>A : typeof A
 >I : I
 
diff --git a/tests/baselines/reference/moduleUnassignedVariable.types b/tests/baselines/reference/moduleUnassignedVariable.types
index 5871c67b5ae..c4eeecbf39f 100644
--- a/tests/baselines/reference/moduleUnassignedVariable.types
+++ b/tests/baselines/reference/moduleUnassignedVariable.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/moduleUnassignedVariable.ts ===
 module Bar {
->Bar : Bar
+>Bar : typeof Bar
 
     export var a = 1;
 >a : number
diff --git a/tests/baselines/reference/moduleVariableArrayIndexer.types b/tests/baselines/reference/moduleVariableArrayIndexer.types
index be9aa49a326..564de3ff972 100644
--- a/tests/baselines/reference/moduleVariableArrayIndexer.types
+++ b/tests/baselines/reference/moduleVariableArrayIndexer.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/moduleVariableArrayIndexer.ts ===
 module Bar {
->Bar : Bar
+>Bar : typeof Bar
 
     export var a = 1;
 >a : number
diff --git a/tests/baselines/reference/moduleVariables.types b/tests/baselines/reference/moduleVariables.types
index 644a615cc50..2c00df87f56 100644
--- a/tests/baselines/reference/moduleVariables.types
+++ b/tests/baselines/reference/moduleVariables.types
@@ -6,7 +6,7 @@ var x = 1;
 >x : number
 
 module M {
->M : M
+>M : typeof M
 
     export var x = 2;
 >x : number
@@ -20,7 +20,7 @@ module M {
 }
  
 module M {
->M : M
+>M : typeof M
 
     console.log(x); // 2
 >console.log(x) : any
@@ -31,7 +31,7 @@ module M {
 }
  
 module M {
->M : M
+>M : typeof M
 
     var x = 3;
 >x : number
diff --git a/tests/baselines/reference/moduleVisibilityTest1.types b/tests/baselines/reference/moduleVisibilityTest1.types
index 39bfd22b11c..aa4e7c91d88 100644
--- a/tests/baselines/reference/moduleVisibilityTest1.types
+++ b/tests/baselines/reference/moduleVisibilityTest1.types
@@ -2,14 +2,14 @@
 
 
 module OuterMod {
->OuterMod : OuterMod
+>OuterMod : typeof OuterMod
 
 	export function someExportedOuterFunc() { return -1; }
 >someExportedOuterFunc : typeof someExportedOuterFunc
 >-1 : number
 
 	export module OuterInnerMod {
->OuterInnerMod : OuterInnerMod
+>OuterInnerMod : typeof OuterInnerMod
 
 		export function someExportedOuterInnerFunc() { return "foo"; }
 >someExportedOuterInnerFunc : typeof someExportedOuterInnerFunc
@@ -17,15 +17,15 @@ module OuterMod {
 }
 
 import OuterInnerAlias = OuterMod.OuterInnerMod;
->OuterInnerAlias : OuterInnerAlias
+>OuterInnerAlias : typeof OuterInnerAlias
 >OuterMod : typeof OuterMod
 >OuterInnerMod : typeof OuterInnerAlias
 
 module M {
->M : M
+>M : typeof M
 
 	export module InnerMod {
->InnerMod : InnerMod
+>InnerMod : typeof InnerMod
 
 		export function someExportedInnerFunc() { return -2; }
 >someExportedInnerFunc : typeof someExportedInnerFunc
@@ -117,7 +117,7 @@ module M {
 }
 
 module M {
->M : M
+>M : typeof M
 
 	export var c = x;
 >c : number
@@ -134,10 +134,10 @@ module M {
 
 var cprime : M.I = <M.I>null;
 >cprime : M.I
->M : M
+>M : unknown
 >I : M.I
 ><M.I>null : M.I
->M : M
+>M : unknown
 >I : M.I
 
 var c = new M.C();
diff --git a/tests/baselines/reference/moduleWithStatementsOfEveryKind.types b/tests/baselines/reference/moduleWithStatementsOfEveryKind.types
index 9f5e4e92d0e..2e1860fc2c9 100644
--- a/tests/baselines/reference/moduleWithStatementsOfEveryKind.types
+++ b/tests/baselines/reference/moduleWithStatementsOfEveryKind.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/internalModules/moduleBody/moduleWithStatementsOfEveryKind.ts ===
 module A {
->A : A
+>A : typeof A
 
     class A { s: string }
 >A : A
@@ -32,7 +32,7 @@ module A {
     }
 
     module Module {
->Module : Module
+>Module : typeof Module
 
         class A { s: string }
 >A : A
@@ -74,7 +74,7 @@ module A {
 }
 
 module Y {
->Y : Y
+>Y : typeof Y
 
     export class A { s: string }
 >A : A
@@ -106,7 +106,7 @@ module Y {
     }
 
     export module Module {
->Module : Module
+>Module : typeof Module
 
         class A { s: string }
 >A : A
diff --git a/tests/baselines/reference/moduleWithTryStatement1.types b/tests/baselines/reference/moduleWithTryStatement1.types
index cb29dd79971..9e18b649735 100644
--- a/tests/baselines/reference/moduleWithTryStatement1.types
+++ b/tests/baselines/reference/moduleWithTryStatement1.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/moduleWithTryStatement1.ts ===
 module M {
->M : M
+>M : typeof M
 
   try {
   }
diff --git a/tests/baselines/reference/multiImportExport.types b/tests/baselines/reference/multiImportExport.types
index 66a7135b8f5..aac60aaee90 100644
--- a/tests/baselines/reference/multiImportExport.types
+++ b/tests/baselines/reference/multiImportExport.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/consumer.ts ===
 import Drawing = require('./Drawing');
->Drawing : Drawing
+>Drawing : typeof Drawing
 
 var addr = new Drawing.Math.Adder();
 >addr : Adder
@@ -13,11 +13,11 @@ var addr = new Drawing.Math.Adder();
 
 === tests/cases/compiler/Drawing.ts ===
 export import Math = require('Math/Math')
->Math : Math
+>Math : { Adder: typeof Adder; }
 
 === tests/cases/compiler/Math/Math.ts ===
 import Adder = require('Math/Adder');
->Adder : Adder
+>Adder : typeof Adder
 
 var Math = {
 >Math : { Adder: typeof Adder; }
diff --git a/tests/baselines/reference/multiModuleClodule1.types b/tests/baselines/reference/multiModuleClodule1.types
index 96003688dc6..39ae7b45b60 100644
--- a/tests/baselines/reference/multiModuleClodule1.types
+++ b/tests/baselines/reference/multiModuleClodule1.types
@@ -16,7 +16,7 @@ class C {
 }
 
 module C {
->C : C
+>C : typeof C
 
     export var x = 1;
 >x : number
@@ -25,7 +25,7 @@ module C {
 >y : number
 }
 module C {
->C : C
+>C : typeof C
 
     export function foo() { }
 >foo : typeof foo
diff --git a/tests/baselines/reference/multiModuleFundule1.types b/tests/baselines/reference/multiModuleFundule1.types
index c0b23c6d1a6..53b3c6342ae 100644
--- a/tests/baselines/reference/multiModuleFundule1.types
+++ b/tests/baselines/reference/multiModuleFundule1.types
@@ -4,13 +4,13 @@ function C(x: number) { }
 >x : number
 
 module C {
->C : C
+>C : typeof C
 
     export var x = 1;
 >x : number
 }
 module C {
->C : C
+>C : typeof C
 
     export function foo() { }
 >foo : typeof foo
diff --git a/tests/baselines/reference/nameCollision.types b/tests/baselines/reference/nameCollision.types
index b3988873b9e..be14150308b 100644
--- a/tests/baselines/reference/nameCollision.types
+++ b/tests/baselines/reference/nameCollision.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/internalModules/codeGeneration/nameCollision.ts ===
 module A {
->A : A
+>A : typeof A
 
     // these 2 statements force an underscore before the 'A' 
     // in the generated function call.
@@ -12,14 +12,14 @@ module A {
 }
 
 module B {
->B : B
+>B : typeof B
 
     var A = 12;
 >A : number
 }
 
 module B {
->B : B
+>B : typeof B
 
     // re-opened module with colliding name
     // this should add an underscore.
@@ -32,19 +32,19 @@ module B {
 }
 
 module X {
->X : X
+>X : typeof X
 
     var X = 13;
 >X : number
 
     export module Y {
->Y : X.Y
+>Y : typeof X.Y
 
         var Y = 13;
 >Y : number
 
         export module Z {
->Z : Y.Z
+>Z : typeof X.Y.Z
 
             var X = 12;
 >X : number
@@ -59,8 +59,8 @@ module X {
 }
 
 module Y.Y {
->Y : Y
->Y : Y.Y
+>Y : typeof Y
+>Y : typeof Y.Y
 
     export enum Y {
 >Y : Y
@@ -74,7 +74,7 @@ module Y.Y {
 // no collision, since interface doesn't
 // generate code.
 module D {
->D : D
+>D : typeof D
 
     export interface D {
 >D : D
diff --git a/tests/baselines/reference/nameDelimitedBySlashes.types b/tests/baselines/reference/nameDelimitedBySlashes.types
index bbd5e324f27..cea87ff2241 100644
--- a/tests/baselines/reference/nameDelimitedBySlashes.types
+++ b/tests/baselines/reference/nameDelimitedBySlashes.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/externalModules/foo_1.ts ===
 import foo = require('./test/foo_0');
->foo : foo
+>foo : typeof foo
 
 var x = foo.foo + 42;
 >x : number
diff --git a/tests/baselines/reference/nameWithRelativePaths.types b/tests/baselines/reference/nameWithRelativePaths.types
index 4cd85df81b4..5f28e9a6169 100644
--- a/tests/baselines/reference/nameWithRelativePaths.types
+++ b/tests/baselines/reference/nameWithRelativePaths.types
@@ -1,12 +1,12 @@
 === tests/cases/conformance/externalModules/test/foo_3.ts ===
 import foo0 = require('../foo_0');
->foo0 : foo0
+>foo0 : typeof foo0
 
 import foo1 = require('./test/foo_1');
->foo1 : foo1
+>foo1 : typeof foo1
 
 import foo2 = require('./.././test/foo_2');
->foo2 : foo2
+>foo2 : typeof foo2
 
 if(foo2.M2.x){
 >foo2.M2.x : boolean
@@ -40,7 +40,7 @@ export function f(){
 
 === tests/cases/conformance/externalModules/test/foo_2.ts ===
 export module M2 {
->M2 : M2
+>M2 : typeof M2
 
 	export var x = true;
 >x : boolean
diff --git a/tests/baselines/reference/namedFunctionExpressionInModule.types b/tests/baselines/reference/namedFunctionExpressionInModule.types
index 703fa3272dc..9643d9ca069 100644
--- a/tests/baselines/reference/namedFunctionExpressionInModule.types
+++ b/tests/baselines/reference/namedFunctionExpressionInModule.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/namedFunctionExpressionInModule.ts ===
 module Variables{
->Variables : Variables
+>Variables : typeof Variables
 
     var x = function bar(a, b, c) {
 >x : (a: any, b: any, c: any) => void
diff --git a/tests/baselines/reference/namespaces1.types b/tests/baselines/reference/namespaces1.types
index e4cebfd284e..b4b41fbeda9 100644
--- a/tests/baselines/reference/namespaces1.types
+++ b/tests/baselines/reference/namespaces1.types
@@ -1,9 +1,9 @@
 === tests/cases/compiler/namespaces1.ts ===
 module X {
->X : X
+>X : unknown
 
     export module Y {
->Y : Y
+>Y : unknown
 
         export interface Z { }
 >Z : Z
@@ -14,12 +14,12 @@ module X {
 
 var x: X.Y.Z;
 >x : X.Y.Z
->X : X
->Y : X.Y
+>X : unknown
+>Y : unknown
 >Z : X.Y.Z
 
 var x2: X.Y;
 >x2 : X.Y
->X : X
+>X : unknown
 >Y : X.Y
 
diff --git a/tests/baselines/reference/namespaces2.types b/tests/baselines/reference/namespaces2.types
index d42d701377a..909f56f561a 100644
--- a/tests/baselines/reference/namespaces2.types
+++ b/tests/baselines/reference/namespaces2.types
@@ -1,9 +1,9 @@
 === tests/cases/compiler/namespaces2.ts ===
 module A {
->A : A
+>A : typeof A
 
     export module B {
->B : B
+>B : typeof B
 
         export class C { }
 >C : C
@@ -12,8 +12,8 @@ module A {
 
 var c: A.B.C = new A.B.C();
 >c : A.B.C
->A : A
->B : A.B
+>A : unknown
+>B : unknown
 >C : A.B.C
 >new A.B.C() : A.B.C
 >A.B.C : typeof A.B.C
diff --git a/tests/baselines/reference/negateOperatorWithAnyOtherType.types b/tests/baselines/reference/negateOperatorWithAnyOtherType.types
index 7b2c7751545..87e7ece0051 100644
--- a/tests/baselines/reference/negateOperatorWithAnyOtherType.types
+++ b/tests/baselines/reference/negateOperatorWithAnyOtherType.types
@@ -47,7 +47,7 @@ class A {
     }
 }
 module M {
->M : M
+>M : typeof M
 
     export var n: any;
 >n : any
diff --git a/tests/baselines/reference/negateOperatorWithBooleanType.types b/tests/baselines/reference/negateOperatorWithBooleanType.types
index f6c0e8591f5..68fc41a5f9e 100644
--- a/tests/baselines/reference/negateOperatorWithBooleanType.types
+++ b/tests/baselines/reference/negateOperatorWithBooleanType.types
@@ -16,7 +16,7 @@ class A {
 >foo : () => boolean
 }
 module M {
->M : M
+>M : typeof M
 
     export var n: boolean;
 >n : boolean
diff --git a/tests/baselines/reference/negateOperatorWithNumberType.types b/tests/baselines/reference/negateOperatorWithNumberType.types
index 33e8bf67177..fbb2c365526 100644
--- a/tests/baselines/reference/negateOperatorWithNumberType.types
+++ b/tests/baselines/reference/negateOperatorWithNumberType.types
@@ -20,7 +20,7 @@ class A {
 >foo : () => number
 }
 module M {
->M : M
+>M : typeof M
 
     export var n: number;
 >n : number
diff --git a/tests/baselines/reference/negateOperatorWithStringType.types b/tests/baselines/reference/negateOperatorWithStringType.types
index 8964c5272a2..e7d1b793f9c 100644
--- a/tests/baselines/reference/negateOperatorWithStringType.types
+++ b/tests/baselines/reference/negateOperatorWithStringType.types
@@ -20,7 +20,7 @@ class A {
 >foo : () => string
 }
 module M {
->M : M
+>M : typeof M
 
     export var n: string;
 >n : string
diff --git a/tests/baselines/reference/nestedModulePrivateAccess.types b/tests/baselines/reference/nestedModulePrivateAccess.types
index 2874e8d1213..7aae7449dcf 100644
--- a/tests/baselines/reference/nestedModulePrivateAccess.types
+++ b/tests/baselines/reference/nestedModulePrivateAccess.types
@@ -1,12 +1,12 @@
 === tests/cases/compiler/nestedModulePrivateAccess.ts ===
 module a{
->a : a
+>a : typeof a
 
        var x:number;
 >x : number
 
        module b{
->b : b
+>b : typeof b
 
                var y = x; // should not be an error
 >y : number
diff --git a/tests/baselines/reference/nestedModules.types b/tests/baselines/reference/nestedModules.types
index de94fbb2ad9..863e57ef859 100644
--- a/tests/baselines/reference/nestedModules.types
+++ b/tests/baselines/reference/nestedModules.types
@@ -1,8 +1,8 @@
 === tests/cases/conformance/internalModules/moduleDeclarations/nestedModules.ts ===
 module A.B.C {
->A : A
->B : B
->C : C
+>A : typeof A
+>B : typeof B
+>C : unknown
 
     export interface Point {
 >Point : Point
@@ -16,14 +16,14 @@ module A.B.C {
 }
 
 module A {
->A : A
+>A : typeof A
 
     export module B {
->B : B
+>B : typeof B
 
         var Point: C.Point = { x: 0, y: 0 }; // bug 832088: could not find module 'C'
 >Point : C.Point
->C : C
+>C : unknown
 >Point : C.Point
 >{ x: 0, y: 0 } : { x: number; y: number; }
 >x : number
@@ -32,8 +32,8 @@ module A {
 }
 
 module M2.X {
->M2 : M2
->X : X
+>M2 : typeof M2
+>X : typeof X
 
     export interface Point {
 >Point : Point
@@ -45,10 +45,10 @@ module M2.X {
 }
 
 module M2 {
->M2 : M2
+>M2 : typeof M2
 
     export module X {
->X : X
+>X : typeof X
 
         export var Point: number;
 >Point : number
@@ -77,7 +77,7 @@ var p: { x: number; y: number; }
 
 var p: M2.X.Point;
 >p : { x: number; y: number; }
->M2 : M2
->X : M2.X
+>M2 : unknown
+>X : unknown
 >Point : M2.X.Point
 
diff --git a/tests/baselines/reference/nestedSelf.types b/tests/baselines/reference/nestedSelf.types
index 3970da4c1ee..56280bffb2f 100644
--- a/tests/baselines/reference/nestedSelf.types
+++ b/tests/baselines/reference/nestedSelf.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/nestedSelf.ts ===
 module M {
->M : M
+>M : typeof M
 
  export class C {
 >C : C
diff --git a/tests/baselines/reference/newArrays.types b/tests/baselines/reference/newArrays.types
index df6474e280e..54068a987f6 100644
--- a/tests/baselines/reference/newArrays.types
+++ b/tests/baselines/reference/newArrays.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/newArrays.ts ===
 module M {
->M : M
+>M : typeof M
 
 	class Foo {}
 >Foo : Foo
diff --git a/tests/baselines/reference/nonInstantiatedModule.types b/tests/baselines/reference/nonInstantiatedModule.types
index 291c41d731c..2a1e11ffcb6 100644
--- a/tests/baselines/reference/nonInstantiatedModule.types
+++ b/tests/baselines/reference/nonInstantiatedModule.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/internalModules/moduleDeclarations/nonInstantiatedModule.ts ===
 module M {
->M : M
+>M : typeof M
 
     export interface Point { x: number; y: number }
 >Point : Point
@@ -39,10 +39,10 @@ var a2 = m.a;
 >a : number
 
 module M2 {
->M2 : M2
+>M2 : typeof M2
 
     export module Point {
->Point : Point
+>Point : typeof Point
 
         export function Origin(): Point {
 >Origin : typeof Origin
@@ -73,7 +73,7 @@ var p: { x: number; y: number; };
 
 var p: M2.Point;
 >p : { x: number; y: number; }
->M2 : M2
+>M2 : unknown
 >Point : M2.Point
 
 var p2: { Origin() : { x: number; y: number; } };
@@ -88,10 +88,10 @@ var p2: typeof M2.Point;
 >Point : typeof M2.Point
 
 module M3 {
->M3 : M3
+>M3 : typeof M3
 
     export module Utils {
->Utils : Utils
+>Utils : typeof Utils
 
         export interface Point {
 >Point : Point
diff --git a/tests/baselines/reference/nullIsSubtypeOfEverythingButUndefined.types b/tests/baselines/reference/nullIsSubtypeOfEverythingButUndefined.types
index 4c24697d04c..e954f677bb7 100644
--- a/tests/baselines/reference/nullIsSubtypeOfEverythingButUndefined.types
+++ b/tests/baselines/reference/nullIsSubtypeOfEverythingButUndefined.types
@@ -195,7 +195,7 @@ function f() { }
 >f : typeof f
 
 module f {
->f : f
+>f : typeof f
 
     export var bar = 1;
 >bar : number
@@ -219,7 +219,7 @@ class c { baz: string }
 >baz : string
 
 module c {
->c : c
+>c : typeof c
 
     export var bar = 1;
 >bar : number
diff --git a/tests/baselines/reference/overloadResolutionOverNonCTLambdas.types b/tests/baselines/reference/overloadResolutionOverNonCTLambdas.types
index dfcde811fd5..1936ac54b53 100644
--- a/tests/baselines/reference/overloadResolutionOverNonCTLambdas.types
+++ b/tests/baselines/reference/overloadResolutionOverNonCTLambdas.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/overloadResolutionOverNonCTLambdas.ts ===
 module Bugs {
->Bugs : Bugs
+>Bugs : typeof Bugs
 
   class A {
 >A : A
diff --git a/tests/baselines/reference/overloadResolutionOverNonCTObjectLit.types b/tests/baselines/reference/overloadResolutionOverNonCTObjectLit.types
index f2606863c64..0a13b0084c1 100644
--- a/tests/baselines/reference/overloadResolutionOverNonCTObjectLit.types
+++ b/tests/baselines/reference/overloadResolutionOverNonCTObjectLit.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/overloadResolutionOverNonCTObjectLit.ts ===
 module Bugs {
->Bugs : Bugs
+>Bugs : typeof Bugs
 
                 export interface IToken {
 >IToken : IToken
diff --git a/tests/baselines/reference/parserFunctionDeclaration8.types b/tests/baselines/reference/parserFunctionDeclaration8.types
index 4e4894c3f3c..15a8721932d 100644
--- a/tests/baselines/reference/parserFunctionDeclaration8.types
+++ b/tests/baselines/reference/parserFunctionDeclaration8.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/parser/ecmascript5/FunctionDeclarations/parserFunctionDeclaration8.ts ===
 declare module M {
->M : M
+>M : typeof M
 
    function foo();
 >foo : typeof foo
diff --git a/tests/baselines/reference/parserModuleDeclaration11.types b/tests/baselines/reference/parserModuleDeclaration11.types
index 9ee2617aff1..2bb5171e96a 100644
--- a/tests/baselines/reference/parserModuleDeclaration11.types
+++ b/tests/baselines/reference/parserModuleDeclaration11.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration11.ts ===
 declare module string {
->string : string
+>string : typeof string
 
     interface X { }
 >X : X
@@ -17,6 +17,6 @@ string.foo("abc");
 
 var x: string.X;
 >x : string.X
->string : string
+>string : unknown
 >X : string.X
 
diff --git a/tests/baselines/reference/parserModuleDeclaration12.types b/tests/baselines/reference/parserModuleDeclaration12.types
index 1c3d9e39906..cffa3cba358 100644
--- a/tests/baselines/reference/parserModuleDeclaration12.types
+++ b/tests/baselines/reference/parserModuleDeclaration12.types
@@ -1,5 +1,5 @@
 === tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration12.ts ===
 module A.string {
->A : A
->string : string
+>A : unknown
+>string : unknown
 }
diff --git a/tests/baselines/reference/parserModuleDeclaration3.d.types b/tests/baselines/reference/parserModuleDeclaration3.d.types
index 221078dacb7..1fbd92c86af 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 : M
+>M : unknown
 }
diff --git a/tests/baselines/reference/parserModuleDeclaration4.types b/tests/baselines/reference/parserModuleDeclaration4.types
index 625691557e4..165378e62fa 100644
--- a/tests/baselines/reference/parserModuleDeclaration4.types
+++ b/tests/baselines/reference/parserModuleDeclaration4.types
@@ -1,12 +1,12 @@
 === tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration4.ts ===
 module M {
->M : M
+>M : unknown
 
   declare module M1 {
->M1 : M1
+>M1 : unknown
 
     module M2 {
->M2 : M2
+>M2 : unknown
     }
   }
 }
diff --git a/tests/baselines/reference/parserModuleDeclaration6.types b/tests/baselines/reference/parserModuleDeclaration6.types
index 7d11c0a5ce3..012ad6f8270 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 : number
+>number : unknown
 }
diff --git a/tests/baselines/reference/parserModuleDeclaration7.types b/tests/baselines/reference/parserModuleDeclaration7.types
index a593c2051a4..38f1c29e642 100644
--- a/tests/baselines/reference/parserModuleDeclaration7.types
+++ b/tests/baselines/reference/parserModuleDeclaration7.types
@@ -1,5 +1,5 @@
 === tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration7.ts ===
 module number.a {
->number : number
->a : a
+>number : unknown
+>a : unknown
 }
diff --git a/tests/baselines/reference/parserModuleDeclaration8.types b/tests/baselines/reference/parserModuleDeclaration8.types
index 9247cebe11f..474e81dbda0 100644
--- a/tests/baselines/reference/parserModuleDeclaration8.types
+++ b/tests/baselines/reference/parserModuleDeclaration8.types
@@ -1,5 +1,5 @@
 === tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration8.ts ===
 module a.number {
->a : a
->number : number
+>a : unknown
+>number : unknown
 }
diff --git a/tests/baselines/reference/parserModuleDeclaration9.types b/tests/baselines/reference/parserModuleDeclaration9.types
index cb3ab79e93d..1898d461290 100644
--- a/tests/baselines/reference/parserModuleDeclaration9.types
+++ b/tests/baselines/reference/parserModuleDeclaration9.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration9.ts ===
 module a.number.b {
->a : a
->number : number
->b : b
+>a : unknown
+>number : unknown
+>b : unknown
 }
diff --git a/tests/baselines/reference/partiallyAmbientClodule.types b/tests/baselines/reference/partiallyAmbientClodule.types
index 62918ddc107..c0cd877d05f 100644
--- a/tests/baselines/reference/partiallyAmbientClodule.types
+++ b/tests/baselines/reference/partiallyAmbientClodule.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/partiallyAmbientClodule.ts ===
 declare module foo {
->foo : foo
+>foo : typeof foo
 
     export function x(): any;
 >x : typeof x
diff --git a/tests/baselines/reference/partiallyAmbientFundule.types b/tests/baselines/reference/partiallyAmbientFundule.types
index 12e1ad32d1d..37f59588a7c 100644
--- a/tests/baselines/reference/partiallyAmbientFundule.types
+++ b/tests/baselines/reference/partiallyAmbientFundule.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/partiallyAmbientFundule.ts ===
 declare module foo {
->foo : foo
+>foo : typeof foo
 
     export function x(): any;
 >x : typeof x
diff --git a/tests/baselines/reference/plusOperatorWithBooleanType.types b/tests/baselines/reference/plusOperatorWithBooleanType.types
index 5eccf25953d..79d10141cb8 100644
--- a/tests/baselines/reference/plusOperatorWithBooleanType.types
+++ b/tests/baselines/reference/plusOperatorWithBooleanType.types
@@ -16,7 +16,7 @@ class A {
 >foo : () => boolean
 }
 module M {
->M : M
+>M : typeof M
 
     export var n: boolean;
 >n : boolean
diff --git a/tests/baselines/reference/plusOperatorWithNumberType.types b/tests/baselines/reference/plusOperatorWithNumberType.types
index 8f8117f1081..7c605ca37d0 100644
--- a/tests/baselines/reference/plusOperatorWithNumberType.types
+++ b/tests/baselines/reference/plusOperatorWithNumberType.types
@@ -20,7 +20,7 @@ class A {
 >foo : () => number
 }
 module M {
->M : M
+>M : typeof M
 
     export var n: number;
 >n : number
diff --git a/tests/baselines/reference/plusOperatorWithStringType.types b/tests/baselines/reference/plusOperatorWithStringType.types
index 0187e3f298c..e8915a8b60a 100644
--- a/tests/baselines/reference/plusOperatorWithStringType.types
+++ b/tests/baselines/reference/plusOperatorWithStringType.types
@@ -20,7 +20,7 @@ class A {
 >foo : () => string
 }
 module M {
->M : M
+>M : typeof M
 
     export var n: string;
 >n : string
diff --git a/tests/baselines/reference/primitiveTypeAsmoduleName.types b/tests/baselines/reference/primitiveTypeAsmoduleName.types
index 5bd74e4bebc..52a3933b745 100644
--- a/tests/baselines/reference/primitiveTypeAsmoduleName.types
+++ b/tests/baselines/reference/primitiveTypeAsmoduleName.types
@@ -1,4 +1,4 @@
 === tests/cases/compiler/primitiveTypeAsmoduleName.ts ===
 module string {}
->string : string
+>string : unknown
 
diff --git a/tests/baselines/reference/privacyCheckAnonymousFunctionParameter.types b/tests/baselines/reference/privacyCheckAnonymousFunctionParameter.types
index a79456c75c9..2ce71bdacfa 100644
--- a/tests/baselines/reference/privacyCheckAnonymousFunctionParameter.types
+++ b/tests/baselines/reference/privacyCheckAnonymousFunctionParameter.types
@@ -8,7 +8,7 @@ interface Iterator<T> {
 }
 
 module Query {
->Query : Query
+>Query : typeof Query
 
     export function fromDoWhile<T>(doWhile: (test: Iterator<T>) => boolean): Iterator<T> {
 >fromDoWhile : typeof fromDoWhile
diff --git a/tests/baselines/reference/privacyCheckAnonymousFunctionParameter2.types b/tests/baselines/reference/privacyCheckAnonymousFunctionParameter2.types
index cb8fbfb308f..7854f5f9b77 100644
--- a/tests/baselines/reference/privacyCheckAnonymousFunctionParameter2.types
+++ b/tests/baselines/reference/privacyCheckAnonymousFunctionParameter2.types
@@ -9,7 +9,7 @@ interface Iterator<T> { x: T }
 >T : T
 
 module Q {
->Q : Q
+>Q : typeof Q
 
     export function foo<T>(x: (a: Iterator<T>) => number) {
 >foo : typeof foo
@@ -25,7 +25,7 @@ module Q {
 }
 
 module Q {
->Q : Q
+>Q : typeof Q
 
     function bar() {
 >bar : typeof bar
diff --git a/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface1.types b/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface1.types
index adc228bc582..9fa07a674f3 100644
--- a/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface1.types
+++ b/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface1.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/privacyCheckExportAssignmentOnExportedGenericInterface1.ts ===
 module Foo {
->Foo : Foo
+>Foo : new () => A<Foo<string>>
 
     export interface A<T> {
 >A : A<T>
diff --git a/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface2.types b/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface2.types
index 522885cd979..8c89db63515 100644
--- a/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface2.types
+++ b/tests/baselines/reference/privacyCheckExportAssignmentOnExportedGenericInterface2.types
@@ -20,7 +20,7 @@ function Foo<T>(array: T[]): Foo<T> {
 }
 
 module Foo {
->Foo : Foo
+>Foo : typeof Foo
 
     export var x = "hello";
 >x : string
diff --git a/tests/baselines/reference/privacyCheckExternalModuleExportAssignmentOfGenericClass.types b/tests/baselines/reference/privacyCheckExternalModuleExportAssignmentOfGenericClass.types
index 7c310ece8bc..2259b039c91 100644
--- a/tests/baselines/reference/privacyCheckExternalModuleExportAssignmentOfGenericClass.types
+++ b/tests/baselines/reference/privacyCheckExternalModuleExportAssignmentOfGenericClass.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/privacyCheckExternalModuleExportAssignmentOfGenericClass_1.ts ===
 import Foo = require("privacyCheckExternalModuleExportAssignmentOfGenericClass_0");
->Foo : Foo
+>Foo : typeof Foo
 
 export = Bar;
 >Bar : Bar
diff --git a/tests/baselines/reference/privacyClass.types b/tests/baselines/reference/privacyClass.types
index 449639e298e..d42133ad9ec 100644
--- a/tests/baselines/reference/privacyClass.types
+++ b/tests/baselines/reference/privacyClass.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/privacyClass.ts ===
 export module m1 {
->m1 : m1
+>m1 : typeof m1
 
     export interface m1_i_public {
 >m1_i_public : m1_i_public
@@ -84,7 +84,7 @@ export module m1 {
 
 
 module m2 {
->m2 : m2
+>m2 : typeof m2
 
     export interface m2_i_public {
 >m2_i_public : m2_i_public
diff --git a/tests/baselines/reference/privacyFunc.types b/tests/baselines/reference/privacyFunc.types
index b82d1f5f9fd..367a5213a3a 100644
--- a/tests/baselines/reference/privacyFunc.types
+++ b/tests/baselines/reference/privacyFunc.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/privacyFunc.ts ===
 module m1 {
->m1 : m1
+>m1 : typeof m1
 
     export class C1_public {
 >C1_public : C1_public
diff --git a/tests/baselines/reference/privacyGetter.types b/tests/baselines/reference/privacyGetter.types
index 1a946eb581b..160d72a0279 100644
--- a/tests/baselines/reference/privacyGetter.types
+++ b/tests/baselines/reference/privacyGetter.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/privacyGetter.ts ===
 export module m1 {
->m1 : m1
+>m1 : typeof m1
 
     export class C1_public {
 >C1_public : C1_public
@@ -138,7 +138,7 @@ export module m1 {
 }
 
 module m2 {
->m2 : m2
+>m2 : typeof m2
 
     export class m2_C1_public {
 >m2_C1_public : m2_C1_public
diff --git a/tests/baselines/reference/privacyGloClass.types b/tests/baselines/reference/privacyGloClass.types
index ef078fca8a8..be0c8a74dcc 100644
--- a/tests/baselines/reference/privacyGloClass.types
+++ b/tests/baselines/reference/privacyGloClass.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/privacyGloClass.ts ===
 module m1 {
->m1 : m1
+>m1 : typeof m1
 
     export interface m1_i_public {
 >m1_i_public : m1_i_public
diff --git a/tests/baselines/reference/privacyGloFunc.types b/tests/baselines/reference/privacyGloFunc.types
index 6c112db5df6..8b8eacd4157 100644
--- a/tests/baselines/reference/privacyGloFunc.types
+++ b/tests/baselines/reference/privacyGloFunc.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/privacyGloFunc.ts ===
 export module m1 {
->m1 : m1
+>m1 : typeof m1
 
     export class C1_public {
 >C1_public : C1_public
@@ -362,7 +362,7 @@ export module m1 {
 }
 
 module m2 {
->m2 : m2
+>m2 : typeof m2
 
     export class m2_C1_public {
 >m2_C1_public : m2_C1_public
diff --git a/tests/baselines/reference/privacyGloGetter.types b/tests/baselines/reference/privacyGloGetter.types
index 053495077a2..6dc32ec095b 100644
--- a/tests/baselines/reference/privacyGloGetter.types
+++ b/tests/baselines/reference/privacyGloGetter.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/privacyGloGetter.ts ===
 module m1 {
->m1 : m1
+>m1 : typeof m1
 
     export class C1_public {
 >C1_public : C1_public
diff --git a/tests/baselines/reference/privacyGloInterface.types b/tests/baselines/reference/privacyGloInterface.types
index 5a53128e103..9c3a538c8a9 100644
--- a/tests/baselines/reference/privacyGloInterface.types
+++ b/tests/baselines/reference/privacyGloInterface.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/privacyGloInterface.ts ===
 module m1 {
->m1 : m1
+>m1 : typeof m1
 
     export class C1_public {
 >C1_public : C1_public
@@ -219,7 +219,7 @@ interface C7_public {
 }
 
 module m3 {
->m3 : m3
+>m3 : unknown
 
     export interface m3_i_public {
 >m3_i_public : m3_i_public
diff --git a/tests/baselines/reference/privacyGloVar.types b/tests/baselines/reference/privacyGloVar.types
index 1c878edbd6c..173d6326da5 100644
--- a/tests/baselines/reference/privacyGloVar.types
+++ b/tests/baselines/reference/privacyGloVar.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/privacyGloVar.ts ===
 module m1 {
->m1 : m1
+>m1 : typeof m1
 
     export class C1_public {
 >C1_public : C1_public
diff --git a/tests/baselines/reference/privacyInterface.types b/tests/baselines/reference/privacyInterface.types
index a9ed5107a4d..a96b8de9d81 100644
--- a/tests/baselines/reference/privacyInterface.types
+++ b/tests/baselines/reference/privacyInterface.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/privacyInterface.ts ===
 export module m1 {
->m1 : m1
+>m1 : typeof m1
 
     export class C1_public {
 >C1_public : C1_public
@@ -172,7 +172,7 @@ export module m1 {
 
 
 module m2 {
->m2 : m2
+>m2 : typeof m2
 
     export class C1_public {
 >C1_public : C1_public
@@ -510,7 +510,7 @@ interface C8_private {
 }
 
 export module m3 {
->m3 : m3
+>m3 : unknown
 
     export interface m3_i_public {
 >m3_i_public : m3_i_public
@@ -557,7 +557,7 @@ export module m3 {
 
 
 module m4 {
->m4 : m4
+>m4 : unknown
 
     export interface m4_i_public {
 >m4_i_public : m4_i_public
diff --git a/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithExport.types b/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithExport.types
index 50ac3b74788..b6d3d2967dc 100644
--- a/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithExport.types
+++ b/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithExport.types
@@ -3,16 +3,16 @@
 ///<reference path='privacyTopLevelAmbientExternalModuleImportWithExport_require3.ts'/>
 // Privacy errors - importing private elements
 export import im_public_mi_private = require("privacyTopLevelAmbientExternalModuleImportWithExport_require");
->im_public_mi_private : im_public_mi_private
+>im_public_mi_private : typeof im_public_mi_private
 
 export import im_public_mu_private = require("privacyTopLevelAmbientExternalModuleImportWithExport_require1");
->im_public_mu_private : im_public_mu_private
+>im_public_mu_private : typeof im_public_mu_private
 
 export import im_public_mi_public = require("m");
->im_public_mi_public : im_public_mi_public
+>im_public_mi_public : typeof im_public_mi_public
 
 export import im_public_mu_public = require("m2");
->im_public_mu_public : im_public_mu_public
+>im_public_mu_public : typeof im_public_mu_public
 
 // Usage of privacy error imports
 var privateUse_im_public_mi_private = new im_public_mi_private.c_public();
diff --git a/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithoutExport.types b/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithoutExport.types
index 3d9eb2028fb..437d35fb64a 100644
--- a/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithoutExport.types
+++ b/tests/baselines/reference/privacyTopLevelAmbientExternalModuleImportWithoutExport.types
@@ -3,16 +3,16 @@
 ///<reference path='privacyTopLevelAmbientExternalModuleImportWithoutExport_require3.ts'/>
 // Privacy errors - importing private elements
 import im_private_mi_private = require("m");
->im_private_mi_private : im_private_mi_private
+>im_private_mi_private : typeof im_private_mi_private
 
 import im_private_mu_private = require("m2");
->im_private_mu_private : im_private_mu_private
+>im_private_mu_private : typeof im_private_mu_private
 
 import im_private_mi_public = require("privacyTopLevelAmbientExternalModuleImportWithoutExport_require");
->im_private_mi_public : im_private_mi_public
+>im_private_mi_public : typeof im_private_mi_public
 
 import im_private_mu_public = require("privacyTopLevelAmbientExternalModuleImportWithoutExport_require1");
->im_private_mu_public : im_private_mu_public
+>im_private_mu_public : typeof im_private_mu_public
 
 // Usage of privacy error imports
 var privateUse_im_private_mi_private = new im_private_mi_private.c_private();
diff --git a/tests/baselines/reference/privacyVar.types b/tests/baselines/reference/privacyVar.types
index 427c6efdc87..b5a96afb9e6 100644
--- a/tests/baselines/reference/privacyVar.types
+++ b/tests/baselines/reference/privacyVar.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/privacyVar.ts ===
 export module m1 {
->m1 : m1
+>m1 : typeof m1
 
     export class C1_public {
 >C1_public : C1_public
@@ -204,7 +204,7 @@ export module m1 {
 }
 
 module m2 {
->m2 : m2
+>m2 : typeof m2
 
     export class m2_C1_public {
 >m2_C1_public : m2_C1_public
diff --git a/tests/baselines/reference/privateInstanceVisibility.types b/tests/baselines/reference/privateInstanceVisibility.types
index a009095a9e1..109309ceb76 100644
--- a/tests/baselines/reference/privateInstanceVisibility.types
+++ b/tests/baselines/reference/privateInstanceVisibility.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/privateInstanceVisibility.ts ===
 module Test {
->Test : Test
+>Test : typeof Test
  
     export class Example {
 >Example : Example
diff --git a/tests/baselines/reference/propertyNamesWithStringLiteral.types b/tests/baselines/reference/propertyNamesWithStringLiteral.types
index 5c6ee71bf55..89e5771a4b0 100644
--- a/tests/baselines/reference/propertyNamesWithStringLiteral.types
+++ b/tests/baselines/reference/propertyNamesWithStringLiteral.types
@@ -23,7 +23,7 @@ interface NamedColors {
 >_Color : _Color
 }
 module Color {
->Color : Color
+>Color : typeof Color
 
     export var namedColors: NamedColors;
 >namedColors : NamedColors
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 04a013ff189..d438d846bf4 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
@@ -1,16 +1,16 @@
 === tests/cases/compiler/qualifiedName_ImportDeclarations-entity-names-referencing-a-var.ts ===
 module Alpha {
->Alpha : Alpha
+>Alpha : typeof Alpha
 
     export var x = 100;
 >x : number
 }
 
 module Beta {
->Beta : Beta
+>Beta : unknown
 
     import p = Alpha.x;
->p : p
+>p : number
 >Alpha : typeof Alpha
 >x : number
 }
diff --git a/tests/baselines/reference/reboundBaseClassSymbol.types b/tests/baselines/reference/reboundBaseClassSymbol.types
index 06c152d7855..1a62a7f71cb 100644
--- a/tests/baselines/reference/reboundBaseClassSymbol.types
+++ b/tests/baselines/reference/reboundBaseClassSymbol.types
@@ -4,7 +4,7 @@ interface A { a: number; }
 >a : number
 
 module Foo {
->Foo : Foo
+>Foo : typeof Foo
 
     var A = 1;
 >A : number
diff --git a/tests/baselines/reference/rectype.types b/tests/baselines/reference/rectype.types
index e26748085c0..5d8da81c3e1 100644
--- a/tests/baselines/reference/rectype.types
+++ b/tests/baselines/reference/rectype.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/rectype.ts ===
 module M {
->M : M
+>M : typeof M
 
     interface I { (i:I):I; }
 >I : I
diff --git a/tests/baselines/reference/recursiveClassInstantiationsWithDefaultConstructors.types b/tests/baselines/reference/recursiveClassInstantiationsWithDefaultConstructors.types
index 97d0c5f7a9a..49a97bdb656 100644
--- a/tests/baselines/reference/recursiveClassInstantiationsWithDefaultConstructors.types
+++ b/tests/baselines/reference/recursiveClassInstantiationsWithDefaultConstructors.types
@@ -7,7 +7,7 @@ var a = new TypeScript2.MemberNameArray()
 >MemberNameArray : typeof TypeScript2.MemberNameArray
 
 module TypeScript2 {
->TypeScript2 : TypeScript2
+>TypeScript2 : typeof TypeScript2
 
 export class MemberName {
 >MemberName : MemberName
diff --git a/tests/baselines/reference/recursiveCloduleReference.types b/tests/baselines/reference/recursiveCloduleReference.types
index 953bf0e4b2e..b5de969cabe 100644
--- a/tests/baselines/reference/recursiveCloduleReference.types
+++ b/tests/baselines/reference/recursiveCloduleReference.types
@@ -1,12 +1,12 @@
 === tests/cases/compiler/recursiveCloduleReference.ts ===
 module M
->M : M
+>M : typeof M
 {
   export class C {
 >C : C
   }
   export module C {
->C : M.C
+>C : typeof M.C
 
     export var C = M.C
 >C : typeof M.C
diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType7.types b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType7.types
index fb2d460038b..3e4708e94eb 100644
--- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType7.types
+++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType7.types
@@ -1,9 +1,9 @@
 === tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType7_moduleA.ts ===
 import moduleC = require("recursiveExportAssignmentAndFindAliasedType7_moduleC");
->moduleC : moduleC
+>moduleC : any
 
 import ClassB = require("recursiveExportAssignmentAndFindAliasedType7_moduleB");
->ClassB : ClassB
+>ClassB : typeof ClassB
 
 export var b: ClassB; // This should result in type ClassB
 >b : ClassB
@@ -11,7 +11,7 @@ export var b: ClassB; // This should result in type ClassB
 
 === tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType7_moduleC.ts ===
 import self = require("recursiveExportAssignmentAndFindAliasedType7_moduleD");
->self : self
+>self : any
 
 var selfVar = self;
 >selfVar : any
@@ -22,14 +22,14 @@ export = selfVar;
 
 === tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType7_moduleD.ts ===
 import self = require("recursiveExportAssignmentAndFindAliasedType7_moduleE");
->self : self
+>self : any
 
 export = self;
 >self : any
 
 === tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType7_moduleE.ts ===
 import self = require("recursiveExportAssignmentAndFindAliasedType7_moduleC");
->self : self
+>self : any
 
 export = self;
 >self : any
diff --git a/tests/baselines/reference/recursiveIdenticalOverloadResolution.types b/tests/baselines/reference/recursiveIdenticalOverloadResolution.types
index e1089848276..18000888d4f 100644
--- a/tests/baselines/reference/recursiveIdenticalOverloadResolution.types
+++ b/tests/baselines/reference/recursiveIdenticalOverloadResolution.types
@@ -1,7 +1,7 @@
 === tests/cases/compiler/recursiveIdenticalOverloadResolution.ts ===
 
 module M {
->M : M
+>M : typeof M
 
    interface I { (i: I): I; }
 >I : I
diff --git a/tests/baselines/reference/recursiveMods.types b/tests/baselines/reference/recursiveMods.types
index 19a22d892dd..016b9a72129 100644
--- a/tests/baselines/reference/recursiveMods.types
+++ b/tests/baselines/reference/recursiveMods.types
@@ -1,13 +1,13 @@
 === tests/cases/compiler/recursiveMods.ts ===
 export module Foo {
->Foo : Foo
+>Foo : typeof Foo
 
 	export class C {}
 >C : C
 }
 
 export module Foo {
->Foo : Foo
+>Foo : typeof Foo
 
 	function Bar() : C {
 >Bar : typeof Bar
diff --git a/tests/baselines/reference/recursivelySpecializedConstructorDeclaration.types b/tests/baselines/reference/recursivelySpecializedConstructorDeclaration.types
index 37840c44da6..bccd226ceba 100644
--- a/tests/baselines/reference/recursivelySpecializedConstructorDeclaration.types
+++ b/tests/baselines/reference/recursivelySpecializedConstructorDeclaration.types
@@ -1,9 +1,9 @@
 === tests/cases/compiler/recursivelySpecializedConstructorDeclaration.ts ===
 module MsPortal.Controls.Base.ItemList {
->MsPortal : MsPortal
->Controls : Controls
->Base : Base
->ItemList : ItemList
+>MsPortal : typeof MsPortal
+>Controls : typeof Controls
+>Base : typeof Base
+>ItemList : typeof ItemList
 
     export interface Interface<TValue> {
 >Interface : Interface<TValue>
diff --git a/tests/baselines/reference/requireEmitSemicolon.types b/tests/baselines/reference/requireEmitSemicolon.types
index 5f35f6ee4f2..692cfcfe63f 100644
--- a/tests/baselines/reference/requireEmitSemicolon.types
+++ b/tests/baselines/reference/requireEmitSemicolon.types
@@ -1,10 +1,10 @@
 === tests/cases/compiler/requireEmitSemicolon_1.ts ===
 ///<reference path='requireEmitSemicolon_0.ts'/>
 import P = require("requireEmitSemicolon_0"); // bug was we were not emitting a ; here and causing runtime failures in node
->P : P
+>P : typeof P
 
 export module Database {
->Database : Database
+>Database : typeof Database
 
 	export class DB {
 >DB : DB
@@ -12,8 +12,8 @@ export module Database {
 	    public findPerson(id: number): P.Models.Person {
 >findPerson : (id: number) => P.Models.Person
 >id : number
->P : P
->Models : P.Models
+>P : unknown
+>Models : unknown
 >Person : P.Models.Person
 
 	        return new P.Models.Person("Rock");
@@ -28,7 +28,7 @@ export module Database {
 } 
 === tests/cases/compiler/requireEmitSemicolon_0.ts ===
 export module Models {
->Models : Models
+>Models : typeof Models
 
 	export class Person {
 >Person : Person
diff --git a/tests/baselines/reference/reservedNameOnModuleImport.types b/tests/baselines/reference/reservedNameOnModuleImport.types
index 1450c52840f..f515b45fab8 100644
--- a/tests/baselines/reference/reservedNameOnModuleImport.types
+++ b/tests/baselines/reference/reservedNameOnModuleImport.types
@@ -1,13 +1,13 @@
 === tests/cases/compiler/reservedNameOnModuleImport.ts ===
 declare module test {
->test : test
+>test : typeof test
 
     module mstring { }
->mstring : mstring
+>mstring : unknown
 
     // Should be fine; this does not clobber any declared values.
     export import string = mstring;
->string : string
->mstring : mstring
+>string : unknown
+>mstring : unknown
 }
 
diff --git a/tests/baselines/reference/resolvingClassDeclarationWhenInBaseTypeResolution.types b/tests/baselines/reference/resolvingClassDeclarationWhenInBaseTypeResolution.types
index db60a7f845b..7f0163cf1e3 100644
--- a/tests/baselines/reference/resolvingClassDeclarationWhenInBaseTypeResolution.types
+++ b/tests/baselines/reference/resolvingClassDeclarationWhenInBaseTypeResolution.types
@@ -1,14 +1,14 @@
 === tests/cases/compiler/resolvingClassDeclarationWhenInBaseTypeResolution.ts ===
 module rionegrensis {
->rionegrensis : rionegrensis
+>rionegrensis : typeof rionegrensis
 
   export class caniventer extends Lanthanum.nitidus<petrophilus.minutilla, julianae.sumatrana> {
 >caniventer : caniventer
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >nitidus : Lanthanum.nitidus<T0, T1>
->petrophilus : petrophilus
+>petrophilus : unknown
 >minutilla : petrophilus.minutilla
->julianae : julianae
+>julianae : unknown
 >sumatrana : julianae.sumatrana
 
     salomonseni() : caniventer { var x : caniventer; () => { var y = this; }; return x; }
@@ -23,10 +23,10 @@ module rionegrensis {
 
     uchidai() : lavali.xanthognathus { var x : lavali.xanthognathus; () => { var y = this; }; return x; }
 >uchidai : () => lavali.xanthognathus
->lavali : lavali
+>lavali : unknown
 >xanthognathus : lavali.xanthognathus
 >x : lavali.xanthognathus
->lavali : lavali
+>lavali : unknown
 >xanthognathus : lavali.xanthognathus
 >() => { var y = this; } : () => void
 >y : caniventer
@@ -35,10 +35,10 @@ module rionegrensis {
 
     raffrayana() : lavali.otion { var x : lavali.otion; () => { var y = this; }; return x; }
 >raffrayana : () => lavali.otion
->lavali : lavali
+>lavali : unknown
 >otion : lavali.otion
 >x : lavali.otion
->lavali : lavali
+>lavali : unknown
 >otion : lavali.otion
 >() => { var y = this; } : () => void
 >y : caniventer
@@ -47,26 +47,26 @@ 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 : minutus
+>minutus : unknown
 >inez : minutus.inez<T0, T1>
->minutus : minutus
+>minutus : unknown
 >inez : minutus.inez<T0, T1>
->sagitta : sagitta
+>sagitta : unknown
 >stolzmanni : sagitta.stolzmanni
->dammermani : dammermani
+>dammermani : unknown
 >melanops : dammermani.melanops
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >falconeri : trivirgatus.falconeri
 >x : minutus.inez<minutus.inez<sagitta.stolzmanni, dammermani.melanops>, trivirgatus.falconeri>
->minutus : minutus
+>minutus : unknown
 >inez : minutus.inez<T0, T1>
->minutus : minutus
+>minutus : unknown
 >inez : minutus.inez<T0, T1>
->sagitta : sagitta
+>sagitta : unknown
 >stolzmanni : sagitta.stolzmanni
->dammermani : dammermani
+>dammermani : unknown
 >melanops : dammermani.melanops
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >falconeri : trivirgatus.falconeri
 >() => { var y = this; } : () => void
 >y : caniventer
@@ -75,10 +75,10 @@ module rionegrensis {
 
     nayaur() : gabriellae.amicus { var x : gabriellae.amicus; () => { var y = this; }; return x; }
 >nayaur : () => gabriellae.amicus
->gabriellae : gabriellae
+>gabriellae : unknown
 >amicus : gabriellae.amicus
 >x : gabriellae.amicus
->gabriellae : gabriellae
+>gabriellae : unknown
 >amicus : gabriellae.amicus
 >() => { var y = this; } : () => void
 >y : caniventer
@@ -89,35 +89,35 @@ module rionegrensis {
 >veraecrucis : veraecrucis<T0, T1>
 >T0 : T0
 >T1 : T1
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >mixtus : trivirgatus.mixtus<T0, T1>
->gabriellae : gabriellae
+>gabriellae : unknown
 >amicus : gabriellae.amicus
->lutreolus : lutreolus
+>lutreolus : unknown
 >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 : panamensis
+>panamensis : unknown
 >setulosus : panamensis.setulosus<T0, T1>
->lutreolus : lutreolus
+>lutreolus : unknown
 >punicus : lutreolus.punicus
->howi : howi
+>howi : unknown
 >coludo : howi.coludo<T0, T1>
->quasiater : quasiater
+>quasiater : unknown
 >bobrinskoi : quasiater.bobrinskoi
->provocax : provocax
+>provocax : unknown
 >melanoleuca : provocax.melanoleuca
 >x : panamensis.setulosus<lutreolus.punicus, howi.coludo<quasiater.bobrinskoi, provocax.melanoleuca>>
->panamensis : panamensis
+>panamensis : unknown
 >setulosus : panamensis.setulosus<T0, T1>
->lutreolus : lutreolus
+>lutreolus : unknown
 >punicus : lutreolus.punicus
->howi : howi
+>howi : unknown
 >coludo : howi.coludo<T0, T1>
->quasiater : quasiater
+>quasiater : unknown
 >bobrinskoi : quasiater.bobrinskoi
->provocax : provocax
+>provocax : unknown
 >melanoleuca : provocax.melanoleuca
 >() => { var y = this; } : () => void
 >y : veraecrucis<T0, T1>
@@ -126,18 +126,18 @@ 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 : imperfecta
+>imperfecta : unknown
 >ciliolabrum : imperfecta.ciliolabrum<T0, T1>
->argurus : argurus
+>argurus : unknown
 >oreas : argurus.oreas
->argurus : argurus
+>argurus : unknown
 >peninsulae : argurus.peninsulae
 >x : imperfecta.ciliolabrum<argurus.oreas, argurus.peninsulae>
->imperfecta : imperfecta
+>imperfecta : unknown
 >ciliolabrum : imperfecta.ciliolabrum<T0, T1>
->argurus : argurus
+>argurus : unknown
 >oreas : argurus.oreas
->argurus : argurus
+>argurus : unknown
 >peninsulae : argurus.peninsulae
 >() => { var y = this; } : () => void
 >y : veraecrucis<T0, T1>
@@ -146,34 +146,34 @@ 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 : argurus
+>argurus : unknown
 >gilbertii : argurus.gilbertii<T0, T1>
->panamensis : panamensis
+>panamensis : unknown
 >linulus : panamensis.linulus<T0, T1>
->lavali : lavali
+>lavali : unknown
 >lepturus : lavali.lepturus
->argurus : argurus
+>argurus : unknown
 >oreas : argurus.oreas
->sagitta : sagitta
+>sagitta : unknown
 >cinereus : sagitta.cinereus<T0, T1>
->lavali : lavali
+>lavali : unknown
 >xanthognathus : lavali.xanthognathus
->argurus : argurus
+>argurus : unknown
 >oreas : argurus.oreas
 >x : argurus.gilbertii<panamensis.linulus<lavali.lepturus, argurus.oreas>, sagitta.cinereus<lavali.xanthognathus, argurus.oreas>>
->argurus : argurus
+>argurus : unknown
 >gilbertii : argurus.gilbertii<T0, T1>
->panamensis : panamensis
+>panamensis : unknown
 >linulus : panamensis.linulus<T0, T1>
->lavali : lavali
+>lavali : unknown
 >lepturus : lavali.lepturus
->argurus : argurus
+>argurus : unknown
 >oreas : argurus.oreas
->sagitta : sagitta
+>sagitta : unknown
 >cinereus : sagitta.cinereus<T0, T1>
->lavali : lavali
+>lavali : unknown
 >xanthognathus : lavali.xanthognathus
->argurus : argurus
+>argurus : unknown
 >oreas : argurus.oreas
 >() => { var y = this; } : () => void
 >y : veraecrucis<T0, T1>
@@ -182,10 +182,10 @@ module rionegrensis {
 
     palliolata() : Lanthanum.jugularis { var x : Lanthanum.jugularis; () => { var y = this; }; return x; }
 >palliolata : () => Lanthanum.jugularis
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >jugularis : Lanthanum.jugularis
 >x : Lanthanum.jugularis
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >jugularis : Lanthanum.jugularis
 >() => { var y = this; } : () => void
 >y : veraecrucis<T0, T1>
@@ -194,10 +194,10 @@ module rionegrensis {
 
     nivicola() : samarensis.pallidus { var x : samarensis.pallidus; () => { var y = this; }; return x; }
 >nivicola : () => samarensis.pallidus
->samarensis : samarensis
+>samarensis : unknown
 >pallidus : samarensis.pallidus
 >x : samarensis.pallidus
->samarensis : samarensis
+>samarensis : unknown
 >pallidus : samarensis.pallidus
 >() => { var y = this; } : () => void
 >y : veraecrucis<T0, T1>
@@ -206,7 +206,7 @@ module rionegrensis {
   }
 }
 module julianae {
->julianae : julianae
+>julianae : typeof julianae
 
   export class steerii {
 >steerii : steerii
@@ -216,10 +216,10 @@ module julianae {
 
     brandtii() : argurus.germaini { var x : argurus.germaini; () => { var y = this; }; return x; }
 >brandtii : () => argurus.germaini
->argurus : argurus
+>argurus : unknown
 >germaini : argurus.germaini
 >x : argurus.germaini
->argurus : argurus
+>argurus : unknown
 >germaini : argurus.germaini
 >() => { var y = this; } : () => void
 >y : nudicaudus
@@ -228,18 +228,18 @@ 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 : ruatanica
+>ruatanica : unknown
 >Praseodymium : ruatanica.Praseodymium<T0, T1>
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >jugularis : Lanthanum.jugularis
->dammermani : dammermani
+>dammermani : unknown
 >melanops : dammermani.melanops
 >x : ruatanica.Praseodymium<Lanthanum.jugularis, dammermani.melanops>
->ruatanica : ruatanica
+>ruatanica : unknown
 >Praseodymium : ruatanica.Praseodymium<T0, T1>
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >jugularis : Lanthanum.jugularis
->dammermani : dammermani
+>dammermani : unknown
 >melanops : dammermani.melanops
 >() => { var y = this; } : () => void
 >y : nudicaudus
@@ -248,18 +248,18 @@ 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 : panglima
+>panglima : unknown
 >abidi : panglima.abidi<T0, T1>
->dogramacii : dogramacii
+>dogramacii : unknown
 >kaiseri : dogramacii.kaiseri
->lavali : lavali
+>lavali : unknown
 >wilsoni : lavali.wilsoni
 >x : panglima.abidi<dogramacii.kaiseri, lavali.wilsoni>
->panglima : panglima
+>panglima : unknown
 >abidi : panglima.abidi<T0, T1>
->dogramacii : dogramacii
+>dogramacii : unknown
 >kaiseri : dogramacii.kaiseri
->lavali : lavali
+>lavali : unknown
 >wilsoni : lavali.wilsoni
 >() => { var y = this; } : () => void
 >y : nudicaudus
@@ -268,10 +268,10 @@ module julianae {
 
     venezuelae() : howi.marcanoi { var x : howi.marcanoi; () => { var y = this; }; return x; }
 >venezuelae : () => howi.marcanoi
->howi : howi
+>howi : unknown
 >marcanoi : howi.marcanoi
 >x : howi.marcanoi
->howi : howi
+>howi : unknown
 >marcanoi : howi.marcanoi
 >() => { var y = this; } : () => void
 >y : nudicaudus
@@ -280,10 +280,10 @@ module julianae {
 
     zamicrus() : rionegrensis.caniventer { var x : rionegrensis.caniventer; () => { var y = this; }; return x; }
 >zamicrus : () => rionegrensis.caniventer
->rionegrensis : rionegrensis
+>rionegrensis : unknown
 >caniventer : rionegrensis.caniventer
 >x : rionegrensis.caniventer
->rionegrensis : rionegrensis
+>rionegrensis : unknown
 >caniventer : rionegrensis.caniventer
 >() => { var y = this; } : () => void
 >y : nudicaudus
@@ -295,18 +295,18 @@ 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 : panglima
+>panglima : unknown
 >amphibius : panglima.amphibius<T0, T1>
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >daphaenodon : macrorhinos.daphaenodon
->patas : patas
+>patas : unknown
 >uralensis : patas.uralensis
 >x : panglima.amphibius<macrorhinos.daphaenodon, patas.uralensis>
->panglima : panglima
+>panglima : unknown
 >amphibius : panglima.amphibius<T0, T1>
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >daphaenodon : macrorhinos.daphaenodon
->patas : patas
+>patas : unknown
 >uralensis : patas.uralensis
 >() => { var y = this; } : () => void
 >y : galapagoensis
@@ -315,10 +315,10 @@ module julianae {
 
     rueppellii() : ruatanica.americanus { var x : ruatanica.americanus; () => { var y = this; }; return x; }
 >rueppellii : () => ruatanica.americanus
->ruatanica : ruatanica
+>ruatanica : unknown
 >americanus : ruatanica.americanus
 >x : ruatanica.americanus
->ruatanica : ruatanica
+>ruatanica : unknown
 >americanus : ruatanica.americanus
 >() => { var y = this; } : () => void
 >y : galapagoensis
@@ -327,10 +327,10 @@ module julianae {
 
     peregusna() : dogramacii.kaiseri { var x : dogramacii.kaiseri; () => { var y = this; }; return x; }
 >peregusna : () => dogramacii.kaiseri
->dogramacii : dogramacii
+>dogramacii : unknown
 >kaiseri : dogramacii.kaiseri
 >x : dogramacii.kaiseri
->dogramacii : dogramacii
+>dogramacii : unknown
 >kaiseri : dogramacii.kaiseri
 >() => { var y = this; } : () => void
 >y : galapagoensis
@@ -339,18 +339,18 @@ 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 : howi
+>howi : unknown
 >coludo : howi.coludo<T0, T1>
->howi : howi
+>howi : unknown
 >marcanoi : howi.marcanoi
->lavali : lavali
+>lavali : unknown
 >wilsoni : lavali.wilsoni
 >x : howi.coludo<howi.marcanoi, lavali.wilsoni>
->howi : howi
+>howi : unknown
 >coludo : howi.coludo<T0, T1>
->howi : howi
+>howi : unknown
 >marcanoi : howi.marcanoi
->lavali : lavali
+>lavali : unknown
 >wilsoni : lavali.wilsoni
 >() => { var y = this; } : () => void
 >y : galapagoensis
@@ -359,10 +359,10 @@ module julianae {
 
     banakrisi() : macrorhinos.daphaenodon { var x : macrorhinos.daphaenodon; () => { var y = this; }; return x; }
 >banakrisi : () => macrorhinos.daphaenodon
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >daphaenodon : macrorhinos.daphaenodon
 >x : macrorhinos.daphaenodon
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >daphaenodon : macrorhinos.daphaenodon
 >() => { var y = this; } : () => void
 >y : galapagoensis
@@ -371,10 +371,10 @@ module julianae {
 
     rozendaali() : lutreolus.foina { var x : lutreolus.foina; () => { var y = this; }; return x; }
 >rozendaali : () => lutreolus.foina
->lutreolus : lutreolus
+>lutreolus : unknown
 >foina : lutreolus.foina
 >x : lutreolus.foina
->lutreolus : lutreolus
+>lutreolus : unknown
 >foina : lutreolus.foina
 >() => { var y = this; } : () => void
 >y : galapagoensis
@@ -383,18 +383,18 @@ 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 : panamensis
+>panamensis : unknown
 >linulus : panamensis.linulus<T0, T1>
->caurinus : caurinus
+>caurinus : unknown
 >megaphyllus : caurinus.megaphyllus
->caurinus : caurinus
+>caurinus : unknown
 >megaphyllus : caurinus.megaphyllus
 >x : panamensis.linulus<caurinus.megaphyllus, caurinus.megaphyllus>
->panamensis : panamensis
+>panamensis : unknown
 >linulus : panamensis.linulus<T0, T1>
->caurinus : caurinus
+>caurinus : unknown
 >megaphyllus : caurinus.megaphyllus
->caurinus : caurinus
+>caurinus : unknown
 >megaphyllus : caurinus.megaphyllus
 >() => { var y = this; } : () => void
 >y : galapagoensis
@@ -408,26 +408,26 @@ module julianae {
 
     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 : samarensis
+>samarensis : unknown
 >fuscus : samarensis.fuscus<T0, T1>
->lavali : lavali
+>lavali : unknown
 >wilsoni : lavali.wilsoni
->chrysaeolus : chrysaeolus
+>chrysaeolus : unknown
 >sarasinorum : chrysaeolus.sarasinorum<T0, T1>
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >jugularis : Lanthanum.jugularis
->imperfecta : imperfecta
+>imperfecta : unknown
 >subspinosus : imperfecta.subspinosus
 >x : samarensis.fuscus<lavali.wilsoni, chrysaeolus.sarasinorum<Lanthanum.jugularis, imperfecta.subspinosus>>
->samarensis : samarensis
+>samarensis : unknown
 >fuscus : samarensis.fuscus<T0, T1>
->lavali : lavali
+>lavali : unknown
 >wilsoni : lavali.wilsoni
->chrysaeolus : chrysaeolus
+>chrysaeolus : unknown
 >sarasinorum : chrysaeolus.sarasinorum<T0, T1>
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >jugularis : Lanthanum.jugularis
->imperfecta : imperfecta
+>imperfecta : unknown
 >subspinosus : imperfecta.subspinosus
 >() => { var y = this; } : () => void
 >y : albidens<T0, T1>
@@ -446,18 +446,18 @@ 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 : argurus
+>argurus : unknown
 >dauricus : argurus.dauricus<T0, T1>
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >konganensis : macrorhinos.konganensis
->patas : patas
+>patas : unknown
 >uralensis : patas.uralensis
 >x : argurus.dauricus<macrorhinos.konganensis, patas.uralensis>
->argurus : argurus
+>argurus : unknown
 >dauricus : argurus.dauricus<T0, T1>
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >konganensis : macrorhinos.konganensis
->patas : patas
+>patas : unknown
 >uralensis : patas.uralensis
 >() => { var y = this; } : () => void
 >y : albidens<T0, T1>
@@ -466,10 +466,10 @@ module julianae {
 
     hirta() : Lanthanum.jugularis { var x : Lanthanum.jugularis; () => { var y = this; }; return x; }
 >hirta : () => Lanthanum.jugularis
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >jugularis : Lanthanum.jugularis
 >x : Lanthanum.jugularis
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >jugularis : Lanthanum.jugularis
 >() => { var y = this; } : () => void
 >y : albidens<T0, T1>
@@ -488,10 +488,10 @@ module julianae {
 
     macrophyllum() : howi.marcanoi { var x : howi.marcanoi; () => { var y = this; }; return x; }
 >macrophyllum : () => howi.marcanoi
->howi : howi
+>howi : unknown
 >marcanoi : howi.marcanoi
 >x : howi.marcanoi
->howi : howi
+>howi : unknown
 >marcanoi : howi.marcanoi
 >() => { var y = this; } : () => void
 >y : albidens<T0, T1>
@@ -500,10 +500,10 @@ module julianae {
 
     porcellus() : ruatanica.americanus { var x : ruatanica.americanus; () => { var y = this; }; return x; }
 >porcellus : () => ruatanica.americanus
->ruatanica : ruatanica
+>ruatanica : unknown
 >americanus : ruatanica.americanus
 >x : ruatanica.americanus
->ruatanica : ruatanica
+>ruatanica : unknown
 >americanus : ruatanica.americanus
 >() => { var y = this; } : () => void
 >y : albidens<T0, T1>
@@ -514,15 +514,15 @@ module julianae {
 >oralis : oralis<T0, T1>
 >T0 : T0
 >T1 : T1
->caurinus : caurinus
+>caurinus : unknown
 >psilurus : caurinus.psilurus
 
     cepapi() : caurinus.psilurus { var x : caurinus.psilurus; () => { var y = this; }; return x; }
 >cepapi : () => caurinus.psilurus
->caurinus : caurinus
+>caurinus : unknown
 >psilurus : caurinus.psilurus
 >x : caurinus.psilurus
->caurinus : caurinus
+>caurinus : unknown
 >psilurus : caurinus.psilurus
 >() => { var y = this; } : () => void
 >y : oralis<T0, T1>
@@ -531,10 +531,10 @@ module julianae {
 
     porteri() : lavali.thaeleri { var x : lavali.thaeleri; () => { var y = this; }; return x; }
 >porteri : () => lavali.thaeleri
->lavali : lavali
+>lavali : unknown
 >thaeleri : lavali.thaeleri
 >x : lavali.thaeleri
->lavali : lavali
+>lavali : unknown
 >thaeleri : lavali.thaeleri
 >() => { var y = this; } : () => void
 >y : oralis<T0, T1>
@@ -543,26 +543,26 @@ 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 : caurinus
+>caurinus : unknown
 >mahaganus : caurinus.mahaganus<T0, T1>
->gabriellae : gabriellae
+>gabriellae : unknown
 >amicus : gabriellae.amicus
->panglima : panglima
+>panglima : unknown
 >amphibius : panglima.amphibius<T0, T1>
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >daphaenodon : macrorhinos.daphaenodon
->patas : patas
+>patas : unknown
 >uralensis : patas.uralensis
 >x : caurinus.mahaganus<gabriellae.amicus, panglima.amphibius<macrorhinos.daphaenodon, patas.uralensis>>
->caurinus : caurinus
+>caurinus : unknown
 >mahaganus : caurinus.mahaganus<T0, T1>
->gabriellae : gabriellae
+>gabriellae : unknown
 >amicus : gabriellae.amicus
->panglima : panglima
+>panglima : unknown
 >amphibius : panglima.amphibius<T0, T1>
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >daphaenodon : macrorhinos.daphaenodon
->patas : patas
+>patas : unknown
 >uralensis : patas.uralensis
 >() => { var y = this; } : () => void
 >y : oralis<T0, T1>
@@ -571,10 +571,10 @@ module julianae {
 
     puda() : sagitta.stolzmanni { var x : sagitta.stolzmanni; () => { var y = this; }; return x; }
 >puda : () => sagitta.stolzmanni
->sagitta : sagitta
+>sagitta : unknown
 >stolzmanni : sagitta.stolzmanni
 >x : sagitta.stolzmanni
->sagitta : sagitta
+>sagitta : unknown
 >stolzmanni : sagitta.stolzmanni
 >() => { var y = this; } : () => void
 >y : oralis<T0, T1>
@@ -583,10 +583,10 @@ module julianae {
 
     mindorensis() : trivirgatus.falconeri { var x : trivirgatus.falconeri; () => { var y = this; }; return x; }
 >mindorensis : () => trivirgatus.falconeri
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >falconeri : trivirgatus.falconeri
 >x : trivirgatus.falconeri
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >falconeri : trivirgatus.falconeri
 >() => { var y = this; } : () => void
 >y : oralis<T0, T1>
@@ -595,24 +595,24 @@ 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 : petrophilus
+>petrophilus : unknown
 >rosalia : petrophilus.rosalia<T0, T1>
->panamensis : panamensis
+>panamensis : unknown
 >setulosus : panamensis.setulosus<T0, T1>
->gabriellae : gabriellae
+>gabriellae : unknown
 >echinatus : gabriellae.echinatus
 >steerii : steerii
->lavali : lavali
+>lavali : unknown
 >wilsoni : lavali.wilsoni
 >x : petrophilus.rosalia<panamensis.setulosus<gabriellae.echinatus, steerii>, lavali.wilsoni>
->petrophilus : petrophilus
+>petrophilus : unknown
 >rosalia : petrophilus.rosalia<T0, T1>
->panamensis : panamensis
+>panamensis : unknown
 >setulosus : panamensis.setulosus<T0, T1>
->gabriellae : gabriellae
+>gabriellae : unknown
 >echinatus : gabriellae.echinatus
 >steerii : steerii
->lavali : lavali
+>lavali : unknown
 >wilsoni : lavali.wilsoni
 >() => { var y = this; } : () => void
 >y : oralis<T0, T1>
@@ -631,10 +631,10 @@ module julianae {
 
     monax() : imperfecta.subspinosus { var x : imperfecta.subspinosus; () => { var y = this; }; return x; }
 >monax : () => imperfecta.subspinosus
->imperfecta : imperfecta
+>imperfecta : unknown
 >subspinosus : imperfecta.subspinosus
 >x : imperfecta.subspinosus
->imperfecta : imperfecta
+>imperfecta : unknown
 >subspinosus : imperfecta.subspinosus
 >() => { var y = this; } : () => void
 >y : oralis<T0, T1>
@@ -643,34 +643,34 @@ 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 : minutus
+>minutus : unknown
 >inez : minutus.inez<T0, T1>
->rendalli : rendalli
+>rendalli : unknown
 >moojeni : rendalli.moojeni<T0, T1>
->panglima : panglima
+>panglima : unknown
 >amphibius : panglima.amphibius<T0, T1>
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >falconeri : trivirgatus.falconeri
->caurinus : caurinus
+>caurinus : unknown
 >psilurus : caurinus.psilurus
->gabriellae : gabriellae
+>gabriellae : unknown
 >echinatus : gabriellae.echinatus
->dogramacii : dogramacii
+>dogramacii : unknown
 >aurata : dogramacii.aurata
 >x : minutus.inez<rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>, dogramacii.aurata>
->minutus : minutus
+>minutus : unknown
 >inez : minutus.inez<T0, T1>
->rendalli : rendalli
+>rendalli : unknown
 >moojeni : rendalli.moojeni<T0, T1>
->panglima : panglima
+>panglima : unknown
 >amphibius : panglima.amphibius<T0, T1>
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >falconeri : trivirgatus.falconeri
->caurinus : caurinus
+>caurinus : unknown
 >psilurus : caurinus.psilurus
->gabriellae : gabriellae
+>gabriellae : unknown
 >echinatus : gabriellae.echinatus
->dogramacii : dogramacii
+>dogramacii : unknown
 >aurata : dogramacii.aurata
 >() => { var y = this; } : () => void
 >y : oralis<T0, T1>
@@ -679,26 +679,26 @@ 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 : howi
+>howi : unknown
 >angulatus : howi.angulatus<T0, T1>
->howi : howi
+>howi : unknown
 >coludo : howi.coludo<T0, T1>
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
->minutus : minutus
+>minutus : unknown
 >portoricensis : minutus.portoricensis
->petrophilus : petrophilus
+>petrophilus : unknown
 >minutilla : petrophilus.minutilla
 >x : howi.angulatus<howi.coludo<quasiater.carolinensis, minutus.portoricensis>, petrophilus.minutilla>
->howi : howi
+>howi : unknown
 >angulatus : howi.angulatus<T0, T1>
->howi : howi
+>howi : unknown
 >coludo : howi.coludo<T0, T1>
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
->minutus : minutus
+>minutus : unknown
 >portoricensis : minutus.portoricensis
->petrophilus : petrophilus
+>petrophilus : unknown
 >minutilla : petrophilus.minutilla
 >() => { var y = this; } : () => void
 >y : oralis<T0, T1>
@@ -707,10 +707,10 @@ module julianae {
 
     leucippe() : lavali.otion { var x : lavali.otion; () => { var y = this; }; return x; }
 >leucippe : () => lavali.otion
->lavali : lavali
+>lavali : unknown
 >otion : lavali.otion
 >x : lavali.otion
->lavali : lavali
+>lavali : unknown
 >otion : lavali.otion
 >() => { var y = this; } : () => void
 >y : oralis<T0, T1>
@@ -719,18 +719,18 @@ 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 : daubentonii
+>daubentonii : unknown
 >arboreus : daubentonii.arboreus<T0, T1>
->argurus : argurus
+>argurus : unknown
 >germaini : argurus.germaini
->sagitta : sagitta
+>sagitta : unknown
 >stolzmanni : sagitta.stolzmanni
 >x : daubentonii.arboreus<argurus.germaini, sagitta.stolzmanni>
->daubentonii : daubentonii
+>daubentonii : unknown
 >arboreus : daubentonii.arboreus<T0, T1>
->argurus : argurus
+>argurus : unknown
 >germaini : argurus.germaini
->sagitta : sagitta
+>sagitta : unknown
 >stolzmanni : sagitta.stolzmanni
 >() => { var y = this; } : () => void
 >y : oralis<T0, T1>
@@ -739,10 +739,10 @@ module julianae {
 
     eisentrauti() : rendalli.zuluensis { var x : rendalli.zuluensis; () => { var y = this; }; return x; }
 >eisentrauti : () => rendalli.zuluensis
->rendalli : rendalli
+>rendalli : unknown
 >zuluensis : rendalli.zuluensis
 >x : rendalli.zuluensis
->rendalli : rendalli
+>rendalli : unknown
 >zuluensis : rendalli.zuluensis
 >() => { var y = this; } : () => void
 >y : oralis<T0, T1>
@@ -751,23 +751,23 @@ module julianae {
   }
   export class sumatrana extends Lanthanum.jugularis {
 >sumatrana : sumatrana
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >jugularis : Lanthanum.jugularis
 
     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 : Lanthanum
+>Lanthanum : unknown
 >suillus : Lanthanum.suillus<T0, T1>
->dammermani : dammermani
+>dammermani : unknown
 >melanops : dammermani.melanops
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
 >x : Lanthanum.suillus<dammermani.melanops, quasiater.carolinensis>
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >suillus : Lanthanum.suillus<T0, T1>
->dammermani : dammermani
+>dammermani : unknown
 >melanops : dammermani.melanops
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
 >() => { var y = this; } : () => void
 >y : sumatrana
@@ -776,16 +776,16 @@ 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 : ruatanica
+>ruatanica : unknown
 >hector : ruatanica.hector<T0, T1>
 >sumatrana : sumatrana
->quasiater : quasiater
+>quasiater : unknown
 >bobrinskoi : quasiater.bobrinskoi
 >x : ruatanica.hector<sumatrana, quasiater.bobrinskoi>
->ruatanica : ruatanica
+>ruatanica : unknown
 >hector : ruatanica.hector<T0, T1>
 >sumatrana : sumatrana
->quasiater : quasiater
+>quasiater : unknown
 >bobrinskoi : quasiater.bobrinskoi
 >() => { var y = this; } : () => void
 >y : sumatrana
@@ -794,10 +794,10 @@ module julianae {
 
     awashensis() : petrophilus.minutilla { var x : petrophilus.minutilla; () => { var y = this; }; return x; }
 >awashensis : () => petrophilus.minutilla
->petrophilus : petrophilus
+>petrophilus : unknown
 >minutilla : petrophilus.minutilla
 >x : petrophilus.minutilla
->petrophilus : petrophilus
+>petrophilus : unknown
 >minutilla : petrophilus.minutilla
 >() => { var y = this; } : () => void
 >y : sumatrana
@@ -806,15 +806,15 @@ 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 : lutreolus
+>lutreolus : unknown
 >cor : lutreolus.cor<T0, T1>
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >jugularis : Lanthanum.jugularis
 >galapagoensis : galapagoensis
 >x : lutreolus.cor<Lanthanum.jugularis, galapagoensis>
->lutreolus : lutreolus
+>lutreolus : unknown
 >cor : lutreolus.cor<T0, T1>
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >jugularis : Lanthanum.jugularis
 >galapagoensis : galapagoensis
 >() => { var y = this; } : () => void
@@ -824,24 +824,24 @@ 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 : howi
+>howi : unknown
 >angulatus : howi.angulatus<T0, T1>
->dogramacii : dogramacii
+>dogramacii : unknown
 >aurata : dogramacii.aurata
 >gerbillus : gerbillus<T0, T1>
->lavali : lavali
+>lavali : unknown
 >thaeleri : lavali.thaeleri
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
 >x : howi.angulatus<dogramacii.aurata, gerbillus<lavali.thaeleri, quasiater.carolinensis>>
->howi : howi
+>howi : unknown
 >angulatus : howi.angulatus<T0, T1>
->dogramacii : dogramacii
+>dogramacii : unknown
 >aurata : dogramacii.aurata
 >gerbillus : gerbillus<T0, T1>
->lavali : lavali
+>lavali : unknown
 >thaeleri : lavali.thaeleri
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
 >() => { var y = this; } : () => void
 >y : sumatrana
@@ -850,10 +850,10 @@ module julianae {
 
     lyelli() : provocax.melanoleuca { var x : provocax.melanoleuca; () => { var y = this; }; return x; }
 >lyelli : () => provocax.melanoleuca
->provocax : provocax
+>provocax : unknown
 >melanoleuca : provocax.melanoleuca
 >x : provocax.melanoleuca
->provocax : provocax
+>provocax : unknown
 >melanoleuca : provocax.melanoleuca
 >() => { var y = this; } : () => void
 >y : sumatrana
@@ -862,18 +862,18 @@ 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 : dammermani
+>dammermani : unknown
 >siberu : dammermani.siberu<T0, T1>
->lutreolus : lutreolus
+>lutreolus : unknown
 >foina : lutreolus.foina
->samarensis : samarensis
+>samarensis : unknown
 >pallidus : samarensis.pallidus
 >x : dammermani.siberu<lutreolus.foina, samarensis.pallidus>
->dammermani : dammermani
+>dammermani : unknown
 >siberu : dammermani.siberu<T0, T1>
->lutreolus : lutreolus
+>lutreolus : unknown
 >foina : lutreolus.foina
->samarensis : samarensis
+>samarensis : unknown
 >pallidus : samarensis.pallidus
 >() => { var y = this; } : () => void
 >y : sumatrana
@@ -887,18 +887,18 @@ module julianae {
 
     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 : sagitta
+>sagitta : unknown
 >sicarius : sagitta.sicarius<T0, T1>
->dogramacii : dogramacii
+>dogramacii : unknown
 >koepckeae : dogramacii.koepckeae
->caurinus : caurinus
+>caurinus : unknown
 >psilurus : caurinus.psilurus
 >x : sagitta.sicarius<dogramacii.koepckeae, caurinus.psilurus>
->sagitta : sagitta
+>sagitta : unknown
 >sicarius : sagitta.sicarius<T0, T1>
->dogramacii : dogramacii
+>dogramacii : unknown
 >koepckeae : dogramacii.koepckeae
->caurinus : caurinus
+>caurinus : unknown
 >psilurus : caurinus.psilurus
 >() => { var y = this; } : () => void
 >y : gerbillus<T0, T1>
@@ -907,10 +907,10 @@ module julianae {
 
     tristrami() : petrophilus.minutilla { var x : petrophilus.minutilla; () => { var y = this; }; return x; }
 >tristrami : () => petrophilus.minutilla
->petrophilus : petrophilus
+>petrophilus : unknown
 >minutilla : petrophilus.minutilla
 >x : petrophilus.minutilla
->petrophilus : petrophilus
+>petrophilus : unknown
 >minutilla : petrophilus.minutilla
 >() => { var y = this; } : () => void
 >y : gerbillus<T0, T1>
@@ -919,10 +919,10 @@ module julianae {
 
     swarthi() : lutreolus.foina { var x : lutreolus.foina; () => { var y = this; }; return x; }
 >swarthi : () => lutreolus.foina
->lutreolus : lutreolus
+>lutreolus : unknown
 >foina : lutreolus.foina
 >x : lutreolus.foina
->lutreolus : lutreolus
+>lutreolus : unknown
 >foina : lutreolus.foina
 >() => { var y = this; } : () => void
 >y : gerbillus<T0, T1>
@@ -931,10 +931,10 @@ module julianae {
 
     horsfieldii() : trivirgatus.falconeri { var x : trivirgatus.falconeri; () => { var y = this; }; return x; }
 >horsfieldii : () => trivirgatus.falconeri
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >falconeri : trivirgatus.falconeri
 >x : trivirgatus.falconeri
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >falconeri : trivirgatus.falconeri
 >() => { var y = this; } : () => void
 >y : gerbillus<T0, T1>
@@ -943,18 +943,18 @@ 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 : imperfecta
+>imperfecta : unknown
 >lasiurus : imperfecta.lasiurus<T0, T1>
->lutreolus : lutreolus
+>lutreolus : unknown
 >foina : lutreolus.foina
->dammermani : dammermani
+>dammermani : unknown
 >melanops : dammermani.melanops
 >x : imperfecta.lasiurus<lutreolus.foina, dammermani.melanops>
->imperfecta : imperfecta
+>imperfecta : unknown
 >lasiurus : imperfecta.lasiurus<T0, T1>
->lutreolus : lutreolus
+>lutreolus : unknown
 >foina : lutreolus.foina
->dammermani : dammermani
+>dammermani : unknown
 >melanops : dammermani.melanops
 >() => { var y = this; } : () => void
 >y : gerbillus<T0, T1>
@@ -963,10 +963,10 @@ module julianae {
 
     rennelli() : argurus.luctuosa { var x : argurus.luctuosa; () => { var y = this; }; return x; }
 >rennelli : () => argurus.luctuosa
->argurus : argurus
+>argurus : unknown
 >luctuosa : argurus.luctuosa
 >x : argurus.luctuosa
->argurus : argurus
+>argurus : unknown
 >luctuosa : argurus.luctuosa
 >() => { var y = this; } : () => void
 >y : gerbillus<T0, T1>
@@ -975,10 +975,10 @@ module julianae {
 
     maulinus() : lavali.lepturus { var x : lavali.lepturus; () => { var y = this; }; return x; }
 >maulinus : () => lavali.lepturus
->lavali : lavali
+>lavali : unknown
 >lepturus : lavali.lepturus
 >x : lavali.lepturus
->lavali : lavali
+>lavali : unknown
 >lepturus : lavali.lepturus
 >() => { var y = this; } : () => void
 >y : gerbillus<T0, T1>
@@ -987,18 +987,18 @@ 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 : daubentonii
+>daubentonii : unknown
 >arboreus : daubentonii.arboreus<T0, T1>
->petrophilus : petrophilus
+>petrophilus : unknown
 >minutilla : petrophilus.minutilla
->argurus : argurus
+>argurus : unknown
 >peninsulae : argurus.peninsulae
 >x : daubentonii.arboreus<petrophilus.minutilla, argurus.peninsulae>
->daubentonii : daubentonii
+>daubentonii : unknown
 >arboreus : daubentonii.arboreus<T0, T1>
->petrophilus : petrophilus
+>petrophilus : unknown
 >minutilla : petrophilus.minutilla
->argurus : argurus
+>argurus : unknown
 >peninsulae : argurus.peninsulae
 >() => { var y = this; } : () => void
 >y : gerbillus<T0, T1>
@@ -1007,18 +1007,18 @@ 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 : sagitta
+>sagitta : unknown
 >leptoceros : sagitta.leptoceros<T0, T1>
->caurinus : caurinus
+>caurinus : unknown
 >psilurus : caurinus.psilurus
->gabriellae : gabriellae
+>gabriellae : unknown
 >echinatus : gabriellae.echinatus
 >x : sagitta.leptoceros<caurinus.psilurus, gabriellae.echinatus>
->sagitta : sagitta
+>sagitta : unknown
 >leptoceros : sagitta.leptoceros<T0, T1>
->caurinus : caurinus
+>caurinus : unknown
 >psilurus : caurinus.psilurus
->gabriellae : gabriellae
+>gabriellae : unknown
 >echinatus : gabriellae.echinatus
 >() => { var y = this; } : () => void
 >y : gerbillus<T0, T1>
@@ -1027,10 +1027,10 @@ module julianae {
 
     abramus() : lavali.thaeleri { var x : lavali.thaeleri; () => { var y = this; }; return x; }
 >abramus : () => lavali.thaeleri
->lavali : lavali
+>lavali : unknown
 >thaeleri : lavali.thaeleri
 >x : lavali.thaeleri
->lavali : lavali
+>lavali : unknown
 >thaeleri : lavali.thaeleri
 >() => { var y = this; } : () => void
 >y : gerbillus<T0, T1>
@@ -1039,10 +1039,10 @@ module julianae {
 
     reevesi() : provocax.melanoleuca { var x : provocax.melanoleuca; () => { var y = this; }; return x; }
 >reevesi : () => provocax.melanoleuca
->provocax : provocax
+>provocax : unknown
 >melanoleuca : provocax.melanoleuca
 >x : provocax.melanoleuca
->provocax : provocax
+>provocax : unknown
 >melanoleuca : provocax.melanoleuca
 >() => { var y = this; } : () => void
 >y : gerbillus<T0, T1>
@@ -1054,10 +1054,10 @@ module julianae {
 
     levicula() : lavali.lepturus { var x : lavali.lepturus; () => { var y = this; }; return x; }
 >levicula : () => lavali.lepturus
->lavali : lavali
+>lavali : unknown
 >lepturus : lavali.lepturus
 >x : lavali.lepturus
->lavali : lavali
+>lavali : unknown
 >lepturus : lavali.lepturus
 >() => { var y = this; } : () => void
 >y : acariensis
@@ -1066,18 +1066,18 @@ 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 : argurus
+>argurus : unknown
 >dauricus : argurus.dauricus<T0, T1>
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
->lavali : lavali
+>lavali : unknown
 >otion : lavali.otion
 >x : argurus.dauricus<quasiater.carolinensis, lavali.otion>
->argurus : argurus
+>argurus : unknown
 >dauricus : argurus.dauricus<T0, T1>
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
->lavali : lavali
+>lavali : unknown
 >otion : lavali.otion
 >() => { var y = this; } : () => void
 >y : acariensis
@@ -1086,18 +1086,18 @@ 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 : panamensis
+>panamensis : unknown
 >setulosus : panamensis.setulosus<T0, T1>
->sagitta : sagitta
+>sagitta : unknown
 >walkeri : sagitta.walkeri
->lavali : lavali
+>lavali : unknown
 >otion : lavali.otion
 >x : panamensis.setulosus<sagitta.walkeri, lavali.otion>
->panamensis : panamensis
+>panamensis : unknown
 >setulosus : panamensis.setulosus<T0, T1>
->sagitta : sagitta
+>sagitta : unknown
 >walkeri : sagitta.walkeri
->lavali : lavali
+>lavali : unknown
 >otion : lavali.otion
 >() => { var y = this; } : () => void
 >y : acariensis
@@ -1106,24 +1106,24 @@ 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 : macrorhinos
+>macrorhinos : unknown
 >marmosurus : macrorhinos.marmosurus<T0, T1>
->dammermani : dammermani
+>dammermani : unknown
 >melanops : dammermani.melanops
->caurinus : caurinus
+>caurinus : unknown
 >mahaganus : caurinus.mahaganus<T0, T1>
 >nudicaudus : nudicaudus
->lavali : lavali
+>lavali : unknown
 >otion : lavali.otion
 >x : macrorhinos.marmosurus<dammermani.melanops, caurinus.mahaganus<nudicaudus, lavali.otion>>
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >marmosurus : macrorhinos.marmosurus<T0, T1>
->dammermani : dammermani
+>dammermani : unknown
 >melanops : dammermani.melanops
->caurinus : caurinus
+>caurinus : unknown
 >mahaganus : caurinus.mahaganus<T0, T1>
 >nudicaudus : nudicaudus
->lavali : lavali
+>lavali : unknown
 >otion : lavali.otion
 >() => { var y = this; } : () => void
 >y : acariensis
@@ -1132,26 +1132,26 @@ 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 : argurus
+>argurus : unknown
 >netscheri : argurus.netscheri<T0, T1>
->dammermani : dammermani
+>dammermani : unknown
 >siberu : dammermani.siberu<T0, T1>
->lutreolus : lutreolus
+>lutreolus : unknown
 >foina : lutreolus.foina
->samarensis : samarensis
+>samarensis : unknown
 >pallidus : samarensis.pallidus
->argurus : argurus
+>argurus : unknown
 >luctuosa : argurus.luctuosa
 >x : argurus.netscheri<dammermani.siberu<lutreolus.foina, samarensis.pallidus>, argurus.luctuosa>
->argurus : argurus
+>argurus : unknown
 >netscheri : argurus.netscheri<T0, T1>
->dammermani : dammermani
+>dammermani : unknown
 >siberu : dammermani.siberu<T0, T1>
->lutreolus : lutreolus
+>lutreolus : unknown
 >foina : lutreolus.foina
->samarensis : samarensis
+>samarensis : unknown
 >pallidus : samarensis.pallidus
->argurus : argurus
+>argurus : unknown
 >luctuosa : argurus.luctuosa
 >() => { var y = this; } : () => void
 >y : acariensis
@@ -1160,10 +1160,10 @@ module julianae {
 
     soricoides() : argurus.luctuosa { var x : argurus.luctuosa; () => { var y = this; }; return x; }
 >soricoides : () => argurus.luctuosa
->argurus : argurus
+>argurus : unknown
 >luctuosa : argurus.luctuosa
 >x : argurus.luctuosa
->argurus : argurus
+>argurus : unknown
 >luctuosa : argurus.luctuosa
 >() => { var y = this; } : () => void
 >y : acariensis
@@ -1172,26 +1172,26 @@ 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 : daubentonii
+>daubentonii : unknown
 >arboreus : daubentonii.arboreus<T0, T1>
->provocax : provocax
+>provocax : unknown
 >melanoleuca : provocax.melanoleuca
->panglima : panglima
+>panglima : unknown
 >amphibius : panglima.amphibius<T0, T1>
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >daphaenodon : macrorhinos.daphaenodon
->patas : patas
+>patas : unknown
 >uralensis : patas.uralensis
 >x : daubentonii.arboreus<provocax.melanoleuca, panglima.amphibius<macrorhinos.daphaenodon, patas.uralensis>>
->daubentonii : daubentonii
+>daubentonii : unknown
 >arboreus : daubentonii.arboreus<T0, T1>
->provocax : provocax
+>provocax : unknown
 >melanoleuca : provocax.melanoleuca
->panglima : panglima
+>panglima : unknown
 >amphibius : panglima.amphibius<T0, T1>
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >daphaenodon : macrorhinos.daphaenodon
->patas : patas
+>patas : unknown
 >uralensis : patas.uralensis
 >() => { var y = this; } : () => void
 >y : acariensis
@@ -1200,10 +1200,10 @@ module julianae {
 
     spixii() : imperfecta.subspinosus { var x : imperfecta.subspinosus; () => { var y = this; }; return x; }
 >spixii : () => imperfecta.subspinosus
->imperfecta : imperfecta
+>imperfecta : unknown
 >subspinosus : imperfecta.subspinosus
 >x : imperfecta.subspinosus
->imperfecta : imperfecta
+>imperfecta : unknown
 >subspinosus : imperfecta.subspinosus
 >() => { var y = this; } : () => void
 >y : acariensis
@@ -1212,10 +1212,10 @@ module julianae {
 
     anakuma() : lavali.wilsoni { var x : lavali.wilsoni; () => { var y = this; }; return x; }
 >anakuma : () => lavali.wilsoni
->lavali : lavali
+>lavali : unknown
 >wilsoni : lavali.wilsoni
 >x : lavali.wilsoni
->lavali : lavali
+>lavali : unknown
 >wilsoni : lavali.wilsoni
 >() => { var y = this; } : () => void
 >y : acariensis
@@ -1224,18 +1224,18 @@ 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 : panglima
+>panglima : unknown
 >amphibius : panglima.amphibius<T0, T1>
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >oconnelli : trivirgatus.oconnelli
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >konganensis : macrorhinos.konganensis
 >x : panglima.amphibius<trivirgatus.oconnelli, macrorhinos.konganensis>
->panglima : panglima
+>panglima : unknown
 >amphibius : panglima.amphibius<T0, T1>
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >oconnelli : trivirgatus.oconnelli
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >konganensis : macrorhinos.konganensis
 >() => { var y = this; } : () => void
 >y : acariensis
@@ -1244,10 +1244,10 @@ module julianae {
 
     gymnura() : quasiater.carolinensis { var x : quasiater.carolinensis; () => { var y = this; }; return x; }
 >gymnura : () => quasiater.carolinensis
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
 >x : quasiater.carolinensis
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
 >() => { var y = this; } : () => void
 >y : acariensis
@@ -1256,18 +1256,18 @@ 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 : rendalli
+>rendalli : unknown
 >crenulata : rendalli.crenulata<T0, T1>
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >falconeri : trivirgatus.falconeri
->provocax : provocax
+>provocax : unknown
 >melanoleuca : provocax.melanoleuca
 >x : rendalli.crenulata<trivirgatus.falconeri, provocax.melanoleuca>
->rendalli : rendalli
+>rendalli : unknown
 >crenulata : rendalli.crenulata<T0, T1>
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >falconeri : trivirgatus.falconeri
->provocax : provocax
+>provocax : unknown
 >melanoleuca : provocax.melanoleuca
 >() => { var y = this; } : () => void
 >y : acariensis
@@ -1276,23 +1276,23 @@ module julianae {
   }
   export class durangae extends dogramacii.aurata {
 >durangae : durangae
->dogramacii : dogramacii
+>dogramacii : unknown
 >aurata : dogramacii.aurata
 
     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 : panamensis
+>panamensis : unknown
 >setulosus : panamensis.setulosus<T0, T1>
->lutreolus : lutreolus
+>lutreolus : unknown
 >punicus : lutreolus.punicus
->dammermani : dammermani
+>dammermani : unknown
 >melanops : dammermani.melanops
 >x : panamensis.setulosus<lutreolus.punicus, dammermani.melanops>
->panamensis : panamensis
+>panamensis : unknown
 >setulosus : panamensis.setulosus<T0, T1>
->lutreolus : lutreolus
+>lutreolus : unknown
 >punicus : lutreolus.punicus
->dammermani : dammermani
+>dammermani : unknown
 >melanops : dammermani.melanops
 >() => { var y = this; } : () => void
 >y : durangae
@@ -1301,18 +1301,18 @@ 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 : howi
+>howi : unknown
 >angulatus : howi.angulatus<T0, T1>
->petrophilus : petrophilus
+>petrophilus : unknown
 >minutilla : petrophilus.minutilla
->lavali : lavali
+>lavali : unknown
 >xanthognathus : lavali.xanthognathus
 >x : howi.angulatus<petrophilus.minutilla, lavali.xanthognathus>
->howi : howi
+>howi : unknown
 >angulatus : howi.angulatus<T0, T1>
->petrophilus : petrophilus
+>petrophilus : unknown
 >minutilla : petrophilus.minutilla
->lavali : lavali
+>lavali : unknown
 >xanthognathus : lavali.xanthognathus
 >() => { var y = this; } : () => void
 >y : durangae
@@ -1321,10 +1321,10 @@ module julianae {
 
     phrudus() : sagitta.stolzmanni { var x : sagitta.stolzmanni; () => { var y = this; }; return x; }
 >phrudus : () => sagitta.stolzmanni
->sagitta : sagitta
+>sagitta : unknown
 >stolzmanni : sagitta.stolzmanni
 >x : sagitta.stolzmanni
->sagitta : sagitta
+>sagitta : unknown
 >stolzmanni : sagitta.stolzmanni
 >() => { var y = this; } : () => void
 >y : durangae
@@ -1333,7 +1333,7 @@ module julianae {
   }
 }
 module ruatanica {
->ruatanica : ruatanica
+>ruatanica : typeof ruatanica
 
   export class hector<T0, T1> {
 >hector : hector<T0, T1>
@@ -1342,10 +1342,10 @@ module ruatanica {
 
     humulis() : julianae.steerii { var x : julianae.steerii; () => { var y = this; }; return x; }
 >humulis : () => julianae.steerii
->julianae : julianae
+>julianae : unknown
 >steerii : julianae.steerii
 >x : julianae.steerii
->julianae : julianae
+>julianae : unknown
 >steerii : julianae.steerii
 >() => { var y = this; } : () => void
 >y : hector<T0, T1>
@@ -1354,26 +1354,26 @@ 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 : panamensis
+>panamensis : unknown
 >linulus : panamensis.linulus<T0, T1>
->ruatanica : ruatanica
+>ruatanica : unknown
 >Praseodymium : Praseodymium<T0, T1>
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >jugularis : Lanthanum.jugularis
->dammermani : dammermani
+>dammermani : unknown
 >melanops : dammermani.melanops
->lavali : lavali
+>lavali : unknown
 >wilsoni : lavali.wilsoni
 >x : panamensis.linulus<Praseodymium<Lanthanum.jugularis, dammermani.melanops>, lavali.wilsoni>
->panamensis : panamensis
+>panamensis : unknown
 >linulus : panamensis.linulus<T0, T1>
->ruatanica : ruatanica
+>ruatanica : unknown
 >Praseodymium : Praseodymium<T0, T1>
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >jugularis : Lanthanum.jugularis
->dammermani : dammermani
+>dammermani : unknown
 >melanops : dammermani.melanops
->lavali : lavali
+>lavali : unknown
 >wilsoni : lavali.wilsoni
 >() => { var y = this; } : () => void
 >y : hector<T0, T1>
@@ -1382,7 +1382,7 @@ module ruatanica {
   }
 }
 module Lanthanum {
->Lanthanum : Lanthanum
+>Lanthanum : typeof Lanthanum
 
   export class suillus<T0, T1> {
 >suillus : suillus<T0, T1>
@@ -1391,10 +1391,10 @@ module Lanthanum {
 
     spilosoma() : quasiater.carolinensis { var x : quasiater.carolinensis; () => { var y = this; }; return x; }
 >spilosoma : () => quasiater.carolinensis
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
 >x : quasiater.carolinensis
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
 >() => { var y = this; } : () => void
 >y : suillus<T0, T1>
@@ -1403,10 +1403,10 @@ module Lanthanum {
 
     tumbalensis() : caurinus.megaphyllus { var x : caurinus.megaphyllus; () => { var y = this; }; return x; }
 >tumbalensis : () => caurinus.megaphyllus
->caurinus : caurinus
+>caurinus : unknown
 >megaphyllus : caurinus.megaphyllus
 >x : caurinus.megaphyllus
->caurinus : caurinus
+>caurinus : unknown
 >megaphyllus : caurinus.megaphyllus
 >() => { var y = this; } : () => void
 >y : suillus<T0, T1>
@@ -1415,10 +1415,10 @@ module Lanthanum {
 
     anatolicus() : julianae.steerii { var x : julianae.steerii; () => { var y = this; }; return x; }
 >anatolicus : () => julianae.steerii
->julianae : julianae
+>julianae : unknown
 >steerii : julianae.steerii
 >x : julianae.steerii
->julianae : julianae
+>julianae : unknown
 >steerii : julianae.steerii
 >() => { var y = this; } : () => void
 >y : suillus<T0, T1>
@@ -1429,19 +1429,19 @@ module Lanthanum {
 >nitidus : nitidus<T0, T1>
 >T0 : T0
 >T1 : T1
->argurus : argurus
+>argurus : unknown
 >gilbertii : argurus.gilbertii<T0, T1>
->lavali : lavali
+>lavali : unknown
 >thaeleri : lavali.thaeleri
->lutreolus : lutreolus
+>lutreolus : unknown
 >punicus : lutreolus.punicus
 
     granatensis() : quasiater.bobrinskoi { var x : quasiater.bobrinskoi; () => { var y = this; }; return x; }
 >granatensis : () => quasiater.bobrinskoi
->quasiater : quasiater
+>quasiater : unknown
 >bobrinskoi : quasiater.bobrinskoi
 >x : quasiater.bobrinskoi
->quasiater : quasiater
+>quasiater : unknown
 >bobrinskoi : quasiater.bobrinskoi
 >() => { var y = this; } : () => void
 >y : nitidus<T0, T1>
@@ -1450,18 +1450,18 @@ 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 : minutus
+>minutus : unknown
 >inez : minutus.inez<T0, T1>
->lavali : lavali
+>lavali : unknown
 >wilsoni : lavali.wilsoni
->lavali : lavali
+>lavali : unknown
 >wilsoni : lavali.wilsoni
 >x : minutus.inez<lavali.wilsoni, lavali.wilsoni>
->minutus : minutus
+>minutus : unknown
 >inez : minutus.inez<T0, T1>
->lavali : lavali
+>lavali : unknown
 >wilsoni : lavali.wilsoni
->lavali : lavali
+>lavali : unknown
 >wilsoni : lavali.wilsoni
 >() => { var y = this; } : () => void
 >y : nitidus<T0, T1>
@@ -1470,18 +1470,18 @@ 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 : julianae
+>julianae : unknown
 >oralis : julianae.oralis<T0, T1>
->lavali : lavali
+>lavali : unknown
 >xanthognathus : lavali.xanthognathus
->argurus : argurus
+>argurus : unknown
 >oreas : argurus.oreas
 >x : julianae.oralis<lavali.xanthognathus, argurus.oreas>
->julianae : julianae
+>julianae : unknown
 >oralis : julianae.oralis<T0, T1>
->lavali : lavali
+>lavali : unknown
 >xanthognathus : lavali.xanthognathus
->argurus : argurus
+>argurus : unknown
 >oreas : argurus.oreas
 >() => { var y = this; } : () => void
 >y : nitidus<T0, T1>
@@ -1490,18 +1490,18 @@ 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 : chrysaeolus
+>chrysaeolus : unknown
 >sarasinorum : chrysaeolus.sarasinorum<T0, T1>
->caurinus : caurinus
+>caurinus : unknown
 >megaphyllus : caurinus.megaphyllus
->lavali : lavali
+>lavali : unknown
 >xanthognathus : lavali.xanthognathus
 >x : chrysaeolus.sarasinorum<caurinus.megaphyllus, lavali.xanthognathus>
->chrysaeolus : chrysaeolus
+>chrysaeolus : unknown
 >sarasinorum : chrysaeolus.sarasinorum<T0, T1>
->caurinus : caurinus
+>caurinus : unknown
 >megaphyllus : caurinus.megaphyllus
->lavali : lavali
+>lavali : unknown
 >xanthognathus : lavali.xanthognathus
 >() => { var y = this; } : () => void
 >y : nitidus<T0, T1>
@@ -1510,10 +1510,10 @@ module Lanthanum {
 
     dominicensis() : dammermani.melanops { var x : dammermani.melanops; () => { var y = this; }; return x; }
 >dominicensis : () => dammermani.melanops
->dammermani : dammermani
+>dammermani : unknown
 >melanops : dammermani.melanops
 >x : dammermani.melanops
->dammermani : dammermani
+>dammermani : unknown
 >melanops : dammermani.melanops
 >() => { var y = this; } : () => void
 >y : nitidus<T0, T1>
@@ -1522,10 +1522,10 @@ module Lanthanum {
 
     taurus() : macrorhinos.konganensis { var x : macrorhinos.konganensis; () => { var y = this; }; return x; }
 >taurus : () => macrorhinos.konganensis
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >konganensis : macrorhinos.konganensis
 >x : macrorhinos.konganensis
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >konganensis : macrorhinos.konganensis
 >() => { var y = this; } : () => void
 >y : nitidus<T0, T1>
@@ -1534,18 +1534,18 @@ 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 : argurus
+>argurus : unknown
 >netscheri : argurus.netscheri<T0, T1>
->dogramacii : dogramacii
+>dogramacii : unknown
 >aurata : dogramacii.aurata
->dogramacii : dogramacii
+>dogramacii : unknown
 >aurata : dogramacii.aurata
 >x : argurus.netscheri<dogramacii.aurata, dogramacii.aurata>
->argurus : argurus
+>argurus : unknown
 >netscheri : argurus.netscheri<T0, T1>
->dogramacii : dogramacii
+>dogramacii : unknown
 >aurata : dogramacii.aurata
->dogramacii : dogramacii
+>dogramacii : unknown
 >aurata : dogramacii.aurata
 >() => { var y = this; } : () => void
 >y : nitidus<T0, T1>
@@ -1554,18 +1554,18 @@ 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 : rendalli
+>rendalli : unknown
 >moojeni : rendalli.moojeni<T0, T1>
->dogramacii : dogramacii
+>dogramacii : unknown
 >aurata : dogramacii.aurata
->lavali : lavali
+>lavali : unknown
 >otion : lavali.otion
 >x : rendalli.moojeni<dogramacii.aurata, lavali.otion>
->rendalli : rendalli
+>rendalli : unknown
 >moojeni : rendalli.moojeni<T0, T1>
->dogramacii : dogramacii
+>dogramacii : unknown
 >aurata : dogramacii.aurata
->lavali : lavali
+>lavali : unknown
 >otion : lavali.otion
 >() => { var y = this; } : () => void
 >y : nitidus<T0, T1>
@@ -1574,10 +1574,10 @@ module Lanthanum {
 
     midas() : lavali.xanthognathus { var x : lavali.xanthognathus; () => { var y = this; }; return x; }
 >midas : () => lavali.xanthognathus
->lavali : lavali
+>lavali : unknown
 >xanthognathus : lavali.xanthognathus
 >x : lavali.xanthognathus
->lavali : lavali
+>lavali : unknown
 >xanthognathus : lavali.xanthognathus
 >() => { var y = this; } : () => void
 >y : nitidus<T0, T1>
@@ -1586,10 +1586,10 @@ module Lanthanum {
 
     bicornis() : dogramacii.kaiseri { var x : dogramacii.kaiseri; () => { var y = this; }; return x; }
 >bicornis : () => dogramacii.kaiseri
->dogramacii : dogramacii
+>dogramacii : unknown
 >kaiseri : dogramacii.kaiseri
 >x : dogramacii.kaiseri
->dogramacii : dogramacii
+>dogramacii : unknown
 >kaiseri : dogramacii.kaiseri
 >() => { var y = this; } : () => void
 >y : nitidus<T0, T1>
@@ -1598,19 +1598,19 @@ module Lanthanum {
   }
   export class megalonyx extends caurinus.johorensis<caurinus.megaphyllus, julianae.steerii> {
 >megalonyx : megalonyx
->caurinus : caurinus
+>caurinus : unknown
 >johorensis : caurinus.johorensis<T0, T1>
->caurinus : caurinus
+>caurinus : unknown
 >megaphyllus : caurinus.megaphyllus
->julianae : julianae
+>julianae : unknown
 >steerii : julianae.steerii
 
     phillipsii() : macrorhinos.konganensis { var x : macrorhinos.konganensis; () => { var y = this; }; return x; }
 >phillipsii : () => macrorhinos.konganensis
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >konganensis : macrorhinos.konganensis
 >x : macrorhinos.konganensis
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >konganensis : macrorhinos.konganensis
 >() => { var y = this; } : () => void
 >y : megalonyx
@@ -1619,18 +1619,18 @@ 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 : rionegrensis
+>rionegrensis : unknown
 >veraecrucis : rionegrensis.veraecrucis<T0, T1>
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >falconeri : trivirgatus.falconeri
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
 >x : rionegrensis.veraecrucis<trivirgatus.falconeri, quasiater.carolinensis>
->rionegrensis : rionegrensis
+>rionegrensis : unknown
 >veraecrucis : rionegrensis.veraecrucis<T0, T1>
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >falconeri : trivirgatus.falconeri
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
 >() => { var y = this; } : () => void
 >y : megalonyx
@@ -1640,15 +1640,15 @@ 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 : petrophilus
+>petrophilus : unknown
 >minutilla : petrophilus.minutilla
->julianae : julianae
+>julianae : unknown
 >sumatrana : julianae.sumatrana
 >x : nitidus<petrophilus.minutilla, julianae.sumatrana>
 >nitidus : nitidus<T0, T1>
->petrophilus : petrophilus
+>petrophilus : unknown
 >minutilla : petrophilus.minutilla
->julianae : julianae
+>julianae : unknown
 >sumatrana : julianae.sumatrana
 >() => { var y = this; } : () => void
 >y : megalonyx
@@ -1657,10 +1657,10 @@ module Lanthanum {
 
     elater() : lavali.lepturus { var x : lavali.lepturus; () => { var y = this; }; return x; }
 >elater : () => lavali.lepturus
->lavali : lavali
+>lavali : unknown
 >lepturus : lavali.lepturus
 >x : lavali.lepturus
->lavali : lavali
+>lavali : unknown
 >lepturus : lavali.lepturus
 >() => { var y = this; } : () => void
 >y : megalonyx
@@ -1669,10 +1669,10 @@ module Lanthanum {
 
     ourebi() : provocax.melanoleuca { var x : provocax.melanoleuca; () => { var y = this; }; return x; }
 >ourebi : () => provocax.melanoleuca
->provocax : provocax
+>provocax : unknown
 >melanoleuca : provocax.melanoleuca
 >x : provocax.melanoleuca
->provocax : provocax
+>provocax : unknown
 >melanoleuca : provocax.melanoleuca
 >() => { var y = this; } : () => void
 >y : megalonyx
@@ -1681,26 +1681,26 @@ 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 : imperfecta
+>imperfecta : unknown
 >ciliolabrum : imperfecta.ciliolabrum<T0, T1>
->julianae : julianae
+>julianae : unknown
 >nudicaudus : julianae.nudicaudus
->ruatanica : ruatanica
+>ruatanica : unknown
 >Praseodymium : ruatanica.Praseodymium<T0, T1>
->lavali : lavali
+>lavali : unknown
 >thaeleri : lavali.thaeleri
->julianae : julianae
+>julianae : unknown
 >acariensis : julianae.acariensis
 >x : imperfecta.ciliolabrum<julianae.nudicaudus, ruatanica.Praseodymium<lavali.thaeleri, julianae.acariensis>>
->imperfecta : imperfecta
+>imperfecta : unknown
 >ciliolabrum : imperfecta.ciliolabrum<T0, T1>
->julianae : julianae
+>julianae : unknown
 >nudicaudus : julianae.nudicaudus
->ruatanica : ruatanica
+>ruatanica : unknown
 >Praseodymium : ruatanica.Praseodymium<T0, T1>
->lavali : lavali
+>lavali : unknown
 >thaeleri : lavali.thaeleri
->julianae : julianae
+>julianae : unknown
 >acariensis : julianae.acariensis
 >() => { var y = this; } : () => void
 >y : megalonyx
@@ -1709,10 +1709,10 @@ module Lanthanum {
 
     parva() : gabriellae.echinatus { var x : gabriellae.echinatus; () => { var y = this; }; return x; }
 >parva : () => gabriellae.echinatus
->gabriellae : gabriellae
+>gabriellae : unknown
 >echinatus : gabriellae.echinatus
 >x : gabriellae.echinatus
->gabriellae : gabriellae
+>gabriellae : unknown
 >echinatus : gabriellae.echinatus
 >() => { var y = this; } : () => void
 >y : megalonyx
@@ -1721,15 +1721,15 @@ 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 : quasiater
+>quasiater : unknown
 >wattsi : quasiater.wattsi<T0, T1>
->dammermani : dammermani
+>dammermani : unknown
 >melanops : dammermani.melanops
 >megalonyx : megalonyx
 >x : quasiater.wattsi<dammermani.melanops, megalonyx>
->quasiater : quasiater
+>quasiater : unknown
 >wattsi : quasiater.wattsi<T0, T1>
->dammermani : dammermani
+>dammermani : unknown
 >melanops : dammermani.melanops
 >megalonyx : megalonyx
 >() => { var y = this; } : () => void
@@ -1742,18 +1742,18 @@ 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 : petrophilus
+>petrophilus : unknown
 >sodyi : petrophilus.sodyi<T0, T1>
->argurus : argurus
+>argurus : unknown
 >oreas : argurus.oreas
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >daphaenodon : macrorhinos.daphaenodon
 >x : petrophilus.sodyi<argurus.oreas, macrorhinos.daphaenodon>
->petrophilus : petrophilus
+>petrophilus : unknown
 >sodyi : petrophilus.sodyi<T0, T1>
->argurus : argurus
+>argurus : unknown
 >oreas : argurus.oreas
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >daphaenodon : macrorhinos.daphaenodon
 >() => { var y = this; } : () => void
 >y : jugularis
@@ -1762,10 +1762,10 @@ module Lanthanum {
 
     revoili() : lavali.wilsoni { var x : lavali.wilsoni; () => { var y = this; }; return x; }
 >revoili : () => lavali.wilsoni
->lavali : lavali
+>lavali : unknown
 >wilsoni : lavali.wilsoni
 >x : lavali.wilsoni
->lavali : lavali
+>lavali : unknown
 >wilsoni : lavali.wilsoni
 >() => { var y = this; } : () => void
 >y : jugularis
@@ -1774,10 +1774,10 @@ module Lanthanum {
 
     macrobullatus() : macrorhinos.daphaenodon { var x : macrorhinos.daphaenodon; () => { var y = this; }; return x; }
 >macrobullatus : () => macrorhinos.daphaenodon
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >daphaenodon : macrorhinos.daphaenodon
 >x : macrorhinos.daphaenodon
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >daphaenodon : macrorhinos.daphaenodon
 >() => { var y = this; } : () => void
 >y : jugularis
@@ -1786,10 +1786,10 @@ module Lanthanum {
 
     compactus() : sagitta.stolzmanni { var x : sagitta.stolzmanni; () => { var y = this; }; return x; }
 >compactus : () => sagitta.stolzmanni
->sagitta : sagitta
+>sagitta : unknown
 >stolzmanni : sagitta.stolzmanni
 >x : sagitta.stolzmanni
->sagitta : sagitta
+>sagitta : unknown
 >stolzmanni : sagitta.stolzmanni
 >() => { var y = this; } : () => void
 >y : jugularis
@@ -1799,15 +1799,15 @@ 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 : ruatanica
+>ruatanica : unknown
 >americanus : ruatanica.americanus
->sagitta : sagitta
+>sagitta : unknown
 >stolzmanni : sagitta.stolzmanni
 >x : nitidus<ruatanica.americanus, sagitta.stolzmanni>
 >nitidus : nitidus<T0, T1>
->ruatanica : ruatanica
+>ruatanica : unknown
 >americanus : ruatanica.americanus
->sagitta : sagitta
+>sagitta : unknown
 >stolzmanni : sagitta.stolzmanni
 >() => { var y = this; } : () => void
 >y : jugularis
@@ -1816,10 +1816,10 @@ module Lanthanum {
 
     stramineus() : gabriellae.amicus { var x : gabriellae.amicus; () => { var y = this; }; return x; }
 >stramineus : () => gabriellae.amicus
->gabriellae : gabriellae
+>gabriellae : unknown
 >amicus : gabriellae.amicus
 >x : gabriellae.amicus
->gabriellae : gabriellae
+>gabriellae : unknown
 >amicus : gabriellae.amicus
 >() => { var y = this; } : () => void
 >y : jugularis
@@ -1828,18 +1828,18 @@ 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 : trivirgatus
+>trivirgatus : unknown
 >mixtus : trivirgatus.mixtus<T0, T1>
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >daphaenodon : macrorhinos.daphaenodon
->argurus : argurus
+>argurus : unknown
 >luctuosa : argurus.luctuosa
 >x : trivirgatus.mixtus<macrorhinos.daphaenodon, argurus.luctuosa>
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >mixtus : trivirgatus.mixtus<T0, T1>
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >daphaenodon : macrorhinos.daphaenodon
->argurus : argurus
+>argurus : unknown
 >luctuosa : argurus.luctuosa
 >() => { var y = this; } : () => void
 >y : jugularis
@@ -1848,18 +1848,18 @@ 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 : argurus
+>argurus : unknown
 >dauricus : argurus.dauricus<T0, T1>
->argurus : argurus
+>argurus : unknown
 >oreas : argurus.oreas
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
 >x : argurus.dauricus<argurus.oreas, quasiater.carolinensis>
->argurus : argurus
+>argurus : unknown
 >dauricus : argurus.dauricus<T0, T1>
->argurus : argurus
+>argurus : unknown
 >oreas : argurus.oreas
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
 >() => { var y = this; } : () => void
 >y : jugularis
@@ -1868,18 +1868,18 @@ 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 : daubentonii
+>daubentonii : unknown
 >nesiotes : daubentonii.nesiotes<T0, T1>
->julianae : julianae
+>julianae : unknown
 >sumatrana : julianae.sumatrana
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
 >x : daubentonii.nesiotes<julianae.sumatrana, quasiater.carolinensis>
->daubentonii : daubentonii
+>daubentonii : unknown
 >nesiotes : daubentonii.nesiotes<T0, T1>
->julianae : julianae
+>julianae : unknown
 >sumatrana : julianae.sumatrana
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
 >() => { var y = this; } : () => void
 >y : jugularis
@@ -1888,18 +1888,18 @@ 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 : ruatanica
+>ruatanica : unknown
 >Praseodymium : ruatanica.Praseodymium<T0, T1>
->argurus : argurus
+>argurus : unknown
 >germaini : argurus.germaini
->caurinus : caurinus
+>caurinus : unknown
 >megaphyllus : caurinus.megaphyllus
 >x : ruatanica.Praseodymium<argurus.germaini, caurinus.megaphyllus>
->ruatanica : ruatanica
+>ruatanica : unknown
 >Praseodymium : ruatanica.Praseodymium<T0, T1>
->argurus : argurus
+>argurus : unknown
 >germaini : argurus.germaini
->caurinus : caurinus
+>caurinus : unknown
 >megaphyllus : caurinus.megaphyllus
 >() => { var y = this; } : () => void
 >y : jugularis
@@ -1908,18 +1908,18 @@ 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 : samarensis
+>samarensis : unknown
 >pelurus : samarensis.pelurus<T0, T1>
->dammermani : dammermani
+>dammermani : unknown
 >melanops : dammermani.melanops
->rendalli : rendalli
+>rendalli : unknown
 >zuluensis : rendalli.zuluensis
 >x : samarensis.pelurus<dammermani.melanops, rendalli.zuluensis>
->samarensis : samarensis
+>samarensis : unknown
 >pelurus : samarensis.pelurus<T0, T1>
->dammermani : dammermani
+>dammermani : unknown
 >melanops : dammermani.melanops
->rendalli : rendalli
+>rendalli : unknown
 >zuluensis : rendalli.zuluensis
 >() => { var y = this; } : () => void
 >y : jugularis
@@ -1928,26 +1928,26 @@ 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 : minutus
+>minutus : unknown
 >inez : minutus.inez<T0, T1>
->quasiater : quasiater
+>quasiater : unknown
 >wattsi : quasiater.wattsi<T0, T1>
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
->lavali : lavali
+>lavali : unknown
 >lepturus : lavali.lepturus
->dogramacii : dogramacii
+>dogramacii : unknown
 >kaiseri : dogramacii.kaiseri
 >x : minutus.inez<quasiater.wattsi<quasiater.carolinensis, lavali.lepturus>, dogramacii.kaiseri>
->minutus : minutus
+>minutus : unknown
 >inez : minutus.inez<T0, T1>
->quasiater : quasiater
+>quasiater : unknown
 >wattsi : quasiater.wattsi<T0, T1>
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
->lavali : lavali
+>lavali : unknown
 >lepturus : lavali.lepturus
->dogramacii : dogramacii
+>dogramacii : unknown
 >kaiseri : dogramacii.kaiseri
 >() => { var y = this; } : () => void
 >y : jugularis
@@ -1956,10 +1956,10 @@ module Lanthanum {
 
     pomona() : julianae.steerii { var x : julianae.steerii; () => { var y = this; }; return x; }
 >pomona : () => julianae.steerii
->julianae : julianae
+>julianae : unknown
 >steerii : julianae.steerii
 >x : julianae.steerii
->julianae : julianae
+>julianae : unknown
 >steerii : julianae.steerii
 >() => { var y = this; } : () => void
 >y : jugularis
@@ -1968,10 +1968,10 @@ module Lanthanum {
 
     ileile() : quasiater.carolinensis { var x : quasiater.carolinensis; () => { var y = this; }; return x; }
 >ileile : () => quasiater.carolinensis
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
 >x : quasiater.carolinensis
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
 >() => { var y = this; } : () => void
 >y : jugularis
@@ -1980,27 +1980,27 @@ module Lanthanum {
   }
 }
 module rendalli {
->rendalli : rendalli
+>rendalli : typeof rendalli
 
   export class zuluensis extends julianae.steerii {
 >zuluensis : zuluensis
->julianae : julianae
+>julianae : unknown
 >steerii : julianae.steerii
 
     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 : argurus
+>argurus : unknown
 >wetmorei : argurus.wetmorei<T0, T1>
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >megalonyx : Lanthanum.megalonyx
->provocax : provocax
+>provocax : unknown
 >melanoleuca : provocax.melanoleuca
 >x : argurus.wetmorei<Lanthanum.megalonyx, provocax.melanoleuca>
->argurus : argurus
+>argurus : unknown
 >wetmorei : argurus.wetmorei<T0, T1>
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >megalonyx : Lanthanum.megalonyx
->provocax : provocax
+>provocax : unknown
 >melanoleuca : provocax.melanoleuca
 >() => { var y = this; } : () => void
 >y : zuluensis
@@ -2009,18 +2009,18 @@ 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 : quasiater
+>quasiater : unknown
 >wattsi : quasiater.wattsi<T0, T1>
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
->lavali : lavali
+>lavali : unknown
 >lepturus : lavali.lepturus
 >x : quasiater.wattsi<quasiater.carolinensis, lavali.lepturus>
->quasiater : quasiater
+>quasiater : unknown
 >wattsi : quasiater.wattsi<T0, T1>
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
->lavali : lavali
+>lavali : unknown
 >lepturus : lavali.lepturus
 >() => { var y = this; } : () => void
 >y : zuluensis
@@ -2029,18 +2029,18 @@ 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 : argurus
+>argurus : unknown
 >gilbertii : argurus.gilbertii<T0, T1>
->caurinus : caurinus
+>caurinus : unknown
 >psilurus : caurinus.psilurus
->lavali : lavali
+>lavali : unknown
 >xanthognathus : lavali.xanthognathus
 >x : argurus.gilbertii<caurinus.psilurus, lavali.xanthognathus>
->argurus : argurus
+>argurus : unknown
 >gilbertii : argurus.gilbertii<T0, T1>
->caurinus : caurinus
+>caurinus : unknown
 >psilurus : caurinus.psilurus
->lavali : lavali
+>lavali : unknown
 >xanthognathus : lavali.xanthognathus
 >() => { var y = this; } : () => void
 >y : zuluensis
@@ -2049,10 +2049,10 @@ module rendalli {
 
     damarensis() : julianae.galapagoensis { var x : julianae.galapagoensis; () => { var y = this; }; return x; }
 >damarensis : () => julianae.galapagoensis
->julianae : julianae
+>julianae : unknown
 >galapagoensis : julianae.galapagoensis
 >x : julianae.galapagoensis
->julianae : julianae
+>julianae : unknown
 >galapagoensis : julianae.galapagoensis
 >() => { var y = this; } : () => void
 >y : zuluensis
@@ -2061,18 +2061,18 @@ 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 : panglima
+>panglima : unknown
 >abidi : panglima.abidi<T0, T1>
->dogramacii : dogramacii
+>dogramacii : unknown
 >robustulus : dogramacii.robustulus
->lutreolus : lutreolus
+>lutreolus : unknown
 >foina : lutreolus.foina
 >x : panglima.abidi<dogramacii.robustulus, lutreolus.foina>
->panglima : panglima
+>panglima : unknown
 >abidi : panglima.abidi<T0, T1>
->dogramacii : dogramacii
+>dogramacii : unknown
 >robustulus : dogramacii.robustulus
->lutreolus : lutreolus
+>lutreolus : unknown
 >foina : lutreolus.foina
 >() => { var y = this; } : () => void
 >y : zuluensis
@@ -2081,10 +2081,10 @@ module rendalli {
 
     griseoflavus() : ruatanica.americanus { var x : ruatanica.americanus; () => { var y = this; }; return x; }
 >griseoflavus : () => ruatanica.americanus
->ruatanica : ruatanica
+>ruatanica : unknown
 >americanus : ruatanica.americanus
 >x : ruatanica.americanus
->ruatanica : ruatanica
+>ruatanica : unknown
 >americanus : ruatanica.americanus
 >() => { var y = this; } : () => void
 >y : zuluensis
@@ -2093,10 +2093,10 @@ module rendalli {
 
     thar() : argurus.oreas { var x : argurus.oreas; () => { var y = this; }; return x; }
 >thar : () => argurus.oreas
->argurus : argurus
+>argurus : unknown
 >oreas : argurus.oreas
 >x : argurus.oreas
->argurus : argurus
+>argurus : unknown
 >oreas : argurus.oreas
 >() => { var y = this; } : () => void
 >y : zuluensis
@@ -2105,18 +2105,18 @@ 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 : panamensis
+>panamensis : unknown
 >linulus : panamensis.linulus<T0, T1>
->lavali : lavali
+>lavali : unknown
 >lepturus : lavali.lepturus
->argurus : argurus
+>argurus : unknown
 >oreas : argurus.oreas
 >x : panamensis.linulus<lavali.lepturus, argurus.oreas>
->panamensis : panamensis
+>panamensis : unknown
 >linulus : panamensis.linulus<T0, T1>
->lavali : lavali
+>lavali : unknown
 >lepturus : lavali.lepturus
->argurus : argurus
+>argurus : unknown
 >oreas : argurus.oreas
 >() => { var y = this; } : () => void
 >y : zuluensis
@@ -2125,10 +2125,10 @@ module rendalli {
 
     fusicaudus() : sagitta.stolzmanni { var x : sagitta.stolzmanni; () => { var y = this; }; return x; }
 >fusicaudus : () => sagitta.stolzmanni
->sagitta : sagitta
+>sagitta : unknown
 >stolzmanni : sagitta.stolzmanni
 >x : sagitta.stolzmanni
->sagitta : sagitta
+>sagitta : unknown
 >stolzmanni : sagitta.stolzmanni
 >() => { var y = this; } : () => void
 >y : zuluensis
@@ -2137,18 +2137,18 @@ 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 : howi
+>howi : unknown
 >angulatus : howi.angulatus<T0, T1>
->ruatanica : ruatanica
+>ruatanica : unknown
 >americanus : ruatanica.americanus
->argurus : argurus
+>argurus : unknown
 >germaini : argurus.germaini
 >x : howi.angulatus<ruatanica.americanus, argurus.germaini>
->howi : howi
+>howi : unknown
 >angulatus : howi.angulatus<T0, T1>
->ruatanica : ruatanica
+>ruatanica : unknown
 >americanus : ruatanica.americanus
->argurus : argurus
+>argurus : unknown
 >germaini : argurus.germaini
 >() => { var y = this; } : () => void
 >y : zuluensis
@@ -2157,18 +2157,18 @@ 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 : dammermani
+>dammermani : unknown
 >siberu : dammermani.siberu<T0, T1>
->lutreolus : lutreolus
+>lutreolus : unknown
 >punicus : lutreolus.punicus
->julianae : julianae
+>julianae : unknown
 >acariensis : julianae.acariensis
 >x : dammermani.siberu<lutreolus.punicus, julianae.acariensis>
->dammermani : dammermani
+>dammermani : unknown
 >siberu : dammermani.siberu<T0, T1>
->lutreolus : lutreolus
+>lutreolus : unknown
 >punicus : lutreolus.punicus
->julianae : julianae
+>julianae : unknown
 >acariensis : julianae.acariensis
 >() => { var y = this; } : () => void
 >y : zuluensis
@@ -2177,10 +2177,10 @@ module rendalli {
 
     desmarestianus() : julianae.steerii { var x : julianae.steerii; () => { var y = this; }; return x; }
 >desmarestianus : () => julianae.steerii
->julianae : julianae
+>julianae : unknown
 >steerii : julianae.steerii
 >x : julianae.steerii
->julianae : julianae
+>julianae : unknown
 >steerii : julianae.steerii
 >() => { var y = this; } : () => void
 >y : zuluensis
@@ -2189,18 +2189,18 @@ 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 : nigra
+>nigra : unknown
 >dolichurus : nigra.dolichurus<T0, T1>
->howi : howi
+>howi : unknown
 >marcanoi : howi.marcanoi
->lavali : lavali
+>lavali : unknown
 >wilsoni : lavali.wilsoni
 >x : nigra.dolichurus<howi.marcanoi, lavali.wilsoni>
->nigra : nigra
+>nigra : unknown
 >dolichurus : nigra.dolichurus<T0, T1>
->howi : howi
+>howi : unknown
 >marcanoi : howi.marcanoi
->lavali : lavali
+>lavali : unknown
 >wilsoni : lavali.wilsoni
 >() => { var y = this; } : () => void
 >y : zuluensis
@@ -2209,10 +2209,10 @@ module rendalli {
 
     salocco() : argurus.peninsulae { var x : argurus.peninsulae; () => { var y = this; }; return x; }
 >salocco : () => argurus.peninsulae
->argurus : argurus
+>argurus : unknown
 >peninsulae : argurus.peninsulae
 >x : argurus.peninsulae
->argurus : argurus
+>argurus : unknown
 >peninsulae : argurus.peninsulae
 >() => { var y = this; } : () => void
 >y : zuluensis
@@ -2226,10 +2226,10 @@ module rendalli {
 
     floweri() : lavali.otion { var x : lavali.otion; () => { var y = this; }; return x; }
 >floweri : () => lavali.otion
->lavali : lavali
+>lavali : unknown
 >otion : lavali.otion
 >x : lavali.otion
->lavali : lavali
+>lavali : unknown
 >otion : lavali.otion
 >() => { var y = this; } : () => void
 >y : moojeni<T0, T1>
@@ -2238,18 +2238,18 @@ 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 : imperfecta
+>imperfecta : unknown
 >ciliolabrum : imperfecta.ciliolabrum<T0, T1>
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >megalonyx : Lanthanum.megalonyx
->petrophilus : petrophilus
+>petrophilus : unknown
 >minutilla : petrophilus.minutilla
 >x : imperfecta.ciliolabrum<Lanthanum.megalonyx, petrophilus.minutilla>
->imperfecta : imperfecta
+>imperfecta : unknown
 >ciliolabrum : imperfecta.ciliolabrum<T0, T1>
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >megalonyx : Lanthanum.megalonyx
->petrophilus : petrophilus
+>petrophilus : unknown
 >minutilla : petrophilus.minutilla
 >() => { var y = this; } : () => void
 >y : moojeni<T0, T1>
@@ -2258,10 +2258,10 @@ module rendalli {
 
     miletus() : julianae.sumatrana { var x : julianae.sumatrana; () => { var y = this; }; return x; }
 >miletus : () => julianae.sumatrana
->julianae : julianae
+>julianae : unknown
 >sumatrana : julianae.sumatrana
 >x : julianae.sumatrana
->julianae : julianae
+>julianae : unknown
 >sumatrana : julianae.sumatrana
 >() => { var y = this; } : () => void
 >y : moojeni<T0, T1>
@@ -2280,26 +2280,26 @@ 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 : panglima
+>panglima : unknown
 >amphibius : panglima.amphibius<T0, T1>
->patas : patas
+>patas : unknown
 >uralensis : patas.uralensis
->gabriellae : gabriellae
+>gabriellae : unknown
 >klossii : gabriellae.klossii<T0, T1>
->julianae : julianae
+>julianae : unknown
 >nudicaudus : julianae.nudicaudus
->dogramacii : dogramacii
+>dogramacii : unknown
 >aurata : dogramacii.aurata
 >x : panglima.amphibius<patas.uralensis, gabriellae.klossii<julianae.nudicaudus, dogramacii.aurata>>
->panglima : panglima
+>panglima : unknown
 >amphibius : panglima.amphibius<T0, T1>
->patas : patas
+>patas : unknown
 >uralensis : patas.uralensis
->gabriellae : gabriellae
+>gabriellae : unknown
 >klossii : gabriellae.klossii<T0, T1>
->julianae : julianae
+>julianae : unknown
 >nudicaudus : julianae.nudicaudus
->dogramacii : dogramacii
+>dogramacii : unknown
 >aurata : dogramacii.aurata
 >() => { var y = this; } : () => void
 >y : moojeni<T0, T1>
@@ -2308,10 +2308,10 @@ module rendalli {
 
     budini() : julianae.durangae { var x : julianae.durangae; () => { var y = this; }; return x; }
 >budini : () => julianae.durangae
->julianae : julianae
+>julianae : unknown
 >durangae : julianae.durangae
 >x : julianae.durangae
->julianae : julianae
+>julianae : unknown
 >durangae : julianae.durangae
 >() => { var y = this; } : () => void
 >y : moojeni<T0, T1>
@@ -2320,34 +2320,34 @@ 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 : trivirgatus
+>trivirgatus : unknown
 >mixtus : trivirgatus.mixtus<T0, T1>
->panglima : panglima
+>panglima : unknown
 >amphibius : panglima.amphibius<T0, T1>
->gabriellae : gabriellae
+>gabriellae : unknown
 >klossii : gabriellae.klossii<T0, T1>
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >jugularis : Lanthanum.jugularis
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >jugularis : Lanthanum.jugularis
->imperfecta : imperfecta
+>imperfecta : unknown
 >subspinosus : imperfecta.subspinosus
->sagitta : sagitta
+>sagitta : unknown
 >stolzmanni : sagitta.stolzmanni
 >x : trivirgatus.mixtus<panglima.amphibius<gabriellae.klossii<Lanthanum.jugularis, Lanthanum.jugularis>, imperfecta.subspinosus>, sagitta.stolzmanni>
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >mixtus : trivirgatus.mixtus<T0, T1>
->panglima : panglima
+>panglima : unknown
 >amphibius : panglima.amphibius<T0, T1>
->gabriellae : gabriellae
+>gabriellae : unknown
 >klossii : gabriellae.klossii<T0, T1>
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >jugularis : Lanthanum.jugularis
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >jugularis : Lanthanum.jugularis
->imperfecta : imperfecta
+>imperfecta : unknown
 >subspinosus : imperfecta.subspinosus
->sagitta : sagitta
+>sagitta : unknown
 >stolzmanni : sagitta.stolzmanni
 >() => { var y = this; } : () => void
 >y : moojeni<T0, T1>
@@ -2356,18 +2356,18 @@ 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 : julianae
+>julianae : unknown
 >gerbillus : julianae.gerbillus<T0, T1>
->julianae : julianae
+>julianae : unknown
 >durangae : julianae.durangae
->dammermani : dammermani
+>dammermani : unknown
 >melanops : dammermani.melanops
 >x : julianae.gerbillus<julianae.durangae, dammermani.melanops>
->julianae : julianae
+>julianae : unknown
 >gerbillus : julianae.gerbillus<T0, T1>
->julianae : julianae
+>julianae : unknown
 >durangae : julianae.durangae
->dammermani : dammermani
+>dammermani : unknown
 >melanops : dammermani.melanops
 >() => { var y = this; } : () => void
 >y : moojeni<T0, T1>
@@ -2376,18 +2376,18 @@ 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 : minutus
+>minutus : unknown
 >inez : minutus.inez<T0, T1>
->sagitta : sagitta
+>sagitta : unknown
 >stolzmanni : sagitta.stolzmanni
->dammermani : dammermani
+>dammermani : unknown
 >melanops : dammermani.melanops
 >x : minutus.inez<sagitta.stolzmanni, dammermani.melanops>
->minutus : minutus
+>minutus : unknown
 >inez : minutus.inez<T0, T1>
->sagitta : sagitta
+>sagitta : unknown
 >stolzmanni : sagitta.stolzmanni
->dammermani : dammermani
+>dammermani : unknown
 >melanops : dammermani.melanops
 >() => { var y = this; } : () => void
 >y : moojeni<T0, T1>
@@ -2396,18 +2396,18 @@ 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 : howi
+>howi : unknown
 >coludo : howi.coludo<T0, T1>
->quasiater : quasiater
+>quasiater : unknown
 >bobrinskoi : quasiater.bobrinskoi
->provocax : provocax
+>provocax : unknown
 >melanoleuca : provocax.melanoleuca
 >x : howi.coludo<quasiater.bobrinskoi, provocax.melanoleuca>
->howi : howi
+>howi : unknown
 >coludo : howi.coludo<T0, T1>
->quasiater : quasiater
+>quasiater : unknown
 >bobrinskoi : quasiater.bobrinskoi
->provocax : provocax
+>provocax : unknown
 >melanoleuca : provocax.melanoleuca
 >() => { var y = this; } : () => void
 >y : moojeni<T0, T1>
@@ -2418,23 +2418,23 @@ module rendalli {
 >crenulata : crenulata<T0, T1>
 >T0 : T0
 >T1 : T1
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >falconeri : trivirgatus.falconeri
 
     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 : howi
+>howi : unknown
 >coludo : howi.coludo<T0, T1>
->howi : howi
+>howi : unknown
 >marcanoi : howi.marcanoi
->rionegrensis : rionegrensis
+>rionegrensis : unknown
 >caniventer : rionegrensis.caniventer
 >x : howi.coludo<howi.marcanoi, rionegrensis.caniventer>
->howi : howi
+>howi : unknown
 >coludo : howi.coludo<T0, T1>
->howi : howi
+>howi : unknown
 >marcanoi : howi.marcanoi
->rionegrensis : rionegrensis
+>rionegrensis : unknown
 >caniventer : rionegrensis.caniventer
 >() => { var y = this; } : () => void
 >y : crenulata<T0, T1>
@@ -2443,10 +2443,10 @@ module rendalli {
 
     maritimus() : ruatanica.americanus { var x : ruatanica.americanus; () => { var y = this; }; return x; }
 >maritimus : () => ruatanica.americanus
->ruatanica : ruatanica
+>ruatanica : unknown
 >americanus : ruatanica.americanus
 >x : ruatanica.americanus
->ruatanica : ruatanica
+>ruatanica : unknown
 >americanus : ruatanica.americanus
 >() => { var y = this; } : () => void
 >y : crenulata<T0, T1>
@@ -2455,34 +2455,34 @@ 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 : lutreolus
+>lutreolus : unknown
 >cor : lutreolus.cor<T0, T1>
->imperfecta : imperfecta
+>imperfecta : unknown
 >lasiurus : imperfecta.lasiurus<T0, T1>
->howi : howi
+>howi : unknown
 >marcanoi : howi.marcanoi
->imperfecta : imperfecta
+>imperfecta : unknown
 >ciliolabrum : imperfecta.ciliolabrum<T0, T1>
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >megalonyx : Lanthanum.megalonyx
->petrophilus : petrophilus
+>petrophilus : unknown
 >minutilla : petrophilus.minutilla
->rionegrensis : rionegrensis
+>rionegrensis : unknown
 >caniventer : rionegrensis.caniventer
 >x : lutreolus.cor<imperfecta.lasiurus<howi.marcanoi, imperfecta.ciliolabrum<Lanthanum.megalonyx, petrophilus.minutilla>>, rionegrensis.caniventer>
->lutreolus : lutreolus
+>lutreolus : unknown
 >cor : lutreolus.cor<T0, T1>
->imperfecta : imperfecta
+>imperfecta : unknown
 >lasiurus : imperfecta.lasiurus<T0, T1>
->howi : howi
+>howi : unknown
 >marcanoi : howi.marcanoi
->imperfecta : imperfecta
+>imperfecta : unknown
 >ciliolabrum : imperfecta.ciliolabrum<T0, T1>
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >megalonyx : Lanthanum.megalonyx
->petrophilus : petrophilus
+>petrophilus : unknown
 >minutilla : petrophilus.minutilla
->rionegrensis : rionegrensis
+>rionegrensis : unknown
 >caniventer : rionegrensis.caniventer
 >() => { var y = this; } : () => void
 >y : crenulata<T0, T1>
@@ -2491,7 +2491,7 @@ module rendalli {
   }
 }
 module trivirgatus {
->trivirgatus : trivirgatus
+>trivirgatus : typeof trivirgatus
 
   export class tumidifrons<T0, T1> {
 >tumidifrons : tumidifrons<T0, T1>
@@ -2500,10 +2500,10 @@ module trivirgatus {
 
     nivalis() : dogramacii.kaiseri { var x : dogramacii.kaiseri; () => { var y = this; }; return x; }
 >nivalis : () => dogramacii.kaiseri
->dogramacii : dogramacii
+>dogramacii : unknown
 >kaiseri : dogramacii.kaiseri
 >x : dogramacii.kaiseri
->dogramacii : dogramacii
+>dogramacii : unknown
 >kaiseri : dogramacii.kaiseri
 >() => { var y = this; } : () => void
 >y : tumidifrons<T0, T1>
@@ -2512,10 +2512,10 @@ module trivirgatus {
 
     vestitus() : lavali.xanthognathus { var x : lavali.xanthognathus; () => { var y = this; }; return x; }
 >vestitus : () => lavali.xanthognathus
->lavali : lavali
+>lavali : unknown
 >xanthognathus : lavali.xanthognathus
 >x : lavali.xanthognathus
->lavali : lavali
+>lavali : unknown
 >xanthognathus : lavali.xanthognathus
 >() => { var y = this; } : () => void
 >y : tumidifrons<T0, T1>
@@ -2524,10 +2524,10 @@ module trivirgatus {
 
     aequatorius() : rionegrensis.caniventer { var x : rionegrensis.caniventer; () => { var y = this; }; return x; }
 >aequatorius : () => rionegrensis.caniventer
->rionegrensis : rionegrensis
+>rionegrensis : unknown
 >caniventer : rionegrensis.caniventer
 >x : rionegrensis.caniventer
->rionegrensis : rionegrensis
+>rionegrensis : unknown
 >caniventer : rionegrensis.caniventer
 >() => { var y = this; } : () => void
 >y : tumidifrons<T0, T1>
@@ -2546,10 +2546,10 @@ module trivirgatus {
 
     improvisum() : argurus.peninsulae { var x : argurus.peninsulae; () => { var y = this; }; return x; }
 >improvisum : () => argurus.peninsulae
->argurus : argurus
+>argurus : unknown
 >peninsulae : argurus.peninsulae
 >x : argurus.peninsulae
->argurus : argurus
+>argurus : unknown
 >peninsulae : argurus.peninsulae
 >() => { var y = this; } : () => void
 >y : tumidifrons<T0, T1>
@@ -2558,18 +2558,18 @@ 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 : panglima
+>panglima : unknown
 >abidi : panglima.abidi<T0, T1>
->lavali : lavali
+>lavali : unknown
 >lepturus : lavali.lepturus
->caurinus : caurinus
+>caurinus : unknown
 >psilurus : caurinus.psilurus
 >x : panglima.abidi<lavali.lepturus, caurinus.psilurus>
->panglima : panglima
+>panglima : unknown
 >abidi : panglima.abidi<T0, T1>
->lavali : lavali
+>lavali : unknown
 >lepturus : lavali.lepturus
->caurinus : caurinus
+>caurinus : unknown
 >psilurus : caurinus.psilurus
 >() => { var y = this; } : () => void
 >y : tumidifrons<T0, T1>
@@ -2578,10 +2578,10 @@ module trivirgatus {
 
     audax() : dogramacii.robustulus { var x : dogramacii.robustulus; () => { var y = this; }; return x; }
 >audax : () => dogramacii.robustulus
->dogramacii : dogramacii
+>dogramacii : unknown
 >robustulus : dogramacii.robustulus
 >x : dogramacii.robustulus
->dogramacii : dogramacii
+>dogramacii : unknown
 >robustulus : dogramacii.robustulus
 >() => { var y = this; } : () => void
 >y : tumidifrons<T0, T1>
@@ -2590,18 +2590,18 @@ 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 : sagitta
+>sagitta : unknown
 >sicarius : sagitta.sicarius<T0, T1>
->lavali : lavali
+>lavali : unknown
 >wilsoni : lavali.wilsoni
->lutreolus : lutreolus
+>lutreolus : unknown
 >punicus : lutreolus.punicus
 >x : sagitta.sicarius<lavali.wilsoni, lutreolus.punicus>
->sagitta : sagitta
+>sagitta : unknown
 >sicarius : sagitta.sicarius<T0, T1>
->lavali : lavali
+>lavali : unknown
 >wilsoni : lavali.wilsoni
->lutreolus : lutreolus
+>lutreolus : unknown
 >punicus : lutreolus.punicus
 >() => { var y = this; } : () => void
 >y : tumidifrons<T0, T1>
@@ -2612,23 +2612,23 @@ module trivirgatus {
 >mixtus : mixtus<T0, T1>
 >T0 : T0
 >T1 : T1
->argurus : argurus
+>argurus : unknown
 >pygmaea : argurus.pygmaea<T0, T1>
->argurus : argurus
+>argurus : unknown
 >oreas : argurus.oreas
->panglima : panglima
+>panglima : unknown
 >fundatus : panglima.fundatus<T0, T1>
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >daphaenodon : macrorhinos.daphaenodon
 
     ochrogaster() : dogramacii.aurata { var x : dogramacii.aurata; () => { var y = this; }; return x; }
 >ochrogaster : () => dogramacii.aurata
->dogramacii : dogramacii
+>dogramacii : unknown
 >aurata : dogramacii.aurata
 >x : dogramacii.aurata
->dogramacii : dogramacii
+>dogramacii : unknown
 >aurata : dogramacii.aurata
 >() => { var y = this; } : () => void
 >y : mixtus<T0, T1>
@@ -2637,34 +2637,34 @@ 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 : macrorhinos
+>macrorhinos : unknown
 >marmosurus : macrorhinos.marmosurus<T0, T1>
->dogramacii : dogramacii
+>dogramacii : unknown
 >koepckeae : dogramacii.koepckeae
->panglima : panglima
+>panglima : unknown
 >abidi : panglima.abidi<T0, T1>
->dogramacii : dogramacii
+>dogramacii : unknown
 >aurata : dogramacii.aurata
->chrysaeolus : chrysaeolus
+>chrysaeolus : unknown
 >sarasinorum : chrysaeolus.sarasinorum<T0, T1>
->caurinus : caurinus
+>caurinus : unknown
 >megaphyllus : caurinus.megaphyllus
->lavali : lavali
+>lavali : unknown
 >xanthognathus : lavali.xanthognathus
 >x : macrorhinos.marmosurus<dogramacii.koepckeae, panglima.abidi<dogramacii.aurata, chrysaeolus.sarasinorum<caurinus.megaphyllus, lavali.xanthognathus>>>
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >marmosurus : macrorhinos.marmosurus<T0, T1>
->dogramacii : dogramacii
+>dogramacii : unknown
 >koepckeae : dogramacii.koepckeae
->panglima : panglima
+>panglima : unknown
 >abidi : panglima.abidi<T0, T1>
->dogramacii : dogramacii
+>dogramacii : unknown
 >aurata : dogramacii.aurata
->chrysaeolus : chrysaeolus
+>chrysaeolus : unknown
 >sarasinorum : chrysaeolus.sarasinorum<T0, T1>
->caurinus : caurinus
+>caurinus : unknown
 >megaphyllus : caurinus.megaphyllus
->lavali : lavali
+>lavali : unknown
 >xanthognathus : lavali.xanthognathus
 >() => { var y = this; } : () => void
 >y : mixtus<T0, T1>
@@ -2673,10 +2673,10 @@ module trivirgatus {
 
     liechtensteini() : rendalli.zuluensis { var x : rendalli.zuluensis; () => { var y = this; }; return x; }
 >liechtensteini : () => rendalli.zuluensis
->rendalli : rendalli
+>rendalli : unknown
 >zuluensis : rendalli.zuluensis
 >x : rendalli.zuluensis
->rendalli : rendalli
+>rendalli : unknown
 >zuluensis : rendalli.zuluensis
 >() => { var y = this; } : () => void
 >y : mixtus<T0, T1>
@@ -2685,26 +2685,26 @@ 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 : howi
+>howi : unknown
 >coludo : howi.coludo<T0, T1>
->julianae : julianae
+>julianae : unknown
 >steerii : julianae.steerii
->julianae : julianae
+>julianae : unknown
 >gerbillus : julianae.gerbillus<T0, T1>
->lavali : lavali
+>lavali : unknown
 >thaeleri : lavali.thaeleri
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
 >x : howi.coludo<julianae.steerii, julianae.gerbillus<lavali.thaeleri, quasiater.carolinensis>>
->howi : howi
+>howi : unknown
 >coludo : howi.coludo<T0, T1>
->julianae : julianae
+>julianae : unknown
 >steerii : julianae.steerii
->julianae : julianae
+>julianae : unknown
 >gerbillus : julianae.gerbillus<T0, T1>
->lavali : lavali
+>lavali : unknown
 >thaeleri : lavali.thaeleri
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
 >() => { var y = this; } : () => void
 >y : mixtus<T0, T1>
@@ -2713,10 +2713,10 @@ module trivirgatus {
 
     hypsibia() : lavali.thaeleri { var x : lavali.thaeleri; () => { var y = this; }; return x; }
 >hypsibia : () => lavali.thaeleri
->lavali : lavali
+>lavali : unknown
 >thaeleri : lavali.thaeleri
 >x : lavali.thaeleri
->lavali : lavali
+>lavali : unknown
 >thaeleri : lavali.thaeleri
 >() => { var y = this; } : () => void
 >y : mixtus<T0, T1>
@@ -2725,32 +2725,32 @@ 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 : panglima
+>panglima : unknown
 >fundatus : panglima.fundatus<T0, T1>
->panamensis : panamensis
+>panamensis : unknown
 >linulus : panamensis.linulus<T0, T1>
 >lotor : lotor<T0, T1>
->argurus : argurus
+>argurus : unknown
 >luctuosa : argurus.luctuosa
->lavali : lavali
+>lavali : unknown
 >wilsoni : lavali.wilsoni
->lavali : lavali
+>lavali : unknown
 >beisa : lavali.beisa
->dammermani : dammermani
+>dammermani : unknown
 >melanops : dammermani.melanops
 >x : panglima.fundatus<panamensis.linulus<lotor<argurus.luctuosa, lavali.wilsoni>, lavali.beisa>, dammermani.melanops>
->panglima : panglima
+>panglima : unknown
 >fundatus : panglima.fundatus<T0, T1>
->panamensis : panamensis
+>panamensis : unknown
 >linulus : panamensis.linulus<T0, T1>
 >lotor : lotor<T0, T1>
->argurus : argurus
+>argurus : unknown
 >luctuosa : argurus.luctuosa
->lavali : lavali
+>lavali : unknown
 >wilsoni : lavali.wilsoni
->lavali : lavali
+>lavali : unknown
 >beisa : lavali.beisa
->dammermani : dammermani
+>dammermani : unknown
 >melanops : dammermani.melanops
 >() => { var y = this; } : () => void
 >y : mixtus<T0, T1>
@@ -2759,18 +2759,18 @@ 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 : caurinus
+>caurinus : unknown
 >johorensis : caurinus.johorensis<T0, T1>
->julianae : julianae
+>julianae : unknown
 >acariensis : julianae.acariensis
->rendalli : rendalli
+>rendalli : unknown
 >zuluensis : rendalli.zuluensis
 >x : caurinus.johorensis<julianae.acariensis, rendalli.zuluensis>
->caurinus : caurinus
+>caurinus : unknown
 >johorensis : caurinus.johorensis<T0, T1>
->julianae : julianae
+>julianae : unknown
 >acariensis : julianae.acariensis
->rendalli : rendalli
+>rendalli : unknown
 >zuluensis : rendalli.zuluensis
 >() => { var y = this; } : () => void
 >y : mixtus<T0, T1>
@@ -2784,10 +2784,10 @@ module trivirgatus {
 
     balensis() : samarensis.pallidus { var x : samarensis.pallidus; () => { var y = this; }; return x; }
 >balensis : () => samarensis.pallidus
->samarensis : samarensis
+>samarensis : unknown
 >pallidus : samarensis.pallidus
 >x : samarensis.pallidus
->samarensis : samarensis
+>samarensis : unknown
 >pallidus : samarensis.pallidus
 >() => { var y = this; } : () => void
 >y : lotor<T0, T1>
@@ -2796,18 +2796,18 @@ 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 : rionegrensis
+>rionegrensis : unknown
 >veraecrucis : rionegrensis.veraecrucis<T0, T1>
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
->argurus : argurus
+>argurus : unknown
 >peninsulae : argurus.peninsulae
 >x : rionegrensis.veraecrucis<quasiater.carolinensis, argurus.peninsulae>
->rionegrensis : rionegrensis
+>rionegrensis : unknown
 >veraecrucis : rionegrensis.veraecrucis<T0, T1>
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
->argurus : argurus
+>argurus : unknown
 >peninsulae : argurus.peninsulae
 >() => { var y = this; } : () => void
 >y : lotor<T0, T1>
@@ -2819,42 +2819,42 @@ 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 : rendalli
+>rendalli : unknown
 >moojeni : rendalli.moojeni<T0, T1>
->imperfecta : imperfecta
+>imperfecta : unknown
 >lasiurus : imperfecta.lasiurus<T0, T1>
->howi : howi
+>howi : unknown
 >marcanoi : howi.marcanoi
->imperfecta : imperfecta
+>imperfecta : unknown
 >ciliolabrum : imperfecta.ciliolabrum<T0, T1>
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >megalonyx : Lanthanum.megalonyx
->petrophilus : petrophilus
+>petrophilus : unknown
 >minutilla : petrophilus.minutilla
->daubentonii : daubentonii
+>daubentonii : unknown
 >arboreus : daubentonii.arboreus<T0, T1>
->julianae : julianae
+>julianae : unknown
 >nudicaudus : julianae.nudicaudus
->julianae : julianae
+>julianae : unknown
 >steerii : julianae.steerii
 >x : rendalli.moojeni<imperfecta.lasiurus<howi.marcanoi, imperfecta.ciliolabrum<Lanthanum.megalonyx, petrophilus.minutilla>>, daubentonii.arboreus<julianae.nudicaudus, julianae.steerii>>
->rendalli : rendalli
+>rendalli : unknown
 >moojeni : rendalli.moojeni<T0, T1>
->imperfecta : imperfecta
+>imperfecta : unknown
 >lasiurus : imperfecta.lasiurus<T0, T1>
->howi : howi
+>howi : unknown
 >marcanoi : howi.marcanoi
->imperfecta : imperfecta
+>imperfecta : unknown
 >ciliolabrum : imperfecta.ciliolabrum<T0, T1>
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >megalonyx : Lanthanum.megalonyx
->petrophilus : petrophilus
+>petrophilus : unknown
 >minutilla : petrophilus.minutilla
->daubentonii : daubentonii
+>daubentonii : unknown
 >arboreus : daubentonii.arboreus<T0, T1>
->julianae : julianae
+>julianae : unknown
 >nudicaudus : julianae.nudicaudus
->julianae : julianae
+>julianae : unknown
 >steerii : julianae.steerii
 >() => { var y = this; } : () => void
 >y : falconeri
@@ -2863,34 +2863,34 @@ 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 : nigra
+>nigra : unknown
 >dolichurus : nigra.dolichurus<T0, T1>
->imperfecta : imperfecta
+>imperfecta : unknown
 >lasiurus : imperfecta.lasiurus<T0, T1>
->julianae : julianae
+>julianae : unknown
 >acariensis : julianae.acariensis
->howi : howi
+>howi : unknown
 >coludo : howi.coludo<T0, T1>
->argurus : argurus
+>argurus : unknown
 >oreas : argurus.oreas
->howi : howi
+>howi : unknown
 >marcanoi : howi.marcanoi
->patas : patas
+>patas : unknown
 >uralensis : patas.uralensis
 >x : nigra.dolichurus<imperfecta.lasiurus<julianae.acariensis, howi.coludo<argurus.oreas, howi.marcanoi>>, patas.uralensis>
->nigra : nigra
+>nigra : unknown
 >dolichurus : nigra.dolichurus<T0, T1>
->imperfecta : imperfecta
+>imperfecta : unknown
 >lasiurus : imperfecta.lasiurus<T0, T1>
->julianae : julianae
+>julianae : unknown
 >acariensis : julianae.acariensis
->howi : howi
+>howi : unknown
 >coludo : howi.coludo<T0, T1>
->argurus : argurus
+>argurus : unknown
 >oreas : argurus.oreas
->howi : howi
+>howi : unknown
 >marcanoi : howi.marcanoi
->patas : patas
+>patas : unknown
 >uralensis : patas.uralensis
 >() => { var y = this; } : () => void
 >y : falconeri
@@ -2899,26 +2899,26 @@ 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 : samarensis
+>samarensis : unknown
 >pelurus : samarensis.pelurus<T0, T1>
->dammermani : dammermani
+>dammermani : unknown
 >melanops : dammermani.melanops
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >nitidus : Lanthanum.nitidus<T0, T1>
->ruatanica : ruatanica
+>ruatanica : unknown
 >americanus : ruatanica.americanus
->sagitta : sagitta
+>sagitta : unknown
 >stolzmanni : sagitta.stolzmanni
 >x : samarensis.pelurus<dammermani.melanops, Lanthanum.nitidus<ruatanica.americanus, sagitta.stolzmanni>>
->samarensis : samarensis
+>samarensis : unknown
 >pelurus : samarensis.pelurus<T0, T1>
->dammermani : dammermani
+>dammermani : unknown
 >melanops : dammermani.melanops
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >nitidus : Lanthanum.nitidus<T0, T1>
->ruatanica : ruatanica
+>ruatanica : unknown
 >americanus : ruatanica.americanus
->sagitta : sagitta
+>sagitta : unknown
 >stolzmanni : sagitta.stolzmanni
 >() => { var y = this; } : () => void
 >y : falconeri
@@ -2927,34 +2927,34 @@ 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 : sagitta
+>sagitta : unknown
 >cinereus : sagitta.cinereus<T0, T1>
->imperfecta : imperfecta
+>imperfecta : unknown
 >ciliolabrum : imperfecta.ciliolabrum<T0, T1>
->lavali : lavali
+>lavali : unknown
 >otion : lavali.otion
->petrophilus : petrophilus
+>petrophilus : unknown
 >sodyi : petrophilus.sodyi<T0, T1>
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >konganensis : macrorhinos.konganensis
->caurinus : caurinus
+>caurinus : unknown
 >psilurus : caurinus.psilurus
->dogramacii : dogramacii
+>dogramacii : unknown
 >koepckeae : dogramacii.koepckeae
 >x : sagitta.cinereus<imperfecta.ciliolabrum<lavali.otion, petrophilus.sodyi<macrorhinos.konganensis, caurinus.psilurus>>, dogramacii.koepckeae>
->sagitta : sagitta
+>sagitta : unknown
 >cinereus : sagitta.cinereus<T0, T1>
->imperfecta : imperfecta
+>imperfecta : unknown
 >ciliolabrum : imperfecta.ciliolabrum<T0, T1>
->lavali : lavali
+>lavali : unknown
 >otion : lavali.otion
->petrophilus : petrophilus
+>petrophilus : unknown
 >sodyi : petrophilus.sodyi<T0, T1>
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >konganensis : macrorhinos.konganensis
->caurinus : caurinus
+>caurinus : unknown
 >psilurus : caurinus.psilurus
->dogramacii : dogramacii
+>dogramacii : unknown
 >koepckeae : dogramacii.koepckeae
 >() => { var y = this; } : () => void
 >y : falconeri
@@ -2963,10 +2963,10 @@ module trivirgatus {
 
     gaoligongensis() : dogramacii.koepckeae { var x : dogramacii.koepckeae; () => { var y = this; }; return x; }
 >gaoligongensis : () => dogramacii.koepckeae
->dogramacii : dogramacii
+>dogramacii : unknown
 >koepckeae : dogramacii.koepckeae
 >x : dogramacii.koepckeae
->dogramacii : dogramacii
+>dogramacii : unknown
 >koepckeae : dogramacii.koepckeae
 >() => { var y = this; } : () => void
 >y : falconeri
@@ -2975,26 +2975,26 @@ 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 : minutus
+>minutus : unknown
 >inez : minutus.inez<T0, T1>
->sagitta : sagitta
+>sagitta : unknown
 >stolzmanni : sagitta.stolzmanni
->rionegrensis : rionegrensis
+>rionegrensis : unknown
 >veraecrucis : rionegrensis.veraecrucis<T0, T1>
->lavali : lavali
+>lavali : unknown
 >xanthognathus : lavali.xanthognathus
->quasiater : quasiater
+>quasiater : unknown
 >bobrinskoi : quasiater.bobrinskoi
 >x : minutus.inez<sagitta.stolzmanni, rionegrensis.veraecrucis<lavali.xanthognathus, quasiater.bobrinskoi>>
->minutus : minutus
+>minutus : unknown
 >inez : minutus.inez<T0, T1>
->sagitta : sagitta
+>sagitta : unknown
 >stolzmanni : sagitta.stolzmanni
->rionegrensis : rionegrensis
+>rionegrensis : unknown
 >veraecrucis : rionegrensis.veraecrucis<T0, T1>
->lavali : lavali
+>lavali : unknown
 >xanthognathus : lavali.xanthognathus
->quasiater : quasiater
+>quasiater : unknown
 >bobrinskoi : quasiater.bobrinskoi
 >() => { var y = this; } : () => void
 >y : falconeri
@@ -3003,10 +3003,10 @@ module trivirgatus {
 
     gmelini() : rionegrensis.caniventer { var x : rionegrensis.caniventer; () => { var y = this; }; return x; }
 >gmelini : () => rionegrensis.caniventer
->rionegrensis : rionegrensis
+>rionegrensis : unknown
 >caniventer : rionegrensis.caniventer
 >x : rionegrensis.caniventer
->rionegrensis : rionegrensis
+>rionegrensis : unknown
 >caniventer : rionegrensis.caniventer
 >() => { var y = this; } : () => void
 >y : falconeri
@@ -3018,18 +3018,18 @@ 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 : nigra
+>nigra : unknown
 >thalia : nigra.thalia<T0, T1>
->patas : patas
+>patas : unknown
 >uralensis : patas.uralensis
->julianae : julianae
+>julianae : unknown
 >galapagoensis : julianae.galapagoensis
 >x : nigra.thalia<patas.uralensis, julianae.galapagoensis>
->nigra : nigra
+>nigra : unknown
 >thalia : nigra.thalia<T0, T1>
->patas : patas
+>patas : unknown
 >uralensis : patas.uralensis
->julianae : julianae
+>julianae : unknown
 >galapagoensis : julianae.galapagoensis
 >() => { var y = this; } : () => void
 >y : oconnelli
@@ -3038,10 +3038,10 @@ module trivirgatus {
 
     terrestris() : macrorhinos.konganensis { var x : macrorhinos.konganensis; () => { var y = this; }; return x; }
 >terrestris : () => macrorhinos.konganensis
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >konganensis : macrorhinos.konganensis
 >x : macrorhinos.konganensis
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >konganensis : macrorhinos.konganensis
 >() => { var y = this; } : () => void
 >y : oconnelli
@@ -3050,26 +3050,26 @@ 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 : sagitta
+>sagitta : unknown
 >sicarius : sagitta.sicarius<T0, T1>
->dogramacii : dogramacii
+>dogramacii : unknown
 >koepckeae : dogramacii.koepckeae
->petrophilus : petrophilus
+>petrophilus : unknown
 >sodyi : petrophilus.sodyi<T0, T1>
->argurus : argurus
+>argurus : unknown
 >oreas : argurus.oreas
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >daphaenodon : macrorhinos.daphaenodon
 >x : sagitta.sicarius<dogramacii.koepckeae, petrophilus.sodyi<argurus.oreas, macrorhinos.daphaenodon>>
->sagitta : sagitta
+>sagitta : unknown
 >sicarius : sagitta.sicarius<T0, T1>
->dogramacii : dogramacii
+>dogramacii : unknown
 >koepckeae : dogramacii.koepckeae
->petrophilus : petrophilus
+>petrophilus : unknown
 >sodyi : petrophilus.sodyi<T0, T1>
->argurus : argurus
+>argurus : unknown
 >oreas : argurus.oreas
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >daphaenodon : macrorhinos.daphaenodon
 >() => { var y = this; } : () => void
 >y : oconnelli
@@ -3078,10 +3078,10 @@ module trivirgatus {
 
     fuscomurina() : argurus.peninsulae { var x : argurus.peninsulae; () => { var y = this; }; return x; }
 >fuscomurina : () => argurus.peninsulae
->argurus : argurus
+>argurus : unknown
 >peninsulae : argurus.peninsulae
 >x : argurus.peninsulae
->argurus : argurus
+>argurus : unknown
 >peninsulae : argurus.peninsulae
 >() => { var y = this; } : () => void
 >y : oconnelli
@@ -3090,34 +3090,34 @@ 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 : nigra
+>nigra : unknown
 >gracilis : nigra.gracilis<T0, T1>
->panamensis : panamensis
+>panamensis : unknown
 >setulosus : panamensis.setulosus<T0, T1>
->sagitta : sagitta
+>sagitta : unknown
 >walkeri : sagitta.walkeri
->dogramacii : dogramacii
+>dogramacii : unknown
 >robustulus : dogramacii.robustulus
->petrophilus : petrophilus
+>petrophilus : unknown
 >sodyi : petrophilus.sodyi<T0, T1>
->argurus : argurus
+>argurus : unknown
 >oreas : argurus.oreas
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >daphaenodon : macrorhinos.daphaenodon
 >x : nigra.gracilis<panamensis.setulosus<sagitta.walkeri, dogramacii.robustulus>, petrophilus.sodyi<argurus.oreas, macrorhinos.daphaenodon>>
->nigra : nigra
+>nigra : unknown
 >gracilis : nigra.gracilis<T0, T1>
->panamensis : panamensis
+>panamensis : unknown
 >setulosus : panamensis.setulosus<T0, T1>
->sagitta : sagitta
+>sagitta : unknown
 >walkeri : sagitta.walkeri
->dogramacii : dogramacii
+>dogramacii : unknown
 >robustulus : dogramacii.robustulus
->petrophilus : petrophilus
+>petrophilus : unknown
 >sodyi : petrophilus.sodyi<T0, T1>
->argurus : argurus
+>argurus : unknown
 >oreas : argurus.oreas
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >daphaenodon : macrorhinos.daphaenodon
 >() => { var y = this; } : () => void
 >y : oconnelli
@@ -3126,10 +3126,10 @@ module trivirgatus {
 
     aenea() : argurus.luctuosa { var x : argurus.luctuosa; () => { var y = this; }; return x; }
 >aenea : () => argurus.luctuosa
->argurus : argurus
+>argurus : unknown
 >luctuosa : argurus.luctuosa
 >x : argurus.luctuosa
->argurus : argurus
+>argurus : unknown
 >luctuosa : argurus.luctuosa
 >() => { var y = this; } : () => void
 >y : oconnelli
@@ -3138,10 +3138,10 @@ module trivirgatus {
 
     perrini() : quasiater.bobrinskoi { var x : quasiater.bobrinskoi; () => { var y = this; }; return x; }
 >perrini : () => quasiater.bobrinskoi
->quasiater : quasiater
+>quasiater : unknown
 >bobrinskoi : quasiater.bobrinskoi
 >x : quasiater.bobrinskoi
->quasiater : quasiater
+>quasiater : unknown
 >bobrinskoi : quasiater.bobrinskoi
 >() => { var y = this; } : () => void
 >y : oconnelli
@@ -3150,10 +3150,10 @@ module trivirgatus {
 
     entellus() : dammermani.melanops { var x : dammermani.melanops; () => { var y = this; }; return x; }
 >entellus : () => dammermani.melanops
->dammermani : dammermani
+>dammermani : unknown
 >melanops : dammermani.melanops
 >x : dammermani.melanops
->dammermani : dammermani
+>dammermani : unknown
 >melanops : dammermani.melanops
 >() => { var y = this; } : () => void
 >y : oconnelli
@@ -3162,18 +3162,18 @@ 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 : rionegrensis
+>rionegrensis : unknown
 >veraecrucis : rionegrensis.veraecrucis<T0, T1>
->rionegrensis : rionegrensis
+>rionegrensis : unknown
 >caniventer : rionegrensis.caniventer
->julianae : julianae
+>julianae : unknown
 >durangae : julianae.durangae
 >x : rionegrensis.veraecrucis<rionegrensis.caniventer, julianae.durangae>
->rionegrensis : rionegrensis
+>rionegrensis : unknown
 >veraecrucis : rionegrensis.veraecrucis<T0, T1>
->rionegrensis : rionegrensis
+>rionegrensis : unknown
 >caniventer : rionegrensis.caniventer
->julianae : julianae
+>julianae : unknown
 >durangae : julianae.durangae
 >() => { var y = this; } : () => void
 >y : oconnelli
@@ -3182,10 +3182,10 @@ module trivirgatus {
 
     cephalotes() : lutreolus.schlegeli { var x : lutreolus.schlegeli; () => { var y = this; }; return x; }
 >cephalotes : () => lutreolus.schlegeli
->lutreolus : lutreolus
+>lutreolus : unknown
 >schlegeli : lutreolus.schlegeli
 >x : lutreolus.schlegeli
->lutreolus : lutreolus
+>lutreolus : unknown
 >schlegeli : lutreolus.schlegeli
 >() => { var y = this; } : () => void
 >y : oconnelli
@@ -3194,26 +3194,26 @@ 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 : daubentonii
+>daubentonii : unknown
 >nigricans : daubentonii.nigricans<T0, T1>
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
->daubentonii : daubentonii
+>daubentonii : unknown
 >nesiotes : daubentonii.nesiotes<T0, T1>
->julianae : julianae
+>julianae : unknown
 >sumatrana : julianae.sumatrana
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
 >x : daubentonii.nigricans<quasiater.carolinensis, daubentonii.nesiotes<julianae.sumatrana, quasiater.carolinensis>>
->daubentonii : daubentonii
+>daubentonii : unknown
 >nigricans : daubentonii.nigricans<T0, T1>
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
->daubentonii : daubentonii
+>daubentonii : unknown
 >nesiotes : daubentonii.nesiotes<T0, T1>
->julianae : julianae
+>julianae : unknown
 >sumatrana : julianae.sumatrana
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
 >() => { var y = this; } : () => void
 >y : oconnelli
@@ -3222,10 +3222,10 @@ module trivirgatus {
 
     luisi() : dogramacii.robustulus { var x : dogramacii.robustulus; () => { var y = this; }; return x; }
 >luisi : () => dogramacii.robustulus
->dogramacii : dogramacii
+>dogramacii : unknown
 >robustulus : dogramacii.robustulus
 >x : dogramacii.robustulus
->dogramacii : dogramacii
+>dogramacii : unknown
 >robustulus : dogramacii.robustulus
 >() => { var y = this; } : () => void
 >y : oconnelli
@@ -3234,10 +3234,10 @@ module trivirgatus {
 
     ceylonicus() : rionegrensis.caniventer { var x : rionegrensis.caniventer; () => { var y = this; }; return x; }
 >ceylonicus : () => rionegrensis.caniventer
->rionegrensis : rionegrensis
+>rionegrensis : unknown
 >caniventer : rionegrensis.caniventer
 >x : rionegrensis.caniventer
->rionegrensis : rionegrensis
+>rionegrensis : unknown
 >caniventer : rionegrensis.caniventer
 >() => { var y = this; } : () => void
 >y : oconnelli
@@ -3246,10 +3246,10 @@ module trivirgatus {
 
     ralli() : lavali.xanthognathus { var x : lavali.xanthognathus; () => { var y = this; }; return x; }
 >ralli : () => lavali.xanthognathus
->lavali : lavali
+>lavali : unknown
 >xanthognathus : lavali.xanthognathus
 >x : lavali.xanthognathus
->lavali : lavali
+>lavali : unknown
 >xanthognathus : lavali.xanthognathus
 >() => { var y = this; } : () => void
 >y : oconnelli
@@ -3258,25 +3258,25 @@ module trivirgatus {
   }
 }
 module quasiater {
->quasiater : quasiater
+>quasiater : typeof quasiater
 
   export class bobrinskoi {
 >bobrinskoi : bobrinskoi
 
     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 : samarensis
+>samarensis : unknown
 >cahirinus : samarensis.cahirinus<T0, T1>
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >daphaenodon : macrorhinos.daphaenodon
->argurus : argurus
+>argurus : unknown
 >luctuosa : argurus.luctuosa
 >x : samarensis.cahirinus<macrorhinos.daphaenodon, argurus.luctuosa>
->samarensis : samarensis
+>samarensis : unknown
 >cahirinus : samarensis.cahirinus<T0, T1>
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >daphaenodon : macrorhinos.daphaenodon
->argurus : argurus
+>argurus : unknown
 >luctuosa : argurus.luctuosa
 >() => { var y = this; } : () => void
 >y : bobrinskoi
@@ -3285,10 +3285,10 @@ module quasiater {
 
     mulatta() : argurus.oreas { var x : argurus.oreas; () => { var y = this; }; return x; }
 >mulatta : () => argurus.oreas
->argurus : argurus
+>argurus : unknown
 >oreas : argurus.oreas
 >x : argurus.oreas
->argurus : argurus
+>argurus : unknown
 >oreas : argurus.oreas
 >() => { var y = this; } : () => void
 >y : bobrinskoi
@@ -3297,26 +3297,26 @@ 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 : rendalli
+>rendalli : unknown
 >moojeni : rendalli.moojeni<T0, T1>
->panglima : panglima
+>panglima : unknown
 >amphibius : panglima.amphibius<T0, T1>
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >falconeri : trivirgatus.falconeri
->caurinus : caurinus
+>caurinus : unknown
 >psilurus : caurinus.psilurus
->gabriellae : gabriellae
+>gabriellae : unknown
 >echinatus : gabriellae.echinatus
 >x : rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>
->rendalli : rendalli
+>rendalli : unknown
 >moojeni : rendalli.moojeni<T0, T1>
->panglima : panglima
+>panglima : unknown
 >amphibius : panglima.amphibius<T0, T1>
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >falconeri : trivirgatus.falconeri
->caurinus : caurinus
+>caurinus : unknown
 >psilurus : caurinus.psilurus
->gabriellae : gabriellae
+>gabriellae : unknown
 >echinatus : gabriellae.echinatus
 >() => { var y = this; } : () => void
 >y : bobrinskoi
@@ -3325,18 +3325,18 @@ 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 : argurus
+>argurus : unknown
 >netscheri : argurus.netscheri<T0, T1>
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : carolinensis
->dogramacii : dogramacii
+>dogramacii : unknown
 >kaiseri : dogramacii.kaiseri
 >x : argurus.netscheri<carolinensis, dogramacii.kaiseri>
->argurus : argurus
+>argurus : unknown
 >netscheri : argurus.netscheri<T0, T1>
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : carolinensis
->dogramacii : dogramacii
+>dogramacii : unknown
 >kaiseri : dogramacii.kaiseri
 >() => { var y = this; } : () => void
 >y : bobrinskoi
@@ -3345,23 +3345,23 @@ module quasiater {
   }
 }
 module ruatanica {
->ruatanica : ruatanica
+>ruatanica : typeof ruatanica
 
   export class americanus extends imperfecta.ciliolabrum<argurus.germaini, lutreolus.foina> {
 >americanus : americanus
->imperfecta : imperfecta
+>imperfecta : unknown
 >ciliolabrum : imperfecta.ciliolabrum<T0, T1>
->argurus : argurus
+>argurus : unknown
 >germaini : argurus.germaini
->lutreolus : lutreolus
+>lutreolus : unknown
 >foina : lutreolus.foina
 
     nasoloi() : macrorhinos.konganensis { var x : macrorhinos.konganensis; () => { var y = this; }; return x; }
 >nasoloi : () => macrorhinos.konganensis
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >konganensis : macrorhinos.konganensis
 >x : macrorhinos.konganensis
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >konganensis : macrorhinos.konganensis
 >() => { var y = this; } : () => void
 >y : americanus
@@ -3370,18 +3370,18 @@ 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 : howi
+>howi : unknown
 >angulatus : howi.angulatus<T0, T1>
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
->sagitta : sagitta
+>sagitta : unknown
 >stolzmanni : sagitta.stolzmanni
 >x : howi.angulatus<quasiater.carolinensis, sagitta.stolzmanni>
->howi : howi
+>howi : unknown
 >angulatus : howi.angulatus<T0, T1>
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
->sagitta : sagitta
+>sagitta : unknown
 >stolzmanni : sagitta.stolzmanni
 >() => { var y = this; } : () => void
 >y : americanus
@@ -3390,10 +3390,10 @@ module ruatanica {
 
     fardoulisi() : trivirgatus.oconnelli { var x : trivirgatus.oconnelli; () => { var y = this; }; return x; }
 >fardoulisi : () => trivirgatus.oconnelli
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >oconnelli : trivirgatus.oconnelli
 >x : trivirgatus.oconnelli
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >oconnelli : trivirgatus.oconnelli
 >() => { var y = this; } : () => void
 >y : americanus
@@ -3402,10 +3402,10 @@ module ruatanica {
 
     tumidus() : gabriellae.amicus { var x : gabriellae.amicus; () => { var y = this; }; return x; }
 >tumidus : () => gabriellae.amicus
->gabriellae : gabriellae
+>gabriellae : unknown
 >amicus : gabriellae.amicus
 >x : gabriellae.amicus
->gabriellae : gabriellae
+>gabriellae : unknown
 >amicus : gabriellae.amicus
 >() => { var y = this; } : () => void
 >y : americanus
@@ -3414,28 +3414,28 @@ module ruatanica {
   }
 }
 module lavali {
->lavali : lavali
+>lavali : typeof lavali
 
   export class wilsoni extends Lanthanum.nitidus<rionegrensis.caniventer, Lanthanum.jugularis> {
 >wilsoni : wilsoni
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >nitidus : Lanthanum.nitidus<T0, T1>
->rionegrensis : rionegrensis
+>rionegrensis : unknown
 >caniventer : rionegrensis.caniventer
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >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 : nigra
+>nigra : unknown
 >thalia : nigra.thalia<T0, T1>
->patas : patas
+>patas : unknown
 >uralensis : patas.uralensis
 >wilsoni : wilsoni
 >x : nigra.thalia<patas.uralensis, wilsoni>
->nigra : nigra
+>nigra : unknown
 >thalia : nigra.thalia<T0, T1>
->patas : patas
+>patas : unknown
 >uralensis : patas.uralensis
 >wilsoni : wilsoni
 >() => { var y = this; } : () => void
@@ -3445,10 +3445,10 @@ module lavali {
 
     lorentzii() : imperfecta.subspinosus { var x : imperfecta.subspinosus; () => { var y = this; }; return x; }
 >lorentzii : () => imperfecta.subspinosus
->imperfecta : imperfecta
+>imperfecta : unknown
 >subspinosus : imperfecta.subspinosus
 >x : imperfecta.subspinosus
->imperfecta : imperfecta
+>imperfecta : unknown
 >subspinosus : imperfecta.subspinosus
 >() => { var y = this; } : () => void
 >y : wilsoni
@@ -3457,10 +3457,10 @@ module lavali {
 
     antisensis() : lutreolus.foina { var x : lutreolus.foina; () => { var y = this; }; return x; }
 >antisensis : () => lutreolus.foina
->lutreolus : lutreolus
+>lutreolus : unknown
 >foina : lutreolus.foina
 >x : lutreolus.foina
->lutreolus : lutreolus
+>lutreolus : unknown
 >foina : lutreolus.foina
 >() => { var y = this; } : () => void
 >y : wilsoni
@@ -3469,18 +3469,18 @@ 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 : dammermani
+>dammermani : unknown
 >siberu : dammermani.siberu<T0, T1>
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >megalonyx : Lanthanum.megalonyx
->dogramacii : dogramacii
+>dogramacii : unknown
 >kaiseri : dogramacii.kaiseri
 >x : dammermani.siberu<Lanthanum.megalonyx, dogramacii.kaiseri>
->dammermani : dammermani
+>dammermani : unknown
 >siberu : dammermani.siberu<T0, T1>
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >megalonyx : Lanthanum.megalonyx
->dogramacii : dogramacii
+>dogramacii : unknown
 >kaiseri : dogramacii.kaiseri
 >() => { var y = this; } : () => void
 >y : wilsoni
@@ -3489,10 +3489,10 @@ module lavali {
 
     bontanus() : rionegrensis.caniventer { var x : rionegrensis.caniventer; () => { var y = this; }; return x; }
 >bontanus : () => rionegrensis.caniventer
->rionegrensis : rionegrensis
+>rionegrensis : unknown
 >caniventer : rionegrensis.caniventer
 >x : rionegrensis.caniventer
->rionegrensis : rionegrensis
+>rionegrensis : unknown
 >caniventer : rionegrensis.caniventer
 >() => { var y = this; } : () => void
 >y : wilsoni
@@ -3501,10 +3501,10 @@ module lavali {
 
     caligata() : argurus.oreas { var x : argurus.oreas; () => { var y = this; }; return x; }
 >caligata : () => argurus.oreas
->argurus : argurus
+>argurus : unknown
 >oreas : argurus.oreas
 >x : argurus.oreas
->argurus : argurus
+>argurus : unknown
 >oreas : argurus.oreas
 >() => { var y = this; } : () => void
 >y : wilsoni
@@ -3513,26 +3513,26 @@ 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 : panglima
+>panglima : unknown
 >amphibius : panglima.amphibius<T0, T1>
->gabriellae : gabriellae
+>gabriellae : unknown
 >klossii : gabriellae.klossii<T0, T1>
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >jugularis : Lanthanum.jugularis
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >jugularis : Lanthanum.jugularis
->imperfecta : imperfecta
+>imperfecta : unknown
 >subspinosus : imperfecta.subspinosus
 >x : panglima.amphibius<gabriellae.klossii<Lanthanum.jugularis, Lanthanum.jugularis>, imperfecta.subspinosus>
->panglima : panglima
+>panglima : unknown
 >amphibius : panglima.amphibius<T0, T1>
->gabriellae : gabriellae
+>gabriellae : unknown
 >klossii : gabriellae.klossii<T0, T1>
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >jugularis : Lanthanum.jugularis
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >jugularis : Lanthanum.jugularis
->imperfecta : imperfecta
+>imperfecta : unknown
 >subspinosus : imperfecta.subspinosus
 >() => { var y = this; } : () => void
 >y : wilsoni
@@ -3541,10 +3541,10 @@ module lavali {
 
     roberti() : julianae.acariensis { var x : julianae.acariensis; () => { var y = this; }; return x; }
 >roberti : () => julianae.acariensis
->julianae : julianae
+>julianae : unknown
 >acariensis : julianae.acariensis
 >x : julianae.acariensis
->julianae : julianae
+>julianae : unknown
 >acariensis : julianae.acariensis
 >() => { var y = this; } : () => void
 >y : wilsoni
@@ -3553,18 +3553,18 @@ 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 : chrysaeolus
+>chrysaeolus : unknown
 >sarasinorum : chrysaeolus.sarasinorum<T0, T1>
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >jugularis : Lanthanum.jugularis
->imperfecta : imperfecta
+>imperfecta : unknown
 >subspinosus : imperfecta.subspinosus
 >x : chrysaeolus.sarasinorum<Lanthanum.jugularis, imperfecta.subspinosus>
->chrysaeolus : chrysaeolus
+>chrysaeolus : unknown
 >sarasinorum : chrysaeolus.sarasinorum<T0, T1>
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >jugularis : Lanthanum.jugularis
->imperfecta : imperfecta
+>imperfecta : unknown
 >subspinosus : imperfecta.subspinosus
 >() => { var y = this; } : () => void
 >y : wilsoni
@@ -3573,10 +3573,10 @@ module lavali {
 
     amoenus() : quasiater.carolinensis { var x : quasiater.carolinensis; () => { var y = this; }; return x; }
 >amoenus : () => quasiater.carolinensis
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
 >x : quasiater.carolinensis
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
 >() => { var y = this; } : () => void
 >y : wilsoni
@@ -3585,15 +3585,15 @@ 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 : trivirgatus
+>trivirgatus : unknown
 >lotor : trivirgatus.lotor<T0, T1>
->argurus : argurus
+>argurus : unknown
 >oreas : argurus.oreas
 >beisa : beisa
 >x : trivirgatus.lotor<argurus.oreas, beisa>
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >lotor : trivirgatus.lotor<T0, T1>
->argurus : argurus
+>argurus : unknown
 >oreas : argurus.oreas
 >beisa : beisa
 >() => { var y = this; } : () => void
@@ -3603,18 +3603,18 @@ 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 : caurinus
+>caurinus : unknown
 >johorensis : caurinus.johorensis<T0, T1>
->caurinus : caurinus
+>caurinus : unknown
 >megaphyllus : caurinus.megaphyllus
->julianae : julianae
+>julianae : unknown
 >steerii : julianae.steerii
 >x : caurinus.johorensis<caurinus.megaphyllus, julianae.steerii>
->caurinus : caurinus
+>caurinus : unknown
 >johorensis : caurinus.johorensis<T0, T1>
->caurinus : caurinus
+>caurinus : unknown
 >megaphyllus : caurinus.megaphyllus
->julianae : julianae
+>julianae : unknown
 >steerii : julianae.steerii
 >() => { var y = this; } : () => void
 >y : wilsoni
@@ -3623,10 +3623,10 @@ module lavali {
 
     dorsata() : gabriellae.echinatus { var x : gabriellae.echinatus; () => { var y = this; }; return x; }
 >dorsata : () => gabriellae.echinatus
->gabriellae : gabriellae
+>gabriellae : unknown
 >echinatus : gabriellae.echinatus
 >x : gabriellae.echinatus
->gabriellae : gabriellae
+>gabriellae : unknown
 >echinatus : gabriellae.echinatus
 >() => { var y = this; } : () => void
 >y : wilsoni
@@ -3638,19 +3638,19 @@ module lavali {
   }
   export class otion extends howi.coludo<argurus.oreas, howi.marcanoi> {
 >otion : otion
->howi : howi
+>howi : unknown
 >coludo : howi.coludo<T0, T1>
->argurus : argurus
+>argurus : unknown
 >oreas : argurus.oreas
->howi : howi
+>howi : unknown
 >marcanoi : howi.marcanoi
 
     bonaerensis() : provocax.melanoleuca { var x : provocax.melanoleuca; () => { var y = this; }; return x; }
 >bonaerensis : () => provocax.melanoleuca
->provocax : provocax
+>provocax : unknown
 >melanoleuca : provocax.melanoleuca
 >x : provocax.melanoleuca
->provocax : provocax
+>provocax : unknown
 >melanoleuca : provocax.melanoleuca
 >() => { var y = this; } : () => void
 >y : otion
@@ -3659,18 +3659,18 @@ 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 : nigra
+>nigra : unknown
 >gracilis : nigra.gracilis<T0, T1>
->julianae : julianae
+>julianae : unknown
 >steerii : julianae.steerii
->dogramacii : dogramacii
+>dogramacii : unknown
 >kaiseri : dogramacii.kaiseri
 >x : nigra.gracilis<julianae.steerii, dogramacii.kaiseri>
->nigra : nigra
+>nigra : unknown
 >gracilis : nigra.gracilis<T0, T1>
->julianae : julianae
+>julianae : unknown
 >steerii : julianae.steerii
->dogramacii : dogramacii
+>dogramacii : unknown
 >kaiseri : dogramacii.kaiseri
 >() => { var y = this; } : () => void
 >y : otion
@@ -3679,18 +3679,18 @@ 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 : julianae
+>julianae : unknown
 >albidens : julianae.albidens<T0, T1>
->julianae : julianae
+>julianae : unknown
 >steerii : julianae.steerii
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
 >x : julianae.albidens<julianae.steerii, quasiater.carolinensis>
->julianae : julianae
+>julianae : unknown
 >albidens : julianae.albidens<T0, T1>
->julianae : julianae
+>julianae : unknown
 >steerii : julianae.steerii
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
 >() => { var y = this; } : () => void
 >y : otion
@@ -3699,10 +3699,10 @@ module lavali {
 
     grevyi() : samarensis.pallidus { var x : samarensis.pallidus; () => { var y = this; }; return x; }
 >grevyi : () => samarensis.pallidus
->samarensis : samarensis
+>samarensis : unknown
 >pallidus : samarensis.pallidus
 >x : samarensis.pallidus
->samarensis : samarensis
+>samarensis : unknown
 >pallidus : samarensis.pallidus
 >() => { var y = this; } : () => void
 >y : otion
@@ -3721,10 +3721,10 @@ module lavali {
 
     cristatus() : argurus.luctuosa { var x : argurus.luctuosa; () => { var y = this; }; return x; }
 >cristatus : () => argurus.luctuosa
->argurus : argurus
+>argurus : unknown
 >luctuosa : argurus.luctuosa
 >x : argurus.luctuosa
->argurus : argurus
+>argurus : unknown
 >luctuosa : argurus.luctuosa
 >() => { var y = this; } : () => void
 >y : otion
@@ -3733,16 +3733,16 @@ 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 : sagitta
+>sagitta : unknown
 >leptoceros : sagitta.leptoceros<T0, T1>
 >wilsoni : wilsoni
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >oconnelli : trivirgatus.oconnelli
 >x : sagitta.leptoceros<wilsoni, trivirgatus.oconnelli>
->sagitta : sagitta
+>sagitta : unknown
 >leptoceros : sagitta.leptoceros<T0, T1>
 >wilsoni : wilsoni
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >oconnelli : trivirgatus.oconnelli
 >() => { var y = this; } : () => void
 >y : otion
@@ -3751,32 +3751,32 @@ 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 : panamensis
+>panamensis : unknown
 >setulosus : panamensis.setulosus<T0, T1>
->samarensis : samarensis
+>samarensis : unknown
 >fuscus : samarensis.fuscus<T0, T1>
 >wilsoni : wilsoni
->chrysaeolus : chrysaeolus
+>chrysaeolus : unknown
 >sarasinorum : chrysaeolus.sarasinorum<T0, T1>
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >jugularis : Lanthanum.jugularis
->imperfecta : imperfecta
+>imperfecta : unknown
 >subspinosus : imperfecta.subspinosus
->lutreolus : lutreolus
+>lutreolus : unknown
 >foina : lutreolus.foina
 >x : panamensis.setulosus<samarensis.fuscus<wilsoni, chrysaeolus.sarasinorum<Lanthanum.jugularis, imperfecta.subspinosus>>, lutreolus.foina>
->panamensis : panamensis
+>panamensis : unknown
 >setulosus : panamensis.setulosus<T0, T1>
->samarensis : samarensis
+>samarensis : unknown
 >fuscus : samarensis.fuscus<T0, T1>
 >wilsoni : wilsoni
->chrysaeolus : chrysaeolus
+>chrysaeolus : unknown
 >sarasinorum : chrysaeolus.sarasinorum<T0, T1>
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >jugularis : Lanthanum.jugularis
->imperfecta : imperfecta
+>imperfecta : unknown
 >subspinosus : imperfecta.subspinosus
->lutreolus : lutreolus
+>lutreolus : unknown
 >foina : lutreolus.foina
 >() => { var y = this; } : () => void
 >y : otion
@@ -3785,10 +3785,10 @@ module lavali {
 
     umbrosus() : howi.marcanoi { var x : howi.marcanoi; () => { var y = this; }; return x; }
 >umbrosus : () => howi.marcanoi
->howi : howi
+>howi : unknown
 >marcanoi : howi.marcanoi
 >x : howi.marcanoi
->howi : howi
+>howi : unknown
 >marcanoi : howi.marcanoi
 >() => { var y = this; } : () => void
 >y : otion
@@ -3797,18 +3797,18 @@ 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 : imperfecta
+>imperfecta : unknown
 >lasiurus : imperfecta.lasiurus<T0, T1>
->caurinus : caurinus
+>caurinus : unknown
 >psilurus : caurinus.psilurus
->caurinus : caurinus
+>caurinus : unknown
 >psilurus : caurinus.psilurus
 >x : imperfecta.lasiurus<caurinus.psilurus, caurinus.psilurus>
->imperfecta : imperfecta
+>imperfecta : unknown
 >lasiurus : imperfecta.lasiurus<T0, T1>
->caurinus : caurinus
+>caurinus : unknown
 >psilurus : caurinus.psilurus
->caurinus : caurinus
+>caurinus : unknown
 >psilurus : caurinus.psilurus
 >() => { var y = this; } : () => void
 >y : otion
@@ -3817,10 +3817,10 @@ module lavali {
 
     orarius() : lutreolus.schlegeli { var x : lutreolus.schlegeli; () => { var y = this; }; return x; }
 >orarius : () => lutreolus.schlegeli
->lutreolus : lutreolus
+>lutreolus : unknown
 >schlegeli : lutreolus.schlegeli
 >x : lutreolus.schlegeli
->lutreolus : lutreolus
+>lutreolus : unknown
 >schlegeli : lutreolus.schlegeli
 >() => { var y = this; } : () => void
 >y : otion
@@ -3829,18 +3829,18 @@ 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 : caurinus
+>caurinus : unknown
 >mahaganus : caurinus.mahaganus<T0, T1>
->julianae : julianae
+>julianae : unknown
 >acariensis : julianae.acariensis
->julianae : julianae
+>julianae : unknown
 >sumatrana : julianae.sumatrana
 >x : caurinus.mahaganus<julianae.acariensis, julianae.sumatrana>
->caurinus : caurinus
+>caurinus : unknown
 >mahaganus : caurinus.mahaganus<T0, T1>
->julianae : julianae
+>julianae : unknown
 >acariensis : julianae.acariensis
->julianae : julianae
+>julianae : unknown
 >sumatrana : julianae.sumatrana
 >() => { var y = this; } : () => void
 >y : otion
@@ -3849,10 +3849,10 @@ module lavali {
 
     musschenbroekii() : trivirgatus.falconeri { var x : trivirgatus.falconeri; () => { var y = this; }; return x; }
 >musschenbroekii : () => trivirgatus.falconeri
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >falconeri : trivirgatus.falconeri
 >x : trivirgatus.falconeri
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >falconeri : trivirgatus.falconeri
 >() => { var y = this; } : () => void
 >y : otion
@@ -3864,18 +3864,18 @@ 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 : daubentonii
+>daubentonii : unknown
 >nigricans : daubentonii.nigricans<T0, T1>
->imperfecta : imperfecta
+>imperfecta : unknown
 >subspinosus : imperfecta.subspinosus
->samarensis : samarensis
+>samarensis : unknown
 >pallidus : samarensis.pallidus
 >x : daubentonii.nigricans<imperfecta.subspinosus, samarensis.pallidus>
->daubentonii : daubentonii
+>daubentonii : unknown
 >nigricans : daubentonii.nigricans<T0, T1>
->imperfecta : imperfecta
+>imperfecta : unknown
 >subspinosus : imperfecta.subspinosus
->samarensis : samarensis
+>samarensis : unknown
 >pallidus : samarensis.pallidus
 >() => { var y = this; } : () => void
 >y : xanthognathus
@@ -3884,18 +3884,18 @@ 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 : chrysaeolus
+>chrysaeolus : unknown
 >sarasinorum : chrysaeolus.sarasinorum<T0, T1>
->caurinus : caurinus
+>caurinus : unknown
 >psilurus : caurinus.psilurus
->quasiater : quasiater
+>quasiater : unknown
 >bobrinskoi : quasiater.bobrinskoi
 >x : chrysaeolus.sarasinorum<caurinus.psilurus, quasiater.bobrinskoi>
->chrysaeolus : chrysaeolus
+>chrysaeolus : unknown
 >sarasinorum : chrysaeolus.sarasinorum<T0, T1>
->caurinus : caurinus
+>caurinus : unknown
 >psilurus : caurinus.psilurus
->quasiater : quasiater
+>quasiater : unknown
 >bobrinskoi : quasiater.bobrinskoi
 >() => { var y = this; } : () => void
 >y : xanthognathus
@@ -3904,10 +3904,10 @@ module lavali {
 
     onca() : sagitta.stolzmanni { var x : sagitta.stolzmanni; () => { var y = this; }; return x; }
 >onca : () => sagitta.stolzmanni
->sagitta : sagitta
+>sagitta : unknown
 >stolzmanni : sagitta.stolzmanni
 >x : sagitta.stolzmanni
->sagitta : sagitta
+>sagitta : unknown
 >stolzmanni : sagitta.stolzmanni
 >() => { var y = this; } : () => void
 >y : xanthognathus
@@ -3916,32 +3916,32 @@ 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 : minutus
+>minutus : unknown
 >himalayana : minutus.himalayana<T0, T1>
->howi : howi
+>howi : unknown
 >coludo : howi.coludo<T0, T1>
 >lepturus : lepturus
->lutreolus : lutreolus
+>lutreolus : unknown
 >punicus : lutreolus.punicus
->nigra : nigra
+>nigra : unknown
 >thalia : nigra.thalia<T0, T1>
->patas : patas
+>patas : unknown
 >uralensis : patas.uralensis
->dogramacii : dogramacii
+>dogramacii : unknown
 >robustulus : dogramacii.robustulus
 >x : minutus.himalayana<howi.coludo<lepturus, lutreolus.punicus>, nigra.thalia<patas.uralensis, dogramacii.robustulus>>
->minutus : minutus
+>minutus : unknown
 >himalayana : minutus.himalayana<T0, T1>
->howi : howi
+>howi : unknown
 >coludo : howi.coludo<T0, T1>
 >lepturus : lepturus
->lutreolus : lutreolus
+>lutreolus : unknown
 >punicus : lutreolus.punicus
->nigra : nigra
+>nigra : unknown
 >thalia : nigra.thalia<T0, T1>
->patas : patas
+>patas : unknown
 >uralensis : patas.uralensis
->dogramacii : dogramacii
+>dogramacii : unknown
 >robustulus : dogramacii.robustulus
 >() => { var y = this; } : () => void
 >y : xanthognathus
@@ -3950,10 +3950,10 @@ module lavali {
 
     apeco() : lutreolus.foina { var x : lutreolus.foina; () => { var y = this; }; return x; }
 >apeco : () => lutreolus.foina
->lutreolus : lutreolus
+>lutreolus : unknown
 >foina : lutreolus.foina
 >x : lutreolus.foina
->lutreolus : lutreolus
+>lutreolus : unknown
 >foina : lutreolus.foina
 >() => { var y = this; } : () => void
 >y : xanthognathus
@@ -3962,16 +3962,16 @@ 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 : gabriellae
+>gabriellae : unknown
 >klossii : gabriellae.klossii<T0, T1>
 >wilsoni : wilsoni
->julianae : julianae
+>julianae : unknown
 >nudicaudus : julianae.nudicaudus
 >x : gabriellae.klossii<wilsoni, julianae.nudicaudus>
->gabriellae : gabriellae
+>gabriellae : unknown
 >klossii : gabriellae.klossii<T0, T1>
 >wilsoni : wilsoni
->julianae : julianae
+>julianae : unknown
 >nudicaudus : julianae.nudicaudus
 >() => { var y = this; } : () => void
 >y : xanthognathus
@@ -3980,10 +3980,10 @@ module lavali {
 
     goudotii() : trivirgatus.falconeri { var x : trivirgatus.falconeri; () => { var y = this; }; return x; }
 >goudotii : () => trivirgatus.falconeri
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >falconeri : trivirgatus.falconeri
 >x : trivirgatus.falconeri
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >falconeri : trivirgatus.falconeri
 >() => { var y = this; } : () => void
 >y : xanthognathus
@@ -3992,10 +3992,10 @@ module lavali {
 
     pohlei() : Lanthanum.megalonyx { var x : Lanthanum.megalonyx; () => { var y = this; }; return x; }
 >pohlei : () => Lanthanum.megalonyx
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >megalonyx : Lanthanum.megalonyx
 >x : Lanthanum.megalonyx
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >megalonyx : Lanthanum.megalonyx
 >() => { var y = this; } : () => void
 >y : xanthognathus
@@ -4004,12 +4004,12 @@ module lavali {
 
     ineptus() : panamensis.setulosus<xanthognathus, beisa> { var x : panamensis.setulosus<xanthognathus, beisa>; () => { var y = this; }; return x; }
 >ineptus : () => panamensis.setulosus<xanthognathus, beisa>
->panamensis : panamensis
+>panamensis : unknown
 >setulosus : panamensis.setulosus<T0, T1>
 >xanthognathus : xanthognathus
 >beisa : beisa
 >x : panamensis.setulosus<xanthognathus, beisa>
->panamensis : panamensis
+>panamensis : unknown
 >setulosus : panamensis.setulosus<T0, T1>
 >xanthognathus : xanthognathus
 >beisa : beisa
@@ -4020,26 +4020,26 @@ 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 : rendalli
+>rendalli : unknown
 >moojeni : rendalli.moojeni<T0, T1>
->julianae : julianae
+>julianae : unknown
 >steerii : julianae.steerii
->samarensis : samarensis
+>samarensis : unknown
 >pelurus : samarensis.pelurus<T0, T1>
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >jugularis : Lanthanum.jugularis
->ruatanica : ruatanica
+>ruatanica : unknown
 >americanus : ruatanica.americanus
 >x : rendalli.moojeni<julianae.steerii, samarensis.pelurus<Lanthanum.jugularis, ruatanica.americanus>>
->rendalli : rendalli
+>rendalli : unknown
 >moojeni : rendalli.moojeni<T0, T1>
->julianae : julianae
+>julianae : unknown
 >steerii : julianae.steerii
->samarensis : samarensis
+>samarensis : unknown
 >pelurus : samarensis.pelurus<T0, T1>
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >jugularis : Lanthanum.jugularis
->ruatanica : ruatanica
+>ruatanica : unknown
 >americanus : ruatanica.americanus
 >() => { var y = this; } : () => void
 >y : xanthognathus
@@ -4048,18 +4048,18 @@ 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 : Lanthanum
+>Lanthanum : unknown
 >suillus : Lanthanum.suillus<T0, T1>
->rionegrensis : rionegrensis
+>rionegrensis : unknown
 >caniventer : rionegrensis.caniventer
->imperfecta : imperfecta
+>imperfecta : unknown
 >subspinosus : imperfecta.subspinosus
 >x : Lanthanum.suillus<rionegrensis.caniventer, imperfecta.subspinosus>
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >suillus : Lanthanum.suillus<T0, T1>
->rionegrensis : rionegrensis
+>rionegrensis : unknown
 >caniventer : rionegrensis.caniventer
->imperfecta : imperfecta
+>imperfecta : unknown
 >subspinosus : imperfecta.subspinosus
 >() => { var y = this; } : () => void
 >y : xanthognathus
@@ -4068,42 +4068,42 @@ 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 : caurinus
+>caurinus : unknown
 >mahaganus : caurinus.mahaganus<T0, T1>
->dammermani : dammermani
+>dammermani : unknown
 >siberu : dammermani.siberu<T0, T1>
->nigra : nigra
+>nigra : unknown
 >thalia : nigra.thalia<T0, T1>
->lutreolus : lutreolus
+>lutreolus : unknown
 >schlegeli : lutreolus.schlegeli
->julianae : julianae
+>julianae : unknown
 >sumatrana : julianae.sumatrana
->panglima : panglima
+>panglima : unknown
 >abidi : panglima.abidi<T0, T1>
->lutreolus : lutreolus
+>lutreolus : unknown
 >foina : lutreolus.foina
->argurus : argurus
+>argurus : unknown
 >peninsulae : argurus.peninsulae
->lutreolus : lutreolus
+>lutreolus : unknown
 >punicus : lutreolus.punicus
 >x : caurinus.mahaganus<dammermani.siberu<nigra.thalia<lutreolus.schlegeli, julianae.sumatrana>, panglima.abidi<lutreolus.foina, argurus.peninsulae>>, lutreolus.punicus>
->caurinus : caurinus
+>caurinus : unknown
 >mahaganus : caurinus.mahaganus<T0, T1>
->dammermani : dammermani
+>dammermani : unknown
 >siberu : dammermani.siberu<T0, T1>
->nigra : nigra
+>nigra : unknown
 >thalia : nigra.thalia<T0, T1>
->lutreolus : lutreolus
+>lutreolus : unknown
 >schlegeli : lutreolus.schlegeli
->julianae : julianae
+>julianae : unknown
 >sumatrana : julianae.sumatrana
->panglima : panglima
+>panglima : unknown
 >abidi : panglima.abidi<T0, T1>
->lutreolus : lutreolus
+>lutreolus : unknown
 >foina : lutreolus.foina
->argurus : argurus
+>argurus : unknown
 >peninsulae : argurus.peninsulae
->lutreolus : lutreolus
+>lutreolus : unknown
 >punicus : lutreolus.punicus
 >() => { var y = this; } : () => void
 >y : xanthognathus
@@ -4112,15 +4112,15 @@ module lavali {
   }
   export class thaeleri extends argurus.oreas {
 >thaeleri : thaeleri
->argurus : argurus
+>argurus : unknown
 >oreas : argurus.oreas
 
     coromandra() : julianae.galapagoensis { var x : julianae.galapagoensis; () => { var y = this; }; return x; }
 >coromandra : () => julianae.galapagoensis
->julianae : julianae
+>julianae : unknown
 >galapagoensis : julianae.galapagoensis
 >x : julianae.galapagoensis
->julianae : julianae
+>julianae : unknown
 >galapagoensis : julianae.galapagoensis
 >() => { var y = this; } : () => void
 >y : thaeleri
@@ -4129,18 +4129,18 @@ 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 : nigra
+>nigra : unknown
 >dolichurus : nigra.dolichurus<T0, T1>
->argurus : argurus
+>argurus : unknown
 >germaini : argurus.germaini
->samarensis : samarensis
+>samarensis : unknown
 >pallidus : samarensis.pallidus
 >x : nigra.dolichurus<argurus.germaini, samarensis.pallidus>
->nigra : nigra
+>nigra : unknown
 >dolichurus : nigra.dolichurus<T0, T1>
->argurus : argurus
+>argurus : unknown
 >germaini : argurus.germaini
->samarensis : samarensis
+>samarensis : unknown
 >pallidus : samarensis.pallidus
 >() => { var y = this; } : () => void
 >y : thaeleri
@@ -4149,26 +4149,26 @@ 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 : rionegrensis
+>rionegrensis : unknown
 >veraecrucis : rionegrensis.veraecrucis<T0, T1>
->chrysaeolus : chrysaeolus
+>chrysaeolus : unknown
 >sarasinorum : chrysaeolus.sarasinorum<T0, T1>
->caurinus : caurinus
+>caurinus : unknown
 >psilurus : caurinus.psilurus
->quasiater : quasiater
+>quasiater : unknown
 >bobrinskoi : quasiater.bobrinskoi
->julianae : julianae
+>julianae : unknown
 >steerii : julianae.steerii
 >x : rionegrensis.veraecrucis<chrysaeolus.sarasinorum<caurinus.psilurus, quasiater.bobrinskoi>, julianae.steerii>
->rionegrensis : rionegrensis
+>rionegrensis : unknown
 >veraecrucis : rionegrensis.veraecrucis<T0, T1>
->chrysaeolus : chrysaeolus
+>chrysaeolus : unknown
 >sarasinorum : chrysaeolus.sarasinorum<T0, T1>
->caurinus : caurinus
+>caurinus : unknown
 >psilurus : caurinus.psilurus
->quasiater : quasiater
+>quasiater : unknown
 >bobrinskoi : quasiater.bobrinskoi
->julianae : julianae
+>julianae : unknown
 >steerii : julianae.steerii
 >() => { var y = this; } : () => void
 >y : thaeleri
@@ -4177,10 +4177,10 @@ module lavali {
 
     vates() : dogramacii.robustulus { var x : dogramacii.robustulus; () => { var y = this; }; return x; }
 >vates : () => dogramacii.robustulus
->dogramacii : dogramacii
+>dogramacii : unknown
 >robustulus : dogramacii.robustulus
 >x : dogramacii.robustulus
->dogramacii : dogramacii
+>dogramacii : unknown
 >robustulus : dogramacii.robustulus
 >() => { var y = this; } : () => void
 >y : thaeleri
@@ -4189,10 +4189,10 @@ module lavali {
 
     roosmalenorum() : dogramacii.koepckeae { var x : dogramacii.koepckeae; () => { var y = this; }; return x; }
 >roosmalenorum : () => dogramacii.koepckeae
->dogramacii : dogramacii
+>dogramacii : unknown
 >koepckeae : dogramacii.koepckeae
 >x : dogramacii.koepckeae
->dogramacii : dogramacii
+>dogramacii : unknown
 >koepckeae : dogramacii.koepckeae
 >() => { var y = this; } : () => void
 >y : thaeleri
@@ -4201,34 +4201,34 @@ 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 : rendalli
+>rendalli : unknown
 >moojeni : rendalli.moojeni<T0, T1>
->rionegrensis : rionegrensis
+>rionegrensis : unknown
 >caniventer : rionegrensis.caniventer
->rendalli : rendalli
+>rendalli : unknown
 >moojeni : rendalli.moojeni<T0, T1>
->panglima : panglima
+>panglima : unknown
 >amphibius : panglima.amphibius<T0, T1>
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >falconeri : trivirgatus.falconeri
->caurinus : caurinus
+>caurinus : unknown
 >psilurus : caurinus.psilurus
->gabriellae : gabriellae
+>gabriellae : unknown
 >echinatus : gabriellae.echinatus
 >x : rendalli.moojeni<rionegrensis.caniventer, rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>>
->rendalli : rendalli
+>rendalli : unknown
 >moojeni : rendalli.moojeni<T0, T1>
->rionegrensis : rionegrensis
+>rionegrensis : unknown
 >caniventer : rionegrensis.caniventer
->rendalli : rendalli
+>rendalli : unknown
 >moojeni : rendalli.moojeni<T0, T1>
->panglima : panglima
+>panglima : unknown
 >amphibius : panglima.amphibius<T0, T1>
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >falconeri : trivirgatus.falconeri
->caurinus : caurinus
+>caurinus : unknown
 >psilurus : caurinus.psilurus
->gabriellae : gabriellae
+>gabriellae : unknown
 >echinatus : gabriellae.echinatus
 >() => { var y = this; } : () => void
 >y : thaeleri
@@ -4237,10 +4237,10 @@ module lavali {
 
     ikonnikovi() : argurus.luctuosa { var x : argurus.luctuosa; () => { var y = this; }; return x; }
 >ikonnikovi : () => argurus.luctuosa
->argurus : argurus
+>argurus : unknown
 >luctuosa : argurus.luctuosa
 >x : argurus.luctuosa
->argurus : argurus
+>argurus : unknown
 >luctuosa : argurus.luctuosa
 >() => { var y = this; } : () => void
 >y : thaeleri
@@ -4249,24 +4249,24 @@ 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 : imperfecta
+>imperfecta : unknown
 >ciliolabrum : imperfecta.ciliolabrum<T0, T1>
 >otion : otion
->petrophilus : petrophilus
+>petrophilus : unknown
 >sodyi : petrophilus.sodyi<T0, T1>
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >konganensis : macrorhinos.konganensis
->caurinus : caurinus
+>caurinus : unknown
 >psilurus : caurinus.psilurus
 >x : imperfecta.ciliolabrum<otion, petrophilus.sodyi<macrorhinos.konganensis, caurinus.psilurus>>
->imperfecta : imperfecta
+>imperfecta : unknown
 >ciliolabrum : imperfecta.ciliolabrum<T0, T1>
 >otion : otion
->petrophilus : petrophilus
+>petrophilus : unknown
 >sodyi : petrophilus.sodyi<T0, T1>
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >konganensis : macrorhinos.konganensis
->caurinus : caurinus
+>caurinus : unknown
 >psilurus : caurinus.psilurus
 >() => { var y = this; } : () => void
 >y : thaeleri
@@ -4275,27 +4275,27 @@ module lavali {
   }
   export class lepturus extends Lanthanum.suillus<dammermani.melanops, quasiater.carolinensis> {
 >lepturus : lepturus
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >suillus : Lanthanum.suillus<T0, T1>
->dammermani : dammermani
+>dammermani : unknown
 >melanops : dammermani.melanops
->quasiater : quasiater
+>quasiater : unknown
 >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 : argurus
+>argurus : unknown
 >netscheri : argurus.netscheri<T0, T1>
->argurus : argurus
+>argurus : unknown
 >luctuosa : argurus.luctuosa
->julianae : julianae
+>julianae : unknown
 >nudicaudus : julianae.nudicaudus
 >x : argurus.netscheri<argurus.luctuosa, julianae.nudicaudus>
->argurus : argurus
+>argurus : unknown
 >netscheri : argurus.netscheri<T0, T1>
->argurus : argurus
+>argurus : unknown
 >luctuosa : argurus.luctuosa
->julianae : julianae
+>julianae : unknown
 >nudicaudus : julianae.nudicaudus
 >() => { var y = this; } : () => void
 >y : lepturus
@@ -4304,40 +4304,40 @@ 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 : sagitta
+>sagitta : unknown
 >cinereus : sagitta.cinereus<T0, T1>
->petrophilus : petrophilus
+>petrophilus : unknown
 >sodyi : petrophilus.sodyi<T0, T1>
->quasiater : quasiater
+>quasiater : unknown
 >wattsi : quasiater.wattsi<T0, T1>
->julianae : julianae
+>julianae : unknown
 >galapagoensis : julianae.galapagoensis
->panamensis : panamensis
+>panamensis : unknown
 >linulus : panamensis.linulus<T0, T1>
 >xanthognathus : xanthognathus
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >konganensis : macrorhinos.konganensis
->petrophilus : petrophilus
+>petrophilus : unknown
 >minutilla : petrophilus.minutilla
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >jugularis : Lanthanum.jugularis
 >x : sagitta.cinereus<petrophilus.sodyi<quasiater.wattsi<julianae.galapagoensis, panamensis.linulus<xanthognathus, macrorhinos.konganensis>>, petrophilus.minutilla>, Lanthanum.jugularis>
->sagitta : sagitta
+>sagitta : unknown
 >cinereus : sagitta.cinereus<T0, T1>
->petrophilus : petrophilus
+>petrophilus : unknown
 >sodyi : petrophilus.sodyi<T0, T1>
->quasiater : quasiater
+>quasiater : unknown
 >wattsi : quasiater.wattsi<T0, T1>
->julianae : julianae
+>julianae : unknown
 >galapagoensis : julianae.galapagoensis
->panamensis : panamensis
+>panamensis : unknown
 >linulus : panamensis.linulus<T0, T1>
 >xanthognathus : xanthognathus
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >konganensis : macrorhinos.konganensis
->petrophilus : petrophilus
+>petrophilus : unknown
 >minutilla : petrophilus.minutilla
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >jugularis : Lanthanum.jugularis
 >() => { var y = this; } : () => void
 >y : lepturus
@@ -4346,27 +4346,27 @@ module lavali {
   }
 }
 module dogramacii {
->dogramacii : dogramacii
+>dogramacii : typeof dogramacii
 
   export class robustulus extends lavali.wilsoni {
 >robustulus : robustulus
->lavali : lavali
+>lavali : unknown
 >wilsoni : lavali.wilsoni
 
     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 : minutus
+>minutus : unknown
 >inez : minutus.inez<T0, T1>
->argurus : argurus
+>argurus : unknown
 >peninsulae : argurus.peninsulae
->julianae : julianae
+>julianae : unknown
 >nudicaudus : julianae.nudicaudus
 >x : minutus.inez<argurus.peninsulae, julianae.nudicaudus>
->minutus : minutus
+>minutus : unknown
 >inez : minutus.inez<T0, T1>
->argurus : argurus
+>argurus : unknown
 >peninsulae : argurus.peninsulae
->julianae : julianae
+>julianae : unknown
 >nudicaudus : julianae.nudicaudus
 >() => { var y = this; } : () => void
 >y : robustulus
@@ -4375,18 +4375,18 @@ 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 : sagitta
+>sagitta : unknown
 >cinereus : sagitta.cinereus<T0, T1>
->lavali : lavali
+>lavali : unknown
 >xanthognathus : lavali.xanthognathus
->argurus : argurus
+>argurus : unknown
 >oreas : argurus.oreas
 >x : sagitta.cinereus<lavali.xanthognathus, argurus.oreas>
->sagitta : sagitta
+>sagitta : unknown
 >cinereus : sagitta.cinereus<T0, T1>
->lavali : lavali
+>lavali : unknown
 >xanthognathus : lavali.xanthognathus
->argurus : argurus
+>argurus : unknown
 >oreas : argurus.oreas
 >() => { var y = this; } : () => void
 >y : robustulus
@@ -4395,10 +4395,10 @@ module dogramacii {
 
     mexicana() : macrorhinos.konganensis { var x : macrorhinos.konganensis; () => { var y = this; }; return x; }
 >mexicana : () => macrorhinos.konganensis
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >konganensis : macrorhinos.konganensis
 >x : macrorhinos.konganensis
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >konganensis : macrorhinos.konganensis
 >() => { var y = this; } : () => void
 >y : robustulus
@@ -4407,18 +4407,18 @@ 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 : julianae
+>julianae : unknown
 >oralis : julianae.oralis<T0, T1>
->julianae : julianae
+>julianae : unknown
 >steerii : julianae.steerii
->lavali : lavali
+>lavali : unknown
 >lepturus : lavali.lepturus
 >x : julianae.oralis<julianae.steerii, lavali.lepturus>
->julianae : julianae
+>julianae : unknown
 >oralis : julianae.oralis<T0, T1>
->julianae : julianae
+>julianae : unknown
 >steerii : julianae.steerii
->lavali : lavali
+>lavali : unknown
 >lepturus : lavali.lepturus
 >() => { var y = this; } : () => void
 >y : robustulus
@@ -4427,10 +4427,10 @@ module dogramacii {
 
     beatus() : Lanthanum.jugularis { var x : Lanthanum.jugularis; () => { var y = this; }; return x; }
 >beatus : () => Lanthanum.jugularis
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >jugularis : Lanthanum.jugularis
 >x : Lanthanum.jugularis
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >jugularis : Lanthanum.jugularis
 >() => { var y = this; } : () => void
 >y : robustulus
@@ -4439,10 +4439,10 @@ module dogramacii {
 
     leporina() : trivirgatus.falconeri { var x : trivirgatus.falconeri; () => { var y = this; }; return x; }
 >leporina : () => trivirgatus.falconeri
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >falconeri : trivirgatus.falconeri
 >x : trivirgatus.falconeri
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >falconeri : trivirgatus.falconeri
 >() => { var y = this; } : () => void
 >y : robustulus
@@ -4451,10 +4451,10 @@ module dogramacii {
 
     pearsonii() : dammermani.melanops { var x : dammermani.melanops; () => { var y = this; }; return x; }
 >pearsonii : () => dammermani.melanops
->dammermani : dammermani
+>dammermani : unknown
 >melanops : dammermani.melanops
 >x : dammermani.melanops
->dammermani : dammermani
+>dammermani : unknown
 >melanops : dammermani.melanops
 >() => { var y = this; } : () => void
 >y : robustulus
@@ -4463,18 +4463,18 @@ 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 : howi
+>howi : unknown
 >angulatus : howi.angulatus<T0, T1>
->lavali : lavali
+>lavali : unknown
 >beisa : lavali.beisa
->rendalli : rendalli
+>rendalli : unknown
 >zuluensis : rendalli.zuluensis
 >x : howi.angulatus<lavali.beisa, rendalli.zuluensis>
->howi : howi
+>howi : unknown
 >angulatus : howi.angulatus<T0, T1>
->lavali : lavali
+>lavali : unknown
 >beisa : lavali.beisa
->rendalli : rendalli
+>rendalli : unknown
 >zuluensis : rendalli.zuluensis
 >() => { var y = this; } : () => void
 >y : robustulus
@@ -4483,18 +4483,18 @@ 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 : imperfecta
+>imperfecta : unknown
 >lasiurus : imperfecta.lasiurus<T0, T1>
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >konganensis : macrorhinos.konganensis
->julianae : julianae
+>julianae : unknown
 >steerii : julianae.steerii
 >x : imperfecta.lasiurus<macrorhinos.konganensis, julianae.steerii>
->imperfecta : imperfecta
+>imperfecta : unknown
 >lasiurus : imperfecta.lasiurus<T0, T1>
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >konganensis : macrorhinos.konganensis
->julianae : julianae
+>julianae : unknown
 >steerii : julianae.steerii
 >() => { var y = this; } : () => void
 >y : robustulus
@@ -4506,24 +4506,24 @@ 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 : samarensis
+>samarensis : unknown
 >pelurus : samarensis.pelurus<T0, T1>
->daubentonii : daubentonii
+>daubentonii : unknown
 >arboreus : daubentonii.arboreus<T0, T1>
 >kaiseri : kaiseri
->lutreolus : lutreolus
+>lutreolus : unknown
 >punicus : lutreolus.punicus
->julianae : julianae
+>julianae : unknown
 >sumatrana : julianae.sumatrana
 >x : samarensis.pelurus<daubentonii.arboreus<kaiseri, lutreolus.punicus>, julianae.sumatrana>
->samarensis : samarensis
+>samarensis : unknown
 >pelurus : samarensis.pelurus<T0, T1>
->daubentonii : daubentonii
+>daubentonii : unknown
 >arboreus : daubentonii.arboreus<T0, T1>
 >kaiseri : kaiseri
->lutreolus : lutreolus
+>lutreolus : unknown
 >punicus : lutreolus.punicus
->julianae : julianae
+>julianae : unknown
 >sumatrana : julianae.sumatrana
 >() => { var y = this; } : () => void
 >y : koepckeae
@@ -4535,10 +4535,10 @@ module dogramacii {
 
     bedfordiae() : quasiater.carolinensis { var x : quasiater.carolinensis; () => { var y = this; }; return x; }
 >bedfordiae : () => quasiater.carolinensis
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
 >x : quasiater.carolinensis
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
 >() => { var y = this; } : () => void
 >y : kaiseri
@@ -4547,10 +4547,10 @@ module dogramacii {
 
     paramorum() : Lanthanum.megalonyx { var x : Lanthanum.megalonyx; () => { var y = this; }; return x; }
 >paramorum : () => Lanthanum.megalonyx
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >megalonyx : Lanthanum.megalonyx
 >x : Lanthanum.megalonyx
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >megalonyx : Lanthanum.megalonyx
 >() => { var y = this; } : () => void
 >y : kaiseri
@@ -4559,18 +4559,18 @@ 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 : trivirgatus
+>trivirgatus : unknown
 >lotor : trivirgatus.lotor<T0, T1>
->julianae : julianae
+>julianae : unknown
 >steerii : julianae.steerii
->samarensis : samarensis
+>samarensis : unknown
 >pallidus : samarensis.pallidus
 >x : trivirgatus.lotor<julianae.steerii, samarensis.pallidus>
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >lotor : trivirgatus.lotor<T0, T1>
->julianae : julianae
+>julianae : unknown
 >steerii : julianae.steerii
->samarensis : samarensis
+>samarensis : unknown
 >pallidus : samarensis.pallidus
 >() => { var y = this; } : () => void
 >y : kaiseri
@@ -4579,10 +4579,10 @@ module dogramacii {
 
     juninensis() : quasiater.bobrinskoi { var x : quasiater.bobrinskoi; () => { var y = this; }; return x; }
 >juninensis : () => quasiater.bobrinskoi
->quasiater : quasiater
+>quasiater : unknown
 >bobrinskoi : quasiater.bobrinskoi
 >x : quasiater.bobrinskoi
->quasiater : quasiater
+>quasiater : unknown
 >bobrinskoi : quasiater.bobrinskoi
 >() => { var y = this; } : () => void
 >y : kaiseri
@@ -4591,34 +4591,34 @@ 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 : argurus
+>argurus : unknown
 >wetmorei : argurus.wetmorei<T0, T1>
->rionegrensis : rionegrensis
+>rionegrensis : unknown
 >caniventer : rionegrensis.caniventer
->sagitta : sagitta
+>sagitta : unknown
 >leptoceros : sagitta.leptoceros<T0, T1>
->lutreolus : lutreolus
+>lutreolus : unknown
 >punicus : lutreolus.punicus
->daubentonii : daubentonii
+>daubentonii : unknown
 >arboreus : daubentonii.arboreus<T0, T1>
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
->rionegrensis : rionegrensis
+>rionegrensis : unknown
 >caniventer : rionegrensis.caniventer
 >x : argurus.wetmorei<rionegrensis.caniventer, sagitta.leptoceros<lutreolus.punicus, daubentonii.arboreus<quasiater.carolinensis, rionegrensis.caniventer>>>
->argurus : argurus
+>argurus : unknown
 >wetmorei : argurus.wetmorei<T0, T1>
->rionegrensis : rionegrensis
+>rionegrensis : unknown
 >caniventer : rionegrensis.caniventer
->sagitta : sagitta
+>sagitta : unknown
 >leptoceros : sagitta.leptoceros<T0, T1>
->lutreolus : lutreolus
+>lutreolus : unknown
 >punicus : lutreolus.punicus
->daubentonii : daubentonii
+>daubentonii : unknown
 >arboreus : daubentonii.arboreus<T0, T1>
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
->rionegrensis : rionegrensis
+>rionegrensis : unknown
 >caniventer : rionegrensis.caniventer
 >() => { var y = this; } : () => void
 >y : kaiseri
@@ -4627,26 +4627,26 @@ 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 : ruatanica
+>ruatanica : unknown
 >Praseodymium : ruatanica.Praseodymium<T0, T1>
->julianae : julianae
+>julianae : unknown
 >sumatrana : julianae.sumatrana
->lutreolus : lutreolus
+>lutreolus : unknown
 >cor : lutreolus.cor<T0, T1>
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >jugularis : Lanthanum.jugularis
->julianae : julianae
+>julianae : unknown
 >galapagoensis : julianae.galapagoensis
 >x : ruatanica.Praseodymium<julianae.sumatrana, lutreolus.cor<Lanthanum.jugularis, julianae.galapagoensis>>
->ruatanica : ruatanica
+>ruatanica : unknown
 >Praseodymium : ruatanica.Praseodymium<T0, T1>
->julianae : julianae
+>julianae : unknown
 >sumatrana : julianae.sumatrana
->lutreolus : lutreolus
+>lutreolus : unknown
 >cor : lutreolus.cor<T0, T1>
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >jugularis : Lanthanum.jugularis
->julianae : julianae
+>julianae : unknown
 >galapagoensis : julianae.galapagoensis
 >() => { var y = this; } : () => void
 >y : kaiseri
@@ -4655,10 +4655,10 @@ module dogramacii {
 
     pinetorum() : rionegrensis.caniventer { var x : rionegrensis.caniventer; () => { var y = this; }; return x; }
 >pinetorum : () => rionegrensis.caniventer
->rionegrensis : rionegrensis
+>rionegrensis : unknown
 >caniventer : rionegrensis.caniventer
 >x : rionegrensis.caniventer
->rionegrensis : rionegrensis
+>rionegrensis : unknown
 >caniventer : rionegrensis.caniventer
 >() => { var y = this; } : () => void
 >y : kaiseri
@@ -4667,18 +4667,18 @@ 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 : samarensis
+>samarensis : unknown
 >pelurus : samarensis.pelurus<T0, T1>
->argurus : argurus
+>argurus : unknown
 >oreas : argurus.oreas
->argurus : argurus
+>argurus : unknown
 >luctuosa : argurus.luctuosa
 >x : samarensis.pelurus<argurus.oreas, argurus.luctuosa>
->samarensis : samarensis
+>samarensis : unknown
 >pelurus : samarensis.pelurus<T0, T1>
->argurus : argurus
+>argurus : unknown
 >oreas : argurus.oreas
->argurus : argurus
+>argurus : unknown
 >luctuosa : argurus.luctuosa
 >() => { var y = this; } : () => void
 >y : kaiseri
@@ -4687,10 +4687,10 @@ module dogramacii {
 
     poeyi() : gabriellae.echinatus { var x : gabriellae.echinatus; () => { var y = this; }; return x; }
 >poeyi : () => gabriellae.echinatus
->gabriellae : gabriellae
+>gabriellae : unknown
 >echinatus : gabriellae.echinatus
 >x : gabriellae.echinatus
->gabriellae : gabriellae
+>gabriellae : unknown
 >echinatus : gabriellae.echinatus
 >() => { var y = this; } : () => void
 >y : kaiseri
@@ -4699,10 +4699,10 @@ module dogramacii {
 
     Thulium() : julianae.durangae { var x : julianae.durangae; () => { var y = this; }; return x; }
 >Thulium : () => julianae.durangae
->julianae : julianae
+>julianae : unknown
 >durangae : julianae.durangae
 >x : julianae.durangae
->julianae : julianae
+>julianae : unknown
 >durangae : julianae.durangae
 >() => { var y = this; } : () => void
 >y : kaiseri
@@ -4711,10 +4711,10 @@ module dogramacii {
 
     patrius() : Lanthanum.jugularis { var x : Lanthanum.jugularis; () => { var y = this; }; return x; }
 >patrius : () => Lanthanum.jugularis
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >jugularis : Lanthanum.jugularis
 >x : Lanthanum.jugularis
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >jugularis : Lanthanum.jugularis
 >() => { var y = this; } : () => void
 >y : kaiseri
@@ -4723,10 +4723,10 @@ module dogramacii {
 
     quadraticauda() : julianae.nudicaudus { var x : julianae.nudicaudus; () => { var y = this; }; return x; }
 >quadraticauda : () => julianae.nudicaudus
->julianae : julianae
+>julianae : unknown
 >nudicaudus : julianae.nudicaudus
 >x : julianae.nudicaudus
->julianae : julianae
+>julianae : unknown
 >nudicaudus : julianae.nudicaudus
 >() => { var y = this; } : () => void
 >y : kaiseri
@@ -4735,10 +4735,10 @@ module dogramacii {
 
     ater() : ruatanica.americanus { var x : ruatanica.americanus; () => { var y = this; }; return x; }
 >ater : () => ruatanica.americanus
->ruatanica : ruatanica
+>ruatanica : unknown
 >americanus : ruatanica.americanus
 >x : ruatanica.americanus
->ruatanica : ruatanica
+>ruatanica : unknown
 >americanus : ruatanica.americanus
 >() => { var y = this; } : () => void
 >y : kaiseri
@@ -4750,32 +4750,32 @@ 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 : nigra
+>nigra : unknown
 >gracilis : nigra.gracilis<T0, T1>
->samarensis : samarensis
+>samarensis : unknown
 >pelurus : samarensis.pelurus<T0, T1>
->daubentonii : daubentonii
+>daubentonii : unknown
 >arboreus : daubentonii.arboreus<T0, T1>
 >kaiseri : kaiseri
->lutreolus : lutreolus
+>lutreolus : unknown
 >punicus : lutreolus.punicus
->julianae : julianae
+>julianae : unknown
 >sumatrana : julianae.sumatrana
->ruatanica : ruatanica
+>ruatanica : unknown
 >americanus : ruatanica.americanus
 >x : nigra.gracilis<samarensis.pelurus<daubentonii.arboreus<kaiseri, lutreolus.punicus>, julianae.sumatrana>, ruatanica.americanus>
->nigra : nigra
+>nigra : unknown
 >gracilis : nigra.gracilis<T0, T1>
->samarensis : samarensis
+>samarensis : unknown
 >pelurus : samarensis.pelurus<T0, T1>
->daubentonii : daubentonii
+>daubentonii : unknown
 >arboreus : daubentonii.arboreus<T0, T1>
 >kaiseri : kaiseri
->lutreolus : lutreolus
+>lutreolus : unknown
 >punicus : lutreolus.punicus
->julianae : julianae
+>julianae : unknown
 >sumatrana : julianae.sumatrana
->ruatanica : ruatanica
+>ruatanica : unknown
 >americanus : ruatanica.americanus
 >() => { var y = this; } : () => void
 >y : aurata
@@ -4784,10 +4784,10 @@ module dogramacii {
 
     howensis() : ruatanica.americanus { var x : ruatanica.americanus; () => { var y = this; }; return x; }
 >howensis : () => ruatanica.americanus
->ruatanica : ruatanica
+>ruatanica : unknown
 >americanus : ruatanica.americanus
 >x : ruatanica.americanus
->ruatanica : ruatanica
+>ruatanica : unknown
 >americanus : ruatanica.americanus
 >() => { var y = this; } : () => void
 >y : aurata
@@ -4796,10 +4796,10 @@ module dogramacii {
 
     karlkoopmani() : caurinus.psilurus { var x : caurinus.psilurus; () => { var y = this; }; return x; }
 >karlkoopmani : () => caurinus.psilurus
->caurinus : caurinus
+>caurinus : unknown
 >psilurus : caurinus.psilurus
 >x : caurinus.psilurus
->caurinus : caurinus
+>caurinus : unknown
 >psilurus : caurinus.psilurus
 >() => { var y = this; } : () => void
 >y : aurata
@@ -4808,18 +4808,18 @@ 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 : julianae
+>julianae : unknown
 >albidens : julianae.albidens<T0, T1>
->gabriellae : gabriellae
+>gabriellae : unknown
 >echinatus : gabriellae.echinatus
->gabriellae : gabriellae
+>gabriellae : unknown
 >echinatus : gabriellae.echinatus
 >x : julianae.albidens<gabriellae.echinatus, gabriellae.echinatus>
->julianae : julianae
+>julianae : unknown
 >albidens : julianae.albidens<T0, T1>
->gabriellae : gabriellae
+>gabriellae : unknown
 >echinatus : gabriellae.echinatus
->gabriellae : gabriellae
+>gabriellae : unknown
 >echinatus : gabriellae.echinatus
 >() => { var y = this; } : () => void
 >y : aurata
@@ -4838,18 +4838,18 @@ 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 : samarensis
+>samarensis : unknown
 >pelurus : samarensis.pelurus<T0, T1>
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >jugularis : Lanthanum.jugularis
->ruatanica : ruatanica
+>ruatanica : unknown
 >americanus : ruatanica.americanus
 >x : samarensis.pelurus<Lanthanum.jugularis, ruatanica.americanus>
->samarensis : samarensis
+>samarensis : unknown
 >pelurus : samarensis.pelurus<T0, T1>
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >jugularis : Lanthanum.jugularis
->ruatanica : ruatanica
+>ruatanica : unknown
 >americanus : ruatanica.americanus
 >() => { var y = this; } : () => void
 >y : aurata
@@ -4858,23 +4858,23 @@ 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 : trivirgatus
+>trivirgatus : unknown
 >lotor : trivirgatus.lotor<T0, T1>
->panglima : panglima
+>panglima : unknown
 >abidi : panglima.abidi<T0, T1>
->lavali : lavali
+>lavali : unknown
 >lepturus : lavali.lepturus
->caurinus : caurinus
+>caurinus : unknown
 >psilurus : caurinus.psilurus
 >koepckeae : koepckeae
 >x : trivirgatus.lotor<panglima.abidi<lavali.lepturus, caurinus.psilurus>, koepckeae>
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >lotor : trivirgatus.lotor<T0, T1>
->panglima : panglima
+>panglima : unknown
 >abidi : panglima.abidi<T0, T1>
->lavali : lavali
+>lavali : unknown
 >lepturus : lavali.lepturus
->caurinus : caurinus
+>caurinus : unknown
 >psilurus : caurinus.psilurus
 >koepckeae : koepckeae
 >() => { var y = this; } : () => void
@@ -4884,34 +4884,34 @@ 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 : caurinus
+>caurinus : unknown
 >johorensis : caurinus.johorensis<T0, T1>
->panglima : panglima
+>panglima : unknown
 >fundatus : panglima.fundatus<T0, T1>
->samarensis : samarensis
+>samarensis : unknown
 >pallidus : samarensis.pallidus
->sagitta : sagitta
+>sagitta : unknown
 >stolzmanni : sagitta.stolzmanni
->nigra : nigra
+>nigra : unknown
 >dolichurus : nigra.dolichurus<T0, T1>
->lavali : lavali
+>lavali : unknown
 >lepturus : lavali.lepturus
->samarensis : samarensis
+>samarensis : unknown
 >pallidus : samarensis.pallidus
 >x : caurinus.johorensis<panglima.fundatus<samarensis.pallidus, sagitta.stolzmanni>, nigra.dolichurus<lavali.lepturus, samarensis.pallidus>>
->caurinus : caurinus
+>caurinus : unknown
 >johorensis : caurinus.johorensis<T0, T1>
->panglima : panglima
+>panglima : unknown
 >fundatus : panglima.fundatus<T0, T1>
->samarensis : samarensis
+>samarensis : unknown
 >pallidus : samarensis.pallidus
->sagitta : sagitta
+>sagitta : unknown
 >stolzmanni : sagitta.stolzmanni
->nigra : nigra
+>nigra : unknown
 >dolichurus : nigra.dolichurus<T0, T1>
->lavali : lavali
+>lavali : unknown
 >lepturus : lavali.lepturus
->samarensis : samarensis
+>samarensis : unknown
 >pallidus : samarensis.pallidus
 >() => { var y = this; } : () => void
 >y : aurata
@@ -4920,19 +4920,19 @@ module dogramacii {
   }
 }
 module lutreolus {
->lutreolus : lutreolus
+>lutreolus : typeof lutreolus
 
   export class schlegeli extends lavali.beisa {
 >schlegeli : schlegeli
->lavali : lavali
+>lavali : unknown
 >beisa : lavali.beisa
 
     mittendorfi() : rionegrensis.caniventer { var x : rionegrensis.caniventer; () => { var y = this; }; return x; }
 >mittendorfi : () => rionegrensis.caniventer
->rionegrensis : rionegrensis
+>rionegrensis : unknown
 >caniventer : rionegrensis.caniventer
 >x : rionegrensis.caniventer
->rionegrensis : rionegrensis
+>rionegrensis : unknown
 >caniventer : rionegrensis.caniventer
 >() => { var y = this; } : () => void
 >y : schlegeli
@@ -4941,10 +4941,10 @@ module lutreolus {
 
     blicki() : dogramacii.robustulus { var x : dogramacii.robustulus; () => { var y = this; }; return x; }
 >blicki : () => dogramacii.robustulus
->dogramacii : dogramacii
+>dogramacii : unknown
 >robustulus : dogramacii.robustulus
 >x : dogramacii.robustulus
->dogramacii : dogramacii
+>dogramacii : unknown
 >robustulus : dogramacii.robustulus
 >() => { var y = this; } : () => void
 >y : schlegeli
@@ -4953,18 +4953,18 @@ 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 : argurus
+>argurus : unknown
 >dauricus : argurus.dauricus<T0, T1>
->ruatanica : ruatanica
+>ruatanica : unknown
 >americanus : ruatanica.americanus
->rionegrensis : rionegrensis
+>rionegrensis : unknown
 >caniventer : rionegrensis.caniventer
 >x : argurus.dauricus<ruatanica.americanus, rionegrensis.caniventer>
->argurus : argurus
+>argurus : unknown
 >dauricus : argurus.dauricus<T0, T1>
->ruatanica : ruatanica
+>ruatanica : unknown
 >americanus : ruatanica.americanus
->rionegrensis : rionegrensis
+>rionegrensis : unknown
 >caniventer : rionegrensis.caniventer
 >() => { var y = this; } : () => void
 >y : schlegeli
@@ -4973,18 +4973,18 @@ 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 : petrophilus
+>petrophilus : unknown
 >sodyi : petrophilus.sodyi<T0, T1>
->gabriellae : gabriellae
+>gabriellae : unknown
 >amicus : gabriellae.amicus
->julianae : julianae
+>julianae : unknown
 >sumatrana : julianae.sumatrana
 >x : petrophilus.sodyi<gabriellae.amicus, julianae.sumatrana>
->petrophilus : petrophilus
+>petrophilus : unknown
 >sodyi : petrophilus.sodyi<T0, T1>
->gabriellae : gabriellae
+>gabriellae : unknown
 >amicus : gabriellae.amicus
->julianae : julianae
+>julianae : unknown
 >sumatrana : julianae.sumatrana
 >() => { var y = this; } : () => void
 >y : schlegeli
@@ -4993,10 +4993,10 @@ module lutreolus {
 
     fernandoni() : quasiater.carolinensis { var x : quasiater.carolinensis; () => { var y = this; }; return x; }
 >fernandoni : () => quasiater.carolinensis
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
 >x : quasiater.carolinensis
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
 >() => { var y = this; } : () => void
 >y : schlegeli
@@ -5005,26 +5005,26 @@ 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 : sagitta
+>sagitta : unknown
 >leptoceros : sagitta.leptoceros<T0, T1>
->lutreolus : lutreolus
+>lutreolus : unknown
 >punicus : punicus
->daubentonii : daubentonii
+>daubentonii : unknown
 >arboreus : daubentonii.arboreus<T0, T1>
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
->rionegrensis : rionegrensis
+>rionegrensis : unknown
 >caniventer : rionegrensis.caniventer
 >x : sagitta.leptoceros<punicus, daubentonii.arboreus<quasiater.carolinensis, rionegrensis.caniventer>>
->sagitta : sagitta
+>sagitta : unknown
 >leptoceros : sagitta.leptoceros<T0, T1>
->lutreolus : lutreolus
+>lutreolus : unknown
 >punicus : punicus
->daubentonii : daubentonii
+>daubentonii : unknown
 >arboreus : daubentonii.arboreus<T0, T1>
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
->rionegrensis : rionegrensis
+>rionegrensis : unknown
 >caniventer : rionegrensis.caniventer
 >() => { var y = this; } : () => void
 >y : schlegeli
@@ -5033,26 +5033,26 @@ 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 : panamensis
+>panamensis : unknown
 >setulosus : panamensis.setulosus<T0, T1>
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
->daubentonii : daubentonii
+>daubentonii : unknown
 >arboreus : daubentonii.arboreus<T0, T1>
->dogramacii : dogramacii
+>dogramacii : unknown
 >kaiseri : dogramacii.kaiseri
->lutreolus : lutreolus
+>lutreolus : unknown
 >punicus : punicus
 >x : panamensis.setulosus<quasiater.carolinensis, daubentonii.arboreus<dogramacii.kaiseri, punicus>>
->panamensis : panamensis
+>panamensis : unknown
 >setulosus : panamensis.setulosus<T0, T1>
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
->daubentonii : daubentonii
+>daubentonii : unknown
 >arboreus : daubentonii.arboreus<T0, T1>
->dogramacii : dogramacii
+>dogramacii : unknown
 >kaiseri : dogramacii.kaiseri
->lutreolus : lutreolus
+>lutreolus : unknown
 >punicus : punicus
 >() => { var y = this; } : () => void
 >y : schlegeli
@@ -5061,18 +5061,18 @@ 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 : Lanthanum
+>Lanthanum : unknown
 >nitidus : Lanthanum.nitidus<T0, T1>
->howi : howi
+>howi : unknown
 >marcanoi : howi.marcanoi
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >daphaenodon : macrorhinos.daphaenodon
 >x : Lanthanum.nitidus<howi.marcanoi, macrorhinos.daphaenodon>
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >nitidus : Lanthanum.nitidus<T0, T1>
->howi : howi
+>howi : unknown
 >marcanoi : howi.marcanoi
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >daphaenodon : macrorhinos.daphaenodon
 >() => { var y = this; } : () => void
 >y : schlegeli
@@ -5081,18 +5081,18 @@ 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 : daubentonii
+>daubentonii : unknown
 >nesiotes : daubentonii.nesiotes<T0, T1>
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >konganensis : macrorhinos.konganensis
->lutreolus : lutreolus
+>lutreolus : unknown
 >punicus : punicus
 >x : daubentonii.nesiotes<macrorhinos.konganensis, punicus>
->daubentonii : daubentonii
+>daubentonii : unknown
 >nesiotes : daubentonii.nesiotes<T0, T1>
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >konganensis : macrorhinos.konganensis
->lutreolus : lutreolus
+>lutreolus : unknown
 >punicus : punicus
 >() => { var y = this; } : () => void
 >y : schlegeli
@@ -5101,34 +5101,34 @@ 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 : macrorhinos
+>macrorhinos : unknown
 >marmosurus : macrorhinos.marmosurus<T0, T1>
->ruatanica : ruatanica
+>ruatanica : unknown
 >hector : ruatanica.hector<T0, T1>
->julianae : julianae
+>julianae : unknown
 >sumatrana : julianae.sumatrana
->samarensis : samarensis
+>samarensis : unknown
 >pelurus : samarensis.pelurus<T0, T1>
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >jugularis : Lanthanum.jugularis
->sagitta : sagitta
+>sagitta : unknown
 >walkeri : sagitta.walkeri
->samarensis : samarensis
+>samarensis : unknown
 >pallidus : samarensis.pallidus
 >x : macrorhinos.marmosurus<ruatanica.hector<julianae.sumatrana, samarensis.pelurus<Lanthanum.jugularis, sagitta.walkeri>>, samarensis.pallidus>
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >marmosurus : macrorhinos.marmosurus<T0, T1>
->ruatanica : ruatanica
+>ruatanica : unknown
 >hector : ruatanica.hector<T0, T1>
->julianae : julianae
+>julianae : unknown
 >sumatrana : julianae.sumatrana
->samarensis : samarensis
+>samarensis : unknown
 >pelurus : samarensis.pelurus<T0, T1>
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >jugularis : Lanthanum.jugularis
->sagitta : sagitta
+>sagitta : unknown
 >walkeri : sagitta.walkeri
->samarensis : samarensis
+>samarensis : unknown
 >pallidus : samarensis.pallidus
 >() => { var y = this; } : () => void
 >y : schlegeli
@@ -5137,10 +5137,10 @@ module lutreolus {
 
     cuniculus() : patas.uralensis { var x : patas.uralensis; () => { var y = this; }; return x; }
 >cuniculus : () => patas.uralensis
->patas : patas
+>patas : unknown
 >uralensis : patas.uralensis
 >x : patas.uralensis
->patas : patas
+>patas : unknown
 >uralensis : patas.uralensis
 >() => { var y = this; } : () => void
 >y : schlegeli
@@ -5149,26 +5149,26 @@ 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 : julianae
+>julianae : unknown
 >gerbillus : julianae.gerbillus<T0, T1>
->rionegrensis : rionegrensis
+>rionegrensis : unknown
 >caniventer : rionegrensis.caniventer
->rendalli : rendalli
+>rendalli : unknown
 >crenulata : rendalli.crenulata<T0, T1>
->rendalli : rendalli
+>rendalli : unknown
 >zuluensis : rendalli.zuluensis
->dogramacii : dogramacii
+>dogramacii : unknown
 >robustulus : dogramacii.robustulus
 >x : julianae.gerbillus<rionegrensis.caniventer, rendalli.crenulata<rendalli.zuluensis, dogramacii.robustulus>>
->julianae : julianae
+>julianae : unknown
 >gerbillus : julianae.gerbillus<T0, T1>
->rionegrensis : rionegrensis
+>rionegrensis : unknown
 >caniventer : rionegrensis.caniventer
->rendalli : rendalli
+>rendalli : unknown
 >crenulata : rendalli.crenulata<T0, T1>
->rendalli : rendalli
+>rendalli : unknown
 >zuluensis : rendalli.zuluensis
->dogramacii : dogramacii
+>dogramacii : unknown
 >robustulus : dogramacii.robustulus
 >() => { var y = this; } : () => void
 >y : schlegeli
@@ -5177,18 +5177,18 @@ 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 : julianae
+>julianae : unknown
 >oralis : julianae.oralis<T0, T1>
->ruatanica : ruatanica
+>ruatanica : unknown
 >americanus : ruatanica.americanus
->rendalli : rendalli
+>rendalli : unknown
 >zuluensis : rendalli.zuluensis
 >x : julianae.oralis<ruatanica.americanus, rendalli.zuluensis>
->julianae : julianae
+>julianae : unknown
 >oralis : julianae.oralis<T0, T1>
->ruatanica : ruatanica
+>ruatanica : unknown
 >americanus : ruatanica.americanus
->rendalli : rendalli
+>rendalli : unknown
 >zuluensis : rendalli.zuluensis
 >() => { var y = this; } : () => void
 >y : schlegeli
@@ -5197,18 +5197,18 @@ 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 : panamensis
+>panamensis : unknown
 >linulus : panamensis.linulus<T0, T1>
->dogramacii : dogramacii
+>dogramacii : unknown
 >kaiseri : dogramacii.kaiseri
->minutus : minutus
+>minutus : unknown
 >portoricensis : minutus.portoricensis
 >x : panamensis.linulus<dogramacii.kaiseri, minutus.portoricensis>
->panamensis : panamensis
+>panamensis : unknown
 >linulus : panamensis.linulus<T0, T1>
->dogramacii : dogramacii
+>dogramacii : unknown
 >kaiseri : dogramacii.kaiseri
->minutus : minutus
+>minutus : unknown
 >portoricensis : minutus.portoricensis
 >() => { var y = this; } : () => void
 >y : schlegeli
@@ -5217,7 +5217,7 @@ module lutreolus {
   }
 }
 module argurus {
->argurus : argurus
+>argurus : typeof argurus
 
   export class dauricus<T0, T1> {
 >dauricus : dauricus<T0, T1>
@@ -5226,10 +5226,10 @@ module argurus {
 
     chinensis() : Lanthanum.jugularis { var x : Lanthanum.jugularis; () => { var y = this; }; return x; }
 >chinensis : () => Lanthanum.jugularis
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >jugularis : Lanthanum.jugularis
 >x : Lanthanum.jugularis
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >jugularis : Lanthanum.jugularis
 >() => { var y = this; } : () => void
 >y : dauricus<T0, T1>
@@ -5238,10 +5238,10 @@ module argurus {
 
     duodecimcostatus() : lavali.xanthognathus { var x : lavali.xanthognathus; () => { var y = this; }; return x; }
 >duodecimcostatus : () => lavali.xanthognathus
->lavali : lavali
+>lavali : unknown
 >xanthognathus : lavali.xanthognathus
 >x : lavali.xanthognathus
->lavali : lavali
+>lavali : unknown
 >xanthognathus : lavali.xanthognathus
 >() => { var y = this; } : () => void
 >y : dauricus<T0, T1>
@@ -5250,18 +5250,18 @@ 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 : daubentonii
+>daubentonii : unknown
 >nesiotes : daubentonii.nesiotes<T0, T1>
->lavali : lavali
+>lavali : unknown
 >beisa : lavali.beisa
->lavali : lavali
+>lavali : unknown
 >lepturus : lavali.lepturus
 >x : daubentonii.nesiotes<lavali.beisa, lavali.lepturus>
->daubentonii : daubentonii
+>daubentonii : unknown
 >nesiotes : daubentonii.nesiotes<T0, T1>
->lavali : lavali
+>lavali : unknown
 >beisa : lavali.beisa
->lavali : lavali
+>lavali : unknown
 >lepturus : lavali.lepturus
 >() => { var y = this; } : () => void
 >y : dauricus<T0, T1>
@@ -5270,34 +5270,34 @@ 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 : petrophilus
+>petrophilus : unknown
 >sodyi : petrophilus.sodyi<T0, T1>
->quasiater : quasiater
+>quasiater : unknown
 >wattsi : quasiater.wattsi<T0, T1>
->julianae : julianae
+>julianae : unknown
 >galapagoensis : julianae.galapagoensis
->panamensis : panamensis
+>panamensis : unknown
 >linulus : panamensis.linulus<T0, T1>
->lavali : lavali
+>lavali : unknown
 >xanthognathus : lavali.xanthognathus
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >konganensis : macrorhinos.konganensis
->petrophilus : petrophilus
+>petrophilus : unknown
 >minutilla : petrophilus.minutilla
 >x : petrophilus.sodyi<quasiater.wattsi<julianae.galapagoensis, panamensis.linulus<lavali.xanthognathus, macrorhinos.konganensis>>, petrophilus.minutilla>
->petrophilus : petrophilus
+>petrophilus : unknown
 >sodyi : petrophilus.sodyi<T0, T1>
->quasiater : quasiater
+>quasiater : unknown
 >wattsi : quasiater.wattsi<T0, T1>
->julianae : julianae
+>julianae : unknown
 >galapagoensis : julianae.galapagoensis
->panamensis : panamensis
+>panamensis : unknown
 >linulus : panamensis.linulus<T0, T1>
->lavali : lavali
+>lavali : unknown
 >xanthognathus : lavali.xanthognathus
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >konganensis : macrorhinos.konganensis
->petrophilus : petrophilus
+>petrophilus : unknown
 >minutilla : petrophilus.minutilla
 >() => { var y = this; } : () => void
 >y : dauricus<T0, T1>
@@ -5306,10 +5306,10 @@ module argurus {
 
     darienensis() : trivirgatus.oconnelli { var x : trivirgatus.oconnelli; () => { var y = this; }; return x; }
 >darienensis : () => trivirgatus.oconnelli
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >oconnelli : trivirgatus.oconnelli
 >x : trivirgatus.oconnelli
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >oconnelli : trivirgatus.oconnelli
 >() => { var y = this; } : () => void
 >y : dauricus<T0, T1>
@@ -5318,10 +5318,10 @@ module argurus {
 
     hardwickii() : macrorhinos.daphaenodon { var x : macrorhinos.daphaenodon; () => { var y = this; }; return x; }
 >hardwickii : () => macrorhinos.daphaenodon
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >daphaenodon : macrorhinos.daphaenodon
 >x : macrorhinos.daphaenodon
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >daphaenodon : macrorhinos.daphaenodon
 >() => { var y = this; } : () => void
 >y : dauricus<T0, T1>
@@ -5330,18 +5330,18 @@ 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 : rionegrensis
+>rionegrensis : unknown
 >veraecrucis : rionegrensis.veraecrucis<T0, T1>
->lavali : lavali
+>lavali : unknown
 >lepturus : lavali.lepturus
->julianae : julianae
+>julianae : unknown
 >durangae : julianae.durangae
 >x : rionegrensis.veraecrucis<lavali.lepturus, julianae.durangae>
->rionegrensis : rionegrensis
+>rionegrensis : unknown
 >veraecrucis : rionegrensis.veraecrucis<T0, T1>
->lavali : lavali
+>lavali : unknown
 >lepturus : lavali.lepturus
->julianae : julianae
+>julianae : unknown
 >durangae : julianae.durangae
 >() => { var y = this; } : () => void
 >y : dauricus<T0, T1>
@@ -5350,34 +5350,34 @@ 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 : caurinus
+>caurinus : unknown
 >johorensis : caurinus.johorensis<T0, T1>
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >konganensis : macrorhinos.konganensis
->caurinus : caurinus
+>caurinus : unknown
 >johorensis : caurinus.johorensis<T0, T1>
->argurus : argurus
+>argurus : unknown
 >peninsulae : peninsulae
->daubentonii : daubentonii
+>daubentonii : unknown
 >arboreus : daubentonii.arboreus<T0, T1>
->argurus : argurus
+>argurus : unknown
 >germaini : germaini
->sagitta : sagitta
+>sagitta : unknown
 >stolzmanni : sagitta.stolzmanni
 >x : caurinus.johorensis<macrorhinos.konganensis, caurinus.johorensis<peninsulae, daubentonii.arboreus<germaini, sagitta.stolzmanni>>>
->caurinus : caurinus
+>caurinus : unknown
 >johorensis : caurinus.johorensis<T0, T1>
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >konganensis : macrorhinos.konganensis
->caurinus : caurinus
+>caurinus : unknown
 >johorensis : caurinus.johorensis<T0, T1>
->argurus : argurus
+>argurus : unknown
 >peninsulae : peninsulae
->daubentonii : daubentonii
+>daubentonii : unknown
 >arboreus : daubentonii.arboreus<T0, T1>
->argurus : argurus
+>argurus : unknown
 >germaini : germaini
->sagitta : sagitta
+>sagitta : unknown
 >stolzmanni : sagitta.stolzmanni
 >() => { var y = this; } : () => void
 >y : dauricus<T0, T1>
@@ -5386,18 +5386,18 @@ 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 : rendalli
+>rendalli : unknown
 >moojeni : rendalli.moojeni<T0, T1>
->lutreolus : lutreolus
+>lutreolus : unknown
 >foina : lutreolus.foina
->argurus : argurus
+>argurus : unknown
 >oreas : oreas
 >x : rendalli.moojeni<lutreolus.foina, oreas>
->rendalli : rendalli
+>rendalli : unknown
 >moojeni : rendalli.moojeni<T0, T1>
->lutreolus : lutreolus
+>lutreolus : unknown
 >foina : lutreolus.foina
->argurus : argurus
+>argurus : unknown
 >oreas : oreas
 >() => { var y = this; } : () => void
 >y : dauricus<T0, T1>
@@ -5406,18 +5406,18 @@ 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 : imperfecta
+>imperfecta : unknown
 >ciliolabrum : imperfecta.ciliolabrum<T0, T1>
->argurus : argurus
+>argurus : unknown
 >germaini : germaini
->lutreolus : lutreolus
+>lutreolus : unknown
 >foina : lutreolus.foina
 >x : imperfecta.ciliolabrum<germaini, lutreolus.foina>
->imperfecta : imperfecta
+>imperfecta : unknown
 >ciliolabrum : imperfecta.ciliolabrum<T0, T1>
->argurus : argurus
+>argurus : unknown
 >germaini : germaini
->lutreolus : lutreolus
+>lutreolus : unknown
 >foina : lutreolus.foina
 >() => { var y = this; } : () => void
 >y : dauricus<T0, T1>
@@ -5426,26 +5426,26 @@ 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 : macrorhinos
+>macrorhinos : unknown
 >marmosurus : macrorhinos.marmosurus<T0, T1>
->daubentonii : daubentonii
+>daubentonii : unknown
 >arboreus : daubentonii.arboreus<T0, T1>
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
->rionegrensis : rionegrensis
+>rionegrensis : unknown
 >caniventer : rionegrensis.caniventer
->gabriellae : gabriellae
+>gabriellae : unknown
 >echinatus : gabriellae.echinatus
 >x : macrorhinos.marmosurus<daubentonii.arboreus<quasiater.carolinensis, rionegrensis.caniventer>, gabriellae.echinatus>
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >marmosurus : macrorhinos.marmosurus<T0, T1>
->daubentonii : daubentonii
+>daubentonii : unknown
 >arboreus : daubentonii.arboreus<T0, T1>
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
->rionegrensis : rionegrensis
+>rionegrensis : unknown
 >caniventer : rionegrensis.caniventer
->gabriellae : gabriellae
+>gabriellae : unknown
 >echinatus : gabriellae.echinatus
 >() => { var y = this; } : () => void
 >y : dauricus<T0, T1>
@@ -5454,7 +5454,7 @@ module argurus {
   }
 }
 module nigra {
->nigra : nigra
+>nigra : typeof nigra
 
   export class dolichurus<T0, T1> {
 >dolichurus : dolichurus<T0, T1>
@@ -5463,58 +5463,58 @@ module nigra {
 
     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 : panglima
+>panglima : unknown
 >abidi : panglima.abidi<T0, T1>
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
->rendalli : rendalli
+>rendalli : unknown
 >crenulata : rendalli.crenulata<T0, T1>
->gabriellae : gabriellae
+>gabriellae : unknown
 >klossii : gabriellae.klossii<T0, T1>
->julianae : julianae
+>julianae : unknown
 >nudicaudus : julianae.nudicaudus
->dogramacii : dogramacii
+>dogramacii : unknown
 >aurata : dogramacii.aurata
->argurus : argurus
+>argurus : unknown
 >netscheri : argurus.netscheri<T0, T1>
->minutus : minutus
+>minutus : unknown
 >inez : minutus.inez<T0, T1>
->argurus : argurus
+>argurus : unknown
 >peninsulae : argurus.peninsulae
->julianae : julianae
+>julianae : unknown
 >nudicaudus : julianae.nudicaudus
->julianae : julianae
+>julianae : unknown
 >oralis : julianae.oralis<T0, T1>
->lavali : lavali
+>lavali : unknown
 >xanthognathus : lavali.xanthognathus
->argurus : argurus
+>argurus : unknown
 >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 : panglima
+>panglima : unknown
 >abidi : panglima.abidi<T0, T1>
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
->rendalli : rendalli
+>rendalli : unknown
 >crenulata : rendalli.crenulata<T0, T1>
->gabriellae : gabriellae
+>gabriellae : unknown
 >klossii : gabriellae.klossii<T0, T1>
->julianae : julianae
+>julianae : unknown
 >nudicaudus : julianae.nudicaudus
->dogramacii : dogramacii
+>dogramacii : unknown
 >aurata : dogramacii.aurata
->argurus : argurus
+>argurus : unknown
 >netscheri : argurus.netscheri<T0, T1>
->minutus : minutus
+>minutus : unknown
 >inez : minutus.inez<T0, T1>
->argurus : argurus
+>argurus : unknown
 >peninsulae : argurus.peninsulae
->julianae : julianae
+>julianae : unknown
 >nudicaudus : julianae.nudicaudus
->julianae : julianae
+>julianae : unknown
 >oralis : julianae.oralis<T0, T1>
->lavali : lavali
+>lavali : unknown
 >xanthognathus : lavali.xanthognathus
->argurus : argurus
+>argurus : unknown
 >oreas : argurus.oreas
 >() => { var y = this; } : () => void
 >y : dolichurus<T0, T1>
@@ -5523,10 +5523,10 @@ module nigra {
 
     alfredi() : caurinus.psilurus { var x : caurinus.psilurus; () => { var y = this; }; return x; }
 >alfredi : () => caurinus.psilurus
->caurinus : caurinus
+>caurinus : unknown
 >psilurus : caurinus.psilurus
 >x : caurinus.psilurus
->caurinus : caurinus
+>caurinus : unknown
 >psilurus : caurinus.psilurus
 >() => { var y = this; } : () => void
 >y : dolichurus<T0, T1>
@@ -5535,50 +5535,50 @@ 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 : ruatanica
+>ruatanica : unknown
 >hector : ruatanica.hector<T0, T1>
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >oconnelli : trivirgatus.oconnelli
->sagitta : sagitta
+>sagitta : unknown
 >cinereus : sagitta.cinereus<T0, T1>
->nigra : nigra
+>nigra : unknown
 >caucasica : caucasica<T0, T1>
->julianae : julianae
+>julianae : unknown
 >sumatrana : julianae.sumatrana
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >oconnelli : trivirgatus.oconnelli
->quasiater : quasiater
+>quasiater : unknown
 >wattsi : quasiater.wattsi<T0, T1>
->julianae : julianae
+>julianae : unknown
 >galapagoensis : julianae.galapagoensis
->panamensis : panamensis
+>panamensis : unknown
 >linulus : panamensis.linulus<T0, T1>
->lavali : lavali
+>lavali : unknown
 >xanthognathus : lavali.xanthognathus
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >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 : ruatanica
+>ruatanica : unknown
 >hector : ruatanica.hector<T0, T1>
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >oconnelli : trivirgatus.oconnelli
->sagitta : sagitta
+>sagitta : unknown
 >cinereus : sagitta.cinereus<T0, T1>
->nigra : nigra
+>nigra : unknown
 >caucasica : caucasica<T0, T1>
->julianae : julianae
+>julianae : unknown
 >sumatrana : julianae.sumatrana
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >oconnelli : trivirgatus.oconnelli
->quasiater : quasiater
+>quasiater : unknown
 >wattsi : quasiater.wattsi<T0, T1>
->julianae : julianae
+>julianae : unknown
 >galapagoensis : julianae.galapagoensis
->panamensis : panamensis
+>panamensis : unknown
 >linulus : panamensis.linulus<T0, T1>
->lavali : lavali
+>lavali : unknown
 >xanthognathus : lavali.xanthognathus
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >konganensis : macrorhinos.konganensis
 >() => { var y = this; } : () => void
 >y : dolichurus<T0, T1>
@@ -5587,18 +5587,18 @@ 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 : Lanthanum
+>Lanthanum : unknown
 >nitidus : Lanthanum.nitidus<T0, T1>
->dammermani : dammermani
+>dammermani : unknown
 >melanops : dammermani.melanops
->lavali : lavali
+>lavali : unknown
 >lepturus : lavali.lepturus
 >x : Lanthanum.nitidus<dammermani.melanops, lavali.lepturus>
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >nitidus : Lanthanum.nitidus<T0, T1>
->dammermani : dammermani
+>dammermani : unknown
 >melanops : dammermani.melanops
->lavali : lavali
+>lavali : unknown
 >lepturus : lavali.lepturus
 >() => { var y = this; } : () => void
 >y : dolichurus<T0, T1>
@@ -5607,10 +5607,10 @@ module nigra {
 
     dimissus() : imperfecta.subspinosus { var x : imperfecta.subspinosus; () => { var y = this; }; return x; }
 >dimissus : () => imperfecta.subspinosus
->imperfecta : imperfecta
+>imperfecta : unknown
 >subspinosus : imperfecta.subspinosus
 >x : imperfecta.subspinosus
->imperfecta : imperfecta
+>imperfecta : unknown
 >subspinosus : imperfecta.subspinosus
 >() => { var y = this; } : () => void
 >y : dolichurus<T0, T1>
@@ -5619,10 +5619,10 @@ module nigra {
 
     phaeotis() : julianae.sumatrana { var x : julianae.sumatrana; () => { var y = this; }; return x; }
 >phaeotis : () => julianae.sumatrana
->julianae : julianae
+>julianae : unknown
 >sumatrana : julianae.sumatrana
 >x : julianae.sumatrana
->julianae : julianae
+>julianae : unknown
 >sumatrana : julianae.sumatrana
 >() => { var y = this; } : () => void
 >y : dolichurus<T0, T1>
@@ -5631,10 +5631,10 @@ module nigra {
 
     ustus() : julianae.acariensis { var x : julianae.acariensis; () => { var y = this; }; return x; }
 >ustus : () => julianae.acariensis
->julianae : julianae
+>julianae : unknown
 >acariensis : julianae.acariensis
 >x : julianae.acariensis
->julianae : julianae
+>julianae : unknown
 >acariensis : julianae.acariensis
 >() => { var y = this; } : () => void
 >y : dolichurus<T0, T1>
@@ -5643,10 +5643,10 @@ module nigra {
 
     sagei() : howi.marcanoi { var x : howi.marcanoi; () => { var y = this; }; return x; }
 >sagei : () => howi.marcanoi
->howi : howi
+>howi : unknown
 >marcanoi : howi.marcanoi
 >x : howi.marcanoi
->howi : howi
+>howi : unknown
 >marcanoi : howi.marcanoi
 >() => { var y = this; } : () => void
 >y : dolichurus<T0, T1>
@@ -5655,51 +5655,51 @@ module nigra {
   }
 }
 module panglima {
->panglima : panglima
+>panglima : typeof 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 : caurinus
+>caurinus : unknown
 >johorensis : caurinus.johorensis<T0, T1>
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >nitidus : Lanthanum.nitidus<T0, T1>
->petrophilus : petrophilus
+>petrophilus : unknown
 >minutilla : petrophilus.minutilla
->julianae : julianae
+>julianae : unknown
 >sumatrana : julianae.sumatrana
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >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 : macrorhinos
+>macrorhinos : unknown
 >marmosurus : macrorhinos.marmosurus<T0, T1>
->rendalli : rendalli
+>rendalli : unknown
 >moojeni : rendalli.moojeni<T0, T1>
 >amphibius : amphibius<T0, T1>
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >falconeri : trivirgatus.falconeri
->caurinus : caurinus
+>caurinus : unknown
 >psilurus : caurinus.psilurus
->gabriellae : gabriellae
+>gabriellae : unknown
 >echinatus : gabriellae.echinatus
->sagitta : sagitta
+>sagitta : unknown
 >stolzmanni : sagitta.stolzmanni
 >x : macrorhinos.marmosurus<rendalli.moojeni<amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>, sagitta.stolzmanni>
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >marmosurus : macrorhinos.marmosurus<T0, T1>
->rendalli : rendalli
+>rendalli : unknown
 >moojeni : rendalli.moojeni<T0, T1>
 >amphibius : amphibius<T0, T1>
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >falconeri : trivirgatus.falconeri
->caurinus : caurinus
+>caurinus : unknown
 >psilurus : caurinus.psilurus
->gabriellae : gabriellae
+>gabriellae : unknown
 >echinatus : gabriellae.echinatus
->sagitta : sagitta
+>sagitta : unknown
 >stolzmanni : sagitta.stolzmanni
 >() => { var y = this; } : () => void
 >y : amphibius<T0, T1>
@@ -5708,10 +5708,10 @@ module panglima {
 
         jerdoni(): macrorhinos.daphaenodon { var x: macrorhinos.daphaenodon; () => { var y = this; }; return x; }
 >jerdoni : () => macrorhinos.daphaenodon
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >daphaenodon : macrorhinos.daphaenodon
 >x : macrorhinos.daphaenodon
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >daphaenodon : macrorhinos.daphaenodon
 >() => { var y = this; } : () => void
 >y : amphibius<T0, T1>
@@ -5720,10 +5720,10 @@ module panglima {
 
         camtschatica(): samarensis.pallidus { var x: samarensis.pallidus; () => { var y = this; }; return x; }
 >camtschatica : () => samarensis.pallidus
->samarensis : samarensis
+>samarensis : unknown
 >pallidus : samarensis.pallidus
 >x : samarensis.pallidus
->samarensis : samarensis
+>samarensis : unknown
 >pallidus : samarensis.pallidus
 >() => { var y = this; } : () => void
 >y : amphibius<T0, T1>
@@ -5732,18 +5732,18 @@ 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 : petrophilus
+>petrophilus : unknown
 >sodyi : petrophilus.sodyi<T0, T1>
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >konganensis : macrorhinos.konganensis
->caurinus : caurinus
+>caurinus : unknown
 >psilurus : caurinus.psilurus
 >x : petrophilus.sodyi<macrorhinos.konganensis, caurinus.psilurus>
->petrophilus : petrophilus
+>petrophilus : unknown
 >sodyi : petrophilus.sodyi<T0, T1>
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >konganensis : macrorhinos.konganensis
->caurinus : caurinus
+>caurinus : unknown
 >psilurus : caurinus.psilurus
 >() => { var y = this; } : () => void
 >y : amphibius<T0, T1>
@@ -5752,18 +5752,18 @@ 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 : rendalli
+>rendalli : unknown
 >moojeni : rendalli.moojeni<T0, T1>
->julianae : julianae
+>julianae : unknown
 >sumatrana : julianae.sumatrana
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >oconnelli : trivirgatus.oconnelli
 >x : rendalli.moojeni<julianae.sumatrana, trivirgatus.oconnelli>
->rendalli : rendalli
+>rendalli : unknown
 >moojeni : rendalli.moojeni<T0, T1>
->julianae : julianae
+>julianae : unknown
 >sumatrana : julianae.sumatrana
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >oconnelli : trivirgatus.oconnelli
 >() => { var y = this; } : () => void
 >y : amphibius<T0, T1>
@@ -5772,18 +5772,18 @@ 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 : daubentonii
+>daubentonii : unknown
 >arboreus : daubentonii.arboreus<T0, T1>
->julianae : julianae
+>julianae : unknown
 >nudicaudus : julianae.nudicaudus
->julianae : julianae
+>julianae : unknown
 >steerii : julianae.steerii
 >x : daubentonii.arboreus<julianae.nudicaudus, julianae.steerii>
->daubentonii : daubentonii
+>daubentonii : unknown
 >arboreus : daubentonii.arboreus<T0, T1>
->julianae : julianae
+>julianae : unknown
 >nudicaudus : julianae.nudicaudus
->julianae : julianae
+>julianae : unknown
 >steerii : julianae.steerii
 >() => { var y = this; } : () => void
 >y : amphibius<T0, T1>
@@ -5794,23 +5794,23 @@ module panglima {
 >fundatus : fundatus<T0, T1>
 >T0 : T0
 >T1 : T1
->lutreolus : lutreolus
+>lutreolus : unknown
 >schlegeli : lutreolus.schlegeli
 
         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 : nigra
+>nigra : unknown
 >gracilis : nigra.gracilis<T0, T1>
->provocax : provocax
+>provocax : unknown
 >melanoleuca : provocax.melanoleuca
->provocax : provocax
+>provocax : unknown
 >melanoleuca : provocax.melanoleuca
 >x : nigra.gracilis<provocax.melanoleuca, provocax.melanoleuca>
->nigra : nigra
+>nigra : unknown
 >gracilis : nigra.gracilis<T0, T1>
->provocax : provocax
+>provocax : unknown
 >melanoleuca : provocax.melanoleuca
->provocax : provocax
+>provocax : unknown
 >melanoleuca : provocax.melanoleuca
 >() => { var y = this; } : () => void
 >y : fundatus<T0, T1>
@@ -5819,48 +5819,48 @@ 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 : imperfecta
+>imperfecta : unknown
 >lasiurus : imperfecta.lasiurus<T0, T1>
 >amphibius : amphibius<T0, T1>
->patas : patas
+>patas : unknown
 >uralensis : patas.uralensis
->gabriellae : gabriellae
+>gabriellae : unknown
 >klossii : gabriellae.klossii<T0, T1>
->julianae : julianae
+>julianae : unknown
 >nudicaudus : julianae.nudicaudus
->dogramacii : dogramacii
+>dogramacii : unknown
 >aurata : dogramacii.aurata
->sagitta : sagitta
+>sagitta : unknown
 >leptoceros : sagitta.leptoceros<T0, T1>
->lutreolus : lutreolus
+>lutreolus : unknown
 >punicus : lutreolus.punicus
->daubentonii : daubentonii
+>daubentonii : unknown
 >arboreus : daubentonii.arboreus<T0, T1>
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
->rionegrensis : rionegrensis
+>rionegrensis : unknown
 >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 : imperfecta
+>imperfecta : unknown
 >lasiurus : imperfecta.lasiurus<T0, T1>
 >amphibius : amphibius<T0, T1>
->patas : patas
+>patas : unknown
 >uralensis : patas.uralensis
->gabriellae : gabriellae
+>gabriellae : unknown
 >klossii : gabriellae.klossii<T0, T1>
->julianae : julianae
+>julianae : unknown
 >nudicaudus : julianae.nudicaudus
->dogramacii : dogramacii
+>dogramacii : unknown
 >aurata : dogramacii.aurata
->sagitta : sagitta
+>sagitta : unknown
 >leptoceros : sagitta.leptoceros<T0, T1>
->lutreolus : lutreolus
+>lutreolus : unknown
 >punicus : lutreolus.punicus
->daubentonii : daubentonii
+>daubentonii : unknown
 >arboreus : daubentonii.arboreus<T0, T1>
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
->rionegrensis : rionegrensis
+>rionegrensis : unknown
 >caniventer : rionegrensis.caniventer
 >() => { var y = this; } : () => void
 >y : fundatus<T0, T1>
@@ -5869,26 +5869,26 @@ 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 : macrorhinos
+>macrorhinos : unknown
 >marmosurus : macrorhinos.marmosurus<T0, T1>
->petrophilus : petrophilus
+>petrophilus : unknown
 >rosalia : petrophilus.rosalia<T0, T1>
->julianae : julianae
+>julianae : unknown
 >steerii : julianae.steerii
->lavali : lavali
+>lavali : unknown
 >beisa : lavali.beisa
->lavali : lavali
+>lavali : unknown
 >lepturus : lavali.lepturus
 >x : macrorhinos.marmosurus<petrophilus.rosalia<julianae.steerii, lavali.beisa>, lavali.lepturus>
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >marmosurus : macrorhinos.marmosurus<T0, T1>
->petrophilus : petrophilus
+>petrophilus : unknown
 >rosalia : petrophilus.rosalia<T0, T1>
->julianae : julianae
+>julianae : unknown
 >steerii : julianae.steerii
->lavali : lavali
+>lavali : unknown
 >beisa : lavali.beisa
->lavali : lavali
+>lavali : unknown
 >lepturus : lavali.lepturus
 >() => { var y = this; } : () => void
 >y : fundatus<T0, T1>
@@ -5899,19 +5899,19 @@ module panglima {
 >abidi : abidi<T0, T1>
 >T0 : T0
 >T1 : T1
->argurus : argurus
+>argurus : unknown
 >dauricus : argurus.dauricus<T0, T1>
->argurus : argurus
+>argurus : unknown
 >germaini : argurus.germaini
->julianae : julianae
+>julianae : unknown
 >durangae : julianae.durangae
 
         greyii(): trivirgatus.oconnelli { var x: trivirgatus.oconnelli; () => { var y = this; }; return x; }
 >greyii : () => trivirgatus.oconnelli
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >oconnelli : trivirgatus.oconnelli
 >x : trivirgatus.oconnelli
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >oconnelli : trivirgatus.oconnelli
 >() => { var y = this; } : () => void
 >y : abidi<T0, T1>
@@ -5920,10 +5920,10 @@ module panglima {
 
         macedonicus(): petrophilus.minutilla { var x: petrophilus.minutilla; () => { var y = this; }; return x; }
 >macedonicus : () => petrophilus.minutilla
->petrophilus : petrophilus
+>petrophilus : unknown
 >minutilla : petrophilus.minutilla
 >x : petrophilus.minutilla
->petrophilus : petrophilus
+>petrophilus : unknown
 >minutilla : petrophilus.minutilla
 >() => { var y = this; } : () => void
 >y : abidi<T0, T1>
@@ -5932,18 +5932,18 @@ 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 : samarensis
+>samarensis : unknown
 >cahirinus : samarensis.cahirinus<T0, T1>
->dammermani : dammermani
+>dammermani : unknown
 >melanops : dammermani.melanops
->samarensis : samarensis
+>samarensis : unknown
 >pallidus : samarensis.pallidus
 >x : samarensis.cahirinus<dammermani.melanops, samarensis.pallidus>
->samarensis : samarensis
+>samarensis : unknown
 >cahirinus : samarensis.cahirinus<T0, T1>
->dammermani : dammermani
+>dammermani : unknown
 >melanops : dammermani.melanops
->samarensis : samarensis
+>samarensis : unknown
 >pallidus : samarensis.pallidus
 >() => { var y = this; } : () => void
 >y : abidi<T0, T1>
@@ -5952,10 +5952,10 @@ module panglima {
 
         thierryi(): dogramacii.robustulus { var x: dogramacii.robustulus; () => { var y = this; }; return x; }
 >thierryi : () => dogramacii.robustulus
->dogramacii : dogramacii
+>dogramacii : unknown
 >robustulus : dogramacii.robustulus
 >x : dogramacii.robustulus
->dogramacii : dogramacii
+>dogramacii : unknown
 >robustulus : dogramacii.robustulus
 >() => { var y = this; } : () => void
 >y : abidi<T0, T1>
@@ -5964,26 +5964,26 @@ 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 : imperfecta
+>imperfecta : unknown
 >lasiurus : imperfecta.lasiurus<T0, T1>
->julianae : julianae
+>julianae : unknown
 >acariensis : julianae.acariensis
->howi : howi
+>howi : unknown
 >coludo : howi.coludo<T0, T1>
->argurus : argurus
+>argurus : unknown
 >oreas : argurus.oreas
->howi : howi
+>howi : unknown
 >marcanoi : howi.marcanoi
 >x : imperfecta.lasiurus<julianae.acariensis, howi.coludo<argurus.oreas, howi.marcanoi>>
->imperfecta : imperfecta
+>imperfecta : unknown
 >lasiurus : imperfecta.lasiurus<T0, T1>
->julianae : julianae
+>julianae : unknown
 >acariensis : julianae.acariensis
->howi : howi
+>howi : unknown
 >coludo : howi.coludo<T0, T1>
->argurus : argurus
+>argurus : unknown
 >oreas : argurus.oreas
->howi : howi
+>howi : unknown
 >marcanoi : howi.marcanoi
 >() => { var y = this; } : () => void
 >y : abidi<T0, T1>
@@ -5992,17 +5992,17 @@ module panglima {
     }
 }
 module quasiater {
->quasiater : quasiater
+>quasiater : typeof quasiater
 
     export class carolinensis {
 >carolinensis : carolinensis
 
         concinna(): rendalli.zuluensis { var x: rendalli.zuluensis; () => { var y = this; }; return x; }
 >concinna : () => rendalli.zuluensis
->rendalli : rendalli
+>rendalli : unknown
 >zuluensis : rendalli.zuluensis
 >x : rendalli.zuluensis
->rendalli : rendalli
+>rendalli : unknown
 >zuluensis : rendalli.zuluensis
 >() => { var y = this; } : () => void
 >y : carolinensis
@@ -6011,10 +6011,10 @@ module quasiater {
 
         aeneus(): howi.marcanoi { var x: howi.marcanoi; () => { var y = this; }; return x; }
 >aeneus : () => howi.marcanoi
->howi : howi
+>howi : unknown
 >marcanoi : howi.marcanoi
 >x : howi.marcanoi
->howi : howi
+>howi : unknown
 >marcanoi : howi.marcanoi
 >() => { var y = this; } : () => void
 >y : carolinensis
@@ -6023,26 +6023,26 @@ 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 : argurus
+>argurus : unknown
 >netscheri : argurus.netscheri<T0, T1>
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >lotor : trivirgatus.lotor<T0, T1>
->argurus : argurus
+>argurus : unknown
 >oreas : argurus.oreas
->lavali : lavali
+>lavali : unknown
 >beisa : lavali.beisa
->lavali : lavali
+>lavali : unknown
 >lepturus : lavali.lepturus
 >x : argurus.netscheri<trivirgatus.lotor<argurus.oreas, lavali.beisa>, lavali.lepturus>
->argurus : argurus
+>argurus : unknown
 >netscheri : argurus.netscheri<T0, T1>
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >lotor : trivirgatus.lotor<T0, T1>
->argurus : argurus
+>argurus : unknown
 >oreas : argurus.oreas
->lavali : lavali
+>lavali : unknown
 >beisa : lavali.beisa
->lavali : lavali
+>lavali : unknown
 >lepturus : lavali.lepturus
 >() => { var y = this; } : () => void
 >y : carolinensis
@@ -6051,10 +6051,10 @@ module quasiater {
 
         tenellus(): julianae.nudicaudus { var x: julianae.nudicaudus; () => { var y = this; }; return x; }
 >tenellus : () => julianae.nudicaudus
->julianae : julianae
+>julianae : unknown
 >nudicaudus : julianae.nudicaudus
 >x : julianae.nudicaudus
->julianae : julianae
+>julianae : unknown
 >nudicaudus : julianae.nudicaudus
 >() => { var y = this; } : () => void
 >y : carolinensis
@@ -6063,10 +6063,10 @@ module quasiater {
 
         andium(): lavali.beisa { var x: lavali.beisa; () => { var y = this; }; return x; }
 >andium : () => lavali.beisa
->lavali : lavali
+>lavali : unknown
 >beisa : lavali.beisa
 >x : lavali.beisa
->lavali : lavali
+>lavali : unknown
 >beisa : lavali.beisa
 >() => { var y = this; } : () => void
 >y : carolinensis
@@ -6075,18 +6075,18 @@ 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 : panglima
+>panglima : unknown
 >fundatus : panglima.fundatus<T0, T1>
->samarensis : samarensis
+>samarensis : unknown
 >pallidus : samarensis.pallidus
->sagitta : sagitta
+>sagitta : unknown
 >stolzmanni : sagitta.stolzmanni
 >x : panglima.fundatus<samarensis.pallidus, sagitta.stolzmanni>
->panglima : panglima
+>panglima : unknown
 >fundatus : panglima.fundatus<T0, T1>
->samarensis : samarensis
+>samarensis : unknown
 >pallidus : samarensis.pallidus
->sagitta : sagitta
+>sagitta : unknown
 >stolzmanni : sagitta.stolzmanni
 >() => { var y = this; } : () => void
 >y : carolinensis
@@ -6095,10 +6095,10 @@ module quasiater {
 
         patrizii(): Lanthanum.megalonyx { var x: Lanthanum.megalonyx; () => { var y = this; }; return x; }
 >patrizii : () => Lanthanum.megalonyx
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >megalonyx : Lanthanum.megalonyx
 >x : Lanthanum.megalonyx
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >megalonyx : Lanthanum.megalonyx
 >() => { var y = this; } : () => void
 >y : carolinensis
@@ -6107,37 +6107,37 @@ module quasiater {
     }
 }
 module minutus {
->minutus : minutus
+>minutus : typeof minutus
 
     export class himalayana<T0, T1> extends lutreolus.punicus {
 >himalayana : himalayana<T0, T1>
 >T0 : T0
 >T1 : T1
->lutreolus : lutreolus
+>lutreolus : unknown
 >punicus : lutreolus.punicus
 
         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 : argurus
+>argurus : unknown
 >netscheri : argurus.netscheri<T0, T1>
->lavali : lavali
+>lavali : unknown
 >lepturus : lavali.lepturus
->argurus : argurus
+>argurus : unknown
 >dauricus : argurus.dauricus<T0, T1>
->argurus : argurus
+>argurus : unknown
 >oreas : argurus.oreas
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
 >x : argurus.netscheri<lavali.lepturus, argurus.dauricus<argurus.oreas, quasiater.carolinensis>>
->argurus : argurus
+>argurus : unknown
 >netscheri : argurus.netscheri<T0, T1>
->lavali : lavali
+>lavali : unknown
 >lepturus : lavali.lepturus
->argurus : argurus
+>argurus : unknown
 >dauricus : argurus.dauricus<T0, T1>
->argurus : argurus
+>argurus : unknown
 >oreas : argurus.oreas
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
 >() => { var y = this; } : () => void
 >y : himalayana<T0, T1>
@@ -6146,10 +6146,10 @@ module minutus {
 
         lobata(): samarensis.pallidus { var x: samarensis.pallidus; () => { var y = this; }; return x; }
 >lobata : () => samarensis.pallidus
->samarensis : samarensis
+>samarensis : unknown
 >pallidus : samarensis.pallidus
 >x : samarensis.pallidus
->samarensis : samarensis
+>samarensis : unknown
 >pallidus : samarensis.pallidus
 >() => { var y = this; } : () => void
 >y : himalayana<T0, T1>
@@ -6158,10 +6158,10 @@ module minutus {
 
         rusticus(): dogramacii.aurata { var x: dogramacii.aurata; () => { var y = this; }; return x; }
 >rusticus : () => dogramacii.aurata
->dogramacii : dogramacii
+>dogramacii : unknown
 >aurata : dogramacii.aurata
 >x : dogramacii.aurata
->dogramacii : dogramacii
+>dogramacii : unknown
 >aurata : dogramacii.aurata
 >() => { var y = this; } : () => void
 >y : himalayana<T0, T1>
@@ -6170,18 +6170,18 @@ 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 : daubentonii
+>daubentonii : unknown
 >nesiotes : daubentonii.nesiotes<T0, T1>
->dammermani : dammermani
+>dammermani : unknown
 >melanops : dammermani.melanops
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >megalonyx : Lanthanum.megalonyx
 >x : daubentonii.nesiotes<dammermani.melanops, Lanthanum.megalonyx>
->daubentonii : daubentonii
+>daubentonii : unknown
 >nesiotes : daubentonii.nesiotes<T0, T1>
->dammermani : dammermani
+>dammermani : unknown
 >melanops : dammermani.melanops
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >megalonyx : Lanthanum.megalonyx
 >() => { var y = this; } : () => void
 >y : himalayana<T0, T1>
@@ -6190,10 +6190,10 @@ module minutus {
 
         famulus(): patas.uralensis { var x: patas.uralensis; () => { var y = this; }; return x; }
 >famulus : () => patas.uralensis
->patas : patas
+>patas : unknown
 >uralensis : patas.uralensis
 >x : patas.uralensis
->patas : patas
+>patas : unknown
 >uralensis : patas.uralensis
 >() => { var y = this; } : () => void
 >y : himalayana<T0, T1>
@@ -6202,26 +6202,26 @@ 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 : minutus
+>minutus : unknown
 >inez : inez<T0, T1>
->argurus : argurus
+>argurus : unknown
 >oreas : argurus.oreas
->panglima : panglima
+>panglima : unknown
 >fundatus : panglima.fundatus<T0, T1>
->gabriellae : gabriellae
+>gabriellae : unknown
 >amicus : gabriellae.amicus
->lutreolus : lutreolus
+>lutreolus : unknown
 >foina : lutreolus.foina
 >x : inez<argurus.oreas, panglima.fundatus<gabriellae.amicus, lutreolus.foina>>
->minutus : minutus
+>minutus : unknown
 >inez : inez<T0, T1>
->argurus : argurus
+>argurus : unknown
 >oreas : argurus.oreas
->panglima : panglima
+>panglima : unknown
 >fundatus : panglima.fundatus<T0, T1>
->gabriellae : gabriellae
+>gabriellae : unknown
 >amicus : gabriellae.amicus
->lutreolus : lutreolus
+>lutreolus : unknown
 >foina : lutreolus.foina
 >() => { var y = this; } : () => void
 >y : himalayana<T0, T1>
@@ -6230,26 +6230,26 @@ 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 : nigra
+>nigra : unknown
 >dolichurus : nigra.dolichurus<T0, T1>
->lutreolus : lutreolus
+>lutreolus : unknown
 >schlegeli : lutreolus.schlegeli
->chrysaeolus : chrysaeolus
+>chrysaeolus : unknown
 >sarasinorum : chrysaeolus.sarasinorum<T0, T1>
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >jugularis : Lanthanum.jugularis
->imperfecta : imperfecta
+>imperfecta : unknown
 >subspinosus : imperfecta.subspinosus
 >x : nigra.dolichurus<lutreolus.schlegeli, chrysaeolus.sarasinorum<Lanthanum.jugularis, imperfecta.subspinosus>>
->nigra : nigra
+>nigra : unknown
 >dolichurus : nigra.dolichurus<T0, T1>
->lutreolus : lutreolus
+>lutreolus : unknown
 >schlegeli : lutreolus.schlegeli
->chrysaeolus : chrysaeolus
+>chrysaeolus : unknown
 >sarasinorum : chrysaeolus.sarasinorum<T0, T1>
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >jugularis : Lanthanum.jugularis
->imperfecta : imperfecta
+>imperfecta : unknown
 >subspinosus : imperfecta.subspinosus
 >() => { var y = this; } : () => void
 >y : himalayana<T0, T1>
@@ -6258,10 +6258,10 @@ module minutus {
 
         Osmium(): lavali.wilsoni { var x: lavali.wilsoni; () => { var y = this; }; return x; }
 >Osmium : () => lavali.wilsoni
->lavali : lavali
+>lavali : unknown
 >wilsoni : lavali.wilsoni
 >x : lavali.wilsoni
->lavali : lavali
+>lavali : unknown
 >wilsoni : lavali.wilsoni
 >() => { var y = this; } : () => void
 >y : himalayana<T0, T1>
@@ -6270,18 +6270,18 @@ 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 : Lanthanum
+>Lanthanum : unknown
 >nitidus : Lanthanum.nitidus<T0, T1>
->lavali : lavali
+>lavali : unknown
 >lepturus : lavali.lepturus
->julianae : julianae
+>julianae : unknown
 >acariensis : julianae.acariensis
 >x : Lanthanum.nitidus<lavali.lepturus, julianae.acariensis>
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >nitidus : Lanthanum.nitidus<T0, T1>
->lavali : lavali
+>lavali : unknown
 >lepturus : lavali.lepturus
->julianae : julianae
+>julianae : unknown
 >acariensis : julianae.acariensis
 >() => { var y = this; } : () => void
 >y : himalayana<T0, T1>
@@ -6290,18 +6290,18 @@ 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 : panglima
+>panglima : unknown
 >amphibius : panglima.amphibius<T0, T1>
->caurinus : caurinus
+>caurinus : unknown
 >megaphyllus : caurinus.megaphyllus
->lavali : lavali
+>lavali : unknown
 >lepturus : lavali.lepturus
 >x : panglima.amphibius<caurinus.megaphyllus, lavali.lepturus>
->panglima : panglima
+>panglima : unknown
 >amphibius : panglima.amphibius<T0, T1>
->caurinus : caurinus
+>caurinus : unknown
 >megaphyllus : caurinus.megaphyllus
->lavali : lavali
+>lavali : unknown
 >lepturus : lavali.lepturus
 >() => { var y = this; } : () => void
 >y : himalayana<T0, T1>
@@ -6310,26 +6310,26 @@ 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 : argurus
+>argurus : unknown
 >gilbertii : argurus.gilbertii<T0, T1>
->gabriellae : gabriellae
+>gabriellae : unknown
 >klossii : gabriellae.klossii<T0, T1>
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >konganensis : macrorhinos.konganensis
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
->provocax : provocax
+>provocax : unknown
 >melanoleuca : provocax.melanoleuca
 >x : argurus.gilbertii<gabriellae.klossii<macrorhinos.konganensis, quasiater.carolinensis>, provocax.melanoleuca>
->argurus : argurus
+>argurus : unknown
 >gilbertii : argurus.gilbertii<T0, T1>
->gabriellae : gabriellae
+>gabriellae : unknown
 >klossii : gabriellae.klossii<T0, T1>
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >konganensis : macrorhinos.konganensis
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
->provocax : provocax
+>provocax : unknown
 >melanoleuca : provocax.melanoleuca
 >() => { var y = this; } : () => void
 >y : himalayana<T0, T1>
@@ -6338,10 +6338,10 @@ module minutus {
 
         olympus(): Lanthanum.megalonyx { var x: Lanthanum.megalonyx; () => { var y = this; }; return x; }
 >olympus : () => Lanthanum.megalonyx
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >megalonyx : Lanthanum.megalonyx
 >x : Lanthanum.megalonyx
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >megalonyx : Lanthanum.megalonyx
 >() => { var y = this; } : () => void
 >y : himalayana<T0, T1>
@@ -6350,49 +6350,49 @@ module minutus {
     }
 }
 module caurinus {
->caurinus : caurinus
+>caurinus : typeof caurinus
 
     export class mahaganus<T0, T1> extends panglima.fundatus<quasiater.carolinensis, macrorhinos.daphaenodon> {
 >mahaganus : mahaganus<T0, T1>
 >T0 : T0
 >T1 : T1
->panglima : panglima
+>panglima : unknown
 >fundatus : panglima.fundatus<T0, T1>
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >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 : ruatanica
+>ruatanica : unknown
 >hector : ruatanica.hector<T0, T1>
->julianae : julianae
+>julianae : unknown
 >sumatrana : julianae.sumatrana
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >marmosurus : macrorhinos.marmosurus<T0, T1>
->dammermani : dammermani
+>dammermani : unknown
 >melanops : dammermani.melanops
->caurinus : caurinus
+>caurinus : unknown
 >mahaganus : mahaganus<T0, T1>
->julianae : julianae
+>julianae : unknown
 >nudicaudus : julianae.nudicaudus
->lavali : lavali
+>lavali : unknown
 >otion : lavali.otion
 >x : ruatanica.hector<julianae.sumatrana, macrorhinos.marmosurus<dammermani.melanops, mahaganus<julianae.nudicaudus, lavali.otion>>>
->ruatanica : ruatanica
+>ruatanica : unknown
 >hector : ruatanica.hector<T0, T1>
->julianae : julianae
+>julianae : unknown
 >sumatrana : julianae.sumatrana
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >marmosurus : macrorhinos.marmosurus<T0, T1>
->dammermani : dammermani
+>dammermani : unknown
 >melanops : dammermani.melanops
->caurinus : caurinus
+>caurinus : unknown
 >mahaganus : mahaganus<T0, T1>
->julianae : julianae
+>julianae : unknown
 >nudicaudus : julianae.nudicaudus
->lavali : lavali
+>lavali : unknown
 >otion : lavali.otion
 >() => { var y = this; } : () => void
 >y : mahaganus<T0, T1>
@@ -6401,34 +6401,34 @@ 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 : samarensis
+>samarensis : unknown
 >pelurus : samarensis.pelurus<T0, T1>
->dogramacii : dogramacii
+>dogramacii : unknown
 >aurata : dogramacii.aurata
->minutus : minutus
+>minutus : unknown
 >inez : minutus.inez<T0, T1>
->minutus : minutus
+>minutus : unknown
 >inez : minutus.inez<T0, T1>
->sagitta : sagitta
+>sagitta : unknown
 >stolzmanni : sagitta.stolzmanni
->dammermani : dammermani
+>dammermani : unknown
 >melanops : dammermani.melanops
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >falconeri : trivirgatus.falconeri
 >x : samarensis.pelurus<dogramacii.aurata, minutus.inez<minutus.inez<sagitta.stolzmanni, dammermani.melanops>, trivirgatus.falconeri>>
->samarensis : samarensis
+>samarensis : unknown
 >pelurus : samarensis.pelurus<T0, T1>
->dogramacii : dogramacii
+>dogramacii : unknown
 >aurata : dogramacii.aurata
->minutus : minutus
+>minutus : unknown
 >inez : minutus.inez<T0, T1>
->minutus : minutus
+>minutus : unknown
 >inez : minutus.inez<T0, T1>
->sagitta : sagitta
+>sagitta : unknown
 >stolzmanni : sagitta.stolzmanni
->dammermani : dammermani
+>dammermani : unknown
 >melanops : dammermani.melanops
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >falconeri : trivirgatus.falconeri
 >() => { var y = this; } : () => void
 >y : mahaganus<T0, T1>
@@ -6437,10 +6437,10 @@ module caurinus {
 
         masalai(): argurus.oreas { var x: argurus.oreas; () => { var y = this; }; return x; }
 >masalai : () => argurus.oreas
->argurus : argurus
+>argurus : unknown
 >oreas : argurus.oreas
 >x : argurus.oreas
->argurus : argurus
+>argurus : unknown
 >oreas : argurus.oreas
 >() => { var y = this; } : () => void
 >y : mahaganus<T0, T1>
@@ -6449,18 +6449,18 @@ 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 : nigra
+>nigra : unknown
 >dolichurus : nigra.dolichurus<T0, T1>
->patas : patas
+>patas : unknown
 >uralensis : patas.uralensis
->caurinus : caurinus
+>caurinus : unknown
 >psilurus : psilurus
 >x : nigra.dolichurus<patas.uralensis, psilurus>
->nigra : nigra
+>nigra : unknown
 >dolichurus : nigra.dolichurus<T0, T1>
->patas : patas
+>patas : unknown
 >uralensis : patas.uralensis
->caurinus : caurinus
+>caurinus : unknown
 >psilurus : psilurus
 >() => { var y = this; } : () => void
 >y : mahaganus<T0, T1>
@@ -6469,10 +6469,10 @@ module caurinus {
 
         simulus(): gabriellae.echinatus { var x: gabriellae.echinatus; () => { var y = this; }; return x; }
 >simulus : () => gabriellae.echinatus
->gabriellae : gabriellae
+>gabriellae : unknown
 >echinatus : gabriellae.echinatus
 >x : gabriellae.echinatus
->gabriellae : gabriellae
+>gabriellae : unknown
 >echinatus : gabriellae.echinatus
 >() => { var y = this; } : () => void
 >y : mahaganus<T0, T1>
@@ -6481,34 +6481,34 @@ 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 : caurinus
+>caurinus : unknown
 >mahaganus : mahaganus<T0, T1>
->gabriellae : gabriellae
+>gabriellae : unknown
 >echinatus : gabriellae.echinatus
->petrophilus : petrophilus
+>petrophilus : unknown
 >rosalia : petrophilus.rosalia<T0, T1>
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >megalonyx : Lanthanum.megalonyx
->panglima : panglima
+>panglima : unknown
 >abidi : panglima.abidi<T0, T1>
->dogramacii : dogramacii
+>dogramacii : unknown
 >kaiseri : dogramacii.kaiseri
->lavali : lavali
+>lavali : unknown
 >wilsoni : lavali.wilsoni
 >x : mahaganus<gabriellae.echinatus, petrophilus.rosalia<Lanthanum.megalonyx, panglima.abidi<dogramacii.kaiseri, lavali.wilsoni>>>
->caurinus : caurinus
+>caurinus : unknown
 >mahaganus : mahaganus<T0, T1>
->gabriellae : gabriellae
+>gabriellae : unknown
 >echinatus : gabriellae.echinatus
->petrophilus : petrophilus
+>petrophilus : unknown
 >rosalia : petrophilus.rosalia<T0, T1>
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >megalonyx : Lanthanum.megalonyx
->panglima : panglima
+>panglima : unknown
 >abidi : panglima.abidi<T0, T1>
->dogramacii : dogramacii
+>dogramacii : unknown
 >kaiseri : dogramacii.kaiseri
->lavali : lavali
+>lavali : unknown
 >wilsoni : lavali.wilsoni
 >() => { var y = this; } : () => void
 >y : mahaganus<T0, T1>
@@ -6517,26 +6517,26 @@ 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 : gabriellae
+>gabriellae : unknown
 >klossii : gabriellae.klossii<T0, T1>
->howi : howi
+>howi : unknown
 >coludo : howi.coludo<T0, T1>
->lavali : lavali
+>lavali : unknown
 >lepturus : lavali.lepturus
->lutreolus : lutreolus
+>lutreolus : unknown
 >punicus : lutreolus.punicus
->dammermani : dammermani
+>dammermani : unknown
 >melanops : dammermani.melanops
 >x : gabriellae.klossii<howi.coludo<lavali.lepturus, lutreolus.punicus>, dammermani.melanops>
->gabriellae : gabriellae
+>gabriellae : unknown
 >klossii : gabriellae.klossii<T0, T1>
->howi : howi
+>howi : unknown
 >coludo : howi.coludo<T0, T1>
->lavali : lavali
+>lavali : unknown
 >lepturus : lavali.lepturus
->lutreolus : lutreolus
+>lutreolus : unknown
 >punicus : lutreolus.punicus
->dammermani : dammermani
+>dammermani : unknown
 >melanops : dammermani.melanops
 >() => { var y = this; } : () => void
 >y : mahaganus<T0, T1>
@@ -6545,10 +6545,10 @@ module caurinus {
 
         acticola(): argurus.luctuosa { var x: argurus.luctuosa; () => { var y = this; }; return x; }
 >acticola : () => argurus.luctuosa
->argurus : argurus
+>argurus : unknown
 >luctuosa : argurus.luctuosa
 >x : argurus.luctuosa
->argurus : argurus
+>argurus : unknown
 >luctuosa : argurus.luctuosa
 >() => { var y = this; } : () => void
 >y : mahaganus<T0, T1>
@@ -6557,7 +6557,7 @@ module caurinus {
     }
 }
 module macrorhinos {
->macrorhinos : macrorhinos
+>macrorhinos : typeof macrorhinos
 
     export class marmosurus<T0, T1> {
 >marmosurus : marmosurus<T0, T1>
@@ -6566,10 +6566,10 @@ module macrorhinos {
 
         tansaniana(): lutreolus.punicus { var x: lutreolus.punicus; () => { var y = this; }; return x; }
 >tansaniana : () => lutreolus.punicus
->lutreolus : lutreolus
+>lutreolus : unknown
 >punicus : lutreolus.punicus
 >x : lutreolus.punicus
->lutreolus : lutreolus
+>lutreolus : unknown
 >punicus : lutreolus.punicus
 >() => { var y = this; } : () => void
 >y : marmosurus<T0, T1>
@@ -6578,21 +6578,21 @@ module macrorhinos {
     }
 }
 module howi {
->howi : howi
+>howi : typeof howi
 
     export class angulatus<T0, T1> extends sagitta.stolzmanni {
 >angulatus : angulatus<T0, T1>
 >T0 : T0
 >T1 : T1
->sagitta : sagitta
+>sagitta : unknown
 >stolzmanni : sagitta.stolzmanni
 
         pennatus(): howi.marcanoi { var x: howi.marcanoi; () => { var y = this; }; return x; }
 >pennatus : () => marcanoi
->howi : howi
+>howi : unknown
 >marcanoi : marcanoi
 >x : marcanoi
->howi : howi
+>howi : unknown
 >marcanoi : marcanoi
 >() => { var y = this; } : () => void
 >y : angulatus<T0, T1>
@@ -6601,7 +6601,7 @@ module howi {
     }
 }
 module daubentonii {
->daubentonii : daubentonii
+>daubentonii : typeof daubentonii
 
     export class nesiotes<T0, T1> {
 >nesiotes : nesiotes<T0, T1>
@@ -6610,7 +6610,7 @@ module daubentonii {
     }
 }
 module nigra {
->nigra : nigra
+>nigra : typeof nigra
 
     export class thalia<T0, T1> {
 >thalia : thalia<T0, T1>
@@ -6619,10 +6619,10 @@ module nigra {
 
         dichotomus(): quasiater.carolinensis { var x: quasiater.carolinensis; () => { var y = this; }; return x; }
 >dichotomus : () => quasiater.carolinensis
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
 >x : quasiater.carolinensis
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
 >() => { var y = this; } : () => void
 >y : thalia<T0, T1>
@@ -6631,26 +6631,26 @@ 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 : panamensis
+>panamensis : unknown
 >linulus : panamensis.linulus<T0, T1>
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >lotor : trivirgatus.lotor<T0, T1>
->argurus : argurus
+>argurus : unknown
 >luctuosa : argurus.luctuosa
->lavali : lavali
+>lavali : unknown
 >wilsoni : lavali.wilsoni
->lavali : lavali
+>lavali : unknown
 >beisa : lavali.beisa
 >x : panamensis.linulus<trivirgatus.lotor<argurus.luctuosa, lavali.wilsoni>, lavali.beisa>
->panamensis : panamensis
+>panamensis : unknown
 >linulus : panamensis.linulus<T0, T1>
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >lotor : trivirgatus.lotor<T0, T1>
->argurus : argurus
+>argurus : unknown
 >luctuosa : argurus.luctuosa
->lavali : lavali
+>lavali : unknown
 >wilsoni : lavali.wilsoni
->lavali : lavali
+>lavali : unknown
 >beisa : lavali.beisa
 >() => { var y = this; } : () => void
 >y : thalia<T0, T1>
@@ -6659,10 +6659,10 @@ module nigra {
 
         verheyeni(): lavali.xanthognathus { var x: lavali.xanthognathus; () => { var y = this; }; return x; }
 >verheyeni : () => lavali.xanthognathus
->lavali : lavali
+>lavali : unknown
 >xanthognathus : lavali.xanthognathus
 >x : lavali.xanthognathus
->lavali : lavali
+>lavali : unknown
 >xanthognathus : lavali.xanthognathus
 >() => { var y = this; } : () => void
 >y : thalia<T0, T1>
@@ -6671,10 +6671,10 @@ module nigra {
 
         dauuricus(): gabriellae.amicus { var x: gabriellae.amicus; () => { var y = this; }; return x; }
 >dauuricus : () => gabriellae.amicus
->gabriellae : gabriellae
+>gabriellae : unknown
 >amicus : gabriellae.amicus
 >x : gabriellae.amicus
->gabriellae : gabriellae
+>gabriellae : unknown
 >amicus : gabriellae.amicus
 >() => { var y = this; } : () => void
 >y : thalia<T0, T1>
@@ -6683,26 +6683,26 @@ 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 : rionegrensis
+>rionegrensis : unknown
 >veraecrucis : rionegrensis.veraecrucis<T0, T1>
->howi : howi
+>howi : unknown
 >marcanoi : howi.marcanoi
->panamensis : panamensis
+>panamensis : unknown
 >linulus : panamensis.linulus<T0, T1>
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >megalonyx : Lanthanum.megalonyx
->howi : howi
+>howi : unknown
 >marcanoi : howi.marcanoi
 >x : rionegrensis.veraecrucis<howi.marcanoi, panamensis.linulus<Lanthanum.megalonyx, howi.marcanoi>>
->rionegrensis : rionegrensis
+>rionegrensis : unknown
 >veraecrucis : rionegrensis.veraecrucis<T0, T1>
->howi : howi
+>howi : unknown
 >marcanoi : howi.marcanoi
->panamensis : panamensis
+>panamensis : unknown
 >linulus : panamensis.linulus<T0, T1>
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >megalonyx : Lanthanum.megalonyx
->howi : howi
+>howi : unknown
 >marcanoi : howi.marcanoi
 >() => { var y = this; } : () => void
 >y : thalia<T0, T1>
@@ -6711,42 +6711,42 @@ 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 : panglima
+>panglima : unknown
 >abidi : panglima.abidi<T0, T1>
->samarensis : samarensis
+>samarensis : unknown
 >fuscus : samarensis.fuscus<T0, T1>
->lavali : lavali
+>lavali : unknown
 >wilsoni : lavali.wilsoni
->chrysaeolus : chrysaeolus
+>chrysaeolus : unknown
 >sarasinorum : chrysaeolus.sarasinorum<T0, T1>
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >jugularis : Lanthanum.jugularis
->imperfecta : imperfecta
+>imperfecta : unknown
 >subspinosus : imperfecta.subspinosus
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >nitidus : Lanthanum.nitidus<T0, T1>
->lavali : lavali
+>lavali : unknown
 >lepturus : lavali.lepturus
->julianae : julianae
+>julianae : unknown
 >acariensis : julianae.acariensis
 >x : panglima.abidi<samarensis.fuscus<lavali.wilsoni, chrysaeolus.sarasinorum<Lanthanum.jugularis, imperfecta.subspinosus>>, Lanthanum.nitidus<lavali.lepturus, julianae.acariensis>>
->panglima : panglima
+>panglima : unknown
 >abidi : panglima.abidi<T0, T1>
->samarensis : samarensis
+>samarensis : unknown
 >fuscus : samarensis.fuscus<T0, T1>
->lavali : lavali
+>lavali : unknown
 >wilsoni : lavali.wilsoni
->chrysaeolus : chrysaeolus
+>chrysaeolus : unknown
 >sarasinorum : chrysaeolus.sarasinorum<T0, T1>
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >jugularis : Lanthanum.jugularis
->imperfecta : imperfecta
+>imperfecta : unknown
 >subspinosus : imperfecta.subspinosus
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >nitidus : Lanthanum.nitidus<T0, T1>
->lavali : lavali
+>lavali : unknown
 >lepturus : lavali.lepturus
->julianae : julianae
+>julianae : unknown
 >acariensis : julianae.acariensis
 >() => { var y = this; } : () => void
 >y : thalia<T0, T1>
@@ -6755,10 +6755,10 @@ module nigra {
 
         gangetica(): argurus.luctuosa { var x: argurus.luctuosa; () => { var y = this; }; return x; }
 >gangetica : () => argurus.luctuosa
->argurus : argurus
+>argurus : unknown
 >luctuosa : argurus.luctuosa
 >x : argurus.luctuosa
->argurus : argurus
+>argurus : unknown
 >luctuosa : argurus.luctuosa
 >() => { var y = this; } : () => void
 >y : thalia<T0, T1>
@@ -6767,18 +6767,18 @@ 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 : chrysaeolus
+>chrysaeolus : unknown
 >sarasinorum : chrysaeolus.sarasinorum<T0, T1>
->julianae : julianae
+>julianae : unknown
 >steerii : julianae.steerii
->ruatanica : ruatanica
+>ruatanica : unknown
 >americanus : ruatanica.americanus
 >x : chrysaeolus.sarasinorum<julianae.steerii, ruatanica.americanus>
->chrysaeolus : chrysaeolus
+>chrysaeolus : unknown
 >sarasinorum : chrysaeolus.sarasinorum<T0, T1>
->julianae : julianae
+>julianae : unknown
 >steerii : julianae.steerii
->ruatanica : ruatanica
+>ruatanica : unknown
 >americanus : ruatanica.americanus
 >() => { var y = this; } : () => void
 >y : thalia<T0, T1>
@@ -6787,27 +6787,27 @@ module nigra {
     }
 }
 module sagitta {
->sagitta : sagitta
+>sagitta : typeof sagitta
 
     export class walkeri extends minutus.portoricensis {
 >walkeri : walkeri
->minutus : minutus
+>minutus : unknown
 >portoricensis : minutus.portoricensis
 
         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 : samarensis
+>samarensis : unknown
 >cahirinus : samarensis.cahirinus<T0, T1>
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >jugularis : Lanthanum.jugularis
->ruatanica : ruatanica
+>ruatanica : unknown
 >americanus : ruatanica.americanus
 >x : samarensis.cahirinus<Lanthanum.jugularis, ruatanica.americanus>
->samarensis : samarensis
+>samarensis : unknown
 >cahirinus : samarensis.cahirinus<T0, T1>
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >jugularis : Lanthanum.jugularis
->ruatanica : ruatanica
+>ruatanica : unknown
 >americanus : ruatanica.americanus
 >() => { var y = this; } : () => void
 >y : walkeri
@@ -6816,33 +6816,33 @@ module sagitta {
     }
 }
 module minutus {
->minutus : minutus
+>minutus : typeof minutus
 
     export class inez<T0, T1> extends samarensis.pelurus<argurus.germaini, julianae.durangae> {
 >inez : inez<T0, T1>
 >T0 : T0
 >T1 : T1
->samarensis : samarensis
+>samarensis : unknown
 >pelurus : samarensis.pelurus<T0, T1>
->argurus : argurus
+>argurus : unknown
 >germaini : argurus.germaini
->julianae : julianae
+>julianae : unknown
 >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 : samarensis
+>samarensis : unknown
 >cahirinus : samarensis.cahirinus<T0, T1>
->lavali : lavali
+>lavali : unknown
 >lepturus : lavali.lepturus
->lavali : lavali
+>lavali : unknown
 >wilsoni : lavali.wilsoni
 >x : samarensis.cahirinus<lavali.lepturus, lavali.wilsoni>
->samarensis : samarensis
+>samarensis : unknown
 >cahirinus : samarensis.cahirinus<T0, T1>
->lavali : lavali
+>lavali : unknown
 >lepturus : lavali.lepturus
->lavali : lavali
+>lavali : unknown
 >wilsoni : lavali.wilsoni
 >() => { var y = this; } : () => void
 >y : inez<T0, T1>
@@ -6851,50 +6851,50 @@ module minutus {
     }
 }
 module macrorhinos {
->macrorhinos : macrorhinos
+>macrorhinos : typeof macrorhinos
 
     export class konganensis extends imperfecta.lasiurus<caurinus.psilurus, caurinus.psilurus> {
 >konganensis : konganensis
->imperfecta : imperfecta
+>imperfecta : unknown
 >lasiurus : imperfecta.lasiurus<T0, T1>
->caurinus : caurinus
+>caurinus : unknown
 >psilurus : caurinus.psilurus
->caurinus : caurinus
+>caurinus : unknown
 >psilurus : caurinus.psilurus
     }
 }
 module panamensis {
->panamensis : panamensis
+>panamensis : typeof 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 : ruatanica
+>ruatanica : unknown
 >hector : ruatanica.hector<T0, T1>
->julianae : julianae
+>julianae : unknown
 >sumatrana : julianae.sumatrana
->samarensis : samarensis
+>samarensis : unknown
 >pelurus : samarensis.pelurus<T0, T1>
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >jugularis : Lanthanum.jugularis
->sagitta : sagitta
+>sagitta : unknown
 >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 : daubentonii
+>daubentonii : unknown
 >arboreus : daubentonii.arboreus<T0, T1>
->gabriellae : gabriellae
+>gabriellae : unknown
 >amicus : gabriellae.amicus
->dogramacii : dogramacii
+>dogramacii : unknown
 >kaiseri : dogramacii.kaiseri
 >x : daubentonii.arboreus<gabriellae.amicus, dogramacii.kaiseri>
->daubentonii : daubentonii
+>daubentonii : unknown
 >arboreus : daubentonii.arboreus<T0, T1>
->gabriellae : gabriellae
+>gabriellae : unknown
 >amicus : gabriellae.amicus
->dogramacii : dogramacii
+>dogramacii : unknown
 >kaiseri : dogramacii.kaiseri
 >() => { var y = this; } : () => void
 >y : linulus<T0, T1>
@@ -6903,10 +6903,10 @@ module panamensis {
 
         taki(): patas.uralensis { var x: patas.uralensis; () => { var y = this; }; return x; }
 >taki : () => patas.uralensis
->patas : patas
+>patas : unknown
 >uralensis : patas.uralensis
 >x : patas.uralensis
->patas : patas
+>patas : unknown
 >uralensis : patas.uralensis
 >() => { var y = this; } : () => void
 >y : linulus<T0, T1>
@@ -6915,26 +6915,26 @@ 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 : rendalli
+>rendalli : unknown
 >moojeni : rendalli.moojeni<T0, T1>
->argurus : argurus
+>argurus : unknown
 >netscheri : argurus.netscheri<T0, T1>
->dogramacii : dogramacii
+>dogramacii : unknown
 >aurata : dogramacii.aurata
->dogramacii : dogramacii
+>dogramacii : unknown
 >aurata : dogramacii.aurata
->lavali : lavali
+>lavali : unknown
 >beisa : lavali.beisa
 >x : rendalli.moojeni<argurus.netscheri<dogramacii.aurata, dogramacii.aurata>, lavali.beisa>
->rendalli : rendalli
+>rendalli : unknown
 >moojeni : rendalli.moojeni<T0, T1>
->argurus : argurus
+>argurus : unknown
 >netscheri : argurus.netscheri<T0, T1>
->dogramacii : dogramacii
+>dogramacii : unknown
 >aurata : dogramacii.aurata
->dogramacii : dogramacii
+>dogramacii : unknown
 >aurata : dogramacii.aurata
->lavali : lavali
+>lavali : unknown
 >beisa : lavali.beisa
 >() => { var y = this; } : () => void
 >y : linulus<T0, T1>
@@ -6943,10 +6943,10 @@ module panamensis {
 
         rufinus(): macrorhinos.konganensis { var x: macrorhinos.konganensis; () => { var y = this; }; return x; }
 >rufinus : () => macrorhinos.konganensis
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >konganensis : macrorhinos.konganensis
 >x : macrorhinos.konganensis
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >konganensis : macrorhinos.konganensis
 >() => { var y = this; } : () => void
 >y : linulus<T0, T1>
@@ -6955,18 +6955,18 @@ 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 : nigra
+>nigra : unknown
 >thalia : nigra.thalia<T0, T1>
->patas : patas
+>patas : unknown
 >uralensis : patas.uralensis
->dogramacii : dogramacii
+>dogramacii : unknown
 >robustulus : dogramacii.robustulus
 >x : nigra.thalia<patas.uralensis, dogramacii.robustulus>
->nigra : nigra
+>nigra : unknown
 >thalia : nigra.thalia<T0, T1>
->patas : patas
+>patas : unknown
 >uralensis : patas.uralensis
->dogramacii : dogramacii
+>dogramacii : unknown
 >robustulus : dogramacii.robustulus
 >() => { var y = this; } : () => void
 >y : linulus<T0, T1>
@@ -6975,10 +6975,10 @@ module panamensis {
 
         regina(): trivirgatus.oconnelli { var x: trivirgatus.oconnelli; () => { var y = this; }; return x; }
 >regina : () => trivirgatus.oconnelli
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >oconnelli : trivirgatus.oconnelli
 >x : trivirgatus.oconnelli
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >oconnelli : trivirgatus.oconnelli
 >() => { var y = this; } : () => void
 >y : linulus<T0, T1>
@@ -6987,18 +6987,18 @@ 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 : dammermani
+>dammermani : unknown
 >siberu : dammermani.siberu<T0, T1>
->lavali : lavali
+>lavali : unknown
 >xanthognathus : lavali.xanthognathus
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >oconnelli : trivirgatus.oconnelli
 >x : dammermani.siberu<lavali.xanthognathus, trivirgatus.oconnelli>
->dammermani : dammermani
+>dammermani : unknown
 >siberu : dammermani.siberu<T0, T1>
->lavali : lavali
+>lavali : unknown
 >xanthognathus : lavali.xanthognathus
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >oconnelli : trivirgatus.oconnelli
 >() => { var y = this; } : () => void
 >y : linulus<T0, T1>
@@ -7007,18 +7007,18 @@ 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 : petrophilus
+>petrophilus : unknown
 >sodyi : petrophilus.sodyi<T0, T1>
->dogramacii : dogramacii
+>dogramacii : unknown
 >aurata : dogramacii.aurata
->argurus : argurus
+>argurus : unknown
 >oreas : argurus.oreas
 >x : petrophilus.sodyi<dogramacii.aurata, argurus.oreas>
->petrophilus : petrophilus
+>petrophilus : unknown
 >sodyi : petrophilus.sodyi<T0, T1>
->dogramacii : dogramacii
+>dogramacii : unknown
 >aurata : dogramacii.aurata
->argurus : argurus
+>argurus : unknown
 >oreas : argurus.oreas
 >() => { var y = this; } : () => void
 >y : linulus<T0, T1>
@@ -7027,26 +7027,26 @@ 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 : rionegrensis
+>rionegrensis : unknown
 >veraecrucis : rionegrensis.veraecrucis<T0, T1>
->caurinus : caurinus
+>caurinus : unknown
 >psilurus : caurinus.psilurus
->minutus : minutus
+>minutus : unknown
 >inez : minutus.inez<T0, T1>
->rendalli : rendalli
+>rendalli : unknown
 >zuluensis : rendalli.zuluensis
->rionegrensis : rionegrensis
+>rionegrensis : unknown
 >caniventer : rionegrensis.caniventer
 >x : rionegrensis.veraecrucis<caurinus.psilurus, minutus.inez<rendalli.zuluensis, rionegrensis.caniventer>>
->rionegrensis : rionegrensis
+>rionegrensis : unknown
 >veraecrucis : rionegrensis.veraecrucis<T0, T1>
->caurinus : caurinus
+>caurinus : unknown
 >psilurus : caurinus.psilurus
->minutus : minutus
+>minutus : unknown
 >inez : minutus.inez<T0, T1>
->rendalli : rendalli
+>rendalli : unknown
 >zuluensis : rendalli.zuluensis
->rionegrensis : rionegrensis
+>rionegrensis : unknown
 >caniventer : rionegrensis.caniventer
 >() => { var y = this; } : () => void
 >y : linulus<T0, T1>
@@ -7055,7 +7055,7 @@ module panamensis {
     }
 }
 module nigra {
->nigra : nigra
+>nigra : typeof nigra
 
     export class gracilis<T0, T1> {
 >gracilis : gracilis<T0, T1>
@@ -7064,18 +7064,18 @@ module nigra {
 
         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 : nigra
+>nigra : unknown
 >dolichurus : dolichurus<T0, T1>
->dogramacii : dogramacii
+>dogramacii : unknown
 >aurata : dogramacii.aurata
->julianae : julianae
+>julianae : unknown
 >steerii : julianae.steerii
 >x : dolichurus<dogramacii.aurata, julianae.steerii>
->nigra : nigra
+>nigra : unknown
 >dolichurus : dolichurus<T0, T1>
->dogramacii : dogramacii
+>dogramacii : unknown
 >aurata : dogramacii.aurata
->julianae : julianae
+>julianae : unknown
 >steerii : julianae.steerii
 >() => { var y = this; } : () => void
 >y : gracilis<T0, T1>
@@ -7084,26 +7084,26 @@ 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 : Lanthanum
+>Lanthanum : unknown
 >nitidus : Lanthanum.nitidus<T0, T1>
->panglima : panglima
+>panglima : unknown
 >amphibius : panglima.amphibius<T0, T1>
->caurinus : caurinus
+>caurinus : unknown
 >megaphyllus : caurinus.megaphyllus
->lavali : lavali
+>lavali : unknown
 >lepturus : lavali.lepturus
->argurus : argurus
+>argurus : unknown
 >oreas : argurus.oreas
 >x : Lanthanum.nitidus<panglima.amphibius<caurinus.megaphyllus, lavali.lepturus>, argurus.oreas>
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >nitidus : Lanthanum.nitidus<T0, T1>
->panglima : panglima
+>panglima : unknown
 >amphibius : panglima.amphibius<T0, T1>
->caurinus : caurinus
+>caurinus : unknown
 >megaphyllus : caurinus.megaphyllus
->lavali : lavali
+>lavali : unknown
 >lepturus : lavali.lepturus
->argurus : argurus
+>argurus : unknown
 >oreas : argurus.oreas
 >() => { var y = this; } : () => void
 >y : gracilis<T0, T1>
@@ -7112,10 +7112,10 @@ module nigra {
 
         garridoi(): dogramacii.koepckeae { var x: dogramacii.koepckeae; () => { var y = this; }; return x; }
 >garridoi : () => dogramacii.koepckeae
->dogramacii : dogramacii
+>dogramacii : unknown
 >koepckeae : dogramacii.koepckeae
 >x : dogramacii.koepckeae
->dogramacii : dogramacii
+>dogramacii : unknown
 >koepckeae : dogramacii.koepckeae
 >() => { var y = this; } : () => void
 >y : gracilis<T0, T1>
@@ -7124,34 +7124,34 @@ 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 : nigra
+>nigra : unknown
 >gracilis : gracilis<T0, T1>
->argurus : argurus
+>argurus : unknown
 >dauricus : argurus.dauricus<T0, T1>
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >konganensis : macrorhinos.konganensis
->patas : patas
+>patas : unknown
 >uralensis : patas.uralensis
->nigra : nigra
+>nigra : unknown
 >thalia : thalia<T0, T1>
->patas : patas
+>patas : unknown
 >uralensis : patas.uralensis
->julianae : julianae
+>julianae : unknown
 >galapagoensis : julianae.galapagoensis
 >x : gracilis<argurus.dauricus<macrorhinos.konganensis, patas.uralensis>, thalia<patas.uralensis, julianae.galapagoensis>>
->nigra : nigra
+>nigra : unknown
 >gracilis : gracilis<T0, T1>
->argurus : argurus
+>argurus : unknown
 >dauricus : argurus.dauricus<T0, T1>
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >konganensis : macrorhinos.konganensis
->patas : patas
+>patas : unknown
 >uralensis : patas.uralensis
->nigra : nigra
+>nigra : unknown
 >thalia : thalia<T0, T1>
->patas : patas
+>patas : unknown
 >uralensis : patas.uralensis
->julianae : julianae
+>julianae : unknown
 >galapagoensis : julianae.galapagoensis
 >() => { var y = this; } : () => void
 >y : gracilis<T0, T1>
@@ -7160,10 +7160,10 @@ module nigra {
 
         aurita(): sagitta.stolzmanni { var x: sagitta.stolzmanni; () => { var y = this; }; return x; }
 >aurita : () => sagitta.stolzmanni
->sagitta : sagitta
+>sagitta : unknown
 >stolzmanni : sagitta.stolzmanni
 >x : sagitta.stolzmanni
->sagitta : sagitta
+>sagitta : unknown
 >stolzmanni : sagitta.stolzmanni
 >() => { var y = this; } : () => void
 >y : gracilis<T0, T1>
@@ -7172,10 +7172,10 @@ module nigra {
 
         geoffrensis(): rionegrensis.caniventer { var x: rionegrensis.caniventer; () => { var y = this; }; return x; }
 >geoffrensis : () => rionegrensis.caniventer
->rionegrensis : rionegrensis
+>rionegrensis : unknown
 >caniventer : rionegrensis.caniventer
 >x : rionegrensis.caniventer
->rionegrensis : rionegrensis
+>rionegrensis : unknown
 >caniventer : rionegrensis.caniventer
 >() => { var y = this; } : () => void
 >y : gracilis<T0, T1>
@@ -7184,42 +7184,42 @@ 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 : macrorhinos
+>macrorhinos : unknown
 >marmosurus : macrorhinos.marmosurus<T0, T1>
->argurus : argurus
+>argurus : unknown
 >netscheri : argurus.netscheri<T0, T1>
->dammermani : dammermani
+>dammermani : unknown
 >siberu : dammermani.siberu<T0, T1>
->lutreolus : lutreolus
+>lutreolus : unknown
 >foina : lutreolus.foina
->samarensis : samarensis
+>samarensis : unknown
 >pallidus : samarensis.pallidus
->argurus : argurus
+>argurus : unknown
 >luctuosa : argurus.luctuosa
->nigra : nigra
+>nigra : unknown
 >dolichurus : dolichurus<T0, T1>
->lavali : lavali
+>lavali : unknown
 >lepturus : lavali.lepturus
->samarensis : samarensis
+>samarensis : unknown
 >pallidus : samarensis.pallidus
 >x : macrorhinos.marmosurus<argurus.netscheri<dammermani.siberu<lutreolus.foina, samarensis.pallidus>, argurus.luctuosa>, dolichurus<lavali.lepturus, samarensis.pallidus>>
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >marmosurus : macrorhinos.marmosurus<T0, T1>
->argurus : argurus
+>argurus : unknown
 >netscheri : argurus.netscheri<T0, T1>
->dammermani : dammermani
+>dammermani : unknown
 >siberu : dammermani.siberu<T0, T1>
->lutreolus : lutreolus
+>lutreolus : unknown
 >foina : lutreolus.foina
->samarensis : samarensis
+>samarensis : unknown
 >pallidus : samarensis.pallidus
->argurus : argurus
+>argurus : unknown
 >luctuosa : argurus.luctuosa
->nigra : nigra
+>nigra : unknown
 >dolichurus : dolichurus<T0, T1>
->lavali : lavali
+>lavali : unknown
 >lepturus : lavali.lepturus
->samarensis : samarensis
+>samarensis : unknown
 >pallidus : samarensis.pallidus
 >() => { var y = this; } : () => void
 >y : gracilis<T0, T1>
@@ -7228,26 +7228,26 @@ 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 : julianae
+>julianae : unknown
 >albidens : julianae.albidens<T0, T1>
->dammermani : dammermani
+>dammermani : unknown
 >siberu : dammermani.siberu<T0, T1>
->lutreolus : lutreolus
+>lutreolus : unknown
 >foina : lutreolus.foina
->samarensis : samarensis
+>samarensis : unknown
 >pallidus : samarensis.pallidus
->julianae : julianae
+>julianae : unknown
 >sumatrana : julianae.sumatrana
 >x : julianae.albidens<dammermani.siberu<lutreolus.foina, samarensis.pallidus>, julianae.sumatrana>
->julianae : julianae
+>julianae : unknown
 >albidens : julianae.albidens<T0, T1>
->dammermani : dammermani
+>dammermani : unknown
 >siberu : dammermani.siberu<T0, T1>
->lutreolus : lutreolus
+>lutreolus : unknown
 >foina : lutreolus.foina
->samarensis : samarensis
+>samarensis : unknown
 >pallidus : samarensis.pallidus
->julianae : julianae
+>julianae : unknown
 >sumatrana : julianae.sumatrana
 >() => { var y = this; } : () => void
 >y : gracilis<T0, T1>
@@ -7256,10 +7256,10 @@ module nigra {
 
         dubiaquercus(): dogramacii.robustulus { var x: dogramacii.robustulus; () => { var y = this; }; return x; }
 >dubiaquercus : () => dogramacii.robustulus
->dogramacii : dogramacii
+>dogramacii : unknown
 >robustulus : dogramacii.robustulus
 >x : dogramacii.robustulus
->dogramacii : dogramacii
+>dogramacii : unknown
 >robustulus : dogramacii.robustulus
 >() => { var y = this; } : () => void
 >y : gracilis<T0, T1>
@@ -7268,10 +7268,10 @@ module nigra {
 
         pectoralis(): julianae.sumatrana { var x: julianae.sumatrana; () => { var y = this; }; return x; }
 >pectoralis : () => julianae.sumatrana
->julianae : julianae
+>julianae : unknown
 >sumatrana : julianae.sumatrana
 >x : julianae.sumatrana
->julianae : julianae
+>julianae : unknown
 >sumatrana : julianae.sumatrana
 >() => { var y = this; } : () => void
 >y : gracilis<T0, T1>
@@ -7280,10 +7280,10 @@ module nigra {
 
         apoensis(): caurinus.megaphyllus { var x: caurinus.megaphyllus; () => { var y = this; }; return x; }
 >apoensis : () => caurinus.megaphyllus
->caurinus : caurinus
+>caurinus : unknown
 >megaphyllus : caurinus.megaphyllus
 >x : caurinus.megaphyllus
->caurinus : caurinus
+>caurinus : unknown
 >megaphyllus : caurinus.megaphyllus
 >() => { var y = this; } : () => void
 >y : gracilis<T0, T1>
@@ -7292,10 +7292,10 @@ module nigra {
 
         grisescens(): Lanthanum.jugularis { var x: Lanthanum.jugularis; () => { var y = this; }; return x; }
 >grisescens : () => Lanthanum.jugularis
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >jugularis : Lanthanum.jugularis
 >x : Lanthanum.jugularis
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >jugularis : Lanthanum.jugularis
 >() => { var y = this; } : () => void
 >y : gracilis<T0, T1>
@@ -7304,18 +7304,18 @@ 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 : panglima
+>panglima : unknown
 >amphibius : panglima.amphibius<T0, T1>
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >falconeri : trivirgatus.falconeri
->gabriellae : gabriellae
+>gabriellae : unknown
 >echinatus : gabriellae.echinatus
 >x : panglima.amphibius<trivirgatus.falconeri, gabriellae.echinatus>
->panglima : panglima
+>panglima : unknown
 >amphibius : panglima.amphibius<T0, T1>
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >falconeri : trivirgatus.falconeri
->gabriellae : gabriellae
+>gabriellae : unknown
 >echinatus : gabriellae.echinatus
 >() => { var y = this; } : () => void
 >y : gracilis<T0, T1>
@@ -7324,29 +7324,29 @@ module nigra {
     }
 }
 module samarensis {
->samarensis : samarensis
+>samarensis : typeof samarensis
 
     export class pelurus<T0, T1> extends sagitta.stolzmanni {
 >pelurus : pelurus<T0, T1>
 >T0 : T0
 >T1 : T1
->sagitta : sagitta
+>sagitta : unknown
 >stolzmanni : sagitta.stolzmanni
 
         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 : panamensis
+>panamensis : unknown
 >linulus : panamensis.linulus<T0, T1>
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >konganensis : macrorhinos.konganensis
->rionegrensis : rionegrensis
+>rionegrensis : unknown
 >caniventer : rionegrensis.caniventer
 >x : panamensis.linulus<macrorhinos.konganensis, rionegrensis.caniventer>
->panamensis : panamensis
+>panamensis : unknown
 >linulus : panamensis.linulus<T0, T1>
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >konganensis : macrorhinos.konganensis
->rionegrensis : rionegrensis
+>rionegrensis : unknown
 >caniventer : rionegrensis.caniventer
 >() => { var y = this; } : () => void
 >y : pelurus<T0, T1>
@@ -7355,34 +7355,34 @@ 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 : argurus
+>argurus : unknown
 >netscheri : argurus.netscheri<T0, T1>
->minutus : minutus
+>minutus : unknown
 >inez : minutus.inez<T0, T1>
->argurus : argurus
+>argurus : unknown
 >peninsulae : argurus.peninsulae
->julianae : julianae
+>julianae : unknown
 >nudicaudus : julianae.nudicaudus
->julianae : julianae
+>julianae : unknown
 >oralis : julianae.oralis<T0, T1>
->lavali : lavali
+>lavali : unknown
 >xanthognathus : lavali.xanthognathus
->argurus : argurus
+>argurus : unknown
 >oreas : argurus.oreas
 >x : argurus.netscheri<minutus.inez<argurus.peninsulae, julianae.nudicaudus>, julianae.oralis<lavali.xanthognathus, argurus.oreas>>
->argurus : argurus
+>argurus : unknown
 >netscheri : argurus.netscheri<T0, T1>
->minutus : minutus
+>minutus : unknown
 >inez : minutus.inez<T0, T1>
->argurus : argurus
+>argurus : unknown
 >peninsulae : argurus.peninsulae
->julianae : julianae
+>julianae : unknown
 >nudicaudus : julianae.nudicaudus
->julianae : julianae
+>julianae : unknown
 >oralis : julianae.oralis<T0, T1>
->lavali : lavali
+>lavali : unknown
 >xanthognathus : lavali.xanthognathus
->argurus : argurus
+>argurus : unknown
 >oreas : argurus.oreas
 >() => { var y = this; } : () => void
 >y : pelurus<T0, T1>
@@ -7391,18 +7391,18 @@ 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 : argurus
+>argurus : unknown
 >pygmaea : argurus.pygmaea<T0, T1>
->julianae : julianae
+>julianae : unknown
 >galapagoensis : julianae.galapagoensis
->provocax : provocax
+>provocax : unknown
 >melanoleuca : provocax.melanoleuca
 >x : argurus.pygmaea<julianae.galapagoensis, provocax.melanoleuca>
->argurus : argurus
+>argurus : unknown
 >pygmaea : argurus.pygmaea<T0, T1>
->julianae : julianae
+>julianae : unknown
 >galapagoensis : julianae.galapagoensis
->provocax : provocax
+>provocax : unknown
 >melanoleuca : provocax.melanoleuca
 >() => { var y = this; } : () => void
 >y : pelurus<T0, T1>
@@ -7411,10 +7411,10 @@ module samarensis {
 
         nigriceps(): lutreolus.punicus { var x: lutreolus.punicus; () => { var y = this; }; return x; }
 >nigriceps : () => lutreolus.punicus
->lutreolus : lutreolus
+>lutreolus : unknown
 >punicus : lutreolus.punicus
 >x : lutreolus.punicus
->lutreolus : lutreolus
+>lutreolus : unknown
 >punicus : lutreolus.punicus
 >() => { var y = this; } : () => void
 >y : pelurus<T0, T1>
@@ -7424,15 +7424,15 @@ 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 : Lanthanum
+>Lanthanum : unknown
 >jugularis : Lanthanum.jugularis
->sagitta : sagitta
+>sagitta : unknown
 >walkeri : sagitta.walkeri
 >x : pelurus<Lanthanum.jugularis, sagitta.walkeri>
 >pelurus : pelurus<T0, T1>
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >jugularis : Lanthanum.jugularis
->sagitta : sagitta
+>sagitta : unknown
 >walkeri : sagitta.walkeri
 >() => { var y = this; } : () => void
 >y : pelurus<T0, T1>
@@ -7441,10 +7441,10 @@ module samarensis {
 
         madurae(): rionegrensis.caniventer { var x: rionegrensis.caniventer; () => { var y = this; }; return x; }
 >madurae : () => rionegrensis.caniventer
->rionegrensis : rionegrensis
+>rionegrensis : unknown
 >caniventer : rionegrensis.caniventer
 >x : rionegrensis.caniventer
->rionegrensis : rionegrensis
+>rionegrensis : unknown
 >caniventer : rionegrensis.caniventer
 >() => { var y = this; } : () => void
 >y : pelurus<T0, T1>
@@ -7453,10 +7453,10 @@ module samarensis {
 
         chinchilla(): macrorhinos.daphaenodon { var x: macrorhinos.daphaenodon; () => { var y = this; }; return x; }
 >chinchilla : () => macrorhinos.daphaenodon
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >daphaenodon : macrorhinos.daphaenodon
 >x : macrorhinos.daphaenodon
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >daphaenodon : macrorhinos.daphaenodon
 >() => { var y = this; } : () => void
 >y : pelurus<T0, T1>
@@ -7465,18 +7465,18 @@ 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 : petrophilus
+>petrophilus : unknown
 >rosalia : petrophilus.rosalia<T0, T1>
->julianae : julianae
+>julianae : unknown
 >steerii : julianae.steerii
->lavali : lavali
+>lavali : unknown
 >beisa : lavali.beisa
 >x : petrophilus.rosalia<julianae.steerii, lavali.beisa>
->petrophilus : petrophilus
+>petrophilus : unknown
 >rosalia : petrophilus.rosalia<T0, T1>
->julianae : julianae
+>julianae : unknown
 >steerii : julianae.steerii
->lavali : lavali
+>lavali : unknown
 >beisa : lavali.beisa
 >() => { var y = this; } : () => void
 >y : pelurus<T0, T1>
@@ -7485,18 +7485,18 @@ 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 : panamensis
+>panamensis : unknown
 >setulosus : panamensis.setulosus<T0, T1>
->gabriellae : gabriellae
+>gabriellae : unknown
 >echinatus : gabriellae.echinatus
->julianae : julianae
+>julianae : unknown
 >steerii : julianae.steerii
 >x : panamensis.setulosus<gabriellae.echinatus, julianae.steerii>
->panamensis : panamensis
+>panamensis : unknown
 >setulosus : panamensis.setulosus<T0, T1>
->gabriellae : gabriellae
+>gabriellae : unknown
 >echinatus : gabriellae.echinatus
->julianae : julianae
+>julianae : unknown
 >steerii : julianae.steerii
 >() => { var y = this; } : () => void
 >y : pelurus<T0, T1>
@@ -7505,26 +7505,26 @@ 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 : quasiater
+>quasiater : unknown
 >wattsi : quasiater.wattsi<T0, T1>
->julianae : julianae
+>julianae : unknown
 >galapagoensis : julianae.galapagoensis
->panamensis : panamensis
+>panamensis : unknown
 >linulus : panamensis.linulus<T0, T1>
->lavali : lavali
+>lavali : unknown
 >xanthognathus : lavali.xanthognathus
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >konganensis : macrorhinos.konganensis
 >x : quasiater.wattsi<julianae.galapagoensis, panamensis.linulus<lavali.xanthognathus, macrorhinos.konganensis>>
->quasiater : quasiater
+>quasiater : unknown
 >wattsi : quasiater.wattsi<T0, T1>
->julianae : julianae
+>julianae : unknown
 >galapagoensis : julianae.galapagoensis
->panamensis : panamensis
+>panamensis : unknown
 >linulus : panamensis.linulus<T0, T1>
->lavali : lavali
+>lavali : unknown
 >xanthognathus : lavali.xanthognathus
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >konganensis : macrorhinos.konganensis
 >() => { var y = this; } : () => void
 >y : pelurus<T0, T1>
@@ -7533,10 +7533,10 @@ module samarensis {
 
         petteri(): dogramacii.kaiseri { var x: dogramacii.kaiseri; () => { var y = this; }; return x; }
 >petteri : () => dogramacii.kaiseri
->dogramacii : dogramacii
+>dogramacii : unknown
 >kaiseri : dogramacii.kaiseri
 >x : dogramacii.kaiseri
->dogramacii : dogramacii
+>dogramacii : unknown
 >kaiseri : dogramacii.kaiseri
 >() => { var y = this; } : () => void
 >y : pelurus<T0, T1>
@@ -7545,18 +7545,18 @@ 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 : panglima
+>panglima : unknown
 >amphibius : panglima.amphibius<T0, T1>
->lavali : lavali
+>lavali : unknown
 >lepturus : lavali.lepturus
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
 >x : panglima.amphibius<lavali.lepturus, quasiater.carolinensis>
->panglima : panglima
+>panglima : unknown
 >amphibius : panglima.amphibius<T0, T1>
->lavali : lavali
+>lavali : unknown
 >lepturus : lavali.lepturus
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
 >() => { var y = this; } : () => void
 >y : pelurus<T0, T1>
@@ -7565,18 +7565,18 @@ 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 : rionegrensis
+>rionegrensis : unknown
 >veraecrucis : rionegrensis.veraecrucis<T0, T1>
->lavali : lavali
+>lavali : unknown
 >xanthognathus : lavali.xanthognathus
->quasiater : quasiater
+>quasiater : unknown
 >bobrinskoi : quasiater.bobrinskoi
 >x : rionegrensis.veraecrucis<lavali.xanthognathus, quasiater.bobrinskoi>
->rionegrensis : rionegrensis
+>rionegrensis : unknown
 >veraecrucis : rionegrensis.veraecrucis<T0, T1>
->lavali : lavali
+>lavali : unknown
 >xanthognathus : lavali.xanthognathus
->quasiater : quasiater
+>quasiater : unknown
 >bobrinskoi : quasiater.bobrinskoi
 >() => { var y = this; } : () => void
 >y : pelurus<T0, T1>
@@ -7587,23 +7587,23 @@ module samarensis {
 >fuscus : fuscus<T0, T1>
 >T0 : T0
 >T1 : T1
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >daphaenodon : macrorhinos.daphaenodon
 
         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 : nigra
+>nigra : unknown
 >gracilis : nigra.gracilis<T0, T1>
->julianae : julianae
+>julianae : unknown
 >nudicaudus : julianae.nudicaudus
->dogramacii : dogramacii
+>dogramacii : unknown
 >aurata : dogramacii.aurata
 >x : nigra.gracilis<julianae.nudicaudus, dogramacii.aurata>
->nigra : nigra
+>nigra : unknown
 >gracilis : nigra.gracilis<T0, T1>
->julianae : julianae
+>julianae : unknown
 >nudicaudus : julianae.nudicaudus
->dogramacii : dogramacii
+>dogramacii : unknown
 >aurata : dogramacii.aurata
 >() => { var y = this; } : () => void
 >y : fuscus<T0, T1>
@@ -7612,10 +7612,10 @@ module samarensis {
 
         badia(): julianae.sumatrana { var x: julianae.sumatrana; () => { var y = this; }; return x; }
 >badia : () => julianae.sumatrana
->julianae : julianae
+>julianae : unknown
 >sumatrana : julianae.sumatrana
 >x : julianae.sumatrana
->julianae : julianae
+>julianae : unknown
 >sumatrana : julianae.sumatrana
 >() => { var y = this; } : () => void
 >y : fuscus<T0, T1>
@@ -7624,10 +7624,10 @@ module samarensis {
 
         prymnolopha(): sagitta.walkeri { var x: sagitta.walkeri; () => { var y = this; }; return x; }
 >prymnolopha : () => sagitta.walkeri
->sagitta : sagitta
+>sagitta : unknown
 >walkeri : sagitta.walkeri
 >x : sagitta.walkeri
->sagitta : sagitta
+>sagitta : unknown
 >walkeri : sagitta.walkeri
 >() => { var y = this; } : () => void
 >y : fuscus<T0, T1>
@@ -7636,10 +7636,10 @@ module samarensis {
 
         natalensis(): trivirgatus.falconeri { var x: trivirgatus.falconeri; () => { var y = this; }; return x; }
 >natalensis : () => trivirgatus.falconeri
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >falconeri : trivirgatus.falconeri
 >x : trivirgatus.falconeri
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >falconeri : trivirgatus.falconeri
 >() => { var y = this; } : () => void
 >y : fuscus<T0, T1>
@@ -7648,10 +7648,10 @@ module samarensis {
 
         hunteri(): julianae.durangae { var x: julianae.durangae; () => { var y = this; }; return x; }
 >hunteri : () => julianae.durangae
->julianae : julianae
+>julianae : unknown
 >durangae : julianae.durangae
 >x : julianae.durangae
->julianae : julianae
+>julianae : unknown
 >durangae : julianae.durangae
 >() => { var y = this; } : () => void
 >y : fuscus<T0, T1>
@@ -7670,18 +7670,18 @@ 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 : panamensis
+>panamensis : unknown
 >setulosus : panamensis.setulosus<T0, T1>
->dogramacii : dogramacii
+>dogramacii : unknown
 >koepckeae : dogramacii.koepckeae
->julianae : julianae
+>julianae : unknown
 >sumatrana : julianae.sumatrana
 >x : panamensis.setulosus<dogramacii.koepckeae, julianae.sumatrana>
->panamensis : panamensis
+>panamensis : unknown
 >setulosus : panamensis.setulosus<T0, T1>
->dogramacii : dogramacii
+>dogramacii : unknown
 >koepckeae : dogramacii.koepckeae
->julianae : julianae
+>julianae : unknown
 >sumatrana : julianae.sumatrana
 >() => { var y = this; } : () => void
 >y : fuscus<T0, T1>
@@ -7690,10 +7690,10 @@ module samarensis {
 
         nimbae(): lutreolus.punicus { var x: lutreolus.punicus; () => { var y = this; }; return x; }
 >nimbae : () => lutreolus.punicus
->lutreolus : lutreolus
+>lutreolus : unknown
 >punicus : lutreolus.punicus
 >x : lutreolus.punicus
->lutreolus : lutreolus
+>lutreolus : unknown
 >punicus : lutreolus.punicus
 >() => { var y = this; } : () => void
 >y : fuscus<T0, T1>
@@ -7702,18 +7702,18 @@ 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 : daubentonii
+>daubentonii : unknown
 >nigricans : daubentonii.nigricans<T0, T1>
->dammermani : dammermani
+>dammermani : unknown
 >melanops : dammermani.melanops
->imperfecta : imperfecta
+>imperfecta : unknown
 >subspinosus : imperfecta.subspinosus
 >x : daubentonii.nigricans<dammermani.melanops, imperfecta.subspinosus>
->daubentonii : daubentonii
+>daubentonii : unknown
 >nigricans : daubentonii.nigricans<T0, T1>
->dammermani : dammermani
+>dammermani : unknown
 >melanops : dammermani.melanops
->imperfecta : imperfecta
+>imperfecta : unknown
 >subspinosus : imperfecta.subspinosus
 >() => { var y = this; } : () => void
 >y : fuscus<T0, T1>
@@ -7722,10 +7722,10 @@ module samarensis {
 
         jagorii(): julianae.galapagoensis { var x: julianae.galapagoensis; () => { var y = this; }; return x; }
 >jagorii : () => julianae.galapagoensis
->julianae : julianae
+>julianae : unknown
 >galapagoensis : julianae.galapagoensis
 >x : julianae.galapagoensis
->julianae : julianae
+>julianae : unknown
 >galapagoensis : julianae.galapagoensis
 >() => { var y = this; } : () => void
 >y : fuscus<T0, T1>
@@ -7734,10 +7734,10 @@ module samarensis {
 
         beecrofti(): sagitta.stolzmanni { var x: sagitta.stolzmanni; () => { var y = this; }; return x; }
 >beecrofti : () => sagitta.stolzmanni
->sagitta : sagitta
+>sagitta : unknown
 >stolzmanni : sagitta.stolzmanni
 >x : sagitta.stolzmanni
->sagitta : sagitta
+>sagitta : unknown
 >stolzmanni : sagitta.stolzmanni
 >() => { var y = this; } : () => void
 >y : fuscus<T0, T1>
@@ -7746,50 +7746,50 @@ 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 : minutus
+>minutus : unknown
 >inez : minutus.inez<T0, T1>
->julianae : julianae
+>julianae : unknown
 >gerbillus : julianae.gerbillus<T0, T1>
->minutus : minutus
+>minutus : unknown
 >inez : minutus.inez<T0, T1>
->rendalli : rendalli
+>rendalli : unknown
 >moojeni : rendalli.moojeni<T0, T1>
->panglima : panglima
+>panglima : unknown
 >amphibius : panglima.amphibius<T0, T1>
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >falconeri : trivirgatus.falconeri
->caurinus : caurinus
+>caurinus : unknown
 >psilurus : caurinus.psilurus
->gabriellae : gabriellae
+>gabriellae : unknown
 >echinatus : gabriellae.echinatus
->dogramacii : dogramacii
+>dogramacii : unknown
 >aurata : dogramacii.aurata
->lavali : lavali
+>lavali : unknown
 >otion : lavali.otion
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >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 : minutus
+>minutus : unknown
 >inez : minutus.inez<T0, T1>
->julianae : julianae
+>julianae : unknown
 >gerbillus : julianae.gerbillus<T0, T1>
->minutus : minutus
+>minutus : unknown
 >inez : minutus.inez<T0, T1>
->rendalli : rendalli
+>rendalli : unknown
 >moojeni : rendalli.moojeni<T0, T1>
->panglima : panglima
+>panglima : unknown
 >amphibius : panglima.amphibius<T0, T1>
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >falconeri : trivirgatus.falconeri
->caurinus : caurinus
+>caurinus : unknown
 >psilurus : caurinus.psilurus
->gabriellae : gabriellae
+>gabriellae : unknown
 >echinatus : gabriellae.echinatus
->dogramacii : dogramacii
+>dogramacii : unknown
 >aurata : dogramacii.aurata
->lavali : lavali
+>lavali : unknown
 >otion : lavali.otion
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >konganensis : macrorhinos.konganensis
 >() => { var y = this; } : () => void
 >y : fuscus<T0, T1>
@@ -7798,10 +7798,10 @@ module samarensis {
 
         colocolo(): quasiater.bobrinskoi { var x: quasiater.bobrinskoi; () => { var y = this; }; return x; }
 >colocolo : () => quasiater.bobrinskoi
->quasiater : quasiater
+>quasiater : unknown
 >bobrinskoi : quasiater.bobrinskoi
 >x : quasiater.bobrinskoi
->quasiater : quasiater
+>quasiater : unknown
 >bobrinskoi : quasiater.bobrinskoi
 >() => { var y = this; } : () => void
 >y : fuscus<T0, T1>
@@ -7810,26 +7810,26 @@ 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 : petrophilus
+>petrophilus : unknown
 >rosalia : petrophilus.rosalia<T0, T1>
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >megalonyx : Lanthanum.megalonyx
->panglima : panglima
+>panglima : unknown
 >abidi : panglima.abidi<T0, T1>
->dogramacii : dogramacii
+>dogramacii : unknown
 >kaiseri : dogramacii.kaiseri
->lavali : lavali
+>lavali : unknown
 >wilsoni : lavali.wilsoni
 >x : petrophilus.rosalia<Lanthanum.megalonyx, panglima.abidi<dogramacii.kaiseri, lavali.wilsoni>>
->petrophilus : petrophilus
+>petrophilus : unknown
 >rosalia : petrophilus.rosalia<T0, T1>
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >megalonyx : Lanthanum.megalonyx
->panglima : panglima
+>panglima : unknown
 >abidi : panglima.abidi<T0, T1>
->dogramacii : dogramacii
+>dogramacii : unknown
 >kaiseri : dogramacii.kaiseri
->lavali : lavali
+>lavali : unknown
 >wilsoni : lavali.wilsoni
 >() => { var y = this; } : () => void
 >y : fuscus<T0, T1>
@@ -7841,10 +7841,10 @@ module samarensis {
 
         oblativa(): trivirgatus.falconeri { var x: trivirgatus.falconeri; () => { var y = this; }; return x; }
 >oblativa : () => trivirgatus.falconeri
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >falconeri : trivirgatus.falconeri
 >x : trivirgatus.falconeri
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >falconeri : trivirgatus.falconeri
 >() => { var y = this; } : () => void
 >y : pallidus
@@ -7853,10 +7853,10 @@ module samarensis {
 
         watersi(): lavali.wilsoni { var x: lavali.wilsoni; () => { var y = this; }; return x; }
 >watersi : () => lavali.wilsoni
->lavali : lavali
+>lavali : unknown
 >wilsoni : lavali.wilsoni
 >x : lavali.wilsoni
->lavali : lavali
+>lavali : unknown
 >wilsoni : lavali.wilsoni
 >() => { var y = this; } : () => void
 >y : pallidus
@@ -7865,42 +7865,42 @@ 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 : sagitta
+>sagitta : unknown
 >cinereus : sagitta.cinereus<T0, T1>
->nigra : nigra
+>nigra : unknown
 >caucasica : nigra.caucasica<T0, T1>
->julianae : julianae
+>julianae : unknown
 >sumatrana : julianae.sumatrana
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >oconnelli : trivirgatus.oconnelli
->quasiater : quasiater
+>quasiater : unknown
 >wattsi : quasiater.wattsi<T0, T1>
->julianae : julianae
+>julianae : unknown
 >galapagoensis : julianae.galapagoensis
->panamensis : panamensis
+>panamensis : unknown
 >linulus : panamensis.linulus<T0, T1>
->lavali : lavali
+>lavali : unknown
 >xanthognathus : lavali.xanthognathus
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >konganensis : macrorhinos.konganensis
 >x : sagitta.cinereus<nigra.caucasica<julianae.sumatrana, trivirgatus.oconnelli>, quasiater.wattsi<julianae.galapagoensis, panamensis.linulus<lavali.xanthognathus, macrorhinos.konganensis>>>
->sagitta : sagitta
+>sagitta : unknown
 >cinereus : sagitta.cinereus<T0, T1>
->nigra : nigra
+>nigra : unknown
 >caucasica : nigra.caucasica<T0, T1>
->julianae : julianae
+>julianae : unknown
 >sumatrana : julianae.sumatrana
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >oconnelli : trivirgatus.oconnelli
->quasiater : quasiater
+>quasiater : unknown
 >wattsi : quasiater.wattsi<T0, T1>
->julianae : julianae
+>julianae : unknown
 >galapagoensis : julianae.galapagoensis
->panamensis : panamensis
+>panamensis : unknown
 >linulus : panamensis.linulus<T0, T1>
->lavali : lavali
+>lavali : unknown
 >xanthognathus : lavali.xanthognathus
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >konganensis : macrorhinos.konganensis
 >() => { var y = this; } : () => void
 >y : pallidus
@@ -7909,18 +7909,18 @@ 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 : chrysaeolus
+>chrysaeolus : unknown
 >sarasinorum : chrysaeolus.sarasinorum<T0, T1>
->lavali : lavali
+>lavali : unknown
 >xanthognathus : lavali.xanthognathus
->lutreolus : lutreolus
+>lutreolus : unknown
 >punicus : lutreolus.punicus
 >x : chrysaeolus.sarasinorum<lavali.xanthognathus, lutreolus.punicus>
->chrysaeolus : chrysaeolus
+>chrysaeolus : unknown
 >sarasinorum : chrysaeolus.sarasinorum<T0, T1>
->lavali : lavali
+>lavali : unknown
 >xanthognathus : lavali.xanthognathus
->lutreolus : lutreolus
+>lutreolus : unknown
 >punicus : lutreolus.punicus
 >() => { var y = this; } : () => void
 >y : pallidus
@@ -7934,18 +7934,18 @@ module samarensis {
 
         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 : nigra
+>nigra : unknown
 >caucasica : nigra.caucasica<T0, T1>
->ruatanica : ruatanica
+>ruatanica : unknown
 >americanus : ruatanica.americanus
->argurus : argurus
+>argurus : unknown
 >peninsulae : argurus.peninsulae
 >x : nigra.caucasica<ruatanica.americanus, argurus.peninsulae>
->nigra : nigra
+>nigra : unknown
 >caucasica : nigra.caucasica<T0, T1>
->ruatanica : ruatanica
+>ruatanica : unknown
 >americanus : ruatanica.americanus
->argurus : argurus
+>argurus : unknown
 >peninsulae : argurus.peninsulae
 >() => { var y = this; } : () => void
 >y : cahirinus<T0, T1>
@@ -7954,26 +7954,26 @@ 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 : trivirgatus
+>trivirgatus : unknown
 >tumidifrons : trivirgatus.tumidifrons<T0, T1>
->lavali : lavali
+>lavali : unknown
 >thaeleri : lavali.thaeleri
->daubentonii : daubentonii
+>daubentonii : unknown
 >arboreus : daubentonii.arboreus<T0, T1>
->petrophilus : petrophilus
+>petrophilus : unknown
 >minutilla : petrophilus.minutilla
->argurus : argurus
+>argurus : unknown
 >peninsulae : argurus.peninsulae
 >x : trivirgatus.tumidifrons<lavali.thaeleri, daubentonii.arboreus<petrophilus.minutilla, argurus.peninsulae>>
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >tumidifrons : trivirgatus.tumidifrons<T0, T1>
->lavali : lavali
+>lavali : unknown
 >thaeleri : lavali.thaeleri
->daubentonii : daubentonii
+>daubentonii : unknown
 >arboreus : daubentonii.arboreus<T0, T1>
->petrophilus : petrophilus
+>petrophilus : unknown
 >minutilla : petrophilus.minutilla
->argurus : argurus
+>argurus : unknown
 >peninsulae : argurus.peninsulae
 >() => { var y = this; } : () => void
 >y : cahirinus<T0, T1>
@@ -7982,10 +7982,10 @@ module samarensis {
 
         bottai(): lutreolus.schlegeli { var x: lutreolus.schlegeli; () => { var y = this; }; return x; }
 >bottai : () => lutreolus.schlegeli
->lutreolus : lutreolus
+>lutreolus : unknown
 >schlegeli : lutreolus.schlegeli
 >x : lutreolus.schlegeli
->lutreolus : lutreolus
+>lutreolus : unknown
 >schlegeli : lutreolus.schlegeli
 >() => { var y = this; } : () => void
 >y : cahirinus<T0, T1>
@@ -7994,10 +7994,10 @@ module samarensis {
 
         pinetis(): argurus.oreas { var x: argurus.oreas; () => { var y = this; }; return x; }
 >pinetis : () => argurus.oreas
->argurus : argurus
+>argurus : unknown
 >oreas : argurus.oreas
 >x : argurus.oreas
->argurus : argurus
+>argurus : unknown
 >oreas : argurus.oreas
 >() => { var y = this; } : () => void
 >y : cahirinus<T0, T1>
@@ -8006,50 +8006,50 @@ 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 : rendalli
+>rendalli : unknown
 >crenulata : rendalli.crenulata<T0, T1>
->gabriellae : gabriellae
+>gabriellae : unknown
 >klossii : gabriellae.klossii<T0, T1>
->julianae : julianae
+>julianae : unknown
 >nudicaudus : julianae.nudicaudus
->dogramacii : dogramacii
+>dogramacii : unknown
 >aurata : dogramacii.aurata
->argurus : argurus
+>argurus : unknown
 >netscheri : argurus.netscheri<T0, T1>
->minutus : minutus
+>minutus : unknown
 >inez : minutus.inez<T0, T1>
->argurus : argurus
+>argurus : unknown
 >peninsulae : argurus.peninsulae
->julianae : julianae
+>julianae : unknown
 >nudicaudus : julianae.nudicaudus
->julianae : julianae
+>julianae : unknown
 >oralis : julianae.oralis<T0, T1>
->lavali : lavali
+>lavali : unknown
 >xanthognathus : lavali.xanthognathus
->argurus : argurus
+>argurus : unknown
 >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 : rendalli
+>rendalli : unknown
 >crenulata : rendalli.crenulata<T0, T1>
->gabriellae : gabriellae
+>gabriellae : unknown
 >klossii : gabriellae.klossii<T0, T1>
->julianae : julianae
+>julianae : unknown
 >nudicaudus : julianae.nudicaudus
->dogramacii : dogramacii
+>dogramacii : unknown
 >aurata : dogramacii.aurata
->argurus : argurus
+>argurus : unknown
 >netscheri : argurus.netscheri<T0, T1>
->minutus : minutus
+>minutus : unknown
 >inez : minutus.inez<T0, T1>
->argurus : argurus
+>argurus : unknown
 >peninsulae : argurus.peninsulae
->julianae : julianae
+>julianae : unknown
 >nudicaudus : julianae.nudicaudus
->julianae : julianae
+>julianae : unknown
 >oralis : julianae.oralis<T0, T1>
->lavali : lavali
+>lavali : unknown
 >xanthognathus : lavali.xanthognathus
->argurus : argurus
+>argurus : unknown
 >oreas : argurus.oreas
 >() => { var y = this; } : () => void
 >y : cahirinus<T0, T1>
@@ -8058,29 +8058,29 @@ module samarensis {
     }
 }
 module sagitta {
->sagitta : sagitta
+>sagitta : typeof 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 : caurinus
+>caurinus : unknown
 >johorensis : caurinus.johorensis<T0, T1>
->argurus : argurus
+>argurus : unknown
 >peninsulae : argurus.peninsulae
->daubentonii : daubentonii
+>daubentonii : unknown
 >arboreus : daubentonii.arboreus<T0, T1>
->argurus : argurus
+>argurus : unknown
 >germaini : argurus.germaini
->sagitta : sagitta
+>sagitta : unknown
 >stolzmanni : stolzmanni
 
         victus(): rionegrensis.caniventer { var x: rionegrensis.caniventer; () => { var y = this; }; return x; }
 >victus : () => rionegrensis.caniventer
->rionegrensis : rionegrensis
+>rionegrensis : unknown
 >caniventer : rionegrensis.caniventer
 >x : rionegrensis.caniventer
->rionegrensis : rionegrensis
+>rionegrensis : unknown
 >caniventer : rionegrensis.caniventer
 >() => { var y = this; } : () => void
 >y : leptoceros<T0, T1>
@@ -8089,34 +8089,34 @@ 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 : panglima
+>panglima : unknown
 >fundatus : panglima.fundatus<T0, T1>
->julianae : julianae
+>julianae : unknown
 >gerbillus : julianae.gerbillus<T0, T1>
->imperfecta : imperfecta
+>imperfecta : unknown
 >subspinosus : imperfecta.subspinosus
->julianae : julianae
+>julianae : unknown
 >durangae : julianae.durangae
->nigra : nigra
+>nigra : unknown
 >gracilis : nigra.gracilis<T0, T1>
->argurus : argurus
+>argurus : unknown
 >luctuosa : argurus.luctuosa
->imperfecta : imperfecta
+>imperfecta : unknown
 >subspinosus : imperfecta.subspinosus
 >x : panglima.fundatus<julianae.gerbillus<imperfecta.subspinosus, julianae.durangae>, nigra.gracilis<argurus.luctuosa, imperfecta.subspinosus>>
->panglima : panglima
+>panglima : unknown
 >fundatus : panglima.fundatus<T0, T1>
->julianae : julianae
+>julianae : unknown
 >gerbillus : julianae.gerbillus<T0, T1>
->imperfecta : imperfecta
+>imperfecta : unknown
 >subspinosus : imperfecta.subspinosus
->julianae : julianae
+>julianae : unknown
 >durangae : julianae.durangae
->nigra : nigra
+>nigra : unknown
 >gracilis : nigra.gracilis<T0, T1>
->argurus : argurus
+>argurus : unknown
 >luctuosa : argurus.luctuosa
->imperfecta : imperfecta
+>imperfecta : unknown
 >subspinosus : imperfecta.subspinosus
 >() => { var y = this; } : () => void
 >y : leptoceros<T0, T1>
@@ -8125,10 +8125,10 @@ module sagitta {
 
         gratiosus(): lavali.lepturus { var x: lavali.lepturus; () => { var y = this; }; return x; }
 >gratiosus : () => lavali.lepturus
->lavali : lavali
+>lavali : unknown
 >lepturus : lavali.lepturus
 >x : lavali.lepturus
->lavali : lavali
+>lavali : unknown
 >lepturus : lavali.lepturus
 >() => { var y = this; } : () => void
 >y : leptoceros<T0, T1>
@@ -8137,10 +8137,10 @@ module sagitta {
 
         rex(): lavali.wilsoni { var x: lavali.wilsoni; () => { var y = this; }; return x; }
 >rex : () => lavali.wilsoni
->lavali : lavali
+>lavali : unknown
 >wilsoni : lavali.wilsoni
 >x : lavali.wilsoni
->lavali : lavali
+>lavali : unknown
 >wilsoni : lavali.wilsoni
 >() => { var y = this; } : () => void
 >y : leptoceros<T0, T1>
@@ -8149,18 +8149,18 @@ 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 : trivirgatus
+>trivirgatus : unknown
 >tumidifrons : trivirgatus.tumidifrons<T0, T1>
->lutreolus : lutreolus
+>lutreolus : unknown
 >schlegeli : lutreolus.schlegeli
->ruatanica : ruatanica
+>ruatanica : unknown
 >americanus : ruatanica.americanus
 >x : trivirgatus.tumidifrons<lutreolus.schlegeli, ruatanica.americanus>
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >tumidifrons : trivirgatus.tumidifrons<T0, T1>
->lutreolus : lutreolus
+>lutreolus : unknown
 >schlegeli : lutreolus.schlegeli
->ruatanica : ruatanica
+>ruatanica : unknown
 >americanus : ruatanica.americanus
 >() => { var y = this; } : () => void
 >y : leptoceros<T0, T1>
@@ -8169,21 +8169,21 @@ module sagitta {
     }
 }
 module daubentonii {
->daubentonii : daubentonii
+>daubentonii : typeof daubentonii
 
     export class nigricans<T0, T1> extends sagitta.stolzmanni {
 >nigricans : nigricans<T0, T1>
 >T0 : T0
 >T1 : T1
->sagitta : sagitta
+>sagitta : unknown
 >stolzmanni : sagitta.stolzmanni
 
         woosnami(): dogramacii.robustulus { var x: dogramacii.robustulus; () => { var y = this; }; return x; }
 >woosnami : () => dogramacii.robustulus
->dogramacii : dogramacii
+>dogramacii : unknown
 >robustulus : dogramacii.robustulus
 >x : dogramacii.robustulus
->dogramacii : dogramacii
+>dogramacii : unknown
 >robustulus : dogramacii.robustulus
 >() => { var y = this; } : () => void
 >y : nigricans<T0, T1>
@@ -8192,7 +8192,7 @@ module daubentonii {
     }
 }
 module dammermani {
->dammermani : dammermani
+>dammermani : typeof dammermani
 
     export class siberu<T0, T1> {
 >siberu : siberu<T0, T1>
@@ -8201,25 +8201,25 @@ module dammermani {
     }
 }
 module argurus {
->argurus : argurus
+>argurus : typeof argurus
 
     export class pygmaea<T0, T1> extends rendalli.moojeni<macrorhinos.konganensis, gabriellae.echinatus> {
 >pygmaea : pygmaea<T0, T1>
 >T0 : T0
 >T1 : T1
->rendalli : rendalli
+>rendalli : unknown
 >moojeni : rendalli.moojeni<T0, T1>
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >konganensis : macrorhinos.konganensis
->gabriellae : gabriellae
+>gabriellae : unknown
 >echinatus : gabriellae.echinatus
 
         pajeros(): gabriellae.echinatus { var x: gabriellae.echinatus; () => { var y = this; }; return x; }
 >pajeros : () => gabriellae.echinatus
->gabriellae : gabriellae
+>gabriellae : unknown
 >echinatus : gabriellae.echinatus
 >x : gabriellae.echinatus
->gabriellae : gabriellae
+>gabriellae : unknown
 >echinatus : gabriellae.echinatus
 >() => { var y = this; } : () => void
 >y : pygmaea<T0, T1>
@@ -8228,10 +8228,10 @@ module argurus {
 
         capucinus(): rendalli.zuluensis { var x: rendalli.zuluensis; () => { var y = this; }; return x; }
 >capucinus : () => rendalli.zuluensis
->rendalli : rendalli
+>rendalli : unknown
 >zuluensis : rendalli.zuluensis
 >x : rendalli.zuluensis
->rendalli : rendalli
+>rendalli : unknown
 >zuluensis : rendalli.zuluensis
 >() => { var y = this; } : () => void
 >y : pygmaea<T0, T1>
@@ -8240,10 +8240,10 @@ module argurus {
 
         cuvieri(): rionegrensis.caniventer { var x: rionegrensis.caniventer; () => { var y = this; }; return x; }
 >cuvieri : () => rionegrensis.caniventer
->rionegrensis : rionegrensis
+>rionegrensis : unknown
 >caniventer : rionegrensis.caniventer
 >x : rionegrensis.caniventer
->rionegrensis : rionegrensis
+>rionegrensis : unknown
 >caniventer : rionegrensis.caniventer
 >() => { var y = this; } : () => void
 >y : pygmaea<T0, T1>
@@ -8252,21 +8252,21 @@ module argurus {
     }
 }
 module chrysaeolus {
->chrysaeolus : chrysaeolus
+>chrysaeolus : typeof chrysaeolus
 
     export class sarasinorum<T0, T1> extends caurinus.psilurus {
 >sarasinorum : sarasinorum<T0, T1>
 >T0 : T0
 >T1 : T1
->caurinus : caurinus
+>caurinus : unknown
 >psilurus : caurinus.psilurus
 
         belzebul(): samarensis.pallidus { var x: samarensis.pallidus; () => { var y = this; }; return x; }
 >belzebul : () => samarensis.pallidus
->samarensis : samarensis
+>samarensis : unknown
 >pallidus : samarensis.pallidus
 >x : samarensis.pallidus
->samarensis : samarensis
+>samarensis : unknown
 >pallidus : samarensis.pallidus
 >() => { var y = this; } : () => void
 >y : sarasinorum<T0, T1>
@@ -8275,18 +8275,18 @@ 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 : nigra
+>nigra : unknown
 >caucasica : nigra.caucasica<T0, T1>
->julianae : julianae
+>julianae : unknown
 >sumatrana : julianae.sumatrana
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >oconnelli : trivirgatus.oconnelli
 >x : nigra.caucasica<julianae.sumatrana, trivirgatus.oconnelli>
->nigra : nigra
+>nigra : unknown
 >caucasica : nigra.caucasica<T0, T1>
->julianae : julianae
+>julianae : unknown
 >sumatrana : julianae.sumatrana
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >oconnelli : trivirgatus.oconnelli
 >() => { var y = this; } : () => void
 >y : sarasinorum<T0, T1>
@@ -8295,18 +8295,18 @@ 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 : quasiater
+>quasiater : unknown
 >wattsi : quasiater.wattsi<T0, T1>
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >jugularis : Lanthanum.jugularis
->julianae : julianae
+>julianae : unknown
 >sumatrana : julianae.sumatrana
 >x : quasiater.wattsi<Lanthanum.jugularis, julianae.sumatrana>
->quasiater : quasiater
+>quasiater : unknown
 >wattsi : quasiater.wattsi<T0, T1>
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >jugularis : Lanthanum.jugularis
->julianae : julianae
+>julianae : unknown
 >sumatrana : julianae.sumatrana
 >() => { var y = this; } : () => void
 >y : sarasinorum<T0, T1>
@@ -8315,10 +8315,10 @@ module chrysaeolus {
 
         cynosuros(): dammermani.melanops { var x: dammermani.melanops; () => { var y = this; }; return x; }
 >cynosuros : () => dammermani.melanops
->dammermani : dammermani
+>dammermani : unknown
 >melanops : dammermani.melanops
 >x : dammermani.melanops
->dammermani : dammermani
+>dammermani : unknown
 >melanops : dammermani.melanops
 >() => { var y = this; } : () => void
 >y : sarasinorum<T0, T1>
@@ -8327,10 +8327,10 @@ module chrysaeolus {
 
         Germanium(): lavali.beisa { var x: lavali.beisa; () => { var y = this; }; return x; }
 >Germanium : () => lavali.beisa
->lavali : lavali
+>lavali : unknown
 >beisa : lavali.beisa
 >x : lavali.beisa
->lavali : lavali
+>lavali : unknown
 >beisa : lavali.beisa
 >() => { var y = this; } : () => void
 >y : sarasinorum<T0, T1>
@@ -8339,18 +8339,18 @@ 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 : nigra
+>nigra : unknown
 >gracilis : nigra.gracilis<T0, T1>
->lavali : lavali
+>lavali : unknown
 >xanthognathus : lavali.xanthognathus
->provocax : provocax
+>provocax : unknown
 >melanoleuca : provocax.melanoleuca
 >x : nigra.gracilis<lavali.xanthognathus, provocax.melanoleuca>
->nigra : nigra
+>nigra : unknown
 >gracilis : nigra.gracilis<T0, T1>
->lavali : lavali
+>lavali : unknown
 >xanthognathus : lavali.xanthognathus
->provocax : provocax
+>provocax : unknown
 >melanoleuca : provocax.melanoleuca
 >() => { var y = this; } : () => void
 >y : sarasinorum<T0, T1>
@@ -8359,10 +8359,10 @@ module chrysaeolus {
 
         princeps(): minutus.portoricensis { var x: minutus.portoricensis; () => { var y = this; }; return x; }
 >princeps : () => minutus.portoricensis
->minutus : minutus
+>minutus : unknown
 >portoricensis : minutus.portoricensis
 >x : minutus.portoricensis
->minutus : minutus
+>minutus : unknown
 >portoricensis : minutus.portoricensis
 >() => { var y = this; } : () => void
 >y : sarasinorum<T0, T1>
@@ -8371,7 +8371,7 @@ module chrysaeolus {
     }
 }
 module argurus {
->argurus : argurus
+>argurus : typeof argurus
 
     export class wetmorei<T0, T1> {
 >wetmorei : wetmorei<T0, T1>
@@ -8380,18 +8380,18 @@ module argurus {
 
         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 : petrophilus
+>petrophilus : unknown
 >rosalia : petrophilus.rosalia<T0, T1>
->dogramacii : dogramacii
+>dogramacii : unknown
 >koepckeae : dogramacii.koepckeae
->lutreolus : lutreolus
+>lutreolus : unknown
 >foina : lutreolus.foina
 >x : petrophilus.rosalia<dogramacii.koepckeae, lutreolus.foina>
->petrophilus : petrophilus
+>petrophilus : unknown
 >rosalia : petrophilus.rosalia<T0, T1>
->dogramacii : dogramacii
+>dogramacii : unknown
 >koepckeae : dogramacii.koepckeae
->lutreolus : lutreolus
+>lutreolus : unknown
 >foina : lutreolus.foina
 >() => { var y = this; } : () => void
 >y : wetmorei<T0, T1>
@@ -8400,10 +8400,10 @@ module argurus {
 
         ochraventer(): sagitta.walkeri { var x: sagitta.walkeri; () => { var y = this; }; return x; }
 >ochraventer : () => sagitta.walkeri
->sagitta : sagitta
+>sagitta : unknown
 >walkeri : sagitta.walkeri
 >x : sagitta.walkeri
->sagitta : sagitta
+>sagitta : unknown
 >walkeri : sagitta.walkeri
 >() => { var y = this; } : () => void
 >y : wetmorei<T0, T1>
@@ -8412,10 +8412,10 @@ module argurus {
 
         tephromelas(): Lanthanum.jugularis { var x: Lanthanum.jugularis; () => { var y = this; }; return x; }
 >tephromelas : () => Lanthanum.jugularis
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >jugularis : Lanthanum.jugularis
 >x : Lanthanum.jugularis
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >jugularis : Lanthanum.jugularis
 >() => { var y = this; } : () => void
 >y : wetmorei<T0, T1>
@@ -8424,18 +8424,18 @@ 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 : argurus
+>argurus : unknown
 >gilbertii : gilbertii<T0, T1>
->lavali : lavali
+>lavali : unknown
 >thaeleri : lavali.thaeleri
->lutreolus : lutreolus
+>lutreolus : unknown
 >punicus : lutreolus.punicus
 >x : gilbertii<lavali.thaeleri, lutreolus.punicus>
->argurus : argurus
+>argurus : unknown
 >gilbertii : gilbertii<T0, T1>
->lavali : lavali
+>lavali : unknown
 >thaeleri : lavali.thaeleri
->lutreolus : lutreolus
+>lutreolus : unknown
 >punicus : lutreolus.punicus
 >() => { var y = this; } : () => void
 >y : wetmorei<T0, T1>
@@ -8444,26 +8444,26 @@ 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 : nigra
+>nigra : unknown
 >thalia : nigra.thalia<T0, T1>
->howi : howi
+>howi : unknown
 >marcanoi : howi.marcanoi
->rionegrensis : rionegrensis
+>rionegrensis : unknown
 >veraecrucis : rionegrensis.veraecrucis<T0, T1>
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >falconeri : trivirgatus.falconeri
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
 >x : nigra.thalia<howi.marcanoi, rionegrensis.veraecrucis<trivirgatus.falconeri, quasiater.carolinensis>>
->nigra : nigra
+>nigra : unknown
 >thalia : nigra.thalia<T0, T1>
->howi : howi
+>howi : unknown
 >marcanoi : howi.marcanoi
->rionegrensis : rionegrensis
+>rionegrensis : unknown
 >veraecrucis : rionegrensis.veraecrucis<T0, T1>
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >falconeri : trivirgatus.falconeri
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
 >() => { var y = this; } : () => void
 >y : wetmorei<T0, T1>
@@ -8472,10 +8472,10 @@ module argurus {
 
         gymnocaudus(): dogramacii.aurata { var x: dogramacii.aurata; () => { var y = this; }; return x; }
 >gymnocaudus : () => dogramacii.aurata
->dogramacii : dogramacii
+>dogramacii : unknown
 >aurata : dogramacii.aurata
 >x : dogramacii.aurata
->dogramacii : dogramacii
+>dogramacii : unknown
 >aurata : dogramacii.aurata
 >() => { var y = this; } : () => void
 >y : wetmorei<T0, T1>
@@ -8484,10 +8484,10 @@ module argurus {
 
         mayori(): sagitta.stolzmanni { var x: sagitta.stolzmanni; () => { var y = this; }; return x; }
 >mayori : () => sagitta.stolzmanni
->sagitta : sagitta
+>sagitta : unknown
 >stolzmanni : sagitta.stolzmanni
 >x : sagitta.stolzmanni
->sagitta : sagitta
+>sagitta : unknown
 >stolzmanni : sagitta.stolzmanni
 >() => { var y = this; } : () => void
 >y : wetmorei<T0, T1>
@@ -8496,19 +8496,19 @@ module argurus {
     }
 }
 module argurus {
->argurus : argurus
+>argurus : typeof argurus
 
     export class oreas extends lavali.wilsoni {
 >oreas : oreas
->lavali : lavali
+>lavali : unknown
 >wilsoni : lavali.wilsoni
 
         salamonis(): lavali.xanthognathus { var x: lavali.xanthognathus; () => { var y = this; }; return x; }
 >salamonis : () => lavali.xanthognathus
->lavali : lavali
+>lavali : unknown
 >xanthognathus : lavali.xanthognathus
 >x : lavali.xanthognathus
->lavali : lavali
+>lavali : unknown
 >xanthognathus : lavali.xanthognathus
 >() => { var y = this; } : () => void
 >y : oreas
@@ -8517,18 +8517,18 @@ 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 : ruatanica
+>ruatanica : unknown
 >Praseodymium : ruatanica.Praseodymium<T0, T1>
->caurinus : caurinus
+>caurinus : unknown
 >psilurus : caurinus.psilurus
->lavali : lavali
+>lavali : unknown
 >xanthognathus : lavali.xanthognathus
 >x : ruatanica.Praseodymium<caurinus.psilurus, lavali.xanthognathus>
->ruatanica : ruatanica
+>ruatanica : unknown
 >Praseodymium : ruatanica.Praseodymium<T0, T1>
->caurinus : caurinus
+>caurinus : unknown
 >psilurus : caurinus.psilurus
->lavali : lavali
+>lavali : unknown
 >xanthognathus : lavali.xanthognathus
 >() => { var y = this; } : () => void
 >y : oreas
@@ -8537,10 +8537,10 @@ module argurus {
 
         fagani(): trivirgatus.oconnelli { var x: trivirgatus.oconnelli; () => { var y = this; }; return x; }
 >fagani : () => trivirgatus.oconnelli
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >oconnelli : trivirgatus.oconnelli
 >x : trivirgatus.oconnelli
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >oconnelli : trivirgatus.oconnelli
 >() => { var y = this; } : () => void
 >y : oreas
@@ -8549,18 +8549,18 @@ 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 : panglima
+>panglima : unknown
 >fundatus : panglima.fundatus<T0, T1>
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >daphaenodon : macrorhinos.daphaenodon
 >x : panglima.fundatus<quasiater.carolinensis, macrorhinos.daphaenodon>
->panglima : panglima
+>panglima : unknown
 >fundatus : panglima.fundatus<T0, T1>
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >daphaenodon : macrorhinos.daphaenodon
 >() => { var y = this; } : () => void
 >y : oreas
@@ -8569,10 +8569,10 @@ module argurus {
 
         timidus(): dammermani.melanops { var x: dammermani.melanops; () => { var y = this; }; return x; }
 >timidus : () => dammermani.melanops
->dammermani : dammermani
+>dammermani : unknown
 >melanops : dammermani.melanops
 >x : dammermani.melanops
->dammermani : dammermani
+>dammermani : unknown
 >melanops : dammermani.melanops
 >() => { var y = this; } : () => void
 >y : oreas
@@ -8581,18 +8581,18 @@ 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 : gabriellae
+>gabriellae : unknown
 >klossii : gabriellae.klossii<T0, T1>
->argurus : argurus
+>argurus : unknown
 >luctuosa : luctuosa
->julianae : julianae
+>julianae : unknown
 >steerii : julianae.steerii
 >x : gabriellae.klossii<luctuosa, julianae.steerii>
->gabriellae : gabriellae
+>gabriellae : unknown
 >klossii : gabriellae.klossii<T0, T1>
->argurus : argurus
+>argurus : unknown
 >luctuosa : luctuosa
->julianae : julianae
+>julianae : unknown
 >steerii : julianae.steerii
 >() => { var y = this; } : () => void
 >y : oreas
@@ -8601,18 +8601,18 @@ 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 : samarensis
+>samarensis : unknown
 >cahirinus : samarensis.cahirinus<T0, T1>
->lavali : lavali
+>lavali : unknown
 >lepturus : lavali.lepturus
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
 >x : samarensis.cahirinus<lavali.lepturus, quasiater.carolinensis>
->samarensis : samarensis
+>samarensis : unknown
 >cahirinus : samarensis.cahirinus<T0, T1>
->lavali : lavali
+>lavali : unknown
 >lepturus : lavali.lepturus
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
 >() => { var y = this; } : () => void
 >y : oreas
@@ -8621,10 +8621,10 @@ module argurus {
 
         univittatus(): argurus.peninsulae { var x: argurus.peninsulae; () => { var y = this; }; return x; }
 >univittatus : () => peninsulae
->argurus : argurus
+>argurus : unknown
 >peninsulae : peninsulae
 >x : peninsulae
->argurus : argurus
+>argurus : unknown
 >peninsulae : peninsulae
 >() => { var y = this; } : () => void
 >y : oreas
@@ -8633,7 +8633,7 @@ module argurus {
     }
 }
 module daubentonii {
->daubentonii : daubentonii
+>daubentonii : typeof daubentonii
 
     export class arboreus<T0, T1> {
 >arboreus : arboreus<T0, T1>
@@ -8642,26 +8642,26 @@ module daubentonii {
 
         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 : rendalli
+>rendalli : unknown
 >crenulata : rendalli.crenulata<T0, T1>
->samarensis : samarensis
+>samarensis : unknown
 >pelurus : samarensis.pelurus<T0, T1>
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >jugularis : Lanthanum.jugularis
->ruatanica : ruatanica
+>ruatanica : unknown
 >americanus : ruatanica.americanus
->lavali : lavali
+>lavali : unknown
 >wilsoni : lavali.wilsoni
 >x : rendalli.crenulata<samarensis.pelurus<Lanthanum.jugularis, ruatanica.americanus>, lavali.wilsoni>
->rendalli : rendalli
+>rendalli : unknown
 >crenulata : rendalli.crenulata<T0, T1>
->samarensis : samarensis
+>samarensis : unknown
 >pelurus : samarensis.pelurus<T0, T1>
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >jugularis : Lanthanum.jugularis
->ruatanica : ruatanica
+>ruatanica : unknown
 >americanus : ruatanica.americanus
->lavali : lavali
+>lavali : unknown
 >wilsoni : lavali.wilsoni
 >() => { var y = this; } : () => void
 >y : arboreus<T0, T1>
@@ -8670,18 +8670,18 @@ 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 : panglima
+>panglima : unknown
 >abidi : panglima.abidi<T0, T1>
->julianae : julianae
+>julianae : unknown
 >galapagoensis : julianae.galapagoensis
->dogramacii : dogramacii
+>dogramacii : unknown
 >koepckeae : dogramacii.koepckeae
 >x : panglima.abidi<julianae.galapagoensis, dogramacii.koepckeae>
->panglima : panglima
+>panglima : unknown
 >abidi : panglima.abidi<T0, T1>
->julianae : julianae
+>julianae : unknown
 >galapagoensis : julianae.galapagoensis
->dogramacii : dogramacii
+>dogramacii : unknown
 >koepckeae : dogramacii.koepckeae
 >() => { var y = this; } : () => void
 >y : arboreus<T0, T1>
@@ -8690,18 +8690,18 @@ 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 : nigra
+>nigra : unknown
 >gracilis : nigra.gracilis<T0, T1>
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >falconeri : trivirgatus.falconeri
->argurus : argurus
+>argurus : unknown
 >germaini : argurus.germaini
 >x : nigra.gracilis<trivirgatus.falconeri, argurus.germaini>
->nigra : nigra
+>nigra : unknown
 >gracilis : nigra.gracilis<T0, T1>
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >falconeri : trivirgatus.falconeri
->argurus : argurus
+>argurus : unknown
 >germaini : argurus.germaini
 >() => { var y = this; } : () => void
 >y : arboreus<T0, T1>
@@ -8710,10 +8710,10 @@ module daubentonii {
 
         paedulcus(): minutus.portoricensis { var x: minutus.portoricensis; () => { var y = this; }; return x; }
 >paedulcus : () => minutus.portoricensis
->minutus : minutus
+>minutus : unknown
 >portoricensis : minutus.portoricensis
 >x : minutus.portoricensis
->minutus : minutus
+>minutus : unknown
 >portoricensis : minutus.portoricensis
 >() => { var y = this; } : () => void
 >y : arboreus<T0, T1>
@@ -8722,18 +8722,18 @@ 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 : samarensis
+>samarensis : unknown
 >fuscus : samarensis.fuscus<T0, T1>
->julianae : julianae
+>julianae : unknown
 >durangae : julianae.durangae
->caurinus : caurinus
+>caurinus : unknown
 >megaphyllus : caurinus.megaphyllus
 >x : samarensis.fuscus<julianae.durangae, caurinus.megaphyllus>
->samarensis : samarensis
+>samarensis : unknown
 >fuscus : samarensis.fuscus<T0, T1>
->julianae : julianae
+>julianae : unknown
 >durangae : julianae.durangae
->caurinus : caurinus
+>caurinus : unknown
 >megaphyllus : caurinus.megaphyllus
 >() => { var y = this; } : () => void
 >y : arboreus<T0, T1>
@@ -8742,18 +8742,18 @@ 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 : julianae
+>julianae : unknown
 >oralis : julianae.oralis<T0, T1>
->lutreolus : lutreolus
+>lutreolus : unknown
 >foina : lutreolus.foina
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
 >x : julianae.oralis<lutreolus.foina, quasiater.carolinensis>
->julianae : julianae
+>julianae : unknown
 >oralis : julianae.oralis<T0, T1>
->lutreolus : lutreolus
+>lutreolus : unknown
 >foina : lutreolus.foina
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
 >() => { var y = this; } : () => void
 >y : arboreus<T0, T1>
@@ -8762,10 +8762,10 @@ module daubentonii {
 
         brasiliensis(): imperfecta.subspinosus { var x: imperfecta.subspinosus; () => { var y = this; }; return x; }
 >brasiliensis : () => imperfecta.subspinosus
->imperfecta : imperfecta
+>imperfecta : unknown
 >subspinosus : imperfecta.subspinosus
 >x : imperfecta.subspinosus
->imperfecta : imperfecta
+>imperfecta : unknown
 >subspinosus : imperfecta.subspinosus
 >() => { var y = this; } : () => void
 >y : arboreus<T0, T1>
@@ -8774,10 +8774,10 @@ module daubentonii {
 
         brevicaudata(): trivirgatus.oconnelli { var x: trivirgatus.oconnelli; () => { var y = this; }; return x; }
 >brevicaudata : () => trivirgatus.oconnelli
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >oconnelli : trivirgatus.oconnelli
 >x : trivirgatus.oconnelli
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >oconnelli : trivirgatus.oconnelli
 >() => { var y = this; } : () => void
 >y : arboreus<T0, T1>
@@ -8786,10 +8786,10 @@ module daubentonii {
 
         vitticollis(): dogramacii.koepckeae { var x: dogramacii.koepckeae; () => { var y = this; }; return x; }
 >vitticollis : () => dogramacii.koepckeae
->dogramacii : dogramacii
+>dogramacii : unknown
 >koepckeae : dogramacii.koepckeae
 >x : dogramacii.koepckeae
->dogramacii : dogramacii
+>dogramacii : unknown
 >koepckeae : dogramacii.koepckeae
 >() => { var y = this; } : () => void
 >y : arboreus<T0, T1>
@@ -8798,10 +8798,10 @@ module daubentonii {
 
         huangensis(): caurinus.psilurus { var x: caurinus.psilurus; () => { var y = this; }; return x; }
 >huangensis : () => caurinus.psilurus
->caurinus : caurinus
+>caurinus : unknown
 >psilurus : caurinus.psilurus
 >x : caurinus.psilurus
->caurinus : caurinus
+>caurinus : unknown
 >psilurus : caurinus.psilurus
 >() => { var y = this; } : () => void
 >y : arboreus<T0, T1>
@@ -8810,42 +8810,42 @@ 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 : petrophilus
+>petrophilus : unknown
 >rosalia : petrophilus.rosalia<T0, T1>
->dammermani : dammermani
+>dammermani : unknown
 >siberu : dammermani.siberu<T0, T1>
->imperfecta : imperfecta
+>imperfecta : unknown
 >lasiurus : imperfecta.lasiurus<T0, T1>
->lutreolus : lutreolus
+>lutreolus : unknown
 >foina : lutreolus.foina
->dammermani : dammermani
+>dammermani : unknown
 >melanops : dammermani.melanops
->imperfecta : imperfecta
+>imperfecta : unknown
 >ciliolabrum : imperfecta.ciliolabrum<T0, T1>
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >megalonyx : Lanthanum.megalonyx
->petrophilus : petrophilus
+>petrophilus : unknown
 >minutilla : petrophilus.minutilla
->caurinus : caurinus
+>caurinus : unknown
 >psilurus : caurinus.psilurus
 >x : petrophilus.rosalia<dammermani.siberu<imperfecta.lasiurus<lutreolus.foina, dammermani.melanops>, imperfecta.ciliolabrum<Lanthanum.megalonyx, petrophilus.minutilla>>, caurinus.psilurus>
->petrophilus : petrophilus
+>petrophilus : unknown
 >rosalia : petrophilus.rosalia<T0, T1>
->dammermani : dammermani
+>dammermani : unknown
 >siberu : dammermani.siberu<T0, T1>
->imperfecta : imperfecta
+>imperfecta : unknown
 >lasiurus : imperfecta.lasiurus<T0, T1>
->lutreolus : lutreolus
+>lutreolus : unknown
 >foina : lutreolus.foina
->dammermani : dammermani
+>dammermani : unknown
 >melanops : dammermani.melanops
->imperfecta : imperfecta
+>imperfecta : unknown
 >ciliolabrum : imperfecta.ciliolabrum<T0, T1>
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >megalonyx : Lanthanum.megalonyx
->petrophilus : petrophilus
+>petrophilus : unknown
 >minutilla : petrophilus.minutilla
->caurinus : caurinus
+>caurinus : unknown
 >psilurus : caurinus.psilurus
 >() => { var y = this; } : () => void
 >y : arboreus<T0, T1>
@@ -8854,10 +8854,10 @@ module daubentonii {
 
         tianshanica(): howi.marcanoi { var x: howi.marcanoi; () => { var y = this; }; return x; }
 >tianshanica : () => howi.marcanoi
->howi : howi
+>howi : unknown
 >marcanoi : howi.marcanoi
 >x : howi.marcanoi
->howi : howi
+>howi : unknown
 >marcanoi : howi.marcanoi
 >() => { var y = this; } : () => void
 >y : arboreus<T0, T1>
@@ -8866,25 +8866,25 @@ module daubentonii {
     }
 }
 module patas {
->patas : patas
+>patas : typeof patas
 
     export class uralensis {
 >uralensis : uralensis
 
         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 : Lanthanum
+>Lanthanum : unknown
 >nitidus : Lanthanum.nitidus<T0, T1>
->rionegrensis : rionegrensis
+>rionegrensis : unknown
 >caniventer : rionegrensis.caniventer
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >jugularis : Lanthanum.jugularis
 >x : Lanthanum.nitidus<rionegrensis.caniventer, Lanthanum.jugularis>
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >nitidus : Lanthanum.nitidus<T0, T1>
->rionegrensis : rionegrensis
+>rionegrensis : unknown
 >caniventer : rionegrensis.caniventer
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >jugularis : Lanthanum.jugularis
 >() => { var y = this; } : () => void
 >y : uralensis
@@ -8893,10 +8893,10 @@ module patas {
 
         pyrrhinus(): lavali.beisa { var x: lavali.beisa; () => { var y = this; }; return x; }
 >pyrrhinus : () => lavali.beisa
->lavali : lavali
+>lavali : unknown
 >beisa : lavali.beisa
 >x : lavali.beisa
->lavali : lavali
+>lavali : unknown
 >beisa : lavali.beisa
 >() => { var y = this; } : () => void
 >y : uralensis
@@ -8905,10 +8905,10 @@ module patas {
 
         insulans(): Lanthanum.jugularis { var x: Lanthanum.jugularis; () => { var y = this; }; return x; }
 >insulans : () => Lanthanum.jugularis
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >jugularis : Lanthanum.jugularis
 >x : Lanthanum.jugularis
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >jugularis : Lanthanum.jugularis
 >() => { var y = this; } : () => void
 >y : uralensis
@@ -8917,26 +8917,26 @@ 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 : caurinus
+>caurinus : unknown
 >johorensis : caurinus.johorensis<T0, T1>
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >nitidus : Lanthanum.nitidus<T0, T1>
->petrophilus : petrophilus
+>petrophilus : unknown
 >minutilla : petrophilus.minutilla
->julianae : julianae
+>julianae : unknown
 >sumatrana : julianae.sumatrana
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >jugularis : Lanthanum.jugularis
 >x : caurinus.johorensis<Lanthanum.nitidus<petrophilus.minutilla, julianae.sumatrana>, Lanthanum.jugularis>
->caurinus : caurinus
+>caurinus : unknown
 >johorensis : caurinus.johorensis<T0, T1>
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >nitidus : Lanthanum.nitidus<T0, T1>
->petrophilus : petrophilus
+>petrophilus : unknown
 >minutilla : petrophilus.minutilla
->julianae : julianae
+>julianae : unknown
 >sumatrana : julianae.sumatrana
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >jugularis : Lanthanum.jugularis
 >() => { var y = this; } : () => void
 >y : uralensis
@@ -8945,26 +8945,26 @@ 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 : panglima
+>panglima : unknown
 >fundatus : panglima.fundatus<T0, T1>
->lutreolus : lutreolus
+>lutreolus : unknown
 >foina : lutreolus.foina
->dammermani : dammermani
+>dammermani : unknown
 >siberu : dammermani.siberu<T0, T1>
->lutreolus : lutreolus
+>lutreolus : unknown
 >punicus : lutreolus.punicus
->julianae : julianae
+>julianae : unknown
 >acariensis : julianae.acariensis
 >x : panglima.fundatus<lutreolus.foina, dammermani.siberu<lutreolus.punicus, julianae.acariensis>>
->panglima : panglima
+>panglima : unknown
 >fundatus : panglima.fundatus<T0, T1>
->lutreolus : lutreolus
+>lutreolus : unknown
 >foina : lutreolus.foina
->dammermani : dammermani
+>dammermani : unknown
 >siberu : dammermani.siberu<T0, T1>
->lutreolus : lutreolus
+>lutreolus : unknown
 >punicus : lutreolus.punicus
->julianae : julianae
+>julianae : unknown
 >acariensis : julianae.acariensis
 >() => { var y = this; } : () => void
 >y : uralensis
@@ -8973,10 +8973,10 @@ module patas {
 
         albicaudus(): sagitta.stolzmanni { var x: sagitta.stolzmanni; () => { var y = this; }; return x; }
 >albicaudus : () => sagitta.stolzmanni
->sagitta : sagitta
+>sagitta : unknown
 >stolzmanni : sagitta.stolzmanni
 >x : sagitta.stolzmanni
->sagitta : sagitta
+>sagitta : unknown
 >stolzmanni : sagitta.stolzmanni
 >() => { var y = this; } : () => void
 >y : uralensis
@@ -8985,18 +8985,18 @@ 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 : ruatanica
+>ruatanica : unknown
 >hector : ruatanica.hector<T0, T1>
->lutreolus : lutreolus
+>lutreolus : unknown
 >punicus : lutreolus.punicus
->gabriellae : gabriellae
+>gabriellae : unknown
 >amicus : gabriellae.amicus
 >x : ruatanica.hector<lutreolus.punicus, gabriellae.amicus>
->ruatanica : ruatanica
+>ruatanica : unknown
 >hector : ruatanica.hector<T0, T1>
->lutreolus : lutreolus
+>lutreolus : unknown
 >punicus : lutreolus.punicus
->gabriellae : gabriellae
+>gabriellae : unknown
 >amicus : gabriellae.amicus
 >() => { var y = this; } : () => void
 >y : uralensis
@@ -9005,26 +9005,26 @@ 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 : macrorhinos
+>macrorhinos : unknown
 >marmosurus : macrorhinos.marmosurus<T0, T1>
->ruatanica : ruatanica
+>ruatanica : unknown
 >americanus : ruatanica.americanus
->argurus : argurus
+>argurus : unknown
 >netscheri : argurus.netscheri<T0, T1>
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
->dogramacii : dogramacii
+>dogramacii : unknown
 >kaiseri : dogramacii.kaiseri
 >x : macrorhinos.marmosurus<ruatanica.americanus, argurus.netscheri<quasiater.carolinensis, dogramacii.kaiseri>>
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >marmosurus : macrorhinos.marmosurus<T0, T1>
->ruatanica : ruatanica
+>ruatanica : unknown
 >americanus : ruatanica.americanus
->argurus : argurus
+>argurus : unknown
 >netscheri : argurus.netscheri<T0, T1>
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
->dogramacii : dogramacii
+>dogramacii : unknown
 >kaiseri : dogramacii.kaiseri
 >() => { var y = this; } : () => void
 >y : uralensis
@@ -9033,10 +9033,10 @@ module patas {
 
         megalura(): howi.marcanoi { var x: howi.marcanoi; () => { var y = this; }; return x; }
 >megalura : () => howi.marcanoi
->howi : howi
+>howi : unknown
 >marcanoi : howi.marcanoi
 >x : howi.marcanoi
->howi : howi
+>howi : unknown
 >marcanoi : howi.marcanoi
 >() => { var y = this; } : () => void
 >y : uralensis
@@ -9045,18 +9045,18 @@ 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 : samarensis
+>samarensis : unknown
 >pelurus : samarensis.pelurus<T0, T1>
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >daphaenodon : macrorhinos.daphaenodon
->rionegrensis : rionegrensis
+>rionegrensis : unknown
 >caniventer : rionegrensis.caniventer
 >x : samarensis.pelurus<macrorhinos.daphaenodon, rionegrensis.caniventer>
->samarensis : samarensis
+>samarensis : unknown
 >pelurus : samarensis.pelurus<T0, T1>
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >daphaenodon : macrorhinos.daphaenodon
->rionegrensis : rionegrensis
+>rionegrensis : unknown
 >caniventer : rionegrensis.caniventer
 >() => { var y = this; } : () => void
 >y : uralensis
@@ -9065,18 +9065,18 @@ 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 : daubentonii
+>daubentonii : unknown
 >arboreus : daubentonii.arboreus<T0, T1>
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
->rionegrensis : rionegrensis
+>rionegrensis : unknown
 >caniventer : rionegrensis.caniventer
 >x : daubentonii.arboreus<quasiater.carolinensis, rionegrensis.caniventer>
->daubentonii : daubentonii
+>daubentonii : unknown
 >arboreus : daubentonii.arboreus<T0, T1>
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
->rionegrensis : rionegrensis
+>rionegrensis : unknown
 >caniventer : rionegrensis.caniventer
 >() => { var y = this; } : () => void
 >y : uralensis
@@ -9085,18 +9085,18 @@ 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 : imperfecta
+>imperfecta : unknown
 >lasiurus : imperfecta.lasiurus<T0, T1>
->dogramacii : dogramacii
+>dogramacii : unknown
 >robustulus : dogramacii.robustulus
->caurinus : caurinus
+>caurinus : unknown
 >psilurus : caurinus.psilurus
 >x : imperfecta.lasiurus<dogramacii.robustulus, caurinus.psilurus>
->imperfecta : imperfecta
+>imperfecta : unknown
 >lasiurus : imperfecta.lasiurus<T0, T1>
->dogramacii : dogramacii
+>dogramacii : unknown
 >robustulus : dogramacii.robustulus
->caurinus : caurinus
+>caurinus : unknown
 >psilurus : caurinus.psilurus
 >() => { var y = this; } : () => void
 >y : uralensis
@@ -9105,18 +9105,18 @@ 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 : rendalli
+>rendalli : unknown
 >crenulata : rendalli.crenulata<T0, T1>
->rendalli : rendalli
+>rendalli : unknown
 >zuluensis : rendalli.zuluensis
->dogramacii : dogramacii
+>dogramacii : unknown
 >robustulus : dogramacii.robustulus
 >x : rendalli.crenulata<rendalli.zuluensis, dogramacii.robustulus>
->rendalli : rendalli
+>rendalli : unknown
 >crenulata : rendalli.crenulata<T0, T1>
->rendalli : rendalli
+>rendalli : unknown
 >zuluensis : rendalli.zuluensis
->dogramacii : dogramacii
+>dogramacii : unknown
 >robustulus : dogramacii.robustulus
 >() => { var y = this; } : () => void
 >y : uralensis
@@ -9125,35 +9125,35 @@ module patas {
     }
 }
 module provocax {
->provocax : provocax
+>provocax : typeof provocax
 
     export class melanoleuca extends lavali.wilsoni {
 >melanoleuca : melanoleuca
->lavali : lavali
+>lavali : unknown
 >wilsoni : lavali.wilsoni
 
         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 : macrorhinos
+>macrorhinos : unknown
 >marmosurus : macrorhinos.marmosurus<T0, T1>
->petrophilus : petrophilus
+>petrophilus : unknown
 >sodyi : petrophilus.sodyi<T0, T1>
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >falconeri : trivirgatus.falconeri
->quasiater : quasiater
+>quasiater : unknown
 >bobrinskoi : quasiater.bobrinskoi
->lutreolus : lutreolus
+>lutreolus : unknown
 >foina : lutreolus.foina
 >x : macrorhinos.marmosurus<petrophilus.sodyi<trivirgatus.falconeri, quasiater.bobrinskoi>, lutreolus.foina>
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >marmosurus : macrorhinos.marmosurus<T0, T1>
->petrophilus : petrophilus
+>petrophilus : unknown
 >sodyi : petrophilus.sodyi<T0, T1>
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >falconeri : trivirgatus.falconeri
->quasiater : quasiater
+>quasiater : unknown
 >bobrinskoi : quasiater.bobrinskoi
->lutreolus : lutreolus
+>lutreolus : unknown
 >foina : lutreolus.foina
 >() => { var y = this; } : () => void
 >y : melanoleuca
@@ -9162,18 +9162,18 @@ 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 : imperfecta
+>imperfecta : unknown
 >lasiurus : imperfecta.lasiurus<T0, T1>
->lavali : lavali
+>lavali : unknown
 >lepturus : lavali.lepturus
->ruatanica : ruatanica
+>ruatanica : unknown
 >americanus : ruatanica.americanus
 >x : imperfecta.lasiurus<lavali.lepturus, ruatanica.americanus>
->imperfecta : imperfecta
+>imperfecta : unknown
 >lasiurus : imperfecta.lasiurus<T0, T1>
->lavali : lavali
+>lavali : unknown
 >lepturus : lavali.lepturus
->ruatanica : ruatanica
+>ruatanica : unknown
 >americanus : ruatanica.americanus
 >() => { var y = this; } : () => void
 >y : melanoleuca
@@ -9182,7 +9182,7 @@ module provocax {
     }
 }
 module sagitta {
->sagitta : sagitta
+>sagitta : typeof sagitta
 
     export class sicarius<T0, T1> {
 >sicarius : sicarius<T0, T1>
@@ -9191,26 +9191,26 @@ module sagitta {
 
         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 : samarensis
+>samarensis : unknown
 >cahirinus : samarensis.cahirinus<T0, T1>
->nigra : nigra
+>nigra : unknown
 >gracilis : nigra.gracilis<T0, T1>
->argurus : argurus
+>argurus : unknown
 >luctuosa : argurus.luctuosa
->imperfecta : imperfecta
+>imperfecta : unknown
 >subspinosus : imperfecta.subspinosus
->dogramacii : dogramacii
+>dogramacii : unknown
 >robustulus : dogramacii.robustulus
 >x : samarensis.cahirinus<nigra.gracilis<argurus.luctuosa, imperfecta.subspinosus>, dogramacii.robustulus>
->samarensis : samarensis
+>samarensis : unknown
 >cahirinus : samarensis.cahirinus<T0, T1>
->nigra : nigra
+>nigra : unknown
 >gracilis : nigra.gracilis<T0, T1>
->argurus : argurus
+>argurus : unknown
 >luctuosa : argurus.luctuosa
->imperfecta : imperfecta
+>imperfecta : unknown
 >subspinosus : imperfecta.subspinosus
->dogramacii : dogramacii
+>dogramacii : unknown
 >robustulus : dogramacii.robustulus
 >() => { var y = this; } : () => void
 >y : sicarius<T0, T1>
@@ -9219,50 +9219,50 @@ 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 : macrorhinos
+>macrorhinos : unknown
 >marmosurus : macrorhinos.marmosurus<T0, T1>
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >nitidus : Lanthanum.nitidus<T0, T1>
->dammermani : dammermani
+>dammermani : unknown
 >melanops : dammermani.melanops
->lavali : lavali
+>lavali : unknown
 >lepturus : lavali.lepturus
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >marmosurus : macrorhinos.marmosurus<T0, T1>
->rendalli : rendalli
+>rendalli : unknown
 >moojeni : rendalli.moojeni<T0, T1>
->panglima : panglima
+>panglima : unknown
 >amphibius : panglima.amphibius<T0, T1>
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >falconeri : trivirgatus.falconeri
->caurinus : caurinus
+>caurinus : unknown
 >psilurus : caurinus.psilurus
->gabriellae : gabriellae
+>gabriellae : unknown
 >echinatus : gabriellae.echinatus
->sagitta : sagitta
+>sagitta : unknown
 >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 : macrorhinos
+>macrorhinos : unknown
 >marmosurus : macrorhinos.marmosurus<T0, T1>
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >nitidus : Lanthanum.nitidus<T0, T1>
->dammermani : dammermani
+>dammermani : unknown
 >melanops : dammermani.melanops
->lavali : lavali
+>lavali : unknown
 >lepturus : lavali.lepturus
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >marmosurus : macrorhinos.marmosurus<T0, T1>
->rendalli : rendalli
+>rendalli : unknown
 >moojeni : rendalli.moojeni<T0, T1>
->panglima : panglima
+>panglima : unknown
 >amphibius : panglima.amphibius<T0, T1>
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >falconeri : trivirgatus.falconeri
->caurinus : caurinus
+>caurinus : unknown
 >psilurus : caurinus.psilurus
->gabriellae : gabriellae
+>gabriellae : unknown
 >echinatus : gabriellae.echinatus
->sagitta : sagitta
+>sagitta : unknown
 >stolzmanni : stolzmanni
 >() => { var y = this; } : () => void
 >y : sicarius<T0, T1>
@@ -9271,19 +9271,19 @@ module sagitta {
     }
 }
 module howi {
->howi : howi
+>howi : typeof howi
 
     export class marcanoi extends Lanthanum.megalonyx {
 >marcanoi : marcanoi
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >megalonyx : Lanthanum.megalonyx
 
         formosae(): Lanthanum.megalonyx { var x: Lanthanum.megalonyx; () => { var y = this; }; return x; }
 >formosae : () => Lanthanum.megalonyx
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >megalonyx : Lanthanum.megalonyx
 >x : Lanthanum.megalonyx
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >megalonyx : Lanthanum.megalonyx
 >() => { var y = this; } : () => void
 >y : marcanoi
@@ -9292,10 +9292,10 @@ module howi {
 
         dudui(): lutreolus.punicus { var x: lutreolus.punicus; () => { var y = this; }; return x; }
 >dudui : () => lutreolus.punicus
->lutreolus : lutreolus
+>lutreolus : unknown
 >punicus : lutreolus.punicus
 >x : lutreolus.punicus
->lutreolus : lutreolus
+>lutreolus : unknown
 >punicus : lutreolus.punicus
 >() => { var y = this; } : () => void
 >y : marcanoi
@@ -9304,18 +9304,18 @@ 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 : daubentonii
+>daubentonii : unknown
 >nesiotes : daubentonii.nesiotes<T0, T1>
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >megalonyx : Lanthanum.megalonyx
->minutus : minutus
+>minutus : unknown
 >portoricensis : minutus.portoricensis
 >x : daubentonii.nesiotes<Lanthanum.megalonyx, minutus.portoricensis>
->daubentonii : daubentonii
+>daubentonii : unknown
 >nesiotes : daubentonii.nesiotes<T0, T1>
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >megalonyx : Lanthanum.megalonyx
->minutus : minutus
+>minutus : unknown
 >portoricensis : minutus.portoricensis
 >() => { var y = this; } : () => void
 >y : marcanoi
@@ -9324,10 +9324,10 @@ module howi {
 
         martinsi(): dogramacii.aurata { var x: dogramacii.aurata; () => { var y = this; }; return x; }
 >martinsi : () => dogramacii.aurata
->dogramacii : dogramacii
+>dogramacii : unknown
 >aurata : dogramacii.aurata
 >x : dogramacii.aurata
->dogramacii : dogramacii
+>dogramacii : unknown
 >aurata : dogramacii.aurata
 >() => { var y = this; } : () => void
 >y : marcanoi
@@ -9336,58 +9336,58 @@ 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 : imperfecta
+>imperfecta : unknown
 >ciliolabrum : imperfecta.ciliolabrum<T0, T1>
->provocax : provocax
+>provocax : unknown
 >melanoleuca : provocax.melanoleuca
->panglima : panglima
+>panglima : unknown
 >amphibius : panglima.amphibius<T0, T1>
->minutus : minutus
+>minutus : unknown
 >inez : minutus.inez<T0, T1>
->rendalli : rendalli
+>rendalli : unknown
 >moojeni : rendalli.moojeni<T0, T1>
->panglima : panglima
+>panglima : unknown
 >amphibius : panglima.amphibius<T0, T1>
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >falconeri : trivirgatus.falconeri
->caurinus : caurinus
+>caurinus : unknown
 >psilurus : caurinus.psilurus
->gabriellae : gabriellae
+>gabriellae : unknown
 >echinatus : gabriellae.echinatus
->dogramacii : dogramacii
+>dogramacii : unknown
 >aurata : dogramacii.aurata
->imperfecta : imperfecta
+>imperfecta : unknown
 >ciliolabrum : imperfecta.ciliolabrum<T0, T1>
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
->lavali : lavali
+>lavali : unknown
 >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 : imperfecta
+>imperfecta : unknown
 >ciliolabrum : imperfecta.ciliolabrum<T0, T1>
->provocax : provocax
+>provocax : unknown
 >melanoleuca : provocax.melanoleuca
->panglima : panglima
+>panglima : unknown
 >amphibius : panglima.amphibius<T0, T1>
->minutus : minutus
+>minutus : unknown
 >inez : minutus.inez<T0, T1>
->rendalli : rendalli
+>rendalli : unknown
 >moojeni : rendalli.moojeni<T0, T1>
->panglima : panglima
+>panglima : unknown
 >amphibius : panglima.amphibius<T0, T1>
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >falconeri : trivirgatus.falconeri
->caurinus : caurinus
+>caurinus : unknown
 >psilurus : caurinus.psilurus
->gabriellae : gabriellae
+>gabriellae : unknown
 >echinatus : gabriellae.echinatus
->dogramacii : dogramacii
+>dogramacii : unknown
 >aurata : dogramacii.aurata
->imperfecta : imperfecta
+>imperfecta : unknown
 >ciliolabrum : imperfecta.ciliolabrum<T0, T1>
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
->lavali : lavali
+>lavali : unknown
 >beisa : lavali.beisa
 >() => { var y = this; } : () => void
 >y : marcanoi
@@ -9396,10 +9396,10 @@ module howi {
 
         griseoventer(): argurus.oreas { var x: argurus.oreas; () => { var y = this; }; return x; }
 >griseoventer : () => argurus.oreas
->argurus : argurus
+>argurus : unknown
 >oreas : argurus.oreas
 >x : argurus.oreas
->argurus : argurus
+>argurus : unknown
 >oreas : argurus.oreas
 >() => { var y = this; } : () => void
 >y : marcanoi
@@ -9408,42 +9408,42 @@ 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 : quasiater
+>quasiater : unknown
 >wattsi : quasiater.wattsi<T0, T1>
->julianae : julianae
+>julianae : unknown
 >oralis : julianae.oralis<T0, T1>
->julianae : julianae
+>julianae : unknown
 >steerii : julianae.steerii
->lavali : lavali
+>lavali : unknown
 >lepturus : lavali.lepturus
->howi : howi
+>howi : unknown
 >coludo : coludo<T0, T1>
->julianae : julianae
+>julianae : unknown
 >steerii : julianae.steerii
->julianae : julianae
+>julianae : unknown
 >gerbillus : julianae.gerbillus<T0, T1>
->lavali : lavali
+>lavali : unknown
 >thaeleri : lavali.thaeleri
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
 >x : quasiater.wattsi<julianae.oralis<julianae.steerii, lavali.lepturus>, coludo<julianae.steerii, julianae.gerbillus<lavali.thaeleri, quasiater.carolinensis>>>
->quasiater : quasiater
+>quasiater : unknown
 >wattsi : quasiater.wattsi<T0, T1>
->julianae : julianae
+>julianae : unknown
 >oralis : julianae.oralis<T0, T1>
->julianae : julianae
+>julianae : unknown
 >steerii : julianae.steerii
->lavali : lavali
+>lavali : unknown
 >lepturus : lavali.lepturus
->howi : howi
+>howi : unknown
 >coludo : coludo<T0, T1>
->julianae : julianae
+>julianae : unknown
 >steerii : julianae.steerii
->julianae : julianae
+>julianae : unknown
 >gerbillus : julianae.gerbillus<T0, T1>
->lavali : lavali
+>lavali : unknown
 >thaeleri : lavali.thaeleri
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
 >() => { var y = this; } : () => void
 >y : marcanoi
@@ -9452,10 +9452,10 @@ module howi {
 
         yucatanicus(): julianae.nudicaudus { var x: julianae.nudicaudus; () => { var y = this; }; return x; }
 >yucatanicus : () => julianae.nudicaudus
->julianae : julianae
+>julianae : unknown
 >nudicaudus : julianae.nudicaudus
 >x : julianae.nudicaudus
->julianae : julianae
+>julianae : unknown
 >nudicaudus : julianae.nudicaudus
 >() => { var y = this; } : () => void
 >y : marcanoi
@@ -9464,10 +9464,10 @@ module howi {
 
         nigrita(): argurus.peninsulae { var x: argurus.peninsulae; () => { var y = this; }; return x; }
 >nigrita : () => argurus.peninsulae
->argurus : argurus
+>argurus : unknown
 >peninsulae : argurus.peninsulae
 >x : argurus.peninsulae
->argurus : argurus
+>argurus : unknown
 >peninsulae : argurus.peninsulae
 >() => { var y = this; } : () => void
 >y : marcanoi
@@ -9476,18 +9476,18 @@ 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 : argurus
+>argurus : unknown
 >dauricus : argurus.dauricus<T0, T1>
->argurus : argurus
+>argurus : unknown
 >germaini : argurus.germaini
->julianae : julianae
+>julianae : unknown
 >durangae : julianae.durangae
 >x : argurus.dauricus<argurus.germaini, julianae.durangae>
->argurus : argurus
+>argurus : unknown
 >dauricus : argurus.dauricus<T0, T1>
->argurus : argurus
+>argurus : unknown
 >germaini : argurus.germaini
->julianae : julianae
+>julianae : unknown
 >durangae : julianae.durangae
 >() => { var y = this; } : () => void
 >y : marcanoi
@@ -9496,10 +9496,10 @@ module howi {
 
         indefessus(): sagitta.walkeri { var x: sagitta.walkeri; () => { var y = this; }; return x; }
 >indefessus : () => sagitta.walkeri
->sagitta : sagitta
+>sagitta : unknown
 >walkeri : sagitta.walkeri
 >x : sagitta.walkeri
->sagitta : sagitta
+>sagitta : unknown
 >walkeri : sagitta.walkeri
 >() => { var y = this; } : () => void
 >y : marcanoi
@@ -9508,10 +9508,10 @@ module howi {
 
         vuquangensis(): macrorhinos.daphaenodon { var x: macrorhinos.daphaenodon; () => { var y = this; }; return x; }
 >vuquangensis : () => macrorhinos.daphaenodon
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >daphaenodon : macrorhinos.daphaenodon
 >x : macrorhinos.daphaenodon
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >daphaenodon : macrorhinos.daphaenodon
 >() => { var y = this; } : () => void
 >y : marcanoi
@@ -9520,10 +9520,10 @@ module howi {
 
         Zirconium(): lavali.thaeleri { var x: lavali.thaeleri; () => { var y = this; }; return x; }
 >Zirconium : () => lavali.thaeleri
->lavali : lavali
+>lavali : unknown
 >thaeleri : lavali.thaeleri
 >x : lavali.thaeleri
->lavali : lavali
+>lavali : unknown
 >thaeleri : lavali.thaeleri
 >() => { var y = this; } : () => void
 >y : marcanoi
@@ -9532,18 +9532,18 @@ 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 : julianae
+>julianae : unknown
 >oralis : julianae.oralis<T0, T1>
->lavali : lavali
+>lavali : unknown
 >beisa : lavali.beisa
->argurus : argurus
+>argurus : unknown
 >oreas : argurus.oreas
 >x : julianae.oralis<lavali.beisa, argurus.oreas>
->julianae : julianae
+>julianae : unknown
 >oralis : julianae.oralis<T0, T1>
->lavali : lavali
+>lavali : unknown
 >beisa : lavali.beisa
->argurus : argurus
+>argurus : unknown
 >oreas : argurus.oreas
 >() => { var y = this; } : () => void
 >y : marcanoi
@@ -9552,7 +9552,7 @@ module howi {
     }
 }
 module argurus {
->argurus : argurus
+>argurus : typeof argurus
 
     export class gilbertii<T0, T1> {
 >gilbertii : gilbertii<T0, T1>
@@ -9561,10 +9561,10 @@ module argurus {
 
         nasutus(): lavali.lepturus { var x: lavali.lepturus; () => { var y = this; }; return x; }
 >nasutus : () => lavali.lepturus
->lavali : lavali
+>lavali : unknown
 >lepturus : lavali.lepturus
 >x : lavali.lepturus
->lavali : lavali
+>lavali : unknown
 >lepturus : lavali.lepturus
 >() => { var y = this; } : () => void
 >y : gilbertii<T0, T1>
@@ -9573,10 +9573,10 @@ module argurus {
 
         poecilops(): julianae.steerii { var x: julianae.steerii; () => { var y = this; }; return x; }
 >poecilops : () => julianae.steerii
->julianae : julianae
+>julianae : unknown
 >steerii : julianae.steerii
 >x : julianae.steerii
->julianae : julianae
+>julianae : unknown
 >steerii : julianae.steerii
 >() => { var y = this; } : () => void
 >y : gilbertii<T0, T1>
@@ -9585,18 +9585,18 @@ 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 : samarensis
+>samarensis : unknown
 >fuscus : samarensis.fuscus<T0, T1>
->argurus : argurus
+>argurus : unknown
 >peninsulae : peninsulae
->lavali : lavali
+>lavali : unknown
 >lepturus : lavali.lepturus
 >x : samarensis.fuscus<peninsulae, lavali.lepturus>
->samarensis : samarensis
+>samarensis : unknown
 >fuscus : samarensis.fuscus<T0, T1>
->argurus : argurus
+>argurus : unknown
 >peninsulae : peninsulae
->lavali : lavali
+>lavali : unknown
 >lepturus : lavali.lepturus
 >() => { var y = this; } : () => void
 >y : gilbertii<T0, T1>
@@ -9605,18 +9605,18 @@ 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 : petrophilus
+>petrophilus : unknown
 >rosalia : petrophilus.rosalia<T0, T1>
->lavali : lavali
+>lavali : unknown
 >xanthognathus : lavali.xanthognathus
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >oconnelli : trivirgatus.oconnelli
 >x : petrophilus.rosalia<lavali.xanthognathus, trivirgatus.oconnelli>
->petrophilus : petrophilus
+>petrophilus : unknown
 >rosalia : petrophilus.rosalia<T0, T1>
->lavali : lavali
+>lavali : unknown
 >xanthognathus : lavali.xanthognathus
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >oconnelli : trivirgatus.oconnelli
 >() => { var y = this; } : () => void
 >y : gilbertii<T0, T1>
@@ -9625,18 +9625,18 @@ 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 : ruatanica
+>ruatanica : unknown
 >Praseodymium : ruatanica.Praseodymium<T0, T1>
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >jugularis : Lanthanum.jugularis
->argurus : argurus
+>argurus : unknown
 >oreas : oreas
 >x : ruatanica.Praseodymium<Lanthanum.jugularis, oreas>
->ruatanica : ruatanica
+>ruatanica : unknown
 >Praseodymium : ruatanica.Praseodymium<T0, T1>
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >jugularis : Lanthanum.jugularis
->argurus : argurus
+>argurus : unknown
 >oreas : oreas
 >() => { var y = this; } : () => void
 >y : gilbertii<T0, T1>
@@ -9645,18 +9645,18 @@ 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 : minutus
+>minutus : unknown
 >inez : minutus.inez<T0, T1>
->rendalli : rendalli
+>rendalli : unknown
 >zuluensis : rendalli.zuluensis
->rionegrensis : rionegrensis
+>rionegrensis : unknown
 >caniventer : rionegrensis.caniventer
 >x : minutus.inez<rendalli.zuluensis, rionegrensis.caniventer>
->minutus : minutus
+>minutus : unknown
 >inez : minutus.inez<T0, T1>
->rendalli : rendalli
+>rendalli : unknown
 >zuluensis : rendalli.zuluensis
->rionegrensis : rionegrensis
+>rionegrensis : unknown
 >caniventer : rionegrensis.caniventer
 >() => { var y = this; } : () => void
 >y : gilbertii<T0, T1>
@@ -9665,10 +9665,10 @@ module argurus {
 
         pipistrellus(): quasiater.carolinensis { var x: quasiater.carolinensis; () => { var y = this; }; return x; }
 >pipistrellus : () => quasiater.carolinensis
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
 >x : quasiater.carolinensis
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
 >() => { var y = this; } : () => void
 >y : gilbertii<T0, T1>
@@ -9677,10 +9677,10 @@ module argurus {
 
         paranus(): lutreolus.punicus { var x: lutreolus.punicus; () => { var y = this; }; return x; }
 >paranus : () => lutreolus.punicus
->lutreolus : lutreolus
+>lutreolus : unknown
 >punicus : lutreolus.punicus
 >x : lutreolus.punicus
->lutreolus : lutreolus
+>lutreolus : unknown
 >punicus : lutreolus.punicus
 >() => { var y = this; } : () => void
 >y : gilbertii<T0, T1>
@@ -9689,18 +9689,18 @@ 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 : nigra
+>nigra : unknown
 >thalia : nigra.thalia<T0, T1>
->lutreolus : lutreolus
+>lutreolus : unknown
 >schlegeli : lutreolus.schlegeli
->julianae : julianae
+>julianae : unknown
 >sumatrana : julianae.sumatrana
 >x : nigra.thalia<lutreolus.schlegeli, julianae.sumatrana>
->nigra : nigra
+>nigra : unknown
 >thalia : nigra.thalia<T0, T1>
->lutreolus : lutreolus
+>lutreolus : unknown
 >schlegeli : lutreolus.schlegeli
->julianae : julianae
+>julianae : unknown
 >sumatrana : julianae.sumatrana
 >() => { var y = this; } : () => void
 >y : gilbertii<T0, T1>
@@ -9709,18 +9709,18 @@ 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 : nigra
+>nigra : unknown
 >dolichurus : nigra.dolichurus<T0, T1>
->lavali : lavali
+>lavali : unknown
 >lepturus : lavali.lepturus
->samarensis : samarensis
+>samarensis : unknown
 >pallidus : samarensis.pallidus
 >x : nigra.dolichurus<lavali.lepturus, samarensis.pallidus>
->nigra : nigra
+>nigra : unknown
 >dolichurus : nigra.dolichurus<T0, T1>
->lavali : lavali
+>lavali : unknown
 >lepturus : lavali.lepturus
->samarensis : samarensis
+>samarensis : unknown
 >pallidus : samarensis.pallidus
 >() => { var y = this; } : () => void
 >y : gilbertii<T0, T1>
@@ -9729,10 +9729,10 @@ module argurus {
 
         oreopolus(): minutus.portoricensis { var x: minutus.portoricensis; () => { var y = this; }; return x; }
 >oreopolus : () => minutus.portoricensis
->minutus : minutus
+>minutus : unknown
 >portoricensis : minutus.portoricensis
 >x : minutus.portoricensis
->minutus : minutus
+>minutus : unknown
 >portoricensis : minutus.portoricensis
 >() => { var y = this; } : () => void
 >y : gilbertii<T0, T1>
@@ -9741,18 +9741,18 @@ 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 : daubentonii
+>daubentonii : unknown
 >arboreus : daubentonii.arboreus<T0, T1>
->lavali : lavali
+>lavali : unknown
 >otion : lavali.otion
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >konganensis : macrorhinos.konganensis
 >x : daubentonii.arboreus<lavali.otion, macrorhinos.konganensis>
->daubentonii : daubentonii
+>daubentonii : unknown
 >arboreus : daubentonii.arboreus<T0, T1>
->lavali : lavali
+>lavali : unknown
 >otion : lavali.otion
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >konganensis : macrorhinos.konganensis
 >() => { var y = this; } : () => void
 >y : gilbertii<T0, T1>
@@ -9761,32 +9761,32 @@ module argurus {
     }
 }
 module petrophilus {
->petrophilus : petrophilus
+>petrophilus : typeof petrophilus
 
     export class minutilla {
 >minutilla : minutilla
     }
 }
 module lutreolus {
->lutreolus : lutreolus
+>lutreolus : typeof lutreolus
 
     export class punicus {
 >punicus : punicus
 
         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 : gabriellae
+>gabriellae : unknown
 >klossii : gabriellae.klossii<T0, T1>
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >jugularis : Lanthanum.jugularis
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >jugularis : Lanthanum.jugularis
 >x : gabriellae.klossii<Lanthanum.jugularis, Lanthanum.jugularis>
->gabriellae : gabriellae
+>gabriellae : unknown
 >klossii : gabriellae.klossii<T0, T1>
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >jugularis : Lanthanum.jugularis
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >jugularis : Lanthanum.jugularis
 >() => { var y = this; } : () => void
 >y : punicus
@@ -9795,18 +9795,18 @@ 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 : caurinus
+>caurinus : unknown
 >mahaganus : caurinus.mahaganus<T0, T1>
->julianae : julianae
+>julianae : unknown
 >nudicaudus : julianae.nudicaudus
->lavali : lavali
+>lavali : unknown
 >otion : lavali.otion
 >x : caurinus.mahaganus<julianae.nudicaudus, lavali.otion>
->caurinus : caurinus
+>caurinus : unknown
 >mahaganus : caurinus.mahaganus<T0, T1>
->julianae : julianae
+>julianae : unknown
 >nudicaudus : julianae.nudicaudus
->lavali : lavali
+>lavali : unknown
 >otion : lavali.otion
 >() => { var y = this; } : () => void
 >y : punicus
@@ -9815,10 +9815,10 @@ module lutreolus {
 
         erica(): dogramacii.koepckeae { var x: dogramacii.koepckeae; () => { var y = this; }; return x; }
 >erica : () => dogramacii.koepckeae
->dogramacii : dogramacii
+>dogramacii : unknown
 >koepckeae : dogramacii.koepckeae
 >x : dogramacii.koepckeae
->dogramacii : dogramacii
+>dogramacii : unknown
 >koepckeae : dogramacii.koepckeae
 >() => { var y = this; } : () => void
 >y : punicus
@@ -9827,10 +9827,10 @@ module lutreolus {
 
         trichura(): macrorhinos.konganensis { var x: macrorhinos.konganensis; () => { var y = this; }; return x; }
 >trichura : () => macrorhinos.konganensis
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >konganensis : macrorhinos.konganensis
 >x : macrorhinos.konganensis
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >konganensis : macrorhinos.konganensis
 >() => { var y = this; } : () => void
 >y : punicus
@@ -9839,18 +9839,18 @@ 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 : panglima
+>panglima : unknown
 >fundatus : panglima.fundatus<T0, T1>
->gabriellae : gabriellae
+>gabriellae : unknown
 >amicus : gabriellae.amicus
->lutreolus : lutreolus
+>lutreolus : unknown
 >foina : foina
 >x : panglima.fundatus<gabriellae.amicus, foina>
->panglima : panglima
+>panglima : unknown
 >fundatus : panglima.fundatus<T0, T1>
->gabriellae : gabriellae
+>gabriellae : unknown
 >amicus : gabriellae.amicus
->lutreolus : lutreolus
+>lutreolus : unknown
 >foina : foina
 >() => { var y = this; } : () => void
 >y : punicus
@@ -9859,18 +9859,18 @@ 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 : panamensis
+>panamensis : unknown
 >linulus : panamensis.linulus<T0, T1>
->lavali : lavali
+>lavali : unknown
 >xanthognathus : lavali.xanthognathus
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >konganensis : macrorhinos.konganensis
 >x : panamensis.linulus<lavali.xanthognathus, macrorhinos.konganensis>
->panamensis : panamensis
+>panamensis : unknown
 >linulus : panamensis.linulus<T0, T1>
->lavali : lavali
+>lavali : unknown
 >xanthognathus : lavali.xanthognathus
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >konganensis : macrorhinos.konganensis
 >() => { var y = this; } : () => void
 >y : punicus
@@ -9879,10 +9879,10 @@ module lutreolus {
 
         marshalli(): julianae.nudicaudus { var x: julianae.nudicaudus; () => { var y = this; }; return x; }
 >marshalli : () => julianae.nudicaudus
->julianae : julianae
+>julianae : unknown
 >nudicaudus : julianae.nudicaudus
 >x : julianae.nudicaudus
->julianae : julianae
+>julianae : unknown
 >nudicaudus : julianae.nudicaudus
 >() => { var y = this; } : () => void
 >y : punicus
@@ -9891,10 +9891,10 @@ module lutreolus {
 
         Zinc(): julianae.galapagoensis { var x: julianae.galapagoensis; () => { var y = this; }; return x; }
 >Zinc : () => julianae.galapagoensis
->julianae : julianae
+>julianae : unknown
 >galapagoensis : julianae.galapagoensis
 >x : julianae.galapagoensis
->julianae : julianae
+>julianae : unknown
 >galapagoensis : julianae.galapagoensis
 >() => { var y = this; } : () => void
 >y : punicus
@@ -9903,18 +9903,18 @@ 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 : howi
+>howi : unknown
 >coludo : howi.coludo<T0, T1>
->lavali : lavali
+>lavali : unknown
 >lepturus : lavali.lepturus
->lutreolus : lutreolus
+>lutreolus : unknown
 >punicus : punicus
 >x : howi.coludo<lavali.lepturus, punicus>
->howi : howi
+>howi : unknown
 >coludo : howi.coludo<T0, T1>
->lavali : lavali
+>lavali : unknown
 >lepturus : lavali.lepturus
->lutreolus : lutreolus
+>lutreolus : unknown
 >punicus : punicus
 >() => { var y = this; } : () => void
 >y : punicus
@@ -9923,18 +9923,18 @@ 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 : ruatanica
+>ruatanica : unknown
 >hector : ruatanica.hector<T0, T1>
->lutreolus : lutreolus
+>lutreolus : unknown
 >schlegeli : schlegeli
->provocax : provocax
+>provocax : unknown
 >melanoleuca : provocax.melanoleuca
 >x : ruatanica.hector<schlegeli, provocax.melanoleuca>
->ruatanica : ruatanica
+>ruatanica : unknown
 >hector : ruatanica.hector<T0, T1>
->lutreolus : lutreolus
+>lutreolus : unknown
 >schlegeli : schlegeli
->provocax : provocax
+>provocax : unknown
 >melanoleuca : provocax.melanoleuca
 >() => { var y = this; } : () => void
 >y : punicus
@@ -9943,10 +9943,10 @@ module lutreolus {
 
         ischyrus(): lavali.lepturus { var x: lavali.lepturus; () => { var y = this; }; return x; }
 >ischyrus : () => lavali.lepturus
->lavali : lavali
+>lavali : unknown
 >lepturus : lavali.lepturus
 >x : lavali.lepturus
->lavali : lavali
+>lavali : unknown
 >lepturus : lavali.lepturus
 >() => { var y = this; } : () => void
 >y : punicus
@@ -9955,10 +9955,10 @@ module lutreolus {
 
         tenuis(): macrorhinos.daphaenodon { var x: macrorhinos.daphaenodon; () => { var y = this; }; return x; }
 >tenuis : () => macrorhinos.daphaenodon
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >daphaenodon : macrorhinos.daphaenodon
 >x : macrorhinos.daphaenodon
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >daphaenodon : macrorhinos.daphaenodon
 >() => { var y = this; } : () => void
 >y : punicus
@@ -9967,10 +9967,10 @@ module lutreolus {
 
         Helium(): julianae.acariensis { var x: julianae.acariensis; () => { var y = this; }; return x; }
 >Helium : () => julianae.acariensis
->julianae : julianae
+>julianae : unknown
 >acariensis : julianae.acariensis
 >x : julianae.acariensis
->julianae : julianae
+>julianae : unknown
 >acariensis : julianae.acariensis
 >() => { var y = this; } : () => void
 >y : punicus
@@ -9979,17 +9979,17 @@ module lutreolus {
     }
 }
 module macrorhinos {
->macrorhinos : macrorhinos
+>macrorhinos : typeof macrorhinos
 
     export class daphaenodon {
 >daphaenodon : daphaenodon
 
         bredanensis(): julianae.sumatrana { var x: julianae.sumatrana; () => { var y = this; }; return x; }
 >bredanensis : () => julianae.sumatrana
->julianae : julianae
+>julianae : unknown
 >sumatrana : julianae.sumatrana
 >x : julianae.sumatrana
->julianae : julianae
+>julianae : unknown
 >sumatrana : julianae.sumatrana
 >() => { var y = this; } : () => void
 >y : daphaenodon
@@ -9998,18 +9998,18 @@ 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 : howi
+>howi : unknown
 >coludo : howi.coludo<T0, T1>
->argurus : argurus
+>argurus : unknown
 >oreas : argurus.oreas
->howi : howi
+>howi : unknown
 >marcanoi : howi.marcanoi
 >x : howi.coludo<argurus.oreas, howi.marcanoi>
->howi : howi
+>howi : unknown
 >coludo : howi.coludo<T0, T1>
->argurus : argurus
+>argurus : unknown
 >oreas : argurus.oreas
->howi : howi
+>howi : unknown
 >marcanoi : howi.marcanoi
 >() => { var y = this; } : () => void
 >y : daphaenodon
@@ -10018,42 +10018,42 @@ 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 : julianae
+>julianae : unknown
 >gerbillus : julianae.gerbillus<T0, T1>
->minutus : minutus
+>minutus : unknown
 >inez : minutus.inez<T0, T1>
->rendalli : rendalli
+>rendalli : unknown
 >moojeni : rendalli.moojeni<T0, T1>
->panglima : panglima
+>panglima : unknown
 >amphibius : panglima.amphibius<T0, T1>
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >falconeri : trivirgatus.falconeri
->caurinus : caurinus
+>caurinus : unknown
 >psilurus : caurinus.psilurus
->gabriellae : gabriellae
+>gabriellae : unknown
 >echinatus : gabriellae.echinatus
->dogramacii : dogramacii
+>dogramacii : unknown
 >aurata : dogramacii.aurata
->lavali : lavali
+>lavali : unknown
 >otion : lavali.otion
 >x : julianae.gerbillus<minutus.inez<rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>, dogramacii.aurata>, lavali.otion>
->julianae : julianae
+>julianae : unknown
 >gerbillus : julianae.gerbillus<T0, T1>
->minutus : minutus
+>minutus : unknown
 >inez : minutus.inez<T0, T1>
->rendalli : rendalli
+>rendalli : unknown
 >moojeni : rendalli.moojeni<T0, T1>
->panglima : panglima
+>panglima : unknown
 >amphibius : panglima.amphibius<T0, T1>
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >falconeri : trivirgatus.falconeri
->caurinus : caurinus
+>caurinus : unknown
 >psilurus : caurinus.psilurus
->gabriellae : gabriellae
+>gabriellae : unknown
 >echinatus : gabriellae.echinatus
->dogramacii : dogramacii
+>dogramacii : unknown
 >aurata : dogramacii.aurata
->lavali : lavali
+>lavali : unknown
 >otion : lavali.otion
 >() => { var y = this; } : () => void
 >y : daphaenodon
@@ -10062,10 +10062,10 @@ module macrorhinos {
 
         aureocollaris(): quasiater.carolinensis { var x: quasiater.carolinensis; () => { var y = this; }; return x; }
 >aureocollaris : () => quasiater.carolinensis
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
 >x : quasiater.carolinensis
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
 >() => { var y = this; } : () => void
 >y : daphaenodon
@@ -10074,10 +10074,10 @@ module macrorhinos {
 
         flavipes(): petrophilus.minutilla { var x: petrophilus.minutilla; () => { var y = this; }; return x; }
 >flavipes : () => petrophilus.minutilla
->petrophilus : petrophilus
+>petrophilus : unknown
 >minutilla : petrophilus.minutilla
 >x : petrophilus.minutilla
->petrophilus : petrophilus
+>petrophilus : unknown
 >minutilla : petrophilus.minutilla
 >() => { var y = this; } : () => void
 >y : daphaenodon
@@ -10086,18 +10086,18 @@ 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 : trivirgatus
+>trivirgatus : unknown
 >lotor : trivirgatus.lotor<T0, T1>
->lutreolus : lutreolus
+>lutreolus : unknown
 >foina : lutreolus.foina
->dogramacii : dogramacii
+>dogramacii : unknown
 >robustulus : dogramacii.robustulus
 >x : trivirgatus.lotor<lutreolus.foina, dogramacii.robustulus>
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >lotor : trivirgatus.lotor<T0, T1>
->lutreolus : lutreolus
+>lutreolus : unknown
 >foina : lutreolus.foina
->dogramacii : dogramacii
+>dogramacii : unknown
 >robustulus : dogramacii.robustulus
 >() => { var y = this; } : () => void
 >y : daphaenodon
@@ -10106,7 +10106,7 @@ module macrorhinos {
     }
 }
 module sagitta {
->sagitta : sagitta
+>sagitta : typeof sagitta
 
     export class cinereus<T0, T1> {
 >cinereus : cinereus<T0, T1>
@@ -10115,26 +10115,26 @@ module sagitta {
 
         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 : rendalli
+>rendalli : unknown
 >crenulata : rendalli.crenulata<T0, T1>
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >konganensis : macrorhinos.konganensis
->nigra : nigra
+>nigra : unknown
 >dolichurus : nigra.dolichurus<T0, T1>
->lavali : lavali
+>lavali : unknown
 >lepturus : lavali.lepturus
->samarensis : samarensis
+>samarensis : unknown
 >pallidus : samarensis.pallidus
 >x : rendalli.crenulata<macrorhinos.konganensis, nigra.dolichurus<lavali.lepturus, samarensis.pallidus>>
->rendalli : rendalli
+>rendalli : unknown
 >crenulata : rendalli.crenulata<T0, T1>
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >konganensis : macrorhinos.konganensis
->nigra : nigra
+>nigra : unknown
 >dolichurus : nigra.dolichurus<T0, T1>
->lavali : lavali
+>lavali : unknown
 >lepturus : lavali.lepturus
->samarensis : samarensis
+>samarensis : unknown
 >pallidus : samarensis.pallidus
 >() => { var y = this; } : () => void
 >y : cinereus<T0, T1>
@@ -10143,26 +10143,26 @@ 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 : daubentonii
+>daubentonii : unknown
 >nigricans : daubentonii.nigricans<T0, T1>
->caurinus : caurinus
+>caurinus : unknown
 >megaphyllus : caurinus.megaphyllus
->quasiater : quasiater
+>quasiater : unknown
 >wattsi : quasiater.wattsi<T0, T1>
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >jugularis : Lanthanum.jugularis
->julianae : julianae
+>julianae : unknown
 >sumatrana : julianae.sumatrana
 >x : daubentonii.nigricans<caurinus.megaphyllus, quasiater.wattsi<Lanthanum.jugularis, julianae.sumatrana>>
->daubentonii : daubentonii
+>daubentonii : unknown
 >nigricans : daubentonii.nigricans<T0, T1>
->caurinus : caurinus
+>caurinus : unknown
 >megaphyllus : caurinus.megaphyllus
->quasiater : quasiater
+>quasiater : unknown
 >wattsi : quasiater.wattsi<T0, T1>
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >jugularis : Lanthanum.jugularis
->julianae : julianae
+>julianae : unknown
 >sumatrana : julianae.sumatrana
 >() => { var y = this; } : () => void
 >y : cinereus<T0, T1>
@@ -10171,18 +10171,18 @@ 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 : daubentonii
+>daubentonii : unknown
 >arboreus : daubentonii.arboreus<T0, T1>
->gabriellae : gabriellae
+>gabriellae : unknown
 >amicus : gabriellae.amicus
->argurus : argurus
+>argurus : unknown
 >germaini : argurus.germaini
 >x : daubentonii.arboreus<gabriellae.amicus, argurus.germaini>
->daubentonii : daubentonii
+>daubentonii : unknown
 >arboreus : daubentonii.arboreus<T0, T1>
->gabriellae : gabriellae
+>gabriellae : unknown
 >amicus : gabriellae.amicus
->argurus : argurus
+>argurus : unknown
 >germaini : argurus.germaini
 >() => { var y = this; } : () => void
 >y : cinereus<T0, T1>
@@ -10191,18 +10191,18 @@ 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 : panglima
+>panglima : unknown
 >fundatus : panglima.fundatus<T0, T1>
->petrophilus : petrophilus
+>petrophilus : unknown
 >minutilla : petrophilus.minutilla
->dammermani : dammermani
+>dammermani : unknown
 >melanops : dammermani.melanops
 >x : panglima.fundatus<petrophilus.minutilla, dammermani.melanops>
->panglima : panglima
+>panglima : unknown
 >fundatus : panglima.fundatus<T0, T1>
->petrophilus : petrophilus
+>petrophilus : unknown
 >minutilla : petrophilus.minutilla
->dammermani : dammermani
+>dammermani : unknown
 >melanops : dammermani.melanops
 >() => { var y = this; } : () => void
 >y : cinereus<T0, T1>
@@ -10211,18 +10211,18 @@ 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 : dammermani
+>dammermani : unknown
 >siberu : dammermani.siberu<T0, T1>
->dogramacii : dogramacii
+>dogramacii : unknown
 >aurata : dogramacii.aurata
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >oconnelli : trivirgatus.oconnelli
 >x : dammermani.siberu<dogramacii.aurata, trivirgatus.oconnelli>
->dammermani : dammermani
+>dammermani : unknown
 >siberu : dammermani.siberu<T0, T1>
->dogramacii : dogramacii
+>dogramacii : unknown
 >aurata : dogramacii.aurata
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >oconnelli : trivirgatus.oconnelli
 >() => { var y = this; } : () => void
 >y : cinereus<T0, T1>
@@ -10231,10 +10231,10 @@ module sagitta {
 
         sphinx(): minutus.portoricensis { var x: minutus.portoricensis; () => { var y = this; }; return x; }
 >sphinx : () => minutus.portoricensis
->minutus : minutus
+>minutus : unknown
 >portoricensis : minutus.portoricensis
 >x : minutus.portoricensis
->minutus : minutus
+>minutus : unknown
 >portoricensis : minutus.portoricensis
 >() => { var y = this; } : () => void
 >y : cinereus<T0, T1>
@@ -10243,18 +10243,18 @@ 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 : argurus
+>argurus : unknown
 >wetmorei : argurus.wetmorei<T0, T1>
->argurus : argurus
+>argurus : unknown
 >oreas : argurus.oreas
->howi : howi
+>howi : unknown
 >marcanoi : howi.marcanoi
 >x : argurus.wetmorei<argurus.oreas, howi.marcanoi>
->argurus : argurus
+>argurus : unknown
 >wetmorei : argurus.wetmorei<T0, T1>
->argurus : argurus
+>argurus : unknown
 >oreas : argurus.oreas
->howi : howi
+>howi : unknown
 >marcanoi : howi.marcanoi
 >() => { var y = this; } : () => void
 >y : cinereus<T0, T1>
@@ -10263,18 +10263,18 @@ 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 : petrophilus
+>petrophilus : unknown
 >sodyi : petrophilus.sodyi<T0, T1>
->argurus : argurus
+>argurus : unknown
 >luctuosa : argurus.luctuosa
->julianae : julianae
+>julianae : unknown
 >sumatrana : julianae.sumatrana
 >x : petrophilus.sodyi<argurus.luctuosa, julianae.sumatrana>
->petrophilus : petrophilus
+>petrophilus : unknown
 >sodyi : petrophilus.sodyi<T0, T1>
->argurus : argurus
+>argurus : unknown
 >luctuosa : argurus.luctuosa
->julianae : julianae
+>julianae : unknown
 >sumatrana : julianae.sumatrana
 >() => { var y = this; } : () => void
 >y : cinereus<T0, T1>
@@ -10283,10 +10283,10 @@ module sagitta {
 
         fimbriatus(): provocax.melanoleuca { var x: provocax.melanoleuca; () => { var y = this; }; return x; }
 >fimbriatus : () => provocax.melanoleuca
->provocax : provocax
+>provocax : unknown
 >melanoleuca : provocax.melanoleuca
 >x : provocax.melanoleuca
->provocax : provocax
+>provocax : unknown
 >melanoleuca : provocax.melanoleuca
 >() => { var y = this; } : () => void
 >y : cinereus<T0, T1>
@@ -10295,18 +10295,18 @@ 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 : nigra
+>nigra : unknown
 >gracilis : nigra.gracilis<T0, T1>
->argurus : argurus
+>argurus : unknown
 >luctuosa : argurus.luctuosa
->imperfecta : imperfecta
+>imperfecta : unknown
 >subspinosus : imperfecta.subspinosus
 >x : nigra.gracilis<argurus.luctuosa, imperfecta.subspinosus>
->nigra : nigra
+>nigra : unknown
 >gracilis : nigra.gracilis<T0, T1>
->argurus : argurus
+>argurus : unknown
 >luctuosa : argurus.luctuosa
->imperfecta : imperfecta
+>imperfecta : unknown
 >subspinosus : imperfecta.subspinosus
 >() => { var y = this; } : () => void
 >y : cinereus<T0, T1>
@@ -10315,10 +10315,10 @@ module sagitta {
 
         epimelas(): sagitta.stolzmanni { var x: sagitta.stolzmanni; () => { var y = this; }; return x; }
 >epimelas : () => stolzmanni
->sagitta : sagitta
+>sagitta : unknown
 >stolzmanni : stolzmanni
 >x : stolzmanni
->sagitta : sagitta
+>sagitta : unknown
 >stolzmanni : stolzmanni
 >() => { var y = this; } : () => void
 >y : cinereus<T0, T1>
@@ -10327,18 +10327,18 @@ 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 : samarensis
+>samarensis : unknown
 >fuscus : samarensis.fuscus<T0, T1>
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
->sagitta : sagitta
+>sagitta : unknown
 >stolzmanni : stolzmanni
 >x : samarensis.fuscus<quasiater.carolinensis, stolzmanni>
->samarensis : samarensis
+>samarensis : unknown
 >fuscus : samarensis.fuscus<T0, T1>
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
->sagitta : sagitta
+>sagitta : unknown
 >stolzmanni : stolzmanni
 >() => { var y = this; } : () => void
 >y : cinereus<T0, T1>
@@ -10347,7 +10347,7 @@ module sagitta {
     }
 }
 module nigra {
->nigra : nigra
+>nigra : typeof nigra
 
     export class caucasica<T0, T1> {
 >caucasica : caucasica<T0, T1>
@@ -10356,17 +10356,17 @@ module nigra {
     }
 }
 module gabriellae {
->gabriellae : gabriellae
+>gabriellae : typeof gabriellae
 
     export class klossii<T0, T1> extends imperfecta.lasiurus<dogramacii.robustulus, caurinus.psilurus> {
 >klossii : klossii<T0, T1>
 >T0 : T0
 >T1 : T1
->imperfecta : imperfecta
+>imperfecta : unknown
 >lasiurus : imperfecta.lasiurus<T0, T1>
->dogramacii : dogramacii
+>dogramacii : unknown
 >robustulus : dogramacii.robustulus
->caurinus : caurinus
+>caurinus : unknown
 >psilurus : caurinus.psilurus
     }
     export class amicus {
@@ -10374,10 +10374,10 @@ module gabriellae {
 
         pirrensis(): argurus.luctuosa { var x: argurus.luctuosa; () => { var y = this; }; return x; }
 >pirrensis : () => argurus.luctuosa
->argurus : argurus
+>argurus : unknown
 >luctuosa : argurus.luctuosa
 >x : argurus.luctuosa
->argurus : argurus
+>argurus : unknown
 >luctuosa : argurus.luctuosa
 >() => { var y = this; } : () => void
 >y : amicus
@@ -10386,18 +10386,18 @@ 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 : panglima
+>panglima : unknown
 >abidi : panglima.abidi<T0, T1>
->lutreolus : lutreolus
+>lutreolus : unknown
 >foina : lutreolus.foina
->argurus : argurus
+>argurus : unknown
 >peninsulae : argurus.peninsulae
 >x : panglima.abidi<lutreolus.foina, argurus.peninsulae>
->panglima : panglima
+>panglima : unknown
 >abidi : panglima.abidi<T0, T1>
->lutreolus : lutreolus
+>lutreolus : unknown
 >foina : lutreolus.foina
->argurus : argurus
+>argurus : unknown
 >peninsulae : argurus.peninsulae
 >() => { var y = this; } : () => void
 >y : amicus
@@ -10406,10 +10406,10 @@ module gabriellae {
 
         voratus(): lavali.thaeleri { var x: lavali.thaeleri; () => { var y = this; }; return x; }
 >voratus : () => lavali.thaeleri
->lavali : lavali
+>lavali : unknown
 >thaeleri : lavali.thaeleri
 >x : lavali.thaeleri
->lavali : lavali
+>lavali : unknown
 >thaeleri : lavali.thaeleri
 >() => { var y = this; } : () => void
 >y : amicus
@@ -10418,18 +10418,18 @@ 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 : trivirgatus
+>trivirgatus : unknown
 >lotor : trivirgatus.lotor<T0, T1>
->argurus : argurus
+>argurus : unknown
 >luctuosa : argurus.luctuosa
->lavali : lavali
+>lavali : unknown
 >wilsoni : lavali.wilsoni
 >x : trivirgatus.lotor<argurus.luctuosa, lavali.wilsoni>
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >lotor : trivirgatus.lotor<T0, T1>
->argurus : argurus
+>argurus : unknown
 >luctuosa : argurus.luctuosa
->lavali : lavali
+>lavali : unknown
 >wilsoni : lavali.wilsoni
 >() => { var y = this; } : () => void
 >y : amicus
@@ -10438,10 +10438,10 @@ module gabriellae {
 
         hooperi(): caurinus.psilurus { var x: caurinus.psilurus; () => { var y = this; }; return x; }
 >hooperi : () => caurinus.psilurus
->caurinus : caurinus
+>caurinus : unknown
 >psilurus : caurinus.psilurus
 >x : caurinus.psilurus
->caurinus : caurinus
+>caurinus : unknown
 >psilurus : caurinus.psilurus
 >() => { var y = this; } : () => void
 >y : amicus
@@ -10450,18 +10450,18 @@ 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 : rendalli
+>rendalli : unknown
 >crenulata : rendalli.crenulata<T0, T1>
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >falconeri : trivirgatus.falconeri
->howi : howi
+>howi : unknown
 >marcanoi : howi.marcanoi
 >x : rendalli.crenulata<trivirgatus.falconeri, howi.marcanoi>
->rendalli : rendalli
+>rendalli : unknown
 >crenulata : rendalli.crenulata<T0, T1>
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >falconeri : trivirgatus.falconeri
->howi : howi
+>howi : unknown
 >marcanoi : howi.marcanoi
 >() => { var y = this; } : () => void
 >y : amicus
@@ -10470,26 +10470,26 @@ 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 : ruatanica
+>ruatanica : unknown
 >hector : ruatanica.hector<T0, T1>
->julianae : julianae
+>julianae : unknown
 >sumatrana : julianae.sumatrana
->samarensis : samarensis
+>samarensis : unknown
 >pelurus : samarensis.pelurus<T0, T1>
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >jugularis : Lanthanum.jugularis
->sagitta : sagitta
+>sagitta : unknown
 >walkeri : sagitta.walkeri
 >x : ruatanica.hector<julianae.sumatrana, samarensis.pelurus<Lanthanum.jugularis, sagitta.walkeri>>
->ruatanica : ruatanica
+>ruatanica : unknown
 >hector : ruatanica.hector<T0, T1>
->julianae : julianae
+>julianae : unknown
 >sumatrana : julianae.sumatrana
->samarensis : samarensis
+>samarensis : unknown
 >pelurus : samarensis.pelurus<T0, T1>
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >jugularis : Lanthanum.jugularis
->sagitta : sagitta
+>sagitta : unknown
 >walkeri : sagitta.walkeri
 >() => { var y = this; } : () => void
 >y : amicus
@@ -10498,18 +10498,18 @@ 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 : daubentonii
+>daubentonii : unknown
 >arboreus : daubentonii.arboreus<T0, T1>
->dogramacii : dogramacii
+>dogramacii : unknown
 >kaiseri : dogramacii.kaiseri
->lutreolus : lutreolus
+>lutreolus : unknown
 >punicus : lutreolus.punicus
 >x : daubentonii.arboreus<dogramacii.kaiseri, lutreolus.punicus>
->daubentonii : daubentonii
+>daubentonii : unknown
 >arboreus : daubentonii.arboreus<T0, T1>
->dogramacii : dogramacii
+>dogramacii : unknown
 >kaiseri : dogramacii.kaiseri
->lutreolus : lutreolus
+>lutreolus : unknown
 >punicus : lutreolus.punicus
 >() => { var y = this; } : () => void
 >y : amicus
@@ -10518,18 +10518,18 @@ 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 : macrorhinos
+>macrorhinos : unknown
 >marmosurus : macrorhinos.marmosurus<T0, T1>
->sagitta : sagitta
+>sagitta : unknown
 >stolzmanni : sagitta.stolzmanni
->lavali : lavali
+>lavali : unknown
 >thaeleri : lavali.thaeleri
 >x : macrorhinos.marmosurus<sagitta.stolzmanni, lavali.thaeleri>
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >marmosurus : macrorhinos.marmosurus<T0, T1>
->sagitta : sagitta
+>sagitta : unknown
 >stolzmanni : sagitta.stolzmanni
->lavali : lavali
+>lavali : unknown
 >thaeleri : lavali.thaeleri
 >() => { var y = this; } : () => void
 >y : amicus
@@ -10538,26 +10538,26 @@ 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 : samarensis
+>samarensis : unknown
 >fuscus : samarensis.fuscus<T0, T1>
->julianae : julianae
+>julianae : unknown
 >oralis : julianae.oralis<T0, T1>
->julianae : julianae
+>julianae : unknown
 >steerii : julianae.steerii
->lavali : lavali
+>lavali : unknown
 >lepturus : lavali.lepturus
->dogramacii : dogramacii
+>dogramacii : unknown
 >koepckeae : dogramacii.koepckeae
 >x : samarensis.fuscus<julianae.oralis<julianae.steerii, lavali.lepturus>, dogramacii.koepckeae>
->samarensis : samarensis
+>samarensis : unknown
 >fuscus : samarensis.fuscus<T0, T1>
->julianae : julianae
+>julianae : unknown
 >oralis : julianae.oralis<T0, T1>
->julianae : julianae
+>julianae : unknown
 >steerii : julianae.steerii
->lavali : lavali
+>lavali : unknown
 >lepturus : lavali.lepturus
->dogramacii : dogramacii
+>dogramacii : unknown
 >koepckeae : dogramacii.koepckeae
 >() => { var y = this; } : () => void
 >y : amicus
@@ -10569,26 +10569,26 @@ 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 : howi
+>howi : unknown
 >coludo : howi.coludo<T0, T1>
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >daphaenodon : macrorhinos.daphaenodon
->panglima : panglima
+>panglima : unknown
 >amphibius : panglima.amphibius<T0, T1>
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >daphaenodon : macrorhinos.daphaenodon
->patas : patas
+>patas : unknown
 >uralensis : patas.uralensis
 >x : howi.coludo<macrorhinos.daphaenodon, panglima.amphibius<macrorhinos.daphaenodon, patas.uralensis>>
->howi : howi
+>howi : unknown
 >coludo : howi.coludo<T0, T1>
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >daphaenodon : macrorhinos.daphaenodon
->panglima : panglima
+>panglima : unknown
 >amphibius : panglima.amphibius<T0, T1>
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >daphaenodon : macrorhinos.daphaenodon
->patas : patas
+>patas : unknown
 >uralensis : patas.uralensis
 >() => { var y = this; } : () => void
 >y : echinatus
@@ -10597,7 +10597,7 @@ module gabriellae {
     }
 }
 module imperfecta {
->imperfecta : imperfecta
+>imperfecta : typeof imperfecta
 
     export class lasiurus<T0, T1> {
 >lasiurus : lasiurus<T0, T1>
@@ -10606,10 +10606,10 @@ module imperfecta {
 
         marisae(): lavali.thaeleri { var x: lavali.thaeleri; () => { var y = this; }; return x; }
 >marisae : () => lavali.thaeleri
->lavali : lavali
+>lavali : unknown
 >thaeleri : lavali.thaeleri
 >x : lavali.thaeleri
->lavali : lavali
+>lavali : unknown
 >thaeleri : lavali.thaeleri
 >() => { var y = this; } : () => void
 >y : lasiurus<T0, T1>
@@ -10618,10 +10618,10 @@ module imperfecta {
 
         fulvus(): argurus.germaini { var x: argurus.germaini; () => { var y = this; }; return x; }
 >fulvus : () => argurus.germaini
->argurus : argurus
+>argurus : unknown
 >germaini : argurus.germaini
 >x : argurus.germaini
->argurus : argurus
+>argurus : unknown
 >germaini : argurus.germaini
 >() => { var y = this; } : () => void
 >y : lasiurus<T0, T1>
@@ -10630,10 +10630,10 @@ module imperfecta {
 
         paranaensis(): dogramacii.koepckeae { var x: dogramacii.koepckeae; () => { var y = this; }; return x; }
 >paranaensis : () => dogramacii.koepckeae
->dogramacii : dogramacii
+>dogramacii : unknown
 >koepckeae : dogramacii.koepckeae
 >x : dogramacii.koepckeae
->dogramacii : dogramacii
+>dogramacii : unknown
 >koepckeae : dogramacii.koepckeae
 >() => { var y = this; } : () => void
 >y : lasiurus<T0, T1>
@@ -10642,26 +10642,26 @@ 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 : panglima
+>panglima : unknown
 >abidi : panglima.abidi<T0, T1>
->dogramacii : dogramacii
+>dogramacii : unknown
 >aurata : dogramacii.aurata
->chrysaeolus : chrysaeolus
+>chrysaeolus : unknown
 >sarasinorum : chrysaeolus.sarasinorum<T0, T1>
->caurinus : caurinus
+>caurinus : unknown
 >megaphyllus : caurinus.megaphyllus
->lavali : lavali
+>lavali : unknown
 >xanthognathus : lavali.xanthognathus
 >x : panglima.abidi<dogramacii.aurata, chrysaeolus.sarasinorum<caurinus.megaphyllus, lavali.xanthognathus>>
->panglima : panglima
+>panglima : unknown
 >abidi : panglima.abidi<T0, T1>
->dogramacii : dogramacii
+>dogramacii : unknown
 >aurata : dogramacii.aurata
->chrysaeolus : chrysaeolus
+>chrysaeolus : unknown
 >sarasinorum : chrysaeolus.sarasinorum<T0, T1>
->caurinus : caurinus
+>caurinus : unknown
 >megaphyllus : caurinus.megaphyllus
->lavali : lavali
+>lavali : unknown
 >xanthognathus : lavali.xanthognathus
 >() => { var y = this; } : () => void
 >y : lasiurus<T0, T1>
@@ -10670,18 +10670,18 @@ 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 : nigra
+>nigra : unknown
 >gracilis : nigra.gracilis<T0, T1>
->argurus : argurus
+>argurus : unknown
 >luctuosa : argurus.luctuosa
->ruatanica : ruatanica
+>ruatanica : unknown
 >americanus : ruatanica.americanus
 >x : nigra.gracilis<argurus.luctuosa, ruatanica.americanus>
->nigra : nigra
+>nigra : unknown
 >gracilis : nigra.gracilis<T0, T1>
->argurus : argurus
+>argurus : unknown
 >luctuosa : argurus.luctuosa
->ruatanica : ruatanica
+>ruatanica : unknown
 >americanus : ruatanica.americanus
 >() => { var y = this; } : () => void
 >y : lasiurus<T0, T1>
@@ -10690,10 +10690,10 @@ module imperfecta {
 
         orii(): dogramacii.kaiseri { var x: dogramacii.kaiseri; () => { var y = this; }; return x; }
 >orii : () => dogramacii.kaiseri
->dogramacii : dogramacii
+>dogramacii : unknown
 >kaiseri : dogramacii.kaiseri
 >x : dogramacii.kaiseri
->dogramacii : dogramacii
+>dogramacii : unknown
 >kaiseri : dogramacii.kaiseri
 >() => { var y = this; } : () => void
 >y : lasiurus<T0, T1>
@@ -10705,10 +10705,10 @@ module imperfecta {
 
         monticularis(): macrorhinos.konganensis { var x: macrorhinos.konganensis; () => { var y = this; }; return x; }
 >monticularis : () => macrorhinos.konganensis
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >konganensis : macrorhinos.konganensis
 >x : macrorhinos.konganensis
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >konganensis : macrorhinos.konganensis
 >() => { var y = this; } : () => void
 >y : subspinosus
@@ -10717,18 +10717,18 @@ 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 : nigra
+>nigra : unknown
 >caucasica : nigra.caucasica<T0, T1>
->sagitta : sagitta
+>sagitta : unknown
 >stolzmanni : sagitta.stolzmanni
->patas : patas
+>patas : unknown
 >uralensis : patas.uralensis
 >x : nigra.caucasica<sagitta.stolzmanni, patas.uralensis>
->nigra : nigra
+>nigra : unknown
 >caucasica : nigra.caucasica<T0, T1>
->sagitta : sagitta
+>sagitta : unknown
 >stolzmanni : sagitta.stolzmanni
->patas : patas
+>patas : unknown
 >uralensis : patas.uralensis
 >() => { var y = this; } : () => void
 >y : subspinosus
@@ -10737,26 +10737,26 @@ 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 : caurinus
+>caurinus : unknown
 >johorensis : caurinus.johorensis<T0, T1>
->argurus : argurus
+>argurus : unknown
 >peninsulae : argurus.peninsulae
->daubentonii : daubentonii
+>daubentonii : unknown
 >arboreus : daubentonii.arboreus<T0, T1>
->argurus : argurus
+>argurus : unknown
 >germaini : argurus.germaini
->sagitta : sagitta
+>sagitta : unknown
 >stolzmanni : sagitta.stolzmanni
 >x : caurinus.johorensis<argurus.peninsulae, daubentonii.arboreus<argurus.germaini, sagitta.stolzmanni>>
->caurinus : caurinus
+>caurinus : unknown
 >johorensis : caurinus.johorensis<T0, T1>
->argurus : argurus
+>argurus : unknown
 >peninsulae : argurus.peninsulae
->daubentonii : daubentonii
+>daubentonii : unknown
 >arboreus : daubentonii.arboreus<T0, T1>
->argurus : argurus
+>argurus : unknown
 >germaini : argurus.germaini
->sagitta : sagitta
+>sagitta : unknown
 >stolzmanni : sagitta.stolzmanni
 >() => { var y = this; } : () => void
 >y : subspinosus
@@ -10765,10 +10765,10 @@ module imperfecta {
 
         paterculus(): lutreolus.punicus { var x: lutreolus.punicus; () => { var y = this; }; return x; }
 >paterculus : () => lutreolus.punicus
->lutreolus : lutreolus
+>lutreolus : unknown
 >punicus : lutreolus.punicus
 >x : lutreolus.punicus
->lutreolus : lutreolus
+>lutreolus : unknown
 >punicus : lutreolus.punicus
 >() => { var y = this; } : () => void
 >y : subspinosus
@@ -10777,10 +10777,10 @@ module imperfecta {
 
         punctata(): lavali.thaeleri { var x: lavali.thaeleri; () => { var y = this; }; return x; }
 >punctata : () => lavali.thaeleri
->lavali : lavali
+>lavali : unknown
 >thaeleri : lavali.thaeleri
 >x : lavali.thaeleri
->lavali : lavali
+>lavali : unknown
 >thaeleri : lavali.thaeleri
 >() => { var y = this; } : () => void
 >y : subspinosus
@@ -10789,10 +10789,10 @@ module imperfecta {
 
         invictus(): sagitta.stolzmanni { var x: sagitta.stolzmanni; () => { var y = this; }; return x; }
 >invictus : () => sagitta.stolzmanni
->sagitta : sagitta
+>sagitta : unknown
 >stolzmanni : sagitta.stolzmanni
 >x : sagitta.stolzmanni
->sagitta : sagitta
+>sagitta : unknown
 >stolzmanni : sagitta.stolzmanni
 >() => { var y = this; } : () => void
 >y : subspinosus
@@ -10801,10 +10801,10 @@ module imperfecta {
 
         stangeri(): petrophilus.minutilla { var x: petrophilus.minutilla; () => { var y = this; }; return x; }
 >stangeri : () => petrophilus.minutilla
->petrophilus : petrophilus
+>petrophilus : unknown
 >minutilla : petrophilus.minutilla
 >x : petrophilus.minutilla
->petrophilus : petrophilus
+>petrophilus : unknown
 >minutilla : petrophilus.minutilla
 >() => { var y = this; } : () => void
 >y : subspinosus
@@ -10813,18 +10813,18 @@ 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 : minutus
+>minutus : unknown
 >inez : minutus.inez<T0, T1>
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >konganensis : macrorhinos.konganensis
->samarensis : samarensis
+>samarensis : unknown
 >pallidus : samarensis.pallidus
 >x : minutus.inez<macrorhinos.konganensis, samarensis.pallidus>
->minutus : minutus
+>minutus : unknown
 >inez : minutus.inez<T0, T1>
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >konganensis : macrorhinos.konganensis
->samarensis : samarensis
+>samarensis : unknown
 >pallidus : samarensis.pallidus
 >() => { var y = this; } : () => void
 >y : subspinosus
@@ -10833,10 +10833,10 @@ module imperfecta {
 
         welwitschii(): rionegrensis.caniventer { var x: rionegrensis.caniventer; () => { var y = this; }; return x; }
 >welwitschii : () => rionegrensis.caniventer
->rionegrensis : rionegrensis
+>rionegrensis : unknown
 >caniventer : rionegrensis.caniventer
 >x : rionegrensis.caniventer
->rionegrensis : rionegrensis
+>rionegrensis : unknown
 >caniventer : rionegrensis.caniventer
 >() => { var y = this; } : () => void
 >y : subspinosus
@@ -10845,10 +10845,10 @@ module imperfecta {
 
         Polonium(): lavali.wilsoni { var x: lavali.wilsoni; () => { var y = this; }; return x; }
 >Polonium : () => lavali.wilsoni
->lavali : lavali
+>lavali : unknown
 >wilsoni : lavali.wilsoni
 >x : lavali.wilsoni
->lavali : lavali
+>lavali : unknown
 >wilsoni : lavali.wilsoni
 >() => { var y = this; } : () => void
 >y : subspinosus
@@ -10857,10 +10857,10 @@ module imperfecta {
 
         harpia(): argurus.luctuosa { var x: argurus.luctuosa; () => { var y = this; }; return x; }
 >harpia : () => argurus.luctuosa
->argurus : argurus
+>argurus : unknown
 >luctuosa : argurus.luctuosa
 >x : argurus.luctuosa
->argurus : argurus
+>argurus : unknown
 >luctuosa : argurus.luctuosa
 >() => { var y = this; } : () => void
 >y : subspinosus
@@ -10871,31 +10871,31 @@ module imperfecta {
 >ciliolabrum : ciliolabrum<T0, T1>
 >T0 : T0
 >T1 : T1
->dogramacii : dogramacii
+>dogramacii : unknown
 >robustulus : dogramacii.robustulus
 
         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 : argurus
+>argurus : unknown
 >dauricus : argurus.dauricus<T0, T1>
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >jugularis : Lanthanum.jugularis
->ruatanica : ruatanica
+>ruatanica : unknown
 >Praseodymium : ruatanica.Praseodymium<T0, T1>
->argurus : argurus
+>argurus : unknown
 >germaini : argurus.germaini
->caurinus : caurinus
+>caurinus : unknown
 >megaphyllus : caurinus.megaphyllus
 >x : argurus.dauricus<Lanthanum.jugularis, ruatanica.Praseodymium<argurus.germaini, caurinus.megaphyllus>>
->argurus : argurus
+>argurus : unknown
 >dauricus : argurus.dauricus<T0, T1>
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >jugularis : Lanthanum.jugularis
->ruatanica : ruatanica
+>ruatanica : unknown
 >Praseodymium : ruatanica.Praseodymium<T0, T1>
->argurus : argurus
+>argurus : unknown
 >germaini : argurus.germaini
->caurinus : caurinus
+>caurinus : unknown
 >megaphyllus : caurinus.megaphyllus
 >() => { var y = this; } : () => void
 >y : ciliolabrum<T0, T1>
@@ -10904,18 +10904,18 @@ 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 : caurinus
+>caurinus : unknown
 >johorensis : caurinus.johorensis<T0, T1>
->rionegrensis : rionegrensis
+>rionegrensis : unknown
 >caniventer : rionegrensis.caniventer
->lutreolus : lutreolus
+>lutreolus : unknown
 >punicus : lutreolus.punicus
 >x : caurinus.johorensis<rionegrensis.caniventer, lutreolus.punicus>
->caurinus : caurinus
+>caurinus : unknown
 >johorensis : caurinus.johorensis<T0, T1>
->rionegrensis : rionegrensis
+>rionegrensis : unknown
 >caniventer : rionegrensis.caniventer
->lutreolus : lutreolus
+>lutreolus : unknown
 >punicus : lutreolus.punicus
 >() => { var y = this; } : () => void
 >y : ciliolabrum<T0, T1>
@@ -10924,18 +10924,18 @@ 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 : macrorhinos
+>macrorhinos : unknown
 >marmosurus : macrorhinos.marmosurus<T0, T1>
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >daphaenodon : macrorhinos.daphaenodon
->gabriellae : gabriellae
+>gabriellae : unknown
 >amicus : gabriellae.amicus
 >x : macrorhinos.marmosurus<macrorhinos.daphaenodon, gabriellae.amicus>
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >marmosurus : macrorhinos.marmosurus<T0, T1>
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >daphaenodon : macrorhinos.daphaenodon
->gabriellae : gabriellae
+>gabriellae : unknown
 >amicus : gabriellae.amicus
 >() => { var y = this; } : () => void
 >y : ciliolabrum<T0, T1>
@@ -10944,7 +10944,7 @@ module imperfecta {
     }
 }
 module quasiater {
->quasiater : quasiater
+>quasiater : typeof quasiater
 
     export class wattsi<T0, T1> {
 >wattsi : wattsi<T0, T1>
@@ -10953,10 +10953,10 @@ module quasiater {
 
         lagotis(): lavali.xanthognathus { var x: lavali.xanthognathus; () => { var y = this; }; return x; }
 >lagotis : () => lavali.xanthognathus
->lavali : lavali
+>lavali : unknown
 >xanthognathus : lavali.xanthognathus
 >x : lavali.xanthognathus
->lavali : lavali
+>lavali : unknown
 >xanthognathus : lavali.xanthognathus
 >() => { var y = this; } : () => void
 >y : wattsi<T0, T1>
@@ -10965,10 +10965,10 @@ module quasiater {
 
         hussoni(): lavali.wilsoni { var x: lavali.wilsoni; () => { var y = this; }; return x; }
 >hussoni : () => lavali.wilsoni
->lavali : lavali
+>lavali : unknown
 >wilsoni : lavali.wilsoni
 >x : lavali.wilsoni
->lavali : lavali
+>lavali : unknown
 >wilsoni : lavali.wilsoni
 >() => { var y = this; } : () => void
 >y : wattsi<T0, T1>
@@ -10977,34 +10977,34 @@ 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 : samarensis
+>samarensis : unknown
 >cahirinus : samarensis.cahirinus<T0, T1>
->rendalli : rendalli
+>rendalli : unknown
 >crenulata : rendalli.crenulata<T0, T1>
->lavali : lavali
+>lavali : unknown
 >wilsoni : lavali.wilsoni
->panglima : panglima
+>panglima : unknown
 >fundatus : panglima.fundatus<T0, T1>
->gabriellae : gabriellae
+>gabriellae : unknown
 >amicus : gabriellae.amicus
->lutreolus : lutreolus
+>lutreolus : unknown
 >foina : lutreolus.foina
->dogramacii : dogramacii
+>dogramacii : unknown
 >koepckeae : dogramacii.koepckeae
 >x : samarensis.cahirinus<rendalli.crenulata<lavali.wilsoni, panglima.fundatus<gabriellae.amicus, lutreolus.foina>>, dogramacii.koepckeae>
->samarensis : samarensis
+>samarensis : unknown
 >cahirinus : samarensis.cahirinus<T0, T1>
->rendalli : rendalli
+>rendalli : unknown
 >crenulata : rendalli.crenulata<T0, T1>
->lavali : lavali
+>lavali : unknown
 >wilsoni : lavali.wilsoni
->panglima : panglima
+>panglima : unknown
 >fundatus : panglima.fundatus<T0, T1>
->gabriellae : gabriellae
+>gabriellae : unknown
 >amicus : gabriellae.amicus
->lutreolus : lutreolus
+>lutreolus : unknown
 >foina : lutreolus.foina
->dogramacii : dogramacii
+>dogramacii : unknown
 >koepckeae : dogramacii.koepckeae
 >() => { var y = this; } : () => void
 >y : wattsi<T0, T1>
@@ -11013,10 +11013,10 @@ module quasiater {
 
         cabrerae(): lavali.lepturus { var x: lavali.lepturus; () => { var y = this; }; return x; }
 >cabrerae : () => lavali.lepturus
->lavali : lavali
+>lavali : unknown
 >lepturus : lavali.lepturus
 >x : lavali.lepturus
->lavali : lavali
+>lavali : unknown
 >lepturus : lavali.lepturus
 >() => { var y = this; } : () => void
 >y : wattsi<T0, T1>
@@ -11025,24 +11025,24 @@ module quasiater {
     }
 }
 module butleri {
->butleri : butleri
+>butleri : unknown
 }
 module petrophilus {
->petrophilus : petrophilus
+>petrophilus : typeof petrophilus
 
     export class sodyi<T0, T1> extends quasiater.bobrinskoi {
 >sodyi : sodyi<T0, T1>
 >T0 : T0
 >T1 : T1
->quasiater : quasiater
+>quasiater : unknown
 >bobrinskoi : quasiater.bobrinskoi
 
         saundersiae(): samarensis.pallidus { var x: samarensis.pallidus; () => { var y = this; }; return x; }
 >saundersiae : () => samarensis.pallidus
->samarensis : samarensis
+>samarensis : unknown
 >pallidus : samarensis.pallidus
 >x : samarensis.pallidus
->samarensis : samarensis
+>samarensis : unknown
 >pallidus : samarensis.pallidus
 >() => { var y = this; } : () => void
 >y : sodyi<T0, T1>
@@ -11051,10 +11051,10 @@ module petrophilus {
 
         imberbis(): quasiater.carolinensis { var x: quasiater.carolinensis; () => { var y = this; }; return x; }
 >imberbis : () => quasiater.carolinensis
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
 >x : quasiater.carolinensis
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
 >() => { var y = this; } : () => void
 >y : sodyi<T0, T1>
@@ -11063,10 +11063,10 @@ module petrophilus {
 
         cansdalei(): dammermani.melanops { var x: dammermani.melanops; () => { var y = this; }; return x; }
 >cansdalei : () => dammermani.melanops
->dammermani : dammermani
+>dammermani : unknown
 >melanops : dammermani.melanops
 >x : dammermani.melanops
->dammermani : dammermani
+>dammermani : unknown
 >melanops : dammermani.melanops
 >() => { var y = this; } : () => void
 >y : sodyi<T0, T1>
@@ -11075,18 +11075,18 @@ 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 : nigra
+>nigra : unknown
 >dolichurus : nigra.dolichurus<T0, T1>
->julianae : julianae
+>julianae : unknown
 >sumatrana : julianae.sumatrana
->imperfecta : imperfecta
+>imperfecta : unknown
 >subspinosus : imperfecta.subspinosus
 >x : nigra.dolichurus<julianae.sumatrana, imperfecta.subspinosus>
->nigra : nigra
+>nigra : unknown
 >dolichurus : nigra.dolichurus<T0, T1>
->julianae : julianae
+>julianae : unknown
 >sumatrana : julianae.sumatrana
->imperfecta : imperfecta
+>imperfecta : unknown
 >subspinosus : imperfecta.subspinosus
 >() => { var y = this; } : () => void
 >y : sodyi<T0, T1>
@@ -11095,10 +11095,10 @@ module petrophilus {
 
         catta(): argurus.oreas { var x: argurus.oreas; () => { var y = this; }; return x; }
 >catta : () => argurus.oreas
->argurus : argurus
+>argurus : unknown
 >oreas : argurus.oreas
 >x : argurus.oreas
->argurus : argurus
+>argurus : unknown
 >oreas : argurus.oreas
 >() => { var y = this; } : () => void
 >y : sodyi<T0, T1>
@@ -11107,18 +11107,18 @@ 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 : argurus
+>argurus : unknown
 >dauricus : argurus.dauricus<T0, T1>
->dogramacii : dogramacii
+>dogramacii : unknown
 >aurata : dogramacii.aurata
->dammermani : dammermani
+>dammermani : unknown
 >melanops : dammermani.melanops
 >x : argurus.dauricus<dogramacii.aurata, dammermani.melanops>
->argurus : argurus
+>argurus : unknown
 >dauricus : argurus.dauricus<T0, T1>
->dogramacii : dogramacii
+>dogramacii : unknown
 >aurata : dogramacii.aurata
->dammermani : dammermani
+>dammermani : unknown
 >melanops : dammermani.melanops
 >() => { var y = this; } : () => void
 >y : sodyi<T0, T1>
@@ -11127,10 +11127,10 @@ module petrophilus {
 
         transitionalis(): rendalli.zuluensis { var x: rendalli.zuluensis; () => { var y = this; }; return x; }
 >transitionalis : () => rendalli.zuluensis
->rendalli : rendalli
+>rendalli : unknown
 >zuluensis : rendalli.zuluensis
 >x : rendalli.zuluensis
->rendalli : rendalli
+>rendalli : unknown
 >zuluensis : rendalli.zuluensis
 >() => { var y = this; } : () => void
 >y : sodyi<T0, T1>
@@ -11139,10 +11139,10 @@ module petrophilus {
 
         heptneri(): argurus.germaini { var x: argurus.germaini; () => { var y = this; }; return x; }
 >heptneri : () => argurus.germaini
->argurus : argurus
+>argurus : unknown
 >germaini : argurus.germaini
 >x : argurus.germaini
->argurus : argurus
+>argurus : unknown
 >germaini : argurus.germaini
 >() => { var y = this; } : () => void
 >y : sodyi<T0, T1>
@@ -11151,10 +11151,10 @@ module petrophilus {
 
         bairdii(): lavali.beisa { var x: lavali.beisa; () => { var y = this; }; return x; }
 >bairdii : () => lavali.beisa
->lavali : lavali
+>lavali : unknown
 >beisa : lavali.beisa
 >x : lavali.beisa
->lavali : lavali
+>lavali : unknown
 >beisa : lavali.beisa
 >() => { var y = this; } : () => void
 >y : sodyi<T0, T1>
@@ -11163,27 +11163,27 @@ module petrophilus {
     }
 }
 module caurinus {
->caurinus : caurinus
+>caurinus : typeof caurinus
 
     export class megaphyllus extends imperfecta.lasiurus<julianae.acariensis, howi.coludo<argurus.oreas, howi.marcanoi>> {
 >megaphyllus : megaphyllus
->imperfecta : imperfecta
+>imperfecta : unknown
 >lasiurus : imperfecta.lasiurus<T0, T1>
->julianae : julianae
+>julianae : unknown
 >acariensis : julianae.acariensis
->howi : howi
+>howi : unknown
 >coludo : howi.coludo<T0, T1>
->argurus : argurus
+>argurus : unknown
 >oreas : argurus.oreas
->howi : howi
+>howi : unknown
 >marcanoi : howi.marcanoi
 
         montana(): argurus.oreas { var x: argurus.oreas; () => { var y = this; }; return x; }
 >montana : () => argurus.oreas
->argurus : argurus
+>argurus : unknown
 >oreas : argurus.oreas
 >x : argurus.oreas
->argurus : argurus
+>argurus : unknown
 >oreas : argurus.oreas
 >() => { var y = this; } : () => void
 >y : megaphyllus
@@ -11192,10 +11192,10 @@ module caurinus {
 
         amatus(): lutreolus.schlegeli { var x: lutreolus.schlegeli; () => { var y = this; }; return x; }
 >amatus : () => lutreolus.schlegeli
->lutreolus : lutreolus
+>lutreolus : unknown
 >schlegeli : lutreolus.schlegeli
 >x : lutreolus.schlegeli
->lutreolus : lutreolus
+>lutreolus : unknown
 >schlegeli : lutreolus.schlegeli
 >() => { var y = this; } : () => void
 >y : megaphyllus
@@ -11204,10 +11204,10 @@ module caurinus {
 
         bucculentus(): gabriellae.echinatus { var x: gabriellae.echinatus; () => { var y = this; }; return x; }
 >bucculentus : () => gabriellae.echinatus
->gabriellae : gabriellae
+>gabriellae : unknown
 >echinatus : gabriellae.echinatus
 >x : gabriellae.echinatus
->gabriellae : gabriellae
+>gabriellae : unknown
 >echinatus : gabriellae.echinatus
 >() => { var y = this; } : () => void
 >y : megaphyllus
@@ -11216,26 +11216,26 @@ 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 : rendalli
+>rendalli : unknown
 >crenulata : rendalli.crenulata<T0, T1>
->lavali : lavali
+>lavali : unknown
 >wilsoni : lavali.wilsoni
->panglima : panglima
+>panglima : unknown
 >fundatus : panglima.fundatus<T0, T1>
->gabriellae : gabriellae
+>gabriellae : unknown
 >amicus : gabriellae.amicus
->lutreolus : lutreolus
+>lutreolus : unknown
 >foina : lutreolus.foina
 >x : rendalli.crenulata<lavali.wilsoni, panglima.fundatus<gabriellae.amicus, lutreolus.foina>>
->rendalli : rendalli
+>rendalli : unknown
 >crenulata : rendalli.crenulata<T0, T1>
->lavali : lavali
+>lavali : unknown
 >wilsoni : lavali.wilsoni
->panglima : panglima
+>panglima : unknown
 >fundatus : panglima.fundatus<T0, T1>
->gabriellae : gabriellae
+>gabriellae : unknown
 >amicus : gabriellae.amicus
->lutreolus : lutreolus
+>lutreolus : unknown
 >foina : lutreolus.foina
 >() => { var y = this; } : () => void
 >y : megaphyllus
@@ -11244,10 +11244,10 @@ module caurinus {
 
         graecus(): dogramacii.kaiseri { var x: dogramacii.kaiseri; () => { var y = this; }; return x; }
 >graecus : () => dogramacii.kaiseri
->dogramacii : dogramacii
+>dogramacii : unknown
 >kaiseri : dogramacii.kaiseri
 >x : dogramacii.kaiseri
->dogramacii : dogramacii
+>dogramacii : unknown
 >kaiseri : dogramacii.kaiseri
 >() => { var y = this; } : () => void
 >y : megaphyllus
@@ -11256,10 +11256,10 @@ module caurinus {
 
         forsteri(): petrophilus.minutilla { var x: petrophilus.minutilla; () => { var y = this; }; return x; }
 >forsteri : () => petrophilus.minutilla
->petrophilus : petrophilus
+>petrophilus : unknown
 >minutilla : petrophilus.minutilla
 >x : petrophilus.minutilla
->petrophilus : petrophilus
+>petrophilus : unknown
 >minutilla : petrophilus.minutilla
 >() => { var y = this; } : () => void
 >y : megaphyllus
@@ -11268,18 +11268,18 @@ 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 : samarensis
+>samarensis : unknown
 >cahirinus : samarensis.cahirinus<T0, T1>
->minutus : minutus
+>minutus : unknown
 >portoricensis : minutus.portoricensis
->lavali : lavali
+>lavali : unknown
 >lepturus : lavali.lepturus
 >x : samarensis.cahirinus<minutus.portoricensis, lavali.lepturus>
->samarensis : samarensis
+>samarensis : unknown
 >cahirinus : samarensis.cahirinus<T0, T1>
->minutus : minutus
+>minutus : unknown
 >portoricensis : minutus.portoricensis
->lavali : lavali
+>lavali : unknown
 >lepturus : lavali.lepturus
 >() => { var y = this; } : () => void
 >y : megaphyllus
@@ -11288,10 +11288,10 @@ module caurinus {
 
         cirrhosus(): quasiater.carolinensis { var x: quasiater.carolinensis; () => { var y = this; }; return x; }
 >cirrhosus : () => quasiater.carolinensis
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
 >x : quasiater.carolinensis
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
 >() => { var y = this; } : () => void
 >y : megaphyllus
@@ -11300,17 +11300,17 @@ module caurinus {
     }
 }
 module minutus {
->minutus : minutus
+>minutus : typeof minutus
 
     export class portoricensis {
 >portoricensis : portoricensis
 
         relictus(): quasiater.carolinensis { var x: quasiater.carolinensis; () => { var y = this; }; return x; }
 >relictus : () => quasiater.carolinensis
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
 >x : quasiater.carolinensis
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
 >() => { var y = this; } : () => void
 >y : portoricensis
@@ -11319,18 +11319,18 @@ 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 : gabriellae
+>gabriellae : unknown
 >klossii : gabriellae.klossii<T0, T1>
->julianae : julianae
+>julianae : unknown
 >nudicaudus : julianae.nudicaudus
->dogramacii : dogramacii
+>dogramacii : unknown
 >aurata : dogramacii.aurata
 >x : gabriellae.klossii<julianae.nudicaudus, dogramacii.aurata>
->gabriellae : gabriellae
+>gabriellae : unknown
 >klossii : gabriellae.klossii<T0, T1>
->julianae : julianae
+>julianae : unknown
 >nudicaudus : julianae.nudicaudus
->dogramacii : dogramacii
+>dogramacii : unknown
 >aurata : dogramacii.aurata
 >() => { var y = this; } : () => void
 >y : portoricensis
@@ -11339,18 +11339,18 @@ 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 : samarensis
+>samarensis : unknown
 >cahirinus : samarensis.cahirinus<T0, T1>
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
->julianae : julianae
+>julianae : unknown
 >durangae : julianae.durangae
 >x : samarensis.cahirinus<quasiater.carolinensis, julianae.durangae>
->samarensis : samarensis
+>samarensis : unknown
 >cahirinus : samarensis.cahirinus<T0, T1>
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
->julianae : julianae
+>julianae : unknown
 >durangae : julianae.durangae
 >() => { var y = this; } : () => void
 >y : portoricensis
@@ -11359,17 +11359,17 @@ module minutus {
     }
 }
 module lutreolus {
->lutreolus : lutreolus
+>lutreolus : typeof lutreolus
 
     export class foina {
 >foina : foina
 
         tarfayensis(): lutreolus.punicus { var x: lutreolus.punicus; () => { var y = this; }; return x; }
 >tarfayensis : () => punicus
->lutreolus : lutreolus
+>lutreolus : unknown
 >punicus : punicus
 >x : punicus
->lutreolus : lutreolus
+>lutreolus : unknown
 >punicus : punicus
 >() => { var y = this; } : () => void
 >y : foina
@@ -11378,18 +11378,18 @@ 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 : samarensis
+>samarensis : unknown
 >pelurus : samarensis.pelurus<T0, T1>
->argurus : argurus
+>argurus : unknown
 >germaini : argurus.germaini
->julianae : julianae
+>julianae : unknown
 >durangae : julianae.durangae
 >x : samarensis.pelurus<argurus.germaini, julianae.durangae>
->samarensis : samarensis
+>samarensis : unknown
 >pelurus : samarensis.pelurus<T0, T1>
->argurus : argurus
+>argurus : unknown
 >germaini : argurus.germaini
->julianae : julianae
+>julianae : unknown
 >durangae : julianae.durangae
 >() => { var y = this; } : () => void
 >y : foina
@@ -11398,18 +11398,18 @@ 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 : gabriellae
+>gabriellae : unknown
 >klossii : gabriellae.klossii<T0, T1>
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >konganensis : macrorhinos.konganensis
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
 >x : gabriellae.klossii<macrorhinos.konganensis, quasiater.carolinensis>
->gabriellae : gabriellae
+>gabriellae : unknown
 >klossii : gabriellae.klossii<T0, T1>
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >konganensis : macrorhinos.konganensis
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
 >() => { var y = this; } : () => void
 >y : foina
@@ -11418,18 +11418,18 @@ 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 : howi
+>howi : unknown
 >coludo : howi.coludo<T0, T1>
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
->minutus : minutus
+>minutus : unknown
 >portoricensis : minutus.portoricensis
 >x : howi.coludo<quasiater.carolinensis, minutus.portoricensis>
->howi : howi
+>howi : unknown
 >coludo : howi.coludo<T0, T1>
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
->minutus : minutus
+>minutus : unknown
 >portoricensis : minutus.portoricensis
 >() => { var y = this; } : () => void
 >y : foina
@@ -11438,18 +11438,18 @@ 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 : quasiater
+>quasiater : unknown
 >wattsi : quasiater.wattsi<T0, T1>
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >konganensis : macrorhinos.konganensis
->dogramacii : dogramacii
+>dogramacii : unknown
 >robustulus : dogramacii.robustulus
 >x : quasiater.wattsi<macrorhinos.konganensis, dogramacii.robustulus>
->quasiater : quasiater
+>quasiater : unknown
 >wattsi : quasiater.wattsi<T0, T1>
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >konganensis : macrorhinos.konganensis
->dogramacii : dogramacii
+>dogramacii : unknown
 >robustulus : dogramacii.robustulus
 >() => { var y = this; } : () => void
 >y : foina
@@ -11458,18 +11458,18 @@ 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 : julianae
+>julianae : unknown
 >gerbillus : julianae.gerbillus<T0, T1>
->imperfecta : imperfecta
+>imperfecta : unknown
 >subspinosus : imperfecta.subspinosus
->julianae : julianae
+>julianae : unknown
 >durangae : julianae.durangae
 >x : julianae.gerbillus<imperfecta.subspinosus, julianae.durangae>
->julianae : julianae
+>julianae : unknown
 >gerbillus : julianae.gerbillus<T0, T1>
->imperfecta : imperfecta
+>imperfecta : unknown
 >subspinosus : imperfecta.subspinosus
->julianae : julianae
+>julianae : unknown
 >durangae : julianae.durangae
 >() => { var y = this; } : () => void
 >y : foina
@@ -11478,10 +11478,10 @@ module lutreolus {
 
         affinis(): argurus.germaini { var x: argurus.germaini; () => { var y = this; }; return x; }
 >affinis : () => argurus.germaini
->argurus : argurus
+>argurus : unknown
 >germaini : argurus.germaini
 >x : argurus.germaini
->argurus : argurus
+>argurus : unknown
 >germaini : argurus.germaini
 >() => { var y = this; } : () => void
 >y : foina
@@ -11490,26 +11490,26 @@ 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 : trivirgatus
+>trivirgatus : unknown
 >lotor : trivirgatus.lotor<T0, T1>
->argurus : argurus
+>argurus : unknown
 >oreas : argurus.oreas
->nigra : nigra
+>nigra : unknown
 >thalia : nigra.thalia<T0, T1>
->patas : patas
+>patas : unknown
 >uralensis : patas.uralensis
->lavali : lavali
+>lavali : unknown
 >wilsoni : lavali.wilsoni
 >x : trivirgatus.lotor<argurus.oreas, nigra.thalia<patas.uralensis, lavali.wilsoni>>
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >lotor : trivirgatus.lotor<T0, T1>
->argurus : argurus
+>argurus : unknown
 >oreas : argurus.oreas
->nigra : nigra
+>nigra : unknown
 >thalia : nigra.thalia<T0, T1>
->patas : patas
+>patas : unknown
 >uralensis : patas.uralensis
->lavali : lavali
+>lavali : unknown
 >wilsoni : lavali.wilsoni
 >() => { var y = this; } : () => void
 >y : foina
@@ -11518,10 +11518,10 @@ module lutreolus {
 
         maquassiensis(): trivirgatus.oconnelli { var x: trivirgatus.oconnelli; () => { var y = this; }; return x; }
 >maquassiensis : () => trivirgatus.oconnelli
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >oconnelli : trivirgatus.oconnelli
 >x : trivirgatus.oconnelli
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >oconnelli : trivirgatus.oconnelli
 >() => { var y = this; } : () => void
 >y : foina
@@ -11530,18 +11530,18 @@ 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 : julianae
+>julianae : unknown
 >albidens : julianae.albidens<T0, T1>
->howi : howi
+>howi : unknown
 >marcanoi : howi.marcanoi
->dogramacii : dogramacii
+>dogramacii : unknown
 >koepckeae : dogramacii.koepckeae
 >x : julianae.albidens<howi.marcanoi, dogramacii.koepckeae>
->julianae : julianae
+>julianae : unknown
 >albidens : julianae.albidens<T0, T1>
->howi : howi
+>howi : unknown
 >marcanoi : howi.marcanoi
->dogramacii : dogramacii
+>dogramacii : unknown
 >koepckeae : dogramacii.koepckeae
 >() => { var y = this; } : () => void
 >y : foina
@@ -11550,10 +11550,10 @@ module lutreolus {
 
         bishopi(): dogramacii.aurata { var x: dogramacii.aurata; () => { var y = this; }; return x; }
 >bishopi : () => dogramacii.aurata
->dogramacii : dogramacii
+>dogramacii : unknown
 >aurata : dogramacii.aurata
 >x : dogramacii.aurata
->dogramacii : dogramacii
+>dogramacii : unknown
 >aurata : dogramacii.aurata
 >() => { var y = this; } : () => void
 >y : foina
@@ -11562,10 +11562,10 @@ module lutreolus {
 
         apodemoides(): caurinus.psilurus { var x: caurinus.psilurus; () => { var y = this; }; return x; }
 >apodemoides : () => caurinus.psilurus
->caurinus : caurinus
+>caurinus : unknown
 >psilurus : caurinus.psilurus
 >x : caurinus.psilurus
->caurinus : caurinus
+>caurinus : unknown
 >psilurus : caurinus.psilurus
 >() => { var y = this; } : () => void
 >y : foina
@@ -11574,18 +11574,18 @@ 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 : trivirgatus
+>trivirgatus : unknown
 >mixtus : trivirgatus.mixtus<T0, T1>
->gabriellae : gabriellae
+>gabriellae : unknown
 >amicus : gabriellae.amicus
->lutreolus : lutreolus
+>lutreolus : unknown
 >punicus : punicus
 >x : trivirgatus.mixtus<gabriellae.amicus, punicus>
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >mixtus : trivirgatus.mixtus<T0, T1>
->gabriellae : gabriellae
+>gabriellae : unknown
 >amicus : gabriellae.amicus
->lutreolus : lutreolus
+>lutreolus : unknown
 >punicus : punicus
 >() => { var y = this; } : () => void
 >y : foina
@@ -11594,41 +11594,41 @@ module lutreolus {
     }
 }
 module lutreolus {
->lutreolus : lutreolus
+>lutreolus : typeof 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 : panglima
+>panglima : unknown
 >fundatus : panglima.fundatus<T0, T1>
->panamensis : panamensis
+>panamensis : unknown
 >linulus : panamensis.linulus<T0, T1>
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >lotor : trivirgatus.lotor<T0, T1>
->argurus : argurus
+>argurus : unknown
 >luctuosa : argurus.luctuosa
->lavali : lavali
+>lavali : unknown
 >wilsoni : lavali.wilsoni
->lavali : lavali
+>lavali : unknown
 >beisa : lavali.beisa
->dammermani : dammermani
+>dammermani : unknown
 >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 : petrophilus
+>petrophilus : unknown
 >sodyi : petrophilus.sodyi<T0, T1>
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
->argurus : argurus
+>argurus : unknown
 >germaini : argurus.germaini
 >x : petrophilus.sodyi<quasiater.carolinensis, argurus.germaini>
->petrophilus : petrophilus
+>petrophilus : unknown
 >sodyi : petrophilus.sodyi<T0, T1>
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
->argurus : argurus
+>argurus : unknown
 >germaini : argurus.germaini
 >() => { var y = this; } : () => void
 >y : cor<T0, T1>
@@ -11637,18 +11637,18 @@ 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 : caurinus
+>caurinus : unknown
 >johorensis : caurinus.johorensis<T0, T1>
->dammermani : dammermani
+>dammermani : unknown
 >melanops : dammermani.melanops
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >konganensis : macrorhinos.konganensis
 >x : caurinus.johorensis<dammermani.melanops, macrorhinos.konganensis>
->caurinus : caurinus
+>caurinus : unknown
 >johorensis : caurinus.johorensis<T0, T1>
->dammermani : dammermani
+>dammermani : unknown
 >melanops : dammermani.melanops
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >konganensis : macrorhinos.konganensis
 >() => { var y = this; } : () => void
 >y : cor<T0, T1>
@@ -11657,10 +11657,10 @@ module lutreolus {
 
         mussoi(): quasiater.carolinensis { var x: quasiater.carolinensis; () => { var y = this; }; return x; }
 >mussoi : () => quasiater.carolinensis
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
 >x : quasiater.carolinensis
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
 >() => { var y = this; } : () => void
 >y : cor<T0, T1>
@@ -11669,18 +11669,18 @@ 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 : trivirgatus
+>trivirgatus : unknown
 >lotor : trivirgatus.lotor<T0, T1>
->sagitta : sagitta
+>sagitta : unknown
 >stolzmanni : sagitta.stolzmanni
->lutreolus : lutreolus
+>lutreolus : unknown
 >foina : foina
 >x : trivirgatus.lotor<sagitta.stolzmanni, foina>
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >lotor : trivirgatus.lotor<T0, T1>
->sagitta : sagitta
+>sagitta : unknown
 >stolzmanni : sagitta.stolzmanni
->lutreolus : lutreolus
+>lutreolus : unknown
 >foina : foina
 >() => { var y = this; } : () => void
 >y : cor<T0, T1>
@@ -11689,10 +11689,10 @@ module lutreolus {
 
         achates(): provocax.melanoleuca { var x: provocax.melanoleuca; () => { var y = this; }; return x; }
 >achates : () => provocax.melanoleuca
->provocax : provocax
+>provocax : unknown
 >melanoleuca : provocax.melanoleuca
 >x : provocax.melanoleuca
->provocax : provocax
+>provocax : unknown
 >melanoleuca : provocax.melanoleuca
 >() => { var y = this; } : () => void
 >y : cor<T0, T1>
@@ -11701,18 +11701,18 @@ 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 : howi
+>howi : unknown
 >angulatus : howi.angulatus<T0, T1>
->dogramacii : dogramacii
+>dogramacii : unknown
 >kaiseri : dogramacii.kaiseri
->julianae : julianae
+>julianae : unknown
 >steerii : julianae.steerii
 >x : howi.angulatus<dogramacii.kaiseri, julianae.steerii>
->howi : howi
+>howi : unknown
 >angulatus : howi.angulatus<T0, T1>
->dogramacii : dogramacii
+>dogramacii : unknown
 >kaiseri : dogramacii.kaiseri
->julianae : julianae
+>julianae : unknown
 >steerii : julianae.steerii
 >() => { var y = this; } : () => void
 >y : cor<T0, T1>
@@ -11721,34 +11721,34 @@ 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 : quasiater
+>quasiater : unknown
 >wattsi : quasiater.wattsi<T0, T1>
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >lotor : trivirgatus.lotor<T0, T1>
->julianae : julianae
+>julianae : unknown
 >steerii : julianae.steerii
->samarensis : samarensis
+>samarensis : unknown
 >pallidus : samarensis.pallidus
->minutus : minutus
+>minutus : unknown
 >inez : minutus.inez<T0, T1>
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >oconnelli : trivirgatus.oconnelli
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >jugularis : Lanthanum.jugularis
 >x : quasiater.wattsi<trivirgatus.lotor<julianae.steerii, samarensis.pallidus>, minutus.inez<trivirgatus.oconnelli, Lanthanum.jugularis>>
->quasiater : quasiater
+>quasiater : unknown
 >wattsi : quasiater.wattsi<T0, T1>
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >lotor : trivirgatus.lotor<T0, T1>
->julianae : julianae
+>julianae : unknown
 >steerii : julianae.steerii
->samarensis : samarensis
+>samarensis : unknown
 >pallidus : samarensis.pallidus
->minutus : minutus
+>minutus : unknown
 >inez : minutus.inez<T0, T1>
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >oconnelli : trivirgatus.oconnelli
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >jugularis : Lanthanum.jugularis
 >() => { var y = this; } : () => void
 >y : cor<T0, T1>
@@ -11757,26 +11757,26 @@ 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 : nigra
+>nigra : unknown
 >gracilis : nigra.gracilis<T0, T1>
->panamensis : panamensis
+>panamensis : unknown
 >linulus : panamensis.linulus<T0, T1>
->dogramacii : dogramacii
+>dogramacii : unknown
 >kaiseri : dogramacii.kaiseri
->minutus : minutus
+>minutus : unknown
 >portoricensis : minutus.portoricensis
->howi : howi
+>howi : unknown
 >marcanoi : howi.marcanoi
 >x : nigra.gracilis<panamensis.linulus<dogramacii.kaiseri, minutus.portoricensis>, howi.marcanoi>
->nigra : nigra
+>nigra : unknown
 >gracilis : nigra.gracilis<T0, T1>
->panamensis : panamensis
+>panamensis : unknown
 >linulus : panamensis.linulus<T0, T1>
->dogramacii : dogramacii
+>dogramacii : unknown
 >kaiseri : dogramacii.kaiseri
->minutus : minutus
+>minutus : unknown
 >portoricensis : minutus.portoricensis
->howi : howi
+>howi : unknown
 >marcanoi : howi.marcanoi
 >() => { var y = this; } : () => void
 >y : cor<T0, T1>
@@ -11785,10 +11785,10 @@ module lutreolus {
 
         tapoatafa(): caurinus.megaphyllus { var x: caurinus.megaphyllus; () => { var y = this; }; return x; }
 >tapoatafa : () => caurinus.megaphyllus
->caurinus : caurinus
+>caurinus : unknown
 >megaphyllus : caurinus.megaphyllus
 >x : caurinus.megaphyllus
->caurinus : caurinus
+>caurinus : unknown
 >megaphyllus : caurinus.megaphyllus
 >() => { var y = this; } : () => void
 >y : cor<T0, T1>
@@ -11797,10 +11797,10 @@ module lutreolus {
 
         castroviejoi(): Lanthanum.jugularis { var x: Lanthanum.jugularis; () => { var y = this; }; return x; }
 >castroviejoi : () => Lanthanum.jugularis
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >jugularis : Lanthanum.jugularis
 >x : Lanthanum.jugularis
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >jugularis : Lanthanum.jugularis
 >() => { var y = this; } : () => void
 >y : cor<T0, T1>
@@ -11809,7 +11809,7 @@ module lutreolus {
     }
 }
 module howi {
->howi : howi
+>howi : typeof howi
 
     export class coludo<T0, T1> {
 >coludo : coludo<T0, T1>
@@ -11818,10 +11818,10 @@ module howi {
 
         bernhardi(): lutreolus.punicus { var x: lutreolus.punicus; () => { var y = this; }; return x; }
 >bernhardi : () => lutreolus.punicus
->lutreolus : lutreolus
+>lutreolus : unknown
 >punicus : lutreolus.punicus
 >x : lutreolus.punicus
->lutreolus : lutreolus
+>lutreolus : unknown
 >punicus : lutreolus.punicus
 >() => { var y = this; } : () => void
 >y : coludo<T0, T1>
@@ -11830,10 +11830,10 @@ module howi {
 
         isseli(): argurus.germaini { var x: argurus.germaini; () => { var y = this; }; return x; }
 >isseli : () => argurus.germaini
->argurus : argurus
+>argurus : unknown
 >germaini : argurus.germaini
 >x : argurus.germaini
->argurus : argurus
+>argurus : unknown
 >germaini : argurus.germaini
 >() => { var y = this; } : () => void
 >y : coludo<T0, T1>
@@ -11842,19 +11842,19 @@ module howi {
     }
 }
 module argurus {
->argurus : argurus
+>argurus : typeof argurus
 
     export class germaini extends gabriellae.amicus {
 >germaini : germaini
->gabriellae : gabriellae
+>gabriellae : unknown
 >amicus : gabriellae.amicus
 
         sharpei(): lavali.wilsoni { var x: lavali.wilsoni; () => { var y = this; }; return x; }
 >sharpei : () => lavali.wilsoni
->lavali : lavali
+>lavali : unknown
 >wilsoni : lavali.wilsoni
 >x : lavali.wilsoni
->lavali : lavali
+>lavali : unknown
 >wilsoni : lavali.wilsoni
 >() => { var y = this; } : () => void
 >y : germaini
@@ -11863,18 +11863,18 @@ 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 : macrorhinos
+>macrorhinos : unknown
 >marmosurus : macrorhinos.marmosurus<T0, T1>
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >megalonyx : Lanthanum.megalonyx
->lavali : lavali
+>lavali : unknown
 >thaeleri : lavali.thaeleri
 >x : macrorhinos.marmosurus<Lanthanum.megalonyx, lavali.thaeleri>
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >marmosurus : macrorhinos.marmosurus<T0, T1>
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >megalonyx : Lanthanum.megalonyx
->lavali : lavali
+>lavali : unknown
 >thaeleri : lavali.thaeleri
 >() => { var y = this; } : () => void
 >y : germaini
@@ -11883,25 +11883,25 @@ module argurus {
     }
 }
 module sagitta {
->sagitta : sagitta
+>sagitta : typeof sagitta
 
     export class stolzmanni {
 >stolzmanni : stolzmanni
 
         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 : nigra
+>nigra : unknown
 >dolichurus : nigra.dolichurus<T0, T1>
->dogramacii : dogramacii
+>dogramacii : unknown
 >koepckeae : dogramacii.koepckeae
->caurinus : caurinus
+>caurinus : unknown
 >psilurus : caurinus.psilurus
 >x : nigra.dolichurus<dogramacii.koepckeae, caurinus.psilurus>
->nigra : nigra
+>nigra : unknown
 >dolichurus : nigra.dolichurus<T0, T1>
->dogramacii : dogramacii
+>dogramacii : unknown
 >koepckeae : dogramacii.koepckeae
->caurinus : caurinus
+>caurinus : unknown
 >psilurus : caurinus.psilurus
 >() => { var y = this; } : () => void
 >y : stolzmanni
@@ -11910,10 +11910,10 @@ module sagitta {
 
         dhofarensis(): lutreolus.foina { var x: lutreolus.foina; () => { var y = this; }; return x; }
 >dhofarensis : () => lutreolus.foina
->lutreolus : lutreolus
+>lutreolus : unknown
 >foina : lutreolus.foina
 >x : lutreolus.foina
->lutreolus : lutreolus
+>lutreolus : unknown
 >foina : lutreolus.foina
 >() => { var y = this; } : () => void
 >y : stolzmanni
@@ -11922,10 +11922,10 @@ module sagitta {
 
         tricolor(): argurus.germaini { var x: argurus.germaini; () => { var y = this; }; return x; }
 >tricolor : () => argurus.germaini
->argurus : argurus
+>argurus : unknown
 >germaini : argurus.germaini
 >x : argurus.germaini
->argurus : argurus
+>argurus : unknown
 >germaini : argurus.germaini
 >() => { var y = this; } : () => void
 >y : stolzmanni
@@ -11934,10 +11934,10 @@ module sagitta {
 
         gardneri(): lavali.xanthognathus { var x: lavali.xanthognathus; () => { var y = this; }; return x; }
 >gardneri : () => lavali.xanthognathus
->lavali : lavali
+>lavali : unknown
 >xanthognathus : lavali.xanthognathus
 >x : lavali.xanthognathus
->lavali : lavali
+>lavali : unknown
 >xanthognathus : lavali.xanthognathus
 >() => { var y = this; } : () => void
 >y : stolzmanni
@@ -11946,26 +11946,26 @@ 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 : rendalli
+>rendalli : unknown
 >moojeni : rendalli.moojeni<T0, T1>
->chrysaeolus : chrysaeolus
+>chrysaeolus : unknown
 >sarasinorum : chrysaeolus.sarasinorum<T0, T1>
->caurinus : caurinus
+>caurinus : unknown
 >megaphyllus : caurinus.megaphyllus
->lavali : lavali
+>lavali : unknown
 >xanthognathus : lavali.xanthognathus
->gabriellae : gabriellae
+>gabriellae : unknown
 >echinatus : gabriellae.echinatus
 >x : rendalli.moojeni<chrysaeolus.sarasinorum<caurinus.megaphyllus, lavali.xanthognathus>, gabriellae.echinatus>
->rendalli : rendalli
+>rendalli : unknown
 >moojeni : rendalli.moojeni<T0, T1>
->chrysaeolus : chrysaeolus
+>chrysaeolus : unknown
 >sarasinorum : chrysaeolus.sarasinorum<T0, T1>
->caurinus : caurinus
+>caurinus : unknown
 >megaphyllus : caurinus.megaphyllus
->lavali : lavali
+>lavali : unknown
 >xanthognathus : lavali.xanthognathus
->gabriellae : gabriellae
+>gabriellae : unknown
 >echinatus : gabriellae.echinatus
 >() => { var y = this; } : () => void
 >y : stolzmanni
@@ -11974,10 +11974,10 @@ module sagitta {
 
         talpoides(): gabriellae.echinatus { var x: gabriellae.echinatus; () => { var y = this; }; return x; }
 >talpoides : () => gabriellae.echinatus
->gabriellae : gabriellae
+>gabriellae : unknown
 >echinatus : gabriellae.echinatus
 >x : gabriellae.echinatus
->gabriellae : gabriellae
+>gabriellae : unknown
 >echinatus : gabriellae.echinatus
 >() => { var y = this; } : () => void
 >y : stolzmanni
@@ -11986,10 +11986,10 @@ module sagitta {
 
         pallipes(): dammermani.melanops { var x: dammermani.melanops; () => { var y = this; }; return x; }
 >pallipes : () => dammermani.melanops
->dammermani : dammermani
+>dammermani : unknown
 >melanops : dammermani.melanops
 >x : dammermani.melanops
->dammermani : dammermani
+>dammermani : unknown
 >melanops : dammermani.melanops
 >() => { var y = this; } : () => void
 >y : stolzmanni
@@ -11998,10 +11998,10 @@ module sagitta {
 
         lagurus(): lavali.beisa { var x: lavali.beisa; () => { var y = this; }; return x; }
 >lagurus : () => lavali.beisa
->lavali : lavali
+>lavali : unknown
 >beisa : lavali.beisa
 >x : lavali.beisa
->lavali : lavali
+>lavali : unknown
 >beisa : lavali.beisa
 >() => { var y = this; } : () => void
 >y : stolzmanni
@@ -12010,18 +12010,18 @@ 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 : julianae
+>julianae : unknown
 >albidens : julianae.albidens<T0, T1>
->argurus : argurus
+>argurus : unknown
 >luctuosa : argurus.luctuosa
->gabriellae : gabriellae
+>gabriellae : unknown
 >echinatus : gabriellae.echinatus
 >x : julianae.albidens<argurus.luctuosa, gabriellae.echinatus>
->julianae : julianae
+>julianae : unknown
 >albidens : julianae.albidens<T0, T1>
->argurus : argurus
+>argurus : unknown
 >luctuosa : argurus.luctuosa
->gabriellae : gabriellae
+>gabriellae : unknown
 >echinatus : gabriellae.echinatus
 >() => { var y = this; } : () => void
 >y : stolzmanni
@@ -12030,10 +12030,10 @@ module sagitta {
 
         griselda(): caurinus.psilurus { var x: caurinus.psilurus; () => { var y = this; }; return x; }
 >griselda : () => caurinus.psilurus
->caurinus : caurinus
+>caurinus : unknown
 >psilurus : caurinus.psilurus
 >x : caurinus.psilurus
->caurinus : caurinus
+>caurinus : unknown
 >psilurus : caurinus.psilurus
 >() => { var y = this; } : () => void
 >y : stolzmanni
@@ -12042,10 +12042,10 @@ module sagitta {
 
         florium(): rendalli.zuluensis { var x: rendalli.zuluensis; () => { var y = this; }; return x; }
 >florium : () => rendalli.zuluensis
->rendalli : rendalli
+>rendalli : unknown
 >zuluensis : rendalli.zuluensis
 >x : rendalli.zuluensis
->rendalli : rendalli
+>rendalli : unknown
 >zuluensis : rendalli.zuluensis
 >() => { var y = this; } : () => void
 >y : stolzmanni
@@ -12054,23 +12054,23 @@ module sagitta {
     }
 }
 module dammermani {
->dammermani : dammermani
+>dammermani : typeof dammermani
 
     export class melanops extends minutus.inez<sagitta.stolzmanni, dammermani.melanops> {
 >melanops : melanops
->minutus : minutus
+>minutus : unknown
 >inez : minutus.inez<T0, T1>
->sagitta : sagitta
+>sagitta : unknown
 >stolzmanni : sagitta.stolzmanni
->dammermani : dammermani
+>dammermani : unknown
 >melanops : melanops
 
         blarina(): dammermani.melanops { var x: dammermani.melanops; () => { var y = this; }; return x; }
 >blarina : () => melanops
->dammermani : dammermani
+>dammermani : unknown
 >melanops : melanops
 >x : melanops
->dammermani : dammermani
+>dammermani : unknown
 >melanops : melanops
 >() => { var y = this; } : () => void
 >y : melanops
@@ -12079,26 +12079,26 @@ 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 : rionegrensis
+>rionegrensis : unknown
 >veraecrucis : rionegrensis.veraecrucis<T0, T1>
->nigra : nigra
+>nigra : unknown
 >dolichurus : nigra.dolichurus<T0, T1>
->lavali : lavali
+>lavali : unknown
 >lepturus : lavali.lepturus
->samarensis : samarensis
+>samarensis : unknown
 >pallidus : samarensis.pallidus
->lavali : lavali
+>lavali : unknown
 >wilsoni : lavali.wilsoni
 >x : rionegrensis.veraecrucis<nigra.dolichurus<lavali.lepturus, samarensis.pallidus>, lavali.wilsoni>
->rionegrensis : rionegrensis
+>rionegrensis : unknown
 >veraecrucis : rionegrensis.veraecrucis<T0, T1>
->nigra : nigra
+>nigra : unknown
 >dolichurus : nigra.dolichurus<T0, T1>
->lavali : lavali
+>lavali : unknown
 >lepturus : lavali.lepturus
->samarensis : samarensis
+>samarensis : unknown
 >pallidus : samarensis.pallidus
->lavali : lavali
+>lavali : unknown
 >wilsoni : lavali.wilsoni
 >() => { var y = this; } : () => void
 >y : melanops
@@ -12107,10 +12107,10 @@ module dammermani {
 
         ashaninka(): julianae.nudicaudus { var x: julianae.nudicaudus; () => { var y = this; }; return x; }
 >ashaninka : () => julianae.nudicaudus
->julianae : julianae
+>julianae : unknown
 >nudicaudus : julianae.nudicaudus
 >x : julianae.nudicaudus
->julianae : julianae
+>julianae : unknown
 >nudicaudus : julianae.nudicaudus
 >() => { var y = this; } : () => void
 >y : melanops
@@ -12119,10 +12119,10 @@ module dammermani {
 
         wiedii(): julianae.steerii { var x: julianae.steerii; () => { var y = this; }; return x; }
 >wiedii : () => julianae.steerii
->julianae : julianae
+>julianae : unknown
 >steerii : julianae.steerii
 >x : julianae.steerii
->julianae : julianae
+>julianae : unknown
 >steerii : julianae.steerii
 >() => { var y = this; } : () => void
 >y : melanops
@@ -12131,10 +12131,10 @@ module dammermani {
 
         godmani(): imperfecta.subspinosus { var x: imperfecta.subspinosus; () => { var y = this; }; return x; }
 >godmani : () => imperfecta.subspinosus
->imperfecta : imperfecta
+>imperfecta : unknown
 >subspinosus : imperfecta.subspinosus
 >x : imperfecta.subspinosus
->imperfecta : imperfecta
+>imperfecta : unknown
 >subspinosus : imperfecta.subspinosus
 >() => { var y = this; } : () => void
 >y : melanops
@@ -12143,18 +12143,18 @@ 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 : imperfecta
+>imperfecta : unknown
 >ciliolabrum : imperfecta.ciliolabrum<T0, T1>
->samarensis : samarensis
+>samarensis : unknown
 >pallidus : samarensis.pallidus
->caurinus : caurinus
+>caurinus : unknown
 >psilurus : caurinus.psilurus
 >x : imperfecta.ciliolabrum<samarensis.pallidus, caurinus.psilurus>
->imperfecta : imperfecta
+>imperfecta : unknown
 >ciliolabrum : imperfecta.ciliolabrum<T0, T1>
->samarensis : samarensis
+>samarensis : unknown
 >pallidus : samarensis.pallidus
->caurinus : caurinus
+>caurinus : unknown
 >psilurus : caurinus.psilurus
 >() => { var y = this; } : () => void
 >y : melanops
@@ -12163,18 +12163,18 @@ 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 : panglima
+>panglima : unknown
 >abidi : panglima.abidi<T0, T1>
->minutus : minutus
+>minutus : unknown
 >portoricensis : minutus.portoricensis
->patas : patas
+>patas : unknown
 >uralensis : patas.uralensis
 >x : panglima.abidi<minutus.portoricensis, patas.uralensis>
->panglima : panglima
+>panglima : unknown
 >abidi : panglima.abidi<T0, T1>
->minutus : minutus
+>minutus : unknown
 >portoricensis : minutus.portoricensis
->patas : patas
+>patas : unknown
 >uralensis : patas.uralensis
 >() => { var y = this; } : () => void
 >y : melanops
@@ -12183,34 +12183,34 @@ 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 : panglima
+>panglima : unknown
 >fundatus : panglima.fundatus<T0, T1>
->howi : howi
+>howi : unknown
 >marcanoi : howi.marcanoi
->samarensis : samarensis
+>samarensis : unknown
 >fuscus : samarensis.fuscus<T0, T1>
->lavali : lavali
+>lavali : unknown
 >wilsoni : lavali.wilsoni
->chrysaeolus : chrysaeolus
+>chrysaeolus : unknown
 >sarasinorum : chrysaeolus.sarasinorum<T0, T1>
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >jugularis : Lanthanum.jugularis
->imperfecta : imperfecta
+>imperfecta : unknown
 >subspinosus : imperfecta.subspinosus
 >x : panglima.fundatus<howi.marcanoi, samarensis.fuscus<lavali.wilsoni, chrysaeolus.sarasinorum<Lanthanum.jugularis, imperfecta.subspinosus>>>
->panglima : panglima
+>panglima : unknown
 >fundatus : panglima.fundatus<T0, T1>
->howi : howi
+>howi : unknown
 >marcanoi : howi.marcanoi
->samarensis : samarensis
+>samarensis : unknown
 >fuscus : samarensis.fuscus<T0, T1>
->lavali : lavali
+>lavali : unknown
 >wilsoni : lavali.wilsoni
->chrysaeolus : chrysaeolus
+>chrysaeolus : unknown
 >sarasinorum : chrysaeolus.sarasinorum<T0, T1>
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >jugularis : Lanthanum.jugularis
->imperfecta : imperfecta
+>imperfecta : unknown
 >subspinosus : imperfecta.subspinosus
 >() => { var y = this; } : () => void
 >y : melanops
@@ -12219,10 +12219,10 @@ module dammermani {
 
         archeri(): howi.marcanoi { var x: howi.marcanoi; () => { var y = this; }; return x; }
 >archeri : () => howi.marcanoi
->howi : howi
+>howi : unknown
 >marcanoi : howi.marcanoi
 >x : howi.marcanoi
->howi : howi
+>howi : unknown
 >marcanoi : howi.marcanoi
 >() => { var y = this; } : () => void
 >y : melanops
@@ -12231,18 +12231,18 @@ 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 : minutus
+>minutus : unknown
 >inez : minutus.inez<T0, T1>
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >oconnelli : trivirgatus.oconnelli
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >jugularis : Lanthanum.jugularis
 >x : minutus.inez<trivirgatus.oconnelli, Lanthanum.jugularis>
->minutus : minutus
+>minutus : unknown
 >inez : minutus.inez<T0, T1>
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >oconnelli : trivirgatus.oconnelli
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >jugularis : Lanthanum.jugularis
 >() => { var y = this; } : () => void
 >y : melanops
@@ -12251,10 +12251,10 @@ module dammermani {
 
         unicolor(): lutreolus.schlegeli { var x: lutreolus.schlegeli; () => { var y = this; }; return x; }
 >unicolor : () => lutreolus.schlegeli
->lutreolus : lutreolus
+>lutreolus : unknown
 >schlegeli : lutreolus.schlegeli
 >x : lutreolus.schlegeli
->lutreolus : lutreolus
+>lutreolus : unknown
 >schlegeli : lutreolus.schlegeli
 >() => { var y = this; } : () => void
 >y : melanops
@@ -12263,18 +12263,18 @@ 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 : nigra
+>nigra : unknown
 >gracilis : nigra.gracilis<T0, T1>
->sagitta : sagitta
+>sagitta : unknown
 >walkeri : sagitta.walkeri
->sagitta : sagitta
+>sagitta : unknown
 >stolzmanni : sagitta.stolzmanni
 >x : nigra.gracilis<sagitta.walkeri, sagitta.stolzmanni>
->nigra : nigra
+>nigra : unknown
 >gracilis : nigra.gracilis<T0, T1>
->sagitta : sagitta
+>sagitta : unknown
 >walkeri : sagitta.walkeri
->sagitta : sagitta
+>sagitta : unknown
 >stolzmanni : sagitta.stolzmanni
 >() => { var y = this; } : () => void
 >y : melanops
@@ -12283,18 +12283,18 @@ 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 : julianae
+>julianae : unknown
 >albidens : julianae.albidens<T0, T1>
->lavali : lavali
+>lavali : unknown
 >wilsoni : lavali.wilsoni
->lavali : lavali
+>lavali : unknown
 >thaeleri : lavali.thaeleri
 >x : julianae.albidens<lavali.wilsoni, lavali.thaeleri>
->julianae : julianae
+>julianae : unknown
 >albidens : julianae.albidens<T0, T1>
->lavali : lavali
+>lavali : unknown
 >wilsoni : lavali.wilsoni
->lavali : lavali
+>lavali : unknown
 >thaeleri : lavali.thaeleri
 >() => { var y = this; } : () => void
 >y : melanops
@@ -12303,43 +12303,43 @@ module dammermani {
     }
 }
 module argurus {
->argurus : argurus
+>argurus : typeof argurus
 
     export class peninsulae extends patas.uralensis {
 >peninsulae : peninsulae
->patas : patas
+>patas : unknown
 >uralensis : patas.uralensis
 
         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 : trivirgatus
+>trivirgatus : unknown
 >mixtus : trivirgatus.mixtus<T0, T1>
->argurus : argurus
+>argurus : unknown
 >dauricus : dauricus<T0, T1>
->dogramacii : dogramacii
+>dogramacii : unknown
 >aurata : dogramacii.aurata
->dammermani : dammermani
+>dammermani : unknown
 >melanops : dammermani.melanops
->panglima : panglima
+>panglima : unknown
 >amphibius : panglima.amphibius<T0, T1>
->lavali : lavali
+>lavali : unknown
 >lepturus : lavali.lepturus
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
 >x : trivirgatus.mixtus<dauricus<dogramacii.aurata, dammermani.melanops>, panglima.amphibius<lavali.lepturus, quasiater.carolinensis>>
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >mixtus : trivirgatus.mixtus<T0, T1>
->argurus : argurus
+>argurus : unknown
 >dauricus : dauricus<T0, T1>
->dogramacii : dogramacii
+>dogramacii : unknown
 >aurata : dogramacii.aurata
->dammermani : dammermani
+>dammermani : unknown
 >melanops : dammermani.melanops
->panglima : panglima
+>panglima : unknown
 >amphibius : panglima.amphibius<T0, T1>
->lavali : lavali
+>lavali : unknown
 >lepturus : lavali.lepturus
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
 >() => { var y = this; } : () => void
 >y : peninsulae
@@ -12348,10 +12348,10 @@ module argurus {
 
         novaeangliae(): lavali.xanthognathus { var x: lavali.xanthognathus; () => { var y = this; }; return x; }
 >novaeangliae : () => lavali.xanthognathus
->lavali : lavali
+>lavali : unknown
 >xanthognathus : lavali.xanthognathus
 >x : lavali.xanthognathus
->lavali : lavali
+>lavali : unknown
 >xanthognathus : lavali.xanthognathus
 >() => { var y = this; } : () => void
 >y : peninsulae
@@ -12360,10 +12360,10 @@ module argurus {
 
         olallae(): julianae.sumatrana { var x: julianae.sumatrana; () => { var y = this; }; return x; }
 >olallae : () => julianae.sumatrana
->julianae : julianae
+>julianae : unknown
 >sumatrana : julianae.sumatrana
 >x : julianae.sumatrana
->julianae : julianae
+>julianae : unknown
 >sumatrana : julianae.sumatrana
 >() => { var y = this; } : () => void
 >y : peninsulae
@@ -12372,10 +12372,10 @@ module argurus {
 
         anselli(): dogramacii.aurata { var x: dogramacii.aurata; () => { var y = this; }; return x; }
 >anselli : () => dogramacii.aurata
->dogramacii : dogramacii
+>dogramacii : unknown
 >aurata : dogramacii.aurata
 >x : dogramacii.aurata
->dogramacii : dogramacii
+>dogramacii : unknown
 >aurata : dogramacii.aurata
 >() => { var y = this; } : () => void
 >y : peninsulae
@@ -12384,10 +12384,10 @@ module argurus {
 
         timminsi(): macrorhinos.konganensis { var x: macrorhinos.konganensis; () => { var y = this; }; return x; }
 >timminsi : () => macrorhinos.konganensis
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >konganensis : macrorhinos.konganensis
 >x : macrorhinos.konganensis
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >konganensis : macrorhinos.konganensis
 >() => { var y = this; } : () => void
 >y : peninsulae
@@ -12396,18 +12396,18 @@ 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 : rendalli
+>rendalli : unknown
 >moojeni : rendalli.moojeni<T0, T1>
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >konganensis : macrorhinos.konganensis
->gabriellae : gabriellae
+>gabriellae : unknown
 >echinatus : gabriellae.echinatus
 >x : rendalli.moojeni<macrorhinos.konganensis, gabriellae.echinatus>
->rendalli : rendalli
+>rendalli : unknown
 >moojeni : rendalli.moojeni<T0, T1>
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >konganensis : macrorhinos.konganensis
->gabriellae : gabriellae
+>gabriellae : unknown
 >echinatus : gabriellae.echinatus
 >() => { var y = this; } : () => void
 >y : peninsulae
@@ -12416,10 +12416,10 @@ module argurus {
 
         telfordi(): trivirgatus.oconnelli { var x: trivirgatus.oconnelli; () => { var y = this; }; return x; }
 >telfordi : () => trivirgatus.oconnelli
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >oconnelli : trivirgatus.oconnelli
 >x : trivirgatus.oconnelli
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >oconnelli : trivirgatus.oconnelli
 >() => { var y = this; } : () => void
 >y : peninsulae
@@ -12428,18 +12428,18 @@ 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 : minutus
+>minutus : unknown
 >inez : minutus.inez<T0, T1>
->gabriellae : gabriellae
+>gabriellae : unknown
 >echinatus : gabriellae.echinatus
->argurus : argurus
+>argurus : unknown
 >luctuosa : luctuosa
 >x : minutus.inez<gabriellae.echinatus, luctuosa>
->minutus : minutus
+>minutus : unknown
 >inez : minutus.inez<T0, T1>
->gabriellae : gabriellae
+>gabriellae : unknown
 >echinatus : gabriellae.echinatus
->argurus : argurus
+>argurus : unknown
 >luctuosa : luctuosa
 >() => { var y = this; } : () => void
 >y : peninsulae
@@ -12448,7 +12448,7 @@ module argurus {
     }
 }
 module argurus {
->argurus : argurus
+>argurus : typeof argurus
 
     export class netscheri<T0, T1> {
 >netscheri : netscheri<T0, T1>
@@ -12457,26 +12457,26 @@ module argurus {
 
         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 : nigra
+>nigra : unknown
 >caucasica : nigra.caucasica<T0, T1>
->rendalli : rendalli
+>rendalli : unknown
 >crenulata : rendalli.crenulata<T0, T1>
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >falconeri : trivirgatus.falconeri
->howi : howi
+>howi : unknown
 >marcanoi : howi.marcanoi
->dogramacii : dogramacii
+>dogramacii : unknown
 >kaiseri : dogramacii.kaiseri
 >x : nigra.caucasica<rendalli.crenulata<trivirgatus.falconeri, howi.marcanoi>, dogramacii.kaiseri>
->nigra : nigra
+>nigra : unknown
 >caucasica : nigra.caucasica<T0, T1>
->rendalli : rendalli
+>rendalli : unknown
 >crenulata : rendalli.crenulata<T0, T1>
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >falconeri : trivirgatus.falconeri
->howi : howi
+>howi : unknown
 >marcanoi : howi.marcanoi
->dogramacii : dogramacii
+>dogramacii : unknown
 >kaiseri : dogramacii.kaiseri
 >() => { var y = this; } : () => void
 >y : netscheri<T0, T1>
@@ -12485,26 +12485,26 @@ 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 : imperfecta
+>imperfecta : unknown
 >lasiurus : imperfecta.lasiurus<T0, T1>
->howi : howi
+>howi : unknown
 >marcanoi : howi.marcanoi
->imperfecta : imperfecta
+>imperfecta : unknown
 >ciliolabrum : imperfecta.ciliolabrum<T0, T1>
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >megalonyx : Lanthanum.megalonyx
->petrophilus : petrophilus
+>petrophilus : unknown
 >minutilla : petrophilus.minutilla
 >x : imperfecta.lasiurus<howi.marcanoi, imperfecta.ciliolabrum<Lanthanum.megalonyx, petrophilus.minutilla>>
->imperfecta : imperfecta
+>imperfecta : unknown
 >lasiurus : imperfecta.lasiurus<T0, T1>
->howi : howi
+>howi : unknown
 >marcanoi : howi.marcanoi
->imperfecta : imperfecta
+>imperfecta : unknown
 >ciliolabrum : imperfecta.ciliolabrum<T0, T1>
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >megalonyx : Lanthanum.megalonyx
->petrophilus : petrophilus
+>petrophilus : unknown
 >minutilla : petrophilus.minutilla
 >() => { var y = this; } : () => void
 >y : netscheri<T0, T1>
@@ -12513,10 +12513,10 @@ module argurus {
 
         tricuspidatus(): lavali.wilsoni { var x: lavali.wilsoni; () => { var y = this; }; return x; }
 >tricuspidatus : () => lavali.wilsoni
->lavali : lavali
+>lavali : unknown
 >wilsoni : lavali.wilsoni
 >x : lavali.wilsoni
->lavali : lavali
+>lavali : unknown
 >wilsoni : lavali.wilsoni
 >() => { var y = this; } : () => void
 >y : netscheri<T0, T1>
@@ -12525,34 +12525,34 @@ 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 : dammermani
+>dammermani : unknown
 >siberu : dammermani.siberu<T0, T1>
->nigra : nigra
+>nigra : unknown
 >thalia : nigra.thalia<T0, T1>
->lutreolus : lutreolus
+>lutreolus : unknown
 >schlegeli : lutreolus.schlegeli
->julianae : julianae
+>julianae : unknown
 >sumatrana : julianae.sumatrana
->panglima : panglima
+>panglima : unknown
 >abidi : panglima.abidi<T0, T1>
->lutreolus : lutreolus
+>lutreolus : unknown
 >foina : lutreolus.foina
->argurus : argurus
+>argurus : unknown
 >peninsulae : peninsulae
 >x : dammermani.siberu<nigra.thalia<lutreolus.schlegeli, julianae.sumatrana>, panglima.abidi<lutreolus.foina, peninsulae>>
->dammermani : dammermani
+>dammermani : unknown
 >siberu : dammermani.siberu<T0, T1>
->nigra : nigra
+>nigra : unknown
 >thalia : nigra.thalia<T0, T1>
->lutreolus : lutreolus
+>lutreolus : unknown
 >schlegeli : lutreolus.schlegeli
->julianae : julianae
+>julianae : unknown
 >sumatrana : julianae.sumatrana
->panglima : panglima
+>panglima : unknown
 >abidi : panglima.abidi<T0, T1>
->lutreolus : lutreolus
+>lutreolus : unknown
 >foina : lutreolus.foina
->argurus : argurus
+>argurus : unknown
 >peninsulae : peninsulae
 >() => { var y = this; } : () => void
 >y : netscheri<T0, T1>
@@ -12561,10 +12561,10 @@ module argurus {
 
         colletti(): samarensis.pallidus { var x: samarensis.pallidus; () => { var y = this; }; return x; }
 >colletti : () => samarensis.pallidus
->samarensis : samarensis
+>samarensis : unknown
 >pallidus : samarensis.pallidus
 >x : samarensis.pallidus
->samarensis : samarensis
+>samarensis : unknown
 >pallidus : samarensis.pallidus
 >() => { var y = this; } : () => void
 >y : netscheri<T0, T1>
@@ -12573,10 +12573,10 @@ module argurus {
 
         microbullatus(): lutreolus.schlegeli { var x: lutreolus.schlegeli; () => { var y = this; }; return x; }
 >microbullatus : () => lutreolus.schlegeli
->lutreolus : lutreolus
+>lutreolus : unknown
 >schlegeli : lutreolus.schlegeli
 >x : lutreolus.schlegeli
->lutreolus : lutreolus
+>lutreolus : unknown
 >schlegeli : lutreolus.schlegeli
 >() => { var y = this; } : () => void
 >y : netscheri<T0, T1>
@@ -12585,18 +12585,18 @@ 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 : chrysaeolus
+>chrysaeolus : unknown
 >sarasinorum : chrysaeolus.sarasinorum<T0, T1>
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >konganensis : macrorhinos.konganensis
->julianae : julianae
+>julianae : unknown
 >acariensis : julianae.acariensis
 >x : chrysaeolus.sarasinorum<macrorhinos.konganensis, julianae.acariensis>
->chrysaeolus : chrysaeolus
+>chrysaeolus : unknown
 >sarasinorum : chrysaeolus.sarasinorum<T0, T1>
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >konganensis : macrorhinos.konganensis
->julianae : julianae
+>julianae : unknown
 >acariensis : julianae.acariensis
 >() => { var y = this; } : () => void
 >y : netscheri<T0, T1>
@@ -12605,26 +12605,26 @@ 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 : argurus
+>argurus : unknown
 >pygmaea : pygmaea<T0, T1>
->argurus : argurus
+>argurus : unknown
 >oreas : oreas
->panglima : panglima
+>panglima : unknown
 >fundatus : panglima.fundatus<T0, T1>
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >daphaenodon : macrorhinos.daphaenodon
 >x : pygmaea<oreas, panglima.fundatus<quasiater.carolinensis, macrorhinos.daphaenodon>>
->argurus : argurus
+>argurus : unknown
 >pygmaea : pygmaea<T0, T1>
->argurus : argurus
+>argurus : unknown
 >oreas : oreas
->panglima : panglima
+>panglima : unknown
 >fundatus : panglima.fundatus<T0, T1>
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >daphaenodon : macrorhinos.daphaenodon
 >() => { var y = this; } : () => void
 >y : netscheri<T0, T1>
@@ -12633,10 +12633,10 @@ module argurus {
 
         millardi(): sagitta.walkeri { var x: sagitta.walkeri; () => { var y = this; }; return x; }
 >millardi : () => sagitta.walkeri
->sagitta : sagitta
+>sagitta : unknown
 >walkeri : sagitta.walkeri
 >x : sagitta.walkeri
->sagitta : sagitta
+>sagitta : unknown
 >walkeri : sagitta.walkeri
 >() => { var y = this; } : () => void
 >y : netscheri<T0, T1>
@@ -12645,10 +12645,10 @@ module argurus {
 
         pruinosus(): trivirgatus.falconeri { var x: trivirgatus.falconeri; () => { var y = this; }; return x; }
 >pruinosus : () => trivirgatus.falconeri
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >falconeri : trivirgatus.falconeri
 >x : trivirgatus.falconeri
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >falconeri : trivirgatus.falconeri
 >() => { var y = this; } : () => void
 >y : netscheri<T0, T1>
@@ -12657,18 +12657,18 @@ 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 : argurus
+>argurus : unknown
 >netscheri : netscheri<T0, T1>
->dogramacii : dogramacii
+>dogramacii : unknown
 >kaiseri : dogramacii.kaiseri
->lavali : lavali
+>lavali : unknown
 >lepturus : lavali.lepturus
 >x : netscheri<dogramacii.kaiseri, lavali.lepturus>
->argurus : argurus
+>argurus : unknown
 >netscheri : netscheri<T0, T1>
->dogramacii : dogramacii
+>dogramacii : unknown
 >kaiseri : dogramacii.kaiseri
->lavali : lavali
+>lavali : unknown
 >lepturus : lavali.lepturus
 >() => { var y = this; } : () => void
 >y : netscheri<T0, T1>
@@ -12677,34 +12677,34 @@ 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 : trivirgatus
+>trivirgatus : unknown
 >tumidifrons : trivirgatus.tumidifrons<T0, T1>
->howi : howi
+>howi : unknown
 >angulatus : howi.angulatus<T0, T1>
->howi : howi
+>howi : unknown
 >coludo : howi.coludo<T0, T1>
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
->minutus : minutus
+>minutus : unknown
 >portoricensis : minutus.portoricensis
->petrophilus : petrophilus
+>petrophilus : unknown
 >minutilla : petrophilus.minutilla
->julianae : julianae
+>julianae : unknown
 >acariensis : julianae.acariensis
 >x : trivirgatus.tumidifrons<howi.angulatus<howi.coludo<quasiater.carolinensis, minutus.portoricensis>, petrophilus.minutilla>, julianae.acariensis>
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >tumidifrons : trivirgatus.tumidifrons<T0, T1>
->howi : howi
+>howi : unknown
 >angulatus : howi.angulatus<T0, T1>
->howi : howi
+>howi : unknown
 >coludo : howi.coludo<T0, T1>
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
->minutus : minutus
+>minutus : unknown
 >portoricensis : minutus.portoricensis
->petrophilus : petrophilus
+>petrophilus : unknown
 >minutilla : petrophilus.minutilla
->julianae : julianae
+>julianae : unknown
 >acariensis : julianae.acariensis
 >() => { var y = this; } : () => void
 >y : netscheri<T0, T1>
@@ -12713,50 +12713,50 @@ 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 : panglima
+>panglima : unknown
 >amphibius : panglima.amphibius<T0, T1>
->minutus : minutus
+>minutus : unknown
 >inez : minutus.inez<T0, T1>
->rendalli : rendalli
+>rendalli : unknown
 >moojeni : rendalli.moojeni<T0, T1>
->panglima : panglima
+>panglima : unknown
 >amphibius : panglima.amphibius<T0, T1>
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >falconeri : trivirgatus.falconeri
->caurinus : caurinus
+>caurinus : unknown
 >psilurus : caurinus.psilurus
->gabriellae : gabriellae
+>gabriellae : unknown
 >echinatus : gabriellae.echinatus
->dogramacii : dogramacii
+>dogramacii : unknown
 >aurata : dogramacii.aurata
->imperfecta : imperfecta
+>imperfecta : unknown
 >ciliolabrum : imperfecta.ciliolabrum<T0, T1>
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
->lavali : lavali
+>lavali : unknown
 >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 : panglima
+>panglima : unknown
 >amphibius : panglima.amphibius<T0, T1>
->minutus : minutus
+>minutus : unknown
 >inez : minutus.inez<T0, T1>
->rendalli : rendalli
+>rendalli : unknown
 >moojeni : rendalli.moojeni<T0, T1>
->panglima : panglima
+>panglima : unknown
 >amphibius : panglima.amphibius<T0, T1>
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >falconeri : trivirgatus.falconeri
->caurinus : caurinus
+>caurinus : unknown
 >psilurus : caurinus.psilurus
->gabriellae : gabriellae
+>gabriellae : unknown
 >echinatus : gabriellae.echinatus
->dogramacii : dogramacii
+>dogramacii : unknown
 >aurata : dogramacii.aurata
->imperfecta : imperfecta
+>imperfecta : unknown
 >ciliolabrum : imperfecta.ciliolabrum<T0, T1>
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
->lavali : lavali
+>lavali : unknown
 >beisa : lavali.beisa
 >() => { var y = this; } : () => void
 >y : netscheri<T0, T1>
@@ -12765,49 +12765,49 @@ module argurus {
     }
 }
 module ruatanica {
->ruatanica : ruatanica
+>ruatanica : typeof ruatanica
 
     export class Praseodymium<T0, T1> extends ruatanica.hector<lutreolus.punicus, gabriellae.amicus> {
 >Praseodymium : Praseodymium<T0, T1>
 >T0 : T0
 >T1 : T1
->ruatanica : ruatanica
+>ruatanica : unknown
 >hector : hector<T0, T1>
->lutreolus : lutreolus
+>lutreolus : unknown
 >punicus : lutreolus.punicus
->gabriellae : gabriellae
+>gabriellae : unknown
 >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 : panglima
+>panglima : unknown
 >amphibius : panglima.amphibius<T0, T1>
->imperfecta : imperfecta
+>imperfecta : unknown
 >ciliolabrum : imperfecta.ciliolabrum<T0, T1>
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
->lavali : lavali
+>lavali : unknown
 >beisa : lavali.beisa
->argurus : argurus
+>argurus : unknown
 >dauricus : argurus.dauricus<T0, T1>
->ruatanica : ruatanica
+>ruatanica : unknown
 >americanus : americanus
->rionegrensis : rionegrensis
+>rionegrensis : unknown
 >caniventer : rionegrensis.caniventer
 >x : panglima.amphibius<imperfecta.ciliolabrum<quasiater.carolinensis, lavali.beisa>, argurus.dauricus<americanus, rionegrensis.caniventer>>
->panglima : panglima
+>panglima : unknown
 >amphibius : panglima.amphibius<T0, T1>
->imperfecta : imperfecta
+>imperfecta : unknown
 >ciliolabrum : imperfecta.ciliolabrum<T0, T1>
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
->lavali : lavali
+>lavali : unknown
 >beisa : lavali.beisa
->argurus : argurus
+>argurus : unknown
 >dauricus : argurus.dauricus<T0, T1>
->ruatanica : ruatanica
+>ruatanica : unknown
 >americanus : americanus
->rionegrensis : rionegrensis
+>rionegrensis : unknown
 >caniventer : rionegrensis.caniventer
 >() => { var y = this; } : () => void
 >y : Praseodymium<T0, T1>
@@ -12816,18 +12816,18 @@ 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 : petrophilus
+>petrophilus : unknown
 >sodyi : petrophilus.sodyi<T0, T1>
->rionegrensis : rionegrensis
+>rionegrensis : unknown
 >caniventer : rionegrensis.caniventer
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
 >x : petrophilus.sodyi<rionegrensis.caniventer, quasiater.carolinensis>
->petrophilus : petrophilus
+>petrophilus : unknown
 >sodyi : petrophilus.sodyi<T0, T1>
->rionegrensis : rionegrensis
+>rionegrensis : unknown
 >caniventer : rionegrensis.caniventer
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
 >() => { var y = this; } : () => void
 >y : Praseodymium<T0, T1>
@@ -12836,26 +12836,26 @@ 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 : trivirgatus
+>trivirgatus : unknown
 >lotor : trivirgatus.lotor<T0, T1>
->panamensis : panamensis
+>panamensis : unknown
 >linulus : panamensis.linulus<T0, T1>
->dogramacii : dogramacii
+>dogramacii : unknown
 >kaiseri : dogramacii.kaiseri
->minutus : minutus
+>minutus : unknown
 >portoricensis : minutus.portoricensis
->lavali : lavali
+>lavali : unknown
 >lepturus : lavali.lepturus
 >x : trivirgatus.lotor<panamensis.linulus<dogramacii.kaiseri, minutus.portoricensis>, lavali.lepturus>
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >lotor : trivirgatus.lotor<T0, T1>
->panamensis : panamensis
+>panamensis : unknown
 >linulus : panamensis.linulus<T0, T1>
->dogramacii : dogramacii
+>dogramacii : unknown
 >kaiseri : dogramacii.kaiseri
->minutus : minutus
+>minutus : unknown
 >portoricensis : minutus.portoricensis
->lavali : lavali
+>lavali : unknown
 >lepturus : lavali.lepturus
 >() => { var y = this; } : () => void
 >y : Praseodymium<T0, T1>
@@ -12864,10 +12864,10 @@ module ruatanica {
 
         ruddi(): lutreolus.foina { var x: lutreolus.foina; () => { var y = this; }; return x; }
 >ruddi : () => lutreolus.foina
->lutreolus : lutreolus
+>lutreolus : unknown
 >foina : lutreolus.foina
 >x : lutreolus.foina
->lutreolus : lutreolus
+>lutreolus : unknown
 >foina : lutreolus.foina
 >() => { var y = this; } : () => void
 >y : Praseodymium<T0, T1>
@@ -12876,10 +12876,10 @@ module ruatanica {
 
         bartelsii(): julianae.sumatrana { var x: julianae.sumatrana; () => { var y = this; }; return x; }
 >bartelsii : () => julianae.sumatrana
->julianae : julianae
+>julianae : unknown
 >sumatrana : julianae.sumatrana
 >x : julianae.sumatrana
->julianae : julianae
+>julianae : unknown
 >sumatrana : julianae.sumatrana
 >() => { var y = this; } : () => void
 >y : Praseodymium<T0, T1>
@@ -12888,34 +12888,34 @@ 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 : dammermani
+>dammermani : unknown
 >siberu : dammermani.siberu<T0, T1>
->imperfecta : imperfecta
+>imperfecta : unknown
 >lasiurus : imperfecta.lasiurus<T0, T1>
->lutreolus : lutreolus
+>lutreolus : unknown
 >foina : lutreolus.foina
->dammermani : dammermani
+>dammermani : unknown
 >melanops : dammermani.melanops
->imperfecta : imperfecta
+>imperfecta : unknown
 >ciliolabrum : imperfecta.ciliolabrum<T0, T1>
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >megalonyx : Lanthanum.megalonyx
->petrophilus : petrophilus
+>petrophilus : unknown
 >minutilla : petrophilus.minutilla
 >x : dammermani.siberu<imperfecta.lasiurus<lutreolus.foina, dammermani.melanops>, imperfecta.ciliolabrum<Lanthanum.megalonyx, petrophilus.minutilla>>
->dammermani : dammermani
+>dammermani : unknown
 >siberu : dammermani.siberu<T0, T1>
->imperfecta : imperfecta
+>imperfecta : unknown
 >lasiurus : imperfecta.lasiurus<T0, T1>
->lutreolus : lutreolus
+>lutreolus : unknown
 >foina : lutreolus.foina
->dammermani : dammermani
+>dammermani : unknown
 >melanops : dammermani.melanops
->imperfecta : imperfecta
+>imperfecta : unknown
 >ciliolabrum : imperfecta.ciliolabrum<T0, T1>
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >megalonyx : Lanthanum.megalonyx
->petrophilus : petrophilus
+>petrophilus : unknown
 >minutilla : petrophilus.minutilla
 >() => { var y = this; } : () => void
 >y : Praseodymium<T0, T1>
@@ -12924,18 +12924,18 @@ 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 : trivirgatus
+>trivirgatus : unknown
 >mixtus : trivirgatus.mixtus<T0, T1>
->provocax : provocax
+>provocax : unknown
 >melanoleuca : provocax.melanoleuca
->sagitta : sagitta
+>sagitta : unknown
 >stolzmanni : sagitta.stolzmanni
 >x : trivirgatus.mixtus<provocax.melanoleuca, sagitta.stolzmanni>
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >mixtus : trivirgatus.mixtus<T0, T1>
->provocax : provocax
+>provocax : unknown
 >melanoleuca : provocax.melanoleuca
->sagitta : sagitta
+>sagitta : unknown
 >stolzmanni : sagitta.stolzmanni
 >() => { var y = this; } : () => void
 >y : Praseodymium<T0, T1>
@@ -12944,58 +12944,58 @@ 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 : argurus
+>argurus : unknown
 >wetmorei : argurus.wetmorei<T0, T1>
->imperfecta : imperfecta
+>imperfecta : unknown
 >lasiurus : imperfecta.lasiurus<T0, T1>
->panglima : panglima
+>panglima : unknown
 >amphibius : panglima.amphibius<T0, T1>
->patas : patas
+>patas : unknown
 >uralensis : patas.uralensis
->gabriellae : gabriellae
+>gabriellae : unknown
 >klossii : gabriellae.klossii<T0, T1>
->julianae : julianae
+>julianae : unknown
 >nudicaudus : julianae.nudicaudus
->dogramacii : dogramacii
+>dogramacii : unknown
 >aurata : dogramacii.aurata
->sagitta : sagitta
+>sagitta : unknown
 >leptoceros : sagitta.leptoceros<T0, T1>
->lutreolus : lutreolus
+>lutreolus : unknown
 >punicus : lutreolus.punicus
->daubentonii : daubentonii
+>daubentonii : unknown
 >arboreus : daubentonii.arboreus<T0, T1>
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
->rionegrensis : rionegrensis
+>rionegrensis : unknown
 >caniventer : rionegrensis.caniventer
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >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 : argurus
+>argurus : unknown
 >wetmorei : argurus.wetmorei<T0, T1>
->imperfecta : imperfecta
+>imperfecta : unknown
 >lasiurus : imperfecta.lasiurus<T0, T1>
->panglima : panglima
+>panglima : unknown
 >amphibius : panglima.amphibius<T0, T1>
->patas : patas
+>patas : unknown
 >uralensis : patas.uralensis
->gabriellae : gabriellae
+>gabriellae : unknown
 >klossii : gabriellae.klossii<T0, T1>
->julianae : julianae
+>julianae : unknown
 >nudicaudus : julianae.nudicaudus
->dogramacii : dogramacii
+>dogramacii : unknown
 >aurata : dogramacii.aurata
->sagitta : sagitta
+>sagitta : unknown
 >leptoceros : sagitta.leptoceros<T0, T1>
->lutreolus : lutreolus
+>lutreolus : unknown
 >punicus : lutreolus.punicus
->daubentonii : daubentonii
+>daubentonii : unknown
 >arboreus : daubentonii.arboreus<T0, T1>
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
->rionegrensis : rionegrensis
+>rionegrensis : unknown
 >caniventer : rionegrensis.caniventer
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >konganensis : macrorhinos.konganensis
 >() => { var y = this; } : () => void
 >y : Praseodymium<T0, T1>
@@ -13004,34 +13004,34 @@ 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 : imperfecta
+>imperfecta : unknown
 >lasiurus : imperfecta.lasiurus<T0, T1>
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >nitidus : Lanthanum.nitidus<T0, T1>
->howi : howi
+>howi : unknown
 >marcanoi : howi.marcanoi
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >daphaenodon : macrorhinos.daphaenodon
->petrophilus : petrophilus
+>petrophilus : unknown
 >sodyi : petrophilus.sodyi<T0, T1>
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >konganensis : macrorhinos.konganensis
->caurinus : caurinus
+>caurinus : unknown
 >psilurus : caurinus.psilurus
 >x : imperfecta.lasiurus<Lanthanum.nitidus<howi.marcanoi, macrorhinos.daphaenodon>, petrophilus.sodyi<macrorhinos.konganensis, caurinus.psilurus>>
->imperfecta : imperfecta
+>imperfecta : unknown
 >lasiurus : imperfecta.lasiurus<T0, T1>
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >nitidus : Lanthanum.nitidus<T0, T1>
->howi : howi
+>howi : unknown
 >marcanoi : howi.marcanoi
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >daphaenodon : macrorhinos.daphaenodon
->petrophilus : petrophilus
+>petrophilus : unknown
 >sodyi : petrophilus.sodyi<T0, T1>
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >konganensis : macrorhinos.konganensis
->caurinus : caurinus
+>caurinus : unknown
 >psilurus : caurinus.psilurus
 >() => { var y = this; } : () => void
 >y : Praseodymium<T0, T1>
@@ -13040,10 +13040,10 @@ module ruatanica {
 
         frontata(): argurus.oreas { var x: argurus.oreas; () => { var y = this; }; return x; }
 >frontata : () => argurus.oreas
->argurus : argurus
+>argurus : unknown
 >oreas : argurus.oreas
 >x : argurus.oreas
->argurus : argurus
+>argurus : unknown
 >oreas : argurus.oreas
 >() => { var y = this; } : () => void
 >y : Praseodymium<T0, T1>
@@ -13052,18 +13052,18 @@ 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 : caurinus
+>caurinus : unknown
 >mahaganus : caurinus.mahaganus<T0, T1>
->julianae : julianae
+>julianae : unknown
 >galapagoensis : julianae.galapagoensis
->argurus : argurus
+>argurus : unknown
 >luctuosa : argurus.luctuosa
 >x : caurinus.mahaganus<julianae.galapagoensis, argurus.luctuosa>
->caurinus : caurinus
+>caurinus : unknown
 >mahaganus : caurinus.mahaganus<T0, T1>
->julianae : julianae
+>julianae : unknown
 >galapagoensis : julianae.galapagoensis
->argurus : argurus
+>argurus : unknown
 >luctuosa : argurus.luctuosa
 >() => { var y = this; } : () => void
 >y : Praseodymium<T0, T1>
@@ -13072,26 +13072,26 @@ 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 : minutus
+>minutus : unknown
 >inez : minutus.inez<T0, T1>
->argurus : argurus
+>argurus : unknown
 >oreas : argurus.oreas
->julianae : julianae
+>julianae : unknown
 >albidens : julianae.albidens<T0, T1>
->argurus : argurus
+>argurus : unknown
 >luctuosa : argurus.luctuosa
->gabriellae : gabriellae
+>gabriellae : unknown
 >echinatus : gabriellae.echinatus
 >x : minutus.inez<argurus.oreas, julianae.albidens<argurus.luctuosa, gabriellae.echinatus>>
->minutus : minutus
+>minutus : unknown
 >inez : minutus.inez<T0, T1>
->argurus : argurus
+>argurus : unknown
 >oreas : argurus.oreas
->julianae : julianae
+>julianae : unknown
 >albidens : julianae.albidens<T0, T1>
->argurus : argurus
+>argurus : unknown
 >luctuosa : argurus.luctuosa
->gabriellae : gabriellae
+>gabriellae : unknown
 >echinatus : gabriellae.echinatus
 >() => { var y = this; } : () => void
 >y : Praseodymium<T0, T1>
@@ -13100,10 +13100,10 @@ module ruatanica {
 
         soricinus(): quasiater.carolinensis { var x: quasiater.carolinensis; () => { var y = this; }; return x; }
 >soricinus : () => quasiater.carolinensis
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
 >x : quasiater.carolinensis
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
 >() => { var y = this; } : () => void
 >y : Praseodymium<T0, T1>
@@ -13112,29 +13112,29 @@ module ruatanica {
     }
 }
 module caurinus {
->caurinus : caurinus
+>caurinus : typeof caurinus
 
     export class johorensis<T0, T1> extends lutreolus.punicus {
 >johorensis : johorensis<T0, T1>
 >T0 : T0
 >T1 : T1
->lutreolus : lutreolus
+>lutreolus : unknown
 >punicus : lutreolus.punicus
 
         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 : ruatanica
+>ruatanica : unknown
 >Praseodymium : ruatanica.Praseodymium<T0, T1>
->lavali : lavali
+>lavali : unknown
 >thaeleri : lavali.thaeleri
->julianae : julianae
+>julianae : unknown
 >acariensis : julianae.acariensis
 >x : ruatanica.Praseodymium<lavali.thaeleri, julianae.acariensis>
->ruatanica : ruatanica
+>ruatanica : unknown
 >Praseodymium : ruatanica.Praseodymium<T0, T1>
->lavali : lavali
+>lavali : unknown
 >thaeleri : lavali.thaeleri
->julianae : julianae
+>julianae : unknown
 >acariensis : julianae.acariensis
 >() => { var y = this; } : () => void
 >y : johorensis<T0, T1>
@@ -13143,49 +13143,49 @@ module caurinus {
     }
 }
 module argurus {
->argurus : argurus
+>argurus : typeof argurus
 
     export class luctuosa {
 >luctuosa : luctuosa
 
         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 : rendalli
+>rendalli : unknown
 >moojeni : rendalli.moojeni<T0, T1>
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >marmosurus : macrorhinos.marmosurus<T0, T1>
->rendalli : rendalli
+>rendalli : unknown
 >moojeni : rendalli.moojeni<T0, T1>
->panglima : panglima
+>panglima : unknown
 >amphibius : panglima.amphibius<T0, T1>
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >falconeri : trivirgatus.falconeri
->caurinus : caurinus
+>caurinus : unknown
 >psilurus : caurinus.psilurus
->gabriellae : gabriellae
+>gabriellae : unknown
 >echinatus : gabriellae.echinatus
->sagitta : sagitta
+>sagitta : unknown
 >stolzmanni : sagitta.stolzmanni
->lutreolus : lutreolus
+>lutreolus : unknown
 >punicus : lutreolus.punicus
 >x : rendalli.moojeni<macrorhinos.marmosurus<rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>, sagitta.stolzmanni>, lutreolus.punicus>
->rendalli : rendalli
+>rendalli : unknown
 >moojeni : rendalli.moojeni<T0, T1>
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >marmosurus : macrorhinos.marmosurus<T0, T1>
->rendalli : rendalli
+>rendalli : unknown
 >moojeni : rendalli.moojeni<T0, T1>
->panglima : panglima
+>panglima : unknown
 >amphibius : panglima.amphibius<T0, T1>
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >falconeri : trivirgatus.falconeri
->caurinus : caurinus
+>caurinus : unknown
 >psilurus : caurinus.psilurus
->gabriellae : gabriellae
+>gabriellae : unknown
 >echinatus : gabriellae.echinatus
->sagitta : sagitta
+>sagitta : unknown
 >stolzmanni : sagitta.stolzmanni
->lutreolus : lutreolus
+>lutreolus : unknown
 >punicus : lutreolus.punicus
 >() => { var y = this; } : () => void
 >y : luctuosa
@@ -13194,7 +13194,7 @@ module argurus {
     }
 }
 module panamensis {
->panamensis : panamensis
+>panamensis : typeof panamensis
 
     export class setulosus<T0, T1> {
 >setulosus : setulosus<T0, T1>
@@ -13203,26 +13203,26 @@ module panamensis {
 
         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 : caurinus
+>caurinus : unknown
 >mahaganus : caurinus.mahaganus<T0, T1>
->howi : howi
+>howi : unknown
 >coludo : howi.coludo<T0, T1>
->argurus : argurus
+>argurus : unknown
 >oreas : argurus.oreas
->howi : howi
+>howi : unknown
 >marcanoi : howi.marcanoi
->dogramacii : dogramacii
+>dogramacii : unknown
 >aurata : dogramacii.aurata
 >x : caurinus.mahaganus<howi.coludo<argurus.oreas, howi.marcanoi>, dogramacii.aurata>
->caurinus : caurinus
+>caurinus : unknown
 >mahaganus : caurinus.mahaganus<T0, T1>
->howi : howi
+>howi : unknown
 >coludo : howi.coludo<T0, T1>
->argurus : argurus
+>argurus : unknown
 >oreas : argurus.oreas
->howi : howi
+>howi : unknown
 >marcanoi : howi.marcanoi
->dogramacii : dogramacii
+>dogramacii : unknown
 >aurata : dogramacii.aurata
 >() => { var y = this; } : () => void
 >y : setulosus<T0, T1>
@@ -13231,18 +13231,18 @@ 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 : howi
+>howi : unknown
 >coludo : howi.coludo<T0, T1>
->sagitta : sagitta
+>sagitta : unknown
 >stolzmanni : sagitta.stolzmanni
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
 >x : howi.coludo<sagitta.stolzmanni, quasiater.carolinensis>
->howi : howi
+>howi : unknown
 >coludo : howi.coludo<T0, T1>
->sagitta : sagitta
+>sagitta : unknown
 >stolzmanni : sagitta.stolzmanni
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
 >() => { var y = this; } : () => void
 >y : setulosus<T0, T1>
@@ -13251,42 +13251,42 @@ 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 : daubentonii
+>daubentonii : unknown
 >nesiotes : daubentonii.nesiotes<T0, T1>
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >lotor : trivirgatus.lotor<T0, T1>
->panglima : panglima
+>panglima : unknown
 >abidi : panglima.abidi<T0, T1>
->lavali : lavali
+>lavali : unknown
 >lepturus : lavali.lepturus
->caurinus : caurinus
+>caurinus : unknown
 >psilurus : caurinus.psilurus
->dogramacii : dogramacii
+>dogramacii : unknown
 >koepckeae : dogramacii.koepckeae
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >mixtus : trivirgatus.mixtus<T0, T1>
->gabriellae : gabriellae
+>gabriellae : unknown
 >amicus : gabriellae.amicus
->lutreolus : lutreolus
+>lutreolus : unknown
 >punicus : lutreolus.punicus
 >x : daubentonii.nesiotes<trivirgatus.lotor<panglima.abidi<lavali.lepturus, caurinus.psilurus>, dogramacii.koepckeae>, trivirgatus.mixtus<gabriellae.amicus, lutreolus.punicus>>
->daubentonii : daubentonii
+>daubentonii : unknown
 >nesiotes : daubentonii.nesiotes<T0, T1>
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >lotor : trivirgatus.lotor<T0, T1>
->panglima : panglima
+>panglima : unknown
 >abidi : panglima.abidi<T0, T1>
->lavali : lavali
+>lavali : unknown
 >lepturus : lavali.lepturus
->caurinus : caurinus
+>caurinus : unknown
 >psilurus : caurinus.psilurus
->dogramacii : dogramacii
+>dogramacii : unknown
 >koepckeae : dogramacii.koepckeae
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >mixtus : trivirgatus.mixtus<T0, T1>
->gabriellae : gabriellae
+>gabriellae : unknown
 >amicus : gabriellae.amicus
->lutreolus : lutreolus
+>lutreolus : unknown
 >punicus : lutreolus.punicus
 >() => { var y = this; } : () => void
 >y : setulosus<T0, T1>
@@ -13295,34 +13295,34 @@ 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 : sagitta
+>sagitta : unknown
 >cinereus : sagitta.cinereus<T0, T1>
->argurus : argurus
+>argurus : unknown
 >netscheri : argurus.netscheri<T0, T1>
->argurus : argurus
+>argurus : unknown
 >luctuosa : argurus.luctuosa
->julianae : julianae
+>julianae : unknown
 >nudicaudus : julianae.nudicaudus
->chrysaeolus : chrysaeolus
+>chrysaeolus : unknown
 >sarasinorum : chrysaeolus.sarasinorum<T0, T1>
->caurinus : caurinus
+>caurinus : unknown
 >megaphyllus : caurinus.megaphyllus
->lavali : lavali
+>lavali : unknown
 >xanthognathus : lavali.xanthognathus
 >x : sagitta.cinereus<argurus.netscheri<argurus.luctuosa, julianae.nudicaudus>, chrysaeolus.sarasinorum<caurinus.megaphyllus, lavali.xanthognathus>>
->sagitta : sagitta
+>sagitta : unknown
 >cinereus : sagitta.cinereus<T0, T1>
->argurus : argurus
+>argurus : unknown
 >netscheri : argurus.netscheri<T0, T1>
->argurus : argurus
+>argurus : unknown
 >luctuosa : argurus.luctuosa
->julianae : julianae
+>julianae : unknown
 >nudicaudus : julianae.nudicaudus
->chrysaeolus : chrysaeolus
+>chrysaeolus : unknown
 >sarasinorum : chrysaeolus.sarasinorum<T0, T1>
->caurinus : caurinus
+>caurinus : unknown
 >megaphyllus : caurinus.megaphyllus
->lavali : lavali
+>lavali : unknown
 >xanthognathus : lavali.xanthognathus
 >() => { var y = this; } : () => void
 >y : setulosus<T0, T1>
@@ -13331,26 +13331,26 @@ 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 : rendalli
+>rendalli : unknown
 >crenulata : rendalli.crenulata<T0, T1>
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >nitidus : Lanthanum.nitidus<T0, T1>
->rionegrensis : rionegrensis
+>rionegrensis : unknown
 >caniventer : rionegrensis.caniventer
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >jugularis : Lanthanum.jugularis
->julianae : julianae
+>julianae : unknown
 >steerii : julianae.steerii
 >x : rendalli.crenulata<Lanthanum.nitidus<rionegrensis.caniventer, Lanthanum.jugularis>, julianae.steerii>
->rendalli : rendalli
+>rendalli : unknown
 >crenulata : rendalli.crenulata<T0, T1>
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >nitidus : Lanthanum.nitidus<T0, T1>
->rionegrensis : rionegrensis
+>rionegrensis : unknown
 >caniventer : rionegrensis.caniventer
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >jugularis : Lanthanum.jugularis
->julianae : julianae
+>julianae : unknown
 >steerii : julianae.steerii
 >() => { var y = this; } : () => void
 >y : setulosus<T0, T1>
@@ -13359,10 +13359,10 @@ module panamensis {
 
         tunneyi(): sagitta.stolzmanni { var x: sagitta.stolzmanni; () => { var y = this; }; return x; }
 >tunneyi : () => sagitta.stolzmanni
->sagitta : sagitta
+>sagitta : unknown
 >stolzmanni : sagitta.stolzmanni
 >x : sagitta.stolzmanni
->sagitta : sagitta
+>sagitta : unknown
 >stolzmanni : sagitta.stolzmanni
 >() => { var y = this; } : () => void
 >y : setulosus<T0, T1>
@@ -13371,10 +13371,10 @@ module panamensis {
 
         lamula(): patas.uralensis { var x: patas.uralensis; () => { var y = this; }; return x; }
 >lamula : () => patas.uralensis
->patas : patas
+>patas : unknown
 >uralensis : patas.uralensis
 >x : patas.uralensis
->patas : patas
+>patas : unknown
 >uralensis : patas.uralensis
 >() => { var y = this; } : () => void
 >y : setulosus<T0, T1>
@@ -13383,18 +13383,18 @@ 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 : julianae
+>julianae : unknown
 >oralis : julianae.oralis<T0, T1>
->lutreolus : lutreolus
+>lutreolus : unknown
 >foina : lutreolus.foina
->provocax : provocax
+>provocax : unknown
 >melanoleuca : provocax.melanoleuca
 >x : julianae.oralis<lutreolus.foina, provocax.melanoleuca>
->julianae : julianae
+>julianae : unknown
 >oralis : julianae.oralis<T0, T1>
->lutreolus : lutreolus
+>lutreolus : unknown
 >foina : lutreolus.foina
->provocax : provocax
+>provocax : unknown
 >melanoleuca : provocax.melanoleuca
 >() => { var y = this; } : () => void
 >y : setulosus<T0, T1>
@@ -13403,7 +13403,7 @@ module panamensis {
     }
 }
 module petrophilus {
->petrophilus : petrophilus
+>petrophilus : typeof petrophilus
 
     export class rosalia<T0, T1> {
 >rosalia : rosalia<T0, T1>
@@ -13412,58 +13412,58 @@ module petrophilus {
 
         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 : panglima
+>panglima : unknown
 >amphibius : panglima.amphibius<T0, T1>
->howi : howi
+>howi : unknown
 >coludo : howi.coludo<T0, T1>
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >daphaenodon : macrorhinos.daphaenodon
->panglima : panglima
+>panglima : unknown
 >amphibius : panglima.amphibius<T0, T1>
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >daphaenodon : macrorhinos.daphaenodon
->patas : patas
+>patas : unknown
 >uralensis : patas.uralensis
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >mixtus : trivirgatus.mixtus<T0, T1>
->argurus : argurus
+>argurus : unknown
 >dauricus : argurus.dauricus<T0, T1>
->dogramacii : dogramacii
+>dogramacii : unknown
 >aurata : dogramacii.aurata
->dammermani : dammermani
+>dammermani : unknown
 >melanops : dammermani.melanops
->panglima : panglima
+>panglima : unknown
 >amphibius : panglima.amphibius<T0, T1>
->lavali : lavali
+>lavali : unknown
 >lepturus : lavali.lepturus
->quasiater : quasiater
+>quasiater : unknown
 >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 : panglima
+>panglima : unknown
 >amphibius : panglima.amphibius<T0, T1>
->howi : howi
+>howi : unknown
 >coludo : howi.coludo<T0, T1>
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >daphaenodon : macrorhinos.daphaenodon
->panglima : panglima
+>panglima : unknown
 >amphibius : panglima.amphibius<T0, T1>
->macrorhinos : macrorhinos
+>macrorhinos : unknown
 >daphaenodon : macrorhinos.daphaenodon
->patas : patas
+>patas : unknown
 >uralensis : patas.uralensis
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >mixtus : trivirgatus.mixtus<T0, T1>
->argurus : argurus
+>argurus : unknown
 >dauricus : argurus.dauricus<T0, T1>
->dogramacii : dogramacii
+>dogramacii : unknown
 >aurata : dogramacii.aurata
->dammermani : dammermani
+>dammermani : unknown
 >melanops : dammermani.melanops
->panglima : panglima
+>panglima : unknown
 >amphibius : panglima.amphibius<T0, T1>
->lavali : lavali
+>lavali : unknown
 >lepturus : lavali.lepturus
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
 >() => { var y = this; } : () => void
 >y : rosalia<T0, T1>
@@ -13472,18 +13472,18 @@ 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 : Lanthanum
+>Lanthanum : unknown
 >nitidus : Lanthanum.nitidus<T0, T1>
->lavali : lavali
+>lavali : unknown
 >thaeleri : lavali.thaeleri
->lavali : lavali
+>lavali : unknown
 >lepturus : lavali.lepturus
 >x : Lanthanum.nitidus<lavali.thaeleri, lavali.lepturus>
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >nitidus : Lanthanum.nitidus<T0, T1>
->lavali : lavali
+>lavali : unknown
 >thaeleri : lavali.thaeleri
->lavali : lavali
+>lavali : unknown
 >lepturus : lavali.lepturus
 >() => { var y = this; } : () => void
 >y : rosalia<T0, T1>
@@ -13492,26 +13492,26 @@ 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 : imperfecta
+>imperfecta : unknown
 >lasiurus : imperfecta.lasiurus<T0, T1>
->panglima : panglima
+>panglima : unknown
 >fundatus : panglima.fundatus<T0, T1>
->gabriellae : gabriellae
+>gabriellae : unknown
 >amicus : gabriellae.amicus
->lutreolus : lutreolus
+>lutreolus : unknown
 >foina : lutreolus.foina
->lutreolus : lutreolus
+>lutreolus : unknown
 >foina : lutreolus.foina
 >x : imperfecta.lasiurus<panglima.fundatus<gabriellae.amicus, lutreolus.foina>, lutreolus.foina>
->imperfecta : imperfecta
+>imperfecta : unknown
 >lasiurus : imperfecta.lasiurus<T0, T1>
->panglima : panglima
+>panglima : unknown
 >fundatus : panglima.fundatus<T0, T1>
->gabriellae : gabriellae
+>gabriellae : unknown
 >amicus : gabriellae.amicus
->lutreolus : lutreolus
+>lutreolus : unknown
 >foina : lutreolus.foina
->lutreolus : lutreolus
+>lutreolus : unknown
 >foina : lutreolus.foina
 >() => { var y = this; } : () => void
 >y : rosalia<T0, T1>
@@ -13520,10 +13520,10 @@ module petrophilus {
 
         creaghi(): argurus.luctuosa { var x: argurus.luctuosa; () => { var y = this; }; return x; }
 >creaghi : () => argurus.luctuosa
->argurus : argurus
+>argurus : unknown
 >luctuosa : argurus.luctuosa
 >x : argurus.luctuosa
->argurus : argurus
+>argurus : unknown
 >luctuosa : argurus.luctuosa
 >() => { var y = this; } : () => void
 >y : rosalia<T0, T1>
@@ -13532,26 +13532,26 @@ 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 : panamensis
+>panamensis : unknown
 >setulosus : panamensis.setulosus<T0, T1>
->lavali : lavali
+>lavali : unknown
 >beisa : lavali.beisa
->panamensis : panamensis
+>panamensis : unknown
 >linulus : panamensis.linulus<T0, T1>
->caurinus : caurinus
+>caurinus : unknown
 >megaphyllus : caurinus.megaphyllus
->caurinus : caurinus
+>caurinus : unknown
 >megaphyllus : caurinus.megaphyllus
 >x : panamensis.setulosus<lavali.beisa, panamensis.linulus<caurinus.megaphyllus, caurinus.megaphyllus>>
->panamensis : panamensis
+>panamensis : unknown
 >setulosus : panamensis.setulosus<T0, T1>
->lavali : lavali
+>lavali : unknown
 >beisa : lavali.beisa
->panamensis : panamensis
+>panamensis : unknown
 >linulus : panamensis.linulus<T0, T1>
->caurinus : caurinus
+>caurinus : unknown
 >megaphyllus : caurinus.megaphyllus
->caurinus : caurinus
+>caurinus : unknown
 >megaphyllus : caurinus.megaphyllus
 >() => { var y = this; } : () => void
 >y : rosalia<T0, T1>
@@ -13560,27 +13560,27 @@ module petrophilus {
     }
 }
 module caurinus {
->caurinus : caurinus
+>caurinus : typeof caurinus
 
     export class psilurus extends lutreolus.punicus {
 >psilurus : psilurus
->lutreolus : lutreolus
+>lutreolus : unknown
 >punicus : lutreolus.punicus
 
         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 : panglima
+>panglima : unknown
 >amphibius : panglima.amphibius<T0, T1>
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >falconeri : trivirgatus.falconeri
->caurinus : caurinus
+>caurinus : unknown
 >psilurus : psilurus
 >x : panglima.amphibius<trivirgatus.falconeri, psilurus>
->panglima : panglima
+>panglima : unknown
 >amphibius : panglima.amphibius<T0, T1>
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >falconeri : trivirgatus.falconeri
->caurinus : caurinus
+>caurinus : unknown
 >psilurus : psilurus
 >() => { var y = this; } : () => void
 >y : psilurus
@@ -13589,18 +13589,18 @@ 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 : petrophilus
+>petrophilus : unknown
 >sodyi : petrophilus.sodyi<T0, T1>
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >falconeri : trivirgatus.falconeri
->quasiater : quasiater
+>quasiater : unknown
 >bobrinskoi : quasiater.bobrinskoi
 >x : petrophilus.sodyi<trivirgatus.falconeri, quasiater.bobrinskoi>
->petrophilus : petrophilus
+>petrophilus : unknown
 >sodyi : petrophilus.sodyi<T0, T1>
->trivirgatus : trivirgatus
+>trivirgatus : unknown
 >falconeri : trivirgatus.falconeri
->quasiater : quasiater
+>quasiater : unknown
 >bobrinskoi : quasiater.bobrinskoi
 >() => { var y = this; } : () => void
 >y : psilurus
@@ -13609,18 +13609,18 @@ 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 : imperfecta
+>imperfecta : unknown
 >ciliolabrum : imperfecta.ciliolabrum<T0, T1>
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
->lavali : lavali
+>lavali : unknown
 >beisa : lavali.beisa
 >x : imperfecta.ciliolabrum<quasiater.carolinensis, lavali.beisa>
->imperfecta : imperfecta
+>imperfecta : unknown
 >ciliolabrum : imperfecta.ciliolabrum<T0, T1>
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
->lavali : lavali
+>lavali : unknown
 >beisa : lavali.beisa
 >() => { var y = this; } : () => void
 >y : psilurus
@@ -13629,18 +13629,18 @@ 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 : julianae
+>julianae : unknown
 >gerbillus : julianae.gerbillus<T0, T1>
->lavali : lavali
+>lavali : unknown
 >thaeleri : lavali.thaeleri
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
 >x : julianae.gerbillus<lavali.thaeleri, quasiater.carolinensis>
->julianae : julianae
+>julianae : unknown
 >gerbillus : julianae.gerbillus<T0, T1>
->lavali : lavali
+>lavali : unknown
 >thaeleri : lavali.thaeleri
->quasiater : quasiater
+>quasiater : unknown
 >carolinensis : quasiater.carolinensis
 >() => { var y = this; } : () => void
 >y : psilurus
@@ -13649,18 +13649,18 @@ 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 : panamensis
+>panamensis : unknown
 >setulosus : panamensis.setulosus<T0, T1>
->sagitta : sagitta
+>sagitta : unknown
 >walkeri : sagitta.walkeri
->dogramacii : dogramacii
+>dogramacii : unknown
 >robustulus : dogramacii.robustulus
 >x : panamensis.setulosus<sagitta.walkeri, dogramacii.robustulus>
->panamensis : panamensis
+>panamensis : unknown
 >setulosus : panamensis.setulosus<T0, T1>
->sagitta : sagitta
+>sagitta : unknown
 >walkeri : sagitta.walkeri
->dogramacii : dogramacii
+>dogramacii : unknown
 >robustulus : dogramacii.robustulus
 >() => { var y = this; } : () => void
 >y : psilurus
@@ -13669,18 +13669,18 @@ 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 : panamensis
+>panamensis : unknown
 >linulus : panamensis.linulus<T0, T1>
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >megalonyx : Lanthanum.megalonyx
->howi : howi
+>howi : unknown
 >marcanoi : howi.marcanoi
 >x : panamensis.linulus<Lanthanum.megalonyx, howi.marcanoi>
->panamensis : panamensis
+>panamensis : unknown
 >linulus : panamensis.linulus<T0, T1>
->Lanthanum : Lanthanum
+>Lanthanum : unknown
 >megalonyx : Lanthanum.megalonyx
->howi : howi
+>howi : unknown
 >marcanoi : howi.marcanoi
 >() => { var y = this; } : () => void
 >y : psilurus
diff --git a/tests/baselines/reference/returnTypeParameterWithModules.types b/tests/baselines/reference/returnTypeParameterWithModules.types
index 1f39f3d335c..a13a9b79e0d 100644
--- a/tests/baselines/reference/returnTypeParameterWithModules.types
+++ b/tests/baselines/reference/returnTypeParameterWithModules.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/returnTypeParameterWithModules.ts ===
 module M1 {
->M1 : M1
+>M1 : typeof M1
 
     export function reduce<A>(ar, f, e?): Array<A> {
 >reduce : typeof reduce
@@ -32,10 +32,10 @@ module M1 {
     };
 };
 module M2 {
->M2 : M2
+>M2 : typeof M2
 
   import A = M1
->A : A
+>A : typeof A
 >M1 : typeof A
 
   export function compose() {
diff --git a/tests/baselines/reference/reuseInnerModuleMember.types b/tests/baselines/reference/reuseInnerModuleMember.types
index 7ef31b326d7..b4ff68efbdf 100644
--- a/tests/baselines/reference/reuseInnerModuleMember.types
+++ b/tests/baselines/reference/reuseInnerModuleMember.types
@@ -1,17 +1,17 @@
 === tests/cases/compiler/reuseInnerModuleMember_1.ts ===
 ///<reference path='reuseInnerModuleMember_0.ts'/>
 declare module bar {
->bar : bar
+>bar : typeof bar
 
     interface alpha { }
 >alpha : alpha
 }
 
 import f = require('reuseInnerModuleMember_0');
->f : f
+>f : typeof f
 
 module bar {
->bar : bar
+>bar : typeof bar
 
     var x: alpha;
 >x : alpha
@@ -20,5 +20,5 @@ module bar {
 
 === tests/cases/compiler/reuseInnerModuleMember_0.ts ===
 export module M { }
->M : M
+>M : unknown
 
diff --git a/tests/baselines/reference/scopeResolutionIdentifiers.types b/tests/baselines/reference/scopeResolutionIdentifiers.types
index 135ff1fbda6..daac3c316e4 100644
--- a/tests/baselines/reference/scopeResolutionIdentifiers.types
+++ b/tests/baselines/reference/scopeResolutionIdentifiers.types
@@ -5,7 +5,7 @@ var s: string;
 >s : string
 
 module M1 {
->M1 : M1
+>M1 : typeof M1
 
     export var s: number;
 >s : number
@@ -19,7 +19,7 @@ module M1 {
 }
 
 module M2 {
->M2 : M2
+>M2 : typeof M2
 
     var s: number;
 >s : number
@@ -75,13 +75,13 @@ class C {
 }
 
 module M3 {
->M3 : M3
+>M3 : typeof M3
 
     var s: any;
 >s : any
 
     module M4 {
->M4 : M4
+>M4 : typeof M4
 
         var n = s;
 >n : any
diff --git a/tests/baselines/reference/separate1-2.types b/tests/baselines/reference/separate1-2.types
index ebe49d5c2a7..9e07b3f7a5b 100644
--- a/tests/baselines/reference/separate1-2.types
+++ b/tests/baselines/reference/separate1-2.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/separate1-2.ts ===
 module X {
->X : X
+>X : typeof X
 
     export function f() { }
 >f : typeof f
diff --git a/tests/baselines/reference/sourceMap-FileWithComments.types b/tests/baselines/reference/sourceMap-FileWithComments.types
index 07981506ff8..053a73c42ce 100644
--- a/tests/baselines/reference/sourceMap-FileWithComments.types
+++ b/tests/baselines/reference/sourceMap-FileWithComments.types
@@ -10,7 +10,7 @@ interface IPoint {
 
 // Module
 module Shapes {
->Shapes : Shapes
+>Shapes : typeof Shapes
 
     // Class
     export class Point implements IPoint {
diff --git a/tests/baselines/reference/sourceMap-StringLiteralWithNewLine.types b/tests/baselines/reference/sourceMap-StringLiteralWithNewLine.types
index f8bf01a97d6..3d71b5a5ca1 100644
--- a/tests/baselines/reference/sourceMap-StringLiteralWithNewLine.types
+++ b/tests/baselines/reference/sourceMap-StringLiteralWithNewLine.types
@@ -15,7 +15,7 @@ declare var window: Window;
 >Window : Window
 
 module Foo {
->Foo : Foo
+>Foo : typeof Foo
 
     var x = "test1";
 >x : string
diff --git a/tests/baselines/reference/sourceMapValidationClasses.types b/tests/baselines/reference/sourceMapValidationClasses.types
index 64d059eafdc..8deaf6c2ce8 100644
--- a/tests/baselines/reference/sourceMapValidationClasses.types
+++ b/tests/baselines/reference/sourceMapValidationClasses.types
@@ -1,7 +1,7 @@
 === tests/cases/compiler/sourceMapValidationClasses.ts ===
 module Foo.Bar {
->Foo : Foo
->Bar : Bar
+>Foo : typeof Foo
+>Bar : typeof Bar
 
     "use strict";
 
diff --git a/tests/baselines/reference/sourceMapValidationImport.types b/tests/baselines/reference/sourceMapValidationImport.types
index d58238b34f4..801925fc8cb 100644
--- a/tests/baselines/reference/sourceMapValidationImport.types
+++ b/tests/baselines/reference/sourceMapValidationImport.types
@@ -1,18 +1,18 @@
 === tests/cases/compiler/sourceMapValidationImport.ts ===
 export module m {
->m : m
+>m : typeof m
 
     export class c {
 >c : c
     }
 }
 import a = m.c;
->a : a
+>a : typeof a
 >m : typeof m
 >c : a
 
 export import b = m.c;
->b : b
+>b : typeof a
 >m : typeof m
 >c : a
 
diff --git a/tests/baselines/reference/sourceMapValidationModule.types b/tests/baselines/reference/sourceMapValidationModule.types
index 27a90f32afc..38c0c3e8392 100644
--- a/tests/baselines/reference/sourceMapValidationModule.types
+++ b/tests/baselines/reference/sourceMapValidationModule.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/sourceMapValidationModule.ts ===
 module m2 {
->m2 : m2
+>m2 : typeof m2
 
     var a = 10;
 >a : number
@@ -10,10 +10,10 @@ module m2 {
 >a : number
 }
 module m3 {
->m3 : m3
+>m3 : typeof m3
 
     module m4 {
->m4 : m4
+>m4 : typeof m4
 
         export var x = 30;
 >x : number
diff --git a/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.types b/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.types
index 33a67423eaf..6e6d6672c16 100644
--- a/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.types
+++ b/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/a.ts ===
 module M {
->M : M
+>M : typeof M
 
     export var X = 1;
 >X : number
@@ -27,7 +27,7 @@ interface Navigator {
 
 === tests/cases/compiler/b.ts ===
 module m1 {
->m1 : m1
+>m1 : typeof m1
 
     export class c1 {
 >c1 : c1
diff --git a/tests/baselines/reference/sourcemapValidationDuplicateNames.types b/tests/baselines/reference/sourcemapValidationDuplicateNames.types
index 921524ad416..d5862720ede 100644
--- a/tests/baselines/reference/sourcemapValidationDuplicateNames.types
+++ b/tests/baselines/reference/sourcemapValidationDuplicateNames.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/sourcemapValidationDuplicateNames.ts ===
 module m1 {
->m1 : m1
+>m1 : typeof m1
 
     var x = 10;
 >x : number
@@ -10,7 +10,7 @@ module m1 {
     }
 }
 module m1 {
->m1 : m1
+>m1 : typeof m1
 
     var b = new m1.c();
 >b : c
diff --git a/tests/baselines/reference/specializationOfExportedClass.types b/tests/baselines/reference/specializationOfExportedClass.types
index b03922bb197..bfe5bd0021d 100644
--- a/tests/baselines/reference/specializationOfExportedClass.types
+++ b/tests/baselines/reference/specializationOfExportedClass.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/specializationOfExportedClass.ts ===
 module M {
->M : M
+>M : typeof M
 
 export class C<T> { }
 >C : C<T>
diff --git a/tests/baselines/reference/staticInstanceResolution3.types b/tests/baselines/reference/staticInstanceResolution3.types
index ab1398f16de..b442aebd31f 100644
--- a/tests/baselines/reference/staticInstanceResolution3.types
+++ b/tests/baselines/reference/staticInstanceResolution3.types
@@ -1,7 +1,7 @@
 === tests/cases/compiler/staticInstanceResolution3_1.ts ===
 ///<reference path='staticInstanceResolution3_0.ts'/>
 import WinJS = require('staticInstanceResolution3_0');
->WinJS : WinJS
+>WinJS : typeof WinJS
 
 WinJS.Promise.timeout(10);
 >WinJS.Promise.timeout(10) : WinJS.Promise
diff --git a/tests/baselines/reference/stringLiteralObjectLiteralDeclaration1.types b/tests/baselines/reference/stringLiteralObjectLiteralDeclaration1.types
index 1f2695a0bb6..8a68a436577 100644
--- a/tests/baselines/reference/stringLiteralObjectLiteralDeclaration1.types
+++ b/tests/baselines/reference/stringLiteralObjectLiteralDeclaration1.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/stringLiteralObjectLiteralDeclaration1.ts ===
 module m1 {
->m1 : m1
+>m1 : typeof m1
 
   export var n = { 'foo bar': 4 };
 >n : { 'foo bar': number; }
diff --git a/tests/baselines/reference/structural1.types b/tests/baselines/reference/structural1.types
index fa99db38a5f..cb0e8a356a5 100644
--- a/tests/baselines/reference/structural1.types
+++ b/tests/baselines/reference/structural1.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/structural1.ts ===
 module M {
->M : M
+>M : typeof M
 
     export interface I {
 >I : I
diff --git a/tests/baselines/reference/structuralTypeInDeclareFileForModule.types b/tests/baselines/reference/structuralTypeInDeclareFileForModule.types
index c3769f9dd6a..ff023a79133 100644
--- a/tests/baselines/reference/structuralTypeInDeclareFileForModule.types
+++ b/tests/baselines/reference/structuralTypeInDeclareFileForModule.types
@@ -1,7 +1,7 @@
 === tests/cases/compiler/structuralTypeInDeclareFileForModule.ts ===
 
 module M { export var x; }
->M : M
+>M : typeof M
 >x : any
 
 var m = M;
diff --git a/tests/baselines/reference/subtypesOfAny.types b/tests/baselines/reference/subtypesOfAny.types
index 40aaf6836c7..ec88559ce9b 100644
--- a/tests/baselines/reference/subtypesOfAny.types
+++ b/tests/baselines/reference/subtypesOfAny.types
@@ -183,7 +183,7 @@ function f() { }
 >f : typeof f
 
 module f {
->f : f
+>f : typeof f
 
     export var bar = 1;
 >bar : number
@@ -205,7 +205,7 @@ class c { baz: string }
 >baz : string
 
 module c {
->c : c
+>c : typeof c
 
     export var bar = 1;
 >bar : number
diff --git a/tests/baselines/reference/subtypingWithCallSignatures.types b/tests/baselines/reference/subtypingWithCallSignatures.types
index 969e6f09b39..c9c35c1cd55 100644
--- a/tests/baselines/reference/subtypingWithCallSignatures.types
+++ b/tests/baselines/reference/subtypingWithCallSignatures.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithCallSignatures.ts ===
 module CallSignature {
->CallSignature : CallSignature
+>CallSignature : typeof CallSignature
 
     declare function foo1(cb: (x: number) => void): typeof cb;
 >foo1 : typeof foo1
diff --git a/tests/baselines/reference/subtypingWithCallSignatures3.types b/tests/baselines/reference/subtypingWithCallSignatures3.types
index 21622d51661..d53e3467adf 100644
--- a/tests/baselines/reference/subtypingWithCallSignatures3.types
+++ b/tests/baselines/reference/subtypingWithCallSignatures3.types
@@ -3,7 +3,7 @@
 // error cases, so function calls will all result in 'any'
 
 module Errors {
->Errors : Errors
+>Errors : typeof Errors
 
     class Base { foo: string; }
 >Base : Base
@@ -575,7 +575,7 @@ module Errors {
 }
 
 module WithGenericSignaturesInBaseType {
->WithGenericSignaturesInBaseType : WithGenericSignaturesInBaseType
+>WithGenericSignaturesInBaseType : typeof WithGenericSignaturesInBaseType
 
     declare function foo2(a2: <T>(x: T) => T[]): typeof a2;
 >foo2 : typeof foo2
diff --git a/tests/baselines/reference/subtypingWithConstructSignatures.types b/tests/baselines/reference/subtypingWithConstructSignatures.types
index 892e3983132..ed6ebc18c56 100644
--- a/tests/baselines/reference/subtypingWithConstructSignatures.types
+++ b/tests/baselines/reference/subtypingWithConstructSignatures.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/types/typeRelationships/subtypesAndSuperTypes/subtypingWithConstructSignatures.ts ===
 module ConstructSignature {
->ConstructSignature : ConstructSignature
+>ConstructSignature : typeof ConstructSignature
 
     declare function foo1(cb: new (x: number) => void): typeof cb;
 >foo1 : typeof foo1
diff --git a/tests/baselines/reference/subtypingWithConstructSignatures3.types b/tests/baselines/reference/subtypingWithConstructSignatures3.types
index 96b68efe59a..51a67c37131 100644
--- a/tests/baselines/reference/subtypingWithConstructSignatures3.types
+++ b/tests/baselines/reference/subtypingWithConstructSignatures3.types
@@ -3,7 +3,7 @@
 // error cases, so function calls will all result in 'any'
 
 module Errors {
->Errors : Errors
+>Errors : typeof Errors
 
     class Base { foo: string; }
 >Base : Base
@@ -533,7 +533,7 @@ module Errors {
 }
 
 module WithGenericSignaturesInBaseType {
->WithGenericSignaturesInBaseType : WithGenericSignaturesInBaseType
+>WithGenericSignaturesInBaseType : typeof WithGenericSignaturesInBaseType
 
     declare function foo2(a2: new <T>(x: T) => T[]): typeof a2;
 >foo2 : typeof foo2
diff --git a/tests/baselines/reference/subtypingWithObjectMembersOptionality.types b/tests/baselines/reference/subtypingWithObjectMembersOptionality.types
index 8aff0f02840..d60045d363b 100644
--- a/tests/baselines/reference/subtypingWithObjectMembersOptionality.types
+++ b/tests/baselines/reference/subtypingWithObjectMembersOptionality.types
@@ -90,7 +90,7 @@ var r = true ? a : b;
 >b : { Foo: Derived; }
 
 module TwoLevels {
->TwoLevels : TwoLevels
+>TwoLevels : typeof TwoLevels
 
     interface T {
 >T : T
diff --git a/tests/baselines/reference/superAccessInFatArrow1.types b/tests/baselines/reference/superAccessInFatArrow1.types
index d6c613e63f5..0c50015c051 100644
--- a/tests/baselines/reference/superAccessInFatArrow1.types
+++ b/tests/baselines/reference/superAccessInFatArrow1.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/superAccessInFatArrow1.ts ===
 module test {
->test : test
+>test : typeof test
 
     export class A {
 >A : A
diff --git a/tests/baselines/reference/switchStatements.types b/tests/baselines/reference/switchStatements.types
index 9dc3a2c2b15..bbcd3553385 100644
--- a/tests/baselines/reference/switchStatements.types
+++ b/tests/baselines/reference/switchStatements.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/statements/switchStatements/switchStatements.ts ===
 module M {
->M : M
+>M : typeof M
 
     export function fn(x: number) {
 >fn : typeof fn
diff --git a/tests/baselines/reference/testContainerList.types b/tests/baselines/reference/testContainerList.types
index 4078069f1e2..8449b6dc065 100644
--- a/tests/baselines/reference/testContainerList.types
+++ b/tests/baselines/reference/testContainerList.types
@@ -1,7 +1,7 @@
 === tests/cases/compiler/testContainerList.ts ===
 // Regression test for #325
 module A {
->A : A
+>A : typeof A
 
     class C {
 >C : C
diff --git a/tests/baselines/reference/thisInModuleFunction1.types b/tests/baselines/reference/thisInModuleFunction1.types
index 627e77ef1e5..28da3bc4650 100644
--- a/tests/baselines/reference/thisInModuleFunction1.types
+++ b/tests/baselines/reference/thisInModuleFunction1.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/thisInModuleFunction1.ts ===
 module bar {
->bar : bar
+>bar : typeof bar
 
  export function bar() {
 >bar : typeof bar
diff --git a/tests/baselines/reference/throwStatements.types b/tests/baselines/reference/throwStatements.types
index 3aa2e7b5822..73f3fe41b5b 100644
--- a/tests/baselines/reference/throwStatements.types
+++ b/tests/baselines/reference/throwStatements.types
@@ -41,7 +41,7 @@ function F(x: string): number { return 42; }
 >x : string
 
 module M {
->M : M
+>M : typeof M
 
     export class A {
 >A : A
diff --git a/tests/baselines/reference/topLevel.types b/tests/baselines/reference/topLevel.types
index e10ad1964b5..4476ec55134 100644
--- a/tests/baselines/reference/topLevel.types
+++ b/tests/baselines/reference/topLevel.types
@@ -71,7 +71,7 @@ result+=(new Point(3,4).move(2,2));
 >move : (xo: number, yo: number) => Point
 
 module M {
->M : M
+>M : typeof M
 
     export var origin=new Point(0,0);
 >origin : Point
diff --git a/tests/baselines/reference/topLevelAmbientModule.types b/tests/baselines/reference/topLevelAmbientModule.types
index eef6dea3d04..7d01be9ae6f 100644
--- a/tests/baselines/reference/topLevelAmbientModule.types
+++ b/tests/baselines/reference/topLevelAmbientModule.types
@@ -1,7 +1,7 @@
 === tests/cases/conformance/externalModules/foo_1.ts ===
 /// <reference path="foo_0.ts"/>
 import foo = require("foo");
->foo : foo
+>foo : typeof foo
 
 var z = foo.x + 10;
 >z : number
diff --git a/tests/baselines/reference/topLevelFileModule.types b/tests/baselines/reference/topLevelFileModule.types
index 101574f340d..033dbf197d3 100644
--- a/tests/baselines/reference/topLevelFileModule.types
+++ b/tests/baselines/reference/topLevelFileModule.types
@@ -1,9 +1,9 @@
 === tests/cases/conformance/externalModules/foo_1.ts ===
 import foo = require("vs/foo_0");
->foo : foo
+>foo : typeof foo
 
 import fum = require("vs/fum");
->fum : fum
+>fum : typeof fum
 
 var z = foo.x + fum.y;
 >z : number
diff --git a/tests/baselines/reference/twoMergedInterfacesWithDifferingOverloads2.types b/tests/baselines/reference/twoMergedInterfacesWithDifferingOverloads2.types
index 529675d1533..46fa17d31a6 100644
--- a/tests/baselines/reference/twoMergedInterfacesWithDifferingOverloads2.types
+++ b/tests/baselines/reference/twoMergedInterfacesWithDifferingOverloads2.types
@@ -35,7 +35,7 @@ var r3 = a(1, 2);
 >a : A
 
 module G {
->G : G
+>G : typeof G
 
     interface A<T> {
 >A : A<T>
diff --git a/tests/baselines/reference/typeCheckObjectCreationExpressionWithUndefinedCallResolutionData.types b/tests/baselines/reference/typeCheckObjectCreationExpressionWithUndefinedCallResolutionData.types
index e395f608c59..b8222e73d92 100644
--- a/tests/baselines/reference/typeCheckObjectCreationExpressionWithUndefinedCallResolutionData.types
+++ b/tests/baselines/reference/typeCheckObjectCreationExpressionWithUndefinedCallResolutionData.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/file2.ts ===
 import f = require('file1');
->f : f
+>f : typeof f
 
 f.foo();
 >f.foo() : any
diff --git a/tests/baselines/reference/typeOfThisInFunctionExpression.types b/tests/baselines/reference/typeOfThisInFunctionExpression.types
index e71bc87f1e7..5b66ec0d5c9 100644
--- a/tests/baselines/reference/typeOfThisInFunctionExpression.types
+++ b/tests/baselines/reference/typeOfThisInFunctionExpression.types
@@ -66,7 +66,7 @@ class C {
 }
 
 module M {
->M : M
+>M : typeof M
 
     function fn() {
 >fn : typeof fn
diff --git a/tests/baselines/reference/typeResolution.types b/tests/baselines/reference/typeResolution.types
index ca173566324..006ac67f692 100644
--- a/tests/baselines/reference/typeResolution.types
+++ b/tests/baselines/reference/typeResolution.types
@@ -1,12 +1,12 @@
 === tests/cases/compiler/typeResolution.ts ===
 export module TopLevelModule1 {
->TopLevelModule1 : TopLevelModule1
+>TopLevelModule1 : typeof TopLevelModule1
 
     export module SubModule1 {
->SubModule1 : SubModule1
+>SubModule1 : typeof SubModule1
 
         export module SubSubModule1 {
->SubSubModule1 : SubSubModule1
+>SubSubModule1 : typeof SubSubModule1
 
             export class ClassA {
 >ClassA : ClassA
@@ -25,7 +25,7 @@ export module TopLevelModule1 {
 
                     var a2: SubSubModule1.ClassA; a2.AisIn1_1_1();
 >a2 : ClassA
->SubSubModule1 : SubSubModule1
+>SubSubModule1 : unknown
 >ClassA : ClassA
 >a2.AisIn1_1_1() : void
 >a2.AisIn1_1_1 : () => void
@@ -34,8 +34,8 @@ export module TopLevelModule1 {
 
                     var a3: SubModule1.SubSubModule1.ClassA; a3.AisIn1_1_1();
 >a3 : ClassA
->SubModule1 : SubModule1
->SubSubModule1 : SubSubModule1
+>SubModule1 : unknown
+>SubSubModule1 : unknown
 >ClassA : ClassA
 >a3.AisIn1_1_1() : void
 >a3.AisIn1_1_1 : () => void
@@ -44,9 +44,9 @@ export module TopLevelModule1 {
 
                     var a4: TopLevelModule1.SubModule1.SubSubModule1.ClassA; a4.AisIn1_1_1();
 >a4 : ClassA
->TopLevelModule1 : TopLevelModule1
->SubModule1 : SubModule1
->SubSubModule1 : SubSubModule1
+>TopLevelModule1 : unknown
+>SubModule1 : unknown
+>SubSubModule1 : unknown
 >ClassA : ClassA
 >a4.AisIn1_1_1() : void
 >a4.AisIn1_1_1 : () => void
@@ -64,9 +64,9 @@ export module TopLevelModule1 {
 
                     var b2: TopLevelModule1.SubModule1.SubSubModule1.ClassB; b2.BisIn1_1_1();
 >b2 : ClassB
->TopLevelModule1 : TopLevelModule1
->SubModule1 : SubModule1
->SubSubModule1 : SubSubModule1
+>TopLevelModule1 : unknown
+>SubModule1 : unknown
+>SubSubModule1 : unknown
 >ClassB : ClassB
 >b2.BisIn1_1_1() : void
 >b2.BisIn1_1_1 : () => void
@@ -76,9 +76,9 @@ export module TopLevelModule1 {
                     // Type only accessible from the root
                     var c1: TopLevelModule1.SubModule2.SubSubModule2.ClassA; c1.AisIn1_2_2();
 >c1 : SubModule2.SubSubModule2.ClassA
->TopLevelModule1 : TopLevelModule1
->SubModule2 : SubModule2
->SubSubModule2 : SubModule2.SubSubModule2
+>TopLevelModule1 : unknown
+>SubModule2 : unknown
+>SubSubModule2 : unknown
 >ClassA : SubModule2.SubSubModule2.ClassA
 >c1.AisIn1_2_2() : void
 >c1.AisIn1_2_2 : () => void
@@ -96,7 +96,7 @@ export module TopLevelModule1 {
 
                     var d2: SubSubModule1.InterfaceX; d2.XisIn1_1_1();
 >d2 : InterfaceX
->SubSubModule1 : SubSubModule1
+>SubSubModule1 : unknown
 >InterfaceX : InterfaceX
 >d2.XisIn1_1_1() : any
 >d2.XisIn1_1_1 : () => any
@@ -123,7 +123,7 @@ export module TopLevelModule1 {
 
                     var a2: SubSubModule1.ClassA; a2.AisIn1_1_1();
 >a2 : ClassA
->SubSubModule1 : SubSubModule1
+>SubSubModule1 : unknown
 >ClassA : ClassA
 >a2.AisIn1_1_1() : void
 >a2.AisIn1_1_1 : () => void
@@ -132,8 +132,8 @@ export module TopLevelModule1 {
 
                     var a3: SubModule1.SubSubModule1.ClassA; a3.AisIn1_1_1();
 >a3 : ClassA
->SubModule1 : SubModule1
->SubSubModule1 : SubSubModule1
+>SubModule1 : unknown
+>SubSubModule1 : unknown
 >ClassA : ClassA
 >a3.AisIn1_1_1() : void
 >a3.AisIn1_1_1 : () => void
@@ -142,9 +142,9 @@ export module TopLevelModule1 {
 
                     var a4: TopLevelModule1.SubModule1.SubSubModule1.ClassA; a4.AisIn1_1_1();
 >a4 : ClassA
->TopLevelModule1 : TopLevelModule1
->SubModule1 : SubModule1
->SubSubModule1 : SubSubModule1
+>TopLevelModule1 : unknown
+>SubModule1 : unknown
+>SubSubModule1 : unknown
 >ClassA : ClassA
 >a4.AisIn1_1_1() : void
 >a4.AisIn1_1_1 : () => void
@@ -162,9 +162,9 @@ export module TopLevelModule1 {
 
                     var b2: TopLevelModule1.SubModule1.SubSubModule1.ClassB; b2.BisIn1_1_1();
 >b2 : ClassB
->TopLevelModule1 : TopLevelModule1
->SubModule1 : SubModule1
->SubSubModule1 : SubSubModule1
+>TopLevelModule1 : unknown
+>SubModule1 : unknown
+>SubSubModule1 : unknown
 >ClassB : ClassB
 >b2.BisIn1_1_1() : void
 >b2.BisIn1_1_1 : () => void
@@ -174,9 +174,9 @@ export module TopLevelModule1 {
                     // Type only accessible from the root
                     var c1: TopLevelModule1.SubModule2.SubSubModule2.ClassA; c1.AisIn1_2_2();
 >c1 : SubModule2.SubSubModule2.ClassA
->TopLevelModule1 : TopLevelModule1
->SubModule2 : SubModule2
->SubSubModule2 : SubModule2.SubSubModule2
+>TopLevelModule1 : unknown
+>SubModule2 : unknown
+>SubSubModule2 : unknown
 >ClassA : SubModule2.SubSubModule2.ClassA
 >c1.AisIn1_2_2() : void
 >c1.AisIn1_2_2 : () => void
@@ -185,8 +185,8 @@ export module TopLevelModule1 {
 
                     var c2: TopLevelModule2.SubModule3.ClassA; c2.AisIn2_3();
 >c2 : TopLevelModule2.SubModule3.ClassA
->TopLevelModule2 : TopLevelModule2
->SubModule3 : TopLevelModule2.SubModule3
+>TopLevelModule2 : unknown
+>SubModule3 : unknown
 >ClassA : TopLevelModule2.SubModule3.ClassA
 >c2.AisIn2_3() : void
 >c2.AisIn2_3 : () => void
@@ -204,7 +204,7 @@ export module TopLevelModule1 {
 
                     var d2: SubSubModule1.InterfaceX; d2.XisIn1_1_1();
 >d2 : InterfaceX
->SubSubModule1 : SubSubModule1
+>SubSubModule1 : unknown
 >InterfaceX : InterfaceX
 >d2.XisIn1_1_1() : any
 >d2.XisIn1_1_1 : () => any
@@ -226,9 +226,9 @@ export module TopLevelModule1 {
                         /* Sampling of stuff from AisIn1_1_1 */
                         var a4: TopLevelModule1.SubModule1.SubSubModule1.ClassA; a4.AisIn1_1_1();
 >a4 : ClassA
->TopLevelModule1 : TopLevelModule1
->SubModule1 : SubModule1
->SubSubModule1 : SubSubModule1
+>TopLevelModule1 : unknown
+>SubModule1 : unknown
+>SubSubModule1 : unknown
 >ClassA : ClassA
 >a4.AisIn1_1_1() : void
 >a4.AisIn1_1_1 : () => void
@@ -237,9 +237,9 @@ export module TopLevelModule1 {
 
                         var c1: TopLevelModule1.SubModule2.SubSubModule2.ClassA; c1.AisIn1_2_2();
 >c1 : SubModule2.SubSubModule2.ClassA
->TopLevelModule1 : TopLevelModule1
->SubModule2 : SubModule2
->SubSubModule2 : SubModule2.SubSubModule2
+>TopLevelModule1 : unknown
+>SubModule2 : unknown
+>SubSubModule2 : unknown
 >ClassA : SubModule2.SubSubModule2.ClassA
 >c1.AisIn1_2_2() : void
 >c1.AisIn1_2_2 : () => void
@@ -256,8 +256,8 @@ export module TopLevelModule1 {
 
                         var c2: TopLevelModule2.SubModule3.ClassA; c2.AisIn2_3();
 >c2 : TopLevelModule2.SubModule3.ClassA
->TopLevelModule2 : TopLevelModule2
->SubModule3 : TopLevelModule2.SubModule3
+>TopLevelModule2 : unknown
+>SubModule3 : unknown
 >ClassA : TopLevelModule2.SubModule3.ClassA
 >c2.AisIn2_3() : void
 >c2.AisIn2_3 : () => void
@@ -278,7 +278,7 @@ export module TopLevelModule1 {
 
                     var a2: SubSubModule1.ClassA; a2.AisIn1_1_1();
 >a2 : SubSubModule1.ClassA
->SubSubModule1 : SubSubModule1
+>SubSubModule1 : unknown
 >ClassA : SubSubModule1.ClassA
 >a2.AisIn1_1_1() : void
 >a2.AisIn1_1_1 : () => void
@@ -287,8 +287,8 @@ export module TopLevelModule1 {
 
                     var a3: SubModule1.SubSubModule1.ClassA; a3.AisIn1_1_1();
 >a3 : SubSubModule1.ClassA
->SubModule1 : SubModule1
->SubSubModule1 : SubSubModule1
+>SubModule1 : unknown
+>SubSubModule1 : unknown
 >ClassA : SubSubModule1.ClassA
 >a3.AisIn1_1_1() : void
 >a3.AisIn1_1_1 : () => void
@@ -297,9 +297,9 @@ export module TopLevelModule1 {
 
                     var a4: TopLevelModule1.SubModule1.SubSubModule1.ClassA; a4.AisIn1_1_1();
 >a4 : SubSubModule1.ClassA
->TopLevelModule1 : TopLevelModule1
->SubModule1 : SubModule1
->SubSubModule1 : SubSubModule1
+>TopLevelModule1 : unknown
+>SubModule1 : unknown
+>SubSubModule1 : unknown
 >ClassA : SubSubModule1.ClassA
 >a4.AisIn1_1_1() : void
 >a4.AisIn1_1_1 : () => void
@@ -309,7 +309,7 @@ export module TopLevelModule1 {
                     // Interface reference
                     var d2: SubSubModule1.InterfaceX; d2.XisIn1_1_1();
 >d2 : SubSubModule1.InterfaceX
->SubSubModule1 : SubSubModule1
+>SubSubModule1 : unknown
 >InterfaceX : SubSubModule1.InterfaceX
 >d2.XisIn1_1_1() : any
 >d2.XisIn1_1_1 : () => any
@@ -321,10 +321,10 @@ export module TopLevelModule1 {
     }
 
     export module SubModule2 {
->SubModule2 : SubModule2
+>SubModule2 : typeof SubModule2
 
         export module SubSubModule2 {
->SubSubModule2 : SubSubModule2
+>SubSubModule2 : typeof SubSubModule2
 
             // No code here since these are the mirror of the above calls
             export class ClassA { public AisIn1_2_2() { } }
@@ -367,7 +367,7 @@ export module TopLevelModule1 {
     }
     
     module NotExportedModule {
->NotExportedModule : NotExportedModule
+>NotExportedModule : typeof NotExportedModule
 
         export class ClassA { }
 >ClassA : ClassA
@@ -375,10 +375,10 @@ export module TopLevelModule1 {
 }
 
 module TopLevelModule2 {
->TopLevelModule2 : TopLevelModule2
+>TopLevelModule2 : typeof TopLevelModule2
 
     export module SubModule3 {
->SubModule3 : SubModule3
+>SubModule3 : typeof SubModule3
 
         export class ClassA {
 >ClassA : ClassA
diff --git a/tests/baselines/reference/typeofModuleWithoutExports.types b/tests/baselines/reference/typeofModuleWithoutExports.types
index e82daca8cb1..b1468c9a88e 100644
--- a/tests/baselines/reference/typeofModuleWithoutExports.types
+++ b/tests/baselines/reference/typeofModuleWithoutExports.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/types/specifyingTypes/typeQueries/typeofModuleWithoutExports.ts ===
 module M {
->M : M
+>M : typeof M
 
     var x = 1;
 >x : number
diff --git a/tests/baselines/reference/typeofOperatorWithBooleanType.types b/tests/baselines/reference/typeofOperatorWithBooleanType.types
index 34a4d1e3687..bd41639c0a1 100644
--- a/tests/baselines/reference/typeofOperatorWithBooleanType.types
+++ b/tests/baselines/reference/typeofOperatorWithBooleanType.types
@@ -16,7 +16,7 @@ class A {
 >foo : () => boolean
 }
 module M {
->M : M
+>M : typeof M
 
     export var n: boolean;
 >n : boolean
diff --git a/tests/baselines/reference/typeofOperatorWithNumberType.types b/tests/baselines/reference/typeofOperatorWithNumberType.types
index 5daa29a919b..e3a2794edbe 100644
--- a/tests/baselines/reference/typeofOperatorWithNumberType.types
+++ b/tests/baselines/reference/typeofOperatorWithNumberType.types
@@ -20,7 +20,7 @@ class A {
 >foo : () => number
 }
 module M {
->M : M
+>M : typeof M
 
     export var n: number;
 >n : number
diff --git a/tests/baselines/reference/typeofOperatorWithStringType.types b/tests/baselines/reference/typeofOperatorWithStringType.types
index 8bfff145b30..dff0676b82e 100644
--- a/tests/baselines/reference/typeofOperatorWithStringType.types
+++ b/tests/baselines/reference/typeofOperatorWithStringType.types
@@ -20,7 +20,7 @@ class A {
 >foo : () => string
 }
 module M {
->M : M
+>M : typeof M
 
     export var n: string;
 >n : string
diff --git a/tests/baselines/reference/undefinedIsSubtypeOfEverything.types b/tests/baselines/reference/undefinedIsSubtypeOfEverything.types
index bc2de4fc0fd..42f517432fa 100644
--- a/tests/baselines/reference/undefinedIsSubtypeOfEverything.types
+++ b/tests/baselines/reference/undefinedIsSubtypeOfEverything.types
@@ -167,7 +167,7 @@ function f() { }
 >f : typeof f
 
 module f {
->f : f
+>f : typeof f
 
     export var bar = 1;
 >bar : number
@@ -187,7 +187,7 @@ class c { baz: string }
 >baz : string
 
 module c {
->c : c
+>c : typeof c
 
     export var bar = 1;
 >bar : number
diff --git a/tests/baselines/reference/underscoreMapFirst.types b/tests/baselines/reference/underscoreMapFirst.types
index 789a8b618a3..c15e0ac37d3 100644
--- a/tests/baselines/reference/underscoreMapFirst.types
+++ b/tests/baselines/reference/underscoreMapFirst.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/underscoreMapFirst.ts ===
 declare module _ {
->_ : _
+>_ : typeof _
 
     interface Collection<T> { }
 >Collection : Collection<T>
diff --git a/tests/baselines/reference/underscoreTest1.types b/tests/baselines/reference/underscoreTest1.types
index 178aeb17322..fe1db7c20c3 100644
--- a/tests/baselines/reference/underscoreTest1.types
+++ b/tests/baselines/reference/underscoreTest1.types
@@ -1440,7 +1440,7 @@ interface Tuple4<T0, T1, T2, T3> extends Array<any> {
 }
 
 module Underscore {
->Underscore : Underscore
+>Underscore : unknown
 
     export interface WrappedObject<T> {
 >WrappedObject : WrappedObject<T>
@@ -5277,6 +5277,6 @@ module Underscore {
 
 declare var _: Underscore.Static;
 >_ : Underscore.Static
->Underscore : Underscore
+>Underscore : unknown
 >Static : Underscore.Static
 
diff --git a/tests/baselines/reference/unexportedInstanceClassVariables.types b/tests/baselines/reference/unexportedInstanceClassVariables.types
index e83530b1ff0..f40c606816d 100644
--- a/tests/baselines/reference/unexportedInstanceClassVariables.types
+++ b/tests/baselines/reference/unexportedInstanceClassVariables.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/unexportedInstanceClassVariables.ts ===
 module M{
->M : M
+>M : typeof M
 
 	class A{
 >A : A
@@ -11,7 +11,7 @@ module M{
 }
 
 module M{
->M : M
+>M : typeof M
 
 	class A {}  
 >A : A
diff --git a/tests/baselines/reference/unusedImportDeclaration.types b/tests/baselines/reference/unusedImportDeclaration.types
index a8361457d41..b8281684a5d 100644
--- a/tests/baselines/reference/unusedImportDeclaration.types
+++ b/tests/baselines/reference/unusedImportDeclaration.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/unusedImportDeclaration_testerA.ts ===
 import B = require("unusedImportDeclaration_testerB");
->B : B
+>B : typeof B
 
 var thingy: B = {
 >thingy : B
diff --git a/tests/baselines/reference/usingModuleWithExportImportInValuePosition.types b/tests/baselines/reference/usingModuleWithExportImportInValuePosition.types
index a738c5c518d..50f36a516d2 100644
--- a/tests/baselines/reference/usingModuleWithExportImportInValuePosition.types
+++ b/tests/baselines/reference/usingModuleWithExportImportInValuePosition.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/usingModuleWithExportImportInValuePosition.ts ===
 module A {
->A : A
+>A : typeof A
 
 export var x = 'hello world'
 >x : string
@@ -13,7 +13,7 @@ export class Point {
 >y : number
     }
     export module B {
->B : B
+>B : unknown
 
         export interface Id {
 >Id : Id
@@ -24,10 +24,10 @@ export class Point {
     }
 }
 module C {
->C : C
+>C : typeof C
 
     export import a = A;
->a : a
+>a : typeof a
 >A : typeof a
 }
 
@@ -56,8 +56,8 @@ var c: { name: string };
 
 var c: C.a.B.Id;
 >c : { name: string; }
->C : C
->a : C.a
->B : A.B
+>C : unknown
+>a : unknown
+>B : unknown
 >Id : A.B.Id
 
diff --git a/tests/baselines/reference/vardecl.types b/tests/baselines/reference/vardecl.types
index c8d9fcc40e3..714a721602e 100644
--- a/tests/baselines/reference/vardecl.types
+++ b/tests/baselines/reference/vardecl.types
@@ -132,7 +132,7 @@ var d4: {
 }
 
 module m2 {
->m2 : m2
+>m2 : typeof m2
 
     export var a, b2: number = 10, b;
 >a : any
diff --git a/tests/baselines/reference/visSyntax.types b/tests/baselines/reference/visSyntax.types
index d151c510437..fc318e7de23 100644
--- a/tests/baselines/reference/visSyntax.types
+++ b/tests/baselines/reference/visSyntax.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/visSyntax.ts ===
 module M {
->M : M
+>M : typeof M
 
     export class C {
 >C : C
diff --git a/tests/baselines/reference/visibilityOfCrossModuleTypeUsage.types b/tests/baselines/reference/visibilityOfCrossModuleTypeUsage.types
index 23b49f275b3..a275b3cbc23 100644
--- a/tests/baselines/reference/visibilityOfCrossModuleTypeUsage.types
+++ b/tests/baselines/reference/visibilityOfCrossModuleTypeUsage.types
@@ -1,11 +1,11 @@
 === tests/cases/compiler/visibilityOfCrossModuleTypeUsage_fs.ts ===
 import commands = require('visibilityOfCrossModuleTypeUsage_commands');
->commands : commands
+>commands : typeof commands
 
 function run(configuration: commands.IConfiguration) {
 >run : typeof run
 >configuration : commands.IConfiguration
->commands : commands
+>commands : unknown
 >IConfiguration : commands.IConfiguration
 
     var absoluteWorkspacePath = configuration.workspace.toAbsolutePath(configuration.server);
@@ -24,22 +24,22 @@ function run(configuration: commands.IConfiguration) {
 //visibilityOfCrossModuleTypeUsage
 
 import fs = require('visibilityOfCrossModuleTypeUsage_fs');
->fs : fs
+>fs : typeof fs
 
 import server = require('visibilityOfCrossModuleTypeUsage_server');
->server : server
+>server : typeof server
 
 export interface IConfiguration {
 >IConfiguration : IConfiguration
 
     workspace: server.IWorkspace;
 >workspace : server.IWorkspace
->server : server
+>server : unknown
 >IWorkspace : server.IWorkspace
 
     server?: server.IServer;
 >server : server.IServer
->server : server
+>server : unknown
 >IServer : server.IServer
 }
 
diff --git a/tests/baselines/reference/voidOperatorWithBooleanType.types b/tests/baselines/reference/voidOperatorWithBooleanType.types
index d623e11d731..393228a9766 100644
--- a/tests/baselines/reference/voidOperatorWithBooleanType.types
+++ b/tests/baselines/reference/voidOperatorWithBooleanType.types
@@ -16,7 +16,7 @@ class A {
 >foo : () => boolean
 }
 module M {
->M : M
+>M : typeof M
 
     export var n: boolean;
 >n : boolean
diff --git a/tests/baselines/reference/voidOperatorWithNumberType.types b/tests/baselines/reference/voidOperatorWithNumberType.types
index 1f789034764..44ea71937cd 100644
--- a/tests/baselines/reference/voidOperatorWithNumberType.types
+++ b/tests/baselines/reference/voidOperatorWithNumberType.types
@@ -20,7 +20,7 @@ class A {
 >foo : () => number
 }
 module M {
->M : M
+>M : typeof M
 
     export var n: number;
 >n : number
diff --git a/tests/baselines/reference/voidOperatorWithStringType.types b/tests/baselines/reference/voidOperatorWithStringType.types
index 260764d7d5f..0aa7ef8ffb0 100644
--- a/tests/baselines/reference/voidOperatorWithStringType.types
+++ b/tests/baselines/reference/voidOperatorWithStringType.types
@@ -20,7 +20,7 @@ class A {
 >foo : () => string
 }
 module M {
->M : M
+>M : typeof M
 
     export var n: string;
 >n : string
diff --git a/tests/baselines/reference/withImportDecl.types b/tests/baselines/reference/withImportDecl.types
index cc536ddfc67..0228d6a16ac 100644
--- a/tests/baselines/reference/withImportDecl.types
+++ b/tests/baselines/reference/withImportDecl.types
@@ -58,7 +58,7 @@ function simpleFunction() {
 }
 
 module m1 {
->m1 : m1
+>m1 : typeof m1
 
     export function foo() {
 >foo : typeof foo
@@ -68,7 +68,7 @@ module m1 {
 }
 
 import m3 = require("withImportDecl_0");
->m3 : m3
+>m3 : typeof m3
 
 var b = new m3.A();
 >b : m3.A

From 46825ab05ddf250300554805e04d041adf2d1da5 Mon Sep 17 00:00:00 2001
From: Jason Freeman <jfreeman@microsoft.com>
Date: Thu, 28 Aug 2014 12:48:30 -0700
Subject: [PATCH 08/11] Print Array as T[]

---
 src/harness/typeWriter.ts                     |  6 +-
 ...peWithInaccessibleTypeAsTypeArgument.types |  4 +-
 tests/baselines/reference/arrayAugment.types  |  2 +-
 tests/baselines/reference/arrayConcat2.types  |  2 +-
 .../reference/arrayConstructors1.types        | 12 ++--
 tests/baselines/reference/arrayLiteral.types  |  8 +--
 tests/baselines/reference/arrayLiterals.types |  4 +-
 .../assignmentCompatWithCallSignatures3.types | 22 +++----
 ...gnmentCompatWithConstructSignatures3.types | 22 +++----
 tests/baselines/reference/augmentArray.types  |  2 +-
 ...SignatureAssignabilityInInheritance2.types | 22 +++----
 ...SignatureAssignabilityInInheritance5.types | 22 +++----
 ...SignatureAssignabilityInInheritance2.types | 22 +++----
 ...SignatureAssignabilityInInheritance5.types | 22 +++----
 .../reference/declFileGenericType.types       |  2 +-
 ...array-types-from-generic-array-usage.types |  2 +-
 ...duplicateOverloadInTypeAugmentation1.types |  4 +-
 .../forStatementsMultipleValidDecl.types      |  2 +-
 .../reference/generatedContextualTyping.types | 62 +++++++++----------
 ...ericFunctionsWithOptionalParameters1.types |  2 +-
 .../reference/implementArrayInterface.types   |  2 +-
 .../reference/innerBoundLambdaEmit.types      |  2 +-
 .../reference/library_ArraySlice.types        |  6 +-
 tests/baselines/reference/newArrays.types     |  2 +-
 ...CallSignaturesDifferingByConstraints.types | 18 +++---
 ...ructSignaturesDifferingByConstraints.types | 16 ++---
 .../returnTypeParameterWithModules.types      |  4 +-
 .../subtypingWithCallSignatures2.types        | 34 +++++-----
 .../subtypingWithCallSignatures3.types        | 18 +++---
 .../subtypingWithConstructSignatures2.types   | 34 +++++-----
 .../subtypingWithConstructSignatures3.types   | 18 +++---
 .../subtypingWithConstructSignatures5.types   | 22 +++----
 .../baselines/reference/underscoreTest1.types | 10 +--
 .../validMultipleVariableDeclarations.types   |  2 +-
 34 files changed, 215 insertions(+), 219 deletions(-)

diff --git a/src/harness/typeWriter.ts b/src/harness/typeWriter.ts
index c134bf3df18..953e3413a93 100644
--- a/src/harness/typeWriter.ts
+++ b/src/harness/typeWriter.ts
@@ -77,10 +77,6 @@ class TypeWriterWalker {
         var actualPos = ts.skipTrivia(this.currentSourceFile.text, node.pos);
         var lineAndCharacter = this.currentSourceFile.getLineAndCharacterFromPosition(actualPos);
         var sourceText = ts.getSourceTextOfNodeFromSourceText(this.currentSourceFile.text, node);
-        var isUnknownType = (<ts.IntrinsicType>type).intrinsicName === "unknown";
-        if (!isUnknownType) {
-            var writeArrayAsGenericType = node.kind === ts.SyntaxKind.Identifier && (<ts.Identifier>node).text === "Array" ? ts.TypeFormatFlags.WriteArrayAsGenericType : 0;
-        }
         
         // If we got an unknown type, we temporarily want to fall back to just pretending the name
         // (source text) of the node is the type. This is to align with the old typeWriter to make
@@ -90,7 +86,7 @@ class TypeWriterWalker {
             column: lineAndCharacter.character,
             syntaxKind: ts.SyntaxKind[node.kind],
             sourceText: sourceText,
-            type: this.checker.typeToString(type, node.parent, ts.TypeFormatFlags.UseTypeOfFunction | writeArrayAsGenericType)
+            type: this.checker.typeToString(type, node.parent, ts.TypeFormatFlags.UseTypeOfFunction)
         });
     }
 
diff --git a/tests/baselines/reference/ExportVariableOfGenericTypeWithInaccessibleTypeAsTypeArgument.types b/tests/baselines/reference/ExportVariableOfGenericTypeWithInaccessibleTypeAsTypeArgument.types
index 14e05a1913b..46084e85632 100644
--- a/tests/baselines/reference/ExportVariableOfGenericTypeWithInaccessibleTypeAsTypeArgument.types
+++ b/tests/baselines/reference/ExportVariableOfGenericTypeWithInaccessibleTypeAsTypeArgument.types
@@ -11,12 +11,12 @@ module A {
 
     export var beez: Array<B>;
 >beez : B[]
->Array : Array<T>
+>Array : T[]
 >B : B
 
     export var beez2 = new Array<B>();
 >beez2 : B[]
 >new Array<B>() : B[]
->Array : { (arrayLength?: number): Array<any>; <T>(arrayLength: number): Array<T>; <T>(...items: Array<T>): Array<T>; new (arrayLength?: number): Array<any>; new <T>(arrayLength: number): Array<T>; new <T>(...items: Array<T>): Array<T>; isArray(arg: any): boolean; prototype: Array<any>; }
+>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[]; }
 >B : B
 }
diff --git a/tests/baselines/reference/arrayAugment.types b/tests/baselines/reference/arrayAugment.types
index 2f18aa6bdd5..b338d7f5c5f 100644
--- a/tests/baselines/reference/arrayAugment.types
+++ b/tests/baselines/reference/arrayAugment.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/arrayAugment.ts ===
 interface Array<T> {
->Array : Array<T>
+>Array : T[]
 >T : T
 
     split: (parts: number) => T[][];
diff --git a/tests/baselines/reference/arrayConcat2.types b/tests/baselines/reference/arrayConcat2.types
index 02348c29119..a4036560305 100644
--- a/tests/baselines/reference/arrayConcat2.types
+++ b/tests/baselines/reference/arrayConcat2.types
@@ -18,7 +18,7 @@ a.concat('Hello');
 var b = new Array<string>();
 >b : string[]
 >new Array<string>() : string[]
->Array : { (arrayLength?: number): Array<any>; <T>(arrayLength: number): Array<T>; <T>(...items: Array<T>): Array<T>; new (arrayLength?: number): Array<any>; new <T>(arrayLength: number): Array<T>; new <T>(...items: Array<T>): Array<T>; isArray(arg: any): boolean; prototype: Array<any>; }
+>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[]; }
 
 b.concat('hello');
 >b.concat('hello') : string[]
diff --git a/tests/baselines/reference/arrayConstructors1.types b/tests/baselines/reference/arrayConstructors1.types
index 615f559fcfd..8b34f32205e 100644
--- a/tests/baselines/reference/arrayConstructors1.types
+++ b/tests/baselines/reference/arrayConstructors1.types
@@ -6,19 +6,19 @@ x = new Array(1);
 >x = new Array(1) : any[]
 >x : string[]
 >new Array(1) : any[]
->Array : { (arrayLength?: number): Array<any>; <T>(arrayLength: number): Array<T>; <T>(...items: Array<T>): Array<T>; new (arrayLength?: number): Array<any>; new <T>(arrayLength: number): Array<T>; new <T>(...items: Array<T>): Array<T>; isArray(arg: any): boolean; prototype: Array<any>; }
+>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[]; }
 
 x = new Array('hi', 'bye'); 
 >x = new Array('hi', 'bye') : string[]
 >x : string[]
 >new Array('hi', 'bye') : string[]
->Array : { (arrayLength?: number): Array<any>; <T>(arrayLength: number): Array<T>; <T>(...items: Array<T>): Array<T>; new (arrayLength?: number): Array<any>; new <T>(arrayLength: number): Array<T>; new <T>(...items: Array<T>): Array<T>; isArray(arg: any): boolean; prototype: Array<any>; }
+>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[]; }
 
 x = new Array<string>('hi', 'bye');
 >x = new Array<string>('hi', 'bye') : string[]
 >x : string[]
 >new Array<string>('hi', 'bye') : string[]
->Array : { (arrayLength?: number): Array<any>; <T>(arrayLength: number): Array<T>; <T>(...items: Array<T>): Array<T>; new (arrayLength?: number): Array<any>; new <T>(arrayLength: number): Array<T>; new <T>(...items: Array<T>): Array<T>; isArray(arg: any): boolean; prototype: Array<any>; }
+>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[]; }
 
 var y: number[];
 >y : number[]
@@ -27,17 +27,17 @@ y = new Array(1);
 >y = new Array(1) : any[]
 >y : number[]
 >new Array(1) : any[]
->Array : { (arrayLength?: number): Array<any>; <T>(arrayLength: number): Array<T>; <T>(...items: Array<T>): Array<T>; new (arrayLength?: number): Array<any>; new <T>(arrayLength: number): Array<T>; new <T>(...items: Array<T>): Array<T>; isArray(arg: any): boolean; prototype: Array<any>; }
+>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[]; }
 
 y = new Array(1,2);
 >y = new Array(1,2) : number[]
 >y : number[]
 >new Array(1,2) : number[]
->Array : { (arrayLength?: number): Array<any>; <T>(arrayLength: number): Array<T>; <T>(...items: Array<T>): Array<T>; new (arrayLength?: number): Array<any>; new <T>(arrayLength: number): Array<T>; new <T>(...items: Array<T>): Array<T>; isArray(arg: any): boolean; prototype: Array<any>; }
+>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[]; }
 
 y = new Array<number>(1, 2);
 >y = new Array<number>(1, 2) : number[]
 >y : number[]
 >new Array<number>(1, 2) : number[]
->Array : { (arrayLength?: number): Array<any>; <T>(arrayLength: number): Array<T>; <T>(...items: Array<T>): Array<T>; new (arrayLength?: number): Array<any>; new <T>(arrayLength: number): Array<T>; new <T>(...items: Array<T>): Array<T>; isArray(arg: any): boolean; prototype: Array<any>; }
+>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[]; }
 
diff --git a/tests/baselines/reference/arrayLiteral.types b/tests/baselines/reference/arrayLiteral.types
index bd979a92b98..1b356773dc7 100644
--- a/tests/baselines/reference/arrayLiteral.types
+++ b/tests/baselines/reference/arrayLiteral.types
@@ -8,7 +8,7 @@ var x = [];
 var x = new Array(1);
 >x : any[]
 >new Array(1) : any[]
->Array : { (arrayLength?: number): Array<any>; <T>(arrayLength: number): Array<T>; <T>(...items: Array<T>): Array<T>; new (arrayLength?: number): Array<any>; new <T>(arrayLength: number): Array<T>; new <T>(...items: Array<T>): Array<T>; isArray(arg: any): boolean; prototype: Array<any>; }
+>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[]; }
 
 var y = [1];
 >y : number[]
@@ -21,7 +21,7 @@ var y = [1, 2];
 var y = new Array<number>();
 >y : number[]
 >new Array<number>() : number[]
->Array : { (arrayLength?: number): Array<any>; <T>(arrayLength: number): Array<T>; <T>(...items: Array<T>): Array<T>; new (arrayLength?: number): Array<any>; new <T>(arrayLength: number): Array<T>; new <T>(...items: Array<T>): Array<T>; isArray(arg: any): boolean; prototype: Array<any>; }
+>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[]; }
 
 var x2: number[] = [];
 >x2 : number[]
@@ -30,7 +30,7 @@ var x2: number[] = [];
 var x2: number[] = new Array(1);
 >x2 : number[]
 >new Array(1) : any[]
->Array : { (arrayLength?: number): Array<any>; <T>(arrayLength: number): Array<T>; <T>(...items: Array<T>): Array<T>; new (arrayLength?: number): Array<any>; new <T>(arrayLength: number): Array<T>; new <T>(...items: Array<T>): Array<T>; isArray(arg: any): boolean; prototype: Array<any>; }
+>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[]; }
 
 var y2: number[] = [1];
 >y2 : number[]
@@ -43,5 +43,5 @@ var y2: number[] = [1, 2];
 var y2: number[] = new Array<number>();
 >y2 : number[]
 >new Array<number>() : number[]
->Array : { (arrayLength?: number): Array<any>; <T>(arrayLength: number): Array<T>; <T>(...items: Array<T>): Array<T>; new (arrayLength?: number): Array<any>; new <T>(arrayLength: number): Array<T>; new <T>(...items: Array<T>): Array<T>; isArray(arg: any): boolean; prototype: Array<any>; }
+>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[]; }
 
diff --git a/tests/baselines/reference/arrayLiterals.types b/tests/baselines/reference/arrayLiterals.types
index 4cc28d4fa8b..29dd1b19970 100644
--- a/tests/baselines/reference/arrayLiterals.types
+++ b/tests/baselines/reference/arrayLiterals.types
@@ -78,7 +78,7 @@ var classTypeArray = [C, C, C];
 
 var classTypeArray: Array<typeof C>; // Should OK, not be a parse error
 >classTypeArray : typeof C[]
->Array : Array<T>
+>Array : T[]
 >C : typeof C
 
 // Contextual type C with numeric index signature makes array literal of EveryType E of type BCT(E,C)[]
@@ -111,7 +111,7 @@ var context2 = [{ a: '', b: 0, c: '' }, { a: "", b: 3, c: 0 }];
 
 var context2: Array<{}>; // Should be OK
 >context2 : {}[]
->Array : Array<T>
+>Array : T[]
 
 // Contextual type C with numeric index signature of type Base makes array literal of Derived have type Base[]
 class Base { private p; }
diff --git a/tests/baselines/reference/assignmentCompatWithCallSignatures3.types b/tests/baselines/reference/assignmentCompatWithCallSignatures3.types
index 6b264a0486c..72cceae84ff 100644
--- a/tests/baselines/reference/assignmentCompatWithCallSignatures3.types
+++ b/tests/baselines/reference/assignmentCompatWithCallSignatures3.types
@@ -106,23 +106,23 @@ var a11: (x: { foo: string }, y: { foo: string; bar: string }) => Base;
 var a12: (x: Array<Base>, y: Array<Derived2>) => Array<Derived>;
 >a12 : (x: Base[], y: Derived2[]) => Derived[]
 >x : Base[]
->Array : Array<T>
+>Array : T[]
 >Base : Base
 >y : Derived2[]
->Array : Array<T>
+>Array : T[]
 >Derived2 : Derived2
->Array : Array<T>
+>Array : T[]
 >Derived : Derived
 
 var a13: (x: Array<Base>, y: Array<Derived>) => Array<Derived>;
 >a13 : (x: Base[], y: Derived[]) => Derived[]
 >x : Base[]
->Array : Array<T>
+>Array : T[]
 >Base : Base
 >y : Derived[]
->Array : Array<T>
+>Array : T[]
 >Derived : Derived
->Array : Array<T>
+>Array : T[]
 >Derived : Derived
 
 var a14: (x: { a: string; b: number }) => Object;
@@ -429,14 +429,14 @@ 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 : Array<T>
+>Array : T[]
 >Base : Base
 >x : Base[]
->Array : Array<T>
+>Array : T[]
 >Base : Base
 >y : T
 >T : T
->Array : Array<T>
+>Array : T[]
 >Derived : Derived
 
 a12 = b12; // ok
@@ -452,10 +452,10 @@ 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 : Array<T>
+>Array : T[]
 >Derived : Derived
 >x : Base[]
->Array : Array<T>
+>Array : T[]
 >Base : Base
 >y : T
 >T : T
diff --git a/tests/baselines/reference/assignmentCompatWithConstructSignatures3.types b/tests/baselines/reference/assignmentCompatWithConstructSignatures3.types
index 4289475ec8e..807f31b0e6e 100644
--- a/tests/baselines/reference/assignmentCompatWithConstructSignatures3.types
+++ b/tests/baselines/reference/assignmentCompatWithConstructSignatures3.types
@@ -106,23 +106,23 @@ var a11: new (x: { foo: string }, y: { foo: string; bar: string }) => Base;
 var a12: new (x: Array<Base>, y: Array<Derived2>) => Array<Derived>;
 >a12 : new (x: Base[], y: Derived2[]) => Derived[]
 >x : Base[]
->Array : Array<T>
+>Array : T[]
 >Base : Base
 >y : Derived2[]
->Array : Array<T>
+>Array : T[]
 >Derived2 : Derived2
->Array : Array<T>
+>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 : Array<T>
+>Array : T[]
 >Base : Base
 >y : Derived[]
->Array : Array<T>
+>Array : T[]
 >Derived : Derived
->Array : Array<T>
+>Array : T[]
 >Derived : Derived
 
 var a14: new (x: { a: string; b: number }) => Object;
@@ -429,14 +429,14 @@ 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 : Array<T>
+>Array : T[]
 >Base : Base
 >x : Base[]
->Array : Array<T>
+>Array : T[]
 >Base : Base
 >y : T
 >T : T
->Array : Array<T>
+>Array : T[]
 >Derived : Derived
 
 a12 = b12; // ok
@@ -452,10 +452,10 @@ 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 : Array<T>
+>Array : T[]
 >Derived : Derived
 >x : Base[]
->Array : Array<T>
+>Array : T[]
 >Base : Base
 >y : T
 >T : T
diff --git a/tests/baselines/reference/augmentArray.types b/tests/baselines/reference/augmentArray.types
index a5696ced583..31f7e11edca 100644
--- a/tests/baselines/reference/augmentArray.types
+++ b/tests/baselines/reference/augmentArray.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/augmentArray.ts ===
 interface Array<T> {
->Array : Array<T>
+>Array : T[]
 >T : T
 
     (): any[];
diff --git a/tests/baselines/reference/callSignatureAssignabilityInInheritance2.types b/tests/baselines/reference/callSignatureAssignabilityInInheritance2.types
index 57006b6b3b8..335413cd73e 100644
--- a/tests/baselines/reference/callSignatureAssignabilityInInheritance2.types
+++ b/tests/baselines/reference/callSignatureAssignabilityInInheritance2.types
@@ -110,23 +110,23 @@ interface A { // T
     a12: (x: Array<Base>, y: Array<Derived2>) => Array<Derived>;
 >a12 : (x: Base[], y: Derived2[]) => Derived[]
 >x : Base[]
->Array : Array<T>
+>Array : T[]
 >Base : Base
 >y : Derived2[]
->Array : Array<T>
+>Array : T[]
 >Derived2 : Derived2
->Array : Array<T>
+>Array : T[]
 >Derived : Derived
 
     a13: (x: Array<Base>, y: Array<Derived>) => Array<Derived>;
 >a13 : (x: Base[], y: Derived[]) => Derived[]
 >x : Base[]
->Array : Array<T>
+>Array : T[]
 >Base : Base
 >y : Derived[]
->Array : Array<T>
+>Array : T[]
 >Derived : Derived
->Array : Array<T>
+>Array : T[]
 >Derived : Derived
 
     a14: (x: { a: string; b: number }) => Object;
@@ -332,23 +332,23 @@ interface I extends A {
     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 : Array<T>
+>Array : T[]
 >Base : Base
 >x : Base[]
->Array : Array<T>
+>Array : T[]
 >Base : Base
 >y : T
 >T : T
->Array : Array<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 : Array<T>
+>Array : T[]
 >Derived : Derived
 >x : Base[]
->Array : Array<T>
+>Array : T[]
 >Base : Base
 >y : T
 >T : T
diff --git a/tests/baselines/reference/callSignatureAssignabilityInInheritance5.types b/tests/baselines/reference/callSignatureAssignabilityInInheritance5.types
index 8d9e49a3942..0ffc8257a56 100644
--- a/tests/baselines/reference/callSignatureAssignabilityInInheritance5.types
+++ b/tests/baselines/reference/callSignatureAssignabilityInInheritance5.types
@@ -111,23 +111,23 @@ interface A { // T
     a12: (x: Array<Base>, y: Array<Derived2>) => Array<Derived>;
 >a12 : (x: Base[], y: Derived2[]) => Derived[]
 >x : Base[]
->Array : Array<T>
+>Array : T[]
 >Base : Base
 >y : Derived2[]
->Array : Array<T>
+>Array : T[]
 >Derived2 : Derived2
->Array : Array<T>
+>Array : T[]
 >Derived : Derived
 
     a13: (x: Array<Base>, y: Array<Derived>) => Array<Derived>;
 >a13 : (x: Base[], y: Derived[]) => Derived[]
 >x : Base[]
->Array : Array<T>
+>Array : T[]
 >Base : Base
 >y : Derived[]
->Array : Array<T>
+>Array : T[]
 >Derived : Derived
->Array : Array<T>
+>Array : T[]
 >Derived : Derived
 
     a14: (x: { a: string; b: number }) => Object;
@@ -280,23 +280,23 @@ interface I extends B {
     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 : Array<T>
+>Array : T[]
 >Base : Base
 >x : Base[]
->Array : Array<T>
+>Array : T[]
 >Base : Base
 >y : T
 >T : T
->Array : Array<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 : Array<T>
+>Array : T[]
 >Derived : Derived
 >x : Base[]
->Array : Array<T>
+>Array : T[]
 >Base : Base
 >y : T
 >T : T
diff --git a/tests/baselines/reference/constructSignatureAssignabilityInInheritance2.types b/tests/baselines/reference/constructSignatureAssignabilityInInheritance2.types
index 2f659a45164..7ab221024ca 100644
--- a/tests/baselines/reference/constructSignatureAssignabilityInInheritance2.types
+++ b/tests/baselines/reference/constructSignatureAssignabilityInInheritance2.types
@@ -110,23 +110,23 @@ interface A { // T
     a12: new (x: Array<Base>, y: Array<Derived2>) => Array<Derived>;
 >a12 : new (x: Base[], y: Derived2[]) => Derived[]
 >x : Base[]
->Array : Array<T>
+>Array : T[]
 >Base : Base
 >y : Derived2[]
->Array : Array<T>
+>Array : T[]
 >Derived2 : Derived2
->Array : Array<T>
+>Array : T[]
 >Derived : Derived
 
     a13: new (x: Array<Base>, y: Array<Derived>) => Array<Derived>;
 >a13 : new (x: Base[], y: Derived[]) => Derived[]
 >x : Base[]
->Array : Array<T>
+>Array : T[]
 >Base : Base
 >y : Derived[]
->Array : Array<T>
+>Array : T[]
 >Derived : Derived
->Array : Array<T>
+>Array : T[]
 >Derived : Derived
 
     a14: new (x: { a: string; b: number }) => Object;
@@ -332,23 +332,23 @@ interface I extends A {
     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 : Array<T>
+>Array : T[]
 >Base : Base
 >x : Base[]
->Array : Array<T>
+>Array : T[]
 >Base : Base
 >y : T
 >T : T
->Array : Array<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 : Array<T>
+>Array : T[]
 >Derived : Derived
 >x : Base[]
->Array : Array<T>
+>Array : T[]
 >Base : Base
 >y : T
 >T : T
diff --git a/tests/baselines/reference/constructSignatureAssignabilityInInheritance5.types b/tests/baselines/reference/constructSignatureAssignabilityInInheritance5.types
index 188336aa245..dea9478b372 100644
--- a/tests/baselines/reference/constructSignatureAssignabilityInInheritance5.types
+++ b/tests/baselines/reference/constructSignatureAssignabilityInInheritance5.types
@@ -111,23 +111,23 @@ interface A { // T
     a12: new (x: Array<Base>, y: Array<Derived2>) => Array<Derived>;
 >a12 : new (x: Base[], y: Derived2[]) => Derived[]
 >x : Base[]
->Array : Array<T>
+>Array : T[]
 >Base : Base
 >y : Derived2[]
->Array : Array<T>
+>Array : T[]
 >Derived2 : Derived2
->Array : Array<T>
+>Array : T[]
 >Derived : Derived
 
     a13: new (x: Array<Base>, y: Array<Derived>) => Array<Derived>;
 >a13 : new (x: Base[], y: Derived[]) => Derived[]
 >x : Base[]
->Array : Array<T>
+>Array : T[]
 >Base : Base
 >y : Derived[]
->Array : Array<T>
+>Array : T[]
 >Derived : Derived
->Array : Array<T>
+>Array : T[]
 >Derived : Derived
 
     a14: new (x: { a: string; b: number }) => Object;
@@ -280,23 +280,23 @@ interface I extends B {
     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 : Array<T>
+>Array : T[]
 >Base : Base
 >x : Base[]
->Array : Array<T>
+>Array : T[]
 >Base : Base
 >y : T
 >T : T
->Array : Array<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 : Array<T>
+>Array : T[]
 >Derived : Derived
 >x : Base[]
->Array : Array<T>
+>Array : T[]
 >Base : Base
 >y : T
 >T : T
diff --git a/tests/baselines/reference/declFileGenericType.types b/tests/baselines/reference/declFileGenericType.types
index c30f54a6ebe..6239722b6b5 100644
--- a/tests/baselines/reference/declFileGenericType.types
+++ b/tests/baselines/reference/declFileGenericType.types
@@ -44,7 +44,7 @@ export module C {
 >B : B
 >x : T
 >T : T
->Array : Array<T>
+>Array : T[]
 >C : unknown
 >A : A<T>
 >C : unknown
diff --git a/tests/baselines/reference/declarationEmit_array-types-from-generic-array-usage.types b/tests/baselines/reference/declarationEmit_array-types-from-generic-array-usage.types
index 5fd5c5c62ac..63f35d0f263 100644
--- a/tests/baselines/reference/declarationEmit_array-types-from-generic-array-usage.types
+++ b/tests/baselines/reference/declarationEmit_array-types-from-generic-array-usage.types
@@ -1,5 +1,5 @@
 === tests/cases/compiler/declarationEmit_array-types-from-generic-array-usage.ts ===
 interface A extends Array<string> { }
 >A : A
->Array : Array<T>
+>Array : T[]
 
diff --git a/tests/baselines/reference/duplicateOverloadInTypeAugmentation1.types b/tests/baselines/reference/duplicateOverloadInTypeAugmentation1.types
index 5352ef905bb..bc7214eb6b9 100644
--- a/tests/baselines/reference/duplicateOverloadInTypeAugmentation1.types
+++ b/tests/baselines/reference/duplicateOverloadInTypeAugmentation1.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/duplicateOverloadInTypeAugmentation1.ts ===
 interface Array<T> {
->Array : Array<T>
+>Array : T[]
 >T : T
 
     reduce(callbackfn: (previousValue: T, currentValue: T, currentIndex: number, array: T[]) => T,
@@ -40,7 +40,7 @@ interface Array<T> {
 }
 var a: Array<string>;
 >a : string[]
->Array : Array<T>
+>Array : T[]
 
 var r5 = a.reduce((x, y) => x + y);
 >r5 : string
diff --git a/tests/baselines/reference/forStatementsMultipleValidDecl.types b/tests/baselines/reference/forStatementsMultipleValidDecl.types
index c084ec4a631..f5401754e29 100644
--- a/tests/baselines/reference/forStatementsMultipleValidDecl.types
+++ b/tests/baselines/reference/forStatementsMultipleValidDecl.types
@@ -118,7 +118,7 @@ for (var a: string[] = []; ;) { }
 for (var a = new Array<string>(); ;) { }
 >a : string[]
 >new Array<string>() : string[]
->Array : { (arrayLength?: number): Array<any>; <T>(arrayLength: number): Array<T>; <T>(...items: Array<T>): Array<T>; new (arrayLength?: number): Array<any>; new <T>(arrayLength: number): Array<T>; new <T>(...items: Array<T>): Array<T>; isArray(arg: any): boolean; prototype: Array<any>; }
+>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[]; }
 
 for (var a: typeof a; ;) { }
 >a : string[]
diff --git a/tests/baselines/reference/generatedContextualTyping.types b/tests/baselines/reference/generatedContextualTyping.types
index 9f70ffe2af5..13254eb8d22 100644
--- a/tests/baselines/reference/generatedContextualTyping.types
+++ b/tests/baselines/reference/generatedContextualTyping.types
@@ -90,7 +90,7 @@ var x7: Base[] = [d1, d2];
 
 var x8: Array<Base> = [d1, d2];
 >x8 : Base[]
->Array : Array<T>
+>Array : T[]
 >Base : Base
 >[d1, d2] : Base[]
 >d1 : Derived1
@@ -202,7 +202,7 @@ class x19 { member: Base[] = [d1, d2] }
 class x20 { member: Array<Base> = [d1, d2] }
 >x20 : x20
 >member : Base[]
->Array : Array<T>
+>Array : T[]
 >Base : Base
 >[d1, d2] : Base[]
 >d1 : Derived1
@@ -318,7 +318,7 @@ class x31 { private member: Base[] = [d1, d2] }
 class x32 { private member: Array<Base> = [d1, d2] }
 >x32 : x32
 >member : Base[]
->Array : Array<T>
+>Array : T[]
 >Base : Base
 >[d1, d2] : Base[]
 >d1 : Derived1
@@ -434,7 +434,7 @@ class x43 { public member: Base[] = [d1, d2] }
 class x44 { public member: Array<Base> = [d1, d2] }
 >x44 : x44
 >member : Base[]
->Array : Array<T>
+>Array : T[]
 >Base : Base
 >[d1, d2] : Base[]
 >d1 : Derived1
@@ -550,7 +550,7 @@ class x55 { static member: Base[] = [d1, d2] }
 class x56 { static member: Array<Base> = [d1, d2] }
 >x56 : x56
 >member : Base[]
->Array : Array<T>
+>Array : T[]
 >Base : Base
 >[d1, d2] : Base[]
 >d1 : Derived1
@@ -666,7 +666,7 @@ class x67 { private static member: Base[] = [d1, d2] }
 class x68 { private static member: Array<Base> = [d1, d2] }
 >x68 : x68
 >member : Base[]
->Array : Array<T>
+>Array : T[]
 >Base : Base
 >[d1, d2] : Base[]
 >d1 : Derived1
@@ -782,7 +782,7 @@ class x79 { public static member: Base[] = [d1, d2] }
 class x80 { public static member: Array<Base> = [d1, d2] }
 >x80 : x80
 >member : Base[]
->Array : Array<T>
+>Array : T[]
 >Base : Base
 >[d1, d2] : Base[]
 >d1 : Derived1
@@ -898,7 +898,7 @@ class x91 { constructor(parm: Base[] = [d1, d2]) { } }
 class x92 { constructor(parm: Array<Base> = [d1, d2]) { } }
 >x92 : x92
 >parm : Base[]
->Array : Array<T>
+>Array : T[]
 >Base : Base
 >[d1, d2] : Base[]
 >d1 : Derived1
@@ -1014,7 +1014,7 @@ class x103 { constructor(public parm: Base[] = [d1, d2]) { } }
 class x104 { constructor(public parm: Array<Base> = [d1, d2]) { } }
 >x104 : x104
 >parm : Base[]
->Array : Array<T>
+>Array : T[]
 >Base : Base
 >[d1, d2] : Base[]
 >d1 : Derived1
@@ -1130,7 +1130,7 @@ class x115 { constructor(private parm: Base[] = [d1, d2]) { } }
 class x116 { constructor(private parm: Array<Base> = [d1, d2]) { } }
 >x116 : x116
 >parm : Base[]
->Array : Array<T>
+>Array : T[]
 >Base : Base
 >[d1, d2] : Base[]
 >d1 : Derived1
@@ -1246,7 +1246,7 @@ function x127(parm: Base[] = [d1, d2]) { }
 function x128(parm: Array<Base> = [d1, d2]) { }
 >x128 : typeof x128
 >parm : Base[]
->Array : Array<T>
+>Array : T[]
 >Base : Base
 >[d1, d2] : Base[]
 >d1 : Derived1
@@ -1354,7 +1354,7 @@ function x139(): Base[] { return [d1, d2]; }
 
 function x140(): Array<Base> { return [d1, d2]; }
 >x140 : typeof x140
->Array : Array<T>
+>Array : T[]
 >Base : Base
 >[d1, d2] : Base[]
 >d1 : Derived1
@@ -1487,7 +1487,7 @@ function x151(): Base[] { return [d1, d2]; return [d1, d2]; }
 
 function x152(): Array<Base> { return [d1, d2]; return [d1, d2]; }
 >x152 : typeof x152
->Array : Array<T>
+>Array : T[]
 >Base : Base
 >[d1, d2] : Base[]
 >d1 : Derived1
@@ -1620,7 +1620,7 @@ var x163: () => Base[] = () => { return [d1, d2]; };
 
 var x164: () => Array<Base> = () => { return [d1, d2]; };
 >x164 : () => Base[]
->Array : Array<T>
+>Array : T[]
 >Base : Base
 >() => { return [d1, d2]; } : () => Base[]
 >[d1, d2] : Base[]
@@ -1736,7 +1736,7 @@ var x175: () => Base[] = function() { return [d1, d2]; };
 
 var x176: () => Array<Base> = function() { return [d1, d2]; };
 >x176 : () => Base[]
->Array : Array<T>
+>Array : T[]
 >Base : Base
 >function() { return [d1, d2]; } : () => Base[]
 >[d1, d2] : Base[]
@@ -1853,7 +1853,7 @@ module x187 { var t: Base[] = [d1, d2]; }
 module x188 { var t: Array<Base> = [d1, d2]; }
 >x188 : typeof x188
 >t : Base[]
->Array : Array<T>
+>Array : T[]
 >Base : Base
 >[d1, d2] : Base[]
 >d1 : Derived1
@@ -1969,7 +1969,7 @@ module x199 { export var t: Base[] = [d1, d2]; }
 module x200 { export var t: Array<Base> = [d1, d2]; }
 >x200 : typeof x200
 >t : Base[]
->Array : Array<T>
+>Array : T[]
 >Base : Base
 >[d1, d2] : Base[]
 >d1 : Derived1
@@ -2067,7 +2067,7 @@ var x211 = <Base[]>[d1, d2];
 var x212 = <Array<Base>>[d1, d2];
 >x212 : Base[]
 ><Array<Base>>[d1, d2] : Base[]
->Array : Array<T>
+>Array : T[]
 >Base : Base
 >[d1, d2] : Base[]
 >d1 : Derived1
@@ -2172,7 +2172,7 @@ var x222 = (<Array<Base>>undefined) || [d1, d2];
 >(<Array<Base>>undefined) || [d1, d2] : Base[]
 >(<Array<Base>>undefined) : Base[]
 ><Array<Base>>undefined : Base[]
->Array : Array<T>
+>Array : T[]
 >Base : Base
 >undefined : undefined
 >[d1, d2] : Base[]
@@ -2278,7 +2278,7 @@ var x231: Base[]; x231 = [d1, d2];
 
 var x232: Array<Base>; x232 = [d1, d2];
 >x232 : Base[]
->Array : Array<T>
+>Array : T[]
 >Base : Base
 >x232 = [d1, d2] : Base[]
 >x232 : Base[]
@@ -2414,7 +2414,7 @@ var x243: { n: Base[]; } = { n: [d1, d2] };
 var x244: { n: Array<Base>; } = { n: [d1, d2] };
 >x244 : { n: Base[]; }
 >n : Base[]
->Array : Array<T>
+>Array : T[]
 >Base : Base
 >{ n: [d1, d2] } : { n: Base[]; }
 >n : Base[]
@@ -2511,7 +2511,7 @@ var x255: Base[][] = [[d1, d2]];
 
 var x256: Array<Base>[] = [[d1, d2]];
 >x256 : Base[][]
->Array : Array<T>
+>Array : T[]
 >Base : Base
 >[[d1, d2]] : Base[][]
 >[d1, d2] : Base[]
@@ -2604,7 +2604,7 @@ var x265: Base[] = [d1, d2] || undefined;
 
 var x266: Array<Base> = [d1, d2] || undefined;
 >x266 : Base[]
->Array : Array<T>
+>Array : T[]
 >Base : Base
 >[d1, d2] || undefined : Base[]
 >[d1, d2] : Base[]
@@ -2687,7 +2687,7 @@ var x273: Base[] = undefined || [d1, d2];
 
 var x274: Array<Base> = undefined || [d1, d2];
 >x274 : Base[]
->Array : Array<T>
+>Array : T[]
 >Base : Base
 >undefined || [d1, d2] : Base[]
 >undefined : undefined
@@ -2786,7 +2786,7 @@ var x281: Base[] = [d1, d2] || [d1, d2];
 
 var x282: Array<Base> = [d1, d2] || [d1, d2];
 >x282 : Base[]
->Array : Array<T>
+>Array : T[]
 >Base : Base
 >[d1, d2] || [d1, d2] : Base[]
 >[d1, d2] : Base[]
@@ -2919,7 +2919,7 @@ var x291: Base[] = true ? [d1, d2] : [d1, d2];
 
 var x292: Array<Base> = true ? [d1, d2] : [d1, d2];
 >x292 : Base[]
->Array : Array<T>
+>Array : T[]
 >Base : Base
 >true ? [d1, d2] : [d1, d2] : Base[]
 >[d1, d2] : Base[]
@@ -3064,7 +3064,7 @@ var x303: Base[] = true ? undefined : [d1, d2];
 
 var x304: Array<Base> = true ? undefined : [d1, d2];
 >x304 : Base[]
->Array : Array<T>
+>Array : T[]
 >Base : Base
 >true ? undefined : [d1, d2] : Base[]
 >undefined : undefined
@@ -3192,7 +3192,7 @@ var x315: Base[] = true ? [d1, d2] : undefined;
 
 var x316: Array<Base> = true ? [d1, d2] : undefined;
 >x316 : Base[]
->Array : Array<T>
+>Array : T[]
 >Base : Base
 >true ? [d1, d2] : undefined : Base[]
 >[d1, d2] : Base[]
@@ -3328,7 +3328,7 @@ function x327(n: Base[]) { }; x327([d1, d2]);
 function x328(n: Array<Base>) { }; x328([d1, d2]);
 >x328 : typeof x328
 >n : Base[]
->Array : Array<T>
+>Array : T[]
 >Base : Base
 >x328([d1, d2]) : void
 >x328 : typeof x328
@@ -3483,7 +3483,7 @@ var x340 = (n: Array<Base>) => n; x340([d1, d2]);
 >x340 : (n: Base[]) => Base[]
 >(n: Array<Base>) => n : (n: Base[]) => Base[]
 >n : Base[]
->Array : Array<T>
+>Array : T[]
 >Base : Base
 >n : Base[]
 >x340([d1, d2]) : Base[]
@@ -3640,7 +3640,7 @@ var x352 = function(n: Array<Base>) { }; x352([d1, d2]);
 >x352 : (n: Base[]) => void
 >function(n: Array<Base>) { } : (n: Base[]) => void
 >n : Base[]
->Array : Array<T>
+>Array : T[]
 >Base : Base
 >x352([d1, d2]) : void
 >x352 : (n: Base[]) => void
diff --git a/tests/baselines/reference/genericFunctionsWithOptionalParameters1.types b/tests/baselines/reference/genericFunctionsWithOptionalParameters1.types
index 7b377f691ba..74b8b5e6858 100644
--- a/tests/baselines/reference/genericFunctionsWithOptionalParameters1.types
+++ b/tests/baselines/reference/genericFunctionsWithOptionalParameters1.types
@@ -7,7 +7,7 @@ interface Utils {
 >T : T
 >S : S
 >c : T[]
->Array : Array<T>
+>Array : T[]
 >T : T
 >folder : (s: S, t: T) => T
 >s : S
diff --git a/tests/baselines/reference/implementArrayInterface.types b/tests/baselines/reference/implementArrayInterface.types
index 7045c09a57b..68d192cee6f 100644
--- a/tests/baselines/reference/implementArrayInterface.types
+++ b/tests/baselines/reference/implementArrayInterface.types
@@ -2,7 +2,7 @@
 declare class ArrayConstructor<T> implements Array<T> {
 >ArrayConstructor : ArrayConstructor<T>
 >T : T
->Array : Array<T>
+>Array : T[]
 >T : T
 
     toString(): string;
diff --git a/tests/baselines/reference/innerBoundLambdaEmit.types b/tests/baselines/reference/innerBoundLambdaEmit.types
index 94ad46b500e..d68e6e81cb6 100644
--- a/tests/baselines/reference/innerBoundLambdaEmit.types
+++ b/tests/baselines/reference/innerBoundLambdaEmit.types
@@ -10,7 +10,7 @@ module M {
 >() => { } : () => void
 }
 interface Array<T> {
->Array : Array<T>
+>Array : T[]
 >T : T
 
     toFoo(): M.Foo
diff --git a/tests/baselines/reference/library_ArraySlice.types b/tests/baselines/reference/library_ArraySlice.types
index 42bc9b5f581..f1309844913 100644
--- a/tests/baselines/reference/library_ArraySlice.types
+++ b/tests/baselines/reference/library_ArraySlice.types
@@ -4,7 +4,7 @@ Array.prototype.slice();
 >Array.prototype.slice() : any[]
 >Array.prototype.slice : (start?: number, end?: number) => any[]
 >Array.prototype : any[]
->Array : { (arrayLength?: number): Array<any>; <T>(arrayLength: number): Array<T>; <T>(...items: Array<T>): Array<T>; new (arrayLength?: number): Array<any>; new <T>(arrayLength: number): Array<T>; new <T>(...items: Array<T>): Array<T>; isArray(arg: any): boolean; prototype: Array<any>; }
+>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[]; }
 >prototype : any[]
 >slice : (start?: number, end?: number) => any[]
 
@@ -12,7 +12,7 @@ Array.prototype.slice(0);
 >Array.prototype.slice(0) : any[]
 >Array.prototype.slice : (start?: number, end?: number) => any[]
 >Array.prototype : any[]
->Array : { (arrayLength?: number): Array<any>; <T>(arrayLength: number): Array<T>; <T>(...items: Array<T>): Array<T>; new (arrayLength?: number): Array<any>; new <T>(arrayLength: number): Array<T>; new <T>(...items: Array<T>): Array<T>; isArray(arg: any): boolean; prototype: Array<any>; }
+>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[]; }
 >prototype : any[]
 >slice : (start?: number, end?: number) => any[]
 
@@ -20,7 +20,7 @@ Array.prototype.slice(0, 1);
 >Array.prototype.slice(0, 1) : any[]
 >Array.prototype.slice : (start?: number, end?: number) => any[]
 >Array.prototype : any[]
->Array : { (arrayLength?: number): Array<any>; <T>(arrayLength: number): Array<T>; <T>(...items: Array<T>): Array<T>; new (arrayLength?: number): Array<any>; new <T>(arrayLength: number): Array<T>; new <T>(...items: Array<T>): Array<T>; isArray(arg: any): boolean; prototype: Array<any>; }
+>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[]; }
 >prototype : any[]
 >slice : (start?: number, end?: number) => any[]
 
diff --git a/tests/baselines/reference/newArrays.types b/tests/baselines/reference/newArrays.types
index 54068a987f6..ab2d7165980 100644
--- a/tests/baselines/reference/newArrays.types
+++ b/tests/baselines/reference/newArrays.types
@@ -27,7 +27,7 @@ module M {
 >this : Gar
 >fa : Foo[]
 >new Array<Foo>(this.x * this.y) : Foo[]
->Array : { (arrayLength?: number): Array<any>; <T>(arrayLength: number): Array<T>; <T>(...items: Array<T>): Array<T>; new (arrayLength?: number): Array<any>; new <T>(arrayLength: number): Array<T>; new <T>(...items: Array<T>): Array<T>; isArray(arg: any): boolean; prototype: Array<any>; }
+>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[]; }
 >Foo : Foo
 >this.x * this.y : number
 >this.x : number
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.types b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.types
index 27f6ffca0c6..a0a1ace5645 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.types
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.types
@@ -17,7 +17,7 @@ class A {
 class B<T extends Array<number>> {
 >B : B<T>
 >T : T
->Array : Array<T>
+>Array : T[]
 
     foo(x: T): string { return null; }
 >foo : (x: T) => string
@@ -62,7 +62,7 @@ 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 : Array<T>
+>Array : T[]
 >x : T
 >T : T
 
@@ -94,13 +94,13 @@ function foo1b(x: B<Array<number>>);
 >foo1b : typeof foo1b
 >x : B<number[]>
 >B : B<T>
->Array : Array<T>
+>Array : T[]
 
 function foo1b(x: B<Array<number>>); // error
 >foo1b : typeof foo1b
 >x : B<number[]>
 >B : B<T>
->Array : Array<T>
+>Array : T[]
 
 function foo1b(x: any) { }
 >foo1b : typeof foo1b
@@ -175,7 +175,7 @@ function foo5(x: B<Array<number>>); // ok
 >foo5 : typeof foo5
 >x : B<number[]>
 >B : B<T>
->Array : Array<T>
+>Array : T[]
 
 function foo5(x: any) { }
 >foo5 : typeof foo5
@@ -229,7 +229,7 @@ function foo8(x: B<Array<number>>);
 >foo8 : typeof foo8
 >x : B<number[]>
 >B : B<T>
->Array : Array<T>
+>Array : T[]
 
 function foo8(x: I<Number>); // ok
 >foo8 : typeof foo8
@@ -245,7 +245,7 @@ function foo9(x: B<Array<number>>);
 >foo9 : typeof foo9
 >x : B<number[]>
 >B : B<T>
->Array : Array<T>
+>Array : T[]
 
 function foo9(x: C<String>); // ok
 >foo9 : typeof foo9
@@ -261,7 +261,7 @@ function foo10(x: B<Array<number>>);
 >foo10 : typeof foo10
 >x : B<number[]>
 >B : B<T>
->Array : Array<T>
+>Array : T[]
 
 function foo10(x: typeof a); // ok
 >foo10 : typeof foo10
@@ -276,7 +276,7 @@ function foo11(x: B<Array<number>>);
 >foo11 : typeof foo11
 >x : B<number[]>
 >B : B<T>
->Array : Array<T>
+>Array : T[]
 
 function foo11(x: typeof b); // ok
 >foo11 : typeof foo11
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.types b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.types
index f6b042a576f..5a9db264031 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.types
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.types
@@ -6,7 +6,7 @@
 class B<T extends Array<number>> {
 >B : B<T>
 >T : T
->Array : Array<T>
+>Array : T[]
 
     constructor(x: T) { return null; }
 >x : T
@@ -46,7 +46,7 @@ interface I2 {
 var a: { new<T extends Array<string>>(x: T): string }
 >a : new <T extends string[]>(x: T) => string
 >T : T
->Array : Array<T>
+>Array : T[]
 >x : T
 >T : T
 
@@ -64,13 +64,13 @@ function foo1b(x: B<Array<number>>);
 >foo1b : typeof foo1b
 >x : B<number[]>
 >B : B<T>
->Array : Array<T>
+>Array : T[]
 
 function foo1b(x: B<Array<number>>); // error
 >foo1b : typeof foo1b
 >x : B<number[]>
 >B : B<T>
->Array : Array<T>
+>Array : T[]
 
 function foo1b(x: any) { }
 >foo1b : typeof foo1b
@@ -140,7 +140,7 @@ function foo8(x: B<Array<number>>);
 >foo8 : typeof foo8
 >x : B<number[]>
 >B : B<T>
->Array : Array<T>
+>Array : T[]
 
 function foo8(x: I<Number>); // ok
 >foo8 : typeof foo8
@@ -156,7 +156,7 @@ function foo9(x: B<Array<number>>);
 >foo9 : typeof foo9
 >x : B<number[]>
 >B : B<T>
->Array : Array<T>
+>Array : T[]
 
 function foo9(x: C<String>); // error, types are structurally equal
 >foo9 : typeof foo9
@@ -172,7 +172,7 @@ function foo10(x: B<Array<number>>);
 >foo10 : typeof foo10
 >x : B<number[]>
 >B : B<T>
->Array : Array<T>
+>Array : T[]
 
 function foo10(x: typeof a); // ok
 >foo10 : typeof foo10
@@ -187,7 +187,7 @@ function foo11(x: B<Array<number>>);
 >foo11 : typeof foo11
 >x : B<number[]>
 >B : B<T>
->Array : Array<T>
+>Array : T[]
 
 function foo11(x: typeof b); // ok
 >foo11 : typeof foo11
diff --git a/tests/baselines/reference/returnTypeParameterWithModules.types b/tests/baselines/reference/returnTypeParameterWithModules.types
index a13a9b79e0d..68161de58c7 100644
--- a/tests/baselines/reference/returnTypeParameterWithModules.types
+++ b/tests/baselines/reference/returnTypeParameterWithModules.types
@@ -8,7 +8,7 @@ module M1 {
 >ar : any
 >f : any
 >e : any
->Array : Array<T>
+>Array : T[]
 >A : A
 
         return Array.prototype.reduce.apply(ar, e ? [f, e] : [f]);
@@ -16,7 +16,7 @@ module M1 {
 >Array.prototype.reduce.apply : (thisArg: any, argArray?: any) => any
 >Array.prototype.reduce : { (callbackfn: (previousValue: any, currentValue: any, currentIndex: number, array: any[]) => any, initialValue?: any): any; <U>(callbackfn: (previousValue: U, currentValue: any, currentIndex: number, array: any[]) => U, initialValue: U): U; }
 >Array.prototype : any[]
->Array : { (arrayLength?: number): Array<any>; <T>(arrayLength: number): Array<T>; <T>(...items: Array<T>): Array<T>; new (arrayLength?: number): Array<any>; new <T>(arrayLength: number): Array<T>; new <T>(...items: Array<T>): Array<T>; isArray(arg: any): boolean; prototype: Array<any>; }
+>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[]; }
 >prototype : any[]
 >reduce : { (callbackfn: (previousValue: any, currentValue: any, currentIndex: number, array: any[]) => any, initialValue?: any): any; <U>(callbackfn: (previousValue: U, currentValue: any, currentIndex: number, array: any[]) => U, initialValue: U): U; }
 >apply : (thisArg: any, argArray?: any) => any
diff --git a/tests/baselines/reference/subtypingWithCallSignatures2.types b/tests/baselines/reference/subtypingWithCallSignatures2.types
index ea152e90d5d..91984c6aba2 100644
--- a/tests/baselines/reference/subtypingWithCallSignatures2.types
+++ b/tests/baselines/reference/subtypingWithCallSignatures2.types
@@ -173,12 +173,12 @@ declare function foo12(a: (x: Array<Base>, y: Array<Derived2>) => Array<Derived>
 >foo12 : typeof foo12
 >a : (x: Base[], y: Derived2[]) => Derived[]
 >x : Base[]
->Array : Array<T>
+>Array : T[]
 >Base : Base
 >y : Derived2[]
->Array : Array<T>
+>Array : T[]
 >Derived2 : Derived2
->Array : Array<T>
+>Array : T[]
 >Derived : Derived
 >a : (x: Base[], y: Derived2[]) => Derived[]
 
@@ -190,12 +190,12 @@ declare function foo13(a: (x: Array<Base>, y: Array<Derived>) => Array<Derived>)
 >foo13 : typeof foo13
 >a : (x: Base[], y: Derived[]) => Derived[]
 >x : Base[]
->Array : Array<T>
+>Array : T[]
 >Base : Base
 >y : Derived[]
->Array : Array<T>
+>Array : T[]
 >Derived : Derived
->Array : Array<T>
+>Array : T[]
 >Derived : Derived
 >a : (x: Base[], y: Derived[]) => Derived[]
 
@@ -758,28 +758,28 @@ var r12arg1 = <T extends Array<Base>>(x: Array<Base>, y: T) => <Array<Derived>>n
 >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 : Array<T>
+>Array : T[]
 >Base : Base
 >x : Base[]
->Array : Array<T>
+>Array : T[]
 >Base : Base
 >y : T
 >T : T
 ><Array<Derived>>null : Derived[]
->Array : Array<T>
+>Array : T[]
 >Derived : Derived
 
 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 : Array<T>
+>Array : T[]
 >Base : Base
 >y : Derived2[]
->Array : Array<T>
+>Array : T[]
 >Derived2 : Derived2
 ><Array<Derived>>null : Derived[]
->Array : Array<T>
+>Array : T[]
 >Derived : Derived
 
 var r12 = foo12(r12arg1); // any
@@ -804,10 +804,10 @@ 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 : Array<T>
+>Array : T[]
 >Derived : Derived
 >x : Base[]
->Array : Array<T>
+>Array : T[]
 >Base : Base
 >y : T
 >T : T
@@ -817,13 +817,13 @@ 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 : Array<T>
+>Array : T[]
 >Base : Base
 >y : Derived[]
->Array : Array<T>
+>Array : T[]
 >Derived : Derived
 ><Array<Derived>>null : Derived[]
->Array : Array<T>
+>Array : T[]
 >Derived : Derived
 
 var r13 = foo13(r13arg1); // any
diff --git a/tests/baselines/reference/subtypingWithCallSignatures3.types b/tests/baselines/reference/subtypingWithCallSignatures3.types
index d53e3467adf..122301a477d 100644
--- a/tests/baselines/reference/subtypingWithCallSignatures3.types
+++ b/tests/baselines/reference/subtypingWithCallSignatures3.types
@@ -101,12 +101,12 @@ module Errors {
 >foo12 : typeof foo12
 >a2 : (x: Base[], y: Derived2[]) => Derived[]
 >x : Base[]
->Array : Array<T>
+>Array : T[]
 >Base : Base
 >y : Derived2[]
->Array : Array<T>
+>Array : T[]
 >Derived2 : Derived2
->Array : Array<T>
+>Array : T[]
 >Derived : Derived
 >a2 : (x: Base[], y: Derived2[]) => Derived[]
 
@@ -432,26 +432,26 @@ 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 : Array<T>
+>Array : T[]
 >Base : Base
 >y : Derived2[]
->Array : Array<T>
+>Array : T[]
 >Derived2 : Derived2
 ><Array<Derived>>null : Derived[]
->Array : Array<T>
+>Array : T[]
 >Derived : Derived
 
     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 : Array<T>
+>Array : T[]
 >Derived2 : Derived2
 >x : Base[]
->Array : Array<T>
+>Array : T[]
 >Base : Base
 >y : Base[]
->Array : Array<T>
+>Array : T[]
 >Base : Base
 ><T>null : T
 >T : T
diff --git a/tests/baselines/reference/subtypingWithConstructSignatures2.types b/tests/baselines/reference/subtypingWithConstructSignatures2.types
index 713477a63fa..75859e04902 100644
--- a/tests/baselines/reference/subtypingWithConstructSignatures2.types
+++ b/tests/baselines/reference/subtypingWithConstructSignatures2.types
@@ -173,12 +173,12 @@ declare function foo12(a: new (x: Array<Base>, y: Array<Derived2>) => Array<Deri
 >foo12 : typeof foo12
 >a : new (x: Base[], y: Derived2[]) => Derived[]
 >x : Base[]
->Array : Array<T>
+>Array : T[]
 >Base : Base
 >y : Derived2[]
->Array : Array<T>
+>Array : T[]
 >Derived2 : Derived2
->Array : Array<T>
+>Array : T[]
 >Derived : Derived
 >a : new (x: Base[], y: Derived2[]) => Derived[]
 
@@ -190,12 +190,12 @@ declare function foo13(a: new (x: Array<Base>, y: Array<Derived>) => Array<Deriv
 >foo13 : typeof foo13
 >a : new (x: Base[], y: Derived[]) => Derived[]
 >x : Base[]
->Array : Array<T>
+>Array : T[]
 >Base : Base
 >y : Derived[]
->Array : Array<T>
+>Array : T[]
 >Derived : Derived
->Array : Array<T>
+>Array : T[]
 >Derived : Derived
 >a : new (x: Base[], y: Derived[]) => Derived[]
 
@@ -713,25 +713,25 @@ 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 : Array<T>
+>Array : T[]
 >Base : Base
 >x : Base[]
->Array : Array<T>
+>Array : T[]
 >Base : Base
 >y : T
 >T : T
->Array : Array<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 : Array<T>
+>Array : T[]
 >Base : Base
 >y : Derived2[]
->Array : Array<T>
+>Array : T[]
 >Derived2 : Derived2
->Array : Array<T>
+>Array : T[]
 >Derived : Derived
 
 var r12 = foo12(r12arg1); // any
@@ -755,10 +755,10 @@ 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 : Array<T>
+>Array : T[]
 >Derived : Derived
 >x : Base[]
->Array : Array<T>
+>Array : T[]
 >Base : Base
 >y : T
 >T : T
@@ -767,12 +767,12 @@ var r13arg1: new <T extends Array<Derived>>(x: Array<Base>, y: T) => T;
 var r13arg2: new (x: Array<Base>, y: Array<Derived>) => Array<Derived>;
 >r13arg2 : new (x: Base[], y: Derived[]) => Derived[]
 >x : Base[]
->Array : Array<T>
+>Array : T[]
 >Base : Base
 >y : Derived[]
->Array : Array<T>
+>Array : T[]
 >Derived : Derived
->Array : Array<T>
+>Array : T[]
 >Derived : Derived
 
 var r13 = foo13(r13arg1); // any
diff --git a/tests/baselines/reference/subtypingWithConstructSignatures3.types b/tests/baselines/reference/subtypingWithConstructSignatures3.types
index 51a67c37131..5d33a2149d6 100644
--- a/tests/baselines/reference/subtypingWithConstructSignatures3.types
+++ b/tests/baselines/reference/subtypingWithConstructSignatures3.types
@@ -101,12 +101,12 @@ module Errors {
 >foo12 : typeof foo12
 >a2 : new (x: Base[], y: Derived2[]) => Derived[]
 >x : Base[]
->Array : Array<T>
+>Array : T[]
 >Base : Base
 >y : Derived2[]
->Array : Array<T>
+>Array : T[]
 >Derived2 : Derived2
->Array : Array<T>
+>Array : T[]
 >Derived : Derived
 >a2 : new (x: Base[], y: Derived2[]) => Derived[]
 
@@ -401,24 +401,24 @@ module Errors {
     var r6arg1: new (x: Array<Base>, y: Array<Derived2>) => Array<Derived>;
 >r6arg1 : new (x: Base[], y: Derived2[]) => Derived[]
 >x : Base[]
->Array : Array<T>
+>Array : T[]
 >Base : Base
 >y : Derived2[]
->Array : Array<T>
+>Array : T[]
 >Derived2 : Derived2
->Array : Array<T>
+>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 : Array<T>
+>Array : T[]
 >Derived2 : Derived2
 >x : Base[]
->Array : Array<T>
+>Array : T[]
 >Base : Base
 >y : Base[]
->Array : Array<T>
+>Array : T[]
 >Base : Base
 >T : T
 
diff --git a/tests/baselines/reference/subtypingWithConstructSignatures5.types b/tests/baselines/reference/subtypingWithConstructSignatures5.types
index 1b27400656f..7ffb4db5467 100644
--- a/tests/baselines/reference/subtypingWithConstructSignatures5.types
+++ b/tests/baselines/reference/subtypingWithConstructSignatures5.types
@@ -111,23 +111,23 @@ interface A { // T
     a12: new (x: Array<Base>, y: Array<Derived2>) => Array<Derived>;
 >a12 : new (x: Base[], y: Derived2[]) => Derived[]
 >x : Base[]
->Array : Array<T>
+>Array : T[]
 >Base : Base
 >y : Derived2[]
->Array : Array<T>
+>Array : T[]
 >Derived2 : Derived2
->Array : Array<T>
+>Array : T[]
 >Derived : Derived
 
     a13: new (x: Array<Base>, y: Array<Derived>) => Array<Derived>;
 >a13 : new (x: Base[], y: Derived[]) => Derived[]
 >x : Base[]
->Array : Array<T>
+>Array : T[]
 >Base : Base
 >y : Derived[]
->Array : Array<T>
+>Array : T[]
 >Derived : Derived
->Array : Array<T>
+>Array : T[]
 >Derived : Derived
 
     a14: new (x: { a: string; b: number }) => Object;
@@ -280,23 +280,23 @@ interface I extends B {
     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 : Array<T>
+>Array : T[]
 >Base : Base
 >x : Base[]
->Array : Array<T>
+>Array : T[]
 >Base : Base
 >y : T
 >T : T
->Array : Array<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 : Array<T>
+>Array : T[]
 >Derived : Derived
 >x : Base[]
->Array : Array<T>
+>Array : T[]
 >Base : Base
 >y : T
 >T : T
diff --git a/tests/baselines/reference/underscoreTest1.types b/tests/baselines/reference/underscoreTest1.types
index fe1db7c20c3..488d01b9f35 100644
--- a/tests/baselines/reference/underscoreTest1.types
+++ b/tests/baselines/reference/underscoreTest1.types
@@ -1392,7 +1392,7 @@ interface Tuple2<T0, T1> extends Array<any> {
 >Tuple2 : Tuple2<T0, T1>
 >T0 : T0
 >T1 : T1
->Array : Array<T>
+>Array : T[]
 
     0: T0;
 >T0 : T0
@@ -1406,7 +1406,7 @@ interface Tuple3<T0, T1, T2> extends Array<any> {
 >T0 : T0
 >T1 : T1
 >T2 : T2
->Array : Array<T>
+>Array : T[]
 
     0: T0;
 >T0 : T0
@@ -1424,7 +1424,7 @@ interface Tuple4<T0, T1, T2, T3> extends Array<any> {
 >T1 : T1
 >T2 : T2
 >T3 : T3
->Array : Array<T>
+>Array : T[]
 
     0: T0;
 >T0 : T0
@@ -1631,7 +1631,7 @@ module Underscore {
 >WrappedArray : WrappedArray<T>
 >T : T
 >WrappedObject : WrappedObject<T>
->Array : Array<T>
+>Array : T[]
 >T : T
 
         each(iterator: Iterator<T, void>, context?: any): void;
@@ -2635,7 +2635,7 @@ module Underscore {
 >ChainedArray : ChainedArray<T>
 >T : T
 >ChainedObject : ChainedObject<T>
->Array : Array<T>
+>Array : T[]
 >T : T
 
         each(iterator: Iterator<T, void>, context?: any): ChainedObject<void>;
diff --git a/tests/baselines/reference/validMultipleVariableDeclarations.types b/tests/baselines/reference/validMultipleVariableDeclarations.types
index d5a0d0cf673..60e7cebb491 100644
--- a/tests/baselines/reference/validMultipleVariableDeclarations.types
+++ b/tests/baselines/reference/validMultipleVariableDeclarations.types
@@ -126,7 +126,7 @@ var a: string[] = [];
 var a = new Array<string>();
 >a : string[]
 >new Array<string>() : string[]
->Array : { (arrayLength?: number): Array<any>; <T>(arrayLength: number): Array<T>; <T>(...items: Array<T>): Array<T>; new (arrayLength?: number): Array<any>; new <T>(arrayLength: number): Array<T>; new <T>(...items: Array<T>): Array<T>; isArray(arg: any): boolean; prototype: Array<any>; }
+>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[]; }
 
 var a: typeof a;
 >a : string[]

From 44c2453ec6c5725baf37384645b8a7d656b69158 Mon Sep 17 00:00:00 2001
From: Jason Freeman <jfreeman@microsoft.com>
Date: Thu, 28 Aug 2014 12:52:44 -0700
Subject: [PATCH 09/11] Don't use UseTypeOfFunction in typeWriter

---
 src/harness/typeWriter.ts                     |   2 +-
 ...AndNonExportedFunctionThatShareAName.types |   4 +-
 ...esInParameterAndReturnTypeAnnotation.types |   2 +-
 ...ssibleTypesInParameterTypeAnnotation.types |   2 +-
 ...ccessibleTypesInReturnTypeAnnotation.types |   2 +-
 ...leWithSameNameAndDifferentCommonRoot.types |   6 +-
 ...AndNonExportedLocalVarsOfTheSameName.types |   6 +-
 ...ithTheSameNameAndDifferentCommonRoot.types |   2 +-
 ...ulesWithTheSameNameAndSameCommonRoot.types |   6 +-
 .../additionOperatorWithAnyAndEveryType.types |   6 +-
 .../aliasUsageInGenericFunction.types         |   6 +-
 .../reference/aliasUsedAsNameValue.types      |   6 +-
 .../reference/ambientDeclarations.types       |  26 ++--
 .../reference/ambientModuleExports.types      |  12 +-
 .../ambiguousOverloadResolution.types         |   6 +-
 .../anyAsReturnTypeForNewOnCall.types         |   4 +-
 .../anyAssignabilityInInheritance.types       | 102 ++++++-------
 .../reference/anyAssignableToEveryType.types  |   2 +-
 tests/baselines/reference/arguments.types     |   2 +-
 .../arrayLiteralInNonVarArgParameter.types    |   4 +-
 .../reference/arrowFunctionExpressions.types  |  12 +-
 .../asiAmbientFunctionDeclaration.types       |   2 +-
 .../reference/assignEveryTypeToAny.types      |   2 +-
 .../reference/assignmentCompatForEnums.types  |   6 +-
 .../reference/assignmentCompatOnNew.types     |   4 +-
 ...tibilityForConstrainedTypeParameters.types |   2 +-
 .../reference/assignmentLHSIsReference.types  |   4 +-
 tests/baselines/reference/avoid.types         |  10 +-
 .../reference/badOverloadError.types          |   2 +-
 .../baselines/reference/badThisBinding.types  |   8 +-
 ...stCommonTypeOfConditionalExpressions.types |   2 +-
 .../bestCommonTypeReturnStatement.types       |  10 +-
 .../bitwiseNotOperatorWithBooleanType.types   |   6 +-
 .../bitwiseNotOperatorWithNumberType.types    |   6 +-
 .../bitwiseNotOperatorWithStringType.types    |   6 +-
 ...GenericFunctionWithZeroTypeArguments.types |   4 +-
 ...allSignatureWithoutAnnotationsOrBody.types |   4 +-
 ...WithoutReturnTypeAnnotationInference.types |  64 ++++----
 ...callSignaturesWithOptionalParameters.types |   6 +-
 ...allSignaturesWithOptionalParameters2.types |  18 +--
 tests/baselines/reference/catch.types         |   2 +-
 tests/baselines/reference/cf.types            |   2 +-
 .../reference/chainedImportAlias.types        |   6 +-
 tests/baselines/reference/cloduleTest1.types  |   2 +-
 ...ionCodeGenModuleWithFunctionChildren.types |   6 +-
 ...isionCodeGenModuleWithModuleChildren.types |   4 +-
 .../collisionExportsRequireAndFunction.types  |   4 +-
 .../collisionExportsRequireAndModule.types    |   4 +-
 ...xportsRequireAndUninstantiatedModule.types |   4 +-
 .../collisionExportsRequireAndVar.types       |   2 +-
 .../baselines/reference/commaOperator1.types  |   2 +-
 .../commaOperatorOtherValidOperation.types    |   6 +-
 .../commentInEmptyParameterList1.types        |   2 +-
 .../reference/commentOnSignature1.types       |   6 +-
 .../commentOnSimpleArrowFunctionBody1.types   |   4 +-
 .../reference/commentsCommentParsing.types    |  76 +++++-----
 .../reference/commentsExternalModules.types   |  28 ++--
 .../reference/commentsExternalModules2.types  |  28 ++--
 .../reference/commentsExternalModules3.types  |  28 ++--
 .../reference/commentsFunction.types          |  20 +--
 .../baselines/reference/commentsModules.types |  16 +-
 .../reference/commentsOverloads.types         |  40 ++---
 .../reference/commentsTypeParameters.types    |   2 +-
 .../reference/commentsdoNotEmitComments.types |   4 +-
 .../reference/commentsemitComments.types      |   4 +-
 ...onOperatorWithIdenticalTypeParameter.types |   2 +-
 ...omparisonOperatorWithOneOperandIsAny.types |   2 +-
 ...mparisonOperatorWithOneOperandIsNull.types |   2 +-
 ...sonOperatorWithOneOperandIsUndefined.types |   2 +-
 .../reference/compositeGenericFunction.types  |  12 +-
 .../compoundAssignmentLHSIsReference.types    |   4 +-
 .../reference/conditionalExpressions2.types   |   2 +-
 ...itionalOperatorConditionIsNumberType.types |  10 +-
 ...itionalOperatorConditionIsObjectType.types |   6 +-
 ...itionalOperatorConditoinIsStringType.types |   6 +-
 ...eOverloadsCausedByOverloadResolution.types |  12 +-
 .../reference/constantOverloadFunction.types  |  10 +-
 ...straintPropagationThroughReturnTypes.types |   6 +-
 .../constraintSatisfactionWithAny.types       |  18 +--
 ...onstraintSatisfactionWithEmptyObject.types |  12 +-
 ...nstructorArgWithGenericCallSignature.types |   6 +-
 ...contextualSigInstantiationRestParams.types |  10 +-
 .../contextualSignatureInstantiation1.types   |   8 +-
 .../contextualSignatureInstantiation3.types   |  18 +--
 ...meterConstrainedToOuterTypeParameter.types |   4 +-
 .../contextualTypeAppliedToVarArgs.types      |   4 +-
 .../reference/contextualTyping25.types        |   4 +-
 .../reference/contextualTyping26.types        |   4 +-
 .../reference/contextualTyping27.types        |   4 +-
 .../reference/contextualTyping28.types        |   4 +-
 .../reference/contextualTyping29.types        |   4 +-
 .../reference/contextualTyping31.types        |   4 +-
 .../reference/contextualTyping32.types        |   4 +-
 ...ypingTwoInstancesOfSameTypeParameter.types |   6 +-
 .../reference/convertKeywordsYes.types        |   2 +-
 tests/baselines/reference/covariance1.types   |   6 +-
 .../crashInresolveReturnStatement.types       |   4 +-
 tests/baselines/reference/debugger.types      |   2 +-
 .../reference/declFileFunctions.types         |  36 ++---
 .../reference/declFileGenericType.types       |  48 +++---
 ...tParametersOfFunctionAndFunctionType.types |  10 +-
 .../reference/declFileTypeofFunction.types    |  46 +++---
 .../declarationEmit_nameConflicts.types       |  32 ++--
 .../declarationEmit_nameConflicts2.types      |   8 +-
 .../declarationEmit_nameConflicts3.types      |  24 +--
 .../deleteOperatorWithBooleanType.types       |   6 +-
 .../deleteOperatorWithNumberType.types        |   6 +-
 .../deleteOperatorWithStringType.types        |   6 +-
 .../reference/dottedSymbolResolution1.types   |  10 +-
 .../reference/duplicateVariablesByScope.types |   2 +-
 tests/baselines/reference/es6ClassTest8.types |   6 +-
 .../reference/everyTypeAssignableToAny.types  |   2 +-
 ...veryTypeWithAnnotationAndInitializer.types |  20 +--
 .../reference/everyTypeWithInitializer.types  |  14 +-
 .../reference/exportAssignmentFunction.types  |   8 +-
 .../exportAssignmentMergedModule.types        |  12 +-
 tests/baselines/reference/exportCodeGen.types |  12 +-
 tests/baselines/reference/exportImport.types  |   2 +-
 .../reference/exportImportMultipleFiles.types |  10 +-
 .../exportImportNonInstantiatedModule2.types  |   2 +-
 .../reference/exportVisibility.types          |   2 +-
 tests/baselines/reference/externFunc.types    |   4 +-
 ...fImportDeclarationWithExportModifier.types |   6 +-
 .../reference/fatarrowfunctions.types         |  36 ++---
 ...functionsInFunctionParameterDefaults.types |   4 +-
 .../fatarrowfunctionsInFunctions.types        |   4 +-
 ...rameterInSignatureWithRestParameters.types |   4 +-
 .../baselines/reference/forInStatement3.types |   2 +-
 tests/baselines/reference/forStatements.types |  20 +--
 .../forStatementsMultipleValidDecl.types      |   2 +-
 tests/baselines/reference/funcdecl.types      |  78 +++++-----
 tests/baselines/reference/functionCall1.types |   4 +-
 tests/baselines/reference/functionCall2.types |   4 +-
 tests/baselines/reference/functionCall3.types |   4 +-
 tests/baselines/reference/functionCall4.types |   8 +-
 tests/baselines/reference/functionCall5.types |   4 +-
 .../functionConstraintSatisfaction.types      |  44 +++---
 .../functionConstraintSatisfaction3.types     |  22 +--
 ...nWithArgumentOfTypeFunctionTypeArray.types |   2 +-
 .../reference/functionImplementations.types   |  34 ++---
 .../reference/functionMergedWithModule.types  |   8 +-
 .../reference/functionOnlyHasThrow.types      |   2 +-
 .../reference/functionOverloads10.types       |   6 +-
 .../reference/functionOverloads12.types       |   6 +-
 .../reference/functionOverloads13.types       |   6 +-
 .../reference/functionOverloads14.types       |   6 +-
 .../reference/functionOverloads15.types       |   6 +-
 .../reference/functionOverloads16.types       |   6 +-
 .../reference/functionOverloads21.types       |   6 +-
 .../reference/functionOverloads23.types       |   6 +-
 .../reference/functionOverloads24.types       |   6 +-
 .../reference/functionOverloads25.types       |   8 +-
 .../reference/functionOverloads26.types       |   8 +-
 .../reference/functionOverloads28.types       |   8 +-
 .../reference/functionOverloads30.types       |   8 +-
 .../reference/functionOverloads31.types       |   8 +-
 .../reference/functionOverloads32.types       |   8 +-
 .../reference/functionOverloads33.types       |   8 +-
 .../reference/functionOverloads35.types       |   8 +-
 .../reference/functionOverloads36.types       |   8 +-
 .../reference/functionOverloads38.types       |   8 +-
 .../reference/functionOverloads39.types       |   8 +-
 .../reference/functionOverloads42.types       |   8 +-
 .../reference/functionOverloads8.types        |   6 +-
 .../reference/functionOverloads9.types        |   6 +-
 ...nOverloadsRecursiveGenericReturnType.types |   6 +-
 .../baselines/reference/functionReturn.types  |  14 +-
 .../reference/functionReturningItself.types   |   4 +-
 tests/baselines/reference/functionType.types  |   4 +-
 ...thAnyReturnTypeAndNoReturnExpression.types |   2 +-
 ...unctionWithMultipleReturnStatements2.types |  18 +--
 .../funduleUsedAcrossFileBoundary.types       |   8 +-
 .../reference/generatedContextualTyping.types | 120 +++++++--------
 .../generativeRecursionWithTypeOf.types       |   2 +-
 tests/baselines/reference/genericArray0.types |   2 +-
 .../genericArrayPropertyAssignment.types      |   4 +-
 .../genericCallTypeArgumentInference.types    |  12 +-
 .../genericCallWithArrayLiteralArgs.types     |  18 +--
 ...WithConstraintsTypeArgumentInference.types |  16 +-
 .../genericCallWithFixedArguments.types       |   4 +-
 ...enericCallWithFunctionTypedArguments.types |  36 ++---
 ...nericCallWithFunctionTypedArguments2.types |  30 ++--
 ...nericCallWithFunctionTypedArguments3.types |   6 +-
 ...nericCallWithFunctionTypedArguments4.types |   6 +-
 ...ricCallWithGenericSignatureArguments.types |  32 ++--
 ...icCallWithGenericSignatureArguments3.types |  28 ++--
 .../genericCallWithNonGenericArgs1.types      |   4 +-
 .../genericCallWithNonSymmetricSubtypes.types |  22 +--
 .../genericCallWithObjectLiteralArgs.types    |  24 +--
 .../genericCallWithObjectTypeArgs.types       |   6 +-
 .../genericCallWithObjectTypeArgs2.types      |  12 +-
 ...CallWithObjectTypeArgsAndConstraints.types |  12 +-
 ...allWithObjectTypeArgsAndConstraints2.types |  20 +--
 ...ricCallWithObjectTypeArgsAndIndexers.types |   8 +-
 ...lWithObjectTypeArgsAndNumericIndexer.types |  16 +-
 ...llWithObjectTypeArgsAndStringIndexer.types |  16 +-
 ...hOverloadedConstructorTypedArguments.types |  26 ++--
 ...WithOverloadedFunctionTypedArguments.types |  30 ++--
 ...lassWithFunctionTypedMemberArguments.types |   2 +-
 .../genericFunctionHasFreshTypeArgs.types     |   6 +-
 .../genericFunctionSpecializations1.types     |   8 +-
 .../reference/genericFunctions0.types         |   4 +-
 .../reference/genericFunctions1.types         |   4 +-
 .../reference/genericFunctions2.types         |   4 +-
 .../reference/genericFunctions3.types         |   4 +-
 .../reference/genericInference2.types         |  10 +-
 ...stantiationEquivalentToObjectLiteral.types |  12 +-
 ...enericInterfaceFunctionTypeParameter.types |   4 +-
 .../reference/genericOverloadSignatures.types |   6 +-
 .../genericParameterAssignability1.types      |   6 +-
 .../genericTypeParameterEquivalence2.types    |  28 ++--
 .../genericTypeWithCallableMembers2.types     |   4 +-
 .../genericsManyTypeParameters.types          |   2 +-
 .../reference/getterSetterNonAccessor.types   |  16 +-
 tests/baselines/reference/global.types        |   6 +-
 .../heterogeneousArrayLiterals.types          |   8 +-
 tests/baselines/reference/icomparable.types   |   4 +-
 tests/baselines/reference/idInProp.types      |   2 +-
 .../reference/ifDoWhileStatements.types       |  22 +--
 .../implicitAnyAnyReturningFunction.types     |   4 +-
 ...AnyDeclareFunctionWithoutFormalType2.types |   6 +-
 .../reference/implicitAnyGenerics.types       |   6 +-
 tests/baselines/reference/importDecl.types    |  42 +++---
 .../reference/importStatements.types          |   2 +-
 .../inOperatorWithValidOperands.types         |   2 +-
 .../indexSignaturesInferentialTyping.types    |  12 +-
 ...gumentsInSignatureWithRestParameters.types |  16 +-
 .../inferentialTypingWithFunctionType.types   |   8 +-
 .../inferentialTypingWithFunctionType2.types  |   4 +-
 ...erentialTypingWithFunctionTypeNested.types |  14 +-
 ...ngWithFunctionTypeSyntacticScenarios.types |  70 ++++-----
 .../inferentiallyTypingAnEmptyArray.types     |   4 +-
 ...nfiniteExpansionThroughTypeInference.types |   4 +-
 .../reference/infinitelyExpandingTypes5.types |   6 +-
 ...finitelyExpandingTypesNonGenericBase.types |   4 +-
 ...ritedFunctionAssignmentCompatibility.types |   6 +-
 tests/baselines/reference/innerAliases2.types |   2 +-
 tests/baselines/reference/innerFunc.types     |   4 +-
 .../baselines/reference/innerOverloads.types  |   4 +-
 .../innerTypeArgumentInference.types          |   4 +-
 .../innerTypeParameterShadowingOuterOne.types |   4 +-
 .../instanceOfInExternalModules.types         |   2 +-
 ...anceofOperatorWithLHSIsTypeParameter.types |   2 +-
 .../interMixingModulesInterfaces0.types       |   6 +-
 .../interMixingModulesInterfaces1.types       |   6 +-
 .../interMixingModulesInterfaces2.types       |   2 +-
 .../interMixingModulesInterfaces3.types       |   2 +-
 .../interMixingModulesInterfaces4.types       |   6 +-
 .../interMixingModulesInterfaces5.types       |   6 +-
 .../interfaceWithPropertyOfEveryType.types    |  12 +-
 .../reference/internalAliasFunction.types     |  12 +-
 ...sFunctionInsideLocalModuleWithExport.types |  12 +-
 ...nctionInsideLocalModuleWithoutExport.types |  12 +-
 ...nctionInsideTopLevelModuleWithExport.types |  12 +-
 ...ionInsideTopLevelModuleWithoutExport.types |  12 +-
 .../reference/invalidUndefinedValues.types    |   6 +-
 tests/baselines/reference/lambdaASIEmit.types |   4 +-
 tests/baselines/reference/listFailure.types   |  12 +-
 .../localImportNameVsGlobalName.types         |   8 +-
 ...ocalVariablesReturnedFromCatchBlocks.types |   2 +-
 ...logicalAndOperatorWithTypeParameters.types |   2 +-
 .../logicalNotOperatorWithBooleanType.types   |   6 +-
 .../logicalNotOperatorWithNumberType.types    |   6 +-
 .../logicalNotOperatorWithStringType.types    |   6 +-
 .../logicalOrOperatorWithTypeParameters.types |   6 +-
 .../reference/mergedDeclarations1.types       |   6 +-
 .../mergedModuleDeclarationCodeGen2.types     |   8 +-
 .../mergedModuleDeclarationCodeGen3.types     |   6 +-
 .../mergedModuleDeclarationCodeGen4.types     |   6 +-
 .../mergedModuleDeclarationCodeGen5.types     |  24 +--
 .../methodContainingLocalFunction.types       |   2 +-
 tests/baselines/reference/mixedExports.types  |   6 +-
 .../reference/modFunctionCrash.types          |   6 +-
 .../moduleAliasAsFunctionArgument.types       |   4 +-
 .../reference/moduleCodeGenTest5.types        |   4 +-
 .../moduleMemberWithoutTypeAnnotation1.types  |   6 +-
 .../moduleMemberWithoutTypeAnnotation2.types  |   2 +-
 .../reference/moduleScopingBug.types          |   2 +-
 .../reference/moduleSymbolMerging.types       |   2 +-
 .../reference/moduleUnassignedVariable.types  |   4 +-
 .../reference/moduleVisibilityTest1.types     |  20 +--
 .../moduleWithStatementsOfEveryKind.types     |   4 +-
 .../reference/multiCallOverloads.types        |  10 +-
 .../reference/multiModuleClodule1.types       |  10 +-
 .../reference/multiModuleFundule1.types       |   6 +-
 tests/baselines/reference/mutrec.types        |  12 +-
 .../reference/nameWithRelativePaths.types     |   6 +-
 .../negateOperatorWithAnyOtherType.types      |   4 +-
 .../negateOperatorWithBooleanType.types       |   6 +-
 .../negateOperatorWithNumberType.types        |   6 +-
 .../negateOperatorWithStringType.types        |   6 +-
 tests/baselines/reference/nestedIndexer.types |   2 +-
 .../reference/nestedRecursiveLambda.types     |   4 +-
 .../reference/newOperatorConformance.types    |   8 +-
 ...nThisExpressionAndLocalVarInFunction.types |   2 +-
 ...ionThisExpressionAndLocalVarInLambda.types |   6 +-
 ...isExpressionInFunctionAndVarInGlobal.types |   2 +-
 tests/baselines/reference/noSelfOnVars.types  |   2 +-
 .../reference/nonInstantiatedModule.types     |   2 +-
 tests/baselines/reference/null.types          |   4 +-
 .../reference/nullAssignableToEveryType.types |   2 +-
 ...ullIsSubtypeOfEverythingButUndefined.types |   4 +-
 .../reference/objectLitGetterSetter.types     |   2 +-
 .../objectLiteralArraySpecialization.types    |   4 +-
 .../reference/objectTypesIdentity.types       | 102 ++++++-------
 .../reference/objectTypesIdentity2.types      |  66 ++++-----
 ...bjectTypesIdentityWithCallSignatures.types | 114 +++++++--------
 ...jectTypesIdentityWithCallSignatures2.types | 114 +++++++--------
 ...thCallSignaturesDifferingParamCounts.types | 114 +++++++--------
 ...hCallSignaturesDifferingParamCounts2.types |  48 +++---
 ...ntityWithCallSignaturesWithOverloads.types | 114 +++++++--------
 ...TypesIdentityWithConstructSignatures.types |  96 ++++++------
 ...ypesIdentityWithConstructSignatures2.types |  84 +++++------
 ...structSignaturesDifferingParamCounts.types |  84 +++++------
 ...pesIdentityWithGenericCallSignatures.types | 114 +++++++--------
 ...esIdentityWithGenericCallSignatures2.types | 114 +++++++--------
 ...CallSignaturesDifferingByConstraints.types | 114 +++++++--------
 ...cCallSignaturesDifferingByReturnType.types | 114 +++++++--------
 ...CallSignaturesDifferingByReturnType2.types | 114 +++++++--------
 ...gnaturesDifferingTypeParameterCounts.types | 114 +++++++--------
 ...naturesDifferingTypeParameterCounts2.types |  42 +++---
 ...ignaturesDifferingTypeParameterNames.types | 114 +++++++--------
 ...hGenericCallSignaturesOptionalParams.types | 114 +++++++--------
 ...GenericCallSignaturesOptionalParams2.types | 114 +++++++--------
 ...GenericCallSignaturesOptionalParams3.types | 114 +++++++--------
 ...ructSignaturesDifferingByConstraints.types |  78 +++++-----
 ...tructSignaturesDifferingByReturnType.types |  90 ++++++------
 ...ructSignaturesDifferingByReturnType2.types |  84 +++++------
 ...gnaturesDifferingTypeParameterCounts.types |  78 +++++-----
 ...ignaturesDifferingTypeParameterNames.types |  78 +++++-----
 ...ricConstructSignaturesOptionalParams.types |  78 +++++-----
 ...icConstructSignaturesOptionalParams2.types |  78 +++++-----
 ...icConstructSignaturesOptionalParams3.types |  78 +++++-----
 ...ectTypesIdentityWithNumericIndexers1.types | 138 +++++++++---------
 ...ectTypesIdentityWithNumericIndexers2.types | 138 +++++++++---------
 ...ectTypesIdentityWithNumericIndexers3.types | 138 +++++++++---------
 .../objectTypesIdentityWithOptionality.types  |  54 +++----
 .../objectTypesIdentityWithPrivates.types     | 138 +++++++++---------
 .../objectTypesIdentityWithPrivates2.types    |  40 ++---
 .../objectTypesIdentityWithPublics.types      | 102 ++++++-------
 ...bjectTypesIdentityWithStringIndexers.types | 138 +++++++++---------
 ...jectTypesIdentityWithStringIndexers2.types | 138 +++++++++---------
 .../optionalAccessorsInInterface1.types       |   8 +-
 ...optionalParamReferencingOtherParams1.types |   2 +-
 tests/baselines/reference/overload2.types     |  12 +-
 tests/baselines/reference/overloadCrash.types |   6 +-
 .../overloadGenericFunctionWithRestArgs.types |   4 +-
 .../overloadOnConstConstraintChecks2.types    |   8 +-
 .../overloadOnConstConstraintChecks3.types    |   8 +-
 ...loadOnGenericClassAndNonGenericClass.types |   8 +-
 .../overloadResolutionOverNonCTLambdas.types  |  12 +-
 ...overloadResolutionOverNonCTObjectLit.types |   2 +-
 .../reference/overloadReturnTypes.types       |   8 +-
 ...lbacksWithDifferingOptionalityOnArgs.types |  10 +-
 .../overloadsAndTypeArgumentArity.types       |  12 +-
 .../parametersWithNoAnnotationAreAny.types    |   2 +-
 .../parserFunctionDeclaration1.d.types        |   2 +-
 .../parserFunctionDeclaration5.types          |   4 +-
 .../parserFunctionDeclaration8.types          |   2 +-
 .../reference/parserModuleDeclaration11.types |   6 +-
 .../reference/parserReturnStatement3.types    |   2 +-
 .../parserUnicodeWhitespaceCharacter1.types   |   2 +-
 .../reference/partiallyAmbientClodule.types   |   2 +-
 .../reference/partiallyAmbientFundule.types   |   2 +-
 .../plusOperatorWithBooleanType.types         |   6 +-
 .../plusOperatorWithNumberType.types          |   6 +-
 .../plusOperatorWithStringType.types          |   6 +-
 .../reference/primtiveTypesAreIdentical.types |  44 +++---
 ...ivacyCheckAnonymousFunctionParameter.types |   6 +-
 ...vacyCheckAnonymousFunctionParameter2.types |   6 +-
 tests/baselines/reference/privacyFunc.types   |  30 ++--
 .../baselines/reference/privacyGloFunc.types  |  72 ++++-----
 .../privacyTypeParameterOfFunction.types      |  12 +-
 .../reference/promiseTypeInference.types      |   8 +-
 tests/baselines/reference/rectype.types       |  30 ++--
 .../recursiveComplicatedClasses.types         |   4 +-
 .../recursiveGenericMethodCall.types          |   4 +-
 ...cursiveGenericSignatureInstantiation.types |   4 +-
 ...recursiveIdenticalOverloadResolution.types |  30 ++--
 .../reference/recursiveInference1.types       |   8 +-
 tests/baselines/reference/recursiveMods.types |  14 +-
 .../reference/recursiveReturns.types          |  12 +-
 .../restParameterNoTypeAnnotation.types       |   2 +-
 .../baselines/reference/restParameters.types  |   8 +-
 .../reference/returnStatement1.types          |   2 +-
 .../reference/returnStatements.types          |  24 +--
 .../returnTypeParameterWithModules.types      |  12 +-
 ...seInferenceInContextualInstantiation.types |   4 +-
 .../scopeResolutionIdentifiers.types          |   2 +-
 tests/baselines/reference/separate1-2.types   |   2 +-
 .../sourceMap-FileWithComments.types          |   2 +-
 .../sourceMapValidationClasses.types          |   6 +-
 .../sourceMapValidationFunctions.types        |   6 +-
 .../reference/sourceMapValidationModule.types |   2 +-
 ...cializationsShouldNotAffectEachOther.types |   2 +-
 .../reference/specializeVarArgs1.types        |   4 +-
 ...reIsSubtypeOfNonSpecializedSignature.types |   6 +-
 .../reference/staticInheritance.types         |  10 +-
 tests/baselines/reference/stradac.types       |   2 +-
 tests/baselines/reference/strictMode2.types   |   2 +-
 tests/baselines/reference/strictMode3.types   |   2 +-
 tests/baselines/reference/strictMode5.types   |   4 +-
 tests/baselines/reference/structural1.types   |   4 +-
 .../subtypingWithCallSignatures.types         |  16 +-
 .../subtypingWithCallSignatures2.types        | 108 +++++++-------
 .../subtypingWithCallSignatures3.types        |  68 ++++-----
 .../subtypingWithCallSignatures4.types        |  66 ++++-----
 .../subtypingWithConstructSignatures.types    |  16 +-
 .../subtypingWithConstructSignatures2.types   | 108 +++++++-------
 .../subtypingWithConstructSignatures3.types   |  68 ++++-----
 .../subtypingWithConstructSignatures4.types   |  66 ++++-----
 .../subtypingWithOptionalProperties.types     |   4 +-
 tests/baselines/reference/superCalls.types    |   4 +-
 .../reference/switchFallThroughs.types        |   2 +-
 .../reference/switchStatements.types          |   6 +-
 .../baselines/reference/targetTypeArgs.types  |   4 +-
 .../targetTypeObjectLiteralToAny.types        |   2 +-
 .../baselines/reference/targetTypeTest2.types |   6 +-
 tests/baselines/reference/thisBinding2.types  |   4 +-
 .../thisExpressionInIndexExpression.types     |   2 +-
 .../reference/thisInInnerFunctions.types      |   2 +-
 tests/baselines/reference/thisInLambda.types  |   6 +-
 .../reference/thisInModuleFunction1.types     |   6 +-
 ...rencedInFunctionInsideArrowFunction1.types |   2 +-
 .../throwInEnclosingStatements.types          |   2 +-
 .../baselines/reference/throwStatements.types |  20 +--
 .../baselines/reference/topLevelExports.types |   4 +-
 .../baselines/reference/topLevelLambda2.types |   4 +-
 tests/baselines/reference/tryStatements.types |   2 +-
 .../reference/typeArgInference2.types         |  14 +-
 .../reference/typeArgInferenceWithNull.types  |  12 +-
 .../reference/typeArgumentInference.types     | 106 +++++++-------
 .../typeArgumentInferenceOrdering.types       |   4 +-
 ...tInferenceWithConstraintAsCommonRoot.types |   4 +-
 ...ssionWithUndefinedCallResolutionData.types |   6 +-
 .../typeInferenceConflictingCandidates.types  |   4 +-
 .../reference/typeInferenceFixEarly.types     |   4 +-
 .../typeInferenceWithTypeAnnotation.types     |   4 +-
 .../typeOfThisInFunctionExpression.types      |   4 +-
 .../typeParameterAndArgumentOfSameName1.types |   2 +-
 .../typeParameterAsElementType.types          |   2 +-
 .../typeParameterAsTypeArgument.types         |   4 +-
 ...sTypeParameterConstraintTransitively.types |  20 +--
 ...TypeParameterConstraintTransitively2.types |  18 +--
 ...peParametersAreIdenticalToThemselves.types |  14 +-
 ...ypeParametersAvailableInNestedScope2.types |   2 +-
 .../typeofOperatorWithBooleanType.types       |   8 +-
 .../typeofOperatorWithNumberType.types        |   8 +-
 .../typeofOperatorWithStringType.types        |   8 +-
 .../reference/uncaughtCompilerError1.types    |   2 +-
 .../undefinedArgumentInference.types          |   4 +-
 .../undefinedAssignableToEveryType.types      |   2 +-
 .../undefinedInferentialTyping.types          |   4 +-
 .../reference/underscoreMapFirst.types        |  18 +--
 .../baselines/reference/underscoreTest1.types |  26 ++--
 .../untypedArgumentInLambdaExpression.types   |   4 +-
 .../reference/unusedImportDeclaration.types   |   4 +-
 .../validMultipleVariableDeclarations.types   |   2 +-
 .../reference/validUndefinedAssignments.types |   2 +-
 .../reference/varArgParamTypeCheck.types      |  10 +-
 tests/baselines/reference/vardecl.types       |   2 +-
 .../visibilityOfCrossModuleTypeUsage.types    |   2 +-
 .../voidFunctionAssignmentCompat.types        |   8 +-
 .../voidOperatorWithBooleanType.types         |   6 +-
 .../voidOperatorWithNumberType.types          |   6 +-
 .../voidOperatorWithStringType.types          |   6 +-
 .../reference/voidReturnLambdaValue.types     |   2 +-
 .../baselines/reference/withImportDecl.types  |   4 +-
 468 files changed, 4147 insertions(+), 4147 deletions(-)

diff --git a/src/harness/typeWriter.ts b/src/harness/typeWriter.ts
index 953e3413a93..a3b23d10f14 100644
--- a/src/harness/typeWriter.ts
+++ b/src/harness/typeWriter.ts
@@ -86,7 +86,7 @@ class TypeWriterWalker {
             column: lineAndCharacter.character,
             syntaxKind: ts.SyntaxKind[node.kind],
             sourceText: sourceText,
-            type: this.checker.typeToString(type, node.parent, ts.TypeFormatFlags.UseTypeOfFunction)
+            type: this.checker.typeToString(type, node.parent, ts.TypeFormatFlags.None)
         });
     }
 
diff --git a/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.types b/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.types
index 51bd20fea92..3ea1919ecae 100644
--- a/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.types
+++ b/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.types
@@ -18,7 +18,7 @@ module Point {
 >Point : typeof Point
 
     function Origin() { return ""; }// not an error, since not exported
->Origin : typeof Origin
+>Origin : () => string
 }
 
 
@@ -44,6 +44,6 @@ module A {
 >Point : typeof Point
 
         function Origin() { return ""; }// not an error since not exported
->Origin : typeof Origin
+>Origin : () => string
     }
 }
diff --git a/tests/baselines/reference/ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.types b/tests/baselines/reference/ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.types
index fe2fea1b7a6..ac1845a533c 100644
--- a/tests/baselines/reference/ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.types
+++ b/tests/baselines/reference/ExportFunctionWithAccessibleTypesInParameterAndReturnTypeAnnotation.types
@@ -23,7 +23,7 @@ module A {
     }
 
     export function fromOrigin(p: Point): Line {
->fromOrigin : typeof fromOrigin
+>fromOrigin : (p: Point) => Line
 >p : Point
 >Point : Point
 >Line : Line
diff --git a/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.types b/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.types
index 36c78cd700a..3f3a670ee8e 100644
--- a/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.types
+++ b/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInParameterTypeAnnotation.types
@@ -23,7 +23,7 @@ module A {
     }
 
     export function fromOrigin(p: Point): Line {
->fromOrigin : typeof fromOrigin
+>fromOrigin : (p: Point) => Line
 >p : Point
 >Point : Point
 >Line : Line
diff --git a/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.types b/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.types
index 5d59aa10039..7634e2cde3e 100644
--- a/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.types
+++ b/tests/baselines/reference/ExportFunctionWithInaccessibleTypesInReturnTypeAnnotation.types
@@ -23,7 +23,7 @@ module A {
     }
 
     export function fromOrigin(p: Point): Line {
->fromOrigin : typeof fromOrigin
+>fromOrigin : (p: Point) => Line
 >p : Point
 >Point : Point
 >Line : Line
diff --git a/tests/baselines/reference/FunctionAndModuleWithSameNameAndDifferentCommonRoot.types b/tests/baselines/reference/FunctionAndModuleWithSameNameAndDifferentCommonRoot.types
index 24174ebad50..879088f93df 100644
--- a/tests/baselines/reference/FunctionAndModuleWithSameNameAndDifferentCommonRoot.types
+++ b/tests/baselines/reference/FunctionAndModuleWithSameNameAndDifferentCommonRoot.types
@@ -3,7 +3,7 @@ module A {
 >A : typeof A
 
     export function Point() {
->Point : typeof Point
+>Point : () => { x: number; y: number; }
 
         return { x: 0, y: 0 };
 >{ x: 0, y: 0 } : { x: number; y: number; }
@@ -35,9 +35,9 @@ var fn: () => { x: number; y: number };
 
 var fn = A.Point;
 >fn : () => { x: number; y: number; }
->A.Point : typeof A.Point
+>A.Point : () => { x: number; y: number; }
 >A : typeof A
->Point : typeof A.Point
+>Point : () => { x: number; y: number; }
 
 var cl: { x: number; y: number; }
 >cl : { x: number; y: number; }
diff --git a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedLocalVarsOfTheSameName.types b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedLocalVarsOfTheSameName.types
index 135eeae57b7..003fb5fa15a 100644
--- a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedLocalVarsOfTheSameName.types
+++ b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedAndNonExportedLocalVarsOfTheSameName.types
@@ -16,7 +16,7 @@ module A {
 >Utils : typeof Utils
 
         export function mirror<T extends Point>(p: T) {
->mirror : typeof mirror
+>mirror : <T extends Point>(p: T) => { x: number; y: number; }
 >T : T
 >Point : Point
 >p : T
@@ -87,11 +87,11 @@ var o = A.Origin;
 var o = A.Utils.mirror(o);
 >o : { x: number; y: number; }
 >A.Utils.mirror(o) : { x: number; y: number; }
->A.Utils.mirror : typeof A.Utils.mirror
+>A.Utils.mirror : <T extends A.Point>(p: T) => { x: number; y: number; }
 >A.Utils : typeof A.Utils
 >A : typeof A
 >Utils : typeof A.Utils
->mirror : typeof A.Utils.mirror
+>mirror : <T extends A.Point>(p: T) => { x: number; y: number; }
 >o : { x: number; y: number; }
 
 var p: { tl: A.Point; br: A.Point };
diff --git a/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndDifferentCommonRoot.types b/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndDifferentCommonRoot.types
index 59cdbf6f50e..b31bb4b22ac 100644
--- a/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndDifferentCommonRoot.types
+++ b/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndDifferentCommonRoot.types
@@ -19,7 +19,7 @@ module Root {
 >Utils : typeof Utils
 
             export function mirror<T extends Point>(p: T) {
->mirror : typeof mirror
+>mirror : <T extends Point>(p: T) => { x: number; y: number; }
 >T : T
 >Point : Point
 >p : T
diff --git a/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndSameCommonRoot.types b/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndSameCommonRoot.types
index 4f58b36c5e6..b13cbde5522 100644
--- a/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndSameCommonRoot.types
+++ b/tests/baselines/reference/TwoInternalModulesWithTheSameNameAndSameCommonRoot.types
@@ -16,7 +16,7 @@ module A {
 >Utils : typeof Utils
 
         export function mirror<T extends Point>(p: T) {
->mirror : typeof mirror
+>mirror : <T extends Point>(p: T) => { x: number; y: number; }
 >T : T
 >Point : Point
 >p : T
@@ -84,11 +84,11 @@ var o = A.Origin;
 var o = A.Utils.mirror(o);
 >o : { x: number; y: number; }
 >A.Utils.mirror(o) : { x: number; y: number; }
->A.Utils.mirror : typeof A.Utils.mirror
+>A.Utils.mirror : <T extends A.Point>(p: T) => { x: number; y: number; }
 >A.Utils : typeof A.Utils
 >A : typeof A
 >Utils : typeof A.Utils
->mirror : typeof A.Utils.mirror
+>mirror : <T extends A.Point>(p: T) => { x: number; y: number; }
 >o : { x: number; y: number; }
 
 var p: { tl: A.Point; br: A.Point };
diff --git a/tests/baselines/reference/additionOperatorWithAnyAndEveryType.types b/tests/baselines/reference/additionOperatorWithAnyAndEveryType.types
index f3fa9fad181..da534c68ad6 100644
--- a/tests/baselines/reference/additionOperatorWithAnyAndEveryType.types
+++ b/tests/baselines/reference/additionOperatorWithAnyAndEveryType.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/expressions/binaryOperators/additionOperator/additionOperatorWithAnyAndEveryType.ts ===
 function foo() { }
->foo : typeof foo
+>foo : () => void
 
 class C {
 >C : C
@@ -98,14 +98,14 @@ var r10 = a + foo;
 >r10 : any
 >a + foo : any
 >a : any
->foo : typeof foo
+>foo : () => void
 
 var r11 = a + foo();
 >r11 : any
 >a + foo() : any
 >a : any
 >foo() : void
->foo : typeof foo
+>foo : () => void
 
 var r12 = a + C;
 >r12 : any
diff --git a/tests/baselines/reference/aliasUsageInGenericFunction.types b/tests/baselines/reference/aliasUsageInGenericFunction.types
index d3d0814ed66..cf63eba6a61 100644
--- a/tests/baselines/reference/aliasUsageInGenericFunction.types
+++ b/tests/baselines/reference/aliasUsageInGenericFunction.types
@@ -14,7 +14,7 @@ interface IHasVisualizationModel {
 >Model : typeof Backbone.Model
 }
 function foo<T extends { a: IHasVisualizationModel }>(x: T) {
->foo : typeof foo
+>foo : <T extends { a: IHasVisualizationModel; }>(x: T) => T
 >T : T
 >a : IHasVisualizationModel
 >IHasVisualizationModel : IHasVisualizationModel
@@ -27,7 +27,7 @@ function foo<T extends { a: IHasVisualizationModel }>(x: T) {
 var r = foo({ a: moduleA });
 >r : { a: typeof moduleA; }
 >foo({ a: moduleA }) : { a: typeof moduleA; }
->foo : typeof foo
+>foo : <T extends { a: IHasVisualizationModel; }>(x: T) => T
 >{ a: moduleA } : { a: typeof moduleA; }
 >a : typeof moduleA
 >moduleA : typeof moduleA
@@ -35,7 +35,7 @@ var r = foo({ a: moduleA });
 var r2 = foo({ a: <IHasVisualizationModel>null });
 >r2 : { a: IHasVisualizationModel; }
 >foo({ a: <IHasVisualizationModel>null }) : { a: IHasVisualizationModel; }
->foo : typeof foo
+>foo : <T extends { a: IHasVisualizationModel; }>(x: T) => T
 >{ a: <IHasVisualizationModel>null } : { a: IHasVisualizationModel; }
 >a : IHasVisualizationModel
 ><IHasVisualizationModel>null : IHasVisualizationModel
diff --git a/tests/baselines/reference/aliasUsedAsNameValue.types b/tests/baselines/reference/aliasUsedAsNameValue.types
index 5b687138341..b8d92f28496 100644
--- a/tests/baselines/reference/aliasUsedAsNameValue.types
+++ b/tests/baselines/reference/aliasUsedAsNameValue.types
@@ -14,9 +14,9 @@ export var a = function () {
     //var x = mod.id; // TODO needed hack that mod is loaded
     b.b(mod);
 >b.b(mod) : any
->b.b : typeof b.b
+>b.b : (a: any) => any
 >b : typeof b
->b : typeof b.b
+>b : (a: any) => any
 >mod : typeof mod
 }
 
@@ -26,6 +26,6 @@ export var id: number;
 
 === tests/cases/compiler/aliasUsedAsNameValue_1.ts ===
 export function b(a: any): any { return null; }
->b : typeof b
+>b : (a: any) => any
 >a : any
 
diff --git a/tests/baselines/reference/ambientDeclarations.types b/tests/baselines/reference/ambientDeclarations.types
index 261952c284e..38814405521 100644
--- a/tests/baselines/reference/ambientDeclarations.types
+++ b/tests/baselines/reference/ambientDeclarations.types
@@ -9,50 +9,50 @@ declare var m: string;
 
 // Ambient function with no type annotations
 declare function fn1();
->fn1 : typeof fn1
+>fn1 : () => any
 
 // Ambient function with type annotations
 declare function fn2(n: string): number;
->fn2 : typeof fn2
+>fn2 : (n: string) => number
 >n : string
 
 // Ambient function with valid overloads
 declare function fn3(n: string): number;
->fn3 : typeof fn3
+>fn3 : (n: string) => number
 >n : string
 
 declare function fn4(n: number, y: number): string;
->fn4 : typeof fn4
+>fn4 : (n: number, y: number) => string
 >n : number
 >y : number
 
 // Ambient function with optional parameters
 declare function fn5(x, y?);
->fn5 : typeof fn5
+>fn5 : (x: any, y?: any) => any
 >x : any
 >y : any
 
 declare function fn6(e?);
->fn6 : typeof fn6
+>fn6 : (e?: any) => any
 >e : any
 
 declare function fn7(x, y?, ...z);
->fn7 : typeof fn7
+>fn7 : (x: any, y?: any, ...z: any[]) => any
 >x : any
 >y : any
 >z : any[]
 
 declare function fn8(y?, ...z: number[]);
->fn8 : typeof fn8
+>fn8 : (y?: any, ...z: number[]) => any
 >y : any
 >z : number[]
 
 declare function fn9(...q: {}[]);
->fn9 : typeof fn9
+>fn9 : (...q: {}[]) => any
 >q : {}[]
 
 declare function fn10<T>(...q: T[]);
->fn10 : typeof fn10
+>fn10 : <T>(...q: T[]) => any
 >T : T
 >q : T[]
 >T : T
@@ -141,7 +141,7 @@ declare module M1 {
 >x : any
 
     function fn(): number;
->fn : typeof fn
+>fn : () => number
 }
 
 // Ambient module members are always exported with or without export keyword
@@ -154,9 +154,9 @@ var p = M1.x;
 var q = M1.fn();
 >q : number
 >M1.fn() : number
->M1.fn : typeof M1.fn
+>M1.fn : () => number
 >M1 : typeof M1
->fn : typeof M1.fn
+>fn : () => number
 
 // Ambient external module in the global module
 // Ambient external module with a string literal name that is a top level external module name
diff --git a/tests/baselines/reference/ambientModuleExports.types b/tests/baselines/reference/ambientModuleExports.types
index 9bc8fb57ebe..3f096afa838 100644
--- a/tests/baselines/reference/ambientModuleExports.types
+++ b/tests/baselines/reference/ambientModuleExports.types
@@ -3,7 +3,7 @@ declare module Foo {
 >Foo : typeof Foo
 
 	function a():void;
->a : typeof a
+>a : () => void
 
 	var b:number;
 >b : number
@@ -14,9 +14,9 @@ declare module Foo {
 
 Foo.a();
 >Foo.a() : void
->Foo.a : typeof Foo.a
+>Foo.a : () => void
 >Foo : typeof Foo
->a : typeof Foo.a
+>a : () => void
 
 Foo.b;
 >Foo.b : number
@@ -34,7 +34,7 @@ declare module Foo2 {
 >Foo2 : typeof Foo2
 
     export function a(): void;
->a : typeof a
+>a : () => void
 
     export var b: number;
 >b : number
@@ -45,9 +45,9 @@ declare module Foo2 {
 
 Foo2.a();
 >Foo2.a() : void
->Foo2.a : typeof Foo2.a
+>Foo2.a : () => void
 >Foo2 : typeof Foo2
->a : typeof Foo2.a
+>a : () => void
 
 Foo2.b;
 >Foo2.b : number
diff --git a/tests/baselines/reference/ambiguousOverloadResolution.types b/tests/baselines/reference/ambiguousOverloadResolution.types
index 17ce79db6f1..dd42b44d7c3 100644
--- a/tests/baselines/reference/ambiguousOverloadResolution.types
+++ b/tests/baselines/reference/ambiguousOverloadResolution.types
@@ -8,14 +8,14 @@ class B extends A { x: number; }
 >x : number
 
 declare function f(p: A, q: B): number;
->f : typeof f
+>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 : typeof f
+>f : { (p: A, q: B): number; (p: B, q: A): string; }
 >p : B
 >B : B
 >q : A
@@ -28,7 +28,7 @@ var x: B;
 var t: number = f(x, x); // Not an error
 >t : number
 >f(x, x) : number
->f : typeof f
+>f : { (p: A, q: B): number; (p: B, q: A): string; }
 >x : B
 >x : B
 
diff --git a/tests/baselines/reference/anyAsReturnTypeForNewOnCall.types b/tests/baselines/reference/anyAsReturnTypeForNewOnCall.types
index e95e692c34d..f25cd57831b 100644
--- a/tests/baselines/reference/anyAsReturnTypeForNewOnCall.types
+++ b/tests/baselines/reference/anyAsReturnTypeForNewOnCall.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/anyAsReturnTypeForNewOnCall.ts ===
 function Point(x, y) {
->Point : typeof Point
+>Point : (x: any, y: any) => void
 >x : any
 >y : any
 
@@ -23,7 +23,7 @@ function Point(x, y) {
 var o = new Point(3, 4);
 >o : any
 >new Point(3, 4) : any
->Point : typeof Point
+>Point : (x: any, y: any) => void
 
 var xx = o.x;
 >xx : any
diff --git a/tests/baselines/reference/anyAssignabilityInInheritance.types b/tests/baselines/reference/anyAssignabilityInInheritance.types
index 795e4a1f332..f5a4f22ef3f 100644
--- a/tests/baselines/reference/anyAssignabilityInInheritance.types
+++ b/tests/baselines/reference/anyAssignabilityInInheritance.types
@@ -15,107 +15,107 @@ var a: any;
 >a : any
 
 declare function foo2(x: number): number;
->foo2 : typeof foo2
+>foo2 : { (x: number): number; (x: any): any; }
 >x : number
 
 declare function foo2(x: any): any;
->foo2 : typeof foo2
+>foo2 : { (x: number): number; (x: any): any; }
 >x : any
 
 var r3 = foo2(a); // any, not a subtype of number so it skips that overload, is a subtype of itself so it picks second (if truly ambiguous it would pick first overload)
 >r3 : any
 >foo2(a) : any
->foo2 : typeof foo2
+>foo2 : { (x: number): number; (x: any): any; }
 >a : any
 
 declare function foo3(x: string): string;
->foo3 : typeof foo3
+>foo3 : { (x: string): string; (x: any): any; }
 >x : string
 
 declare function foo3(x: any): any;
->foo3 : typeof foo3
+>foo3 : { (x: string): string; (x: any): any; }
 >x : any
 
 var r3 = foo3(a); // any
 >r3 : any
 >foo3(a) : any
->foo3 : typeof foo3
+>foo3 : { (x: string): string; (x: any): any; }
 >a : any
 
 declare function foo4(x: boolean): boolean;
->foo4 : typeof foo4
+>foo4 : { (x: boolean): boolean; (x: any): any; }
 >x : boolean
 
 declare function foo4(x: any): any;
->foo4 : typeof foo4
+>foo4 : { (x: boolean): boolean; (x: any): any; }
 >x : any
 
 var r3 = foo3(a); // any
 >r3 : any
 >foo3(a) : any
->foo3 : typeof foo3
+>foo3 : { (x: string): string; (x: any): any; }
 >a : any
 
 declare function foo5(x: Date): Date;
->foo5 : typeof foo5
+>foo5 : { (x: Date): Date; (x: any): any; }
 >x : Date
 >Date : Date
 >Date : Date
 
 declare function foo5(x: any): any;
->foo5 : typeof foo5
+>foo5 : { (x: Date): Date; (x: any): any; }
 >x : any
 
 var r3 = foo3(a); // any
 >r3 : any
 >foo3(a) : any
->foo3 : typeof foo3
+>foo3 : { (x: string): string; (x: any): any; }
 >a : any
 
 declare function foo6(x: RegExp): RegExp;
->foo6 : typeof foo6
+>foo6 : { (x: RegExp): RegExp; (x: any): any; }
 >x : RegExp
 >RegExp : RegExp
 >RegExp : RegExp
 
 declare function foo6(x: any): any;
->foo6 : typeof foo6
+>foo6 : { (x: RegExp): RegExp; (x: any): any; }
 >x : any
 
 var r3 = foo3(a); // any
 >r3 : any
 >foo3(a) : any
->foo3 : typeof foo3
+>foo3 : { (x: string): string; (x: any): any; }
 >a : any
 
 declare function foo7(x: { bar: number }): { bar: number };
->foo7 : typeof foo7
+>foo7 : { (x: { bar: number; }): { bar: number; }; (x: any): any; }
 >x : { bar: number; }
 >bar : number
 >bar : number
 
 declare function foo7(x: any): any;
->foo7 : typeof foo7
+>foo7 : { (x: { bar: number; }): { bar: number; }; (x: any): any; }
 >x : any
 
 var r3 = foo3(a); // any
 >r3 : any
 >foo3(a) : any
->foo3 : typeof foo3
+>foo3 : { (x: string): string; (x: any): any; }
 >a : any
 
 declare function foo8(x: number[]): number[];
->foo8 : typeof foo8
+>foo8 : { (x: number[]): number[]; (x: any): any; }
 >x : number[]
 
 declare function foo8(x: any): any;
->foo8 : typeof foo8
+>foo8 : { (x: number[]): number[]; (x: any): any; }
 >x : any
 
 var r3 = foo3(a); // any
 >r3 : any
 >foo3(a) : any
->foo3 : typeof foo3
+>foo3 : { (x: string): string; (x: any): any; }
 >a : any
 
 interface I8 { foo: string }
@@ -123,19 +123,19 @@ interface I8 { foo: string }
 >foo : string
 
 declare function foo9(x: I8): I8;
->foo9 : typeof foo9
+>foo9 : { (x: I8): I8; (x: any): any; }
 >x : I8
 >I8 : I8
 >I8 : I8
 
 declare function foo9(x: any): any;
->foo9 : typeof foo9
+>foo9 : { (x: I8): I8; (x: any): any; }
 >x : any
 
 var r3 = foo3(a); // any
 >r3 : any
 >foo3(a) : any
->foo3 : typeof foo3
+>foo3 : { (x: string): string; (x: any): any; }
 >a : any
 
 class A { foo: number; }
@@ -143,19 +143,19 @@ class A { foo: number; }
 >foo : number
 
 declare function foo10(x: A): A;
->foo10 : typeof foo10
+>foo10 : { (x: A): A; (x: any): any; }
 >x : A
 >A : A
 >A : A
 
 declare function foo10(x: any): any;
->foo10 : typeof foo10
+>foo10 : { (x: A): A; (x: any): any; }
 >x : any
 
 var r3 = foo3(a); // any
 >r3 : any
 >foo3(a) : any
->foo3 : typeof foo3
+>foo3 : { (x: string): string; (x: any): any; }
 >a : any
 
 class A2<T> { foo: T; }
@@ -165,39 +165,39 @@ class A2<T> { foo: T; }
 >T : T
 
 declare function foo11(x: A2<string>): A2<string>;
->foo11 : typeof foo11
+>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 : typeof foo11
+>foo11 : { (x: A2<string>): A2<string>; (x: any): any; }
 >x : any
 
 var r3 = foo3(a); // any
 >r3 : any
 >foo3(a) : any
->foo3 : typeof foo3
+>foo3 : { (x: string): string; (x: any): any; }
 >a : any
 
 declare function foo12(x: (x) => number): (x) => number;
->foo12 : typeof foo12
+>foo12 : { (x: (x: any) => number): (x: any) => number; (x: any): any; }
 >x : (x: any) => number
 >x : any
 >x : any
 
 declare function foo12(x: any): any;
->foo12 : typeof foo12
+>foo12 : { (x: (x: any) => number): (x: any) => number; (x: any): any; }
 >x : any
 
 var r3 = foo3(a); // any
 >r3 : any
 >foo3(a) : any
->foo3 : typeof foo3
+>foo3 : { (x: string): string; (x: any): any; }
 >a : any
 
 declare function foo13(x: <T>(x: T) => T): <T>(x: T) => T;
->foo13 : typeof foo13
+>foo13 : { (x: <T>(x: T) => T): <T>(x: T) => T; (x: any): any; }
 >x : <T>(x: T) => T
 >T : T
 >x : T
@@ -209,13 +209,13 @@ declare function foo13(x: <T>(x: T) => T): <T>(x: T) => T;
 >T : T
 
 declare function foo13(x: any): any;
->foo13 : typeof foo13
+>foo13 : { (x: <T>(x: T) => T): <T>(x: T) => T; (x: any): any; }
 >x : any
 
 var r3 = foo3(a); // any
 >r3 : any
 >foo3(a) : any
->foo3 : typeof foo3
+>foo3 : { (x: string): string; (x: any): any; }
 >a : any
 
 enum E { A }
@@ -223,19 +223,19 @@ enum E { A }
 >A : E
 
 declare function foo14(x: E): E;
->foo14 : typeof foo14
+>foo14 : { (x: E): E; (x: any): any; }
 >x : E
 >E : E
 >E : E
 
 declare function foo14(x: any): any;
->foo14 : typeof foo14
+>foo14 : { (x: E): E; (x: any): any; }
 >x : any
 
 var r3 = foo3(a); // any
 >r3 : any
 >foo3(a) : any
->foo3 : typeof foo3
+>foo3 : { (x: string): string; (x: any): any; }
 >a : any
 
 function f() { }
@@ -248,19 +248,19 @@ module f {
 >bar : number
 }
 declare function foo15(x: typeof f): typeof f;
->foo15 : typeof foo15
+>foo15 : { (x: typeof f): typeof f; (x: any): any; }
 >x : typeof f
 >f : typeof f
 >f : typeof f
 
 declare function foo15(x: any): any;
->foo15 : typeof foo15
+>foo15 : { (x: typeof f): typeof f; (x: any): any; }
 >x : any
 
 var r3 = foo3(a); // any
 >r3 : any
 >foo3(a) : any
->foo3 : typeof foo3
+>foo3 : { (x: string): string; (x: any): any; }
 >a : any
 
 class CC { baz: string }
@@ -274,48 +274,48 @@ module CC {
 >bar : number
 }
 declare function foo16(x: CC): CC;
->foo16 : typeof foo16
+>foo16 : { (x: CC): CC; (x: any): any; }
 >x : CC
 >CC : CC
 >CC : CC
 
 declare function foo16(x: any): any;
->foo16 : typeof foo16
+>foo16 : { (x: CC): CC; (x: any): any; }
 >x : any
 
 var r3 = foo3(a); // any
 >r3 : any
 >foo3(a) : any
->foo3 : typeof foo3
+>foo3 : { (x: string): string; (x: any): any; }
 >a : any
 
 declare function foo17(x: Object): Object;
->foo17 : typeof foo17
+>foo17 : { (x: Object): Object; (x: any): any; }
 >x : Object
 >Object : Object
 >Object : Object
 
 declare function foo17(x: any): any;
->foo17 : typeof foo17
+>foo17 : { (x: Object): Object; (x: any): any; }
 >x : any
 
 var r3 = foo3(a); // any
 >r3 : any
 >foo3(a) : any
->foo3 : typeof foo3
+>foo3 : { (x: string): string; (x: any): any; }
 >a : any
 
 declare function foo18(x: {}): {};
->foo18 : typeof foo18
+>foo18 : { (x: {}): {}; (x: any): any; }
 >x : {}
 
 declare function foo18(x: any): any;
->foo18 : typeof foo18
+>foo18 : { (x: {}): {}; (x: any): any; }
 >x : any
 
 var r3 = foo3(a); // any
 >r3 : any
 >foo3(a) : any
->foo3 : typeof foo3
+>foo3 : { (x: string): string; (x: any): any; }
 >a : any
 
diff --git a/tests/baselines/reference/anyAssignableToEveryType.types b/tests/baselines/reference/anyAssignableToEveryType.types
index 36c24c6ac3d..c2a9b324d96 100644
--- a/tests/baselines/reference/anyAssignableToEveryType.types
+++ b/tests/baselines/reference/anyAssignableToEveryType.types
@@ -121,7 +121,7 @@ var q: String = a;
 >a : any
 
 function foo<T, U /*extends T*/, V extends Date>(x: T, y: U, z: V) {
->foo : typeof foo
+>foo : <T, U, V extends Date>(x: T, y: U, z: V) => void
 >T : T
 >U : U
 >V : V
diff --git a/tests/baselines/reference/arguments.types b/tests/baselines/reference/arguments.types
index 5adaf29a8ba..1902e459316 100644
--- a/tests/baselines/reference/arguments.types
+++ b/tests/baselines/reference/arguments.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/arguments.ts ===
 function f() {
->f : typeof f
+>f : () => void
 
     var x=arguments[12];
 >x : any
diff --git a/tests/baselines/reference/arrayLiteralInNonVarArgParameter.types b/tests/baselines/reference/arrayLiteralInNonVarArgParameter.types
index 9afd479dc7f..c4889e223bb 100644
--- a/tests/baselines/reference/arrayLiteralInNonVarArgParameter.types
+++ b/tests/baselines/reference/arrayLiteralInNonVarArgParameter.types
@@ -1,11 +1,11 @@
 === tests/cases/compiler/arrayLiteralInNonVarArgParameter.ts ===
 function panic(val: string[], ...opt: string[]) { }
->panic : typeof panic
+>panic : (val: string[], ...opt: string[]) => void
 >val : string[]
 >opt : string[]
 
 panic([], 'one', 'two');
 >panic([], 'one', 'two') : void
->panic : typeof panic
+>panic : (val: string[], ...opt: string[]) => void
 >[] : string[]
 
diff --git a/tests/baselines/reference/arrowFunctionExpressions.types b/tests/baselines/reference/arrowFunctionExpressions.types
index 8a27de65225..5807f6d6a7d 100644
--- a/tests/baselines/reference/arrowFunctionExpressions.types
+++ b/tests/baselines/reference/arrowFunctionExpressions.types
@@ -118,7 +118,7 @@ var e: number;
 
 // Arrow function used in arrow function used in function
 function someFn() {
->someFn : typeof someFn
+>someFn : () => void
 
     var arr = (n: number) => (p: number) => p * n;
 >arr : (n: number) => (p: number) => number
@@ -141,7 +141,7 @@ function someFn() {
 
 // Arrow function used in function
 function someOtherFn() {
->someOtherFn : typeof someOtherFn
+>someOtherFn : () => void
 
     var arr = (n: number) => '' + n;
 >arr : (n: number) => string
@@ -160,7 +160,7 @@ function someOtherFn() {
 
 // Arrow function used in nested function in function
 function outerFn() {
->outerFn : typeof outerFn
+>outerFn : () => void
 
     function innerFn() {
 >innerFn : () => void
@@ -211,7 +211,7 @@ var g: string;
 
 // Arrow function used in nested function in arrow function in nested function
 function someOuterFn() {
->someOuterFn : typeof someOuterFn
+>someOuterFn : () => (n: string) => () => () => number
 
     var arr = (n: string) => {
 >arr : (n: string) => () => () => number
@@ -239,7 +239,7 @@ var h = someOuterFn()('')()();
 >someOuterFn()('')() : () => number
 >someOuterFn()('') : () => () => number
 >someOuterFn() : (n: string) => () => () => number
->someOuterFn : typeof someOuterFn
+>someOuterFn : () => (n: string) => () => () => number
 
 h.toExponential();
 >h.toExponential() : string
@@ -249,7 +249,7 @@ h.toExponential();
 
 // Arrow function used in try/catch/finally in function
 function tryCatchFn() {
->tryCatchFn : typeof tryCatchFn
+>tryCatchFn : () => void
 
     try {
         var x = () => this;
diff --git a/tests/baselines/reference/asiAmbientFunctionDeclaration.types b/tests/baselines/reference/asiAmbientFunctionDeclaration.types
index 63d2c18f44a..40ad7f2ba94 100644
--- a/tests/baselines/reference/asiAmbientFunctionDeclaration.types
+++ b/tests/baselines/reference/asiAmbientFunctionDeclaration.types
@@ -1,4 +1,4 @@
 === tests/cases/compiler/asiAmbientFunctionDeclaration.ts ===
 declare function foo()
->foo : typeof foo
+>foo : () => any
 
diff --git a/tests/baselines/reference/assignEveryTypeToAny.types b/tests/baselines/reference/assignEveryTypeToAny.types
index 379d705cc4b..b25aba00837 100644
--- a/tests/baselines/reference/assignEveryTypeToAny.types
+++ b/tests/baselines/reference/assignEveryTypeToAny.types
@@ -150,7 +150,7 @@ x = { f<T>(x: T) { return x; } }
 >x : T
 
 function j<T>(a: T) {
->j : typeof j
+>j : <T>(a: T) => void
 >T : T
 >a : T
 >T : T
diff --git a/tests/baselines/reference/assignmentCompatForEnums.types b/tests/baselines/reference/assignmentCompatForEnums.types
index c8026077aec..53e8caab638 100644
--- a/tests/baselines/reference/assignmentCompatForEnums.types
+++ b/tests/baselines/reference/assignmentCompatForEnums.types
@@ -10,16 +10,16 @@ var list = {};
 
 
 function returnType(): TokenType { return null; }
->returnType : typeof returnType
+>returnType : () => TokenType
 >TokenType : TokenType
 
 function foo() {
->foo : typeof foo
+>foo : () => void
 
     var x = returnType();
 >x : TokenType
 >returnType() : TokenType
->returnType : typeof returnType
+>returnType : () => TokenType
 
     var x: TokenType = list['one'];
 >x : TokenType
diff --git a/tests/baselines/reference/assignmentCompatOnNew.types b/tests/baselines/reference/assignmentCompatOnNew.types
index a6fb74f6184..19994e61df8 100644
--- a/tests/baselines/reference/assignmentCompatOnNew.types
+++ b/tests/baselines/reference/assignmentCompatOnNew.types
@@ -3,12 +3,12 @@ class Foo{};
 >Foo : Foo
 
 function bar(x: {new(): Foo;}){}
->bar : typeof bar
+>bar : (x: new () => Foo) => void
 >x : new () => Foo
 >Foo : Foo
 
 bar(Foo); // Error, but should be allowed
 >bar(Foo) : void
->bar : typeof bar
+>bar : (x: new () => Foo) => void
 >Foo : typeof Foo
 
diff --git a/tests/baselines/reference/assignmentCompatibilityForConstrainedTypeParameters.types b/tests/baselines/reference/assignmentCompatibilityForConstrainedTypeParameters.types
index 1a8f0e6bfd2..fab8e2baae6 100644
--- a/tests/baselines/reference/assignmentCompatibilityForConstrainedTypeParameters.types
+++ b/tests/baselines/reference/assignmentCompatibilityForConstrainedTypeParameters.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/assignmentCompatibilityForConstrainedTypeParameters.ts ===
 function foo<T extends { bar: string }>() {
->foo : typeof foo
+>foo : <T extends { bar: string; }>() => void
 >T : T
 >bar : string
 
diff --git a/tests/baselines/reference/assignmentLHSIsReference.types b/tests/baselines/reference/assignmentLHSIsReference.types
index c5dc4813a5d..0d7bfad3f06 100644
--- a/tests/baselines/reference/assignmentLHSIsReference.types
+++ b/tests/baselines/reference/assignmentLHSIsReference.types
@@ -12,7 +12,7 @@ x1 = value;
 >value : any
 
 function fn1(x2: number) {
->fn1 : typeof fn1
+>fn1 : (x2: number) => void
 >x2 : number
 
     x2 = value;
@@ -47,7 +47,7 @@ x3['a'] = value;
 >value : any
 
 function fn2(x4: number) {
->fn2 : typeof fn2
+>fn2 : (x4: number) => void
 >x4 : number
 
     (x4) = value;
diff --git a/tests/baselines/reference/avoid.types b/tests/baselines/reference/avoid.types
index 23e78f37613..853d93bdd79 100644
--- a/tests/baselines/reference/avoid.types
+++ b/tests/baselines/reference/avoid.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/avoid.ts ===
 function f() {
->f : typeof f
+>f : () => void
 
     var x=1;
 >x : number
@@ -9,12 +9,12 @@ function f() {
 var y=f();  // error void fn
 >y : void
 >f() : void
->f : typeof f
+>f : () => void
 
 var why:any=f(); // error void fn
 >why : any
 >f() : void
->f : typeof f
+>f : () => void
 
 var w:any;
 >w : any
@@ -23,7 +23,7 @@ w=f(); // error void fn
 >w=f() : void
 >w : any
 >f() : void
->f : typeof f
+>f : () => void
 
 class C {
 >C : C
@@ -45,6 +45,6 @@ var z=new C().g(); // error void fn
 var N=new f();  // ok with void fn
 >N : any
 >new f() : any
->f : typeof f
+>f : () => void
 
 
diff --git a/tests/baselines/reference/badOverloadError.types b/tests/baselines/reference/badOverloadError.types
index 8777296d798..837eb5c5c83 100644
--- a/tests/baselines/reference/badOverloadError.types
+++ b/tests/baselines/reference/badOverloadError.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/badOverloadError.ts ===
 function method() {
->method : typeof method
+>method : () => void
 
     var dictionary = <{ [index: string]: string; }>{};
 >dictionary : { [x: string]: string; }
diff --git a/tests/baselines/reference/badThisBinding.types b/tests/baselines/reference/badThisBinding.types
index 5b95cc95ba0..a6b1c478d53 100644
--- a/tests/baselines/reference/badThisBinding.types
+++ b/tests/baselines/reference/badThisBinding.types
@@ -1,10 +1,10 @@
 === tests/cases/compiler/badThisBinding.ts ===
 declare function foo(a:any): any;
->foo : typeof foo
+>foo : (a: any) => any
 >a : any
 
 declare function bar(a:any): any;
->bar : typeof bar
+>bar : (a: any) => any
 >a : any
 
 class Greeter {
@@ -13,12 +13,12 @@ class Greeter {
     constructor() {
 		foo(() => {
 >foo(() => {            bar(() => {                var x = this;			});		}) : any
->foo : typeof foo
+>foo : (a: any) => any
 >() => {            bar(() => {                var x = this;			});		} : () => void
 
             bar(() => {
 >bar(() => {                var x = this;			}) : any
->bar : typeof bar
+>bar : (a: any) => any
 >() => {                var x = this;			} : () => void
 
                 var x = this;
diff --git a/tests/baselines/reference/bestCommonTypeOfConditionalExpressions.types b/tests/baselines/reference/bestCommonTypeOfConditionalExpressions.types
index ae9f7c59765..3deeae69bbe 100644
--- a/tests/baselines/reference/bestCommonTypeOfConditionalExpressions.types
+++ b/tests/baselines/reference/bestCommonTypeOfConditionalExpressions.types
@@ -102,7 +102,7 @@ var r11 = true ? base : derived2;
 >derived2 : Derived2
 
 function foo5<T, U>(t: T, u: U): Object {
->foo5 : typeof foo5
+>foo5 : <T, U>(t: T, u: U) => Object
 >T : T
 >U : U
 >t : T
diff --git a/tests/baselines/reference/bestCommonTypeReturnStatement.types b/tests/baselines/reference/bestCommonTypeReturnStatement.types
index ce360a92ccf..3c260ea709b 100644
--- a/tests/baselines/reference/bestCommonTypeReturnStatement.types
+++ b/tests/baselines/reference/bestCommonTypeReturnStatement.types
@@ -14,23 +14,23 @@ interface IPromise<T> {
 }
 
 function f() {
->f : typeof f
+>f : () => IPromise<void>
 
     if (true) return b();
 >b() : IPromise<void>
->b : typeof b
+>b : () => IPromise<void>
 
     return d();
 >d() : IPromise<any>
->d : typeof d
+>d : () => IPromise<any>
 }
 
 
 function b(): IPromise<void> { return null; }
->b : typeof b
+>b : () => IPromise<void>
 >IPromise : IPromise<T>
 
 function d(): IPromise<any> { return null; }
->d : typeof d
+>d : () => IPromise<any>
 >IPromise : IPromise<T>
 
diff --git a/tests/baselines/reference/bitwiseNotOperatorWithBooleanType.types b/tests/baselines/reference/bitwiseNotOperatorWithBooleanType.types
index 13cee004559..ce870dbc818 100644
--- a/tests/baselines/reference/bitwiseNotOperatorWithBooleanType.types
+++ b/tests/baselines/reference/bitwiseNotOperatorWithBooleanType.types
@@ -4,7 +4,7 @@ var BOOLEAN: boolean;
 >BOOLEAN : boolean
 
 function foo(): boolean { return true; }
->foo : typeof foo
+>foo : () => boolean
 
 class A {
 >A : A
@@ -64,7 +64,7 @@ var ResultIsNumber6 = ~foo();
 >ResultIsNumber6 : number
 >~foo() : number
 >foo() : boolean
->foo : typeof foo
+>foo : () => boolean
 
 var ResultIsNumber7 = ~A.foo();
 >ResultIsNumber7 : number
@@ -92,7 +92,7 @@ var ResultIsNumber8 = ~~BOOLEAN;
 ~foo();
 >~foo() : number
 >foo() : boolean
->foo : typeof foo
+>foo : () => boolean
 
 ~true, false;
 >~true, false : boolean
diff --git a/tests/baselines/reference/bitwiseNotOperatorWithNumberType.types b/tests/baselines/reference/bitwiseNotOperatorWithNumberType.types
index 508edaf17e2..94207a56343 100644
--- a/tests/baselines/reference/bitwiseNotOperatorWithNumberType.types
+++ b/tests/baselines/reference/bitwiseNotOperatorWithNumberType.types
@@ -8,7 +8,7 @@ var NUMBER1: number[] = [1, 2];
 >[1, 2] : number[]
 
 function foo(): number { return 1; }
->foo : typeof foo
+>foo : () => number
 
 class A {
 >A : A
@@ -89,7 +89,7 @@ var ResultIsNumber9 = ~foo();
 >ResultIsNumber9 : number
 >~foo() : number
 >foo() : number
->foo : typeof foo
+>foo : () => number
 
 var ResultIsNumber10 = ~A.foo();
 >ResultIsNumber10 : number
@@ -136,7 +136,7 @@ var ResultIsNumber13 = ~~~(NUMBER + NUMBER);
 ~foo();
 >~foo() : number
 >foo() : number
->foo : typeof foo
+>foo : () => number
 
 ~objA.a;
 >~objA.a : number
diff --git a/tests/baselines/reference/bitwiseNotOperatorWithStringType.types b/tests/baselines/reference/bitwiseNotOperatorWithStringType.types
index d1041f805de..dbe2f29631e 100644
--- a/tests/baselines/reference/bitwiseNotOperatorWithStringType.types
+++ b/tests/baselines/reference/bitwiseNotOperatorWithStringType.types
@@ -8,7 +8,7 @@ var STRING1: string[] = ["", "abc"];
 >["", "abc"] : string[]
 
 function foo(): string { return "abc"; }
->foo : typeof foo
+>foo : () => string
 
 class A {
 >A : A
@@ -89,7 +89,7 @@ var ResultIsNumber9 = ~foo();
 >ResultIsNumber9 : number
 >~foo() : number
 >foo() : string
->foo : typeof foo
+>foo : () => string
 
 var ResultIsNumber10 = ~A.foo();
 >ResultIsNumber10 : number
@@ -144,7 +144,7 @@ var ResultIsNumber14 = ~~~(STRING + STRING);
 ~foo();
 >~foo() : number
 >foo() : string
->foo : typeof foo
+>foo : () => string
 
 ~objA.a,M.n;
 >~objA.a,M.n : string
diff --git a/tests/baselines/reference/callGenericFunctionWithZeroTypeArguments.types b/tests/baselines/reference/callGenericFunctionWithZeroTypeArguments.types
index f2ac424455b..34de901e3c0 100644
--- a/tests/baselines/reference/callGenericFunctionWithZeroTypeArguments.types
+++ b/tests/baselines/reference/callGenericFunctionWithZeroTypeArguments.types
@@ -2,7 +2,7 @@
 // valid invocations of generic functions with no explicit type arguments provided 
 
 function f<T>(x: T): T { return null; }
->f : typeof f
+>f : <T>(x: T) => T
 >T : T
 >x : T
 >T : T
@@ -11,7 +11,7 @@ function f<T>(x: T): T { return null; }
 var r = f(1);
 >r : number
 >f(1) : number
->f : typeof f
+>f : <T>(x: T) => T
 
 var f2 = <T>(x: T): T => { return null; }
 >f2 : <T>(x: T) => T
diff --git a/tests/baselines/reference/callSignatureWithoutAnnotationsOrBody.types b/tests/baselines/reference/callSignatureWithoutAnnotationsOrBody.types
index 08288f53f7e..b8b608762f5 100644
--- a/tests/baselines/reference/callSignatureWithoutAnnotationsOrBody.types
+++ b/tests/baselines/reference/callSignatureWithoutAnnotationsOrBody.types
@@ -2,13 +2,13 @@
 // Call signatures without a return type annotation and function body return 'any'
 
 function foo(x) { }
->foo : typeof foo
+>foo : (x: any) => void
 >x : any
 
 var r = foo(1); // void since there's a body
 >r : void
 >foo(1) : void
->foo : typeof foo
+>foo : (x: any) => void
 
 interface I {
 >I : I
diff --git a/tests/baselines/reference/callSignatureWithoutReturnTypeAnnotationInference.types b/tests/baselines/reference/callSignatureWithoutReturnTypeAnnotationInference.types
index 6a4f5560c0d..dc6a72cf897 100644
--- a/tests/baselines/reference/callSignatureWithoutReturnTypeAnnotationInference.types
+++ b/tests/baselines/reference/callSignatureWithoutReturnTypeAnnotationInference.types
@@ -3,7 +3,7 @@
 
 // Simple types
 function foo(x) {
->foo : typeof foo
+>foo : (x: any) => number
 >x : any
 
     return 1;
@@ -11,36 +11,36 @@ function foo(x) {
 var r = foo(1);
 >r : number
 >foo(1) : number
->foo : typeof foo
+>foo : (x: any) => number
 
 function foo2(x) {
->foo2 : typeof foo2
+>foo2 : (x: any) => number
 >x : any
 
     return foo(x);
 >foo(x) : number
->foo : typeof foo
+>foo : (x: any) => number
 >x : any
 }
 var r2 = foo2(1);
 >r2 : number
 >foo2(1) : number
->foo2 : typeof foo2
+>foo2 : (x: any) => number
 
 function foo3() {
->foo3 : typeof foo3
+>foo3 : () => any
 
     return foo3();
 >foo3() : any
->foo3 : typeof foo3
+>foo3 : () => any
 }
 var r3 = foo3();
 >r3 : any
 >foo3() : any
->foo3 : typeof foo3
+>foo3 : () => any
 
 function foo4<T>(x: T) {
->foo4 : typeof foo4
+>foo4 : <T>(x: T) => T
 >T : T
 >x : T
 >T : T
@@ -51,10 +51,10 @@ function foo4<T>(x: T) {
 var r4 = foo4(1);
 >r4 : number
 >foo4(1) : number
->foo4 : typeof foo4
+>foo4 : <T>(x: T) => T
 
 function foo5(x) {
->foo5 : typeof foo5
+>foo5 : (x: any) => number
 >x : any
 
     if (true) {
@@ -66,10 +66,10 @@ function foo5(x) {
 var r5 = foo5(1);
 >r5 : number
 >foo5(1) : number
->foo5 : typeof foo5
+>foo5 : (x: any) => number
 
 function foo6(x) {
->foo6 : typeof foo6
+>foo6 : (x: any) => any[]
 >x : any
 
     try {
@@ -88,10 +88,10 @@ function foo6(x) {
 var r6 = foo6(1);
 >r6 : any[]
 >foo6(1) : any[]
->foo6 : typeof foo6
+>foo6 : (x: any) => any[]
 
 function foo7(x) {
->foo7 : typeof foo7
+>foo7 : (x: any) => string
 >x : any
 
     return typeof x;
@@ -101,11 +101,11 @@ function foo7(x) {
 var r7 = foo7(1);
 >r7 : string
 >foo7(1) : string
->foo7 : typeof foo7
+>foo7 : (x: any) => string
 
 // object types
 function foo8(x: number) {
->foo8 : typeof foo8
+>foo8 : (x: number) => { x: number; }
 >x : number
 
     return { x: x };
@@ -116,7 +116,7 @@ function foo8(x: number) {
 var r8 = foo8(1);
 >r8 : { x: number; }
 >foo8(1) : { x: number; }
->foo8 : typeof foo8
+>foo8 : (x: number) => { x: number; }
 
 interface I {
 >I : I
@@ -125,7 +125,7 @@ interface I {
 >foo : string
 }
 function foo9(x: number) {
->foo9 : typeof foo9
+>foo9 : (x: number) => I
 >x : number
 
     var i: I;
@@ -138,7 +138,7 @@ function foo9(x: number) {
 var r9 = foo9(1);
 >r9 : I
 >foo9(1) : I
->foo9 : typeof foo9
+>foo9 : (x: number) => I
 
 class C {
 >C : C
@@ -147,7 +147,7 @@ class C {
 >foo : string
 }
 function foo10(x: number) {
->foo10 : typeof foo10
+>foo10 : (x: number) => C
 >x : number
 
     var c: C;
@@ -160,7 +160,7 @@ function foo10(x: number) {
 var r10 = foo10(1);
 >r10 : C
 >foo10(1) : C
->foo10 : typeof foo10
+>foo10 : (x: number) => C
 
 module M {
 >M : typeof M
@@ -173,7 +173,7 @@ module M {
 >foo : string
 }
 function foo11() {
->foo11 : typeof foo11
+>foo11 : () => typeof M
 
     return M;
 >M : typeof M
@@ -181,7 +181,7 @@ function foo11() {
 var r11 = foo11();
 >r11 : typeof M
 >foo11() : typeof M
->foo11 : typeof foo11
+>foo11 : () => typeof M
 
 // merged declarations
 interface I2 {
@@ -197,7 +197,7 @@ interface I2 {
 >y : number
 }
 function foo12() {
->foo12 : typeof foo12
+>foo12 : () => I2
 
     var i2: I2;
 >i2 : I2
@@ -209,7 +209,7 @@ function foo12() {
 var r12 = foo12();
 >r12 : I2
 >foo12() : I2
->foo12 : typeof foo12
+>foo12 : () => I2
 
 function m1() { return 1; }
 >m1 : typeof m1
@@ -219,7 +219,7 @@ module m1 { export var y = 2; }
 >y : number
 
 function foo13() {
->foo13 : typeof foo13
+>foo13 : () => typeof m1
 
     return m1;
 >m1 : typeof m1
@@ -227,7 +227,7 @@ function foo13() {
 var r13 = foo13();
 >r13 : typeof m1
 >foo13() : typeof m1
->foo13 : typeof foo13
+>foo13 : () => typeof m1
 
 class c1 {
 >c1 : c1
@@ -245,7 +245,7 @@ module c1 {
 >x : number
 }
 function foo14() {
->foo14 : typeof foo14
+>foo14 : () => typeof c1
 
     return c1;
 >c1 : typeof c1
@@ -253,7 +253,7 @@ function foo14() {
 var r14 = foo14();
 >r14 : typeof c1
 >foo14() : typeof c1
->foo14 : typeof foo14
+>foo14 : () => typeof c1
 
 enum e1 { A }
 >e1 : e1
@@ -264,7 +264,7 @@ module e1 { export var y = 1; }
 >y : number
 
 function foo15() {
->foo15 : typeof foo15
+>foo15 : () => typeof e1
 
     return e1;
 >e1 : typeof e1
@@ -272,5 +272,5 @@ function foo15() {
 var r15 = foo15();
 >r15 : typeof e1
 >foo15() : typeof e1
->foo15 : typeof foo15
+>foo15 : () => typeof e1
 
diff --git a/tests/baselines/reference/callSignaturesWithOptionalParameters.types b/tests/baselines/reference/callSignaturesWithOptionalParameters.types
index 199d458983c..8b1e929d9e3 100644
--- a/tests/baselines/reference/callSignaturesWithOptionalParameters.types
+++ b/tests/baselines/reference/callSignaturesWithOptionalParameters.types
@@ -2,7 +2,7 @@
 // Optional parameters should be valid in all the below casts
 
 function foo(x?: number) { }
->foo : typeof foo
+>foo : (x?: number) => void
 >x : number
 
 var f = function foo(x?: number) { }
@@ -19,11 +19,11 @@ var f2 = (x: number, y?: number) => { }
 
 foo(1);
 >foo(1) : void
->foo : typeof foo
+>foo : (x?: number) => void
 
 foo();
 >foo() : void
->foo : typeof foo
+>foo : (x?: number) => void
 
 f(1);
 >f(1) : void
diff --git a/tests/baselines/reference/callSignaturesWithOptionalParameters2.types b/tests/baselines/reference/callSignaturesWithOptionalParameters2.types
index c13942a5c70..602edd911fe 100644
--- a/tests/baselines/reference/callSignaturesWithOptionalParameters2.types
+++ b/tests/baselines/reference/callSignaturesWithOptionalParameters2.types
@@ -2,42 +2,42 @@
 // Optional parameters should be valid in all the below casts
 
 function foo(x?: number);
->foo : typeof foo
+>foo : (x?: number) => any
 >x : number
 
 function foo(x?: number) { }
->foo : typeof foo
+>foo : (x?: number) => any
 >x : number
 
 foo(1);
 >foo(1) : any
->foo : typeof foo
+>foo : (x?: number) => any
 
 foo();
 >foo() : any
->foo : typeof foo
+>foo : (x?: number) => any
 
 function foo2(x: number);
->foo2 : typeof foo2
+>foo2 : { (x: number): any; (x: number, y?: number): any; }
 >x : number
 
 function foo2(x: number, y?: number);
->foo2 : typeof foo2
+>foo2 : { (x: number): any; (x: number, y?: number): any; }
 >x : number
 >y : number
 
 function foo2(x: number, y?: number) { }
->foo2 : typeof foo2
+>foo2 : { (x: number): any; (x: number, y?: number): any; }
 >x : number
 >y : number
 
 foo2(1);
 >foo2(1) : any
->foo2 : typeof foo2
+>foo2 : { (x: number): any; (x: number, y?: number): any; }
 
 foo2(1, 2);
 >foo2(1, 2) : any
->foo2 : typeof foo2
+>foo2 : { (x: number): any; (x: number, y?: number): any; }
 
 class C {
 >C : C
diff --git a/tests/baselines/reference/catch.types b/tests/baselines/reference/catch.types
index 2caa04d8697..bb0b2adbefe 100644
--- a/tests/baselines/reference/catch.types
+++ b/tests/baselines/reference/catch.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/catch.ts ===
 function f() {
->f : typeof f
+>f : () => void
 
     try {} catch(e) { }
 >e : any
diff --git a/tests/baselines/reference/cf.types b/tests/baselines/reference/cf.types
index df7dc12ce31..62dcba0ba9a 100644
--- a/tests/baselines/reference/cf.types
+++ b/tests/baselines/reference/cf.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/cf.ts ===
 function f() {
->f : typeof f
+>f : () => void
 
     var z;
 >z : any
diff --git a/tests/baselines/reference/chainedImportAlias.types b/tests/baselines/reference/chainedImportAlias.types
index 6140d98272f..1435776fff2 100644
--- a/tests/baselines/reference/chainedImportAlias.types
+++ b/tests/baselines/reference/chainedImportAlias.types
@@ -8,17 +8,17 @@ import y = x;
 
 y.m.foo();
 >y.m.foo() : void
->y.m.foo : typeof x.m.foo
+>y.m.foo : () => void
 >y.m : typeof x.m
 >y : typeof x
 >m : typeof x.m
->foo : typeof x.m.foo
+>foo : () => void
 
 === tests/cases/compiler/chainedImportAlias_file0.ts ===
 export module m {
 >m : typeof m
 
     export function foo() { }
->foo : typeof foo
+>foo : () => void
 }
 
diff --git a/tests/baselines/reference/cloduleTest1.types b/tests/baselines/reference/cloduleTest1.types
index 214b46c2676..a92355b483a 100644
--- a/tests/baselines/reference/cloduleTest1.types
+++ b/tests/baselines/reference/cloduleTest1.types
@@ -19,7 +19,7 @@
 >AjaxSettings : AjaxSettings
     }
     export function ajax(options: AjaxSettings) { }
->ajax : typeof ajax
+>ajax : (options: AjaxSettings) => void
 >options : AjaxSettings
 >AjaxSettings : AjaxSettings
   }
diff --git a/tests/baselines/reference/collisionCodeGenModuleWithFunctionChildren.types b/tests/baselines/reference/collisionCodeGenModuleWithFunctionChildren.types
index 7c22d6ddc8f..07ef123f642 100644
--- a/tests/baselines/reference/collisionCodeGenModuleWithFunctionChildren.types
+++ b/tests/baselines/reference/collisionCodeGenModuleWithFunctionChildren.types
@@ -6,7 +6,7 @@ module M {
 >x : number
 
     function fn(M, p = x) { }
->fn : typeof fn
+>fn : (M: any, p?: number) => void
 >M : any
 >p : number
 >x : number
@@ -16,7 +16,7 @@ module M {
 >M : typeof M
 
     function fn2() {
->fn2 : typeof fn2
+>fn2 : () => void
 
         var M;
 >M : any
@@ -31,7 +31,7 @@ module M {
 >M : typeof M
 
     function fn3() {
->fn3 : typeof fn3
+>fn3 : () => void
 
         function M() {
 >M : () => void
diff --git a/tests/baselines/reference/collisionCodeGenModuleWithModuleChildren.types b/tests/baselines/reference/collisionCodeGenModuleWithModuleChildren.types
index 3ed65442a0e..7853bcbdb32 100644
--- a/tests/baselines/reference/collisionCodeGenModuleWithModuleChildren.types
+++ b/tests/baselines/reference/collisionCodeGenModuleWithModuleChildren.types
@@ -44,7 +44,7 @@ module M {
 >m3 : typeof m3
 
         function M() {
->M : typeof M
+>M : () => void
         }
         var p = x;
 >p : number
@@ -53,7 +53,7 @@ module M {
         var p2 = M();
 >p2 : void
 >M() : void
->M : typeof M
+>M : () => void
     }
 }
 
diff --git a/tests/baselines/reference/collisionExportsRequireAndFunction.types b/tests/baselines/reference/collisionExportsRequireAndFunction.types
index 8bf94d991f7..8b90397c6fe 100644
--- a/tests/baselines/reference/collisionExportsRequireAndFunction.types
+++ b/tests/baselines/reference/collisionExportsRequireAndFunction.types
@@ -1,11 +1,11 @@
 === tests/cases/compiler/collisionExportsRequireAndFunction.ts ===
 export function exports() {
->exports : typeof exports
+>exports : () => number
 
     return 1;
 }
 export function require() {
->require : typeof require
+>require : () => string
 
     return "require";
 }
diff --git a/tests/baselines/reference/collisionExportsRequireAndModule.types b/tests/baselines/reference/collisionExportsRequireAndModule.types
index 9aa418cad80..c462a508d06 100644
--- a/tests/baselines/reference/collisionExportsRequireAndModule.types
+++ b/tests/baselines/reference/collisionExportsRequireAndModule.types
@@ -10,7 +10,7 @@ export module require {
     }
 }
 export function foo(): require.I {
->foo : typeof foo
+>foo : () => require.I
 >require : unknown
 >I : require.I
 
@@ -27,7 +27,7 @@ export module exports {
     }
 }
 export function foo2(): exports.I {
->foo2 : typeof foo2
+>foo2 : () => exports.I
 >exports : unknown
 >I : exports.I
 
diff --git a/tests/baselines/reference/collisionExportsRequireAndUninstantiatedModule.types b/tests/baselines/reference/collisionExportsRequireAndUninstantiatedModule.types
index b9d5b8a2606..59d90feda46 100644
--- a/tests/baselines/reference/collisionExportsRequireAndUninstantiatedModule.types
+++ b/tests/baselines/reference/collisionExportsRequireAndUninstantiatedModule.types
@@ -7,7 +7,7 @@ export module require { // no error
     }
 }
 export function foo(): require.I {
->foo : typeof foo
+>foo : () => require.I
 >require : unknown
 >I : require.I
 
@@ -21,7 +21,7 @@ export module exports { // no error
     }
 }
 export function foo2(): exports.I {
->foo2 : typeof foo2
+>foo2 : () => exports.I
 >exports : unknown
 >I : exports.I
 
diff --git a/tests/baselines/reference/collisionExportsRequireAndVar.types b/tests/baselines/reference/collisionExportsRequireAndVar.types
index 112b8ec838e..656c705aa23 100644
--- a/tests/baselines/reference/collisionExportsRequireAndVar.types
+++ b/tests/baselines/reference/collisionExportsRequireAndVar.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/collisionExportsRequireAndVar.ts ===
 export function foo() {
->foo : typeof foo
+>foo : () => void
 }
 var exports = 1;
 >exports : number
diff --git a/tests/baselines/reference/commaOperator1.types b/tests/baselines/reference/commaOperator1.types
index 17b8c3cad00..52a36e33024 100644
--- a/tests/baselines/reference/commaOperator1.types
+++ b/tests/baselines/reference/commaOperator1.types
@@ -12,7 +12,7 @@ var v1 = ((1, 2, 3), 4, 5, (6, 7));
 >6, 7 : number
 
 function f1() {
->f1 : typeof f1
+>f1 : () => number
 
     var a = 1;
 >a : number
diff --git a/tests/baselines/reference/commaOperatorOtherValidOperation.types b/tests/baselines/reference/commaOperatorOtherValidOperation.types
index 57538f4a1cb..e42991e7b5a 100644
--- a/tests/baselines/reference/commaOperatorOtherValidOperation.types
+++ b/tests/baselines/reference/commaOperatorOtherValidOperation.types
@@ -16,7 +16,7 @@ for (var i = 0, j = 10; i < j; i++, j--)
 
 //Comma operator in fuction arguments and return
 function foo(x: number, y: string)
->foo : typeof foo
+>foo : (x: number, y: string) => string
 >x : number
 >y : string
 {
@@ -28,11 +28,11 @@ function foo(x: number, y: string)
 var resultIsString = foo(1, "123");
 >resultIsString : string
 >foo(1, "123") : string
->foo : typeof foo
+>foo : (x: number, y: string) => string
 
 //TypeParameters
 function foo1<T1, T2>()
->foo1 : typeof foo1
+>foo1 : <T1, T2>() => void
 >T1 : T1
 >T2 : T2
 {
diff --git a/tests/baselines/reference/commentInEmptyParameterList1.types b/tests/baselines/reference/commentInEmptyParameterList1.types
index c2e120d1ffb..dd708e8c9ac 100644
--- a/tests/baselines/reference/commentInEmptyParameterList1.types
+++ b/tests/baselines/reference/commentInEmptyParameterList1.types
@@ -1,4 +1,4 @@
 === tests/cases/compiler/commentInEmptyParameterList1.ts ===
 function foo(/** nothing */) {
->foo : typeof foo
+>foo : () => void
 }
diff --git a/tests/baselines/reference/commentOnSignature1.types b/tests/baselines/reference/commentOnSignature1.types
index 6630fb2cf1e..6fd4516d4e9 100644
--- a/tests/baselines/reference/commentOnSignature1.types
+++ b/tests/baselines/reference/commentOnSignature1.types
@@ -1,15 +1,15 @@
 === tests/cases/compiler/commentOnSignature1.ts ===
 /*! Keep this pinned comment */
 function foo(n: number): void;
->foo : typeof foo
+>foo : { (n: number): void; (s: string): void; }
 >n : number
 
 // Don't keep this comment.
 function foo(s: string): void;
->foo : typeof foo
+>foo : { (n: number): void; (s: string): void; }
 >s : string
 
 function foo(a: any): void {
->foo : typeof foo
+>foo : { (n: number): void; (s: string): void; }
 >a : any
 }
diff --git a/tests/baselines/reference/commentOnSimpleArrowFunctionBody1.types b/tests/baselines/reference/commentOnSimpleArrowFunctionBody1.types
index 99ec3c9a021..916a03eb65e 100644
--- a/tests/baselines/reference/commentOnSimpleArrowFunctionBody1.types
+++ b/tests/baselines/reference/commentOnSimpleArrowFunctionBody1.types
@@ -1,13 +1,13 @@
 === tests/cases/compiler/commentOnSimpleArrowFunctionBody1.ts ===
 function Foo(x: any)
->Foo : typeof Foo
+>Foo : (x: any) => void
 >x : any
 {
 }
  
 Foo(() =>
 >Foo(() =>    // do something    127) : void
->Foo : typeof Foo
+>Foo : (x: any) => void
 >() =>    // do something    127 : () => number
 
     // do something
diff --git a/tests/baselines/reference/commentsCommentParsing.types b/tests/baselines/reference/commentsCommentParsing.types
index d10a339868e..a9194f9a63a 100644
--- a/tests/baselines/reference/commentsCommentParsing.types
+++ b/tests/baselines/reference/commentsCommentParsing.types
@@ -2,41 +2,41 @@
 
 /// This is simple /// comments
 function simple() {
->simple : typeof simple
+>simple : () => void
 }
 
 simple();
 >simple() : void
->simple : typeof simple
+>simple : () => void
 
 /// multiLine /// Comments
 /// This is example of multiline /// comments
 /// Another multiLine
 function multiLine() {
->multiLine : typeof multiLine
+>multiLine : () => void
 }
 multiLine();
 >multiLine() : void
->multiLine : typeof multiLine
+>multiLine : () => void
 
 /** this is eg of single line jsdoc style comment */
 function jsDocSingleLine() {
->jsDocSingleLine : typeof jsDocSingleLine
+>jsDocSingleLine : () => void
 }
 jsDocSingleLine();
 >jsDocSingleLine() : void
->jsDocSingleLine : typeof jsDocSingleLine
+>jsDocSingleLine : () => void
 
 
 /** this is multiple line jsdoc stule comment
 *New line1
 *New Line2*/
 function jsDocMultiLine() {
->jsDocMultiLine : typeof jsDocMultiLine
+>jsDocMultiLine : () => void
 }
 jsDocMultiLine();
 >jsDocMultiLine() : void
->jsDocMultiLine : typeof jsDocMultiLine
+>jsDocMultiLine : () => void
 
 /** this is multiple line jsdoc stule comment
 *New line1
@@ -44,60 +44,60 @@ jsDocMultiLine();
 /** Shoul mege this line as well
 * and this too*/ /** Another this one too*/
 function jsDocMultiLineMerge() {
->jsDocMultiLineMerge : typeof jsDocMultiLineMerge
+>jsDocMultiLineMerge : () => void
 }
 jsDocMultiLineMerge();
 >jsDocMultiLineMerge() : void
->jsDocMultiLineMerge : typeof jsDocMultiLineMerge
+>jsDocMultiLineMerge : () => void
 
 
 /// Triple slash comment
 /** jsdoc comment */
 function jsDocMixedComments1() {
->jsDocMixedComments1 : typeof jsDocMixedComments1
+>jsDocMixedComments1 : () => void
 }
 jsDocMixedComments1();
 >jsDocMixedComments1() : void
->jsDocMixedComments1 : typeof jsDocMixedComments1
+>jsDocMixedComments1 : () => void
 
 /// Triple slash comment
 /** jsdoc comment */ /*** another jsDocComment*/
 function jsDocMixedComments2() {
->jsDocMixedComments2 : typeof jsDocMixedComments2
+>jsDocMixedComments2 : () => void
 }
 jsDocMixedComments2();
 >jsDocMixedComments2() : void
->jsDocMixedComments2 : typeof jsDocMixedComments2
+>jsDocMixedComments2 : () => void
 
 /** jsdoc comment */ /*** another jsDocComment*/
 /// Triple slash comment
 function jsDocMixedComments3() {
->jsDocMixedComments3 : typeof jsDocMixedComments3
+>jsDocMixedComments3 : () => void
 }
 jsDocMixedComments3();
 >jsDocMixedComments3() : void
->jsDocMixedComments3 : typeof jsDocMixedComments3
+>jsDocMixedComments3 : () => void
 
 /** jsdoc comment */ /*** another jsDocComment*/
 /// Triple slash comment
 /// Triple slash comment 2
 function jsDocMixedComments4() {
->jsDocMixedComments4 : typeof jsDocMixedComments4
+>jsDocMixedComments4 : () => void
 }
 jsDocMixedComments4();
 >jsDocMixedComments4() : void
->jsDocMixedComments4 : typeof jsDocMixedComments4
+>jsDocMixedComments4 : () => void
 
 /// Triple slash comment 1
 /** jsdoc comment */ /*** another jsDocComment*/
 /// Triple slash comment
 /// Triple slash comment 2
 function jsDocMixedComments5() {
->jsDocMixedComments5 : typeof jsDocMixedComments5
+>jsDocMixedComments5 : () => void
 }
 jsDocMixedComments5();
 >jsDocMixedComments5() : void
->jsDocMixedComments5 : typeof jsDocMixedComments5
+>jsDocMixedComments5 : () => void
 
 /*** another jsDocComment*/
 /// Triple slash comment 1
@@ -105,41 +105,41 @@ jsDocMixedComments5();
 /// Triple slash comment 2
 /** jsdoc comment */
 function jsDocMixedComments6() {
->jsDocMixedComments6 : typeof jsDocMixedComments6
+>jsDocMixedComments6 : () => void
 }
 jsDocMixedComments6();
 >jsDocMixedComments6() : void
->jsDocMixedComments6 : typeof jsDocMixedComments6
+>jsDocMixedComments6 : () => void
 
 // This shoulnot be help comment
 function noHelpComment1() {
->noHelpComment1 : typeof noHelpComment1
+>noHelpComment1 : () => void
 }
 noHelpComment1();
 >noHelpComment1() : void
->noHelpComment1 : typeof noHelpComment1
+>noHelpComment1 : () => void
 
 /* This shoulnot be help comment */
 function noHelpComment2() {
->noHelpComment2 : typeof noHelpComment2
+>noHelpComment2 : () => void
 }
 noHelpComment2();
 >noHelpComment2() : void
->noHelpComment2 : typeof noHelpComment2
+>noHelpComment2 : () => void
 
 function noHelpComment3() {
->noHelpComment3 : typeof noHelpComment3
+>noHelpComment3 : () => void
 }
 noHelpComment3();
 >noHelpComment3() : void
->noHelpComment3 : typeof noHelpComment3
+>noHelpComment3 : () => void
 
 /** Adds two integers and returns the result
   * @param {number} a first number
   * @param b second number
   */
 function sum(a: number, b: number) {
->sum : typeof sum
+>sum : (a: number, b: number) => number
 >a : number
 >b : number
 
@@ -150,7 +150,7 @@ function sum(a: number, b: number) {
 }
 sum(10, 20);
 >sum(10, 20) : number
->sum : typeof sum
+>sum : (a: number, b: number) => number
 
 /** This is multiplication function*/
 /** @param */
@@ -160,7 +160,7 @@ sum(10, 20);
  @param d @anotherTag*/
 /** @param e LastParam @anotherTag*/
 function multiply(a: number, b: number, c?: number, d?, e?) {
->multiply : typeof multiply
+>multiply : (a: number, b: number, c?: number, d?: any, e?: any) => void
 >a : number
 >b : number
 >c : number
@@ -171,16 +171,16 @@ function multiply(a: number, b: number, c?: number, d?, e?) {
 * @param { string} b about b
 */
 function f1(a: number);
->f1 : typeof f1
+>f1 : { (a: number): any; (b: string): any; }
 >a : number
 
 function f1(b: string);
->f1 : typeof f1
+>f1 : { (a: number): any; (b: string): any; }
 >b : string
 
 /**@param opt optional parameter*/
 function f1(aOrb, opt?) {
->f1 : typeof f1
+>f1 : { (a: number): any; (b: string): any; }
 >aOrb : any
 >opt : any
 
@@ -196,7 +196,7 @@ function f1(aOrb, opt?) {
 @param { { { () => string; } } f this is optional param f
 */
 function subtract(a: number, b: number, c?: () => string, d?: () => string, e?: () => string, f?: () => string) {
->subtract : typeof subtract
+>subtract : (a: number, b: number, c?: () => string, d?: () => string, e?: () => string, f?: () => string) => void
 >a : number
 >b : number
 >c : () => string
@@ -210,7 +210,7 @@ function subtract(a: number, b: number, c?: () => string, d?: () => string, e?:
 @returnType { number } it is return type
 */
 function square(a: number) {
->square : typeof square
+>square : (a: number) => number
 >a : number
 
     return a * a;
@@ -224,7 +224,7 @@ function square(a: number) {
 @param { number} b this is b
 */
 function divide(a: number, b: number) {
->divide : typeof divide
+>divide : (a: number, b: number) => void
 >a : number
 >b : number
 }
@@ -233,7 +233,7 @@ function divide(a: number, b: number) {
 *@param c it is third parameter
 */
 function jsDocParamTest(/** this is inline comment for a */a: number, /** this is inline comment for b*/ b: number, c: number, d: number) {
->jsDocParamTest : typeof jsDocParamTest
+>jsDocParamTest : (a: number, b: number, c: number, d: number) => number
 >a : number
 >b : number
 >c : number
diff --git a/tests/baselines/reference/commentsExternalModules.types b/tests/baselines/reference/commentsExternalModules.types
index b018a5de6b3..56b6b338f4d 100644
--- a/tests/baselines/reference/commentsExternalModules.types
+++ b/tests/baselines/reference/commentsExternalModules.types
@@ -5,11 +5,11 @@ import extMod = require("commentsExternalModules_0"); // trailing comment1
 
 extMod.m1.fooExport();
 >extMod.m1.fooExport() : number
->extMod.m1.fooExport : typeof extMod.m1.fooExport
+>extMod.m1.fooExport : () => number
 >extMod.m1 : typeof extMod.m1
 >extMod : typeof extMod
 >m1 : typeof extMod.m1
->fooExport : typeof extMod.m1.fooExport
+>fooExport : () => number
 
 var newVar = new extMod.m1.m2.c();
 >newVar : extMod.m1.m2.c
@@ -24,11 +24,11 @@ var newVar = new extMod.m1.m2.c();
 
 extMod.m4.fooExport();
 >extMod.m4.fooExport() : number
->extMod.m4.fooExport : typeof extMod.m4.fooExport
+>extMod.m4.fooExport : () => number
 >extMod.m4 : typeof extMod.m4
 >extMod : typeof extMod
 >m4 : typeof extMod.m4
->fooExport : typeof extMod.m4.fooExport
+>fooExport : () => number
 
 var newVar2 = new extMod.m4.m2.c();
 >newVar2 : extMod.m4.m2.c
@@ -53,7 +53,7 @@ export module m1 {
 
     /** foo's comment*/
     function foo() {
->foo : typeof foo
+>foo : () => number
 
         return b;
 >b : number
@@ -75,18 +75,18 @@ export module m1 {
     }
     /** exported function*/
     export function fooExport() {
->fooExport : typeof fooExport
+>fooExport : () => number
 
         return foo();
 >foo() : number
->foo : typeof foo
+>foo : () => number
     }
 }
 m1.fooExport();
 >m1.fooExport() : number
->m1.fooExport : typeof m1.fooExport
+>m1.fooExport : () => number
 >m1 : typeof m1
->fooExport : typeof m1.fooExport
+>fooExport : () => number
 
 var myvar = new m1.m2.c();
 >myvar : m1.m2.c
@@ -108,7 +108,7 @@ export module m4 {
     /** foo's comment
     */
     function foo() {
->foo : typeof foo
+>foo : () => number
 
         return b;
 >b : number
@@ -131,18 +131,18 @@ export module m4 {
     }
     /** exported function */
     export function fooExport() {
->fooExport : typeof fooExport
+>fooExport : () => number
 
         return foo();
 >foo() : number
->foo : typeof foo
+>foo : () => number
     }
 }
 m4.fooExport();
 >m4.fooExport() : number
->m4.fooExport : typeof m4.fooExport
+>m4.fooExport : () => number
 >m4 : typeof m4
->fooExport : typeof m4.fooExport
+>fooExport : () => number
 
 var myvar2 = new m4.m2.c();
 >myvar2 : m4.m2.c
diff --git a/tests/baselines/reference/commentsExternalModules2.types b/tests/baselines/reference/commentsExternalModules2.types
index f6f004654d2..556b5d11d35 100644
--- a/tests/baselines/reference/commentsExternalModules2.types
+++ b/tests/baselines/reference/commentsExternalModules2.types
@@ -5,11 +5,11 @@ import extMod = require("commentsExternalModules2_0"); // trailing comment 1
 
 extMod.m1.fooExport();
 >extMod.m1.fooExport() : number
->extMod.m1.fooExport : typeof extMod.m1.fooExport
+>extMod.m1.fooExport : () => number
 >extMod.m1 : typeof extMod.m1
 >extMod : typeof extMod
 >m1 : typeof extMod.m1
->fooExport : typeof extMod.m1.fooExport
+>fooExport : () => number
 
 export var newVar = new extMod.m1.m2.c();
 >newVar : extMod.m1.m2.c
@@ -24,11 +24,11 @@ export var newVar = new extMod.m1.m2.c();
 
 extMod.m4.fooExport();
 >extMod.m4.fooExport() : number
->extMod.m4.fooExport : typeof extMod.m4.fooExport
+>extMod.m4.fooExport : () => number
 >extMod.m4 : typeof extMod.m4
 >extMod : typeof extMod
 >m4 : typeof extMod.m4
->fooExport : typeof extMod.m4.fooExport
+>fooExport : () => number
 
 export var newVar2 = new extMod.m4.m2.c();
 >newVar2 : extMod.m4.m2.c
@@ -53,7 +53,7 @@ export module m1 {
 
     /** foo's comment*/
     function foo() {
->foo : typeof foo
+>foo : () => number
 
         return b;
 >b : number
@@ -75,18 +75,18 @@ export module m1 {
     }
     /** exported function*/
     export function fooExport() {
->fooExport : typeof fooExport
+>fooExport : () => number
 
         return foo();
 >foo() : number
->foo : typeof foo
+>foo : () => number
     }
 }
 m1.fooExport();
 >m1.fooExport() : number
->m1.fooExport : typeof m1.fooExport
+>m1.fooExport : () => number
 >m1 : typeof m1
->fooExport : typeof m1.fooExport
+>fooExport : () => number
 
 var myvar = new m1.m2.c();
 >myvar : m1.m2.c
@@ -108,7 +108,7 @@ export module m4 {
     /** foo's comment
     */
     function foo() {
->foo : typeof foo
+>foo : () => number
 
         return b;
 >b : number
@@ -131,18 +131,18 @@ export module m4 {
     }
     /** exported function */
     export function fooExport() {
->fooExport : typeof fooExport
+>fooExport : () => number
 
         return foo();
 >foo() : number
->foo : typeof foo
+>foo : () => number
     }
 }
 m4.fooExport();
 >m4.fooExport() : number
->m4.fooExport : typeof m4.fooExport
+>m4.fooExport : () => number
 >m4 : typeof m4
->fooExport : typeof m4.fooExport
+>fooExport : () => number
 
 var myvar2 = new m4.m2.c();
 >myvar2 : m4.m2.c
diff --git a/tests/baselines/reference/commentsExternalModules3.types b/tests/baselines/reference/commentsExternalModules3.types
index f6f004654d2..556b5d11d35 100644
--- a/tests/baselines/reference/commentsExternalModules3.types
+++ b/tests/baselines/reference/commentsExternalModules3.types
@@ -5,11 +5,11 @@ import extMod = require("commentsExternalModules2_0"); // trailing comment 1
 
 extMod.m1.fooExport();
 >extMod.m1.fooExport() : number
->extMod.m1.fooExport : typeof extMod.m1.fooExport
+>extMod.m1.fooExport : () => number
 >extMod.m1 : typeof extMod.m1
 >extMod : typeof extMod
 >m1 : typeof extMod.m1
->fooExport : typeof extMod.m1.fooExport
+>fooExport : () => number
 
 export var newVar = new extMod.m1.m2.c();
 >newVar : extMod.m1.m2.c
@@ -24,11 +24,11 @@ export var newVar = new extMod.m1.m2.c();
 
 extMod.m4.fooExport();
 >extMod.m4.fooExport() : number
->extMod.m4.fooExport : typeof extMod.m4.fooExport
+>extMod.m4.fooExport : () => number
 >extMod.m4 : typeof extMod.m4
 >extMod : typeof extMod
 >m4 : typeof extMod.m4
->fooExport : typeof extMod.m4.fooExport
+>fooExport : () => number
 
 export var newVar2 = new extMod.m4.m2.c();
 >newVar2 : extMod.m4.m2.c
@@ -53,7 +53,7 @@ export module m1 {
 
     /** foo's comment*/
     function foo() {
->foo : typeof foo
+>foo : () => number
 
         return b;
 >b : number
@@ -75,18 +75,18 @@ export module m1 {
     }
     /** exported function*/
     export function fooExport() {
->fooExport : typeof fooExport
+>fooExport : () => number
 
         return foo();
 >foo() : number
->foo : typeof foo
+>foo : () => number
     }
 }
 m1.fooExport();
 >m1.fooExport() : number
->m1.fooExport : typeof m1.fooExport
+>m1.fooExport : () => number
 >m1 : typeof m1
->fooExport : typeof m1.fooExport
+>fooExport : () => number
 
 var myvar = new m1.m2.c();
 >myvar : m1.m2.c
@@ -108,7 +108,7 @@ export module m4 {
     /** foo's comment
     */
     function foo() {
->foo : typeof foo
+>foo : () => number
 
         return b;
 >b : number
@@ -131,18 +131,18 @@ export module m4 {
     }
     /** exported function */
     export function fooExport() {
->fooExport : typeof fooExport
+>fooExport : () => number
 
         return foo();
 >foo() : number
->foo : typeof foo
+>foo : () => number
     }
 }
 m4.fooExport();
 >m4.fooExport() : number
->m4.fooExport : typeof m4.fooExport
+>m4.fooExport : () => number
 >m4 : typeof m4
->fooExport : typeof m4.fooExport
+>fooExport : () => number
 
 var myvar2 = new m4.m2.c();
 >myvar2 : m4.m2.c
diff --git a/tests/baselines/reference/commentsFunction.types b/tests/baselines/reference/commentsFunction.types
index 6b8dd2dec26..6d37e1732e0 100644
--- a/tests/baselines/reference/commentsFunction.types
+++ b/tests/baselines/reference/commentsFunction.types
@@ -2,16 +2,16 @@
 
 /** This comment should appear for foo*/
 function foo() {
->foo : typeof foo
+>foo : () => void
 
 } /* trailing comment of function */
 foo();
 >foo() : void
->foo : typeof foo
+>foo : () => void
 
 /** This is comment for function signature*/
 function fooWithParameters(/** this is comment about a*/a: string,
->fooWithParameters : typeof fooWithParameters
+>fooWithParameters : (a: string, b: number) => void
 >a : string
 
     /** this is comment for b*/
@@ -25,7 +25,7 @@ function fooWithParameters(/** this is comment about a*/a: string,
 } // trailing comment of function
 fooWithParameters("a", 10);
 >fooWithParameters("a", 10) : void
->fooWithParameters : typeof fooWithParameters
+>fooWithParameters : (a: string, b: number) => void
 
 /** fooFunc
  * comment
@@ -68,19 +68,19 @@ lambddaNoVarComment(10, 20);
 >lambddaNoVarComment : (a: number, b: number) => number
 
 function blah(a: string /* multiline trailing comment 
->blah : typeof blah
+>blah : (a: string) => void
 >a : string
 
 multiline */) {
 }
 
 function blah2(a: string /* single line multiple trailing comments */ /* second */) {
->blah2 : typeof blah2
+>blah2 : (a: string) => void
 >a : string
 }
 
 function blah3(a: string // trailing commen single line
->blah3 : typeof blah3
+>blah3 : (a: string) => void
 >a : string
 
     ) {
@@ -104,19 +104,19 @@ lambdaFoo = (a, b) => a * b; // This is trailing comment
 >() => 0 : () => number
 
 function blah4(/*1*/a: string/*2*/,/*3*/b: string/*4*/) {
->blah4 : typeof blah4
+>blah4 : (a: string, b: string) => void
 >a : string
 >b : string
 }
 
 function foo1() {
->foo1 : typeof foo1
+>foo1 : () => void
 
     // should emit this
 }
 
 function foo2() {
->foo2 : typeof foo2
+>foo2 : () => void
 
     /// This is some detached comment
 
diff --git a/tests/baselines/reference/commentsModules.types b/tests/baselines/reference/commentsModules.types
index 88fbda685e1..1027f1ce308 100644
--- a/tests/baselines/reference/commentsModules.types
+++ b/tests/baselines/reference/commentsModules.types
@@ -9,7 +9,7 @@ module m1 {
 
     /** foo's comment*/
     function foo() {
->foo : typeof foo
+>foo : () => number
 
         return b;
 >b : number
@@ -31,16 +31,16 @@ module m1 {
     }
     /** exported function*/
     export function fooExport() {
->fooExport : typeof fooExport
+>fooExport : () => number
 
         return foo();
 >foo() : number
->foo : typeof foo
+>foo : () => number
     }
 
     // shouldn't appear
     export function foo2Export(/**hm*/ a: string) {
->foo2Export : typeof foo2Export
+>foo2Export : (a: string) => void
 >a : string
     }
 
@@ -48,21 +48,21 @@ module m1 {
      * comment
      */
     export function foo3Export() {
->foo3Export : typeof foo3Export
+>foo3Export : () => void
     }
 
     /** foo4Export
      * comment
      */
     function foo4Export() {
->foo4Export : typeof foo4Export
+>foo4Export : () => void
     }
 } // trailing comment module
 m1.fooExport();
 >m1.fooExport() : number
->m1.fooExport : typeof m1.fooExport
+>m1.fooExport : () => number
 >m1 : typeof m1
->fooExport : typeof m1.fooExport
+>fooExport : () => number
 
 var myvar = new m1.m2.c();
 >myvar : m1.m2.c
diff --git a/tests/baselines/reference/commentsOverloads.types b/tests/baselines/reference/commentsOverloads.types
index c9fc0517fd4..9984c1b5b26 100644
--- a/tests/baselines/reference/commentsOverloads.types
+++ b/tests/baselines/reference/commentsOverloads.types
@@ -1,96 +1,96 @@
 === tests/cases/compiler/commentsOverloads.ts ===
 /** this is signature 1*/
 function f1(/**param a*/a: number): number;
->f1 : typeof f1
+>f1 : { (a: number): number; (b: string): number; }
 >a : number
 
 function f1(b: string): number;
->f1 : typeof f1
+>f1 : { (a: number): number; (b: string): number; }
 >b : string
 
 function f1(aOrb: any) {
->f1 : typeof f1
+>f1 : { (a: number): number; (b: string): number; }
 >aOrb : any
 
     return 10;
 }
 f1("hello");
 >f1("hello") : number
->f1 : typeof f1
+>f1 : { (a: number): number; (b: string): number; }
 
 f1(10);
 >f1(10) : number
->f1 : typeof f1
+>f1 : { (a: number): number; (b: string): number; }
 
 function f2(a: number): number;
->f2 : typeof f2
+>f2 : { (a: number): number; (b: string): number; }
 >a : number
 
 /** this is signature 2*/
 function f2(b: string): number;
->f2 : typeof f2
+>f2 : { (a: number): number; (b: string): number; }
 >b : string
 
 /** this is f2 var comment*/
 function f2(aOrb: any) {
->f2 : typeof f2
+>f2 : { (a: number): number; (b: string): number; }
 >aOrb : any
 
     return 10;
 }
 f2("hello");
 >f2("hello") : number
->f2 : typeof f2
+>f2 : { (a: number): number; (b: string): number; }
 
 f2(10);
 >f2(10) : number
->f2 : typeof f2
+>f2 : { (a: number): number; (b: string): number; }
 
 function f3(a: number): number;
->f3 : typeof f3
+>f3 : { (a: number): number; (b: string): number; }
 >a : number
 
 function f3(b: string): number;
->f3 : typeof f3
+>f3 : { (a: number): number; (b: string): number; }
 >b : string
 
 function f3(aOrb: any) {
->f3 : typeof f3
+>f3 : { (a: number): number; (b: string): number; }
 >aOrb : any
 
     return 10;
 }
 f3("hello");
 >f3("hello") : number
->f3 : typeof f3
+>f3 : { (a: number): number; (b: string): number; }
 
 f3(10);
 >f3(10) : number
->f3 : typeof f3
+>f3 : { (a: number): number; (b: string): number; }
 
 /** this is signature 4 - with number parameter*/
 function f4(/**param a*/a: number): number;
->f4 : typeof f4
+>f4 : { (a: number): number; (b: string): number; }
 >a : number
 
 /** this is signature 4 - with string parameter*/
 function f4(b: string): number;
->f4 : typeof f4
+>f4 : { (a: number): number; (b: string): number; }
 >b : string
 
 function f4(aOrb: any) {
->f4 : typeof f4
+>f4 : { (a: number): number; (b: string): number; }
 >aOrb : any
 
     return 10;
 }
 f4("hello");
 >f4("hello") : number
->f4 : typeof f4
+>f4 : { (a: number): number; (b: string): number; }
 
 f4(10);
 >f4(10) : number
->f4 : typeof f4
+>f4 : { (a: number): number; (b: string): number; }
 
 interface i1 {
 >i1 : i1
diff --git a/tests/baselines/reference/commentsTypeParameters.types b/tests/baselines/reference/commentsTypeParameters.types
index 43344f1a826..573dabed7da 100644
--- a/tests/baselines/reference/commentsTypeParameters.types
+++ b/tests/baselines/reference/commentsTypeParameters.types
@@ -33,7 +33,7 @@ class C</**docComment for type parameter*/ T> {
 }
 
 function compare</**type*/T>(a: T, b: T) {
->compare : typeof compare
+>compare : <T>(a: T, b: T) => boolean
 >T : T
 >a : T
 >T : T
diff --git a/tests/baselines/reference/commentsdoNotEmitComments.types b/tests/baselines/reference/commentsdoNotEmitComments.types
index 48a5904f44e..c42d3d2c17c 100644
--- a/tests/baselines/reference/commentsdoNotEmitComments.types
+++ b/tests/baselines/reference/commentsdoNotEmitComments.types
@@ -6,7 +6,7 @@ var myVariable = 10;
 
 /** function comments*/
 function foo(/** parameter comment*/p: number) {
->foo : typeof foo
+>foo : (p: number) => void
 >p : number
 }
 
@@ -16,7 +16,7 @@ var fooVar: () => void;
 
 foo(50);
 >foo(50) : void
->foo : typeof foo
+>foo : (p: number) => void
 
 fooVar();
 >fooVar() : void
diff --git a/tests/baselines/reference/commentsemitComments.types b/tests/baselines/reference/commentsemitComments.types
index 74747a4161d..b87ef5ad6fd 100644
--- a/tests/baselines/reference/commentsemitComments.types
+++ b/tests/baselines/reference/commentsemitComments.types
@@ -6,7 +6,7 @@ var myVariable = 10;
 
 /** function comments*/
 function foo(/** parameter comment*/p: number) {
->foo : typeof foo
+>foo : (p: number) => void
 >p : number
 }
 
@@ -16,7 +16,7 @@ var fooVar: () => void;
 
 foo(50);
 >foo(50) : void
->foo : typeof foo
+>foo : (p: number) => void
 
 fooVar();
 >fooVar() : void
diff --git a/tests/baselines/reference/comparisonOperatorWithIdenticalTypeParameter.types b/tests/baselines/reference/comparisonOperatorWithIdenticalTypeParameter.types
index 32a6a69f671..b545fdc9f1a 100644
--- a/tests/baselines/reference/comparisonOperatorWithIdenticalTypeParameter.types
+++ b/tests/baselines/reference/comparisonOperatorWithIdenticalTypeParameter.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/expressions/binaryOperators/comparisonOperator/comparisonOperatorWithIdenticalTypeParameter.ts ===
 function foo<T>(t: T) {
->foo : typeof foo
+>foo : <T>(t: T) => void
 >T : T
 >t : T
 >T : T
diff --git a/tests/baselines/reference/comparisonOperatorWithOneOperandIsAny.types b/tests/baselines/reference/comparisonOperatorWithOneOperandIsAny.types
index a4be3dfa27d..e132f03cfa3 100644
--- a/tests/baselines/reference/comparisonOperatorWithOneOperandIsAny.types
+++ b/tests/baselines/reference/comparisonOperatorWithOneOperandIsAny.types
@@ -9,7 +9,7 @@ enum E { a, b, c }
 >c : E
 
 function foo<T>(t: T) {
->foo : typeof foo
+>foo : <T>(t: T) => void
 >T : T
 >t : T
 >T : T
diff --git a/tests/baselines/reference/comparisonOperatorWithOneOperandIsNull.types b/tests/baselines/reference/comparisonOperatorWithOneOperandIsNull.types
index a1ed285e96c..d1b30eb7f6a 100644
--- a/tests/baselines/reference/comparisonOperatorWithOneOperandIsNull.types
+++ b/tests/baselines/reference/comparisonOperatorWithOneOperandIsNull.types
@@ -6,7 +6,7 @@ enum E { a, b, c }
 >c : E
 
 function foo<T>(t: T) {
->foo : typeof foo
+>foo : <T>(t: T) => void
 >T : T
 >t : T
 >T : T
diff --git a/tests/baselines/reference/comparisonOperatorWithOneOperandIsUndefined.types b/tests/baselines/reference/comparisonOperatorWithOneOperandIsUndefined.types
index a7b92a27c40..b4a70c3e3d6 100644
--- a/tests/baselines/reference/comparisonOperatorWithOneOperandIsUndefined.types
+++ b/tests/baselines/reference/comparisonOperatorWithOneOperandIsUndefined.types
@@ -10,7 +10,7 @@ enum E { a, b, c }
 >c : E
 
 function foo<T>(t: T) {
->foo : typeof foo
+>foo : <T>(t: T) => void
 >T : T
 >t : T
 >T : T
diff --git a/tests/baselines/reference/compositeGenericFunction.types b/tests/baselines/reference/compositeGenericFunction.types
index 2711c0fabc0..421b7bbe514 100644
--- a/tests/baselines/reference/compositeGenericFunction.types
+++ b/tests/baselines/reference/compositeGenericFunction.types
@@ -1,13 +1,13 @@
 === tests/cases/compiler/compositeGenericFunction.ts ===
 function f<T>(value: T) { return value; };
->f : typeof f
+>f : <T>(value: T) => T
 >T : T
 >value : T
 >T : T
 >value : T
 
 function h<R>(func: (x: number) => R): R { return null; }
->h : typeof h
+>h : <R>(func: (x: number) => R) => R
 >R : R
 >func : (x: number) => R
 >x : number
@@ -17,12 +17,12 @@ function h<R>(func: (x: number) => R): R { return null; }
 var z: number = h<number>(f);
 >z : number
 >h<number>(f) : number
->h : typeof h
->f : typeof f
+>h : <R>(func: (x: number) => R) => R
+>f : <T>(value: T) => T
 
 var z: number = h(f);
 >z : number
 >h(f) : number
->h : typeof h
->f : typeof f
+>h : <R>(func: (x: number) => R) => R
+>f : <T>(value: T) => T
 
diff --git a/tests/baselines/reference/compoundAssignmentLHSIsReference.types b/tests/baselines/reference/compoundAssignmentLHSIsReference.types
index 1234d6fb876..e30cf19f3e3 100644
--- a/tests/baselines/reference/compoundAssignmentLHSIsReference.types
+++ b/tests/baselines/reference/compoundAssignmentLHSIsReference.types
@@ -17,7 +17,7 @@ x1 += value;
 >value : any
 
 function fn1(x2: number) {
->fn1 : typeof fn1
+>fn1 : (x2: number) => void
 >x2 : number
 
     x2 *= value;
@@ -76,7 +76,7 @@ x3['a'] += value;
 >value : any
 
 function fn2(x4: number) {
->fn2 : typeof fn2
+>fn2 : (x4: number) => void
 >x4 : number
 
     (x4) *= value;
diff --git a/tests/baselines/reference/conditionalExpressions2.types b/tests/baselines/reference/conditionalExpressions2.types
index a85b4889444..7fa483ad348 100644
--- a/tests/baselines/reference/conditionalExpressions2.types
+++ b/tests/baselines/reference/conditionalExpressions2.types
@@ -38,7 +38,7 @@ var h = [{h:5}, null];
 >h : number
 
 function i() { if (true) { return { x: 5 }; } else { return null; } }
->i : typeof i
+>i : () => { x: number; }
 >{ x: 5 } : { x: number; }
 >x : number
 
diff --git a/tests/baselines/reference/conditionalOperatorConditionIsNumberType.types b/tests/baselines/reference/conditionalOperatorConditionIsNumberType.types
index 2182a6864c2..3396885509a 100644
--- a/tests/baselines/reference/conditionalOperatorConditionIsNumberType.types
+++ b/tests/baselines/reference/conditionalOperatorConditionIsNumberType.types
@@ -95,7 +95,7 @@ condNumber ? exprIsObject1 : exprIsObject2;
 
 //Cond is a number type expression
 function foo() { return 1 };
->foo : typeof foo
+>foo : () => number
 
 var array = [1, 2, 3];
 >array : number[]
@@ -123,7 +123,7 @@ var array = [1, 2, 3];
 foo() ? exprString1 : exprString2;
 >foo() ? exprString1 : exprString2 : string
 >foo() : number
->foo : typeof foo
+>foo : () => number
 >exprString1 : string
 >exprString2 : string
 
@@ -131,7 +131,7 @@ foo() / array[1] ? exprIsObject1 : exprIsObject2;
 >foo() / array[1] ? exprIsObject1 : exprIsObject2 : Object
 >foo() / array[1] : number
 >foo() : number
->foo : typeof foo
+>foo : () => number
 >array[1] : number
 >array : number[]
 >exprIsObject1 : Object
@@ -230,7 +230,7 @@ var resultIsString3 = foo() ? exprString1 : exprString2;
 >resultIsString3 : string
 >foo() ? exprString1 : exprString2 : string
 >foo() : number
->foo : typeof foo
+>foo : () => number
 >exprString1 : string
 >exprString2 : string
 
@@ -239,7 +239,7 @@ var resultIsObject3 = foo() / array[1] ? exprIsObject1 : exprIsObject2;
 >foo() / array[1] ? exprIsObject1 : exprIsObject2 : Object
 >foo() / array[1] : number
 >foo() : number
->foo : typeof foo
+>foo : () => number
 >array[1] : number
 >array : number[]
 >exprIsObject1 : Object
diff --git a/tests/baselines/reference/conditionalOperatorConditionIsObjectType.types b/tests/baselines/reference/conditionalOperatorConditionIsObjectType.types
index d72ef94a175..36c15d64c54 100644
--- a/tests/baselines/reference/conditionalOperatorConditionIsObjectType.types
+++ b/tests/baselines/reference/conditionalOperatorConditionIsObjectType.types
@@ -37,7 +37,7 @@ var exprIsObject2: Object;
 >Object : Object
 
 function foo() { };
->foo : typeof foo
+>foo : () => void
 
 class C { static doIt: () => void };
 >C : C
@@ -126,7 +126,7 @@ condObject ? exprIsObject1 : exprIsObject2;
 foo() ? exprAny1 : exprAny2;
 >foo() ? exprAny1 : exprAny2 : any
 >foo() : void
->foo : typeof foo
+>foo : () => void
 >exprAny1 : any
 >exprAny2 : any
 
@@ -254,7 +254,7 @@ var resultIsAny3 = foo() ? exprAny1 : exprAny2;
 >resultIsAny3 : any
 >foo() ? exprAny1 : exprAny2 : any
 >foo() : void
->foo : typeof foo
+>foo : () => void
 >exprAny1 : any
 >exprAny2 : any
 
diff --git a/tests/baselines/reference/conditionalOperatorConditoinIsStringType.types b/tests/baselines/reference/conditionalOperatorConditoinIsStringType.types
index dd316991075..668e0fc437c 100644
--- a/tests/baselines/reference/conditionalOperatorConditoinIsStringType.types
+++ b/tests/baselines/reference/conditionalOperatorConditoinIsStringType.types
@@ -94,7 +94,7 @@ condString ? exprIsObject1 : exprIsObject2;
 
 //Cond is a string type expression
 function foo() { return "string" };
->foo : typeof foo
+>foo : () => string
 
 var array = ["1", "2", "3"];
 >array : string[]
@@ -125,7 +125,7 @@ condString + "string" ? exprNumber1 : exprNumber2;
 foo() ? exprString1 : exprString2;
 >foo() ? exprString1 : exprString2 : string
 >foo() : string
->foo : typeof foo
+>foo : () => string
 >exprString1 : string
 >exprString2 : string
 
@@ -231,7 +231,7 @@ var resultIsString3 = foo() ? exprString1 : exprString2;
 >resultIsString3 : string
 >foo() ? exprString1 : exprString2 : string
 >foo() : string
->foo : typeof foo
+>foo : () => string
 >exprString1 : string
 >exprString2 : string
 
diff --git a/tests/baselines/reference/conditionallyDuplicateOverloadsCausedByOverloadResolution.types b/tests/baselines/reference/conditionallyDuplicateOverloadsCausedByOverloadResolution.types
index 4affab88a68..41981e19b8e 100644
--- a/tests/baselines/reference/conditionallyDuplicateOverloadsCausedByOverloadResolution.types
+++ b/tests/baselines/reference/conditionallyDuplicateOverloadsCausedByOverloadResolution.types
@@ -1,12 +1,12 @@
 === tests/cases/compiler/conditionallyDuplicateOverloadsCausedByOverloadResolution.ts ===
 declare function foo(func: (x: string, y: string) => any): boolean;
->foo : typeof foo
+>foo : { (func: (x: string, y: string) => any): boolean; (func: (x: string, y: number) => any): string; }
 >func : (x: string, y: string) => any
 >x : string
 >y : string
 
 declare function foo(func: (x: string, y: number) => any): string;
->foo : typeof foo
+>foo : { (func: (x: string, y: string) => any): boolean; (func: (x: string, y: number) => any): string; }
 >func : (x: string, y: number) => any
 >x : string
 >y : number
@@ -14,7 +14,7 @@ declare function foo(func: (x: string, y: number) => any): string;
 var out = foo((x, y) => {
 >out : boolean
 >foo((x, y) => {    function bar(a: typeof x): void;    function bar(b: typeof y): void;    function bar() { }    return bar;}) : boolean
->foo : typeof foo
+>foo : { (func: (x: string, y: string) => any): boolean; (func: (x: string, y: number) => any): string; }
 >(x, y) => {    function bar(a: typeof x): void;    function bar(b: typeof y): void;    function bar() { }    return bar;} : (x: string, y: string) => { (a: string): void; (b: string): void; }
 >x : string
 >y : string
@@ -38,13 +38,13 @@ var out = foo((x, y) => {
 });
 
 declare function foo2(func: (x: string, y: string) => any): boolean;
->foo2 : typeof foo2
+>foo2 : { (func: (x: string, y: string) => any): boolean; (func: (x: string, y: number) => any): string; }
 >func : (x: string, y: string) => any
 >x : string
 >y : string
 
 declare function foo2(func: (x: string, y: number) => any): string;
->foo2 : typeof foo2
+>foo2 : { (func: (x: string, y: string) => any): boolean; (func: (x: string, y: number) => any): string; }
 >func : (x: string, y: number) => any
 >x : string
 >y : number
@@ -52,7 +52,7 @@ declare function foo2(func: (x: string, y: number) => any): string;
 var out2 = foo2((x, y) => {
 >out2 : boolean
 >foo2((x, y) => {    var bar: {        (a: typeof x): void;        (b: typeof y): void;    };    return bar;}) : boolean
->foo2 : typeof foo2
+>foo2 : { (func: (x: string, y: string) => any): boolean; (func: (x: string, y: number) => any): string; }
 >(x, y) => {    var bar: {        (a: typeof x): void;        (b: typeof y): void;    };    return bar;} : (x: string, y: string) => { (a: string): void; (b: string): void; }
 >x : string
 >y : string
diff --git a/tests/baselines/reference/constantOverloadFunction.types b/tests/baselines/reference/constantOverloadFunction.types
index aa2710a8c66..1e74486cb32 100644
--- a/tests/baselines/reference/constantOverloadFunction.types
+++ b/tests/baselines/reference/constantOverloadFunction.types
@@ -19,27 +19,27 @@ class Derived3 extends Base { biz() { } }
 >biz : () => void
 
 function foo(tagName: 'canvas'): Derived1;
->foo : typeof foo
+>foo : { (tagName: 'canvas'): Derived1; (tagName: 'div'): Derived2; (tagName: 'span'): Derived3; (tagName: string): Base; }
 >tagName : 'canvas'
 >Derived1 : Derived1
 
 function foo(tagName:  'div'): Derived2;
->foo : typeof foo
+>foo : { (tagName: 'canvas'): Derived1; (tagName: 'div'): Derived2; (tagName: 'span'): Derived3; (tagName: string): Base; }
 >tagName : 'div'
 >Derived2 : Derived2
 
 function foo(tagName: 'span'): Derived3;
->foo : typeof foo
+>foo : { (tagName: 'canvas'): Derived1; (tagName: 'div'): Derived2; (tagName: 'span'): Derived3; (tagName: string): Base; }
 >tagName : 'span'
 >Derived3 : Derived3
 
 function foo(tagName: string): Base;
->foo : typeof foo
+>foo : { (tagName: 'canvas'): Derived1; (tagName: 'div'): Derived2; (tagName: 'span'): Derived3; (tagName: string): Base; }
 >tagName : string
 >Base : Base
 
 function foo(tagName: any): Base {
->foo : typeof foo
+>foo : { (tagName: 'canvas'): Derived1; (tagName: 'div'): Derived2; (tagName: 'span'): Derived3; (tagName: string): Base; }
 >tagName : any
 >Base : Base
 
diff --git a/tests/baselines/reference/constraintPropagationThroughReturnTypes.types b/tests/baselines/reference/constraintPropagationThroughReturnTypes.types
index d8a7a5b9991..6f56cca28cc 100644
--- a/tests/baselines/reference/constraintPropagationThroughReturnTypes.types
+++ b/tests/baselines/reference/constraintPropagationThroughReturnTypes.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/constraintPropagationThroughReturnTypes.ts ===
 function g<T>(x: T): T {
->g : typeof g
+>g : <T>(x: T) => T
 >T : T
 >x : T
 >T : T
@@ -11,7 +11,7 @@ function g<T>(x: T): T {
 }
  
 function f<S extends { foo: string }>(x: S) {
->f : typeof f
+>f : <S extends { foo: string; }>(x: S) => void
 >S : S
 >foo : string
 >x : S
@@ -20,7 +20,7 @@ function f<S extends { foo: string }>(x: S) {
   var y = g(x);
 >y : S
 >g(x) : S
->g : typeof g
+>g : <T>(x: T) => T
 >x : S
 
   y;
diff --git a/tests/baselines/reference/constraintSatisfactionWithAny.types b/tests/baselines/reference/constraintSatisfactionWithAny.types
index 7e88d4044af..e007d3cec73 100644
--- a/tests/baselines/reference/constraintSatisfactionWithAny.types
+++ b/tests/baselines/reference/constraintSatisfactionWithAny.types
@@ -2,7 +2,7 @@
 // any is not a valid type argument unless there is no constraint, or the constraint is any
 
 function foo<T extends String>(x: T): T { return null; }
->foo : typeof foo
+>foo : <T extends String>(x: T) => T
 >T : T
 >String : String
 >x : T
@@ -10,7 +10,7 @@ function foo<T extends String>(x: T): T { return null; }
 >T : T
 
 function foo2<T extends { x: number }>(x: T): T { return null; }
->foo2 : typeof foo2
+>foo2 : <T extends { x: number; }>(x: T) => T
 >T : T
 >x : number
 >x : T
@@ -19,7 +19,7 @@ function foo2<T extends { x: number }>(x: T): T { return 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 : typeof foo4
+>foo4 : <T extends <T>(x: T) => void>(x: T) => T
 >T : T
 >T : T
 >x : T
@@ -33,18 +33,18 @@ var a;
 
 foo(a);
 >foo(a) : any
->foo : typeof foo
+>foo : <T extends String>(x: T) => T
 >a : any
 
 foo2(a);
 >foo2(a) : any
->foo2 : typeof foo2
+>foo2 : <T extends { x: number; }>(x: T) => T
 >a : any
 
 //foo3(a);
 foo4(a);
 >foo4(a) : any
->foo4 : typeof foo4
+>foo4 : <T extends <T>(x: T) => void>(x: T) => T
 >a : any
 
 var b: number;
@@ -52,18 +52,18 @@ var b: number;
 
 foo<any>(b);
 >foo<any>(b) : any
->foo : typeof foo
+>foo : <T extends String>(x: T) => T
 >b : number
 
 foo2<any>(b);
 >foo2<any>(b) : any
->foo2 : typeof foo2
+>foo2 : <T extends { x: number; }>(x: T) => T
 >b : number
 
 //foo3<any>(b);
 foo4<any>(b);
 >foo4<any>(b) : any
->foo4 : typeof foo4
+>foo4 : <T extends <T>(x: T) => void>(x: T) => T
 >b : number
 
 //function foo5<T extends String, U extends T>(x: T, y: U): T { return null; }
diff --git a/tests/baselines/reference/constraintSatisfactionWithEmptyObject.types b/tests/baselines/reference/constraintSatisfactionWithEmptyObject.types
index a36b8e5ec65..113736bdd11 100644
--- a/tests/baselines/reference/constraintSatisfactionWithEmptyObject.types
+++ b/tests/baselines/reference/constraintSatisfactionWithEmptyObject.types
@@ -3,7 +3,7 @@
 
 // Object constraint
 function foo<T extends Object>(x: T) { }
->foo : typeof foo
+>foo : <T extends Object>(x: T) => void
 >T : T
 >Object : Object
 >x : T
@@ -12,7 +12,7 @@ function foo<T extends Object>(x: T) { }
 var r = foo({});
 >r : void
 >foo({}) : void
->foo : typeof foo
+>foo : <T extends Object>(x: T) => void
 >{} : {}
 
 var a = {};
@@ -22,7 +22,7 @@ var a = {};
 var r = foo({});
 >r : void
 >foo({}) : void
->foo : typeof foo
+>foo : <T extends Object>(x: T) => void
 >{} : {}
 
 class C<T extends Object> {
@@ -56,7 +56,7 @@ var i: I<{}>;
 
 // {} constraint
 function foo2<T extends {}>(x: T) { }
->foo2 : typeof foo2
+>foo2 : <T extends {}>(x: T) => void
 >T : T
 >x : T
 >T : T
@@ -64,7 +64,7 @@ function foo2<T extends {}>(x: T) { }
 var r = foo2({});
 >r : void
 >foo2({}) : void
->foo2 : typeof foo2
+>foo2 : <T extends {}>(x: T) => void
 >{} : {}
 
 var a = {};
@@ -74,7 +74,7 @@ var a = {};
 var r = foo2({});
 >r : void
 >foo2({}) : void
->foo2 : typeof foo2
+>foo2 : <T extends {}>(x: T) => void
 >{} : {}
 
 class C2<T extends {}> {
diff --git a/tests/baselines/reference/constructorArgWithGenericCallSignature.types b/tests/baselines/reference/constructorArgWithGenericCallSignature.types
index 339ca301f63..a419f3a3427 100644
--- a/tests/baselines/reference/constructorArgWithGenericCallSignature.types
+++ b/tests/baselines/reference/constructorArgWithGenericCallSignature.types
@@ -20,7 +20,7 @@ module Test {
     }
  
  export function F(func: MyFunc) { }
->F : typeof F
+>F : (func: MyFunc) => void
 >func : MyFunc
 >MyFunc : MyFunc
 }
@@ -31,9 +31,9 @@ var func: Test.MyFunc;
 
 Test.F(func); // OK
 >Test.F(func) : void
->Test.F : typeof Test.F
+>Test.F : (func: Test.MyFunc) => void
 >Test : typeof Test
->F : typeof Test.F
+>F : (func: Test.MyFunc) => void
 >func : Test.MyFunc
 
 var test = new Test.MyClass(func); // Should be OK
diff --git a/tests/baselines/reference/contextualSigInstantiationRestParams.types b/tests/baselines/reference/contextualSigInstantiationRestParams.types
index 6dc06be50fc..76a00310fd9 100644
--- a/tests/baselines/reference/contextualSigInstantiationRestParams.types
+++ b/tests/baselines/reference/contextualSigInstantiationRestParams.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/contextualSigInstantiationRestParams.ts ===
 declare function toInstantiate<A, B>(a?: A, b?: B): B;
->toInstantiate : typeof toInstantiate
+>toInstantiate : <A, B>(a?: A, b?: B) => B
 >A : A
 >B : B
 >a : A
@@ -10,11 +10,11 @@ declare function toInstantiate<A, B>(a?: A, b?: B): B;
 >B : B
 
 declare function contextual(...s: string[]): string
->contextual : typeof contextual
+>contextual : (...s: string[]) => string
 >s : string[]
 
 var sig: typeof contextual = toInstantiate;
->sig : typeof contextual
->contextual : typeof contextual
->toInstantiate : typeof toInstantiate
+>sig : (...s: string[]) => string
+>contextual : (...s: string[]) => string
+>toInstantiate : <A, B>(a?: A, b?: B) => B
 
diff --git a/tests/baselines/reference/contextualSignatureInstantiation1.types b/tests/baselines/reference/contextualSignatureInstantiation1.types
index e181cd47ab3..3a95e87b76f 100644
--- a/tests/baselines/reference/contextualSignatureInstantiation1.types
+++ b/tests/baselines/reference/contextualSignatureInstantiation1.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/contextualSignatureInstantiation1.ts ===
 declare function map<S, T>(f: (x: S) => T): (a: S[]) => T[];
->map : typeof map
+>map : <S, T>(f: (x: S) => T) => (a: S[]) => T[]
 >S : S
 >T : T
 >f : (x: S) => T
@@ -25,11 +25,11 @@ var e = <K>(x: string, y?: K) => x.length;
 var r99 = map(e); // should be {}[] for S since a generic lambda is not inferentially typed
 >r99 : (a: {}[]) => number[]
 >map(e) : (a: {}[]) => number[]
->map : typeof map
+>map : <S, T>(f: (x: S) => T) => (a: S[]) => T[]
 >e : <K>(x: string, y?: K) => number
 
 declare function map2<S extends { length: number }, T>(f: (x: S) => T): (a: S[]) => T[];
->map2 : typeof map2
+>map2 : <S extends { length: number; }, T>(f: (x: S) => T) => (a: S[]) => T[]
 >S : S
 >length : number
 >T : T
@@ -55,6 +55,6 @@ var e2 = <K>(x: string, y?: K) => x.length;
 var r100 = map2(e2); // type arg inference should fail for S since a generic lambda is not inferentially typed. Falls back to { length: number }
 >r100 : (a: { length: number; }[]) => number[]
 >map2(e2) : (a: { length: number; }[]) => number[]
->map2 : typeof map2
+>map2 : <S extends { length: number; }, T>(f: (x: S) => T) => (a: S[]) => T[]
 >e2 : <K>(x: string, y?: K) => number
 
diff --git a/tests/baselines/reference/contextualSignatureInstantiation3.types b/tests/baselines/reference/contextualSignatureInstantiation3.types
index eba0e9aee72..c6ed5a7e97d 100644
--- a/tests/baselines/reference/contextualSignatureInstantiation3.types
+++ b/tests/baselines/reference/contextualSignatureInstantiation3.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/contextualSignatureInstantiation3.ts ===
 function map<T, U>(items: T[], f: (x: T) => U): U[]{
->map : typeof map
+>map : <T, U>(items: T[], f: (x: T) => U) => U[]
 >T : T
 >U : U
 >items : T[]
@@ -20,7 +20,7 @@ function map<T, U>(items: T[], f: (x: T) => U): U[]{
 }
 
 function identity<T>(x: T) {
->identity : typeof identity
+>identity : <T>(x: T) => T
 >T : T
 >x : T
 >T : T
@@ -30,7 +30,7 @@ function identity<T>(x: T) {
 }
 
 function singleton<T>(x: T) {
->singleton : typeof singleton
+>singleton : <T>(x: T) => T[]
 >T : T
 >x : T
 >T : T
@@ -54,14 +54,14 @@ var v1 = xs.map(identity);      // Error if not number[]
 >xs.map : <U>(callbackfn: (value: number, index: number, array: number[]) => U, thisArg?: any) => U[]
 >xs : number[]
 >map : <U>(callbackfn: (value: number, index: number, array: number[]) => U, thisArg?: any) => U[]
->identity : typeof identity
+>identity : <T>(x: T) => T
 
 var v1 = map(xs, identity);     // Error if not number[]
 >v1 : number[]
 >map(xs, identity) : number[]
->map : typeof map
+>map : <T, U>(items: T[], f: (x: T) => U) => U[]
 >xs : number[]
->identity : typeof identity
+>identity : <T>(x: T) => T
 
 var v2: number[][];         
 >v2 : number[][]
@@ -72,12 +72,12 @@ var v2 = xs.map(singleton);     // Error if not number[][]
 >xs.map : <U>(callbackfn: (value: number, index: number, array: number[]) => U, thisArg?: any) => U[]
 >xs : number[]
 >map : <U>(callbackfn: (value: number, index: number, array: number[]) => U, thisArg?: any) => U[]
->singleton : typeof singleton
+>singleton : <T>(x: T) => T[]
 
 var v2 = map(xs, singleton);    // Error if not number[][]
 >v2 : number[][]
 >map(xs, singleton) : number[][]
->map : typeof map
+>map : <T, U>(items: T[], f: (x: T) => U) => U[]
 >xs : number[]
->singleton : typeof singleton
+>singleton : <T>(x: T) => T[]
 
diff --git a/tests/baselines/reference/contextualSignatureInstantiationWithTypeParameterConstrainedToOuterTypeParameter.types b/tests/baselines/reference/contextualSignatureInstantiationWithTypeParameterConstrainedToOuterTypeParameter.types
index e858596a976..89ea3028d94 100644
--- a/tests/baselines/reference/contextualSignatureInstantiationWithTypeParameterConstrainedToOuterTypeParameter.types
+++ b/tests/baselines/reference/contextualSignatureInstantiationWithTypeParameterConstrainedToOuterTypeParameter.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/contextualSignatureInstantiationWithTypeParameterConstrainedToOuterTypeParameter.ts ===
 function f<T>() {
->f : typeof f
+>f : <T>() => <U extends T>(u: U) => U
 >T : T
 
     function g<U extends T>(u: U): U { return null }
@@ -31,5 +31,5 @@ var x = h("", f<string>()); // Call should succeed and x should be string. All t
 >h("", f<string>()) : string
 >h : <V, W>(v: V, func: (v: V) => W) => W
 >f<string>() : <U extends string>(u: U) => U
->f : typeof f
+>f : <T>() => <U extends T>(u: U) => U
 
diff --git a/tests/baselines/reference/contextualTypeAppliedToVarArgs.types b/tests/baselines/reference/contextualTypeAppliedToVarArgs.types
index b6c50514918..cbd16aea35f 100644
--- a/tests/baselines/reference/contextualTypeAppliedToVarArgs.types
+++ b/tests/baselines/reference/contextualTypeAppliedToVarArgs.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/contextualTypeAppliedToVarArgs.ts ===
 function delegate(instance: any, method: (...args: any[]) => any, data?: any): (...args: any[]) => any {
->delegate : typeof delegate
+>delegate : (instance: any, method: (...args: any[]) => any, data?: any) => (...args: any[]) => any
 >instance : any
 >method : (...args: any[]) => any
 >args : any[]
@@ -20,7 +20,7 @@ class Foo{
 
         delegate(this, function (source, args2)
 >delegate(this, function (source, args2)        {            var a = source.node;            var b = args2.node;        } ) : (...args: any[]) => any
->delegate : typeof delegate
+>delegate : (instance: any, method: (...args: any[]) => any, data?: any) => (...args: any[]) => any
 >this : Foo
 >function (source, args2)        {            var a = source.node;            var b = args2.node;        } : (source: any, args2: any) => void
 >source : any
diff --git a/tests/baselines/reference/contextualTyping25.types b/tests/baselines/reference/contextualTyping25.types
index 9b7b60a8715..3c6442739a2 100644
--- a/tests/baselines/reference/contextualTyping25.types
+++ b/tests/baselines/reference/contextualTyping25.types
@@ -1,10 +1,10 @@
 === tests/cases/compiler/contextualTyping25.ts ===
 function foo(param:{id:number;}){}; foo(<{id:number;}>({}));
->foo : typeof foo
+>foo : (param: { id: number; }) => void
 >param : { id: number; }
 >id : number
 >foo(<{id:number;}>({})) : void
->foo : typeof foo
+>foo : (param: { id: number; }) => void
 ><{id:number;}>({}) : { id: number; }
 >id : number
 >({}) : {}
diff --git a/tests/baselines/reference/contextualTyping26.types b/tests/baselines/reference/contextualTyping26.types
index 45363789c20..65a089f6082 100644
--- a/tests/baselines/reference/contextualTyping26.types
+++ b/tests/baselines/reference/contextualTyping26.types
@@ -1,10 +1,10 @@
 === tests/cases/compiler/contextualTyping26.ts ===
 function foo(param:{id:number;}){}; foo(<{id:number;}>({}));
->foo : typeof foo
+>foo : (param: { id: number; }) => void
 >param : { id: number; }
 >id : number
 >foo(<{id:number;}>({})) : void
->foo : typeof foo
+>foo : (param: { id: number; }) => void
 ><{id:number;}>({}) : { id: number; }
 >id : number
 >({}) : {}
diff --git a/tests/baselines/reference/contextualTyping27.types b/tests/baselines/reference/contextualTyping27.types
index e74bee5e052..f668565e43d 100644
--- a/tests/baselines/reference/contextualTyping27.types
+++ b/tests/baselines/reference/contextualTyping27.types
@@ -1,10 +1,10 @@
 === tests/cases/compiler/contextualTyping27.ts ===
 function foo(param:{id:number;}){}; foo(<{id:number;}>({}));
->foo : typeof foo
+>foo : (param: { id: number; }) => void
 >param : { id: number; }
 >id : number
 >foo(<{id:number;}>({})) : void
->foo : typeof foo
+>foo : (param: { id: number; }) => void
 ><{id:number;}>({}) : { id: number; }
 >id : number
 >({}) : {}
diff --git a/tests/baselines/reference/contextualTyping28.types b/tests/baselines/reference/contextualTyping28.types
index 04ca0651af5..6019fde4a6b 100644
--- a/tests/baselines/reference/contextualTyping28.types
+++ b/tests/baselines/reference/contextualTyping28.types
@@ -1,8 +1,8 @@
 === tests/cases/compiler/contextualTyping28.ts ===
 function foo(param:number[]){}; foo([1]);
->foo : typeof foo
+>foo : (param: number[]) => void
 >param : number[]
 >foo([1]) : void
->foo : typeof foo
+>foo : (param: number[]) => void
 >[1] : number[]
 
diff --git a/tests/baselines/reference/contextualTyping29.types b/tests/baselines/reference/contextualTyping29.types
index a06d296a378..9666e60e959 100644
--- a/tests/baselines/reference/contextualTyping29.types
+++ b/tests/baselines/reference/contextualTyping29.types
@@ -1,8 +1,8 @@
 === tests/cases/compiler/contextualTyping29.ts ===
 function foo(param:number[]){}; foo([1, 3]);
->foo : typeof foo
+>foo : (param: number[]) => void
 >param : number[]
 >foo([1, 3]) : void
->foo : typeof foo
+>foo : (param: number[]) => void
 >[1, 3] : number[]
 
diff --git a/tests/baselines/reference/contextualTyping31.types b/tests/baselines/reference/contextualTyping31.types
index 80511aada95..e37bacd33f3 100644
--- a/tests/baselines/reference/contextualTyping31.types
+++ b/tests/baselines/reference/contextualTyping31.types
@@ -1,8 +1,8 @@
 === tests/cases/compiler/contextualTyping31.ts ===
 function foo(param:number[]){}; foo([1]);
->foo : typeof foo
+>foo : (param: number[]) => void
 >param : number[]
 >foo([1]) : void
->foo : typeof foo
+>foo : (param: number[]) => void
 >[1] : number[]
 
diff --git a/tests/baselines/reference/contextualTyping32.types b/tests/baselines/reference/contextualTyping32.types
index cb8ad24166b..a9d41405b93 100644
--- a/tests/baselines/reference/contextualTyping32.types
+++ b/tests/baselines/reference/contextualTyping32.types
@@ -1,10 +1,10 @@
 === tests/cases/compiler/contextualTyping32.ts ===
 function foo(param: {():number; (i:number):number; }[]) { }; foo([function(){return 1;}, function(){return 4}]);
->foo : typeof foo
+>foo : (param: { (): number; (i: number): number; }[]) => void
 >param : { (): number; (i: number): number; }[]
 >i : number
 >foo([function(){return 1;}, function(){return 4}]) : void
->foo : typeof foo
+>foo : (param: { (): number; (i: number): number; }[]) => void
 >[function(){return 1;}, function(){return 4}] : { (): number; (i: number): number; }[]
 >function(){return 1;} : () => number
 >function(){return 4} : () => number
diff --git a/tests/baselines/reference/contextualTypingTwoInstancesOfSameTypeParameter.types b/tests/baselines/reference/contextualTypingTwoInstancesOfSameTypeParameter.types
index fb24b8c6f2b..0e5c25a9282 100644
--- a/tests/baselines/reference/contextualTypingTwoInstancesOfSameTypeParameter.types
+++ b/tests/baselines/reference/contextualTypingTwoInstancesOfSameTypeParameter.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/contextualTypingTwoInstancesOfSameTypeParameter.ts ===
 function f6<T>(x: (a: T) => T) {
->f6 : typeof f6
+>f6 : <T>(x: (a: T) => T) => any
 >T : T
 >x : (a: T) => T
 >a : T
@@ -11,11 +11,11 @@ function f6<T>(x: (a: T) => T) {
 } 
 f6(x => f6(y => x = y));
 >f6(x => f6(y => x = y)) : any
->f6 : typeof f6
+>f6 : <T>(x: (a: T) => T) => any
 >x => f6(y => x = y) : (x: {}) => any
 >x : {}
 >f6(y => x = y) : any
->f6 : typeof f6
+>f6 : <T>(x: (a: T) => T) => any
 >y => x = y : (y: {}) => {}
 >y : {}
 >x = y : {}
diff --git a/tests/baselines/reference/convertKeywordsYes.types b/tests/baselines/reference/convertKeywordsYes.types
index 75779136160..af2e0766181 100644
--- a/tests/baselines/reference/convertKeywordsYes.types
+++ b/tests/baselines/reference/convertKeywordsYes.types
@@ -56,7 +56,7 @@ var declare = 0;
 >declare : number
 
 function bigGeneric<
->bigGeneric : typeof 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
diff --git a/tests/baselines/reference/covariance1.types b/tests/baselines/reference/covariance1.types
index d9f39089b1d..d9167095d47 100644
--- a/tests/baselines/reference/covariance1.types
+++ b/tests/baselines/reference/covariance1.types
@@ -17,7 +17,7 @@ module M {
 >X : X
 
     export function f(y:Y) { }
->f : typeof f
+>f : (y: Y) => void
 >y : Y
 >Y : Y
 
@@ -27,7 +27,7 @@ module M {
 
     f({x:a}); // ok
 >f({x:a}) : void
->f : typeof f
+>f : (y: Y) => void
 >{x:a} : { x: X; }
 >x : X
 >a : X
@@ -38,7 +38,7 @@ module M {
 
     f({x:b}); // ok covariant subtype
 >f({x:b}) : void
->f : typeof f
+>f : (y: Y) => void
 >{x:b} : { x: XX; }
 >x : XX
 >b : XX
diff --git a/tests/baselines/reference/crashInresolveReturnStatement.types b/tests/baselines/reference/crashInresolveReturnStatement.types
index d15889cce40..6d31f15569b 100644
--- a/tests/baselines/reference/crashInresolveReturnStatement.types
+++ b/tests/baselines/reference/crashInresolveReturnStatement.types
@@ -22,7 +22,7 @@ class CreateCopyOfWorkItemDialog {
     }
 }
 function createWorkItemDialog<P0>(dialogType: P0) {
->createWorkItemDialog : typeof createWorkItemDialog
+>createWorkItemDialog : <P0>(dialogType: P0) => void
 >P0 : P0
 >dialogType : P0
 >P0 : P0
@@ -35,7 +35,7 @@ class WITDialogs {
 
         createWorkItemDialog(CreateCopyOfWorkItemDialog);
 >createWorkItemDialog(CreateCopyOfWorkItemDialog) : void
->createWorkItemDialog : typeof createWorkItemDialog
+>createWorkItemDialog : <P0>(dialogType: P0) => void
 >CreateCopyOfWorkItemDialog : typeof CreateCopyOfWorkItemDialog
     }
 }
diff --git a/tests/baselines/reference/debugger.types b/tests/baselines/reference/debugger.types
index f53af948b67..8d46931bf8f 100644
--- a/tests/baselines/reference/debugger.types
+++ b/tests/baselines/reference/debugger.types
@@ -2,7 +2,7 @@
 debugger;
 
 function foo() {
->foo : typeof foo
+>foo : () => void
 
     debugger;
 
diff --git a/tests/baselines/reference/declFileFunctions.types b/tests/baselines/reference/declFileFunctions.types
index 841c47a6ca0..46281813eb0 100644
--- a/tests/baselines/reference/declFileFunctions.types
+++ b/tests/baselines/reference/declFileFunctions.types
@@ -2,11 +2,11 @@
 
 /** This comment should appear for foo*/
 export function foo() {
->foo : typeof foo
+>foo : () => void
 }
 /** This is comment for function signature*/
 export function fooWithParameters(/** this is comment about a*/a: string,
->fooWithParameters : typeof fooWithParameters
+>fooWithParameters : (a: string, b: number) => void
 >a : string
 
     /** this is comment for b*/
@@ -18,7 +18,7 @@ export function fooWithParameters(/** this is comment about a*/a: string,
 >a : string
 }
 export function fooWithRestParameters(a: string, ...rests: string[]) {
->fooWithRestParameters : typeof fooWithRestParameters
+>fooWithRestParameters : (a: string, ...rests: string[]) => string
 >a : string
 >rests : string[]
 
@@ -32,15 +32,15 @@ export function fooWithRestParameters(a: string, ...rests: string[]) {
 }
 
 export function fooWithOverloads(a: string): string;
->fooWithOverloads : typeof fooWithOverloads
+>fooWithOverloads : { (a: string): string; (a: number): number; }
 >a : string
 
 export function fooWithOverloads(a: number): number;
->fooWithOverloads : typeof fooWithOverloads
+>fooWithOverloads : { (a: string): string; (a: number): number; }
 >a : number
 
 export function fooWithOverloads(a: any): any {
->fooWithOverloads : typeof fooWithOverloads
+>fooWithOverloads : { (a: string): string; (a: number): number; }
 >a : any
 
     return a;
@@ -49,11 +49,11 @@ export function fooWithOverloads(a: any): any {
 
 /** This comment should appear for nonExportedFoo*/
 function nonExportedFoo() {
->nonExportedFoo : typeof nonExportedFoo
+>nonExportedFoo : () => void
 }
 /** This is comment for function signature*/
 function nonExportedFooWithParameters(/** this is comment about a*/a: string,
->nonExportedFooWithParameters : typeof nonExportedFooWithParameters
+>nonExportedFooWithParameters : (a: string, b: number) => void
 >a : string
 
     /** this is comment for b*/
@@ -65,7 +65,7 @@ function nonExportedFooWithParameters(/** this is comment about a*/a: string,
 >a : string
 }
 function nonExportedFooWithRestParameters(a: string, ...rests: string[]) {
->nonExportedFooWithRestParameters : typeof nonExportedFooWithRestParameters
+>nonExportedFooWithRestParameters : (a: string, ...rests: string[]) => string
 >a : string
 >rests : string[]
 
@@ -79,15 +79,15 @@ function nonExportedFooWithRestParameters(a: string, ...rests: string[]) {
 }
 
 function nonExportedFooWithOverloads(a: string): string;
->nonExportedFooWithOverloads : typeof nonExportedFooWithOverloads
+>nonExportedFooWithOverloads : { (a: string): string; (a: number): number; }
 >a : string
 
 function nonExportedFooWithOverloads(a: number): number;
->nonExportedFooWithOverloads : typeof nonExportedFooWithOverloads
+>nonExportedFooWithOverloads : { (a: string): string; (a: number): number; }
 >a : number
 
 function nonExportedFooWithOverloads(a: any): any {
->nonExportedFooWithOverloads : typeof nonExportedFooWithOverloads
+>nonExportedFooWithOverloads : { (a: string): string; (a: number): number; }
 >a : any
 
     return a;
@@ -97,11 +97,11 @@ function nonExportedFooWithOverloads(a: any): any {
 === tests/cases/compiler/declFileFunctions_1.ts ===
 /** This comment should appear for foo*/
 function globalfoo() {
->globalfoo : typeof globalfoo
+>globalfoo : () => void
 }
 /** This is comment for function signature*/
 function globalfooWithParameters(/** this is comment about a*/a: string,
->globalfooWithParameters : typeof globalfooWithParameters
+>globalfooWithParameters : (a: string, b: number) => void
 >a : string
 
     /** this is comment for b*/
@@ -113,7 +113,7 @@ function globalfooWithParameters(/** this is comment about a*/a: string,
 >a : string
 }
 function globalfooWithRestParameters(a: string, ...rests: string[]) {
->globalfooWithRestParameters : typeof globalfooWithRestParameters
+>globalfooWithRestParameters : (a: string, ...rests: string[]) => string
 >a : string
 >rests : string[]
 
@@ -126,15 +126,15 @@ function globalfooWithRestParameters(a: string, ...rests: string[]) {
 >join : (separator?: string) => string
 }
 function globalfooWithOverloads(a: string): string;
->globalfooWithOverloads : typeof globalfooWithOverloads
+>globalfooWithOverloads : { (a: string): string; (a: number): number; }
 >a : string
 
 function globalfooWithOverloads(a: number): number;
->globalfooWithOverloads : typeof globalfooWithOverloads
+>globalfooWithOverloads : { (a: string): string; (a: number): number; }
 >a : number
 
 function globalfooWithOverloads(a: any): any {
->globalfooWithOverloads : typeof globalfooWithOverloads
+>globalfooWithOverloads : { (a: string): string; (a: number): number; }
 >a : any
 
     return a;
diff --git a/tests/baselines/reference/declFileGenericType.types b/tests/baselines/reference/declFileGenericType.types
index 6239722b6b5..284ce8f475b 100644
--- a/tests/baselines/reference/declFileGenericType.types
+++ b/tests/baselines/reference/declFileGenericType.types
@@ -10,7 +10,7 @@ export module C {
 >B : B
     
     export function F<T>(x: T): A<B> { return null; }
->F : typeof F
+>F : <T>(x: T) => A<B>
 >T : T
 >x : T
 >T : T
@@ -18,7 +18,7 @@ export module C {
 >B : B
 
     export function F2<T>(x: T): C.A<C.B> { return null; }
->F2 : typeof F2
+>F2 : <T>(x: T) => A<B>
 >T : T
 >x : T
 >T : T
@@ -28,7 +28,7 @@ export module C {
 >B : B
 
     export function F3<T>(x: T): C.A<C.B>[] { return null; }
->F3 : typeof F3
+>F3 : <T>(x: T) => A<B>[]
 >T : T
 >x : T
 >T : T
@@ -38,7 +38,7 @@ export module C {
 >B : B
 
     export function F4<T extends A<B>>(x: T): Array<C.A<C.B>> { return null; }
->F4 : typeof F4
+>F4 : <T extends A<B>>(x: T) => A<B>[]
 >T : T
 >A : A<T>
 >B : B
@@ -51,12 +51,12 @@ export module C {
 >B : B
 
     export function F5<T>(): T { return null; }
->F5 : typeof F5
+>F5 : <T>() => T
 >T : T
 >T : T
 
     export function F6<T extends A<B>>(x: T): T { return null; }
->F6 : typeof F6
+>F6 : <T extends A<B>>(x: T) => T
 >T : T
 >A : A<T>
 >B : B
@@ -83,28 +83,28 @@ export var a: C.A<C.B>;
 >B : C.B
 
 export var b = C.F;
->b : typeof C.F
->C.F : typeof C.F
+>b : <T>(x: T) => C.A<C.B>
+>C.F : <T>(x: T) => C.A<C.B>
 >C : typeof C
->F : typeof C.F
+>F : <T>(x: T) => C.A<C.B>
 
 export var c = C.F2;
->c : typeof C.F2
->C.F2 : typeof C.F2
+>c : <T>(x: T) => C.A<C.B>
+>C.F2 : <T>(x: T) => C.A<C.B>
 >C : typeof C
->F2 : typeof C.F2
+>F2 : <T>(x: T) => C.A<C.B>
 
 export var d = C.F3;
->d : typeof C.F3
->C.F3 : typeof C.F3
+>d : <T>(x: T) => C.A<C.B>[]
+>C.F3 : <T>(x: T) => C.A<C.B>[]
 >C : typeof C
->F3 : typeof C.F3
+>F3 : <T>(x: T) => C.A<C.B>[]
 
 export var e = C.F4;
->e : typeof C.F4
->C.F4 : typeof C.F4
+>e : <T extends C.A<C.B>>(x: T) => C.A<C.B>[]
+>C.F4 : <T extends C.A<C.B>>(x: T) => C.A<C.B>[]
 >C : typeof C
->F4 : typeof C.F4
+>F4 : <T extends C.A<C.B>>(x: T) => C.A<C.B>[]
 
 export var x = (new C.D<C.A<C.B>>(new C.A<C.B>())).val;
 >x : C.A<C.B>
@@ -127,7 +127,7 @@ export var x = (new C.D<C.A<C.B>>(new C.A<C.B>())).val;
 >val : C.A<C.B>
 
 export function f<T extends C.A<C.B>>() { }
->f : typeof f
+>f : <T extends C.A<C.B>>() => void
 >T : T
 >C : unknown
 >A : C.A<T>
@@ -137,9 +137,9 @@ export function f<T extends C.A<C.B>>() { }
 export var g = C.F5<C.A<C.B>>();
 >g : C.A<C.B>
 >C.F5<C.A<C.B>>() : C.A<C.B>
->C.F5 : typeof C.F5
+>C.F5 : <T>() => T
 >C : typeof C
->F5 : typeof C.F5
+>F5 : <T>() => T
 >C : unknown
 >A : C.A<T>
 >C : unknown
@@ -160,8 +160,8 @@ export interface i extends C.A<C.B> { }
 >B : C.B
 
 export var j = C.F6;
->j : typeof C.F6
->C.F6 : typeof C.F6
+>j : <T extends C.A<C.B>>(x: T) => T
+>C.F6 : <T extends C.A<C.B>>(x: T) => T
 >C : typeof C
->F6 : typeof C.F6
+>F6 : <T extends C.A<C.B>>(x: T) => T
 
diff --git a/tests/baselines/reference/declFileRestParametersOfFunctionAndFunctionType.types b/tests/baselines/reference/declFileRestParametersOfFunctionAndFunctionType.types
index 41f709491d0..ecb7c002089 100644
--- a/tests/baselines/reference/declFileRestParametersOfFunctionAndFunctionType.types
+++ b/tests/baselines/reference/declFileRestParametersOfFunctionAndFunctionType.types
@@ -1,26 +1,26 @@
 === tests/cases/compiler/declFileRestParametersOfFunctionAndFunctionType.ts ===
 
 function f1(...args) { }
->f1 : typeof f1
+>f1 : (...args: any[]) => void
 >args : any[]
 
 function f2(x: (...args) => void) { }
->f2 : typeof f2
+>f2 : (x: (...args: any[]) => void) => void
 >x : (...args: any[]) => void
 >args : any[]
 
 function f3(x: { (...args): void }) { }
->f3 : typeof f3
+>f3 : (x: (...args: any[]) => void) => void
 >x : (...args: any[]) => void
 >args : any[]
 
 function f4<T extends (...args) => void>() { }
->f4 : typeof f4
+>f4 : <T extends (...args: any[]) => void>() => void
 >T : T
 >args : any[]
 
 function f5<T extends { (...args): void }>() { }
->f5 : typeof f5
+>f5 : <T extends (...args: any[]) => void>() => void
 >T : T
 >args : any[]
 
diff --git a/tests/baselines/reference/declFileTypeofFunction.types b/tests/baselines/reference/declFileTypeofFunction.types
index 0a2dae318e9..4f913b2c184 100644
--- a/tests/baselines/reference/declFileTypeofFunction.types
+++ b/tests/baselines/reference/declFileTypeofFunction.types
@@ -1,31 +1,31 @@
 === tests/cases/compiler/declFileTypeofFunction.ts ===
 
 function f(n: typeof f): string;
->f : typeof f
->n : typeof f
->f : typeof f
+>f : { (n: typeof f): string; (n: { (n: typeof g): number; (n: typeof f): number; }): string; }
+>n : { (n: typeof f): string; (n: { (n: typeof g): number; (n: typeof f): number; }): string; }
+>f : { (n: typeof f): string; (n: { (n: typeof g): number; (n: typeof f): number; }): string; }
 
 function f(n: typeof g): string;
->f : typeof f
->n : typeof g
->g : typeof g
+>f : { (n: typeof f): string; (n: { (n: typeof g): number; (n: typeof f): number; }): string; }
+>n : { (n: typeof g): number; (n: { (n: typeof f): string; (n: typeof g): string; }): number; }
+>g : { (n: typeof g): number; (n: { (n: typeof f): string; (n: typeof g): string; }): number; }
 
 function f() { return undefined; }
->f : typeof f
+>f : { (n: typeof f): string; (n: { (n: typeof g): number; (n: typeof f): number; }): string; }
 >undefined : undefined
 
 function g(n: typeof g): number;
->g : typeof g
->n : typeof g
->g : typeof g
+>g : { (n: typeof g): number; (n: { (n: typeof f): string; (n: typeof g): string; }): number; }
+>n : { (n: typeof g): number; (n: { (n: typeof f): string; (n: typeof g): string; }): number; }
+>g : { (n: typeof g): number; (n: { (n: typeof f): string; (n: typeof g): string; }): number; }
 
 function g(n: typeof f): number;
->g : typeof g
->n : typeof f
->f : typeof f
+>g : { (n: typeof g): number; (n: { (n: typeof f): string; (n: typeof g): string; }): number; }
+>n : { (n: typeof f): string; (n: { (n: typeof g): number; (n: typeof f): number; }): string; }
+>f : { (n: typeof f): string; (n: { (n: typeof g): number; (n: typeof f): number; }): string; }
 
 function g() { return undefined; }
->g : typeof g
+>g : { (n: typeof g): number; (n: { (n: typeof f): string; (n: typeof g): string; }): number; }
 >undefined : undefined
 
 var b: () => typeof b;
@@ -33,25 +33,25 @@ var b: () => typeof b;
 >b : any
 
 function b1() {
->b1 : typeof b1
+>b1 : () => typeof b1
 
     return b1;
->b1 : typeof b1
+>b1 : () => typeof b1
 }
 
 function foo(): typeof foo {
->foo : typeof foo
->foo : typeof foo
+>foo : () => typeof foo
+>foo : () => typeof foo
 
     return null;
 }
 var foo1: typeof foo;
->foo1 : typeof foo
->foo : typeof foo
+>foo1 : () => typeof foo
+>foo : () => typeof foo
 
 var foo2 = foo;
->foo2 : typeof foo
->foo : typeof foo
+>foo2 : () => typeof foo
+>foo : () => typeof foo
 
 var foo3 = function () {
 >foo3 : any
@@ -69,7 +69,7 @@ var x = () => {
 }
 
 function foo5(x: number) {
->foo5 : typeof foo5
+>foo5 : (x: number) => (x: number) => number
 >x : number
 
     function bar(x: number) {
diff --git a/tests/baselines/reference/declarationEmit_nameConflicts.types b/tests/baselines/reference/declarationEmit_nameConflicts.types
index fe6a5c29565..f07a7fbb2ab 100644
--- a/tests/baselines/reference/declarationEmit_nameConflicts.types
+++ b/tests/baselines/reference/declarationEmit_nameConflicts.types
@@ -6,7 +6,7 @@ export module M {
 >M : typeof M
 
     export function f() { }
->f : typeof f
+>f : () => void
 
     export class C { }
 >C : C
@@ -15,16 +15,16 @@ export module M {
 >N : typeof N
 
         export function g() { };
->g : typeof g
+>g : () => void
 
         export interface I { }
 >I : I
     }
 
     export import a = M.f;
->a : typeof f
+>a : () => void
 >M : typeof M
->f : typeof f
+>f : () => void
 
     export import b = M.C;
 >b : typeof C
@@ -45,7 +45,7 @@ export module M.P {
 >P : typeof P
 
     export function f() { }
->f : typeof f
+>f : () => void
 
     export class C { }
 >C : C
@@ -54,22 +54,22 @@ export module M.P {
 >N : typeof N
 
         export function g() { };
->g : typeof g
+>g : () => void
 
         export interface I { }
 >I : I
     }
     export import im = M.P.f;
->im : typeof f
+>im : () => void
 >M : typeof M
 >P : typeof P
->f : typeof f
+>f : () => void
 
     export var a = M.a; // emitted incorrectly as typeof f
->a : typeof M.f
->M.a : typeof M.f
+>a : () => void
+>M.a : () => void
 >M : typeof M
->a : typeof M.f
+>a : () => void
 
     export var b = M.b; // ok
 >b : typeof M.C
@@ -84,12 +84,12 @@ export module M.P {
 >c : typeof M.N
 
     export var g = M.c.g; // ok
->g : typeof M.c.g
->M.c.g : typeof M.c.g
+>g : () => void
+>M.c.g : () => void
 >M.c : typeof M.N
 >M : typeof M
 >c : typeof M.N
->g : typeof M.c.g
+>g : () => void
 
     export var d = M.d; // emitted incorrectly as typeof im
 >d : typeof M.d
@@ -103,7 +103,7 @@ export module M.Q {
 >Q : typeof Q
 
     export function f() { }
->f : typeof f
+>f : () => void
 
     export class C { }
 >C : C
@@ -112,7 +112,7 @@ export module M.Q {
 >N : typeof N
 
         export function g() { };
->g : typeof g
+>g : () => void
 
         export interface I { }
 >I : I
diff --git a/tests/baselines/reference/declarationEmit_nameConflicts2.types b/tests/baselines/reference/declarationEmit_nameConflicts2.types
index 258ea9596e8..026cfed0989 100644
--- a/tests/baselines/reference/declarationEmit_nameConflicts2.types
+++ b/tests/baselines/reference/declarationEmit_nameConflicts2.types
@@ -5,7 +5,7 @@ module X.Y.base {
 >base : typeof base
 
     export function f() { }
->f : typeof f
+>f : () => void
 
     export class C { }
 >C : C
@@ -27,14 +27,14 @@ module X.Y.base.Z {
 >Z : typeof Z
 
     export var f = X.Y.base.f; // Should be base.f
->f : typeof base.f
->X.Y.base.f : typeof base.f
+>f : () => void
+>X.Y.base.f : () => void
 >X.Y.base : typeof base
 >X.Y : typeof Y
 >X : typeof X
 >Y : typeof Y
 >base : typeof base
->f : typeof base.f
+>f : () => void
 
     export var C = X.Y.base.C; // Should be base.C
 >C : typeof base.C
diff --git a/tests/baselines/reference/declarationEmit_nameConflicts3.types b/tests/baselines/reference/declarationEmit_nameConflicts3.types
index d4b4934b2d1..50fd6ecdd1b 100644
--- a/tests/baselines/reference/declarationEmit_nameConflicts3.types
+++ b/tests/baselines/reference/declarationEmit_nameConflicts3.types
@@ -9,19 +9,19 @@ module M {
 >D : typeof D
 
         export function f() { }
->f : typeof f
+>f : () => void
     }
     export module C {
 >C : typeof C
 
         export function f() { }
->f : typeof f
+>f : () => void
     }
     export module E {
 >E : typeof E
 
         export function f() { }
->f : typeof f
+>f : () => void
     }
 }
 
@@ -51,26 +51,26 @@ module M.P {
 >D : M.D
 
     export var w = M.D.f; // error, should be typeof M.D.f
->w : typeof M.D.f
->M.D.f : typeof M.D.f
+>w : () => void
+>M.D.f : () => void
 >M.D : typeof M.D
 >M : typeof M
 >D : typeof M.D
->f : typeof M.D.f
+>f : () => void
 
     export var x = M.C.f; // error, should be typeof M.C.f
->x : typeof M.C.f
->M.C.f : typeof M.C.f
+>x : () => void
+>M.C.f : () => void
 >M.C : typeof M.C
 >M : typeof M
 >C : typeof M.C
->f : typeof M.C.f
+>f : () => void
 
     export var x = M.E.f; // error, should be typeof M.E.f
->x : typeof M.C.f
->M.E.f : typeof M.E.f
+>x : () => void
+>M.E.f : () => void
 >M.E : typeof M.E
 >M : typeof M
 >E : typeof M.E
->f : typeof M.E.f
+>f : () => void
 }
diff --git a/tests/baselines/reference/deleteOperatorWithBooleanType.types b/tests/baselines/reference/deleteOperatorWithBooleanType.types
index 93cc9971d11..fa8c375b0a5 100644
--- a/tests/baselines/reference/deleteOperatorWithBooleanType.types
+++ b/tests/baselines/reference/deleteOperatorWithBooleanType.types
@@ -4,7 +4,7 @@ var BOOLEAN: boolean;
 >BOOLEAN : boolean
 
 function foo(): boolean { return true; }
->foo : typeof foo
+>foo : () => boolean
 
 class A {
 >A : A
@@ -64,7 +64,7 @@ var ResultIsBoolean6 = delete foo();
 >ResultIsBoolean6 : boolean
 >delete foo() : boolean
 >foo() : boolean
->foo : typeof foo
+>foo : () => boolean
 
 var ResultIsBoolean7 = delete A.foo();
 >ResultIsBoolean7 : boolean
@@ -92,7 +92,7 @@ delete BOOLEAN;
 delete foo();
 >delete foo() : boolean
 >foo() : boolean
->foo : typeof foo
+>foo : () => boolean
 
 delete true, false;
 >delete true, false : boolean
diff --git a/tests/baselines/reference/deleteOperatorWithNumberType.types b/tests/baselines/reference/deleteOperatorWithNumberType.types
index f2301e698e0..542efe04c34 100644
--- a/tests/baselines/reference/deleteOperatorWithNumberType.types
+++ b/tests/baselines/reference/deleteOperatorWithNumberType.types
@@ -8,7 +8,7 @@ var NUMBER1: number[] = [1, 2];
 >[1, 2] : number[]
 
 function foo(): number { return 1; }
->foo : typeof foo
+>foo : () => number
 
 class A {
 >A : A
@@ -89,7 +89,7 @@ var ResultIsBoolean9 = delete foo();
 >ResultIsBoolean9 : boolean
 >delete foo() : boolean
 >foo() : number
->foo : typeof foo
+>foo : () => number
 
 var ResultIsBoolean10 = delete A.foo();
 >ResultIsBoolean10 : boolean
@@ -139,7 +139,7 @@ delete NUMBER1;
 delete foo();
 >delete foo() : boolean
 >foo() : number
->foo : typeof foo
+>foo : () => number
 
 delete objA.a;
 >delete objA.a : boolean
diff --git a/tests/baselines/reference/deleteOperatorWithStringType.types b/tests/baselines/reference/deleteOperatorWithStringType.types
index 869d5b24be5..f86afc39c49 100644
--- a/tests/baselines/reference/deleteOperatorWithStringType.types
+++ b/tests/baselines/reference/deleteOperatorWithStringType.types
@@ -8,7 +8,7 @@ var STRING1: string[] = ["", "abc"];
 >["", "abc"] : string[]
 
 function foo(): string { return "abc"; }
->foo : typeof foo
+>foo : () => string
 
 class A {
 >A : A
@@ -89,7 +89,7 @@ var ResultIsBoolean9 = delete foo();
 >ResultIsBoolean9 : boolean
 >delete foo() : boolean
 >foo() : string
->foo : typeof foo
+>foo : () => string
 
 var ResultIsBoolean10 = delete A.foo();
 >ResultIsBoolean10 : boolean
@@ -147,7 +147,7 @@ delete STRING1;
 delete foo();
 >delete foo() : boolean
 >foo() : string
->foo : typeof foo
+>foo : () => string
 
 delete objA.a,M.n;
 >delete objA.a,M.n : string
diff --git a/tests/baselines/reference/dottedSymbolResolution1.types b/tests/baselines/reference/dottedSymbolResolution1.types
index 11c52d494bb..776b9704e73 100644
--- a/tests/baselines/reference/dottedSymbolResolution1.types
+++ b/tests/baselines/reference/dottedSymbolResolution1.types
@@ -26,14 +26,14 @@ class Base { foo() { } }
 >foo : () => void
 
 function each(collection: string, callback: (indexInArray: any, valueOfElement: any) => any): any;
->each : typeof each
+>each : { (collection: string, callback: (indexInArray: any, valueOfElement: any) => any): any; (collection: JQuery, callback: (indexInArray: number, valueOfElement: Base) => any): any; }
 >collection : string
 >callback : (indexInArray: any, valueOfElement: any) => any
 >indexInArray : any
 >valueOfElement : any
 
 function each(collection: JQuery, callback: (indexInArray: number, valueOfElement: Base) => any): any;
->each : typeof each
+>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
@@ -42,7 +42,7 @@ function each(collection: JQuery, callback: (indexInArray: number, valueOfElemen
 >Base : Base
 
 function each(collection: any, callback: (indexInArray: any, valueOfElement: any) => any): any {
->each : typeof each
+>each : { (collection: string, callback: (indexInArray: any, valueOfElement: any) => any): any; (collection: JQuery, callback: (indexInArray: number, valueOfElement: Base) => any): any; }
 >collection : any
 >callback : (indexInArray: any, valueOfElement: any) => any
 >indexInArray : any
@@ -52,7 +52,7 @@ function each(collection: any, callback: (indexInArray: any, valueOfElement: any
 }
 
 function _setBarAndText(): void {
->_setBarAndText : typeof _setBarAndText
+>_setBarAndText : () => void
 
     var x: JQuery, $: JQueryStatic
 >x : JQuery
@@ -62,7 +62,7 @@ function _setBarAndText(): void {
 
     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
->each : typeof each
+>each : { (collection: string, callback: (indexInArray: any, valueOfElement: any) => any): any; (collection: JQuery, callback: (indexInArray: number, valueOfElement: Base) => any): any; }
 >x.find(" ") : JQuery
 >x.find : (selector: string) => JQuery
 >x : JQuery
diff --git a/tests/baselines/reference/duplicateVariablesByScope.types b/tests/baselines/reference/duplicateVariablesByScope.types
index add12599a83..ec20d665ad8 100644
--- a/tests/baselines/reference/duplicateVariablesByScope.types
+++ b/tests/baselines/reference/duplicateVariablesByScope.types
@@ -22,7 +22,7 @@ module M {
 }
 
 function foo() {
->foo : typeof foo
+>foo : () => void
 
     var x = 2;
 >x : number
diff --git a/tests/baselines/reference/es6ClassTest8.types b/tests/baselines/reference/es6ClassTest8.types
index 5d554708103..e5133c88d7e 100644
--- a/tests/baselines/reference/es6ClassTest8.types
+++ b/tests/baselines/reference/es6ClassTest8.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/es6ClassTest8.ts ===
 function f1(x:any) {return x;}
->f1 : typeof f1
+>f1 : (x: any) => any
 >x : any
 >x : any
 
@@ -20,9 +20,9 @@ class C {
         var b = f1(f1(bar));
 >b : any
 >f1(f1(bar)) : any
->f1 : typeof f1
+>f1 : (x: any) => any
 >f1(bar) : any
->f1 : typeof f1
+>f1 : (x: any) => any
 >bar : any
     }
   
diff --git a/tests/baselines/reference/everyTypeAssignableToAny.types b/tests/baselines/reference/everyTypeAssignableToAny.types
index 850a906ff9a..89af4f4b7c0 100644
--- a/tests/baselines/reference/everyTypeAssignableToAny.types
+++ b/tests/baselines/reference/everyTypeAssignableToAny.types
@@ -180,7 +180,7 @@ a = ae;
 >ae : E
 
 function foo<T, U /*extends T*/, V extends Date>(x: T, y: U, z: V) {
->foo : typeof foo
+>foo : <T, U, V extends Date>(x: T, y: U, z: V) => void
 >T : T
 >U : U
 >V : V
diff --git a/tests/baselines/reference/everyTypeWithAnnotationAndInitializer.types b/tests/baselines/reference/everyTypeWithAnnotationAndInitializer.types
index 7cca0148fce..54dcc67b78a 100644
--- a/tests/baselines/reference/everyTypeWithAnnotationAndInitializer.types
+++ b/tests/baselines/reference/everyTypeWithAnnotationAndInitializer.types
@@ -35,7 +35,7 @@ class D<T>{
 }
 
 function F(x: string): number { return 42; }
->F : typeof F
+>F : (x: string) => number
 >x : string
 
 module M {
@@ -49,7 +49,7 @@ module M {
     }
 
     export function F2(x: number): string { return x.toString(); }
->F2 : typeof F2
+>F2 : (x: number) => string
 >x : number
 >x.toString() : string
 >x.toString : (radix?: number) => string
@@ -117,18 +117,18 @@ var anOtherObjectLiteral: { id: number } = new C();
 >C : typeof C
 
 var aFunction: typeof F = F;
->aFunction : typeof F
->F : typeof F
->F : typeof F
+>aFunction : (x: string) => number
+>F : (x: string) => number
+>F : (x: string) => number
 
 var anOtherFunction: (x: string) => number = F;
 >anOtherFunction : (x: string) => number
 >x : string
->F : typeof F
+>F : (x: string) => number
 
 var aLambda: typeof F = (x) => 2;
->aLambda : typeof F
->F : typeof F
+>aLambda : (x: string) => number
+>F : (x: string) => number
 >(x) => 2 : (x: string) => number
 >x : string
 
@@ -147,9 +147,9 @@ var aClassInModule: M.A = new M.A();
 >A : typeof M.A
 
 var aFunctionInModule: typeof M.F2 = (x) => 'this is a string';
->aFunctionInModule : typeof M.F2
+>aFunctionInModule : (x: number) => string
 >M : typeof M
->F2 : typeof M.F2
+>F2 : (x: number) => string
 >(x) => 'this is a string' : (x: number) => string
 >x : number
 
diff --git a/tests/baselines/reference/everyTypeWithInitializer.types b/tests/baselines/reference/everyTypeWithInitializer.types
index 825656fbfea..3ebe8368f35 100644
--- a/tests/baselines/reference/everyTypeWithInitializer.types
+++ b/tests/baselines/reference/everyTypeWithInitializer.types
@@ -35,7 +35,7 @@ class D<T>{
 }
 
 function F(x: string): number { return 42; }
->F : typeof F
+>F : (x: string) => number
 >x : string
 
 module M {
@@ -49,7 +49,7 @@ module M {
     }
 
     export function F2(x: number): string { return x.toString(); }
->F2 : typeof F2
+>F2 : (x: number) => string
 >x : number
 >x.toString() : string
 >x.toString : (radix?: number) => string
@@ -103,8 +103,8 @@ var anObjectLiteral = { id: 12 };
 >id : number
 
 var aFunction = F;
->aFunction : typeof F
->F : typeof F
+>aFunction : (x: string) => number
+>F : (x: string) => number
 
 var aLambda = (x) => 2;
 >aLambda : (x: any) => number
@@ -123,10 +123,10 @@ var aClassInModule = new M.A();
 >A : typeof M.A
 
 var aFunctionInModule = M.F2;
->aFunctionInModule : typeof M.F2
->M.F2 : typeof M.F2
+>aFunctionInModule : (x: number) => string
+>M.F2 : (x: number) => string
 >M : typeof M
->F2 : typeof M.F2
+>F2 : (x: number) => string
 
 // no initializer or annotation, so this is an 'any'
 var x;
diff --git a/tests/baselines/reference/exportAssignmentFunction.types b/tests/baselines/reference/exportAssignmentFunction.types
index e1748f8b891..023a8c234d2 100644
--- a/tests/baselines/reference/exportAssignmentFunction.types
+++ b/tests/baselines/reference/exportAssignmentFunction.types
@@ -1,16 +1,16 @@
 === tests/cases/compiler/exportAssignmentFunction_B.ts ===
 import fooFunc = require("exportAssignmentFunction_A");
->fooFunc : typeof fooFunc
+>fooFunc : () => number
 
 var n: number = fooFunc();
 >n : number
 >fooFunc() : number
->fooFunc : typeof fooFunc
+>fooFunc : () => number
 
 === tests/cases/compiler/exportAssignmentFunction_A.ts ===
 function foo() { return 0; }
->foo : typeof foo
+>foo : () => number
 
 export = foo;
->foo : typeof foo
+>foo : () => number
 
diff --git a/tests/baselines/reference/exportAssignmentMergedModule.types b/tests/baselines/reference/exportAssignmentMergedModule.types
index 333cfdd9a93..d72f173a439 100644
--- a/tests/baselines/reference/exportAssignmentMergedModule.types
+++ b/tests/baselines/reference/exportAssignmentMergedModule.types
@@ -5,9 +5,9 @@ import foo = require("./foo_0");
 var a: number = foo.a();
 >a : number
 >foo.a() : number
->foo.a : typeof foo.a
+>foo.a : () => number
 >foo : typeof foo
->a : typeof foo.a
+>a : () => number
 
 if(!!foo.b){
 >!!foo.b : boolean
@@ -24,16 +24,16 @@ if(!!foo.b){
 >Test : typeof foo.Test
 >answer : number
 >foo.c(42) : number
->foo.c : typeof foo.c
+>foo.c : (a: number) => number
 >foo : typeof foo
->c : typeof foo.c
+>c : (a: number) => number
 }
 === tests/cases/conformance/externalModules/foo_0.ts ===
 module Foo {
 >Foo : typeof Foo
 
 	export function a(){
->a : typeof a
+>a : () => number
 
 		return 5;
 	}
@@ -44,7 +44,7 @@ module Foo {
 >Foo : typeof Foo
 
 	export function c(a: number){
->c : typeof c
+>c : (a: number) => number
 >a : number
 
 		return a;
diff --git a/tests/baselines/reference/exportCodeGen.types b/tests/baselines/reference/exportCodeGen.types
index 348d8f9c46f..89cb16fdf4c 100644
--- a/tests/baselines/reference/exportCodeGen.types
+++ b/tests/baselines/reference/exportCodeGen.types
@@ -9,7 +9,7 @@ module A {
 >x : number
 
     function lt12() {
->lt12 : typeof lt12
+>lt12 : () => boolean
 
         return x < 12;
 >x < 12 : boolean
@@ -25,7 +25,7 @@ module B {
 >x : number
 
     function lt12() {
->lt12 : typeof lt12
+>lt12 : () => boolean
 
         return x < 12;
 >x < 12 : boolean
@@ -38,7 +38,7 @@ module C {
 >C : typeof C
 
     function no() {
->no : typeof no
+>no : () => boolean
 
         return false;
     }
@@ -49,7 +49,7 @@ module D {
 >D : typeof D
 
     export function yes() {
->yes : typeof yes
+>yes : () => boolean
 
         return true;
     }
@@ -64,7 +64,7 @@ module E {
 >Red : Color
 
     export function fn() { }
->fn : typeof fn
+>fn : () => void
 
     export interface I { id: number }
 >I : I
@@ -92,7 +92,7 @@ module F {
 >Red : Color
 
     function fn() { }
->fn : typeof fn
+>fn : () => void
 
     interface I { id: number }
 >I : I
diff --git a/tests/baselines/reference/exportImport.types b/tests/baselines/reference/exportImport.types
index 88a9aded86f..9899103d779 100644
--- a/tests/baselines/reference/exportImport.types
+++ b/tests/baselines/reference/exportImport.types
@@ -3,7 +3,7 @@ import e = require('./exporter');
 >e : typeof e
 
 export function w(): e.w { // Should be OK
->w : typeof w
+>w : () => e.w
 >e : unknown
 >w : e.w
 
diff --git a/tests/baselines/reference/exportImportMultipleFiles.types b/tests/baselines/reference/exportImportMultipleFiles.types
index 368f857950b..adafcef2dba 100644
--- a/tests/baselines/reference/exportImportMultipleFiles.types
+++ b/tests/baselines/reference/exportImportMultipleFiles.types
@@ -4,15 +4,15 @@ import lib = require('./exportImportMultipleFiles_library');
 
 lib.math.add(3, 4); // Shouldnt be error
 >lib.math.add(3, 4) : any
->lib.math.add : typeof lib.math.add
+>lib.math.add : (a: any, b: any) => any
 >lib.math : typeof lib.math
 >lib : typeof lib
 >math : typeof lib.math
->add : typeof lib.math.add
+>add : (a: any, b: any) => any
 
 === tests/cases/compiler/exportImportMultipleFiles_math.ts ===
 export function add(a, b) { return a + b; }
->add : typeof add
+>add : (a: any, b: any) => any
 >a : any
 >b : any
 >a + b : any
@@ -25,7 +25,7 @@ export import math = require("exportImportMultipleFiles_math");
 
 math.add(3, 4); // OK
 >math.add(3, 4) : any
->math.add : typeof math.add
+>math.add : (a: any, b: any) => any
 >math : typeof math
->add : typeof math.add
+>add : (a: any, b: any) => any
 
diff --git a/tests/baselines/reference/exportImportNonInstantiatedModule2.types b/tests/baselines/reference/exportImportNonInstantiatedModule2.types
index 958f48bec9d..c11eac715a9 100644
--- a/tests/baselines/reference/exportImportNonInstantiatedModule2.types
+++ b/tests/baselines/reference/exportImportNonInstantiatedModule2.types
@@ -3,7 +3,7 @@ import e = require('./exporter');
 >e : typeof e
 
 export function w(): e.w { // Should be OK
->w : typeof w
+>w : () => e.w
 >e : unknown
 >w : e.w
 
diff --git a/tests/baselines/reference/exportVisibility.types b/tests/baselines/reference/exportVisibility.types
index c972bd0e5d6..59936828275 100644
--- a/tests/baselines/reference/exportVisibility.types
+++ b/tests/baselines/reference/exportVisibility.types
@@ -9,7 +9,7 @@ export var foo = new Foo();
 >Foo : typeof Foo
 
 export function test(foo: Foo) {
->test : typeof test
+>test : (foo: Foo) => boolean
 >foo : Foo
 >Foo : Foo
 
diff --git a/tests/baselines/reference/externFunc.types b/tests/baselines/reference/externFunc.types
index 2ba2886873d..5aac52ac125 100644
--- a/tests/baselines/reference/externFunc.types
+++ b/tests/baselines/reference/externFunc.types
@@ -1,9 +1,9 @@
 === tests/cases/compiler/externFunc.ts ===
 declare function parseInt(s:string):number;
->parseInt : typeof parseInt
+>parseInt : { (s: string, radix?: number): number; (s: string): number; }
 >s : string
 
 parseInt("2");
 >parseInt("2") : number
->parseInt : typeof parseInt
+>parseInt : { (s: string, radix?: number): number; (s: string): number; }
 
diff --git a/tests/baselines/reference/externalModuleReferenceOfImportDeclarationWithExportModifier.types b/tests/baselines/reference/externalModuleReferenceOfImportDeclarationWithExportModifier.types
index 4a20abec68b..bb49781d477 100644
--- a/tests/baselines/reference/externalModuleReferenceOfImportDeclarationWithExportModifier.types
+++ b/tests/baselines/reference/externalModuleReferenceOfImportDeclarationWithExportModifier.types
@@ -4,11 +4,11 @@ export import file1 = require('externalModuleReferenceOfImportDeclarationWithExp
 
 file1.foo();
 >file1.foo() : void
->file1.foo : typeof file1.foo
+>file1.foo : () => void
 >file1 : typeof file1
->foo : typeof file1.foo
+>foo : () => void
 
 === tests/cases/compiler/externalModuleReferenceOfImportDeclarationWithExportModifier_0.ts ===
 export function foo() { };
->foo : typeof foo
+>foo : () => void
 
diff --git a/tests/baselines/reference/fatarrowfunctions.types b/tests/baselines/reference/fatarrowfunctions.types
index 0ac210f1b4e..1b819b8496a 100644
--- a/tests/baselines/reference/fatarrowfunctions.types
+++ b/tests/baselines/reference/fatarrowfunctions.types
@@ -1,7 +1,7 @@
 === tests/cases/compiler/fatarrowfunctions.ts ===
 
 function foo(x:any) {
->foo : typeof foo
+>foo : (x: any) => any
 >x : any
 
 	return x();
@@ -12,7 +12,7 @@ function foo(x:any) {
 
 foo((x:number,y,z)=>{return x+y+z;});
 >foo((x:number,y,z)=>{return x+y+z;}) : any
->foo : typeof foo
+>foo : (x: any) => any
 >(x:number,y,z)=>{return x+y+z;} : (x: number, y: any, z: any) => any
 >x : number
 >y : any
@@ -25,7 +25,7 @@ foo((x:number,y,z)=>{return x+y+z;});
 
 foo((x,y,z)=>{return x+y+z;});
 >foo((x,y,z)=>{return x+y+z;}) : any
->foo : typeof foo
+>foo : (x: any) => any
 >(x,y,z)=>{return x+y+z;} : (x: any, y: any, z: any) => any
 >x : any
 >y : any
@@ -38,7 +38,7 @@ foo((x,y,z)=>{return x+y+z;});
 
 foo((x,y:number,z)=>{return x+y+z;});
 >foo((x,y:number,z)=>{return x+y+z;}) : any
->foo : typeof foo
+>foo : (x: any) => any
 >(x,y:number,z)=>{return x+y+z;} : (x: any, y: number, z: any) => any
 >x : any
 >y : number
@@ -51,7 +51,7 @@ foo((x,y:number,z)=>{return x+y+z;});
 
 foo((x,y:number,z:number)=>{return x+y+z;});
 >foo((x,y:number,z:number)=>{return x+y+z;}) : any
->foo : typeof foo
+>foo : (x: any) => any
 >(x,y:number,z:number)=>{return x+y+z;} : (x: any, y: number, z: number) => any
 >x : any
 >y : number
@@ -64,7 +64,7 @@ foo((x,y:number,z:number)=>{return x+y+z;});
 
 foo((x,y,z:number)=>{return x+y+z;});
 >foo((x,y,z:number)=>{return x+y+z;}) : any
->foo : typeof foo
+>foo : (x: any) => any
 >(x,y,z:number)=>{return x+y+z;} : (x: any, y: any, z: number) => any
 >x : any
 >y : any
@@ -77,12 +77,12 @@ foo((x,y,z:number)=>{return x+y+z;});
 
 foo(()=>{return 0;});
 >foo(()=>{return 0;}) : any
->foo : typeof foo
+>foo : (x: any) => any
 >()=>{return 0;} : () => number
 
 foo((x:number,y,z)=>x+y+z);
 >foo((x:number,y,z)=>x+y+z) : any
->foo : typeof foo
+>foo : (x: any) => any
 >(x:number,y,z)=>x+y+z : (x: number, y: any, z: any) => any
 >x : number
 >y : any
@@ -95,7 +95,7 @@ foo((x:number,y,z)=>x+y+z);
 
 foo((x,y,z)=>x+y+z);
 >foo((x,y,z)=>x+y+z) : any
->foo : typeof foo
+>foo : (x: any) => any
 >(x,y,z)=>x+y+z : (x: any, y: any, z: any) => any
 >x : any
 >y : any
@@ -108,7 +108,7 @@ foo((x,y,z)=>x+y+z);
 
 foo((x,y:number,z)=>{return x+y+z;});
 >foo((x,y:number,z)=>{return x+y+z;}) : any
->foo : typeof foo
+>foo : (x: any) => any
 >(x,y:number,z)=>{return x+y+z;} : (x: any, y: number, z: any) => any
 >x : any
 >y : number
@@ -121,7 +121,7 @@ foo((x,y:number,z)=>{return x+y+z;});
 
 foo((x,y:number,z:number)=>{return x+y+z;});
 >foo((x,y:number,z:number)=>{return x+y+z;}) : any
->foo : typeof foo
+>foo : (x: any) => any
 >(x,y:number,z:number)=>{return x+y+z;} : (x: any, y: number, z: number) => any
 >x : any
 >y : number
@@ -134,7 +134,7 @@ foo((x,y:number,z:number)=>{return x+y+z;});
 
 foo((x,y,z:number)=>{return x+y+z;});
 >foo((x,y,z:number)=>{return x+y+z;}) : any
->foo : typeof foo
+>foo : (x: any) => any
 >(x,y,z:number)=>{return x+y+z;} : (x: any, y: any, z: number) => any
 >x : any
 >y : any
@@ -147,13 +147,13 @@ foo((x,y,z:number)=>{return x+y+z;});
 
 foo(()=>{return 0;});
 >foo(()=>{return 0;}) : any
->foo : typeof foo
+>foo : (x: any) => any
 >()=>{return 0;} : () => number
 
 
 foo(((x) => x));
 >foo(((x) => x)) : any
->foo : typeof foo
+>foo : (x: any) => any
 >((x) => x) : (x: any) => any
 >(x) => x : (x: any) => any
 >x : any
@@ -161,7 +161,7 @@ foo(((x) => x));
 
 foo(x => x*x);
 >foo(x => x*x) : any
->foo : typeof foo
+>foo : (x: any) => any
 >x => x*x : (x: any) => number
 >x : any
 >x*x : number
@@ -189,7 +189,7 @@ var w = () => 3;
 >() => 3 : () => number
 
 function ternaryTest(isWhile:boolean) {
->ternaryTest : typeof ternaryTest
+>ternaryTest : (isWhile: boolean) => void
 >isWhile : boolean
 
                 var f = isWhile ? function (n) { return n > 0; } : function (n) { return n === 0; };
@@ -208,7 +208,7 @@ function ternaryTest(isWhile:boolean) {
 }
 
 declare function setTimeout(expression: any, msec?: number, language?: any): number;
->setTimeout : typeof setTimeout
+>setTimeout : (expression: any, msec?: number, language?: any) => number
 >expression : any
 >msec : number
 >language : any
@@ -226,7 +226,7 @@ var messenger = {
 
         setTimeout(() => { this.message.toString(); }, 3000);
 >setTimeout(() => { this.message.toString(); }, 3000) : number
->setTimeout : typeof setTimeout
+>setTimeout : (expression: any, msec?: number, language?: any) => number
 >() => { this.message.toString(); } : () => void
 >this.message.toString() : any
 >this.message.toString : any
diff --git a/tests/baselines/reference/fatarrowfunctionsInFunctionParameterDefaults.types b/tests/baselines/reference/fatarrowfunctionsInFunctionParameterDefaults.types
index 57cfb46b109..cf561eb08af 100644
--- a/tests/baselines/reference/fatarrowfunctionsInFunctionParameterDefaults.types
+++ b/tests/baselines/reference/fatarrowfunctionsInFunctionParameterDefaults.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/fatarrowfunctionsInFunctionParameterDefaults.ts ===
 function fn(x = () => this, y = x()) {
->fn : typeof fn
+>fn : (x?: () => any, y?: any) => any
 >x : () => any
 >() => this : () => any
 >this : any
@@ -17,6 +17,6 @@ function fn(x = () => this, y = x()) {
 fn.call(4); // Should be 4
 >fn.call(4) : any
 >fn.call : (thisArg: any, ...argArray: any[]) => any
->fn : typeof fn
+>fn : (x?: () => any, y?: any) => any
 >call : (thisArg: any, ...argArray: any[]) => any
 
diff --git a/tests/baselines/reference/fatarrowfunctionsInFunctions.types b/tests/baselines/reference/fatarrowfunctionsInFunctions.types
index 7a91fa42d6f..a8633eb1a8c 100644
--- a/tests/baselines/reference/fatarrowfunctionsInFunctions.types
+++ b/tests/baselines/reference/fatarrowfunctionsInFunctions.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/fatarrowfunctionsInFunctions.ts ===
 declare function setTimeout(expression: any, msec?: number, language?: any): number;
->setTimeout : typeof setTimeout
+>setTimeout : (expression: any, msec?: number, language?: any) => number
 >expression : any
 >msec : number
 >language : any
@@ -22,7 +22,7 @@ var messenger = {
 
         setTimeout(function() {
 >setTimeout(function() {            _self.message.toString();         }, 3000) : number
->setTimeout : typeof setTimeout
+>setTimeout : (expression: any, msec?: number, language?: any) => number
 >function() {            _self.message.toString();         } : () => void
 
             _self.message.toString(); 
diff --git a/tests/baselines/reference/fixTypeParameterInSignatureWithRestParameters.types b/tests/baselines/reference/fixTypeParameterInSignatureWithRestParameters.types
index d3781874b56..95214571df9 100644
--- a/tests/baselines/reference/fixTypeParameterInSignatureWithRestParameters.types
+++ b/tests/baselines/reference/fixTypeParameterInSignatureWithRestParameters.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/fixTypeParameterInSignatureWithRestParameters.ts ===
 function bar<T>(item1: T, item2: T) { }
->bar : typeof bar
+>bar : <T>(item1: T, item2: T) => void
 >T : T
 >item1 : T
 >T : T
@@ -9,5 +9,5 @@ function bar<T>(item1: T, item2: T) { }
 
 bar(1, ""); // Should be ok
 >bar(1, "") : void
->bar : typeof bar
+>bar : <T>(item1: T, item2: T) => void
 
diff --git a/tests/baselines/reference/forInStatement3.types b/tests/baselines/reference/forInStatement3.types
index e98730e48b9..1d3803065bd 100644
--- a/tests/baselines/reference/forInStatement3.types
+++ b/tests/baselines/reference/forInStatement3.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/forInStatement3.ts ===
 function F<T>() {
->F : typeof F
+>F : <T>() => void
 >T : T
 
   var expr: T;
diff --git a/tests/baselines/reference/forStatements.types b/tests/baselines/reference/forStatements.types
index a13add7c4a5..fad702213df 100644
--- a/tests/baselines/reference/forStatements.types
+++ b/tests/baselines/reference/forStatements.types
@@ -35,7 +35,7 @@ class D<T>{
 }
 
 function F(x: string): number { return 42; }
->F : typeof F
+>F : (x: string) => number
 >x : string
 
 module M {
@@ -49,7 +49,7 @@ module M {
     }
 
     export function F2(x: number): string { return x.toString(); }
->F2 : typeof F2
+>F2 : (x: number) => string
 >x : number
 >x.toString() : string
 >x.toString : (radix?: number) => string
@@ -117,18 +117,18 @@ for(var anOtherObjectLiteral: { id: number } = new C();;){}
 >C : typeof C
 
 for(var aFunction: typeof F = F;;){}
->aFunction : typeof F
->F : typeof F
->F : typeof F
+>aFunction : (x: string) => number
+>F : (x: string) => number
+>F : (x: string) => number
 
 for(var anOtherFunction: (x: string) => number = F;;){}
 >anOtherFunction : (x: string) => number
 >x : string
->F : typeof F
+>F : (x: string) => number
 
 for(var aLambda: typeof F = (x) => 2;;){}
->aLambda : typeof F
->F : typeof F
+>aLambda : (x: string) => number
+>F : (x: string) => number
 >(x) => 2 : (x: string) => number
 >x : string
 
@@ -147,9 +147,9 @@ for(var aClassInModule: M.A = new M.A();;){}
 >A : typeof M.A
 
 for(var aFunctionInModule: typeof M.F2 = (x) => 'this is a string';;){}
->aFunctionInModule : typeof M.F2
+>aFunctionInModule : (x: number) => string
 >M : typeof M
->F2 : typeof M.F2
+>F2 : (x: number) => string
 >(x) => 'this is a string' : (x: number) => string
 >x : number
 
diff --git a/tests/baselines/reference/forStatementsMultipleValidDecl.types b/tests/baselines/reference/forStatementsMultipleValidDecl.types
index f5401754e29..f894eef1404 100644
--- a/tests/baselines/reference/forStatementsMultipleValidDecl.types
+++ b/tests/baselines/reference/forStatementsMultipleValidDecl.types
@@ -14,7 +14,7 @@ for (var x = <number>undefined; ;) { }
 
 // new declaration space, making redeclaring x as a string valid
 function declSpace() {
->declSpace : typeof declSpace
+>declSpace : () => void
 
     for (var x = 'this is a string'; ;) { }
 >x : string
diff --git a/tests/baselines/reference/funcdecl.types b/tests/baselines/reference/funcdecl.types
index c208e51c450..bbfd14bd220 100644
--- a/tests/baselines/reference/funcdecl.types
+++ b/tests/baselines/reference/funcdecl.types
@@ -1,42 +1,42 @@
 === tests/cases/compiler/funcdecl.ts ===
 function simpleFunc() {
->simpleFunc : typeof simpleFunc
+>simpleFunc : () => string
 
     return "this is my simple func";
 }
 var simpleFuncVar = simpleFunc;
->simpleFuncVar : typeof simpleFunc
->simpleFunc : typeof simpleFunc
+>simpleFuncVar : () => string
+>simpleFunc : () => string
 
 function anotherFuncNoReturn() {
->anotherFuncNoReturn : typeof anotherFuncNoReturn
+>anotherFuncNoReturn : () => void
 }
 var anotherFuncNoReturnVar = anotherFuncNoReturn;
->anotherFuncNoReturnVar : typeof anotherFuncNoReturn
->anotherFuncNoReturn : typeof anotherFuncNoReturn
+>anotherFuncNoReturnVar : () => void
+>anotherFuncNoReturn : () => void
 
 function withReturn() : string{
->withReturn : typeof withReturn
+>withReturn : () => string
 
     return "Hello";
 }
 var withReturnVar = withReturn;
->withReturnVar : typeof withReturn
->withReturn : typeof withReturn
+>withReturnVar : () => string
+>withReturn : () => string
 
 function withParams(a : string) : string{
->withParams : typeof withParams
+>withParams : (a: string) => string
 >a : string
 
     return a;
 >a : string
 }
 var withparamsVar = withParams;
->withparamsVar : typeof withParams
->withParams : typeof withParams
+>withparamsVar : (a: string) => string
+>withParams : (a: string) => string
 
 function withMultiParams(a : number, b, c: Object) {
->withMultiParams : typeof withMultiParams
+>withMultiParams : (a: number, b: any, c: Object) => number
 >a : number
 >b : any
 >c : Object
@@ -46,39 +46,39 @@ function withMultiParams(a : number, b, c: Object) {
 >a : number
 }
 var withMultiParamsVar = withMultiParams;
->withMultiParamsVar : typeof withMultiParams
->withMultiParams : typeof withMultiParams
+>withMultiParamsVar : (a: number, b: any, c: Object) => number
+>withMultiParams : (a: number, b: any, c: Object) => number
 
 function withOptionalParams(a?: string) {
->withOptionalParams : typeof withOptionalParams
+>withOptionalParams : (a?: string) => void
 >a : string
 }
 var withOptionalParamsVar = withOptionalParams;
->withOptionalParamsVar : typeof withOptionalParams
->withOptionalParams : typeof withOptionalParams
+>withOptionalParamsVar : (a?: string) => void
+>withOptionalParams : (a?: string) => void
 
 function withInitializedParams(a: string, b0, b = 30, c = "string value") {
->withInitializedParams : typeof withInitializedParams
+>withInitializedParams : (a: string, b0: any, b?: number, c?: string) => void
 >a : string
 >b0 : any
 >b : number
 >c : string
 }
 var withInitializedParamsVar = withInitializedParams;
->withInitializedParamsVar : typeof withInitializedParams
->withInitializedParams : typeof withInitializedParams
+>withInitializedParamsVar : (a: string, b0: any, b?: number, c?: string) => void
+>withInitializedParams : (a: string, b0: any, b?: number, c?: string) => void
 
 function withOptionalInitializedParams(a: string, c: string = "hello string") {
->withOptionalInitializedParams : typeof withOptionalInitializedParams
+>withOptionalInitializedParams : (a: string, c?: string) => void
 >a : string
 >c : string
 }
 var withOptionalInitializedParamsVar = withOptionalInitializedParams;
->withOptionalInitializedParamsVar : typeof withOptionalInitializedParams
->withOptionalInitializedParams : typeof withOptionalInitializedParams
+>withOptionalInitializedParamsVar : (a: string, c?: string) => void
+>withOptionalInitializedParams : (a: string, c?: string) => void
 
 function withRestParams(a: string, ... myRestParameter : number[]) {
->withRestParams : typeof withRestParams
+>withRestParams : (a: string, ...myRestParameter: number[]) => number[]
 >a : string
 >myRestParameter : number[]
 
@@ -86,19 +86,19 @@ function withRestParams(a: string, ... myRestParameter : number[]) {
 >myRestParameter : number[]
 }
 var withRestParamsVar = withRestParams;
->withRestParamsVar : typeof withRestParams
->withRestParams : typeof withRestParams
+>withRestParamsVar : (a: string, ...myRestParameter: number[]) => number[]
+>withRestParams : (a: string, ...myRestParameter: number[]) => number[]
 
 function overload1(n: number) : string;
->overload1 : typeof overload1
+>overload1 : { (n: number): string; (s: string): string; }
 >n : number
 
 function overload1(s: string) : string;
->overload1 : typeof overload1
+>overload1 : { (n: number): string; (s: string): string; }
 >s : string
 
 function overload1(ns: any) {
->overload1 : typeof overload1
+>overload1 : { (n: number): string; (s: string): string; }
 >ns : any
 
     return ns.toString();
@@ -108,18 +108,18 @@ function overload1(ns: any) {
 >toString : any
 }
 var withOverloadSignature = overload1;
->withOverloadSignature : typeof overload1
->overload1 : typeof overload1
+>withOverloadSignature : { (n: number): string; (s: string): string; }
+>overload1 : { (n: number): string; (s: string): string; }
 
 function f(n: () => void) { }
->f : typeof f
+>f : (n: () => void) => void
 >n : () => void
 
 module m2 {
 >m2 : typeof m2
 
     export function foo(n: () => void ) {
->foo : typeof foo
+>foo : (n: () => void) => void
 >n : () => void
     }
 
@@ -127,9 +127,9 @@ module m2 {
 
 m2.foo(() =>  {
 >m2.foo(() =>  {    var b = 30;    return b;}) : void
->m2.foo : typeof m2.foo
+>m2.foo : (n: () => void) => void
 >m2 : typeof m2
->foo : typeof m2.foo
+>foo : (n: () => void) => void
 >() =>  {    var b = 30;    return b;} : () => number
 
     var b = 30;
@@ -142,15 +142,15 @@ m2.foo(() =>  {
 
 
 declare function fooAmbient(n: number): string;
->fooAmbient : typeof fooAmbient
+>fooAmbient : (n: number) => string
 >n : number
 
 declare function overloadAmbient(n: number): string;
->overloadAmbient : typeof overloadAmbient
+>overloadAmbient : { (n: number): string; (s: string): string; }
 >n : number
 
 declare function overloadAmbient(s: string): string;
->overloadAmbient : typeof overloadAmbient
+>overloadAmbient : { (n: number): string; (s: string): string; }
 >s : string
 
 var f2 = () => {
diff --git a/tests/baselines/reference/functionCall1.types b/tests/baselines/reference/functionCall1.types
index fbd17de66c7..1b06379860c 100644
--- a/tests/baselines/reference/functionCall1.types
+++ b/tests/baselines/reference/functionCall1.types
@@ -1,9 +1,9 @@
 === tests/cases/compiler/functionCall1.ts ===
 function foo():any{return ""};
->foo : typeof foo
+>foo : () => any
 
 var x = foo();
 >x : any
 >foo() : any
->foo : typeof foo
+>foo : () => any
 
diff --git a/tests/baselines/reference/functionCall2.types b/tests/baselines/reference/functionCall2.types
index a40eefe5bb7..92bb0f0be23 100644
--- a/tests/baselines/reference/functionCall2.types
+++ b/tests/baselines/reference/functionCall2.types
@@ -1,9 +1,9 @@
 === tests/cases/compiler/functionCall2.ts ===
 function foo():number{return 1}; 
->foo : typeof foo
+>foo : () => number
 
 var x = foo();
 >x : number
 >foo() : number
->foo : typeof foo
+>foo : () => number
 
diff --git a/tests/baselines/reference/functionCall3.types b/tests/baselines/reference/functionCall3.types
index 242ac83fed1..a9b8e46069c 100644
--- a/tests/baselines/reference/functionCall3.types
+++ b/tests/baselines/reference/functionCall3.types
@@ -1,10 +1,10 @@
 === tests/cases/compiler/functionCall3.ts ===
 function foo():any[]{return [1];} 
->foo : typeof foo
+>foo : () => any[]
 >[1] : any[]
 
 var x = foo();
 >x : any[]
 >foo() : any[]
->foo : typeof foo
+>foo : () => any[]
 
diff --git a/tests/baselines/reference/functionCall4.types b/tests/baselines/reference/functionCall4.types
index 0a51873350b..37a0b980a00 100644
--- a/tests/baselines/reference/functionCall4.types
+++ b/tests/baselines/reference/functionCall4.types
@@ -1,13 +1,13 @@
 === tests/cases/compiler/functionCall4.ts ===
 function foo():any{return ""}; 
->foo : typeof foo
+>foo : () => any
 
 function bar():()=>any{return foo}; 
->bar : typeof bar
->foo : typeof foo
+>bar : () => () => any
+>foo : () => any
 
 var x = bar();
 >x : () => any
 >bar() : () => any
->bar : typeof bar
+>bar : () => () => any
 
diff --git a/tests/baselines/reference/functionCall5.types b/tests/baselines/reference/functionCall5.types
index 9ac37cf0fad..e5578ef3c34 100644
--- a/tests/baselines/reference/functionCall5.types
+++ b/tests/baselines/reference/functionCall5.types
@@ -5,7 +5,7 @@ module m1 { export class c1 { public a; }}
 >a : any
 
 function foo():m1.c1{return new m1.c1();}; 
->foo : typeof foo
+>foo : () => m1.c1
 >m1 : unknown
 >c1 : m1.c1
 >new m1.c1() : m1.c1
@@ -16,5 +16,5 @@ function foo():m1.c1{return new m1.c1();};
 var x = foo();
 >x : m1.c1
 >foo() : m1.c1
->foo : typeof foo
+>foo : () => m1.c1
 
diff --git a/tests/baselines/reference/functionConstraintSatisfaction.types b/tests/baselines/reference/functionConstraintSatisfaction.types
index 56ebbe1fb01..70200af6fa9 100644
--- a/tests/baselines/reference/functionConstraintSatisfaction.types
+++ b/tests/baselines/reference/functionConstraintSatisfaction.types
@@ -2,7 +2,7 @@
 // satisfaction of a constraint to Function, no errors expected
 
 function foo<T extends Function>(x: T): T { return x; }
->foo : typeof foo
+>foo : <T extends Function>(x: T) => T
 >T : T
 >Function : Function
 >x : T
@@ -39,14 +39,14 @@ var c: { (): string; (x): string };
 var r = foo(new Function());
 >r : Function
 >foo(new Function()) : Function
->foo : typeof foo
+>foo : <T extends Function>(x: T) => T
 >new Function() : Function
 >Function : { (...args: string[]): Function; new (...args: string[]): Function; prototype: Function; }
 
 var r1 = foo((x) => x);
 >r1 : (x: any) => any
 >foo((x) => x) : (x: any) => any
->foo : typeof foo
+>foo : <T extends Function>(x: T) => T
 >(x) => x : (x: any) => any
 >x : any
 >x : any
@@ -54,7 +54,7 @@ var r1 = foo((x) => x);
 var r2 = foo((x: string[]) => x);
 >r2 : (x: string[]) => string[]
 >foo((x: string[]) => x) : (x: string[]) => string[]
->foo : typeof foo
+>foo : <T extends Function>(x: T) => T
 >(x: string[]) => x : (x: string[]) => string[]
 >x : string[]
 >x : string[]
@@ -62,7 +62,7 @@ var r2 = foo((x: string[]) => x);
 var r3 = foo(function (x) { return x });
 >r3 : (x: any) => any
 >foo(function (x) { return x }) : (x: any) => any
->foo : typeof foo
+>foo : <T extends Function>(x: T) => T
 >function (x) { return x } : (x: any) => any
 >x : any
 >x : any
@@ -70,7 +70,7 @@ var r3 = foo(function (x) { return x });
 var r4 = foo(function (x: string[]) { return x });
 >r4 : (x: string[]) => string[]
 >foo(function (x: string[]) { return x }) : (x: string[]) => string[]
->foo : typeof foo
+>foo : <T extends Function>(x: T) => T
 >function (x: string[]) { return x } : (x: string[]) => string[]
 >x : string[]
 >x : string[]
@@ -78,25 +78,25 @@ var r4 = foo(function (x: string[]) { return x });
 var r5 = foo(i);
 >r5 : I
 >foo(i) : I
->foo : typeof foo
+>foo : <T extends Function>(x: T) => T
 >i : I
 
 var r6 = foo(C);
 >r6 : typeof C
 >foo(C) : typeof C
->foo : typeof foo
+>foo : <T extends Function>(x: T) => T
 >C : typeof C
 
 var r7 = foo(b);
 >r7 : new () => string
 >foo(b) : new () => string
->foo : typeof foo
+>foo : <T extends Function>(x: T) => T
 >b : new () => string
 
 var r8 = foo(c);
 >r8 : { (): string; (x: any): string; }
 >foo(c) : { (): string; (x: any): string; }
->foo : typeof foo
+>foo : <T extends Function>(x: T) => T
 >c : { (): string; (x: any): string; }
 
 interface I2<T> {
@@ -151,7 +151,7 @@ var c2: { <T>(x: T): T; <T>(x: T, y: T): T };
 var r9 = foo(<U>(x: U) => x);
 >r9 : <U>(x: U) => U
 >foo(<U>(x: U) => x) : <U>(x: U) => U
->foo : typeof foo
+>foo : <T extends Function>(x: T) => T
 ><U>(x: U) => x : <U>(x: U) => U
 >U : U
 >x : U
@@ -161,7 +161,7 @@ var r9 = foo(<U>(x: U) => x);
 var r10 = foo(function <U>(x: U) { return x; });
 >r10 : <U>(x: U) => U
 >foo(function <U>(x: U) { return x; }) : <U>(x: U) => U
->foo : typeof foo
+>foo : <T extends Function>(x: T) => T
 >function <U>(x: U) { return x; } : <U>(x: U) => U
 >U : U
 >x : U
@@ -171,7 +171,7 @@ var r10 = foo(function <U>(x: U) { return x; });
 var r11 = foo(<U extends Date>(x: U) => x);
 >r11 : <U extends Date>(x: U) => U
 >foo(<U extends Date>(x: U) => x) : <U extends Date>(x: U) => U
->foo : typeof foo
+>foo : <T extends Function>(x: T) => T
 ><U extends Date>(x: U) => x : <U extends Date>(x: U) => U
 >U : U
 >Date : Date
@@ -182,7 +182,7 @@ var r11 = foo(<U extends Date>(x: U) => x);
 var r12 = foo(<U, V>(x: U, y: V) => x);
 >r12 : <U, V>(x: U, y: V) => U
 >foo(<U, V>(x: U, y: V) => x) : <U, V>(x: U, y: V) => U
->foo : typeof foo
+>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
@@ -195,25 +195,25 @@ var r12 = foo(<U, V>(x: U, y: V) => x);
 var r13 = foo(i2);
 >r13 : I2<string>
 >foo(i2) : I2<string>
->foo : typeof foo
+>foo : <T extends Function>(x: T) => T
 >i2 : I2<string>
 
 var r14 = foo(C2);
 >r14 : typeof C2
 >foo(C2) : typeof C2
->foo : typeof foo
+>foo : <T extends Function>(x: T) => T
 >C2 : typeof C2
 
 var r15 = foo(b2);
 >r15 : new <T>(x: T) => T
 >foo(b2) : new <T>(x: T) => T
->foo : typeof foo
+>foo : <T extends Function>(x: T) => T
 >b2 : new <T>(x: T) => T
 
 var r16 = foo(c2);
 >r16 : { <T>(x: T): T; <T>(x: T, y: T): T; }
 >foo(c2) : { <T>(x: T): T; <T>(x: T, y: T): T; }
->foo : typeof foo
+>foo : <T extends Function>(x: T) => T
 >c2 : { <T>(x: T): T; <T>(x: T, y: T): T; }
 
 interface F2 extends Function { foo: string; }
@@ -228,11 +228,11 @@ var f2: F2;
 var r17 = foo(f2);
 >r17 : F2
 >foo(f2) : F2
->foo : typeof foo
+>foo : <T extends Function>(x: T) => T
 >f2 : F2
 
 function foo2<T extends { (): void }, U extends { (): void }>(x: T, y: U) {
->foo2 : typeof foo2
+>foo2 : <T extends () => void, U extends () => void>(x: T, y: U) => void
 >T : T
 >U : U
 >x : T
@@ -242,12 +242,12 @@ function foo2<T extends { (): void }, U extends { (): void }>(x: T, y: U) {
 
     foo(x);
 >foo(x) : T
->foo : typeof foo
+>foo : <T extends Function>(x: T) => T
 >x : T
 
     foo(y);
 >foo(y) : U
->foo : typeof foo
+>foo : <T extends Function>(x: T) => T
 >y : U
 }
 //function foo2<T extends { (): void }, U extends T>(x: T, y: U) {
diff --git a/tests/baselines/reference/functionConstraintSatisfaction3.types b/tests/baselines/reference/functionConstraintSatisfaction3.types
index f260cc568da..04963c36519 100644
--- a/tests/baselines/reference/functionConstraintSatisfaction3.types
+++ b/tests/baselines/reference/functionConstraintSatisfaction3.types
@@ -2,7 +2,7 @@
 // satisfaction of a constraint to Function, no errors expected
 
 function foo<T extends (x: string) => string>(x: T): T { return x; }
->foo : typeof foo
+>foo : <T extends (x: string) => string>(x: T) => T
 >T : T
 >x : string
 >x : T
@@ -39,7 +39,7 @@ var c: { (): string; (x): string };
 var r1 = foo((x) => x);
 >r1 : (x: any) => any
 >foo((x) => x) : (x: any) => any
->foo : typeof foo
+>foo : <T extends (x: string) => string>(x: T) => T
 >(x) => x : (x: any) => any
 >x : any
 >x : any
@@ -47,7 +47,7 @@ var r1 = foo((x) => x);
 var r2 = foo((x: string) => x);
 >r2 : (x: string) => string
 >foo((x: string) => x) : (x: string) => string
->foo : typeof foo
+>foo : <T extends (x: string) => string>(x: T) => T
 >(x: string) => x : (x: string) => string
 >x : string
 >x : string
@@ -55,7 +55,7 @@ var r2 = foo((x: string) => x);
 var r3 = foo(function (x) { return x });
 >r3 : (x: any) => any
 >foo(function (x) { return x }) : (x: any) => any
->foo : typeof foo
+>foo : <T extends (x: string) => string>(x: T) => T
 >function (x) { return x } : (x: any) => any
 >x : any
 >x : any
@@ -63,7 +63,7 @@ var r3 = foo(function (x) { return x });
 var r4 = foo(function (x: string) { return x });
 >r4 : (x: string) => string
 >foo(function (x: string) { return x }) : (x: string) => string
->foo : typeof foo
+>foo : <T extends (x: string) => string>(x: T) => T
 >function (x: string) { return x } : (x: string) => string
 >x : string
 >x : string
@@ -71,13 +71,13 @@ var r4 = foo(function (x: string) { return x });
 var r5 = foo(i);
 >r5 : I
 >foo(i) : I
->foo : typeof foo
+>foo : <T extends (x: string) => string>(x: T) => T
 >i : I
 
 var r8 = foo(c);
 >r8 : { (): string; (x: any): string; }
 >foo(c) : { (): string; (x: any): string; }
->foo : typeof foo
+>foo : <T extends (x: string) => string>(x: T) => T
 >c : { (): string; (x: any): string; }
 
 interface I2<T> {
@@ -132,7 +132,7 @@ var c2: { <T>(x: T): T; <T>(x: T, y: T): T };
 var r9 = foo(function <U>(x: U) { return x; });
 >r9 : <U>(x: U) => U
 >foo(function <U>(x: U) { return x; }) : <U>(x: U) => U
->foo : typeof foo
+>foo : <T extends (x: string) => string>(x: T) => T
 >function <U>(x: U) { return x; } : <U>(x: U) => U
 >U : U
 >x : U
@@ -142,7 +142,7 @@ var r9 = foo(function <U>(x: U) { return x; });
 var r10 = foo(<U extends string>(x: U) => x);
 >r10 : <U extends string>(x: U) => U
 >foo(<U extends string>(x: U) => x) : <U extends string>(x: U) => U
->foo : typeof foo
+>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
@@ -152,12 +152,12 @@ var r10 = foo(<U extends string>(x: U) => x);
 var r12 = foo(i2);
 >r12 : I2<string>
 >foo(i2) : I2<string>
->foo : typeof foo
+>foo : <T extends (x: string) => string>(x: T) => T
 >i2 : I2<string>
 
 var r15 = foo(c2);
 >r15 : { <T>(x: T): T; <T>(x: T, y: T): T; }
 >foo(c2) : { <T>(x: T): T; <T>(x: T, y: T): T; }
->foo : typeof foo
+>foo : <T extends (x: string) => string>(x: T) => T
 >c2 : { <T>(x: T): T; <T>(x: T, y: T): T; }
 
diff --git a/tests/baselines/reference/functionDeclarationWithArgumentOfTypeFunctionTypeArray.types b/tests/baselines/reference/functionDeclarationWithArgumentOfTypeFunctionTypeArray.types
index fefa0168edb..af751fbb0e9 100644
--- a/tests/baselines/reference/functionDeclarationWithArgumentOfTypeFunctionTypeArray.types
+++ b/tests/baselines/reference/functionDeclarationWithArgumentOfTypeFunctionTypeArray.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/functionDeclarationWithArgumentOfTypeFunctionTypeArray.ts ===
 function foo(args: { (x): number }[]) {
->foo : typeof foo
+>foo : (args: { (x: any): number; }[]) => number
 >args : { (x: any): number; }[]
 >x : any
 
diff --git a/tests/baselines/reference/functionImplementations.types b/tests/baselines/reference/functionImplementations.types
index eeb3cb02a5c..fe03fa58d98 100644
--- a/tests/baselines/reference/functionImplementations.types
+++ b/tests/baselines/reference/functionImplementations.types
@@ -43,43 +43,43 @@ var a: any = function f() {
 
 // Two mutually recursive function implementations with no return type annotations
 function rec1() {
->rec1 : typeof rec1
+>rec1 : () => any
 
     return rec2();
 >rec2() : any
->rec2 : typeof rec2
+>rec2 : () => any
 }
 function rec2() {
->rec2 : typeof rec2
+>rec2 : () => any
 
     return rec1();
 >rec1() : any
->rec1 : typeof rec1
+>rec1 : () => any
 }
 var a = rec1();
 >a : any
 >rec1() : any
->rec1 : typeof rec1
+>rec1 : () => any
 
 var a = rec2();
 >a : any
 >rec2() : any
->rec2 : typeof rec2
+>rec2 : () => any
 
 // Two mutually recursive function implementations with return type annotation in one
 function rec3(): number {
->rec3 : typeof rec3
+>rec3 : () => number
 
     return rec4();
 >rec4() : number
->rec4 : typeof rec4
+>rec4 : () => number
 }
 function rec4() {
->rec4 : typeof rec4
+>rec4 : () => number
 
     return rec3();
 >rec3() : number
->rec3 : typeof rec3
+>rec3 : () => number
 }
 var n: number;
 >n : number
@@ -87,12 +87,12 @@ var n: number;
 var n = rec3();
 >n : number
 >rec3() : number
->rec3 : typeof rec3
+>rec3 : () => number
 
 var n = rec4();
 >n : number
 >rec4() : number
->rec4 : typeof rec4
+>rec4 : () => number
 
 // FunctionExpression with no return type annotation and returns a number
 var n = function () {
@@ -225,7 +225,7 @@ undefined === function (): number {
 
 // Type of 'this' in function implementation is 'any'
 function thisFunc() {
->thisFunc : typeof thisFunc
+>thisFunc : () => void
 
     var x = this;
 >x : any
@@ -237,7 +237,7 @@ function thisFunc() {
 
 // Function signature with optional parameter, no type annotation and initializer has initializer's type
 function opt1(n = 4) {
->opt1 : typeof opt1
+>opt1 : (n?: number) => void
 >n : number
 
     var m = n;
@@ -250,7 +250,7 @@ function opt1(n = 4) {
 
 // Function signature with optional parameter, no type annotation and initializer has initializer's widened type
 function opt2(n = { x: null, y: undefined }) {
->opt2 : typeof opt2
+>opt2 : (n?: { x: any; y: any; }) => void
 >n : { x: any; y: any; }
 >{ x: null, y: undefined } : { x: null; y: undefined; }
 >x : any
@@ -269,7 +269,7 @@ function opt2(n = { x: null, y: undefined }) {
 
 // Function signature with initializer referencing other parameter to the left
 function opt3(n: number, m = n) {
->opt3 : typeof opt3
+>opt3 : (n: number, m?: number) => void
 >n : number
 >m : number
 >n : number
@@ -287,7 +287,7 @@ function opt3(n: number, m = n) {
 
 // FunctionExpression with non -void return type annotation return with no expression
 function f6(): number {
->f6 : typeof f6
+>f6 : () => number
 
     return;
 }
diff --git a/tests/baselines/reference/functionMergedWithModule.types b/tests/baselines/reference/functionMergedWithModule.types
index e472584c5a4..d0c711ab39a 100644
--- a/tests/baselines/reference/functionMergedWithModule.types
+++ b/tests/baselines/reference/functionMergedWithModule.types
@@ -12,7 +12,7 @@ module foo.Bar {
 >Bar : typeof Bar
 
     export function f() {
->f : typeof f
+>f : () => void
     }
 }
 
@@ -21,12 +21,12 @@ module foo.Baz {
 >Baz : typeof Baz
 
     export function g() {
->g : typeof g
+>g : () => void
 
         Bar.f();
 >Bar.f() : void
->Bar.f : typeof Bar.f
+>Bar.f : () => void
 >Bar : typeof Bar
->f : typeof Bar.f
+>f : () => void
     }
 }
diff --git a/tests/baselines/reference/functionOnlyHasThrow.types b/tests/baselines/reference/functionOnlyHasThrow.types
index 33237c3c78a..0f76f4be39d 100644
--- a/tests/baselines/reference/functionOnlyHasThrow.types
+++ b/tests/baselines/reference/functionOnlyHasThrow.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/functionOnlyHasThrow.ts ===
 function clone():number {
->clone : typeof clone
+>clone : () => number
 
 	throw new Error("To be implemented");
 >new Error("To be implemented") : Error
diff --git a/tests/baselines/reference/functionOverloads10.types b/tests/baselines/reference/functionOverloads10.types
index 8637862a87e..8ec2bc7c589 100644
--- a/tests/baselines/reference/functionOverloads10.types
+++ b/tests/baselines/reference/functionOverloads10.types
@@ -1,14 +1,14 @@
 === tests/cases/compiler/functionOverloads10.ts ===
 function foo(foo:string, bar:number);
->foo : typeof foo
+>foo : { (foo: string, bar: number): any; (foo: string): any; }
 >foo : string
 >bar : number
 
 function foo(foo:string);
->foo : typeof foo
+>foo : { (foo: string, bar: number): any; (foo: string): any; }
 >foo : string
 
 function foo(foo:any){ }
->foo : typeof foo
+>foo : { (foo: string, bar: number): any; (foo: string): any; }
 >foo : any
 
diff --git a/tests/baselines/reference/functionOverloads12.types b/tests/baselines/reference/functionOverloads12.types
index 2b46367ecbb..6e4c2d9189e 100644
--- a/tests/baselines/reference/functionOverloads12.types
+++ b/tests/baselines/reference/functionOverloads12.types
@@ -1,10 +1,10 @@
 === tests/cases/compiler/functionOverloads12.ts ===
 function foo():string;
->foo : typeof foo
+>foo : { (): string; (): number; }
 
 function foo():number;
->foo : typeof foo
+>foo : { (): string; (): number; }
 
 function foo():any { if (true) return ""; else return 0;}
->foo : typeof foo
+>foo : { (): string; (): number; }
 
diff --git a/tests/baselines/reference/functionOverloads13.types b/tests/baselines/reference/functionOverloads13.types
index 438a3008e9b..ee65bc296e7 100644
--- a/tests/baselines/reference/functionOverloads13.types
+++ b/tests/baselines/reference/functionOverloads13.types
@@ -1,13 +1,13 @@
 === tests/cases/compiler/functionOverloads13.ts ===
 function foo(bar:number):string;
->foo : typeof foo
+>foo : { (bar: number): string; (bar: number): number; }
 >bar : number
 
 function foo(bar:number):number;
->foo : typeof foo
+>foo : { (bar: number): string; (bar: number): number; }
 >bar : number
 
 function foo(bar?:number):any { return "" }
->foo : typeof foo
+>foo : { (bar: number): string; (bar: number): number; }
 >bar : number
 
diff --git a/tests/baselines/reference/functionOverloads14.types b/tests/baselines/reference/functionOverloads14.types
index 60c8a44e996..562c43965c7 100644
--- a/tests/baselines/reference/functionOverloads14.types
+++ b/tests/baselines/reference/functionOverloads14.types
@@ -1,14 +1,14 @@
 === tests/cases/compiler/functionOverloads14.ts ===
 function foo():{a:number;}
->foo : typeof foo
+>foo : { (): { a: number; }; (): { a: string; }; }
 >a : number
 
 function foo():{a:string;}
->foo : typeof foo
+>foo : { (): { a: number; }; (): { a: string; }; }
 >a : string
 
 function foo():{a:any;} { return {a:1} }
->foo : typeof foo
+>foo : { (): { a: number; }; (): { a: string; }; }
 >a : any
 >{a:1} : { a: number; }
 >a : number
diff --git a/tests/baselines/reference/functionOverloads15.types b/tests/baselines/reference/functionOverloads15.types
index ab5b25fb369..6ca5b6709cb 100644
--- a/tests/baselines/reference/functionOverloads15.types
+++ b/tests/baselines/reference/functionOverloads15.types
@@ -1,18 +1,18 @@
 === tests/cases/compiler/functionOverloads15.ts ===
 function foo(foo:{a:string; b:number;}):string;
->foo : typeof foo
+>foo : { (foo: { a: string; b: number; }): string; (foo: { a: string; b: number; }): number; }
 >foo : { a: string; b: number; }
 >a : string
 >b : number
 
 function foo(foo:{a:string; b:number;}):number;
->foo : typeof foo
+>foo : { (foo: { a: string; b: number; }): string; (foo: { a: string; b: number; }): number; }
 >foo : { a: string; b: number; }
 >a : string
 >b : number
 
 function foo(foo:{a:string; b?:number;}):any { return "" }
->foo : typeof foo
+>foo : { (foo: { a: string; b: number; }): string; (foo: { a: string; b: number; }): number; }
 >foo : { a: string; b?: number; }
 >a : string
 >b : number
diff --git a/tests/baselines/reference/functionOverloads16.types b/tests/baselines/reference/functionOverloads16.types
index ae3d08d6479..6974d0dab98 100644
--- a/tests/baselines/reference/functionOverloads16.types
+++ b/tests/baselines/reference/functionOverloads16.types
@@ -1,16 +1,16 @@
 === tests/cases/compiler/functionOverloads16.ts ===
 function foo(foo:{a:string;}):string;
->foo : typeof foo
+>foo : { (foo: { a: string; }): string; (foo: { a: string; }): number; }
 >foo : { a: string; }
 >a : string
 
 function foo(foo:{a:string;}):number;
->foo : typeof foo
+>foo : { (foo: { a: string; }): string; (foo: { a: string; }): number; }
 >foo : { a: string; }
 >a : string
 
 function foo(foo:{a:string; b?:number;}):any { return "" }
->foo : typeof foo
+>foo : { (foo: { a: string; }): string; (foo: { a: string; }): number; }
 >foo : { a: string; b?: number; }
 >a : string
 >b : number
diff --git a/tests/baselines/reference/functionOverloads21.types b/tests/baselines/reference/functionOverloads21.types
index e3a8be004d5..dc9e28b7b57 100644
--- a/tests/baselines/reference/functionOverloads21.types
+++ b/tests/baselines/reference/functionOverloads21.types
@@ -1,17 +1,17 @@
 === tests/cases/compiler/functionOverloads21.ts ===
 function foo(bar:{a:number;}[]);
->foo : typeof foo
+>foo : { (bar: { a: number; }[]): any; (bar: { a: number; b: string; }[]): any; }
 >bar : { a: number; }[]
 >a : number
 
 function foo(bar:{a:number; b:string;}[]);
->foo : typeof foo
+>foo : { (bar: { a: number; }[]): any; (bar: { a: number; b: string; }[]): any; }
 >bar : { a: number; b: string; }[]
 >a : number
 >b : string
 
 function foo(bar:{a:any; b?:string;}[]) { return 0 }
->foo : typeof foo
+>foo : { (bar: { a: number; }[]): any; (bar: { a: number; b: string; }[]): any; }
 >bar : { a: any; b?: string; }[]
 >a : any
 >b : string
diff --git a/tests/baselines/reference/functionOverloads23.types b/tests/baselines/reference/functionOverloads23.types
index 4bdbc646fcf..40b67a78c55 100644
--- a/tests/baselines/reference/functionOverloads23.types
+++ b/tests/baselines/reference/functionOverloads23.types
@@ -1,16 +1,16 @@
 === tests/cases/compiler/functionOverloads23.ts ===
 function foo(bar:(b:string)=>void);
->foo : typeof foo
+>foo : { (bar: (b: string) => void): any; (bar: (a: number) => void): any; }
 >bar : (b: string) => void
 >b : string
 
 function foo(bar:(a:number)=>void);
->foo : typeof foo
+>foo : { (bar: (b: string) => void): any; (bar: (a: number) => void): any; }
 >bar : (a: number) => void
 >a : number
 
 function foo(bar:(a?)=>void) { return 0 }
->foo : typeof foo
+>foo : { (bar: (b: string) => void): any; (bar: (a: number) => void): any; }
 >bar : (a?: any) => void
 >a : any
 
diff --git a/tests/baselines/reference/functionOverloads24.types b/tests/baselines/reference/functionOverloads24.types
index cea176a6e05..f6f090d904f 100644
--- a/tests/baselines/reference/functionOverloads24.types
+++ b/tests/baselines/reference/functionOverloads24.types
@@ -1,16 +1,16 @@
 === tests/cases/compiler/functionOverloads24.ts ===
 function foo(bar:number):(b:string)=>void;
->foo : typeof foo
+>foo : { (bar: number): (b: string) => void; (bar: string): (a: number) => void; }
 >bar : number
 >b : string
 
 function foo(bar:string):(a:number)=>void;
->foo : typeof foo
+>foo : { (bar: number): (b: string) => void; (bar: string): (a: number) => void; }
 >bar : string
 >a : number
 
 function foo(bar:any):(a)=>void { return function(){} }
->foo : typeof foo
+>foo : { (bar: number): (b: string) => void; (bar: string): (a: number) => void; }
 >bar : any
 >a : any
 >function(){} : () => void
diff --git a/tests/baselines/reference/functionOverloads25.types b/tests/baselines/reference/functionOverloads25.types
index e84ac94b798..ace77ebc9e4 100644
--- a/tests/baselines/reference/functionOverloads25.types
+++ b/tests/baselines/reference/functionOverloads25.types
@@ -1,17 +1,17 @@
 === tests/cases/compiler/functionOverloads25.ts ===
 function foo():string;
->foo : typeof foo
+>foo : { (): string; (bar: string): number; }
 
 function foo(bar:string):number;
->foo : typeof foo
+>foo : { (): string; (bar: string): number; }
 >bar : string
 
 function foo(bar?:any):any{ return '' };
->foo : typeof foo
+>foo : { (): string; (bar: string): number; }
 >bar : any
 
 var x = foo();
 >x : string
 >foo() : string
->foo : typeof foo
+>foo : { (): string; (bar: string): number; }
 
diff --git a/tests/baselines/reference/functionOverloads26.types b/tests/baselines/reference/functionOverloads26.types
index 40aad4298da..402003d7e7b 100644
--- a/tests/baselines/reference/functionOverloads26.types
+++ b/tests/baselines/reference/functionOverloads26.types
@@ -1,17 +1,17 @@
 === tests/cases/compiler/functionOverloads26.ts ===
 function foo():string;
->foo : typeof foo
+>foo : { (): string; (bar: string): number; }
 
 function foo(bar:string):number;
->foo : typeof foo
+>foo : { (): string; (bar: string): number; }
 >bar : string
 
 function foo(bar?:any):any{ return '' }
->foo : typeof foo
+>foo : { (): string; (bar: string): number; }
 >bar : any
 
 var x = foo('baz');
 >x : number
 >foo('baz') : number
->foo : typeof foo
+>foo : { (): string; (bar: string): number; }
 
diff --git a/tests/baselines/reference/functionOverloads28.types b/tests/baselines/reference/functionOverloads28.types
index f27ae1b8c0c..034d35c64f7 100644
--- a/tests/baselines/reference/functionOverloads28.types
+++ b/tests/baselines/reference/functionOverloads28.types
@@ -1,19 +1,19 @@
 === tests/cases/compiler/functionOverloads28.ts ===
 function foo():string;
->foo : typeof foo
+>foo : { (): string; (bar: string): number; }
 
 function foo(bar:string):number;
->foo : typeof foo
+>foo : { (): string; (bar: string): number; }
 >bar : string
 
 function foo(bar?:any):any{ return '' }
->foo : typeof foo
+>foo : { (): string; (bar: string): number; }
 >bar : any
 
 var t:any; var x = foo(t);
 >t : any
 >x : number
 >foo(t) : number
->foo : typeof foo
+>foo : { (): string; (bar: string): number; }
 >t : any
 
diff --git a/tests/baselines/reference/functionOverloads30.types b/tests/baselines/reference/functionOverloads30.types
index 088e6f51127..80d43c952d9 100644
--- a/tests/baselines/reference/functionOverloads30.types
+++ b/tests/baselines/reference/functionOverloads30.types
@@ -1,19 +1,19 @@
 === tests/cases/compiler/functionOverloads30.ts ===
 function foo(bar:string):string;
->foo : typeof foo
+>foo : { (bar: string): string; (bar: number): number; }
 >bar : string
 
 function foo(bar:number):number;
->foo : typeof foo
+>foo : { (bar: string): string; (bar: number): number; }
 >bar : number
 
 function foo(bar:any):any{ return bar }
->foo : typeof foo
+>foo : { (bar: string): string; (bar: number): number; }
 >bar : any
 >bar : any
 
 var x = foo('bar');
 >x : string
 >foo('bar') : string
->foo : typeof foo
+>foo : { (bar: string): string; (bar: number): number; }
 
diff --git a/tests/baselines/reference/functionOverloads31.types b/tests/baselines/reference/functionOverloads31.types
index 1005a2dc55c..4d7816166bc 100644
--- a/tests/baselines/reference/functionOverloads31.types
+++ b/tests/baselines/reference/functionOverloads31.types
@@ -1,19 +1,19 @@
 === tests/cases/compiler/functionOverloads31.ts ===
 function foo(bar:string):string;
->foo : typeof foo
+>foo : { (bar: string): string; (bar: number): number; }
 >bar : string
 
 function foo(bar:number):number;
->foo : typeof foo
+>foo : { (bar: string): string; (bar: number): number; }
 >bar : number
 
 function foo(bar:any):any{ return bar }
->foo : typeof foo
+>foo : { (bar: string): string; (bar: number): number; }
 >bar : any
 >bar : any
 
 var x = foo(5);
 >x : number
 >foo(5) : number
->foo : typeof foo
+>foo : { (bar: string): string; (bar: number): number; }
 
diff --git a/tests/baselines/reference/functionOverloads32.types b/tests/baselines/reference/functionOverloads32.types
index c858f2a54d1..df997e5d52a 100644
--- a/tests/baselines/reference/functionOverloads32.types
+++ b/tests/baselines/reference/functionOverloads32.types
@@ -1,14 +1,14 @@
 === tests/cases/compiler/functionOverloads32.ts ===
 function foo(bar:string):string;
->foo : typeof foo
+>foo : { (bar: string): string; (bar: number): number; }
 >bar : string
 
 function foo(bar:number):number;
->foo : typeof foo
+>foo : { (bar: string): string; (bar: number): number; }
 >bar : number
 
 function foo(bar:any):any{ return bar }
->foo : typeof foo
+>foo : { (bar: string): string; (bar: number): number; }
 >bar : any
 >bar : any
 
@@ -16,6 +16,6 @@ var baz:number; var x = foo(baz);
 >baz : number
 >x : number
 >foo(baz) : number
->foo : typeof foo
+>foo : { (bar: string): string; (bar: number): number; }
 >baz : number
 
diff --git a/tests/baselines/reference/functionOverloads33.types b/tests/baselines/reference/functionOverloads33.types
index fd510ea959e..0199277180d 100644
--- a/tests/baselines/reference/functionOverloads33.types
+++ b/tests/baselines/reference/functionOverloads33.types
@@ -1,19 +1,19 @@
 === tests/cases/compiler/functionOverloads33.ts ===
 function foo(bar:string):string;
->foo : typeof foo
+>foo : { (bar: string): string; (bar: any): number; }
 >bar : string
 
 function foo(bar:any):number;
->foo : typeof foo
+>foo : { (bar: string): string; (bar: any): number; }
 >bar : any
 
 function foo(bar:any):any{ return bar }
->foo : typeof foo
+>foo : { (bar: string): string; (bar: any): number; }
 >bar : any
 >bar : any
 
 var x = foo(5);
 >x : number
 >foo(5) : number
->foo : typeof foo
+>foo : { (bar: string): string; (bar: any): number; }
 
diff --git a/tests/baselines/reference/functionOverloads35.types b/tests/baselines/reference/functionOverloads35.types
index db42ed0d47b..567f9512e3d 100644
--- a/tests/baselines/reference/functionOverloads35.types
+++ b/tests/baselines/reference/functionOverloads35.types
@@ -1,16 +1,16 @@
 === tests/cases/compiler/functionOverloads35.ts ===
 function foo(bar:{a:number;}):number;
->foo : typeof foo
+>foo : { (bar: { a: number; }): number; (bar: { a: string; }): string; }
 >bar : { a: number; }
 >a : number
 
 function foo(bar:{a:string;}):string;
->foo : typeof foo
+>foo : { (bar: { a: number; }): number; (bar: { a: string; }): string; }
 >bar : { a: string; }
 >a : string
 
 function foo(bar:{a:any;}):any{ return bar }
->foo : typeof foo
+>foo : { (bar: { a: number; }): number; (bar: { a: string; }): string; }
 >bar : { a: any; }
 >a : any
 >bar : { a: any; }
@@ -18,7 +18,7 @@ function foo(bar:{a:any;}):any{ return bar }
 var x = foo({a:1});
 >x : number
 >foo({a:1}) : number
->foo : typeof foo
+>foo : { (bar: { a: number; }): number; (bar: { a: string; }): string; }
 >{a:1} : { a: number; }
 >a : number
 
diff --git a/tests/baselines/reference/functionOverloads36.types b/tests/baselines/reference/functionOverloads36.types
index 3726bbea87d..8118a1c113a 100644
--- a/tests/baselines/reference/functionOverloads36.types
+++ b/tests/baselines/reference/functionOverloads36.types
@@ -1,16 +1,16 @@
 === tests/cases/compiler/functionOverloads36.ts ===
 function foo(bar:{a:number;}):number;
->foo : typeof foo
+>foo : { (bar: { a: number; }): number; (bar: { a: string; }): string; }
 >bar : { a: number; }
 >a : number
 
 function foo(bar:{a:string;}):string;
->foo : typeof foo
+>foo : { (bar: { a: number; }): number; (bar: { a: string; }): string; }
 >bar : { a: string; }
 >a : string
 
 function foo(bar:{a:any;}):any{ return bar }
->foo : typeof foo
+>foo : { (bar: { a: number; }): number; (bar: { a: string; }): string; }
 >bar : { a: any; }
 >a : any
 >bar : { a: any; }
@@ -18,7 +18,7 @@ function foo(bar:{a:any;}):any{ return bar }
 var x = foo({a:'foo'});
 >x : string
 >foo({a:'foo'}) : string
->foo : typeof foo
+>foo : { (bar: { a: number; }): number; (bar: { a: string; }): string; }
 >{a:'foo'} : { a: string; }
 >a : string
 
diff --git a/tests/baselines/reference/functionOverloads38.types b/tests/baselines/reference/functionOverloads38.types
index 021ac7490ba..852191ba07f 100644
--- a/tests/baselines/reference/functionOverloads38.types
+++ b/tests/baselines/reference/functionOverloads38.types
@@ -1,16 +1,16 @@
 === tests/cases/compiler/functionOverloads38.ts ===
 function foo(bar:{a:number;}[]):string;
->foo : typeof foo
+>foo : { (bar: { a: number; }[]): string; (bar: { a: boolean; }[]): number; }
 >bar : { a: number; }[]
 >a : number
 
 function foo(bar:{a:boolean;}[]):number;
->foo : typeof foo
+>foo : { (bar: { a: number; }[]): string; (bar: { a: boolean; }[]): number; }
 >bar : { a: boolean; }[]
 >a : boolean
 
 function foo(bar:{a:any;}[]):any{ return bar }
->foo : typeof foo
+>foo : { (bar: { a: number; }[]): string; (bar: { a: boolean; }[]): number; }
 >bar : { a: any; }[]
 >a : any
 >bar : { a: any; }[]
@@ -18,7 +18,7 @@ function foo(bar:{a:any;}[]):any{ return bar }
 var x = foo([{a:1}]);
 >x : string
 >foo([{a:1}]) : string
->foo : typeof foo
+>foo : { (bar: { a: number; }[]): string; (bar: { a: boolean; }[]): number; }
 >[{a:1}] : { a: number; }[]
 >{a:1} : { a: number; }
 >a : number
diff --git a/tests/baselines/reference/functionOverloads39.types b/tests/baselines/reference/functionOverloads39.types
index 1cb1ebc43c1..70eee2b5163 100644
--- a/tests/baselines/reference/functionOverloads39.types
+++ b/tests/baselines/reference/functionOverloads39.types
@@ -1,16 +1,16 @@
 === tests/cases/compiler/functionOverloads39.ts ===
 function foo(bar:{a:number;}[]):string;
->foo : typeof foo
+>foo : { (bar: { a: number; }[]): string; (bar: { a: boolean; }[]): number; }
 >bar : { a: number; }[]
 >a : number
 
 function foo(bar:{a:boolean;}[]):number;
->foo : typeof foo
+>foo : { (bar: { a: number; }[]): string; (bar: { a: boolean; }[]): number; }
 >bar : { a: boolean; }[]
 >a : boolean
 
 function foo(bar:{a:any;}[]):any{ return bar }
->foo : typeof foo
+>foo : { (bar: { a: number; }[]): string; (bar: { a: boolean; }[]): number; }
 >bar : { a: any; }[]
 >a : any
 >bar : { a: any; }[]
@@ -18,7 +18,7 @@ function foo(bar:{a:any;}[]):any{ return bar }
 var x = foo([{a:true}]);
 >x : number
 >foo([{a:true}]) : number
->foo : typeof foo
+>foo : { (bar: { a: number; }[]): string; (bar: { a: boolean; }[]): number; }
 >[{a:true}] : { a: boolean; }[]
 >{a:true} : { a: boolean; }
 >a : boolean
diff --git a/tests/baselines/reference/functionOverloads42.types b/tests/baselines/reference/functionOverloads42.types
index 298ffcbc437..dec6a041440 100644
--- a/tests/baselines/reference/functionOverloads42.types
+++ b/tests/baselines/reference/functionOverloads42.types
@@ -1,16 +1,16 @@
 === tests/cases/compiler/functionOverloads42.ts ===
 function foo(bar:{a:number;}[]):string;
->foo : typeof foo
+>foo : { (bar: { a: number; }[]): string; (bar: { a: any; }[]): number; }
 >bar : { a: number; }[]
 >a : number
 
 function foo(bar:{a:any;}[]):number;
->foo : typeof foo
+>foo : { (bar: { a: number; }[]): string; (bar: { a: any; }[]): number; }
 >bar : { a: any; }[]
 >a : any
 
 function foo(bar:{a:any;}[]):any{ return bar }
->foo : typeof foo
+>foo : { (bar: { a: number; }[]): string; (bar: { a: any; }[]): number; }
 >bar : { a: any; }[]
 >a : any
 >bar : { a: any; }[]
@@ -18,7 +18,7 @@ function foo(bar:{a:any;}[]):any{ return bar }
 var x = foo([{a:'s'}]);
 >x : number
 >foo([{a:'s'}]) : number
->foo : typeof foo
+>foo : { (bar: { a: number; }[]): string; (bar: { a: any; }[]): number; }
 >[{a:'s'}] : { a: any; }[]
 >{a:'s'} : { a: string; }
 >a : string
diff --git a/tests/baselines/reference/functionOverloads8.types b/tests/baselines/reference/functionOverloads8.types
index 9155a06e82e..e342db5d174 100644
--- a/tests/baselines/reference/functionOverloads8.types
+++ b/tests/baselines/reference/functionOverloads8.types
@@ -1,12 +1,12 @@
 === tests/cases/compiler/functionOverloads8.ts ===
 function foo();
->foo : typeof foo
+>foo : { (): any; (foo: string): any; }
 
 function foo(foo:string);
->foo : typeof foo
+>foo : { (): any; (foo: string): any; }
 >foo : string
 
 function foo(foo?:any){ return '' }
->foo : typeof foo
+>foo : { (): any; (foo: string): any; }
 >foo : any
 
diff --git a/tests/baselines/reference/functionOverloads9.types b/tests/baselines/reference/functionOverloads9.types
index f27d1ba797c..a844aee7df1 100644
--- a/tests/baselines/reference/functionOverloads9.types
+++ b/tests/baselines/reference/functionOverloads9.types
@@ -1,14 +1,14 @@
 === tests/cases/compiler/functionOverloads9.ts ===
 function foo(foo:string);
->foo : typeof foo
+>foo : (foo: string) => any
 >foo : string
 
 function foo(foo?:string){ return '' };
->foo : typeof foo
+>foo : (foo: string) => any
 >foo : string
 
 var x = foo('foo');
 >x : any
 >foo('foo') : any
->foo : typeof foo
+>foo : (foo: string) => any
 
diff --git a/tests/baselines/reference/functionOverloadsRecursiveGenericReturnType.types b/tests/baselines/reference/functionOverloadsRecursiveGenericReturnType.types
index 7e9e07aff68..9fe33890b55 100644
--- a/tests/baselines/reference/functionOverloadsRecursiveGenericReturnType.types
+++ b/tests/baselines/reference/functionOverloadsRecursiveGenericReturnType.types
@@ -19,7 +19,7 @@ class A<U>{
 }
 
 function Choice<T>(args: T[]): A<T>;
->Choice : typeof Choice
+>Choice : { <T>(args: T[]): A<T>; <T>(...v_args: T[]): A<T>; }
 >T : T
 >args : T[]
 >T : T
@@ -27,7 +27,7 @@ function Choice<T>(args: T[]): A<T>;
 >T : T
 
 function Choice<T>(...v_args: T[]): A<T>;
->Choice : typeof Choice
+>Choice : { <T>(args: T[]): A<T>; <T>(...v_args: T[]): A<T>; }
 >T : T
 >v_args : T[]
 >T : T
@@ -35,7 +35,7 @@ function Choice<T>(...v_args: T[]): A<T>;
 >T : T
 
 function Choice<T>(...v_args: any[]): A<T>{
->Choice : typeof Choice
+>Choice : { <T>(args: T[]): A<T>; <T>(...v_args: T[]): A<T>; }
 >T : T
 >v_args : any[]
 >A : A<U>
diff --git a/tests/baselines/reference/functionReturn.types b/tests/baselines/reference/functionReturn.types
index 1eb0342040f..0c1ee8eafc2 100644
--- a/tests/baselines/reference/functionReturn.types
+++ b/tests/baselines/reference/functionReturn.types
@@ -1,29 +1,29 @@
 === tests/cases/compiler/functionReturn.ts ===
 function f0(): void { }
->f0 : typeof f0
+>f0 : () => void
 
 function f1() {
->f1 : typeof f1
+>f1 : () => void
 
     var n: any = f0();
 >n : any
 >f0() : void
->f0 : typeof f0
+>f0 : () => void
 }
 function f2(): any { }
->f2 : typeof f2
+>f2 : () => any
 
 function f3(): string { return; }
->f3 : typeof f3
+>f3 : () => string
 
 function f4(): string {
->f4 : typeof f4
+>f4 : () => string
 
     return '';
     return;
 }
 function f5(): string {
->f5 : typeof f5
+>f5 : () => string
 
     return '';
     return undefined;
diff --git a/tests/baselines/reference/functionReturningItself.types b/tests/baselines/reference/functionReturningItself.types
index 6505e574c5e..597202a55e2 100644
--- a/tests/baselines/reference/functionReturningItself.types
+++ b/tests/baselines/reference/functionReturningItself.types
@@ -1,7 +1,7 @@
 === tests/cases/compiler/functionReturningItself.ts ===
 function somefn() {
->somefn : typeof somefn
+>somefn : () => typeof somefn
 
     return somefn;
->somefn : typeof somefn
+>somefn : () => typeof somefn
 }
diff --git a/tests/baselines/reference/functionType.types b/tests/baselines/reference/functionType.types
index 74aafc7c8d0..4bbce7e096a 100644
--- a/tests/baselines/reference/functionType.types
+++ b/tests/baselines/reference/functionType.types
@@ -1,11 +1,11 @@
 === tests/cases/compiler/functionType.ts ===
 function salt() {}
->salt : typeof salt
+>salt : () => void
 
 salt.apply("hello", []);
 >salt.apply("hello", []) : any
 >salt.apply : (thisArg: any, argArray?: any) => any
->salt : typeof salt
+>salt : () => void
 >apply : (thisArg: any, argArray?: any) => any
 >[] : undefined[]
 
diff --git a/tests/baselines/reference/functionWithAnyReturnTypeAndNoReturnExpression.types b/tests/baselines/reference/functionWithAnyReturnTypeAndNoReturnExpression.types
index 6b0208b6b64..a5096d464d8 100644
--- a/tests/baselines/reference/functionWithAnyReturnTypeAndNoReturnExpression.types
+++ b/tests/baselines/reference/functionWithAnyReturnTypeAndNoReturnExpression.types
@@ -1,7 +1,7 @@
 === tests/cases/compiler/functionWithAnyReturnTypeAndNoReturnExpression.ts ===
 // All should be allowed
 function f(): any { }
->f : typeof f
+>f : () => any
 
 var f2: () => any = () => { };
 >f2 : () => any
diff --git a/tests/baselines/reference/functionWithMultipleReturnStatements2.types b/tests/baselines/reference/functionWithMultipleReturnStatements2.types
index 99aa5457f7b..706aca40c94 100644
--- a/tests/baselines/reference/functionWithMultipleReturnStatements2.types
+++ b/tests/baselines/reference/functionWithMultipleReturnStatements2.types
@@ -3,7 +3,7 @@
 // no errors expected here
 
 function f1() {
->f1 : typeof f1
+>f1 : () => number
 
     if (true) {
         return 1;
@@ -13,7 +13,7 @@ function f1() {
 }
 
 function f2() {
->f2 : typeof f2
+>f2 : () => number
 
     if (true) {
         return 1;
@@ -25,7 +25,7 @@ function f2() {
 }
 
 function f4() {
->f4 : typeof f4
+>f4 : () => number
 
     try {
         return 1;
@@ -42,7 +42,7 @@ function f4() {
 }
 
 function f5() {
->f5 : typeof f5
+>f5 : () => Object
 
     return 1;
     return new Object();
@@ -51,7 +51,7 @@ function f5() {
 }
 
 function f6<T>(x: T) {
->f6 : typeof f6
+>f6 : <T>(x: T) => T
 >T : T
 >x : T
 >T : T
@@ -85,7 +85,7 @@ var b: { x: number; z?: number };
 
 // returns typeof a
 function f9() {
->f9 : typeof f9
+>f9 : () => { x: number; y?: number; }
 
     if (true) {
         return a;
@@ -99,7 +99,7 @@ function f9() {
 
 // returns typeof b
 function f10() {
->f10 : typeof f10
+>f10 : () => { x: number; z?: number; }
 
     if (true) {
         return b;
@@ -113,7 +113,7 @@ function f10() {
 
 // returns number => void
 function f11() {
->f11 : typeof f11
+>f11 : () => (x: number) => void
 
     if (true) {
         return (x: number) => { }
@@ -130,7 +130,7 @@ function f11() {
 
 // returns Object => void
 function f12() {
->f12 : typeof f12
+>f12 : () => (x: Object) => void
 
     if (true) {
         return (x: Object) => { }
diff --git a/tests/baselines/reference/funduleUsedAcrossFileBoundary.types b/tests/baselines/reference/funduleUsedAcrossFileBoundary.types
index 105246be7b0..09fc76a257b 100644
--- a/tests/baselines/reference/funduleUsedAcrossFileBoundary.types
+++ b/tests/baselines/reference/funduleUsedAcrossFileBoundary.types
@@ -16,13 +16,13 @@ declare module Q {
 >foo : string
     }
     export function defer<T>(): string;
->defer : typeof defer
+>defer : <T>() => string
 >T : T
 }
 
 === tests/cases/compiler/funduleUsedAcrossFileBoundary_file2.ts ===
 function promiseWithCancellation<T>(promise: Q.Promise<T>) {
->promiseWithCancellation : typeof promiseWithCancellation
+>promiseWithCancellation : <T>(promise: Q.Promise<T>) => void
 >T : T
 >promise : Q.Promise<T>
 >Q : unknown
@@ -32,8 +32,8 @@ function promiseWithCancellation<T>(promise: Q.Promise<T>) {
     var deferred = Q.defer<T>(); // used to be an error
 >deferred : string
 >Q.defer<T>() : string
->Q.defer : typeof Q.defer
+>Q.defer : <T>() => string
 >Q : typeof Q
->defer : typeof Q.defer
+>defer : <T>() => string
 >T : T
 }
diff --git a/tests/baselines/reference/generatedContextualTyping.types b/tests/baselines/reference/generatedContextualTyping.types
index 13254eb8d22..57b5408eabe 100644
--- a/tests/baselines/reference/generatedContextualTyping.types
+++ b/tests/baselines/reference/generatedContextualTyping.types
@@ -1180,7 +1180,7 @@ class x120 { constructor(private parm: Genric<Base> = { func: n => { return [d1,
 >d2 : Derived2
 
 function x121(parm: () => Base[] = () => [d1, d2]) { }
->x121 : typeof x121
+>x121 : (parm?: () => Base[]) => void
 >parm : () => Base[]
 >Base : Base
 >() => [d1, d2] : () => Base[]
@@ -1189,7 +1189,7 @@ function x121(parm: () => Base[] = () => [d1, d2]) { }
 >d2 : Derived2
 
 function x122(parm: () => Base[] = function() { return [d1, d2] }) { }
->x122 : typeof x122
+>x122 : (parm?: () => Base[]) => void
 >parm : () => Base[]
 >Base : Base
 >function() { return [d1, d2] } : () => Base[]
@@ -1198,7 +1198,7 @@ function x122(parm: () => Base[] = function() { return [d1, d2] }) { }
 >d2 : Derived2
 
 function x123(parm: () => Base[] = function named() { return [d1, d2] }) { }
->x123 : typeof x123
+>x123 : (parm?: () => Base[]) => void
 >parm : () => Base[]
 >Base : Base
 >function named() { return [d1, d2] } : () => Base[]
@@ -1208,7 +1208,7 @@ function x123(parm: () => Base[] = function named() { return [d1, d2] }) { }
 >d2 : Derived2
 
 function x124(parm: { (): Base[]; } = () => [d1, d2]) { }
->x124 : typeof x124
+>x124 : (parm?: () => Base[]) => void
 >parm : () => Base[]
 >Base : Base
 >() => [d1, d2] : () => Base[]
@@ -1217,7 +1217,7 @@ function x124(parm: { (): Base[]; } = () => [d1, d2]) { }
 >d2 : Derived2
 
 function x125(parm: { (): Base[]; } = function() { return [d1, d2] }) { }
->x125 : typeof x125
+>x125 : (parm?: () => Base[]) => void
 >parm : () => Base[]
 >Base : Base
 >function() { return [d1, d2] } : () => Base[]
@@ -1226,7 +1226,7 @@ function x125(parm: { (): Base[]; } = function() { return [d1, d2] }) { }
 >d2 : Derived2
 
 function x126(parm: { (): Base[]; } = function named() { return [d1, d2] }) { }
->x126 : typeof x126
+>x126 : (parm?: () => Base[]) => void
 >parm : () => Base[]
 >Base : Base
 >function named() { return [d1, d2] } : () => Base[]
@@ -1236,7 +1236,7 @@ function x126(parm: { (): Base[]; } = function named() { return [d1, d2] }) { }
 >d2 : Derived2
 
 function x127(parm: Base[] = [d1, d2]) { }
->x127 : typeof x127
+>x127 : (parm?: Base[]) => void
 >parm : Base[]
 >Base : Base
 >[d1, d2] : Base[]
@@ -1244,7 +1244,7 @@ function x127(parm: Base[] = [d1, d2]) { }
 >d2 : Derived2
 
 function x128(parm: Array<Base> = [d1, d2]) { }
->x128 : typeof x128
+>x128 : (parm?: Base[]) => void
 >parm : Base[]
 >Array : T[]
 >Base : Base
@@ -1253,7 +1253,7 @@ function x128(parm: Array<Base> = [d1, d2]) { }
 >d2 : Derived2
 
 function x129(parm: { [n: number]: Base; } = [d1, d2]) { }
->x129 : typeof x129
+>x129 : (parm?: { [x: number]: Base; }) => void
 >parm : { [x: number]: Base; }
 >n : number
 >Base : Base
@@ -1262,7 +1262,7 @@ function x129(parm: { [n: number]: Base; } = [d1, d2]) { }
 >d2 : Derived2
 
 function x130(parm: {n: Base[]; }  = { n: [d1, d2] }) { }
->x130 : typeof x130
+>x130 : (parm?: { n: Base[]; }) => void
 >parm : { n: Base[]; }
 >n : Base[]
 >Base : Base
@@ -1273,7 +1273,7 @@ function x130(parm: {n: Base[]; }  = { n: [d1, d2] }) { }
 >d2 : Derived2
 
 function x131(parm: (s: Base[]) => any = n => { var n: Base[]; return null; }) { }
->x131 : typeof x131
+>x131 : (parm?: (s: Base[]) => any) => void
 >parm : (s: Base[]) => any
 >s : Base[]
 >Base : Base
@@ -1283,7 +1283,7 @@ function x131(parm: (s: Base[]) => any = n => { var n: Base[]; return null; }) {
 >Base : Base
 
 function x132(parm: Genric<Base> = { func: n => { return [d1, d2]; } }) { }
->x132 : typeof x132
+>x132 : (parm?: Genric<Base>) => void
 >parm : Genric<Base>
 >Genric : Genric<T>
 >Base : Base
@@ -1296,7 +1296,7 @@ function x132(parm: Genric<Base> = { func: n => { return [d1, d2]; } }) { }
 >d2 : Derived2
 
 function x133(): () => Base[] { return () => [d1, d2]; }
->x133 : typeof x133
+>x133 : () => () => Base[]
 >Base : Base
 >() => [d1, d2] : () => Base[]
 >[d1, d2] : Base[]
@@ -1304,7 +1304,7 @@ function x133(): () => Base[] { return () => [d1, d2]; }
 >d2 : Derived2
 
 function x134(): () => Base[] { return function() { return [d1, d2] }; }
->x134 : typeof x134
+>x134 : () => () => Base[]
 >Base : Base
 >function() { return [d1, d2] } : () => Base[]
 >[d1, d2] : Base[]
@@ -1312,7 +1312,7 @@ function x134(): () => Base[] { return function() { return [d1, d2] }; }
 >d2 : Derived2
 
 function x135(): () => Base[] { return function named() { return [d1, d2] }; }
->x135 : typeof x135
+>x135 : () => () => Base[]
 >Base : Base
 >function named() { return [d1, d2] } : () => Base[]
 >named : () => Base[]
@@ -1321,7 +1321,7 @@ function x135(): () => Base[] { return function named() { return [d1, d2] }; }
 >d2 : Derived2
 
 function x136(): { (): Base[]; } { return () => [d1, d2]; }
->x136 : typeof x136
+>x136 : () => () => Base[]
 >Base : Base
 >() => [d1, d2] : () => Base[]
 >[d1, d2] : Base[]
@@ -1329,7 +1329,7 @@ function x136(): { (): Base[]; } { return () => [d1, d2]; }
 >d2 : Derived2
 
 function x137(): { (): Base[]; } { return function() { return [d1, d2] }; }
->x137 : typeof x137
+>x137 : () => () => Base[]
 >Base : Base
 >function() { return [d1, d2] } : () => Base[]
 >[d1, d2] : Base[]
@@ -1337,7 +1337,7 @@ function x137(): { (): Base[]; } { return function() { return [d1, d2] }; }
 >d2 : Derived2
 
 function x138(): { (): Base[]; } { return function named() { return [d1, d2] }; }
->x138 : typeof x138
+>x138 : () => () => Base[]
 >Base : Base
 >function named() { return [d1, d2] } : () => Base[]
 >named : () => Base[]
@@ -1346,14 +1346,14 @@ function x138(): { (): Base[]; } { return function named() { return [d1, d2] };
 >d2 : Derived2
 
 function x139(): Base[] { return [d1, d2]; }
->x139 : typeof x139
+>x139 : () => Base[]
 >Base : Base
 >[d1, d2] : Base[]
 >d1 : Derived1
 >d2 : Derived2
 
 function x140(): Array<Base> { return [d1, d2]; }
->x140 : typeof x140
+>x140 : () => Base[]
 >Array : T[]
 >Base : Base
 >[d1, d2] : Base[]
@@ -1361,7 +1361,7 @@ function x140(): Array<Base> { return [d1, d2]; }
 >d2 : Derived2
 
 function x141(): { [n: number]: Base; } { return [d1, d2]; }
->x141 : typeof x141
+>x141 : () => { [x: number]: Base; }
 >n : number
 >Base : Base
 >[d1, d2] : Base[]
@@ -1369,7 +1369,7 @@ function x141(): { [n: number]: Base; } { return [d1, d2]; }
 >d2 : Derived2
 
 function x142(): {n: Base[]; }  { return { n: [d1, d2] }; }
->x142 : typeof x142
+>x142 : () => { n: Base[]; }
 >n : Base[]
 >Base : Base
 >{ n: [d1, d2] } : { n: Base[]; }
@@ -1379,7 +1379,7 @@ function x142(): {n: Base[]; }  { return { n: [d1, d2] }; }
 >d2 : Derived2
 
 function x143(): (s: Base[]) => any { return n => { var n: Base[]; return null; }; }
->x143 : typeof x143
+>x143 : () => (s: Base[]) => any
 >s : Base[]
 >Base : Base
 >n => { var n: Base[]; return null; } : (n: Base[]) => any
@@ -1388,7 +1388,7 @@ function x143(): (s: Base[]) => any { return n => { var n: Base[]; return null;
 >Base : Base
 
 function x144(): Genric<Base> { return { func: n => { return [d1, d2]; } }; }
->x144 : typeof x144
+>x144 : () => Genric<Base>
 >Genric : Genric<T>
 >Base : Base
 >{ func: n => { return [d1, d2]; } } : { func: (n: Base[]) => {}[]; }
@@ -1400,7 +1400,7 @@ function x144(): Genric<Base> { return { func: n => { return [d1, d2]; } }; }
 >d2 : Derived2
 
 function x145(): () => Base[] { return () => [d1, d2]; return () => [d1, d2]; }
->x145 : typeof x145
+>x145 : () => () => Base[]
 >Base : Base
 >() => [d1, d2] : () => Base[]
 >[d1, d2] : Base[]
@@ -1412,7 +1412,7 @@ function x145(): () => Base[] { return () => [d1, d2]; return () => [d1, d2]; }
 >d2 : Derived2
 
 function x146(): () => Base[] { return function() { return [d1, d2] }; return function() { return [d1, d2] }; }
->x146 : typeof x146
+>x146 : () => () => Base[]
 >Base : Base
 >function() { return [d1, d2] } : () => Base[]
 >[d1, d2] : Base[]
@@ -1424,7 +1424,7 @@ function x146(): () => Base[] { return function() { return [d1, d2] }; return fu
 >d2 : Derived2
 
 function x147(): () => Base[] { return function named() { return [d1, d2] }; return function named() { return [d1, d2] }; }
->x147 : typeof x147
+>x147 : () => () => Base[]
 >Base : Base
 >function named() { return [d1, d2] } : () => Base[]
 >named : () => Base[]
@@ -1438,7 +1438,7 @@ function x147(): () => Base[] { return function named() { return [d1, d2] }; ret
 >d2 : Derived2
 
 function x148(): { (): Base[]; } { return () => [d1, d2]; return () => [d1, d2]; }
->x148 : typeof x148
+>x148 : () => () => Base[]
 >Base : Base
 >() => [d1, d2] : () => Base[]
 >[d1, d2] : Base[]
@@ -1450,7 +1450,7 @@ function x148(): { (): Base[]; } { return () => [d1, d2]; return () => [d1, d2];
 >d2 : Derived2
 
 function x149(): { (): Base[]; } { return function() { return [d1, d2] }; return function() { return [d1, d2] }; }
->x149 : typeof x149
+>x149 : () => () => Base[]
 >Base : Base
 >function() { return [d1, d2] } : () => Base[]
 >[d1, d2] : Base[]
@@ -1462,7 +1462,7 @@ function x149(): { (): Base[]; } { return function() { return [d1, d2] }; return
 >d2 : Derived2
 
 function x150(): { (): Base[]; } { return function named() { return [d1, d2] }; return function named() { return [d1, d2] }; }
->x150 : typeof x150
+>x150 : () => () => Base[]
 >Base : Base
 >function named() { return [d1, d2] } : () => Base[]
 >named : () => Base[]
@@ -1476,7 +1476,7 @@ function x150(): { (): Base[]; } { return function named() { return [d1, d2] };
 >d2 : Derived2
 
 function x151(): Base[] { return [d1, d2]; return [d1, d2]; }
->x151 : typeof x151
+>x151 : () => Base[]
 >Base : Base
 >[d1, d2] : Base[]
 >d1 : Derived1
@@ -1486,7 +1486,7 @@ function x151(): Base[] { return [d1, d2]; return [d1, d2]; }
 >d2 : Derived2
 
 function x152(): Array<Base> { return [d1, d2]; return [d1, d2]; }
->x152 : typeof x152
+>x152 : () => Base[]
 >Array : T[]
 >Base : Base
 >[d1, d2] : Base[]
@@ -1497,7 +1497,7 @@ function x152(): Array<Base> { return [d1, d2]; return [d1, d2]; }
 >d2 : Derived2
 
 function x153(): { [n: number]: Base; } { return [d1, d2]; return [d1, d2]; }
->x153 : typeof x153
+>x153 : () => { [x: number]: Base; }
 >n : number
 >Base : Base
 >[d1, d2] : Base[]
@@ -1508,7 +1508,7 @@ function x153(): { [n: number]: Base; } { return [d1, d2]; return [d1, d2]; }
 >d2 : Derived2
 
 function x154(): {n: Base[]; }  { return { n: [d1, d2] }; return { n: [d1, d2] }; }
->x154 : typeof x154
+>x154 : () => { n: Base[]; }
 >n : Base[]
 >Base : Base
 >{ n: [d1, d2] } : { n: Base[]; }
@@ -1523,7 +1523,7 @@ function x154(): {n: Base[]; }  { return { n: [d1, d2] }; return { n: [d1, d2] }
 >d2 : Derived2
 
 function x155(): (s: Base[]) => any { return n => { var n: Base[]; return null; }; return n => { var n: Base[]; return null; }; }
->x155 : typeof x155
+>x155 : () => (s: Base[]) => any
 >s : Base[]
 >Base : Base
 >n => { var n: Base[]; return null; } : (n: Base[]) => any
@@ -1536,7 +1536,7 @@ function x155(): (s: Base[]) => any { return n => { var n: Base[]; return null;
 >Base : Base
 
 function x156(): Genric<Base> { return { func: n => { return [d1, d2]; } }; return { func: n => { return [d1, d2]; } }; }
->x156 : typeof x156
+>x156 : () => Genric<Base>
 >Genric : Genric<T>
 >Base : Base
 >{ func: n => { return [d1, d2]; } } : { func: (n: Base[]) => {}[]; }
@@ -3248,33 +3248,33 @@ var x320: Genric<Base> = true ? { func: n => { return [d1, d2]; } } : undefined;
 >undefined : undefined
 
 function x321(n: () => Base[]) { }; x321(() => [d1, d2]);
->x321 : typeof x321
+>x321 : (n: () => Base[]) => void
 >n : () => Base[]
 >Base : Base
 >x321(() => [d1, d2]) : void
->x321 : typeof x321
+>x321 : (n: () => Base[]) => void
 >() => [d1, d2] : () => Base[]
 >[d1, d2] : Base[]
 >d1 : Derived1
 >d2 : Derived2
 
 function x322(n: () => Base[]) { }; x322(function() { return [d1, d2] });
->x322 : typeof x322
+>x322 : (n: () => Base[]) => void
 >n : () => Base[]
 >Base : Base
 >x322(function() { return [d1, d2] }) : void
->x322 : typeof x322
+>x322 : (n: () => Base[]) => void
 >function() { return [d1, d2] } : () => Base[]
 >[d1, d2] : Base[]
 >d1 : Derived1
 >d2 : Derived2
 
 function x323(n: () => Base[]) { }; x323(function named() { return [d1, d2] });
->x323 : typeof x323
+>x323 : (n: () => Base[]) => void
 >n : () => Base[]
 >Base : Base
 >x323(function named() { return [d1, d2] }) : void
->x323 : typeof x323
+>x323 : (n: () => Base[]) => void
 >function named() { return [d1, d2] } : () => Base[]
 >named : () => Base[]
 >[d1, d2] : Base[]
@@ -3282,33 +3282,33 @@ function x323(n: () => Base[]) { }; x323(function named() { return [d1, d2] });
 >d2 : Derived2
 
 function x324(n: { (): Base[]; }) { }; x324(() => [d1, d2]);
->x324 : typeof x324
+>x324 : (n: () => Base[]) => void
 >n : () => Base[]
 >Base : Base
 >x324(() => [d1, d2]) : void
->x324 : typeof x324
+>x324 : (n: () => Base[]) => void
 >() => [d1, d2] : () => Base[]
 >[d1, d2] : Base[]
 >d1 : Derived1
 >d2 : Derived2
 
 function x325(n: { (): Base[]; }) { }; x325(function() { return [d1, d2] });
->x325 : typeof x325
+>x325 : (n: () => Base[]) => void
 >n : () => Base[]
 >Base : Base
 >x325(function() { return [d1, d2] }) : void
->x325 : typeof x325
+>x325 : (n: () => Base[]) => void
 >function() { return [d1, d2] } : () => Base[]
 >[d1, d2] : Base[]
 >d1 : Derived1
 >d2 : Derived2
 
 function x326(n: { (): Base[]; }) { }; x326(function named() { return [d1, d2] });
->x326 : typeof x326
+>x326 : (n: () => Base[]) => void
 >n : () => Base[]
 >Base : Base
 >x326(function named() { return [d1, d2] }) : void
->x326 : typeof x326
+>x326 : (n: () => Base[]) => void
 >function named() { return [d1, d2] } : () => Base[]
 >named : () => Base[]
 >[d1, d2] : Base[]
@@ -3316,44 +3316,44 @@ function x326(n: { (): Base[]; }) { }; x326(function named() { return [d1, d2] }
 >d2 : Derived2
 
 function x327(n: Base[]) { }; x327([d1, d2]);
->x327 : typeof x327
+>x327 : (n: Base[]) => void
 >n : Base[]
 >Base : Base
 >x327([d1, d2]) : void
->x327 : typeof x327
+>x327 : (n: Base[]) => void
 >[d1, d2] : Base[]
 >d1 : Derived1
 >d2 : Derived2
 
 function x328(n: Array<Base>) { }; x328([d1, d2]);
->x328 : typeof x328
+>x328 : (n: Base[]) => void
 >n : Base[]
 >Array : T[]
 >Base : Base
 >x328([d1, d2]) : void
->x328 : typeof x328
+>x328 : (n: Base[]) => void
 >[d1, d2] : Base[]
 >d1 : Derived1
 >d2 : Derived2
 
 function x329(n: { [n: number]: Base; }) { }; x329([d1, d2]);
->x329 : typeof x329
+>x329 : (n: { [x: number]: Base; }) => void
 >n : { [x: number]: Base; }
 >n : number
 >Base : Base
 >x329([d1, d2]) : void
->x329 : typeof x329
+>x329 : (n: { [x: number]: Base; }) => void
 >[d1, d2] : Base[]
 >d1 : Derived1
 >d2 : Derived2
 
 function x330(n: {n: Base[]; } ) { }; x330({ n: [d1, d2] });
->x330 : typeof x330
+>x330 : (n: { n: Base[]; }) => void
 >n : { n: Base[]; }
 >n : Base[]
 >Base : Base
 >x330({ n: [d1, d2] }) : void
->x330 : typeof x330
+>x330 : (n: { n: Base[]; }) => void
 >{ n: [d1, d2] } : { n: Base[]; }
 >n : Base[]
 >[d1, d2] : Base[]
@@ -3361,24 +3361,24 @@ function x330(n: {n: Base[]; } ) { }; x330({ n: [d1, d2] });
 >d2 : Derived2
 
 function x331(n: (s: Base[]) => any) { }; x331(n => { var n: Base[]; return null; });
->x331 : typeof x331
+>x331 : (n: (s: Base[]) => any) => void
 >n : (s: Base[]) => any
 >s : Base[]
 >Base : Base
 >x331(n => { var n: Base[]; return null; }) : void
->x331 : typeof x331
+>x331 : (n: (s: Base[]) => any) => void
 >n => { var n: Base[]; return null; } : (n: Base[]) => any
 >n : Base[]
 >n : Base[]
 >Base : Base
 
 function x332(n: Genric<Base>) { }; x332({ func: n => { return [d1, d2]; } });
->x332 : typeof x332
+>x332 : (n: Genric<Base>) => void
 >n : Genric<Base>
 >Genric : Genric<T>
 >Base : Base
 >x332({ func: n => { return [d1, d2]; } }) : void
->x332 : typeof x332
+>x332 : (n: Genric<Base>) => void
 >{ func: n => { return [d1, d2]; } } : { func: (n: Base[]) => {}[]; }
 >func : (n: Base[]) => {}[]
 >n => { return [d1, d2]; } : (n: Base[]) => {}[]
diff --git a/tests/baselines/reference/generativeRecursionWithTypeOf.types b/tests/baselines/reference/generativeRecursionWithTypeOf.types
index b26941d8793..1447c51358f 100644
--- a/tests/baselines/reference/generativeRecursionWithTypeOf.types
+++ b/tests/baselines/reference/generativeRecursionWithTypeOf.types
@@ -16,7 +16,7 @@ module M {
 >M : typeof M
 
     export function f(x: typeof C) {   
->f : typeof f
+>f : (x: typeof C) => C<typeof C>
 >x : typeof C
 >C : typeof C
 
diff --git a/tests/baselines/reference/genericArray0.types b/tests/baselines/reference/genericArray0.types
index 9118e312cd2..80a9d5199bd 100644
--- a/tests/baselines/reference/genericArray0.types
+++ b/tests/baselines/reference/genericArray0.types
@@ -10,7 +10,7 @@ var y = x;
 >x : number[]
 
 function map<U>() {
->map : typeof map
+>map : <U>() => void
 >U : U
 
     var ys: U[] = [];
diff --git a/tests/baselines/reference/genericArrayPropertyAssignment.types b/tests/baselines/reference/genericArrayPropertyAssignment.types
index a0eea6f20f1..ab3f47de813 100644
--- a/tests/baselines/reference/genericArrayPropertyAssignment.types
+++ b/tests/baselines/reference/genericArrayPropertyAssignment.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/genericArrayPropertyAssignment.ts ===
 function isEmpty(list: {length:number;})
->isEmpty : typeof isEmpty
+>isEmpty : (list: { length: number; }) => boolean
 >list : { length: number; }
 >length : number
 {
@@ -13,7 +13,7 @@ return list.length ===0;
  
 isEmpty([]); // error
 >isEmpty([]) : boolean
->isEmpty : typeof isEmpty
+>isEmpty : (list: { length: number; }) => boolean
 >[] : undefined[]
  
 
diff --git a/tests/baselines/reference/genericCallTypeArgumentInference.types b/tests/baselines/reference/genericCallTypeArgumentInference.types
index f53018bddb1..ced2daee38d 100644
--- a/tests/baselines/reference/genericCallTypeArgumentInference.types
+++ b/tests/baselines/reference/genericCallTypeArgumentInference.types
@@ -2,7 +2,7 @@
 // Basic type inference with generic calls, no errors expected
 
 function foo<T>(t: T) {
->foo : typeof foo
+>foo : <T>(t: T) => T
 >T : T
 >t : T
 >T : T
@@ -14,10 +14,10 @@ function foo<T>(t: T) {
 var r = foo(''); // string
 >r : string
 >foo('') : string
->foo : typeof foo
+>foo : <T>(t: T) => T
 
 function foo2<T, U>(t: T, u: U) {
->foo2 : typeof foo2
+>foo2 : <T, U>(t: T, u: U) => U
 >T : T
 >U : U
 >t : T
@@ -30,7 +30,7 @@ function foo2<T, U>(t: T, u: U) {
 }
 
 function foo2b<T, U>(u: U) {
->foo2b : typeof foo2b
+>foo2b : <T, U>(u: U) => T
 >T : T
 >U : U
 >u : U
@@ -47,12 +47,12 @@ function foo2b<T, U>(u: U) {
 var r2 = foo2('', 1); // number
 >r2 : number
 >foo2('', 1) : number
->foo2 : typeof foo2
+>foo2 : <T, U>(t: T, u: U) => U
 
 var r3 = foo2b(1); // {}
 >r3 : {}
 >foo2b(1) : {}
->foo2b : typeof foo2b
+>foo2b : <T, U>(u: U) => T
 
 class C<T, U> {
 >C : C<T, U>
diff --git a/tests/baselines/reference/genericCallWithArrayLiteralArgs.types b/tests/baselines/reference/genericCallWithArrayLiteralArgs.types
index 09da2dd2e41..c79efb0792c 100644
--- a/tests/baselines/reference/genericCallWithArrayLiteralArgs.types
+++ b/tests/baselines/reference/genericCallWithArrayLiteralArgs.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithArrayLiteralArgs.ts ===
 function foo<T>(t: T) {
->foo : typeof foo
+>foo : <T>(t: T) => T
 >T : T
 >t : T
 >T : T
@@ -12,49 +12,49 @@ function foo<T>(t: T) {
 var r = foo([1, 2]); // number[]
 >r : number[]
 >foo([1, 2]) : number[]
->foo : typeof foo
+>foo : <T>(t: T) => T
 >[1, 2] : number[]
 
 var r = foo<number[]>([1, 2]); // number[]
 >r : number[]
 >foo<number[]>([1, 2]) : number[]
->foo : typeof foo
+>foo : <T>(t: T) => T
 >[1, 2] : number[]
 
 var ra = foo<any[]>([1, 2]); // any[]
 >ra : any[]
 >foo<any[]>([1, 2]) : any[]
->foo : typeof foo
+>foo : <T>(t: T) => T
 >[1, 2] : any[]
 
 var r2 = foo([]); // any[]
 >r2 : any[]
 >foo([]) : any[]
->foo : typeof foo
+>foo : <T>(t: T) => T
 >[] : any[]
 
 var r3 = foo<number[]>([]); // number[]
 >r3 : number[]
 >foo<number[]>([]) : number[]
->foo : typeof foo
+>foo : <T>(t: T) => T
 >[] : number[]
 
 var r4 = foo([1, '']); // {}[]
 >r4 : {}[]
 >foo([1, '']) : {}[]
->foo : typeof foo
+>foo : <T>(t: T) => T
 >[1, ''] : {}[]
 
 var r5 = foo<any[]>([1, '']); // any[]
 >r5 : any[]
 >foo<any[]>([1, '']) : any[]
->foo : typeof foo
+>foo : <T>(t: T) => T
 >[1, ''] : any[]
 
 var r6 = foo<Object[]>([1, '']); // Object[]
 >r6 : Object[]
 >foo<Object[]>([1, '']) : Object[]
->foo : typeof foo
+>foo : <T>(t: T) => T
 >Object : Object
 >[1, ''] : Object[]
 
diff --git a/tests/baselines/reference/genericCallWithConstraintsTypeArgumentInference.types b/tests/baselines/reference/genericCallWithConstraintsTypeArgumentInference.types
index 31e4ad647c5..dcff9ef8a16 100644
--- a/tests/baselines/reference/genericCallWithConstraintsTypeArgumentInference.types
+++ b/tests/baselines/reference/genericCallWithConstraintsTypeArgumentInference.types
@@ -28,7 +28,7 @@ var d2: Derived2;
 >Derived2 : Derived2
 
 function foo<T extends Base>(t: T) {
->foo : typeof foo
+>foo : <T extends Base>(t: T) => T
 >T : T
 >Base : Base
 >t : T
@@ -41,17 +41,17 @@ function foo<T extends Base>(t: T) {
 var r = foo(b); // Base
 >r : Base
 >foo(b) : Base
->foo : typeof foo
+>foo : <T extends Base>(t: T) => T
 >b : Base
 
 var r2 = foo(d1); // Derived
 >r2 : Derived
 >foo(d1) : Derived
->foo : typeof foo
+>foo : <T extends Base>(t: T) => T
 >d1 : Derived
 
 function foo2<T extends Base, U extends Derived>(t: T, u: U) {
->foo2 : typeof foo2
+>foo2 : <T extends Base, U extends Derived>(t: T, u: U) => U
 >T : T
 >Base : Base
 >U : U
@@ -66,7 +66,7 @@ function foo2<T extends Base, U extends Derived>(t: T, u: U) {
 }
 
 function foo2b<T extends Base, U extends Derived>(u: U) {
->foo2b : typeof foo2b
+>foo2b : <T extends Base, U extends Derived>(u: U) => T
 >T : T
 >Base : Base
 >U : U
@@ -83,7 +83,7 @@ function foo2b<T extends Base, U extends Derived>(u: U) {
 }
 
 function foo2c<T extends Base, U extends Derived>() {
->foo2c : typeof foo2c
+>foo2c : <T extends Base, U extends Derived>() => T
 >T : T
 >Base : Base
 >U : U
@@ -100,13 +100,13 @@ function foo2c<T extends Base, U extends Derived>() {
 var r3 = foo2b(d1); // Base
 >r3 : Base
 >foo2b(d1) : Base
->foo2b : typeof foo2b
+>foo2b : <T extends Base, U extends Derived>(u: U) => T
 >d1 : Derived
 
 var r3b = foo2c(); // Base
 >r3b : Base
 >foo2c() : Base
->foo2c : typeof foo2c
+>foo2c : <T extends Base, U extends Derived>() => T
 
 class C<T extends Base, U extends Derived> {
 >C : C<T, U>
diff --git a/tests/baselines/reference/genericCallWithFixedArguments.types b/tests/baselines/reference/genericCallWithFixedArguments.types
index 3d40ceb3a06..acfad45a0f2 100644
--- a/tests/baselines/reference/genericCallWithFixedArguments.types
+++ b/tests/baselines/reference/genericCallWithFixedArguments.types
@@ -8,14 +8,14 @@ class B { bar() { }}
 >bar : () => void
 
 function g<T, U>(x) { }
->g : typeof g
+>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 : typeof g
+>g : <T, U>(x: any) => void
 >A : A
 >B : B
  
diff --git a/tests/baselines/reference/genericCallWithFunctionTypedArguments.types b/tests/baselines/reference/genericCallWithFunctionTypedArguments.types
index aec40c508df..2d3b234d0e1 100644
--- a/tests/baselines/reference/genericCallWithFunctionTypedArguments.types
+++ b/tests/baselines/reference/genericCallWithFunctionTypedArguments.types
@@ -3,7 +3,7 @@
 // Using function arguments, no errors expected
 
 function foo<T>(x: (a: T) => T) {
->foo : typeof foo
+>foo : <T>(x: (a: T) => T) => T
 >T : T
 >x : (a: T) => T
 >a : T
@@ -18,7 +18,7 @@ function foo<T>(x: (a: T) => T) {
 var r = foo(<U>(x: U) => ''); // {}
 >r : {}
 >foo(<U>(x: U) => '') : {}
->foo : typeof foo
+>foo : <T>(x: (a: T) => T) => T
 ><U>(x: U) => '' : <U>(x: U) => string
 >U : U
 >x : U
@@ -27,7 +27,7 @@ var r = foo(<U>(x: U) => ''); // {}
 var r2 = foo<string>(<U>(x: U) => ''); // string 
 >r2 : string
 >foo<string>(<U>(x: U) => '') : string
->foo : typeof foo
+>foo : <T>(x: (a: T) => T) => T
 ><U>(x: U) => '' : <U>(x: U) => string
 >U : U
 >x : U
@@ -36,12 +36,12 @@ var r2 = foo<string>(<U>(x: U) => ''); // string
 var r3 = foo(x => ''); // {}
 >r3 : {}
 >foo(x => '') : {}
->foo : typeof foo
+>foo : <T>(x: (a: T) => T) => T
 >x => '' : (x: {}) => string
 >x : {}
 
 function foo2<T, U>(x: T, cb: (a: T) => U) {
->foo2 : typeof foo2
+>foo2 : <T, U>(x: T, cb: (a: T) => U) => U
 >T : T
 >U : U
 >x : T
@@ -60,7 +60,7 @@ function foo2<T, U>(x: T, cb: (a: T) => U) {
 var r4 = foo2(1, function <Z>(a: Z) { return '' }); // string, contextual signature instantiation is applied to generic functions
 >r4 : string
 >foo2(1, function <Z>(a: Z) { return '' }) : string
->foo2 : typeof foo2
+>foo2 : <T, U>(x: T, cb: (a: T) => U) => U
 >function <Z>(a: Z) { return '' } : <Z>(a: Z) => string
 >Z : Z
 >a : Z
@@ -69,21 +69,21 @@ var r4 = foo2(1, function <Z>(a: Z) { return '' }); // string, contextual signat
 var r5 = foo2(1, (a) => ''); // string
 >r5 : string
 >foo2(1, (a) => '') : string
->foo2 : typeof foo2
+>foo2 : <T, U>(x: T, cb: (a: T) => U) => U
 >(a) => '' : (a: number) => string
 >a : number
 
 var r6 = foo2<string, number>('', <Z>(a: Z) => 1);
 >r6 : number
 >foo2<string, number>('', <Z>(a: Z) => 1) : number
->foo2 : typeof foo2
+>foo2 : <T, U>(x: T, cb: (a: T) => U) => U
 ><Z>(a: Z) => 1 : <Z>(a: Z) => number
 >Z : Z
 >a : Z
 >Z : Z
 
 function foo3<T, U>(x: T, cb: (a: T) => U, y: U) {
->foo3 : typeof foo3
+>foo3 : <T, U>(x: T, cb: (a: T) => U, y: U) => U
 >T : T
 >U : U
 >x : T
@@ -104,7 +104,7 @@ function foo3<T, U>(x: T, cb: (a: T) => U, y: U) {
 var r7 = foo3(1, <Z>(a: Z) => '', ''); // string
 >r7 : string
 >foo3(1, <Z>(a: Z) => '', '') : string
->foo3 : typeof foo3
+>foo3 : <T, U>(x: T, cb: (a: T) => U, y: U) => U
 ><Z>(a: Z) => '' : <Z>(a: Z) => string
 >Z : Z
 >a : Z
@@ -113,19 +113,19 @@ var r7 = foo3(1, <Z>(a: Z) => '', ''); // string
 var r8 = foo3(1, function (a) { return '' }, 1); // {}
 >r8 : {}
 >foo3(1, function (a) { return '' }, 1) : {}
->foo3 : typeof foo3
+>foo3 : <T, U>(x: T, cb: (a: T) => U, y: U) => U
 >function (a) { return '' } : (a: number) => string
 >a : number
 
 var r9 = foo3<number, string>(1, (a) => '', ''); // string
 >r9 : string
 >foo3<number, string>(1, (a) => '', '') : string
->foo3 : typeof foo3
+>foo3 : <T, U>(x: T, cb: (a: T) => U, y: U) => U
 >(a) => '' : (a: number) => string
 >a : number
 
 function other<T, U>(t: T, u: U) {
->other : typeof other
+>other : <T, U>(t: T, u: U) => void
 >T : T
 >U : U
 >t : T
@@ -136,7 +136,7 @@ function other<T, U>(t: T, u: U) {
     var r10 = foo2(1, (x: T) => ''); // string, non-generic signature allows inferences to be made
 >r10 : string
 >foo2(1, (x: T) => '') : string
->foo2 : typeof foo2
+>foo2 : <T, U>(x: T, cb: (a: T) => U) => U
 >(x: T) => '' : (x: T) => string
 >x : T
 >T : T
@@ -144,14 +144,14 @@ function other<T, U>(t: T, u: U) {
     var r10 = foo2(1, (x) => ''); // string
 >r10 : string
 >foo2(1, (x) => '') : string
->foo2 : typeof foo2
+>foo2 : <T, U>(x: T, cb: (a: T) => U) => U
 >(x) => '' : (x: number) => string
 >x : number
 
     var r11 = foo3(1, (x: T) => '', ''); // string
 >r11 : string
 >foo3(1, (x: T) => '', '') : string
->foo3 : typeof foo3
+>foo3 : <T, U>(x: T, cb: (a: T) => U, y: U) => U
 >(x: T) => '' : (x: T) => string
 >x : T
 >T : T
@@ -159,7 +159,7 @@ function other<T, U>(t: T, u: U) {
     var r11b = foo3(1, (x: T) => '', 1); // {}
 >r11b : {}
 >foo3(1, (x: T) => '', 1) : {}
->foo3 : typeof foo3
+>foo3 : <T, U>(x: T, cb: (a: T) => U, y: U) => U
 >(x: T) => '' : (x: T) => string
 >x : T
 >T : T
@@ -167,7 +167,7 @@ function other<T, U>(t: T, u: U) {
     var r12 = foo3(1, function (a) { return '' }, 1); // {}
 >r12 : {}
 >foo3(1, function (a) { return '' }, 1) : {}
->foo3 : typeof foo3
+>foo3 : <T, U>(x: T, cb: (a: T) => U, y: U) => U
 >function (a) { return '' } : (a: number) => string
 >a : number
 }
diff --git a/tests/baselines/reference/genericCallWithFunctionTypedArguments2.types b/tests/baselines/reference/genericCallWithFunctionTypedArguments2.types
index 09f86b64463..89d7afd94e2 100644
--- a/tests/baselines/reference/genericCallWithFunctionTypedArguments2.types
+++ b/tests/baselines/reference/genericCallWithFunctionTypedArguments2.types
@@ -3,7 +3,7 @@
 // Using construct signature arguments, no errors expected
 
 function foo<T>(x: new(a: T) => T) {
->foo : typeof foo
+>foo : <T>(x: new (a: T) => T) => T
 >T : T
 >x : new (a: T) => T
 >a : T
@@ -54,29 +54,29 @@ var a: {
 var r = foo(i); // any
 >r : any
 >foo(i) : any
->foo : typeof foo
+>foo : <T>(x: new (a: T) => T) => T
 >i : I
 
 var r2 = foo<string>(i); // string 
 >r2 : string
 >foo<string>(i) : string
->foo : typeof foo
+>foo : <T>(x: new (a: T) => T) => T
 >i : I
 
 var r3 = foo(i2); // string
 >r3 : string
 >foo(i2) : string
->foo : typeof foo
+>foo : <T>(x: new (a: T) => T) => T
 >i2 : I2<string>
 
 var r3b = foo(a); // any
 >r3b : any
 >foo(a) : any
->foo : typeof foo
+>foo : <T>(x: new (a: T) => T) => T
 >a : new <T>(x: T) => T
 
 function foo2<T, U>(x: T, cb: new(a: T) => U) {
->foo2 : typeof foo2
+>foo2 : <T, U>(x: T, cb: new (a: T) => U) => U
 >T : T
 >U : U
 >x : T
@@ -95,29 +95,29 @@ function foo2<T, U>(x: T, cb: new(a: T) => U) {
 var r4 = foo2(1, i2); // string, instantiated generic
 >r4 : string
 >foo2(1, i2) : string
->foo2 : typeof foo2
+>foo2 : <T, U>(x: T, cb: new (a: T) => U) => U
 >i2 : I2<string>
 
 var r4b = foo2(1, a); // any
 >r4b : any
 >foo2(1, a) : any
->foo2 : typeof foo2
+>foo2 : <T, U>(x: T, cb: new (a: T) => U) => U
 >a : new <T>(x: T) => T
 
 var r5 = foo2(1, i); // any
 >r5 : any
 >foo2(1, i) : any
->foo2 : typeof foo2
+>foo2 : <T, U>(x: T, cb: new (a: T) => U) => U
 >i : I
 
 var r6 = foo2<string, string>('', i2); // string
 >r6 : string
 >foo2<string, string>('', i2) : string
->foo2 : typeof foo2
+>foo2 : <T, U>(x: T, cb: new (a: T) => U) => U
 >i2 : I2<string>
 
 function foo3<T, U>(x: T, cb: new(a: T) => U, y: U) {
->foo3 : typeof foo3
+>foo3 : <T, U>(x: T, cb: new (a: T) => U, y: U) => U
 >T : T
 >U : U
 >x : T
@@ -138,24 +138,24 @@ function foo3<T, U>(x: T, cb: new(a: T) => U, y: U) {
 var r7 = foo3(null, i, ''); // any
 >r7 : any
 >foo3(null, i, '') : any
->foo3 : typeof foo3
+>foo3 : <T, U>(x: T, cb: new (a: T) => U, y: U) => U
 >i : I
 
 var r7b = foo3(null, a, ''); // any
 >r7b : any
 >foo3(null, a, '') : any
->foo3 : typeof foo3
+>foo3 : <T, U>(x: T, cb: new (a: T) => U, y: U) => U
 >a : new <T>(x: T) => T
 
 var r8 = foo3(1, i2, 1); // {}
 >r8 : {}
 >foo3(1, i2, 1) : {}
->foo3 : typeof foo3
+>foo3 : <T, U>(x: T, cb: new (a: T) => U, y: U) => U
 >i2 : I2<string>
 
 var r9 = foo3<string, string>('', i2, ''); // string
 >r9 : string
 >foo3<string, string>('', i2, '') : string
->foo3 : typeof foo3
+>foo3 : <T, U>(x: T, cb: new (a: T) => U, y: U) => U
 >i2 : I2<string>
 
diff --git a/tests/baselines/reference/genericCallWithFunctionTypedArguments3.types b/tests/baselines/reference/genericCallWithFunctionTypedArguments3.types
index 988dcaa9c15..a6e491d3eb8 100644
--- a/tests/baselines/reference/genericCallWithFunctionTypedArguments3.types
+++ b/tests/baselines/reference/genericCallWithFunctionTypedArguments3.types
@@ -12,7 +12,7 @@ var a: {
 }
 
 function foo4<T, U>(cb: (x: T) => U) {
->foo4 : typeof foo4
+>foo4 : <T, U>(cb: (x: T) => U) => U
 >T : T
 >U : U
 >cb : (x: T) => U
@@ -31,7 +31,7 @@ function foo4<T, U>(cb: (x: T) => U) {
 var r = foo4(a); // T is {} (candidates boolean and string), U is any (candidates any and boolean)
 >r : any
 >foo4(a) : any
->foo4 : typeof foo4
+>foo4 : <T, U>(cb: (x: T) => U) => U
 >a : { (x: boolean): boolean; (x: string): any; }
 
 var b: {
@@ -51,6 +51,6 @@ var b: {
 var r2 = foo4(b); // T is {} (candidates boolean and {}), U is any (candidates any and {})
 >r2 : any
 >foo4(b) : any
->foo4 : typeof foo4
+>foo4 : <T, U>(cb: (x: T) => U) => U
 >b : { <T>(x: boolean): T; <T>(x: T): any; }
 
diff --git a/tests/baselines/reference/genericCallWithFunctionTypedArguments4.types b/tests/baselines/reference/genericCallWithFunctionTypedArguments4.types
index 7e2100be048..bf4e1eb749c 100644
--- a/tests/baselines/reference/genericCallWithFunctionTypedArguments4.types
+++ b/tests/baselines/reference/genericCallWithFunctionTypedArguments4.types
@@ -22,7 +22,7 @@ var a: {
 }
 
 function foo4<T, U>(cb: new(x: T) => U) {
->foo4 : typeof foo4
+>foo4 : <T, U>(cb: new (x: T) => U) => U
 >T : T
 >U : U
 >cb : new (x: T) => U
@@ -41,7 +41,7 @@ function foo4<T, U>(cb: new(x: T) => U) {
 var r = foo4(a); // T is {} (candidates boolean and string), U is {} (candidates C and D)
 >r : D
 >foo4(a) : D
->foo4 : typeof foo4
+>foo4 : <T, U>(cb: new (x: T) => U) => U
 >a : { new (x: boolean): C; new (x: string): D; }
 
 var b: {
@@ -61,6 +61,6 @@ var b: {
 var r2 = foo4(b); // T is {} (candidates boolean and {}), U is any (candidates any and {})
 >r2 : any
 >foo4(b) : any
->foo4 : typeof foo4
+>foo4 : <T, U>(cb: new (x: T) => U) => U
 >b : { new <T>(x: boolean): T; new <T>(x: T): any; }
 
diff --git a/tests/baselines/reference/genericCallWithGenericSignatureArguments.types b/tests/baselines/reference/genericCallWithGenericSignatureArguments.types
index 768bca10bdd..9f634070b56 100644
--- a/tests/baselines/reference/genericCallWithGenericSignatureArguments.types
+++ b/tests/baselines/reference/genericCallWithGenericSignatureArguments.types
@@ -3,7 +3,7 @@
 // the corresponding inferred type arguments to become fixed and no further candidate inferences are made for them.
 
 function foo<T>(a: (x: T) => T, b: (x: T) => T) {
->foo : typeof foo
+>foo : <T>(a: (x: T) => T, b: (x: T) => T) => (x: T) => T
 >T : T
 >a : (x: T) => T
 >x : T
@@ -28,7 +28,7 @@ function foo<T>(a: (x: T) => T, b: (x: T) => T) {
 var r1b = foo((x) => 1, (x) => ''); // {} => {}
 >r1b : (x: {}) => {}
 >foo((x) => 1, (x) => '') : (x: {}) => {}
->foo : typeof foo
+>foo : <T>(a: (x: T) => T, b: (x: T) => T) => (x: T) => T
 >(x) => 1 : (x: {}) => number
 >x : {}
 >(x) => '' : (x: {}) => string
@@ -37,7 +37,7 @@ var r1b = foo((x) => 1, (x) => ''); // {} => {}
 var r2 = foo((x: Object) => null, (x: string) => ''); // Object => Object
 >r2 : (x: any) => any
 >foo((x: Object) => null, (x: string) => '') : (x: any) => any
->foo : typeof foo
+>foo : <T>(a: (x: T) => T, b: (x: T) => T) => (x: T) => T
 >(x: Object) => null : (x: Object) => any
 >x : Object
 >Object : Object
@@ -47,7 +47,7 @@ var r2 = foo((x: Object) => null, (x: string) => ''); // Object => Object
 var r3 = foo((x: number) => 1, (x: Object) => null); // number => number
 >r3 : (x: any) => any
 >foo((x: number) => 1, (x: Object) => null) : (x: any) => any
->foo : typeof foo
+>foo : <T>(a: (x: T) => T, b: (x: T) => T) => (x: T) => T
 >(x: number) => 1 : (x: number) => number
 >x : number
 >(x: Object) => null : (x: Object) => any
@@ -57,7 +57,7 @@ var r3 = foo((x: number) => 1, (x: Object) => null); // number => number
 var r3ii = foo((x: number) => 1, (x: number) => 1); // number => number
 >r3ii : (x: number) => number
 >foo((x: number) => 1, (x: number) => 1) : (x: number) => number
->foo : typeof foo
+>foo : <T>(a: (x: T) => T, b: (x: T) => T) => (x: T) => T
 >(x: number) => 1 : (x: number) => number
 >x : number
 >(x: number) => 1 : (x: number) => number
@@ -76,7 +76,7 @@ var b: { x: number; z?: number; };
 var r4 = foo((x: typeof a) => a, (x: typeof b) => b); // typeof a => typeof a
 >r4 : (x: { x: number; y?: number; }) => { x: number; y?: number; }
 >foo((x: typeof a) => a, (x: typeof b) => b) : (x: { x: number; y?: number; }) => { x: number; y?: number; }
->foo : typeof foo
+>foo : <T>(a: (x: T) => T, b: (x: T) => T) => (x: T) => T
 >(x: typeof a) => a : (x: { x: number; y?: number; }) => { x: number; y?: number; }
 >x : { x: number; y?: number; }
 >a : { x: number; y?: number; }
@@ -89,7 +89,7 @@ var r4 = foo((x: typeof a) => a, (x: typeof b) => b); // typeof a => typeof a
 var r5 = foo((x: typeof b) => b, (x: typeof a) => a); // typeof b => typeof b
 >r5 : (x: { x: number; z?: number; }) => { x: number; z?: number; }
 >foo((x: typeof b) => b, (x: typeof a) => a) : (x: { x: number; z?: number; }) => { x: number; z?: number; }
->foo : typeof foo
+>foo : <T>(a: (x: T) => T, b: (x: T) => T) => (x: T) => T
 >(x: typeof b) => b : (x: { x: number; z?: number; }) => { x: number; z?: number; }
 >x : { x: number; z?: number; }
 >b : { x: number; z?: number; }
@@ -100,7 +100,7 @@ var r5 = foo((x: typeof b) => b, (x: typeof a) => a); // typeof b => typeof b
 >a : { x: number; y?: number; }
 
 function other<T>(x: T) {
->other : typeof other
+>other : <T>(x: T) => void
 >T : T
 >x : T
 >T : T
@@ -108,7 +108,7 @@ function other<T>(x: T) {
     var r6 = foo((a: T) => a, (b: T) => b); // T => T
 >r6 : (x: T) => T
 >foo((a: T) => a, (b: T) => b) : (x: T) => T
->foo : typeof foo
+>foo : <T>(a: (x: T) => T, b: (x: T) => T) => (x: T) => T
 >(a: T) => a : (a: T) => T
 >a : T
 >T : T
@@ -121,7 +121,7 @@ function other<T>(x: T) {
     var r6b = foo((a) => a, (b) => b); // {} => {}
 >r6b : (x: {}) => {}
 >foo((a) => a, (b) => b) : (x: {}) => {}
->foo : typeof foo
+>foo : <T>(a: (x: T) => T, b: (x: T) => T) => (x: T) => T
 >(a) => a : (a: {}) => {}
 >a : {}
 >a : {}
@@ -131,7 +131,7 @@ function other<T>(x: T) {
 }
 
 function other2<T extends Date>(x: T) {
->other2 : typeof other2
+>other2 : <T extends Date>(x: T) => void
 >T : T
 >Date : Date
 >x : T
@@ -140,7 +140,7 @@ function other2<T extends Date>(x: T) {
     var r7 = foo((a: T) => a, (b: T) => b); // T => T
 >r7 : (x: T) => T
 >foo((a: T) => a, (b: T) => b) : (x: T) => T
->foo : typeof foo
+>foo : <T>(a: (x: T) => T, b: (x: T) => T) => (x: T) => T
 >(a: T) => a : (a: T) => T
 >a : T
 >T : T
@@ -153,7 +153,7 @@ function other2<T extends Date>(x: T) {
     var r7b = foo((a) => a, (b) => b); // {} => {}
 >r7b : (x: {}) => {}
 >foo((a) => a, (b) => b) : (x: {}) => {}
->foo : typeof foo
+>foo : <T>(a: (x: T) => T, b: (x: T) => T) => (x: T) => T
 >(a) => a : (a: {}) => {}
 >a : {}
 >a : {}
@@ -172,7 +172,7 @@ function other2<T extends Date>(x: T) {
 
 
 function foo2<T extends Date>(a: (x: T) => T, b: (x: T) => T) {
->foo2 : typeof foo2
+>foo2 : <T extends Date>(a: (x: T) => T, b: (x: T) => T) => (x: T) => T
 >T : T
 >Date : Date
 >a : (x: T) => T
@@ -195,7 +195,7 @@ function foo2<T extends Date>(a: (x: T) => T, b: (x: T) => T) {
 }
 
 function other3<T extends RegExp>(x: T) {
->other3 : typeof other3
+>other3 : <T extends RegExp>(x: T) => void
 >T : T
 >RegExp : RegExp
 >x : T
@@ -204,7 +204,7 @@ function other3<T extends RegExp>(x: T) {
     var r8 = foo2((a: Date) => a, (b: Date) => b); // Date => Date
 >r8 : (x: Date) => Date
 >foo2((a: Date) => a, (b: Date) => b) : (x: Date) => Date
->foo2 : typeof foo2
+>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
diff --git a/tests/baselines/reference/genericCallWithGenericSignatureArguments3.types b/tests/baselines/reference/genericCallWithGenericSignatureArguments3.types
index fc512f8eeb4..2c0d21a5a07 100644
--- a/tests/baselines/reference/genericCallWithGenericSignatureArguments3.types
+++ b/tests/baselines/reference/genericCallWithGenericSignatureArguments3.types
@@ -3,7 +3,7 @@
 // the corresponding inferred type arguments to become fixed and no further candidate inferences are made for them.
 
 function foo<T>(x: T, a: (x: T) => T, b: (x: T) => T) {
->foo : typeof foo
+>foo : <T>(x: T, a: (x: T) => T, b: (x: T) => T) => (x: T) => T
 >T : T
 >x : T
 >T : T
@@ -29,7 +29,7 @@ function foo<T>(x: T, a: (x: T) => T, b: (x: T) => T) {
 var r1 = foo('', (x: string) => '', (x: Object) => null); // any => any
 >r1 : (x: any) => any
 >foo('', (x: string) => '', (x: Object) => null) : (x: any) => any
->foo : typeof foo
+>foo : <T>(x: T, a: (x: T) => T, b: (x: T) => T) => (x: T) => T
 >(x: string) => '' : (x: string) => string
 >x : string
 >(x: Object) => null : (x: Object) => any
@@ -39,7 +39,7 @@ var r1 = foo('', (x: string) => '', (x: Object) => null); // any => any
 var r1ii = foo('', (x) => '', (x) => null); // string => string
 >r1ii : (x: string) => string
 >foo('', (x) => '', (x) => null) : (x: string) => string
->foo : typeof foo
+>foo : <T>(x: T, a: (x: T) => T, b: (x: T) => T) => (x: T) => T
 >(x) => '' : (x: string) => string
 >x : string
 >(x) => null : (x: string) => any
@@ -48,7 +48,7 @@ var r1ii = foo('', (x) => '', (x) => null); // string => string
 var r2 = foo('', (x: string) => '', (x: Object) => ''); // string => string
 >r2 : (x: Object) => Object
 >foo('', (x: string) => '', (x: Object) => '') : (x: Object) => Object
->foo : typeof foo
+>foo : <T>(x: T, a: (x: T) => T, b: (x: T) => T) => (x: T) => T
 >(x: string) => '' : (x: string) => string
 >x : string
 >(x: Object) => '' : (x: Object) => string
@@ -58,7 +58,7 @@ var r2 = foo('', (x: string) => '', (x: Object) => ''); // string => string
 var r3 = foo(null, (x: Object) => '', (x: string) => ''); // Object => Object
 >r3 : (x: Object) => Object
 >foo(null, (x: Object) => '', (x: string) => '') : (x: Object) => Object
->foo : typeof foo
+>foo : <T>(x: T, a: (x: T) => T, b: (x: T) => T) => (x: T) => T
 >(x: Object) => '' : (x: Object) => string
 >x : Object
 >Object : Object
@@ -68,7 +68,7 @@ var r3 = foo(null, (x: Object) => '', (x: string) => ''); // Object => Object
 var r4 = foo(null, (x) => '', (x) => ''); // any => any
 >r4 : (x: any) => any
 >foo(null, (x) => '', (x) => '') : (x: any) => any
->foo : typeof foo
+>foo : <T>(x: T, a: (x: T) => T, b: (x: T) => T) => (x: T) => T
 >(x) => '' : (x: any) => string
 >x : any
 >(x) => '' : (x: any) => string
@@ -77,7 +77,7 @@ var r4 = foo(null, (x) => '', (x) => ''); // any => any
 var r5 = foo(new Object(), (x) => '', (x) => ''); // Object => Object
 >r5 : (x: Object) => Object
 >foo(new Object(), (x) => '', (x) => '') : (x: Object) => Object
->foo : typeof foo
+>foo : <T>(x: T, a: (x: T) => T, b: (x: T) => T) => (x: T) => T
 >new Object() : Object
 >Object : { (): any; (value: any): any; new (value?: any): Object; prototype: Object; getPrototypeOf(o: any): any; getOwnPropertyDescriptor(o: any, p: string): PropertyDescriptor; getOwnPropertyNames(o: any): string[]; create(o: any, properties?: PropertyDescriptorMap): any; defineProperty(o: any, p: string, attributes: PropertyDescriptor): any; defineProperties(o: any, properties: PropertyDescriptorMap): any; seal(o: any): any; freeze(o: any): any; preventExtensions(o: any): any; isSealed(o: any): boolean; isFrozen(o: any): boolean; isExtensible(o: any): boolean; keys(o: any): string[]; }
 >(x) => '' : (x: Object) => string
@@ -96,7 +96,7 @@ enum F { A }
 var r6 = foo(E.A, (x: number) => E.A, (x: F) => F.A); // number => number 
 >r6 : (x: number) => number
 >foo(E.A, (x: number) => E.A, (x: F) => F.A) : (x: number) => number
->foo : typeof foo
+>foo : <T>(x: T, a: (x: T) => T, b: (x: T) => T) => (x: T) => T
 >E.A : E
 >E : typeof E
 >A : E
@@ -114,7 +114,7 @@ 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 : typeof foo2
+>foo2 : <T, U>(x: T, a: (x: T) => U, b: (x: T) => U) => (x: T) => U
 >T : T
 >U : U
 >x : T
@@ -141,7 +141,7 @@ function foo2<T, U>(x: T, a: (x: T) => U, b: (x: T) => U) {
 var r8 = foo2('', (x) => '', (x) => null); // string => string
 >r8 : (x: string) => any
 >foo2('', (x) => '', (x) => null) : (x: string) => any
->foo2 : typeof foo2
+>foo2 : <T, U>(x: T, a: (x: T) => U, b: (x: T) => U) => (x: T) => U
 >(x) => '' : (x: string) => string
 >x : string
 >(x) => null : (x: string) => any
@@ -150,7 +150,7 @@ var r8 = foo2('', (x) => '', (x) => null); // string => string
 var r9 = foo2(null, (x) => '', (x) => ''); // any => any
 >r9 : (x: any) => string
 >foo2(null, (x) => '', (x) => '') : (x: any) => string
->foo2 : typeof foo2
+>foo2 : <T, U>(x: T, a: (x: T) => U, b: (x: T) => U) => (x: T) => U
 >(x) => '' : (x: any) => string
 >x : any
 >(x) => '' : (x: any) => string
@@ -159,7 +159,7 @@ var r9 = foo2(null, (x) => '', (x) => ''); // any => any
 var r10 = foo2(null, (x: Object) => '', (x: string) => ''); // Object => Object
 >r10 : (x: Object) => string
 >foo2(null, (x: Object) => '', (x: string) => '') : (x: Object) => string
->foo2 : typeof foo2
+>foo2 : <T, U>(x: T, a: (x: T) => U, b: (x: T) => U) => (x: T) => U
 >(x: Object) => '' : (x: Object) => string
 >x : Object
 >Object : Object
@@ -173,7 +173,7 @@ var x: (a: string) => boolean;
 var r11 = foo2(x, (a1: (y: string) => string) => (n: Object) => 1, (a2: (z: string) => string) => 2); // {} => {}
 >r11 : (x: {}) => {}
 >foo2(x, (a1: (y: string) => string) => (n: Object) => 1, (a2: (z: string) => string) => 2) : (x: {}) => {}
->foo2 : typeof foo2
+>foo2 : <T, U>(x: T, a: (x: T) => U, b: (x: T) => U) => (x: T) => U
 >x : (a: string) => boolean
 >(a1: (y: string) => string) => (n: Object) => 1 : (a1: (y: string) => string) => (n: Object) => number
 >a1 : (y: string) => string
@@ -188,7 +188,7 @@ var r11 = foo2(x, (a1: (y: string) => string) => (n: Object) => 1, (a2: (z: stri
 var r12 = foo2(x, (a1: (y: string) => boolean) => (n: Object) => 1, (a2: (z: string) => boolean) => 2); // (string => boolean) => {}
 >r12 : (x: (a: string) => boolean) => {}
 >foo2(x, (a1: (y: string) => boolean) => (n: Object) => 1, (a2: (z: string) => boolean) => 2) : (x: (a: string) => boolean) => {}
->foo2 : typeof foo2
+>foo2 : <T, U>(x: T, a: (x: T) => U, b: (x: T) => U) => (x: T) => U
 >x : (a: string) => boolean
 >(a1: (y: string) => boolean) => (n: Object) => 1 : (a1: (y: string) => boolean) => (n: Object) => number
 >a1 : (y: string) => boolean
diff --git a/tests/baselines/reference/genericCallWithNonGenericArgs1.types b/tests/baselines/reference/genericCallWithNonGenericArgs1.types
index 8b885d4f677..f08f8503075 100644
--- a/tests/baselines/reference/genericCallWithNonGenericArgs1.types
+++ b/tests/baselines/reference/genericCallWithNonGenericArgs1.types
@@ -1,10 +1,10 @@
 === tests/cases/compiler/genericCallWithNonGenericArgs1.ts ===
 function f<T>(x: any) { }
->f : typeof f
+>f : <T>(x: any) => void
 >T : T
 >x : any
 
 f<any>(null)
 >f<any>(null) : void
->f : typeof f
+>f : <T>(x: any) => void
 
diff --git a/tests/baselines/reference/genericCallWithNonSymmetricSubtypes.types b/tests/baselines/reference/genericCallWithNonSymmetricSubtypes.types
index dd08de2ab05..e37a010baed 100644
--- a/tests/baselines/reference/genericCallWithNonSymmetricSubtypes.types
+++ b/tests/baselines/reference/genericCallWithNonSymmetricSubtypes.types
@@ -3,7 +3,7 @@
 // we choose the first candidate so the result is dependent on the order of the arguments provided
 
 function foo<T>(x: T, y: T) {
->foo : typeof foo
+>foo : <T>(x: T, y: T) => T
 >T : T
 >x : T
 >T : T
@@ -31,14 +31,14 @@ var b: { x: number; z?: number; };
 var r = foo(a, b); // { x: number; y?: number; };
 >r : { x: number; y?: number; }
 >foo(a, b) : { x: number; y?: number; }
->foo : typeof foo
+>foo : <T>(x: T, y: T) => T
 >a : { x: number; y?: number; }
 >b : { x: number; z?: number; }
 
 var r2 = foo(b, a); // { x: number; z?: number; };
 >r2 : { x: number; z?: number; }
 >foo(b, a) : { x: number; z?: number; }
->foo : typeof foo
+>foo : <T>(x: T, y: T) => T
 >b : { x: number; z?: number; }
 >a : { x: number; y?: number; }
 
@@ -53,42 +53,42 @@ var y: { x?: number; };
 var r3 = foo(a, x); // { x: number; y?: number; };
 >r3 : { x: number; y?: number; }
 >foo(a, x) : { x: number; y?: number; }
->foo : typeof foo
+>foo : <T>(x: T, y: T) => T
 >a : { x: number; y?: number; }
 >x : { x: number; }
 
 var r4 = foo(x, a); // { x: number; };
 >r4 : { x: number; }
 >foo(x, a) : { x: number; }
->foo : typeof foo
+>foo : <T>(x: T, y: T) => T
 >x : { x: number; }
 >a : { x: number; y?: number; }
 
 var r5 = foo(a, y); // { x?: number; };
 >r5 : { x?: number; }
 >foo(a, y) : { x?: number; }
->foo : typeof foo
+>foo : <T>(x: T, y: T) => T
 >a : { x: number; y?: number; }
 >y : { x?: number; }
 
 var r5 = foo(y, a); // { x?: number; };
 >r5 : { x?: number; }
 >foo(y, a) : { x?: number; }
->foo : typeof foo
+>foo : <T>(x: T, y: T) => T
 >y : { x?: number; }
 >a : { x: number; y?: number; }
 
 var r6 = foo(x, y); // { x?: number; };
 >r6 : { x?: number; }
 >foo(x, y) : { x?: number; }
->foo : typeof foo
+>foo : <T>(x: T, y: T) => T
 >x : { x: number; }
 >y : { x?: number; }
 
 var r6 = foo(y, x); // { x?: number; };
 >r6 : { x?: number; }
 >foo(y, x) : { x?: number; }
->foo : typeof foo
+>foo : <T>(x: T, y: T) => T
 >y : { x?: number; }
 >x : { x: number; }
 
@@ -104,14 +104,14 @@ var s2: (x: string) => string;
 var r7 = foo(s1, s2); // (x: Object) => string;
 >r7 : (x: Object) => string
 >foo(s1, s2) : (x: Object) => string
->foo : typeof foo
+>foo : <T>(x: T, y: T) => T
 >s1 : (x: Object) => string
 >s2 : (x: string) => string
 
 var r8 = foo(s2, s1); // (x: string) => string;
 >r8 : (x: string) => string
 >foo(s2, s1) : (x: string) => string
->foo : typeof foo
+>foo : <T>(x: T, y: T) => T
 >s2 : (x: string) => string
 >s1 : (x: Object) => string
 
diff --git a/tests/baselines/reference/genericCallWithObjectLiteralArgs.types b/tests/baselines/reference/genericCallWithObjectLiteralArgs.types
index 16919db4496..d23445ecbca 100644
--- a/tests/baselines/reference/genericCallWithObjectLiteralArgs.types
+++ b/tests/baselines/reference/genericCallWithObjectLiteralArgs.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/types/typeRelationships/typeInference/genericCallWithObjectLiteralArgs.ts ===
 function foo<T>(x: { bar: T; baz: T }) {
->foo : typeof foo
+>foo : <T>(x: { bar: T; baz: T; }) => { bar: T; baz: T; }
 >T : T
 >x : { bar: T; baz: T; }
 >bar : T
@@ -15,7 +15,7 @@ function foo<T>(x: { bar: T; baz: T }) {
 var r = foo({ bar: 1, baz: '' }); // T = {}
 >r : { bar: {}; baz: {}; }
 >foo({ bar: 1, baz: '' }) : { bar: {}; baz: {}; }
->foo : typeof foo
+>foo : <T>(x: { bar: T; baz: T; }) => { bar: T; baz: T; }
 >{ bar: 1, baz: '' } : { bar: number; baz: string; }
 >bar : number
 >baz : string
@@ -23,25 +23,25 @@ var r = foo({ bar: 1, baz: '' }); // T = {}
 var r2 = foo({ bar: 1, baz: 1 }); // T = number
 >r2 : { bar: number; baz: number; }
 >foo({ bar: 1, baz: 1 }) : { bar: number; baz: number; }
->foo : typeof foo
+>foo : <T>(x: { bar: T; baz: T; }) => { bar: T; baz: T; }
 >{ bar: 1, baz: 1 } : { bar: number; baz: number; }
 >bar : number
 >baz : number
 
 var r3 = foo({ bar: foo, baz: foo }); // T = typeof foo
->r3 : { bar: typeof foo; baz: typeof foo; }
->foo({ bar: foo, baz: foo }) : { bar: typeof foo; baz: typeof foo; }
->foo : typeof foo
->{ bar: foo, baz: foo } : { bar: typeof foo; baz: typeof foo; }
->bar : typeof foo
->foo : typeof foo
->baz : typeof foo
->foo : typeof foo
+>r3 : { bar: <T>(x: { bar: T; baz: T; }) => { bar: T; baz: T; }; baz: <T>(x: { bar: T; baz: T; }) => { bar: T; baz: T; }; }
+>foo({ bar: foo, baz: foo }) : { bar: <T>(x: { bar: T; baz: T; }) => { bar: T; baz: T; }; baz: <T>(x: { bar: T; baz: T; }) => { bar: T; baz: T; }; }
+>foo : <T>(x: { bar: T; baz: T; }) => { bar: T; baz: T; }
+>{ bar: foo, baz: foo } : { bar: <T>(x: { bar: T; baz: T; }) => { bar: T; baz: T; }; baz: <T>(x: { bar: T; baz: T; }) => { bar: T; baz: T; }; }
+>bar : <T>(x: { bar: T; baz: T; }) => { bar: T; baz: T; }
+>foo : <T>(x: { bar: T; baz: T; }) => { bar: T; baz: T; }
+>baz : <T>(x: { bar: T; baz: T; }) => { bar: T; baz: T; }
+>foo : <T>(x: { bar: T; baz: T; }) => { bar: T; baz: T; }
 
 var r4 = foo<Object>({ bar: 1, baz: '' }); // T = Object
 >r4 : { bar: Object; baz: Object; }
 >foo<Object>({ bar: 1, baz: '' }) : { bar: Object; baz: Object; }
->foo : typeof foo
+>foo : <T>(x: { bar: T; baz: T; }) => { bar: T; baz: T; }
 >Object : Object
 >{ bar: 1, baz: '' } : { bar: number; baz: string; }
 >bar : number
diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgs.types b/tests/baselines/reference/genericCallWithObjectTypeArgs.types
index c2bb114c455..ddbd7d83054 100644
--- a/tests/baselines/reference/genericCallWithObjectTypeArgs.types
+++ b/tests/baselines/reference/genericCallWithObjectTypeArgs.types
@@ -23,7 +23,7 @@ class X<T> {
 }
 
 function foo<T>(t: X<T>, t2: X<T>) {
->foo : typeof foo
+>foo : <T>(t: X<T>, t2: X<T>) => T
 >T : T
 >t : X<T>
 >X : X<T>
@@ -55,14 +55,14 @@ var d1 = new X<D>();
 var r = foo(c1, d1); // error
 >r : {}
 >foo(c1, d1) : {}
->foo : typeof foo
+>foo : <T>(t: X<T>, t2: X<T>) => T
 >c1 : X<C>
 >d1 : X<D>
 
 var r2 = foo(c1, c1); // ok
 >r2 : C
 >foo(c1, c1) : C
->foo : typeof foo
+>foo : <T>(t: X<T>, t2: X<T>) => T
 >c1 : X<C>
 >c1 : X<C>
 
diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgs2.types b/tests/baselines/reference/genericCallWithObjectTypeArgs2.types
index 35d38e3f065..0065811fdc1 100644
--- a/tests/baselines/reference/genericCallWithObjectTypeArgs2.types
+++ b/tests/baselines/reference/genericCallWithObjectTypeArgs2.types
@@ -22,7 +22,7 @@ class Derived2 extends Base {
 
 // returns {}[]
 function f<T extends Base, U extends Base>(a: { x: T; y: U }) {
->f : typeof f
+>f : <T extends Base, U extends Base>(a: { x: T; y: U; }) => {}[]
 >T : T
 >Base : Base
 >U : U
@@ -46,7 +46,7 @@ function f<T extends Base, U extends Base>(a: { x: T; y: U }) {
 var r = f({ x: new Derived(), y: new Derived2() }); // {}[]
 >r : {}[]
 >f({ x: new Derived(), y: new Derived2() }) : {}[]
->f : typeof f
+>f : <T extends Base, U extends Base>(a: { x: T; y: U; }) => {}[]
 >{ x: new Derived(), y: new Derived2() } : { x: Derived; y: Derived2; }
 >x : Derived
 >new Derived() : Derived
@@ -58,7 +58,7 @@ var r = f({ x: new Derived(), y: new Derived2() }); // {}[]
 var r2 = f({ x: new Base(), y: new Derived2() }); // {}[]
 >r2 : {}[]
 >f({ x: new Base(), y: new Derived2() }) : {}[]
->f : typeof f
+>f : <T extends Base, U extends Base>(a: { x: T; y: U; }) => {}[]
 >{ x: new Base(), y: new Derived2() } : { x: Base; y: Derived2; }
 >x : Base
 >new Base() : Base
@@ -69,7 +69,7 @@ var r2 = f({ x: new Base(), y: new Derived2() }); // {}[]
 
 
 function f2<T extends Base, U extends Base>(a: { x: T; y: U }) {
->f2 : typeof f2
+>f2 : <T extends Base, U extends Base>(a: { x: T; y: U; }) => (x: T) => U
 >T : T
 >Base : Base
 >U : U
@@ -92,7 +92,7 @@ function f2<T extends Base, U extends Base>(a: { x: T; y: U }) {
 var r3 = f2({ x: new Derived(), y: new Derived2() }); // Derived => Derived2
 >r3 : (x: Derived) => Derived2
 >f2({ x: new Derived(), y: new Derived2() }) : (x: Derived) => Derived2
->f2 : typeof f2
+>f2 : <T extends Base, U extends Base>(a: { x: T; y: U; }) => (x: T) => U
 >{ x: new Derived(), y: new Derived2() } : { x: Derived; y: Derived2; }
 >x : Derived
 >new Derived() : Derived
@@ -124,6 +124,6 @@ var i: I<Base, Derived>;
 var r4 = f2(i); // Base => Derived
 >r4 : (x: Base) => Derived
 >f2(i) : (x: Base) => Derived
->f2 : typeof f2
+>f2 : <T extends Base, U extends Base>(a: { x: T; y: U; }) => (x: T) => U
 >i : I<Base, Derived>
 
diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints.types b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints.types
index 852196e93f9..8e062a8d5bf 100644
--- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints.types
+++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints.types
@@ -29,7 +29,7 @@ class X<T> {
 }
 
 function foo<T extends { x: string }>(t: X<T>, t2: X<T>) {
->foo : typeof foo
+>foo : <T extends { x: string; }>(t: X<T>, t2: X<T>) => T
 >T : T
 >x : string
 >t : X<T>
@@ -62,19 +62,19 @@ var d1 = new X<D>();
 var r = foo(c1, d1); 
 >r : C
 >foo(c1, d1) : C
->foo : typeof foo
+>foo : <T extends { x: string; }>(t: X<T>, t2: X<T>) => T
 >c1 : X<C>
 >d1 : X<D>
 
 var r2 = foo(c1, c1);
 >r2 : C
 >foo(c1, c1) : C
->foo : typeof foo
+>foo : <T extends { x: string; }>(t: X<T>, t2: X<T>) => T
 >c1 : X<C>
 >c1 : X<C>
 
 function foo2<T extends C>(t: X<T>, t2: X<T>) {
->foo2 : typeof foo2
+>foo2 : <T extends C>(t: X<T>, t2: X<T>) => T
 >T : T
 >C : C
 >t : X<T>
@@ -95,14 +95,14 @@ function foo2<T extends C>(t: X<T>, t2: X<T>) {
 var r = foo2(c1, d1); 
 >r : C
 >foo2(c1, d1) : C
->foo2 : typeof foo2
+>foo2 : <T extends C>(t: X<T>, t2: X<T>) => T
 >c1 : X<C>
 >d1 : X<D>
 
 var r2 = foo2(c1, c1);
 >r2 : C
 >foo2(c1, c1) : C
->foo2 : typeof foo2
+>foo2 : <T extends C>(t: X<T>, t2: X<T>) => T
 >c1 : X<C>
 >c1 : X<C>
 
diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints2.types b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints2.types
index db9db6422e1..29706ba7e3d 100644
--- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints2.types
+++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndConstraints2.types
@@ -17,7 +17,7 @@ class Derived extends Base {
 }
 
 function f<T extends Base>(x: { foo: T; bar: T }) {
->f : typeof f
+>f : <T extends Base>(x: { foo: T; bar: T; }) => T
 >T : T
 >Base : Base
 >x : { foo: T; bar: T; }
@@ -36,7 +36,7 @@ function f<T extends Base>(x: { foo: T; bar: T }) {
 var r = f({ foo: new Base(), bar: new Derived() });
 >r : Base
 >f({ foo: new Base(), bar: new Derived() }) : Base
->f : typeof f
+>f : <T extends Base>(x: { foo: T; bar: T; }) => T
 >{ foo: new Base(), bar: new Derived() } : { foo: Base; bar: Derived; }
 >foo : Base
 >new Base() : Base
@@ -48,7 +48,7 @@ var r = f({ foo: new Base(), bar: new Derived() });
 var r2 = f({ foo: new Derived(), bar: new Derived() });
 >r2 : Derived
 >f({ foo: new Derived(), bar: new Derived() }) : Derived
->f : typeof f
+>f : <T extends Base>(x: { foo: T; bar: T; }) => T
 >{ foo: new Derived(), bar: new Derived() } : { foo: Derived; bar: Derived; }
 >foo : Derived
 >new Derived() : Derived
@@ -67,7 +67,7 @@ interface I<T> {
 >T : T
 }
 function f2<T extends Base>(x: I<T>) {
->f2 : typeof f2
+>f2 : <T extends Base>(x: I<T>) => T
 >T : T
 >Base : Base
 >x : I<T>
@@ -89,12 +89,12 @@ var i: I<Derived>;
 var r3 = f2(i);
 >r3 : Derived
 >f2(i) : Derived
->f2 : typeof f2
+>f2 : <T extends Base>(x: I<T>) => T
 >i : I<Derived>
 
 
 function f3<T extends Base>(x: T, y: (a: T) => T) {
->f3 : typeof f3
+>f3 : <T extends Base>(x: T, y: (a: T) => T) => T
 >T : T
 >Base : Base
 >x : T
@@ -111,7 +111,7 @@ function f3<T extends Base>(x: T, y: (a: T) => T) {
 var r4 = f3(new Base(), x => x);
 >r4 : Base
 >f3(new Base(), x => x) : Base
->f3 : typeof f3
+>f3 : <T extends Base>(x: T, y: (a: T) => T) => T
 >new Base() : Base
 >Base : typeof Base
 >x => x : (x: Base) => Base
@@ -121,7 +121,7 @@ var r4 = f3(new Base(), x => x);
 var r5 = f3(new Derived(), x => x);
 >r5 : Derived
 >f3(new Derived(), x => x) : Derived
->f3 : typeof f3
+>f3 : <T extends Base>(x: T, y: (a: T) => T) => T
 >new Derived() : Derived
 >Derived : typeof Derived
 >x => x : (x: Derived) => Derived
@@ -131,12 +131,12 @@ var r5 = f3(new Derived(), x => x);
 var r6 = f3(null, null); // any
 >r6 : any
 >f3(null, null) : any
->f3 : typeof f3
+>f3 : <T extends Base>(x: T, y: (a: T) => T) => T
 
 var r7 = f3(null, x => x); // any
 >r7 : any
 >f3(null, x => x) : any
->f3 : typeof f3
+>f3 : <T extends Base>(x: T, y: (a: T) => T) => T
 >x => x : (x: any) => any
 >x : any
 >x : any
diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgsAndIndexers.types b/tests/baselines/reference/genericCallWithObjectTypeArgsAndIndexers.types
index 81f4fe5f6d2..9a7ca1dbb91 100644
--- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndIndexers.types
+++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndIndexers.types
@@ -2,7 +2,7 @@
 // Type inference infers from indexers in target type, no errors expected
 
 function foo<T>(x: T) {
->foo : typeof foo
+>foo : <T>(x: T) => T
 >T : T
 >x : T
 >T : T
@@ -26,11 +26,11 @@ var a: {
 var r = foo(a);
 >r : { [x: string]: Object; [x: number]: Date; }
 >foo(a) : { [x: string]: Object; [x: number]: Date; }
->foo : typeof foo
+>foo : <T>(x: T) => T
 >a : { [x: string]: Object; [x: number]: Date; }
 
 function other<T extends Date>(arg: T) {
->other : typeof other
+>other : <T extends Date>(arg: T) => void
 >T : T
 >Date : Date
 >arg : T
@@ -51,7 +51,7 @@ function other<T extends Date>(arg: T) {
     var r2 = foo(b);
 >r2 : { [x: string]: Object; [x: number]: T; }
 >foo(b) : { [x: string]: Object; [x: number]: T; }
->foo : typeof foo
+>foo : <T>(x: T) => T
 >b : { [x: string]: Object; [x: number]: T; }
 
     var d = r2[1]; 
diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgsAndNumericIndexer.types b/tests/baselines/reference/genericCallWithObjectTypeArgsAndNumericIndexer.types
index 497aa0b443e..f4b3f5960f0 100644
--- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndNumericIndexer.types
+++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndNumericIndexer.types
@@ -2,7 +2,7 @@
 // Type inference infers from indexers in target type, no errors expected
 
 function foo<T>(x: T) {
->foo : typeof foo
+>foo : <T>(x: T) => T
 >T : T
 >x : T
 >T : T
@@ -19,11 +19,11 @@ var a: { [x: number]: Date };
 var r = foo(a);
 >r : { [x: number]: Date; }
 >foo(a) : { [x: number]: Date; }
->foo : typeof foo
+>foo : <T>(x: T) => T
 >a : { [x: number]: Date; }
 
 function other<T>(arg: T) {
->other : typeof other
+>other : <T>(arg: T) => void
 >T : T
 >arg : T
 >T : T
@@ -36,12 +36,12 @@ function other<T>(arg: T) {
     var r2 = foo(b); // T
 >r2 : { [x: number]: T; }
 >foo(b) : { [x: number]: T; }
->foo : typeof foo
+>foo : <T>(x: T) => T
 >b : { [x: number]: T; }
 }
 
 function other2<T extends Date>(arg: T) {
->other2 : typeof other2
+>other2 : <T extends Date>(arg: T) => void
 >T : T
 >Date : Date
 >arg : T
@@ -55,7 +55,7 @@ function other2<T extends Date>(arg: T) {
     var r2 = foo(b);
 >r2 : { [x: number]: T; }
 >foo(b) : { [x: number]: T; }
->foo : typeof foo
+>foo : <T>(x: T) => T
 >b : { [x: number]: T; }
 
     var d = r2[1];
@@ -65,7 +65,7 @@ function other2<T extends Date>(arg: T) {
 }
 
 function other3<T extends Date, U extends Date>(arg: T) {
->other3 : typeof other3
+>other3 : <T extends Date, U extends Date>(arg: T) => void
 >T : T
 >Date : Date
 >U : U
@@ -81,7 +81,7 @@ function other3<T extends Date, U extends Date>(arg: T) {
     var r2 = foo(b);
 >r2 : { [x: number]: T; }
 >foo(b) : { [x: number]: T; }
->foo : typeof foo
+>foo : <T>(x: T) => T
 >b : { [x: number]: T; }
 
     var d = r2[1];
diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgsAndStringIndexer.types b/tests/baselines/reference/genericCallWithObjectTypeArgsAndStringIndexer.types
index 133a4a6c6a9..e52e6cff113 100644
--- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndStringIndexer.types
+++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndStringIndexer.types
@@ -2,7 +2,7 @@
 // Type inference infers from indexers in target type, no errors expected
 
 function foo<T>(x: T) {
->foo : typeof foo
+>foo : <T>(x: T) => T
 >T : T
 >x : T
 >T : T
@@ -19,11 +19,11 @@ var a: { [x: string]: Date };
 var r = foo(a);
 >r : { [x: string]: Date; }
 >foo(a) : { [x: string]: Date; }
->foo : typeof foo
+>foo : <T>(x: T) => T
 >a : { [x: string]: Date; }
 
 function other<T>(arg: T) {
->other : typeof other
+>other : <T>(arg: T) => void
 >T : T
 >arg : T
 >T : T
@@ -36,12 +36,12 @@ function other<T>(arg: T) {
     var r2 = foo(b); // T
 >r2 : { [x: string]: T; }
 >foo(b) : { [x: string]: T; }
->foo : typeof foo
+>foo : <T>(x: T) => T
 >b : { [x: string]: T; }
 }
 
 function other2<T extends Date>(arg: T) {
->other2 : typeof other2
+>other2 : <T extends Date>(arg: T) => void
 >T : T
 >Date : Date
 >arg : T
@@ -55,7 +55,7 @@ function other2<T extends Date>(arg: T) {
     var r2 = foo(b);
 >r2 : { [x: string]: T; }
 >foo(b) : { [x: string]: T; }
->foo : typeof foo
+>foo : <T>(x: T) => T
 >b : { [x: string]: T; }
 
     var d: Date = r2['hm']; // ok
@@ -66,7 +66,7 @@ function other2<T extends Date>(arg: T) {
 }
 
 function other3<T extends Date, U extends Date>(arg: T) {
->other3 : typeof other3
+>other3 : <T extends Date, U extends Date>(arg: T) => void
 >T : T
 >Date : Date
 >U : U
@@ -82,7 +82,7 @@ function other3<T extends Date, U extends Date>(arg: T) {
     var r2 = foo(b);
 >r2 : { [x: string]: T; }
 >foo(b) : { [x: string]: T; }
->foo : typeof foo
+>foo : <T>(x: T) => T
 >b : { [x: string]: T; }
 
     var d: Date = r2['hm']; // ok
diff --git a/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments.types b/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments.types
index 2a9b0c2e861..6c16ad0259c 100644
--- a/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments.types
+++ b/tests/baselines/reference/genericCallWithOverloadedConstructorTypedArguments.types
@@ -16,7 +16,7 @@ module NonGenericParameter {
     }
 
     function foo4(cb: typeof a) {
->foo4 : typeof foo4
+>foo4 : (cb: { new (x: boolean): boolean; new (x: string): string; }) => boolean
 >cb : { new (x: boolean): boolean; new (x: string): string; }
 >a : { new (x: boolean): boolean; new (x: string): string; }
 
@@ -28,7 +28,7 @@ module NonGenericParameter {
     var r = foo4(a);
 >r : boolean
 >foo4(a) : boolean
->foo4 : typeof foo4
+>foo4 : (cb: { new (x: boolean): boolean; new (x: string): string; }) => boolean
 >a : { new (x: boolean): boolean; new (x: string): string; }
 
     var b: { new <T>(x: T): T };
@@ -41,7 +41,7 @@ module NonGenericParameter {
     var r2 = foo4(b);
 >r2 : boolean
 >foo4(b) : boolean
->foo4 : typeof foo4
+>foo4 : (cb: { new (x: boolean): boolean; new (x: string): string; }) => boolean
 >b : new <T>(x: T) => T
 }
 
@@ -49,7 +49,7 @@ module GenericParameter {
 >GenericParameter : typeof GenericParameter
 
     function foo5<T>(cb: { new(x: T): string; new(x: number): T }) {
->foo5 : typeof foo5
+>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
@@ -73,7 +73,7 @@ module GenericParameter {
     var r5 = foo5(a); // new{} => string; new(x:number) => {}
 >r5 : { new (x: boolean): string; new (x: number): boolean; }
 >foo5(a) : { new (x: boolean): string; new (x: number): boolean; }
->foo5 : typeof foo5
+>foo5 : <T>(cb: { new (x: T): string; new (x: number): T; }) => { new (x: T): string; new (x: number): T; }
 >a : { new (x: boolean): string; new (x: number): boolean; }
 
     var b: { new<T>(x: T): string; new<T>(x: number): T; }
@@ -88,11 +88,11 @@ module GenericParameter {
     var r7 = foo5(b); // new any => string; new(x:number) => any
 >r7 : { new (x: any): string; new (x: number): any; }
 >foo5(b) : { new (x: any): string; new (x: number): any; }
->foo5 : typeof foo5
+>foo5 : <T>(cb: { new (x: T): string; new (x: number): T; }) => { new (x: T): string; new (x: number): T; }
 >b : { new <T>(x: T): string; new <T>(x: number): T; }
 
     function foo6<T>(cb: { new(x: T): string; new(x: T, y?: T): string }) {
->foo6 : typeof foo6
+>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
@@ -109,17 +109,17 @@ module GenericParameter {
     var r8 = foo6(a); // new{} => string; new(x:{}, y?:{}) => string
 >r8 : { new (x: {}): string; new (x: {}, y?: {}): string; }
 >foo6(a) : { new (x: {}): string; new (x: {}, y?: {}): string; }
->foo6 : typeof foo6
+>foo6 : <T>(cb: { new (x: T): string; new (x: T, y?: T): string; }) => { new (x: T): string; new (x: T, y?: T): string; }
 >a : { new (x: boolean): string; new (x: number): boolean; }
 
     var r9 = foo6(b); // new any => string; new(x:any, y?:any) => string
 >r9 : { new (x: any): string; new (x: any, y?: any): string; }
 >foo6(b) : { new (x: any): string; new (x: any, y?: any): string; }
->foo6 : typeof foo6
+>foo6 : <T>(cb: { new (x: T): string; new (x: T, y?: T): string; }) => { new (x: T): string; new (x: T, y?: T): string; }
 >b : { new <T>(x: T): string; new <T>(x: number): T; }
 
     function foo7<T>(x:T, cb: { new(x: T): string; new(x: T, y?: T): string }) {
->foo7 : typeof foo7
+>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
@@ -138,7 +138,7 @@ module GenericParameter {
     var r13 = foo7(1, b); // new any => string; new(x:any, y?:any) => string
 >r13 : { new (x: any): string; new (x: any, y?: any): string; }
 >foo7(1, b) : { new (x: any): string; new (x: any, y?: any): string; }
->foo7 : typeof foo7
+>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; }
 >b : { new <T>(x: T): string; new <T>(x: number): T; }
 
     var c: { new <T>(x: T): string; <T>(x: number): T; }
@@ -162,12 +162,12 @@ module GenericParameter {
     var r14 = foo7(1, c); // new any => string; new(x:any, y?:any) => string
 >r14 : { new (x: any): string; new (x: any, y?: any): string; }
 >foo7(1, c) : { new (x: any): string; new (x: any, y?: any): string; }
->foo7 : typeof foo7
+>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; }
 >c : { <T>(x: number): T; new <T>(x: T): string; }
 
     var r15 = foo7(1, c2); // new any => string; new(x:any, y?:any) => string
 >r15 : { new (x: any): string; new (x: any, y?: any): string; }
 >foo7(1, c2) : { new (x: any): string; new (x: any, y?: any): string; }
->foo7 : typeof foo7
+>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; }
 >c2 : { new <T>(x: T): string; new <T>(x: number): T; }
 }
diff --git a/tests/baselines/reference/genericCallWithOverloadedFunctionTypedArguments.types b/tests/baselines/reference/genericCallWithOverloadedFunctionTypedArguments.types
index ecf23d2ead9..ad491206be6 100644
--- a/tests/baselines/reference/genericCallWithOverloadedFunctionTypedArguments.types
+++ b/tests/baselines/reference/genericCallWithOverloadedFunctionTypedArguments.types
@@ -16,7 +16,7 @@ module NonGenericParameter {
     }
 
     function foo4(cb: typeof a) {
->foo4 : typeof foo4
+>foo4 : (cb: { (x: boolean): boolean; (x: string): string; }) => { (x: boolean): boolean; (x: string): string; }
 >cb : { (x: boolean): boolean; (x: string): string; }
 >a : { (x: boolean): boolean; (x: string): string; }
 
@@ -27,13 +27,13 @@ module NonGenericParameter {
     var r = foo4(a);
 >r : { (x: boolean): boolean; (x: string): string; }
 >foo4(a) : { (x: boolean): boolean; (x: string): string; }
->foo4 : typeof foo4
+>foo4 : (cb: { (x: boolean): boolean; (x: string): string; }) => { (x: boolean): boolean; (x: string): string; }
 >a : { (x: boolean): boolean; (x: string): string; }
 
     var r2 = foo4(<T>(x: T) => x);
 >r2 : { (x: boolean): boolean; (x: string): string; }
 >foo4(<T>(x: T) => x) : { (x: boolean): boolean; (x: string): string; }
->foo4 : typeof foo4
+>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
@@ -43,7 +43,7 @@ module NonGenericParameter {
     var r4 = foo4(x => x);    
 >r4 : { (x: boolean): boolean; (x: string): string; }
 >foo4(x => x) : { (x: boolean): boolean; (x: string): string; }
->foo4 : typeof foo4
+>foo4 : (cb: { (x: boolean): boolean; (x: string): string; }) => { (x: boolean): boolean; (x: string): string; }
 >x => x : (x: any) => any
 >x : any
 >x : any
@@ -53,7 +53,7 @@ module GenericParameter {
 >GenericParameter : typeof GenericParameter
 
     function foo5<T>(cb: { (x: T): string; (x: number): T }) {
->foo5 : typeof foo5
+>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
@@ -68,7 +68,7 @@ module GenericParameter {
     var r5 = foo5(x => x); // any => string (+1 overload) [inferences are made for T, but lambda not contextually typed]. T is any
 >r5 : { (x: any): string; (x: number): any; }
 >foo5(x => x) : { (x: any): string; (x: number): any; }
->foo5 : typeof foo5
+>foo5 : <T>(cb: { (x: T): string; (x: number): T; }) => { (x: T): string; (x: number): T; }
 >x => x : (x: any) => any
 >x : any
 >x : any
@@ -85,11 +85,11 @@ module GenericParameter {
     var r7 = foo5(a); // any => string (+1 overload)
 >r7 : { (x: any): string; (x: number): any; }
 >foo5(a) : { (x: any): string; (x: number): any; }
->foo5 : typeof foo5
+>foo5 : <T>(cb: { (x: T): string; (x: number): T; }) => { (x: T): string; (x: number): T; }
 >a : { <T>(x: T): string; <T>(x: number): T; }
 
     function foo6<T>(cb: { (x: T): string; (x: T, y?: T): string }) {
->foo6 : typeof foo6
+>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
@@ -106,7 +106,7 @@ module GenericParameter {
     var r8 = foo6(x => x); // any => string (+1 overload) [inferences are made for T, but lambda not contextually typed]. T is any
 >r8 : { (x: any): string; (x: any, y?: any): string; }
 >foo6(x => x) : { (x: any): string; (x: any, y?: any): string; }
->foo6 : typeof foo6
+>foo6 : <T>(cb: { (x: T): string; (x: T, y?: T): string; }) => { (x: T): string; (x: T, y?: T): string; }
 >x => x : (x: any) => any
 >x : any
 >x : any
@@ -114,7 +114,7 @@ module GenericParameter {
     var r9 = foo6(<T>(x: T) => ''); // any => string (+1 overload)
 >r9 : { (x: any): string; (x: any, y?: any): string; }
 >foo6(<T>(x: T) => '') : { (x: any): string; (x: any, y?: any): string; }
->foo6 : typeof foo6
+>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
@@ -123,7 +123,7 @@ module GenericParameter {
     var r11 = foo6(<T>(x: T, y?: T) => ''); // any => string (+1 overload)
 >r11 : { (x: any): string; (x: any, y?: any): string; }
 >foo6(<T>(x: T, y?: T) => '') : { (x: any): string; (x: any, y?: any): string; }
->foo6 : typeof foo6
+>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
@@ -132,7 +132,7 @@ module GenericParameter {
 >T : T
 
     function foo7<T>(x:T, cb: { (x: T): string; (x: T, y?: T): string }) {
->foo7 : typeof foo7
+>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
@@ -151,7 +151,7 @@ module GenericParameter {
     var r12 = foo7(1, (x) => x); // any => string (+1 overload) [inferences are made for T, but lambda not contextually typed]
 >r12 : { (x: any): string; (x: any, y?: any): string; }
 >foo7(1, (x) => x) : { (x: any): string; (x: any, y?: any): string; }
->foo7 : typeof foo7
+>foo7 : <T>(x: T, cb: { (x: T): string; (x: T, y?: T): string; }) => { (x: T): string; (x: T, y?: T): string; }
 >(x) => x : (x: any) => any
 >x : any
 >x : any
@@ -159,7 +159,7 @@ module GenericParameter {
     var r13 = foo7(1, <T>(x: T) => ''); // any => string (+1 overload) [inferences are made for T, but lambda not contextually typed]
 >r13 : { (x: any): string; (x: any, y?: any): string; }
 >foo7(1, <T>(x: T) => '') : { (x: any): string; (x: any, y?: any): string; }
->foo7 : typeof foo7
+>foo7 : <T>(x: 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
@@ -177,6 +177,6 @@ module GenericParameter {
     var r14 = foo7(1, a); // any => string (+1 overload) [inferences are made for T, but lambda not contextually typed]
 >r14 : { (x: any): string; (x: any, y?: any): string; }
 >foo7(1, a) : { (x: any): string; (x: any, y?: any): string; }
->foo7 : typeof foo7
+>foo7 : <T>(x: T, cb: { (x: T): string; (x: T, y?: T): string; }) => { (x: T): string; (x: T, y?: T): string; }
 >a : { <T>(x: T): string; <T>(x: number): T; }
 }
diff --git a/tests/baselines/reference/genericClassWithFunctionTypedMemberArguments.types b/tests/baselines/reference/genericClassWithFunctionTypedMemberArguments.types
index 87037736eff..68b94d81d02 100644
--- a/tests/baselines/reference/genericClassWithFunctionTypedMemberArguments.types
+++ b/tests/baselines/reference/genericClassWithFunctionTypedMemberArguments.types
@@ -238,7 +238,7 @@ module WithCandidates {
 >C3 : C3<T, U>
 
     function other<T, U>(t: T, u: U) {
->other : typeof other
+>other : <T, U>(t: T, u: U) => void
 >T : T
 >U : U
 >t : T
diff --git a/tests/baselines/reference/genericFunctionHasFreshTypeArgs.types b/tests/baselines/reference/genericFunctionHasFreshTypeArgs.types
index 23965f161a9..3a3afebb9ac 100644
--- a/tests/baselines/reference/genericFunctionHasFreshTypeArgs.types
+++ b/tests/baselines/reference/genericFunctionHasFreshTypeArgs.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/genericFunctionHasFreshTypeArgs.ts ===
 function f(p: <T>(x: T) => void) { };
->f : typeof f
+>f : (p: <T>(x: T) => void) => void
 >p : <T>(x: T) => void
 >T : T
 >x : T
@@ -8,11 +8,11 @@ function f(p: <T>(x: T) => void) { };
 
 f(x => f(y => x = y));
 >f(x => f(y => x = y)) : void
->f : typeof f
+>f : (p: <T>(x: T) => void) => void
 >x => f(y => x = y) : (x: any) => void
 >x : any
 >f(y => x = y) : void
->f : typeof f
+>f : (p: <T>(x: T) => void) => void
 >y => x = y : (y: any) => any
 >y : any
 >x = y : any
diff --git a/tests/baselines/reference/genericFunctionSpecializations1.types b/tests/baselines/reference/genericFunctionSpecializations1.types
index 06e2f009bd0..60819c786b8 100644
--- a/tests/baselines/reference/genericFunctionSpecializations1.types
+++ b/tests/baselines/reference/genericFunctionSpecializations1.types
@@ -1,22 +1,22 @@
 === tests/cases/compiler/genericFunctionSpecializations1.ts ===
 function foo3<T>(test: string); // error
->foo3 : typeof foo3
+>foo3 : <T>(test: string) => any
 >T : T
 >test : string
 
 function foo3<T>(test: T) { }
->foo3 : typeof foo3
+>foo3 : <T>(test: string) => any
 >T : T
 >test : T
 >T : T
 
 function foo4<T>(test: string); // valid
->foo4 : typeof foo4
+>foo4 : <T>(test: string) => any
 >T : T
 >test : string
 
 function foo4<T extends String>(test: T) { }
->foo4 : typeof foo4
+>foo4 : <T>(test: string) => any
 >T : T
 >String : String
 >test : T
diff --git a/tests/baselines/reference/genericFunctions0.types b/tests/baselines/reference/genericFunctions0.types
index ee435ee0845..045224a7aaa 100644
--- a/tests/baselines/reference/genericFunctions0.types
+++ b/tests/baselines/reference/genericFunctions0.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/genericFunctions0.ts ===
 function foo<T > (x: T) { return x; }
->foo : typeof foo
+>foo : <T>(x: T) => T
 >T : T
 >x : T
 >T : T
@@ -9,5 +9,5 @@ function foo<T > (x: T) { return x; }
 var x = foo<number>(5); // 'x' should be number
 >x : number
 >foo<number>(5) : number
->foo : typeof foo
+>foo : <T>(x: T) => T
 
diff --git a/tests/baselines/reference/genericFunctions1.types b/tests/baselines/reference/genericFunctions1.types
index 96862e9e0cb..aed264c78e1 100644
--- a/tests/baselines/reference/genericFunctions1.types
+++ b/tests/baselines/reference/genericFunctions1.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/genericFunctions1.ts ===
 function foo<T > (x: T) { return x; }
->foo : typeof foo
+>foo : <T>(x: T) => T
 >T : T
 >x : T
 >T : T
@@ -9,5 +9,5 @@ function foo<T > (x: T) { return x; }
 var x = foo(5); // 'x' should be number
 >x : number
 >foo(5) : number
->foo : typeof foo
+>foo : <T>(x: T) => T
 
diff --git a/tests/baselines/reference/genericFunctions2.types b/tests/baselines/reference/genericFunctions2.types
index 2ad353559a5..96e757d3d9e 100644
--- a/tests/baselines/reference/genericFunctions2.types
+++ b/tests/baselines/reference/genericFunctions2.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/genericFunctions2.ts ===
 declare function map <T, U > (items: T[], f: (x: T) => U): U[];
->map : typeof map
+>map : <T, U>(items: T[], f: (x: T) => U) => U[]
 >T : T
 >U : U
 >items : T[]
@@ -17,7 +17,7 @@ var myItems: string[];
 var lengths = map(myItems, x => x.length);
 >lengths : number[]
 >map(myItems, x => x.length) : number[]
->map : typeof map
+>map : <T, U>(items: T[], f: (x: T) => U) => U[]
 >myItems : string[]
 >x => x.length : (x: string) => number
 >x : string
diff --git a/tests/baselines/reference/genericFunctions3.types b/tests/baselines/reference/genericFunctions3.types
index 663f6270f2a..2215e30adcf 100644
--- a/tests/baselines/reference/genericFunctions3.types
+++ b/tests/baselines/reference/genericFunctions3.types
@@ -11,14 +11,14 @@ interface Query<T> {
 }
  
 function from<T>(arg: boolean): Query<T>; // was Error: Overload signature is not compatible with function definition.
->from : typeof from
+>from : <T>(arg: boolean) => Query<T>
 >T : T
 >arg : boolean
 >Query : Query<T>
 >T : T
 
 function from<T>(arg: any): Query<T> {
->from : typeof from
+>from : <T>(arg: boolean) => Query<T>
 >T : T
 >arg : any
 >Query : Query<T>
diff --git a/tests/baselines/reference/genericInference2.types b/tests/baselines/reference/genericInference2.types
index d9e0bb14ceb..2616c0de2c4 100644
--- a/tests/baselines/reference/genericInference2.types
+++ b/tests/baselines/reference/genericInference2.types
@@ -24,7 +24,7 @@
 >T : T
        } 
        export function observable<T>(value: T): Observable<T>; 
->observable : typeof observable
+>observable : <T>(value: T) => Observable<T>
 >T : T
 >value : T
 >T : T
@@ -38,16 +38,16 @@
        name: ko.observable("Bob"), 
 >name : ko.Observable<string>
 >ko.observable("Bob") : ko.Observable<string>
->ko.observable : typeof ko.observable
+>ko.observable : <T>(value: T) => ko.Observable<T>
 >ko : typeof ko
->observable : typeof ko.observable
+>observable : <T>(value: T) => ko.Observable<T>
 
        age: ko.observable(37) 
 >age : ko.Observable<number>
 >ko.observable(37) : ko.Observable<number>
->ko.observable : typeof ko.observable
+>ko.observable : <T>(value: T) => ko.Observable<T>
 >ko : typeof ko
->observable : typeof ko.observable
+>observable : <T>(value: T) => ko.Observable<T>
 
     }; 
     var x_v = o.name().length;  // should be 'number'
diff --git a/tests/baselines/reference/genericInstantiationEquivalentToObjectLiteral.types b/tests/baselines/reference/genericInstantiationEquivalentToObjectLiteral.types
index aa67bfdf7bb..449c5712c6c 100644
--- a/tests/baselines/reference/genericInstantiationEquivalentToObjectLiteral.types
+++ b/tests/baselines/reference/genericInstantiationEquivalentToObjectLiteral.types
@@ -28,7 +28,7 @@ y = x;
 >x : Pair<string, number>
 
 declare function f<T, U>(x: Pair<T, U>);
->f : typeof f
+>f : <T, U>(x: Pair<T, U>) => any
 >T : T
 >U : U
 >x : Pair<T, U>
@@ -37,7 +37,7 @@ declare function f<T, U>(x: Pair<T, U>);
 >U : U
 
 declare function f2<T, U>(x: { first: T; second: U; });
->f2 : typeof f2
+>f2 : <T, U>(x: { first: T; second: U; }) => any
 >T : T
 >U : U
 >x : { first: T; second: U; }
@@ -48,21 +48,21 @@ declare function f2<T, U>(x: { first: T; second: U; });
 
 f(x);
 >f(x) : any
->f : typeof f
+>f : <T, U>(x: Pair<T, U>) => any
 >x : Pair<string, number>
 
 f(y);
 >f(y) : any
->f : typeof f
+>f : <T, U>(x: Pair<T, U>) => any
 >y : { first: string; second: number; }
 
 f2(x);
 >f2(x) : any
->f2 : typeof f2
+>f2 : <T, U>(x: { first: T; second: U; }) => any
 >x : Pair<string, number>
 
 f2(y);
 >f2(y) : any
->f2 : typeof f2
+>f2 : <T, U>(x: { first: T; second: U; }) => any
 >y : { first: string; second: number; }
 
diff --git a/tests/baselines/reference/genericInterfaceFunctionTypeParameter.types b/tests/baselines/reference/genericInterfaceFunctionTypeParameter.types
index f8d1ff0341d..f262fda55f6 100644
--- a/tests/baselines/reference/genericInterfaceFunctionTypeParameter.types
+++ b/tests/baselines/reference/genericInterfaceFunctionTypeParameter.types
@@ -4,7 +4,7 @@ export interface IFoo<A> { }
 >A : A
 
 export function foo<A>(fn: (ifoo: IFoo<A>) => void) {
->foo : typeof foo
+>foo : <A>(fn: (ifoo: IFoo<A>) => void) => void
 >A : A
 >fn : (ifoo: IFoo<A>) => void
 >ifoo : IFoo<A>
@@ -13,7 +13,7 @@ export function foo<A>(fn: (ifoo: IFoo<A>) => void) {
 
     foo(fn); // Invocation is necessary to repro (!)
 >foo(fn) : void
->foo : typeof foo
+>foo : <A>(fn: (ifoo: IFoo<A>) => void) => void
 >fn : (ifoo: IFoo<A>) => void
 }
 
diff --git a/tests/baselines/reference/genericOverloadSignatures.types b/tests/baselines/reference/genericOverloadSignatures.types
index 1181d61ccb7..e1efe0785ab 100644
--- a/tests/baselines/reference/genericOverloadSignatures.types
+++ b/tests/baselines/reference/genericOverloadSignatures.types
@@ -14,19 +14,19 @@ interface A {
 }
 
 function f<T>(a: T);
->f : typeof f
+>f : { <T>(a: T): any; <T>(a: T): any; }
 >T : T
 >a : T
 >T : T
 
 function f<T>(a: T);
->f : typeof f
+>f : { <T>(a: T): any; <T>(a: T): any; }
 >T : T
 >a : T
 >T : T
 
 function f(a) { }
->f : typeof f
+>f : { <T>(a: T): any; <T>(a: T): any; }
 >a : any
 
 interface I2 {
diff --git a/tests/baselines/reference/genericParameterAssignability1.types b/tests/baselines/reference/genericParameterAssignability1.types
index ac7f1c97436..b7888014dea 100644
--- a/tests/baselines/reference/genericParameterAssignability1.types
+++ b/tests/baselines/reference/genericParameterAssignability1.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/genericParameterAssignability1.ts ===
 function f<T>(x: T): T { return null; }
->f : typeof f
+>f : <T>(x: T) => T
 >T : T
 >x : T
 >T : T
@@ -15,7 +15,7 @@ var r = <T>(x: T) => x;
 >x : T
 
 r = f; // should be allowed
->r = f : typeof f
+>r = f : <T>(x: T) => T
 >r : <T>(x: T) => T
->f : typeof f
+>f : <T>(x: T) => T
 
diff --git a/tests/baselines/reference/genericTypeParameterEquivalence2.types b/tests/baselines/reference/genericTypeParameterEquivalence2.types
index 2c7af15b753..09e13b12f7b 100644
--- a/tests/baselines/reference/genericTypeParameterEquivalence2.types
+++ b/tests/baselines/reference/genericTypeParameterEquivalence2.types
@@ -1,7 +1,7 @@
 === tests/cases/compiler/genericTypeParameterEquivalence2.ts ===
 // compose :: (b->c) -> (a->b) -> (a->c)
 function compose<A, B, C>(f: (b: B) => C, g: (a:A) => B): (a:A) => C {
->compose : typeof compose
+>compose : <A, B, C>(f: (b: B) => C, g: (a: A) => B) => (a: A) => C
 >A : A
 >B : B
 >C : C
@@ -37,7 +37,7 @@ 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 : typeof forEach
+>forEach : <A>(list: A[], f: (a: A, n?: number) => void) => void
 >A : A
 >list : A[]
 >A : A
@@ -68,7 +68,7 @@ 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 : typeof filter
+>filter : <A>(f: (a: A) => boolean, ar: A[]) => A[]
 >A : A
 >f : (a: A) => boolean
 >a : A
@@ -83,7 +83,7 @@ function filter<A>(f: (a: A) => boolean, ar: A[]): A[] {
 
     forEach(ar, (el) => {
 >forEach(ar, (el) => {        if (f(el)) {            ret.push(el);        }    } ) : void
->forEach : typeof forEach
+>forEach : <A>(list: A[], f: (a: A, n?: number) => void) => void
 >ar : A[]
 >(el) => {        if (f(el)) {            ret.push(el);        }    } : (el: A) => void
 >el : A
@@ -108,7 +108,7 @@ function filter<A>(f: (a: A) => boolean, ar: A[]): A[] {
 
 // length :: [a] -> Num
 function length2<A>(ar: A[]): number {
->length2 : typeof length2
+>length2 : <A>(ar: A[]) => number
 >A : A
 >ar : A[]
 >A : A
@@ -121,7 +121,7 @@ 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 : typeof curry1
+>curry1 : <A, B, C>(f: (a: A, b: B) => C) => (ax: A) => (bx: B) => C
 >A : A
 >B : B
 >C : C
@@ -160,8 +160,8 @@ function curry1<A, B, C>(f: (a: A, b: B) => C): (ax: A) => (bx: B) => C {
 var cfilter = curry1(filter);
 >cfilter : (ax: {}) => (bx: {}) => {}[]
 >curry1(filter) : (ax: {}) => (bx: {}) => {}[]
->curry1 : typeof curry1
->filter : typeof filter
+>curry1 : <A, B, C>(f: (a: A, b: B) => C) => (ax: A) => (bx: B) => C
+>filter : <A>(f: (a: A) => boolean, ar: A[]) => A[]
 
 // compose :: (b->c) -> (a->b) -> (a->c)
 // length :: [a] -> Num
@@ -172,7 +172,7 @@ var cfilter = curry1(filter);
 // countWhere :: (a -> Bool) -> [a] -> Num
 
 function countWhere_1<A>(pred: (a: A) => boolean): (a: A[]) => number {
->countWhere_1 : typeof countWhere_1
+>countWhere_1 : <A>(pred: (a: A) => boolean) => (a: A[]) => number
 >A : A
 >pred : (a: A) => boolean
 >a : A
@@ -182,15 +182,15 @@ function countWhere_1<A>(pred: (a: A) => boolean): (a: A[]) => number {
 
     return compose(length2, cfilter(pred));
 >compose(length2, cfilter(pred)) : (a: {}) => number
->compose : typeof compose
->length2 : typeof length2
+>compose : <A, B, C>(f: (b: B) => C, g: (a: A) => B) => (a: A) => C
+>length2 : <A>(ar: A[]) => number
 >cfilter(pred) : (bx: {}) => {}[]
 >cfilter : (ax: {}) => (bx: {}) => {}[]
 >pred : (a: A) => boolean
 }
 
 function countWhere_2<A>(pred: (a: A) => boolean): (a: A[]) => number {
->countWhere_2 : typeof countWhere_2
+>countWhere_2 : <A>(pred: (a: A) => boolean) => (a: A[]) => number
 >A : A
 >pred : (a: A) => boolean
 >a : A
@@ -206,7 +206,7 @@ function countWhere_2<A>(pred: (a: A) => boolean): (a: A[]) => number {
 
     return compose(length2, where);
 >compose(length2, where) : (a: {}) => number
->compose : typeof compose
->length2 : typeof length2
+>compose : <A, B, C>(f: (b: B) => C, g: (a: A) => B) => (a: A) => C
+>length2 : <A>(ar: A[]) => number
 >where : (bx: {}) => {}[]
 }
diff --git a/tests/baselines/reference/genericTypeWithCallableMembers2.types b/tests/baselines/reference/genericTypeWithCallableMembers2.types
index a0b6ec0e8a5..5c265e30a85 100644
--- a/tests/baselines/reference/genericTypeWithCallableMembers2.types
+++ b/tests/baselines/reference/genericTypeWithCallableMembers2.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/genericTypeWithCallableMembers2.ts ===
 function foo1<T extends { (): string; }>(f: T) {
->foo1 : typeof foo1
+>foo1 : <T extends () => string>(f: T) => string
 >T : T
 >f : T
 >T : T
@@ -11,7 +11,7 @@ function foo1<T extends { (): string; }>(f: T) {
 }
  
 function foo2<T extends { new (): string; }>(f: T) {
->foo2 : typeof foo2
+>foo2 : <T extends new () => string>(f: T) => string
 >T : T
 >f : T
 >T : T
diff --git a/tests/baselines/reference/genericsManyTypeParameters.types b/tests/baselines/reference/genericsManyTypeParameters.types
index 21ed88b2013..65f9a7c115e 100644
--- a/tests/baselines/reference/genericsManyTypeParameters.types
+++ b/tests/baselines/reference/genericsManyTypeParameters.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/genericsManyTypeParameters.ts ===
 function Foo<
->Foo : typeof 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,
 >a1 : a1
diff --git a/tests/baselines/reference/getterSetterNonAccessor.types b/tests/baselines/reference/getterSetterNonAccessor.types
index 569d4a303b7..d0b925f99e0 100644
--- a/tests/baselines/reference/getterSetterNonAccessor.types
+++ b/tests/baselines/reference/getterSetterNonAccessor.types
@@ -1,9 +1,9 @@
 === tests/cases/compiler/getterSetterNonAccessor.ts ===
 function getFunc():any{return 0;}
->getFunc : typeof getFunc
+>getFunc : () => any
 
 function setFunc(v){}          
->setFunc : typeof setFunc
+>setFunc : (v: any) => void
 >v : any
 
 Object.defineProperty({}, "0", <PropertyDescriptor>({
@@ -14,16 +14,16 @@ Object.defineProperty({}, "0", <PropertyDescriptor>({
 >{} : {}
 ><PropertyDescriptor>({          get: getFunc,          set: setFunc,          configurable: true      }) : PropertyDescriptor
 >PropertyDescriptor : PropertyDescriptor
->({          get: getFunc,          set: setFunc,          configurable: true      }) : { get: typeof getFunc; set: typeof setFunc; configurable: boolean; }
->{          get: getFunc,          set: setFunc,          configurable: true      } : { get: typeof getFunc; set: typeof setFunc; configurable: boolean; }
+>({          get: getFunc,          set: setFunc,          configurable: true      }) : { get: () => any; set: (v: any) => void; configurable: boolean; }
+>{          get: getFunc,          set: setFunc,          configurable: true      } : { get: () => any; set: (v: any) => void; configurable: boolean; }
 
           get: getFunc,
->get : typeof getFunc
->getFunc : typeof getFunc
+>get : () => any
+>getFunc : () => any
 
           set: setFunc,
->set : typeof setFunc
->setFunc : typeof setFunc
+>set : (v: any) => void
+>setFunc : (v: any) => void
 
           configurable: true
 >configurable : boolean
diff --git a/tests/baselines/reference/global.types b/tests/baselines/reference/global.types
index 568c88297b0..86d5dd3c986 100644
--- a/tests/baselines/reference/global.types
+++ b/tests/baselines/reference/global.types
@@ -3,7 +3,7 @@ module M {
 >M : typeof M
 
     export function f(y:number) {
->f : typeof f
+>f : (y: number) => number
 >y : number
 
         return x+y;
@@ -18,8 +18,8 @@ var x=10;
 
 M.f(3);
 >M.f(3) : number
->M.f : typeof M.f
+>M.f : (y: number) => number
 >M : typeof M
->f : typeof M.f
+>f : (y: number) => number
 
 
diff --git a/tests/baselines/reference/heterogeneousArrayLiterals.types b/tests/baselines/reference/heterogeneousArrayLiterals.types
index cd6cf3a06f7..81770731633 100644
--- a/tests/baselines/reference/heterogeneousArrayLiterals.types
+++ b/tests/baselines/reference/heterogeneousArrayLiterals.types
@@ -237,7 +237,7 @@ module WithContextualType {
 }
 
 function foo<T, U>(t: T, u: U) {
->foo : typeof foo
+>foo : <T, U>(t: T, u: U) => void
 >T : T
 >U : U
 >t : T
@@ -286,7 +286,7 @@ function foo<T, U>(t: T, u: U) {
 }
 
 function foo2<T extends Base, U extends Derived>(t: T, u: U) {
->foo2 : typeof foo2
+>foo2 : <T extends Base, U extends Derived>(t: T, u: U) => void
 >T : T
 >Base : Base
 >U : U
@@ -361,7 +361,7 @@ 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 : typeof foo3
+>foo3 : <T extends Derived, U extends Derived>(t: T, u: U) => void
 >T : T
 >Derived : Derived
 >U : U
@@ -436,7 +436,7 @@ 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 : typeof foo4
+>foo4 : <T extends Base, U extends Base>(t: T, u: U) => void
 >T : T
 >Base : Base
 >U : U
diff --git a/tests/baselines/reference/icomparable.types b/tests/baselines/reference/icomparable.types
index 5281ff73e3c..2766743f41f 100644
--- a/tests/baselines/reference/icomparable.types
+++ b/tests/baselines/reference/icomparable.types
@@ -10,7 +10,7 @@
     }
 
     declare function sort<U extends IComparable<any>>(items: U[]): U[];
->sort : typeof sort
+>sort : <U extends IComparable<any>>(items: U[]) => U[]
 >U : U
 >IComparable : IComparable<T>
 >items : U[]
@@ -29,6 +29,6 @@
     var x = sort(sc);
 >x : StringComparable[]
 >sort(sc) : StringComparable[]
->sort : typeof sort
+>sort : <U extends IComparable<any>>(items: U[]) => U[]
 >sc : StringComparable[]
 
diff --git a/tests/baselines/reference/idInProp.types b/tests/baselines/reference/idInProp.types
index 8227b6fe2c4..f300be6ebf2 100644
--- a/tests/baselines/reference/idInProp.types
+++ b/tests/baselines/reference/idInProp.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/idInProp.ts ===
 function f() {
->f : typeof f
+>f : () => void
 
 var t: { (f: any) : any; };
 >t : (f: any) => any
diff --git a/tests/baselines/reference/ifDoWhileStatements.types b/tests/baselines/reference/ifDoWhileStatements.types
index b488b6c6fc0..b4a3f7a70af 100644
--- a/tests/baselines/reference/ifDoWhileStatements.types
+++ b/tests/baselines/reference/ifDoWhileStatements.types
@@ -46,11 +46,11 @@ class D<T>{
 }
 
 function F(x: string): number { return 42; }
->F : typeof F
+>F : (x: string) => number
 >x : string
 
 function F2(x: number): boolean { return x < 42; }
->F2 : typeof F2
+>F2 : (x: number) => boolean
 >x : number
 >x < 42 : boolean
 >x : number
@@ -66,7 +66,7 @@ module M {
     }
 
     export function F2(x: number): string { return x.toString(); }
->F2 : typeof F2
+>F2 : (x: number) => string
 >x : number
 >x.toString() : string
 >x.toString : (radix?: number) => string
@@ -85,7 +85,7 @@ module N {
     }
 
     export function F2(x: number): string { return x.toString(); }
->F2 : typeof F2
+>F2 : (x: number) => string
 >x : number
 >x.toString() : string
 >x.toString : (radix?: number) => string
@@ -346,30 +346,30 @@ do { }while(k)
 >k : { x: number; y: string; }
 
 function fn(x?: string): I { return null; }
->fn : typeof fn
+>fn : (x?: string) => I
 >x : string
 >I : I
 
 if (fn()) { }
 >fn() : I
->fn : typeof fn
+>fn : (x?: string) => I
 
 while (fn()) { }
 >fn() : I
->fn : typeof fn
+>fn : (x?: string) => I
 
 do { }while(fn())
 >fn() : I
->fn : typeof fn
+>fn : (x?: string) => I
 
 if (fn) { }
->fn : typeof fn
+>fn : (x?: string) => I
 
 while (fn) { }
->fn : typeof fn
+>fn : (x?: string) => I
 
 do { }while(fn)
->fn : typeof fn
+>fn : (x?: string) => I
 
 
 
diff --git a/tests/baselines/reference/implicitAnyAnyReturningFunction.types b/tests/baselines/reference/implicitAnyAnyReturningFunction.types
index e084498ccec..1f0b81c724f 100644
--- a/tests/baselines/reference/implicitAnyAnyReturningFunction.types
+++ b/tests/baselines/reference/implicitAnyAnyReturningFunction.types
@@ -1,13 +1,13 @@
 === tests/cases/compiler/implicitAnyAnyReturningFunction.ts ===
 function A() {
->A : typeof A
+>A : () => any
 
     return <any>"";
 ><any>"" : any
 }
 
 function B() {
->B : typeof B
+>B : () => any
 
     var someLocal: any = {};
 >someLocal : any
diff --git a/tests/baselines/reference/implicitAnyDeclareFunctionWithoutFormalType2.types b/tests/baselines/reference/implicitAnyDeclareFunctionWithoutFormalType2.types
index 9c5264bb029..9fd971ab862 100644
--- a/tests/baselines/reference/implicitAnyDeclareFunctionWithoutFormalType2.types
+++ b/tests/baselines/reference/implicitAnyDeclareFunctionWithoutFormalType2.types
@@ -1,7 +1,7 @@
 === tests/cases/compiler/implicitAnyDeclareFunctionWithoutFormalType2.ts ===
 // generates function fn1(): number;
 function fn1() {
->fn1 : typeof fn1
+>fn1 : () => number
 
     var x: number;
 >x : number
@@ -11,7 +11,7 @@ function fn1() {
 }
 // generates function fn2(): any;
 function fn2(): any {
->fn2 : typeof fn2
+>fn2 : () => any
 
     var x: any;
 >x : any
@@ -21,7 +21,7 @@ function fn2(): any {
 }
 // generates function fn3();
 function fn3() {
->fn3 : typeof fn3
+>fn3 : () => any
 
     var x: any;
 >x : any
diff --git a/tests/baselines/reference/implicitAnyGenerics.types b/tests/baselines/reference/implicitAnyGenerics.types
index b3744097d33..91a231e3f12 100644
--- a/tests/baselines/reference/implicitAnyGenerics.types
+++ b/tests/baselines/reference/implicitAnyGenerics.types
@@ -67,17 +67,17 @@ var d5: D<any> = new D(null);
 >D : typeof D
 
 function foo<T>(): T { return null; };
->foo : typeof foo
+>foo : <T>() => T
 >T : T
 >T : T
 
 foo() 
 >foo() : {}
->foo : typeof foo
+>foo : <T>() => T
 
 foo<any>();
 >foo<any>() : any
->foo : typeof foo
+>foo : <T>() => T
 
 
     
diff --git a/tests/baselines/reference/importDecl.types b/tests/baselines/reference/importDecl.types
index c961a58e7de..973729ae050 100644
--- a/tests/baselines/reference/importDecl.types
+++ b/tests/baselines/reference/importDecl.types
@@ -22,9 +22,9 @@ export var d4 = m4.d;
 export var f4 = m4.foo();
 >f4 : m4.d
 >m4.foo() : m4.d
->m4.foo : typeof m4.foo
+>m4.foo : () => m4.d
 >m4 : typeof m4
->foo : typeof m4.foo
+>foo : () => m4.d
 
 export module m1 {
 >m1 : typeof m1
@@ -44,9 +44,9 @@ export module m1 {
     export var f2 = m4.foo();
 >f2 : m4.d
 >m4.foo() : m4.d
->m4.foo : typeof m4.foo
+>m4.foo : () => m4.d
 >m4 : typeof m4
->foo : typeof m4.foo
+>foo : () => m4.d
 
     var x3 = m4.x;
 >x3 : m4.d
@@ -63,9 +63,9 @@ export module m1 {
     var f3 = m4.foo();
 >f3 : m4.d
 >m4.foo() : m4.d
->m4.foo : typeof m4.foo
+>m4.foo : () => m4.d
 >m4 : typeof m4
->foo : typeof m4.foo
+>foo : () => m4.d
 }
 
 //Emit global only usage
@@ -81,9 +81,9 @@ export var useGlo_m4_d4 = glo_m4.d;
 export var useGlo_m4_f4 = glo_m4.foo();
 >useGlo_m4_f4 : glo_m4.d
 >glo_m4.foo() : glo_m4.d
->glo_m4.foo : typeof glo_m4.foo
+>glo_m4.foo : () => glo_m4.d
 >glo_m4 : typeof glo_m4
->foo : typeof glo_m4.foo
+>foo : () => glo_m4.d
 
 //Emit even when used just in function type
 import fncOnly_m4 = require("importDecl_require2");
@@ -92,9 +92,9 @@ import fncOnly_m4 = require("importDecl_require2");
 export var useFncOnly_m4_f4 = fncOnly_m4.foo();
 >useFncOnly_m4_f4 : fncOnly_m4.d
 >fncOnly_m4.foo() : fncOnly_m4.d
->fncOnly_m4.foo : typeof fncOnly_m4.foo
+>fncOnly_m4.foo : () => fncOnly_m4.d
 >fncOnly_m4 : typeof fncOnly_m4
->foo : typeof fncOnly_m4.foo
+>foo : () => fncOnly_m4.d
 
 // only used privately no need to emit
 import private_m4 = require("importDecl_require3");
@@ -118,9 +118,9 @@ export module usePrivate_m4_m1 {
     var f3 = private_m4.foo();
 >f3 : private_m4.d
 >private_m4.foo() : private_m4.d
->private_m4.foo : typeof private_m4.foo
+>private_m4.foo : () => private_m4.d
 >private_m4 : typeof private_m4
->foo : typeof private_m4.foo
+>foo : () => private_m4.d
 }
 
 // Do not emit unused import
@@ -130,9 +130,9 @@ import m5 = require("importDecl_require4");
 export var d = m5.foo2();
 >d : m4.d
 >m5.foo2() : m4.d
->m5.foo2 : typeof m5.foo2
+>m5.foo2 : () => m4.d
 >m5 : typeof m5
->foo2 : typeof m5.foo2
+>foo2 : () => m4.d
 
 // Do not emit multiple used import statements
 import multiImport_m4 = require("importDecl_require"); // Emit used
@@ -153,9 +153,9 @@ export var useMultiImport_m4_d4 = multiImport_m4.d;
 export var useMultiImport_m4_f4 = multiImport_m4.foo();
 >useMultiImport_m4_f4 : m4.d
 >multiImport_m4.foo() : m4.d
->multiImport_m4.foo : typeof m4.foo
+>multiImport_m4.foo : () => m4.d
 >multiImport_m4 : typeof m4
->foo : typeof m4.foo
+>foo : () => m4.d
 
 === tests/cases/compiler/importDecl_require.ts ===
 export class d {
@@ -169,7 +169,7 @@ export var x: d;
 >d : d
 
 export function foo(): d { return null; }
->foo : typeof foo
+>foo : () => d
 >d : d
 
 === tests/cases/compiler/importDecl_require1.ts ===
@@ -184,7 +184,7 @@ var x: d;
 >d : d
 
 export function foo(): d { return null; }
->foo : typeof foo
+>foo : () => d
 >d : d
 
 === tests/cases/compiler/importDecl_require2.ts ===
@@ -199,7 +199,7 @@ export var x: d;
 >d : d
 
 export function foo(): d { return null; }
->foo : typeof foo
+>foo : () => d
 >d : d
 
 === tests/cases/compiler/importDecl_require3.ts ===
@@ -214,7 +214,7 @@ export var x: d;
 >d : d
 
 export function foo(): d { return null; }
->foo : typeof foo
+>foo : () => d
 >d : d
 
 === tests/cases/compiler/importDecl_require4.ts ===
@@ -222,7 +222,7 @@ import m4 = require("importDecl_require");
 >m4 : typeof m4
 
 export function foo2(): m4.d { return null; }
->foo2 : typeof foo2
+>foo2 : () => m4.d
 >m4 : unknown
 >d : m4.d
 
diff --git a/tests/baselines/reference/importStatements.types b/tests/baselines/reference/importStatements.types
index 68038e93a5b..5980a142f34 100644
--- a/tests/baselines/reference/importStatements.types
+++ b/tests/baselines/reference/importStatements.types
@@ -73,7 +73,7 @@ module E {
 >A : typeof a
 
     export function xDist(x: a.Point) {
->xDist : typeof xDist
+>xDist : (x: a.Point) => number
 >x : a.Point
 >a : unknown
 >Point : a.Point
diff --git a/tests/baselines/reference/inOperatorWithValidOperands.types b/tests/baselines/reference/inOperatorWithValidOperands.types
index f2c4d903d1d..f621c3bf55d 100644
--- a/tests/baselines/reference/inOperatorWithValidOperands.types
+++ b/tests/baselines/reference/inOperatorWithValidOperands.types
@@ -56,7 +56,7 @@ var rb2 = x in {};
 >{} : {}
 
 function foo<T>(t: T) {
->foo : typeof foo
+>foo : <T>(t: T) => void
 >T : T
 >t : T
 >T : T
diff --git a/tests/baselines/reference/indexSignaturesInferentialTyping.types b/tests/baselines/reference/indexSignaturesInferentialTyping.types
index a59c8e930ea..3c16db3a2bf 100644
--- a/tests/baselines/reference/indexSignaturesInferentialTyping.types
+++ b/tests/baselines/reference/indexSignaturesInferentialTyping.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/indexSignaturesInferentialTyping.ts ===
 function foo<T>(items: { [index: number]: T }): T { return undefined; }
->foo : typeof foo
+>foo : <T>(items: { [x: number]: T; }) => T
 >T : T
 >items : { [x: number]: T; }
 >index : number
@@ -9,7 +9,7 @@ function foo<T>(items: { [index: number]: T }): T { return undefined; }
 >undefined : undefined
 
 function bar<T>(items: { [index: string]: T }): T { return undefined; }
->bar : typeof bar
+>bar : <T>(items: { [x: string]: T; }) => T
 >T : T
 >items : { [x: string]: T; }
 >index : string
@@ -20,13 +20,13 @@ function bar<T>(items: { [index: string]: T }): T { return undefined; }
 var x1 = foo({ 0: 0, 1: 1 });       // type should be number
 >x1 : number
 >foo({ 0: 0, 1: 1 }) : number
->foo : typeof foo
+>foo : <T>(items: { [x: number]: T; }) => T
 >{ 0: 0, 1: 1 } : { [x: number]: number; 0: number; 1: number; }
 
 var x2 = foo({ zero: 0, one: 1 });
 >x2 : {}
 >foo({ zero: 0, one: 1 }) : {}
->foo : typeof foo
+>foo : <T>(items: { [x: number]: T; }) => T
 >{ zero: 0, one: 1 } : { [x: number]: {}; zero: number; one: number; }
 >zero : number
 >one : number
@@ -34,13 +34,13 @@ var x2 = foo({ zero: 0, one: 1 });
 var x3 = bar({ 0: 0, 1: 1 });
 >x3 : number
 >bar({ 0: 0, 1: 1 }) : number
->bar : typeof bar
+>bar : <T>(items: { [x: string]: T; }) => T
 >{ 0: 0, 1: 1 } : { [x: string]: number; 0: number; 1: number; }
 
 var x4 = bar({ zero: 0, one: 1 });  // type should be number
 >x4 : number
 >bar({ zero: 0, one: 1 }) : number
->bar : typeof bar
+>bar : <T>(items: { [x: string]: T; }) => T
 >{ zero: 0, one: 1 } : { [x: string]: number; zero: number; one: number; }
 >zero : number
 >one : number
diff --git a/tests/baselines/reference/inferTypeArgumentsInSignatureWithRestParameters.types b/tests/baselines/reference/inferTypeArgumentsInSignatureWithRestParameters.types
index 3f985ac3413..5bf41c64b24 100644
--- a/tests/baselines/reference/inferTypeArgumentsInSignatureWithRestParameters.types
+++ b/tests/baselines/reference/inferTypeArgumentsInSignatureWithRestParameters.types
@@ -1,25 +1,25 @@
 === tests/cases/compiler/inferTypeArgumentsInSignatureWithRestParameters.ts ===
 function f<T>(array: T[], ...args) { }
->f : typeof f
+>f : <T>(array: T[], ...args: any[]) => void
 >T : T
 >array : T[]
 >T : T
 >args : any[]
 
 function g(array: number[], ...args) { }
->g : typeof g
+>g : (array: number[], ...args: any[]) => void
 >array : number[]
 >args : any[]
 
 function h<T>(nonarray: T, ...args) { }
->h : typeof h
+>h : <T>(nonarray: T, ...args: any[]) => void
 >T : T
 >nonarray : T
 >T : T
 >args : any[]
 
 function i<T>(array: T[], opt?: any[]) { }
->i : typeof i
+>i : <T>(array: T[], opt?: any[]) => void
 >T : T
 >array : T[]
 >T : T
@@ -31,21 +31,21 @@ var a = [1, 2, 3, 4, 5];
 
 f(a); // OK
 >f(a) : void
->f : typeof f
+>f : <T>(array: T[], ...args: any[]) => void
 >a : number[]
 
 g(a); // OK
 >g(a) : void
->g : typeof g
+>g : (array: number[], ...args: any[]) => void
 >a : number[]
 
 h(a); // OK
 >h(a) : void
->h : typeof h
+>h : <T>(nonarray: T, ...args: any[]) => void
 >a : number[]
 
 i(a); // OK
 >i(a) : void
->i : typeof i
+>i : <T>(array: T[], opt?: any[]) => void
 >a : number[]
 
diff --git a/tests/baselines/reference/inferentialTypingWithFunctionType.types b/tests/baselines/reference/inferentialTypingWithFunctionType.types
index 44312c331f7..9f1986c49ea 100644
--- a/tests/baselines/reference/inferentialTypingWithFunctionType.types
+++ b/tests/baselines/reference/inferentialTypingWithFunctionType.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/inferentialTypingWithFunctionType.ts ===
 declare function map<T, U>(x: T, f: (s: T) => U): U;
->map : typeof map
+>map : <T, U>(x: T, f: (s: T) => U) => U
 >T : T
 >U : U
 >x : T
@@ -12,7 +12,7 @@ declare function map<T, U>(x: T, f: (s: T) => U): U;
 >U : U
 
 declare function identity<V>(y: V): V;
->identity : typeof identity
+>identity : <V>(y: V) => V
 >V : V
 >y : V
 >V : V
@@ -21,6 +21,6 @@ declare function identity<V>(y: V): V;
 var s = map("", identity);
 >s : string
 >map("", identity) : string
->map : typeof map
->identity : typeof identity
+>map : <T, U>(x: T, f: (s: T) => U) => U
+>identity : <V>(y: V) => V
 
diff --git a/tests/baselines/reference/inferentialTypingWithFunctionType2.types b/tests/baselines/reference/inferentialTypingWithFunctionType2.types
index 81b74406ae2..a97bf2ab36c 100644
--- a/tests/baselines/reference/inferentialTypingWithFunctionType2.types
+++ b/tests/baselines/reference/inferentialTypingWithFunctionType2.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/inferentialTypingWithFunctionType2.ts ===
 function identity<A>(a: A): A {
->identity : typeof identity
+>identity : <A>(a: A) => A
 >A : A
 >a : A
 >A : A
@@ -16,5 +16,5 @@ var x = [1, 2, 3].map(identity)[0];
 >[1, 2, 3].map : <U>(callbackfn: (value: number, index: number, array: number[]) => U, thisArg?: any) => U[]
 >[1, 2, 3] : number[]
 >map : <U>(callbackfn: (value: number, index: number, array: number[]) => U, thisArg?: any) => U[]
->identity : typeof identity
+>identity : <A>(a: A) => A
 
diff --git a/tests/baselines/reference/inferentialTypingWithFunctionTypeNested.types b/tests/baselines/reference/inferentialTypingWithFunctionTypeNested.types
index 6f50f04bd6d..0596081ade3 100644
--- a/tests/baselines/reference/inferentialTypingWithFunctionTypeNested.types
+++ b/tests/baselines/reference/inferentialTypingWithFunctionTypeNested.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/inferentialTypingWithFunctionTypeNested.ts ===
 declare function map<T, U>(x: T, f: () => { x: (s: T) => U }): U;
->map : typeof map
+>map : <T, U>(x: T, f: () => { x: (s: T) => U; }) => U
 >T : T
 >U : U
 >x : T
@@ -13,7 +13,7 @@ declare function map<T, U>(x: T, f: () => { x: (s: T) => U }): U;
 >U : U
 
 declare function identity<V>(y: V): V;
->identity : typeof identity
+>identity : <V>(y: V) => V
 >V : V
 >y : V
 >V : V
@@ -22,9 +22,9 @@ declare function identity<V>(y: V): V;
 var s = map("", () => { return { x: identity }; });
 >s : any
 >map("", () => { return { x: identity }; }) : any
->map : typeof map
->() => { return { x: identity }; } : () => { x: typeof identity; }
->{ x: identity } : { x: typeof identity; }
->x : typeof identity
->identity : typeof identity
+>map : <T, U>(x: T, f: () => { x: (s: T) => U; }) => U
+>() => { return { x: identity }; } : () => { x: <V>(y: V) => V; }
+>{ x: identity } : { x: <V>(y: V) => V; }
+>x : <V>(y: V) => V
+>identity : <V>(y: V) => V
 
diff --git a/tests/baselines/reference/inferentialTypingWithFunctionTypeSyntacticScenarios.types b/tests/baselines/reference/inferentialTypingWithFunctionTypeSyntacticScenarios.types
index b8754ee1a1d..115da50176f 100644
--- a/tests/baselines/reference/inferentialTypingWithFunctionTypeSyntacticScenarios.types
+++ b/tests/baselines/reference/inferentialTypingWithFunctionTypeSyntacticScenarios.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/inferentialTypingWithFunctionTypeSyntacticScenarios.ts ===
 declare function map<T, U>(array: T, func: (x: T) => U): U;
->map : typeof map
+>map : <T, U>(array: T, func: (x: T) => U) => U
 >T : T
 >U : U
 >array : T
@@ -12,7 +12,7 @@ declare function map<T, U>(array: T, func: (x: T) => U): U;
 >U : U
 
 declare function identity<V>(y: V): V;
->identity : typeof identity
+>identity : <V>(y: V) => V
 >V : V
 >y : V
 >V : V
@@ -23,46 +23,46 @@ var s: string;
 
 // dotted name
 var dottedIdentity = { x: identity };
->dottedIdentity : { x: typeof identity; }
->{ x: identity } : { x: typeof identity; }
->x : typeof identity
->identity : typeof identity
+>dottedIdentity : { x: <V>(y: V) => V; }
+>{ x: identity } : { x: <V>(y: V) => V; }
+>x : <V>(y: V) => V
+>identity : <V>(y: V) => V
 
 s = map("", dottedIdentity.x);
 >s = map("", dottedIdentity.x) : string
 >s : string
 >map("", dottedIdentity.x) : string
->map : typeof map
->dottedIdentity.x : typeof identity
->dottedIdentity : { x: typeof identity; }
->x : typeof identity
+>map : <T, U>(array: T, func: (x: T) => U) => U
+>dottedIdentity.x : <V>(y: V) => V
+>dottedIdentity : { x: <V>(y: V) => V; }
+>x : <V>(y: V) => V
 
 // index expression
 s = map("", dottedIdentity['x']);
 >s = map("", dottedIdentity['x']) : string
 >s : string
 >map("", dottedIdentity['x']) : string
->map : typeof map
->dottedIdentity['x'] : typeof identity
->dottedIdentity : { x: typeof identity; }
+>map : <T, U>(array: T, func: (x: T) => U) => U
+>dottedIdentity['x'] : <V>(y: V) => V
+>dottedIdentity : { x: <V>(y: V) => V; }
 
 // function call
 s = map("", (() => identity)());
 >s = map("", (() => identity)()) : string
 >s : string
 >map("", (() => identity)()) : string
->map : typeof map
->(() => identity)() : typeof identity
->(() => identity) : () => typeof identity
->() => identity : () => typeof identity
->identity : typeof identity
+>map : <T, U>(array: T, func: (x: T) => U) => U
+>(() => identity)() : <V>(y: V) => V
+>(() => identity) : () => <V>(y: V) => V
+>() => identity : () => <V>(y: V) => V
+>identity : <V>(y: V) => V
 
 // construct
 interface IdentityConstructor {
 >IdentityConstructor : IdentityConstructor
 
     new (): typeof identity;
->identity : typeof identity
+>identity : <V>(y: V) => V
 }
 var ic: IdentityConstructor;
 >ic : IdentityConstructor
@@ -72,8 +72,8 @@ s = map("", new ic());
 >s = map("", new ic()) : string
 >s : string
 >map("", new ic()) : string
->map : typeof map
->new ic() : typeof identity
+>map : <T, U>(array: T, func: (x: T) => U) => U
+>new ic() : <V>(y: V) => V
 >ic : IdentityConstructor
 
 // assignment
@@ -84,37 +84,37 @@ s = map("", t = identity);
 >s = map("", t = identity) : string
 >s : string
 >map("", t = identity) : string
->map : typeof map
->t = identity : typeof identity
+>map : <T, U>(array: T, func: (x: T) => U) => U
+>t = identity : <V>(y: V) => V
 >t : any
->identity : typeof identity
+>identity : <V>(y: V) => V
 
 // type assertion
 s = map("", <typeof identity>identity);
 >s = map("", <typeof identity>identity) : string
 >s : string
 >map("", <typeof identity>identity) : string
->map : typeof map
-><typeof identity>identity : typeof identity
->identity : typeof identity
->identity : typeof identity
+>map : <T, U>(array: T, func: (x: T) => U) => U
+><typeof identity>identity : <V>(y: V) => V
+>identity : <V>(y: V) => V
+>identity : <V>(y: V) => V
 
 // parenthesized expression
 s = map("", (identity));
 >s = map("", (identity)) : string
 >s : string
 >map("", (identity)) : string
->map : typeof map
->(identity) : typeof identity
->identity : typeof identity
+>map : <T, U>(array: T, func: (x: T) => U) => U
+>(identity) : <V>(y: V) => V
+>identity : <V>(y: V) => V
 
 // comma
 s = map("", ("", identity));
 >s = map("", ("", identity)) : string
 >s : string
 >map("", ("", identity)) : string
->map : typeof map
->("", identity) : typeof identity
->"", identity : typeof identity
->identity : typeof identity
+>map : <T, U>(array: T, func: (x: T) => U) => U
+>("", identity) : <V>(y: V) => V
+>"", identity : <V>(y: V) => V
+>identity : <V>(y: V) => V
 
diff --git a/tests/baselines/reference/inferentiallyTypingAnEmptyArray.types b/tests/baselines/reference/inferentiallyTypingAnEmptyArray.types
index bd35eaac96e..c8f51c985e6 100644
--- a/tests/baselines/reference/inferentiallyTypingAnEmptyArray.types
+++ b/tests/baselines/reference/inferentiallyTypingAnEmptyArray.types
@@ -15,7 +15,7 @@
 // Therefore, the following access to bar should not cause an error because we infer
 // the undefined[] type.
 declare function foo<T>(arr: T[]): T;
->foo : typeof foo
+>foo : <T>(arr: T[]) => T
 >T : T
 >arr : T[]
 >T : T
@@ -24,7 +24,7 @@ declare function foo<T>(arr: T[]): T;
 foo([]).bar;
 >foo([]).bar : any
 >foo([]) : any
->foo : typeof foo
+>foo : <T>(arr: T[]) => T
 >[] : any[]
 >bar : any
 
diff --git a/tests/baselines/reference/infiniteExpansionThroughTypeInference.types b/tests/baselines/reference/infiniteExpansionThroughTypeInference.types
index 69c705ca5b0..df818833aa0 100644
--- a/tests/baselines/reference/infiniteExpansionThroughTypeInference.types
+++ b/tests/baselines/reference/infiniteExpansionThroughTypeInference.types
@@ -15,7 +15,7 @@ interface G<T> {
 }
 
 function ff<T>(g: G<T>): void {
->ff : typeof ff
+>ff : <T>(g: G<T>) => void
 >T : T
 >g : G<T>
 >G : G<T>
@@ -23,7 +23,7 @@ function ff<T>(g: G<T>): void {
 
     ff(g) // when infering T here we need to make sure to not descend into the structure of G<T> infinitely
 >ff(g) : void
->ff : typeof ff
+>ff : <T>(g: G<T>) => void
 >g : G<T>
 }
 
diff --git a/tests/baselines/reference/infinitelyExpandingTypes5.types b/tests/baselines/reference/infinitelyExpandingTypes5.types
index 7c1ba26a7cf..f145ff9539f 100644
--- a/tests/baselines/reference/infinitelyExpandingTypes5.types
+++ b/tests/baselines/reference/infinitelyExpandingTypes5.types
@@ -23,7 +23,7 @@ interface Enumerator<T> {
 }
 
 function from<T>(array: T[]): Query<T>;
->from : typeof from
+>from : { <T>(array: T[]): Query<T>; <T>(enumerator: Enumerator<T>): Query<T>; }
 >T : T
 >array : T[]
 >T : T
@@ -31,7 +31,7 @@ function from<T>(array: T[]): Query<T>;
 >T : T
 
 function from<T>(enumerator: Enumerator<T>): Query<T>;
->from : typeof from
+>from : { <T>(array: T[]): Query<T>; <T>(enumerator: Enumerator<T>): Query<T>; }
 >T : T
 >enumerator : Enumerator<T>
 >Enumerator : Enumerator<T>
@@ -40,7 +40,7 @@ function from<T>(enumerator: Enumerator<T>): Query<T>;
 >T : T
 
 function from(arg: any): any {
->from : typeof from
+>from : { <T>(array: T[]): Query<T>; <T>(enumerator: Enumerator<T>): Query<T>; }
 >arg : any
 
     return undefined;
diff --git a/tests/baselines/reference/infinitelyExpandingTypesNonGenericBase.types b/tests/baselines/reference/infinitelyExpandingTypesNonGenericBase.types
index 9a86ce3e8cd..9190ef15779 100644
--- a/tests/baselines/reference/infinitelyExpandingTypesNonGenericBase.types
+++ b/tests/baselines/reference/infinitelyExpandingTypesNonGenericBase.types
@@ -44,13 +44,13 @@ interface Options<T> extends OptionsBase<T> {
 
 
 function o(type: new () => Base) {
->o : typeof o
+>o : (type: new () => Base) => void
 >type : new () => Base
 >Base : Base
 }
 
 o(A);
 >o(A) : void
->o : typeof o
+>o : (type: new () => Base) => void
 >A : typeof A
 
diff --git a/tests/baselines/reference/inheritedFunctionAssignmentCompatibility.types b/tests/baselines/reference/inheritedFunctionAssignmentCompatibility.types
index 2dc52065feb..c24c0545c3e 100644
--- a/tests/baselines/reference/inheritedFunctionAssignmentCompatibility.types
+++ b/tests/baselines/reference/inheritedFunctionAssignmentCompatibility.types
@@ -4,20 +4,20 @@ interface IResultCallback extends Function { }
 >Function : Function
 
 function fn(cb: IResultCallback) { }
->fn : typeof fn
+>fn : (cb: IResultCallback) => void
 >cb : IResultCallback
 >IResultCallback : IResultCallback
 
 fn((a, b) => true);
 >fn((a, b) => true) : void
->fn : typeof fn
+>fn : (cb: IResultCallback) => void
 >(a, b) => true : (a: any, b: any) => boolean
 >a : any
 >b : any
 
 fn(function (a, b) { return true; })
 >fn(function (a, b) { return true; }) : void
->fn : typeof fn
+>fn : (cb: IResultCallback) => void
 >function (a, b) { return true; } : (a: any, b: any) => boolean
 >a : any
 >b : any
diff --git a/tests/baselines/reference/innerAliases2.types b/tests/baselines/reference/innerAliases2.types
index e7508d46ba9..ee8c18f93b4 100644
--- a/tests/baselines/reference/innerAliases2.types
+++ b/tests/baselines/reference/innerAliases2.types
@@ -24,7 +24,7 @@ module consumer {
 >UsefulClass : provider.UsefulClass
                 
                 function use():provider.UsefulClass { 
->use : typeof use
+>use : () => provider.UsefulClass
 >provider : unknown
 >UsefulClass : provider.UsefulClass
 
diff --git a/tests/baselines/reference/innerFunc.types b/tests/baselines/reference/innerFunc.types
index 7725f0c2928..8ca9e9d0a0b 100644
--- a/tests/baselines/reference/innerFunc.types
+++ b/tests/baselines/reference/innerFunc.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/innerFunc.ts ===
 function salt() {
->salt : typeof salt
+>salt : () => number
 
   function pepper() { return 5;}
 >pepper : () => number
@@ -14,7 +14,7 @@ module M {
 >M : typeof M
 
     export function tungsten() {
->tungsten : typeof tungsten
+>tungsten : () => number
 
         function oxygen() { return 6; };
 >oxygen : () => number
diff --git a/tests/baselines/reference/innerOverloads.types b/tests/baselines/reference/innerOverloads.types
index 5c5194e7de1..7168f6161f3 100644
--- a/tests/baselines/reference/innerOverloads.types
+++ b/tests/baselines/reference/innerOverloads.types
@@ -1,7 +1,7 @@
 === tests/cases/compiler/innerOverloads.ts ===
 
 function outer() {
->outer : typeof outer
+>outer : () => any
 
     function inner(x:number); // should work
 >inner : { (x: number): any; (x: string): any; }
@@ -24,6 +24,6 @@ function outer() {
 var x = outer(); // should work
 >x : any
 >outer() : any
->outer : typeof outer
+>outer : () => any
 
 
diff --git a/tests/baselines/reference/innerTypeArgumentInference.types b/tests/baselines/reference/innerTypeArgumentInference.types
index d9f9c2c5dd8..759b78aa75f 100644
--- a/tests/baselines/reference/innerTypeArgumentInference.types
+++ b/tests/baselines/reference/innerTypeArgumentInference.types
@@ -5,7 +5,7 @@ interface Generator<T> { (): T; }
 >T : T
 
 function Generate<U>(func: Generator<U>): U {
->Generate : typeof Generate
+>Generate : <U>(func: Generator<U>) => U
 >U : U
 >func : Generator<U>
 >Generator : Generator<T>
@@ -14,6 +14,6 @@ function Generate<U>(func: Generator<U>): U {
 
     return Generate(func);
 >Generate(func) : U
->Generate : typeof Generate
+>Generate : <U>(func: Generator<U>) => U
 >func : Generator<U>
 }
diff --git a/tests/baselines/reference/innerTypeParameterShadowingOuterOne.types b/tests/baselines/reference/innerTypeParameterShadowingOuterOne.types
index bdd687e727b..eb1ffb17217 100644
--- a/tests/baselines/reference/innerTypeParameterShadowingOuterOne.types
+++ b/tests/baselines/reference/innerTypeParameterShadowingOuterOne.types
@@ -3,7 +3,7 @@
 // no errors expected
 
 function f<T extends Date>() {
->f : typeof f
+>f : <T extends Date>() => void
 >T : T
 >Date : Date
 
@@ -34,7 +34,7 @@ function f<T extends Date>() {
 }
 
 function f2<T extends Date, U extends Date>() {
->f2 : typeof f2
+>f2 : <T extends Date, U extends Date>() => void
 >T : T
 >Date : Date
 >U : U
diff --git a/tests/baselines/reference/instanceOfInExternalModules.types b/tests/baselines/reference/instanceOfInExternalModules.types
index f0c85b2a4db..6e2eb8c77aa 100644
--- a/tests/baselines/reference/instanceOfInExternalModules.types
+++ b/tests/baselines/reference/instanceOfInExternalModules.types
@@ -4,7 +4,7 @@ import Bar = require("instanceOfInExternalModules_require");
 >Bar : typeof Bar
 
 function IsFoo(value: any): boolean {
->IsFoo : typeof IsFoo
+>IsFoo : (value: any) => boolean
 >value : any
 
     return value instanceof Bar.Foo;
diff --git a/tests/baselines/reference/instanceofOperatorWithLHSIsTypeParameter.types b/tests/baselines/reference/instanceofOperatorWithLHSIsTypeParameter.types
index ec6c9e3963f..d10c6c5cafa 100644
--- a/tests/baselines/reference/instanceofOperatorWithLHSIsTypeParameter.types
+++ b/tests/baselines/reference/instanceofOperatorWithLHSIsTypeParameter.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/expressions/binaryOperators/instanceofOperator/instanceofOperatorWithLHSIsTypeParameter.ts ===
 function foo<T>(t: T) {
->foo : typeof foo
+>foo : <T>(t: T) => void
 >T : T
 >t : T
 >T : T
diff --git a/tests/baselines/reference/interMixingModulesInterfaces0.types b/tests/baselines/reference/interMixingModulesInterfaces0.types
index 8b6ace37a2b..977b02e15e8 100644
--- a/tests/baselines/reference/interMixingModulesInterfaces0.types
+++ b/tests/baselines/reference/interMixingModulesInterfaces0.types
@@ -6,7 +6,7 @@ module A {
 >B : typeof B
 
         export function createB(): B {
->createB : typeof createB
+>createB : () => B
 >B : B
 
             return null;
@@ -29,9 +29,9 @@ var x: A.B = A.B.createB();
 >A : unknown
 >B : A.B
 >A.B.createB() : A.B
->A.B.createB : typeof A.B.createB
+>A.B.createB : () => A.B
 >A.B : typeof A.B
 >A : typeof A
 >B : typeof A.B
->createB : typeof A.B.createB
+>createB : () => A.B
 
diff --git a/tests/baselines/reference/interMixingModulesInterfaces1.types b/tests/baselines/reference/interMixingModulesInterfaces1.types
index 9df1c8fe069..c94cc80e5bf 100644
--- a/tests/baselines/reference/interMixingModulesInterfaces1.types
+++ b/tests/baselines/reference/interMixingModulesInterfaces1.types
@@ -16,7 +16,7 @@ module A {
 >B : typeof B
 
         export function createB(): B {
->createB : typeof createB
+>createB : () => B
 >B : B
 
             return null;
@@ -29,9 +29,9 @@ var x: A.B = A.B.createB();
 >A : unknown
 >B : A.B
 >A.B.createB() : A.B
->A.B.createB : typeof A.B.createB
+>A.B.createB : () => A.B
 >A.B : typeof A.B
 >A : typeof A
 >B : typeof A.B
->createB : typeof A.B.createB
+>createB : () => A.B
 
diff --git a/tests/baselines/reference/interMixingModulesInterfaces2.types b/tests/baselines/reference/interMixingModulesInterfaces2.types
index 1d8af83003f..ff21c25358b 100644
--- a/tests/baselines/reference/interMixingModulesInterfaces2.types
+++ b/tests/baselines/reference/interMixingModulesInterfaces2.types
@@ -16,7 +16,7 @@ module A {
 >B : typeof B
 
         export function createB(): B {
->createB : typeof createB
+>createB : () => B
 >B : B
 
             return null;
diff --git a/tests/baselines/reference/interMixingModulesInterfaces3.types b/tests/baselines/reference/interMixingModulesInterfaces3.types
index acb09eb1a7a..123d609c365 100644
--- a/tests/baselines/reference/interMixingModulesInterfaces3.types
+++ b/tests/baselines/reference/interMixingModulesInterfaces3.types
@@ -6,7 +6,7 @@ module A {
 >B : typeof B
 
         export function createB(): B {
->createB : typeof createB
+>createB : () => B
 >B : B
 
             return null;
diff --git a/tests/baselines/reference/interMixingModulesInterfaces4.types b/tests/baselines/reference/interMixingModulesInterfaces4.types
index 9eb9905a1d2..e4e9bf385ac 100644
--- a/tests/baselines/reference/interMixingModulesInterfaces4.types
+++ b/tests/baselines/reference/interMixingModulesInterfaces4.types
@@ -6,7 +6,7 @@ module A {
 >B : typeof B
 
         export function createB(): number {
->createB : typeof createB
+>createB : () => number
 
             return null;
         }
@@ -26,9 +26,9 @@ module A {
 var x : number = A.B.createB();
 >x : number
 >A.B.createB() : number
->A.B.createB : typeof A.B.createB
+>A.B.createB : () => number
 >A.B : typeof A.B
 >A : typeof A
 >B : typeof A.B
->createB : typeof A.B.createB
+>createB : () => number
 
diff --git a/tests/baselines/reference/interMixingModulesInterfaces5.types b/tests/baselines/reference/interMixingModulesInterfaces5.types
index c90a4236dbb..199b37b16eb 100644
--- a/tests/baselines/reference/interMixingModulesInterfaces5.types
+++ b/tests/baselines/reference/interMixingModulesInterfaces5.types
@@ -16,7 +16,7 @@ module A {
 >B : typeof B
 
         export function createB(): number {
->createB : typeof createB
+>createB : () => number
 
             return null;
         }
@@ -26,9 +26,9 @@ module A {
 var x: number = A.B.createB();
 >x : number
 >A.B.createB() : number
->A.B.createB : typeof A.B.createB
+>A.B.createB : () => number
 >A.B : typeof A.B
 >A : typeof A
 >B : typeof A.B
->createB : typeof A.B.createB
+>createB : () => number
 
diff --git a/tests/baselines/reference/interfaceWithPropertyOfEveryType.types b/tests/baselines/reference/interfaceWithPropertyOfEveryType.types
index 94401aabc84..69ad29374a2 100644
--- a/tests/baselines/reference/interfaceWithPropertyOfEveryType.types
+++ b/tests/baselines/reference/interfaceWithPropertyOfEveryType.types
@@ -4,7 +4,7 @@ class C { foo: string; }
 >foo : string
 
 function f1() { }
->f1 : typeof f1
+>f1 : () => void
 
 module M {
 >M : typeof M
@@ -61,8 +61,8 @@ interface Foo {
 >C : C
 
     l: typeof f1;
->l : typeof f1
->f1 : typeof f1
+>l : () => void
+>f1 : () => void
 
     m: typeof M;
 >m : typeof M
@@ -79,7 +79,7 @@ interface Foo {
 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: boolean; d: {}; e: null; f: number[]; g: {}; h: (x: number) => number; i: <T>(x: T) => T; j: Foo; k: C; l: typeof f1; m: typeof M; n: {}; o: E; }
+>{    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: boolean; 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,
 >a : number
@@ -129,8 +129,8 @@ var a: Foo = {
 >C : typeof C
 
     l: f1,
->l : typeof f1
->f1 : typeof f1
+>l : () => void
+>f1 : () => void
 
     m: M,
 >m : typeof M
diff --git a/tests/baselines/reference/internalAliasFunction.types b/tests/baselines/reference/internalAliasFunction.types
index f0dc1619b24..ed297ce1b4e 100644
--- a/tests/baselines/reference/internalAliasFunction.types
+++ b/tests/baselines/reference/internalAliasFunction.types
@@ -3,7 +3,7 @@ module a {
 >a : typeof a
 
     export function foo(x: number) {
->foo : typeof foo
+>foo : (x: number) => number
 >x : number
 
         return x;
@@ -15,17 +15,17 @@ module c {
 >c : typeof c
 
     import b = a.foo;
->b : typeof b
+>b : (x: number) => number
 >a : typeof a
->foo : typeof b
+>foo : (x: number) => number
 
     export var bVal = b(10);
 >bVal : number
 >b(10) : number
->b : typeof b
+>b : (x: number) => number
 
     export var bVal2 = b;
->bVal2 : typeof b
->b : typeof b
+>bVal2 : (x: number) => number
+>b : (x: number) => number
 }
 
diff --git a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithExport.types b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithExport.types
index dd9637c8fdf..b3140e7b09a 100644
--- a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithExport.types
+++ b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithExport.types
@@ -3,7 +3,7 @@ export module a {
 >a : typeof a
 
     export function foo(x: number) {
->foo : typeof foo
+>foo : (x: number) => number
 >x : number
 
         return x;
@@ -15,17 +15,17 @@ export module c {
 >c : typeof c
 
     export import b = a.foo;
->b : typeof b
+>b : (x: number) => number
 >a : typeof a
->foo : typeof b
+>foo : (x: number) => number
 
     export var bVal = b(10);
 >bVal : number
 >b(10) : number
->b : typeof b
+>b : (x: number) => number
 
     export var bVal2 = b;
->bVal2 : typeof b
->b : typeof b
+>bVal2 : (x: number) => number
+>b : (x: number) => number
 }
 
diff --git a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExport.types b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExport.types
index 179025bffb3..c78b5040495 100644
--- a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExport.types
+++ b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExport.types
@@ -3,7 +3,7 @@ export module a {
 >a : typeof a
 
     export function foo(x: number) {
->foo : typeof foo
+>foo : (x: number) => number
 >x : number
 
         return x;
@@ -15,17 +15,17 @@ export module c {
 >c : typeof c
 
     import b = a.foo;
->b : typeof b
+>b : (x: number) => number
 >a : typeof a
->foo : typeof b
+>foo : (x: number) => number
 
     var bVal = b(10);
 >bVal : number
 >b(10) : number
->b : typeof b
+>b : (x: number) => number
 
     export var bVal2 = b;
->bVal2 : typeof b
->b : typeof b
+>bVal2 : (x: number) => number
+>b : (x: number) => number
 }
 
diff --git a/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithExport.types b/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithExport.types
index 0db9210378d..365f0edeb27 100644
--- a/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithExport.types
+++ b/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithExport.types
@@ -3,7 +3,7 @@ export module a {
 >a : typeof a
 
     export function foo(x: number) {
->foo : typeof foo
+>foo : (x: number) => number
 >x : number
 
         return x;
@@ -12,16 +12,16 @@ export module a {
 }
 
 export import b = a.foo;
->b : typeof b
+>b : (x: number) => number
 >a : typeof a
->foo : typeof b
+>foo : (x: number) => number
 
 export var bVal = b(10);
 >bVal : number
 >b(10) : number
->b : typeof b
+>b : (x: number) => number
 
 export var bVal2 = b;
->bVal2 : typeof b
->b : typeof b
+>bVal2 : (x: number) => number
+>b : (x: number) => number
 
diff --git a/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithoutExport.types b/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithoutExport.types
index 316ff673449..c2f06c66f76 100644
--- a/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithoutExport.types
+++ b/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithoutExport.types
@@ -3,7 +3,7 @@ export module a {
 >a : typeof a
 
     export function foo(x: number) {
->foo : typeof foo
+>foo : (x: number) => number
 >x : number
 
         return x;
@@ -12,16 +12,16 @@ export module a {
 }
 
 import b = a.foo;
->b : typeof b
+>b : (x: number) => number
 >a : typeof a
->foo : typeof b
+>foo : (x: number) => number
 
 export var bVal = b(10);
 >bVal : number
 >b(10) : number
->b : typeof b
+>b : (x: number) => number
 
 export var bVal2 = b;
->bVal2 : typeof b
->b : typeof b
+>bVal2 : (x: number) => number
+>b : (x: number) => number
 
diff --git a/tests/baselines/reference/invalidUndefinedValues.types b/tests/baselines/reference/invalidUndefinedValues.types
index 3824498d216..9cc71b87c82 100644
--- a/tests/baselines/reference/invalidUndefinedValues.types
+++ b/tests/baselines/reference/invalidUndefinedValues.types
@@ -75,7 +75,7 @@ x = { f() { } }
 >f() { } : () => void
 
 function f<T>(a: T) {
->f : typeof f
+>f : <T>(a: T) => void
 >T : T
 >a : T
 >T : T
@@ -86,9 +86,9 @@ function f<T>(a: T) {
 >a : T
 }
 x = f;
->x = f : typeof f
+>x = f : <T>(a: T) => void
 >x : any
->f : typeof f
+>f : <T>(a: T) => void
 
 enum E { A }
 >E : E
diff --git a/tests/baselines/reference/lambdaASIEmit.types b/tests/baselines/reference/lambdaASIEmit.types
index 07b4431e519..b72a805cd12 100644
--- a/tests/baselines/reference/lambdaASIEmit.types
+++ b/tests/baselines/reference/lambdaASIEmit.types
@@ -1,14 +1,14 @@
 === tests/cases/compiler/lambdaASIEmit.ts ===
 
 function Foo(x: any)
->Foo : typeof Foo
+>Foo : (x: any) => void
 >x : any
 {
 }
  
 Foo(() =>
 >Foo(() =>    // do something    127) : void
->Foo : typeof Foo
+>Foo : (x: any) => void
 >() =>    // do something    127 : () => number
 
     // do something
diff --git a/tests/baselines/reference/listFailure.types b/tests/baselines/reference/listFailure.types
index cd235e53986..de3c33bbfad 100644
--- a/tests/baselines/reference/listFailure.types
+++ b/tests/baselines/reference/listFailure.types
@@ -10,7 +10,7 @@ module Editor {
 >List : List<T>
 >Line : Line
 >ListMakeHead<Line>() : List<Line>
->ListMakeHead : typeof ListMakeHead
+>ListMakeHead : <U>() => List<U>
 >Line : Line
         
         addLine(lineText: string): List<Line> {
@@ -41,7 +41,7 @@ module Editor {
     }
     
     export function ListRemoveEntry<U>(entry: List<U>): List<U> { 
->ListRemoveEntry : typeof ListRemoveEntry
+>ListRemoveEntry : <U>(entry: List<U>) => List<U>
 >U : U
 >entry : List<U>
 >List : List<T>
@@ -54,7 +54,7 @@ module Editor {
     }
 
     export function ListMakeHead<U>(): List<U> {
->ListMakeHead : typeof ListMakeHead
+>ListMakeHead : <U>() => List<U>
 >U : U
 >List : List<T>
 >U : U
@@ -63,7 +63,7 @@ module Editor {
     }
 
     export function ListMakeEntry<U>(data: U): List<U> {
->ListMakeEntry : typeof ListMakeEntry
+>ListMakeEntry : <U>(data: U) => List<U>
 >U : U
 >data : U
 >U : U
@@ -95,7 +95,7 @@ module Editor {
 >this : List<T>
 >next : List<T>
 >ListMakeEntry(data) : List<T>
->ListMakeEntry : typeof ListMakeEntry
+>ListMakeEntry : <U>(data: U) => List<U>
 >data : T
 
             return this.next;
@@ -115,7 +115,7 @@ module Editor {
             return (ListRemoveEntry(this.next));
 >(ListRemoveEntry(this.next)) : List<T>
 >ListRemoveEntry(this.next) : List<T>
->ListRemoveEntry : typeof ListRemoveEntry
+>ListRemoveEntry : <U>(entry: List<U>) => List<U>
 >this.next : List<T>
 >this : List<T>
 >next : List<T>
diff --git a/tests/baselines/reference/localImportNameVsGlobalName.types b/tests/baselines/reference/localImportNameVsGlobalName.types
index 6b920a25fe7..7cb45208e81 100644
--- a/tests/baselines/reference/localImportNameVsGlobalName.types
+++ b/tests/baselines/reference/localImportNameVsGlobalName.types
@@ -19,27 +19,27 @@ module App {
 >Key : Key
 
   export function foo(key: Key): void {}
->foo : typeof foo
+>foo : (key: Key) => void
 >key : Key
 >Key : Key
 
   foo(Key.UP);
 >foo(Key.UP) : void
->foo : typeof foo
+>foo : (key: Key) => void
 >Key.UP : Key
 >Key : typeof Key
 >UP : Key
 
   foo(Key.DOWN);
 >foo(Key.DOWN) : void
->foo : typeof foo
+>foo : (key: Key) => void
 >Key.DOWN : Key
 >Key : typeof Key
 >DOWN : Key
 
   foo(Key.LEFT);
 >foo(Key.LEFT) : void
->foo : typeof foo
+>foo : (key: Key) => void
 >Key.LEFT : Key
 >Key : typeof Key
 >LEFT : Key
diff --git a/tests/baselines/reference/localVariablesReturnedFromCatchBlocks.types b/tests/baselines/reference/localVariablesReturnedFromCatchBlocks.types
index b18925989c4..81ee0ddc74a 100644
--- a/tests/baselines/reference/localVariablesReturnedFromCatchBlocks.types
+++ b/tests/baselines/reference/localVariablesReturnedFromCatchBlocks.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/localVariablesReturnedFromCatchBlocks.ts ===
 function f() {
->f : typeof f
+>f : () => any
 
     try {
     } catch (e) {
diff --git a/tests/baselines/reference/logicalAndOperatorWithTypeParameters.types b/tests/baselines/reference/logicalAndOperatorWithTypeParameters.types
index 711fca6c1e1..f77b231c6bc 100644
--- a/tests/baselines/reference/logicalAndOperatorWithTypeParameters.types
+++ b/tests/baselines/reference/logicalAndOperatorWithTypeParameters.types
@@ -3,7 +3,7 @@
 // type as the second operand.
 
 function foo<T, U, V/* extends T*/>(t: T, u: U, v: V) {
->foo : typeof foo
+>foo : <T, U, V>(t: T, u: U, v: V) => void
 >T : T
 >U : U
 >V : V
diff --git a/tests/baselines/reference/logicalNotOperatorWithBooleanType.types b/tests/baselines/reference/logicalNotOperatorWithBooleanType.types
index 031c986a9b2..e232ae2af80 100644
--- a/tests/baselines/reference/logicalNotOperatorWithBooleanType.types
+++ b/tests/baselines/reference/logicalNotOperatorWithBooleanType.types
@@ -4,7 +4,7 @@ var BOOLEAN: boolean;
 >BOOLEAN : boolean
 
 function foo(): boolean { return true; }
->foo : typeof foo
+>foo : () => boolean
 
 class A {
 >A : A
@@ -64,7 +64,7 @@ var ResultIsBoolean6 = !foo();
 >ResultIsBoolean6 : boolean
 >!foo() : boolean
 >foo() : boolean
->foo : typeof foo
+>foo : () => boolean
 
 var ResultIsBoolean7 = !A.foo();
 >ResultIsBoolean7 : boolean
@@ -92,7 +92,7 @@ var ResultIsBoolean = !!BOOLEAN;
 !foo();
 >!foo() : boolean
 >foo() : boolean
->foo : typeof foo
+>foo : () => boolean
 
 !true, false;
 >!true, false : boolean
diff --git a/tests/baselines/reference/logicalNotOperatorWithNumberType.types b/tests/baselines/reference/logicalNotOperatorWithNumberType.types
index bfd710ef2ee..4bcc8a14041 100644
--- a/tests/baselines/reference/logicalNotOperatorWithNumberType.types
+++ b/tests/baselines/reference/logicalNotOperatorWithNumberType.types
@@ -8,7 +8,7 @@ var NUMBER1: number[] = [1, 2];
 >[1, 2] : number[]
 
 function foo(): number { return 1; }
->foo : typeof foo
+>foo : () => number
 
 class A {
 >A : A
@@ -89,7 +89,7 @@ var ResultIsBoolean9 = !foo();
 >ResultIsBoolean9 : boolean
 >!foo() : boolean
 >foo() : number
->foo : typeof foo
+>foo : () => number
 
 var ResultIsBoolean10 = !A.foo();
 >ResultIsBoolean10 : boolean
@@ -139,7 +139,7 @@ var ResultIsBoolean13 = !!!(NUMBER + NUMBER);
 !foo();
 >!foo() : boolean
 >foo() : number
->foo : typeof foo
+>foo : () => number
 
 !objA.a;
 >!objA.a : boolean
diff --git a/tests/baselines/reference/logicalNotOperatorWithStringType.types b/tests/baselines/reference/logicalNotOperatorWithStringType.types
index 6c154a1d62f..2decb1ade18 100644
--- a/tests/baselines/reference/logicalNotOperatorWithStringType.types
+++ b/tests/baselines/reference/logicalNotOperatorWithStringType.types
@@ -8,7 +8,7 @@ var STRING1: string[] = ["", "abc"];
 >["", "abc"] : string[]
 
 function foo(): string { return "abc"; }
->foo : typeof foo
+>foo : () => string
 
 class A {
 >A : A
@@ -89,7 +89,7 @@ var ResultIsBoolean9 = !foo();
 >ResultIsBoolean9 : boolean
 >!foo() : boolean
 >foo() : string
->foo : typeof foo
+>foo : () => string
 
 var ResultIsBoolean10 = !A.foo();
 >ResultIsBoolean10 : boolean
@@ -147,7 +147,7 @@ var ResultIsBoolean14 = !!!(STRING + STRING);
 !foo();
 >!foo() : boolean
 >foo() : string
->foo : typeof foo
+>foo : () => string
 
 !objA.a,M.n;
 >!objA.a,M.n : string
diff --git a/tests/baselines/reference/logicalOrOperatorWithTypeParameters.types b/tests/baselines/reference/logicalOrOperatorWithTypeParameters.types
index 374a7cdd5e9..ff0e0ce568a 100644
--- a/tests/baselines/reference/logicalOrOperatorWithTypeParameters.types
+++ b/tests/baselines/reference/logicalOrOperatorWithTypeParameters.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/expressions/binaryOperators/logicalOrOperator/logicalOrOperatorWithTypeParameters.ts ===
 function fn1<T, U>(t: T, u: U) {
->fn1 : typeof fn1
+>fn1 : <T, U>(t: T, u: U) => void
 >T : T
 >U : U
 >t : T
@@ -35,7 +35,7 @@ function fn1<T, U>(t: T, u: U) {
 }
 
 function fn2<T, U/* extends T*/, V/* extends T*/>(t: T, u: U, v: V) {
->fn2 : typeof fn2
+>fn2 : <T, U, V>(t: T, u: U, v: V) => void
 >T : T
 >U : U
 >V : V
@@ -82,7 +82,7 @@ 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 : typeof fn3
+>fn3 : <T extends { a: string; b: string; }, U extends { a: string; b: number; }>(t: T, u: U) => void
 >T : T
 >a : string
 >b : string
diff --git a/tests/baselines/reference/mergedDeclarations1.types b/tests/baselines/reference/mergedDeclarations1.types
index 7e8eac5b875..20249ab94e1 100644
--- a/tests/baselines/reference/mergedDeclarations1.types
+++ b/tests/baselines/reference/mergedDeclarations1.types
@@ -30,7 +30,7 @@ module point {
 >point : typeof point
 
     export function equals(p1: Point, p2: Point) {
->equals : typeof equals
+>equals : (p1: Point, p2: Point) => boolean
 >p1 : Point
 >Point : Point
 >p2 : Point
@@ -68,9 +68,9 @@ var p2 = point.origin;
 var b = point.equals(p1, p2);
 >b : boolean
 >point.equals(p1, p2) : boolean
->point.equals : typeof point.equals
+>point.equals : (p1: Point, p2: Point) => boolean
 >point : typeof point
->equals : typeof point.equals
+>equals : (p1: Point, p2: Point) => boolean
 >p1 : Point
 >p2 : Point
 
diff --git a/tests/baselines/reference/mergedModuleDeclarationCodeGen2.types b/tests/baselines/reference/mergedModuleDeclarationCodeGen2.types
index c7fd6eb2196..790ec8d9377 100644
--- a/tests/baselines/reference/mergedModuleDeclarationCodeGen2.types
+++ b/tests/baselines/reference/mergedModuleDeclarationCodeGen2.types
@@ -5,20 +5,20 @@ module my.data.foo {
 >foo : typeof foo
 
     export function buz() { }
->buz : typeof buz
+>buz : () => void
 }
 module my.data {
 >my : typeof my
 >data : typeof my.data
 
     function data(my) {
->data : typeof data
+>data : (my: any) => void
 >my : any
 
         foo.buz();
 >foo.buz() : void
->foo.buz : typeof foo.buz
+>foo.buz : () => void
 >foo : typeof foo
->buz : typeof foo.buz
+>buz : () => void
     }
 }
diff --git a/tests/baselines/reference/mergedModuleDeclarationCodeGen3.types b/tests/baselines/reference/mergedModuleDeclarationCodeGen3.types
index 2013d068571..45f652fe3c0 100644
--- a/tests/baselines/reference/mergedModuleDeclarationCodeGen3.types
+++ b/tests/baselines/reference/mergedModuleDeclarationCodeGen3.types
@@ -4,7 +4,7 @@ module my.data {
 >data : typeof data
 
     export function buz() { }
->buz : typeof buz
+>buz : () => void
 }
 module my.data.foo {
 >my : typeof my
@@ -12,12 +12,12 @@ module my.data.foo {
 >foo : typeof foo
 
     function data(my, foo) {
->data : typeof data
+>data : (my: any, foo: any) => void
 >my : any
 >foo : any
 
         buz();
 >buz() : void
->buz : typeof buz
+>buz : () => void
     }
 }
diff --git a/tests/baselines/reference/mergedModuleDeclarationCodeGen4.types b/tests/baselines/reference/mergedModuleDeclarationCodeGen4.types
index aa0dfdb4762..0907a21a969 100644
--- a/tests/baselines/reference/mergedModuleDeclarationCodeGen4.types
+++ b/tests/baselines/reference/mergedModuleDeclarationCodeGen4.types
@@ -13,7 +13,7 @@ module superContain {
 >data : typeof data
 
                 export function foo() { }
->foo : typeof foo
+>foo : () => void
             }
         }
         export module my.buz {
@@ -24,7 +24,7 @@ module superContain {
 >data : typeof data
 
                 export function bar(contain, my, buz, data) {
->bar : typeof bar
+>bar : (contain: any, my: any, buz: any, data: any) => void
 >contain : any
 >my : any
 >buz : any
@@ -32,7 +32,7 @@ module superContain {
 
                     foo();
 >foo() : void
->foo : typeof foo
+>foo : () => void
                 }
             }
         }
diff --git a/tests/baselines/reference/mergedModuleDeclarationCodeGen5.types b/tests/baselines/reference/mergedModuleDeclarationCodeGen5.types
index e5b6520721f..ab4203d7951 100644
--- a/tests/baselines/reference/mergedModuleDeclarationCodeGen5.types
+++ b/tests/baselines/reference/mergedModuleDeclarationCodeGen5.types
@@ -5,10 +5,10 @@ module M.buz.plop {
 >plop : typeof buz.plop
 
     export function doom() { }
->doom : typeof doom
+>doom : () => void
 
     export function M() { }
->M : typeof M
+>M : () => void
 }
 module M.buz.plop {
 >M : typeof M
@@ -16,10 +16,10 @@ module M.buz.plop {
 >plop : typeof M.buz.plop
 
     function gunk() { }
->gunk : typeof gunk
+>gunk : () => void
 
     function buz() { }
->buz : typeof buz
+>buz : () => void
 
     export class fudge { }
 >fudge : fudge
@@ -29,20 +29,20 @@ module M.buz.plop {
 
     // Emit these references as follows
     var v1 = gunk; // gunk
->v1 : typeof gunk
->gunk : typeof gunk
+>v1 : () => void
+>gunk : () => void
 
     var v2 = buz; // buz
->v2 : typeof buz
->buz : typeof buz
+>v2 : () => void
+>buz : () => void
 
     export var v3 = doom; // _plop.doom
->v3 : typeof doom
->doom : typeof doom
+>v3 : () => void
+>doom : () => void
 
     export var v4 = M; // _plop.M
->v4 : typeof M
->M : typeof M
+>v4 : () => void
+>M : () => void
 
     export var v5 = fudge; // fudge
 >v5 : typeof fudge
diff --git a/tests/baselines/reference/methodContainingLocalFunction.types b/tests/baselines/reference/methodContainingLocalFunction.types
index fb52c3831ba..48c4be12631 100644
--- a/tests/baselines/reference/methodContainingLocalFunction.types
+++ b/tests/baselines/reference/methodContainingLocalFunction.types
@@ -92,7 +92,7 @@ module M {
 >M : typeof M
 
     export function exhibitBug() {
->exhibitBug : typeof exhibitBug
+>exhibitBug : () => void
 
         function localFunction() { }
 >localFunction : () => void
diff --git a/tests/baselines/reference/mixedExports.types b/tests/baselines/reference/mixedExports.types
index 36bf875fd64..f7ff0a13c34 100644
--- a/tests/baselines/reference/mixedExports.types
+++ b/tests/baselines/reference/mixedExports.types
@@ -3,13 +3,13 @@ declare module M {
 >M : typeof M
 
      function foo();
->foo : typeof foo
+>foo : { (): any; (): any; (): any; }
 
      export function foo();
->foo : typeof foo
+>foo : { (): any; (): any; (): any; }
 
      function foo();
->foo : typeof foo
+>foo : { (): any; (): any; (): any; }
 }
 
 declare module M1 {
diff --git a/tests/baselines/reference/modFunctionCrash.types b/tests/baselines/reference/modFunctionCrash.types
index d210d3853c1..596dac999a1 100644
--- a/tests/baselines/reference/modFunctionCrash.types
+++ b/tests/baselines/reference/modFunctionCrash.types
@@ -3,16 +3,16 @@ declare module Q {
 >Q : typeof Q
 
     function f(fn:()=>void); // typechecking the function type shouldnot crash the compiler
->f : typeof f
+>f : (fn: () => void) => any
 >fn : () => void
 }
 
 
 Q.f(function() {this;});
 >Q.f(function() {this;}) : any
->Q.f : typeof Q.f
+>Q.f : (fn: () => void) => any
 >Q : typeof Q
->f : typeof Q.f
+>f : (fn: () => void) => any
 >function() {this;} : () => void
 >this : any
 
diff --git a/tests/baselines/reference/moduleAliasAsFunctionArgument.types b/tests/baselines/reference/moduleAliasAsFunctionArgument.types
index c70939eb9da..dc621aa5dbf 100644
--- a/tests/baselines/reference/moduleAliasAsFunctionArgument.types
+++ b/tests/baselines/reference/moduleAliasAsFunctionArgument.types
@@ -4,7 +4,7 @@ import a = require('moduleAliasAsFunctionArgument_0');
 >a : typeof a
 
 function fn(arg: { x: number }) {
->fn : typeof fn
+>fn : (arg: { x: number; }) => void
 >arg : { x: number; }
 >x : number
 }
@@ -16,7 +16,7 @@ a.x; // OK
 
 fn(a); // Error: property 'x' is missing from 'a'
 >fn(a) : void
->fn : typeof fn
+>fn : (arg: { x: number; }) => void
 >a : typeof a
 
 === tests/cases/compiler/moduleAliasAsFunctionArgument_0.ts ===
diff --git a/tests/baselines/reference/moduleCodeGenTest5.types b/tests/baselines/reference/moduleCodeGenTest5.types
index 57f7b7e45e1..40161509aff 100644
--- a/tests/baselines/reference/moduleCodeGenTest5.types
+++ b/tests/baselines/reference/moduleCodeGenTest5.types
@@ -6,10 +6,10 @@ var y = 0;
 >y : number
 
 export function f1() {}
->f1 : typeof f1
+>f1 : () => void
 
 function f2() {}
->f2 : typeof f2
+>f2 : () => void
 
 export class C1 {
 >C1 : C1
diff --git a/tests/baselines/reference/moduleMemberWithoutTypeAnnotation1.types b/tests/baselines/reference/moduleMemberWithoutTypeAnnotation1.types
index 5d2da7fc60d..d8f6083b2c9 100644
--- a/tests/baselines/reference/moduleMemberWithoutTypeAnnotation1.types
+++ b/tests/baselines/reference/moduleMemberWithoutTypeAnnotation1.types
@@ -34,9 +34,9 @@ module TypeScript {
 
             return Syntax.childIndex();
 >Syntax.childIndex() : void
->Syntax.childIndex : typeof Syntax.childIndex
+>Syntax.childIndex : () => void
 >Syntax : typeof Syntax
->childIndex : typeof Syntax.childIndex
+>childIndex : () => void
         }
     }
 
@@ -91,7 +91,7 @@ module TypeScript.Syntax {
 >Syntax : typeof Syntax
 
     export function childIndex() { }
->childIndex : typeof childIndex
+>childIndex : () => void
 
     export class VariableWidthTokenWithTrailingTrivia implements ISyntaxToken {
 >VariableWidthTokenWithTrailingTrivia : VariableWidthTokenWithTrailingTrivia
diff --git a/tests/baselines/reference/moduleMemberWithoutTypeAnnotation2.types b/tests/baselines/reference/moduleMemberWithoutTypeAnnotation2.types
index 3a1c0b07d92..2a5d2c76e76 100644
--- a/tests/baselines/reference/moduleMemberWithoutTypeAnnotation2.types
+++ b/tests/baselines/reference/moduleMemberWithoutTypeAnnotation2.types
@@ -17,7 +17,7 @@ module TypeScript {
 >diagnosticWriter : any
 
         export function Alert(output: string) {
->Alert : typeof Alert
+>Alert : (output: string) => void
 >output : string
 
             if (diagnosticWriter) {
diff --git a/tests/baselines/reference/moduleScopingBug.types b/tests/baselines/reference/moduleScopingBug.types
index 00cd06d076c..b92b8de0c81 100644
--- a/tests/baselines/reference/moduleScopingBug.types
+++ b/tests/baselines/reference/moduleScopingBug.types
@@ -8,7 +8,7 @@ module M
 >outer : number
 
     function f() {
->f : typeof f
+>f : () => void
 
         var inner = outer;   // Ok
 >inner : number
diff --git a/tests/baselines/reference/moduleSymbolMerging.types b/tests/baselines/reference/moduleSymbolMerging.types
index a4ddda20af7..c6b0f58ef46 100644
--- a/tests/baselines/reference/moduleSymbolMerging.types
+++ b/tests/baselines/reference/moduleSymbolMerging.types
@@ -7,7 +7,7 @@ module B {
 >B : typeof B
 
 	export function f(): A.I { return null; }
->f : typeof f
+>f : () => A.I
 >A : unknown
 >I : A.I
 }
diff --git a/tests/baselines/reference/moduleUnassignedVariable.types b/tests/baselines/reference/moduleUnassignedVariable.types
index c4eeecbf39f..7d1dd8600cf 100644
--- a/tests/baselines/reference/moduleUnassignedVariable.types
+++ b/tests/baselines/reference/moduleUnassignedVariable.types
@@ -6,14 +6,14 @@ module Bar {
 >a : number
 
     function fooA() { return a; } // Correct: return Bar.a
->fooA : typeof fooA
+>fooA : () => number
 >a : number
 
     export var b;
 >b : any
 
     function fooB() { return b; } // Incorrect: return b
->fooB : typeof fooB
+>fooB : () => any
 >b : any
 }
 
diff --git a/tests/baselines/reference/moduleVisibilityTest1.types b/tests/baselines/reference/moduleVisibilityTest1.types
index aa4e7c91d88..8c22f792049 100644
--- a/tests/baselines/reference/moduleVisibilityTest1.types
+++ b/tests/baselines/reference/moduleVisibilityTest1.types
@@ -5,14 +5,14 @@ module OuterMod {
 >OuterMod : typeof OuterMod
 
 	export function someExportedOuterFunc() { return -1; }
->someExportedOuterFunc : typeof someExportedOuterFunc
+>someExportedOuterFunc : () => number
 >-1 : number
 
 	export module OuterInnerMod {
 >OuterInnerMod : typeof OuterInnerMod
 
 		export function someExportedOuterInnerFunc() { return "foo"; }
->someExportedOuterInnerFunc : typeof someExportedOuterInnerFunc
+>someExportedOuterInnerFunc : () => string
 	}
 }
 
@@ -28,7 +28,7 @@ module M {
 >InnerMod : typeof InnerMod
 
 		export function someExportedInnerFunc() { return -2; }
->someExportedInnerFunc : typeof someExportedInnerFunc
+>someExportedInnerFunc : () => number
 >-2 : number
 	}
 
@@ -76,23 +76,23 @@ module M {
 		public someMethodThatCallsAnOuterMethod() {return OuterInnerAlias.someExportedOuterInnerFunc();}
 >someMethodThatCallsAnOuterMethod : () => string
 >OuterInnerAlias.someExportedOuterInnerFunc() : string
->OuterInnerAlias.someExportedOuterInnerFunc : typeof OuterInnerAlias.someExportedOuterInnerFunc
+>OuterInnerAlias.someExportedOuterInnerFunc : () => string
 >OuterInnerAlias : typeof OuterInnerAlias
->someExportedOuterInnerFunc : typeof OuterInnerAlias.someExportedOuterInnerFunc
+>someExportedOuterInnerFunc : () => string
 
 		public someMethodThatCallsAnInnerMethod() {return InnerMod.someExportedInnerFunc();}
 >someMethodThatCallsAnInnerMethod : () => number
 >InnerMod.someExportedInnerFunc() : number
->InnerMod.someExportedInnerFunc : typeof InnerMod.someExportedInnerFunc
+>InnerMod.someExportedInnerFunc : () => number
 >InnerMod : typeof InnerMod
->someExportedInnerFunc : typeof InnerMod.someExportedInnerFunc
+>someExportedInnerFunc : () => number
 
 		public someMethodThatCallsAnOuterInnerMethod() {return OuterMod.someExportedOuterFunc();}
 >someMethodThatCallsAnOuterInnerMethod : () => number
 >OuterMod.someExportedOuterFunc() : number
->OuterMod.someExportedOuterFunc : typeof OuterMod.someExportedOuterFunc
+>OuterMod.someExportedOuterFunc : () => number
 >OuterMod : typeof OuterMod
->someExportedOuterFunc : typeof OuterMod.someExportedOuterFunc
+>someExportedOuterFunc : () => number
 
 		public someMethod() { return 0; }
 >someMethod : () => number
@@ -113,7 +113,7 @@ module M {
 >someModuleVar : number
 
 	function someModuleFunction() { return 5;}
->someModuleFunction : typeof someModuleFunction
+>someModuleFunction : () => number
 }
 
 module M {
diff --git a/tests/baselines/reference/moduleWithStatementsOfEveryKind.types b/tests/baselines/reference/moduleWithStatementsOfEveryKind.types
index 2e1860fc2c9..263da21f524 100644
--- a/tests/baselines/reference/moduleWithStatementsOfEveryKind.types
+++ b/tests/baselines/reference/moduleWithStatementsOfEveryKind.types
@@ -47,7 +47,7 @@ module A {
 >x : number
 
     function F(s: string): number {
->F : typeof F
+>F : (s: string) => number
 >s : string
 
         return 2;
@@ -121,7 +121,7 @@ module Y {
 >x : number
 
     export function F(s: string): number {
->F : typeof F
+>F : (s: string) => number
 >s : string
 
         return 2;
diff --git a/tests/baselines/reference/multiCallOverloads.types b/tests/baselines/reference/multiCallOverloads.types
index effde837b3c..8c789510580 100644
--- a/tests/baselines/reference/multiCallOverloads.types
+++ b/tests/baselines/reference/multiCallOverloads.types
@@ -7,7 +7,7 @@ interface ICallback {
 }
 
 function load(f: ICallback) {}
->load : typeof load
+>load : (f: ICallback) => void
 >f : ICallback
 >ICallback : ICallback
 
@@ -25,22 +25,22 @@ var f2: ICallback = function(z?) {}
 
 load(f1) // ok
 >load(f1) : void
->load : typeof load
+>load : (f: ICallback) => void
 >f1 : ICallback
 
 load(f2) // ok
 >load(f2) : void
->load : typeof load
+>load : (f: ICallback) => void
 >f2 : ICallback
 
 load(function() {}) // this shouldn’t be an error
 >load(function() {}) : void
->load : typeof load
+>load : (f: ICallback) => void
 >function() {} : () => void
 
 load(function(z?) {}) // this shouldn't be an error
 >load(function(z?) {}) : void
->load : typeof load
+>load : (f: ICallback) => void
 >function(z?) {} : (z?: string) => void
 >z : string
 
diff --git a/tests/baselines/reference/multiModuleClodule1.types b/tests/baselines/reference/multiModuleClodule1.types
index 39ae7b45b60..f7379e33173 100644
--- a/tests/baselines/reference/multiModuleClodule1.types
+++ b/tests/baselines/reference/multiModuleClodule1.types
@@ -28,10 +28,10 @@ module C {
 >C : typeof C
 
     export function foo() { }
->foo : typeof foo
+>foo : () => void
 
     function baz() { return ''; }
->baz : typeof baz
+>baz : () => string
 }
 
 var c = new C(C.x);
@@ -43,11 +43,11 @@ var c = new C(C.x);
 >x : number
 
 c.foo = C.foo;
->c.foo = C.foo : typeof C.foo
+>c.foo = C.foo : () => void
 >c.foo : () => void
 >c : C
 >foo : () => void
->C.foo : typeof C.foo
+>C.foo : () => void
 >C : typeof C
->foo : typeof C.foo
+>foo : () => void
 
diff --git a/tests/baselines/reference/multiModuleFundule1.types b/tests/baselines/reference/multiModuleFundule1.types
index 53b3c6342ae..c78a195f4b1 100644
--- a/tests/baselines/reference/multiModuleFundule1.types
+++ b/tests/baselines/reference/multiModuleFundule1.types
@@ -13,7 +13,7 @@ module C {
 >C : typeof C
 
     export function foo() { }
->foo : typeof foo
+>foo : () => void
 }
 
 var r = C(2);
@@ -29,7 +29,7 @@ var r2 = new C(2); // using void returning function as constructor
 var r3 = C.foo();
 >r3 : void
 >C.foo() : void
->C.foo : typeof C.foo
+>C.foo : () => void
 >C : typeof C
->foo : typeof C.foo
+>foo : () => void
 
diff --git a/tests/baselines/reference/mutrec.types b/tests/baselines/reference/mutrec.types
index 602c6209be7..6c147174484 100644
--- a/tests/baselines/reference/mutrec.types
+++ b/tests/baselines/reference/mutrec.types
@@ -16,7 +16,7 @@ interface B {
 }
 
 function f(p: A) { return p };
->f : typeof f
+>f : (p: A) => A
 >p : A
 >A : A
 >p : A
@@ -27,7 +27,7 @@ var b:B;
 
 f(b);
 >f(b) : A
->f : typeof f
+>f : (p: A) => A
 >b : B
 
 interface I1 {
@@ -55,7 +55,7 @@ interface I3 {
 }
 
 function g(p: I1) { return p };
->g : typeof g
+>g : (p: I1) => I1
 >p : I1
 >I1 : I1
 >p : I1
@@ -66,7 +66,7 @@ var i2:I2;
 
 g(i2);
 >g(i2) : I1
->g : typeof g
+>g : (p: I1) => I1
 >i2 : I2
 
 var i3:I3;
@@ -75,7 +75,7 @@ var i3:I3;
 
 g(i3);
 >g(i3) : I1
->g : typeof g
+>g : (p: I1) => I1
 >i3 : I3
 
 interface I4 {
@@ -100,7 +100,7 @@ var i4:I4;
 
 g(i4);
 >g(i4) : I1
->g : typeof g
+>g : (p: I1) => I1
 >i4 : I4
 
 
diff --git a/tests/baselines/reference/nameWithRelativePaths.types b/tests/baselines/reference/nameWithRelativePaths.types
index 5f28e9a6169..2dc303b2583 100644
--- a/tests/baselines/reference/nameWithRelativePaths.types
+++ b/tests/baselines/reference/nameWithRelativePaths.types
@@ -22,9 +22,9 @@ if(foo2.M2.x){
 >foo0 : typeof foo0
 >foo : number
 >foo1.f() : number
->foo1.f : typeof foo1.f
+>foo1.f : () => number
 >foo1 : typeof foo1
->f : typeof foo1.f
+>f : () => number
 }
 
 === tests/cases/conformance/externalModules/foo_0.ts ===
@@ -33,7 +33,7 @@ export var foo = 42;
 
 === tests/cases/conformance/externalModules/test/test/foo_1.ts ===
 export function f(){
->f : typeof f
+>f : () => number
 
 	return 42;
 }
diff --git a/tests/baselines/reference/negateOperatorWithAnyOtherType.types b/tests/baselines/reference/negateOperatorWithAnyOtherType.types
index 87e7ece0051..8785ab073b2 100644
--- a/tests/baselines/reference/negateOperatorWithAnyOtherType.types
+++ b/tests/baselines/reference/negateOperatorWithAnyOtherType.types
@@ -22,7 +22,7 @@ var obj1 = { x: "", y: () => { }};
 >() => { } : () => void
 
 function foo(): any {
->foo : typeof foo
+>foo : () => any
 
     var a;
 >a : any
@@ -137,7 +137,7 @@ var ResultIsNumber13 = -foo();
 >ResultIsNumber13 : number
 >-foo() : number
 >foo() : any
->foo : typeof foo
+>foo : () => any
 
 var ResultIsNumber14 = -A.foo();
 >ResultIsNumber14 : number
diff --git a/tests/baselines/reference/negateOperatorWithBooleanType.types b/tests/baselines/reference/negateOperatorWithBooleanType.types
index 68fc41a5f9e..49467d87845 100644
--- a/tests/baselines/reference/negateOperatorWithBooleanType.types
+++ b/tests/baselines/reference/negateOperatorWithBooleanType.types
@@ -4,7 +4,7 @@ var BOOLEAN: boolean;
 >BOOLEAN : boolean
 
 function foo(): boolean { return true; }
->foo : typeof foo
+>foo : () => boolean
 
 class A {
 >A : A
@@ -64,7 +64,7 @@ var ResultIsNumber6 = -foo();
 >ResultIsNumber6 : number
 >-foo() : number
 >foo() : boolean
->foo : typeof foo
+>foo : () => boolean
 
 var ResultIsNumber7 = -A.foo();
 >ResultIsNumber7 : number
@@ -85,7 +85,7 @@ var ResultIsNumber7 = -A.foo();
 -foo();
 >-foo() : number
 >foo() : boolean
->foo : typeof foo
+>foo : () => boolean
 
 -true, false;
 >-true, false : boolean
diff --git a/tests/baselines/reference/negateOperatorWithNumberType.types b/tests/baselines/reference/negateOperatorWithNumberType.types
index fbb2c365526..f6cee89f6df 100644
--- a/tests/baselines/reference/negateOperatorWithNumberType.types
+++ b/tests/baselines/reference/negateOperatorWithNumberType.types
@@ -8,7 +8,7 @@ var NUMBER1: number[] = [1, 2];
 >[1, 2] : number[]
 
 function foo(): number { return 1; }
->foo : typeof foo
+>foo : () => number
 
 class A {
 >A : A
@@ -89,7 +89,7 @@ var ResultIsNumber9 = -foo();
 >ResultIsNumber9 : number
 >-foo() : number
 >foo() : number
->foo : typeof foo
+>foo : () => number
 
 var ResultIsNumber10 = -A.foo();
 >ResultIsNumber10 : number
@@ -122,7 +122,7 @@ var ResultIsNumber11 = -(NUMBER - NUMBER);
 -foo();
 >-foo() : number
 >foo() : number
->foo : typeof foo
+>foo : () => number
 
 -objA.a;
 >-objA.a : number
diff --git a/tests/baselines/reference/negateOperatorWithStringType.types b/tests/baselines/reference/negateOperatorWithStringType.types
index e7d1b793f9c..43a9f05cc5b 100644
--- a/tests/baselines/reference/negateOperatorWithStringType.types
+++ b/tests/baselines/reference/negateOperatorWithStringType.types
@@ -8,7 +8,7 @@ var STRING1: string[] = ["", "abc"];
 >["", "abc"] : string[]
 
 function foo(): string { return "abc"; }
->foo : typeof foo
+>foo : () => string
 
 class A {
 >A : A
@@ -89,7 +89,7 @@ var ResultIsNumber9 = -foo();
 >ResultIsNumber9 : number
 >-foo() : number
 >foo() : string
->foo : typeof foo
+>foo : () => string
 
 var ResultIsNumber10 = -A.foo();
 >ResultIsNumber10 : number
@@ -130,7 +130,7 @@ var ResultIsNumber12 = -STRING.charAt(0);
 -foo();
 >-foo() : number
 >foo() : string
->foo : typeof foo
+>foo : () => string
 
 -objA.a,M.n;
 >-objA.a,M.n : string
diff --git a/tests/baselines/reference/nestedIndexer.types b/tests/baselines/reference/nestedIndexer.types
index 5511f322fd7..612f6a260b7 100644
--- a/tests/baselines/reference/nestedIndexer.types
+++ b/tests/baselines/reference/nestedIndexer.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/nestedIndexer.ts ===
 function then(x) {
->then : typeof then
+>then : (x: any) => void
 >x : any
 
 var match: { [index: number]: string; }
diff --git a/tests/baselines/reference/nestedRecursiveLambda.types b/tests/baselines/reference/nestedRecursiveLambda.types
index 160204cb772..358ebda8abf 100644
--- a/tests/baselines/reference/nestedRecursiveLambda.types
+++ b/tests/baselines/reference/nestedRecursiveLambda.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/nestedRecursiveLambda.ts ===
 function f(a:any) {
->f : typeof f
+>f : (a: any) => void
 >a : any
 
 void (r =>(r => r));
@@ -15,7 +15,7 @@ void (r =>(r => r));
 }
 f((r =>(r => r)));
 >f((r =>(r => r))) : void
->f : typeof f
+>f : (a: any) => void
 >(r =>(r => r)) : (r: any) => (r: any) => any
 >r =>(r => r) : (r: any) => (r: any) => any
 >r : any
diff --git a/tests/baselines/reference/newOperatorConformance.types b/tests/baselines/reference/newOperatorConformance.types
index 266aa89086e..37205bd6177 100644
--- a/tests/baselines/reference/newOperatorConformance.types
+++ b/tests/baselines/reference/newOperatorConformance.types
@@ -84,7 +84,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 : typeof newFn1
+>newFn1 : <T extends new () => number>(s: T) => void
 >T : T
 >s : T
 >T : T
@@ -100,7 +100,7 @@ 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 : typeof newFn2
+>newFn2 : <T extends new (s: number) => string>(s: T) => void
 >T : T
 >s : number
 >s : T
@@ -117,12 +117,12 @@ function newFn2<T extends { new (s: number): string}>(s: T) {
 
 // Construct expression of void returning function
 function fnVoid(): void { }
->fnVoid : typeof fnVoid
+>fnVoid : () => void
 
 var t = new fnVoid();
 >t : any
 >new fnVoid() : any
->fnVoid : typeof fnVoid
+>fnVoid : () => void
 
 var t: any;
 >t : any
diff --git a/tests/baselines/reference/noCollisionThisExpressionAndLocalVarInFunction.types b/tests/baselines/reference/noCollisionThisExpressionAndLocalVarInFunction.types
index daeee8e1864..56f5701e912 100644
--- a/tests/baselines/reference/noCollisionThisExpressionAndLocalVarInFunction.types
+++ b/tests/baselines/reference/noCollisionThisExpressionAndLocalVarInFunction.types
@@ -7,7 +7,7 @@ var console: {
 >val : any
 }
 function x() {
->x : typeof x
+>x : () => void
 
     var _this = 5;
 >_this : number
diff --git a/tests/baselines/reference/noCollisionThisExpressionAndLocalVarInLambda.types b/tests/baselines/reference/noCollisionThisExpressionAndLocalVarInLambda.types
index c67508c16d7..6cf4428bcc5 100644
--- a/tests/baselines/reference/noCollisionThisExpressionAndLocalVarInLambda.types
+++ b/tests/baselines/reference/noCollisionThisExpressionAndLocalVarInLambda.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/noCollisionThisExpressionAndLocalVarInLambda.ts ===
 declare function alert(message?: any): void;
->alert : typeof alert
+>alert : (message?: any) => void
 >message : any
 
 var x = {
@@ -24,7 +24,7 @@ var x = {
 }
 alert(x.doStuff(x => alert(x)));
 >alert(x.doStuff(x => alert(x))) : void
->alert : typeof alert
+>alert : (message?: any) => void
 >x.doStuff(x => alert(x)) : () => any
 >x.doStuff : (callback: any) => () => any
 >x : { doStuff: (callback: any) => () => any; }
@@ -32,6 +32,6 @@ alert(x.doStuff(x => alert(x)));
 >x => alert(x) : (x: any) => void
 >x : any
 >alert(x) : void
->alert : typeof alert
+>alert : (message?: any) => void
 >x : any
 
diff --git a/tests/baselines/reference/noCollisionThisExpressionInFunctionAndVarInGlobal.types b/tests/baselines/reference/noCollisionThisExpressionInFunctionAndVarInGlobal.types
index 1413afd3938..35a62c6f671 100644
--- a/tests/baselines/reference/noCollisionThisExpressionInFunctionAndVarInGlobal.types
+++ b/tests/baselines/reference/noCollisionThisExpressionInFunctionAndVarInGlobal.types
@@ -10,7 +10,7 @@ var _this = 5;
 >_this : number
 
 function x() {
->x : typeof x
+>x : () => void
 
     x => { console.log(this); };
 >x => { console.log(this); } : (x: any) => void
diff --git a/tests/baselines/reference/noSelfOnVars.types b/tests/baselines/reference/noSelfOnVars.types
index 3f7f637a468..8a059d8bc60 100644
--- a/tests/baselines/reference/noSelfOnVars.types
+++ b/tests/baselines/reference/noSelfOnVars.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/noSelfOnVars.ts ===
 function foo() {
->foo : typeof foo
+>foo : () => void
 
     function bar() { }
 >bar : () => void
diff --git a/tests/baselines/reference/nonInstantiatedModule.types b/tests/baselines/reference/nonInstantiatedModule.types
index 2a1e11ffcb6..1093fbd0653 100644
--- a/tests/baselines/reference/nonInstantiatedModule.types
+++ b/tests/baselines/reference/nonInstantiatedModule.types
@@ -45,7 +45,7 @@ module M2 {
 >Point : typeof Point
 
         export function Origin(): Point {
->Origin : typeof Origin
+>Origin : () => Point
 >Point : Point
 
             return { x: 0, y: 0 };
diff --git a/tests/baselines/reference/null.types b/tests/baselines/reference/null.types
index 6e937ce732e..0614b5efec4 100644
--- a/tests/baselines/reference/null.types
+++ b/tests/baselines/reference/null.types
@@ -15,7 +15,7 @@ class C {
 >C : C
 }
 function f() {
->f : typeof f
+>f : () => C
 
     return null;
     return new C();
@@ -23,7 +23,7 @@ function f() {
 >C : typeof C
 }
 function g() {
->g : typeof g
+>g : () => number
 
     return null;
     return 3;
diff --git a/tests/baselines/reference/nullAssignableToEveryType.types b/tests/baselines/reference/nullAssignableToEveryType.types
index 3fe16f828a4..aaf3b3bd8c5 100644
--- a/tests/baselines/reference/nullAssignableToEveryType.types
+++ b/tests/baselines/reference/nullAssignableToEveryType.types
@@ -99,7 +99,7 @@ var q: String = null;
 >String : String
 
 function foo<T, U, V extends Date>(x: T, y: U, z: V) {
->foo : typeof foo
+>foo : <T, U, V extends Date>(x: T, y: U, z: V) => void
 >T : T
 >U : U
 >V : V
diff --git a/tests/baselines/reference/nullIsSubtypeOfEverythingButUndefined.types b/tests/baselines/reference/nullIsSubtypeOfEverythingButUndefined.types
index e954f677bb7..aa81f87bed6 100644
--- a/tests/baselines/reference/nullIsSubtypeOfEverythingButUndefined.types
+++ b/tests/baselines/reference/nullIsSubtypeOfEverythingButUndefined.types
@@ -239,7 +239,7 @@ var r16 = true ? null : ac;
 >ac : typeof c
 
 function f17<T>(x: T) {
->f17 : typeof f17
+>f17 : <T>(x: T) => void
 >T : T
 >x : T
 >T : T
@@ -256,7 +256,7 @@ function f17<T>(x: T) {
 }
 
 function f18<T, U>(x: U) {
->f18 : typeof f18
+>f18 : <T, U>(x: U) => void
 >T : T
 >U : U
 >x : U
diff --git a/tests/baselines/reference/objectLitGetterSetter.types b/tests/baselines/reference/objectLitGetterSetter.types
index 9ac8643baab..2215f60d889 100644
--- a/tests/baselines/reference/objectLitGetterSetter.types
+++ b/tests/baselines/reference/objectLitGetterSetter.types
@@ -20,7 +20,7 @@
 
                     eval("public = 1;");
 >eval("public = 1;") : any
->eval : typeof eval
+>eval : (x: string) => any
 
                     return 11;
                 },
diff --git a/tests/baselines/reference/objectLiteralArraySpecialization.types b/tests/baselines/reference/objectLiteralArraySpecialization.types
index b7be0f6c1a0..d077354728b 100644
--- a/tests/baselines/reference/objectLiteralArraySpecialization.types
+++ b/tests/baselines/reference/objectLiteralArraySpecialization.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/objectLiteralArraySpecialization.ts ===
 declare function create<T>(initialValues?: T[]): MyArrayWrapper<T>;
->create : typeof create
+>create : <T>(initialValues?: T[]) => MyArrayWrapper<T>
 >T : T
 >initialValues : T[]
 >T : T
@@ -27,7 +27,7 @@ interface MyArrayWrapper<T> {
 var thing = create([ { name: "bob", id: 24 }, { name: "doug", id: 32 } ]); // should not error
 >thing : MyArrayWrapper<{ name: string; id: number; }>
 >create([ { name: "bob", id: 24 }, { name: "doug", id: 32 } ]) : MyArrayWrapper<{ name: string; id: number; }>
->create : typeof create
+>create : <T>(initialValues?: T[]) => MyArrayWrapper<T>
 >[ { name: "bob", id: 24 }, { name: "doug", id: 32 } ] : { name: string; id: number; }[]
 >{ name: "bob", id: 24 } : { name: string; id: number; }
 >name : string
diff --git a/tests/baselines/reference/objectTypesIdentity.types b/tests/baselines/reference/objectTypesIdentity.types
index 7a7db0b15d7..c148c4223ed 100644
--- a/tests/baselines/reference/objectTypesIdentity.types
+++ b/tests/baselines/reference/objectTypesIdentity.types
@@ -41,240 +41,240 @@ var b = { foo: '' };
 >foo : string
 
 function foo1(x: A);
->foo1 : typeof foo1
+>foo1 : { (x: A): any; (x: A): any; }
 >x : A
 >A : A
 
 function foo1(x: A); // error
->foo1 : typeof foo1
+>foo1 : { (x: A): any; (x: A): any; }
 >x : A
 >A : A
 
 function foo1(x: any) { }
->foo1 : typeof foo1
+>foo1 : { (x: A): any; (x: A): any; }
 >x : any
 
 function foo1b(x: B);
->foo1b : typeof foo1b
+>foo1b : { (x: B): any; (x: B): any; }
 >x : B
 >B : B
 
 function foo1b(x: B); // error
->foo1b : typeof foo1b
+>foo1b : { (x: B): any; (x: B): any; }
 >x : B
 >B : B
 
 function foo1b(x: any) { }
->foo1b : typeof foo1b
+>foo1b : { (x: B): any; (x: B): any; }
 >x : any
 
 function foo1c(x: C<string>);
->foo1c : typeof foo1c
+>foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo1c(x: C<string>); // error
->foo1c : typeof foo1c
+>foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo1c(x: any) { }
->foo1c : typeof foo1c
+>foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : any
 
 function foo2(x: I);
->foo2 : typeof foo2
+>foo2 : { (x: I): any; (x: I): any; }
 >x : I
 >I : I
 
 function foo2(x: I); // error
->foo2 : typeof foo2
+>foo2 : { (x: I): any; (x: I): any; }
 >x : I
 >I : I
 
 function foo2(x: any) { }
->foo2 : typeof foo2
+>foo2 : { (x: I): any; (x: I): any; }
 >x : any
 
 function foo3(x: typeof a);
->foo3 : typeof foo3
+>foo3 : { (x: { foo: string; }): any; (x: { foo: string; }): any; }
 >x : { foo: string; }
 >a : { foo: string; }
 
 function foo3(x: typeof a); // error
->foo3 : typeof foo3
+>foo3 : { (x: { foo: string; }): any; (x: { foo: string; }): any; }
 >x : { foo: string; }
 >a : { foo: string; }
 
 function foo3(x: any) { }
->foo3 : typeof foo3
+>foo3 : { (x: { foo: string; }): any; (x: { foo: string; }): any; }
 >x : any
 
 function foo4(x: typeof b);
->foo4 : typeof foo4
+>foo4 : { (x: { foo: string; }): any; (x: { foo: string; }): any; }
 >x : { foo: string; }
 >b : { foo: string; }
 
 function foo4(x: typeof b); // error
->foo4 : typeof foo4
+>foo4 : { (x: { foo: string; }): any; (x: { foo: string; }): any; }
 >x : { foo: string; }
 >b : { foo: string; }
 
 function foo4(x: any) { }
->foo4 : typeof foo4
+>foo4 : { (x: { foo: string; }): any; (x: { foo: string; }): any; }
 >x : any
 
 function foo5(x: A);
->foo5 : typeof foo5
+>foo5 : { (x: A): any; (x: B): any; }
 >x : A
 >A : A
 
 function foo5(x: B); // error
->foo5 : typeof foo5
+>foo5 : { (x: A): any; (x: B): any; }
 >x : B
 >B : B
 
 function foo5(x: any) { }
->foo5 : typeof foo5
+>foo5 : { (x: A): any; (x: B): any; }
 >x : any
 
 function foo5b(x: A);
->foo5b : typeof foo5b
+>foo5b : { (x: A): any; (x: C<string>): any; }
 >x : A
 >A : A
 
 function foo5b(x: C<string>); // error
->foo5b : typeof foo5b
+>foo5b : { (x: A): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo5b(x: any) { }
->foo5b : typeof foo5b
+>foo5b : { (x: A): any; (x: C<string>): any; }
 >x : any
 
 function foo6(x: A);
->foo6 : typeof foo6
+>foo6 : { (x: A): any; (x: I): any; }
 >x : A
 >A : A
 
 function foo6(x: I); // error
->foo6 : typeof foo6
+>foo6 : { (x: A): any; (x: I): any; }
 >x : I
 >I : I
 
 function foo6(x: any) { }
->foo6 : typeof foo6
+>foo6 : { (x: A): any; (x: I): any; }
 >x : any
 
 function foo7(x: A);
->foo7 : typeof foo7
+>foo7 : { (x: A): any; (x: { foo: string; }): any; }
 >x : A
 >A : A
 
 function foo7(x: typeof a); // error
->foo7 : typeof foo7
+>foo7 : { (x: A): any; (x: { foo: string; }): any; }
 >x : { foo: string; }
 >a : { foo: string; }
 
 function foo7(x: any) { }
->foo7 : typeof foo7
+>foo7 : { (x: A): any; (x: { foo: string; }): any; }
 >x : any
 
 function foo8(x: B);
->foo8 : typeof foo8
+>foo8 : { (x: B): any; (x: I): any; }
 >x : B
 >B : B
 
 function foo8(x: I); // error
->foo8 : typeof foo8
+>foo8 : { (x: B): any; (x: I): any; }
 >x : I
 >I : I
 
 function foo8(x: any) { }
->foo8 : typeof foo8
+>foo8 : { (x: B): any; (x: I): any; }
 >x : any
 
 function foo9(x: B);
->foo9 : typeof foo9
+>foo9 : { (x: B): any; (x: C<string>): any; }
 >x : B
 >B : B
 
 function foo9(x: C<string>); // error
->foo9 : typeof foo9
+>foo9 : { (x: B): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo9(x: any) { }
->foo9 : typeof foo9
+>foo9 : { (x: B): any; (x: C<string>): any; }
 >x : any
 
 function foo10(x: B);
->foo10 : typeof foo10
+>foo10 : { (x: B): any; (x: { foo: string; }): any; }
 >x : B
 >B : B
 
 function foo10(x: typeof a); // error
->foo10 : typeof foo10
+>foo10 : { (x: B): any; (x: { foo: string; }): any; }
 >x : { foo: string; }
 >a : { foo: string; }
 
 function foo10(x: any) { }
->foo10 : typeof foo10
+>foo10 : { (x: B): any; (x: { foo: string; }): any; }
 >x : any
 
 function foo11(x: B);
->foo11 : typeof foo11
+>foo11 : { (x: B): any; (x: { foo: string; }): any; }
 >x : B
 >B : B
 
 function foo11(x: typeof b); // error
->foo11 : typeof foo11
+>foo11 : { (x: B): any; (x: { foo: string; }): any; }
 >x : { foo: string; }
 >b : { foo: string; }
 
 function foo11(x: any) { }
->foo11 : typeof foo11
+>foo11 : { (x: B): any; (x: { foo: string; }): any; }
 >x : any
 
 function foo12(x: I);
->foo12 : typeof foo12
+>foo12 : { (x: I): any; (x: C<string>): any; }
 >x : I
 >I : I
 
 function foo12(x: C<string>); // error
->foo12 : typeof foo12
+>foo12 : { (x: I): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo12(x: any) { }
->foo12 : typeof foo12
+>foo12 : { (x: I): any; (x: C<string>): any; }
 >x : any
 
 function foo13(x: I);
->foo13 : typeof foo13
+>foo13 : { (x: I): any; (x: { foo: string; }): any; }
 >x : I
 >I : I
 
 function foo13(x: typeof a); // error
->foo13 : typeof foo13
+>foo13 : { (x: I): any; (x: { foo: string; }): any; }
 >x : { foo: string; }
 >a : { foo: string; }
 
 function foo13(x: any) { }
->foo13 : typeof foo13
+>foo13 : { (x: I): any; (x: { foo: string; }): any; }
 >x : any
 
 function foo14(x: I);
->foo14 : typeof foo14
+>foo14 : { (x: I): any; (x: { foo: string; }): any; }
 >x : I
 >I : I
 
 function foo14(x: typeof b); // error
->foo14 : typeof foo14
+>foo14 : { (x: I): any; (x: { foo: string; }): any; }
 >x : { foo: string; }
 >b : { foo: string; }
 
 function foo14(x: any) { }
->foo14 : typeof foo14
+>foo14 : { (x: I): any; (x: { foo: string; }): any; }
 >x : any
 
diff --git a/tests/baselines/reference/objectTypesIdentity2.types b/tests/baselines/reference/objectTypesIdentity2.types
index 891a0e25c04..1969d55bd11 100644
--- a/tests/baselines/reference/objectTypesIdentity2.types
+++ b/tests/baselines/reference/objectTypesIdentity2.types
@@ -50,156 +50,156 @@ var b = { foo: E.A };
 >A : E
 
 function foo5(x: A);
->foo5 : typeof foo5
+>foo5 : { (x: A): any; (x: B): any; }
 >x : A
 >A : A
 
 function foo5(x: B); // ok
->foo5 : typeof foo5
+>foo5 : { (x: A): any; (x: B): any; }
 >x : B
 >B : B
 
 function foo5(x: any) { }
->foo5 : typeof foo5
+>foo5 : { (x: A): any; (x: B): any; }
 >x : any
 
 function foo5b(x: A);
->foo5b : typeof foo5b
+>foo5b : { (x: A): any; (x: C<string>): any; }
 >x : A
 >A : A
 
 function foo5b(x: C<string>); // ok
->foo5b : typeof foo5b
+>foo5b : { (x: A): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo5b(x: any) { }
->foo5b : typeof foo5b
+>foo5b : { (x: A): any; (x: C<string>): any; }
 >x : any
 
 function foo6(x: A);
->foo6 : typeof foo6
+>foo6 : { (x: A): any; (x: I): any; }
 >x : A
 >A : A
 
 function foo6(x: I); // ok
->foo6 : typeof foo6
+>foo6 : { (x: A): any; (x: I): any; }
 >x : I
 >I : I
 
 function foo6(x: any) { }
->foo6 : typeof foo6
+>foo6 : { (x: A): any; (x: I): any; }
 >x : any
 
 function foo7(x: A);
->foo7 : typeof foo7
+>foo7 : { (x: A): any; (x: { foo: RegExp; }): any; }
 >x : A
 >A : A
 
 function foo7(x: typeof a); // ok
->foo7 : typeof foo7
+>foo7 : { (x: A): any; (x: { foo: RegExp; }): any; }
 >x : { foo: RegExp; }
 >a : { foo: RegExp; }
 
 function foo7(x: any) { }
->foo7 : typeof foo7
+>foo7 : { (x: A): any; (x: { foo: RegExp; }): any; }
 >x : any
 
 function foo8(x: B);
->foo8 : typeof foo8
+>foo8 : { (x: B): any; (x: I): any; }
 >x : B
 >B : B
 
 function foo8(x: I); // ok
->foo8 : typeof foo8
+>foo8 : { (x: B): any; (x: I): any; }
 >x : I
 >I : I
 
 function foo8(x: any) { }
->foo8 : typeof foo8
+>foo8 : { (x: B): any; (x: I): any; }
 >x : any
 
 function foo9(x: B);
->foo9 : typeof foo9
+>foo9 : { (x: B): any; (x: C<string>): any; }
 >x : B
 >B : B
 
 function foo9(x: C<string>); // ok
->foo9 : typeof foo9
+>foo9 : { (x: B): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo9(x: any) { }
->foo9 : typeof foo9
+>foo9 : { (x: B): any; (x: C<string>): any; }
 >x : any
 
 function foo10(x: B);
->foo10 : typeof foo10
+>foo10 : { (x: B): any; (x: { foo: RegExp; }): any; }
 >x : B
 >B : B
 
 function foo10(x: typeof a); // ok
->foo10 : typeof foo10
+>foo10 : { (x: B): any; (x: { foo: RegExp; }): any; }
 >x : { foo: RegExp; }
 >a : { foo: RegExp; }
 
 function foo10(x: any) { }
->foo10 : typeof foo10
+>foo10 : { (x: B): any; (x: { foo: RegExp; }): any; }
 >x : any
 
 function foo11(x: B);
->foo11 : typeof foo11
+>foo11 : { (x: B): any; (x: { foo: E; }): any; }
 >x : B
 >B : B
 
 function foo11(x: typeof b); // ok
->foo11 : typeof foo11
+>foo11 : { (x: B): any; (x: { foo: E; }): any; }
 >x : { foo: E; }
 >b : { foo: E; }
 
 function foo11(x: any) { }
->foo11 : typeof foo11
+>foo11 : { (x: B): any; (x: { foo: E; }): any; }
 >x : any
 
 function foo12(x: I);
->foo12 : typeof foo12
+>foo12 : { (x: I): any; (x: C<string>): any; }
 >x : I
 >I : I
 
 function foo12(x: C<string>); // ok
->foo12 : typeof foo12
+>foo12 : { (x: I): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo12(x: any) { }
->foo12 : typeof foo12
+>foo12 : { (x: I): any; (x: C<string>): any; }
 >x : any
 
 function foo13(x: I);
->foo13 : typeof foo13
+>foo13 : { (x: I): any; (x: { foo: RegExp; }): any; }
 >x : I
 >I : I
 
 function foo13(x: typeof a); // ok
->foo13 : typeof foo13
+>foo13 : { (x: I): any; (x: { foo: RegExp; }): any; }
 >x : { foo: RegExp; }
 >a : { foo: RegExp; }
 
 function foo13(x: any) { }
->foo13 : typeof foo13
+>foo13 : { (x: I): any; (x: { foo: RegExp; }): any; }
 >x : any
 
 function foo14(x: I);
->foo14 : typeof foo14
+>foo14 : { (x: I): any; (x: { foo: E; }): any; }
 >x : I
 >I : I
 
 function foo14(x: typeof b); // ok
->foo14 : typeof foo14
+>foo14 : { (x: I): any; (x: { foo: E; }): any; }
 >x : { foo: E; }
 >b : { foo: E; }
 
 function foo14(x: any) { }
->foo14 : typeof foo14
+>foo14 : { (x: I): any; (x: { foo: E; }): any; }
 >x : any
 
diff --git a/tests/baselines/reference/objectTypesIdentityWithCallSignatures.types b/tests/baselines/reference/objectTypesIdentityWithCallSignatures.types
index d484446b91e..f73785fab0d 100644
--- a/tests/baselines/reference/objectTypesIdentityWithCallSignatures.types
+++ b/tests/baselines/reference/objectTypesIdentityWithCallSignatures.types
@@ -60,268 +60,268 @@ var b = { foo(x: string) { return ''; } };
 >x : string
 
 function foo1(x: A);
->foo1 : typeof foo1
+>foo1 : { (x: A): any; (x: A): any; }
 >x : A
 >A : A
 
 function foo1(x: A); // error
->foo1 : typeof foo1
+>foo1 : { (x: A): any; (x: A): any; }
 >x : A
 >A : A
 
 function foo1(x: any) { }
->foo1 : typeof foo1
+>foo1 : { (x: A): any; (x: A): any; }
 >x : any
 
 function foo1b(x: B);
->foo1b : typeof foo1b
+>foo1b : { (x: B): any; (x: B): any; }
 >x : B
 >B : B
 
 function foo1b(x: B); // error
->foo1b : typeof foo1b
+>foo1b : { (x: B): any; (x: B): any; }
 >x : B
 >B : B
 
 function foo1b(x: any) { }
->foo1b : typeof foo1b
+>foo1b : { (x: B): any; (x: B): any; }
 >x : any
 
 function foo1c(x: C<string>);
->foo1c : typeof foo1c
+>foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo1c(x: C<string>); // error
->foo1c : typeof foo1c
+>foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo1c(x: any) { }
->foo1c : typeof foo1c
+>foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : any
 
 function foo2(x: I);
->foo2 : typeof foo2
+>foo2 : { (x: I): any; (x: I): any; }
 >x : I
 >I : I
 
 function foo2(x: I); // error
->foo2 : typeof foo2
+>foo2 : { (x: I): any; (x: I): any; }
 >x : I
 >I : I
 
 function foo2(x: any) { }
->foo2 : typeof foo2
+>foo2 : { (x: I): any; (x: I): any; }
 >x : any
 
 function foo3(x: typeof a);
->foo3 : typeof foo3
+>foo3 : { (x: { foo(x: string): string; }): any; (x: { foo(x: string): string; }): any; }
 >x : { foo(x: string): string; }
 >a : { foo(x: string): string; }
 
 function foo3(x: typeof a); // error
->foo3 : typeof foo3
+>foo3 : { (x: { foo(x: string): string; }): any; (x: { foo(x: string): string; }): any; }
 >x : { foo(x: string): string; }
 >a : { foo(x: string): string; }
 
 function foo3(x: any) { }
->foo3 : typeof foo3
+>foo3 : { (x: { foo(x: string): string; }): any; (x: { foo(x: string): string; }): any; }
 >x : any
 
 function foo4(x: typeof b);
->foo4 : typeof foo4
+>foo4 : { (x: { foo: (x: string) => string; }): any; (x: { foo: (x: string) => string; }): any; }
 >x : { foo: (x: string) => string; }
 >b : { foo: (x: string) => string; }
 
 function foo4(x: typeof b); // error
->foo4 : typeof foo4
+>foo4 : { (x: { foo: (x: string) => string; }): any; (x: { foo: (x: string) => string; }): any; }
 >x : { foo: (x: string) => string; }
 >b : { foo: (x: string) => string; }
 
 function foo4(x: any) { }
->foo4 : typeof foo4
+>foo4 : { (x: { foo: (x: string) => string; }): any; (x: { foo: (x: string) => string; }): any; }
 >x : any
 
 function foo5(x: A);
->foo5 : typeof foo5
+>foo5 : { (x: A): any; (x: B): any; }
 >x : A
 >A : A
 
 function foo5(x: B); // error
->foo5 : typeof foo5
+>foo5 : { (x: A): any; (x: B): any; }
 >x : B
 >B : B
 
 function foo5(x: any) { }
->foo5 : typeof foo5
+>foo5 : { (x: A): any; (x: B): any; }
 >x : any
 
 function foo5b(x: A);
->foo5b : typeof foo5b
+>foo5b : { (x: A): any; (x: C<string>): any; }
 >x : A
 >A : A
 
 function foo5b(x: C<string>); // error
->foo5b : typeof foo5b
+>foo5b : { (x: A): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo5b(x: any) { }
->foo5b : typeof foo5b
+>foo5b : { (x: A): any; (x: C<string>): any; }
 >x : any
 
 function foo6(x: A);
->foo6 : typeof foo6
+>foo6 : { (x: A): any; (x: I): any; }
 >x : A
 >A : A
 
 function foo6(x: I); // error
->foo6 : typeof foo6
+>foo6 : { (x: A): any; (x: I): any; }
 >x : I
 >I : I
 
 function foo6(x: any) { }
->foo6 : typeof foo6
+>foo6 : { (x: A): any; (x: I): any; }
 >x : any
 
 function foo7(x: A);
->foo7 : typeof foo7
+>foo7 : { (x: A): any; (x: { foo(x: string): string; }): any; }
 >x : A
 >A : A
 
 function foo7(x: typeof a); // error
->foo7 : typeof foo7
+>foo7 : { (x: A): any; (x: { foo(x: string): string; }): any; }
 >x : { foo(x: string): string; }
 >a : { foo(x: string): string; }
 
 function foo7(x: any) { }
->foo7 : typeof foo7
+>foo7 : { (x: A): any; (x: { foo(x: string): string; }): any; }
 >x : any
 
 function foo8(x: B);
->foo8 : typeof foo8
+>foo8 : { (x: B): any; (x: I): any; }
 >x : B
 >B : B
 
 function foo8(x: I); // error
->foo8 : typeof foo8
+>foo8 : { (x: B): any; (x: I): any; }
 >x : I
 >I : I
 
 function foo8(x: any) { }
->foo8 : typeof foo8
+>foo8 : { (x: B): any; (x: I): any; }
 >x : any
 
 function foo9(x: B);
->foo9 : typeof foo9
+>foo9 : { (x: B): any; (x: C<string>): any; }
 >x : B
 >B : B
 
 function foo9(x: C<string>); // error
->foo9 : typeof foo9
+>foo9 : { (x: B): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo9(x: any) { }
->foo9 : typeof foo9
+>foo9 : { (x: B): any; (x: C<string>): any; }
 >x : any
 
 function foo10(x: B);
->foo10 : typeof foo10
+>foo10 : { (x: B): any; (x: { foo(x: string): string; }): any; }
 >x : B
 >B : B
 
 function foo10(x: typeof a); // error
->foo10 : typeof foo10
+>foo10 : { (x: B): any; (x: { foo(x: string): string; }): any; }
 >x : { foo(x: string): string; }
 >a : { foo(x: string): string; }
 
 function foo10(x: any) { }
->foo10 : typeof foo10
+>foo10 : { (x: B): any; (x: { foo(x: string): string; }): any; }
 >x : any
 
 function foo11(x: B);
->foo11 : typeof foo11
+>foo11 : { (x: B): any; (x: { foo: (x: string) => string; }): any; }
 >x : B
 >B : B
 
 function foo11(x: typeof b); // error
->foo11 : typeof foo11
+>foo11 : { (x: B): any; (x: { foo: (x: string) => string; }): any; }
 >x : { foo: (x: string) => string; }
 >b : { foo: (x: string) => string; }
 
 function foo11(x: any) { }
->foo11 : typeof foo11
+>foo11 : { (x: B): any; (x: { foo: (x: string) => string; }): any; }
 >x : any
 
 function foo12(x: I);
->foo12 : typeof foo12
+>foo12 : { (x: I): any; (x: C<string>): any; }
 >x : I
 >I : I
 
 function foo12(x: C<string>); // error
->foo12 : typeof foo12
+>foo12 : { (x: I): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo12(x: any) { }
->foo12 : typeof foo12
+>foo12 : { (x: I): any; (x: C<string>): any; }
 >x : any
 
 function foo12b(x: I2<string>);
->foo12b : typeof foo12b
+>foo12b : { (x: I2<string>): any; (x: C<string>): any; }
 >x : I2<string>
 >I2 : I2<T>
 
 function foo12b(x: C<string>); // error
->foo12b : typeof foo12b
+>foo12b : { (x: I2<string>): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo12b(x: any) { }
->foo12b : typeof foo12b
+>foo12b : { (x: I2<string>): any; (x: C<string>): any; }
 >x : any
 
 function foo13(x: I);
->foo13 : typeof foo13
+>foo13 : { (x: I): any; (x: { foo(x: string): string; }): any; }
 >x : I
 >I : I
 
 function foo13(x: typeof a); // error
->foo13 : typeof foo13
+>foo13 : { (x: I): any; (x: { foo(x: string): string; }): any; }
 >x : { foo(x: string): string; }
 >a : { foo(x: string): string; }
 
 function foo13(x: any) { }
->foo13 : typeof foo13
+>foo13 : { (x: I): any; (x: { foo(x: string): string; }): any; }
 >x : any
 
 function foo14(x: I);
->foo14 : typeof foo14
+>foo14 : { (x: I): any; (x: { foo: (x: string) => string; }): any; }
 >x : I
 >I : I
 
 function foo14(x: typeof b); // error
->foo14 : typeof foo14
+>foo14 : { (x: I): any; (x: { foo: (x: string) => string; }): any; }
 >x : { foo: (x: string) => string; }
 >b : { foo: (x: string) => string; }
 
 function foo14(x: any) { }
->foo14 : typeof foo14
+>foo14 : { (x: I): any; (x: { foo: (x: string) => string; }): any; }
 >x : any
 
 function foo15(x: I2<string>);
->foo15 : typeof foo15
+>foo15 : { (x: I2<string>): any; (x: C<number>): any; }
 >x : I2<string>
 >I2 : I2<T>
 
 function foo15(x: C<number>); // ok
->foo15 : typeof foo15
+>foo15 : { (x: I2<string>): any; (x: C<number>): any; }
 >x : C<number>
 >C : C<T>
 
 function foo15(x: any) { }
->foo15 : typeof foo15
+>foo15 : { (x: I2<string>): any; (x: C<number>): any; }
 >x : any
 
diff --git a/tests/baselines/reference/objectTypesIdentityWithCallSignatures2.types b/tests/baselines/reference/objectTypesIdentityWithCallSignatures2.types
index f45434ed589..16b658d0e43 100644
--- a/tests/baselines/reference/objectTypesIdentityWithCallSignatures2.types
+++ b/tests/baselines/reference/objectTypesIdentityWithCallSignatures2.types
@@ -62,268 +62,268 @@ var b = { foo(x: RegExp) { return ''; } };
 >RegExp : RegExp
 
 function foo1(x: A);
->foo1 : typeof foo1
+>foo1 : { (x: A): any; (x: A): any; }
 >x : A
 >A : A
 
 function foo1(x: A); // error
->foo1 : typeof foo1
+>foo1 : { (x: A): any; (x: A): any; }
 >x : A
 >A : A
 
 function foo1(x: any) { }
->foo1 : typeof foo1
+>foo1 : { (x: A): any; (x: A): any; }
 >x : any
 
 function foo1b(x: B);
->foo1b : typeof foo1b
+>foo1b : { (x: B): any; (x: B): any; }
 >x : B
 >B : B
 
 function foo1b(x: B); // error
->foo1b : typeof foo1b
+>foo1b : { (x: B): any; (x: B): any; }
 >x : B
 >B : B
 
 function foo1b(x: any) { }
->foo1b : typeof foo1b
+>foo1b : { (x: B): any; (x: B): any; }
 >x : any
 
 function foo1c(x: C<string>);
->foo1c : typeof foo1c
+>foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo1c(x: C<string>); // error
->foo1c : typeof foo1c
+>foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo1c(x: any) { }
->foo1c : typeof foo1c
+>foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : any
 
 function foo2(x: I);
->foo2 : typeof foo2
+>foo2 : { (x: I): any; (x: I): any; }
 >x : I
 >I : I
 
 function foo2(x: I); // error
->foo2 : typeof foo2
+>foo2 : { (x: I): any; (x: I): any; }
 >x : I
 >I : I
 
 function foo2(x: any) { }
->foo2 : typeof foo2
+>foo2 : { (x: I): any; (x: I): any; }
 >x : any
 
 function foo3(x: typeof a);
->foo3 : typeof foo3
+>foo3 : { (x: { foo(x: Date): string; }): any; (x: { foo(x: Date): string; }): any; }
 >x : { foo(x: Date): string; }
 >a : { foo(x: Date): string; }
 
 function foo3(x: typeof a); // error
->foo3 : typeof foo3
+>foo3 : { (x: { foo(x: Date): string; }): any; (x: { foo(x: Date): string; }): any; }
 >x : { foo(x: Date): string; }
 >a : { foo(x: Date): string; }
 
 function foo3(x: any) { }
->foo3 : typeof foo3
+>foo3 : { (x: { foo(x: Date): string; }): any; (x: { foo(x: Date): string; }): any; }
 >x : any
 
 function foo4(x: typeof b);
->foo4 : typeof foo4
+>foo4 : { (x: { foo: (x: RegExp) => string; }): any; (x: { foo: (x: RegExp) => string; }): any; }
 >x : { foo: (x: RegExp) => string; }
 >b : { foo: (x: RegExp) => string; }
 
 function foo4(x: typeof b); // error
->foo4 : typeof foo4
+>foo4 : { (x: { foo: (x: RegExp) => string; }): any; (x: { foo: (x: RegExp) => string; }): any; }
 >x : { foo: (x: RegExp) => string; }
 >b : { foo: (x: RegExp) => string; }
 
 function foo4(x: any) { }
->foo4 : typeof foo4
+>foo4 : { (x: { foo: (x: RegExp) => string; }): any; (x: { foo: (x: RegExp) => string; }): any; }
 >x : any
 
 function foo5(x: A);
->foo5 : typeof foo5
+>foo5 : { (x: A): any; (x: B): any; }
 >x : A
 >A : A
 
 function foo5(x: B); // ok
->foo5 : typeof foo5
+>foo5 : { (x: A): any; (x: B): any; }
 >x : B
 >B : B
 
 function foo5(x: any) { }
->foo5 : typeof foo5
+>foo5 : { (x: A): any; (x: B): any; }
 >x : any
 
 function foo5b(x: A);
->foo5b : typeof foo5b
+>foo5b : { (x: A): any; (x: C<string>): any; }
 >x : A
 >A : A
 
 function foo5b(x: C<string>); // error
->foo5b : typeof foo5b
+>foo5b : { (x: A): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo5b(x: any) { }
->foo5b : typeof foo5b
+>foo5b : { (x: A): any; (x: C<string>): any; }
 >x : any
 
 function foo6(x: A);
->foo6 : typeof foo6
+>foo6 : { (x: A): any; (x: I): any; }
 >x : A
 >A : A
 
 function foo6(x: I); // ok
->foo6 : typeof foo6
+>foo6 : { (x: A): any; (x: I): any; }
 >x : I
 >I : I
 
 function foo6(x: any) { }
->foo6 : typeof foo6
+>foo6 : { (x: A): any; (x: I): any; }
 >x : any
 
 function foo7(x: A);
->foo7 : typeof foo7
+>foo7 : { (x: A): any; (x: { foo(x: Date): string; }): any; }
 >x : A
 >A : A
 
 function foo7(x: typeof a); // ok
->foo7 : typeof foo7
+>foo7 : { (x: A): any; (x: { foo(x: Date): string; }): any; }
 >x : { foo(x: Date): string; }
 >a : { foo(x: Date): string; }
 
 function foo7(x: any) { }
->foo7 : typeof foo7
+>foo7 : { (x: A): any; (x: { foo(x: Date): string; }): any; }
 >x : any
 
 function foo8(x: B);
->foo8 : typeof foo8
+>foo8 : { (x: B): any; (x: I): any; }
 >x : B
 >B : B
 
 function foo8(x: I); // ok
->foo8 : typeof foo8
+>foo8 : { (x: B): any; (x: I): any; }
 >x : I
 >I : I
 
 function foo8(x: any) { }
->foo8 : typeof foo8
+>foo8 : { (x: B): any; (x: I): any; }
 >x : any
 
 function foo9(x: B);
->foo9 : typeof foo9
+>foo9 : { (x: B): any; (x: C<string>): any; }
 >x : B
 >B : B
 
 function foo9(x: C<string>); // ok
->foo9 : typeof foo9
+>foo9 : { (x: B): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo9(x: any) { }
->foo9 : typeof foo9
+>foo9 : { (x: B): any; (x: C<string>): any; }
 >x : any
 
 function foo10(x: B);
->foo10 : typeof foo10
+>foo10 : { (x: B): any; (x: { foo(x: Date): string; }): any; }
 >x : B
 >B : B
 
 function foo10(x: typeof a); // ok
->foo10 : typeof foo10
+>foo10 : { (x: B): any; (x: { foo(x: Date): string; }): any; }
 >x : { foo(x: Date): string; }
 >a : { foo(x: Date): string; }
 
 function foo10(x: any) { }
->foo10 : typeof foo10
+>foo10 : { (x: B): any; (x: { foo(x: Date): string; }): any; }
 >x : any
 
 function foo11(x: B);
->foo11 : typeof foo11
+>foo11 : { (x: B): any; (x: { foo: (x: RegExp) => string; }): any; }
 >x : B
 >B : B
 
 function foo11(x: typeof b); // ok
->foo11 : typeof foo11
+>foo11 : { (x: B): any; (x: { foo: (x: RegExp) => string; }): any; }
 >x : { foo: (x: RegExp) => string; }
 >b : { foo: (x: RegExp) => string; }
 
 function foo11(x: any) { }
->foo11 : typeof foo11
+>foo11 : { (x: B): any; (x: { foo: (x: RegExp) => string; }): any; }
 >x : any
 
 function foo12(x: I);
->foo12 : typeof foo12
+>foo12 : { (x: I): any; (x: C<string>): any; }
 >x : I
 >I : I
 
 function foo12(x: C<string>); // ok
->foo12 : typeof foo12
+>foo12 : { (x: I): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo12(x: any) { }
->foo12 : typeof foo12
+>foo12 : { (x: I): any; (x: C<string>): any; }
 >x : any
 
 function foo12b(x: I2<string>);
->foo12b : typeof foo12b
+>foo12b : { (x: I2<string>): any; (x: C<string>): any; }
 >x : I2<string>
 >I2 : I2<T>
 
 function foo12b(x: C<string>); // error
->foo12b : typeof foo12b
+>foo12b : { (x: I2<string>): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo12b(x: any) { }
->foo12b : typeof foo12b
+>foo12b : { (x: I2<string>): any; (x: C<string>): any; }
 >x : any
 
 function foo13(x: I);
->foo13 : typeof foo13
+>foo13 : { (x: I): any; (x: { foo(x: Date): string; }): any; }
 >x : I
 >I : I
 
 function foo13(x: typeof a); // ok
->foo13 : typeof foo13
+>foo13 : { (x: I): any; (x: { foo(x: Date): string; }): any; }
 >x : { foo(x: Date): string; }
 >a : { foo(x: Date): string; }
 
 function foo13(x: any) { }
->foo13 : typeof foo13
+>foo13 : { (x: I): any; (x: { foo(x: Date): string; }): any; }
 >x : any
 
 function foo14(x: I);
->foo14 : typeof foo14
+>foo14 : { (x: I): any; (x: { foo: (x: RegExp) => string; }): any; }
 >x : I
 >I : I
 
 function foo14(x: typeof b); // ok
->foo14 : typeof foo14
+>foo14 : { (x: I): any; (x: { foo: (x: RegExp) => string; }): any; }
 >x : { foo: (x: RegExp) => string; }
 >b : { foo: (x: RegExp) => string; }
 
 function foo14(x: any) { }
->foo14 : typeof foo14
+>foo14 : { (x: I): any; (x: { foo: (x: RegExp) => string; }): any; }
 >x : any
 
 function foo15(x: I2<string>);
->foo15 : typeof foo15
+>foo15 : { (x: I2<string>): any; (x: C<number>): any; }
 >x : I2<string>
 >I2 : I2<T>
 
 function foo15(x: C<number>); // ok
->foo15 : typeof foo15
+>foo15 : { (x: I2<string>): any; (x: C<number>): any; }
 >x : C<number>
 >C : C<T>
 
 function foo15(x: any) { }
->foo15 : typeof foo15
+>foo15 : { (x: I2<string>): any; (x: C<number>): any; }
 >x : any
 
diff --git a/tests/baselines/reference/objectTypesIdentityWithCallSignaturesDifferingParamCounts.types b/tests/baselines/reference/objectTypesIdentityWithCallSignaturesDifferingParamCounts.types
index c0b3bbfcd45..0ebbc639e5f 100644
--- a/tests/baselines/reference/objectTypesIdentityWithCallSignaturesDifferingParamCounts.types
+++ b/tests/baselines/reference/objectTypesIdentityWithCallSignaturesDifferingParamCounts.types
@@ -64,268 +64,268 @@ var b = { foo(x: string) { return ''; } };
 >x : string
 
 function foo1(x: A);
->foo1 : typeof foo1
+>foo1 : { (x: A): any; (x: A): any; }
 >x : A
 >A : A
 
 function foo1(x: A); // error
->foo1 : typeof foo1
+>foo1 : { (x: A): any; (x: A): any; }
 >x : A
 >A : A
 
 function foo1(x: any) { }
->foo1 : typeof foo1
+>foo1 : { (x: A): any; (x: A): any; }
 >x : any
 
 function foo1b(x: B);
->foo1b : typeof foo1b
+>foo1b : { (x: B): any; (x: B): any; }
 >x : B
 >B : B
 
 function foo1b(x: B); // error
->foo1b : typeof foo1b
+>foo1b : { (x: B): any; (x: B): any; }
 >x : B
 >B : B
 
 function foo1b(x: any) { }
->foo1b : typeof foo1b
+>foo1b : { (x: B): any; (x: B): any; }
 >x : any
 
 function foo1c(x: C<string>);
->foo1c : typeof foo1c
+>foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo1c(x: C<string>); // error
->foo1c : typeof foo1c
+>foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo1c(x: any) { }
->foo1c : typeof foo1c
+>foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : any
 
 function foo2(x: I);
->foo2 : typeof foo2
+>foo2 : { (x: I): any; (x: I): any; }
 >x : I
 >I : I
 
 function foo2(x: I); // error
->foo2 : typeof foo2
+>foo2 : { (x: I): any; (x: I): any; }
 >x : I
 >I : I
 
 function foo2(x: any) { }
->foo2 : typeof foo2
+>foo2 : { (x: I): any; (x: I): any; }
 >x : any
 
 function foo3(x: typeof a);
->foo3 : typeof foo3
+>foo3 : { (x: { foo(x: string, y: string): string; }): any; (x: { foo(x: string, y: string): string; }): any; }
 >x : { foo(x: string, y: string): string; }
 >a : { foo(x: string, y: string): string; }
 
 function foo3(x: typeof a); // error
->foo3 : typeof foo3
+>foo3 : { (x: { foo(x: string, y: string): string; }): any; (x: { foo(x: string, y: string): string; }): any; }
 >x : { foo(x: string, y: string): string; }
 >a : { foo(x: string, y: string): string; }
 
 function foo3(x: any) { }
->foo3 : typeof foo3
+>foo3 : { (x: { foo(x: string, y: string): string; }): any; (x: { foo(x: string, y: string): string; }): any; }
 >x : any
 
 function foo4(x: typeof b);
->foo4 : typeof foo4
+>foo4 : { (x: { foo: (x: string) => string; }): any; (x: { foo: (x: string) => string; }): any; }
 >x : { foo: (x: string) => string; }
 >b : { foo: (x: string) => string; }
 
 function foo4(x: typeof b); // error
->foo4 : typeof foo4
+>foo4 : { (x: { foo: (x: string) => string; }): any; (x: { foo: (x: string) => string; }): any; }
 >x : { foo: (x: string) => string; }
 >b : { foo: (x: string) => string; }
 
 function foo4(x: any) { }
->foo4 : typeof foo4
+>foo4 : { (x: { foo: (x: string) => string; }): any; (x: { foo: (x: string) => string; }): any; }
 >x : any
 
 function foo5(x: A);
->foo5 : typeof foo5
+>foo5 : { (x: A): any; (x: B): any; }
 >x : A
 >A : A
 
 function foo5(x: B); // ok
->foo5 : typeof foo5
+>foo5 : { (x: A): any; (x: B): any; }
 >x : B
 >B : B
 
 function foo5(x: any) { }
->foo5 : typeof foo5
+>foo5 : { (x: A): any; (x: B): any; }
 >x : any
 
 function foo5b(x: A);
->foo5b : typeof foo5b
+>foo5b : { (x: A): any; (x: C<string>): any; }
 >x : A
 >A : A
 
 function foo5b(x: C<string>); // ok
->foo5b : typeof foo5b
+>foo5b : { (x: A): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo5b(x: any) { }
->foo5b : typeof foo5b
+>foo5b : { (x: A): any; (x: C<string>): any; }
 >x : any
 
 function foo6(x: A);
->foo6 : typeof foo6
+>foo6 : { (x: A): any; (x: I): any; }
 >x : A
 >A : A
 
 function foo6(x: I); // error
->foo6 : typeof foo6
+>foo6 : { (x: A): any; (x: I): any; }
 >x : I
 >I : I
 
 function foo6(x: any) { }
->foo6 : typeof foo6
+>foo6 : { (x: A): any; (x: I): any; }
 >x : any
 
 function foo7(x: A);
->foo7 : typeof foo7
+>foo7 : { (x: A): any; (x: { foo(x: string, y: string): string; }): any; }
 >x : A
 >A : A
 
 function foo7(x: typeof a); // ok
->foo7 : typeof foo7
+>foo7 : { (x: A): any; (x: { foo(x: string, y: string): string; }): any; }
 >x : { foo(x: string, y: string): string; }
 >a : { foo(x: string, y: string): string; }
 
 function foo7(x: any) { }
->foo7 : typeof foo7
+>foo7 : { (x: A): any; (x: { foo(x: string, y: string): string; }): any; }
 >x : any
 
 function foo8(x: B);
->foo8 : typeof foo8
+>foo8 : { (x: B): any; (x: I): any; }
 >x : B
 >B : B
 
 function foo8(x: I); // ok
->foo8 : typeof foo8
+>foo8 : { (x: B): any; (x: I): any; }
 >x : I
 >I : I
 
 function foo8(x: any) { }
->foo8 : typeof foo8
+>foo8 : { (x: B): any; (x: I): any; }
 >x : any
 
 function foo9(x: B);
->foo9 : typeof foo9
+>foo9 : { (x: B): any; (x: C<string>): any; }
 >x : B
 >B : B
 
 function foo9(x: C<string>); // ok
->foo9 : typeof foo9
+>foo9 : { (x: B): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo9(x: any) { }
->foo9 : typeof foo9
+>foo9 : { (x: B): any; (x: C<string>): any; }
 >x : any
 
 function foo10(x: B);
->foo10 : typeof foo10
+>foo10 : { (x: B): any; (x: { foo(x: string, y: string): string; }): any; }
 >x : B
 >B : B
 
 function foo10(x: typeof a); // error
->foo10 : typeof foo10
+>foo10 : { (x: B): any; (x: { foo(x: string, y: string): string; }): any; }
 >x : { foo(x: string, y: string): string; }
 >a : { foo(x: string, y: string): string; }
 
 function foo10(x: any) { }
->foo10 : typeof foo10
+>foo10 : { (x: B): any; (x: { foo(x: string, y: string): string; }): any; }
 >x : any
 
 function foo11(x: B);
->foo11 : typeof foo11
+>foo11 : { (x: B): any; (x: { foo: (x: string) => string; }): any; }
 >x : B
 >B : B
 
 function foo11(x: typeof b); // ok
->foo11 : typeof foo11
+>foo11 : { (x: B): any; (x: { foo: (x: string) => string; }): any; }
 >x : { foo: (x: string) => string; }
 >b : { foo: (x: string) => string; }
 
 function foo11(x: any) { }
->foo11 : typeof foo11
+>foo11 : { (x: B): any; (x: { foo: (x: string) => string; }): any; }
 >x : any
 
 function foo12(x: I);
->foo12 : typeof foo12
+>foo12 : { (x: I): any; (x: C<string>): any; }
 >x : I
 >I : I
 
 function foo12(x: C<string>); // ok
->foo12 : typeof foo12
+>foo12 : { (x: I): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo12(x: any) { }
->foo12 : typeof foo12
+>foo12 : { (x: I): any; (x: C<string>): any; }
 >x : any
 
 function foo12b(x: I2<string>);
->foo12b : typeof foo12b
+>foo12b : { (x: I2<string>): any; (x: C<string>): any; }
 >x : I2<string>
 >I2 : I2<T>
 
 function foo12b(x: C<string>); // ok
->foo12b : typeof foo12b
+>foo12b : { (x: I2<string>): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo12b(x: any) { }
->foo12b : typeof foo12b
+>foo12b : { (x: I2<string>): any; (x: C<string>): any; }
 >x : any
 
 function foo13(x: I);
->foo13 : typeof foo13
+>foo13 : { (x: I): any; (x: { foo(x: string, y: string): string; }): any; }
 >x : I
 >I : I
 
 function foo13(x: typeof a); // ok
->foo13 : typeof foo13
+>foo13 : { (x: I): any; (x: { foo(x: string, y: string): string; }): any; }
 >x : { foo(x: string, y: string): string; }
 >a : { foo(x: string, y: string): string; }
 
 function foo13(x: any) { }
->foo13 : typeof foo13
+>foo13 : { (x: I): any; (x: { foo(x: string, y: string): string; }): any; }
 >x : any
 
 function foo14(x: I);
->foo14 : typeof foo14
+>foo14 : { (x: I): any; (x: { foo: (x: string) => string; }): any; }
 >x : I
 >I : I
 
 function foo14(x: typeof b); // error
->foo14 : typeof foo14
+>foo14 : { (x: I): any; (x: { foo: (x: string) => string; }): any; }
 >x : { foo: (x: string) => string; }
 >b : { foo: (x: string) => string; }
 
 function foo14(x: any) { }
->foo14 : typeof foo14
+>foo14 : { (x: I): any; (x: { foo: (x: string) => string; }): any; }
 >x : any
 
 function foo15(x: I2<string>);
->foo15 : typeof foo15
+>foo15 : { (x: I2<string>): any; (x: C<number>): any; }
 >x : I2<string>
 >I2 : I2<T>
 
 function foo15(x: C<number>); // ok
->foo15 : typeof foo15
+>foo15 : { (x: I2<string>): any; (x: C<number>): any; }
 >x : C<number>
 >C : C<T>
 
 function foo15(x: any) { }
->foo15 : typeof foo15
+>foo15 : { (x: I2<string>): any; (x: C<number>): any; }
 >x : any
 
diff --git a/tests/baselines/reference/objectTypesIdentityWithCallSignaturesDifferingParamCounts2.types b/tests/baselines/reference/objectTypesIdentityWithCallSignaturesDifferingParamCounts2.types
index becd0d14850..b72d0a799e4 100644
--- a/tests/baselines/reference/objectTypesIdentityWithCallSignaturesDifferingParamCounts2.types
+++ b/tests/baselines/reference/objectTypesIdentityWithCallSignaturesDifferingParamCounts2.types
@@ -24,114 +24,114 @@ var a: { (x: string, y: string): string }
 >y : string
 
 function foo2(x: I);
->foo2 : typeof foo2
+>foo2 : { (x: I): any; (x: I): any; }
 >x : I
 >I : I
 
 function foo2(x: I); // error
->foo2 : typeof foo2
+>foo2 : { (x: I): any; (x: I): any; }
 >x : I
 >I : I
 
 function foo2(x: any) { }
->foo2 : typeof foo2
+>foo2 : { (x: I): any; (x: I): any; }
 >x : any
 
 function foo3(x: typeof a);
->foo3 : typeof foo3
+>foo3 : { (x: (x: string, y: string) => string): any; (x: (x: string, y: string) => string): any; }
 >x : (x: string, y: string) => string
 >a : (x: string, y: string) => string
 
 function foo3(x: typeof a); // error
->foo3 : typeof foo3
+>foo3 : { (x: (x: string, y: string) => string): any; (x: (x: string, y: string) => string): any; }
 >x : (x: string, y: string) => string
 >a : (x: string, y: string) => string
 
 function foo3(x: any) { }
->foo3 : typeof foo3
+>foo3 : { (x: (x: string, y: string) => string): any; (x: (x: string, y: string) => string): any; }
 >x : any
 
 function foo4(x: I2<string>);
->foo4 : typeof foo4
+>foo4 : { (x: I2<string>): any; (x: I2<string>): any; }
 >x : I2<string>
 >I2 : I2<T>
 
 function foo4(x: I2<string>); // error
->foo4 : typeof foo4
+>foo4 : { (x: I2<string>): any; (x: I2<string>): any; }
 >x : I2<string>
 >I2 : I2<T>
 
 function foo4(x: any) { }
->foo4 : typeof foo4
+>foo4 : { (x: I2<string>): any; (x: I2<string>): any; }
 >x : any
 
 function foo5(x: I2<string>);
->foo5 : typeof foo5
+>foo5 : { (x: I2<string>): any; (x: I2<number>): any; }
 >x : I2<string>
 >I2 : I2<T>
 
 function foo5(x: I2<number>); // ok
->foo5 : typeof foo5
+>foo5 : { (x: I2<string>): any; (x: I2<number>): any; }
 >x : I2<number>
 >I2 : I2<T>
 
 function foo5(x: any) { }
->foo5 : typeof foo5
+>foo5 : { (x: I2<string>): any; (x: I2<number>): any; }
 >x : any
 
 function foo13(x: I);
->foo13 : typeof foo13
+>foo13 : { (x: I): any; (x: (x: string, y: string) => string): any; }
 >x : I
 >I : I
 
 function foo13(x: typeof a); // ok
->foo13 : typeof foo13
+>foo13 : { (x: I): any; (x: (x: string, y: string) => string): any; }
 >x : (x: string, y: string) => string
 >a : (x: string, y: string) => string
 
 function foo13(x: any) { }
->foo13 : typeof foo13
+>foo13 : { (x: I): any; (x: (x: string, y: string) => string): any; }
 >x : any
 
 function foo14(x: I);
->foo14 : typeof foo14
+>foo14 : { (x: I): any; (x: I2<string>): any; }
 >x : I
 >I : I
 
 function foo14(x: I2<string>); // error
->foo14 : typeof foo14
+>foo14 : { (x: I): any; (x: I2<string>): any; }
 >x : I2<string>
 >I2 : I2<T>
 
 function foo14(x: any) { }
->foo14 : typeof foo14
+>foo14 : { (x: I): any; (x: I2<string>): any; }
 >x : any
 
 function foo14b(x: typeof a);
->foo14b : typeof foo14b
+>foo14b : { (x: (x: string, y: string) => string): any; (x: I2<string>): any; }
 >x : (x: string, y: string) => string
 >a : (x: string, y: string) => string
 
 function foo14b(x: I2<string>); // ok
->foo14b : typeof foo14b
+>foo14b : { (x: (x: string, y: string) => string): any; (x: I2<string>): any; }
 >x : I2<string>
 >I2 : I2<T>
 
 function foo14b(x: any) { }
->foo14b : typeof foo14b
+>foo14b : { (x: (x: string, y: string) => string): any; (x: I2<string>): any; }
 >x : any
 
 function foo15(x: I);
->foo15 : typeof foo15
+>foo15 : { (x: I): any; (x: I2<number>): any; }
 >x : I
 >I : I
 
 function foo15(x: I2<number>); // ok
->foo15 : typeof foo15
+>foo15 : { (x: I): any; (x: I2<number>): any; }
 >x : I2<number>
 >I2 : I2<T>
 
 function foo15(x: any) { }
->foo15 : typeof foo15
+>foo15 : { (x: I): any; (x: I2<number>): any; }
 >x : any
 
diff --git a/tests/baselines/reference/objectTypesIdentityWithCallSignaturesWithOverloads.types b/tests/baselines/reference/objectTypesIdentityWithCallSignaturesWithOverloads.types
index e24ea1c88ac..4d8b8ccb42a 100644
--- a/tests/baselines/reference/objectTypesIdentityWithCallSignaturesWithOverloads.types
+++ b/tests/baselines/reference/objectTypesIdentityWithCallSignaturesWithOverloads.types
@@ -112,268 +112,268 @@ var b = {
 };
 
 function foo1(x: A);
->foo1 : typeof foo1
+>foo1 : { (x: A): any; (x: A): any; }
 >x : A
 >A : A
 
 function foo1(x: A); // error
->foo1 : typeof foo1
+>foo1 : { (x: A): any; (x: A): any; }
 >x : A
 >A : A
 
 function foo1(x: any) { }
->foo1 : typeof foo1
+>foo1 : { (x: A): any; (x: A): any; }
 >x : any
 
 function foo1b(x: B);
->foo1b : typeof foo1b
+>foo1b : { (x: B): any; (x: B): any; }
 >x : B
 >B : B
 
 function foo1b(x: B); // error
->foo1b : typeof foo1b
+>foo1b : { (x: B): any; (x: B): any; }
 >x : B
 >B : B
 
 function foo1b(x: any) { }
->foo1b : typeof foo1b
+>foo1b : { (x: B): any; (x: B): any; }
 >x : any
 
 function foo1c(x: C<string>);
->foo1c : typeof foo1c
+>foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo1c(x: C<string>); // error
->foo1c : typeof foo1c
+>foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo1c(x: any) { }
->foo1c : typeof foo1c
+>foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : any
 
 function foo2(x: I);
->foo2 : typeof foo2
+>foo2 : { (x: I): any; (x: I): any; }
 >x : I
 >I : I
 
 function foo2(x: I); // error
->foo2 : typeof foo2
+>foo2 : { (x: I): any; (x: I): any; }
 >x : I
 >I : I
 
 function foo2(x: any) { }
->foo2 : typeof foo2
+>foo2 : { (x: I): any; (x: I): any; }
 >x : any
 
 function foo3(x: typeof a);
->foo3 : typeof foo3
+>foo3 : { (x: { foo(x: number): number; foo(x: string): string; }): any; (x: { foo(x: number): number; foo(x: string): string; }): any; }
 >x : { foo(x: number): number; foo(x: string): string; }
 >a : { foo(x: number): number; foo(x: string): string; }
 
 function foo3(x: typeof a); // error
->foo3 : typeof foo3
+>foo3 : { (x: { foo(x: number): number; foo(x: string): string; }): any; (x: { foo(x: number): number; foo(x: string): string; }): any; }
 >x : { foo(x: number): number; foo(x: string): string; }
 >a : { foo(x: number): number; foo(x: string): string; }
 
 function foo3(x: any) { }
->foo3 : typeof foo3
+>foo3 : { (x: { foo(x: number): number; foo(x: string): string; }): any; (x: { foo(x: number): number; foo(x: string): string; }): any; }
 >x : any
 
 function foo4(x: typeof b);
->foo4 : typeof foo4
+>foo4 : { (x: { foo: (x: any) => any; }): any; (x: { foo: (x: any) => any; }): any; }
 >x : { foo: (x: any) => any; }
 >b : { foo: (x: any) => any; }
 
 function foo4(x: typeof b); // error
->foo4 : typeof foo4
+>foo4 : { (x: { foo: (x: any) => any; }): any; (x: { foo: (x: any) => any; }): any; }
 >x : { foo: (x: any) => any; }
 >b : { foo: (x: any) => any; }
 
 function foo4(x: any) { }
->foo4 : typeof foo4
+>foo4 : { (x: { foo: (x: any) => any; }): any; (x: { foo: (x: any) => any; }): any; }
 >x : any
 
 function foo5(x: A);
->foo5 : typeof foo5
+>foo5 : { (x: A): any; (x: B): any; }
 >x : A
 >A : A
 
 function foo5(x: B); // error
->foo5 : typeof foo5
+>foo5 : { (x: A): any; (x: B): any; }
 >x : B
 >B : B
 
 function foo5(x: any) { }
->foo5 : typeof foo5
+>foo5 : { (x: A): any; (x: B): any; }
 >x : any
 
 function foo5b(x: A);
->foo5b : typeof foo5b
+>foo5b : { (x: A): any; (x: C<string>): any; }
 >x : A
 >A : A
 
 function foo5b(x: C<string>); // ok
->foo5b : typeof foo5b
+>foo5b : { (x: A): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo5b(x: any) { }
->foo5b : typeof foo5b
+>foo5b : { (x: A): any; (x: C<string>): any; }
 >x : any
 
 function foo6(x: A);
->foo6 : typeof foo6
+>foo6 : { (x: A): any; (x: I): any; }
 >x : A
 >A : A
 
 function foo6(x: I); // BUG 831930
->foo6 : typeof foo6
+>foo6 : { (x: A): any; (x: I): any; }
 >x : I
 >I : I
 
 function foo6(x: any) { }
->foo6 : typeof foo6
+>foo6 : { (x: A): any; (x: I): any; }
 >x : any
 
 function foo7(x: A);
->foo7 : typeof foo7
+>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 : typeof foo7
+>foo7 : { (x: A): any; (x: { foo(x: number): number; foo(x: string): string; }): any; }
 >x : { foo(x: number): number; foo(x: string): string; }
 >a : { foo(x: number): number; foo(x: string): string; }
 
 function foo7(x: any) { }
->foo7 : typeof foo7
+>foo7 : { (x: A): any; (x: { foo(x: number): number; foo(x: string): string; }): any; }
 >x : any
 
 function foo8(x: B);
->foo8 : typeof foo8
+>foo8 : { (x: B): any; (x: I): any; }
 >x : B
 >B : B
 
 function foo8(x: I); // BUG 831930
->foo8 : typeof foo8
+>foo8 : { (x: B): any; (x: I): any; }
 >x : I
 >I : I
 
 function foo8(x: any) { }
->foo8 : typeof foo8
+>foo8 : { (x: B): any; (x: I): any; }
 >x : any
 
 function foo9(x: B);
->foo9 : typeof foo9
+>foo9 : { (x: B): any; (x: C<string>): any; }
 >x : B
 >B : B
 
 function foo9(x: C<string>); // ok
->foo9 : typeof foo9
+>foo9 : { (x: B): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo9(x: any) { }
->foo9 : typeof foo9
+>foo9 : { (x: B): any; (x: C<string>): any; }
 >x : any
 
 function foo10(x: B);
->foo10 : typeof foo10
+>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 : typeof foo10
+>foo10 : { (x: B): any; (x: { foo(x: number): number; foo(x: string): string; }): any; }
 >x : { foo(x: number): number; foo(x: string): string; }
 >a : { foo(x: number): number; foo(x: string): string; }
 
 function foo10(x: any) { }
->foo10 : typeof foo10
+>foo10 : { (x: B): any; (x: { foo(x: number): number; foo(x: string): string; }): any; }
 >x : any
 
 function foo11(x: B);
->foo11 : typeof foo11
+>foo11 : { (x: B): any; (x: { foo: (x: any) => any; }): any; }
 >x : B
 >B : B
 
 function foo11(x: typeof b); // ok
->foo11 : typeof foo11
+>foo11 : { (x: B): any; (x: { foo: (x: any) => any; }): any; }
 >x : { foo: (x: any) => any; }
 >b : { foo: (x: any) => any; }
 
 function foo11(x: any) { }
->foo11 : typeof foo11
+>foo11 : { (x: B): any; (x: { foo: (x: any) => any; }): any; }
 >x : any
 
 function foo12(x: I);
->foo12 : typeof foo12
+>foo12 : { (x: I): any; (x: C<string>): any; }
 >x : I
 >I : I
 
 function foo12(x: C<string>); // ok
->foo12 : typeof foo12
+>foo12 : { (x: I): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo12(x: any) { }
->foo12 : typeof foo12
+>foo12 : { (x: I): any; (x: C<string>): any; }
 >x : any
 
 function foo12b(x: I2<string>);
->foo12b : typeof foo12b
+>foo12b : { (x: I2<string>): any; (x: C<string>): any; }
 >x : I2<string>
 >I2 : I2<T>
 
 function foo12b(x: C<string>); // ok
->foo12b : typeof foo12b
+>foo12b : { (x: I2<string>): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo12b(x: any) { }
->foo12b : typeof foo12b
+>foo12b : { (x: I2<string>): any; (x: C<string>): any; }
 >x : any
 
 function foo13(x: I);
->foo13 : typeof foo13
+>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 : typeof foo13
+>foo13 : { (x: I): any; (x: { foo(x: number): number; foo(x: string): string; }): any; }
 >x : { foo(x: number): number; foo(x: string): string; }
 >a : { foo(x: number): number; foo(x: string): string; }
 
 function foo13(x: any) { }
->foo13 : typeof foo13
+>foo13 : { (x: I): any; (x: { foo(x: number): number; foo(x: string): string; }): any; }
 >x : any
 
 function foo14(x: I);
->foo14 : typeof foo14
+>foo14 : { (x: I): any; (x: { foo: (x: any) => any; }): any; }
 >x : I
 >I : I
 
 function foo14(x: typeof b); // ok
->foo14 : typeof foo14
+>foo14 : { (x: I): any; (x: { foo: (x: any) => any; }): any; }
 >x : { foo: (x: any) => any; }
 >b : { foo: (x: any) => any; }
 
 function foo14(x: any) { }
->foo14 : typeof foo14
+>foo14 : { (x: I): any; (x: { foo: (x: any) => any; }): any; }
 >x : any
 
 function foo15(x: I2<string>);
->foo15 : typeof foo15
+>foo15 : { (x: I2<string>): any; (x: C<number>): any; }
 >x : I2<string>
 >I2 : I2<T>
 
 function foo15(x: C<number>); // ok
->foo15 : typeof foo15
+>foo15 : { (x: I2<string>): any; (x: C<number>): any; }
 >x : C<number>
 >C : C<T>
 
 function foo15(x: any) { }
->foo15 : typeof foo15
+>foo15 : { (x: I2<string>): any; (x: C<number>): any; }
 >x : any
 
diff --git a/tests/baselines/reference/objectTypesIdentityWithConstructSignatures.types b/tests/baselines/reference/objectTypesIdentityWithConstructSignatures.types
index f78a89f9097..a29f213bdde 100644
--- a/tests/baselines/reference/objectTypesIdentityWithConstructSignatures.types
+++ b/tests/baselines/reference/objectTypesIdentityWithConstructSignatures.types
@@ -46,226 +46,226 @@ var a: { new(x: string) }
 >x : string
 
 function foo1(x: A);
->foo1 : typeof foo1
+>foo1 : { (x: A): any; (x: A): any; }
 >x : A
 >A : A
 
 function foo1(x: A); // error
->foo1 : typeof foo1
+>foo1 : { (x: A): any; (x: A): any; }
 >x : A
 >A : A
 
 function foo1(x: any) { }
->foo1 : typeof foo1
+>foo1 : { (x: A): any; (x: A): any; }
 >x : any
 
 function foo1b(x: B);
->foo1b : typeof foo1b
+>foo1b : { (x: B): any; (x: B): any; }
 >x : B
 >B : B
 
 function foo1b(x: B); // error
->foo1b : typeof foo1b
+>foo1b : { (x: B): any; (x: B): any; }
 >x : B
 >B : B
 
 function foo1b(x: any) { }
->foo1b : typeof foo1b
+>foo1b : { (x: B): any; (x: B): any; }
 >x : any
 
 function foo1c(x: C<string>);
->foo1c : typeof foo1c
+>foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo1c(x: C<string>); // error
->foo1c : typeof foo1c
+>foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo1c(x: any) { }
->foo1c : typeof foo1c
+>foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : any
 
 function foo2(x: I);
->foo2 : typeof foo2
+>foo2 : { (x: I): any; (x: I): any; }
 >x : I
 >I : I
 
 function foo2(x: I); // error
->foo2 : typeof foo2
+>foo2 : { (x: I): any; (x: I): any; }
 >x : I
 >I : I
 
 function foo2(x: any) { }
->foo2 : typeof foo2
+>foo2 : { (x: I): any; (x: I): any; }
 >x : any
 
 function foo3(x: typeof a);
->foo3 : typeof foo3
+>foo3 : { (x: new (x: string) => any): any; (x: new (x: string) => any): any; }
 >x : new (x: string) => any
 >a : new (x: string) => any
 
 function foo3(x: typeof a); // error
->foo3 : typeof foo3
+>foo3 : { (x: new (x: string) => any): any; (x: new (x: string) => any): any; }
 >x : new (x: string) => any
 >a : new (x: string) => any
 
 function foo3(x: any) { }
->foo3 : typeof foo3
+>foo3 : { (x: new (x: string) => any): any; (x: new (x: string) => any): any; }
 >x : any
 
 function foo5(x: A);
->foo5 : typeof foo5
+>foo5 : { (x: A): any; (x: B): any; }
 >x : A
 >A : A
 
 function foo5(x: B); // error
->foo5 : typeof foo5
+>foo5 : { (x: A): any; (x: B): any; }
 >x : B
 >B : B
 
 function foo5(x: any) { }
->foo5 : typeof foo5
+>foo5 : { (x: A): any; (x: B): any; }
 >x : any
 
 function foo5b(x: A);
->foo5b : typeof foo5b
+>foo5b : { (x: A): any; (x: C<string>): any; }
 >x : A
 >A : A
 
 function foo5b(x: C<string>); // error
->foo5b : typeof foo5b
+>foo5b : { (x: A): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo5b(x: any) { }
->foo5b : typeof foo5b
+>foo5b : { (x: A): any; (x: C<string>): any; }
 >x : any
 
 function foo6(x: A);
->foo6 : typeof foo6
+>foo6 : { (x: A): any; (x: I): any; }
 >x : A
 >A : A
 
 function foo6(x: I); // ok 
->foo6 : typeof foo6
+>foo6 : { (x: A): any; (x: I): any; }
 >x : I
 >I : I
 
 function foo6(x: any) { }
->foo6 : typeof foo6
+>foo6 : { (x: A): any; (x: I): any; }
 >x : any
 
 function foo7(x: A);
->foo7 : typeof foo7
+>foo7 : { (x: A): any; (x: new (x: string) => any): any; }
 >x : A
 >A : A
 
 function foo7(x: typeof a); // ok
->foo7 : typeof foo7
+>foo7 : { (x: A): any; (x: new (x: string) => any): any; }
 >x : new (x: string) => any
 >a : new (x: string) => any
 
 function foo7(x: any) { }
->foo7 : typeof foo7
+>foo7 : { (x: A): any; (x: new (x: string) => any): any; }
 >x : any
 
 function foo8(x: B);
->foo8 : typeof foo8
+>foo8 : { (x: B): any; (x: I): any; }
 >x : B
 >B : B
 
 function foo8(x: I); // ok
->foo8 : typeof foo8
+>foo8 : { (x: B): any; (x: I): any; }
 >x : I
 >I : I
 
 function foo8(x: any) { }
->foo8 : typeof foo8
+>foo8 : { (x: B): any; (x: I): any; }
 >x : any
 
 function foo9(x: B);
->foo9 : typeof foo9
+>foo9 : { (x: B): any; (x: C<string>): any; }
 >x : B
 >B : B
 
 function foo9(x: C<string>); // error
->foo9 : typeof foo9
+>foo9 : { (x: B): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo9(x: any) { }
->foo9 : typeof foo9
+>foo9 : { (x: B): any; (x: C<string>): any; }
 >x : any
 
 function foo10(x: B);
->foo10 : typeof foo10
+>foo10 : { (x: B): any; (x: new (x: string) => any): any; }
 >x : B
 >B : B
 
 function foo10(x: typeof a); // ok
->foo10 : typeof foo10
+>foo10 : { (x: B): any; (x: new (x: string) => any): any; }
 >x : new (x: string) => any
 >a : new (x: string) => any
 
 function foo10(x: any) { }
->foo10 : typeof foo10
+>foo10 : { (x: B): any; (x: new (x: string) => any): any; }
 >x : any
 
 function foo12(x: I);
->foo12 : typeof foo12
+>foo12 : { (x: I): any; (x: C<string>): any; }
 >x : I
 >I : I
 
 function foo12(x: C<string>); // ok
->foo12 : typeof foo12
+>foo12 : { (x: I): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo12(x: any) { }
->foo12 : typeof foo12
+>foo12 : { (x: I): any; (x: C<string>): any; }
 >x : any
 
 function foo12b(x: I2<string>);
->foo12b : typeof foo12b
+>foo12b : { (x: I2<string>): any; (x: C<string>): any; }
 >x : I2<string>
 >I2 : I2<T>
 
 function foo12b(x: C<string>); // ok
->foo12b : typeof foo12b
+>foo12b : { (x: I2<string>): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo12b(x: any) { }
->foo12b : typeof foo12b
+>foo12b : { (x: I2<string>): any; (x: C<string>): any; }
 >x : any
 
 function foo13(x: I);
->foo13 : typeof foo13
+>foo13 : { (x: I): any; (x: new (x: string) => any): any; }
 >x : I
 >I : I
 
 function foo13(x: typeof a); // error
->foo13 : typeof foo13
+>foo13 : { (x: I): any; (x: new (x: string) => any): any; }
 >x : new (x: string) => any
 >a : new (x: string) => any
 
 function foo13(x: any) { }
->foo13 : typeof foo13
+>foo13 : { (x: I): any; (x: new (x: string) => any): any; }
 >x : any
 
 function foo15(x: I2<string>);
->foo15 : typeof foo15
+>foo15 : { (x: I2<string>): any; (x: C<number>): any; }
 >x : I2<string>
 >I2 : I2<T>
 
 function foo15(x: C<number>); // ok
->foo15 : typeof foo15
+>foo15 : { (x: I2<string>): any; (x: C<number>): any; }
 >x : C<number>
 >C : C<T>
 
 function foo15(x: any) { }
->foo15 : typeof foo15
+>foo15 : { (x: I2<string>): any; (x: C<number>): any; }
 >x : any
 
diff --git a/tests/baselines/reference/objectTypesIdentityWithConstructSignatures2.types b/tests/baselines/reference/objectTypesIdentityWithConstructSignatures2.types
index 2245a3c8cef..c530f1ced9b 100644
--- a/tests/baselines/reference/objectTypesIdentityWithConstructSignatures2.types
+++ b/tests/baselines/reference/objectTypesIdentityWithConstructSignatures2.types
@@ -48,198 +48,198 @@ var b = { new(x: RegExp) { return ''; } }; // not a construct signature, functio
 >RegExp : RegExp
 
 function foo1b(x: B);
->foo1b : typeof foo1b
+>foo1b : { (x: B): any; (x: B): any; }
 >x : B
 >B : B
 
 function foo1b(x: B); // error
->foo1b : typeof foo1b
+>foo1b : { (x: B): any; (x: B): any; }
 >x : B
 >B : B
 
 function foo1b(x: any) { }
->foo1b : typeof foo1b
+>foo1b : { (x: B): any; (x: B): any; }
 >x : any
 
 function foo1c(x: C<string>);
->foo1c : typeof foo1c
+>foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo1c(x: C<string>); // error
->foo1c : typeof foo1c
+>foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo1c(x: any) { }
->foo1c : typeof foo1c
+>foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : any
 
 function foo2(x: I);
->foo2 : typeof foo2
+>foo2 : { (x: I): any; (x: I): any; }
 >x : I
 >I : I
 
 function foo2(x: I); // error
->foo2 : typeof foo2
+>foo2 : { (x: I): any; (x: I): any; }
 >x : I
 >I : I
 
 function foo2(x: any) { }
->foo2 : typeof foo2
+>foo2 : { (x: I): any; (x: I): any; }
 >x : any
 
 function foo3(x: typeof a);
->foo3 : typeof foo3
+>foo3 : { (x: new (x: Date) => string): any; (x: new (x: Date) => string): any; }
 >x : new (x: Date) => string
 >a : new (x: Date) => string
 
 function foo3(x: typeof a); // error
->foo3 : typeof foo3
+>foo3 : { (x: new (x: Date) => string): any; (x: new (x: Date) => string): any; }
 >x : new (x: Date) => string
 >a : new (x: Date) => string
 
 function foo3(x: any) { }
->foo3 : typeof foo3
+>foo3 : { (x: new (x: Date) => string): any; (x: new (x: Date) => string): any; }
 >x : any
 
 function foo4(x: typeof b);
->foo4 : typeof foo4
+>foo4 : { (x: { new: (x: RegExp) => string; }): any; (x: { new: (x: RegExp) => string; }): any; }
 >x : { new: (x: RegExp) => string; }
 >b : { new: (x: RegExp) => string; }
 
 function foo4(x: typeof b); // error
->foo4 : typeof foo4
+>foo4 : { (x: { new: (x: RegExp) => string; }): any; (x: { new: (x: RegExp) => string; }): any; }
 >x : { new: (x: RegExp) => string; }
 >b : { new: (x: RegExp) => string; }
 
 function foo4(x: any) { }
->foo4 : typeof foo4
+>foo4 : { (x: { new: (x: RegExp) => string; }): any; (x: { new: (x: RegExp) => string; }): any; }
 >x : any
 
 function foo8(x: B);
->foo8 : typeof foo8
+>foo8 : { (x: B): any; (x: I): any; }
 >x : B
 >B : B
 
 function foo8(x: I); // ok
->foo8 : typeof foo8
+>foo8 : { (x: B): any; (x: I): any; }
 >x : I
 >I : I
 
 function foo8(x: any) { }
->foo8 : typeof foo8
+>foo8 : { (x: B): any; (x: I): any; }
 >x : any
 
 function foo9(x: B);
->foo9 : typeof foo9
+>foo9 : { (x: B): any; (x: C<string>): any; }
 >x : B
 >B : B
 
 function foo9(x: C<string>); // error, types are structurally equal
->foo9 : typeof foo9
+>foo9 : { (x: B): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo9(x: any) { }
->foo9 : typeof foo9
+>foo9 : { (x: B): any; (x: C<string>): any; }
 >x : any
 
 function foo10(x: B);
->foo10 : typeof foo10
+>foo10 : { (x: B): any; (x: new (x: Date) => string): any; }
 >x : B
 >B : B
 
 function foo10(x: typeof a); // ok
->foo10 : typeof foo10
+>foo10 : { (x: B): any; (x: new (x: Date) => string): any; }
 >x : new (x: Date) => string
 >a : new (x: Date) => string
 
 function foo10(x: any) { }
->foo10 : typeof foo10
+>foo10 : { (x: B): any; (x: new (x: Date) => string): any; }
 >x : any
 
 function foo11(x: B);
->foo11 : typeof foo11
+>foo11 : { (x: B): any; (x: { new: (x: RegExp) => string; }): any; }
 >x : B
 >B : B
 
 function foo11(x: typeof b); // ok
->foo11 : typeof foo11
+>foo11 : { (x: B): any; (x: { new: (x: RegExp) => string; }): any; }
 >x : { new: (x: RegExp) => string; }
 >b : { new: (x: RegExp) => string; }
 
 function foo11(x: any) { }
->foo11 : typeof foo11
+>foo11 : { (x: B): any; (x: { new: (x: RegExp) => string; }): any; }
 >x : any
 
 function foo12(x: I);
->foo12 : typeof foo12
+>foo12 : { (x: I): any; (x: C<string>): any; }
 >x : I
 >I : I
 
 function foo12(x: C<string>); // ok
->foo12 : typeof foo12
+>foo12 : { (x: I): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo12(x: any) { }
->foo12 : typeof foo12
+>foo12 : { (x: I): any; (x: C<string>): any; }
 >x : any
 
 function foo12b(x: I2<string>);
->foo12b : typeof foo12b
+>foo12b : { (x: I2<string>): any; (x: C<string>): any; }
 >x : I2<string>
 >I2 : I2<T>
 
 function foo12b(x: C<string>); // ok
->foo12b : typeof foo12b
+>foo12b : { (x: I2<string>): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo12b(x: any) { }
->foo12b : typeof foo12b
+>foo12b : { (x: I2<string>): any; (x: C<string>): any; }
 >x : any
 
 function foo13(x: I);
->foo13 : typeof foo13
+>foo13 : { (x: I): any; (x: new (x: Date) => string): any; }
 >x : I
 >I : I
 
 function foo13(x: typeof a); // ok
->foo13 : typeof foo13
+>foo13 : { (x: I): any; (x: new (x: Date) => string): any; }
 >x : new (x: Date) => string
 >a : new (x: Date) => string
 
 function foo13(x: any) { }
->foo13 : typeof foo13
+>foo13 : { (x: I): any; (x: new (x: Date) => string): any; }
 >x : any
 
 function foo14(x: I);
->foo14 : typeof foo14
+>foo14 : { (x: I): any; (x: { new: (x: RegExp) => string; }): any; }
 >x : I
 >I : I
 
 function foo14(x: typeof b); // ok
->foo14 : typeof foo14
+>foo14 : { (x: I): any; (x: { new: (x: RegExp) => string; }): any; }
 >x : { new: (x: RegExp) => string; }
 >b : { new: (x: RegExp) => string; }
 
 function foo14(x: any) { }
->foo14 : typeof foo14
+>foo14 : { (x: I): any; (x: { new: (x: RegExp) => string; }): any; }
 >x : any
 
 function foo15(x: I2<string>);
->foo15 : typeof foo15
+>foo15 : { (x: I2<string>): any; (x: C<number>): any; }
 >x : I2<string>
 >I2 : I2<T>
 
 function foo15(x: C<number>); // ok
->foo15 : typeof foo15
+>foo15 : { (x: I2<string>): any; (x: C<number>): any; }
 >x : C<number>
 >C : C<T>
 
 function foo15(x: any) { }
->foo15 : typeof foo15
+>foo15 : { (x: I2<string>): any; (x: C<number>): any; }
 >x : any
 
diff --git a/tests/baselines/reference/objectTypesIdentityWithConstructSignaturesDifferingParamCounts.types b/tests/baselines/reference/objectTypesIdentityWithConstructSignaturesDifferingParamCounts.types
index 615a1cd6e6b..e5598f874e0 100644
--- a/tests/baselines/reference/objectTypesIdentityWithConstructSignaturesDifferingParamCounts.types
+++ b/tests/baselines/reference/objectTypesIdentityWithConstructSignaturesDifferingParamCounts.types
@@ -50,198 +50,198 @@ var b = { new(x: string) { return ''; } }; // not a construct signature, functio
 >x : string
 
 function foo1b(x: B);
->foo1b : typeof foo1b
+>foo1b : { (x: B): any; (x: B): any; }
 >x : B
 >B : B
 
 function foo1b(x: B); // error
->foo1b : typeof foo1b
+>foo1b : { (x: B): any; (x: B): any; }
 >x : B
 >B : B
 
 function foo1b(x: any) { }
->foo1b : typeof foo1b
+>foo1b : { (x: B): any; (x: B): any; }
 >x : any
 
 function foo1c(x: C<string>);
->foo1c : typeof foo1c
+>foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo1c(x: C<string>); // error
->foo1c : typeof foo1c
+>foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo1c(x: any) { }
->foo1c : typeof foo1c
+>foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : any
 
 function foo2(x: I);
->foo2 : typeof foo2
+>foo2 : { (x: I): any; (x: I): any; }
 >x : I
 >I : I
 
 function foo2(x: I); // error
->foo2 : typeof foo2
+>foo2 : { (x: I): any; (x: I): any; }
 >x : I
 >I : I
 
 function foo2(x: any) { }
->foo2 : typeof foo2
+>foo2 : { (x: I): any; (x: I): any; }
 >x : any
 
 function foo3(x: typeof a);
->foo3 : typeof foo3
+>foo3 : { (x: new (x: string, y: string) => string): any; (x: new (x: string, y: string) => string): any; }
 >x : new (x: string, y: string) => string
 >a : new (x: string, y: string) => string
 
 function foo3(x: typeof a); // error
->foo3 : typeof foo3
+>foo3 : { (x: new (x: string, y: string) => string): any; (x: new (x: string, y: string) => string): any; }
 >x : new (x: string, y: string) => string
 >a : new (x: string, y: string) => string
 
 function foo3(x: any) { }
->foo3 : typeof foo3
+>foo3 : { (x: new (x: string, y: string) => string): any; (x: new (x: string, y: string) => string): any; }
 >x : any
 
 function foo4(x: typeof b);
->foo4 : typeof foo4
+>foo4 : { (x: { new: (x: string) => string; }): any; (x: { new: (x: string) => string; }): any; }
 >x : { new: (x: string) => string; }
 >b : { new: (x: string) => string; }
 
 function foo4(x: typeof b); // error
->foo4 : typeof foo4
+>foo4 : { (x: { new: (x: string) => string; }): any; (x: { new: (x: string) => string; }): any; }
 >x : { new: (x: string) => string; }
 >b : { new: (x: string) => string; }
 
 function foo4(x: any) { }
->foo4 : typeof foo4
+>foo4 : { (x: { new: (x: string) => string; }): any; (x: { new: (x: string) => string; }): any; }
 >x : any
 
 function foo8(x: B);
->foo8 : typeof foo8
+>foo8 : { (x: B): any; (x: I): any; }
 >x : B
 >B : B
 
 function foo8(x: I); // ok
->foo8 : typeof foo8
+>foo8 : { (x: B): any; (x: I): any; }
 >x : I
 >I : I
 
 function foo8(x: any) { }
->foo8 : typeof foo8
+>foo8 : { (x: B): any; (x: I): any; }
 >x : any
 
 function foo9(x: B);
->foo9 : typeof foo9
+>foo9 : { (x: B): any; (x: C<string>): any; }
 >x : B
 >B : B
 
 function foo9(x: C<string>); // error, types are structurally equal
->foo9 : typeof foo9
+>foo9 : { (x: B): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo9(x: any) { }
->foo9 : typeof foo9
+>foo9 : { (x: B): any; (x: C<string>): any; }
 >x : any
 
 function foo10(x: B);
->foo10 : typeof foo10
+>foo10 : { (x: B): any; (x: new (x: string, y: string) => string): any; }
 >x : B
 >B : B
 
 function foo10(x: typeof a); // ok
->foo10 : typeof foo10
+>foo10 : { (x: B): any; (x: new (x: string, y: string) => string): any; }
 >x : new (x: string, y: string) => string
 >a : new (x: string, y: string) => string
 
 function foo10(x: any) { }
->foo10 : typeof foo10
+>foo10 : { (x: B): any; (x: new (x: string, y: string) => string): any; }
 >x : any
 
 function foo11(x: B);
->foo11 : typeof foo11
+>foo11 : { (x: B): any; (x: { new: (x: string) => string; }): any; }
 >x : B
 >B : B
 
 function foo11(x: typeof b); // ok
->foo11 : typeof foo11
+>foo11 : { (x: B): any; (x: { new: (x: string) => string; }): any; }
 >x : { new: (x: string) => string; }
 >b : { new: (x: string) => string; }
 
 function foo11(x: any) { }
->foo11 : typeof foo11
+>foo11 : { (x: B): any; (x: { new: (x: string) => string; }): any; }
 >x : any
 
 function foo12(x: I);
->foo12 : typeof foo12
+>foo12 : { (x: I): any; (x: C<string>): any; }
 >x : I
 >I : I
 
 function foo12(x: C<string>); // ok
->foo12 : typeof foo12
+>foo12 : { (x: I): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo12(x: any) { }
->foo12 : typeof foo12
+>foo12 : { (x: I): any; (x: C<string>): any; }
 >x : any
 
 function foo12b(x: I2<string>);
->foo12b : typeof foo12b
+>foo12b : { (x: I2<string>): any; (x: C<string>): any; }
 >x : I2<string>
 >I2 : I2<T>
 
 function foo12b(x: C<string>); // ok
->foo12b : typeof foo12b
+>foo12b : { (x: I2<string>): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo12b(x: any) { }
->foo12b : typeof foo12b
+>foo12b : { (x: I2<string>): any; (x: C<string>): any; }
 >x : any
 
 function foo13(x: I);
->foo13 : typeof foo13
+>foo13 : { (x: I): any; (x: new (x: string, y: string) => string): any; }
 >x : I
 >I : I
 
 function foo13(x: typeof a); // ok
->foo13 : typeof foo13
+>foo13 : { (x: I): any; (x: new (x: string, y: string) => string): any; }
 >x : new (x: string, y: string) => string
 >a : new (x: string, y: string) => string
 
 function foo13(x: any) { }
->foo13 : typeof foo13
+>foo13 : { (x: I): any; (x: new (x: string, y: string) => string): any; }
 >x : any
 
 function foo14(x: I);
->foo14 : typeof foo14
+>foo14 : { (x: I): any; (x: { new: (x: string) => string; }): any; }
 >x : I
 >I : I
 
 function foo14(x: typeof b); // ok
->foo14 : typeof foo14
+>foo14 : { (x: I): any; (x: { new: (x: string) => string; }): any; }
 >x : { new: (x: string) => string; }
 >b : { new: (x: string) => string; }
 
 function foo14(x: any) { }
->foo14 : typeof foo14
+>foo14 : { (x: I): any; (x: { new: (x: string) => string; }): any; }
 >x : any
 
 function foo15(x: I2<string>);
->foo15 : typeof foo15
+>foo15 : { (x: I2<string>): any; (x: C<number>): any; }
 >x : I2<string>
 >I2 : I2<T>
 
 function foo15(x: C<number>); // ok
->foo15 : typeof foo15
+>foo15 : { (x: I2<string>): any; (x: C<number>): any; }
 >x : C<number>
 >C : C<T>
 
 function foo15(x: any) { }
->foo15 : typeof foo15
+>foo15 : { (x: I2<string>): any; (x: C<number>): any; }
 >x : any
 
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignatures.types b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignatures.types
index a6223aae995..240e12b1c22 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignatures.types
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignatures.types
@@ -75,268 +75,268 @@ var b = { foo<T>(x: T) { return x; } };
 >x : T
 
 function foo1(x: A);
->foo1 : typeof foo1
+>foo1 : { (x: A): any; (x: A): any; }
 >x : A
 >A : A
 
 function foo1(x: A); // error
->foo1 : typeof foo1
+>foo1 : { (x: A): any; (x: A): any; }
 >x : A
 >A : A
 
 function foo1(x: any) { }
->foo1 : typeof foo1
+>foo1 : { (x: A): any; (x: A): any; }
 >x : any
 
 function foo1b(x: B<string>);
->foo1b : typeof foo1b
+>foo1b : { (x: B<string>): any; (x: B<string>): any; }
 >x : B<string>
 >B : B<T>
 
 function foo1b(x: B<string>); // error
->foo1b : typeof foo1b
+>foo1b : { (x: B<string>): any; (x: B<string>): any; }
 >x : B<string>
 >B : B<T>
 
 function foo1b(x: any) { }
->foo1b : typeof foo1b
+>foo1b : { (x: B<string>): any; (x: B<string>): any; }
 >x : any
 
 function foo1c(x: C<string>);
->foo1c : typeof foo1c
+>foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo1c(x: C<string>); // error
->foo1c : typeof foo1c
+>foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo1c(x: any) { }
->foo1c : typeof foo1c
+>foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : any
 
 function foo2(x: I<string>);
->foo2 : typeof foo2
+>foo2 : { (x: I<string>): any; (x: I<string>): any; }
 >x : I<string>
 >I : I<T>
 
 function foo2(x: I<string>); // error
->foo2 : typeof foo2
+>foo2 : { (x: I<string>): any; (x: I<string>): any; }
 >x : I<string>
 >I : I<T>
 
 function foo2(x: any) { }
->foo2 : typeof foo2
+>foo2 : { (x: I<string>): any; (x: I<string>): any; }
 >x : any
 
 function foo3(x: typeof a);
->foo3 : typeof foo3
+>foo3 : { (x: { foo<T>(x: T): T; }): any; (x: { foo<T>(x: T): T; }): any; }
 >x : { foo<T>(x: T): T; }
 >a : { foo<T>(x: T): T; }
 
 function foo3(x: typeof a); // error
->foo3 : typeof foo3
+>foo3 : { (x: { foo<T>(x: T): T; }): any; (x: { foo<T>(x: T): T; }): any; }
 >x : { foo<T>(x: T): T; }
 >a : { foo<T>(x: T): T; }
 
 function foo3(x: any) { }
->foo3 : typeof foo3
+>foo3 : { (x: { foo<T>(x: T): T; }): any; (x: { foo<T>(x: T): T; }): any; }
 >x : any
 
 function foo4(x: typeof b);
->foo4 : typeof foo4
+>foo4 : { (x: { foo: <T>(x: T) => T; }): any; (x: { foo: <T>(x: T) => T; }): any; }
 >x : { foo: <T>(x: T) => T; }
 >b : { foo: <T>(x: T) => T; }
 
 function foo4(x: typeof b); // error
->foo4 : typeof foo4
+>foo4 : { (x: { foo: <T>(x: T) => T; }): any; (x: { foo: <T>(x: T) => T; }): any; }
 >x : { foo: <T>(x: T) => T; }
 >b : { foo: <T>(x: T) => T; }
 
 function foo4(x: any) { }
->foo4 : typeof foo4
+>foo4 : { (x: { foo: <T>(x: T) => T; }): any; (x: { foo: <T>(x: T) => T; }): any; }
 >x : any
 
 function foo5(x: A);
->foo5 : typeof foo5
+>foo5 : { (x: A): any; (x: B<string>): any; }
 >x : A
 >A : A
 
 function foo5(x: B<string>); // ok
->foo5 : typeof foo5
+>foo5 : { (x: A): any; (x: B<string>): any; }
 >x : B<string>
 >B : B<T>
 
 function foo5(x: any) { }
->foo5 : typeof foo5
+>foo5 : { (x: A): any; (x: B<string>): any; }
 >x : any
 
 function foo5b(x: A);
->foo5b : typeof foo5b
+>foo5b : { (x: A): any; (x: C<string>): any; }
 >x : A
 >A : A
 
 function foo5b(x: C<string>); // ok
->foo5b : typeof foo5b
+>foo5b : { (x: A): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo5b(x: any) { }
->foo5b : typeof foo5b
+>foo5b : { (x: A): any; (x: C<string>): any; }
 >x : any
 
 function foo6(x: A);
->foo6 : typeof foo6
+>foo6 : { (x: A): any; (x: I<string>): any; }
 >x : A
 >A : A
 
 function foo6(x: I<string>); // ok
->foo6 : typeof foo6
+>foo6 : { (x: A): any; (x: I<string>): any; }
 >x : I<string>
 >I : I<T>
 
 function foo6(x: any) { }
->foo6 : typeof foo6
+>foo6 : { (x: A): any; (x: I<string>): any; }
 >x : any
 
 function foo7(x: A);
->foo7 : typeof foo7
+>foo7 : { (x: A): any; (x: { foo<T>(x: T): T; }): any; }
 >x : A
 >A : A
 
 function foo7(x: typeof a); // error
->foo7 : typeof foo7
+>foo7 : { (x: A): any; (x: { foo<T>(x: T): T; }): any; }
 >x : { foo<T>(x: T): T; }
 >a : { foo<T>(x: T): T; }
 
 function foo7(x: any) { }
->foo7 : typeof foo7
+>foo7 : { (x: A): any; (x: { foo<T>(x: T): T; }): any; }
 >x : any
 
 function foo8(x: B<string>);
->foo8 : typeof foo8
+>foo8 : { (x: B<string>): any; (x: I<string>): any; }
 >x : B<string>
 >B : B<T>
 
 function foo8(x: I<string>); // error
->foo8 : typeof foo8
+>foo8 : { (x: B<string>): any; (x: I<string>): any; }
 >x : I<string>
 >I : I<T>
 
 function foo8(x: any) { }
->foo8 : typeof foo8
+>foo8 : { (x: B<string>): any; (x: I<string>): any; }
 >x : any
 
 function foo9(x: B<string>);
->foo9 : typeof foo9
+>foo9 : { (x: B<string>): any; (x: C<string>): any; }
 >x : B<string>
 >B : B<T>
 
 function foo9(x: C<string>); // error
->foo9 : typeof foo9
+>foo9 : { (x: B<string>): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo9(x: any) { }
->foo9 : typeof foo9
+>foo9 : { (x: B<string>): any; (x: C<string>): any; }
 >x : any
 
 function foo10(x: B<string>);
->foo10 : typeof foo10
+>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 : typeof foo10
+>foo10 : { (x: B<string>): any; (x: { foo<T>(x: T): T; }): any; }
 >x : { foo<T>(x: T): T; }
 >a : { foo<T>(x: T): T; }
 
 function foo10(x: any) { }
->foo10 : typeof foo10
+>foo10 : { (x: B<string>): any; (x: { foo<T>(x: T): T; }): any; }
 >x : any
 
 function foo11(x: B<string>);
->foo11 : typeof foo11
+>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 : typeof foo11
+>foo11 : { (x: B<string>): any; (x: { foo: <T>(x: T) => T; }): any; }
 >x : { foo: <T>(x: T) => T; }
 >b : { foo: <T>(x: T) => T; }
 
 function foo11(x: any) { }
->foo11 : typeof foo11
+>foo11 : { (x: B<string>): any; (x: { foo: <T>(x: T) => T; }): any; }
 >x : any
 
 function foo12(x: I<string>);
->foo12 : typeof foo12
+>foo12 : { (x: I<string>): any; (x: C<string>): any; }
 >x : I<string>
 >I : I<T>
 
 function foo12(x: C<string>); // error
->foo12 : typeof foo12
+>foo12 : { (x: I<string>): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo12(x: any) { }
->foo12 : typeof foo12
+>foo12 : { (x: I<string>): any; (x: C<string>): any; }
 >x : any
 
 function foo12b(x: I2);
->foo12b : typeof foo12b
+>foo12b : { (x: I2): any; (x: C<string>): any; }
 >x : I2
 >I2 : I2
 
 function foo12b(x: C<string>); // ok
->foo12b : typeof foo12b
+>foo12b : { (x: I2): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo12b(x: any) { }
->foo12b : typeof foo12b
+>foo12b : { (x: I2): any; (x: C<string>): any; }
 >x : any
 
 function foo13(x: I<string>);
->foo13 : typeof foo13
+>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 : typeof foo13
+>foo13 : { (x: I<string>): any; (x: { foo<T>(x: T): T; }): any; }
 >x : { foo<T>(x: T): T; }
 >a : { foo<T>(x: T): T; }
 
 function foo13(x: any) { }
->foo13 : typeof foo13
+>foo13 : { (x: I<string>): any; (x: { foo<T>(x: T): T; }): any; }
 >x : any
 
 function foo14(x: I<string>);
->foo14 : typeof foo14
+>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 : typeof foo14
+>foo14 : { (x: I<string>): any; (x: { foo: <T>(x: T) => T; }): any; }
 >x : { foo: <T>(x: T) => T; }
 >b : { foo: <T>(x: T) => T; }
 
 function foo14(x: any) { }
->foo14 : typeof foo14
+>foo14 : { (x: I<string>): any; (x: { foo: <T>(x: T) => T; }): any; }
 >x : any
 
 function foo15(x: I2);
->foo15 : typeof foo15
+>foo15 : { (x: I2): any; (x: C<number>): any; }
 >x : I2
 >I2 : I2
 
 function foo15(x: C<number>); // ok
->foo15 : typeof foo15
+>foo15 : { (x: I2): any; (x: C<number>): any; }
 >x : C<number>
 >C : C<T>
 
 function foo15(x: any) { }
->foo15 : typeof foo15
+>foo15 : { (x: I2): any; (x: C<number>): any; }
 >x : any
 
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignatures2.types b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignatures2.types
index f3ecf95b1f8..932dbf7e9b3 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignatures2.types
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignatures2.types
@@ -96,268 +96,268 @@ var b = { foo<T, U>(x: T, y: U) { return x; } };
 >x : T
 
 function foo1(x: A);
->foo1 : typeof foo1
+>foo1 : { (x: A): any; (x: A): any; }
 >x : A
 >A : A
 
 function foo1(x: A); // error
->foo1 : typeof foo1
+>foo1 : { (x: A): any; (x: A): any; }
 >x : A
 >A : A
 
 function foo1(x: any) { }
->foo1 : typeof foo1
+>foo1 : { (x: A): any; (x: A): any; }
 >x : any
 
 function foo1b(x: B<string, number>);
->foo1b : typeof foo1b
+>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 : typeof foo1b
+>foo1b : { (x: B<string, number>): any; (x: B<string, number>): any; }
 >x : B<string, number>
 >B : B<T, U>
 
 function foo1b(x: any) { }
->foo1b : typeof foo1b
+>foo1b : { (x: B<string, number>): any; (x: B<string, number>): any; }
 >x : any
 
 function foo1c(x: C<string, number>);
->foo1c : typeof foo1c
+>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 : typeof foo1c
+>foo1c : { (x: C<string, number>): any; (x: C<string, number>): any; }
 >x : C<string, number>
 >C : C<T, U>
 
 function foo1c(x: any) { }
->foo1c : typeof foo1c
+>foo1c : { (x: C<string, number>): any; (x: C<string, number>): any; }
 >x : any
 
 function foo2(x: I<string, number>);
->foo2 : typeof foo2
+>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 : typeof foo2
+>foo2 : { (x: I<string, number>): any; (x: I<string, number>): any; }
 >x : I<string, number>
 >I : I<T, U>
 
 function foo2(x: any) { }
->foo2 : typeof foo2
+>foo2 : { (x: I<string, number>): any; (x: I<string, number>): any; }
 >x : any
 
 function foo3(x: typeof a);
->foo3 : typeof foo3
+>foo3 : { (x: { foo<T, U>(x: T, y: U): T; }): any; (x: { foo<T, U>(x: T, y: U): T; }): any; }
 >x : { foo<T, U>(x: T, y: U): T; }
 >a : { foo<T, U>(x: T, y: U): T; }
 
 function foo3(x: typeof a); // error
->foo3 : typeof foo3
+>foo3 : { (x: { foo<T, U>(x: T, y: U): T; }): any; (x: { foo<T, U>(x: T, y: U): T; }): any; }
 >x : { foo<T, U>(x: T, y: U): T; }
 >a : { foo<T, U>(x: T, y: U): T; }
 
 function foo3(x: any) { }
->foo3 : typeof foo3
+>foo3 : { (x: { foo<T, U>(x: T, y: U): T; }): any; (x: { foo<T, U>(x: T, y: U): T; }): any; }
 >x : any
 
 function foo4(x: typeof b);
->foo4 : typeof foo4
+>foo4 : { (x: { foo: <T, U>(x: T, y: U) => T; }): any; (x: { foo: <T, U>(x: T, y: U) => T; }): any; }
 >x : { foo: <T, U>(x: T, y: U) => T; }
 >b : { foo: <T, U>(x: T, y: U) => T; }
 
 function foo4(x: typeof b); // error
->foo4 : typeof foo4
+>foo4 : { (x: { foo: <T, U>(x: T, y: U) => T; }): any; (x: { foo: <T, U>(x: T, y: U) => T; }): any; }
 >x : { foo: <T, U>(x: T, y: U) => T; }
 >b : { foo: <T, U>(x: T, y: U) => T; }
 
 function foo4(x: any) { }
->foo4 : typeof foo4
+>foo4 : { (x: { foo: <T, U>(x: T, y: U) => T; }): any; (x: { foo: <T, U>(x: T, y: U) => T; }): any; }
 >x : any
 
 function foo5(x: A);
->foo5 : typeof foo5
+>foo5 : { (x: A): any; (x: B<string, number>): any; }
 >x : A
 >A : A
 
 function foo5(x: B<string, number>); // ok
->foo5 : typeof foo5
+>foo5 : { (x: A): any; (x: B<string, number>): any; }
 >x : B<string, number>
 >B : B<T, U>
 
 function foo5(x: any) { }
->foo5 : typeof foo5
+>foo5 : { (x: A): any; (x: B<string, number>): any; }
 >x : any
 
 function foo5b(x: A);
->foo5b : typeof foo5b
+>foo5b : { (x: A): any; (x: C<string, number>): any; }
 >x : A
 >A : A
 
 function foo5b(x: C<string, number>); // ok
->foo5b : typeof foo5b
+>foo5b : { (x: A): any; (x: C<string, number>): any; }
 >x : C<string, number>
 >C : C<T, U>
 
 function foo5b(x: any) { }
->foo5b : typeof foo5b
+>foo5b : { (x: A): any; (x: C<string, number>): any; }
 >x : any
 
 function foo6(x: A);
->foo6 : typeof foo6
+>foo6 : { (x: A): any; (x: I<string, number>): any; }
 >x : A
 >A : A
 
 function foo6(x: I<string, number>); // ok
->foo6 : typeof foo6
+>foo6 : { (x: A): any; (x: I<string, number>): any; }
 >x : I<string, number>
 >I : I<T, U>
 
 function foo6(x: any) { }
->foo6 : typeof foo6
+>foo6 : { (x: A): any; (x: I<string, number>): any; }
 >x : any
 
 function foo7(x: A);
->foo7 : typeof foo7
+>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 : typeof foo7
+>foo7 : { (x: A): any; (x: { foo<T, U>(x: T, y: U): T; }): any; }
 >x : { foo<T, U>(x: T, y: U): T; }
 >a : { foo<T, U>(x: T, y: U): T; }
 
 function foo7(x: any) { }
->foo7 : typeof foo7
+>foo7 : { (x: A): any; (x: { foo<T, U>(x: T, y: U): T; }): any; }
 >x : any
 
 function foo8(x: B<string, number>);
->foo8 : typeof foo8
+>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 : typeof foo8
+>foo8 : { (x: B<string, number>): any; (x: I<string, number>): any; }
 >x : I<string, number>
 >I : I<T, U>
 
 function foo8(x: any) { }
->foo8 : typeof foo8
+>foo8 : { (x: B<string, number>): any; (x: I<string, number>): any; }
 >x : any
 
 function foo9(x: B<string, number>);
->foo9 : typeof foo9
+>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 : typeof foo9
+>foo9 : { (x: B<string, number>): any; (x: C<string, number>): any; }
 >x : C<string, number>
 >C : C<T, U>
 
 function foo9(x: any) { }
->foo9 : typeof foo9
+>foo9 : { (x: B<string, number>): any; (x: C<string, number>): any; }
 >x : any
 
 function foo10(x: B<string, number>);
->foo10 : typeof foo10
+>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 : typeof foo10
+>foo10 : { (x: B<string, number>): any; (x: { foo<T, U>(x: T, y: U): T; }): any; }
 >x : { foo<T, U>(x: T, y: U): T; }
 >a : { foo<T, U>(x: T, y: U): T; }
 
 function foo10(x: any) { }
->foo10 : typeof foo10
+>foo10 : { (x: B<string, number>): any; (x: { foo<T, U>(x: T, y: U): T; }): any; }
 >x : any
 
 function foo11(x: B<string, number>);
->foo11 : typeof foo11
+>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 : typeof foo11
+>foo11 : { (x: B<string, number>): any; (x: { foo: <T, U>(x: T, y: U) => T; }): any; }
 >x : { foo: <T, U>(x: T, y: U) => T; }
 >b : { foo: <T, U>(x: T, y: U) => T; }
 
 function foo11(x: any) { }
->foo11 : typeof foo11
+>foo11 : { (x: B<string, number>): any; (x: { foo: <T, U>(x: T, y: U) => T; }): any; }
 >x : any
 
 function foo12(x: I<string, number>);
->foo12 : typeof foo12
+>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 : typeof foo12
+>foo12 : { (x: I<string, number>): any; (x: C<string, number>): any; }
 >x : C<string, number>
 >C : C<T, U>
 
 function foo12(x: any) { }
->foo12 : typeof foo12
+>foo12 : { (x: I<string, number>): any; (x: C<string, number>): any; }
 >x : any
 
 function foo12b(x: I2);
->foo12b : typeof foo12b
+>foo12b : { (x: I2): any; (x: C<string, number>): any; }
 >x : I2
 >I2 : I2
 
 function foo12b(x: C<string, number>); // ok
->foo12b : typeof foo12b
+>foo12b : { (x: I2): any; (x: C<string, number>): any; }
 >x : C<string, number>
 >C : C<T, U>
 
 function foo12b(x: any) { }
->foo12b : typeof foo12b
+>foo12b : { (x: I2): any; (x: C<string, number>): any; }
 >x : any
 
 function foo13(x: I<string, number>);
->foo13 : typeof foo13
+>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 : typeof foo13
+>foo13 : { (x: I<string, number>): any; (x: { foo<T, U>(x: T, y: U): T; }): any; }
 >x : { foo<T, U>(x: T, y: U): T; }
 >a : { foo<T, U>(x: T, y: U): T; }
 
 function foo13(x: any) { }
->foo13 : typeof foo13
+>foo13 : { (x: I<string, number>): any; (x: { foo<T, U>(x: T, y: U): T; }): any; }
 >x : any
 
 function foo14(x: I<string, number>);
->foo14 : typeof foo14
+>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 : typeof foo14
+>foo14 : { (x: I<string, number>): any; (x: { foo: <T, U>(x: T, y: U) => T; }): any; }
 >x : { foo: <T, U>(x: T, y: U) => T; }
 >b : { foo: <T, U>(x: T, y: U) => T; }
 
 function foo14(x: any) { }
->foo14 : typeof foo14
+>foo14 : { (x: I<string, number>): any; (x: { foo: <T, U>(x: T, y: U) => T; }): any; }
 >x : any
 
 function foo15(x: I2);
->foo15 : typeof foo15
+>foo15 : { (x: I2): any; (x: C<string, number>): any; }
 >x : I2
 >I2 : I2
 
 function foo15(x: C<string, number>); // ok
->foo15 : typeof foo15
+>foo15 : { (x: I2): any; (x: C<string, number>): any; }
 >x : C<string, number>
 >C : C<T, U>
 
 function foo15(x: any) { }
->foo15 : typeof foo15
+>foo15 : { (x: I2): any; (x: C<string, number>): any; }
 >x : any
 
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.types b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.types
index a0a1ace5645..2a5ab2dfe70 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.types
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.types
@@ -77,289 +77,289 @@ var b = { foo<T extends RegExp>(x: T) { return ''; } };
 >T : T
 
 function foo1(x: A);
->foo1 : typeof foo1
+>foo1 : { (x: A): any; (x: A): any; }
 >x : A
 >A : A
 
 function foo1(x: A); // error
->foo1 : typeof foo1
+>foo1 : { (x: A): any; (x: A): any; }
 >x : A
 >A : A
 
 function foo1(x: any) { }
->foo1 : typeof foo1
+>foo1 : { (x: A): any; (x: A): any; }
 >x : any
 
 function foo1b(x: B<Array<number>>);
->foo1b : typeof foo1b
+>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 : typeof foo1b
+>foo1b : { (x: B<number[]>): any; (x: B<number[]>): any; }
 >x : B<number[]>
 >B : B<T>
 >Array : T[]
 
 function foo1b(x: any) { }
->foo1b : typeof foo1b
+>foo1b : { (x: B<number[]>): any; (x: B<number[]>): any; }
 >x : any
 
 function foo1c(x: C<String>);
->foo1c : typeof foo1c
+>foo1c : { (x: C<String>): any; (x: C<String>): any; }
 >x : C<String>
 >C : C<T>
 >String : String
 
 function foo1c(x: C<String>); // error
->foo1c : typeof foo1c
+>foo1c : { (x: C<String>): any; (x: C<String>): any; }
 >x : C<String>
 >C : C<T>
 >String : String
 
 function foo1c(x: any) { }
->foo1c : typeof foo1c
+>foo1c : { (x: C<String>): any; (x: C<String>): any; }
 >x : any
 
 function foo2(x: I<Number>);
->foo2 : typeof foo2
+>foo2 : { (x: I<Number>): any; (x: I<Number>): any; }
 >x : I<Number>
 >I : I<T>
 >Number : Number
 
 function foo2(x: I<Number>); // error
->foo2 : typeof foo2
+>foo2 : { (x: I<Number>): any; (x: I<Number>): any; }
 >x : I<Number>
 >I : I<T>
 >Number : Number
 
 function foo2(x: any) { }
->foo2 : typeof foo2
+>foo2 : { (x: I<Number>): any; (x: I<Number>): any; }
 >x : any
 
 function foo3(x: typeof a);
->foo3 : typeof foo3
+>foo3 : { (x: { foo<T extends string[]>(x: T): string; }): any; (x: { foo<T extends string[]>(x: T): string; }): any; }
 >x : { foo<T extends string[]>(x: T): string; }
 >a : { foo<T extends string[]>(x: T): string; }
 
 function foo3(x: typeof a); // error
->foo3 : typeof foo3
+>foo3 : { (x: { foo<T extends string[]>(x: T): string; }): any; (x: { foo<T extends string[]>(x: T): string; }): any; }
 >x : { foo<T extends string[]>(x: T): string; }
 >a : { foo<T extends string[]>(x: T): string; }
 
 function foo3(x: any) { }
->foo3 : typeof foo3
+>foo3 : { (x: { foo<T extends string[]>(x: T): string; }): any; (x: { foo<T extends string[]>(x: T): string; }): any; }
 >x : any
 
 function foo4(x: typeof b);
->foo4 : typeof foo4
+>foo4 : { (x: { foo: <T extends RegExp>(x: T) => string; }): any; (x: { foo: <T extends RegExp>(x: T) => string; }): any; }
 >x : { foo: <T extends RegExp>(x: T) => string; }
 >b : { foo: <T extends RegExp>(x: T) => string; }
 
 function foo4(x: typeof b); // error
->foo4 : typeof foo4
+>foo4 : { (x: { foo: <T extends RegExp>(x: T) => string; }): any; (x: { foo: <T extends RegExp>(x: T) => string; }): any; }
 >x : { foo: <T extends RegExp>(x: T) => string; }
 >b : { foo: <T extends RegExp>(x: T) => string; }
 
 function foo4(x: any) { }
->foo4 : typeof foo4
+>foo4 : { (x: { foo: <T extends RegExp>(x: T) => string; }): any; (x: { foo: <T extends RegExp>(x: T) => string; }): any; }
 >x : any
 
 function foo5(x: A);
->foo5 : typeof foo5
+>foo5 : { (x: A): any; (x: B<number[]>): any; }
 >x : A
 >A : A
 
 function foo5(x: B<Array<number>>); // ok
->foo5 : typeof foo5
+>foo5 : { (x: A): any; (x: B<number[]>): any; }
 >x : B<number[]>
 >B : B<T>
 >Array : T[]
 
 function foo5(x: any) { }
->foo5 : typeof foo5
+>foo5 : { (x: A): any; (x: B<number[]>): any; }
 >x : any
 
 function foo5b(x: A);
->foo5b : typeof foo5b
+>foo5b : { (x: A): any; (x: C<String>): any; }
 >x : A
 >A : A
 
 function foo5b(x: C<String>); // ok
->foo5b : typeof foo5b
+>foo5b : { (x: A): any; (x: C<String>): any; }
 >x : C<String>
 >C : C<T>
 >String : String
 
 function foo5b(x: any) { }
->foo5b : typeof foo5b
+>foo5b : { (x: A): any; (x: C<String>): any; }
 >x : any
 
 function foo6(x: A);
->foo6 : typeof foo6
+>foo6 : { (x: A): any; (x: I<Number>): any; }
 >x : A
 >A : A
 
 function foo6(x: I<Number>); // ok
->foo6 : typeof foo6
+>foo6 : { (x: A): any; (x: I<Number>): any; }
 >x : I<Number>
 >I : I<T>
 >Number : Number
 
 function foo6(x: any) { }
->foo6 : typeof foo6
+>foo6 : { (x: A): any; (x: I<Number>): any; }
 >x : any
 
 function foo7(x: A);
->foo7 : typeof foo7
+>foo7 : { (x: A): any; (x: { foo<T extends string[]>(x: T): string; }): any; }
 >x : A
 >A : A
 
 function foo7(x: typeof a); // ok
->foo7 : typeof foo7
+>foo7 : { (x: A): any; (x: { foo<T extends string[]>(x: T): string; }): any; }
 >x : { foo<T extends string[]>(x: T): string; }
 >a : { foo<T extends string[]>(x: T): string; }
 
 function foo7(x: any) { }
->foo7 : typeof foo7
+>foo7 : { (x: A): any; (x: { foo<T extends string[]>(x: T): string; }): any; }
 >x : any
 
 function foo8(x: B<Array<number>>);
->foo8 : typeof foo8
+>foo8 : { (x: B<number[]>): any; (x: I<Number>): any; }
 >x : B<number[]>
 >B : B<T>
 >Array : T[]
 
 function foo8(x: I<Number>); // ok
->foo8 : typeof foo8
+>foo8 : { (x: B<number[]>): any; (x: I<Number>): any; }
 >x : I<Number>
 >I : I<T>
 >Number : Number
 
 function foo8(x: any) { }
->foo8 : typeof foo8
+>foo8 : { (x: B<number[]>): any; (x: I<Number>): any; }
 >x : any
 
 function foo9(x: B<Array<number>>);
->foo9 : typeof foo9
+>foo9 : { (x: B<number[]>): any; (x: C<String>): any; }
 >x : B<number[]>
 >B : B<T>
 >Array : T[]
 
 function foo9(x: C<String>); // ok
->foo9 : typeof foo9
+>foo9 : { (x: B<number[]>): any; (x: C<String>): any; }
 >x : C<String>
 >C : C<T>
 >String : String
 
 function foo9(x: any) { }
->foo9 : typeof foo9
+>foo9 : { (x: B<number[]>): any; (x: C<String>): any; }
 >x : any
 
 function foo10(x: B<Array<number>>);
->foo10 : typeof foo10
+>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 : typeof foo10
+>foo10 : { (x: B<number[]>): any; (x: { foo<T extends string[]>(x: T): string; }): any; }
 >x : { foo<T extends string[]>(x: T): string; }
 >a : { foo<T extends string[]>(x: T): string; }
 
 function foo10(x: any) { }
->foo10 : typeof foo10
+>foo10 : { (x: B<number[]>): any; (x: { foo<T extends string[]>(x: T): string; }): any; }
 >x : any
 
 function foo11(x: B<Array<number>>);
->foo11 : typeof foo11
+>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 : typeof foo11
+>foo11 : { (x: B<number[]>): any; (x: { foo: <T extends RegExp>(x: T) => string; }): any; }
 >x : { foo: <T extends RegExp>(x: T) => string; }
 >b : { foo: <T extends RegExp>(x: T) => string; }
 
 function foo11(x: any) { }
->foo11 : typeof foo11
+>foo11 : { (x: B<number[]>): any; (x: { foo: <T extends RegExp>(x: T) => string; }): any; }
 >x : any
 
 function foo12(x: I<Number>);
->foo12 : typeof foo12
+>foo12 : { (x: I<Number>): any; (x: C<String>): any; }
 >x : I<Number>
 >I : I<T>
 >Number : Number
 
 function foo12(x: C<String>); // ok
->foo12 : typeof foo12
+>foo12 : { (x: I<Number>): any; (x: C<String>): any; }
 >x : C<String>
 >C : C<T>
 >String : String
 
 function foo12(x: any) { }
->foo12 : typeof foo12
+>foo12 : { (x: I<Number>): any; (x: C<String>): any; }
 >x : any
 
 function foo12b(x: I2);
->foo12b : typeof foo12b
+>foo12b : { (x: I2): any; (x: C<String>): any; }
 >x : I2
 >I2 : I2
 
 function foo12b(x: C<String>); // ok
->foo12b : typeof foo12b
+>foo12b : { (x: I2): any; (x: C<String>): any; }
 >x : C<String>
 >C : C<T>
 >String : String
 
 function foo12b(x: any) { }
->foo12b : typeof foo12b
+>foo12b : { (x: I2): any; (x: C<String>): any; }
 >x : any
 
 function foo13(x: I<Number>);
->foo13 : typeof foo13
+>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 : typeof foo13
+>foo13 : { (x: I<Number>): any; (x: { foo<T extends string[]>(x: T): string; }): any; }
 >x : { foo<T extends string[]>(x: T): string; }
 >a : { foo<T extends string[]>(x: T): string; }
 
 function foo13(x: any) { }
->foo13 : typeof foo13
+>foo13 : { (x: I<Number>): any; (x: { foo<T extends string[]>(x: T): string; }): any; }
 >x : any
 
 function foo14(x: I<Number>);
->foo14 : typeof foo14
+>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 : typeof foo14
+>foo14 : { (x: I<Number>): any; (x: { foo: <T extends RegExp>(x: T) => string; }): any; }
 >x : { foo: <T extends RegExp>(x: T) => string; }
 >b : { foo: <T extends RegExp>(x: T) => string; }
 
 function foo14(x: any) { }
->foo14 : typeof foo14
+>foo14 : { (x: I<Number>): any; (x: { foo: <T extends RegExp>(x: T) => string; }): any; }
 >x : any
 
 function foo15(x: I2);
->foo15 : typeof foo15
+>foo15 : { (x: I2): any; (x: C<String>): any; }
 >x : I2
 >I2 : I2
 
 function foo15(x: C<String>); // ok
->foo15 : typeof foo15
+>foo15 : { (x: I2): any; (x: C<String>): any; }
 >x : C<String>
 >C : C<T>
 >String : String
 
 function foo15(x: any) { }
->foo15 : typeof foo15
+>foo15 : { (x: I2): any; (x: C<String>): any; }
 >x : any
 
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType.types b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType.types
index d06da02469b..9de1a816ab7 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType.types
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType.types
@@ -73,268 +73,268 @@ var b = { foo<T>(x: T) { return null; } };
 >T : T
 
 function foo1(x: A);
->foo1 : typeof foo1
+>foo1 : { (x: A): any; (x: A): any; }
 >x : A
 >A : A
 
 function foo1(x: A); // error
->foo1 : typeof foo1
+>foo1 : { (x: A): any; (x: A): any; }
 >x : A
 >A : A
 
 function foo1(x: any) { }
->foo1 : typeof foo1
+>foo1 : { (x: A): any; (x: A): any; }
 >x : any
 
 function foo1b(x: B<string>);
->foo1b : typeof foo1b
+>foo1b : { (x: B<string>): any; (x: B<string>): any; }
 >x : B<string>
 >B : B<T>
 
 function foo1b(x: B<string>); // error
->foo1b : typeof foo1b
+>foo1b : { (x: B<string>): any; (x: B<string>): any; }
 >x : B<string>
 >B : B<T>
 
 function foo1b(x: any) { }
->foo1b : typeof foo1b
+>foo1b : { (x: B<string>): any; (x: B<string>): any; }
 >x : any
 
 function foo1c(x: C<string>);
->foo1c : typeof foo1c
+>foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo1c(x: C<string>); // error
->foo1c : typeof foo1c
+>foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo1c(x: any) { }
->foo1c : typeof foo1c
+>foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : any
 
 function foo2(x: I<string>);
->foo2 : typeof foo2
+>foo2 : { (x: I<string>): any; (x: I<string>): any; }
 >x : I<string>
 >I : I<T>
 
 function foo2(x: I<string>); // error
->foo2 : typeof foo2
+>foo2 : { (x: I<string>): any; (x: I<string>): any; }
 >x : I<string>
 >I : I<T>
 
 function foo2(x: any) { }
->foo2 : typeof foo2
+>foo2 : { (x: I<string>): any; (x: I<string>): any; }
 >x : any
 
 function foo3(x: typeof a);
->foo3 : typeof foo3
+>foo3 : { (x: { foo<T>(x: T): T; }): any; (x: { foo<T>(x: T): T; }): any; }
 >x : { foo<T>(x: T): T; }
 >a : { foo<T>(x: T): T; }
 
 function foo3(x: typeof a); // error
->foo3 : typeof foo3
+>foo3 : { (x: { foo<T>(x: T): T; }): any; (x: { foo<T>(x: T): T; }): any; }
 >x : { foo<T>(x: T): T; }
 >a : { foo<T>(x: T): T; }
 
 function foo3(x: any) { }
->foo3 : typeof foo3
+>foo3 : { (x: { foo<T>(x: T): T; }): any; (x: { foo<T>(x: T): T; }): any; }
 >x : any
 
 function foo4(x: typeof b);
->foo4 : typeof foo4
+>foo4 : { (x: { foo: <T>(x: T) => any; }): any; (x: { foo: <T>(x: T) => any; }): any; }
 >x : { foo: <T>(x: T) => any; }
 >b : { foo: <T>(x: T) => any; }
 
 function foo4(x: typeof b); // error
->foo4 : typeof foo4
+>foo4 : { (x: { foo: <T>(x: T) => any; }): any; (x: { foo: <T>(x: T) => any; }): any; }
 >x : { foo: <T>(x: T) => any; }
 >b : { foo: <T>(x: T) => any; }
 
 function foo4(x: any) { }
->foo4 : typeof foo4
+>foo4 : { (x: { foo: <T>(x: T) => any; }): any; (x: { foo: <T>(x: T) => any; }): any; }
 >x : any
 
 function foo5(x: A);
->foo5 : typeof foo5
+>foo5 : { (x: A): any; (x: B<string>): any; }
 >x : A
 >A : A
 
 function foo5(x: B<string>); // ok
->foo5 : typeof foo5
+>foo5 : { (x: A): any; (x: B<string>): any; }
 >x : B<string>
 >B : B<T>
 
 function foo5(x: any) { }
->foo5 : typeof foo5
+>foo5 : { (x: A): any; (x: B<string>): any; }
 >x : any
 
 function foo5b(x: A);
->foo5b : typeof foo5b
+>foo5b : { (x: A): any; (x: C<string>): any; }
 >x : A
 >A : A
 
 function foo5b(x: C<string>); // ok
->foo5b : typeof foo5b
+>foo5b : { (x: A): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo5b(x: any) { }
->foo5b : typeof foo5b
+>foo5b : { (x: A): any; (x: C<string>): any; }
 >x : any
 
 function foo6(x: A);
->foo6 : typeof foo6
+>foo6 : { (x: A): any; (x: I<string>): any; }
 >x : A
 >A : A
 
 function foo6(x: I<string>); // ok
->foo6 : typeof foo6
+>foo6 : { (x: A): any; (x: I<string>): any; }
 >x : I<string>
 >I : I<T>
 
 function foo6(x: any) { }
->foo6 : typeof foo6
+>foo6 : { (x: A): any; (x: I<string>): any; }
 >x : any
 
 function foo7(x: A);
->foo7 : typeof foo7
+>foo7 : { (x: A): any; (x: { foo<T>(x: T): T; }): any; }
 >x : A
 >A : A
 
 function foo7(x: typeof a); // ok
->foo7 : typeof foo7
+>foo7 : { (x: A): any; (x: { foo<T>(x: T): T; }): any; }
 >x : { foo<T>(x: T): T; }
 >a : { foo<T>(x: T): T; }
 
 function foo7(x: any) { }
->foo7 : typeof foo7
+>foo7 : { (x: A): any; (x: { foo<T>(x: T): T; }): any; }
 >x : any
 
 function foo8(x: B<string>);
->foo8 : typeof foo8
+>foo8 : { (x: B<string>): any; (x: I<string>): any; }
 >x : B<string>
 >B : B<T>
 
 function foo8(x: I<string>); // ok
->foo8 : typeof foo8
+>foo8 : { (x: B<string>): any; (x: I<string>): any; }
 >x : I<string>
 >I : I<T>
 
 function foo8(x: any) { }
->foo8 : typeof foo8
+>foo8 : { (x: B<string>): any; (x: I<string>): any; }
 >x : any
 
 function foo9(x: B<string>);
->foo9 : typeof foo9
+>foo9 : { (x: B<string>): any; (x: C<string>): any; }
 >x : B<string>
 >B : B<T>
 
 function foo9(x: C<string>); // ok
->foo9 : typeof foo9
+>foo9 : { (x: B<string>): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo9(x: any) { }
->foo9 : typeof foo9
+>foo9 : { (x: B<string>): any; (x: C<string>): any; }
 >x : any
 
 function foo10(x: B<string>);
->foo10 : typeof foo10
+>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 : typeof foo10
+>foo10 : { (x: B<string>): any; (x: { foo<T>(x: T): T; }): any; }
 >x : { foo<T>(x: T): T; }
 >a : { foo<T>(x: T): T; }
 
 function foo10(x: any) { }
->foo10 : typeof foo10
+>foo10 : { (x: B<string>): any; (x: { foo<T>(x: T): T; }): any; }
 >x : any
 
 function foo11(x: B<string>);
->foo11 : typeof foo11
+>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 : typeof foo11
+>foo11 : { (x: B<string>): any; (x: { foo: <T>(x: T) => any; }): any; }
 >x : { foo: <T>(x: T) => any; }
 >b : { foo: <T>(x: T) => any; }
 
 function foo11(x: any) { }
->foo11 : typeof foo11
+>foo11 : { (x: B<string>): any; (x: { foo: <T>(x: T) => any; }): any; }
 >x : any
 
 function foo12(x: I<string>);
->foo12 : typeof foo12
+>foo12 : { (x: I<string>): any; (x: C<string>): any; }
 >x : I<string>
 >I : I<T>
 
 function foo12(x: C<string>); // ok
->foo12 : typeof foo12
+>foo12 : { (x: I<string>): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo12(x: any) { }
->foo12 : typeof foo12
+>foo12 : { (x: I<string>): any; (x: C<string>): any; }
 >x : any
 
 function foo12b(x: I2);
->foo12b : typeof foo12b
+>foo12b : { (x: I2): any; (x: C<string>): any; }
 >x : I2
 >I2 : I2
 
 function foo12b(x: C<string>); // ok
->foo12b : typeof foo12b
+>foo12b : { (x: I2): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo12b(x: any) { }
->foo12b : typeof foo12b
+>foo12b : { (x: I2): any; (x: C<string>): any; }
 >x : any
 
 function foo13(x: I<string>);
->foo13 : typeof foo13
+>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 : typeof foo13
+>foo13 : { (x: I<string>): any; (x: { foo<T>(x: T): T; }): any; }
 >x : { foo<T>(x: T): T; }
 >a : { foo<T>(x: T): T; }
 
 function foo13(x: any) { }
->foo13 : typeof foo13
+>foo13 : { (x: I<string>): any; (x: { foo<T>(x: T): T; }): any; }
 >x : any
 
 function foo14(x: I<string>);
->foo14 : typeof foo14
+>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 : typeof foo14
+>foo14 : { (x: I<string>): any; (x: { foo: <T>(x: T) => any; }): any; }
 >x : { foo: <T>(x: T) => any; }
 >b : { foo: <T>(x: T) => any; }
 
 function foo14(x: any) { }
->foo14 : typeof foo14
+>foo14 : { (x: I<string>): any; (x: { foo: <T>(x: T) => any; }): any; }
 >x : any
 
 function foo15(x: I2);
->foo15 : typeof foo15
+>foo15 : { (x: I2): any; (x: C<number>): any; }
 >x : I2
 >I2 : I2
 
 function foo15(x: C<number>); // ok
->foo15 : typeof foo15
+>foo15 : { (x: I2): any; (x: C<number>): any; }
 >x : C<number>
 >C : C<T>
 
 function foo15(x: any) { }
->foo15 : typeof foo15
+>foo15 : { (x: I2): any; (x: C<number>): any; }
 >x : any
 
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.types b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.types
index 710c440e2d0..f6f33890c07 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.types
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.types
@@ -80,289 +80,289 @@ var b = { foo<T extends Date>(x: T) { return null; } };
 >T : T
 
 function foo1(x: A);
->foo1 : typeof foo1
+>foo1 : { (x: A): any; (x: A): any; }
 >x : A
 >A : A
 
 function foo1(x: A); // error
->foo1 : typeof foo1
+>foo1 : { (x: A): any; (x: A): any; }
 >x : A
 >A : A
 
 function foo1(x: any) { }
->foo1 : typeof foo1
+>foo1 : { (x: A): any; (x: A): any; }
 >x : any
 
 function foo1b(x: B<Date>);
->foo1b : typeof foo1b
+>foo1b : { (x: B<Date>): any; (x: B<Date>): any; }
 >x : B<Date>
 >B : B<T>
 >Date : Date
 
 function foo1b(x: B<Date>); // error
->foo1b : typeof foo1b
+>foo1b : { (x: B<Date>): any; (x: B<Date>): any; }
 >x : B<Date>
 >B : B<T>
 >Date : Date
 
 function foo1b(x: any) { }
->foo1b : typeof foo1b
+>foo1b : { (x: B<Date>): any; (x: B<Date>): any; }
 >x : any
 
 function foo1c(x: C<Date>);
->foo1c : typeof foo1c
+>foo1c : { (x: C<Date>): any; (x: C<Date>): any; }
 >x : C<Date>
 >C : C<T>
 >Date : Date
 
 function foo1c(x: C<Date>); // error
->foo1c : typeof foo1c
+>foo1c : { (x: C<Date>): any; (x: C<Date>): any; }
 >x : C<Date>
 >C : C<T>
 >Date : Date
 
 function foo1c(x: any) { }
->foo1c : typeof foo1c
+>foo1c : { (x: C<Date>): any; (x: C<Date>): any; }
 >x : any
 
 function foo2(x: I<Date>);
->foo2 : typeof foo2
+>foo2 : { (x: I<Date>): any; (x: I<Date>): any; }
 >x : I<Date>
 >I : I<T>
 >Date : Date
 
 function foo2(x: I<Date>); // error
->foo2 : typeof foo2
+>foo2 : { (x: I<Date>): any; (x: I<Date>): any; }
 >x : I<Date>
 >I : I<T>
 >Date : Date
 
 function foo2(x: any) { }
->foo2 : typeof foo2
+>foo2 : { (x: I<Date>): any; (x: I<Date>): any; }
 >x : any
 
 function foo3(x: typeof a);
->foo3 : typeof foo3
+>foo3 : { (x: { foo<T extends Date>(x: T): T; }): any; (x: { foo<T extends Date>(x: T): T; }): any; }
 >x : { foo<T extends Date>(x: T): T; }
 >a : { foo<T extends Date>(x: T): T; }
 
 function foo3(x: typeof a); // error
->foo3 : typeof foo3
+>foo3 : { (x: { foo<T extends Date>(x: T): T; }): any; (x: { foo<T extends Date>(x: T): T; }): any; }
 >x : { foo<T extends Date>(x: T): T; }
 >a : { foo<T extends Date>(x: T): T; }
 
 function foo3(x: any) { }
->foo3 : typeof foo3
+>foo3 : { (x: { foo<T extends Date>(x: T): T; }): any; (x: { foo<T extends Date>(x: T): T; }): any; }
 >x : any
 
 function foo4(x: typeof b);
->foo4 : typeof foo4
+>foo4 : { (x: { foo: <T extends Date>(x: T) => any; }): any; (x: { foo: <T extends Date>(x: T) => any; }): any; }
 >x : { foo: <T extends Date>(x: T) => any; }
 >b : { foo: <T extends Date>(x: T) => any; }
 
 function foo4(x: typeof b); // error
->foo4 : typeof foo4
+>foo4 : { (x: { foo: <T extends Date>(x: T) => any; }): any; (x: { foo: <T extends Date>(x: T) => any; }): any; }
 >x : { foo: <T extends Date>(x: T) => any; }
 >b : { foo: <T extends Date>(x: T) => any; }
 
 function foo4(x: any) { }
->foo4 : typeof foo4
+>foo4 : { (x: { foo: <T extends Date>(x: T) => any; }): any; (x: { foo: <T extends Date>(x: T) => any; }): any; }
 >x : any
 
 function foo5(x: A);
->foo5 : typeof foo5
+>foo5 : { (x: A): any; (x: B<Date>): any; }
 >x : A
 >A : A
 
 function foo5(x: B<Date>); // ok
->foo5 : typeof foo5
+>foo5 : { (x: A): any; (x: B<Date>): any; }
 >x : B<Date>
 >B : B<T>
 >Date : Date
 
 function foo5(x: any) { }
->foo5 : typeof foo5
+>foo5 : { (x: A): any; (x: B<Date>): any; }
 >x : any
 
 function foo5b(x: A);
->foo5b : typeof foo5b
+>foo5b : { (x: A): any; (x: C<Date>): any; }
 >x : A
 >A : A
 
 function foo5b(x: C<Date>); // ok
->foo5b : typeof foo5b
+>foo5b : { (x: A): any; (x: C<Date>): any; }
 >x : C<Date>
 >C : C<T>
 >Date : Date
 
 function foo5b(x: any) { }
->foo5b : typeof foo5b
+>foo5b : { (x: A): any; (x: C<Date>): any; }
 >x : any
 
 function foo6(x: A);
->foo6 : typeof foo6
+>foo6 : { (x: A): any; (x: I<Date>): any; }
 >x : A
 >A : A
 
 function foo6(x: I<Date>); // ok
->foo6 : typeof foo6
+>foo6 : { (x: A): any; (x: I<Date>): any; }
 >x : I<Date>
 >I : I<T>
 >Date : Date
 
 function foo6(x: any) { }
->foo6 : typeof foo6
+>foo6 : { (x: A): any; (x: I<Date>): any; }
 >x : any
 
 function foo7(x: A);
->foo7 : typeof foo7
+>foo7 : { (x: A): any; (x: { foo<T extends Date>(x: T): T; }): any; }
 >x : A
 >A : A
 
 function foo7(x: typeof a); // ok
->foo7 : typeof foo7
+>foo7 : { (x: A): any; (x: { foo<T extends Date>(x: T): T; }): any; }
 >x : { foo<T extends Date>(x: T): T; }
 >a : { foo<T extends Date>(x: T): T; }
 
 function foo7(x: any) { }
->foo7 : typeof foo7
+>foo7 : { (x: A): any; (x: { foo<T extends Date>(x: T): T; }): any; }
 >x : any
 
 function foo8(x: B<Date>);
->foo8 : typeof foo8
+>foo8 : { (x: B<Date>): any; (x: I<Date>): any; }
 >x : B<Date>
 >B : B<T>
 >Date : Date
 
 function foo8(x: I<Date>); // ok
->foo8 : typeof foo8
+>foo8 : { (x: B<Date>): any; (x: I<Date>): any; }
 >x : I<Date>
 >I : I<T>
 >Date : Date
 
 function foo8(x: any) { }
->foo8 : typeof foo8
+>foo8 : { (x: B<Date>): any; (x: I<Date>): any; }
 >x : any
 
 function foo9(x: B<Date>);
->foo9 : typeof foo9
+>foo9 : { (x: B<Date>): any; (x: C<Date>): any; }
 >x : B<Date>
 >B : B<T>
 >Date : Date
 
 function foo9(x: C<Date>); // ok
->foo9 : typeof foo9
+>foo9 : { (x: B<Date>): any; (x: C<Date>): any; }
 >x : C<Date>
 >C : C<T>
 >Date : Date
 
 function foo9(x: any) { }
->foo9 : typeof foo9
+>foo9 : { (x: B<Date>): any; (x: C<Date>): any; }
 >x : any
 
 function foo10(x: B<Date>);
->foo10 : typeof foo10
+>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 : typeof foo10
+>foo10 : { (x: B<Date>): any; (x: { foo<T extends Date>(x: T): T; }): any; }
 >x : { foo<T extends Date>(x: T): T; }
 >a : { foo<T extends Date>(x: T): T; }
 
 function foo10(x: any) { }
->foo10 : typeof foo10
+>foo10 : { (x: B<Date>): any; (x: { foo<T extends Date>(x: T): T; }): any; }
 >x : any
 
 function foo11(x: B<Date>);
->foo11 : typeof foo11
+>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 : typeof foo11
+>foo11 : { (x: B<Date>): any; (x: { foo: <T extends Date>(x: T) => any; }): any; }
 >x : { foo: <T extends Date>(x: T) => any; }
 >b : { foo: <T extends Date>(x: T) => any; }
 
 function foo11(x: any) { }
->foo11 : typeof foo11
+>foo11 : { (x: B<Date>): any; (x: { foo: <T extends Date>(x: T) => any; }): any; }
 >x : any
 
 function foo12(x: I<Date>);
->foo12 : typeof foo12
+>foo12 : { (x: I<Date>): any; (x: C<Date>): any; }
 >x : I<Date>
 >I : I<T>
 >Date : Date
 
 function foo12(x: C<Date>); // ok
->foo12 : typeof foo12
+>foo12 : { (x: I<Date>): any; (x: C<Date>): any; }
 >x : C<Date>
 >C : C<T>
 >Date : Date
 
 function foo12(x: any) { }
->foo12 : typeof foo12
+>foo12 : { (x: I<Date>): any; (x: C<Date>): any; }
 >x : any
 
 function foo12b(x: I2);
->foo12b : typeof foo12b
+>foo12b : { (x: I2): any; (x: C<Date>): any; }
 >x : I2
 >I2 : I2
 
 function foo12b(x: C<Date>); // ok
->foo12b : typeof foo12b
+>foo12b : { (x: I2): any; (x: C<Date>): any; }
 >x : C<Date>
 >C : C<T>
 >Date : Date
 
 function foo12b(x: any) { }
->foo12b : typeof foo12b
+>foo12b : { (x: I2): any; (x: C<Date>): any; }
 >x : any
 
 function foo13(x: I<Date>);
->foo13 : typeof foo13
+>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 : typeof foo13
+>foo13 : { (x: I<Date>): any; (x: { foo<T extends Date>(x: T): T; }): any; }
 >x : { foo<T extends Date>(x: T): T; }
 >a : { foo<T extends Date>(x: T): T; }
 
 function foo13(x: any) { }
->foo13 : typeof foo13
+>foo13 : { (x: I<Date>): any; (x: { foo<T extends Date>(x: T): T; }): any; }
 >x : any
 
 function foo14(x: I<Date>);
->foo14 : typeof foo14
+>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 : typeof foo14
+>foo14 : { (x: I<Date>): any; (x: { foo: <T extends Date>(x: T) => any; }): any; }
 >x : { foo: <T extends Date>(x: T) => any; }
 >b : { foo: <T extends Date>(x: T) => any; }
 
 function foo14(x: any) { }
->foo14 : typeof foo14
+>foo14 : { (x: I<Date>): any; (x: { foo: <T extends Date>(x: T) => any; }): any; }
 >x : any
 
 function foo15(x: I2);
->foo15 : typeof foo15
+>foo15 : { (x: I2): any; (x: C<Date>): any; }
 >x : I2
 >I2 : I2
 
 function foo15(x: C<Date>); // ok
->foo15 : typeof foo15
+>foo15 : { (x: I2): any; (x: C<Date>): any; }
 >x : C<Date>
 >C : C<T>
 >Date : Date
 
 function foo15(x: any) { }
->foo15 : typeof foo15
+>foo15 : { (x: I2): any; (x: C<Date>): any; }
 >x : any
 
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.types b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.types
index dd8f28b684d..dbd6d3e7d03 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.types
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.types
@@ -93,238 +93,238 @@ var b = { foo<A, B, C, D, E, F>(x: A) { return x; } };
 >x : A
 
 function foo1(x: A);
->foo1 : typeof foo1
+>foo1 : { (x: A): any; (x: A): any; }
 >x : A
 >A : A
 
 function foo1(x: A); // error
->foo1 : typeof foo1
+>foo1 : { (x: A): any; (x: A): any; }
 >x : A
 >A : A
 
 function foo1(x: any) { }
->foo1 : typeof foo1
+>foo1 : { (x: A): any; (x: A): any; }
 >x : any
 
 function foo1b(x: B<string, string>);
->foo1b : typeof foo1b
+>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 : typeof foo1b
+>foo1b : { (x: B<string, string>): any; (x: B<string, string>): any; }
 >x : B<string, string>
 >B : B<U, V>
 
 function foo1b(x: any) { }
->foo1b : typeof foo1b
+>foo1b : { (x: B<string, string>): any; (x: B<string, string>): any; }
 >x : any
 
 function foo1c(x: C<string, number, boolean>);
->foo1c : typeof foo1c
+>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 : typeof foo1c
+>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 : typeof foo1c
+>foo1c : { (x: C<string, number, boolean>): any; (x: C<string, number, boolean>): any; }
 >x : any
 
 function foo2(x: I<string, boolean, number, string>);
->foo2 : typeof foo2
+>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 : typeof foo2
+>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 : typeof foo2
+>foo2 : { (x: I<string, boolean, number, string>): any; (x: I<string, boolean, number, string>): any; }
 >x : any
 
 function foo3(x: typeof a);
->foo3 : typeof foo3
+>foo3 : { (x: { foo<Z, A, B, C, D>(x: Z): Z; }): any; (x: { foo<Z, A, B, C, D>(x: Z): Z; }): any; }
 >x : { foo<Z, A, B, C, D>(x: Z): Z; }
 >a : { foo<Z, A, B, C, D>(x: Z): Z; }
 
 function foo3(x: typeof a); // error
->foo3 : typeof foo3
+>foo3 : { (x: { foo<Z, A, B, C, D>(x: Z): Z; }): any; (x: { foo<Z, A, B, C, D>(x: Z): Z; }): any; }
 >x : { foo<Z, A, B, C, D>(x: Z): Z; }
 >a : { foo<Z, A, B, C, D>(x: Z): Z; }
 
 function foo3(x: any) { }
->foo3 : typeof foo3
+>foo3 : { (x: { foo<Z, A, B, C, D>(x: Z): Z; }): any; (x: { foo<Z, A, B, C, D>(x: Z): Z; }): any; }
 >x : any
 
 function foo4(x: typeof b);
->foo4 : typeof foo4
+>foo4 : { (x: { foo: <A, B, C, D, E, F>(x: A) => A; }): any; (x: { foo: <A, B, C, D, E, F>(x: A) => A; }): any; }
 >x : { foo: <A, B, C, D, E, F>(x: A) => A; }
 >b : { foo: <A, B, C, D, E, F>(x: A) => A; }
 
 function foo4(x: typeof b); // error
->foo4 : typeof foo4
+>foo4 : { (x: { foo: <A, B, C, D, E, F>(x: A) => A; }): any; (x: { foo: <A, B, C, D, E, F>(x: A) => A; }): any; }
 >x : { foo: <A, B, C, D, E, F>(x: A) => A; }
 >b : { foo: <A, B, C, D, E, F>(x: A) => A; }
 
 function foo4(x: any) { }
->foo4 : typeof foo4
+>foo4 : { (x: { foo: <A, B, C, D, E, F>(x: A) => A; }): any; (x: { foo: <A, B, C, D, E, F>(x: A) => A; }): any; }
 >x : any
 
 function foo5(x: A);
->foo5 : typeof foo5
+>foo5 : { (x: A): any; (x: B<string, string>): any; }
 >x : A
 >A : A
 
 function foo5(x: B<string, string>); // ok
->foo5 : typeof foo5
+>foo5 : { (x: A): any; (x: B<string, string>): any; }
 >x : B<string, string>
 >B : B<U, V>
 
 function foo5(x: any) { }
->foo5 : typeof foo5
+>foo5 : { (x: A): any; (x: B<string, string>): any; }
 >x : any
 
 function foo5b(x: A);
->foo5b : typeof foo5b
+>foo5b : { (x: A): any; (x: C<string, number, boolean>): any; }
 >x : A
 >A : A
 
 function foo5b(x: C<string, number, boolean>); // ok
->foo5b : typeof foo5b
+>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 : typeof foo5b
+>foo5b : { (x: A): any; (x: C<string, number, boolean>): any; }
 >x : any
 
 function foo6(x: A);
->foo6 : typeof foo6
+>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 : typeof foo6
+>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 : typeof foo6
+>foo6 : { (x: A): any; (x: I<string, number, boolean, Date>): any; }
 >x : any
 
 function foo7(x: A);
->foo7 : typeof foo7
+>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 : typeof foo7
+>foo7 : { (x: A): any; (x: { foo<Z, A, B, C, D>(x: Z): Z; }): any; }
 >x : { foo<Z, A, B, C, D>(x: Z): Z; }
 >a : { foo<Z, A, B, C, D>(x: Z): Z; }
 
 function foo7(x: any) { }
->foo7 : typeof foo7
+>foo7 : { (x: A): any; (x: { foo<Z, A, B, C, D>(x: Z): Z; }): any; }
 >x : any
 
 function foo8(x: B<string, string>);
->foo8 : typeof foo8
+>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 : typeof foo8
+>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 : typeof foo8
+>foo8 : { (x: B<string, string>): any; (x: I<string, string, boolean, Date>): any; }
 >x : any
 
 function foo9(x: B<string, number>);
->foo9 : typeof foo9
+>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 : typeof foo9
+>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 : typeof foo9
+>foo9 : { (x: B<string, number>): any; (x: C<string, number, B<string, string>>): any; }
 >x : any
 
 function foo10(x: B<string, boolean>);
->foo10 : typeof foo10
+>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 : typeof foo10
+>foo10 : { (x: B<string, boolean>): any; (x: { foo<Z, A, B, C, D>(x: Z): Z; }): any; }
 >x : { foo<Z, A, B, C, D>(x: Z): Z; }
 >a : { foo<Z, A, B, C, D>(x: Z): Z; }
 
 function foo10(x: any) { }
->foo10 : typeof foo10
+>foo10 : { (x: B<string, boolean>): any; (x: { foo<Z, A, B, C, D>(x: Z): Z; }): any; }
 >x : any
 
 function foo11(x: B<string, boolean>);
->foo11 : typeof foo11
+>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 : typeof foo11
+>foo11 : { (x: B<string, boolean>): any; (x: { foo: <A, B, C, D, E, F>(x: A) => A; }): any; }
 >x : { foo: <A, B, C, D, E, F>(x: A) => A; }
 >b : { foo: <A, B, C, D, E, F>(x: A) => A; }
 
 function foo11(x: any) { }
->foo11 : typeof foo11
+>foo11 : { (x: B<string, boolean>): any; (x: { foo: <A, B, C, D, E, F>(x: A) => A; }): any; }
 >x : any
 
 function foo12(x: I<B<string, number>, number, Date, string>);
->foo12 : typeof foo12
+>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 : typeof foo12
+>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 : typeof foo12
+>foo12 : { (x: I<B<string, number>, number, Date, string>): any; (x: C<B<string, number>, number, Date>): any; }
 >x : any
 
 function foo12b(x: I2);
->foo12b : typeof foo12b
+>foo12b : { (x: I2): any; (x: C<string, string, boolean>): any; }
 >x : I2
 >I2 : I2
 
 function foo12b(x: C<string, string, boolean>); // ok
->foo12b : typeof foo12b
+>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 : typeof foo12b
+>foo12b : { (x: I2): any; (x: C<string, string, boolean>): any; }
 >x : any
 
 function foo13(x: I<string, Date, RegExp, Date>);
->foo13 : typeof foo13
+>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
@@ -332,43 +332,43 @@ function foo13(x: I<string, Date, RegExp, Date>);
 >Date : Date
 
 function foo13(x: typeof a); // ok
->foo13 : typeof foo13
+>foo13 : { (x: I<string, Date, RegExp, Date>): any; (x: { foo<Z, A, B, C, D>(x: Z): Z; }): any; }
 >x : { foo<Z, A, B, C, D>(x: Z): Z; }
 >a : { foo<Z, A, B, C, D>(x: Z): Z; }
 
 function foo13(x: any) { }
->foo13 : typeof foo13
+>foo13 : { (x: I<string, Date, RegExp, Date>): any; (x: { foo<Z, A, B, C, D>(x: Z): Z; }): any; }
 >x : any
 
 function foo14(x: I<string, Date, RegExp, boolean>);
->foo14 : typeof foo14
+>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 : typeof foo14
+>foo14 : { (x: I<string, Date, RegExp, boolean>): any; (x: { foo: <A, B, C, D, E, F>(x: A) => A; }): any; }
 >x : { foo: <A, B, C, D, E, F>(x: A) => A; }
 >b : { foo: <A, B, C, D, E, F>(x: A) => A; }
 
 function foo14(x: any) { }
->foo14 : typeof foo14
+>foo14 : { (x: I<string, Date, RegExp, boolean>): any; (x: { foo: <A, B, C, D, E, F>(x: A) => A; }): any; }
 >x : any
 
 function foo15(x: I2);
->foo15 : typeof foo15
+>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 : typeof foo15
+>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 : typeof foo15
+>foo15 : { (x: I2): any; (x: C<number, B<string, string>, B<number, string>>): any; }
 >x : any
 
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts2.types b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts2.types
index 0340ce46d6e..8cc0042cc9e 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts2.types
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts2.types
@@ -40,103 +40,103 @@ var a: { <Z, A, B, C, D>(x: Z): Z }
 >Z : Z
 
 function foo1(x: I<string, boolean, number, string>);
->foo1 : typeof foo1
+>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 : typeof foo1
+>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 : typeof foo1
+>foo1 : { (x: I<string, boolean, number, string>): any; (x: I<string, boolean, number, string>): any; }
 >x : any
 
 function foo2(x: I2);
->foo2 : typeof foo2
+>foo2 : { (x: I2): any; (x: I2): any; }
 >x : I2
 >I2 : I2
 
 function foo2(x: I2); // error
->foo2 : typeof foo2
+>foo2 : { (x: I2): any; (x: I2): any; }
 >x : I2
 >I2 : I2
 
 function foo2(x: any) { }
->foo2 : typeof foo2
+>foo2 : { (x: I2): any; (x: I2): any; }
 >x : any
 
 function foo3(x: typeof a);
->foo3 : typeof foo3
+>foo3 : { (x: <Z, A, B, C, D>(x: Z) => Z): any; (x: <Z, A, B, C, D>(x: Z) => Z): any; }
 >x : <Z, A, B, C, D>(x: Z) => Z
 >a : <Z, A, B, C, D>(x: Z) => Z
 
 function foo3(x: typeof a); // error
->foo3 : typeof foo3
+>foo3 : { (x: <Z, A, B, C, D>(x: Z) => Z): any; (x: <Z, A, B, C, D>(x: Z) => Z): any; }
 >x : <Z, A, B, C, D>(x: Z) => Z
 >a : <Z, A, B, C, D>(x: Z) => Z
 
 function foo3(x: any) { }
->foo3 : typeof foo3
+>foo3 : { (x: <Z, A, B, C, D>(x: Z) => Z): any; (x: <Z, A, B, C, D>(x: Z) => Z): any; }
 >x : any
 
 function foo13(x: I<boolean, string, number, Date>);
->foo13 : typeof foo13
+>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 : typeof foo13
+>foo13 : { (x: I<boolean, string, number, Date>): any; (x: <Z, A, B, C, D>(x: Z) => Z): any; }
 >x : <Z, A, B, C, D>(x: Z) => Z
 >a : <Z, A, B, C, D>(x: Z) => Z
 
 function foo13(x: any) { }
->foo13 : typeof foo13
+>foo13 : { (x: I<boolean, string, number, Date>): any; (x: <Z, A, B, C, D>(x: Z) => Z): any; }
 >x : any
 
 function foo14(x: I<boolean, string, number, Date>);
->foo14 : typeof foo14
+>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 : typeof foo14
+>foo14 : { (x: I<boolean, string, number, Date>): any; (x: I2): any; }
 >x : I2
 >I2 : I2
 
 function foo14(x: any) { }
->foo14 : typeof foo14
+>foo14 : { (x: I<boolean, string, number, Date>): any; (x: I2): any; }
 >x : any
 
 function foo14b(x: typeof a);
->foo14b : typeof foo14b
+>foo14b : { (x: <Z, A, B, C, D>(x: Z) => Z): any; (x: I2): any; }
 >x : <Z, A, B, C, D>(x: Z) => Z
 >a : <Z, A, B, C, D>(x: Z) => Z
 
 function foo14b(x: I2); // ok
->foo14b : typeof foo14b
+>foo14b : { (x: <Z, A, B, C, D>(x: Z) => Z): any; (x: I2): any; }
 >x : I2
 >I2 : I2
 
 function foo14b(x: any) { }
->foo14b : typeof foo14b
+>foo14b : { (x: <Z, A, B, C, D>(x: Z) => Z): any; (x: I2): any; }
 >x : any
 
 function foo15(x: I<boolean, string, number, Date>);
->foo15 : typeof foo15
+>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 : typeof foo15
+>foo15 : { (x: I<boolean, string, number, Date>): any; (x: I2): any; }
 >x : I2
 >I2 : I2
 
 function foo15(x: any) { }
->foo15 : typeof foo15
+>foo15 : { (x: I<boolean, string, number, Date>): any; (x: I2): any; }
 >x : any
 
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterNames.types b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterNames.types
index 7c90a214fff..85e83528cd0 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterNames.types
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterNames.types
@@ -75,268 +75,268 @@ var b = { foo<A>(x: A) { return x; } };
 >x : A
 
 function foo1(x: A);
->foo1 : typeof foo1
+>foo1 : { (x: A): any; (x: A): any; }
 >x : A
 >A : A
 
 function foo1(x: A); // error
->foo1 : typeof foo1
+>foo1 : { (x: A): any; (x: A): any; }
 >x : A
 >A : A
 
 function foo1(x: any) { }
->foo1 : typeof foo1
+>foo1 : { (x: A): any; (x: A): any; }
 >x : any
 
 function foo1b(x: B<string>);
->foo1b : typeof foo1b
+>foo1b : { (x: B<string>): any; (x: B<string>): any; }
 >x : B<string>
 >B : B<U>
 
 function foo1b(x: B<string>); // error
->foo1b : typeof foo1b
+>foo1b : { (x: B<string>): any; (x: B<string>): any; }
 >x : B<string>
 >B : B<U>
 
 function foo1b(x: any) { }
->foo1b : typeof foo1b
+>foo1b : { (x: B<string>): any; (x: B<string>): any; }
 >x : any
 
 function foo1c(x: C<string>);
->foo1c : typeof foo1c
+>foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<V>
 
 function foo1c(x: C<string>); // error
->foo1c : typeof foo1c
+>foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<V>
 
 function foo1c(x: any) { }
->foo1c : typeof foo1c
+>foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : any
 
 function foo2(x: I<string>);
->foo2 : typeof foo2
+>foo2 : { (x: I<string>): any; (x: I<string>): any; }
 >x : I<string>
 >I : I<X>
 
 function foo2(x: I<string>); // error
->foo2 : typeof foo2
+>foo2 : { (x: I<string>): any; (x: I<string>): any; }
 >x : I<string>
 >I : I<X>
 
 function foo2(x: any) { }
->foo2 : typeof foo2
+>foo2 : { (x: I<string>): any; (x: I<string>): any; }
 >x : any
 
 function foo3(x: typeof a);
->foo3 : typeof foo3
+>foo3 : { (x: { foo<Z>(x: Z): Z; }): any; (x: { foo<Z>(x: Z): Z; }): any; }
 >x : { foo<Z>(x: Z): Z; }
 >a : { foo<Z>(x: Z): Z; }
 
 function foo3(x: typeof a); // error
->foo3 : typeof foo3
+>foo3 : { (x: { foo<Z>(x: Z): Z; }): any; (x: { foo<Z>(x: Z): Z; }): any; }
 >x : { foo<Z>(x: Z): Z; }
 >a : { foo<Z>(x: Z): Z; }
 
 function foo3(x: any) { }
->foo3 : typeof foo3
+>foo3 : { (x: { foo<Z>(x: Z): Z; }): any; (x: { foo<Z>(x: Z): Z; }): any; }
 >x : any
 
 function foo4(x: typeof b);
->foo4 : typeof foo4
+>foo4 : { (x: { foo: <A>(x: A) => A; }): any; (x: { foo: <A>(x: A) => A; }): any; }
 >x : { foo: <A>(x: A) => A; }
 >b : { foo: <A>(x: A) => A; }
 
 function foo4(x: typeof b); // error
->foo4 : typeof foo4
+>foo4 : { (x: { foo: <A>(x: A) => A; }): any; (x: { foo: <A>(x: A) => A; }): any; }
 >x : { foo: <A>(x: A) => A; }
 >b : { foo: <A>(x: A) => A; }
 
 function foo4(x: any) { }
->foo4 : typeof foo4
+>foo4 : { (x: { foo: <A>(x: A) => A; }): any; (x: { foo: <A>(x: A) => A; }): any; }
 >x : any
 
 function foo5(x: A);
->foo5 : typeof foo5
+>foo5 : { (x: A): any; (x: B<string>): any; }
 >x : A
 >A : A
 
 function foo5(x: B<string>); // ok
->foo5 : typeof foo5
+>foo5 : { (x: A): any; (x: B<string>): any; }
 >x : B<string>
 >B : B<U>
 
 function foo5(x: any) { }
->foo5 : typeof foo5
+>foo5 : { (x: A): any; (x: B<string>): any; }
 >x : any
 
 function foo5b(x: A);
->foo5b : typeof foo5b
+>foo5b : { (x: A): any; (x: C<string>): any; }
 >x : A
 >A : A
 
 function foo5b(x: C<string>); // ok
->foo5b : typeof foo5b
+>foo5b : { (x: A): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<V>
 
 function foo5b(x: any) { }
->foo5b : typeof foo5b
+>foo5b : { (x: A): any; (x: C<string>): any; }
 >x : any
 
 function foo6(x: A);
->foo6 : typeof foo6
+>foo6 : { (x: A): any; (x: I<string>): any; }
 >x : A
 >A : A
 
 function foo6(x: I<string>); // ok
->foo6 : typeof foo6
+>foo6 : { (x: A): any; (x: I<string>): any; }
 >x : I<string>
 >I : I<X>
 
 function foo6(x: any) { }
->foo6 : typeof foo6
+>foo6 : { (x: A): any; (x: I<string>): any; }
 >x : any
 
 function foo7(x: A);
->foo7 : typeof foo7
+>foo7 : { (x: A): any; (x: { foo<Z>(x: Z): Z; }): any; }
 >x : A
 >A : A
 
 function foo7(x: typeof a); // error
->foo7 : typeof foo7
+>foo7 : { (x: A): any; (x: { foo<Z>(x: Z): Z; }): any; }
 >x : { foo<Z>(x: Z): Z; }
 >a : { foo<Z>(x: Z): Z; }
 
 function foo7(x: any) { }
->foo7 : typeof foo7
+>foo7 : { (x: A): any; (x: { foo<Z>(x: Z): Z; }): any; }
 >x : any
 
 function foo8(x: B<string>);
->foo8 : typeof foo8
+>foo8 : { (x: B<string>): any; (x: I<string>): any; }
 >x : B<string>
 >B : B<U>
 
 function foo8(x: I<string>); // error
->foo8 : typeof foo8
+>foo8 : { (x: B<string>): any; (x: I<string>): any; }
 >x : I<string>
 >I : I<X>
 
 function foo8(x: any) { }
->foo8 : typeof foo8
+>foo8 : { (x: B<string>): any; (x: I<string>): any; }
 >x : any
 
 function foo9(x: B<string>);
->foo9 : typeof foo9
+>foo9 : { (x: B<string>): any; (x: C<string>): any; }
 >x : B<string>
 >B : B<U>
 
 function foo9(x: C<string>); // error
->foo9 : typeof foo9
+>foo9 : { (x: B<string>): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<V>
 
 function foo9(x: any) { }
->foo9 : typeof foo9
+>foo9 : { (x: B<string>): any; (x: C<string>): any; }
 >x : any
 
 function foo10(x: B<string>);
->foo10 : typeof foo10
+>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 : typeof foo10
+>foo10 : { (x: B<string>): any; (x: { foo<Z>(x: Z): Z; }): any; }
 >x : { foo<Z>(x: Z): Z; }
 >a : { foo<Z>(x: Z): Z; }
 
 function foo10(x: any) { }
->foo10 : typeof foo10
+>foo10 : { (x: B<string>): any; (x: { foo<Z>(x: Z): Z; }): any; }
 >x : any
 
 function foo11(x: B<string>);
->foo11 : typeof foo11
+>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 : typeof foo11
+>foo11 : { (x: B<string>): any; (x: { foo: <A>(x: A) => A; }): any; }
 >x : { foo: <A>(x: A) => A; }
 >b : { foo: <A>(x: A) => A; }
 
 function foo11(x: any) { }
->foo11 : typeof foo11
+>foo11 : { (x: B<string>): any; (x: { foo: <A>(x: A) => A; }): any; }
 >x : any
 
 function foo12(x: I<string>);
->foo12 : typeof foo12
+>foo12 : { (x: I<string>): any; (x: C<string>): any; }
 >x : I<string>
 >I : I<X>
 
 function foo12(x: C<string>); // error
->foo12 : typeof foo12
+>foo12 : { (x: I<string>): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<V>
 
 function foo12(x: any) { }
->foo12 : typeof foo12
+>foo12 : { (x: I<string>): any; (x: C<string>): any; }
 >x : any
 
 function foo12b(x: I2);
->foo12b : typeof foo12b
+>foo12b : { (x: I2): any; (x: C<string>): any; }
 >x : I2
 >I2 : I2
 
 function foo12b(x: C<string>); // ok
->foo12b : typeof foo12b
+>foo12b : { (x: I2): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<V>
 
 function foo12b(x: any) { }
->foo12b : typeof foo12b
+>foo12b : { (x: I2): any; (x: C<string>): any; }
 >x : any
 
 function foo13(x: I<string>);
->foo13 : typeof foo13
+>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 : typeof foo13
+>foo13 : { (x: I<string>): any; (x: { foo<Z>(x: Z): Z; }): any; }
 >x : { foo<Z>(x: Z): Z; }
 >a : { foo<Z>(x: Z): Z; }
 
 function foo13(x: any) { }
->foo13 : typeof foo13
+>foo13 : { (x: I<string>): any; (x: { foo<Z>(x: Z): Z; }): any; }
 >x : any
 
 function foo14(x: I<string>);
->foo14 : typeof foo14
+>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 : typeof foo14
+>foo14 : { (x: I<string>): any; (x: { foo: <A>(x: A) => A; }): any; }
 >x : { foo: <A>(x: A) => A; }
 >b : { foo: <A>(x: A) => A; }
 
 function foo14(x: any) { }
->foo14 : typeof foo14
+>foo14 : { (x: I<string>): any; (x: { foo: <A>(x: A) => A; }): any; }
 >x : any
 
 function foo15(x: I2);
->foo15 : typeof foo15
+>foo15 : { (x: I2): any; (x: C<number>): any; }
 >x : I2
 >I2 : I2
 
 function foo15(x: C<number>); // ok
->foo15 : typeof foo15
+>foo15 : { (x: I2): any; (x: C<number>): any; }
 >x : C<number>
 >C : C<V>
 
 function foo15(x: any) { }
->foo15 : typeof foo15
+>foo15 : { (x: I2): any; (x: C<number>): any; }
 >x : any
 
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesOptionalParams.types b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesOptionalParams.types
index c0bcf8e394c..bef916fc410 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesOptionalParams.types
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesOptionalParams.types
@@ -91,268 +91,268 @@ var b = { foo<T>(x: T, y?: T) { return x; } };
 >x : T
 
 function foo1(x: A);
->foo1 : typeof foo1
+>foo1 : { (x: A): any; (x: A): any; }
 >x : A
 >A : A
 
 function foo1(x: A); // error
->foo1 : typeof foo1
+>foo1 : { (x: A): any; (x: A): any; }
 >x : A
 >A : A
 
 function foo1(x: any) { }
->foo1 : typeof foo1
+>foo1 : { (x: A): any; (x: A): any; }
 >x : any
 
 function foo1b(x: B<string>);
->foo1b : typeof foo1b
+>foo1b : { (x: B<string>): any; (x: B<string>): any; }
 >x : B<string>
 >B : B<T>
 
 function foo1b(x: B<string>); // error
->foo1b : typeof foo1b
+>foo1b : { (x: B<string>): any; (x: B<string>): any; }
 >x : B<string>
 >B : B<T>
 
 function foo1b(x: any) { }
->foo1b : typeof foo1b
+>foo1b : { (x: B<string>): any; (x: B<string>): any; }
 >x : any
 
 function foo1c(x: C<string>);
->foo1c : typeof foo1c
+>foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo1c(x: C<string>); // error
->foo1c : typeof foo1c
+>foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo1c(x: any) { }
->foo1c : typeof foo1c
+>foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : any
 
 function foo2(x: I<string>);
->foo2 : typeof foo2
+>foo2 : { (x: I<string>): any; (x: I<string>): any; }
 >x : I<string>
 >I : I<T>
 
 function foo2(x: I<string>); // error
->foo2 : typeof foo2
+>foo2 : { (x: I<string>): any; (x: I<string>): any; }
 >x : I<string>
 >I : I<T>
 
 function foo2(x: any) { }
->foo2 : typeof foo2
+>foo2 : { (x: I<string>): any; (x: I<string>): any; }
 >x : any
 
 function foo3(x: typeof a);
->foo3 : typeof foo3
+>foo3 : { (x: { foo<T>(x: T, y?: T): T; }): any; (x: { foo<T>(x: T, y?: T): T; }): any; }
 >x : { foo<T>(x: T, y?: T): T; }
 >a : { foo<T>(x: T, y?: T): T; }
 
 function foo3(x: typeof a); // error
->foo3 : typeof foo3
+>foo3 : { (x: { foo<T>(x: T, y?: T): T; }): any; (x: { foo<T>(x: T, y?: T): T; }): any; }
 >x : { foo<T>(x: T, y?: T): T; }
 >a : { foo<T>(x: T, y?: T): T; }
 
 function foo3(x: any) { }
->foo3 : typeof foo3
+>foo3 : { (x: { foo<T>(x: T, y?: T): T; }): any; (x: { foo<T>(x: T, y?: T): T; }): any; }
 >x : any
 
 function foo4(x: typeof b);
->foo4 : typeof foo4
+>foo4 : { (x: { foo: <T>(x: T, y?: T) => T; }): any; (x: { foo: <T>(x: T, y?: T) => T; }): any; }
 >x : { foo: <T>(x: T, y?: T) => T; }
 >b : { foo: <T>(x: T, y?: T) => T; }
 
 function foo4(x: typeof b); // error
->foo4 : typeof foo4
+>foo4 : { (x: { foo: <T>(x: T, y?: T) => T; }): any; (x: { foo: <T>(x: T, y?: T) => T; }): any; }
 >x : { foo: <T>(x: T, y?: T) => T; }
 >b : { foo: <T>(x: T, y?: T) => T; }
 
 function foo4(x: any) { }
->foo4 : typeof foo4
+>foo4 : { (x: { foo: <T>(x: T, y?: T) => T; }): any; (x: { foo: <T>(x: T, y?: T) => T; }): any; }
 >x : any
 
 function foo5(x: A);
->foo5 : typeof foo5
+>foo5 : { (x: A): any; (x: B<string>): any; }
 >x : A
 >A : A
 
 function foo5(x: B<string>); // ok
->foo5 : typeof foo5
+>foo5 : { (x: A): any; (x: B<string>): any; }
 >x : B<string>
 >B : B<T>
 
 function foo5(x: any) { }
->foo5 : typeof foo5
+>foo5 : { (x: A): any; (x: B<string>): any; }
 >x : any
 
 function foo5b(x: A);
->foo5b : typeof foo5b
+>foo5b : { (x: A): any; (x: C<string>): any; }
 >x : A
 >A : A
 
 function foo5b(x: C<string>); // ok
->foo5b : typeof foo5b
+>foo5b : { (x: A): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo5b(x: any) { }
->foo5b : typeof foo5b
+>foo5b : { (x: A): any; (x: C<string>): any; }
 >x : any
 
 function foo6(x: A);
->foo6 : typeof foo6
+>foo6 : { (x: A): any; (x: I<string>): any; }
 >x : A
 >A : A
 
 function foo6(x: I<string>); // ok
->foo6 : typeof foo6
+>foo6 : { (x: A): any; (x: I<string>): any; }
 >x : I<string>
 >I : I<T>
 
 function foo6(x: any) { }
->foo6 : typeof foo6
+>foo6 : { (x: A): any; (x: I<string>): any; }
 >x : any
 
 function foo7(x: A);
->foo7 : typeof foo7
+>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 : typeof foo7
+>foo7 : { (x: A): any; (x: { foo<T>(x: T, y?: T): T; }): any; }
 >x : { foo<T>(x: T, y?: T): T; }
 >a : { foo<T>(x: T, y?: T): T; }
 
 function foo7(x: any) { }
->foo7 : typeof foo7
+>foo7 : { (x: A): any; (x: { foo<T>(x: T, y?: T): T; }): any; }
 >x : any
 
 function foo8(x: B<string>);
->foo8 : typeof foo8
+>foo8 : { (x: B<string>): any; (x: I<string>): any; }
 >x : B<string>
 >B : B<T>
 
 function foo8(x: I<string>); // error
->foo8 : typeof foo8
+>foo8 : { (x: B<string>): any; (x: I<string>): any; }
 >x : I<string>
 >I : I<T>
 
 function foo8(x: any) { }
->foo8 : typeof foo8
+>foo8 : { (x: B<string>): any; (x: I<string>): any; }
 >x : any
 
 function foo9(x: B<string>);
->foo9 : typeof foo9
+>foo9 : { (x: B<string>): any; (x: C<string>): any; }
 >x : B<string>
 >B : B<T>
 
 function foo9(x: C<string>); // error
->foo9 : typeof foo9
+>foo9 : { (x: B<string>): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo9(x: any) { }
->foo9 : typeof foo9
+>foo9 : { (x: B<string>): any; (x: C<string>): any; }
 >x : any
 
 function foo10(x: B<string>);
->foo10 : typeof foo10
+>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 : typeof foo10
+>foo10 : { (x: B<string>): any; (x: { foo<T>(x: T, y?: T): T; }): any; }
 >x : { foo<T>(x: T, y?: T): T; }
 >a : { foo<T>(x: T, y?: T): T; }
 
 function foo10(x: any) { }
->foo10 : typeof foo10
+>foo10 : { (x: B<string>): any; (x: { foo<T>(x: T, y?: T): T; }): any; }
 >x : any
 
 function foo11(x: B<string>);
->foo11 : typeof foo11
+>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 : typeof foo11
+>foo11 : { (x: B<string>): any; (x: { foo: <T>(x: T, y?: T) => T; }): any; }
 >x : { foo: <T>(x: T, y?: T) => T; }
 >b : { foo: <T>(x: T, y?: T) => T; }
 
 function foo11(x: any) { }
->foo11 : typeof foo11
+>foo11 : { (x: B<string>): any; (x: { foo: <T>(x: T, y?: T) => T; }): any; }
 >x : any
 
 function foo12(x: I<string>);
->foo12 : typeof foo12
+>foo12 : { (x: I<string>): any; (x: C<string>): any; }
 >x : I<string>
 >I : I<T>
 
 function foo12(x: C<string>); // error
->foo12 : typeof foo12
+>foo12 : { (x: I<string>): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo12(x: any) { }
->foo12 : typeof foo12
+>foo12 : { (x: I<string>): any; (x: C<string>): any; }
 >x : any
 
 function foo12b(x: I2);
->foo12b : typeof foo12b
+>foo12b : { (x: I2): any; (x: C<string>): any; }
 >x : I2
 >I2 : I2
 
 function foo12b(x: C<string>); // ok
->foo12b : typeof foo12b
+>foo12b : { (x: I2): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo12b(x: any) { }
->foo12b : typeof foo12b
+>foo12b : { (x: I2): any; (x: C<string>): any; }
 >x : any
 
 function foo13(x: I<string>);
->foo13 : typeof foo13
+>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 : typeof foo13
+>foo13 : { (x: I<string>): any; (x: { foo<T>(x: T, y?: T): T; }): any; }
 >x : { foo<T>(x: T, y?: T): T; }
 >a : { foo<T>(x: T, y?: T): T; }
 
 function foo13(x: any) { }
->foo13 : typeof foo13
+>foo13 : { (x: I<string>): any; (x: { foo<T>(x: T, y?: T): T; }): any; }
 >x : any
 
 function foo14(x: I<string>);
->foo14 : typeof foo14
+>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 : typeof foo14
+>foo14 : { (x: I<string>): any; (x: { foo: <T>(x: T, y?: T) => T; }): any; }
 >x : { foo: <T>(x: T, y?: T) => T; }
 >b : { foo: <T>(x: T, y?: T) => T; }
 
 function foo14(x: any) { }
->foo14 : typeof foo14
+>foo14 : { (x: I<string>): any; (x: { foo: <T>(x: T, y?: T) => T; }): any; }
 >x : any
 
 function foo15(x: I2);
->foo15 : typeof foo15
+>foo15 : { (x: I2): any; (x: C<number>): any; }
 >x : I2
 >I2 : I2
 
 function foo15(x: C<number>); // ok
->foo15 : typeof foo15
+>foo15 : { (x: I2): any; (x: C<number>): any; }
 >x : C<number>
 >C : C<T>
 
 function foo15(x: any) { }
->foo15 : typeof foo15
+>foo15 : { (x: I2): any; (x: C<number>): any; }
 >x : any
 
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesOptionalParams2.types b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesOptionalParams2.types
index cbf9db01907..c8a4ad6be29 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesOptionalParams2.types
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesOptionalParams2.types
@@ -98,268 +98,268 @@ var b = { foo<T, U>(x: T, y?: U) { return x; } };
 >x : T
 
 function foo1(x: A);
->foo1 : typeof foo1
+>foo1 : { (x: A): any; (x: A): any; }
 >x : A
 >A : A
 
 function foo1(x: A); // error
->foo1 : typeof foo1
+>foo1 : { (x: A): any; (x: A): any; }
 >x : A
 >A : A
 
 function foo1(x: any) { }
->foo1 : typeof foo1
+>foo1 : { (x: A): any; (x: A): any; }
 >x : any
 
 function foo1b(x: B<string, number>);
->foo1b : typeof foo1b
+>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 : typeof foo1b
+>foo1b : { (x: B<string, number>): any; (x: B<string, number>): any; }
 >x : B<string, number>
 >B : B<T, U>
 
 function foo1b(x: any) { }
->foo1b : typeof foo1b
+>foo1b : { (x: B<string, number>): any; (x: B<string, number>): any; }
 >x : any
 
 function foo1c(x: C<string, number>);
->foo1c : typeof foo1c
+>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 : typeof foo1c
+>foo1c : { (x: C<string, number>): any; (x: C<string, number>): any; }
 >x : C<string, number>
 >C : C<T, U>
 
 function foo1c(x: any) { }
->foo1c : typeof foo1c
+>foo1c : { (x: C<string, number>): any; (x: C<string, number>): any; }
 >x : any
 
 function foo2(x: I<string, number>);
->foo2 : typeof foo2
+>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 : typeof foo2
+>foo2 : { (x: I<string, number>): any; (x: I<string, number>): any; }
 >x : I<string, number>
 >I : I<T, U>
 
 function foo2(x: any) { }
->foo2 : typeof foo2
+>foo2 : { (x: I<string, number>): any; (x: I<string, number>): any; }
 >x : any
 
 function foo3(x: typeof a);
->foo3 : typeof foo3
+>foo3 : { (x: { foo<T, U>(x: T, y?: U): T; }): any; (x: { foo<T, U>(x: T, y?: U): T; }): any; }
 >x : { foo<T, U>(x: T, y?: U): T; }
 >a : { foo<T, U>(x: T, y?: U): T; }
 
 function foo3(x: typeof a); // error
->foo3 : typeof foo3
+>foo3 : { (x: { foo<T, U>(x: T, y?: U): T; }): any; (x: { foo<T, U>(x: T, y?: U): T; }): any; }
 >x : { foo<T, U>(x: T, y?: U): T; }
 >a : { foo<T, U>(x: T, y?: U): T; }
 
 function foo3(x: any) { }
->foo3 : typeof foo3
+>foo3 : { (x: { foo<T, U>(x: T, y?: U): T; }): any; (x: { foo<T, U>(x: T, y?: U): T; }): any; }
 >x : any
 
 function foo4(x: typeof b);
->foo4 : typeof foo4
+>foo4 : { (x: { foo: <T, U>(x: T, y?: U) => T; }): any; (x: { foo: <T, U>(x: T, y?: U) => T; }): any; }
 >x : { foo: <T, U>(x: T, y?: U) => T; }
 >b : { foo: <T, U>(x: T, y?: U) => T; }
 
 function foo4(x: typeof b); // error
->foo4 : typeof foo4
+>foo4 : { (x: { foo: <T, U>(x: T, y?: U) => T; }): any; (x: { foo: <T, U>(x: T, y?: U) => T; }): any; }
 >x : { foo: <T, U>(x: T, y?: U) => T; }
 >b : { foo: <T, U>(x: T, y?: U) => T; }
 
 function foo4(x: any) { }
->foo4 : typeof foo4
+>foo4 : { (x: { foo: <T, U>(x: T, y?: U) => T; }): any; (x: { foo: <T, U>(x: T, y?: U) => T; }): any; }
 >x : any
 
 function foo5(x: A);
->foo5 : typeof foo5
+>foo5 : { (x: A): any; (x: B<string, number>): any; }
 >x : A
 >A : A
 
 function foo5(x: B<string, number>); // ok
->foo5 : typeof foo5
+>foo5 : { (x: A): any; (x: B<string, number>): any; }
 >x : B<string, number>
 >B : B<T, U>
 
 function foo5(x: any) { }
->foo5 : typeof foo5
+>foo5 : { (x: A): any; (x: B<string, number>): any; }
 >x : any
 
 function foo5b(x: A);
->foo5b : typeof foo5b
+>foo5b : { (x: A): any; (x: C<string, number>): any; }
 >x : A
 >A : A
 
 function foo5b(x: C<string, number>); // ok
->foo5b : typeof foo5b
+>foo5b : { (x: A): any; (x: C<string, number>): any; }
 >x : C<string, number>
 >C : C<T, U>
 
 function foo5b(x: any) { }
->foo5b : typeof foo5b
+>foo5b : { (x: A): any; (x: C<string, number>): any; }
 >x : any
 
 function foo6(x: A);
->foo6 : typeof foo6
+>foo6 : { (x: A): any; (x: I<string, number>): any; }
 >x : A
 >A : A
 
 function foo6(x: I<string, number>); // ok
->foo6 : typeof foo6
+>foo6 : { (x: A): any; (x: I<string, number>): any; }
 >x : I<string, number>
 >I : I<T, U>
 
 function foo6(x: any) { }
->foo6 : typeof foo6
+>foo6 : { (x: A): any; (x: I<string, number>): any; }
 >x : any
 
 function foo7(x: A);
->foo7 : typeof foo7
+>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 : typeof foo7
+>foo7 : { (x: A): any; (x: { foo<T, U>(x: T, y?: U): T; }): any; }
 >x : { foo<T, U>(x: T, y?: U): T; }
 >a : { foo<T, U>(x: T, y?: U): T; }
 
 function foo7(x: any) { }
->foo7 : typeof foo7
+>foo7 : { (x: A): any; (x: { foo<T, U>(x: T, y?: U): T; }): any; }
 >x : any
 
 function foo8(x: B<string, number>);
->foo8 : typeof foo8
+>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 : typeof foo8
+>foo8 : { (x: B<string, number>): any; (x: I<string, number>): any; }
 >x : I<string, number>
 >I : I<T, U>
 
 function foo8(x: any) { }
->foo8 : typeof foo8
+>foo8 : { (x: B<string, number>): any; (x: I<string, number>): any; }
 >x : any
 
 function foo9(x: B<string, number>);
->foo9 : typeof foo9
+>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 : typeof foo9
+>foo9 : { (x: B<string, number>): any; (x: C<string, number>): any; }
 >x : C<string, number>
 >C : C<T, U>
 
 function foo9(x: any) { }
->foo9 : typeof foo9
+>foo9 : { (x: B<string, number>): any; (x: C<string, number>): any; }
 >x : any
 
 function foo10(x: B<string, number>);
->foo10 : typeof foo10
+>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 : typeof foo10
+>foo10 : { (x: B<string, number>): any; (x: { foo<T, U>(x: T, y?: U): T; }): any; }
 >x : { foo<T, U>(x: T, y?: U): T; }
 >a : { foo<T, U>(x: T, y?: U): T; }
 
 function foo10(x: any) { }
->foo10 : typeof foo10
+>foo10 : { (x: B<string, number>): any; (x: { foo<T, U>(x: T, y?: U): T; }): any; }
 >x : any
 
 function foo11(x: B<string, number>);
->foo11 : typeof foo11
+>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 : typeof foo11
+>foo11 : { (x: B<string, number>): any; (x: { foo: <T, U>(x: T, y?: U) => T; }): any; }
 >x : { foo: <T, U>(x: T, y?: U) => T; }
 >b : { foo: <T, U>(x: T, y?: U) => T; }
 
 function foo11(x: any) { }
->foo11 : typeof foo11
+>foo11 : { (x: B<string, number>): any; (x: { foo: <T, U>(x: T, y?: U) => T; }): any; }
 >x : any
 
 function foo12(x: I<string, number>);
->foo12 : typeof foo12
+>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 : typeof foo12
+>foo12 : { (x: I<string, number>): any; (x: C<string, number>): any; }
 >x : C<string, number>
 >C : C<T, U>
 
 function foo12(x: any) { }
->foo12 : typeof foo12
+>foo12 : { (x: I<string, number>): any; (x: C<string, number>): any; }
 >x : any
 
 function foo12b(x: I2);
->foo12b : typeof foo12b
+>foo12b : { (x: I2): any; (x: C<string, number>): any; }
 >x : I2
 >I2 : I2
 
 function foo12b(x: C<string, number>); // ok
->foo12b : typeof foo12b
+>foo12b : { (x: I2): any; (x: C<string, number>): any; }
 >x : C<string, number>
 >C : C<T, U>
 
 function foo12b(x: any) { }
->foo12b : typeof foo12b
+>foo12b : { (x: I2): any; (x: C<string, number>): any; }
 >x : any
 
 function foo13(x: I<string, number>);
->foo13 : typeof foo13
+>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 : typeof foo13
+>foo13 : { (x: I<string, number>): any; (x: { foo<T, U>(x: T, y?: U): T; }): any; }
 >x : { foo<T, U>(x: T, y?: U): T; }
 >a : { foo<T, U>(x: T, y?: U): T; }
 
 function foo13(x: any) { }
->foo13 : typeof foo13
+>foo13 : { (x: I<string, number>): any; (x: { foo<T, U>(x: T, y?: U): T; }): any; }
 >x : any
 
 function foo14(x: I<string, number>);
->foo14 : typeof foo14
+>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 : typeof foo14
+>foo14 : { (x: I<string, number>): any; (x: { foo: <T, U>(x: T, y?: U) => T; }): any; }
 >x : { foo: <T, U>(x: T, y?: U) => T; }
 >b : { foo: <T, U>(x: T, y?: U) => T; }
 
 function foo14(x: any) { }
->foo14 : typeof foo14
+>foo14 : { (x: I<string, number>): any; (x: { foo: <T, U>(x: T, y?: U) => T; }): any; }
 >x : any
 
 function foo15(x: I2);
->foo15 : typeof foo15
+>foo15 : { (x: I2): any; (x: C<string, number>): any; }
 >x : I2
 >I2 : I2
 
 function foo15(x: C<string, number>); // ok
->foo15 : typeof foo15
+>foo15 : { (x: I2): any; (x: C<string, number>): any; }
 >x : C<string, number>
 >C : C<T, U>
 
 function foo15(x: any) { }
->foo15 : typeof foo15
+>foo15 : { (x: I2): any; (x: C<string, number>): any; }
 >x : any
 
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesOptionalParams3.types b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesOptionalParams3.types
index f03e7b89ce6..06c23dcd0b1 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesOptionalParams3.types
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericCallSignaturesOptionalParams3.types
@@ -98,268 +98,268 @@ var b = { foo<T, U>(x: T, y: U) { return x; } };
 >x : T
 
 function foo1(x: A);
->foo1 : typeof foo1
+>foo1 : { (x: A): any; (x: A): any; }
 >x : A
 >A : A
 
 function foo1(x: A); // error
->foo1 : typeof foo1
+>foo1 : { (x: A): any; (x: A): any; }
 >x : A
 >A : A
 
 function foo1(x: any) { }
->foo1 : typeof foo1
+>foo1 : { (x: A): any; (x: A): any; }
 >x : any
 
 function foo1b(x: B<string, number>);
->foo1b : typeof foo1b
+>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 : typeof foo1b
+>foo1b : { (x: B<string, number>): any; (x: B<string, number>): any; }
 >x : B<string, number>
 >B : B<T, U>
 
 function foo1b(x: any) { }
->foo1b : typeof foo1b
+>foo1b : { (x: B<string, number>): any; (x: B<string, number>): any; }
 >x : any
 
 function foo1c(x: C<string, number>);
->foo1c : typeof foo1c
+>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 : typeof foo1c
+>foo1c : { (x: C<string, number>): any; (x: C<string, number>): any; }
 >x : C<string, number>
 >C : C<T, U>
 
 function foo1c(x: any) { }
->foo1c : typeof foo1c
+>foo1c : { (x: C<string, number>): any; (x: C<string, number>): any; }
 >x : any
 
 function foo2(x: I<string, number>);
->foo2 : typeof foo2
+>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 : typeof foo2
+>foo2 : { (x: I<string, number>): any; (x: I<string, number>): any; }
 >x : I<string, number>
 >I : I<T, U>
 
 function foo2(x: any) { }
->foo2 : typeof foo2
+>foo2 : { (x: I<string, number>): any; (x: I<string, number>): any; }
 >x : any
 
 function foo3(x: typeof a);
->foo3 : typeof foo3
+>foo3 : { (x: { foo<T, U>(x: T, y?: U): T; }): any; (x: { foo<T, U>(x: T, y?: U): T; }): any; }
 >x : { foo<T, U>(x: T, y?: U): T; }
 >a : { foo<T, U>(x: T, y?: U): T; }
 
 function foo3(x: typeof a); // error
->foo3 : typeof foo3
+>foo3 : { (x: { foo<T, U>(x: T, y?: U): T; }): any; (x: { foo<T, U>(x: T, y?: U): T; }): any; }
 >x : { foo<T, U>(x: T, y?: U): T; }
 >a : { foo<T, U>(x: T, y?: U): T; }
 
 function foo3(x: any) { }
->foo3 : typeof foo3
+>foo3 : { (x: { foo<T, U>(x: T, y?: U): T; }): any; (x: { foo<T, U>(x: T, y?: U): T; }): any; }
 >x : any
 
 function foo4(x: typeof b);
->foo4 : typeof foo4
+>foo4 : { (x: { foo: <T, U>(x: T, y: U) => T; }): any; (x: { foo: <T, U>(x: T, y: U) => T; }): any; }
 >x : { foo: <T, U>(x: T, y: U) => T; }
 >b : { foo: <T, U>(x: T, y: U) => T; }
 
 function foo4(x: typeof b); // error
->foo4 : typeof foo4
+>foo4 : { (x: { foo: <T, U>(x: T, y: U) => T; }): any; (x: { foo: <T, U>(x: T, y: U) => T; }): any; }
 >x : { foo: <T, U>(x: T, y: U) => T; }
 >b : { foo: <T, U>(x: T, y: U) => T; }
 
 function foo4(x: any) { }
->foo4 : typeof foo4
+>foo4 : { (x: { foo: <T, U>(x: T, y: U) => T; }): any; (x: { foo: <T, U>(x: T, y: U) => T; }): any; }
 >x : any
 
 function foo5(x: A);
->foo5 : typeof foo5
+>foo5 : { (x: A): any; (x: B<string, number>): any; }
 >x : A
 >A : A
 
 function foo5(x: B<string, number>); // ok
->foo5 : typeof foo5
+>foo5 : { (x: A): any; (x: B<string, number>): any; }
 >x : B<string, number>
 >B : B<T, U>
 
 function foo5(x: any) { }
->foo5 : typeof foo5
+>foo5 : { (x: A): any; (x: B<string, number>): any; }
 >x : any
 
 function foo5b(x: A);
->foo5b : typeof foo5b
+>foo5b : { (x: A): any; (x: C<string, number>): any; }
 >x : A
 >A : A
 
 function foo5b(x: C<string, number>); // ok
->foo5b : typeof foo5b
+>foo5b : { (x: A): any; (x: C<string, number>): any; }
 >x : C<string, number>
 >C : C<T, U>
 
 function foo5b(x: any) { }
->foo5b : typeof foo5b
+>foo5b : { (x: A): any; (x: C<string, number>): any; }
 >x : any
 
 function foo6(x: A);
->foo6 : typeof foo6
+>foo6 : { (x: A): any; (x: I<string, number>): any; }
 >x : A
 >A : A
 
 function foo6(x: I<string, number>); // ok
->foo6 : typeof foo6
+>foo6 : { (x: A): any; (x: I<string, number>): any; }
 >x : I<string, number>
 >I : I<T, U>
 
 function foo6(x: any) { }
->foo6 : typeof foo6
+>foo6 : { (x: A): any; (x: I<string, number>): any; }
 >x : any
 
 function foo7(x: A);
->foo7 : typeof foo7
+>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 : typeof foo7
+>foo7 : { (x: A): any; (x: { foo<T, U>(x: T, y?: U): T; }): any; }
 >x : { foo<T, U>(x: T, y?: U): T; }
 >a : { foo<T, U>(x: T, y?: U): T; }
 
 function foo7(x: any) { }
->foo7 : typeof foo7
+>foo7 : { (x: A): any; (x: { foo<T, U>(x: T, y?: U): T; }): any; }
 >x : any
 
 function foo8(x: B<string, number>);
->foo8 : typeof foo8
+>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 : typeof foo8
+>foo8 : { (x: B<string, number>): any; (x: I<string, number>): any; }
 >x : I<string, number>
 >I : I<T, U>
 
 function foo8(x: any) { }
->foo8 : typeof foo8
+>foo8 : { (x: B<string, number>): any; (x: I<string, number>): any; }
 >x : any
 
 function foo9(x: B<string, number>);
->foo9 : typeof foo9
+>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 : typeof foo9
+>foo9 : { (x: B<string, number>): any; (x: C<string, number>): any; }
 >x : C<string, number>
 >C : C<T, U>
 
 function foo9(x: any) { }
->foo9 : typeof foo9
+>foo9 : { (x: B<string, number>): any; (x: C<string, number>): any; }
 >x : any
 
 function foo10(x: B<string, number>);
->foo10 : typeof foo10
+>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 : typeof foo10
+>foo10 : { (x: B<string, number>): any; (x: { foo<T, U>(x: T, y?: U): T; }): any; }
 >x : { foo<T, U>(x: T, y?: U): T; }
 >a : { foo<T, U>(x: T, y?: U): T; }
 
 function foo10(x: any) { }
->foo10 : typeof foo10
+>foo10 : { (x: B<string, number>): any; (x: { foo<T, U>(x: T, y?: U): T; }): any; }
 >x : any
 
 function foo11(x: B<string, number>);
->foo11 : typeof foo11
+>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 : typeof foo11
+>foo11 : { (x: B<string, number>): any; (x: { foo: <T, U>(x: T, y: U) => T; }): any; }
 >x : { foo: <T, U>(x: T, y: U) => T; }
 >b : { foo: <T, U>(x: T, y: U) => T; }
 
 function foo11(x: any) { }
->foo11 : typeof foo11
+>foo11 : { (x: B<string, number>): any; (x: { foo: <T, U>(x: T, y: U) => T; }): any; }
 >x : any
 
 function foo12(x: I<string, number>);
->foo12 : typeof foo12
+>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 : typeof foo12
+>foo12 : { (x: I<string, number>): any; (x: C<string, number>): any; }
 >x : C<string, number>
 >C : C<T, U>
 
 function foo12(x: any) { }
->foo12 : typeof foo12
+>foo12 : { (x: I<string, number>): any; (x: C<string, number>): any; }
 >x : any
 
 function foo12b(x: I2);
->foo12b : typeof foo12b
+>foo12b : { (x: I2): any; (x: C<string, number>): any; }
 >x : I2
 >I2 : I2
 
 function foo12b(x: C<string, number>); // ok
->foo12b : typeof foo12b
+>foo12b : { (x: I2): any; (x: C<string, number>): any; }
 >x : C<string, number>
 >C : C<T, U>
 
 function foo12b(x: any) { }
->foo12b : typeof foo12b
+>foo12b : { (x: I2): any; (x: C<string, number>): any; }
 >x : any
 
 function foo13(x: I<string, number>);
->foo13 : typeof foo13
+>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 : typeof foo13
+>foo13 : { (x: I<string, number>): any; (x: { foo<T, U>(x: T, y?: U): T; }): any; }
 >x : { foo<T, U>(x: T, y?: U): T; }
 >a : { foo<T, U>(x: T, y?: U): T; }
 
 function foo13(x: any) { }
->foo13 : typeof foo13
+>foo13 : { (x: I<string, number>): any; (x: { foo<T, U>(x: T, y?: U): T; }): any; }
 >x : any
 
 function foo14(x: I<string, number>);
->foo14 : typeof foo14
+>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 : typeof foo14
+>foo14 : { (x: I<string, number>): any; (x: { foo: <T, U>(x: T, y: U) => T; }): any; }
 >x : { foo: <T, U>(x: T, y: U) => T; }
 >b : { foo: <T, U>(x: T, y: U) => T; }
 
 function foo14(x: any) { }
->foo14 : typeof foo14
+>foo14 : { (x: I<string, number>): any; (x: { foo: <T, U>(x: T, y: U) => T; }): any; }
 >x : any
 
 function foo15(x: I2);
->foo15 : typeof foo15
+>foo15 : { (x: I2): any; (x: C<string, number>): any; }
 >x : I2
 >I2 : I2
 
 function foo15(x: C<string, number>); // ok
->foo15 : typeof foo15
+>foo15 : { (x: I2): any; (x: C<string, number>): any; }
 >x : C<string, number>
 >C : C<T, U>
 
 function foo15(x: any) { }
->foo15 : typeof foo15
+>foo15 : { (x: I2): any; (x: C<string, number>): any; }
 >x : any
 
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.types b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.types
index 5a9db264031..8a41814e1a9 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.types
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.types
@@ -61,201 +61,201 @@ var b = { new<T extends RegExp>(x: T) { return ''; } }; // not a construct signa
 >T : T
 
 function foo1b(x: B<Array<number>>);
->foo1b : typeof foo1b
+>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 : typeof foo1b
+>foo1b : { (x: B<number[]>): any; (x: B<number[]>): any; }
 >x : B<number[]>
 >B : B<T>
 >Array : T[]
 
 function foo1b(x: any) { }
->foo1b : typeof foo1b
+>foo1b : { (x: B<number[]>): any; (x: B<number[]>): any; }
 >x : any
 
 function foo1c(x: C<String>);
->foo1c : typeof foo1c
+>foo1c : { (x: C<String>): any; (x: C<String>): any; }
 >x : C<String>
 >C : C<T>
 >String : String
 
 function foo1c(x: C<String>); // error
->foo1c : typeof foo1c
+>foo1c : { (x: C<String>): any; (x: C<String>): any; }
 >x : C<String>
 >C : C<T>
 >String : String
 
 function foo1c(x: any) { }
->foo1c : typeof foo1c
+>foo1c : { (x: C<String>): any; (x: C<String>): any; }
 >x : any
 
 function foo2(x: I<Number>);
->foo2 : typeof foo2
+>foo2 : { (x: I<Number>): any; (x: I<Number>): any; }
 >x : I<Number>
 >I : I<T>
 >Number : Number
 
 function foo2(x: I<Number>); // error
->foo2 : typeof foo2
+>foo2 : { (x: I<Number>): any; (x: I<Number>): any; }
 >x : I<Number>
 >I : I<T>
 >Number : Number
 
 function foo2(x: any) { }
->foo2 : typeof foo2
+>foo2 : { (x: I<Number>): any; (x: I<Number>): any; }
 >x : any
 
 function foo3(x: typeof a);
->foo3 : typeof foo3
+>foo3 : { (x: new <T extends string[]>(x: T) => string): any; (x: new <T extends string[]>(x: T) => string): any; }
 >x : new <T extends string[]>(x: T) => string
 >a : new <T extends string[]>(x: T) => string
 
 function foo3(x: typeof a); // error
->foo3 : typeof foo3
+>foo3 : { (x: new <T extends string[]>(x: T) => string): any; (x: new <T extends string[]>(x: T) => string): any; }
 >x : new <T extends string[]>(x: T) => string
 >a : new <T extends string[]>(x: T) => string
 
 function foo3(x: any) { }
->foo3 : typeof foo3
+>foo3 : { (x: new <T extends string[]>(x: T) => string): any; (x: new <T extends string[]>(x: T) => string): any; }
 >x : any
 
 function foo4(x: typeof b);
->foo4 : typeof foo4
+>foo4 : { (x: { new: <T extends RegExp>(x: T) => string; }): any; (x: { new: <T extends RegExp>(x: T) => string; }): any; }
 >x : { new: <T extends RegExp>(x: T) => string; }
 >b : { new: <T extends RegExp>(x: T) => string; }
 
 function foo4(x: typeof b); // error
->foo4 : typeof foo4
+>foo4 : { (x: { new: <T extends RegExp>(x: T) => string; }): any; (x: { new: <T extends RegExp>(x: T) => string; }): any; }
 >x : { new: <T extends RegExp>(x: T) => string; }
 >b : { new: <T extends RegExp>(x: T) => string; }
 
 function foo4(x: any) { }
->foo4 : typeof foo4
+>foo4 : { (x: { new: <T extends RegExp>(x: T) => string; }): any; (x: { new: <T extends RegExp>(x: T) => string; }): any; }
 >x : any
 
 function foo8(x: B<Array<number>>);
->foo8 : typeof foo8
+>foo8 : { (x: B<number[]>): any; (x: I<Number>): any; }
 >x : B<number[]>
 >B : B<T>
 >Array : T[]
 
 function foo8(x: I<Number>); // ok
->foo8 : typeof foo8
+>foo8 : { (x: B<number[]>): any; (x: I<Number>): any; }
 >x : I<Number>
 >I : I<T>
 >Number : Number
 
 function foo8(x: any) { }
->foo8 : typeof foo8
+>foo8 : { (x: B<number[]>): any; (x: I<Number>): any; }
 >x : any
 
 function foo9(x: B<Array<number>>);
->foo9 : typeof foo9
+>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 : typeof foo9
+>foo9 : { (x: B<number[]>): any; (x: C<String>): any; }
 >x : C<String>
 >C : C<T>
 >String : String
 
 function foo9(x: any) { }
->foo9 : typeof foo9
+>foo9 : { (x: B<number[]>): any; (x: C<String>): any; }
 >x : any
 
 function foo10(x: B<Array<number>>);
->foo10 : typeof foo10
+>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 : typeof foo10
+>foo10 : { (x: B<number[]>): any; (x: new <T extends string[]>(x: T) => string): any; }
 >x : new <T extends string[]>(x: T) => string
 >a : new <T extends string[]>(x: T) => string
 
 function foo10(x: any) { }
->foo10 : typeof foo10
+>foo10 : { (x: B<number[]>): any; (x: new <T extends string[]>(x: T) => string): any; }
 >x : any
 
 function foo11(x: B<Array<number>>);
->foo11 : typeof foo11
+>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 : typeof foo11
+>foo11 : { (x: B<number[]>): any; (x: { new: <T extends RegExp>(x: T) => string; }): any; }
 >x : { new: <T extends RegExp>(x: T) => string; }
 >b : { new: <T extends RegExp>(x: T) => string; }
 
 function foo11(x: any) { }
->foo11 : typeof foo11
+>foo11 : { (x: B<number[]>): any; (x: { new: <T extends RegExp>(x: T) => string; }): any; }
 >x : any
 
 function foo12(x: I<Number>);
->foo12 : typeof foo12
+>foo12 : { (x: I<Number>): any; (x: C<String>): any; }
 >x : I<Number>
 >I : I<T>
 >Number : Number
 
 function foo12(x: C<String>); // ok
->foo12 : typeof foo12
+>foo12 : { (x: I<Number>): any; (x: C<String>): any; }
 >x : C<String>
 >C : C<T>
 >String : String
 
 function foo12(x: any) { }
->foo12 : typeof foo12
+>foo12 : { (x: I<Number>): any; (x: C<String>): any; }
 >x : any
 
 function foo12b(x: I2);
->foo12b : typeof foo12b
+>foo12b : { (x: I2): any; (x: C<String>): any; }
 >x : I2
 >I2 : I2
 
 function foo12b(x: C<String>); // ok
->foo12b : typeof foo12b
+>foo12b : { (x: I2): any; (x: C<String>): any; }
 >x : C<String>
 >C : C<T>
 >String : String
 
 function foo12b(x: any) { }
->foo12b : typeof foo12b
+>foo12b : { (x: I2): any; (x: C<String>): any; }
 >x : any
 
 function foo13(x: I<Number>);
->foo13 : typeof foo13
+>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 : typeof foo13
+>foo13 : { (x: I<Number>): any; (x: new <T extends string[]>(x: T) => string): any; }
 >x : new <T extends string[]>(x: T) => string
 >a : new <T extends string[]>(x: T) => string
 
 function foo13(x: any) { }
->foo13 : typeof foo13
+>foo13 : { (x: I<Number>): any; (x: new <T extends string[]>(x: T) => string): any; }
 >x : any
 
 function foo14(x: I<Number>);
->foo14 : typeof foo14
+>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 : typeof foo14
+>foo14 : { (x: I<Number>): any; (x: { new: <T extends RegExp>(x: T) => string; }): any; }
 >x : { new: <T extends RegExp>(x: T) => string; }
 >b : { new: <T extends RegExp>(x: T) => string; }
 
 function foo14(x: any) { }
->foo14 : typeof foo14
+>foo14 : { (x: I<Number>): any; (x: { new: <T extends RegExp>(x: T) => string; }): any; }
 >x : any
 
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType.types b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType.types
index c07d0e2430f..1eac69f7f23 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType.types
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType.types
@@ -59,212 +59,212 @@ var b = { new<T>(x: T): T { return null; } }; // not a construct signature, func
 >T : T
 
 function foo1b(x: B<string>);
->foo1b : typeof foo1b
+>foo1b : { (x: B<string>): any; (x: B<string>): any; }
 >x : B<string>
 >B : B<T>
 
 function foo1b(x: B<string>); // error
->foo1b : typeof foo1b
+>foo1b : { (x: B<string>): any; (x: B<string>): any; }
 >x : B<string>
 >B : B<T>
 
 function foo1b(x: any) { }
->foo1b : typeof foo1b
+>foo1b : { (x: B<string>): any; (x: B<string>): any; }
 >x : any
 
 function foo1c(x: C<string>);
->foo1c : typeof foo1c
+>foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo1c(x: C<string>); // error
->foo1c : typeof foo1c
+>foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo1c(x: any) { }
->foo1c : typeof foo1c
+>foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : any
 
 function foo2(x: I<string>);
->foo2 : typeof foo2
+>foo2 : { (x: I<string>): any; (x: I<string>): any; }
 >x : I<string>
 >I : I<T>
 
 function foo2(x: I<string>); // error
->foo2 : typeof foo2
+>foo2 : { (x: I<string>): any; (x: I<string>): any; }
 >x : I<string>
 >I : I<T>
 
 function foo2(x: any) { }
->foo2 : typeof foo2
+>foo2 : { (x: I<string>): any; (x: I<string>): any; }
 >x : any
 
 function foo3(x: typeof a);
->foo3 : typeof foo3
+>foo3 : { (x: new <T>(x: T) => T): any; (x: new <T>(x: T) => T): any; }
 >x : new <T>(x: T) => T
 >a : new <T>(x: T) => T
 
 function foo3(x: typeof a); // error
->foo3 : typeof foo3
+>foo3 : { (x: new <T>(x: T) => T): any; (x: new <T>(x: T) => T): any; }
 >x : new <T>(x: T) => T
 >a : new <T>(x: T) => T
 
 function foo3(x: any) { }
->foo3 : typeof foo3
+>foo3 : { (x: new <T>(x: T) => T): any; (x: new <T>(x: T) => T): any; }
 >x : any
 
 function foo4(x: typeof b);
->foo4 : typeof foo4
+>foo4 : { (x: { new: <T>(x: T) => T; }): any; (x: { new: <T>(x: T) => T; }): any; }
 >x : { new: <T>(x: T) => T; }
 >b : { new: <T>(x: T) => T; }
 
 function foo4(x: typeof b); // error
->foo4 : typeof foo4
+>foo4 : { (x: { new: <T>(x: T) => T; }): any; (x: { new: <T>(x: T) => T; }): any; }
 >x : { new: <T>(x: T) => T; }
 >b : { new: <T>(x: T) => T; }
 
 function foo4(x: any) { }
->foo4 : typeof foo4
+>foo4 : { (x: { new: <T>(x: T) => T; }): any; (x: { new: <T>(x: T) => T; }): any; }
 >x : any
 
 function foo5(x: typeof a): number;
->foo5 : typeof foo5
+>foo5 : { (x: new <T>(x: T) => T): number; (x: { new: <T>(x: T) => T; }): string; }
 >x : new <T>(x: T) => T
 >a : new <T>(x: T) => T
 
 function foo5(x: typeof b): string; // ok
->foo5 : typeof foo5
+>foo5 : { (x: new <T>(x: T) => T): number; (x: { new: <T>(x: T) => T; }): string; }
 >x : { new: <T>(x: T) => T; }
 >b : { new: <T>(x: T) => T; }
 
 function foo5(x: any): any { }
->foo5 : typeof foo5
+>foo5 : { (x: new <T>(x: T) => T): number; (x: { new: <T>(x: T) => T; }): string; }
 >x : any
 
 function foo8(x: B<string>);
->foo8 : typeof foo8
+>foo8 : { (x: B<string>): any; (x: I<string>): any; }
 >x : B<string>
 >B : B<T>
 
 function foo8(x: I<string>); // ok
->foo8 : typeof foo8
+>foo8 : { (x: B<string>): any; (x: I<string>): any; }
 >x : I<string>
 >I : I<T>
 
 function foo8(x: any) { }
->foo8 : typeof foo8
+>foo8 : { (x: B<string>): any; (x: I<string>): any; }
 >x : any
 
 function foo9(x: B<string>);
->foo9 : typeof foo9
+>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 : typeof foo9
+>foo9 : { (x: B<string>): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo9(x: any) { }
->foo9 : typeof foo9
+>foo9 : { (x: B<string>): any; (x: C<string>): any; }
 >x : any
 
 function foo10(x: B<string>);
->foo10 : typeof foo10
+>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 : typeof foo10
+>foo10 : { (x: B<string>): any; (x: new <T>(x: T) => T): any; }
 >x : new <T>(x: T) => T
 >a : new <T>(x: T) => T
 
 function foo10(x: any) { }
->foo10 : typeof foo10
+>foo10 : { (x: B<string>): any; (x: new <T>(x: T) => T): any; }
 >x : any
 
 function foo11(x: B<string>);
->foo11 : typeof foo11
+>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 : typeof foo11
+>foo11 : { (x: B<string>): any; (x: { new: <T>(x: T) => T; }): any; }
 >x : { new: <T>(x: T) => T; }
 >b : { new: <T>(x: T) => T; }
 
 function foo11(x: any) { }
->foo11 : typeof foo11
+>foo11 : { (x: B<string>): any; (x: { new: <T>(x: T) => T; }): any; }
 >x : any
 
 function foo12(x: I<string>);
->foo12 : typeof foo12
+>foo12 : { (x: I<string>): any; (x: C<string>): any; }
 >x : I<string>
 >I : I<T>
 
 function foo12(x: C<string>); // ok
->foo12 : typeof foo12
+>foo12 : { (x: I<string>): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo12(x: any) { }
->foo12 : typeof foo12
+>foo12 : { (x: I<string>): any; (x: C<string>): any; }
 >x : any
 
 function foo12b(x: I2);
->foo12b : typeof foo12b
+>foo12b : { (x: I2): any; (x: C<string>): any; }
 >x : I2
 >I2 : I2
 
 function foo12b(x: C<string>); // ok
->foo12b : typeof foo12b
+>foo12b : { (x: I2): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo12b(x: any) { }
->foo12b : typeof foo12b
+>foo12b : { (x: I2): any; (x: C<string>): any; }
 >x : any
 
 function foo13(x: I<string>);
->foo13 : typeof foo13
+>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 : typeof foo13
+>foo13 : { (x: I<string>): any; (x: new <T>(x: T) => T): any; }
 >x : new <T>(x: T) => T
 >a : new <T>(x: T) => T
 
 function foo13(x: any) { }
->foo13 : typeof foo13
+>foo13 : { (x: I<string>): any; (x: new <T>(x: T) => T): any; }
 >x : any
 
 function foo14(x: I<string>);
->foo14 : typeof foo14
+>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 : typeof foo14
+>foo14 : { (x: I<string>): any; (x: { new: <T>(x: T) => T; }): any; }
 >x : { new: <T>(x: T) => T; }
 >b : { new: <T>(x: T) => T; }
 
 function foo14(x: any) { }
->foo14 : typeof foo14
+>foo14 : { (x: I<string>): any; (x: { new: <T>(x: T) => T; }): any; }
 >x : any
 
 function foo15(x: I2);
->foo15 : typeof foo15
+>foo15 : { (x: I2): any; (x: C<number>): any; }
 >x : I2
 >I2 : I2
 
 function foo15(x: C<number>); // ok
->foo15 : typeof foo15
+>foo15 : { (x: I2): any; (x: C<number>): any; }
 >x : C<number>
 >C : C<T>
 
 function foo15(x: any) { }
->foo15 : typeof foo15
+>foo15 : { (x: I2): any; (x: C<number>): any; }
 >x : any
 
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.types b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.types
index 80086f62f9c..308f592ef12 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.types
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.types
@@ -64,216 +64,216 @@ var b = { new<T extends Date>(x: T) { return null; } }; // not a construct signa
 >T : T
 
 function foo1b(x: B<Date>);
->foo1b : typeof foo1b
+>foo1b : { (x: B<Date>): any; (x: B<Date>): any; }
 >x : B<Date>
 >B : B<T>
 >Date : Date
 
 function foo1b(x: B<Date>); // error
->foo1b : typeof foo1b
+>foo1b : { (x: B<Date>): any; (x: B<Date>): any; }
 >x : B<Date>
 >B : B<T>
 >Date : Date
 
 function foo1b(x: any) { }
->foo1b : typeof foo1b
+>foo1b : { (x: B<Date>): any; (x: B<Date>): any; }
 >x : any
 
 function foo1c(x: C<Date>);
->foo1c : typeof foo1c
+>foo1c : { (x: C<Date>): any; (x: C<Date>): any; }
 >x : C<Date>
 >C : C<T>
 >Date : Date
 
 function foo1c(x: C<Date>); // error
->foo1c : typeof foo1c
+>foo1c : { (x: C<Date>): any; (x: C<Date>): any; }
 >x : C<Date>
 >C : C<T>
 >Date : Date
 
 function foo1c(x: any) { }
->foo1c : typeof foo1c
+>foo1c : { (x: C<Date>): any; (x: C<Date>): any; }
 >x : any
 
 function foo2(x: I<Date>);
->foo2 : typeof foo2
+>foo2 : { (x: I<Date>): any; (x: I<Date>): any; }
 >x : I<Date>
 >I : I<T>
 >Date : Date
 
 function foo2(x: I<Date>); // error
->foo2 : typeof foo2
+>foo2 : { (x: I<Date>): any; (x: I<Date>): any; }
 >x : I<Date>
 >I : I<T>
 >Date : Date
 
 function foo2(x: any) { }
->foo2 : typeof foo2
+>foo2 : { (x: I<Date>): any; (x: I<Date>): any; }
 >x : any
 
 function foo3(x: typeof a);
->foo3 : typeof foo3
+>foo3 : { (x: new <T extends Date>(x: T) => T): any; (x: new <T extends Date>(x: T) => T): any; }
 >x : new <T extends Date>(x: T) => T
 >a : new <T extends Date>(x: T) => T
 
 function foo3(x: typeof a); // error
->foo3 : typeof foo3
+>foo3 : { (x: new <T extends Date>(x: T) => T): any; (x: new <T extends Date>(x: T) => T): any; }
 >x : new <T extends Date>(x: T) => T
 >a : new <T extends Date>(x: T) => T
 
 function foo3(x: any) { }
->foo3 : typeof foo3
+>foo3 : { (x: new <T extends Date>(x: T) => T): any; (x: new <T extends Date>(x: T) => T): any; }
 >x : any
 
 function foo4(x: typeof b);
->foo4 : typeof foo4
+>foo4 : { (x: { new: <T extends Date>(x: T) => any; }): any; (x: { new: <T extends Date>(x: T) => any; }): any; }
 >x : { new: <T extends Date>(x: T) => any; }
 >b : { new: <T extends Date>(x: T) => any; }
 
 function foo4(x: typeof b); // error
->foo4 : typeof foo4
+>foo4 : { (x: { new: <T extends Date>(x: T) => any; }): any; (x: { new: <T extends Date>(x: T) => any; }): any; }
 >x : { new: <T extends Date>(x: T) => any; }
 >b : { new: <T extends Date>(x: T) => any; }
 
 function foo4(x: any) { }
->foo4 : typeof foo4
+>foo4 : { (x: { new: <T extends Date>(x: T) => any; }): any; (x: { new: <T extends Date>(x: T) => any; }): any; }
 >x : any
 
 function foo8(x: B<Date>);
->foo8 : typeof foo8
+>foo8 : { (x: B<Date>): any; (x: I<Date>): any; }
 >x : B<Date>
 >B : B<T>
 >Date : Date
 
 function foo8(x: I<Date>); // ok
->foo8 : typeof foo8
+>foo8 : { (x: B<Date>): any; (x: I<Date>): any; }
 >x : I<Date>
 >I : I<T>
 >Date : Date
 
 function foo8(x: any) { }
->foo8 : typeof foo8
+>foo8 : { (x: B<Date>): any; (x: I<Date>): any; }
 >x : any
 
 function foo9(x: B<Date>);
->foo9 : typeof foo9
+>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 : typeof foo9
+>foo9 : { (x: B<Date>): any; (x: C<Date>): any; }
 >x : C<Date>
 >C : C<T>
 >Date : Date
 
 function foo9(x: any) { }
->foo9 : typeof foo9
+>foo9 : { (x: B<Date>): any; (x: C<Date>): any; }
 >x : any
 
 function foo10(x: B<Date>);
->foo10 : typeof foo10
+>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 : typeof foo10
+>foo10 : { (x: B<Date>): any; (x: new <T extends Date>(x: T) => T): any; }
 >x : new <T extends Date>(x: T) => T
 >a : new <T extends Date>(x: T) => T
 
 function foo10(x: any) { }
->foo10 : typeof foo10
+>foo10 : { (x: B<Date>): any; (x: new <T extends Date>(x: T) => T): any; }
 >x : any
 
 function foo11(x: B<Date>);
->foo11 : typeof foo11
+>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 : typeof foo11
+>foo11 : { (x: B<Date>): any; (x: { new: <T extends Date>(x: T) => any; }): any; }
 >x : { new: <T extends Date>(x: T) => any; }
 >b : { new: <T extends Date>(x: T) => any; }
 
 function foo11(x: any) { }
->foo11 : typeof foo11
+>foo11 : { (x: B<Date>): any; (x: { new: <T extends Date>(x: T) => any; }): any; }
 >x : any
 
 function foo12(x: I<Date>);
->foo12 : typeof foo12
+>foo12 : { (x: I<Date>): any; (x: C<Date>): any; }
 >x : I<Date>
 >I : I<T>
 >Date : Date
 
 function foo12(x: C<Date>); // ok
->foo12 : typeof foo12
+>foo12 : { (x: I<Date>): any; (x: C<Date>): any; }
 >x : C<Date>
 >C : C<T>
 >Date : Date
 
 function foo12(x: any) { }
->foo12 : typeof foo12
+>foo12 : { (x: I<Date>): any; (x: C<Date>): any; }
 >x : any
 
 function foo12b(x: I2);
->foo12b : typeof foo12b
+>foo12b : { (x: I2): any; (x: C<Date>): any; }
 >x : I2
 >I2 : I2
 
 function foo12b(x: C<Date>); // ok
->foo12b : typeof foo12b
+>foo12b : { (x: I2): any; (x: C<Date>): any; }
 >x : C<Date>
 >C : C<T>
 >Date : Date
 
 function foo12b(x: any) { }
->foo12b : typeof foo12b
+>foo12b : { (x: I2): any; (x: C<Date>): any; }
 >x : any
 
 function foo13(x: I<Date>);
->foo13 : typeof foo13
+>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 : typeof foo13
+>foo13 : { (x: I<Date>): any; (x: new <T extends Date>(x: T) => T): any; }
 >x : new <T extends Date>(x: T) => T
 >a : new <T extends Date>(x: T) => T
 
 function foo13(x: any) { }
->foo13 : typeof foo13
+>foo13 : { (x: I<Date>): any; (x: new <T extends Date>(x: T) => T): any; }
 >x : any
 
 function foo14(x: I<Date>);
->foo14 : typeof foo14
+>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 : typeof foo14
+>foo14 : { (x: I<Date>): any; (x: { new: <T extends Date>(x: T) => any; }): any; }
 >x : { new: <T extends Date>(x: T) => any; }
 >b : { new: <T extends Date>(x: T) => any; }
 
 function foo14(x: any) { }
->foo14 : typeof foo14
+>foo14 : { (x: I<Date>): any; (x: { new: <T extends Date>(x: T) => any; }): any; }
 >x : any
 
 function foo15(x: I2);
->foo15 : typeof foo15
+>foo15 : { (x: I2): any; (x: C<Date>): any; }
 >x : I2
 >I2 : I2
 
 function foo15(x: C<Date>); // ok
->foo15 : typeof foo15
+>foo15 : { (x: I2): any; (x: C<Date>): any; }
 >x : C<Date>
 >C : C<T>
 >Date : Date
 
 function foo15(x: any) { }
->foo15 : typeof foo15
+>foo15 : { (x: I2): any; (x: C<Date>): any; }
 >x : any
 
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterCounts.types b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterCounts.types
index 52cee1f5bcd..0276458ea91 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterCounts.types
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterCounts.types
@@ -83,167 +83,167 @@ var b = { new<A, B, C, D, E, F>(x: A) { return x; } };
 >x : A
 
 function foo1b(x: B<string, string>);
->foo1b : typeof foo1b
+>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 : typeof foo1b
+>foo1b : { (x: B<string, string>): any; (x: B<string, string>): any; }
 >x : B<string, string>
 >B : B<U, V>
 
 function foo1b(x: any) { }
->foo1b : typeof foo1b
+>foo1b : { (x: B<string, string>): any; (x: B<string, string>): any; }
 >x : any
 
 function foo1c(x: C<string, number, boolean>);
->foo1c : typeof foo1c
+>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 : typeof foo1c
+>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 : typeof foo1c
+>foo1c : { (x: C<string, number, boolean>): any; (x: C<string, number, boolean>): any; }
 >x : any
 
 function foo2(x: I<string, boolean, number, string>);
->foo2 : typeof foo2
+>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 : typeof foo2
+>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 : typeof foo2
+>foo2 : { (x: I<string, boolean, number, string>): any; (x: I<string, boolean, number, string>): any; }
 >x : any
 
 function foo3(x: typeof a);
->foo3 : typeof foo3
+>foo3 : { (x: new <Z, A, B, CC, D>(x: Z) => C<Z, A, B>): any; (x: new <Z, A, B, CC, D>(x: Z) => C<Z, A, B>): any; }
 >x : 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>
 
 function foo3(x: typeof a); // error
->foo3 : typeof foo3
+>foo3 : { (x: new <Z, A, B, CC, D>(x: Z) => C<Z, A, B>): any; (x: new <Z, A, B, CC, D>(x: Z) => C<Z, A, B>): any; }
 >x : 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>
 
 function foo3(x: any) { }
->foo3 : typeof foo3
+>foo3 : { (x: new <Z, A, B, CC, D>(x: Z) => C<Z, A, B>): any; (x: new <Z, A, B, CC, D>(x: Z) => C<Z, A, B>): any; }
 >x : any
 
 function foo4(x: typeof b);
->foo4 : typeof foo4
+>foo4 : { (x: { new: <A, B, C, D, E, F>(x: A) => A; }): any; (x: { new: <A, B, C, D, E, F>(x: A) => A; }): any; }
 >x : { new: <A, B, C, D, E, F>(x: A) => A; }
 >b : { new: <A, B, C, D, E, F>(x: A) => A; }
 
 function foo4(x: typeof b); // error
->foo4 : typeof foo4
+>foo4 : { (x: { new: <A, B, C, D, E, F>(x: A) => A; }): any; (x: { new: <A, B, C, D, E, F>(x: A) => A; }): any; }
 >x : { new: <A, B, C, D, E, F>(x: A) => A; }
 >b : { new: <A, B, C, D, E, F>(x: A) => A; }
 
 function foo4(x: any) { }
->foo4 : typeof foo4
+>foo4 : { (x: { new: <A, B, C, D, E, F>(x: A) => A; }): any; (x: { new: <A, B, C, D, E, F>(x: A) => A; }): any; }
 >x : any
 
 function foo8(x: B<string, string>);
->foo8 : typeof foo8
+>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 : typeof foo8
+>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 : typeof foo8
+>foo8 : { (x: B<string, string>): any; (x: I<string, string, boolean, Date>): any; }
 >x : any
 
 function foo9(x: B<string, number>);
->foo9 : typeof foo9
+>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 : typeof foo9
+>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 : typeof foo9
+>foo9 : { (x: B<string, number>): any; (x: C<string, number, B<string, string>>): any; }
 >x : any
 
 function foo10(x: B<string, boolean>);
->foo10 : typeof foo10
+>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 : typeof foo10
+>foo10 : { (x: B<string, boolean>): any; (x: new <Z, A, B, CC, D>(x: Z) => C<Z, A, B>): any; }
 >x : 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>
 
 function foo10(x: any) { }
->foo10 : typeof foo10
+>foo10 : { (x: B<string, boolean>): any; (x: new <Z, A, B, CC, D>(x: Z) => C<Z, A, B>): any; }
 >x : any
 
 function foo11(x: B<string, boolean>);
->foo11 : typeof foo11
+>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 : typeof foo11
+>foo11 : { (x: B<string, boolean>): any; (x: { new: <A, B, C, D, E, F>(x: A) => A; }): any; }
 >x : { new: <A, B, C, D, E, F>(x: A) => A; }
 >b : { new: <A, B, C, D, E, F>(x: A) => A; }
 
 function foo11(x: any) { }
->foo11 : typeof foo11
+>foo11 : { (x: B<string, boolean>): any; (x: { new: <A, B, C, D, E, F>(x: A) => A; }): any; }
 >x : any
 
 function foo12(x: I<B<string, number>, number, Date, string>);
->foo12 : typeof foo12
+>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 : typeof foo12
+>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 : typeof foo12
+>foo12 : { (x: I<B<string, number>, number, Date, string>): any; (x: C<B<string, number>, number, Date>): any; }
 >x : any
 
 function foo12b(x: I2);
->foo12b : typeof foo12b
+>foo12b : { (x: I2): any; (x: C<string, string, boolean>): any; }
 >x : I2
 >I2 : I2
 
 function foo12b(x: C<string, string, boolean>); // BUG 832086
->foo12b : typeof foo12b
+>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 : typeof foo12b
+>foo12b : { (x: I2): any; (x: C<string, string, boolean>): any; }
 >x : any
 
 function foo13(x: I<string, Date, RegExp, Date>);
->foo13 : typeof foo13
+>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
@@ -251,27 +251,27 @@ function foo13(x: I<string, Date, RegExp, Date>);
 >Date : Date
 
 function foo13(x: typeof a); // ok
->foo13 : typeof foo13
+>foo13 : { (x: I<string, Date, RegExp, Date>): any; (x: new <Z, A, B, CC, D>(x: Z) => C<Z, A, B>): any; }
 >x : 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>
 
 function foo13(x: any) { }
->foo13 : typeof foo13
+>foo13 : { (x: I<string, Date, RegExp, Date>): any; (x: new <Z, A, B, CC, D>(x: Z) => C<Z, A, B>): any; }
 >x : any
 
 function foo14(x: I<string, Date, RegExp, boolean>);
->foo14 : typeof foo14
+>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 : typeof foo14
+>foo14 : { (x: I<string, Date, RegExp, boolean>): any; (x: { new: <A, B, C, D, E, F>(x: A) => A; }): any; }
 >x : { new: <A, B, C, D, E, F>(x: A) => A; }
 >b : { new: <A, B, C, D, E, F>(x: A) => A; }
 
 function foo14(x: any) { }
->foo14 : typeof foo14
+>foo14 : { (x: I<string, Date, RegExp, boolean>): any; (x: { new: <A, B, C, D, E, F>(x: A) => A; }): any; }
 >x : any
 
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterNames.types b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterNames.types
index a1c1e1aca99..10a8da26907 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterNames.types
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterNames.types
@@ -63,184 +63,184 @@ var b = { new<A>(x: A) { return new C<A>(x); } };
 >x : A
 
 function foo1b(x: B<string>);
->foo1b : typeof foo1b
+>foo1b : { (x: B<string>): any; (x: B<string>): any; }
 >x : B<string>
 >B : B<U>
 
 function foo1b(x: B<string>); // error
->foo1b : typeof foo1b
+>foo1b : { (x: B<string>): any; (x: B<string>): any; }
 >x : B<string>
 >B : B<U>
 
 function foo1b(x: any) { }
->foo1b : typeof foo1b
+>foo1b : { (x: B<string>): any; (x: B<string>): any; }
 >x : any
 
 function foo1c(x: C<string>);
->foo1c : typeof foo1c
+>foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<V>
 
 function foo1c(x: C<string>); // error
->foo1c : typeof foo1c
+>foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<V>
 
 function foo1c(x: any) { }
->foo1c : typeof foo1c
+>foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : any
 
 function foo2(x: I<string>);
->foo2 : typeof foo2
+>foo2 : { (x: I<string>): any; (x: I<string>): any; }
 >x : I<string>
 >I : I<X>
 
 function foo2(x: I<string>); // error
->foo2 : typeof foo2
+>foo2 : { (x: I<string>): any; (x: I<string>): any; }
 >x : I<string>
 >I : I<X>
 
 function foo2(x: any) { }
->foo2 : typeof foo2
+>foo2 : { (x: I<string>): any; (x: I<string>): any; }
 >x : any
 
 function foo3(x: typeof a);
->foo3 : typeof foo3
+>foo3 : { (x: new <Z>(x: Z) => B<Z>): any; (x: new <Z>(x: Z) => B<Z>): any; }
 >x : new <Z>(x: Z) => B<Z>
 >a : new <Z>(x: Z) => B<Z>
 
 function foo3(x: typeof a); // error
->foo3 : typeof foo3
+>foo3 : { (x: new <Z>(x: Z) => B<Z>): any; (x: new <Z>(x: Z) => B<Z>): any; }
 >x : new <Z>(x: Z) => B<Z>
 >a : new <Z>(x: Z) => B<Z>
 
 function foo3(x: any) { }
->foo3 : typeof foo3
+>foo3 : { (x: new <Z>(x: Z) => B<Z>): any; (x: new <Z>(x: Z) => B<Z>): any; }
 >x : any
 
 function foo4(x: typeof b);
->foo4 : typeof foo4
+>foo4 : { (x: { new: <A>(x: A) => C<A>; }): any; (x: { new: <A>(x: A) => C<A>; }): any; }
 >x : { new: <A>(x: A) => C<A>; }
 >b : { new: <A>(x: A) => C<A>; }
 
 function foo4(x: typeof b); // error
->foo4 : typeof foo4
+>foo4 : { (x: { new: <A>(x: A) => C<A>; }): any; (x: { new: <A>(x: A) => C<A>; }): any; }
 >x : { new: <A>(x: A) => C<A>; }
 >b : { new: <A>(x: A) => C<A>; }
 
 function foo4(x: any) { }
->foo4 : typeof foo4
+>foo4 : { (x: { new: <A>(x: A) => C<A>; }): any; (x: { new: <A>(x: A) => C<A>; }): any; }
 >x : any
 
 function foo8(x: B<string>);
->foo8 : typeof foo8
+>foo8 : { (x: B<string>): any; (x: I<string>): any; }
 >x : B<string>
 >B : B<U>
 
 function foo8(x: I<string>); // BUG 832086
->foo8 : typeof foo8
+>foo8 : { (x: B<string>): any; (x: I<string>): any; }
 >x : I<string>
 >I : I<X>
 
 function foo8(x: any) { }
->foo8 : typeof foo8
+>foo8 : { (x: B<string>): any; (x: I<string>): any; }
 >x : any
 
 function foo9(x: B<string>);
->foo9 : typeof foo9
+>foo9 : { (x: B<string>): any; (x: C<string>): any; }
 >x : B<string>
 >B : B<U>
 
 function foo9(x: C<string>); // error
->foo9 : typeof foo9
+>foo9 : { (x: B<string>): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<V>
 
 function foo9(x: any) { }
->foo9 : typeof foo9
+>foo9 : { (x: B<string>): any; (x: C<string>): any; }
 >x : any
 
 function foo10(x: B<string>);
->foo10 : typeof foo10
+>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 : typeof foo10
+>foo10 : { (x: B<string>): any; (x: new <Z>(x: Z) => B<Z>): any; }
 >x : new <Z>(x: Z) => B<Z>
 >a : new <Z>(x: Z) => B<Z>
 
 function foo10(x: any) { }
->foo10 : typeof foo10
+>foo10 : { (x: B<string>): any; (x: new <Z>(x: Z) => B<Z>): any; }
 >x : any
 
 function foo11(x: B<string>);
->foo11 : typeof foo11
+>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 : typeof foo11
+>foo11 : { (x: B<string>): any; (x: { new: <A>(x: A) => C<A>; }): any; }
 >x : { new: <A>(x: A) => C<A>; }
 >b : { new: <A>(x: A) => C<A>; }
 
 function foo11(x: any) { }
->foo11 : typeof foo11
+>foo11 : { (x: B<string>): any; (x: { new: <A>(x: A) => C<A>; }): any; }
 >x : any
 
 function foo12(x: I<string>);
->foo12 : typeof foo12
+>foo12 : { (x: I<string>): any; (x: C<string>): any; }
 >x : I<string>
 >I : I<X>
 
 function foo12(x: C<string>); // error
->foo12 : typeof foo12
+>foo12 : { (x: I<string>): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<V>
 
 function foo12(x: any) { }
->foo12 : typeof foo12
+>foo12 : { (x: I<string>): any; (x: C<string>): any; }
 >x : any
 
 function foo12b(x: I2);
->foo12b : typeof foo12b
+>foo12b : { (x: I2): any; (x: C<string>): any; }
 >x : I2
 >I2 : I2
 
 function foo12b(x: C<string>); // BUG 832086
->foo12b : typeof foo12b
+>foo12b : { (x: I2): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<V>
 
 function foo12b(x: any) { }
->foo12b : typeof foo12b
+>foo12b : { (x: I2): any; (x: C<string>): any; }
 >x : any
 
 function foo13(x: I<string>);
->foo13 : typeof foo13
+>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 : typeof foo13
+>foo13 : { (x: I<string>): any; (x: new <Z>(x: Z) => B<Z>): any; }
 >x : new <Z>(x: Z) => B<Z>
 >a : new <Z>(x: Z) => B<Z>
 
 function foo13(x: any) { }
->foo13 : typeof foo13
+>foo13 : { (x: I<string>): any; (x: new <Z>(x: Z) => B<Z>): any; }
 >x : any
 
 function foo14(x: I<string>);
->foo14 : typeof foo14
+>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 : typeof foo14
+>foo14 : { (x: I<string>): any; (x: { new: <A>(x: A) => C<A>; }): any; }
 >x : { new: <A>(x: A) => C<A>; }
 >b : { new: <A>(x: A) => C<A>; }
 
 function foo14(x: any) { }
->foo14 : typeof foo14
+>foo14 : { (x: I<string>): any; (x: { new: <A>(x: A) => C<A>; }): any; }
 >x : any
 
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesOptionalParams.types b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesOptionalParams.types
index 9da0c3ae436..28ef6a81505 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesOptionalParams.types
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesOptionalParams.types
@@ -78,184 +78,184 @@ var b = { new<T>(x: T, y?: T) { return new C<T>(x, y); } }; // not a construct s
 >y : T
 
 function foo1b(x: B<string>);
->foo1b : typeof foo1b
+>foo1b : { (x: B<string>): any; (x: B<string>): any; }
 >x : B<string>
 >B : B<T>
 
 function foo1b(x: B<string>); // error
->foo1b : typeof foo1b
+>foo1b : { (x: B<string>): any; (x: B<string>): any; }
 >x : B<string>
 >B : B<T>
 
 function foo1b(x: any) { }
->foo1b : typeof foo1b
+>foo1b : { (x: B<string>): any; (x: B<string>): any; }
 >x : any
 
 function foo1c(x: C<string>);
->foo1c : typeof foo1c
+>foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo1c(x: C<string>); // error
->foo1c : typeof foo1c
+>foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo1c(x: any) { }
->foo1c : typeof foo1c
+>foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : any
 
 function foo2(x: I<string>);
->foo2 : typeof foo2
+>foo2 : { (x: I<string>): any; (x: I<string>): any; }
 >x : I<string>
 >I : I<T>
 
 function foo2(x: I<string>); // error
->foo2 : typeof foo2
+>foo2 : { (x: I<string>): any; (x: I<string>): any; }
 >x : I<string>
 >I : I<T>
 
 function foo2(x: any) { }
->foo2 : typeof foo2
+>foo2 : { (x: I<string>): any; (x: I<string>): any; }
 >x : any
 
 function foo3(x: typeof a);
->foo3 : typeof foo3
+>foo3 : { (x: new <T>(x: T, y?: T) => B<T>): any; (x: new <T>(x: T, y?: T) => B<T>): any; }
 >x : new <T>(x: T, y?: T) => B<T>
 >a : new <T>(x: T, y?: T) => B<T>
 
 function foo3(x: typeof a); // error
->foo3 : typeof foo3
+>foo3 : { (x: new <T>(x: T, y?: T) => B<T>): any; (x: new <T>(x: T, y?: T) => B<T>): any; }
 >x : new <T>(x: T, y?: T) => B<T>
 >a : new <T>(x: T, y?: T) => B<T>
 
 function foo3(x: any) { }
->foo3 : typeof foo3
+>foo3 : { (x: new <T>(x: T, y?: T) => B<T>): any; (x: new <T>(x: T, y?: T) => B<T>): any; }
 >x : any
 
 function foo4(x: typeof b);
->foo4 : typeof foo4
+>foo4 : { (x: { new: <T>(x: T, y?: T) => C<T>; }): any; (x: { new: <T>(x: T, y?: T) => C<T>; }): any; }
 >x : { new: <T>(x: T, y?: T) => C<T>; }
 >b : { new: <T>(x: T, y?: T) => C<T>; }
 
 function foo4(x: typeof b); // error
->foo4 : typeof foo4
+>foo4 : { (x: { new: <T>(x: T, y?: T) => C<T>; }): any; (x: { new: <T>(x: T, y?: T) => C<T>; }): any; }
 >x : { new: <T>(x: T, y?: T) => C<T>; }
 >b : { new: <T>(x: T, y?: T) => C<T>; }
 
 function foo4(x: any) { }
->foo4 : typeof foo4
+>foo4 : { (x: { new: <T>(x: T, y?: T) => C<T>; }): any; (x: { new: <T>(x: T, y?: T) => C<T>; }): any; }
 >x : any
 
 function foo8(x: B<string>): string;
->foo8 : typeof foo8
+>foo8 : { (x: B<string>): string; (x: I<string>): number; }
 >x : B<string>
 >B : B<T>
 
 function foo8(x: I<string>): number; // BUG 832086
->foo8 : typeof foo8
+>foo8 : { (x: B<string>): string; (x: I<string>): number; }
 >x : I<string>
 >I : I<T>
 
 function foo8(x: any): any { }
->foo8 : typeof foo8
+>foo8 : { (x: B<string>): string; (x: I<string>): number; }
 >x : any
 
 function foo9(x: B<string>);
->foo9 : typeof foo9
+>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 : typeof foo9
+>foo9 : { (x: B<string>): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo9(x: any) { }
->foo9 : typeof foo9
+>foo9 : { (x: B<string>): any; (x: C<string>): any; }
 >x : any
 
 function foo10(x: B<string>);
->foo10 : typeof foo10
+>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 : typeof foo10
+>foo10 : { (x: B<string>): any; (x: new <T>(x: T, y?: T) => B<T>): any; }
 >x : new <T>(x: T, y?: T) => B<T>
 >a : new <T>(x: T, y?: T) => B<T>
 
 function foo10(x: any) { }
->foo10 : typeof foo10
+>foo10 : { (x: B<string>): any; (x: new <T>(x: T, y?: T) => B<T>): any; }
 >x : any
 
 function foo11(x: B<string>);
->foo11 : typeof foo11
+>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 : typeof foo11
+>foo11 : { (x: B<string>): any; (x: { new: <T>(x: T, y?: T) => C<T>; }): any; }
 >x : { new: <T>(x: T, y?: T) => C<T>; }
 >b : { new: <T>(x: T, y?: T) => C<T>; }
 
 function foo11(x: any) { }
->foo11 : typeof foo11
+>foo11 : { (x: B<string>): any; (x: { new: <T>(x: T, y?: T) => C<T>; }): any; }
 >x : any
 
 function foo12(x: I<string>);
->foo12 : typeof foo12
+>foo12 : { (x: I<string>): any; (x: C<string>): any; }
 >x : I<string>
 >I : I<T>
 
 function foo12(x: C<string>); // ok
->foo12 : typeof foo12
+>foo12 : { (x: I<string>): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo12(x: any) { }
->foo12 : typeof foo12
+>foo12 : { (x: I<string>): any; (x: C<string>): any; }
 >x : any
 
 function foo12b(x: I2);
->foo12b : typeof foo12b
+>foo12b : { (x: I2): any; (x: C<string>): any; }
 >x : I2
 >I2 : I2
 
 function foo12b(x: C<string>); // BUG 832086
->foo12b : typeof foo12b
+>foo12b : { (x: I2): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo12b(x: any) { }
->foo12b : typeof foo12b
+>foo12b : { (x: I2): any; (x: C<string>): any; }
 >x : any
 
 function foo13(x: I<string>);
->foo13 : typeof foo13
+>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 : typeof foo13
+>foo13 : { (x: I<string>): any; (x: new <T>(x: T, y?: T) => B<T>): any; }
 >x : new <T>(x: T, y?: T) => B<T>
 >a : new <T>(x: T, y?: T) => B<T>
 
 function foo13(x: any) { }
->foo13 : typeof foo13
+>foo13 : { (x: I<string>): any; (x: new <T>(x: T, y?: T) => B<T>): any; }
 >x : any
 
 function foo14(x: I<string>);
->foo14 : typeof foo14
+>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 : typeof foo14
+>foo14 : { (x: I<string>): any; (x: { new: <T>(x: T, y?: T) => C<T>; }): any; }
 >x : { new: <T>(x: T, y?: T) => C<T>; }
 >b : { new: <T>(x: T, y?: T) => C<T>; }
 
 function foo14(x: any) { }
->foo14 : typeof foo14
+>foo14 : { (x: I<string>): any; (x: { new: <T>(x: T, y?: T) => C<T>; }): any; }
 >x : any
 
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesOptionalParams2.types b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesOptionalParams2.types
index 1a500ad8a62..e75f1ce7cbb 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesOptionalParams2.types
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesOptionalParams2.types
@@ -88,184 +88,184 @@ var b = { new<T, U>(x: T, y?: U) { return new C<T, U>(x, y); } }; // not a const
 >y : U
 
 function foo1b(x: B<string, number>);
->foo1b : typeof foo1b
+>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 : typeof foo1b
+>foo1b : { (x: B<string, number>): any; (x: B<string, number>): any; }
 >x : B<string, number>
 >B : B<T, U>
 
 function foo1b(x: any) { }
->foo1b : typeof foo1b
+>foo1b : { (x: B<string, number>): any; (x: B<string, number>): any; }
 >x : any
 
 function foo1c(x: C<string, number>);
->foo1c : typeof foo1c
+>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 : typeof foo1c
+>foo1c : { (x: C<string, number>): any; (x: C<string, number>): any; }
 >x : C<string, number>
 >C : C<T, U>
 
 function foo1c(x: any) { }
->foo1c : typeof foo1c
+>foo1c : { (x: C<string, number>): any; (x: C<string, number>): any; }
 >x : any
 
 function foo2(x: I<string, number>);
->foo2 : typeof foo2
+>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 : typeof foo2
+>foo2 : { (x: I<string, number>): any; (x: I<string, number>): any; }
 >x : I<string, number>
 >I : I<T, U>
 
 function foo2(x: any) { }
->foo2 : typeof foo2
+>foo2 : { (x: I<string, number>): any; (x: I<string, number>): any; }
 >x : any
 
 function foo3(x: typeof a);
->foo3 : typeof foo3
+>foo3 : { (x: new <T, U>(x: T, y?: U) => B<T, U>): any; (x: new <T, U>(x: T, y?: U) => B<T, U>): any; }
 >x : new <T, U>(x: T, y?: U) => B<T, U>
 >a : new <T, U>(x: T, y?: U) => B<T, U>
 
 function foo3(x: typeof a); // error
->foo3 : typeof foo3
+>foo3 : { (x: new <T, U>(x: T, y?: U) => B<T, U>): any; (x: new <T, U>(x: T, y?: U) => B<T, U>): any; }
 >x : new <T, U>(x: T, y?: U) => B<T, U>
 >a : new <T, U>(x: T, y?: U) => B<T, U>
 
 function foo3(x: any) { }
->foo3 : typeof foo3
+>foo3 : { (x: new <T, U>(x: T, y?: U) => B<T, U>): any; (x: new <T, U>(x: T, y?: U) => B<T, U>): any; }
 >x : any
 
 function foo4(x: typeof b);
->foo4 : typeof foo4
+>foo4 : { (x: { new: <T, U>(x: T, y?: U) => C<T, U>; }): any; (x: { new: <T, U>(x: T, y?: U) => C<T, U>; }): any; }
 >x : { new: <T, U>(x: T, y?: U) => C<T, U>; }
 >b : { new: <T, U>(x: T, y?: U) => C<T, U>; }
 
 function foo4(x: typeof b); // error
->foo4 : typeof foo4
+>foo4 : { (x: { new: <T, U>(x: T, y?: U) => C<T, U>; }): any; (x: { new: <T, U>(x: T, y?: U) => C<T, U>; }): any; }
 >x : { new: <T, U>(x: T, y?: U) => C<T, U>; }
 >b : { new: <T, U>(x: T, y?: U) => C<T, U>; }
 
 function foo4(x: any) { }
->foo4 : typeof foo4
+>foo4 : { (x: { new: <T, U>(x: T, y?: U) => C<T, U>; }): any; (x: { new: <T, U>(x: T, y?: U) => C<T, U>; }): any; }
 >x : any
 
 function foo8(x: B<string, number>);
->foo8 : typeof foo8
+>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 : typeof foo8
+>foo8 : { (x: B<string, number>): any; (x: I<string, number>): any; }
 >x : I<string, number>
 >I : I<T, U>
 
 function foo8(x: any) { }
->foo8 : typeof foo8
+>foo8 : { (x: B<string, number>): any; (x: I<string, number>): any; }
 >x : any
 
 function foo9(x: B<string, number>);
->foo9 : typeof foo9
+>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 : typeof foo9
+>foo9 : { (x: B<string, number>): any; (x: C<string, number>): any; }
 >x : C<string, number>
 >C : C<T, U>
 
 function foo9(x: any) { }
->foo9 : typeof foo9
+>foo9 : { (x: B<string, number>): any; (x: C<string, number>): any; }
 >x : any
 
 function foo10(x: B<string, number>);
->foo10 : typeof foo10
+>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 : typeof foo10
+>foo10 : { (x: B<string, number>): any; (x: new <T, U>(x: T, y?: U) => B<T, U>): any; }
 >x : new <T, U>(x: T, y?: U) => B<T, U>
 >a : new <T, U>(x: T, y?: U) => B<T, U>
 
 function foo10(x: any) { }
->foo10 : typeof foo10
+>foo10 : { (x: B<string, number>): any; (x: new <T, U>(x: T, y?: U) => B<T, U>): any; }
 >x : any
 
 function foo11(x: B<string, number>);
->foo11 : typeof foo11
+>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 : typeof foo11
+>foo11 : { (x: B<string, number>): any; (x: { new: <T, U>(x: T, y?: U) => C<T, U>; }): any; }
 >x : { new: <T, U>(x: T, y?: U) => C<T, U>; }
 >b : { new: <T, U>(x: T, y?: U) => C<T, U>; }
 
 function foo11(x: any) { }
->foo11 : typeof foo11
+>foo11 : { (x: B<string, number>): any; (x: { new: <T, U>(x: T, y?: U) => C<T, U>; }): any; }
 >x : any
 
 function foo12(x: I<string, number>);
->foo12 : typeof foo12
+>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 : typeof foo12
+>foo12 : { (x: I<string, number>): any; (x: C<string, number>): any; }
 >x : C<string, number>
 >C : C<T, U>
 
 function foo12(x: any) { }
->foo12 : typeof foo12
+>foo12 : { (x: I<string, number>): any; (x: C<string, number>): any; }
 >x : any
 
 function foo12b(x: I2);
->foo12b : typeof foo12b
+>foo12b : { (x: I2): any; (x: C<string, number>): any; }
 >x : I2
 >I2 : I2
 
 function foo12b(x: C<string, number>); // ok
->foo12b : typeof foo12b
+>foo12b : { (x: I2): any; (x: C<string, number>): any; }
 >x : C<string, number>
 >C : C<T, U>
 
 function foo12b(x: any) { }
->foo12b : typeof foo12b
+>foo12b : { (x: I2): any; (x: C<string, number>): any; }
 >x : any
 
 function foo13(x: I<string, number>);
->foo13 : typeof foo13
+>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 : typeof foo13
+>foo13 : { (x: I<string, number>): any; (x: new <T, U>(x: T, y?: U) => B<T, U>): any; }
 >x : new <T, U>(x: T, y?: U) => B<T, U>
 >a : new <T, U>(x: T, y?: U) => B<T, U>
 
 function foo13(x: any) { }
->foo13 : typeof foo13
+>foo13 : { (x: I<string, number>): any; (x: new <T, U>(x: T, y?: U) => B<T, U>): any; }
 >x : any
 
 function foo14(x: I<string, number>);
->foo14 : typeof foo14
+>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 : typeof foo14
+>foo14 : { (x: I<string, number>): any; (x: { new: <T, U>(x: T, y?: U) => C<T, U>; }): any; }
 >x : { new: <T, U>(x: T, y?: U) => C<T, U>; }
 >b : { new: <T, U>(x: T, y?: U) => C<T, U>; }
 
 function foo14(x: any) { }
->foo14 : typeof foo14
+>foo14 : { (x: I<string, number>): any; (x: { new: <T, U>(x: T, y?: U) => C<T, U>; }): any; }
 >x : any
 
diff --git a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesOptionalParams3.types b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesOptionalParams3.types
index 1fd61d4cf8c..5f5d592df34 100644
--- a/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesOptionalParams3.types
+++ b/tests/baselines/reference/objectTypesIdentityWithGenericConstructSignaturesOptionalParams3.types
@@ -88,184 +88,184 @@ var b = { new<T, U>(x: T, y: U) { return new C<T, U>(x, y); } }; // not a constr
 >y : U
 
 function foo1b(x: B<string, number>);
->foo1b : typeof foo1b
+>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 : typeof foo1b
+>foo1b : { (x: B<string, number>): any; (x: B<string, number>): any; }
 >x : B<string, number>
 >B : B<T, U>
 
 function foo1b(x: any) { }
->foo1b : typeof foo1b
+>foo1b : { (x: B<string, number>): any; (x: B<string, number>): any; }
 >x : any
 
 function foo1c(x: C<string, number>);
->foo1c : typeof foo1c
+>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 : typeof foo1c
+>foo1c : { (x: C<string, number>): any; (x: C<string, number>): any; }
 >x : C<string, number>
 >C : C<T, U>
 
 function foo1c(x: any) { }
->foo1c : typeof foo1c
+>foo1c : { (x: C<string, number>): any; (x: C<string, number>): any; }
 >x : any
 
 function foo2(x: I<string, number>);
->foo2 : typeof foo2
+>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 : typeof foo2
+>foo2 : { (x: I<string, number>): any; (x: I<string, number>): any; }
 >x : I<string, number>
 >I : I<T, U>
 
 function foo2(x: any) { }
->foo2 : typeof foo2
+>foo2 : { (x: I<string, number>): any; (x: I<string, number>): any; }
 >x : any
 
 function foo3(x: typeof a);
->foo3 : typeof foo3
+>foo3 : { (x: new <T, U>(x: T, y?: U) => B<T, U>): any; (x: new <T, U>(x: T, y?: U) => B<T, U>): any; }
 >x : new <T, U>(x: T, y?: U) => B<T, U>
 >a : new <T, U>(x: T, y?: U) => B<T, U>
 
 function foo3(x: typeof a); // error
->foo3 : typeof foo3
+>foo3 : { (x: new <T, U>(x: T, y?: U) => B<T, U>): any; (x: new <T, U>(x: T, y?: U) => B<T, U>): any; }
 >x : new <T, U>(x: T, y?: U) => B<T, U>
 >a : new <T, U>(x: T, y?: U) => B<T, U>
 
 function foo3(x: any) { }
->foo3 : typeof foo3
+>foo3 : { (x: new <T, U>(x: T, y?: U) => B<T, U>): any; (x: new <T, U>(x: T, y?: U) => B<T, U>): any; }
 >x : any
 
 function foo4(x: typeof b);
->foo4 : typeof foo4
+>foo4 : { (x: { new: <T, U>(x: T, y: U) => C<T, U>; }): any; (x: { new: <T, U>(x: T, y: U) => C<T, U>; }): any; }
 >x : { new: <T, U>(x: T, y: U) => C<T, U>; }
 >b : { new: <T, U>(x: T, y: U) => C<T, U>; }
 
 function foo4(x: typeof b); // error
->foo4 : typeof foo4
+>foo4 : { (x: { new: <T, U>(x: T, y: U) => C<T, U>; }): any; (x: { new: <T, U>(x: T, y: U) => C<T, U>; }): any; }
 >x : { new: <T, U>(x: T, y: U) => C<T, U>; }
 >b : { new: <T, U>(x: T, y: U) => C<T, U>; }
 
 function foo4(x: any) { }
->foo4 : typeof foo4
+>foo4 : { (x: { new: <T, U>(x: T, y: U) => C<T, U>; }): any; (x: { new: <T, U>(x: T, y: U) => C<T, U>; }): any; }
 >x : any
 
 function foo8(x: B<string, number>);
->foo8 : typeof foo8
+>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 : typeof foo8
+>foo8 : { (x: B<string, number>): any; (x: I<string, number>): any; }
 >x : I<string, number>
 >I : I<T, U>
 
 function foo8(x: any) { }
->foo8 : typeof foo8
+>foo8 : { (x: B<string, number>): any; (x: I<string, number>): any; }
 >x : any
 
 function foo9(x: B<string, number>);
->foo9 : typeof foo9
+>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 : typeof foo9
+>foo9 : { (x: B<string, number>): any; (x: C<string, number>): any; }
 >x : C<string, number>
 >C : C<T, U>
 
 function foo9(x: any) { }
->foo9 : typeof foo9
+>foo9 : { (x: B<string, number>): any; (x: C<string, number>): any; }
 >x : any
 
 function foo10(x: B<string, number>);
->foo10 : typeof foo10
+>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 : typeof foo10
+>foo10 : { (x: B<string, number>): any; (x: new <T, U>(x: T, y?: U) => B<T, U>): any; }
 >x : new <T, U>(x: T, y?: U) => B<T, U>
 >a : new <T, U>(x: T, y?: U) => B<T, U>
 
 function foo10(x: any) { }
->foo10 : typeof foo10
+>foo10 : { (x: B<string, number>): any; (x: new <T, U>(x: T, y?: U) => B<T, U>): any; }
 >x : any
 
 function foo11(x: B<string, number>);
->foo11 : typeof foo11
+>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 : typeof foo11
+>foo11 : { (x: B<string, number>): any; (x: { new: <T, U>(x: T, y: U) => C<T, U>; }): any; }
 >x : { new: <T, U>(x: T, y: U) => C<T, U>; }
 >b : { new: <T, U>(x: T, y: U) => C<T, U>; }
 
 function foo11(x: any) { }
->foo11 : typeof foo11
+>foo11 : { (x: B<string, number>): any; (x: { new: <T, U>(x: T, y: U) => C<T, U>; }): any; }
 >x : any
 
 function foo12(x: I<string, number>);
->foo12 : typeof foo12
+>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 : typeof foo12
+>foo12 : { (x: I<string, number>): any; (x: C<string, number>): any; }
 >x : C<string, number>
 >C : C<T, U>
 
 function foo12(x: any) { }
->foo12 : typeof foo12
+>foo12 : { (x: I<string, number>): any; (x: C<string, number>): any; }
 >x : any
 
 function foo12b(x: I2);
->foo12b : typeof foo12b
+>foo12b : { (x: I2): any; (x: C<string, number>): any; }
 >x : I2
 >I2 : I2
 
 function foo12b(x: C<string, number>); // BUG 832086
->foo12b : typeof foo12b
+>foo12b : { (x: I2): any; (x: C<string, number>): any; }
 >x : C<string, number>
 >C : C<T, U>
 
 function foo12b(x: any) { }
->foo12b : typeof foo12b
+>foo12b : { (x: I2): any; (x: C<string, number>): any; }
 >x : any
 
 function foo13(x: I<string, number>);
->foo13 : typeof foo13
+>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 : typeof foo13
+>foo13 : { (x: I<string, number>): any; (x: new <T, U>(x: T, y?: U) => B<T, U>): any; }
 >x : new <T, U>(x: T, y?: U) => B<T, U>
 >a : new <T, U>(x: T, y?: U) => B<T, U>
 
 function foo13(x: any) { }
->foo13 : typeof foo13
+>foo13 : { (x: I<string, number>): any; (x: new <T, U>(x: T, y?: U) => B<T, U>): any; }
 >x : any
 
 function foo14(x: I<string, number>);
->foo14 : typeof foo14
+>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 : typeof foo14
+>foo14 : { (x: I<string, number>): any; (x: { new: <T, U>(x: T, y: U) => C<T, U>; }): any; }
 >x : { new: <T, U>(x: T, y: U) => C<T, U>; }
 >b : { new: <T, U>(x: T, y: U) => C<T, U>; }
 
 function foo14(x: any) { }
->foo14 : typeof foo14
+>foo14 : { (x: I<string, number>): any; (x: { new: <T, U>(x: T, y: U) => C<T, U>; }): any; }
 >x : any
 
diff --git a/tests/baselines/reference/objectTypesIdentityWithNumericIndexers1.types b/tests/baselines/reference/objectTypesIdentityWithNumericIndexers1.types
index 7182fd542de..ab83b0c78f0 100644
--- a/tests/baselines/reference/objectTypesIdentityWithNumericIndexers1.types
+++ b/tests/baselines/reference/objectTypesIdentityWithNumericIndexers1.types
@@ -54,325 +54,325 @@ var b: { [x: number]: string; } = { foo: '' };
 >foo : string
 
 function foo1(x: A);
->foo1 : typeof foo1
+>foo1 : { (x: A): any; (x: A): any; }
 >x : A
 >A : A
 
 function foo1(x: A); // error
->foo1 : typeof foo1
+>foo1 : { (x: A): any; (x: A): any; }
 >x : A
 >A : A
 
 function foo1(x: any) { }
->foo1 : typeof foo1
+>foo1 : { (x: A): any; (x: A): any; }
 >x : any
 
 function foo1b(x: B);
->foo1b : typeof foo1b
+>foo1b : { (x: B): any; (x: B): any; }
 >x : B
 >B : B
 
 function foo1b(x: B); // error
->foo1b : typeof foo1b
+>foo1b : { (x: B): any; (x: B): any; }
 >x : B
 >B : B
 
 function foo1b(x: any) { }
->foo1b : typeof foo1b
+>foo1b : { (x: B): any; (x: B): any; }
 >x : any
 
 function foo1c(x: C<string>);
->foo1c : typeof foo1c
+>foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo1c(x: C<string>); // error
->foo1c : typeof foo1c
+>foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo1c(x: any) { }
->foo1c : typeof foo1c
+>foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : any
 
 function foo2(x: I);
->foo2 : typeof foo2
+>foo2 : { (x: I): any; (x: I): any; }
 >x : I
 >I : I
 
 function foo2(x: I); // error
->foo2 : typeof foo2
+>foo2 : { (x: I): any; (x: I): any; }
 >x : I
 >I : I
 
 function foo2(x: any) { }
->foo2 : typeof foo2
+>foo2 : { (x: I): any; (x: I): any; }
 >x : any
 
 function foo3(x: typeof a);
->foo3 : typeof foo3
+>foo3 : { (x: { [x: number]: string; }): any; (x: { [x: number]: string; }): any; }
 >x : { [x: number]: string; }
 >a : { [x: number]: string; }
 
 function foo3(x: typeof a); // error
->foo3 : typeof foo3
+>foo3 : { (x: { [x: number]: string; }): any; (x: { [x: number]: string; }): any; }
 >x : { [x: number]: string; }
 >a : { [x: number]: string; }
 
 function foo3(x: any) { }
->foo3 : typeof foo3
+>foo3 : { (x: { [x: number]: string; }): any; (x: { [x: number]: string; }): any; }
 >x : any
 
 function foo4(x: typeof b);
->foo4 : typeof foo4
+>foo4 : { (x: { [x: number]: string; }): any; (x: { [x: number]: string; }): any; }
 >x : { [x: number]: string; }
 >b : { [x: number]: string; }
 
 function foo4(x: typeof b); // error
->foo4 : typeof foo4
+>foo4 : { (x: { [x: number]: string; }): any; (x: { [x: number]: string; }): any; }
 >x : { [x: number]: string; }
 >b : { [x: number]: string; }
 
 function foo4(x: any) { }
->foo4 : typeof foo4
+>foo4 : { (x: { [x: number]: string; }): any; (x: { [x: number]: string; }): any; }
 >x : any
 
 function foo5(x: A);
->foo5 : typeof foo5
+>foo5 : { (x: A): any; (x: B): any; }
 >x : A
 >A : A
 
 function foo5(x: B); // error
->foo5 : typeof foo5
+>foo5 : { (x: A): any; (x: B): any; }
 >x : B
 >B : B
 
 function foo5(x: any) { }
->foo5 : typeof foo5
+>foo5 : { (x: A): any; (x: B): any; }
 >x : any
 
 function foo5b(x: A);
->foo5b : typeof foo5b
+>foo5b : { (x: A): any; (x: C<string>): any; }
 >x : A
 >A : A
 
 function foo5b(x: C<string>); // error
->foo5b : typeof foo5b
+>foo5b : { (x: A): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo5b(x: any) { }
->foo5b : typeof foo5b
+>foo5b : { (x: A): any; (x: C<string>): any; }
 >x : any
 
 function foo5c(x: A);
->foo5c : typeof foo5c
+>foo5c : { (x: A): any; (x: PA): any; }
 >x : A
 >A : A
 
 function foo5c(x: PA); // error
->foo5c : typeof foo5c
+>foo5c : { (x: A): any; (x: PA): any; }
 >x : PA
 >PA : PA
 
 function foo5c(x: any) { }
->foo5c : typeof foo5c
+>foo5c : { (x: A): any; (x: PA): any; }
 >x : any
 
 function foo5d(x: A);
->foo5d : typeof foo5d
+>foo5d : { (x: A): any; (x: PB): any; }
 >x : A
 >A : A
 
 function foo5d(x: PB); // error
->foo5d : typeof foo5d
+>foo5d : { (x: A): any; (x: PB): any; }
 >x : PB
 >PB : PB
 
 function foo5d(x: any) { }
->foo5d : typeof foo5d
+>foo5d : { (x: A): any; (x: PB): any; }
 >x : any
 
 function foo6(x: A);
->foo6 : typeof foo6
+>foo6 : { (x: A): any; (x: I): any; }
 >x : A
 >A : A
 
 function foo6(x: I); // error
->foo6 : typeof foo6
+>foo6 : { (x: A): any; (x: I): any; }
 >x : I
 >I : I
 
 function foo6(x: any) { }
->foo6 : typeof foo6
+>foo6 : { (x: A): any; (x: I): any; }
 >x : any
 
 function foo7(x: A);
->foo7 : typeof foo7
+>foo7 : { (x: A): any; (x: { [x: number]: string; }): any; }
 >x : A
 >A : A
 
 function foo7(x: typeof a); // error
->foo7 : typeof foo7
+>foo7 : { (x: A): any; (x: { [x: number]: string; }): any; }
 >x : { [x: number]: string; }
 >a : { [x: number]: string; }
 
 function foo7(x: any) { }
->foo7 : typeof foo7
+>foo7 : { (x: A): any; (x: { [x: number]: string; }): any; }
 >x : any
 
 function foo8(x: B);
->foo8 : typeof foo8
+>foo8 : { (x: B): any; (x: I): any; }
 >x : B
 >B : B
 
 function foo8(x: I); // error
->foo8 : typeof foo8
+>foo8 : { (x: B): any; (x: I): any; }
 >x : I
 >I : I
 
 function foo8(x: any) { }
->foo8 : typeof foo8
+>foo8 : { (x: B): any; (x: I): any; }
 >x : any
 
 function foo9(x: B);
->foo9 : typeof foo9
+>foo9 : { (x: B): any; (x: C<string>): any; }
 >x : B
 >B : B
 
 function foo9(x: C<string>); // error
->foo9 : typeof foo9
+>foo9 : { (x: B): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo9(x: any) { }
->foo9 : typeof foo9
+>foo9 : { (x: B): any; (x: C<string>): any; }
 >x : any
 
 function foo10(x: B);
->foo10 : typeof foo10
+>foo10 : { (x: B): any; (x: { [x: number]: string; }): any; }
 >x : B
 >B : B
 
 function foo10(x: typeof a); // error
->foo10 : typeof foo10
+>foo10 : { (x: B): any; (x: { [x: number]: string; }): any; }
 >x : { [x: number]: string; }
 >a : { [x: number]: string; }
 
 function foo10(x: any) { }
->foo10 : typeof foo10
+>foo10 : { (x: B): any; (x: { [x: number]: string; }): any; }
 >x : any
 
 function foo11(x: B);
->foo11 : typeof foo11
+>foo11 : { (x: B): any; (x: { [x: number]: string; }): any; }
 >x : B
 >B : B
 
 function foo11(x: typeof b); // error
->foo11 : typeof foo11
+>foo11 : { (x: B): any; (x: { [x: number]: string; }): any; }
 >x : { [x: number]: string; }
 >b : { [x: number]: string; }
 
 function foo11(x: any) { }
->foo11 : typeof foo11
+>foo11 : { (x: B): any; (x: { [x: number]: string; }): any; }
 >x : any
 
 function foo11b(x: B);
->foo11b : typeof foo11b
+>foo11b : { (x: B): any; (x: PA): any; }
 >x : B
 >B : B
 
 function foo11b(x: PA); // error
->foo11b : typeof foo11b
+>foo11b : { (x: B): any; (x: PA): any; }
 >x : PA
 >PA : PA
 
 function foo11b(x: any) { }
->foo11b : typeof foo11b
+>foo11b : { (x: B): any; (x: PA): any; }
 >x : any
 
 function foo11c(x: B);
->foo11c : typeof foo11c
+>foo11c : { (x: B): any; (x: PB): any; }
 >x : B
 >B : B
 
 function foo11c(x: PB); // error
->foo11c : typeof foo11c
+>foo11c : { (x: B): any; (x: PB): any; }
 >x : PB
 >PB : PB
 
 function foo11c(x: any) { }
->foo11c : typeof foo11c
+>foo11c : { (x: B): any; (x: PB): any; }
 >x : any
 
 function foo12(x: I);
->foo12 : typeof foo12
+>foo12 : { (x: I): any; (x: C<string>): any; }
 >x : I
 >I : I
 
 function foo12(x: C<string>); // error
->foo12 : typeof foo12
+>foo12 : { (x: I): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo12(x: any) { }
->foo12 : typeof foo12
+>foo12 : { (x: I): any; (x: C<string>): any; }
 >x : any
 
 function foo13(x: I);
->foo13 : typeof foo13
+>foo13 : { (x: I): any; (x: { [x: number]: string; }): any; }
 >x : I
 >I : I
 
 function foo13(x: typeof a); // error
->foo13 : typeof foo13
+>foo13 : { (x: I): any; (x: { [x: number]: string; }): any; }
 >x : { [x: number]: string; }
 >a : { [x: number]: string; }
 
 function foo13(x: any) { }
->foo13 : typeof foo13
+>foo13 : { (x: I): any; (x: { [x: number]: string; }): any; }
 >x : any
 
 function foo14(x: I);
->foo14 : typeof foo14
+>foo14 : { (x: I): any; (x: { [x: number]: string; }): any; }
 >x : I
 >I : I
 
 function foo14(x: typeof b); // error
->foo14 : typeof foo14
+>foo14 : { (x: I): any; (x: { [x: number]: string; }): any; }
 >x : { [x: number]: string; }
 >b : { [x: number]: string; }
 
 function foo14(x: any) { }
->foo14 : typeof foo14
+>foo14 : { (x: I): any; (x: { [x: number]: string; }): any; }
 >x : any
 
 function foo15(x: I);
->foo15 : typeof foo15
+>foo15 : { (x: I): any; (x: PA): any; }
 >x : I
 >I : I
 
 function foo15(x: PA); // error
->foo15 : typeof foo15
+>foo15 : { (x: I): any; (x: PA): any; }
 >x : PA
 >PA : PA
 
 function foo15(x: any) { }
->foo15 : typeof foo15
+>foo15 : { (x: I): any; (x: PA): any; }
 >x : any
 
 function foo16(x: I);
->foo16 : typeof foo16
+>foo16 : { (x: I): any; (x: PB): any; }
 >x : I
 >I : I
 
 function foo16(x: PB); // error
->foo16 : typeof foo16
+>foo16 : { (x: I): any; (x: PB): any; }
 >x : PB
 >PB : PB
 
 function foo16(x: any) { }
->foo16 : typeof foo16
+>foo16 : { (x: I): any; (x: PB): any; }
 >x : any
 
 
diff --git a/tests/baselines/reference/objectTypesIdentityWithNumericIndexers2.types b/tests/baselines/reference/objectTypesIdentityWithNumericIndexers2.types
index dc5616ebba6..cd8f19b2b7e 100644
--- a/tests/baselines/reference/objectTypesIdentityWithNumericIndexers2.types
+++ b/tests/baselines/reference/objectTypesIdentityWithNumericIndexers2.types
@@ -70,328 +70,328 @@ var b: { [x: number]: Derived; } = { foo: <Derived>null };
 >Derived : Derived
 
 function foo1(x: A);
->foo1 : typeof foo1
+>foo1 : { (x: A): any; (x: A): any; }
 >x : A
 >A : A
 
 function foo1(x: A); // error
->foo1 : typeof foo1
+>foo1 : { (x: A): any; (x: A): any; }
 >x : A
 >A : A
 
 function foo1(x: any) { }
->foo1 : typeof foo1
+>foo1 : { (x: A): any; (x: A): any; }
 >x : any
 
 function foo1b(x: B);
->foo1b : typeof foo1b
+>foo1b : { (x: B): any; (x: B): any; }
 >x : B
 >B : B
 
 function foo1b(x: B); // error
->foo1b : typeof foo1b
+>foo1b : { (x: B): any; (x: B): any; }
 >x : B
 >B : B
 
 function foo1b(x: any) { }
->foo1b : typeof foo1b
+>foo1b : { (x: B): any; (x: B): any; }
 >x : any
 
 function foo1c(x: C<string>);
->foo1c : typeof foo1c
+>foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo1c(x: C<string>); // error
->foo1c : typeof foo1c
+>foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo1c(x: any) { }
->foo1c : typeof foo1c
+>foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : any
 
 function foo2(x: I);
->foo2 : typeof foo2
+>foo2 : { (x: I): any; (x: I): any; }
 >x : I
 >I : I
 
 function foo2(x: I); // error
->foo2 : typeof foo2
+>foo2 : { (x: I): any; (x: I): any; }
 >x : I
 >I : I
 
 function foo2(x: any) { }
->foo2 : typeof foo2
+>foo2 : { (x: I): any; (x: I): any; }
 >x : any
 
 function foo3(x: typeof a);
->foo3 : typeof foo3
+>foo3 : { (x: { [x: number]: Base; }): any; (x: { [x: number]: Base; }): any; }
 >x : { [x: number]: Base; }
 >a : { [x: number]: Base; }
 
 function foo3(x: typeof a); // error
->foo3 : typeof foo3
+>foo3 : { (x: { [x: number]: Base; }): any; (x: { [x: number]: Base; }): any; }
 >x : { [x: number]: Base; }
 >a : { [x: number]: Base; }
 
 function foo3(x: any) { }
->foo3 : typeof foo3
+>foo3 : { (x: { [x: number]: Base; }): any; (x: { [x: number]: Base; }): any; }
 >x : any
 
 function foo4(x: typeof b);
->foo4 : typeof foo4
+>foo4 : { (x: { [x: number]: Derived; }): any; (x: { [x: number]: Derived; }): any; }
 >x : { [x: number]: Derived; }
 >b : { [x: number]: Derived; }
 
 function foo4(x: typeof b); // error
->foo4 : typeof foo4
+>foo4 : { (x: { [x: number]: Derived; }): any; (x: { [x: number]: Derived; }): any; }
 >x : { [x: number]: Derived; }
 >b : { [x: number]: Derived; }
 
 function foo4(x: any) { }
->foo4 : typeof foo4
+>foo4 : { (x: { [x: number]: Derived; }): any; (x: { [x: number]: Derived; }): any; }
 >x : any
 
 function foo5(x: A);
->foo5 : typeof foo5
+>foo5 : { (x: A): any; (x: B): any; }
 >x : A
 >A : A
 
 function foo5(x: B); // ok
->foo5 : typeof foo5
+>foo5 : { (x: A): any; (x: B): any; }
 >x : B
 >B : B
 
 function foo5(x: any) { }
->foo5 : typeof foo5
+>foo5 : { (x: A): any; (x: B): any; }
 >x : any
 
 function foo5b(x: A);
->foo5b : typeof foo5b
+>foo5b : { (x: A): any; (x: C<Derived>): any; }
 >x : A
 >A : A
 
 function foo5b(x: C<Derived>); // ok
->foo5b : typeof foo5b
+>foo5b : { (x: A): any; (x: C<Derived>): any; }
 >x : C<Derived>
 >C : C<T>
 >Derived : Derived
 
 function foo5b(x: any) { }
->foo5b : typeof foo5b
+>foo5b : { (x: A): any; (x: C<Derived>): any; }
 >x : any
 
 function foo5c(x: A);
->foo5c : typeof foo5c
+>foo5c : { (x: A): any; (x: PA): any; }
 >x : A
 >A : A
 
 function foo5c(x: PA); // error
->foo5c : typeof foo5c
+>foo5c : { (x: A): any; (x: PA): any; }
 >x : PA
 >PA : PA
 
 function foo5c(x: any) { }
->foo5c : typeof foo5c
+>foo5c : { (x: A): any; (x: PA): any; }
 >x : any
 
 function foo5d(x: A);
->foo5d : typeof foo5d
+>foo5d : { (x: A): any; (x: PB): any; }
 >x : A
 >A : A
 
 function foo5d(x: PB); // ok
->foo5d : typeof foo5d
+>foo5d : { (x: A): any; (x: PB): any; }
 >x : PB
 >PB : PB
 
 function foo5d(x: any) { }
->foo5d : typeof foo5d
+>foo5d : { (x: A): any; (x: PB): any; }
 >x : any
 
 function foo6(x: A);
->foo6 : typeof foo6
+>foo6 : { (x: A): any; (x: I): any; }
 >x : A
 >A : A
 
 function foo6(x: I); // ok
->foo6 : typeof foo6
+>foo6 : { (x: A): any; (x: I): any; }
 >x : I
 >I : I
 
 function foo6(x: any) { }
->foo6 : typeof foo6
+>foo6 : { (x: A): any; (x: I): any; }
 >x : any
 
 function foo7(x: A);
->foo7 : typeof foo7
+>foo7 : { (x: A): any; (x: { [x: number]: Base; }): any; }
 >x : A
 >A : A
 
 function foo7(x: typeof a); // error
->foo7 : typeof foo7
+>foo7 : { (x: A): any; (x: { [x: number]: Base; }): any; }
 >x : { [x: number]: Base; }
 >a : { [x: number]: Base; }
 
 function foo7(x: any) { }
->foo7 : typeof foo7
+>foo7 : { (x: A): any; (x: { [x: number]: Base; }): any; }
 >x : any
 
 function foo8(x: B);
->foo8 : typeof foo8
+>foo8 : { (x: B): any; (x: I): any; }
 >x : B
 >B : B
 
 function foo8(x: I); // error
->foo8 : typeof foo8
+>foo8 : { (x: B): any; (x: I): any; }
 >x : I
 >I : I
 
 function foo8(x: any) { }
->foo8 : typeof foo8
+>foo8 : { (x: B): any; (x: I): any; }
 >x : any
 
 function foo9(x: B);
->foo9 : typeof foo9
+>foo9 : { (x: B): any; (x: C<Base>): any; }
 >x : B
 >B : B
 
 function foo9(x: C<Base>); // ok
->foo9 : typeof foo9
+>foo9 : { (x: B): any; (x: C<Base>): any; }
 >x : C<Base>
 >C : C<T>
 >Base : Base
 
 function foo9(x: any) { }
->foo9 : typeof foo9
+>foo9 : { (x: B): any; (x: C<Base>): any; }
 >x : any
 
 function foo10(x: B);
->foo10 : typeof foo10
+>foo10 : { (x: B): any; (x: { [x: number]: Base; }): any; }
 >x : B
 >B : B
 
 function foo10(x: typeof a); // ok
->foo10 : typeof foo10
+>foo10 : { (x: B): any; (x: { [x: number]: Base; }): any; }
 >x : { [x: number]: Base; }
 >a : { [x: number]: Base; }
 
 function foo10(x: any) { }
->foo10 : typeof foo10
+>foo10 : { (x: B): any; (x: { [x: number]: Base; }): any; }
 >x : any
 
 function foo11(x: B);
->foo11 : typeof foo11
+>foo11 : { (x: B): any; (x: { [x: number]: Derived; }): any; }
 >x : B
 >B : B
 
 function foo11(x: typeof b); // error
->foo11 : typeof foo11
+>foo11 : { (x: B): any; (x: { [x: number]: Derived; }): any; }
 >x : { [x: number]: Derived; }
 >b : { [x: number]: Derived; }
 
 function foo11(x: any) { }
->foo11 : typeof foo11
+>foo11 : { (x: B): any; (x: { [x: number]: Derived; }): any; }
 >x : any
 
 function foo11b(x: B);
->foo11b : typeof foo11b
+>foo11b : { (x: B): any; (x: PA): any; }
 >x : B
 >B : B
 
 function foo11b(x: PA); // ok
->foo11b : typeof foo11b
+>foo11b : { (x: B): any; (x: PA): any; }
 >x : PA
 >PA : PA
 
 function foo11b(x: any) { }
->foo11b : typeof foo11b
+>foo11b : { (x: B): any; (x: PA): any; }
 >x : any
 
 function foo11c(x: B);
->foo11c : typeof foo11c
+>foo11c : { (x: B): any; (x: PB): any; }
 >x : B
 >B : B
 
 function foo11c(x: PB); // error
->foo11c : typeof foo11c
+>foo11c : { (x: B): any; (x: PB): any; }
 >x : PB
 >PB : PB
 
 function foo11c(x: any) { }
->foo11c : typeof foo11c
+>foo11c : { (x: B): any; (x: PB): any; }
 >x : any
 
 function foo12(x: I);
->foo12 : typeof foo12
+>foo12 : { (x: I): any; (x: C<Derived>): any; }
 >x : I
 >I : I
 
 function foo12(x: C<Derived>); // error
->foo12 : typeof foo12
+>foo12 : { (x: I): any; (x: C<Derived>): any; }
 >x : C<Derived>
 >C : C<T>
 >Derived : Derived
 
 function foo12(x: any) { }
->foo12 : typeof foo12
+>foo12 : { (x: I): any; (x: C<Derived>): any; }
 >x : any
 
 function foo13(x: I);
->foo13 : typeof foo13
+>foo13 : { (x: I): any; (x: { [x: number]: Base; }): any; }
 >x : I
 >I : I
 
 function foo13(x: typeof a); // ok
->foo13 : typeof foo13
+>foo13 : { (x: I): any; (x: { [x: number]: Base; }): any; }
 >x : { [x: number]: Base; }
 >a : { [x: number]: Base; }
 
 function foo13(x: any) { }
->foo13 : typeof foo13
+>foo13 : { (x: I): any; (x: { [x: number]: Base; }): any; }
 >x : any
 
 function foo14(x: I);
->foo14 : typeof foo14
+>foo14 : { (x: I): any; (x: { [x: number]: Derived; }): any; }
 >x : I
 >I : I
 
 function foo14(x: typeof b); // error
->foo14 : typeof foo14
+>foo14 : { (x: I): any; (x: { [x: number]: Derived; }): any; }
 >x : { [x: number]: Derived; }
 >b : { [x: number]: Derived; }
 
 function foo14(x: any) { }
->foo14 : typeof foo14
+>foo14 : { (x: I): any; (x: { [x: number]: Derived; }): any; }
 >x : any
 
 function foo15(x: I);
->foo15 : typeof foo15
+>foo15 : { (x: I): any; (x: PA): any; }
 >x : I
 >I : I
 
 function foo15(x: PA); // ok
->foo15 : typeof foo15
+>foo15 : { (x: I): any; (x: PA): any; }
 >x : PA
 >PA : PA
 
 function foo15(x: any) { }
->foo15 : typeof foo15
+>foo15 : { (x: I): any; (x: PA): any; }
 >x : any
 
 function foo16(x: I);
->foo16 : typeof foo16
+>foo16 : { (x: I): any; (x: PB): any; }
 >x : I
 >I : I
 
 function foo16(x: PB); // error
->foo16 : typeof foo16
+>foo16 : { (x: I): any; (x: PB): any; }
 >x : PB
 >PB : PB
 
 function foo16(x: any) { }
->foo16 : typeof foo16
+>foo16 : { (x: I): any; (x: PB): any; }
 >x : any
 
 
diff --git a/tests/baselines/reference/objectTypesIdentityWithNumericIndexers3.types b/tests/baselines/reference/objectTypesIdentityWithNumericIndexers3.types
index d62a05d7e23..6a73749fc84 100644
--- a/tests/baselines/reference/objectTypesIdentityWithNumericIndexers3.types
+++ b/tests/baselines/reference/objectTypesIdentityWithNumericIndexers3.types
@@ -54,325 +54,325 @@ var b: { [x: number]: string; } = { foo: '' };
 >foo : string
 
 function foo1(x: A);
->foo1 : typeof foo1
+>foo1 : { (x: A): any; (x: A): any; }
 >x : A
 >A : A
 
 function foo1(x: A); // error
->foo1 : typeof foo1
+>foo1 : { (x: A): any; (x: A): any; }
 >x : A
 >A : A
 
 function foo1(x: any) { }
->foo1 : typeof foo1
+>foo1 : { (x: A): any; (x: A): any; }
 >x : any
 
 function foo1b(x: B);
->foo1b : typeof foo1b
+>foo1b : { (x: B): any; (x: B): any; }
 >x : B
 >B : B
 
 function foo1b(x: B); // error
->foo1b : typeof foo1b
+>foo1b : { (x: B): any; (x: B): any; }
 >x : B
 >B : B
 
 function foo1b(x: any) { }
->foo1b : typeof foo1b
+>foo1b : { (x: B): any; (x: B): any; }
 >x : any
 
 function foo1c(x: C<string>);
->foo1c : typeof foo1c
+>foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo1c(x: C<string>); // error
->foo1c : typeof foo1c
+>foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo1c(x: any) { }
->foo1c : typeof foo1c
+>foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : any
 
 function foo2(x: I);
->foo2 : typeof foo2
+>foo2 : { (x: I): any; (x: I): any; }
 >x : I
 >I : I
 
 function foo2(x: I); // error
->foo2 : typeof foo2
+>foo2 : { (x: I): any; (x: I): any; }
 >x : I
 >I : I
 
 function foo2(x: any) { }
->foo2 : typeof foo2
+>foo2 : { (x: I): any; (x: I): any; }
 >x : any
 
 function foo3(x: typeof a);
->foo3 : typeof foo3
+>foo3 : { (x: { [x: string]: string; }): any; (x: { [x: string]: string; }): any; }
 >x : { [x: string]: string; }
 >a : { [x: string]: string; }
 
 function foo3(x: typeof a); // error
->foo3 : typeof foo3
+>foo3 : { (x: { [x: string]: string; }): any; (x: { [x: string]: string; }): any; }
 >x : { [x: string]: string; }
 >a : { [x: string]: string; }
 
 function foo3(x: any) { }
->foo3 : typeof foo3
+>foo3 : { (x: { [x: string]: string; }): any; (x: { [x: string]: string; }): any; }
 >x : any
 
 function foo4(x: typeof b);
->foo4 : typeof foo4
+>foo4 : { (x: { [x: number]: string; }): any; (x: { [x: number]: string; }): any; }
 >x : { [x: number]: string; }
 >b : { [x: number]: string; }
 
 function foo4(x: typeof b); // error
->foo4 : typeof foo4
+>foo4 : { (x: { [x: number]: string; }): any; (x: { [x: number]: string; }): any; }
 >x : { [x: number]: string; }
 >b : { [x: number]: string; }
 
 function foo4(x: any) { }
->foo4 : typeof foo4
+>foo4 : { (x: { [x: number]: string; }): any; (x: { [x: number]: string; }): any; }
 >x : any
 
 function foo5(x: A);
->foo5 : typeof foo5
+>foo5 : { (x: A): any; (x: B): any; }
 >x : A
 >A : A
 
 function foo5(x: B); // ok
->foo5 : typeof foo5
+>foo5 : { (x: A): any; (x: B): any; }
 >x : B
 >B : B
 
 function foo5(x: any) { }
->foo5 : typeof foo5
+>foo5 : { (x: A): any; (x: B): any; }
 >x : any
 
 function foo5b(x: A);
->foo5b : typeof foo5b
+>foo5b : { (x: A): any; (x: C<string>): any; }
 >x : A
 >A : A
 
 function foo5b(x: C<string>); // error
->foo5b : typeof foo5b
+>foo5b : { (x: A): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo5b(x: any) { }
->foo5b : typeof foo5b
+>foo5b : { (x: A): any; (x: C<string>): any; }
 >x : any
 
 function foo5c(x: A);
->foo5c : typeof foo5c
+>foo5c : { (x: A): any; (x: PA): any; }
 >x : A
 >A : A
 
 function foo5c(x: PA); // error
->foo5c : typeof foo5c
+>foo5c : { (x: A): any; (x: PA): any; }
 >x : PA
 >PA : PA
 
 function foo5c(x: any) { }
->foo5c : typeof foo5c
+>foo5c : { (x: A): any; (x: PA): any; }
 >x : any
 
 function foo5d(x: A);
->foo5d : typeof foo5d
+>foo5d : { (x: A): any; (x: PB): any; }
 >x : A
 >A : A
 
 function foo5d(x: PB); // ok
->foo5d : typeof foo5d
+>foo5d : { (x: A): any; (x: PB): any; }
 >x : PB
 >PB : PB
 
 function foo5d(x: any) { }
->foo5d : typeof foo5d
+>foo5d : { (x: A): any; (x: PB): any; }
 >x : any
 
 function foo6(x: A);
->foo6 : typeof foo6
+>foo6 : { (x: A): any; (x: I): any; }
 >x : A
 >A : A
 
 function foo6(x: I); // ok
->foo6 : typeof foo6
+>foo6 : { (x: A): any; (x: I): any; }
 >x : I
 >I : I
 
 function foo6(x: any) { }
->foo6 : typeof foo6
+>foo6 : { (x: A): any; (x: I): any; }
 >x : any
 
 function foo7(x: A);
->foo7 : typeof foo7
+>foo7 : { (x: A): any; (x: { [x: string]: string; }): any; }
 >x : A
 >A : A
 
 function foo7(x: typeof a); // ok
->foo7 : typeof foo7
+>foo7 : { (x: A): any; (x: { [x: string]: string; }): any; }
 >x : { [x: string]: string; }
 >a : { [x: string]: string; }
 
 function foo7(x: any) { }
->foo7 : typeof foo7
+>foo7 : { (x: A): any; (x: { [x: string]: string; }): any; }
 >x : any
 
 function foo8(x: B);
->foo8 : typeof foo8
+>foo8 : { (x: B): any; (x: I): any; }
 >x : B
 >B : B
 
 function foo8(x: I); // error
->foo8 : typeof foo8
+>foo8 : { (x: B): any; (x: I): any; }
 >x : I
 >I : I
 
 function foo8(x: any) { }
->foo8 : typeof foo8
+>foo8 : { (x: B): any; (x: I): any; }
 >x : any
 
 function foo9(x: B);
->foo9 : typeof foo9
+>foo9 : { (x: B): any; (x: C<string>): any; }
 >x : B
 >B : B
 
 function foo9(x: C<string>); // ok
->foo9 : typeof foo9
+>foo9 : { (x: B): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo9(x: any) { }
->foo9 : typeof foo9
+>foo9 : { (x: B): any; (x: C<string>): any; }
 >x : any
 
 function foo10(x: B);
->foo10 : typeof foo10
+>foo10 : { (x: B): any; (x: { [x: string]: string; }): any; }
 >x : B
 >B : B
 
 function foo10(x: typeof a); // error
->foo10 : typeof foo10
+>foo10 : { (x: B): any; (x: { [x: string]: string; }): any; }
 >x : { [x: string]: string; }
 >a : { [x: string]: string; }
 
 function foo10(x: any) { }
->foo10 : typeof foo10
+>foo10 : { (x: B): any; (x: { [x: string]: string; }): any; }
 >x : any
 
 function foo11(x: B);
->foo11 : typeof foo11
+>foo11 : { (x: B): any; (x: { [x: number]: string; }): any; }
 >x : B
 >B : B
 
 function foo11(x: typeof b); // ok
->foo11 : typeof foo11
+>foo11 : { (x: B): any; (x: { [x: number]: string; }): any; }
 >x : { [x: number]: string; }
 >b : { [x: number]: string; }
 
 function foo11(x: any) { }
->foo11 : typeof foo11
+>foo11 : { (x: B): any; (x: { [x: number]: string; }): any; }
 >x : any
 
 function foo11b(x: B);
->foo11b : typeof foo11b
+>foo11b : { (x: B): any; (x: PA): any; }
 >x : B
 >B : B
 
 function foo11b(x: PA); // ok
->foo11b : typeof foo11b
+>foo11b : { (x: B): any; (x: PA): any; }
 >x : PA
 >PA : PA
 
 function foo11b(x: any) { }
->foo11b : typeof foo11b
+>foo11b : { (x: B): any; (x: PA): any; }
 >x : any
 
 function foo11c(x: B);
->foo11c : typeof foo11c
+>foo11c : { (x: B): any; (x: PB): any; }
 >x : B
 >B : B
 
 function foo11c(x: PB); // error
->foo11c : typeof foo11c
+>foo11c : { (x: B): any; (x: PB): any; }
 >x : PB
 >PB : PB
 
 function foo11c(x: any) { }
->foo11c : typeof foo11c
+>foo11c : { (x: B): any; (x: PB): any; }
 >x : any
 
 function foo12(x: I);
->foo12 : typeof foo12
+>foo12 : { (x: I): any; (x: C<string>): any; }
 >x : I
 >I : I
 
 function foo12(x: C<string>); // ok
->foo12 : typeof foo12
+>foo12 : { (x: I): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo12(x: any) { }
->foo12 : typeof foo12
+>foo12 : { (x: I): any; (x: C<string>): any; }
 >x : any
 
 function foo13(x: I);
->foo13 : typeof foo13
+>foo13 : { (x: I): any; (x: { [x: string]: string; }): any; }
 >x : I
 >I : I
 
 function foo13(x: typeof a); // error
->foo13 : typeof foo13
+>foo13 : { (x: I): any; (x: { [x: string]: string; }): any; }
 >x : { [x: string]: string; }
 >a : { [x: string]: string; }
 
 function foo13(x: any) { }
->foo13 : typeof foo13
+>foo13 : { (x: I): any; (x: { [x: string]: string; }): any; }
 >x : any
 
 function foo14(x: I);
->foo14 : typeof foo14
+>foo14 : { (x: I): any; (x: { [x: number]: string; }): any; }
 >x : I
 >I : I
 
 function foo14(x: typeof b); // ok
->foo14 : typeof foo14
+>foo14 : { (x: I): any; (x: { [x: number]: string; }): any; }
 >x : { [x: number]: string; }
 >b : { [x: number]: string; }
 
 function foo14(x: any) { }
->foo14 : typeof foo14
+>foo14 : { (x: I): any; (x: { [x: number]: string; }): any; }
 >x : any
 
 function foo15(x: I);
->foo15 : typeof foo15
+>foo15 : { (x: I): any; (x: PA): any; }
 >x : I
 >I : I
 
 function foo15(x: PA); // ok
->foo15 : typeof foo15
+>foo15 : { (x: I): any; (x: PA): any; }
 >x : PA
 >PA : PA
 
 function foo15(x: any) { }
->foo15 : typeof foo15
+>foo15 : { (x: I): any; (x: PA): any; }
 >x : any
 
 function foo16(x: I);
->foo16 : typeof foo16
+>foo16 : { (x: I): any; (x: PB): any; }
 >x : I
 >I : I
 
 function foo16(x: PB); // error
->foo16 : typeof foo16
+>foo16 : { (x: I): any; (x: PB): any; }
 >x : PB
 >PB : PB
 
 function foo16(x: any) { }
->foo16 : typeof foo16
+>foo16 : { (x: I): any; (x: PB): any; }
 >x : any
 
 
diff --git a/tests/baselines/reference/objectTypesIdentityWithOptionality.types b/tests/baselines/reference/objectTypesIdentityWithOptionality.types
index 4a762d39fac..0ca5b552bf5 100644
--- a/tests/baselines/reference/objectTypesIdentityWithOptionality.types
+++ b/tests/baselines/reference/objectTypesIdentityWithOptionality.types
@@ -41,128 +41,128 @@ var b = { foo: '' };
 >foo : string
 
 function foo2(x: I);
->foo2 : typeof foo2
+>foo2 : { (x: I): any; (x: I): any; }
 >x : I
 >I : I
 
 function foo2(x: I); // error
->foo2 : typeof foo2
+>foo2 : { (x: I): any; (x: I): any; }
 >x : I
 >I : I
 
 function foo2(x: any) { }
->foo2 : typeof foo2
+>foo2 : { (x: I): any; (x: I): any; }
 >x : any
 
 function foo3(x: typeof a);
->foo3 : typeof foo3
+>foo3 : { (x: { foo?: string; }): any; (x: { foo?: string; }): any; }
 >x : { foo?: string; }
 >a : { foo?: string; }
 
 function foo3(x: typeof a); // error
->foo3 : typeof foo3
+>foo3 : { (x: { foo?: string; }): any; (x: { foo?: string; }): any; }
 >x : { foo?: string; }
 >a : { foo?: string; }
 
 function foo3(x: any) { }
->foo3 : typeof foo3
+>foo3 : { (x: { foo?: string; }): any; (x: { foo?: string; }): any; }
 >x : any
 
 function foo6(x: A);
->foo6 : typeof foo6
+>foo6 : { (x: A): any; (x: I): any; }
 >x : A
 >A : A
 
 function foo6(x: I); // ok
->foo6 : typeof foo6
+>foo6 : { (x: A): any; (x: I): any; }
 >x : I
 >I : I
 
 function foo6(x: any) { }
->foo6 : typeof foo6
+>foo6 : { (x: A): any; (x: I): any; }
 >x : any
 
 function foo7(x: A);
->foo7 : typeof foo7
+>foo7 : { (x: A): any; (x: { foo?: string; }): any; }
 >x : A
 >A : A
 
 function foo7(x: typeof a); // ok
->foo7 : typeof foo7
+>foo7 : { (x: A): any; (x: { foo?: string; }): any; }
 >x : { foo?: string; }
 >a : { foo?: string; }
 
 function foo7(x: any) { }
->foo7 : typeof foo7
+>foo7 : { (x: A): any; (x: { foo?: string; }): any; }
 >x : any
 
 function foo8(x: B);
->foo8 : typeof foo8
+>foo8 : { (x: B): any; (x: I): any; }
 >x : B
 >B : B
 
 function foo8(x: I); // ok
->foo8 : typeof foo8
+>foo8 : { (x: B): any; (x: I): any; }
 >x : I
 >I : I
 
 function foo8(x: any) { }
->foo8 : typeof foo8
+>foo8 : { (x: B): any; (x: I): any; }
 >x : any
 
 function foo10(x: B);
->foo10 : typeof foo10
+>foo10 : { (x: B): any; (x: { foo?: string; }): any; }
 >x : B
 >B : B
 
 function foo10(x: typeof a); // ok
->foo10 : typeof foo10
+>foo10 : { (x: B): any; (x: { foo?: string; }): any; }
 >x : { foo?: string; }
 >a : { foo?: string; }
 
 function foo10(x: any) { }
->foo10 : typeof foo10
+>foo10 : { (x: B): any; (x: { foo?: string; }): any; }
 >x : any
 
 function foo12(x: I);
->foo12 : typeof foo12
+>foo12 : { (x: I): any; (x: C<string>): any; }
 >x : I
 >I : I
 
 function foo12(x: C<string>); // ok
->foo12 : typeof foo12
+>foo12 : { (x: I): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo12(x: any) { }
->foo12 : typeof foo12
+>foo12 : { (x: I): any; (x: C<string>): any; }
 >x : any
 
 function foo13(x: I);
->foo13 : typeof foo13
+>foo13 : { (x: I): any; (x: { foo?: string; }): any; }
 >x : I
 >I : I
 
 function foo13(x: typeof a); // error
->foo13 : typeof foo13
+>foo13 : { (x: I): any; (x: { foo?: string; }): any; }
 >x : { foo?: string; }
 >a : { foo?: string; }
 
 function foo13(x: any) { }
->foo13 : typeof foo13
+>foo13 : { (x: I): any; (x: { foo?: string; }): any; }
 >x : any
 
 function foo14(x: I);
->foo14 : typeof foo14
+>foo14 : { (x: I): any; (x: { foo: string; }): any; }
 >x : I
 >I : I
 
 function foo14(x: typeof b); // ok
->foo14 : typeof foo14
+>foo14 : { (x: I): any; (x: { foo: string; }): any; }
 >x : { foo: string; }
 >b : { foo: string; }
 
 function foo14(x: any) { }
->foo14 : typeof foo14
+>foo14 : { (x: I): any; (x: { foo: string; }): any; }
 >x : any
 
diff --git a/tests/baselines/reference/objectTypesIdentityWithPrivates.types b/tests/baselines/reference/objectTypesIdentityWithPrivates.types
index 6bd61edbacf..391f6f1f200 100644
--- a/tests/baselines/reference/objectTypesIdentityWithPrivates.types
+++ b/tests/baselines/reference/objectTypesIdentityWithPrivates.types
@@ -51,325 +51,325 @@ var b = { foo: '' };
 >foo : string
 
 function foo1(x: A);
->foo1 : typeof foo1
+>foo1 : { (x: A): any; (x: A): any; }
 >x : A
 >A : A
 
 function foo1(x: A); // error
->foo1 : typeof foo1
+>foo1 : { (x: A): any; (x: A): any; }
 >x : A
 >A : A
 
 function foo1(x: any) { }
->foo1 : typeof foo1
+>foo1 : { (x: A): any; (x: A): any; }
 >x : any
 
 function foo1b(x: B);
->foo1b : typeof foo1b
+>foo1b : { (x: B): any; (x: B): any; }
 >x : B
 >B : B
 
 function foo1b(x: B); // error
->foo1b : typeof foo1b
+>foo1b : { (x: B): any; (x: B): any; }
 >x : B
 >B : B
 
 function foo1b(x: any) { }
->foo1b : typeof foo1b
+>foo1b : { (x: B): any; (x: B): any; }
 >x : any
 
 function foo1c(x: C<string>);
->foo1c : typeof foo1c
+>foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo1c(x: C<string>); // error
->foo1c : typeof foo1c
+>foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo1c(x: any) { }
->foo1c : typeof foo1c
+>foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : any
 
 function foo2(x: I);
->foo2 : typeof foo2
+>foo2 : { (x: I): any; (x: I): any; }
 >x : I
 >I : I
 
 function foo2(x: I); // error
->foo2 : typeof foo2
+>foo2 : { (x: I): any; (x: I): any; }
 >x : I
 >I : I
 
 function foo2(x: any) { }
->foo2 : typeof foo2
+>foo2 : { (x: I): any; (x: I): any; }
 >x : any
 
 function foo3(x: typeof a);
->foo3 : typeof foo3
+>foo3 : { (x: { foo: string; }): any; (x: { foo: string; }): any; }
 >x : { foo: string; }
 >a : { foo: string; }
 
 function foo3(x: typeof a); // error
->foo3 : typeof foo3
+>foo3 : { (x: { foo: string; }): any; (x: { foo: string; }): any; }
 >x : { foo: string; }
 >a : { foo: string; }
 
 function foo3(x: any) { }
->foo3 : typeof foo3
+>foo3 : { (x: { foo: string; }): any; (x: { foo: string; }): any; }
 >x : any
 
 function foo4(x: typeof b);
->foo4 : typeof foo4
+>foo4 : { (x: { foo: string; }): any; (x: { foo: string; }): any; }
 >x : { foo: string; }
 >b : { foo: string; }
 
 function foo4(x: typeof b); // error
->foo4 : typeof foo4
+>foo4 : { (x: { foo: string; }): any; (x: { foo: string; }): any; }
 >x : { foo: string; }
 >b : { foo: string; }
 
 function foo4(x: any) { }
->foo4 : typeof foo4
+>foo4 : { (x: { foo: string; }): any; (x: { foo: string; }): any; }
 >x : any
 
 function foo5(x: A);
->foo5 : typeof foo5
+>foo5 : { (x: A): any; (x: B): any; }
 >x : A
 >A : A
 
 function foo5(x: B); // no error
->foo5 : typeof foo5
+>foo5 : { (x: A): any; (x: B): any; }
 >x : B
 >B : B
 
 function foo5(x: any) { }
->foo5 : typeof foo5
+>foo5 : { (x: A): any; (x: B): any; }
 >x : any
 
 function foo5b(x: A);
->foo5b : typeof foo5b
+>foo5b : { (x: A): any; (x: C<string>): any; }
 >x : A
 >A : A
 
 function foo5b(x: C<string>); // no error
->foo5b : typeof foo5b
+>foo5b : { (x: A): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo5b(x: any) { }
->foo5b : typeof foo5b
+>foo5b : { (x: A): any; (x: C<string>): any; }
 >x : any
 
 function foo5c(x: A);
->foo5c : typeof foo5c
+>foo5c : { (x: A): any; (x: PA): any; }
 >x : A
 >A : A
 
 function foo5c(x: PA); // error
->foo5c : typeof foo5c
+>foo5c : { (x: A): any; (x: PA): any; }
 >x : PA
 >PA : PA
 
 function foo5c(x: any) { }
->foo5c : typeof foo5c
+>foo5c : { (x: A): any; (x: PA): any; }
 >x : any
 
 function foo5d(x: A);
->foo5d : typeof foo5d
+>foo5d : { (x: A): any; (x: PB): any; }
 >x : A
 >A : A
 
 function foo5d(x: PB); // no error
->foo5d : typeof foo5d
+>foo5d : { (x: A): any; (x: PB): any; }
 >x : PB
 >PB : PB
 
 function foo5d(x: any) { }
->foo5d : typeof foo5d
+>foo5d : { (x: A): any; (x: PB): any; }
 >x : any
 
 function foo6(x: A);
->foo6 : typeof foo6
+>foo6 : { (x: A): any; (x: I): any; }
 >x : A
 >A : A
 
 function foo6(x: I); // no error
->foo6 : typeof foo6
+>foo6 : { (x: A): any; (x: I): any; }
 >x : I
 >I : I
 
 function foo6(x: any) { }
->foo6 : typeof foo6
+>foo6 : { (x: A): any; (x: I): any; }
 >x : any
 
 function foo7(x: A);
->foo7 : typeof foo7
+>foo7 : { (x: A): any; (x: { foo: string; }): any; }
 >x : A
 >A : A
 
 function foo7(x: typeof a); // no error
->foo7 : typeof foo7
+>foo7 : { (x: A): any; (x: { foo: string; }): any; }
 >x : { foo: string; }
 >a : { foo: string; }
 
 function foo7(x: any) { }
->foo7 : typeof foo7
+>foo7 : { (x: A): any; (x: { foo: string; }): any; }
 >x : any
 
 function foo8(x: B);
->foo8 : typeof foo8
+>foo8 : { (x: B): any; (x: I): any; }
 >x : B
 >B : B
 
 function foo8(x: I); // no error
->foo8 : typeof foo8
+>foo8 : { (x: B): any; (x: I): any; }
 >x : I
 >I : I
 
 function foo8(x: any) { }
->foo8 : typeof foo8
+>foo8 : { (x: B): any; (x: I): any; }
 >x : any
 
 function foo9(x: B);
->foo9 : typeof foo9
+>foo9 : { (x: B): any; (x: C<string>): any; }
 >x : B
 >B : B
 
 function foo9(x: C<string>); // no error
->foo9 : typeof foo9
+>foo9 : { (x: B): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo9(x: any) { }
->foo9 : typeof foo9
+>foo9 : { (x: B): any; (x: C<string>): any; }
 >x : any
 
 function foo10(x: B);
->foo10 : typeof foo10
+>foo10 : { (x: B): any; (x: { foo: string; }): any; }
 >x : B
 >B : B
 
 function foo10(x: typeof a); // no error
->foo10 : typeof foo10
+>foo10 : { (x: B): any; (x: { foo: string; }): any; }
 >x : { foo: string; }
 >a : { foo: string; }
 
 function foo10(x: any) { }
->foo10 : typeof foo10
+>foo10 : { (x: B): any; (x: { foo: string; }): any; }
 >x : any
 
 function foo11(x: B);
->foo11 : typeof foo11
+>foo11 : { (x: B): any; (x: { foo: string; }): any; }
 >x : B
 >B : B
 
 function foo11(x: typeof b); // no error
->foo11 : typeof foo11
+>foo11 : { (x: B): any; (x: { foo: string; }): any; }
 >x : { foo: string; }
 >b : { foo: string; }
 
 function foo11(x: any) { }
->foo11 : typeof foo11
+>foo11 : { (x: B): any; (x: { foo: string; }): any; }
 >x : any
 
 function foo11b(x: B);
->foo11b : typeof foo11b
+>foo11b : { (x: B): any; (x: PA): any; }
 >x : B
 >B : B
 
 function foo11b(x: PA); // no error
->foo11b : typeof foo11b
+>foo11b : { (x: B): any; (x: PA): any; }
 >x : PA
 >PA : PA
 
 function foo11b(x: any) { }
->foo11b : typeof foo11b
+>foo11b : { (x: B): any; (x: PA): any; }
 >x : any
 
 function foo11c(x: B);
->foo11c : typeof foo11c
+>foo11c : { (x: B): any; (x: PB): any; }
 >x : B
 >B : B
 
 function foo11c(x: PB); // error
->foo11c : typeof foo11c
+>foo11c : { (x: B): any; (x: PB): any; }
 >x : PB
 >PB : PB
 
 function foo11c(x: any) { }
->foo11c : typeof foo11c
+>foo11c : { (x: B): any; (x: PB): any; }
 >x : any
 
 function foo12(x: I);
->foo12 : typeof foo12
+>foo12 : { (x: I): any; (x: C<string>): any; }
 >x : I
 >I : I
 
 function foo12(x: C<string>); // no error
->foo12 : typeof foo12
+>foo12 : { (x: I): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo12(x: any) { }
->foo12 : typeof foo12
+>foo12 : { (x: I): any; (x: C<string>): any; }
 >x : any
 
 function foo13(x: I);
->foo13 : typeof foo13
+>foo13 : { (x: I): any; (x: { foo: string; }): any; }
 >x : I
 >I : I
 
 function foo13(x: typeof a); // error
->foo13 : typeof foo13
+>foo13 : { (x: I): any; (x: { foo: string; }): any; }
 >x : { foo: string; }
 >a : { foo: string; }
 
 function foo13(x: any) { }
->foo13 : typeof foo13
+>foo13 : { (x: I): any; (x: { foo: string; }): any; }
 >x : any
 
 function foo14(x: I);
->foo14 : typeof foo14
+>foo14 : { (x: I): any; (x: { foo: string; }): any; }
 >x : I
 >I : I
 
 function foo14(x: typeof b); // error
->foo14 : typeof foo14
+>foo14 : { (x: I): any; (x: { foo: string; }): any; }
 >x : { foo: string; }
 >b : { foo: string; }
 
 function foo14(x: any) { }
->foo14 : typeof foo14
+>foo14 : { (x: I): any; (x: { foo: string; }): any; }
 >x : any
 
 function foo15(x: I);
->foo15 : typeof foo15
+>foo15 : { (x: I): any; (x: PA): any; }
 >x : I
 >I : I
 
 function foo15(x: PA); // no error
->foo15 : typeof foo15
+>foo15 : { (x: I): any; (x: PA): any; }
 >x : PA
 >PA : PA
 
 function foo15(x: any) { }
->foo15 : typeof foo15
+>foo15 : { (x: I): any; (x: PA): any; }
 >x : any
 
 function foo16(x: I);
->foo16 : typeof foo16
+>foo16 : { (x: I): any; (x: PB): any; }
 >x : I
 >I : I
 
 function foo16(x: PB); // no error
->foo16 : typeof foo16
+>foo16 : { (x: I): any; (x: PB): any; }
 >x : PB
 >PB : PB
 
 function foo16(x: any) { }
->foo16 : typeof foo16
+>foo16 : { (x: I): any; (x: PB): any; }
 >x : any
 
 
diff --git a/tests/baselines/reference/objectTypesIdentityWithPrivates2.types b/tests/baselines/reference/objectTypesIdentityWithPrivates2.types
index 2756ce4a327..a29edc75162 100644
--- a/tests/baselines/reference/objectTypesIdentityWithPrivates2.types
+++ b/tests/baselines/reference/objectTypesIdentityWithPrivates2.types
@@ -18,101 +18,101 @@ class D<T> extends C<T> {
 }
 
 function foo1(x: C<string>);
->foo1 : typeof foo1
+>foo1 : { (x: C<string>): any; (x: C<number>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo1(x: C<number>); // ok
->foo1 : typeof foo1
+>foo1 : { (x: C<string>): any; (x: C<number>): any; }
 >x : C<number>
 >C : C<T>
 
 function foo1(x: any) { }
->foo1 : typeof foo1
+>foo1 : { (x: C<string>): any; (x: C<number>): any; }
 >x : any
 
 function foo2(x: D<string>);
->foo2 : typeof foo2
+>foo2 : { (x: D<string>): any; (x: D<number>): any; }
 >x : D<string>
 >D : D<T>
 
 function foo2(x: D<number>); // ok
->foo2 : typeof foo2
+>foo2 : { (x: D<string>): any; (x: D<number>): any; }
 >x : D<number>
 >D : D<T>
 
 function foo2(x: any) { }
->foo2 : typeof foo2
+>foo2 : { (x: D<string>): any; (x: D<number>): any; }
 >x : any
 
 function foo3(x: C<string>);
->foo3 : typeof foo3
+>foo3 : { (x: C<string>): any; (x: D<number>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo3(x: D<number>); // ok
->foo3 : typeof foo3
+>foo3 : { (x: C<string>): any; (x: D<number>): any; }
 >x : D<number>
 >D : D<T>
 
 function foo3(x: any) { }
->foo3 : typeof foo3
+>foo3 : { (x: C<string>): any; (x: D<number>): any; }
 >x : any
 
 function foo4(x: C<number>): number; 
->foo4 : typeof foo4
+>foo4 : { (x: C<number>): number; (x: D<number>): string; }
 >x : C<number>
 >C : C<T>
 
 function foo4(x: D<number>): string; // BUG 831926
->foo4 : typeof foo4
+>foo4 : { (x: C<number>): number; (x: D<number>): string; }
 >x : D<number>
 >D : D<T>
 
 function foo4(x: any): any { }
->foo4 : typeof foo4
+>foo4 : { (x: C<number>): number; (x: D<number>): string; }
 >x : any
 
 var r = foo4(new C<number>());
 >r : number
 >foo4(new C<number>()) : number
->foo4 : typeof foo4
+>foo4 : { (x: C<number>): number; (x: D<number>): string; }
 >new C<number>() : C<number>
 >C : typeof C
 
 var r = foo4(new D<number>());
 >r : number
 >foo4(new D<number>()) : number
->foo4 : typeof foo4
+>foo4 : { (x: C<number>): number; (x: D<number>): string; }
 >new D<number>() : D<number>
 >D : typeof D
 
 function foo5(x: C<number>): number;
->foo5 : typeof foo5
+>foo5 : { (x: C<number>): number; (x: C<number>): string; }
 >x : C<number>
 >C : C<T>
 
 function foo5(x: C<number>): string; // error
->foo5 : typeof foo5
+>foo5 : { (x: C<number>): number; (x: C<number>): string; }
 >x : C<number>
 >C : C<T>
 
 function foo5(x: any): any { }
->foo5 : typeof foo5
+>foo5 : { (x: C<number>): number; (x: C<number>): string; }
 >x : any
 
 function foo6(x: D<number>): number;
->foo6 : typeof foo6
+>foo6 : { (x: D<number>): number; (x: D<number>): string; }
 >x : D<number>
 >D : D<T>
 
 function foo6(x: D<number>): string; // error
->foo6 : typeof foo6
+>foo6 : { (x: D<number>): number; (x: D<number>): string; }
 >x : D<number>
 >D : D<T>
 
 function foo6(x: any): any { }
->foo6 : typeof foo6
+>foo6 : { (x: D<number>): number; (x: D<number>): string; }
 >x : any
 
 
diff --git a/tests/baselines/reference/objectTypesIdentityWithPublics.types b/tests/baselines/reference/objectTypesIdentityWithPublics.types
index a15bc396bea..411fe4fb88e 100644
--- a/tests/baselines/reference/objectTypesIdentityWithPublics.types
+++ b/tests/baselines/reference/objectTypesIdentityWithPublics.types
@@ -41,240 +41,240 @@ var b = { foo: '' };
 >foo : string
 
 function foo1(x: A);
->foo1 : typeof foo1
+>foo1 : { (x: A): any; (x: A): any; }
 >x : A
 >A : A
 
 function foo1(x: A); // error
->foo1 : typeof foo1
+>foo1 : { (x: A): any; (x: A): any; }
 >x : A
 >A : A
 
 function foo1(x: any) { }
->foo1 : typeof foo1
+>foo1 : { (x: A): any; (x: A): any; }
 >x : any
 
 function foo1b(x: B);
->foo1b : typeof foo1b
+>foo1b : { (x: B): any; (x: B): any; }
 >x : B
 >B : B
 
 function foo1b(x: B); // error
->foo1b : typeof foo1b
+>foo1b : { (x: B): any; (x: B): any; }
 >x : B
 >B : B
 
 function foo1b(x: any) { }
->foo1b : typeof foo1b
+>foo1b : { (x: B): any; (x: B): any; }
 >x : any
 
 function foo1c(x: C<string>);
->foo1c : typeof foo1c
+>foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo1c(x: C<string>); // error
->foo1c : typeof foo1c
+>foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo1c(x: any) { }
->foo1c : typeof foo1c
+>foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : any
 
 function foo2(x: I);
->foo2 : typeof foo2
+>foo2 : { (x: I): any; (x: I): any; }
 >x : I
 >I : I
 
 function foo2(x: I); // error
->foo2 : typeof foo2
+>foo2 : { (x: I): any; (x: I): any; }
 >x : I
 >I : I
 
 function foo2(x: any) { }
->foo2 : typeof foo2
+>foo2 : { (x: I): any; (x: I): any; }
 >x : any
 
 function foo3(x: typeof a);
->foo3 : typeof foo3
+>foo3 : { (x: { foo: string; }): any; (x: { foo: string; }): any; }
 >x : { foo: string; }
 >a : { foo: string; }
 
 function foo3(x: typeof a); // error
->foo3 : typeof foo3
+>foo3 : { (x: { foo: string; }): any; (x: { foo: string; }): any; }
 >x : { foo: string; }
 >a : { foo: string; }
 
 function foo3(x: any) { }
->foo3 : typeof foo3
+>foo3 : { (x: { foo: string; }): any; (x: { foo: string; }): any; }
 >x : any
 
 function foo4(x: typeof b);
->foo4 : typeof foo4
+>foo4 : { (x: { foo: string; }): any; (x: { foo: string; }): any; }
 >x : { foo: string; }
 >b : { foo: string; }
 
 function foo4(x: typeof b); // error
->foo4 : typeof foo4
+>foo4 : { (x: { foo: string; }): any; (x: { foo: string; }): any; }
 >x : { foo: string; }
 >b : { foo: string; }
 
 function foo4(x: any) { }
->foo4 : typeof foo4
+>foo4 : { (x: { foo: string; }): any; (x: { foo: string; }): any; }
 >x : any
 
 function foo5(x: A);
->foo5 : typeof foo5
+>foo5 : { (x: A): any; (x: B): any; }
 >x : A
 >A : A
 
 function foo5(x: B); // error
->foo5 : typeof foo5
+>foo5 : { (x: A): any; (x: B): any; }
 >x : B
 >B : B
 
 function foo5(x: any) { }
->foo5 : typeof foo5
+>foo5 : { (x: A): any; (x: B): any; }
 >x : any
 
 function foo5b(x: A);
->foo5b : typeof foo5b
+>foo5b : { (x: A): any; (x: C<string>): any; }
 >x : A
 >A : A
 
 function foo5b(x: C<string>); // error
->foo5b : typeof foo5b
+>foo5b : { (x: A): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo5b(x: any) { }
->foo5b : typeof foo5b
+>foo5b : { (x: A): any; (x: C<string>): any; }
 >x : any
 
 function foo6(x: A);
->foo6 : typeof foo6
+>foo6 : { (x: A): any; (x: I): any; }
 >x : A
 >A : A
 
 function foo6(x: I); // error
->foo6 : typeof foo6
+>foo6 : { (x: A): any; (x: I): any; }
 >x : I
 >I : I
 
 function foo6(x: any) { }
->foo6 : typeof foo6
+>foo6 : { (x: A): any; (x: I): any; }
 >x : any
 
 function foo7(x: A);
->foo7 : typeof foo7
+>foo7 : { (x: A): any; (x: { foo: string; }): any; }
 >x : A
 >A : A
 
 function foo7(x: typeof a); // error
->foo7 : typeof foo7
+>foo7 : { (x: A): any; (x: { foo: string; }): any; }
 >x : { foo: string; }
 >a : { foo: string; }
 
 function foo7(x: any) { }
->foo7 : typeof foo7
+>foo7 : { (x: A): any; (x: { foo: string; }): any; }
 >x : any
 
 function foo8(x: B);
->foo8 : typeof foo8
+>foo8 : { (x: B): any; (x: I): any; }
 >x : B
 >B : B
 
 function foo8(x: I); // error
->foo8 : typeof foo8
+>foo8 : { (x: B): any; (x: I): any; }
 >x : I
 >I : I
 
 function foo8(x: any) { }
->foo8 : typeof foo8
+>foo8 : { (x: B): any; (x: I): any; }
 >x : any
 
 function foo9(x: B);
->foo9 : typeof foo9
+>foo9 : { (x: B): any; (x: C<string>): any; }
 >x : B
 >B : B
 
 function foo9(x: C<string>); // error
->foo9 : typeof foo9
+>foo9 : { (x: B): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo9(x: any) { }
->foo9 : typeof foo9
+>foo9 : { (x: B): any; (x: C<string>): any; }
 >x : any
 
 function foo10(x: B);
->foo10 : typeof foo10
+>foo10 : { (x: B): any; (x: { foo: string; }): any; }
 >x : B
 >B : B
 
 function foo10(x: typeof a); // error
->foo10 : typeof foo10
+>foo10 : { (x: B): any; (x: { foo: string; }): any; }
 >x : { foo: string; }
 >a : { foo: string; }
 
 function foo10(x: any) { }
->foo10 : typeof foo10
+>foo10 : { (x: B): any; (x: { foo: string; }): any; }
 >x : any
 
 function foo11(x: B);
->foo11 : typeof foo11
+>foo11 : { (x: B): any; (x: { foo: string; }): any; }
 >x : B
 >B : B
 
 function foo11(x: typeof b); // error
->foo11 : typeof foo11
+>foo11 : { (x: B): any; (x: { foo: string; }): any; }
 >x : { foo: string; }
 >b : { foo: string; }
 
 function foo11(x: any) { }
->foo11 : typeof foo11
+>foo11 : { (x: B): any; (x: { foo: string; }): any; }
 >x : any
 
 function foo12(x: I);
->foo12 : typeof foo12
+>foo12 : { (x: I): any; (x: C<string>): any; }
 >x : I
 >I : I
 
 function foo12(x: C<string>); // error
->foo12 : typeof foo12
+>foo12 : { (x: I): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo12(x: any) { }
->foo12 : typeof foo12
+>foo12 : { (x: I): any; (x: C<string>): any; }
 >x : any
 
 function foo13(x: I);
->foo13 : typeof foo13
+>foo13 : { (x: I): any; (x: { foo: string; }): any; }
 >x : I
 >I : I
 
 function foo13(x: typeof a); // error
->foo13 : typeof foo13
+>foo13 : { (x: I): any; (x: { foo: string; }): any; }
 >x : { foo: string; }
 >a : { foo: string; }
 
 function foo13(x: any) { }
->foo13 : typeof foo13
+>foo13 : { (x: I): any; (x: { foo: string; }): any; }
 >x : any
 
 function foo14(x: I);
->foo14 : typeof foo14
+>foo14 : { (x: I): any; (x: { foo: string; }): any; }
 >x : I
 >I : I
 
 function foo14(x: typeof b); // error
->foo14 : typeof foo14
+>foo14 : { (x: I): any; (x: { foo: string; }): any; }
 >x : { foo: string; }
 >b : { foo: string; }
 
 function foo14(x: any) { }
->foo14 : typeof foo14
+>foo14 : { (x: I): any; (x: { foo: string; }): any; }
 >x : any
 
diff --git a/tests/baselines/reference/objectTypesIdentityWithStringIndexers.types b/tests/baselines/reference/objectTypesIdentityWithStringIndexers.types
index 9488d61a819..83a73646874 100644
--- a/tests/baselines/reference/objectTypesIdentityWithStringIndexers.types
+++ b/tests/baselines/reference/objectTypesIdentityWithStringIndexers.types
@@ -54,325 +54,325 @@ var b: { [x: string]: string; } = { foo: '' };
 >foo : string
 
 function foo1(x: A);
->foo1 : typeof foo1
+>foo1 : { (x: A): any; (x: A): any; }
 >x : A
 >A : A
 
 function foo1(x: A); // error
->foo1 : typeof foo1
+>foo1 : { (x: A): any; (x: A): any; }
 >x : A
 >A : A
 
 function foo1(x: any) { }
->foo1 : typeof foo1
+>foo1 : { (x: A): any; (x: A): any; }
 >x : any
 
 function foo1b(x: B);
->foo1b : typeof foo1b
+>foo1b : { (x: B): any; (x: B): any; }
 >x : B
 >B : B
 
 function foo1b(x: B); // error
->foo1b : typeof foo1b
+>foo1b : { (x: B): any; (x: B): any; }
 >x : B
 >B : B
 
 function foo1b(x: any) { }
->foo1b : typeof foo1b
+>foo1b : { (x: B): any; (x: B): any; }
 >x : any
 
 function foo1c(x: C<string>);
->foo1c : typeof foo1c
+>foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo1c(x: C<string>); // error
->foo1c : typeof foo1c
+>foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo1c(x: any) { }
->foo1c : typeof foo1c
+>foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : any
 
 function foo2(x: I);
->foo2 : typeof foo2
+>foo2 : { (x: I): any; (x: I): any; }
 >x : I
 >I : I
 
 function foo2(x: I); // error
->foo2 : typeof foo2
+>foo2 : { (x: I): any; (x: I): any; }
 >x : I
 >I : I
 
 function foo2(x: any) { }
->foo2 : typeof foo2
+>foo2 : { (x: I): any; (x: I): any; }
 >x : any
 
 function foo3(x: typeof a);
->foo3 : typeof foo3
+>foo3 : { (x: { [x: string]: string; }): any; (x: { [x: string]: string; }): any; }
 >x : { [x: string]: string; }
 >a : { [x: string]: string; }
 
 function foo3(x: typeof a); // error
->foo3 : typeof foo3
+>foo3 : { (x: { [x: string]: string; }): any; (x: { [x: string]: string; }): any; }
 >x : { [x: string]: string; }
 >a : { [x: string]: string; }
 
 function foo3(x: any) { }
->foo3 : typeof foo3
+>foo3 : { (x: { [x: string]: string; }): any; (x: { [x: string]: string; }): any; }
 >x : any
 
 function foo4(x: typeof b);
->foo4 : typeof foo4
+>foo4 : { (x: { [x: string]: string; }): any; (x: { [x: string]: string; }): any; }
 >x : { [x: string]: string; }
 >b : { [x: string]: string; }
 
 function foo4(x: typeof b); // error
->foo4 : typeof foo4
+>foo4 : { (x: { [x: string]: string; }): any; (x: { [x: string]: string; }): any; }
 >x : { [x: string]: string; }
 >b : { [x: string]: string; }
 
 function foo4(x: any) { }
->foo4 : typeof foo4
+>foo4 : { (x: { [x: string]: string; }): any; (x: { [x: string]: string; }): any; }
 >x : any
 
 function foo5(x: A);
->foo5 : typeof foo5
+>foo5 : { (x: A): any; (x: B): any; }
 >x : A
 >A : A
 
 function foo5(x: B); // error
->foo5 : typeof foo5
+>foo5 : { (x: A): any; (x: B): any; }
 >x : B
 >B : B
 
 function foo5(x: any) { }
->foo5 : typeof foo5
+>foo5 : { (x: A): any; (x: B): any; }
 >x : any
 
 function foo5b(x: A);
->foo5b : typeof foo5b
+>foo5b : { (x: A): any; (x: C<string>): any; }
 >x : A
 >A : A
 
 function foo5b(x: C<string>); // error
->foo5b : typeof foo5b
+>foo5b : { (x: A): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo5b(x: any) { }
->foo5b : typeof foo5b
+>foo5b : { (x: A): any; (x: C<string>): any; }
 >x : any
 
 function foo5c(x: A);
->foo5c : typeof foo5c
+>foo5c : { (x: A): any; (x: PA): any; }
 >x : A
 >A : A
 
 function foo5c(x: PA); // error
->foo5c : typeof foo5c
+>foo5c : { (x: A): any; (x: PA): any; }
 >x : PA
 >PA : PA
 
 function foo5c(x: any) { }
->foo5c : typeof foo5c
+>foo5c : { (x: A): any; (x: PA): any; }
 >x : any
 
 function foo5d(x: A);
->foo5d : typeof foo5d
+>foo5d : { (x: A): any; (x: PB): any; }
 >x : A
 >A : A
 
 function foo5d(x: PB); // error
->foo5d : typeof foo5d
+>foo5d : { (x: A): any; (x: PB): any; }
 >x : PB
 >PB : PB
 
 function foo5d(x: any) { }
->foo5d : typeof foo5d
+>foo5d : { (x: A): any; (x: PB): any; }
 >x : any
 
 function foo6(x: A);
->foo6 : typeof foo6
+>foo6 : { (x: A): any; (x: I): any; }
 >x : A
 >A : A
 
 function foo6(x: I); // error
->foo6 : typeof foo6
+>foo6 : { (x: A): any; (x: I): any; }
 >x : I
 >I : I
 
 function foo6(x: any) { }
->foo6 : typeof foo6
+>foo6 : { (x: A): any; (x: I): any; }
 >x : any
 
 function foo7(x: A);
->foo7 : typeof foo7
+>foo7 : { (x: A): any; (x: { [x: string]: string; }): any; }
 >x : A
 >A : A
 
 function foo7(x: typeof a); // error
->foo7 : typeof foo7
+>foo7 : { (x: A): any; (x: { [x: string]: string; }): any; }
 >x : { [x: string]: string; }
 >a : { [x: string]: string; }
 
 function foo7(x: any) { }
->foo7 : typeof foo7
+>foo7 : { (x: A): any; (x: { [x: string]: string; }): any; }
 >x : any
 
 function foo8(x: B);
->foo8 : typeof foo8
+>foo8 : { (x: B): any; (x: I): any; }
 >x : B
 >B : B
 
 function foo8(x: I); // error
->foo8 : typeof foo8
+>foo8 : { (x: B): any; (x: I): any; }
 >x : I
 >I : I
 
 function foo8(x: any) { }
->foo8 : typeof foo8
+>foo8 : { (x: B): any; (x: I): any; }
 >x : any
 
 function foo9(x: B);
->foo9 : typeof foo9
+>foo9 : { (x: B): any; (x: C<string>): any; }
 >x : B
 >B : B
 
 function foo9(x: C<string>); // error
->foo9 : typeof foo9
+>foo9 : { (x: B): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo9(x: any) { }
->foo9 : typeof foo9
+>foo9 : { (x: B): any; (x: C<string>): any; }
 >x : any
 
 function foo10(x: B);
->foo10 : typeof foo10
+>foo10 : { (x: B): any; (x: { [x: string]: string; }): any; }
 >x : B
 >B : B
 
 function foo10(x: typeof a); // error
->foo10 : typeof foo10
+>foo10 : { (x: B): any; (x: { [x: string]: string; }): any; }
 >x : { [x: string]: string; }
 >a : { [x: string]: string; }
 
 function foo10(x: any) { }
->foo10 : typeof foo10
+>foo10 : { (x: B): any; (x: { [x: string]: string; }): any; }
 >x : any
 
 function foo11(x: B);
->foo11 : typeof foo11
+>foo11 : { (x: B): any; (x: { [x: string]: string; }): any; }
 >x : B
 >B : B
 
 function foo11(x: typeof b); // error
->foo11 : typeof foo11
+>foo11 : { (x: B): any; (x: { [x: string]: string; }): any; }
 >x : { [x: string]: string; }
 >b : { [x: string]: string; }
 
 function foo11(x: any) { }
->foo11 : typeof foo11
+>foo11 : { (x: B): any; (x: { [x: string]: string; }): any; }
 >x : any
 
 function foo11b(x: B);
->foo11b : typeof foo11b
+>foo11b : { (x: B): any; (x: PA): any; }
 >x : B
 >B : B
 
 function foo11b(x: PA); // error
->foo11b : typeof foo11b
+>foo11b : { (x: B): any; (x: PA): any; }
 >x : PA
 >PA : PA
 
 function foo11b(x: any) { }
->foo11b : typeof foo11b
+>foo11b : { (x: B): any; (x: PA): any; }
 >x : any
 
 function foo11c(x: B);
->foo11c : typeof foo11c
+>foo11c : { (x: B): any; (x: PB): any; }
 >x : B
 >B : B
 
 function foo11c(x: PB); // error
->foo11c : typeof foo11c
+>foo11c : { (x: B): any; (x: PB): any; }
 >x : PB
 >PB : PB
 
 function foo11c(x: any) { }
->foo11c : typeof foo11c
+>foo11c : { (x: B): any; (x: PB): any; }
 >x : any
 
 function foo12(x: I);
->foo12 : typeof foo12
+>foo12 : { (x: I): any; (x: C<string>): any; }
 >x : I
 >I : I
 
 function foo12(x: C<string>); // error
->foo12 : typeof foo12
+>foo12 : { (x: I): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo12(x: any) { }
->foo12 : typeof foo12
+>foo12 : { (x: I): any; (x: C<string>): any; }
 >x : any
 
 function foo13(x: I);
->foo13 : typeof foo13
+>foo13 : { (x: I): any; (x: { [x: string]: string; }): any; }
 >x : I
 >I : I
 
 function foo13(x: typeof a); // error
->foo13 : typeof foo13
+>foo13 : { (x: I): any; (x: { [x: string]: string; }): any; }
 >x : { [x: string]: string; }
 >a : { [x: string]: string; }
 
 function foo13(x: any) { }
->foo13 : typeof foo13
+>foo13 : { (x: I): any; (x: { [x: string]: string; }): any; }
 >x : any
 
 function foo14(x: I);
->foo14 : typeof foo14
+>foo14 : { (x: I): any; (x: { [x: string]: string; }): any; }
 >x : I
 >I : I
 
 function foo14(x: typeof b); // error
->foo14 : typeof foo14
+>foo14 : { (x: I): any; (x: { [x: string]: string; }): any; }
 >x : { [x: string]: string; }
 >b : { [x: string]: string; }
 
 function foo14(x: any) { }
->foo14 : typeof foo14
+>foo14 : { (x: I): any; (x: { [x: string]: string; }): any; }
 >x : any
 
 function foo15(x: I);
->foo15 : typeof foo15
+>foo15 : { (x: I): any; (x: PA): any; }
 >x : I
 >I : I
 
 function foo15(x: PA); // error
->foo15 : typeof foo15
+>foo15 : { (x: I): any; (x: PA): any; }
 >x : PA
 >PA : PA
 
 function foo15(x: any) { }
->foo15 : typeof foo15
+>foo15 : { (x: I): any; (x: PA): any; }
 >x : any
 
 function foo16(x: I);
->foo16 : typeof foo16
+>foo16 : { (x: I): any; (x: PB): any; }
 >x : I
 >I : I
 
 function foo16(x: PB); // error
->foo16 : typeof foo16
+>foo16 : { (x: I): any; (x: PB): any; }
 >x : PB
 >PB : PB
 
 function foo16(x: any) { }
->foo16 : typeof foo16
+>foo16 : { (x: I): any; (x: PB): any; }
 >x : any
 
 
diff --git a/tests/baselines/reference/objectTypesIdentityWithStringIndexers2.types b/tests/baselines/reference/objectTypesIdentityWithStringIndexers2.types
index 6a9d54b1062..c621be1e26b 100644
--- a/tests/baselines/reference/objectTypesIdentityWithStringIndexers2.types
+++ b/tests/baselines/reference/objectTypesIdentityWithStringIndexers2.types
@@ -70,328 +70,328 @@ var b: { [x: string]: Derived; } = { foo: <Derived>null };
 >Derived : Derived
 
 function foo1(x: A);
->foo1 : typeof foo1
+>foo1 : { (x: A): any; (x: A): any; }
 >x : A
 >A : A
 
 function foo1(x: A); // error
->foo1 : typeof foo1
+>foo1 : { (x: A): any; (x: A): any; }
 >x : A
 >A : A
 
 function foo1(x: any) { }
->foo1 : typeof foo1
+>foo1 : { (x: A): any; (x: A): any; }
 >x : any
 
 function foo1b(x: B);
->foo1b : typeof foo1b
+>foo1b : { (x: B): any; (x: B): any; }
 >x : B
 >B : B
 
 function foo1b(x: B); // error
->foo1b : typeof foo1b
+>foo1b : { (x: B): any; (x: B): any; }
 >x : B
 >B : B
 
 function foo1b(x: any) { }
->foo1b : typeof foo1b
+>foo1b : { (x: B): any; (x: B): any; }
 >x : any
 
 function foo1c(x: C<string>);
->foo1c : typeof foo1c
+>foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo1c(x: C<string>); // error
->foo1c : typeof foo1c
+>foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : C<string>
 >C : C<T>
 
 function foo1c(x: any) { }
->foo1c : typeof foo1c
+>foo1c : { (x: C<string>): any; (x: C<string>): any; }
 >x : any
 
 function foo2(x: I);
->foo2 : typeof foo2
+>foo2 : { (x: I): any; (x: I): any; }
 >x : I
 >I : I
 
 function foo2(x: I); // error
->foo2 : typeof foo2
+>foo2 : { (x: I): any; (x: I): any; }
 >x : I
 >I : I
 
 function foo2(x: any) { }
->foo2 : typeof foo2
+>foo2 : { (x: I): any; (x: I): any; }
 >x : any
 
 function foo3(x: typeof a);
->foo3 : typeof foo3
+>foo3 : { (x: { [x: string]: Base; }): any; (x: { [x: string]: Base; }): any; }
 >x : { [x: string]: Base; }
 >a : { [x: string]: Base; }
 
 function foo3(x: typeof a); // error
->foo3 : typeof foo3
+>foo3 : { (x: { [x: string]: Base; }): any; (x: { [x: string]: Base; }): any; }
 >x : { [x: string]: Base; }
 >a : { [x: string]: Base; }
 
 function foo3(x: any) { }
->foo3 : typeof foo3
+>foo3 : { (x: { [x: string]: Base; }): any; (x: { [x: string]: Base; }): any; }
 >x : any
 
 function foo4(x: typeof b);
->foo4 : typeof foo4
+>foo4 : { (x: { [x: string]: Derived; }): any; (x: { [x: string]: Derived; }): any; }
 >x : { [x: string]: Derived; }
 >b : { [x: string]: Derived; }
 
 function foo4(x: typeof b); // error
->foo4 : typeof foo4
+>foo4 : { (x: { [x: string]: Derived; }): any; (x: { [x: string]: Derived; }): any; }
 >x : { [x: string]: Derived; }
 >b : { [x: string]: Derived; }
 
 function foo4(x: any) { }
->foo4 : typeof foo4
+>foo4 : { (x: { [x: string]: Derived; }): any; (x: { [x: string]: Derived; }): any; }
 >x : any
 
 function foo5(x: A);
->foo5 : typeof foo5
+>foo5 : { (x: A): any; (x: B): any; }
 >x : A
 >A : A
 
 function foo5(x: B); // ok
->foo5 : typeof foo5
+>foo5 : { (x: A): any; (x: B): any; }
 >x : B
 >B : B
 
 function foo5(x: any) { }
->foo5 : typeof foo5
+>foo5 : { (x: A): any; (x: B): any; }
 >x : any
 
 function foo5b(x: A);
->foo5b : typeof foo5b
+>foo5b : { (x: A): any; (x: C<Derived>): any; }
 >x : A
 >A : A
 
 function foo5b(x: C<Derived>); // ok
->foo5b : typeof foo5b
+>foo5b : { (x: A): any; (x: C<Derived>): any; }
 >x : C<Derived>
 >C : C<T>
 >Derived : Derived
 
 function foo5b(x: any) { }
->foo5b : typeof foo5b
+>foo5b : { (x: A): any; (x: C<Derived>): any; }
 >x : any
 
 function foo5c(x: A);
->foo5c : typeof foo5c
+>foo5c : { (x: A): any; (x: PA): any; }
 >x : A
 >A : A
 
 function foo5c(x: PA); // error
->foo5c : typeof foo5c
+>foo5c : { (x: A): any; (x: PA): any; }
 >x : PA
 >PA : PA
 
 function foo5c(x: any) { }
->foo5c : typeof foo5c
+>foo5c : { (x: A): any; (x: PA): any; }
 >x : any
 
 function foo5d(x: A);
->foo5d : typeof foo5d
+>foo5d : { (x: A): any; (x: PB): any; }
 >x : A
 >A : A
 
 function foo5d(x: PB); // ok
->foo5d : typeof foo5d
+>foo5d : { (x: A): any; (x: PB): any; }
 >x : PB
 >PB : PB
 
 function foo5d(x: any) { }
->foo5d : typeof foo5d
+>foo5d : { (x: A): any; (x: PB): any; }
 >x : any
 
 function foo6(x: A);
->foo6 : typeof foo6
+>foo6 : { (x: A): any; (x: I): any; }
 >x : A
 >A : A
 
 function foo6(x: I); // ok
->foo6 : typeof foo6
+>foo6 : { (x: A): any; (x: I): any; }
 >x : I
 >I : I
 
 function foo6(x: any) { }
->foo6 : typeof foo6
+>foo6 : { (x: A): any; (x: I): any; }
 >x : any
 
 function foo7(x: A);
->foo7 : typeof foo7
+>foo7 : { (x: A): any; (x: { [x: string]: Base; }): any; }
 >x : A
 >A : A
 
 function foo7(x: typeof a); // error
->foo7 : typeof foo7
+>foo7 : { (x: A): any; (x: { [x: string]: Base; }): any; }
 >x : { [x: string]: Base; }
 >a : { [x: string]: Base; }
 
 function foo7(x: any) { }
->foo7 : typeof foo7
+>foo7 : { (x: A): any; (x: { [x: string]: Base; }): any; }
 >x : any
 
 function foo8(x: B);
->foo8 : typeof foo8
+>foo8 : { (x: B): any; (x: I): any; }
 >x : B
 >B : B
 
 function foo8(x: I); // error
->foo8 : typeof foo8
+>foo8 : { (x: B): any; (x: I): any; }
 >x : I
 >I : I
 
 function foo8(x: any) { }
->foo8 : typeof foo8
+>foo8 : { (x: B): any; (x: I): any; }
 >x : any
 
 function foo9(x: B);
->foo9 : typeof foo9
+>foo9 : { (x: B): any; (x: C<Base>): any; }
 >x : B
 >B : B
 
 function foo9(x: C<Base>); // ok
->foo9 : typeof foo9
+>foo9 : { (x: B): any; (x: C<Base>): any; }
 >x : C<Base>
 >C : C<T>
 >Base : Base
 
 function foo9(x: any) { }
->foo9 : typeof foo9
+>foo9 : { (x: B): any; (x: C<Base>): any; }
 >x : any
 
 function foo10(x: B);
->foo10 : typeof foo10
+>foo10 : { (x: B): any; (x: { [x: string]: Base; }): any; }
 >x : B
 >B : B
 
 function foo10(x: typeof a); // ok
->foo10 : typeof foo10
+>foo10 : { (x: B): any; (x: { [x: string]: Base; }): any; }
 >x : { [x: string]: Base; }
 >a : { [x: string]: Base; }
 
 function foo10(x: any) { }
->foo10 : typeof foo10
+>foo10 : { (x: B): any; (x: { [x: string]: Base; }): any; }
 >x : any
 
 function foo11(x: B);
->foo11 : typeof foo11
+>foo11 : { (x: B): any; (x: { [x: string]: Derived; }): any; }
 >x : B
 >B : B
 
 function foo11(x: typeof b); // error
->foo11 : typeof foo11
+>foo11 : { (x: B): any; (x: { [x: string]: Derived; }): any; }
 >x : { [x: string]: Derived; }
 >b : { [x: string]: Derived; }
 
 function foo11(x: any) { }
->foo11 : typeof foo11
+>foo11 : { (x: B): any; (x: { [x: string]: Derived; }): any; }
 >x : any
 
 function foo11b(x: B);
->foo11b : typeof foo11b
+>foo11b : { (x: B): any; (x: PA): any; }
 >x : B
 >B : B
 
 function foo11b(x: PA); // ok
->foo11b : typeof foo11b
+>foo11b : { (x: B): any; (x: PA): any; }
 >x : PA
 >PA : PA
 
 function foo11b(x: any) { }
->foo11b : typeof foo11b
+>foo11b : { (x: B): any; (x: PA): any; }
 >x : any
 
 function foo11c(x: B);
->foo11c : typeof foo11c
+>foo11c : { (x: B): any; (x: PB): any; }
 >x : B
 >B : B
 
 function foo11c(x: PB); // error
->foo11c : typeof foo11c
+>foo11c : { (x: B): any; (x: PB): any; }
 >x : PB
 >PB : PB
 
 function foo11c(x: any) { }
->foo11c : typeof foo11c
+>foo11c : { (x: B): any; (x: PB): any; }
 >x : any
 
 function foo12(x: I);
->foo12 : typeof foo12
+>foo12 : { (x: I): any; (x: C<Derived>): any; }
 >x : I
 >I : I
 
 function foo12(x: C<Derived>); // error
->foo12 : typeof foo12
+>foo12 : { (x: I): any; (x: C<Derived>): any; }
 >x : C<Derived>
 >C : C<T>
 >Derived : Derived
 
 function foo12(x: any) { }
->foo12 : typeof foo12
+>foo12 : { (x: I): any; (x: C<Derived>): any; }
 >x : any
 
 function foo13(x: I);
->foo13 : typeof foo13
+>foo13 : { (x: I): any; (x: { [x: string]: Base; }): any; }
 >x : I
 >I : I
 
 function foo13(x: typeof a); // ok
->foo13 : typeof foo13
+>foo13 : { (x: I): any; (x: { [x: string]: Base; }): any; }
 >x : { [x: string]: Base; }
 >a : { [x: string]: Base; }
 
 function foo13(x: any) { }
->foo13 : typeof foo13
+>foo13 : { (x: I): any; (x: { [x: string]: Base; }): any; }
 >x : any
 
 function foo14(x: I);
->foo14 : typeof foo14
+>foo14 : { (x: I): any; (x: { [x: string]: Derived; }): any; }
 >x : I
 >I : I
 
 function foo14(x: typeof b); // error
->foo14 : typeof foo14
+>foo14 : { (x: I): any; (x: { [x: string]: Derived; }): any; }
 >x : { [x: string]: Derived; }
 >b : { [x: string]: Derived; }
 
 function foo14(x: any) { }
->foo14 : typeof foo14
+>foo14 : { (x: I): any; (x: { [x: string]: Derived; }): any; }
 >x : any
 
 function foo15(x: I);
->foo15 : typeof foo15
+>foo15 : { (x: I): any; (x: PA): any; }
 >x : I
 >I : I
 
 function foo15(x: PA); // ok
->foo15 : typeof foo15
+>foo15 : { (x: I): any; (x: PA): any; }
 >x : PA
 >PA : PA
 
 function foo15(x: any) { }
->foo15 : typeof foo15
+>foo15 : { (x: I): any; (x: PA): any; }
 >x : any
 
 function foo16(x: I);
->foo16 : typeof foo16
+>foo16 : { (x: I): any; (x: PB): any; }
 >x : I
 >I : I
 
 function foo16(x: PB); // error
->foo16 : typeof foo16
+>foo16 : { (x: I): any; (x: PB): any; }
 >x : PB
 >PB : PB
 
 function foo16(x: any) { }
->foo16 : typeof foo16
+>foo16 : { (x: I): any; (x: PB): any; }
 >x : any
 
 
diff --git a/tests/baselines/reference/optionalAccessorsInInterface1.types b/tests/baselines/reference/optionalAccessorsInInterface1.types
index ab541bd0400..c426cdba178 100644
--- a/tests/baselines/reference/optionalAccessorsInInterface1.types
+++ b/tests/baselines/reference/optionalAccessorsInInterface1.types
@@ -11,7 +11,7 @@ interface MyPropertyDescriptor {
 }
 
 declare function defineMyProperty(o: any, p: string, attributes: MyPropertyDescriptor): any;
->defineMyProperty : typeof defineMyProperty
+>defineMyProperty : (o: any, p: string, attributes: MyPropertyDescriptor) => any
 >o : any
 >p : string
 >attributes : MyPropertyDescriptor
@@ -19,7 +19,7 @@ declare function defineMyProperty(o: any, p: string, attributes: MyPropertyDescr
 
 defineMyProperty({}, "name", { get: function () { return 5; } });
 >defineMyProperty({}, "name", { get: function () { return 5; } }) : any
->defineMyProperty : typeof defineMyProperty
+>defineMyProperty : (o: any, p: string, attributes: MyPropertyDescriptor) => any
 >{} : {}
 >{ get: function () { return 5; } } : { get: () => number; }
 >get : () => number
@@ -37,7 +37,7 @@ interface MyPropertyDescriptor2 {
 }
 
 declare function defineMyProperty2(o: any, p: string, attributes: MyPropertyDescriptor2): any;
->defineMyProperty2 : typeof defineMyProperty2
+>defineMyProperty2 : (o: any, p: string, attributes: MyPropertyDescriptor2) => any
 >o : any
 >p : string
 >attributes : MyPropertyDescriptor2
@@ -45,7 +45,7 @@ declare function defineMyProperty2(o: any, p: string, attributes: MyPropertyDesc
 
 defineMyProperty2({}, "name", { get: function () { return 5; } });
 >defineMyProperty2({}, "name", { get: function () { return 5; } }) : any
->defineMyProperty2 : typeof defineMyProperty2
+>defineMyProperty2 : (o: any, p: string, attributes: MyPropertyDescriptor2) => any
 >{} : {}
 >{ get: function () { return 5; } } : { get: () => number; }
 >get : () => number
diff --git a/tests/baselines/reference/optionalParamReferencingOtherParams1.types b/tests/baselines/reference/optionalParamReferencingOtherParams1.types
index 8170b3e95f1..3a62d51759c 100644
--- a/tests/baselines/reference/optionalParamReferencingOtherParams1.types
+++ b/tests/baselines/reference/optionalParamReferencingOtherParams1.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/optionalParamReferencingOtherParams1.ts ===
 function strange(x: number, y = x * 1, z = x + y) {
->strange : typeof strange
+>strange : (x: number, y?: number, z?: number) => number
 >x : number
 >y : number
 >x * 1 : number
diff --git a/tests/baselines/reference/overload2.types b/tests/baselines/reference/overload2.types
index b52ff0579ca..05a9533b2d2 100644
--- a/tests/baselines/reference/overload2.types
+++ b/tests/baselines/reference/overload2.types
@@ -6,18 +6,18 @@ enum B { }
 >B : B
     
 function foo(a: A);
->foo : typeof foo
+>foo : { (a: A): any; (b: B): any; }
 >a : A
 >A : A
 
 function foo(b: B);
->foo : typeof foo
+>foo : { (a: A): any; (b: B): any; }
 >b : B
 >B : B
 
 // should be ok
 function foo(x: number) { 
->foo : typeof foo
+>foo : { (a: A): any; (b: B): any; }
 >x : number
 }
 
@@ -25,18 +25,18 @@ class C { }
 >C : C
 
 function foo1(a: A);
->foo1 : typeof foo1
+>foo1 : { (a: A): any; (c: C): any; }
 >a : A
 >A : A
 
 function foo1(c: C);
->foo1 : typeof foo1
+>foo1 : { (a: A): any; (c: C): any; }
 >c : C
 >C : C
 
 // should be ok
 function foo1(x: number) { 
->foo1 : typeof foo1
+>foo1 : { (a: A): any; (c: C): any; }
 >x : number
 }
 
diff --git a/tests/baselines/reference/overloadCrash.types b/tests/baselines/reference/overloadCrash.types
index 3a93fcb6d53..88c2b8c79c0 100644
--- a/tests/baselines/reference/overloadCrash.types
+++ b/tests/baselines/reference/overloadCrash.types
@@ -17,12 +17,12 @@ interface I3 {a:number; b:number; c:number; d:number;};
 >d : number
 
 declare function foo(...n:I1[]);
->foo : typeof foo
+>foo : { (...n: I1[]): any; (n1: I2, n3: I2): any; }
 >n : I1[]
 >I1 : I1
 
 declare function foo(n1:I2, n3:I2);
->foo : typeof foo
+>foo : { (...n: I1[]): any; (n1: I2, n3: I2): any; }
 >n1 : I2
 >I2 : I2
 >n3 : I2
@@ -34,7 +34,7 @@ var i3:I3;
 
 foo(i3, i3); // should not crash the compiler :)
 >foo(i3, i3) : any
->foo : typeof foo
+>foo : { (...n: I1[]): any; (n1: I2, n3: I2): any; }
 >i3 : I3
 >i3 : I3
 
diff --git a/tests/baselines/reference/overloadGenericFunctionWithRestArgs.types b/tests/baselines/reference/overloadGenericFunctionWithRestArgs.types
index 5ea89a59e9b..17ecdeac503 100644
--- a/tests/baselines/reference/overloadGenericFunctionWithRestArgs.types
+++ b/tests/baselines/reference/overloadGenericFunctionWithRestArgs.types
@@ -17,7 +17,7 @@ class A<U>{
 >U : U
 }
 function Choice<T>(...v_args: T[]): A<T>;
->Choice : typeof Choice
+>Choice : <T>(...v_args: T[]) => A<T>
 >T : T
 >v_args : T[]
 >T : T
@@ -25,7 +25,7 @@ function Choice<T>(...v_args: T[]): A<T>;
 >T : T
 
 function Choice<T>(...v_args: T[]): A<T> {
->Choice : typeof Choice
+>Choice : <T>(...v_args: T[]) => A<T>
 >T : T
 >v_args : T[]
 >T : T
diff --git a/tests/baselines/reference/overloadOnConstConstraintChecks2.types b/tests/baselines/reference/overloadOnConstConstraintChecks2.types
index d4a62b4e9a7..c5af206c6da 100644
--- a/tests/baselines/reference/overloadOnConstConstraintChecks2.types
+++ b/tests/baselines/reference/overloadOnConstConstraintChecks2.types
@@ -14,22 +14,22 @@ class C extends A {
 >foo : () => void
 }
 function foo(name: 'hi'): B;
->foo : typeof foo
+>foo : { (name: 'hi'): B; (name: 'bye'): C; (name: string): A; }
 >name : 'hi'
 >B : B
 
 function foo(name: 'bye'): C;
->foo : typeof foo
+>foo : { (name: 'hi'): B; (name: 'bye'): C; (name: string): A; }
 >name : 'bye'
 >C : C
 
 function foo(name: string): A;
->foo : typeof foo
+>foo : { (name: 'hi'): B; (name: 'bye'): C; (name: string): A; }
 >name : string
 >A : A
 
 function foo(name: any): A {
->foo : typeof foo
+>foo : { (name: 'hi'): B; (name: 'bye'): C; (name: string): A; }
 >name : any
 >A : A
 
diff --git a/tests/baselines/reference/overloadOnConstConstraintChecks3.types b/tests/baselines/reference/overloadOnConstConstraintChecks3.types
index e3c2ead8606..adc41ff235c 100644
--- a/tests/baselines/reference/overloadOnConstConstraintChecks3.types
+++ b/tests/baselines/reference/overloadOnConstConstraintChecks3.types
@@ -15,22 +15,22 @@ class C extends A {
 >foo : () => void
 }
 function foo(name: 'hi'): B;
->foo : typeof foo
+>foo : { (name: 'hi'): B; (name: 'bye'): C; (name: string): A; }
 >name : 'hi'
 >B : B
 
 function foo(name: 'bye'): C;
->foo : typeof foo
+>foo : { (name: 'hi'): B; (name: 'bye'): C; (name: string): A; }
 >name : 'bye'
 >C : C
 
 function foo(name: string): A;
->foo : typeof foo
+>foo : { (name: 'hi'): B; (name: 'bye'): C; (name: string): A; }
 >name : string
 >A : A
 
 function foo(name: any): A {
->foo : typeof foo
+>foo : { (name: 'hi'): B; (name: 'bye'): C; (name: string): A; }
 >name : any
 >A : A
 
diff --git a/tests/baselines/reference/overloadOnGenericClassAndNonGenericClass.types b/tests/baselines/reference/overloadOnGenericClassAndNonGenericClass.types
index c69b06e5c1c..c0d0533a533 100644
--- a/tests/baselines/reference/overloadOnGenericClassAndNonGenericClass.types
+++ b/tests/baselines/reference/overloadOnGenericClassAndNonGenericClass.types
@@ -26,13 +26,13 @@ class X2 { x: string; }
 >x : string
 
 function f(a: X1): A;
->f : typeof f
+>f : { (a: X1): A; <T>(a: X<T>): B; }
 >a : X1
 >X1 : X1
 >A : A
 
 function f<T>(a: X<T>): B;
->f : typeof f
+>f : { (a: X1): A; <T>(a: X<T>): B; }
 >T : T
 >a : X<T>
 >X : X<T>
@@ -40,7 +40,7 @@ function f<T>(a: X<T>): B;
 >B : B
 
 function f(a): any {
->f : typeof f
+>f : { (a: X1): A; <T>(a: X<T>): B; }
 >a : any
 }
 
@@ -51,7 +51,7 @@ var xs: X<string>;
 var t3 = f(xs);
 >t3 : A
 >f(xs) : A
->f : typeof f
+>f : { (a: X1): A; <T>(a: X<T>): B; }
 >xs : X<string>
 
 var t3: A; // should not error
diff --git a/tests/baselines/reference/overloadResolutionOverNonCTLambdas.types b/tests/baselines/reference/overloadResolutionOverNonCTLambdas.types
index 1936ac54b53..6e129400736 100644
--- a/tests/baselines/reference/overloadResolutionOverNonCTLambdas.types
+++ b/tests/baselines/reference/overloadResolutionOverNonCTLambdas.types
@@ -8,7 +8,7 @@ module Bugs {
   
   // replace(searchValue: RegExp, replaceValue: (substring: string, ...args: any[]) => string): string;
   function bug2(message:string, ...args:any[]):string {
->bug2 : typeof bug2
+>bug2 : (message: string, ...args: any[]) => string
 >message : string
 >args : any[]
 
@@ -50,25 +50,25 @@ module Bugs {
 }
 
 function bug3(f:(x:string)=>string) { return f("s") }
->bug3 : typeof bug3
+>bug3 : (f: (x: string) => string) => string
 >f : (x: string) => string
 >x : string
 >f("s") : string
 >f : (x: string) => string
 
 function fprime(x:string):string { return x; }
->fprime : typeof fprime
+>fprime : (x: string) => string
 >x : string
 >x : string
 
 bug3(fprime);
 >bug3(fprime) : string
->bug3 : typeof bug3
->fprime : typeof fprime
+>bug3 : (f: (x: string) => string) => string
+>fprime : (x: string) => string
 
 bug3(function(x:string):string { return x; });
 >bug3(function(x:string):string { return x; }) : string
->bug3 : typeof bug3
+>bug3 : (f: (x: string) => string) => string
 >function(x:string):string { return x; } : (x: string) => string
 >x : string
 >x : string
diff --git a/tests/baselines/reference/overloadResolutionOverNonCTObjectLit.types b/tests/baselines/reference/overloadResolutionOverNonCTObjectLit.types
index 0a13b0084c1..6bc491fd157 100644
--- a/tests/baselines/reference/overloadResolutionOverNonCTObjectLit.types
+++ b/tests/baselines/reference/overloadResolutionOverNonCTObjectLit.types
@@ -32,7 +32,7 @@ module Bugs {
                 }
                 
                 function bug3() {
->bug3 : typeof bug3
+>bug3 : () => void
 
                                 var tokens:IToken[]= [];
 >tokens : IToken[]
diff --git a/tests/baselines/reference/overloadReturnTypes.types b/tests/baselines/reference/overloadReturnTypes.types
index 125bca016d4..1823c752ae7 100644
--- a/tests/baselines/reference/overloadReturnTypes.types
+++ b/tests/baselines/reference/overloadReturnTypes.types
@@ -3,22 +3,22 @@ class Accessor {}
 >Accessor : Accessor
 
 function attr(name: string): string;
->attr : typeof attr
+>attr : { (name: string): string; (name: string, value: string): Accessor; (map: any): Accessor; }
 >name : string
 
 function attr(name: string, value: string): Accessor;
->attr : typeof attr
+>attr : { (name: string): string; (name: string, value: string): Accessor; (map: any): Accessor; }
 >name : string
 >value : string
 >Accessor : Accessor
 
 function attr(map: any): Accessor;
->attr : typeof attr
+>attr : { (name: string): string; (name: string, value: string): Accessor; (map: any): Accessor; }
 >map : any
 >Accessor : Accessor
 
 function attr(nameOrMap: any, value?: string): any {
->attr : typeof attr
+>attr : { (name: string): string; (name: string, value: string): Accessor; (map: any): Accessor; }
 >nameOrMap : any
 >value : string
 
diff --git a/tests/baselines/reference/overloadWithCallbacksWithDifferingOptionalityOnArgs.types b/tests/baselines/reference/overloadWithCallbacksWithDifferingOptionalityOnArgs.types
index dec652bc677..2ed804ad012 100644
--- a/tests/baselines/reference/overloadWithCallbacksWithDifferingOptionalityOnArgs.types
+++ b/tests/baselines/reference/overloadWithCallbacksWithDifferingOptionalityOnArgs.types
@@ -1,27 +1,27 @@
 === tests/cases/compiler/overloadWithCallbacksWithDifferingOptionalityOnArgs.ts ===
 function x2(callback: (x?: number) => number);
->x2 : typeof x2
+>x2 : { (callback: (x?: number) => number): any; (callback: (x: string) => number): any; }
 >callback : (x?: number) => number
 >x : number
 
 function x2(callback: (x: string) => number);
->x2 : typeof x2
+>x2 : { (callback: (x?: number) => number): any; (callback: (x: string) => number): any; }
 >callback : (x: string) => number
 >x : string
 
 function x2(callback: (x: any) => number) { }
->x2 : typeof x2
+>x2 : { (callback: (x?: number) => number): any; (callback: (x: string) => number): any; }
 >callback : (x: any) => number
 >x : any
 
 x2(() => 1);
 >x2(() => 1) : any
->x2 : typeof x2
+>x2 : { (callback: (x?: number) => number): any; (callback: (x: string) => number): any; }
 >() => 1 : () => number
 
 x2((x) => 1 );
 >x2((x) => 1 ) : any
->x2 : typeof x2
+>x2 : { (callback: (x?: number) => number): any; (callback: (x: string) => number): any; }
 >(x) => 1 : (x: number) => number
 >x : number
 
diff --git a/tests/baselines/reference/overloadsAndTypeArgumentArity.types b/tests/baselines/reference/overloadsAndTypeArgumentArity.types
index b7ac883b837..1b76b8e13fe 100644
--- a/tests/baselines/reference/overloadsAndTypeArgumentArity.types
+++ b/tests/baselines/reference/overloadsAndTypeArgumentArity.types
@@ -1,21 +1,21 @@
 === tests/cases/compiler/overloadsAndTypeArgumentArity.ts ===
 declare function Callbacks(flags?: string): void;
->Callbacks : typeof Callbacks
+>Callbacks : { (flags?: string): void; <T>(flags?: string): void; <T1, T2>(flags?: string): void; <T1, T2, T3>(flags?: string): void; }
 >flags : string
 
 declare function Callbacks<T>(flags?: string): void;
->Callbacks : typeof Callbacks
+>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 : typeof Callbacks
+>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 : typeof Callbacks
+>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
@@ -23,9 +23,9 @@ declare function Callbacks<T1, T2, T3>(flags?: string): void;
 
 Callbacks<number, string, boolean>('s'); // no error
 >Callbacks<number, string, boolean>('s') : void
->Callbacks : typeof Callbacks
+>Callbacks : { (flags?: string): void; <T>(flags?: string): void; <T1, T2>(flags?: string): void; <T1, T2, T3>(flags?: string): void; }
 
 new Callbacks<number, string, boolean>('s'); // no error
 >new Callbacks<number, string, boolean>('s') : any
->Callbacks : typeof Callbacks
+>Callbacks : { (flags?: string): void; <T>(flags?: string): void; <T1, T2>(flags?: string): void; <T1, T2, T3>(flags?: string): void; }
 
diff --git a/tests/baselines/reference/parametersWithNoAnnotationAreAny.types b/tests/baselines/reference/parametersWithNoAnnotationAreAny.types
index 791ab04550e..9629d06c114 100644
--- a/tests/baselines/reference/parametersWithNoAnnotationAreAny.types
+++ b/tests/baselines/reference/parametersWithNoAnnotationAreAny.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/types/objectTypeLiteral/callSignatures/parametersWithNoAnnotationAreAny.ts ===
 function foo(x) { return x; }
->foo : typeof foo
+>foo : (x: any) => any
 >x : any
 >x : any
 
diff --git a/tests/baselines/reference/parserFunctionDeclaration1.d.types b/tests/baselines/reference/parserFunctionDeclaration1.d.types
index 732188e3e8b..cb62ab01c90 100644
--- a/tests/baselines/reference/parserFunctionDeclaration1.d.types
+++ b/tests/baselines/reference/parserFunctionDeclaration1.d.types
@@ -1,4 +1,4 @@
 === tests/cases/conformance/parser/ecmascript5/FunctionDeclarations/parserFunctionDeclaration1.d.ts ===
 declare function F();
->F : typeof F
+>F : () => any
 
diff --git a/tests/baselines/reference/parserFunctionDeclaration5.types b/tests/baselines/reference/parserFunctionDeclaration5.types
index 2d48c8f5d1a..a3cf71336ea 100644
--- a/tests/baselines/reference/parserFunctionDeclaration5.types
+++ b/tests/baselines/reference/parserFunctionDeclaration5.types
@@ -1,7 +1,7 @@
 === tests/cases/conformance/parser/ecmascript5/FunctionDeclarations/parserFunctionDeclaration5.ts ===
 function foo();
->foo : typeof foo
+>foo : () => any
 
 function foo() { }
->foo : typeof foo
+>foo : () => any
 
diff --git a/tests/baselines/reference/parserFunctionDeclaration8.types b/tests/baselines/reference/parserFunctionDeclaration8.types
index 15a8721932d..ebb8ff8d409 100644
--- a/tests/baselines/reference/parserFunctionDeclaration8.types
+++ b/tests/baselines/reference/parserFunctionDeclaration8.types
@@ -3,5 +3,5 @@ declare module M {
 >M : typeof M
 
    function foo();
->foo : typeof foo
+>foo : () => any
 }
diff --git a/tests/baselines/reference/parserModuleDeclaration11.types b/tests/baselines/reference/parserModuleDeclaration11.types
index 2bb5171e96a..bd66d638ddf 100644
--- a/tests/baselines/reference/parserModuleDeclaration11.types
+++ b/tests/baselines/reference/parserModuleDeclaration11.types
@@ -6,14 +6,14 @@ declare module string {
 >X : X
 
     export function foo(s: string);
->foo : typeof foo
+>foo : (s: string) => any
 >s : string
 }
 string.foo("abc");
 >string.foo("abc") : any
->string.foo : typeof string.foo
+>string.foo : (s: string) => any
 >string : typeof string
->foo : typeof string.foo
+>foo : (s: string) => any
 
 var x: string.X;
 >x : string.X
diff --git a/tests/baselines/reference/parserReturnStatement3.types b/tests/baselines/reference/parserReturnStatement3.types
index 28b06c922ab..6484050efee 100644
--- a/tests/baselines/reference/parserReturnStatement3.types
+++ b/tests/baselines/reference/parserReturnStatement3.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/parser/ecmascript5/Statements/ReturnStatements/parserReturnStatement3.ts ===
 function f() {
->f : typeof f
+>f : () => void
 
    return;
 }
diff --git a/tests/baselines/reference/parserUnicodeWhitespaceCharacter1.types b/tests/baselines/reference/parserUnicodeWhitespaceCharacter1.types
index fed538e327e..4fd487230b2 100644
--- a/tests/baselines/reference/parserUnicodeWhitespaceCharacter1.types
+++ b/tests/baselines/reference/parserUnicodeWhitespaceCharacter1.types
@@ -1,4 +1,4 @@
 === tests/cases/conformance/parser/ecmascript5/parserUnicodeWhitespaceCharacter1.ts ===
 function foo(){　}
->foo : typeof foo
+>foo : () => void
 
diff --git a/tests/baselines/reference/partiallyAmbientClodule.types b/tests/baselines/reference/partiallyAmbientClodule.types
index c0cd877d05f..40307f426d0 100644
--- a/tests/baselines/reference/partiallyAmbientClodule.types
+++ b/tests/baselines/reference/partiallyAmbientClodule.types
@@ -3,7 +3,7 @@ declare module foo {
 >foo : typeof foo
 
     export function x(): any;
->x : typeof x
+>x : () => any
 }
 class foo { } // Legal, because module is ambient
 >foo : foo
diff --git a/tests/baselines/reference/partiallyAmbientFundule.types b/tests/baselines/reference/partiallyAmbientFundule.types
index 37f59588a7c..c11c6ed5ec3 100644
--- a/tests/baselines/reference/partiallyAmbientFundule.types
+++ b/tests/baselines/reference/partiallyAmbientFundule.types
@@ -3,7 +3,7 @@ declare module foo {
 >foo : typeof foo
 
     export function x(): any;
->x : typeof x
+>x : () => any
 }
 function foo () { } // Legal, because module is ambient
 >foo : typeof foo
diff --git a/tests/baselines/reference/plusOperatorWithBooleanType.types b/tests/baselines/reference/plusOperatorWithBooleanType.types
index 79d10141cb8..40ca167a4d7 100644
--- a/tests/baselines/reference/plusOperatorWithBooleanType.types
+++ b/tests/baselines/reference/plusOperatorWithBooleanType.types
@@ -4,7 +4,7 @@ var BOOLEAN: boolean;
 >BOOLEAN : boolean
 
 function foo(): boolean { return true; }
->foo : typeof foo
+>foo : () => boolean
 
 class A {
 >A : A
@@ -64,7 +64,7 @@ var ResultIsNumber6 = +foo();
 >ResultIsNumber6 : number
 >+foo() : number
 >foo() : boolean
->foo : typeof foo
+>foo : () => boolean
 
 var ResultIsNumber7 = +A.foo();
 >ResultIsNumber7 : number
@@ -85,7 +85,7 @@ var ResultIsNumber7 = +A.foo();
 +foo();
 >+foo() : number
 >foo() : boolean
->foo : typeof foo
+>foo : () => boolean
 
 +true, false;
 >+true, false : boolean
diff --git a/tests/baselines/reference/plusOperatorWithNumberType.types b/tests/baselines/reference/plusOperatorWithNumberType.types
index 7c605ca37d0..cad0448f2a3 100644
--- a/tests/baselines/reference/plusOperatorWithNumberType.types
+++ b/tests/baselines/reference/plusOperatorWithNumberType.types
@@ -8,7 +8,7 @@ var NUMBER1: number[] = [1, 2];
 >[1, 2] : number[]
 
 function foo(): number { return 1; }
->foo : typeof foo
+>foo : () => number
 
 class A {
 >A : A
@@ -89,7 +89,7 @@ var ResultIsNumber9 = +foo();
 >ResultIsNumber9 : number
 >+foo() : number
 >foo() : number
->foo : typeof foo
+>foo : () => number
 
 var ResultIsNumber10 = +A.foo();
 >ResultIsNumber10 : number
@@ -122,7 +122,7 @@ var ResultIsNumber11 = +(NUMBER + NUMBER);
 +foo();
 >+foo() : number
 >foo() : number
->foo : typeof foo
+>foo : () => number
 
 +objA.a;
 >+objA.a : number
diff --git a/tests/baselines/reference/plusOperatorWithStringType.types b/tests/baselines/reference/plusOperatorWithStringType.types
index e8915a8b60a..d08a3917196 100644
--- a/tests/baselines/reference/plusOperatorWithStringType.types
+++ b/tests/baselines/reference/plusOperatorWithStringType.types
@@ -8,7 +8,7 @@ var STRING1: string[] = ["", "abc"];
 >["", "abc"] : string[]
 
 function foo(): string { return "abc"; }
->foo : typeof foo
+>foo : () => string
 
 class A {
 >A : A
@@ -89,7 +89,7 @@ var ResultIsNumber9 = +foo();
 >ResultIsNumber9 : number
 >+foo() : number
 >foo() : string
->foo : typeof foo
+>foo : () => string
 
 var ResultIsNumber10 = +A.foo();
 >ResultIsNumber10 : number
@@ -130,7 +130,7 @@ var ResultIsNumber12 = +STRING.charAt(0);
 +foo();
 >+foo() : number
 >foo() : string
->foo : typeof foo
+>foo : () => string
 
 +objA.a,M.n;
 >+objA.a,M.n : string
diff --git a/tests/baselines/reference/primtiveTypesAreIdentical.types b/tests/baselines/reference/primtiveTypesAreIdentical.types
index aee6272223f..bbff4623f0b 100644
--- a/tests/baselines/reference/primtiveTypesAreIdentical.types
+++ b/tests/baselines/reference/primtiveTypesAreIdentical.types
@@ -2,67 +2,67 @@
 // primitive types are identical to themselves so these overloads will all cause errors
 
 function foo1(x: number);
->foo1 : typeof foo1
+>foo1 : { (x: number): any; (x: number): any; }
 >x : number
 
 function foo1(x: number);
->foo1 : typeof foo1
+>foo1 : { (x: number): any; (x: number): any; }
 >x : number
 
 function foo1(x: any) { }
->foo1 : typeof foo1
+>foo1 : { (x: number): any; (x: number): any; }
 >x : any
 
 function foo2(x: string);
->foo2 : typeof foo2
+>foo2 : { (x: string): any; (x: string): any; }
 >x : string
 
 function foo2(x: string);
->foo2 : typeof foo2
+>foo2 : { (x: string): any; (x: string): any; }
 >x : string
 
 function foo2(x: any) { }
->foo2 : typeof foo2
+>foo2 : { (x: string): any; (x: string): any; }
 >x : any
 
 function foo3(x: boolean);
->foo3 : typeof foo3
+>foo3 : { (x: boolean): any; (x: boolean): any; }
 >x : boolean
 
 function foo3(x: boolean);
->foo3 : typeof foo3
+>foo3 : { (x: boolean): any; (x: boolean): any; }
 >x : boolean
 
 function foo3(x: any) { }
->foo3 : typeof foo3
+>foo3 : { (x: boolean): any; (x: boolean): any; }
 >x : any
 
 function foo4(x: any);
->foo4 : typeof foo4
+>foo4 : { (x: any): any; (x: any): any; }
 >x : any
 
 function foo4(x: any);
->foo4 : typeof foo4
+>foo4 : { (x: any): any; (x: any): any; }
 >x : any
 
 function foo4(x: any) { }
->foo4 : typeof foo4
+>foo4 : { (x: any): any; (x: any): any; }
 >x : any
 
 function foo5(x: 'a');
->foo5 : typeof foo5
+>foo5 : { (x: 'a'): any; (x: 'a'): any; (x: string): any; }
 >x : 'a'
 
 function foo5(x: 'a');
->foo5 : typeof foo5
+>foo5 : { (x: 'a'): any; (x: 'a'): any; (x: string): any; }
 >x : 'a'
 
 function foo5(x: string);
->foo5 : typeof foo5
+>foo5 : { (x: 'a'): any; (x: 'a'): any; (x: string): any; }
 >x : string
 
 function foo5(x: any) { }
->foo5 : typeof foo5
+>foo5 : { (x: 'a'): any; (x: 'a'): any; (x: string): any; }
 >x : any
 
 enum E { A }
@@ -70,28 +70,28 @@ enum E { A }
 >A : E
 
 function foo6(x: E);
->foo6 : typeof foo6
+>foo6 : { (x: E): any; (x: E): any; }
 >x : E
 >E : E
 
 function foo6(x: E);
->foo6 : typeof foo6
+>foo6 : { (x: E): any; (x: E): any; }
 >x : E
 >E : E
 
 function foo6(x: any) { }
->foo6 : typeof foo6
+>foo6 : { (x: E): any; (x: E): any; }
 >x : any
 
 function foo7(x: void);
->foo7 : typeof foo7
+>foo7 : { (x: void): any; (x: void): any; }
 >x : void
 
 function foo7(x: void);
->foo7 : typeof foo7
+>foo7 : { (x: void): any; (x: void): any; }
 >x : void
 
 function foo7(x: any) { }
->foo7 : typeof foo7
+>foo7 : { (x: void): any; (x: void): any; }
 >x : any
 
diff --git a/tests/baselines/reference/privacyCheckAnonymousFunctionParameter.types b/tests/baselines/reference/privacyCheckAnonymousFunctionParameter.types
index 2ce71bdacfa..17e496f5568 100644
--- a/tests/baselines/reference/privacyCheckAnonymousFunctionParameter.types
+++ b/tests/baselines/reference/privacyCheckAnonymousFunctionParameter.types
@@ -11,7 +11,7 @@ module Query {
 >Query : typeof Query
 
     export function fromDoWhile<T>(doWhile: (test: Iterator<T>) => boolean): Iterator<T> {
->fromDoWhile : typeof fromDoWhile
+>fromDoWhile : <T>(doWhile: (test: Iterator<T>) => boolean) => Iterator<T>
 >T : T
 >doWhile : (test: Iterator<T>) => boolean
 >test : Iterator<T>
@@ -24,11 +24,11 @@ module Query {
     }
 
     function fromOrderBy() {
->fromOrderBy : typeof fromOrderBy
+>fromOrderBy : () => Iterator<{}>
 
         return fromDoWhile(test => {
 >fromDoWhile(test => {            return true;        }) : Iterator<{}>
->fromDoWhile : typeof fromDoWhile
+>fromDoWhile : <T>(doWhile: (test: Iterator<T>) => boolean) => Iterator<T>
 >test => {            return true;        } : (test: Iterator<{}>) => boolean
 >test : Iterator<{}>
 
diff --git a/tests/baselines/reference/privacyCheckAnonymousFunctionParameter2.types b/tests/baselines/reference/privacyCheckAnonymousFunctionParameter2.types
index 7854f5f9b77..6615a3c9af0 100644
--- a/tests/baselines/reference/privacyCheckAnonymousFunctionParameter2.types
+++ b/tests/baselines/reference/privacyCheckAnonymousFunctionParameter2.types
@@ -12,7 +12,7 @@ module Q {
 >Q : typeof Q
 
     export function foo<T>(x: (a: Iterator<T>) => number) {
->foo : typeof foo
+>foo : <T>(x: (a: Iterator<T>) => number) => (a: Iterator<T>) => number
 >T : T
 >x : (a: Iterator<T>) => number
 >a : Iterator<T>
@@ -28,10 +28,10 @@ module Q {
 >Q : typeof Q
 
     function bar() {
->bar : typeof bar
+>bar : () => void
 
         foo(null);
 >foo(null) : (a: Iterator<{}>) => number
->foo : typeof foo
+>foo : <T>(x: (a: Iterator<T>) => number) => (a: Iterator<T>) => number
     }
 }
diff --git a/tests/baselines/reference/privacyFunc.types b/tests/baselines/reference/privacyFunc.types
index 367a5213a3a..e43a5c0102a 100644
--- a/tests/baselines/reference/privacyFunc.types
+++ b/tests/baselines/reference/privacyFunc.types
@@ -267,32 +267,32 @@ module m1 {
     }
 
     function f1_public(m1_f1_arg: C1_public) {
->f1_public : typeof f1_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 : typeof f2_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 : typeof f3_public
+>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 : typeof f4_public
+>f4_public : (m1_f4_arg: C2_private) => void
 >m1_f4_arg : C2_private
 >C2_private : C2_private
     }
 
 
     function f5_public() {
->f5_public : typeof f5_public
+>f5_public : () => C1_public
 
         return new C1_public();
 >new C1_public() : C1_public
@@ -300,7 +300,7 @@ module m1 {
     }
 
     export function f6_public() {
->f6_public : typeof f6_public
+>f6_public : () => C1_public
 
         return new C1_public();
 >new C1_public() : C1_public
@@ -308,7 +308,7 @@ module m1 {
     }
 
     function f7_public() {
->f7_public : typeof f7_public
+>f7_public : () => C2_private
 
         return new C2_private();
 >new C2_private() : C2_private
@@ -316,7 +316,7 @@ module m1 {
     }
 
     export function f8_public() {
->f8_public : typeof f8_public
+>f8_public : () => C2_private
 
         return new C2_private();  // error
 >new C2_private() : C2_private
@@ -325,7 +325,7 @@ module m1 {
 
 
     function f9_private(): C1_public {
->f9_private : typeof f9_private
+>f9_private : () => C1_public
 >C1_public : C1_public
 
         return new C1_public();
@@ -334,7 +334,7 @@ module m1 {
     }
 
     export function f10_public(): C1_public {
->f10_public : typeof f10_public
+>f10_public : () => C1_public
 >C1_public : C1_public
 
         return new C1_public();
@@ -343,7 +343,7 @@ module m1 {
     }
 
     function f11_private(): C2_private {
->f11_private : typeof f11_private
+>f11_private : () => C2_private
 >C2_private : C2_private
 
         return new C2_private();
@@ -352,7 +352,7 @@ module m1 {
     }
 
     export function f12_public(): C2_private { // error
->f12_public : typeof f12_public
+>f12_public : () => C2_private
 >C2_private : C2_private
 
         return new C2_private(); //error
@@ -433,7 +433,7 @@ class C9_public {
   
 
 function f4_public(f4_arg: C6_public) {
->f4_public : typeof f4_public
+>f4_public : (f4_arg: C6_public) => void
 >f4_arg : C6_public
 >C6_public : C6_public
 }
@@ -441,7 +441,7 @@ function f4_public(f4_arg: C6_public) {
 
 
 function f6_public() {
->f6_public : typeof f6_public
+>f6_public : () => C6_public
 
     return new C6_public();
 >new C6_public() : C6_public
@@ -450,7 +450,7 @@ function f6_public() {
 
 
 function f10_public(): C6_public {
->f10_public : typeof f10_public
+>f10_public : () => C6_public
 >C6_public : C6_public
 
     return new C6_public();
diff --git a/tests/baselines/reference/privacyGloFunc.types b/tests/baselines/reference/privacyGloFunc.types
index 8b8eacd4157..35ccb19f8ed 100644
--- a/tests/baselines/reference/privacyGloFunc.types
+++ b/tests/baselines/reference/privacyGloFunc.types
@@ -267,32 +267,32 @@ export module m1 {
     }
 
     function f1_public(m1_f1_arg: C1_public) {
->f1_public : typeof f1_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 : typeof f2_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 : typeof f3_public
+>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 : typeof f4_public
+>f4_public : (m1_f4_arg: C2_private) => void
 >m1_f4_arg : C2_private
 >C2_private : C2_private
     }
 
 
     function f5_public() {
->f5_public : typeof f5_public
+>f5_public : () => C1_public
 
         return new C1_public();
 >new C1_public() : C1_public
@@ -300,7 +300,7 @@ export module m1 {
     }
 
     export function f6_public() {
->f6_public : typeof f6_public
+>f6_public : () => C1_public
 
         return new C1_public();
 >new C1_public() : C1_public
@@ -308,7 +308,7 @@ export module m1 {
     }
 
     function f7_public() {
->f7_public : typeof f7_public
+>f7_public : () => C2_private
 
         return new C2_private();
 >new C2_private() : C2_private
@@ -316,7 +316,7 @@ export module m1 {
     }
 
     export function f8_public() {
->f8_public : typeof f8_public
+>f8_public : () => C2_private
 
         return new C2_private();  // error
 >new C2_private() : C2_private
@@ -325,7 +325,7 @@ export module m1 {
 
 
     function f9_private(): C1_public {
->f9_private : typeof f9_private
+>f9_private : () => C1_public
 >C1_public : C1_public
 
         return new C1_public();
@@ -334,7 +334,7 @@ export module m1 {
     }
 
     export function f10_public(): C1_public {
->f10_public : typeof f10_public
+>f10_public : () => C1_public
 >C1_public : C1_public
 
         return new C1_public();
@@ -343,7 +343,7 @@ export module m1 {
     }
 
     function f11_private(): C2_private {
->f11_private : typeof f11_private
+>f11_private : () => C2_private
 >C2_private : C2_private
 
         return new C2_private();
@@ -352,7 +352,7 @@ export module m1 {
     }
 
     export function f12_public(): C2_private { // error
->f12_public : typeof f12_public
+>f12_public : () => C2_private
 >C2_private : C2_private
 
         return new C2_private(); //error
@@ -630,32 +630,32 @@ module m2 {
     }
 
     function f1_public(m2_f1_arg: m2_C1_public) {
->f1_public : typeof f1_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 : typeof f2_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 : typeof f3_public
+>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 : typeof f4_public
+>f4_public : (m2_f4_arg: m2_C2_private) => void
 >m2_f4_arg : m2_C2_private
 >m2_C2_private : m2_C2_private
     }
 
 
     function f5_public() {
->f5_public : typeof f5_public
+>f5_public : () => m2_C1_public
 
         return new m2_C1_public();
 >new m2_C1_public() : m2_C1_public
@@ -663,7 +663,7 @@ module m2 {
     }
 
     export function f6_public() {
->f6_public : typeof f6_public
+>f6_public : () => m2_C1_public
 
         return new m2_C1_public();
 >new m2_C1_public() : m2_C1_public
@@ -671,7 +671,7 @@ module m2 {
     }
 
     function f7_public() {
->f7_public : typeof f7_public
+>f7_public : () => m2_C2_private
 
         return new m2_C2_private();
 >new m2_C2_private() : m2_C2_private
@@ -679,7 +679,7 @@ module m2 {
     }
 
     export function f8_public() {
->f8_public : typeof f8_public
+>f8_public : () => m2_C2_private
 
         return new m2_C2_private();
 >new m2_C2_private() : m2_C2_private
@@ -688,7 +688,7 @@ module m2 {
 
 
     function f9_private(): m2_C1_public {
->f9_private : typeof f9_private
+>f9_private : () => m2_C1_public
 >m2_C1_public : m2_C1_public
 
         return new m2_C1_public();
@@ -697,7 +697,7 @@ module m2 {
     }
 
     export function f10_public(): m2_C1_public {
->f10_public : typeof f10_public
+>f10_public : () => m2_C1_public
 >m2_C1_public : m2_C1_public
 
         return new m2_C1_public();
@@ -706,7 +706,7 @@ module m2 {
     }
 
     function f11_private(): m2_C2_private {
->f11_private : typeof f11_private
+>f11_private : () => m2_C2_private
 >m2_C2_private : m2_C2_private
 
         return new m2_C2_private();
@@ -715,7 +715,7 @@ module m2 {
     }
 
     export function f12_public(): m2_C2_private {
->f12_public : typeof f12_public
+>f12_public : () => m2_C2_private
 >m2_C2_private : m2_C2_private
 
         return new m2_C2_private();
@@ -988,31 +988,31 @@ class C12_private {
 }
 
 function f1_private(f1_arg: C5_private) {
->f1_private : typeof f1_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 : typeof f2_public
+>f2_public : (f2_arg: C5_private) => void
 >f2_arg : C5_private
 >C5_private : C5_private
 }
 
 function f3_private(f3_arg: C6_public) {
->f3_private : typeof f3_private
+>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 : typeof f4_public
+>f4_public : (f4_arg: C6_public) => void
 >f4_arg : C6_public
 >C6_public : C6_public
 }
 
 function f5_private() {
->f5_private : typeof f5_private
+>f5_private : () => C6_public
 
     return new C6_public();
 >new C6_public() : C6_public
@@ -1020,7 +1020,7 @@ function f5_private() {
 }
 
 export function f6_public() {
->f6_public : typeof f6_public
+>f6_public : () => C6_public
 
     return new C6_public();
 >new C6_public() : C6_public
@@ -1028,7 +1028,7 @@ export function f6_public() {
 }
 
 function f7_private() {
->f7_private : typeof f7_private
+>f7_private : () => C5_private
 
     return new C5_private();
 >new C5_private() : C5_private
@@ -1036,7 +1036,7 @@ function f7_private() {
 }
 
 export function f8_public() {
->f8_public : typeof f8_public
+>f8_public : () => C5_private
 
     return new C5_private(); //error
 >new C5_private() : C5_private
@@ -1044,7 +1044,7 @@ export function f8_public() {
 }
 
 function f9_private(): C6_public {
->f9_private : typeof f9_private
+>f9_private : () => C6_public
 >C6_public : C6_public
 
     return new C6_public();
@@ -1053,7 +1053,7 @@ function f9_private(): C6_public {
 }
 
 export function f10_public(): C6_public {
->f10_public : typeof f10_public
+>f10_public : () => C6_public
 >C6_public : C6_public
 
     return new C6_public();
@@ -1062,7 +1062,7 @@ export function f10_public(): C6_public {
 }
 
 function f11_private(): C5_private {
->f11_private : typeof f11_private
+>f11_private : () => C5_private
 >C5_private : C5_private
 
     return new C5_private();
@@ -1071,7 +1071,7 @@ function f11_private(): C5_private {
 }
 
 export function f12_public(): C5_private { //error 
->f12_public : typeof f12_public
+>f12_public : () => C5_private
 >C5_private : C5_private
 
     return new C5_private(); //error
diff --git a/tests/baselines/reference/privacyTypeParameterOfFunction.types b/tests/baselines/reference/privacyTypeParameterOfFunction.types
index 3a58521b0a1..7d5c147a21d 100644
--- a/tests/baselines/reference/privacyTypeParameterOfFunction.types
+++ b/tests/baselines/reference/privacyTypeParameterOfFunction.types
@@ -194,25 +194,25 @@ class privateClassWithWithPublicTypeParameters {
 
 // TypeParameter_0_of_exported_function_has_or_is_using_private_type_1
 export function publicFunctionWithPrivateTypeParameters<T extends privateClass>() {
->publicFunctionWithPrivateTypeParameters : typeof publicFunctionWithPrivateTypeParameters
+>publicFunctionWithPrivateTypeParameters : <T extends privateClass>() => void
 >T : T
 >privateClass : privateClass
 }
 
 export function publicFunctionWithPublicTypeParameters<T extends publicClass>() {
->publicFunctionWithPublicTypeParameters : typeof publicFunctionWithPublicTypeParameters
+>publicFunctionWithPublicTypeParameters : <T extends publicClass>() => void
 >T : T
 >publicClass : publicClass
 }
 
 function privateFunctionWithPrivateTypeParameters<T extends privateClass>() {
->privateFunctionWithPrivateTypeParameters : typeof privateFunctionWithPrivateTypeParameters
+>privateFunctionWithPrivateTypeParameters : <T extends privateClass>() => void
 >T : T
 >privateClass : privateClass
 }
 
 function privateFunctionWithPublicTypeParameters<T extends publicClass>() {
->privateFunctionWithPublicTypeParameters : typeof privateFunctionWithPublicTypeParameters
+>privateFunctionWithPublicTypeParameters : <T extends publicClass>() => void
 >T : T
 >publicClass : publicClass
 }
@@ -293,11 +293,11 @@ class privateClassWithWithPublicTypeParametersWithoutExtends {
 }
 
 export function publicFunctionWithPublicTypeParametersWithoutExtends<T>() {
->publicFunctionWithPublicTypeParametersWithoutExtends : typeof publicFunctionWithPublicTypeParametersWithoutExtends
+>publicFunctionWithPublicTypeParametersWithoutExtends : <T>() => void
 >T : T
 }
 
 function privateFunctionWithPublicTypeParametersWithoutExtends<T>() {
->privateFunctionWithPublicTypeParametersWithoutExtends : typeof privateFunctionWithPublicTypeParametersWithoutExtends
+>privateFunctionWithPublicTypeParametersWithoutExtends : <T>() => void
 >T : T
 }
diff --git a/tests/baselines/reference/promiseTypeInference.types b/tests/baselines/reference/promiseTypeInference.types
index 3674ea90dcf..52d026adb1d 100644
--- a/tests/baselines/reference/promiseTypeInference.types
+++ b/tests/baselines/reference/promiseTypeInference.types
@@ -30,12 +30,12 @@ interface IPromise<T> {
 >U : U
 }
 declare function load(name: string): Promise<string>;
->load : typeof load
+>load : (name: string) => Promise<string>
 >name : string
 >Promise : Promise<T>
 
 declare function convert(s: string): IPromise<number>;
->convert : typeof convert
+>convert : (s: string) => IPromise<number>
 >s : string
 >IPromise : IPromise<T>
 
@@ -44,11 +44,11 @@ var $$x = load("something").then(s => convert(s));
 >load("something").then(s => convert(s)) : Promise<number>
 >load("something").then : <U>(success?: (value: string) => Promise<U>) => Promise<U>
 >load("something") : Promise<string>
->load : typeof load
+>load : (name: string) => Promise<string>
 >then : <U>(success?: (value: string) => Promise<U>) => Promise<U>
 >s => convert(s) : (s: string) => IPromise<number>
 >s : string
 >convert(s) : IPromise<number>
->convert : typeof convert
+>convert : (s: string) => IPromise<number>
 >s : string
 
diff --git a/tests/baselines/reference/rectype.types b/tests/baselines/reference/rectype.types
index 5d8da81c3e1..403e7a3a4dc 100644
--- a/tests/baselines/reference/rectype.types
+++ b/tests/baselines/reference/rectype.types
@@ -9,35 +9,35 @@ module M {
 >I : I
 
     export function f(p: I) { return f };
->f : typeof f
+>f : (p: I) => typeof f
 >p : I
 >I : I
->f : typeof f
+>f : (p: I) => typeof f
 
     var i:I;
 >i : I
 >I : I
 
     f(i);
->f(i) : typeof f
->f : typeof f
+>f(i) : (p: I) => typeof f
+>f : (p: I) => typeof f
 >i : I
 
     f(f(i));
->f(f(i)) : typeof f
->f : typeof f
->f(i) : typeof f
->f : typeof f
+>f(f(i)) : (p: I) => typeof f
+>f : (p: I) => typeof f
+>f(i) : (p: I) => typeof f
+>f : (p: I) => typeof f
 >i : I
 
     f((f(f(i))));
->f((f(f(i)))) : typeof f
->f : typeof f
->(f(f(i))) : typeof f
->f(f(i)) : typeof f
->f : typeof f
->f(i) : typeof f
->f : typeof f
+>f((f(f(i)))) : (p: I) => typeof f
+>f : (p: I) => typeof f
+>(f(f(i))) : (p: I) => typeof f
+>f(f(i)) : (p: I) => typeof f
+>f : (p: I) => typeof f
+>f(i) : (p: I) => typeof f
+>f : (p: I) => typeof f
 >i : I
 }
 
diff --git a/tests/baselines/reference/recursiveComplicatedClasses.types b/tests/baselines/reference/recursiveComplicatedClasses.types
index cb0db56e69b..d969bbfcea0 100644
--- a/tests/baselines/reference/recursiveComplicatedClasses.types
+++ b/tests/baselines/reference/recursiveComplicatedClasses.types
@@ -8,7 +8,7 @@ class Signature {
 }
 
 function aEnclosesB(a: Symbol) {
->aEnclosesB : typeof aEnclosesB
+>aEnclosesB : (a: Symbol) => boolean
 >a : Symbol
 >Symbol : Symbol
 
@@ -30,7 +30,7 @@ class Symbol {
 
         return aEnclosesB(b);
 >aEnclosesB(b) : boolean
->aEnclosesB : typeof aEnclosesB
+>aEnclosesB : (a: Symbol) => boolean
 >b : TypeSymbol
     }
 
diff --git a/tests/baselines/reference/recursiveGenericMethodCall.types b/tests/baselines/reference/recursiveGenericMethodCall.types
index 948790e31fa..ef03ca545df 100644
--- a/tests/baselines/reference/recursiveGenericMethodCall.types
+++ b/tests/baselines/reference/recursiveGenericMethodCall.types
@@ -5,7 +5,7 @@ interface Generator<T> { (): T; }
 >T : T
 
 function Generate<T>(func: Generator<T>): T {
->Generate : typeof Generate
+>Generate : <T>(func: Generator<T>) => T
 >T : T
 >func : Generator<T>
 >Generator : Generator<T>
@@ -14,7 +14,7 @@ function Generate<T>(func: Generator<T>): T {
 
     return Generate(func);
 >Generate(func) : T
->Generate : typeof Generate
+>Generate : <T>(func: Generator<T>) => T
 >func : Generator<T>
 }
 
diff --git a/tests/baselines/reference/recursiveGenericSignatureInstantiation.types b/tests/baselines/reference/recursiveGenericSignatureInstantiation.types
index 8d61d58549c..f1e93270396 100644
--- a/tests/baselines/reference/recursiveGenericSignatureInstantiation.types
+++ b/tests/baselines/reference/recursiveGenericSignatureInstantiation.types
@@ -1,13 +1,13 @@
 === tests/cases/compiler/recursiveGenericSignatureInstantiation.ts ===
 function f6<T>(x: T) {
->f6 : typeof f6
+>f6 : <T>(x: T) => any
 >T : T
 >x : T
 >T : T
 
     return f6(x);
 >f6(x) : any
->f6 : typeof f6
+>f6 : <T>(x: T) => any
 >x : T
 }
 
diff --git a/tests/baselines/reference/recursiveIdenticalOverloadResolution.types b/tests/baselines/reference/recursiveIdenticalOverloadResolution.types
index 18000888d4f..e2ec96b1c82 100644
--- a/tests/baselines/reference/recursiveIdenticalOverloadResolution.types
+++ b/tests/baselines/reference/recursiveIdenticalOverloadResolution.types
@@ -10,35 +10,35 @@ module M {
 >I : I
 
    function f(p: I) { return f };
->f : typeof f
+>f : (p: I) => typeof f
 >p : I
 >I : I
->f : typeof f
+>f : (p: I) => typeof f
 
    var i: I;
 >i : I
 >I : I
 
    f(i);
->f(i) : typeof f
->f : typeof f
+>f(i) : (p: I) => typeof f
+>f : (p: I) => typeof f
 >i : I
 
    f(f(i));
->f(f(i)) : typeof f
->f : typeof f
->f(i) : typeof f
->f : typeof f
+>f(f(i)) : (p: I) => typeof f
+>f : (p: I) => typeof f
+>f(i) : (p: I) => typeof f
+>f : (p: I) => typeof f
 >i : I
 
    f((f(f(i))));
->f((f(f(i)))) : typeof f
->f : typeof f
->(f(f(i))) : typeof f
->f(f(i)) : typeof f
->f : typeof f
->f(i) : typeof f
->f : typeof f
+>f((f(f(i)))) : (p: I) => typeof f
+>f : (p: I) => typeof f
+>(f(f(i))) : (p: I) => typeof f
+>f(f(i)) : (p: I) => typeof f
+>f : (p: I) => typeof f
+>f(i) : (p: I) => typeof f
+>f : (p: I) => typeof f
 >i : I
 
 }
diff --git a/tests/baselines/reference/recursiveInference1.types b/tests/baselines/reference/recursiveInference1.types
index 02688f17705..3fef5dbb805 100644
--- a/tests/baselines/reference/recursiveInference1.types
+++ b/tests/baselines/reference/recursiveInference1.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/recursiveInference1.ts ===
 function fib(x:number) { return x <= 1 ? x : fib(x - 1) + fib(x - 2); }
->fib : typeof fib
+>fib : (x: number) => any
 >x : number
 >x <= 1 ? x : fib(x - 1) + fib(x - 2) : any
 >x <= 1 : boolean
@@ -8,16 +8,16 @@ function fib(x:number) { return x <= 1 ? x : fib(x - 1) + fib(x - 2); }
 >x : number
 >fib(x - 1) + fib(x - 2) : any
 >fib(x - 1) : any
->fib : typeof fib
+>fib : (x: number) => any
 >x - 1 : number
 >x : number
 >fib(x - 2) : any
->fib : typeof fib
+>fib : (x: number) => any
 >x - 2 : number
 >x : number
 
 var result = fib(5);
 >result : any
 >fib(5) : any
->fib : typeof fib
+>fib : (x: number) => any
 
diff --git a/tests/baselines/reference/recursiveMods.types b/tests/baselines/reference/recursiveMods.types
index 016b9a72129..a02156a6e9b 100644
--- a/tests/baselines/reference/recursiveMods.types
+++ b/tests/baselines/reference/recursiveMods.types
@@ -10,12 +10,12 @@ export module Foo {
 >Foo : typeof Foo
 
 	function Bar() : C {
->Bar : typeof Bar
+>Bar : () => C
 >C : C
 
 		if (true) { return Bar();}
 >Bar() : C
->Bar : typeof Bar
+>Bar : () => C
 
 		return new C();
 >new C() : C
@@ -23,27 +23,27 @@ export module Foo {
 	}
 
 	function Baz() : C {
->Baz : typeof Baz
+>Baz : () => C
 >C : C
 
 		var c = Baz();
 >c : C
 >Baz() : C
->Baz : typeof Baz
+>Baz : () => C
 
 		return Bar();
 >Bar() : C
->Bar : typeof Bar
+>Bar : () => C
 	}
 
 	function Gar() {
->Gar : typeof Gar
+>Gar : () => void
 
 		var c : C = Baz();
 >c : C
 >C : C
 >Baz() : C
->Baz : typeof Baz
+>Baz : () => C
 
 		return;
 	}
diff --git a/tests/baselines/reference/recursiveReturns.types b/tests/baselines/reference/recursiveReturns.types
index a62578cf41a..dfb54f126a3 100644
--- a/tests/baselines/reference/recursiveReturns.types
+++ b/tests/baselines/reference/recursiveReturns.types
@@ -1,21 +1,21 @@
 === tests/cases/compiler/recursiveReturns.ts ===
 function R1() {
->R1 : typeof R1
+>R1 : () => void
 
 	R1();
 >R1() : void
->R1 : typeof R1
+>R1 : () => void
 
 	return;
 }
 
 function R2() { R2(); }
->R2 : typeof R2
+>R2 : () => void
 >R2() : void
->R2 : typeof R2
+>R2 : () => void
 
 function R3(n:number) {
->R3 : typeof R3
+>R3 : (n: number) => void
 >n : number
 
 	if (n == 0) {
@@ -27,7 +27,7 @@ function R3(n:number) {
 	else {
 		R3(n--);
 >R3(n--) : void
->R3 : typeof R3
+>R3 : (n: number) => void
 >n-- : number
 >n : number
 	}
diff --git a/tests/baselines/reference/restParameterNoTypeAnnotation.types b/tests/baselines/reference/restParameterNoTypeAnnotation.types
index d4b5f3ed850..0298ff37ca5 100644
--- a/tests/baselines/reference/restParameterNoTypeAnnotation.types
+++ b/tests/baselines/reference/restParameterNoTypeAnnotation.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/restParameterNoTypeAnnotation.ts ===
 function foo(...rest) {   
->foo : typeof foo
+>foo : (...rest: any[]) => number
 >rest : any[]
 
      var x: number = rest[0];
diff --git a/tests/baselines/reference/restParameters.types b/tests/baselines/reference/restParameters.types
index dea68d33762..441635287ea 100644
--- a/tests/baselines/reference/restParameters.types
+++ b/tests/baselines/reference/restParameters.types
@@ -1,23 +1,23 @@
 === tests/cases/compiler/restParameters.ts ===
 function f18(a?:string, ...b:number[]){}
->f18 : typeof f18
+>f18 : (a?: string, ...b: number[]) => void
 >a : string
 >b : number[]
  
 function f19(a?:string, b?:number, ...c:number[]){}
->f19 : typeof f19
+>f19 : (a?: string, b?: number, ...c: number[]) => void
 >a : string
 >b : number
 >c : number[]
  
 function f20(a:string, b?:string, ...c:number[]){}
->f20 : typeof f20
+>f20 : (a: string, b?: string, ...c: number[]) => void
 >a : string
 >b : string
 >c : number[]
  
 function f21(a:string, b?:string, c?:number, ...d:number[]){}
->f21 : typeof f21
+>f21 : (a: string, b?: string, c?: number, ...d: number[]) => void
 >a : string
 >b : string
 >c : number
diff --git a/tests/baselines/reference/returnStatement1.types b/tests/baselines/reference/returnStatement1.types
index 37c2db7b5e7..b7a668bfa03 100644
--- a/tests/baselines/reference/returnStatement1.types
+++ b/tests/baselines/reference/returnStatement1.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/returnStatement1.ts ===
 function f() {
->f : typeof f
+>f : () => (s: any) => void
 
     return function (s) {
 >function (s) {        var x = s;    } : (s: any) => void
diff --git a/tests/baselines/reference/returnStatements.types b/tests/baselines/reference/returnStatements.types
index 0a4b81f6873..58d2a251b0e 100644
--- a/tests/baselines/reference/returnStatements.types
+++ b/tests/baselines/reference/returnStatements.types
@@ -1,32 +1,32 @@
 === tests/cases/conformance/statements/returnStatements/returnStatements.ts ===
 // all the following should be valid
 function fn1(): number { return 1; }
->fn1 : typeof fn1
+>fn1 : () => number
 
 function fn2(): string { return ''; }
->fn2 : typeof fn2
+>fn2 : () => string
 
 function fn3(): void { return undefined; }
->fn3 : typeof fn3
+>fn3 : () => void
 >undefined : undefined
 
 function fn4(): void { return; }
->fn4 : typeof fn4
+>fn4 : () => void
 
 function fn5(): boolean { return true; }
->fn5 : typeof fn5
+>fn5 : () => boolean
 
 function fn6(): Date { return new Date(12); }
->fn6 : typeof fn6
+>fn6 : () => Date
 >Date : Date
 >new Date(12) : 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; }
 
 function fn7(): any { return null; }
->fn7 : typeof fn7
+>fn7 : () => any
 
 function fn8(): any { return; } // OK, eq. to 'return undefined'
->fn8 : typeof fn8
+>fn8 : () => any
 
 interface I { id: number }
 >I : I
@@ -50,24 +50,24 @@ class D extends C {
 >name : string
 }
 function fn10(): I { return { id: 12 }; } 
->fn10 : typeof fn10
+>fn10 : () => I
 >I : I
 >{ id: 12 } : { id: number; }
 >id : number
 
 function fn11(): I { return new C(); }
->fn11 : typeof fn11
+>fn11 : () => I
 >I : I
 >new C() : C
 >C : typeof C
 
 function fn12(): C { return new D(); }
->fn12 : typeof fn12
+>fn12 : () => C
 >C : C
 >new D() : D
 >D : typeof D
 
 function fn13(): C { return null; }
->fn13 : typeof fn13
+>fn13 : () => C
 >C : C
 
diff --git a/tests/baselines/reference/returnTypeParameterWithModules.types b/tests/baselines/reference/returnTypeParameterWithModules.types
index 68161de58c7..adcc1b4bcee 100644
--- a/tests/baselines/reference/returnTypeParameterWithModules.types
+++ b/tests/baselines/reference/returnTypeParameterWithModules.types
@@ -3,7 +3,7 @@ module M1 {
 >M1 : typeof M1
 
     export function reduce<A>(ar, f, e?): Array<A> {
->reduce : typeof reduce
+>reduce : <A>(ar: any, f: any, e?: any) => A[]
 >A : A
 >ar : any
 >f : any
@@ -39,19 +39,19 @@ module M2 {
 >M1 : typeof A
 
   export function compose() {
->compose : typeof compose
+>compose : () => void
 
         A.reduce(arguments, compose2);
 >A.reduce(arguments, compose2) : {}[]
->A.reduce : typeof A.reduce
+>A.reduce : <A>(ar: any, f: any, e?: any) => A[]
 >A : typeof A
->reduce : typeof A.reduce
+>reduce : <A>(ar: any, f: any, e?: any) => A[]
 >arguments : IArguments
->compose2 : typeof compose2
+>compose2 : <B, C, D>(g: (x: B) => C, f: (x: D) => B) => (x: D) => C
 
     };
     export function compose2<B, C, D>(g: (x: B) => C, f: (x: D) => B): (x: D) => C {
->compose2 : typeof compose2
+>compose2 : <B, C, D>(g: (x: B) => C, f: (x: D) => B) => (x: D) => C
 >B : B
 >C : C
 >D : D
diff --git a/tests/baselines/reference/reverseInferenceInContextualInstantiation.types b/tests/baselines/reference/reverseInferenceInContextualInstantiation.types
index 60ca53a0c94..d38d0423e84 100644
--- a/tests/baselines/reference/reverseInferenceInContextualInstantiation.types
+++ b/tests/baselines/reference/reverseInferenceInContextualInstantiation.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/reverseInferenceInContextualInstantiation.ts ===
 function compare<T>(a: T, b: T): number { return 0; }
->compare : typeof compare
+>compare : <T>(a: T, b: T) => number
 >T : T
 >a : T
 >T : T
@@ -15,5 +15,5 @@ x.sort(compare); // Error, but shouldn't be
 >x.sort : (compareFn?: (a: number, b: number) => number) => number[]
 >x : number[]
 >sort : (compareFn?: (a: number, b: number) => number) => number[]
->compare : typeof compare
+>compare : <T>(a: T, b: T) => number
 
diff --git a/tests/baselines/reference/scopeResolutionIdentifiers.types b/tests/baselines/reference/scopeResolutionIdentifiers.types
index daac3c316e4..37fa897863d 100644
--- a/tests/baselines/reference/scopeResolutionIdentifiers.types
+++ b/tests/baselines/reference/scopeResolutionIdentifiers.types
@@ -33,7 +33,7 @@ module M2 {
 }
 
 function fn() {
->fn : typeof fn
+>fn : () => void
 
     var s: boolean;
 >s : boolean
diff --git a/tests/baselines/reference/separate1-2.types b/tests/baselines/reference/separate1-2.types
index 9e07b3f7a5b..11b19d0b476 100644
--- a/tests/baselines/reference/separate1-2.types
+++ b/tests/baselines/reference/separate1-2.types
@@ -3,5 +3,5 @@ module X {
 >X : typeof X
 
     export function f() { }
->f : typeof f
+>f : () => void
 }
diff --git a/tests/baselines/reference/sourceMap-FileWithComments.types b/tests/baselines/reference/sourceMap-FileWithComments.types
index 053a73c42ce..ecb32311c4a 100644
--- a/tests/baselines/reference/sourceMap-FileWithComments.types
+++ b/tests/baselines/reference/sourceMap-FileWithComments.types
@@ -57,7 +57,7 @@ module Shapes {
 >a : number
 
     export function foo() {
->foo : typeof foo
+>foo : () => void
     }
 
     /**  comment after function
diff --git a/tests/baselines/reference/sourceMapValidationClasses.types b/tests/baselines/reference/sourceMapValidationClasses.types
index 8deaf6c2ce8..d53cdcb9974 100644
--- a/tests/baselines/reference/sourceMapValidationClasses.types
+++ b/tests/baselines/reference/sourceMapValidationClasses.types
@@ -26,7 +26,7 @@ module Foo.Bar {
 
 
     function foo(greeting: string): Greeter {
->foo : typeof foo
+>foo : (greeting: string) => Greeter
 >greeting : string
 >Greeter : Greeter
 
@@ -49,7 +49,7 @@ module Foo.Bar {
 >greet : () => string
 
     function foo2(greeting: string, ...restGreetings /* more greeting */: string[]) {
->foo2 : typeof foo2
+>foo2 : (greeting: string, ...restGreetings: string[]) => Greeter[]
 >greeting : string
 >restGreetings : string[]
 
@@ -95,7 +95,7 @@ module Foo.Bar {
     var b = foo2("Hello", "World", "!");
 >b : Greeter[]
 >foo2("Hello", "World", "!") : Greeter[]
->foo2 : typeof foo2
+>foo2 : (greeting: string, ...restGreetings: string[]) => Greeter[]
 
     // This is simple signle line comment
     for (var j = 0; j < b.length; j++) {
diff --git a/tests/baselines/reference/sourceMapValidationFunctions.types b/tests/baselines/reference/sourceMapValidationFunctions.types
index e6d2c156496..0d110ece2d2 100644
--- a/tests/baselines/reference/sourceMapValidationFunctions.types
+++ b/tests/baselines/reference/sourceMapValidationFunctions.types
@@ -3,7 +3,7 @@ var greetings = 0;
 >greetings : number
 
 function greet(greeting: string): number {
->greet : typeof greet
+>greet : (greeting: string) => number
 >greeting : string
 
     greetings++;
@@ -14,7 +14,7 @@ function greet(greeting: string): number {
 >greetings : number
 }
 function greet2(greeting: string, n = 10, x?: string, ...restParams: string[]): number {
->greet2 : typeof greet2
+>greet2 : (greeting: string, n?: number, x?: string, ...restParams: string[]) => number
 >greeting : string
 >n : number
 >x : string
@@ -28,7 +28,7 @@ function greet2(greeting: string, n = 10, x?: string, ...restParams: string[]):
 >greetings : number
 }
 function foo(greeting: string, n = 10, x?: string, ...restParams: string[])
->foo : typeof foo
+>foo : (greeting: string, n?: number, x?: string, ...restParams: string[]) => void
 >greeting : string
 >n : number
 >x : string
diff --git a/tests/baselines/reference/sourceMapValidationModule.types b/tests/baselines/reference/sourceMapValidationModule.types
index 38c0c3e8392..6c77a0b9b44 100644
--- a/tests/baselines/reference/sourceMapValidationModule.types
+++ b/tests/baselines/reference/sourceMapValidationModule.types
@@ -20,7 +20,7 @@ module m3 {
     }
 
     export function foo() {
->foo : typeof foo
+>foo : () => number
 
         return m4.x;
 >m4.x : number
diff --git a/tests/baselines/reference/specializationsShouldNotAffectEachOther.types b/tests/baselines/reference/specializationsShouldNotAffectEachOther.types
index f8ca3216848..9bf91e6fe42 100644
--- a/tests/baselines/reference/specializationsShouldNotAffectEachOther.types
+++ b/tests/baselines/reference/specializationsShouldNotAffectEachOther.types
@@ -13,7 +13,7 @@ var series: Series;
 
 
 function foo() {
->foo : typeof foo
+>foo : () => any
 
     var seriesExtent = (series) => null;
 >seriesExtent : (series: any) => any
diff --git a/tests/baselines/reference/specializeVarArgs1.types b/tests/baselines/reference/specializeVarArgs1.types
index 8c9175b9d4f..4cdf5790983 100644
--- a/tests/baselines/reference/specializeVarArgs1.types
+++ b/tests/baselines/reference/specializeVarArgs1.types
@@ -23,7 +23,7 @@ interface ObservableArray<T> extends Observable<T[]>
  
 
 function observableArray<T>(): ObservableArray<T> { return null;}
->observableArray : typeof observableArray
+>observableArray : <T>() => ObservableArray<T>
 >T : T
 >ObservableArray : ObservableArray<T>
 >T : T
@@ -33,7 +33,7 @@ function observableArray<T>(): ObservableArray<T> { return null;}
 var a =  observableArray<string>();
 >a : ObservableArray<string>
 >observableArray<string>() : ObservableArray<string>
->observableArray : typeof observableArray
+>observableArray : <T>() => ObservableArray<T>
 
 a.push('Some Value');
 >a.push('Some Value') : any
diff --git a/tests/baselines/reference/specializedSignatureIsSubtypeOfNonSpecializedSignature.types b/tests/baselines/reference/specializedSignatureIsSubtypeOfNonSpecializedSignature.types
index e28c8144d02..cb86966d65a 100644
--- a/tests/baselines/reference/specializedSignatureIsSubtypeOfNonSpecializedSignature.types
+++ b/tests/baselines/reference/specializedSignatureIsSubtypeOfNonSpecializedSignature.types
@@ -3,15 +3,15 @@
 // All the below should not be errors
 
 function foo(x: 'a');
->foo : typeof foo
+>foo : { (x: 'a'): any; (x: string): any; }
 >x : 'a'
 
 function foo(x: string);
->foo : typeof foo
+>foo : { (x: 'a'): any; (x: string): any; }
 >x : string
 
 function foo(x: any) { }
->foo : typeof foo
+>foo : { (x: 'a'): any; (x: string): any; }
 >x : any
 
 class C {
diff --git a/tests/baselines/reference/staticInheritance.types b/tests/baselines/reference/staticInheritance.types
index d4926e059c9..04c64281ba8 100644
--- a/tests/baselines/reference/staticInheritance.types
+++ b/tests/baselines/reference/staticInheritance.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/staticInheritance.ts ===
 function doThing(x: { n: string }) { }
->doThing : typeof doThing
+>doThing : (x: { n: string; }) => void
 >x : { n: string; }
 >n : string
 
@@ -13,7 +13,7 @@ class A {
     p = doThing(A); // OK
 >p : void
 >doThing(A) : void
->doThing : typeof doThing
+>doThing : (x: { n: string; }) => void
 >A : typeof A
 }
 class B extends A {
@@ -23,17 +23,17 @@ class B extends A {
     p1 = doThing(A); // OK
 >p1 : void
 >doThing(A) : void
->doThing : typeof doThing
+>doThing : (x: { n: string; }) => void
 >A : typeof A
 
     p2 = doThing(B); // OK
 >p2 : void
 >doThing(B) : void
->doThing : typeof doThing
+>doThing : (x: { n: string; }) => void
 >B : typeof B
 }
 doThing(B); //OK
 >doThing(B) : void
->doThing : typeof doThing
+>doThing : (x: { n: string; }) => void
 >B : typeof B
 
diff --git a/tests/baselines/reference/stradac.types b/tests/baselines/reference/stradac.types
index a720e3e608d..6fc9bb282be 100644
--- a/tests/baselines/reference/stradac.types
+++ b/tests/baselines/reference/stradac.types
@@ -10,7 +10,7 @@ var x = 10;
     
     
 function foo() {
->foo : typeof foo
+>foo : () => void
 
     x++;
 >x++ : number
diff --git a/tests/baselines/reference/strictMode2.types b/tests/baselines/reference/strictMode2.types
index 87d6db600d6..69c972355b8 100644
--- a/tests/baselines/reference/strictMode2.types
+++ b/tests/baselines/reference/strictMode2.types
@@ -2,7 +2,7 @@
 "use strict";
 
 function foo() {
->foo : typeof foo
+>foo : () => number
 
     return 30;
 }
diff --git a/tests/baselines/reference/strictMode3.types b/tests/baselines/reference/strictMode3.types
index fce99bbcb45..701ebc12d9a 100644
--- a/tests/baselines/reference/strictMode3.types
+++ b/tests/baselines/reference/strictMode3.types
@@ -11,7 +11,7 @@ class B extends A {
 }
 
 function foo() {
->foo : typeof foo
+>foo : () => any
 
     return this.window;
 >this.window : any
diff --git a/tests/baselines/reference/strictMode5.types b/tests/baselines/reference/strictMode5.types
index 8901401c616..dd668dc24d1 100644
--- a/tests/baselines/reference/strictMode5.types
+++ b/tests/baselines/reference/strictMode5.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/strictMode5.ts ===
 function foo(...args) {
->foo : typeof foo
+>foo : (...args: any[]) => void
 >args : any[]
 
     "use strict"
@@ -31,7 +31,7 @@ class A {
 }
 
 function bar(x: number = 10) {
->bar : typeof bar
+>bar : (x?: number) => void
 >x : number
 
     "use strict"
diff --git a/tests/baselines/reference/structural1.types b/tests/baselines/reference/structural1.types
index cb0e8a356a5..dcbfc8a3bb7 100644
--- a/tests/baselines/reference/structural1.types
+++ b/tests/baselines/reference/structural1.types
@@ -13,14 +13,14 @@ module M {
     }
 
     export function f(i:I) {
->f : typeof f
+>f : (i: I) => void
 >i : I
 >I : I
     }
 
     f({salt:2,pepper:0});
 >f({salt:2,pepper:0}) : void
->f : typeof f
+>f : (i: I) => void
 >{salt:2,pepper:0} : { salt: number; pepper: number; }
 >salt : number
 >pepper : number
diff --git a/tests/baselines/reference/subtypingWithCallSignatures.types b/tests/baselines/reference/subtypingWithCallSignatures.types
index c9c35c1cd55..49b5bf299ab 100644
--- a/tests/baselines/reference/subtypingWithCallSignatures.types
+++ b/tests/baselines/reference/subtypingWithCallSignatures.types
@@ -3,46 +3,46 @@ module CallSignature {
 >CallSignature : typeof CallSignature
 
     declare function foo1(cb: (x: number) => void): typeof cb;
->foo1 : typeof foo1
+>foo1 : { (cb: (x: number) => void): (x: number) => void; (cb: any): any; }
 >cb : (x: number) => void
 >x : number
 >cb : (x: number) => void
 
     declare function foo1(cb: any): any;
->foo1 : typeof foo1
+>foo1 : { (cb: (x: number) => void): (x: number) => void; (cb: any): any; }
 >cb : any
 
     var r = foo1((x: number) => 1); // ok because base returns void
 >r : (x: number) => void
 >foo1((x: number) => 1) : (x: number) => void
->foo1 : typeof foo1
+>foo1 : { (cb: (x: number) => void): (x: number) => void; (cb: any): any; }
 >(x: number) => 1 : (x: number) => number
 >x : number
 
     var r2 = foo1(<T>(x: T) => ''); // ok because base returns void
 >r2 : (x: number) => void
 >foo1(<T>(x: T) => '') : (x: number) => void
->foo1 : typeof foo1
+>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;
->foo2 : typeof foo2
+>foo2 : { (cb: (x: number, y: number) => void): (x: number, y: number) => void; (cb: any): any; }
 >cb : (x: number, y: number) => void
 >x : number
 >y : number
 >cb : (x: number, y: number) => void
 
     declare function foo2(cb: any): any;
->foo2 : typeof foo2
+>foo2 : { (cb: (x: number, y: number) => void): (x: number, y: number) => void; (cb: any): any; }
 >cb : any
 
     var r3 = foo2((x: number, y: number) => 1); // ok because base returns void
 >r3 : (x: number, y: number) => void
 >foo2((x: number, y: number) => 1) : (x: number, y: number) => void
->foo2 : typeof foo2
+>foo2 : { (cb: (x: number, y: number) => void): (x: number, y: number) => void; (cb: any): any; }
 >(x: number, y: number) => 1 : (x: number, y: number) => number
 >x : number
 >y : number
@@ -50,7 +50,7 @@ module CallSignature {
     var r4 = foo2(<T>(x: T) => ''); // ok because base returns void
 >r4 : (x: number, y: number) => void
 >foo2(<T>(x: T) => '') : (x: number, y: number) => void
->foo2 : typeof foo2
+>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
diff --git a/tests/baselines/reference/subtypingWithCallSignatures2.types b/tests/baselines/reference/subtypingWithCallSignatures2.types
index 91984c6aba2..5006e00d52b 100644
--- a/tests/baselines/reference/subtypingWithCallSignatures2.types
+++ b/tests/baselines/reference/subtypingWithCallSignatures2.types
@@ -21,59 +21,59 @@ class OtherDerived extends Base { bing: string; }
 >bing : string
 
 declare function foo1(a: (x: number) => number[]): typeof a;
->foo1 : typeof foo1
+>foo1 : { (a: (x: number) => number[]): (x: number) => number[]; (a: any): any; }
 >a : (x: number) => number[]
 >x : number
 >a : (x: number) => number[]
 
 declare function foo1(a: any): any;
->foo1 : typeof foo1
+>foo1 : { (a: (x: number) => number[]): (x: number) => number[]; (a: any): any; }
 >a : any
 
 declare function foo2(a: (x: number) => string[]): typeof a;
->foo2 : typeof foo2
+>foo2 : { (a: (x: number) => string[]): (x: number) => string[]; (a: any): any; }
 >a : (x: number) => string[]
 >x : number
 >a : (x: number) => string[]
 
 declare function foo2(a: any): any;
->foo2 : typeof foo2
+>foo2 : { (a: (x: number) => string[]): (x: number) => string[]; (a: any): any; }
 >a : any
 
 declare function foo3(a: (x: number) => void): typeof a;
->foo3 : typeof foo3
+>foo3 : { (a: (x: number) => void): (x: number) => void; (a: any): any; }
 >a : (x: number) => void
 >x : number
 >a : (x: number) => void
 
 declare function foo3(a: any): any;
->foo3 : typeof foo3
+>foo3 : { (a: (x: number) => void): (x: number) => void; (a: any): any; }
 >a : any
 
 declare function foo4(a: (x: string, y: number) => string): typeof a;
->foo4 : typeof foo4
+>foo4 : { (a: (x: string, y: number) => string): (x: string, y: number) => string; (a: any): any; }
 >a : (x: string, y: number) => string
 >x : string
 >y : number
 >a : (x: string, y: number) => string
 
 declare function foo4(a: any): any;
->foo4 : typeof foo4
+>foo4 : { (a: (x: string, y: number) => string): (x: string, y: number) => string; (a: any): any; }
 >a : any
 
 declare function foo5(a: (x: (arg: string) => number) => string): typeof a;
->foo5 : typeof foo5
+>foo5 : { (a: (x: (arg: string) => number) => string): (x: (arg: string) => number) => string; (a: any): any; }
 >a : (x: (arg: string) => number) => string
 >x : (arg: string) => number
 >arg : string
 >a : (x: (arg: string) => number) => string
 
 declare function foo5(a: any): any;
->foo5 : typeof foo5
+>foo5 : { (a: (x: (arg: string) => number) => string): (x: (arg: string) => number) => string; (a: any): any; }
 >a : any
 
 declare function foo6(a: (x: (arg: Base) => Derived) => Base): typeof a;
->foo6 : typeof foo6
+>foo6 : { (a: (x: (arg: Base) => Derived) => Base): (x: (arg: Base) => Derived) => Base; (a: any): any; }
 >a : (x: (arg: Base) => Derived) => Base
 >x : (arg: Base) => Derived
 >arg : Base
@@ -83,11 +83,11 @@ declare function foo6(a: (x: (arg: Base) => Derived) => Base): typeof a;
 >a : (x: (arg: Base) => Derived) => Base
 
 declare function foo6(a: any): any;
->foo6 : typeof foo6
+>foo6 : { (a: (x: (arg: Base) => Derived) => Base): (x: (arg: Base) => Derived) => Base; (a: any): any; }
 >a : any
 
 declare function foo7(a: (x: (arg: Base) => Derived) => (r: Base) => Derived): typeof a;
->foo7 : typeof foo7
+>foo7 : { (a: (x: (arg: Base) => Derived) => (r: Base) => Derived): (x: (arg: Base) => Derived) => (r: Base) => Derived; (a: any): any; }
 >a : (x: (arg: Base) => Derived) => (r: Base) => Derived
 >x : (arg: Base) => Derived
 >arg : Base
@@ -99,11 +99,11 @@ declare function foo7(a: (x: (arg: Base) => Derived) => (r: Base) => Derived): t
 >a : (x: (arg: Base) => Derived) => (r: Base) => Derived
 
 declare function foo7(a: any): any;
->foo7 : typeof foo7
+>foo7 : { (a: (x: (arg: Base) => Derived) => (r: Base) => Derived): (x: (arg: Base) => Derived) => (r: Base) => Derived; (a: any): any; }
 >a : any
 
 declare function foo8(a: (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived): typeof a;
->foo8 : typeof foo8
+>foo8 : { (a: (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived): (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived; (a: any): any; }
 >a : (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived
 >x : (arg: Base) => Derived
 >arg : Base
@@ -119,11 +119,11 @@ declare function foo8(a: (x: (arg: Base) => Derived, y: (arg2: Base) => Derived)
 >a : (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived
 
 declare function foo8(a: any): any;
->foo8 : typeof foo8
+>foo8 : { (a: (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived): (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived; (a: any): any; }
 >a : any
 
 declare function foo9(a: (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived): typeof a;
->foo9 : typeof foo9
+>foo9 : { (a: (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived): (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived; (a: any): any; }
 >a : (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived
 >x : (arg: Base) => Derived
 >arg : Base
@@ -139,11 +139,11 @@ declare function foo9(a: (x: (arg: Base) => Derived, y: (arg2: Base) => Derived)
 >a : (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived
 
 declare function foo9(a: any): any;
->foo9 : typeof foo9
+>foo9 : { (a: (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived): (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived; (a: any): any; }
 >a : any
 
 declare function foo10(a: (...x: Derived[]) => Derived): typeof a;
->foo10 : typeof foo10
+>foo10 : { (a: (...x: Derived[]) => Derived): (...x: Derived[]) => Derived; (a: any): any; }
 >a : (...x: Derived[]) => Derived
 >x : Derived[]
 >Derived : Derived
@@ -151,11 +151,11 @@ declare function foo10(a: (...x: Derived[]) => Derived): typeof a;
 >a : (...x: Derived[]) => Derived
 
 declare function foo10(a: any): any;
->foo10 : typeof foo10
+>foo10 : { (a: (...x: Derived[]) => Derived): (...x: Derived[]) => Derived; (a: any): any; }
 >a : any
 
 declare function foo11(a: (x: { foo: string }, y: { foo: string; bar: string }) => Base): typeof a;
->foo11 : typeof foo11
+>foo11 : { (a: (x: { foo: string; }, y: { foo: string; bar: string; }) => Base): (x: { foo: string; }, y: { foo: string; bar: string; }) => Base; (a: any): any; }
 >a : (x: { foo: string; }, y: { foo: string; bar: string; }) => Base
 >x : { foo: string; }
 >foo : string
@@ -166,11 +166,11 @@ declare function foo11(a: (x: { foo: string }, y: { foo: string; bar: string })
 >a : (x: { foo: string; }, y: { foo: string; bar: string; }) => Base
 
 declare function foo11(a: any): any;
->foo11 : typeof foo11
+>foo11 : { (a: (x: { foo: string; }, y: { foo: string; bar: string; }) => Base): (x: { foo: string; }, y: { foo: string; bar: string; }) => Base; (a: any): any; }
 >a : any
 
 declare function foo12(a: (x: Array<Base>, y: Array<Derived2>) => Array<Derived>): typeof a;
->foo12 : typeof foo12
+>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[]
@@ -183,11 +183,11 @@ declare function foo12(a: (x: Array<Base>, y: Array<Derived2>) => Array<Derived>
 >a : (x: Base[], y: Derived2[]) => Derived[]
 
 declare function foo12(a: any): any;
->foo12 : typeof foo12
+>foo12 : { (a: (x: Base[], y: Derived2[]) => Derived[]): (x: Base[], y: Derived2[]) => Derived[]; (a: any): any; }
 >a : any
 
 declare function foo13(a: (x: Array<Base>, y: Array<Derived>) => Array<Derived>): typeof a;
->foo13 : typeof foo13
+>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[]
@@ -200,11 +200,11 @@ declare function foo13(a: (x: Array<Base>, y: Array<Derived>) => Array<Derived>)
 >a : (x: Base[], y: Derived[]) => Derived[]
 
 declare function foo13(a: any): any;
->foo13 : typeof foo13
+>foo13 : { (a: (x: Base[], y: Derived[]) => Derived[]): (x: Base[], y: Derived[]) => Derived[]; (a: any): any; }
 >a : any
 
 declare function foo14(a: (x: { a: string; b: number }) => Object): typeof a;
->foo14 : typeof foo14
+>foo14 : { (a: (x: { a: string; b: number; }) => Object): (x: { a: string; b: number; }) => Object; (a: any): any; }
 >a : (x: { a: string; b: number; }) => Object
 >x : { a: string; b: number; }
 >a : string
@@ -213,11 +213,11 @@ declare function foo14(a: (x: { a: string; b: number }) => Object): typeof a;
 >a : (x: { a: string; b: number; }) => Object
 
 declare function foo14(a: any): any;
->foo14 : typeof foo14
+>foo14 : { (a: (x: { a: string; b: number; }) => Object): (x: { a: string; b: number; }) => Object; (a: any): any; }
 >a : any
 
 declare function foo15(a: { 
->foo15 : typeof foo15
+>foo15 : { (a: { (x: number): number[]; (x: string): string[]; }): { (x: number): number[]; (x: string): string[]; }; (a: any): any; }
 >a : { (x: number): number[]; (x: string): string[]; }
 
     (x: number): number[];
@@ -230,11 +230,11 @@ declare function foo15(a: {
 >a : { (x: number): number[]; (x: string): string[]; }
 
 declare function foo15(a: any): any;
->foo15 : typeof foo15
+>foo15 : { (a: { (x: number): number[]; (x: string): string[]; }): { (x: number): number[]; (x: string): string[]; }; (a: any): any; }
 >a : any
 
 declare function foo16(a: {
->foo16 : typeof foo16
+>foo16 : { (a: { <T extends Derived>(x: T): number[]; <U extends Base>(x: U): number[]; }): { <T extends Derived>(x: T): number[]; <U extends Base>(x: U): number[]; }; (a: any): any; }
 >a : { <T extends Derived>(x: T): number[]; <U extends Base>(x: U): number[]; }
 
     <T extends Derived>(x: T): number[];
@@ -253,11 +253,11 @@ declare function foo16(a: {
 >a : { <T extends Derived>(x: T): number[]; <U extends Base>(x: U): number[]; }
 
 declare function foo16(a: any): any;
->foo16 : typeof foo16
+>foo16 : { (a: { <T extends Derived>(x: T): number[]; <U extends Base>(x: U): number[]; }): { <T extends Derived>(x: T): number[]; <U extends Base>(x: U): number[]; }; (a: any): any; }
 >a : any
 
 declare function foo17(a: {
->foo17 : typeof foo17
+>foo17 : { (a: { (x: (a: number) => number): number[]; (x: (a: string) => string): string[]; }): { (x: (a: number) => number): number[]; (x: (a: string) => string): string[]; }; (a: any): any; }
 >a : { (x: (a: number) => number): number[]; (x: (a: string) => string): string[]; }
 
     (x: (a: number) => number): number[];
@@ -272,11 +272,11 @@ declare function foo17(a: {
 >a : { (x: (a: number) => number): number[]; (x: (a: string) => string): string[]; }
 
 declare function foo17(a: any): any;
->foo17 : typeof foo17
+>foo17 : { (a: { (x: (a: number) => number): number[]; (x: (a: string) => string): string[]; }): { (x: (a: number) => number): number[]; (x: (a: string) => string): string[]; }; (a: any): any; }
 >a : any
 
 declare function foo18(a: {
->foo18 : typeof foo18
+>foo18 : { (a: { (x: { (a: number): number; (a: string): string; }): any[]; (x: { (a: boolean): boolean; (a: Date): Date; }): any[]; }): { (x: { (a: number): number; (a: string): string; }): any[]; (x: { (a: boolean): boolean; (a: Date): Date; }): any[]; }; (a: any): any; }
 >a : { (x: { (a: number): number; (a: string): string; }): any[]; (x: { (a: boolean): boolean; (a: Date): Date; }): any[]; }
 
     (x: {
@@ -305,7 +305,7 @@ declare function foo18(a: {
 >a : { (x: { (a: number): number; (a: string): string; }): any[]; (x: { (a: boolean): boolean; (a: Date): Date; }): any[]; }
 
 declare function foo18(a: any): any;
->foo18 : typeof foo18
+>foo18 : { (a: { (x: { (a: number): number; (a: string): string; }): any[]; (x: { (a: boolean): boolean; (a: Date): Date; }): any[]; }): { (x: { (a: number): number; (a: string): string; }): any[]; (x: { (a: boolean): boolean; (a: Date): Date; }): any[]; }; (a: any): any; }
 >a : any
 
 var r1arg1 = <T>(x: T) => [x];
@@ -326,7 +326,7 @@ var r1arg2 = (x: number) => [1];
 var r1 = foo1(r1arg1); // any, return types are not subtype of first overload
 >r1 : any
 >foo1(r1arg1) : any
->foo1 : typeof foo1
+>foo1 : { (a: (x: number) => number[]): (x: number) => number[]; (a: any): any; }
 >r1arg1 : <T>(x: T) => T[]
 
 var r1a = [r1arg2, r1arg1]; // generic signature, subtype in both directions
@@ -358,7 +358,7 @@ var r2arg2 = (x: number) => [''];
 var r2 = foo2(r2arg1); 
 >r2 : (x: number) => string[]
 >foo2(r2arg1) : (x: number) => string[]
->foo2 : typeof foo2
+>foo2 : { (a: (x: number) => string[]): (x: number) => string[]; (a: any): any; }
 >r2arg1 : <T>(x: T) => string[]
 
 var r2a = [r2arg1, r2arg2];
@@ -389,7 +389,7 @@ var r3arg2 = (x: number) => { };
 var r3 = foo3(r3arg1); 
 >r3 : (x: number) => void
 >foo3(r3arg1) : (x: number) => void
->foo3 : typeof foo3
+>foo3 : { (a: (x: number) => void): (x: number) => void; (a: any): any; }
 >r3arg1 : <T>(x: T) => T
 
 var r3a = [r3arg1, r3arg2];
@@ -424,7 +424,7 @@ var r4arg2 = (x: string, y: number) => '';
 var r4 = foo4(r4arg1); // any
 >r4 : any
 >foo4(r4arg1) : any
->foo4 : typeof foo4
+>foo4 : { (a: (x: string, y: number) => string): (x: string, y: number) => string; (a: any): any; }
 >r4arg1 : <T, U>(x: T, y: U) => T
 
 var r4a = [r4arg1, r4arg2];
@@ -460,7 +460,7 @@ var r5arg2 = (x: (arg: string) => number) => '';
 var r5 = foo5(r5arg1); // any
 >r5 : any
 >foo5(r5arg1) : any
->foo5 : typeof foo5
+>foo5 : { (a: (x: (arg: string) => number) => string): (x: (arg: string) => number) => string; (a: any): any; }
 >r5arg1 : <T, U>(x: (arg: T) => U) => T
 
 var r5a = [r5arg1, r5arg2];
@@ -502,7 +502,7 @@ var r6arg2 = (x: (arg: Base) => Derived) => <Base>null;
 var r6 = foo6(r6arg1); // any
 >r6 : any
 >foo6(r6arg1) : any
->foo6 : typeof foo6
+>foo6 : { (a: (x: (arg: Base) => Derived) => Base): (x: (arg: Base) => Derived) => Base; (a: any): any; }
 >r6arg1 : <T extends Base, U extends Derived>(x: (arg: T) => U) => T
 
 var r6a = [r6arg1, r6arg2];
@@ -550,7 +550,7 @@ var r7arg2 = (x: (arg: Base) => Derived) => (r: Base) => <Derived>null;
 var r7 = foo7(r7arg1); // any
 >r7 : any
 >foo7(r7arg1) : any
->foo7 : typeof foo7
+>foo7 : { (a: (x: (arg: Base) => Derived) => (r: Base) => Derived): (x: (arg: Base) => Derived) => (r: Base) => Derived; (a: any): any; }
 >r7arg1 : <T extends Base, U extends Derived>(x: (arg: T) => U) => (r: T) => U
 
 var r7a = [r7arg1, r7arg2];
@@ -606,7 +606,7 @@ var r8arg2 = (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base
 var r8 = foo8(r8arg1); // any
 >r8 : any
 >foo8(r8arg1) : any
->foo8 : typeof foo8
+>foo8 : { (a: (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived): (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived; (a: any): any; }
 >r8arg1 : <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: T) => U) => (r: T) => U
 
 var r8a = [r8arg1, r8arg2];
@@ -663,7 +663,7 @@ var r9arg2 = (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base
 var r9 = foo9(r9arg1); // any
 >r9 : any
 >foo9(r9arg1) : any
->foo9 : typeof foo9
+>foo9 : { (a: (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived): (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived; (a: any): any; }
 >r9arg1 : <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: string; bing: number; }) => U) => (r: T) => U
 
 var r9a = [r9arg1, r9arg2];
@@ -699,7 +699,7 @@ var r10arg2 = (...x: Derived[]) => <Derived>null;
 var r10 = foo10(r10arg1); // any
 >r10 : any
 >foo10(r10arg1) : any
->foo10 : typeof foo10
+>foo10 : { (a: (...x: Derived[]) => Derived): (...x: Derived[]) => Derived; (a: any): any; }
 >r10arg1 : <T extends Derived>(...x: T[]) => T
 
 var r10a = [r10arg1, r10arg2];
@@ -739,7 +739,7 @@ var r11arg2 = (x: { foo: string }, y: { foo: string; bar: string }) => <Base>nul
 var r11 = foo11(r11arg1); // any
 >r11 : any
 >foo11(r11arg1) : any
->foo11 : typeof foo11
+>foo11 : { (a: (x: { foo: string; }, y: { foo: string; bar: string; }) => Base): (x: { foo: string; }, y: { foo: string; bar: string; }) => Base; (a: any): any; }
 >r11arg1 : <T extends Base>(x: T, y: T) => T
 
 var r11a = [r11arg1, r11arg2];
@@ -785,7 +785,7 @@ var r12arg2 = (x: Array<Base>, y: Array<Derived2>) => <Array<Derived>>null;
 var r12 = foo12(r12arg1); // any
 >r12 : (x: Base[], y: Derived2[]) => Derived[]
 >foo12(r12arg1) : (x: Base[], y: Derived2[]) => Derived[]
->foo12 : typeof foo12
+>foo12 : { (a: (x: Base[], y: Derived2[]) => Derived[]): (x: Base[], y: Derived2[]) => Derived[]; (a: any): any; }
 >r12arg1 : <T extends Base[]>(x: Base[], y: T) => Derived[]
 
 var r12a = [r12arg1, r12arg2];
@@ -829,7 +829,7 @@ var r13arg2 = (x: Array<Base>, y: Array<Derived>) => <Array<Derived>>null;
 var r13 = foo13(r13arg1); // any
 >r13 : any
 >foo13(r13arg1) : any
->foo13 : typeof foo13
+>foo13 : { (a: (x: Base[], y: Derived[]) => Derived[]): (x: Base[], y: Derived[]) => Derived[]; (a: any): any; }
 >r13arg1 : <T extends Derived[]>(x: Base[], y: T) => T
 
 var r13a = [r13arg1, r13arg2];
@@ -869,7 +869,7 @@ var r14arg2 = (x: { a: string; b: number }) => <Object>null;
 var r14 = foo14(r14arg1); // any
 >r14 : any
 >foo14(r14arg1) : any
->foo14 : typeof foo14
+>foo14 : { (a: (x: { a: string; b: number; }) => Object): (x: { a: string; b: number; }) => Object; (a: any): any; }
 >r14arg1 : <T>(x: { a: T; b: T; }) => T
 
 var r14a = [r14arg1, r14arg2];
@@ -896,7 +896,7 @@ var r15arg1 = <T>(x: T) => <T[]>null
 var r15 = foo15(r15arg1); // any
 >r15 : any
 >foo15(r15arg1) : any
->foo15 : typeof foo15
+>foo15 : { (a: { (x: number): number[]; (x: string): string[]; }): { (x: number): number[]; (x: string): string[]; }; (a: any): any; }
 >r15arg1 : <T>(x: T) => T[]
 
 var r16arg1 = <T extends Base>(x: T) => [1];
@@ -911,7 +911,7 @@ var r16arg1 = <T extends Base>(x: T) => [1];
 var r16 = foo16(r16arg1); 
 >r16 : { <T extends Derived>(x: T): number[]; <U extends Base>(x: U): number[]; }
 >foo16(r16arg1) : { <T extends Derived>(x: T): number[]; <U extends Base>(x: U): number[]; }
->foo16 : typeof foo16
+>foo16 : { (a: { <T extends Derived>(x: T): number[]; <U extends Base>(x: U): number[]; }): { <T extends Derived>(x: T): number[]; <U extends Base>(x: U): number[]; }; (a: any): any; }
 >r16arg1 : <T extends Base>(x: T) => number[]
 
 var r17arg1 = <T>(x: (a: T) => T) => <T[]>null;
@@ -928,7 +928,7 @@ var r17arg1 = <T>(x: (a: T) => T) => <T[]>null;
 var r17 = foo17(r17arg1); // any
 >r17 : any
 >foo17(r17arg1) : any
->foo17 : typeof foo17
+>foo17 : { (a: { (x: (a: number) => number): number[]; (x: (a: string) => string): string[]; }): { (x: (a: number) => number): number[]; (x: (a: string) => string): string[]; }; (a: any): any; }
 >r17arg1 : <T>(x: (a: T) => T) => T[]
 
 var r18arg1 = <T>(x: (a: T) => T) => <T[]>null;
@@ -945,6 +945,6 @@ var r18arg1 = <T>(x: (a: T) => T) => <T[]>null;
 var r18 = foo18(r18arg1); 
 >r18 : { (x: { (a: number): number; (a: string): string; }): any[]; (x: { (a: boolean): boolean; (a: Date): Date; }): any[]; }
 >foo18(r18arg1) : { (x: { (a: number): number; (a: string): string; }): any[]; (x: { (a: boolean): boolean; (a: Date): Date; }): any[]; }
->foo18 : typeof foo18
+>foo18 : { (a: { (x: { (a: number): number; (a: string): string; }): any[]; (x: { (a: boolean): boolean; (a: Date): Date; }): any[]; }): { (x: { (a: number): number; (a: string): string; }): any[]; (x: { (a: boolean): boolean; (a: Date): Date; }): any[]; }; (a: any): any; }
 >r18arg1 : <T>(x: (a: T) => T) => T[]
 
diff --git a/tests/baselines/reference/subtypingWithCallSignatures3.types b/tests/baselines/reference/subtypingWithCallSignatures3.types
index 122301a477d..8c136113464 100644
--- a/tests/baselines/reference/subtypingWithCallSignatures3.types
+++ b/tests/baselines/reference/subtypingWithCallSignatures3.types
@@ -25,17 +25,17 @@ module Errors {
 >bing : string
 
     declare function foo2(a2: (x: number) => string[]): typeof a2;
->foo2 : typeof foo2
+>foo2 : { (a2: (x: number) => string[]): (x: number) => string[]; (a2: any): any; }
 >a2 : (x: number) => string[]
 >x : number
 >a2 : (x: number) => string[]
 
     declare function foo2(a2: any): any;
->foo2 : typeof foo2
+>foo2 : { (a2: (x: number) => string[]): (x: number) => string[]; (a2: any): any; }
 >a2 : any
 
     declare function foo7(a2: (x: (arg: Base) => Derived) => (r: Base) => Derived2): typeof a2;
->foo7 : typeof foo7
+>foo7 : { (a2: (x: (arg: Base) => Derived) => (r: Base) => Derived2): (x: (arg: Base) => Derived) => (r: Base) => Derived2; (a2: any): any; }
 >a2 : (x: (arg: Base) => Derived) => (r: Base) => Derived2
 >x : (arg: Base) => Derived
 >arg : Base
@@ -47,11 +47,11 @@ module Errors {
 >a2 : (x: (arg: Base) => Derived) => (r: Base) => Derived2
 
     declare function foo7(a2: any): any;
->foo7 : typeof foo7
+>foo7 : { (a2: (x: (arg: Base) => Derived) => (r: Base) => Derived2): (x: (arg: Base) => Derived) => (r: Base) => Derived2; (a2: any): any; }
 >a2 : any
 
     declare function foo8(a2: (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived): typeof a2;
->foo8 : typeof foo8
+>foo8 : { (a2: (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived): (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived; (a2: any): any; }
 >a2 : (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived
 >x : (arg: Base) => Derived
 >arg : Base
@@ -67,11 +67,11 @@ module Errors {
 >a2 : (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived
 
     declare function foo8(a2: any): any;
->foo8 : typeof foo8
+>foo8 : { (a2: (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived): (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived; (a2: any): any; }
 >a2 : any
 
     declare function foo10(a2: (...x: Base[]) => Base): typeof a2;
->foo10 : typeof foo10
+>foo10 : { (a2: (...x: Base[]) => Base): (...x: Base[]) => Base; (a2: any): any; }
 >a2 : (...x: Base[]) => Base
 >x : Base[]
 >Base : Base
@@ -79,11 +79,11 @@ module Errors {
 >a2 : (...x: Base[]) => Base
 
     declare function foo10(a2: any): any;
->foo10 : typeof foo10
+>foo10 : { (a2: (...x: Base[]) => Base): (...x: Base[]) => Base; (a2: any): any; }
 >a2 : any
 
     declare function foo11(a2: (x: { foo: string }, y: { foo: string; bar: string }) => Base): typeof a2;
->foo11 : typeof foo11
+>foo11 : { (a2: (x: { foo: string; }, y: { foo: string; bar: string; }) => Base): (x: { foo: string; }, y: { foo: string; bar: string; }) => Base; (a2: any): any; }
 >a2 : (x: { foo: string; }, y: { foo: string; bar: string; }) => Base
 >x : { foo: string; }
 >foo : string
@@ -94,11 +94,11 @@ module Errors {
 >a2 : (x: { foo: string; }, y: { foo: string; bar: string; }) => Base
 
     declare function foo11(a2: any): any;
->foo11 : typeof foo11
+>foo11 : { (a2: (x: { foo: string; }, y: { foo: string; bar: string; }) => Base): (x: { foo: string; }, y: { foo: string; bar: string; }) => Base; (a2: any): any; }
 >a2 : any
 
     declare function foo12(a2: (x: Array<Base>, y: Array<Derived2>) => Array<Derived>): typeof a2;
->foo12 : typeof foo12
+>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[]
@@ -111,11 +111,11 @@ module Errors {
 >a2 : (x: Base[], y: Derived2[]) => Derived[]
 
     declare function foo12(a2: any): any;
->foo12 : typeof foo12
+>foo12 : { (a2: (x: Base[], y: Derived2[]) => Derived[]): (x: Base[], y: Derived2[]) => Derived[]; (a2: any): any; }
 >a2 : any
 
     declare function foo15(a2: (x: { a: string; b: number }) => number): typeof a2;
->foo15 : typeof foo15
+>foo15 : { (a2: (x: { a: string; b: number; }) => number): (x: { a: string; b: number; }) => number; (a2: any): any; }
 >a2 : (x: { a: string; b: number; }) => number
 >x : { a: string; b: number; }
 >a : string
@@ -123,11 +123,11 @@ module Errors {
 >a2 : (x: { a: string; b: number; }) => number
 
     declare function foo15(a2: any): any;
->foo15 : typeof foo15
+>foo15 : { (a2: (x: { a: string; b: number; }) => number): (x: { a: string; b: number; }) => number; (a2: any): any; }
 >a2 : any
 
     declare function foo16(a2: {
->foo16 : typeof foo16
+>foo16 : { (a2: { (x: { (a: number): number; (a?: number): number; }): number[]; (x: { (a: boolean): boolean; (a?: boolean): boolean; }): boolean[]; }): { (x: { (a: number): number; (a?: number): number; }): number[]; (x: { (a: boolean): boolean; (a?: boolean): boolean; }): boolean[]; }; (a2: any): any; }
 >a2 : { (x: { (a: number): number; (a?: number): number; }): number[]; (x: { (a: boolean): boolean; (a?: boolean): boolean; }): boolean[]; }
 
         // type of parameter is overload set which means we can't do inference based on this type
@@ -155,11 +155,11 @@ module Errors {
 >a2 : { (x: { (a: number): number; (a?: number): number; }): number[]; (x: { (a: boolean): boolean; (a?: boolean): boolean; }): boolean[]; }
 
     declare function foo16(a2: any): any;
->foo16 : typeof foo16
+>foo16 : { (a2: { (x: { (a: number): number; (a?: number): number; }): number[]; (x: { (a: boolean): boolean; (a?: boolean): boolean; }): boolean[]; }): { (x: { (a: number): number; (a?: number): number; }): number[]; (x: { (a: boolean): boolean; (a?: boolean): boolean; }): boolean[]; }; (a2: any): any; }
 >a2 : any
 
     declare function foo17(a2: {
->foo17 : typeof foo17
+>foo17 : { (a2: { (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[]; }): { (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[]; }; (a2: any): any; }
 >a2 : { (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[]; }
 
         (x: {
@@ -202,13 +202,13 @@ module Errors {
 >a2 : { (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[]; }
 
     declare function foo17(a2: any): any;
->foo17 : typeof foo17
+>foo17 : { (a2: { (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[]; }): { (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[]; }; (a2: any): any; }
 >a2 : any
 
     var r1 = foo2(<T, U>(x: T) => <U[]>null); // any
 >r1 : any
 >foo2(<T, U>(x: T) => <U[]>null) : any
->foo2 : typeof foo2
+>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
@@ -280,7 +280,7 @@ module Errors {
     var r2 = foo7(r2arg); // any
 >r2 : any
 >foo7(r2arg) : any
->foo7 : typeof foo7
+>foo7 : { (a2: (x: (arg: Base) => Derived) => (r: Base) => Derived2): (x: (arg: Base) => Derived) => (r: Base) => Derived2; (a2: any): any; }
 >r2arg : <T extends Base, U extends Derived, V extends Derived2>(x: (arg: T) => U) => (r: T) => V
 
     var r2a = [r2arg2, r2arg];
@@ -336,7 +336,7 @@ module Errors {
     var r3 = foo8(r3arg); // any
 >r3 : any
 >foo8(r3arg) : any
->foo8 : typeof foo8
+>foo8 : { (a2: (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived): (x: (arg: Base) => Derived, y: (arg2: Base) => Derived) => (r: Base) => Derived; (a2: any): any; }
 >r3arg : <T extends Base, U extends Derived>(x: (arg: T) => U, y: (arg2: { foo: number; }) => U) => (r: T) => U
 
     var r3a = [r3arg2, r3arg];
@@ -372,7 +372,7 @@ module Errors {
     var r4 = foo10(r4arg); // any
 >r4 : any
 >foo10(r4arg) : any
->foo10 : typeof foo10
+>foo10 : { (a2: (...x: Base[]) => Base): (...x: Base[]) => Base; (a2: any): any; }
 >r4arg : <T extends Derived>(...x: T[]) => T
 
     var r4a = [r4arg2, r4arg];
@@ -413,7 +413,7 @@ module Errors {
     var r5 = foo11(r5arg); // any
 >r5 : any
 >foo11(r5arg) : any
->foo11 : typeof foo11
+>foo11 : { (a2: (x: { foo: string; }, y: { foo: string; bar: string; }) => Base): (x: { foo: string; }, y: { foo: string; bar: string; }) => Base; (a2: any): any; }
 >r5arg : <T extends Derived>(x: T, y: T) => T
 
     var r5a = [r5arg2, r5arg];
@@ -459,7 +459,7 @@ module Errors {
     var r6 = foo12(r6arg); // (x: Array<Base>, y: Array<Derived2>) => Array<Derived>
 >r6 : (x: Base[], y: Derived2[]) => Derived[]
 >foo12(r6arg) : (x: Base[], y: Derived2[]) => Derived[]
->foo12 : typeof foo12
+>foo12 : { (a2: (x: Base[], y: Derived2[]) => Derived[]): (x: Base[], y: Derived2[]) => Derived[]; (a2: any): any; }
 >r6arg : (x: Base[], y: Derived2[]) => Derived[]
 
     var r6a = [r6arg2, r6arg];
@@ -496,7 +496,7 @@ module Errors {
     var r7 = foo15(r7arg); // any
 >r7 : any
 >foo15(r7arg) : any
->foo15 : typeof foo15
+>foo15 : { (a2: (x: { a: string; b: number; }) => number): (x: { a: string; b: number; }) => number; (a2: any): any; }
 >r7arg : <T>(x: { a: T; b: T; }) => T
 
     var r7a = [r7arg2, r7arg];
@@ -525,7 +525,7 @@ module Errors {
     var r7c = foo15(r7arg3); // (x: { a: string; b: number }) => number): number;
 >r7c : (x: { a: string; b: number; }) => number
 >foo15(r7arg3) : (x: { a: string; b: number; }) => number
->foo15 : typeof foo15
+>foo15 : { (a2: (x: { a: string; b: number; }) => number): (x: { a: string; b: number; }) => number; (a2: any): any; }
 >r7arg3 : <T extends Base>(x: { a: T; b: T; }) => number
 
     var r7d = [r7arg2, r7arg3];
@@ -554,7 +554,7 @@ module Errors {
     var r8 = foo16(r8arg); // any
 >r8 : any
 >foo16(r8arg) : any
->foo16 : typeof foo16
+>foo16 : { (a2: { (x: { (a: number): number; (a?: number): number; }): number[]; (x: { (a: boolean): boolean; (a?: boolean): boolean; }): boolean[]; }): { (x: { (a: number): number; (a?: number): number; }): number[]; (x: { (a: boolean): boolean; (a?: boolean): boolean; }): boolean[]; }; (a2: any): any; }
 >r8arg : <T>(x: (a: T) => T) => T[]
 
     var r9arg = <T>(x: (a: T) => T) => <any[]>null;
@@ -570,7 +570,7 @@ module Errors {
     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 : { (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[]; }
 >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[]; }
->foo17 : typeof foo17
+>foo17 : { (a2: { (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[]; }): { (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[]; }; (a2: any): any; }
 >r9arg : <T>(x: (a: T) => T) => any[]
 }
 
@@ -578,7 +578,7 @@ module WithGenericSignaturesInBaseType {
 >WithGenericSignaturesInBaseType : typeof WithGenericSignaturesInBaseType
 
     declare function foo2(a2: <T>(x: T) => T[]): typeof a2;
->foo2 : typeof foo2
+>foo2 : { (a2: <T>(x: T) => T[]): <T>(x: T) => T[]; (a2: any): any; }
 >a2 : <T>(x: T) => T[]
 >T : T
 >x : T
@@ -587,7 +587,7 @@ module WithGenericSignaturesInBaseType {
 >a2 : <T>(x: T) => T[]
 
     declare function foo2(a2: any): any;
->foo2 : typeof foo2
+>foo2 : { (a2: <T>(x: T) => T[]): <T>(x: T) => T[]; (a2: any): any; }
 >a2 : any
 
     var r2arg2 = <T>(x: T) => [''];
@@ -601,11 +601,11 @@ module WithGenericSignaturesInBaseType {
     var r2 = foo2(r2arg2); // <T>(x:T) => T[] since we can infer from generic signatures now
 >r2 : <T>(x: T) => T[]
 >foo2(r2arg2) : <T>(x: T) => T[]
->foo2 : typeof foo2
+>foo2 : { (a2: <T>(x: T) => T[]): <T>(x: T) => T[]; (a2: any): any; }
 >r2arg2 : <T>(x: T) => string[]
 
     declare function foo3(a2: <T>(x: T) => string[]): typeof a2;
->foo3 : typeof foo3
+>foo3 : { (a2: <T>(x: T) => string[]): <T>(x: T) => string[]; (a2: any): any; }
 >a2 : <T>(x: T) => string[]
 >T : T
 >x : T
@@ -613,7 +613,7 @@ module WithGenericSignaturesInBaseType {
 >a2 : <T>(x: T) => string[]
 
     declare function foo3(a2: any): any;
->foo3 : typeof foo3
+>foo3 : { (a2: <T>(x: T) => string[]): <T>(x: T) => string[]; (a2: any): any; }
 >a2 : any
 
     var r3arg2 = <T>(x: T) => <T[]>null;
@@ -628,6 +628,6 @@ module WithGenericSignaturesInBaseType {
     var r3 = foo3(r3arg2); // any
 >r3 : any
 >foo3(r3arg2) : any
->foo3 : typeof foo3
+>foo3 : { (a2: <T>(x: T) => string[]): <T>(x: T) => string[]; (a2: any): any; }
 >r3arg2 : <T>(x: T) => T[]
 }
diff --git a/tests/baselines/reference/subtypingWithCallSignatures4.types b/tests/baselines/reference/subtypingWithCallSignatures4.types
index e570a89ab42..07b3af3e540 100644
--- a/tests/baselines/reference/subtypingWithCallSignatures4.types
+++ b/tests/baselines/reference/subtypingWithCallSignatures4.types
@@ -21,7 +21,7 @@ class OtherDerived extends Base { bing: string; }
 >bing : string
 
 declare function foo1(a: <T>(x: T) => T[]);
->foo1 : typeof foo1
+>foo1 : { (a: <T>(x: T) => T[]): any; (a: any): any; }
 >a : <T>(x: T) => T[]
 >T : T
 >x : T
@@ -29,33 +29,33 @@ declare function foo1(a: <T>(x: T) => T[]);
 >T : T
 
 declare function foo1(a: any): any;
->foo1 : typeof foo1
+>foo1 : { (a: <T>(x: T) => T[]): any; (a: any): any; }
 >a : any
 
 declare function foo2(a2: <T>(x: T) => string[]);
->foo2 : typeof foo2
+>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 : typeof foo2
+>foo2 : { (a2: <T>(x: T) => string[]): any; (a: any): any; }
 >a : any
 
 declare function foo3(a3: <T>(x: T) => void);
->foo3 : typeof foo3
+>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 : typeof foo3
+>foo3 : { (a3: <T>(x: T) => void): any; (a: any): any; }
 >a : any
 
 declare function foo4(a4: <T, U>(x: T, y: U) => string);
->foo4 : typeof foo4
+>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
@@ -65,11 +65,11 @@ declare function foo4(a4: <T, U>(x: T, y: U) => string);
 >U : U
 
 declare function foo4(a: any): any;
->foo4 : typeof foo4
+>foo4 : { (a4: <T, U>(x: T, y: U) => string): any; (a: any): any; }
 >a : any
 
 declare function foo5(a5: <T, U>(x: (arg: T) => U) => T);
->foo5 : typeof foo5
+>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
@@ -80,11 +80,11 @@ declare function foo5(a5: <T, U>(x: (arg: T) => U) => T);
 >T : T
 
 declare function foo5(a: any): any;
->foo5 : typeof foo5
+>foo5 : { (a5: <T, U>(x: (arg: T) => U) => T): any; (a: any): any; }
 >a : any
 
 declare function foo6(a6: <T extends Base>(x: (arg: T) => Derived) => T);
->foo6 : typeof foo6
+>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
@@ -95,11 +95,11 @@ declare function foo6(a6: <T extends Base>(x: (arg: T) => Derived) => T);
 >T : T
 
 declare function foo6(a: any): any;
->foo6 : typeof foo6
+>foo6 : { (a6: <T extends Base>(x: (arg: T) => Derived) => T): any; (a: any): any; }
 >a : any
 
 declare function foo11(a11: <T>(x: { foo: T }, y: { foo: T; bar: T }) => Base);
->foo11 : typeof foo11
+>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; }
@@ -113,11 +113,11 @@ declare function foo11(a11: <T>(x: { foo: T }, y: { foo: T; bar: T }) => Base);
 >Base : Base
 
 declare function foo11(a: any): any;
->foo11 : typeof foo11
+>foo11 : { (a11: <T>(x: { foo: T; }, y: { foo: T; bar: T; }) => Base): any; (a: any): any; }
 >a : any
 
 declare function foo15(a15: <T>(x: { a: T; b: T }) => T[]);
->foo15 : typeof foo15
+>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; }
@@ -128,11 +128,11 @@ declare function foo15(a15: <T>(x: { a: T; b: T }) => T[]);
 >T : T
 
 declare function foo15(a: any): any;
->foo15 : typeof foo15
+>foo15 : { (a15: <T>(x: { a: T; b: T; }) => T[]): any; (a: any): any; }
 >a : any
 
 declare function foo16(a16: <T extends Base>(x: { a: T; b: T }) => T[]);
->foo16 : typeof foo16
+>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
@@ -144,11 +144,11 @@ declare function foo16(a16: <T extends Base>(x: { a: T; b: T }) => T[]);
 >T : T
 
 declare function foo16(a: any): any;
->foo16 : typeof foo16
+>foo16 : { (a16: <T extends Base>(x: { a: T; b: T; }) => T[]): any; (a: any): any; }
 >a : any
 
 declare function foo17(a17: {
->foo17 : typeof foo17
+>foo17 : { (a17: { <T extends Derived>(x: (a: T) => T): T[]; <T extends Base>(x: (a: T) => T): T[]; }): any; (a: any): any; }
 >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[];
@@ -171,11 +171,11 @@ declare function foo17(a17: {
 
 });
 declare function foo17(a: any): any;
->foo17 : typeof foo17
+>foo17 : { (a17: { <T extends Derived>(x: (a: T) => T): T[]; <T extends Base>(x: (a: T) => T): T[]; }): any; (a: any): any; }
 >a : any
 
 declare function foo18(a18: {
->foo18 : typeof foo18
+>foo18 : { (a18: { (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[]; }): any; (a: any): any; }
 >a18 : { (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[]; }
 
     (x: {
@@ -216,7 +216,7 @@ declare function foo18(a18: {
     }): any[];
 });
 declare function foo18(a: any): any;
->foo18 : typeof foo18
+>foo18 : { (a18: { (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[]; }): any; (a: any): any; }
 >a : any
 
 var r1arg = <T>(x: T) => <T[]>null;
@@ -240,7 +240,7 @@ var r1arg2 = <T>(x: T) => <T[]>null;
 var r1 = foo1(r1arg);
 >r1 : any
 >foo1(r1arg) : any
->foo1 : typeof foo1
+>foo1 : { (a: <T>(x: T) => T[]): any; (a: any): any; }
 >r1arg : <T>(x: T) => T[]
 
 var r1a = [r1arg, r1arg2];
@@ -274,7 +274,7 @@ var r2arg2 = <T>(x: T) => [''];
 var r2 = foo2(r2arg);
 >r2 : any
 >foo2(r2arg) : any
->foo2 : typeof foo2
+>foo2 : { (a2: <T>(x: T) => string[]): any; (a: any): any; }
 >r2arg : <T>(x: T) => string[]
 
 var r2a = [r2arg, r2arg2];
@@ -308,7 +308,7 @@ var r3arg2 = <T>(x: T) => { };
 var r3 = foo3(r3arg);
 >r3 : any
 >foo3(r3arg) : any
->foo3 : typeof foo3
+>foo3 : { (a3: <T>(x: T) => void): any; (a: any): any; }
 >r3arg : <T>(x: T) => T
 
 var r3a = [r3arg, r3arg2];
@@ -346,7 +346,7 @@ var r4arg2 = <T, U>(x: T, y: U) => '';
 var r4 = foo4(r4arg);
 >r4 : any
 >foo4(r4arg) : any
->foo4 : typeof foo4
+>foo4 : { (a4: <T, U>(x: T, y: U) => string): any; (a: any): any; }
 >r4arg : <T, U>(x: T, y: U) => string
 
 var r4a = [r4arg, r4arg2];
@@ -388,7 +388,7 @@ var r5arg2 = <T, U>(x: (arg: T) => U) => <T>null;
 var r5 = foo5(r5arg);
 >r5 : any
 >foo5(r5arg) : any
->foo5 : typeof foo5
+>foo5 : { (a5: <T, U>(x: (arg: T) => U) => T): any; (a: any): any; }
 >r5arg : <T, U>(x: (arg: T) => U) => T
 
 var r5a = [r5arg, r5arg2];
@@ -432,7 +432,7 @@ var r6arg2 = <T extends Base>(x: (arg: T) => Derived) => <T>null;
 var r6 = foo6(r6arg);
 >r6 : any
 >foo6(r6arg) : any
->foo6 : typeof foo6
+>foo6 : { (a6: <T extends Base>(x: (arg: T) => Derived) => T): any; (a: any): any; }
 >r6arg : <T extends Base, U extends Derived>(x: (arg: T) => U) => T
 
 var r6a = [r6arg, r6arg2];
@@ -481,7 +481,7 @@ var r11arg2 = <T>(x: { foo: T }, y: { foo: T; bar: T }) => <Base>null;
 var r11 = foo11(r11arg);
 >r11 : any
 >foo11(r11arg) : any
->foo11 : typeof foo11
+>foo11 : { (a11: <T>(x: { foo: T; }, y: { foo: T; bar: T; }) => Base): any; (a: any): any; }
 >r11arg : <T, U>(x: { foo: T; }, y: { foo: U; bar: U; }) => Base
 
 var r11a = [r11arg, r11arg2];
@@ -524,7 +524,7 @@ var r15arg2 = <T>(x: { a: T; b: T }) => <T[]>null;
 var r15 = foo15(r15arg);
 >r15 : any
 >foo15(r15arg) : any
->foo15 : typeof foo15
+>foo15 : { (a15: <T>(x: { a: T; b: T; }) => T[]): any; (a: any): any; }
 >r15arg : <U, V>(x: { a: U; b: V; }) => U[]
 
 var r15a = [r15arg, r15arg2];
@@ -568,7 +568,7 @@ var r16arg2 = <T extends Base>(x: { a: T; b: T }) => <T[]>null;
 var r16 = foo16(r16arg);
 >r16 : any
 >foo16(r16arg) : any
->foo16 : typeof foo16
+>foo16 : { (a16: <T extends Base>(x: { a: T; b: T; }) => T[]): any; (a: any): any; }
 >r16arg : <T extends Base>(x: { a: T; b: T; }) => T[]
 
 var r16a = [r16arg, r16arg2];
@@ -597,7 +597,7 @@ var r17arg = <T>(x: (a: T) => T) => <T[]>null;
 var r17 = foo17(r17arg);
 >r17 : any
 >foo17(r17arg) : any
->foo17 : typeof foo17
+>foo17 : { (a17: { <T extends Derived>(x: (a: T) => T): T[]; <T extends Base>(x: (a: T) => T): T[]; }): any; (a: any): any; }
 >r17arg : <T>(x: (a: T) => T) => T[]
 
 var r18arg = (x: <T>(a: T) => T) => <any[]>null;
@@ -613,6 +613,6 @@ var r18arg = (x: <T>(a: T) => T) => <any[]>null;
 var r18 = foo18(r18arg);
 >r18 : any
 >foo18(r18arg) : any
->foo18 : typeof foo18
+>foo18 : { (a18: { (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[]; }): any; (a: any): any; }
 >r18arg : (x: <T>(a: T) => T) => any[]
 
diff --git a/tests/baselines/reference/subtypingWithConstructSignatures.types b/tests/baselines/reference/subtypingWithConstructSignatures.types
index ed6ebc18c56..71ee7384f25 100644
--- a/tests/baselines/reference/subtypingWithConstructSignatures.types
+++ b/tests/baselines/reference/subtypingWithConstructSignatures.types
@@ -3,13 +3,13 @@ module ConstructSignature {
 >ConstructSignature : typeof ConstructSignature
 
     declare function foo1(cb: new (x: number) => void): typeof cb;
->foo1 : typeof foo1
+>foo1 : { (cb: new (x: number) => void): new (x: number) => void; (cb: any): any; }
 >cb : new (x: number) => void
 >x : number
 >cb : new (x: number) => void
 
     declare function foo1(cb: any): any;
->foo1 : typeof foo1
+>foo1 : { (cb: new (x: number) => void): new (x: number) => void; (cb: any): any; }
 >cb : any
 
     var rarg1: new (x: number) => number;
@@ -19,7 +19,7 @@ module ConstructSignature {
     var r = foo1(rarg1); // ok because base returns void
 >r : new (x: number) => void
 >foo1(rarg1) : new (x: number) => void
->foo1 : typeof foo1
+>foo1 : { (cb: new (x: number) => void): new (x: number) => void; (cb: any): any; }
 >rarg1 : new (x: number) => number
 
     var rarg2: new <T>(x: T) => string;
@@ -31,18 +31,18 @@ module ConstructSignature {
     var r2 = foo1(rarg2); // ok because base returns void
 >r2 : new (x: number) => void
 >foo1(rarg2) : new (x: number) => void
->foo1 : typeof foo1
+>foo1 : { (cb: new (x: number) => void): new (x: number) => void; (cb: any): any; }
 >rarg2 : new <T>(x: T) => string
 
     declare function foo2(cb: new (x: number, y: number) => void): typeof cb;
->foo2 : typeof foo2
+>foo2 : { (cb: new (x: number, y: number) => void): new (x: number, y: number) => void; (cb: any): any; }
 >cb : new (x: number, y: number) => void
 >x : number
 >y : number
 >cb : new (x: number, y: number) => void
 
     declare function foo2(cb: any): any;
->foo2 : typeof foo2
+>foo2 : { (cb: new (x: number, y: number) => void): new (x: number, y: number) => void; (cb: any): any; }
 >cb : any
 
     var r3arg1: new (x: number, y: number) => number;
@@ -53,7 +53,7 @@ module ConstructSignature {
     var r3 = foo2(r3arg1); // ok because base returns void
 >r3 : new (x: number, y: number) => void
 >foo2(r3arg1) : new (x: number, y: number) => void
->foo2 : typeof foo2
+>foo2 : { (cb: new (x: number, y: number) => void): new (x: number, y: number) => void; (cb: any): any; }
 >r3arg1 : new (x: number, y: number) => number
 
     var r4arg1: new <T>(x: T) => string;
@@ -65,6 +65,6 @@ module ConstructSignature {
     var r4 = foo2(r4arg1); // ok because base returns void
 >r4 : new (x: number, y: number) => void
 >foo2(r4arg1) : new (x: number, y: number) => void
->foo2 : typeof foo2
+>foo2 : { (cb: new (x: number, y: number) => void): new (x: number, y: number) => void; (cb: any): any; }
 >r4arg1 : new <T>(x: T) => string
 }
diff --git a/tests/baselines/reference/subtypingWithConstructSignatures2.types b/tests/baselines/reference/subtypingWithConstructSignatures2.types
index 75859e04902..fdba6014751 100644
--- a/tests/baselines/reference/subtypingWithConstructSignatures2.types
+++ b/tests/baselines/reference/subtypingWithConstructSignatures2.types
@@ -21,59 +21,59 @@ class OtherDerived extends Base { bing: string; }
 >bing : string
 
 declare function foo1(a: new (x: number) => number[]): typeof a;
->foo1 : typeof foo1
+>foo1 : { (a: new (x: number) => number[]): new (x: number) => number[]; (a: any): any; }
 >a : new (x: number) => number[]
 >x : number
 >a : new (x: number) => number[]
 
 declare function foo1(a: any): any;
->foo1 : typeof foo1
+>foo1 : { (a: new (x: number) => number[]): new (x: number) => number[]; (a: any): any; }
 >a : any
 
 declare function foo2(a: new (x: number) => string[]): typeof a;
->foo2 : typeof foo2
+>foo2 : { (a: new (x: number) => string[]): new (x: number) => string[]; (a: any): any; }
 >a : new (x: number) => string[]
 >x : number
 >a : new (x: number) => string[]
 
 declare function foo2(a: any): any;
->foo2 : typeof foo2
+>foo2 : { (a: new (x: number) => string[]): new (x: number) => string[]; (a: any): any; }
 >a : any
 
 declare function foo3(a: new (x: number) => void): typeof a;
->foo3 : typeof foo3
+>foo3 : { (a: new (x: number) => void): new (x: number) => void; (a: any): any; }
 >a : new (x: number) => void
 >x : number
 >a : new (x: number) => void
 
 declare function foo3(a: any): any;
->foo3 : typeof foo3
+>foo3 : { (a: new (x: number) => void): new (x: number) => void; (a: any): any; }
 >a : any
 
 declare function foo4(a: new (x: string, y: number) => string): typeof a;
->foo4 : typeof foo4
+>foo4 : { (a: new (x: string, y: number) => string): new (x: string, y: number) => string; (a: any): any; }
 >a : new (x: string, y: number) => string
 >x : string
 >y : number
 >a : new (x: string, y: number) => string
 
 declare function foo4(a: any): any;
->foo4 : typeof foo4
+>foo4 : { (a: new (x: string, y: number) => string): new (x: string, y: number) => string; (a: any): any; }
 >a : any
 
 declare function foo5(a: new (x: new (arg: string) => number) => string): typeof a;
->foo5 : typeof foo5
+>foo5 : { (a: new (x: new (arg: string) => number) => string): new (x: new (arg: string) => number) => string; (a: any): any; }
 >a : new (x: new (arg: string) => number) => string
 >x : new (arg: string) => number
 >arg : string
 >a : new (x: new (arg: string) => number) => string
 
 declare function foo5(a: any): any;
->foo5 : typeof foo5
+>foo5 : { (a: new (x: new (arg: string) => number) => string): new (x: new (arg: string) => number) => string; (a: any): any; }
 >a : any
 
 declare function foo6(a: new (x: new (arg: Base) => Derived) => Base): typeof a;
->foo6 : typeof foo6
+>foo6 : { (a: new (x: new (arg: Base) => Derived) => Base): new (x: new (arg: Base) => Derived) => Base; (a: any): any; }
 >a : new (x: new (arg: Base) => Derived) => Base
 >x : new (arg: Base) => Derived
 >arg : Base
@@ -83,11 +83,11 @@ declare function foo6(a: new (x: new (arg: Base) => Derived) => Base): typeof a;
 >a : new (x: new (arg: Base) => Derived) => Base
 
 declare function foo6(a: any): any;
->foo6 : typeof foo6
+>foo6 : { (a: new (x: new (arg: Base) => Derived) => Base): new (x: new (arg: Base) => Derived) => Base; (a: any): any; }
 >a : any
 
 declare function foo7(a: new (x: new (arg: Base) => Derived) => new (r: Base) => Derived): typeof a;
->foo7 : typeof foo7
+>foo7 : { (a: new (x: new (arg: Base) => Derived) => new (r: Base) => Derived): new (x: new (arg: Base) => Derived) => new (r: Base) => Derived; (a: any): any; }
 >a : new (x: new (arg: Base) => Derived) => new (r: Base) => Derived
 >x : new (arg: Base) => Derived
 >arg : Base
@@ -99,11 +99,11 @@ declare function foo7(a: new (x: new (arg: Base) => Derived) => new (r: Base) =>
 >a : new (x: new (arg: Base) => Derived) => new (r: Base) => Derived
 
 declare function foo7(a: any): any;
->foo7 : typeof foo7
+>foo7 : { (a: new (x: new (arg: Base) => Derived) => new (r: Base) => Derived): new (x: new (arg: Base) => Derived) => new (r: Base) => Derived; (a: any): any; }
 >a : any
 
 declare function foo8(a: new (x: new (arg: Base) => Derived, y: new (arg2: Base) => Derived) => new (r: Base) => Derived): typeof a;
->foo8 : typeof foo8
+>foo8 : { (a: new (x: new (arg: Base) => Derived, y: new (arg2: Base) => Derived) => new (r: Base) => Derived): new (x: new (arg: Base) => Derived, y: new (arg2: Base) => Derived) => new (r: Base) => Derived; (a: any): any; }
 >a : new (x: new (arg: Base) => Derived, y: new (arg2: Base) => Derived) => new (r: Base) => Derived
 >x : new (arg: Base) => Derived
 >arg : Base
@@ -119,11 +119,11 @@ 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
 
 declare function foo8(a: any): any;
->foo8 : typeof foo8
+>foo8 : { (a: new (x: new (arg: Base) => Derived, y: new (arg2: Base) => Derived) => new (r: Base) => Derived): new (x: new (arg: Base) => Derived, y: new (arg2: Base) => Derived) => new (r: Base) => Derived; (a: any): any; }
 >a : any
 
 declare function foo9(a: new (x: new (arg: Base) => Derived, y: new (arg2: Base) => Derived) => new (r: Base) => Derived): typeof a;
->foo9 : typeof foo9
+>foo9 : { (a: new (x: new (arg: Base) => Derived, y: new (arg2: Base) => Derived) => new (r: Base) => Derived): new (x: new (arg: Base) => Derived, y: new (arg2: Base) => Derived) => new (r: Base) => Derived; (a: any): any; }
 >a : new (x: new (arg: Base) => Derived, y: new (arg2: Base) => Derived) => new (r: Base) => Derived
 >x : new (arg: Base) => Derived
 >arg : Base
@@ -139,11 +139,11 @@ 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
 
 declare function foo9(a: any): any;
->foo9 : typeof foo9
+>foo9 : { (a: new (x: new (arg: Base) => Derived, y: new (arg2: Base) => Derived) => new (r: Base) => Derived): new (x: new (arg: Base) => Derived, y: new (arg2: Base) => Derived) => new (r: Base) => Derived; (a: any): any; }
 >a : any
 
 declare function foo10(a: new (...x: Derived[]) => Derived): typeof a;
->foo10 : typeof foo10
+>foo10 : { (a: new (...x: Derived[]) => Derived): new (...x: Derived[]) => Derived; (a: any): any; }
 >a : new (...x: Derived[]) => Derived
 >x : Derived[]
 >Derived : Derived
@@ -151,11 +151,11 @@ declare function foo10(a: new (...x: Derived[]) => Derived): typeof a;
 >a : new (...x: Derived[]) => Derived
 
 declare function foo10(a: any): any;
->foo10 : typeof foo10
+>foo10 : { (a: new (...x: Derived[]) => Derived): new (...x: Derived[]) => Derived; (a: any): any; }
 >a : any
 
 declare function foo11(a: new (x: { foo: string }, y: { foo: string; bar: string }) => Base): typeof a;
->foo11 : typeof foo11
+>foo11 : { (a: new (x: { foo: string; }, y: { foo: string; bar: string; }) => Base): new (x: { foo: string; }, y: { foo: string; bar: string; }) => Base; (a: any): any; }
 >a : new (x: { foo: string; }, y: { foo: string; bar: string; }) => Base
 >x : { foo: string; }
 >foo : string
@@ -166,11 +166,11 @@ declare function foo11(a: new (x: { foo: string }, y: { foo: string; bar: string
 >a : new (x: { foo: string; }, y: { foo: string; bar: string; }) => Base
 
 declare function foo11(a: any): any;
->foo11 : typeof foo11
+>foo11 : { (a: new (x: { foo: string; }, y: { foo: string; bar: string; }) => Base): new (x: { foo: string; }, y: { foo: string; bar: string; }) => Base; (a: any): any; }
 >a : any
 
 declare function foo12(a: new (x: Array<Base>, y: Array<Derived2>) => Array<Derived>): typeof a;
->foo12 : typeof foo12
+>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[]
@@ -183,11 +183,11 @@ declare function foo12(a: new (x: Array<Base>, y: Array<Derived2>) => Array<Deri
 >a : new (x: Base[], y: Derived2[]) => Derived[]
 
 declare function foo12(a: any): any;
->foo12 : typeof foo12
+>foo12 : { (a: new (x: Base[], y: Derived2[]) => Derived[]): new (x: Base[], y: Derived2[]) => Derived[]; (a: any): any; }
 >a : any
 
 declare function foo13(a: new (x: Array<Base>, y: Array<Derived>) => Array<Derived>): typeof a;
->foo13 : typeof foo13
+>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[]
@@ -200,11 +200,11 @@ declare function foo13(a: new (x: Array<Base>, y: Array<Derived>) => Array<Deriv
 >a : new (x: Base[], y: Derived[]) => Derived[]
 
 declare function foo13(a: any): any;
->foo13 : typeof foo13
+>foo13 : { (a: new (x: Base[], y: Derived[]) => Derived[]): new (x: Base[], y: Derived[]) => Derived[]; (a: any): any; }
 >a : any
 
 declare function foo14(a: new (x: { a: string; b: number }) => Object): typeof a;
->foo14 : typeof foo14
+>foo14 : { (a: new (x: { a: string; b: number; }) => Object): new (x: { a: string; b: number; }) => Object; (a: any): any; }
 >a : new (x: { a: string; b: number; }) => Object
 >x : { a: string; b: number; }
 >a : string
@@ -213,11 +213,11 @@ declare function foo14(a: new (x: { a: string; b: number }) => Object): typeof a
 >a : new (x: { a: string; b: number; }) => Object
 
 declare function foo14(a: any): any;
->foo14 : typeof foo14
+>foo14 : { (a: new (x: { a: string; b: number; }) => Object): new (x: { a: string; b: number; }) => Object; (a: any): any; }
 >a : any
 
 declare function foo15(a: { 
->foo15 : typeof foo15
+>foo15 : { (a: { new (x: number): number[]; new (x: string): string[]; }): { new (x: number): number[]; new (x: string): string[]; }; (a: any): any; }
 >a : { new (x: number): number[]; new (x: string): string[]; }
 
     new (x: number): number[];
@@ -230,11 +230,11 @@ declare function foo15(a: {
 >a : { new (x: number): number[]; new (x: string): string[]; }
 
 declare function foo15(a: any): any;
->foo15 : typeof foo15
+>foo15 : { (a: { new (x: number): number[]; new (x: string): string[]; }): { new (x: number): number[]; new (x: string): string[]; }; (a: any): any; }
 >a : any
 
 declare function foo16(a: {
->foo16 : typeof foo16
+>foo16 : { (a: { new <T extends Derived>(x: T): number[]; new <U extends Base>(x: U): number[]; }): { new <T extends Derived>(x: T): number[]; new <U extends Base>(x: U): number[]; }; (a: any): any; }
 >a : { new <T extends Derived>(x: T): number[]; new <U extends Base>(x: U): number[]; }
 
     new <T extends Derived>(x: T): number[];
@@ -253,11 +253,11 @@ declare function foo16(a: {
 >a : { new <T extends Derived>(x: T): number[]; new <U extends Base>(x: U): number[]; }
 
 declare function foo16(a: any): any;
->foo16 : typeof foo16
+>foo16 : { (a: { new <T extends Derived>(x: T): number[]; new <U extends Base>(x: U): number[]; }): { new <T extends Derived>(x: T): number[]; new <U extends Base>(x: U): number[]; }; (a: any): any; }
 >a : any
 
 declare function foo17(a: {
->foo17 : typeof foo17
+>foo17 : { (a: { new (x: (a: number) => number): number[]; new (x: (a: string) => string): string[]; }): { new (x: (a: number) => number): number[]; new (x: (a: string) => string): string[]; }; (a: any): any; }
 >a : { new (x: (a: number) => number): number[]; new (x: (a: string) => string): string[]; }
 
     new (x: (a: number) => number): number[];
@@ -272,11 +272,11 @@ declare function foo17(a: {
 >a : { new (x: (a: number) => number): number[]; new (x: (a: string) => string): string[]; }
 
 declare function foo17(a: any): any;
->foo17 : typeof foo17
+>foo17 : { (a: { new (x: (a: number) => number): number[]; new (x: (a: string) => string): string[]; }): { new (x: (a: number) => number): number[]; new (x: (a: string) => string): string[]; }; (a: any): any; }
 >a : any
 
 declare function foo18(a: {
->foo18 : typeof foo18
+>foo18 : { (a: { new (x: { new (a: number): number; new (a: string): string; }): any[]; new (x: { new (a: boolean): boolean; new (a: Date): Date; }): any[]; }): { new (x: { new (a: number): number; new (a: string): string; }): any[]; new (x: { new (a: boolean): boolean; new (a: Date): Date; }): any[]; }; (a: any): any; }
 >a : { new (x: { new (a: number): number; new (a: string): string; }): any[]; new (x: { new (a: boolean): boolean; new (a: Date): Date; }): any[]; }
 
     new (x: {
@@ -305,7 +305,7 @@ declare function foo18(a: {
 >a : { new (x: { new (a: number): number; new (a: string): string; }): any[]; new (x: { new (a: boolean): boolean; new (a: Date): Date; }): any[]; }
 
 declare function foo18(a: any): any;
->foo18 : typeof foo18
+>foo18 : { (a: { new (x: { new (a: number): number; new (a: string): string; }): any[]; new (x: { new (a: boolean): boolean; new (a: Date): Date; }): any[]; }): { new (x: { new (a: number): number; new (a: string): string; }): any[]; new (x: { new (a: boolean): boolean; new (a: Date): Date; }): any[]; }; (a: any): any; }
 >a : any
 
 var r1arg1: new <T>(x: T) => T[];
@@ -322,7 +322,7 @@ var r1arg2: new (x: number) => number[];
 var r1 = foo1(r1arg1); // any, return types are not subtype of first overload
 >r1 : any
 >foo1(r1arg1) : any
->foo1 : typeof foo1
+>foo1 : { (a: new (x: number) => number[]): new (x: number) => number[]; (a: any): any; }
 >r1arg1 : new <T>(x: T) => T[]
 
 var r1a = [r1arg2, r1arg1]; // generic signature, subtype in both directions
@@ -350,7 +350,7 @@ var r2arg2: new (x: number) => string[];
 var r2 = foo2(r2arg1);
 >r2 : new (x: number) => string[]
 >foo2(r2arg1) : new (x: number) => string[]
->foo2 : typeof foo2
+>foo2 : { (a: new (x: number) => string[]): new (x: number) => string[]; (a: any): any; }
 >r2arg1 : new <T>(x: T) => string[]
 
 var r2a = [r2arg1, r2arg2];
@@ -379,7 +379,7 @@ var r3arg2: new (x: number) => void;
 var r3 = foo3(r3arg1);
 >r3 : new (x: number) => void
 >foo3(r3arg1) : new (x: number) => void
->foo3 : typeof foo3
+>foo3 : { (a: new (x: number) => void): new (x: number) => void; (a: any): any; }
 >r3arg1 : new <T>(x: T) => T
 
 var r3a = [r3arg1, r3arg2];
@@ -412,7 +412,7 @@ var r4arg2: new (x: string, y: number) => string;
 var r4 = foo4(r4arg1); // any
 >r4 : any
 >foo4(r4arg1) : any
->foo4 : typeof foo4
+>foo4 : { (a: new (x: string, y: number) => string): new (x: string, y: number) => string; (a: any): any; }
 >r4arg1 : new <T, U>(x: T, y: U) => T
 
 var r4a = [r4arg1, r4arg2];
@@ -445,7 +445,7 @@ var r5arg2: new (x: new (arg: string) => number) => string;
 var r5 = foo5(r5arg1); // any
 >r5 : any
 >foo5(r5arg1) : any
->foo5 : typeof foo5
+>foo5 : { (a: new (x: new (arg: string) => number) => string): new (x: new (arg: string) => number) => string; (a: any): any; }
 >r5arg1 : new <T, U>(x: new (arg: T) => U) => T
 
 var r5a = [r5arg1, r5arg2];
@@ -483,7 +483,7 @@ var r6arg2: new (x: new (arg: Base) => Derived) => Base;
 var r6 = foo6(r6arg1); // any
 >r6 : any
 >foo6(r6arg1) : any
->foo6 : typeof foo6
+>foo6 : { (a: new (x: new (arg: Base) => Derived) => Base): new (x: new (arg: Base) => Derived) => Base; (a: any): any; }
 >r6arg1 : new <T extends Base, U extends Derived>(x: new (arg: T) => U) => T
 
 var r6a = [r6arg1, r6arg2];
@@ -525,7 +525,7 @@ var r7arg2: new (x: new (arg: Base) => Derived) => new (r: Base) => Derived;
 var r7 = foo7(r7arg1); // any
 >r7 : any
 >foo7(r7arg1) : any
->foo7 : typeof foo7
+>foo7 : { (a: new (x: new (arg: Base) => Derived) => new (r: Base) => Derived): new (x: new (arg: Base) => Derived) => new (r: Base) => Derived; (a: any): any; }
 >r7arg1 : new <T extends Base, U extends Derived>(x: new (arg: T) => U) => new (r: T) => U
 
 var r7a = [r7arg1, r7arg2];
@@ -575,7 +575,7 @@ var r8arg2: new (x: new (arg: Base) => Derived, y: new (arg2: Base) => Derived)
 var r8 = foo8(r8arg1); // any
 >r8 : any
 >foo8(r8arg1) : any
->foo8 : typeof foo8
+>foo8 : { (a: new (x: new (arg: Base) => Derived, y: new (arg2: Base) => Derived) => new (r: Base) => Derived): new (x: new (arg: Base) => Derived, y: new (arg2: Base) => Derived) => new (r: Base) => Derived; (a: any): any; }
 >r8arg1 : new <T extends Base, U extends Derived>(x: new (arg: T) => U, y: new (arg2: T) => U) => new (r: T) => U
 
 var r8a = [r8arg1, r8arg2];
@@ -626,7 +626,7 @@ var r9arg2: new (x: new (arg: Base) => Derived, y: new (arg2: Base) => Derived)
 var r9 = foo9(r9arg1); // any
 >r9 : any
 >foo9(r9arg1) : any
->foo9 : typeof foo9
+>foo9 : { (a: new (x: new (arg: Base) => Derived, y: new (arg2: Base) => Derived) => new (r: Base) => Derived): new (x: new (arg: Base) => Derived, y: new (arg2: Base) => Derived) => new (r: Base) => Derived; (a: any): any; }
 >r9arg1 : new <T extends Base, U extends Derived>(x: new (arg: T) => U, y: (arg2: { foo: string; bing: number; }) => U) => new (r: T) => U
 
 var r9a = [r9arg1, r9arg2];
@@ -658,7 +658,7 @@ var r10arg2: new (...x: Derived[]) => Derived;
 var r10 = foo10(r10arg1); // any
 >r10 : any
 >foo10(r10arg1) : any
->foo10 : typeof foo10
+>foo10 : { (a: new (...x: Derived[]) => Derived): new (...x: Derived[]) => Derived; (a: any): any; }
 >r10arg1 : new <T extends Derived>(...x: T[]) => T
 
 var r10a = [r10arg1, r10arg2];
@@ -695,7 +695,7 @@ var r11arg2: new (x: { foo: string }, y: { foo: string; bar: string }) => Base;
 var r11 = foo11(r11arg1); // any
 >r11 : any
 >foo11(r11arg1) : any
->foo11 : typeof foo11
+>foo11 : { (a: new (x: { foo: string; }, y: { foo: string; bar: string; }) => Base): new (x: { foo: string; }, y: { foo: string; bar: string; }) => Base; (a: any): any; }
 >r11arg1 : new <T extends Base>(x: T, y: T) => T
 
 var r11a = [r11arg1, r11arg2];
@@ -737,7 +737,7 @@ var r12arg2: new (x: Array<Base>, y: Array<Derived2>) => Array<Derived>;
 var r12 = foo12(r12arg1); // any
 >r12 : new (x: Base[], y: Derived2[]) => Derived[]
 >foo12(r12arg1) : new (x: Base[], y: Derived2[]) => Derived[]
->foo12 : typeof foo12
+>foo12 : { (a: new (x: Base[], y: Derived2[]) => Derived[]): new (x: Base[], y: Derived2[]) => Derived[]; (a: any): any; }
 >r12arg1 : new <T extends Base[]>(x: Base[], y: T) => Derived[]
 
 var r12a = [r12arg1, r12arg2];
@@ -778,7 +778,7 @@ var r13arg2: new (x: Array<Base>, y: Array<Derived>) => Array<Derived>;
 var r13 = foo13(r13arg1); // any
 >r13 : any
 >foo13(r13arg1) : any
->foo13 : typeof foo13
+>foo13 : { (a: new (x: Base[], y: Derived[]) => Derived[]): new (x: Base[], y: Derived[]) => Derived[]; (a: any): any; }
 >r13arg1 : new <T extends Derived[]>(x: Base[], y: T) => T
 
 var r13a = [r13arg1, r13arg2];
@@ -813,7 +813,7 @@ var r14arg2: new (x: { a: string; b: number }) => Object;
 var r14 = foo14(r14arg1); // any
 >r14 : any
 >foo14(r14arg1) : any
->foo14 : typeof foo14
+>foo14 : { (a: new (x: { a: string; b: number; }) => Object): new (x: { a: string; b: number; }) => Object; (a: any): any; }
 >r14arg1 : new <T>(x: { a: T; b: T; }) => T
 
 var r14a = [r14arg1, r14arg2];
@@ -838,7 +838,7 @@ var r15arg1: new <T>(x: T) => T[];
 var r15 = foo15(r15arg1); // any
 >r15 : any
 >foo15(r15arg1) : any
->foo15 : typeof foo15
+>foo15 : { (a: { new (x: number): number[]; new (x: string): string[]; }): { new (x: number): number[]; new (x: string): string[]; }; (a: any): any; }
 >r15arg1 : new <T>(x: T) => T[]
 
 var r16arg1: new <T extends Base>(x: T) => number[];
@@ -851,7 +851,7 @@ var r16arg1: new <T extends Base>(x: T) => number[];
 var r16 = foo16(r16arg1);
 >r16 : { new <T extends Derived>(x: T): number[]; new <U extends Base>(x: U): number[]; }
 >foo16(r16arg1) : { new <T extends Derived>(x: T): number[]; new <U extends Base>(x: U): number[]; }
->foo16 : typeof foo16
+>foo16 : { (a: { new <T extends Derived>(x: T): number[]; new <U extends Base>(x: U): number[]; }): { new <T extends Derived>(x: T): number[]; new <U extends Base>(x: U): number[]; }; (a: any): any; }
 >r16arg1 : new <T extends Base>(x: T) => number[]
 
 var r17arg1: new <T>(x: (a: T) => T) => T[];
@@ -866,7 +866,7 @@ var r17arg1: new <T>(x: (a: T) => T) => T[];
 var r17 = foo17(r17arg1); // any
 >r17 : any
 >foo17(r17arg1) : any
->foo17 : typeof foo17
+>foo17 : { (a: { new (x: (a: number) => number): number[]; new (x: (a: string) => string): string[]; }): { new (x: (a: number) => number): number[]; new (x: (a: string) => string): string[]; }; (a: any): any; }
 >r17arg1 : new <T>(x: (a: T) => T) => T[]
 
 var r18arg1: new <T>(x: (a: T) => T) => T[];
@@ -881,6 +881,6 @@ var r18arg1: new <T>(x: (a: T) => T) => T[];
 var r18 = foo18(r18arg1); 
 >r18 : any
 >foo18(r18arg1) : any
->foo18 : typeof foo18
+>foo18 : { (a: { new (x: { new (a: number): number; new (a: string): string; }): any[]; new (x: { new (a: boolean): boolean; new (a: Date): Date; }): any[]; }): { new (x: { new (a: number): number; new (a: string): string; }): any[]; new (x: { new (a: boolean): boolean; new (a: Date): Date; }): any[]; }; (a: any): any; }
 >r18arg1 : new <T>(x: (a: T) => T) => T[]
 
diff --git a/tests/baselines/reference/subtypingWithConstructSignatures3.types b/tests/baselines/reference/subtypingWithConstructSignatures3.types
index 5d33a2149d6..cf4db8939fd 100644
--- a/tests/baselines/reference/subtypingWithConstructSignatures3.types
+++ b/tests/baselines/reference/subtypingWithConstructSignatures3.types
@@ -25,17 +25,17 @@ module Errors {
 >bing : string
 
     declare function foo2(a2: new (x: number) => string[]): typeof a2;
->foo2 : typeof foo2
+>foo2 : { (a2: new (x: number) => string[]): new (x: number) => string[]; (a2: any): any; }
 >a2 : new (x: number) => string[]
 >x : number
 >a2 : new (x: number) => string[]
 
     declare function foo2(a2: any): any;
->foo2 : typeof foo2
+>foo2 : { (a2: new (x: number) => string[]): new (x: number) => string[]; (a2: any): any; }
 >a2 : any
 
     declare function foo7(a2: new (x: new (arg: Base) => Derived) => new (r: Base) => Derived2): typeof a2;
->foo7 : typeof foo7
+>foo7 : { (a2: new (x: new (arg: Base) => Derived) => new (r: Base) => Derived2): new (x: new (arg: Base) => Derived) => new (r: Base) => Derived2; (a2: any): any; }
 >a2 : new (x: new (arg: Base) => Derived) => new (r: Base) => Derived2
 >x : new (arg: Base) => Derived
 >arg : Base
@@ -47,11 +47,11 @@ module Errors {
 >a2 : new (x: new (arg: Base) => Derived) => new (r: Base) => Derived2
 
     declare function foo7(a2: any): any;
->foo7 : typeof foo7
+>foo7 : { (a2: new (x: new (arg: Base) => Derived) => new (r: Base) => Derived2): new (x: new (arg: Base) => Derived) => new (r: Base) => Derived2; (a2: any): any; }
 >a2 : any
 
     declare function foo8(a2: new (x: new (arg: Base) => Derived, y: new (arg2: Base) => Derived) => new (r: Base) => Derived): typeof a2;
->foo8 : typeof foo8
+>foo8 : { (a2: new (x: new (arg: Base) => Derived, y: new (arg2: Base) => Derived) => new (r: Base) => Derived): new (x: new (arg: Base) => Derived, y: new (arg2: Base) => Derived) => new (r: Base) => Derived; (a2: any): any; }
 >a2 : new (x: new (arg: Base) => Derived, y: new (arg2: Base) => Derived) => new (r: Base) => Derived
 >x : new (arg: Base) => Derived
 >arg : Base
@@ -67,11 +67,11 @@ module Errors {
 >a2 : new (x: new (arg: Base) => Derived, y: new (arg2: Base) => Derived) => new (r: Base) => Derived
 
     declare function foo8(a2: any): any;
->foo8 : typeof foo8
+>foo8 : { (a2: new (x: new (arg: Base) => Derived, y: new (arg2: Base) => Derived) => new (r: Base) => Derived): new (x: new (arg: Base) => Derived, y: new (arg2: Base) => Derived) => new (r: Base) => Derived; (a2: any): any; }
 >a2 : any
 
     declare function foo10(a2: new (...x: Base[]) => Base): typeof a2;
->foo10 : typeof foo10
+>foo10 : { (a2: new (...x: Base[]) => Base): new (...x: Base[]) => Base; (a2: any): any; }
 >a2 : new (...x: Base[]) => Base
 >x : Base[]
 >Base : Base
@@ -79,11 +79,11 @@ module Errors {
 >a2 : new (...x: Base[]) => Base
 
     declare function foo10(a2: any): any;
->foo10 : typeof foo10
+>foo10 : { (a2: new (...x: Base[]) => Base): new (...x: Base[]) => Base; (a2: any): any; }
 >a2 : any
 
     declare function foo11(a2: new (x: { foo: string }, y: { foo: string; bar: string }) => Base): typeof a2;
->foo11 : typeof foo11
+>foo11 : { (a2: new (x: { foo: string; }, y: { foo: string; bar: string; }) => Base): new (x: { foo: string; }, y: { foo: string; bar: string; }) => Base; (a2: any): any; }
 >a2 : new (x: { foo: string; }, y: { foo: string; bar: string; }) => Base
 >x : { foo: string; }
 >foo : string
@@ -94,11 +94,11 @@ module Errors {
 >a2 : new (x: { foo: string; }, y: { foo: string; bar: string; }) => Base
 
     declare function foo11(a2: any): any;
->foo11 : typeof foo11
+>foo11 : { (a2: new (x: { foo: string; }, y: { foo: string; bar: string; }) => Base): new (x: { foo: string; }, y: { foo: string; bar: string; }) => Base; (a2: any): any; }
 >a2 : any
 
     declare function foo12(a2: new (x: Array<Base>, y: Array<Derived2>) => Array<Derived>): typeof a2;
->foo12 : typeof foo12
+>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[]
@@ -111,11 +111,11 @@ module Errors {
 >a2 : new (x: Base[], y: Derived2[]) => Derived[]
 
     declare function foo12(a2: any): any;
->foo12 : typeof foo12
+>foo12 : { (a2: new (x: Base[], y: Derived2[]) => Derived[]): new (x: Base[], y: Derived2[]) => Derived[]; (a2: any): any; }
 >a2 : any
 
     declare function foo15(a2: new (x: { a: string; b: number }) => number): typeof a2;
->foo15 : typeof foo15
+>foo15 : { (a2: new (x: { a: string; b: number; }) => number): new (x: { a: string; b: number; }) => number; (a2: any): any; }
 >a2 : new (x: { a: string; b: number; }) => number
 >x : { a: string; b: number; }
 >a : string
@@ -123,11 +123,11 @@ module Errors {
 >a2 : new (x: { a: string; b: number; }) => number
 
     declare function foo15(a2: any): any;
->foo15 : typeof foo15
+>foo15 : { (a2: new (x: { a: string; b: number; }) => number): new (x: { a: string; b: number; }) => number; (a2: any): any; }
 >a2 : any
 
     declare function foo16(a2: {
->foo16 : typeof foo16
+>foo16 : { (a2: { new (x: { new (a: number): number; new (a?: number): number; }): number[]; new (x: { new (a: boolean): boolean; new (a?: boolean): boolean; }): boolean[]; }): { new (x: { new (a: number): number; new (a?: number): number; }): number[]; new (x: { new (a: boolean): boolean; new (a?: boolean): boolean; }): boolean[]; }; (a2: any): any; }
 >a2 : { new (x: { new (a: number): number; new (a?: number): number; }): number[]; new (x: { new (a: boolean): boolean; new (a?: boolean): boolean; }): boolean[]; }
 
         // type of parameter is overload set which means we can't do inference based on this type
@@ -155,11 +155,11 @@ module Errors {
 >a2 : { new (x: { new (a: number): number; new (a?: number): number; }): number[]; new (x: { new (a: boolean): boolean; new (a?: boolean): boolean; }): boolean[]; }
 
     declare function foo16(a2: any): any;
->foo16 : typeof foo16
+>foo16 : { (a2: { new (x: { new (a: number): number; new (a?: number): number; }): number[]; new (x: { new (a: boolean): boolean; new (a?: boolean): boolean; }): boolean[]; }): { new (x: { new (a: number): number; new (a?: number): number; }): number[]; new (x: { new (a: boolean): boolean; new (a?: boolean): boolean; }): boolean[]; }; (a2: any): any; }
 >a2 : any
 
     declare function foo17(a2: {
->foo17 : typeof foo17
+>foo17 : { (a2: { 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[]; }): { 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[]; }; (a2: any): any; }
 >a2 : { 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[]; }
 
         new (x: {
@@ -202,7 +202,7 @@ module Errors {
 >a2 : { 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[]; }
 
     declare function foo17(a2: any): any;
->foo17 : typeof foo17
+>foo17 : { (a2: { 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[]; }): { 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[]; }; (a2: any): any; }
 >a2 : any
 
     var r1arg1: new <T, U>(x: T) => U[];
@@ -220,7 +220,7 @@ module Errors {
     var r1 = foo2(r1arg1); // any
 >r1 : any
 >foo2(r1arg1) : any
->foo2 : typeof foo2
+>foo2 : { (a2: new (x: number) => string[]): new (x: number) => string[]; (a2: any): any; }
 >r1arg1 : new <T, U>(x: T) => U[]
 
     var r1a = [r1arg2, r1arg1];
@@ -264,7 +264,7 @@ module Errors {
     var r2 = foo7(r2arg1); // any
 >r2 : any
 >foo7(r2arg1) : any
->foo7 : typeof foo7
+>foo7 : { (a2: new (x: new (arg: Base) => Derived) => new (r: Base) => Derived2): new (x: new (arg: Base) => Derived) => new (r: Base) => Derived2; (a2: any): any; }
 >r2arg1 : new <T extends Base, U extends Derived, V extends Derived2>(x: new (arg: T) => U) => new (r: T) => V
 
     var r2a = [r2arg2, r2arg1];
@@ -314,7 +314,7 @@ module Errors {
     var r3 = foo8(r3arg1); // any
 >r3 : any
 >foo8(r3arg1) : any
->foo8 : typeof foo8
+>foo8 : { (a2: new (x: new (arg: Base) => Derived, y: new (arg2: Base) => Derived) => new (r: Base) => Derived): new (x: new (arg: Base) => Derived, y: new (arg2: Base) => Derived) => new (r: Base) => Derived; (a2: any): any; }
 >r3arg1 : new <T extends Base, U extends Derived>(x: new (arg: T) => U, y: (arg2: { foo: number; }) => U) => new (r: T) => U
 
     var r3a = [r3arg2, r3arg1];
@@ -346,7 +346,7 @@ module Errors {
     var r4 = foo10(r4arg1); // any
 >r4 : any
 >foo10(r4arg1) : any
->foo10 : typeof foo10
+>foo10 : { (a2: new (...x: Base[]) => Base): new (...x: Base[]) => Base; (a2: any): any; }
 >r4arg1 : new <T extends Derived>(...x: T[]) => T
 
     var r4a = [r4arg2, r4arg1];
@@ -383,7 +383,7 @@ module Errors {
     var r5 = foo11(r5arg1); // any
 >r5 : any
 >foo11(r5arg1) : any
->foo11 : typeof foo11
+>foo11 : { (a2: new (x: { foo: string; }, y: { foo: string; bar: string; }) => Base): new (x: { foo: string; }, y: { foo: string; bar: string; }) => Base; (a2: any): any; }
 >r5arg1 : new <T extends Derived>(x: T, y: T) => T
 
     var r5a = [r5arg2, r5arg1];
@@ -425,7 +425,7 @@ module Errors {
     var r6 = foo12(r6arg1); // new (x: Array<Base>, y: Array<Derived2>) => Array<Derived>
 >r6 : new (x: Base[], y: Derived2[]) => Derived[]
 >foo12(r6arg1) : new (x: Base[], y: Derived2[]) => Derived[]
->foo12 : typeof foo12
+>foo12 : { (a2: new (x: Base[], y: Derived2[]) => Derived[]): new (x: Base[], y: Derived2[]) => Derived[]; (a2: any): any; }
 >r6arg1 : new (x: Base[], y: Derived2[]) => Derived[]
 
     var r6a = [r6arg2, r6arg1];
@@ -459,7 +459,7 @@ module Errors {
     var r7 = foo15(r7arg1); // (x: { a: string; b: number }) => number): number;
 >r7 : any
 >foo15(r7arg1) : any
->foo15 : typeof foo15
+>foo15 : { (a2: new (x: { a: string; b: number; }) => number): new (x: { a: string; b: number; }) => number; (a2: any): any; }
 >r7arg1 : new <T>(x: { a: T; b: T; }) => T
 
     var r7a = [r7arg2, r7arg1];
@@ -487,7 +487,7 @@ module Errors {
     var r7c = foo15(r7arg3); // any
 >r7c : new (x: { a: string; b: number; }) => number
 >foo15(r7arg3) : new (x: { a: string; b: number; }) => number
->foo15 : typeof foo15
+>foo15 : { (a2: new (x: { a: string; b: number; }) => number): new (x: { a: string; b: number; }) => number; (a2: any): any; }
 >r7arg3 : new <T extends Base>(x: { a: T; b: T; }) => number
 
     var r7d = [r7arg2, r7arg3];
@@ -514,7 +514,7 @@ module Errors {
     var r8 = foo16(r8arg); // any
 >r8 : any
 >foo16(r8arg) : any
->foo16 : typeof foo16
+>foo16 : { (a2: { new (x: { new (a: number): number; new (a?: number): number; }): number[]; new (x: { new (a: boolean): boolean; new (a?: boolean): boolean; }): boolean[]; }): { new (x: { new (a: number): number; new (a?: number): number; }): number[]; new (x: { new (a: boolean): boolean; new (a?: boolean): boolean; }): boolean[]; }; (a2: any): any; }
 >r8arg : new <T>(x: new (a: T) => T) => T[]
 
     var r9arg: new <T>(x: new (a: T) => T) => any[];
@@ -528,7 +528,7 @@ module Errors {
     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[]; }
 >foo17(r9arg) : { 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[]; }
->foo17 : typeof foo17
+>foo17 : { (a2: { 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[]; }): { 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[]; }; (a2: any): any; }
 >r9arg : new <T>(x: new (a: T) => T) => any[]
 }
 
@@ -536,7 +536,7 @@ module WithGenericSignaturesInBaseType {
 >WithGenericSignaturesInBaseType : typeof WithGenericSignaturesInBaseType
 
     declare function foo2(a2: new <T>(x: T) => T[]): typeof a2;
->foo2 : typeof foo2
+>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
@@ -545,7 +545,7 @@ module WithGenericSignaturesInBaseType {
 >a2 : new <T>(x: T) => T[]
 
     declare function foo2(a2: any): any;
->foo2 : typeof foo2
+>foo2 : { (a2: new <T>(x: T) => T[]): new <T>(x: T) => T[]; (a2: any): any; }
 >a2 : any
 
     var r2arg2: new <T>(x: T) => string[];
@@ -557,11 +557,11 @@ module WithGenericSignaturesInBaseType {
     var r2 = foo2(r2arg2); // <T>(x:T) => T[] since we can infer from generic signatures now
 >r2 : new <T>(x: T) => T[]
 >foo2(r2arg2) : new <T>(x: T) => T[]
->foo2 : typeof foo2
+>foo2 : { (a2: new <T>(x: T) => T[]): new <T>(x: T) => T[]; (a2: any): any; }
 >r2arg2 : new <T>(x: T) => string[]
 
     declare function foo3(a2: new <T>(x: T) => string[]): typeof a2;
->foo3 : typeof foo3
+>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
@@ -569,7 +569,7 @@ module WithGenericSignaturesInBaseType {
 >a2 : new <T>(x: T) => string[]
 
     declare function foo3(a2: any): any;
->foo3 : typeof foo3
+>foo3 : { (a2: new <T>(x: T) => string[]): new <T>(x: T) => string[]; (a2: any): any; }
 >a2 : any
 
     var r3arg2: new <T>(x: T) => T[];
@@ -582,6 +582,6 @@ module WithGenericSignaturesInBaseType {
     var r3 = foo3(r3arg2); // any
 >r3 : any
 >foo3(r3arg2) : any
->foo3 : typeof foo3
+>foo3 : { (a2: new <T>(x: T) => string[]): new <T>(x: T) => string[]; (a2: any): any; }
 >r3arg2 : new <T>(x: T) => T[]
 }
diff --git a/tests/baselines/reference/subtypingWithConstructSignatures4.types b/tests/baselines/reference/subtypingWithConstructSignatures4.types
index d168c57a7eb..a9116880df3 100644
--- a/tests/baselines/reference/subtypingWithConstructSignatures4.types
+++ b/tests/baselines/reference/subtypingWithConstructSignatures4.types
@@ -21,7 +21,7 @@ class OtherDerived extends Base { bing: string; }
 >bing : string
 
 declare function foo1(a: new <T>(x: T) => T[]);
->foo1 : typeof foo1
+>foo1 : { (a: new <T>(x: T) => T[]): any; (a: any): any; }
 >a : new <T>(x: T) => T[]
 >T : T
 >x : T
@@ -29,33 +29,33 @@ declare function foo1(a: new <T>(x: T) => T[]);
 >T : T
 
 declare function foo1(a: any): any;
->foo1 : typeof foo1
+>foo1 : { (a: new <T>(x: T) => T[]): any; (a: any): any; }
 >a : any
 
 declare function foo2(a2: new <T>(x: T) => string[]);
->foo2 : typeof foo2
+>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 : typeof foo2
+>foo2 : { (a2: new <T>(x: T) => string[]): any; (a: any): any; }
 >a : any
 
 declare function foo3(a3: new <T>(x: T) => void);
->foo3 : typeof foo3
+>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 : typeof foo3
+>foo3 : { (a3: new <T>(x: T) => void): any; (a: any): any; }
 >a : any
 
 declare function foo4(a4: new <T, U>(x: T, y: U) => string);
->foo4 : typeof foo4
+>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
@@ -65,11 +65,11 @@ declare function foo4(a4: new <T, U>(x: T, y: U) => string);
 >U : U
 
 declare function foo4(a: any): any;
->foo4 : typeof foo4
+>foo4 : { (a4: new <T, U>(x: T, y: U) => string): any; (a: any): any; }
 >a : any
 
 declare function foo5(a5: new <T, U>(x: new (arg: T) => U) => T);
->foo5 : typeof foo5
+>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
@@ -80,11 +80,11 @@ declare function foo5(a5: new <T, U>(x: new (arg: T) => U) => T);
 >T : T
 
 declare function foo5(a: any): any;
->foo5 : typeof foo5
+>foo5 : { (a5: new <T, U>(x: new (arg: T) => U) => T): any; (a: any): any; }
 >a : any
 
 declare function foo6(a6: new <T extends Base>(x: new (arg: T) => Derived) => T);
->foo6 : typeof foo6
+>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
@@ -95,11 +95,11 @@ declare function foo6(a6: new <T extends Base>(x: new (arg: T) => Derived) => T)
 >T : T
 
 declare function foo6(a: any): any;
->foo6 : typeof foo6
+>foo6 : { (a6: new <T extends Base>(x: new (arg: T) => Derived) => T): any; (a: any): any; }
 >a : any
 
 declare function foo11(a11: new <T>(x: { foo: T }, y: { foo: T; bar: T }) => Base);
->foo11 : typeof foo11
+>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; }
@@ -113,11 +113,11 @@ declare function foo11(a11: new <T>(x: { foo: T }, y: { foo: T; bar: T }) => Bas
 >Base : Base
 
 declare function foo11(a: any): any;
->foo11 : typeof foo11
+>foo11 : { (a11: new <T>(x: { foo: T; }, y: { foo: T; bar: T; }) => Base): any; (a: any): any; }
 >a : any
 
 declare function foo15(a15: new <T>(x: { a: T; b: T }) => T[]);
->foo15 : typeof foo15
+>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; }
@@ -128,11 +128,11 @@ declare function foo15(a15: new <T>(x: { a: T; b: T }) => T[]);
 >T : T
 
 declare function foo15(a: any): any;
->foo15 : typeof foo15
+>foo15 : { (a15: new <T>(x: { a: T; b: T; }) => T[]): any; (a: any): any; }
 >a : any
 
 declare function foo16(a16: new <T extends Base>(x: { a: T; b: T }) => T[]);
->foo16 : typeof foo16
+>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
@@ -144,11 +144,11 @@ declare function foo16(a16: new <T extends Base>(x: { a: T; b: T }) => T[]);
 >T : T
 
 declare function foo16(a: any): any;
->foo16 : typeof foo16
+>foo16 : { (a16: new <T extends Base>(x: { a: T; b: T; }) => T[]): any; (a: any): any; }
 >a : any
 
 declare function foo17(a17: {
->foo17 : typeof foo17
+>foo17 : { (a17: { new <T extends Derived>(x: new (a: T) => T): T[]; new <T extends Base>(x: new (a: T) => T): T[]; }): any; (a: any): any; }
 >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[];
@@ -171,11 +171,11 @@ declare function foo17(a17: {
 
 });
 declare function foo17(a: any): any;
->foo17 : typeof foo17
+>foo17 : { (a17: { new <T extends Derived>(x: new (a: T) => T): T[]; new <T extends Base>(x: new (a: T) => T): T[]; }): any; (a: any): any; }
 >a : any
 
 declare function foo18(a18: {
->foo18 : typeof foo18
+>foo18 : { (a18: { 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[]; }): any; (a: any): any; }
 >a18 : { 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[]; }
 
     new (x: {
@@ -216,7 +216,7 @@ declare function foo18(a18: {
     }): any[];
 });
 declare function foo18(a: any): any;
->foo18 : typeof foo18
+>foo18 : { (a18: { 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[]; }): any; (a: any): any; }
 >a : any
 
 var r1arg: new <T>(x: T) => T[];
@@ -236,7 +236,7 @@ var r1arg2: new <T>(x: T) => T[];
 var r1 = foo1(r1arg);
 >r1 : any
 >foo1(r1arg) : any
->foo1 : typeof foo1
+>foo1 : { (a: new <T>(x: T) => T[]): any; (a: any): any; }
 >r1arg : new <T>(x: T) => T[]
 
 var r1a = [r1arg, r1arg2];
@@ -266,7 +266,7 @@ var r2arg2: new <T>(x: T) => string[];
 var r2 = foo2(r2arg);
 >r2 : any
 >foo2(r2arg) : any
->foo2 : typeof foo2
+>foo2 : { (a2: new <T>(x: T) => string[]): any; (a: any): any; }
 >r2arg : new <T>(x: T) => string[]
 
 var r2a = [r2arg, r2arg2];
@@ -297,7 +297,7 @@ var r3arg2: new <T>(x: T) => void;
 var r3 = foo3(r3arg);
 >r3 : any
 >foo3(r3arg) : any
->foo3 : typeof foo3
+>foo3 : { (a3: new <T>(x: T) => void): any; (a: any): any; }
 >r3arg : new <T>(x: T) => T
 
 var r3a = [r3arg, r3arg2];
@@ -333,7 +333,7 @@ var r4arg2: new <T, U>(x: T, y: U) => string;
 var r4 = foo4(r4arg);
 >r4 : any
 >foo4(r4arg) : any
->foo4 : typeof foo4
+>foo4 : { (a4: new <T, U>(x: T, y: U) => string): any; (a: any): any; }
 >r4arg : new <T, U>(x: T, y: U) => string
 
 var r4a = [r4arg, r4arg2];
@@ -371,7 +371,7 @@ var r5arg2: new <T, U>(x: new (arg: T) => U) => T;
 var r5 = foo5(r5arg);
 >r5 : any
 >foo5(r5arg) : any
->foo5 : typeof foo5
+>foo5 : { (a5: new <T, U>(x: new (arg: T) => U) => T): any; (a: any): any; }
 >r5arg : new <T, U>(x: new (arg: T) => U) => T
 
 var r5a = [r5arg, r5arg2];
@@ -411,7 +411,7 @@ var r6arg2: new <T extends Base>(x: new (arg: T) => Derived) => T;
 var r6 = foo6(r6arg);
 >r6 : any
 >foo6(r6arg) : any
->foo6 : typeof foo6
+>foo6 : { (a6: new <T extends Base>(x: new (arg: T) => Derived) => T): any; (a: any): any; }
 >r6arg : new <T extends Base, U extends Derived>(x: new (arg: T) => U) => T
 
 var r6a = [r6arg, r6arg2];
@@ -456,7 +456,7 @@ var r11arg2: new <T>(x: { foo: T }, y: { foo: T; bar: T }) => Base;
 var r11 = foo11(r11arg);
 >r11 : any
 >foo11(r11arg) : any
->foo11 : typeof foo11
+>foo11 : { (a11: new <T>(x: { foo: T; }, y: { foo: T; bar: T; }) => Base): any; (a: any): any; }
 >r11arg : new <T, U>(x: { foo: T; }, y: { foo: U; bar: U; }) => Base
 
 var r11a = [r11arg, r11arg2];
@@ -495,7 +495,7 @@ var r15arg2: new <T>(x: { a: T; b: T }) => T[];
 var r15 = foo15(r15arg);
 >r15 : any
 >foo15(r15arg) : any
->foo15 : typeof foo15
+>foo15 : { (a15: new <T>(x: { a: T; b: T; }) => T[]): any; (a: any): any; }
 >r15arg : new <U, V>(x: { a: U; b: V; }) => U[]
 
 var r15a = [r15arg, r15arg2];
@@ -535,7 +535,7 @@ var r16arg2: new <T extends Base>(x: { a: T; b: T }) => T[];
 var r16 = foo16(r16arg);
 >r16 : any
 >foo16(r16arg) : any
->foo16 : typeof foo16
+>foo16 : { (a16: new <T extends Base>(x: { a: T; b: T; }) => T[]): any; (a: any): any; }
 >r16arg : new <T extends Base>(x: { a: T; b: T; }) => T[]
 
 var r16a = [r16arg, r16arg2];
@@ -562,7 +562,7 @@ var r17arg: new <T>(x: new (a: T) => T) => T[];
 var r17 = foo17(r17arg);
 >r17 : any
 >foo17(r17arg) : any
->foo17 : typeof foo17
+>foo17 : { (a17: { new <T extends Derived>(x: new (a: T) => T): T[]; new <T extends Base>(x: new (a: T) => T): T[]; }): any; (a: any): any; }
 >r17arg : new <T>(x: new (a: T) => T) => T[]
 
 var r18arg: new (x: new <T>(a: T) => T) => any[];
@@ -576,6 +576,6 @@ var r18arg: new (x: new <T>(a: T) => T) => any[];
 var r18 = foo18(r18arg);
 >r18 : any
 >foo18(r18arg) : any
->foo18 : typeof foo18
+>foo18 : { (a18: { 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[]; }): any; (a: any): any; }
 >r18arg : new (x: new <T>(a: T) => T) => any[]
 
diff --git a/tests/baselines/reference/subtypingWithOptionalProperties.types b/tests/baselines/reference/subtypingWithOptionalProperties.types
index d16903202d7..67eeb274c6b 100644
--- a/tests/baselines/reference/subtypingWithOptionalProperties.types
+++ b/tests/baselines/reference/subtypingWithOptionalProperties.types
@@ -3,7 +3,7 @@
 
 // returns { s?: number; }
 function f<T>(a: T) {
->f : typeof f
+>f : <T>(a: T) => { s?: number; }
 >T : T
 >a : T
 >T : T
@@ -20,7 +20,7 @@ function f<T>(a: T) {
 var r = f({ s: new Object() }); // ok
 >r : { s?: number; }
 >f({ s: new Object() }) : { s?: number; }
->f : typeof f
+>f : <T>(a: T) => { s?: number; }
 >{ s: new Object() } : { s: Object; }
 >s : Object
 >new Object() : Object
diff --git a/tests/baselines/reference/superCalls.types b/tests/baselines/reference/superCalls.types
index fcb0ef045bc..ef983183f9c 100644
--- a/tests/baselines/reference/superCalls.types
+++ b/tests/baselines/reference/superCalls.types
@@ -12,7 +12,7 @@ class Base {
 }
 
 function v(): void { }
->v : typeof v
+>v : () => void
 
 class Derived extends Base {
 >Derived : Derived
@@ -35,7 +35,7 @@ class Derived extends Base {
         var p = v();
 >p : void
 >v() : void
->v : typeof v
+>v : () => void
     }
 }
 
diff --git a/tests/baselines/reference/switchFallThroughs.types b/tests/baselines/reference/switchFallThroughs.types
index 0d3f7ccb871..dfca84cfa4c 100644
--- a/tests/baselines/reference/switchFallThroughs.types
+++ b/tests/baselines/reference/switchFallThroughs.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/switchFallThroughs.ts ===
 function R1(index: number) {
->R1 : typeof R1
+>R1 : (index: number) => string
 >index : number
 
     switch (index) {
diff --git a/tests/baselines/reference/switchStatements.types b/tests/baselines/reference/switchStatements.types
index bbcd3553385..1c951c5e098 100644
--- a/tests/baselines/reference/switchStatements.types
+++ b/tests/baselines/reference/switchStatements.types
@@ -3,7 +3,7 @@ module M {
 >M : typeof M
 
     export function fn(x: number) {
->fn : typeof fn
+>fn : (x: number) => string
 >x : number
 
         return '';
@@ -55,9 +55,9 @@ switch (x) {
 
     case M.fn(1):
 >M.fn(1) : string
->M.fn : typeof M.fn
+>M.fn : (x: number) => string
 >M : typeof M
->fn : typeof M.fn
+>fn : (x: number) => string
 
     case <T>(x: number) => '':
 ><T>(x: number) => '' : <T>(x: number) => string
diff --git a/tests/baselines/reference/targetTypeArgs.types b/tests/baselines/reference/targetTypeArgs.types
index ec14cdf4e0f..80c99ff9ff3 100644
--- a/tests/baselines/reference/targetTypeArgs.types
+++ b/tests/baselines/reference/targetTypeArgs.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/targetTypeArgs.ts ===
 function foo(callback: (x: string) => void) {
->foo : typeof foo
+>foo : (callback: (x: string) => void) => void
 >callback : (x: string) => void
 >x : string
 
@@ -11,7 +11,7 @@ function foo(callback: (x: string) => void) {
 
 foo(function(x) { x });
 >foo(function(x) { x }) : void
->foo : typeof foo
+>foo : (callback: (x: string) => void) => void
 >function(x) { x } : (x: string) => void
 >x : string
 >x : string
diff --git a/tests/baselines/reference/targetTypeObjectLiteralToAny.types b/tests/baselines/reference/targetTypeObjectLiteralToAny.types
index 3bc76954da3..ebbafd39d8d 100644
--- a/tests/baselines/reference/targetTypeObjectLiteralToAny.types
+++ b/tests/baselines/reference/targetTypeObjectLiteralToAny.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/targetTypeObjectLiteralToAny.ts ===
 function suggest(){ 
->suggest : typeof suggest
+>suggest : () => void
 
 	var TypeScriptKeywords:string[];  
 >TypeScriptKeywords : string[]
diff --git a/tests/baselines/reference/targetTypeTest2.types b/tests/baselines/reference/targetTypeTest2.types
index dc8b5359250..795dd7036f7 100644
--- a/tests/baselines/reference/targetTypeTest2.types
+++ b/tests/baselines/reference/targetTypeTest2.types
@@ -8,19 +8,19 @@ var a : any[] = [1,2,"3"];
 
 
 function func1(stuff:any[]) { return stuff; }
->func1 : typeof func1
+>func1 : (stuff: any[]) => any[]
 >stuff : any[]
 >stuff : any[]
 
 function func2(stuff1:string, stuff2:number, stuff3:number) {
->func2 : typeof func2
+>func2 : (stuff1: string, stuff2: number, stuff3: number) => any[]
 >stuff1 : string
 >stuff2 : number
 >stuff3 : number
 
 	return func1([stuff1, stuff2, stuff3]);
 >func1([stuff1, stuff2, stuff3]) : any[]
->func1 : typeof func1
+>func1 : (stuff: any[]) => any[]
 >[stuff1, stuff2, stuff3] : any[]
 >stuff1 : string
 >stuff2 : number
diff --git a/tests/baselines/reference/thisBinding2.types b/tests/baselines/reference/thisBinding2.types
index d2027a4ea5b..441a8f575c0 100644
--- a/tests/baselines/reference/thisBinding2.types
+++ b/tests/baselines/reference/thisBinding2.types
@@ -44,7 +44,7 @@ class C {
     }  
 }
 declare function setTimeout(expression: any, msec?: number, language?: any): number;
->setTimeout : typeof setTimeout
+>setTimeout : (expression: any, msec?: number, language?: any) => number
 >expression : any
 >msec : number
 >language : any
@@ -62,7 +62,7 @@ var messenger = {
 
         return setTimeout(() => { var x = this.message; }, 3000);
 >setTimeout(() => { var x = this.message; }, 3000) : number
->setTimeout : typeof setTimeout
+>setTimeout : (expression: any, msec?: number, language?: any) => number
 >() => { var x = this.message; } : () => void
 >x : any
 >this.message : any
diff --git a/tests/baselines/reference/thisExpressionInIndexExpression.types b/tests/baselines/reference/thisExpressionInIndexExpression.types
index 057fb2f9db7..b26dbb8bde7 100644
--- a/tests/baselines/reference/thisExpressionInIndexExpression.types
+++ b/tests/baselines/reference/thisExpressionInIndexExpression.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/thisExpressionInIndexExpression.ts ===
 function f() {
->f : typeof f
+>f : () => (r: any) => any
 
     return r => r[this];
 >r => r[this] : (r: any) => any
diff --git a/tests/baselines/reference/thisInInnerFunctions.types b/tests/baselines/reference/thisInInnerFunctions.types
index cec73bbdcf0..b47b917a469 100644
--- a/tests/baselines/reference/thisInInnerFunctions.types
+++ b/tests/baselines/reference/thisInInnerFunctions.types
@@ -28,7 +28,7 @@ class Foo {
 }
 
 function test() {
->test : typeof test
+>test : () => void
 
     var x = () => {
 >x : () => void
diff --git a/tests/baselines/reference/thisInLambda.types b/tests/baselines/reference/thisInLambda.types
index 950b7ecc3ef..ebc32449f07 100644
--- a/tests/baselines/reference/thisInLambda.types
+++ b/tests/baselines/reference/thisInLambda.types
@@ -23,7 +23,7 @@ class Foo {
 }
 
 function myFn(a:any) { }
->myFn : typeof myFn
+>myFn : (a: any) => void
 >a : any
 
 class myCls {
@@ -32,12 +32,12 @@ class myCls {
     constructor () {
         myFn(() => {
 >myFn(() => {            myFn(() => {                var x = this;            });        }) : void
->myFn : typeof myFn
+>myFn : (a: any) => void
 >() => {            myFn(() => {                var x = this;            });        } : () => void
 
             myFn(() => {
 >myFn(() => {                var x = this;            }) : void
->myFn : typeof myFn
+>myFn : (a: any) => void
 >() => {                var x = this;            } : () => void
 
                 var x = this;
diff --git a/tests/baselines/reference/thisInModuleFunction1.types b/tests/baselines/reference/thisInModuleFunction1.types
index 28da3bc4650..c73f9ebbd9c 100644
--- a/tests/baselines/reference/thisInModuleFunction1.types
+++ b/tests/baselines/reference/thisInModuleFunction1.types
@@ -3,7 +3,7 @@ module bar {
 >bar : typeof bar
 
  export function bar() {
->bar : typeof bar
+>bar : () => any
 
   return this;
 >this : any
@@ -12,7 +12,7 @@ module bar {
 var z = bar.bar();
 >z : any
 >bar.bar() : any
->bar.bar : typeof bar.bar
+>bar.bar : () => any
 >bar : typeof bar
->bar : typeof bar.bar
+>bar : () => any
 
diff --git a/tests/baselines/reference/thisReferencedInFunctionInsideArrowFunction1.types b/tests/baselines/reference/thisReferencedInFunctionInsideArrowFunction1.types
index 03b7ba5db3b..8e387fd66c1 100644
--- a/tests/baselines/reference/thisReferencedInFunctionInsideArrowFunction1.types
+++ b/tests/baselines/reference/thisReferencedInFunctionInsideArrowFunction1.types
@@ -5,7 +5,7 @@ var foo = (dummy) => { };
 >dummy : any
 
 function test()
->test : typeof test
+>test : () => void
 {
     foo(() =>
 >foo(() =>        function () { return this; }    ) : void
diff --git a/tests/baselines/reference/throwInEnclosingStatements.types b/tests/baselines/reference/throwInEnclosingStatements.types
index 50b8aa97e64..d642dc55b0b 100644
--- a/tests/baselines/reference/throwInEnclosingStatements.types
+++ b/tests/baselines/reference/throwInEnclosingStatements.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/statements/throwStatements/throwInEnclosingStatements.ts ===
 function fn(x) {
->fn : typeof fn
+>fn : (x: any) => void
 >x : any
 
     throw x;
diff --git a/tests/baselines/reference/throwStatements.types b/tests/baselines/reference/throwStatements.types
index 73f3fe41b5b..efc2ff24124 100644
--- a/tests/baselines/reference/throwStatements.types
+++ b/tests/baselines/reference/throwStatements.types
@@ -37,7 +37,7 @@ class D<T>{
 }
 
 function F(x: string): number { return 42; }
->F : typeof F
+>F : (x: string) => number
 >x : string
 
 module M {
@@ -51,7 +51,7 @@ module M {
     }
 
     export function F2(x: number): string { return x.toString(); }
->F2 : typeof F2
+>F2 : (x: number) => string
 >x : number
 >x.toString() : string
 >x.toString : (radix?: number) => string
@@ -134,15 +134,15 @@ throw anObjectLiteral;
 >anObjectLiteral : { id: number; }
 
 var aFunction = F;
->aFunction : typeof F
->F : typeof F
+>aFunction : (x: string) => number
+>F : (x: string) => number
 
 throw aFunction;
->aFunction : typeof F
+>aFunction : (x: string) => number
 
 throw aFunction('');
 >aFunction('') : number
->aFunction : typeof F
+>aFunction : (x: string) => number
 
 var aLambda = (x) => 2;
 >aLambda : (x: any) => number
@@ -178,13 +178,13 @@ throw aClassInModule;
 >aClassInModule : M.A
 
 var aFunctionInModule = M.F2;
->aFunctionInModule : typeof M.F2
->M.F2 : typeof M.F2
+>aFunctionInModule : (x: number) => string
+>M.F2 : (x: number) => string
 >M : typeof M
->F2 : typeof M.F2
+>F2 : (x: number) => string
 
 throw aFunctionInModule;
->aFunctionInModule : typeof M.F2
+>aFunctionInModule : (x: number) => string
 
 // no initializer or annotation, so this is an 'any'
 var x;
diff --git a/tests/baselines/reference/topLevelExports.types b/tests/baselines/reference/topLevelExports.types
index 38789ad5304..c4076a80239 100644
--- a/tests/baselines/reference/topLevelExports.types
+++ b/tests/baselines/reference/topLevelExports.types
@@ -3,7 +3,7 @@ export var foo = 3;
 >foo : number
 
 function log(n:number) { return n;}
->log : typeof log
+>log : (n: number) => number
 >n : number
 >n : number
 
@@ -12,7 +12,7 @@ void log(foo).toString();
 >log(foo).toString() : string
 >log(foo).toString : (radix?: number) => string
 >log(foo) : number
->log : typeof log
+>log : (n: number) => number
 >foo : number
 >toString : (radix?: number) => string
 
diff --git a/tests/baselines/reference/topLevelLambda2.types b/tests/baselines/reference/topLevelLambda2.types
index 04f1c0833cb..7dcb909cdf9 100644
--- a/tests/baselines/reference/topLevelLambda2.types
+++ b/tests/baselines/reference/topLevelLambda2.types
@@ -1,11 +1,11 @@
 === tests/cases/compiler/topLevelLambda2.ts ===
 function foo(x:any) {}
->foo : typeof foo
+>foo : (x: any) => void
 >x : any
 
 foo(()=>this.window);
 >foo(()=>this.window) : void
->foo : typeof foo
+>foo : (x: any) => void
 >()=>this.window : () => any
 >this.window : any
 >this : any
diff --git a/tests/baselines/reference/tryStatements.types b/tests/baselines/reference/tryStatements.types
index 54a1b1539b5..07bc3997d83 100644
--- a/tests/baselines/reference/tryStatements.types
+++ b/tests/baselines/reference/tryStatements.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/statements/tryStatements/tryStatements.ts ===
 function fn() {
->fn : typeof fn
+>fn : () => void
 
     try {
 
diff --git a/tests/baselines/reference/typeArgInference2.types b/tests/baselines/reference/typeArgInference2.types
index d7bc7eb7ebc..b6568afee24 100644
--- a/tests/baselines/reference/typeArgInference2.types
+++ b/tests/baselines/reference/typeArgInference2.types
@@ -7,7 +7,7 @@ interface Item {
 }
 
 declare function foo<T extends Item>(x?: T, y?: T): T;
->foo : typeof foo
+>foo : <T extends Item>(x?: T, y?: T) => T
 >T : T
 >Item : Item
 >x : T
@@ -19,31 +19,31 @@ declare function foo<T extends Item>(x?: T, y?: T): T;
 var z1 = foo(null);                   // any
 >z1 : any
 >foo(null) : any
->foo : typeof foo
+>foo : <T extends Item>(x?: T, y?: T) => T
 
 var z2 = foo();                       // Item
 >z2 : Item
 >foo() : Item
->foo : typeof foo
+>foo : <T extends Item>(x?: T, y?: T) => T
 
 var z3 = foo({ name: null });         // { name: any }
 >z3 : { name: any; }
 >foo({ name: null }) : { name: any; }
->foo : typeof foo
+>foo : <T extends Item>(x?: T, y?: T) => T
 >{ name: null } : { name: null; }
 >name : any
 
 var z4 = foo({ name: "abc" });        // { name: string }
 >z4 : { name: string; }
 >foo({ name: "abc" }) : { name: string; }
->foo : typeof foo
+>foo : <T extends Item>(x?: T, y?: T) => T
 >{ name: "abc" } : { name: string; }
 >name : string
 
 var z5 = foo({ name: "abc", a: 5 });  // { name: string; a: number }
 >z5 : { name: string; a: number; }
 >foo({ name: "abc", a: 5 }) : { name: string; a: number; }
->foo : typeof foo
+>foo : <T extends Item>(x?: T, y?: T) => T
 >{ name: "abc", a: 5 } : { name: string; a: number; }
 >name : string
 >a : number
@@ -51,7 +51,7 @@ var z5 = foo({ name: "abc", a: 5 });  // { name: string; a: number }
 var z6 = foo({ name: "abc", a: 5 }, { name: "def", b: 5 });  // Item
 >z6 : Item
 >foo({ name: "abc", a: 5 }, { name: "def", b: 5 }) : Item
->foo : typeof foo
+>foo : <T extends Item>(x?: T, y?: T) => T
 >{ name: "abc", a: 5 } : { name: string; a: number; }
 >name : string
 >a : number
diff --git a/tests/baselines/reference/typeArgInferenceWithNull.types b/tests/baselines/reference/typeArgInferenceWithNull.types
index cb3bbe344b3..9fd3ea33e24 100644
--- a/tests/baselines/reference/typeArgInferenceWithNull.types
+++ b/tests/baselines/reference/typeArgInferenceWithNull.types
@@ -2,17 +2,17 @@
 // All legal
 
 function fn4<T extends string>(n: T) { }
->fn4 : typeof fn4
+>fn4 : <T extends string>(n: T) => void
 >T : T
 >n : T
 >T : T
 
 fn4(null);
 >fn4(null) : void
->fn4 : typeof fn4
+>fn4 : <T extends string>(n: T) => void
 
 function fn5<T extends { x: string }>(n: T) { }
->fn5 : typeof fn5
+>fn5 : <T extends { x: string; }>(n: T) => void
 >T : T
 >x : string
 >n : T
@@ -20,12 +20,12 @@ function fn5<T extends { x: string }>(n: T) { }
 
 fn5({ x: null });
 >fn5({ x: null }) : void
->fn5 : typeof fn5
+>fn5 : <T extends { x: string; }>(n: T) => void
 >{ x: null } : { x: null; }
 >x : any
 
 function fn6<T extends { x: string }>(n: T, fun: (x: T) => void, n2: T) { }
->fn6 : typeof fn6
+>fn6 : <T extends { x: string; }>(n: T, fun: (x: T) => void, n2: T) => void
 >T : T
 >x : string
 >n : T
@@ -38,7 +38,7 @@ function fn6<T extends { x: string }>(n: T, fun: (x: T) => void, n2: T) { }
 
 fn6({ x: null }, y => { }, { x: "" }); // y has type { x: any }, but ideally would have type { x: string }
 >fn6({ x: null }, y => { }, { x: "" }) : void
->fn6 : typeof fn6
+>fn6 : <T extends { x: string; }>(n: T, fun: (x: T) => void, n2: T) => void
 >{ x: null } : { x: null; }
 >x : any
 >y => { } : (y: { x: string; }) => void
diff --git a/tests/baselines/reference/typeArgumentInference.types b/tests/baselines/reference/typeArgumentInference.types
index 0930cad6e53..40136bd10c3 100644
--- a/tests/baselines/reference/typeArgumentInference.types
+++ b/tests/baselines/reference/typeArgumentInference.types
@@ -1,42 +1,42 @@
 === tests/cases/conformance/expressions/functionCalls/typeArgumentInference.ts ===
 // Generic call with no parameters
 function noParams<T>() { }
->noParams : typeof noParams
+>noParams : <T>() => void
 >T : T
 
 noParams();
 >noParams() : void
->noParams : typeof noParams
+>noParams : <T>() => void
 
 noParams<string>();
 >noParams<string>() : void
->noParams : typeof noParams
+>noParams : <T>() => void
 
 noParams<{}>();
 >noParams<{}>() : void
->noParams : typeof noParams
+>noParams : <T>() => void
 
 // Generic call with parameters but none use type parameter type
 function noGenericParams<T>(n: string) { }
->noGenericParams : typeof noGenericParams
+>noGenericParams : <T>(n: string) => void
 >T : T
 >n : string
 
 noGenericParams('');
 >noGenericParams('') : void
->noGenericParams : typeof noGenericParams
+>noGenericParams : <T>(n: string) => void
 
 noGenericParams<number>('');
 >noGenericParams<number>('') : void
->noGenericParams : typeof noGenericParams
+>noGenericParams : <T>(n: string) => void
 
 noGenericParams<{}>('');
 >noGenericParams<{}>('') : void
->noGenericParams : typeof noGenericParams
+>noGenericParams : <T>(n: string) => void
 
 // Generic call with multiple type parameters and only one used in parameter type annotation
 function someGenerics1<T, U>(n: T, m: number) { }
->someGenerics1 : typeof someGenerics1
+>someGenerics1 : <T, U>(n: T, m: number) => void
 >T : T
 >U : U
 >n : T
@@ -45,15 +45,15 @@ function someGenerics1<T, U>(n: T, m: number) { }
 
 someGenerics1(3, 4);
 >someGenerics1(3, 4) : void
->someGenerics1 : typeof someGenerics1
+>someGenerics1 : <T, U>(n: T, m: number) => void
 
 someGenerics1<number, {}>(3, 4);
 >someGenerics1<number, {}>(3, 4) : void
->someGenerics1 : typeof someGenerics1
+>someGenerics1 : <T, U>(n: T, m: number) => void
 
 // Generic call with argument of function type whose parameter is of type parameter type
 function someGenerics2a<T>(n: (x: T) => void) { }
->someGenerics2a : typeof someGenerics2a
+>someGenerics2a : <T>(n: (x: T) => void) => void
 >T : T
 >n : (x: T) => void
 >x : T
@@ -61,21 +61,21 @@ function someGenerics2a<T>(n: (x: T) => void) { }
 
 someGenerics2a((n: string) => n);
 >someGenerics2a((n: string) => n) : void
->someGenerics2a : typeof someGenerics2a
+>someGenerics2a : <T>(n: (x: T) => void) => void
 >(n: string) => n : (n: string) => string
 >n : string
 >n : string
 
 someGenerics2a<string>((n: string) => n);
 >someGenerics2a<string>((n: string) => n) : void
->someGenerics2a : typeof someGenerics2a
+>someGenerics2a : <T>(n: (x: T) => void) => void
 >(n: string) => n : (n: string) => string
 >n : string
 >n : string
 
 someGenerics2a<string>((n) => n.substr(0));
 >someGenerics2a<string>((n) => n.substr(0)) : void
->someGenerics2a : typeof someGenerics2a
+>someGenerics2a : <T>(n: (x: T) => void) => void
 >(n) => n.substr(0) : (n: string) => string
 >n : string
 >n.substr(0) : string
@@ -84,7 +84,7 @@ someGenerics2a<string>((n) => n.substr(0));
 >substr : (from: number, length?: number) => string
 
 function someGenerics2b<T, U>(n: (x: T, y: U) => void) { }
->someGenerics2b : typeof someGenerics2b
+>someGenerics2b : <T, U>(n: (x: T, y: U) => void) => void
 >T : T
 >U : U
 >n : (x: T, y: U) => void
@@ -95,7 +95,7 @@ function someGenerics2b<T, U>(n: (x: T, y: U) => void) { }
 
 someGenerics2b((n: string, x: number) => n);
 >someGenerics2b((n: string, x: number) => n) : void
->someGenerics2b : typeof someGenerics2b
+>someGenerics2b : <T, U>(n: (x: T, y: U) => void) => void
 >(n: string, x: number) => n : (n: string, x: number) => string
 >n : string
 >x : number
@@ -103,7 +103,7 @@ someGenerics2b((n: string, x: number) => n);
 
 someGenerics2b<string, number>((n: string, t: number) => n);
 >someGenerics2b<string, number>((n: string, t: number) => n) : void
->someGenerics2b : typeof someGenerics2b
+>someGenerics2b : <T, U>(n: (x: T, y: U) => void) => void
 >(n: string, t: number) => n : (n: string, t: number) => string
 >n : string
 >t : number
@@ -111,7 +111,7 @@ someGenerics2b<string, number>((n: string, t: number) => n);
 
 someGenerics2b<string, number>((n, t) => n.substr(t * t));
 >someGenerics2b<string, number>((n, t) => n.substr(t * t)) : void
->someGenerics2b : typeof someGenerics2b
+>someGenerics2b : <T, U>(n: (x: T, y: U) => void) => void
 >(n, t) => n.substr(t * t) : (n: string, t: number) => string
 >n : string
 >t : number
@@ -125,31 +125,31 @@ 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 : typeof someGenerics3
+>someGenerics3 : <T>(producer: () => T) => void
 >T : T
 >producer : () => T
 >T : T
 
 someGenerics3(() => '');
 >someGenerics3(() => '') : void
->someGenerics3 : typeof someGenerics3
+>someGenerics3 : <T>(producer: () => T) => void
 >() => '' : () => string
 
 someGenerics3<Date>(() => undefined);
 >someGenerics3<Date>(() => undefined) : void
->someGenerics3 : typeof someGenerics3
+>someGenerics3 : <T>(producer: () => T) => void
 >Date : Date
 >() => undefined : () => any
 >undefined : undefined
 
 someGenerics3<number>(() => 3);
 >someGenerics3<number>(() => 3) : void
->someGenerics3 : typeof someGenerics3
+>someGenerics3 : <T>(producer: () => T) => void
 >() => 3 : () => number
 
 // 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 : typeof someGenerics4
+>someGenerics4 : <T, U>(n: T, f: (x: U) => void) => void
 >T : T
 >U : U
 >n : T
@@ -160,21 +160,21 @@ function someGenerics4<T, U>(n: T, f: (x: U) => void) { }
 
 someGenerics4(4, () => null);
 >someGenerics4(4, () => null) : void
->someGenerics4 : typeof someGenerics4
+>someGenerics4 : <T, U>(n: T, f: (x: U) => void) => void
 >() => null : () => any
 
 someGenerics4<string, number>('', () => 3);
 >someGenerics4<string, number>('', () => 3) : void
->someGenerics4 : typeof someGenerics4
+>someGenerics4 : <T, U>(n: T, f: (x: U) => void) => void
 >() => 3 : () => number
 
 someGenerics4<string, number>(null, null);
 >someGenerics4<string, number>(null, null) : void
->someGenerics4 : typeof someGenerics4
+>someGenerics4 : <T, U>(n: T, f: (x: U) => void) => void
 
 // 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 : typeof someGenerics5
+>someGenerics5 : <U, T>(n: T, f: (x: U) => void) => void
 >U : U
 >T : T
 >n : T
@@ -185,21 +185,21 @@ function someGenerics5<U, T>(n: T, f: (x: U) => void) { }
 
 someGenerics5(4, () => null);
 >someGenerics5(4, () => null) : void
->someGenerics5 : typeof someGenerics5
+>someGenerics5 : <U, T>(n: T, f: (x: U) => void) => void
 >() => null : () => any
 
 someGenerics5<number, string>('', () => 3);
 >someGenerics5<number, string>('', () => 3) : void
->someGenerics5 : typeof someGenerics5
+>someGenerics5 : <U, T>(n: T, f: (x: U) => void) => void
 >() => 3 : () => number
 
 someGenerics5<string, number>(null, null);
 >someGenerics5<string, number>(null, null) : void
->someGenerics5 : typeof someGenerics5
+>someGenerics5 : <U, T>(n: T, f: (x: U) => void) => void
 
 // 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 : typeof someGenerics6
+>someGenerics6 : <A>(a: (a: A) => A, b: (b: A) => A, c: (c: A) => A) => void
 >A : A
 >a : (a: A) => A
 >a : A
@@ -216,7 +216,7 @@ function someGenerics6<A>(a: (a: A) => A, b: (b: A) => A, c: (c: A) => A) { }
 
 someGenerics6(n => n, n => n, n => n);
 >someGenerics6(n => n, n => n, n => n) : void
->someGenerics6 : typeof someGenerics6
+>someGenerics6 : <A>(a: (a: A) => A, b: (b: A) => A, c: (c: A) => A) => void
 >n => n : (n: {}) => {}
 >n : {}
 >n : {}
@@ -229,7 +229,7 @@ someGenerics6(n => n, n => n, n => n);
 
 someGenerics6<number>(n => n, n => n, n => n);
 >someGenerics6<number>(n => n, n => n, n => n) : void
->someGenerics6 : typeof someGenerics6
+>someGenerics6 : <A>(a: (a: A) => A, b: (b: A) => A, c: (c: A) => A) => void
 >n => n : (n: number) => number
 >n : number
 >n : number
@@ -242,7 +242,7 @@ someGenerics6<number>(n => n, n => n, n => n);
 
 someGenerics6<number>((n: number) => n, (n: number) => n, (n: number) => n);
 >someGenerics6<number>((n: number) => n, (n: number) => n, (n: number) => n) : void
->someGenerics6 : typeof someGenerics6
+>someGenerics6 : <A>(a: (a: A) => A, b: (b: A) => A, c: (c: A) => A) => void
 >(n: number) => n : (n: number) => number
 >n : number
 >n : number
@@ -255,7 +255,7 @@ 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 : typeof someGenerics7
+>someGenerics7 : <A, B, C>(a: (a: A) => A, b: (b: B) => B, c: (c: C) => C) => void
 >A : A
 >B : B
 >C : C
@@ -274,7 +274,7 @@ function someGenerics7<A, B, C>(a: (a: A) => A, b: (b: B) => B, c: (c: C) => C)
 
 someGenerics7(n => n, n => n, n => n);
 >someGenerics7(n => n, n => n, n => n) : void
->someGenerics7 : typeof someGenerics7
+>someGenerics7 : <A, B, C>(a: (a: A) => A, b: (b: B) => B, c: (c: C) => C) => void
 >n => n : (n: {}) => {}
 >n : {}
 >n : {}
@@ -287,7 +287,7 @@ someGenerics7(n => n, n => n, n => n);
 
 someGenerics7<number, string, number>(n => n, n => n, n => n);
 >someGenerics7<number, string, number>(n => n, n => n, n => n) : void
->someGenerics7 : typeof someGenerics7
+>someGenerics7 : <A, B, C>(a: (a: A) => A, b: (b: B) => B, c: (c: C) => C) => void
 >n => n : (n: number) => number
 >n : number
 >n : number
@@ -300,7 +300,7 @@ someGenerics7<number, string, number>(n => n, n => n, n => n);
 
 someGenerics7<number, string, number>((n: number) => n, (n: string) => n, (n: number) => n);
 >someGenerics7<number, string, number>((n: number) => n, (n: string) => n, (n: number) => n) : void
->someGenerics7 : typeof someGenerics7
+>someGenerics7 : <A, B, C>(a: (a: A) => A, b: (b: B) => B, c: (c: C) => C) => void
 >(n: number) => n : (n: number) => number
 >n : number
 >n : number
@@ -313,7 +313,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 : typeof someGenerics8
+>someGenerics8 : <T>(n: T) => T
 >T : T
 >n : T
 >T : T
@@ -321,18 +321,18 @@ function someGenerics8<T>(n: T): T { return n; }
 >n : T
 
 var x = someGenerics8(someGenerics7);
->x : typeof someGenerics7
->someGenerics8(someGenerics7) : typeof someGenerics7
->someGenerics8 : typeof someGenerics8
->someGenerics7 : typeof someGenerics7
+>x : <A, B, C>(a: (a: A) => A, b: (b: B) => B, c: (c: C) => C) => void
+>someGenerics8(someGenerics7) : <A, B, C>(a: (a: A) => A, b: (b: B) => B, c: (c: C) => C) => void
+>someGenerics8 : <T>(n: T) => T
+>someGenerics7 : <A, B, C>(a: (a: A) => A, b: (b: B) => B, c: (c: C) => C) => void
 
 x<string, string, string>(null, null, null);
 >x<string, string, string>(null, null, null) : void
->x : typeof someGenerics7
+>x : <A, B, C>(a: (a: A) => A, b: (b: B) => B, c: (c: C) => C) => void
 
 // 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 : typeof someGenerics9
+>someGenerics9 : <T>(a: T, b: T, c: T) => T
 >T : T
 >a : T
 >T : T
@@ -347,7 +347,7 @@ function someGenerics9<T>(a: T, b: T, c: T): T {
 var a9a = someGenerics9('', 0, []);
 >a9a : {}
 >someGenerics9('', 0, []) : {}
->someGenerics9 : typeof someGenerics9
+>someGenerics9 : <T>(a: T, b: T, c: T) => T
 >[] : undefined[]
 
 var a9a: {};
@@ -356,7 +356,7 @@ var a9a: {};
 var a9b = someGenerics9<{ a?: number; b?: string; }>({ a: 0 }, { b: '' }, null);
 >a9b : { a?: number; b?: string; }
 >someGenerics9<{ a?: number; b?: string; }>({ a: 0 }, { b: '' }, null) : { a?: number; b?: string; }
->someGenerics9 : typeof someGenerics9
+>someGenerics9 : <T>(a: T, b: T, c: T) => T
 >a : number
 >b : string
 >{ a: 0 } : { a: number; }
@@ -392,7 +392,7 @@ interface A92 {
 var a9e = someGenerics9(undefined, { x: 6, z: new Date() }, { x: 6, y: '' });
 >a9e : {}
 >someGenerics9(undefined, { x: 6, z: new Date() }, { x: 6, y: '' }) : {}
->someGenerics9 : typeof someGenerics9
+>someGenerics9 : <T>(a: T, b: T, c: T) => T
 >undefined : undefined
 >{ x: 6, z: new Date() } : { x: number; z: Date; }
 >x : number
@@ -409,7 +409,7 @@ var a9e: {};
 var a9f = someGenerics9<A92>(undefined, { x: 6, z: new Date() }, { x: 6, y: '' });
 >a9f : A92
 >someGenerics9<A92>(undefined, { x: 6, z: new Date() }, { x: 6, y: '' }) : A92
->someGenerics9 : typeof someGenerics9
+>someGenerics9 : <T>(a: T, b: T, c: T) => T
 >A92 : A92
 >undefined : undefined
 >{ x: 6, z: new Date() } : { x: number; z: Date; }
@@ -429,7 +429,7 @@ var a9f: A92;
 var a9d = someGenerics9({ x: 3 }, { x: 6 }, { x: 6 });
 >a9d : { x: number; }
 >someGenerics9({ x: 3 }, { x: 6 }, { x: 6 }) : { x: number; }
->someGenerics9 : typeof someGenerics9
+>someGenerics9 : <T>(a: T, b: T, c: T) => T
 >{ x: 3 } : { x: number; }
 >x : number
 >{ x: 6 } : { x: number; }
@@ -448,7 +448,7 @@ var anyVar: any;
 var a = someGenerics9(7, anyVar, 4);
 >a : any
 >someGenerics9(7, anyVar, 4) : any
->someGenerics9 : typeof someGenerics9
+>someGenerics9 : <T>(a: T, b: T, c: T) => T
 >anyVar : any
 
 var a: any;
@@ -458,7 +458,7 @@ var a: any;
 var arr = someGenerics9([], null, undefined);
 >arr : any[]
 >someGenerics9([], null, undefined) : any[]
->someGenerics9 : typeof someGenerics9
+>someGenerics9 : <T>(a: T, b: T, c: T) => T
 >[] : any[]
 >undefined : undefined
 
diff --git a/tests/baselines/reference/typeArgumentInferenceOrdering.types b/tests/baselines/reference/typeArgumentInferenceOrdering.types
index ebba7ce49c9..62371562c96 100644
--- a/tests/baselines/reference/typeArgumentInferenceOrdering.types
+++ b/tests/baselines/reference/typeArgumentInferenceOrdering.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/typeArgumentInferenceOrdering.ts ===
 function foo<T>(f: { y: T }): T { return null }
->foo : typeof foo
+>foo : <T>(f: { y: T; }) => T
 >T : T
 >f : { y: T; }
 >y : T
@@ -11,7 +11,7 @@ var x = foo(new C()).x; // was Error that property x does not exist on type {}
 >x : () => Goo
 >foo(new C()).x : () => Goo
 >foo(new C()) : I
->foo : typeof foo
+>foo : <T>(f: { y: T; }) => T
 >new C() : C
 >C : typeof C
 >x : () => Goo
diff --git a/tests/baselines/reference/typeArgumentInferenceWithConstraintAsCommonRoot.types b/tests/baselines/reference/typeArgumentInferenceWithConstraintAsCommonRoot.types
index 4d4ae199926..35328f72803 100644
--- a/tests/baselines/reference/typeArgumentInferenceWithConstraintAsCommonRoot.types
+++ b/tests/baselines/reference/typeArgumentInferenceWithConstraintAsCommonRoot.types
@@ -14,7 +14,7 @@ interface Elephant extends Animal { z }
 >z : any
 
 function f<T extends Animal>(x: T, y: T): T { return undefined; }
->f : typeof f
+>f : <T extends Animal>(x: T, y: T) => T
 >T : T
 >Animal : Animal
 >x : T
@@ -34,7 +34,7 @@ var e: Elephant;
 
 f(g, e); // valid because both Giraffe and Elephant satisfy the constraint. T is Animal
 >f(g, e) : Animal
->f : typeof f
+>f : <T extends Animal>(x: T, y: T) => T
 >g : Giraffe
 >e : Elephant
 
diff --git a/tests/baselines/reference/typeCheckObjectCreationExpressionWithUndefinedCallResolutionData.types b/tests/baselines/reference/typeCheckObjectCreationExpressionWithUndefinedCallResolutionData.types
index b8222e73d92..a3ed77e3488 100644
--- a/tests/baselines/reference/typeCheckObjectCreationExpressionWithUndefinedCallResolutionData.types
+++ b/tests/baselines/reference/typeCheckObjectCreationExpressionWithUndefinedCallResolutionData.types
@@ -4,13 +4,13 @@ import f = require('file1');
 
 f.foo();
 >f.foo() : any
->f.foo : typeof f.foo
+>f.foo : () => any
 >f : typeof f
->foo : typeof f.foo
+>foo : () => any
 
 === tests/cases/compiler/file1.ts ===
 export function foo() {
->foo : typeof foo
+>foo : () => any
 
 var classes = undefined;
 >classes : any
diff --git a/tests/baselines/reference/typeInferenceConflictingCandidates.types b/tests/baselines/reference/typeInferenceConflictingCandidates.types
index fc9e2824265..7a77daf4092 100644
--- a/tests/baselines/reference/typeInferenceConflictingCandidates.types
+++ b/tests/baselines/reference/typeInferenceConflictingCandidates.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/typeInferenceConflictingCandidates.ts ===
 declare function g<T>(a: T, b: T, c: (t: T) => T): T;
->g : typeof g
+>g : <T>(a: T, b: T, c: (t: T) => T) => T
 >T : T
 >a : T
 >T : T
@@ -14,7 +14,7 @@ declare function g<T>(a: T, b: T, c: (t: T) => T): T;
 
 g("", 3, a => a);
 >g("", 3, a => a) : {}
->g : typeof g
+>g : <T>(a: T, b: T, c: (t: T) => T) => T
 >a => a : (a: {}) => {}
 >a : {}
 >a : {}
diff --git a/tests/baselines/reference/typeInferenceFixEarly.types b/tests/baselines/reference/typeInferenceFixEarly.types
index 47bdcec0c71..c009d2d809e 100644
--- a/tests/baselines/reference/typeInferenceFixEarly.types
+++ b/tests/baselines/reference/typeInferenceFixEarly.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/typeInferenceFixEarly.ts ===
 declare function f<T>(p: (t: T) => T): T;
->f : typeof f
+>f : <T>(p: (t: T) => T) => T
 >T : T
 >p : (t: T) => T
 >t : T
@@ -10,7 +10,7 @@ declare function f<T>(p: (t: T) => T): T;
 
 f(n => 3);
 >f(n => 3) : {}
->f : typeof f
+>f : <T>(p: (t: T) => T) => T
 >n => 3 : (n: {}) => number
 >n : {}
 
diff --git a/tests/baselines/reference/typeInferenceWithTypeAnnotation.types b/tests/baselines/reference/typeInferenceWithTypeAnnotation.types
index f47aaf9942b..b1d97ec3fef 100644
--- a/tests/baselines/reference/typeInferenceWithTypeAnnotation.types
+++ b/tests/baselines/reference/typeInferenceWithTypeAnnotation.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/typeInferenceWithTypeAnnotation.ts ===
 declare function f<T>(p: (t: T) => T): T;
->f : typeof f
+>f : <T>(p: (t: T) => T) => T
 >T : T
 >p : (t: T) => T
 >t : T
@@ -10,7 +10,7 @@ declare function f<T>(p: (t: T) => T): T;
 
 f((n: number) => n); 
 >f((n: number) => n) : number
->f : typeof f
+>f : <T>(p: (t: T) => T) => T
 >(n: number) => n : (n: number) => number
 >n : number
 >n : number
diff --git a/tests/baselines/reference/typeOfThisInFunctionExpression.types b/tests/baselines/reference/typeOfThisInFunctionExpression.types
index 5b66ec0d5c9..b91f5f8c33b 100644
--- a/tests/baselines/reference/typeOfThisInFunctionExpression.types
+++ b/tests/baselines/reference/typeOfThisInFunctionExpression.types
@@ -2,7 +2,7 @@
 // type of 'this' in FunctionExpression is Any
 
 function fn() {
->fn : typeof fn
+>fn : () => void
 
     var p = this;
 >p : any
@@ -69,7 +69,7 @@ module M {
 >M : typeof M
 
     function fn() {
->fn : typeof fn
+>fn : () => void
 
         var p = this;
 >p : any
diff --git a/tests/baselines/reference/typeParameterAndArgumentOfSameName1.types b/tests/baselines/reference/typeParameterAndArgumentOfSameName1.types
index 64195a4a976..5811e481ebd 100644
--- a/tests/baselines/reference/typeParameterAndArgumentOfSameName1.types
+++ b/tests/baselines/reference/typeParameterAndArgumentOfSameName1.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/typeParameterAndArgumentOfSameName1.ts ===
 function f<A extends Number>(A: A): A {
->f : typeof f
+>f : <A extends Number>(A: A) => A
 >A : A
 >Number : Number
 >A : A
diff --git a/tests/baselines/reference/typeParameterAsElementType.types b/tests/baselines/reference/typeParameterAsElementType.types
index 46c603af294..0dbbbf5ac7a 100644
--- a/tests/baselines/reference/typeParameterAsElementType.types
+++ b/tests/baselines/reference/typeParameterAsElementType.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/typeParameterAsElementType.ts ===
 function fee<T>() {
->fee : typeof fee
+>fee : <T>() => void
 >T : T
 
     var t: T;
diff --git a/tests/baselines/reference/typeParameterAsTypeArgument.types b/tests/baselines/reference/typeParameterAsTypeArgument.types
index d8573a1564b..5e0d5ba2437 100644
--- a/tests/baselines/reference/typeParameterAsTypeArgument.types
+++ b/tests/baselines/reference/typeParameterAsTypeArgument.types
@@ -2,7 +2,7 @@
 // These are all errors because type parameters cannot reference other type parameters from the same list
 
 function foo<T, U>(x: T, y: U) {
->foo : typeof foo
+>foo : <T, U>(x: T, y: U) => C<U, T>
 >T : T
 >U : U
 >x : T
@@ -12,7 +12,7 @@ function foo<T, U>(x: T, y: U) {
 
     foo<U, U>(y, y);
 >foo<U, U>(y, y) : C<U, U>
->foo : typeof foo
+>foo : <T, U>(x: T, y: U) => C<U, T>
 >U : U
 >U : U
 >y : U
diff --git a/tests/baselines/reference/typeParameterAsTypeParameterConstraintTransitively.types b/tests/baselines/reference/typeParameterAsTypeParameterConstraintTransitively.types
index 62a19ee5d4f..21f0f4835ab 100644
--- a/tests/baselines/reference/typeParameterAsTypeParameterConstraintTransitively.types
+++ b/tests/baselines/reference/typeParameterAsTypeParameterConstraintTransitively.types
@@ -29,7 +29,7 @@ var c: C;
 >C : C
 
 function foo<T, U, V>(x: T, y: U, z: V): V { return z; }
->foo : typeof foo
+>foo : <T, U, V>(x: T, y: U, z: V) => V
 >T : T
 >U : U
 >V : V
@@ -46,11 +46,11 @@ function foo<T, U, V>(x: T, y: U, z: V): V { return z; }
 
 foo(1, 2, 3);
 >foo(1, 2, 3) : number
->foo : typeof foo
+>foo : <T, U, V>(x: T, y: U, z: V) => V
 
 foo({ x: 1 }, { x: 1, y: '' }, { x: 2, y: '', z: true });
 >foo({ x: 1 }, { x: 1, y: '' }, { x: 2, y: '', z: true }) : { x: number; y: string; z: boolean; }
->foo : typeof foo
+>foo : <T, U, V>(x: T, y: U, z: V) => V
 >{ x: 1 } : { x: number; }
 >x : number
 >{ x: 1, y: '' } : { x: number; y: string; }
@@ -63,14 +63,14 @@ foo({ x: 1 }, { x: 1, y: '' }, { x: 2, y: '', z: true });
 
 foo(a, b, c);
 >foo(a, b, c) : C
->foo : typeof foo
+>foo : <T, U, V>(x: T, y: U, z: V) => V
 >a : A
 >b : B
 >c : C
 
 foo(a, b, { foo: 1, bar: '', hm: true });
 >foo(a, b, { foo: 1, bar: '', hm: true }) : { foo: number; bar: string; hm: boolean; }
->foo : typeof foo
+>foo : <T, U, V>(x: T, y: U, z: V) => V
 >a : A
 >b : B
 >{ foo: 1, bar: '', hm: true } : { foo: number; bar: string; hm: boolean; }
@@ -80,7 +80,7 @@ foo(a, b, { foo: 1, bar: '', hm: true });
 
 foo((x: number, y) => { }, (x) => { }, () => { });
 >foo((x: number, y) => { }, (x) => { }, () => { }) : () => void
->foo : typeof foo
+>foo : <T, U, V>(x: T, y: U, z: V) => V
 >(x: number, y) => { } : (x: number, y: any) => void
 >x : number
 >y : any
@@ -89,7 +89,7 @@ foo((x: number, y) => { }, (x) => { }, () => { });
 >() => { } : () => void
 
 function foo2<T extends A, U, V>(x: T, y: U, z: V): V { return z; }
->foo2 : typeof foo2
+>foo2 : <T extends A, U, V>(x: T, y: U, z: V) => V
 >T : T
 >A : A
 >U : U
@@ -106,21 +106,21 @@ function foo2<T extends A, U, V>(x: T, y: U, z: V): V { return z; }
 //function foo2<T extends A, U extends T, V extends U>(x: T, y: U, z: V): V { return z; }
 foo(a, a, a);
 >foo(a, a, a) : A
->foo : typeof foo
+>foo : <T, U, V>(x: T, y: U, z: V) => V
 >a : A
 >a : A
 >a : A
 
 foo(a, b, c);
 >foo(a, b, c) : C
->foo : typeof foo
+>foo : <T, U, V>(x: T, y: U, z: V) => V
 >a : A
 >b : B
 >c : C
 
 foo(b, b, { foo: 1, bar: '', hm: '' });
 >foo(b, b, { foo: 1, bar: '', hm: '' }) : { foo: number; bar: string; hm: string; }
->foo : typeof foo
+>foo : <T, U, V>(x: T, y: U, z: V) => V
 >b : B
 >b : B
 >{ foo: 1, bar: '', hm: '' } : { foo: number; bar: string; hm: string; }
diff --git a/tests/baselines/reference/typeParameterAsTypeParameterConstraintTransitively2.types b/tests/baselines/reference/typeParameterAsTypeParameterConstraintTransitively2.types
index 283b6e43205..fdd66ebf435 100644
--- a/tests/baselines/reference/typeParameterAsTypeParameterConstraintTransitively2.types
+++ b/tests/baselines/reference/typeParameterAsTypeParameterConstraintTransitively2.types
@@ -29,7 +29,7 @@ var c: C;
 >C : C
 
 function foo<T, U, V>(x: T, y: U, z: V): V { return z; }
->foo : typeof foo
+>foo : <T, U, V>(x: T, y: U, z: V) => V
 >T : T
 >U : U
 >V : V
@@ -46,11 +46,11 @@ function foo<T, U, V>(x: T, y: U, z: V): V { return z; }
 
 foo(1, 2, '');
 >foo(1, 2, '') : string
->foo : typeof foo
+>foo : <T, U, V>(x: T, y: U, z: V) => V
 
 foo({ x: 1 }, { x: 1, y: '' }, { x: 2, y: 2, z: true });
 >foo({ x: 1 }, { x: 1, y: '' }, { x: 2, y: 2, z: true }) : { x: number; y: number; z: boolean; }
->foo : typeof foo
+>foo : <T, U, V>(x: T, y: U, z: V) => V
 >{ x: 1 } : { x: number; }
 >x : number
 >{ x: 1, y: '' } : { x: number; y: string; }
@@ -63,14 +63,14 @@ foo({ x: 1 }, { x: 1, y: '' }, { x: 2, y: 2, z: true });
 
 foo(a, b, a);
 >foo(a, b, a) : A
->foo : typeof foo
+>foo : <T, U, V>(x: T, y: U, z: V) => V
 >a : A
 >b : B
 >a : A
 
 foo(a, { foo: 1, bar: '', hm: true }, b);
 >foo(a, { foo: 1, bar: '', hm: true }, b) : B
->foo : typeof foo
+>foo : <T, U, V>(x: T, y: U, z: V) => V
 >a : A
 >{ foo: 1, bar: '', hm: true } : { foo: number; bar: string; hm: boolean; }
 >foo : number
@@ -80,7 +80,7 @@ foo(a, { foo: 1, bar: '', hm: true }, b);
 
 foo((x: number, y: string) => { }, (x, y: boolean) => { }, () => { });
 >foo((x: number, y: string) => { }, (x, y: boolean) => { }, () => { }) : () => void
->foo : typeof foo
+>foo : <T, U, V>(x: T, y: U, z: V) => V
 >(x: number, y: string) => { } : (x: number, y: string) => void
 >x : number
 >y : string
@@ -90,7 +90,7 @@ foo((x: number, y: string) => { }, (x, y: boolean) => { }, () => { });
 >() => { } : () => void
 
 function foo2<T extends A, U extends A, V extends A>(x: T, y: U, z: V): V { return z; }
->foo2 : typeof foo2
+>foo2 : <T extends A, U extends A, V extends A>(x: T, y: U, z: V) => V
 >T : T
 >A : A
 >U : U
@@ -109,14 +109,14 @@ function foo2<T extends A, U extends A, V extends A>(x: T, y: U, z: V): V { retu
 //function foo2<T extends A, U extends T, V extends U>(x: T, y: U, z: V): V { return z; }
 foo(b, a, c);
 >foo(b, a, c) : C
->foo : typeof foo
+>foo : <T, U, V>(x: T, y: U, z: V) => V
 >b : B
 >a : A
 >c : C
 
 foo(c, c, a);
 >foo(c, c, a) : A
->foo : typeof foo
+>foo : <T, U, V>(x: T, y: U, z: V) => V
 >c : C
 >c : C
 >a : A
diff --git a/tests/baselines/reference/typeParametersAreIdenticalToThemselves.types b/tests/baselines/reference/typeParametersAreIdenticalToThemselves.types
index 52b5754854a..345914d41bf 100644
--- a/tests/baselines/reference/typeParametersAreIdenticalToThemselves.types
+++ b/tests/baselines/reference/typeParametersAreIdenticalToThemselves.types
@@ -2,46 +2,46 @@
 // type parameters from the same declaration are identical to themself
 
 function foo1<T>(x: T);
->foo1 : typeof foo1
+>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 : typeof foo1
+>foo1 : { <T>(x: T): any; <T>(x: T): any; }
 >T : T
 >x : T
 >T : T
 
 function foo1<T>(x: T) { }
->foo1 : typeof foo1
+>foo1 : { <T>(x: T): any; <T>(x: T): any; }
 >T : T
 >x : T
 >T : T
 
 function foo2<T, U>(x: T);
->foo2 : typeof foo2
+>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 : typeof foo2
+>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 : typeof foo2
+>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 : typeof foo3
+>foo3 : <T, U>(x: T, y: U) => void
 >T : T
 >U : U
 >x : T
diff --git a/tests/baselines/reference/typeParametersAvailableInNestedScope2.types b/tests/baselines/reference/typeParametersAvailableInNestedScope2.types
index 70b0aa8b691..e5aa4282fbd 100644
--- a/tests/baselines/reference/typeParametersAvailableInNestedScope2.types
+++ b/tests/baselines/reference/typeParametersAvailableInNestedScope2.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/types/typeParameters/typeParameterLists/typeParametersAvailableInNestedScope2.ts ===
 function foo<T, U>(x: T, y: U) {
->foo : typeof foo
+>foo : <T, U>(x: T, y: U) => void
 >T : T
 >U : U
 >x : T
diff --git a/tests/baselines/reference/typeofOperatorWithBooleanType.types b/tests/baselines/reference/typeofOperatorWithBooleanType.types
index bd41639c0a1..74df383985a 100644
--- a/tests/baselines/reference/typeofOperatorWithBooleanType.types
+++ b/tests/baselines/reference/typeofOperatorWithBooleanType.types
@@ -4,7 +4,7 @@ var BOOLEAN: boolean;
 >BOOLEAN : boolean
 
 function foo(): boolean { return true; }
->foo : typeof foo
+>foo : () => boolean
 
 class A {
 >A : A
@@ -64,7 +64,7 @@ var ResultIsString6 = typeof foo();
 >ResultIsString6 : string
 >typeof foo() : string
 >foo() : boolean
->foo : typeof foo
+>foo : () => boolean
 
 var ResultIsString7 = typeof A.foo();
 >ResultIsString7 : string
@@ -92,7 +92,7 @@ typeof BOOLEAN;
 typeof foo();
 >typeof foo() : string
 >foo() : boolean
->foo : typeof foo
+>foo : () => boolean
 
 typeof true, false;
 >typeof true, false : boolean
@@ -126,7 +126,7 @@ z: typeof BOOLEAN;
 
 r: typeof foo;
 >typeof foo : string
->foo : typeof foo
+>foo : () => boolean
 
 var y = { a: true, b: false};
 >y : { a: boolean; b: boolean; }
diff --git a/tests/baselines/reference/typeofOperatorWithNumberType.types b/tests/baselines/reference/typeofOperatorWithNumberType.types
index e3a2794edbe..43d798d4c8e 100644
--- a/tests/baselines/reference/typeofOperatorWithNumberType.types
+++ b/tests/baselines/reference/typeofOperatorWithNumberType.types
@@ -8,7 +8,7 @@ var NUMBER1: number[] = [1, 2];
 >[1, 2] : number[]
 
 function foo(): number { return 1; }
->foo : typeof foo
+>foo : () => number
 
 class A {
 >A : A
@@ -89,7 +89,7 @@ var ResultIsString9 = typeof foo();
 >ResultIsString9 : string
 >typeof foo() : string
 >foo() : number
->foo : typeof foo
+>foo : () => number
 
 var ResultIsString10 = typeof A.foo();
 >ResultIsString10 : string
@@ -139,7 +139,7 @@ typeof NUMBER1;
 typeof foo();
 >typeof foo() : string
 >foo() : number
->foo : typeof foo
+>foo : () => number
 
 typeof objA.a;
 >typeof objA.a : string
@@ -180,7 +180,7 @@ x: typeof NUMBER1;
 
 r: typeof foo;
 >typeof foo : string
->foo : typeof foo
+>foo : () => number
 
 var y = { a: 1, b: 2 };
 >y : { a: number; b: number; }
diff --git a/tests/baselines/reference/typeofOperatorWithStringType.types b/tests/baselines/reference/typeofOperatorWithStringType.types
index dff0676b82e..fe63bc4cd36 100644
--- a/tests/baselines/reference/typeofOperatorWithStringType.types
+++ b/tests/baselines/reference/typeofOperatorWithStringType.types
@@ -8,7 +8,7 @@ var STRING1: string[] = ["", "abc"];
 >["", "abc"] : string[]
 
 function foo(): string { return "abc"; }
->foo : typeof foo
+>foo : () => string
 
 class A {
 >A : A
@@ -89,7 +89,7 @@ var ResultIsString9 = typeof foo();
 >ResultIsString9 : string
 >typeof foo() : string
 >foo() : string
->foo : typeof foo
+>foo : () => string
 
 var ResultIsString10 = typeof A.foo();
 >ResultIsString10 : string
@@ -147,7 +147,7 @@ typeof STRING1;
 typeof foo();
 >typeof foo() : string
 >foo() : string
->foo : typeof foo
+>foo : () => string
 
 typeof objA.a, M.n;
 >typeof objA.a, M.n : string
@@ -179,7 +179,7 @@ x: typeof STRING1;
 
 r: typeof foo;
 >typeof foo : string
->foo : typeof foo
+>foo : () => string
 
 var y = { a: "", b: "" };
 >y : { a: string; b: string; }
diff --git a/tests/baselines/reference/uncaughtCompilerError1.types b/tests/baselines/reference/uncaughtCompilerError1.types
index b017471e569..1300915a803 100644
--- a/tests/baselines/reference/uncaughtCompilerError1.types
+++ b/tests/baselines/reference/uncaughtCompilerError1.types
@@ -6,7 +6,7 @@ declare var index, lineTokens, token, tokens;
 >tokens : any
 
 function f() {
->f : typeof f
+>f : () => { appendText: string; advanceCount: number; }
 
     if (lineTokens[index].trim() === '=' && index > 0 && token.type === '' && tokens[index - 1].type === 'attribute.name.html') {
 >lineTokens[index].trim() === '=' && index > 0 && token.type === '' && tokens[index - 1].type === 'attribute.name.html' : boolean
diff --git a/tests/baselines/reference/undefinedArgumentInference.types b/tests/baselines/reference/undefinedArgumentInference.types
index 463b3fca1fa..e6c50461aeb 100644
--- a/tests/baselines/reference/undefinedArgumentInference.types
+++ b/tests/baselines/reference/undefinedArgumentInference.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/undefinedArgumentInference.ts ===
 function foo1<T>(f1: { x: T; y: T }): T {
->foo1 : typeof foo1
+>foo1 : <T>(f1: { x: T; y: T; }) => T
 >T : T
 >f1 : { x: T; y: T; }
 >x : T
@@ -17,7 +17,7 @@ function foo1<T>(f1: { x: T; y: T }): T {
 var z1 = foo1({ x: undefined, y: undefined }); 
 >z1 : any
 >foo1({ x: undefined, y: undefined }) : any
->foo1 : typeof foo1
+>foo1 : <T>(f1: { x: T; y: T; }) => T
 >{ x: undefined, y: undefined } : { x: undefined; y: undefined; }
 >x : any
 >undefined : undefined
diff --git a/tests/baselines/reference/undefinedAssignableToEveryType.types b/tests/baselines/reference/undefinedAssignableToEveryType.types
index 1037b96976f..a32af9cd58f 100644
--- a/tests/baselines/reference/undefinedAssignableToEveryType.types
+++ b/tests/baselines/reference/undefinedAssignableToEveryType.types
@@ -118,7 +118,7 @@ var q: String = undefined;
 >undefined : undefined
 
 function foo<T, U, V extends Date>(x: T, y: U, z: V) {
->foo : typeof foo
+>foo : <T, U, V extends Date>(x: T, y: U, z: V) => void
 >T : T
 >U : U
 >V : V
diff --git a/tests/baselines/reference/undefinedInferentialTyping.types b/tests/baselines/reference/undefinedInferentialTyping.types
index 881ced0fb90..b5741e4d40f 100644
--- a/tests/baselines/reference/undefinedInferentialTyping.types
+++ b/tests/baselines/reference/undefinedInferentialTyping.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/undefinedInferentialTyping.ts ===
 function f<T>(arr: T[], elemnt: T): T {
->f : typeof f
+>f : <T>(arr: T[], elemnt: T) => T
 >T : T
 >arr : T[]
 >T : T
@@ -14,6 +14,6 @@ function f<T>(arr: T[], elemnt: T): T {
 var a = f([], 3); // should be number
 >a : number
 >f([], 3) : number
->f : typeof f
+>f : <T>(arr: T[], elemnt: T) => T
 >[] : number[]
 
diff --git a/tests/baselines/reference/underscoreMapFirst.types b/tests/baselines/reference/underscoreMapFirst.types
index c15e0ac37d3..52761647164 100644
--- a/tests/baselines/reference/underscoreMapFirst.types
+++ b/tests/baselines/reference/underscoreMapFirst.types
@@ -45,7 +45,7 @@ declare module _ {
 >T : T
     }
     export function pluck<T extends {}>(
->pluck : typeof pluck
+>pluck : <T extends {}>(list: Collection<T>, propertyName: string) => any[]
 >T : T
 
         list: Collection<T>,
@@ -57,7 +57,7 @@ declare module _ {
 >propertyName : string
 
     export function map<T, TResult>(
->map : typeof map
+>map : <T, TResult>(list: List<T>, iterator: ListIterator<T, TResult>, context?: any) => TResult[]
 >T : T
 >TResult : TResult
 
@@ -77,7 +77,7 @@ declare module _ {
 >TResult : TResult
 
     export function first<T>(array: List<T>): T;
->first : typeof first
+>first : <T>(array: List<T>) => T
 >T : T
 >array : List<T>
 >List : List<T>
@@ -132,20 +132,20 @@ class MyView extends View {
 >allSeries : ISeries[][]
 >ISeries : ISeries
 >_.pluck(data, "series") : any[]
->_.pluck : typeof _.pluck
+>_.pluck : <T extends {}>(list: _.Collection<T>, propertyName: string) => any[]
 >_ : typeof _
->pluck : typeof _.pluck
+>pluck : <T extends {}>(list: _.Collection<T>, propertyName: string) => any[]
 >data : IData[]
 
         return _.map(allSeries, _.first);
 >_.map(allSeries, _.first) : ISeries[]
->_.map : typeof _.map
+>_.map : <T, TResult>(list: _.List<T>, iterator: _.ListIterator<T, TResult>, context?: any) => TResult[]
 >_ : typeof _
->map : typeof _.map
+>map : <T, TResult>(list: _.List<T>, iterator: _.ListIterator<T, TResult>, context?: any) => TResult[]
 >allSeries : ISeries[][]
->_.first : typeof _.first
+>_.first : <T>(array: _.List<T>) => T
 >_ : typeof _
->first : typeof _.first
+>first : <T>(array: _.List<T>) => T
     }
 }
 
diff --git a/tests/baselines/reference/underscoreTest1.types b/tests/baselines/reference/underscoreTest1.types
index 488d01b9f35..15cf42b9c7b 100644
--- a/tests/baselines/reference/underscoreTest1.types
+++ b/tests/baselines/reference/underscoreTest1.types
@@ -5,7 +5,7 @@ declare var $;
 >$ : any
 
 declare function alert(x: string): void;
->alert : typeof alert
+>alert : (x: string) => void
 >x : string
 
 _.each([1, 2, 3], (num) => alert(num.toString()));
@@ -17,7 +17,7 @@ _.each([1, 2, 3], (num) => alert(num.toString()));
 >(num) => alert(num.toString()) : (num: number) => void
 >num : number
 >alert(num.toString()) : void
->alert : typeof alert
+>alert : (x: string) => void
 >num.toString() : string
 >num.toString : (radix?: number) => string
 >num : number
@@ -36,7 +36,7 @@ _.each({ one: 1, two: 2, three: 3 }, (value: number, key?: string) => alert(valu
 >value : number
 >key : string
 >alert(value.toString()) : void
->alert : typeof alert
+>alert : (x: string) => void
 >value.toString() : string
 >value.toString : (radix?: number) => string
 >value : number
@@ -566,7 +566,7 @@ var buttonView = {
 >onClick : () => void
 >function () { alert('clicked: ' + this.label); } : () => void
 >alert('clicked: ' + this.label) : void
->alert : typeof alert
+>alert : (x: string) => void
 >'clicked: ' + this.label : string
 >this.label : any
 >this : any
@@ -576,7 +576,7 @@ var buttonView = {
 >onHover : () => void
 >function () { alert('hovering: ' + this.label); } : () => void
 >alert('hovering: ' + this.label) : void
->alert : typeof alert
+>alert : (x: string) => void
 >'hovering: ' + this.label : string
 >this.label : any
 >this : any
@@ -651,13 +651,13 @@ _.defer(function () { alert('deferred'); });
 >defer : (func: Function, ...args: any[]) => number
 >function () { alert('deferred'); } : () => void
 >alert('deferred') : void
->alert : typeof alert
+>alert : (x: string) => void
 
 var updatePosition = () => alert('updating position...');
 >updatePosition : () => void
 >() => alert('updating position...') : () => void
 >alert('updating position...') : void
->alert : typeof alert
+>alert : (x: string) => void
 
 var throttled = _.throttle(updatePosition, 100);
 >throttled : () => void
@@ -679,7 +679,7 @@ var calculateLayout = () => alert('calculating layout...');
 >calculateLayout : () => void
 >() => alert('calculating layout...') : () => void
 >alert('calculating layout...') : void
->alert : typeof alert
+>alert : (x: string) => void
 
 var lazyLayout = _.debounce(calculateLayout, 300);
 >lazyLayout : () => void
@@ -701,7 +701,7 @@ var createApplication = () => alert('creating application...');
 >createApplication : () => void
 >() => alert('creating application...') : () => void
 >alert('creating application...') : void
->alert : typeof alert
+>alert : (x: string) => void
 
 var initialize = _.once(createApplication);
 >initialize : () => void
@@ -726,7 +726,7 @@ var render = () => alert("rendering...");
 >render : () => void
 >() => alert("rendering...") : () => void
 >alert("rendering...") : void
->alert : typeof alert
+>alert : (x: string) => void
 
 var renderNotes = _.after(notes.length, render);
 >renderNotes : () => void
@@ -938,7 +938,7 @@ _.chain([1, 2, 3, 200])
     .tap(<any>alert)
 >tap : (interceptor: (object: number[]) => void) => Underscore.ChainedArray<number>
 ><any>alert : any
->alert : typeof alert
+>alert : (x: string) => void
 
     .map(function (num) { return num * num })
 >map : <U>(iterator: Iterator<number, U>, context?: any) => Underscore.ChainedArray<U>
@@ -1055,7 +1055,7 @@ _.isFunction(alert);
 >_.isFunction : (object: any) => boolean
 >_ : Underscore.Static
 >isFunction : (object: any) => boolean
->alert : typeof alert
+>alert : (x: string) => void
 
 _.isString("moe");
 >_.isString("moe") : boolean
@@ -1114,7 +1114,7 @@ _.isNaN(NaN);
 
 isNaN(undefined);
 >isNaN(undefined) : boolean
->isNaN : typeof isNaN
+>isNaN : (number: number) => boolean
 >undefined : undefined
 
 _.isNaN(undefined);
diff --git a/tests/baselines/reference/untypedArgumentInLambdaExpression.types b/tests/baselines/reference/untypedArgumentInLambdaExpression.types
index f400a0525c9..9d12a4f9fbf 100644
--- a/tests/baselines/reference/untypedArgumentInLambdaExpression.types
+++ b/tests/baselines/reference/untypedArgumentInLambdaExpression.types
@@ -1,12 +1,12 @@
 === tests/cases/compiler/untypedArgumentInLambdaExpression.ts ===
 declare function f(fn: (a: string) => string);
->f : typeof f
+>f : (fn: (a: string) => string) => any
 >fn : (a: string) => string
 >a : string
  
 f((input): string => {
 >f((input): string => {    return "." + input;}) : any
->f : typeof f
+>f : (fn: (a: string) => string) => any
 >(input): string => {    return "." + input;} : (input: string) => string
 >input : string
 
diff --git a/tests/baselines/reference/unusedImportDeclaration.types b/tests/baselines/reference/unusedImportDeclaration.types
index b8281684a5d..b15ebbf3242 100644
--- a/tests/baselines/reference/unusedImportDeclaration.types
+++ b/tests/baselines/reference/unusedImportDeclaration.types
@@ -12,12 +12,12 @@ var thingy: B = {
 
 };
 declare function foo(a: string): void;
->foo : typeof foo
+>foo : (a: string) => void
 >a : string
 
 foo("IN " + thingy.me + "!");
 >foo("IN " + thingy.me + "!") : void
->foo : typeof foo
+>foo : (a: string) => void
 >"IN " + thingy.me + "!" : string
 >"IN " + thingy.me : string
 >thingy.me : string
diff --git a/tests/baselines/reference/validMultipleVariableDeclarations.types b/tests/baselines/reference/validMultipleVariableDeclarations.types
index 60e7cebb491..0e25906aac4 100644
--- a/tests/baselines/reference/validMultipleVariableDeclarations.types
+++ b/tests/baselines/reference/validMultipleVariableDeclarations.types
@@ -21,7 +21,7 @@ var x = <number>undefined;
 
 // new declaration space, making redeclaring x as a string valid
 function declSpace() {
->declSpace : typeof declSpace
+>declSpace : () => void
 
     var x = 'this is a string';
 >x : string
diff --git a/tests/baselines/reference/validUndefinedAssignments.types b/tests/baselines/reference/validUndefinedAssignments.types
index 84e9848c5b9..b48b6072e34 100644
--- a/tests/baselines/reference/validUndefinedAssignments.types
+++ b/tests/baselines/reference/validUndefinedAssignments.types
@@ -61,7 +61,7 @@ var h: { f(): void } = x;
 >x : any
 
 function i<T>(a: T) {
->i : typeof i
+>i : <T>(a: T) => void
 >T : T
 >a : T
 >T : T
diff --git a/tests/baselines/reference/varArgParamTypeCheck.types b/tests/baselines/reference/varArgParamTypeCheck.types
index bd342bb79d9..1b5b20adbec 100644
--- a/tests/baselines/reference/varArgParamTypeCheck.types
+++ b/tests/baselines/reference/varArgParamTypeCheck.types
@@ -1,17 +1,17 @@
 === tests/cases/compiler/varArgParamTypeCheck.ts ===
 function sequence(...sequences:{():void;}[]) {
->sequence : typeof sequence
+>sequence : (...sequences: { (): void; }[]) => void
 >sequences : { (): void; }[]
 }
 
 function callback(clb:()=>void) {
->callback : typeof callback
+>callback : (clb: () => void) => void
 >clb : () => void
 }
 
 sequence(
 >sequence(    function bar() {    },    function foo() {        callback(()=>{            this();        });    },    function baz() {        callback(()=>{            this();        });    }) : void
->sequence : typeof sequence
+>sequence : (...sequences: { (): void; }[]) => void
 
     function bar() {
 >function bar() {    } : () => void
@@ -24,7 +24,7 @@ sequence(
 
         callback(()=>{
 >callback(()=>{            this();        }) : void
->callback : typeof callback
+>callback : (clb: () => void) => void
 >()=>{            this();        } : () => void
 
             this();
@@ -39,7 +39,7 @@ sequence(
 
         callback(()=>{
 >callback(()=>{            this();        }) : void
->callback : typeof callback
+>callback : (clb: () => void) => void
 >()=>{            this();        } : () => void
 
             this();
diff --git a/tests/baselines/reference/vardecl.types b/tests/baselines/reference/vardecl.types
index 714a721602e..f757562c103 100644
--- a/tests/baselines/reference/vardecl.types
+++ b/tests/baselines/reference/vardecl.types
@@ -220,7 +220,7 @@ var z;
 >z : any
 
 function foo(a2) {
->foo : typeof foo
+>foo : (a2: any) => void
 >a2 : any
 
     var a = 10;
diff --git a/tests/baselines/reference/visibilityOfCrossModuleTypeUsage.types b/tests/baselines/reference/visibilityOfCrossModuleTypeUsage.types
index a275b3cbc23..112c9c87f23 100644
--- a/tests/baselines/reference/visibilityOfCrossModuleTypeUsage.types
+++ b/tests/baselines/reference/visibilityOfCrossModuleTypeUsage.types
@@ -3,7 +3,7 @@ import commands = require('visibilityOfCrossModuleTypeUsage_commands');
 >commands : typeof commands
 
 function run(configuration: commands.IConfiguration) {
->run : typeof run
+>run : (configuration: commands.IConfiguration) => void
 >configuration : commands.IConfiguration
 >commands : unknown
 >IConfiguration : commands.IConfiguration
diff --git a/tests/baselines/reference/voidFunctionAssignmentCompat.types b/tests/baselines/reference/voidFunctionAssignmentCompat.types
index 8da295f13bc..86e69c278c8 100644
--- a/tests/baselines/reference/voidFunctionAssignmentCompat.types
+++ b/tests/baselines/reference/voidFunctionAssignmentCompat.types
@@ -18,7 +18,7 @@ fv = function() { return 0; } // should work
 >function() { return 0; } : () => number
 
 function execAny(callback:(val:any)=>any) { return callback(0) }
->execAny : typeof execAny
+>execAny : (callback: (val: any) => any) => any
 >callback : (val: any) => any
 >val : any
 >callback(0) : any
@@ -26,11 +26,11 @@ function execAny(callback:(val:any)=>any) { return callback(0) }
 
 execAny(function () {}); // should work
 >execAny(function () {}) : any
->execAny : typeof execAny
+>execAny : (callback: (val: any) => any) => any
 >function () {} : () => void
 
 function execVoid(callback:(val:any)=>void) { callback(0); }
->execVoid : typeof execVoid
+>execVoid : (callback: (val: any) => void) => void
 >callback : (val: any) => void
 >val : any
 >callback(0) : void
@@ -38,7 +38,7 @@ function execVoid(callback:(val:any)=>void) { callback(0); }
 
 execVoid(function () {return 0;}); // should work
 >execVoid(function () {return 0;}) : void
->execVoid : typeof execVoid
+>execVoid : (callback: (val: any) => void) => void
 >function () {return 0;} : () => number
 
 var fra: (v:any)=>any = function() { return function () {}; } // should work
diff --git a/tests/baselines/reference/voidOperatorWithBooleanType.types b/tests/baselines/reference/voidOperatorWithBooleanType.types
index 393228a9766..88859c20378 100644
--- a/tests/baselines/reference/voidOperatorWithBooleanType.types
+++ b/tests/baselines/reference/voidOperatorWithBooleanType.types
@@ -4,7 +4,7 @@ var BOOLEAN: boolean;
 >BOOLEAN : boolean
 
 function foo(): boolean { return true; }
->foo : typeof foo
+>foo : () => boolean
 
 class A {
 >A : A
@@ -64,7 +64,7 @@ var ResultIsAny6 = void foo();
 >ResultIsAny6 : any
 >void foo() : undefined
 >foo() : boolean
->foo : typeof foo
+>foo : () => boolean
 
 var ResultIsAny7 = void A.foo();
 >ResultIsAny7 : any
@@ -92,7 +92,7 @@ void BOOLEAN;
 void foo();
 >void foo() : undefined
 >foo() : boolean
->foo : typeof foo
+>foo : () => boolean
 
 void true, false;
 >void true, false : boolean
diff --git a/tests/baselines/reference/voidOperatorWithNumberType.types b/tests/baselines/reference/voidOperatorWithNumberType.types
index 44ea71937cd..5669709e24b 100644
--- a/tests/baselines/reference/voidOperatorWithNumberType.types
+++ b/tests/baselines/reference/voidOperatorWithNumberType.types
@@ -8,7 +8,7 @@ var NUMBER1: number[] = [1, 2];
 >[1, 2] : number[]
 
 function foo(): number { return 1; }
->foo : typeof foo
+>foo : () => number
 
 class A {
 >A : A
@@ -89,7 +89,7 @@ var ResultIsAny9 = void foo();
 >ResultIsAny9 : any
 >void foo() : undefined
 >foo() : number
->foo : typeof foo
+>foo : () => number
 
 var ResultIsAny10 = void A.foo();
 >ResultIsAny10 : any
@@ -139,7 +139,7 @@ void NUMBER1;
 void foo();
 >void foo() : undefined
 >foo() : number
->foo : typeof foo
+>foo : () => number
 
 void objA.a;
 >void objA.a : undefined
diff --git a/tests/baselines/reference/voidOperatorWithStringType.types b/tests/baselines/reference/voidOperatorWithStringType.types
index 0aa7ef8ffb0..cb2dc7cb490 100644
--- a/tests/baselines/reference/voidOperatorWithStringType.types
+++ b/tests/baselines/reference/voidOperatorWithStringType.types
@@ -8,7 +8,7 @@ var STRING1: string[] = ["", "abc"];
 >["", "abc"] : string[]
 
 function foo(): string { return "abc"; }
->foo : typeof foo
+>foo : () => string
 
 class A {
 >A : A
@@ -89,7 +89,7 @@ var ResultIsAny9 = void foo();
 >ResultIsAny9 : any
 >void foo() : undefined
 >foo() : string
->foo : typeof foo
+>foo : () => string
 
 var ResultIsAny10 = void A.foo();
 >ResultIsAny10 : any
@@ -147,7 +147,7 @@ void STRING1;
 void foo();
 >void foo() : undefined
 >foo() : string
->foo : typeof foo
+>foo : () => string
 
 void objA.a,M.n;
 >void objA.a,M.n : string
diff --git a/tests/baselines/reference/voidReturnLambdaValue.types b/tests/baselines/reference/voidReturnLambdaValue.types
index 70ba206c6e1..0e524460a0c 100644
--- a/tests/baselines/reference/voidReturnLambdaValue.types
+++ b/tests/baselines/reference/voidReturnLambdaValue.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/voidReturnLambdaValue.ts ===
 function foo(arg1, arg2, callback:(v1,v2,v3) => void):void {
->foo : typeof foo
+>foo : (arg1: any, arg2: any, callback: (v1: any, v2: any, v3: any) => void) => void
 >arg1 : any
 >arg2 : any
 >callback : (v1: any, v2: any, v3: any) => void
diff --git a/tests/baselines/reference/withImportDecl.types b/tests/baselines/reference/withImportDecl.types
index 0228d6a16ac..02236436dee 100644
--- a/tests/baselines/reference/withImportDecl.types
+++ b/tests/baselines/reference/withImportDecl.types
@@ -40,7 +40,7 @@ var arrayVar: string[] = ['a', 'b'];
 
 
 function simpleFunction() {
->simpleFunction : typeof simpleFunction
+>simpleFunction : () => { x: string; y: string; n: number; }
 
     return {
 >{        x: "Hello",        y: "word",        n: 2    } : { x: string; y: string; n: number; }
@@ -61,7 +61,7 @@ module m1 {
 >m1 : typeof m1
 
     export function foo() {
->foo : typeof foo
+>foo : () => string
 
         return "Hello";
     }

From 088ca88bfddcf090cf5b6c636362d6c18c2c4daf Mon Sep 17 00:00:00 2001
From: Jason Freeman <jfreeman@microsoft.com>
Date: Thu, 28 Aug 2014 13:18:59 -0700
Subject: [PATCH 10/11] Revert condition inside shouldWriteTypeOfFunctionSymbol

---
 src/compiler/checker.ts                       |   6 +-
 .../reference/commentsClassMembers.js         | 112 +++++++++++++++++-
 .../recursiveFunctionTypes.errors.txt         |   2 +-
 .../reference/recursiveFunctionTypes1.types   |   6 +-
 4 files changed, 116 insertions(+), 10 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 825f53c7c55..f91fae2b5d5 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -1036,10 +1036,8 @@ module ts {
                             (type.symbol.parent || // is exported function symbol
                             ts.forEach(type.symbol.declarations, declaration =>
                                 declaration.parent.kind === SyntaxKind.SourceFile || declaration.parent.kind === SyntaxKind.ModuleBlock));
-                        if (isStaticMethodSymbol) {
-                            return false;
-                        }
-                        if (isNonLocalFunctionSymbol) {
+
+                        if (isStaticMethodSymbol || isNonLocalFunctionSymbol) {
                             // typeof is allowed only for static/non local functions
                             return !!(flags & TypeFormatFlags.UseTypeOfFunction) || // use typeof if format flags specify it
                                 (typeStack && contains(typeStack, type)); // it is type of the symbol uses itself recursively
diff --git a/tests/baselines/reference/commentsClassMembers.js b/tests/baselines/reference/commentsClassMembers.js
index 67fdd047518..a0cf8f2b631 100644
--- a/tests/baselines/reference/commentsClassMembers.js
+++ b/tests/baselines/reference/commentsClassMembers.js
@@ -557,11 +557,11 @@ declare var i1_ncf: (b: number) => number;
 declare var i1_ncr: number;
 declare var i1_ncprop: number;
 declare var i1_s_p: number;
-declare var i1_s_f: (b: number) => number;
+declare var i1_s_f: typeof s2;
 declare var i1_s_r: number;
 declare var i1_s_prop: number;
 declare var i1_s_nc_p: number;
-declare var i1_s_ncf: (b: number) => number;
+declare var i1_s_ncf: typeof nc_s2;
 declare var i1_s_ncr: number;
 declare var i1_s_ncprop: number;
 declare var i1_c: typeof c1;
@@ -577,3 +577,111 @@ declare class cProperties {
     private y;
 }
 declare var cProperties_i: cProperties;
+
+
+//// [DtsFileErrors]
+
+
+==== tests/cases/compiler/commentsClassMembers.d.ts (2 errors) ====
+    /** This is comment for c1*/
+    declare class c1 {
+        /** p1 is property of c1*/
+        p1: number;
+        /** sum with property*/
+        p2(/** number to add*/ b: number): number;
+        /** getter property*/
+        /** setter property*/
+        p3: number;
+        /** pp1 is property of c1*/
+        private pp1;
+        /** sum with property*/
+        private pp2(/** number to add*/ b);
+        /** getter property*/
+        /** setter property*/
+        private pp3;
+        /** Constructor method*/
+        constructor();
+        /** s1 is static property of c1*/
+        static s1: number;
+        /** static sum with property*/
+        static s2(/** number to add*/ b: number): number;
+        /** static getter property*/
+        /** setter property*/
+        static s3: number;
+        nc_p1: number;
+        nc_p2(b: number): number;
+        nc_p3: number;
+        private nc_pp1;
+        private nc_pp2(b);
+        private nc_pp3;
+        static nc_s1: number;
+        static nc_s2(b: number): number;
+        static nc_s3: number;
+        a_p1: number;
+        a_p2(b: number): number;
+        a_p3: number;
+        private a_pp1;
+        private a_pp2(b);
+        private a_pp3;
+        static a_s1: number;
+        static a_s2(b: number): number;
+        static a_s3: number;
+        /** p1 is property of c1 */
+        b_p1: number;
+        /** sum with property */
+        b_p2(b: number): number;
+        /** getter property */
+        /** setter property */
+        b_p3: number;
+        /** pp1 is property of c1 */
+        private b_pp1;
+        /** sum with property */
+        private b_pp2(b);
+        /** getter property */
+        /** setter property */
+        private b_pp3;
+        /** s1 is static property of c1 */
+        static b_s1: number;
+        /** static sum with property */
+        static b_s2(b: number): number;
+        /** static getter property
+        */
+        /** setter property
+        */
+        static b_s3: number;
+    }
+    declare var i1: c1;
+    declare var i1_p: number;
+    declare var i1_f: (b: number) => number;
+    declare var i1_r: number;
+    declare var i1_prop: number;
+    declare var i1_nc_p: number;
+    declare var i1_ncf: (b: number) => number;
+    declare var i1_ncr: number;
+    declare var i1_ncprop: number;
+    declare var i1_s_p: number;
+    declare var i1_s_f: typeof s2;
+                               ~~
+!!! Cannot find name 's2'.
+    declare var i1_s_r: number;
+    declare var i1_s_prop: number;
+    declare var i1_s_nc_p: number;
+    declare var i1_s_ncf: typeof nc_s2;
+                                 ~~~~~
+!!! Cannot find name 'nc_s2'.
+    declare var i1_s_ncr: number;
+    declare var i1_s_ncprop: number;
+    declare var i1_c: typeof c1;
+    declare class cProperties {
+        private val;
+        /** getter only property*/
+        p1: number;
+        nc_p1: number;
+        /**setter only property*/
+        p2: number;
+        nc_p2: number;
+        x: number;
+        private y;
+    }
+    declare var cProperties_i: cProperties;
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/recursiveFunctionTypes.errors.txt b/tests/baselines/reference/recursiveFunctionTypes.errors.txt
index 3d61fc694ab..5068438a8ca 100644
--- a/tests/baselines/reference/recursiveFunctionTypes.errors.txt
+++ b/tests/baselines/reference/recursiveFunctionTypes.errors.txt
@@ -35,7 +35,7 @@
     }
     C.g(3); // error
         ~
-!!! Argument of type 'number' is not assignable to parameter of type '(t: any) => void'.
+!!! Argument of type 'number' is not assignable to parameter of type '(t: typeof g) => void'.
     
     var f4: () => typeof f4;
     f4 = 3; // error
diff --git a/tests/baselines/reference/recursiveFunctionTypes1.types b/tests/baselines/reference/recursiveFunctionTypes1.types
index 81af54b96d3..535555ef13d 100644
--- a/tests/baselines/reference/recursiveFunctionTypes1.types
+++ b/tests/baselines/reference/recursiveFunctionTypes1.types
@@ -3,8 +3,8 @@ class C {
 >C : C
 
      static g(t: typeof C.g){ }
->g : (t: any) => void
->t : (t: any) => void
+>g : (t: typeof g) => void
+>t : (t: typeof g) => void
 >C : typeof C
->g : (t: any) => void
+>g : (t: typeof g) => void
 }

From ae59368836b36c417d4eafe4bff3a3c395a7cbe8 Mon Sep 17 00:00:00 2001
From: Jason Freeman <jfreeman@microsoft.com>
Date: Thu, 28 Aug 2014 17:30:56 -0700
Subject: [PATCH 11/11] Update baselines

---
 tests/baselines/reference/commentOnAmbientModule.types | 4 ++--
 tests/baselines/reference/commentOnElidedModule1.types | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/baselines/reference/commentOnAmbientModule.types b/tests/baselines/reference/commentOnAmbientModule.types
index 99d86cc6a9b..bf57d9d11bd 100644
--- a/tests/baselines/reference/commentOnAmbientModule.types
+++ b/tests/baselines/reference/commentOnAmbientModule.types
@@ -5,8 +5,8 @@ declare module E {
 
     class foobar extends D.bar {
 >foobar : foobar
->D : D
->bar : bar
+>D : unknown
+>bar : D.bar
 
         foo();
 >foo : () => any
diff --git a/tests/baselines/reference/commentOnElidedModule1.types b/tests/baselines/reference/commentOnElidedModule1.types
index 817825edbbc..785336dff3d 100644
--- a/tests/baselines/reference/commentOnElidedModule1.types
+++ b/tests/baselines/reference/commentOnElidedModule1.types
@@ -1,7 +1,7 @@
 === tests/cases/compiler/b.ts ===
 ///<reference path="a.ts"/>
 module ElidedModule3 {
->ElidedModule3 : ElidedModule3
+>ElidedModule3 : unknown
 }
 === tests/cases/compiler/a.ts ===
 /*! Keep this pinned comment */